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.121 by ayin, Thu Nov 22 12:31:49 2007 UTC vs.
Revision 1.148 by sf-exg, Thu Oct 14 22:08:45 2010 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.
… …
62/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
63#define SWCH(opt, option, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
64 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
65 66
66/* convenient macros */ 67/* convenient macros */
67#define optList_strlen(i) \ 68#define optList_isString(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag == 0)
69#define optList_isBool(i) \ 70#define optList_isBool(i) \
70 (optList[i].flag & Optflag_Boolean) 71 (optList[i].flag & Optflag_Boolean)
71#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
72 (optList[i].flag & Optflag_Reverse) 73 (optList[i].flag & Optflag_Reverse)
73#define optList_size \ 74#define optList_size \
… …
90 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
91 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
92 SWCH ("C", Opt_console, 0, "intercept console messages"), 93 SWCH ("C", Opt_console, 0, "intercept console messages"),
93 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 94 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
94 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
96 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
96 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
97 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
98 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 100 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
99 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 101 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
100#if HAVE_SCROLLBARS
101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
103 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"),
104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), 105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
106 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"),
107#endif
108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if ENABLE_TRANSPARENCY 112#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115 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", "%", "shade background by x %."), 116 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
117 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
117#endif 118#endif
118#if OFF_FOCUS_FADING 119#if OFF_FOCUS_FADING
119 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"),
120 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"),
121#endif 122#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 123 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL 124#ifndef NO_BELL
124# if ENABLE_FRILLS 125# if ENABLE_FRILLS
… …
171 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 172 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
173#if ENABLE_FRILLS 174#if ENABLE_FRILLS
174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
175#endif 176#endif
176#ifdef KEEP_SCROLLCOLOR
177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
178#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 179 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif /* KEEP_SCROLLCOLOR */ 180#endif
180#ifdef OPTION_HC 181#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
183 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
182#endif 184#endif
183#ifndef NO_CURSORCOLOR 185#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 186 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 187 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 188 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
… …
189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 191 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 192 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 193#ifdef BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 194 RSTRG (Rs_path, "path", "search path"),
193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 195 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
196# if ENABLE_EWMH
197 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
198# endif
194#endif 199#endif
195 /* fonts: command-line option = resource name */ 200 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 201 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
197#if ENABLE_STYLES 202#if ENABLE_STYLES
198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 203 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
214#if ENABLE_XEMBED 219#if ENABLE_XEMBED
215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 220 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
216#endif 221#endif
217#if XFT 222#if XFT
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 223 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
224 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
219#endif 225#endif
220#if ENABLE_FRILLS 226#if ENABLE_FRILLS
221 RSTRG (Rs_transient_for, "transient-for", "windowid"), 227 RSTRG (Rs_transient_for, "transient-for", "windowid"),
222 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 228 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
223 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 229 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 231 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 232 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 233 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 234 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 235 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
236 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
237 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
238#endif
239#ifdef BUILTIN_GLYPHS
230 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 240 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232#endif 241#endif
233#ifdef POINTER_BLANK 242#ifdef POINTER_BLANK
234 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 243 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
235#endif 244#endif
236#ifndef NO_BACKSPACE_KEY 245#ifndef NO_BACKSPACE_KEY
237 RSTRG (Rs_backspace_key, "backspacekey", "string"), 246 RSTRG (Rs_backspace_key, "backspacekey", "string"),
238#endif 247#endif
239#ifndef NO_DELETE_KEY 248#ifndef NO_DELETE_KEY
240 RSTRG (Rs_delete_key, "deletekey", "string"), 249 RSTRG (Rs_delete_key, "deletekey", "string"),
241#endif 250#endif
242 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
243#ifdef PRINTPIPE 251#ifdef PRINTPIPE
244 RSTRG (Rs_print_pipe, "print-pipe", "string"), 252 RSTRG (Rs_print_pipe, "print-pipe", "string"),
245#endif 253#endif
246 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 254 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
247#ifdef CUTCHAR_RESOURCE
248 RSTRG (Rs_cutchars, "cutchars", "string"), 255 RSTRG (Rs_cutchars, "cutchars", "string"),
249#endif /* CUTCHAR_RESOURCE */
250 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 256 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251#ifndef NO_SECONDARY_SCREEN 257#ifndef NO_SECONDARY_SCREEN
252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 258 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 259 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
254#endif 260#endif
… …
257 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 263 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 264 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"), 265 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
260#endif 266#endif
261#if ISO_14755 267#if ISO_14755
268 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 269 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif 270#endif
264#ifdef HAVE_AFTERIMAGE 271#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 272 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"),
267#endif
268#ifndef NO_RESOURCES
269 INFO ("xrm", "string", "X resource"),
270#endif 273#endif
271 INFO ("e", "command arg ...", "command to execute") 274 INFO ("e", "command arg ...", "command to execute")
272 }; 275 };
273 276
274#undef INFO 277#undef INFO
… …
325 "tint," 328 "tint,"
326#endif 329#endif
327#if HAVE_AFTERIMAGE 330#if HAVE_AFTERIMAGE
328 "afterimage," 331 "afterimage,"
329#endif 332#endif
333#if HAVE_PIXBUF
334 "pixbuf,"
335#endif
330#if defined(USE_XIM) 336#if defined(USE_XIM)
331 "XIM," 337 "XIM,"
332#endif 338#endif
333#if defined(NO_BACKSPACE_KEY) 339#if defined(NO_BACKSPACE_KEY)
334 "no_backspace," 340 "no_backspace,"
… …
361 "pointerBlank," 367 "pointerBlank,"
362#endif 368#endif
363#if defined(NO_RESOURCES) 369#if defined(NO_RESOURCES)
364 "NoResources," 370 "NoResources,"
365#endif 371#endif
366 "scrollbars=" 372 "scrollbars=plain"
367#if !defined(HAVE_SCROLLBARS)
368 "NONE"
369#else
370# if defined(PLAIN_SCROLLBAR)
371 "plain"
372# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
373 "+"
374# endif
375# endif
376# if defined(RXVT_SCROLLBAR) 373#if defined(RXVT_SCROLLBAR)
377 "rxvt" 374 "+rxvt"
378# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
379 "+"
380# endif
381# endif 375#endif
382# if defined(NEXT_SCROLLBAR) 376#if defined(NEXT_SCROLLBAR)
383 "NeXT" 377 "+NeXT"
384# if defined(XTERM_SCROLLBAR)
385 "+"
386# endif
387# endif 378#endif
388# if defined(XTERM_SCROLLBAR) 379#if defined(XTERM_SCROLLBAR)
389 "xterm" 380 "+xterm"
390# endif
391#endif 381#endif
392 "\nUsage: "; /* Usage */ 382 "\nUsage: "; /* Usage */
393 383
394#define INDENT 18 384#define INDENT 18
395 385
… …
414 for (col = 1, i = 0; i < optList_size; i++) 404 for (col = 1, i = 0; i < optList_size; i++)
415 if (optList[i].desc != NULL) 405 if (optList[i].desc != NULL)
416 { 406 {
417 int len = 0; 407 int len = 0;
418 408
419 if (!optList_isBool (i)) 409 if (optList[i].arg)
420 { 410 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
426 assert (optList[i].opt != NULL); 411 assert (optList[i].opt != NULL);
427#endif
428 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 412 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
429 col += len; 413 col += len;
430 if (col > 79) 414 if (col > 79)
415 {
431 { /* assume regular width */ 416 /* assume regular width */
432 rxvt_log ("\n"); 417 rxvt_log ("\n");
433 col = 1 + len; 418 col = 1 + len;
434 } 419 }
435 420
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 421 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
437 if (optList_strlen (i)) 422 if (optList[i].arg)
438 rxvt_log (" %s]", optList[i].arg); 423 rxvt_log (" %s]", optList[i].arg);
439 else 424 else
440 rxvt_log ("]"); 425 rxvt_log ("]");
441 } 426 }
442 break; 427 break;
… …
445 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 430 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
446 431
447 for (i = 0; i < optList_size; i++) 432 for (i = 0; i < optList_size; i++)
448 if (optList[i].desc != NULL) 433 if (optList[i].desc != NULL)
449 { 434 {
450#ifdef DEBUG_STRICT
451 assert (optList[i].opt != NULL); 435 assert (optList[i].opt != NULL);
452#endif
453 rxvt_log (" %s%s %-*s%s%s\n", 436 rxvt_log (" %s%s %-*s%s%s\n",
454 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 437 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
455 (INDENT - strlen (optList[i].opt) 438 (INDENT - strlen (optList[i].opt)
456 + (optList_isBool (i) ? 0 : 2)), 439 + (optList_isBool (i) ? 0 : 2)),
457 (optList[i].arg ? optList[i].arg : ""), 440 (optList[i].arg ? optList[i].arg : ""),
… …
494 int i, bad_option = 0; 477 int i, bad_option = 0;
495 478
496 for (i = 1; i < argc; i++) 479 for (i = 1; i < argc; i++)
497 { 480 {
498 unsigned int entry, longopt = 0; 481 unsigned int entry, longopt = 0;
499 const char *flag, *opt; 482 const char *opt;
483 int flag;
500 484
501 opt = argv[i]; 485 opt = argv[i];
502 486
503 if (*opt == '-') 487 if (*opt == '-')
504 { 488 {
505 flag = resval_on; 489 flag = 1;
506 490
507 if (*++opt == '-') 491 if (*++opt == '-')
508 longopt = *opt++; /* long option */ 492 longopt = *opt++; /* long option */
509 } 493 }
510 else if (*opt == '+') 494 else if (*opt == '+')
511 { 495 {
512 flag = resval_off; 496 flag = 0;
513 497
514 if (*++opt == '+') 498 if (*++opt == '+')
515 longopt = *opt++; /* long option */ 499 longopt = *opt++; /* long option */
516 } 500 }
517 else 501 else
… …
535 break; 519 break;
536 520
537 if (entry < optList_size) 521 if (entry < optList_size)
538 { 522 {
539 if (optList_isReverse (entry)) 523 if (optList_isReverse (entry))
540 flag = flag == resval_on ? resval_off : resval_on; 524 flag = !flag;
541 525
542 if (optList_strlen (entry)) 526 if (optList_isString (entry))
543 { 527 {
544 /* 528 /*
545 * special cases are handled in main.c:main () to allow 529 * special cases are handled in main.c:main () to allow
546 * X resources to set these values before we settle for 530 * X resources to set these values before we settle for
547 * default values 531 * default values
548 */ 532 */
549 533
550 if (optList[entry].doff != -1) 534 if (optList[entry].doff != -1)
551 { 535 {
552 if (flag == resval_on && i+1 == argc) 536 if (flag && i+1 == argc)
553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 537 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554 538
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 539 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
556 } 540 }
557 } 541 }
558 else 542 else
543 {
559 { /* boolean value */ 544 /* boolean value */
560 set_option (optList[entry].index, flag == resval_on); 545 set_option (optList[entry].index, flag);
561 546
562 if (optList[entry].doff != -1) 547 if (optList[entry].doff != -1)
563 rs[optList[entry].doff] = flag; 548 rs[optList[entry].doff] = flag ? resval_on : resval_off;
564 } 549 }
565 } 550 }
551#ifndef NO_RESOURCES
552 else if (!strcmp (opt, "xrm"))
553 {
554 if (i+1 < argc)
555 XrmPutLineResource (&option_db, argv[++i]);
556 }
557#endif
566#ifdef KEYSYM_RESOURCE 558#ifdef KEYSYM_RESOURCE
567 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 559 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
568 { 560 {
569 if (i+1 < argc) 561 if (i+1 < argc)
570 parse_keysym (opt + sizeof ("keysym.") - 1, argv[++i]); 562 {
563 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
564 sprintf (res, "*.%s: %s\n", opt, argv[i]);
565 XrmPutLineResource (&option_db, res);
566 }
571 } 567 }
572#endif 568#endif
573 else 569 else
574 { 570 {
575 bad_option = 1; 571 bad_option = 1;
… …
613} 609}
614 610
615/* 611/*
616 * look for something like this (XK_Delete) 612 * look for something like this (XK_Delete)
617 * rxvt*keysym.0xFFFF: "\177" 613 * rxvt*keysym.0xFFFF: "\177"
618 *
619 * arg will be
620 * NULL for ~/.Xdefaults and
621 * non-NULL for command-line options (need to allocate)
622 */ 614 */
623#define NEWARGLIM 500 /* `reasonable' size */
624 615
625struct keysym_vocabulary_t 616struct keysym_vocabulary_t
626{ 617{
627 const char *name; 618 const char *name;
628 unsigned short len; 619 unsigned short len;
629 unsigned short value; 620 unsigned short value;
630}; 621};
631keysym_vocabulary_t keysym_vocabulary[] = 622static const keysym_vocabulary_t keysym_vocabulary[] =
632{ 623{
633 { "ISOLevel3", 9, Level3Mask }, 624 { "ISOLevel3", 9, Level3Mask },
634 { "AppKeypad", 9, AppKeypadMask }, 625 { "AppKeypad", 9, AppKeypadMask },
635 { "Control", 7, ControlMask }, 626 { "Control", 7, ControlMask },
636 { "NumLock", 7, NumLockMask }, 627 { "NumLock", 7, NumLockMask },
… …
658}; 649};
659 650
660int 651int
661rxvt_term::parse_keysym (const char *str, const char *arg) 652rxvt_term::parse_keysym (const char *str, const char *arg)
662{ 653{
663 int n, sym; 654 int sym;
664 unsigned int state = 0; 655 unsigned int state = 0;
665 const char *pmodend = NULL; 656 const char *key = strrchr (str, '-');
666 char *newarg = NULL;
667 char newargstr[NEWARGLIM];
668 657
669 if (arg == NULL) 658 if (!key)
670 { 659 key = str;
671 n = sizeof ("keysym.") - 1;
672 if (strncmp (str, "keysym.", n))
673 return 0;
674
675 str += n; /* skip `keysym.' */
676 if (!(pmodend = strchr (str, ':')))
677 return -1;
678 }
679 else 660 else
680 pmodend = str + strlen(str); 661 key++;
681 662
682 for (--pmodend; str < pmodend; --pmodend) 663 // string or key is empty
683 if (*pmodend == '-') 664 if (*arg == '\0' || *key == '\0')
684 break; 665 return -1;
685 666
667 // parse modifiers
686 while (str < pmodend) 668 while (str < key)
687 { 669 {
688 unsigned int i; 670 unsigned int i;
689 671
690 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 672 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
691 { 673 {
… …
702 684
703 if (*str == '-') 685 if (*str == '-')
704 ++str; 686 ++str;
705 } 687 }
706 688
707 /* some scanf () have trouble with a 0x prefix */ 689 // convert keysym name to keysym number
708 if (str[0] == '0' && toupper (str[1]) == 'X') 690 if ((sym = XStringToKeysym (str)) == None)
709 { 691 {
710 str += 2; 692 // fallback on hexadecimal parsing
711 693 char *end;
694 sym = strtol (str, &end, 16);
712 if (arg) 695 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; 696 return -1;
746 } 697 }
747 698
748 if (newarg == NULL)
749 {
750 strncpy (newargstr, arg, NEWARGLIM - 1);
751 newargstr[NEWARGLIM - 1] = '\0';
752 newarg = newargstr;
753 }
754
755 if (*newarg == '\0')
756 return -1;
757
758 keyboard->register_user_translation (sym, state, newarg); 699 keyboard->register_user_translation (sym, state, arg);
759 return 1; 700 return 1;
760} 701}
761 702
762# endif /* KEYSYM_RESOURCE */ 703# endif /* KEYSYM_RESOURCE */
763#endif /* NO_RESOURCES */ 704#endif /* NO_RESOURCES */
… …
800 741
801void 742void
802rxvt_term::extract_resources () 743rxvt_term::extract_resources ()
803{ 744{
804#ifndef NO_RESOURCES 745#ifndef NO_RESOURCES
746 XrmDatabase database = XrmGetDatabase (dpy);
747 XrmMergeDatabases (option_db, &database);
748 option_db = NULL;
805 /* 749 /*
806 * Query resources for options that affect us 750 * Query resources for options that affect us
807 */ 751 */
808 for (int entry = 0; entry < optList_size; entry++) 752 for (int entry = 0; entry < optList_size; entry++)
809 { 753 {
… …
838 782
839 /* 783 /*
840 * [R5 or later]: enumerate the resource database 784 * [R5 or later]: enumerate the resource database
841 */ 785 */
842# ifdef KEYSYM_RESOURCE 786# ifdef KEYSYM_RESOURCE
843 XrmDatabase database = XrmGetDatabase (dpy);
844 XrmName name_prefix[3]; 787 XrmName name_prefix[3];
845 XrmClass class_prefix[3]; 788 XrmClass class_prefix[3];
846 789
847 name_prefix[0] = XrmStringToName (rs[Rs_name]); 790 name_prefix[0] = XrmStringToName (rs[Rs_name]);
848 name_prefix[1] = XrmStringToName ("keysym"); 791 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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