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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.19 by ayin, Tue Dec 18 11:15:24 2007 UTC vs.
Revision 1.24 by ayin, Mon Jan 7 12:41:31 2008 UTC

   h_scale = v_scale = 0;
   h_align = v_align = 0;
 #endif
   flags = 0;
   pixmap = None;
+  valid_since = invalid_since = 0;
 }
 void
 bgPixmap_t::destroy ()
 {
   int x = 0, y = 0;
   unsigned int w = 0, h = 0;
   unsigned int n;
   unsigned long new_flags = (flags & (~geometryFlags));
   char *p;
-#  define MAXLEN_GEOM		256 /* could be longer then regular geometry string */
+#  define MAXLEN_GEOM		256 /* could be longer than regular geometry string */
   if (geom == NULL)
     return false;
   char str[MAXLEN_GEOM];
   if (n < MAXLEN_GEOM)
     {
       char *ops;
       new_flags |= geometrySet;
-      strncpy (str, geom, n);
+      memcpy (str, geom, n);
       str[n] = '\0';
       if (str[0] == ':')
         ops = &str[0];
       else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
         ops = &str[0];
                                   100, ASIMAGE_QUALITY_DEFAULT);
         }
       if (background == NULL)
         {
           /* if tiling - pixmap has to be sized exactly as the image,
-             but there is no need to make it bigger then the window! */
+             but there is no need to make it bigger than the window! */
           if (h_scale == 0)
             new_pmap_width = min (result->width, target_width);
           if (v_scale == 0)
             new_pmap_height = min (result->height, target_height);
           /* we also need to tile our image in one or both directions */
         original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
       else
         {
           size_t len = f - file;
           f = (char *)malloc (len + 1);
-          strncpy (f, file, len);
+          memcpy (f, file, len);
           f[len] = '\0';
           original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
           free (f);
         }
       return (original_asim != NULL);
       unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
       tint = new_tint;
       flags = (flags & ~tintFlags) | new_flags | tintSet;
       return true;
     }
   return false;
 }
 bool
 bgPixmap_t::unset_tint ()
   if (new_flags != (flags & tintFlags))
     {
      flags = (flags&~tintFlags)|new_flags;
      return true;
     }
   return false;
 }
 bool
 bgPixmap_t::set_shade (const char *shade_str)
 {
   int new_shade = (shade_str) ? atoi (shade_str) : 0;
   if (new_shade < 0 && new_shade > -100)
-		new_shade = 200 - (100 + new_shade);
+    new_shade = 200 - (100 + new_shade);
   else if (new_shade == 100)
     new_shade = 0;
   if (new_shade != shade)
     {
       unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
       shade = new_shade;
       flags = (flags & (~tintFlags | tintSet)) | new_flags;
       return true;
     }
   return false;
 }
 /* make_transparency_pixmap()
  * Builds a pixmap sized the same as terminal window, with depth same as the root window
           XGrabServer (dpy);
           XMapRaised (dpy, src);
           XSync (dpy, False);
           /* XSync should get window where it's properly exposed,
-           * but to be on the safe side - let's check for the actuall event to arrive : */
+           * but to be on the safe side - let's check for the actual event to arrive : */
           while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
             ++ev_count;
           if (ev_count > 0);
             {
                 {
                   XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
                   success = true;
                 }
             }
           XDestroyWindow (dpy, src);
           XUngrabServer (dpy);
           //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
         }
                       mask_c.blue = 0xffff - c.b;
                       XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
                       XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
                       result |= transpPmapTinted;
                     }
                   XRenderFreePicture (dpy, mask_pic);
                   XRenderFreePicture (dpy, overlay_pic);
                   XRenderFreePicture (dpy, back_pic);
 #   if DO_TIMING_TEST
                   XSync (dpy, False);
 }
 bool
 bgPixmap_t::set_root_pixmap ()
 {
-  Pixmap new_root_pixmap = None;
-  new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
+  Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
   if (new_root_pixmap == None)
     new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
   if (new_root_pixmap != root_pixmap)
     {
       root_pixmap = new_root_pixmap;
       return true;
     }
   return false;
 }
 # endif /* ENABLE_TRANSPARENCY */
 # ifndef HAVE_AFTERIMAGE
 static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm);
 # endif
 bool
 bgPixmap_t::render ()
 {
   unsigned long background_flags = 0;
           ShadeXImage (target, result, shade, c.r, c.g, c.b);
         }
     }
 # endif /* HAVE_AFTERIMAGE */
-  if (result != NULL)
+  if (result)
     {
       GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
       if (gc)
         {
           if (/*pmap_depth != target->depth &&*/ pixmap != None)
             {
               XFreePixmap (target->dpy, pixmap);
               pixmap = None;
             }
           if (pixmap == None)
             {
               pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
-              pmap_width = result->width;
+              pmap_width  = result->width;
               pmap_height = result->height;
-              pmap_depth = target->depth;
+              pmap_depth  = target->depth;
             }
           if (pmap_depth != result->depth)
             {
               /* Bad Match error will ensue ! stupid X !!!! */
               if (result->depth == 24 && pmap_depth == 32)
                 result->depth = 32;
               else
                 {
                   /* TODO: implement image recoding */
                 }
             }
           if (pmap_depth == result->depth)
             XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
           XFreeGC (target->dpy, gc);
           flags = flags & ~isInvalid;
         }
         XDestroyImage (result);
     }
   if (flags & isInvalid)
     {
           pixmap = None;
         }
     }
   apply ();
+  XSync (target->dpy, False);
+  valid_since = ev::now ();
   TIMING_TEST_PRINT_RESULT (tp);
   return true;
 }
       }
   return false;
 }
 void
-bgPixmap_t::apply()
+bgPixmap_t::apply ()
 {
   if (target)
     {
       flags &= ~isVtOrigin;
       if (pixmap != None)

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.19 by ayin, Tue Dec 18 11:15:24 2007 UTC vs. Revision 1.24 by ayin, Mon Jan 7 12:41:31 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.19 by ayin, Tue Dec 18 11:15:24 2007 UTC vs.
Revision 1.24 by ayin, Mon Jan 7 12:41:31 2008 UTC