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.23 by pcg, Fri Apr 2 18:00:01 2004 UTC vs.
Revision 1.46 by root, Sun Jan 16 19:20:30 2005 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xdefaults.c 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xdefaults.C,v 1.23 2004/04/02 18:00:01 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
8 * - original version 7 * - original version
9 * 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-2004 Marc Lehmann <pcg@goof.com>
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * 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 12 * 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 13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
… …
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
… …
109 SWCH ("tr", Opt_transparent, NULL), 113 SWCH ("tr", Opt_transparent, NULL),
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
118#ifdef OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."),
120#endif
121#ifdef TINTING
122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
123#endif
114 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
115#ifndef NO_BELL 125#ifndef NO_BELL
116 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 126 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
117# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
118 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 128 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL),
… …
122 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 132 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
123#endif 133#endif
124#ifdef MOUSE_WHEEL 134#ifdef MOUSE_WHEEL
125 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 135 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
126#endif 136#endif
127#ifndef NO_FRILLS 137#if ENABLE_FRILLS
128 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 138 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
129 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"),
130#endif 140#endif
131#ifdef CURSOR_BLINK 141#ifdef CURSOR_BLINK
132 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 142 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
… …
154 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 164 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
155 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 165 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
156#endif /* NO_BRIGHTCOLOR */ 166#endif /* NO_BRIGHTCOLOR */
157#ifndef NO_BOLD_UNDERLINE_REVERSE 167#ifndef NO_BOLD_UNDERLINE_REVERSE
158 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 168 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
169 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
159 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 170 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
160 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
161#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
162#ifdef KEEP_SCROLLCOLOR 176#ifdef KEEP_SCROLLCOLOR
163 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
164 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
165#endif /* KEEP_SCROLLCOLOR */ 179#endif /* KEEP_SCROLLCOLOR */
166#ifdef OPTION_HC 180#ifdef OPTION_HC
… …
173 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 187 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
174#endif /* XPM_BACKGROUND */ 188#endif /* XPM_BACKGROUND */
175#if (MENUBAR_MAX) 189#if (MENUBAR_MAX)
176 RSTRG (Rs_menu, "menu", "name[;tag]"), 190 RSTRG (Rs_menu, "menu", "name[;tag]"),
177#endif 191#endif
192 /* fonts: command-line option = resource name */
178 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 193 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
179 /* 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
180#ifdef USE_XIM 199#ifdef USE_XIM
181 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 200 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
182 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"),
183#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 202#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
184 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"),
… …
195#endif /* NO_CURSORCOLOR */ 214#endif /* NO_CURSORCOLOR */
196 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 215 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
197 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"),
198 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 217 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
199 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"),
200#ifndef NO_FRILLS 219#if ENABLE_FRILLS
201 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 220 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
202 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 221 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
203 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 222 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
204 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 223 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
205#endif 224 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
206#ifndef NO_LINESPACE
207 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"),
208#endif 226#endif
209 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"),
210#ifdef POINTER_BLANK 228#ifdef POINTER_BLANK
211 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 229 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
… …
242#undef RSTRG 260#undef RSTRG
243#undef SWCH 261#undef SWCH
244#undef BOOL 262#undef BOOL
245/*}}} */ 263/*}}} */
246 264
247static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 265static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
248static 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
249#if defined(XPM_BACKGROUND) 305#if defined(XPM_BACKGROUND)
250 "XPM," 306 "XPM,"
251#endif 307#endif
252#if defined(TRANSPARENT) 308#if defined(TRANSPARENT)
253 "transparent," 309 "transparent,"
254#endif 310#endif
311#if TINTING
312 "tint,"
313#endif
255#if defined(UTMP_SUPPORT) 314#if defined(UTMP_SUPPORT)
256 "utmp," 315 "utmp,"
257#endif 316#endif
258#if defined(MENUBAR) 317#if defined(MENUBAR)
259 "menubar," 318 "menubar,"
260#endif
261#if !defined(NO_FRILLS)
262 "frills,"
263#endif
264#if !defined(NO_LINESPACE)
265 "linespace,"
266#endif
267#if defined(PREFER_24BIT)
268 "24bit,"
269#endif 319#endif
270#if defined(USE_XIM) 320#if defined(USE_XIM)
271 "XIM," 321 "XIM,"
272#endif 322#endif
273 "scrollbars=" 323 "scrollbars="
… …
301 "no_backspace," 351 "no_backspace,"
302#endif 352#endif
303#if defined(NO_DELETE_KEY) 353#if defined(NO_DELETE_KEY)
304 "no_delete," 354 "no_delete,"
305#endif 355#endif
356#if EIGHT_BIT_CONTROLS
357 "8bitctrls,"
358#endif
306#if !defined(NO_STRINGS) 359#if !defined(NO_STRINGS)
307 "strings," 360 "strings,"
308#endif 361#endif
309#if defined(TTY_256COLOR) 362#if defined(ENABLE_FRILLS)
363 "frills,"
364#endif
365#if defined(PREFER_24BIT)
310 "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,"
311#endif 385#endif
312#if defined(NO_RESOURCES) 386#if defined(NO_RESOURCES)
313 "NoResources" 387 "NoResources"
314#else 388#else
315# if defined(USE_XGETDEFAULT) 389# if defined(USE_XGETDEFAULT)
… …
348 len++; /* account for space */ 422 len++; /* account for space */
349 } 423 }
350#ifdef DEBUG_STRICT 424#ifdef DEBUG_STRICT
351 assert (optList[i].opt != NULL); 425 assert (optList[i].opt != NULL);
352#endif 426#endif
353 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
354 col += len; 428 col += len;
355 if (col > 79) 429 if (col > 79)
356 { /* assume regular width */ 430 { /* assume regular width */
357 rxvt_log ("\n"); 431 rxvt_log ("\n");
358 col = 1 + len; 432 col = 1 + len;
… …
375#ifdef DEBUG_STRICT 449#ifdef DEBUG_STRICT
376 assert (optList[i].opt != NULL); 450 assert (optList[i].opt != NULL);
377#endif 451#endif
378 rxvt_log (" %s%s %-*s%s%s\n", 452 rxvt_log (" %s%s %-*s%s%s\n",
379 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 453 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
380 (INDENT - STRLEN (optList[i].opt) 454 (INDENT - strlen (optList[i].opt)
381 + (optList_isBool (i) ? 0 : 2)), 455 + (optList_isBool (i) ? 0 : 2)),
382 (optList[i].arg ? optList[i].arg : ""), 456 (optList[i].arg ? optList[i].arg : ""),
383 (optList_isBool (i) ? "turn on/off " : ""), 457 (optList_isBool (i) ? "turn on/off " : ""),
384 optList[i].desc); 458 optList[i].desc);
385 } 459 }
… …
392 466
393 for (i = 0; i < optList_size (); i++) 467 for (i = 0; i < optList_size (); i++)
394 if (optList[i].kw != NULL) 468 if (optList[i].kw != NULL)
395 rxvt_log (" %s: %*s%s\n", 469 rxvt_log (" %s: %*s%s\n",
396 optList[i].kw, 470 optList[i].kw,
397 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 471 (INDENT - strlen (optList[i].kw)), "", /* XXX */
398 (optList_isBool (i) ? "boolean" : optList[i].arg)); 472 (optList_isBool (i) ? "boolean" : optList[i].arg));
399#ifdef KEYSYM_RESOURCE 473#ifdef KEYSYM_RESOURCE
400 rxvt_log (" " "keysym.sym" ": %*s%s\n", 474 rxvt_log (" " "keysym.sym" ": %*s%s\n",
401 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 475 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
402 "keysym"); 476 "keysym");
… …
445 bad_option = 1; 519 bad_option = 1;
446 rxvt_warn ("\"%s\": malformed option.\n", opt); 520 rxvt_warn ("\"%s\": malformed option.\n", opt);
447 continue; 521 continue;
448 } 522 }
449 523
450 if (!STRCMP (opt, "help")) 524 if (!strcmp (opt, "help"))
451 rxvt_usage (longopt ? 2 : 1); 525 rxvt_usage (longopt ? 2 : 1);
452 if (!STRCMP (opt, "h")) 526 if (!strcmp (opt, "h"))
453 rxvt_usage (0); 527 rxvt_usage (0);
454 528
455 /* feature: always try to match long-options */ 529 /* feature: always try to match long-options */
456 for (entry = 0; entry < optList_size (); entry++) 530 for (entry = 0; entry < optList_size (); entry++)
457 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 531 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
458 || (!longopt 532 || (!longopt
459 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 533 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
460 break; 534 break;
461 535
462 if (entry < optList_size ()) 536 if (entry < optList_size ())
463 { 537 {
464 if (optList_isReverse (entry)) 538 if (optList_isReverse (entry))
465 flag = flag == On ? Off : On; 539 flag = flag == On ? Off : On;
540
466 if (optList_strlen (entry)) 541 if (optList_strlen (entry))
467 { /* string value */
468 const char *str = argv[++i];
469
470#ifdef DEBUG_RESOURCES
471 fprintf (stderr, "string (%s,%s) = ",
472 optList[entry].opt ? optList[entry].opt : "nil",
473 optList[entry].kw ? optList[entry].kw : "nil");
474#endif
475 if (flag == On && str && (optList[entry].doff != -1))
476 { 542 {
477#ifdef DEBUG_RESOURCES
478 fprintf (stderr, "\"%s\"\n", str);
479#endif
480 rs[optList[entry].doff] = str;
481 /* 543 /*
482 * special cases are handled in main.c:main () to allow 544 * special cases are handled in main.c:main () to allow
483 * X resources to set these values before we settle for 545 * X resources to set these values before we settle for
484 * default values 546 * default values
485 */ 547 */
486 }
487#ifdef DEBUG_RESOURCES
488 else
489 fprintf (stderr, "???\n");
490#endif
491 548
549 if (optList[entry].doff != -1)
550 rs[optList[entry].doff] = flag == On && argv[i+1]
551 ? argv[++i] : 0;
492 } 552 }
493 else 553 else
494 { /* boolean value */ 554 { /* boolean value */
495#ifdef DEBUG_RESOURCES 555#ifdef DEBUG_RESOURCES
496 fprintf (stderr, "boolean (%s,%s) = %s\n", 556 fprintf (stderr, "boolean (%s,%s) = %s\n",
497 optList[entry].opt, optList[entry].kw, flag); 557 optList[entry].opt, optList[entry].kw, flag);
498#endif 558#endif
499 if (flag == On) 559 if (flag == On)
500 Options |= (optList[entry].flag); 560 options |= (optList[entry].flag);
501 else 561 else
502 Options &= ~ (optList[entry].flag); 562 options &= ~ (optList[entry].flag);
503 563
504 if (optList[entry].doff != -1) 564 if (optList[entry].doff != -1)
505 rs[optList[entry].doff] = flag; 565 rs[optList[entry].doff] = flag;
506 } 566 }
507 } 567 }
508 else 568 else
509#ifdef KEYSYM_RESOURCE 569#ifdef KEYSYM_RESOURCE
510 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 570 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
511 if (rxvt_Str_match (opt, "keysym.")) 571 if (rxvt_Str_match (opt, "keysym."))
512 { 572 {
513 const char *str = argv[++i]; 573 const char *str = argv[++i];
514 574
515 if (str != NULL) 575 if (str != NULL)
… …
564 * arg will be 624 * arg will be
565 * NULL for ~/.Xdefaults and 625 * NULL for ~/.Xdefaults and
566 * non-NULL for command-line options (need to allocate) 626 * non-NULL for command-line options (need to allocate)
567 */ 627 */
568#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
569int 665int
570rxvt_term::parse_keysym (const char *str, const char *arg) 666rxvt_term::parse_keysym (const char *str, const char *arg)
571{ 667{
572 int n, sym; 668 int n, sym;
669 unsigned int state = 0;
670 const char *pmodend = NULL;
573 char *key_string, *newarg = NULL; 671 char *newarg = NULL;
574 char newargstr[NEWARGLIM]; 672 char newargstr[NEWARGLIM];
575 673
576 if (arg == NULL) 674 if (arg == NULL)
577 { 675 {
578 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 676 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
579 return 0; 677 return 0;
678
580 str += n; /* skip `keysym.' */ 679 str += n; /* skip `keysym.' */
680 if ((pmodend = strchr (str, ':')) < str)
681 return -1;
581 } 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
582 /* some scanf () have trouble with a 0x prefix */ 711 /* some scanf () have trouble with a 0x prefix */
583 if (isdigit (str[0])) 712 if (str[0] == '0' && toupper (str[1]) == 'X')
584 { 713 {
585 if (str[0] == '0' && toupper (str[1]) == 'X')
586 str += 2; 714 str += 2;
715
587 if (arg) 716 if (arg)
588 { 717 {
589 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 718 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
590 return -1; 719 return -1;
591 } 720 }
592 else 721 else
593 { 722 {
594 if (sscanf (str, "%x:", &sym) != 1) 723 if (sscanf (str, "%x:", &sym) != 1)
595 return -1; 724 return -1;
596 725
597 /* cue to ':', it's there since sscanf () worked */ 726 /* cue to ':', it's there since sscanf () worked */
598 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 727 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
599 newargstr[NEWARGLIM - 1] = '\0'; 728 newargstr[NEWARGLIM - 1] = '\0';
600 newarg = newargstr; 729 newarg = newargstr;
601 } 730 }
602 } 731 }
603 else 732 else
604 { 733 {
605 /* 734 /*
606 * convert keysym name to keysym number 735 * convert keysym name to keysym number
607 */ 736 */
608 STRNCPY (newargstr, str, NEWARGLIM - 1); 737 strncpy (newargstr, str, NEWARGLIM - 1);
609 newargstr[NEWARGLIM - 1] = '\0'; 738 newargstr[NEWARGLIM - 1] = '\0';
739
610 if (arg == NULL) 740 if (arg == NULL)
611 { 741 {
612 if ((newarg = STRCHR (newargstr, ':')) == NULL) 742 if ((newarg = strchr (newargstr, ':')) == NULL)
613 return -1; 743 return -1;
744
614 *newarg++ = '\0'; /* terminate keysym name */ 745 *newarg++ = '\0'; /* terminate keysym name */
615 } 746 }
747
616 if ((sym = XStringToKeysym (newargstr)) == None) 748 if ((sym = XStringToKeysym (newargstr)) == None)
617 return -1; 749 return -1;
618 } 750 }
619 751
620 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */
621 return -1;
622 sym &= 0xFF;
623 if (Keysym_map[sym] != NULL) /* already set ? */
624 return -1;
625
626 if (newarg == NULL) 752 if (newarg == NULL)
627 { 753 {
628 STRNCPY (newargstr, arg, NEWARGLIM - 1); 754 strncpy (newargstr, arg, NEWARGLIM - 1);
629 newargstr[NEWARGLIM - 1] = '\0'; 755 newargstr[NEWARGLIM - 1] = '\0';
630 newarg = newargstr; 756 newarg = newargstr;
631 } 757 }
758
632 rxvt_Str_trim (newarg); 759 rxvt_Str_trim (newarg);
633 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 760 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
634 return -1; 761 return -1;
635 MIN_IT (n, 255);
636 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
637 762
638 key_string[0] = n; 763 keyboard->register_user_translation (sym, state, newarg);
639 STRNCPY (key_string + 1, newarg, n);
640 Keysym_map[sym] = (unsigned char *)key_string;
641
642 return 1; 764 return 1;
643} 765}
644 766
645# endif /* KEYSYM_RESOURCE */ 767# endif /* KEYSYM_RESOURCE */
646 768
… …
656 char *str, buffer[256]; 778 char *str, buffer[256];
657 779
658 if (stream == NULL) 780 if (stream == NULL)
659 return; 781 return;
660 782
661 len = STRLEN (name); 783 len = strlen (name);
662 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 784 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
663 { 785 {
664 unsigned int entry, n; 786 unsigned int entry, n;
665 787
666 while (*str && isspace (*str)) 788 while (*str && isspace (*str))
667 str++; /* leading whitespace */ 789 str++; /* leading whitespace */
668 790
669 if ((str[len] != '*' && str[len] != '.') 791 if ((str[len] != '*' && str[len] != '.')
670 || (len && STRNCMP (str, name, len))) 792 || (len && strncmp (str, name, len)))
671 continue; 793 continue;
672 str += (len + 1); /* skip `name*' or `name.' */ 794 str += (len + 1); /* skip `name*' or `name.' */
673 795
674# ifdef KEYSYM_RESOURCE 796# ifdef KEYSYM_RESOURCE
675 if (!parse_keysym (str, NULL)) 797 if (!parse_keysym (str, NULL))
… …
679 const char *kw = optList[entry].kw; 801 const char *kw = optList[entry].kw;
680 802
681 if (kw == NULL) 803 if (kw == NULL)
682 continue; 804 continue;
683 805
684 n = STRLEN (kw); 806 n = strlen (kw);
685 if (str[n] == ':' && rxvt_Str_match (str, kw)) 807 if (str[n] == ':' && rxvt_Str_match (str, kw))
686 { 808 {
687 /* skip `keyword:' */ 809 /* skip `keyword:' */
688 str += n + 1; 810 str += n + 1;
689 rxvt_Str_trim (str); 811 rxvt_Str_trim (str);
690 n = STRLEN (str); 812 n = strlen (str);
691 if (n && rs[optList[entry].doff] == NULL) 813 if (n && rs[optList[entry].doff] == NULL)
692 { 814 {
693 /* not already set */ 815 /* not already set */
694 int s; 816 int s;
695 char *p = 0; 817 char *p = 0;
696 818
697 for (int o = 0;;) 819 for (int o = 0;;)
698 { 820 {
699 p = (char *)rxvt_realloc (p, o + n + 1); 821 p = (char *)rxvt_realloc (p, o + n + 1);
700 MEMCPY (p + o, str, n); 822 memcpy (p + o, str, n);
701 o += n; 823 o += n;
702 p[o] = 0; 824 p[o] = 0;
703 825
704 if (o == 0 || p[o - 1] != '\\') // continuation line 826 if (o == 0 || p[o - 1] != '\\') // continuation line
705 break; 827 break;
… …
708 830
709 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 831 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
710 break; 832 break;
711 833
712 rxvt_Str_trim (str); 834 rxvt_Str_trim (str);
713 n = STRLEN (str); 835 n = strlen (str);
714 } 836 }
715 837
716 rs[optList[entry].doff] = p; 838 rs[optList[entry].doff] = p;
717 allocated.push_back (p); 839 allocated.push_back (p);
718 840
719 if (optList_isBool (entry)) 841 if (optList_isBool (entry))
720 { 842 {
721 s = STRCASECMP (str, "TRUE") == 0 843 s = strcasecmp (str, "TRUE") == 0
722 || STRCASECMP (str, "YES") == 0 844 || strcasecmp (str, "YES") == 0
723 || STRCASECMP (str, "ON") == 0 845 || strcasecmp (str, "ON") == 0
724 || STRCASECMP (str, "1") == 0; 846 || strcasecmp (str, "1") == 0;
725 847
726 if (optList_isReverse (entry)) 848 if (optList_isReverse (entry))
727 s = !s; 849 s = !s;
728 850
729 if (s) 851 if (s)
730 Options |= optList[entry].flag; 852 options |= optList[entry].flag;
731 else 853 else
732 Options &= ~optList[entry].flag; 854 options &= ~optList[entry].flag;
733 } 855 }
734 } 856 }
735 857
736 break; 858 break;
737 } 859 }
… …
796 database = XrmGetStringDatabase (displayResource); 918 database = XrmGetStringDatabase (displayResource);
797 919
798# ifdef HAVE_EXTRA_XRESOURCE_FILES 920# ifdef HAVE_EXTRA_XRESOURCE_FILES
799 /* Add in ~/.Xdefaults or ~/.Xresources */ 921 /* Add in ~/.Xdefaults or ~/.Xresources */
800 { 922 {
801 char *ptr; 923 char *ptr;
802 924
803 if ((ptr = (char *)getenv ("HOME")) == NULL) 925 if ((ptr = (char *)getenv ("HOME")) == NULL)
804 ptr = "."; 926 ptr = ".";
805 927
806 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 928 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
807 { 929 {
808 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 930 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
809 ptr, xnames[i]); 931 ptr, xnames[i]);
810 if ((rdb1 = XrmGetFileDatabase (fname))) 932 if ((rdb1 = XrmGetFileDatabase (fname)))
811 { 933 {
812 XrmMergeDatabases (rdb1, &database); 934 XrmMergeDatabases (rdb1, &database);
813# ifndef HAVE_BOTH_XRESOURCE_FILES 935# ifndef HAVE_BOTH_XRESOURCE_FILES
… …
858 if (kw == NULL || rs[optList[entry].doff] != NULL) 980 if (kw == NULL || rs[optList[entry].doff] != NULL)
859 continue; /* previously set */ 981 continue; /* previously set */
860 982
861 p = XGetDefault (display, name, kw); 983 p = XGetDefault (display, name, kw);
862 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 984 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
863 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 985 if (p == NULL || (p0 && strcmp (p, p0) == 0))
864 { 986 {
865 p = XGetDefault (display, RESCLASS, kw); 987 p = XGetDefault (display, RESCLASS, kw);
866#ifdef RESFALLBACK 988#ifdef RESFALLBACK
867 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 989 if (p == NULL || (p0 && strcmp (p, p0) == 0))
868 p = XGetDefault (display, RESFALLBACK, kw); 990 p = XGetDefault (display, RESFALLBACK, kw);
869#endif 991#endif
870 } 992 }
871 993
872 if (p == NULL && p0) 994 if (p == NULL && p0)
… …
876 { 998 {
877 rs[optList[entry].doff] = p; 999 rs[optList[entry].doff] = p;
878 1000
879 if (optList_isBool (entry)) 1001 if (optList_isBool (entry))
880 { 1002 {
881 s = STRCASECMP (p, "TRUE") == 0 1003 s = strcasecmp (p, "TRUE") == 0
882 || STRCASECMP (p, "YES") == 0 1004 || strcasecmp (p, "YES") == 0
883 || STRCASECMP (p, "ON") == 0 1005 || strcasecmp (p, "ON") == 0
884 || STRCASECMP (p, "1") == 0; 1006 || strcasecmp (p, "1") == 0;
885 if (optList_isReverse (entry)) 1007 if (optList_isReverse (entry))
886 s = !s; 1008 s = !s;
887 if (s) 1009 if (s)
888 Options |= (optList[entry].flag); 1010 options |= (optList[entry].flag);
889 else 1011 else
890 Options &= ~ (optList[entry].flag); 1012 options &= ~ (optList[entry].flag);
891 } 1013 }
892 } 1014 }
893 } 1015 }
894 1016
895 /* 1017 /*
… …
923 FILE *fd = NULL; 1045 FILE *fd = NULL;
924 char *home; 1046 char *home;
925 1047
926 if ((home = getenv ("HOME")) != NULL) 1048 if ((home = getenv ("HOME")) != NULL)
927 { 1049 {
928 unsigned int i, len = STRLEN (home) + 2; 1050 unsigned int i, len = strlen (home) + 2;
929 char *f = NULL; 1051 char *f = NULL;
930 1052
931 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 1053 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
932 { 1054 {
933 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char)); 1055 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
934 1056
935 sprintf (f, "%s/%s", home, xnames[i]); 1057 sprintf (f, "%s/%s", home, xnames[i]);
936 1058
937 if ((fd = fopen (f, "r")) != NULL) 1059 if ((fd = fopen (f, "r")) != NULL)
938 break; 1060 break;

Diff Legend

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