* man/mlterm.1, README.ja, etc/main, etc/main.ja: Updated.

* ui_sb_factory.[ch]: ui_simple_scrollbar_set_dpr() is added. * ui_main_config.c: --sdpr / simple_scrollbar_dpr option is added. * motif_data.h, mozmodern_data.h, next_data.h, ui_arrow_data.h: Fix up the appearance.
arakiken · Mar 18, 2023 · c3a2045 · c3a2045
1 parent 96fbf41
commit c3a2045
Show file tree

Hide file tree

Showing 16 changed files with 414 additions and 118 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,14 @@
+2023-03-18  Araki Ken  <arakiken@users.sf.net>
+
+	* man/mlterm.1, README.ja, etc/main, etc/main.ja: Updated.
+
+	* ui_sb_factory.[ch]: ui_simple_scrollbar_set_dpr() is added.
+
+	* ui_main_config.c: --sdpr / simple_scrollbar_dpr option is added.
+
+	* motif_data.h, mozmodern_data.h, next_data.h, ui_arrow_data.h:
+	  Fix up the appearance.
+
 2023-02-26  Araki Ken  <arakiken@users.sf.net>
 
 	* cocoa.m: MLTermView::update always calls [self setNeedsDisplay:YES].

diff --git a/contrib/scrollbar/extra/motif_data.h b/contrib/scrollbar/extra/motif_data.h
@@ -10,20 +10,56 @@
  * ' ' bg
  */
 
-static char *arrow_up_src[] = {"     .     ", "    ..#    ", "    ..#    ", "   ..:##   ",
-                               "   ..:##   ", "  ..:::##  ", "  ..:::##  ", " ..:::::## ",
-                               " ..:::::## ", "..#########", ".##########"};
+static char *arrow_up_src[] = {
+  "     .     ",
+  "    ..#    ",
+  "    ..#    ",
+  "   ..:##   ",
+  "   ..:##   ",
+  "  ..:::##  ",
+  "  ..:::##  ",
+  " ..:::::## ",
+  " ..:::::## ",
+  "..#########",
+  ".##########" };
 
-static char *arrow_down_src[] = {"...........", ".........##", " ..:::::## ", " ..:::::## ",
-                                 "  ..:::##  ", "  ..:::##  ", "   ..:##   ", "   ..:##   ",
-                                 "    .##    ", "    .##    ", "     #     "};
+static char *arrow_down_src[] = {
+  "...........",
+  ".........##",
+  " ..:::::## ",
+  " ..:::::## ",
+  "  ..:::##  ",
+  "  ..:::##  ",
+  "   ..:##   ",
+  "   ..:##   ",
+  "    .##    ",
+  "    .##    ",
+  "     #     " };
 
-static char *arrow_up_pressed_src[] = {"     #     ", "    ##.    ", "    ##.    ", "   ##:..   ",
-                                       "   ##:..   ", "  ##:::..  ", "  ##:::..  ", " ##:::::.. ",
-                                       " ##:::::.. ", "##.........", "#.........."};
+static char *arrow_up_pressed_src[] = {
+  "     #     ",
+  "    ##.    ",
+  "    ##.    ",
+  "   ##:..   ",
+  "   ##:..   ",
+  "  ##:::..  ",
+  "  ##:::..  ",
+  " ##:::::.. ",
+  " ##:::::.. ",
+  "##.........",
+  "#.........." };
 
-static char *arrow_down_pressed_src[] = {"###########", "#########..", " ##:::::.. ", " ##:::::.. ",
-                                         "  ##:::..  ", "  ##:::..  ", "   ##:..   ", "   ##:..   ",
-                                         "    #..    ", "    #..    ", "     .     "};
+static char *arrow_down_pressed_src[] = {
+  "###########",
+  "#########..",
+  " ##:::::.. ",
+  " ##:::::.. ",
+  "  ##:::..  ",
+  "  ##:::..  ",
+  "   ##:..   ",
+  "   ##:..   ",
+  "    #..    ",
+  "    #..    ",
+  "     .     " };
 
 #endif
