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.67 by root, Mon Jan 2 20:40:20 2006 UTC vs.
Revision 1.83 by root, Sat Jan 21 22:38:06 2006 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
… …
20 * 20 *
21 * You should have received a copy of the GNU General Public License 21 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 22 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
25/*----------------------------------------------------------------------*
26 * get resources from ~/.Xdefaults or ~/.Xresources with the memory-saving
27 * default or with XGetDefault() (#define USE_XGETDEFAULT)
28 *----------------------------------------------------------------------*/
29 25
30#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
31#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
32#include "version.h" 28#include "version.h"
33
34#include <sys/utsname.h>
35 29
36#ifdef KEYSYM_RESOURCE 30#ifdef KEYSYM_RESOURCE
37#include "keyboard.h" 31#include "keyboard.h"
38#endif 32#endif
39 33
… …
161 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 155 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
162 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 156 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
163 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 157 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
164 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 158 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
165 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 159 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
166#ifndef NO_BRIGHTCOLOR
167 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
169 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 162 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
170 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 163 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
171 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 164 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
172 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 165 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
173 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
174 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 167 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
175#endif /* NO_BRIGHTCOLOR */
176#ifndef NO_BOLD_UNDERLINE_REVERSE 168#ifndef NO_BOLD_UNDERLINE_REVERSE
177 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 169 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
178 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 170 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
179 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 171 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
180 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 172 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
… …
195 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
196#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
197 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
198 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"),
199 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
200#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 192#ifdef XPM_BACKGROUND
201 RSTRG (Rs_path, "path", "search path"), 193 RSTRG (Rs_path, "path", "search path"),
202#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
203#ifdef XPM_BACKGROUND
204 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
205#endif /* XPM_BACKGROUND */
206#if (MENUBAR_MAX)
207 RSTRG (Rs_menu, "menu", "name[;tag]"),
208#endif 195#endif
209 /* fonts: command-line option = resource name */ 196 /* fonts: command-line option = resource name */
210 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
211#if ENABLE_STYLES 198#if ENABLE_STYLES
212 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 199 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
227 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 214 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
228#if ENABLE_XEMBED 215#if ENABLE_XEMBED
229 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"),
230#endif 217#endif
231#if ENABLE_FRILLS 218#if ENABLE_FRILLS
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"),
232 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"),
233 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"),
234 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 223 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
235 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 224 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
236 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 225 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
237 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 226 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
238 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 227 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
228 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
239 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 229 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
240#endif 230#endif
241#ifdef POINTER_BLANK 231#ifdef POINTER_BLANK
242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 232 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
243#endif 233#endif
… …
259#ifndef NO_SECONDARY_SCREEN 249#ifndef NO_SECONDARY_SCREEN
260 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 250 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
261 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 251 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
262#endif 252#endif
263#if ENABLE_PERL 253#if ENABLE_PERL
264 STRG (Rs_perl_lib, "perl-lib", 0, "string", "colon-separated directories with extension scripts"), 254 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
265 STRG (Rs_perl_eval, "perl-eval", 0, "string", "code to be evaluated after all extensions have been loaded"), 255 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
256 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
266 STRG (Rs_perl_ext, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable"), 257 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
267#endif 258#endif
268#if 0 && TODO 259#ifndef NO_RESOURCES
269#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
270 INFO ("xrm", "string", "X resource"), 260 INFO ("xrm", "string", "X resource"),
271#endif
272#endif 261#endif
273 INFO ("e", "command arg ...", "command to execute") 262 INFO ("e", "command arg ...", "command to execute")
274 }; 263 };
275 264
276#undef INFO 265#undef INFO
… …
280#undef BOOL 269#undef BOOL
281/*}}} */ 270/*}}} */
282 271
283static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
284static const char optionsstring[] = "options: " 273static const char optionsstring[] = "options: "
274#if ENABLE_PERL
275 "perl,"
276#endif
285#if XFT 277#if XFT
286 "xft," 278 "xft,"
287#endif 279#endif
288#if ENABLE_STYLES 280#if ENABLE_STYLES
289 "styles," 281 "styles,"
… …
326#if defined(TRANSPARENT) 318#if defined(TRANSPARENT)
327 "transparent," 319 "transparent,"
328#endif 320#endif
329#if TINTING 321#if TINTING
330 "tint," 322 "tint,"
331#endif
332#if defined(UTMP_SUPPORT)
333 "utmp,"
334#endif
335#if defined(MENUBAR)
336 "menubar,"
337#endif 323#endif
338#if defined(USE_XIM) 324#if defined(USE_XIM)
339 "XIM," 325 "XIM,"
340#endif 326#endif
341 "scrollbars=" 327 "scrollbars="
… …
372 "no_delete," 358 "no_delete,"
373#endif 359#endif
374#if EIGHT_BIT_CONTROLS 360#if EIGHT_BIT_CONTROLS
375 "8bitctrls," 361 "8bitctrls,"
376#endif 362#endif
377#if !defined(NO_STRINGS)
378 "strings,"
379#endif
380#if defined(ENABLE_FRILLS) 363#if defined(ENABLE_FRILLS)
381 "frills," 364 "frills,"
382#endif 365#endif
383#if defined(PREFER_24BIT) 366#if defined(PREFER_24BIT)
384 "24bit," 367 "24bit,"
… …
401#if defined(POINTER_BLANK) 384#if defined(POINTER_BLANK)
402 "pointerBlank," 385 "pointerBlank,"
403#endif 386#endif
404#if defined(NO_RESOURCES) 387#if defined(NO_RESOURCES)
405 "NoResources" 388 "NoResources"
406#else
407# if defined(USE_XGETDEFAULT)
408 "XGetDefaults"
409# else
410 ".Xdefaults"
411# endif
412#endif 389#endif
413 "\nUsage: "; /* Usage */ 390 "\nUsage: "; /* Usage */
414 391
415#define INDENT 18 392#define INDENT 18
416 393
… …
572 { /* boolean value */ 549 { /* boolean value */
573#ifdef DEBUG_RESOURCES 550#ifdef DEBUG_RESOURCES
574 fprintf (stderr, "boolean (%s,%s) = %s\n", 551 fprintf (stderr, "boolean (%s,%s) = %s\n",
575 optList[entry].opt, optList[entry].kw, flag); 552 optList[entry].opt, optList[entry].kw, flag);
576#endif 553#endif
577 if (flag == On)
578 SET_OPTION (optList[entry].flag & Optflag_mask); 554 set_option (optList[entry].flag & Optflag_mask, flag == On);
579 else
580 CLR_OPTION (optList[entry].flag & Optflag_mask);
581 555
582 if (optList[entry].doff != -1) 556 if (optList[entry].doff != -1)
583 rs[optList[entry].doff] = flag; 557 rs[optList[entry].doff] = flag;
584 } 558 }
585 } 559 }
… …
617 * "rxvt" "keysym" "0xFF01" 591 * "rxvt" "keysym" "0xFF01"
618 * value will be a string 592 * value will be a string
619 */ 593 */
620/* ARGSUSED */ 594/* ARGSUSED */
621int 595int
622rxvt_define_key (XrmDatabase *database __attribute__((unused)), 596rxvt_define_key (XrmDatabase *database UNUSED,
623 XrmBindingList bindings __attribute__((unused)), 597 XrmBindingList bindings UNUSED,
624 XrmQuarkList quarks, 598 XrmQuarkList quarks,
625 XrmRepresentation *type __attribute__((unused)), 599 XrmRepresentation *type UNUSED,
626 XrmValue *value, 600 XrmValue *value,
627 XPointer closure __attribute__((unused))) 601 XPointer closure UNUSED)
628{ 602{
629 int last; 603 int last;
630 604
631 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 */
632 ; 606 ;
… …
694 { 668 {
695 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 669 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
696 return 0; 670 return 0;
697 671
698 str += n; /* skip `keysym.' */ 672 str += n; /* skip `keysym.' */
699 if ((pmodend = strchr (str, ':')) < str) 673 if (!(pmodend = strchr (str, ':')))
700 return -1; 674 return -1;
701 } 675 }
702 else 676 else
703 pmodend = str + strlen(str); 677 pmodend = str + strlen(str);
704 678
… …
782 keyboard->register_user_translation (sym, state, newarg); 756 keyboard->register_user_translation (sym, state, newarg);
783 return 1; 757 return 1;
784} 758}
785 759
786# endif /* KEYSYM_RESOURCE */ 760# endif /* KEYSYM_RESOURCE */
761#endif /* NO_RESOURCES */
787 762
788# ifndef USE_XGETDEFAULT 763static char *
789/*{{{ rxvt_get_xdefaults () */ 764get_res (XrmDatabase database, const char *program, const char *option)
790/*
791 * the matching algorithm used for memory-save fake resources
792 */
793void
794rxvt_term::get_xdefaults (FILE *stream, const char *name)
795{ 765{
796 unsigned int len; 766 char resource[512];
797 char *str, buffer[256]; 767 char *type;
768 XrmValue result;
798 769
799 if (stream == NULL) 770 snprintf (resource, sizeof (resource), "%s.%s", program, option);
800 return; 771 XrmGetResource (database, resource, resource, &type, &result);
801 772
802 len = strlen (name); 773 return result.addr;
803 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 774}
775
776const char *
777rxvt_term::x_resource (const char *name)
778{
779 XrmDatabase database = XrmGetDatabase (display->display);
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))
804 { 785 {
805 unsigned int entry, n; 786 p = get_res (database, RESCLASS, name);
806 787#ifdef RESFALLBACK
807 while (*str && isspace (*str)) 788 if (p == NULL || (p0 && strcmp (p, p0) == 0))
808 str++; /* leading whitespace */ 789 p = get_res (database, RESFALLBACK, name);
809 790#endif
810 if ((str[len] != '*' && str[len] != '.')
811 || (len && strncmp (str, name, len)))
812 continue;
813 str += (len + 1); /* skip `name*' or `name.' */
814
815# ifdef KEYSYM_RESOURCE
816 if (!parse_keysym (str, NULL))
817# endif /* KEYSYM_RESOURCE */
818 for (entry = 0; entry < optList_size; entry++)
819 {
820 const char *kw = optList[entry].kw;
821
822 if (kw == NULL)
823 continue;
824
825 n = strlen (kw);
826 if (str[n] == ':' && rxvt_Str_match (str, kw))
827 {
828 /* skip `keyword:' */
829 str += n + 1;
830 rxvt_Str_trim (str);
831 n = strlen (str);
832
833 if (n && rs[optList[entry].doff] == NULL)
834 {
835 /* not already set */
836 int s;
837 char *p = 0;
838
839 for (int o = 0;;)
840 {
841 p = (char *)rxvt_realloc (p, o + n + 1);
842 memcpy (p + o, str, n);
843 o += n;
844 p[o] = 0;
845
846 if (o == 0 || p[o - 1] != '\\') // continuation line
847 break;
848
849 o--; // eat "\"
850
851 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
852 break;
853
854 rxvt_Str_trim (str);
855 n = strlen (str);
856 }
857
858 rs[optList[entry].doff] = p;
859 allocated.push_back (p);
860
861 if (optList_isBool (entry))
862 {
863 s = strcasecmp (str, "true") == 0
864 || strcasecmp (str, "yes") == 0
865 || strcasecmp (str, "on") == 0
866 || strcmp (str, "1") == 0;
867
868 if (optList_isReverse (entry))
869 s = !s;
870
871 if (s)
872 SET_OPTION (optList[entry].flag & Optflag_mask);
873 else
874 CLR_OPTION (optList[entry].flag & Optflag_mask);
875 }
876 }
877
878 break;
879 }
880 }
881 } 791 }
882 792
883 rewind (stream); 793 if (p == NULL && p0)
794 p = p0;
795
796 return p;
884} 797}
885 798
886/*}}} */
887# endif /* ! USE_XGETDEFAULT */
888#endif /* NO_RESOURCES */
889
890/*{{{ read the resources files */
891/*
892 * using XGetDefault () or the hand-rolled replacement
893 */
894/* ARGSUSED */
895void 799void
896rxvt_term::extract_resources () 800rxvt_term::extract_resources ()
897{ 801{
898 dDisp;
899
900#ifndef NO_RESOURCES 802#ifndef NO_RESOURCES
901
902 char *homedir = (char *)getenv ("HOME");
903 char fname[1024];
904
905# if defined XAPPLOADDIR
906# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
907 /* Compute the path of the possibly available localized Rxvt file */
908 char localepath[1024];
909
910 if (locale)
911 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
912 else
913 localepath[0] = 0;
914# endif
915# endif
916
917# ifdef USE_XGETDEFAULT
918 /*
919 * get resources using the X library function
920 */
921 int entry;
922
923# ifdef XrmEnumOneLevel
924 char *displayResource, *xe;
925 XrmName name_prefix[3];
926 XrmClass class_prefix[3];
927 XrmDatabase database, rdb1;
928
929 XrmInitialize ();
930 database = NULL;
931
932 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
933
934 // 6. System wide per application default file.
935 /* Add in Rxvt file */
936# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
937 if (*localepath
938 && ((rdb1 = XrmGetFileDatabase (localepath))
939 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
940# endif
941 XrmMergeDatabases (rdb1, &database);
942
943 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
944 if ((xe = (char *)getenv ("XAPPLRESDIR")))
945 {
946 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
947
948 if ((rdb1 = XrmGetFileDatabase (fname)))
949 XrmMergeDatabases (rdb1, &database);
950 }
951
952 // 5. User's per application default file.
953 // none
954
955 // 4. User's defaults file.
956 /* Get any Xserver defaults */
957 displayResource = XResourceManagerString (disp);
958 if (displayResource != NULL)
959 {
960 if ((rdb1 = XrmGetStringDatabase (displayResource)))
961 XrmMergeDatabases (rdb1, &database);
962 }
963 else if (homedir)
964 {
965 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
966
967 if ((rdb1 = XrmGetFileDatabase (fname)))
968 XrmMergeDatabases (rdb1, &database);
969 }
970
971 /* Get screen specific resources */
972 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
973 if (displayResource != NULL)
974 {
975 if ((rdb1 = XrmGetStringDatabase (displayResource)))
976 /* Merge with screen-independent resources */
977 XrmMergeDatabases (rdb1, &database);
978
979 XFree (displayResource);
980 }
981
982 // 3. User's per host defaults file
983 /* Add in XENVIRONMENT file */
984 if ((xe = (char *)getenv ("XENVIRONMENT"))
985 && (rdb1 = XrmGetFileDatabase (xe)))
986 XrmMergeDatabases (rdb1, &database);
987 else if (homedir)
988 {
989 struct utsname un;
990
991 if (!uname (&un))
992 {
993 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
994
995 if ((rdb1 = XrmGetFileDatabase (fname)))
996 XrmMergeDatabases (rdb1, &database);
997 }
998 }
999
1000 XrmSetDatabase (disp, database);
1001# endif
1002
1003 /* 803 /*
1004 * Query resources for options that affect us 804 * Query resources for options that affect us
1005 */ 805 */
1006 for (entry = 0; entry < optList_size; entry++) 806 for (int entry = 0; entry < optList_size; entry++)
1007 { 807 {
1008 int s; 808 int s;
1009 char *p, *p0;
1010 const char *kw = optList[entry].kw; 809 const char *kw = optList[entry].kw;
1011 810
1012 if (kw == NULL || rs[optList[entry].doff] != NULL) 811 if (kw == NULL || rs[optList[entry].doff] != NULL)
1013 continue; /* previously set */ 812 continue; // previously set
1014 813
1015 p = XGetDefault (disp, rs[Rs_name], kw); 814 const char *p = x_resource (kw);
1016 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1017 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1018 {
1019 p = XGetDefault (disp, RESCLASS, kw);
1020#ifdef RESFALLBACK
1021 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1022 p = XGetDefault (disp, RESFALLBACK, kw);
1023#endif
1024 }
1025
1026 if (p == NULL && p0)
1027 p = p0;
1028 815
1029 if (p) 816 if (p)
1030 { 817 {
818 p = strdup (p);
819 allocated.push_back ((void *)p);
1031 rs[optList[entry].doff] = p; 820 rs[optList[entry].doff] = p;
1032 821
1033 if (optList_isBool (entry)) 822 if (optList_isBool (entry))
1034 { 823 {
1035 s = strcasecmp (p, "TRUE") == 0 824 s = strcasecmp (p, "TRUE") == 0
… …
1038 || strcasecmp (p, "1") == 0; 827 || strcasecmp (p, "1") == 0;
1039 828
1040 if (optList_isReverse (entry)) 829 if (optList_isReverse (entry))
1041 s = !s; 830 s = !s;
1042 831
1043 if (s)
1044 SET_OPTION (optList[entry].flag & Optflag_mask); 832 set_option (optList[entry].flag & Optflag_mask, s);
1045 else
1046 CLR_OPTION (optList[entry].flag & Optflag_mask);
1047 } 833 }
1048 } 834 }
1049 } 835 }
1050 836
1051 /* 837 /*
1052 * [R5 or later]: enumerate the resource database 838 * [R5 or later]: enumerate the resource database
1053 */ 839 */
1054# ifdef KEYSYM_RESOURCE 840# ifdef KEYSYM_RESOURCE
841 XrmDatabase database = XrmGetDatabase (display->display);
842 XrmName name_prefix[3];
843 XrmClass class_prefix[3];
844
1055 name_prefix[0] = XrmStringToName (rs[Rs_name]); 845 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1056 name_prefix[1] = XrmStringToName ("keysym"); 846 name_prefix[1] = XrmStringToName ("keysym");
1057 name_prefix[2] = NULLQUARK; 847 name_prefix[2] = NULLQUARK;
1058 class_prefix[0] = XrmStringToName (RESCLASS); 848 class_prefix[0] = XrmStringToName (RESCLASS);
1059 class_prefix[1] = XrmStringToName ("Keysym"); 849 class_prefix[1] = XrmStringToName ("Keysym");
1060 class_prefix[2] = NULLQUARK; 850 class_prefix[2] = NULLQUARK;
1061 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 851 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1062 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 852 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1063 XrmEnumOneLevel, rxvt_define_key, NULL); 853 XrmEnumOneLevel, rxvt_define_key, NULL);
1064# ifdef RESFALLBACK 854# ifdef RESFALLBACK
1065 name_prefix[0] = XrmStringToName (RESFALLBACK); 855 name_prefix[0] = XrmStringToName (RESFALLBACK);
1066 name_prefix[1] = XrmStringToName ("keysym"); 856 name_prefix[1] = XrmStringToName ("keysym");
1067 class_prefix[0] = XrmStringToName (RESFALLBACK); 857 class_prefix[0] = XrmStringToName (RESFALLBACK);
1068 class_prefix[1] = XrmStringToName ("Keysym"); 858 class_prefix[1] = XrmStringToName ("Keysym");
1069 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 859 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1070 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 860 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1071 XrmEnumOneLevel, rxvt_define_key, NULL); 861 XrmEnumOneLevel, rxvt_define_key, NULL);
1072# endif 862# endif
1073# endif 863# endif
1074 864
1075# else /* USE_XGETDEFAULT */
1076 /* get resources the hard way, but save lots of memory */
1077 FILE *fd = NULL;
1078
1079 if (homedir)
1080 {
1081 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1082
1083 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1084 {
1085 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1086
1087 if ((fd = fopen (fname, "r")) != NULL)
1088 break;
1089 }
1090 }
1091 /*
1092 * The normal order to match resources is the following:
1093 * @ global resources (partial match, ~/.Xdefaults)
1094 * @ application file resources (XAPPLOADDIR/Rxvt)
1095 * @ class resources (~/.Xdefaults)
1096 * @ private resources (~/.Xdefaults)
1097 *
1098 * However, for the hand-rolled resources, the matching algorithm
1099 * checks if a resource string value has already been allocated
1100 * and won't overwrite it with (in this case) a less specific
1101 * resource value.
1102 *
1103 * This avoids multiple allocation. Also, when we've called this
1104 * routine command-line string options have already been applied so we
1105 * needn't to allocate for those resources.
1106 *
1107 * So, search in resources from most to least specific.
1108 *
1109 * Also, use a special sub-class so that we can use either or both of
1110 * "XTerm" and "Rxvt" as class names.
1111 */
1112
1113 get_xdefaults (fd, rs[Rs_name]);
1114 get_xdefaults (fd, RESCLASS);
1115# ifdef RESFALLBACK
1116 get_xdefaults (fd, RESFALLBACK);
1117# endif
1118
1119# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1120 {
1121 FILE *ad = NULL;
1122
1123# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1124 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1125# endif
1126 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1127 if (ad != NULL)
1128 {
1129 get_xdefaults (ad, RESCLASS);
1130 get_xdefaults (ad, "");
1131 fclose (ad);
1132 }
1133 }
1134# endif /* XAPPLOADDIR */
1135
1136 get_xdefaults (fd, ""); /* partial match */
1137 if (fd != NULL)
1138 fclose (fd);
1139# endif /* USE_XGETDEFAULT */
1140
1141#endif /* NO_RESOURCES */ 865#endif /* NO_RESOURCES */
1142} 866}
1143 867
1144/*}}} */
1145/*----------------------- end-of-file (C source) -----------------------*/ 868/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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