Terminal 生活

! -*- mode: conf-xdefaults; coding: utf-8-unix -*-
!! Rxvt !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
URxvt*skipBuiltinGlyphs: true
URxvt*allow_bold: true
URxvt*font: xft:Victor Mono NF:style=Medium:size=13,xft:Migu 1M:style=Regular:size=13,xft:Twemoji Mozilla:size=13:style=Regular,xft:Symbola:size=13:style=Regular
URxvt*boldfont: xft:Victor Mono NF:style=Bold:size=13,xft:Migu 1M:style=Bold:size=13,xft:Twemoji Mozilla:size=13:style=Regular,xft:Symbola:size=13:style=Regular
URxvt*italicfont: xft:Victor Mono NF:style=Italic:size=13,xft:Migu 1M:style=Italic:size=13,xft:Twemoji Mozilla:size=13:style=Regular,xft:Symbola:size=13:style=Regular
URxvt*bolditalicfont: xft:Victor Mono NF:style=BoldItalic:size=13,xft:Migu 1M:style=Bolditalic:size=13,xft:Twemoji Mozilla:size=13:style=Regular,xft:Symbola:size=13:style=Regular
URxvt*letterSpace: -2
URxvt*lineSpace: -2
! misc settings
URxvt*saveLines:   0
URxvt*scrollBar:   false
URxvt*inputMethod: fcitx
! URxvt*inputMethod: xim
URxvt*preeditType: OnTheSpot
! URxvt*inputMethod: ibus
! URxvt*preeditType: OverTheSpot
URxvt*depth: 32
URxvt*fading: 30
URxvt*cursorBlink: false
URxvt*cursorUnderline: false
! Dracula color scheme
URxvt*cursorColor: #ffb86c
URxvt*cursorColor2: #242424
URxvt*foreground: #f8f8f2
URxvt*background: [90]#282A36
URxvt.color0:     #21222c
URxvt.color1:     #ff5555
URxvt.color2:     #50fa7b
URxvt.color3:     #f1fa8c
URxvt.color4:     #bd93f9
URxvt.color5:     #ff79c6
URxvt.color6:     #8be9fd
URxvt.color7:     #f8f8f2
URxvt.color8:     #6272a4
URxvt.color9:     #ff6e6e
URxvt.color10:    #69ff94
URxvt.color11:    #ffffa5
URxvt.color12:    #d6acff
URxvt.color13:    #ff92df
URxvt.color14:    #a4ffff
URxvt.color15:    #ffffff
! plugin
URxvt.perl-lib: /home/uwabami/.config/rxvt-ext
URxvt.perl-ext-common: default,clipboard,xim-onthespot,font-size
! URxvt.url-select.launcher: /usr/bin/xdg-open
! URxvt.url-select.button: 1
! URxvt.url-select.underline: false
URxvt.keysym.M-u: perl:url-select:select_next
URxvt.font-size.step: 1.5
URxvt.iso14755: false
URxvt.keysym.Shift-Control-C: perl:clipboard:copy
URxvt.keysym.Shift-Control-V: perl:clipboard:paste
URxvt.clipboard.copycmd: xclip -in -selection clipboard
URxvt.clipboard.pastecmd: xclip -out -selection clipboard

diff --git a/src/rxvtfont.C b/src/rxvtfont.C
index 1914539..4c0189e 100644
--- a/src/rxvtfont.C
+++ b/src/rxvtfont.C
@@ -1223,92 +1223,63 @@ rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
     return false;

   int ftheight = 0;
