[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvttoolkit.C

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.99 by root, Sat Jan 26 13:31:09 2008 UTC vs.
Revision 1.114 by root, Thu Jan 27 02:03:30 2011 UTC

 #if XFT
 # include <X11/extensions/Xrender.h>
 #endif
-const char *const xa_names[] =
+static const char *const xa_names[] =
 {
   "TEXT",
   "COMPOUND_TEXT",
   "UTF8_STRING",
   "MULTIPLE",
 #if ENABLE_EWMH
   "_NET_WM_PID",
   "_NET_WM_NAME",
   "_NET_WM_ICON_NAME",
   "_NET_WM_PING",
+  "_NET_WM_ICON",
 #endif
 #if USE_XIM
   "WM_LOCALE_NAME",
   "XIM_SERVERS",
 #endif
 {
 }
 rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h)
 {
-  // it's actually faster to re-allocate every time. don't ask me
-  // why, but its likely no big deal there are no roundtrips
-  // (I think/hope).
-  if (!scratch_area || w > scratch_w || h > scratch_h || 1/*D*/)
+  if (!scratch_area || w > scratch_w || h > scratch_h)
     {
       if (scratch_area)
         {
           XFreePixmap (dpy, scratch_area->drawable);
           delete scratch_area;
 /////////////////////////////////////////////////////////////////////////////
 rxvt_display::rxvt_display (const char *id)
 : refcounted (id)
 , selection_owner (0)
+, clipboard_owner (0)
 {
   x_ev    .set<rxvt_display, &rxvt_display::x_cb    > (this);
   flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
 }
   /*
    * get resources using the X library function
    */
   char *displayResource, *xe;
   XrmDatabase rdb1, database = 0;
+#if !XLIB_ILLEGAL_ACCESS
+  /* work around a bug in XrmSetDatabase where it frees the db, see ref_next */
+  database = XrmGetStringDatabase ("");
+#endif
   // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
   // as opposed to "standard practise", we always read in ~/.Xdefaults
   // 6. System wide per application default file.
                               XA_STRING, &actual_type, &actual_format,
                               &nitems, &nremaining,
                               (unsigned char **)&val) == Success
           && actual_type == XA_STRING
           && actual_format == 8)
-         displayResource = val;
+        displayResource = val;
-       else
+      else
-         {
+        {
-           displayResource = 0;
+          displayResource = 0;
-           if (val)
+          if (val)
-             XFree(val);
+            XFree (val);
-         }
+        }
 #if XLIB_ILLEGAL_ACCESS
       dpy->xdefaults = displayResource;
 #endif
     }
 bool rxvt_display::ref_init ()
 {
 #ifdef LOCAL_X_IS_UNIX
   if (id[0] == ':')
     {
-      val = rxvt_malloc (5 + strlen (id) + 1);
+      if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
+        return false;
       strcpy (val, "unix/");
       strcat (val, id);
       dpy = XOpenDisplay (val);
-      free (val);
     }
   else
 #endif
     dpy = 0;
     return false;
   screen = DefaultScreen     (dpy);
   root   = DefaultRootWindow (dpy);
-  assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
+  assert (ARRAY_LENGTH(xa_names) == NUM_XA);
   XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
   XrmSetDatabase (dpy, get_resources (false));
 #ifdef POINTER_BLANK
   XUnloadFont (dpy, f);
 #endif
   int fd = XConnectionNumber (dpy);
-  // try to detect wether we have a local connection.
+  // try to detect whether we have a local connection.
   // assume unix domain socket == local, everything else not
   // TODO: might want to check for inet/127.0.0.1
   is_local = 0;
   sockaddr_un sa;
   socklen_t sl = sizeof (sa);
 }
 void
 rxvt_display::ref_next ()
 {
-  // TODO: somehow check wether the database files/resources changed
+  // TODO: somehow check whether the database files/resources changed
   // before affording re-loading/parsing
   XrmDestroyDatabase (XrmGetDatabase (dpy));
+#if XLIB_ILLEGAL_ACCESS
+  /* work around a bug in XrmSetDatabase where it frees the db */
+  dpy->db = 0;
+#endif
   XrmSetDatabase (dpy, get_resources (true));
 }
 rxvt_display::~rxvt_display ()
 {
   x_ev.stop ();
   flush_ev.stop ();
 #ifdef USE_XIM
   xims.clear ();
 #endif
+  XrmDestroyDatabase (XrmGetDatabase (dpy));
   XCloseDisplay (dpy);
 }
 #ifdef USE_XIM
 void rxvt_display::im_change_cb ()
   unsigned long nitems, bytes_after;
   if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
                           False, XA_ATOM, &actual_type, &actual_format,
                           &nitems, &bytes_after, (unsigned char **)&atoms)
