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.159 by sf-exg, Fri Dec 2 09:03:43 2011 UTC vs.
Revision 1.161 by sf-exg, Sun Dec 18 02:25:12 2011 UTC

… …
34 34
35/* place holders used for parsing command-line options */ 35/* place holders used for parsing command-line options */
36#define Optflag_Reverse 1 36#define Optflag_Reverse 1
37#define Optflag_Boolean 2 37#define Optflag_Boolean 2
38#define Optflag_Switch 4 38#define Optflag_Switch 4
39#define Optflag_Info 8
39 40
40/* monolithic option/resource structure: */ 41/* monolithic option/resource structure: */
41/* 42/*
42 * `string' options MUST have a usage argument 43 * `string' options MUST have a usage argument
43 * `switch' and `boolean' options have no argument 44 * `switch' and `boolean' options have no argument
44 * if there's no desc (ription), it won't appear in rxvt_usage () 45 * if there's no desc (ription), it won't appear in rxvt_usage ()
45 */ 46 */
46 47
47/* INFO () - descriptive information only */ 48/* INFO () - descriptive information only */
48#define INFO(opt, arg, desc) \ 49#define INFO(opt, arg, desc) \
49 {0, 0, -1, NULL, (opt), (arg), (desc)} 50 {0, Optflag_Info, -1, NULL, (opt), (arg), (desc)}
51
52#define RINFO(kw, arg) \
53 {0, Optflag_Info, -1, (kw), NULL, (arg), NULL}
50 54
51/* STRG () - command-line option, with/without resource */ 55/* STRG () - command-line option, with/without resource */
52#define STRG(rsp, kw, opt, arg, desc) \ 56#define STRG(rsp, kw, opt, arg, desc) \
53 {0, 0, (rsp), (kw), (opt), (arg), (desc)} 57 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
54 58
… …
69 (optList[i].flag == 0) 73 (optList[i].flag == 0)
70#define optList_isBool(i) \ 74#define optList_isBool(i) \
71 (optList[i].flag & Optflag_Boolean) 75 (optList[i].flag & Optflag_Boolean)
72#define optList_isReverse(i) \ 76#define optList_isReverse(i) \
73 (optList[i].flag & Optflag_Reverse) 77 (optList[i].flag & Optflag_Reverse)
78#define optList_isInfo(i) \
79 (optList[i].flag & Optflag_Info)
74 80
75static const struct 81static const struct
76 { 82 {
77 const uint8_t index; /* Option index */ 83 const uint8_t index; /* Option index */
78 const uint8_t flag; /* Option flag */ 84 const uint8_t flag; /* Option flag */
… …
267 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 273 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
268#endif 274#endif
269#ifdef HAVE_AFTERIMAGE 275#ifdef HAVE_AFTERIMAGE
270 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 276 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
271#endif 277#endif
278#ifndef NO_RESOURCES
279 RINFO ("xrm", "string"),
280#endif
281#ifdef KEYSYM_RESOURCE
282 RINFO ("keysym.sym", "keysym"),
283#endif
272 INFO ("e", "command arg ...", "command to execute") 284 INFO ("e", "command arg ...", "command to execute")
273 }; 285 };
274 286
275#undef INFO 287#undef INFO
288#undef RINFO
276#undef STRG 289#undef STRG
277#undef RSTRG 290#undef RSTRG
278#undef SWCH 291#undef SWCH
279#undef BOOL 292#undef BOOL
280 293
… …
450 if (optList[i].kw != NULL) 463 if (optList[i].kw != NULL)
451 rxvt_log (" %s: %*s%s\n", 464 rxvt_log (" %s: %*s%s\n",
452 optList[i].kw, 465 optList[i].kw,
453 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 466 (INDENT - strlen (optList[i].kw)), "", /* XXX */
454 (optList_isBool (i) ? "boolean" : optList[i].arg)); 467 (optList_isBool (i) ? "boolean" : optList[i].arg));
455#ifdef KEYSYM_RESOURCE
456 rxvt_log (" " "keysym.sym" ": %*s%s\n",
457 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
458 "keysym");
459#endif
460 rxvt_log ("\n -help to list options"); 468 rxvt_log ("\n -help to list options");
461 break; 469 break;
462 } 470 }
463 471
464 rxvt_log ("\n\n"); 472 rxvt_log ("\n\n");
… …
466} 474}
467 475
468/*}}} */ 476/*}}} */
469 477
470/*{{{ get command-line options before getting resources */ 478/*{{{ get command-line options before getting resources */
471void 479const char **
472rxvt_term::get_options (int argc, const char *const *argv) 480rxvt_term::get_options (int argc, const char *const *argv)
473{ 481{
474 int i, bad_option = 0; 482 int i, bad_option = 0;
475 483
476 for (i = 1; i < argc; i++) 484 for (i = 1; i < argc; i++)
… …
513 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 521 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
514 || (!longopt 522 || (!longopt
515 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 523 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
516 break; 524 break;
517 525
518 if (entry < ecb_array_length (optList)) 526 if (entry < ecb_array_length (optList)
527 && !optList_isInfo (entry))
519 { 528 {
520 if (optList_isReverse (entry)) 529 if (optList_isReverse (entry))
521 flag = !flag; 530 flag = !flag;
522 531
523 if (optList_isString (entry)) 532 if (optList_isString (entry))
… …
561 sprintf (res, "*.%s: %s\n", opt, argv[i]); 570 sprintf (res, "*.%s: %s\n", opt, argv[i]);
562 XrmPutLineResource (&option_db, res); 571 XrmPutLineResource (&option_db, res);
563 } 572 }
564 } 573 }
565#endif 574#endif
575 else if (!strcmp (opt, "e"))
576 {
577 if (i+1 == argc)
578 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
579
580 return (const char **)argv + i + 1;
581 }
566 else 582 else
567 { 583 {
568 bad_option = 1; 584 bad_option = 1;
569 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 585 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
570 } 586 }
571 } 587 }
572 588
573 if (bad_option) 589 if (bad_option)
574 rxvt_usage (0); 590 rxvt_usage (0);
591
592 return 0;
575} 593}
576 594
577/*}}} */ 595/*}}} */
578 596
579#ifndef NO_RESOURCES 597#ifndef NO_RESOURCES

Diff Legend

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