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.147 by sf-exg, Wed Oct 13 23:04:57 2010 UTC vs.
Revision 1.149 by sf-exg, Sat Dec 18 18:17:39 2010 UTC

… …
69 (optList[i].flag == 0) 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 \
75 (sizeof (optList) / sizeof (optList[0]))
76 74
77static const struct 75static const struct
78 { 76 {
79 const uint8_t index; /* Option index */ 77 const uint8_t index; /* Option index */
80 const uint8_t flag; /* Option flag */ 78 const uint8_t flag; /* Option flag */
… …
328 "tint," 326 "tint,"
329#endif 327#endif
330#if HAVE_AFTERIMAGE 328#if HAVE_AFTERIMAGE
331 "afterimage," 329 "afterimage,"
332#endif 330#endif
331#if HAVE_PIXBUF
332 "pixbuf,"
333#endif
333#if defined(USE_XIM) 334#if defined(USE_XIM)
334 "XIM," 335 "XIM,"
335#endif 336#endif
336#if defined(NO_BACKSPACE_KEY) 337#if defined(NO_BACKSPACE_KEY)
337 "no_backspace," 338 "no_backspace,"
… …
396 switch (type) 397 switch (type)
397 { 398 {
398 case 0: /* brief listing */ 399 case 0: /* brief listing */
399 rxvt_log (" [-help] [--help]\n"); 400 rxvt_log (" [-help] [--help]\n");
400 401
401 for (col = 1, i = 0; i < optList_size; i++) 402 for (col = 1, i = 0; i < ARRAY_LENGTH(optList); i++)
402 if (optList[i].desc != NULL) 403 if (optList[i].desc != NULL)
403 { 404 {
404 int len = 0; 405 int len = 0;
405 406
406 if (optList[i].arg) 407 if (optList[i].arg)
… …
424 break; 425 break;
425 426
426 case 1: /* full command-line listing */ 427 case 1: /* full command-line listing */
427 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 428 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
428 429
429 for (i = 0; i < optList_size; i++) 430 for (i = 0; i < ARRAY_LENGTH(optList); i++)
430 if (optList[i].desc != NULL) 431 if (optList[i].desc != NULL)
431 { 432 {
432 assert (optList[i].opt != NULL); 433 assert (optList[i].opt != NULL);
433 rxvt_log (" %s%s %-*s%s%s\n", 434 rxvt_log (" %s%s %-*s%s%s\n",
434 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 435 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
… …
443 444
444 case 2: /* full resource listing */ 445 case 2: /* full resource listing */
445 rxvt_log (" [options] [-e command args]\n\n" 446 rxvt_log (" [options] [-e command args]\n\n"
446 "where resources (long-options) include:\n"); 447 "where resources (long-options) include:\n");
447 448
448 for (i = 0; i < optList_size; i++) 449 for (i = 0; i < ARRAY_LENGTH(optList); i++)
449 if (optList[i].kw != NULL) 450 if (optList[i].kw != NULL)
450 rxvt_log (" %s: %*s%s\n", 451 rxvt_log (" %s: %*s%s\n",
451 optList[i].kw, 452 optList[i].kw,
452 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 453 (INDENT - strlen (optList[i].kw)), "", /* XXX */
453 (optList_isBool (i) ? "boolean" : optList[i].arg)); 454 (optList_isBool (i) ? "boolean" : optList[i].arg));
… …
507 508
508 if (!strcmp (opt, "h")) 509 if (!strcmp (opt, "h"))
509 rxvt_usage (0); 510 rxvt_usage (0);
510 511
511 /* feature: always try to match long-options */ 512 /* feature: always try to match long-options */
512 for (entry = 0; entry < optList_size; entry++) 513 for (entry = 0; entry < ARRAY_LENGTH(optList); entry++)
513 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 514 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
514 || (!longopt 515 || (!longopt
515 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 516 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
516 break; 517 break;
517 518
518 if (entry < optList_size) 519 if (entry < ARRAY_LENGTH(optList))
519 { 520 {
520 if (optList_isReverse (entry)) 521 if (optList_isReverse (entry))
521 flag = !flag; 522 flag = !flag;
522 523
523 if (optList_isString (entry)) 524 if (optList_isString (entry))
… …
664 // parse modifiers 665 // parse modifiers
665 while (str < key) 666 while (str < key)
666 { 667 {
667 unsigned int i; 668 unsigned int i;
668 669
669 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 670 for (i=0; i < ARRAY_LENGTH(keysym_vocabulary); ++i)
670 { 671 {
671 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 672 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
672 { 673 {
673 state |= keysym_vocabulary[i].value; 674 state |= keysym_vocabulary[i].value;
674 str += keysym_vocabulary[i].len; 675 str += keysym_vocabulary[i].len;
675 break; 676 break;
676 } 677 }
677 } 678 }
678 679
679 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 680 if (i >= ARRAY_LENGTH(keysym_vocabulary))
680 return -1; 681 return -1;
681 682
682 if (*str == '-') 683 if (*str == '-')
683 ++str; 684 ++str;
684 } 685 }
… …
744 XrmMergeDatabases (option_db, &database); 745 XrmMergeDatabases (option_db, &database);
745 option_db = NULL; 746 option_db = NULL;
746 /* 747 /*
747 * Query resources for options that affect us 748 * Query resources for options that affect us
748 */ 749 */
749 for (int entry = 0; entry < optList_size; entry++) 750 for (int entry = 0; entry < ARRAY_LENGTH(optList); entry++)
750 { 751 {
751 int s; 752 int s;
752 const char *kw = optList[entry].kw; 753 const char *kw = optList[entry].kw;
753 754
754 if (kw == NULL || rs[optList[entry].doff] != NULL) 755 if (kw == NULL || rs[optList[entry].doff] != NULL)

Diff Legend

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