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

Diff Legend

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