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.11 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.59 by root, Thu Aug 11 02:05:07 2005 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xdefaults.c 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xdefaults.C,v 1.11 2004/02/13 12:16:21 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.
28 *----------------------------------------------------------------------*/ 28 *----------------------------------------------------------------------*/
29 29
30#include "../config.h" /* NECESSARY */ 30#include "../config.h" /* NECESSARY */
31#include "rxvt.h" /* NECESSARY */ 31#include "rxvt.h" /* NECESSARY */
32#include "version.h" 32#include "version.h"
33#include "xdefaults.intpro" /* PROTOS for internal routines */ 33
34#include <sys/utsname.h>
35
36#ifdef KEYSYM_RESOURCE
37#include "keyboard.h"
38#endif
34 39
35/* #define DEBUG_RESOURCES */ 40/* #define DEBUG_RESOURCES */
36
37static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
38 41
39/*{{{ monolithic option/resource structure: */ 42/*{{{ monolithic option/resource structure: */
40/* 43/*
41 * `string' options MUST have a usage argument 44 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 45 * `switch' and `boolean' options have no argument
63#define SWCH(opt, flag, desc) \ 66#define SWCH(opt, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 67 { (flag), -1, NULL, (opt), NULL, (desc)}
65 68
66/* convenient macros */ 69/* convenient macros */
67#define optList_strlen(i) \ 70#define optList_strlen(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? STRLEN (optList[i].arg) : 1)) 71 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
69#define optList_isBool(i) \ 72#define optList_isBool(i) \
70 (optList[i].flag & Opt_Boolean) 73 (optList[i].flag & Opt_Boolean)
71#define optList_isReverse(i) \ 74#define optList_isReverse(i) \
72 (optList[i].flag & Opt_Reverse) 75 (optList[i].flag & Opt_Reverse)
73#define optList_size() \ 76#define optList_size \
74 (sizeof (optList) / sizeof (optList[0])) 77 (sizeof (optList) / sizeof (optList[0]))
75 78
76static const struct 79static const struct
77 { 80 {
78 const unsigned long flag; /* Option flag */ 81 const unsigned long flag; /* Option flag */
83 const char *desc; /* description */ 86 const char *desc; /* description */
84 } 87 }
85optList[] = { 88optList[] = {
86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 89 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 90 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
88 STRG (Rs_term_name, "termName", "tn", "string", 91 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 */ 92 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
91 STRG (Rs_geometry, "geometry", "geometry", "geometry", 93 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"), 94 SWCH ("C", Opt_console, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, "start iconic"), 95 SWCH ("iconic", Opt_iconic, "start iconic"),
95 SWCH ("ic", Opt_iconic, NULL), /* short form */ 96 SWCH ("ic", Opt_iconic, NULL), /* short form */
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
97 "reverse video"),
98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
100#ifdef HAVE_SCROLLBARS 101#if HAVE_SCROLLBARS
102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
101 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
102 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
103 "scrollbar right"), 105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", 106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
105 Opt_scrollBar_floating, "scrollbar without a trough"), 107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
106#endif 108#endif
107 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
108 NULL),
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, 110 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, 111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
112 "scroll-on-keypress"),
113 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
114 "scroll-with-buffer"),
115#ifdef TRANSPARENT 113#if TRANSPARENT
116 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
117 "inherit parent pixmap"),
118 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, 115 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
119 "forcefully inherit root pixmap"),
120 SWCH ("tr", Opt_transparent, NULL), 116 SWCH ("tr", Opt_transparent, NULL),
117# if TINTING
118 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
119# endif
120#endif
121#if OFF_FOCUS_FADING
122 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
123 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
124#endif
125#if TINTING
126 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
121#endif 127#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 128 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
123#ifndef NO_BELL 129#ifndef NO_BELL
124 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 130 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
125# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 131# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
128#endif 134#endif
129#ifdef META8_OPTION 135#ifdef META8_OPTION
130 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 136 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
131#endif 137#endif
132#ifdef MOUSE_WHEEL 138#ifdef MOUSE_WHEEL
133 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 139 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
134 NULL),
135#endif 140#endif
136#ifdef MULTICHAR_SET 141#if ENABLE_FRILLS
137 BOOL (Rs_mc_hack, "multibyte_cursor", "mcc", Opt_mc_hack,
138 "Multibyte character cursor movement"),
139#endif
140#ifndef NO_FRILLS
141 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 142 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
142 "triple click word selection"), 143 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
144 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"),
143#endif 145#endif
144#ifdef CURSOR_BLINK 146#if CURSOR_BLINK
145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 147 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
146#endif 148#endif
147#ifdef POINTER_BLANK 149#ifdef POINTER_BLANK
148 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 150 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"),
149#endif 151#endif
167 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 169 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 170 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
169#endif /* NO_BRIGHTCOLOR */ 171#endif /* NO_BRIGHTCOLOR */
170#ifndef NO_BOLD_UNDERLINE_REVERSE 172#ifndef NO_BOLD_UNDERLINE_REVERSE
171 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 173 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
174 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
172 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 175 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
173 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 176 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
174#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 177#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
178#if ENABLE_FRILLS
179 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
180#endif
175#ifdef KEEP_SCROLLCOLOR 181#ifdef KEEP_SCROLLCOLOR
176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 182 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
177 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 183 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
178#endif /* KEEP_SCROLLCOLOR */ 184#endif /* KEEP_SCROLLCOLOR */
179#ifdef OPTION_HC 185#ifdef OPTION_HC
180 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 186 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
181#endif 187#endif
182#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
183 RSTRG (Rs_path, "path", "search path"),
184#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
185#ifdef XPM_BACKGROUND
186 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]",
187 "background pixmap"),
188#endif /* XPM_BACKGROUND */
189#if (MENUBAR_MAX)
190 RSTRG (Rs_menu, "menu", "name[;tag]"),
191#endif
192 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
193 /* fonts: command-line option = resource name */
194#ifdef USE_XIM
195 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
196 STRG (Rs_preeditType, "preeditType", "pt", "style",
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
201#endif /* USE_XIM */
202#ifdef GREEK_SUPPORT
203 STRG (Rs_greek_keyboard, "greek_keyboard", "grk", "mode",
204 "greek keyboard mapping; mode = iso | ibm"),
205 RSTRG (Rs_greektoggle_key, "greektoggle_key", "keysym"),
206#endif
207 STRG (Rs_name, NULL, "name", "string",
208 "client instance, icon, and title strings"),
209 STRG (Rs_title, "title", "title", "string", "title name for window"),
210 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212#ifndef NO_CURSORCOLOR 188#ifndef NO_CURSORCOLOR
213 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 189 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
214 /* command-line option = resource name */ 190 /* command-line option = resource name */
215 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 191 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
216#endif /* NO_CURSORCOLOR */ 192#endif /* NO_CURSORCOLOR */
217 STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color", 193 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
218 "pointer color"), 194 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
219 STRG (Rs_color + Color_border, "borderColor", "bd", "color", 195 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
220 "border color"), 196#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
197 RSTRG (Rs_path, "path", "search path"),
198#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
199#ifdef XPM_BACKGROUND
200 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
201#endif /* XPM_BACKGROUND */
202#if (MENUBAR_MAX)
203 RSTRG (Rs_menu, "menu", "name[;tag]"),
204#endif
205 /* fonts: command-line option = resource name */
206 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
207#if ENABLE_STYLES
208 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
209 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
210 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
211#endif
212#ifdef USE_XIM
213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
214 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
215 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
216 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
217#endif /* USE_XIM */
218 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
219 STRG (Rs_title, "title", "title", "string", "title name for window"),
220 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
221 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
221 STRG (Rs_saveLines, "saveLines", "sl", "number", 222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
222 "number of scrolled lines to save"), 223#if ENABLE_XEMBED
223#ifndef NO_FRILLS 224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
225#endif
226#if ENABLE_FRILLS
227 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
224 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", 228 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
225 "external border in pixels"),
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 229 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 230 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", 231 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 "internal border in pixels"), 232 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
230#endif
231#ifndef NO_LINESPACE
232 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", 233 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
233 "number of extra pixels between rows"),
234#endif 234#endif
235 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number",
236 "scrollbar thickness/width in pixels"),
237#ifdef POINTER_BLANK 235#ifdef POINTER_BLANK
238 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
239#endif 237#endif
240#ifndef NO_BACKSPACE_KEY 238#ifndef NO_BACKSPACE_KEY
241 RSTRG (Rs_backspace_key, "backspacekey", "string"), 239 RSTRG (Rs_backspace_key, "backspacekey", "string"),
242#endif 240#endif
243#ifndef NO_DELETE_KEY 241#ifndef NO_DELETE_KEY
244 RSTRG (Rs_delete_key, "deletekey", "string"), 242 RSTRG (Rs_delete_key, "deletekey", "string"),
245#endif 243#endif
246 RSTRG (Rs_selectstyle, "selectstyle", "mode"), 244 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
247 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
248#ifdef HAVE_SCROLLBARS
249 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
250#endif
251#ifdef PRINTPIPE 245#ifdef PRINTPIPE
252 RSTRG (Rs_print_pipe, "print-pipe", "string"), 246 RSTRG (Rs_print_pipe, "print-pipe", "string"),
253#endif 247#endif
254#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
255 RSTRG (Rs_bigfont_key, "bigfont_key", "keysym"),
256 RSTRG (Rs_smallfont_key, "smallfont_key", "keysym"),
257#endif
258 STRG (Rs_modifier, "modifier", "mod", "modifier",
259 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
260 INFO ("xrm", "string", "X resource"),
261#ifdef CUTCHAR_RESOURCE 249#ifdef CUTCHAR_RESOURCE
262 RSTRG (Rs_cutchars, "cutchars", "string"), 250 RSTRG (Rs_cutchars, "cutchars", "string"),
263#endif /* CUTCHAR_RESOURCE */ 251#endif /* CUTCHAR_RESOURCE */
264#ifdef ACS_ASCII
265 RSTRG (Rs_acs_chars, "acsChars", "string"),
266#endif /* ACS_ASCII */
267 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 252 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
256#endif
257#if 0 && TODO
258#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
259 INFO ("xrm", "string", "X resource"),
260#endif
261#endif
268 INFO ("e", "command arg ...", "command to execute") 262 INFO ("e", "command arg ...", "command to execute")
269 }; 263 };
270 264
271#undef INFO 265#undef INFO
272#undef STRG 266#undef STRG
273#undef RSTRG 267#undef RSTRG
274#undef SWCH 268#undef SWCH
275#undef BOOL 269#undef BOOL
276/*}}} */ 270/*}}} */
277 271
278static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
279static const char optionsstring[] = "Options: " 273static const char optionsstring[] = "options: "
274#if XFT
275 "xft,"
276#endif
277#if ENABLE_STYLES
278 "styles,"
279#endif
280#if ENABLE_COMBINING
281 "combining,"
282#endif
283#if TEXT_BLINK
284 "blink,"
285#endif
286#if ISO_14755
287 "iso14755,"
288#endif
289#if UNICODE_3
290 "unicode3,"
291#endif
292 "encodings=eu+vn"
293#if ENCODING_JP
294 "+jp"
295#endif
296#if ENCODING_JP_EXT
297 "+jp-ext"
298#endif
299#if ENCODING_KR
300 "+kr"
301#endif
302#if ENCODING_ZH
303 "+zh"
304#endif
305#if ENCODING_ZH_EXT
306 "+zh-ext"
307#endif
308 ","
309#if OFF_FOCUS_FADING
310 "fade,"
311#endif
280#if defined(XPM_BACKGROUND) 312#if defined(XPM_BACKGROUND)
281 "XPM," 313 "XPM,"
282#endif 314#endif
283#if defined(TRANSPARENT) 315#if defined(TRANSPARENT)
284 "transparent," 316 "transparent,"
285#endif 317#endif
318#if TINTING
319 "tint,"
320#endif
286#if defined(UTMP_SUPPORT) 321#if defined(UTMP_SUPPORT)
287 "utmp," 322 "utmp,"
288#endif 323#endif
289#if defined(MENUBAR) 324#if defined(MENUBAR)
290 "menubar," 325 "menubar,"
291#endif 326#endif
292#if !defined(NO_FRILLS)
293 "frills,"
294#endif
295#if !defined(NO_LINESPACE)
296 "linespace,"
297#endif
298#if defined(PREFER_24BIT)
299 "24bit,"
300#endif
301#if defined(USE_XIM) 327#if defined(USE_XIM)
302 "XIM," 328 "XIM,"
303#endif
304#if defined(MULTICHAR_SET)
305 "multichar_languages,"
306#endif 329#endif
307 "scrollbars=" 330 "scrollbars="
308#if !defined(HAVE_SCROLLBARS) 331#if !defined(HAVE_SCROLLBARS)
309 "NONE" 332 "NONE"
310#else 333#else
334# if defined(PLAIN_SCROLLBAR)
335 "plain"
336# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
337 "+"
338# endif
339# endif
311# if defined(RXVT_SCROLLBAR) 340# if defined(RXVT_SCROLLBAR)
312 "rxvt" 341 "rxvt"
313# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 342# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
314 "+" 343 "+"
315# endif 344# endif
323# if defined(XTERM_SCROLLBAR) 352# if defined(XTERM_SCROLLBAR)
324 "xterm" 353 "xterm"
325# endif 354# endif
326#endif 355#endif
327 "," 356 ","
328#if defined(GREEK_SUPPORT)
329 "Greek,"
330#endif
331#if defined(RXVT_GRAPHICS)
332 "graphics,"
333#endif
334#if defined(NO_BACKSPACE_KEY) 357#if defined(NO_BACKSPACE_KEY)
335 "no_backspace," 358 "no_backspace,"
336#endif 359#endif
337#if defined(NO_DELETE_KEY) 360#if defined(NO_DELETE_KEY)
338 "no_delete," 361 "no_delete,"
339#endif 362#endif
363#if EIGHT_BIT_CONTROLS
364 "8bitctrls,"
365#endif
340#if !defined(NO_STRINGS) 366#if !defined(NO_STRINGS)
341 "strings," 367 "strings,"
342#endif 368#endif
343#if defined(TTY_256COLOR) 369#if defined(ENABLE_FRILLS)
370 "frills,"
371#endif
372#if defined(PREFER_24BIT)
344 "256colour," 373 "24bit,"
374#endif
375#if defined(SELECTION_SCROLLING)
376 "selectionscrolling,"
377#endif
378#if MOUSE_WHEEL
379 "wheel,"
380#endif
381#if MOUSE_SLIP_WHEELING
382 "slipwheel,"
383#endif
384#if defined(SMART_RESIZE)
385 "smart-resize,"
386#endif
387#if defined(CURSOR_BLINK)
388 "cursorBlink,"
389#endif
390#if defined(POINTER_BLANK)
391 "pointerBlank,"
345#endif 392#endif
346#if defined(NO_RESOURCES) 393#if defined(NO_RESOURCES)
347 "NoResources" 394 "NoResources"
348#else 395#else
349# if defined(USE_XGETDEFAULT) 396# if defined(USE_XGETDEFAULT)
359/*{{{ usage: */ 406/*{{{ usage: */
360/*----------------------------------------------------------------------*/ 407/*----------------------------------------------------------------------*/
361static void 408static void
362rxvt_usage (int type) 409rxvt_usage (int type)
363{ 410{
364 unsigned int i, col; 411 unsigned int i, col;
365 412
366 write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); 413 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
367 write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1);
368 write (STDERR_FILENO, APL_NAME, sizeof (APL_NAME) - 1);
369 414
370 switch (type) 415 switch (type)
371 { 416 {
372 case 0: /* brief listing */ 417 case 0: /* brief listing */
373 fprintf (stderr, " [-help] [--help]\n"); 418 rxvt_log (" [-help] [--help]\n");
419
374 for (col = 1, i = 0; i < optList_size (); i++) 420 for (col = 1, i = 0; i < optList_size; i++)
375 if (optList[i].desc != NULL) 421 if (optList[i].desc != NULL)
376 { 422 {
377 int len = 0; 423 int len = 0;
378 424
379 if (!optList_isBool (i)) 425 if (!optList_isBool (i))
383 len++; /* account for space */ 429 len++; /* account for space */
384 } 430 }
385#ifdef DEBUG_STRICT 431#ifdef DEBUG_STRICT
386 assert (optList[i].opt != NULL); 432 assert (optList[i].opt != NULL);
387#endif 433#endif
388 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 434 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
389 col += len; 435 col += len;
390 if (col > 79) 436 if (col > 79)
391 { /* assume regular width */ 437 { /* assume regular width */
392 putc ('\n', stderr); 438 rxvt_log ("\n");
393 col = 1 + len; 439 col = 1 + len;
394 } 440 }
441
395 fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""), 442 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
396 optList[i].opt);
397 if (optList_strlen (i)) 443 if (optList_strlen (i))
398 fprintf (stderr, " %s]", optList[i].arg); 444 rxvt_log (" %s]", optList[i].arg);
399 else 445 else
400 fprintf (stderr, "]"); 446 rxvt_log ("]");
401 } 447 }
402 break; 448 break;
403 449
404 case 1: /* full command-line listing */ 450 case 1: /* full command-line listing */
405 fprintf (stderr, " [options] [-e command args]\n\n" 451 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
406 "where options include:\n"); 452
407 for (i = 0; i < optList_size (); i++) 453 for (i = 0; i < optList_size; i++)
408 if (optList[i].desc != NULL) 454 if (optList[i].desc != NULL)
409 { 455 {
410#ifdef DEBUG_STRICT 456#ifdef DEBUG_STRICT
411 assert (optList[i].opt != NULL); 457 assert (optList[i].opt != NULL);
412#endif 458#endif
413 fprintf (stderr, " %s%s %-*s%s%s\n", 459 rxvt_log (" %s%s %-*s%s%s\n",
414 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 460 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
415 (INDENT - STRLEN (optList[i].opt) 461 (INDENT - strlen (optList[i].opt)
416 + (optList_isBool (i) ? 0 : 2)), 462 + (optList_isBool (i) ? 0 : 2)),
417 (optList[i].arg ? optList[i].arg : ""), 463 (optList[i].arg ? optList[i].arg : ""),
418 (optList_isBool (i) ? "turn on/off " : ""), 464 (optList_isBool (i) ? "turn on/off " : ""),
419 optList[i].desc); 465 optList[i].desc);
420 } 466 }
421 fprintf (stderr, "\n --help to list long-options"); 467 rxvt_log ("\n --help to list long-options");
422 break; 468 break;
423 469
424 case 2: /* full resource listing */ 470 case 2: /* full resource listing */
425 fprintf (stderr,
426 " [options] [-e command args]\n\n" 471 rxvt_log (" [options] [-e command args]\n\n"
427 "where resources (long-options) include:\n"); 472 "where resources (long-options) include:\n");
428 473
429 for (i = 0; i < optList_size (); i++) 474 for (i = 0; i < optList_size; i++)
430 if (optList[i].kw != NULL) 475 if (optList[i].kw != NULL)
431 fprintf (stderr, " %s: %*s%s\n", 476 rxvt_log (" %s: %*s%s\n",
432 optList[i].kw, 477 optList[i].kw,
433 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 478 (INDENT - strlen (optList[i].kw)), "", /* XXX */
434 (optList_isBool (i) ? "boolean" : optList[i].arg)); 479 (optList_isBool (i) ? "boolean" : optList[i].arg));
435#ifdef KEYSYM_RESOURCE 480#ifdef KEYSYM_RESOURCE
436 fprintf (stderr, " " "keysym.sym" ": %*s%s\n", 481 rxvt_log (" " "keysym.sym" ": %*s%s\n",
437 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 482 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
438 "keysym"); 483 "keysym");
439#endif 484#endif
440 fprintf (stderr, "\n -help to list options"); 485 rxvt_log ("\n -help to list options");
441 break; 486 break;
442 } 487 }
443 fprintf (stderr, "\n\n"); 488
444 exit (EXIT_FAILURE); 489 rxvt_log ("\n\n");
490 rxvt_exit_failure ();
445 /* NOTREACHED */ 491 /* NOTREACHED */
446} 492}
447 493
448/*}}} */ 494/*}}} */
449 495
454 int i, bad_option = 0; 500 int i, bad_option = 0;
455 static const char On[3] = "ON", Off[4] = "OFF"; 501 static const char On[3] = "ON", Off[4] = "OFF";
456 502
457 for (i = 1; i < argc; i++) 503 for (i = 1; i < argc; i++)
458 { 504 {
459 unsigned int entry, longopt = 0; 505 unsigned int entry, longopt = 0;
460 const char *flag, *opt; 506 const char *flag, *opt;
461 507
462 opt = argv[i]; 508 opt = argv[i];
463#ifdef DEBUG_RESOURCES 509#ifdef DEBUG_RESOURCES
464 fprintf (stderr, "argv[%d] = %s: ", i, opt); 510 fprintf (stderr, "argv[%d] = %s: ", i, opt);
465#endif 511#endif
476 longopt = *opt++; /* long option */ 522 longopt = *opt++; /* long option */
477 } 523 }
478 else 524 else
479 { 525 {
480 bad_option = 1; 526 bad_option = 1;
481 rxvt_print_error ("bad option \"%s\"", opt); 527 rxvt_warn ("\"%s\": malformed option.\n", opt);
482 continue; 528 continue;
483 } 529 }
484 530
485 if (!STRCMP (opt, "help")) 531 if (!strcmp (opt, "help"))
486 rxvt_usage (longopt ? 2 : 1); 532 rxvt_usage (longopt ? 2 : 1);
487 if (!STRCMP (opt, "h")) 533 if (!strcmp (opt, "h"))
488 rxvt_usage (0); 534 rxvt_usage (0);
489 535
490 /* feature: always try to match long-options */ 536 /* feature: always try to match long-options */
491 for (entry = 0; entry < optList_size (); entry++) 537 for (entry = 0; entry < optList_size; entry++)
492 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 538 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
493 || (!longopt 539 || (!longopt
494 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 540 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
495 break; 541 break;
496 542
497 if (entry < optList_size ()) 543 if (entry < optList_size)
498 { 544 {
499 if (optList_isReverse (entry)) 545 if (optList_isReverse (entry))
500 flag = flag == On ? Off : On; 546 flag = flag == On ? Off : On;
547
501 if (optList_strlen (entry)) 548 if (optList_strlen (entry))
502 { /* string value */
503 const char *str = argv[++i];
504
505#ifdef DEBUG_RESOURCES
506 fprintf (stderr, "string (%s,%s) = ",
507 optList[entry].opt ? optList[entry].opt : "nil",
508 optList[entry].kw ? optList[entry].kw : "nil");
509#endif
510 if (flag == On && str && (optList[entry].doff != -1))
511 { 549 {
512#ifdef DEBUG_RESOURCES
513 fprintf (stderr, "\"%s\"\n", str);
514#endif
515 rs[optList[entry].doff] = str;
516 /* 550 /*
517 * special cases are handled in main.c:main () to allow 551 * special cases are handled in main.c:main () to allow
518 * X resources to set these values before we settle for 552 * X resources to set these values before we settle for
519 * default values 553 * default values
520 */ 554 */
521 }
522#ifdef DEBUG_RESOURCES
523 else
524 fprintf (stderr, "???\n");
525#endif
526 555
556 if (optList[entry].doff != -1)
557 rs[optList[entry].doff] = flag == On && argv[i+1]
558 ? argv[++i] : 0;
527 } 559 }
528 else 560 else
529 { /* boolean value */ 561 { /* boolean value */
530#ifdef DEBUG_RESOURCES 562#ifdef DEBUG_RESOURCES
531 fprintf (stderr, "boolean (%s,%s) = %s\n", 563 fprintf (stderr, "boolean (%s,%s) = %s\n",
532 optList[entry].opt, optList[entry].kw, flag); 564 optList[entry].opt, optList[entry].kw, flag);
533#endif 565#endif
534 if (flag == On) 566 if (flag == On)
535 Options |= (optList[entry].flag); 567 options |= optList[entry].flag;
536 else 568 else
537 Options &= ~ (optList[entry].flag); 569 options &= ~optList[entry].flag;
538 570
539 if (optList[entry].doff != -1) 571 if (optList[entry].doff != -1)
540 rs[optList[entry].doff] = flag; 572 rs[optList[entry].doff] = flag;
541 } 573 }
542 } 574 }
543 else 575 else
544#ifdef KEYSYM_RESOURCE 576#ifdef KEYSYM_RESOURCE
545 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 577 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
546 if (rxvt_Str_match (opt, "keysym.")) 578 if (rxvt_Str_match (opt, "keysym."))
547 { 579 {
548 const char *str = argv[++i]; 580 const char *str = argv[++i];
549 581
550 if (str != NULL) 582 if (str != NULL)
551 parse_keysym (opt + sizeof ("keysym.") - 1, str); 583 parse_keysym (opt + sizeof ("keysym.") - 1, str);
552 } 584 }
553 else 585 else
554#endif 586#endif
587 {
555 bad_option = 1; 588 bad_option = 1;
589 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
590 }
556 } 591 }
557 592
558 if (bad_option) 593 if (bad_option)
559 rxvt_usage (0); 594 rxvt_usage (0);
560} 595}
570 * quarks will be something like 605 * quarks will be something like
571 * "rxvt" "keysym" "0xFF01" 606 * "rxvt" "keysym" "0xFF01"
572 * value will be a string 607 * value will be a string
573 */ 608 */
574/* ARGSUSED */ 609/* ARGSUSED */
575bool 610int
576rxvt_define_key(XrmDatabase *database __attribute__((unused)), XrmBindingList bindings __attribute__((unused)), XrmQuarkList quarks, XrmRepresentation *type __attribute__((unused)), XrmValue *value, XPointer closure __attribute__((unused))) 611rxvt_define_key (XrmDatabase *database __attribute__((unused)),
612 XrmBindingList bindings __attribute__((unused)),
613 XrmQuarkList quarks,
614 XrmRepresentation *type __attribute__((unused)),
615 XrmValue *value,
616 XPointer closure __attribute__((unused)))
577{ 617{
578 int last; 618 int last;
579 619
580 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 620 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
581 ; 621 ;
622
582 last--; 623 last--;
583 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 624 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
584 return False; 625 return False;
585} 626}
586 627
591 * arg will be 632 * arg will be
592 * NULL for ~/.Xdefaults and 633 * NULL for ~/.Xdefaults and
593 * non-NULL for command-line options (need to allocate) 634 * non-NULL for command-line options (need to allocate)
594 */ 635 */
595#define NEWARGLIM 500 /* `reasonable' size */ 636#define NEWARGLIM 500 /* `reasonable' size */
637
638struct keysym_vocabulary_t
639{
640 const char *name;
641 unsigned short len;
642 unsigned short value;
643};
644keysym_vocabulary_t keysym_vocabulary[] =
645{
646 { "ISOLevel3", 9, Level3Mask },
647 { "AppKeypad", 9, AppKeypadMask },
648 { "Control", 7, ControlMask },
649 { "NumLock", 7, NumLockMask },
650 { "Shift", 5, ShiftMask },
651 { "Meta", 4, MetaMask },
652 { "Lock", 4, LockMask },
653 { "Mod1", 4, Mod1Mask },
654 { "Mod2", 4, Mod2Mask },
655 { "Mod3", 4, Mod3Mask },
656 { "Mod4", 4, Mod4Mask },
657 { "Mod5", 4, Mod5Mask },
658 { "I", 1, Level3Mask },
659 { "K", 1, AppKeypadMask },
660 { "C", 1, ControlMask },
661 { "N", 1, NumLockMask },
662 { "S", 1, ShiftMask },
663 { "M", 1, MetaMask },
664 { "A", 1, MetaMask },
665 { "L", 1, LockMask },
666 { "1", 1, Mod1Mask },
667 { "2", 1, Mod2Mask },
668 { "3", 1, Mod3Mask },
669 { "4", 1, Mod4Mask },
670 { "5", 1, Mod5Mask },
671};
672
596int 673int
597rxvt_term::parse_keysym (const char *str, const char *arg) 674rxvt_term::parse_keysym (const char *str, const char *arg)
598{ 675{
599 int n, sym; 676 int n, sym;
600 char *key_string, *newarg = NULL; 677 unsigned int state = 0;
678 const char *pmodend = NULL;
679 char *newarg = NULL;
601 char newargstr[NEWARGLIM]; 680 char newargstr[NEWARGLIM];
602 681
603 if (arg == NULL) 682 if (arg == NULL)
604 { 683 {
605 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 684 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
606 return 0; 685 return 0;
686
607 str += n; /* skip `keysym.' */ 687 str += n; /* skip `keysym.' */
688 if ((pmodend = strchr (str, ':')) < str)
689 return -1;
690 }
691 else
692 pmodend = str + strlen(str);
693
694 for (--pmodend; str < pmodend; --pmodend)
695 if (*pmodend == '-')
696 break;
697
698 while (str < pmodend)
608 } 699 {
700 unsigned int i;
701
702 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
703 {
704 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
705 {
706 state |= keysym_vocabulary[i].value;
707 str += keysym_vocabulary[i].len;
708 break;
709 }
710 }
711
712 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
713 return -1;
714
715 if (*str == '-')
716 ++str;
717 }
718
609 /* some scanf () have trouble with a 0x prefix */ 719 /* some scanf () have trouble with a 0x prefix */
610 if (isdigit (str[0]))
611 {
612 if (str[0] == '0' && toupper (str[1]) == 'X') 720 if (str[0] == '0' && toupper (str[1]) == 'X')
721 {
613 str += 2; 722 str += 2;
723
614 if (arg) 724 if (arg)
615 { 725 {
616 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 726 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
617 return -1; 727 return -1;
618 } 728 }
619 else 729 else
620 { 730 {
621 if (sscanf (str, "%x:", &sym) != 1) 731 if (sscanf (str, "%x:", &sym) != 1)
622 return -1; 732 return -1;
623 733
624 /* cue to ':', it's there since sscanf () worked */ 734 /* cue to ':', it's there since sscanf () worked */
625 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 735 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
626 newargstr[NEWARGLIM - 1] = '\0'; 736 newargstr[NEWARGLIM - 1] = '\0';
627 newarg = newargstr; 737 newarg = newargstr;
628 } 738 }
629 } 739 }
630 else 740 else
631 { 741 {
632 /* 742 /*
633 * convert keysym name to keysym number 743 * convert keysym name to keysym number
634 */ 744 */
635 STRNCPY (newargstr, str, NEWARGLIM - 1); 745 strncpy (newargstr, str, NEWARGLIM - 1);
636 newargstr[NEWARGLIM - 1] = '\0'; 746 newargstr[NEWARGLIM - 1] = '\0';
747
637 if (arg == NULL) 748 if (arg == NULL)
638 { 749 {
639 if ((newarg = STRCHR (newargstr, ':')) == NULL) 750 if ((newarg = strchr (newargstr, ':')) == NULL)
640 return -1; 751 return -1;
752
641 *newarg++ = '\0'; /* terminate keysym name */ 753 *newarg++ = '\0'; /* terminate keysym name */
642 } 754 }
755
643 if ((sym = XStringToKeysym (newargstr)) == None) 756 if ((sym = XStringToKeysym (newargstr)) == None)
644 return -1; 757 return -1;
645 } 758 }
646 759
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) 760 if (newarg == NULL)
654 { 761 {
655 STRNCPY (newargstr, arg, NEWARGLIM - 1); 762 strncpy (newargstr, arg, NEWARGLIM - 1);
656 newargstr[NEWARGLIM - 1] = '\0'; 763 newargstr[NEWARGLIM - 1] = '\0';
657 newarg = newargstr; 764 newarg = newargstr;
658 } 765 }
766
659 rxvt_Str_trim (newarg); 767 rxvt_Str_trim (newarg);
660 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 768 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
661 return -1; 769 return -1;
662 MIN_IT (n, 255);
663 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
664 770
665 key_string[0] = n; 771 keyboard->register_user_translation (sym, state, newarg);
666 STRNCPY (key_string + 1, newarg, n);
667 Keysym_map[sym] = (unsigned char *)key_string;
668
669 return 1; 772 return 1;
670} 773}
671 774
672# endif /* KEYSYM_RESOURCE */ 775# endif /* KEYSYM_RESOURCE */
673 776
677 * the matching algorithm used for memory-save fake resources 780 * the matching algorithm used for memory-save fake resources
678 */ 781 */
679void 782void
680rxvt_term::get_xdefaults (FILE *stream, const char *name) 783rxvt_term::get_xdefaults (FILE *stream, const char *name)
681{ 784{
682 unsigned int len; 785 unsigned int len;
683 char *str, buffer[256]; 786 char *str, buffer[256];
684 787
685 if (stream == NULL) 788 if (stream == NULL)
686 return; 789 return;
687 len = STRLEN (name); 790
791 len = strlen (name);
688 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 792 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
689 { 793 {
690 unsigned int entry, n; 794 unsigned int entry, n;
691 795
692 while (*str && isspace (*str)) 796 while (*str && isspace (*str))
693 str++; /* leading whitespace */ 797 str++; /* leading whitespace */
694 798
695 if ((str[len] != '*' && str[len] != '.') 799 if ((str[len] != '*' && str[len] != '.')
696 || (len && STRNCMP (str, name, len))) 800 || (len && strncmp (str, name, len)))
697 continue; 801 continue;
698 str += (len + 1); /* skip `name*' or `name.' */ 802 str += (len + 1); /* skip `name*' or `name.' */
699 803
700# ifdef KEYSYM_RESOURCE 804# ifdef KEYSYM_RESOURCE
701 if (!parse_keysym (str, NULL)) 805 if (!parse_keysym (str, NULL))
702# endif /* KEYSYM_RESOURCE */ 806# endif /* KEYSYM_RESOURCE */
703 for (entry = 0; entry < optList_size (); entry++) 807 for (entry = 0; entry < optList_size; entry++)
704 { 808 {
705 const char *kw = optList[entry].kw; 809 const char *kw = optList[entry].kw;
706 810
707 if (kw == NULL) 811 if (kw == NULL)
708 continue; 812 continue;
813
709 n = STRLEN (kw); 814 n = strlen (kw);
710 if (str[n] == ':' && rxvt_Str_match (str, kw)) 815 if (str[n] == ':' && rxvt_Str_match (str, kw))
711 { 816 {
712 /* skip `keyword:' */ 817 /* skip `keyword:' */
713 str += (n + 1); 818 str += n + 1;
714 rxvt_Str_trim (str); 819 rxvt_Str_trim (str);
715 n = STRLEN (str); 820 n = strlen (str);
821
716 if (n && rs[optList[entry].doff] == NULL) 822 if (n && rs[optList[entry].doff] == NULL)
717 { 823 {
718 /* not already set */ 824 /* not already set */
719 int s; 825 int s;
720 char *p = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 826 char *p = 0;
721 827
722 STRCPY (p, str); 828 for (int o = 0;;)
829 {
830 p = (char *)rxvt_realloc (p, o + n + 1);
831 memcpy (p + o, str, n);
832 o += n;
833 p[o] = 0;
834
835 if (o == 0 || p[o - 1] != '\\') // continuation line
836 break;
837
838 o--; // eat "\"
839
840 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
841 break;
842
843 rxvt_Str_trim (str);
844 n = strlen (str);
845 }
846
723 rs[optList[entry].doff] = p; 847 rs[optList[entry].doff] = p;
848 allocated.push_back (p);
849
724 if (optList_isBool (entry)) 850 if (optList_isBool (entry))
725 { 851 {
726 s = STRCASECMP (str, "TRUE") == 0 852 s = strcasecmp (str, "true") == 0
727 || STRCASECMP (str, "YES") == 0 853 || strcasecmp (str, "yes") == 0
728 || STRCASECMP (str, "ON") == 0 854 || strcasecmp (str, "on") == 0
729 || STRCASECMP (str, "1") == 0; 855 || strcmp (str, "1") == 0;
856
730 if (optList_isReverse (entry)) 857 if (optList_isReverse (entry))
731 s = !s; 858 s = !s;
859
732 if (s) 860 if (s)
733 Options |= (optList[entry].flag); 861 options |= optList[entry].flag;
734 else 862 else
735 Options &= ~ (optList[entry].flag); 863 options &= ~optList[entry].flag;
736 } 864 }
737 } 865 }
866
738 break; 867 break;
739 } 868 }
740 } 869 }
741 } 870 }
871
742 rewind (stream); 872 rewind (stream);
743} 873}
744 874
745/*}}} */ 875/*}}} */
746# endif /* ! USE_XGETDEFAULT */ 876# endif /* ! USE_XGETDEFAULT */
750/* 880/*
751 * using XGetDefault () or the hand-rolled replacement 881 * using XGetDefault () or the hand-rolled replacement
752 */ 882 */
753/* ARGSUSED */ 883/* ARGSUSED */
754void 884void
755rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name) 885rxvt_term::extract_resources ()
756{ 886{
887 dDisp;
888
757#ifndef NO_RESOURCES 889#ifndef NO_RESOURCES
890
891 char *homedir = (char *)getenv ("HOME");
892 char fname[1024];
758 893
759# if defined XAPPLOADDIR 894# if defined XAPPLOADDIR
760# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 895# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
761 /* Compute the path of the possibly available localized Rxvt file */ 896 /* Compute the path of the possibly available localized Rxvt file */
762 char *localepath = NULL; 897 char localepath[1024];
763 898
764 if (locale != NULL) 899 if (locale)
765 { /* XXX: must limit length of string */ 900 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
766 localepath = (char *)rxvt_malloc (256); 901 else
767 sprintf (localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, 902 localepath[0] = 0;
768 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (APL_SUBCLASS)),
769 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
770 }
771
772 {
773# endif 903# endif
774# endif 904# endif
775 905
776# ifdef USE_XGETDEFAULT 906# ifdef USE_XGETDEFAULT
777 /* 907 /*
778 * get resources using the X library function 908 * get resources using the X library function
779 */ 909 */
780 int entry; 910 int entry;
781 911
782# ifdef XrmEnumOneLevel 912# ifdef XrmEnumOneLevel
783 int i; 913 int i;
784 char *displayResource, *xe; 914 char *displayResource, *xe;
785 XrmName name_prefix[3]; 915 XrmName name_prefix[3];
786 XrmClass class_prefix[3]; 916 XrmClass class_prefix[3];
787 XrmDatabase database, rdb1; 917 XrmDatabase database, rdb1;
788 char fname[1024];
789 918
790 XrmInitialize (); 919 XrmInitialize ();
791 database = NULL; 920 database = NULL;
792 921
922 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
923
924 // 6. System wide per application default file.
925 /* Add in Rxvt file */
926# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
927 if (*localepath
928 && ((rdb1 = XrmGetFileDatabase (localepath))
929 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
930# endif
931 XrmMergeDatabases (rdb1, &database);
932
933 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
934 if ((xe = (char *)getenv ("XAPPLRESDIR")))
935 {
936 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
937
938 if ((rdb1 = XrmGetFileDatabase (fname)))
939 XrmMergeDatabases (rdb1, &database);
940 }
941
942 // 5. User's per application default file.
943 // none
944
945 // 4. User's defaults file.
793 /* Get any Xserver defaults */ 946 /* Get any Xserver defaults */
794
795 displayResource = XResourceManagerString (display); 947 displayResource = XResourceManagerString (disp);
796 if (displayResource != NULL) 948 if (displayResource != NULL)
949 {
797 database = XrmGetStringDatabase (displayResource); 950 if ((rdb1 = XrmGetStringDatabase (displayResource)))
798 951 XrmMergeDatabases (rdb1, &database);
799# ifdef HAVE_EXTRA_XRESOURCE_FILES
800 /* Add in ~/.Xdefaults or ~/.Xresources */
801 { 952 }
802 char *ptr; 953 else if (homedir)
954 {
955 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
803 956
804 if ((ptr = (char *)getenv ("HOME")) == NULL) 957 if ((rdb1 = XrmGetFileDatabase (fname)))
805 ptr = "."; 958 XrmMergeDatabases (rdb1, &database);
959 }
806 960
807 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 961 /* Get screen specific resources */
962 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
963 if (displayResource != NULL)
964 {
965 if ((rdb1 = XrmGetStringDatabase (displayResource)))
966 /* Merge with screen-independent resources */
967 XrmMergeDatabases (rdb1, &database);
968
969 XFree (displayResource);
970 }
971
972 // 3. User's per host defaults file
973 /* Add in XENVIRONMENT file */
974 if ((xe = (char *)getenv ("XENVIRONMENT"))
975 && (rdb1 = XrmGetFileDatabase (xe)))
976 XrmMergeDatabases (rdb1, &database);
977 else if (homedir)
978 {
979 struct utsname un;
980
981 if (!uname (&un))
808 { 982 {
809 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 983 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
810 ptr, xnames[i]); 984
811 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 985 if ((rdb1 = XrmGetFileDatabase (fname)))
986 XrmMergeDatabases (rdb1, &database);
987 }
988 }
989
990 XrmSetDatabase (disp, database);
991# endif
992
993 /*
994 * Query resources for options that affect us
995 */
996 for (entry = 0; entry < optList_size; entry++)
997 {
998 int s;
999 char *p, *p0;
1000 const char *kw = optList[entry].kw;
1001
1002 if (kw == NULL || rs[optList[entry].doff] != NULL)
1003 continue; /* previously set */
1004
1005 p = XGetDefault (disp, rs[Rs_name], kw);
1006 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1007 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1008 {
1009 p = XGetDefault (disp, RESCLASS, kw);
1010#ifdef RESFALLBACK
1011 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1012 p = XGetDefault (disp, RESFALLBACK, kw);
1013#endif
1014 }
1015
1016 if (p == NULL && p0)
1017 p = p0;
1018
1019 if (p)
1020 {
1021 rs[optList[entry].doff] = p;
1022
1023 if (optList_isBool (entry))
812 { 1024 {
813 XrmMergeDatabases (rdb1, &database); 1025 s = strcasecmp (p, "TRUE") == 0
814# ifndef HAVE_BOTH_XRESOURCE_FILES 1026 || strcasecmp (p, "YES") == 0
1027 || strcasecmp (p, "ON") == 0
1028 || strcasecmp (p, "1") == 0;
1029
1030 if (optList_isReverse (entry))
1031 s = !s;
1032
1033 if (s)
1034 options |= optList[entry].flag;
815 break; 1035 else
816# endif 1036 options &= ~optList[entry].flag;
817
818 } 1037 }
819 } 1038 }
820 } 1039 }
821# endif
822 1040
823 /* Add in XENVIRONMENT file */
824
825 if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
826 && (rdb1 = XrmGetFileDatabase (xe)) != NULL)
827 XrmMergeDatabases (rdb1, &database);
828
829 /* Add in Rxvt file */
830# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
831 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
832# endif
833 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" APL_SUBCLASS);
834 if (rdb1 != NULL)
835 XrmMergeDatabases (rdb1, &database);
836
837 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
838 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
839 {
840 sprintf (fname, "%-.*s/" APL_SUBCLASS, sizeof (fname)
841 - sizeof (APL_SUBCLASS) - 2, xe);
842 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
843 XrmMergeDatabases (rdb1, &database);
844 }
845
846 XrmSetDatabase (display, database);
847# endif
848
849 /* 1041 /*
850 * Query resources for options that affect us
851 */
852 for (entry = 0; entry < optList_size (); entry++)
853 {
854 int s;
855 char *p, *p0;
856 const char *kw = optList[entry].kw;
857
858 if (kw == NULL || rs[optList[entry].doff] != NULL)
859 continue; /* previously set */
860
861 p = XGetDefault (display, name, kw);
862 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
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))
867 p = XGetDefault (display, APL_CLASS, kw);
868 }
869 if (p == NULL && p0)
870 p = p0;
871 if (p)
872 {
873 rs[optList[entry].doff] = p;
874
875 if (optList_isBool (entry))
876 {
877 s = STRCASECMP (p, "TRUE") == 0
878 || STRCASECMP (p, "YES") == 0
879 || STRCASECMP (p, "ON") == 0
880 || STRCASECMP (p, "1") == 0;
881 if (optList_isReverse (entry))
882 s = !s;
883 if (s)
884 Options |= (optList[entry].flag);
885 else
886 Options &= ~ (optList[entry].flag);
887 }
888 }
889 }
890
891 /*
892 * [R5 or later]: enumerate the resource database 1042 * [R5 or later]: enumerate the resource database
893 */ 1043 */
894# ifdef XrmEnumOneLevel
895# ifdef KEYSYM_RESOURCE 1044# ifdef KEYSYM_RESOURCE
896 name_prefix[0] = XrmStringToName (name); 1045 name_prefix[0] = XrmStringToName (rs[Rs_name]);
897 name_prefix[1] = XrmStringToName ("keysym"); 1046 name_prefix[1] = XrmStringToName ("keysym");
898 name_prefix[2] = NULLQUARK; 1047 name_prefix[2] = NULLQUARK;
899 class_prefix[0] = XrmStringToName (APL_SUBCLASS); 1048 class_prefix[0] = XrmStringToName (RESCLASS);
900 class_prefix[1] = XrmStringToName ("Keysym"); 1049 class_prefix[1] = XrmStringToName ("Keysym");
901 class_prefix[2] = NULLQUARK; 1050 class_prefix[2] = NULLQUARK;
902 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1051 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
903 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1052 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
904 XrmEnumOneLevel, rxvt_define_key, NULL); 1053 XrmEnumOneLevel, rxvt_define_key, NULL);
1054# ifdef RESFALLBACK
905 name_prefix[0] = XrmStringToName (APL_CLASS); 1055 name_prefix[0] = XrmStringToName (RESFALLBACK);
906 name_prefix[1] = XrmStringToName ("keysym"); 1056 name_prefix[1] = XrmStringToName ("keysym");
907 class_prefix[0] = XrmStringToName (APL_CLASS); 1057 class_prefix[0] = XrmStringToName (RESFALLBACK);
908 class_prefix[1] = XrmStringToName ("Keysym"); 1058 class_prefix[1] = XrmStringToName ("Keysym");
909 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1059 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
910 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1060 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
911 XrmEnumOneLevel, rxvt_define_key, NULL); 1061 XrmEnumOneLevel, rxvt_define_key, NULL);
912# endif 1062# endif
913# endif 1063# endif
914 1064
915# else /* USE_XGETDEFAULT */ 1065# else /* USE_XGETDEFAULT */
916 /* get resources the hard way, but save lots of memory */ 1066 /* get resources the hard way, but save lots of memory */
1067 FILE *fd = NULL;
1068
1069 if (homedir)
1070 {
1071 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1072
1073 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1074 {
1075 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1076
1077 if ((fd = fopen (fname, "r")) != NULL)
1078 break;
1079 }
1080 }
1081 /*
1082 * The normal order to match resources is the following:
1083 * @ global resources (partial match, ~/.Xdefaults)
1084 * @ application file resources (XAPPLOADDIR/Rxvt)
1085 * @ class resources (~/.Xdefaults)
1086 * @ private resources (~/.Xdefaults)
1087 *
1088 * However, for the hand-rolled resources, the matching algorithm
1089 * checks if a resource string value has already been allocated
1090 * and won't overwrite it with (in this case) a less specific
1091 * resource value.
1092 *
1093 * This avoids multiple allocation. Also, when we've called this
1094 * routine command-line string options have already been applied so we
1095 * needn't to allocate for those resources.
1096 *
1097 * So, search in resources from most to least specific.
1098 *
1099 * Also, use a special sub-class so that we can use either or both of
1100 * "XTerm" and "Rxvt" as class names.
1101 */
1102
1103 get_xdefaults (fd, rs[Rs_name]);
1104 get_xdefaults (fd, RESCLASS);
1105# ifdef RESFALLBACK
1106 get_xdefaults (fd, RESFALLBACK);
1107# endif
1108
1109# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1110 {
917 FILE *fd = NULL; 1111 FILE *ad = NULL;
918 char *home;
919 1112
920 if ((home = getenv ("HOME")) != NULL) 1113# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1114 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1115# endif
1116 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1117 if (ad != NULL)
921 { 1118 {
922 unsigned int i, len = STRLEN (home) + 2; 1119 get_xdefaults (ad, RESCLASS);
923 char *f = NULL; 1120 get_xdefaults (ad, "");
924
925 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
926 {
927 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char));
928
929 sprintf (f, "%s/%s", home, xnames[i]);
930
931 if ((fd = fopen (f, "r")) != NULL)
932 break;
933 }
934 free (f); 1121 fclose (ad);
935 } 1122 }
936 /*
937 * The normal order to match resources is the following:
938 * @ global resources (partial match, ~/.Xdefaults)
939 * @ application file resources (XAPPLOADDIR/Rxvt)
940 * @ class resources (~/.Xdefaults)
941 * @ private resources (~/.Xdefaults)
942 *
943 * However, for the hand-rolled resources, the matching algorithm
944 * checks if a resource string value has already been allocated
945 * and won't overwrite it with (in this case) a less specific
946 * resource value.
947 *
948 * This avoids multiple allocation. Also, when we've called this
949 * routine command-line string options have already been applied so we
950 * needn't to allocate for those resources.
951 *
952 * So, search in resources from most to least specific.
953 *
954 * Also, use a special sub-class so that we can use either or both of
955 * "XTerm" and "Rxvt" as class names.
956 */
957
958 get_xdefaults (fd, name);
959 get_xdefaults (fd, APL_SUBCLASS);
960
961# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
962
963 {
964 FILE *ad = NULL;
965
966# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
967 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
968# endif
969 ad = fopen (XAPPLOADDIR "/" APL_SUBCLASS, "r");
970 if (ad != NULL)
971 {
972 get_xdefaults (ad, APL_SUBCLASS);
973 get_xdefaults (ad, "");
974 fclose (ad);
975 }
976 } 1123 }
977# endif /* XAPPLOADDIR */ 1124# endif /* XAPPLOADDIR */
978 1125
979 get_xdefaults (fd, APL_CLASS);
980 get_xdefaults (fd, ""); /* partial match */ 1126 get_xdefaults (fd, ""); /* partial match */
981 if (fd != NULL) 1127 if (fd != NULL)
982 fclose (fd); 1128 fclose (fd);
983# endif /* USE_XGETDEFAULT */ 1129# endif /* USE_XGETDEFAULT */
984 1130
985# if defined XAPPLOADDIR
986# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
987
988 }
989
990 /* Free the path of the possibly available localized Rxvt file */
991 free (localepath);
992# endif
993# endif
994
995#endif /* NO_RESOURCES */ 1131#endif /* NO_RESOURCES */
996
997 /*
998 * even without resources, at least do this setup for command-line
999 * options and command-line long options
1000 */
1001#ifdef MULTICHAR_SET
1002 set_multichar_encoding (rs[Rs_multichar_encoding]);
1003#endif
1004#ifdef GREEK_SUPPORT
1005 /* this could be a function in grkelot.c */
1006 /* void set_greek_keyboard (const char * str); */
1007 if (rs[Rs_greek_keyboard])
1008 {
1009 if (!STRCMP (rs[Rs_greek_keyboard], "iso"))
1010 greek_setmode (GREEK_ELOT928); /* former -grk9 */
1011 else if (!STRCMP (rs[Rs_greek_keyboard], "ibm"))
1012 greek_setmode (GREEK_IBM437); /* former -grk4 */
1013 }
1014 {
1015 KeySym sym;
1016
1017 if (rs[Rs_greektoggle_key]
1018 && ((sym = XStringToKeysym (rs[Rs_greektoggle_key])) != 0))
1019 ks_greekmodeswith = sym;
1020 }
1021#endif /* GREEK_SUPPORT */
1022
1023#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
1024
1025 {
1026 KeySym sym;
1027
1028 if (rs[Rs_bigfont_key]
1029 && ((sym = XStringToKeysym (rs[Rs_bigfont_key])) != 0))
1030 ks_bigfont = sym;
1031 if (rs[Rs_smallfont_key]
1032 && ((sym = XStringToKeysym (rs[Rs_smallfont_key])) != 0))
1033 ks_smallfont = sym;
1034 }
1035#endif
1036} 1132}
1037 1133
1038/*}}} */ 1134/*}}} */
1039/*----------------------- end-of-file (C source) -----------------------*/ 1135/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines