From 9ecd8e245c6a05dfaa71d8ee87380d2fb30e7b3c Mon Sep 17 00:00:00 2001 From: root Date: Mon, 16 Jan 2006 15:00:20 +0000 Subject: [PATCH] *** empty log message *** --- MANIFEST | 7 -- README.FAQ | 2 +- doc/README.menu | 55 ------------- doc/menu/example.menu | 95 --------------------- doc/menu/jedmenu.sl | 136 ------------------------------ doc/menu/menu | 83 ------------------- doc/menu/rxvt.menu | 119 --------------------------- doc/menu/rxvt.zh-menu | 168 ------------------------------------- doc/menu/terminal.menu | 59 ------------- doc/rxvt.1.html | 160 +++++++++++++++++------------------- doc/rxvt.1.man.in | 28 +++---- doc/rxvt.1.pod | 25 +++--- doc/rxvt.1.txt | 182 ++++++++++++++++++++--------------------- doc/rxvt.7.html | 2 +- doc/rxvt.7.man.in | 2 +- doc/rxvt.7.pod | 2 +- doc/rxvt.7.txt | 2 +- doc/rxvtperl.3.man.in | 2 +- src/Makefile.in | 3 +- src/command.C | 43 +--------- src/feature.h | 20 ----- src/init.C | 49 ++--------- src/main.C | 45 ++-------- src/misc.C | 49 +---------- src/rsinc.h | 7 +- src/rxvt.h | 98 ++-------------------- src/rxvtlib.h.in | 10 --- src/rxvtperl.xs | 2 +- src/scrollbar.C | 2 +- src/xdefaults.C | 10 +-- 30 files changed, 222 insertions(+), 1245 deletions(-) delete mode 100644 doc/README.menu delete mode 100644 doc/menu/example.menu delete mode 100644 doc/menu/jedmenu.sl delete mode 100644 doc/menu/menu delete mode 100644 doc/menu/rxvt.menu delete mode 100644 doc/menu/rxvt.zh-menu delete mode 100644 doc/menu/terminal.menu diff --git a/MANIFEST b/MANIFEST index bb5ef0ae..6ed3c212 100644 --- a/MANIFEST +++ b/MANIFEST @@ -16,17 +16,10 @@ doc/rxvt-tabbed doc/pty-fd doc/etc/rxvt-unicode.terminfo doc/etc/rxvt-unicode.termcap -doc/menu/example.menu -doc/menu/jedmenu.sl -doc/menu/menu -doc/menu/rxvt.menu -doc/menu/rxvt.zh-menu -doc/menu/terminal.menu doc/solaris9.patch doc/.cvsignore doc/Makefile.in -doc/README.menu doc/README.xvt doc/changes.txt doc/podtbl diff --git a/README.FAQ b/README.FAQ index 657dfd91..7622ccc2 100644 --- a/README.FAQ +++ b/README.FAQ @@ -582,7 +582,7 @@ FREQUENTLY ASKED QUESTIONS You can specify separate locales for the input method and the rest of the terminal, using the resource "imlocale": - URxvt*imlocale: ja_JP.EUC-JP + URxvt.imlocale: ja_JP.EUC-JP Now you can start your terminal with "LC_CTYPE=ja_JP.UTF-8" and still use your input method. Please note, however, that you will not diff --git a/doc/README.menu b/doc/README.menu deleted file mode 100644 index 2aabf254..00000000 --- a/doc/README.menu +++ /dev/null @@ -1,55 +0,0 @@ -A few examples of constructing menubars for rxvt. Used in conjuction -with the reference material (rxvtRef.html/txt), it should be possible to -piece together some useful menus without too much time. - -C-shell users be warned. -Some of the menu items contain bsh/ksh constructs like ${EDITOR:-vi}\r -which will cause your shell to gag. ----------------------------------------------------------------------- - -example.menu: - simple menus for Pico and the Shell - -jedmenu.sl: - (almost) self-contained SLang code for loading up a menubar - for the Jed editor. It doesn't need terminal.menu, - but looks a bit better with it. - - Note for JED users: - since rxvt provides an escape sequence to override the - normal XTerm interpretation of Shift-Insert/Prev/Next, - "wmark.sl" (MS-windows-style shift marking) works really - well and is a nice bonus for those forced to switch - to/from MS-windows - -terminal.menu - common rxvt terminal functions used by the other menus - -menu: - a small shell script to reduce the pain of typing - echo "ESC]10; ... BEL" for every menubar command. - It also contains a sample "default" menu at the bottom. - -rxvt.menu: - A nice script that allows a convenient way to have different - menubars used for rlogin|telnet to a machine. - Of course to get it to work, you'll need to add your own - machine names (and remove mine). - - The script is set up so that "rxvt" will be called if the first - argument to the script does not contain "rxvt". - So - rxvt.menu [options] - is the same as - rxvt.menu rxvt [options] - - To always have this script act as the front-end for rxvt: - 1) install the rxvt binary somewhere not in your path - 2) set the `exe' in menu.script to point to this binary - eg, - exe="/usr/local/X11/rxvt-2.21/rxvt" - # default program to execute - 3) have rxvt.menu linked somewhere in your path as `rxvt' - 4) add all the various machines/menus combinations to - rxvt.menu, or else make a separate database and change - the `menu' variable in rxvt.menu to suit. diff --git a/doc/menu/example.menu b/doc/menu/example.menu deleted file mode 100644 index c7e9388f..00000000 --- a/doc/menu/example.menu +++ /dev/null @@ -1,95 +0,0 @@ -This example illustrates how several menus could be combined together - -command = "[read:example]" - - read the file starting at "[menu]" or "[menu:???]" - and continue until it "[done]" - -command = "[read:example;pico]" or "[read:example;shell]" - - read the file starting at "[menu:pico]" or "[menu:shell]", - respectively and continue until "[done:pico]" or [done:shell]", - respectively. - -#------------------------------------------------------------------------- - -[menu:pico] -[clear] -[title:Pico (%n-%v)] - -# a menu for the pico editor -# mostly a demonstration, I don't know why anyone would need it - -# Prior/Next & Home/End are messed up -^A^E^Y^V - -/File/* -{Insert File}{^R} -{Save As}{^O} -{-} -{Suspend}{^Z} -{Exit}{^X} - -/Edit/* -{Find}{^W} -{-} -{Del Char}{^D} -{Mark}{^^} -{Kill Line}{^K} -{Paste}{^U} - -/Basics/* -{Forward}{^F} -{Backward}{^B} -{-} -{Prev}{^P} -{Next}{^N} -{-} -{Beg-of-Line}{^A} -{End-of-Line}{^E} -{-} -{Prev Page}{^Y} -{Next Page}{^V} - -/Buffer/* -{Reformat}{^J} -{Position}{^C} -{Refresh}{^L} -{Spell}{^T} - -[read:terminal] - -/?/* -{Help}{^G} - -[show] -[done:pico] - -#------------------------------------------------------------------------- - -[menu:shell] -[clear] -[title:shell] -# [pixmap:name] - -# not necessarily useful, but an example of using the rxvt menuBar - -# assuming we have ksh with Emacs bindings -^P^N^F^B - -/Programs/* -{Edit} ${EDITOR:-vi}\r -{Mail} Mail\r -{News} slrn\r -{Rxvt-News} rxvt -e slrn& -{Commander} mc\r - -/Shell/{finger} finger\r -{.name} invisible label! -/ - -[read:terminal] -[show] -[done:shell] - -#--------------------------------------------------------------------- eof diff --git a/doc/menu/jedmenu.sl b/doc/menu/jedmenu.sl deleted file mode 100644 index a27c4981..00000000 --- a/doc/menu/jedmenu.sl +++ /dev/null @@ -1,136 +0,0 @@ -%--------------------------------*-SLang-*-------------------------------- -% An example of using the rxvt menuBar for the JED editor -#if$TERM xterm* -%!% provide a hook to imitated the S-Lang> prompt -%!% use ESC[m to shadow the ESC[M used by mouse reporting -define menuFn () -{ - variable ch, cmd; - - cmd = Null_String; - forever - { - ch = getkey (); - if (ch == '\r') break; - cmd = strcat (cmd, char (ch)); - } - eval (cmd); -} -local_setkey ("menuFn", "\e[m"); % menu - -%!% allow the user to bind their owm commands -define menucmd (str) { tt_send (Sprintf ("\e]10;%s\a", str, 1)); } -%------------------------------------------------------------------------- -% integrate these with any existing suspend/resume/exit hooks -% the suspend hook works best if there was already a menu defined -% before invoking JED - -define suspend_hook () { menucmd ("[prev]"); } -define resume_hook () { menucmd ("[next]"); } -define exit_hook () { menucmd ("[rm]"); exit_jed (); } - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -menucmd ("[read:jedmenu.sl]"); % read this file - -% format _jed_version xyyzz into x.yy-zz -menucmd (Sprintf ("[:[title:Jed%d.%d-%d (%%n-%%v)]:]", - (_jed_version/10000), - ((_jed_version mod 10000)/100), - (_jed_version mod 100), - 3)); - -% get rid off pixmap stuff -if (strcmp (getenv ("COLORTERM"), "rxvt-xpm")) -{ - menucmd ("[menu][:-/Terminal/Pixmap:][show]"); -} -#endif % xterm* -%%%%%%%%%%%%%%%%%%%%%%%%%%% end-of-file (SLang) %%%%%%%%%%%%%%%%%%%%%%%%%% -% rxvt menu database -#iffalse -% An example of using the rxvt menuBar for the JED editor -% possibly useful things for the JED editor -- assuming Emacs bindings - -[menu:jed] - -[title:Jed menu (%n-%v)] -% some convenient arrows -\E[mbskip_wordbackward_paragraphforward_paragraphskip_word\r - -/File/* -{Open}{^X^F} -{Save}{^X^W} -{Save Buffers}{^Xs} -{Insert File}{^Xi} -{-} -{Shell Cmd}{M-!} -{-} -{Exit}{^X^C} - -/Edit/* -{Undo}{^_} -{-} -{Cut}{^W} -{Copy}{M-W} -{Paste}{^Y} - -/Search/* -{Forward}{^S} -{Backward}{^R} -{Replace}{M-%} -{-} -./Regexp/* -{Forward}{M-^S} -{Backward}{M-^R} -{Replace} \E[mquery_replace_match\r - -/Buffers/* -{Kill}{^Xk} -{List}{^X^B} -{Switch}{^Xb} -{-} -./Modes/* -{C} \E[mc_mode\r -{SLang} \E[mslang_mode\r -{None} \E[mno_mode\r -{LaTeX} \E[mlatex_mode\r -{Text} \E[mtext_mode\r -{Fortran} \E[mfortran_mode\r - -/Window/* -{Delete}{^X0} -{One}{^X1} -{Split}{^X2} -{Other}{^Xo} -{-} -{Recenter}{^L} -{-} -./Color Schemes/* -{White-on-Black} \E[mset_color_scheme("15;0")\r -{Black-on-White} \E[mset_color_scheme("0;15")\r -{White-on-default-Black}\E[mset_color_scheme("15;default;0")\r -{Black-on-default-White}\E[mset_color_scheme("0;default;15")\r - -/Utils/* -{Bufed} \E[mbufed\r -{Dired} \E[mdired\r -{Mail} \E[mmail\r -{Rmail} \E[mrmail\r -{-} -{EvalBuffer} \E[mevalbuffer\r -{Trim-Buffer} \E[mtrim_buffer\r - -[read:terminal] - -/?/* -{Info}{^X?i} -{Man}{^X?m} -{-} -{Apropos}{^X?a} -{Show Key}{^X?k} -{Where Is}{^X?w} - -[show] -[done] -#endif -%%%%%%%%%%%%%%%%%%%%%%%%%%% end-of-file (SLang) %%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/doc/menu/menu b/doc/menu/menu deleted file mode 100644 index 347a77c4..00000000 --- a/doc/menu/menu +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh -- -# shell wrapper to avoid typing Menu escape sequences -if test $# -eq 0; then -echo "\ -usage: `basename $0` cmd -where the most common commands are - [menu] [menu:name] - [read:file] [read:file;name] - [title:string] - +/path/menu - +/path/menu/* - +/menu/path/{-} - +/menu/path/{item}{rtext} action - - -/* - -/path/menu - -/path/menu/* - -/path/{-} - -/path/{item} - - BeginRightLeftUpDownEnd - [done] - - [rm] [rm:] [rm*] [rm:*] [rm:name] - [swap] [prev] [next] - [clear] [show] [hide] - [pixmap:file] - [dump] -NB: commands may need to be quoted to avoid shell expansion -" -exit -fi -Echo="echo -n" -# some systems/shells don't like `echo -n' -case `/bin/uname` in - SunOS) Echo="echo";; -esac -while [ $# -gt 0 ] -do - case $1 in - +* | -* | '<'* | '['*) # send raw commands - $Echo "]10;$1" - ;; - - *) # read in menu files - if test $1 = "default"; - then - $Echo "]10;[read:$0]" - else - $Echo "]10;[read:$1]" - fi - if test "$COLORTERM" != "rxvt-xpm"; # remove pixmap stuff - then - $Echo "]10;[menu][:-/Terminal/Pixmap:][show]" - fi - ;; - esac - shift -done -exit # stop shell here! -#------------------------------------------------------------------------- -# since everything before a [menu] tag is ignored, we can put a default -# menu here -#------------------------------------------------------------------------- -[menu:default] - -/Programs/* -{Edit} ${EDITOR:-vi}\r -{Top} top\r -{Dir} ls -la|${PAGER:-more}\r -{Dir-Time} ls -lat|${PAGER:-more}\r -{Space Left} df\r -{-} -{Exit} exit\r - -/Shell/* -{check mail} checkmail\r -{Background} ^Z bg\r -{Kill} ^C\r - -[show] -[done] -#--------------------------------------------------------------------- eof diff --git a/doc/menu/rxvt.menu b/doc/menu/rxvt.menu deleted file mode 100644 index af0c0ddc..00000000 --- a/doc/menu/rxvt.menu +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/sh -- -# an example of having different menus (even different pixmaps) -# show up depending on the machine you are rlogin/telnet connecting to - -menu="$0" # or any convenient database -exe="../../src/rxvt" # default program to execute -# exe="/usr/local/bin/rxvt-2.21" # default program to execute - -if test $# -gt 0; then - # if first argument contains "rxvt" use that instead - case $1 in *rxvt*) exe="$1" shift;; esac -fi - -while [ $# -gt 0 ] -do - case $1 in - -h) # give usage - echo " -Usage: `basename $0` [rxvt-prgm] [options] - - start rxvt - and load a menu corresponding to \"machine\" if the option - -e {rlogin|telnet|tn3270} Machine.Domain ... - was used" - exit - ;; # don't bother if we've already set it - - -menu) break;; # don't bother if we've already set it - - -e) - if test $# -ge 3; - then - case $2 in - # try to find menu for these cases - *rlogin | *telnet | *tn3270) - # strip domain & convert case - mach=`echo $3 | sed -e 's/\..*$//' | tr [A-Z] [a-z]` - if test ! -z "$mach"; - then - found=`egrep "^\[menu:$mach\]" $menu` - if test ! -z "$found"; - then - mach="$menu;$mach" - exe="$exe -menu $mach" - fi - fi - ;; - esac - fi - break - ;; - - *) - exe="$exe $1" - ;; - esac - shift -done - -# echo "$exe $@" -$exe $@ & -exit # stop shell here! -#------------------------------------------------------------------------- -[menu:weber] -#[menu:machine1] -[clear] -# [pixmap:machine1.xpm] - -/Programs/* -{Edit} ${EDITOR:-vi}\r -{Mail} Mail\r -{News} News\r -{-} -{Exit} exit\r - -/Jobs/* -{Top} top\r -{Ps u} ps aux|egrep ^$USER -{Ps aux} ps aux|egrep -v "(root|ps)" -# who's REALLY logged on (even with utmp logging turned off) -{Who} ps aux|egrep "\-bash"|egrep -v "grep" -{-} -{Background} ^Z bg\r -{Kill} ^C\r - -/Misc/* -{Dir} ls -la|${PAGER:-more}\r -{Dir-Time} ls -lat|${PAGER:-more}\r -{Space Left} df\r - -[read:terminal] -[show] -#[done:machine1] -[done:weber] - -#------------------------------------------------------------------------- -[menu:conn] -#[menu:machine2] -[clear] -# [pixmap:machine2.xpm] - -/Programs/* -{Edit} ${EDITOR:-vi}\r -{Checkmail} checkmail\r -{Dir} ls -la|${PAGER:-more}\r -{Dir-Time} ls -lat|${PAGER:-more}\r -{Space Left} df\r -{-} -{Exit} exit\r - -/Jobs/* -{Background} ^Z bg\r -{Kill} ^C\r - -[read:terminal] -[show] -#[done:machine2] -[done:conn] -#--------------------------------------------------------------------- eof diff --git a/doc/menu/rxvt.zh-menu b/doc/menu/rxvt.zh-menu deleted file mode 100644 index afff2409..00000000 --- a/doc/menu/rxvt.zh-menu +++ /dev/null @@ -1,168 +0,0 @@ -#------------------------------------------------------------------------- -[menu:big5] -#[menu:machine2] -[clear] -# [pixmap:machine2.xpm] - -/¿ï³æ/* -{½s¿è} ${EDITOR:-vi}\r -{¦C¥X¥Ø¿ý} ls -la|${PAGER:-more}\r -#{Dir-Time} ls -lat|${PAGER:-more}\r -{ºÏºÐªÅ¶¡} df\r -{-} -{Ãö³¬ Ctrl-D} exit\r - -/¤u§@/* -{Top} top\r -{Ps u} ps aux|egrep $USER|${PAGER:-more}\r -{Ps aux} ps aux|egrep -v "(root|ps)"|${PAGER:-more}\r -# who's REALLY logged on (even with utmp logging turned off) -{Who} w\r -{-} -{­I´º} ^Z bg\r -{²×µ²} ^C\r - -# standard settings for a `terminal' control menu -# only attach to an existing menubar -/²×ºÝ¾÷/* -./¦r«¬ /* -{¥¿±`} ^@\E]50;# -{¸û¤j} ^@\E]50;#+ -{¸û¤p} ^@\E]50;#- -{-} -{¦r«¬ 1} ^@\E]50;#1 -{¦r«¬ 2} ^@\E]50;#2 -{¦r«¬ 3} ^@\E]50;#3 -{¦r«¬ 4} ^@\E]50;#4 -{¦r«¬ 5} ^@\E]50;#5 -{¦r«¬ 6} ^@\E]50;#6 -../¿Ã¹õ/* -{­I´º¤ÏÂà} ^@\E[?5t -#{Toggle Width} ^@\E[?3t -{´å¼Ð} ^@\E[?25t -{¤Á´«} ^@\E[?47t -{-} -{ÁôÂÿï³æ} ^@\E[?10t -{§ó·s¿ï³æ} ^@\E[?10h -{¤Á´«±²¶b} ^@\E[?30t -#{-} -#{Toggle scroll-on-TTY} ^@\E[?1010t -#{Toggle scroll-on-Key} ^@\E[?1011t -../Áä½L /* -{XTerm} ^@\E[?35t -{Backspace} ^@\E[?67t -{Cursor} ^@\E[?1t -{KeyPad} ^@\E[?66t -../ -{-} -./­I´º /* -{µL} ^@\E[m\E]20;\a -{-} -# load .xpm files (assuming Rxvt*path: has been properly set) -# notice there are 2 ways to do this task -{background5} ^@\E]20;background5 -{Mona} ^@\E]10;[pixmap:monalisa;100] -{-} -./ÄÝ©Ê /* -{©ñ¤j} ^@\E]20;;100x100+50+50;? -{¨Ã¦C} ^@\E]20;;0 -{¤¤¥¡} ^@\E]20;;=+50+50;? -{-} -# set `quick arrow' keys -{¦ùÁY}{200/50%} ^@\E]10;[:\^@\\E]20;;200x050x00x2000x50;?:] -#{Pos}{5%} ^@\E]10;[:\^@\\E]20;;+5+0-5+0+0-5+0+5;?:] -../ -../ -{-} -{ª©¥»} ^@\E[8n -/ - -[show] -#[done:machine2] -[done:big5] -#--------------------------------------------------------------------- eof - -#------------------------------------------------------------------------- -[menu:gb] -#[menu:machine2] -[clear] -# [pixmap:machine2.xpm] - -/Ñ¡µ¥/* -{±à¼­} ${EDITOR:-vi}\r -{ÁгöĿ¼} ls -la|${PAGER:-more}\r -#{Dir-Time} ls -lat|${PAGER:-more}\r -{´Åµú¿Õ¼ä} df\r -{-} -{¹Ø±Õ Ctrl-D} exit\r - -/¹¤×÷/* -{Top} top\r -{Ps u} ps aux|egrep $USER|${PAGER:-more}\r -{Ps aux} ps aux|egrep -v "(root|ps)"|${PAGER:-more}\r -# who's REALLY logged on (even with utmp logging turned off) -{Who} w\r -{-} -{±³¾°} ^Z bg\r -{ÖÕ½á} ^C\r - -# standard settings for a `terminal' control menu -# only attach to an existing menubar -/Öն˻ú/* -./×ÖÐÍ /* -{Õý³£} ^@\E]50;# -{½Ï´ó} ^@\E]50;#+ -{½ÏС} ^@\E]50;#- -{-} -{×ÖÐÍ 1} ^@\E]50;#1 -{×ÖÐÍ 2} ^@\E]50;#2 -{×ÖÐÍ 3} ^@\E]50;#3 -{×ÖÐÍ 4} ^@\E]50;#4 -{×ÖÐÍ 5} ^@\E]50;#5 -{×ÖÐÍ 6} ^@\E]50;#6 -../Ó©Ä»/* -{±³¾°·´×ª} ^@\E[?5t -#{Toggle Width} ^@\E[?3t -{Óαê} ^@\E[?25t -{Çл»} ^@\E[?47t -{-} -{Òþ²ØÑ¡µ¥} ^@\E[?10t -{¸üÐÂÑ¡µ¥} ^@\E[?10h -{Çл»¾íÖá} ^@\E[?30t -#{-} -#{Toggle scroll-on-TTY} ^@\E[?1010t -#{Toggle scroll-on-Key} ^@\E[?1011t -../¼üÅÌ /* -{XTerm} ^@\E[?35t -{Backspace} ^@\E[?67t -{Cursor} ^@\E[?1t -{KeyPad} ^@\E[?66t -../ -{-} -./±³¾° /* -{ÎÞ} ^@\E[m\E]20;\a -{-} -# load .xpm files (assuming Rxvt*path: has been properly set) -# notice there are 2 ways to do this task -{background5} ^@\E]20;background5 -{Mona} ^@\E]10;[pixmap:monalisa;100] -{-} -./ÊôÐÔ /* -{·Å´ó} ^@\E]20;;100x100+50+50;? -{²¢ÁÐ} ^@\E]20;;0 -{ÖÐÑë} ^@\E]20;;=+50+50;? -{-} -# set `quick arrow' keys -{ÉìËõ}{200/50%} ^@\E]10;[:\^@\\E]20;;200x050x00x2000x50;?:] -#{Pos}{5%} ^@\E]10;[:\^@\\E]20;;+5+0-5+0+0-5+0+5;?:] -../ -../ -{-} -{°æ±¾} ^@\E[8n -/ - -[show] -#[done:machine2] -[done:gb] -#--------------------------------------------------------------------- eof - diff --git a/doc/menu/terminal.menu b/doc/menu/terminal.menu deleted file mode 100644 index e274e26e..00000000 --- a/doc/menu/terminal.menu +++ /dev/null @@ -1,59 +0,0 @@ -# standard settings for a `terminal' control menu -# only attach to an existing menubar -[menu] - -/Terminal/* -./Font/* -{Normal} ^@\E]50;# -{Larger} ^@\E]50;#+ -{Smaller} ^@\E]50;#- -{-} -{Font 1} ^@\E]50;#1 -{Font 2} ^@\E]50;#2 -{Font 3} ^@\E]50;#3 -{Font 4} ^@\E]50;#4 -../Screen/* -{ReverseVideo} ^@\E[?5t -{Toggle Width} ^@\E[?3t -{Cursor} ^@\E[?25t -{Switch} ^@\E[?47t -{-} -{menuBar} ^@\E[?10t -{refresh menu} ^@\E[?10h -{scrollBar} ^@\E[?30t -{-} -{Toggle scroll-on-TTY} ^@\E[?1010t -{Toggle scroll-on-Key} ^@\E[?1011t -../Keys/* -{XTerm} ^@\E[?35t -{Backspace} ^@\E[?67t -{Cursor} ^@\E[?1t -{KeyPad} ^@\E[?66t -../ -{-} -./Pixmap/* -{None} ^@\E[m\E]20;\a -{-} -# load .xpm files (assuming Rxvt*path: has been properly set) -# notice there are 2 ways to do this task -{background5} ^@\E]20;background5 -{Mona} ^@\E]10;[pixmap:monalisa;100] -{-} -./Attrib/* -{Full} ^@\E]20;;100x100+50+50;? -{Tiled} ^@\E]20;;0 -{Centre} ^@\E]20;;=+50+50;? -{-} -# set `quick arrow' keys -{Zoom}{200/50%} ^@\E]10;[:\^@\\E]20;;200x050x00x2000x50;?:] -{Pos}{5%} ^@\E]10;[:\^@\\E]20;;+5+0-5+0+0-5+0+5;?:] -../ -../ -{-} -{Version} ^@\E[8n -/ - -# make sure the change gets updated -[show] -[done] -#--------------------------------------------------------------------- eof diff --git a/doc/rxvt.1.html b/doc/rxvt.1.html index 7a55f4a5..4a36485c 100644 --- a/doc/rxvt.1.html +++ b/doc/rxvt.1.html @@ -43,7 +43,7 @@

SYNOPSIS

-

urxvt [options] [-e command [ args ]]

+

rxvt [options] [-e command [ args ]]

@@ -57,7 +57,7 @@ a significant advantage on a machine serving many X sessions.

FREQUENTLY ASKED QUESTIONS

-

See urxvt(7) (try man 7 urxvt) for a list of +

See rxvt(7) (try man 7 rxvt) for a list of frequently asked questions and answer to them and some common problems. That document is also accessible on the World-Wide-Web at http://cvs.schmorp.de/browse/*checkout*/rxvt-unicode/doc/rxvt.7.html.

