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.30 by root, Fri Aug 13 03:36:57 2004 UTC vs.
Revision 1.40 by root, Sun Aug 22 01:45:12 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() \
… …
110#if TINTING 109#if TINTING
111 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 110 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
112#endif 111#endif
113#endif 112#endif
114#ifdef OFF_FOCUS_FADING 113#ifdef OFF_FOCUS_FADING
115 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when urxvt is losing focus."), 114 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."),
116#endif 115#endif
117#ifdef TINTING 116#ifdef TINTING
118 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), 117 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
119#endif 118#endif
120 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 119 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
… …
128 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 127 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
129#endif 128#endif
130#ifdef MOUSE_WHEEL 129#ifdef MOUSE_WHEEL
131 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 130 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
132#endif 131#endif
133#ifndef NO_FRILLS 132#if ENABLE_FRILLS
134 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 133 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
135 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 134 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
136#endif 135#endif
137#ifdef CURSOR_BLINK 136#ifdef CURSOR_BLINK
138 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 137 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
… …
159 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 158 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
160 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 159 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
161 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
162#endif /* NO_BRIGHTCOLOR */ 161#endif /* NO_BRIGHTCOLOR */
163#ifndef NO_BOLD_UNDERLINE_REVERSE 162#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"), 163 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
164 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
166 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 165 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
167 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 166 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
168#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 167#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
169#ifdef KEEP_SCROLLCOLOR 168#ifdef KEEP_SCROLLCOLOR
170 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 169 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
… …
180 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 179 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
181#endif /* XPM_BACKGROUND */ 180#endif /* XPM_BACKGROUND */
182#if (MENUBAR_MAX) 181#if (MENUBAR_MAX)
183 RSTRG (Rs_menu, "menu", "name[;tag]"), 182 RSTRG (Rs_menu, "menu", "name[;tag]"),
184#endif 183#endif
184 /* fonts: command-line option = resource name */
185 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 185 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
186 /* fonts: command-line option = resource name */ 186#if ENABLE_STYLES
187 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
188 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
189 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
190#endif
187#ifdef USE_XIM 191#ifdef USE_XIM
188 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 192 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
189 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 193 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
190#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 194#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
191 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 195 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
… …
202#endif /* NO_CURSORCOLOR */ 206#endif /* NO_CURSORCOLOR */
203 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 207 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
204 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 208 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
205 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 209 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
206 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 210 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
207#ifndef NO_FRILLS 211#if ENABLE_FRILLS
208 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 212 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
209 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 213 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
210 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 214 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
211 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 215 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
212 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 216 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
… …
250#undef RSTRG 254#undef RSTRG
251#undef SWCH 255#undef SWCH
252#undef BOOL 256#undef BOOL
253/*}}} */ 257/*}}} */
254 258
255static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 259static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
256static const char optionsstring[] = "Options: " 260static const char optionsstring[] = "options: "
257#if XFT 261#if XFT
258 "xft," 262 "xft,"
263#endif
264#if ENABLE_STYLES
265 "styles,"
266#endif
267#if ENABLE_COMBINING
268 "combining,"
269#endif
270#if TEXT_BLINK
271 "blink,"
272#endif
273#if ISO_14755
274 "iso14755,"
259#endif 275#endif
260#if UNICODE_3 276#if UNICODE_3
261 "unicode3," 277 "unicode3,"
262#endif 278#endif
263 "encodings=eu+vn" 279 "encodings=eu+vn"
… …
275#endif 291#endif
276#if ENCODING_CN_EXT 292#if ENCODING_CN_EXT
277 "+cn-ext" 293 "+cn-ext"
278#endif 294#endif
279 "," 295 ","
280#if ENABLE_COMBINING
281 "combining,"
282#endif
283#if TEXT_BLINK
284 "blink,"
285#endif
286#if OFF_FOCUS_FADING 296#if OFF_FOCUS_FADING
287 "fade," 297 "fade,"
288#endif 298#endif
289#if defined(XPM_BACKGROUND) 299#if defined(XPM_BACKGROUND)
290 "XPM," 300 "XPM,"
… …
341 "8bitctrls," 351 "8bitctrls,"
342#endif 352#endif
343#if !defined(NO_STRINGS) 353#if !defined(NO_STRINGS)
344 "strings," 354 "strings,"
345#endif 355#endif
346#if !defined(NO_FRILLS) 356#if defined(ENABLE_FRILLS)
347 "frills," 357 "frills,"
348#endif 358#endif
349#if !defined(NO_LINESPACE) 359#if !defined(NO_LINESPACE)
350 "linespace," 360 "linespace,"
351#endif 361#endif
… …
361#if MOUSE_SLIP_WHEELING 371#if MOUSE_SLIP_WHEELING
362 "slipwheel," 372 "slipwheel,"
363#endif 373#endif
364#if defined(SMART_RESIZE) 374#if defined(SMART_RESIZE)
365 "smart-resize," 375 "smart-resize,"
366#endif
367#if defined(TTY_256COLOR)
368 "256colour,"
369#endif 376#endif
370#if defined(CURSOR_BLINK) 377#if defined(CURSOR_BLINK)
371 "cursorBlink," 378 "cursorBlink,"
372#endif 379#endif
373#if defined(POINTER_BLANK) 380#if defined(POINTER_BLANK)
… …
412 len++; /* account for space */ 419 len++; /* account for space */
413 } 420 }
414#ifdef DEBUG_STRICT 421#ifdef DEBUG_STRICT
415 assert (optList[i].opt != NULL); 422 assert (optList[i].opt != NULL);
416#endif 423#endif
417 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 424 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
418 col += len; 425 col += len;
419 if (col > 79) 426 if (col > 79)
420 { /* assume regular width */ 427 { /* assume regular width */
421 rxvt_log ("\n"); 428 rxvt_log ("\n");
422 col = 1 + len; 429 col = 1 + len;
… …
439#ifdef DEBUG_STRICT 446#ifdef DEBUG_STRICT
440 assert (optList[i].opt != NULL); 447 assert (optList[i].opt != NULL);
441#endif 448#endif
442 rxvt_log (" %s%s %-*s%s%s\n", 449 rxvt_log (" %s%s %-*s%s%s\n",
443 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 450 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
444 (INDENT - STRLEN (optList[i].opt) 451 (INDENT - strlen (optList[i].opt)
445 + (optList_isBool (i) ? 0 : 2)), 452 + (optList_isBool (i) ? 0 : 2)),
446 (optList[i].arg ? optList[i].arg : ""), 453 (optList[i].arg ? optList[i].arg : ""),
447 (optList_isBool (i) ? "turn on/off " : ""), 454 (optList_isBool (i) ? "turn on/off " : ""),
448 optList[i].desc); 455 optList[i].desc);
449 } 456 }
… …
456 463
457 for (i = 0; i < optList_size (); i++) 464 for (i = 0; i < optList_size (); i++)
458 if (optList[i].kw != NULL) 465 if (optList[i].kw != NULL)
459 rxvt_log (" %s: %*s%s\n", 466 rxvt_log (" %s: %*s%s\n",
460 optList[i].kw, 467 optList[i].kw,
461 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 468 (INDENT - strlen (optList[i].kw)), "", /* XXX */
462 (optList_isBool (i) ? "boolean" : optList[i].arg)); 469 (optList_isBool (i) ? "boolean" : optList[i].arg));
463#ifdef KEYSYM_RESOURCE 470#ifdef KEYSYM_RESOURCE
464 rxvt_log (" " "keysym.sym" ": %*s%s\n", 471 rxvt_log (" " "keysym.sym" ": %*s%s\n",
465 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 472 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
466 "keysym"); 473 "keysym");
… …
509 bad_option = 1; 516 bad_option = 1;
510 rxvt_warn ("\"%s\": malformed option.\n", opt); 517 rxvt_warn ("\"%s\": malformed option.\n", opt);
511 continue; 518 continue;
512 } 519 }
513 520
514 if (!STRCMP (opt, "help")) 521 if (!strcmp (opt, "help"))
515 rxvt_usage (longopt ? 2 : 1); 522 rxvt_usage (longopt ? 2 : 1);
516 if (!STRCMP (opt, "h")) 523 if (!strcmp (opt, "h"))
517 rxvt_usage (0); 524 rxvt_usage (0);
518 525
519 /* feature: always try to match long-options */ 526 /* feature: always try to match long-options */
520 for (entry = 0; entry < optList_size (); entry++) 527 for (entry = 0; entry < optList_size (); entry++)
521 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 528 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
522 || (!longopt 529 || (!longopt
523 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 530 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
524 break; 531 break;
525 532
526 if (entry < optList_size ()) 533 if (entry < optList_size ())
527 { 534 {
528 if (optList_isReverse (entry)) 535 if (optList_isReverse (entry))
… …
545#ifdef DEBUG_RESOURCES 552#ifdef DEBUG_RESOURCES
546 fprintf (stderr, "boolean (%s,%s) = %s\n", 553 fprintf (stderr, "boolean (%s,%s) = %s\n",
547 optList[entry].opt, optList[entry].kw, flag); 554 optList[entry].opt, optList[entry].kw, flag);
548#endif 555#endif
549 if (flag == On) 556 if (flag == On)
550 Options |= (optList[entry].flag); 557 options |= (optList[entry].flag);
551 else 558 else
552 Options &= ~ (optList[entry].flag); 559 options &= ~ (optList[entry].flag);
553 560
554 if (optList[entry].doff != -1) 561 if (optList[entry].doff != -1)
555 rs[optList[entry].doff] = flag; 562 rs[optList[entry].doff] = flag;
556 } 563 }
557 } 564 }
558 else 565 else
559#ifdef KEYSYM_RESOURCE 566#ifdef KEYSYM_RESOURCE
560 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 567 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
561 if (rxvt_Str_match (opt, "keysym.")) 568 if (rxvt_Str_match (opt, "keysym."))
562 { 569 {
563 const char *str = argv[++i]; 570 const char *str = argv[++i];
564 571
565 if (str != NULL) 572 if (str != NULL)
… …
634 { 641 {
635 if (str[0] == '0' && toupper (str[1]) == 'X') 642 if (str[0] == '0' && toupper (str[1]) == 'X')
636 str += 2; 643 str += 2;
637 if (arg) 644 if (arg)
638 { 645 {
639 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 646 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
640 return -1; 647 return -1;
641 } 648 }
642 else 649 else
643 { 650 {
644 if (sscanf (str, "%x:", &sym) != 1) 651 if (sscanf (str, "%x:", &sym) != 1)
645 return -1; 652 return -1;
646 653
647 /* cue to ':', it's there since sscanf () worked */ 654 /* cue to ':', it's there since sscanf () worked */
648 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 655 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
649 newargstr[NEWARGLIM - 1] = '\0'; 656 newargstr[NEWARGLIM - 1] = '\0';
650 newarg = newargstr; 657 newarg = newargstr;
651 } 658 }
652 } 659 }
653 else 660 else
654 { 661 {
655 /* 662 /*
656 * convert keysym name to keysym number 663 * convert keysym name to keysym number
657 */ 664 */
658 STRNCPY (newargstr, str, NEWARGLIM - 1); 665 strncpy (newargstr, str, NEWARGLIM - 1);
659 newargstr[NEWARGLIM - 1] = '\0'; 666 newargstr[NEWARGLIM - 1] = '\0';
660 if (arg == NULL) 667 if (arg == NULL)
661 { 668 {
662 if ((newarg = STRCHR (newargstr, ':')) == NULL) 669 if ((newarg = strchr (newargstr, ':')) == NULL)
663 return -1; 670 return -1;
664 *newarg++ = '\0'; /* terminate keysym name */ 671 *newarg++ = '\0'; /* terminate keysym name */
665 } 672 }
666 if ((sym = XStringToKeysym (newargstr)) == None) 673 if ((sym = XStringToKeysym (newargstr)) == None)
667 return -1; 674 return -1;
… …
673 if (Keysym_map[sym] != NULL) /* already set ? */ 680 if (Keysym_map[sym] != NULL) /* already set ? */
674 return -1; 681 return -1;
675 682
676 if (newarg == NULL) 683 if (newarg == NULL)
677 { 684 {
678 STRNCPY (newargstr, arg, NEWARGLIM - 1); 685 strncpy (newargstr, arg, NEWARGLIM - 1);
679 newargstr[NEWARGLIM - 1] = '\0'; 686 newargstr[NEWARGLIM - 1] = '\0';
680 newarg = newargstr; 687 newarg = newargstr;
681 } 688 }
682 rxvt_Str_trim (newarg); 689 rxvt_Str_trim (newarg);
683 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 690 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
684 return -1; 691 return -1;
685 MIN_IT (n, 255); 692 MIN_IT (n, 255);
686 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 693 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
687 694
688 key_string[0] = n; 695 key_string[0] = n;
689 STRNCPY (key_string + 1, newarg, n); 696 strncpy (key_string + 1, newarg, n);
690 Keysym_map[sym] = (unsigned char *)key_string; 697 Keysym_map[sym] = (unsigned char *)key_string;
691 698
692 return 1; 699 return 1;
693} 700}
694 701
… …
706 char *str, buffer[256]; 713 char *str, buffer[256];
707 714
708 if (stream == NULL) 715 if (stream == NULL)
709 return; 716 return;
710 717
711 len = STRLEN (name); 718 len = strlen (name);
712 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 719 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
713 { 720 {
714 unsigned int entry, n; 721 unsigned int entry, n;
715 722
716 while (*str && isspace (*str)) 723 while (*str && isspace (*str))
717 str++; /* leading whitespace */ 724 str++; /* leading whitespace */
718 725
719 if ((str[len] != '*' && str[len] != '.') 726 if ((str[len] != '*' && str[len] != '.')
720 || (len && STRNCMP (str, name, len))) 727 || (len && strncmp (str, name, len)))
721 continue; 728 continue;
722 str += (len + 1); /* skip `name*' or `name.' */ 729 str += (len + 1); /* skip `name*' or `name.' */
723 730
724# ifdef KEYSYM_RESOURCE 731# ifdef KEYSYM_RESOURCE
725 if (!parse_keysym (str, NULL)) 732 if (!parse_keysym (str, NULL))
… …
729 const char *kw = optList[entry].kw; 736 const char *kw = optList[entry].kw;
730 737
731 if (kw == NULL) 738 if (kw == NULL)
732 continue; 739 continue;
733 740
734 n = STRLEN (kw); 741 n = strlen (kw);
735 if (str[n] == ':' && rxvt_Str_match (str, kw)) 742 if (str[n] == ':' && rxvt_Str_match (str, kw))
736 { 743 {
737 /* skip `keyword:' */ 744 /* skip `keyword:' */
738 str += n + 1; 745 str += n + 1;
739 rxvt_Str_trim (str); 746 rxvt_Str_trim (str);
740 n = STRLEN (str); 747 n = strlen (str);
741 if (n && rs[optList[entry].doff] == NULL) 748 if (n && rs[optList[entry].doff] == NULL)
742 { 749 {
743 /* not already set */ 750 /* not already set */
744 int s; 751 int s;
745 char *p = 0; 752 char *p = 0;
746 753
747 for (int o = 0;;) 754 for (int o = 0;;)
748 { 755 {
749 p = (char *)rxvt_realloc (p, o + n + 1); 756 p = (char *)rxvt_realloc (p, o + n + 1);
750 MEMCPY (p + o, str, n); 757 memcpy (p + o, str, n);
751 o += n; 758 o += n;
752 p[o] = 0; 759 p[o] = 0;
753 760
754 if (o == 0 || p[o - 1] != '\\') // continuation line 761 if (o == 0 || p[o - 1] != '\\') // continuation line
755 break; 762 break;
… …
758 765
759 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 766 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
760 break; 767 break;
761 768
762 rxvt_Str_trim (str); 769 rxvt_Str_trim (str);
763 n = STRLEN (str); 770 n = strlen (str);
764 } 771 }
765 772
766 rs[optList[entry].doff] = p; 773 rs[optList[entry].doff] = p;
767 allocated.push_back (p); 774 allocated.push_back (p);
768 775
769 if (optList_isBool (entry)) 776 if (optList_isBool (entry))
770 { 777 {
771 s = STRCASECMP (str, "TRUE") == 0 778 s = strcasecmp (str, "TRUE") == 0
772 || STRCASECMP (str, "YES") == 0 779 || strcasecmp (str, "YES") == 0
773 || STRCASECMP (str, "ON") == 0 780 || strcasecmp (str, "ON") == 0
774 || STRCASECMP (str, "1") == 0; 781 || strcasecmp (str, "1") == 0;
775 782
776 if (optList_isReverse (entry)) 783 if (optList_isReverse (entry))
777 s = !s; 784 s = !s;
778 785
779 if (s) 786 if (s)
780 Options |= optList[entry].flag; 787 options |= optList[entry].flag;
781 else 788 else
782 Options &= ~optList[entry].flag; 789 options &= ~optList[entry].flag;
783 } 790 }
784 } 791 }
785 792
786 break; 793 break;
787 } 794 }
… …
846 database = XrmGetStringDatabase (displayResource); 853 database = XrmGetStringDatabase (displayResource);
847 854
848# ifdef HAVE_EXTRA_XRESOURCE_FILES 855# ifdef HAVE_EXTRA_XRESOURCE_FILES
849 /* Add in ~/.Xdefaults or ~/.Xresources */ 856 /* Add in ~/.Xdefaults or ~/.Xresources */
850 { 857 {
851 char *ptr; 858 char *ptr;
852 859
853 if ((ptr = (char *)getenv ("HOME")) == NULL) 860 if ((ptr = (char *)getenv ("HOME")) == NULL)
854 ptr = "."; 861 ptr = ".";
855 862
856 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 863 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
857 { 864 {
858 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 865 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
859 ptr, xnames[i]); 866 ptr, xnames[i]);
860 if ((rdb1 = XrmGetFileDatabase (fname))) 867 if ((rdb1 = XrmGetFileDatabase (fname)))
861 { 868 {
862 XrmMergeDatabases (rdb1, &database); 869 XrmMergeDatabases (rdb1, &database);
863# ifndef HAVE_BOTH_XRESOURCE_FILES 870# ifndef HAVE_BOTH_XRESOURCE_FILES
… …
908 if (kw == NULL || rs[optList[entry].doff] != NULL) 915 if (kw == NULL || rs[optList[entry].doff] != NULL)
909 continue; /* previously set */ 916 continue; /* previously set */
910 917
911 p = XGetDefault (display, name, kw); 918 p = XGetDefault (display, name, kw);
912 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 919 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
913 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 920 if (p == NULL || (p0 && strcmp (p, p0) == 0))
914 { 921 {
915 p = XGetDefault (display, RESCLASS, kw); 922 p = XGetDefault (display, RESCLASS, kw);
916#ifdef RESFALLBACK 923#ifdef RESFALLBACK
917 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 924 if (p == NULL || (p0 && strcmp (p, p0) == 0))
918 p = XGetDefault (display, RESFALLBACK, kw); 925 p = XGetDefault (display, RESFALLBACK, kw);
919#endif 926#endif
920 } 927 }
921 928
922 if (p == NULL && p0) 929 if (p == NULL && p0)
… …
926 { 933 {
927 rs[optList[entry].doff] = p; 934 rs[optList[entry].doff] = p;
928 935
929 if (optList_isBool (entry)) 936 if (optList_isBool (entry))
930 { 937 {
931 s = STRCASECMP (p, "TRUE") == 0 938 s = strcasecmp (p, "TRUE") == 0
932 || STRCASECMP (p, "YES") == 0 939 || strcasecmp (p, "YES") == 0
933 || STRCASECMP (p, "ON") == 0 940 || strcasecmp (p, "ON") == 0
934 || STRCASECMP (p, "1") == 0; 941 || strcasecmp (p, "1") == 0;
935 if (optList_isReverse (entry)) 942 if (optList_isReverse (entry))
936 s = !s; 943 s = !s;
937 if (s) 944 if (s)
938 Options |= (optList[entry].flag); 945 options |= (optList[entry].flag);
939 else 946 else
940 Options &= ~ (optList[entry].flag); 947 options &= ~ (optList[entry].flag);
941 } 948 }
942 } 949 }
943 } 950 }
944 951
945 /* 952 /*
… …
973 FILE *fd = NULL; 980 FILE *fd = NULL;
974 char *home; 981 char *home;
975 982
976 if ((home = getenv ("HOME")) != NULL) 983 if ((home = getenv ("HOME")) != NULL)
977 { 984 {
978 unsigned int i, len = STRLEN (home) + 2; 985 unsigned int i, len = strlen (home) + 2;
979 char *f = NULL; 986 char *f = NULL;
980 987
981 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 988 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
982 { 989 {
983 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char)); 990 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
984 991
985 sprintf (f, "%s/%s", home, xnames[i]); 992 sprintf (f, "%s/%s", home, xnames[i]);
986 993
987 if ((fd = fopen (f, "r")) != NULL) 994 if ((fd = fopen (f, "r")) != NULL)
988 break; 995 break;

Diff Legend

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