ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.10 by pcg, Fri Feb 13 12:11:05 2004 UTC vs.
Revision 1.69 by root, Wed Jan 4 04:42:45 2006 UTC

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

Diff Legend

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