diff --git a/contrib/scrollbar/extra/mozmodern_data.h b/contrib/scrollbar/extra/mozmodern_data.h
@@ -23,26 +23,71 @@
  */
 
 static char *arrow_up_src[] = {
-    "###############", "#            +#", "# ..........$+#", "# .:::::::::$+#", "# .:::::::::$+#",
-    "# .::::#::::$+#", "# .:::###:::$+#", "# .::#####::$+#", "# .:#######:$+#", "# .#########$+#",
-    "# .:::::::::$+#", "# .:::::::::$+#", "# .$$$$$$$$$$+#", "# ++++++++++++#", "###############"};
+  "###############",
+  "#            +#",
+  "# ..........$+#",
+  "# .:::::::::$+#",
+  "# .:::::::::$+#",
+  "# .::::#::::$+#",
+  "# .:::###:::$+#",
+  "# .::#####::$+#",
+  "# .:#######:$+#",
+  "# .#########$+#",
+  "# .:::::::::$+#",
+  "# .:::::::::$+#",
+  "# .$$$$$$$$$$+#",
+  "# ++++++++++++#",
+  "###############" };
 
 static char *arrow_down_src[] = {
-    "###############", "#            +#", "# ..........$+#", "# .:::::::::$+#", "# .:::::::::$+#",
-    "# .#########$+#", "# .:#######:$+#", "# .::#####::$+#", "# .:::###:::$+#", "# .::::#::::$+#",
-    "# .:::::::::$+#", "# .:::::::::$+#", "# .$$$$$$$$$$+#", "# ++++++++++++#", "###############"};
+  "###############",
+  "#            +#",
+  "# ..........$+#",
+  "# .:::::::::$+#",
+  "# .:::::::::$+#",
+  "# .#########$+#",
+  "# .:#######:$+#",
+  "# .::#####::$+#",
+  "# .:::###:::$+#",
+  "# .::::#::::$+#",
+  "# .:::::::::$+#",
+  "# .:::::::::$+#",
+  "# .$$$$$$$$$$+#",
+  "# ++++++++++++#",
+  "###############" };
 
 static char *arrow_up_pressed_src[] = {
-    "###############", "#-------------#", "#^,,,,,,,,,,,-#", "#^@@@@@@@@@@@-#", "#^@@@@@@@@@@@-#",
-    "#^@@@@@#@@@@@-#", "#^@@@@###@@@@-#", "#^@@@#####@@@-#", "#^@@#######@@-#", "#^@#########@-#",
-    "#^@@@@@@@@@@@-#", "#^@@@@@@@@@@@-#", "#^~~~~~~~~~~~-#", "#^;;;;;;;;;;;-#", "###############"};
+  "###############",
+  "#-------------#",
+  "#^,,,,,,,,,,,-#",
+  "#^@@@@@@@@@@@-#",
+  "#^@@@@@@@@@@@-#",
+  "#^@@@@@#@@@@@-#",
+  "#^@@@@###@@@@-#",
+  "#^@@@#####@@@-#",
+  "#^@@#######@@-#",
+  "#^@#########@-#",
+  "#^@@@@@@@@@@@-#",
+  "#^@@@@@@@@@@@-#",
+  "#^~~~~~~~~~~~-#",
+  "#^;;;;;;;;;;;-#",
+  "###############" };
 
 static char *arrow_down_pressed_src[] = {
-    "###############", "#-------------#", "#^,,,,,,,,,,,-#", "#^@@@@@@@@@@@-#",
-    "#^@@@@@@@@@@@-#", "#^@#########@-#", "#^@@#######@@-#", "#^@@@#####@@@-#",
-    "#^@@@@###@@@@-#", "#^@@@@@#@@@@@-#", "#^@@@@@@@@@@@-#", "#^@@@@@@@@@@@-#",
-    "#^~~~~~~~~~~~-#", "#^;;;;;;;;;;;-#", "###############"
-
-};
+  "###############",
+  "#-------------#",
+  "#^,,,,,,,,,,,-#",
+  "#^@@@@@@@@@@@-#",
+  "#^@@@@@@@@@@@-#",
+  "#^@#########@-#",
+  "#^@@#######@@-#",
+  "#^@@@#####@@@-#",
+  "#^@@@@###@@@@-#",
+  "#^@@@@@#@@@@@-#",
+  "#^@@@@@@@@@@@-#",
+  "#^@@@@@@@@@@@-#",
+  "#^~~~~~~~~~~~-#",
+  "#^;;;;;;;;;;;-#",
+  "###############" };
 
 #endif
diff --git a/contrib/scrollbar/extra/next_data.h b/contrib/scrollbar/extra/next_data.h
@@ -3,34 +3,89 @@
 #ifndef __VT_NEXTISH_SB_DATA_H__
 #define __VT_NEXTISH_SB_DATA_H__
 
