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.46 by root, Sun Jan 16 19:20:30 2005 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
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-2004 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.
… …
28 *----------------------------------------------------------------------*/ 28 *----------------------------------------------------------------------*/
29 29
30#include "../config.h" /* NECESSARY */ 30#include "../config.h" /* NECESSARY */
31#include "rxvt.h" /* NECESSARY */ 31#include "rxvt.h" /* NECESSARY */
32#include "version.h" 32#include "version.h"
33#include "xdefaults.intpro" /* PROTOS for internal routines */ 33
34#ifdef KEYSYM_RESOURCE
35#include "keyboard.h"
36#endif
34 37
35/* #define DEBUG_RESOURCES */ 38/* #define DEBUG_RESOURCES */
36 39
37static const char *const xnames[2] = { ".Xdefaults", ".Xresources" }; 40static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
38 41
39/*{{{ monolithic option/resource structure: */ 42/*{{{ monolithic option/resource structure: */
40/* 43/*
41 * `string' options MUST have a usage argument 44 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 45 * `switch' and `boolean' options have no argument
43 * if there's no desc(ription), it won't appear in rxvt_usage() 46 * if there's no desc (ription), it won't appear in rxvt_usage ()
44 */ 47 */
45 48
46/* INFO() - descriptive information only */ 49/* INFO () - descriptive information only */
47#define INFO(opt, arg, desc) \ 50#define INFO(opt, arg, desc) \
48 {0, -1, NULL, (opt), (arg), (desc)} 51 {0, -1, NULL, (opt), (arg), (desc)}
49 52
50/* STRG() - command-line option, with/without resource */ 53/* STRG () - command-line option, with/without resource */
51#define STRG(rsp, kw, opt, arg, desc) \ 54#define STRG(rsp, kw, opt, arg, desc) \
52 {0, (rsp), (kw), (opt), (arg), (desc)} 55 {0, (rsp), (kw), (opt), (arg), (desc)}
53 56
54/* RSTRG() - resource/long-option */ 57/* RSTRG () - resource/long-option */
55#define RSTRG(rsp, kw, arg) \ 58#define RSTRG(rsp, kw, arg) \
56 {0, (rsp), (kw), NULL, (arg), NULL} 59 {0, (rsp), (kw), NULL, (arg), NULL}
57 60
58/* BOOL() - regular boolean `-/+' flag */ 61/* BOOL () - regular boolean `-/+' flag */
59#define BOOL(rsp, kw, opt, flag, desc) \ 62#define BOOL(rsp, kw, opt, flag, desc) \
60 {(Opt_Boolean|(flag)), (rsp), (kw), (opt), NULL, (desc)} 63 { (Opt_Boolean| (flag)), (rsp), (kw), (opt), NULL, (desc)}
61 64
62/* SWCH() - `-' flag */ 65/* SWCH () - `-' flag */
63#define SWCH(opt, flag, desc) \ 66#define SWCH(opt, flag, desc) \
64 {(flag), -1, NULL, (opt), NULL, (desc)} 67 { (flag), -1, NULL, (opt), NULL, (desc)}
65 68
66/* convenient macros */ 69/* convenient macros */
67#define optList_strlen(i) \ 70#define optList_strlen(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? STRLEN(optList[i].arg) : 1)) 71 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
69#define optList_isBool(i) \ 72#define optList_isBool(i) \
70 (optList[i].flag & Opt_Boolean) 73 (optList[i].flag & Opt_Boolean)
71#define optList_isReverse(i) \ 74#define optList_isReverse(i) \
72 (optList[i].flag & Opt_Reverse) 75 (optList[i].flag & Opt_Reverse)
73#define optList_size() \ 76#define optList_size() \
74 (sizeof(optList) / sizeof(optList[0])) 77 (sizeof (optList) / sizeof (optList[0]))
75 78
76static const struct 79static const struct
77 { 80 {
78 const unsigned long flag; /* Option flag */ 81 const unsigned long flag; /* Option flag */
79 const int doff; /* data offset */ 82 const int doff; /* data offset */
… …
81 const char *opt; /* option */ 84 const char *opt; /* option */
82 const char *arg; /* argument */ 85 const char *arg; /* argument */
83 const char *desc; /* description */ 86 const char *desc; /* description */
84 } 87 }
85optList[] = { 88optList[] = {
86 STRG(Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 89 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87 STRG(Rs_display_name, NULL, "display", "string", "X server to contact"), 90 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
88 STRG(Rs_term_name, "termName", "tn", "string", 91 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 */ 92 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
91 STRG(Rs_geometry, "geometry", "geometry", "geometry", 93 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"), 94 SWCH ("C", Opt_console, "intercept console messages"),
94 SWCH("iconic", Opt_iconic, "start iconic"), 95 SWCH ("iconic", Opt_iconic, "start iconic"),
95 SWCH("ic", Opt_iconic, NULL), /* short form */ 96 SWCH ("ic", Opt_iconic, NULL), /* short form */
96 BOOL(Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
97 "reverse video"),
98 BOOL(Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
99 BOOL(Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
100#ifdef HAVE_SCROLLBARS 101#ifdef HAVE_SCROLLBARS
101 BOOL(Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
102 BOOL(Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 103 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
103 "scrollbar right"), 104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
104 BOOL(Rs_scrollBar_floating, "scrollBar_floating", "st",
105 Opt_scrollBar_floating, "scrollbar without a trough"),
106#endif 105#endif
107 BOOL(Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
108 NULL),
109 BOOL(Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, 107 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
110 "scroll-on-tty-output inhibit"),
111 BOOL(Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
112 "scroll-on-keypress"),
113 BOOL(Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
114 "scroll-with-buffer"),
115#ifdef TRANSPARENT 110#ifdef TRANSPARENT
116 BOOL(Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
117 "inherit parent pixmap"),
118 BOOL(Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, 112 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
119 "forcefully inherit root pixmap"),
120 SWCH("tr", Opt_transparent, NULL), 113 SWCH ("tr", Opt_transparent, NULL),
114#if TINTING
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
121#endif 116#endif
117#endif
118#ifdef OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."),
120#endif
121#ifdef 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, "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, "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, 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, 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, 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, "triple click word selection"),
142 "triple click word selection"), 139 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
143#endif 140#endif
144#ifdef CURSOR_BLINK 141#ifdef CURSOR_BLINK
145 BOOL(Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 142 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
146#endif 143#endif
147#ifdef POINTER_BLANK 144#ifdef POINTER_BLANK
148 BOOL(Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 145 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"),
149#endif 146#endif
150 STRG(Rs_color + Color_bg, "background", "bg", "color", "background color"), 147 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
151 STRG(Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 148 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
152 RSTRG(Rs_color + minCOLOR + 0, "color0", "color"), 149 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
153 RSTRG(Rs_color + minCOLOR + 1, "color1", "color"), 150 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
154 RSTRG(Rs_color + minCOLOR + 2, "color2", "color"), 151 RSTRG (Rs_color + minCOLOR + 2, "color2", "color"),
155 RSTRG(Rs_color + minCOLOR + 3, "color3", "color"), 152 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
156 RSTRG(Rs_color + minCOLOR + 4, "color4", "color"), 153 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
157 RSTRG(Rs_color + minCOLOR + 5, "color5", "color"), 154 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
158 RSTRG(Rs_color + minCOLOR + 6, "color6", "color"), 155 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
159 RSTRG(Rs_color + minCOLOR + 7, "color7", "color"), 156 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
160#ifndef NO_BRIGHTCOLOR 157#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 */ 166#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#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
183 RSTRG(Rs_path, "path", "search path"), 184 RSTRG (Rs_path, "path", "search path"),
184#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 185#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
185#ifdef XPM_BACKGROUND 186#ifdef XPM_BACKGROUND
186 STRG(Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", 187 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
187 "background pixmap"),
188#endif /* XPM_BACKGROUND */ 188#endif /* XPM_BACKGROUND */
189#if (MENUBAR_MAX) 189#if (MENUBAR_MAX)
190 RSTRG(Rs_menu, "menu", "name[;tag]"), 190 RSTRG (Rs_menu, "menu", "name[;tag]"),
191#endif 191#endif
192 STRG(Rs_font, "font", "fn", "fontname", "normal text font"),
193 /* fonts: command-line option = resource name */ 192 /* fonts: command-line option = resource name */
193 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
194#if ENABLE_STYLES
195 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
196 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
197 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
198#endif
194#ifdef USE_XIM 199#ifdef USE_XIM
195 STRG(Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 200 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
196 STRG(Rs_preeditType, "preeditType", "pt", "style", 201 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) 202#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
199 STRG(Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 203 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
200#endif 204#endif
201#endif /* USE_XIM */ 205#endif /* USE_XIM */
202#ifdef GREEK_SUPPORT 206 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"), 207 STRG (Rs_title, "title", "title", "string", "title name for window"),
210 STRG(Rs_title, NULL, "T", NULL, NULL), /* short form */ 208 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
211 STRG(Rs_iconName, "iconName", "n", "string", "icon name for window"), 209 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212#ifndef NO_CURSORCOLOR 210#ifndef NO_CURSORCOLOR
213 STRG(Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 211 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
214 /* command-line option = resource name */ 212 /* command-line option = resource name */
215 RSTRG(Rs_color + Color_cursor2, "cursorColor2", "color"), 213 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
216#endif /* NO_CURSORCOLOR */ 214#endif /* NO_CURSORCOLOR */
217 STRG(Rs_color + Color_pointer, "pointerColor", "pr", "color", 215 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
218 "pointer color"), 216 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
219 STRG(Rs_color + Color_border, "borderColor", "bd", "color", 217 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
220 "border color"),
221 STRG(Rs_saveLines, "saveLines", "sl", "number", 218 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
222 "number of scrolled lines to save"), 219#if ENABLE_FRILLS
223#ifndef NO_FRILLS
224 STRG(Rs_ext_bwidth, "externalBorder", "w", "number", 220 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), 221 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG(Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 222 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG(Rs_int_bwidth, "internalBorder", "b", "number", 223 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 "internal border in pixels"), 224 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
230#endif
231#ifndef NO_LINESPACE
232 STRG(Rs_lineSpace, "lineSpace", "lsp", "number", 225 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
233 "number of extra pixels between rows"),
234#endif 226#endif
235 STRG(Rs_scrollBar_thickness, "thickness", "sbt", "number", 227 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
236 "scrollbar thickness/width in pixels"),
237#ifdef POINTER_BLANK 228#ifdef POINTER_BLANK
238 RSTRG(Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 229 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
239#endif 230#endif
240#ifndef NO_BACKSPACE_KEY 231#ifndef NO_BACKSPACE_KEY
241 RSTRG(Rs_backspace_key, "backspacekey", "string"), 232 RSTRG (Rs_backspace_key, "backspacekey", "string"),
242#endif 233#endif
243#ifndef NO_DELETE_KEY 234#ifndef NO_DELETE_KEY
244 RSTRG(Rs_delete_key, "deletekey", "string"), 235 RSTRG (Rs_delete_key, "deletekey", "string"),
245#endif 236#endif
246 RSTRG(Rs_selectstyle, "selectstyle", "mode"), 237 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
247 RSTRG(Rs_scrollstyle, "scrollstyle", "mode"), 238 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
248#ifdef HAVE_SCROLLBARS 239#ifdef HAVE_SCROLLBARS
249 RSTRG(Rs_scrollBar_align, "scrollBar_align", "mode"), 240 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
250#endif 241#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"), 246 INFO ("xrm", "string", "X resource"),
261#ifdef CUTCHAR_RESOURCE 247#ifdef CUTCHAR_RESOURCE
262 RSTRG(Rs_cutchars, "cutchars", "string"), 248 RSTRG (Rs_cutchars, "cutchars", "string"),
263#endif /* CUTCHAR_RESOURCE */ 249#endif /* CUTCHAR_RESOURCE */
264#ifdef ACS_ASCII
265 RSTRG(Rs_acs_chars, "acsChars", "string"),
266#endif /* ACS_ASCII */
267 RSTRG(Rs_answerbackstring, "answerbackString", "string"), 250 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251#ifndef NO_SECONDARY_SCREEN
252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
254#endif
268 INFO("e", "command arg ...", "command to execute") 255 INFO ("e", "command arg ...", "command to execute")
269 }; 256 };
270 257
271#undef INFO 258#undef INFO
272#undef STRG 259#undef STRG
273#undef RSTRG 260#undef RSTRG
274#undef SWCH 261#undef SWCH
275#undef BOOL 262#undef BOOL
276/*}}} */ 263/*}}} */
277 264
278static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 265static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
279static const char optionsstring[] = "Options: " 266static const char optionsstring[] = "options: "
267#if XFT
268 "xft,"
269#endif
270#if ENABLE_STYLES
271 "styles,"
272#endif
273#if ENABLE_COMBINING
274 "combining,"
275#endif
276#if TEXT_BLINK
277 "blink,"
278#endif
279#if ISO_14755
280 "iso14755,"
281#endif
282#if UNICODE_3
283 "unicode3,"
284#endif
285 "encodings=eu+vn"
286#if ENCODING_JP
287 "+jp"
288#endif
289#if ENCODING_JP_EXT
290 "+jp-ext"
291#endif
292#if ENCODING_KR
293 "+kr"
294#endif
295#if ENCODING_ZH
296 "+zh"
297#endif
298#if ENCODING_ZH_EXT
299 "+zh-ext"
300#endif
301 ","
302#if OFF_FOCUS_FADING
303 "fade,"
304#endif
280#if defined(XPM_BACKGROUND) 305#if defined(XPM_BACKGROUND)
281 "XPM," 306 "XPM,"
282#endif 307#endif
283#if defined(TRANSPARENT) 308#if defined(TRANSPARENT)
284 "transparent," 309 "transparent,"
285#endif 310#endif
311#if TINTING
312 "tint,"
313#endif
286#if defined(UTMP_SUPPORT) 314#if defined(UTMP_SUPPORT)
287 "utmp," 315 "utmp,"
288#endif 316#endif
289#if defined(MENUBAR) 317#if defined(MENUBAR)
290 "menubar," 318 "menubar,"
291#endif 319#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,"
300#endif
301#if defined(USE_XIM) 320#if defined(USE_XIM)
302 "XIM," 321 "XIM,"
303#endif
304#if defined(MULTICHAR_SET)
305 "multichar_languages,"
306#endif 322#endif
307 "scrollbars=" 323 "scrollbars="
308#if !defined(HAVE_SCROLLBARS) 324#if !defined(HAVE_SCROLLBARS)
309 "NONE" 325 "NONE"
310#else 326#else
327# if defined(PLAIN_SCROLLBAR)
328 "plain"
329# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
330 "+"
331# endif
332# endif
311# if defined(RXVT_SCROLLBAR) 333# if defined(RXVT_SCROLLBAR)
312 "rxvt" 334 "rxvt"
313# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 335# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
314 "+" 336 "+"
315# endif 337# endif
… …
323# if defined(XTERM_SCROLLBAR) 345# if defined(XTERM_SCROLLBAR)
324 "xterm" 346 "xterm"
325# endif 347# endif
326#endif 348#endif
327 "," 349 ","
328#if defined(GREEK_SUPPORT)
329 "Greek,"
330#endif
331#if defined(RXVT_GRAPHICS)
332 "graphics,"
333#endif
334#if defined(NO_BACKSPACE_KEY) 350#if defined(NO_BACKSPACE_KEY)
335 "no_backspace," 351 "no_backspace,"
336#endif 352#endif
337#if defined(NO_DELETE_KEY) 353#if defined(NO_DELETE_KEY)
338 "no_delete," 354 "no_delete,"
339#endif 355#endif
356#if EIGHT_BIT_CONTROLS
357 "8bitctrls,"
358#endif
340#if !defined(NO_STRINGS) 359#if !defined(NO_STRINGS)
341 "strings," 360 "strings,"
342#endif 361#endif
343#if defined(TTY_256COLOR) 362#if defined(ENABLE_FRILLS)
363 "frills,"
364#endif
365#if defined(PREFER_24BIT)
344 "256colour," 366 "24bit,"
367#endif
368#if defined(SELECTION_SCROLLING)
369 "selectionscrolling,"
370#endif
371#if MOUSE_WHEEL
372 "wheel,"
373#endif
374#if MOUSE_SLIP_WHEELING
375 "slipwheel,"
376#endif
377#if defined(SMART_RESIZE)
378 "smart-resize,"
379#endif
380#if defined(CURSOR_BLINK)
381 "cursorBlink,"
382#endif
383#if defined(POINTER_BLANK)
384 "pointerBlank,"
345#endif 385#endif
346#if defined(NO_RESOURCES) 386#if defined(NO_RESOURCES)
347 "NoResources" 387 "NoResources"
348#else 388#else
349# if defined(USE_XGETDEFAULT) 389# if defined(USE_XGETDEFAULT)
… …
357#define INDENT 18 397#define INDENT 18
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)
391 { /* assume regular width */ 430 { /* assume regular width */
392 putc('\n', stderr); 431 rxvt_log ("\n");
393 col = 1 + len; 432 col = 1 + len;
394 } 433 }
434
395 fprintf(stderr, " [-%s%s", (optList_isBool(i) ? "/+" : ""), 435 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
396 optList[i].opt);
397 if (optList_strlen(i)) 436 if (optList_strlen (i))
398 fprintf(stderr, " %s]", optList[i].arg); 437 rxvt_log (" %s]", optList[i].arg);
399 else 438 else
400 fprintf(stderr, "]"); 439 rxvt_log ("]");
401 } 440 }
402 break; 441 break;
403 442
404 case 1: /* full command-line listing */ 443 case 1: /* full command-line listing */
405 fprintf(stderr, " [options] [-e command args]\n\n" 444 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
406 "where options include:\n"); 445
407 for (i = 0; i < optList_size(); i++) 446 for (i = 0; i < optList_size (); i++)
408 if (optList[i].desc != NULL) 447 if (optList[i].desc != NULL)
409 { 448 {
410#ifdef DEBUG_STRICT 449#ifdef DEBUG_STRICT
411 assert(optList[i].opt != NULL); 450 assert (optList[i].opt != NULL);
412#endif 451#endif
413 fprintf(stderr, " %s%s %-*s%s%s\n", 452 rxvt_log (" %s%s %-*s%s%s\n",
414 (optList_isBool(i) ? "-/+" : "-"), optList[i].opt, 453 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
415 (INDENT - STRLEN(optList[i].opt) 454 (INDENT - strlen (optList[i].opt)
416 + (optList_isBool(i) ? 0 : 2)), 455 + (optList_isBool (i) ? 0 : 2)),
417 (optList[i].arg ? optList[i].arg : ""), 456 (optList[i].arg ? optList[i].arg : ""),
418 (optList_isBool(i) ? "turn on/off " : ""), 457 (optList_isBool (i) ? "turn on/off " : ""),
419 optList[i].desc); 458 optList[i].desc);
420 } 459 }
421 fprintf(stderr, "\n --help to list long-options"); 460 rxvt_log ("\n --help to list long-options");
422 break; 461 break;
423 462
424 case 2: /* full resource listing */ 463 case 2: /* full resource listing */
425 fprintf(stderr,
426 " [options] [-e command args]\n\n" 464 rxvt_log (" [options] [-e command args]\n\n"
427 "where resources (long-options) include:\n"); 465 "where resources (long-options) include:\n");
428 466
429 for (i = 0; i < optList_size(); i++) 467 for (i = 0; i < optList_size (); i++)
430 if (optList[i].kw != NULL) 468 if (optList[i].kw != NULL)
431 fprintf(stderr, " %s: %*s%s\n", 469 rxvt_log (" %s: %*s%s\n",
432 optList[i].kw, 470 optList[i].kw,
433 (INDENT - STRLEN(optList[i].kw)), "", /* XXX */ 471 (INDENT - strlen (optList[i].kw)), "", /* XXX */
434 (optList_isBool(i) ? "boolean" : optList[i].arg)); 472 (optList_isBool (i) ? "boolean" : optList[i].arg));
435#ifdef KEYSYM_RESOURCE 473#ifdef KEYSYM_RESOURCE
436 fprintf(stderr, " " "keysym.sym" ": %*s%s\n", 474 rxvt_log (" " "keysym.sym" ": %*s%s\n",
437 (INDENT - sizeof("keysym.sym") + 1), "", /* XXX */ 475 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
438 "keysym"); 476 "keysym");
439#endif 477#endif
440 fprintf(stderr, "\n -help to list options"); 478 rxvt_log ("\n -help to list options");
441 break; 479 break;
442 } 480 }
443 fprintf(stderr, "\n\n"); 481
444 exit(EXIT_FAILURE); 482 rxvt_log ("\n\n");
483 rxvt_exit_failure ();
445 /* NOTREACHED */ 484 /* NOTREACHED */
446} 485}
447 486
448/*}}} */ 487/*}}} */
449 488
… …
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#ifdef DEBUG_RESOURCES
464 fprintf(stderr, "argv[%d] = %s: ", i, opt); 503 fprintf (stderr, "argv[%d] = %s: ", i, opt);
465#endif 504#endif
466 if (*opt == '-') 505 if (*opt == '-')
467 { 506 {
468 flag = On; 507 flag = On;
469 if (*++opt == '-') 508 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);
487 if (!STRCMP(opt, "h")) 526 if (!strcmp (opt, "h"))
488 rxvt_usage(0); 527 rxvt_usage (0);
489 528
490 /* feature: always try to match long-options */ 529 /* feature: always try to match long-options */
491 for (entry = 0; entry < optList_size(); entry++) 530 for (entry = 0; entry < optList_size (); entry++)
492 if ((optList[entry].kw && !STRCMP(opt, optList[entry].kw)) 531 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
493 || (!longopt 532 || (!longopt
494 && optList[entry].opt && !STRCMP(opt, optList[entry].opt))) 533 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
495 break; 534 break;
496 535
497 if (entry < optList_size()) 536 if (entry < optList_size ())
498 { 537 {
499 if (optList_isReverse(entry)) 538 if (optList_isReverse (entry))
500 flag = flag == On ? Off : On; 539 flag = flag == On ? Off : On;
540
501 if (optList_strlen(entry)) 541 if (optList_strlen (entry))
502 { /* string value */
503 const char *str = argv[++i];
504
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))
511 { 542 {
512#ifdef DEBUG_RESOURCES
513 fprintf(stderr, "\"%s\"\n", str);
514#endif
515 rs[optList[entry].doff] = str;
516 /* 543 /*
517 * special cases are handled in main.c:main() to allow 544 * special cases are handled in main.c:main () to allow
518 * X resources to set these values before we settle for 545 * X resources to set these values before we settle for
519 * default values 546 * default values
520 */ 547 */
521 }
522#ifdef DEBUG_RESOURCES
523 else
524 fprintf(stderr, "???\n");
525#endif
526 548
549 if (optList[entry].doff != -1)
550 rs[optList[entry].doff] = flag == On && argv[i+1]
551 ? argv[++i] : 0;
527 } 552 }
528 else 553 else
529 { /* boolean value */ 554 { /* boolean value */
530#ifdef DEBUG_RESOURCES 555#ifdef DEBUG_RESOURCES
531 fprintf(stderr, "boolean (%s,%s) = %s\n", 556 fprintf (stderr, "boolean (%s,%s) = %s\n",
532 optList[entry].opt, optList[entry].kw, flag); 557 optList[entry].opt, optList[entry].kw, flag);
533#endif 558#endif
534 if (flag == On) 559 if (flag == On)
535 Options |= (optList[entry].flag); 560 options |= (optList[entry].flag);
536 else 561 else
537 Options &= ~(optList[entry].flag); 562 options &= ~ (optList[entry].flag);
538 563
539 if (optList[entry].doff != -1) 564 if (optList[entry].doff != -1)
540 rs[optList[entry].doff] = flag; 565 rs[optList[entry].doff] = flag;
541 } 566 }
542 } 567 }
543 else 568 else
544#ifdef KEYSYM_RESOURCE 569#ifdef KEYSYM_RESOURCE
545 /* if (!STRNCMP(opt, "keysym.", sizeof("keysym.") - 1)) */ 570 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
546 if (rxvt_Str_match(opt, "keysym.")) 571 if (rxvt_Str_match (opt, "keysym."))
547 { 572 {
548 const char *str = argv[++i]; 573 const char *str = argv[++i];
549 574
550 if (str != NULL) 575 if (str != NULL)
551 parse_keysym (opt + sizeof("keysym.") - 1, str); 576 parse_keysym (opt + sizeof ("keysym.") - 1, str);
552 } 577 }
553 else 578 else
554#endif 579#endif
580 {
555 bad_option = 1; 581 bad_option = 1;
582 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
583 }
556 } 584 }
557 585
558 if (bad_option) 586 if (bad_option)
559 rxvt_usage(0); 587 rxvt_usage (0);
560} 588}
561 589
562/*}}} */ 590/*}}} */
563 591
564#ifndef NO_RESOURCES 592#ifndef NO_RESOURCES
… …
570 * quarks will be something like 598 * quarks will be something like
571 * "rxvt" "keysym" "0xFF01" 599 * "rxvt" "keysym" "0xFF01"
572 * value will be a string 600 * value will be a string
573 */ 601 */
574/* ARGSUSED */ 602/* ARGSUSED */
575bool 603int
576rxvt_define_key(XrmDatabase *database __attribute__((unused)), XrmBindingList bindings __attribute__((unused)), XrmQuarkList quarks, XrmRepresentation *type __attribute__((unused)), XrmValue *value, XPointer closure __attribute__((unused))) 604rxvt_define_key (XrmDatabase *database __attribute__((unused)),
605 XrmBindingList bindings __attribute__((unused)),
606 XrmQuarkList quarks,
607 XrmRepresentation *type __attribute__((unused)),
608 XrmValue *value,
609 XPointer closure __attribute__((unused)))
577{ 610{
578 int last; 611 int last;
579 612
580 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 613 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
581 ; 614 ;
582 last--; 615 last--;
583 GET_R->parse_keysym (XrmQuarkToString(quarks[last]), (char *)value->addr);//D//TODO 616 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
584 return False; 617 return False;
585} 618}
586 619
587/* 620/*
588 * look for something like this (XK_Delete) 621 * look for something like this (XK_Delete)
… …
591 * arg will be 624 * arg will be
592 * NULL for ~/.Xdefaults and 625 * NULL for ~/.Xdefaults and
593 * non-NULL for command-line options (need to allocate) 626 * non-NULL for command-line options (need to allocate)
594 */ 627 */
595#define NEWARGLIM 500 /* `reasonable' size */ 628#define NEWARGLIM 500 /* `reasonable' size */
629
630struct keysym_vocabulary_t
631{
632 const char *name;
633 unsigned short len;
634 unsigned short value;
635};
636keysym_vocabulary_t keysym_vocabulary[] =
637{
638 { "ISOLevel3", 9, Level3Mask },
639 { "AppKeypad", 9, AppKeypadMask },
640 { "Control", 7, ControlMask },
641 { "NumLock", 7, NumLockMask },
642 { "Shift", 5, ShiftMask },
643 { "Meta", 4, MetaMask },
644 { "Lock", 4, LockMask },
645 { "Mod1", 4, Mod1Mask },
646 { "Mod2", 4, Mod2Mask },
647 { "Mod3", 4, Mod3Mask },
648 { "Mod4", 4, Mod4Mask },
649 { "Mod5", 4, Mod5Mask },
650 { "I", 1, Level3Mask },
651 { "K", 1, AppKeypadMask },
652 { "C", 1, ControlMask },
653 { "N", 1, NumLockMask },
654 { "S", 1, ShiftMask },
655 { "M", 1, MetaMask },
656 { "A", 1, MetaMask },
657 { "L", 1, LockMask },
658 { "1", 1, Mod1Mask },
659 { "2", 1, Mod2Mask },
660 { "3", 1, Mod3Mask },
661 { "4", 1, Mod4Mask },
662 { "5", 1, Mod5Mask },
663};
664
596int 665int
597rxvt_term::parse_keysym (const char *str, const char *arg) 666rxvt_term::parse_keysym (const char *str, const char *arg)
598{ 667{
599 int n, sym; 668 int n, sym;
669 unsigned int state = 0;
670 const char *pmodend = NULL;
600 char *key_string, *newarg = NULL; 671 char *newarg = NULL;
601 char newargstr[NEWARGLIM]; 672 char newargstr[NEWARGLIM];
602 673
603 if (arg == NULL) 674 if (arg == NULL)
604 { 675 {
605 if ((n = rxvt_Str_match(str, "keysym.")) == 0) 676 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
606 return 0; 677 return 0;
678
607 str += n; /* skip `keysym.' */ 679 str += n; /* skip `keysym.' */
680 if ((pmodend = strchr (str, ':')) < str)
681 return -1;
608 } 682 }
609 /* some scanf() have trouble with a 0x prefix */ 683 else
610 if (isdigit(str[0])) 684 pmodend = str + strlen(str);
685
686 for (--pmodend; str < pmodend; --pmodend)
687 if (*pmodend == '-')
688 break;
689
690 while (str < pmodend)
611 { 691 {
692 unsigned int i;
693
694 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
695 {
696 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
697 {
698 state |= keysym_vocabulary[i].value;
699 str += keysym_vocabulary[i].len;
700 break;
701 }
702 }
703
704 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
705 return -1;
706
707 if (*str == '-')
708 ++str;
709 }
710
711 /* some scanf () have trouble with a 0x prefix */
612 if (str[0] == '0' && toupper(str[1]) == 'X') 712 if (str[0] == '0' && toupper (str[1]) == 'X')
713 {
613 str += 2; 714 str += 2;
715
614 if (arg) 716 if (arg)
615 { 717 {
616 if (sscanf(str, (STRCHR(str, ':') ? "%x:" : "%x"), &sym) != 1) 718 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
617 return -1; 719 return -1;
618 } 720 }
619 else 721 else
620 { 722 {
621 if (sscanf(str, "%x:", &sym) != 1) 723 if (sscanf (str, "%x:", &sym) != 1)
622 return -1; 724 return -1;
623 725
624 /* cue to ':', it's there since sscanf() worked */ 726 /* cue to ':', it's there since sscanf () worked */
625 STRNCPY(newargstr, STRCHR(str, ':') + 1, NEWARGLIM - 1); 727 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
626 newargstr[NEWARGLIM - 1] = '\0'; 728 newargstr[NEWARGLIM - 1] = '\0';
627 newarg = newargstr; 729 newarg = newargstr;
628 } 730 }
629 } 731 }
630 else 732 else
631 { 733 {
632 /* 734 /*
633 * convert keysym name to keysym number 735 * convert keysym name to keysym number
634 */ 736 */
635 STRNCPY(newargstr, str, NEWARGLIM - 1); 737 strncpy (newargstr, str, NEWARGLIM - 1);
636 newargstr[NEWARGLIM - 1] = '\0'; 738 newargstr[NEWARGLIM - 1] = '\0';
739
637 if (arg == NULL) 740 if (arg == NULL)
638 { 741 {
639 if ((newarg = STRCHR(newargstr, ':')) == NULL) 742 if ((newarg = strchr (newargstr, ':')) == NULL)
640 return -1; 743 return -1;
744
641 *newarg++ = '\0'; /* terminate keysym name */ 745 *newarg++ = '\0'; /* terminate keysym name */
642 } 746 }
747
643 if ((sym = XStringToKeysym(newargstr)) == None) 748 if ((sym = XStringToKeysym (newargstr)) == None)
644 return -1; 749 return -1;
645 } 750 }
646 751
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) 752 if (newarg == NULL)
654 { 753 {
655 STRNCPY(newargstr, arg, NEWARGLIM - 1); 754 strncpy (newargstr, arg, NEWARGLIM - 1);
656 newargstr[NEWARGLIM - 1] = '\0'; 755 newargstr[NEWARGLIM - 1] = '\0';
657 newarg = newargstr; 756 newarg = newargstr;
658 } 757 }
758
659 rxvt_Str_trim(newarg); 759 rxvt_Str_trim (newarg);
660 if (*newarg == '\0' || (n = rxvt_Str_escaped(newarg)) == 0) 760 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
661 return -1; 761 return -1;
662 MIN_IT(n, 255);
663 key_string = (char *)rxvt_malloc((n + 1) * sizeof(char));
664 762
665 key_string[0] = n; 763 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; 764 return 1;
670} 765}
671 766
672# endif /* KEYSYM_RESOURCE */ 767# endif /* KEYSYM_RESOURCE */
673 768
674# ifndef USE_XGETDEFAULT 769# ifndef USE_XGETDEFAULT
675/*{{{ rxvt_get_xdefaults() */ 770/*{{{ rxvt_get_xdefaults () */
676/* 771/*
677 * the matching algorithm used for memory-save fake resources 772 * the matching algorithm used for memory-save fake resources
678 */ 773 */
679void 774void
680rxvt_term::get_xdefaults (FILE *stream, const char *name) 775rxvt_term::get_xdefaults (FILE *stream, const char *name)
681{ 776{
682 unsigned int len; 777 unsigned int len;
683 char *str, buffer[256]; 778 char *str, buffer[256];
684 779
685 if (stream == NULL) 780 if (stream == NULL)
686 return; 781 return;
687 len = STRLEN(name); 782
783 len = strlen (name);
688 while ((str = fgets(buffer, sizeof(buffer), stream)) != NULL) 784 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
689 { 785 {
690 unsigned int entry, n; 786 unsigned int entry, n;
691 787
692 while (*str && isspace(*str)) 788 while (*str && isspace (*str))
693 str++; /* leading whitespace */ 789 str++; /* leading whitespace */
694 790
695 if ((str[len] != '*' && str[len] != '.') 791 if ((str[len] != '*' && str[len] != '.')
696 || (len && STRNCMP(str, name, len))) 792 || (len && strncmp (str, name, len)))
697 continue; 793 continue;
698 str += (len + 1); /* skip `name*' or `name.' */ 794 str += (len + 1); /* skip `name*' or `name.' */
699 795
700# ifdef KEYSYM_RESOURCE 796# ifdef KEYSYM_RESOURCE
701 if (!parse_keysym (str, NULL)) 797 if (!parse_keysym (str, NULL))
702# endif /* KEYSYM_RESOURCE */ 798# endif /* KEYSYM_RESOURCE */
703 for (entry = 0; entry < optList_size(); entry++) 799 for (entry = 0; entry < optList_size (); entry++)
704 { 800 {
705 const char *kw = optList[entry].kw; 801 const char *kw = optList[entry].kw;
706 802
707 if (kw == NULL) 803 if (kw == NULL)
708 continue; 804 continue;
805
709 n = STRLEN (kw); 806 n = strlen (kw);
710 if (str[n] == ':' && rxvt_Str_match(str, kw)) 807 if (str[n] == ':' && rxvt_Str_match (str, kw))
711 { 808 {
712 /* skip `keyword:' */ 809 /* skip `keyword:' */
713 str += (n + 1); 810 str += n + 1;
714 rxvt_Str_trim(str); 811 rxvt_Str_trim (str);
715 n = STRLEN(str); 812 n = strlen (str);
716 if (n && rs[optList[entry].doff] == NULL) 813 if (n && rs[optList[entry].doff] == NULL)
717 { 814 {
718 /* not already set */ 815 /* not already set */
719 int s; 816 int s;
720 char *p = (char *)rxvt_malloc((n + 1) * sizeof(char)); 817 char *p = 0;
721 818
722 STRCPY(p, str); 819 for (int o = 0;;)
820 {
821 p = (char *)rxvt_realloc (p, o + n + 1);
822 memcpy (p + o, str, n);
823 o += n;
824 p[o] = 0;
825
826 if (o == 0 || p[o - 1] != '\\') // continuation line
827 break;
828
829 o--; // eat "\"
830
831 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
832 break;
833
834 rxvt_Str_trim (str);
835 n = strlen (str);
836 }
837
723 rs[optList[entry].doff] = p; 838 rs[optList[entry].doff] = p;
839 allocated.push_back (p);
840
724 if (optList_isBool(entry)) 841 if (optList_isBool (entry))
725 { 842 {
726 s = STRCASECMP(str, "TRUE") == 0 843 s = strcasecmp (str, "TRUE") == 0
727 || STRCASECMP(str, "YES") == 0 844 || strcasecmp (str, "YES") == 0
728 || STRCASECMP(str, "ON") == 0 845 || strcasecmp (str, "ON") == 0
729 || STRCASECMP(str, "1") == 0; 846 || strcasecmp (str, "1") == 0;
847
730 if (optList_isReverse(entry)) 848 if (optList_isReverse (entry))
731 s = !s; 849 s = !s;
850
732 if (s) 851 if (s)
733 Options |= (optList[entry].flag); 852 options |= optList[entry].flag;
734 else 853 else
735 Options &= ~(optList[entry].flag); 854 options &= ~optList[entry].flag;
736 } 855 }
737 } 856 }
857
738 break; 858 break;
739 } 859 }
740 } 860 }
741 } 861 }
862
742 rewind(stream); 863 rewind (stream);
743} 864}
744 865
745/*}}} */ 866/*}}} */
746# endif /* ! USE_XGETDEFAULT */ 867# endif /* ! USE_XGETDEFAULT */
747#endif /* NO_RESOURCES */ 868#endif /* NO_RESOURCES */
748 869
749/*{{{ read the resources files */ 870/*{{{ read the resources files */
750/* 871/*
751 * using XGetDefault() or the hand-rolled replacement 872 * using XGetDefault () or the hand-rolled replacement
752 */ 873 */
753/* ARGSUSED */ 874/* ARGSUSED */
754void 875void
755rxvt_term::extract_resources (Display *display __attribute__((unused)), const char *name) 876rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name)
756{ 877{
757#ifndef NO_RESOURCES 878#ifndef NO_RESOURCES
758 879
759# if defined XAPPLOADDIR 880# if defined XAPPLOADDIR
760# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 881# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
761 /* Compute the path of the possibly available localized Rxvt file */ 882 /* Compute the path of the possibly available localized Rxvt file */
762 char *localepath = NULL; 883 char *localepath = NULL;
763 884
764 if (locale != NULL) 885 if (locale != NULL)
765 { /* XXX: must limit length of string */ 886 { /* XXX: must limit length of string */
766 localepath = (char *)rxvt_malloc(256); 887 localepath = (char *)rxvt_malloc (256);
767 sprintf(localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, 888 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
768 (int)(258 - sizeof(XAPPLOADDIRLOCALE) - sizeof(APL_SUBCLASS)), 889 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),
769 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 890 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
770 } 891 }
771 892
772 { 893 {
773# endif 894# endif
… …
775 896
776# ifdef USE_XGETDEFAULT 897# ifdef USE_XGETDEFAULT
777 /* 898 /*
778 * get resources using the X library function 899 * get resources using the X library function
779 */ 900 */
780 int entry; 901 int entry;
781 902
782# ifdef XrmEnumOneLevel 903# ifdef XrmEnumOneLevel
783 int i; 904 int i;
784 char *displayResource, *xe; 905 char *displayResource, *xe;
785 XrmName name_prefix[3]; 906 XrmName name_prefix[3];
786 XrmClass class_prefix[3]; 907 XrmClass class_prefix[3];
787 XrmDatabase database, rdb1; 908 XrmDatabase database, rdb1;
788 char fname[1024]; 909 char fname[1024];
789 910
790 XrmInitialize(); 911 XrmInitialize ();
791 database = NULL; 912 database = NULL;
792 913
793 /* Get any Xserver defaults */ 914 /* Get any Xserver defaults */
794 915
795 displayResource = XResourceManagerString(display); 916 displayResource = XResourceManagerString (display);
796 if (displayResource != NULL) 917 if (displayResource != NULL)
797 database = XrmGetStringDatabase(displayResource); 918 database = XrmGetStringDatabase (displayResource);
798 919
799# ifdef HAVE_EXTRA_XRESOURCE_FILES 920# ifdef HAVE_EXTRA_XRESOURCE_FILES
800 /* Add in ~/.Xdefaults or ~/.Xresources */ 921 /* Add in ~/.Xdefaults or ~/.Xresources */
801 { 922 {
802 char *ptr; 923 char *ptr;
803 924
804 if ((ptr = (char *)getenv("HOME")) == NULL) 925 if ((ptr = (char *)getenv ("HOME")) == NULL)
805 ptr = "."; 926 ptr = ".";
806 927
807 for (i = 0; i < (sizeof(xnames) / sizeof(xnames[0])); i++) 928 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
808 { 929 {
809 sprintf(fname, "%-.*s/%s", sizeof(fname) - STRLEN(xnames[i]) - 2, 930 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
810 ptr, xnames[i]); 931 ptr, xnames[i]);
811 if ((rdb1 = XrmGetFileDatabase(fname)) != NULL) 932 if ((rdb1 = XrmGetFileDatabase (fname)))
812 { 933 {
813 XrmMergeDatabases(rdb1, &database); 934 XrmMergeDatabases (rdb1, &database);
814# ifndef HAVE_BOTH_XRESOURCE_FILES 935# ifndef HAVE_BOTH_XRESOURCE_FILES
815 break; 936 break;
816# endif 937# endif
817 938
818 } 939 }
… …
820 } 941 }
821# endif 942# endif
822 943
823 /* Add in XENVIRONMENT file */ 944 /* Add in XENVIRONMENT file */
824 945
825 if ((xe = (char *)getenv("XENVIRONMENT")) != NULL 946 if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
826 && (rdb1 = XrmGetFileDatabase(xe)) != NULL) 947 && (rdb1 = XrmGetFileDatabase (xe)) != NULL)
827 XrmMergeDatabases(rdb1, &database); 948 XrmMergeDatabases (rdb1, &database);
828 949
829 /* Add in Rxvt file */ 950 /* Add in Rxvt file */
830# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 951# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
831 if (localepath == NULL || (rdb1 = XrmGetFileDatabase(localepath)) == NULL) 952 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
832# endif 953# endif
833 rdb1 = XrmGetFileDatabase(XAPPLOADDIR "/" APL_SUBCLASS); 954 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
955
834 if (rdb1 != NULL) 956 if (rdb1 != NULL)
835 XrmMergeDatabases(rdb1, &database); 957 XrmMergeDatabases (rdb1, &database);
836 958
837 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 959 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
838 if ((xe = (char *)getenv("XAPPLRESDIR")) != NULL) 960 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
839 { 961 {
840 sprintf(fname, "%-.*s/" APL_SUBCLASS, sizeof(fname) 962 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
841 - sizeof(APL_SUBCLASS) - 2, xe); 963 - sizeof (RESCLASS) - 2, xe);
842 if ((rdb1 = XrmGetFileDatabase(fname)) != NULL) 964 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
843 XrmMergeDatabases(rdb1, &database); 965 XrmMergeDatabases (rdb1, &database);
844 } 966 }
845 967
846 XrmSetDatabase(display, database); 968 XrmSetDatabase (display, database);
847# endif 969# endif
848 970
849 /* 971 /*
850 * Query resources for options that affect us 972 * Query resources for options that affect us
851 */ 973 */
852 for (entry = 0; entry < optList_size(); entry++) 974 for (entry = 0; entry < optList_size (); entry++)
853 { 975 {
854 int s; 976 int s;
855 char *p, *p0; 977 char *p, *p0;
856 const char *kw = optList[entry].kw; 978 const char *kw = optList[entry].kw;
857 979
858 if (kw == NULL || rs[optList[entry].doff] != NULL) 980 if (kw == NULL || rs[optList[entry].doff] != NULL)
859 continue; /* previously set */ 981 continue; /* previously set */
860 982
861 p = XGetDefault(display, name, kw); 983 p = XGetDefault (display, name, kw);
862 p0 = XGetDefault(display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 984 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
863 if (p == NULL || (p0 && STRCMP(p, p0) == 0)) 985 if (p == NULL || (p0 && strcmp (p, p0) == 0))
864 { 986 {
865 p = XGetDefault(display, APL_SUBCLASS, kw); 987 p = XGetDefault (display, RESCLASS, kw);
988#ifdef RESFALLBACK
866 if (p == NULL || (p0 && STRCMP(p, p0) == 0)) 989 if (p == NULL || (p0 && strcmp (p, p0) == 0))
867 p = XGetDefault(display, APL_CLASS, kw); 990 p = XGetDefault (display, RESFALLBACK, kw);
991#endif
868 } 992 }
993
869 if (p == NULL && p0) 994 if (p == NULL && p0)
870 p = p0; 995 p = p0;
996
871 if (p) 997 if (p)
872 { 998 {
873 rs[optList[entry].doff] = p; 999 rs[optList[entry].doff] = p;
874 1000
875 if (optList_isBool(entry)) 1001 if (optList_isBool (entry))
876 { 1002 {
877 s = STRCASECMP(p, "TRUE") == 0 1003 s = strcasecmp (p, "TRUE") == 0
878 || STRCASECMP(p, "YES") == 0 1004 || strcasecmp (p, "YES") == 0
879 || STRCASECMP(p, "ON") == 0 1005 || strcasecmp (p, "ON") == 0
880 || STRCASECMP(p, "1") == 0; 1006 || strcasecmp (p, "1") == 0;
881 if (optList_isReverse(entry)) 1007 if (optList_isReverse (entry))
882 s = !s; 1008 s = !s;
883 if (s) 1009 if (s)
884 Options |= (optList[entry].flag); 1010 options |= (optList[entry].flag);
885 else 1011 else
886 Options &= ~(optList[entry].flag); 1012 options &= ~ (optList[entry].flag);
887 } 1013 }
888 } 1014 }
889 } 1015 }
890 1016
891 /* 1017 /*
892 * [R5 or later]: enumerate the resource database 1018 * [R5 or later]: enumerate the resource database
893 */ 1019 */
894# ifdef XrmEnumOneLevel 1020# ifdef XrmEnumOneLevel
895# ifdef KEYSYM_RESOURCE 1021# ifdef KEYSYM_RESOURCE
896 name_prefix[0] = XrmStringToName(name); 1022 name_prefix[0] = XrmStringToName (name);
897 name_prefix[1] = XrmStringToName("keysym"); 1023 name_prefix[1] = XrmStringToName ("keysym");
898 name_prefix[2] = NULLQUARK; 1024 name_prefix[2] = NULLQUARK;
899 class_prefix[0] = XrmStringToName(APL_SUBCLASS); 1025 class_prefix[0] = XrmStringToName (RESCLASS);
900 class_prefix[1] = XrmStringToName("Keysym"); 1026 class_prefix[1] = XrmStringToName ("Keysym");
901 class_prefix[2] = NULLQUARK; 1027 class_prefix[2] = NULLQUARK;
902 /* XXX: Need to check sizeof(rxvt_t) == sizeof(XPointer) */ 1028 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
903 XrmEnumerateDatabase(XrmGetDatabase(display), name_prefix, class_prefix, 1029 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
904 XrmEnumOneLevel, rxvt_define_key, NULL); 1030 XrmEnumOneLevel, rxvt_define_key, NULL);
1031# ifdef RESFALLBACK
905 name_prefix[0] = XrmStringToName(APL_CLASS); 1032 name_prefix[0] = XrmStringToName (RESFALLBACK);
906 name_prefix[1] = XrmStringToName("keysym"); 1033 name_prefix[1] = XrmStringToName ("keysym");
907 class_prefix[0] = XrmStringToName(APL_CLASS); 1034 class_prefix[0] = XrmStringToName (RESFALLBACK);
908 class_prefix[1] = XrmStringToName("Keysym"); 1035 class_prefix[1] = XrmStringToName ("Keysym");
909 /* XXX: Need to check sizeof(rxvt_t) == sizeof(XPointer) */ 1036 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
910 XrmEnumerateDatabase(XrmGetDatabase(display), name_prefix, class_prefix, 1037 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
911 XrmEnumOneLevel, rxvt_define_key, NULL); 1038 XrmEnumOneLevel, rxvt_define_key, NULL);
1039# endif
912# endif 1040# endif
913# endif 1041# endif
914 1042
915# else /* USE_XGETDEFAULT */ 1043# else /* USE_XGETDEFAULT */
916 /* get resources the hard way, but save lots of memory */ 1044 /* get resources the hard way, but save lots of memory */
917 FILE *fd = NULL; 1045 FILE *fd = NULL;
918 char *home; 1046 char *home;
919 1047
920 if ((home = getenv("HOME")) != NULL) 1048 if ((home = getenv ("HOME")) != NULL)
921 { 1049 {
922 unsigned int i, len = STRLEN(home) + 2; 1050 unsigned int i, len = strlen (home) + 2;
923 char *f = NULL; 1051 char *f = NULL;
924 1052
925 for (i = 0; i < (sizeof(xnames) / sizeof(xnames[0])); i++) 1053 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
926 { 1054 {
927 f = (char *)rxvt_realloc(f, (len + STRLEN(xnames[i])) * sizeof(char)); 1055 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
928 1056
929 sprintf(f, "%s/%s", home, xnames[i]); 1057 sprintf (f, "%s/%s", home, xnames[i]);
930 1058
931 if ((fd = fopen(f, "r")) != NULL) 1059 if ((fd = fopen (f, "r")) != NULL)
932 break; 1060 break;
933 } 1061 }
934 free(f); 1062 free (f);
935 } 1063 }
936 /* 1064 /*
937 * The normal order to match resources is the following: 1065 * The normal order to match resources is the following:
938 * @ global resources (partial match, ~/.Xdefaults) 1066 * @ global resources (partial match, ~/.Xdefaults)
939 * @ application file resources (XAPPLOADDIR/Rxvt) 1067 * @ application file resources (XAPPLOADDIR/Rxvt)
… …
954 * Also, use a special sub-class so that we can use either or both of 1082 * Also, use a special sub-class so that we can use either or both of
955 * "XTerm" and "Rxvt" as class names. 1083 * "XTerm" and "Rxvt" as class names.
956 */ 1084 */
957 1085
958 get_xdefaults (fd, name); 1086 get_xdefaults (fd, name);
959 get_xdefaults (fd, APL_SUBCLASS); 1087 get_xdefaults (fd, RESCLASS);
1088# ifdef RESFALLBACK
1089 get_xdefaults (fd, RESFALLBACK);
1090# endif
960 1091
961# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) 1092# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
962
963 { 1093 {
964 FILE *ad = NULL; 1094 FILE *ad = NULL;
965 1095
966# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1096# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
967 if (localepath == NULL || (ad = fopen(localepath, "r")) == NULL) 1097 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
968# endif 1098# endif
969 ad = fopen(XAPPLOADDIR "/" APL_SUBCLASS, "r"); 1099 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
970 if (ad != NULL) 1100 if (ad != NULL)
971 { 1101 {
972 get_xdefaults (ad, APL_SUBCLASS); 1102 get_xdefaults (ad, RESCLASS);
973 get_xdefaults (ad, ""); 1103 get_xdefaults (ad, "");
974 fclose(ad); 1104 fclose (ad);
975 } 1105 }
976 } 1106 }
977# endif /* XAPPLOADDIR */ 1107# endif /* XAPPLOADDIR */
978 1108
979 get_xdefaults (fd, APL_CLASS);
980 get_xdefaults (fd, ""); /* partial match */ 1109 get_xdefaults (fd, ""); /* partial match */
981 if (fd != NULL) 1110 if (fd != NULL)
982 fclose(fd); 1111 fclose (fd);
983# endif /* USE_XGETDEFAULT */ 1112# endif /* USE_XGETDEFAULT */
984 1113
985# if defined XAPPLOADDIR 1114# if defined XAPPLOADDIR
986# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1115# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
987 1116
988 } 1117 }
989 1118
990 /* Free the path of the possibly available localized Rxvt file */ 1119 /* Free the path of the possibly available localized Rxvt file */
991 free(localepath); 1120 free (localepath);
992# endif 1121# endif
993# endif 1122# endif
994 1123
995#endif /* NO_RESOURCES */ 1124#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} 1125}
1037 1126
1038/*}}} */ 1127/*}}} */
1039/*----------------------- end-of-file (C source) -----------------------*/ 1128/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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