*** empty log message ***

diff --git a/Changes b/Changes
index 5632cd033fcf9ae33b189d64c8cd5c5bf7ef1aa1..7e09613e38659f84963b35ea4c3e414b81058072 100644 (file)
--- a/Changes
+++ b/Changes
@@ -40,6 +40,8 @@ TODO: document searchable-scorllback hotkey
         - removed support for locale-specific app-defaults file.
         - fixed a bug where out-of-bounds colour sequences could lead
           to crashes.
+        - limit colour changing to the standard 88 palette instead of all
+          colours.
         - XTerm_Color01 sequence returned wrong results in query mode.
 
 6.3  Wed Jan  4 22:37:10 CET 2006

diff --git a/doc/rxvt.7.html b/doc/rxvt.7.html
index 70ae2df8f0737812d92e27d16ce237f1ce198cda..d2b26c50e62a767f8806cd8d7833c82a1c94b3a0 100644 (file)
--- a/doc/rxvt.7.html
+++ b/doc/rxvt.7.html
@@ -1908,8 +1908,8 @@ Set XTerm Parameters. 8-bit ST: 0x9c, 7-bit ST sequence: ESC \ (0x1b,
 <tr><td>Ps = 12</td><td>Change colour of text cursor foreground to Pt</td></tr>
 <tr><td>Ps = 13</td><td>Change colour of mouse foreground to Pt</td></tr>
 <tr><td>Ps = 17</td><td>Change colour of highlight characters to Pt</td></tr>
-<tr><td>Ps = 18</td><td>Change colour of bold characters to Pt</td></tr>
-<tr><td>Ps = 19</td><td>Change colour of underlined characters to Pt</td></tr>
+<tr><td>Ps = 18</td><td>Change colour of bold characters to Pt [deprecated, see 706]</td></tr>
+<tr><td>Ps = 19</td><td>Change colour of underlined characters to Pt [deprecated, see 707]</td></tr>
 <tr><td>Ps = 20</td><td>Change default background to Pt</td></tr>
 <tr><td>Ps = 39</td><td>Change default foreground colour to Pt.</td></tr>
 <tr><td>Ps = 46</td><td>Change Log File to Pt unimplemented</td></tr>
@@ -1920,6 +1920,8 @@ Set XTerm Parameters. 8-bit ST: 0x9c, 7-bit ST sequence: ESC \ (0x1b,
 <tr><td>Ps = 703</td><td>Menubar command Pt (Compile menubar).</td></tr>
 <tr><td>Ps = 704</td><td>Change colour of italic characters to Pt</td></tr>
 <tr><td>Ps = 705</td><td>Change background pixmap tint colour to Pt (Compile transparency).</td></tr>
+<tr><td>Ps = 706</td><td>Change colour of bold characters to Pt</td></tr>
+<tr><td>Ps = 707</td><td>Change colour of underlined characters to Pt</td></tr>
 <tr><td>Ps = 710</td><td>Set normal fontset to Pt. Same as Ps = 50.</td></tr>
 <tr><td>Ps = 711</td><td>Set bold fontset to Pt. Similar to Ps = 50 (Compile styles).</td></tr>
 <tr><td>Ps = 712</td><td>Set italic fontset to Pt. Similar to Ps = 50 (Compile styles).</td></tr>

diff --git a/doc/rxvt.7.man.in b/doc/rxvt.7.man.in
index 1cf40b26cb364849295bc8600eb262e0bf2a630e..6b85ead5f3a2e12e7a05d2e22c00df9efcb1f62f 100644 (file)
--- a/doc/rxvt.7.man.in
+++ b/doc/rxvt.7.man.in
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "rxvt 7"
-.TH rxvt 7 "2006-01-10" "6.3" "RXVT-UNICODE"
+.TH rxvt 7 "2006-01-11" "6.3" "RXVT-UNICODE"
 .SH "NAME"
 RXVT REFERENCE \- FAQ, command sequences and other background information
 .SH "SYNOPSIS"
@@ -1776,8 +1776,8 @@ Ps = 11   Change colour of text background to Pt (NB: may change in future)
 Ps = 12        Change colour of text cursor foreground to Pt
 Ps = 13        Change colour of mouse foreground to Pt
 Ps = 17        Change colour of highlight characters to Pt
-Ps = 18        Change colour of bold characters to Pt
-Ps = 19        Change colour of underlined characters to Pt
+Ps = 18        Change colour of bold characters to Pt [deprecated, see 706]
+Ps = 19        Change colour of underlined characters to Pt [deprecated, see 707]
 Ps = 20        Change default background to Pt
 Ps = 39        Change default foreground colour to Pt.
 Ps = 46        Change Log File to Pt unimplemented
@@ -1788,6 +1788,8 @@ Ps = 701  Change current locale to Pt, or, if Pt is ?, return the current locale
 Ps = 703       Menubar command Pt (Compile menubar).
 Ps = 704       Change colour of italic characters to Pt
 Ps = 705       Change background pixmap tint colour to Pt (Compile transparency).
+Ps = 706       Change colour of bold characters to Pt
+Ps = 707       Change colour of underlined characters to Pt
 Ps = 710       Set normal fontset to Pt. Same as Ps = 50.
 Ps = 711       Set bold fontset to Pt. Similar to Ps = 50 (Compile styles).
 Ps = 712       Set italic fontset to Pt. Similar to Ps = 50 (Compile styles).

diff --git a/doc/rxvt.7.pod b/doc/rxvt.7.pod
index 1731bb3a9449e3d6fcc0a20c110be5c73987b69b..d2e060e8bbca7fa1908088eb5b5cb5d3d12c74ce 100644 (file)
--- a/doc/rxvt.7.pod
+++ b/doc/rxvt.7.pod
@@ -1638,8 +1638,8 @@ B<octet> can be escaped by prefixing it with SYN (0x16, ^V).
        B<< C<Ps = 12> >>       Change colour of text cursor foreground to B<< C<Pt> >>
        B<< C<Ps = 13> >>       Change colour of mouse foreground to B<< C<Pt> >>
        B<< C<Ps = 17> >>       Change colour of highlight characters to B<< C<Pt> >>
-       B<< C<Ps = 18> >>       Change colour of bold characters to B<< C<Pt> >>
-       B<< C<Ps = 19> >>       Change colour of underlined characters to B<< C<Pt> >>
+       B<< C<Ps = 18> >>       Change colour of bold characters to B<< C<Pt> >> [deprecated, see 706]
+       B<< C<Ps = 19> >>       Change colour of underlined characters to B<< C<Pt> >> [deprecated, see 707]
        B<< C<Ps = 20> >>       Change default background to B<< C<Pt> >>
        B<< C<Ps = 39> >>       Change default foreground colour to B<< C<Pt> >>.
        B<< C<Ps = 46> >>       Change Log File to B<< C<Pt> >> I<unimplemented>
@@ -1650,6 +1650,8 @@ B<octet> can be escaped by prefixing it with SYN (0x16, ^V).
        B<< C<Ps = 703> >>      Menubar command B<< C<Pt> >> (Compile menubar).
        B<< C<Ps = 704> >>      Change colour of italic characters to B<< C<Pt> >>
        B<< C<Ps = 705> >>      Change background pixmap tint colour to B<< C<Pt> >> (Compile transparency).
+       B<< C<Ps = 706> >>      Change colour of bold characters to B<< C<Pt> >>
+       B<< C<Ps = 707> >>      Change colour of underlined characters to B<< C<Pt> >>
        B<< C<Ps = 710> >>      Set normal fontset to B<< C<Pt> >>. Same as C<Ps = 50>.
        B<< C<Ps = 711> >>      Set bold fontset to B<< C<Pt> >>. Similar to C<Ps = 50> (Compile styles).
        B<< C<Ps = 712> >>      Set italic fontset to B<< C<Pt> >>. Similar to C<Ps = 50> (Compile styles).

diff --git a/doc/rxvt.7.txt b/doc/rxvt.7.txt
index 054b02e26dd589bf462b8851ec4b621c456ab9c0..df1e945287f3b85d979d6829455ac22752892364 100644 (file)
--- a/doc/rxvt.7.txt
+++ b/doc/rxvt.7.txt
@@ -1309,8 +1309,8 @@ XTerm Operating System Commands
            Ps = 12         Change colour of text cursor foreground to Pt 
            Ps = 13         Change colour of mouse foreground to Pt 
            Ps = 17         Change colour of highlight characters to Pt 
-           Ps = 18         Change colour of bold characters to Pt 
-           Ps = 19         Change colour of underlined characters to Pt 
+           Ps = 18         Change colour of bold characters to Pt [deprecated, see 706] 
+           Ps = 19         Change colour of underlined characters to Pt [deprecated, see 707] 
            Ps = 20         Change default background to Pt 
            Ps = 39         Change default foreground colour to Pt. 
            Ps = 46         Change Log File to Pt unimplemented 
@@ -1321,6 +1321,8 @@ XTerm Operating System Commands
            Ps = 703        Menubar command Pt (Compile menubar). 
            Ps = 704        Change colour of italic characters to Pt 
            Ps = 705        Change background pixmap tint colour to Pt (Compile transparency). 
+           Ps = 706        Change colour of bold characters to Pt 
+           Ps = 707        Change colour of underlined characters to Pt 
            Ps = 710        Set normal fontset to Pt. Same as Ps = 50. 
            Ps = 711        Set bold fontset to Pt. Similar to Ps = 50 (Compile styles). 
            Ps = 712        Set italic fontset to Pt. Similar to Ps = 50 (Compile styles). 

diff --git a/src/command.C b/src/command.C
index e5692203df07637b5ed05a46e62bf0b5adfa9307..6854f6dfa8d1def2a03796ec2506305eb599b5fb 100644 (file)
--- a/src/command.C
+++ b/src/command.C
@@ -3862,7 +3862,7 @@ rxvt_term::process_xterm_seq (int op, const char *str, char resp)
             *name++ = '\0';
             color = atoi (buf) + minCOLOR;
 
-            if (!IN_RANGE_EXC (color, minCOLOR, TOTAL_COLORS))
+            if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
               break;
 
             if ((buf = strchr (name, ';')) != NULL)
@@ -3896,15 +3896,17 @@ rxvt_term::process_xterm_seq (int op, const char *str, char resp)
         process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
         break;
 #ifndef NO_BOLD_UNDERLINE_REVERSE
-      case XTerm_Color_BD:
-        process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
-        break;
-      case XTerm_Color_UL:
-        process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
-        break;
       case XTerm_Color_RV:
         process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
         break;
+      case Rxvt_Color_BD:
+      case URxvt_Color_BD:
+        process_color_seq (op, Color_BD, str, resp);
+        break;
+      case Rxvt_Color_UL:
+      case URxvt_Color_UL:
+        process_color_seq (op, Color_UL, str, resp);
+        break;
       case URxvt_Color_IT:
         process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
         break;
@@ -3918,7 +3920,7 @@ rxvt_term::process_xterm_seq (int op, const char *str, char resp)
         break;
 #endif
 
-      case XTerm_Pixmap:
+      case Rxvt_Pixmap:
         if (*str != ';')
           {
 #if XPM_BACKGROUND
@@ -3945,10 +3947,10 @@ rxvt_term::process_xterm_seq (int op, const char *str, char resp)
           }
         break;
 
-      case XTerm_restoreFG:
+      case Rxvt_restoreFG:
         set_window_color (Color_fg, str);
         break;
-      case XTerm_restoreBG:
+      case Rxvt_restoreBG:
         set_window_color (Color_bg, str);
         break;
 
@@ -3963,7 +3965,7 @@ rxvt_term::process_xterm_seq (int op, const char *str, char resp)
        break;
 #endif
 #if 0
-      case XTerm_dumpscreen:   /* no error notices */
+      case Rxvt_dumpscreen:    /* no error notices */
         {
           int fd;
           if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)

diff --git a/src/menubar.C b/src/menubar.C
index d580ced19f7f878f19c21c800527353e7398e0ba..f4621b94ecc37c14b71427ae6c6419fc18330575 100644 (file)
--- a/src/menubar.C
+++ b/src/menubar.C
@@ -1709,7 +1709,7 @@ rxvt_term::menubar_dispatch (char *str)
             else if ((n = rxvt_Str_match (str, "pixmap:")) != 0)
               {
                 str += n;
-                process_xterm_seq (XTerm_Pixmap, str, CHAR_ST);
+                process_xterm_seq (Rxvt_Pixmap, str, CHAR_ST);
               }
 #if (MENUBAR_MAX > 1)
             else if ((n = rxvt_Str_match (str, "rm")) != 0)

diff --git a/src/rxvt.h b/src/rxvt.h
index 33f5109c7a9154ffd30d2ae7402c4a0711094d01..18c02c445fc1827f1c6cc521c3e4ae883e5d669d 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -436,10 +436,10 @@ enum {
   XTerm_Color00          = 10,      // not implemented, CLASH!
   XTerm_Color01          = 11,      // not implemented
   XTerm_Color_cursor     = 12,      // change actual 'Cursor' color
-  XTerm_Color_pointer_fg = 13,      // change actual 'Pointer' color
-  XTerm_Color_pointer_bg = 14,      // not implemented
-  XTerm_Color05          = 15,      // not implemented
-  XTerm_Color06          = 16,      // not implemented
+  XTerm_Color_pointer_fg = 13,      // change actual 'Pointer' fg color
+  XTerm_Color_pointer_bg = 14,      // change actual 'Pointer' bg color
+  XTerm_Color05          = 15,      // not implemented (tektronix fg)
+  XTerm_Color06          = 16,      // not implemented (tektronix bg)
   XTerm_Color_RV         = 17,      // change actual 'Highlight' color
   XTerm_logfile          = 46,      // not implemented
   XTerm_font             = 50,
@@ -449,18 +449,21 @@ enum {
   XTerm_emacs51          = 51,      // reserved for emacs shell
   /*
    * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
+   * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
    */
-  XTerm_Color_BD         = 18,      // change actual 'Bold' color
-  XTerm_Color_UL         = 19,      // change actual 'Underline' color
-  XTerm_Pixmap           = 20,      // new bg pixmap
-  XTerm_restoreFG        = 39,      // change default fg color
-  XTerm_restoreBG        = 49,      // change default bg color
-  XTerm_dumpscreen       = 55,      // dump scrollback and all of screen
+  Rxvt_Color_BD          = 18,      // change actual 'Bold' color
+  Rxvt_Color_UL          = 19,      // change actual 'Underline' color
+  Rxvt_Pixmap            = 20,      // new bg pixmap
+  Rxvt_restoreFG         = 39,      // change default fg color
+  Rxvt_restoreBG         = 49,      // change default bg color
+  Rxvt_dumpscreen        = 55,      // dump scrollback and all of screen
 
   URxvt_locale           = 701,     // change locale
   URxvt_Menu             = 703,     // set menu item
   URxvt_Color_IT         = 704,     // change actual 'Italic' colour
   URxvt_Color_tint       = 705,     // change actual tint colour
+  URxvt_Color_BD         = 706,
+  URxvt_Color_UL         = 707,
 
   URxvt_font             = 710,
   URxvt_boldFont         = 711,