[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.62 by root, Mon Aug 7 15:41:05 2006 UTC

    */
   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")))
   // 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;
           && actual_format == 8)
          displayResource = val;
        else
          {
            displayResource = 0;
            if (val)
              XFree(val);
          }
 #if XLIB_ILLEGAL_ACCESS
     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)
   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)
 {
   if (selection_owner && selection_owner != owner)

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.62 by root, Mon Aug 7 15:41:05 2006 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.62 by root, Mon Aug 7 15:41:05 2006 UTC