From 36330578e274c81f5116ba9949c30a35fddad2a9 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 29 Jul 2004 22:30:28 +0000 Subject: [PATCH] *** empty log message *** --- doc/rxvt.1 | 46 +++++++++++++++++++++++----------------------- doc/rxvt.tbl | 46 +++++++++++++++++++++++----------------------- src/rxvtcolor.C | 3 ++- 3 files changed, 48 insertions(+), 47 deletions(-) diff --git a/doc/rxvt.1 b/doc/rxvt.1 index 330c12f1..cbcba072 100644 --- a/doc/rxvt.1 +++ b/doc/rxvt.1 @@ -1,17 +1,17 @@ .if !\n(.g .ab GNU tbl requires GNU troff. .if !dTS .ds TS .if !dTE .ds TE -.TH "RXVT" "1" "2004-06-26" "X Version 11" "X Tools" +.TH "RXVT" "1" "2004-07-26" "X Version 11" "X Tools" .SH "NAME" rxvt-unicode (ouR XVT, unicode) \- a VT102 emulator for the X window system .PP .SH "SYNOPSIS" .PP -\fBurxvt\fP [options] [-e command [ args ]] +\fBrxvt\fP [options] [-e command [ args ]] .PP .SH "DESCRIPTION" .PP -\fBrxvt-unicode\fP, version \fB3\&.1\fP, is a colour vt102 terminal emulator +\fBrxvt-unicode\fP, version \fB3\&.2\fP, is a colour vt102 terminal emulator intended as an \fIxterm\fP(1) replacement for users who do not require features such as Tektronix 4014 emulation and toolkit-style configurability\&. As a result, \fBrxvt-unicode\fP uses much less swap space -- a significant @@ -20,7 +20,7 @@ advantage on a machine serving many X sessions\&. .PP .SH "OPTIONS" .PP -The \fBurxvt\fP options (mostly a subset of \fIxterm\fP\&'s) are listed below\&. +The \fBrxvt\fP options (mostly a subset of \fIxterm\fP\&'s) are listed below\&. In keeping with the smaller-is-better philosophy, options may be eliminated or default values chosen at compile-time, so options and defaults listed may not accurately reflect the version installed on your system\&. @@ -30,7 +30,7 @@ dependent upon\&. e\&.g\&. `Compile \fIXIM\fP:\&' requires \fIXIM\fP on the \fI line\&. Note: `rxvt -help\&' gives a list of all command-line options compiled into your version\&. .PP -Note that \fBurxvt\fP permits the resource name to be used as a long-option +Note that \fBrxvt\fP permits the resource name to be used as a long-option (--/++ option) so the potential command-line options are far greater than those listed\&. For example: `rxvt --loginShell --color1 Orange\&'\&. @@ -158,7 +158,7 @@ This option specifies the name of the terminal type to be set in the \fItermcap(5)\fP database and should have \fIli#\fP and \fIco#\fP entries; resource \fBtermName\fP\&. .IP "\fB-e\fP \fIcommand [arguments]\fP" -Run the command with its command-line arguments in the \fBurxvt\fP +Run the command with its command-line arguments in the \fBrxvt\fP window; also sets the window title and icon name to be the basename of the program being executed if neither \fI-title\fP (\fI-T\fP) nor \fI-n\fP are given on the command line\&. If this option is used, it @@ -212,15 +212,15 @@ in some window managers\&. Note: `rxvt --help\&' gives a list of all resources (long options) compiled into your version\&. If compiled with internal Xresources support (i\&.e\&. \fBrxvt -h\fP lists -\fB\&.Xdefaults\fP) then \fBurxvt\fP accepts application defaults set in +\fB\&.Xdefaults\fP) then \fBrxvt\fP accepts application defaults set in XAPPLOADDIR/Rxvt (compile-time defined: usually \fB/usr/lib/X11/app-defaults/Rxvt\fP) and resources set in \fB~/\&.Xdefaults\fP, or \fB~/\&.Xresources\fP if \fB~/\&.Xdefaults\fP does not exist\&. Note that when -reading X resources, \fBurxvt\fP recognizes two class names: \fBXTerm\fP and +reading X resources, \fBrxvt\fP recognizes two class names: \fBXTerm\fP and \fBRxvt\fP\&. The class name \fBXTerm\fP allows resources common to both -\fBurxvt\fP and \fIxterm\fP to be easily configured, while the class name -\fBRxvt\fP allows resources unique to \fBurxvt\fP, notably colours and -key-handling, to be shared between different \fBurxvt\fP configurations\&. +\fBrxvt\fP and \fIxterm\fP to be easily configured, while the class name +\fBRxvt\fP allows resources unique to \fBrxvt\fP, notably colours and +key-handling, to be shared between different \fBrxvt\fP configurations\&. If no resources are specified, suitable defaults will be used\&. Command-line arguments can be used to override resource settings\&. The following resources are allowed: @@ -279,7 +279,7 @@ option \fB+j\fP\&. \fBTrue\fP: make the background inherit the parent windows\&' pixmap, giving artificial transparency\&. \fBFalse\fP: do not inherit the parent windows\&' pixmap\&. -.IP "\fBtintColor\fP \fIcolour\fP" +.IP "\fBtintColor:\fP \fIcolour\fP" Tint the transparent background pixmap with the given colour\&. .IP "\fBscrollColor:\fP \fIcolour\fP" Use the specified colour for the scrollbar [default #B2B2B2]\&. @@ -328,7 +328,7 @@ Set mouse selection style to \fBold\fP which is 2\&.20, \fBoldword\fP which is xterm style with 2\&.20 old word selection, or anything else which gives xterm style selection\&. .IP "\fBscrollstyle:\fP \fImode\fP" -Set scrollbar style to \fBurxvt\fP, \fBrxvt\fP, \fBplain\fP, \fBnext\fP or \fBxterm\fP +Set scrollbar style to \fBrxvt\fP, \fBrxvt\fP, \fBplain\fP, \fBnext\fP or \fBxterm\fP .IP "\fBtitle:\fP \fIstring\fP" Set window title string, the default title is the command-line specified after the \fB-e\fP option, if any, otherwise the application @@ -509,9 +509,9 @@ intervening resource name \fBkeysym\&.\fP cannot be omitted\&. This resource is only available when compiled with KEYSYM_RESOURCE\&. .SH "THE SCROLLBAR" .PP -Lines of text that scroll off the top of the \fBurxvt\fP window (resource: +Lines of text that scroll off the top of the \fBrxvt\fP window (resource: \fBsaveLines\fP) and can be scrolled back using the scrollbar or by keystrokes\&. -The normal \fBurxvt\fP scrollbar has arrows and its behaviour is fairly +The normal \fBrxvt\fP scrollbar has arrows and its behaviour is fairly intuitive\&. The \fBxterm-scrollbar\fP is without arrows and its behaviour mimics that of \fIxterm\fP .PP @@ -542,7 +542,7 @@ Left double-click to select a word; Left triple-click to select the entire line\&. .IP "\fBInsertion\fP:" Pressing and releasing the Middle mouse button (or \fBShift-Insert\fP) -in an \fBurxvt\fP window causes the current text selection to be inserted +in an \fBrxvt\fP window causes the current text selection to be inserted as if it had been typed on the keyboard\&. .SH "CHANGING FONTS" .PP @@ -553,12 +553,12 @@ font and others of various sizes, by using \fBShift-KP_Add\fP and can be selected using resources \fBsmallfont_key\fP/\fBbigfont_key\fP\&. .SH "LOGIN STAMP" .PP -\fBurxvt\fP tries to write an entry into the \fIutmp\fP(5) file so that it can be +\fBrxvt\fP tries to write an entry into the \fIutmp\fP(5) file so that it can be seen via the \fIwho(1)\fP command, and can accept messages\&. To allow this -feature, \fBurxvt\fP must be installed setuid root on some systems\&. +feature, \fBrxvt\fP must be installed setuid root on some systems\&. .SH "COLORS AND GRAPHICS" .PP -In addition to the default foreground and background colours, \fBurxvt\fP +In addition to the default foreground and background colours, \fBrxvt\fP can display up to 16 colours (8 ANSI colours plus high-intensity bold/blink versions of the same)\&. Here is a list of the colours with their \fBrgb\&.txt\fP names\&. @@ -1049,10 +1049,10 @@ would yield White on Black, while on \fIxterm\fP(1) it would yield Black on White\&. .SH "ENVIRONMENT" .PP -\fBurxvt\fP sets the environment variables \fBTERM\fP, \fBCOLORTERM\fP and +\fBrxvt\fP sets the environment variables \fBTERM\fP, \fBCOLORTERM\fP and \fBCOLORFGBG\fP\&. The environment variable \fBWINDOWID\fP is set to the X window -id number of the \fBurxvt\fP window and it also uses and sets the environment -variable \fBDISPLAY\fP to specify which display terminal to use\&. \fBurxvt\fP uses +id number of the \fBrxvt\fP window and it also uses and sets the environment +variable \fBDISPLAY\fP to specify which display terminal to use\&. \fBrxvt\fP uses the environment variables \fBRXVTPATH\fP and \fBPATH\fP to find XPM files\&. .SH "FILES" .PP @@ -1079,7 +1079,7 @@ Click-and-drag doesn\&'t work with X11 mouse report overriding\&. .PP .SH "FTP LOCATION" .PP -rxvt-3\&.1\&.tar\&.gz can be found at the following ftp sites +rxvt-3\&.2\&.tar\&.gz can be found at the following ftp sites ftp://ftp\&.rxvt\&.org/pub/rxvt .PP .SH "CURRENT PROJECT COORDINATOR" diff --git a/doc/rxvt.tbl b/doc/rxvt.tbl index 8ce3cba5..b68575cd 100644 --- a/doc/rxvt.tbl +++ b/doc/rxvt.tbl @@ -1,14 +1,14 @@ -.TH "RXVT" "1" "2004-06-26" "X Version 11" "X Tools" +.TH "RXVT" "1" "2004-07-26" "X Version 11" "X Tools" .SH "NAME" rxvt-unicode (ouR XVT, unicode) \- a VT102 emulator for the X window system .PP .SH "SYNOPSIS" .PP -\fBurxvt\fP [options] [-e command [ args ]] +\fBrxvt\fP [options] [-e command [ args ]] .PP .SH "DESCRIPTION" .PP -\fBrxvt-unicode\fP, version \fB3\&.1\fP, is a colour vt102 terminal emulator +\fBrxvt-unicode\fP, version \fB3\&.2\fP, is a colour vt102 terminal emulator intended as an \fIxterm\fP(1) replacement for users who do not require features such as Tektronix 4014 emulation and toolkit-style configurability\&. As a result, \fBrxvt-unicode\fP uses much less swap space -- a significant @@ -17,7 +17,7 @@ advantage on a machine serving many X sessions\&. .PP .SH "OPTIONS" .PP -The \fBurxvt\fP options (mostly a subset of \fIxterm\fP\&'s) are listed below\&. +The \fBrxvt\fP options (mostly a subset of \fIxterm\fP\&'s) are listed below\&. In keeping with the smaller-is-better philosophy, options may be eliminated or default values chosen at compile-time, so options and defaults listed may not accurately reflect the version installed on your system\&. @@ -27,7 +27,7 @@ dependent upon\&. e\&.g\&. `Compile \fIXIM\fP:\&' requires \fIXIM\fP on the \fI line\&. Note: `rxvt -help\&' gives a list of all command-line options compiled into your version\&. .PP -Note that \fBurxvt\fP permits the resource name to be used as a long-option +Note that \fBrxvt\fP permits the resource name to be used as a long-option (--/++ option) so the potential command-line options are far greater than those listed\&. For example: `rxvt --loginShell --color1 Orange\&'\&. @@ -155,7 +155,7 @@ This option specifies the name of the terminal type to be set in the \fItermcap(5)\fP database and should have \fIli#\fP and \fIco#\fP entries; resource \fBtermName\fP\&. .IP "\fB-e\fP \fIcommand [arguments]\fP" -Run the command with its command-line arguments in the \fBurxvt\fP +Run the command with its command-line arguments in the \fBrxvt\fP window; also sets the window title and icon name to be the basename of the program being executed if neither \fI-title\fP (\fI-T\fP) nor \fI-n\fP are given on the command line\&. If this option is used, it @@ -209,15 +209,15 @@ in some window managers\&. Note: `rxvt --help\&' gives a list of all resources (long options) compiled into your version\&. If compiled with internal Xresources support (i\&.e\&. \fBrxvt -h\fP lists -\fB\&.Xdefaults\fP) then \fBurxvt\fP accepts application defaults set in +\fB\&.Xdefaults\fP) then \fBrxvt\fP accepts application defaults set in XAPPLOADDIR/Rxvt (compile-time defined: usually \fB/usr/lib/X11/app-defaults/Rxvt\fP) and resources set in \fB~/\&.Xdefaults\fP, or \fB~/\&.Xresources\fP if \fB~/\&.Xdefaults\fP does not exist\&. Note that when -reading X resources, \fBurxvt\fP recognizes two class names: \fBXTerm\fP and +reading X resources, \fBrxvt\fP recognizes two class names: \fBXTerm\fP and \fBRxvt\fP\&. The class name \fBXTerm\fP allows resources common to both -\fBurxvt\fP and \fIxterm\fP to be easily configured, while the class name -\fBRxvt\fP allows resources unique to \fBurxvt\fP, notably colours and -key-handling, to be shared between different \fBurxvt\fP configurations\&. +\fBrxvt\fP and \fIxterm\fP to be easily configured, while the class name +\fBRxvt\fP allows resources unique to \fBrxvt\fP, notably colours and +key-handling, to be shared between different \fBrxvt\fP configurations\&. If no resources are specified, suitable defaults will be used\&. Command-line arguments can be used to override resource settings\&. The following resources are allowed: @@ -276,7 +276,7 @@ option \fB+j\fP\&. \fBTrue\fP: make the background inherit the parent windows\&' pixmap, giving artificial transparency\&. \fBFalse\fP: do not inherit the parent windows\&' pixmap\&. -.IP "\fBtintColor\fP \fIcolour\fP" +.IP "\fBtintColor:\fP \fIcolour\fP" Tint the transparent background pixmap with the given colour\&. .IP "\fBscrollColor:\fP \fIcolour\fP" Use the specified colour for the scrollbar [default #B2B2B2]\&. @@ -325,7 +325,7 @@ Set mouse selection style to \fBold\fP which is 2\&.20, \fBoldword\fP which is xterm style with 2\&.20 old word selection, or anything else which gives xterm style selection\&. .IP "\fBscrollstyle:\fP \fImode\fP" -Set scrollbar style to \fBurxvt\fP, \fBrxvt\fP, \fBplain\fP, \fBnext\fP or \fBxterm\fP +Set scrollbar style to \fBrxvt\fP, \fBrxvt\fP, \fBplain\fP, \fBnext\fP or \fBxterm\fP .IP "\fBtitle:\fP \fIstring\fP" Set window title string, the default title is the command-line specified after the \fB-e\fP option, if any, otherwise the application @@ -506,9 +506,9 @@ intervening resource name \fBkeysym\&.\fP cannot be omitted\&. This resource is only available when compiled with KEYSYM_RESOURCE\&. .SH "THE SCROLLBAR" .PP -Lines of text that scroll off the top of the \fBurxvt\fP window (resource: +Lines of text that scroll off the top of the \fBrxvt\fP window (resource: \fBsaveLines\fP) and can be scrolled back using the scrollbar or by keystrokes\&. -The normal \fBurxvt\fP scrollbar has arrows and its behaviour is fairly +The normal \fBrxvt\fP scrollbar has arrows and its behaviour is fairly intuitive\&. The \fBxterm-scrollbar\fP is without arrows and its behaviour mimics that of \fIxterm\fP .PP @@ -539,7 +539,7 @@ Left double-click to select a word; Left triple-click to select the entire line\&. .IP "\fBInsertion\fP:" Pressing and releasing the Middle mouse button (or \fBShift-Insert\fP) -in an \fBurxvt\fP window causes the current text selection to be inserted +in an \fBrxvt\fP window causes the current text selection to be inserted as if it had been typed on the keyboard\&. .SH "CHANGING FONTS" .PP @@ -550,12 +550,12 @@ font and others of various sizes, by using \fBShift-KP_Add\fP and can be selected using resources \fBsmallfont_key\fP/\fBbigfont_key\fP\&. .SH "LOGIN STAMP" .PP -\fBurxvt\fP tries to write an entry into the \fIutmp\fP(5) file so that it can be +\fBrxvt\fP tries to write an entry into the \fIutmp\fP(5) file so that it can be seen via the \fIwho(1)\fP command, and can accept messages\&. To allow this -feature, \fBurxvt\fP must be installed setuid root on some systems\&. +feature, \fBrxvt\fP must be installed setuid root on some systems\&. .SH "COLORS AND GRAPHICS" .PP -In addition to the default foreground and background colours, \fBurxvt\fP +In addition to the default foreground and background colours, \fBrxvt\fP can display up to 16 colours (8 ANSI colours plus high-intensity bold/blink versions of the same)\&. Here is a list of the colours with their \fBrgb\&.txt\fP names\&. @@ -599,10 +599,10 @@ would yield White on Black, while on \fIxterm\fP(1) it would yield Black on White\&. .SH "ENVIRONMENT" .PP -\fBurxvt\fP sets the environment variables \fBTERM\fP, \fBCOLORTERM\fP and +\fBrxvt\fP sets the environment variables \fBTERM\fP, \fBCOLORTERM\fP and \fBCOLORFGBG\fP\&. The environment variable \fBWINDOWID\fP is set to the X window -id number of the \fBurxvt\fP window and it also uses and sets the environment -variable \fBDISPLAY\fP to specify which display terminal to use\&. \fBurxvt\fP uses +id number of the \fBrxvt\fP window and it also uses and sets the environment +variable \fBDISPLAY\fP to specify which display terminal to use\&. \fBrxvt\fP uses the environment variables \fBRXVTPATH\fP and \fBPATH\fP to find XPM files\&. .SH "FILES" .PP @@ -629,7 +629,7 @@ Click-and-drag doesn\&'t work with X11 mouse report overriding\&. .PP .SH "FTP LOCATION" .PP -rxvt-3\&.1\&.tar\&.gz can be found at the following ftp sites +rxvt-3\&.2\&.tar\&.gz can be found at the following ftp sites ftp://ftp\&.rxvt\&.org/pub/rxvt .PP .SH "CURRENT PROJECT COORDINATOR" diff --git a/src/rxvtcolor.C b/src/rxvtcolor.C index dfa3e876..ef2fd6d4 100644 --- a/src/rxvtcolor.C +++ b/src/rxvtcolor.C @@ -129,7 +129,8 @@ bool rxvt_xim::init () ximcallback.client_data = (XPointer)this; ximcallback.callback = im_destroy_cb; - XSetIMValues (xim, XNDestroyCallback, &ximcallback, NULL); + ((void (*)(XIM, ...)) XSetIMValues) + (xim, XNDestroyCallback, &ximcallback, NULL); return true; } -- 2.34.1