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.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: "
257#if XFT 265#if XFT
258 "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,"
259#endif 279#endif
260#if UNICODE_3 280#if UNICODE_3
261 "unicode3," 281 "unicode3,"
262#endif 282#endif
263 "encodings=eu+vn" 283 "encodings=eu+vn"
… …
268 "+jp-ext" 288 "+jp-ext"
269#endif 289#endif
270#if ENCODING_KR 290#if ENCODING_KR
271 "+kr" 291 "+kr"
272#endif 292#endif
273#if ENCODING_CN 293#if ENCODING_ZH
274 "+cn" 294 "+zh"
275#endif 295#endif
276#if ENCODING_CN_EXT 296#if ENCODING_ZH_EXT
277 "+cn-ext" 297 "+zh-ext"
278#endif 298#endif
279 "," 299 ","
280#if ENABLE_COMBINING
281 "combining,"
282#endif
283#if TEXT_BLINK
284 "blink,"
285#endif
286#if OFF_FOCUS_FADING 300#if OFF_FOCUS_FADING
287 "fade," 301 "fade,"
288#endif 302#endif
289#if defined(XPM_BACKGROUND) 303#if defined(XPM_BACKGROUND)
290 "XPM," 304 "XPM,"
… …
341 "8bitctrls," 355 "8bitctrls,"
342#endif 356#endif
343#if !defined(NO_STRINGS) 357#if !defined(NO_STRINGS)
344 "strings," 358 "strings,"
345#endif 359#endif
346#if !defined(NO_FRILLS) 360#if defined(ENABLE_FRILLS)
347 "frills," 361 "frills,"
348#endif 362#endif
349#if !defined(NO_LINESPACE) 363#if !defined(NO_LINESPACE)
350 "linespace," 364 "linespace,"
351#endif 365#endif
… …
361#if MOUSE_SLIP_WHEELING 375#if MOUSE_SLIP_WHEELING
362 "slipwheel," 376 "slipwheel,"
363#endif 377#endif
364#if defined(SMART_RESIZE) 378#if defined(SMART_RESIZE)
365 "smart-resize," 379 "smart-resize,"
366#endif
367#if defined(TTY_256COLOR)
368 "256colour,"
369#endif 380#endif
370#if defined(CURSOR_BLINK) 381#if defined(CURSOR_BLINK)
371 "cursorBlink," 382 "cursorBlink,"
372#endif 383#endif
373#if defined(POINTER_BLANK) 384#if defined(POINTER_BLANK)
… …
412 len++; /* account for space */ 423 len++; /* account for space */
413 } 424 }
414#ifdef DEBUG_STRICT 425#ifdef DEBUG_STRICT
415 assert (optList[i].opt != NULL); 426 assert (optList[i].opt != NULL);
416#endif 427#endif
417 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 428 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
418 col += len; 429 col += len;
419 if (col > 79) 430 if (col > 79)
420 { /* assume regular width */ 431 { /* assume regular width */
421 rxvt_log ("\n"); 432 rxvt_log ("\n");
422 col = 1 + len; 433 col = 1 + len;
… …
439#ifdef DEBUG_STRICT 450#ifdef DEBUG_STRICT
440 assert (optList[i].opt != NULL); 451 assert (optList[i].opt != NULL);
441#endif 452#endif
442 rxvt_log (" %s%s %-*s%s%s\n", 453 rxvt_log (" %s%s %-*s%s%s\n",
443 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 454 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
444 (INDENT - STRLEN (optList[i].opt) 455 (INDENT - strlen (optList[i].opt)
445 + (optList_isBool (i) ? 0 : 2)), 456 + (optList_isBool (i) ? 0 : 2)),
446 (optList[i].arg ? optList[i].arg : ""), 457 (optList[i].arg ? optList[i].arg : ""),
447 (optList_isBool (i) ? "turn on/off " : ""), 458 (optList_isBool (i) ? "turn on/off " : ""),
448 optList[i].desc); 459 optList[i].desc);
449 } 460 }
… …
456 467
457 for (i = 0; i < optList_size (); i++) 468 for (i = 0; i < optList_size (); i++)
458 if (optList[i].kw != NULL) 469 if (optList[i].kw != NULL)
459 rxvt_log (" %s: %*s%s\n", 470 rxvt_log (" %s: %*s%s\n",
460 optList[i].kw, 471 optList[i].kw,
461 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 472 (INDENT - strlen (optList[i].kw)), "", /* XXX */
462 (optList_isBool (i) ? "boolean" : optList[i].arg)); 473 (optList_isBool (i) ? "boolean" : optList[i].arg));
463#ifdef KEYSYM_RESOURCE 474#ifdef KEYSYM_RESOURCE
464 rxvt_log (" " "keysym.sym" ": %*s%s\n", 475 rxvt_log (" " "keysym.sym" ": %*s%s\n",
465 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 476 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
466 "keysym"); 477 "keysym");
… …
509 bad_option = 1; 520 bad_option = 1;
510 rxvt_warn ("\"%s\": malformed option.\n", opt); 521 rxvt_warn ("\"%s\": malformed option.\n", opt);
511 continue; 522 continue;
512 } 523 }
513 524
514 if (!STRCMP (opt, "help")) 525 if (!strcmp (opt, "help"))
515 rxvt_usage (longopt ? 2 : 1); 526 rxvt_usage (longopt ? 2 : 1);
516 if (!STRCMP (opt, "h")) 527 if (!strcmp (opt, "h"))
517 rxvt_usage (0); 528 rxvt_usage (0);
518 529
519 /* feature: always try to match long-options */ 530 /* feature: always try to match long-options */
520 for (entry = 0; entry < optList_size (); entry++) 531 for (entry = 0; entry < optList_size (); entry++)
521 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 532 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
522 || (!longopt 533 || (!longopt
523 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 534 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
524 break; 535 break;
525 536
526 if (entry < optList_size ()) 537 if (entry < optList_size ())
527 { 538 {
528 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
… …
545#ifdef DEBUG_RESOURCES 556#ifdef DEBUG_RESOURCES
546 fprintf (stderr, "boolean (%s,%s) = %s\n", 557 fprintf (stderr, "boolean (%s,%s) = %s\n",
547 optList[entry].opt, optList[entry].kw, flag); 558 optList[entry].opt, optList[entry].kw, flag);
548#endif 559#endif
549 if (flag == On) 560 if (flag == On)
550 Options |= (optList[entry].flag); 561 options |= (optList[entry].flag);
551 else 562 else
552 Options &= ~ (optList[entry].flag); 563 options &= ~ (optList[entry].flag);
553 564
554 if (optList[entry].doff != -1) 565 if (optList[entry].doff != -1)
555 rs[optList[entry].doff] = flag; 566 rs[optList[entry].doff] = flag;
556 } 567 }
557 } 568 }
558 else 569 else
559#ifdef KEYSYM_RESOURCE 570#ifdef KEYSYM_RESOURCE
560 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 571 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
561 if (rxvt_Str_match (opt, "keysym.")) 572 if (rxvt_Str_match (opt, "keysym."))
562 { 573 {
563 const char *str = argv[++i]; 574 const char *str = argv[++i];
564 575
565 if (str != NULL) 576 if (str != NULL)
… …
634 { 645 {
635 if (str[0] == '0' && toupper (str[1]) == 'X') 646 if (str[0] == '0' && toupper (str[1]) == 'X')
636 str += 2; 647 str += 2;
637 if (arg) 648 if (arg)
638 { 649 {
639 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 650 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
640 return -1; 651 return -1;
641 } 652 }
642 else 653 else
643 { 654 {
644 if (sscanf (str, "%x:", &sym) != 1) 655 if (sscanf (str, "%x:", &sym) != 1)
645 return -1; 656 return -1;
646 657
647 /* cue to ':', it's there since sscanf () worked */ 658 /* cue to ':', it's there since sscanf () worked */
648 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 659 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
649 newargstr[NEWARGLIM - 1] = '\0'; 660 newargstr[NEWARGLIM - 1] = '\0';
650 newarg = newargstr; 661 newarg = newargstr;
651 } 662 }
652 } 663 }
653 else 664 else
654 { 665 {
655 /* 666 /*
656 * convert keysym name to keysym number 667 * convert keysym name to keysym number
657 */ 668 */
658 STRNCPY (newargstr, str, NEWARGLIM - 1); 669 strncpy (newargstr, str, NEWARGLIM - 1);
659 newargstr[NEWARGLIM - 1] = '\0'; 670 newargstr[NEWARGLIM - 1] = '\0';
660 if (arg == NULL) 671 if (arg == NULL)
661 { 672 {
662 if ((newarg = STRCHR (newargstr, ':')) == NULL) 673 if ((newarg = strchr (newargstr, ':')) == NULL)
663 return -1; 674 return -1;
664 *newarg++ = '\0'; /* terminate keysym name */ 675 *newarg++ = '\0'; /* terminate keysym name */
665 } 676 }
666 if ((sym = XStringToKeysym (newargstr)) == None) 677 if ((sym = XStringToKeysym (newargstr)) == None)
667 return -1; 678 return -1;
… …
673 if (Keysym_map[sym] != NULL) /* already set ? */ 684 if (Keysym_map[sym] != NULL) /* already set ? */
674 return -1; 685 return -1;
675 686
676 if (newarg == NULL) 687 if (newarg == NULL)
677 { 688 {
678 STRNCPY (newargstr, arg, NEWARGLIM - 1); 689 strncpy (newargstr, arg, NEWARGLIM - 1);
679 newargstr[NEWARGLIM - 1] = '\0'; 690 newargstr[NEWARGLIM - 1] = '\0';
680 newarg = newargstr; 691 newarg = newargstr;
681 } 692 }
682 rxvt_Str_trim (newarg); 693 rxvt_Str_trim (newarg);
683 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 694 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
684 return -1; 695 return -1;
685 MIN_IT (n, 255); 696 MIN_IT (n, 255);
686 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 697 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
687 698
688 key_string[0] = n; 699 key_string[0] = n;
689 STRNCPY (key_string + 1, newarg, n); 700 strncpy (key_string + 1, newarg, n);
690 Keysym_map[sym] = (unsigned char *)key_string; 701 Keysym_map[sym] = (unsigned char *)key_string;
691 702
692 return 1; 703 return 1;
693} 704}
694 705
… …
706 char *str, buffer[256]; 717 char *str, buffer[256];
707 718
708 if (stream == NULL) 719 if (stream == NULL)
709 return; 720 return;
710 721
711 len = STRLEN (name); 722 len = strlen (name);
712 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 723 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
713 { 724 {
714 unsigned int entry, n; 725 unsigned int entry, n;
715 726
716 while (*str && isspace (*str)) 727 while (*str && isspace (*str))
717 str++; /* leading whitespace */ 728 str++; /* leading whitespace */
718 729
719 if ((str[len] != '*' && str[len] != '.') 730 if ((str[len] != '*' && str[len] != '.')
720 || (len && STRNCMP (str, name, len))) 731 || (len && strncmp (str, name, len)))
721 continue; 732 continue;
722 str += (len + 1); /* skip `name*' or `name.' */ 733 str += (len + 1); /* skip `name*' or `name.' */
723 734
724# ifdef KEYSYM_RESOURCE 735# ifdef KEYSYM_RESOURCE
725 if (!parse_keysym (str, NULL)) 736 if (!parse_keysym (str, NULL))
… …
729 const char *kw = optList[entry].kw; 740 const char *kw = optList[entry].kw;
730 741
731 if (kw == NULL) 742 if (kw == NULL)
732 continue; 743 continue;
733 744
734 n = STRLEN (kw); 745 n = strlen (kw);
735 if (str[n] == ':' && rxvt_Str_match (str, kw)) 746 if (str[n] == ':' && rxvt_Str_match (str, kw))
736 { 747 {
737 /* skip `keyword:' */ 748 /* skip `keyword:' */
738 str += n + 1; 749 str += n + 1;
739 rxvt_Str_trim (str); 750 rxvt_Str_trim (str);
740 n = STRLEN (str); 751 n = strlen (str);
741 if (n && rs[optList[entry].doff] == NULL) 752 if (n && rs[optList[entry].doff] == NULL)
742 { 753 {
743 /* not already set */ 754 /* not already set */
744 int s; 755 int s;
745 char *p = 0; 756 char *p = 0;
746 757
747 for (int o = 0;;) 758 for (int o = 0;;)
748 { 759 {
749 p = (char *)rxvt_realloc (p, o + n + 1); 760 p = (char *)rxvt_realloc (p, o + n + 1);
750 MEMCPY (p + o, str, n); 761 memcpy (p + o, str, n);
751 o += n; 762 o += n;
752 p[o] = 0; 763 p[o] = 0;
753 764
754 if (o == 0 || p[o - 1] != '\\') // continuation line 765 if (o == 0 || p[o - 1] != '\\') // continuation line
755 break; 766 break;
… …
758 769
759 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 770 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
760 break; 771 break;
761 772
762 rxvt_Str_trim (str); 773 rxvt_Str_trim (str);
763 n = STRLEN (str); 774 n = strlen (str);
764 } 775 }
765 776
766 rs[optList[entry].doff] = p; 777 rs[optList[entry].doff] = p;
767 allocated.push_back (p); 778 allocated.push_back (p);
768 779
769 if (optList_isBool (entry)) 780 if (optList_isBool (entry))
770 { 781 {
771 s = STRCASECMP (str, "TRUE") == 0 782 s = strcasecmp (str, "TRUE") == 0
772 || STRCASECMP (str, "YES") == 0 783 || strcasecmp (str, "YES") == 0
773 || STRCASECMP (str, "ON") == 0 784 || strcasecmp (str, "ON") == 0
774 || STRCASECMP (str, "1") == 0; 785 || strcasecmp (str, "1") == 0;
775 786
776 if (optList_isReverse (entry)) 787 if (optList_isReverse (entry))
777 s = !s; 788 s = !s;
778 789
779 if (s) 790 if (s)
780 Options |= optList[entry].flag; 791 options |= optList[entry].flag;
781 else 792 else
782 Options &= ~optList[entry].flag; 793 options &= ~optList[entry].flag;
783 } 794 }
784 } 795 }
785 796
786 break; 797 break;
787 } 798 }
… …
846 database = XrmGetStringDatabase (displayResource); 857 database = XrmGetStringDatabase (displayResource);
847 858
848# ifdef HAVE_EXTRA_XRESOURCE_FILES 859# ifdef HAVE_EXTRA_XRESOURCE_FILES
849 /* Add in ~/.Xdefaults or ~/.Xresources */ 860 /* Add in ~/.Xdefaults or ~/.Xresources */
850 { 861 {
851 char *ptr; 862 char *ptr;
852 863
853 if ((ptr = (char *)getenv ("HOME")) == NULL) 864 if ((ptr = (char *)getenv ("HOME")) == NULL)
854 ptr = "."; 865 ptr = ".";
855 866
856 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 867 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
857 { 868 {
858 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 869 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
859 ptr, xnames[i]); 870 ptr, xnames[i]);
860 if ((rdb1 = XrmGetFileDatabase (fname))) 871 if ((rdb1 = XrmGetFileDatabase (fname)))
861 { 872 {
862 XrmMergeDatabases (rdb1, &database); 873 XrmMergeDatabases (rdb1, &database);
863# ifndef HAVE_BOTH_XRESOURCE_FILES 874# ifndef HAVE_BOTH_XRESOURCE_FILES
… …
908 if (kw == NULL || rs[optList[entry].doff] != NULL) 919 if (kw == NULL || rs[optList[entry].doff] != NULL)
909 continue; /* previously set */ 920 continue; /* previously set */
910 921
911 p = XGetDefault (display, name, kw); 922 p = XGetDefault (display, name, kw);
912 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 923 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
913 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 924 if (p == NULL || (p0 && strcmp (p, p0) == 0))
914 { 925 {
915 p = XGetDefault (display, RESCLASS, kw); 926 p = XGetDefault (display, RESCLASS, kw);
916#ifdef RESFALLBACK 927#ifdef RESFALLBACK
917 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 928 if (p == NULL || (p0 && strcmp (p, p0) == 0))
918 p = XGetDefault (display, RESFALLBACK, kw); 929 p = XGetDefault (display, RESFALLBACK, kw);
919#endif 930#endif
920 } 931 }
921 932
922 if (p == NULL && p0) 933 if (p == NULL && p0)
… …
926 { 937 {
927 rs[optList[entry].doff] = p; 938 rs[optList[entry].doff] = p;
928 939
929 if (optList_isBool (entry)) 940 if (optList_isBool (entry))
930 { 941 {
931 s = STRCASECMP (p, "TRUE") == 0 942 s = strcasecmp (p, "TRUE") == 0
932 || STRCASECMP (p, "YES") == 0 943 || strcasecmp (p, "YES") == 0
933 || STRCASECMP (p, "ON") == 0 944 || strcasecmp (p, "ON") == 0
934 || STRCASECMP (p, "1") == 0; 945 || strcasecmp (p, "1") == 0;
935 if (optList_isReverse (entry)) 946 if (optList_isReverse (entry))
936 s = !s; 947 s = !s;
937 if (s) 948 if (s)
938 Options |= (optList[entry].flag); 949 options |= (optList[entry].flag);
939 else 950 else
940 Options &= ~ (optList[entry].flag); 951 options &= ~ (optList[entry].flag);
941 } 952 }
942 } 953 }
943 } 954 }
944 955
945 /* 956 /*
… …
973 FILE *fd = NULL; 984 FILE *fd = NULL;
974 char *home; 985 char *home;
975 986
976 if ((home = getenv ("HOME")) != NULL) 987 if ((home = getenv ("HOME")) != NULL)
977 { 988 {
978 unsigned int i, len = STRLEN (home) + 2; 989 unsigned int i, len = strlen (home) + 2;
979 char *f = NULL; 990 char *f = NULL;
980 991
981 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 992 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
982 { 993 {
983 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char)); 994 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
984 995
985 sprintf (f, "%s/%s", home, xnames[i]); 996 sprintf (f, "%s/%s", home, xnames[i]);
986 997
987 if ((fd = fopen (f, "r")) != NULL) 998 if ((fd = fopen (f, "r")) != NULL)
988 break; 999 break;

Diff Legend

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