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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines