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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.69 by root, Sat Jun 30 18:10:41 2007 UTC vs.
Revision 1.80 by ayin, Fri Dec 7 01:29:00 2007 UTC

   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_display::rxvt_display (const char *id)
 : refcounted (id)
-, x_ev (this, &rxvt_display::x_cb)
 , selection_owner (0)
 {
+  x_ev.set<rxvt_display, &rxvt_display::x_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
    */
   // 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);
       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;
   if (!dpy)
     return false;
   screen = DefaultScreen     (dpy);
   root   = DefaultRootWindow (dpy);
-#ifdef HAVE_AFTERIMAGE
-  ::dpy = dpy; /* init global var from libAfter... */
-  asv = create_asvisual_for_id (dpy, screen, DefaultDepth (dpy,screen),
-                                XVisualIDFromVisual (DefaultVisual (dpy, screen)), None, NULL);
-#endif
   assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
   XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
   XrmSetDatabase (dpy, get_resources (false));
 #endif
   int fd = XConnectionNumber (dpy);
   // try to detect wether 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_UNIX;
-  x_ev.start (fd, EVENT_READ);
+  x_ev.start (fd, ev::READ);
   fcntl (fd, F_SETFD, FD_CLOEXEC);
   XSelectInput (dpy, root, PropertyChangeMask);
   flush ();
   XFree (atoms);
 }
 #endif
-void rxvt_display::x_cb (io_watcher &w, short revents)
+void rxvt_display::x_cb (ev::io &w, int revents)
 {
-  do
+  while (XEventsQueued (dpy, QueuedAfterReading))
     {
       XEvent xev;
       XNextEvent (dpy, &xev);
 #ifdef USE_XIM
             }
 #ifdef USE_XIM
         }
 #endif
     }
-  while (XEventsQueued (dpy, QueuedAlready));
   XFlush (dpy);
 }
 void rxvt_display::flush ()
 {
-  if (XEventsQueued (dpy, QueuedAlready))
-    x_cb (x_ev, EVENT_READ);
+  x_cb (x_ev, ev::READ);
-  XFlush (dpy);
 }
 void rxvt_display::reg (xevent_watcher *w)
 {
   if (!w->active)
 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)
 {
 #if XFT
   XRenderPictFormat *format;
       name += skip;
     }
   else
     c.a = rgba::MAX_CC;
+  // parse the non-standard "#aarrggbb" format
+  if (name[0] == '#' && strlen (name) == 1+2+2+2+2 && 4 == sscanf (name+1, "%2hx%2hx%2hx%2hx%c", &c.a, &c.r, &c.g, &c.b, &eos))
+    {
+      if (c.r)
+        c.r = (c.r << 8) | 0x0ff;
+      if (c.g)
+        c.g = (c.g << 8) | 0x0ff;
+      if (c.b)
+        c.b = (c.b << 8) | 0x0ff;
+      if (c.a)
+        c.a = (c.a << 8) | 0x0ff;
+    }
   // 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))
+  else 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;
     }
 #endif
   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
       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.69 by root, Sat Jun 30 18:10:41 2007 UTC vs. Revision 1.80 by ayin, Fri Dec 7 01:29:00 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.69 by root, Sat Jun 30 18:10:41 2007 UTC vs.
Revision 1.80 by ayin, Fri Dec 7 01:29:00 2007 UTC