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

Diff Legend

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