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.148 by sf-exg, Thu Oct 14 22:08:45 2010 UTC vs.
Revision 1.164 by sf-exg, Fri May 25 08:27:47 2012 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
11 * 11 *
12 * This program is free software; you can redistribute it and/or modify 12 * This program is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License as published by 13 * it under the terms of the GNU General Public License as published by
14 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 2 of the License, or
… …
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)
74#define optList_size \ 78#define optList_isInfo(i) \
75 (sizeof (optList) / sizeof (optList[0])) 79 (optList[i].flag & Optflag_Info)
76 80
77static const struct 81static const struct
78 { 82 {
79 const uint8_t index; /* Option index */ 83 const uint8_t index; /* Option index */
80 const uint8_t flag; /* Option flag */ 84 const uint8_t flag; /* Option flag */
… …
266#endif 270#endif
267#if ISO_14755 271#if ISO_14755
268 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), 272 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
269 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),
270#endif 274#endif
271#ifdef HAVE_AFTERIMAGE 275#ifndef NO_RESOURCES
272 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"),
273#endif 280#endif
274 INFO ("e", "command arg ...", "command to execute") 281 INFO ("e", "command arg ...", "command to execute")
275 }; 282 };
276 283
277#undef INFO 284#undef INFO
285#undef RINFO
278#undef STRG 286#undef STRG
279#undef RSTRG 287#undef RSTRG
280#undef SWCH 288#undef SWCH
281#undef BOOL 289#undef BOOL
282 290
… …
325#endif 333#endif
326#if defined(ENABLE_TRANSPARENCY) 334#if defined(ENABLE_TRANSPARENCY)
327 "transparent," 335 "transparent,"
328 "tint," 336 "tint,"
329#endif 337#endif
330#if HAVE_AFTERIMAGE
331 "afterimage,"
332#endif
333#if HAVE_PIXBUF 338#if HAVE_PIXBUF
334 "pixbuf," 339 "pixbuf,"
335#endif 340#endif
336#if defined(USE_XIM) 341#if defined(USE_XIM)
337 "XIM," 342 "XIM,"
… …
399 switch (type) 404 switch (type)
400 { 405 {
401 case 0: /* brief listing */ 406 case 0: /* brief listing */
402 rxvt_log (" [-help] [--help]\n"); 407 rxvt_log (" [-help] [--help]\n");
403 408
404 for (col = 1, i = 0; i < optList_size; i++) 409 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
405 if (optList[i].desc != NULL) 410 if (optList[i].desc != NULL)
406 { 411 {
407 int len = 0; 412 int len = 0;
408 413
409 if (optList[i].arg) 414 if (optList[i].arg)
410 len = strlen (optList[i].arg) + 1; 415 len = strlen (optList[i].arg) + 1;
411 assert (optList[i].opt != NULL); 416 assert (optList[i].opt != NULL);
412 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 417 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
413 col += len; 418 col += len;
414 if (col > 79) 419 if (col > 79)
415 { 420 {
416 /* assume regular width */ 421 /* assume regular width */
417 rxvt_log ("\n"); 422 rxvt_log ("\n");
… …
427 break; 432 break;
428 433
429 case 1: /* full command-line listing */ 434 case 1: /* full command-line listing */
430 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 435 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
431 436
432 for (i = 0; i < optList_size; i++) 437 for (i = 0; i < ecb_array_length (optList); i++)
433 if (optList[i].desc != NULL) 438 if (optList[i].desc != NULL)
434 { 439 {
435 assert (optList[i].opt != NULL); 440 assert (optList[i].opt != NULL);
436 rxvt_log (" %s%s %-*s%s%s\n", 441 rxvt_log (" %s%s %-*s%s%s\n",
437 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 442 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
… …
446 451
447 case 2: /* full resource listing */ 452 case 2: /* full resource listing */
448 rxvt_log (" [options] [-e command args]\n\n" 453 rxvt_log (" [options] [-e command args]\n\n"
449 "where resources (long-options) include:\n"); 454 "where resources (long-options) include:\n");
450 455
451 for (i = 0; i < optList_size; i++) 456 for (i = 0; i < ecb_array_length (optList); i++)
452 if (optList[i].kw != NULL) 457 if (optList[i].kw != NULL)
453 rxvt_log (" %s: %*s%s\n", 458 rxvt_log (" %s: %*s%s\n",
454 optList[i].kw, 459 optList[i].kw,
455 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 460 (INDENT - strlen (optList[i].kw)), "", /* XXX */
456 (optList_isBool (i) ? "boolean" : optList[i].arg)); 461 (optList_isBool (i) ? "boolean" : optList[i].arg));
457#ifdef KEYSYM_RESOURCE
458 rxvt_log (" " "keysym.sym" ": %*s%s\n",
459 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
460 "keysym");
461#endif
462 rxvt_log ("\n -help to list options"); 462 rxvt_log ("\n -help to list options");
463 break; 463 break;
464 } 464 }
465 465
466 rxvt_log ("\n\n"); 466 rxvt_log ("\n\n");
467 rxvt_exit_failure (); 467 rxvt_exit_failure ();
468 /* NOTREACHED */
469} 468}
470 469
471/*}}} */ 470/*}}} */
472 471
473/*{{{ get command-line options before getting resources */ 472/*{{{ get command-line options before getting resources */
474void 473const char **
475rxvt_term::get_options (int argc, const char *const *argv) 474rxvt_term::get_options (int argc, const char *const *argv)
476{ 475{
477 int i, bad_option = 0; 476 int i, bad_option = 0;
478 477
479 for (i = 1; i < argc; i++) 478 for (i = 1; i < argc; i++)
… …
510 509
511 if (!strcmp (opt, "h")) 510 if (!strcmp (opt, "h"))
512 rxvt_usage (0); 511 rxvt_usage (0);
513 512
514 /* feature: always try to match long-options */ 513 /* feature: always try to match long-options */
515 for (entry = 0; entry < optList_size; entry++) 514 for (entry = 0; entry < ecb_array_length (optList); entry++)
516 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 515 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
517 || (!longopt 516 || (!longopt
518 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 517 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
519 break; 518 break;
520 519
521 if (entry < optList_size) 520 if (entry < ecb_array_length (optList)
521 && !optList_isInfo (entry))
522 { 522 {
523 if (optList_isReverse (entry)) 523 if (optList_isReverse (entry))
524 flag = !flag; 524 flag = !flag;
525 525
526 if (optList_isString (entry)) 526 if (optList_isString (entry))
527 { 527 {
528 /* 528 /*
529 * special cases are handled in main.c:main () to allow 529 * special cases are handled in init_resources () to allow
530 * X resources to set these values before we settle for 530 * X resources to set these values before we settle for
531 * default values 531 * default values
532 */ 532 */
533 533
534 if (optList[entry].doff != -1) 534 if (optList[entry].doff != -1)
… …
564 sprintf (res, "*.%s: %s\n", opt, argv[i]); 564 sprintf (res, "*.%s: %s\n", opt, argv[i]);
565 XrmPutLineResource (&option_db, res); 565 XrmPutLineResource (&option_db, res);
566 } 566 }
567 } 567 }
568#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 }
569 else 576 else
570 { 577 {
571 bad_option = 1; 578 bad_option = 1;
572 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 579 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
573 } 580 }
574 } 581 }
575 582
576 if (bad_option) 583 if (bad_option)
577 rxvt_usage (0); 584 rxvt_usage (0);
585
586 return 0;
578} 587}
579 588
580/*}}} */ 589/*}}} */
581 590
582#ifndef NO_RESOURCES 591#ifndef NO_RESOURCES
… …
587 * Define key from XrmEnumerateDatabase. 596 * Define key from XrmEnumerateDatabase.
588 * quarks will be something like 597 * quarks will be something like
589 * "rxvt" "keysym" "0xFF01" 598 * "rxvt" "keysym" "0xFF01"
590 * value will be a string 599 * value will be a string
591 */ 600 */
592/* ARGSUSED */ 601static int
593int
594rxvt_define_key (XrmDatabase *database UNUSED, 602rxvt_define_key (XrmDatabase *database ecb_unused,
595 XrmBindingList bindings UNUSED, 603 XrmBindingList bindings ecb_unused,
596 XrmQuarkList quarks, 604 XrmQuarkList quarks,
597 XrmRepresentation *type UNUSED, 605 XrmRepresentation *type ecb_unused,
598 XrmValue *value, 606 XrmValue *value,
599 XPointer closure UNUSED) 607 XPointer closure ecb_unused)
600{ 608{
601 int last; 609 int last;
602 610
603 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 611 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
604 ; 612 ;
… …
667 // parse modifiers 675 // parse modifiers
668 while (str < key) 676 while (str < key)
669 { 677 {
670 unsigned int i; 678 unsigned int i;
671 679
672 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 680 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
673 { 681 {
674 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)
675 { 683 {
676 state |= keysym_vocabulary[i].value; 684 state |= keysym_vocabulary[i].value;
677 str += keysym_vocabulary[i].len; 685 str += keysym_vocabulary[i].len;
678 break; 686 break;
679 } 687 }
680 } 688 }
681 689
682 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 690 if (i >= ecb_array_length (keysym_vocabulary))
683 return -1; 691 return -1;
684 692
685 if (*str == '-') 693 if (*str == '-')
686 ++str; 694 ++str;
687 } 695 }
… …
694 sym = strtol (str, &end, 16); 702 sym = strtol (str, &end, 16);
695 if (*end) 703 if (*end)
696 return -1; 704 return -1;
697 } 705 }
698 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)))
699 keyboard->register_user_translation (sym, state, arg); 709 keyboard->register_user_translation (sym, state, ws);
710 free (ws);
700 return 1; 711 return 1;
701} 712}
702 713
703# endif /* KEYSYM_RESOURCE */ 714# endif /* KEYSYM_RESOURCE */
704#endif /* NO_RESOURCES */ 715#endif /* NO_RESOURCES */
… …
747 XrmMergeDatabases (option_db, &database); 758 XrmMergeDatabases (option_db, &database);
748 option_db = NULL; 759 option_db = NULL;
749 /* 760 /*
750 * Query resources for options that affect us 761 * Query resources for options that affect us
751 */ 762 */
752 for (int entry = 0; entry < optList_size; entry++) 763 for (int entry = 0; entry < ecb_array_length (optList); entry++)
753 { 764 {
754 int s;
755 const char *kw = optList[entry].kw; 765 const char *kw = optList[entry].kw;
756 766
757 if (kw == NULL || rs[optList[entry].doff] != NULL) 767 if (kw == NULL || rs[optList[entry].doff] != NULL)
758 continue; // previously set 768 continue; // previously set
759 769
… …
765 allocated.push_back ((void *)p); 775 allocated.push_back ((void *)p);
766 rs[optList[entry].doff] = p; 776 rs[optList[entry].doff] = p;
767 777
768 if (optList_isBool (entry)) 778 if (optList_isBool (entry))
769 { 779 {
770 s = strcasecmp (p, "TRUE") == 0 780 bool s = parse_bool_resource (p);
771 || strcasecmp (p, "YES") == 0
772 || strcasecmp (p, "ON") == 0
773 || strcasecmp (p, "1") == 0;
774 781
775 if (optList_isReverse (entry)) 782 if (optList_isReverse (entry))
776 s = !s; 783 s = !s;
777 784
778 set_option (optList[entry].index, s); 785 set_option (optList[entry].index, s);
779 } 786 }
780 } 787 }
781 } 788 }
789#endif /* NO_RESOURCES */
790}
782 791
792void
793rxvt_term::extract_keysym_resources ()
794{
795#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
796 find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
797#endif
798}
799
800#if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE)
801void
802rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
803 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
804{
783 /* 805 /*
784 * [R5 or later]: enumerate the resource database 806 * [R5 or later]: enumerate the resource database
785 */ 807 */
786# ifdef KEYSYM_RESOURCE 808 XrmDatabase database = XrmGetDatabase (dpy);
787 XrmName name_prefix[3]; 809 XrmName name_prefix[3];
788 XrmClass class_prefix[3]; 810 XrmClass class_prefix[3];
789 811
790 name_prefix[0] = XrmStringToName (rs[Rs_name]); 812 name_prefix[0] = XrmStringToName (rs[Rs_name]);
791 name_prefix[1] = XrmStringToName ("keysym"); 813 name_prefix[1] = XrmStringToName (n_prefix);
792 name_prefix[2] = NULLQUARK; 814 name_prefix[2] = NULLQUARK;
793 class_prefix[0] = XrmStringToName (RESCLASS); 815 class_prefix[0] = XrmStringToName (RESCLASS);
794 class_prefix[1] = XrmStringToName ("Keysym"); 816 class_prefix[1] = XrmStringToName (c_prefix);
795 class_prefix[2] = NULLQUARK; 817 class_prefix[2] = NULLQUARK;
796 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 818 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
797 XrmEnumerateDatabase (database, name_prefix, class_prefix, 819 XrmEnumerateDatabase (database, name_prefix, class_prefix,
798 XrmEnumOneLevel, rxvt_define_key, NULL); 820 mode, proc, NULL);
799# ifdef RESFALLBACK 821# ifdef RESFALLBACK
800 name_prefix[0] = XrmStringToName (RESFALLBACK);
801 name_prefix[1] = XrmStringToName ("keysym");
802 class_prefix[0] = XrmStringToName (RESFALLBACK); 822 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
803 class_prefix[1] = XrmStringToName ("Keysym");
804 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 823 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
805 XrmEnumerateDatabase (database, name_prefix, class_prefix, 824 XrmEnumerateDatabase (database, name_prefix, class_prefix,
806 XrmEnumOneLevel, rxvt_define_key, NULL); 825 mode, proc, NULL);
807# endif 826# endif
808# endif
809
810#endif /* NO_RESOURCES */
811} 827}
828#endif
812 829
813/*----------------------- end-of-file (C source) -----------------------*/ 830/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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