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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.59 by root, Wed Jul 5 20:31:48 2006 UTC vs.
Revision 1.113 by sf-exg, Fri Jan 14 11:09:54 2011 UTC

 /*----------------------------------------------------------------------*
  * File:	rxvttoolkit.C
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
 #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
-#ifdef TRANSPARENT
+#ifdef ENABLE_TRANSPARENCY
   "_XROOTPMAP_ID",
   "ESETROOT_PMAP_ID",
 #endif
 #if ENABLE_XEMBED
   "_XEMBED",
   XIMCallback ximcallback;
   ximcallback.client_data = (XPointer)this;
   ximcallback.callback = im_destroy_cb;
-  XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0);
+  XSetIMValues (xim, XNDestroyCallback, &ximcallback, (char *)0);
   return true;
 }
 rxvt_xim::~rxvt_xim ()
 {
 }
 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)
-, x_ev (this, &rxvt_display::x_cb)
 , 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);
 }
 XrmDatabase
 rxvt_display::get_resources (bool refresh)
 {
-  char *homedir = (char *)getenv ("HOME");
+  char *homedir = getenv ("HOME");
   char fname[1024];
   /*
    * get resources using the X library function
    */
   char *displayResource, *xe;
   XrmDatabase rdb1, database = 0;
   // 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.
   /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
-  if ((xe = (char *)getenv ("XAPPLRESDIR")))
+  if ((xe = getenv ("XAPPLRESDIR")))
     {
       snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
       if ((rdb1 = XrmGetFileDatabase (fname)))
         XrmMergeDatabases (rdb1, &database);
   // 5. User's per application default file.
   // none
   // 4. User's defaults file.
+  if (homedir)
+    {
+      snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
+      if ((rdb1 = XrmGetFileDatabase (fname)))
+        XrmMergeDatabases (rdb1, &database);
+    }
   /* Get any Xserver defaults */
   if (refresh)
     {
       // fucking xlib keeps a copy of the rm string
       Atom actual_type;
                               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
     }
     displayResource = XResourceManagerString (dpy);
   if (displayResource)
     {
       if ((rdb1 = XrmGetStringDatabase (displayResource)))
-        XrmMergeDatabases (rdb1, &database);
-    }
-  else if (homedir)
-    {
-      snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
-      if ((rdb1 = XrmGetFileDatabase (fname)))
         XrmMergeDatabases (rdb1, &database);
     }
 #if !XLIB_ILLEGAL_ACCESS
   if (refresh && displayResource)
       XFree (displayResource);
     }
   // 3. User's per host defaults file
   /* Add in XENVIRONMENT file */
-  if ((xe = (char *)getenv ("XENVIRONMENT"))
+  if ((xe = getenv ("XENVIRONMENT"))
       && (rdb1 = XrmGetFileDatabase (xe)))
     XrmMergeDatabases (rdb1, &database);
   else if (homedir)
     {
       struct utsname un;
 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 domains socket == local, everything else not
+  // 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);
   if (!getsockname (fd, (sockaddr *)&sa, &sl))
-    is_local = sa.sun_family == AF_LOCAL;
+    is_local = sa.sun_family == AF_UNIX;
+  flush_ev.start ();
-  x_ev.start (fd, EVENT_READ);
+  x_ev.start (fd, ev::READ);
   fcntl (fd, F_SETFD, FD_CLOEXEC);
   XSelectInput (dpy, root, PropertyChangeMask);
   flush ();
 }
 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));
   XrmSetDatabase (dpy, get_resources (true));
 }
 #ifdef POINTER_BLANK
   XFreeCursor (dpy, blank_cursor);
 #endif
   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;
   XFree (atoms);
 }
 #endif
