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

Diff Legend

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