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.124 by ayin, Sat Nov 24 10:32:33 2007 UTC vs.
Revision 1.146 by sf-exg, Thu Sep 2 15:48:11 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"),
… …
189 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"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 192#ifdef BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 193 RSTRG (Rs_path, "path", "search path"),
193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
195# if ENABLE_EWMH
196 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
197# endif
194#endif 198#endif
195 /* fonts: command-line option = resource name */ 199 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 200 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
197#if ENABLE_STYLES 201#if ENABLE_STYLES
198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 202 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
214#if ENABLE_XEMBED 218#if ENABLE_XEMBED
215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 219 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
216#endif 220#endif
217#if XFT 221#if XFT
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 222 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
223 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
219#endif 224#endif
220#if ENABLE_FRILLS 225#if ENABLE_FRILLS
221 RSTRG (Rs_transient_for, "transient-for", "windowid"), 226 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"), 227 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"), 228 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 231 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 232 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 233 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 234 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 235 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
236 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
231#endif 237#endif
232#ifdef BUILTIN_GLYPHS 238#ifdef BUILTIN_GLYPHS
233 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 239 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
234#endif 240#endif
235#ifdef POINTER_BLANK 241#ifdef POINTER_BLANK
… …
239 RSTRG (Rs_backspace_key, "backspacekey", "string"), 245 RSTRG (Rs_backspace_key, "backspacekey", "string"),
240#endif 246#endif
241#ifndef NO_DELETE_KEY 247#ifndef NO_DELETE_KEY
242 RSTRG (Rs_delete_key, "deletekey", "string"), 248 RSTRG (Rs_delete_key, "deletekey", "string"),
243#endif 249#endif
244 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
245#ifdef PRINTPIPE 250#ifdef PRINTPIPE
246 RSTRG (Rs_print_pipe, "print-pipe", "string"), 251 RSTRG (Rs_print_pipe, "print-pipe", "string"),
247#endif 252#endif
248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 253 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
249#ifdef CUTCHAR_RESOURCE
250 RSTRG (Rs_cutchars, "cutchars", "string"), 254 RSTRG (Rs_cutchars, "cutchars", "string"),
251#endif /* CUTCHAR_RESOURCE */
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 255 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 256#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 257 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 258 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
256#endif 259#endif
… …
259 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 262 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 263 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"), 264 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
262#endif 265#endif
263#if ISO_14755 266#if ISO_14755
267 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
264 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 268 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
265#endif 269#endif
266#ifdef HAVE_AFTERIMAGE 270#ifdef HAVE_AFTERIMAGE
267 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 271 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"), 272 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
… …
360 "pointerBlank," 364 "pointerBlank,"
361#endif 365#endif
362#if defined(NO_RESOURCES) 366#if defined(NO_RESOURCES)
363 "NoResources," 367 "NoResources,"
364#endif 368#endif
365 "scrollbars=" 369 "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) 370#if defined(RXVT_SCROLLBAR)
376 "rxvt" 371 "+rxvt"
377# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
378 "+"
379# endif
380# endif 372#endif
381# if defined(NEXT_SCROLLBAR) 373#if defined(NEXT_SCROLLBAR)
382 "NeXT" 374 "+NeXT"
383# if defined(XTERM_SCROLLBAR)
384 "+"
385# endif
386# endif 375#endif
387# if defined(XTERM_SCROLLBAR) 376#if defined(XTERM_SCROLLBAR)
388 "xterm" 377 "+xterm"
389# endif
390#endif 378#endif
391 "\nUsage: "; /* Usage */ 379 "\nUsage: "; /* Usage */
392 380
393#define INDENT 18 381#define INDENT 18
394 382
… …
413 for (col = 1, i = 0; i < optList_size; i++) 401 for (col = 1, i = 0; i < optList_size; i++)
414 if (optList[i].desc != NULL) 402 if (optList[i].desc != NULL)
415 { 403 {
416 int len = 0; 404 int len = 0;
417 405
418 if (!optList_isBool (i)) 406 if (optList[i].arg)
419 { 407 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); 408 assert (optList[i].opt != NULL);
426#endif
427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 409 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
428 col += len; 410 col += len;
429 if (col > 79) 411 if (col > 79)
412 {
430 { /* assume regular width */ 413 /* assume regular width */
431 rxvt_log ("\n"); 414 rxvt_log ("\n");
432 col = 1 + len; 415 col = 1 + len;
433 } 416 }
434 417
435 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 418 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
436 if (optList_strlen (i)) 419 if (optList[i].arg)
437 rxvt_log (" %s]", optList[i].arg); 420 rxvt_log (" %s]", optList[i].arg);
438 else 421 else
439 rxvt_log ("]"); 422 rxvt_log ("]");
440 } 423 }
441 break; 424 break;
… …
444 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 427 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
445 428
446 for (i = 0; i < optList_size; i++) 429 for (i = 0; i < optList_size; i++)
447 if (optList[i].desc != NULL) 430 if (optList[i].desc != NULL)
448 { 431 {
449#ifdef DEBUG_STRICT
450 assert (optList[i].opt != NULL); 432 assert (optList[i].opt != NULL);
451#endif
452 rxvt_log (" %s%s %-*s%s%s\n", 433 rxvt_log (" %s%s %-*s%s%s\n",
453 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 434 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
454 (INDENT - strlen (optList[i].opt) 435 (INDENT - strlen (optList[i].opt)
455 + (optList_isBool (i) ? 0 : 2)), 436 + (optList_isBool (i) ? 0 : 2)),
456 (optList[i].arg ? optList[i].arg : ""), 437 (optList[i].arg ? optList[i].arg : ""),
… …
493 int i, bad_option = 0; 474 int i, bad_option = 0;
494 475
495 for (i = 1; i < argc; i++) 476 for (i = 1; i < argc; i++)
496 { 477 {
497 unsigned int entry, longopt = 0; 478 unsigned int entry, longopt = 0;
498 const char *flag, *opt; 479 const char *opt;
480 int flag;
499 481
500 opt = argv[i]; 482 opt = argv[i];
501 483
502 if (*opt == '-') 484 if (*opt == '-')
503 { 485 {
504 flag = resval_on; 486 flag = 1;
505 487
506 if (*++opt == '-') 488 if (*++opt == '-')
507 longopt = *opt++; /* long option */ 489 longopt = *opt++; /* long option */
508 } 490 }
509 else if (*opt == '+') 491 else if (*opt == '+')
510 { 492 {
511 flag = resval_off; 493 flag = 0;
512 494
513 if (*++opt == '+') 495 if (*++opt == '+')
514 longopt = *opt++; /* long option */ 496 longopt = *opt++; /* long option */
515 } 497 }
516 else 498 else
… …
534 break; 516 break;
535 517
536 if (entry < optList_size) 518 if (entry < optList_size)
537 { 519 {
538 if (optList_isReverse (entry)) 520 if (optList_isReverse (entry))
539 flag = flag == resval_on ? resval_off : resval_on; 521 flag = !flag;
540 522
541 if (optList_strlen (entry)) 523 if (optList_isString (entry))
542 { 524 {
543 /* 525 /*
544 * special cases are handled in main.c:main () to allow 526 * special cases are handled in main.c:main () to allow
545 * X resources to set these values before we settle for 527 * X resources to set these values before we settle for
546 * default values 528 * default values
547 */ 529 */
548 530
549 if (optList[entry].doff != -1) 531 if (optList[entry].doff != -1)
550 { 532 {
551 if (flag == resval_on && i+1 == argc) 533 if (flag && i+1 == argc)
552 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 534 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
553 535
554 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 536 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
555 } 537 }
556 } 538 }
557 else 539 else
540 {
558 { /* boolean value */ 541 /* boolean value */
559 set_option (optList[entry].index, flag == resval_on); 542 set_option (optList[entry].index, flag);
560 543
561 if (optList[entry].doff != -1) 544 if (optList[entry].doff != -1)
562 rs[optList[entry].doff] = flag; 545 rs[optList[entry].doff] = flag ? resval_on : resval_off;
563 } 546 }
564 } 547 }
565#ifndef NO_RESOURCES 548#ifndef NO_RESOURCES
566 else if (!strcmp (opt, "xrm")) 549 else if (!strcmp (opt, "xrm"))
567 { 550 {
… …
572#ifdef KEYSYM_RESOURCE 555#ifdef KEYSYM_RESOURCE
573 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 556 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
574 { 557 {
575 if (i+1 < argc) 558 if (i+1 < argc)
576 { 559 {
577 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 560 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
578 sprintf (res, "*.%s: %s\n", opt, argv[i]); 561 sprintf (res, "*.%s: %s\n", opt, argv[i]);
579 XrmPutLineResource (&option_db, res); 562 XrmPutLineResource (&option_db, res);
580 free (res);
581 } 563 }
582 } 564 }
583#endif 565#endif
584 else 566 else
585 { 567 {
… …
624} 606}
625 607
626/* 608/*
627 * look for something like this (XK_Delete) 609 * look for something like this (XK_Delete)
628 * rxvt*keysym.0xFFFF: "\177" 610 * rxvt*keysym.0xFFFF: "\177"
629 *
630 * arg will be
631 * NULL for ~/.Xdefaults and
632 * non-NULL for command-line options (need to allocate)
633 */ 611 */
634#define NEWARGLIM 500 /* `reasonable' size */
635 612
636struct keysym_vocabulary_t 613struct keysym_vocabulary_t
637{ 614{
638 const char *name; 615 const char *name;
639 unsigned short len; 616 unsigned short len;
640 unsigned short value; 617 unsigned short value;
641}; 618};
642keysym_vocabulary_t keysym_vocabulary[] = 619static const keysym_vocabulary_t keysym_vocabulary[] =
643{ 620{
644 { "ISOLevel3", 9, Level3Mask }, 621 { "ISOLevel3", 9, Level3Mask },
645 { "AppKeypad", 9, AppKeypadMask }, 622 { "AppKeypad", 9, AppKeypadMask },
646 { "Control", 7, ControlMask }, 623 { "Control", 7, ControlMask },
647 { "NumLock", 7, NumLockMask }, 624 { "NumLock", 7, NumLockMask },
… …
669}; 646};
670 647
671int 648int
672rxvt_term::parse_keysym (const char *str, const char *arg) 649rxvt_term::parse_keysym (const char *str, const char *arg)
673{ 650{
674 int n, sym; 651 int sym;
675 unsigned int state = 0; 652 unsigned int state = 0;
676 const char *pmodend = NULL; 653 const char *key = strrchr (str, '-');
677 char *newarg = NULL;
678 char newargstr[NEWARGLIM];
679 654
680 if (arg == NULL) 655 if (!key)
681 { 656 key = str;
682 n = sizeof ("keysym.") - 1;
683 if (strncmp (str, "keysym.", n))
684 return 0;
685
686 str += n; /* skip `keysym.' */
687 if (!(pmodend = strchr (str, ':')))
688 return -1;
689 }
690 else 657 else
691 pmodend = str + strlen(str); 658 key++;
692 659
693 for (--pmodend; str < pmodend; --pmodend) 660 // string or key is empty
694 if (*pmodend == '-') 661 if (*arg == '\0' || *key == '\0')
695 break; 662 return -1;
696 663
664 // parse modifiers
697 while (str < pmodend) 665 while (str < key)
698 { 666 {
699 unsigned int i; 667 unsigned int i;
700 668
701 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)
702 { 670 {
… …
713 681
714 if (*str == '-') 682 if (*str == '-')
715 ++str; 683 ++str;
716 } 684 }
717 685
718 /* some scanf () have trouble with a 0x prefix */ 686 // convert keysym name to keysym number
719 if (str[0] == '0' && toupper (str[1]) == 'X') 687 if ((sym = XStringToKeysym (str)) == None)
720 { 688 {
721 str += 2; 689 // fallback on hexadecimal parsing
722 690 char *end;
691 sym = strtol (str, &end, 16);
723 if (arg) 692 if (*end)
724 {
725 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
726 return -1;
727 }
728 else
729 {
730 if (sscanf (str, "%x:", &sym) != 1)
731 return -1;
732
733 /* cue to ':', it's there since sscanf () worked */
734 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
735 newargstr[NEWARGLIM - 1] = '\0';
736 newarg = newargstr;
737 }
738 }
739 else
740 {
741 /*
742 * convert keysym name to keysym number
743 */
744 strncpy (newargstr, str, NEWARGLIM - 1);
745 newargstr[NEWARGLIM - 1] = '\0';
746
747 if (arg == NULL)
748 {
749 if ((newarg = strchr (newargstr, ':')) == NULL)
750 return -1;
751
752 *newarg++ = '\0'; /* terminate keysym name */
753 }
754
755 if ((sym = XStringToKeysym (newargstr)) == None)
756 return -1; 693 return -1;
757 } 694 }
758 695
759 if (newarg == NULL)
760 {
761 strncpy (newargstr, arg, NEWARGLIM - 1);
762 newargstr[NEWARGLIM - 1] = '\0';
763 newarg = newargstr;
764 }
765
766 if (*newarg == '\0')
767 return -1;
768
769 keyboard->register_user_translation (sym, state, newarg); 696 keyboard->register_user_translation (sym, state, arg);
770 return 1; 697 return 1;
771} 698}
772 699
773# endif /* KEYSYM_RESOURCE */ 700# endif /* KEYSYM_RESOURCE */
774#endif /* NO_RESOURCES */ 701#endif /* NO_RESOURCES */

Diff Legend

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