@@ -95,27 +95,27 @@ and nice on resources: for example, you can still configure rxvt-unicode without most of it's features to get a lean binary. It also comes with a client/daemon pair that lets you open any number of terminal windows from within a single process, which makes startup time very fast and -drastically reduces memory usage. See urxvtd(1) (daemon) and -urxvtc(1) (client).

+drastically reduces memory usage. See rxvtd(1) (daemon) and +rxvtc(1) (client).

It also makes technical information about escape sequences (which have -been extended) easier accessible: see urxvt(7) for technical +been extended) easier accessible: see rxvt(7) for technical reference documentation (escape sequences etc.).

OPTIONS

-

The urxvt options (mostly a subset of xterm's) are listed +

The rxvt options (mostly a subset of xterm'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. `urxvt -h' gives a list of major compile-time options on +your system. `rxvt -h' gives a list of major compile-time options on the Options line. Option descriptions may be prefixed with which compile option each is dependent upon. e.g. `Compile XIM:' requires -XIM on the Options line. Note: `urxvt -help' gives a list of all +XIM on the Options line. Note: `rxvt -help' gives a list of all command-line options compiled into your version.

-

Note that urxvt permits the resource name to be used as a +

Note that rxvt 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: `urxvt --loginShell --color1 +far greater than those listed. For example: `rxvt --loginShell --color1 Orange'.

The following options are available:

@@ -184,7 +184,7 @@ used to brighten or darken the image in addition to tinting it; resource 
-   urxvt -tr -tint blue -sh 40
+ rxvt -tr -tint blue -sh 40

-sh
@@ -257,12 +257,12 @@ e.g.:

-   urxvt -fn "xft:Bitstream Vera Sans Mono:pixelsize=15"
-   urxvt -fn "9x15bold,xft:Bitstream Vera Sans Mono"
+ rxvt -fn "xft:Bitstream Vera Sans Mono:pixelsize=15" + rxvt -fn "9x15bold,xft:Bitstream Vera Sans Mono"

See also the question ``How does rxvt-unicode choose fonts?'' in the FAQ -section of urxvt(7).

+section of rxvt(7).

-fb fontlist
@@ -446,7 +446,7 @@ resource termName.
-e command [arguments]
-Run the command with its command-line arguments in the urxvt +Run the command with its command-line arguments in the rxvt window; also sets the window title and icon name to be the basename of the program being executed if neither -title (-T) nor -n are given on the command line. If this option is used, it must be the last @@ -460,7 +460,7 @@ run shell commands, you have to specify the shell, like this:

-  urxvt -e sh -c "shell commands"
+ rxvt -e sh -c "shell commands"

-title text
@@ -555,7 +555,7 @@ Turn on/off secondary screen scroll (default enabled); resource
-hold|+hold
-Turn on/off hold window after exit support. If enabled, urxvt +Turn on/off hold window after exit support. If enabled, rxvt will not immediately destroy its window when the program executed within it exits. Instead, it will wait till it is being killed or closed by the user; resource hold. @@ -570,20 +570,20 @@ Remap a key symbol. See resource keysym.
-embed windowid
-Tells urxvt to embed it's windows into an already-existing window, +Tells rxvt to embed it's windows into an already-existing window, which enables applications to easily embed a terminal.
-

Right now, urxvt will first unmap/map the specified window, so it -shouldn't be a top-level window. urxvt will also reconfigure it +

Right now, rxvt will first unmap/map the specified window, so it +shouldn't be a top-level window. rxvt will also reconfigure it quite a bit, so don't expect it to keep some specific state. It's best to -create an extra subwindow for urxvt and leave it alone.

+create an extra subwindow for rxvt and leave it alone.

-

The window will not be destroyed when urxvt exits.

+

The window will not be destroyed when rxvt exits.

-

It might be useful to know that urxvt will not close file +

It might be useful to know that rxvt will not close file descriptors passed to it (except for stdin/out/err, of course), so you can use file descriptors to communicate with the programs within the terminal. This works regardless of wether the -embed option was used or @@ -598,20 +598,20 @@ used (a longer example is in doc/embed):

my $rxvt = new Gtk2::Socket; $rxvt->signal_connect_after (realize => sub { my $xid = $_[0]->window->get_xid; - system "urxvt -embed $xid &"; + system "rxvt -embed $xid &"; });

-pty-fd file descriptor
-Tells urxvt NOT to execute any commands or create a new pty/tty +Tells rxvt NOT to execute any commands or create a new pty/tty pair but instead use the given filehandle as the tty master. This is -useful if you want to drive urxvt as a generic terminal emulator +useful if you want to drive rxvt as a generic terminal emulator without having to run a program within it.
-

If this switch is given, urxvt will not create any utmp/wtmp +

If this switch is given, rxvt will not create any utmp/wtmp entries and will not tinker with pty/tty permissions - you have to do that yourself if you want that.

@@ -632,7 +632,7 @@ longer example is in doc/pty-fd):

    my $pty = new IO::Pty;
    fcntl $pty, F_SETFD, 0; # clear close-on-exec
-   system "urxvt -pty-fd " . (fileno $pty) . "&";
+   system "rxvt -pty-fd " . (fileno $pty) . "&";
    close $pty;
@@ -653,11 +653,11 @@ this terminal instance. See resource perl-ext for details.

RESOURCES (available also as long-options)

-

Note: `urxvt --help' gives a list of all resources (long +

Note: `rxvt --help' gives a list of all resources (long options) compiled into your version.

You can set and change the resources using X11 tools like xrdb. Many distribution do also load settings from the ~/.Xresources file when X -starts. urxvt will consult the following files/resources in order, +starts. rxvt will consult the following files/resources in order, with later settings overwriting earlier ones:

   1. system-wide app-defaults file, either locale-dependent OR global
@@ -665,15 +665,15 @@ with later settings overwriting earlier ones:

   3. RESOURCE_MANAGER property on root-window OR $HOME/.Xdefaults
   4. SCREEN_RESOURCES for the current screen
   5. $XENVIRONMENT file OR $HOME/.Xdefaults-<nodename>
-

Note that when reading X resources, urxvt recognizes two class +

Note that when reading X resources, rxvt recognizes two class names: Rxvt and URxvt. The class name Rxvt allows resources -common to both urxvt and the original rxvt to be easily +common to both rxvt and the original rxvt to be easily configured, while the class name URxvt allows resources unique to -urxvt, to be shared between different urxvt +rxvt, to be shared between different rxvt 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 supported (you might want to -check the urxvtperl(3) manpage for additional settings by perl +check the rxvtperl(3) manpage for additional settings by perl extensions not documented here):

geometry: geom
@@ -709,7 +709,7 @@ names used are listed in the COLORS AND GRAPHICS section.

Colours higher than 15 cannot be set using resources (yet), but can be -changed using an escape command (see urxvt(7)).

+changed using an escape command (see rxvt(7)).

Colours 16-79 form a standard 4x4x4 colour cube (the same as xterm with @@ -847,20 +847,10 @@ be magnified beyond 10 times its original size. The maximum permitted scale is 1000. [default 0x0+50+50]

-
menu: file[;tag]
-
-
-Read in the specified menu file (note the `.menu' extension is -optional) and also optionally specify a starting tag to find. See the -reference documentation for details on the syntax for the menuBar. -
-

path: path
-Specify the colon-delimited search path for finding files (XPM and -menus), in addition to the paths specified by the RXVTPATH and -PATH environment variables. +Specify the colon-delimited search path for finding XPM files.

font: fontlist
@@ -887,7 +877,7 @@ fonts.

-   URxvt*font: 9x15bold,\
+   URxvt.font: 9x15bold,\
                -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1,\
                -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1, \
                [codeset=JISX0208]xft:Kochi Gothic:antialias=false, \
@@ -1027,7 +1017,7 @@ Specify a command pipe for vt100 printer [default lpr(1)]. Use
 
-   URxvt*print-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX)
+ URxvt.print-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX)

