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.4 by pcg, Wed Dec 17 09:00:35 2003 UTC vs.
Revision 1.10 by pcg, Fri Feb 13 12:11:05 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xdefaults.c 2 * File: xdefaults.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xdefaults.C,v 1.4 2003/12/17 09:00:35 pcg Exp $ 4 * $Id: xdefaults.C,v 1.10 2004/02/13 12:11:05 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>
… …
71#define optList_isReverse(i) \ 71#define optList_isReverse(i) \
72 (optList[i].flag & Opt_Reverse) 72 (optList[i].flag & Opt_Reverse)
73#define optList_size() \ 73#define optList_size() \
74 (sizeof(optList) / sizeof(optList[0])) 74 (sizeof(optList) / sizeof(optList[0]))
75 75
76static const struct { 76static const struct
77 {
77 const unsigned long flag; /* Option flag */ 78 const unsigned long flag; /* Option flag */
78 const int doff; /* data offset */ 79 const int doff; /* data offset */
79 const char *kw; /* keyword */ 80 const char *kw; /* keyword */
80 const char *opt; /* option */ 81 const char *opt; /* option */
81 const char *arg; /* argument */ 82 const char *arg; /* argument */
82 const char *desc; /* description */ 83 const char *desc; /* description */
84 }
83} optList[] = { 85optList[] = {
84 STRG(Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 86 STRG(Rs_display_name, NULL, "d", NULL, NULL), /* short form */
85 STRG(Rs_display_name, NULL, "display", "string", "X server to contact"), 87 STRG(Rs_display_name, NULL, "display", "string", "X server to contact"),
86 STRG(Rs_term_name, "termName", "tn", "string", 88 STRG(Rs_term_name, "termName", "tn", "string",
87 "value of the TERM environment variable"), 89 "value of the TERM environment variable"),
88 STRG(Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 90 STRG(Rs_geometry, NULL, "g", NULL, NULL), /* short form */
89 STRG(Rs_geometry, "geometry", "geometry", "geometry", 91 STRG(Rs_geometry, "geometry", "geometry", "geometry",
90 "size (in characters) and position"), 92 "size (in characters) and position"),
91 SWCH("C", Opt_console, "intercept console messages"), 93 SWCH("C", Opt_console, "intercept console messages"),
92 SWCH("iconic", Opt_iconic, "start iconic"), 94 SWCH("iconic", Opt_iconic, "start iconic"),
93 SWCH("ic", Opt_iconic, NULL), /* short form */ 95 SWCH("ic", Opt_iconic, NULL), /* short form */
94 BOOL(Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 96 BOOL(Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo,
95 "reverse video"), 97 "reverse video"),
96 BOOL(Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 98 BOOL(Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
97 BOOL(Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 99 BOOL(Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
98#ifdef HAVE_SCROLLBARS 100#ifdef HAVE_SCROLLBARS
99 BOOL(Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 101 BOOL(Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
100 BOOL(Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 102 BOOL(Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right,
101 "scrollbar right"), 103 "scrollbar right"),
102 BOOL(Rs_scrollBar_floating, "scrollBar_floating", "st", 104 BOOL(Rs_scrollBar_floating, "scrollBar_floating", "st",
103 Opt_scrollBar_floating, "scrollbar without a trough"), 105 Opt_scrollBar_floating, "scrollbar without a trough"),
104#endif 106#endif
105 BOOL(Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 107 BOOL(Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput,
106 NULL), 108 NULL),
107 BOOL(Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, 109 BOOL(Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput,
108 "scroll-on-tty-output inhibit"), 110 "scroll-on-tty-output inhibit"),
109 BOOL(Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 111 BOOL(Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress,
110 "scroll-on-keypress"), 112 "scroll-on-keypress"),
111 BOOL(Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 113 BOOL(Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer,
112 "scroll-with-buffer"), 114 "scroll-with-buffer"),
113#ifdef TRANSPARENT 115#ifdef TRANSPARENT
114 BOOL(Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 116 BOOL(Rs_transparent, "inheritPixmap", "ip", Opt_transparent,
115 "inherit parent pixmap"), 117 "inherit parent pixmap"),
116 BOOL(Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, 118 BOOL(Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all,
117 "forcefully inherit root pixmap"), 119 "forcefully inherit root pixmap"),
118 SWCH("tr", Opt_transparent, NULL), 120 SWCH("tr", Opt_transparent, NULL),
119#endif 121#endif
120 BOOL(Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 122 BOOL(Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
121#ifndef NO_BELL 123#ifndef NO_BELL
122 BOOL(Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 124 BOOL(Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
123# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 125# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
124 BOOL(Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 126 BOOL(Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL),
125# endif 127# endif
126#endif 128#endif
127#ifdef META8_OPTION 129#ifdef META8_OPTION
128 BOOL(Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 130 BOOL(Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
129#endif 131#endif
130#ifdef MOUSE_WHEEL 132#ifdef MOUSE_WHEEL
131 BOOL(Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 133 BOOL(Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage,
132 NULL), 134 NULL),
133#endif 135#endif
134#ifdef MULTICHAR_SET 136#ifdef MULTICHAR_SET
135 BOOL(Rs_mc_hack, "multibyte_cursor", "mcc", Opt_mc_hack, 137 BOOL(Rs_mc_hack, "multibyte_cursor", "mcc", Opt_mc_hack,
136 "Multibyte character cursor movement"), 138 "Multibyte character cursor movement"),
137#endif 139#endif
138#ifndef NO_FRILLS 140#ifndef NO_FRILLS
139 BOOL(Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 141 BOOL(Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords,
140 "triple click word selection"), 142 "triple click word selection"),
141#endif 143#endif
142#ifdef CURSOR_BLINK 144#ifdef CURSOR_BLINK
143 BOOL(Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 145 BOOL(Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
144#endif 146#endif
145#ifdef POINTER_BLANK 147#ifdef POINTER_BLANK
146 BOOL(Rs_pointerBlank, "pointerBlank", NULL, Opt_pointerBlank, NULL), 148 BOOL(Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"),
147#endif 149#endif
148 STRG(Rs_color + Color_bg, "background", "bg", "color", "background color"), 150 STRG(Rs_color + Color_bg, "background", "bg", "color", "background color"),
149 STRG(Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 151 STRG(Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
150 RSTRG(Rs_color + minCOLOR + 0, "color0", "color"), 152 RSTRG(Rs_color + minCOLOR + 0, "color0", "color"),
151 RSTRG(Rs_color + minCOLOR + 1, "color1", "color"), 153 RSTRG(Rs_color + minCOLOR + 1, "color1", "color"),
152 RSTRG(Rs_color + minCOLOR + 2, "color2", "color"), 154 RSTRG(Rs_color + minCOLOR + 2, "color2", "color"),
153 RSTRG(Rs_color + minCOLOR + 3, "color3", "color"), 155 RSTRG(Rs_color + minCOLOR + 3, "color3", "color"),
154 RSTRG(Rs_color + minCOLOR + 4, "color4", "color"), 156 RSTRG(Rs_color + minCOLOR + 4, "color4", "color"),
155 RSTRG(Rs_color + minCOLOR + 5, "color5", "color"), 157 RSTRG(Rs_color + minCOLOR + 5, "color5", "color"),
156 RSTRG(Rs_color + minCOLOR + 6, "color6", "color"), 158 RSTRG(Rs_color + minCOLOR + 6, "color6", "color"),
157 RSTRG(Rs_color + minCOLOR + 7, "color7", "color"), 159 RSTRG(Rs_color + minCOLOR + 7, "color7", "color"),
158#ifndef NO_BRIGHTCOLOR 160#ifndef NO_BRIGHTCOLOR
159 RSTRG(Rs_color + minBrightCOLOR + 0, "color8", "color"), 161 RSTRG(Rs_color + minBrightCOLOR + 0, "color8", "color"),
160 RSTRG(Rs_color + minBrightCOLOR + 1, "color9", "color"), 162 RSTRG(Rs_color + minBrightCOLOR + 1, "color9", "color"),
161 RSTRG(Rs_color + minBrightCOLOR + 2, "color10", "color"), 163 RSTRG(Rs_color + minBrightCOLOR + 2, "color10", "color"),
162 RSTRG(Rs_color + minBrightCOLOR + 3, "color11", "color"), 164 RSTRG(Rs_color + minBrightCOLOR + 3, "color11", "color"),
163 RSTRG(Rs_color + minBrightCOLOR + 4, "color12", "color"), 165 RSTRG(Rs_color + minBrightCOLOR + 4, "color12", "color"),
164 RSTRG(Rs_color + minBrightCOLOR + 5, "color13", "color"), 166 RSTRG(Rs_color + minBrightCOLOR + 5, "color13", "color"),
165 RSTRG(Rs_color + minBrightCOLOR + 6, "color14", "color"), 167 RSTRG(Rs_color + minBrightCOLOR + 6, "color14", "color"),
166 RSTRG(Rs_color + minBrightCOLOR + 7, "color15", "color"), 168 RSTRG(Rs_color + minBrightCOLOR + 7, "color15", "color"),
167#endif /* NO_BRIGHTCOLOR */ 169#endif /* NO_BRIGHTCOLOR */
168#ifndef NO_BOLD_UNDERLINE_REVERSE 170#ifndef NO_BOLD_UNDERLINE_REVERSE
169 RSTRG(Rs_color + Color_BD, "colorBD", "color"), 171 RSTRG(Rs_color + Color_BD, "colorBD", "color"),
170 RSTRG(Rs_color + Color_UL, "colorUL", "color"), 172 RSTRG(Rs_color + Color_UL, "colorUL", "color"),
171 RSTRG(Rs_color + Color_RV, "colorRV", "color"), 173 RSTRG(Rs_color + Color_RV, "colorRV", "color"),
172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 174#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
173#ifdef KEEP_SCROLLCOLOR 175#ifdef KEEP_SCROLLCOLOR
174 RSTRG(Rs_color + Color_scroll, "scrollColor", "color"), 176 RSTRG(Rs_color + Color_scroll, "scrollColor", "color"),
175 RSTRG(Rs_color + Color_trough, "troughColor", "color"), 177 RSTRG(Rs_color + Color_trough, "troughColor", "color"),
176#endif /* KEEP_SCROLLCOLOR */ 178#endif /* KEEP_SCROLLCOLOR */
177#ifdef OPTION_HC 179#ifdef OPTION_HC
178 STRG(Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 180 STRG(Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
179#endif 181#endif
180#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 182#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
181 RSTRG(Rs_path, "path", "search path"), 183 RSTRG(Rs_path, "path", "search path"),
182#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 184#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
183#ifdef XPM_BACKGROUND 185#ifdef XPM_BACKGROUND
184 STRG(Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", 186 STRG(Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]",
185 "background pixmap"), 187 "background pixmap"),
186#endif /* XPM_BACKGROUND */ 188#endif /* XPM_BACKGROUND */
187#if (MENUBAR_MAX) 189#if (MENUBAR_MAX)
188 RSTRG(Rs_menu, "menu", "name[;tag]"), 190 RSTRG(Rs_menu, "menu", "name[;tag]"),
189#endif 191#endif
190#ifndef NO_BOLDFONT
191 STRG(Rs_boldFont, "boldFont", "fb", "fontname", "bold text font"),
192#endif
193 STRG(Rs_font + 0, "font", "fn", "fontname", "normal text font"), 192 STRG(Rs_font, "font", "fn", "fontname", "normal text font"),
194/* fonts: command-line option = resource name */ 193 /* fonts: command-line option = resource name */
195#ifdef MULTICHAR_SET
196 STRG(Rs_multichar_encoding, "multichar_encoding", "km", "mode",
197 "multichar encoding; mode = eucj|sjis|big5|gb|kr|noenc"),
198#endif /* MULTICHAR_SET */
199#ifdef USE_XIM 194#ifdef USE_XIM
200 STRG(Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 195 STRG(Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
201 STRG(Rs_preeditType, "preeditType", "pt", "style", 196 STRG(Rs_preeditType, "preeditType", "pt", "style",
202 "input style: style = OverTheSpot|OffTheSpot|Root"), 197 "input style: style = OverTheSpot|OffTheSpot|Root"),
198#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
199 STRG(Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
200#endif
203#endif /* USE_XIM */ 201#endif /* USE_XIM */
204#ifdef GREEK_SUPPORT 202#ifdef GREEK_SUPPORT
205 STRG(Rs_greek_keyboard, "greek_keyboard", "grk", "mode", 203 STRG(Rs_greek_keyboard, "greek_keyboard", "grk", "mode",
206 "greek keyboard mapping; mode = iso | ibm"), 204 "greek keyboard mapping; mode = iso | ibm"),
207 RSTRG(Rs_greektoggle_key, "greektoggle_key", "keysym"), 205 RSTRG(Rs_greektoggle_key, "greektoggle_key", "keysym"),
208#endif 206#endif
209 STRG(Rs_name, NULL, "name", "string", 207 STRG(Rs_name, NULL, "name", "string",
210 "client instance, icon, and title strings"), 208 "client instance, icon, and title strings"),
211 STRG(Rs_title, "title", "title", "string", "title name for window"), 209 STRG(Rs_title, "title", "title", "string", "title name for window"),
212 STRG(Rs_title, NULL, "T", NULL, NULL), /* short form */ 210 STRG(Rs_title, NULL, "T", NULL, NULL), /* short form */
213 STRG(Rs_iconName, "iconName", "n", "string", "icon name for window"), 211 STRG(Rs_iconName, "iconName", "n", "string", "icon name for window"),
214#ifndef NO_CURSORCOLOR 212#ifndef NO_CURSORCOLOR
215 STRG(Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 213 STRG(Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
216/* command-line option = resource name */ 214 /* command-line option = resource name */
217 RSTRG(Rs_color + Color_cursor2, "cursorColor2", "color"), 215 RSTRG(Rs_color + Color_cursor2, "cursorColor2", "color"),
218#endif /* NO_CURSORCOLOR */ 216#endif /* NO_CURSORCOLOR */
219 STRG(Rs_color + Color_pointer, "pointerColor", "pr", "color", 217 STRG(Rs_color + Color_pointer, "pointerColor", "pr", "color",
220 "pointer color"), 218 "pointer color"),
221 STRG(Rs_color + Color_border, "borderColor", "bd", "color", 219 STRG(Rs_color + Color_border, "borderColor", "bd", "color",
222 "border color"), 220 "border color"),
223 STRG(Rs_saveLines, "saveLines", "sl", "number", 221 STRG(Rs_saveLines, "saveLines", "sl", "number",
224 "number of scrolled lines to save"), 222 "number of scrolled lines to save"),
225#ifndef NO_FRILLS 223#ifndef NO_FRILLS
226 STRG(Rs_ext_bwidth, "externalBorder", "w", "number", 224 STRG(Rs_ext_bwidth, "externalBorder", "w", "number",
227 "external border in pixels"), 225 "external border in pixels"),
228 STRG(Rs_ext_bwidth, NULL, "bw", NULL, NULL), 226 STRG(Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229 STRG(Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 227 STRG(Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
230 STRG(Rs_int_bwidth, "internalBorder", "b", "number", 228 STRG(Rs_int_bwidth, "internalBorder", "b", "number",
231 "internal border in pixels"), 229 "internal border in pixels"),
232#endif 230#endif
233#ifndef NO_LINESPACE 231#ifndef NO_LINESPACE
234 STRG(Rs_lineSpace, "lineSpace", "lsp", "number", 232 STRG(Rs_lineSpace, "lineSpace", "lsp", "number",
235 "number of extra pixels between rows"), 233 "number of extra pixels between rows"),
236#endif 234#endif
237 STRG(Rs_scrollBar_thickness, "thickness", "sbt", "number", 235 STRG(Rs_scrollBar_thickness, "thickness", "sbt", "number",
238 "scrollbar thickness/width in pixels"), 236 "scrollbar thickness/width in pixels"),
239#ifdef POINTER_BLANK 237#ifdef POINTER_BLANK
240 RSTRG(Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 238 RSTRG(Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
241#endif 239#endif
242#ifndef NO_BACKSPACE_KEY 240#ifndef NO_BACKSPACE_KEY
243 RSTRG(Rs_backspace_key, "backspacekey", "string"), 241 RSTRG(Rs_backspace_key, "backspacekey", "string"),
244#endif 242#endif
245#ifndef NO_DELETE_KEY 243#ifndef NO_DELETE_KEY
246 RSTRG(Rs_delete_key, "deletekey", "string"), 244 RSTRG(Rs_delete_key, "deletekey", "string"),
247#endif 245#endif
248 RSTRG(Rs_selectstyle, "selectstyle", "mode"), 246 RSTRG(Rs_selectstyle, "selectstyle", "mode"),
249 RSTRG(Rs_scrollstyle, "scrollstyle", "mode"), 247 RSTRG(Rs_scrollstyle, "scrollstyle", "mode"),
250#ifdef HAVE_SCROLLBARS 248#ifdef HAVE_SCROLLBARS
251 RSTRG(Rs_scrollBar_align, "scrollBar_align", "mode"), 249 RSTRG(Rs_scrollBar_align, "scrollBar_align", "mode"),
252#endif 250#endif
253#ifdef PRINTPIPE 251#ifdef PRINTPIPE
254 RSTRG(Rs_print_pipe, "print-pipe", "string"), 252 RSTRG(Rs_print_pipe, "print-pipe", "string"),
255#endif 253#endif
256#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 254#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
257 RSTRG(Rs_bigfont_key, "bigfont_key", "keysym"), 255 RSTRG(Rs_bigfont_key, "bigfont_key", "keysym"),
258 RSTRG(Rs_smallfont_key, "smallfont_key", "keysym"), 256 RSTRG(Rs_smallfont_key, "smallfont_key", "keysym"),
259#endif 257#endif
260 STRG(Rs_modifier, "modifier", "mod", "modifier", 258 STRG(Rs_modifier, "modifier", "mod", "modifier",
261 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 259 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
262 INFO("xrm", "string", "X resource"), 260 INFO("xrm", "string", "X resource"),
263#ifdef CUTCHAR_RESOURCE 261#ifdef CUTCHAR_RESOURCE
264 RSTRG(Rs_cutchars, "cutchars", "string"), 262 RSTRG(Rs_cutchars, "cutchars", "string"),
265#endif /* CUTCHAR_RESOURCE */ 263#endif /* CUTCHAR_RESOURCE */
266#ifdef ACS_ASCII 264#ifdef ACS_ASCII
267 RSTRG(Rs_acs_chars, "acsChars", "string"), 265 RSTRG(Rs_acs_chars, "acsChars", "string"),
268#endif /* ACS_ASCII */ 266#endif /* ACS_ASCII */
269 RSTRG(Rs_answerbackstring, "answerbackString", "string"), 267 RSTRG(Rs_answerbackstring, "answerbackString", "string"),
270 INFO("e", "command arg ...", "command to execute") 268 INFO("e", "command arg ...", "command to execute")
271}; 269 };
272 270
273#undef INFO 271#undef INFO
274#undef STRG 272#undef STRG
275#undef RSTRG 273#undef RSTRG
276#undef SWCH 274#undef SWCH
… …
278/*}}} */ 276/*}}} */
279 277
280static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 278static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n";
281static const char optionsstring[] = "Options: " 279static const char optionsstring[] = "Options: "
282#if defined(XPM_BACKGROUND) 280#if defined(XPM_BACKGROUND)
283 "XPM," 281 "XPM,"
284#endif 282#endif
285#if defined(TRANSPARENT) 283#if defined(TRANSPARENT)
286 "transparent," 284 "transparent,"
287#endif 285#endif
288#if defined(UTMP_SUPPORT) 286#if defined(UTMP_SUPPORT)
289 "utmp," 287 "utmp,"
290#endif 288#endif
291#if defined(MENUBAR) 289#if defined(MENUBAR)
292 "menubar," 290 "menubar,"
293#endif 291#endif
294#if !defined(NO_FRILLS) 292#if !defined(NO_FRILLS)
295 "frills," 293 "frills,"
296#endif 294#endif
297#if !defined(NO_LINESPACE) 295#if !defined(NO_LINESPACE)
298 "linespace," 296 "linespace,"
299#endif 297#endif
300#if defined(PREFER_24BIT) 298#if defined(PREFER_24BIT)
301 "24bit," 299 "24bit,"
302#endif 300#endif
303#if defined(USE_XIM) 301#if defined(USE_XIM)
304 "XIM," 302 "XIM,"
305#endif 303#endif
306#if defined(MULTICHAR_SET) 304#if defined(MULTICHAR_SET)
307 "multichar_languages," 305 "multichar_languages,"
308#endif 306#endif
309 "scrollbars=" 307 "scrollbars="
310#if !defined(HAVE_SCROLLBARS) 308#if !defined(HAVE_SCROLLBARS)
311 "NONE" 309 "NONE"
312#else 310#else
313# if defined(RXVT_SCROLLBAR) 311# if defined(RXVT_SCROLLBAR)
314 "rxvt" 312 "rxvt"
315# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 313# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
316 "+" 314 "+"
317# endif 315# endif
318# endif 316# endif
319# if defined(NEXT_SCROLLBAR) 317# if defined(NEXT_SCROLLBAR)
320 "NeXT" 318 "NeXT"
321# if defined(XTERM_SCROLLBAR) 319# if defined(XTERM_SCROLLBAR)
322 "+" 320 "+"
323# endif 321# endif
324# endif 322# endif
325# if defined(XTERM_SCROLLBAR) 323# if defined(XTERM_SCROLLBAR)
326 "xterm" 324 "xterm"
327# endif 325# endif
328#endif 326#endif
329 "," 327 ","
330#if defined(GREEK_SUPPORT) 328#if defined(GREEK_SUPPORT)
331 "Greek," 329 "Greek,"
332#endif 330#endif
333#if defined(RXVT_GRAPHICS) 331#if defined(RXVT_GRAPHICS)
334 "graphics," 332 "graphics,"
335#endif 333#endif
336#if defined(NO_BACKSPACE_KEY) 334#if defined(NO_BACKSPACE_KEY)
337 "no_backspace," 335 "no_backspace,"
338#endif 336#endif
339#if defined(NO_DELETE_KEY) 337#if defined(NO_DELETE_KEY)
340 "no_delete," 338 "no_delete,"
341#endif 339#endif
342#if !defined(NO_STRINGS) 340#if !defined(NO_STRINGS)
343 "strings," 341 "strings,"
344#endif 342#endif
345#if defined(TTY_256COLOR) 343#if defined(TTY_256COLOR)
346 "256colour," 344 "256colour,"
347#endif 345#endif
348#if defined(NO_RESOURCES) 346#if defined(NO_RESOURCES)
349 "NoResources" 347 "NoResources"
350#else 348#else
351# if defined(USE_XGETDEFAULT) 349# if defined(USE_XGETDEFAULT)
352 "XGetDefaults" 350 "XGetDefaults"
353# else 351# else
354 ".Xdefaults" 352 ".Xdefaults"
355# endif 353# endif
356#endif 354#endif
357 "\nUsage: "; /* Usage */ 355 "\nUsage: "; /* Usage */
358 356
359#define INDENT 18 357#define INDENT 18
360 358
361/*{{{ usage: */ 359/*{{{ usage: */
362/*----------------------------------------------------------------------*/ 360/*----------------------------------------------------------------------*/
363/* EXTPROTO */ 361static void
364void
365rxvt_usage(int type) 362rxvt_usage(int type)
366{ 363{
367 unsigned int i, col; 364 unsigned int i, col;
368 365
369 write(STDERR_FILENO, releasestring, sizeof(releasestring) - 1); 366 write(STDERR_FILENO, releasestring, sizeof(releasestring) - 1);
370 write(STDERR_FILENO, optionsstring, sizeof(optionsstring) - 1); 367 write(STDERR_FILENO, optionsstring, sizeof(optionsstring) - 1);
371 write(STDERR_FILENO, APL_NAME, sizeof(APL_NAME) - 1); 368 write(STDERR_FILENO, APL_NAME, sizeof(APL_NAME) - 1);
372 369
373 switch (type) { 370 switch (type)
371 {
374 case 0: /* brief listing */ 372 case 0: /* brief listing */
375 fprintf(stderr, " [-help] [--help]\n"); 373 fprintf(stderr, " [-help] [--help]\n");
376 for (col = 1, i = 0; i < optList_size(); i++) 374 for (col = 1, i = 0; i < optList_size(); i++)
377 if (optList[i].desc != NULL) { 375 if (optList[i].desc != NULL)
376 {
378 int len = 0; 377 int len = 0;
379 378
380 if (!optList_isBool(i)) { 379 if (!optList_isBool(i))
380 {
381 len = optList_strlen(i); 381 len = optList_strlen(i);
382 if (len > 0) 382 if (len > 0)
383 len++; /* account for space */ 383 len++; /* account for space */
384 } 384 }
385#ifdef DEBUG_STRICT 385#ifdef DEBUG_STRICT
386 assert(optList[i].opt != NULL); 386 assert(optList[i].opt != NULL);
387#endif 387#endif
388 len += 4 + STRLEN(optList[i].opt) + (optList_isBool(i) ? 2: 0); 388 len += 4 + STRLEN(optList[i].opt) + (optList_isBool(i) ? 2: 0);
389 col += len; 389 col += len;
390 if (col > 79) { /* assume regular width */ 390 if (col > 79)
391 putc('\n', stderr); 391 { /* assume regular width */
392 col = 1 + len; 392 putc('\n', stderr);
393 } 393 col = 1 + len;
394 }
394 fprintf(stderr, " [-%s%s", (optList_isBool(i) ? "/+" : ""), 395 fprintf(stderr, " [-%s%s", (optList_isBool(i) ? "/+" : ""),
395 optList[i].opt); 396 optList[i].opt);
396 if (optList_strlen(i)) 397 if (optList_strlen(i))
397 fprintf(stderr, " %s]", optList[i].arg); 398 fprintf(stderr, " %s]", optList[i].arg);
398 else 399 else
399 fprintf(stderr, "]"); 400 fprintf(stderr, "]");
400 } 401 }
401 break; 402 break;
402 403
403 case 1: /* full command-line listing */ 404 case 1: /* full command-line listing */
404 fprintf(stderr, " [options] [-e command args]\n\n" 405 fprintf(stderr, " [options] [-e command args]\n\n"
405 "where options include:\n"); 406 "where options include:\n");
406 for (i = 0; i < optList_size(); i++) 407 for (i = 0; i < optList_size(); i++)
407 if (optList[i].desc != NULL) { 408 if (optList[i].desc != NULL)
409 {
408#ifdef DEBUG_STRICT 410#ifdef DEBUG_STRICT
409 assert(optList[i].opt != NULL); 411 assert(optList[i].opt != NULL);
410#endif 412#endif
411 fprintf(stderr, " %s%s %-*s%s%s\n", 413 fprintf(stderr, " %s%s %-*s%s%s\n",
412 (optList_isBool(i) ? "-/+" : "-"), optList[i].opt, 414 (optList_isBool(i) ? "-/+" : "-"), optList[i].opt,
413 (INDENT - STRLEN(optList[i].opt) 415 (INDENT - STRLEN(optList[i].opt)
414 + (optList_isBool(i) ? 0 : 2)), 416 + (optList_isBool(i) ? 0 : 2)),
415 (optList[i].arg ? optList[i].arg : ""), 417 (optList[i].arg ? optList[i].arg : ""),
416 (optList_isBool(i) ? "turn on/off " : ""), 418 (optList_isBool(i) ? "turn on/off " : ""),
417 optList[i].desc); 419 optList[i].desc);
418 } 420 }
419 fprintf(stderr, "\n --help to list long-options"); 421 fprintf(stderr, "\n --help to list long-options");
420 break; 422 break;
421 423
422 case 2: /* full resource listing */ 424 case 2: /* full resource listing */
423 fprintf(stderr, 425 fprintf(stderr,
424 " [options] [-e command args]\n\n" 426 " [options] [-e command args]\n\n"
425 "where resources (long-options) include:\n"); 427 "where resources (long-options) include:\n");
426 428
427 for (i = 0; i < optList_size(); i++) 429 for (i = 0; i < optList_size(); i++)
428 if (optList[i].kw != NULL) 430 if (optList[i].kw != NULL)
429 fprintf(stderr, " %s: %*s%s\n", 431 fprintf(stderr, " %s: %*s%s\n",
430 optList[i].kw, 432 optList[i].kw,
431 (INDENT - STRLEN(optList[i].kw)), "", /* XXX */ 433 (INDENT - STRLEN(optList[i].kw)), "", /* XXX */
432 (optList_isBool(i) ? "boolean" : optList[i].arg)); 434 (optList_isBool(i) ? "boolean" : optList[i].arg));
433#ifdef KEYSYM_RESOURCE 435#ifdef KEYSYM_RESOURCE
434 fprintf(stderr, " " "keysym.sym" ": %*s%s\n", 436 fprintf(stderr, " " "keysym.sym" ": %*s%s\n",
435 (INDENT - sizeof("keysym.sym") + 1), "", /* XXX */ 437 (INDENT - sizeof("keysym.sym") + 1), "", /* XXX */
436 "keysym"); 438 "keysym");
437#endif 439#endif
438 fprintf(stderr, "\n -help to list options"); 440 fprintf(stderr, "\n -help to list options");
439 break; 441 break;
440 } 442 }
441 fprintf(stderr, "\n\n"); 443 fprintf(stderr, "\n\n");
442 exit(EXIT_FAILURE); 444 exit(EXIT_FAILURE);
443 /* NOTREACHED */ 445 /* NOTREACHED */
444} 446}
445 447
446/*}}} */ 448/*}}} */
447 449
448/*{{{ get command-line options before getting resources */ 450/*{{{ get command-line options before getting resources */
449/* EXTPROTO */
450void 451void
451rxvt_get_options(pR_ int argc, const char *const *argv) 452rxvt_term::get_options (int argc, const char *const *argv)
452{ 453{
453 int i, bad_option = 0; 454 int i, bad_option = 0;
454 static const char On[3] = "ON", Off[4] = "OFF"; 455 static const char On[3] = "ON", Off[4] = "OFF";
455 456
456 for (i = 1; i < argc; i++) { 457 for (i = 1; i < argc; i++)
458 {
457 unsigned int entry, longopt = 0; 459 unsigned int entry, longopt = 0;
458 const char *flag, *opt; 460 const char *flag, *opt;
459 461
460 opt = argv[i]; 462 opt = argv[i];
461#ifdef DEBUG_RESOURCES 463#ifdef DEBUG_RESOURCES
462 fprintf(stderr, "argv[%d] = %s: ", i, opt); 464 fprintf(stderr, "argv[%d] = %s: ", i, opt);
463#endif 465#endif
464 if (*opt == '-') {
465 flag = On;
466 if (*++opt == '-') 466 if (*opt == '-')
467 {
468 flag = On;
469 if (*++opt == '-')
467 longopt = *opt++; /* long option */ 470 longopt = *opt++; /* long option */
471 }
468 } else if (*opt == '+') { 472 else if (*opt == '+')
473 {
469 flag = Off; 474 flag = Off;
470 if (*++opt == '+') 475 if (*++opt == '+')
471 longopt = *opt++; /* long option */ 476 longopt = *opt++; /* long option */
472 } else { 477 }
478 else
479 {
473 bad_option = 1; 480 bad_option = 1;
474 rxvt_print_error("bad option \"%s\"", opt); 481 rxvt_print_error("bad option \"%s\"", opt);
475 continue; 482 continue;
476 } 483 }
477 484
478 if (!STRCMP(opt, "help")) 485 if (!STRCMP(opt, "help"))
479 rxvt_usage(longopt ? 2 : 1); 486 rxvt_usage(longopt ? 2 : 1);
480 if (!STRCMP(opt, "h")) 487 if (!STRCMP(opt, "h"))
481 rxvt_usage(0); 488 rxvt_usage(0);
482 489
483 /* feature: always try to match long-options */ 490 /* feature: always try to match long-options */
484 for (entry = 0; entry < optList_size(); entry++) 491 for (entry = 0; entry < optList_size(); entry++)
485 if ((optList[entry].kw && !STRCMP(opt, optList[entry].kw)) 492 if ((optList[entry].kw && !STRCMP(opt, optList[entry].kw))
486 || (!longopt 493 || (!longopt
487 && optList[entry].opt && !STRCMP(opt, optList[entry].opt))) 494 && optList[entry].opt && !STRCMP(opt, optList[entry].opt)))
488 break; 495 break;
489 496
490 if (entry < optList_size()) { 497 if (entry < optList_size())
498 {
491 if (optList_isReverse(entry)) 499 if (optList_isReverse(entry))
492 flag = flag == On ? Off : On; 500 flag = flag == On ? Off : On;
493 if (optList_strlen(entry)) { /* string value */ 501 if (optList_strlen(entry))
494 const char *str = argv[++i]; 502 { /* string value */
503 const char *str = argv[++i];
495 504
496#ifdef DEBUG_RESOURCES 505#ifdef DEBUG_RESOURCES
497 fprintf(stderr, "string (%s,%s) = ", 506 fprintf(stderr, "string (%s,%s) = ",
498 optList[entry].opt ? optList[entry].opt : "nil", 507 optList[entry].opt ? optList[entry].opt : "nil",
499 optList[entry].kw ? optList[entry].kw : "nil"); 508 optList[entry].kw ? optList[entry].kw : "nil");
500#endif 509#endif
501 if (flag == On && str && (optList[entry].doff != -1)) { 510 if (flag == On && str && (optList[entry].doff != -1))
511 {
502#ifdef DEBUG_RESOURCES 512#ifdef DEBUG_RESOURCES
503 fprintf(stderr, "\"%s\"\n", str); 513 fprintf(stderr, "\"%s\"\n", str);
504#endif 514#endif
505 R->rs[optList[entry].doff] = str; 515 rs[optList[entry].doff] = str;
506 /* 516 /*
507 * special cases are handled in main.c:main() to allow 517 * special cases are handled in main.c:main() to allow
508 * X resources to set these values before we settle for 518 * X resources to set these values before we settle for
509 * default values 519 * default values
510 */ 520 */
511 } 521 }
512#ifdef DEBUG_RESOURCES 522#ifdef DEBUG_RESOURCES
513 else 523 else
514 fprintf(stderr, "???\n"); 524 fprintf(stderr, "???\n");
515#endif 525#endif
516 } else { /* boolean value */ 526
527 }
528 else
529 { /* boolean value */
517#ifdef DEBUG_RESOURCES 530#ifdef DEBUG_RESOURCES
518 fprintf(stderr, "boolean (%s,%s) = %s\n", 531 fprintf(stderr, "boolean (%s,%s) = %s\n",
519 optList[entry].opt, optList[entry].kw, flag); 532 optList[entry].opt, optList[entry].kw, flag);
520#endif 533#endif
521 if (flag == On) 534 if (flag == On)
522 R->Options |= (optList[entry].flag); 535 Options |= (optList[entry].flag);
523 else 536 else
524 R->Options &= ~(optList[entry].flag); 537 Options &= ~(optList[entry].flag);
525 538
526 if (optList[entry].doff != -1) 539 if (optList[entry].doff != -1)
527 R->rs[optList[entry].doff] = flag; 540 rs[optList[entry].doff] = flag;
528 } 541 }
529 } else 542 }
543 else
530#ifdef KEYSYM_RESOURCE 544#ifdef KEYSYM_RESOURCE
531 /* if (!STRNCMP(opt, "keysym.", sizeof("keysym.") - 1)) */ 545 /* if (!STRNCMP(opt, "keysym.", sizeof("keysym.") - 1)) */
532 if (rxvt_Str_match(opt, "keysym.")) { 546 if (rxvt_Str_match(opt, "keysym."))
533 const char *str = argv[++i];
534
535 if (str != NULL)
536 rxvt_parse_keysym(aR_ opt + sizeof("keysym.") - 1, str);
537 } else
538#endif
539 ; 547 {
548 const char *str = argv[++i];
549
550 if (str != NULL)
551 parse_keysym (opt + sizeof("keysym.") - 1, str);
552 }
553 else
554#endif
555 bad_option = 1;
540 } 556 }
541 557
542 if (bad_option) 558 if (bad_option)
543 rxvt_usage(0); 559 rxvt_usage(0);
544} 560}
545 561
546/*}}} */ 562/*}}} */
547 563
548#ifndef NO_RESOURCES 564#ifndef NO_RESOURCES
… …
554 * quarks will be something like 570 * quarks will be something like
555 * "rxvt" "keysym" "0xFF01" 571 * "rxvt" "keysym" "0xFF01"
556 * value will be a string 572 * value will be a string
557 */ 573 */
558/* ARGSUSED */ 574/* ARGSUSED */
559/* INTPROTO */
560Bool 575bool
561rxvt_define_key(XrmDatabase *database __attribute__((unused)), XrmBindingList bindings __attribute__((unused)), XrmQuarkList quarks, XrmRepresentation *type __attribute__((unused)), XrmValue *value, XPointer closure __attribute__((unused))) 576rxvt_define_key(XrmDatabase *database __attribute__((unused)), XrmBindingList bindings __attribute__((unused)), XrmQuarkList quarks, XrmRepresentation *type __attribute__((unused)), XrmValue *value, XPointer closure __attribute__((unused)))
562{ 577{
563 dR;
564 int last; 578 int last;
565 579
566 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 580 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
567 ; 581 ;
568 last--; 582 last--;
569 rxvt_parse_keysym(aR_ XrmQuarkToString(quarks[last]), (char *)value->addr); 583 GET_R->parse_keysym (XrmQuarkToString(quarks[last]), (char *)value->addr);//D//TODO
570 return False; 584 return False;
571} 585}
572 586
573/* 587/*
574 * look for something like this (XK_Delete) 588 * look for something like this (XK_Delete)
575 * rxvt*keysym.0xFFFF: "\177" 589 * rxvt*keysym.0xFFFF: "\177"
… …
577 * arg will be 591 * arg will be
578 * NULL for ~/.Xdefaults and 592 * NULL for ~/.Xdefaults and
579 * non-NULL for command-line options (need to allocate) 593 * non-NULL for command-line options (need to allocate)
580 */ 594 */
581#define NEWARGLIM 500 /* `reasonable' size */ 595#define NEWARGLIM 500 /* `reasonable' size */
582/* INTPROTO */
583int 596int
584rxvt_parse_keysym(pR_ const char *str, const char *arg) 597rxvt_term::parse_keysym (const char *str, const char *arg)
585{ 598{
586 int n, sym; 599 int n, sym;
587 char *key_string, *newarg = NULL; 600 char *key_string, *newarg = NULL;
588 char newargstr[NEWARGLIM]; 601 char newargstr[NEWARGLIM];
589 602
590 if (arg == NULL) { 603 if (arg == NULL)
604 {
591 if ((n = rxvt_Str_match(str, "keysym.")) == 0) 605 if ((n = rxvt_Str_match(str, "keysym.")) == 0)
592 return 0; 606 return 0;
593 str += n; /* skip `keysym.' */ 607 str += n; /* skip `keysym.' */
594 } 608 }
595/* some scanf() have trouble with a 0x prefix */ 609 /* some scanf() have trouble with a 0x prefix */
596 if (isdigit(str[0])) { 610 if (isdigit(str[0]))
611 {
597 if (str[0] == '0' && toupper(str[1]) == 'X') 612 if (str[0] == '0' && toupper(str[1]) == 'X')
598 str += 2; 613 str += 2;
599 if (arg) { 614 if (arg)
615 {
600 if (sscanf(str, (STRCHR(str, ':') ? "%x:" : "%x"), &sym) != 1) 616 if (sscanf(str, (STRCHR(str, ':') ? "%x:" : "%x"), &sym) != 1)
601 return -1; 617 return -1;
602 } else { 618 }
619 else
620 {
603 if (sscanf(str, "%x:", &sym) != 1) 621 if (sscanf(str, "%x:", &sym) != 1)
604 return -1; 622 return -1;
605 623
606 /* cue to ':', it's there since sscanf() worked */ 624 /* cue to ':', it's there since sscanf() worked */
607 STRNCPY(newargstr, STRCHR(str, ':') + 1, NEWARGLIM - 1); 625 STRNCPY(newargstr, STRCHR(str, ':') + 1, NEWARGLIM - 1);
608 newargstr[NEWARGLIM - 1] = '\0'; 626 newargstr[NEWARGLIM - 1] = '\0';
609 newarg = newargstr; 627 newarg = newargstr;
610 } 628 }
611 } else {
612 /*
613 * convert keysym name to keysym number
614 */
615 STRNCPY(newargstr, str, NEWARGLIM - 1);
616 newargstr[NEWARGLIM - 1] = '\0';
617 if (arg == NULL) {
618 if ((newarg = STRCHR(newargstr, ':')) == NULL)
619 return -1;
620 *newarg++ = '\0'; /* terminate keysym name */
621 }
622 if ((sym = XStringToKeysym(newargstr)) == None)
623 return -1;
624 } 629 }
625 630 else
626 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */ 631 {
627 return -1; 632 /*
628 sym &= 0xFF; 633 * convert keysym name to keysym number
629 if (R->Keysym_map[sym] != NULL) /* already set ? */ 634 */
630 return -1;
631
632 if (newarg == NULL) {
633 STRNCPY(newargstr, arg, NEWARGLIM - 1); 635 STRNCPY(newargstr, str, NEWARGLIM - 1);
634 newargstr[NEWARGLIM - 1] = '\0'; 636 newargstr[NEWARGLIM - 1] = '\0';
635 newarg = newargstr; 637 if (arg == NULL)
638 {
639 if ((newarg = STRCHR(newargstr, ':')) == NULL)
640 return -1;
641 *newarg++ = '\0'; /* terminate keysym name */
642 }
643 if ((sym = XStringToKeysym(newargstr)) == None)
644 return -1;
636 } 645 }
646
647 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */
648 return -1;
649 sym &= 0xFF;
650 if (Keysym_map[sym] != NULL) /* already set ? */
651 return -1;
652
653 if (newarg == NULL)
654 {
655 STRNCPY(newargstr, arg, NEWARGLIM - 1);
656 newargstr[NEWARGLIM - 1] = '\0';
657 newarg = newargstr;
658 }
637 rxvt_Str_trim(newarg); 659 rxvt_Str_trim(newarg);
638 if (*newarg == '\0' || (n = rxvt_Str_escaped(newarg)) == 0) 660 if (*newarg == '\0' || (n = rxvt_Str_escaped(newarg)) == 0)
639 return -1; 661 return -1;
640 MIN_IT(n, 255); 662 MIN_IT(n, 255);
641 key_string = (char *)rxvt_malloc((n + 1) * sizeof(char)); 663 key_string = (char *)rxvt_malloc((n + 1) * sizeof(char));
642 664
643 key_string[0] = n; 665 key_string[0] = n;
644 STRNCPY(key_string + 1, newarg, n); 666 STRNCPY(key_string + 1, newarg, n);
645 R->Keysym_map[sym] = (unsigned char *)key_string; 667 Keysym_map[sym] = (unsigned char *)key_string;
646 668
647 return 1; 669 return 1;
648} 670}
649 671
650# endif /* KEYSYM_RESOURCE */ 672# endif /* KEYSYM_RESOURCE */
651 673
652# ifndef USE_XGETDEFAULT 674# ifndef USE_XGETDEFAULT
653/*{{{ rxvt_get_xdefaults() */ 675/*{{{ rxvt_get_xdefaults() */
654/* 676/*
655 * the matching algorithm used for memory-save fake resources 677 * the matching algorithm used for memory-save fake resources
656 */ 678 */
657/* INTPROTO */
658void 679void
659rxvt_get_xdefaults(pR_ FILE *stream, const char *name) 680rxvt_term::get_xdefaults (FILE *stream, const char *name)
660{ 681{
661 unsigned int len; 682 unsigned int len;
662 char *str, buffer[256]; 683 char *str, buffer[256];
663 684
664 if (stream == NULL) 685 if (stream == NULL)
665 return; 686 return;
666 len = STRLEN(name); 687 len = STRLEN(name);
667 while ((str = fgets(buffer, sizeof(buffer), stream)) != NULL) { 688 while ((str = fgets(buffer, sizeof(buffer), stream)) != NULL)
689 {
668 unsigned int entry, n; 690 unsigned int entry, n;
669 691
670 while (*str && isspace(*str)) 692 while (*str && isspace(*str))
671 str++; /* leading whitespace */ 693 str++; /* leading whitespace */
672 694
673 if ((str[len] != '*' && str[len] != '.') 695 if ((str[len] != '*' && str[len] != '.')
674 || (len && STRNCMP(str, name, len))) 696 || (len && STRNCMP(str, name, len)))
675 continue; 697 continue;
676 str += (len + 1); /* skip `name*' or `name.' */ 698 str += (len + 1); /* skip `name*' or `name.' */
677 699
678# ifdef KEYSYM_RESOURCE 700# ifdef KEYSYM_RESOURCE
679 if (!rxvt_parse_keysym(aR_ str, NULL)) 701 if (!parse_keysym (str, NULL))
680# endif /* KEYSYM_RESOURCE */ 702# endif /* KEYSYM_RESOURCE */
681 for (entry = 0; entry < optList_size(); entry++) { 703 for (entry = 0; entry < optList_size(); entry++)
704 {
682 const char *kw = optList[entry].kw; 705 const char *kw = optList[entry].kw;
683 706
684 if (kw == NULL) 707 if (kw == NULL)
685 continue; 708 continue;
686 n = STRLEN (kw); 709 n = STRLEN (kw);
687 if (str[n] == ':' && rxvt_Str_match(str, kw)) { 710 if (str[n] == ':' && rxvt_Str_match(str, kw))
711 {
688 /* skip `keyword:' */ 712 /* skip `keyword:' */
689 str += (n + 1); 713 str += (n + 1);
690 rxvt_Str_trim(str); 714 rxvt_Str_trim(str);
691 n = STRLEN(str); 715 n = STRLEN(str);
692 if (n && R->rs[optList[entry].doff] == NULL) { 716 if (n && rs[optList[entry].doff] == NULL)
693 /* not already set */ 717 {
694 int s; 718 /* not already set */
719 int s;
695 char *p = (char *)rxvt_malloc((n + 1) * sizeof(char)); 720 char *p = (char *)rxvt_malloc((n + 1) * sizeof(char));
696 721
697 STRCPY(p, str); 722 STRCPY(p, str);
698 R->rs[optList[entry].doff] = p; 723 rs[optList[entry].doff] = p;
699 if (optList_isBool(entry)) { 724 if (optList_isBool(entry))
725 {
700 s = STRCASECMP(str, "TRUE") == 0 726 s = STRCASECMP(str, "TRUE") == 0
701 || STRCASECMP(str, "YES") == 0 727 || STRCASECMP(str, "YES") == 0
702 || STRCASECMP(str, "ON") == 0 728 || STRCASECMP(str, "ON") == 0
703 || STRCASECMP(str, "1") == 0; 729 || STRCASECMP(str, "1") == 0;
704 if (optList_isReverse(entry)) 730 if (optList_isReverse(entry))
705 s = !s; 731 s = !s;
706 if (s) 732 if (s)
707 R->Options |= (optList[entry].flag); 733 Options |= (optList[entry].flag);
708 else 734 else
709 R->Options &= ~(optList[entry].flag); 735 Options &= ~(optList[entry].flag);
710 } 736 }
711 } 737 }
712 break; 738 break;
713 } 739 }
714 } 740 }
715 } 741 }
716 rewind(stream); 742 rewind(stream);
717} 743}
718 744
719/*}}} */ 745/*}}} */
720# endif /* ! USE_XGETDEFAULT */ 746# endif /* ! USE_XGETDEFAULT */
721#endif /* NO_RESOURCES */ 747#endif /* NO_RESOURCES */
… …
723/*{{{ read the resources files */ 749/*{{{ read the resources files */
724/* 750/*
725 * using XGetDefault() or the hand-rolled replacement 751 * using XGetDefault() or the hand-rolled replacement
726 */ 752 */
727/* ARGSUSED */ 753/* ARGSUSED */
728/* EXTPROTO */
729void 754void
730rxvt_extract_resources(pR_ Display *display __attribute__((unused)), const char *name) 755rxvt_term::extract_resources (Display *display __attribute__((unused)), const char *name)
731{ 756{
732#ifndef NO_RESOURCES 757#ifndef NO_RESOURCES
733 758
734# if defined XAPPLOADDIR 759# if defined XAPPLOADDIR
735# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 760# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
736 /* Compute the path of the possibly available localized Rxvt file */ 761 /* Compute the path of the possibly available localized Rxvt file */
737 char *localepath = NULL; 762 char *localepath = NULL;
738 763
764 if (locale != NULL)
739 if (R->locale != NULL) { /* XXX: must limit length of string */ 765 { /* XXX: must limit length of string */
740 localepath = (char *)rxvt_malloc(256); 766 localepath = (char *)rxvt_malloc(256);
741 sprintf(localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, 767 sprintf(localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS,
742 (int)(258 - sizeof(XAPPLOADDIRLOCALE) - sizeof(APL_SUBCLASS)), 768 (int)(258 - sizeof(XAPPLOADDIRLOCALE) - sizeof(APL_SUBCLASS)),
743 R->locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 769 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
744 } 770 }
745 771
746 { 772 {
747# endif 773# endif
748# endif 774# endif
749 775
750# ifdef USE_XGETDEFAULT 776# ifdef USE_XGETDEFAULT
751/* 777 /*
752 * get resources using the X library function 778 * get resources using the X library function
753 */ 779 */
754 int entry; 780 int entry;
755 781
756# ifdef XrmEnumOneLevel 782# ifdef XrmEnumOneLevel
757 int i; 783 int i;
758 char *displayResource, *xe; 784 char *displayResource, *xe;
… …
762 char fname[1024]; 788 char fname[1024];
763 789
764 XrmInitialize(); 790 XrmInitialize();
765 database = NULL; 791 database = NULL;
766 792
767/* Get any Xserver defaults */ 793 /* Get any Xserver defaults */
768 794
769 displayResource = XResourceManagerString(display); 795 displayResource = XResourceManagerString(display);
770 if (displayResource != NULL) 796 if (displayResource != NULL)
771 database = XrmGetStringDatabase(displayResource); 797 database = XrmGetStringDatabase(displayResource);
772 798
773# ifdef HAVE_EXTRA_XRESOURCE_FILES 799# ifdef HAVE_EXTRA_XRESOURCE_FILES
774/* Add in ~/.Xdefaults or ~/.Xresources */ 800 /* Add in ~/.Xdefaults or ~/.Xresources */
775 { 801 {
776 char *ptr; 802 char *ptr;
777 803
778 if ((ptr = (char *)getenv("HOME")) == NULL) 804 if ((ptr = (char *)getenv("HOME")) == NULL)
779 ptr = "."; 805 ptr = ".";
780 806
781 for (i = 0; i < (sizeof(xnames) / sizeof(xnames[0])); i++) { 807 for (i = 0; i < (sizeof(xnames) / sizeof(xnames[0])); i++)
808 {
782 sprintf(fname, "%-.*s/%s", sizeof(fname) - STRLEN(xnames[i]) - 2, 809 sprintf(fname, "%-.*s/%s", sizeof(fname) - STRLEN(xnames[i]) - 2,
783 ptr, xnames[i]); 810 ptr, xnames[i]);
784 if ((rdb1 = XrmGetFileDatabase(fname)) != NULL) { 811 if ((rdb1 = XrmGetFileDatabase(fname)) != NULL)
812 {
785 XrmMergeDatabases(rdb1, &database); 813 XrmMergeDatabases(rdb1, &database);
786# ifndef HAVE_BOTH_XRESOURCE_FILES 814# ifndef HAVE_BOTH_XRESOURCE_FILES
787 break; 815 break;
788# endif 816# endif
789 } 817
790 } 818 }
819 }
791 } 820 }
792# endif 821# endif
793 822
794/* Add in XENVIRONMENT file */ 823 /* Add in XENVIRONMENT file */
795 824
796 if ((xe = (char *)getenv("XENVIRONMENT")) != NULL 825 if ((xe = (char *)getenv("XENVIRONMENT")) != NULL
797 && (rdb1 = XrmGetFileDatabase(xe)) != NULL) 826 && (rdb1 = XrmGetFileDatabase(xe)) != NULL)
798 XrmMergeDatabases(rdb1, &database); 827 XrmMergeDatabases(rdb1, &database);
799 828
800/* Add in Rxvt file */ 829 /* Add in Rxvt file */
801# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 830# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
802 if (localepath == NULL || (rdb1 = XrmGetFileDatabase(localepath)) == NULL) 831 if (localepath == NULL || (rdb1 = XrmGetFileDatabase(localepath)) == NULL)
803# endif 832# endif
804 rdb1 = XrmGetFileDatabase(XAPPLOADDIR "/" APL_SUBCLASS); 833 rdb1 = XrmGetFileDatabase(XAPPLOADDIR "/" APL_SUBCLASS);
805 if (rdb1 != NULL) 834 if (rdb1 != NULL)
806 XrmMergeDatabases(rdb1, &database); 835 XrmMergeDatabases(rdb1, &database);
807 836
808/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 837 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
809 if ((xe = (char *)getenv("XAPPLRESDIR")) != NULL) { 838 if ((xe = (char *)getenv("XAPPLRESDIR")) != NULL)
839 {
810 sprintf(fname, "%-.*s/" APL_SUBCLASS, sizeof(fname) 840 sprintf(fname, "%-.*s/" APL_SUBCLASS, sizeof(fname)
811 - sizeof(APL_SUBCLASS) - 2, xe); 841 - sizeof(APL_SUBCLASS) - 2, xe);
812 if ((rdb1 = XrmGetFileDatabase(fname)) != NULL) 842 if ((rdb1 = XrmGetFileDatabase(fname)) != NULL)
813 XrmMergeDatabases(rdb1, &database); 843 XrmMergeDatabases(rdb1, &database);
814 } 844 }
815 845
816 XrmSetDatabase(display, database); 846 XrmSetDatabase(display, database);
817# endif 847# endif
818 848
819/* 849 /*
820 * Query resources for options that affect us 850 * Query resources for options that affect us
821 */ 851 */
822 for (entry = 0; entry < optList_size(); entry++) { 852 for (entry = 0; entry < optList_size(); entry++)
853 {
823 int s; 854 int s;
824 char *p, *p0; 855 char *p, *p0;
825 const char *kw = optList[entry].kw; 856 const char *kw = optList[entry].kw;
826 857
827 if (kw == NULL || R->rs[optList[entry].doff] != NULL) 858 if (kw == NULL || rs[optList[entry].doff] != NULL)
828 continue; /* previously set */ 859 continue; /* previously set */
829 860
830 p = XGetDefault(display, name, kw); 861 p = XGetDefault(display, name, kw);
831 p0 = XGetDefault(display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 862 p0 = XGetDefault(display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
832 if (p == NULL || (p0 && STRCMP(p, p0) == 0)) {
833 p = XGetDefault(display, APL_SUBCLASS, kw);
834 if (p == NULL || (p0 && STRCMP(p, p0) == 0)) 863 if (p == NULL || (p0 && STRCMP(p, p0) == 0))
864 {
865 p = XGetDefault(display, APL_SUBCLASS, kw);
866 if (p == NULL || (p0 && STRCMP(p, p0) == 0))
835 p = XGetDefault(display, APL_CLASS, kw); 867 p = XGetDefault(display, APL_CLASS, kw);
836 } 868 }
837 if (p == NULL && p0) 869 if (p == NULL && p0)
838 p = p0; 870 p = p0;
839 if (p) { 871 if (p)
840 R->rs[optList[entry].doff] = p; 872 {
873 rs[optList[entry].doff] = p;
841 874
842 if (optList_isBool(entry)) { 875 if (optList_isBool(entry))
876 {
843 s = STRCASECMP(p, "TRUE") == 0 877 s = STRCASECMP(p, "TRUE") == 0
844 || STRCASECMP(p, "YES") == 0 878 || STRCASECMP(p, "YES") == 0
845 || STRCASECMP(p, "ON") == 0 879 || STRCASECMP(p, "ON") == 0
846 || STRCASECMP(p, "1") == 0; 880 || STRCASECMP(p, "1") == 0;
847 if (optList_isReverse(entry)) 881 if (optList_isReverse(entry))
848 s = !s; 882 s = !s;
849 if (s) 883 if (s)
850 R->Options |= (optList[entry].flag); 884 Options |= (optList[entry].flag);
851 else 885 else
852 R->Options &= ~(optList[entry].flag); 886 Options &= ~(optList[entry].flag);
853 } 887 }
854 } 888 }
855 } 889 }
856 890
857/* 891 /*
858 * [R5 or later]: enumerate the resource database 892 * [R5 or later]: enumerate the resource database
859 */ 893 */
860# ifdef XrmEnumOneLevel 894# ifdef XrmEnumOneLevel
861# ifdef KEYSYM_RESOURCE 895# ifdef KEYSYM_RESOURCE
862 name_prefix[0] = XrmStringToName(name); 896 name_prefix[0] = XrmStringToName(name);
863 name_prefix[1] = XrmStringToName("keysym"); 897 name_prefix[1] = XrmStringToName("keysym");
864 name_prefix[2] = NULLQUARK; 898 name_prefix[2] = NULLQUARK;
865 class_prefix[0] = XrmStringToName(APL_SUBCLASS); 899 class_prefix[0] = XrmStringToName(APL_SUBCLASS);
866 class_prefix[1] = XrmStringToName("Keysym"); 900 class_prefix[1] = XrmStringToName("Keysym");
867 class_prefix[2] = NULLQUARK; 901 class_prefix[2] = NULLQUARK;
868/* XXX: Need to check sizeof(rxvt_t) == sizeof(XPointer) */ 902 /* XXX: Need to check sizeof(rxvt_t) == sizeof(XPointer) */
869 XrmEnumerateDatabase(XrmGetDatabase(display), name_prefix, class_prefix, 903 XrmEnumerateDatabase(XrmGetDatabase(display), name_prefix, class_prefix,
870 XrmEnumOneLevel, rxvt_define_key, NULL); 904 XrmEnumOneLevel, rxvt_define_key, NULL);
871 name_prefix[0] = XrmStringToName(APL_CLASS); 905 name_prefix[0] = XrmStringToName(APL_CLASS);
872 name_prefix[1] = XrmStringToName("keysym"); 906 name_prefix[1] = XrmStringToName("keysym");
873 class_prefix[0] = XrmStringToName(APL_CLASS); 907 class_prefix[0] = XrmStringToName(APL_CLASS);
874 class_prefix[1] = XrmStringToName("Keysym"); 908 class_prefix[1] = XrmStringToName("Keysym");
875/* XXX: Need to check sizeof(rxvt_t) == sizeof(XPointer) */ 909 /* XXX: Need to check sizeof(rxvt_t) == sizeof(XPointer) */
876 XrmEnumerateDatabase(XrmGetDatabase(display), name_prefix, class_prefix, 910 XrmEnumerateDatabase(XrmGetDatabase(display), name_prefix, class_prefix,
877 XrmEnumOneLevel, rxvt_define_key, NULL); 911 XrmEnumOneLevel, rxvt_define_key, NULL);
878# endif 912# endif
879# endif 913# endif
880 914
881# else /* USE_XGETDEFAULT */ 915# else /* USE_XGETDEFAULT */
882/* get resources the hard way, but save lots of memory */ 916 /* get resources the hard way, but save lots of memory */
883 FILE *fd = NULL; 917 FILE *fd = NULL;
884 char *home; 918 char *home;
885 919
886 if ((home = getenv("HOME")) != NULL) { 920 if ((home = getenv("HOME")) != NULL)
921 {
887 unsigned int i, len = STRLEN(home) + 2; 922 unsigned int i, len = STRLEN(home) + 2;
888 char *f = NULL; 923 char *f = NULL;
889 924
890 for (i = 0; i < (sizeof(xnames) / sizeof(xnames[0])); i++) { 925 for (i = 0; i < (sizeof(xnames) / sizeof(xnames[0])); i++)
926 {
891 f = (char *)rxvt_realloc(f, (len + STRLEN(xnames[i])) * sizeof(char)); 927 f = (char *)rxvt_realloc(f, (len + STRLEN(xnames[i])) * sizeof(char));
892 928
893 sprintf(f, "%s/%s", home, xnames[i]); 929 sprintf(f, "%s/%s", home, xnames[i]);
894 930
895 if ((fd = fopen(f, "r")) != NULL) 931 if ((fd = fopen(f, "r")) != NULL)
896 break; 932 break;
897 } 933 }
898 free(f); 934 free(f);
899 } 935 }
900/* 936 /*
901 * The normal order to match resources is the following: 937 * The normal order to match resources is the following:
902 * @ global resources (partial match, ~/.Xdefaults) 938 * @ global resources (partial match, ~/.Xdefaults)
903 * @ application file resources (XAPPLOADDIR/Rxvt) 939 * @ application file resources (XAPPLOADDIR/Rxvt)
904 * @ class resources (~/.Xdefaults) 940 * @ class resources (~/.Xdefaults)
905 * @ private resources (~/.Xdefaults) 941 * @ private resources (~/.Xdefaults)
906 * 942 *
907 * However, for the hand-rolled resources, the matching algorithm 943 * However, for the hand-rolled resources, the matching algorithm
908 * checks if a resource string value has already been allocated 944 * checks if a resource string value has already been allocated
909 * and won't overwrite it with (in this case) a less specific 945 * and won't overwrite it with (in this case) a less specific
910 * resource value. 946 * resource value.
911 * 947 *
912 * This avoids multiple allocation. Also, when we've called this 948 * This avoids multiple allocation. Also, when we've called this
913 * routine command-line string options have already been applied so we 949 * routine command-line string options have already been applied so we
914 * needn't to allocate for those resources. 950 * needn't to allocate for those resources.
915 * 951 *
916 * So, search in resources from most to least specific. 952 * So, search in resources from most to least specific.
917 * 953 *
918 * 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
919 * "XTerm" and "Rxvt" as class names. 955 * "XTerm" and "Rxvt" as class names.
920 */ 956 */
921 957
922 rxvt_get_xdefaults(aR_ fd, name); 958 get_xdefaults (fd, name);
923 rxvt_get_xdefaults(aR_ fd, APL_SUBCLASS); 959 get_xdefaults (fd, APL_SUBCLASS);
924 960
925# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) 961# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
962
926 { 963 {
927 FILE *ad = NULL; 964 FILE *ad = NULL;
928 965
929# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 966# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
930 if (localepath == NULL || (ad = fopen(localepath, "r")) == NULL) 967 if (localepath == NULL || (ad = fopen(localepath, "r")) == NULL)
931# endif 968# endif
932 ad = fopen(XAPPLOADDIR "/" APL_SUBCLASS, "r"); 969 ad = fopen(XAPPLOADDIR "/" APL_SUBCLASS, "r");
933 if (ad != NULL) { 970 if (ad != NULL)
934 rxvt_get_xdefaults(aR_ ad, APL_SUBCLASS); 971 {
935 rxvt_get_xdefaults(aR_ ad, ""); 972 get_xdefaults (ad, APL_SUBCLASS);
973 get_xdefaults (ad, "");
936 fclose(ad); 974 fclose(ad);
937 } 975 }
938 } 976 }
939# endif /* XAPPLOADDIR */ 977# endif /* XAPPLOADDIR */
940 978
941 rxvt_get_xdefaults(aR_ fd, APL_CLASS); 979 get_xdefaults (fd, APL_CLASS);
942 rxvt_get_xdefaults(aR_ fd, ""); /* partial match */ 980 get_xdefaults (fd, ""); /* partial match */
943 if (fd != NULL) 981 if (fd != NULL)
944 fclose(fd); 982 fclose(fd);
945# endif /* USE_XGETDEFAULT */ 983# endif /* USE_XGETDEFAULT */
946 984
947# if defined XAPPLOADDIR 985# if defined XAPPLOADDIR
948# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 986# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
987
949 } 988 }
950 989
951 /* Free the path of the possibly available localized Rxvt file */ 990 /* Free the path of the possibly available localized Rxvt file */
952 free(localepath); 991 free(localepath);
953# endif 992# endif
954# endif 993# endif
955 994
956#endif /* NO_RESOURCES */ 995#endif /* NO_RESOURCES */
957 996
958/* 997 /*
959 * even without resources, at least do this setup for command-line 998 * even without resources, at least do this setup for command-line
960 * options and command-line long options 999 * options and command-line long options
961 */ 1000 */
962#ifdef MULTICHAR_SET 1001#ifdef MULTICHAR_SET
963 rxvt_set_multichar_encoding(aR_ R->rs[Rs_multichar_encoding]); 1002 set_multichar_encoding (rs[Rs_multichar_encoding]);
964#endif 1003#endif
965#ifdef GREEK_SUPPORT 1004#ifdef GREEK_SUPPORT
966/* this could be a function in grkelot.c */ 1005 /* this could be a function in grkelot.c */
967/* void set_greek_keyboard (const char * str); */ 1006 /* void set_greek_keyboard (const char * str); */
968 if (R->rs[Rs_greek_keyboard]) { 1007 if (rs[Rs_greek_keyboard])
1008 {
969 if (!STRCMP(R->rs[Rs_greek_keyboard], "iso")) 1009 if (!STRCMP(rs[Rs_greek_keyboard], "iso"))
970 greek_setmode(GREEK_ELOT928); /* former -grk9 */ 1010 greek_setmode(GREEK_ELOT928); /* former -grk9 */
971 else if (!STRCMP(R->rs[Rs_greek_keyboard], "ibm")) 1011 else if (!STRCMP(rs[Rs_greek_keyboard], "ibm"))
972 greek_setmode(GREEK_IBM437); /* former -grk4 */ 1012 greek_setmode(GREEK_IBM437); /* former -grk4 */
973 } 1013 }
974 { 1014 {
975 KeySym sym; 1015 KeySym sym;
976 1016
977 if (R->rs[Rs_greektoggle_key] 1017 if (rs[Rs_greektoggle_key]
978 && ((sym = XStringToKeysym(R->rs[Rs_greektoggle_key])) != 0)) 1018 && ((sym = XStringToKeysym(rs[Rs_greektoggle_key])) != 0))
979 R->ks_greekmodeswith = sym; 1019 ks_greekmodeswith = sym;
980 } 1020 }
981#endif /* GREEK_SUPPORT */ 1021#endif /* GREEK_SUPPORT */
982 1022
983#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 1023#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
1024
984 { 1025 {
985 KeySym sym; 1026 KeySym sym;
986 1027
987 if (R->rs[Rs_bigfont_key] 1028 if (rs[Rs_bigfont_key]
988 && ((sym = XStringToKeysym(R->rs[Rs_bigfont_key])) != 0)) 1029 && ((sym = XStringToKeysym(rs[Rs_bigfont_key])) != 0))
989 R->ks_bigfont = sym; 1030 ks_bigfont = sym;
990 if (R->rs[Rs_smallfont_key] 1031 if (rs[Rs_smallfont_key]
991 && ((sym = XStringToKeysym(R->rs[Rs_smallfont_key])) != 0)) 1032 && ((sym = XStringToKeysym(rs[Rs_smallfont_key])) != 0))
992 R->ks_smallfont = sym; 1033 ks_smallfont = sym;
993 } 1034 }
994#endif 1035#endif
995} 1036}
996 1037
997/*}}} */ 1038/*}}} */
998/*----------------------- end-of-file (C source) -----------------------*/ 1039/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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