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.123 by ayin, Fri Nov 23 11:17:37 2007 UTC vs.
Revision 1.132 by ayin, Sun Jan 20 01:15:35 2008 UTC

… …
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 <pcg@goof.com>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
10 * 11 *
11 * 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
12 * 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
13 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 15 * (at your option) any later version.
… …
62/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
63#define SWCH(opt, option, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
64 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
65 66
66/* convenient macros */ 67/* convenient macros */
67#define optList_strlen(i) \ 68#define optList_isString(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag == 0)
69#define optList_isBool(i) \ 70#define optList_isBool(i) \
70 (optList[i].flag & Optflag_Boolean) 71 (optList[i].flag & Optflag_Boolean)
71#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
72 (optList[i].flag & Optflag_Reverse) 73 (optList[i].flag & Optflag_Reverse)
73#define optList_size \ 74#define optList_size \
… …
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if ENABLE_TRANSPARENCY 113#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 115 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."), 117 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
117#endif 118#endif
118#if OFF_FOCUS_FADING 119#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 120 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 121 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif 122#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 123 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL 124#ifndef NO_BELL
124# if ENABLE_FRILLS 125# if ENABLE_FRILLS
… …
225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 226 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232#endif
233#ifdef BUILTIN_GLYPHS
230 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 234 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232#endif 235#endif
233#ifdef POINTER_BLANK 236#ifdef POINTER_BLANK
234 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 237 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
235#endif 238#endif
236#ifndef NO_BACKSPACE_KEY 239#ifndef NO_BACKSPACE_KEY
237 RSTRG (Rs_backspace_key, "backspacekey", "string"), 240 RSTRG (Rs_backspace_key, "backspacekey", "string"),
238#endif 241#endif
239#ifndef NO_DELETE_KEY 242#ifndef NO_DELETE_KEY
240 RSTRG (Rs_delete_key, "deletekey", "string"), 243 RSTRG (Rs_delete_key, "deletekey", "string"),
241#endif 244#endif
242 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
243#ifdef PRINTPIPE 245#ifdef PRINTPIPE
244 RSTRG (Rs_print_pipe, "print-pipe", "string"), 246 RSTRG (Rs_print_pipe, "print-pipe", "string"),
245#endif 247#endif
246 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
247#ifdef CUTCHAR_RESOURCE 249#ifdef CUTCHAR_RESOURCE
… …
411 for (col = 1, i = 0; i < optList_size; i++) 413 for (col = 1, i = 0; i < optList_size; i++)
412 if (optList[i].desc != NULL) 414 if (optList[i].desc != NULL)
413 { 415 {
414 int len = 0; 416 int len = 0;
415 417
416 if (!optList_isBool (i)) 418 if (optList[i].arg)
417 { 419 len = strlen (optList[i].arg) + 1;
418 len = optList_strlen (i);
419 if (len > 0)
420 len++; /* account for space */
421 }
422#ifdef DEBUG_STRICT 420#ifdef DEBUG_STRICT
423 assert (optList[i].opt != NULL); 421 assert (optList[i].opt != NULL);
424#endif 422#endif
425 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 423 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
426 col += len; 424 col += len;
427 if (col > 79) 425 if (col > 79)
426 {
428 { /* assume regular width */ 427 /* assume regular width */
429 rxvt_log ("\n"); 428 rxvt_log ("\n");
430 col = 1 + len; 429 col = 1 + len;
431 } 430 }
432 431
433 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 432 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
434 if (optList_strlen (i)) 433 if (optList[i].arg)
435 rxvt_log (" %s]", optList[i].arg); 434 rxvt_log (" %s]", optList[i].arg);
436 else 435 else
437 rxvt_log ("]"); 436 rxvt_log ("]");
438 } 437 }
439 break; 438 break;
… …
491 int i, bad_option = 0; 490 int i, bad_option = 0;
492 491
493 for (i = 1; i < argc; i++) 492 for (i = 1; i < argc; i++)
494 { 493 {
495 unsigned int entry, longopt = 0; 494 unsigned int entry, longopt = 0;
496 const char *flag, *opt; 495 const char *opt;
496 int flag;
497 497
498 opt = argv[i]; 498 opt = argv[i];
499 499
500 if (*opt == '-') 500 if (*opt == '-')
501 { 501 {
502 flag = resval_on; 502 flag = 1;
503 503
504 if (*++opt == '-') 504 if (*++opt == '-')
505 longopt = *opt++; /* long option */ 505 longopt = *opt++; /* long option */
506 } 506 }
507 else if (*opt == '+') 507 else if (*opt == '+')
508 { 508 {
509 flag = resval_off; 509 flag = 0;
510 510
511 if (*++opt == '+') 511 if (*++opt == '+')
512 longopt = *opt++; /* long option */ 512 longopt = *opt++; /* long option */
513 } 513 }
514 else 514 else
… …
532 break; 532 break;
533 533
534 if (entry < optList_size) 534 if (entry < optList_size)
535 { 535 {
536 if (optList_isReverse (entry)) 536 if (optList_isReverse (entry))
537 flag = flag == resval_on ? resval_off : resval_on; 537 flag = !flag;
538 538
539 if (optList_strlen (entry)) 539 if (optList_isString (entry))
540 { 540 {
541 /* 541 /*
542 * special cases are handled in main.c:main () to allow 542 * special cases are handled in main.c:main () to allow
543 * X resources to set these values before we settle for 543 * X resources to set these values before we settle for
544 * default values 544 * default values
545 */ 545 */
546 546
547 if (optList[entry].doff != -1) 547 if (optList[entry].doff != -1)
548 { 548 {
549 if (flag == resval_on && i+1 == argc) 549 if (flag && i+1 == argc)
550 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 550 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
551 551
552 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 552 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
553 } 553 }
554 } 554 }
555 else 555 else
556 {
556 { /* boolean value */ 557 /* boolean value */
557 set_option (optList[entry].index, flag == resval_on); 558 set_option (optList[entry].index, flag);
558 559
559 if (optList[entry].doff != -1) 560 if (optList[entry].doff != -1)
560 rs[optList[entry].doff] = flag; 561 rs[optList[entry].doff] = flag ? resval_on : resval_off;
561 } 562 }
562 } 563 }
563#ifndef NO_RESOURCES 564#ifndef NO_RESOURCES
564 else if (!strcmp (opt, "xrm")) 565 else if (!strcmp (opt, "xrm"))
565 { 566 {
… …
622} 623}
623 624
624/* 625/*
625 * look for something like this (XK_Delete) 626 * look for something like this (XK_Delete)
626 * rxvt*keysym.0xFFFF: "\177" 627 * rxvt*keysym.0xFFFF: "\177"
627 *
628 * arg will be
629 * NULL for ~/.Xdefaults and
630 * non-NULL for command-line options (need to allocate)
631 */ 628 */
632#define NEWARGLIM 500 /* `reasonable' size */
633 629
634struct keysym_vocabulary_t 630struct keysym_vocabulary_t
635{ 631{
636 const char *name; 632 const char *name;
637 unsigned short len; 633 unsigned short len;
638 unsigned short value; 634 unsigned short value;
639}; 635};
640keysym_vocabulary_t keysym_vocabulary[] = 636static const keysym_vocabulary_t keysym_vocabulary[] =
641{ 637{
642 { "ISOLevel3", 9, Level3Mask }, 638 { "ISOLevel3", 9, Level3Mask },
643 { "AppKeypad", 9, AppKeypadMask }, 639 { "AppKeypad", 9, AppKeypadMask },
644 { "Control", 7, ControlMask }, 640 { "Control", 7, ControlMask },
645 { "NumLock", 7, NumLockMask }, 641 { "NumLock", 7, NumLockMask },
… …
667}; 663};
668 664
669int 665int
670rxvt_term::parse_keysym (const char *str, const char *arg) 666rxvt_term::parse_keysym (const char *str, const char *arg)
671{ 667{
672 int n, sym; 668 int sym;
673 unsigned int state = 0; 669 unsigned int state = 0;
674 const char *pmodend = NULL; 670 const char *key = strrchr (str, '-');
675 char *newarg = NULL;
676 char newargstr[NEWARGLIM];
677 671
678 if (arg == NULL) 672 if (!key)
679 { 673 key = str;
680 n = sizeof ("keysym.") - 1;
681 if (strncmp (str, "keysym.", n))
682 return 0;
683
684 str += n; /* skip `keysym.' */
685 if (!(pmodend = strchr (str, ':')))
686 return -1;
687 }
688 else 674 else
689 pmodend = str + strlen(str); 675 key++;
690 676
691 for (--pmodend; str < pmodend; --pmodend) 677 // string or key is empty
692 if (*pmodend == '-') 678 if (*arg == '\0' || *key == '\0')
693 break; 679 return -1;
694 680
681 // parse modifiers
695 while (str < pmodend) 682 while (str < key)
696 { 683 {
697 unsigned int i; 684 unsigned int i;
698 685
699 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 686 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
700 { 687 {
… …
711 698
712 if (*str == '-') 699 if (*str == '-')
713 ++str; 700 ++str;
714 } 701 }
715 702
716 /* some scanf () have trouble with a 0x prefix */ 703 // convert keysym name to keysym number
717 if (str[0] == '0' && toupper (str[1]) == 'X') 704 if ((sym = XStringToKeysym (str)) == None)
718 { 705 {
719 str += 2; 706 // fallback on hexadecimal parsing
720 707 char *end;
708 sym = strtol (str, &end, 16);
721 if (arg) 709 if (*end)
722 {
723 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
724 return -1;
725 }
726 else
727 {
728 if (sscanf (str, "%x:", &sym) != 1)
729 return -1;
730
731 /* cue to ':', it's there since sscanf () worked */
732 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
733 newargstr[NEWARGLIM - 1] = '\0';
734 newarg = newargstr;
735 }
736 }
737 else
738 {
739 /*
740 * convert keysym name to keysym number
741 */
742 strncpy (newargstr, str, NEWARGLIM - 1);
743 newargstr[NEWARGLIM - 1] = '\0';
744
745 if (arg == NULL)
746 {
747 if ((newarg = strchr (newargstr, ':')) == NULL)
748 return -1;
749
750 *newarg++ = '\0'; /* terminate keysym name */
751 }
752
753 if ((sym = XStringToKeysym (newargstr)) == None)
754 return -1; 710 return -1;
755 } 711 }
756 712
757 if (newarg == NULL)
758 {
759 strncpy (newargstr, arg, NEWARGLIM - 1);
760 newargstr[NEWARGLIM - 1] = '\0';
761 newarg = newargstr;
762 }
763
764 if (*newarg == '\0')
765 return -1;
766
767 keyboard->register_user_translation (sym, state, newarg); 713 keyboard->register_user_translation (sym, state, arg);
768 return 1; 714 return 1;
769} 715}
770 716
771# endif /* KEYSYM_RESOURCE */ 717# endif /* KEYSYM_RESOURCE */
772#endif /* NO_RESOURCES */ 718#endif /* NO_RESOURCES */

Diff Legend

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