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.131 by ayin, Fri Jan 18 23:14:05 2008 UTC vs.
Revision 1.133 by ayin, Sat Jan 26 14:24:43 2008 UTC

… …
63/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
64#define SWCH(opt, option, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
66 66
67/* convenient macros */ 67/* convenient macros */
68#define optList_strlen(i) \ 68#define optList_isString(i) \
69 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag == 0)
70#define optList_isBool(i) \ 70#define optList_isBool(i) \
71 (optList[i].flag & Optflag_Boolean) 71 (optList[i].flag & Optflag_Boolean)
72#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
73 (optList[i].flag & Optflag_Reverse) 73 (optList[i].flag & Optflag_Reverse)
74#define optList_size \ 74#define optList_size \
… …
215#if ENABLE_XEMBED 215#if ENABLE_XEMBED
216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
217#endif 217#endif
218#if XFT 218#if XFT
219 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 219 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
220 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
220#endif 221#endif
221#if ENABLE_FRILLS 222#if ENABLE_FRILLS
222 RSTRG (Rs_transient_for, "transient-for", "windowid"), 223 RSTRG (Rs_transient_for, "transient-for", "windowid"),
223 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 224 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
224 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 225 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
413 for (col = 1, i = 0; i < optList_size; i++) 414 for (col = 1, i = 0; i < optList_size; i++)
414 if (optList[i].desc != NULL) 415 if (optList[i].desc != NULL)
415 { 416 {
416 int len = 0; 417 int len = 0;
417 418
418 if (!optList_isBool (i)) 419 if (optList[i].arg)
419 { 420 len = strlen (optList[i].arg) + 1;
420 len = optList_strlen (i);
421 if (len > 0)
422 len++; /* account for space */
423 }
424#ifdef DEBUG_STRICT 421#ifdef DEBUG_STRICT
425 assert (optList[i].opt != NULL); 422 assert (optList[i].opt != NULL);
426#endif 423#endif
427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 424 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
428 col += len; 425 col += len;
… …
432 rxvt_log ("\n"); 429 rxvt_log ("\n");
433 col = 1 + len; 430 col = 1 + len;
434 } 431 }
435 432
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 433 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
437 if (optList_strlen (i)) 434 if (optList[i].arg)
438 rxvt_log (" %s]", optList[i].arg); 435 rxvt_log (" %s]", optList[i].arg);
439 else 436 else
440 rxvt_log ("]"); 437 rxvt_log ("]");
441 } 438 }
442 break; 439 break;
… …
538 if (entry < optList_size) 535 if (entry < optList_size)
539 { 536 {
540 if (optList_isReverse (entry)) 537 if (optList_isReverse (entry))
541 flag = !flag; 538 flag = !flag;
542 539
543 if (optList_strlen (entry)) 540 if (optList_isString (entry))
544 { 541 {
545 /* 542 /*
546 * special cases are handled in main.c:main () to allow 543 * special cases are handled in main.c:main () to allow
547 * X resources to set these values before we settle for 544 * X resources to set these values before we settle for
548 * default values 545 * default values

Diff Legend

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