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.13 by pcg, Tue Feb 24 21:41:16 2004 UTC vs.
Revision 1.17 by pcg, Sun Mar 14 17:33:08 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xdefaults.c 2 * File: xdefaults.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xdefaults.C,v 1.13 2004/02/24 21:41:16 pcg Exp $ 4 * $Id: xdefaults.C,v 1.17 2004/03/14 17:33:08 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
… …
244 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 240 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
245#endif 241#endif
246#ifdef PRINTPIPE 242#ifdef PRINTPIPE
247 RSTRG (Rs_print_pipe, "print-pipe", "string"), 243 RSTRG (Rs_print_pipe, "print-pipe", "string"),
248#endif 244#endif
249#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
250 RSTRG (Rs_bigfont_key, "bigfont_key", "keysym"),
251 RSTRG (Rs_smallfont_key, "smallfont_key", "keysym"),
252#endif
253 STRG (Rs_modifier, "modifier", "mod", "modifier", 245 STRG (Rs_modifier, "modifier", "mod", "modifier",
254 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 246 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
255 INFO ("xrm", "string", "X resource"), 247 INFO ("xrm", "string", "X resource"),
256#ifdef CUTCHAR_RESOURCE 248#ifdef CUTCHAR_RESOURCE
257 RSTRG (Rs_cutchars, "cutchars", "string"), 249 RSTRG (Rs_cutchars, "cutchars", "string"),
258#endif /* CUTCHAR_RESOURCE */ 250#endif /* CUTCHAR_RESOURCE */
259#ifdef ACS_ASCII
260 RSTRG (Rs_acs_chars, "acsChars", "string"),
261#endif /* ACS_ASCII */
262 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 251 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
263 INFO ("e", "command arg ...", "command to execute") 252 INFO ("e", "command arg ...", "command to execute")
264 }; 253 };
265 254
266#undef INFO 255#undef INFO
… …
294 "24bit," 283 "24bit,"
295#endif 284#endif
296#if defined(USE_XIM) 285#if defined(USE_XIM)
297 "XIM," 286 "XIM,"
298#endif 287#endif
299#if defined(MULTICHAR_SET)
300 "multichar_languages,"
301#endif
302 "scrollbars=" 288 "scrollbars="
303#if !defined(HAVE_SCROLLBARS) 289#if !defined(HAVE_SCROLLBARS)
304 "NONE" 290 "NONE"
305#else 291#else
292# if defined(PLAIN_SCROLLBAR)
293 "plain"
294# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
295 "+"
296# endif
297# endif
306# if defined(RXVT_SCROLLBAR) 298# if defined(RXVT_SCROLLBAR)
307 "rxvt" 299 "rxvt"
308# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 300# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
309 "+" 301 "+"
310# endif 302# endif
… …
352{ 344{
353 unsigned int i, col; 345 unsigned int i, col;
354 346
355 write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); 347 write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1);
356 write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1); 348 write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1);
357 write (STDERR_FILENO, APL_NAME, sizeof (APL_NAME) - 1); 349 write (STDERR_FILENO, RESNAME, sizeof (RESNAME) - 1);
358 350
359 switch (type) 351 switch (type)
360 { 352 {
361 case 0: /* brief listing */ 353 case 0: /* brief listing */
362 fprintf (stderr, " [-help] [--help]\n"); 354 fprintf (stderr, " [-help] [--help]\n");
… …
671 * the matching algorithm used for memory-save fake resources 663 * the matching algorithm used for memory-save fake resources
672 */ 664 */
673void 665void
674rxvt_term::get_xdefaults (FILE *stream, const char *name) 666rxvt_term::get_xdefaults (FILE *stream, const char *name)
675{ 667{
676 unsigned int len; 668 unsigned int len;
677 char *str, buffer[256]; 669 char *str, buffer[256];
678 670
679 if (stream == NULL) 671 if (stream == NULL)
680 return; 672 return;
681 len = STRLEN (name); 673 len = STRLEN (name);
682 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 674 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
… …
702 continue; 694 continue;
703 n = STRLEN (kw); 695 n = STRLEN (kw);
704 if (str[n] == ':' && rxvt_Str_match (str, kw)) 696 if (str[n] == ':' && rxvt_Str_match (str, kw))
705 { 697 {
706 /* skip `keyword:' */ 698 /* skip `keyword:' */
707 str += (n + 1); 699 str += n + 1;
708 rxvt_Str_trim (str); 700 rxvt_Str_trim (str);
709 n = STRLEN (str); 701 n = STRLEN (str);
710 if (n && rs[optList[entry].doff] == NULL) 702 if (n && rs[optList[entry].doff] == NULL)
711 { 703 {
712 /* not already set */ 704 /* not already set */
713 int s; 705 int s;
714 char *p = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 706 char *p = 0;
715 707
708 for (int o = 0;;)
709 {
710 p = (char *)rxvt_realloc (p, o + n + 1);
716 STRCPY (p, str); 711 MEMCPY (p + o, str, n);
712 o += n;
713 p[o] = 0;
714
715 if (o == 0 || p[o - 1] != '\\') // continuation line
716 break;
717
718 o--; // eat "\"
719
720 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
721 break;
722
723 rxvt_Str_trim (str);
724 n = STRLEN (str);
725 }
726
717 rs[optList[entry].doff] = p; 727 rs[optList[entry].doff] = p;
718 if (optList_isBool (entry)) 728 if (optList_isBool (entry))
719 { 729 {
720 s = STRCASECMP (str, "TRUE") == 0 730 s = STRCASECMP (str, "TRUE") == 0
721 || STRCASECMP (str, "YES") == 0 731 || STRCASECMP (str, "YES") == 0
… …
756 char *localepath = NULL; 766 char *localepath = NULL;
757 767
758 if (locale != NULL) 768 if (locale != NULL)
759 { /* XXX: must limit length of string */ 769 { /* XXX: must limit length of string */
760 localepath = (char *)rxvt_malloc (256); 770 localepath = (char *)rxvt_malloc (256);
761 sprintf (localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, 771 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
762 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (APL_SUBCLASS)), 772 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),
763 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 773 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
764 } 774 }
765 775
766 { 776 {
767# endif 777# endif
… …
822 832
823 /* Add in Rxvt file */ 833 /* Add in Rxvt file */
824# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 834# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
825 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL) 835 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
826# endif 836# endif
827 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" APL_SUBCLASS); 837 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
838
828 if (rdb1 != NULL) 839 if (rdb1 != NULL)
829 XrmMergeDatabases (rdb1, &database); 840 XrmMergeDatabases (rdb1, &database);
830 841
831 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 842 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
832 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL) 843 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
833 { 844 {
834 sprintf (fname, "%-.*s/" APL_SUBCLASS, sizeof (fname) 845 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
835 - sizeof (APL_SUBCLASS) - 2, xe); 846 - sizeof (RESCLASS) - 2, xe);
836 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 847 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
837 XrmMergeDatabases (rdb1, &database); 848 XrmMergeDatabases (rdb1, &database);
838 } 849 }
839 850
840 XrmSetDatabase (display, database); 851 XrmSetDatabase (display, database);
… …
854 865
855 p = XGetDefault (display, name, kw); 866 p = XGetDefault (display, name, kw);
856 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 867 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
857 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 868 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
858 { 869 {
859 p = XGetDefault (display, APL_SUBCLASS, kw); 870 p = XGetDefault (display, RESCLASS, kw);
871#ifdef RESFALLBACK
860 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 872 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
861 p = XGetDefault (display, APL_CLASS, kw); 873 p = XGetDefault (display, RESFALLBACK, kw);
874#endif
862 } 875 }
876
863 if (p == NULL && p0) 877 if (p == NULL && p0)
864 p = p0; 878 p = p0;
879
865 if (p) 880 if (p)
866 { 881 {
867 rs[optList[entry].doff] = p; 882 rs[optList[entry].doff] = p;
868 883
869 if (optList_isBool (entry)) 884 if (optList_isBool (entry))
… …
888# ifdef XrmEnumOneLevel 903# ifdef XrmEnumOneLevel
889# ifdef KEYSYM_RESOURCE 904# ifdef KEYSYM_RESOURCE
890 name_prefix[0] = XrmStringToName (name); 905 name_prefix[0] = XrmStringToName (name);
891 name_prefix[1] = XrmStringToName ("keysym"); 906 name_prefix[1] = XrmStringToName ("keysym");
892 name_prefix[2] = NULLQUARK; 907 name_prefix[2] = NULLQUARK;
893 class_prefix[0] = XrmStringToName (APL_SUBCLASS); 908 class_prefix[0] = XrmStringToName (RESCLASS);
894 class_prefix[1] = XrmStringToName ("Keysym"); 909 class_prefix[1] = XrmStringToName ("Keysym");
895 class_prefix[2] = NULLQUARK; 910 class_prefix[2] = NULLQUARK;
896 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 911 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
897 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 912 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
898 XrmEnumOneLevel, rxvt_define_key, NULL); 913 XrmEnumOneLevel, rxvt_define_key, NULL);
914# ifdef RESFALLBACK
899 name_prefix[0] = XrmStringToName (APL_CLASS); 915 name_prefix[0] = XrmStringToName (RESFALLBACK);
900 name_prefix[1] = XrmStringToName ("keysym"); 916 name_prefix[1] = XrmStringToName ("keysym");
901 class_prefix[0] = XrmStringToName (APL_CLASS); 917 class_prefix[0] = XrmStringToName (RESFALLBACK);
902 class_prefix[1] = XrmStringToName ("Keysym"); 918 class_prefix[1] = XrmStringToName ("Keysym");
903 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 919 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
904 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 920 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
905 XrmEnumOneLevel, rxvt_define_key, NULL); 921 XrmEnumOneLevel, rxvt_define_key, NULL);
922# endif
906# endif 923# endif
907# endif 924# endif
908 925
909# else /* USE_XGETDEFAULT */ 926# else /* USE_XGETDEFAULT */
910 /* get resources the hard way, but save lots of memory */ 927 /* get resources the hard way, but save lots of memory */
… …
948 * Also, use a special sub-class so that we can use either or both of 965 * Also, use a special sub-class so that we can use either or both of
949 * "XTerm" and "Rxvt" as class names. 966 * "XTerm" and "Rxvt" as class names.
950 */ 967 */
951 968
952 get_xdefaults (fd, name); 969 get_xdefaults (fd, name);
953 get_xdefaults (fd, APL_SUBCLASS); 970 get_xdefaults (fd, RESCLASS);
971# ifdef RESFALLBACK
972 get_xdefaults (fd, RESFALLBACK);
973# endif
954 974
955# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) 975# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
956
957 { 976 {
958 FILE *ad = NULL; 977 FILE *ad = NULL;
959 978
960# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 979# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
961 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL) 980 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
962# endif 981# endif
963 ad = fopen (XAPPLOADDIR "/" APL_SUBCLASS, "r"); 982 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
964 if (ad != NULL) 983 if (ad != NULL)
965 { 984 {
966 get_xdefaults (ad, APL_SUBCLASS); 985 get_xdefaults (ad, RESCLASS);
967 get_xdefaults (ad, ""); 986 get_xdefaults (ad, "");
968 fclose (ad); 987 fclose (ad);
969 } 988 }
970 } 989 }
971# endif /* XAPPLOADDIR */ 990# endif /* XAPPLOADDIR */
972 991
973 get_xdefaults (fd, APL_CLASS);
974 get_xdefaults (fd, ""); /* partial match */ 992 get_xdefaults (fd, ""); /* partial match */
975 if (fd != NULL) 993 if (fd != NULL)
976 fclose (fd); 994 fclose (fd);
977# endif /* USE_XGETDEFAULT */ 995# endif /* USE_XGETDEFAULT */
978 996
… …
985 free (localepath); 1003 free (localepath);
986# endif 1004# endif
987# endif 1005# endif
988 1006
989#endif /* NO_RESOURCES */ 1007#endif /* NO_RESOURCES */
990
991 /*
992 * even without resources, at least do this setup for command-line
993 * options and command-line long options
994 */
995
996#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
997 KeySym sym;
998
999 if (rs[Rs_bigfont_key]
1000 && ((sym = XStringToKeysym (rs[Rs_bigfont_key])) != 0))
1001 ks_bigfont = sym;
1002 if (rs[Rs_smallfont_key]
1003 && ((sym = XStringToKeysym (rs[Rs_smallfont_key])) != 0))
1004 ks_smallfont = sym;
1005#endif
1006} 1008}
1007 1009
1008/*}}} */ 1010/*}}} */
1009/*----------------------- end-of-file (C source) -----------------------*/ 1011/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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