ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.4 by pcg, Wed Dec 17 09:00:35 2003 UTC vs.
Revision 1.160 by sf-exg, Sun Dec 18 02:14:59 2011 UTC

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

Diff Legend

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