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.72 by root, Fri Jan 6 05:28:55 2006 UTC vs.
Revision 1.87 by root, Wed Jan 25 22:13:47 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
40/* place holders used for parsing command-line options */ 34/* place holders used for parsing command-line options */
41#define Optflag_Reverse 0x40000000UL 35#define Optflag_Reverse 0x40000000UL
42#define Optflag_Boolean 0x80000000UL 36#define Optflag_Boolean 0x80000000UL
43#define Optflag_mask 0x3fffffffUL 37#define Optflag_mask 0x3fffffffUL
44
45/* #define DEBUG_RESOURCES */
46 38
47/*{{{ monolithic option/resource structure: */ 39/*{{{ monolithic option/resource structure: */
48/* 40/*
49 * `string' options MUST have a usage argument 41 * `string' options MUST have a usage argument
50 * `switch' and `boolean' options have no argument 42 * `switch' and `boolean' options have no argument
… …
193 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
194#endif /* NO_CURSORCOLOR */ 186#endif /* NO_CURSORCOLOR */
195 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 187 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
196 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"),
197 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
198#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 190#ifdef XPM_BACKGROUND
199 RSTRG (Rs_path, "path", "search path"), 191 RSTRG (Rs_path, "path", "search path"),
200#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
201#ifdef XPM_BACKGROUND
202 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 192 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
203#endif /* XPM_BACKGROUND */
204#if (MENUBAR_MAX)
205 RSTRG (Rs_menu, "menu", "name[;tag]"),
206#endif 193#endif
207 /* fonts: command-line option = resource name */ 194 /* fonts: command-line option = resource name */
208 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
209#if ENABLE_STYLES 196#if ENABLE_STYLES
210 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
226#if ENABLE_XEMBED 213#if ENABLE_XEMBED
227 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"),
228#endif 215#endif
229#if ENABLE_FRILLS 216#if ENABLE_FRILLS
230 RSTRG (Rs_transient_for, "transient-for", "windowid"), 217 RSTRG (Rs_transient_for, "transient-for", "windowid"),
218 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"),
231 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 219 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
232 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 220 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
233 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 222 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
234 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 223 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
235 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 224 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
236 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 225 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
237 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 226 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
… …
264 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 253 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
265 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 254 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
266 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 255 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
267 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 256 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
268#endif 257#endif
269#if 0 && TODO 258#ifndef NO_RESOURCES
270#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
271 INFO ("xrm", "string", "X resource"), 259 INFO ("xrm", "string", "X resource"),
272#endif
273#endif 260#endif
274 INFO ("e", "command arg ...", "command to execute") 261 INFO ("e", "command arg ...", "command to execute")
275 }; 262 };
276 263
277#undef INFO 264#undef INFO
… …
281#undef BOOL 268#undef BOOL
282/*}}} */ 269/*}}} */
283 270
284static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 271static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
285static const char optionsstring[] = "options: " 272static const char optionsstring[] = "options: "
273#if ENABLE_PERL
274 "perl,"
275#endif
286#if XFT 276#if XFT
287 "xft," 277 "xft,"
288#endif 278#endif
289#if ENABLE_STYLES 279#if ENABLE_STYLES
290 "styles," 280 "styles,"
… …
327#if defined(TRANSPARENT) 317#if defined(TRANSPARENT)
328 "transparent," 318 "transparent,"
329#endif 319#endif
330#if TINTING 320#if TINTING
331 "tint," 321 "tint,"
332#endif
333#if defined(UTMP_SUPPORT)
334 "utmp,"
335#endif
336#if defined(MENUBAR)
337 "menubar,"
338#endif 322#endif
339#if defined(USE_XIM) 323#if defined(USE_XIM)
340 "XIM," 324 "XIM,"
341#endif 325#endif
342 "scrollbars=" 326 "scrollbars="
… …
373 "no_delete," 357 "no_delete,"
374#endif 358#endif
375#if EIGHT_BIT_CONTROLS 359#if EIGHT_BIT_CONTROLS
376 "8bitctrls," 360 "8bitctrls,"
377#endif 361#endif
378#if !defined(NO_STRINGS)
379 "strings,"
380#endif
381#if defined(ENABLE_FRILLS) 362#if defined(ENABLE_FRILLS)
382 "frills," 363 "frills,"
383#endif 364#endif
384#if defined(PREFER_24BIT)
385 "24bit,"
386#endif
387#if defined(SELECTION_SCROLLING) 365#if defined(SELECTION_SCROLLING)
388 "selectionscrolling," 366 "selectionscrolling,"
389#endif 367#endif
390#if MOUSE_WHEEL 368#if MOUSE_WHEEL
391 "wheel," 369 "wheel,"
… …
401#endif 379#endif
402#if defined(POINTER_BLANK) 380#if defined(POINTER_BLANK)
403 "pointerBlank," 381 "pointerBlank,"
404#endif 382#endif
405#if defined(NO_RESOURCES) 383#if defined(NO_RESOURCES)
406 "NoResources" 384 "NoResources,"
407#else
408# if defined(USE_XGETDEFAULT)
409 "XGetDefaults"
410# else
411 ".Xdefaults"
412# endif 385#endif
413#endif 386 "v" VERSION
414 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
415 388
416#define INDENT 18 389#define INDENT 18
417 390
418/*{{{ usage: */ 391/*{{{ usage: */
… …
516 { 489 {
517 unsigned int entry, longopt = 0; 490 unsigned int entry, longopt = 0;
518 const char *flag, *opt; 491 const char *flag, *opt;
519 492
520 opt = argv[i]; 493 opt = argv[i];
521#ifdef DEBUG_RESOURCES 494
522 fprintf (stderr, "argv[%d] = %s: ", i, opt);
523#endif
524 if (*opt == '-') 495 if (*opt == '-')
525 { 496 {
526 flag = On; 497 flag = On;
527 if (*++opt == '-') 498 if (*++opt == '-')
528 longopt = *opt++; /* long option */ 499 longopt = *opt++; /* long option */
… …
569 rs[optList[entry].doff] = flag == On && argv[i+1] 540 rs[optList[entry].doff] = flag == On && argv[i+1]
570 ? argv[++i] : 0; 541 ? argv[++i] : 0;
571 } 542 }
572 else 543 else
573 { /* boolean value */ 544 { /* boolean value */
574#ifdef DEBUG_RESOURCES
575 fprintf (stderr, "boolean (%s,%s) = %s\n",
576 optList[entry].opt, optList[entry].kw, flag);
577#endif
578 if (flag == On)
579 SET_OPTION (optList[entry].flag & Optflag_mask); 545 set_option (optList[entry].flag & Optflag_mask, flag == On);
580 else
581 CLR_OPTION (optList[entry].flag & Optflag_mask);
582 546
583 if (optList[entry].doff != -1) 547 if (optList[entry].doff != -1)
584 rs[optList[entry].doff] = flag; 548 rs[optList[entry].doff] = flag;
585 } 549 }
586 } 550 }
… …
618 * "rxvt" "keysym" "0xFF01" 582 * "rxvt" "keysym" "0xFF01"
619 * value will be a string 583 * value will be a string
620 */ 584 */
621/* ARGSUSED */ 585/* ARGSUSED */
622int 586int
623rxvt_define_key (XrmDatabase *database __attribute__((unused)), 587rxvt_define_key (XrmDatabase *database UNUSED,
624 XrmBindingList bindings __attribute__((unused)), 588 XrmBindingList bindings UNUSED,
625 XrmQuarkList quarks, 589 XrmQuarkList quarks,
626 XrmRepresentation *type __attribute__((unused)), 590 XrmRepresentation *type UNUSED,
627 XrmValue *value, 591 XrmValue *value,
628 XPointer closure __attribute__((unused))) 592 XPointer closure UNUSED)
629{ 593{
630 int last; 594 int last;
631 595
632 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 */
633 ; 597 ;
… …
695 { 659 {
696 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 660 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
697 return 0; 661 return 0;
698 662
699 str += n; /* skip `keysym.' */ 663 str += n; /* skip `keysym.' */
700 if ((pmodend = strchr (str, ':')) < str) 664 if (!(pmodend = strchr (str, ':')))
701 return -1; 665 return -1;
702 } 666 }
703 else 667 else
704 pmodend = str + strlen(str); 668 pmodend = str + strlen(str);
705 669
… …
783 keyboard->register_user_translation (sym, state, newarg); 747 keyboard->register_user_translation (sym, state, newarg);
784 return 1; 748 return 1;
785} 749}
786 750
787# endif /* KEYSYM_RESOURCE */ 751# endif /* KEYSYM_RESOURCE */
752#endif /* NO_RESOURCES */
788 753
789# ifndef USE_XGETDEFAULT 754static char *
790/*{{{ rxvt_get_xdefaults () */ 755get_res (XrmDatabase database, const char *program, const char *option)
791/*
792 * the matching algorithm used for memory-save fake resources
793 */
794void
795rxvt_term::get_xdefaults (FILE *stream, const char *name)
796{ 756{
797 unsigned int len; 757 char resource[512];
798 char *str, buffer[256]; 758 char *type;
759 XrmValue result;
799 760
800 if (stream == NULL) 761 snprintf (resource, sizeof (resource), "%s.%s", program, option);
801 return; 762 XrmGetResource (database, resource, resource, &type, &result);
802 763
803 len = strlen (name); 764 return result.addr;
804 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 765}
766
767const char *
768rxvt_term::x_resource (const char *name)
769{
770 XrmDatabase database = XrmGetDatabase (xdisp);
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))
805 { 776 {
806 unsigned int entry, n; 777 p = get_res (database, RESCLASS, name);
807 778#ifdef RESFALLBACK
808 while (*str && isspace (*str)) 779 if (p == NULL || (p0 && strcmp (p, p0) == 0))
809 str++; /* leading whitespace */ 780 p = get_res (database, RESFALLBACK, name);
810 781#endif
811 if ((str[len] != '*' && str[len] != '.')
812 || (len && strncmp (str, name, len)))
813 continue;
814 str += (len + 1); /* skip `name*' or `name.' */
815
816# ifdef KEYSYM_RESOURCE
817 if (!parse_keysym (str, NULL))
818# endif /* KEYSYM_RESOURCE */
819 for (entry = 0; entry < optList_size; entry++)
820 {
821 const char *kw = optList[entry].kw;
822
823 if (kw == NULL)
824 continue;
825
826 n = strlen (kw);
827 if (str[n] == ':' && rxvt_Str_match (str, kw))
828 {
829 /* skip `keyword:' */
830 str += n + 1;
831 rxvt_Str_trim (str);
832 n = strlen (str);
833
834 if (n && rs[optList[entry].doff] == NULL)
835 {
836 /* not already set */
837 int s;
838 char *p = 0;
839
840 for (int o = 0;;)
841 {
842 p = (char *)rxvt_realloc (p, o + n + 1);
843 memcpy (p + o, str, n);
844 o += n;
845 p[o] = 0;
846
847 if (o == 0 || p[o - 1] != '\\') // continuation line
848 break;
849
850 o--; // eat "\"
851
852 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
853 break;
854
855 rxvt_Str_trim (str);
856 n = strlen (str);
857 }
858
859 rs[optList[entry].doff] = p;
860 allocated.push_back (p);
861
862 if (optList_isBool (entry))
863 {
864 s = strcasecmp (str, "true") == 0
865 || strcasecmp (str, "yes") == 0
866 || strcasecmp (str, "on") == 0
867 || strcmp (str, "1") == 0;
868
869 if (optList_isReverse (entry))
870 s = !s;
871
872 if (s)
873 SET_OPTION (optList[entry].flag & Optflag_mask);
874 else
875 CLR_OPTION (optList[entry].flag & Optflag_mask);
876 }
877 }
878
879 break;
880 }
881 }
882 } 782 }
883 783
884 rewind (stream); 784 if (p == NULL && p0)
785 p = p0;
786
787 return p;
885} 788}
886 789
887/*}}} */
888# endif /* ! USE_XGETDEFAULT */
889#endif /* NO_RESOURCES */
890
891/*{{{ read the resources files */
892/*
893 * using XGetDefault () or the hand-rolled replacement
894 */
895/* ARGSUSED */
896void 790void
897rxvt_term::extract_resources () 791rxvt_term::extract_resources ()
898{ 792{
899 dDisp;
900
901#ifndef NO_RESOURCES 793#ifndef NO_RESOURCES
902
903 char *homedir = (char *)getenv ("HOME");
904 char fname[1024];
905
906# if defined XAPPLOADDIR
907# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
908 /* Compute the path of the possibly available localized Rxvt file */
909 char localepath[1024];
910
911 if (locale)
912 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
913 else
914 localepath[0] = 0;
915# endif
916# endif
917
918# ifdef USE_XGETDEFAULT
919 /*
920 * get resources using the X library function
921 */
922 int entry;
923
924# ifdef XrmEnumOneLevel
925 char *displayResource, *xe;
926 XrmName name_prefix[3];
927 XrmClass class_prefix[3];
928 XrmDatabase database, rdb1;
929
930 XrmInitialize ();
931 database = NULL;
932
933 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
934
935 // 6. System wide per application default file.
936 /* Add in Rxvt file */
937# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
938 if (*localepath
939 && ((rdb1 = XrmGetFileDatabase (localepath))
940 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
941# endif
942 XrmMergeDatabases (rdb1, &database);
943
944 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
945 if ((xe = (char *)getenv ("XAPPLRESDIR")))
946 {
947 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
948
949 if ((rdb1 = XrmGetFileDatabase (fname)))
950 XrmMergeDatabases (rdb1, &database);
951 }
952
953 // 5. User's per application default file.
954 // none
955
956 // 4. User's defaults file.
957 /* Get any Xserver defaults */
958 displayResource = XResourceManagerString (disp);
959 if (displayResource != NULL)
960 {
961 if ((rdb1 = XrmGetStringDatabase (displayResource)))
962 XrmMergeDatabases (rdb1, &database);
963 }
964 else if (homedir)
965 {
966 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
967
968 if ((rdb1 = XrmGetFileDatabase (fname)))
969 XrmMergeDatabases (rdb1, &database);
970 }
971
972 /* Get screen specific resources */
973 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
974 if (displayResource != NULL)
975 {
976 if ((rdb1 = XrmGetStringDatabase (displayResource)))
977 /* Merge with screen-independent resources */
978 XrmMergeDatabases (rdb1, &database);
979
980 XFree (displayResource);
981 }
982
983 // 3. User's per host defaults file
984 /* Add in XENVIRONMENT file */
985 if ((xe = (char *)getenv ("XENVIRONMENT"))
986 && (rdb1 = XrmGetFileDatabase (xe)))
987 XrmMergeDatabases (rdb1, &database);
988 else if (homedir)
989 {
990 struct utsname un;
991
992 if (!uname (&un))
993 {
994 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
995
996 if ((rdb1 = XrmGetFileDatabase (fname)))
997 XrmMergeDatabases (rdb1, &database);
998 }
999 }
1000
1001 XrmSetDatabase (disp, database);
1002# endif
1003
1004 /* 794 /*
1005 * Query resources for options that affect us 795 * Query resources for options that affect us
1006 */ 796 */
1007 for (entry = 0; entry < optList_size; entry++) 797 for (int entry = 0; entry < optList_size; entry++)
1008 { 798 {
1009 int s; 799 int s;
1010 char *p, *p0;
1011 const char *kw = optList[entry].kw; 800 const char *kw = optList[entry].kw;
1012 801
1013 if (kw == NULL || rs[optList[entry].doff] != NULL) 802 if (kw == NULL || rs[optList[entry].doff] != NULL)
1014 continue; /* previously set */ 803 continue; // previously set
1015 804
1016 p = XGetDefault (disp, rs[Rs_name], kw); 805 const char *p = x_resource (kw);
1017 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1018 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1019 {
1020 p = XGetDefault (disp, RESCLASS, kw);
1021#ifdef RESFALLBACK
1022 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1023 p = XGetDefault (disp, RESFALLBACK, kw);
1024#endif
1025 }
1026
1027 if (p == NULL && p0)
1028 p = p0;
1029 806
1030 if (p) 807 if (p)
1031 { 808 {
809 p = strdup (p);
810 allocated.push_back ((void *)p);
1032 rs[optList[entry].doff] = p; 811 rs[optList[entry].doff] = p;
1033 812
1034 if (optList_isBool (entry)) 813 if (optList_isBool (entry))
1035 { 814 {
1036 s = strcasecmp (p, "TRUE") == 0 815 s = strcasecmp (p, "TRUE") == 0
… …
1039 || strcasecmp (p, "1") == 0; 818 || strcasecmp (p, "1") == 0;
1040 819
1041 if (optList_isReverse (entry)) 820 if (optList_isReverse (entry))
1042 s = !s; 821 s = !s;
1043 822
1044 if (s)
1045 SET_OPTION (optList[entry].flag & Optflag_mask); 823 set_option (optList[entry].flag & Optflag_mask, s);
1046 else
1047 CLR_OPTION (optList[entry].flag & Optflag_mask);
1048 } 824 }
1049 } 825 }
1050 } 826 }
1051 827
1052 /* 828 /*
1053 * [R5 or later]: enumerate the resource database 829 * [R5 or later]: enumerate the resource database
1054 */ 830 */
1055# ifdef KEYSYM_RESOURCE 831# ifdef KEYSYM_RESOURCE
832 XrmDatabase database = XrmGetDatabase (xdisp);
833 XrmName name_prefix[3];
834 XrmClass class_prefix[3];
835
1056 name_prefix[0] = XrmStringToName (rs[Rs_name]); 836 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1057 name_prefix[1] = XrmStringToName ("keysym"); 837 name_prefix[1] = XrmStringToName ("keysym");
1058 name_prefix[2] = NULLQUARK; 838 name_prefix[2] = NULLQUARK;
1059 class_prefix[0] = XrmStringToName (RESCLASS); 839 class_prefix[0] = XrmStringToName (RESCLASS);
1060 class_prefix[1] = XrmStringToName ("Keysym"); 840 class_prefix[1] = XrmStringToName ("Keysym");
1061 class_prefix[2] = NULLQUARK; 841 class_prefix[2] = NULLQUARK;
1062 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 842 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1063 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 843 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1064 XrmEnumOneLevel, rxvt_define_key, NULL); 844 XrmEnumOneLevel, rxvt_define_key, NULL);
1065# ifdef RESFALLBACK 845# ifdef RESFALLBACK
1066 name_prefix[0] = XrmStringToName (RESFALLBACK); 846 name_prefix[0] = XrmStringToName (RESFALLBACK);
1067 name_prefix[1] = XrmStringToName ("keysym"); 847 name_prefix[1] = XrmStringToName ("keysym");
1068 class_prefix[0] = XrmStringToName (RESFALLBACK); 848 class_prefix[0] = XrmStringToName (RESFALLBACK);
1069 class_prefix[1] = XrmStringToName ("Keysym"); 849 class_prefix[1] = XrmStringToName ("Keysym");
1070 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 850 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1071 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 851 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1072 XrmEnumOneLevel, rxvt_define_key, NULL); 852 XrmEnumOneLevel, rxvt_define_key, NULL);
1073# endif 853# endif
1074# endif 854# endif
1075 855
1076# else /* USE_XGETDEFAULT */
1077 /* get resources the hard way, but save lots of memory */
1078 FILE *fd = NULL;
1079
1080 if (homedir)
1081 {
1082 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1083
1084 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1085 {
1086 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1087
1088 if ((fd = fopen (fname, "r")) != NULL)
1089 break;
1090 }
1091 }
1092 /*
1093 * The normal order to match resources is the following:
1094 * @ global resources (partial match, ~/.Xdefaults)
1095 * @ application file resources (XAPPLOADDIR/Rxvt)
1096 * @ class resources (~/.Xdefaults)
1097 * @ private resources (~/.Xdefaults)
1098 *
1099 * However, for the hand-rolled resources, the matching algorithm
1100 * checks if a resource string value has already been allocated
1101 * and won't overwrite it with (in this case) a less specific
1102 * resource value.
1103 *
1104 * This avoids multiple allocation. Also, when we've called this
1105 * routine command-line string options have already been applied so we
1106 * needn't to allocate for those resources.
1107 *
1108 * So, search in resources from most to least specific.
1109 *
1110 * Also, use a special sub-class so that we can use either or both of
1111 * "XTerm" and "Rxvt" as class names.
1112 */
1113
1114 get_xdefaults (fd, rs[Rs_name]);
1115 get_xdefaults (fd, RESCLASS);
1116# ifdef RESFALLBACK
1117 get_xdefaults (fd, RESFALLBACK);
1118# endif
1119
1120# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1121 {
1122 FILE *ad = NULL;
1123
1124# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1125 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1126# endif
1127 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1128 if (ad != NULL)
1129 {
1130 get_xdefaults (ad, RESCLASS);
1131 get_xdefaults (ad, "");
1132 fclose (ad);
1133 }
1134 }
1135# endif /* XAPPLOADDIR */
1136
1137 get_xdefaults (fd, ""); /* partial match */
1138 if (fd != NULL)
1139 fclose (fd);
1140# endif /* USE_XGETDEFAULT */
1141
1142#endif /* NO_RESOURCES */ 856#endif /* NO_RESOURCES */
1143} 857}
1144 858
1145/*}}} */
1146/*----------------------- end-of-file (C source) -----------------------*/ 859/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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