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

Diff Legend

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