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

Diff Legend

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