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.24 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.30 by root, Fri Aug 13 03:36:57 2004 UTC

… …
109 SWCH ("tr", Opt_transparent, NULL), 109 SWCH ("tr", Opt_transparent, NULL),
110#if TINTING 110#if TINTING
111 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 111 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
112#endif 112#endif
113#endif 113#endif
114#ifdef OFF_FOCUS_FADING
115 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when urxvt is losing focus."),
116#endif
117#ifdef TINTING
118 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
119#endif
114 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 120 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
115#ifndef NO_BELL 121#ifndef NO_BELL
116 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 122 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
117# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 123# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
118 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 124 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL),
… …
153 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 159 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
154 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
155 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
156#endif /* NO_BRIGHTCOLOR */ 162#endif /* NO_BRIGHTCOLOR */
157#ifndef NO_BOLD_UNDERLINE_REVERSE 163#ifndef NO_BOLD_UNDERLINE_REVERSE
164 BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"),
158 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 165 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
159 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 166 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
160 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 167 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
161#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 168#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
162#ifdef KEEP_SCROLLCOLOR 169#ifdef KEEP_SCROLLCOLOR
… …
200#ifndef NO_FRILLS 207#ifndef NO_FRILLS
201 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 208 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
202 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 209 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
203 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 210 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
204 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 211 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
212 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
205#endif 213#endif
206#ifndef NO_LINESPACE 214#ifndef NO_LINESPACE
207 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 215 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
208#endif 216#endif
209 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 217 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
… …
244#undef BOOL 252#undef BOOL
245/*}}} */ 253/*}}} */
246 254
247static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 255static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n";
248static const char optionsstring[] = "Options: " 256static const char optionsstring[] = "Options: "
257#if XFT
258 "xft,"
259#endif
260#if UNICODE_3
261 "unicode3,"
262#endif
263 "encodings=eu+vn"
264#if ENCODING_JP
265 "+jp"
266#endif
267#if ENCODING_JP_EXT
268 "+jp-ext"
269#endif
270#if ENCODING_KR
271 "+kr"
272#endif
273#if ENCODING_CN
274 "+cn"
275#endif
276#if ENCODING_CN_EXT
277 "+cn-ext"
278#endif
279 ","
280#if ENABLE_COMBINING
281 "combining,"
282#endif
283#if TEXT_BLINK
284 "blink,"
285#endif
286#if OFF_FOCUS_FADING
287 "fade,"
288#endif
249#if defined(XPM_BACKGROUND) 289#if defined(XPM_BACKGROUND)
250 "XPM," 290 "XPM,"
251#endif 291#endif
252#if defined(TRANSPARENT) 292#if defined(TRANSPARENT)
253 "transparent," 293 "transparent,"
254#endif 294#endif
295#if TINTING
296 "tint,"
297#endif
255#if defined(UTMP_SUPPORT) 298#if defined(UTMP_SUPPORT)
256 "utmp," 299 "utmp,"
257#endif 300#endif
258#if defined(MENUBAR) 301#if defined(MENUBAR)
259 "menubar," 302 "menubar,"
260#endif
261#if !defined(NO_FRILLS)
262 "frills,"
263#endif
264#if !defined(NO_LINESPACE)
265 "linespace,"
266#endif
267#if defined(PREFER_24BIT)
268 "24bit,"
269#endif 303#endif
270#if defined(USE_XIM) 304#if defined(USE_XIM)
271 "XIM," 305 "XIM,"
272#endif 306#endif
273 "scrollbars=" 307 "scrollbars="
… …
301 "no_backspace," 335 "no_backspace,"
302#endif 336#endif
303#if defined(NO_DELETE_KEY) 337#if defined(NO_DELETE_KEY)
304 "no_delete," 338 "no_delete,"
305#endif 339#endif
340#if EIGHT_BIT_CONTROLS
341 "8bitctrls,"
342#endif
306#if !defined(NO_STRINGS) 343#if !defined(NO_STRINGS)
307 "strings," 344 "strings,"
308#endif 345#endif
346#if !defined(NO_FRILLS)
347 "frills,"
348#endif
349#if !defined(NO_LINESPACE)
350 "linespace,"
351#endif
352#if defined(PREFER_24BIT)
353 "24bit,"
354#endif
355#if defined(SELECTION_SCROLLING)
356 "selectionscrolling,"
357#endif
358#if MOUSE_WHEEL
359 "wheel,"
360#endif
361#if MOUSE_SLIP_WHEELING
362 "slipwheel,"
363#endif
364#if defined(SMART_RESIZE)
365 "smart-resize,"
366#endif
309#if defined(TTY_256COLOR) 367#if defined(TTY_256COLOR)
310 "256colour," 368 "256colour,"
369#endif
370#if defined(CURSOR_BLINK)
371 "cursorBlink,"
372#endif
373#if defined(POINTER_BLANK)
374 "pointerBlank,"
311#endif 375#endif
312#if defined(NO_RESOURCES) 376#if defined(NO_RESOURCES)
313 "NoResources" 377 "NoResources"
314#else 378#else
315# if defined(USE_XGETDEFAULT) 379# if defined(USE_XGETDEFAULT)
… …
461 525
462 if (entry < optList_size ()) 526 if (entry < optList_size ())
463 { 527 {
464 if (optList_isReverse (entry)) 528 if (optList_isReverse (entry))
465 flag = flag == On ? Off : On; 529 flag = flag == On ? Off : On;
530
466 if (optList_strlen (entry)) 531 if (optList_strlen (entry))
467 { /* string value */
468 const char *str = argv[++i];
469
470#ifdef DEBUG_RESOURCES
471 fprintf (stderr, "string (%s,%s) = ",
472 optList[entry].opt ? optList[entry].opt : "nil",
473 optList[entry].kw ? optList[entry].kw : "nil");
474#endif
475 if (flag == On && str && (optList[entry].doff != -1))
476 { 532 {
477#ifdef DEBUG_RESOURCES
478 fprintf (stderr, "\"%s\"\n", str);
479#endif
480 rs[optList[entry].doff] = str;
481 /* 533 /*
482 * special cases are handled in main.c:main () to allow 534 * special cases are handled in main.c:main () to allow
483 * X resources to set these values before we settle for 535 * X resources to set these values before we settle for
484 * default values 536 * default values
485 */ 537 */
486 }
487#ifdef DEBUG_RESOURCES
488 else
489 fprintf (stderr, "???\n");
490#endif
491 538
539 if (optList[entry].doff != -1)
540 rs[optList[entry].doff] = flag == On && argv[i+1]
541 ? argv[++i] : 0;
492 } 542 }
493 else 543 else
494 { /* boolean value */ 544 { /* boolean value */
495#ifdef DEBUG_RESOURCES 545#ifdef DEBUG_RESOURCES
496 fprintf (stderr, "boolean (%s,%s) = %s\n", 546 fprintf (stderr, "boolean (%s,%s) = %s\n",

Diff Legend

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