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.101 by ayin, Thu May 3 18:11:08 2007 UTC vs.
Revision 1.120 by ayin, Thu Nov 15 11:36:15 2007 UTC

… …
32#endif 32#endif
33 33
34/* place holders used for parsing command-line options */ 34/* place holders used for parsing command-line options */
35#define Optflag_Reverse 1 35#define Optflag_Reverse 1
36#define Optflag_Boolean 2 36#define Optflag_Boolean 2
37#define Optflag_Switch 4
37 38
38/* monolithic option/resource structure: */ 39/* monolithic option/resource structure: */
39/* 40/*
40 * `string' options MUST have a usage argument 41 * `string' options MUST have a usage argument
41 * `switch' and `boolean' options have no argument 42 * `switch' and `boolean' options have no argument
… …
58#define BOOL(rsp, kw, opt, option, flag, desc) \ 59#define BOOL(rsp, kw, opt, option, flag, desc) \
59 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 60 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
60 61
61/* SWCH () - `-' flag */ 62/* SWCH () - `-' flag */
62#define SWCH(opt, option, flag, desc) \ 63#define SWCH(opt, option, flag, desc) \
63 { (option), (flag), -1, NULL, (opt), NULL, (desc)} 64 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
64 65
65/* convenient macros */ 66/* convenient macros */
66#define optList_strlen(i) \ 67#define optList_strlen(i) \
67 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
68#define optList_isBool(i) \ 69#define optList_isBool(i) \
… …
92 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 93 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
93 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 94 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 96 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 97 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
98 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
97 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 99 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
98#if HAVE_SCROLLBARS 100#if HAVE_SCROLLBARS
99 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
100 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
101 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), 103 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
… …
105#endif 107#endif
106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
107 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
110#if TRANSPARENT 112#if ENABLE_TRANSPARENCY
111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
112 SWCH ("tr", Opt_transparent, 0, NULL), 114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
113# if TINTING
114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
115# endif 116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."),
116#endif 117#endif
117#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 119 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
119 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
120#endif
121#if TINTING
122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
123#endif 121#endif
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
125#ifndef NO_BELL 123#ifndef NO_BELL
126# if ENABLE_FRILLS 124# if ENABLE_FRILLS
127 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), 125 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
… …
169#ifndef NO_BOLD_UNDERLINE_REVERSE 167#ifndef NO_BOLD_UNDERLINE_REVERSE
170 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 168 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
171 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 169 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
172 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 170 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
173 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
174#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
175#if ENABLE_FRILLS 173#if ENABLE_FRILLS
176 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
177#endif 175#endif
178#ifdef KEEP_SCROLLCOLOR 176#ifdef KEEP_SCROLLCOLOR
179 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
180 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
181#endif /* KEEP_SCROLLCOLOR */ 179#endif /* KEEP_SCROLLCOLOR */
182#ifdef OPTION_HC 180#ifdef OPTION_HC
183 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
184#endif 182#endif
185#ifndef NO_CURSORCOLOR 183#ifndef NO_CURSORCOLOR
186 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
187 /* command-line option = resource name */ 185 /* command-line option = resource name */
188 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
189#endif /* NO_CURSORCOLOR */ 187#endif /* NO_CURSORCOLOR */
190 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
191 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
192 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
193#ifdef XPM_BACKGROUND 191#ifdef BG_IMAGE_FROM_FILE
194 RSTRG (Rs_path, "path", "search path"), 192 RSTRG (Rs_path, "path", "search path"),
195 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
196#endif 194#endif
197 /* fonts: command-line option = resource name */ 195 /* fonts: command-line option = resource name */
198 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
… …
205#ifdef USE_XIM 203#ifdef USE_XIM
206 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
207 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 205 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
208 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 206 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
209 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 207 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
210#endif /* USE_XIM */ 208#endif /* USE_XIM */
211 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 209 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
212 STRG (Rs_title, "title", "title", "string", "title name for window"), 210 STRG (Rs_title, "title", "title", "string", "title name for window"),
213 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 211 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
214 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
215 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 213 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
… …
246 RSTRG (Rs_print_pipe, "print-pipe", "string"), 244 RSTRG (Rs_print_pipe, "print-pipe", "string"),
247#endif 245#endif
248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 246 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
249#ifdef CUTCHAR_RESOURCE 247#ifdef CUTCHAR_RESOURCE
250 RSTRG (Rs_cutchars, "cutchars", "string"), 248 RSTRG (Rs_cutchars, "cutchars", "string"),
251#endif /* CUTCHAR_RESOURCE */ 249#endif /* CUTCHAR_RESOURCE */
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 250 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 251#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
256#endif 254#endif
… …
258 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 256 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
259 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 257 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
260 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 258 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
261 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 259 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
262#endif 260#endif
261#if ISO_14755
262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif
264#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
266 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
267#endif
263#ifndef NO_RESOURCES 268#ifndef NO_RESOURCES
264 INFO ("xrm", "string", "X resource"), 269 INFO ("xrm", "string", "X resource"),
265#endif 270#endif
266 INFO ("e", "command arg ...", "command to execute") 271 INFO ("e", "command arg ...", "command to execute")
267 }; 272 };
… …
313#endif 318#endif
314 "," 319 ","
315#if OFF_FOCUS_FADING 320#if OFF_FOCUS_FADING
316 "fade," 321 "fade,"
317#endif 322#endif
318#if defined(XPM_BACKGROUND)
319 "XPM,"
320#endif
321#if defined(TRANSPARENT) 323#if defined(ENABLE_TRANSPARENCY)
322 "transparent," 324 "transparent,"
323#endif
324#if TINTING
325 "tint," 325 "tint,"
326#endif
327#if HAVE_AFTERIMAGE
328 "afterimage,"
326#endif 329#endif
327#if defined(USE_XIM) 330#if defined(USE_XIM)
328 "XIM," 331 "XIM,"
329#endif 332#endif
330#if defined(NO_BACKSPACE_KEY) 333#if defined(NO_BACKSPACE_KEY)
… …
544 * default values 547 * default values
545 */ 548 */
546 549
547 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
548 { 551 {
549 if (flag == resval_on && !argv [i+1]) 552 if (flag == resval_on && i+1 == argc)
550 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
551 554
552 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
553 } 556 }
554 } 557 }
555 else 558 else
… …
560 rs[optList[entry].doff] = flag; 563 rs[optList[entry].doff] = flag;
561 } 564 }
562 } 565 }
563 else 566 else
564#ifdef KEYSYM_RESOURCE 567#ifdef KEYSYM_RESOURCE
565 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ 568 if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
566 if (rxvt_Str_match (opt, "keysym."))
567 { 569 {
568 const char *str = argv[++i]; 570 if (i+1 < argc)
569
570 if (str != NULL)
571 parse_keysym (opt + sizeof ("keysym.") - 1, str); 571 parse_keysym (opt + sizeof ("keysym.") - 1, argv[++i]);
572 } 572 }
573 else 573 else
574#endif 574#endif
575 { 575 {
576 bad_option = 1; 576 bad_option = 1;
… …
667 char *newarg = NULL; 667 char *newarg = NULL;
668 char newargstr[NEWARGLIM]; 668 char newargstr[NEWARGLIM];
669 669
670 if (arg == NULL) 670 if (arg == NULL)
671 { 671 {
672 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 672 n = sizeof ("keysym.") - 1;
673 if (strncmp (str, "keysym.", n))
673 return 0; 674 return 0;
674 675
675 str += n; /* skip `keysym.' */ 676 str += n; /* skip `keysym.' */
676 if (!(pmodend = strchr (str, ':'))) 677 if (!(pmodend = strchr (str, ':')))
677 return -1; 678 return -1;
… …
750 strncpy (newargstr, arg, NEWARGLIM - 1); 751 strncpy (newargstr, arg, NEWARGLIM - 1);
751 newargstr[NEWARGLIM - 1] = '\0'; 752 newargstr[NEWARGLIM - 1] = '\0';
752 newarg = newargstr; 753 newarg = newargstr;
753 } 754 }
754 755
755 rxvt_Str_trim (newarg); 756 if (*newarg == '\0')
756 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
757 return -1; 757 return -1;
758 758
759 keyboard->register_user_translation (sym, state, newarg); 759 keyboard->register_user_translation (sym, state, newarg);
760 return 1; 760 return 1;
761} 761}
762 762
763# endif /* KEYSYM_RESOURCE */ 763# endif /* KEYSYM_RESOURCE */
764#endif /* NO_RESOURCES */ 764#endif /* NO_RESOURCES */
765 765
766static char * 766static char *
767get_res (XrmDatabase database, const char *program, const char *option) 767get_res (XrmDatabase database, const char *program, const char *option)
768{ 768{
769 char resource[512]; 769 char resource[512];
… …
863 XrmEnumerateDatabase (database, name_prefix, class_prefix, 863 XrmEnumerateDatabase (database, name_prefix, class_prefix,
864 XrmEnumOneLevel, rxvt_define_key, NULL); 864 XrmEnumOneLevel, rxvt_define_key, NULL);
865# endif 865# endif
866# endif 866# endif
867 867
868#endif /* NO_RESOURCES */ 868#endif /* NO_RESOURCES */
869} 869}
870 870
871/*----------------------- end-of-file (C source) -----------------------*/ 871/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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