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.70 by root, Wed Jan 4 05:35:34 2006 UTC vs.
Revision 1.138 by root, Tue Nov 4 11:03:29 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: xdefaults.C 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * 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> 9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
10 * 11 *
11 * This program is free software; you can redistribute it and/or modify 12 * 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 13 * 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 14 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 15 * (at your option) any later version.
… …
20 * 21 *
21 * You should have received a copy of the GNU General Public License 22 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 23 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 24 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 25 *----------------------------------------------------------------------*/
25/*----------------------------------------------------------------------*
26 * get resources from ~/.Xdefaults or ~/.Xresources with the memory-saving
27 * default or with XGetDefault() (#define USE_XGETDEFAULT)
28 *----------------------------------------------------------------------*/
29 26
30#include "../config.h" /* NECESSARY */ 27#include "../config.h"
31#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h"
32#include "version.h" 29#include "version.h"
33 30
34#include <sys/utsname.h>
35
36#ifdef KEYSYM_RESOURCE 31#ifdef KEYSYM_RESOURCE
37#include "keyboard.h" 32# include "keyboard.h"
38#endif 33#endif
39 34
40/* place holders used for parsing command-line options */ 35/* place holders used for parsing command-line options */
41#define Optflag_Reverse 0x40000000UL 36#define Optflag_Reverse 1
42#define Optflag_Boolean 0x80000000UL 37#define Optflag_Boolean 2
43#define Optflag_mask 0x3fffffffUL 38#define Optflag_Switch 4
44 39
45/* #define DEBUG_RESOURCES */
46
47/*{{{ monolithic option/resource structure: */ 40/* monolithic option/resource structure: */
48/* 41/*
49 * `string' options MUST have a usage argument 42 * `string' options MUST have a usage argument
50 * `switch' and `boolean' options have no argument 43 * `switch' and `boolean' options have no argument
51 * if there's no desc (ription), it won't appear in rxvt_usage () 44 * if there's no desc (ription), it won't appear in rxvt_usage ()
52 */ 45 */
53 46
54/* INFO () - descriptive information only */ 47/* INFO () - descriptive information only */
55#define INFO(opt, arg, desc) \ 48#define INFO(opt, arg, desc) \
56 {0, -1, NULL, (opt), (arg), (desc)} 49 {0, 0, -1, NULL, (opt), (arg), (desc)}
57 50
58/* STRG () - command-line option, with/without resource */ 51/* STRG () - command-line option, with/without resource */
59#define STRG(rsp, kw, opt, arg, desc) \ 52#define STRG(rsp, kw, opt, arg, desc) \
60 {0, (rsp), (kw), (opt), (arg), (desc)} 53 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
61 54
62/* RSTRG () - resource/long-option */ 55/* RSTRG () - resource/long-option */
63#define RSTRG(rsp, kw, arg) \ 56#define RSTRG(rsp, kw, arg) \
64 {0, (rsp), (kw), NULL, (arg), NULL} 57 {0, 0, (rsp), (kw), NULL, (arg), NULL}
65 58
66/* BOOL () - regular boolean `-/+' flag */ 59/* BOOL () - regular boolean `-/+' flag */
67#define BOOL(rsp, kw, opt, flag, desc) \ 60#define BOOL(rsp, kw, opt, option, flag, desc) \
68 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 61 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
69 62
70/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
71#define SWCH(opt, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
72 { (flag), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
73 66
74/* convenient macros */ 67/* convenient macros */
75#define optList_strlen(i) \ 68#define optList_isString(i) \
76 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag == 0)
77#define optList_isBool(i) \ 70#define optList_isBool(i) \
78 (optList[i].flag & Optflag_Boolean) 71 (optList[i].flag & Optflag_Boolean)
79#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
80 (optList[i].flag & Optflag_Reverse) 73 (optList[i].flag & Optflag_Reverse)
81#define optList_size \ 74#define optList_size \
82 (sizeof (optList) / sizeof (optList[0])) 75 (sizeof (optList) / sizeof (optList[0]))
83 76
84static const struct 77static const struct
85 { 78 {
79 const uint8_t index; /* Option index */
86 const unsigned long flag; /* Option flag */ 80 const uint8_t flag; /* Option flag */
87 const int doff; /* data offset */ 81 const int16_t doff; /* resource value index or -1 */
88 const char *kw; /* keyword */ 82 const char *kw; /* keyword */
89 const char *opt; /* option */ 83 const char *opt; /* option */
90 const char *arg; /* argument */ 84 const char *arg; /* argument */
91 const char *desc; /* description */ 85 const char *desc; /* description */
92 } 86 }
… …
94 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 88 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
95 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 89 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
96 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"), 90 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
97 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
98 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
99 SWCH ("C", Opt_console, "intercept console messages"), 93 SWCH ("C", Opt_console, 0, "intercept console messages"),
100 SWCH ("iconic", Opt_iconic, "start iconic"), 94 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
101 SWCH ("ic", Opt_iconic, NULL), /* short form */ 95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
96 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
103 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
104 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
100 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 101 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
106#if HAVE_SCROLLBARS
107 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
108 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
109 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
110 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
111 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
112 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
113#endif
114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
115 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
118#if TRANSPARENT 112#if ENABLE_TRANSPARENCY
119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
120 SWCH ("tr", Opt_transparent, NULL), 114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
121# if TINTING
122 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
117#endif
118#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL
124# if ENABLE_FRILLS
125 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
123# endif 126# endif
124#endif
125#if OFF_FOCUS_FADING
126 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
127 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
128#endif
129#if TINTING
130 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
131#endif
132 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
133#ifndef NO_BELL
134 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 127 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
135# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 128# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
136 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 129 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
137# endif 130# endif
138#endif 131#endif
139#ifdef META8_OPTION 132#ifdef META8_OPTION
140 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 133 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
141#endif 134#endif
142#ifdef MOUSE_WHEEL 135#ifdef MOUSE_WHEEL
143 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 136 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
144#endif 137#endif
145#if ENABLE_FRILLS 138#if ENABLE_FRILLS
146 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 139 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
147 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 140 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
148 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 141 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
149#endif 142#endif
150#if CURSOR_BLINK 143#if CURSOR_BLINK
151 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 144 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
152#endif 145#endif
153#ifdef POINTER_BLANK 146#ifdef POINTER_BLANK
154 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 147 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
155#endif 148#endif
156 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 149 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
157 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 150 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
158 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 151 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
159 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 152 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
161 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 154 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
162 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 155 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
163 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 156 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
164 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 157 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
165 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 158 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
166#ifndef NO_BRIGHTCOLOR
167 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 159 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
169 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
170 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 162 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
171 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 163 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
172 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 164 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
173 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 165 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
174 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
175#endif /* NO_BRIGHTCOLOR */
176#ifndef NO_BOLD_UNDERLINE_REVERSE 167#ifndef NO_BOLD_UNDERLINE_REVERSE
177 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 168 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
178 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 169 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
179 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 170 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
180 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
181#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
182#if ENABLE_FRILLS 173#if ENABLE_FRILLS
183 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
184#endif 175#endif
185#ifdef KEEP_SCROLLCOLOR
186 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
177#ifdef RXVT_SCROLLBAR
187 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
188#endif /* KEEP_SCROLLCOLOR */ 179#endif
189#ifdef OPTION_HC 180#ifdef OPTION_HC
190 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
191#endif 182#endif
192#ifndef NO_CURSORCOLOR 183#ifndef NO_CURSORCOLOR
193 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
194 /* command-line option = resource name */ 185 /* command-line option = resource name */
195 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
196#endif /* NO_CURSORCOLOR */ 187#endif /* NO_CURSORCOLOR */
197 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
198 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
199 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
200#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 191#ifdef BG_IMAGE_FROM_FILE
201 RSTRG (Rs_path, "path", "search path"), 192 RSTRG (Rs_path, "path", "search path"),
202#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
203#ifdef XPM_BACKGROUND
204 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
205#endif /* XPM_BACKGROUND */
206#if (MENUBAR_MAX)
207 RSTRG (Rs_menu, "menu", "name[;tag]"),
208#endif 194#endif
209 /* fonts: command-line option = resource name */ 195 /* fonts: command-line option = resource name */
210 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
211#if ENABLE_STYLES 197#if ENABLE_STYLES
212 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
213 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 199 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
214 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 200 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
215 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), 201 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
216#endif 202#endif
217#ifdef USE_XIM 203#ifdef USE_XIM
218 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
219 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 205 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
220 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 206 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
221 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 207 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
222#endif /* USE_XIM */ 208#endif /* USE_XIM */
223 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 209 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
224 STRG (Rs_title, "title", "title", "string", "title name for window"), 210 STRG (Rs_title, "title", "title", "string", "title name for window"),
225 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 211 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
226 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
227 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 213 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
228#if ENABLE_XEMBED 214#if ENABLE_XEMBED
229 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
230#endif 216#endif
217#if XFT
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
219 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
220#endif
231#if ENABLE_FRILLS 221#if ENABLE_FRILLS
222 RSTRG (Rs_transient_for, "transient-for", "windowid"),
223 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
232 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 224 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
233 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 225 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
234 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 226 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
235 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
236 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
237 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
238 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
239 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232#endif
233#ifdef BUILTIN_GLYPHS
234 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
240#endif 235#endif
241#ifdef POINTER_BLANK 236#ifdef POINTER_BLANK
242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 237 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
243#endif 238#endif
244#ifndef NO_BACKSPACE_KEY 239#ifndef NO_BACKSPACE_KEY
245 RSTRG (Rs_backspace_key, "backspacekey", "string"), 240 RSTRG (Rs_backspace_key, "backspacekey", "string"),
246#endif 241#endif
247#ifndef NO_DELETE_KEY 242#ifndef NO_DELETE_KEY
248 RSTRG (Rs_delete_key, "deletekey", "string"), 243 RSTRG (Rs_delete_key, "deletekey", "string"),
249#endif 244#endif
250 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
251#ifdef PRINTPIPE 245#ifdef PRINTPIPE
252 RSTRG (Rs_print_pipe, "print-pipe", "string"), 246 RSTRG (Rs_print_pipe, "print-pipe", "string"),
253#endif 247#endif
254 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
255#ifdef CUTCHAR_RESOURCE
256 RSTRG (Rs_cutchars, "cutchars", "string"), 249 RSTRG (Rs_cutchars, "cutchars", "string"),
257#endif /* CUTCHAR_RESOURCE */
258 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 250 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
259#ifndef NO_SECONDARY_SCREEN 251#ifndef NO_SECONDARY_SCREEN
260 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
261 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
262#endif 254#endif
263#if ENABLE_PERL 255#if ENABLE_PERL
264 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 256 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 257 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 258 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"), 259 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
268#endif 260#endif
269#if 0 && TODO 261#if ISO_14755
270#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT) 262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
271 INFO ("xrm", "string", "X resource"), 263#endif
264#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
266 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
267# if ENABLE_EWMH
268 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to aplication icon image"),
272#endif 269# endif
273#endif 270#endif
274 INFO ("e", "command arg ...", "command to execute") 271 INFO ("e", "command arg ...", "command to execute")
275 }; 272 };
276 273
277#undef INFO 274#undef INFO
278#undef STRG 275#undef STRG
279#undef RSTRG 276#undef RSTRG
280#undef SWCH 277#undef SWCH
281#undef BOOL 278#undef BOOL
282/*}}} */
283 279
284static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 280static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
285static const char optionsstring[] = "options: " 281static const char optionsstring[] = "options: "
282#if ENABLE_PERL
283 "perl,"
284#endif
286#if XFT 285#if XFT
287 "xft," 286 "xft,"
288#endif 287#endif
289#if ENABLE_STYLES 288#if ENABLE_STYLES
290 "styles," 289 "styles,"
… …
319#endif 318#endif
320 "," 319 ","
321#if OFF_FOCUS_FADING 320#if OFF_FOCUS_FADING
322 "fade," 321 "fade,"
323#endif 322#endif
324#if defined(XPM_BACKGROUND)
325 "XPM,"
326#endif
327#if defined(TRANSPARENT) 323#if defined(ENABLE_TRANSPARENCY)
328 "transparent," 324 "transparent,"
329#endif
330#if TINTING
331 "tint," 325 "tint,"
332#endif 326#endif
333#if defined(UTMP_SUPPORT) 327#if HAVE_AFTERIMAGE
334 "utmp," 328 "afterimage,"
335#endif
336#if defined(MENUBAR)
337 "menubar,"
338#endif 329#endif
339#if defined(USE_XIM) 330#if defined(USE_XIM)
340 "XIM," 331 "XIM,"
341#endif 332#endif
342 "scrollbars="
343#if !defined(HAVE_SCROLLBARS)
344 "NONE"
345#else
346# if defined(PLAIN_SCROLLBAR)
347 "plain"
348# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
349 "+"
350# endif
351# endif
352# if defined(RXVT_SCROLLBAR)
353 "rxvt"
354# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
355 "+"
356# endif
357# endif
358# if defined(NEXT_SCROLLBAR)
359 "NeXT"
360# if defined(XTERM_SCROLLBAR)
361 "+"
362# endif
363# endif
364# if defined(XTERM_SCROLLBAR)
365 "xterm"
366# endif
367#endif
368 ","
369#if defined(NO_BACKSPACE_KEY) 333#if defined(NO_BACKSPACE_KEY)
370 "no_backspace," 334 "no_backspace,"
371#endif 335#endif
372#if defined(NO_DELETE_KEY) 336#if defined(NO_DELETE_KEY)
373 "no_delete," 337 "no_delete,"
374#endif 338#endif
375#if EIGHT_BIT_CONTROLS 339#if EIGHT_BIT_CONTROLS
376 "8bitctrls," 340 "8bitctrls,"
377#endif 341#endif
378#if !defined(NO_STRINGS)
379 "strings,"
380#endif
381#if defined(ENABLE_FRILLS) 342#if defined(ENABLE_FRILLS)
382 "frills," 343 "frills,"
383#endif 344#endif
384#if defined(PREFER_24BIT)
385 "24bit,"
386#endif
387#if defined(SELECTION_SCROLLING) 345#if defined(SELECTION_SCROLLING)
388 "selectionscrolling," 346 "selectionscrolling,"
389#endif 347#endif
390#if MOUSE_WHEEL 348#if MOUSE_WHEEL
391 "wheel," 349 "wheel,"
… …
401#endif 359#endif
402#if defined(POINTER_BLANK) 360#if defined(POINTER_BLANK)
403 "pointerBlank," 361 "pointerBlank,"
404#endif 362#endif
405#if defined(NO_RESOURCES) 363#if defined(NO_RESOURCES)
406 "NoResources" 364 "NoResources,"
407#else
408# if defined(USE_XGETDEFAULT)
409 "XGetDefaults"
410# else
411 ".Xdefaults"
412# endif 365#endif
366 "scrollbars=plain"
367#if defined(RXVT_SCROLLBAR)
368 "+rxvt"
369#endif
370#if defined(NEXT_SCROLLBAR)
371 "+NeXT"
372#endif
373#if defined(XTERM_SCROLLBAR)
374 "+xterm"
413#endif 375#endif
414 "\nUsage: "; /* Usage */ 376 "\nUsage: "; /* Usage */
415 377
416#define INDENT 18 378#define INDENT 18
379
380const char rxvt_term::resval_undef [] = "<undef>";
381const char rxvt_term::resval_on [] = "on";
382const char rxvt_term::resval_off [] = "off";
417 383
418/*{{{ usage: */ 384/*{{{ usage: */
419/*----------------------------------------------------------------------*/ 385/*----------------------------------------------------------------------*/
420static void 386static void
421rxvt_usage (int type) 387rxvt_usage (int type)
… …
430 rxvt_log (" [-help] [--help]\n"); 396 rxvt_log (" [-help] [--help]\n");
431 397
432 for (col = 1, i = 0; i < optList_size; i++) 398 for (col = 1, i = 0; i < optList_size; i++)
433 if (optList[i].desc != NULL) 399 if (optList[i].desc != NULL)
434 { 400 {
435 int len = 0; 401 int len = 0;
436 402
437 if (!optList_isBool (i)) 403 if (optList[i].arg)
438 { 404 len = strlen (optList[i].arg) + 1;
439 len = optList_strlen (i);
440 if (len > 0)
441 len++; /* account for space */
442 }
443#ifdef DEBUG_STRICT 405#ifdef DEBUG_STRICT
444 assert (optList[i].opt != NULL); 406 assert (optList[i].opt != NULL);
445#endif 407#endif
446 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 408 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
447 col += len; 409 col += len;
448 if (col > 79) 410 if (col > 79)
411 {
449 { /* assume regular width */ 412 /* assume regular width */
450 rxvt_log ("\n"); 413 rxvt_log ("\n");
451 col = 1 + len; 414 col = 1 + len;
452 } 415 }
453 416
454 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 417 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
455 if (optList_strlen (i)) 418 if (optList[i].arg)
456 rxvt_log (" %s]", optList[i].arg); 419 rxvt_log (" %s]", optList[i].arg);
457 else 420 else
458 rxvt_log ("]"); 421 rxvt_log ("]");
459 } 422 }
460 break; 423 break;
… …
507 470
508/*{{{ get command-line options before getting resources */ 471/*{{{ get command-line options before getting resources */
509void 472void
510rxvt_term::get_options (int argc, const char *const *argv) 473rxvt_term::get_options (int argc, const char *const *argv)
511{ 474{
512 int i, bad_option = 0; 475 int i, bad_option = 0;
513 static const char On[3] = "ON", Off[4] = "OFF";
514 476
515 for (i = 1; i < argc; i++) 477 for (i = 1; i < argc; i++)
516 { 478 {
517 unsigned int entry, longopt = 0; 479 unsigned int entry, longopt = 0;
518 const char *flag, *opt; 480 const char *opt;
481 int flag;
519 482
520 opt = argv[i]; 483 opt = argv[i];
521#ifdef DEBUG_RESOURCES 484
522 fprintf (stderr, "argv[%d] = %s: ", i, opt);
523#endif
524 if (*opt == '-') 485 if (*opt == '-')
525 { 486 {
526 flag = On; 487 flag = 1;
488
527 if (*++opt == '-') 489 if (*++opt == '-')
528 longopt = *opt++; /* long option */ 490 longopt = *opt++; /* long option */
529 } 491 }
530 else if (*opt == '+') 492 else if (*opt == '+')
531 { 493 {
532 flag = Off; 494 flag = 0;
495
533 if (*++opt == '+') 496 if (*++opt == '+')
534 longopt = *opt++; /* long option */ 497 longopt = *opt++; /* long option */
535 } 498 }
536 else 499 else
537 { 500 {
… …
540 continue; 503 continue;
541 } 504 }
542 505
543 if (!strcmp (opt, "help")) 506 if (!strcmp (opt, "help"))
544 rxvt_usage (longopt ? 2 : 1); 507 rxvt_usage (longopt ? 2 : 1);
508
545 if (!strcmp (opt, "h")) 509 if (!strcmp (opt, "h"))
546 rxvt_usage (0); 510 rxvt_usage (0);
547 511
548 /* feature: always try to match long-options */ 512 /* feature: always try to match long-options */
549 for (entry = 0; entry < optList_size; entry++) 513 for (entry = 0; entry < optList_size; entry++)
… …
553 break; 517 break;
554 518
555 if (entry < optList_size) 519 if (entry < optList_size)
556 { 520 {
557 if (optList_isReverse (entry)) 521 if (optList_isReverse (entry))
558 flag = flag == On ? Off : On; 522 flag = !flag;
559 523
560 if (optList_strlen (entry)) 524 if (optList_isString (entry))
561 { 525 {
562 /* 526 /*
563 * special cases are handled in main.c:main () to allow 527 * special cases are handled in main.c:main () to allow
564 * X resources to set these values before we settle for 528 * X resources to set these values before we settle for
565 * default values 529 * default values
566 */ 530 */
567 531
568 if (optList[entry].doff != -1) 532 if (optList[entry].doff != -1)
533 {
534 if (flag && i+1 == argc)
535 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
536
569 rs[optList[entry].doff] = flag == On && argv[i+1] 537 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
570 ? argv[++i] : 0; 538 }
571 } 539 }
572 else 540 else
541 {
573 { /* boolean value */ 542 /* boolean value */
574#ifdef DEBUG_RESOURCES 543 set_option (optList[entry].index, flag);
575 fprintf (stderr, "boolean (%s,%s) = %s\n",
576 optList[entry].opt, optList[entry].kw, flag);
577#endif
578 if (flag == On)
579 SET_OPTION (optList[entry].flag & Optflag_mask);
580 else
581 CLR_OPTION (optList[entry].flag & Optflag_mask);
582 544
583 if (optList[entry].doff != -1) 545 if (optList[entry].doff != -1)
584 rs[optList[entry].doff] = flag; 546 rs[optList[entry].doff] = flag ? resval_on : resval_off;
585 } 547 }
586 } 548 }
549#ifndef NO_RESOURCES
550 else if (!strcmp (opt, "xrm"))
551 {
552 if (i+1 < argc)
553 XrmPutLineResource (&option_db, argv[++i]);
554 }
555#endif
556#ifdef KEYSYM_RESOURCE
557 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
558 {
559 if (i+1 < argc)
560 {
561 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
562 sprintf (res, "*.%s: %s\n", opt, argv[i]);
563 XrmPutLineResource (&option_db, res);
564 free (res);
565 }
566 }
567#endif
587 else 568 else
588#ifdef KEYSYM_RESOURCE
589 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
590 if (rxvt_Str_match (opt, "keysym."))
591 { 569 {
592 const char *str = argv[++i];
593
594 if (str != NULL)
595 parse_keysym (opt + sizeof ("keysym.") - 1, str);
596 }
597 else
598#endif
599 {
600 bad_option = 1; 570 bad_option = 1;
601 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 571 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
602 } 572 }
603 } 573 }
604 574
605 if (bad_option) 575 if (bad_option)
606 rxvt_usage (0); 576 rxvt_usage (0);
607} 577}
… …
618 * "rxvt" "keysym" "0xFF01" 588 * "rxvt" "keysym" "0xFF01"
619 * value will be a string 589 * value will be a string
620 */ 590 */
621/* ARGSUSED */ 591/* ARGSUSED */
622int 592int
623rxvt_define_key (XrmDatabase *database __attribute__((unused)), 593rxvt_define_key (XrmDatabase *database UNUSED,
624 XrmBindingList bindings __attribute__((unused)), 594 XrmBindingList bindings UNUSED,
625 XrmQuarkList quarks, 595 XrmQuarkList quarks,
626 XrmRepresentation *type __attribute__((unused)), 596 XrmRepresentation *type UNUSED,
627 XrmValue *value, 597 XrmValue *value,
628 XPointer closure __attribute__((unused))) 598 XPointer closure UNUSED)
629{ 599{
630 int last; 600 int last;
631 601
632 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 602 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
633 ; 603 ;
… …
638} 608}
639 609
640/* 610/*
641 * look for something like this (XK_Delete) 611 * look for something like this (XK_Delete)
642 * rxvt*keysym.0xFFFF: "\177" 612 * rxvt*keysym.0xFFFF: "\177"
643 *
644 * arg will be
645 * NULL for ~/.Xdefaults and
646 * non-NULL for command-line options (need to allocate)
647 */ 613 */
648#define NEWARGLIM 500 /* `reasonable' size */
649 614
650struct keysym_vocabulary_t 615struct keysym_vocabulary_t
651{ 616{
652 const char *name; 617 const char *name;
653 unsigned short len; 618 unsigned short len;
654 unsigned short value; 619 unsigned short value;
655}; 620};
656keysym_vocabulary_t keysym_vocabulary[] = 621static const keysym_vocabulary_t keysym_vocabulary[] =
657{ 622{
658 { "ISOLevel3", 9, Level3Mask }, 623 { "ISOLevel3", 9, Level3Mask },
659 { "AppKeypad", 9, AppKeypadMask }, 624 { "AppKeypad", 9, AppKeypadMask },
660 { "Control", 7, ControlMask }, 625 { "Control", 7, ControlMask },
661 { "NumLock", 7, NumLockMask }, 626 { "NumLock", 7, NumLockMask },
… …
683}; 648};
684 649
685int 650int
686rxvt_term::parse_keysym (const char *str, const char *arg) 651rxvt_term::parse_keysym (const char *str, const char *arg)
687{ 652{
688 int n, sym; 653 int sym;
689 unsigned int state = 0; 654 unsigned int state = 0;
690 const char *pmodend = NULL; 655 const char *key = strrchr (str, '-');
691 char *newarg = NULL;
692 char newargstr[NEWARGLIM];
693 656
694 if (arg == NULL) 657 if (!key)
695 { 658 key = str;
696 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
697 return 0;
698
699 str += n; /* skip `keysym.' */
700 if ((pmodend = strchr (str, ':')) < str)
701 return -1;
702 }
703 else 659 else
704 pmodend = str + strlen(str); 660 key++;
705 661
706 for (--pmodend; str < pmodend; --pmodend) 662 // string or key is empty
707 if (*pmodend == '-') 663 if (*arg == '\0' || *key == '\0')
708 break; 664 return -1;
709 665
666 // parse modifiers
710 while (str < pmodend) 667 while (str < key)
711 { 668 {
712 unsigned int i; 669 unsigned int i;
713 670
714 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 671 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
715 { 672 {
… …
726 683
727 if (*str == '-') 684 if (*str == '-')
728 ++str; 685 ++str;
729 } 686 }
730 687
731 /* some scanf () have trouble with a 0x prefix */ 688 // convert keysym name to keysym number
732 if (str[0] == '0' && toupper (str[1]) == 'X') 689 if ((sym = XStringToKeysym (str)) == None)
733 { 690 {
734 str += 2; 691 // fallback on hexadecimal parsing
735 692 char *end;
693 sym = strtol (str, &end, 16);
736 if (arg) 694 if (*end)
737 {
738 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
739 return -1;
740 }
741 else
742 {
743 if (sscanf (str, "%x:", &sym) != 1)
744 return -1;
745
746 /* cue to ':', it's there since sscanf () worked */
747 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
748 newargstr[NEWARGLIM - 1] = '\0';
749 newarg = newargstr;
750 }
751 }
752 else
753 {
754 /*
755 * convert keysym name to keysym number
756 */
757 strncpy (newargstr, str, NEWARGLIM - 1);
758 newargstr[NEWARGLIM - 1] = '\0';
759
760 if (arg == NULL)
761 {
762 if ((newarg = strchr (newargstr, ':')) == NULL)
763 return -1;
764
765 *newarg++ = '\0'; /* terminate keysym name */
766 }
767
768 if ((sym = XStringToKeysym (newargstr)) == None)
769 return -1; 695 return -1;
770 } 696 }
771 697
772 if (newarg == NULL)
773 {
774 strncpy (newargstr, arg, NEWARGLIM - 1);
775 newargstr[NEWARGLIM - 1] = '\0';
776 newarg = newargstr;
777 }
778
779 rxvt_Str_trim (newarg);
780 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
781 return -1;
782
783 keyboard->register_user_translation (sym, state, newarg); 698 keyboard->register_user_translation (sym, state, arg);
784 return 1; 699 return 1;
785} 700}
786 701
787# endif /* KEYSYM_RESOURCE */ 702# endif /* KEYSYM_RESOURCE */
703#endif /* NO_RESOURCES */
788 704
789# ifndef USE_XGETDEFAULT 705static char *
790/*{{{ rxvt_get_xdefaults () */ 706get_res (XrmDatabase database, const char *program, const char *option)
791/*
792 * the matching algorithm used for memory-save fake resources
793 */
794void
795rxvt_term::get_xdefaults (FILE *stream, const char *name)
796{ 707{
797 unsigned int len; 708 char resource[512];
798 char *str, buffer[256]; 709 char *type;
710 XrmValue result;
799 711
800 if (stream == NULL) 712 snprintf (resource, sizeof (resource), "%s.%s", program, option);
801 return; 713 XrmGetResource (database, resource, resource, &type, &result);
802 714
803 len = strlen (name); 715 return result.addr;
804 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 716}
717
718const char *
719rxvt_term::x_resource (const char *name)
720{
721 XrmDatabase database = XrmGetDatabase (dpy);
722
723 const char *p = get_res (database, rs[Rs_name], name);
724 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
725
726 if (p == NULL || (p0 && strcmp (p, p0) == 0))
805 { 727 {
806 unsigned int entry, n; 728 p = get_res (database, RESCLASS, name);
807 729#ifdef RESFALLBACK
808 while (*str && isspace (*str)) 730 if (p == NULL || (p0 && strcmp (p, p0) == 0))
809 str++; /* leading whitespace */ 731 p = get_res (database, RESFALLBACK, name);
810 732#endif
811 if ((str[len] != '*' && str[len] != '.')
812 || (len && strncmp (str, name, len)))
813 continue;
814 str += (len + 1); /* skip `name*' or `name.' */
815
816# ifdef KEYSYM_RESOURCE
817 if (!parse_keysym (str, NULL))
818# endif /* KEYSYM_RESOURCE */
819 for (entry = 0; entry < optList_size; entry++)
820 {
821 const char *kw = optList[entry].kw;
822
823 if (kw == NULL)
824 continue;
825
826 n = strlen (kw);
827 if (str[n] == ':' && rxvt_Str_match (str, kw))
828 {
829 /* skip `keyword:' */
830 str += n + 1;
831 rxvt_Str_trim (str);
832 n = strlen (str);
833
834 if (n && rs[optList[entry].doff] == NULL)
835 {
836 /* not already set */
837 int s;
838 char *p = 0;
839
840 for (int o = 0;;)
841 {
842 p = (char *)rxvt_realloc (p, o + n + 1);
843 memcpy (p + o, str, n);
844 o += n;
845 p[o] = 0;
846
847 if (o == 0 || p[o - 1] != '\\') // continuation line
848 break;
849
850 o--; // eat "\"
851
852 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
853 break;
854
855 rxvt_Str_trim (str);
856 n = strlen (str);
857 }
858
859 rs[optList[entry].doff] = p;
860 allocated.push_back (p);
861
862 if (optList_isBool (entry))
863 {
864 s = strcasecmp (str, "true") == 0
865 || strcasecmp (str, "yes") == 0
866 || strcasecmp (str, "on") == 0
867 || strcmp (str, "1") == 0;
868
869 if (optList_isReverse (entry))
870 s = !s;
871
872 if (s)
873 SET_OPTION (optList[entry].flag & Optflag_mask);
874 else
875 CLR_OPTION (optList[entry].flag & Optflag_mask);
876 }
877 }
878
879 break;
880 }
881 }
882 } 733 }
883 734
884 rewind (stream); 735 if (p == NULL && p0)
736 p = p0;
737
738 return p;
885} 739}
886 740
887/*}}} */
888# endif /* ! USE_XGETDEFAULT */
889#endif /* NO_RESOURCES */
890
891/*{{{ read the resources files */
892/*
893 * using XGetDefault () or the hand-rolled replacement
894 */
895/* ARGSUSED */
896void 741void
897rxvt_term::extract_resources () 742rxvt_term::extract_resources ()
898{ 743{
899 dDisp;
900
901#ifndef NO_RESOURCES 744#ifndef NO_RESOURCES
902 745 XrmDatabase database = XrmGetDatabase (dpy);
903 char *homedir = (char *)getenv ("HOME");
904 char fname[1024];
905
906# if defined XAPPLOADDIR
907# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
908 /* Compute the path of the possibly available localized Rxvt file */
909 char localepath[1024];
910
911 if (locale)
912 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
913 else
914 localepath[0] = 0;
915# endif
916# endif
917
918# ifdef USE_XGETDEFAULT
919 /*
920 * get resources using the X library function
921 */
922 int entry;
923
924# ifdef XrmEnumOneLevel
925 char *displayResource, *xe;
926 XrmName name_prefix[3];
927 XrmClass class_prefix[3];
928 XrmDatabase database, rdb1;
929
930 XrmInitialize ();
931 database = NULL;
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); 746 XrmMergeDatabases (option_db, &database);
943 747 option_db = NULL;
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.
957 /* Get any Xserver defaults */
958 displayResource = XResourceManagerString (disp);
959 if (displayResource != NULL)
960 {
961 if ((rdb1 = XrmGetStringDatabase (displayResource)))
962 XrmMergeDatabases (rdb1, &database);
963 }
964 else if (homedir)
965 {
966 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
967
968 if ((rdb1 = XrmGetFileDatabase (fname)))
969 XrmMergeDatabases (rdb1, &database);
970 }
971
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))
993 {
994 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
995
996 if ((rdb1 = XrmGetFileDatabase (fname)))
997 XrmMergeDatabases (rdb1, &database);
998 }
999 }
1000
1001 XrmSetDatabase (disp, database);
1002# endif
1003
1004 /* 748 /*
1005 * Query resources for options that affect us 749 * Query resources for options that affect us
1006 */ 750 */
1007 for (entry = 0; entry < optList_size; entry++) 751 for (int entry = 0; entry < optList_size; entry++)
1008 { 752 {
1009 int s; 753 int s;
1010 char *p, *p0;
1011 const char *kw = optList[entry].kw; 754 const char *kw = optList[entry].kw;
1012 755
1013 if (kw == NULL || rs[optList[entry].doff] != NULL) 756 if (kw == NULL || rs[optList[entry].doff] != NULL)
1014 continue; /* previously set */ 757 continue; // previously set
1015 758
1016 p = XGetDefault (disp, rs[Rs_name], kw); 759 const char *p = x_resource (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 760
1030 if (p) 761 if (p)
1031 { 762 {
763 p = strdup (p);
764 allocated.push_back ((void *)p);
1032 rs[optList[entry].doff] = p; 765 rs[optList[entry].doff] = p;
1033 766
1034 if (optList_isBool (entry)) 767 if (optList_isBool (entry))
1035 { 768 {
1036 s = strcasecmp (p, "TRUE") == 0 769 s = strcasecmp (p, "TRUE") == 0
… …
1039 || strcasecmp (p, "1") == 0; 772 || strcasecmp (p, "1") == 0;
1040 773
1041 if (optList_isReverse (entry)) 774 if (optList_isReverse (entry))
1042 s = !s; 775 s = !s;
1043 776
1044 if (s) 777 set_option (optList[entry].index, s);
1045 SET_OPTION (optList[entry].flag & Optflag_mask);
1046 else
1047 CLR_OPTION (optList[entry].flag & Optflag_mask);
1048 } 778 }
1049 } 779 }
1050 } 780 }
1051 781
1052 /* 782 /*
1053 * [R5 or later]: enumerate the resource database 783 * [R5 or later]: enumerate the resource database
1054 */ 784 */
1055# ifdef KEYSYM_RESOURCE 785# ifdef KEYSYM_RESOURCE
786 XrmName name_prefix[3];
787 XrmClass class_prefix[3];
788
1056 name_prefix[0] = XrmStringToName (rs[Rs_name]); 789 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1057 name_prefix[1] = XrmStringToName ("keysym"); 790 name_prefix[1] = XrmStringToName ("keysym");
1058 name_prefix[2] = NULLQUARK; 791 name_prefix[2] = NULLQUARK;
1059 class_prefix[0] = XrmStringToName (RESCLASS); 792 class_prefix[0] = XrmStringToName (RESCLASS);
1060 class_prefix[1] = XrmStringToName ("Keysym"); 793 class_prefix[1] = XrmStringToName ("Keysym");
1061 class_prefix[2] = NULLQUARK; 794 class_prefix[2] = NULLQUARK;
1062 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 795 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1063 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 796 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1064 XrmEnumOneLevel, rxvt_define_key, NULL); 797 XrmEnumOneLevel, rxvt_define_key, NULL);
1065# ifdef RESFALLBACK 798# ifdef RESFALLBACK
1066 name_prefix[0] = XrmStringToName (RESFALLBACK); 799 name_prefix[0] = XrmStringToName (RESFALLBACK);
1067 name_prefix[1] = XrmStringToName ("keysym"); 800 name_prefix[1] = XrmStringToName ("keysym");
1068 class_prefix[0] = XrmStringToName (RESFALLBACK); 801 class_prefix[0] = XrmStringToName (RESFALLBACK);
1069 class_prefix[1] = XrmStringToName ("Keysym"); 802 class_prefix[1] = XrmStringToName ("Keysym");
1070 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 803 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1071 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 804 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1072 XrmEnumOneLevel, rxvt_define_key, NULL); 805 XrmEnumOneLevel, rxvt_define_key, NULL);
1073# endif 806# endif
1074# endif 807# endif
1075 808
1076# else /* USE_XGETDEFAULT */
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 {
1122 FILE *ad = NULL;
1123
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)
1129 {
1130 get_xdefaults (ad, RESCLASS);
1131 get_xdefaults (ad, "");
1132 fclose (ad);
1133 }
1134 }
1135# endif /* XAPPLOADDIR */
1136
1137 get_xdefaults (fd, ""); /* partial match */
1138 if (fd != NULL)
1139 fclose (fd);
1140# endif /* USE_XGETDEFAULT */
1141
1142#endif /* NO_RESOURCES */ 809#endif /* NO_RESOURCES */
1143} 810}
1144 811
1145/*}}} */
1146/*----------------------- end-of-file (C source) -----------------------*/ 812/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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