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.24 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.43 by root, Wed Dec 15 00:53:23 2004 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 */
34 33
35/* #define DEBUG_RESOURCES */ 34/* #define DEBUG_RESOURCES */
36 35
37static const char *const xnames[2] = { ".Xdefaults", ".Xresources" }; 36static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
38 37
… …
63#define SWCH(opt, flag, desc) \ 62#define SWCH(opt, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 63 { (flag), -1, NULL, (opt), NULL, (desc)}
65 64
66/* convenient macros */ 65/* convenient macros */
67#define optList_strlen(i) \ 66#define optList_strlen(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? STRLEN (optList[i].arg) : 1)) 67 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
69#define optList_isBool(i) \ 68#define optList_isBool(i) \
70 (optList[i].flag & Opt_Boolean) 69 (optList[i].flag & Opt_Boolean)
71#define optList_isReverse(i) \ 70#define optList_isReverse(i) \
72 (optList[i].flag & Opt_Reverse) 71 (optList[i].flag & Opt_Reverse)
73#define optList_size() \ 72#define optList_size() \
… …
92 SWCH ("iconic", Opt_iconic, "start iconic"), 91 SWCH ("iconic", Opt_iconic, "start iconic"),
93 SWCH ("ic", Opt_iconic, NULL), /* short form */ 92 SWCH ("ic", Opt_iconic, NULL), /* short form */
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 93 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 94 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 95 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
96 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
97#ifdef HAVE_SCROLLBARS 97#ifdef HAVE_SCROLLBARS
98 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 98 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
99 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 99 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"), 100 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
101#endif 101#endif
… …
109 SWCH ("tr", Opt_transparent, NULL), 109 SWCH ("tr", Opt_transparent, NULL),
110#if TINTING 110#if TINTING
111 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 111 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
112#endif 112#endif
113#endif 113#endif
114#ifdef OFF_FOCUS_FADING
115 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."),
116#endif
117#ifdef TINTING
118 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
119#endif
114 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 120 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
115#ifndef NO_BELL 121#ifndef NO_BELL
116 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 122 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
117# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 123# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
118 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 124 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL),
… …
122 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 128 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
123#endif 129#endif
124#ifdef MOUSE_WHEEL 130#ifdef MOUSE_WHEEL
125 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 131 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
126#endif 132#endif
127#ifndef NO_FRILLS 133#if ENABLE_FRILLS
128 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 134 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
129 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 135 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
130#endif 136#endif
131#ifdef CURSOR_BLINK 137#ifdef CURSOR_BLINK
132 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 138 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
… …
154 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
155 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
156#endif /* NO_BRIGHTCOLOR */ 162#endif /* NO_BRIGHTCOLOR */
157#ifndef NO_BOLD_UNDERLINE_REVERSE 163#ifndef NO_BOLD_UNDERLINE_REVERSE
158 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 164 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
165 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
159 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 166 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
160 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 167 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
161#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 168#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
169#if ENABLE_FRILLS
170 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
171#endif
162#ifdef KEEP_SCROLLCOLOR 172#ifdef KEEP_SCROLLCOLOR
163 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 173 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
164 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 174 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
165#endif /* KEEP_SCROLLCOLOR */ 175#endif /* KEEP_SCROLLCOLOR */
166#ifdef OPTION_HC 176#ifdef OPTION_HC
… …
173 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 183 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
174#endif /* XPM_BACKGROUND */ 184#endif /* XPM_BACKGROUND */
175#if (MENUBAR_MAX) 185#if (MENUBAR_MAX)
176 RSTRG (Rs_menu, "menu", "name[;tag]"), 186 RSTRG (Rs_menu, "menu", "name[;tag]"),
177#endif 187#endif
188 /* fonts: command-line option = resource name */
178 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 189 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
179 /* fonts: command-line option = resource name */ 190#if ENABLE_STYLES
191 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
192 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
193 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
194#endif
180#ifdef USE_XIM 195#ifdef USE_XIM
181 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 196 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
182 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 197 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
183#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 198#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
184 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 199 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
… …
195#endif /* NO_CURSORCOLOR */ 210#endif /* NO_CURSORCOLOR */
196 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 211 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
197 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 212 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
198 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 213 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
199 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 214 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
200#ifndef NO_FRILLS 215#if ENABLE_FRILLS
201 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 216 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
202 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 217 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
203 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 218 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
204 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 219 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
220 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
205#endif 221#endif
206#ifndef NO_LINESPACE 222#ifndef NO_LINESPACE
207 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 223 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
208#endif 224#endif
209 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 225 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
… …
242#undef RSTRG 258#undef RSTRG
243#undef SWCH 259#undef SWCH
244#undef BOOL 260#undef BOOL
245/*}}} */ 261/*}}} */
246 262
247static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 263static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
248static const char optionsstring[] = "Options: " 264static const char optionsstring[] = "options: "
265#if XFT
266 "xft,"
267#endif
268#if ENABLE_STYLES
269 "styles,"
270#endif
271#if ENABLE_COMBINING
272 "combining,"
273#endif
274#if TEXT_BLINK
275 "blink,"
276#endif
277#if ISO_14755
278 "iso14755,"
279#endif
280#if UNICODE_3
281 "unicode3,"
282#endif
283 "encodings=eu+vn"
284#if ENCODING_JP
285 "+jp"
286#endif
287#if ENCODING_JP_EXT
288 "+jp-ext"
289#endif
290#if ENCODING_KR
291 "+kr"
292#endif
293#if ENCODING_ZH
294 "+zh"
295#endif
296#if ENCODING_ZH_EXT
297 "+zh-ext"
298#endif
299 ","
300#if OFF_FOCUS_FADING
301 "fade,"
302#endif
249#if defined(XPM_BACKGROUND) 303#if defined(XPM_BACKGROUND)
250 "XPM," 304 "XPM,"
251#endif 305#endif
252#if defined(TRANSPARENT) 306#if defined(TRANSPARENT)
253 "transparent," 307 "transparent,"
254#endif 308#endif
309#if TINTING
310 "tint,"
311#endif
255#if defined(UTMP_SUPPORT) 312#if defined(UTMP_SUPPORT)
256 "utmp," 313 "utmp,"
257#endif 314#endif
258#if defined(MENUBAR) 315#if defined(MENUBAR)
259 "menubar," 316 "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 317#endif
270#if defined(USE_XIM) 318#if defined(USE_XIM)
271 "XIM," 319 "XIM,"
272#endif 320#endif
273 "scrollbars=" 321 "scrollbars="
… …
301 "no_backspace," 349 "no_backspace,"
302#endif 350#endif
303#if defined(NO_DELETE_KEY) 351#if defined(NO_DELETE_KEY)
304 "no_delete," 352 "no_delete,"
305#endif 353#endif
354#if EIGHT_BIT_CONTROLS
355 "8bitctrls,"
356#endif
306#if !defined(NO_STRINGS) 357#if !defined(NO_STRINGS)
307 "strings," 358 "strings,"
308#endif 359#endif
309#if defined(TTY_256COLOR) 360#if defined(ENABLE_FRILLS)
361 "frills,"
362#endif
363#if !defined(NO_LINESPACE)
364 "linespace,"
365#endif
366#if defined(PREFER_24BIT)
310 "256colour," 367 "24bit,"
368#endif
369#if defined(SELECTION_SCROLLING)
370 "selectionscrolling,"
371#endif
372#if MOUSE_WHEEL
373 "wheel,"
374#endif
375#if MOUSE_SLIP_WHEELING
376 "slipwheel,"
377#endif
378#if defined(SMART_RESIZE)
379 "smart-resize,"
380#endif
381#if defined(CURSOR_BLINK)
382 "cursorBlink,"
383#endif
384#if defined(POINTER_BLANK)
385 "pointerBlank,"
311#endif 386#endif
312#if defined(NO_RESOURCES) 387#if defined(NO_RESOURCES)
313 "NoResources" 388 "NoResources"
314#else 389#else
315# if defined(USE_XGETDEFAULT) 390# if defined(USE_XGETDEFAULT)
… …
348 len++; /* account for space */ 423 len++; /* account for space */
349 } 424 }
350#ifdef DEBUG_STRICT 425#ifdef DEBUG_STRICT
351 assert (optList[i].opt != NULL); 426 assert (optList[i].opt != NULL);
352#endif 427#endif
353 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 428 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
354 col += len; 429 col += len;
355 if (col > 79) 430 if (col > 79)
356 { /* assume regular width */ 431 { /* assume regular width */
357 rxvt_log ("\n"); 432 rxvt_log ("\n");
358 col = 1 + len; 433 col = 1 + len;
… …
375#ifdef DEBUG_STRICT 450#ifdef DEBUG_STRICT
376 assert (optList[i].opt != NULL); 451 assert (optList[i].opt != NULL);
377#endif 452#endif
378 rxvt_log (" %s%s %-*s%s%s\n", 453 rxvt_log (" %s%s %-*s%s%s\n",
379 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 454 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
380 (INDENT - STRLEN (optList[i].opt) 455 (INDENT - strlen (optList[i].opt)
381 + (optList_isBool (i) ? 0 : 2)), 456 + (optList_isBool (i) ? 0 : 2)),
382 (optList[i].arg ? optList[i].arg : ""), 457 (optList[i].arg ? optList[i].arg : ""),
383 (optList_isBool (i) ? "turn on/off " : ""), 458 (optList_isBool (i) ? "turn on/off " : ""),
384 optList[i].desc); 459 optList[i].desc);
385 } 460 }
… …
392 467
393 for (i = 0; i < optList_size (); i++) 468 for (i = 0; i < optList_size (); i++)
394 if (optList[i].kw != NULL) 469 if (optList[i].kw != NULL)
395 rxvt_log (" %s: %*s%s\n", 470 rxvt_log (" %s: %*s%s\n",
396 optList[i].kw, 471 optList[i].kw,
397 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 472 (INDENT - strlen (optList[i].kw)), "", /* XXX */
398 (optList_isBool (i) ? "boolean" : optList[i].arg)); 473 (optList_isBool (i) ? "boolean" : optList[i].arg));
399#ifdef KEYSYM_RESOURCE 474#ifdef KEYSYM_RESOURCE
400 rxvt_log (" " "keysym.sym" ": %*s%s\n", 475 rxvt_log (" " "keysym.sym" ": %*s%s\n",
401 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 476 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
402 "keysym"); 477 "keysym");
… …
445 bad_option = 1; 520 bad_option = 1;
446 rxvt_warn ("\"%s\": malformed option.\n", opt); 521 rxvt_warn ("\"%s\": malformed option.\n", opt);
447 continue; 522 continue;
448 } 523 }
449 524
450 if (!STRCMP (opt, "help")) 525 if (!strcmp (opt, "help"))
451 rxvt_usage (longopt ? 2 : 1); 526 rxvt_usage (longopt ? 2 : 1);
452 if (!STRCMP (opt, "h")) 527 if (!strcmp (opt, "h"))
453 rxvt_usage (0); 528 rxvt_usage (0);
454 529
455 /* feature: always try to match long-options */ 530 /* feature: always try to match long-options */
456 for (entry = 0; entry < optList_size (); entry++) 531 for (entry = 0; entry < optList_size (); entry++)
457 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 532 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
458 || (!longopt 533 || (!longopt
459 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 534 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
460 break; 535 break;
461 536
462 if (entry < optList_size ()) 537 if (entry < optList_size ())
463 { 538 {
464 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
465 flag = flag == On ? Off : On; 540 flag = flag == On ? Off : On;
541
466 if (optList_strlen (entry)) 542 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 { 543 {
477#ifdef DEBUG_RESOURCES
478 fprintf (stderr, "\"%s\"\n", str);
479#endif
480 rs[optList[entry].doff] = str;
481 /* 544 /*
482 * special cases are handled in main.c:main () to allow 545 * special cases are handled in main.c:main () to allow
483 * X resources to set these values before we settle for 546 * X resources to set these values before we settle for
484 * default values 547 * default values
485 */ 548 */
486 }
487#ifdef DEBUG_RESOURCES
488 else
489 fprintf (stderr, "???\n");
490#endif
491 549
550 if (optList[entry].doff != -1)
551 rs[optList[entry].doff] = flag == On && argv[i+1]
552 ? argv[++i] : 0;
492 } 553 }
493 else 554 else
494 { /* boolean value */ 555 { /* boolean value */
495#ifdef DEBUG_RESOURCES 556#ifdef DEBUG_RESOURCES
496 fprintf (stderr, "boolean (%s,%s) = %s\n", 557 fprintf (stderr, "boolean (%s,%s) = %s\n",
497 optList[entry].opt, optList[entry].kw, flag); 558 optList[entry].opt, optList[entry].kw, flag);
498#endif 559#endif
499 if (flag == On) 560 if (flag == On)
500 Options |= (optList[entry].flag); 561 options |= (optList[entry].flag);
501 else 562 else
502 Options &= ~ (optList[entry].flag); 563 options &= ~ (optList[entry].flag);
503 564
504 if (optList[entry].doff != -1) 565 if (optList[entry].doff != -1)
505 rs[optList[entry].doff] = flag; 566 rs[optList[entry].doff] = flag;
506 } 567 }
507 } 568 }
508 else 569 else
509#ifdef KEYSYM_RESOURCE 570#ifdef KEYSYM_RESOURCE
510 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 571 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
511 if (rxvt_Str_match (opt, "keysym.")) 572 if (rxvt_Str_match (opt, "keysym."))
512 { 573 {
513 const char *str = argv[++i]; 574 const char *str = argv[++i];
514 575
515 if (str != NULL) 576 if (str != NULL)
… …
584 { 645 {
585 if (str[0] == '0' && toupper (str[1]) == 'X') 646 if (str[0] == '0' && toupper (str[1]) == 'X')
586 str += 2; 647 str += 2;
587 if (arg) 648 if (arg)
588 { 649 {
589 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 650 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
590 return -1; 651 return -1;
591 } 652 }
592 else 653 else
593 { 654 {
594 if (sscanf (str, "%x:", &sym) != 1) 655 if (sscanf (str, "%x:", &sym) != 1)
595 return -1; 656 return -1;
596 657
597 /* cue to ':', it's there since sscanf () worked */ 658 /* cue to ':', it's there since sscanf () worked */
598 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 659 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
599 newargstr[NEWARGLIM - 1] = '\0'; 660 newargstr[NEWARGLIM - 1] = '\0';
600 newarg = newargstr; 661 newarg = newargstr;
601 } 662 }
602 } 663 }
603 else 664 else
604 { 665 {
605 /* 666 /*
606 * convert keysym name to keysym number 667 * convert keysym name to keysym number
607 */ 668 */
608 STRNCPY (newargstr, str, NEWARGLIM - 1); 669 strncpy (newargstr, str, NEWARGLIM - 1);
609 newargstr[NEWARGLIM - 1] = '\0'; 670 newargstr[NEWARGLIM - 1] = '\0';
610 if (arg == NULL) 671 if (arg == NULL)
611 { 672 {
612 if ((newarg = STRCHR (newargstr, ':')) == NULL) 673 if ((newarg = strchr (newargstr, ':')) == NULL)
613 return -1; 674 return -1;
614 *newarg++ = '\0'; /* terminate keysym name */ 675 *newarg++ = '\0'; /* terminate keysym name */
615 } 676 }
616 if ((sym = XStringToKeysym (newargstr)) == None) 677 if ((sym = XStringToKeysym (newargstr)) == None)
617 return -1; 678 return -1;
… …
623 if (Keysym_map[sym] != NULL) /* already set ? */ 684 if (Keysym_map[sym] != NULL) /* already set ? */
624 return -1; 685 return -1;
625 686
626 if (newarg == NULL) 687 if (newarg == NULL)
627 { 688 {
628 STRNCPY (newargstr, arg, NEWARGLIM - 1); 689 strncpy (newargstr, arg, NEWARGLIM - 1);
629 newargstr[NEWARGLIM - 1] = '\0'; 690 newargstr[NEWARGLIM - 1] = '\0';
630 newarg = newargstr; 691 newarg = newargstr;
631 } 692 }
632 rxvt_Str_trim (newarg); 693 rxvt_Str_trim (newarg);
633 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 694 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
634 return -1; 695 return -1;
635 MIN_IT (n, 255); 696 MIN_IT (n, 255);
636 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 697 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
637 698
638 key_string[0] = n; 699 key_string[0] = n;
639 STRNCPY (key_string + 1, newarg, n); 700 strncpy (key_string + 1, newarg, n);
640 Keysym_map[sym] = (unsigned char *)key_string; 701 Keysym_map[sym] = (unsigned char *)key_string;
641 702
642 return 1; 703 return 1;
643} 704}
644 705
… …
656 char *str, buffer[256]; 717 char *str, buffer[256];
657 718
658 if (stream == NULL) 719 if (stream == NULL)
659 return; 720 return;
660 721
661 len = STRLEN (name); 722 len = strlen (name);
662 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 723 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
663 { 724 {
664 unsigned int entry, n; 725 unsigned int entry, n;
665 726
666 while (*str && isspace (*str)) 727 while (*str && isspace (*str))
667 str++; /* leading whitespace */ 728 str++; /* leading whitespace */
668 729
669 if ((str[len] != '*' && str[len] != '.') 730 if ((str[len] != '*' && str[len] != '.')
670 || (len && STRNCMP (str, name, len))) 731 || (len && strncmp (str, name, len)))
671 continue; 732 continue;
672 str += (len + 1); /* skip `name*' or `name.' */ 733 str += (len + 1); /* skip `name*' or `name.' */
673 734
674# ifdef KEYSYM_RESOURCE 735# ifdef KEYSYM_RESOURCE
675 if (!parse_keysym (str, NULL)) 736 if (!parse_keysym (str, NULL))
… …
679 const char *kw = optList[entry].kw; 740 const char *kw = optList[entry].kw;
680 741
681 if (kw == NULL) 742 if (kw == NULL)
682 continue; 743 continue;
683 744
684 n = STRLEN (kw); 745 n = strlen (kw);
685 if (str[n] == ':' && rxvt_Str_match (str, kw)) 746 if (str[n] == ':' && rxvt_Str_match (str, kw))
686 { 747 {
687 /* skip `keyword:' */ 748 /* skip `keyword:' */
688 str += n + 1; 749 str += n + 1;
689 rxvt_Str_trim (str); 750 rxvt_Str_trim (str);
690 n = STRLEN (str); 751 n = strlen (str);
691 if (n && rs[optList[entry].doff] == NULL) 752 if (n && rs[optList[entry].doff] == NULL)
692 { 753 {
693 /* not already set */ 754 /* not already set */
694 int s; 755 int s;
695 char *p = 0; 756 char *p = 0;
696 757
697 for (int o = 0;;) 758 for (int o = 0;;)
698 { 759 {
699 p = (char *)rxvt_realloc (p, o + n + 1); 760 p = (char *)rxvt_realloc (p, o + n + 1);
700 MEMCPY (p + o, str, n); 761 memcpy (p + o, str, n);
701 o += n; 762 o += n;
702 p[o] = 0; 763 p[o] = 0;
703 764
704 if (o == 0 || p[o - 1] != '\\') // continuation line 765 if (o == 0 || p[o - 1] != '\\') // continuation line
705 break; 766 break;
… …
708 769
709 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 770 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
710 break; 771 break;
711 772
712 rxvt_Str_trim (str); 773 rxvt_Str_trim (str);
713 n = STRLEN (str); 774 n = strlen (str);
714 } 775 }
715 776
716 rs[optList[entry].doff] = p; 777 rs[optList[entry].doff] = p;
717 allocated.push_back (p); 778 allocated.push_back (p);
718 779
719 if (optList_isBool (entry)) 780 if (optList_isBool (entry))
720 { 781 {
721 s = STRCASECMP (str, "TRUE") == 0 782 s = strcasecmp (str, "TRUE") == 0
722 || STRCASECMP (str, "YES") == 0 783 || strcasecmp (str, "YES") == 0
723 || STRCASECMP (str, "ON") == 0 784 || strcasecmp (str, "ON") == 0
724 || STRCASECMP (str, "1") == 0; 785 || strcasecmp (str, "1") == 0;
725 786
726 if (optList_isReverse (entry)) 787 if (optList_isReverse (entry))
727 s = !s; 788 s = !s;
728 789
729 if (s) 790 if (s)
730 Options |= optList[entry].flag; 791 options |= optList[entry].flag;
731 else 792 else
732 Options &= ~optList[entry].flag; 793 options &= ~optList[entry].flag;
733 } 794 }
734 } 795 }
735 796
736 break; 797 break;
737 } 798 }
… …
796 database = XrmGetStringDatabase (displayResource); 857 database = XrmGetStringDatabase (displayResource);
797 858
798# ifdef HAVE_EXTRA_XRESOURCE_FILES 859# ifdef HAVE_EXTRA_XRESOURCE_FILES
799 /* Add in ~/.Xdefaults or ~/.Xresources */ 860 /* Add in ~/.Xdefaults or ~/.Xresources */
800 { 861 {
801 char *ptr; 862 char *ptr;
802 863
803 if ((ptr = (char *)getenv ("HOME")) == NULL) 864 if ((ptr = (char *)getenv ("HOME")) == NULL)
804 ptr = "."; 865 ptr = ".";
805 866
806 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 867 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
807 { 868 {
808 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 869 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
809 ptr, xnames[i]); 870 ptr, xnames[i]);
810 if ((rdb1 = XrmGetFileDatabase (fname))) 871 if ((rdb1 = XrmGetFileDatabase (fname)))
811 { 872 {
812 XrmMergeDatabases (rdb1, &database); 873 XrmMergeDatabases (rdb1, &database);
813# ifndef HAVE_BOTH_XRESOURCE_FILES 874# ifndef HAVE_BOTH_XRESOURCE_FILES
… …
858 if (kw == NULL || rs[optList[entry].doff] != NULL) 919 if (kw == NULL || rs[optList[entry].doff] != NULL)
859 continue; /* previously set */ 920 continue; /* previously set */
860 921
861 p = XGetDefault (display, name, kw); 922 p = XGetDefault (display, name, kw);
862 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 923 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
863 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 924 if (p == NULL || (p0 && strcmp (p, p0) == 0))
864 { 925 {
865 p = XGetDefault (display, RESCLASS, kw); 926 p = XGetDefault (display, RESCLASS, kw);
866#ifdef RESFALLBACK 927#ifdef RESFALLBACK
867 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 928 if (p == NULL || (p0 && strcmp (p, p0) == 0))
868 p = XGetDefault (display, RESFALLBACK, kw); 929 p = XGetDefault (display, RESFALLBACK, kw);
869#endif 930#endif
870 } 931 }
871 932
872 if (p == NULL && p0) 933 if (p == NULL && p0)
… …
876 { 937 {
877 rs[optList[entry].doff] = p; 938 rs[optList[entry].doff] = p;
878 939
879 if (optList_isBool (entry)) 940 if (optList_isBool (entry))
880 { 941 {
881 s = STRCASECMP (p, "TRUE") == 0 942 s = strcasecmp (p, "TRUE") == 0
882 || STRCASECMP (p, "YES") == 0 943 || strcasecmp (p, "YES") == 0
883 || STRCASECMP (p, "ON") == 0 944 || strcasecmp (p, "ON") == 0
884 || STRCASECMP (p, "1") == 0; 945 || strcasecmp (p, "1") == 0;
885 if (optList_isReverse (entry)) 946 if (optList_isReverse (entry))
886 s = !s; 947 s = !s;
887 if (s) 948 if (s)
888 Options |= (optList[entry].flag); 949 options |= (optList[entry].flag);
889 else 950 else
890 Options &= ~ (optList[entry].flag); 951 options &= ~ (optList[entry].flag);
891 } 952 }
892 } 953 }
893 } 954 }
894 955
895 /* 956 /*
… …
923 FILE *fd = NULL; 984 FILE *fd = NULL;
924 char *home; 985 char *home;
925 986
926 if ((home = getenv ("HOME")) != NULL) 987 if ((home = getenv ("HOME")) != NULL)
927 { 988 {
928 unsigned int i, len = STRLEN (home) + 2; 989 unsigned int i, len = strlen (home) + 2;
929 char *f = NULL; 990 char *f = NULL;
930 991
931 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 992 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
932 { 993 {
933 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char)); 994 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
934 995
935 sprintf (f, "%s/%s", home, xnames[i]); 996 sprintf (f, "%s/%s", home, xnames[i]);
936 997
937 if ((fd = fopen (f, "r")) != NULL) 998 if ((fd = fopen (f, "r")) != NULL)
938 break; 999 break;

Diff Legend

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