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.78 by root, Wed Jan 11 02:13:56 2006 UTC vs.
Revision 1.84 by root, Tue Jan 24 19:40:12 2006 UTC

33 33
34/* place holders used for parsing command-line options */ 34/* place holders used for parsing command-line options */
35#define Optflag_Reverse 0x40000000UL 35#define Optflag_Reverse 0x40000000UL
36#define Optflag_Boolean 0x80000000UL 36#define Optflag_Boolean 0x80000000UL
37#define Optflag_mask 0x3fffffffUL 37#define Optflag_mask 0x3fffffffUL
38
39/* #define DEBUG_RESOURCES */
40 38
41/*{{{ monolithic option/resource structure: */ 39/*{{{ monolithic option/resource structure: */
42/* 40/*
43 * `string' options MUST have a usage argument 41 * `string' options MUST have a usage argument
44 * `switch' and `boolean' options have no argument 42 * `switch' and `boolean' options have no argument
187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
188#endif /* NO_CURSORCOLOR */ 186#endif /* NO_CURSORCOLOR */
189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 187 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 188 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
192#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 190#ifdef XPM_BACKGROUND
193 RSTRG (Rs_path, "path", "search path"), 191 RSTRG (Rs_path, "path", "search path"),
194#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
195#ifdef XPM_BACKGROUND
196 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 192 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
197#endif /* XPM_BACKGROUND */
198#if (MENUBAR_MAX)
199 RSTRG (Rs_menu, "menu", "name[;tag]"),
200#endif 193#endif
201 /* fonts: command-line option = resource name */ 194 /* fonts: command-line option = resource name */
202 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
203#if ENABLE_STYLES 196#if ENABLE_STYLES
204 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
220#if ENABLE_XEMBED 213#if ENABLE_XEMBED
221 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 214 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
222#endif 215#endif
223#if ENABLE_FRILLS 216#if ENABLE_FRILLS
224 RSTRG (Rs_transient_for, "transient-for", "windowid"), 217 RSTRG (Rs_transient_for, "transient-for", "windowid"),
218 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"),
225 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 219 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
226 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 220 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 221 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 222 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 223 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
322#if defined(TRANSPARENT) 316#if defined(TRANSPARENT)
323 "transparent," 317 "transparent,"
324#endif 318#endif
325#if TINTING 319#if TINTING
326 "tint," 320 "tint,"
327#endif
328#if defined(UTMP_SUPPORT)
329 "utmp,"
330#endif
331#if defined(MENUBAR)
332 "menubar,"
333#endif 321#endif
334#if defined(USE_XIM) 322#if defined(USE_XIM)
335 "XIM," 323 "XIM,"
336#endif 324#endif
337 "scrollbars=" 325 "scrollbars="
368 "no_delete," 356 "no_delete,"
369#endif 357#endif
370#if EIGHT_BIT_CONTROLS 358#if EIGHT_BIT_CONTROLS
371 "8bitctrls," 359 "8bitctrls,"
372#endif 360#endif
373#if !defined(NO_STRINGS)
374 "strings,"
375#endif
376#if defined(ENABLE_FRILLS) 361#if defined(ENABLE_FRILLS)
377 "frills," 362 "frills,"
378#endif 363#endif
379#if defined(PREFER_24BIT) 364#if defined(PREFER_24BIT)
380 "24bit," 365 "24bit,"
505 { 490 {
506 unsigned int entry, longopt = 0; 491 unsigned int entry, longopt = 0;
507 const char *flag, *opt; 492 const char *flag, *opt;
508 493
509 opt = argv[i]; 494 opt = argv[i];
510#ifdef DEBUG_RESOURCES 495
511 fprintf (stderr, "argv[%d] = %s: ", i, opt);
512#endif
513 if (*opt == '-') 496 if (*opt == '-')
514 { 497 {
515 flag = On; 498 flag = On;
516 if (*++opt == '-') 499 if (*++opt == '-')
517 longopt = *opt++; /* long option */ 500 longopt = *opt++; /* long option */
558 rs[optList[entry].doff] = flag == On && argv[i+1] 541 rs[optList[entry].doff] = flag == On && argv[i+1]
559 ? argv[++i] : 0; 542 ? argv[++i] : 0;
560 } 543 }
561 else 544 else
562 { /* boolean value */ 545 { /* boolean value */
563#ifdef DEBUG_RESOURCES
564 fprintf (stderr, "boolean (%s,%s) = %s\n",
565 optList[entry].opt, optList[entry].kw, flag);
566#endif
567 set_option (optList[entry].flag & Optflag_mask, flag == On); 546 set_option (optList[entry].flag & Optflag_mask, flag == On);
568 547
569 if (optList[entry].doff != -1) 548 if (optList[entry].doff != -1)
570 rs[optList[entry].doff] = flag; 549 rs[optList[entry].doff] = flag;
571 } 550 }
604 * "rxvt" "keysym" "0xFF01" 583 * "rxvt" "keysym" "0xFF01"
605 * value will be a string 584 * value will be a string
606 */ 585 */
607/* ARGSUSED */ 586/* ARGSUSED */
608int 587int
609rxvt_define_key (XrmDatabase *database __attribute__((unused)), 588rxvt_define_key (XrmDatabase *database UNUSED,
610 XrmBindingList bindings __attribute__((unused)), 589 XrmBindingList bindings UNUSED,
611 XrmQuarkList quarks, 590 XrmQuarkList quarks,
612 XrmRepresentation *type __attribute__((unused)), 591 XrmRepresentation *type UNUSED,
613 XrmValue *value, 592 XrmValue *value,
614 XPointer closure __attribute__((unused))) 593 XPointer closure UNUSED)
615{ 594{
616 int last; 595 int last;
617 596
618 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 597 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
619 ; 598 ;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines