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.109 by sasha, Tue Jul 31 22:24:36 2007 UTC vs.
Revision 1.124 by ayin, Sat Nov 24 10:32:33 2007 UTC

… …
109 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"),
110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if ENABLE_TRANSPARENCY 112#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 SWCH ("tr", Opt_transparent, 0, NULL), 114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115# if TINTING
116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
117# endif 116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."),
118#endif 117#endif
119#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
120 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"),
121 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"),
122#endif
123#if TINTING
124 STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
125#endif 121#endif
126 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
127#ifndef NO_BELL 123#ifndef NO_BELL
128# if ENABLE_FRILLS 124# if ENABLE_FRILLS
129 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), 125 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
… …
171#ifndef NO_BOLD_UNDERLINE_REVERSE 167#ifndef NO_BOLD_UNDERLINE_REVERSE
172 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 168 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
173 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 169 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
174 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 170 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
175 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
176#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
177#if ENABLE_FRILLS 173#if ENABLE_FRILLS
178 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
179#endif 175#endif
180#ifdef KEEP_SCROLLCOLOR 176#ifdef KEEP_SCROLLCOLOR
181 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
182 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
183#endif /* KEEP_SCROLLCOLOR */ 179#endif /* KEEP_SCROLLCOLOR */
184#ifdef OPTION_HC 180#ifdef OPTION_HC
185 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
186#endif 182#endif
187#ifndef NO_CURSORCOLOR 183#ifndef NO_CURSORCOLOR
188 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
189 /* command-line option = resource name */ 185 /* command-line option = resource name */
190 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
191#endif /* NO_CURSORCOLOR */ 187#endif /* NO_CURSORCOLOR */
192 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
193 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"),
194 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
195#ifdef XPM_BACKGROUND 191#ifdef BG_IMAGE_FROM_FILE
196 RSTRG (Rs_path, "path", "search path"), 192 RSTRG (Rs_path, "path", "search path"),
197 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
198#endif 194#endif
199 /* fonts: command-line option = resource name */ 195 /* fonts: command-line option = resource name */
200 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
… …
207#ifdef USE_XIM 203#ifdef USE_XIM
208 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
209 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"),
210 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"),
211 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"),
212#endif /* USE_XIM */ 208#endif /* USE_XIM */
213 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"),
214 STRG (Rs_title, "title", "title", "string", "title name for window"), 210 STRG (Rs_title, "title", "title", "string", "title name for window"),
215 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 211 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
216 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
217 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"),
… …
229 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
230 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
231 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
232 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
233 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
231#endif
232#ifdef BUILTIN_GLYPHS
234 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 233 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
235 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
236#endif 234#endif
237#ifdef POINTER_BLANK 235#ifdef POINTER_BLANK
238 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
239#endif 237#endif
240#ifndef NO_BACKSPACE_KEY 238#ifndef NO_BACKSPACE_KEY
… …
248 RSTRG (Rs_print_pipe, "print-pipe", "string"), 246 RSTRG (Rs_print_pipe, "print-pipe", "string"),
249#endif 247#endif
250 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
251#ifdef CUTCHAR_RESOURCE 249#ifdef CUTCHAR_RESOURCE
252 RSTRG (Rs_cutchars, "cutchars", "string"), 250 RSTRG (Rs_cutchars, "cutchars", "string"),
253#endif /* CUTCHAR_RESOURCE */ 251#endif /* CUTCHAR_RESOURCE */
254 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 252 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
255#ifndef NO_SECONDARY_SCREEN 253#ifndef NO_SECONDARY_SCREEN
256 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
257 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
258#endif 256#endif
… …
267#endif 265#endif
268#ifdef HAVE_AFTERIMAGE 266#ifdef HAVE_AFTERIMAGE
269 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 267 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
270 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"), 268 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
271#endif 269#endif
272#ifndef NO_RESOURCES
273 INFO ("xrm", "string", "X resource"),
274#endif
275 INFO ("e", "command arg ...", "command to execute") 270 INFO ("e", "command arg ...", "command to execute")
276 }; 271 };
277 272
278#undef INFO 273#undef INFO
279#undef STRG 274#undef STRG
… …
322#endif 317#endif
323 "," 318 ","
324#if OFF_FOCUS_FADING 319#if OFF_FOCUS_FADING
325 "fade," 320 "fade,"
326#endif 321#endif
327#if defined(XPM_BACKGROUND)
328 "XPM,"
329#endif
330#if defined(ENABLE_TRANSPARENCY) 322#if defined(ENABLE_TRANSPARENCY)
331 "transparent," 323 "transparent,"
332#endif
333#if TINTING
334 "tint," 324 "tint,"
325#endif
326#if HAVE_AFTERIMAGE
327 "afterimage,"
335#endif 328#endif
336#if defined(USE_XIM) 329#if defined(USE_XIM)
337 "XIM," 330 "XIM,"
338#endif 331#endif
339#if defined(NO_BACKSPACE_KEY) 332#if defined(NO_BACKSPACE_KEY)
… …
553 * default values 546 * default values
554 */ 547 */
555 548
556 if (optList[entry].doff != -1) 549 if (optList[entry].doff != -1)
557 { 550 {
558 if (flag == resval_on && !argv [i+1]) 551 if (flag == resval_on && i+1 == argc)
559 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 552 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
560 553
561 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 554 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
562 } 555 }
563 } 556 }
564 else 557 else
… …
567 560
568 if (optList[entry].doff != -1) 561 if (optList[entry].doff != -1)
569 rs[optList[entry].doff] = flag; 562 rs[optList[entry].doff] = flag;
570 } 563 }
571 } 564 }
565#ifndef NO_RESOURCES
566 else if (!strcmp (opt, "xrm"))
567 {
568 if (i+1 < argc)
569 XrmPutLineResource (&option_db, argv[++i]);
570 }
571#endif
572#ifdef KEYSYM_RESOURCE
573 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
574 {
575 if (i+1 < argc)
576 {
577 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
578 sprintf (res, "*.%s: %s\n", opt, argv[i]);
579 XrmPutLineResource (&option_db, res);
580 free (res);
581 }
582 }
583#endif
572 else 584 else
573#ifdef KEYSYM_RESOURCE
574 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
575 if (rxvt_Str_match (opt, "keysym."))
576 { 585 {
577 const char *str = argv[++i];
578
579 if (str != NULL)
580 parse_keysym (opt + sizeof ("keysym.") - 1, str);
581 }
582 else
583#endif
584 {
585 bad_option = 1; 586 bad_option = 1;
586 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 587 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
587 } 588 }
588 } 589 }
589 590
590 if (bad_option) 591 if (bad_option)
591 rxvt_usage (0); 592 rxvt_usage (0);
592} 593}
… …
676 char *newarg = NULL; 677 char *newarg = NULL;
677 char newargstr[NEWARGLIM]; 678 char newargstr[NEWARGLIM];
678 679
679 if (arg == NULL) 680 if (arg == NULL)
680 { 681 {
681 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 682 n = sizeof ("keysym.") - 1;
683 if (strncmp (str, "keysym.", n))
682 return 0; 684 return 0;
683 685
684 str += n; /* skip `keysym.' */ 686 str += n; /* skip `keysym.' */
685 if (!(pmodend = strchr (str, ':'))) 687 if (!(pmodend = strchr (str, ':')))
686 return -1; 688 return -1;
… …
759 strncpy (newargstr, arg, NEWARGLIM - 1); 761 strncpy (newargstr, arg, NEWARGLIM - 1);
760 newargstr[NEWARGLIM - 1] = '\0'; 762 newargstr[NEWARGLIM - 1] = '\0';
761 newarg = newargstr; 763 newarg = newargstr;
762 } 764 }
763 765
764 rxvt_Str_trim (newarg); 766 if (*newarg == '\0')
765 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
766 return -1; 767 return -1;
767 768
768 keyboard->register_user_translation (sym, state, newarg); 769 keyboard->register_user_translation (sym, state, newarg);
769 return 1; 770 return 1;
770} 771}
771 772
772# endif /* KEYSYM_RESOURCE */ 773# endif /* KEYSYM_RESOURCE */
773#endif /* NO_RESOURCES */ 774#endif /* NO_RESOURCES */
774 775
775static char * 776static char *
776get_res (XrmDatabase database, const char *program, const char *option) 777get_res (XrmDatabase database, const char *program, const char *option)
777{ 778{
778 char resource[512]; 779 char resource[512];
… …
810 811
811void 812void
812rxvt_term::extract_resources () 813rxvt_term::extract_resources ()
813{ 814{
814#ifndef NO_RESOURCES 815#ifndef NO_RESOURCES
816 XrmDatabase database = XrmGetDatabase (dpy);
817 XrmMergeDatabases (option_db, &database);
818 option_db = NULL;
815 /* 819 /*
816 * Query resources for options that affect us 820 * Query resources for options that affect us
817 */ 821 */
818 for (int entry = 0; entry < optList_size; entry++) 822 for (int entry = 0; entry < optList_size; entry++)
819 { 823 {
… …
848 852
849 /* 853 /*
850 * [R5 or later]: enumerate the resource database 854 * [R5 or later]: enumerate the resource database
851 */ 855 */
852# ifdef KEYSYM_RESOURCE 856# ifdef KEYSYM_RESOURCE
853 XrmDatabase database = XrmGetDatabase (dpy);
854 XrmName name_prefix[3]; 857 XrmName name_prefix[3];
855 XrmClass class_prefix[3]; 858 XrmClass class_prefix[3];
856 859
857 name_prefix[0] = XrmStringToName (rs[Rs_name]); 860 name_prefix[0] = XrmStringToName (rs[Rs_name]);
858 name_prefix[1] = XrmStringToName ("keysym"); 861 name_prefix[1] = XrmStringToName ("keysym");
… …
872 XrmEnumerateDatabase (database, name_prefix, class_prefix, 875 XrmEnumerateDatabase (database, name_prefix, class_prefix,
873 XrmEnumOneLevel, rxvt_define_key, NULL); 876 XrmEnumOneLevel, rxvt_define_key, NULL);
874# endif 877# endif
875# endif 878# endif
876 879
877#endif /* NO_RESOURCES */ 880#endif /* NO_RESOURCES */
878} 881}
879 882
880/*----------------------- end-of-file (C source) -----------------------*/ 883/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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