-static char *bar_relief_src[] = {"-+###-", "+#++++", "#++---", "#+--  ", "#+-   ", "-+-  -"};
+static char *bar_relief_src[] = {
+  "-+###-",
+  "+#++++",
+  "#++---",
+  "#+--  ",
+  "#+-   ",
+  "-+-  -" };
 
 static char *arrow_up_src[] = {
-    "               #", " -------------+#", " -------------+#", " ------+------+#",
-    " ------#------+#", " -----+#+-----+#", " -----###-----+#", " ----+###+----+#",
-    " ----#####----+#", " ---+#####+---+#", " ---#######---+#", " --+#######+--+#",
-    " -------------+#", " -------------+#", " ++++++++++++++#", "################",
+  "               #",
+  " -------------+#",
+  " -------------+#",
+  " ------+------+#",
+  " ------#------+#",
+  " -----+#+-----+#",
+  " -----###-----+#",
+  " ----+###+----+#",
+  " ----#####----+#",
+  " ---+#####+---+#",
+  " ---#######---+#",
+  " --+#######+--+#",
+  " -------------+#",
+  " -------------+#",
+  " ++++++++++++++#",
+  "################",
 };
 
 static char *arrow_down_src[] = {
-    "               #", " -------------+#", " -------------+#", " --+#######+--+#",
-    " ---#######---+#", " ---+#####+---+#", " ----#####----+#", " ----+###+----+#",
-    " -----###-----+#", " -----+#+-----+#", " ------#------+#", " ------+------+#",
-    " -------------+#", " -------------+#", " ++++++++++++++#", "################",
+  "               #",
+  " -------------+#",
+  " -------------+#",
+  " --+#######+--+#",
+  " ---#######---+#",
+  " ---+#####+---+#",
+  " ----#####----+#",
+  " ----+###+----+#",
+  " -----###-----+#",
+  " -----+#+-----+#",
+  " ------#------+#",
+  " ------+------+#",
+  " -------------+#",
+  " -------------+#",
+  " ++++++++++++++#",
+  "################",
 };
 
 static char *arrow_up_pressed_src[] = {
-    "               #", "              +#", "              +#", "       +      +#",
-    "       +      +#", "      +++     +#", "      +++     +#", "     +++++    +#",
-    "     +++++    +#", "    +++++++   +#", "    +++++++   +#", "   +++++++++  +#",
-    "              +#", "              +#", " ++++++++++++++#", "################",
+  "               #",
+  "              +#",
+  "              +#",
+  "       +      +#",
+  "       +      +#",
+  "      +++     +#",
+  "      +++     +#",
+  "     +++++    +#",
+  "     +++++    +#",
+  "    +++++++   +#",
+  "    +++++++   +#",
+  "   +++++++++  +#",
+  "              +#",
+  "              +#",
+  " ++++++++++++++#",
+  "################",
 };
 
 static char *arrow_down_pressed_src[] = {
-    "               #", "              +#", "              +#", "   +++++++++  +#",
-    "    +++++++   +#", "    +++++++   +#", "     +++++    +#", "     +++++    +#",
-    "      +++     +#", "      +++     +#", "       +      +#", "       +      +#",
-    "              +#", "              +#", " ++++++++++++++#", "################",
+  "               #",
+  "              +#",
+  "              +#",
+  "   +++++++++  +#",
+  "    +++++++   +#",
+  "    +++++++   +#",
+  "     +++++    +#",
+  "     +++++    +#",
+  "      +++     +#",
+  "      +++     +#",
+  "       +      +#",
+  "       +      +#",
+  "              +#",
+  "              +#",
+  " ++++++++++++++#",
+  "################",
 };
 
+
 #endif
diff --git a/doc/en/ReleaseNote b/doc/en/ReleaseNote
@@ -2,6 +2,8 @@
 * Add --disable-compact-truecolor option to ./configure script.
 * Add vte 0.68 API symbols to libvte compatible library.
 * Add libvterm 0.2 API symbols to libvterm compatible library.
