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.7 by pcg, Fri Jan 16 22:26:18 2004 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.7 2004/01/16 22:26:18 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", "pb", Opt_pointerBlank, "switch off pointer after delay"), 149 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
147#endif 150#endif
148 STRG(Rs_color + Color_bg, "background", "bg", "color", "background color"), 151 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
149 STRG(Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 152 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
150 RSTRG(Rs_color + minCOLOR + 0, "color0", "color"), 153 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
151 RSTRG(Rs_color + minCOLOR + 1, "color1", "color"), 154 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
152 RSTRG(Rs_color + minCOLOR + 2, "color2", "color"), 155 RSTRG (Rs_color + minCOLOR + 2, "color2", "color"),
153 RSTRG(Rs_color + minCOLOR + 3, "color3", "color"), 156 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
154 RSTRG(Rs_color + minCOLOR + 4, "color4", "color"), 157 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
155 RSTRG(Rs_color + minCOLOR + 5, "color5", "color"), 158 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
156 RSTRG(Rs_color + minCOLOR + 6, "color6", "color"), 159 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
157 RSTRG(Rs_color + minCOLOR + 7, "color7", "color"), 160 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
158#ifndef NO_BRIGHTCOLOR
159 RSTRG(Rs_color + minBrightCOLOR + 0, "color8", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
160 RSTRG(Rs_color + minBrightCOLOR + 1, "color9", "color"), 162 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
161 RSTRG(Rs_color + minBrightCOLOR + 2, "color10", "color"), 163 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
162 RSTRG(Rs_color + minBrightCOLOR + 3, "color11", "color"), 164 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
163 RSTRG(Rs_color + minBrightCOLOR + 4, "color12", "color"), 165 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
164 RSTRG(Rs_color + minBrightCOLOR + 5, "color13", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
165 RSTRG(Rs_color + minBrightCOLOR + 6, "color14", "color"), 167 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
166 RSTRG(Rs_color + minBrightCOLOR + 7, "color15", "color"), 168 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
167#endif /* NO_BRIGHTCOLOR */
168#ifndef NO_BOLD_UNDERLINE_REVERSE 169#ifndef NO_BOLD_UNDERLINE_REVERSE
169 RSTRG(Rs_color + Color_BD, "colorBD", "color"), 170 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
171 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
170 RSTRG(Rs_color + Color_UL, "colorUL", "color"), 172 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
171 RSTRG(Rs_color + Color_RV, "colorRV", "color"), 173 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 174#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
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
201 /* fonts: command-line option = resource name */
190 STRG(Rs_font, "font", "fn", "fontname", "normal text font"), 202 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
191/* fonts: command-line option = resource name */ 203#if ENABLE_STYLES
204 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
205 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
206 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
207 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
208#endif
192#ifdef USE_XIM 209#ifdef USE_XIM
193 STRG(Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 210 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
194 STRG(Rs_preeditType, "preeditType", "pt", "style", 211 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"), 212 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
198#endif 213 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
199#endif /* USE_XIM */ 214#endif /* USE_XIM */
200#ifdef GREEK_SUPPORT 215 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"), 216 STRG (Rs_title, "title", "title", "string", "title name for window"),
208 STRG(Rs_title, NULL, "T", NULL, NULL), /* short form */ 217 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
209 STRG(Rs_iconName, "iconName", "n", "string", "icon name for window"), 218 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
210#ifndef NO_CURSORCOLOR 219 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
211 STRG(Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 220#if ENABLE_XEMBED
212/* command-line option = resource name */ 221 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
213 RSTRG(Rs_color + Color_cursor2, "cursorColor2", "color"), 222#endif
214#endif /* NO_CURSORCOLOR */ 223#if XFT
215 STRG(Rs_color + Color_pointer, "pointerColor", "pr", "color", 224 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
216 "pointer color"), 225 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
217 STRG(Rs_color + Color_border, "borderColor", "bd", "color", 226#endif
218 "border color"), 227#if ENABLE_FRILLS
219 STRG(Rs_saveLines, "saveLines", "sl", "number", 228 RSTRG (Rs_transient_for, "transient-for", "windowid"),
220 "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"),
221#ifndef NO_FRILLS 230 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
222 STRG(Rs_ext_bwidth, "externalBorder", "w", "number", 231 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
223 "external border in pixels"), 232 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
224 STRG(Rs_ext_bwidth, NULL, "bw", NULL, NULL), 233 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
225 STRG(Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 234 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
226 STRG(Rs_int_bwidth, "internalBorder", "b", "number", 235 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
227 "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"),
228#endif 239#endif
229#ifndef NO_LINESPACE 240#ifdef BUILTIN_GLYPHS
230 STRG(Rs_lineSpace, "lineSpace", "lsp", "number", 241 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
231 "number of extra pixels between rows"),
232#endif 242#endif
233 STRG(Rs_scrollBar_thickness, "thickness", "sbt", "number",
234 "scrollbar thickness/width in pixels"),
235#ifdef POINTER_BLANK 243#ifdef POINTER_BLANK
236 RSTRG(Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 244 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
237#endif 245#endif
238#ifndef NO_BACKSPACE_KEY 246#ifndef NO_BACKSPACE_KEY
239 RSTRG(Rs_backspace_key, "backspacekey", "string"), 247 RSTRG (Rs_backspace_key, "backspacekey", "string"),
240#endif 248#endif
241#ifndef NO_DELETE_KEY 249#ifndef NO_DELETE_KEY
242 RSTRG(Rs_delete_key, "deletekey", "string"), 250 RSTRG (Rs_delete_key, "deletekey", "string"),
243#endif
244 RSTRG(Rs_selectstyle, "selectstyle", "mode"),
245 RSTRG(Rs_scrollstyle, "scrollstyle", "mode"),
246#ifdef HAVE_SCROLLBARS
247 RSTRG(Rs_scrollBar_align, "scrollBar_align", "mode"),
248#endif 251#endif
249#ifdef PRINTPIPE 252#ifdef PRINTPIPE
250 RSTRG(Rs_print_pipe, "print-pipe", "string"), 253 RSTRG (Rs_print_pipe, "print-pipe", "string"),
251#endif 254#endif
252#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 255 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
260 RSTRG(Rs_cutchars, "cutchars", "string"), 256 RSTRG (Rs_cutchars, "cutchars", "string"),
261#endif /* CUTCHAR_RESOURCE */
262#ifdef ACS_ASCII
263 RSTRG(Rs_acs_chars, "acsChars", "string"),
264#endif /* ACS_ASCII */
265 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
266 INFO("e", "command arg ...", "command to execute") 275 INFO ("e", "command arg ...", "command to execute")
267}; 276 };
268 277
269#undef INFO 278#undef INFO
270#undef STRG 279#undef STRG
271#undef RSTRG 280#undef RSTRG
272#undef SWCH 281#undef SWCH
273#undef BOOL 282#undef BOOL
274/*}}} */
275 283
276static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 284static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
277static const char optionsstring[] = "Options: " 285static const char optionsstring[] = "options: "
278#if defined(XPM_BACKGROUND) 286#if ENABLE_PERL
279 "XPM," 287 "perl,"
280#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
281#if defined(TRANSPARENT) 327#if defined(ENABLE_TRANSPARENCY)
282 "transparent," 328 "transparent,"
329 "tint,"
283#endif 330#endif
284#if defined(UTMP_SUPPORT) 331#if HAVE_AFTERIMAGE
285 "utmp," 332 "afterimage,"
286#endif 333#endif
287#if defined(MENUBAR) 334#if HAVE_PIXBUF
288 "menubar," 335 "pixbuf,"
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 336#endif
299#if defined(USE_XIM) 337#if defined(USE_XIM)
300 "XIM," 338 "XIM,"
301#endif
302#if defined(MULTICHAR_SET)
303 "multichar_languages,"
304#endif
305 "scrollbars="
306#if !defined(HAVE_SCROLLBARS)
307 "NONE"
308#else
309# if defined(RXVT_SCROLLBAR)
310 "rxvt"
311# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
312 "+"
313# endif
314# endif
315# if defined(NEXT_SCROLLBAR)
316 "NeXT"
317# if defined(XTERM_SCROLLBAR)
318 "+"
319# endif
320# endif
321# if defined(XTERM_SCROLLBAR)
322 "xterm"
323# endif
324#endif
325 ","
326#if defined(GREEK_SUPPORT)
327 "Greek,"
328#endif
329#if defined(RXVT_GRAPHICS)
330 "graphics,"
331#endif 339#endif
332#if defined(NO_BACKSPACE_KEY) 340#if defined(NO_BACKSPACE_KEY)
333 "no_backspace," 341 "no_backspace,"
334#endif 342#endif
335#if defined(NO_DELETE_KEY) 343#if defined(NO_DELETE_KEY)
336 "no_delete," 344 "no_delete,"
337#endif 345#endif
338#if !defined(NO_STRINGS) 346#if EIGHT_BIT_CONTROLS
339 "strings," 347 "8bitctrls,"
340#endif 348#endif
341#if defined(TTY_256COLOR) 349#if defined(ENABLE_FRILLS)
342 "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,"
343#endif 369#endif
344#if defined(NO_RESOURCES) 370#if defined(NO_RESOURCES)
345 "NoResources" 371 "NoResources,"
346#else
347# if defined(USE_XGETDEFAULT)
348 "XGetDefaults"
349# else
350 ".Xdefaults"
351# endif 372#endif
373 "scrollbars=plain"
374#if defined(RXVT_SCROLLBAR)
375 "+rxvt"
352#endif 376#endif
353 "\nUsage: "; /* Usage */ 377#if defined(NEXT_SCROLLBAR)
378 "+NeXT"
379#endif
380#if defined(XTERM_SCROLLBAR)
381 "+xterm"
382#endif
383 "\nUsage: "; /* Usage */
354 384
355#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";
356 390
357/*{{{ usage: */ 391/*{{{ usage: */
358/*----------------------------------------------------------------------*/ 392/*----------------------------------------------------------------------*/
359/* EXTPROTO */ 393static void
360void
361rxvt_usage(int type) 394rxvt_usage (int type)
362{ 395{
363 unsigned int i, col; 396 unsigned int i, col;
364 397
365 write(STDERR_FILENO, releasestring, sizeof(releasestring) - 1); 398 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
366 write(STDERR_FILENO, optionsstring, sizeof(optionsstring) - 1);
367 write(STDERR_FILENO, APL_NAME, sizeof(APL_NAME) - 1);
368 399
369 switch (type) { 400 switch (type)
401 {
370 case 0: /* brief listing */ 402 case 0: /* brief listing */
371 fprintf(stderr, " [-help] [--help]\n"); 403 rxvt_log (" [-help] [--help]\n");
372 for (col = 1, i = 0; i < optList_size(); i++) 404
405 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
373 if (optList[i].desc != NULL) { 406 if (optList[i].desc != NULL)
374 int len = 0; 407 {
408 int len = 0;
375 409
376 if (!optList_isBool(i)) { 410 if (optList[i].arg)
377 len = optList_strlen(i); 411 len = strlen (optList[i].arg) + 1;
378 if (len > 0)
379 len++; /* account for space */
380 }
381#ifdef DEBUG_STRICT
382 assert(optList[i].opt != NULL); 412 assert (optList[i].opt != NULL);
383#endif
384 len += 4 + STRLEN(optList[i].opt) + (optList_isBool(i) ? 2: 0); 413 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
385 col += len; 414 col += len;
386 if (col > 79) { /* assume regular width */ 415 if (col > 79)
387 putc('\n', stderr); 416 {
388 col = 1 + len; 417 /* assume regular width */
389 } 418 rxvt_log ("\n");
390 fprintf(stderr, " [-%s%s", (optList_isBool(i) ? "/+" : ""), 419 col = 1 + len;
391 optList[i].opt); 420 }
392 if (optList_strlen(i))
393 fprintf(stderr, " %s]", optList[i].arg);
394 else
395 fprintf(stderr, "]");
396 }
397 break;
398 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
399 case 1: /* full command-line listing */ 430 case 1: /* full command-line listing */
400 fprintf(stderr, " [options] [-e command args]\n\n" 431 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
401 "where options include:\n"); 432
402 for (i = 0; i < optList_size(); i++) 433 for (i = 0; i < ecb_array_length (optList); i++)
403 if (optList[i].desc != NULL) { 434 if (optList[i].desc != NULL)
404#ifdef DEBUG_STRICT 435 {
405 assert(optList[i].opt != NULL); 436 assert (optList[i].opt != NULL);
406#endif 437 rxvt_log (" %s%s %-*s%s%s\n",
407 fprintf(stderr, " %s%s %-*s%s%s\n",
408 (optList_isBool(i) ? "-/+" : "-"), optList[i].opt, 438 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
409 (INDENT - STRLEN(optList[i].opt) 439 (INDENT - strlen (optList[i].opt)
410 + (optList_isBool(i) ? 0 : 2)), 440 + (optList_isBool (i) ? 0 : 2)),
411 (optList[i].arg ? optList[i].arg : ""), 441 (optList[i].arg ? optList[i].arg : ""),
412 (optList_isBool(i) ? "turn on/off " : ""), 442 (optList_isBool (i) ? "turn on/off " : ""),
413 optList[i].desc); 443 optList[i].desc);
414 } 444 }
415 fprintf(stderr, "\n --help to list long-options"); 445 rxvt_log ("\n --help to list long-options");
416 break; 446 break;
417 447
418 case 2: /* full resource listing */ 448 case 2: /* full resource listing */
419 fprintf(stderr,
420 " [options] [-e command args]\n\n" 449 rxvt_log (" [options] [-e command args]\n\n"
421 "where resources (long-options) include:\n"); 450 "where resources (long-options) include:\n");
422 451
423 for (i = 0; i < optList_size(); i++) 452 for (i = 0; i < ecb_array_length (optList); i++)
424 if (optList[i].kw != NULL) 453 if (optList[i].kw != NULL)
425 fprintf(stderr, " %s: %*s%s\n", 454 rxvt_log (" %s: %*s%s\n",
426 optList[i].kw, 455 optList[i].kw,
427 (INDENT - STRLEN(optList[i].kw)), "", /* XXX */ 456 (INDENT - strlen (optList[i].kw)), "", /* XXX */
428 (optList_isBool(i) ? "boolean" : optList[i].arg)); 457 (optList_isBool (i) ? "boolean" : optList[i].arg));
429#ifdef KEYSYM_RESOURCE 458#ifdef KEYSYM_RESOURCE
430 fprintf(stderr, " " "keysym.sym" ": %*s%s\n", 459 rxvt_log (" " "keysym.sym" ": %*s%s\n",
431 (INDENT - sizeof("keysym.sym") + 1), "", /* XXX */ 460 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
432 "keysym"); 461 "keysym");
433#endif 462#endif
434 fprintf(stderr, "\n -help to list options"); 463 rxvt_log ("\n -help to list options");
435 break; 464 break;
436 } 465 }
437 fprintf(stderr, "\n\n"); 466
438 exit(EXIT_FAILURE); 467 rxvt_log ("\n\n");
439 /* NOTREACHED */ 468 rxvt_exit_failure ();
440} 469}
441 470
442/*}}} */ 471/*}}} */
443 472
444/*{{{ get command-line options before getting resources */ 473/*{{{ get command-line options before getting resources */
445/* EXTPROTO */ 474const char **
446void
447rxvt_get_options(pR_ int argc, const char *const *argv) 475rxvt_term::get_options (int argc, const char *const *argv)
448{ 476{
449 int i, bad_option = 0; 477 int i, bad_option = 0;
450 static const char On[3] = "ON", Off[4] = "OFF";
451 478
452 for (i = 1; i < argc; i++) { 479 for (i = 1; i < argc; i++)
480 {
453 unsigned int entry, longopt = 0; 481 unsigned int entry, longopt = 0;
454 const char *flag, *opt; 482 const char *opt;
483 int flag;
455 484
456 opt = argv[i]; 485 opt = argv[i];
457#ifdef DEBUG_RESOURCES 486
458 fprintf(stderr, "argv[%d] = %s: ", i, opt);
459#endif
460 if (*opt == '-') {
461 flag = On;
462 if (*++opt == '-') 487 if (*opt == '-')
488 {
489 flag = 1;
490
491 if (*++opt == '-')
463 longopt = *opt++; /* long option */ 492 longopt = *opt++; /* long option */
493 }
464 } else if (*opt == '+') { 494 else if (*opt == '+')
465 flag = Off; 495 {
496 flag = 0;
497
466 if (*++opt == '+') 498 if (*++opt == '+')
467 longopt = *opt++; /* long option */ 499 longopt = *opt++; /* long option */
468 } else { 500 }
501 else
502 {
469 bad_option = 1; 503 bad_option = 1;
470 rxvt_print_error("bad option \"%s\"", opt); 504 rxvt_warn ("\"%s\": malformed option.\n", opt);
471 continue; 505 continue;
472 } 506 }
473 507
474 if (!STRCMP(opt, "help")) 508 if (!strcmp (opt, "help"))
475 rxvt_usage(longopt ? 2 : 1); 509 rxvt_usage (longopt ? 2 : 1);
476 if (!STRCMP(opt, "h")) 510
511 if (!strcmp (opt, "h"))
477 rxvt_usage(0); 512 rxvt_usage (0);
478 513
479 /* feature: always try to match long-options */ 514 /* feature: always try to match long-options */
480 for (entry = 0; entry < optList_size(); entry++) 515 for (entry = 0; entry < ecb_array_length (optList); entry++)
481 if ((optList[entry].kw && !STRCMP(opt, optList[entry].kw)) 516 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
482 || (!longopt 517 || (!longopt
483 && optList[entry].opt && !STRCMP(opt, optList[entry].opt))) 518 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
484 break; 519 break;
485 520
486 if (entry < optList_size()) { 521 if (entry < ecb_array_length (optList)
522 && !optList_isInfo (entry))
523 {
487 if (optList_isReverse(entry)) 524 if (optList_isReverse (entry))
488 flag = flag == On ? Off : On; 525 flag = !flag;
489 if (optList_strlen(entry)) { /* string value */
490 const char *str = argv[++i];
491 526
492#ifdef DEBUG_RESOURCES 527 if (optList_isString (entry))
493 fprintf(stderr, "string (%s,%s) = ", 528 {
494 optList[entry].opt ? optList[entry].opt : "nil", 529 /*
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 530 * special cases are handled in init_resources () to allow
504 * X resources to set these values before we settle for 531 * X resources to set these values before we settle for
505 * default values 532 * default values
506 */ 533 */
507 } 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 }
508#ifdef DEBUG_RESOURCES 552#ifndef NO_RESOURCES
509 else 553 else if (!strcmp (opt, "xrm"))
510 fprintf(stderr, "???\n"); 554 {
555 if (i+1 < argc)
556 XrmPutLineResource (&option_db, argv[++i]);
557 }
511#endif 558#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 559#ifdef KEYSYM_RESOURCE
527 /* if (!STRNCMP(opt, "keysym.", sizeof("keysym.") - 1)) */ 560 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
528 if (rxvt_Str_match(opt, "keysym.")) { 561 {
529 const char *str = argv[++i]; 562 if (i+1 < argc)
530 563 {
531 if (str != NULL) 564 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
532 rxvt_parse_keysym(aR_ opt + sizeof("keysym.") - 1, str); 565 sprintf (res, "*.%s: %s\n", opt, argv[i]);
533 } else 566 XrmPutLineResource (&option_db, res);
567 }
568 }
534#endif 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 {
535 bad_option = 1; 579 bad_option = 1;
580 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
581 }
536 } 582 }
537 583
538 if (bad_option) 584 if (bad_option)
539 rxvt_usage(0); 585 rxvt_usage (0);
586
587 return 0;
540} 588}
541 589
542/*}}} */ 590/*}}} */
543 591
544#ifndef NO_RESOURCES 592#ifndef NO_RESOURCES
… …
549 * Define key from XrmEnumerateDatabase. 597 * Define key from XrmEnumerateDatabase.
550 * quarks will be something like 598 * quarks will be something like
551 * "rxvt" "keysym" "0xFF01" 599 * "rxvt" "keysym" "0xFF01"
552 * value will be a string 600 * value will be a string
553 */ 601 */
554/* ARGSUSED */ 602static int
555/* INTPROTO */ 603rxvt_define_key (XrmDatabase *database ecb_unused,
556Bool 604 XrmBindingList bindings ecb_unused,
557rxvt_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)
558{ 609{
559 dR; 610 int last;
560 int last;
561 611
562 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 */
563 ; 613 ;
614
564 last--; 615 last--;
565 rxvt_parse_keysym(aR_ XrmQuarkToString(quarks[last]), (char *)value->addr); 616 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
566 return False; 617 return False;
567} 618}
568 619
569/* 620/*
570 * look for something like this (XK_Delete) 621 * look for something like this (XK_Delete)
571 * rxvt*keysym.0xFFFF: "\177" 622 * rxvt*keysym.0xFFFF: "\177"
572 *
573 * arg will be
574 * NULL for ~/.Xdefaults and
575 * non-NULL for command-line options (need to allocate)
576 */ 623 */
577#define NEWARGLIM 500 /* `reasonable' size */ 624
578/* 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
579int 660int
580rxvt_parse_keysym(pR_ const char *str, const char *arg) 661rxvt_term::parse_keysym (const char *str, const char *arg)
581{ 662{
582 int n, sym; 663 int sym;
583 char *key_string, *newarg = NULL; 664 unsigned int state = 0;
584 char newargstr[NEWARGLIM]; 665 const char *key = strrchr (str, '-');
585 666
586 if (arg == NULL) { 667 if (!key)
587 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')
588 return 0; 674 return -1;
589 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;
590 } 696 }
591/* some scanf() have trouble with a 0x prefix */
592 if (isdigit(str[0])) {
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 697
602 /* cue to ':', it's there since sscanf() worked */
603 STRNCPY(newargstr, STRCHR(str, ':') + 1, NEWARGLIM - 1);
604 newargstr[NEWARGLIM - 1] = '\0';
605 newarg = newargstr;
606 }
607 } else {
608 /*
609 * convert keysym name to keysym number 698 // convert keysym name to keysym number
610 */
611 STRNCPY(newargstr, str, NEWARGLIM - 1);
612 newargstr[NEWARGLIM - 1] = '\0';
613 if (arg == NULL) {
614 if ((newarg = STRCHR(newargstr, ':')) == NULL)
615 return -1;
616 *newarg++ = '\0'; /* terminate keysym name */
617 }
618 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)
619 return -1; 705 return -1;
620 } 706 }
621 707
622 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);
623 return -1; 712 return 1;
624 sym &= 0xFF; 713}
625 if (R->Keysym_map[sym] != NULL) /* already set ? */
626 return -1;
627 714
628 if (newarg == NULL) { 715# endif /* KEYSYM_RESOURCE */
629 STRNCPY(newargstr, arg, NEWARGLIM - 1); 716#endif /* NO_RESOURCES */
630 newargstr[NEWARGLIM - 1] = '\0'; 717
631 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
632 } 746 }
633 rxvt_Str_trim(newarg);
634 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 747
639 key_string[0] = n; 748 if (p == NULL && p0)
640 STRNCPY(key_string + 1, newarg, n); 749 p = p0;
641 R->Keysym_map[sym] = (unsigned char *)key_string;
642 750
643 return 1; 751 return p;
644} 752}
645 753
646# endif /* KEYSYM_RESOURCE */
647
648# ifndef USE_XGETDEFAULT
649/*{{{ rxvt_get_xdefaults() */
650/*
651 * the matching algorithm used for memory-save fake resources
652 */
653/* INTPROTO */
654void 754void
655rxvt_get_xdefaults(pR_ FILE *stream, const char *name) 755rxvt_term::extract_resources ()
656{ 756{
657 unsigned int len; 757#ifndef NO_RESOURCES
658 char *str, buffer[256]; 758 XrmDatabase database = XrmGetDatabase (dpy);
659 759 XrmMergeDatabases (option_db, &database);
660 if (stream == NULL) 760 option_db = NULL;
661 return; 761 /*
662 len = STRLEN(name); 762 * Query resources for options that affect us
663 while ((str = fgets(buffer, sizeof(buffer), stream)) != NULL) { 763 */
664 unsigned int entry, n; 764 for (int entry = 0; entry < ecb_array_length (optList); entry++)
665 765 {
666 while (*str && isspace(*str)) 766 int s;
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; 767 const char *kw = optList[entry].kw;
679 768
680 if (kw == NULL) 769 if (kw == NULL || rs[optList[entry].doff] != NULL)
681 continue; 770 continue; // previously set
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 771
693 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);
694 R->rs[optList[entry].doff] = p; 778 rs[optList[entry].doff] = p;
779
695 if (optList_isBool(entry)) { 780 if (optList_isBool (entry))
696 s = STRCASECMP(str, "TRUE") == 0 781 {
697 || STRCASECMP(str, "YES") == 0 782 s = strcasecmp (p, "TRUE") == 0
698 || STRCASECMP(str, "ON") == 0 783 || strcasecmp (p, "YES") == 0
699 || STRCASECMP(str, "1") == 0; 784 || strcasecmp (p, "ON") == 0
785 || strcasecmp (p, "1") == 0;
786
700 if (optList_isReverse(entry)) 787 if (optList_isReverse (entry))
701 s = !s; 788 s = !s;
702 if (s) 789
703 R->Options |= (optList[entry].flag); 790 set_option (optList[entry].index, s);
704 else 791 }
705 R->Options &= ~(optList[entry].flag); 792 }
706 }
707 }
708 break;
709 }
710 }
711 } 793 }
712 rewind(stream); 794#endif /* NO_RESOURCES */
713} 795}
714 796
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 797void
726rxvt_extract_resources(pR_ Display *display __attribute__((unused)), const char *name) 798rxvt_term::extract_keysym_resources ()
727{ 799{
728#ifndef NO_RESOURCES 800#ifndef NO_RESOURCES
729 801 /*
730# if defined XAPPLOADDIR
731# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
732 /* Compute the path of the possibly available localized Rxvt file */
733 char *localepath = NULL;
734
735 if (R->locale != NULL) { /* XXX: must limit length of string */
736 localepath = (char *)rxvt_malloc(256);
737 sprintf(localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS,
738 (int)(258 - sizeof(XAPPLOADDIRLOCALE) - sizeof(APL_SUBCLASS)),
739 R->locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
740 }
741
742 {
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 802 * [R5 or later]: enumerate the resource database
855 */ 803 */
856# ifdef XrmEnumOneLevel
857# ifdef KEYSYM_RESOURCE 804# ifdef KEYSYM_RESOURCE
805 XrmDatabase database = XrmGetDatabase (dpy);
806 XrmName name_prefix[3];
807 XrmClass class_prefix[3];
808
858 name_prefix[0] = XrmStringToName(name); 809 name_prefix[0] = XrmStringToName (rs[Rs_name]);
859 name_prefix[1] = XrmStringToName("keysym"); 810 name_prefix[1] = XrmStringToName ("keysym");
860 name_prefix[2] = NULLQUARK; 811 name_prefix[2] = NULLQUARK;
861 class_prefix[0] = XrmStringToName(APL_SUBCLASS); 812 class_prefix[0] = XrmStringToName (RESCLASS);
862 class_prefix[1] = XrmStringToName("Keysym"); 813 class_prefix[1] = XrmStringToName ("Keysym");
863 class_prefix[2] = NULLQUARK; 814 class_prefix[2] = NULLQUARK;
864/* XXX: Need to check sizeof(rxvt_t) == sizeof(XPointer) */ 815 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
865 XrmEnumerateDatabase(XrmGetDatabase(display), name_prefix, class_prefix, 816 XrmEnumerateDatabase (database, name_prefix, class_prefix,
866 XrmEnumOneLevel, rxvt_define_key, NULL); 817 XrmEnumOneLevel, rxvt_define_key, NULL);
867 name_prefix[0] = XrmStringToName(APL_CLASS); 818# ifdef RESFALLBACK
868 name_prefix[1] = XrmStringToName("keysym"); 819 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
869 class_prefix[0] = XrmStringToName(APL_CLASS);
870 class_prefix[1] = XrmStringToName("Keysym");
871/* XXX: Need to check sizeof(rxvt_t) == sizeof(XPointer) */ 820 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
872 XrmEnumerateDatabase(XrmGetDatabase(display), name_prefix, class_prefix, 821 XrmEnumerateDatabase (database, name_prefix, class_prefix,
873 XrmEnumOneLevel, rxvt_define_key, NULL); 822 XrmEnumOneLevel, rxvt_define_key, NULL);
874# endif 823# endif
875# endif 824# endif
876 825
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 */ 826#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} 827}
992 828
993/*}}} */
994/*----------------------- end-of-file (C source) -----------------------*/ 829/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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