--- rxvt-unicode/src/rxvt.h	2013/12/12 09:15:23	1.526
+++ rxvt-unicode/src/rxvt.h	2014/11/24 21:46:04	1.540
@@ -178,6 +178,8 @@
 void           * rxvt_calloc                      (size_t number, size_t size);
 void           * rxvt_realloc                     (void *ptr, size_t size);
 
+KeySym rxvt_XKeycodeToKeysym (Display *dpy, KeyCode keycode, int index);
+
 /////////////////////////////////////////////////////////////////////////////
 
 // temporarily replace the process environment
@@ -185,17 +187,6 @@
 extern char **rxvt_environ; // the original environ pointer
 
 static inline void
-set_environ (stringvec *envv)
-{
-#if ENABLE_PERL
-  assert (envv);
-#else
-  if (envv)
-#endif
-    environ = (char **)envv->begin ();
-}
-
-static inline void
 set_environ (char **envv)
 {
 #if ENABLE_PERL
@@ -652,6 +643,7 @@
 #define PrivMode_BracketPaste   (1UL<<22)
 #define PrivMode_ExtModeMouse   (1UL<<23) // xterm pseudo-utf-8 hack
 #define PrivMode_ExtMouseRight  (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
+#define PrivMode_BlinkingCursor (1UL<<25)
 
 #define PrivMode_mouse_report   (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
 
@@ -664,7 +656,7 @@
 // do not change these constants lightly, there are many interdependencies
 #define IMBUFSIZ               128     // input modifier buffer sizes
 #define KBUFSZ                 512     // size of keyboard mapping buffer
-#define CBUFSIZ                2048    // size of command buffer
+#define CBUFSIZ                32768   // size of command buffer (longest command sequence possible)
 #define CBUFCNT                8       // never call pty_fill/cmd_parse more than this often in a row
 #define UBUFSIZ                2048    // character buffer
 
@@ -747,13 +739,6 @@
 #define SET_STYLE(x,style)	(((x) & ~RS_styleMask) | ((style) << RS_styleShift))
 
 #define GET_ATTR(x)             (((x) & RS_attrMask))
-// return attributes defining the background, encoding doesn't matter
-// depends on RS_fgShift > RS_bgShift
-#define GET_BGATTR(x)                                      \
-  (ecb_unlikely ((x) & RS_RVid)                            \
-    ? (((x) & (RS_attrMask & ~RS_RVid))                    \
-      | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift)))  \
-    : ((x) & (RS_attrMask | RS_bgMask)))
 #define SET_FGCOLOR(x,fg)       (((x) & ~RS_fgMask)   | ((fg) << RS_fgShift))
 #define SET_BGCOLOR(x,bg)       (((x) & ~RS_bgMask)   | ((bg) << RS_bgShift))
 #define SET_ATTR(x,a)           (((x) & ~RS_attrMask) | (a))
@@ -1164,6 +1149,8 @@
 # ifdef POINTER_BLANK
                   pointerBlankDelay,
 # endif
+                  multiClickTime,
+                  cursor_type,
                   allowedxerror;
 /* ---------- */
   unsigned int    ModLevel3Mask,
@@ -1242,6 +1229,7 @@
   char           *v_buffer;           /* pointer to physical buffer */
   unsigned int    v_buflen;           /* size of area to write */
   stringvec      *argv, *envv;        /* if != 0, will be freed at destroy time */
+  char           **env;
 
 #ifdef KEYSYM_RESOURCE
   keyboard_manager *keyboard;
@@ -1334,13 +1322,15 @@
   void pointer_unblank ();
 
   void tt_printf (const char *fmt,...);
+  void tt_write_ (const char *data, unsigned int len);
   void tt_write (const char *data, unsigned int len);
+  void tt_write_user_input (const char *data, unsigned int len);
   void pty_write ();
 
   void make_current () const // make this the "currently active" urxvt instance
   {
     SET_R (this);
-    set_environ (envv);
+    set_environ (env);
     rxvt_set_locale (locale);
   }
 
@@ -1568,9 +1558,11 @@
   // xdefaults.C
   void rxvt_usage (int type);
   const char **get_options (int argc, const char *const *argv);
-  int parse_keysym (const char *str, const char *arg);
+  int parse_keysym (const char *str, unsigned int &state);
+  int bind_action (const char *str, const char *arg);
   const char *x_resource (const char *name);
   void extract_resources ();
+  void enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *));
   void extract_keysym_resources ();
 };