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.128 by ayin, Mon Dec 31 01:16:47 2007 UTC vs.
Revision 1.148 by sf-exg, Thu Oct 14 22:08:45 2010 UTC

… …
63/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
64#define SWCH(opt, option, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
66 66
67/* convenient macros */ 67/* convenient macros */
68#define optList_strlen(i) \ 68#define optList_isString(i) \
69 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag == 0)
70#define optList_isBool(i) \ 70#define optList_isBool(i) \
71 (optList[i].flag & Optflag_Boolean) 71 (optList[i].flag & Optflag_Boolean)
72#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
73 (optList[i].flag & Optflag_Reverse) 73 (optList[i].flag & Optflag_Reverse)
74#define optList_size \ 74#define optList_size \
… …
91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
93 SWCH ("C", Opt_console, 0, "intercept console messages"), 93 SWCH ("C", Opt_console, 0, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 94 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
95 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"),
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
99 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 100 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
100 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"),
101#if HAVE_SCROLLBARS
102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
104 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 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"),
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, 0, NULL), 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
110 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"),
111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
113#if ENABLE_TRANSPARENCY 112#if ENABLE_TRANSPARENCY
114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
115 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
117 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 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"),
118#endif 118#endif
119#if OFF_FOCUS_FADING 119#if OFF_FOCUS_FADING
120 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), 120 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
121 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"),
122#endif 122#endif
… …
172 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 172 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
174#if ENABLE_FRILLS 174#if ENABLE_FRILLS
175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
176#endif 176#endif
177#ifdef KEEP_SCROLLCOLOR
178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
178#ifdef RXVT_SCROLLBAR
179 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 179 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
180#endif /* KEEP_SCROLLCOLOR */ 180#endif
181#ifdef OPTION_HC 181#ifdef OPTION_HC
182 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"),
183#endif 184#endif
184#ifndef NO_CURSORCOLOR 185#ifndef NO_CURSORCOLOR
185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 186 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
186 /* command-line option = resource name */ 187 /* command-line option = resource name */
187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 188 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
… …
190 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"),
191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 192 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
192#ifdef BG_IMAGE_FROM_FILE 193#ifdef BG_IMAGE_FROM_FILE
193 RSTRG (Rs_path, "path", "search path"), 194 RSTRG (Rs_path, "path", "search path"),
194 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
195#endif 199#endif
196 /* fonts: command-line option = resource name */ 200 /* fonts: command-line option = resource name */
197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 201 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
198#if ENABLE_STYLES 202#if ENABLE_STYLES
199 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 203 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
215#if ENABLE_XEMBED 219#if ENABLE_XEMBED
216 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"),
217#endif 221#endif
218#if XFT 222#if XFT
219 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),
220#endif 225#endif
221#if ENABLE_FRILLS 226#if ENABLE_FRILLS
222 RSTRG (Rs_transient_for, "transient-for", "windowid"), 227 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"), 228 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"), 229 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 232 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 233 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 234 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 235 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 236 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
237 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
232#endif 238#endif
233#ifdef BUILTIN_GLYPHS 239#ifdef BUILTIN_GLYPHS
234 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"),
235#endif 241#endif
236#ifdef POINTER_BLANK 242#ifdef POINTER_BLANK
… …
244#endif 250#endif
245#ifdef PRINTPIPE 251#ifdef PRINTPIPE
246 RSTRG (Rs_print_pipe, "print-pipe", "string"), 252 RSTRG (Rs_print_pipe, "print-pipe", "string"),
247#endif 253#endif
248 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"),
249#ifdef CUTCHAR_RESOURCE
250 RSTRG (Rs_cutchars, "cutchars", "string"), 255 RSTRG (Rs_cutchars, "cutchars", "string"),
251#endif /* CUTCHAR_RESOURCE */
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 256 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 257#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 258 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
255 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"),
256#endif 260#endif
… …
259 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
260 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
261 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"),
262#endif 266#endif
263#if ISO_14755 267#if ISO_14755
268 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
264 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),
265#endif 270#endif
266#ifdef HAVE_AFTERIMAGE 271#ifdef HAVE_AFTERIMAGE
267 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..."),
268 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
269#endif 273#endif
270 INFO ("e", "command arg ...", "command to execute") 274 INFO ("e", "command arg ...", "command to execute")
271 }; 275 };
272 276
273#undef INFO 277#undef INFO
… …
324 "tint," 328 "tint,"
325#endif 329#endif
326#if HAVE_AFTERIMAGE 330#if HAVE_AFTERIMAGE
327 "afterimage," 331 "afterimage,"
328#endif 332#endif
333#if HAVE_PIXBUF
334 "pixbuf,"
335#endif
329#if defined(USE_XIM) 336#if defined(USE_XIM)
330 "XIM," 337 "XIM,"
331#endif 338#endif
332#if defined(NO_BACKSPACE_KEY) 339#if defined(NO_BACKSPACE_KEY)
333 "no_backspace," 340 "no_backspace,"
… …
360 "pointerBlank," 367 "pointerBlank,"
361#endif 368#endif
362#if defined(NO_RESOURCES) 369#if defined(NO_RESOURCES)
363 "NoResources," 370 "NoResources,"
364#endif 371#endif
365 "scrollbars=" 372 "scrollbars=plain"
366#if !defined(HAVE_SCROLLBARS)
367 "NONE"
368#else
369# if defined(PLAIN_SCROLLBAR)
370 "plain"
371# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
372 "+"
373# endif
374# endif
375# if defined(RXVT_SCROLLBAR) 373#if defined(RXVT_SCROLLBAR)
376 "rxvt" 374 "+rxvt"
377# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
378 "+"
379# endif
380# endif 375#endif
381# if defined(NEXT_SCROLLBAR) 376#if defined(NEXT_SCROLLBAR)
382 "NeXT" 377 "+NeXT"
383# if defined(XTERM_SCROLLBAR)
384 "+"
385# endif
386# endif 378#endif
387# if defined(XTERM_SCROLLBAR) 379#if defined(XTERM_SCROLLBAR)
388 "xterm" 380 "+xterm"
389# endif
390#endif 381#endif
391 "\nUsage: "; /* Usage */ 382 "\nUsage: "; /* Usage */
392 383
393#define INDENT 18 384#define INDENT 18
394 385
… …
413 for (col = 1, i = 0; i < optList_size; i++) 404 for (col = 1, i = 0; i < optList_size; i++)
414 if (optList[i].desc != NULL) 405 if (optList[i].desc != NULL)
415 { 406 {
416 int len = 0; 407 int len = 0;
417 408
418 if (!optList_isBool (i)) 409 if (optList[i].arg)
419 { 410 len = strlen (optList[i].arg) + 1;
420 len = optList_strlen (i);
421 if (len > 0)
422 len++; /* account for space */
423 }
424#ifdef DEBUG_STRICT
425 assert (optList[i].opt != NULL); 411 assert (optList[i].opt != NULL);
426#endif
427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 412 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
428 col += len; 413 col += len;
429 if (col > 79) 414 if (col > 79)
430 { 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
559 { 543 {
560 /* boolean value */ 544 /* boolean value */
561 set_option (optList[entry].index, flag == resval_on); 545 set_option (optList[entry].index, flag);
562 546
563 if (optList[entry].doff != -1) 547 if (optList[entry].doff != -1)
564 rs[optList[entry].doff] = flag; 548 rs[optList[entry].doff] = flag ? resval_on : resval_off;
565 } 549 }
566 } 550 }
567#ifndef NO_RESOURCES 551#ifndef NO_RESOURCES
568 else if (!strcmp (opt, "xrm")) 552 else if (!strcmp (opt, "xrm"))
569 { 553 {
… …
574#ifdef KEYSYM_RESOURCE 558#ifdef KEYSYM_RESOURCE
575 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 559 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
576 { 560 {
577 if (i+1 < argc) 561 if (i+1 < argc)
578 { 562 {
579 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 563 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
580 sprintf (res, "*.%s: %s\n", opt, argv[i]); 564 sprintf (res, "*.%s: %s\n", opt, argv[i]);
581 XrmPutLineResource (&option_db, res); 565 XrmPutLineResource (&option_db, res);
582 free (res);
583 } 566 }
584 } 567 }
585#endif 568#endif
586 else 569 else
587 { 570 {
… …
626} 609}
627 610
628/* 611/*
629 * look for something like this (XK_Delete) 612 * look for something like this (XK_Delete)
630 * rxvt*keysym.0xFFFF: "\177" 613 * rxvt*keysym.0xFFFF: "\177"
631 *
632 * arg will be
633 * NULL for ~/.Xdefaults and
634 * non-NULL for command-line options (need to allocate)
635 */ 614 */
636#define NEWARGLIM 500 /* `reasonable' size */
637 615
638struct keysym_vocabulary_t 616struct keysym_vocabulary_t
639{ 617{
640 const char *name; 618 const char *name;
641 unsigned short len; 619 unsigned short len;
642 unsigned short value; 620 unsigned short value;
643}; 621};
644keysym_vocabulary_t keysym_vocabulary[] = 622static const keysym_vocabulary_t keysym_vocabulary[] =
645{ 623{
646 { "ISOLevel3", 9, Level3Mask }, 624 { "ISOLevel3", 9, Level3Mask },
647 { "AppKeypad", 9, AppKeypadMask }, 625 { "AppKeypad", 9, AppKeypadMask },
648 { "Control", 7, ControlMask }, 626 { "Control", 7, ControlMask },
649 { "NumLock", 7, NumLockMask }, 627 { "NumLock", 7, NumLockMask },
… …
671}; 649};
672 650
673int 651int
674rxvt_term::parse_keysym (const char *str, const char *arg) 652rxvt_term::parse_keysym (const char *str, const char *arg)
675{ 653{
676 int n, sym; 654 int sym;
677 unsigned int state = 0; 655 unsigned int state = 0;
678 const char *pmodend = NULL; 656 const char *key = strrchr (str, '-');
679 char *newarg = NULL;
680 char newargstr[NEWARGLIM];
681 657
682 if (arg == NULL) 658 if (!key)
683 { 659 key = str;
684 n = sizeof ("keysym.") - 1;
685 if (strncmp (str, "keysym.", n))
686 return 0;
687
688 str += n; /* skip `keysym.' */
689 if (!(pmodend = strchr (str, ':')))
690 return -1;
691 }
692 else 660 else
693 pmodend = str + strlen(str); 661 key++;
694 662
695 for (--pmodend; str < pmodend; --pmodend) 663 // string or key is empty
696 if (*pmodend == '-') 664 if (*arg == '\0' || *key == '\0')
697 break; 665 return -1;
698 666
667 // parse modifiers
699 while (str < pmodend) 668 while (str < key)
700 { 669 {
701 unsigned int i; 670 unsigned int i;
702 671
703 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)
704 { 673 {
… …
715 684
716 if (*str == '-') 685 if (*str == '-')
717 ++str; 686 ++str;
718 } 687 }
719 688
720 /* some scanf () have trouble with a 0x prefix */ 689 // convert keysym name to keysym number
721 if (str[0] == '0' && toupper (str[1]) == 'X') 690 if ((sym = XStringToKeysym (str)) == None)
722 { 691 {
723 str += 2; 692 // fallback on hexadecimal parsing
724 693 char *end;
694 sym = strtol (str, &end, 16);
725 if (arg) 695 if (*end)
726 {
727 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
728 return -1;
729 }
730 else
731 {
732 if (sscanf (str, "%x:", &sym) != 1)
733 return -1;
734
735 /* cue to ':', it's there since sscanf () worked */
736 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
737 newargstr[NEWARGLIM - 1] = '\0';
738 newarg = newargstr;
739 }
740 }
741 else
742 {
743 /*
744 * convert keysym name to keysym number
745 */
746 strncpy (newargstr, str, NEWARGLIM - 1);
747 newargstr[NEWARGLIM - 1] = '\0';
748
749 if (arg == NULL)
750 {
751 if ((newarg = strchr (newargstr, ':')) == NULL)
752 return -1;
753
754 *newarg++ = '\0'; /* terminate keysym name */
755 }
756
757 if ((sym = XStringToKeysym (newargstr)) == None)
758 return -1; 696 return -1;
759 } 697 }
760 698
761 if (newarg == NULL)
762 {
763 strncpy (newargstr, arg, NEWARGLIM - 1);
764 newargstr[NEWARGLIM - 1] = '\0';
765 newarg = newargstr;
766 }
767
768 if (*newarg == '\0')
769 return -1;
770
771 keyboard->register_user_translation (sym, state, newarg); 699 keyboard->register_user_translation (sym, state, arg);
772 return 1; 700 return 1;
773} 701}
774 702
775# endif /* KEYSYM_RESOURCE */ 703# endif /* KEYSYM_RESOURCE */
776#endif /* NO_RESOURCES */ 704#endif /* NO_RESOURCES */

Diff Legend

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