--- rxvt-unicode/src/command.h	2004/07/26 18:01:19	1.10
+++ rxvt-unicode/src/command.h	2008/02/16 15:48:37	1.20
@@ -1,5 +1,5 @@
 /*
- * $Id: command.h,v 1.10 2004/07/26 18:01:19 root Exp $
+ * command.h
  */
 
 #ifndef COMMAND_H_
@@ -10,15 +10,6 @@
 
 #define ESC_ARGS	32	/* max # of args for esc sequences */
 
-#ifdef OFFIX_DND
-# define DndFile	2
-# define DndDir		5
-# define DndLink	7
-#endif
-
-/* a large REFRESH_PERIOD causes problems with `cat' */
-#define REFRESH_PERIOD		2
-
 #ifndef MULTICLICK_TIME
 # define MULTICLICK_TIME	500
 #endif
@@ -29,33 +20,30 @@
 # define SCROLLBAR_CONTINUOUS_DELAY	0.05
 #endif
 
-/*
- * key-strings: if only these keys were standardized <sigh>
- */
-#ifdef LINUX_KEYS
-# define KS_HOME	"\033[1~"	/* Home == Find */
-# define KS_END		"\033[4~"	/* End == Select */
-#else
-# define KS_HOME	"\033[7~"	/* Home */
-# define KS_END		"\033[8~"	/* End */
-#endif
-
 #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))
+
 
 /*
  * ESC-Z processing:
@@ -81,5 +69,4 @@
 # define ESCZ_ANSWER	VT100_ANS	/* obsolete ANSI ESC[c */
 #endif
 
-#include "command.intpro"	/* PROTOS for internal routines */
-#endif	/* _COMMAND_H_ */
+#endif /* _COMMAND_H_ */