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.29 by root, Tue Aug 3 22:19:51 2004 UTC vs.
Revision 1.49 by root, Thu Feb 3 10:24:10 2005 UTC

… …
28 *----------------------------------------------------------------------*/ 28 *----------------------------------------------------------------------*/
29 29
30#include "../config.h" /* NECESSARY */ 30#include "../config.h" /* NECESSARY */
31#include "rxvt.h" /* NECESSARY */ 31#include "rxvt.h" /* NECESSARY */
32#include "version.h" 32#include "version.h"
33#include "xdefaults.intpro" /* PROTOS for internal routines */ 33
34#ifdef KEYSYM_RESOURCE
35#include "keyboard.h"
36#endif
34 37
35/* #define DEBUG_RESOURCES */ 38/* #define DEBUG_RESOURCES */
36 39
37static const char *const xnames[2] = { ".Xdefaults", ".Xresources" }; 40static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
38 41
… …
63#define SWCH(opt, flag, desc) \ 66#define SWCH(opt, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 67 { (flag), -1, NULL, (opt), NULL, (desc)}
65 68
66/* convenient macros */ 69/* convenient macros */
67#define optList_strlen(i) \ 70#define optList_strlen(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? STRLEN (optList[i].arg) : 1)) 71 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
69#define optList_isBool(i) \ 72#define optList_isBool(i) \
70 (optList[i].flag & Opt_Boolean) 73 (optList[i].flag & Opt_Boolean)
71#define optList_isReverse(i) \ 74#define optList_isReverse(i) \
72 (optList[i].flag & Opt_Reverse) 75 (optList[i].flag & Opt_Reverse)
73#define optList_size() \ 76#define optList_size() \
… …
92 SWCH ("iconic", Opt_iconic, "start iconic"), 95 SWCH ("iconic", Opt_iconic, "start iconic"),
93 SWCH ("ic", Opt_iconic, NULL), /* short form */ 96 SWCH ("ic", Opt_iconic, NULL), /* short form */
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
97#ifdef HAVE_SCROLLBARS 101#ifdef HAVE_SCROLLBARS
102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
98 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
99 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
100 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
101#endif 108#endif
102 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
103 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 110 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
104 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
105 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
… …
110#if TINTING 117#if TINTING
111 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 118 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
112#endif 119#endif
113#endif 120#endif
114#ifdef OFF_FOCUS_FADING 121#ifdef OFF_FOCUS_FADING
115 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when urxvt is losing focus."), 122 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."),
116#endif 123#endif
117#ifdef TINTING 124#ifdef TINTING
118 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), 125 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
119#endif 126#endif
120 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 127 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
… …
128 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 135 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
129#endif 136#endif
130#ifdef MOUSE_WHEEL 137#ifdef MOUSE_WHEEL
131 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 138 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
132#endif 139#endif
133#ifndef NO_FRILLS 140#if ENABLE_FRILLS
134 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 141 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
135 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 142 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
136#endif 143#endif
137#ifdef CURSOR_BLINK 144#ifdef CURSOR_BLINK
138 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
… …
159 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
160 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 167 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
161 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 168 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
162#endif /* NO_BRIGHTCOLOR */ 169#endif /* NO_BRIGHTCOLOR */
163#ifndef NO_BOLD_UNDERLINE_REVERSE 170#ifndef NO_BOLD_UNDERLINE_REVERSE
164 BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"),
165 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 171 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
172 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
166 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 173 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
167 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 174 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
168#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 175#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
176#if ENABLE_FRILLS
177 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
178#endif
169#ifdef KEEP_SCROLLCOLOR 179#ifdef KEEP_SCROLLCOLOR
170 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 180 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
171 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 181 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
172#endif /* KEEP_SCROLLCOLOR */ 182#endif /* KEEP_SCROLLCOLOR */
173#ifdef OPTION_HC 183#ifdef OPTION_HC
174 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 184 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
175#endif 185#endif
186#ifndef NO_CURSORCOLOR
187 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
188 /* command-line option = resource name */
189 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
190#endif /* NO_CURSORCOLOR */
191 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
192 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
193 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
176#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 194#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
177 RSTRG (Rs_path, "path", "search path"), 195 RSTRG (Rs_path, "path", "search path"),
178#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 196#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
179#ifdef XPM_BACKGROUND 197#ifdef XPM_BACKGROUND
180 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 198 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
181#endif /* XPM_BACKGROUND */ 199#endif /* XPM_BACKGROUND */
182#if (MENUBAR_MAX) 200#if (MENUBAR_MAX)
183 RSTRG (Rs_menu, "menu", "name[;tag]"), 201 RSTRG (Rs_menu, "menu", "name[;tag]"),
184#endif 202#endif
203 /* fonts: command-line option = resource name */
185 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 204 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
186 /* fonts: command-line option = resource name */ 205#if ENABLE_STYLES
206 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
207 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
208 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
209#endif
187#ifdef USE_XIM 210#ifdef USE_XIM
188 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 211 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
189 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 212 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
190#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
191 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 213 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
192#endif 214 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
193#endif /* USE_XIM */ 215#endif /* USE_XIM */
194 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 216 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
195 STRG (Rs_title, "title", "title", "string", "title name for window"), 217 STRG (Rs_title, "title", "title", "string", "title name for window"),
196 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 218 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
197 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 219 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
198#ifndef NO_CURSORCOLOR
199 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
200 /* command-line option = resource name */
201 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
202#endif /* NO_CURSORCOLOR */
203 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
204 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
205 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
206 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 220 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
207#ifndef NO_FRILLS 221#if ENABLE_FRILLS
208 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 222 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
209 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 223 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
210 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 224 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
211 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 225 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
212 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 226 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
213#endif
214#ifndef NO_LINESPACE
215 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 227 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
216#endif 228#endif
217 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
218#ifdef POINTER_BLANK 229#ifdef POINTER_BLANK
219 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 230 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
220#endif 231#endif
221#ifndef NO_BACKSPACE_KEY 232#ifndef NO_BACKSPACE_KEY
222 RSTRG (Rs_backspace_key, "backspacekey", "string"), 233 RSTRG (Rs_backspace_key, "backspacekey", "string"),
223#endif 234#endif
224#ifndef NO_DELETE_KEY 235#ifndef NO_DELETE_KEY
225 RSTRG (Rs_delete_key, "deletekey", "string"), 236 RSTRG (Rs_delete_key, "deletekey", "string"),
226#endif 237#endif
227 RSTRG (Rs_selectstyle, "selectstyle", "mode"), 238 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
228 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
229#ifdef HAVE_SCROLLBARS
230 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
231#endif
232#ifdef PRINTPIPE 239#ifdef PRINTPIPE
233 RSTRG (Rs_print_pipe, "print-pipe", "string"), 240 RSTRG (Rs_print_pipe, "print-pipe", "string"),
234#endif 241#endif
235 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 242 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
236 INFO ("xrm", "string", "X resource"),
237#ifdef CUTCHAR_RESOURCE 243#ifdef CUTCHAR_RESOURCE
238 RSTRG (Rs_cutchars, "cutchars", "string"), 244 RSTRG (Rs_cutchars, "cutchars", "string"),
239#endif /* CUTCHAR_RESOURCE */ 245#endif /* CUTCHAR_RESOURCE */
240 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 246 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
241#ifndef NO_SECONDARY_SCREEN 247#ifndef NO_SECONDARY_SCREEN
242 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 248 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
243 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 249 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
244#endif 250#endif
251#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
252 INFO ("xrm", "string", "X resource"),
253#endif
245 INFO ("e", "command arg ...", "command to execute") 254 INFO ("e", "command arg ...", "command to execute")
246 }; 255 };
247 256
248#undef INFO 257#undef INFO
249#undef STRG 258#undef STRG
250#undef RSTRG 259#undef RSTRG
251#undef SWCH 260#undef SWCH
252#undef BOOL 261#undef BOOL
253/*}}} */ 262/*}}} */
254 263
255static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 264static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
256static const char optionsstring[] = "Options: " 265static const char optionsstring[] = "options: "
266#if XFT
267 "xft,"
268#endif
269#if ENABLE_STYLES
270 "styles,"
271#endif
272#if ENABLE_COMBINING
273 "combining,"
274#endif
275#if TEXT_BLINK
276 "blink,"
277#endif
278#if ISO_14755
279 "iso14755,"
280#endif
281#if UNICODE_3
282 "unicode3,"
283#endif
284 "encodings=eu+vn"
285#if ENCODING_JP
286 "+jp"
287#endif
288#if ENCODING_JP_EXT
289 "+jp-ext"
290#endif
291#if ENCODING_KR
292 "+kr"
293#endif
294#if ENCODING_ZH
295 "+zh"
296#endif
297#if ENCODING_ZH_EXT
298 "+zh-ext"
299#endif
300 ","
301#if OFF_FOCUS_FADING
302 "fade,"
303#endif
257#if defined(XPM_BACKGROUND) 304#if defined(XPM_BACKGROUND)
258 "XPM," 305 "XPM,"
259#endif 306#endif
260#if defined(TRANSPARENT) 307#if defined(TRANSPARENT)
261 "transparent," 308 "transparent,"
262#endif 309#endif
310#if TINTING
311 "tint,"
312#endif
263#if defined(UTMP_SUPPORT) 313#if defined(UTMP_SUPPORT)
264 "utmp," 314 "utmp,"
265#endif 315#endif
266#if defined(MENUBAR) 316#if defined(MENUBAR)
267 "menubar," 317 "menubar,"
268#endif
269#if !defined(NO_FRILLS)
270 "frills,"
271#endif
272#if !defined(NO_LINESPACE)
273 "linespace,"
274#endif
275#if defined(PREFER_24BIT)
276 "24bit,"
277#endif 318#endif
278#if defined(USE_XIM) 319#if defined(USE_XIM)
279 "XIM," 320 "XIM,"
280#endif 321#endif
281 "scrollbars=" 322 "scrollbars="
… …
309 "no_backspace," 350 "no_backspace,"
310#endif 351#endif
311#if defined(NO_DELETE_KEY) 352#if defined(NO_DELETE_KEY)
312 "no_delete," 353 "no_delete,"
313#endif 354#endif
355#if EIGHT_BIT_CONTROLS
356 "8bitctrls,"
357#endif
314#if !defined(NO_STRINGS) 358#if !defined(NO_STRINGS)
315 "strings," 359 "strings,"
316#endif 360#endif
317#if defined(TTY_256COLOR) 361#if defined(ENABLE_FRILLS)
362 "frills,"
363#endif
364#if defined(PREFER_24BIT)
318 "256colour," 365 "24bit,"
366#endif
367#if defined(SELECTION_SCROLLING)
368 "selectionscrolling,"
369#endif
370#if MOUSE_WHEEL
371 "wheel,"
372#endif
373#if MOUSE_SLIP_WHEELING
374 "slipwheel,"
375#endif
376#if defined(SMART_RESIZE)
377 "smart-resize,"
378#endif
379#if defined(CURSOR_BLINK)
380 "cursorBlink,"
381#endif
382#if defined(POINTER_BLANK)
383 "pointerBlank,"
319#endif 384#endif
320#if defined(NO_RESOURCES) 385#if defined(NO_RESOURCES)
321 "NoResources" 386 "NoResources"
322#else 387#else
323# if defined(USE_XGETDEFAULT) 388# if defined(USE_XGETDEFAULT)
… …
356 len++; /* account for space */ 421 len++; /* account for space */
357 } 422 }
358#ifdef DEBUG_STRICT 423#ifdef DEBUG_STRICT
359 assert (optList[i].opt != NULL); 424 assert (optList[i].opt != NULL);
360#endif 425#endif
361 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 426 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
362 col += len; 427 col += len;
363 if (col > 79) 428 if (col > 79)
364 { /* assume regular width */ 429 { /* assume regular width */
365 rxvt_log ("\n"); 430 rxvt_log ("\n");
366 col = 1 + len; 431 col = 1 + len;
… …
383#ifdef DEBUG_STRICT 448#ifdef DEBUG_STRICT
384 assert (optList[i].opt != NULL); 449 assert (optList[i].opt != NULL);
385#endif 450#endif
386 rxvt_log (" %s%s %-*s%s%s\n", 451 rxvt_log (" %s%s %-*s%s%s\n",
387 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 452 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
388 (INDENT - STRLEN (optList[i].opt) 453 (INDENT - strlen (optList[i].opt)
389 + (optList_isBool (i) ? 0 : 2)), 454 + (optList_isBool (i) ? 0 : 2)),
390 (optList[i].arg ? optList[i].arg : ""), 455 (optList[i].arg ? optList[i].arg : ""),
391 (optList_isBool (i) ? "turn on/off " : ""), 456 (optList_isBool (i) ? "turn on/off " : ""),
392 optList[i].desc); 457 optList[i].desc);
393 } 458 }
… …
400 465
401 for (i = 0; i < optList_size (); i++) 466 for (i = 0; i < optList_size (); i++)
402 if (optList[i].kw != NULL) 467 if (optList[i].kw != NULL)
403 rxvt_log (" %s: %*s%s\n", 468 rxvt_log (" %s: %*s%s\n",
404 optList[i].kw, 469 optList[i].kw,
405 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 470 (INDENT - strlen (optList[i].kw)), "", /* XXX */
406 (optList_isBool (i) ? "boolean" : optList[i].arg)); 471 (optList_isBool (i) ? "boolean" : optList[i].arg));
407#ifdef KEYSYM_RESOURCE 472#ifdef KEYSYM_RESOURCE
408 rxvt_log (" " "keysym.sym" ": %*s%s\n", 473 rxvt_log (" " "keysym.sym" ": %*s%s\n",
409 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 474 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
410 "keysym"); 475 "keysym");
… …
453 bad_option = 1; 518 bad_option = 1;
454 rxvt_warn ("\"%s\": malformed option.\n", opt); 519 rxvt_warn ("\"%s\": malformed option.\n", opt);
455 continue; 520 continue;
456 } 521 }
457 522
458 if (!STRCMP (opt, "help")) 523 if (!strcmp (opt, "help"))
459 rxvt_usage (longopt ? 2 : 1); 524 rxvt_usage (longopt ? 2 : 1);
460 if (!STRCMP (opt, "h")) 525 if (!strcmp (opt, "h"))
461 rxvt_usage (0); 526 rxvt_usage (0);
462 527
463 /* feature: always try to match long-options */ 528 /* feature: always try to match long-options */
464 for (entry = 0; entry < optList_size (); entry++) 529 for (entry = 0; entry < optList_size (); entry++)
465 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 530 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
466 || (!longopt 531 || (!longopt
467 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 532 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
468 break; 533 break;
469 534
470 if (entry < optList_size ()) 535 if (entry < optList_size ())
471 { 536 {
472 if (optList_isReverse (entry)) 537 if (optList_isReverse (entry))
… …
489#ifdef DEBUG_RESOURCES 554#ifdef DEBUG_RESOURCES
490 fprintf (stderr, "boolean (%s,%s) = %s\n", 555 fprintf (stderr, "boolean (%s,%s) = %s\n",
491 optList[entry].opt, optList[entry].kw, flag); 556 optList[entry].opt, optList[entry].kw, flag);
492#endif 557#endif
493 if (flag == On) 558 if (flag == On)
494 Options |= (optList[entry].flag); 559 options |= (optList[entry].flag);
495 else 560 else
496 Options &= ~ (optList[entry].flag); 561 options &= ~ (optList[entry].flag);
497 562
498 if (optList[entry].doff != -1) 563 if (optList[entry].doff != -1)
499 rs[optList[entry].doff] = flag; 564 rs[optList[entry].doff] = flag;
500 } 565 }
501 } 566 }
502 else 567 else
503#ifdef KEYSYM_RESOURCE 568#ifdef KEYSYM_RESOURCE
504 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 569 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
505 if (rxvt_Str_match (opt, "keysym.")) 570 if (rxvt_Str_match (opt, "keysym."))
506 { 571 {
507 const char *str = argv[++i]; 572 const char *str = argv[++i];
508 573
509 if (str != NULL) 574 if (str != NULL)
… …
540 XrmQuarkList quarks, 605 XrmQuarkList quarks,
541 XrmRepresentation *type __attribute__((unused)), 606 XrmRepresentation *type __attribute__((unused)),
542 XrmValue *value, 607 XrmValue *value,
543 XPointer closure __attribute__((unused))) 608 XPointer closure __attribute__((unused)))
544{ 609{
545 int last; 610 int last;
546 611
547 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 612 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
548 ; 613 ;
614
549 last--; 615 last--;
550 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 616 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
551 return False; 617 return False;
552} 618}
553 619
… …
558 * arg will be 624 * arg will be
559 * NULL for ~/.Xdefaults and 625 * NULL for ~/.Xdefaults and
560 * non-NULL for command-line options (need to allocate) 626 * non-NULL for command-line options (need to allocate)
561 */ 627 */
562#define NEWARGLIM 500 /* `reasonable' size */ 628#define NEWARGLIM 500 /* `reasonable' size */
629
630struct keysym_vocabulary_t
631{
632 const char *name;
633 unsigned short len;
634 unsigned short value;
635};
636keysym_vocabulary_t keysym_vocabulary[] =
637{
638 { "ISOLevel3", 9, Level3Mask },
639 { "AppKeypad", 9, AppKeypadMask },
640 { "Control", 7, ControlMask },
641 { "NumLock", 7, NumLockMask },
642 { "Shift", 5, ShiftMask },
643 { "Meta", 4, MetaMask },
644 { "Lock", 4, LockMask },
645 { "Mod1", 4, Mod1Mask },
646 { "Mod2", 4, Mod2Mask },
647 { "Mod3", 4, Mod3Mask },
648 { "Mod4", 4, Mod4Mask },
649 { "Mod5", 4, Mod5Mask },
650 { "I", 1, Level3Mask },
651 { "K", 1, AppKeypadMask },
652 { "C", 1, ControlMask },
653 { "N", 1, NumLockMask },
654 { "S", 1, ShiftMask },
655 { "M", 1, MetaMask },
656 { "A", 1, MetaMask },
657 { "L", 1, LockMask },
658 { "1", 1, Mod1Mask },
659 { "2", 1, Mod2Mask },
660 { "3", 1, Mod3Mask },
661 { "4", 1, Mod4Mask },
662 { "5", 1, Mod5Mask },
663};
664
563int 665int
564rxvt_term::parse_keysym (const char *str, const char *arg) 666rxvt_term::parse_keysym (const char *str, const char *arg)
565{ 667{
566 int n, sym; 668 int n, sym;
567 char *key_string, *newarg = NULL; 669 unsigned int state = 0;
670 const char *pmodend = NULL;
671 char *newarg = NULL;
568 char newargstr[NEWARGLIM]; 672 char newargstr[NEWARGLIM];
569 673
570 if (arg == NULL) 674 if (arg == NULL)
571 { 675 {
572 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 676 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
573 return 0; 677 return 0;
678
574 str += n; /* skip `keysym.' */ 679 str += n; /* skip `keysym.' */
680 if ((pmodend = strchr (str, ':')) < str)
681 return -1;
575 } 682 }
683 else
684 pmodend = str + strlen(str);
685
686 for (--pmodend; str < pmodend; --pmodend)
687 if (*pmodend == '-')
688 break;
689
690 while (str < pmodend)
691 {
692 unsigned int i;
693
694 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
695 {
696 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
697 {
698 state |= keysym_vocabulary[i].value;
699 str += keysym_vocabulary[i].len;
700 break;
701 }
702 }
703
704 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
705 return -1;
706
707 if (*str == '-')
708 ++str;
709 }
710
576 /* some scanf () have trouble with a 0x prefix */ 711 /* some scanf () have trouble with a 0x prefix */
577 if (isdigit (str[0])) 712 if (str[0] == '0' && toupper (str[1]) == 'X')
578 { 713 {
579 if (str[0] == '0' && toupper (str[1]) == 'X')
580 str += 2; 714 str += 2;
715
581 if (arg) 716 if (arg)
582 { 717 {
583 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 718 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
584 return -1; 719 return -1;
585 } 720 }
586 else 721 else
587 { 722 {
588 if (sscanf (str, "%x:", &sym) != 1) 723 if (sscanf (str, "%x:", &sym) != 1)
589 return -1; 724 return -1;
590 725
591 /* cue to ':', it's there since sscanf () worked */ 726 /* cue to ':', it's there since sscanf () worked */
592 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 727 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
593 newargstr[NEWARGLIM - 1] = '\0'; 728 newargstr[NEWARGLIM - 1] = '\0';
594 newarg = newargstr; 729 newarg = newargstr;
595 } 730 }
596 } 731 }
597 else 732 else
598 { 733 {
599 /* 734 /*
600 * convert keysym name to keysym number 735 * convert keysym name to keysym number
601 */ 736 */
602 STRNCPY (newargstr, str, NEWARGLIM - 1); 737 strncpy (newargstr, str, NEWARGLIM - 1);
603 newargstr[NEWARGLIM - 1] = '\0'; 738 newargstr[NEWARGLIM - 1] = '\0';
739
604 if (arg == NULL) 740 if (arg == NULL)
605 { 741 {
606 if ((newarg = STRCHR (newargstr, ':')) == NULL) 742 if ((newarg = strchr (newargstr, ':')) == NULL)
607 return -1; 743 return -1;
744
608 *newarg++ = '\0'; /* terminate keysym name */ 745 *newarg++ = '\0'; /* terminate keysym name */
609 } 746 }
747
610 if ((sym = XStringToKeysym (newargstr)) == None) 748 if ((sym = XStringToKeysym (newargstr)) == None)
611 return -1; 749 return -1;
612 } 750 }
613 751
614 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */
615 return -1;
616 sym &= 0xFF;
617 if (Keysym_map[sym] != NULL) /* already set ? */
618 return -1;
619
620 if (newarg == NULL) 752 if (newarg == NULL)
621 { 753 {
622 STRNCPY (newargstr, arg, NEWARGLIM - 1); 754 strncpy (newargstr, arg, NEWARGLIM - 1);
623 newargstr[NEWARGLIM - 1] = '\0'; 755 newargstr[NEWARGLIM - 1] = '\0';
624 newarg = newargstr; 756 newarg = newargstr;
625 } 757 }
758
626 rxvt_Str_trim (newarg); 759 rxvt_Str_trim (newarg);
627 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 760 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
628 return -1; 761 return -1;
629 MIN_IT (n, 255);
630 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
631 762
632 key_string[0] = n; 763 keyboard->register_user_translation (sym, state, newarg);
633 STRNCPY (key_string + 1, newarg, n);
634 Keysym_map[sym] = (unsigned char *)key_string;
635
636 return 1; 764 return 1;
637} 765}
638 766
639# endif /* KEYSYM_RESOURCE */ 767# endif /* KEYSYM_RESOURCE */
640 768
… …
650 char *str, buffer[256]; 778 char *str, buffer[256];
651 779
652 if (stream == NULL) 780 if (stream == NULL)
653 return; 781 return;
654 782
655 len = STRLEN (name); 783 len = strlen (name);
656 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 784 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
657 { 785 {
658 unsigned int entry, n; 786 unsigned int entry, n;
659 787
660 while (*str && isspace (*str)) 788 while (*str && isspace (*str))
661 str++; /* leading whitespace */ 789 str++; /* leading whitespace */
662 790
663 if ((str[len] != '*' && str[len] != '.') 791 if ((str[len] != '*' && str[len] != '.')
664 || (len && STRNCMP (str, name, len))) 792 || (len && strncmp (str, name, len)))
665 continue; 793 continue;
666 str += (len + 1); /* skip `name*' or `name.' */ 794 str += (len + 1); /* skip `name*' or `name.' */
667 795
668# ifdef KEYSYM_RESOURCE 796# ifdef KEYSYM_RESOURCE
669 if (!parse_keysym (str, NULL)) 797 if (!parse_keysym (str, NULL))
… …
673 const char *kw = optList[entry].kw; 801 const char *kw = optList[entry].kw;
674 802
675 if (kw == NULL) 803 if (kw == NULL)
676 continue; 804 continue;
677 805
678 n = STRLEN (kw); 806 n = strlen (kw);
679 if (str[n] == ':' && rxvt_Str_match (str, kw)) 807 if (str[n] == ':' && rxvt_Str_match (str, kw))
680 { 808 {
681 /* skip `keyword:' */ 809 /* skip `keyword:' */
682 str += n + 1; 810 str += n + 1;
683 rxvt_Str_trim (str); 811 rxvt_Str_trim (str);
684 n = STRLEN (str); 812 n = strlen (str);
685 if (n && rs[optList[entry].doff] == NULL) 813 if (n && rs[optList[entry].doff] == NULL)
686 { 814 {
687 /* not already set */ 815 /* not already set */
688 int s; 816 int s;
689 char *p = 0; 817 char *p = 0;
690 818
691 for (int o = 0;;) 819 for (int o = 0;;)
692 { 820 {
693 p = (char *)rxvt_realloc (p, o + n + 1); 821 p = (char *)rxvt_realloc (p, o + n + 1);
694 MEMCPY (p + o, str, n); 822 memcpy (p + o, str, n);
695 o += n; 823 o += n;
696 p[o] = 0; 824 p[o] = 0;
697 825
698 if (o == 0 || p[o - 1] != '\\') // continuation line 826 if (o == 0 || p[o - 1] != '\\') // continuation line
699 break; 827 break;
… …
702 830
703 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 831 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
704 break; 832 break;
705 833
706 rxvt_Str_trim (str); 834 rxvt_Str_trim (str);
707 n = STRLEN (str); 835 n = strlen (str);
708 } 836 }
709 837
710 rs[optList[entry].doff] = p; 838 rs[optList[entry].doff] = p;
711 allocated.push_back (p); 839 allocated.push_back (p);
712 840
713 if (optList_isBool (entry)) 841 if (optList_isBool (entry))
714 { 842 {
715 s = STRCASECMP (str, "TRUE") == 0 843 s = strcasecmp (str, "TRUE") == 0
716 || STRCASECMP (str, "YES") == 0 844 || strcasecmp (str, "YES") == 0
717 || STRCASECMP (str, "ON") == 0 845 || strcasecmp (str, "ON") == 0
718 || STRCASECMP (str, "1") == 0; 846 || strcasecmp (str, "1") == 0;
719 847
720 if (optList_isReverse (entry)) 848 if (optList_isReverse (entry))
721 s = !s; 849 s = !s;
722 850
723 if (s) 851 if (s)
724 Options |= optList[entry].flag; 852 options |= optList[entry].flag;
725 else 853 else
726 Options &= ~optList[entry].flag; 854 options &= ~optList[entry].flag;
727 } 855 }
728 } 856 }
729 857
730 break; 858 break;
731 } 859 }
… …
790 database = XrmGetStringDatabase (displayResource); 918 database = XrmGetStringDatabase (displayResource);
791 919
792# ifdef HAVE_EXTRA_XRESOURCE_FILES 920# ifdef HAVE_EXTRA_XRESOURCE_FILES
793 /* Add in ~/.Xdefaults or ~/.Xresources */ 921 /* Add in ~/.Xdefaults or ~/.Xresources */
794 { 922 {
795 char *ptr; 923 char *ptr;
796 924
797 if ((ptr = (char *)getenv ("HOME")) == NULL) 925 if ((ptr = (char *)getenv ("HOME")) == NULL)
798 ptr = "."; 926 ptr = ".";
799 927
800 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 928 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
801 { 929 {
802 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 930 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
803 ptr, xnames[i]); 931 ptr, xnames[i]);
804 if ((rdb1 = XrmGetFileDatabase (fname))) 932 if ((rdb1 = XrmGetFileDatabase (fname)))
805 { 933 {
806 XrmMergeDatabases (rdb1, &database); 934 XrmMergeDatabases (rdb1, &database);
807# ifndef HAVE_BOTH_XRESOURCE_FILES 935# ifndef HAVE_BOTH_XRESOURCE_FILES
808 break; 936 break;
809# endif 937# endif
810
811 } 938 }
812 } 939 }
813 } 940 }
814# endif 941# endif
815 942
… …
852 if (kw == NULL || rs[optList[entry].doff] != NULL) 979 if (kw == NULL || rs[optList[entry].doff] != NULL)
853 continue; /* previously set */ 980 continue; /* previously set */
854 981
855 p = XGetDefault (display, name, kw); 982 p = XGetDefault (display, name, kw);
856 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 983 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
857 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 984 if (p == NULL || (p0 && strcmp (p, p0) == 0))
858 { 985 {
859 p = XGetDefault (display, RESCLASS, kw); 986 p = XGetDefault (display, RESCLASS, kw);
860#ifdef RESFALLBACK 987#ifdef RESFALLBACK
861 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 988 if (p == NULL || (p0 && strcmp (p, p0) == 0))
862 p = XGetDefault (display, RESFALLBACK, kw); 989 p = XGetDefault (display, RESFALLBACK, kw);
863#endif 990#endif
864 } 991 }
865 992
866 if (p == NULL && p0) 993 if (p == NULL && p0)
… …
870 { 997 {
871 rs[optList[entry].doff] = p; 998 rs[optList[entry].doff] = p;
872 999
873 if (optList_isBool (entry)) 1000 if (optList_isBool (entry))
874 { 1001 {
875 s = STRCASECMP (p, "TRUE") == 0 1002 s = strcasecmp (p, "TRUE") == 0
876 || STRCASECMP (p, "YES") == 0 1003 || strcasecmp (p, "YES") == 0
877 || STRCASECMP (p, "ON") == 0 1004 || strcasecmp (p, "ON") == 0
878 || STRCASECMP (p, "1") == 0; 1005 || strcasecmp (p, "1") == 0;
879 if (optList_isReverse (entry)) 1006 if (optList_isReverse (entry))
880 s = !s; 1007 s = !s;
881 if (s) 1008 if (s)
882 Options |= (optList[entry].flag); 1009 options |= (optList[entry].flag);
883 else 1010 else
884 Options &= ~ (optList[entry].flag); 1011 options &= ~ (optList[entry].flag);
885 } 1012 }
886 } 1013 }
887 } 1014 }
888 1015
889 /* 1016 /*
… …
912# endif 1039# endif
913# endif 1040# endif
914 1041
915# else /* USE_XGETDEFAULT */ 1042# else /* USE_XGETDEFAULT */
916 /* get resources the hard way, but save lots of memory */ 1043 /* get resources the hard way, but save lots of memory */
917 FILE *fd = NULL; 1044 FILE *fd = NULL;
918 char *home; 1045 char *home;
919 1046
920 if ((home = getenv ("HOME")) != NULL) 1047 if ((home = getenv ("HOME")) != NULL)
921 { 1048 {
922 unsigned int i, len = STRLEN (home) + 2; 1049 unsigned int i, len = strlen (home) + 2;
923 char *f = NULL; 1050 char *f = NULL;
924 1051
925 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 1052 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
926 { 1053 {
927 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char)); 1054 f = (char *)rxvt_realloc (f, len + strlen (xnames[i]));
928 1055
929 sprintf (f, "%s/%s", home, xnames[i]); 1056 sprintf (f, "%s/%s", home, xnames[i]);
930 1057
931 if ((fd = fopen (f, "r")) != NULL) 1058 if ((fd = fopen (f, "r")) != NULL)
932 break; 1059 break;
933 } 1060 }
1061
934 free (f); 1062 free (f);
935 } 1063 }
936 /* 1064 /*
937 * The normal order to match resources is the following: 1065 * The normal order to match resources is the following:
938 * @ global resources (partial match, ~/.Xdefaults) 1066 * @ global resources (partial match, ~/.Xdefaults)

Diff Legend

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