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.10 by pcg, Fri Feb 13 12:11:05 2004 UTC vs.
Revision 1.108 by root, Tue Jun 26 00:40:19 2007 UTC

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

Diff Legend

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