This creates a new file in your home directory with the screen contents @@ -1247,7 +1237,7 @@ another locale; option -imlocale. Specify the font-set used for XIM styles OverTheSpot or OffTheSpot. It must be a standard X font set (XLFD patterns separated by commas), i.e. it's not in the same format as the other font lists used -in urxvt. The default will be set-up to chose *any* suitable found +in rxvt. The default will be set-up to chose *any* suitable found found, preferably one or two pixels differing in size to the base font. option -imfont.

@@ -1274,8 +1264,7 @@ sequences enabled by default, which doesn't make it safer, though).

You can enable them by setting this boolean resource or specifying -insecure as an option. At the moment, this enables display-answer, -locale, findfont, icon label and window title requests as well as dynamic -menubar dispatch.

+locale, findfont, icon label and window title requests.

modifier: modifier
@@ -1312,7 +1301,7 @@ instead scroll the screen up.
hold: bool
-Turn on/off hold window after exit support. If enabled, urxvt +Turn on/off hold window after exit support. If enabled, rxvt will not immediately destroy its window when the program executed within it exits. Instead, it will wait till it is being killed or closed by the user. @@ -1354,7 +1343,7 @@ can start or end with whitespace.

Please note that you need to double the \ in resource files, as Xlib itself does it's own de-escaping (you can use \033 instead of -\e (and so on), which will work with both Xt and urxvt's own +\e (and so on), which will work with both Xt and rxvt's own processing).

