--- rxvt-unicode/src/xdefaults.C 2015/05/11 22:05:58 1.187 +++ rxvt-unicode/src/xdefaults.C 2015/10/13 08:10:43 1.190 @@ -7,7 +7,7 @@ * - original version * Copyright (c) 1997,1998 mj olesen * Copyright (c) 2003-2006 Marc Lehmann - * Copyright (c) 2007 Emanuele Giaquinta + * Copyright (c) 2007,2015 Emanuele Giaquinta * * 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 @@ -203,6 +203,9 @@ #if ENABLE_EWMH STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), #endif +#ifdef HAVE_XMU + RSTRG (Rs_pointerShape, "pointerShape", "string"), +#endif /* fonts: command-line option = resource name */ STRG (Rs_font, "font", "fn", "fontname", "normal text font"), #if ENABLE_STYLES @@ -629,7 +632,7 @@ /*----------------------------------------------------------------------*/ -# ifdef KEYSYM_RESOURCE +#ifdef KEYSYM_RESOURCE static void rxvt_define_key (rxvt_term *term, const char *k, const char *v) { @@ -776,7 +779,7 @@ return 1; } -# endif /* KEYSYM_RESOURCE */ +#endif /* KEYSYM_RESOURCE */ static char * get_res (XrmDatabase database, const char *program, const char *option) @@ -863,7 +866,7 @@ /* * [R5 or later]: enumerate the resource database */ -# ifdef KEYSYM_RESOURCE +#ifdef KEYSYM_RESOURCE void *closure[2] = { (void *)this, (void *)cb, @@ -878,12 +881,12 @@ class_prefix[1] = XrmStringToName ("Keysym"); class_prefix[2] = NULLQUARK; -# ifdef RESFALLBACK +# 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, XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); -# endif +# endif name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS); XrmEnumerateDatabase (database, name_prefix, class_prefix, @@ -892,7 +895,7 @@ name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]); XrmEnumerateDatabase (database, name_prefix, class_prefix, XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); -# endif +#endif } void