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

Diff Legend

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