--- rxvt-unicode/src/command.C	2006/01/25 21:03:04	1.285
+++ rxvt-unicode/src/command.C	2006/01/29 21:45:47	1.292
@@ -1166,7 +1166,7 @@
 void
 rxvt_term::pointer_unblank ()
 {
-  XDefineCursor (display->display, vt, TermWin_cursor);
+  XDefineCursor (xdisp, vt, TermWin_cursor);
   recolour_cursor ();
 
 #ifdef POINTER_BLANK
@@ -1184,8 +1184,8 @@
   if (!OPTION (Opt_pointerBlank))
     return;
 
-  XDefineCursor (display->display, vt, display->blank_cursor);
-  XFlush (display->display);
+  XDefineCursor (xdisp, vt, display->blank_cursor);
+  XFlush (xdisp);
 
   hidden_pointer = 1;
 }
@@ -2533,12 +2533,12 @@
 #if TINTING
           if (ISSET_PIXCOLOR (Color_tint))
             {
-              unsigned short rm, gm, bm;
+              rxvt_rgba c;
               int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
 
-              pix_colors_focused[Color_tint].get (this, rm, gm, bm);
+              pix_colors_focused[Color_tint].get (this, c);
 
-              ShadeXImage (this, image, shade, rm, gm, bm);
+              ShadeXImage (this, image, shade, c.r, c.g, c.b);
             }
 #endif
 
@@ -3280,13 +3280,13 @@
             if (ch == CSI_DA)	/* secondary device attributes */
               {
                 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
-                // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.
+                // 'U' for rxvt-unicode != 7.[34] (where it was broken).
                 //
                 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
                 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
                 // that we do not support xterm mouse reporting (should be 95 when we do).
                 //
-                tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);
+                tt_printf ("\033[>%d;94;0c", 'U');
               }
             break;
           case '?':
@@ -3716,9 +3716,15 @@
 {
   if (str[0] == '?' && !str[1])
     {
-      unsigned short r, g, b;
-      pix_colors_focused[color].get (this, r, g, b);
-      tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
+      rxvt_rgba c;
+      pix_colors_focused[color].get (this, c);
+
+#if XFT
+      if (c.a != rxvt_rgba::MAX_CC)
+        tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
+      else
+#endif
+        tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
     }
   else
     set_window_color (color, str);
@@ -3769,7 +3775,7 @@
                 && actual_format == 8)
               str = (const char *)(value);
 
-            tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
+            tt_printf ("\033]%d;%s%c", op, str, resp);
 
             XFree (value);
           }
@@ -3803,36 +3809,29 @@
             if ((buf = strchr (name, ';')) != NULL)
               *buf++ = '\0';
 
-            if (name[0] == '?' && !name[1])
-              {
-                unsigned short r, g, b;
-                pix_colors_focused[color].get (this, r, g, b);
-                tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
-              }
-            else
-              set_window_color (color, name);
+            process_color_seq (op, color, name, resp);
           }
         break;
       case XTerm_Color00:
-        process_color_seq (XTerm_Color00, Color_fg, str, resp);
+        process_color_seq (op, Color_fg, str, resp);
         break;
       case XTerm_Color01:
-        process_color_seq (XTerm_Color01, Color_bg, str, resp);
+        process_color_seq (op, Color_bg, str, resp);
         break;
 #ifndef NO_CURSORCOLOR
       case XTerm_Color_cursor:
-        process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
+        process_color_seq (op, Color_cursor, str, resp);
         break;
 #endif
       case XTerm_Color_pointer_fg:
-        process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
+        process_color_seq (op, Color_pointer_fg, str, resp);
         break;
       case XTerm_Color_pointer_bg:
-        process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
+        process_color_seq (op, Color_pointer_bg, str, resp);
         break;
 #ifndef NO_BOLD_UNDERLINE_REVERSE
       case XTerm_Color_RV:
-        process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
+        process_color_seq (op, Color_RV, str, resp);
         break;
       case Rxvt_Color_BD:
       case URxvt_Color_BD:
@@ -3843,12 +3842,12 @@
         process_color_seq (op, Color_UL, str, resp);
         break;
       case URxvt_Color_IT:
-        process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
+        process_color_seq (op, Color_IT, str, resp);
         break;
 #endif
 #if TRANSPARENT && TINTING
       case URxvt_Color_tint:
-        process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
+        process_color_seq (op, Color_tint, str, resp);
         check_our_parents ();
         if (am_transparent)
           want_full_refresh = want_refresh = 1;
@@ -3932,10 +3931,18 @@
           }
         break;
 
+      case URxvt_version:
+        if (query)
+          tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
+                     op,
+                     rs[Rs_name], VERSION[0], VERSION[2],
+                     resp);
+        break;
+
 #if ENABLE_FRILLS
       case URxvt_locale:
         if (query)
-          tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
+          tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
         else
           {
             set_locale (str);