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.8 by pcg, Sat Jan 31 00:20:21 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.8 2004/01/31 00:20:21 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
80 {
77 const unsigned long flag; /* Option flag */ 81 const unsigned long flag; /* Option flag */
78 const int doff; /* data offset */ 82 const int doff; /* data offset */
79 const char *kw; /* keyword */ 83 const char *kw; /* keyword */
80 const char *opt; /* option */ 84 const char *opt; /* option */
81 const char *arg; /* argument */ 85 const char *arg; /* argument */
82 const char *desc; /* description */ 86 const char *desc; /* description */
87 }
83} optList[] = { 88optList[] = {
84 STRG(Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 89 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
85 STRG(Rs_display_name, NULL, "display", "string", "X server to contact"), 90 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
86 STRG(Rs_term_name, "termName", "tn", "string", 91 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
87 "value of the TERM environment variable"),
88 STRG(Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 92 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
89 STRG(Rs_geometry, "geometry", "geometry", "geometry", 93 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
90 "size (in characters) and position"),
91 SWCH("C", Opt_console, "intercept console messages"), 94 SWCH ("C", Opt_console, "intercept console messages"),
92 SWCH("iconic", Opt_iconic, "start iconic"), 95 SWCH ("iconic", Opt_iconic, "start iconic"),
93 SWCH("ic", Opt_iconic, NULL), /* short form */ 96 SWCH ("ic", Opt_iconic, NULL), /* short form */
94 BOOL(Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
95 "reverse video"),
96 BOOL(Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
97 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"),
98#ifdef HAVE_SCROLLBARS 101#ifdef HAVE_SCROLLBARS
99 BOOL(Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
100 BOOL(Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 103 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
101 "scrollbar right"), 104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
102 BOOL(Rs_scrollBar_floating, "scrollBar_floating", "st",
103 Opt_scrollBar_floating, "scrollbar without a trough"),
104#endif 105#endif
105 BOOL(Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
106 NULL),
107 BOOL(Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, 107 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
108 "scroll-on-tty-output inhibit"),
109 BOOL(Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
110 "scroll-on-keypress"),
111 BOOL(Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
112 "scroll-with-buffer"),
113#ifdef TRANSPARENT 110#ifdef TRANSPARENT
114 BOOL(Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
115 "inherit parent pixmap"),
116 BOOL(Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, 112 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
117 "forcefully inherit root pixmap"),
118 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"),
119#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
120 BOOL(Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
121#ifndef NO_BELL 125#ifndef NO_BELL
122 BOOL(Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 126 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
123# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
124 BOOL(Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 128 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL),
125# endif 129# endif
126#endif 130#endif
127#ifdef META8_OPTION 131#ifdef META8_OPTION
128 BOOL(Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 132 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
129#endif 133#endif
130#ifdef MOUSE_WHEEL 134#ifdef MOUSE_WHEEL
131 BOOL(Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 135 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
132 NULL),
133#endif 136#endif
134#ifdef MULTICHAR_SET 137#if ENABLE_FRILLS
135 BOOL(Rs_mc_hack, "multibyte_cursor", "mcc", Opt_mc_hack,
136 "Multibyte character cursor movement"),
137#endif
138#ifndef NO_FRILLS
139 BOOL(Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 138 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
140 "triple click word selection"), 139 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
141#endif 140#endif
142#ifdef CURSOR_BLINK 141#ifdef CURSOR_BLINK
143 BOOL(Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 142 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
144#endif 143#endif
145#ifdef POINTER_BLANK 144#ifdef POINTER_BLANK
146 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"),
147#endif 146#endif
148 STRG(Rs_color + Color_bg, "background", "bg", "color", "background color"), 147 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
149 STRG(Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 148 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
150 RSTRG(Rs_color + minCOLOR + 0, "color0", "color"), 149 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
151 RSTRG(Rs_color + minCOLOR + 1, "color1", "color"), 150 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
152 RSTRG(Rs_color + minCOLOR + 2, "color2", "color"), 151 RSTRG (Rs_color + minCOLOR + 2, "color2", "color"),
153 RSTRG(Rs_color + minCOLOR + 3, "color3", "color"), 152 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
154 RSTRG(Rs_color + minCOLOR + 4, "color4", "color"), 153 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
155 RSTRG(Rs_color + minCOLOR + 5, "color5", "color"), 154 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
156 RSTRG(Rs_color + minCOLOR + 6, "color6", "color"), 155 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
157 RSTRG(Rs_color + minCOLOR + 7, "color7", "color"), 156 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
158#ifndef NO_BRIGHTCOLOR 157#ifndef NO_BRIGHTCOLOR
159 RSTRG(Rs_color + minBrightCOLOR + 0, "color8", "color"), 158 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
160 RSTRG(Rs_color + minBrightCOLOR + 1, "color9", "color"), 159 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
161 RSTRG(Rs_color + minBrightCOLOR + 2, "color10", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
162 RSTRG(Rs_color + minBrightCOLOR + 3, "color11", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
163 RSTRG(Rs_color + minBrightCOLOR + 4, "color12", "color"), 162 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
164 RSTRG(Rs_color + minBrightCOLOR + 5, "color13", "color"), 163 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
165 RSTRG(Rs_color + minBrightCOLOR + 6, "color14", "color"), 164 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
166 RSTRG(Rs_color + minBrightCOLOR + 7, "color15", "color"), 165 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
167#endif /* NO_BRIGHTCOLOR */ 166#endif /* NO_BRIGHTCOLOR */
168#ifndef NO_BOLD_UNDERLINE_REVERSE 167#ifndef NO_BOLD_UNDERLINE_REVERSE
169 RSTRG(Rs_color + Color_BD, "colorBD", "color"), 168 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
169 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
170 RSTRG(Rs_color + Color_UL, "colorUL", "color"), 170 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
171 RSTRG(Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
172#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
173#ifdef KEEP_SCROLLCOLOR 176#ifdef KEEP_SCROLLCOLOR
174 RSTRG(Rs_color + Color_scroll, "scrollColor", "color"), 177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
175 RSTRG(Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
176#endif /* KEEP_SCROLLCOLOR */ 179#endif /* KEEP_SCROLLCOLOR */
177#ifdef OPTION_HC 180#ifdef OPTION_HC
178 STRG(Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
179#endif 182#endif
180#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 183#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
181 RSTRG(Rs_path, "path", "search path"), 184 RSTRG (Rs_path, "path", "search path"),
182#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 185#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
183#ifdef XPM_BACKGROUND 186#ifdef XPM_BACKGROUND
184 STRG(Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", 187 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
185 "background pixmap"),
186#endif /* XPM_BACKGROUND */ 188#endif /* XPM_BACKGROUND */
187#if (MENUBAR_MAX) 189#if (MENUBAR_MAX)
188 RSTRG(Rs_menu, "menu", "name[;tag]"), 190 RSTRG (Rs_menu, "menu", "name[;tag]"),
189#endif 191#endif
192 /* fonts: command-line option = resource name */
190 STRG(Rs_font, "font", "fn", "fontname", "normal text font"), 193 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
191/* fonts: command-line option = resource name */ 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
192#ifdef USE_XIM 199#ifdef USE_XIM
193 STRG(Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 200 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
194 STRG(Rs_preeditType, "preeditType", "pt", "style", 201 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
195 "input style: style = OverTheSpot|OffTheSpot|Root"),
196#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 202#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
197 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"),
198#endif 204#endif
199#endif /* USE_XIM */ 205#endif /* USE_XIM */
200#ifdef GREEK_SUPPORT 206 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
201 STRG(Rs_greek_keyboard, "greek_keyboard", "grk", "mode",
202 "greek keyboard mapping; mode = iso | ibm"),
203 RSTRG(Rs_greektoggle_key, "greektoggle_key", "keysym"),
204#endif
205 STRG(Rs_name, NULL, "name", "string",
206 "client instance, icon, and title strings"),
207 STRG(Rs_title, "title", "title", "string", "title name for window"), 207 STRG (Rs_title, "title", "title", "string", "title name for window"),
208 STRG(Rs_title, NULL, "T", NULL, NULL), /* short form */ 208 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
209 STRG(Rs_iconName, "iconName", "n", "string", "icon name for window"), 209 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
210#ifndef NO_CURSORCOLOR 210#ifndef NO_CURSORCOLOR
211 STRG(Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 211 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
212/* command-line option = resource name */ 212 /* command-line option = resource name */
213 RSTRG(Rs_color + Color_cursor2, "cursorColor2", "color"), 213 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
214#endif /* NO_CURSORCOLOR */ 214#endif /* NO_CURSORCOLOR */
215 STRG(Rs_color + Color_pointer, "pointerColor", "pr", "color", 215 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
216 "pointer color"), 216 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
217 STRG(Rs_color + Color_border, "borderColor", "bd", "color", 217 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
218 "border color"), 218 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
219 STRG(Rs_saveLines, "saveLines", "sl", "number", 219#if ENABLE_FRILLS
220 "number of scrolled lines to save"), 220 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
221#ifndef NO_FRILLS
222 STRG(Rs_ext_bwidth, "externalBorder", "w", "number",
223 "external border in pixels"),
224 STRG(Rs_ext_bwidth, NULL, "bw", NULL, NULL), 221 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
225 STRG(Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 222 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
226 STRG(Rs_int_bwidth, "internalBorder", "b", "number", 223 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
227 "internal border in pixels"), 224 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
225 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
228#endif 226#endif
229#ifndef NO_LINESPACE 227 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
230 STRG(Rs_lineSpace, "lineSpace", "lsp", "number",
231 "number of extra pixels between rows"),
232#endif
233 STRG(Rs_scrollBar_thickness, "thickness", "sbt", "number",
234 "scrollbar thickness/width in pixels"),
235#ifdef POINTER_BLANK 228#ifdef POINTER_BLANK
236 RSTRG(Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 229 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
237#endif 230#endif
238#ifndef NO_BACKSPACE_KEY 231#ifndef NO_BACKSPACE_KEY
239 RSTRG(Rs_backspace_key, "backspacekey", "string"), 232 RSTRG (Rs_backspace_key, "backspacekey", "string"),
240#endif 233#endif
241#ifndef NO_DELETE_KEY 234#ifndef NO_DELETE_KEY
242 RSTRG(Rs_delete_key, "deletekey", "string"), 235 RSTRG (Rs_delete_key, "deletekey", "string"),
243#endif 236#endif
244 RSTRG(Rs_selectstyle, "selectstyle", "mode"), 237 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
245 RSTRG(Rs_scrollstyle, "scrollstyle", "mode"), 238 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
246#ifdef HAVE_SCROLLBARS 239#ifdef HAVE_SCROLLBARS
247 RSTRG(Rs_scrollBar_align, "scrollBar_align", "mode"), 240 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
248#endif 241#endif
249#ifdef PRINTPIPE 242#ifdef PRINTPIPE
250 RSTRG(Rs_print_pipe, "print-pipe", "string"), 243 RSTRG (Rs_print_pipe, "print-pipe", "string"),
251#endif 244#endif
252#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 245 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
253 RSTRG(Rs_bigfont_key, "bigfont_key", "keysym"),
254 RSTRG(Rs_smallfont_key, "smallfont_key", "keysym"),
255#endif
256 STRG(Rs_modifier, "modifier", "mod", "modifier",
257 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
258 INFO("xrm", "string", "X resource"), 246 INFO ("xrm", "string", "X resource"),
259#ifdef CUTCHAR_RESOURCE 247#ifdef CUTCHAR_RESOURCE
260 RSTRG(Rs_cutchars, "cutchars", "string"), 248 RSTRG (Rs_cutchars, "cutchars", "string"),
261#endif /* CUTCHAR_RESOURCE */ 249#endif /* CUTCHAR_RESOURCE */
262#ifdef ACS_ASCII
263 RSTRG(Rs_acs_chars, "acsChars", "string"),
264#endif /* ACS_ASCII */
265 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
266 INFO("e", "command arg ...", "command to execute") 255 INFO ("e", "command arg ...", "command to execute")
267}; 256 };
268 257
269#undef INFO 258#undef INFO
270#undef STRG 259#undef STRG
271#undef RSTRG 260#undef RSTRG
272#undef SWCH 261#undef SWCH
273#undef BOOL 262#undef BOOL
274/*}}} */ 263/*}}} */
275 264
276static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 265static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
277static 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
278#if defined(XPM_BACKGROUND) 305#if defined(XPM_BACKGROUND)
279 "XPM," 306 "XPM,"
280#endif 307#endif
281#if defined(TRANSPARENT) 308#if defined(TRANSPARENT)
282 "transparent," 309 "transparent,"
310#endif
311#if TINTING
312 "tint,"
283#endif 313#endif
284#if defined(UTMP_SUPPORT) 314#if defined(UTMP_SUPPORT)
285 "utmp," 315 "utmp,"
286#endif 316#endif
287#if defined(MENUBAR) 317#if defined(MENUBAR)
288 "menubar," 318 "menubar,"
289#endif
290#if !defined(NO_FRILLS)
291 "frills,"
292#endif
293#if !defined(NO_LINESPACE)
294 "linespace,"
295#endif
296#if defined(PREFER_24BIT)
297 "24bit,"
298#endif 319#endif
299#if defined(USE_XIM) 320#if defined(USE_XIM)
300 "XIM," 321 "XIM,"
301#endif 322#endif
302#if defined(MULTICHAR_SET) 323 "scrollbars="
303 "multichar_languages,"
304#endif
305 "scrollbars="
306#if !defined(HAVE_SCROLLBARS) 324#if !defined(HAVE_SCROLLBARS)
307 "NONE" 325 "NONE"
308#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
309# if defined(RXVT_SCROLLBAR) 333# if defined(RXVT_SCROLLBAR)
310 "rxvt" 334 "rxvt"
311# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 335# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
312 "+" 336 "+"
313# endif 337# endif
314# endif 338# endif
315# if defined(NEXT_SCROLLBAR) 339# if defined(NEXT_SCROLLBAR)
316 "NeXT" 340 "NeXT"
317# if defined(XTERM_SCROLLBAR) 341# if defined(XTERM_SCROLLBAR)
318 "+" 342 "+"
319# endif 343# endif
320# endif 344# endif
321# if defined(XTERM_SCROLLBAR) 345# if defined(XTERM_SCROLLBAR)
322 "xterm" 346 "xterm"
323# endif 347# endif
324#endif 348#endif
325 "," 349 ","
326#if defined(GREEK_SUPPORT)
327 "Greek,"
328#endif
329#if defined(RXVT_GRAPHICS)
330 "graphics,"
331#endif
332#if defined(NO_BACKSPACE_KEY) 350#if defined(NO_BACKSPACE_KEY)
333 "no_backspace," 351 "no_backspace,"
334#endif 352#endif
335#if defined(NO_DELETE_KEY) 353#if defined(NO_DELETE_KEY)
336 "no_delete," 354 "no_delete,"
355#endif
356#if EIGHT_BIT_CONTROLS
357 "8bitctrls,"
337#endif 358#endif
338#if !defined(NO_STRINGS) 359#if !defined(NO_STRINGS)
339 "strings," 360 "strings,"
340#endif 361#endif
341#if defined(TTY_256COLOR) 362#if defined(ENABLE_FRILLS)
342 "256colour," 363 "frills,"
364#endif
365#if defined(PREFER_24BIT)
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,"
343#endif 385#endif
344#if defined(NO_RESOURCES) 386#if defined(NO_RESOURCES)
345 "NoResources" 387 "NoResources"
346#else 388#else
347# if defined(USE_XGETDEFAULT) 389# if defined(USE_XGETDEFAULT)
348 "XGetDefaults" 390 "XGetDefaults"
349# else 391# else
350 ".Xdefaults" 392 ".Xdefaults"
351# endif 393# endif
352#endif 394#endif
353 "\nUsage: "; /* Usage */ 395 "\nUsage: "; /* Usage */
354 396
355#define INDENT 18 397#define INDENT 18
356 398
357/*{{{ usage: */ 399/*{{{ usage: */
358/*----------------------------------------------------------------------*/ 400/*----------------------------------------------------------------------*/
359static void 401static void
360rxvt_usage(int type) 402rxvt_usage (int type)
361{ 403{
362 unsigned int i, col; 404 unsigned int i, col;
363 405
364 write(STDERR_FILENO, releasestring, sizeof(releasestring) - 1); 406 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
365 write(STDERR_FILENO, optionsstring, sizeof(optionsstring) - 1);
366 write(STDERR_FILENO, APL_NAME, sizeof(APL_NAME) - 1);
367 407
368 switch (type) { 408 switch (type)
409 {
369 case 0: /* brief listing */ 410 case 0: /* brief listing */
370 fprintf(stderr, " [-help] [--help]\n"); 411 rxvt_log (" [-help] [--help]\n");
412
371 for (col = 1, i = 0; i < optList_size(); i++) 413 for (col = 1, i = 0; i < optList_size (); i++)
372 if (optList[i].desc != NULL) { 414 if (optList[i].desc != NULL)
415 {
373 int len = 0; 416 int len = 0;
374 417
375 if (!optList_isBool(i)) { 418 if (!optList_isBool (i))
419 {
376 len = optList_strlen(i); 420 len = optList_strlen (i);
377 if (len > 0) 421 if (len > 0)
378 len++; /* account for space */ 422 len++; /* account for space */
379 } 423 }
380#ifdef DEBUG_STRICT 424#ifdef DEBUG_STRICT
381 assert(optList[i].opt != NULL); 425 assert (optList[i].opt != NULL);
382#endif 426#endif
383 len += 4 + STRLEN(optList[i].opt) + (optList_isBool(i) ? 2: 0); 427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
384 col += len; 428 col += len;
385 if (col > 79) { /* assume regular width */ 429 if (col > 79)
386 putc('\n', stderr); 430 { /* assume regular width */
387 col = 1 + len; 431 rxvt_log ("\n");
388 } 432 col = 1 + len;
389 fprintf(stderr, " [-%s%s", (optList_isBool(i) ? "/+" : ""), 433 }
390 optList[i].opt);
391 if (optList_strlen(i))
392 fprintf(stderr, " %s]", optList[i].arg);
393 else
394 fprintf(stderr, "]");
395 }
396 break;
397 434
435 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
436 if (optList_strlen (i))
437 rxvt_log (" %s]", optList[i].arg);
438 else
439 rxvt_log ("]");
440 }
441 break;
442
398 case 1: /* full command-line listing */ 443 case 1: /* full command-line listing */
399 fprintf(stderr, " [options] [-e command args]\n\n" 444 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
400 "where options include:\n"); 445
401 for (i = 0; i < optList_size(); i++) 446 for (i = 0; i < optList_size (); i++)
402 if (optList[i].desc != NULL) { 447 if (optList[i].desc != NULL)
448 {
403#ifdef DEBUG_STRICT 449#ifdef DEBUG_STRICT
404 assert(optList[i].opt != NULL); 450 assert (optList[i].opt != NULL);
405#endif 451#endif
406 fprintf(stderr, " %s%s %-*s%s%s\n", 452 rxvt_log (" %s%s %-*s%s%s\n",
407 (optList_isBool(i) ? "-/+" : "-"), optList[i].opt, 453 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
408 (INDENT - STRLEN(optList[i].opt) 454 (INDENT - strlen (optList[i].opt)
409 + (optList_isBool(i) ? 0 : 2)), 455 + (optList_isBool (i) ? 0 : 2)),
410 (optList[i].arg ? optList[i].arg : ""), 456 (optList[i].arg ? optList[i].arg : ""),
411 (optList_isBool(i) ? "turn on/off " : ""), 457 (optList_isBool (i) ? "turn on/off " : ""),
412 optList[i].desc); 458 optList[i].desc);
413 } 459 }
414 fprintf(stderr, "\n --help to list long-options"); 460 rxvt_log ("\n --help to list long-options");
415 break; 461 break;
416 462
417 case 2: /* full resource listing */ 463 case 2: /* full resource listing */
418 fprintf(stderr,
419 " [options] [-e command args]\n\n" 464 rxvt_log (" [options] [-e command args]\n\n"
420 "where resources (long-options) include:\n"); 465 "where resources (long-options) include:\n");
421 466
422 for (i = 0; i < optList_size(); i++) 467 for (i = 0; i < optList_size (); i++)
423 if (optList[i].kw != NULL) 468 if (optList[i].kw != NULL)
424 fprintf(stderr, " %s: %*s%s\n", 469 rxvt_log (" %s: %*s%s\n",
425 optList[i].kw, 470 optList[i].kw,
426 (INDENT - STRLEN(optList[i].kw)), "", /* XXX */ 471 (INDENT - strlen (optList[i].kw)), "", /* XXX */
427 (optList_isBool(i) ? "boolean" : optList[i].arg)); 472 (optList_isBool (i) ? "boolean" : optList[i].arg));
428#ifdef KEYSYM_RESOURCE 473#ifdef KEYSYM_RESOURCE
429 fprintf(stderr, " " "keysym.sym" ": %*s%s\n", 474 rxvt_log (" " "keysym.sym" ": %*s%s\n",
430 (INDENT - sizeof("keysym.sym") + 1), "", /* XXX */ 475 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
431 "keysym"); 476 "keysym");
432#endif 477#endif
433 fprintf(stderr, "\n -help to list options"); 478 rxvt_log ("\n -help to list options");
434 break; 479 break;
435 } 480 }
436 fprintf(stderr, "\n\n"); 481
437 exit(EXIT_FAILURE); 482 rxvt_log ("\n\n");
483 rxvt_exit_failure ();
438 /* NOTREACHED */ 484 /* NOTREACHED */
439} 485}
440 486
441/*}}} */ 487/*}}} */
442 488
443/*{{{ get command-line options before getting resources */ 489/*{{{ get command-line options before getting resources */
444void 490void
445rxvt_term::get_options (int argc, const char *const *argv) 491rxvt_term::get_options (int argc, const char *const *argv)
446{ 492{
447 int i, bad_option = 0; 493 int i, bad_option = 0;
448 static const char On[3] = "ON", Off[4] = "OFF"; 494 static const char On[3] = "ON", Off[4] = "OFF";
449 495
450 for (i = 1; i < argc; i++) { 496 for (i = 1; i < argc; i++)
497 {
451 unsigned int entry, longopt = 0; 498 unsigned int entry, longopt = 0;
452 const char *flag, *opt; 499 const char *flag, *opt;
453 500
454 opt = argv[i]; 501 opt = argv[i];
455#ifdef DEBUG_RESOURCES 502#ifdef DEBUG_RESOURCES
456 fprintf(stderr, "argv[%d] = %s: ", i, opt); 503 fprintf (stderr, "argv[%d] = %s: ", i, opt);
457#endif 504#endif
458 if (*opt == '-') {
459 flag = On;
460 if (*++opt == '-') 505 if (*opt == '-')
506 {
507 flag = On;
508 if (*++opt == '-')
461 longopt = *opt++; /* long option */ 509 longopt = *opt++; /* long option */
510 }
462 } else if (*opt == '+') { 511 else if (*opt == '+')
512 {
463 flag = Off; 513 flag = Off;
464 if (*++opt == '+') 514 if (*++opt == '+')
465 longopt = *opt++; /* long option */ 515 longopt = *opt++; /* long option */
466 } else { 516 }
517 else
518 {
467 bad_option = 1; 519 bad_option = 1;
468 rxvt_print_error("bad option \"%s\"", opt); 520 rxvt_warn ("\"%s\": malformed option.\n", opt);
469 continue; 521 continue;
470 } 522 }
471 523
472 if (!STRCMP(opt, "help")) 524 if (!strcmp (opt, "help"))
473 rxvt_usage(longopt ? 2 : 1); 525 rxvt_usage (longopt ? 2 : 1);
474 if (!STRCMP(opt, "h")) 526 if (!strcmp (opt, "h"))
475 rxvt_usage(0); 527 rxvt_usage (0);
476 528
477 /* feature: always try to match long-options */ 529 /* feature: always try to match long-options */
478 for (entry = 0; entry < optList_size(); entry++) 530 for (entry = 0; entry < optList_size (); entry++)
479 if ((optList[entry].kw && !STRCMP(opt, optList[entry].kw)) 531 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
480 || (!longopt 532 || (!longopt
481 && optList[entry].opt && !STRCMP(opt, optList[entry].opt))) 533 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
482 break; 534 break;
483 535
484 if (entry < optList_size()) { 536 if (entry < optList_size ())
537 {
485 if (optList_isReverse(entry)) 538 if (optList_isReverse (entry))
486 flag = flag == On ? Off : On; 539 flag = flag == On ? Off : On;
487 if (optList_strlen(entry)) { /* string value */
488 const char *str = argv[++i];
489 540
541 if (optList_strlen (entry))
542 {
543 /*
544 * special cases are handled in main.c:main () to allow
545 * X resources to set these values before we settle for
546 * default values
547 */
548
549 if (optList[entry].doff != -1)
550 rs[optList[entry].doff] = flag == On && argv[i+1]
551 ? argv[++i] : 0;
552 }
553 else
554 { /* boolean value */
490#ifdef DEBUG_RESOURCES 555#ifdef DEBUG_RESOURCES
491 fprintf(stderr, "string (%s,%s) = ",
492 optList[entry].opt ? optList[entry].opt : "nil",
493 optList[entry].kw ? optList[entry].kw : "nil");
494#endif
495 if (flag == On && str && (optList[entry].doff != -1)) {
496#ifdef DEBUG_RESOURCES
497 fprintf(stderr, "\"%s\"\n", str);
498#endif
499 rs[optList[entry].doff] = str;
500 /*
501 * special cases are handled in main.c:main() to allow
502 * X resources to set these values before we settle for
503 * default values
504 */
505 }
506#ifdef DEBUG_RESOURCES
507 else
508 fprintf(stderr, "???\n");
509#endif
510 } else { /* boolean value */
511#ifdef DEBUG_RESOURCES
512 fprintf(stderr, "boolean (%s,%s) = %s\n", 556 fprintf (stderr, "boolean (%s,%s) = %s\n",
513 optList[entry].opt, optList[entry].kw, flag); 557 optList[entry].opt, optList[entry].kw, flag);
514#endif 558#endif
515 if (flag == On) 559 if (flag == On)
516 Options |= (optList[entry].flag); 560 options |= (optList[entry].flag);
517 else 561 else
518 Options &= ~(optList[entry].flag); 562 options &= ~ (optList[entry].flag);
519 563
520 if (optList[entry].doff != -1) 564 if (optList[entry].doff != -1)
521 rs[optList[entry].doff] = flag; 565 rs[optList[entry].doff] = flag;
522 } 566 }
523 } else 567 }
568 else
524#ifdef KEYSYM_RESOURCE 569#ifdef KEYSYM_RESOURCE
525 /* if (!STRNCMP(opt, "keysym.", sizeof("keysym.") - 1)) */ 570 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
526 if (rxvt_Str_match(opt, "keysym.")) { 571 if (rxvt_Str_match (opt, "keysym."))
572 {
527 const char *str = argv[++i]; 573 const char *str = argv[++i];
528 574
529 if (str != NULL) 575 if (str != NULL)
530 parse_keysym (opt + sizeof("keysym.") - 1, str); 576 parse_keysym (opt + sizeof ("keysym.") - 1, str);
531 } else 577 }
578 else
532#endif 579#endif
580 {
533 bad_option = 1; 581 bad_option = 1;
582 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
583 }
534 } 584 }
535 585
536 if (bad_option) 586 if (bad_option)
537 rxvt_usage(0); 587 rxvt_usage (0);
538} 588}
539 589
540/*}}} */ 590/*}}} */
541 591
542#ifndef NO_RESOURCES 592#ifndef NO_RESOURCES
… …
548 * quarks will be something like 598 * quarks will be something like
549 * "rxvt" "keysym" "0xFF01" 599 * "rxvt" "keysym" "0xFF01"
550 * value will be a string 600 * value will be a string
551 */ 601 */
552/* ARGSUSED */ 602/* ARGSUSED */
553bool 603int
554rxvt_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)))
555{ 610{
556 int last; 611 int last;
557 612
558 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 */
559 ; 614 ;
560 last--; 615 last--;
561 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
562 return False; 617 return False;
563} 618}
564 619
565/* 620/*
566 * look for something like this (XK_Delete) 621 * look for something like this (XK_Delete)
567 * rxvt*keysym.0xFFFF: "\177" 622 * rxvt*keysym.0xFFFF: "\177"
… …
569 * arg will be 624 * arg will be
570 * NULL for ~/.Xdefaults and 625 * NULL for ~/.Xdefaults and
571 * non-NULL for command-line options (need to allocate) 626 * non-NULL for command-line options (need to allocate)
572 */ 627 */
573#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
574int 665int
575rxvt_term::parse_keysym (const char *str, const char *arg) 666rxvt_term::parse_keysym (const char *str, const char *arg)
576{ 667{
577 int n, sym; 668 int n, sym;
669 unsigned int state = 0;
670 const char *pmodend = NULL;
578 char *key_string, *newarg = NULL; 671 char *newarg = NULL;
579 char newargstr[NEWARGLIM]; 672 char newargstr[NEWARGLIM];
580 673
581 if (arg == NULL) { 674 if (arg == NULL)
675 {
582 if ((n = rxvt_Str_match(str, "keysym.")) == 0) 676 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
583 return 0; 677 return 0;
678
584 str += n; /* skip `keysym.' */ 679 str += n; /* skip `keysym.' */
680 if ((pmodend = strchr (str, ':')) < str)
681 return -1;
585 } 682 }
586/* some scanf() have trouble with a 0x prefix */ 683 else
587 if (isdigit(str[0])) { 684 pmodend = str + strlen(str);
588 if (str[0] == '0' && toupper(str[1]) == 'X')
589 str += 2;
590 if (arg) {
591 if (sscanf(str, (STRCHR(str, ':') ? "%x:" : "%x"), &sym) != 1)
592 return -1;
593 } else {
594 if (sscanf(str, "%x:", &sym) != 1)
595 return -1;
596 685
597 /* cue to ':', it's there since sscanf() worked */ 686 for (--pmodend; str < pmodend; --pmodend)
598 STRNCPY(newargstr, STRCHR(str, ':') + 1, NEWARGLIM - 1); 687 if (*pmodend == '-')
599 newargstr[NEWARGLIM - 1] = '\0'; 688 break;
600 newarg = newargstr; 689
601 } 690 while (str < pmodend)
602 } else { 691 {
603 /* 692 unsigned int i;
604 * convert keysym name to keysym number 693
605 */ 694 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
606 STRNCPY(newargstr, str, NEWARGLIM - 1); 695 {
607 newargstr[NEWARGLIM - 1] = '\0'; 696 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
608 if (arg == NULL) { 697 {
609 if ((newarg = STRCHR(newargstr, ':')) == NULL) 698 state |= keysym_vocabulary[i].value;
610 return -1; 699 str += keysym_vocabulary[i].len;
611 *newarg++ = '\0'; /* terminate keysym name */ 700 break;
612 } 701 }
613 if ((sym = XStringToKeysym(newargstr)) == None) 702 }
703
704 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
614 return -1; 705 return -1;
706
707 if (*str == '-')
708 ++str;
615 } 709 }
616 710
617 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */ 711 /* some scanf () have trouble with a 0x prefix */
618 return -1; 712 if (str[0] == '0' && toupper (str[1]) == 'X')
619 sym &= 0xFF; 713 {
620 if (Keysym_map[sym] != NULL) /* already set ? */ 714 str += 2;
621 return -1;
622 715
623 if (newarg == NULL) { 716 if (arg)
624 STRNCPY(newargstr, arg, NEWARGLIM - 1); 717 {
718 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
719 return -1;
720 }
721 else
722 {
723 if (sscanf (str, "%x:", &sym) != 1)
724 return -1;
725
726 /* cue to ':', it's there since sscanf () worked */
727 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
625 newargstr[NEWARGLIM - 1] = '\0'; 728 newargstr[NEWARGLIM - 1] = '\0';
626 newarg = newargstr; 729 newarg = newargstr;
730 }
627 } 731 }
732 else
733 {
734 /*
735 * convert keysym name to keysym number
736 */
737 strncpy (newargstr, str, NEWARGLIM - 1);
738 newargstr[NEWARGLIM - 1] = '\0';
739
740 if (arg == NULL)
741 {
742 if ((newarg = strchr (newargstr, ':')) == NULL)
743 return -1;
744
745 *newarg++ = '\0'; /* terminate keysym name */
746 }
747
748 if ((sym = XStringToKeysym (newargstr)) == None)
749 return -1;
750 }
751
752 if (newarg == NULL)
753 {
754 strncpy (newargstr, arg, NEWARGLIM - 1);
755 newargstr[NEWARGLIM - 1] = '\0';
756 newarg = newargstr;
757 }
758
628 rxvt_Str_trim(newarg); 759 rxvt_Str_trim (newarg);
629 if (*newarg == '\0' || (n = rxvt_Str_escaped(newarg)) == 0) 760 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
630 return -1;
631 MIN_IT(n, 255);
632 key_string = (char *)rxvt_malloc((n + 1) * sizeof(char));
633
634 key_string[0] = n;
635 STRNCPY(key_string + 1, newarg, n);
636 Keysym_map[sym] = (unsigned char *)key_string;
637
638 return 1; 761 return -1;
762
763 keyboard->register_user_translation (sym, state, newarg);
764 return 1;
639} 765}
640 766
641# endif /* KEYSYM_RESOURCE */ 767# endif /* KEYSYM_RESOURCE */
642 768
643# ifndef USE_XGETDEFAULT 769# ifndef USE_XGETDEFAULT
644/*{{{ rxvt_get_xdefaults() */ 770/*{{{ rxvt_get_xdefaults () */
645/* 771/*
646 * the matching algorithm used for memory-save fake resources 772 * the matching algorithm used for memory-save fake resources
647 */ 773 */
648void 774void
649rxvt_term::get_xdefaults (FILE *stream, const char *name) 775rxvt_term::get_xdefaults (FILE *stream, const char *name)
650{ 776{
651 unsigned int len; 777 unsigned int len;
652 char *str, buffer[256]; 778 char *str, buffer[256];
653 779
654 if (stream == NULL) 780 if (stream == NULL)
655 return; 781 return;
656 len = STRLEN(name); 782
783 len = strlen (name);
657 while ((str = fgets(buffer, sizeof(buffer), stream)) != NULL) { 784 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
785 {
658 unsigned int entry, n; 786 unsigned int entry, n;
659 787
660 while (*str && isspace(*str)) 788 while (*str && isspace (*str))
661 str++; /* leading whitespace */ 789 str++; /* leading whitespace */
662 790
663 if ((str[len] != '*' && str[len] != '.') 791 if ((str[len] != '*' && str[len] != '.')
664 || (len && STRNCMP(str, name, len))) 792 || (len && strncmp (str, name, len)))
665 continue; 793 continue;
666 str += (len + 1); /* skip `name*' or `name.' */ 794 str += (len + 1); /* skip `name*' or `name.' */
667 795
668# ifdef KEYSYM_RESOURCE 796# ifdef KEYSYM_RESOURCE
669 if (!parse_keysym (str, NULL)) 797 if (!parse_keysym (str, NULL))
670# endif /* KEYSYM_RESOURCE */ 798# endif /* KEYSYM_RESOURCE */
671 for (entry = 0; entry < optList_size(); entry++) { 799 for (entry = 0; entry < optList_size (); entry++)
800 {
672 const char *kw = optList[entry].kw; 801 const char *kw = optList[entry].kw;
673 802
674 if (kw == NULL) 803 if (kw == NULL)
675 continue; 804 continue;
676 n = STRLEN (kw); 805
806 n = strlen (kw);
677 if (str[n] == ':' && rxvt_Str_match(str, kw)) { 807 if (str[n] == ':' && rxvt_Str_match (str, kw))
808 {
678 /* skip `keyword:' */ 809 /* skip `keyword:' */
679 str += (n + 1); 810 str += n + 1;
680 rxvt_Str_trim(str); 811 rxvt_Str_trim (str);
681 n = STRLEN(str); 812 n = strlen (str);
682 if (n && rs[optList[entry].doff] == NULL) { 813 if (n && rs[optList[entry].doff] == NULL)
683 /* not already set */ 814 {
684 int s; 815 /* not already set */
685 char *p = (char *)rxvt_malloc((n + 1) * sizeof(char)); 816 int s;
817 char *p = 0;
686 818
687 STRCPY(p, str); 819 for (int o = 0;;)
688 rs[optList[entry].doff] = p; 820 {
689 if (optList_isBool(entry)) { 821 p = (char *)rxvt_realloc (p, o + n + 1);
690 s = STRCASECMP(str, "TRUE") == 0 822 memcpy (p + o, str, n);
691 || STRCASECMP(str, "YES") == 0 823 o += n;
692 || STRCASECMP(str, "ON") == 0 824 p[o] = 0;
693 || STRCASECMP(str, "1") == 0; 825
694 if (optList_isReverse(entry)) 826 if (o == 0 || p[o - 1] != '\\') // continuation line
695 s = !s; 827 break;
696 if (s) 828
697 Options |= (optList[entry].flag); 829 o--; // eat "\"
698 else 830
699 Options &= ~(optList[entry].flag); 831 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
700 } 832 break;
701 } 833
702 break; 834 rxvt_Str_trim (str);
703 } 835 n = strlen (str);
704 } 836 }
837
838 rs[optList[entry].doff] = p;
839 allocated.push_back (p);
840
841 if (optList_isBool (entry))
842 {
843 s = strcasecmp (str, "TRUE") == 0
844 || strcasecmp (str, "YES") == 0
845 || strcasecmp (str, "ON") == 0
846 || strcasecmp (str, "1") == 0;
847
848 if (optList_isReverse (entry))
849 s = !s;
850
851 if (s)
852 options |= optList[entry].flag;
853 else
854 options &= ~optList[entry].flag;
855 }
856 }
857
858 break;
859 }
860 }
705 } 861 }
862
706 rewind(stream); 863 rewind (stream);
707} 864}
708 865
709/*}}} */ 866/*}}} */
710# endif /* ! USE_XGETDEFAULT */ 867# endif /* ! USE_XGETDEFAULT */
711#endif /* NO_RESOURCES */ 868#endif /* NO_RESOURCES */
712 869
713/*{{{ read the resources files */ 870/*{{{ read the resources files */
714/* 871/*
715 * using XGetDefault() or the hand-rolled replacement 872 * using XGetDefault () or the hand-rolled replacement
716 */ 873 */
717/* ARGSUSED */ 874/* ARGSUSED */
718void 875void
719rxvt_term::extract_resources (Display *display __attribute__((unused)), const char *name) 876rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name)
720{ 877{
721#ifndef NO_RESOURCES 878#ifndef NO_RESOURCES
722 879
723# if defined XAPPLOADDIR 880# if defined XAPPLOADDIR
724# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 881# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
725 /* Compute the path of the possibly available localized Rxvt file */ 882 /* Compute the path of the possibly available localized Rxvt file */
726 char *localepath = NULL; 883 char *localepath = NULL;
727 884
885 if (locale != NULL)
728 if (locale != NULL) { /* XXX: must limit length of string */ 886 { /* XXX: must limit length of string */
729 localepath = (char *)rxvt_malloc(256); 887 localepath = (char *)rxvt_malloc (256);
730 sprintf(localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, 888 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
731 (int)(258 - sizeof(XAPPLOADDIRLOCALE) - sizeof(APL_SUBCLASS)), 889 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),
732 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 890 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
733 } 891 }
734 892
735 { 893 {
736# endif 894# endif
737# endif 895# endif
738 896
739# ifdef USE_XGETDEFAULT 897# ifdef USE_XGETDEFAULT
740/* 898 /*
741 * get resources using the X library function 899 * get resources using the X library function
742 */ 900 */
743 int entry; 901 int entry;
744 902
745# ifdef XrmEnumOneLevel 903# ifdef XrmEnumOneLevel
746 int i; 904 int i;
747 char *displayResource, *xe; 905 char *displayResource, *xe;
748 XrmName name_prefix[3]; 906 XrmName name_prefix[3];
749 XrmClass class_prefix[3]; 907 XrmClass class_prefix[3];
750 XrmDatabase database, rdb1; 908 XrmDatabase database, rdb1;
751 char fname[1024]; 909 char fname[1024];
752 910
753 XrmInitialize(); 911 XrmInitialize ();
754 database = NULL; 912 database = NULL;
755 913
756/* Get any Xserver defaults */ 914 /* Get any Xserver defaults */
757 915
758 displayResource = XResourceManagerString(display); 916 displayResource = XResourceManagerString (display);
759 if (displayResource != NULL) 917 if (displayResource != NULL)
760 database = XrmGetStringDatabase(displayResource); 918 database = XrmGetStringDatabase (displayResource);
761 919
762# ifdef HAVE_EXTRA_XRESOURCE_FILES 920# ifdef HAVE_EXTRA_XRESOURCE_FILES
763/* Add in ~/.Xdefaults or ~/.Xresources */ 921 /* Add in ~/.Xdefaults or ~/.Xresources */
764 { 922 {
765 char *ptr; 923 char *ptr;
766 924
767 if ((ptr = (char *)getenv("HOME")) == NULL) 925 if ((ptr = (char *)getenv ("HOME")) == NULL)
768 ptr = "."; 926 ptr = ".";
769 927
770 for (i = 0; i < (sizeof(xnames) / sizeof(xnames[0])); i++) { 928 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
929 {
771 sprintf(fname, "%-.*s/%s", sizeof(fname) - STRLEN(xnames[i]) - 2, 930 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
772 ptr, xnames[i]); 931 ptr, xnames[i]);
773 if ((rdb1 = XrmGetFileDatabase(fname)) != NULL) { 932 if ((rdb1 = XrmGetFileDatabase (fname)))
933 {
774 XrmMergeDatabases(rdb1, &database); 934 XrmMergeDatabases (rdb1, &database);
775# ifndef HAVE_BOTH_XRESOURCE_FILES 935# ifndef HAVE_BOTH_XRESOURCE_FILES
776 break; 936 break;
777# endif 937# endif
778 } 938
779 } 939 }
940 }
780 } 941 }
781# endif 942# endif
782 943
783/* Add in XENVIRONMENT file */ 944 /* Add in XENVIRONMENT file */
784 945
785 if ((xe = (char *)getenv("XENVIRONMENT")) != NULL 946 if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
786 && (rdb1 = XrmGetFileDatabase(xe)) != NULL) 947 && (rdb1 = XrmGetFileDatabase (xe)) != NULL)
787 XrmMergeDatabases(rdb1, &database); 948 XrmMergeDatabases (rdb1, &database);
788 949
789/* Add in Rxvt file */ 950 /* Add in Rxvt file */
790# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 951# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
791 if (localepath == NULL || (rdb1 = XrmGetFileDatabase(localepath)) == NULL) 952 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
792# endif 953# endif
793 rdb1 = XrmGetFileDatabase(XAPPLOADDIR "/" APL_SUBCLASS); 954 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
955
794 if (rdb1 != NULL) 956 if (rdb1 != NULL)
795 XrmMergeDatabases(rdb1, &database); 957 XrmMergeDatabases (rdb1, &database);
796 958
797/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 959 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
798 if ((xe = (char *)getenv("XAPPLRESDIR")) != NULL) { 960 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
961 {
799 sprintf(fname, "%-.*s/" APL_SUBCLASS, sizeof(fname) 962 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
800 - sizeof(APL_SUBCLASS) - 2, xe); 963 - sizeof (RESCLASS) - 2, xe);
801 if ((rdb1 = XrmGetFileDatabase(fname)) != NULL) 964 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
802 XrmMergeDatabases(rdb1, &database); 965 XrmMergeDatabases (rdb1, &database);
803 } 966 }
804 967
805 XrmSetDatabase(display, database); 968 XrmSetDatabase (display, database);
806# endif 969# endif
807 970
808/* 971 /*
809 * Query resources for options that affect us 972 * Query resources for options that affect us
810 */ 973 */
811 for (entry = 0; entry < optList_size(); entry++) { 974 for (entry = 0; entry < optList_size (); entry++)
975 {
812 int s; 976 int s;
813 char *p, *p0; 977 char *p, *p0;
814 const char *kw = optList[entry].kw; 978 const char *kw = optList[entry].kw;
815 979
816 if (kw == NULL || rs[optList[entry].doff] != NULL) 980 if (kw == NULL || rs[optList[entry].doff] != NULL)
817 continue; /* previously set */ 981 continue; /* previously set */
818 982
819 p = XGetDefault(display, name, kw); 983 p = XGetDefault (display, name, kw);
820 p0 = XGetDefault(display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 984 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
821 if (p == NULL || (p0 && STRCMP(p, p0) == 0)) {
822 p = XGetDefault(display, APL_SUBCLASS, kw);
823 if (p == NULL || (p0 && STRCMP(p, p0) == 0)) 985 if (p == NULL || (p0 && strcmp (p, p0) == 0))
986 {
824 p = XGetDefault(display, APL_CLASS, kw); 987 p = XGetDefault (display, RESCLASS, kw);
825 } 988#ifdef RESFALLBACK
989 if (p == NULL || (p0 && strcmp (p, p0) == 0))
990 p = XGetDefault (display, RESFALLBACK, kw);
991#endif
992 }
993
826 if (p == NULL && p0) 994 if (p == NULL && p0)
827 p = p0; 995 p = p0;
828 if (p) { 996
997 if (p)
998 {
829 rs[optList[entry].doff] = p; 999 rs[optList[entry].doff] = p;
830 1000
831 if (optList_isBool(entry)) { 1001 if (optList_isBool (entry))
832 s = STRCASECMP(p, "TRUE") == 0 1002 {
833 || STRCASECMP(p, "YES") == 0 1003 s = strcasecmp (p, "TRUE") == 0
834 || STRCASECMP(p, "ON") == 0 1004 || strcasecmp (p, "YES") == 0
835 || STRCASECMP(p, "1") == 0; 1005 || strcasecmp (p, "ON") == 0
1006 || strcasecmp (p, "1") == 0;
836 if (optList_isReverse(entry)) 1007 if (optList_isReverse (entry))
837 s = !s; 1008 s = !s;
838 if (s) 1009 if (s)
839 Options |= (optList[entry].flag); 1010 options |= (optList[entry].flag);
840 else 1011 else
841 Options &= ~(optList[entry].flag); 1012 options &= ~ (optList[entry].flag);
842 } 1013 }
843 } 1014 }
844 } 1015 }
845 1016
846/* 1017 /*
847 * [R5 or later]: enumerate the resource database 1018 * [R5 or later]: enumerate the resource database
848 */ 1019 */
849# ifdef XrmEnumOneLevel 1020# ifdef XrmEnumOneLevel
850# ifdef KEYSYM_RESOURCE 1021# ifdef KEYSYM_RESOURCE
851 name_prefix[0] = XrmStringToName(name); 1022 name_prefix[0] = XrmStringToName (name);
852 name_prefix[1] = XrmStringToName("keysym"); 1023 name_prefix[1] = XrmStringToName ("keysym");
853 name_prefix[2] = NULLQUARK; 1024 name_prefix[2] = NULLQUARK;
854 class_prefix[0] = XrmStringToName(APL_SUBCLASS); 1025 class_prefix[0] = XrmStringToName (RESCLASS);
855 class_prefix[1] = XrmStringToName("Keysym"); 1026 class_prefix[1] = XrmStringToName ("Keysym");
856 class_prefix[2] = NULLQUARK; 1027 class_prefix[2] = NULLQUARK;
857/* XXX: Need to check sizeof(rxvt_t) == sizeof(XPointer) */ 1028 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
858 XrmEnumerateDatabase(XrmGetDatabase(display), name_prefix, class_prefix, 1029 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
859 XrmEnumOneLevel, rxvt_define_key, NULL); 1030 XrmEnumOneLevel, rxvt_define_key, NULL);
1031# ifdef RESFALLBACK
860 name_prefix[0] = XrmStringToName(APL_CLASS); 1032 name_prefix[0] = XrmStringToName (RESFALLBACK);
861 name_prefix[1] = XrmStringToName("keysym"); 1033 name_prefix[1] = XrmStringToName ("keysym");
862 class_prefix[0] = XrmStringToName(APL_CLASS); 1034 class_prefix[0] = XrmStringToName (RESFALLBACK);
863 class_prefix[1] = XrmStringToName("Keysym"); 1035 class_prefix[1] = XrmStringToName ("Keysym");
864/* XXX: Need to check sizeof(rxvt_t) == sizeof(XPointer) */ 1036 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
865 XrmEnumerateDatabase(XrmGetDatabase(display), name_prefix, class_prefix, 1037 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
866 XrmEnumOneLevel, rxvt_define_key, NULL); 1038 XrmEnumOneLevel, rxvt_define_key, NULL);
1039# endif
867# endif 1040# endif
868# endif 1041# endif
869 1042
870# else /* USE_XGETDEFAULT */ 1043# else /* USE_XGETDEFAULT */
871/* get resources the hard way, but save lots of memory */ 1044 /* get resources the hard way, but save lots of memory */
872 FILE *fd = NULL; 1045 FILE *fd = NULL;
873 char *home; 1046 char *home;
874 1047
875 if ((home = getenv("HOME")) != NULL) { 1048 if ((home = getenv ("HOME")) != NULL)
1049 {
876 unsigned int i, len = STRLEN(home) + 2; 1050 unsigned int i, len = strlen (home) + 2;
877 char *f = NULL; 1051 char *f = NULL;
878 1052
879 for (i = 0; i < (sizeof(xnames) / sizeof(xnames[0])); i++) { 1053 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
1054 {
880 f = (char *)rxvt_realloc(f, (len + STRLEN(xnames[i])) * sizeof(char)); 1055 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
881 1056
882 sprintf(f, "%s/%s", home, xnames[i]); 1057 sprintf (f, "%s/%s", home, xnames[i]);
883 1058
884 if ((fd = fopen(f, "r")) != NULL) 1059 if ((fd = fopen (f, "r")) != NULL)
885 break; 1060 break;
886 } 1061 }
887 free(f); 1062 free (f);
888 } 1063 }
889/* 1064 /*
890 * The normal order to match resources is the following: 1065 * The normal order to match resources is the following:
891 * @ global resources (partial match, ~/.Xdefaults) 1066 * @ global resources (partial match, ~/.Xdefaults)
892 * @ application file resources (XAPPLOADDIR/Rxvt) 1067 * @ application file resources (XAPPLOADDIR/Rxvt)
893 * @ class resources (~/.Xdefaults) 1068 * @ class resources (~/.Xdefaults)
894 * @ private resources (~/.Xdefaults) 1069 * @ private resources (~/.Xdefaults)
895 * 1070 *
896 * However, for the hand-rolled resources, the matching algorithm 1071 * However, for the hand-rolled resources, the matching algorithm
897 * checks if a resource string value has already been allocated 1072 * checks if a resource string value has already been allocated
898 * and won't overwrite it with (in this case) a less specific 1073 * and won't overwrite it with (in this case) a less specific
899 * resource value. 1074 * resource value.
900 * 1075 *
901 * This avoids multiple allocation. Also, when we've called this 1076 * This avoids multiple allocation. Also, when we've called this
902 * routine command-line string options have already been applied so we 1077 * routine command-line string options have already been applied so we
903 * needn't to allocate for those resources. 1078 * needn't to allocate for those resources.
904 * 1079 *
905 * So, search in resources from most to least specific. 1080 * So, search in resources from most to least specific.
906 * 1081 *
907 * 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
908 * "XTerm" and "Rxvt" as class names. 1083 * "XTerm" and "Rxvt" as class names.
909 */ 1084 */
910 1085
911 get_xdefaults (fd, name); 1086 get_xdefaults (fd, name);
912 get_xdefaults (fd, APL_SUBCLASS); 1087 get_xdefaults (fd, RESCLASS);
1088# ifdef RESFALLBACK
1089 get_xdefaults (fd, RESFALLBACK);
1090# endif
913 1091
914# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) 1092# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
915 { 1093 {
916 FILE *ad = NULL; 1094 FILE *ad = NULL;
917 1095
918# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1096# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
919 if (localepath == NULL || (ad = fopen(localepath, "r")) == NULL) 1097 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
920# endif 1098# endif
921 ad = fopen(XAPPLOADDIR "/" APL_SUBCLASS, "r"); 1099 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
922 if (ad != NULL) { 1100 if (ad != NULL)
1101 {
923 get_xdefaults (ad, APL_SUBCLASS); 1102 get_xdefaults (ad, RESCLASS);
924 get_xdefaults (ad, ""); 1103 get_xdefaults (ad, "");
925 fclose(ad); 1104 fclose (ad);
926 } 1105 }
927 } 1106 }
928# endif /* XAPPLOADDIR */ 1107# endif /* XAPPLOADDIR */
929 1108
930 get_xdefaults (fd, APL_CLASS);
931 get_xdefaults (fd, ""); /* partial match */ 1109 get_xdefaults (fd, ""); /* partial match */
932 if (fd != NULL) 1110 if (fd != NULL)
933 fclose(fd); 1111 fclose (fd);
934# endif /* USE_XGETDEFAULT */ 1112# endif /* USE_XGETDEFAULT */
935 1113
936# if defined XAPPLOADDIR 1114# if defined XAPPLOADDIR
937# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1115# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1116
938 } 1117 }
939 1118
940 /* Free the path of the possibly available localized Rxvt file */ 1119 /* Free the path of the possibly available localized Rxvt file */
941 free(localepath); 1120 free (localepath);
942# endif 1121# endif
943# endif 1122# endif
944 1123
945#endif /* NO_RESOURCES */ 1124#endif /* NO_RESOURCES */
946
947/*
948 * even without resources, at least do this setup for command-line
949 * options and command-line long options
950 */
951#ifdef MULTICHAR_SET
952 set_multichar_encoding (rs[Rs_multichar_encoding]);
953#endif
954#ifdef GREEK_SUPPORT
955/* this could be a function in grkelot.c */
956/* void set_greek_keyboard (const char * str); */
957 if (rs[Rs_greek_keyboard]) {
958 if (!STRCMP(rs[Rs_greek_keyboard], "iso"))
959 greek_setmode(GREEK_ELOT928); /* former -grk9 */
960 else if (!STRCMP(rs[Rs_greek_keyboard], "ibm"))
961 greek_setmode(GREEK_IBM437); /* former -grk4 */
962 }
963 {
964 KeySym sym;
965
966 if (rs[Rs_greektoggle_key]
967 && ((sym = XStringToKeysym(rs[Rs_greektoggle_key])) != 0))
968 ks_greekmodeswith = sym;
969 }
970#endif /* GREEK_SUPPORT */
971
972#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
973 {
974 KeySym sym;
975
976 if (rs[Rs_bigfont_key]
977 && ((sym = XStringToKeysym(rs[Rs_bigfont_key])) != 0))
978 ks_bigfont = sym;
979 if (rs[Rs_smallfont_key]
980 && ((sym = XStringToKeysym(rs[Rs_smallfont_key])) != 0))
981 ks_smallfont = sym;
982 }
983#endif
984} 1125}
985 1126
986/*}}} */ 1127/*}}} */
987/*----------------------- end-of-file (C source) -----------------------*/ 1128/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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