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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.112 by sf-exg, Thu Dec 30 00:35:29 2010 UTC vs.
Revision 1.114 by root, Thu Jan 27 02:03:30 2011 UTC

 {
 }
 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;
   /*
    * 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.
 rxvt_display::ref_next ()
 {
   // 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 ()
 {

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