From: root <root>
Date: Wed, 5 Jul 2006 20:31:48 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=5e77215acfe61f4b196437f232583276fdef74c8;p=dana%2Furxvt.git

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

diff --git a/Changes b/Changes
index 284f4eee..009bc8c1 100644
--- a/Changes
+++ b/Changes
@@ -29,6 +29,9 @@ TODO: implement smartcase-like search in searchable-scrollback
 TODO: check wether -depth works as resource
 TODO: digital clock gets nuked after searching
 TODO: read .Xdefaults even when we have display resources, but give them lower priority
+        - use less "correct" color scaling that is compatible with libX11 and Xft
+          (avoids off-by-one colors resulting in striped backgrounds).
+        - the "depth" resource is now respected.
 	- add FORCE_UNBUFFERED_XFT define to features.h.
         - double-buffered xft drawing did suffer from pixel offset issues
           when pixmap transparency was enabled.
@@ -48,8 +51,6 @@ TODO: read .Xdefaults even when we have display resources, but give them lower p
         - slap in a using namespace std, might help on platforms that don't
           follow C++ closely enough.
         - fix mailto url regex, spotted within milliseconds by Jost Krieger.
-        - use less "correct" color scaling that is compatible with libX11 and Xft
-          (avoids off-by-one colors resulting in striped backgrounds).
 
 7.7  Tue Feb 21 12:32:49 CET 2006
 	- use double-buffered drawing (xft fonts only). On many driver/hardware
diff --git a/src/init.C b/src/init.C
index 06ab2360..96c982c6 100644
--- a/src/init.C
+++ b/src/init.C
@@ -302,14 +302,13 @@ rxvt_term::init_resources (int argc, const char *const *argv)
   // using a local pointer decreases code size a lot
   xa = display->xa;
 
+  set (display);
+  extract_resources ();
+
 #if XFT
   if (rs[Rs_depth])
-    set (display, strtol (rs[Rs_depth], 0, 0));
-  else
+    select_visual (strtol (rs[Rs_depth], 0, 0));
 #endif
-    set (display);
-
-  extract_resources ();
 
   free (r_argv);
 
diff --git a/src/rxvttoolkit.C b/src/rxvttoolkit.C
index 102b69bf..4f6896a7 100644
--- a/src/rxvttoolkit.C
+++ b/src/rxvttoolkit.C
@@ -264,10 +264,8 @@ rxvt_screen::set (rxvt_display *disp)
 }
 
 void
-rxvt_screen::set (rxvt_display *disp, int bitdepth)
+rxvt_screen::select_visual (int bitdepth)
 {
-  set (disp);
-
 #if XFT
   XVisualInfo vinfo;
 
@@ -275,7 +273,7 @@ rxvt_screen::set (rxvt_display *disp, int bitdepth)
     {
       depth  = bitdepth;
       visual = vinfo.visual;
-      cmap   = XCreateColormap (dpy, disp->root, visual, AllocNone);
+      cmap   = XCreateColormap (dpy, display->root, visual, AllocNone);
     }
 #endif
 }
diff --git a/src/rxvttoolkit.h b/src/rxvttoolkit.h
index d6893f51..9c0be3f8 100644
--- a/src/rxvttoolkit.h
+++ b/src/rxvttoolkit.h
@@ -185,7 +185,7 @@ struct rxvt_screen {
 #endif
 
   void set (rxvt_display *disp);
-  void set (rxvt_display *disp, int bitdepth);
+  void select_visual (int bitdepth);
   void clear ();
 };