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.149 by sf-exg, Sat Dec 18 18:17:39 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)
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
… …
323#endif 333#endif
324#if defined(ENABLE_TRANSPARENCY) 334#if defined(ENABLE_TRANSPARENCY)
325 "transparent," 335 "transparent,"
326 "tint," 336 "tint,"
327#endif 337#endif
328#if HAVE_AFTERIMAGE
329 "afterimage,"
330#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)
335 "XIM," 342 "XIM,"
… …
397 switch (type) 404 switch (type)
398 { 405 {
399 case 0: /* brief listing */ 406 case 0: /* brief listing */
400 rxvt_log (" [-help] [--help]\n"); 407 rxvt_log (" [-help] [--help]\n");
401 408
402 for (col = 1, i = 0; i < ARRAY_LENGTH(optList); i++) 409 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
403 if (optList[i].desc != NULL) 410 if (optList[i].desc != NULL)
404 { 411 {
405 int len = 0; 412 int len = 0;
406 413
407 if (optList[i].arg) 414 if (optList[i].arg)
408 len = strlen (optList[i].arg) + 1; 415 len = strlen (optList[i].arg) + 1;
409 assert (optList[i].opt != NULL); 416 assert (optList[i].opt != NULL);
410 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 417 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
411 col += len; 418 col += len;
412 if (col > 79) 419 if (col > 79)
413 { 420 {
414 /* assume regular width */ 421 /* assume regular width */
415 rxvt_log ("\n"); 422 rxvt_log ("\n");
… …
425 break; 432 break;
426 433
427 case 1: /* full command-line listing */ 434 case 1: /* full command-line listing */
428 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 435 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
429 436
430 for (i = 0; i < ARRAY_LENGTH(optList); i++) 437 for (i = 0; i < ecb_array_length (optList); i++)
431 if (optList[i].desc != NULL) 438 if (optList[i].desc != NULL)
432 { 439 {
433 assert (optList[i].opt != NULL); 440 assert (optList[i].opt != NULL);
434 rxvt_log (" %s%s %-*s%s%s\n", 441 rxvt_log (" %s%s %-*s%s%s\n",
435 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 442 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
… …
444 451
445 case 2: /* full resource listing */ 452 case 2: /* full resource listing */
446 rxvt_log (" [options] [-e command args]\n\n" 453 rxvt_log (" [options] [-e command args]\n\n"
447 "where resources (long-options) include:\n"); 454 "where resources (long-options) include:\n");
448 455
449 for (i = 0; i < ARRAY_LENGTH(optList); i++) 456 for (i = 0; i < ecb_array_length (optList); i++)
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");
465 rxvt_exit_failure (); 467 rxvt_exit_failure ();
466 /* NOTREACHED */
467} 468}
468 469
469/*}}} */ 470/*}}} */
470 471
471/*{{{ get command-line options before getting resources */ 472/*{{{ get command-line options before getting resources */
472void 473const char **
473rxvt_term::get_options (int argc, const char *const *argv) 474rxvt_term::get_options (int argc, const char *const *argv)
474{ 475{
475 int i, bad_option = 0; 476 int i, bad_option = 0;
476 477
477 for (i = 1; i < argc; i++) 478 for (i = 1; i < argc; i++)
… …
508 509
509 if (!strcmp (opt, "h")) 510 if (!strcmp (opt, "h"))
510 rxvt_usage (0); 511 rxvt_usage (0);
511 512
512 /* feature: always try to match long-options */ 513 /* feature: always try to match long-options */
513 for (entry = 0; entry < ARRAY_LENGTH(optList); entry++) 514 for (entry = 0; entry < ecb_array_length (optList); entry++)
514 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 515 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
515 || (!longopt 516 || (!longopt
516 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 517 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
517 break; 518 break;
518 519
519 if (entry < ARRAY_LENGTH(optList)) 520 if (entry < ecb_array_length (optList)
521 && !optList_isInfo (entry))
520 { 522 {
521 if (optList_isReverse (entry)) 523 if (optList_isReverse (entry))
522 flag = !flag; 524 flag = !flag;
523 525
524 if (optList_isString (entry)) 526 if (optList_isString (entry))
525 { 527 {
526 /* 528 /*
527 * special cases are handled in main.c:main () to allow 529 * special cases are handled in init_resources () to allow
528 * X resources to set these values before we settle for 530 * X resources to set these values before we settle for
529 * default values 531 * default values
530 */ 532 */
531 533
532 if (optList[entry].doff != -1) 534 if (optList[entry].doff != -1)
… …
562 sprintf (res, "*.%s: %s\n", opt, argv[i]); 564 sprintf (res, "*.%s: %s\n", opt, argv[i]);
563 XrmPutLineResource (&option_db, res); 565 XrmPutLineResource (&option_db, res);
564 } 566 }
565 } 567 }
566#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 }
567 else 576 else
568 { 577 {
569 bad_option = 1; 578 bad_option = 1;
570 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 579 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
571 } 580 }
572 } 581 }
573 582
574 if (bad_option) 583 if (bad_option)
575 rxvt_usage (0); 584 rxvt_usage (0);
585
586 return 0;
576} 587}
577 588
578/*}}} */ 589/*}}} */
579 590
580#ifndef NO_RESOURCES 591#ifndef NO_RESOURCES
… …
585 * Define key from XrmEnumerateDatabase. 596 * Define key from XrmEnumerateDatabase.
586 * quarks will be something like 597 * quarks will be something like
587 * "rxvt" "keysym" "0xFF01" 598 * "rxvt" "keysym" "0xFF01"
588 * value will be a string 599 * value will be a string
589 */ 600 */
590/* ARGSUSED */ 601static int
591int
592rxvt_define_key (XrmDatabase *database UNUSED, 602rxvt_define_key (XrmDatabase *database ecb_unused,
593 XrmBindingList bindings UNUSED, 603 XrmBindingList bindings ecb_unused,
594 XrmQuarkList quarks, 604 XrmQuarkList quarks,
595 XrmRepresentation *type UNUSED, 605 XrmRepresentation *type ecb_unused,
596 XrmValue *value, 606 XrmValue *value,
597 XPointer closure UNUSED) 607 XPointer closure ecb_unused)
598{ 608{
599 int last; 609 int last;
600 610
601 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 */
602 ; 612 ;
… …
665 // parse modifiers 675 // parse modifiers
666 while (str < key) 676 while (str < key)
667 { 677 {
668 unsigned int i; 678 unsigned int i;
669 679
670 for (i=0; i < ARRAY_LENGTH(keysym_vocabulary); ++i) 680 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
671 { 681 {
672 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)
673 { 683 {
674 state |= keysym_vocabulary[i].value; 684 state |= keysym_vocabulary[i].value;
675 str += keysym_vocabulary[i].len; 685 str += keysym_vocabulary[i].len;
676 break; 686 break;
677 } 687 }
678 } 688 }
679 689
680 if (i >= ARRAY_LENGTH(keysym_vocabulary)) 690 if (i >= ecb_array_length (keysym_vocabulary))
681 return -1; 691 return -1;
682 692
683 if (*str == '-') 693 if (*str == '-')
684 ++str; 694 ++str;
685 } 695 }
… …
692 sym = strtol (str, &end, 16); 702 sym = strtol (str, &end, 16);
693 if (*end) 703 if (*end)
694 return -1; 704 return -1;
695 } 705 }
696 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)))
697 keyboard->register_user_translation (sym, state, arg); 709 keyboard->register_user_translation (sym, state, ws);
710 free (ws);
698 return 1; 711 return 1;
699} 712}
700 713
701# endif /* KEYSYM_RESOURCE */ 714# endif /* KEYSYM_RESOURCE */
702#endif /* NO_RESOURCES */ 715#endif /* NO_RESOURCES */
… …
745 XrmMergeDatabases (option_db, &database); 758 XrmMergeDatabases (option_db, &database);
746 option_db = NULL; 759 option_db = NULL;
747 /* 760 /*
748 * Query resources for options that affect us 761 * Query resources for options that affect us
749 */ 762 */
750 for (int entry = 0; entry < ARRAY_LENGTH(optList); entry++) 763 for (int entry = 0; entry < ecb_array_length (optList); entry++)
751 { 764 {
752 int s;
753 const char *kw = optList[entry].kw; 765 const char *kw = optList[entry].kw;
754 766
755 if (kw == NULL || rs[optList[entry].doff] != NULL) 767 if (kw == NULL || rs[optList[entry].doff] != NULL)
756 continue; // previously set 768 continue; // previously set
757 769
… …
763 allocated.push_back ((void *)p); 775 allocated.push_back ((void *)p);
764 rs[optList[entry].doff] = p; 776 rs[optList[entry].doff] = p;
765 777
766 if (optList_isBool (entry)) 778 if (optList_isBool (entry))
767 { 779 {
768 s = strcasecmp (p, "TRUE") == 0 780 bool s = parse_bool_resource (p);
769 || strcasecmp (p, "YES") == 0
770 || strcasecmp (p, "ON") == 0
771 || strcasecmp (p, "1") == 0;
772 781
773 if (optList_isReverse (entry)) 782 if (optList_isReverse (entry))
774 s = !s; 783 s = !s;
775 784
776 set_option (optList[entry].index, s); 785 set_option (optList[entry].index, s);
777 } 786 }
778 } 787 }
779 } 788 }
789#endif /* NO_RESOURCES */
790}
780 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{
781 /* 805 /*
782 * [R5 or later]: enumerate the resource database 806 * [R5 or later]: enumerate the resource database
783 */ 807 */
784# ifdef KEYSYM_RESOURCE 808 XrmDatabase database = XrmGetDatabase (dpy);
785 XrmName name_prefix[3]; 809 XrmName name_prefix[3];
786 XrmClass class_prefix[3]; 810 XrmClass class_prefix[3];
787 811
788 name_prefix[0] = XrmStringToName (rs[Rs_name]); 812 name_prefix[0] = XrmStringToName (rs[Rs_name]);
789 name_prefix[1] = XrmStringToName ("keysym"); 813 name_prefix[1] = XrmStringToName (n_prefix);
790 name_prefix[2] = NULLQUARK; 814 name_prefix[2] = NULLQUARK;
791 class_prefix[0] = XrmStringToName (RESCLASS); 815 class_prefix[0] = XrmStringToName (RESCLASS);
792 class_prefix[1] = XrmStringToName ("Keysym"); 816 class_prefix[1] = XrmStringToName (c_prefix);
793 class_prefix[2] = NULLQUARK; 817 class_prefix[2] = NULLQUARK;
794 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 818 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
795 XrmEnumerateDatabase (database, name_prefix, class_prefix, 819 XrmEnumerateDatabase (database, name_prefix, class_prefix,
796 XrmEnumOneLevel, rxvt_define_key, NULL); 820 mode, proc, NULL);
797# ifdef RESFALLBACK 821# ifdef RESFALLBACK
798 name_prefix[0] = XrmStringToName (RESFALLBACK);
799 name_prefix[1] = XrmStringToName ("keysym");
800 class_prefix[0] = XrmStringToName (RESFALLBACK); 822 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
801 class_prefix[1] = XrmStringToName ("Keysym");
802 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 823 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
803 XrmEnumerateDatabase (database, name_prefix, class_prefix, 824 XrmEnumerateDatabase (database, name_prefix, class_prefix,
804 XrmEnumOneLevel, rxvt_define_key, NULL); 825 mode, proc, NULL);
805# endif 826# endif
806# endif
807
808#endif /* NO_RESOURCES */
809} 827}
828#endif
810 829
811/*----------------------- end-of-file (C source) -----------------------*/ 830/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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