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.118 by ayin, Fri Oct 26 18:30:37 2007 UTC vs.
Revision 1.122 by ayin, Thu Nov 22 15:07:10 2007 UTC

… …
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 BG_IMAGE_FROM_FILE 191#ifdef BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 192 RSTRG (Rs_path, "path", "search path"),
… …
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
… …
548 */ 548 */
549 549
550 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
551 { 551 {
552 if (flag == resval_on && i+1 == argc) 552 if (flag == resval_on && i+1 == argc)
553 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554 554
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
556 } 556 }
557 } 557 }
558 else 558 else
… …
561 561
562 if (optList[entry].doff != -1) 562 if (optList[entry].doff != -1)
563 rs[optList[entry].doff] = flag; 563 rs[optList[entry].doff] = flag;
564 } 564 }
565 } 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
566 else 578 else
567#ifdef KEYSYM_RESOURCE
568 if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
569 { 579 {
570 if (i+1 < argc)
571 parse_keysym (opt + sizeof ("keysym.") - 1, argv[++i]);
572 }
573 else
574#endif
575 {
576 bad_option = 1; 580 bad_option = 1;
577 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 581 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
578 } 582 }
579 } 583 }
580 584
581 if (bad_option) 585 if (bad_option)
582 rxvt_usage (0); 586 rxvt_usage (0);
583} 587}
… …
758 762
759 keyboard->register_user_translation (sym, state, newarg); 763 keyboard->register_user_translation (sym, state, newarg);
760 return 1; 764 return 1;
761} 765}
762 766
763# endif /* KEYSYM_RESOURCE */ 767# endif /* KEYSYM_RESOURCE */
764#endif /* NO_RESOURCES */ 768#endif /* NO_RESOURCES */
765 769
766static char * 770static char *
767get_res (XrmDatabase database, const char *program, const char *option) 771get_res (XrmDatabase database, const char *program, const char *option)
768{ 772{
769 char resource[512]; 773 char resource[512];
… …
801 805
802void 806void
803rxvt_term::extract_resources () 807rxvt_term::extract_resources ()
804{ 808{
805#ifndef NO_RESOURCES 809#ifndef NO_RESOURCES
810 XrmDatabase database = XrmGetDatabase (dpy);
811 XrmMergeDatabases (option_db, &database);
812 option_db = NULL;
806 /* 813 /*
807 * Query resources for options that affect us 814 * Query resources for options that affect us
808 */ 815 */
809 for (int entry = 0; entry < optList_size; entry++) 816 for (int entry = 0; entry < optList_size; entry++)
810 { 817 {
… …
839 846
840 /* 847 /*
841 * [R5 or later]: enumerate the resource database 848 * [R5 or later]: enumerate the resource database
842 */ 849 */
843# ifdef KEYSYM_RESOURCE 850# ifdef KEYSYM_RESOURCE
844 XrmDatabase database = XrmGetDatabase (dpy);
845 XrmName name_prefix[3]; 851 XrmName name_prefix[3];
846 XrmClass class_prefix[3]; 852 XrmClass class_prefix[3];
847 853
848 name_prefix[0] = XrmStringToName (rs[Rs_name]); 854 name_prefix[0] = XrmStringToName (rs[Rs_name]);
849 name_prefix[1] = XrmStringToName ("keysym"); 855 name_prefix[1] = XrmStringToName ("keysym");
… …
863 XrmEnumerateDatabase (database, name_prefix, class_prefix, 869 XrmEnumerateDatabase (database, name_prefix, class_prefix,
864 XrmEnumOneLevel, rxvt_define_key, NULL); 870 XrmEnumOneLevel, rxvt_define_key, NULL);
865# endif 871# endif
866# endif 872# endif
867 873
868#endif /* NO_RESOURCES */ 874#endif /* NO_RESOURCES */
869} 875}
870 876
871/*----------------------- end-of-file (C source) -----------------------*/ 877/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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