*** empty log message ***

diff --git a/Changes b/Changes
index 2a75818af3a44e705d8a682fbdfc2266fc748ab9..db885b9813f505f801400985bb115924364525f2 100644 (file)
--- a/Changes
+++ b/Changes
@@ -14,6 +14,8 @@ DUMB: support tex fonts
 
        - SYNCCVS: updated to rxvt-cvs 2006-01-28, no relevant changes.
         - fix version report (DA) (which was unfortunately broken).
+        - changed version number report again, now to emulate xterm.
+        - added the OSC sequence 702 to detect the urxvt version number.
 
 7.4  Sat Jan 28 15:26:27 CET 2006
        - screen background wasn't always erased properly when scrolling,

diff --git a/doc/rxvt.7.pod b/doc/rxvt.7.pod
index 65d7bdec713767e8f87ff1ff90dda788c17be1bf..87350814bf5122679a21b5c54dde9b913e340961 100644 (file)
--- a/doc/rxvt.7.pod
+++ b/doc/rxvt.7.pod
@@ -144,12 +144,19 @@ except maybe libX11 :)
 
 =item Does it support tabs, can I have a tabbed rxvt-unicode?
 
-rxvt-unicode does not directly support tabs. It will work fine with
-tabbing functionality of many window managers or similar tabbing programs,
-and its embedding-features allow it to be embedded into other programs,
-as witnessed by F<doc/rxvt-tabbed> or the upcoming C<Gtk2::URxvt> perl
-module, which features a tabbed urxvt (murxvt) terminal as an example
-embedding application.
+Beginning with version 7.3, there is a perl extension that implements a
+simple tabbed terminal. It is installed by default, so any of these should
+give you tabs:
+
+   @@RXVT_NAME@@ -pe tabbed
+
+   URxvt.perl-ext-common: default,tabbed
+
+It will also work fine with tabbing functionality of many window managers
+or similar tabbing programs, and its embedding-features allow it to be
+embedded into other programs, as witnessed by F<doc/rxvt-tabbed> or
+the upcoming C<Gtk2::URxvt> perl module, which features a tabbed urxvt
+(murxvt) terminal as an example embedding application.
 
 =item How do I know which rxvt-unicode version I'm using?
 
@@ -1677,6 +1684,7 @@ B<octet> can be escaped by prefixing it with SYN (0x16, ^V).
        B<< C<Ps = 50> >>       Set fontset to B<< C<Pt> >>, with the following special values of B<< C<Pt> >> (B<rxvt>) B<< C<#+n> >> change up B<< C<n> >> B<< C<#-n> >> change down B<< C<n> >> if B<< C<n> >> is missing of 0, a value of 1 is used I<empty> change to font0 B<< C<n> >> change to font B<< C<n> >>
        B<< C<Ps = 55> >>       Log all scrollback buffer and all of screen to B<< C<Pt> >>
        B<< C<Ps = 701> >>      Change current locale to B<< C<Pt> >>, or, if B<< C<Pt> >> is B<< C<?> >>, return the current locale (Compile frills).
+       B<< C<Ps = 702> >>      Request version if B<< C<Pt> >> is B<< C<?> >>, returning C<rxvt-unicode>, the resource name, the major and minor version numbers, e.g. C<ESC ] 702 ; rxvt-unicode ; urxvt ; 7 ; 4 ST>.
        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> >>

diff --git a/src/command.C b/src/command.C
index 364e9d4446dd0dd8d435ca1d8b1436f9b5ce21c0..20efd608e4b6e8f041d93a853ea7bbbf2f7dc624 100644 (file)
--- a/src/command.C
+++ b/src/command.C
@@ -3280,13 +3280,13 @@ rxvt_term::process_csi_seq ()
             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[2]);
+                tt_printf ("\033[>%d;94;0c", 'U');
               }
             break;
           case '?':
@@ -3932,6 +3932,15 @@ rxvt_term::process_xterm_seq (int op, const char *str, char resp)
           }
         break;
 
+      case URxvt_version:
+        if (query)
+          tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
+                     URxvt_version,
+                     rs[Rs_name],
+                     VERSION[0], VERSION[2],
+                     resp);
+        break;
+
 #if ENABLE_FRILLS
       case URxvt_locale:
         if (query)

diff --git a/src/rxvt.h b/src/rxvt.h
index b215f4f837c2d60d1f0c6969651eae1de841838e..7156ff66edad2573fecbd07f82afec73792a4e78 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -512,6 +512,7 @@ enum {
   Rxvt_dumpscreen        = 55,      // dump scrollback and all of screen
 
   URxvt_locale           = 701,     // change locale
+  URxvt_version          = 702,     // request version
 
   URxvt_Color_IT         = 704,     // change actual 'Italic' colour
   URxvt_Color_tint       = 705,     // change actual tint colour