--- rxvt-unicode/src/command.h	2003/12/19 09:41:09	1.4
+++ rxvt-unicode/src/command.h	2014/08/16 10:51:23	1.23
@@ -1,63 +1,43 @@
 /*
- * $Id: command.h,v 1.4 2003/12/19 09:41:09 pcg Exp $
+ * command.h
  */
 
-#ifndef _COMMAND_H_
-#define _COMMAND_H_
+#ifndef COMMAND_H_
+#define COMMAND_H_
 
-#define STRING_MAX	512	/* max string size for process_rxvt_xterm_seq() */
 #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
 #ifndef SCROLLBAR_INITIAL_DELAY
-# ifdef NEXT_SCROLLER
-#  define SCROLLBAR_INITIAL_DELAY	20
-# else
-#  define SCROLLBAR_INITIAL_DELAY	40
-# endif
+# define SCROLLBAR_INITIAL_DELAY	0.33
 #endif
 #ifndef SCROLLBAR_CONTINUOUS_DELAY
-# define SCROLLBAR_CONTINUOUS_DELAY	2
-#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 */
+# define SCROLLBAR_CONTINUOUS_DELAY	0.05
 #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:
@@ -75,7 +55,7 @@
  * software in question is broken enough to be case insensitive to the 'c'
  * character in the answerback string, we make the distinguishing
  * characteristic be capitalization of that character. The length of the
- * two strings should be the same so that identical read(2) calls may be
+ * two strings should be the same so that identical read (2) calls may be
  * used.
  */
 #define VT100_ANS	"\033[?1;2c"	/* vt100 answerback */
@@ -83,5 +63,4 @@
 # define ESCZ_ANSWER	VT100_ANS	/* obsolete ANSI ESC[c */
 #endif
 
-#include "command.intpro"	/* PROTOS for internal routines */
-#endif	/* _COMMAND_H_ */
+#endif /* _COMMAND_H_ */