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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.364 by sf-exg, Thu Jan 20 17:39:29 2011 UTC vs.
Revision 1.368 by sf-exg, Tue Feb 1 00:41:01 2011 UTC

     {
       rvideo_state = on;
       ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
 #ifdef HAVE_BG_PIXMAP
-      if (bgPixmap.pixmap == None)
+      if (bg_pixmap == None)
 #endif
           XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
       XGCValues gcvalue;
       gcvalue.foreground = pix_colors[Color_fg];
   refresh_count = 0;
   unsigned int old_screen_flags = screen.flags;
   char have_bg = 0;
 #ifdef HAVE_BG_PIXMAP
-  have_bg = bgPixmap.pixmap != None;
+  have_bg = bg_pixmap != None;
 #endif
   ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
   /*
    * B: reverse any characters which are selected
 rxvt_term::scr_recolour (bool refresh) NOTHROW
 {
   bool transparent = false;
 #ifdef HAVE_BG_PIXMAP
-  if (bgPixmap.pixmap != None)
+  if (bg_pixmap != None)
     {
 # ifdef ENABLE_TRANSPARENCY
-      if (bgPixmap.flags & bgPixmap_t::isTransparent)
+      if (bg_flags & BG_IS_TRANSPARENT)
         {
-          XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.pixmap);
+          XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
           XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
           transparent = true;
         }
       else
 # endif
         {
           XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
-          XSetWindowBackgroundPixmap (dpy, vt, bgPixmap.pixmap);
+          XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
         }
     }
   else
 #endif
     {
 void
 rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
 {
   if (prop == None)         /* check for failed XConvertSelection */
     {
+      int selnum = selection_type & Sel_whereMask;
+      if (selnum == Sel_direct)
+        selection_type = 0;
       if ((selection_type & Sel_CompoundText))
         {
-          int selnum = selection_type & Sel_whereMask;
           selection_type = 0;
-          if (selnum != Sel_direct)
-            selection_request_other (XA_STRING, selnum);
+          selection_request_other (XA_STRING, selnum);
         }
       if ((selection_type & Sel_UTF8String))
         {
-          int selnum = selection_type & Sel_whereMask;
           selection_type = Sel_CompoundText;
-          if (selnum != Sel_direct)
-            selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
+          selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
-          else
-            selection_type = 0;
         }
       return;
     }
             {
               /*
                * pass through again trying CUT_BUFFER0 if we've come from
                * XConvertSelection () but nothing was presented
                */
-              selection_paste (display->root, XA_CUT_BUFFER0, False);
+              selection_paste (display->root, XA_CUT_BUFFER0, false);
             }
           goto bailout;
         }
     }

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.364 by sf-exg, Thu Jan 20 17:39:29 2011 UTC vs. Revision 1.368 by sf-exg, Tue Feb 1 00:41:01 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.364 by sf-exg, Thu Jan 20 17:39:29 2011 UTC vs.
Revision 1.368 by sf-exg, Tue Feb 1 00:41:01 2011 UTC