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.29 by root, Tue Aug 3 22:19:51 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
… …
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 114#ifdef OFF_FOCUS_FADING
115 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when urxvt is losing focus."), 115 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."),
116#endif 116#endif
117#ifdef TINTING 117#ifdef TINTING
118 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), 118 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
119#endif 119#endif
120 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 120 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
… …
128 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 128 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
129#endif 129#endif
130#ifdef MOUSE_WHEEL 130#ifdef MOUSE_WHEEL
131 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 131 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
132#endif 132#endif
133#ifndef NO_FRILLS 133#if ENABLE_FRILLS
134 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 134 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
135 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"),
136#endif 136#endif
137#ifdef CURSOR_BLINK 137#ifdef CURSOR_BLINK
138 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 138 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
… …
159 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 159 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
160 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
161 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
162#endif /* NO_BRIGHTCOLOR */ 162#endif /* NO_BRIGHTCOLOR */
163#ifndef NO_BOLD_UNDERLINE_REVERSE 163#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"), 164 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
165 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
166 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 166 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
167 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 167 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
168#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
169#ifdef KEEP_SCROLLCOLOR 172#ifdef KEEP_SCROLLCOLOR
170 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 173 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
171 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 174 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
172#endif /* KEEP_SCROLLCOLOR */ 175#endif /* KEEP_SCROLLCOLOR */
173#ifdef OPTION_HC 176#ifdef OPTION_HC
… …
180 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 183 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
181#endif /* XPM_BACKGROUND */ 184#endif /* XPM_BACKGROUND */
182#if (MENUBAR_MAX) 185#if (MENUBAR_MAX)
183 RSTRG (Rs_menu, "menu", "name[;tag]"), 186 RSTRG (Rs_menu, "menu", "name[;tag]"),
184#endif 187#endif
188 /* fonts: command-line option = resource name */
185 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 189 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
186 /* 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
187#ifdef USE_XIM 195#ifdef USE_XIM
188 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 196 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
189 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"),
190#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 198#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
191 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"),
… …
202#endif /* NO_CURSORCOLOR */ 210#endif /* NO_CURSORCOLOR */
203 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 211 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
204 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"),
205 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 213 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
206 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"),
207#ifndef NO_FRILLS 215#if ENABLE_FRILLS
208 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 216 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
209 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 217 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
210 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 218 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
211 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 219 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
212 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 220 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
… …
250#undef RSTRG 258#undef RSTRG
251#undef SWCH 259#undef SWCH
252#undef BOOL 260#undef BOOL
253/*}}} */ 261/*}}} */
254 262
255static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 263static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
256static 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
257#if defined(XPM_BACKGROUND) 303#if defined(XPM_BACKGROUND)
258 "XPM," 304 "XPM,"
259#endif 305#endif
260#if defined(TRANSPARENT) 306#if defined(TRANSPARENT)
261 "transparent," 307 "transparent,"
262#endif 308#endif
309#if TINTING
310 "tint,"
311#endif
263#if defined(UTMP_SUPPORT) 312#if defined(UTMP_SUPPORT)
264 "utmp," 313 "utmp,"
265#endif 314#endif
266#if defined(MENUBAR) 315#if defined(MENUBAR)
267 "menubar," 316 "menubar,"
268#endif
269#if !defined(NO_FRILLS)
270 "frills,"
271#endif
272#if !defined(NO_LINESPACE)
273 "linespace,"
274#endif
275#if defined(PREFER_24BIT)
276 "24bit,"
277#endif 317#endif
278#if defined(USE_XIM) 318#if defined(USE_XIM)
279 "XIM," 319 "XIM,"
280#endif 320#endif
281 "scrollbars=" 321 "scrollbars="
… …
309 "no_backspace," 349 "no_backspace,"
310#endif 350#endif
311#if defined(NO_DELETE_KEY) 351#if defined(NO_DELETE_KEY)
312 "no_delete," 352 "no_delete,"
313#endif 353#endif
354#if EIGHT_BIT_CONTROLS
355 "8bitctrls,"
356#endif
314#if !defined(NO_STRINGS) 357#if !defined(NO_STRINGS)
315 "strings," 358 "strings,"
316#endif 359#endif
317#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)
318 "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,"
319#endif 386#endif
320#if defined(NO_RESOURCES) 387#if defined(NO_RESOURCES)
321 "NoResources" 388 "NoResources"
322#else 389#else
323# if defined(USE_XGETDEFAULT) 390# if defined(USE_XGETDEFAULT)
… …
356 len++; /* account for space */ 423 len++; /* account for space */
357 } 424 }
358#ifdef DEBUG_STRICT 425#ifdef DEBUG_STRICT
359 assert (optList[i].opt != NULL); 426 assert (optList[i].opt != NULL);
360#endif 427#endif
361 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 428 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
362 col += len; 429 col += len;
363 if (col > 79) 430 if (col > 79)
364 { /* assume regular width */ 431 { /* assume regular width */
365 rxvt_log ("\n"); 432 rxvt_log ("\n");
366 col = 1 + len; 433 col = 1 + len;
… …
383#ifdef DEBUG_STRICT 450#ifdef DEBUG_STRICT
384 assert (optList[i].opt != NULL); 451 assert (optList[i].opt != NULL);
385#endif 452#endif
386 rxvt_log (" %s%s %-*s%s%s\n", 453 rxvt_log (" %s%s %-*s%s%s\n",
387 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 454 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
388 (INDENT - STRLEN (optList[i].opt) 455 (INDENT - strlen (optList[i].opt)
389 + (optList_isBool (i) ? 0 : 2)), 456 + (optList_isBool (i) ? 0 : 2)),
390 (optList[i].arg ? optList[i].arg : ""), 457 (optList[i].arg ? optList[i].arg : ""),
391 (optList_isBool (i) ? "turn on/off " : ""), 458 (optList_isBool (i) ? "turn on/off " : ""),
392 optList[i].desc); 459 optList[i].desc);
393 } 460 }
… …
400 467
401 for (i = 0; i < optList_size (); i++) 468 for (i = 0; i < optList_size (); i++)
402 if (optList[i].kw != NULL) 469 if (optList[i].kw != NULL)
403 rxvt_log (" %s: %*s%s\n", 470 rxvt_log (" %s: %*s%s\n",
404 optList[i].kw, 471 optList[i].kw,
405 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 472 (INDENT - strlen (optList[i].kw)), "", /* XXX */
406 (optList_isBool (i) ? "boolean" : optList[i].arg)); 473 (optList_isBool (i) ? "boolean" : optList[i].arg));
407#ifdef KEYSYM_RESOURCE 474#ifdef KEYSYM_RESOURCE
408 rxvt_log (" " "keysym.sym" ": %*s%s\n", 475 rxvt_log (" " "keysym.sym" ": %*s%s\n",
409 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 476 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
410 "keysym"); 477 "keysym");
… …
453 bad_option = 1; 520 bad_option = 1;
454 rxvt_warn ("\"%s\": malformed option.\n", opt); 521 rxvt_warn ("\"%s\": malformed option.\n", opt);
455 continue; 522 continue;
456 } 523 }
457 524
458 if (!STRCMP (opt, "help")) 525 if (!strcmp (opt, "help"))
459 rxvt_usage (longopt ? 2 : 1); 526 rxvt_usage (longopt ? 2 : 1);
460 if (!STRCMP (opt, "h")) 527 if (!strcmp (opt, "h"))
461 rxvt_usage (0); 528 rxvt_usage (0);
462 529
463 /* feature: always try to match long-options */ 530 /* feature: always try to match long-options */
464 for (entry = 0; entry < optList_size (); entry++) 531 for (entry = 0; entry < optList_size (); entry++)
465 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 532 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
466 || (!longopt 533 || (!longopt
467 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 534 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
468 break; 535 break;
469 536
470 if (entry < optList_size ()) 537 if (entry < optList_size ())
471 { 538 {
472 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
… …
489#ifdef DEBUG_RESOURCES 556#ifdef DEBUG_RESOURCES
490 fprintf (stderr, "boolean (%s,%s) = %s\n", 557 fprintf (stderr, "boolean (%s,%s) = %s\n",
491 optList[entry].opt, optList[entry].kw, flag); 558 optList[entry].opt, optList[entry].kw, flag);
492#endif 559#endif
493 if (flag == On) 560 if (flag == On)
494 Options |= (optList[entry].flag); 561 options |= (optList[entry].flag);
495 else 562 else
496 Options &= ~ (optList[entry].flag); 563 options &= ~ (optList[entry].flag);
497 564
498 if (optList[entry].doff != -1) 565 if (optList[entry].doff != -1)
499 rs[optList[entry].doff] = flag; 566 rs[optList[entry].doff] = flag;
500 } 567 }
501 } 568 }
502 else 569 else
503#ifdef KEYSYM_RESOURCE 570#ifdef KEYSYM_RESOURCE
504 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 571 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
505 if (rxvt_Str_match (opt, "keysym.")) 572 if (rxvt_Str_match (opt, "keysym."))
506 { 573 {
507 const char *str = argv[++i]; 574 const char *str = argv[++i];
508 575
509 if (str != NULL) 576 if (str != NULL)
… …
578 { 645 {
579 if (str[0] == '0' && toupper (str[1]) == 'X') 646 if (str[0] == '0' && toupper (str[1]) == 'X')
580 str += 2; 647 str += 2;
581 if (arg) 648 if (arg)
582 { 649 {
583 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 650 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
584 return -1; 651 return -1;
585 } 652 }
586 else 653 else
587 { 654 {
588 if (sscanf (str, "%x:", &sym) != 1) 655 if (sscanf (str, "%x:", &sym) != 1)
589 return -1; 656 return -1;
590 657
591 /* cue to ':', it's there since sscanf () worked */ 658 /* cue to ':', it's there since sscanf () worked */
592 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 659 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
593 newargstr[NEWARGLIM - 1] = '\0'; 660 newargstr[NEWARGLIM - 1] = '\0';
594 newarg = newargstr; 661 newarg = newargstr;
595 } 662 }
596 } 663 }
597 else 664 else
598 { 665 {
599 /* 666 /*
600 * convert keysym name to keysym number 667 * convert keysym name to keysym number
601 */ 668 */
602 STRNCPY (newargstr, str, NEWARGLIM - 1); 669 strncpy (newargstr, str, NEWARGLIM - 1);
603 newargstr[NEWARGLIM - 1] = '\0'; 670 newargstr[NEWARGLIM - 1] = '\0';
604 if (arg == NULL) 671 if (arg == NULL)
605 { 672 {
606 if ((newarg = STRCHR (newargstr, ':')) == NULL) 673 if ((newarg = strchr (newargstr, ':')) == NULL)
607 return -1; 674 return -1;
608 *newarg++ = '\0'; /* terminate keysym name */ 675 *newarg++ = '\0'; /* terminate keysym name */
609 } 676 }
610 if ((sym = XStringToKeysym (newargstr)) == None) 677 if ((sym = XStringToKeysym (newargstr)) == None)
611 return -1; 678 return -1;
… …
617 if (Keysym_map[sym] != NULL) /* already set ? */ 684 if (Keysym_map[sym] != NULL) /* already set ? */
618 return -1; 685 return -1;
619 686
620 if (newarg == NULL) 687 if (newarg == NULL)
621 { 688 {
622 STRNCPY (newargstr, arg, NEWARGLIM - 1); 689 strncpy (newargstr, arg, NEWARGLIM - 1);
623 newargstr[NEWARGLIM - 1] = '\0'; 690 newargstr[NEWARGLIM - 1] = '\0';
624 newarg = newargstr; 691 newarg = newargstr;
625 } 692 }
626 rxvt_Str_trim (newarg); 693 rxvt_Str_trim (newarg);
627 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 694 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
628 return -1; 695 return -1;
629 MIN_IT (n, 255); 696 MIN_IT (n, 255);
630 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 697 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
631 698
632 key_string[0] = n; 699 key_string[0] = n;
633 STRNCPY (key_string + 1, newarg, n); 700 strncpy (key_string + 1, newarg, n);
634 Keysym_map[sym] = (unsigned char *)key_string; 701 Keysym_map[sym] = (unsigned char *)key_string;
635 702
636 return 1; 703 return 1;
637} 704}
638 705
… …
650 char *str, buffer[256]; 717 char *str, buffer[256];
651 718
652 if (stream == NULL) 719 if (stream == NULL)
653 return; 720 return;
654 721
655 len = STRLEN (name); 722 len = strlen (name);
656 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 723 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
657 { 724 {
658 unsigned int entry, n; 725 unsigned int entry, n;
659 726
660 while (*str && isspace (*str)) 727 while (*str && isspace (*str))
661 str++; /* leading whitespace */ 728 str++; /* leading whitespace */
662 729
663 if ((str[len] != '*' && str[len] != '.') 730 if ((str[len] != '*' && str[len] != '.')
664 || (len && STRNCMP (str, name, len))) 731 || (len && strncmp (str, name, len)))
665 continue; 732 continue;
666 str += (len + 1); /* skip `name*' or `name.' */ 733 str += (len + 1); /* skip `name*' or `name.' */
667 734
668# ifdef KEYSYM_RESOURCE 735# ifdef KEYSYM_RESOURCE
669 if (!parse_keysym (str, NULL)) 736 if (!parse_keysym (str, NULL))
… …
673 const char *kw = optList[entry].kw; 740 const char *kw = optList[entry].kw;
674 741
675 if (kw == NULL) 742 if (kw == NULL)
676 continue; 743 continue;
677 744
678 n = STRLEN (kw); 745 n = strlen (kw);
679 if (str[n] == ':' && rxvt_Str_match (str, kw)) 746 if (str[n] == ':' && rxvt_Str_match (str, kw))
680 { 747 {
681 /* skip `keyword:' */ 748 /* skip `keyword:' */
682 str += n + 1; 749 str += n + 1;
683 rxvt_Str_trim (str); 750 rxvt_Str_trim (str);
684 n = STRLEN (str); 751 n = strlen (str);
685 if (n && rs[optList[entry].doff] == NULL) 752 if (n && rs[optList[entry].doff] == NULL)
686 { 753 {
687 /* not already set */ 754 /* not already set */
688 int s; 755 int s;
689 char *p = 0; 756 char *p = 0;
690 757
691 for (int o = 0;;) 758 for (int o = 0;;)
692 { 759 {
693 p = (char *)rxvt_realloc (p, o + n + 1); 760 p = (char *)rxvt_realloc (p, o + n + 1);
694 MEMCPY (p + o, str, n); 761 memcpy (p + o, str, n);
695 o += n; 762 o += n;
696 p[o] = 0; 763 p[o] = 0;
697 764
698 if (o == 0 || p[o - 1] != '\\') // continuation line 765 if (o == 0 || p[o - 1] != '\\') // continuation line
699 break; 766 break;
… …
702 769
703 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 770 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
704 break; 771 break;
705 772
706 rxvt_Str_trim (str); 773 rxvt_Str_trim (str);
707 n = STRLEN (str); 774 n = strlen (str);
708 } 775 }
709 776
710 rs[optList[entry].doff] = p; 777 rs[optList[entry].doff] = p;
711 allocated.push_back (p); 778 allocated.push_back (p);
712 779
713 if (optList_isBool (entry)) 780 if (optList_isBool (entry))
714 { 781 {
715 s = STRCASECMP (str, "TRUE") == 0 782 s = strcasecmp (str, "TRUE") == 0
716 || STRCASECMP (str, "YES") == 0 783 || strcasecmp (str, "YES") == 0
717 || STRCASECMP (str, "ON") == 0 784 || strcasecmp (str, "ON") == 0
718 || STRCASECMP (str, "1") == 0; 785 || strcasecmp (str, "1") == 0;
719 786
720 if (optList_isReverse (entry)) 787 if (optList_isReverse (entry))
721 s = !s; 788 s = !s;
722 789
723 if (s) 790 if (s)
724 Options |= optList[entry].flag; 791 options |= optList[entry].flag;
725 else 792 else
726 Options &= ~optList[entry].flag; 793 options &= ~optList[entry].flag;
727 } 794 }
728 } 795 }
729 796
730 break; 797 break;
731 } 798 }
… …
790 database = XrmGetStringDatabase (displayResource); 857 database = XrmGetStringDatabase (displayResource);
791 858
792# ifdef HAVE_EXTRA_XRESOURCE_FILES 859# ifdef HAVE_EXTRA_XRESOURCE_FILES
793 /* Add in ~/.Xdefaults or ~/.Xresources */ 860 /* Add in ~/.Xdefaults or ~/.Xresources */
794 { 861 {
795 char *ptr; 862 char *ptr;
796 863
797 if ((ptr = (char *)getenv ("HOME")) == NULL) 864 if ((ptr = (char *)getenv ("HOME")) == NULL)
798 ptr = "."; 865 ptr = ".";
799 866
800 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 867 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
801 { 868 {
802 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 869 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
803 ptr, xnames[i]); 870 ptr, xnames[i]);
804 if ((rdb1 = XrmGetFileDatabase (fname))) 871 if ((rdb1 = XrmGetFileDatabase (fname)))
805 { 872 {
806 XrmMergeDatabases (rdb1, &database); 873 XrmMergeDatabases (rdb1, &database);
807# ifndef HAVE_BOTH_XRESOURCE_FILES 874# ifndef HAVE_BOTH_XRESOURCE_FILES
… …
852 if (kw == NULL || rs[optList[entry].doff] != NULL) 919 if (kw == NULL || rs[optList[entry].doff] != NULL)
853 continue; /* previously set */ 920 continue; /* previously set */
854 921
855 p = XGetDefault (display, name, kw); 922 p = XGetDefault (display, name, kw);
856 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 923 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
857 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 924 if (p == NULL || (p0 && strcmp (p, p0) == 0))
858 { 925 {
859 p = XGetDefault (display, RESCLASS, kw); 926 p = XGetDefault (display, RESCLASS, kw);
860#ifdef RESFALLBACK 927#ifdef RESFALLBACK
861 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 928 if (p == NULL || (p0 && strcmp (p, p0) == 0))
862 p = XGetDefault (display, RESFALLBACK, kw); 929 p = XGetDefault (display, RESFALLBACK, kw);
863#endif 930#endif
864 } 931 }
865 932
866 if (p == NULL && p0) 933 if (p == NULL && p0)
… …
870 { 937 {
871 rs[optList[entry].doff] = p; 938 rs[optList[entry].doff] = p;
872 939
873 if (optList_isBool (entry)) 940 if (optList_isBool (entry))
874 { 941 {
875 s = STRCASECMP (p, "TRUE") == 0 942 s = strcasecmp (p, "TRUE") == 0
876 || STRCASECMP (p, "YES") == 0 943 || strcasecmp (p, "YES") == 0
877 || STRCASECMP (p, "ON") == 0 944 || strcasecmp (p, "ON") == 0
878 || STRCASECMP (p, "1") == 0; 945 || strcasecmp (p, "1") == 0;
879 if (optList_isReverse (entry)) 946 if (optList_isReverse (entry))
880 s = !s; 947 s = !s;
881 if (s) 948 if (s)
882 Options |= (optList[entry].flag); 949 options |= (optList[entry].flag);
883 else 950 else
884 Options &= ~ (optList[entry].flag); 951 options &= ~ (optList[entry].flag);
885 } 952 }
886 } 953 }
887 } 954 }
888 955
889 /* 956 /*
… …
917 FILE *fd = NULL; 984 FILE *fd = NULL;
918 char *home; 985 char *home;
919 986
920 if ((home = getenv ("HOME")) != NULL) 987 if ((home = getenv ("HOME")) != NULL)
921 { 988 {
922 unsigned int i, len = STRLEN (home) + 2; 989 unsigned int i, len = strlen (home) + 2;
923 char *f = NULL; 990 char *f = NULL;
924 991
925 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 992 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
926 { 993 {
927 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char)); 994 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
928 995
929 sprintf (f, "%s/%s", home, xnames[i]); 996 sprintf (f, "%s/%s", home, xnames[i]);
930 997
931 if ((fd = fopen (f, "r")) != NULL) 998 if ((fd = fopen (f, "r")) != NULL)
932 break; 999 break;

Diff Legend

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