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.153 by sf-exg, Sat Apr 30 13:11:34 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
… …
397 switch (type) 410 switch (type)
398 { 411 {
399 case 0: /* brief listing */ 412 case 0: /* brief listing */
400 rxvt_log (" [-help] [--help]\n"); 413 rxvt_log (" [-help] [--help]\n");
401 414
402 for (col = 1, i = 0; i < ARRAY_LENGTH(optList); i++) 415 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
403 if (optList[i].desc != NULL) 416 if (optList[i].desc != NULL)
404 { 417 {
405 int len = 0; 418 int len = 0;
406 419
407 if (optList[i].arg) 420 if (optList[i].arg)
… …
425 break; 438 break;
426 439
427 case 1: /* full command-line listing */ 440 case 1: /* full command-line listing */
428 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 441 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
429 442
430 for (i = 0; i < ARRAY_LENGTH(optList); i++) 443 for (i = 0; i < ecb_array_length (optList); i++)
431 if (optList[i].desc != NULL) 444 if (optList[i].desc != NULL)
432 { 445 {
433 assert (optList[i].opt != NULL); 446 assert (optList[i].opt != NULL);
434 rxvt_log (" %s%s %-*s%s%s\n", 447 rxvt_log (" %s%s %-*s%s%s\n",
435 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 448 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
… …
444 457
445 case 2: /* full resource listing */ 458 case 2: /* full resource listing */
446 rxvt_log (" [options] [-e command args]\n\n" 459 rxvt_log (" [options] [-e command args]\n\n"
447 "where resources (long-options) include:\n"); 460 "where resources (long-options) include:\n");
448 461
449 for (i = 0; i < ARRAY_LENGTH(optList); i++) 462 for (i = 0; i < ecb_array_length (optList); i++)
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++)
… …
507 515
508 if (!strcmp (opt, "h")) 516 if (!strcmp (opt, "h"))
509 rxvt_usage (0); 517 rxvt_usage (0);
510 518
511 /* feature: always try to match long-options */ 519 /* feature: always try to match long-options */
512 for (entry = 0; entry < ARRAY_LENGTH(optList); entry++) 520 for (entry = 0; entry < ecb_array_length (optList); entry++)
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 < 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
… …
584 * Define key from XrmEnumerateDatabase. 602 * Define key from XrmEnumerateDatabase.
585 * quarks will be something like 603 * quarks will be something like
586 * "rxvt" "keysym" "0xFF01" 604 * "rxvt" "keysym" "0xFF01"
587 * value will be a string 605 * value will be a string
588 */ 606 */
589int 607static int
590rxvt_define_key (XrmDatabase *database UNUSED, 608rxvt_define_key (XrmDatabase *database ecb_unused,
591 XrmBindingList bindings UNUSED, 609 XrmBindingList bindings ecb_unused,
592 XrmQuarkList quarks, 610 XrmQuarkList quarks,
593 XrmRepresentation *type UNUSED, 611 XrmRepresentation *type ecb_unused,
594 XrmValue *value, 612 XrmValue *value,
595 XPointer closure UNUSED) 613 XPointer closure ecb_unused)
596{ 614{
597 int last; 615 int last;
598 616
599 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 617 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
600 ; 618 ;
… …
663 // parse modifiers 681 // parse modifiers
664 while (str < key) 682 while (str < key)
665 { 683 {
666 unsigned int i; 684 unsigned int i;
667 685
668 for (i=0; i < ARRAY_LENGTH(keysym_vocabulary); ++i) 686 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
669 { 687 {
670 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 688 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
671 { 689 {
672 state |= keysym_vocabulary[i].value; 690 state |= keysym_vocabulary[i].value;
673 str += keysym_vocabulary[i].len; 691 str += keysym_vocabulary[i].len;
674 break; 692 break;
675 } 693 }
676 } 694 }
677 695
678 if (i >= ARRAY_LENGTH(keysym_vocabulary)) 696 if (i >= ecb_array_length (keysym_vocabulary))
679 return -1; 697 return -1;
680 698
681 if (*str == '-') 699 if (*str == '-')
682 ++str; 700 ++str;
683 } 701 }
… …
690 sym = strtol (str, &end, 16); 708 sym = strtol (str, &end, 16);
691 if (*end) 709 if (*end)
692 return -1; 710 return -1;
693 } 711 }
694 712
713 wchar_t *ws = rxvt_mbstowcs (arg);
714 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
695 keyboard->register_user_translation (sym, state, arg); 715 keyboard->register_user_translation (sym, state, ws);
716 free (ws);
696 return 1; 717 return 1;
697} 718}
698 719
699# endif /* KEYSYM_RESOURCE */ 720# endif /* KEYSYM_RESOURCE */
700#endif /* NO_RESOURCES */ 721#endif /* NO_RESOURCES */
… …
743 XrmMergeDatabases (option_db, &database); 764 XrmMergeDatabases (option_db, &database);
744 option_db = NULL; 765 option_db = NULL;
745 /* 766 /*
746 * Query resources for options that affect us 767 * Query resources for options that affect us
747 */ 768 */
748 for (int entry = 0; entry < ARRAY_LENGTH(optList); entry++) 769 for (int entry = 0; entry < ecb_array_length (optList); entry++)
749 { 770 {
750 int s; 771 int s;
751 const char *kw = optList[entry].kw; 772 const char *kw = optList[entry].kw;
752 773
753 if (kw == NULL || rs[optList[entry].doff] != NULL) 774 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
773 794
774 set_option (optList[entry].index, s); 795 set_option (optList[entry].index, s);
775 } 796 }
776 } 797 }
777 } 798 }
799#endif /* NO_RESOURCES */
800}
778 801
802void
803rxvt_term::extract_keysym_resources ()
804{
805#ifndef NO_RESOURCES
779 /* 806 /*
780 * [R5 or later]: enumerate the resource database 807 * [R5 or later]: enumerate the resource database
781 */ 808 */
782# ifdef KEYSYM_RESOURCE 809# ifdef KEYSYM_RESOURCE
810 XrmDatabase database = XrmGetDatabase (dpy);
783 XrmName name_prefix[3]; 811 XrmName name_prefix[3];
784 XrmClass class_prefix[3]; 812 XrmClass class_prefix[3];
785 813
786 name_prefix[0] = XrmStringToName (rs[Rs_name]); 814 name_prefix[0] = XrmStringToName (rs[Rs_name]);
787 name_prefix[1] = XrmStringToName ("keysym"); 815 name_prefix[1] = XrmStringToName ("keysym");
… …
791 class_prefix[2] = NULLQUARK; 819 class_prefix[2] = NULLQUARK;
792 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 820 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
793 XrmEnumerateDatabase (database, name_prefix, class_prefix, 821 XrmEnumerateDatabase (database, name_prefix, class_prefix,
794 XrmEnumOneLevel, rxvt_define_key, NULL); 822 XrmEnumOneLevel, rxvt_define_key, NULL);
795# ifdef RESFALLBACK 823# ifdef RESFALLBACK
796 name_prefix[0] = XrmStringToName (RESFALLBACK);
797 name_prefix[1] = XrmStringToName ("keysym");
798 class_prefix[0] = XrmStringToName (RESFALLBACK); 824 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
799 class_prefix[1] = XrmStringToName ("Keysym");
800 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 825 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
801 XrmEnumerateDatabase (database, name_prefix, class_prefix, 826 XrmEnumerateDatabase (database, name_prefix, class_prefix,
802 XrmEnumOneLevel, rxvt_define_key, NULL); 827 XrmEnumOneLevel, rxvt_define_key, NULL);
803# endif 828# endif
804# endif 829# endif

Diff Legend

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