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.79 by root, Mon Jan 16 09:28:17 2006 UTC vs.
Revision 1.89 by root, Sun Jan 29 22:27:04 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"),
… …
218 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
219 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
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
216#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218#endif
223#if ENABLE_FRILLS 219#if ENABLE_FRILLS
224 RSTRG (Rs_transient_for, "transient-for", "windowid"), 220 RSTRG (Rs_transient_for, "transient-for", "windowid"),
221 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"), 222 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"), 223 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 224 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 225 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
… …
323 "transparent," 320 "transparent,"
324#endif 321#endif
325#if TINTING 322#if TINTING
326 "tint," 323 "tint,"
327#endif 324#endif
328#if defined(UTMP_SUPPORT)
329 "utmp,"
330#endif
331#if defined(MENUBAR)
332 "menubar,"
333#endif
334#if defined(USE_XIM) 325#if defined(USE_XIM)
335 "XIM," 326 "XIM,"
327#endif
328#if defined(NO_BACKSPACE_KEY)
329 "no_backspace,"
330#endif
331#if defined(NO_DELETE_KEY)
332 "no_delete,"
333#endif
334#if EIGHT_BIT_CONTROLS
335 "8bitctrls,"
336#endif
337#if defined(ENABLE_FRILLS)
338 "frills,"
339#endif
340#if defined(SELECTION_SCROLLING)
341 "selectionscrolling,"
342#endif
343#if MOUSE_WHEEL
344 "wheel,"
345#endif
346#if MOUSE_SLIP_WHEELING
347 "slipwheel,"
348#endif
349#if defined(SMART_RESIZE)
350 "smart-resize,"
351#endif
352#if defined(CURSOR_BLINK)
353 "cursorBlink,"
354#endif
355#if defined(POINTER_BLANK)
356 "pointerBlank,"
357#endif
358#if defined(NO_RESOURCES)
359 "NoResources,"
336#endif 360#endif
337 "scrollbars=" 361 "scrollbars="
338#if !defined(HAVE_SCROLLBARS) 362#if !defined(HAVE_SCROLLBARS)
339 "NONE" 363 "NONE"
340#else 364#else
… …
358# endif 382# endif
359# if defined(XTERM_SCROLLBAR) 383# if defined(XTERM_SCROLLBAR)
360 "xterm" 384 "xterm"
361# endif 385# endif
362#endif 386#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(ENABLE_FRILLS)
374 "frills,"
375#endif
376#if defined(PREFER_24BIT)
377 "24bit,"
378#endif
379#if defined(SELECTION_SCROLLING)
380 "selectionscrolling,"
381#endif
382#if MOUSE_WHEEL
383 "wheel,"
384#endif
385#if MOUSE_SLIP_WHEELING
386 "slipwheel,"
387#endif
388#if defined(SMART_RESIZE)
389 "smart-resize,"
390#endif
391#if defined(CURSOR_BLINK)
392 "cursorBlink,"
393#endif
394#if defined(POINTER_BLANK)
395 "pointerBlank,"
396#endif
397#if defined(NO_RESOURCES)
398 "NoResources"
399#endif
400 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
401 388
402#define INDENT 18 389#define INDENT 18
403 390
404/*{{{ usage: */ 391/*{{{ usage: */
… …
502 { 489 {
503 unsigned int entry, longopt = 0; 490 unsigned int entry, longopt = 0;
504 const char *flag, *opt; 491 const char *flag, *opt;
505 492
506 opt = argv[i]; 493 opt = argv[i];
507#ifdef DEBUG_RESOURCES 494
508 fprintf (stderr, "argv[%d] = %s: ", i, opt);
509#endif
510 if (*opt == '-') 495 if (*opt == '-')
511 { 496 {
512 flag = On; 497 flag = On;
513 if (*++opt == '-') 498 if (*++opt == '-')
514 longopt = *opt++; /* long option */ 499 longopt = *opt++; /* long option */
… …
555 rs[optList[entry].doff] = flag == On && argv[i+1] 540 rs[optList[entry].doff] = flag == On && argv[i+1]
556 ? argv[++i] : 0; 541 ? argv[++i] : 0;
557 } 542 }
558 else 543 else
559 { /* boolean value */ 544 { /* boolean value */
560#ifdef DEBUG_RESOURCES
561 fprintf (stderr, "boolean (%s,%s) = %s\n",
562 optList[entry].opt, optList[entry].kw, flag);
563#endif
564 set_option (optList[entry].flag & Optflag_mask, flag == On); 545 set_option (optList[entry].flag & Optflag_mask, flag == On);
565 546
566 if (optList[entry].doff != -1) 547 if (optList[entry].doff != -1)
567 rs[optList[entry].doff] = flag; 548 rs[optList[entry].doff] = flag;
568 } 549 }
… …
601 * "rxvt" "keysym" "0xFF01" 582 * "rxvt" "keysym" "0xFF01"
602 * value will be a string 583 * value will be a string
603 */ 584 */
604/* ARGSUSED */ 585/* ARGSUSED */
605int 586int
606rxvt_define_key (XrmDatabase *database __attribute__((unused)), 587rxvt_define_key (XrmDatabase *database UNUSED,
607 XrmBindingList bindings __attribute__((unused)), 588 XrmBindingList bindings UNUSED,
608 XrmQuarkList quarks, 589 XrmQuarkList quarks,
609 XrmRepresentation *type __attribute__((unused)), 590 XrmRepresentation *type UNUSED,
610 XrmValue *value, 591 XrmValue *value,
611 XPointer closure __attribute__((unused))) 592 XPointer closure UNUSED)
612{ 593{
613 int last; 594 int last;
614 595
615 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 596 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
616 ; 597 ;
… …
784} 765}
785 766
786const char * 767const char *
787rxvt_term::x_resource (const char *name) 768rxvt_term::x_resource (const char *name)
788{ 769{
789 XrmDatabase database = XrmGetDatabase (display->display); 770 XrmDatabase database = XrmGetDatabase (xdisp);
790 771
791 const char *p = get_res (database, rs[Rs_name], name); 772 const char *p = get_res (database, rs[Rs_name], name);
792 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 773 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
793 774
794 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 775 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
846 827
847 /* 828 /*
848 * [R5 or later]: enumerate the resource database 829 * [R5 or later]: enumerate the resource database
849 */ 830 */
850# ifdef KEYSYM_RESOURCE 831# ifdef KEYSYM_RESOURCE
851 XrmDatabase database = XrmGetDatabase (display->display); 832 XrmDatabase database = XrmGetDatabase (xdisp);
852 XrmName name_prefix[3]; 833 XrmName name_prefix[3];
853 XrmClass class_prefix[3]; 834 XrmClass class_prefix[3];
854 835
855 name_prefix[0] = XrmStringToName (rs[Rs_name]); 836 name_prefix[0] = XrmStringToName (rs[Rs_name]);
856 name_prefix[1] = XrmStringToName ("keysym"); 837 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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