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.88 by root, Wed Jan 25 22:14:45 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"),
221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 222 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 223 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 224 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 225 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 226 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
… …
323 "transparent," 318 "transparent,"
324#endif 319#endif
325#if TINTING 320#if TINTING
326 "tint," 321 "tint,"
327#endif 322#endif
328#if defined(UTMP_SUPPORT)
329 "utmp,"
330#endif
331#if defined(MENUBAR)
332 "menubar,"
333#endif
334#if defined(USE_XIM) 323#if defined(USE_XIM)
335 "XIM," 324 "XIM,"
325#endif
326#if defined(NO_BACKSPACE_KEY)
327 "no_backspace,"
328#endif
329#if defined(NO_DELETE_KEY)
330 "no_delete,"
331#endif
332#if EIGHT_BIT_CONTROLS
333 "8bitctrls,"
334#endif
335#if defined(ENABLE_FRILLS)
336 "frills,"
337#endif
338#if defined(SELECTION_SCROLLING)
339 "selectionscrolling,"
340#endif
341#if MOUSE_WHEEL
342 "wheel,"
343#endif
344#if MOUSE_SLIP_WHEELING
345 "slipwheel,"
346#endif
347#if defined(SMART_RESIZE)
348 "smart-resize,"
349#endif
350#if defined(CURSOR_BLINK)
351 "cursorBlink,"
352#endif
353#if defined(POINTER_BLANK)
354 "pointerBlank,"
355#endif
356#if defined(NO_RESOURCES)
357 "NoResources,"
336#endif 358#endif
337 "scrollbars=" 359 "scrollbars="
338#if !defined(HAVE_SCROLLBARS) 360#if !defined(HAVE_SCROLLBARS)
339 "NONE" 361 "NONE"
340#else 362#else
… …
358# endif 380# endif
359# if defined(XTERM_SCROLLBAR) 381# if defined(XTERM_SCROLLBAR)
360 "xterm" 382 "xterm"
361# endif 383# endif
362#endif 384#endif
363 ","
364#if defined(NO_BACKSPACE_KEY)
365 "no_backspace,"
366#endif
367#if defined(NO_DELETE_KEY)
368 "no_delete,"
369#endif
370#if EIGHT_BIT_CONTROLS
371 "8bitctrls,"
372#endif
373#if !defined(NO_STRINGS)
374 "strings,"
375#endif
376#if defined(ENABLE_FRILLS)
377 "frills,"
378#endif
379#if defined(PREFER_24BIT)
380 "24bit,"
381#endif
382#if defined(SELECTION_SCROLLING)
383 "selectionscrolling,"
384#endif
385#if MOUSE_WHEEL
386 "wheel,"
387#endif
388#if MOUSE_SLIP_WHEELING
389 "slipwheel,"
390#endif
391#if defined(SMART_RESIZE)
392 "smart-resize,"
393#endif
394#if defined(CURSOR_BLINK)
395 "cursorBlink,"
396#endif
397#if defined(POINTER_BLANK)
398 "pointerBlank,"
399#endif
400#if defined(NO_RESOURCES)
401 "NoResources"
402#endif
403 "\nUsage: "; /* Usage */ 385 "\nUsage: "; /* Usage */
404 386
405#define INDENT 18 387#define INDENT 18
406 388
407/*{{{ usage: */ 389/*{{{ usage: */
… …
505 { 487 {
506 unsigned int entry, longopt = 0; 488 unsigned int entry, longopt = 0;
507 const char *flag, *opt; 489 const char *flag, *opt;
508 490
509 opt = argv[i]; 491 opt = argv[i];
510#ifdef DEBUG_RESOURCES 492
511 fprintf (stderr, "argv[%d] = %s: ", i, opt);
512#endif
513 if (*opt == '-') 493 if (*opt == '-')
514 { 494 {
515 flag = On; 495 flag = On;
516 if (*++opt == '-') 496 if (*++opt == '-')
517 longopt = *opt++; /* long option */ 497 longopt = *opt++; /* long option */
… …
558 rs[optList[entry].doff] = flag == On && argv[i+1] 538 rs[optList[entry].doff] = flag == On && argv[i+1]
559 ? argv[++i] : 0; 539 ? argv[++i] : 0;
560 } 540 }
561 else 541 else
562 { /* boolean value */ 542 { /* 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); 543 set_option (optList[entry].flag & Optflag_mask, flag == On);
568 544
569 if (optList[entry].doff != -1) 545 if (optList[entry].doff != -1)
570 rs[optList[entry].doff] = flag; 546 rs[optList[entry].doff] = flag;
571 } 547 }
… …
604 * "rxvt" "keysym" "0xFF01" 580 * "rxvt" "keysym" "0xFF01"
605 * value will be a string 581 * value will be a string
606 */ 582 */
607/* ARGSUSED */ 583/* ARGSUSED */
608int 584int
609rxvt_define_key (XrmDatabase *database __attribute__((unused)), 585rxvt_define_key (XrmDatabase *database UNUSED,
610 XrmBindingList bindings __attribute__((unused)), 586 XrmBindingList bindings UNUSED,
611 XrmQuarkList quarks, 587 XrmQuarkList quarks,
612 XrmRepresentation *type __attribute__((unused)), 588 XrmRepresentation *type UNUSED,
613 XrmValue *value, 589 XrmValue *value,
614 XPointer closure __attribute__((unused))) 590 XPointer closure UNUSED)
615{ 591{
616 int last; 592 int last;
617 593
618 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 594 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
619 ; 595 ;
… …
787} 763}
788 764
789const char * 765const char *
790rxvt_term::x_resource (const char *name) 766rxvt_term::x_resource (const char *name)
791{ 767{
792 XrmDatabase database = XrmGetDatabase (display->display); 768 XrmDatabase database = XrmGetDatabase (xdisp);
793 769
794 const char *p = get_res (database, rs[Rs_name], name); 770 const char *p = get_res (database, rs[Rs_name], name);
795 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 771 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
796 772
797 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 773 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
849 825
850 /* 826 /*
851 * [R5 or later]: enumerate the resource database 827 * [R5 or later]: enumerate the resource database
852 */ 828 */
853# ifdef KEYSYM_RESOURCE 829# ifdef KEYSYM_RESOURCE
854 XrmDatabase database = XrmGetDatabase (display->display); 830 XrmDatabase database = XrmGetDatabase (xdisp);
855 XrmName name_prefix[3]; 831 XrmName name_prefix[3];
856 XrmClass class_prefix[3]; 832 XrmClass class_prefix[3];
857 833
858 name_prefix[0] = XrmStringToName (rs[Rs_name]); 834 name_prefix[0] = XrmStringToName (rs[Rs_name]);
859 name_prefix[1] = XrmStringToName ("keysym"); 835 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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