From: root <root>
Date: Sat, 11 Dec 2004 17:18:29 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=2d88ba86eaf019f802c3b7f51099aadb4394c739;p=dana%2Furxvt.git

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

diff --git a/src/command.C b/src/command.C
index 3270c2fe..aef23f41 100644
--- a/src/command.C
+++ b/src/command.C
@@ -1219,9 +1219,9 @@ rxvt_term::x_cb (XEvent &ev)
     }
 #endif
 
-  Window          unused_root, unused_child;
-  int             unused_root_x, unused_root_y;
-  unsigned int    unused_mask;
+  Window unused_root, unused_child;
+  int unused_root_x, unused_root_y;
+  unsigned int unused_mask;
 
   switch (ev.type)
     {
@@ -1336,10 +1336,7 @@ rxvt_term::x_cb (XEvent &ev)
                                &ActualType, &ActualFormat,
                                &Size, &RemainingBytes,
                                &data);
-            XChangeProperty (display->display, display->root,
-                            XA_CUT_BUFFER0, XA_STRING,
-                            8, PropModeReplace,
-                            data, strlen (data));
+            set_string_property (XA_CUT_BUFFER0, data);
             XFree (data);
             selection_paste (display->root, XA_CUT_BUFFER0, True);
             XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
@@ -1455,11 +1452,7 @@ rxvt_term::x_cb (XEvent &ev)
 
 #ifdef TRANSPARENT		/* XXX: maybe not needed - leave in for now */
             if (options & Opt_transparent)
-              {
-                check_our_parents ();
-                if (am_transparent)
-                  want_refresh = want_full_refresh = 1;
-              }
+              check_our_parents ();
 #endif
           }
         break;
@@ -2418,6 +2411,8 @@ rxvt_term::check_our_parents ()
 
       MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
       MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
+
+      XSync (display->display, False);
       allowedxerror = -1;
       image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
 
@@ -2473,7 +2468,9 @@ rxvt_term::check_our_parents ()
         }
     }
 
-  if (!am_pixmap_trans)
+  if (am_pixmap_trans)
+    XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
+  else
     {
       unsigned int n;
       /*
@@ -2548,6 +2545,13 @@ rxvt_term::check_our_parents ()
       scrollbar_show (0);
     }
 
+  if (am_transparent)
+    {
+      want_refresh = want_full_refresh = 1;
+      if (am_pixmap_trans)
+        flush ();
+    }
+
   return pchanged;
 }
 #endif
@@ -3515,10 +3519,10 @@ rxvt_term::process_window_ops (const int *args, unsigned int nargs)
 unsigned char *
 rxvt_term::get_to_st (unicode_t &ends_how)
 {
-  unicode_t seen_esc = 0, ch;
+  unicode_t ch;
+  bool seen_esc = false;
   unsigned int n = 0;
-  unsigned char *s;
-  unsigned char string[STRING_MAX];
+  wchar_t string[STRING_MAX];
 
   while ((ch = cmd_getc ()) != NOCHAR)
     {
@@ -3531,7 +3535,7 @@ rxvt_term::get_to_st (unicode_t &ends_how)
         }
       else if (ch == C0_ESC)
         {
-          seen_esc = 1;
+          seen_esc = true;
           continue;
         }
       else if (ch == C0_BEL || ch == CHAR_ST)
@@ -3539,7 +3543,7 @@ rxvt_term::get_to_st (unicode_t &ends_how)
       else if (ch < 0x20)
         return NULL;	/* other control character - exit */
 
-      seen_esc = 0;
+      seen_esc = false;
 
       if (n >= sizeof (string) - 1)
         // stop at some sane length
@@ -3553,12 +3557,9 @@ rxvt_term::get_to_st (unicode_t &ends_how)
 
   string[n++] = '\0';
 
-  if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
-    return NULL;
-
   ends_how = (ch == 0x5c ? C0_ESC : ch);
-  strncpy (s, string, n);
-  return s;
+
+  return (unsigned char *)rxvt_wcstombs (string);
 }
 
 /*----------------------------------------------------------------------*/
@@ -3669,7 +3670,7 @@ rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
       case XTerm_property:
         if (str[0] == '?')
           {
-            Atom prop = XInternAtom (display->display, str + 1, True);
+            Atom prop = display->atom (str + 1);
             Atom actual_type;
             int actual_format;
             unsigned long nitems;
@@ -3697,10 +3698,7 @@ rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
             if (eq)
               {
                 *eq = 0;
-                XChangeProperty (display->display, TermWin.parent[0],
-                                 display->atom (str), XA_STRING, 8,
-                                 PropModeReplace, (unsigned char *)eq + 1,
-                                 strlen (eq + 1));
+                set_utf8_property (display->atom (str), eq + 1);
               }
             else
               XDeleteProperty (display->display, TermWin.parent[0],
diff --git a/src/iom.C b/src/iom.C
index 5240df33..b81eb5b2 100644
--- a/src/iom.C
+++ b/src/iom.C
@@ -96,12 +96,17 @@ static struct tw0 : time_watcher
 tstamp NOW;
 
 #if IOM_TIME
-inline void set_now (void)
+tstamp io_manager::now ()
 {
   struct timeval tv;
 
   gettimeofday (&tv, 0);
-  NOW = (tstamp)tv.tv_sec + (tstamp)tv.tv_usec / 1000000.;
+  return (tstamp)tv.tv_sec + (tstamp)tv.tv_usec / 1000000.;
+}
+
+void io_manager::set_now ()
+{
+  NOW = now ();
 }
 #endif
 
@@ -127,7 +132,7 @@ static struct init {
     iom_valid = true;
 
 #if IOM_TIME
-    set_now ();
+    io_manager::set_now ();
 
     tw0.start (TSTAMP_MAX);
 #endif
diff --git a/src/iom.h b/src/iom.h
index e5d37f0a..b77cd62e 100644
--- a/src/iom.h
+++ b/src/iom.h
@@ -86,6 +86,14 @@ class io_manager {
   static void unreg (watcher &w, io_manager_vec<watcher> &queue);
 
 public:
+#if IOM_TIME
+  // fetch time only
+  static tstamp now ();
+
+  // set NOW
+  static void set_now ();
+#endif
+
   // register a watcher
 #if IOM_IO
   static void reg (io_watcher    &w); static void unreg (io_watcher    &w);
diff --git a/src/rxvttoolkit.C b/src/rxvttoolkit.C
index 396711a8..3f4cf0e4 100644
--- a/src/rxvttoolkit.C
+++ b/src/rxvttoolkit.C
@@ -270,7 +270,7 @@ void rxvt_display::x_cb (io_watcher &w, short revents)
         }
 #endif
     }
-  while (XPending (display));
+  while (XEventsQueued (display, QueuedAlready));
 
   flush ();
 }