--- rxvt-unicode/src/command.C	2015/09/12 19:48:26	1.567
+++ rxvt-unicode/src/command.C	2016/06/30 17:02:22	1.578
@@ -28,7 +28,7 @@
  *				- 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
@@ -1789,6 +1789,9 @@
 #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));
@@ -1806,6 +1809,9 @@
 #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)
@@ -3330,6 +3336,92 @@
     }
 }
 
+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 * (Red_levels   - 1) / 0xff;
+  unsigned int idx_g = g * (Green_levels - 1) / 0xff;
+  unsigned int idx_b = b * (Blue_levels  - 1) / 0xff;
+  unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
+
+  /* we allow one of the 6 directly neighbouring colours */
+  /* to replace the current color, if they not used recently */
+  static const signed char dxyz[][3] = {
+     0,  0,  0,
+     0,  0, +1,
+     0,  0, -1,
+     0, +1,  0,
+     0, -1,  0,
+    +1,  0,  0,
+    -1,  0,  0,
+  };
+
+  for (int n = 0; n < ecb_array_length (dxyz); ++n)
+    {
+      int r = idx_r + dxyz[n][0];
+      int g = idx_r + dxyz[n][1];
+      int b = idx_r + dxyz[n][2];
+
+      if (!IN_RANGE_EXC (r, 0, Red_levels  )) continue;
+      if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
+      if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
+
+      unsigned int index = colorcube_index (r, g, b);
+
+      if (rgb24_color[index] == color)
+        {
+          rgb24_seqno[idx] = ++rgb24_sequence;
+          return index + minTermCOLOR24;
+        }
+
+      // minor issue: could update index 0 few more times
+      if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
+        {
+          idx = index;
+          goto update;
+        }
+
+      // 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)
 {
@@ -3709,6 +3801,7 @@
                   { 1002, PrivMode_MouseBtnEvent },
                   { 1003, PrivMode_MouseAnyEvent },
 #if ENABLE_FRILLS
+                  { 1004, PrivMode_FocusEvent },
                   { 1005, PrivMode_ExtModeMouse },
 #endif
                   { 1010, PrivMode_TtyOutputInh }, // rxvt extension
@@ -3971,6 +4064,15 @@
                 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);
@@ -3992,6 +4094,15 @@
                 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);