rxvt (1:2.6.4-14) src/command.h

--- rxvt-2.6.4.orig/src/command.h
+++ rxvt-2.6.4/src/command.h
@@ -181,7 +181,7 @@
 
 /* time factor to slow down a `jumpy' mouse */
 #define MOUSE_THRESHOLD		50
-#define CONSOLE		"/dev/console"	/* console device */
+#define CONSOLE		"/dev/xconsole"	/* console device */
 
 /*
  * key-strings: if only these keys were standardized <sigh>
@@ -196,20 +196,27 @@
 
 #ifdef SCROLL_ON_SHIFT
 # define SCROLL_SHIFTKEY (shft)
+# define NOSCROLL_SHIFTKEY 0
 #else
 # define SCROLL_SHIFTKEY 0
+# define NOSCROLL_SHIFTKEY (shft)
 #endif
 #ifdef SCROLL_ON_CTRL
 # define SCROLL_CTRLKEY  (ctrl)
+# define NOSCROLL_CTRLKEY 0
 #else
 # define SCROLL_CTRLKEY 0
+# define NOSCROLL_CTRLKEY (ctrl)
 #endif
 #ifdef SCROLL_ON_META
 # define SCROLL_METAKEY  (meta)
+# define NOSCROLL_METAKEY 0
 #else
 # define SCROLL_METAKEY 0
+# define NOSCROLL_METAKEY (meta)
 #endif
-#define IS_SCROLL_MOD  (SCROLL_SHIFTKEY || SCROLL_CTRLKEY || SCROLL_METAKEY)
+#define IS_SCROLL_MOD  ((SCROLL_SHIFTKEY || SCROLL_CTRLKEY || SCROLL_METAKEY) \
+              && (!NOSCROLL_SHIFTKEY && !NOSCROLL_CTRLKEY && !NOSCROLL_METAKEY))
 
 typedef struct XCNQueue_t {
     struct XCNQueue_t *next;