| … | |
… | |
| 186 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
186 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
| 187 | #endif /* NO_CURSORCOLOR */ |
187 | #endif /* NO_CURSORCOLOR */ |
| 188 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
188 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
| 189 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
189 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
| 190 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
190 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
| 191 | #ifdef XPM_BACKGROUND |
191 | #ifdef BG_IMAGE_FROM_FILE |
| 192 | RSTRG (Rs_path, "path", "search path"), |
192 | RSTRG (Rs_path, "path", "search path"), |
| 193 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
193 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
| 194 | #endif |
194 | #endif |
| 195 | /* fonts: command-line option = resource name */ |
195 | /* fonts: command-line option = resource name */ |
| 196 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
196 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
| … | |
… | |
| 317 | "+zh-ext" |
317 | "+zh-ext" |
| 318 | #endif |
318 | #endif |
| 319 | "," |
319 | "," |
| 320 | #if OFF_FOCUS_FADING |
320 | #if OFF_FOCUS_FADING |
| 321 | "fade," |
321 | "fade," |
| 322 | #endif |
|
|
| 323 | #if defined(XPM_BACKGROUND) |
|
|
| 324 | "XPM," |
|
|
| 325 | #endif |
322 | #endif |
| 326 | #if defined(ENABLE_TRANSPARENCY) |
323 | #if defined(ENABLE_TRANSPARENCY) |
| 327 | "transparent," |
324 | "transparent," |
| 328 | "tint," |
325 | "tint," |
| 329 | #endif |
326 | #endif |
| … | |
… | |
| 550 | * default values |
547 | * default values |
| 551 | */ |
548 | */ |
| 552 | |
549 | |
| 553 | if (optList[entry].doff != -1) |
550 | if (optList[entry].doff != -1) |
| 554 | { |
551 | { |
| 555 | if (flag == resval_on && !argv [i+1]) |
552 | if (flag == resval_on && i+1 == argc) |
| 556 | rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); |
553 | rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); |
| 557 | |
554 | |
| 558 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
555 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
| 559 | } |
556 | } |
| 560 | } |
557 | } |
| … | |
… | |
| 566 | rs[optList[entry].doff] = flag; |
563 | rs[optList[entry].doff] = flag; |
| 567 | } |
564 | } |
| 568 | } |
565 | } |
| 569 | else |
566 | else |
| 570 | #ifdef KEYSYM_RESOURCE |
567 | #ifdef KEYSYM_RESOURCE |
| 571 | /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ |
568 | if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
| 572 | if (rxvt_Str_match (opt, "keysym.")) |
|
|
| 573 | { |
569 | { |
| 574 | const char *str = argv[++i]; |
570 | if (i+1 < argc) |
| 575 | |
|
|
| 576 | if (str != NULL) |
|
|
| 577 | parse_keysym (opt + sizeof ("keysym.") - 1, str); |
571 | parse_keysym (opt + sizeof ("keysym.") - 1, argv[++i]); |
| 578 | } |
572 | } |
| 579 | else |
573 | else |
| 580 | #endif |
574 | #endif |
| 581 | { |
575 | { |
| 582 | bad_option = 1; |
576 | bad_option = 1; |
| … | |
… | |
| 673 | char *newarg = NULL; |
667 | char *newarg = NULL; |
| 674 | char newargstr[NEWARGLIM]; |
668 | char newargstr[NEWARGLIM]; |
| 675 | |
669 | |
| 676 | if (arg == NULL) |
670 | if (arg == NULL) |
| 677 | { |
671 | { |
| 678 | if ((n = rxvt_Str_match (str, "keysym.")) == 0) |
672 | n = sizeof ("keysym.") - 1; |
|
|
673 | if (strncmp (str, "keysym.", n)) |
| 679 | return 0; |
674 | return 0; |
| 680 | |
675 | |
| 681 | str += n; /* skip `keysym.' */ |
676 | str += n; /* skip `keysym.' */ |
| 682 | if (!(pmodend = strchr (str, ':'))) |
677 | if (!(pmodend = strchr (str, ':'))) |
| 683 | return -1; |
678 | return -1; |
| … | |
… | |
| 756 | strncpy (newargstr, arg, NEWARGLIM - 1); |
751 | strncpy (newargstr, arg, NEWARGLIM - 1); |
| 757 | newargstr[NEWARGLIM - 1] = '\0'; |
752 | newargstr[NEWARGLIM - 1] = '\0'; |
| 758 | newarg = newargstr; |
753 | newarg = newargstr; |
| 759 | } |
754 | } |
| 760 | |
755 | |
| 761 | rxvt_Str_trim (newarg); |
756 | if (*newarg == '\0') |
| 762 | if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) |
|
|
| 763 | return -1; |
757 | return -1; |
| 764 | |
758 | |
| 765 | keyboard->register_user_translation (sym, state, newarg); |
759 | keyboard->register_user_translation (sym, state, newarg); |
| 766 | return 1; |
760 | return 1; |
| 767 | } |
761 | } |
| … | |
… | |
| 780 | XrmGetResource (database, resource, resource, &type, &result); |
774 | XrmGetResource (database, resource, resource, &type, &result); |
| 781 | |
775 | |
| 782 | return result.addr; |
776 | return result.addr; |
| 783 | } |
777 | } |
| 784 | |
778 | |
| 785 | const char * |
779 | static const char * |
| 786 | rxvt_term::x_resource (const char *name) |
780 | x_resource (const char *name) |
| 787 | { |
781 | { |
| 788 | XrmDatabase database = XrmGetDatabase (dpy); |
782 | XrmDatabase database = XrmGetDatabase (dpy); |
| 789 | |
783 | |
| 790 | const char *p = get_res (database, rs[Rs_name], name); |
784 | const char *p = get_res (database, rs[Rs_name], name); |
| 791 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
785 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
