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.150 by root, Mon Feb 21 07:41:04 2011 UTC vs.
Revision 1.160 by sf-exg, Sun Dec 18 02:14:59 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)}
50 51
51/* STRG () - command-line option, with/without resource */ 52/* STRG () - command-line option, with/without resource */
52#define STRG(rsp, kw, opt, arg, desc) \ 53#define STRG(rsp, kw, opt, arg, desc) \
53 {0, 0, (rsp), (kw), (opt), (arg), (desc)} 54 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
54 55
… …
69 (optList[i].flag == 0) 70 (optList[i].flag == 0)
70#define optList_isBool(i) \ 71#define optList_isBool(i) \
71 (optList[i].flag & Optflag_Boolean) 72 (optList[i].flag & Optflag_Boolean)
72#define optList_isReverse(i) \ 73#define optList_isReverse(i) \
73 (optList[i].flag & Optflag_Reverse) 74 (optList[i].flag & Optflag_Reverse)
75#define optList_isInfo(i) \
76 (optList[i].flag & Optflag_Info)
74 77
75static const struct 78static const struct
76 { 79 {
77 const uint8_t index; /* Option index */ 80 const uint8_t index; /* Option index */
78 const uint8_t flag; /* Option flag */ 81 const uint8_t flag; /* Option flag */
… …
397 switch (type) 400 switch (type)
398 { 401 {
399 case 0: /* brief listing */ 402 case 0: /* brief listing */
400 rxvt_log (" [-help] [--help]\n"); 403 rxvt_log (" [-help] [--help]\n");
401 404
402 for (col = 1, i = 0; i < ARRAY_LENGTH(optList); i++) 405 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
403 if (optList[i].desc != NULL) 406 if (optList[i].desc != NULL)
404 { 407 {
405 int len = 0; 408 int len = 0;
406 409
407 if (optList[i].arg) 410 if (optList[i].arg)
408 len = strlen (optList[i].arg) + 1; 411 len = strlen (optList[i].arg) + 1;
409 assert (optList[i].opt != NULL); 412 assert (optList[i].opt != NULL);
410 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 413 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
411 col += len; 414 col += len;
412 if (col > 79) 415 if (col > 79)
413 { 416 {
414 /* assume regular width */ 417 /* assume regular width */
415 rxvt_log ("\n"); 418 rxvt_log ("\n");
… …
425 break; 428 break;
426 429
427 case 1: /* full command-line listing */ 430 case 1: /* full command-line listing */
428 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 431 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
429 432
430 for (i = 0; i < ARRAY_LENGTH(optList); i++) 433 for (i = 0; i < ecb_array_length (optList); i++)
431 if (optList[i].desc != NULL) 434 if (optList[i].desc != NULL)
432 { 435 {
433 assert (optList[i].opt != NULL); 436 assert (optList[i].opt != NULL);
434 rxvt_log (" %s%s %-*s%s%s\n", 437 rxvt_log (" %s%s %-*s%s%s\n",
435 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 438 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
… …
444 447
445 case 2: /* full resource listing */ 448 case 2: /* full resource listing */
446 rxvt_log (" [options] [-e command args]\n\n" 449 rxvt_log (" [options] [-e command args]\n\n"
447 "where resources (long-options) include:\n"); 450 "where resources (long-options) include:\n");
448 451
449 for (i = 0; i < ARRAY_LENGTH(optList); i++) 452 for (i = 0; i < ecb_array_length (optList); i++)
450 if (optList[i].kw != NULL) 453 if (optList[i].kw != NULL)
451 rxvt_log (" %s: %*s%s\n", 454 rxvt_log (" %s: %*s%s\n",
452 optList[i].kw, 455 optList[i].kw,
453 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 456 (INDENT - strlen (optList[i].kw)), "", /* XXX */
454 (optList_isBool (i) ? "boolean" : optList[i].arg)); 457 (optList_isBool (i) ? "boolean" : optList[i].arg));
… …
461 break; 464 break;
462 } 465 }
463 466
464 rxvt_log ("\n\n"); 467 rxvt_log ("\n\n");
465 rxvt_exit_failure (); 468 rxvt_exit_failure ();
466 /* NOTREACHED */
467} 469}
468 470
469/*}}} */ 471/*}}} */
470 472
471/*{{{ get command-line options before getting resources */ 473/*{{{ get command-line options before getting resources */
472void 474const char **
473rxvt_term::get_options (int argc, const char *const *argv) 475rxvt_term::get_options (int argc, const char *const *argv)
474{ 476{
475 int i, bad_option = 0; 477 int i, bad_option = 0;
476 478
477 for (i = 1; i < argc; i++) 479 for (i = 1; i < argc; i++)
… …
508 510
509 if (!strcmp (opt, "h")) 511 if (!strcmp (opt, "h"))
510 rxvt_usage (0); 512 rxvt_usage (0);
511 513
512 /* feature: always try to match long-options */ 514 /* feature: always try to match long-options */
513 for (entry = 0; entry < ARRAY_LENGTH(optList); entry++) 515 for (entry = 0; entry < ecb_array_length (optList); entry++)
514 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 516 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
515 || (!longopt 517 || (!longopt
516 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 518 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
517 break; 519 break;
518 520
519 if (entry < ARRAY_LENGTH(optList)) 521 if (entry < ecb_array_length (optList)
522 && !optList_isInfo (entry))
520 { 523 {
521 if (optList_isReverse (entry)) 524 if (optList_isReverse (entry))
522 flag = !flag; 525 flag = !flag;
523 526
524 if (optList_isString (entry)) 527 if (optList_isString (entry))
525 { 528 {
526 /* 529 /*
527 * special cases are handled in main.c:main () to allow 530 * special cases are handled in init_resources () to allow
528 * X resources to set these values before we settle for 531 * X resources to set these values before we settle for
529 * default values 532 * default values
530 */ 533 */
531 534
532 if (optList[entry].doff != -1) 535 if (optList[entry].doff != -1)
… …
562 sprintf (res, "*.%s: %s\n", opt, argv[i]); 565 sprintf (res, "*.%s: %s\n", opt, argv[i]);
563 XrmPutLineResource (&option_db, res); 566 XrmPutLineResource (&option_db, res);
564 } 567 }
565 } 568 }
566#endif 569#endif
570 else if (!strcmp (opt, "e"))
571 {
572 if (i+1 == argc)
573 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
574
575 return (const char **)argv + i + 1;
576 }
567 else 577 else
568 { 578 {
569 bad_option = 1; 579 bad_option = 1;
570 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 580 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
571 } 581 }
572 } 582 }
573 583
574 if (bad_option) 584 if (bad_option)
575 rxvt_usage (0); 585 rxvt_usage (0);
586
587 return 0;
576} 588}
577 589
578/*}}} */ 590/*}}} */
579 591
580#ifndef NO_RESOURCES 592#ifndef NO_RESOURCES
… …
585 * Define key from XrmEnumerateDatabase. 597 * Define key from XrmEnumerateDatabase.
586 * quarks will be something like 598 * quarks will be something like
587 * "rxvt" "keysym" "0xFF01" 599 * "rxvt" "keysym" "0xFF01"
588 * value will be a string 600 * value will be a string
589 */ 601 */
590/* ARGSUSED */ 602static int
591int
592rxvt_define_key (XrmDatabase *database UNUSED, 603rxvt_define_key (XrmDatabase *database ecb_unused,
593 XrmBindingList bindings UNUSED, 604 XrmBindingList bindings ecb_unused,
594 XrmQuarkList quarks, 605 XrmQuarkList quarks,
595 XrmRepresentation *type UNUSED, 606 XrmRepresentation *type ecb_unused,
596 XrmValue *value, 607 XrmValue *value,
597 XPointer closure UNUSED) 608 XPointer closure ecb_unused)
598{ 609{
599 int last; 610 int last;
600 611
601 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 612 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
602 ; 613 ;
… …
665 // parse modifiers 676 // parse modifiers
666 while (str < key) 677 while (str < key)
667 { 678 {
668 unsigned int i; 679 unsigned int i;
669 680
670 for (i=0; i < ARRAY_LENGTH(keysym_vocabulary); ++i) 681 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
671 { 682 {
672 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 683 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
673 { 684 {
674 state |= keysym_vocabulary[i].value; 685 state |= keysym_vocabulary[i].value;
675 str += keysym_vocabulary[i].len; 686 str += keysym_vocabulary[i].len;
676 break; 687 break;
677 } 688 }
678 } 689 }
679 690
680 if (i >= ARRAY_LENGTH(keysym_vocabulary)) 691 if (i >= ecb_array_length (keysym_vocabulary))
681 return -1; 692 return -1;
682 693
683 if (*str == '-') 694 if (*str == '-')
684 ++str; 695 ++str;
685 } 696 }
… …
692 sym = strtol (str, &end, 16); 703 sym = strtol (str, &end, 16);
693 if (*end) 704 if (*end)
694 return -1; 705 return -1;
695 } 706 }
696 707
708 wchar_t *ws = rxvt_mbstowcs (arg);
709 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
697 keyboard->register_user_translation (sym, state, arg); 710 keyboard->register_user_translation (sym, state, ws);
711 free (ws);
698 return 1; 712 return 1;
699} 713}
700 714
701# endif /* KEYSYM_RESOURCE */ 715# endif /* KEYSYM_RESOURCE */
702#endif /* NO_RESOURCES */ 716#endif /* NO_RESOURCES */
… …
745 XrmMergeDatabases (option_db, &database); 759 XrmMergeDatabases (option_db, &database);
746 option_db = NULL; 760 option_db = NULL;
747 /* 761 /*
748 * Query resources for options that affect us 762 * Query resources for options that affect us
749 */ 763 */
750 for (int entry = 0; entry < ARRAY_LENGTH(optList); entry++) 764 for (int entry = 0; entry < ecb_array_length (optList); entry++)
751 { 765 {
752 int s; 766 int s;
753 const char *kw = optList[entry].kw; 767 const char *kw = optList[entry].kw;
754 768
755 if (kw == NULL || rs[optList[entry].doff] != NULL) 769 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
775 789
776 set_option (optList[entry].index, s); 790 set_option (optList[entry].index, s);
777 } 791 }
778 } 792 }
779 } 793 }
794#endif /* NO_RESOURCES */
795}
780 796
797void
798rxvt_term::extract_keysym_resources ()
799{
800#ifndef NO_RESOURCES
781 /* 801 /*
782 * [R5 or later]: enumerate the resource database 802 * [R5 or later]: enumerate the resource database
783 */ 803 */
784# ifdef KEYSYM_RESOURCE 804# ifdef KEYSYM_RESOURCE
805 XrmDatabase database = XrmGetDatabase (dpy);
785 XrmName name_prefix[3]; 806 XrmName name_prefix[3];
786 XrmClass class_prefix[3]; 807 XrmClass class_prefix[3];
787 808
788 name_prefix[0] = XrmStringToName (rs[Rs_name]); 809 name_prefix[0] = XrmStringToName (rs[Rs_name]);
789 name_prefix[1] = XrmStringToName ("keysym"); 810 name_prefix[1] = XrmStringToName ("keysym");
… …
793 class_prefix[2] = NULLQUARK; 814 class_prefix[2] = NULLQUARK;
794 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 815 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
795 XrmEnumerateDatabase (database, name_prefix, class_prefix, 816 XrmEnumerateDatabase (database, name_prefix, class_prefix,
796 XrmEnumOneLevel, rxvt_define_key, NULL); 817 XrmEnumOneLevel, rxvt_define_key, NULL);
797# ifdef RESFALLBACK 818# ifdef RESFALLBACK
798 name_prefix[0] = XrmStringToName (RESFALLBACK);
799 name_prefix[1] = XrmStringToName ("keysym");
800 class_prefix[0] = XrmStringToName (RESFALLBACK); 819 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
801 class_prefix[1] = XrmStringToName ("Keysym");
802 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 820 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
803 XrmEnumerateDatabase (database, name_prefix, class_prefix, 821 XrmEnumerateDatabase (database, name_prefix, class_prefix,
804 XrmEnumOneLevel, rxvt_define_key, NULL); 822 XrmEnumOneLevel, rxvt_define_key, NULL);
805# endif 823# endif
806# endif 824# endif

Diff Legend

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