-  bool success = true;
-
-  for (;;)
-    {
-      p = FcPatternDuplicate (match);
-      f = XftFontOpenPattern (disp, p);
-
-      if (!f)
-        {
-          FcPatternDestroy (p);
-          success = false;
-          break;
-        }
-
-      FT_Face face = XftLockFace (f);
-
-      ascent  = (face->size->metrics.ascender + 63) >> 6;
-      descent = (-face->size->metrics.descender + 63) >> 6;
-      height  = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
-      width   = 0;
-
-      bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;

-      XftUnlockFace (f);
+  p = FcPatternDuplicate (match);
+  f = XftFontOpenPattern (disp, p);

-      int glheight = height;
+  if (!f)
+    {
+      FcPatternDestroy (p);
+      return false;
+    }

-      for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
-        {
-          FcChar16 ch = *t;
+  FT_Face face = XftLockFace (f);

-          if (cs != CS_UNICODE
-              && ch > 0x100
-              && FROM_UNICODE (cs, ch) == NOCHAR)
-            continue;
+  ascent  = f->ascent;
+  descent = f->descent;
+  height  = max (ascent + descent, f->height);
+  width   = 0;

-          // ignore characters we wouldn't use anyways
-          bool careful;
-          if (!has_char (*t, &prop, careful))
-            continue;
+  bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;

-          XGlyphInfo g;
-          XftTextExtents16 (disp, f, &ch, 1, &g);
+  XftUnlockFace (f);

-          g.width -= g.x;
+  for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
+    {
+      FcChar16 ch = *t;

-          int wcw = WCWIDTH (ch);
-          if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
+      if (cs != CS_UNICODE
+          && ch > 0x100
+          && FROM_UNICODE (cs, ch) == NOCHAR)
+        continue;

-          if (width    < g.width       ) width    = g.width;
-          if (height   < g.height      ) height   = g.height;
-          if (glheight < g.height - g.y) glheight = g.height - g.y;
-        }
+      // ignore characters we wouldn't use anyways
+      bool careful;
+      if (!has_char (*t, &prop, careful))
+        continue;

-      if (!width)
-        {
-          rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
+      XGlyphInfo g;
+      XftTextExtents16 (disp, f, &ch, 1, &g);

-          XftFontClose (disp, f);
-          f = 0;
+      g.width -= g.x;

-          success = false;
-          break;
-        }
+      int wcw = WCWIDTH (ch);
+      if (wcw > 1) g.xOff = g.xOff / wcw;

-      if (prop.height == rxvt_fontprop::unset
-          || (height <= prop.height && glheight <= prop.height)
-          || height <= 2
-          || !scalable)
-        break;
+      if (width    < g.xOff  ) width    = g.xOff;
+      if (height   < g.height) height   = g.height;
+    }

-      if (ftheight)
-        {
-          // take smaller steps near the end
-          if (height > prop.height + 1) ftheight++;
-          if (height > prop.height + 2) ftheight++;
-          if (height > prop.height + 3) ftheight++;
+  bool success = true;

-          ftheight -= height - prop.height;
-        }
-      else
-        ftheight = prop.height - 1;
+  if (!width)
+    {
+      rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);

       XftFontClose (disp, f);
-      FcPatternDel (match, FC_PIXEL_SIZE);
-      FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
+      f = 0;
+
+      success = false;
     }

   FcPatternDestroy (match);
@@ -1395,7 +1366,7 @@ rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,

           ep->glyph = glyph;
           ep->x = x_ + (cwidth - extents.xOff >> 1);
-          ep->y = y_ + ascent;
+          ep->y = y_ + term->fbase + (term->lineSpace >> 1);

           if (extents.xOff == 0)
             ep->x = x_ + cwidth;
diff --git a/src/screen.C b/src/screen.C
index 9eb375a..7b3cdbf 100644
--- a/src/screen.C
+++ b/src/screen.C
@@ -2432,8 +2432,8 @@ rxvt_term::scr_refresh () NOTHROW
                 XSetForeground (dpy, gc, pix_colors[fore]);

               XDrawLine (dpy, vt, gc,
-                         xpixel, ypixel + font->ascent + 1,
-                         xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
+                         xpixel, ypixel + Height2Pixel (1) - 1,
+                         xpixel + Width2Pixel (count) - 1, ypixel + Height2Pixel (1) - 1);
             }
         }                     /* for (col....) */
     }                         /* for (row....) */
