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.88 by root, Wed Jan 25 22:14:45 2006 UTC vs.
Revision 1.93 by root, Wed Feb 1 21:15:33 2006 UTC

… …
21 * You should have received a copy of the GNU General Public License 21 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 22 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
25 25
26#include "../config.h" /* NECESSARY */ 26#include "../config.h"
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h"
28#include "version.h" 28#include "version.h"
29 29
30#ifdef KEYSYM_RESOURCE 30#ifdef KEYSYM_RESOURCE
31#include "keyboard.h" 31# include "keyboard.h"
32#endif 32#endif
33 33
34/* place holders used for parsing command-line options */ 34/* place holders used for parsing command-line options */
35#define Optflag_Reverse 0x40000000UL 35#define Optflag_Reverse 0x40000000UL
36#define Optflag_Boolean 0x80000000UL 36#define Optflag_Boolean 0x80000000UL
37#define Optflag_mask 0x3fffffffUL 37#define Optflag_mask 0x3fffffffUL
38 38
39/*{{{ monolithic option/resource structure: */ 39/* monolithic option/resource structure: */
40/* 40/*
41 * `string' options MUST have a usage argument 41 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 42 * `switch' and `boolean' options have no argument
43 * if there's no desc (ription), it won't appear in rxvt_usage () 43 * if there's no desc (ription), it won't appear in rxvt_usage ()
44 */ 44 */
… …
211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213#if ENABLE_XEMBED 213#if ENABLE_XEMBED
214 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 214 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
215#endif 215#endif
216#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218#endif
216#if ENABLE_FRILLS 219#if ENABLE_FRILLS
217 RSTRG (Rs_transient_for, "transient-for", "windowid"), 220 RSTRG (Rs_transient_for, "transient-for", "windowid"),
218 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"), 221 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"),
219 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 222 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
220 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 223 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
222 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 224 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
223 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 225 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
224 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
225 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 227 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
226 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 228 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
… …
264#undef INFO 266#undef INFO
265#undef STRG 267#undef STRG
266#undef RSTRG 268#undef RSTRG
267#undef SWCH 269#undef SWCH
268#undef BOOL 270#undef BOOL
269/*}}} */
270 271
271static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
272static const char optionsstring[] = "options: " 273static const char optionsstring[] = "options: "
273#if ENABLE_PERL 274#if ENABLE_PERL
274 "perl," 275 "perl,"
… …
384#endif 385#endif
385 "\nUsage: "; /* Usage */ 386 "\nUsage: "; /* Usage */
386 387
387#define INDENT 18 388#define INDENT 18
388 389
390const char rxvt_term::resval_undef [] = "<undef>";
391const char rxvt_term::resval_on [] = "on";
392const char rxvt_term::resval_off [] = "off";
393
389/*{{{ usage: */ 394/*{{{ usage: */
390/*----------------------------------------------------------------------*/ 395/*----------------------------------------------------------------------*/
391static void 396static void
392rxvt_usage (int type) 397rxvt_usage (int type)
393{ 398{
… …
401 rxvt_log (" [-help] [--help]\n"); 406 rxvt_log (" [-help] [--help]\n");
402 407
403 for (col = 1, i = 0; i < optList_size; i++) 408 for (col = 1, i = 0; i < optList_size; i++)
404 if (optList[i].desc != NULL) 409 if (optList[i].desc != NULL)
405 { 410 {
406 int len = 0; 411 int len = 0;
407 412
408 if (!optList_isBool (i)) 413 if (!optList_isBool (i))
409 { 414 {
410 len = optList_strlen (i); 415 len = optList_strlen (i);
411 if (len > 0) 416 if (len > 0)
… …
478 483
479/*{{{ get command-line options before getting resources */ 484/*{{{ get command-line options before getting resources */
480void 485void
481rxvt_term::get_options (int argc, const char *const *argv) 486rxvt_term::get_options (int argc, const char *const *argv)
482{ 487{
483 int i, bad_option = 0; 488 int i, bad_option = 0;
484 static const char On[3] = "ON", Off[4] = "OFF";
485 489
486 for (i = 1; i < argc; i++) 490 for (i = 1; i < argc; i++)
487 { 491 {
488 unsigned int entry, longopt = 0; 492 unsigned int entry, longopt = 0;
489 const char *flag, *opt; 493 const char *flag, *opt;
490 494
491 opt = argv[i]; 495 opt = argv[i];
492 496
493 if (*opt == '-') 497 if (*opt == '-')
494 { 498 {
495 flag = On; 499 flag = resval_on;
500
496 if (*++opt == '-') 501 if (*++opt == '-')
497 longopt = *opt++; /* long option */ 502 longopt = *opt++; /* long option */
498 } 503 }
499 else if (*opt == '+') 504 else if (*opt == '+')
500 { 505 {
501 flag = Off; 506 flag = resval_off;
507
502 if (*++opt == '+') 508 if (*++opt == '+')
503 longopt = *opt++; /* long option */ 509 longopt = *opt++; /* long option */
504 } 510 }
505 else 511 else
506 { 512 {
… …
509 continue; 515 continue;
510 } 516 }
511 517
512 if (!strcmp (opt, "help")) 518 if (!strcmp (opt, "help"))
513 rxvt_usage (longopt ? 2 : 1); 519 rxvt_usage (longopt ? 2 : 1);
520
514 if (!strcmp (opt, "h")) 521 if (!strcmp (opt, "h"))
515 rxvt_usage (0); 522 rxvt_usage (0);
516 523
517 /* feature: always try to match long-options */ 524 /* feature: always try to match long-options */
518 for (entry = 0; entry < optList_size; entry++) 525 for (entry = 0; entry < optList_size; entry++)
… …
522 break; 529 break;
523 530
524 if (entry < optList_size) 531 if (entry < optList_size)
525 { 532 {
526 if (optList_isReverse (entry)) 533 if (optList_isReverse (entry))
527 flag = flag == On ? Off : On; 534 flag = flag == resval_on ? resval_off : resval_on;
528 535
529 if (optList_strlen (entry)) 536 if (optList_strlen (entry))
530 { 537 {
531 /* 538 /*
532 * special cases are handled in main.c:main () to allow 539 * special cases are handled in main.c:main () to allow
533 * X resources to set these values before we settle for 540 * X resources to set these values before we settle for
534 * default values 541 * default values
535 */ 542 */
536 543
537 if (optList[entry].doff != -1) 544 if (optList[entry].doff != -1)
545 {
546 if (flag == resval_on && !argv [i+1])
547 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);
548
538 rs[optList[entry].doff] = flag == On && argv[i+1] 549 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
539 ? argv[++i] : 0; 550 }
540 } 551 }
541 else 552 else
542 { /* boolean value */ 553 { /* boolean value */
543 set_option (optList[entry].flag & Optflag_mask, flag == On); 554 set_option (optList[entry].flag & Optflag_mask, flag == resval_on);
544 555
545 if (optList[entry].doff != -1) 556 if (optList[entry].doff != -1)
546 rs[optList[entry].doff] = flag; 557 rs[optList[entry].doff] = flag;
547 } 558 }
548 } 559 }

Diff Legend

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