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.5 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.83 by root, Sat Jan 21 22:38:06 2006 UTC

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

Diff Legend

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