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.25 by root, Mon Jul 26 14:57:12 2004 UTC vs.
Revision 1.34 by root, Sun Aug 15 22:09:24 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() \
… …
109 SWCH ("tr", Opt_transparent, NULL), 108 SWCH ("tr", Opt_transparent, NULL),
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
113#ifdef OFF_FOCUS_FADING
114 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when urxvt is losing focus."),
115#endif
116#ifdef TINTING
117 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
118#endif
114 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 119 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
115#ifndef NO_BELL 120#ifndef NO_BELL
116 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 121 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
117# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 122# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
118 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 123 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL),
… …
122 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 127 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
123#endif 128#endif
124#ifdef MOUSE_WHEEL 129#ifdef MOUSE_WHEEL
125 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 130 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
126#endif 131#endif
127#ifndef NO_FRILLS 132#if ENABLE_FRILLS
128 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 133 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
129 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"),
130#endif 135#endif
131#ifdef CURSOR_BLINK 136#ifdef CURSOR_BLINK
132 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 137 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
… …
196#endif /* NO_CURSORCOLOR */ 201#endif /* NO_CURSORCOLOR */
197 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 202 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
198 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 203 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
199 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 204 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
200 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 205 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
201#ifndef NO_FRILLS 206#if ENABLE_FRILLS
202 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 207 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
203 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 208 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
204 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 209 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
205 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 210 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
211 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
206#endif 212#endif
207#ifndef NO_LINESPACE 213#ifndef NO_LINESPACE
208 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 214 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
209#endif 215#endif
210 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 216 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
… …
244#undef SWCH 250#undef SWCH
245#undef BOOL 251#undef BOOL
246/*}}} */ 252/*}}} */
247 253
248static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 254static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n";
249static const char optionsstring[] = "Options: " 255static const char optionsstring[] = "options: "
256#if XFT
257 "xft,"
258#endif
259#if UNICODE_3
260 "unicode3,"
261#endif
262 "encodings=eu+vn"
263#if ENCODING_JP
264 "+jp"
265#endif
266#if ENCODING_JP_EXT
267 "+jp-ext"
268#endif
269#if ENCODING_KR
270 "+kr"
271#endif
272#if ENCODING_CN
273 "+cn"
274#endif
275#if ENCODING_CN_EXT
276 "+cn-ext"
277#endif
278 ","
279#if ENABLE_COMBINING
280 "combining,"
281#endif
282#if TEXT_BLINK
283 "blink,"
284#endif
285#if OFF_FOCUS_FADING
286 "fade,"
287#endif
250#if defined(XPM_BACKGROUND) 288#if defined(XPM_BACKGROUND)
251 "XPM," 289 "XPM,"
252#endif 290#endif
253#if defined(TRANSPARENT) 291#if defined(TRANSPARENT)
254 "transparent," 292 "transparent,"
255#endif 293#endif
294#if TINTING
295 "tint,"
296#endif
256#if defined(UTMP_SUPPORT) 297#if defined(UTMP_SUPPORT)
257 "utmp," 298 "utmp,"
258#endif 299#endif
259#if defined(MENUBAR) 300#if defined(MENUBAR)
260 "menubar," 301 "menubar,"
261#endif
262#if !defined(NO_FRILLS)
263 "frills,"
264#endif
265#if !defined(NO_LINESPACE)
266 "linespace,"
267#endif
268#if defined(PREFER_24BIT)
269 "24bit,"
270#endif 302#endif
271#if defined(USE_XIM) 303#if defined(USE_XIM)
272 "XIM," 304 "XIM,"
273#endif 305#endif
274 "scrollbars=" 306 "scrollbars="
… …
302 "no_backspace," 334 "no_backspace,"
303#endif 335#endif
304#if defined(NO_DELETE_KEY) 336#if defined(NO_DELETE_KEY)
305 "no_delete," 337 "no_delete,"
306#endif 338#endif
339#if EIGHT_BIT_CONTROLS
340 "8bitctrls,"
341#endif
307#if !defined(NO_STRINGS) 342#if !defined(NO_STRINGS)
308 "strings," 343 "strings,"
309#endif 344#endif
345#if defined(ENABLE_FRILLS)
346 "frills,"
347#endif
348#if !defined(NO_LINESPACE)
349 "linespace,"
350#endif
351#if defined(PREFER_24BIT)
352 "24bit,"
353#endif
354#if defined(SELECTION_SCROLLING)
355 "selectionscrolling,"
356#endif
357#if MOUSE_WHEEL
358 "wheel,"
359#endif
360#if MOUSE_SLIP_WHEELING
361 "slipwheel,"
362#endif
363#if defined(SMART_RESIZE)
364 "smart-resize,"
365#endif
310#if defined(TTY_256COLOR) 366#if defined(TTY_256COLOR)
311 "256colour," 367 "256colour,"
368#endif
369#if defined(CURSOR_BLINK)
370 "cursorBlink,"
371#endif
372#if defined(POINTER_BLANK)
373 "pointerBlank,"
312#endif 374#endif
313#if defined(NO_RESOURCES) 375#if defined(NO_RESOURCES)
314 "NoResources" 376 "NoResources"
315#else 377#else
316# if defined(USE_XGETDEFAULT) 378# if defined(USE_XGETDEFAULT)
… …
349 len++; /* account for space */ 411 len++; /* account for space */
350 } 412 }
351#ifdef DEBUG_STRICT 413#ifdef DEBUG_STRICT
352 assert (optList[i].opt != NULL); 414 assert (optList[i].opt != NULL);
353#endif 415#endif
354 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 416 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
355 col += len; 417 col += len;
356 if (col > 79) 418 if (col > 79)
357 { /* assume regular width */ 419 { /* assume regular width */
358 rxvt_log ("\n"); 420 rxvt_log ("\n");
359 col = 1 + len; 421 col = 1 + len;
… …
376#ifdef DEBUG_STRICT 438#ifdef DEBUG_STRICT
377 assert (optList[i].opt != NULL); 439 assert (optList[i].opt != NULL);
378#endif 440#endif
379 rxvt_log (" %s%s %-*s%s%s\n", 441 rxvt_log (" %s%s %-*s%s%s\n",
380 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 442 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
381 (INDENT - STRLEN (optList[i].opt) 443 (INDENT - strlen (optList[i].opt)
382 + (optList_isBool (i) ? 0 : 2)), 444 + (optList_isBool (i) ? 0 : 2)),
383 (optList[i].arg ? optList[i].arg : ""), 445 (optList[i].arg ? optList[i].arg : ""),
384 (optList_isBool (i) ? "turn on/off " : ""), 446 (optList_isBool (i) ? "turn on/off " : ""),
385 optList[i].desc); 447 optList[i].desc);
386 } 448 }
… …
393 455
394 for (i = 0; i < optList_size (); i++) 456 for (i = 0; i < optList_size (); i++)
395 if (optList[i].kw != NULL) 457 if (optList[i].kw != NULL)
396 rxvt_log (" %s: %*s%s\n", 458 rxvt_log (" %s: %*s%s\n",
397 optList[i].kw, 459 optList[i].kw,
398 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 460 (INDENT - strlen (optList[i].kw)), "", /* XXX */
399 (optList_isBool (i) ? "boolean" : optList[i].arg)); 461 (optList_isBool (i) ? "boolean" : optList[i].arg));
400#ifdef KEYSYM_RESOURCE 462#ifdef KEYSYM_RESOURCE
401 rxvt_log (" " "keysym.sym" ": %*s%s\n", 463 rxvt_log (" " "keysym.sym" ": %*s%s\n",
402 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 464 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
403 "keysym"); 465 "keysym");
… …
446 bad_option = 1; 508 bad_option = 1;
447 rxvt_warn ("\"%s\": malformed option.\n", opt); 509 rxvt_warn ("\"%s\": malformed option.\n", opt);
448 continue; 510 continue;
449 } 511 }
450 512
451 if (!STRCMP (opt, "help")) 513 if (!strcmp (opt, "help"))
452 rxvt_usage (longopt ? 2 : 1); 514 rxvt_usage (longopt ? 2 : 1);
453 if (!STRCMP (opt, "h")) 515 if (!strcmp (opt, "h"))
454 rxvt_usage (0); 516 rxvt_usage (0);
455 517
456 /* feature: always try to match long-options */ 518 /* feature: always try to match long-options */
457 for (entry = 0; entry < optList_size (); entry++) 519 for (entry = 0; entry < optList_size (); entry++)
458 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 520 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
459 || (!longopt 521 || (!longopt
460 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 522 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
461 break; 523 break;
462 524
463 if (entry < optList_size ()) 525 if (entry < optList_size ())
464 { 526 {
465 if (optList_isReverse (entry)) 527 if (optList_isReverse (entry))
466 flag = flag == On ? Off : On; 528 flag = flag == On ? Off : On;
529
467 if (optList_strlen (entry)) 530 if (optList_strlen (entry))
468 { /* string value */
469 const char *str = argv[++i];
470
471#ifdef DEBUG_RESOURCES
472 fprintf (stderr, "string (%s,%s) = ",
473 optList[entry].opt ? optList[entry].opt : "nil",
474 optList[entry].kw ? optList[entry].kw : "nil");
475#endif
476 if (flag == On && str && (optList[entry].doff != -1))
477 { 531 {
478#ifdef DEBUG_RESOURCES
479 fprintf (stderr, "\"%s\"\n", str);
480#endif
481 rs[optList[entry].doff] = str;
482 /* 532 /*
483 * special cases are handled in main.c:main () to allow 533 * special cases are handled in main.c:main () to allow
484 * X resources to set these values before we settle for 534 * X resources to set these values before we settle for
485 * default values 535 * default values
486 */ 536 */
487 }
488#ifdef DEBUG_RESOURCES
489 else
490 fprintf (stderr, "???\n");
491#endif
492 537
538 if (optList[entry].doff != -1)
539 rs[optList[entry].doff] = flag == On && argv[i+1]
540 ? argv[++i] : 0;
493 } 541 }
494 else 542 else
495 { /* boolean value */ 543 { /* boolean value */
496#ifdef DEBUG_RESOURCES 544#ifdef DEBUG_RESOURCES
497 fprintf (stderr, "boolean (%s,%s) = %s\n", 545 fprintf (stderr, "boolean (%s,%s) = %s\n",
498 optList[entry].opt, optList[entry].kw, flag); 546 optList[entry].opt, optList[entry].kw, flag);
499#endif 547#endif
500 if (flag == On) 548 if (flag == On)
501 Options |= (optList[entry].flag); 549 options |= (optList[entry].flag);
502 else 550 else
503 Options &= ~ (optList[entry].flag); 551 options &= ~ (optList[entry].flag);
504 552
505 if (optList[entry].doff != -1) 553 if (optList[entry].doff != -1)
506 rs[optList[entry].doff] = flag; 554 rs[optList[entry].doff] = flag;
507 } 555 }
508 } 556 }
509 else 557 else
510#ifdef KEYSYM_RESOURCE 558#ifdef KEYSYM_RESOURCE
511 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 559 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
512 if (rxvt_Str_match (opt, "keysym.")) 560 if (rxvt_Str_match (opt, "keysym."))
513 { 561 {
514 const char *str = argv[++i]; 562 const char *str = argv[++i];
515 563
516 if (str != NULL) 564 if (str != NULL)
… …
585 { 633 {
586 if (str[0] == '0' && toupper (str[1]) == 'X') 634 if (str[0] == '0' && toupper (str[1]) == 'X')
587 str += 2; 635 str += 2;
588 if (arg) 636 if (arg)
589 { 637 {
590 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 638 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
591 return -1; 639 return -1;
592 } 640 }
593 else 641 else
594 { 642 {
595 if (sscanf (str, "%x:", &sym) != 1) 643 if (sscanf (str, "%x:", &sym) != 1)
596 return -1; 644 return -1;
597 645
598 /* cue to ':', it's there since sscanf () worked */ 646 /* cue to ':', it's there since sscanf () worked */
599 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 647 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
600 newargstr[NEWARGLIM - 1] = '\0'; 648 newargstr[NEWARGLIM - 1] = '\0';
601 newarg = newargstr; 649 newarg = newargstr;
602 } 650 }
603 } 651 }
604 else 652 else
605 { 653 {
606 /* 654 /*
607 * convert keysym name to keysym number 655 * convert keysym name to keysym number
608 */ 656 */
609 STRNCPY (newargstr, str, NEWARGLIM - 1); 657 strncpy (newargstr, str, NEWARGLIM - 1);
610 newargstr[NEWARGLIM - 1] = '\0'; 658 newargstr[NEWARGLIM - 1] = '\0';
611 if (arg == NULL) 659 if (arg == NULL)
612 { 660 {
613 if ((newarg = STRCHR (newargstr, ':')) == NULL) 661 if ((newarg = strchr (newargstr, ':')) == NULL)
614 return -1; 662 return -1;
615 *newarg++ = '\0'; /* terminate keysym name */ 663 *newarg++ = '\0'; /* terminate keysym name */
616 } 664 }
617 if ((sym = XStringToKeysym (newargstr)) == None) 665 if ((sym = XStringToKeysym (newargstr)) == None)
618 return -1; 666 return -1;
… …
624 if (Keysym_map[sym] != NULL) /* already set ? */ 672 if (Keysym_map[sym] != NULL) /* already set ? */
625 return -1; 673 return -1;
626 674
627 if (newarg == NULL) 675 if (newarg == NULL)
628 { 676 {
629 STRNCPY (newargstr, arg, NEWARGLIM - 1); 677 strncpy (newargstr, arg, NEWARGLIM - 1);
630 newargstr[NEWARGLIM - 1] = '\0'; 678 newargstr[NEWARGLIM - 1] = '\0';
631 newarg = newargstr; 679 newarg = newargstr;
632 } 680 }
633 rxvt_Str_trim (newarg); 681 rxvt_Str_trim (newarg);
634 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 682 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
635 return -1; 683 return -1;
636 MIN_IT (n, 255); 684 MIN_IT (n, 255);
637 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 685 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
638 686
639 key_string[0] = n; 687 key_string[0] = n;
640 STRNCPY (key_string + 1, newarg, n); 688 strncpy (key_string + 1, newarg, n);
641 Keysym_map[sym] = (unsigned char *)key_string; 689 Keysym_map[sym] = (unsigned char *)key_string;
642 690
643 return 1; 691 return 1;
644} 692}
645 693
… …
657 char *str, buffer[256]; 705 char *str, buffer[256];
658 706
659 if (stream == NULL) 707 if (stream == NULL)
660 return; 708 return;
661 709
662 len = STRLEN (name); 710 len = strlen (name);
663 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 711 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
664 { 712 {
665 unsigned int entry, n; 713 unsigned int entry, n;
666 714
667 while (*str && isspace (*str)) 715 while (*str && isspace (*str))
668 str++; /* leading whitespace */ 716 str++; /* leading whitespace */
669 717
670 if ((str[len] != '*' && str[len] != '.') 718 if ((str[len] != '*' && str[len] != '.')
671 || (len && STRNCMP (str, name, len))) 719 || (len && strncmp (str, name, len)))
672 continue; 720 continue;
673 str += (len + 1); /* skip `name*' or `name.' */ 721 str += (len + 1); /* skip `name*' or `name.' */
674 722
675# ifdef KEYSYM_RESOURCE 723# ifdef KEYSYM_RESOURCE
676 if (!parse_keysym (str, NULL)) 724 if (!parse_keysym (str, NULL))
… …
680 const char *kw = optList[entry].kw; 728 const char *kw = optList[entry].kw;
681 729
682 if (kw == NULL) 730 if (kw == NULL)
683 continue; 731 continue;
684 732
685 n = STRLEN (kw); 733 n = strlen (kw);
686 if (str[n] == ':' && rxvt_Str_match (str, kw)) 734 if (str[n] == ':' && rxvt_Str_match (str, kw))
687 { 735 {
688 /* skip `keyword:' */ 736 /* skip `keyword:' */
689 str += n + 1; 737 str += n + 1;
690 rxvt_Str_trim (str); 738 rxvt_Str_trim (str);
691 n = STRLEN (str); 739 n = strlen (str);
692 if (n && rs[optList[entry].doff] == NULL) 740 if (n && rs[optList[entry].doff] == NULL)
693 { 741 {
694 /* not already set */ 742 /* not already set */
695 int s; 743 int s;
696 char *p = 0; 744 char *p = 0;
697 745
698 for (int o = 0;;) 746 for (int o = 0;;)
699 { 747 {
700 p = (char *)rxvt_realloc (p, o + n + 1); 748 p = (char *)rxvt_realloc (p, o + n + 1);
701 MEMCPY (p + o, str, n); 749 memcpy (p + o, str, n);
702 o += n; 750 o += n;
703 p[o] = 0; 751 p[o] = 0;
704 752
705 if (o == 0 || p[o - 1] != '\\') // continuation line 753 if (o == 0 || p[o - 1] != '\\') // continuation line
706 break; 754 break;
… …
709 757
710 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 758 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
711 break; 759 break;
712 760
713 rxvt_Str_trim (str); 761 rxvt_Str_trim (str);
714 n = STRLEN (str); 762 n = strlen (str);
715 } 763 }
716 764
717 rs[optList[entry].doff] = p; 765 rs[optList[entry].doff] = p;
718 allocated.push_back (p); 766 allocated.push_back (p);
719 767
720 if (optList_isBool (entry)) 768 if (optList_isBool (entry))
721 { 769 {
722 s = STRCASECMP (str, "TRUE") == 0 770 s = strcasecmp (str, "TRUE") == 0
723 || STRCASECMP (str, "YES") == 0 771 || strcasecmp (str, "YES") == 0
724 || STRCASECMP (str, "ON") == 0 772 || strcasecmp (str, "ON") == 0
725 || STRCASECMP (str, "1") == 0; 773 || strcasecmp (str, "1") == 0;
726 774
727 if (optList_isReverse (entry)) 775 if (optList_isReverse (entry))
728 s = !s; 776 s = !s;
729 777
730 if (s) 778 if (s)
731 Options |= optList[entry].flag; 779 options |= optList[entry].flag;
732 else 780 else
733 Options &= ~optList[entry].flag; 781 options &= ~optList[entry].flag;
734 } 782 }
735 } 783 }
736 784
737 break; 785 break;
738 } 786 }
… …
804 if ((ptr = (char *)getenv ("HOME")) == NULL) 852 if ((ptr = (char *)getenv ("HOME")) == NULL)
805 ptr = "."; 853 ptr = ".";
806 854
807 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 855 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
808 { 856 {
809 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 857 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
810 ptr, xnames[i]); 858 ptr, xnames[i]);
811 if ((rdb1 = XrmGetFileDatabase (fname))) 859 if ((rdb1 = XrmGetFileDatabase (fname)))
812 { 860 {
813 XrmMergeDatabases (rdb1, &database); 861 XrmMergeDatabases (rdb1, &database);
814# ifndef HAVE_BOTH_XRESOURCE_FILES 862# ifndef HAVE_BOTH_XRESOURCE_FILES
… …
859 if (kw == NULL || rs[optList[entry].doff] != NULL) 907 if (kw == NULL || rs[optList[entry].doff] != NULL)
860 continue; /* previously set */ 908 continue; /* previously set */
861 909
862 p = XGetDefault (display, name, kw); 910 p = XGetDefault (display, name, kw);
863 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 911 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
864 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 912 if (p == NULL || (p0 && strcmp (p, p0) == 0))
865 { 913 {
866 p = XGetDefault (display, RESCLASS, kw); 914 p = XGetDefault (display, RESCLASS, kw);
867#ifdef RESFALLBACK 915#ifdef RESFALLBACK
868 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 916 if (p == NULL || (p0 && strcmp (p, p0) == 0))
869 p = XGetDefault (display, RESFALLBACK, kw); 917 p = XGetDefault (display, RESFALLBACK, kw);
870#endif 918#endif
871 } 919 }
872 920
873 if (p == NULL && p0) 921 if (p == NULL && p0)
… …
877 { 925 {
878 rs[optList[entry].doff] = p; 926 rs[optList[entry].doff] = p;
879 927
880 if (optList_isBool (entry)) 928 if (optList_isBool (entry))
881 { 929 {
882 s = STRCASECMP (p, "TRUE") == 0 930 s = strcasecmp (p, "TRUE") == 0
883 || STRCASECMP (p, "YES") == 0 931 || strcasecmp (p, "YES") == 0
884 || STRCASECMP (p, "ON") == 0 932 || strcasecmp (p, "ON") == 0
885 || STRCASECMP (p, "1") == 0; 933 || strcasecmp (p, "1") == 0;
886 if (optList_isReverse (entry)) 934 if (optList_isReverse (entry))
887 s = !s; 935 s = !s;
888 if (s) 936 if (s)
889 Options |= (optList[entry].flag); 937 options |= (optList[entry].flag);
890 else 938 else
891 Options &= ~ (optList[entry].flag); 939 options &= ~ (optList[entry].flag);
892 } 940 }
893 } 941 }
894 } 942 }
895 943
896 /* 944 /*
… …
924 FILE *fd = NULL; 972 FILE *fd = NULL;
925 char *home; 973 char *home;
926 974
927 if ((home = getenv ("HOME")) != NULL) 975 if ((home = getenv ("HOME")) != NULL)
928 { 976 {
929 unsigned int i, len = STRLEN (home) + 2; 977 unsigned int i, len = strlen (home) + 2;
930 char *f = NULL; 978 char *f = NULL;
931 979
932 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 980 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
933 { 981 {
934 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char)); 982 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
935 983
936 sprintf (f, "%s/%s", home, xnames[i]); 984 sprintf (f, "%s/%s", home, xnames[i]);
937 985
938 if ((fd = fopen (f, "r")) != NULL) 986 if ((fd = fopen (f, "r")) != NULL)
939 break; 987 break;

Diff Legend

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