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.30 by root, Fri Aug 13 03:36:57 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: "
257#if XFT 266#if XFT
258 "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,"
259#endif 280#endif
260#if UNICODE_3 281#if UNICODE_3
261 "unicode3," 282 "unicode3,"
262#endif 283#endif
263 "encodings=eu+vn" 284 "encodings=eu+vn"
… …
268 "+jp-ext" 289 "+jp-ext"
269#endif 290#endif
270#if ENCODING_KR 291#if ENCODING_KR
271 "+kr" 292 "+kr"
272#endif 293#endif
273#if ENCODING_CN 294#if ENCODING_ZH
274 "+cn" 295 "+zh"
275#endif 296#endif
276#if ENCODING_CN_EXT 297#if ENCODING_ZH_EXT
277 "+cn-ext" 298 "+zh-ext"
278#endif 299#endif
279 "," 300 ","
280#if ENABLE_COMBINING
281 "combining,"
282#endif
283#if TEXT_BLINK
284 "blink,"
285#endif
286#if OFF_FOCUS_FADING 301#if OFF_FOCUS_FADING
287 "fade," 302 "fade,"
288#endif 303#endif
289#if defined(XPM_BACKGROUND) 304#if defined(XPM_BACKGROUND)
290 "XPM," 305 "XPM,"
… …
341 "8bitctrls," 356 "8bitctrls,"
342#endif 357#endif
343#if !defined(NO_STRINGS) 358#if !defined(NO_STRINGS)
344 "strings," 359 "strings,"
345#endif 360#endif
346#if !defined(NO_FRILLS) 361#if defined(ENABLE_FRILLS)
347 "frills," 362 "frills,"
348#endif
349#if !defined(NO_LINESPACE)
350 "linespace,"
351#endif 363#endif
352#if defined(PREFER_24BIT) 364#if defined(PREFER_24BIT)
353 "24bit," 365 "24bit,"
354#endif 366#endif
355#if defined(SELECTION_SCROLLING) 367#if defined(SELECTION_SCROLLING)
… …
361#if MOUSE_SLIP_WHEELING 373#if MOUSE_SLIP_WHEELING
362 "slipwheel," 374 "slipwheel,"
363#endif 375#endif
364#if defined(SMART_RESIZE) 376#if defined(SMART_RESIZE)
365 "smart-resize," 377 "smart-resize,"
366#endif
367#if defined(TTY_256COLOR)
368 "256colour,"
369#endif 378#endif
370#if defined(CURSOR_BLINK) 379#if defined(CURSOR_BLINK)
371 "cursorBlink," 380 "cursorBlink,"
372#endif 381#endif
373#if defined(POINTER_BLANK) 382#if defined(POINTER_BLANK)
… …
412 len++; /* account for space */ 421 len++; /* account for space */
413 } 422 }
414#ifdef DEBUG_STRICT 423#ifdef DEBUG_STRICT
415 assert (optList[i].opt != NULL); 424 assert (optList[i].opt != NULL);
416#endif 425#endif
417 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 426 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
418 col += len; 427 col += len;
419 if (col > 79) 428 if (col > 79)
420 { /* assume regular width */ 429 { /* assume regular width */
421 rxvt_log ("\n"); 430 rxvt_log ("\n");
422 col = 1 + len; 431 col = 1 + len;
… …
439#ifdef DEBUG_STRICT 448#ifdef DEBUG_STRICT
440 assert (optList[i].opt != NULL); 449 assert (optList[i].opt != NULL);
441#endif 450#endif
442 rxvt_log (" %s%s %-*s%s%s\n", 451 rxvt_log (" %s%s %-*s%s%s\n",
443 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 452 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
444 (INDENT - STRLEN (optList[i].opt) 453 (INDENT - strlen (optList[i].opt)
445 + (optList_isBool (i) ? 0 : 2)), 454 + (optList_isBool (i) ? 0 : 2)),
446 (optList[i].arg ? optList[i].arg : ""), 455 (optList[i].arg ? optList[i].arg : ""),
447 (optList_isBool (i) ? "turn on/off " : ""), 456 (optList_isBool (i) ? "turn on/off " : ""),
448 optList[i].desc); 457 optList[i].desc);
449 } 458 }
… …
456 465
457 for (i = 0; i < optList_size (); i++) 466 for (i = 0; i < optList_size (); i++)
458 if (optList[i].kw != NULL) 467 if (optList[i].kw != NULL)
459 rxvt_log (" %s: %*s%s\n", 468 rxvt_log (" %s: %*s%s\n",
460 optList[i].kw, 469 optList[i].kw,
461 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 470 (INDENT - strlen (optList[i].kw)), "", /* XXX */
462 (optList_isBool (i) ? "boolean" : optList[i].arg)); 471 (optList_isBool (i) ? "boolean" : optList[i].arg));
463#ifdef KEYSYM_RESOURCE 472#ifdef KEYSYM_RESOURCE
464 rxvt_log (" " "keysym.sym" ": %*s%s\n", 473 rxvt_log (" " "keysym.sym" ": %*s%s\n",
465 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 474 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
466 "keysym"); 475 "keysym");
… …
509 bad_option = 1; 518 bad_option = 1;
510 rxvt_warn ("\"%s\": malformed option.\n", opt); 519 rxvt_warn ("\"%s\": malformed option.\n", opt);
511 continue; 520 continue;
512 } 521 }
513 522
514 if (!STRCMP (opt, "help")) 523 if (!strcmp (opt, "help"))
515 rxvt_usage (longopt ? 2 : 1); 524 rxvt_usage (longopt ? 2 : 1);
516 if (!STRCMP (opt, "h")) 525 if (!strcmp (opt, "h"))
517 rxvt_usage (0); 526 rxvt_usage (0);
518 527
519 /* feature: always try to match long-options */ 528 /* feature: always try to match long-options */
520 for (entry = 0; entry < optList_size (); entry++) 529 for (entry = 0; entry < optList_size (); entry++)
521 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 530 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
522 || (!longopt 531 || (!longopt
523 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 532 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
524 break; 533 break;
525 534
526 if (entry < optList_size ()) 535 if (entry < optList_size ())
527 { 536 {
528 if (optList_isReverse (entry)) 537 if (optList_isReverse (entry))
… …
545#ifdef DEBUG_RESOURCES 554#ifdef DEBUG_RESOURCES
546 fprintf (stderr, "boolean (%s,%s) = %s\n", 555 fprintf (stderr, "boolean (%s,%s) = %s\n",
547 optList[entry].opt, optList[entry].kw, flag); 556 optList[entry].opt, optList[entry].kw, flag);
548#endif 557#endif
549 if (flag == On) 558 if (flag == On)
550 Options |= (optList[entry].flag); 559 options |= (optList[entry].flag);
551 else 560 else
552 Options &= ~ (optList[entry].flag); 561 options &= ~ (optList[entry].flag);
553 562
554 if (optList[entry].doff != -1) 563 if (optList[entry].doff != -1)
555 rs[optList[entry].doff] = flag; 564 rs[optList[entry].doff] = flag;
556 } 565 }
557 } 566 }
558 else 567 else
559#ifdef KEYSYM_RESOURCE 568#ifdef KEYSYM_RESOURCE
560 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 569 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
561 if (rxvt_Str_match (opt, "keysym.")) 570 if (rxvt_Str_match (opt, "keysym."))
562 { 571 {
563 const char *str = argv[++i]; 572 const char *str = argv[++i];
564 573
565 if (str != NULL) 574 if (str != NULL)
… …
596 XrmQuarkList quarks, 605 XrmQuarkList quarks,
597 XrmRepresentation *type __attribute__((unused)), 606 XrmRepresentation *type __attribute__((unused)),
598 XrmValue *value, 607 XrmValue *value,
599 XPointer closure __attribute__((unused))) 608 XPointer closure __attribute__((unused)))
600{ 609{
601 int last; 610 int last;
602 611
603 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 */
604 ; 613 ;
614
605 last--; 615 last--;
606 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
607 return False; 617 return False;
608} 618}
609 619
… …
614 * arg will be 624 * arg will be
615 * NULL for ~/.Xdefaults and 625 * NULL for ~/.Xdefaults and
616 * non-NULL for command-line options (need to allocate) 626 * non-NULL for command-line options (need to allocate)
617 */ 627 */
618#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
619int 665int
620rxvt_term::parse_keysym (const char *str, const char *arg) 666rxvt_term::parse_keysym (const char *str, const char *arg)
621{ 667{
622 int n, sym; 668 int n, sym;
623 char *key_string, *newarg = NULL; 669 unsigned int state = 0;
670 const char *pmodend = NULL;
671 char *newarg = NULL;
624 char newargstr[NEWARGLIM]; 672 char newargstr[NEWARGLIM];
625 673
626 if (arg == NULL) 674 if (arg == NULL)
627 { 675 {
628 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 676 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
629 return 0; 677 return 0;
678
630 str += n; /* skip `keysym.' */ 679 str += n; /* skip `keysym.' */
680 if ((pmodend = strchr (str, ':')) < str)
681 return -1;
631 } 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
632 /* some scanf () have trouble with a 0x prefix */ 711 /* some scanf () have trouble with a 0x prefix */
633 if (isdigit (str[0])) 712 if (str[0] == '0' && toupper (str[1]) == 'X')
634 { 713 {
635 if (str[0] == '0' && toupper (str[1]) == 'X')
636 str += 2; 714 str += 2;
715
637 if (arg) 716 if (arg)
638 { 717 {
639 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 718 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
640 return -1; 719 return -1;
641 } 720 }
642 else 721 else
643 { 722 {
644 if (sscanf (str, "%x:", &sym) != 1) 723 if (sscanf (str, "%x:", &sym) != 1)
645 return -1; 724 return -1;
646 725
647 /* cue to ':', it's there since sscanf () worked */ 726 /* cue to ':', it's there since sscanf () worked */
648 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 727 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
649 newargstr[NEWARGLIM - 1] = '\0'; 728 newargstr[NEWARGLIM - 1] = '\0';
650 newarg = newargstr; 729 newarg = newargstr;
651 } 730 }
652 } 731 }
653 else 732 else
654 { 733 {
655 /* 734 /*
656 * convert keysym name to keysym number 735 * convert keysym name to keysym number
657 */ 736 */
658 STRNCPY (newargstr, str, NEWARGLIM - 1); 737 strncpy (newargstr, str, NEWARGLIM - 1);
659 newargstr[NEWARGLIM - 1] = '\0'; 738 newargstr[NEWARGLIM - 1] = '\0';
739
660 if (arg == NULL) 740 if (arg == NULL)
661 { 741 {
662 if ((newarg = STRCHR (newargstr, ':')) == NULL) 742 if ((newarg = strchr (newargstr, ':')) == NULL)
663 return -1; 743 return -1;
744
664 *newarg++ = '\0'; /* terminate keysym name */ 745 *newarg++ = '\0'; /* terminate keysym name */
665 } 746 }
747
666 if ((sym = XStringToKeysym (newargstr)) == None) 748 if ((sym = XStringToKeysym (newargstr)) == None)
667 return -1; 749 return -1;
668 } 750 }
669 751
670 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */
671 return -1;
672 sym &= 0xFF;
673 if (Keysym_map[sym] != NULL) /* already set ? */
674 return -1;
675
676 if (newarg == NULL) 752 if (newarg == NULL)
677 { 753 {
678 STRNCPY (newargstr, arg, NEWARGLIM - 1); 754 strncpy (newargstr, arg, NEWARGLIM - 1);
679 newargstr[NEWARGLIM - 1] = '\0'; 755 newargstr[NEWARGLIM - 1] = '\0';
680 newarg = newargstr; 756 newarg = newargstr;
681 } 757 }
758
682 rxvt_Str_trim (newarg); 759 rxvt_Str_trim (newarg);
683 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 760 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
684 return -1; 761 return -1;
685 MIN_IT (n, 255);
686 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
687 762
688 key_string[0] = n; 763 keyboard->register_user_translation (sym, state, newarg);
689 STRNCPY (key_string + 1, newarg, n);
690 Keysym_map[sym] = (unsigned char *)key_string;
691
692 return 1; 764 return 1;
693} 765}
694 766
695# endif /* KEYSYM_RESOURCE */ 767# endif /* KEYSYM_RESOURCE */
696 768
… …
706 char *str, buffer[256]; 778 char *str, buffer[256];
707 779
708 if (stream == NULL) 780 if (stream == NULL)
709 return; 781 return;
710 782
711 len = STRLEN (name); 783 len = strlen (name);
712 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 784 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
713 { 785 {
714 unsigned int entry, n; 786 unsigned int entry, n;
715 787
716 while (*str && isspace (*str)) 788 while (*str && isspace (*str))
717 str++; /* leading whitespace */ 789 str++; /* leading whitespace */
718 790
719 if ((str[len] != '*' && str[len] != '.') 791 if ((str[len] != '*' && str[len] != '.')
720 || (len && STRNCMP (str, name, len))) 792 || (len && strncmp (str, name, len)))
721 continue; 793 continue;
722 str += (len + 1); /* skip `name*' or `name.' */ 794 str += (len + 1); /* skip `name*' or `name.' */
723 795
724# ifdef KEYSYM_RESOURCE 796# ifdef KEYSYM_RESOURCE
725 if (!parse_keysym (str, NULL)) 797 if (!parse_keysym (str, NULL))
… …
729 const char *kw = optList[entry].kw; 801 const char *kw = optList[entry].kw;
730 802
731 if (kw == NULL) 803 if (kw == NULL)
732 continue; 804 continue;
733 805
734 n = STRLEN (kw); 806 n = strlen (kw);
735 if (str[n] == ':' && rxvt_Str_match (str, kw)) 807 if (str[n] == ':' && rxvt_Str_match (str, kw))
736 { 808 {
737 /* skip `keyword:' */ 809 /* skip `keyword:' */
738 str += n + 1; 810 str += n + 1;
739 rxvt_Str_trim (str); 811 rxvt_Str_trim (str);
740 n = STRLEN (str); 812 n = strlen (str);
741 if (n && rs[optList[entry].doff] == NULL) 813 if (n && rs[optList[entry].doff] == NULL)
742 { 814 {
743 /* not already set */ 815 /* not already set */
744 int s; 816 int s;
745 char *p = 0; 817 char *p = 0;
746 818
747 for (int o = 0;;) 819 for (int o = 0;;)
748 { 820 {
749 p = (char *)rxvt_realloc (p, o + n + 1); 821 p = (char *)rxvt_realloc (p, o + n + 1);
750 MEMCPY (p + o, str, n); 822 memcpy (p + o, str, n);
751 o += n; 823 o += n;
752 p[o] = 0; 824 p[o] = 0;
753 825
754 if (o == 0 || p[o - 1] != '\\') // continuation line 826 if (o == 0 || p[o - 1] != '\\') // continuation line
755 break; 827 break;
… …
758 830
759 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 831 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
760 break; 832 break;
761 833
762 rxvt_Str_trim (str); 834 rxvt_Str_trim (str);
763 n = STRLEN (str); 835 n = strlen (str);
764 } 836 }
765 837
766 rs[optList[entry].doff] = p; 838 rs[optList[entry].doff] = p;
767 allocated.push_back (p); 839 allocated.push_back (p);
768 840
769 if (optList_isBool (entry)) 841 if (optList_isBool (entry))
770 { 842 {
771 s = STRCASECMP (str, "TRUE") == 0 843 s = strcasecmp (str, "TRUE") == 0
772 || STRCASECMP (str, "YES") == 0 844 || strcasecmp (str, "YES") == 0
773 || STRCASECMP (str, "ON") == 0 845 || strcasecmp (str, "ON") == 0
774 || STRCASECMP (str, "1") == 0; 846 || strcasecmp (str, "1") == 0;
775 847
776 if (optList_isReverse (entry)) 848 if (optList_isReverse (entry))
777 s = !s; 849 s = !s;
778 850
779 if (s) 851 if (s)
780 Options |= optList[entry].flag; 852 options |= optList[entry].flag;
781 else 853 else
782 Options &= ~optList[entry].flag; 854 options &= ~optList[entry].flag;
783 } 855 }
784 } 856 }
785 857
786 break; 858 break;
787 } 859 }
… …
846 database = XrmGetStringDatabase (displayResource); 918 database = XrmGetStringDatabase (displayResource);
847 919
848# ifdef HAVE_EXTRA_XRESOURCE_FILES 920# ifdef HAVE_EXTRA_XRESOURCE_FILES
849 /* Add in ~/.Xdefaults or ~/.Xresources */ 921 /* Add in ~/.Xdefaults or ~/.Xresources */
850 { 922 {
851 char *ptr; 923 char *ptr;
852 924
853 if ((ptr = (char *)getenv ("HOME")) == NULL) 925 if ((ptr = (char *)getenv ("HOME")) == NULL)
854 ptr = "."; 926 ptr = ".";
855 927
856 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 928 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
857 { 929 {
858 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 930 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,
859 ptr, xnames[i]); 931 ptr, xnames[i]);
860 if ((rdb1 = XrmGetFileDatabase (fname))) 932 if ((rdb1 = XrmGetFileDatabase (fname)))
861 { 933 {
862 XrmMergeDatabases (rdb1, &database); 934 XrmMergeDatabases (rdb1, &database);
863# ifndef HAVE_BOTH_XRESOURCE_FILES 935# ifndef HAVE_BOTH_XRESOURCE_FILES
864 break; 936 break;
865# endif 937# endif
866
867 } 938 }
868 } 939 }
869 } 940 }
870# endif 941# endif
871 942
… …
908 if (kw == NULL || rs[optList[entry].doff] != NULL) 979 if (kw == NULL || rs[optList[entry].doff] != NULL)
909 continue; /* previously set */ 980 continue; /* previously set */
910 981
911 p = XGetDefault (display, name, kw); 982 p = XGetDefault (display, name, kw);
912 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 983 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
913 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 984 if (p == NULL || (p0 && strcmp (p, p0) == 0))
914 { 985 {
915 p = XGetDefault (display, RESCLASS, kw); 986 p = XGetDefault (display, RESCLASS, kw);
916#ifdef RESFALLBACK 987#ifdef RESFALLBACK
917 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 988 if (p == NULL || (p0 && strcmp (p, p0) == 0))
918 p = XGetDefault (display, RESFALLBACK, kw); 989 p = XGetDefault (display, RESFALLBACK, kw);
919#endif 990#endif
920 } 991 }
921 992
922 if (p == NULL && p0) 993 if (p == NULL && p0)
… …
926 { 997 {
927 rs[optList[entry].doff] = p; 998 rs[optList[entry].doff] = p;
928 999
929 if (optList_isBool (entry)) 1000 if (optList_isBool (entry))
930 { 1001 {
931 s = STRCASECMP (p, "TRUE") == 0 1002 s = strcasecmp (p, "TRUE") == 0
932 || STRCASECMP (p, "YES") == 0 1003 || strcasecmp (p, "YES") == 0
933 || STRCASECMP (p, "ON") == 0 1004 || strcasecmp (p, "ON") == 0
934 || STRCASECMP (p, "1") == 0; 1005 || strcasecmp (p, "1") == 0;
935 if (optList_isReverse (entry)) 1006 if (optList_isReverse (entry))
936 s = !s; 1007 s = !s;
937 if (s) 1008 if (s)
938 Options |= (optList[entry].flag); 1009 options |= (optList[entry].flag);
939 else 1010 else
940 Options &= ~ (optList[entry].flag); 1011 options &= ~ (optList[entry].flag);
941 } 1012 }
942 } 1013 }
943 } 1014 }
944 1015
945 /* 1016 /*
… …
968# endif 1039# endif
969# endif 1040# endif
970 1041
971# else /* USE_XGETDEFAULT */ 1042# else /* USE_XGETDEFAULT */
972 /* get resources the hard way, but save lots of memory */ 1043 /* get resources the hard way, but save lots of memory */
973 FILE *fd = NULL; 1044 FILE *fd = NULL;
974 char *home; 1045 char *home;
975 1046
976 if ((home = getenv ("HOME")) != NULL) 1047 if ((home = getenv ("HOME")) != NULL)
977 { 1048 {
978 unsigned int i, len = STRLEN (home) + 2; 1049 unsigned int i, len = strlen (home) + 2;
979 char *f = NULL; 1050 char *f = NULL;
980 1051
981 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 1052 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
982 { 1053 {
983 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char)); 1054 f = (char *)rxvt_realloc (f, len + strlen (xnames[i]));
984 1055
985 sprintf (f, "%s/%s", home, xnames[i]); 1056 sprintf (f, "%s/%s", home, xnames[i]);
986 1057
987 if ((fd = fopen (f, "r")) != NULL) 1058 if ((fd = fopen (f, "r")) != NULL)
988 break; 1059 break;
989 } 1060 }
1061
990 free (f); 1062 free (f);
991 } 1063 }
992 /* 1064 /*
993 * The normal order to match resources is the following: 1065 * The normal order to match resources is the following:
994 * @ global resources (partial match, ~/.Xdefaults) 1066 * @ global resources (partial match, ~/.Xdefaults)

Diff Legend

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