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.110 by root, Wed Aug 1 17:54:03 2007 UTC vs.
Revision 1.123 by ayin, Fri Nov 23 11:17:37 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"),
… …
248 RSTRG (Rs_print_pipe, "print-pipe", "string"), 244 RSTRG (Rs_print_pipe, "print-pipe", "string"),
249#endif 245#endif
250 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"),
251#ifdef CUTCHAR_RESOURCE 247#ifdef CUTCHAR_RESOURCE
252 RSTRG (Rs_cutchars, "cutchars", "string"), 248 RSTRG (Rs_cutchars, "cutchars", "string"),
253#endif /* CUTCHAR_RESOURCE */ 249#endif /* CUTCHAR_RESOURCE */
254 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 250 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
255#ifndef NO_SECONDARY_SCREEN 251#ifndef NO_SECONDARY_SCREEN
256 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
257 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"),
258#endif 254#endif
… …
267#endif 263#endif
268#ifdef HAVE_AFTERIMAGE 264#ifdef HAVE_AFTERIMAGE
269 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 265 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"), 266 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
271#endif 267#endif
272#ifndef NO_RESOURCES
273 INFO ("xrm", "string", "X resource"),
274#endif
275 INFO ("e", "command arg ...", "command to execute") 268 INFO ("e", "command arg ...", "command to execute")
276 }; 269 };
277 270
278#undef INFO 271#undef INFO
279#undef STRG 272#undef STRG
… …
322#endif 315#endif
323 "," 316 ","
324#if OFF_FOCUS_FADING 317#if OFF_FOCUS_FADING
325 "fade," 318 "fade,"
326#endif 319#endif
327#if defined(XPM_BACKGROUND)
328 "XPM,"
329#endif
330#if defined(ENABLE_TRANSPARENCY) 320#if defined(ENABLE_TRANSPARENCY)
331 "transparent," 321 "transparent,"
322 "tint,"
332#endif 323#endif
333#if HAVE_AFTERIMAGE 324#if HAVE_AFTERIMAGE
334 "afterimage," 325 "afterimage,"
335#endif
336#if TINTING
337 "tint,"
338#endif 326#endif
339#if defined(USE_XIM) 327#if defined(USE_XIM)
340 "XIM," 328 "XIM,"
341#endif 329#endif
342#if defined(NO_BACKSPACE_KEY) 330#if defined(NO_BACKSPACE_KEY)
… …
556 * default values 544 * default values
557 */ 545 */
558 546
559 if (optList[entry].doff != -1) 547 if (optList[entry].doff != -1)
560 { 548 {
561 if (flag == resval_on && !argv [i+1]) 549 if (flag == resval_on && i+1 == argc)
562 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 550 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
563 551
564 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 552 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
565 } 553 }
566 } 554 }
567 else 555 else
… …
570 558
571 if (optList[entry].doff != -1) 559 if (optList[entry].doff != -1)
572 rs[optList[entry].doff] = flag; 560 rs[optList[entry].doff] = flag;
573 } 561 }
574 } 562 }
563#ifndef NO_RESOURCES
564 else if (!strcmp (opt, "xrm"))
565 {
566 if (i+1 < argc)
567 XrmPutLineResource (&option_db, argv[++i]);
568 }
569#endif
570#ifdef KEYSYM_RESOURCE
571 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
572 {
573 if (i+1 < argc)
574 {
575 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
576 sprintf (res, "*.%s: %s\n", opt, argv[i]);
577 XrmPutLineResource (&option_db, res);
578 free (res);
579 }
580 }
581#endif
575 else 582 else
576#ifdef KEYSYM_RESOURCE
577 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
578 if (rxvt_Str_match (opt, "keysym."))
579 { 583 {
580 const char *str = argv[++i];
581
582 if (str != NULL)
583 parse_keysym (opt + sizeof ("keysym.") - 1, str);
584 }
585 else
586#endif
587 {
588 bad_option = 1; 584 bad_option = 1;
589 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 585 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
590 } 586 }
591 } 587 }
592 588
593 if (bad_option) 589 if (bad_option)
594 rxvt_usage (0); 590 rxvt_usage (0);
595} 591}
… …
679 char *newarg = NULL; 675 char *newarg = NULL;
680 char newargstr[NEWARGLIM]; 676 char newargstr[NEWARGLIM];
681 677
682 if (arg == NULL) 678 if (arg == NULL)
683 { 679 {
684 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 680 n = sizeof ("keysym.") - 1;
681 if (strncmp (str, "keysym.", n))
685 return 0; 682 return 0;
686 683
687 str += n; /* skip `keysym.' */ 684 str += n; /* skip `keysym.' */
688 if (!(pmodend = strchr (str, ':'))) 685 if (!(pmodend = strchr (str, ':')))
689 return -1; 686 return -1;
… …
762 strncpy (newargstr, arg, NEWARGLIM - 1); 759 strncpy (newargstr, arg, NEWARGLIM - 1);
763 newargstr[NEWARGLIM - 1] = '\0'; 760 newargstr[NEWARGLIM - 1] = '\0';
764 newarg = newargstr; 761 newarg = newargstr;
765 } 762 }
766 763
767 rxvt_Str_trim (newarg); 764 if (*newarg == '\0')
768 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
769 return -1; 765 return -1;
770 766
771 keyboard->register_user_translation (sym, state, newarg); 767 keyboard->register_user_translation (sym, state, newarg);
772 return 1; 768 return 1;
773} 769}
774 770
775# endif /* KEYSYM_RESOURCE */ 771# endif /* KEYSYM_RESOURCE */
776#endif /* NO_RESOURCES */ 772#endif /* NO_RESOURCES */
777 773
778static char * 774static char *
779get_res (XrmDatabase database, const char *program, const char *option) 775get_res (XrmDatabase database, const char *program, const char *option)
780{ 776{
781 char resource[512]; 777 char resource[512];
… …
813 809
814void 810void
815rxvt_term::extract_resources () 811rxvt_term::extract_resources ()
816{ 812{
817#ifndef NO_RESOURCES 813#ifndef NO_RESOURCES
814 XrmDatabase database = XrmGetDatabase (dpy);
815 XrmMergeDatabases (option_db, &database);
816 option_db = NULL;
818 /* 817 /*
819 * Query resources for options that affect us 818 * Query resources for options that affect us
820 */ 819 */
821 for (int entry = 0; entry < optList_size; entry++) 820 for (int entry = 0; entry < optList_size; entry++)
822 { 821 {
… …
851 850
852 /* 851 /*
853 * [R5 or later]: enumerate the resource database 852 * [R5 or later]: enumerate the resource database
854 */ 853 */
855# ifdef KEYSYM_RESOURCE 854# ifdef KEYSYM_RESOURCE
856 XrmDatabase database = XrmGetDatabase (dpy);
857 XrmName name_prefix[3]; 855 XrmName name_prefix[3];
858 XrmClass class_prefix[3]; 856 XrmClass class_prefix[3];
859 857
860 name_prefix[0] = XrmStringToName (rs[Rs_name]); 858 name_prefix[0] = XrmStringToName (rs[Rs_name]);
861 name_prefix[1] = XrmStringToName ("keysym"); 859 name_prefix[1] = XrmStringToName ("keysym");
… …
875 XrmEnumerateDatabase (database, name_prefix, class_prefix, 873 XrmEnumerateDatabase (database, name_prefix, class_prefix,
876 XrmEnumOneLevel, rxvt_define_key, NULL); 874 XrmEnumOneLevel, rxvt_define_key, NULL);
877# endif 875# endif
878# endif 876# endif
879 877
880#endif /* NO_RESOURCES */ 878#endif /* NO_RESOURCES */
881} 879}
882 880
883/*----------------------- end-of-file (C source) -----------------------*/ 881/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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