-      != Success )
+      != Success)
     return;
-  if (actual_type == XA_ATOM  && actual_format == 32)
+  if (actual_type == XA_ATOM && actual_format == 32)
     for (int i = 0; i < nitems; i++)
       if (XGetSelectionOwner (dpy, atoms[i]))
         {
           im_change_cb ();
           break;
 }
 #endif
 void rxvt_display::x_cb (ev::io &w, int revents)
 {
+  flush_ev.start ();
+}
+void rxvt_display::flush_cb (ev::prepare &w, int revents)
+{
-  while (XEventsQueued (dpy, QueuedAfterReading))
+  while (XEventsQueued (dpy, QueuedAfterFlush))
+    do
-    {
+      {
-      XEvent xev;
+        XEvent xev;
-      XNextEvent (dpy, &xev);
+        XNextEvent (dpy, &xev);
 #ifdef USE_XIM
-      if (!XFilterEvent (&xev, None))
+        if (!XFilterEvent (&xev, None))
-        {
+          {
-          if (xev.type == PropertyNotify
+            if (xev.type == PropertyNotify
-              && xev.xany.window == root
+                && xev.xany.window == root
-              && xev.xproperty.atom == xa[XA_XIM_SERVERS])
+                && xev.xproperty.atom == xa[XA_XIM_SERVERS])
-            im_change_check ();
+              im_change_check ();
 #endif
-          if (xev.type == MappingNotify)
+            if (xev.type == MappingNotify)
-            XRefreshKeyboardMapping (&xev.xmapping);
+              XRefreshKeyboardMapping (&xev.xmapping);
-          for (int i = xw.size (); i--; )
+            for (int i = xw.size (); i--; )
-            {
+              {
-              if (!xw[i])
+                if (!xw[i])
-                xw.erase_unordered (i);
+                  xw.erase_unordered (i);
-              else if (xw[i]->window == xev.xany.window)
+                else if (xw[i]->window == xev.xany.window)
-                xw[i]->call (xev);
+                  xw[i]->call (xev);
-            }
+              }
 #ifdef USE_XIM
-        }
+          }
 #endif
-    }
+      }
-}
-void rxvt_display::flush_cb (ev::prepare &w, int revents)
-{
-  while (XEventsQueued (dpy, QueuedAfterFlush))
+    while (XEventsQueued (dpy, QueuedAlready));
-    x_cb (x_ev, EV_READ);
   w.stop ();
 }
 void rxvt_display::reg (xevent_watcher *w)
       xw[w->active - 1] = 0;
       w->active = 0;
     }
 }
-void rxvt_display::set_selection_owner (rxvt_term *owner)
+void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
 {
+  rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
-  if (selection_owner && selection_owner != owner)
+  if (cur_owner && cur_owner != owner)
     {
-      rxvt_term *owner = selection_owner;
+      rxvt_term *term = cur_owner;
-      owner->selection_clear ();
+      term->selection_clear (clipboard);
-      owner->flush ();
+      term->flush ();
     }
-  selection_owner = owner;
+  cur_owner = owner;
 }
 #ifdef USE_XIM
 void rxvt_display::reg (im_watcher *w)
   int l, m;
   l = strlen (locale);
   m = strlen (modifiers);
-  if (!(id = (char *)malloc (l + m + 2)))
+  if (!(id = rxvt_temp_buf<char> (l + m + 2)))
     return 0;
   memcpy (id, locale, l); id[l] = '\n';
   memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
   rxvt_xim *xim = xims.get (id);
-  free (id);
   return xim;
 }
 void rxvt_display::put_xim (rxvt_xim *xim)
   c.green = color.g;
   c.blue  = color.b;
   if (screen->visual->c_class == TrueColor)
     {
-      c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask  )) << ctz (screen->visual->red_mask  ))
+      c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask  )) << rxvt_ctz (screen->visual->red_mask  ))
-              | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask))
+              | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
-              | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
+              | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
       return true;
     }
   else if (XAllocColor (screen->dpy, screen->cmap, &c))
     return true;
       lerp (c.a, to.a, percent)
     )
   );
 }
-#if TRACE_PIXMAPS
-# undef XCreatePixmap
-# undef XFreePixmap
-Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
-{
-  Pixmap res = XCreatePixmap (dpy, r, w, h, d);
-  fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
-  return res;
-}
-void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
-{
-  fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
-  XFreePixmap (dpy,p);
-}
-#endif

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents): Revision 1.99 by root, Sat Jan 26 13:31:09 2008 UTC vs. Revision 1.114 by root, Thu Jan 27 02:03:30 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.99 by root, Sat Jan 26 13:31:09 2008 UTC vs.
Revision 1.114 by root, Thu Jan 27 02:03:30 2011 UTC