-void rxvt_display::x_cb (io_watcher &w, short revents)
+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, QueuedAfterFlush))
-  do
+    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)
+              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
-    }
+      }
-  while (XEventsQueued (dpy, QueuedAlready));
+    while (XEventsQueued (dpy, QueuedAlready));
-  XFlush (dpy);
+  w.stop ();
-}
-void rxvt_display::flush ()
-{
-  if (XEventsQueued (dpy, QueuedAlready))
-    x_cb (x_ev, EVENT_READ);
-  XFlush (dpy);
 }
 void rxvt_display::reg (xevent_watcher *w)
 {
+  if (!w->active)
+    {
-  xw.push_back (w);
+      xw.push_back (w);
-  w->active = xw.size ();
+      w->active = xw.size ();
+    }
 }
 void rxvt_display::unreg (xevent_watcher *w)
 {
   if (w->active)
+    {
-    xw[w->active - 1] = 0;
+      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)
-    selection_owner->selection_clear ();
+    {
+      rxvt_term *term = cur_owner;
+      term->selection_clear (clipboard);
+      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)
 static unsigned int
 insert_component (unsigned int value, unsigned int mask, unsigned int shift)
 {
   return (value * (mask + 1) >> 16) << shift;
 }
 bool
 rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
 {
+  //TODO: only supports 24 bit
+  int alpha = color.a >= 0xff00 ? 0xffff : color.a;
 #if XFT
   XRenderPictFormat *format;
   // FUCKING Xft gets it wrong, of course, so work around it.
   // Transparency users should eat shit and die, and then
     {
       // the fun lies in doing everything manually...
       c.color.red   = color.r;
       c.color.green = color.g;
       c.color.blue  = color.b;
-      c.color.alpha = color.a;
+      c.color.alpha = alpha;
       c.pixel = insert_component (color.r, format->direct.redMask  , format->direct.red  )
               | insert_component (color.g, format->direct.greenMask, format->direct.green)
               | insert_component (color.b, format->direct.blueMask , format->direct.blue )
-              | insert_component (color.a, format->direct.alphaMask, format->direct.alpha);
+              | insert_component (alpha  , format->direct.alphaMask, format->direct.alpha);
       return true;
     }
   else
     {
       XRenderColor d;
       d.red   = color.r;
       d.green = color.g;
       d.blue  = color.b;
-      d.alpha = color.a;
+      d.alpha = alpha;
       return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
     }
 #else
   c.red   = color.r;
   c.green = color.g;
   c.blue  = color.b;
   if (screen->visual->c_class == TrueColor)
     {
-      c.pixel = (color.r * (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  ))
-                         / rgba::MAX_CC) << ctz (screen->visual->red_mask  )
+              | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
-              | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
-                         / rgba::MAX_CC) << ctz (screen->visual->green_mask)
-              | (color.b * (screen->visual->blue_mask  >> ctz (screen->visual->blue_mask ))
+              | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
-                         / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
       return true;
     }
   else if (XAllocColor (screen->dpy, screen->cmap, &c))
     return true;
 {
   rgba c;
   char eos;
   int skip;
+  c.a = rgba::MAX_CC;
   // parse the nonstandard "[alphapercent]" prefix
   if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
     {
       c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
       name += skip;
     }
-  else
-    c.a = rgba::MAX_CC;
   // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
   if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
     {
-      XColor xc, xc_exact;
+      XColor xc;
       if (XParseColor (screen->dpy, screen->cmap, name, &xc))
         {
           c.r = xc.red;
           c.g = xc.green;
     {
       XColor *colors = new XColor [screen->visual->map_entries];
       for (int i = 0; i < cmap_size; i++)
         colors [i].pixel = i;
       // many kilobytes transfer per colour, but pseudocolor isn't worth
       // many extra optimisations.
       XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
       int diff = 0x7fffffffUL;
             }
         }
       //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
       //    color.r, color.g, color.b, best->red, best->green, best->blue, diff);
       got = alloc (screen, rgba (best->red, best->green, best->blue));
-      delete colors;
+      delete [] colors;
     }
 #endif
   return got;
 }
   color.green = c.g;
   color.blue  = c.b;
   color.pixel = (Pixel)*this;
 }
 void
 rxvt_color::free (rxvt_screen *screen)
 {
   if (screen->visual->c_class == TrueColor)
     return; // nothing to do

Diff Legend

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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents): Revision 1.59 by root, Wed Jul 5 20:31:48 2006 UTC vs. Revision 1.113 by sf-exg, Fri Jan 14 11:09:54 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.59 by root, Wed Jul 5 20:31:48 2006 UTC vs.
Revision 1.113 by sf-exg, Fri Jan 14 11:09:54 2011 UTC