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.28 by root, Fri Jul 30 22:36:42 2004 UTC vs.
Revision 1.46 by root, Sun Jan 16 19:20:30 2005 UTC

… …
28 *----------------------------------------------------------------------*/ 28 *----------------------------------------------------------------------*/
29 29
30#include "../config.h" /* NECESSARY */ 30#include "../config.h" /* NECESSARY */
31#include "rxvt.h" /* NECESSARY */ 31#include "rxvt.h" /* NECESSARY */
32#include "version.h" 32#include "version.h"
33#include "xdefaults.intpro" /* PROTOS for internal routines */ 33
34#ifdef KEYSYM_RESOURCE
35#include "keyboard.h"
36#endif
34 37
35/* #define DEBUG_RESOURCES */ 38/* #define DEBUG_RESOURCES */
36 39
37static const char *const xnames[2] = { ".Xdefaults", ".Xresources" }; 40static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
38 41
… …
63#define SWCH(opt, flag, desc) \ 66#define SWCH(opt, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 67 { (flag), -1, NULL, (opt), NULL, (desc)}
65 68
66/* convenient macros */ 69/* convenient macros */
67#define optList_strlen(i) \ 70#define optList_strlen(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? STRLEN (optList[i].arg) : 1)) 71 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
69#define optList_isBool(i) \ 72#define optList_isBool(i) \
70 (optList[i].flag & Opt_Boolean) 73 (optList[i].flag & Opt_Boolean)
71#define optList_isReverse(i) \ 74#define optList_isReverse(i) \
72 (optList[i].flag & Opt_Reverse) 75 (optList[i].flag & Opt_Reverse)
73#define optList_size() \ 76#define optList_size() \
… …
92 SWCH ("iconic", Opt_iconic, "start iconic"), 95 SWCH ("iconic", Opt_iconic, "start iconic"),
93 SWCH ("ic", Opt_iconic, NULL), /* short form */ 96 SWCH ("ic", Opt_iconic, NULL), /* short form */
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
97#ifdef HAVE_SCROLLBARS 101#ifdef HAVE_SCROLLBARS
98 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
99 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 103 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
100 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
101#endif 105#endif
… …
110#if TINTING 114#if TINTING
111 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
112#endif 116#endif
113#endif 117#endif
114#ifdef OFF_FOCUS_FADING 118#ifdef OFF_FOCUS_FADING
115 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when urxvt is losing focus."), 119 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."),
116#endif 120#endif
117#ifdef TINTING 121#ifdef TINTING
118 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), 122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
119#endif 123#endif
120 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
… …
128 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 132 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
129#endif 133#endif
130#ifdef MOUSE_WHEEL 134#ifdef MOUSE_WHEEL
131 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 135 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
132#endif 136#endif
133#ifndef NO_FRILLS 137#if ENABLE_FRILLS
134 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 138 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
135 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 139 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
136#endif 140#endif
137#ifdef CURSOR_BLINK 141#ifdef CURSOR_BLINK
138 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 142 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
… …
159 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 163 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
160 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 164 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
161 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 165 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
162#endif /* NO_BRIGHTCOLOR */ 166#endif /* NO_BRIGHTCOLOR */
163#ifndef NO_BOLD_UNDERLINE_REVERSE 167#ifndef NO_BOLD_UNDERLINE_REVERSE
164 BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"),
165 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 168 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
169 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
166 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 170 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
167 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
168#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
173#if ENABLE_FRILLS
174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
175#endif
169#ifdef KEEP_SCROLLCOLOR 176#ifdef KEEP_SCROLLCOLOR
170 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
171 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
172#endif /* KEEP_SCROLLCOLOR */ 179#endif /* KEEP_SCROLLCOLOR */
173#ifdef OPTION_HC 180#ifdef OPTION_HC
… …
180 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 187 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
181#endif /* XPM_BACKGROUND */ 188#endif /* XPM_BACKGROUND */
182#if (MENUBAR_MAX) 189#if (MENUBAR_MAX)
183 RSTRG (Rs_menu, "menu", "name[;tag]"), 190 RSTRG (Rs_menu, "menu", "name[;tag]"),
184#endif 191#endif
192 /* fonts: command-line option = resource name */
185 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 193 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
186 /* fonts: command-line option = resource name */ 194#if ENABLE_STYLES
195 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
196 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
197 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
198#endif
187#ifdef USE_XIM 199#ifdef USE_XIM
188 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 200 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
189 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 201 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
190#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 202#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
191 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 203 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
… …
202#endif /* NO_CURSORCOLOR */ 214#endif /* NO_CURSORCOLOR */
203 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 215 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
204 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 216 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
205 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 217 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
206 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 218 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
207#ifndef NO_FRILLS 219#if ENABLE_FRILLS
208 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 220 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
209 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 221 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
210 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 222 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
211 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 223 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
212#endif 224 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
213#ifndef NO_LINESPACE
214 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 225 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
215#endif 226#endif
216 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 227 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
217#ifdef POINTER_BLANK 228#ifdef POINTER_BLANK
218 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 229 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
… …
249#undef RSTRG 260#undef RSTRG
250#undef SWCH 261#undef SWCH
251#undef BOOL 262#undef BOOL
252/*}}} */ 263/*}}} */
253 264
254static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 265static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
255static const char optionsstring[] = "Options: " 266static const char optionsstring[] = "options: "
267#if XFT
268 "xft,"
269#endif
270#if ENABLE_STYLES
271 "styles,"
272#endif
273#if ENABLE_COMBINING
274 "combining,"
275#endif
276#if TEXT_BLINK
277 "blink,"
278#endif
279#if ISO_14755
280 "iso14755,"
281#endif
282#if UNICODE_3
283 "unicode3,"
284#endif
285 "encodings=eu+vn"
286#if ENCODING_JP
287 "+jp"
288#endif
289#if ENCODING_JP_EXT
290 "+jp-ext"
291#endif
292#if ENCODING_KR
293 "+kr"
294#endif
295#if ENCODING_ZH
296 "+zh"
297#endif
298#if ENCODING_ZH_EXT
299 "+zh-ext"
300#endif
301 ","
302#if OFF_FOCUS_FADING
303 "fade,"
304#endif
256#if defined(XPM_BACKGROUND) 305#if defined(XPM_BACKGROUND)
257 "XPM," 306 "XPM,"
258#endif 307#endif
259#if defined(TRANSPARENT) 308#if defined(TRANSPARENT)
260 "transparent," 309 "transparent,"
261#endif 310#endif
311#if TINTING
312 "tint,"
313#endif
262#if defined(UTMP_SUPPORT) 314#if defined(UTMP_SUPPORT)
263 "utmp," 315 "utmp,"
264#endif 316#endif
265#if defined(MENUBAR) 317#if defined(MENUBAR)
266 "menubar," 318 "menubar,"
267#endif
268#if !defined(NO_FRILLS)
269 "frills,"
270#endif
271#if !defined(NO_LINESPACE)
272 "linespace,"
273#endif
274#if defined(PREFER_24BIT)
275 "24bit,"
276#endif 319#endif
277#if defined(USE_XIM) 320#if defined(USE_XIM)
278 "XIM," 321 "XIM,"
279#endif 322#endif
280 "scrollbars=" 323 "scrollbars="
… …
308 "no_backspace," 351 "no_backspace,"
309#endif 352#endif
310#if defined(NO_DELETE_KEY) 353#if defined(NO_DELETE_KEY)
311 "no_delete," 354 "no_delete,"
312#endif 355#endif
356#if EIGHT_BIT_CONTROLS
357 "8bitctrls,"
358#endif
313#if !defined(NO_STRINGS) 359#if !defined(NO_STRINGS)
314 "strings," 360 "strings,"
315#endif 361#endif
316#if defined(TTY_256COLOR) 362#if defined(ENABLE_FRILLS)
363 "frills,"
364#endif
365#if defined(PREFER_24BIT)
317 "256colour," 366 "24bit,"
367#endif
368#if defined(SELECTION_SCROLLING)
369 "selectionscrolling,"
370#endif
371#if MOUSE_WHEEL
372 "wheel,"
373#endif
374#if MOUSE_SLIP_WHEELING
375 "slipwheel,"
376#endif
377#if defined(SMART_RESIZE)
378 "smart-resize,"
379#endif
380#if defined(CURSOR_BLINK)
381 "cursorBlink,"
382#endif
383#if defined(POINTER_BLANK)
384 "pointerBlank,"
318#endif 385#endif
319#if defined(NO_RESOURCES) 386#if defined(NO_RESOURCES)
320 "NoResources" 387 "NoResources"
321#else 388#else
322# if defined(USE_XGETDEFAULT) 389# if defined(USE_XGETDEFAULT)
… …
355 len++; /* account for space */ 422 len++; /* account for space */
356 } 423 }
357#ifdef DEBUG_STRICT 424#ifdef DEBUG_STRICT
358 assert (optList[i].opt != NULL); 425 assert (optList[i].opt != NULL);
359#endif 426#endif
360 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
361 col += len; 428 col += len;
362 if (col > 79) 429 if (col > 79)
363 { /* assume regular width */ 430 { /* assume regular width */
364 rxvt_log ("\n"); 431 rxvt_log ("\n");
365 col = 1 + len; 432 col = 1 + len;
… …
382#ifdef DEBUG_STRICT 449#ifdef DEBUG_STRICT
383 assert (optList[i].opt != NULL); 450 assert (optList[i].opt != NULL);
384#endif 451#endif
385 rxvt_log (" %s%s %-*s%s%s\n", 452 rxvt_log (" %s%s %-*s%s%s\n",
386 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 453 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
387 (INDENT - STRLEN (optList[i].opt) 454 (INDENT - strlen (optList[i].opt)
388 + (optList_isBool (i) ? 0 : 2)), 455 + (optList_isBool (i) ? 0 : 2)),
389 (optList[i].arg ? optList[i].arg : ""), 456 (optList[i].arg ? optList[i].arg : ""),
390 (optList_isBool (i) ? "turn on/off " : ""), 457 (optList_isBool (i) ? "turn on/off " : ""),
391 optList[i].desc); 458 optList[i].desc);
392 } 459 }
… …
399 466
400 for (i = 0; i < optList_size (); i++) 467 for (i = 0; i < optList_size (); i++)
401 if (optList[i].kw != NULL) 468 if (optList[i].kw != NULL)
402 rxvt_log (" %s: %*s%s\n", 469 rxvt_log (" %s: %*s%s\n",
403 optList[i].kw, 470 optList[i].kw,
404 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 471 (INDENT - strlen (optList[i].kw)), "", /* XXX */
405 (optList_isBool (i) ? "boolean" : optList[i].arg)); 472 (optList_isBool (i) ? "boolean" : optList[i].arg));
406#ifdef KEYSYM_RESOURCE 473#ifdef KEYSYM_RESOURCE
407 rxvt_log (" " "keysym.sym" ": %*s%s\n", 474 rxvt_log (" " "keysym.sym" ": %*s%s\n",
408 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 475 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
409 "keysym"); 476 "keysym");
… …
452 bad_option = 1; 519 bad_option = 1;
453 rxvt_warn ("\"%s\": malformed option.\n", opt); 520 rxvt_warn ("\"%s\": malformed option.\n", opt);
454 continue; 521 continue;
455 } 522 }
456 523
457 if (!STRCMP (opt, "help")) 524 if (!strcmp (opt, "help"))
458 rxvt_usage (longopt ? 2 : 1); 525 rxvt_usage (longopt ? 2 : 1);
459 if (!STRCMP (opt, "h")) 526 if (!strcmp (opt, "h"))
460 rxvt_usage (0); 527 rxvt_usage (0);
461 528
462 /* feature: always try to match long-options */ 529 /* feature: always try to match long-options */
463 for (entry = 0; entry < optList_size (); entry++) 530 for (entry = 0; entry < optList_size (); entry++)
464 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 531 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
465 || (!longopt 532 || (!longopt
466 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 533 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
467 break; 534 break;
468 535
469 if (entry < optList_size ()) 536 if (entry < optList_size ())
470 { 537 {
471 if (optList_isReverse (entry)) 538 if (optList_isReverse (entry))
… …
488#ifdef DEBUG_RESOURCES 555#ifdef DEBUG_RESOURCES
489 fprintf (stderr, "boolean (%s,%s) = %s\n", 556 fprintf (stderr, "boolean (%s,%s) = %s\n",
490 optList[entry].opt, optList[entry].kw, flag); 557 optList[entry].opt, optList[entry].kw, flag);
491#endif 558#endif
492 if (flag == On) 559 if (flag == On)
493 Options |= (optList[entry].flag); 560 options |= (optList[entry].flag);
494 else 561 else
495 Options &= ~ (optList[entry].flag); 562 options &= ~ (optList[entry].flag);
496 563
497 if (optList[entry].doff != -1) 564 if (optList[entry].doff != -1)
498 rs[optList[entry].doff] = flag; 565 rs[optList[entry].doff] = flag;
499 } 566 }
500 } 567 }
501 else 568 else
502#ifdef KEYSYM_RESOURCE 569#ifdef KEYSYM_RESOURCE
503 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 570 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
504 if (rxvt_Str_match (opt, "keysym.")) 571 if (rxvt_Str_match (opt, "keysym."))
505 { 572 {
506 const char *str = argv[++i]; 573 const char *str = argv[++i];
507 574
508 if (str != NULL) 575 if (str != NULL)
… …
557 * arg will be 624 * arg will be
558 * NULL for ~/.Xdefaults and 625 * NULL for ~/.Xdefaults and
559 * non-NULL for command-line options (need to allocate) 626 * non-NULL for command-line options (need to allocate)
560 */ 627 */
561#define NEWARGLIM 500 /* `reasonable' size */ 628#define NEWARGLIM 500 /* `reasonable' size */
629
630struct keysym_vocabulary_t
631{
632 const char *name;
633 unsigned short len;
634 unsigned short value;
635};
636keysym_vocabulary_t keysym_vocabulary[] =
637{
638 { "ISOLevel3", 9, Level3Mask },
639 { "AppKeypad", 9, AppKeypadMask },
640 { "Control", 7, ControlMask },
641 { "NumLock", 7, NumLockMask },
642 { "Shift", 5, ShiftMask },
643 { "Meta", 4, MetaMask },
644 { "Lock", 4, LockMask },
645 { "Mod1", 4, Mod1Mask },
646 { "Mod2", 4, Mod2Mask },
647 { "Mod3", 4, Mod3Mask },
648 { "Mod4", 4, Mod4Mask },
649 { "Mod5", 4, Mod5Mask },
650 { "I", 1, Level3Mask },
651 { "K", 1, AppKeypadMask },
652 { "C", 1, ControlMask },
653 { "N", 1, NumLockMask },
654 { "S", 1, ShiftMask },
655 { "M", 1, MetaMask },
656 { "A", 1, MetaMask },
657 { "L", 1, LockMask },
658 { "1", 1, Mod1Mask },
659 { "2", 1, Mod2Mask },
660 { "3", 1, Mod3Mask },
661 { "4", 1, Mod4Mask },
662 { "5", 1, Mod5Mask },
663};
664
562int 665int
563rxvt_term::parse_keysym (const char *str, const char *arg) 666rxvt_term::parse_keysym (const char *str, const char *arg)
564{ 667{
565 int n, sym; 668 int n, sym;
669 unsigned int state = 0;
670 const char *pmodend = NULL;
566 char *key_string, *newarg = NULL; 671 char *newarg = NULL;
567 char newargstr[NEWARGLIM]; 672 char newargstr[NEWARGLIM];
568 673
569 if (arg == NULL) 674 if (arg == NULL)
570 { 675 {
571 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 676 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
572 return 0; 677 return 0;
678
573 str += n; /* skip `keysym.' */ 679 str += n; /* skip `keysym.' */
680 if ((pmodend = strchr (str, ':')) < str)
681 return -1;
574 } 682 }
683 else
684 pmodend = str + strlen(str);
685
686 for (--pmodend; str < pmodend; --pmodend)
687 if (*pmodend == '-')
688 break;
689
690 while (str < pmodend)
691 {
692 unsigned int i;
693
694 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
695 {
696 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
697 {
698 state |= keysym_vocabulary[i].value;
699 str += keysym_vocabulary[i].len;
700 break;
701 }
702 }
703
704 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
705 return -1;
706
707 if (*str == '-')
708 ++str;
709 }
710
575 /* some scanf () have trouble with a 0x prefix */ 711 /* some scanf () have trouble with a 0x prefix */
576 if (isdigit (str[0])) 712 if (str[0] == '0' && toupper (str[1]) == 'X')
577 { 713 {
578 if (str[0] == '0' && toupper (str[1]) == 'X')
579 str += 2; 714 str += 2;
715
580 if (arg) 716 if (arg)
581 { 717 {
582 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 718 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
583 return -1; 719 return -1;
584 } 720 }
585 else 721 else
586 { 722 {
587 if (sscanf (str, "%x:", &sym) != 1) 723 if (sscanf (str, "%x:", &sym) != 1)
588 return -1; 724 return -1;
589 725
590 /* cue to ':', it's there since sscanf () worked */ 726 /* cue to ':', it's there since sscanf () worked */
591 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 727 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
592 newargstr[NEWARGLIM - 1] = '\0'; 728 newargstr[NEWARGLIM - 1] = '\0';
593 newarg = newargstr; 729 newarg = newargstr;
594 } 730 }
595 } 731 }
596 else 732 else
597 { 733 {
598 /* 734 /*
599 * convert keysym name to keysym number 735 * convert keysym name to keysym number
600 */ 736 */
601 STRNCPY (newargstr, str, NEWARGLIM - 1); 737 strncpy (newargstr, str, NEWARGLIM - 1);
602 newargstr[NEWARGLIM - 1] = '\0'; 738 newargstr[NEWARGLIM - 1] = '\0';
739
603 if (arg == NULL) 740 if (arg == NULL)
604 { 741 {
605 if ((newarg = STRCHR (newargstr, ':')) == NULL) 742 if ((newarg = strchr (newargstr, ':')) == NULL)
606 return -1; 743 return -1;
744
607 *newarg++ = '\0'; /* terminate keysym name */ 745 *newarg++ = '\0'; /* terminate keysym name */
608 } 746 }
747
609 if ((sym = XStringToKeysym (newargstr)) == None) 748 if ((sym = XStringToKeysym (newargstr)) == None)
610 return -1; 749 return -1;
611 } 750 }
612 751
613 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */
614 return -1;
615 sym &= 0xFF;
616 if (Keysym_map[sym] != NULL) /* already set ? */
617 return -1;
618
619 if (newarg == NULL) 752 if (newarg == NULL)
620 { 753 {
621 STRNCPY (newargstr, arg, NEWARGLIM - 1); 754 strncpy (newargstr, arg, NEWARGLIM - 1);
622 newargstr[NEWARGLIM - 1] = '\0'; 755 newargstr[NEWARGLIM - 1] = '\0';
623 newarg = newargstr; 756 newarg = newargstr;
624 } 757 }
758
625 rxvt_Str_trim (newarg); 759 rxvt_Str_trim (newarg);
626 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 760 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
627 return -1; 761 return -1;
628 MIN_IT (n, 255);
629 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
630 762
631 key_string[0] = n; 763 keyboard->register_user_translation (sym, state, newarg);
632 STRNCPY (key_string + 1, newarg, n);
633 Keysym_map[sym] = (unsigned char *)key_string;
634
635 return 1; 764 return 1;
636} 765}
637 766
638# endif /* KEYSYM_RESOURCE */ 767# endif /* KEYSYM_RESOURCE */
639 768
… …
649 char *str, buffer[256]; 778 char *str, buffer[256];
650 779
651 if (stream == NULL) 780 if (stream == NULL)
652 return; 781 return;
653 782
654 len = STRLEN (name); 783 len = strlen (name);
655 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 784 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
656 { 785 {
657 unsigned int entry, n; 786 unsigned int entry, n;
658 787
659 while (*str && isspace (*str)) 788 while (*str && isspace (*str))
660 str++; /* leading whitespace */ 789 str++; /* leading whitespace */
661 790
662 if ((str[len] != '*' && str[len] != '.') 791 if ((str[len] != '*' && str[len] != '.')
663 || (len && STRNCMP (str, name, len))) 792 || (len && strncmp (str, name, len)))
664 continue; 793 continue;
665 str += (len + 1); /* skip `name*' or `name.' */ 794 str += (len + 1); /* skip `name*' or `name.' */
666 795
667# ifdef KEYSYM_RESOURCE 796# ifdef KEYSYM_RESOURCE
668 if (!parse_keysym (str, NULL)) 797 if (!parse_keysym (str, NULL))
… …
672 const char *kw = optList[entry].kw; 801 const char *kw = optList[entry].kw;
673 802
674 if (kw == NULL) 803 if (kw == NULL)
675 continue; 804 continue;
676 805
677 n = STRLEN (kw); 806 n = strlen (kw);
678 if (str[n] == ':' && rxvt_Str_match (str, kw)) 807 if (str[n] == ':' && rxvt_Str_match (str, kw))
679 { 808 {
680 /* skip `keyword:' */ 809 /* skip `keyword:' */
681 str += n + 1; 810 str += n + 1;
682 rxvt_Str_trim (str); 811 rxvt_Str_trim (str);
683 n = STRLEN (str); 812 n = strlen (str);
684 if (n && rs[optList[entry].doff] == NULL) 813 if (n && rs[optList[entry].doff] == NULL)
685 { 814 {
686 /* not already set */ 815 /* not already set */
687 int s; 816 int s;
688 char *p = 0; 817 char *p = 0;
689 818
690 for (int o = 0;;) 819 for (int o = 0;;)
691 { 820 {
692 p = (char *)rxvt_realloc (p, o + n + 1); 821 p = (char *)rxvt_realloc (p, o + n + 1);
693 MEMCPY (p + o, str, n); 822 memcpy (p + o, str, n);
694 o += n; 823 o += n;
695 p[o] = 0; 824 p[o] = 0;
696 825
697 if (o == 0 || p[o - 1] != '\\') // continuation line 826 if (o == 0 || p[o - 1] != '\\') // continuation line
698 break; 827 break;
… …
701 830
702 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 831 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
703 break; 832 break;
704 833
705 rxvt_Str_trim (str); 834 rxvt_Str_trim (str);
706 n = STRLEN (str); 835 n = strlen (str);
707 } 836 }
708 837
709 rs[optList[entry].doff] = p; 838 rs[optList[entry].doff] = p;
710 allocated.push_back (p); 839 allocated.push_back (p);
711 840
712 if (optList_isBool (entry)) 841 if (optList_isBool (entry))
713 { 842 {
714 s = STRCASECMP (str, "TRUE") == 0 843 s = strcasecmp (str, "TRUE") == 0
715 || STRCASECMP (str, "YES") == 0 844 || strcasecmp (str, "YES") == 0
716 || STRCASECMP (str, "ON") == 0 845 || strcasecmp (str, "ON") == 0
717 || STRCASECMP (str, "1") == 0; 846 || strcasecmp (str, "1") == 0;
718 847
719 if (optList_isReverse (entry)) 848 if (optList_isReverse (entry))
720 s = !s; 849 s = !s;
721 850
722 if (s) 851 if (s)
723 Options |= optList[entry].flag; 852 options |= optList[entry].flag;
724 else 853 else
725 Options &= ~optList[entry].flag; 854 options &= ~optList[entry].flag;
726 } 855 }
727 } 856 }
728 857
729 break; 858 break;
730 } 859 }
… …
789 database = XrmGetStringDatabase (displayResource); 918 database = XrmGetStringDatabase (displayResource);
790 919
791# ifdef HAVE_EXTRA_XRESOURCE_FILES 920# ifdef HAVE_EXTRA_XRESOURCE_FILES
792 /* Add in ~/.Xdefaults or ~/.Xresources */ 921 /* Add in ~/.Xdefaults or ~/.Xresources */
793 { 922 {
794 char *ptr; 923 char *ptr;
795 924
796 if ((ptr = (char *)getenv ("HOME")) == NULL) 925 if ((ptr = (char *)getenv ("HOME")) == NULL)
797 ptr = "."; 926 ptr = ".";
798 927
799 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 928 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
800 { 929 {
801 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 930 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
802 ptr, xnames[i]); 931 ptr, xnames[i]);
803 if ((rdb1 = XrmGetFileDatabase (fname))) 932 if ((rdb1 = XrmGetFileDatabase (fname)))
804 { 933 {
805 XrmMergeDatabases (rdb1, &database); 934 XrmMergeDatabases (rdb1, &database);
806# ifndef HAVE_BOTH_XRESOURCE_FILES 935# ifndef HAVE_BOTH_XRESOURCE_FILES
… …
851 if (kw == NULL || rs[optList[entry].doff] != NULL) 980 if (kw == NULL || rs[optList[entry].doff] != NULL)
852 continue; /* previously set */ 981 continue; /* previously set */
853 982
854 p = XGetDefault (display, name, kw); 983 p = XGetDefault (display, name, kw);
855 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 984 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
856 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 985 if (p == NULL || (p0 && strcmp (p, p0) == 0))
857 { 986 {
858 p = XGetDefault (display, RESCLASS, kw); 987 p = XGetDefault (display, RESCLASS, kw);
859#ifdef RESFALLBACK 988#ifdef RESFALLBACK
860 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 989 if (p == NULL || (p0 && strcmp (p, p0) == 0))
861 p = XGetDefault (display, RESFALLBACK, kw); 990 p = XGetDefault (display, RESFALLBACK, kw);
862#endif 991#endif
863 } 992 }
864 993
865 if (p == NULL && p0) 994 if (p == NULL && p0)
… …
869 { 998 {
870 rs[optList[entry].doff] = p; 999 rs[optList[entry].doff] = p;
871 1000
872 if (optList_isBool (entry)) 1001 if (optList_isBool (entry))
873 { 1002 {
874 s = STRCASECMP (p, "TRUE") == 0 1003 s = strcasecmp (p, "TRUE") == 0
875 || STRCASECMP (p, "YES") == 0 1004 || strcasecmp (p, "YES") == 0
876 || STRCASECMP (p, "ON") == 0 1005 || strcasecmp (p, "ON") == 0
877 || STRCASECMP (p, "1") == 0; 1006 || strcasecmp (p, "1") == 0;
878 if (optList_isReverse (entry)) 1007 if (optList_isReverse (entry))
879 s = !s; 1008 s = !s;
880 if (s) 1009 if (s)
881 Options |= (optList[entry].flag); 1010 options |= (optList[entry].flag);
882 else 1011 else
883 Options &= ~ (optList[entry].flag); 1012 options &= ~ (optList[entry].flag);
884 } 1013 }
885 } 1014 }
886 } 1015 }
887 1016
888 /* 1017 /*
… …
916 FILE *fd = NULL; 1045 FILE *fd = NULL;
917 char *home; 1046 char *home;
918 1047
919 if ((home = getenv ("HOME")) != NULL) 1048 if ((home = getenv ("HOME")) != NULL)
920 { 1049 {
921 unsigned int i, len = STRLEN (home) + 2; 1050 unsigned int i, len = strlen (home) + 2;
922 char *f = NULL; 1051 char *f = NULL;
923 1052
924 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 1053 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
925 { 1054 {
926 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char)); 1055 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
927 1056
928 sprintf (f, "%s/%s", home, xnames[i]); 1057 sprintf (f, "%s/%s", home, xnames[i]);
929 1058
930 if ((fd = fopen (f, "r")) != NULL) 1059 if ((fd = fopen (f, "r")) != NULL)
931 break; 1060 break;

Diff Legend

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