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.6 by pcg, Thu Dec 18 00:38:07 2003 UTC vs.
Revision 1.57 by root, Sat Feb 19 01:07:58 2005 UTC

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

Diff Legend

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