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.105 by ayin, Sat Jun 9 09:05:38 2007 UTC vs.
Revision 1.132 by ayin, Sun Jan 20 01:15:35 2008 UTC

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

Diff Legend

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