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.25 by root, Mon Jul 26 14:57:12 2004 UTC vs.
Revision 1.30 by root, Fri Aug 13 03:36:57 2004 UTC

… …
108 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"), 108 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
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
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."),
113#endif 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)
… …
201#ifndef NO_FRILLS 207#ifndef NO_FRILLS
202 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 208 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
203 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 209 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
204 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 210 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
205 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"),
206#endif 213#endif
207#ifndef NO_LINESPACE 214#ifndef NO_LINESPACE
208 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"),
209#endif 216#endif
210 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"),
… …
245#undef BOOL 252#undef BOOL
246/*}}} */ 253/*}}} */
247 254
248static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 255static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n";
249static 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
250#if defined(XPM_BACKGROUND) 289#if defined(XPM_BACKGROUND)
251 "XPM," 290 "XPM,"
252#endif 291#endif
253#if defined(TRANSPARENT) 292#if defined(TRANSPARENT)
254 "transparent," 293 "transparent,"
255#endif 294#endif
295#if TINTING
296 "tint,"
297#endif
256#if defined(UTMP_SUPPORT) 298#if defined(UTMP_SUPPORT)
257 "utmp," 299 "utmp,"
258#endif 300#endif
259#if defined(MENUBAR) 301#if defined(MENUBAR)
260 "menubar," 302 "menubar,"
261#endif
262#if !defined(NO_FRILLS)
263 "frills,"
264#endif
265#if !defined(NO_LINESPACE)
266 "linespace,"
267#endif
268#if defined(PREFER_24BIT)
269 "24bit,"
270#endif 303#endif
271#if defined(USE_XIM) 304#if defined(USE_XIM)
272 "XIM," 305 "XIM,"
273#endif 306#endif
274 "scrollbars=" 307 "scrollbars="
… …
302 "no_backspace," 335 "no_backspace,"
303#endif 336#endif
304#if defined(NO_DELETE_KEY) 337#if defined(NO_DELETE_KEY)
305 "no_delete," 338 "no_delete,"
306#endif 339#endif
340#if EIGHT_BIT_CONTROLS
341 "8bitctrls,"
342#endif
307#if !defined(NO_STRINGS) 343#if !defined(NO_STRINGS)
308 "strings," 344 "strings,"
309#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
310#if defined(TTY_256COLOR) 367#if defined(TTY_256COLOR)
311 "256colour," 368 "256colour,"
369#endif
370#if defined(CURSOR_BLINK)
371 "cursorBlink,"
372#endif
373#if defined(POINTER_BLANK)
374 "pointerBlank,"
312#endif 375#endif
313#if defined(NO_RESOURCES) 376#if defined(NO_RESOURCES)
314 "NoResources" 377 "NoResources"
315#else 378#else
316# if defined(USE_XGETDEFAULT) 379# if defined(USE_XGETDEFAULT)
… …
462 525
463 if (entry < optList_size ()) 526 if (entry < optList_size ())
464 { 527 {
465 if (optList_isReverse (entry)) 528 if (optList_isReverse (entry))
466 flag = flag == On ? Off : On; 529 flag = flag == On ? Off : On;
530
467 if (optList_strlen (entry)) 531 if (optList_strlen (entry))
468 { /* string value */
469 const char *str = argv[++i];
470
471#ifdef DEBUG_RESOURCES
472 fprintf (stderr, "string (%s,%s) = ",
473 optList[entry].opt ? optList[entry].opt : "nil",
474 optList[entry].kw ? optList[entry].kw : "nil");
475#endif
476 if (flag == On && str && (optList[entry].doff != -1))
477 { 532 {
478#ifdef DEBUG_RESOURCES
479 fprintf (stderr, "\"%s\"\n", str);
480#endif
481 rs[optList[entry].doff] = str;
482 /* 533 /*
483 * special cases are handled in main.c:main () to allow 534 * special cases are handled in main.c:main () to allow
484 * X resources to set these values before we settle for 535 * X resources to set these values before we settle for
485 * default values 536 * default values
486 */ 537 */
487 }
488#ifdef DEBUG_RESOURCES
489 else
490 fprintf (stderr, "???\n");
491#endif
492 538
539 if (optList[entry].doff != -1)
540 rs[optList[entry].doff] = flag == On && argv[i+1]
541 ? argv[++i] : 0;
493 } 542 }
494 else 543 else
495 { /* boolean value */ 544 { /* boolean value */
496#ifdef DEBUG_RESOURCES 545#ifdef DEBUG_RESOURCES
497 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