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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.80 by root, Mon Jan 16 15:00:20 2006 UTC

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

Diff Legend

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