+* Add --sdpr / simple_scrollbar_dpr option.
+  (https://github.com/arakiken/mlterm/issues/64)
 * Set "COLORTERM=truecolor" environmental variable.
   (https://github.com/arakiken/mlterm/issues/36)
 * Update unicode property table (generated from UnicodeData.txt and

diff --git a/doc/ja/README.ja b/doc/ja/README.ja
@@ -404,7 +404,7 @@ comment -*- mode: text; tab-width:2; indent-tabs-mode:nil -*-
 
       o col_size_of_width_a  (1/2) (#)
         UNICODE �� EastAsianWidth.txt �� A �ץ��ѥƥ��Υ�����
-        �ǥե�����ͤϡ�ja_XX.XX locale �Ķ��Ǥ� 2 , ����¾�δĶ��Ǥ� 1 �Ǥ���.
+        �ǥե�����ͤϡ�ja_XX.XX locale �Ķ��Ǥ� 2 , ����¾�δĶ��Ǥ� 1 �Ǥ���
 
       o console_encoding (*auto*) (mlterm-con ��)
         mlterm-con ��ư��륳�󥽡���Υ��󥳡��ǥ���
@@ -581,7 +581,7 @@ comment -*- mode: text; tab-width:2; indent-tabs-mode:nil -*-
         cjk �ϡ������麸�ν�ɽ����mongol �ϡ������鱦�ν�ɽ���Ǥ���
 
       -- Font ��Ϣ --
-      o baseline_offset (0) (#)
+      o baseline_offset (*0*) (#)
         �١����饤������а���
 
       o box_drawing_font (unicode/decsp/*noconv*) (#)
@@ -678,10 +678,10 @@ comment -*- mode: text; tab-width:2; indent-tabs-mode:nil -*-
         ���٤Ƥ�ʸ���� UNICODE �ե���Ȥ�����Ȥä�ɽ��
         �ʤ���ʸ������°���ϡ�UNICODE ��°���ϻȤ��ޤ���
 
-      o ot_script (latn) (#)
+      o ot_script (*latn*) (#)
         ������ִ���Ԥ����� script ����ꤷ�ޤ���
 
-      o ot_features (liga,clig,dlig,hlig,rlig) (#)
+      o ot_features (*liga,clig,dlig,hlig,rlig*) (#)
         ������ִ���Ԥ����� feature ����ꤷ�ޤ���
 
       o screen_width_ratio (*100*) (#)
@@ -696,7 +696,7 @@ comment -*- mode: text; tab-width:2; indent-tabs-mode:nil -*-
         �ʤ���use_anti_alias = true �ˤ������ϡ���ưŪ�� type_engine = cairo ��
         �ʤ�ޤ���
 
-      o underline_offset (0) (#)
+      o underline_offset (*0*) (#)
         ��������饤��ΰ���(�ե���ȤΥ١����饤�󤫤�����а���)
 
       o unicode_full_width_areas (#)
@@ -846,6 +846,9 @@ comment -*- mode: text; tab-width:2; indent-tabs-mode:nil -*-
         scrollbar_mode , scrollbar_view_name ���ץ����ϡ����줬 true �ξ���
         ��ͭ���Ǥ���
 
+      o simple_scrollbar_dpr (*1*)
+        "simple" ����������С��β�������뤿��� device pixel ratio
+
       -- ����¾ --
       o allow_change_shortcut (true/*false*)
         OSC 5379 �� "set_shortcut" �ˤ��ưŪ�ʥ��硼�ȥ��åȥ��������ͭ���ˤ�
@@ -964,7 +967,7 @@ comment -*- mode: text; tab-width:2; indent-tabs-mode:nil -*-
         "H,V"�������ͤ���ꤹ��ȡ��������Ƚ��������̡��� inner border ���ͤ��
         ��Ǥ��ޤ���
 
-      o local_echo_wait (250)
+      o local_echo_wait (*250*)
         local echo ���֤��ݻ�������� (�ߥ���)
 
       o locale
@@ -1023,7 +1026,7 @@ comment -*- mode: text; tab-width:2; indent-tabs-mode:nil -*-
       o ssh_auto_reconnect (true/*false*)
         ssh ����³��ͽ���������Ǥ������ˡ���ưŪ�˺���³���ߤ롣
 
-      o ssh_keepalive_interval (0)
+      o ssh_keepalive_interval (*0*)
         ssh ��³��ˡ����ꤷ���ÿ����Ȥˡ�SSH_MSG_IGNORE ������
         (0 �ξ����������ʤ���)
 

diff --git a/etc/main b/etc/main
@@ -149,6 +149,8 @@
 # (simple,sample,sample3,next,motif,athena,mozmodern)
 # scrollbar_view_name = simple
 
+# simple_scrollbar_dpr = 1
+
 # fg_color = black
 
 # bg_color = white

diff --git a/etc/main.ja b/etc/main.ja
@@ -214,6 +214,9 @@
 # scrollbar_view_name = simple
 scrollbar_view_name = sample
 
+# "simple" ����������С��β�������뤿��� device pixel ratio
+# simple_scrollbar_dpr = 1
+
 # ü�����̤����ʿ�
 # fg_color = black
 

diff --git a/man/mlterm.1 b/man/mlterm.1
@@ -782,6 +782,10 @@ The default is \fBfalse\fR.
 Even if allow_scp = false, it is possible to transfer a file to "." directory
 (~/.mlterm/scp).
 .TP
+\fB\-\-sdpr\fR=\fIvalue\fR
+Specify device pixel ratio to determine the width of "simple" scrollbar.
+The default is \fB1\fR.
+.TP
 \fB\-\-seqfmt\fR=\fIvalue\fR
 Specify the format of logging vt100 sequence. \fBraw\fR for logging as it is
 and \fBttyrec\fR for logging by ttyrec format.
@@ -1751,6 +1755,9 @@ Specify secondary device attributes string.
 Draw the wall picture on Text VRAM instead of Graphic VRAM to improve
 the performance of scrolling.
 .TP
+\fBsimple_scrollbar_dpr\fR=\fIvalue\fR (\fB\-\-sdpr\fR)
+Specify device pixel ratio to determine the width of "simple" scrollbar.
+.TP
 \fBssh_auto_reconnect\fR=\fIbool\fR (\fB\-\-rcn\fR)
 Reconnect to ssh server automatically in unexpected disconnection.
 .TP