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.77 by root, Wed Jan 11 00:59:58 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(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 */ 387 "\nUsage: "; /* Usage */
404 388
405#define INDENT 18 389#define INDENT 18
406 390
407/*{{{ usage: */ 391/*{{{ usage: */
… …
505 { 489 {
506 unsigned int entry, longopt = 0; 490 unsigned int entry, longopt = 0;
507 const char *flag, *opt; 491 const char *flag, *opt;
508 492
509 opt = argv[i]; 493 opt = argv[i];
510#ifdef DEBUG_RESOURCES 494
511 fprintf (stderr, "argv[%d] = %s: ", i, opt);
512#endif
513 if (*opt == '-') 495 if (*opt == '-')
514 { 496 {
515 flag = On; 497 flag = On;
516 if (*++opt == '-') 498 if (*++opt == '-')
517 longopt = *opt++; /* long option */ 499 longopt = *opt++; /* long option */
… …
558 rs[optList[entry].doff] = flag == On && argv[i+1] 540 rs[optList[entry].doff] = flag == On && argv[i+1]
559 ? argv[++i] : 0; 541 ? argv[++i] : 0;
560 } 542 }
561 else 543 else
562 { /* boolean value */ 544 { /* 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); 545 set_option (optList[entry].flag & Optflag_mask, flag == On);
568 546
569 if (optList[entry].doff != -1) 547 if (optList[entry].doff != -1)
570 rs[optList[entry].doff] = flag; 548 rs[optList[entry].doff] = flag;
571 } 549 }
… …
604 * "rxvt" "keysym" "0xFF01" 582 * "rxvt" "keysym" "0xFF01"
605 * value will be a string 583 * value will be a string
606 */ 584 */
607/* ARGSUSED */ 585/* ARGSUSED */
608int 586int
609rxvt_define_key (XrmDatabase *database __attribute__((unused)), 587rxvt_define_key (XrmDatabase *database UNUSED,
610 XrmBindingList bindings __attribute__((unused)), 588 XrmBindingList bindings UNUSED,
611 XrmQuarkList quarks, 589 XrmQuarkList quarks,
612 XrmRepresentation *type __attribute__((unused)), 590 XrmRepresentation *type UNUSED,
613 XrmValue *value, 591 XrmValue *value,
614 XPointer closure __attribute__((unused))) 592 XPointer closure UNUSED)
615{ 593{
616 int last; 594 int last;
617 595
618 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 */
619 ; 597 ;
… …
771} 749}
772 750
773# endif /* KEYSYM_RESOURCE */ 751# endif /* KEYSYM_RESOURCE */
774#endif /* NO_RESOURCES */ 752#endif /* NO_RESOURCES */
775 753
754static char *
776char *get_res (XrmDatabase database, const char *program, const char *option) 755get_res (XrmDatabase database, const char *program, const char *option)
777{ 756{
778 char resource[512]; 757 char resource[512];
779 char *type; 758 char *type;
780 XrmValue result; 759 XrmValue result;
781 760
… …
783 XrmGetResource (database, resource, resource, &type, &result); 762 XrmGetResource (database, resource, resource, &type, &result);
784 763
785 return result.addr; 764 return result.addr;
786} 765}
787 766
788/*{{{ read the resources files */ 767const char *
789/* 768rxvt_term::x_resource (const char *name)
790 * using XGetDefault () or the hand-rolled replacement 769{
791 */ 770 XrmDatabase database = XrmGetDatabase (xdisp);
792/* ARGSUSED */ 771
772 const char *p = get_res (database, rs[Rs_name], name);
773 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
774
775 if (p == NULL || (p0 && strcmp (p, p0) == 0))
776 {
777 p = get_res (database, RESCLASS, name);
778#ifdef RESFALLBACK
779 if (p == NULL || (p0 && strcmp (p, p0) == 0))
780 p = get_res (database, RESFALLBACK, name);
781#endif
782 }
783
784 if (p == NULL && p0)
785 p = p0;
786
787 return p;
788}
789
793void 790void
794rxvt_term::extract_resources () 791rxvt_term::extract_resources ()
795{ 792{
796 dDisp;
797
798#ifndef NO_RESOURCES 793#ifndef NO_RESOURCES
799 XrmDatabase database = XrmGetDatabase (display->display);
800
801 /* 794 /*
802 * Query resources for options that affect us 795 * Query resources for options that affect us
803 */ 796 */
804 for (int entry = 0; entry < optList_size; entry++) 797 for (int entry = 0; entry < optList_size; entry++)
805 { 798 {
806 int s; 799 int s;
807 char *p, *p0;
808 const char *kw = optList[entry].kw; 800 const char *kw = optList[entry].kw;
809 801
810 if (kw == NULL || rs[optList[entry].doff] != NULL) 802 if (kw == NULL || rs[optList[entry].doff] != NULL)
811 continue; // previously set 803 continue; // previously set
812 804
813 p = get_res (database, rs[Rs_name], kw); 805 const char *p = x_resource (kw);
814 p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
815 if (p == NULL || (p0 && strcmp (p, p0) == 0))
816 {
817 p = get_res (database, RESCLASS, kw);
818#ifdef RESFALLBACK
819 if (p == NULL || (p0 && strcmp (p, p0) == 0))
820 p = get_res (database, RESFALLBACK, kw);
821#endif
822 }
823
824 if (p == NULL && p0)
825 p = p0;
826 806
827 if (p) 807 if (p)
828 { 808 {
829 p = strdup (p); 809 p = strdup (p);
830 allocated.push_back (p); 810 allocated.push_back ((void *)p);
831 rs[optList[entry].doff] = p; 811 rs[optList[entry].doff] = p;
832 812
833 if (optList_isBool (entry)) 813 if (optList_isBool (entry))
834 { 814 {
835 s = strcasecmp (p, "TRUE") == 0 815 s = strcasecmp (p, "TRUE") == 0
… …
847 827
848 /* 828 /*
849 * [R5 or later]: enumerate the resource database 829 * [R5 or later]: enumerate the resource database
850 */ 830 */
851# ifdef KEYSYM_RESOURCE 831# ifdef KEYSYM_RESOURCE
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");
… …
873# endif 854# endif
874 855
875#endif /* NO_RESOURCES */ 856#endif /* NO_RESOURCES */
876} 857}
877 858
878/*}}} */
879/*----------------------- end-of-file (C source) -----------------------*/ 859/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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