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.64 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.82 by root, Fri Jan 20 10:27:08 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
… …
258 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 248 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
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 0 && TODO 253#if ENABLE_PERL
264#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT) 254 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
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
257 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
258#endif
259#ifndef NO_RESOURCES
265 INFO ("xrm", "string", "X resource"), 260 INFO ("xrm", "string", "X resource"),
266#endif
267#endif 261#endif
268 INFO ("e", "command arg ...", "command to execute") 262 INFO ("e", "command arg ...", "command to execute")
269 }; 263 };
270 264
271#undef INFO 265#undef INFO
… …
275#undef BOOL 269#undef BOOL
276/*}}} */ 270/*}}} */
277 271
278static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
279static const char optionsstring[] = "options: " 273static const char optionsstring[] = "options: "
274#if ENABLE_PERL
275 "perl,"
276#endif
280#if XFT 277#if XFT
281 "xft," 278 "xft,"
282#endif 279#endif
283#if ENABLE_STYLES 280#if ENABLE_STYLES
284 "styles," 281 "styles,"
… …
324#if TINTING 321#if TINTING
325 "tint," 322 "tint,"
326#endif 323#endif
327#if defined(UTMP_SUPPORT) 324#if defined(UTMP_SUPPORT)
328 "utmp," 325 "utmp,"
329#endif
330#if defined(MENUBAR)
331 "menubar,"
332#endif 326#endif
333#if defined(USE_XIM) 327#if defined(USE_XIM)
334 "XIM," 328 "XIM,"
335#endif 329#endif
336 "scrollbars=" 330 "scrollbars="
… …
367 "no_delete," 361 "no_delete,"
368#endif 362#endif
369#if EIGHT_BIT_CONTROLS 363#if EIGHT_BIT_CONTROLS
370 "8bitctrls," 364 "8bitctrls,"
371#endif 365#endif
372#if !defined(NO_STRINGS)
373 "strings,"
374#endif
375#if defined(ENABLE_FRILLS) 366#if defined(ENABLE_FRILLS)
376 "frills," 367 "frills,"
377#endif 368#endif
378#if defined(PREFER_24BIT) 369#if defined(PREFER_24BIT)
379 "24bit," 370 "24bit,"
… …
396#if defined(POINTER_BLANK) 387#if defined(POINTER_BLANK)
397 "pointerBlank," 388 "pointerBlank,"
398#endif 389#endif
399#if defined(NO_RESOURCES) 390#if defined(NO_RESOURCES)
400 "NoResources" 391 "NoResources"
401#else
402# if defined(USE_XGETDEFAULT)
403 "XGetDefaults"
404# else
405 ".Xdefaults"
406# endif
407#endif 392#endif
408 "\nUsage: "; /* Usage */ 393 "\nUsage: "; /* Usage */
409 394
410#define INDENT 18 395#define INDENT 18
411 396
… …
567 { /* boolean value */ 552 { /* boolean value */
568#ifdef DEBUG_RESOURCES 553#ifdef DEBUG_RESOURCES
569 fprintf (stderr, "boolean (%s,%s) = %s\n", 554 fprintf (stderr, "boolean (%s,%s) = %s\n",
570 optList[entry].opt, optList[entry].kw, flag); 555 optList[entry].opt, optList[entry].kw, flag);
571#endif 556#endif
572 if (flag == On)
573 SET_OPTION (optList[entry].flag & Optflag_mask); 557 set_option (optList[entry].flag & Optflag_mask, flag == On);
574 else
575 CLR_OPTION (optList[entry].flag & Optflag_mask);
576 558
577 if (optList[entry].doff != -1) 559 if (optList[entry].doff != -1)
578 rs[optList[entry].doff] = flag; 560 rs[optList[entry].doff] = flag;
579 } 561 }
580 } 562 }
… …
612 * "rxvt" "keysym" "0xFF01" 594 * "rxvt" "keysym" "0xFF01"
613 * value will be a string 595 * value will be a string
614 */ 596 */
615/* ARGSUSED */ 597/* ARGSUSED */
616int 598int
617rxvt_define_key (XrmDatabase *database __attribute__((unused)), 599rxvt_define_key (XrmDatabase *database UNUSED,
618 XrmBindingList bindings __attribute__((unused)), 600 XrmBindingList bindings UNUSED,
619 XrmQuarkList quarks, 601 XrmQuarkList quarks,
620 XrmRepresentation *type __attribute__((unused)), 602 XrmRepresentation *type UNUSED,
621 XrmValue *value, 603 XrmValue *value,
622 XPointer closure __attribute__((unused))) 604 XPointer closure UNUSED)
623{ 605{
624 int last; 606 int last;
625 607
626 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 608 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
627 ; 609 ;
… …
689 { 671 {
690 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 672 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
691 return 0; 673 return 0;
692 674
693 str += n; /* skip `keysym.' */ 675 str += n; /* skip `keysym.' */
694 if ((pmodend = strchr (str, ':')) < str) 676 if (!(pmodend = strchr (str, ':')))
695 return -1; 677 return -1;
696 } 678 }
697 else 679 else
698 pmodend = str + strlen(str); 680 pmodend = str + strlen(str);
699 681
… …
777 keyboard->register_user_translation (sym, state, newarg); 759 keyboard->register_user_translation (sym, state, newarg);
778 return 1; 760 return 1;
779} 761}
780 762
781# endif /* KEYSYM_RESOURCE */ 763# endif /* KEYSYM_RESOURCE */
764#endif /* NO_RESOURCES */
782 765
783# ifndef USE_XGETDEFAULT 766static char *
784/*{{{ rxvt_get_xdefaults () */ 767get_res (XrmDatabase database, const char *program, const char *option)
785/*
786 * the matching algorithm used for memory-save fake resources
787 */
788void
789rxvt_term::get_xdefaults (FILE *stream, const char *name)
790{ 768{
791 unsigned int len; 769 char resource[512];
792 char *str, buffer[256]; 770 char *type;
771 XrmValue result;
793 772
794 if (stream == NULL) 773 snprintf (resource, sizeof (resource), "%s.%s", program, option);
795 return; 774 XrmGetResource (database, resource, resource, &type, &result);
796 775
797 len = strlen (name); 776 return result.addr;
798 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 777}
778
779const char *
780rxvt_term::x_resource (const char *name)
781{
782 XrmDatabase database = XrmGetDatabase (display->display);
783
784 const char *p = get_res (database, rs[Rs_name], name);
785 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
786
787 if (p == NULL || (p0 && strcmp (p, p0) == 0))
799 { 788 {
800 unsigned int entry, n; 789 p = get_res (database, RESCLASS, name);
801 790#ifdef RESFALLBACK
802 while (*str && isspace (*str)) 791 if (p == NULL || (p0 && strcmp (p, p0) == 0))
803 str++; /* leading whitespace */ 792 p = get_res (database, RESFALLBACK, name);
804 793#endif
805 if ((str[len] != '*' && str[len] != '.')
806 || (len && strncmp (str, name, len)))
807 continue;
808 str += (len + 1); /* skip `name*' or `name.' */
809
810# ifdef KEYSYM_RESOURCE
811 if (!parse_keysym (str, NULL))
812# endif /* KEYSYM_RESOURCE */
813 for (entry = 0; entry < optList_size; entry++)
814 {
815 const char *kw = optList[entry].kw;
816
817 if (kw == NULL)
818 continue;
819
820 n = strlen (kw);
821 if (str[n] == ':' && rxvt_Str_match (str, kw))
822 {
823 /* skip `keyword:' */
824 str += n + 1;
825 rxvt_Str_trim (str);
826 n = strlen (str);
827
828 if (n && rs[optList[entry].doff] == NULL)
829 {
830 /* not already set */
831 int s;
832 char *p = 0;
833
834 for (int o = 0;;)
835 {
836 p = (char *)rxvt_realloc (p, o + n + 1);
837 memcpy (p + o, str, n);
838 o += n;
839 p[o] = 0;
840
841 if (o == 0 || p[o - 1] != '\\') // continuation line
842 break;
843
844 o--; // eat "\"
845
846 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
847 break;
848
849 rxvt_Str_trim (str);
850 n = strlen (str);
851 }
852
853 rs[optList[entry].doff] = p;
854 allocated.push_back (p);
855
856 if (optList_isBool (entry))
857 {
858 s = strcasecmp (str, "true") == 0
859 || strcasecmp (str, "yes") == 0
860 || strcasecmp (str, "on") == 0
861 || strcmp (str, "1") == 0;
862
863 if (optList_isReverse (entry))
864 s = !s;
865
866 if (s)
867 SET_OPTION (optList[entry].flag & Optflag_mask);
868 else
869 CLR_OPTION (optList[entry].flag & Optflag_mask);
870 }
871 }
872
873 break;
874 }
875 }
876 } 794 }
877 795
878 rewind (stream); 796 if (p == NULL && p0)
797 p = p0;
798
799 return p;
879} 800}
880 801
881/*}}} */
882# endif /* ! USE_XGETDEFAULT */
883#endif /* NO_RESOURCES */
884
885/*{{{ read the resources files */
886/*
887 * using XGetDefault () or the hand-rolled replacement
888 */
889/* ARGSUSED */
890void 802void
891rxvt_term::extract_resources () 803rxvt_term::extract_resources ()
892{ 804{
893 dDisp;
894
895#ifndef NO_RESOURCES 805#ifndef NO_RESOURCES
896
897 char *homedir = (char *)getenv ("HOME");
898 char fname[1024];
899
900# if defined XAPPLOADDIR
901# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
902 /* Compute the path of the possibly available localized Rxvt file */
903 char localepath[1024];
904
905 if (locale)
906 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
907 else
908 localepath[0] = 0;
909# endif
910# endif
911
912# ifdef USE_XGETDEFAULT
913 /*
914 * get resources using the X library function
915 */
916 int entry;
917
918# ifdef XrmEnumOneLevel
919 char *displayResource, *xe;
920 XrmName name_prefix[3];
921 XrmClass class_prefix[3];
922 XrmDatabase database, rdb1;
923
924 XrmInitialize ();
925 database = NULL;
926
927 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
928
929 // 6. System wide per application default file.
930 /* Add in Rxvt file */
931# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
932 if (*localepath
933 && ((rdb1 = XrmGetFileDatabase (localepath))
934 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
935# endif
936 XrmMergeDatabases (rdb1, &database);
937
938 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
939 if ((xe = (char *)getenv ("XAPPLRESDIR")))
940 {
941 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
942
943 if ((rdb1 = XrmGetFileDatabase (fname)))
944 XrmMergeDatabases (rdb1, &database);
945 }
946
947 // 5. User's per application default file.
948 // none
949
950 // 4. User's defaults file.
951 /* Get any Xserver defaults */
952 displayResource = XResourceManagerString (disp);
953 if (displayResource != NULL)
954 {
955 if ((rdb1 = XrmGetStringDatabase (displayResource)))
956 XrmMergeDatabases (rdb1, &database);
957 }
958 else if (homedir)
959 {
960 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
961
962 if ((rdb1 = XrmGetFileDatabase (fname)))
963 XrmMergeDatabases (rdb1, &database);
964 }
965
966 /* Get screen specific resources */
967 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
968 if (displayResource != NULL)
969 {
970 if ((rdb1 = XrmGetStringDatabase (displayResource)))
971 /* Merge with screen-independent resources */
972 XrmMergeDatabases (rdb1, &database);
973
974 XFree (displayResource);
975 }
976
977 // 3. User's per host defaults file
978 /* Add in XENVIRONMENT file */
979 if ((xe = (char *)getenv ("XENVIRONMENT"))
980 && (rdb1 = XrmGetFileDatabase (xe)))
981 XrmMergeDatabases (rdb1, &database);
982 else if (homedir)
983 {
984 struct utsname un;
985
986 if (!uname (&un))
987 {
988 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
989
990 if ((rdb1 = XrmGetFileDatabase (fname)))
991 XrmMergeDatabases (rdb1, &database);
992 }
993 }
994
995 XrmSetDatabase (disp, database);
996# endif
997
998 /* 806 /*
999 * Query resources for options that affect us 807 * Query resources for options that affect us
1000 */ 808 */
1001 for (entry = 0; entry < optList_size; entry++) 809 for (int entry = 0; entry < optList_size; entry++)
1002 { 810 {
1003 int s; 811 int s;
1004 char *p, *p0;
1005 const char *kw = optList[entry].kw; 812 const char *kw = optList[entry].kw;
1006 813
1007 if (kw == NULL || rs[optList[entry].doff] != NULL) 814 if (kw == NULL || rs[optList[entry].doff] != NULL)
1008 continue; /* previously set */ 815 continue; // previously set
1009 816
1010 p = XGetDefault (disp, rs[Rs_name], kw); 817 const char *p = x_resource (kw);
1011 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1012 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1013 {
1014 p = XGetDefault (disp, RESCLASS, kw);
1015#ifdef RESFALLBACK
1016 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1017 p = XGetDefault (disp, RESFALLBACK, kw);
1018#endif
1019 }
1020
1021 if (p == NULL && p0)
1022 p = p0;
1023 818
1024 if (p) 819 if (p)
1025 { 820 {
821 p = strdup (p);
822 allocated.push_back ((void *)p);
1026 rs[optList[entry].doff] = p; 823 rs[optList[entry].doff] = p;
1027 824
1028 if (optList_isBool (entry)) 825 if (optList_isBool (entry))
1029 { 826 {
1030 s = strcasecmp (p, "TRUE") == 0 827 s = strcasecmp (p, "TRUE") == 0
… …
1033 || strcasecmp (p, "1") == 0; 830 || strcasecmp (p, "1") == 0;
1034 831
1035 if (optList_isReverse (entry)) 832 if (optList_isReverse (entry))
1036 s = !s; 833 s = !s;
1037 834
1038 if (s)
1039 SET_OPTION (optList[entry].flag & Optflag_mask); 835 set_option (optList[entry].flag & Optflag_mask, s);
1040 else
1041 CLR_OPTION (optList[entry].flag & Optflag_mask);
1042 } 836 }
1043 } 837 }
1044 } 838 }
1045 839
1046 /* 840 /*
1047 * [R5 or later]: enumerate the resource database 841 * [R5 or later]: enumerate the resource database
1048 */ 842 */
1049# ifdef KEYSYM_RESOURCE 843# ifdef KEYSYM_RESOURCE
844 XrmDatabase database = XrmGetDatabase (display->display);
845 XrmName name_prefix[3];
846 XrmClass class_prefix[3];
847
1050 name_prefix[0] = XrmStringToName (rs[Rs_name]); 848 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1051 name_prefix[1] = XrmStringToName ("keysym"); 849 name_prefix[1] = XrmStringToName ("keysym");
1052 name_prefix[2] = NULLQUARK; 850 name_prefix[2] = NULLQUARK;
1053 class_prefix[0] = XrmStringToName (RESCLASS); 851 class_prefix[0] = XrmStringToName (RESCLASS);
1054 class_prefix[1] = XrmStringToName ("Keysym"); 852 class_prefix[1] = XrmStringToName ("Keysym");
1055 class_prefix[2] = NULLQUARK; 853 class_prefix[2] = NULLQUARK;
1056 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 854 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1057 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 855 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1058 XrmEnumOneLevel, rxvt_define_key, NULL); 856 XrmEnumOneLevel, rxvt_define_key, NULL);
1059# ifdef RESFALLBACK 857# ifdef RESFALLBACK
1060 name_prefix[0] = XrmStringToName (RESFALLBACK); 858 name_prefix[0] = XrmStringToName (RESFALLBACK);
1061 name_prefix[1] = XrmStringToName ("keysym"); 859 name_prefix[1] = XrmStringToName ("keysym");
1062 class_prefix[0] = XrmStringToName (RESFALLBACK); 860 class_prefix[0] = XrmStringToName (RESFALLBACK);
1063 class_prefix[1] = XrmStringToName ("Keysym"); 861 class_prefix[1] = XrmStringToName ("Keysym");
1064 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 862 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1065 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 863 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1066 XrmEnumOneLevel, rxvt_define_key, NULL); 864 XrmEnumOneLevel, rxvt_define_key, NULL);
1067# endif 865# endif
1068# endif 866# endif
1069 867
1070# else /* USE_XGETDEFAULT */
1071 /* get resources the hard way, but save lots of memory */
1072 FILE *fd = NULL;
1073
1074 if (homedir)
1075 {
1076 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1077
1078 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1079 {
1080 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1081
1082 if ((fd = fopen (fname, "r")) != NULL)
1083 break;
1084 }
1085 }
1086 /*
1087 * The normal order to match resources is the following:
1088 * @ global resources (partial match, ~/.Xdefaults)
1089 * @ application file resources (XAPPLOADDIR/Rxvt)
1090 * @ class resources (~/.Xdefaults)
1091 * @ private resources (~/.Xdefaults)
1092 *
1093 * However, for the hand-rolled resources, the matching algorithm
1094 * checks if a resource string value has already been allocated
1095 * and won't overwrite it with (in this case) a less specific
1096 * resource value.
1097 *
1098 * This avoids multiple allocation. Also, when we've called this
1099 * routine command-line string options have already been applied so we
1100 * needn't to allocate for those resources.
1101 *
1102 * So, search in resources from most to least specific.
1103 *
1104 * Also, use a special sub-class so that we can use either or both of
1105 * "XTerm" and "Rxvt" as class names.
1106 */
1107
1108 get_xdefaults (fd, rs[Rs_name]);
1109 get_xdefaults (fd, RESCLASS);
1110# ifdef RESFALLBACK
1111 get_xdefaults (fd, RESFALLBACK);
1112# endif
1113
1114# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1115 {
1116 FILE *ad = NULL;
1117
1118# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1119 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1120# endif
1121 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1122 if (ad != NULL)
1123 {
1124 get_xdefaults (ad, RESCLASS);
1125 get_xdefaults (ad, "");
1126 fclose (ad);
1127 }
1128 }
1129# endif /* XAPPLOADDIR */
1130
1131 get_xdefaults (fd, ""); /* partial match */
1132 if (fd != NULL)
1133 fclose (fd);
1134# endif /* USE_XGETDEFAULT */
1135
1136#endif /* NO_RESOURCES */ 868#endif /* NO_RESOURCES */
1137} 869}
1138 870
1139/*}}} */
1140/*----------------------- end-of-file (C source) -----------------------*/ 871/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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