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.108 by root, Tue Jun 26 00:40:19 2007 UTC vs.
Revision 1.135 by ayin, Sun Jan 27 22:48:33 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# if TINTING
116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
117# endif 115 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
118#endif 116#endif
119#if OFF_FOCUS_FADING 117#if OFF_FOCUS_FADING
120 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"),
121 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"),
122#endif
123#if TINTING
124 STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
125#endif 120#endif
126 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 121 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
127#ifndef NO_BELL 122#ifndef NO_BELL
128# if ENABLE_FRILLS 123# if ENABLE_FRILLS
129 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), 124 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
… …
171#ifndef NO_BOLD_UNDERLINE_REVERSE 166#ifndef NO_BOLD_UNDERLINE_REVERSE
172 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 167 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
173 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 168 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
174 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 169 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
175 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 170 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
176#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 171#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
177#if ENABLE_FRILLS 172#if ENABLE_FRILLS
178 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 173 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
179#endif 174#endif
180#ifdef KEEP_SCROLLCOLOR
181 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 175 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
176#ifdef RXVT_SCROLLBAR
182 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 177 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
183#endif /* KEEP_SCROLLCOLOR */ 178#endif
184#ifdef OPTION_HC 179#ifdef OPTION_HC
185 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 180 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
186#endif 181#endif
187#ifndef NO_CURSORCOLOR 182#ifndef NO_CURSORCOLOR
188 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 183 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
189 /* command-line option = resource name */ 184 /* command-line option = resource name */
190 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
191#endif /* NO_CURSORCOLOR */ 186#endif /* NO_CURSORCOLOR */
192 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 187 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
193 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"),
194 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
195#ifdef XPM_BACKGROUND 190#ifdef BG_IMAGE_FROM_FILE
196 RSTRG (Rs_path, "path", "search path"), 191 RSTRG (Rs_path, "path", "search path"),
197 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 192 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
198#endif 193#endif
199 /* fonts: command-line option = resource name */ 194 /* fonts: command-line option = resource name */
200 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
… …
207#ifdef USE_XIM 202#ifdef USE_XIM
208 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 203 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
209 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"),
210 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"),
211 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"),
212#endif /* USE_XIM */ 207#endif /* USE_XIM */
213 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"),
214 STRG (Rs_title, "title", "title", "string", "title name for window"), 209 STRG (Rs_title, "title", "title", "string", "title name for window"),
215 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 210 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
216 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
217 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"),
218#if ENABLE_XEMBED 213#if ENABLE_XEMBED
219 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"),
220#endif 215#endif
221#if XFT 216#if XFT
222 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),
223#endif 219#endif
224#if ENABLE_FRILLS 220#if ENABLE_FRILLS
225 RSTRG (Rs_transient_for, "transient-for", "windowid"), 221 RSTRG (Rs_transient_for, "transient-for", "windowid"),
226 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"),
227 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"),
… …
229 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
230 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
231 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
232 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
233 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
234 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"),
235 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
236#endif 234#endif
237#ifdef POINTER_BLANK 235#ifdef POINTER_BLANK
238 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
239#endif 237#endif
240#ifndef NO_BACKSPACE_KEY 238#ifndef NO_BACKSPACE_KEY
241 RSTRG (Rs_backspace_key, "backspacekey", "string"), 239 RSTRG (Rs_backspace_key, "backspacekey", "string"),
242#endif 240#endif
243#ifndef NO_DELETE_KEY 241#ifndef NO_DELETE_KEY
244 RSTRG (Rs_delete_key, "deletekey", "string"), 242 RSTRG (Rs_delete_key, "deletekey", "string"),
245#endif 243#endif
246 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
247#ifdef PRINTPIPE 244#ifdef PRINTPIPE
248 RSTRG (Rs_print_pipe, "print-pipe", "string"), 245 RSTRG (Rs_print_pipe, "print-pipe", "string"),
249#endif 246#endif
250 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"),
251#ifdef CUTCHAR_RESOURCE 248#ifdef CUTCHAR_RESOURCE
252 RSTRG (Rs_cutchars, "cutchars", "string"), 249 RSTRG (Rs_cutchars, "cutchars", "string"),
253#endif /* CUTCHAR_RESOURCE */ 250#endif /* CUTCHAR_RESOURCE */
254 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 251 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
255#ifndef NO_SECONDARY_SCREEN 252#ifndef NO_SECONDARY_SCREEN
256 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 253 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
257 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 254 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
258#endif 255#endif
… …
265#if ISO_14755 262#if ISO_14755
266 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 263 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
267#endif 264#endif
268#ifdef HAVE_AFTERIMAGE 265#ifdef HAVE_AFTERIMAGE
269 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 266 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
270 STRG (Rs_blurradius, "blurRadius", "blr", "number", "Gaussian Blur radius to apply to the root background"), 267 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
271#endif
272#ifndef NO_RESOURCES
273 INFO ("xrm", "string", "X resource"),
274#endif 268#endif
275 INFO ("e", "command arg ...", "command to execute") 269 INFO ("e", "command arg ...", "command to execute")
276 }; 270 };
277 271
278#undef INFO 272#undef INFO
… …
322#endif 316#endif
323 "," 317 ","
324#if OFF_FOCUS_FADING 318#if OFF_FOCUS_FADING
325 "fade," 319 "fade,"
326#endif 320#endif
327#if defined(XPM_BACKGROUND)
328 "XPM,"
329#endif
330#if defined(ENABLE_TRANSPARENCY) 321#if defined(ENABLE_TRANSPARENCY)
331 "transparent," 322 "transparent,"
332#endif
333#if TINTING
334 "tint," 323 "tint,"
324#endif
325#if HAVE_AFTERIMAGE
326 "afterimage,"
335#endif 327#endif
336#if defined(USE_XIM) 328#if defined(USE_XIM)
337 "XIM," 329 "XIM,"
338#endif 330#endif
339#if defined(NO_BACKSPACE_KEY) 331#if defined(NO_BACKSPACE_KEY)
… …
367 "pointerBlank," 359 "pointerBlank,"
368#endif 360#endif
369#if defined(NO_RESOURCES) 361#if defined(NO_RESOURCES)
370 "NoResources," 362 "NoResources,"
371#endif 363#endif
372 "scrollbars=" 364 "scrollbars=plain"
373#if !defined(HAVE_SCROLLBARS)
374 "NONE"
375#else
376# if defined(PLAIN_SCROLLBAR)
377 "plain"
378# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
379 "+"
380# endif
381# endif
382# if defined(RXVT_SCROLLBAR) 365#if defined(RXVT_SCROLLBAR)
383 "rxvt" 366 "+rxvt"
384# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
385 "+"
386# endif
387# endif 367#endif
388# if defined(NEXT_SCROLLBAR) 368#if defined(NEXT_SCROLLBAR)
389 "NeXT" 369 "+NeXT"
390# if defined(XTERM_SCROLLBAR)
391 "+"
392# endif
393# endif 370#endif
394# if defined(XTERM_SCROLLBAR) 371#if defined(XTERM_SCROLLBAR)
395 "xterm" 372 "+xterm"
396# endif
397#endif 373#endif
398 "\nUsage: "; /* Usage */ 374 "\nUsage: "; /* Usage */
399 375
400#define INDENT 18 376#define INDENT 18
401 377
… …
420 for (col = 1, i = 0; i < optList_size; i++) 396 for (col = 1, i = 0; i < optList_size; i++)
421 if (optList[i].desc != NULL) 397 if (optList[i].desc != NULL)
422 { 398 {
423 int len = 0; 399 int len = 0;
424 400
425 if (!optList_isBool (i)) 401 if (optList[i].arg)
426 { 402 len = strlen (optList[i].arg) + 1;
427 len = optList_strlen (i);
428 if (len > 0)
429 len++; /* account for space */
430 }
431#ifdef DEBUG_STRICT 403#ifdef DEBUG_STRICT
432 assert (optList[i].opt != NULL); 404 assert (optList[i].opt != NULL);
433#endif 405#endif
434 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 406 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
435 col += len; 407 col += len;
436 if (col > 79) 408 if (col > 79)
409 {
437 { /* assume regular width */ 410 /* assume regular width */
438 rxvt_log ("\n"); 411 rxvt_log ("\n");
439 col = 1 + len; 412 col = 1 + len;
440 } 413 }
441 414
442 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 415 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
443 if (optList_strlen (i)) 416 if (optList[i].arg)
444 rxvt_log (" %s]", optList[i].arg); 417 rxvt_log (" %s]", optList[i].arg);
445 else 418 else
446 rxvt_log ("]"); 419 rxvt_log ("]");
447 } 420 }
448 break; 421 break;
… …
500 int i, bad_option = 0; 473 int i, bad_option = 0;
501 474
502 for (i = 1; i < argc; i++) 475 for (i = 1; i < argc; i++)
503 { 476 {
504 unsigned int entry, longopt = 0; 477 unsigned int entry, longopt = 0;
505 const char *flag, *opt; 478 const char *opt;
479 int flag;
506 480
507 opt = argv[i]; 481 opt = argv[i];
508 482
509 if (*opt == '-') 483 if (*opt == '-')
510 { 484 {
511 flag = resval_on; 485 flag = 1;
512 486
513 if (*++opt == '-') 487 if (*++opt == '-')
514 longopt = *opt++; /* long option */ 488 longopt = *opt++; /* long option */
515 } 489 }
516 else if (*opt == '+') 490 else if (*opt == '+')
517 { 491 {
518 flag = resval_off; 492 flag = 0;
519 493
520 if (*++opt == '+') 494 if (*++opt == '+')
521 longopt = *opt++; /* long option */ 495 longopt = *opt++; /* long option */
522 } 496 }
523 else 497 else
… …
541 break; 515 break;
542 516
543 if (entry < optList_size) 517 if (entry < optList_size)
544 { 518 {
545 if (optList_isReverse (entry)) 519 if (optList_isReverse (entry))
546 flag = flag == resval_on ? resval_off : resval_on; 520 flag = !flag;
547 521
548 if (optList_strlen (entry)) 522 if (optList_isString (entry))
549 { 523 {
550 /* 524 /*
551 * special cases are handled in main.c:main () to allow 525 * special cases are handled in main.c:main () to allow
552 * X resources to set these values before we settle for 526 * X resources to set these values before we settle for
553 * default values 527 * default values
554 */ 528 */
555 529
556 if (optList[entry].doff != -1) 530 if (optList[entry].doff != -1)
557 { 531 {
558 if (flag == resval_on && !argv [i+1]) 532 if (flag && i+1 == argc)
559 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 533 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
560 534
561 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 535 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
562 } 536 }
563 } 537 }
564 else 538 else
539 {
565 { /* boolean value */ 540 /* boolean value */
566 set_option (optList[entry].index, flag == resval_on); 541 set_option (optList[entry].index, flag);
567 542
568 if (optList[entry].doff != -1) 543 if (optList[entry].doff != -1)
569 rs[optList[entry].doff] = flag; 544 rs[optList[entry].doff] = flag ? resval_on : resval_off;
570 } 545 }
571 } 546 }
547#ifndef NO_RESOURCES
548 else if (!strcmp (opt, "xrm"))
549 {
550 if (i+1 < argc)
551 XrmPutLineResource (&option_db, argv[++i]);
552 }
553#endif
554#ifdef KEYSYM_RESOURCE
555 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
556 {
557 if (i+1 < argc)
558 {
559 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
560 sprintf (res, "*.%s: %s\n", opt, argv[i]);
561 XrmPutLineResource (&option_db, res);
562 free (res);
563 }
564 }
565#endif
572 else 566 else
573#ifdef KEYSYM_RESOURCE
574 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
575 if (rxvt_Str_match (opt, "keysym."))
576 { 567 {
577 const char *str = argv[++i];
578
579 if (str != NULL)
580 parse_keysym (opt + sizeof ("keysym.") - 1, str);
581 }
582 else
583#endif
584 {
585 bad_option = 1; 568 bad_option = 1;
586 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 569 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
587 } 570 }
588 } 571 }
589 572
590 if (bad_option) 573 if (bad_option)
591 rxvt_usage (0); 574 rxvt_usage (0);
592} 575}
… …
623} 606}
624 607
625/* 608/*
626 * look for something like this (XK_Delete) 609 * look for something like this (XK_Delete)
627 * rxvt*keysym.0xFFFF: "\177" 610 * rxvt*keysym.0xFFFF: "\177"
628 *
629 * arg will be
630 * NULL for ~/.Xdefaults and
631 * non-NULL for command-line options (need to allocate)
632 */ 611 */
633#define NEWARGLIM 500 /* `reasonable' size */
634 612
635struct keysym_vocabulary_t 613struct keysym_vocabulary_t
636{ 614{
637 const char *name; 615 const char *name;
638 unsigned short len; 616 unsigned short len;
639 unsigned short value; 617 unsigned short value;
640}; 618};
641keysym_vocabulary_t keysym_vocabulary[] = 619static const keysym_vocabulary_t keysym_vocabulary[] =
642{ 620{
643 { "ISOLevel3", 9, Level3Mask }, 621 { "ISOLevel3", 9, Level3Mask },
644 { "AppKeypad", 9, AppKeypadMask }, 622 { "AppKeypad", 9, AppKeypadMask },
645 { "Control", 7, ControlMask }, 623 { "Control", 7, ControlMask },
646 { "NumLock", 7, NumLockMask }, 624 { "NumLock", 7, NumLockMask },
… …
668}; 646};
669 647
670int 648int
671rxvt_term::parse_keysym (const char *str, const char *arg) 649rxvt_term::parse_keysym (const char *str, const char *arg)
672{ 650{
673 int n, sym; 651 int sym;
674 unsigned int state = 0; 652 unsigned int state = 0;
675 const char *pmodend = NULL; 653 const char *key = strrchr (str, '-');
676 char *newarg = NULL;
677 char newargstr[NEWARGLIM];
678 654
679 if (arg == NULL) 655 if (!key)
680 { 656 key = str;
681 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
682 return 0;
683
684 str += n; /* skip `keysym.' */
685 if (!(pmodend = strchr (str, ':')))
686 return -1;
687 }
688 else 657 else
689 pmodend = str + strlen(str); 658 key++;
690 659
691 for (--pmodend; str < pmodend; --pmodend) 660 // string or key is empty
692 if (*pmodend == '-') 661 if (*arg == '\0' || *key == '\0')
693 break; 662 return -1;
694 663
664 // parse modifiers
695 while (str < pmodend) 665 while (str < key)
696 { 666 {
697 unsigned int i; 667 unsigned int i;
698 668
699 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)
700 { 670 {
… …
711 681
712 if (*str == '-') 682 if (*str == '-')
713 ++str; 683 ++str;
714 } 684 }
715 685
716 /* some scanf () have trouble with a 0x prefix */ 686 // convert keysym name to keysym number
717 if (str[0] == '0' && toupper (str[1]) == 'X') 687 if ((sym = XStringToKeysym (str)) == None)
718 { 688 {
719 str += 2; 689 // fallback on hexadecimal parsing
720 690 char *end;
691 sym = strtol (str, &end, 16);
721 if (arg) 692 if (*end)
722 {
723 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
724 return -1;
725 }
726 else
727 {
728 if (sscanf (str, "%x:", &sym) != 1)
729 return -1;
730
731 /* cue to ':', it's there since sscanf () worked */
732 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
733 newargstr[NEWARGLIM - 1] = '\0';
734 newarg = newargstr;
735 }
736 }
737 else
738 {
739 /*
740 * convert keysym name to keysym number
741 */
742 strncpy (newargstr, str, NEWARGLIM - 1);
743 newargstr[NEWARGLIM - 1] = '\0';
744
745 if (arg == NULL)
746 {
747 if ((newarg = strchr (newargstr, ':')) == NULL)
748 return -1;
749
750 *newarg++ = '\0'; /* terminate keysym name */
751 }
752
753 if ((sym = XStringToKeysym (newargstr)) == None)
754 return -1; 693 return -1;
755 } 694 }
756 695
757 if (newarg == NULL)
758 {
759 strncpy (newargstr, arg, NEWARGLIM - 1);
760 newargstr[NEWARGLIM - 1] = '\0';
761 newarg = newargstr;
762 }
763
764 rxvt_Str_trim (newarg);
765 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
766 return -1;
767
768 keyboard->register_user_translation (sym, state, newarg); 696 keyboard->register_user_translation (sym, state, arg);
769 return 1; 697 return 1;
770} 698}
771 699
772# endif /* KEYSYM_RESOURCE */ 700# endif /* KEYSYM_RESOURCE */
773#endif /* NO_RESOURCES */ 701#endif /* NO_RESOURCES */
774 702
775static char * 703static char *
776get_res (XrmDatabase database, const char *program, const char *option) 704get_res (XrmDatabase database, const char *program, const char *option)
777{ 705{
778 char resource[512]; 706 char resource[512];
… …
810 738
811void 739void
812rxvt_term::extract_resources () 740rxvt_term::extract_resources ()
813{ 741{
814#ifndef NO_RESOURCES 742#ifndef NO_RESOURCES
743 XrmDatabase database = XrmGetDatabase (dpy);
744 XrmMergeDatabases (option_db, &database);
745 option_db = NULL;
815 /* 746 /*
816 * Query resources for options that affect us 747 * Query resources for options that affect us
817 */ 748 */
818 for (int entry = 0; entry < optList_size; entry++) 749 for (int entry = 0; entry < optList_size; entry++)
819 { 750 {
… …
848 779
849 /* 780 /*
850 * [R5 or later]: enumerate the resource database 781 * [R5 or later]: enumerate the resource database
851 */ 782 */
852# ifdef KEYSYM_RESOURCE 783# ifdef KEYSYM_RESOURCE
853 XrmDatabase database = XrmGetDatabase (dpy);
854 XrmName name_prefix[3]; 784 XrmName name_prefix[3];
855 XrmClass class_prefix[3]; 785 XrmClass class_prefix[3];
856 786
857 name_prefix[0] = XrmStringToName (rs[Rs_name]); 787 name_prefix[0] = XrmStringToName (rs[Rs_name]);
858 name_prefix[1] = XrmStringToName ("keysym"); 788 name_prefix[1] = XrmStringToName ("keysym");
… …
872 XrmEnumerateDatabase (database, name_prefix, class_prefix, 802 XrmEnumerateDatabase (database, name_prefix, class_prefix,
873 XrmEnumOneLevel, rxvt_define_key, NULL); 803 XrmEnumOneLevel, rxvt_define_key, NULL);
874# endif 804# endif
875# endif 805# endif
876 806
877#endif /* NO_RESOURCES */ 807#endif /* NO_RESOURCES */
878} 808}
879 809
880/*----------------------- end-of-file (C source) -----------------------*/ 810/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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