ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.54 by root, Fri Feb 11 17:19:30 2005 UTC vs.
Revision 1.137 by root, Sun Jun 15 13:54:15 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: xdefaults.C 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
10 * 11 *
11 * This program is free software; you can redistribute it and/or modify 12 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 13 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 15 * (at your option) any later version.
… …
20 * 21 *
21 * You should have received a copy of the GNU General Public License 22 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 23 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 24 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 25 *----------------------------------------------------------------------*/
25/*----------------------------------------------------------------------*
26 * get resources from ~/.Xdefaults or ~/.Xresources with the memory-saving
27 * default or with XGetDefault() (#define USE_XGETDEFAULT)
28 *----------------------------------------------------------------------*/
29 26
30#include "../config.h" /* NECESSARY */ 27#include "../config.h"
31#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h"
32#include "version.h" 29#include "version.h"
33 30
34#include <sys/utsname.h>
35
36#ifdef KEYSYM_RESOURCE 31#ifdef KEYSYM_RESOURCE
37#include "keyboard.h" 32# include "keyboard.h"
38#endif 33#endif
39 34
40/* #define DEBUG_RESOURCES */ 35/* place holders used for parsing command-line options */
36#define Optflag_Reverse 1
37#define Optflag_Boolean 2
38#define Optflag_Switch 4
41 39
42/*{{{ monolithic option/resource structure: */ 40/* monolithic option/resource structure: */
43/* 41/*
44 * `string' options MUST have a usage argument 42 * `string' options MUST have a usage argument
45 * `switch' and `boolean' options have no argument 43 * `switch' and `boolean' options have no argument
46 * if there's no desc (ription), it won't appear in rxvt_usage () 44 * if there's no desc (ription), it won't appear in rxvt_usage ()
47 */ 45 */
48 46
49/* INFO () - descriptive information only */ 47/* INFO () - descriptive information only */
50#define INFO(opt, arg, desc) \ 48#define INFO(opt, arg, desc) \
51 {0, -1, NULL, (opt), (arg), (desc)} 49 {0, 0, -1, NULL, (opt), (arg), (desc)}
52 50
53/* STRG () - command-line option, with/without resource */ 51/* STRG () - command-line option, with/without resource */
54#define STRG(rsp, kw, opt, arg, desc) \ 52#define STRG(rsp, kw, opt, arg, desc) \
55 {0, (rsp), (kw), (opt), (arg), (desc)} 53 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
56 54
57/* RSTRG () - resource/long-option */ 55/* RSTRG () - resource/long-option */
58#define RSTRG(rsp, kw, arg) \ 56#define RSTRG(rsp, kw, arg) \
59 {0, (rsp), (kw), NULL, (arg), NULL} 57 {0, 0, (rsp), (kw), NULL, (arg), NULL}
60 58
61/* BOOL () - regular boolean `-/+' flag */ 59/* BOOL () - regular boolean `-/+' flag */
62#define BOOL(rsp, kw, opt, flag, desc) \ 60#define BOOL(rsp, kw, opt, option, flag, desc) \
63 { (Opt_Boolean| (flag)), (rsp), (kw), (opt), NULL, (desc)} 61 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
64 62
65/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
66#define SWCH(opt, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
67 { (flag), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
68 66
69/* convenient macros */ 67/* convenient macros */
70#define optList_strlen(i) \ 68#define optList_isString(i) \
71 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag == 0)
72#define optList_isBool(i) \ 70#define optList_isBool(i) \
73 (optList[i].flag & Opt_Boolean) 71 (optList[i].flag & Optflag_Boolean)
74#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
75 (optList[i].flag & Opt_Reverse) 73 (optList[i].flag & Optflag_Reverse)
76#define optList_size \ 74#define optList_size \
77 (sizeof (optList) / sizeof (optList[0])) 75 (sizeof (optList) / sizeof (optList[0]))
78 76
79static const struct 77static const struct
80 { 78 {
79 const uint8_t index; /* Option index */
81 const unsigned long flag; /* Option flag */ 80 const uint8_t flag; /* Option flag */
82 const int doff; /* data offset */ 81 const int16_t doff; /* resource value index or -1 */
83 const char *kw; /* keyword */ 82 const char *kw; /* keyword */
84 const char *opt; /* option */ 83 const char *opt; /* option */
85 const char *arg; /* argument */ 84 const char *arg; /* argument */
86 const char *desc; /* description */ 85 const char *desc; /* description */
87 } 86 }
… …
89 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 88 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
90 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 89 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
91 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"), 90 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
92 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
93 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
94 SWCH ("C", Opt_console, "intercept console messages"), 93 SWCH ("C", Opt_console, 0, "intercept console messages"),
95 SWCH ("iconic", Opt_iconic, "start iconic"), 94 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
96 SWCH ("ic", Opt_iconic, NULL), /* short form */ 95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
96 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
100 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 101 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
101#ifdef HAVE_SCROLLBARS
102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
108#endif
109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
110 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
113#ifdef TRANSPARENT 112#if ENABLE_TRANSPARENCY
114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
115 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"), 114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
116 SWCH ("tr", Opt_transparent, NULL),
117#if TINTING
118 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
119#endif 117#endif
120#endif
121#ifdef OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
122 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."), 119 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
123#endif 121#endif
124#ifdef TINTING
125 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
126#endif
127 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
128#ifndef NO_BELL 123#ifndef NO_BELL
124# if ENABLE_FRILLS
125 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
126# endif
129 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 127 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
130# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 128# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
131 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 129 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
132# endif 130# endif
133#endif 131#endif
134#ifdef META8_OPTION 132#ifdef META8_OPTION
135 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 133 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
136#endif 134#endif
137#ifdef MOUSE_WHEEL 135#ifdef MOUSE_WHEEL
138 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 136 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
139#endif 137#endif
140#if ENABLE_FRILLS 138#if ENABLE_FRILLS
141 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 139 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
142 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 140 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
141 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
143#endif 142#endif
144#ifdef CURSOR_BLINK 143#if CURSOR_BLINK
145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 144 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
146#endif 145#endif
147#ifdef POINTER_BLANK 146#ifdef POINTER_BLANK
148 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 147 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
149#endif 148#endif
150 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 149 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
151 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 150 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
152 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 151 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
153 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 152 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
155 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 154 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
156 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 155 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
157 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 156 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
158 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 157 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
159 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 158 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
160#ifndef NO_BRIGHTCOLOR
161 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 159 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
162 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
163 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
164 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 162 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
165 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 163 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
166 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 164 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
167 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 165 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
169#endif /* NO_BRIGHTCOLOR */
170#ifndef NO_BOLD_UNDERLINE_REVERSE 167#ifndef NO_BOLD_UNDERLINE_REVERSE
171 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 168 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
172 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 169 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
173 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 170 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
174 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
175#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
176#if ENABLE_FRILLS 173#if ENABLE_FRILLS
177 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
178#endif 175#endif
179#ifdef KEEP_SCROLLCOLOR
180 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
177#ifdef RXVT_SCROLLBAR
181 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
182#endif /* KEEP_SCROLLCOLOR */ 179#endif
183#ifdef OPTION_HC 180#ifdef OPTION_HC
184 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
185#endif 182#endif
186#ifndef NO_CURSORCOLOR 183#ifndef NO_CURSORCOLOR
187 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
188 /* command-line option = resource name */ 185 /* command-line option = resource name */
189 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
190#endif /* NO_CURSORCOLOR */ 187#endif /* NO_CURSORCOLOR */
191 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
192 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
193 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
194#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 191#ifdef BG_IMAGE_FROM_FILE
195 RSTRG (Rs_path, "path", "search path"), 192 RSTRG (Rs_path, "path", "search path"),
196#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
197#ifdef XPM_BACKGROUND
198 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
199#endif /* XPM_BACKGROUND */
200#if (MENUBAR_MAX)
201 RSTRG (Rs_menu, "menu", "name[;tag]"),
202#endif 194#endif
203 /* fonts: command-line option = resource name */ 195 /* fonts: command-line option = resource name */
204 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
205#if ENABLE_STYLES 197#if ENABLE_STYLES
206 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
207 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 199 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
208 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 200 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
201 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
209#endif 202#endif
210#ifdef USE_XIM 203#ifdef USE_XIM
211 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
212 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 205 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
213 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 206 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
214 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 207 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
215#endif /* USE_XIM */ 208#endif /* USE_XIM */
216 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 209 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
217 STRG (Rs_title, "title", "title", "string", "title name for window"), 210 STRG (Rs_title, "title", "title", "string", "title name for window"),
218 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 211 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
219 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
220 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 213 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
214#if ENABLE_XEMBED
215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
216#endif
217#if XFT
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
219 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
220#endif
221#if ENABLE_FRILLS 221#if ENABLE_FRILLS
222 RSTRG (Rs_transient_for, "transient-for", "windowid"),
223 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
224 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
225 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
222 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 226 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
223 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
224 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
225 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
226 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
227 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232#endif
233#ifdef BUILTIN_GLYPHS
234 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
228#endif 235#endif
229#ifdef POINTER_BLANK 236#ifdef POINTER_BLANK
230 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 237 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
231#endif 238#endif
232#ifndef NO_BACKSPACE_KEY 239#ifndef NO_BACKSPACE_KEY
233 RSTRG (Rs_backspace_key, "backspacekey", "string"), 240 RSTRG (Rs_backspace_key, "backspacekey", "string"),
234#endif 241#endif
235#ifndef NO_DELETE_KEY 242#ifndef NO_DELETE_KEY
236 RSTRG (Rs_delete_key, "deletekey", "string"), 243 RSTRG (Rs_delete_key, "deletekey", "string"),
237#endif 244#endif
238 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
239#ifdef PRINTPIPE 245#ifdef PRINTPIPE
240 RSTRG (Rs_print_pipe, "print-pipe", "string"), 246 RSTRG (Rs_print_pipe, "print-pipe", "string"),
241#endif 247#endif
242 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
243#ifdef CUTCHAR_RESOURCE
244 RSTRG (Rs_cutchars, "cutchars", "string"), 249 RSTRG (Rs_cutchars, "cutchars", "string"),
245#endif /* CUTCHAR_RESOURCE */
246 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 250 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
247#ifndef NO_SECONDARY_SCREEN 251#ifndef NO_SECONDARY_SCREEN
248 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
249 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
250#endif 254#endif
251#if 0 && TODO 255#if ENABLE_PERL
252#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT) 256 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
253 INFO ("xrm", "string", "X resource"), 257 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
258 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
259 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
254#endif 260#endif
261#if ISO_14755
262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif
264#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
266 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
255#endif 267#endif
256 INFO ("e", "command arg ...", "command to execute") 268 INFO ("e", "command arg ...", "command to execute")
257 }; 269 };
258 270
259#undef INFO 271#undef INFO
260#undef STRG 272#undef STRG
261#undef RSTRG 273#undef RSTRG
262#undef SWCH 274#undef SWCH
263#undef BOOL 275#undef BOOL
264/*}}} */
265 276
266static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 277static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
267static const char optionsstring[] = "options: " 278static const char optionsstring[] = "options: "
279#if ENABLE_PERL
280 "perl,"
281#endif
268#if XFT 282#if XFT
269 "xft," 283 "xft,"
270#endif 284#endif
271#if ENABLE_STYLES 285#if ENABLE_STYLES
272 "styles," 286 "styles,"
… …
301#endif 315#endif
302 "," 316 ","
303#if OFF_FOCUS_FADING 317#if OFF_FOCUS_FADING
304 "fade," 318 "fade,"
305#endif 319#endif
306#if defined(XPM_BACKGROUND)
307 "XPM,"
308#endif
309#if defined(TRANSPARENT) 320#if defined(ENABLE_TRANSPARENCY)
310 "transparent," 321 "transparent,"
311#endif
312#if TINTING
313 "tint," 322 "tint,"
314#endif 323#endif
315#if defined(UTMP_SUPPORT) 324#if HAVE_AFTERIMAGE
316 "utmp," 325 "afterimage,"
317#endif
318#if defined(MENUBAR)
319 "menubar,"
320#endif 326#endif
321#if defined(USE_XIM) 327#if defined(USE_XIM)
322 "XIM," 328 "XIM,"
323#endif 329#endif
324 "scrollbars="
325#if !defined(HAVE_SCROLLBARS)
326 "NONE"
327#else
328# if defined(PLAIN_SCROLLBAR)
329 "plain"
330# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
331 "+"
332# endif
333# endif
334# if defined(RXVT_SCROLLBAR)
335 "rxvt"
336# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
337 "+"
338# endif
339# endif
340# if defined(NEXT_SCROLLBAR)
341 "NeXT"
342# if defined(XTERM_SCROLLBAR)
343 "+"
344# endif
345# endif
346# if defined(XTERM_SCROLLBAR)
347 "xterm"
348# endif
349#endif
350 ","
351#if defined(NO_BACKSPACE_KEY) 330#if defined(NO_BACKSPACE_KEY)
352 "no_backspace," 331 "no_backspace,"
353#endif 332#endif
354#if defined(NO_DELETE_KEY) 333#if defined(NO_DELETE_KEY)
355 "no_delete," 334 "no_delete,"
356#endif 335#endif
357#if EIGHT_BIT_CONTROLS 336#if EIGHT_BIT_CONTROLS
358 "8bitctrls," 337 "8bitctrls,"
359#endif 338#endif
360#if !defined(NO_STRINGS)
361 "strings,"
362#endif
363#if defined(ENABLE_FRILLS) 339#if defined(ENABLE_FRILLS)
364 "frills," 340 "frills,"
365#endif 341#endif
366#if defined(PREFER_24BIT)
367 "24bit,"
368#endif
369#if defined(SELECTION_SCROLLING) 342#if defined(SELECTION_SCROLLING)
370 "selectionscrolling," 343 "selectionscrolling,"
371#endif 344#endif
372#if MOUSE_WHEEL 345#if MOUSE_WHEEL
373 "wheel," 346 "wheel,"
… …
383#endif 356#endif
384#if defined(POINTER_BLANK) 357#if defined(POINTER_BLANK)
385 "pointerBlank," 358 "pointerBlank,"
386#endif 359#endif
387#if defined(NO_RESOURCES) 360#if defined(NO_RESOURCES)
388 "NoResources" 361 "NoResources,"
389#else
390# if defined(USE_XGETDEFAULT)
391 "XGetDefaults"
392# else
393 ".Xdefaults"
394# endif 362#endif
363 "scrollbars=plain"
364#if defined(RXVT_SCROLLBAR)
365 "+rxvt"
366#endif
367#if defined(NEXT_SCROLLBAR)
368 "+NeXT"
369#endif
370#if defined(XTERM_SCROLLBAR)
371 "+xterm"
395#endif 372#endif
396 "\nUsage: "; /* Usage */ 373 "\nUsage: "; /* Usage */
397 374
398#define INDENT 18 375#define INDENT 18
376
377const char rxvt_term::resval_undef [] = "<undef>";
378const char rxvt_term::resval_on [] = "on";
379const char rxvt_term::resval_off [] = "off";
399 380
400/*{{{ usage: */ 381/*{{{ usage: */
401/*----------------------------------------------------------------------*/ 382/*----------------------------------------------------------------------*/
402static void 383static void
403rxvt_usage (int type) 384rxvt_usage (int type)
… …
412 rxvt_log (" [-help] [--help]\n"); 393 rxvt_log (" [-help] [--help]\n");
413 394
414 for (col = 1, i = 0; i < optList_size; i++) 395 for (col = 1, i = 0; i < optList_size; i++)
415 if (optList[i].desc != NULL) 396 if (optList[i].desc != NULL)
416 { 397 {
417 int len = 0; 398 int len = 0;
418 399
419 if (!optList_isBool (i)) 400 if (optList[i].arg)
420 { 401 len = strlen (optList[i].arg) + 1;
421 len = optList_strlen (i);
422 if (len > 0)
423 len++; /* account for space */
424 }
425#ifdef DEBUG_STRICT 402#ifdef DEBUG_STRICT
426 assert (optList[i].opt != NULL); 403 assert (optList[i].opt != NULL);
427#endif 404#endif
428 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 405 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
429 col += len; 406 col += len;
430 if (col > 79) 407 if (col > 79)
408 {
431 { /* assume regular width */ 409 /* assume regular width */
432 rxvt_log ("\n"); 410 rxvt_log ("\n");
433 col = 1 + len; 411 col = 1 + len;
434 } 412 }
435 413
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 414 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
437 if (optList_strlen (i)) 415 if (optList[i].arg)
438 rxvt_log (" %s]", optList[i].arg); 416 rxvt_log (" %s]", optList[i].arg);
439 else 417 else
440 rxvt_log ("]"); 418 rxvt_log ("]");
441 } 419 }
442 break; 420 break;
… …
489 467
490/*{{{ get command-line options before getting resources */ 468/*{{{ get command-line options before getting resources */
491void 469void
492rxvt_term::get_options (int argc, const char *const *argv) 470rxvt_term::get_options (int argc, const char *const *argv)
493{ 471{
494 int i, bad_option = 0; 472 int i, bad_option = 0;
495 static const char On[3] = "ON", Off[4] = "OFF";
496 473
497 for (i = 1; i < argc; i++) 474 for (i = 1; i < argc; i++)
498 { 475 {
499 unsigned int entry, longopt = 0; 476 unsigned int entry, longopt = 0;
500 const char *flag, *opt; 477 const char *opt;
478 int flag;
501 479
502 opt = argv[i]; 480 opt = argv[i];
503#ifdef DEBUG_RESOURCES 481
504 fprintf (stderr, "argv[%d] = %s: ", i, opt);
505#endif
506 if (*opt == '-') 482 if (*opt == '-')
507 { 483 {
508 flag = On; 484 flag = 1;
485
509 if (*++opt == '-') 486 if (*++opt == '-')
510 longopt = *opt++; /* long option */ 487 longopt = *opt++; /* long option */
511 } 488 }
512 else if (*opt == '+') 489 else if (*opt == '+')
513 { 490 {
514 flag = Off; 491 flag = 0;
492
515 if (*++opt == '+') 493 if (*++opt == '+')
516 longopt = *opt++; /* long option */ 494 longopt = *opt++; /* long option */
517 } 495 }
518 else 496 else
519 { 497 {
… …
522 continue; 500 continue;
523 } 501 }
524 502
525 if (!strcmp (opt, "help")) 503 if (!strcmp (opt, "help"))
526 rxvt_usage (longopt ? 2 : 1); 504 rxvt_usage (longopt ? 2 : 1);
505
527 if (!strcmp (opt, "h")) 506 if (!strcmp (opt, "h"))
528 rxvt_usage (0); 507 rxvt_usage (0);
529 508
530 /* feature: always try to match long-options */ 509 /* feature: always try to match long-options */
531 for (entry = 0; entry < optList_size; entry++) 510 for (entry = 0; entry < optList_size; entry++)
… …
535 break; 514 break;
536 515
537 if (entry < optList_size) 516 if (entry < optList_size)
538 { 517 {
539 if (optList_isReverse (entry)) 518 if (optList_isReverse (entry))
540 flag = flag == On ? Off : On; 519 flag = !flag;
541 520
542 if (optList_strlen (entry)) 521 if (optList_isString (entry))
543 { 522 {
544 /* 523 /*
545 * special cases are handled in main.c:main () to allow 524 * special cases are handled in main.c:main () to allow
546 * X resources to set these values before we settle for 525 * X resources to set these values before we settle for
547 * default values 526 * default values
548 */ 527 */
549 528
550 if (optList[entry].doff != -1) 529 if (optList[entry].doff != -1)
530 {
531 if (flag && i+1 == argc)
532 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
533
551 rs[optList[entry].doff] = flag == On && argv[i+1] 534 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
552 ? argv[++i] : 0; 535 }
553 } 536 }
554 else 537 else
538 {
555 { /* boolean value */ 539 /* boolean value */
556#ifdef DEBUG_RESOURCES
557 fprintf (stderr, "boolean (%s,%s) = %s\n",
558 optList[entry].opt, optList[entry].kw, flag);
559#endif
560 if (flag == On)
561 options |= optList[entry].flag; 540 set_option (optList[entry].index, flag);
562 else
563 options &= ~optList[entry].flag;
564 541
565 if (optList[entry].doff != -1) 542 if (optList[entry].doff != -1)
566 rs[optList[entry].doff] = flag; 543 rs[optList[entry].doff] = flag ? resval_on : resval_off;
567 } 544 }
568 } 545 }
546#ifndef NO_RESOURCES
547 else if (!strcmp (opt, "xrm"))
548 {
549 if (i+1 < argc)
550 XrmPutLineResource (&option_db, argv[++i]);
551 }
552#endif
553#ifdef KEYSYM_RESOURCE
554 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
555 {
556 if (i+1 < argc)
557 {
558 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
559 sprintf (res, "*.%s: %s\n", opt, argv[i]);
560 XrmPutLineResource (&option_db, res);
561 free (res);
562 }
563 }
564#endif
569 else 565 else
570#ifdef KEYSYM_RESOURCE
571 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
572 if (rxvt_Str_match (opt, "keysym."))
573 { 566 {
574 const char *str = argv[++i];
575
576 if (str != NULL)
577 parse_keysym (opt + sizeof ("keysym.") - 1, str);
578 }
579 else
580#endif
581 {
582 bad_option = 1; 567 bad_option = 1;
583 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 568 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
584 } 569 }
585 } 570 }
586 571
587 if (bad_option) 572 if (bad_option)
588 rxvt_usage (0); 573 rxvt_usage (0);
589} 574}
… …
600 * "rxvt" "keysym" "0xFF01" 585 * "rxvt" "keysym" "0xFF01"
601 * value will be a string 586 * value will be a string
602 */ 587 */
603/* ARGSUSED */ 588/* ARGSUSED */
604int 589int
605rxvt_define_key (XrmDatabase *database __attribute__((unused)), 590rxvt_define_key (XrmDatabase *database UNUSED,
606 XrmBindingList bindings __attribute__((unused)), 591 XrmBindingList bindings UNUSED,
607 XrmQuarkList quarks, 592 XrmQuarkList quarks,
608 XrmRepresentation *type __attribute__((unused)), 593 XrmRepresentation *type UNUSED,
609 XrmValue *value, 594 XrmValue *value,
610 XPointer closure __attribute__((unused))) 595 XPointer closure UNUSED)
611{ 596{
612 int last; 597 int last;
613 598
614 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 599 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
615 ; 600 ;
… …
620} 605}
621 606
622/* 607/*
623 * look for something like this (XK_Delete) 608 * look for something like this (XK_Delete)
624 * rxvt*keysym.0xFFFF: "\177" 609 * rxvt*keysym.0xFFFF: "\177"
625 *
626 * arg will be
627 * NULL for ~/.Xdefaults and
628 * non-NULL for command-line options (need to allocate)
629 */ 610 */
630#define NEWARGLIM 500 /* `reasonable' size */
631 611
632struct keysym_vocabulary_t 612struct keysym_vocabulary_t
633{ 613{
634 const char *name; 614 const char *name;
635 unsigned short len; 615 unsigned short len;
636 unsigned short value; 616 unsigned short value;
637}; 617};
638keysym_vocabulary_t keysym_vocabulary[] = 618static const keysym_vocabulary_t keysym_vocabulary[] =
639{ 619{
640 { "ISOLevel3", 9, Level3Mask }, 620 { "ISOLevel3", 9, Level3Mask },
641 { "AppKeypad", 9, AppKeypadMask }, 621 { "AppKeypad", 9, AppKeypadMask },
642 { "Control", 7, ControlMask }, 622 { "Control", 7, ControlMask },
643 { "NumLock", 7, NumLockMask }, 623 { "NumLock", 7, NumLockMask },
… …
665}; 645};
666 646
667int 647int
668rxvt_term::parse_keysym (const char *str, const char *arg) 648rxvt_term::parse_keysym (const char *str, const char *arg)
669{ 649{
670 int n, sym; 650 int sym;
671 unsigned int state = 0; 651 unsigned int state = 0;
672 const char *pmodend = NULL; 652 const char *key = strrchr (str, '-');
673 char *newarg = NULL;
674 char newargstr[NEWARGLIM];
675 653
676 if (arg == NULL) 654 if (!key)
677 { 655 key = str;
678 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
679 return 0;
680
681 str += n; /* skip `keysym.' */
682 if ((pmodend = strchr (str, ':')) < str)
683 return -1;
684 }
685 else 656 else
686 pmodend = str + strlen(str); 657 key++;
687 658
688 for (--pmodend; str < pmodend; --pmodend) 659 // string or key is empty
689 if (*pmodend == '-') 660 if (*arg == '\0' || *key == '\0')
690 break; 661 return -1;
691 662
663 // parse modifiers
692 while (str < pmodend) 664 while (str < key)
693 { 665 {
694 unsigned int i; 666 unsigned int i;
695 667
696 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 668 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
697 { 669 {
… …
708 680
709 if (*str == '-') 681 if (*str == '-')
710 ++str; 682 ++str;
711 } 683 }
712 684
713 /* some scanf () have trouble with a 0x prefix */ 685 // convert keysym name to keysym number
714 if (str[0] == '0' && toupper (str[1]) == 'X') 686 if ((sym = XStringToKeysym (str)) == None)
715 { 687 {
716 str += 2; 688 // fallback on hexadecimal parsing
717 689 char *end;
690 sym = strtol (str, &end, 16);
718 if (arg) 691 if (*end)
719 {
720 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
721 return -1;
722 }
723 else
724 {
725 if (sscanf (str, "%x:", &sym) != 1)
726 return -1;
727
728 /* cue to ':', it's there since sscanf () worked */
729 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
730 newargstr[NEWARGLIM - 1] = '\0';
731 newarg = newargstr;
732 }
733 }
734 else
735 {
736 /*
737 * convert keysym name to keysym number
738 */
739 strncpy (newargstr, str, NEWARGLIM - 1);
740 newargstr[NEWARGLIM - 1] = '\0';
741
742 if (arg == NULL)
743 {
744 if ((newarg = strchr (newargstr, ':')) == NULL)
745 return -1;
746
747 *newarg++ = '\0'; /* terminate keysym name */
748 }
749
750 if ((sym = XStringToKeysym (newargstr)) == None)
751 return -1; 692 return -1;
752 } 693 }
753 694
754 if (newarg == NULL)
755 {
756 strncpy (newargstr, arg, NEWARGLIM - 1);
757 newargstr[NEWARGLIM - 1] = '\0';
758 newarg = newargstr;
759 }
760
761 rxvt_Str_trim (newarg);
762 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
763 return -1;
764
765 keyboard->register_user_translation (sym, state, newarg); 695 keyboard->register_user_translation (sym, state, arg);
766 return 1; 696 return 1;
767} 697}
768 698
769# endif /* KEYSYM_RESOURCE */ 699# endif /* KEYSYM_RESOURCE */
700#endif /* NO_RESOURCES */
770 701
771# ifndef USE_XGETDEFAULT 702static char *
772/*{{{ rxvt_get_xdefaults () */ 703get_res (XrmDatabase database, const char *program, const char *option)
773/*
774 * the matching algorithm used for memory-save fake resources
775 */
776void
777rxvt_term::get_xdefaults (FILE *stream, const char *name)
778{ 704{
779 unsigned int len; 705 char resource[512];
780 char *str, buffer[256]; 706 char *type;
707 XrmValue result;
781 708
782 if (stream == NULL) 709 snprintf (resource, sizeof (resource), "%s.%s", program, option);
783 return; 710 XrmGetResource (database, resource, resource, &type, &result);
784 711
785 len = strlen (name); 712 return result.addr;
786 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 713}
714
715const char *
716rxvt_term::x_resource (const char *name)
717{
718 XrmDatabase database = XrmGetDatabase (dpy);
719
720 const char *p = get_res (database, rs[Rs_name], name);
721 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
722
723 if (p == NULL || (p0 && strcmp (p, p0) == 0))
787 { 724 {
788 unsigned int entry, n; 725 p = get_res (database, RESCLASS, name);
789 726#ifdef RESFALLBACK
790 while (*str && isspace (*str)) 727 if (p == NULL || (p0 && strcmp (p, p0) == 0))
791 str++; /* leading whitespace */ 728 p = get_res (database, RESFALLBACK, name);
792 729#endif
793 if ((str[len] != '*' && str[len] != '.')
794 || (len && strncmp (str, name, len)))
795 continue;
796 str += (len + 1); /* skip `name*' or `name.' */
797
798# ifdef KEYSYM_RESOURCE
799 if (!parse_keysym (str, NULL))
800# endif /* KEYSYM_RESOURCE */
801 for (entry = 0; entry < optList_size; entry++)
802 {
803 const char *kw = optList[entry].kw;
804
805 if (kw == NULL)
806 continue;
807
808 n = strlen (kw);
809 if (str[n] == ':' && rxvt_Str_match (str, kw))
810 {
811 /* skip `keyword:' */
812 str += n + 1;
813 rxvt_Str_trim (str);
814 n = strlen (str);
815
816 if (n && rs[optList[entry].doff] == NULL)
817 {
818 /* not already set */
819 int s;
820 char *p = 0;
821
822 for (int o = 0;;)
823 {
824 p = (char *)rxvt_realloc (p, o + n + 1);
825 memcpy (p + o, str, n);
826 o += n;
827 p[o] = 0;
828
829 if (o == 0 || p[o - 1] != '\\') // continuation line
830 break;
831
832 o--; // eat "\"
833
834 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
835 break;
836
837 rxvt_Str_trim (str);
838 n = strlen (str);
839 }
840
841 rs[optList[entry].doff] = p;
842 allocated.push_back (p);
843
844 if (optList_isBool (entry))
845 {
846 s = strcasecmp (str, "true") == 0
847 || strcasecmp (str, "yes") == 0
848 || strcasecmp (str, "on") == 0
849 || strcmp (str, "1") == 0;
850
851 if (optList_isReverse (entry))
852 s = !s;
853
854 if (s)
855 options |= optList[entry].flag;
856 else
857 options &= ~optList[entry].flag;
858 }
859 }
860
861 break;
862 }
863 }
864 } 730 }
865 731
866 rewind (stream); 732 if (p == NULL && p0)
733 p = p0;
734
735 return p;
867} 736}
868 737
869/*}}} */
870# endif /* ! USE_XGETDEFAULT */
871#endif /* NO_RESOURCES */
872
873/*{{{ read the resources files */
874/*
875 * using XGetDefault () or the hand-rolled replacement
876 */
877/* ARGSUSED */
878void 738void
879rxvt_term::extract_resources () 739rxvt_term::extract_resources ()
880{ 740{
881 dDisp;
882
883#ifndef NO_RESOURCES 741#ifndef NO_RESOURCES
884 742 XrmDatabase database = XrmGetDatabase (dpy);
885 char *homedir = (char *)getenv ("HOME");
886 char fname[1024];
887
888# if defined XAPPLOADDIR
889# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
890 /* Compute the path of the possibly available localized Rxvt file */
891 char localepath[1024];
892
893 if (locale)
894 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
895 else
896 localepath[0] = 0;
897# endif
898# endif
899
900# ifdef USE_XGETDEFAULT
901 /*
902 * get resources using the X library function
903 */
904 int entry;
905
906# ifdef XrmEnumOneLevel
907 int i;
908 char *displayResource, *xe;
909 XrmName name_prefix[3];
910 XrmClass class_prefix[3];
911 XrmDatabase database, rdb1;
912
913 XrmInitialize ();
914 database = NULL;
915
916 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
917
918 // 6. System wide per application default file.
919 /* Add in Rxvt file */
920# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
921 if (*localepath
922 && ((rdb1 = XrmGetFileDatabase (localepath))
923 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
924# endif
925 XrmMergeDatabases (rdb1, &database); 743 XrmMergeDatabases (option_db, &database);
926 744 option_db = NULL;
927 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
928 if ((xe = (char *)getenv ("XAPPLRESDIR")))
929 {
930 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
931
932 if ((rdb1 = XrmGetFileDatabase (fname)))
933 XrmMergeDatabases (rdb1, &database);
934 }
935
936 // 5. User's per application default file.
937 // none
938
939 // 4. User's defaults file.
940 /* Get any Xserver defaults */
941 displayResource = XResourceManagerString (disp);
942 if (displayResource != NULL)
943 {
944 if ((rdb1 = XrmGetStringDatabase (displayResource)))
945 XrmMergeDatabases (rdb1, &database);
946 }
947 else if (homedir)
948 {
949 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
950
951 if ((rdb1 = XrmGetFileDatabase (fname)))
952 XrmMergeDatabases (rdb1, &database);
953 }
954
955 /* Get screen specific resources */
956 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
957 if (displayResource != NULL)
958 {
959 if ((rdb1 = XrmGetStringDatabase (displayResource)))
960 /* Merge with screen-independent resources */
961 XrmMergeDatabases (rdb1, &database);
962
963 XFree (displayResource);
964 }
965
966 // 3. User's per host defaults file
967 /* Add in XENVIRONMENT file */
968 if ((xe = (char *)getenv ("XENVIRONMENT"))
969 && (rdb1 = XrmGetFileDatabase (xe)))
970 XrmMergeDatabases (rdb1, &database);
971 else if (homedir)
972 {
973 struct utsname un;
974
975 if (!uname (&un))
976 {
977 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
978
979 if ((rdb1 = XrmGetFileDatabase (fname)))
980 XrmMergeDatabases (rdb1, &database);
981 }
982 }
983
984 XrmSetDatabase (disp, database);
985# endif
986
987 /* 745 /*
988 * Query resources for options that affect us 746 * Query resources for options that affect us
989 */ 747 */
990 for (entry = 0; entry < optList_size; entry++) 748 for (int entry = 0; entry < optList_size; entry++)
991 { 749 {
992 int s; 750 int s;
993 char *p, *p0;
994 const char *kw = optList[entry].kw; 751 const char *kw = optList[entry].kw;
995 752
996 if (kw == NULL || rs[optList[entry].doff] != NULL) 753 if (kw == NULL || rs[optList[entry].doff] != NULL)
997 continue; /* previously set */ 754 continue; // previously set
998 755
999 p = XGetDefault (disp, rs[Rs_name], kw); 756 const char *p = x_resource (kw);
1000 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1001 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1002 {
1003 p = XGetDefault (disp, RESCLASS, kw);
1004#ifdef RESFALLBACK
1005 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1006 p = XGetDefault (disp, RESFALLBACK, kw);
1007#endif
1008 }
1009
1010 if (p == NULL && p0)
1011 p = p0;
1012 757
1013 if (p) 758 if (p)
1014 { 759 {
760 p = strdup (p);
761 allocated.push_back ((void *)p);
1015 rs[optList[entry].doff] = p; 762 rs[optList[entry].doff] = p;
1016 763
1017 if (optList_isBool (entry)) 764 if (optList_isBool (entry))
1018 { 765 {
1019 s = strcasecmp (p, "TRUE") == 0 766 s = strcasecmp (p, "TRUE") == 0
… …
1022 || strcasecmp (p, "1") == 0; 769 || strcasecmp (p, "1") == 0;
1023 770
1024 if (optList_isReverse (entry)) 771 if (optList_isReverse (entry))
1025 s = !s; 772 s = !s;
1026 773
1027 if (s) 774 set_option (optList[entry].index, s);
1028 options |= optList[entry].flag;
1029 else
1030 options &= ~optList[entry].flag;
1031 } 775 }
1032 } 776 }
1033 } 777 }
1034 778
1035 /* 779 /*
1036 * [R5 or later]: enumerate the resource database 780 * [R5 or later]: enumerate the resource database
1037 */ 781 */
1038# ifdef KEYSYM_RESOURCE 782# ifdef KEYSYM_RESOURCE
783 XrmName name_prefix[3];
784 XrmClass class_prefix[3];
785
1039 name_prefix[0] = XrmStringToName (rs[Rs_name]); 786 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1040 name_prefix[1] = XrmStringToName ("keysym"); 787 name_prefix[1] = XrmStringToName ("keysym");
1041 name_prefix[2] = NULLQUARK; 788 name_prefix[2] = NULLQUARK;
1042 class_prefix[0] = XrmStringToName (RESCLASS); 789 class_prefix[0] = XrmStringToName (RESCLASS);
1043 class_prefix[1] = XrmStringToName ("Keysym"); 790 class_prefix[1] = XrmStringToName ("Keysym");
1044 class_prefix[2] = NULLQUARK; 791 class_prefix[2] = NULLQUARK;
1045 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 792 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1046 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 793 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1047 XrmEnumOneLevel, rxvt_define_key, NULL); 794 XrmEnumOneLevel, rxvt_define_key, NULL);
1048# ifdef RESFALLBACK 795# ifdef RESFALLBACK
1049 name_prefix[0] = XrmStringToName (RESFALLBACK); 796 name_prefix[0] = XrmStringToName (RESFALLBACK);
1050 name_prefix[1] = XrmStringToName ("keysym"); 797 name_prefix[1] = XrmStringToName ("keysym");
1051 class_prefix[0] = XrmStringToName (RESFALLBACK); 798 class_prefix[0] = XrmStringToName (RESFALLBACK);
1052 class_prefix[1] = XrmStringToName ("Keysym"); 799 class_prefix[1] = XrmStringToName ("Keysym");
1053 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 800 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1054 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 801 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1055 XrmEnumOneLevel, rxvt_define_key, NULL); 802 XrmEnumOneLevel, rxvt_define_key, NULL);
1056# endif 803# endif
1057# endif 804# endif
1058 805
1059# else /* USE_XGETDEFAULT */
1060 /* get resources the hard way, but save lots of memory */
1061 FILE *fd = NULL;
1062
1063 if (homedir)
1064 {
1065 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1066
1067 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1068 {
1069 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1070
1071 if ((fd = fopen (fname, "r")) != NULL)
1072 break;
1073 }
1074 }
1075 /*
1076 * The normal order to match resources is the following:
1077 * @ global resources (partial match, ~/.Xdefaults)
1078 * @ application file resources (XAPPLOADDIR/Rxvt)
1079 * @ class resources (~/.Xdefaults)
1080 * @ private resources (~/.Xdefaults)
1081 *
1082 * However, for the hand-rolled resources, the matching algorithm
1083 * checks if a resource string value has already been allocated
1084 * and won't overwrite it with (in this case) a less specific
1085 * resource value.
1086 *
1087 * This avoids multiple allocation. Also, when we've called this
1088 * routine command-line string options have already been applied so we
1089 * needn't to allocate for those resources.
1090 *
1091 * So, search in resources from most to least specific.
1092 *
1093 * Also, use a special sub-class so that we can use either or both of
1094 * "XTerm" and "Rxvt" as class names.
1095 */
1096
1097 get_xdefaults (fd, rs[Rs_name]);
1098 get_xdefaults (fd, RESCLASS);
1099# ifdef RESFALLBACK
1100 get_xdefaults (fd, RESFALLBACK);
1101# endif
1102
1103# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1104 {
1105 FILE *ad = NULL;
1106
1107# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1108 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1109# endif
1110 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1111 if (ad != NULL)
1112 {
1113 get_xdefaults (ad, RESCLASS);
1114 get_xdefaults (ad, "");
1115 fclose (ad);
1116 }
1117 }
1118# endif /* XAPPLOADDIR */
1119
1120 get_xdefaults (fd, ""); /* partial match */
1121 if (fd != NULL)
1122 fclose (fd);
1123# endif /* USE_XGETDEFAULT */
1124
1125#endif /* NO_RESOURCES */ 806#endif /* NO_RESOURCES */
1126} 807}
1127 808
1128/*}}} */
1129/*----------------------- end-of-file (C source) -----------------------*/ 809/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines