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

Diff Legend

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