diff --git a/src/table/jis0208_1990_0.h b/src/table/jis0208_1990_0.h
index b23378f..0febcd3 100644
--- a/src/table/jis0208_1990_0.h
+++ b/src/table/jis0208_1990_0.h
@@ -2241,6 +2241,7 @@ const uint16_t *jis0208_1990_0_f_i[] = {

 static uint32_t cs_jis0208_1990_0_from_unicode (unicode_t unicode) {
     if (unicode == 0x2312) return 0x225e;
+    if (unicode == 0xff5e) return 0x2141;
     uint8_t  l = unicode;
     uint16_t h = unicode >> 8;
     if (0x00 <= h && h <= 0xff

From: Youhei SASAKI <uwabami@gfd-dennou.org>
Date: Sat, 4 Feb 2017 03:29:22 +0900
Subject: Use box drawing DECSP or ASCII with option 'pane-border-ascii'

Signed-off-by: Youhei SASAKI <uwabami@gfd-dennou.org>
---
 options-table.c |  5 +++++
 tty-acs.c       | 68 ++++++++++++++++++++++++++++-----------------------------
 2 files changed, 39 insertions(+), 34 deletions(-)

--- a/options-table.c
+++ b/options-table.c
@@ -293,6 +293,12 @@
 	  .default_num = 0
 	},

+	{ .name = "pane-border-ascii",
+	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_SESSION,
+	  .default_num = 1
+	},
+
 	{ .name = "prefix",
 	  .type = OPTIONS_TABLE_KEY,
 	  .scope = OPTIONS_TABLE_SESSION,
--- a/tty-acs.c
+++ b/tty-acs.c
@@ -30,38 +30,38 @@
 	const char	*string;
 };
 const struct tty_acs_entry tty_acs_table[] = {
-	{ '+', "\342\206\222" },	/* arrow pointing right */
-	{ ',', "\342\206\220" },	/* arrow pointing left */
-	{ '-', "\342\206\221" },	/* arrow pointing up */
-	{ '.', "\342\206\223" },	/* arrow pointing down */
-	{ '0', "\342\226\256" },	/* solid square block */
-	{ '`', "\342\227\206" },	/* diamond */
-	{ 'a', "\342\226\222" },	/* checker board (stipple) */
-	{ 'f', "\302\260" },		/* degree symbol */
-	{ 'g', "\302\261" },		/* plus/minus */
-	{ 'h', "\342\226\222" },	/* board of squares */
-	{ 'i', "\342\230\203" },	/* lantern symbol */
-	{ 'j', "\342\224\230" },	/* lower right corner */
-	{ 'k', "\342\224\220" },	/* upper right corner */
-	{ 'l', "\342\224\214" },	/* upper left corner */
-	{ 'm', "\342\224\224" },	/* lower left corner */
-	{ 'n', "\342\224\274" },	/* large plus or crossover */
-	{ 'o', "\342\216\272" },	/* scan line 1 */
-	{ 'p', "\342\216\273" },	/* scan line 3 */
-	{ 'q', "\342\224\200" },	/* horizontal line */
-	{ 'r', "\342\216\274" },	/* scan line 7 */
-	{ 's', "\342\216\275" },	/* scan line 9 */
-	{ 't', "\342\224\234" },	/* tee pointing right */
-	{ 'u', "\342\224\244" },	/* tee pointing left */
-	{ 'v', "\342\224\264" },	/* tee pointing up */
-	{ 'w', "\342\224\254" },	/* tee pointing down */
-	{ 'x', "\342\224\202" },	/* vertical line */
-	{ 'y', "\342\211\244" },	/* less-than-or-equal-to */
-	{ 'z', "\342\211\245" },	/* greater-than-or-equal-to */
-	{ '{', "\317\200" },   		/* greek pi */
-	{ '|', "\342\211\240" },	/* not-equal */
-	{ '}', "\302\243" },		/* UK pound sign */
-	{ '~', "\302\267" }		/* bullet */
+	{ '+', ">" },	/* arrow pointing right */
+	{ ',', "<" },	/* arrow pointing left */
+	{ '-', "^" },	/* arrow pointing up */
+	{ '.', "." },	/* arrow pointing down */
+	{ '0', "#" },	/* solid square block */
+	{ '`', "#" },	/* diamond */
+	{ 'a', "#" },	/* checker board (stipple) */
+	{ 'f', "#" },	/* degree symbol */
+	{ 'g', "#" },	/* plus/minus */
+	{ 'h', "#" },	/* board of squares */
+	{ 'i', "#" },	/* lantern symbol */
+	{ 'j', "+" },	/* lower right corner */
+	{ 'k', "+" },	/* upper right corner */
+	{ 'l', "+" },	/* upper left corner */
+	{ 'm', "+" },	/* lower left corner */
+	{ 'n', "+" },	/* large plus or crossover */
+	{ 'o', "_" },	/* scan line 1 */
+	{ 'p', "_" },	/* scan line 3 */
+	{ 'q', "-" },	/* horizontal line */
+	{ 'r', "_" },	/* scan line 7 */
+	{ 's', "_" },	/* scan line 9 */
+	{ 't', "+" },	/* tee pointing right */
+	{ 'u', "+" },	/* tee pointing left */
+	{ 'v', "+" },	/* tee pointing up */
+	{ 'w', "+" },	/* tee pointing down */
+	{ 'x', "|" },	/* vertical line */
+	{ 'y', "#" },	/* less-than-or-equal-to */
+	{ 'z', "#" },	/* greater-than-or-equal-to */
+	{ '{', "#" },	/* greek pi */
+	{ '|', "#" },	/* not-equal */
+	{ '}', "#" },	/* UK pound sign */
+	{ '~', "*" }	/* bullet */
 };

 int
@@ -80,8 +80,8 @@
 {
 	struct tty_acs_entry *entry;

-	/* If not a UTF-8 terminal, use the ACS set. */
-	if (tty != NULL && !(tty->flags & TTY_UTF8)) {
+	/* If pane-border-ascii */
+	if ( options_get_number(global_s_options, "pane-border-ascii") != 0 ) {
 		if (tty->term->acs[ch][0] == '\0')
 			return (NULL);
 		return (&tty->term->acs[ch][0]);
--- a/tty.c
+++ b/tty.c
@@ -58,7 +58,7 @@
 void	tty_default_colours(struct grid_cell *, const struct window_pane *);

 #define tty_use_acs(tty) \
-	(tty_term_has((tty)->term, TTYC_ACSC) && !((tty)->flags & TTY_UTF8))
+	(tty_term_has((tty)->term, TTYC_ACSC) && (options_get_number(global_s_options, "pane-border-ascii") != 0 ))

 #define tty_pane_full_width(tty, ctx) \
 	((ctx)->xoff == 0 && screen_size_x((ctx)->wp->screen) >= (tty)->sx)

From: Youhei SASAKI <uwabami@gfd-dennou.org>
Date: Sat, 4 Feb 2017 03:30:21 +0900
Subject: Unse locale as en_US.UTF-8

Signed-off-by: Youhei SASAKI <uwabami@gfd-dennou.org>
---
 tmux.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

--- a/tmux.c
+++ b/tmux.c
@@ -188,13 +188,11 @@
 	const char	*s;
 	int		 opt, flags, keys;

-	if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL) {
-		if (setlocale(LC_CTYPE, "") == NULL)
-			errx(1, "invalid LC_ALL, LC_CTYPE or LANG");
-		s = nl_langinfo(CODESET);
-		if (strcasecmp(s, "UTF-8") != 0 && strcasecmp(s, "UTF8") != 0)
-			errx(1, "need UTF-8 locale (LC_CTYPE) but have %s", s);
-	}
+	if (setlocale(LC_CTYPE, "") == NULL)
+		errx(1, "invalid LC_ALL, LC_CTYPE or LANG");
+	s = nl_langinfo(CODESET);
+	if (strcasecmp(s, "UTF-8") != 0 && strcasecmp(s, "UTF8") != 0)
+		errx(1, "need UTF-8 locale (LC_CTYPE) but have %s", s);

 	setlocale(LC_TIME, "");
 	tzset();