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.6 by pcg, Thu Dec 18 00:38:07 2003 UTC vs.
Revision 1.97 by ayin, Tue May 1 09:34:07 2007 UTC

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

Diff Legend

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