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.183 by root, Mon Sep 8 10:40:31 2014 UTC vs.
Revision 1.192 by sf-exg, Thu Jul 14 05:33:26 2016 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 <schmorp@schmorp.de> 9 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 10 * Copyright (c) 2007,2015 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 3 of the License, or 14 * the Free Software Foundation; either version 3 of the License, or
15 * (at your option) any later version. 15 * (at your option) any later version.
… …
113 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 113 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
115 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 115 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
118#if BG_IMAGE_FROM_ROOT
119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
120 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
121 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
122 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
123 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
124#endif
125#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
126 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), 119 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
127 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
128#endif 121#endif
129 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
… …
194 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
195#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
196 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
197 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
198 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
199#if BG_IMAGE_FROM_FILE
200 RSTRG (Rs_path, "path", "search path"),
201 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
202#endif
203#if ENABLE_EWMH 192#if ENABLE_EWMH
204 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 193 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
194#endif
195#ifdef HAVE_XMU
196 RSTRG (Rs_pointerShape, "pointerShape", "string"),
205#endif 197#endif
206 /* fonts: command-line option = resource name */ 198 /* fonts: command-line option = resource name */
207 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
208#if ENABLE_STYLES 200#if ENABLE_STYLES
209 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
625 return 0; 617 return 0;
626} 618}
627 619
628/*}}} */ 620/*}}} */
629 621
630#ifndef NO_RESOURCES
631/*----------------------------------------------------------------------*/ 622/*----------------------------------------------------------------------*/
632 623
633# ifdef KEYSYM_RESOURCE 624#ifdef KEYSYM_RESOURCE
634static void 625static void
635rxvt_define_key (rxvt_term *term, const char *k, const char *v) 626rxvt_define_key (rxvt_term *term, const char *k, const char *v)
636{ 627{
637 term->bind_action (k, v); 628 term->bind_action (k, v);
638} 629}
… …
642 * quarks will be something like 633 * quarks will be something like
643 * "rxvt" "keysym" "0xFF01" 634 * "rxvt" "keysym" "0xFF01"
644 * value will be a string 635 * value will be a string
645 */ 636 */
646static int 637static int
647rxvt_keysym_enumerate_helper ( 638rxvt_enumerate_helper (
648 XrmDatabase *database ecb_unused, 639 XrmDatabase *database ecb_unused,
649 XrmBindingList bindings ecb_unused, 640 XrmBindingList bindings ecb_unused,
650 XrmQuarkList quarks, 641 XrmQuarkList quarks,
651 XrmRepresentation *type ecb_unused, 642 XrmRepresentation *type ecb_unused,
652 XrmValue *value, 643 XrmValue *value,
… …
768 759
769 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1) 760 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
770 return -1; 761 return -1;
771 762
772 wchar_t *ws = rxvt_mbstowcs (arg); 763 wchar_t *ws = rxvt_mbstowcs (arg);
764 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
773 keyboard->register_action (sym, state, ws); 765 keyboard->register_action (sym, state, ws);
774 766
775 free (ws); 767 free (ws);
776 return 1; 768 return 1;
777} 769}
778 770
779# endif /* KEYSYM_RESOURCE */ 771#endif /* KEYSYM_RESOURCE */
780#endif /* NO_RESOURCES */
781 772
782static char * 773static char *
783get_res (XrmDatabase database, const char *program, const char *option) 774get_res (XrmDatabase database, const char *program, const char *option)
784{ 775{
785 char resource[512]; 776 char resource[512];
… …
857 } 848 }
858#endif /* NO_RESOURCES */ 849#endif /* NO_RESOURCES */
859} 850}
860 851
861void 852void
862rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *)) 853rxvt_term::enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p, const char *class_p)
863{ 854{
864#ifndef NO_RESOURCES
865 /* 855 /*
866 * [R5 or later]: enumerate the resource database 856 * [R5 or later]: enumerate the resource database
867 */ 857 */
868# ifdef KEYSYM_RESOURCE 858#ifdef KEYSYM_RESOURCE
869 void *closure[2] = { 859 void *closure[2] = {
870 (void *)this, 860 (void *)this,
871 (void *)cb, 861 (void *)cb,
872 }; 862 };
873 863
874 XrmDatabase database = XrmGetDatabase (dpy); 864 XrmDatabase database = XrmGetDatabase (dpy);
875 XrmName name_prefix[3]; 865 XrmName name_prefix[3];
876 XrmClass class_prefix[3]; 866 XrmClass class_prefix[3];
877 867
878 name_prefix[0] = XrmStringToName (rs[Rs_name]); 868 name_prefix[1] = name_p ? XrmStringToName (name_p) : NULLQUARK;
879 name_prefix[1] = XrmStringToName ("keysym");
880 name_prefix[2] = NULLQUARK; 869 name_prefix[2] = NULLQUARK;
881 class_prefix[0] = XrmStringToName (RESCLASS); 870 class_prefix[1] = class_p ? XrmStringToName (class_p) : NULLQUARK;
882 class_prefix[1] = XrmStringToName ("Keysym");
883 class_prefix[2] = NULLQUARK; 871 class_prefix[2] = NULLQUARK;
884 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 872
885 XrmEnumerateDatabase (database, name_prefix, class_prefix,
886 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
887# ifdef RESFALLBACK 873# ifdef RESFALLBACK
888 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 874 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
889 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 875 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
890 XrmEnumerateDatabase (database, name_prefix, class_prefix, 876 XrmEnumerateDatabase (database, name_prefix, class_prefix,
891 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); 877 XrmEnumOneLevel, rxvt_enumerate_helper, (XPointer)closure);
892# endif
893# endif 878# endif
894 879
895#endif /* NO_RESOURCES */ 880 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
881 XrmEnumerateDatabase (database, name_prefix, class_prefix,
882 XrmEnumOneLevel, rxvt_enumerate_helper, (XPointer)closure);
883
884 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
885 XrmEnumerateDatabase (database, name_prefix, class_prefix,
886 XrmEnumOneLevel, rxvt_enumerate_helper, (XPointer)closure);
887#endif
896} 888}
897 889
898void 890void
899rxvt_term::extract_keysym_resources () 891rxvt_term::extract_keysym_resources ()
900{ 892{
893#ifdef KEYSYM_RESOURCE
901 enumerate_keysym_resources (rxvt_define_key); 894 enumerate_keysym_resources (rxvt_define_key);
895#endif
902} 896}
903 897
904/*----------------------- end-of-file (C source) -----------------------*/ 898/*----------------------- end-of-file (C source) -----------------------*/
905 899

Diff Legend

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