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.9 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.97 by ayin, Tue May 1 09:34:07 2007 UTC

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

Diff Legend

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