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.30 by root, Fri Aug 13 03:36:57 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 $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
8 * - original version 7 * - original version
9 * 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>
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.
… …
83 const char *desc; /* description */ 83 const char *desc; /* description */
84 } 84 }
85optList[] = { 85optList[] = {
86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
88 STRG (Rs_term_name, "termName", "tn", "string", 88 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
89 "value of the TERM environment variable"),
90 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
91 STRG (Rs_geometry, "geometry", "geometry", "geometry", 90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
92 "size (in characters) and position"),
93 SWCH ("C", Opt_console, "intercept console messages"), 91 SWCH ("C", Opt_console, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, "start iconic"), 92 SWCH ("iconic", Opt_iconic, "start iconic"),
95 SWCH ("ic", Opt_iconic, NULL), /* short form */ 93 SWCH ("ic", Opt_iconic, NULL), /* short form */
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
97 "reverse video"),
98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
100#ifdef HAVE_SCROLLBARS 97#ifdef HAVE_SCROLLBARS
101 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 98 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
102 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 99 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
103 "scrollbar right"), 100 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st",
105 Opt_scrollBar_floating, "scrollbar without a trough"),
106#endif 101#endif
107 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 102 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
108 NULL),
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, 103 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
110 "scroll-on-tty-output inhibit"),
111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 104 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
112 "scroll-on-keypress"),
113 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 105 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
114 "scroll-with-buffer"),
115#ifdef TRANSPARENT 106#ifdef TRANSPARENT
116 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 107 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
117 "inherit parent pixmap"),
118 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, 108 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
119 "forcefully inherit root pixmap"),
120 SWCH ("tr", Opt_transparent, NULL), 109 SWCH ("tr", Opt_transparent, NULL),
110#if TINTING
111 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
112#endif
113#endif
114#ifdef OFF_FOCUS_FADING
115 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when urxvt is losing focus."),
116#endif
117#ifdef TINTING
118 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
121#endif 119#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 120 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
123#ifndef NO_BELL 121#ifndef NO_BELL
124 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 122 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
125# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 123# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
… …
128#endif 126#endif
129#ifdef META8_OPTION 127#ifdef META8_OPTION
130 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 128 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
131#endif 129#endif
132#ifdef MOUSE_WHEEL 130#ifdef MOUSE_WHEEL
133 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 131 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 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 132#endif
140#ifndef NO_FRILLS 133#ifndef NO_FRILLS
141 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 134 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
142 "triple click word selection"), 135 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
143#endif 136#endif
144#ifdef CURSOR_BLINK 137#ifdef CURSOR_BLINK
145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 138 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
146#endif 139#endif
147#ifdef POINTER_BLANK 140#ifdef POINTER_BLANK
… …
166 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 159 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
167 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
169#endif /* NO_BRIGHTCOLOR */ 162#endif /* NO_BRIGHTCOLOR */
170#ifndef NO_BOLD_UNDERLINE_REVERSE 163#ifndef NO_BOLD_UNDERLINE_REVERSE
164 BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"),
171 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 165 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
172 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 166 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
173 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 167 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
174#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 168#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
175#ifdef KEEP_SCROLLCOLOR 169#ifdef KEEP_SCROLLCOLOR
… …
181#endif 175#endif
182#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 176#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
183 RSTRG (Rs_path, "path", "search path"), 177 RSTRG (Rs_path, "path", "search path"),
184#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 178#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
185#ifdef XPM_BACKGROUND 179#ifdef XPM_BACKGROUND
186 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", 180 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
187 "background pixmap"),
188#endif /* XPM_BACKGROUND */ 181#endif /* XPM_BACKGROUND */
189#if (MENUBAR_MAX) 182#if (MENUBAR_MAX)
190 RSTRG (Rs_menu, "menu", "name[;tag]"), 183 RSTRG (Rs_menu, "menu", "name[;tag]"),
191#endif 184#endif
192 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 185 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
193 /* fonts: command-line option = resource name */ 186 /* fonts: command-line option = resource name */
194#ifdef USE_XIM 187#ifdef USE_XIM
195 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 188 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
196 STRG (Rs_preeditType, "preeditType", "pt", "style", 189 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
197 "input style: style = OverTheSpot|OffTheSpot|Root"),
198#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 190#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
199 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 191 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
200#endif 192#endif
201#endif /* USE_XIM */ 193#endif /* USE_XIM */
202 STRG (Rs_name, NULL, "name", "string", 194 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
203 "client instance, icon, and title strings"),
204 STRG (Rs_title, "title", "title", "string", "title name for window"), 195 STRG (Rs_title, "title", "title", "string", "title name for window"),
205 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 196 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
206 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 197 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
207#ifndef NO_CURSORCOLOR 198#ifndef NO_CURSORCOLOR
208 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 199 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
209 /* command-line option = resource name */ 200 /* command-line option = resource name */
210 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 201 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
211#endif /* NO_CURSORCOLOR */ 202#endif /* NO_CURSORCOLOR */
212 STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color", 203 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
213 "pointer color"), 204 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
214 STRG (Rs_color + Color_border, "borderColor", "bd", "color", 205 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
215 "border color"),
216 STRG (Rs_saveLines, "saveLines", "sl", "number", 206 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
217 "number of scrolled lines to save"),
218#ifndef NO_FRILLS 207#ifndef NO_FRILLS
219 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", 208 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
220 "external border in pixels"),
221 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 209 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
222 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 210 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
223 STRG (Rs_int_bwidth, "internalBorder", "b", "number", 211 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
224 "internal border in pixels"), 212 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
225#endif 213#endif
226#ifndef NO_LINESPACE 214#ifndef NO_LINESPACE
227 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", 215 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
228 "number of extra pixels between rows"),
229#endif 216#endif
230 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", 217 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
231 "scrollbar thickness/width in pixels"),
232#ifdef POINTER_BLANK 218#ifdef POINTER_BLANK
233 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 219 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
234#endif 220#endif
235#ifndef NO_BACKSPACE_KEY 221#ifndef NO_BACKSPACE_KEY
236 RSTRG (Rs_backspace_key, "backspacekey", "string"), 222 RSTRG (Rs_backspace_key, "backspacekey", "string"),
… …
244 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 230 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
245#endif 231#endif
246#ifdef PRINTPIPE 232#ifdef PRINTPIPE
247 RSTRG (Rs_print_pipe, "print-pipe", "string"), 233 RSTRG (Rs_print_pipe, "print-pipe", "string"),
248#endif 234#endif
249#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 235 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
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",
254 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
255 INFO ("xrm", "string", "X resource"), 236 INFO ("xrm", "string", "X resource"),
256#ifdef CUTCHAR_RESOURCE 237#ifdef CUTCHAR_RESOURCE
257 RSTRG (Rs_cutchars, "cutchars", "string"), 238 RSTRG (Rs_cutchars, "cutchars", "string"),
258#endif /* CUTCHAR_RESOURCE */ 239#endif /* CUTCHAR_RESOURCE */
259#ifdef ACS_ASCII
260 RSTRG (Rs_acs_chars, "acsChars", "string"),
261#endif /* ACS_ASCII */
262 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 240 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
241#ifndef NO_SECONDARY_SCREEN
242 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
243 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
244#endif
263 INFO ("e", "command arg ...", "command to execute") 245 INFO ("e", "command arg ...", "command to execute")
264 }; 246 };
265 247
266#undef INFO 248#undef INFO
267#undef STRG 249#undef STRG
… …
270#undef BOOL 252#undef BOOL
271/*}}} */ 253/*}}} */
272 254
273static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 255static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n";
274static const char optionsstring[] = "Options: " 256static const char optionsstring[] = "Options: "
257#if XFT
258 "xft,"
259#endif
260#if UNICODE_3
261 "unicode3,"
262#endif
263 "encodings=eu+vn"
264#if ENCODING_JP
265 "+jp"
266#endif
267#if ENCODING_JP_EXT
268 "+jp-ext"
269#endif
270#if ENCODING_KR
271 "+kr"
272#endif
273#if ENCODING_CN
274 "+cn"
275#endif
276#if ENCODING_CN_EXT
277 "+cn-ext"
278#endif
279 ","
280#if ENABLE_COMBINING
281 "combining,"
282#endif
283#if TEXT_BLINK
284 "blink,"
285#endif
286#if OFF_FOCUS_FADING
287 "fade,"
288#endif
275#if defined(XPM_BACKGROUND) 289#if defined(XPM_BACKGROUND)
276 "XPM," 290 "XPM,"
277#endif 291#endif
278#if defined(TRANSPARENT) 292#if defined(TRANSPARENT)
279 "transparent," 293 "transparent,"
280#endif 294#endif
295#if TINTING
296 "tint,"
297#endif
281#if defined(UTMP_SUPPORT) 298#if defined(UTMP_SUPPORT)
282 "utmp," 299 "utmp,"
283#endif 300#endif
284#if defined(MENUBAR) 301#if defined(MENUBAR)
285 "menubar," 302 "menubar,"
286#endif 303#endif
287#if !defined(NO_FRILLS)
288 "frills,"
289#endif
290#if !defined(NO_LINESPACE)
291 "linespace,"
292#endif
293#if defined(PREFER_24BIT)
294 "24bit,"
295#endif
296#if defined(USE_XIM) 304#if defined(USE_XIM)
297 "XIM," 305 "XIM,"
298#endif
299#if defined(MULTICHAR_SET)
300 "multichar_languages,"
301#endif 306#endif
302 "scrollbars=" 307 "scrollbars="
303#if !defined(HAVE_SCROLLBARS) 308#if !defined(HAVE_SCROLLBARS)
304 "NONE" 309 "NONE"
305#else 310#else
311# if defined(PLAIN_SCROLLBAR)
312 "plain"
313# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
314 "+"
315# endif
316# endif
306# if defined(RXVT_SCROLLBAR) 317# if defined(RXVT_SCROLLBAR)
307 "rxvt" 318 "rxvt"
308# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 319# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
309 "+" 320 "+"
310# endif 321# endif
… …
324 "no_backspace," 335 "no_backspace,"
325#endif 336#endif
326#if defined(NO_DELETE_KEY) 337#if defined(NO_DELETE_KEY)
327 "no_delete," 338 "no_delete,"
328#endif 339#endif
340#if EIGHT_BIT_CONTROLS
341 "8bitctrls,"
342#endif
329#if !defined(NO_STRINGS) 343#if !defined(NO_STRINGS)
330 "strings," 344 "strings,"
331#endif 345#endif
346#if !defined(NO_FRILLS)
347 "frills,"
348#endif
349#if !defined(NO_LINESPACE)
350 "linespace,"
351#endif
352#if defined(PREFER_24BIT)
353 "24bit,"
354#endif
355#if defined(SELECTION_SCROLLING)
356 "selectionscrolling,"
357#endif
358#if MOUSE_WHEEL
359 "wheel,"
360#endif
361#if MOUSE_SLIP_WHEELING
362 "slipwheel,"
363#endif
364#if defined(SMART_RESIZE)
365 "smart-resize,"
366#endif
332#if defined(TTY_256COLOR) 367#if defined(TTY_256COLOR)
333 "256colour," 368 "256colour,"
369#endif
370#if defined(CURSOR_BLINK)
371 "cursorBlink,"
372#endif
373#if defined(POINTER_BLANK)
374 "pointerBlank,"
334#endif 375#endif
335#if defined(NO_RESOURCES) 376#if defined(NO_RESOURCES)
336 "NoResources" 377 "NoResources"
337#else 378#else
338# if defined(USE_XGETDEFAULT) 379# if defined(USE_XGETDEFAULT)
… …
348/*{{{ usage: */ 389/*{{{ usage: */
349/*----------------------------------------------------------------------*/ 390/*----------------------------------------------------------------------*/
350static void 391static void
351rxvt_usage (int type) 392rxvt_usage (int type)
352{ 393{
353 unsigned int i, col; 394 unsigned int i, col;
354 395
355 write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); 396 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
356 write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1);
357 write (STDERR_FILENO, APL_NAME, sizeof (APL_NAME) - 1);
358 397
359 switch (type) 398 switch (type)
360 { 399 {
361 case 0: /* brief listing */ 400 case 0: /* brief listing */
362 fprintf (stderr, " [-help] [--help]\n"); 401 rxvt_log (" [-help] [--help]\n");
402
363 for (col = 1, i = 0; i < optList_size (); i++) 403 for (col = 1, i = 0; i < optList_size (); i++)
364 if (optList[i].desc != NULL) 404 if (optList[i].desc != NULL)
365 { 405 {
366 int len = 0; 406 int len = 0;
367 407
… …
376#endif 416#endif
377 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 417 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0);
378 col += len; 418 col += len;
379 if (col > 79) 419 if (col > 79)
380 { /* assume regular width */ 420 { /* assume regular width */
381 putc ('\n', stderr); 421 rxvt_log ("\n");
382 col = 1 + len; 422 col = 1 + len;
383 } 423 }
424
384 fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""), 425 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
385 optList[i].opt);
386 if (optList_strlen (i)) 426 if (optList_strlen (i))
387 fprintf (stderr, " %s]", optList[i].arg); 427 rxvt_log (" %s]", optList[i].arg);
388 else 428 else
389 fprintf (stderr, "]"); 429 rxvt_log ("]");
390 } 430 }
391 break; 431 break;
392 432
393 case 1: /* full command-line listing */ 433 case 1: /* full command-line listing */
394 fprintf (stderr, " [options] [-e command args]\n\n" 434 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
395 "where options include:\n"); 435
396 for (i = 0; i < optList_size (); i++) 436 for (i = 0; i < optList_size (); i++)
397 if (optList[i].desc != NULL) 437 if (optList[i].desc != NULL)
398 { 438 {
399#ifdef DEBUG_STRICT 439#ifdef DEBUG_STRICT
400 assert (optList[i].opt != NULL); 440 assert (optList[i].opt != NULL);
401#endif 441#endif
402 fprintf (stderr, " %s%s %-*s%s%s\n", 442 rxvt_log (" %s%s %-*s%s%s\n",
403 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 443 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
404 (INDENT - STRLEN (optList[i].opt) 444 (INDENT - STRLEN (optList[i].opt)
405 + (optList_isBool (i) ? 0 : 2)), 445 + (optList_isBool (i) ? 0 : 2)),
406 (optList[i].arg ? optList[i].arg : ""), 446 (optList[i].arg ? optList[i].arg : ""),
407 (optList_isBool (i) ? "turn on/off " : ""), 447 (optList_isBool (i) ? "turn on/off " : ""),
408 optList[i].desc); 448 optList[i].desc);
409 } 449 }
410 fprintf (stderr, "\n --help to list long-options"); 450 rxvt_log ("\n --help to list long-options");
411 break; 451 break;
412 452
413 case 2: /* full resource listing */ 453 case 2: /* full resource listing */
414 fprintf (stderr,
415 " [options] [-e command args]\n\n" 454 rxvt_log (" [options] [-e command args]\n\n"
416 "where resources (long-options) include:\n"); 455 "where resources (long-options) include:\n");
417 456
418 for (i = 0; i < optList_size (); i++) 457 for (i = 0; i < optList_size (); i++)
419 if (optList[i].kw != NULL) 458 if (optList[i].kw != NULL)
420 fprintf (stderr, " %s: %*s%s\n", 459 rxvt_log (" %s: %*s%s\n",
421 optList[i].kw, 460 optList[i].kw,
422 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 461 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */
423 (optList_isBool (i) ? "boolean" : optList[i].arg)); 462 (optList_isBool (i) ? "boolean" : optList[i].arg));
424#ifdef KEYSYM_RESOURCE 463#ifdef KEYSYM_RESOURCE
425 fprintf (stderr, " " "keysym.sym" ": %*s%s\n", 464 rxvt_log (" " "keysym.sym" ": %*s%s\n",
426 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 465 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
427 "keysym"); 466 "keysym");
428#endif 467#endif
429 fprintf (stderr, "\n -help to list options"); 468 rxvt_log ("\n -help to list options");
430 break; 469 break;
431 } 470 }
432 fprintf (stderr, "\n\n"); 471
433 exit (EXIT_FAILURE); 472 rxvt_log ("\n\n");
473 rxvt_exit_failure ();
434 /* NOTREACHED */ 474 /* NOTREACHED */
435} 475}
436 476
437/*}}} */ 477/*}}} */
438 478
… …
465 longopt = *opt++; /* long option */ 505 longopt = *opt++; /* long option */
466 } 506 }
467 else 507 else
468 { 508 {
469 bad_option = 1; 509 bad_option = 1;
470 rxvt_print_error ("bad option \"%s\"", opt); 510 rxvt_warn ("\"%s\": malformed option.\n", opt);
471 continue; 511 continue;
472 } 512 }
473 513
474 if (!STRCMP (opt, "help")) 514 if (!STRCMP (opt, "help"))
475 rxvt_usage (longopt ? 2 : 1); 515 rxvt_usage (longopt ? 2 : 1);
… …
485 525
486 if (entry < optList_size ()) 526 if (entry < optList_size ())
487 { 527 {
488 if (optList_isReverse (entry)) 528 if (optList_isReverse (entry))
489 flag = flag == On ? Off : On; 529 flag = flag == On ? Off : On;
530
490 if (optList_strlen (entry)) 531 if (optList_strlen (entry))
491 { /* string value */
492 const char *str = argv[++i];
493
494#ifdef DEBUG_RESOURCES
495 fprintf (stderr, "string (%s,%s) = ",
496 optList[entry].opt ? optList[entry].opt : "nil",
497 optList[entry].kw ? optList[entry].kw : "nil");
498#endif
499 if (flag == On && str && (optList[entry].doff != -1))
500 { 532 {
501#ifdef DEBUG_RESOURCES
502 fprintf (stderr, "\"%s\"\n", str);
503#endif
504 rs[optList[entry].doff] = str;
505 /* 533 /*
506 * special cases are handled in main.c:main () to allow 534 * special cases are handled in main.c:main () to allow
507 * X resources to set these values before we settle for 535 * X resources to set these values before we settle for
508 * default values 536 * default values
509 */ 537 */
510 }
511#ifdef DEBUG_RESOURCES
512 else
513 fprintf (stderr, "???\n");
514#endif
515 538
539 if (optList[entry].doff != -1)
540 rs[optList[entry].doff] = flag == On && argv[i+1]
541 ? argv[++i] : 0;
516 } 542 }
517 else 543 else
518 { /* boolean value */ 544 { /* boolean value */
519#ifdef DEBUG_RESOURCES 545#ifdef DEBUG_RESOURCES
520 fprintf (stderr, "boolean (%s,%s) = %s\n", 546 fprintf (stderr, "boolean (%s,%s) = %s\n",
… …
532 else 558 else
533#ifdef KEYSYM_RESOURCE 559#ifdef KEYSYM_RESOURCE
534 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 560 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */
535 if (rxvt_Str_match (opt, "keysym.")) 561 if (rxvt_Str_match (opt, "keysym."))
536 { 562 {
537 const char *str = argv[++i]; 563 const char *str = argv[++i];
538 564
539 if (str != NULL) 565 if (str != NULL)
540 parse_keysym (opt + sizeof ("keysym.") - 1, str); 566 parse_keysym (opt + sizeof ("keysym.") - 1, str);
541 } 567 }
542 else 568 else
543#endif 569#endif
570 {
544 bad_option = 1; 571 bad_option = 1;
572 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
573 }
545 } 574 }
546 575
547 if (bad_option) 576 if (bad_option)
548 rxvt_usage (0); 577 rxvt_usage (0);
549} 578}
… …
559 * quarks will be something like 588 * quarks will be something like
560 * "rxvt" "keysym" "0xFF01" 589 * "rxvt" "keysym" "0xFF01"
561 * value will be a string 590 * value will be a string
562 */ 591 */
563/* ARGSUSED */ 592/* ARGSUSED */
564bool 593int
565rxvt_define_key(XrmDatabase *database __attribute__((unused)), XrmBindingList bindings __attribute__((unused)), XrmQuarkList quarks, XrmRepresentation *type __attribute__((unused)), XrmValue *value, XPointer closure __attribute__((unused))) 594rxvt_define_key (XrmDatabase *database __attribute__((unused)),
595 XrmBindingList bindings __attribute__((unused)),
596 XrmQuarkList quarks,
597 XrmRepresentation *type __attribute__((unused)),
598 XrmValue *value,
599 XPointer closure __attribute__((unused)))
566{ 600{
567 int last; 601 int last;
568 602
569 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 603 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
570 ; 604 ;
… …
666 * the matching algorithm used for memory-save fake resources 700 * the matching algorithm used for memory-save fake resources
667 */ 701 */
668void 702void
669rxvt_term::get_xdefaults (FILE *stream, const char *name) 703rxvt_term::get_xdefaults (FILE *stream, const char *name)
670{ 704{
671 unsigned int len; 705 unsigned int len;
672 char *str, buffer[256]; 706 char *str, buffer[256];
673 707
674 if (stream == NULL) 708 if (stream == NULL)
675 return; 709 return;
710
676 len = STRLEN (name); 711 len = STRLEN (name);
677 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 712 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
678 { 713 {
679 unsigned int entry, n; 714 unsigned int entry, n;
680 715
… …
689# ifdef KEYSYM_RESOURCE 724# ifdef KEYSYM_RESOURCE
690 if (!parse_keysym (str, NULL)) 725 if (!parse_keysym (str, NULL))
691# endif /* KEYSYM_RESOURCE */ 726# endif /* KEYSYM_RESOURCE */
692 for (entry = 0; entry < optList_size (); entry++) 727 for (entry = 0; entry < optList_size (); entry++)
693 { 728 {
694 const char *kw = optList[entry].kw; 729 const char *kw = optList[entry].kw;
695 730
696 if (kw == NULL) 731 if (kw == NULL)
697 continue; 732 continue;
733
698 n = STRLEN (kw); 734 n = STRLEN (kw);
699 if (str[n] == ':' && rxvt_Str_match (str, kw)) 735 if (str[n] == ':' && rxvt_Str_match (str, kw))
700 { 736 {
701 /* skip `keyword:' */ 737 /* skip `keyword:' */
702 str += (n + 1); 738 str += n + 1;
703 rxvt_Str_trim (str); 739 rxvt_Str_trim (str);
704 n = STRLEN (str); 740 n = STRLEN (str);
705 if (n && rs[optList[entry].doff] == NULL) 741 if (n && rs[optList[entry].doff] == NULL)
706 { 742 {
707 /* not already set */ 743 /* not already set */
708 int s; 744 int s;
709 char *p = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 745 char *p = 0;
710 746
747 for (int o = 0;;)
748 {
749 p = (char *)rxvt_realloc (p, o + n + 1);
711 STRCPY (p, str); 750 MEMCPY (p + o, str, n);
751 o += n;
752 p[o] = 0;
753
754 if (o == 0 || p[o - 1] != '\\') // continuation line
755 break;
756
757 o--; // eat "\"
758
759 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
760 break;
761
762 rxvt_Str_trim (str);
763 n = STRLEN (str);
764 }
765
712 rs[optList[entry].doff] = p; 766 rs[optList[entry].doff] = p;
767 allocated.push_back (p);
768
713 if (optList_isBool (entry)) 769 if (optList_isBool (entry))
714 { 770 {
715 s = STRCASECMP (str, "TRUE") == 0 771 s = STRCASECMP (str, "TRUE") == 0
716 || STRCASECMP (str, "YES") == 0 772 || STRCASECMP (str, "YES") == 0
717 || STRCASECMP (str, "ON") == 0 773 || STRCASECMP (str, "ON") == 0
718 || STRCASECMP (str, "1") == 0; 774 || STRCASECMP (str, "1") == 0;
775
719 if (optList_isReverse (entry)) 776 if (optList_isReverse (entry))
720 s = !s; 777 s = !s;
778
721 if (s) 779 if (s)
722 Options |= (optList[entry].flag); 780 Options |= optList[entry].flag;
723 else 781 else
724 Options &= ~ (optList[entry].flag); 782 Options &= ~optList[entry].flag;
725 } 783 }
726 } 784 }
785
727 break; 786 break;
728 } 787 }
729 } 788 }
730 } 789 }
790
731 rewind (stream); 791 rewind (stream);
732} 792}
733 793
734/*}}} */ 794/*}}} */
735# endif /* ! USE_XGETDEFAULT */ 795# endif /* ! USE_XGETDEFAULT */
… …
746#ifndef NO_RESOURCES 806#ifndef NO_RESOURCES
747 807
748# if defined XAPPLOADDIR 808# if defined XAPPLOADDIR
749# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 809# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
750 /* Compute the path of the possibly available localized Rxvt file */ 810 /* Compute the path of the possibly available localized Rxvt file */
751 char *localepath = NULL; 811 char *localepath = NULL;
752 812
753 if (locale != NULL) 813 if (locale != NULL)
754 { /* XXX: must limit length of string */ 814 { /* XXX: must limit length of string */
755 localepath = (char *)rxvt_malloc (256); 815 localepath = (char *)rxvt_malloc (256);
756 sprintf (localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, 816 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
757 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (APL_SUBCLASS)), 817 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),
758 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 818 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
759 } 819 }
760 820
761 { 821 {
762# endif 822# endif
… …
764 824
765# ifdef USE_XGETDEFAULT 825# ifdef USE_XGETDEFAULT
766 /* 826 /*
767 * get resources using the X library function 827 * get resources using the X library function
768 */ 828 */
769 int entry; 829 int entry;
770 830
771# ifdef XrmEnumOneLevel 831# ifdef XrmEnumOneLevel
772 int i; 832 int i;
773 char *displayResource, *xe; 833 char *displayResource, *xe;
774 XrmName name_prefix[3]; 834 XrmName name_prefix[3];
775 XrmClass class_prefix[3]; 835 XrmClass class_prefix[3];
776 XrmDatabase database, rdb1; 836 XrmDatabase database, rdb1;
777 char fname[1024]; 837 char fname[1024];
778 838
779 XrmInitialize (); 839 XrmInitialize ();
780 database = NULL; 840 database = NULL;
781 841
782 /* Get any Xserver defaults */ 842 /* Get any Xserver defaults */
… …
795 855
796 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 856 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
797 { 857 {
798 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 858 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2,
799 ptr, xnames[i]); 859 ptr, xnames[i]);
800 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 860 if ((rdb1 = XrmGetFileDatabase (fname)))
801 { 861 {
802 XrmMergeDatabases (rdb1, &database); 862 XrmMergeDatabases (rdb1, &database);
803# ifndef HAVE_BOTH_XRESOURCE_FILES 863# ifndef HAVE_BOTH_XRESOURCE_FILES
804 break; 864 break;
805# endif 865# endif
… …
817 877
818 /* Add in Rxvt file */ 878 /* Add in Rxvt file */
819# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 879# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
820 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL) 880 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
821# endif 881# endif
822 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" APL_SUBCLASS); 882 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
883
823 if (rdb1 != NULL) 884 if (rdb1 != NULL)
824 XrmMergeDatabases (rdb1, &database); 885 XrmMergeDatabases (rdb1, &database);
825 886
826 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 887 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
827 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL) 888 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
828 { 889 {
829 sprintf (fname, "%-.*s/" APL_SUBCLASS, sizeof (fname) 890 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
830 - sizeof (APL_SUBCLASS) - 2, xe); 891 - sizeof (RESCLASS) - 2, xe);
831 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 892 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
832 XrmMergeDatabases (rdb1, &database); 893 XrmMergeDatabases (rdb1, &database);
833 } 894 }
834 895
835 XrmSetDatabase (display, database); 896 XrmSetDatabase (display, database);
… …
849 910
850 p = XGetDefault (display, name, kw); 911 p = XGetDefault (display, name, kw);
851 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 912 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
852 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 913 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
853 { 914 {
854 p = XGetDefault (display, APL_SUBCLASS, kw); 915 p = XGetDefault (display, RESCLASS, kw);
916#ifdef RESFALLBACK
855 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 917 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
856 p = XGetDefault (display, APL_CLASS, kw); 918 p = XGetDefault (display, RESFALLBACK, kw);
919#endif
857 } 920 }
921
858 if (p == NULL && p0) 922 if (p == NULL && p0)
859 p = p0; 923 p = p0;
924
860 if (p) 925 if (p)
861 { 926 {
862 rs[optList[entry].doff] = p; 927 rs[optList[entry].doff] = p;
863 928
864 if (optList_isBool (entry)) 929 if (optList_isBool (entry))
… …
883# ifdef XrmEnumOneLevel 948# ifdef XrmEnumOneLevel
884# ifdef KEYSYM_RESOURCE 949# ifdef KEYSYM_RESOURCE
885 name_prefix[0] = XrmStringToName (name); 950 name_prefix[0] = XrmStringToName (name);
886 name_prefix[1] = XrmStringToName ("keysym"); 951 name_prefix[1] = XrmStringToName ("keysym");
887 name_prefix[2] = NULLQUARK; 952 name_prefix[2] = NULLQUARK;
888 class_prefix[0] = XrmStringToName (APL_SUBCLASS); 953 class_prefix[0] = XrmStringToName (RESCLASS);
889 class_prefix[1] = XrmStringToName ("Keysym"); 954 class_prefix[1] = XrmStringToName ("Keysym");
890 class_prefix[2] = NULLQUARK; 955 class_prefix[2] = NULLQUARK;
891 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 956 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
892 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 957 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
893 XrmEnumOneLevel, rxvt_define_key, NULL); 958 XrmEnumOneLevel, rxvt_define_key, NULL);
959# ifdef RESFALLBACK
894 name_prefix[0] = XrmStringToName (APL_CLASS); 960 name_prefix[0] = XrmStringToName (RESFALLBACK);
895 name_prefix[1] = XrmStringToName ("keysym"); 961 name_prefix[1] = XrmStringToName ("keysym");
896 class_prefix[0] = XrmStringToName (APL_CLASS); 962 class_prefix[0] = XrmStringToName (RESFALLBACK);
897 class_prefix[1] = XrmStringToName ("Keysym"); 963 class_prefix[1] = XrmStringToName ("Keysym");
898 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 964 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
899 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 965 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
900 XrmEnumOneLevel, rxvt_define_key, NULL); 966 XrmEnumOneLevel, rxvt_define_key, NULL);
967# endif
901# endif 968# endif
902# endif 969# endif
903 970
904# else /* USE_XGETDEFAULT */ 971# else /* USE_XGETDEFAULT */
905 /* get resources the hard way, but save lots of memory */ 972 /* 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 1010 * Also, use a special sub-class so that we can use either or both of
944 * "XTerm" and "Rxvt" as class names. 1011 * "XTerm" and "Rxvt" as class names.
945 */ 1012 */
946 1013
947 get_xdefaults (fd, name); 1014 get_xdefaults (fd, name);
948 get_xdefaults (fd, APL_SUBCLASS); 1015 get_xdefaults (fd, RESCLASS);
1016# ifdef RESFALLBACK
1017 get_xdefaults (fd, RESFALLBACK);
1018# endif
949 1019
950# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) 1020# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
951
952 { 1021 {
953 FILE *ad = NULL; 1022 FILE *ad = NULL;
954 1023
955# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1024# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
956 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL) 1025 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
957# endif 1026# endif
958 ad = fopen (XAPPLOADDIR "/" APL_SUBCLASS, "r"); 1027 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
959 if (ad != NULL) 1028 if (ad != NULL)
960 { 1029 {
961 get_xdefaults (ad, APL_SUBCLASS); 1030 get_xdefaults (ad, RESCLASS);
962 get_xdefaults (ad, ""); 1031 get_xdefaults (ad, "");
963 fclose (ad); 1032 fclose (ad);
964 } 1033 }
965 } 1034 }
966# endif /* XAPPLOADDIR */ 1035# endif /* XAPPLOADDIR */
967 1036
968 get_xdefaults (fd, APL_CLASS);
969 get_xdefaults (fd, ""); /* partial match */ 1037 get_xdefaults (fd, ""); /* partial match */
970 if (fd != NULL) 1038 if (fd != NULL)
971 fclose (fd); 1039 fclose (fd);
972# endif /* USE_XGETDEFAULT */ 1040# endif /* USE_XGETDEFAULT */
973 1041
… …
980 free (localepath); 1048 free (localepath);
981# endif 1049# endif
982# endif 1050# endif
983 1051
984#endif /* NO_RESOURCES */ 1052#endif /* NO_RESOURCES */
985
986 /*
987 * even without resources, at least do this setup for command-line
988 * options and command-line long options
989 */
990
991#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
992 KeySym sym;
993
994 if (rs[Rs_bigfont_key]
995 && ((sym = XStringToKeysym (rs[Rs_bigfont_key])) != 0))
996 ks_bigfont = sym;
997 if (rs[Rs_smallfont_key]
998 && ((sym = XStringToKeysym (rs[Rs_smallfont_key])) != 0))
999 ks_smallfont = sym;
1000#endif
1001} 1053}
1002 1054
1003/*}}} */ 1055/*}}} */
1004/*----------------------- end-of-file (C source) -----------------------*/ 1056/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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