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.111 by ayin, Fri Aug 3 23:32:14 2007 UTC vs.
Revision 1.136 by ayin, Sat Feb 16 15:56:41 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 \
… …
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"),
98 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 99 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
99 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"),
100#if HAVE_SCROLLBARS
101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
103 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), 103 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"), 104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
106 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 106 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
107#endif
108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 107 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 108 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"), 109 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 110 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if ENABLE_TRANSPARENCY 111#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 112 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 SWCH ("tr", Opt_transparent, 0, NULL), 113 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."), 115 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
117#endif 116#endif
118#if OFF_FOCUS_FADING 117#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 118 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"), 119 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif 120#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 121 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL 122#ifndef NO_BELL
124# if ENABLE_FRILLS 123# if ENABLE_FRILLS
… …
167#ifndef NO_BOLD_UNDERLINE_REVERSE 166#ifndef NO_BOLD_UNDERLINE_REVERSE
168 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 167 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
169 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 168 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
170 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 169 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
171 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 170 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 171#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
173#if ENABLE_FRILLS 172#if ENABLE_FRILLS
174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 173 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
175#endif 174#endif
176#ifdef KEEP_SCROLLCOLOR
177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 175 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
176#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 177 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif /* KEEP_SCROLLCOLOR */ 178#endif
180#ifdef OPTION_HC 179#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 180 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
182#endif 181#endif
183#ifndef NO_CURSORCOLOR 182#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 183 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 184 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
187#endif /* NO_CURSORCOLOR */ 186#endif /* NO_CURSORCOLOR */
188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 187 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 188 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef XPM_BACKGROUND 190#ifdef BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 191 RSTRG (Rs_path, "path", "search path"),
193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 192 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
194#endif 193#endif
195 /* fonts: command-line option = resource name */ 194 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
… …
203#ifdef USE_XIM 202#ifdef USE_XIM
204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 203 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
205 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 204 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
206 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 205 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
207 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 206 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
208#endif /* USE_XIM */ 207#endif /* USE_XIM */
209 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 208 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
210 STRG (Rs_title, "title", "title", "string", "title name for window"), 209 STRG (Rs_title, "title", "title", "string", "title name for window"),
211 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 210 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
213 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
214#if ENABLE_XEMBED 213#if ENABLE_XEMBED
215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 214 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
216#endif 215#endif
217#if XFT 216#if XFT
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
219#endif 219#endif
220#if ENABLE_FRILLS 220#if ENABLE_FRILLS
221 RSTRG (Rs_transient_for, "transient-for", "windowid"), 221 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"), 222 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"), 223 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"), 225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
231#endif
232#ifdef BUILTIN_GLYPHS
230 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 233 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 234#endif
233#ifdef POINTER_BLANK 235#ifdef POINTER_BLANK
234 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
235#endif 237#endif
236#ifndef NO_BACKSPACE_KEY 238#ifndef NO_BACKSPACE_KEY
237 RSTRG (Rs_backspace_key, "backspacekey", "string"), 239 RSTRG (Rs_backspace_key, "backspacekey", "string"),
238#endif 240#endif
239#ifndef NO_DELETE_KEY 241#ifndef NO_DELETE_KEY
240 RSTRG (Rs_delete_key, "deletekey", "string"), 242 RSTRG (Rs_delete_key, "deletekey", "string"),
241#endif 243#endif
242 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
243#ifdef PRINTPIPE 244#ifdef PRINTPIPE
244 RSTRG (Rs_print_pipe, "print-pipe", "string"), 245 RSTRG (Rs_print_pipe, "print-pipe", "string"),
245#endif 246#endif
246 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 247 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
247#ifdef CUTCHAR_RESOURCE
248 RSTRG (Rs_cutchars, "cutchars", "string"), 248 RSTRG (Rs_cutchars, "cutchars", "string"),
249#endif /* CUTCHAR_RESOURCE */
250 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 249 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251#ifndef NO_SECONDARY_SCREEN 250#ifndef NO_SECONDARY_SCREEN
252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 251 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 252 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
254#endif 253#endif
… …
263#endif 262#endif
264#ifdef HAVE_AFTERIMAGE 263#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 264 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"), 265 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
267#endif 266#endif
268#ifndef NO_RESOURCES
269 INFO ("xrm", "string", "X resource"),
270#endif
271 INFO ("e", "command arg ...", "command to execute") 267 INFO ("e", "command arg ...", "command to execute")
272 }; 268 };
273 269
274#undef INFO 270#undef INFO
275#undef STRG 271#undef STRG
… …
318#endif 314#endif
319 "," 315 ","
320#if OFF_FOCUS_FADING 316#if OFF_FOCUS_FADING
321 "fade," 317 "fade,"
322#endif 318#endif
323#if defined(XPM_BACKGROUND)
324 "XPM,"
325#endif
326#if defined(ENABLE_TRANSPARENCY) 319#if defined(ENABLE_TRANSPARENCY)
327 "transparent," 320 "transparent,"
328 "tint," 321 "tint,"
329#endif 322#endif
330#if HAVE_AFTERIMAGE 323#if HAVE_AFTERIMAGE
… …
364 "pointerBlank," 357 "pointerBlank,"
365#endif 358#endif
366#if defined(NO_RESOURCES) 359#if defined(NO_RESOURCES)
367 "NoResources," 360 "NoResources,"
368#endif 361#endif
369 "scrollbars=" 362 "scrollbars=plain"
370#if !defined(HAVE_SCROLLBARS)
371 "NONE"
372#else
373# if defined(PLAIN_SCROLLBAR)
374 "plain"
375# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
376 "+"
377# endif
378# endif
379# if defined(RXVT_SCROLLBAR) 363#if defined(RXVT_SCROLLBAR)
380 "rxvt" 364 "+rxvt"
381# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
382 "+"
383# endif
384# endif 365#endif
385# if defined(NEXT_SCROLLBAR) 366#if defined(NEXT_SCROLLBAR)
386 "NeXT" 367 "+NeXT"
387# if defined(XTERM_SCROLLBAR)
388 "+"
389# endif
390# endif 368#endif
391# if defined(XTERM_SCROLLBAR) 369#if defined(XTERM_SCROLLBAR)
392 "xterm" 370 "+xterm"
393# endif
394#endif 371#endif
395 "\nUsage: "; /* Usage */ 372 "\nUsage: "; /* Usage */
396 373
397#define INDENT 18 374#define INDENT 18
398 375
… …
417 for (col = 1, i = 0; i < optList_size; i++) 394 for (col = 1, i = 0; i < optList_size; i++)
418 if (optList[i].desc != NULL) 395 if (optList[i].desc != NULL)
419 { 396 {
420 int len = 0; 397 int len = 0;
421 398
422 if (!optList_isBool (i)) 399 if (optList[i].arg)
423 { 400 len = strlen (optList[i].arg) + 1;
424 len = optList_strlen (i);
425 if (len > 0)
426 len++; /* account for space */
427 }
428#ifdef DEBUG_STRICT 401#ifdef DEBUG_STRICT
429 assert (optList[i].opt != NULL); 402 assert (optList[i].opt != NULL);
430#endif 403#endif
431 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 404 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
432 col += len; 405 col += len;
433 if (col > 79) 406 if (col > 79)
407 {
434 { /* assume regular width */ 408 /* assume regular width */
435 rxvt_log ("\n"); 409 rxvt_log ("\n");
436 col = 1 + len; 410 col = 1 + len;
437 } 411 }
438 412
439 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 413 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
440 if (optList_strlen (i)) 414 if (optList[i].arg)
441 rxvt_log (" %s]", optList[i].arg); 415 rxvt_log (" %s]", optList[i].arg);
442 else 416 else
443 rxvt_log ("]"); 417 rxvt_log ("]");
444 } 418 }
445 break; 419 break;
… …
497 int i, bad_option = 0; 471 int i, bad_option = 0;
498 472
499 for (i = 1; i < argc; i++) 473 for (i = 1; i < argc; i++)
500 { 474 {
501 unsigned int entry, longopt = 0; 475 unsigned int entry, longopt = 0;
502 const char *flag, *opt; 476 const char *opt;
477 int flag;
503 478
504 opt = argv[i]; 479 opt = argv[i];
505 480
506 if (*opt == '-') 481 if (*opt == '-')
507 { 482 {
508 flag = resval_on; 483 flag = 1;
509 484
510 if (*++opt == '-') 485 if (*++opt == '-')
511 longopt = *opt++; /* long option */ 486 longopt = *opt++; /* long option */
512 } 487 }
513 else if (*opt == '+') 488 else if (*opt == '+')
514 { 489 {
515 flag = resval_off; 490 flag = 0;
516 491
517 if (*++opt == '+') 492 if (*++opt == '+')
518 longopt = *opt++; /* long option */ 493 longopt = *opt++; /* long option */
519 } 494 }
520 else 495 else
… …
538 break; 513 break;
539 514
540 if (entry < optList_size) 515 if (entry < optList_size)
541 { 516 {
542 if (optList_isReverse (entry)) 517 if (optList_isReverse (entry))
543 flag = flag == resval_on ? resval_off : resval_on; 518 flag = !flag;
544 519
545 if (optList_strlen (entry)) 520 if (optList_isString (entry))
546 { 521 {
547 /* 522 /*
548 * special cases are handled in main.c:main () to allow 523 * special cases are handled in main.c:main () to allow
549 * X resources to set these values before we settle for 524 * X resources to set these values before we settle for
550 * default values 525 * default values
551 */ 526 */
552 527
553 if (optList[entry].doff != -1) 528 if (optList[entry].doff != -1)
554 { 529 {
555 if (flag == resval_on && !argv [i+1]) 530 if (flag && i+1 == argc)
556 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 531 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
557 532
558 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 533 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
559 } 534 }
560 } 535 }
561 else 536 else
537 {
562 { /* boolean value */ 538 /* boolean value */
563 set_option (optList[entry].index, flag == resval_on); 539 set_option (optList[entry].index, flag);
564 540
565 if (optList[entry].doff != -1) 541 if (optList[entry].doff != -1)
566 rs[optList[entry].doff] = flag; 542 rs[optList[entry].doff] = flag ? resval_on : resval_off;
567 } 543 }
568 } 544 }
545#ifndef NO_RESOURCES
546 else if (!strcmp (opt, "xrm"))
547 {
548 if (i+1 < argc)
549 XrmPutLineResource (&option_db, argv[++i]);
550 }
551#endif
552#ifdef KEYSYM_RESOURCE
553 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
554 {
555 if (i+1 < argc)
556 {
557 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
558 sprintf (res, "*.%s: %s\n", opt, argv[i]);
559 XrmPutLineResource (&option_db, res);
560 free (res);
561 }
562 }
563#endif
569 else 564 else
570#ifdef KEYSYM_RESOURCE
571 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
572 if (rxvt_Str_match (opt, "keysym."))
573 { 565 {
574 const char *str = argv[++i];
575
576 if (str != NULL)
577 parse_keysym (opt + sizeof ("keysym.") - 1, str);
578 }
579 else
580#endif
581 {
582 bad_option = 1; 566 bad_option = 1;
583 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 567 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
584 } 568 }
585 } 569 }
586 570
587 if (bad_option) 571 if (bad_option)
588 rxvt_usage (0); 572 rxvt_usage (0);
589} 573}
… …
620} 604}
621 605
622/* 606/*
623 * look for something like this (XK_Delete) 607 * look for something like this (XK_Delete)
624 * rxvt*keysym.0xFFFF: "\177" 608 * rxvt*keysym.0xFFFF: "\177"
625 *
626 * arg will be
627 * NULL for ~/.Xdefaults and
628 * non-NULL for command-line options (need to allocate)
629 */ 609 */
630#define NEWARGLIM 500 /* `reasonable' size */
631 610
632struct keysym_vocabulary_t 611struct keysym_vocabulary_t
633{ 612{
634 const char *name; 613 const char *name;
635 unsigned short len; 614 unsigned short len;
636 unsigned short value; 615 unsigned short value;
637}; 616};
638keysym_vocabulary_t keysym_vocabulary[] = 617static const keysym_vocabulary_t keysym_vocabulary[] =
639{ 618{
640 { "ISOLevel3", 9, Level3Mask }, 619 { "ISOLevel3", 9, Level3Mask },
641 { "AppKeypad", 9, AppKeypadMask }, 620 { "AppKeypad", 9, AppKeypadMask },
642 { "Control", 7, ControlMask }, 621 { "Control", 7, ControlMask },
643 { "NumLock", 7, NumLockMask }, 622 { "NumLock", 7, NumLockMask },
… …
665}; 644};
666 645
667int 646int
668rxvt_term::parse_keysym (const char *str, const char *arg) 647rxvt_term::parse_keysym (const char *str, const char *arg)
669{ 648{
670 int n, sym; 649 int sym;
671 unsigned int state = 0; 650 unsigned int state = 0;
672 const char *pmodend = NULL; 651 const char *key = strrchr (str, '-');
673 char *newarg = NULL;
674 char newargstr[NEWARGLIM];
675 652
676 if (arg == NULL) 653 if (!key)
677 { 654 key = str;
678 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
679 return 0;
680
681 str += n; /* skip `keysym.' */
682 if (!(pmodend = strchr (str, ':')))
683 return -1;
684 }
685 else 655 else
686 pmodend = str + strlen(str); 656 key++;
687 657
688 for (--pmodend; str < pmodend; --pmodend) 658 // string or key is empty
689 if (*pmodend == '-') 659 if (*arg == '\0' || *key == '\0')
690 break; 660 return -1;
691 661
662 // parse modifiers
692 while (str < pmodend) 663 while (str < key)
693 { 664 {
694 unsigned int i; 665 unsigned int i;
695 666
696 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 667 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
697 { 668 {
… …
708 679
709 if (*str == '-') 680 if (*str == '-')
710 ++str; 681 ++str;
711 } 682 }
712 683
713 /* some scanf () have trouble with a 0x prefix */ 684 // convert keysym name to keysym number
714 if (str[0] == '0' && toupper (str[1]) == 'X') 685 if ((sym = XStringToKeysym (str)) == None)
715 { 686 {
716 str += 2; 687 // fallback on hexadecimal parsing
717 688 char *end;
689 sym = strtol (str, &end, 16);
718 if (arg) 690 if (*end)
719 {
720 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
721 return -1;
722 }
723 else
724 {
725 if (sscanf (str, "%x:", &sym) != 1)
726 return -1;
727
728 /* cue to ':', it's there since sscanf () worked */
729 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
730 newargstr[NEWARGLIM - 1] = '\0';
731 newarg = newargstr;
732 }
733 }
734 else
735 {
736 /*
737 * convert keysym name to keysym number
738 */
739 strncpy (newargstr, str, NEWARGLIM - 1);
740 newargstr[NEWARGLIM - 1] = '\0';
741
742 if (arg == NULL)
743 {
744 if ((newarg = strchr (newargstr, ':')) == NULL)
745 return -1;
746
747 *newarg++ = '\0'; /* terminate keysym name */
748 }
749
750 if ((sym = XStringToKeysym (newargstr)) == None)
751 return -1; 691 return -1;
752 } 692 }
753 693
754 if (newarg == NULL)
755 {
756 strncpy (newargstr, arg, NEWARGLIM - 1);
757 newargstr[NEWARGLIM - 1] = '\0';
758 newarg = newargstr;
759 }
760
761 rxvt_Str_trim (newarg);
762 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
763 return -1;
764
765 keyboard->register_user_translation (sym, state, newarg); 694 keyboard->register_user_translation (sym, state, arg);
766 return 1; 695 return 1;
767} 696}
768 697
769# endif /* KEYSYM_RESOURCE */ 698# endif /* KEYSYM_RESOURCE */
770#endif /* NO_RESOURCES */ 699#endif /* NO_RESOURCES */
771 700
772static char * 701static char *
773get_res (XrmDatabase database, const char *program, const char *option) 702get_res (XrmDatabase database, const char *program, const char *option)
774{ 703{
775 char resource[512]; 704 char resource[512];
… …
807 736
808void 737void
809rxvt_term::extract_resources () 738rxvt_term::extract_resources ()
810{ 739{
811#ifndef NO_RESOURCES 740#ifndef NO_RESOURCES
741 XrmDatabase database = XrmGetDatabase (dpy);
742 XrmMergeDatabases (option_db, &database);
743 option_db = NULL;
812 /* 744 /*
813 * Query resources for options that affect us 745 * Query resources for options that affect us
814 */ 746 */
815 for (int entry = 0; entry < optList_size; entry++) 747 for (int entry = 0; entry < optList_size; entry++)
816 { 748 {
… …
845 777
846 /* 778 /*
847 * [R5 or later]: enumerate the resource database 779 * [R5 or later]: enumerate the resource database
848 */ 780 */
849# ifdef KEYSYM_RESOURCE 781# ifdef KEYSYM_RESOURCE
850 XrmDatabase database = XrmGetDatabase (dpy);
851 XrmName name_prefix[3]; 782 XrmName name_prefix[3];
852 XrmClass class_prefix[3]; 783 XrmClass class_prefix[3];
853 784
854 name_prefix[0] = XrmStringToName (rs[Rs_name]); 785 name_prefix[0] = XrmStringToName (rs[Rs_name]);
855 name_prefix[1] = XrmStringToName ("keysym"); 786 name_prefix[1] = XrmStringToName ("keysym");
… …
869 XrmEnumerateDatabase (database, name_prefix, class_prefix, 800 XrmEnumerateDatabase (database, name_prefix, class_prefix,
870 XrmEnumOneLevel, rxvt_define_key, NULL); 801 XrmEnumOneLevel, rxvt_define_key, NULL);
871# endif 802# endif
872# endif 803# endif
873 804
874#endif /* NO_RESOURCES */ 805#endif /* NO_RESOURCES */
875} 806}
876 807
877/*----------------------- end-of-file (C source) -----------------------*/ 808/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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