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.34 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.40 by root, Sun Aug 22 01:45:12 2004 UTC

… …
109#if TINTING 109#if TINTING
110 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 110 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
111#endif 111#endif
112#endif 112#endif
113#ifdef OFF_FOCUS_FADING 113#ifdef OFF_FOCUS_FADING
114 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when urxvt is losing focus."), 114 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."),
115#endif 115#endif
116#ifdef TINTING 116#ifdef TINTING
117 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), 117 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
118#endif 118#endif
119 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 119 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
… …
158 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 158 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
159 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 159 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
160 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
161#endif /* NO_BRIGHTCOLOR */ 161#endif /* NO_BRIGHTCOLOR */
162#ifndef NO_BOLD_UNDERLINE_REVERSE 162#ifndef NO_BOLD_UNDERLINE_REVERSE
163 BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"),
164 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 163 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
164 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
165 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 165 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
166 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 166 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
167#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 167#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
168#ifdef KEEP_SCROLLCOLOR 168#ifdef KEEP_SCROLLCOLOR
169 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 169 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
… …
179 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 179 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
180#endif /* XPM_BACKGROUND */ 180#endif /* XPM_BACKGROUND */
181#if (MENUBAR_MAX) 181#if (MENUBAR_MAX)
182 RSTRG (Rs_menu, "menu", "name[;tag]"), 182 RSTRG (Rs_menu, "menu", "name[;tag]"),
183#endif 183#endif
184 /* fonts: command-line option = resource name */
184 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 185 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
185 /* fonts: command-line option = resource name */ 186#if ENABLE_STYLES
187 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
188 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
189 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
190#endif
186#ifdef USE_XIM 191#ifdef USE_XIM
187 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 192 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
188 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 193 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
189#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 194#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
190 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 195 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
… …
249#undef RSTRG 254#undef RSTRG
250#undef SWCH 255#undef SWCH
251#undef BOOL 256#undef BOOL
252/*}}} */ 257/*}}} */
253 258
254static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 259static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
255static const char optionsstring[] = "options: " 260static const char optionsstring[] = "options: "
256#if XFT 261#if XFT
257 "xft," 262 "xft,"
258#endif 263#endif
264#if ENABLE_STYLES
265 "styles,"
266#endif
267#if ENABLE_COMBINING
268 "combining,"
269#endif
270#if TEXT_BLINK
271 "blink,"
272#endif
273#if ISO_14755
274 "iso14755,"
275#endif
259#if UNICODE_3 276#if UNICODE_3
260 "unicode3," 277 "unicode3,"
261#endif 278#endif
262 "encodings=eu+vn" 279 "encodings=eu+vn"
263#if ENCODING_JP 280#if ENCODING_JP
… …
274#endif 291#endif
275#if ENCODING_CN_EXT 292#if ENCODING_CN_EXT
276 "+cn-ext" 293 "+cn-ext"
277#endif 294#endif
278 "," 295 ","
279#if ENABLE_COMBINING
280 "combining,"
281#endif
282#if TEXT_BLINK
283 "blink,"
284#endif
285#if OFF_FOCUS_FADING 296#if OFF_FOCUS_FADING
286 "fade," 297 "fade,"
287#endif 298#endif
288#if defined(XPM_BACKGROUND) 299#if defined(XPM_BACKGROUND)
289 "XPM," 300 "XPM,"
… …
361 "slipwheel," 372 "slipwheel,"
362#endif 373#endif
363#if defined(SMART_RESIZE) 374#if defined(SMART_RESIZE)
364 "smart-resize," 375 "smart-resize,"
365#endif 376#endif
366#if defined(TTY_256COLOR)
367 "256colour,"
368#endif
369#if defined(CURSOR_BLINK) 377#if defined(CURSOR_BLINK)
370 "cursorBlink," 378 "cursorBlink,"
371#endif 379#endif
372#if defined(POINTER_BLANK) 380#if defined(POINTER_BLANK)
373 "pointerBlank," 381 "pointerBlank,"
… …
845 database = XrmGetStringDatabase (displayResource); 853 database = XrmGetStringDatabase (displayResource);
846 854
847# ifdef HAVE_EXTRA_XRESOURCE_FILES 855# ifdef HAVE_EXTRA_XRESOURCE_FILES
848 /* Add in ~/.Xdefaults or ~/.Xresources */ 856 /* Add in ~/.Xdefaults or ~/.Xresources */
849 { 857 {
850 char *ptr; 858 char *ptr;
851 859
852 if ((ptr = (char *)getenv ("HOME")) == NULL) 860 if ((ptr = (char *)getenv ("HOME")) == NULL)
853 ptr = "."; 861 ptr = ".";
854 862
855 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 863 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)

Diff Legend

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