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.100 by ayin, Wed May 2 23:06:32 2007 UTC vs.
Revision 1.133 by ayin, Sat Jan 26 14:24:43 2008 UTC

… …
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-2006 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.
… …
32#endif 33#endif
33 34
34/* place holders used for parsing command-line options */ 35/* place holders used for parsing command-line options */
35#define Optflag_Reverse 1 36#define Optflag_Reverse 1
36#define Optflag_Boolean 2 37#define Optflag_Boolean 2
38#define Optflag_Switch 4
37 39
38/* monolithic option/resource structure: */ 40/* monolithic option/resource structure: */
39/* 41/*
40 * `string' options MUST have a usage argument 42 * `string' options MUST have a usage argument
41 * `switch' and `boolean' options have no argument 43 * `switch' and `boolean' options have no argument
… …
58#define BOOL(rsp, kw, opt, option, flag, desc) \ 60#define BOOL(rsp, kw, opt, option, flag, desc) \
59 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 61 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
60 62
61/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
62#define SWCH(opt, option, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
63 { (option), (flag), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
64 66
65/* convenient macros */ 67/* convenient macros */
66#define optList_strlen(i) \ 68#define optList_isString(i) \
67 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag == 0)
68#define optList_isBool(i) \ 70#define optList_isBool(i) \
69 (optList[i].flag & Optflag_Boolean) 71 (optList[i].flag & Optflag_Boolean)
70#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
71 (optList[i].flag & Optflag_Reverse) 73 (optList[i].flag & Optflag_Reverse)
72#define optList_size \ 74#define optList_size \
… …
92 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 94 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
93 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
99 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
97 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
98#if HAVE_SCROLLBARS 101#if HAVE_SCROLLBARS
99 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
100 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
101 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), 104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
… …
105#endif 108#endif
106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
107 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 110 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
110#if TRANSPARENT 113#if ENABLE_TRANSPARENCY
111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
112 SWCH ("tr", Opt_transparent, 0, NULL), 115 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
113# if TINTING
114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
115# endif 117 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
116#endif 118#endif
117#if OFF_FOCUS_FADING 119#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 120 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
119 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 121 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
120#endif
121#if TINTING
122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
123#endif 122#endif
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 123 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
125#ifndef NO_BELL 124#ifndef NO_BELL
126# if ENABLE_FRILLS 125# if ENABLE_FRILLS
127 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, "set the urgency hint for the wm on bell"), 126 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
128# endif 127# endif
129 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"), 128 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
130# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 129# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
131 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL), 130 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
132# endif 131# endif
… …
169#ifndef NO_BOLD_UNDERLINE_REVERSE 168#ifndef NO_BOLD_UNDERLINE_REVERSE
170 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 169 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
171 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 170 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
172 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 171 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
173 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 172 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
174#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
175#if ENABLE_FRILLS 174#if ENABLE_FRILLS
176 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
177#endif 176#endif
178#ifdef KEEP_SCROLLCOLOR 177#ifdef KEEP_SCROLLCOLOR
179 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
180 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 179 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
181#endif /* KEEP_SCROLLCOLOR */ 180#endif /* KEEP_SCROLLCOLOR */
182#ifdef OPTION_HC 181#ifdef OPTION_HC
183 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
184#endif 183#endif
185#ifndef NO_CURSORCOLOR 184#ifndef NO_CURSORCOLOR
186 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
187 /* command-line option = resource name */ 186 /* command-line option = resource name */
188 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
189#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
190 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
191 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
192 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
193#ifdef XPM_BACKGROUND 192#ifdef BG_IMAGE_FROM_FILE
194 RSTRG (Rs_path, "path", "search path"), 193 RSTRG (Rs_path, "path", "search path"),
195 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
196#endif 195#endif
197 /* fonts: command-line option = resource name */ 196 /* fonts: command-line option = resource name */
198 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
… …
205#ifdef USE_XIM 204#ifdef USE_XIM
206 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 205 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
207 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 206 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
208 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 207 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
209 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 208 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
210#endif /* USE_XIM */ 209#endif /* USE_XIM */
211 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 210 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
212 STRG (Rs_title, "title", "title", "string", "title name for window"), 211 STRG (Rs_title, "title", "title", "string", "title name for window"),
213 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 212 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
214 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 213 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
215 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 214 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
216#if ENABLE_XEMBED 215#if ENABLE_XEMBED
217 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
218#endif 217#endif
219#if XFT 218#if XFT
220 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 219 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
220 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
221#endif 221#endif
222#if ENABLE_FRILLS 222#if ENABLE_FRILLS
223 RSTRG (Rs_transient_for, "transient-for", "windowid"), 223 RSTRG (Rs_transient_for, "transient-for", "windowid"),
224 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 224 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
225 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 225 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
232 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
233#endif
234#ifdef BUILTIN_GLYPHS
232 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 235 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
233 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
234#endif 236#endif
235#ifdef POINTER_BLANK 237#ifdef POINTER_BLANK
236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 238 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
237#endif 239#endif
238#ifndef NO_BACKSPACE_KEY 240#ifndef NO_BACKSPACE_KEY
239 RSTRG (Rs_backspace_key, "backspacekey", "string"), 241 RSTRG (Rs_backspace_key, "backspacekey", "string"),
240#endif 242#endif
241#ifndef NO_DELETE_KEY 243#ifndef NO_DELETE_KEY
242 RSTRG (Rs_delete_key, "deletekey", "string"), 244 RSTRG (Rs_delete_key, "deletekey", "string"),
243#endif 245#endif
244 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
245#ifdef PRINTPIPE 246#ifdef PRINTPIPE
246 RSTRG (Rs_print_pipe, "print-pipe", "string"), 247 RSTRG (Rs_print_pipe, "print-pipe", "string"),
247#endif 248#endif
248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 249 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
249#ifdef CUTCHAR_RESOURCE 250#ifdef CUTCHAR_RESOURCE
250 RSTRG (Rs_cutchars, "cutchars", "string"), 251 RSTRG (Rs_cutchars, "cutchars", "string"),
251#endif /* CUTCHAR_RESOURCE */ 252#endif /* CUTCHAR_RESOURCE */
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 253 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 254#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 255 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 256 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
256#endif 257#endif
… …
258 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 259 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
259 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 260 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
260 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 261 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
261 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 262 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
262#endif 263#endif
263#ifndef NO_RESOURCES 264#if ISO_14755
264 INFO ("xrm", "string", "X resource"), 265 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
266#endif
267#ifdef HAVE_AFTERIMAGE
268 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
269 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
265#endif 270#endif
266 INFO ("e", "command arg ...", "command to execute") 271 INFO ("e", "command arg ...", "command to execute")
267 }; 272 };
268 273
269#undef INFO 274#undef INFO
… …
313#endif 318#endif
314 "," 319 ","
315#if OFF_FOCUS_FADING 320#if OFF_FOCUS_FADING
316 "fade," 321 "fade,"
317#endif 322#endif
318#if defined(XPM_BACKGROUND)
319 "XPM,"
320#endif
321#if defined(TRANSPARENT) 323#if defined(ENABLE_TRANSPARENCY)
322 "transparent," 324 "transparent,"
323#endif
324#if TINTING
325 "tint," 325 "tint,"
326#endif
327#if HAVE_AFTERIMAGE
328 "afterimage,"
326#endif 329#endif
327#if defined(USE_XIM) 330#if defined(USE_XIM)
328 "XIM," 331 "XIM,"
329#endif 332#endif
330#if defined(NO_BACKSPACE_KEY) 333#if defined(NO_BACKSPACE_KEY)
… …
411 for (col = 1, i = 0; i < optList_size; i++) 414 for (col = 1, i = 0; i < optList_size; i++)
412 if (optList[i].desc != NULL) 415 if (optList[i].desc != NULL)
413 { 416 {
414 int len = 0; 417 int len = 0;
415 418
416 if (!optList_isBool (i)) 419 if (optList[i].arg)
417 { 420 len = strlen (optList[i].arg) + 1;
418 len = optList_strlen (i);
419 if (len > 0)
420 len++; /* account for space */
421 }
422#ifdef DEBUG_STRICT 421#ifdef DEBUG_STRICT
423 assert (optList[i].opt != NULL); 422 assert (optList[i].opt != NULL);
424#endif 423#endif
425 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 424 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
426 col += len; 425 col += len;
427 if (col > 79) 426 if (col > 79)
427 {
428 { /* assume regular width */ 428 /* assume regular width */
429 rxvt_log ("\n"); 429 rxvt_log ("\n");
430 col = 1 + len; 430 col = 1 + len;
431 } 431 }
432 432
433 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 433 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
434 if (optList_strlen (i)) 434 if (optList[i].arg)
435 rxvt_log (" %s]", optList[i].arg); 435 rxvt_log (" %s]", optList[i].arg);
436 else 436 else
437 rxvt_log ("]"); 437 rxvt_log ("]");
438 } 438 }
439 break; 439 break;
… …
491 int i, bad_option = 0; 491 int i, bad_option = 0;
492 492
493 for (i = 1; i < argc; i++) 493 for (i = 1; i < argc; i++)
494 { 494 {
495 unsigned int entry, longopt = 0; 495 unsigned int entry, longopt = 0;
496 const char *flag, *opt; 496 const char *opt;
497 int flag;
497 498
498 opt = argv[i]; 499 opt = argv[i];
499 500
500 if (*opt == '-') 501 if (*opt == '-')
501 { 502 {
502 flag = resval_on; 503 flag = 1;
503 504
504 if (*++opt == '-') 505 if (*++opt == '-')
505 longopt = *opt++; /* long option */ 506 longopt = *opt++; /* long option */
506 } 507 }
507 else if (*opt == '+') 508 else if (*opt == '+')
508 { 509 {
509 flag = resval_off; 510 flag = 0;
510 511
511 if (*++opt == '+') 512 if (*++opt == '+')
512 longopt = *opt++; /* long option */ 513 longopt = *opt++; /* long option */
513 } 514 }
514 else 515 else
… …
532 break; 533 break;
533 534
534 if (entry < optList_size) 535 if (entry < optList_size)
535 { 536 {
536 if (optList_isReverse (entry)) 537 if (optList_isReverse (entry))
537 flag = flag == resval_on ? resval_off : resval_on; 538 flag = !flag;
538 539
539 if (optList_strlen (entry)) 540 if (optList_isString (entry))
540 { 541 {
541 /* 542 /*
542 * special cases are handled in main.c:main () to allow 543 * special cases are handled in main.c:main () to allow
543 * X resources to set these values before we settle for 544 * X resources to set these values before we settle for
544 * default values 545 * default values
545 */ 546 */
546 547
547 if (optList[entry].doff != -1) 548 if (optList[entry].doff != -1)
548 { 549 {
549 if (flag == resval_on && !argv [i+1]) 550 if (flag && i+1 == argc)
550 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 551 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
551 552
552 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 553 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
553 } 554 }
554 } 555 }
555 else 556 else
557 {
556 { /* boolean value */ 558 /* boolean value */
557 set_option (optList[entry].index, flag == resval_on); 559 set_option (optList[entry].index, flag);
558 560
559 if (optList[entry].doff != -1) 561 if (optList[entry].doff != -1)
560 rs[optList[entry].doff] = flag; 562 rs[optList[entry].doff] = flag ? resval_on : resval_off;
561 } 563 }
562 } 564 }
565#ifndef NO_RESOURCES
566 else if (!strcmp (opt, "xrm"))
567 {
568 if (i+1 < argc)
569 XrmPutLineResource (&option_db, argv[++i]);
570 }
571#endif
572#ifdef KEYSYM_RESOURCE
573 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
574 {
575 if (i+1 < argc)
576 {
577 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
578 sprintf (res, "*.%s: %s\n", opt, argv[i]);
579 XrmPutLineResource (&option_db, res);
580 free (res);
581 }
582 }
583#endif
563 else 584 else
564#ifdef KEYSYM_RESOURCE
565 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
566 if (rxvt_Str_match (opt, "keysym."))
567 { 585 {
568 const char *str = argv[++i];
569
570 if (str != NULL)
571 parse_keysym (opt + sizeof ("keysym.") - 1, str);
572 }
573 else
574#endif
575 {
576 bad_option = 1; 586 bad_option = 1;
577 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 587 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
578 } 588 }
579 } 589 }
580 590
581 if (bad_option) 591 if (bad_option)
582 rxvt_usage (0); 592 rxvt_usage (0);
583} 593}
… …
614} 624}
615 625
616/* 626/*
617 * look for something like this (XK_Delete) 627 * look for something like this (XK_Delete)
618 * rxvt*keysym.0xFFFF: "\177" 628 * rxvt*keysym.0xFFFF: "\177"
619 *
620 * arg will be
621 * NULL for ~/.Xdefaults and
622 * non-NULL for command-line options (need to allocate)
623 */ 629 */
624#define NEWARGLIM 500 /* `reasonable' size */
625 630
626struct keysym_vocabulary_t 631struct keysym_vocabulary_t
627{ 632{
628 const char *name; 633 const char *name;
629 unsigned short len; 634 unsigned short len;
630 unsigned short value; 635 unsigned short value;
631}; 636};
632keysym_vocabulary_t keysym_vocabulary[] = 637static const keysym_vocabulary_t keysym_vocabulary[] =
633{ 638{
634 { "ISOLevel3", 9, Level3Mask }, 639 { "ISOLevel3", 9, Level3Mask },
635 { "AppKeypad", 9, AppKeypadMask }, 640 { "AppKeypad", 9, AppKeypadMask },
636 { "Control", 7, ControlMask }, 641 { "Control", 7, ControlMask },
637 { "NumLock", 7, NumLockMask }, 642 { "NumLock", 7, NumLockMask },
… …
659}; 664};
660 665
661int 666int
662rxvt_term::parse_keysym (const char *str, const char *arg) 667rxvt_term::parse_keysym (const char *str, const char *arg)
663{ 668{
664 int n, sym; 669 int sym;
665 unsigned int state = 0; 670 unsigned int state = 0;
666 const char *pmodend = NULL; 671 const char *key = strrchr (str, '-');
667 char *newarg = NULL;
668 char newargstr[NEWARGLIM];
669 672
670 if (arg == NULL) 673 if (!key)
671 { 674 key = str;
672 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
673 return 0;
674
675 str += n; /* skip `keysym.' */
676 if (!(pmodend = strchr (str, ':')))
677 return -1;
678 }
679 else 675 else
680 pmodend = str + strlen(str); 676 key++;
681 677
682 for (--pmodend; str < pmodend; --pmodend) 678 // string or key is empty
683 if (*pmodend == '-') 679 if (*arg == '\0' || *key == '\0')
684 break; 680 return -1;
685 681
682 // parse modifiers
686 while (str < pmodend) 683 while (str < key)
687 { 684 {
688 unsigned int i; 685 unsigned int i;
689 686
690 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 687 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
691 { 688 {
… …
702 699
703 if (*str == '-') 700 if (*str == '-')
704 ++str; 701 ++str;
705 } 702 }
706 703
707 /* some scanf () have trouble with a 0x prefix */ 704 // convert keysym name to keysym number
708 if (str[0] == '0' && toupper (str[1]) == 'X') 705 if ((sym = XStringToKeysym (str)) == None)
709 { 706 {
710 str += 2; 707 // fallback on hexadecimal parsing
711 708 char *end;
709 sym = strtol (str, &end, 16);
712 if (arg) 710 if (*end)
713 {
714 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
715 return -1;
716 }
717 else
718 {
719 if (sscanf (str, "%x:", &sym) != 1)
720 return -1;
721
722 /* cue to ':', it's there since sscanf () worked */
723 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
724 newargstr[NEWARGLIM - 1] = '\0';
725 newarg = newargstr;
726 }
727 }
728 else
729 {
730 /*
731 * convert keysym name to keysym number
732 */
733 strncpy (newargstr, str, NEWARGLIM - 1);
734 newargstr[NEWARGLIM - 1] = '\0';
735
736 if (arg == NULL)
737 {
738 if ((newarg = strchr (newargstr, ':')) == NULL)
739 return -1;
740
741 *newarg++ = '\0'; /* terminate keysym name */
742 }
743
744 if ((sym = XStringToKeysym (newargstr)) == None)
745 return -1; 711 return -1;
746 } 712 }
747 713
748 if (newarg == NULL)
749 {
750 strncpy (newargstr, arg, NEWARGLIM - 1);
751 newargstr[NEWARGLIM - 1] = '\0';
752 newarg = newargstr;
753 }
754
755 rxvt_Str_trim (newarg);
756 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
757 return -1;
758
759 keyboard->register_user_translation (sym, state, newarg); 714 keyboard->register_user_translation (sym, state, arg);
760 return 1; 715 return 1;
761} 716}
762 717
763# endif /* KEYSYM_RESOURCE */ 718# endif /* KEYSYM_RESOURCE */
764#endif /* NO_RESOURCES */ 719#endif /* NO_RESOURCES */
765 720
766static char * 721static char *
767get_res (XrmDatabase database, const char *program, const char *option) 722get_res (XrmDatabase database, const char *program, const char *option)
768{ 723{
769 char resource[512]; 724 char resource[512];
… …
801 756
802void 757void
803rxvt_term::extract_resources () 758rxvt_term::extract_resources ()
804{ 759{
805#ifndef NO_RESOURCES 760#ifndef NO_RESOURCES
761 XrmDatabase database = XrmGetDatabase (dpy);
762 XrmMergeDatabases (option_db, &database);
763 option_db = NULL;
806 /* 764 /*
807 * Query resources for options that affect us 765 * Query resources for options that affect us
808 */ 766 */
809 for (int entry = 0; entry < optList_size; entry++) 767 for (int entry = 0; entry < optList_size; entry++)
810 { 768 {
… …
839 797
840 /* 798 /*
841 * [R5 or later]: enumerate the resource database 799 * [R5 or later]: enumerate the resource database
842 */ 800 */
843# ifdef KEYSYM_RESOURCE 801# ifdef KEYSYM_RESOURCE
844 XrmDatabase database = XrmGetDatabase (dpy);
845 XrmName name_prefix[3]; 802 XrmName name_prefix[3];
846 XrmClass class_prefix[3]; 803 XrmClass class_prefix[3];
847 804
848 name_prefix[0] = XrmStringToName (rs[Rs_name]); 805 name_prefix[0] = XrmStringToName (rs[Rs_name]);
849 name_prefix[1] = XrmStringToName ("keysym"); 806 name_prefix[1] = XrmStringToName ("keysym");
… …
863 XrmEnumerateDatabase (database, name_prefix, class_prefix, 820 XrmEnumerateDatabase (database, name_prefix, class_prefix,
864 XrmEnumOneLevel, rxvt_define_key, NULL); 821 XrmEnumOneLevel, rxvt_define_key, NULL);
865# endif 822# endif
866# endif 823# endif
867 824
868#endif /* NO_RESOURCES */ 825#endif /* NO_RESOURCES */
869} 826}
870 827
871/*----------------------- end-of-file (C source) -----------------------*/ 828/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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