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.112 by ayin, Mon Aug 27 20:50:38 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 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."), 116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."),
117#endif 117#endif
118#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
119 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"),
… …
167#ifndef NO_BOLD_UNDERLINE_REVERSE 167#ifndef NO_BOLD_UNDERLINE_REVERSE
168 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 168 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
169 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 169 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
170 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 170 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
171 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
173#if ENABLE_FRILLS 173#if ENABLE_FRILLS
174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
175#endif 175#endif
176#ifdef KEEP_SCROLLCOLOR 176#ifdef KEEP_SCROLLCOLOR
177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif /* KEEP_SCROLLCOLOR */ 179#endif /* KEEP_SCROLLCOLOR */
180#ifdef OPTION_HC 180#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
182#endif 182#endif
183#ifndef NO_CURSORCOLOR 183#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 185 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
187#endif /* NO_CURSORCOLOR */ 187#endif /* NO_CURSORCOLOR */
188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
189 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"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef XPM_BACKGROUND 191#ifdef BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 192 RSTRG (Rs_path, "path", "search path"),
193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
194#endif 194#endif
195 /* fonts: command-line option = resource name */ 195 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
… …
203#ifdef USE_XIM 203#ifdef USE_XIM
204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
205 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"),
206 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"),
207 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"),
208#endif /* USE_XIM */ 208#endif /* USE_XIM */
209 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"),
210 STRG (Rs_title, "title", "title", "string", "title name for window"), 210 STRG (Rs_title, "title", "title", "string", "title name for window"),
211 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 211 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
213 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"),
… …
244 RSTRG (Rs_print_pipe, "print-pipe", "string"), 244 RSTRG (Rs_print_pipe, "print-pipe", "string"),
245#endif 245#endif
246 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"),
247#ifdef CUTCHAR_RESOURCE 247#ifdef CUTCHAR_RESOURCE
248 RSTRG (Rs_cutchars, "cutchars", "string"), 248 RSTRG (Rs_cutchars, "cutchars", "string"),
249#endif /* CUTCHAR_RESOURCE */ 249#endif /* CUTCHAR_RESOURCE */
250 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 250 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251#ifndef NO_SECONDARY_SCREEN 251#ifndef NO_SECONDARY_SCREEN
252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
253 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"),
254#endif 254#endif
… …
263#endif 263#endif
264#ifdef HAVE_AFTERIMAGE 264#ifdef HAVE_AFTERIMAGE
265 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..."),
266 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"),
267#endif 267#endif
268#ifndef NO_RESOURCES
269 INFO ("xrm", "string", "X resource"),
270#endif
271 INFO ("e", "command arg ...", "command to execute") 268 INFO ("e", "command arg ...", "command to execute")
272 }; 269 };
273 270
274#undef INFO 271#undef INFO
275#undef STRG 272#undef STRG
… …
317 "+zh-ext" 314 "+zh-ext"
318#endif 315#endif
319 "," 316 ","
320#if OFF_FOCUS_FADING 317#if OFF_FOCUS_FADING
321 "fade," 318 "fade,"
322#endif
323#if defined(XPM_BACKGROUND)
324 "XPM,"
325#endif 319#endif
326#if defined(ENABLE_TRANSPARENCY) 320#if defined(ENABLE_TRANSPARENCY)
327 "transparent," 321 "transparent,"
328 "tint," 322 "tint,"
329#endif 323#endif
… …
550 * default values 544 * default values
551 */ 545 */
552 546
553 if (optList[entry].doff != -1) 547 if (optList[entry].doff != -1)
554 { 548 {
555 if (flag == resval_on && !argv [i+1]) 549 if (flag == resval_on && i+1 == argc)
556 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 550 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
557 551
558 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 552 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
559 } 553 }
560 } 554 }
561 else 555 else
… …
564 558
565 if (optList[entry].doff != -1) 559 if (optList[entry].doff != -1)
566 rs[optList[entry].doff] = flag; 560 rs[optList[entry].doff] = flag;
567 } 561 }
568 } 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
569 else 582 else
570#ifdef KEYSYM_RESOURCE
571 if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
572 { 583 {
573 const char *str = argv[++i];
574
575 if (str != NULL)
576 parse_keysym (opt + sizeof ("keysym.") - 1, str);
577 }
578 else
579#endif
580 {
581 bad_option = 1; 584 bad_option = 1;
582 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 585 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
583 } 586 }
584 } 587 }
585 588
586 if (bad_option) 589 if (bad_option)
587 rxvt_usage (0); 590 rxvt_usage (0);
588} 591}
… …
756 strncpy (newargstr, arg, NEWARGLIM - 1); 759 strncpy (newargstr, arg, NEWARGLIM - 1);
757 newargstr[NEWARGLIM - 1] = '\0'; 760 newargstr[NEWARGLIM - 1] = '\0';
758 newarg = newargstr; 761 newarg = newargstr;
759 } 762 }
760 763
761 rxvt_Str_trim (newarg); 764 if (*newarg == '\0')
762 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
763 return -1; 765 return -1;
764 766
765 keyboard->register_user_translation (sym, state, newarg); 767 keyboard->register_user_translation (sym, state, newarg);
766 return 1; 768 return 1;
767} 769}
768 770
769# endif /* KEYSYM_RESOURCE */ 771# endif /* KEYSYM_RESOURCE */
770#endif /* NO_RESOURCES */ 772#endif /* NO_RESOURCES */
771 773
772static char * 774static char *
773get_res (XrmDatabase database, const char *program, const char *option) 775get_res (XrmDatabase database, const char *program, const char *option)
774{ 776{
775 char resource[512]; 777 char resource[512];
… …
807 809
808void 810void
809rxvt_term::extract_resources () 811rxvt_term::extract_resources ()
810{ 812{
811#ifndef NO_RESOURCES 813#ifndef NO_RESOURCES
814 XrmDatabase database = XrmGetDatabase (dpy);
815 XrmMergeDatabases (option_db, &database);
816 option_db = NULL;
812 /* 817 /*
813 * Query resources for options that affect us 818 * Query resources for options that affect us
814 */ 819 */
815 for (int entry = 0; entry < optList_size; entry++) 820 for (int entry = 0; entry < optList_size; entry++)
816 { 821 {
… …
845 850
846 /* 851 /*
847 * [R5 or later]: enumerate the resource database 852 * [R5 or later]: enumerate the resource database
848 */ 853 */
849# ifdef KEYSYM_RESOURCE 854# ifdef KEYSYM_RESOURCE
850 XrmDatabase database = XrmGetDatabase (dpy);
851 XrmName name_prefix[3]; 855 XrmName name_prefix[3];
852 XrmClass class_prefix[3]; 856 XrmClass class_prefix[3];
853 857
854 name_prefix[0] = XrmStringToName (rs[Rs_name]); 858 name_prefix[0] = XrmStringToName (rs[Rs_name]);
855 name_prefix[1] = XrmStringToName ("keysym"); 859 name_prefix[1] = XrmStringToName ("keysym");
… …
869 XrmEnumerateDatabase (database, name_prefix, class_prefix, 873 XrmEnumerateDatabase (database, name_prefix, class_prefix,
870 XrmEnumOneLevel, rxvt_define_key, NULL); 874 XrmEnumOneLevel, rxvt_define_key, NULL);
871# endif 875# endif
872# endif 876# endif
873 877
874#endif /* NO_RESOURCES */ 878#endif /* NO_RESOURCES */
875} 879}
876 880
877/*----------------------- end-of-file (C source) -----------------------*/ 881/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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