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.12 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.15 by pcg, Wed Mar 3 04:07:52 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xdefaults.c 2 * File: xdefaults.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xdefaults.C,v 1.12 2004/02/22 08:09:38 pcg Exp $ 4 * $Id: xdefaults.C,v 1.15 2004/03/03 04:07:52 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 7 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
8 * - original version 8 * - original version
9 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 9 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
… …
130 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 130 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
131#endif 131#endif
132#ifdef MOUSE_WHEEL 132#ifdef MOUSE_WHEEL
133 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 133 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage,
134 NULL), 134 NULL),
135#endif
136#ifdef MULTICHAR_SET
137 BOOL (Rs_mc_hack, "multibyte_cursor", "mcc", Opt_mc_hack,
138 "Multibyte character cursor movement"),
139#endif 135#endif
140#ifndef NO_FRILLS 136#ifndef NO_FRILLS
141 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 137 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords,
142 "triple click word selection"), 138 "triple click word selection"),
143#endif 139#endif
… …
294 "24bit," 290 "24bit,"
295#endif 291#endif
296#if defined(USE_XIM) 292#if defined(USE_XIM)
297 "XIM," 293 "XIM,"
298#endif 294#endif
299#if defined(MULTICHAR_SET)
300 "multichar_languages,"
301#endif
302 "scrollbars=" 295 "scrollbars="
303#if !defined(HAVE_SCROLLBARS) 296#if !defined(HAVE_SCROLLBARS)
304 "NONE" 297 "NONE"
305#else 298#else
299# if defined(PLAIN_SCROLLBAR)
300 "plain"
301# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
302 "+"
303# endif
304# endif
306# if defined(RXVT_SCROLLBAR) 305# if defined(RXVT_SCROLLBAR)
307 "rxvt" 306 "rxvt"
308# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 307# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
309 "+" 308 "+"
310# endif 309# endif
… …
352{ 351{
353 unsigned int i, col; 352 unsigned int i, col;
354 353
355 write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); 354 write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1);
356 write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1); 355 write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1);
357 write (STDERR_FILENO, APL_NAME, sizeof (APL_NAME) - 1); 356 write (STDERR_FILENO, RESNAME, sizeof (RESNAME) - 1);
358 357
359 switch (type) 358 switch (type)
360 { 359 {
361 case 0: /* brief listing */ 360 case 0: /* brief listing */
362 fprintf (stderr, " [-help] [--help]\n"); 361 fprintf (stderr, " [-help] [--help]\n");
… …
559 * quarks will be something like 558 * quarks will be something like
560 * "rxvt" "keysym" "0xFF01" 559 * "rxvt" "keysym" "0xFF01"
561 * value will be a string 560 * value will be a string
562 */ 561 */
563/* ARGSUSED */ 562/* ARGSUSED */
564bool 563int
565rxvt_define_key(XrmDatabase *database __attribute__((unused)), XrmBindingList bindings __attribute__((unused)), XrmQuarkList quarks, XrmRepresentation *type __attribute__((unused)), XrmValue *value, XPointer closure __attribute__((unused))) 564rxvt_define_key (XrmDatabase *database __attribute__((unused)),
565 XrmBindingList bindings __attribute__((unused)),
566 XrmQuarkList quarks,
567 XrmRepresentation *type __attribute__((unused)),
568 XrmValue *value,
569 XPointer closure __attribute__((unused)))
566{ 570{
567 int last; 571 int last;
568 572
569 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 573 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
570 ; 574 ;
… …
751 char *localepath = NULL; 755 char *localepath = NULL;
752 756
753 if (locale != NULL) 757 if (locale != NULL)
754 { /* XXX: must limit length of string */ 758 { /* XXX: must limit length of string */
755 localepath = (char *)rxvt_malloc (256); 759 localepath = (char *)rxvt_malloc (256);
756 sprintf (localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, 760 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
757 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (APL_SUBCLASS)), 761 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),
758 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 762 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
759 } 763 }
760 764
761 { 765 {
762# endif 766# endif
… …
817 821
818 /* Add in Rxvt file */ 822 /* Add in Rxvt file */
819# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 823# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
820 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL) 824 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
821# endif 825# endif
822 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" APL_SUBCLASS); 826 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
827
823 if (rdb1 != NULL) 828 if (rdb1 != NULL)
824 XrmMergeDatabases (rdb1, &database); 829 XrmMergeDatabases (rdb1, &database);
825 830
826 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 831 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
827 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL) 832 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
828 { 833 {
829 sprintf (fname, "%-.*s/" APL_SUBCLASS, sizeof (fname) 834 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
830 - sizeof (APL_SUBCLASS) - 2, xe); 835 - sizeof (RESCLASS) - 2, xe);
831 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 836 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
832 XrmMergeDatabases (rdb1, &database); 837 XrmMergeDatabases (rdb1, &database);
833 } 838 }
834 839
835 XrmSetDatabase (display, database); 840 XrmSetDatabase (display, database);
… …
849 854
850 p = XGetDefault (display, name, kw); 855 p = XGetDefault (display, name, kw);
851 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 856 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
852 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 857 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
853 { 858 {
854 p = XGetDefault (display, APL_SUBCLASS, kw); 859 p = XGetDefault (display, RESCLASS, kw);
860#ifdef RESFALLBACK
855 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 861 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
856 p = XGetDefault (display, APL_CLASS, kw); 862 p = XGetDefault (display, RESFALLBACK, kw);
863#endif
857 } 864 }
865
858 if (p == NULL && p0) 866 if (p == NULL && p0)
859 p = p0; 867 p = p0;
868
860 if (p) 869 if (p)
861 { 870 {
862 rs[optList[entry].doff] = p; 871 rs[optList[entry].doff] = p;
863 872
864 if (optList_isBool (entry)) 873 if (optList_isBool (entry))
… …
883# ifdef XrmEnumOneLevel 892# ifdef XrmEnumOneLevel
884# ifdef KEYSYM_RESOURCE 893# ifdef KEYSYM_RESOURCE
885 name_prefix[0] = XrmStringToName (name); 894 name_prefix[0] = XrmStringToName (name);
886 name_prefix[1] = XrmStringToName ("keysym"); 895 name_prefix[1] = XrmStringToName ("keysym");
887 name_prefix[2] = NULLQUARK; 896 name_prefix[2] = NULLQUARK;
888 class_prefix[0] = XrmStringToName (APL_SUBCLASS); 897 class_prefix[0] = XrmStringToName (RESCLASS);
889 class_prefix[1] = XrmStringToName ("Keysym"); 898 class_prefix[1] = XrmStringToName ("Keysym");
890 class_prefix[2] = NULLQUARK; 899 class_prefix[2] = NULLQUARK;
891 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 900 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
892 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 901 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
893 XrmEnumOneLevel, rxvt_define_key, NULL); 902 XrmEnumOneLevel, rxvt_define_key, NULL);
903# ifdef RESFALLBACK
894 name_prefix[0] = XrmStringToName (APL_CLASS); 904 name_prefix[0] = XrmStringToName (RESFALLBACK);
895 name_prefix[1] = XrmStringToName ("keysym"); 905 name_prefix[1] = XrmStringToName ("keysym");
896 class_prefix[0] = XrmStringToName (APL_CLASS); 906 class_prefix[0] = XrmStringToName (RESFALLBACK);
897 class_prefix[1] = XrmStringToName ("Keysym"); 907 class_prefix[1] = XrmStringToName ("Keysym");
898 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 908 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
899 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 909 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
900 XrmEnumOneLevel, rxvt_define_key, NULL); 910 XrmEnumOneLevel, rxvt_define_key, NULL);
911# endif
901# endif 912# endif
902# endif 913# endif
903 914
904# else /* USE_XGETDEFAULT */ 915# else /* USE_XGETDEFAULT */
905 /* get resources the hard way, but save lots of memory */ 916 /* get resources the hard way, but save lots of memory */
… …
943 * Also, use a special sub-class so that we can use either or both of 954 * Also, use a special sub-class so that we can use either or both of
944 * "XTerm" and "Rxvt" as class names. 955 * "XTerm" and "Rxvt" as class names.
945 */ 956 */
946 957
947 get_xdefaults (fd, name); 958 get_xdefaults (fd, name);
948 get_xdefaults (fd, APL_SUBCLASS); 959 get_xdefaults (fd, RESCLASS);
960# ifdef RESFALLBACK
961 get_xdefaults (fd, RESFALLBACK);
962# endif
949 963
950# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) 964# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
951 965
952 { 966 {
953 FILE *ad = NULL; 967 FILE *ad = NULL;
954 968
955# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 969# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
956 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL) 970 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
957# endif 971# endif
958 ad = fopen (XAPPLOADDIR "/" APL_SUBCLASS, "r"); 972 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
959 if (ad != NULL) 973 if (ad != NULL)
960 { 974 {
961 get_xdefaults (ad, APL_SUBCLASS); 975 get_xdefaults (ad, RESCLASS);
962 get_xdefaults (ad, ""); 976 get_xdefaults (ad, "");
963 fclose (ad); 977 fclose (ad);
964 } 978 }
965 } 979 }
966# endif /* XAPPLOADDIR */ 980# endif /* XAPPLOADDIR */
967 981
968 get_xdefaults (fd, APL_CLASS);
969 get_xdefaults (fd, ""); /* partial match */ 982 get_xdefaults (fd, ""); /* partial match */
970 if (fd != NULL) 983 if (fd != NULL)
971 fclose (fd); 984 fclose (fd);
972# endif /* USE_XGETDEFAULT */ 985# endif /* USE_XGETDEFAULT */
973 986

Diff Legend

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