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.83 by root, Sat Jan 21 22:38:06 2006 UTC

… …
187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
188#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
192#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 192#ifdef XPM_BACKGROUND
193 RSTRG (Rs_path, "path", "search path"), 193 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"), 194 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 195#endif
201 /* fonts: command-line option = resource name */ 196 /* fonts: command-line option = resource name */
202 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
203#if ENABLE_STYLES 198#if ENABLE_STYLES
204 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 199 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
220#if ENABLE_XEMBED 215#if ENABLE_XEMBED
221 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
222#endif 217#endif
223#if ENABLE_FRILLS 218#if ENABLE_FRILLS
224 RSTRG (Rs_transient_for, "transient-for", "windowid"), 219 RSTRG (Rs_transient_for, "transient-for", "windowid"),
220 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"), 221 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"), 222 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 223 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 224 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 225 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
… …
322#if defined(TRANSPARENT) 318#if defined(TRANSPARENT)
323 "transparent," 319 "transparent,"
324#endif 320#endif
325#if TINTING 321#if TINTING
326 "tint," 322 "tint,"
327#endif
328#if defined(UTMP_SUPPORT)
329 "utmp,"
330#endif
331#if defined(MENUBAR)
332 "menubar,"
333#endif 323#endif
334#if defined(USE_XIM) 324#if defined(USE_XIM)
335 "XIM," 325 "XIM,"
336#endif 326#endif
337 "scrollbars=" 327 "scrollbars="
… …
368 "no_delete," 358 "no_delete,"
369#endif 359#endif
370#if EIGHT_BIT_CONTROLS 360#if EIGHT_BIT_CONTROLS
371 "8bitctrls," 361 "8bitctrls,"
372#endif 362#endif
373#if !defined(NO_STRINGS)
374 "strings,"
375#endif
376#if defined(ENABLE_FRILLS) 363#if defined(ENABLE_FRILLS)
377 "frills," 364 "frills,"
378#endif 365#endif
379#if defined(PREFER_24BIT) 366#if defined(PREFER_24BIT)
380 "24bit," 367 "24bit,"
… …
604 * "rxvt" "keysym" "0xFF01" 591 * "rxvt" "keysym" "0xFF01"
605 * value will be a string 592 * value will be a string
606 */ 593 */
607/* ARGSUSED */ 594/* ARGSUSED */
608int 595int
609rxvt_define_key (XrmDatabase *database __attribute__((unused)), 596rxvt_define_key (XrmDatabase *database UNUSED,
610 XrmBindingList bindings __attribute__((unused)), 597 XrmBindingList bindings UNUSED,
611 XrmQuarkList quarks, 598 XrmQuarkList quarks,
612 XrmRepresentation *type __attribute__((unused)), 599 XrmRepresentation *type UNUSED,
613 XrmValue *value, 600 XrmValue *value,
614 XPointer closure __attribute__((unused))) 601 XPointer closure UNUSED)
615{ 602{
616 int last; 603 int last;
617 604
618 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 605 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
619 ; 606 ;
… …
771} 758}
772 759
773# endif /* KEYSYM_RESOURCE */ 760# endif /* KEYSYM_RESOURCE */
774#endif /* NO_RESOURCES */ 761#endif /* NO_RESOURCES */
775 762
763static char *
776char *get_res (XrmDatabase database, const char *program, const char *option) 764get_res (XrmDatabase database, const char *program, const char *option)
777{ 765{
778 char resource[512]; 766 char resource[512];
779 char *type; 767 char *type;
780 XrmValue result; 768 XrmValue result;
781 769
… …
783 XrmGetResource (database, resource, resource, &type, &result); 771 XrmGetResource (database, resource, resource, &type, &result);
784 772
785 return result.addr; 773 return result.addr;
786} 774}
787 775
788/*{{{ read the resources files */ 776const char *
789/* 777rxvt_term::x_resource (const char *name)
790 * using XGetDefault () or the hand-rolled replacement 778{
791 */ 779 XrmDatabase database = XrmGetDatabase (display->display);
792/* ARGSUSED */ 780
781 const char *p = get_res (database, rs[Rs_name], name);
782 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
783
784 if (p == NULL || (p0 && strcmp (p, p0) == 0))
785 {
786 p = get_res (database, RESCLASS, name);
787#ifdef RESFALLBACK
788 if (p == NULL || (p0 && strcmp (p, p0) == 0))
789 p = get_res (database, RESFALLBACK, name);
790#endif
791 }
792
793 if (p == NULL && p0)
794 p = p0;
795
796 return p;
797}
798
793void 799void
794rxvt_term::extract_resources () 800rxvt_term::extract_resources ()
795{ 801{
796 dDisp;
797
798#ifndef NO_RESOURCES 802#ifndef NO_RESOURCES
799 XrmDatabase database = XrmGetDatabase (display->display);
800
801 /* 803 /*
802 * Query resources for options that affect us 804 * Query resources for options that affect us
803 */ 805 */
804 for (int entry = 0; entry < optList_size; entry++) 806 for (int entry = 0; entry < optList_size; entry++)
805 { 807 {
806 int s; 808 int s;
807 char *p, *p0;
808 const char *kw = optList[entry].kw; 809 const char *kw = optList[entry].kw;
809 810
810 if (kw == NULL || rs[optList[entry].doff] != NULL) 811 if (kw == NULL || rs[optList[entry].doff] != NULL)
811 continue; // previously set 812 continue; // previously set
812 813
813 p = get_res (database, rs[Rs_name], kw); 814 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 815
827 if (p) 816 if (p)
828 { 817 {
829 p = strdup (p); 818 p = strdup (p);
830 allocated.push_back (p); 819 allocated.push_back ((void *)p);
831 rs[optList[entry].doff] = p; 820 rs[optList[entry].doff] = p;
832 821
833 if (optList_isBool (entry)) 822 if (optList_isBool (entry))
834 { 823 {
835 s = strcasecmp (p, "TRUE") == 0 824 s = strcasecmp (p, "TRUE") == 0
… …
847 836
848 /* 837 /*
849 * [R5 or later]: enumerate the resource database 838 * [R5 or later]: enumerate the resource database
850 */ 839 */
851# ifdef KEYSYM_RESOURCE 840# ifdef KEYSYM_RESOURCE
841 XrmDatabase database = XrmGetDatabase (display->display);
852 XrmName name_prefix[3]; 842 XrmName name_prefix[3];
853 XrmClass class_prefix[3]; 843 XrmClass class_prefix[3];
854 844
855 name_prefix[0] = XrmStringToName (rs[Rs_name]); 845 name_prefix[0] = XrmStringToName (rs[Rs_name]);
856 name_prefix[1] = XrmStringToName ("keysym"); 846 name_prefix[1] = XrmStringToName ("keysym");
… …
873# endif 863# endif
874 864
875#endif /* NO_RESOURCES */ 865#endif /* NO_RESOURCES */
876} 866}
877 867
878/*}}} */
879/*----------------------- end-of-file (C source) -----------------------*/ 868/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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