@@ -1380,7 +1369,7 @@ should be a character not used by the strings.

If string takes the form of command:STRING, the specified STRING -is interpreted and executed as urxvt's control sequence. For +is interpreted and executed as rxvt's control sequence. For example the following means ``change the current locale to zh_CN.GBK when Control-Meta-c is being pressed'':

@@ -1390,9 +1379,9 @@ when Control-Meta-c is being pressed'':

If string takes the form perl:STRING, then the specified STRING -is passed to the on_keyboard_command perl handler. See the urxvtperl(3) +is passed to the on_keyboard_command perl handler. See the rxvtperl(3) manpage. For example, the selection extension (activated via -urxvt -pe selection) listens for selection:rot13 events:

+rxvt -pe selection) listens for selection:rot13 events:

@@ -1408,7 +1397,7 @@ mappings themselves.

Unfortunately, this will override built-in key mappings. For example -if you overwrite the Insert key you will disable urxvt's +if you overwrite the Insert key you will disable rxvt's Shift-Insert mapping. To re-enable that, you can poke ``holes'' into the user-defined keymap using the builtin: replacement:

@@ -1433,7 +1422,7 @@ font-switching at runtime:

URxvt.keysym.M-C-2: command:\033]50;9x15bold\007
-

Other things are possible, e.g. resizing (see urxvt(7) for more +

Other things are possible, e.g. resizing (see rxvt(7) for more info):

@@ -1479,7 +1468,7 @@ all instances, while perl-ext is used for specific instances.
Perl code to be evaluated when all extensions have been registered. See -the urxvtperl(3) manpage. Due to security reasons, this resource +the rxvtperl(3) manpage. Due to security reasons, this resource will be ignored when running setuid/setgid.

@@ -1488,25 +1477,25 @@ will be ignored when running setuid/setgid.
Colon-separated list of additional directories that hold extension scripts. When looking for extensions specified by the perl resource, -urxvt will first look in these directories and then in -/usr/local/lib/urxvt/perl/. Due to security reasons, this resource +rxvt will first look in these directories and then in +/opt/rxvt/lib/urxvt/perl/. Due to security reasons, this resource will be ignored when running setuid/setgid.
-

See the urxvtperl(3) manpage.

+

See the rxvtperl(3) manpage.

selection.pattern-idx >: perl-regex
-Additional selection patterns, see the urxvtperl(3) manpage for +Additional selection patterns, see the rxvtperl(3) manpage for details.

selection-autotransform.idx >: perl-transform
-Selection auto-transform patterns, see the urxvtperl(3) manpage +Selection auto-transform patterns, see the rxvtperl(3) manpage for details.

@@ -1534,9 +1523,9 @@ Sets the WM_TRANSIENT_FOR property to the given window iw.

THE SCROLLBAR

-

Lines of text that scroll off the top of the urxvt window +

Lines of text that scroll off the top of the rxvt window (resource: saveLines) and can be scrolled back using the scrollbar -or by keystrokes. The normal urxvt scrollbar has arrows and +or by keystrokes. The normal rxvt scrollbar has arrows and its behaviour is fairly intuitive. The xterm-scrollbar is without arrows and its behaviour mimics that of xterm

Scroll down with Button1 (xterm-scrollbar) or Shift-Next. @@ -1583,7 +1572,7 @@ the selection.

Pressing and releasing the Middle mouse button (or Shift-Insert) in -an urxvt window causes the current text selection to be +an rxvt window causes the current text selection to be inserted as if it had been typed on the keyboard.

@@ -1593,10 +1582,13 @@ inserted as if it had been typed on the keyboard.

CHANGING FONTS

Changing fonts (or font sizes, respectively) via the keypad is not yet supported in rxvt-unicode. Bug me if you need this.

-

You can, however, switch fonts at runtime using escape sequences (and -therefore using the menubar), e.g.:

+

You can, however, switch fonts at runtime using escape sequences, e.g.:

    printf '\e]710;%s\007' "9x15bold,xft:Kochi Gothic"
+

You can use keyboard shortcuts, too:

+
+   URxvt.keysym.M-C-1: command:\033]710;suxuseuro\007\033]711;suxuseuro\007
+   URxvt.keysym.M-C-2: command:\033]710;9x15bold\007\033]711;9x15bold\007

rxvt-unicode will automatically re-apply these fonts to the output so far.

@@ -1659,16 +1651,16 @@ both scenario A and B of ISO 14755, including part 5.2.

LOGIN STAMP

-

urxvt tries to write an entry into the utmp(5) file so that +

rxvt tries to write an entry into the utmp(5) file so that it can be seen via the who(1) command, and can accept messages. To -allow this feature, urxvt may need to be installed setuid root +allow this feature, rxvt may need to be installed setuid root on some systems or setgid to root or to some other group on others.

COLORS AND GRAPHICS

In addition to the default foreground and background colours, -urxvt can display up to 16 colours (8 ANSI colours plus +rxvt 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 rgb.txt names.

@@ -1699,7 +1691,7 @@ always swapping the foreground/background colours. This is in contrast to xterm(1) where the colours are only swapped if they have not otherwise been specified. For example,

-
urxvt -fg Black -bg White -rv
+
rxvt -fg Black -bg White -rv
would yield White on Black, while on xterm(1) it would yield Black @@ -1710,7 +1702,7 @@ on White.

ENVIRONMENT

-

urxvt sets and/or uses the following environment variables:

+

rxvt sets and/or uses the following environment variables:

TERM
@@ -1722,7 +1714,7 @@ resources or on the commandline.
COLORTERM
-Either rxvt, rxvt-xpm, depending on wether urxvt was +Either rxvt, rxvt-xpm, depending on wether rxvt was compiled with XPM support, and optionally with the added extension -mono to indicate that rxvt-unicode runs on a monochrome screen.
@@ -1734,7 +1726,7 @@ Set to a string of the form fg;bg or fg;xpm;bg, where the colour code used as default foreground/text colour (or the string default to indicate that the default-colour escape sequence is to be used), bg is the colour code used as default background colour (or the -string default), and xpm is the string default if urxvt +string default), and xpm is the string default if rxvt was compiled with XPM support. Libraries like ncurses and slang can (and do) use this information to optimize screen output.
@@ -1742,7 +1734,7 @@ was compiled with XPM support. Libraries like ncurses and sla
WINDOWID
-Set to the (decimal) X Window ID of the urxvt window (the toplevel +Set to the (decimal) X Window ID of the rxvt window (the toplevel window, which usually has subwindows for the scrollbar, the terminal window and so on).
@@ -1750,14 +1742,14 @@ window and so on).
TERMINFO
-Set to the terminfo directory iff urxvt was configured with +Set to the terminfo directory iff rxvt was configured with --with-terminfo=PATH.

DISPLAY
-Used by urxvt to connect to the display and set to the correct +Used by rxvt to connect to the display and set to the correct display in it's child processes.

@@ -1770,7 +1762,7 @@ The shell to be used for command execution, defaults to /bin/sh.
RXVTPATH
-The path where urxvt looks for support files such as menu and xpm +The path where rxvt looks for support files such as menu and xpm files.

@@ -1783,8 +1775,8 @@ Used in the same way as RXVTPATH.
RXVT_SOCKET
-The unix domain socket path used by urxvtc(1) and -urxvtd(1). +The unix domain socket path used by rxvtc(1) and +rxvtd(1).

Default $HOME/.rxvt-unicode-<nodename >>>.

@@ -1808,7 +1800,7 @@ Directory where various X resource files are being located.
If set and accessible, gives the name of a X resource file to be loaded by -urxvt. +rxvt.

@@ -1826,7 +1818,7 @@ Color names.

SEE ALSO

-

urxvt(7), urxvtc(1), urxvtd(1), xterm(1), sh(1), resize(1), X(1), pty(4), tty(4), utmp(5)

+

rxvt(7), rxvtc(1), rxvtd(1), xterm(1), sh(1), resize(1), X(1), pty(4), tty(4), utmp(5)

