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.107 by root, Mon Jun 18 12:53:26 2007 UTC vs.
Revision 1.122 by ayin, Thu Nov 22 15:07:10 2007 UTC

… …
107#endif 107#endif
108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
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 TRANSPARENT 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
… …
265#if ISO_14755 261#if ISO_14755
266 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
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", "number", "Gaussian Blur radius 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 268#ifndef NO_RESOURCES
273 INFO ("xrm", "string", "X resource"), 269 INFO ("xrm", "string", "X resource"),
274#endif 270#endif
275 INFO ("e", "command arg ...", "command to execute") 271 INFO ("e", "command arg ...", "command to execute")
… …
322#endif 318#endif
323 "," 319 ","
324#if OFF_FOCUS_FADING 320#if OFF_FOCUS_FADING
325 "fade," 321 "fade,"
326#endif 322#endif
327#if defined(XPM_BACKGROUND)
328 "XPM,"
329#endif
330#if defined(TRANSPARENT) 323#if defined(ENABLE_TRANSPARENCY)
331 "transparent," 324 "transparent,"
332#endif
333#if TINTING
334 "tint," 325 "tint,"
326#endif
327#if HAVE_AFTERIMAGE
328 "afterimage,"
335#endif 329#endif
336#if defined(USE_XIM) 330#if defined(USE_XIM)
337 "XIM," 331 "XIM,"
338#endif 332#endif
339#if defined(NO_BACKSPACE_KEY) 333#if defined(NO_BACKSPACE_KEY)
… …
553 * default values 547 * default values
554 */ 548 */
555 549
556 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
557 { 551 {
558 if (flag == resval_on && !argv [i+1]) 552 if (flag == resval_on && i+1 == argc)
559 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
560 554
561 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
562 } 556 }
563 } 557 }
564 else 558 else
… …
567 561
568 if (optList[entry].doff != -1) 562 if (optList[entry].doff != -1)
569 rs[optList[entry].doff] = flag; 563 rs[optList[entry].doff] = flag;
570 } 564 }
571 } 565 }
566#ifdef KEYSYM_RESOURCE
567 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
568 {
569 if (i+1 < argc)
570 {
571 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
572 sprintf (res, "*.%s: %s\n", opt, argv[i]);
573 XrmPutLineResource (&option_db, res);
574 free (res);
575 }
576 }
577#endif
572 else 578 else
573#ifdef KEYSYM_RESOURCE
574 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
575 if (rxvt_Str_match (opt, "keysym."))
576 { 579 {
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; 580 bad_option = 1;
586 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 581 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
587 } 582 }
588 } 583 }
589 584
590 if (bad_option) 585 if (bad_option)
591 rxvt_usage (0); 586 rxvt_usage (0);
592} 587}
… …
676 char *newarg = NULL; 671 char *newarg = NULL;
677 char newargstr[NEWARGLIM]; 672 char newargstr[NEWARGLIM];
678 673
679 if (arg == NULL) 674 if (arg == NULL)
680 { 675 {
681 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 676 n = sizeof ("keysym.") - 1;
677 if (strncmp (str, "keysym.", n))
682 return 0; 678 return 0;
683 679
684 str += n; /* skip `keysym.' */ 680 str += n; /* skip `keysym.' */
685 if (!(pmodend = strchr (str, ':'))) 681 if (!(pmodend = strchr (str, ':')))
686 return -1; 682 return -1;
… …
759 strncpy (newargstr, arg, NEWARGLIM - 1); 755 strncpy (newargstr, arg, NEWARGLIM - 1);
760 newargstr[NEWARGLIM - 1] = '\0'; 756 newargstr[NEWARGLIM - 1] = '\0';
761 newarg = newargstr; 757 newarg = newargstr;
762 } 758 }
763 759
764 rxvt_Str_trim (newarg); 760 if (*newarg == '\0')
765 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
766 return -1; 761 return -1;
767 762
768 keyboard->register_user_translation (sym, state, newarg); 763 keyboard->register_user_translation (sym, state, newarg);
769 return 1; 764 return 1;
770} 765}
771 766
772# endif /* KEYSYM_RESOURCE */ 767# endif /* KEYSYM_RESOURCE */
773#endif /* NO_RESOURCES */ 768#endif /* NO_RESOURCES */
774 769
775static char * 770static char *
776get_res (XrmDatabase database, const char *program, const char *option) 771get_res (XrmDatabase database, const char *program, const char *option)
777{ 772{
778 char resource[512]; 773 char resource[512];
… …
810 805
811void 806void
812rxvt_term::extract_resources () 807rxvt_term::extract_resources ()
813{ 808{
814#ifndef NO_RESOURCES 809#ifndef NO_RESOURCES
810 XrmDatabase database = XrmGetDatabase (dpy);
811 XrmMergeDatabases (option_db, &database);
812 option_db = NULL;
815 /* 813 /*
816 * Query resources for options that affect us 814 * Query resources for options that affect us
817 */ 815 */
818 for (int entry = 0; entry < optList_size; entry++) 816 for (int entry = 0; entry < optList_size; entry++)
819 { 817 {
… …
848 846
849 /* 847 /*
850 * [R5 or later]: enumerate the resource database 848 * [R5 or later]: enumerate the resource database
851 */ 849 */
852# ifdef KEYSYM_RESOURCE 850# ifdef KEYSYM_RESOURCE
853 XrmDatabase database = XrmGetDatabase (dpy);
854 XrmName name_prefix[3]; 851 XrmName name_prefix[3];
855 XrmClass class_prefix[3]; 852 XrmClass class_prefix[3];
856 853
857 name_prefix[0] = XrmStringToName (rs[Rs_name]); 854 name_prefix[0] = XrmStringToName (rs[Rs_name]);
858 name_prefix[1] = XrmStringToName ("keysym"); 855 name_prefix[1] = XrmStringToName ("keysym");
… …
872 XrmEnumerateDatabase (database, name_prefix, class_prefix, 869 XrmEnumerateDatabase (database, name_prefix, class_prefix,
873 XrmEnumOneLevel, rxvt_define_key, NULL); 870 XrmEnumOneLevel, rxvt_define_key, NULL);
874# endif 871# endif
875# endif 872# endif
876 873
877#endif /* NO_RESOURCES */ 874#endif /* NO_RESOURCES */
878} 875}
879 876
880/*----------------------- end-of-file (C source) -----------------------*/ 877/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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