From: root <root>
Date: Tue, 10 Aug 2004 20:39:19 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=d43154eac9d0e9e46efc8c5dc03b5b99a3aec669;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/src/command.h b/src/command.h
index 337b1215..d693e5f3 100644
--- a/src/command.h
+++ b/src/command.h
@@ -1,5 +1,5 @@
 /*
- * $Id: command.h,v 1.10 2004-07-26 18:01:19 root Exp $
+ * $Id: command.h,v 1.13 2004-08-10 20:39:19 root Exp $
  */
 
 #ifndef COMMAND_H_
@@ -42,20 +42,28 @@
 
 #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:
diff --git a/src/feature.h b/src/feature.h
index 1e55b28f..d802a185 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -171,7 +171,7 @@
 #endif
 
 /*
- * Modifier/s to use to allow up/down arrows and Priot/Next keys
+ * Modifier/s to use to allow up/down arrows and Prior/Next keys
  * to scroll single or page-fulls
  */
 #define SCROLL_ON_SHIFT
@@ -217,7 +217,7 @@
  * Default separating chars for multiple-click selection
  * Space and tab are separate separating characters and are not settable
  */
-#define CUTCHARS	"\"&'()*,;<=>?@[\\]^`{|}~"
+#define CUTCHARS	"\"&'()*,;<=>?@[\\]^`{|}"
 
 /*
  * Add run-time support for changing the cutchars for double click selection
diff --git a/src/init.C b/src/init.C
index f60ad4f5..0606a747 100644
--- a/src/init.C
+++ b/src/init.C
@@ -1352,6 +1352,7 @@ rxvt_term::run_command (const char *const *argv)
           rxvt_fatal ("can't open slave tty %s", ttydev);
         }
     }
+
 #ifndef NO_BACKSPACE_KEY
   if (key_backspace[0] && !key_backspace[1])
     er = key_backspace[0];
@@ -1359,10 +1360,9 @@ rxvt_term::run_command (const char *const *argv)
     er = '\177';            /* the initial state anyway */
   else
 #endif
-
     er = -1;
 
-  rxvt_get_ttymode (& (tio), er);
+  rxvt_get_ttymode (&tio, er);
 
 #ifndef __QNX__
   /* spin off the command interpreter */
@@ -1453,10 +1453,8 @@ rxvt_term::run_child (const char *const *argv)
 
       fd = open (CONSOLE, O_WRONLY, 0);
       if (fd >= 0)
-        {
-          if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
-            close (fd);
-        }
+        if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
+          close (fd);
 #endif                          /* SRIOCSREDIR */
 
     }
diff --git a/src/iom.C b/src/iom.C
index 77c64f89..1b7313d3 100644
--- a/src/iom.C
+++ b/src/iom.C
@@ -52,7 +52,7 @@ static struct tw0 : time_watcher
     {
       // should never get called
       // reached end-of-time, or tstamp has a bogus definition,
-      // or compiler initilization order broken, or somethine else :)
+      // or compiler initialisation order broken, or something else :)
       abort ();
     }
 
diff --git a/src/main.C b/src/main.C
index 4d5991f5..4777b692 100644
--- a/src/main.C
+++ b/src/main.C
@@ -203,6 +203,9 @@ rxvt_term::~rxvt_term ()
     {
       selection_clear ();
 
+#ifdef USE_XIM
+      im_destroy ();
+#endif
 #ifdef MENUBAR
       if (menubarGC) XFreeGC (display->display, menubarGC);
 #endif
@@ -276,13 +279,12 @@ rxvt_term::~rxvt_term ()
 void
 rxvt_term::destroy ()
 {
+  if (destroy_ev.active)
+    return;
+
   if (display)
     {
-      rootwin_ev.stop (display);
-      termwin_ev.stop (display);
-      vt_ev.stop (display);
 #ifdef USE_XIM
-      im_destroy ();
       im_ev.stop (display);
 #endif
 #ifdef HAVE_SCROLLBARS
@@ -291,6 +293,9 @@ rxvt_term::destroy ()
 #ifdef MENUBAR
       menubar_ev.stop (display);
 #endif
+      rootwin_ev.stop (display);
+      termwin_ev.stop (display);
+      vt_ev.stop (display);
     }
 
   check_ev.stop ();