diff --git a/doc/rxvt.1.man.in b/doc/rxvt.1.man.in index a0626332..a71c9fe0 100644 --- a/doc/rxvt.1.man.in +++ b/doc/rxvt.1.man.in @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "rxvt 1" -.TH rxvt 1 "2006-01-13" "7.0" "RXVT-UNICODE" +.TH rxvt 1 "2006-01-16" "7.0" "RXVT-UNICODE" .SH "NAME" rxvt\-unicode (ouR XVT, unicode) \- (a VT102 emulator for the X window system) .SH "SYNOPSIS" @@ -684,16 +684,9 @@ of 1 displays the image without any scaling. A scale of 2 to 9 specifies an integer number of images in that direction. No image will be magnified beyond 10 times its original size. The maximum permitted scale is 1000. [default 0x0+50+50] -.IP "\fBmenu:\fR \fIfile[;tag]\fR" 4 -.IX Item "menu: file[;tag]" -Read in the specified menu file (note the `.menu' extension is -optional) and also optionally specify a starting tag to find. See the -reference documentation for details on the syntax for the menuBar. .IP "\fBpath:\fR \fIpath\fR" 4 .IX Item "path: path" -Specify the colon-delimited search path for finding files (\s-1XPM\s0 and -menus), in addition to the paths specified by the \fB\s-1RXVTPATH\s0\fR and -\&\fB\s-1PATH\s0\fR environment variables. +Specify the colon-delimited search path for finding \s-1XPM\s0 files. .IP "\fBfont:\fR \fIfontlist\fR" 4 .IX Item "font: fontlist" Select the fonts to be used. This is a comma separated list of font names @@ -713,7 +706,7 @@ fonts. For example, this font resource .Sp .Vb 5 -\& URxvt*font: 9x15bold,\e +\& URxvt.font: 9x15bold,\e \& -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1,\e \& -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1, \e \& [codeset=JISX0208]xft:Kochi Gothic:antialias=false, \e @@ -813,7 +806,7 @@ The string will be interpreted as if typed into the shell as\-is. Example: .Sp .Vb 1 -\& URxvt*print-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX) +\& URxvt.print-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX) .Ve .Sp This creates a new file in your home directory with the screen contents @@ -965,8 +958,7 @@ sequences enabled by default, which doesn't make it safer, though). .Sp You can enable them by setting this boolean resource or specifying \&\fB\-insecure\fR as an option. At the moment, this enables display\-answer, -locale, findfont, icon label and window title requests as well as dynamic -menubar dispatch. +locale, findfont, icon label and window title requests. .IP "\fBmodifier:\fR \fImodifier\fR" 4 .IX Item "modifier: modifier" Set the key to be interpreted as the Meta key to: \fBalt\fR, \fBmeta\fR, @@ -1209,13 +1201,19 @@ inserted as if it had been typed on the keyboard. Changing fonts (or font sizes, respectively) via the keypad is not yet supported in rxvt\-unicode. Bug me if you need this. .PP -You can, however, switch fonts at runtime using escape sequences (and -therefore using the menubar), e.g.: +You can, however, switch fonts at runtime using escape sequences, e.g.: .PP .Vb 1 \& printf '\ee]710;%s\e007' "9x15bold,xft:Kochi Gothic" .Ve .PP +You can use keyboard shortcuts, too: +.PP +.Vb 2 +\& URxvt.keysym.M-C-1: command:\e033]710;suxuseuro\e007\e033]711;suxuseuro\e007 +\& URxvt.keysym.M-C-2: command:\e033]710;9x15bold\e007\e033]711;9x15bold\e007 +.Ve +.PP rxvt-unicode will automatically re-apply these fonts to the output so far. .SH "ISO 14755 SUPPORT" .IX Header "ISO 14755 SUPPORT" diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod index fd62a869..a989585a 100644 --- a/doc/rxvt.1.pod +++ b/doc/rxvt.1.pod @@ -629,17 +629,9 @@ specifies an integer number of images in that direction. No image will be magnified beyond 10 times its original size. The maximum permitted scale is 1000. [default 0x0+50+50] -=item B I - -Read in the specified menu file (note the `.menu' extension is -optional) and also optionally specify a starting tag to find. See the -reference documentation for details on the syntax for the menuBar. - =item B I -Specify the colon-delimited search path for finding files (XPM and -menus), in addition to the paths specified by the B and -B environment variables. +Specify the colon-delimited search path for finding XPM files. =item B I @@ -659,7 +651,7 @@ fonts. For example, this font resource - URxvt*font: 9x15bold,\ + URxvt.font: 9x15bold,\ -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1,\ -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1, \ [codeset=JISX0208]xft:Kochi Gothic:antialias=false, \ @@ -766,7 +758,7 @@ The string will be interpreted as if typed into the shell as-is. Example: - URxvt*print-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX) + URxvt.print-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX) This creates a new file in your home directory with the screen contents everytime you hit C. @@ -948,8 +940,7 @@ sequences enabled by default, which doesn't make it safer, though). You can enable them by setting this boolean resource or specifying B<-insecure> as an option. At the moment, this enables display-answer, -locale, findfont, icon label and window title requests as well as dynamic -menubar dispatch. +locale, findfont, icon label and window title requests. =item B I @@ -1202,11 +1193,15 @@ inserted as if it had been typed on the keyboard. Changing fonts (or font sizes, respectively) via the keypad is not yet supported in rxvt-unicode. Bug me if you need this. -You can, however, switch fonts at runtime using escape sequences (and -therefore using the menubar), e.g.: +You can, however, switch fonts at runtime using escape sequences, e.g.: printf '\e]710;%s\007' "9x15bold,xft:Kochi Gothic" +You can use keyboard shortcuts, too: + + URxvt.keysym.M-C-1: command:\033]710;suxuseuro\007\033]711;suxuseuro\007 + URxvt.keysym.M-C-2: command:\033]710;9x15bold\007\033]711;9x15bold\007 + rxvt-unicode will automatically re-apply these fonts to the output so far. =head1 ISO 14755 SUPPORT diff --git a/doc/rxvt.1.txt b/doc/rxvt.1.txt index 763e9ad3..9982958d 100644 --- a/doc/rxvt.1.txt +++ b/doc/rxvt.1.txt @@ -3,7 +3,7 @@ NAME system) SYNOPSIS - urxvt [options] [-e command [ args ]] + rxvt [options] [-e command [ args ]] DESCRIPTION rxvt-unicode, version 7.0, is a colour vt102 terminal emulator intended @@ -13,9 +13,9 @@ DESCRIPTION advantage on a machine serving many X sessions. FREQUENTLY ASKED QUESTIONS - See urxvt(7) (try "man 7 urxvt") for a list of frequently asked - questions and answer to them and some common problems. That document is - also accessible on the World-Wide-Web at + See rxvt(7) (try "man 7 rxvt") for a list of frequently asked questions + and answer to them and some common problems. That document is also + accessible on the World-Wide-Web at . RXVT-UNICODE VS. RXVT @@ -54,27 +54,27 @@ RXVT-UNICODE VS. RXVT without most of it's features to get a lean binary. It also comes with a client/daemon pair that lets you open any number of terminal windows from within a single process, which makes startup time very fast and - drastically reduces memory usage. See urxvtd(1) (daemon) and urxvtc(1) + drastically reduces memory usage. See rxvtd(1) (daemon) and rxvtc(1) (client). It also makes technical information about escape sequences (which have - been extended) easier accessible: see urxvt(7) for technical reference + been extended) easier accessible: see rxvt(7) for technical reference documentation (escape sequences etc.). OPTIONS - The urxvt options (mostly a subset of *xterm*'s) are listed below. In + The rxvt options (mostly a subset of *xterm*'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. `urxvt + may not accurately reflect the version installed on your system. `rxvt -h' gives a list of major compile-time options on the *Options* line. Option descriptions may be prefixed with which compile option each is dependent upon. e.g. `Compile *XIM*:' requires *XIM* on the *Options* - line. Note: `urxvt -help' gives a list of all command-line options + line. Note: `rxvt -help' gives a list of all command-line options compiled into your version. - Note that urxvt permits the resource name to be used as a long-option + Note that rxvt 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: `urxvt --loginShell --color1 Orange'. + than those listed. For example: `rxvt --loginShell --color1 Orange'. The following options are available: @@ -115,7 +115,7 @@ OPTIONS be used to brighten or darken the image in addition to tinting it; resource *tintColor*. Example: - urxvt -tr -tint blue -sh 40 + rxvt -tr -tint blue -sh 40 -sh *number* Darken (0 .. 100) or lighten (-1 .. -100) the transparent background image in addition to tinting it (i.e. -tint must be @@ -158,11 +158,11 @@ OPTIONS prefix it with "x:". To specify an XFT-font, you need to prefix it with "xft:", e.g.: - urxvt -fn "xft:Bitstream Vera Sans Mono:pixelsize=15" - urxvt -fn "9x15bold,xft:Bitstream Vera Sans Mono" + rxvt -fn "xft:Bitstream Vera Sans Mono:pixelsize=15" + rxvt -fn "9x15bold,xft:Bitstream Vera Sans Mono" See also the question "How does rxvt-unicode choose fonts?" in the - FAQ section of urxvt(7). + FAQ section of rxvt(7). -fb *fontlist* Compile *font-styles*: The bold font list to use when bold @@ -272,7 +272,7 @@ OPTIONS resource termName. -e *command [arguments]* - Run the command with its command-line arguments in the urxvt window; + Run the command with its command-line arguments in the rxvt window; also sets the window title and icon name to be the basename of the program being executed if neither *-title* (*-T*) nor *-n* are given on the command line. If this option is used, it must be the last on @@ -284,7 +284,7 @@ OPTIONS want to run shell commands, you have to specify the shell, like this: - urxvt -e sh -c "shell commands" + rxvt -e sh -c "shell commands" -title *text* Window title (-T still respected); the default title is the basename @@ -339,7 +339,7 @@ OPTIONS secondaryScroll. -hold|+hold - Turn on/off hold window after exit support. If enabled, urxvt will + Turn on/off hold window after exit support. If enabled, rxvt will not immediately destroy its window when the program executed within it exits. Instead, it will wait till it is being killed or closed by the user; resource hold. @@ -348,21 +348,21 @@ OPTIONS Remap a key symbol. See resource keysym. -embed *windowid* - Tells urxvt to embed it's windows into an already-existing window, + Tells rxvt to embed it's windows into an already-existing window, which enables applications to easily embed a terminal. - Right now, urxvt will first unmap/map the specified window, so it - shouldn't be a top-level window. urxvt will also reconfigure it - quite a bit, so don't expect it to keep some specific state. It's - best to create an extra subwindow for urxvt and leave it alone. + Right now, rxvt will first unmap/map the specified window, so it + shouldn't be a top-level window. rxvt will also reconfigure it quite + a bit, so don't expect it to keep some specific state. It's best to + create an extra subwindow for rxvt and leave it alone. - The window will not be destroyed when urxvt exits. + The window will not be destroyed when rxvt exits. - It might be useful to know that urxvt will not close file - descriptors passed to it (except for stdin/out/err, of course), so - you can use file descriptors to communicate with the programs within - the terminal. This works regardless of wether the "-embed" option - was used or not. + It might be useful to know that rxvt will not close file descriptors + passed to it (except for stdin/out/err, of course), so you can use + file descriptors to communicate with the programs within the + terminal. This works regardless of wether the "-embed" option was + used or not. Here is a short Gtk2-perl snippet that illustrates how this option can be used (a longer example is in doc/embed): @@ -370,16 +370,16 @@ OPTIONS my $rxvt = new Gtk2::Socket; $rxvt->signal_connect_after (realize => sub { my $xid = $_[0]->window->get_xid; - system "urxvt -embed $xid &"; + system "rxvt -embed $xid &"; }); -pty-fd *file descriptor* - Tells urxvt NOT to execute any commands or create a new pty/tty pair + Tells rxvt NOT to execute any commands or create a new pty/tty pair but instead use the given filehandle as the tty master. This is - useful if you want to drive urxvt as a generic terminal emulator + useful if you want to drive rxvt as a generic terminal emulator without having to run a program within it. - If this switch is given, urxvt will not create any utmp/wtmp entries + If this switch is given, rxvt will not create any utmp/wtmp entries and will not tinker with pty/tty permissions - you have to do that yourself if you want that. @@ -394,7 +394,7 @@ OPTIONS my $pty = new IO::Pty; fcntl $pty, F_SETFD, 0; # clear close-on-exec - system "urxvt -pty-fd " . (fileno $pty) . "&"; + system "rxvt -pty-fd " . (fileno $pty) . "&"; close $pty; # now communicate with rxvt @@ -406,12 +406,12 @@ OPTIONS use) in this terminal instance. See resource perl-ext for details. RESOURCES (available also as long-options) - Note: `urxvt --help' gives a list of all resources (long options) + Note: `rxvt --help' gives a list of all resources (long options) compiled into your version. You can set and change the resources using X11 tools like xrdb. Many distribution do also load settings from the ~/.Xresources file when X - starts. urxvt will consult the following files/resources in order, with + starts. rxvt will consult the following files/resources in order, with later settings overwriting earlier ones: 1. system-wide app-defaults file, either locale-dependent OR global @@ -420,15 +420,15 @@ RESOURCES (available also as long-options) 4. SCREEN_RESOURCES for the current screen 5. $XENVIRONMENT file OR $HOME/.Xdefaults- - Note that when reading X resources, urxvt recognizes two class names: - Rxvt and URxvt. The class name Rxvt allows resources common to both - urxvt and the original *rxvt* to be easily configured, while the class - name URxvt allows resources unique to urxvt, to be shared between - different urxvt 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 supported (you might want - to check the urxvtperl(3) manpage for additional settings by perl - extensions not documented here): + Note that when reading X resources, rxvt recognizes two class names: + Rxvt and URxvt. The class name Rxvt allows resources common to both rxvt + and the original *rxvt* to be easily configured, while the class name + URxvt allows resources unique to rxvt, to be shared between different + rxvt 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 supported (you might want to check + the rxvtperl(3) manpage for additional settings by perl extensions not + documented here): geometry: *geom* Create the window with the specified X window geometry [default @@ -452,7 +452,7 @@ RESOURCES (available also as long-options) section. Colours higher than 15 cannot be set using resources (yet), but can - be changed using an escape command (see urxvt(7)). + be changed using an escape command (see rxvt(7)). Colours 16-79 form a standard 4x4x4 colour cube (the same as xterm with 88 colour support). Colours 80-87 are evenly spaces grey steps. @@ -538,16 +538,8 @@ RESOURCES (available also as long-options) will be magnified beyond 10 times its original size. The maximum permitted scale is 1000. [default 0x0+50+50] - menu: *file[;tag]* - Read in the specified menu file (note the `.menu' extension is - optional) and also optionally specify a starting tag to find. See - the reference documentation for details on the syntax for the - menuBar. - path: *path* - Specify the colon-delimited search path for finding files (XPM and - menus), in addition to the paths specified by the RXVTPATH and PATH - environment variables. + Specify the colon-delimited search path for finding XPM files. font: *fontlist* Select the fonts to be used. This is a comma separated list of font @@ -568,7 +560,7 @@ RESOURCES (available also as long-options) For example, this font resource - URxvt*font: 9x15bold,\ + URxvt.font: 9x15bold,\ -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1,\ -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1, \ [codeset=JISX0208]xft:Kochi Gothic:antialias=false, \ @@ -664,7 +656,7 @@ RESOURCES (available also as long-options) Example: - URxvt*print-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX) + URxvt.print-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX) This creates a new file in your home directory with the screen contents everytime you hit "Print". @@ -796,7 +788,7 @@ RESOURCES (available also as long-options) Specify the font-set used for XIM styles "OverTheSpot" or "OffTheSpot". It must be a standard X font set (XLFD patterns separated by commas), i.e. it's not in the same format as the other - font lists used in urxvt. The default will be set-up to chose *any* + font lists used in rxvt. The default will be set-up to chose *any* suitable found found, preferably one or two pixels differing in size to the base font. option -imfont. @@ -817,8 +809,7 @@ RESOURCES (available also as long-options) You can enable them by setting this boolean resource or specifying -insecure as an option. At the moment, this enables display-answer, - locale, findfont, icon label and window title requests as well as - dynamic menubar dispatch. + locale, findfont, icon label and window title requests. modifier: *modifier* Set the key to be interpreted as the Meta key to: alt, meta, hyper, @@ -839,7 +830,7 @@ RESOURCES (available also as long-options) instead scroll the screen up. hold: *bool* - Turn on/off hold window after exit support. If enabled, urxvt will + Turn on/off hold window after exit support. If enabled, rxvt will not immediately destroy its window when the program executed within it exits. Instead, it will wait till it is being killed or closed by the user. @@ -873,7 +864,7 @@ RESOURCES (available also as long-options) Please note that you need to double the "\" in resource files, as Xlib itself does it's own de-escaping (you can use "\033" instead of - "\e" (and so on), which will work with both Xt and urxvt's own + "\e" (and so on), which will work with both Xt and rxvt's own processing). You can define a range of keysyms in one shot by providing a @@ -891,7 +882,7 @@ RESOURCES (available also as long-options) URxvt.keysym.Meta-Control-0x63: \033 If *string* takes the form of "command:STRING", the specified STRING - is interpreted and executed as urxvt's control sequence. For example + is interpreted and executed as rxvt's control sequence. For example the following means "change the current locale to "zh_CN.GBK" when Control-Meta-c is being pressed": @@ -899,9 +890,8 @@ RESOURCES (available also as long-options) If *string* takes the form "perl:STRING", then the specified STRING is passed to the "on_keyboard_command" perl handler. See the - urxvtperl(3) manpage. For example, the selection extension - (activated via "urxvt -pe selection") listens for "selection:rot13" - events: + rxvtperl(3) manpage. For example, the selection extension (activated + via "rxvt -pe selection") listens for "selection:rot13" events: URxvt.keysym.M-C-c: perl:selection:rot13 @@ -913,7 +903,7 @@ RESOURCES (available also as long-options) unless some of those are defined mappings themselves. Unfortunately, this will override built-in key mappings. For example - if you overwrite the "Insert" key you will disable urxvt's + if you overwrite the "Insert" key you will disable rxvt's "Shift-Insert" mapping. To re-enable that, you can poke "holes" into the user-defined keymap using the "builtin:" replacement: @@ -931,7 +921,7 @@ RESOURCES (available also as long-options) URxvt.keysym.M-C-1: command:\033]50;suxuseuro\007 URxvt.keysym.M-C-2: command:\033]50;9x15bold\007 - Other things are possible, e.g. resizing (see urxvt(7) for more + Other things are possible, e.g. resizing (see rxvt(7) for more info): URxvt.keysym.M-C-3: command:\033[8;25;80t @@ -965,24 +955,24 @@ RESOURCES (available also as long-options) perl-eval: *string* Perl code to be evaluated when all extensions have been registered. - See the urxvtperl(3) manpage. Due to security reasons, this resource + See the rxvtperl(3) manpage. Due to security reasons, this resource will be ignored when running setuid/setgid. perl-lib: *path* Colon-separated list of additional directories that hold extension scripts. When looking for extensions specified by the "perl" - resource, urxvt will first look in these directories and then in - /usr/local/lib/urxvt/perl/. Due to security reasons, this resource + resource, rxvt will first look in these directories and then in + /opt/rxvt/lib/urxvt/perl/. Due to security reasons, this resource will be ignored when running setuid/setgid. - See the urxvtperl(3) manpage. + See the rxvtperl(3) manpage. selection.pattern-*idx*: *perl-regex* - Additional selection patterns, see the urxvtperl(3) manpage for + Additional selection patterns, see the rxvtperl(3) manpage for details. selection-autotransform.*idx*: *perl-transform* - Selection auto-transform patterns, see the urxvtperl(3) manpage for + Selection auto-transform patterns, see the rxvtperl(3) manpage for details. searchable-scrollback: *keysym* @@ -997,9 +987,9 @@ RESOURCES (available also as long-options) Sets the WM_TRANSIENT_FOR property to the given window iw. THE SCROLLBAR - Lines of text that scroll off the top of the urxvt window (resource: + Lines of text that scroll off the top of the rxvt window (resource: saveLines) and can be scrolled back using the scrollbar or by - keystrokes. The normal urxvt scrollbar has arrows and its behaviour is + keystrokes. The normal rxvt scrollbar has arrows and its behaviour is fairly intuitive. The xterm-scrollbar is without arrows and its behaviour mimics that of *xterm* @@ -1037,18 +1027,22 @@ TEXT SELECTION AND INSERTION Insertion: Pressing and releasing the Middle mouse button (or Shift-Insert) in - an urxvt window causes the current text selection to be inserted as + an rxvt window causes the current text selection to be inserted as if it had been typed on the keyboard. CHANGING FONTS Changing fonts (or font sizes, respectively) via the keypad is not yet supported in rxvt-unicode. Bug me if you need this. - You can, however, switch fonts at runtime using escape sequences (and - therefore using the menubar), e.g.: + You can, however, switch fonts at runtime using escape sequences, e.g.: printf '\e]710;%s\007' "9x15bold,xft:Kochi Gothic" + You can use keyboard shortcuts, too: + + URxvt.keysym.M-C-1: command:\033]710;suxuseuro\007\033]711;suxuseuro\007 + URxvt.keysym.M-C-2: command:\033]710;9x15bold\007\033]711;9x15bold\007 + rxvt-unicode will automatically re-apply these fonts to the output so far. @@ -1112,13 +1106,13 @@ ISO 14755 SUPPORT both scenario A and B of ISO 14755, including part 5.2. LOGIN STAMP - urxvt tries to write an entry into the *utmp*(5) file so that it can be + rxvt tries to write an entry into the *utmp*(5) file so that it can be seen via the *who(1)* command, and can accept messages. To allow this - feature, urxvt may need to be installed setuid root on some systems or + feature, rxvt may need to be installed setuid root on some systems or setgid to root or to some other group on others. COLORS AND GRAPHICS - In addition to the default foreground and background colours, urxvt can + In addition to the default foreground and background colours, rxvt 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 rgb.txt names. @@ -1152,19 +1146,19 @@ COLORS AND GRAPHICS *xterm*(1) where the colours are only swapped if they have not otherwise been specified. For example, - urxvt -fg Black -bg White -rv + rxvt -fg Black -bg White -rv would yield White on Black, while on *xterm*(1) it would yield Black on White. ENVIRONMENT - urxvt sets and/or uses the following environment variables: + rxvt sets and/or uses the following environment variables: TERM Normally set to "rxvt-unicode", unless overwritten at configure time, via resources or on the commandline. COLORTERM - Either "rxvt", "rxvt-xpm", depending on wether urxvt was compiled + Either "rxvt", "rxvt-xpm", depending on wether rxvt was compiled with XPM support, and optionally with the added extension "-mono" to indicate that rxvt-unicode runs on a monochrome screen. @@ -1174,34 +1168,34 @@ ENVIRONMENT string "default" to indicate that the default-colour escape sequence is to be used), "bg" is the colour code used as default background colour (or the string "default"), and "xpm" is the string "default" - if urxvt was compiled with XPM support. Libraries like "ncurses" and + if rxvt was compiled with XPM support. Libraries like "ncurses" and "slang" can (and do) use this information to optimize screen output. WINDOWID - Set to the (decimal) X Window ID of the urxvt window (the toplevel + Set to the (decimal) X Window ID of the rxvt window (the toplevel window, which usually has subwindows for the scrollbar, the terminal window and so on). TERMINFO - Set to the terminfo directory iff urxvt was configured with + Set to the terminfo directory iff rxvt was configured with "--with-terminfo=PATH". DISPLAY - Used by urxvt to connect to the display and set to the correct + Used by rxvt to connect to the display and set to the correct display in it's child processes. SHELL The shell to be used for command execution, defaults to "/bin/sh". RXVTPATH - The path where urxvt looks for support files such as menu and xpm + The path where rxvt looks for support files such as menu and xpm files. PATH Used in the same way as "RXVTPATH". RXVT_SOCKET - The unix domain socket path used by urxvtc(1) and urxvtd(1). + The unix domain socket path used by rxvtc(1) and rxvtd(1). Default $HOME/.rxvt-unicode-*imlocale: 
-   URxvt*imlocale: ja_JP.EUC-JP
+ URxvt.imlocale: ja_JP.EUC-JP

Now you can start your terminal with LC_CTYPE=ja_JP.UTF-8 and still diff --git a/doc/rxvt.7.man.in b/doc/rxvt.7.man.in index 778ac620..4465bce5 100644 --- a/doc/rxvt.7.man.in +++ b/doc/rxvt.7.man.in @@ -777,7 +777,7 @@ You can specify separate locales for the input method and the rest of the terminal, using the resource \f(CW\*(C`imlocale\*(C'\fR: .Sp .Vb 1 -\& URxvt*imlocale: ja_JP.EUC-JP +\& URxvt.imlocale: ja_JP.EUC-JP .Ve .Sp Now you can start your terminal with \f(CW\*(C`LC_CTYPE=ja_JP.UTF\-8\*(C'\fR and still diff --git a/doc/rxvt.7.pod b/doc/rxvt.7.pod index a1cb4e24..f3a8f0d8 100644 --- a/doc/rxvt.7.pod +++ b/doc/rxvt.7.pod @@ -618,7 +618,7 @@ enable freetype autohinting, i.e. like this: You can specify separate locales for the input method and the rest of the terminal, using the resource C: - URxvt*imlocale: ja_JP.EUC-JP + URxvt.imlocale: ja_JP.EUC-JP Now you can start your terminal with C and still use your input method. Please note, however, that you will not be able to diff --git a/doc/rxvt.7.txt b/doc/rxvt.7.txt index 32c0363b..c7657d12 100644 --- a/doc/rxvt.7.txt +++ b/doc/rxvt.7.txt @@ -603,7 +603,7 @@ FREQUENTLY ASKED QUESTIONS You can specify separate locales for the input method and the rest of the terminal, using the resource "imlocale": - URxvt*imlocale: ja_JP.EUC-JP + URxvt.imlocale: ja_JP.EUC-JP Now you can start your terminal with "LC_CTYPE=ja_JP.UTF-8" and still use your input method. Please note, however, that you will not diff --git a/doc/rxvtperl.3.man.in b/doc/rxvtperl.3.man.in index d1a5f461..78488f4d 100644 --- a/doc/rxvtperl.3.man.in +++ b/doc/rxvtperl.3.man.in @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "rxvt 3" -.TH rxvt 3 "2006-01-15" "7.0" "RXVT-UNICODE" +.TH rxvt 3 "2006-01-16" "7.0" "RXVT-UNICODE" .SH "NAME" @@RXVT_NAME@@perl \- rxvt\-unicode's embedded perl interpreter .SH "SYNOPSIS" diff --git a/src/Makefile.in b/src/Makefile.in index 5a5f563f..537fabc0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -11,8 +11,7 @@ basedir = .. thisdir = src # for developers: the following debug options may be used -# -DDEBUG_CMD -DDEBUG_MAIN -DDEBUG_MENU -DDEBUG_MENUARROWS -# -DDEBUG_MENUBAR_STACKING -DDEBUG_MENU_LAYOUT -DDEBUG_RESOURCES +# -DDEBUG_CMD -DDEBUG_MAIN -DDEBUG_RESOURCES # -DDEBUG_SEARCH_PATH -DDEBUG_SIZE -DDEBUG_TTY -DDEBUG_TTYMODE # -DDEBUG_KEYBOARD DEBUG=-DDEBUG_STRICT @DEBUG@ diff --git a/src/command.C b/src/command.C index b12df331..ca38a84c 100644 --- a/src/command.C +++ b/src/command.C @@ -921,9 +921,7 @@ rxvt_term::lookup_key (XKeyEvent &ev) } /*}}} */ -#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) -/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ -/* attempt to `write' count to the input buffer */ +#if defined (KEYSYM_RESOURCE) unsigned int rxvt_term::cmd_write (const char *str, unsigned int count) { @@ -1589,10 +1587,6 @@ rxvt_term::x_cb (XEvent &ev) scrollBar.setIdle (); scrollbar_show (0); } -#ifdef MENUBAR - if (menubar_visible () && isMenuBarWindow (ev.xany.window)) - menubar_expose (); -#endif #ifdef TRANSPARENT if (am_transparent && ev.xany.window == parent[0]) @@ -1605,13 +1599,6 @@ rxvt_term::x_cb (XEvent &ev) #ifdef POINTER_BLANK if (hidden_pointer) pointer_unblank (); -#endif -#if MENUBAR - if (isMenuBarWindow (ev.xany.window)) - { - menubar_control (ev.xbutton); - break; - } #endif if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) break; @@ -2100,14 +2087,6 @@ rxvt_term::button_press (XButtonEvent &ev) return; } - -#if MENUBAR - /* - * Menubar window processing of button press - */ - if (isMenuBarWindow (ev.window)) - menubar_control (ev); -#endif } void @@ -2226,10 +2205,6 @@ rxvt_term::button_release (XButtonEvent &ev) #endif } } -#ifdef MENUBAR - else if (isMenuBarWindow (ev.window)) - menubar_control (ev); -#endif } #ifdef TRANSPARENT @@ -3960,12 +3935,6 @@ rxvt_term::process_xterm_seq (int op, const char *str, char resp) // TODO, when secure mode? break; -#ifdef MENUBAR - case URxvt_Menu: - if (OPTION (Opt_insecure)) - menubar_dispatch (const_cast(str)); // casting away constness is checked - break; -#endif #if 0 case Rxvt_dumpscreen: /* no error notices */ { @@ -4092,9 +4061,6 @@ rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), u { 7, PrivMode_Autowrap }, // 8, bi-directional support mode { 9, PrivMode_MouseX10 }, -#ifdef menuBar_esc - { menuBar_esc, PrivMode_menuBar }, -#endif // 18, 19 printing-related { 25, PrivMode_VisibleCursor }, #ifdef scrollBar_esc @@ -4199,13 +4165,6 @@ rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), u if (state) /* orthogonal */ priv_modes &= ~PrivMode_MouseX11; break; -#ifdef menuBar_esc - case menuBar_esc: -#ifdef MENUBAR - map_menuBar (state); -#endif - break; -#endif #ifdef scrollBar_esc case scrollBar_esc: if (scrollbar_mapping (state)) diff --git a/src/feature.h b/src/feature.h index 25572037..07acf73f 100644 --- a/src/feature.h +++ b/src/feature.h @@ -295,26 +295,6 @@ */ /* #define SB_BORDER */ -/*------------------------------MENU BAR--------------------------------*/ -/* - * Choose how many of (experimental) menuBars you want to be able to stack at - * one time. - * A value of 1 disables menuBar stacking. - * A value of 0 disables menuBar all together. - * Note that the amount of memory overhead is the same for any value >= 2. - */ -#define MENUBAR_MAX 16 - -/* - * Change the default shadow style - */ -/* #define MENUBAR_SHADOW_IN */ - -/* - * Change the default shadow style - */ -#define MENU_SHADOW_IN - /*---------------------------MULTILINGUAL-------------------------------*/ /* * Allow run-time selection of Meta (Alt) to set the 8th bit on diff --git a/src/init.C b/src/init.C index 29a6e24c..77f031f1 100644 --- a/src/init.C +++ b/src/init.C @@ -258,13 +258,6 @@ rxvt_term::init_vars () last_bot = last_state = -1; -#ifdef MENUBAR - menu_readonly = 1; -# if ! (MENUBAR_MAX > 1) - CurrentBar = &BarList; -# endif /* (MENUBAR_MAX > 1) */ -#endif - return true; } @@ -672,18 +665,12 @@ rxvt_term::init_command (const char *const *argv) #endif /* add value for scrollBar */ - if (scrollbar_visible ()) + if (scrollBar.state) { priv_modes |= PrivMode_scrollBar; SavedModes |= PrivMode_scrollBar; } - if (menubar_visible ()) - { - priv_modes |= PrivMode_menuBar; - SavedModes |= PrivMode_menuBar; - } - run_command (argv); } @@ -759,7 +746,7 @@ rxvt_term::Get_Colours () } /* - * get scrollBar/menuBar shadow colors + * get scrollBar shadow colors * * The calculations of topShadow/bottomShadow values are adapted * from the fvwm window manager. @@ -1073,8 +1060,8 @@ rxvt_term::create_windows (int argc, const char *const *argv) /* vt cursor: Black-on-White is standard, but this is more popular */ TermWin_cursor = XCreateFontCursor (disp, XC_xterm); -#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) - /* cursor (menuBar/scrollBar): Black-on-White */ +#ifdef HAVE_SCROLLBARS + /* cursor scrollBar: Black-on-White */ leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); #endif @@ -1105,32 +1092,6 @@ rxvt_term::create_windows (int argc, const char *const *argv) vt_ev.start (display, vt); -#if defined(MENUBAR) && (MENUBAR_MAX > 1) - if (menuBar_height ()) - { - menuBar.win = XCreateSimpleWindow (disp, top, - window_vt_x, 0, - width, - menuBar_TotalHeight (), - 0, - pix_colors_focused[Color_fg], - pix_colors_focused[Color_scroll]); - -#ifdef DEBUG_X - XStoreName (disp, menuBar.win, "menubar"); -#endif - - menuBar.drawable = new rxvt_drawable (display, menuBar.win); - - XDefineCursor (disp, menuBar.win, - XCreateFontCursor (disp, XC_left_ptr)); - - XSelectInput (disp, menuBar.win, - (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask)); - menubar_ev.start (display, menuBar.win); - } -#endif - #ifdef XPM_BACKGROUND if (rs[Rs_backgroundPixmap] != NULL && ! OPTION (Opt_transparent)) @@ -1158,7 +1119,7 @@ rxvt_term::create_windows (int argc, const char *const *argv) drawable = new rxvt_drawable (display, vt); -#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) +#ifdef RXVT_SCROLLBAR gcvalue.foreground = pix_colors[Color_topShadow]; topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); gcvalue.foreground = pix_colors[Color_bottomShadow]; diff --git a/src/main.C b/src/main.C index 0753ee8c..08b622af 100644 --- a/src/main.C +++ b/src/main.C @@ -163,9 +163,6 @@ rxvt_term::rxvt_term () #ifdef HAVE_SCROLLBARS scrollbar_ev (this, &rxvt_term::x_cb), #endif -#ifdef MENUBAR - menubar_ev (this, &rxvt_term::x_cb), -#endif #ifdef CURSOR_BLINK cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), #endif @@ -245,9 +242,6 @@ rxvt_term::~rxvt_term () #ifdef USE_XIM im_destroy (); #endif -#ifdef MENUBAR - if (menubarGC) XFreeGC (disp, menubarGC); -#endif #ifdef XTERM_SCROLLBAR if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); if (ShadowGC) XFreeGC (disp, ShadowGC); @@ -267,18 +261,13 @@ rxvt_term::~rxvt_term () if (upArrowHi) XFreePixmap (disp, upArrowHi); if (downArrowHi) XFreePixmap (disp, downArrowHi); #endif -#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) +#ifdef RXVT_SCROLLBAR if (topShadowGC) XFreeGC (disp, topShadowGC); if (botShadowGC) XFreeGC (disp, botShadowGC); if (scrollbarGC) XFreeGC (disp, scrollbarGC); #endif if (gc) XFreeGC (disp, gc); -#if defined(MENUBAR) && (MENUBAR_MAX > 1) - delete menuBar.drawable; - //if (menuBar.win) - // XDestroyWindow (disp, menuBar.win); -#endif delete drawable; // destroy all windows if (parent[0]) @@ -344,9 +333,6 @@ rxvt_term::destroy () #if HAVE_SCROLLBARS scrollbar_ev.stop (display); #endif -#if MENUBAR - menubar_ev.stop (display); -#endif #if TRANSPARENT rootwin_ev.stop (display); #endif @@ -494,9 +480,6 @@ rxvt_term::init (int argc, const char *const *argv) keyboard->register_done (); #endif -#if MENUBAR_MAX - menubar_read (rs[Rs_menu]); -#endif #ifdef HAVE_SCROLLBARS if (OPTION (Opt_scrollBar)) scrollBar.setIdle (); /* set existence for size calculations */ @@ -544,10 +527,6 @@ rxvt_term::init (int argc, const char *const *argv) if (OPTION (Opt_scrollBar)) resize_scrollbar (); /* create and map scrollbar */ #endif -#if (MENUBAR_MAX) - if (menubar_visible ()) - XMapWindow (disp, menuBar.win); -#endif #ifdef TRANSPARENT if (OPTION (Opt_transparent)) { @@ -764,7 +743,7 @@ void rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) { short recalc_x, recalc_y; - int x, y, sb_w, mb_h, flags; + int x, y, sb_w, flags; unsigned int w, h; unsigned int max_width, max_height; dDisp; @@ -835,10 +814,10 @@ rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) szHint.base_width = szHint.base_height = 2 * int_bwidth; - sb_w = mb_h = 0; + sb_w = 0; window_vt_x = window_vt_y = int_bwidth; - if (scrollbar_visible ()) + if (scrollBar.state) { sb_w = scrollbar_TotalWidth (); szHint.base_width += sb_w; @@ -846,13 +825,6 @@ rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) window_vt_x += sb_w; } - if (menubar_visible ()) - { - mb_h = menuBar_TotalHeight (); - szHint.base_height += mb_h; - window_vt_y += mb_h; - } - szHint.width_inc = fwidth; szHint.height_inc = fheight; szHint.min_width = szHint.base_width + szHint.width_inc; @@ -880,7 +852,7 @@ rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) szHint.height = szHint.base_height + height; } - if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) + if (scrollBar.state && OPTION (Opt_scrollBar_right)) window_sb_x = szHint.width - sb_w; if (recalc_x) @@ -1245,7 +1217,7 @@ rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, in if (fix_screen || newwidth != old_width || newheight != old_height) { - if (scrollbar_visible ()) + if (scrollBar.state) { XMoveResizeWindow (disp, scrollBar.win, window_sb_x, 0, @@ -1253,11 +1225,6 @@ rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, in resize_scrollbar (); } - if (menubar_visible ()) - XMoveResizeWindow (disp, menuBar.win, - window_vt_x, 0, - width, menuBar_TotalHeight ()); - XMoveResizeWindow (disp, vt, window_vt_x, window_vt_y, width, height); diff --git a/src/misc.C b/src/misc.C index 51bcb81e..d2ca864e 100644 --- a/src/misc.C +++ b/src/misc.C @@ -440,7 +440,7 @@ rxvt_freecommastring (char **cs) /* #define DEBUG_SEARCH_PATH */ -#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) +#ifdef XPM_BACKGROUND /* * search for FILE in the current working directory, and within the * colon-delimited PATHLIST, adding the file extension EXT if required. @@ -536,7 +536,7 @@ rxvt_File_find (const char *file, const char *ext, const char *path) return f; } -#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ +#endif /*----------------------------------------------------------------------* * miscellaneous drawing routines @@ -545,7 +545,7 @@ rxvt_File_find (const char *file, const char *ext, const char *path) /* * Draw top/left and bottom/right border shadows around windows */ -#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) +#ifdef RXVT_SCROLLBAR void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h) { @@ -564,49 +564,6 @@ rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int } #endif -/* button shapes */ -#ifdef MENUBAR -void -rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type) -{ - switch (type) - { - case 'r': /* right triangle */ - XDrawLine (display, win, topShadow, x, y, x, y + w); - XDrawLine (display, win, topShadow, x, y, x + w, y + w / 2); - XDrawLine (display, win, botShadow, x, y + w, x + w, y + w / 2); - break; - - case 'l': /* left triangle */ - XDrawLine (display, win, botShadow, x + w, y + w, x + w, y); - XDrawLine (display, win, botShadow, x + w, y + w, x, y + w / 2); - XDrawLine (display, win, topShadow, x, y + w / 2, x + w, y); - break; - - case 'd': /* down triangle */ - XDrawLine (display, win, topShadow, x, y, x + w / 2, y + w); - XDrawLine (display, win, topShadow, x, y, x + w, y); - XDrawLine (display, win, botShadow, x + w, y, x + w / 2, y + w); - break; - - case 'u': /* up triangle */ - XDrawLine (display, win, botShadow, x + w, y + w, x + w / 2, y); - XDrawLine (display, win, botShadow, x + w, y + w, x, y + w); - XDrawLine (display, win, topShadow, x, y + w, x + w / 2, y); - break; -#if 0 - case 's': /* square */ - XDrawLine (display, win, topShadow, x + w, y, x, y); - XDrawLine (display, win, topShadow, x, y, x, y + w); - XDrawLine (display, win, botShadow, x, y + w, x + w, y + w); - XDrawLine (display, win, botShadow, x + w, y + w, x + w, y); - break; -#endif - - } -} -#endif - // should not be used in interactive programs, for obvious reasons void rxvt_usleep (int usecs) { diff --git a/src/rsinc.h b/src/rsinc.h index 8105f1e1..36aab7ea 100644 --- a/src/rsinc.h +++ b/src/rsinc.h @@ -16,14 +16,9 @@ #endif def (name) def (title) -#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) - def (path) -#endif #ifdef XPM_BACKGROUND + def (path) def (backgroundPixmap) -#endif -#if (MENUBAR_MAX) - def (menu) #endif def (loginShell) def (jumpScroll) diff --git a/src/rxvt.h b/src/rxvt.h index 3689b0d6..1158d41a 100644 --- a/src/rxvt.h +++ b/src/rxvt.h @@ -160,18 +160,10 @@ inline void set_environ (char **envv) */ struct grwin_t; -/* Sanitize menubar info */ -#ifndef MENUBAR -# undef MENUBAR_MAX -#endif -#ifndef MENUBAR_MAX -# define MENUBAR_MAX 0 -#endif - /* If we're using either the rxvt scrollbar or menu bars, keep the * scrollColor resource. */ -#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) +#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR) # define KEEP_SCROLLCOLOR 1 #else # undef KEEP_SCROLLCOLOR @@ -262,15 +254,13 @@ typedef struct _mwmhints { # define EXIT_FAILURE 1 /* exit function failure */ #endif -#define menuBar_esc 10 #define scrollBar_esc 30 -#define menuBar_margin 2 /* margin below text */ #if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) # define HAVE_SCROLLBARS 1 #endif -/* width of scrollBar, menuBar shadow, must be 1 or 2 */ +/* width of scrollBar shadow, must be 1 or 2 */ #ifdef HALFSHADOW # define MENU_SHADOW 1 #else @@ -658,14 +648,13 @@ enum { #define PrivMode_MouseX10 (1UL<<12) #define PrivMode_MouseX11 (1UL<<13) #define PrivMode_scrollBar (1UL<<14) -#define PrivMode_menuBar (1UL<<15) -#define PrivMode_TtyOutputInh (1UL<<16) -#define PrivMode_Keypress (1UL<<17) -#define PrivMode_smoothScroll (1UL<<18) -#define PrivMode_vt52 (1UL<<19) -#define PrivMode_LFNL (1UL<<20) +#define PrivMode_TtyOutputInh (1UL<<15) +#define PrivMode_Keypress (1UL<<16) +#define PrivMode_smoothScroll (1UL<<17) +#define PrivMode_vt52 (1UL<<18) +#define PrivMode_LFNL (1UL<<19) /* too annoying to implement X11 highlight tracking */ -/* #define PrivMode_MouseX11Track (1LU<<21) */ +/* #define PrivMode_MouseX11Track (1LU<<20) */ #define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) #define PrivMode(test,bit) \ @@ -805,17 +794,6 @@ enum { #define scrollbar_size() (scrollBar.end - scrollBar.beg \ - scrollbar_minheight ()) -#if (MENUBAR_MAX > 1) -/* rendition style flags */ -# define menuBar_height() (fheight + MENU_SHADOW) -# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin) -# define isMenuBarWindow(w) ((w) == menuBar.win) -#else -# define menuBar_height() (0) -# define menuBar_TotalHeight() (0) -# define isMenuBarWindow(w) (0) -#endif - #ifdef XPM_BACKGROUND # define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) #else @@ -879,10 +857,6 @@ extern void rxvt_pop_locale (); /****************************************************************************/ -#ifdef MENUBAR -# include "menubar.h" -#endif - #define BLINK_INTERVAL 0.5 #define TEXT_BLINK_INTERVAL 0.5 @@ -1075,13 +1049,6 @@ struct rxvt_term : zero_initialized, rxvt_vars { last_top, /* scrollbar last top position */ last_state, /* scrollbar last state */ scrollbar_len, -#ifdef MENUBAR - menu_readonly, /* okay to alter menu? */ - Arrows_x, -#endif -#if MENUBAR_MAX > 1 - Nbars, -#endif window_vt_x, window_vt_y, window_sb_x, @@ -1100,10 +1067,7 @@ struct rxvt_term : zero_initialized, rxvt_vars { /* ---------- */ Atom xa[NUM_XA]; /* ---------- */ -#ifdef MENUBAR - GC menubarGC; -#endif -#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) +#ifdef RXVT_SCROLLBAR GC scrollbarGC, topShadowGC, botShadowGC; @@ -1162,14 +1126,6 @@ struct rxvt_term : zero_initialized, rxvt_vars { bgPixmap_t bgPixmap; XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ #endif -#ifdef MENUBAR - menu_t *ActiveMenu, /* currently active menu */ - *BuildMenu; /* the menu currently being built */ - bar_t *CurrentBar; -# if ! (MENUBAR_MAX > 1) - bar_t BarList; -# endif /* (MENUBAR_MAX > 1) */ -#endif #if ENABLE_OVERLAY int ov_x, ov_y, ov_w, ov_h; // overlay dimensions @@ -1245,9 +1201,6 @@ struct rxvt_term : zero_initialized, rxvt_vars { #ifdef HAVE_SCROLLBARS xevent_watcher scrollbar_ev; #endif -#ifdef MENUBAR - xevent_watcher menubar_ev; -#endif void check_cb (check_watcher &w); check_watcher check_ev; void destroy_cb (time_watcher &w); time_watcher destroy_ev; @@ -1402,39 +1355,6 @@ struct rxvt_term : zero_initialized, rxvt_vars { int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); void set_widthheight (unsigned int newwidth, unsigned int newheight); -#ifdef MENUBAR - // menubar.C - void menuitem_free (menu_t *menu, menuitem_t *item); - int action_dispatch (action_t *action); - void menuarrow_free (char name); - void menuarrow_add (char *string); - char *menu_find_base (menu_t **menu, char *path); - menu_t *menu_delete (menu_t *menu); - menu_t *menu_add (menu_t *parent, char *path); - void drawbox_menubar (int x, int len, int state); - void drawtriangle (int x, int y, int state); - void drawbox_menuitem (int y, int state); - void menu_show (); - void menu_display (void (rxvt_term::*update) ()); - void menu_hide_all (); - void menu_hide (); - void menu_clear (menu_t *menu); - void menubar_clear (); - bar_t *menubar_find (const char *name); - int menubar_push (const char *name); - void menubar_remove (const char *name); - void menubar_dump (FILE *fp); - void menubar_read (const char *filename); - void menubar_dispatch (char *str); - void draw_Arrows (int name, int state); - void menubar_expose (); - int menubar_mapping (int map); - int menu_select (XButtonEvent &ev); - void menubar_select (XButtonEvent &ev); - void menubar_control (XButtonEvent &ev); - void map_menuBar (int map); -#endif - // screen.C void lalloc (line_t &l) const diff --git a/src/rxvtlib.h.in b/src/rxvtlib.h.in index 98145bfa..fdc7d6cd 100644 --- a/src/rxvtlib.h.in +++ b/src/rxvtlib.h.in @@ -65,9 +65,6 @@ extern rxvt_t rxvt_current_term; #define SET_R(r) rxvt_current_term = const_cast(r) #define GET_R rxvt_current_term -#define scrollbar_visible() scrollBar.state -#define menubar_visible() menuBar.state - typedef struct { int row; int col; @@ -217,12 +214,6 @@ enum { /* ------------------------------------------------------------------------- */ -typedef struct { - short state; - Window win; - struct rxvt_drawable *drawable; -} menuBar_t; - typedef struct { char state; /* scrollbar state */ char init; /* scrollbar has been initialised */ @@ -243,7 +234,6 @@ typedef struct { struct rxvt_vars : TermWin_t { scrollBar_t scrollBar; - menuBar_t menuBar; uint32_t options; XSizeHints szHint; rxvt_display *display; diff --git a/src/rxvtperl.xs b/src/rxvtperl.xs index 9486e63e..6cd8dac1 100644 --- a/src/rxvtperl.xs +++ b/src/rxvtperl.xs @@ -41,7 +41,7 @@ #include "perlxsi.c" -#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) +#ifdef HAVE_SCROLLBARS # define GRAB_CURSOR THIS->leftptr_cursor #else # define GRAB_CURSOR None diff --git a/src/scrollbar.C b/src/scrollbar.C index 0a12edf7..941620f0 100644 --- a/src/scrollbar.C +++ b/src/scrollbar.C @@ -150,7 +150,7 @@ rxvt_term::scrollbar_show (int update) #ifdef HAVE_SCROLLBARS int top, bot, len, adj; - if (!scrollbar_visible ()) + if (!scrollBar.state) return 0; if (update) diff --git a/src/xdefaults.C b/src/xdefaults.C index c265d577..fe3c2bb2 100644 --- a/src/xdefaults.C +++ b/src/xdefaults.C @@ -189,14 +189,9 @@ optList[] = { STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), -#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) - RSTRG (Rs_path, "path", "search path"), -#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ #ifdef XPM_BACKGROUND + RSTRG (Rs_path, "path", "search path"), STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), -#endif /* XPM_BACKGROUND */ -#if (MENUBAR_MAX) - RSTRG (Rs_menu, "menu", "name[;tag]"), #endif /* fonts: command-line option = resource name */ STRG (Rs_font, "font", "fn", "fontname", "normal text font"), @@ -328,9 +323,6 @@ static const char optionsstring[] = "options: " #if defined(UTMP_SUPPORT) "utmp," #endif -#if defined(MENUBAR) - "menubar," -#endif #if defined(USE_XIM) "XIM," #endif -- 2.34.1