[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.560 by sf-exg, Mon Nov 24 21:46:04 2014 UTC vs.
Revision 1.572 by sf-exg, Thu Jun 30 12:50:36 2016 UTC

  * Copyright (c) 1998      Alfredo K. Kojima <kojima@windowmaker.org>
  * Copyright (c) 2001      Marius Gedminas
  *				- Ctrl/Mod4+Tab works like Meta+Tab (options)
  * Copyright (c) 2003      Rob McMullen <robm@flipturn.org>
  * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
- * Copyright (c) 2007      Emanuele Giaquinta <e.giaquinta@glauco.it>
+ * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
 #ifdef CURSOR_BLINK
 void
 rxvt_term::cursor_blink_reset ()
 {
+  if (!focus)
+    return;
   if (hidden_cursor)
     {
       hidden_cursor = 0;
       want_refresh = 1;
     }
-  if (option (Opt_cursorBlink))
+  if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
     cursor_blink_ev.again ();
   else
     cursor_blink_ev.stop ();
 }
 void ecb_cold
 rxvt_term::pointer_unblank ()
 {
   XDefineCursor (dpy, vt, TermWin_cursor);
-  recolour_cursor ();
+  recolor_cursor ();
 #ifdef POINTER_BLANK
   hidden_pointer = 0;
   if (option (Opt_pointerBlank))
       case MotionNotify:
 #ifdef POINTER_BLANK
         if (hidden_pointer)
           pointer_unblank ();
 #endif
+        if (!bypass_keystate
-        if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
+            && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
-            || priv_modes & PrivMode_MouseAnyEvent)
+                || priv_modes & PrivMode_MouseAnyEvent))
           mouse_report (ev.xbutton);
         if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
           break;
         if (ev.xany.window == vt)
                                &unused_root_x, &unused_root_y,
                                &ev.xbutton.x, &ev.xbutton.y,
                                &ev.xbutton.state);
 #ifdef MOUSE_THRESHOLD
                 /* deal with a `jumpy' mouse */
-                if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
+                if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
+#endif
                   {
-#endif
 #if ISO_14755
                     // 5.4
                     if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
                       {
                         iso14755_54 (ev.xbutton.x, ev.xbutton.y);
                          * shouldn't be scrolling
                          */
                         sel_scroll_ev.stop();
                       }
 #endif
-#ifdef MOUSE_THRESHOLD
                   }
-#endif
               }
           }
         else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
           {
             while (XCheckTypedWindowEvent (dpy, scrollBar.win,
 #endif
 #if OFF_FOCUS_FADING
       if (rs[Rs_fade])
         {
           pix_colors = pix_colors_focused;
-          scr_recolour ();
+          scr_recolor ();
         }
 #endif
 #if ENABLE_FRILLS
       if (option (Opt_urgentOnBell))
         set_urgency (0);
+      if (priv_modes & PrivMode_FocusEvent)
+        tt_printf ("\x1b[I");
 #endif
       HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
     }
 }
       want_refresh = 1;
 #if ENABLE_FRILLS
       if (option (Opt_urgentOnBell))
         set_urgency (0);
+      if (priv_modes & PrivMode_FocusEvent)
+        tt_printf ("\x1b[O");
 #endif
 #if ENABLE_FRILLS || ISO_14755
       if (iso14755buf)
         {
           iso14755buf = 0;
 #endif
 #if OFF_FOCUS_FADING
       if (rs[Rs_fade])
         {
           pix_colors = pix_colors_unfocused;
-          scr_recolour ();
+          scr_recolor ();
         }
 #endif
       HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
     }
 }
 void ecb_cold
-rxvt_term::update_fade_color (unsigned int idx)
+rxvt_term::update_fade_color (unsigned int idx, bool first_time)
 {
 #if OFF_FOCUS_FADING
   if (rs[Rs_fade])
     {
+      if (!first_time)
+        pix_colors_focused [idx].free (this);
       rgba c;
       pix_colors [Color_fade].get (c);
       pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
     }
 #endif
           free (s);
         }
     }
 }
