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.122 by ayin, Thu Nov 22 15:07:10 2007 UTC vs.
Revision 1.145 by sf-exg, Sun Apr 4 18:59:19 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#endif 117#endif
118#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent 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"), 120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif 121#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL 123#ifndef NO_BELL
124# if ENABLE_FRILLS 124# if ENABLE_FRILLS
… …
171 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
173#if ENABLE_FRILLS 173#if ENABLE_FRILLS
174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
175#endif 175#endif
176#ifdef KEEP_SCROLLCOLOR
177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
177#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif /* KEEP_SCROLLCOLOR */ 179#endif
180#ifdef OPTION_HC 180#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
182 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
182#endif 183#endif
183#ifndef NO_CURSORCOLOR 184#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 186 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
… …
214#if ENABLE_XEMBED 215#if ENABLE_XEMBED
215 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"),
216#endif 217#endif
217#if XFT 218#if XFT
218 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),
219#endif 221#endif
220#if ENABLE_FRILLS 222#if ENABLE_FRILLS
221 RSTRG (Rs_transient_for, "transient-for", "windowid"), 223 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"), 224 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"), 225 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"), 227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 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 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
234#endif
235#ifdef BUILTIN_GLYPHS
230 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 236 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 237#endif
233#ifdef POINTER_BLANK 238#ifdef POINTER_BLANK
234 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 239 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
235#endif 240#endif
236#ifndef NO_BACKSPACE_KEY 241#ifndef NO_BACKSPACE_KEY
237 RSTRG (Rs_backspace_key, "backspacekey", "string"), 242 RSTRG (Rs_backspace_key, "backspacekey", "string"),
238#endif 243#endif
239#ifndef NO_DELETE_KEY 244#ifndef NO_DELETE_KEY
240 RSTRG (Rs_delete_key, "deletekey", "string"), 245 RSTRG (Rs_delete_key, "deletekey", "string"),
241#endif 246#endif
242 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
243#ifdef PRINTPIPE 247#ifdef PRINTPIPE
244 RSTRG (Rs_print_pipe, "print-pipe", "string"), 248 RSTRG (Rs_print_pipe, "print-pipe", "string"),
245#endif 249#endif
246 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 250 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
247#ifdef CUTCHAR_RESOURCE
248 RSTRG (Rs_cutchars, "cutchars", "string"), 251 RSTRG (Rs_cutchars, "cutchars", "string"),
249#endif /* CUTCHAR_RESOURCE */
250 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 252 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251#ifndef NO_SECONDARY_SCREEN 253#ifndef NO_SECONDARY_SCREEN
252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
254#endif 256#endif
… …
257 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 259 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 260 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"), 261 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
260#endif 262#endif
261#if ISO_14755 263#if ISO_14755
264 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 265 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif 266#endif
264#ifdef HAVE_AFTERIMAGE 267#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 268 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"), 269 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
270# if ENABLE_EWMH
271 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
267#endif 272# 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
… …
361 "pointerBlank," 364 "pointerBlank,"
362#endif 365#endif
363#if defined(NO_RESOURCES) 366#if defined(NO_RESOURCES)
364 "NoResources," 367 "NoResources,"
365#endif 368#endif
366 "scrollbars=" 369 "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) 370#if defined(RXVT_SCROLLBAR)
377 "rxvt" 371 "+rxvt"
378# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
379 "+"
380# endif
381# endif 372#endif
382# if defined(NEXT_SCROLLBAR) 373#if defined(NEXT_SCROLLBAR)
383 "NeXT" 374 "+NeXT"
384# if defined(XTERM_SCROLLBAR)
385 "+"
386# endif
387# endif 375#endif
388# if defined(XTERM_SCROLLBAR) 376#if defined(XTERM_SCROLLBAR)
389 "xterm" 377 "+xterm"
390# endif
391#endif 378#endif
392 "\nUsage: "; /* Usage */ 379 "\nUsage: "; /* Usage */
393 380
394#define INDENT 18 381#define INDENT 18
395 382
… …
414 for (col = 1, i = 0; i < optList_size; i++) 401 for (col = 1, i = 0; i < optList_size; i++)
415 if (optList[i].desc != NULL) 402 if (optList[i].desc != NULL)
416 { 403 {
417 int len = 0; 404 int len = 0;
418 405
419 if (!optList_isBool (i)) 406 if (optList[i].arg)
420 { 407 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); 408 assert (optList[i].opt != NULL);
427#endif
428 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 409 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
429 col += len; 410 col += len;
430 if (col > 79) 411 if (col > 79)
412 {
431 { /* assume regular width */ 413 /* assume regular width */
432 rxvt_log ("\n"); 414 rxvt_log ("\n");
433 col = 1 + len; 415 col = 1 + len;
434 } 416 }
435 417
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 418 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
437 if (optList_strlen (i)) 419 if (optList[i].arg)
438 rxvt_log (" %s]", optList[i].arg); 420 rxvt_log (" %s]", optList[i].arg);
439 else 421 else
440 rxvt_log ("]"); 422 rxvt_log ("]");
441 } 423 }
442 break; 424 break;
… …
445 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 427 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
446 428
447 for (i = 0; i < optList_size; i++) 429 for (i = 0; i < optList_size; i++)
448 if (optList[i].desc != NULL) 430 if (optList[i].desc != NULL)
449 { 431 {
450#ifdef DEBUG_STRICT
451 assert (optList[i].opt != NULL); 432 assert (optList[i].opt != NULL);
452#endif
453 rxvt_log (" %s%s %-*s%s%s\n", 433 rxvt_log (" %s%s %-*s%s%s\n",
454 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 434 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
455 (INDENT - strlen (optList[i].opt) 435 (INDENT - strlen (optList[i].opt)
456 + (optList_isBool (i) ? 0 : 2)), 436 + (optList_isBool (i) ? 0 : 2)),
457 (optList[i].arg ? optList[i].arg : ""), 437 (optList[i].arg ? optList[i].arg : ""),
… …
494 int i, bad_option = 0; 474 int i, bad_option = 0;
495 475
496 for (i = 1; i < argc; i++) 476 for (i = 1; i < argc; i++)
497 { 477 {
498 unsigned int entry, longopt = 0; 478 unsigned int entry, longopt = 0;
499 const char *flag, *opt; 479 const char *opt;
480 int flag;
500 481
501 opt = argv[i]; 482 opt = argv[i];
502 483
503 if (*opt == '-') 484 if (*opt == '-')
504 { 485 {
505 flag = resval_on; 486 flag = 1;
506 487
507 if (*++opt == '-') 488 if (*++opt == '-')
508 longopt = *opt++; /* long option */ 489 longopt = *opt++; /* long option */
509 } 490 }
510 else if (*opt == '+') 491 else if (*opt == '+')
511 { 492 {
512 flag = resval_off; 493 flag = 0;
513 494
514 if (*++opt == '+') 495 if (*++opt == '+')
515 longopt = *opt++; /* long option */ 496 longopt = *opt++; /* long option */
516 } 497 }
517 else 498 else
… …
535 break; 516 break;
536 517
537 if (entry < optList_size) 518 if (entry < optList_size)
538 { 519 {
539 if (optList_isReverse (entry)) 520 if (optList_isReverse (entry))
540 flag = flag == resval_on ? resval_off : resval_on; 521 flag = !flag;
541 522
542 if (optList_strlen (entry)) 523 if (optList_isString (entry))
543 { 524 {
544 /* 525 /*
545 * special cases are handled in main.c:main () to allow 526 * special cases are handled in main.c:main () to allow
546 * X resources to set these values before we settle for 527 * X resources to set these values before we settle for
547 * default values 528 * default values
548 */ 529 */
549 530
550 if (optList[entry].doff != -1) 531 if (optList[entry].doff != -1)
551 { 532 {
552 if (flag == resval_on && i+1 == argc) 533 if (flag && i+1 == argc)
553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 534 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554 535
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 536 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
556 } 537 }
557 } 538 }
558 else 539 else
540 {
559 { /* boolean value */ 541 /* boolean value */
560 set_option (optList[entry].index, flag == resval_on); 542 set_option (optList[entry].index, flag);
561 543
562 if (optList[entry].doff != -1) 544 if (optList[entry].doff != -1)
563 rs[optList[entry].doff] = flag; 545 rs[optList[entry].doff] = flag ? resval_on : resval_off;
564 } 546 }
565 } 547 }
548#ifndef NO_RESOURCES
549 else if (!strcmp (opt, "xrm"))
550 {
551 if (i+1 < argc)
552 XrmPutLineResource (&option_db, argv[++i]);
553 }
554#endif
566#ifdef KEYSYM_RESOURCE 555#ifdef KEYSYM_RESOURCE
567 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 556 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
568 { 557 {
569 if (i+1 < argc) 558 if (i+1 < argc)
570 { 559 {
571 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 560 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
572 sprintf (res, "*.%s: %s\n", opt, argv[i]); 561 sprintf (res, "*.%s: %s\n", opt, argv[i]);
573 XrmPutLineResource (&option_db, res); 562 XrmPutLineResource (&option_db, res);
574 free (res);
575 } 563 }
576 } 564 }
577#endif 565#endif
578 else 566 else
579 { 567 {
… …
618} 606}
619 607
620/* 608/*
621 * look for something like this (XK_Delete) 609 * look for something like this (XK_Delete)
622 * rxvt*keysym.0xFFFF: "\177" 610 * rxvt*keysym.0xFFFF: "\177"
623 *
624 * arg will be
625 * NULL for ~/.Xdefaults and
626 * non-NULL for command-line options (need to allocate)
627 */ 611 */
628#define NEWARGLIM 500 /* `reasonable' size */
629 612
630struct keysym_vocabulary_t 613struct keysym_vocabulary_t
631{ 614{
632 const char *name; 615 const char *name;
633 unsigned short len; 616 unsigned short len;
634 unsigned short value; 617 unsigned short value;
635}; 618};
636keysym_vocabulary_t keysym_vocabulary[] = 619static const keysym_vocabulary_t keysym_vocabulary[] =
637{ 620{
638 { "ISOLevel3", 9, Level3Mask }, 621 { "ISOLevel3", 9, Level3Mask },
639 { "AppKeypad", 9, AppKeypadMask }, 622 { "AppKeypad", 9, AppKeypadMask },
640 { "Control", 7, ControlMask }, 623 { "Control", 7, ControlMask },
641 { "NumLock", 7, NumLockMask }, 624 { "NumLock", 7, NumLockMask },
… …
663}; 646};
664 647
665int 648int
666rxvt_term::parse_keysym (const char *str, const char *arg) 649rxvt_term::parse_keysym (const char *str, const char *arg)
667{ 650{
668 int n, sym; 651 int sym;
669 unsigned int state = 0; 652 unsigned int state = 0;
670 const char *pmodend = NULL; 653 const char *key = strrchr (str, '-');
671 char *newarg = NULL;
672 char newargstr[NEWARGLIM];
673 654
674 if (arg == NULL) 655 if (!key)
675 { 656 key = str;
676 n = sizeof ("keysym.") - 1;
677 if (strncmp (str, "keysym.", n))
678 return 0;
679
680 str += n; /* skip `keysym.' */
681 if (!(pmodend = strchr (str, ':')))
682 return -1;
683 }
684 else 657 else
685 pmodend = str + strlen(str); 658 key++;
686 659
687 for (--pmodend; str < pmodend; --pmodend) 660 // string or key is empty
688 if (*pmodend == '-') 661 if (*arg == '\0' || *key == '\0')
689 break; 662 return -1;
690 663
664 // parse modifiers
691 while (str < pmodend) 665 while (str < key)
692 { 666 {
693 unsigned int i; 667 unsigned int i;
694 668
695 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 669 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
696 { 670 {
… …
707 681
708 if (*str == '-') 682 if (*str == '-')
709 ++str; 683 ++str;
710 } 684 }
711 685
712 /* some scanf () have trouble with a 0x prefix */ 686 // convert keysym name to keysym number
713 if (str[0] == '0' && toupper (str[1]) == 'X') 687 if ((sym = XStringToKeysym (str)) == None)
714 { 688 {
715 str += 2; 689 // fallback on hexadecimal parsing
716 690 char *end;
691 sym = strtol (str, &end, 16);
717 if (arg) 692 if (*end)
718 {
719 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
720 return -1;
721 }
722 else
723 {
724 if (sscanf (str, "%x:", &sym) != 1)
725 return -1;
726
727 /* cue to ':', it's there since sscanf () worked */
728 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
729 newargstr[NEWARGLIM - 1] = '\0';
730 newarg = newargstr;
731 }
732 }
733 else
734 {
735 /*
736 * convert keysym name to keysym number
737 */
738 strncpy (newargstr, str, NEWARGLIM - 1);
739 newargstr[NEWARGLIM - 1] = '\0';
740
741 if (arg == NULL)
742 {
743 if ((newarg = strchr (newargstr, ':')) == NULL)
744 return -1;
745
746 *newarg++ = '\0'; /* terminate keysym name */
747 }
748
749 if ((sym = XStringToKeysym (newargstr)) == None)
750 return -1; 693 return -1;
751 } 694 }
752 695
753 if (newarg == NULL)
754 {
755 strncpy (newargstr, arg, NEWARGLIM - 1);
756 newargstr[NEWARGLIM - 1] = '\0';
757 newarg = newargstr;
758 }
759
760 if (*newarg == '\0')
761 return -1;
762
763 keyboard->register_user_translation (sym, state, newarg); 696 keyboard->register_user_translation (sym, state, arg);
764 return 1; 697 return 1;
765} 698}
766 699
767# endif /* KEYSYM_RESOURCE */ 700# endif /* KEYSYM_RESOURCE */
768#endif /* NO_RESOURCES */ 701#endif /* NO_RESOURCES */

Diff Legend

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