--- rxvt-unicode/src/xdefaults.C 2012/06/07 16:04:45 1.170 +++ rxvt-unicode/src/xdefaults.C 2014/07/29 13:50:05 1.179 @@ -11,7 +11,7 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -98,6 +98,7 @@ SWCH ("iconic", Opt_iconic, 0, "start iconic"), SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"), + SWCH ("dockapp", Opt_dockapp, 0, "start as dockapp"), BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), @@ -113,7 +114,7 @@ BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), -#if ENABLE_TRANSPARENCY +#if BG_IMAGE_FROM_ROOT BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), @@ -197,9 +198,9 @@ #if BG_IMAGE_FROM_FILE RSTRG (Rs_path, "path", "search path"), STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), -# if ENABLE_EWMH +#endif +#if ENABLE_EWMH STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), -# endif #endif /* fonts: command-line option = resource name */ STRG (Rs_font, "font", "fn", "fontname", "normal text font"), @@ -629,6 +630,12 @@ /*----------------------------------------------------------------------*/ # ifdef KEYSYM_RESOURCE +static void +rxvt_define_key (rxvt_term *term, const char *k, const char *v) +{ + term->bind_action (k, v); +} + /* * Define key from XrmEnumerateDatabase. * quarks will be something like @@ -636,20 +643,27 @@ * value will be a string */ static int -rxvt_define_key (XrmDatabase *database ecb_unused, - XrmBindingList bindings ecb_unused, - XrmQuarkList quarks, - XrmRepresentation *type ecb_unused, - XrmValue *value, - XPointer closure ecb_unused) +rxvt_keysym_enumerate_helper ( + XrmDatabase *database ecb_unused, + XrmBindingList bindings ecb_unused, + XrmQuarkList quarks, + XrmRepresentation *type ecb_unused, + XrmValue *value, + XPointer closure +) { int last; for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ ; - last--; - GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO + rxvt_term *term = (rxvt_term *)(((void **)closure)[0]); + void (*cb)(rxvt_term *, const char *, const char *) + = (void (*)(rxvt_term *, const char *, const char *)) + (((void **)closure)[1]); + + cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr); + return False; } @@ -694,7 +708,7 @@ }; int -rxvt_term::parse_keysym (const char *str, const char *arg) +rxvt_term::bind_action (const char *str, const char *arg) { int sym; unsigned int state = 0; @@ -743,7 +757,8 @@ wchar_t *ws = rxvt_mbstowcs (arg); if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) - keyboard->register_user_translation (sym, state, ws); + keyboard->register_action (sym, state, ws); + free (ws); return 1; } @@ -799,6 +814,7 @@ */ for (int entry = 0; entry < ecb_array_length (optList); entry++) { + int s; const char *kw = optList[entry].kw; if (kw == NULL || rs[optList[entry].doff] != NULL) @@ -814,7 +830,10 @@ if (optList_isBool (entry)) { - bool s = parse_bool_resource (p); + s = strcasecmp (p, "TRUE") == 0 + || strcasecmp (p, "YES") == 0 + || strcasecmp (p, "ON") == 0 + || strcasecmp (p, "1") == 0; if (optList_isReverse (entry)) s = !s; @@ -827,41 +846,47 @@ } void -rxvt_term::extract_keysym_resources () -{ -#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE - find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key); -#endif -} - -#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE -void -rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode, - Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer)) +rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *)) { +#ifndef NO_RESOURCES /* * [R5 or later]: enumerate the resource database */ +# ifdef KEYSYM_RESOURCE + void *closure[2] = { + (void *)this, + (void *)cb, + }; + XrmDatabase database = XrmGetDatabase (dpy); XrmName name_prefix[3]; XrmClass class_prefix[3]; name_prefix[0] = XrmStringToName (rs[Rs_name]); - name_prefix[1] = XrmStringToName (n_prefix); + name_prefix[1] = XrmStringToName ("keysym"); name_prefix[2] = NULLQUARK; class_prefix[0] = XrmStringToName (RESCLASS); - class_prefix[1] = XrmStringToName (c_prefix); + class_prefix[1] = XrmStringToName ("Keysym"); class_prefix[2] = NULLQUARK; /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ XrmEnumerateDatabase (database, name_prefix, class_prefix, - mode, proc, NULL); + XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); # ifdef RESFALLBACK name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ XrmEnumerateDatabase (database, name_prefix, class_prefix, - mode, proc, NULL); + XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); # endif +# endif + +#endif /* NO_RESOURCES */ +} + +void +rxvt_term::extract_keysym_resources () +{ + enumerate_keysym_resources (rxvt_define_key); } -#endif /*----------------------- end-of-file (C source) -----------------------*/ +