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.106 by ayin, Sun Jun 10 14:27:58 2007 UTC vs.
Revision 1.133 by ayin, Sat Jan 26 14:24:43 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.
… …
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 \
… …
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 */
95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
96 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
97 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"),
98 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"),
99#if HAVE_SCROLLBARS 101#if HAVE_SCROLLBARS
100 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
101 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
102 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"),
… …
106#endif 108#endif
107 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
108 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"),
109 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
110 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
111#if TRANSPARENT 113#if ENABLE_TRANSPARENCY
112 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
113 SWCH ("tr", Opt_transparent, 0, NULL), 115 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
114# if TINTING
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116# endif 117 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
117#endif 118#endif
118#if OFF_FOCUS_FADING 119#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 120 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 121 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif
122#if TINTING
123 STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
124#endif 122#endif
125 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 123 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
126#ifndef NO_BELL 124#ifndef NO_BELL
127# if ENABLE_FRILLS 125# if ENABLE_FRILLS
128 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), 126 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
… …
170#ifndef NO_BOLD_UNDERLINE_REVERSE 168#ifndef NO_BOLD_UNDERLINE_REVERSE
171 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 169 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
172 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 170 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
173 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 171 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
174 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 172 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
175#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
176#if ENABLE_FRILLS 174#if ENABLE_FRILLS
177 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
178#endif 176#endif
179#ifdef KEEP_SCROLLCOLOR 177#ifdef KEEP_SCROLLCOLOR
180 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
181 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 179 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
182#endif /* KEEP_SCROLLCOLOR */ 180#endif /* KEEP_SCROLLCOLOR */
183#ifdef OPTION_HC 181#ifdef OPTION_HC
184 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
185#endif 183#endif
186#ifndef NO_CURSORCOLOR 184#ifndef NO_CURSORCOLOR
187 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
188 /* command-line option = resource name */ 186 /* command-line option = resource name */
189 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
190#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
191 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
192 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"),
193 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
194#ifdef XPM_BACKGROUND 192#ifdef BG_IMAGE_FROM_FILE
195 RSTRG (Rs_path, "path", "search path"), 193 RSTRG (Rs_path, "path", "search path"),
196 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
197#endif 195#endif
198 /* fonts: command-line option = resource name */ 196 /* fonts: command-line option = resource name */
199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
… …
206#ifdef USE_XIM 204#ifdef USE_XIM
207 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 205 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
208 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"),
209 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"),
210 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"),
211#endif /* USE_XIM */ 209#endif /* USE_XIM */
212 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"),
213 STRG (Rs_title, "title", "title", "string", "title name for window"), 211 STRG (Rs_title, "title", "title", "string", "title name for window"),
214 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 212 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
215 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 213 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
216 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"),
217#if ENABLE_XEMBED 215#if ENABLE_XEMBED
218 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"),
219#endif 217#endif
220#if XFT 218#if XFT
221 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),
222#endif 221#endif
223#if ENABLE_FRILLS 222#if ENABLE_FRILLS
224 RSTRG (Rs_transient_for, "transient-for", "windowid"), 223 RSTRG (Rs_transient_for, "transient-for", "windowid"),
225 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"),
226 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"),
… …
228 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
229 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
230 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
231 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
232 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#endif
234#ifdef BUILTIN_GLYPHS
233 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 235 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
234 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
235#endif 236#endif
236#ifdef POINTER_BLANK 237#ifdef POINTER_BLANK
237 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 238 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
238#endif 239#endif
239#ifndef NO_BACKSPACE_KEY 240#ifndef NO_BACKSPACE_KEY
240 RSTRG (Rs_backspace_key, "backspacekey", "string"), 241 RSTRG (Rs_backspace_key, "backspacekey", "string"),
241#endif 242#endif
242#ifndef NO_DELETE_KEY 243#ifndef NO_DELETE_KEY
243 RSTRG (Rs_delete_key, "deletekey", "string"), 244 RSTRG (Rs_delete_key, "deletekey", "string"),
244#endif 245#endif
245 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
246#ifdef PRINTPIPE 246#ifdef PRINTPIPE
247 RSTRG (Rs_print_pipe, "print-pipe", "string"), 247 RSTRG (Rs_print_pipe, "print-pipe", "string"),
248#endif 248#endif
249 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 249 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
250#ifdef CUTCHAR_RESOURCE 250#ifdef CUTCHAR_RESOURCE
251 RSTRG (Rs_cutchars, "cutchars", "string"), 251 RSTRG (Rs_cutchars, "cutchars", "string"),
252#endif /* CUTCHAR_RESOURCE */ 252#endif /* CUTCHAR_RESOURCE */
253 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 253 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
254#ifndef NO_SECONDARY_SCREEN 254#ifndef NO_SECONDARY_SCREEN
255 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 255 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
256 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 256 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
257#endif 257#endif
… …
264#if ISO_14755 264#if ISO_14755
265 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),
266#endif 266#endif
267#ifdef HAVE_AFTERIMAGE 267#ifdef HAVE_AFTERIMAGE
268 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..."),
269 STRG (Rs_blurradius, "blurRadius", "blr", "number", "Gaussian Blur radius to apply to the root background"), 269 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
270#endif
271#ifndef NO_RESOURCES
272 INFO ("xrm", "string", "X resource"),
273#endif 270#endif
274 INFO ("e", "command arg ...", "command to execute") 271 INFO ("e", "command arg ...", "command to execute")
275 }; 272 };
276 273
277#undef INFO 274#undef INFO
… …
321#endif 318#endif
322 "," 319 ","
323#if OFF_FOCUS_FADING 320#if OFF_FOCUS_FADING
324 "fade," 321 "fade,"
325#endif 322#endif
326#if defined(XPM_BACKGROUND)
327 "XPM,"
328#endif
329#if defined(TRANSPARENT) 323#if defined(ENABLE_TRANSPARENCY)
330 "transparent," 324 "transparent,"
331#endif
332#if TINTING
333 "tint," 325 "tint,"
326#endif
327#if HAVE_AFTERIMAGE
328 "afterimage,"
334#endif 329#endif
335#if defined(USE_XIM) 330#if defined(USE_XIM)
336 "XIM," 331 "XIM,"
337#endif 332#endif
338#if defined(NO_BACKSPACE_KEY) 333#if defined(NO_BACKSPACE_KEY)
… …
419 for (col = 1, i = 0; i < optList_size; i++) 414 for (col = 1, i = 0; i < optList_size; i++)
420 if (optList[i].desc != NULL) 415 if (optList[i].desc != NULL)
421 { 416 {
422 int len = 0; 417 int len = 0;
423 418
424 if (!optList_isBool (i)) 419 if (optList[i].arg)
425 { 420 len = strlen (optList[i].arg) + 1;
426 len = optList_strlen (i);
427 if (len > 0)
428 len++; /* account for space */
429 }
430#ifdef DEBUG_STRICT 421#ifdef DEBUG_STRICT
431 assert (optList[i].opt != NULL); 422 assert (optList[i].opt != NULL);
432#endif 423#endif
433 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 424 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
434 col += len; 425 col += len;
435 if (col > 79) 426 if (col > 79)
427 {
436 { /* assume regular width */ 428 /* assume regular width */
437 rxvt_log ("\n"); 429 rxvt_log ("\n");
438 col = 1 + len; 430 col = 1 + len;
439 } 431 }
440 432
441 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 433 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
442 if (optList_strlen (i)) 434 if (optList[i].arg)
443 rxvt_log (" %s]", optList[i].arg); 435 rxvt_log (" %s]", optList[i].arg);
444 else 436 else
445 rxvt_log ("]"); 437 rxvt_log ("]");
446 } 438 }
447 break; 439 break;
… …
499 int i, bad_option = 0; 491 int i, bad_option = 0;
500 492
501 for (i = 1; i < argc; i++) 493 for (i = 1; i < argc; i++)
502 { 494 {
503 unsigned int entry, longopt = 0; 495 unsigned int entry, longopt = 0;
504 const char *flag, *opt; 496 const char *opt;
497 int flag;
505 498
506 opt = argv[i]; 499 opt = argv[i];
507 500
508 if (*opt == '-') 501 if (*opt == '-')
509 { 502 {
510 flag = resval_on; 503 flag = 1;
511 504
512 if (*++opt == '-') 505 if (*++opt == '-')
513 longopt = *opt++; /* long option */ 506 longopt = *opt++; /* long option */
514 } 507 }
515 else if (*opt == '+') 508 else if (*opt == '+')
516 { 509 {
517 flag = resval_off; 510 flag = 0;
518 511
519 if (*++opt == '+') 512 if (*++opt == '+')
520 longopt = *opt++; /* long option */ 513 longopt = *opt++; /* long option */
521 } 514 }
522 else 515 else
… …
540 break; 533 break;
541 534
542 if (entry < optList_size) 535 if (entry < optList_size)
543 { 536 {
544 if (optList_isReverse (entry)) 537 if (optList_isReverse (entry))
545 flag = flag == resval_on ? resval_off : resval_on; 538 flag = !flag;
546 539
547 if (optList_strlen (entry)) 540 if (optList_isString (entry))
548 { 541 {
549 /* 542 /*
550 * special cases are handled in main.c:main () to allow 543 * special cases are handled in main.c:main () to allow
551 * X resources to set these values before we settle for 544 * X resources to set these values before we settle for
552 * default values 545 * default values
553 */ 546 */
554 547
555 if (optList[entry].doff != -1) 548 if (optList[entry].doff != -1)
556 { 549 {
557 if (flag == resval_on && !argv [i+1]) 550 if (flag && i+1 == argc)
558 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 551 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
559 552
560 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 553 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
561 } 554 }
562 } 555 }
563 else 556 else
557 {
564 { /* boolean value */ 558 /* boolean value */
565 set_option (optList[entry].index, flag == resval_on); 559 set_option (optList[entry].index, flag);
566 560
567 if (optList[entry].doff != -1) 561 if (optList[entry].doff != -1)
568 rs[optList[entry].doff] = flag; 562 rs[optList[entry].doff] = flag ? resval_on : resval_off;
569 } 563 }
570 } 564 }
565#ifndef NO_RESOURCES
566 else if (!strcmp (opt, "xrm"))
567 {
568 if (i+1 < argc)
569 XrmPutLineResource (&option_db, argv[++i]);
570 }
571#endif
572#ifdef KEYSYM_RESOURCE
573 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
574 {
575 if (i+1 < argc)
576 {
577 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
578 sprintf (res, "*.%s: %s\n", opt, argv[i]);
579 XrmPutLineResource (&option_db, res);
580 free (res);
581 }
582 }
583#endif
571 else 584 else
572#ifdef KEYSYM_RESOURCE
573 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
574 if (rxvt_Str_match (opt, "keysym."))
575 { 585 {
576 const char *str = argv[++i];
577
578 if (str != NULL)
579 parse_keysym (opt + sizeof ("keysym.") - 1, str);
580 }
581 else
582#endif
583 {
584 bad_option = 1; 586 bad_option = 1;
585 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 587 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
586 } 588 }
587 } 589 }
588 590
589 if (bad_option) 591 if (bad_option)
590 rxvt_usage (0); 592 rxvt_usage (0);
591} 593}
… …
622} 624}
623 625
624/* 626/*
625 * look for something like this (XK_Delete) 627 * look for something like this (XK_Delete)
626 * rxvt*keysym.0xFFFF: "\177" 628 * rxvt*keysym.0xFFFF: "\177"
627 *
628 * arg will be
629 * NULL for ~/.Xdefaults and
630 * non-NULL for command-line options (need to allocate)
631 */ 629 */
632#define NEWARGLIM 500 /* `reasonable' size */
633 630
634struct keysym_vocabulary_t 631struct keysym_vocabulary_t
635{ 632{
636 const char *name; 633 const char *name;
637 unsigned short len; 634 unsigned short len;
638 unsigned short value; 635 unsigned short value;
639}; 636};
640keysym_vocabulary_t keysym_vocabulary[] = 637static const keysym_vocabulary_t keysym_vocabulary[] =
641{ 638{
642 { "ISOLevel3", 9, Level3Mask }, 639 { "ISOLevel3", 9, Level3Mask },
643 { "AppKeypad", 9, AppKeypadMask }, 640 { "AppKeypad", 9, AppKeypadMask },
644 { "Control", 7, ControlMask }, 641 { "Control", 7, ControlMask },
645 { "NumLock", 7, NumLockMask }, 642 { "NumLock", 7, NumLockMask },
… …
667}; 664};
668 665
669int 666int
670rxvt_term::parse_keysym (const char *str, const char *arg) 667rxvt_term::parse_keysym (const char *str, const char *arg)
671{ 668{
672 int n, sym; 669 int sym;
673 unsigned int state = 0; 670 unsigned int state = 0;
674 const char *pmodend = NULL; 671 const char *key = strrchr (str, '-');
675 char *newarg = NULL;
676 char newargstr[NEWARGLIM];
677 672
678 if (arg == NULL) 673 if (!key)
679 { 674 key = str;
680 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
681 return 0;
682
683 str += n; /* skip `keysym.' */
684 if (!(pmodend = strchr (str, ':')))
685 return -1;
686 }
687 else 675 else
688 pmodend = str + strlen(str); 676 key++;
689 677
690 for (--pmodend; str < pmodend; --pmodend) 678 // string or key is empty
691 if (*pmodend == '-') 679 if (*arg == '\0' || *key == '\0')
692 break; 680 return -1;
693 681
682 // parse modifiers
694 while (str < pmodend) 683 while (str < key)
695 { 684 {
696 unsigned int i; 685 unsigned int i;
697 686
698 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 687 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
699 { 688 {
… …
710 699
711 if (*str == '-') 700 if (*str == '-')
712 ++str; 701 ++str;
713 } 702 }
714 703
715 /* some scanf () have trouble with a 0x prefix */ 704 // convert keysym name to keysym number
716 if (str[0] == '0' && toupper (str[1]) == 'X') 705 if ((sym = XStringToKeysym (str)) == None)
717 { 706 {
718 str += 2; 707 // fallback on hexadecimal parsing
719 708 char *end;
709 sym = strtol (str, &end, 16);
720 if (arg) 710 if (*end)
721 {
722 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
723 return -1;
724 }
725 else
726 {
727 if (sscanf (str, "%x:", &sym) != 1)
728 return -1;
729
730 /* cue to ':', it's there since sscanf () worked */
731 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
732 newargstr[NEWARGLIM - 1] = '\0';
733 newarg = newargstr;
734 }
735 }
736 else
737 {
738 /*
739 * convert keysym name to keysym number
740 */
741 strncpy (newargstr, str, NEWARGLIM - 1);
742 newargstr[NEWARGLIM - 1] = '\0';
743
744 if (arg == NULL)
745 {
746 if ((newarg = strchr (newargstr, ':')) == NULL)
747 return -1;
748
749 *newarg++ = '\0'; /* terminate keysym name */
750 }
751
752 if ((sym = XStringToKeysym (newargstr)) == None)
753 return -1; 711 return -1;
754 } 712 }
755 713
756 if (newarg == NULL)
757 {
758 strncpy (newargstr, arg, NEWARGLIM - 1);
759 newargstr[NEWARGLIM - 1] = '\0';
760 newarg = newargstr;
761 }
762
763 rxvt_Str_trim (newarg);
764 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
765 return -1;
766
767 keyboard->register_user_translation (sym, state, newarg); 714 keyboard->register_user_translation (sym, state, arg);
768 return 1; 715 return 1;
769} 716}
770 717
771# endif /* KEYSYM_RESOURCE */ 718# endif /* KEYSYM_RESOURCE */
772#endif /* NO_RESOURCES */ 719#endif /* NO_RESOURCES */
773 720
774static char * 721static char *
775get_res (XrmDatabase database, const char *program, const char *option) 722get_res (XrmDatabase database, const char *program, const char *option)
776{ 723{
777 char resource[512]; 724 char resource[512];
… …
809 756
810void 757void
811rxvt_term::extract_resources () 758rxvt_term::extract_resources ()
812{ 759{
813#ifndef NO_RESOURCES 760#ifndef NO_RESOURCES
761 XrmDatabase database = XrmGetDatabase (dpy);
762 XrmMergeDatabases (option_db, &database);
763 option_db = NULL;
814 /* 764 /*
815 * Query resources for options that affect us 765 * Query resources for options that affect us
816 */ 766 */
817 for (int entry = 0; entry < optList_size; entry++) 767 for (int entry = 0; entry < optList_size; entry++)
818 { 768 {
… …
847 797
848 /* 798 /*
849 * [R5 or later]: enumerate the resource database 799 * [R5 or later]: enumerate the resource database
850 */ 800 */
851# ifdef KEYSYM_RESOURCE 801# ifdef KEYSYM_RESOURCE
852 XrmDatabase database = XrmGetDatabase (dpy);
853 XrmName name_prefix[3]; 802 XrmName name_prefix[3];
854 XrmClass class_prefix[3]; 803 XrmClass class_prefix[3];
855 804
856 name_prefix[0] = XrmStringToName (rs[Rs_name]); 805 name_prefix[0] = XrmStringToName (rs[Rs_name]);
857 name_prefix[1] = XrmStringToName ("keysym"); 806 name_prefix[1] = XrmStringToName ("keysym");
… …
871 XrmEnumerateDatabase (database, name_prefix, class_prefix, 820 XrmEnumerateDatabase (database, name_prefix, class_prefix,
872 XrmEnumOneLevel, rxvt_define_key, NULL); 821 XrmEnumOneLevel, rxvt_define_key, NULL);
873# endif 822# endif
874# endif 823# endif
875 824
876#endif /* NO_RESOURCES */ 825#endif /* NO_RESOURCES */
877} 826}
878 827
879/*----------------------- end-of-file (C source) -----------------------*/ 828/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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