--- rxvt-unicode/src/command.C	2010/10/22 16:49:26	1.456
+++ rxvt-unicode/src/command.C	2010/12/14 08:01:51	1.464
@@ -891,7 +891,7 @@
             return;
           }
 
-        for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
+        for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
           if (i[0] == keysym)
             {
               iso14755buf = ISO_14755_51 | i[1];
@@ -977,8 +977,9 @@
   flush_ev.stop ();
 
 #ifdef HAVE_BG_PIXMAP
-  if (bgPixmap.check_clearChanged ())
+  if (bgPixmap.flags & bgPixmap_t::hasChanged)
     {
+      bgPixmap.flags &= ~bgPixmap_t::hasChanged;
 //      scr_clear (true); This needs to be researched further!
       scr_touch (false);
     }
@@ -1253,12 +1254,14 @@
   int x, y;
   int code = 32;
 
-  x = Pixel2Col (ev.x);
-  y = Pixel2Row (ev.y);
+  x = Pixel2Col (ev.x) + 1;
+  y = Pixel2Row (ev.y) + 1;
+
   if (ev.type == MotionNotify)
     {
       if (x == mouse_row && y == mouse_col)
         return;
+
       mouse_row = x;
       mouse_col = y;
       code += 32;
@@ -1271,7 +1274,7 @@
       button_number = MEvent.button - Button1;
       /* add 0x3D for wheel events, like xterm does */
       if (button_number >= 3)
-        button_number += (64 - 3);
+        button_number += 64 - 3;
     }
 
   if (priv_modes & PrivMode_MouseX10)
@@ -1313,14 +1316,27 @@
     fputc ('2', stderr);
   fprintf (stderr, "]: <%d>, %d/%d\n",
           button_number,
-          x + 1,
-          y + 1);
+          x,
+          y);
 #endif
 
-  tt_printf ("\033[M%c%c%c",
-            (code + button_number + key_state),
-            (32 + x + 1),
-            (32 + y + 1));
+#if ENABLE_FRILLS
+  if (priv_modes & PrivMode_ExtMouseRight)
+    tt_printf ("\033[%d;%d;%dM",
+              code + button_number + key_state,
+              x,
+              y);
+  else if (priv_modes & PrivMode_ExtModeMouse)
+    tt_printf ("\033[M%c%lc%lc",
+              code + button_number + key_state,
+              wint_t (32 + x),
+              wint_t (32 + y));
+  else
+#endif
+    tt_printf ("\033[M%c%c%c",
+              code + button_number + key_state,
+              32 + x,
+              32 + y);
 }
 
 /*{{{ process an X event */
@@ -1437,6 +1453,25 @@
             while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
               ;
 
+#ifdef HAVE_BG_PIXMAP
+            bool moved = false;
+            if (bgPixmap.window_position_sensitive ())
+              {
+                int x, y;
+                if (ev.xconfigure.send_event)
+                  {
+                    x = ev.xconfigure.x;
+                    y = ev.xconfigure.y;
+                  }
+                else
+                  get_window_origin (x, y);
+
+                if (bgPixmap.set_position (x, y)
+                    || (bgPixmap.flags & bgPixmap_t::isInvalid))
+                  moved = true;
+              }
+#endif
+
             if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
               {
                 seen_resize = 1;
@@ -1445,7 +1480,7 @@
             else
               {
 #ifdef HAVE_BG_PIXMAP
-                if (bgPixmap.window_position_sensitive ())
+                if (moved)
                   {
                     if (mapped)
                       update_background ();
@@ -2747,7 +2782,7 @@
 #define get_byte_array_bit(array, bit)				\
     (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
 
-const unsigned char csi_defaults[] =
+static const unsigned char csi_defaults[] =
   {
     make_byte (1,1,1,1,1,1,1,1),	/* @, A, B, C, D, E, F, G, */
     make_byte (1,1,0,0,1,1,0,0),	/* H, I, J, K, L, M, N, O, */
@@ -2846,7 +2881,7 @@
                 scr_soft_reset ();
 
                 static const int pm_h[] = { 7, 25 };
-                static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
+                static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
 
                 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
                 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
@@ -3449,25 +3484,33 @@
 
             if (*str != ';')
               {
-                /* reset to default scaling :*/
-                bgPixmap.unset_geometry ();
                 if (bgPixmap.set_file (str))	/* change pixmap */
-                  changed++;
-                str = strchr (str, ';');
-                if (str == NULL)
-                  bgPixmap.set_defaultGeometry ();
+                  {
+                    changed++;
+                    str = strchr (str, ';');
+                    if (str == NULL)
+                      bgPixmap.set_defaultGeometry ();
+                    else
+                      bgPixmap.set_geometry (str+1);
+                  }
               }
-
-            while (str)
+            else
               {
                 str++;
-                if (bgPixmap.set_geometry (str))
+                if (bgPixmap.set_geometry (str, true))
                   changed++;
-                str = strchr (str, ';');
               }
 
             if (changed)
-              update_background ();
+              {
+                if (bgPixmap.window_position_sensitive ())
+                  {
+                    int x, y;
+                    get_window_origin (x, y);
+                    bgPixmap.set_position (x, y);
+                  }
+                update_background ();
+              }
           }
         break;
 #endif
@@ -3628,13 +3671,19 @@
                   { 1000, PrivMode_MouseX11 },
                   { 1002, PrivMode_MouseBtnEvent },
                   { 1003, PrivMode_MouseAnyEvent },
+#if ENABLE_FRILLS
+                  { 1005, PrivMode_ExtModeMouse },
+#endif
                   { 1010, PrivMode_TtyOutputInh }, // rxvt extension
                   { 1011, PrivMode_Keypress }, // rxvt extension
+#if ENABLE_FRILLS
+                  { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
+#endif
                  // 1035 enable modifiers for alt, numlock NYI
                  // 1036 send ESC for meta keys NYI
                  // 1037 send DEL for keypad delete NYI
                   { 1047, PrivMode_Screen },
-                 // 1048 save and restore cursor
+                 // 1048 save and restore cursor, implemented in code
                   { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
                  // 1051, 1052, 1060, 1061 keyboard emulation NYI
                   { 2004, PrivMode_BracketPaste },
@@ -3742,6 +3791,7 @@
                 {
                   priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
                   priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
+                  mouse_row = mouse_col = 0;
                   vt_emask_mouse = PointerMotionMask;
                 }
               else
@@ -3977,7 +4027,7 @@
 /* Write data to the pty as typed by the user, pasted with the mouse,
  * or generated by us in response to a query ESC sequence.
  */
-const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
+static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
 
 void
 rxvt_term::tt_write (const char *data, unsigned int len)