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

Diff Legend

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