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.16 by pcg, Thu Mar 4 00:59:10 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.16 2004/03/04 00:59:10 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>
240 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 240 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
241#endif 241#endif
242#ifdef PRINTPIPE 242#ifdef PRINTPIPE
243 RSTRG (Rs_print_pipe, "print-pipe", "string"), 243 RSTRG (Rs_print_pipe, "print-pipe", "string"),
244#endif 244#endif
245#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
246 RSTRG (Rs_bigfont_key, "bigfont_key", "keysym"),
247 RSTRG (Rs_smallfont_key, "smallfont_key", "keysym"),
248#endif
249 STRG (Rs_modifier, "modifier", "mod", "modifier", 245 STRG (Rs_modifier, "modifier", "mod", "modifier",
250 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 246 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
251 INFO ("xrm", "string", "X resource"), 247 INFO ("xrm", "string", "X resource"),
252#ifdef CUTCHAR_RESOURCE 248#ifdef CUTCHAR_RESOURCE
253 RSTRG (Rs_cutchars, "cutchars", "string"), 249 RSTRG (Rs_cutchars, "cutchars", "string"),
254#endif /* CUTCHAR_RESOURCE */ 250#endif /* CUTCHAR_RESOURCE */
255#ifdef ACS_ASCII
256 RSTRG (Rs_acs_chars, "acsChars", "string"),
257#endif /* ACS_ASCII */
258 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 251 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
259 INFO ("e", "command arg ...", "command to execute") 252 INFO ("e", "command arg ...", "command to execute")
260 }; 253 };
261 254
262#undef INFO 255#undef INFO
978# ifdef RESFALLBACK 971# ifdef RESFALLBACK
979 get_xdefaults (fd, RESFALLBACK); 972 get_xdefaults (fd, RESFALLBACK);
980# endif 973# endif
981 974
982# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) 975# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
983
984 { 976 {
985 FILE *ad = NULL; 977 FILE *ad = NULL;
986 978
987# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 979# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
988 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL) 980 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
989# endif 981# endif
990 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r"); 982 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1011 free (localepath); 1003 free (localepath);
1012# endif 1004# endif
1013# endif 1005# endif
1014 1006
1015#endif /* NO_RESOURCES */ 1007#endif /* NO_RESOURCES */
1016
1017 /*
1018 * even without resources, at least do this setup for command-line
1019 * options and command-line long options
1020 */
1021
1022#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
1023 KeySym sym;
1024
1025 if (rs[Rs_bigfont_key]
1026 && ((sym = XStringToKeysym (rs[Rs_bigfont_key])) != 0))
1027 ks_bigfont = sym;
1028 if (rs[Rs_smallfont_key]
1029 && ((sym = XStringToKeysym (rs[Rs_smallfont_key])) != 0))
1030 ks_smallfont = sym;
1031#endif
1032} 1008}
1033 1009
1034/*}}} */ 1010/*}}} */
1035/*----------------------- end-of-file (C source) -----------------------*/ 1011/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines