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.19 by pcg, Mon Mar 22 15:15:04 2004 UTC vs.
Revision 1.28 by root, Fri Jul 30 22:36:42 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xdefaults.c 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xdefaults.C,v 1.19 2004/03/22 15:15:04 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 132#endif
136#ifndef NO_FRILLS 133#ifndef NO_FRILLS
137 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 134 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
138 "triple click word selection"), 135 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
139#endif 136#endif
140#ifdef CURSOR_BLINK 137#ifdef CURSOR_BLINK
141 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 138 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
142#endif 139#endif
143#ifdef POINTER_BLANK 140#ifdef POINTER_BLANK
… …
162 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 159 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
163 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
164 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
165#endif /* NO_BRIGHTCOLOR */ 162#endif /* NO_BRIGHTCOLOR */
166#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"),
167 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 165 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
168 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 166 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
169 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 167 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
170#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 168#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
171#ifdef KEEP_SCROLLCOLOR 169#ifdef KEEP_SCROLLCOLOR
… …
177#endif 175#endif
178#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 176#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
179 RSTRG (Rs_path, "path", "search path"), 177 RSTRG (Rs_path, "path", "search path"),
180#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 178#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
181#ifdef XPM_BACKGROUND 179#ifdef XPM_BACKGROUND
182 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", 180 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
183 "background pixmap"),
184#endif /* XPM_BACKGROUND */ 181#endif /* XPM_BACKGROUND */
185#if (MENUBAR_MAX) 182#if (MENUBAR_MAX)
186 RSTRG (Rs_menu, "menu", "name[;tag]"), 183 RSTRG (Rs_menu, "menu", "name[;tag]"),
187#endif 184#endif
188 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 185 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
189 /* fonts: command-line option = resource name */ 186 /* fonts: command-line option = resource name */
190#ifdef USE_XIM 187#ifdef USE_XIM
191 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 188 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
192 STRG (Rs_preeditType, "preeditType", "pt", "style", 189 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
193 "input style: style = OverTheSpot|OffTheSpot|Root"),
194#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 190#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
195 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"),
196#endif 192#endif
197#endif /* USE_XIM */ 193#endif /* USE_XIM */
198 STRG (Rs_name, NULL, "name", "string", 194 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
199 "client instance, icon, and title strings"),
200 STRG (Rs_title, "title", "title", "string", "title name for window"), 195 STRG (Rs_title, "title", "title", "string", "title name for window"),
201 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 196 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
202 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 197 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
203#ifndef NO_CURSORCOLOR 198#ifndef NO_CURSORCOLOR
204 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 199 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
205 /* command-line option = resource name */ 200 /* command-line option = resource name */
206 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 201 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
207#endif /* NO_CURSORCOLOR */ 202#endif /* NO_CURSORCOLOR */
208 STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color", 203 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
209 "pointer color"), 204 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
210 STRG (Rs_color + Color_border, "borderColor", "bd", "color", 205 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
211 "border color"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", 206 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213 "number of scrolled lines to save"),
214#ifndef NO_FRILLS 207#ifndef NO_FRILLS
215 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", 208 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
216 "external border in pixels"),
217 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 209 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
218 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 210 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
219 STRG (Rs_int_bwidth, "internalBorder", "b", "number", 211 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
220 "internal border in pixels"),
221#endif 212#endif
222#ifndef NO_LINESPACE 213#ifndef NO_LINESPACE
223 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", 214 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
224 "number of extra pixels between rows"),
225#endif 215#endif
226 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", 216 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
227 "scrollbar thickness/width in pixels"),
228#ifdef POINTER_BLANK 217#ifdef POINTER_BLANK
229 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 218 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
230#endif 219#endif
231#ifndef NO_BACKSPACE_KEY 220#ifndef NO_BACKSPACE_KEY
232 RSTRG (Rs_backspace_key, "backspacekey", "string"), 221 RSTRG (Rs_backspace_key, "backspacekey", "string"),
… …
240 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 229 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
241#endif 230#endif
242#ifdef PRINTPIPE 231#ifdef PRINTPIPE
243 RSTRG (Rs_print_pipe, "print-pipe", "string"), 232 RSTRG (Rs_print_pipe, "print-pipe", "string"),
244#endif 233#endif
245 STRG (Rs_modifier, "modifier", "mod", "modifier", 234 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
246 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
247 INFO ("xrm", "string", "X resource"), 235 INFO ("xrm", "string", "X resource"),
248#ifdef CUTCHAR_RESOURCE 236#ifdef CUTCHAR_RESOURCE
249 RSTRG (Rs_cutchars, "cutchars", "string"), 237 RSTRG (Rs_cutchars, "cutchars", "string"),
250#endif /* CUTCHAR_RESOURCE */ 238#endif /* CUTCHAR_RESOURCE */
251 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 239 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
240#ifndef NO_SECONDARY_SCREEN
241 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
242 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
243#endif
252 INFO ("e", "command arg ...", "command to execute") 244 INFO ("e", "command arg ...", "command to execute")
253 }; 245 };
254 246
255#undef INFO 247#undef INFO
256#undef STRG 248#undef STRG
… …
476 468
477 if (entry < optList_size ()) 469 if (entry < optList_size ())
478 { 470 {
479 if (optList_isReverse (entry)) 471 if (optList_isReverse (entry))
480 flag = flag == On ? Off : On; 472 flag = flag == On ? Off : On;
473
481 if (optList_strlen (entry)) 474 if (optList_strlen (entry))
482 { /* string value */
483 const char *str = argv[++i];
484
485#ifdef DEBUG_RESOURCES
486 fprintf (stderr, "string (%s,%s) = ",
487 optList[entry].opt ? optList[entry].opt : "nil",
488 optList[entry].kw ? optList[entry].kw : "nil");
489#endif
490 if (flag == On && str && (optList[entry].doff != -1))
491 { 475 {
492#ifdef DEBUG_RESOURCES
493 fprintf (stderr, "\"%s\"\n", str);
494#endif
495 rs[optList[entry].doff] = str;
496 /* 476 /*
497 * special cases are handled in main.c:main () to allow 477 * special cases are handled in main.c:main () to allow
498 * X resources to set these values before we settle for 478 * X resources to set these values before we settle for
499 * default values 479 * default values
500 */ 480 */
501 }
502#ifdef DEBUG_RESOURCES
503 else
504 fprintf (stderr, "???\n");
505#endif
506 481
482 if (optList[entry].doff != -1)
483 rs[optList[entry].doff] = flag == On && argv[i+1]
484 ? argv[++i] : 0;
507 } 485 }
508 else 486 else
509 { /* boolean value */ 487 { /* boolean value */
510#ifdef DEBUG_RESOURCES 488#ifdef DEBUG_RESOURCES
511 fprintf (stderr, "boolean (%s,%s) = %s\n", 489 fprintf (stderr, "boolean (%s,%s) = %s\n",

Diff Legend

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