+static unsigned int
+colorcube_index (unsigned int idx_r,
+                 unsigned int idx_g,
+                 unsigned int idx_b)
+{
+  assert (idx_r < Red_levels);
+  assert (idx_g < Green_levels);
+  assert (idx_b < Blue_levels);
+  return idx_r * Blue_levels * Green_levels +
+         idx_g * Blue_levels +
+         idx_b;
+}
+/*
+ * Find the nearest color slot in the hidden color cube,
+ * adapt its value to the 24bit RGB color.
+ */
+unsigned int
+rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b)
+{
+  r &= 0xff;
+  g &= 0xff;
+  b &= 0xff;
+  unsigned int color = (r << 16) | (g << 8) | b;
+  unsigned int idx_r = r / (0xff / (Red_levels - 1));
+  unsigned int idx_g = g / (0xff / (Green_levels - 1));
+  unsigned int idx_b = b / (0xff / (Blue_levels - 1));
+  unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
+  // minor issue: could update idx 0 few more times
+  if (rgb24_seqno[idx] == 0
+      && rgb24_color[idx] == 0)
+    goto update;
+  if (rgb24_color[idx] == color)
+    return idx + minTermCOLOR24;
+  for (int i = idx_r - 1; i <= (signed) idx_r + 1; i++)
+    {
+      if (!IN_RANGE_EXC (i, 0, Red_levels))
+        continue;
+      for (int j = idx_g - 1; j <= (signed) idx_g + 1; j++)
+        {
+          if (!IN_RANGE_EXC (j, 0, Green_levels))
+            continue;
+          for (int k = idx_b - 1; k <= (signed) idx_b + 1; k++)
+            {
+              if (!IN_RANGE_EXC (k, 0, Blue_levels))
+                continue;
+              unsigned int index = colorcube_index (i, j, k);
+              // minor issue: could update index 0 few more times
+              if (rgb24_seqno[index] == 0
+                  && rgb24_color[index] == 0)
+                {
+                  idx = index;
+                  goto update;
+                }
+              if (rgb24_color[index] == color)
+                return index + minTermCOLOR24;
+              // like (rgb24_seqno[idx] > rgb24_seqno[index])
+              // but also handles wrap around values good enough
+              if ((uint16_t) (rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
+                idx = index;
+            }
+        }
+    }
+update:
+  rgb24_color[idx] = color;
+  rgb24_seqno[idx] = ++rgb24_sequence;
+  idx += minTermCOLOR24;
+  pix_colors_focused [idx].free (this);
+  pix_colors_focused [idx].set (this, rgba (r * 0x0101,
+                                            g * 0x0101,
+                                            b * 0x0101));
+  update_fade_color (idx, false);
+  return idx;
+}
 void
 rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
 {
   if (str[0] == '?' && !str[1])
     {
       rgba c;
       pix_colors_focused[color].get (c);
 #if XFT
       if (c.a != rgba::MAX_CC)
-        tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
+        tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
       else
 #endif
         tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
     }
   else
 #endif
                   { 1000, PrivMode_MouseX11 },
                   { 1002, PrivMode_MouseBtnEvent },
                   { 1003, PrivMode_MouseAnyEvent },
 #if ENABLE_FRILLS
+                  { 1004, PrivMode_FocusEvent },
                   { 1005, PrivMode_ExtModeMouse },
 #endif
                   { 1010, PrivMode_TtyOutputInh }, // rxvt extension
                   { 1011, PrivMode_Keypress }, // rxvt extension
 #if ENABLE_FRILLS
               scr_touch (true);
               break;
 #endif
 #ifdef CURSOR_BLINK
             case 12:
-              set_option (Opt_cursorBlink, state);
               cursor_blink_reset ();
               break;
 #endif
             case 25:		/* visible/invisible cursor */
               scr_cursor_visible (state);
           //case 19: // ninth alt font
           //case 20: // gothic
           case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
             rendset = 0, rendstyle = RS_Bold;
             break;
-          case 22: // normal intensity
+          case 22: // bold off (vt220)
             rendset = 0, rendstyle = RS_Bold;
             break;
           case 23: // disable italic
             rendset = 0, rendstyle = RS_Italic;
             break;
-          case 24:
+          case 24: // underline off (vt220)
             rendset = 0, rendstyle = RS_Uline;
             break;
-          case 25:
+          case 25: // blink off (vt220)
             rendset = 0, rendstyle = RS_Blink;
             break;
           case 26: // variable spacing (iso 8613)
             rendset = 0, rendstyle = RS_Blink;
             break;
-          case 27:
+          case 27: // reverse off (vt220)
             rendset = 0, rendstyle = RS_RVid;
             break;
           //case 28: // visible. NYI
           //case 29: // not crossed-out
         }
             if (nargs > i + 2 && arg[i + 1] == 5)
               {
                 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
                 i += 2;
               }
+            else if (nargs > i + 4 && arg[i + 1] == 2)
+              {
+                unsigned int r = arg[i + 2];
+                unsigned int g = arg[i + 3];
+                unsigned int b = arg[i + 4];
+                unsigned int idx = map_rgb24_color (r, g, b);
+                scr_color (idx, Color_fg);
+                i += 4;
+              }
             break;
           case 39:		/* default fg */
             scr_color (Color_fg, Color_fg);
             break;
           case 48: // set bg color, ISO 8613-6
             if (nargs > i + 2 && arg[i + 1] == 5)
               {
                 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
                 i += 2;
+              }
+            else if (nargs > i + 4 && arg[i + 1] == 2)
+              {
+                unsigned int r = arg[i + 2];
+                unsigned int g = arg[i + 3];
+                unsigned int b = arg[i + 4];
+                unsigned int idx = map_rgb24_color (r, g, b);
+                scr_color (idx, Color_bg);
+                i += 4;
               }
             break;
           case 49:		/* default bg */
             scr_color (Color_bg, Color_bg);
             break;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.560 by sf-exg, Mon Nov 24 21:46:04 2014 UTC vs. Revision 1.572 by sf-exg, Thu Jun 30 12:50:36 2016 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.560 by sf-exg, Mon Nov 24 21:46:04 2014 UTC vs.
Revision 1.572 by sf-exg, Thu Jun 30 12:50:36 2016 UTC