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.19 by pcg, Mon Mar 22 15:15:04 2004 UTC vs.
Revision 1.73 by root, Fri Jan 6 05:37:59 2006 UTC

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

Diff Legend

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