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.8 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.103 by sasha, Fri Jun 8 20:40:07 2007 UTC

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

Diff Legend

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