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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.136 by root, Wed Jun 6 20:22:04 2012 UTC vs.
Revision 1.137 by root, Thu Jun 7 16:04:31 2012 UTC

   depth   = DefaultDepthOfScreen    (screen);
   visual  = DefaultVisualOfScreen   (screen);
   cmap    = DefaultColormapOfScreen (screen);
 }
+#if ENABLE_FRILLS
 void
-rxvt_screen::select_visual (int bitdepth)
+rxvt_screen::select_visual (int id)
 {
-#if XFT
   XVisualInfo vinfo;
+  vinfo.visualid = id;
+  int n;
+  if (XVisualInfo *vi = XGetVisualInfo (dpy, VisualIDMask, &vinfo, &n))
+    {
+      depth  = vi->depth;
+      visual = vi->visual;
+      XFree (vi);
+      cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
+    }
+  else
+    rxvt_warn ("cannot requested visual id 0x%02x, using default visual.\n", id);
+}
+void
+rxvt_screen::select_depth (int bitdepth)
+{
+  XVisualInfo vinfo;
   if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
-    {
-      depth  = bitdepth;
-      visual = vinfo.visual;
+    select_visual (vinfo.visualid);
-      cmap   = XCreateColormap (dpy, display->root, visual, AllocNone);
+  else
-    }
+    rxvt_warn ("no visual found for requested depth %d, using default visual.\n", bitdepth);
-#endif
 }
+#endif
 void
 rxvt_screen::clear ()
 {
 #if XFT

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