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.154 by sf-exg, Mon May 30 18:39:04 2011 UTC vs.
Revision 1.162 by sf-exg, Sat Feb 4 21:47:06 2012 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 */
… …
264#endif 270#endif
265#if ISO_14755 271#if ISO_14755
266 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), 272 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
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#ifndef NO_RESOURCES
270 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 276 RINFO ("xrm", "string"),
277#endif
278#ifdef KEYSYM_RESOURCE
279 RINFO ("keysym.sym", "keysym"),
271#endif 280#endif
272 INFO ("e", "command arg ...", "command to execute") 281 INFO ("e", "command arg ...", "command to execute")
273 }; 282 };
274 283
275#undef INFO 284#undef INFO
285#undef RINFO
276#undef STRG 286#undef STRG
277#undef RSTRG 287#undef RSTRG
278#undef SWCH 288#undef SWCH
279#undef BOOL 289#undef BOOL
280 290
… …
322 "fade," 332 "fade,"
323#endif 333#endif
324#if defined(ENABLE_TRANSPARENCY) 334#if defined(ENABLE_TRANSPARENCY)
325 "transparent," 335 "transparent,"
326 "tint," 336 "tint,"
327#endif
328#if HAVE_AFTERIMAGE
329 "afterimage,"
330#endif 337#endif
331#if HAVE_PIXBUF 338#if HAVE_PIXBUF
332 "pixbuf," 339 "pixbuf,"
333#endif 340#endif
334#if defined(USE_XIM) 341#if defined(USE_XIM)
… …
450 if (optList[i].kw != NULL) 457 if (optList[i].kw != NULL)
451 rxvt_log (" %s: %*s%s\n", 458 rxvt_log (" %s: %*s%s\n",
452 optList[i].kw, 459 optList[i].kw,
453 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 460 (INDENT - strlen (optList[i].kw)), "", /* XXX */
454 (optList_isBool (i) ? "boolean" : optList[i].arg)); 461 (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"); 462 rxvt_log ("\n -help to list options");
461 break; 463 break;
462 } 464 }
463 465
464 rxvt_log ("\n\n"); 466 rxvt_log ("\n\n");
… …
466} 468}
467 469
468/*}}} */ 470/*}}} */
469 471
470/*{{{ get command-line options before getting resources */ 472/*{{{ get command-line options before getting resources */
471void 473const char **
472rxvt_term::get_options (int argc, const char *const *argv) 474rxvt_term::get_options (int argc, const char *const *argv)
473{ 475{
474 int i, bad_option = 0; 476 int i, bad_option = 0;
475 477
476 for (i = 1; i < argc; i++) 478 for (i = 1; i < argc; i++)
… …
513 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 515 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
514 || (!longopt 516 || (!longopt
515 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 517 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
516 break; 518 break;
517 519
518 if (entry < ecb_array_length (optList)) 520 if (entry < ecb_array_length (optList)
521 && !optList_isInfo (entry))
519 { 522 {
520 if (optList_isReverse (entry)) 523 if (optList_isReverse (entry))
521 flag = !flag; 524 flag = !flag;
522 525
523 if (optList_isString (entry)) 526 if (optList_isString (entry))
… …
561 sprintf (res, "*.%s: %s\n", opt, argv[i]); 564 sprintf (res, "*.%s: %s\n", opt, argv[i]);
562 XrmPutLineResource (&option_db, res); 565 XrmPutLineResource (&option_db, res);
563 } 566 }
564 } 567 }
565#endif 568#endif
569 else if (!strcmp (opt, "e"))
570 {
571 if (i+1 == argc)
572 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
573
574 return (const char **)argv + i + 1;
575 }
566 else 576 else
567 { 577 {
568 bad_option = 1; 578 bad_option = 1;
569 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 579 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
570 } 580 }
571 } 581 }
572 582
573 if (bad_option) 583 if (bad_option)
574 rxvt_usage (0); 584 rxvt_usage (0);
585
586 return 0;
575} 587}
576 588
577/*}}} */ 589/*}}} */
578 590
579#ifndef NO_RESOURCES 591#ifndef NO_RESOURCES
… …
584 * Define key from XrmEnumerateDatabase. 596 * Define key from XrmEnumerateDatabase.
585 * quarks will be something like 597 * quarks will be something like
586 * "rxvt" "keysym" "0xFF01" 598 * "rxvt" "keysym" "0xFF01"
587 * value will be a string 599 * value will be a string
588 */ 600 */
589int 601static int
590rxvt_define_key (XrmDatabase *database ecb_unused, 602rxvt_define_key (XrmDatabase *database ecb_unused,
591 XrmBindingList bindings ecb_unused, 603 XrmBindingList bindings ecb_unused,
592 XrmQuarkList quarks, 604 XrmQuarkList quarks,
593 XrmRepresentation *type ecb_unused, 605 XrmRepresentation *type ecb_unused,
594 XrmValue *value, 606 XrmValue *value,
… …
663 // parse modifiers 675 // parse modifiers
664 while (str < key) 676 while (str < key)
665 { 677 {
666 unsigned int i; 678 unsigned int i;
667 679
668 for (i=0; i < ecb_array_length (keysym_vocabulary); ++i) 680 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
669 { 681 {
670 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 682 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
671 { 683 {
672 state |= keysym_vocabulary[i].value; 684 state |= keysym_vocabulary[i].value;
673 str += keysym_vocabulary[i].len; 685 str += keysym_vocabulary[i].len;
… …
690 sym = strtol (str, &end, 16); 702 sym = strtol (str, &end, 16);
691 if (*end) 703 if (*end)
692 return -1; 704 return -1;
693 } 705 }
694 706
707 wchar_t *ws = rxvt_mbstowcs (arg);
708 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); 709 keyboard->register_user_translation (sym, state, ws);
710 free (ws);
696 return 1; 711 return 1;
697} 712}
698 713
699# endif /* KEYSYM_RESOURCE */ 714# endif /* KEYSYM_RESOURCE */
700#endif /* NO_RESOURCES */ 715#endif /* NO_RESOURCES */
… …
773 788
774 set_option (optList[entry].index, s); 789 set_option (optList[entry].index, s);
775 } 790 }
776 } 791 }
777 } 792 }
793#endif /* NO_RESOURCES */
794}
778 795
796void
797rxvt_term::extract_keysym_resources ()
798{
799#ifndef NO_RESOURCES
779 /* 800 /*
780 * [R5 or later]: enumerate the resource database 801 * [R5 or later]: enumerate the resource database
781 */ 802 */
782# ifdef KEYSYM_RESOURCE 803# ifdef KEYSYM_RESOURCE
804 XrmDatabase database = XrmGetDatabase (dpy);
783 XrmName name_prefix[3]; 805 XrmName name_prefix[3];
784 XrmClass class_prefix[3]; 806 XrmClass class_prefix[3];
785 807
786 name_prefix[0] = XrmStringToName (rs[Rs_name]); 808 name_prefix[0] = XrmStringToName (rs[Rs_name]);
787 name_prefix[1] = XrmStringToName ("keysym"); 809 name_prefix[1] = XrmStringToName ("keysym");
… …
791 class_prefix[2] = NULLQUARK; 813 class_prefix[2] = NULLQUARK;
792 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 814 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
793 XrmEnumerateDatabase (database, name_prefix, class_prefix, 815 XrmEnumerateDatabase (database, name_prefix, class_prefix,
794 XrmEnumOneLevel, rxvt_define_key, NULL); 816 XrmEnumOneLevel, rxvt_define_key, NULL);
795# ifdef RESFALLBACK 817# ifdef RESFALLBACK
796 name_prefix[0] = XrmStringToName (RESFALLBACK);
797 name_prefix[1] = XrmStringToName ("keysym");
798 class_prefix[0] = XrmStringToName (RESFALLBACK); 818 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
799 class_prefix[1] = XrmStringToName ("Keysym");
800 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 819 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
801 XrmEnumerateDatabase (database, name_prefix, class_prefix, 820 XrmEnumerateDatabase (database, name_prefix, class_prefix,
802 XrmEnumOneLevel, rxvt_define_key, NULL); 821 XrmEnumOneLevel, rxvt_define_key, NULL);
803# endif 822# endif
804# endif 823# endif

Diff Legend

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