ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.24 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.41 by root, Sun Sep 5 09:33:00 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 rxvt-unicode 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"),
… …
154 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 159 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
155 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
156#endif /* NO_BRIGHTCOLOR */ 161#endif /* NO_BRIGHTCOLOR */
157#ifndef NO_BOLD_UNDERLINE_REVERSE 162#ifndef NO_BOLD_UNDERLINE_REVERSE
158 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 163 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
164 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
159 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 165 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
160 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 166 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
161#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 167#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
162#ifdef KEEP_SCROLLCOLOR 168#ifdef KEEP_SCROLLCOLOR
163 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 169 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
… …
173 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 179 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
174#endif /* XPM_BACKGROUND */ 180#endif /* XPM_BACKGROUND */
175#if (MENUBAR_MAX) 181#if (MENUBAR_MAX)
176 RSTRG (Rs_menu, "menu", "name[;tag]"), 182 RSTRG (Rs_menu, "menu", "name[;tag]"),
177#endif 183#endif
184 /* fonts: command-line option = resource name */
178 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 185 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
179 /* 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
180#ifdef USE_XIM 191#ifdef USE_XIM
181 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 192 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
182 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"),
183#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 194#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
184 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"),
… …
195#endif /* NO_CURSORCOLOR */ 206#endif /* NO_CURSORCOLOR */
196 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 207 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
197 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"),
198 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 209 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
199 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"),
200#ifndef NO_FRILLS 211#if ENABLE_FRILLS
201 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 212 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
202 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 213 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
203 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 214 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
204 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 215 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
216 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
205#endif 217#endif
206#ifndef NO_LINESPACE 218#ifndef NO_LINESPACE
207 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 219 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
208#endif 220#endif
209 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 221 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
… …
242#undef RSTRG 254#undef RSTRG
243#undef SWCH 255#undef SWCH
244#undef BOOL 256#undef BOOL
245/*}}} */ 257/*}}} */
246 258
247static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 259static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
248static const char optionsstring[] = "Options: " 260static const char optionsstring[] = "options: "
261#if 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,"
275#endif
276#if UNICODE_3
277 "unicode3,"
278#endif
279 "encodings=eu+vn"
280#if ENCODING_JP
281 "+jp"
282#endif
283#if ENCODING_JP_EXT
284 "+jp-ext"
285#endif
286#if ENCODING_KR
287 "+kr"
288#endif
289#if ENCODING_ZH
290 "+zh"
291#endif
292#if ENCODING_ZH_EXT
293 "+zh-ext"
294#endif
295 ","
296#if OFF_FOCUS_FADING
297 "fade,"
298#endif
249#if defined(XPM_BACKGROUND) 299#if defined(XPM_BACKGROUND)
250 "XPM," 300 "XPM,"
251#endif 301#endif
252#if defined(TRANSPARENT) 302#if defined(TRANSPARENT)
253 "transparent," 303 "transparent,"
254#endif 304#endif
305#if TINTING
306 "tint,"
307#endif
255#if defined(UTMP_SUPPORT) 308#if defined(UTMP_SUPPORT)
256 "utmp," 309 "utmp,"
257#endif 310#endif
258#if defined(MENUBAR) 311#if defined(MENUBAR)
259 "menubar," 312 "menubar,"
260#endif
261#if !defined(NO_FRILLS)
262 "frills,"
263#endif
264#if !defined(NO_LINESPACE)
265 "linespace,"
266#endif
267#if defined(PREFER_24BIT)
268 "24bit,"
269#endif 313#endif
270#if defined(USE_XIM) 314#if defined(USE_XIM)
271 "XIM," 315 "XIM,"
272#endif 316#endif
273 "scrollbars=" 317 "scrollbars="
… …
301 "no_backspace," 345 "no_backspace,"
302#endif 346#endif
303#if defined(NO_DELETE_KEY) 347#if defined(NO_DELETE_KEY)
304 "no_delete," 348 "no_delete,"
305#endif 349#endif
350#if EIGHT_BIT_CONTROLS
351 "8bitctrls,"
352#endif
306#if !defined(NO_STRINGS) 353#if !defined(NO_STRINGS)
307 "strings," 354 "strings,"
308#endif 355#endif
309#if defined(TTY_256COLOR) 356#if defined(ENABLE_FRILLS)
357 "frills,"
358#endif
359#if !defined(NO_LINESPACE)
360 "linespace,"
361#endif
362#if defined(PREFER_24BIT)
310 "256colour," 363 "24bit,"
364#endif
365#if defined(SELECTION_SCROLLING)
366 "selectionscrolling,"
367#endif
368#if MOUSE_WHEEL
369 "wheel,"
370#endif
371#if MOUSE_SLIP_WHEELING
372 "slipwheel,"
373#endif
374#if defined(SMART_RESIZE)
375 "smart-resize,"
376#endif
377#if defined(CURSOR_BLINK)
378 "cursorBlink,"
379#endif
380#if defined(POINTER_BLANK)
381 "pointerBlank,"
311#endif 382#endif
312#if defined(NO_RESOURCES) 383#if defined(NO_RESOURCES)
313 "NoResources" 384 "NoResources"
314#else 385#else
315# if defined(USE_XGETDEFAULT) 386# if defined(USE_XGETDEFAULT)
… …
348 len++; /* account for space */ 419 len++; /* account for space */
349 } 420 }
350#ifdef DEBUG_STRICT 421#ifdef DEBUG_STRICT
351 assert (optList[i].opt != NULL); 422 assert (optList[i].opt != NULL);
352#endif 423#endif
353 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 424 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
354 col += len; 425 col += len;
355 if (col > 79) 426 if (col > 79)
356 { /* assume regular width */ 427 { /* assume regular width */
357 rxvt_log ("\n"); 428 rxvt_log ("\n");
358 col = 1 + len; 429 col = 1 + len;
… …
375#ifdef DEBUG_STRICT 446#ifdef DEBUG_STRICT
376 assert (optList[i].opt != NULL); 447 assert (optList[i].opt != NULL);
377#endif 448#endif
378 rxvt_log (" %s%s %-*s%s%s\n", 449 rxvt_log (" %s%s %-*s%s%s\n",
379 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 450 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
380 (INDENT - STRLEN (optList[i].opt) 451 (INDENT - strlen (optList[i].opt)
381 + (optList_isBool (i) ? 0 : 2)), 452 + (optList_isBool (i) ? 0 : 2)),
382 (optList[i].arg ? optList[i].arg : ""), 453 (optList[i].arg ? optList[i].arg : ""),
383 (optList_isBool (i) ? "turn on/off " : ""), 454 (optList_isBool (i) ? "turn on/off " : ""),
384 optList[i].desc); 455 optList[i].desc);
385 } 456 }
… …
392 463
393 for (i = 0; i < optList_size (); i++) 464 for (i = 0; i < optList_size (); i++)
394 if (optList[i].kw != NULL) 465 if (optList[i].kw != NULL)
395 rxvt_log (" %s: %*s%s\n", 466 rxvt_log (" %s: %*s%s\n",
396 optList[i].kw, 467 optList[i].kw,
397 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 468 (INDENT - strlen (optList[i].kw)), "", /* XXX */
398 (optList_isBool (i) ? "boolean" : optList[i].arg)); 469 (optList_isBool (i) ? "boolean" : optList[i].arg));
399#ifdef KEYSYM_RESOURCE 470#ifdef KEYSYM_RESOURCE
400 rxvt_log (" " "keysym.sym" ": %*s%s\n", 471 rxvt_log (" " "keysym.sym" ": %*s%s\n",
401 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 472 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
402 "keysym"); 473 "keysym");
… …
445 bad_option = 1; 516 bad_option = 1;
446 rxvt_warn ("\"%s\": malformed option.\n", opt); 517 rxvt_warn ("\"%s\": malformed option.\n", opt);
447 continue; 518 continue;
448 } 519 }
449 520
450 if (!STRCMP (opt, "help")) 521 if (!strcmp (opt, "help"))
451 rxvt_usage (longopt ? 2 : 1); 522 rxvt_usage (longopt ? 2 : 1);
452 if (!STRCMP (opt, "h")) 523 if (!strcmp (opt, "h"))
453 rxvt_usage (0); 524 rxvt_usage (0);
454 525
455 /* feature: always try to match long-options */ 526 /* feature: always try to match long-options */
456 for (entry = 0; entry < optList_size (); entry++) 527 for (entry = 0; entry < optList_size (); entry++)
457 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 528 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
458 || (!longopt 529 || (!longopt
459 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 530 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
460 break; 531 break;
461 532
462 if (entry < optList_size ()) 533 if (entry < optList_size ())
463 { 534 {
464 if (optList_isReverse (entry)) 535 if (optList_isReverse (entry))
465 flag = flag == On ? Off : On; 536 flag = flag == On ? Off : On;
537
466 if (optList_strlen (entry)) 538 if (optList_strlen (entry))
467 { /* string value */
468 const char *str = argv[++i];
469
470#ifdef DEBUG_RESOURCES
471 fprintf (stderr, "string (%s,%s) = ",
472 optList[entry].opt ? optList[entry].opt : "nil",
473 optList[entry].kw ? optList[entry].kw : "nil");
474#endif
475 if (flag == On && str && (optList[entry].doff != -1))
476 { 539 {
477#ifdef DEBUG_RESOURCES
478 fprintf (stderr, "\"%s\"\n", str);
479#endif
480 rs[optList[entry].doff] = str;
481 /* 540 /*
482 * special cases are handled in main.c:main () to allow 541 * special cases are handled in main.c:main () to allow
483 * X resources to set these values before we settle for 542 * X resources to set these values before we settle for
484 * default values 543 * default values
485 */ 544 */
486 }
487#ifdef DEBUG_RESOURCES
488 else
489 fprintf (stderr, "???\n");
490#endif
491 545
546 if (optList[entry].doff != -1)
547 rs[optList[entry].doff] = flag == On && argv[i+1]
548 ? argv[++i] : 0;
492 } 549 }
493 else 550 else
494 { /* boolean value */ 551 { /* boolean value */
495#ifdef DEBUG_RESOURCES 552#ifdef DEBUG_RESOURCES
496 fprintf (stderr, "boolean (%s,%s) = %s\n", 553 fprintf (stderr, "boolean (%s,%s) = %s\n",
497 optList[entry].opt, optList[entry].kw, flag); 554 optList[entry].opt, optList[entry].kw, flag);
498#endif 555#endif
499 if (flag == On) 556 if (flag == On)
500 Options |= (optList[entry].flag); 557 options |= (optList[entry].flag);
501 else 558 else
502 Options &= ~ (optList[entry].flag); 559 options &= ~ (optList[entry].flag);
503 560
504 if (optList[entry].doff != -1) 561 if (optList[entry].doff != -1)
505 rs[optList[entry].doff] = flag; 562 rs[optList[entry].doff] = flag;
506 } 563 }
507 } 564 }
508 else 565 else
509#ifdef KEYSYM_RESOURCE 566#ifdef KEYSYM_RESOURCE
510 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 567 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
511 if (rxvt_Str_match (opt, "keysym.")) 568 if (rxvt_Str_match (opt, "keysym."))
512 { 569 {
513 const char *str = argv[++i]; 570 const char *str = argv[++i];
514 571
515 if (str != NULL) 572 if (str != NULL)
… …
584 { 641 {
585 if (str[0] == '0' && toupper (str[1]) == 'X') 642 if (str[0] == '0' && toupper (str[1]) == 'X')
586 str += 2; 643 str += 2;
587 if (arg) 644 if (arg)
588 { 645 {
589 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 646 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
590 return -1; 647 return -1;
591 } 648 }
592 else 649 else
593 { 650 {
594 if (sscanf (str, "%x:", &sym) != 1) 651 if (sscanf (str, "%x:", &sym) != 1)
595 return -1; 652 return -1;
596 653
597 /* cue to ':', it's there since sscanf () worked */ 654 /* cue to ':', it's there since sscanf () worked */
598 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 655 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
599 newargstr[NEWARGLIM - 1] = '\0'; 656 newargstr[NEWARGLIM - 1] = '\0';
600 newarg = newargstr; 657 newarg = newargstr;
601 } 658 }
602 } 659 }
603 else 660 else
604 { 661 {
605 /* 662 /*
606 * convert keysym name to keysym number 663 * convert keysym name to keysym number
607 */ 664 */
608 STRNCPY (newargstr, str, NEWARGLIM - 1); 665 strncpy (newargstr, str, NEWARGLIM - 1);
609 newargstr[NEWARGLIM - 1] = '\0'; 666 newargstr[NEWARGLIM - 1] = '\0';
610 if (arg == NULL) 667 if (arg == NULL)
611 { 668 {
612 if ((newarg = STRCHR (newargstr, ':')) == NULL) 669 if ((newarg = strchr (newargstr, ':')) == NULL)
613 return -1; 670 return -1;
614 *newarg++ = '\0'; /* terminate keysym name */ 671 *newarg++ = '\0'; /* terminate keysym name */
615 } 672 }
616 if ((sym = XStringToKeysym (newargstr)) == None) 673 if ((sym = XStringToKeysym (newargstr)) == None)
617 return -1; 674 return -1;
… …
623 if (Keysym_map[sym] != NULL) /* already set ? */ 680 if (Keysym_map[sym] != NULL) /* already set ? */
624 return -1; 681 return -1;
625 682
626 if (newarg == NULL) 683 if (newarg == NULL)
627 { 684 {
628 STRNCPY (newargstr, arg, NEWARGLIM - 1); 685 strncpy (newargstr, arg, NEWARGLIM - 1);
629 newargstr[NEWARGLIM - 1] = '\0'; 686 newargstr[NEWARGLIM - 1] = '\0';
630 newarg = newargstr; 687 newarg = newargstr;
631 } 688 }
632 rxvt_Str_trim (newarg); 689 rxvt_Str_trim (newarg);
633 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 690 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
634 return -1; 691 return -1;
635 MIN_IT (n, 255); 692 MIN_IT (n, 255);
636 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 693 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
637 694
638 key_string[0] = n; 695 key_string[0] = n;
639 STRNCPY (key_string + 1, newarg, n); 696 strncpy (key_string + 1, newarg, n);
640 Keysym_map[sym] = (unsigned char *)key_string; 697 Keysym_map[sym] = (unsigned char *)key_string;
641 698
642 return 1; 699 return 1;
643} 700}
644 701
… …
656 char *str, buffer[256]; 713 char *str, buffer[256];
657 714
658 if (stream == NULL) 715 if (stream == NULL)
659 return; 716 return;
660 717
661 len = STRLEN (name); 718 len = strlen (name);
662 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 719 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
663 { 720 {
664 unsigned int entry, n; 721 unsigned int entry, n;
665 722
666 while (*str && isspace (*str)) 723 while (*str && isspace (*str))
667 str++; /* leading whitespace */ 724 str++; /* leading whitespace */
668 725
669 if ((str[len] != '*' && str[len] != '.') 726 if ((str[len] != '*' && str[len] != '.')
670 || (len && STRNCMP (str, name, len))) 727 || (len && strncmp (str, name, len)))
671 continue; 728 continue;
672 str += (len + 1); /* skip `name*' or `name.' */ 729 str += (len + 1); /* skip `name*' or `name.' */
673 730
674# ifdef KEYSYM_RESOURCE 731# ifdef KEYSYM_RESOURCE
675 if (!parse_keysym (str, NULL)) 732 if (!parse_keysym (str, NULL))
… …
679 const char *kw = optList[entry].kw; 736 const char *kw = optList[entry].kw;
680 737
681 if (kw == NULL) 738 if (kw == NULL)
682 continue; 739 continue;
683 740
684 n = STRLEN (kw); 741 n = strlen (kw);
685 if (str[n] == ':' && rxvt_Str_match (str, kw)) 742 if (str[n] == ':' && rxvt_Str_match (str, kw))
686 { 743 {
687 /* skip `keyword:' */ 744 /* skip `keyword:' */
688 str += n + 1; 745 str += n + 1;
689 rxvt_Str_trim (str); 746 rxvt_Str_trim (str);
690 n = STRLEN (str); 747 n = strlen (str);
691 if (n && rs[optList[entry].doff] == NULL) 748 if (n && rs[optList[entry].doff] == NULL)
692 { 749 {
693 /* not already set */ 750 /* not already set */
694 int s; 751 int s;
695 char *p = 0; 752 char *p = 0;
696 753
697 for (int o = 0;;) 754 for (int o = 0;;)
698 { 755 {
699 p = (char *)rxvt_realloc (p, o + n + 1); 756 p = (char *)rxvt_realloc (p, o + n + 1);
700 MEMCPY (p + o, str, n); 757 memcpy (p + o, str, n);
701 o += n; 758 o += n;
702 p[o] = 0; 759 p[o] = 0;
703 760
704 if (o == 0 || p[o - 1] != '\\') // continuation line 761 if (o == 0 || p[o - 1] != '\\') // continuation line
705 break; 762 break;
… …
708 765
709 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 766 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
710 break; 767 break;
711 768
712 rxvt_Str_trim (str); 769 rxvt_Str_trim (str);
713 n = STRLEN (str); 770 n = strlen (str);
714 } 771 }
715 772
716 rs[optList[entry].doff] = p; 773 rs[optList[entry].doff] = p;
717 allocated.push_back (p); 774 allocated.push_back (p);
718 775
719 if (optList_isBool (entry)) 776 if (optList_isBool (entry))
720 { 777 {
721 s = STRCASECMP (str, "TRUE") == 0 778 s = strcasecmp (str, "TRUE") == 0
722 || STRCASECMP (str, "YES") == 0 779 || strcasecmp (str, "YES") == 0
723 || STRCASECMP (str, "ON") == 0 780 || strcasecmp (str, "ON") == 0
724 || STRCASECMP (str, "1") == 0; 781 || strcasecmp (str, "1") == 0;
725 782
726 if (optList_isReverse (entry)) 783 if (optList_isReverse (entry))
727 s = !s; 784 s = !s;
728 785
729 if (s) 786 if (s)
730 Options |= optList[entry].flag; 787 options |= optList[entry].flag;
731 else 788 else
732 Options &= ~optList[entry].flag; 789 options &= ~optList[entry].flag;
733 } 790 }
734 } 791 }
735 792
736 break; 793 break;
737 } 794 }
… …
796 database = XrmGetStringDatabase (displayResource); 853 database = XrmGetStringDatabase (displayResource);
797 854
798# ifdef HAVE_EXTRA_XRESOURCE_FILES 855# ifdef HAVE_EXTRA_XRESOURCE_FILES
799 /* Add in ~/.Xdefaults or ~/.Xresources */ 856 /* Add in ~/.Xdefaults or ~/.Xresources */
800 { 857 {
801 char *ptr; 858 char *ptr;
802 859
803 if ((ptr = (char *)getenv ("HOME")) == NULL) 860 if ((ptr = (char *)getenv ("HOME")) == NULL)
804 ptr = "."; 861 ptr = ".";
805 862
806 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 863 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
807 { 864 {
808 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 865 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
809 ptr, xnames[i]); 866 ptr, xnames[i]);
810 if ((rdb1 = XrmGetFileDatabase (fname))) 867 if ((rdb1 = XrmGetFileDatabase (fname)))
811 { 868 {
812 XrmMergeDatabases (rdb1, &database); 869 XrmMergeDatabases (rdb1, &database);
813# ifndef HAVE_BOTH_XRESOURCE_FILES 870# ifndef HAVE_BOTH_XRESOURCE_FILES
… …
858 if (kw == NULL || rs[optList[entry].doff] != NULL) 915 if (kw == NULL || rs[optList[entry].doff] != NULL)
859 continue; /* previously set */ 916 continue; /* previously set */
860 917
861 p = XGetDefault (display, name, kw); 918 p = XGetDefault (display, name, kw);
862 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 919 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
863 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 920 if (p == NULL || (p0 && strcmp (p, p0) == 0))
864 { 921 {
865 p = XGetDefault (display, RESCLASS, kw); 922 p = XGetDefault (display, RESCLASS, kw);
866#ifdef RESFALLBACK 923#ifdef RESFALLBACK
867 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 924 if (p == NULL || (p0 && strcmp (p, p0) == 0))
868 p = XGetDefault (display, RESFALLBACK, kw); 925 p = XGetDefault (display, RESFALLBACK, kw);
869#endif 926#endif
870 } 927 }
871 928
872 if (p == NULL && p0) 929 if (p == NULL && p0)
… …
876 { 933 {
877 rs[optList[entry].doff] = p; 934 rs[optList[entry].doff] = p;
878 935
879 if (optList_isBool (entry)) 936 if (optList_isBool (entry))
880 { 937 {
881 s = STRCASECMP (p, "TRUE") == 0 938 s = strcasecmp (p, "TRUE") == 0
882 || STRCASECMP (p, "YES") == 0 939 || strcasecmp (p, "YES") == 0
883 || STRCASECMP (p, "ON") == 0 940 || strcasecmp (p, "ON") == 0
884 || STRCASECMP (p, "1") == 0; 941 || strcasecmp (p, "1") == 0;
885 if (optList_isReverse (entry)) 942 if (optList_isReverse (entry))
886 s = !s; 943 s = !s;
887 if (s) 944 if (s)
888 Options |= (optList[entry].flag); 945 options |= (optList[entry].flag);
889 else 946 else
890 Options &= ~ (optList[entry].flag); 947 options &= ~ (optList[entry].flag);
891 } 948 }
892 } 949 }
893 } 950 }
894 951
895 /* 952 /*
… …
923 FILE *fd = NULL; 980 FILE *fd = NULL;
924 char *home; 981 char *home;
925 982
926 if ((home = getenv ("HOME")) != NULL) 983 if ((home = getenv ("HOME")) != NULL)
927 { 984 {
928 unsigned int i, len = STRLEN (home) + 2; 985 unsigned int i, len = strlen (home) + 2;
929 char *f = NULL; 986 char *f = NULL;
930 987
931 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 988 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
932 { 989 {
933 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char)); 990 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
934 991
935 sprintf (f, "%s/%s", home, xnames[i]); 992 sprintf (f, "%s/%s", home, xnames[i]);
936 993
937 if ((fd = fopen (f, "r")) != NULL) 994 if ((fd = fopen (f, "r")) != NULL)
938 break; 995 break;

Diff Legend

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