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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.419 by root, Fri Jun 1 08:12:09 2012 UTC vs.
Revision 1.432 by sf-exg, Sun Jan 13 22:30:47 2013 UTC

   tsize -= tsize % sizeof (rend_t);
   int all_rows = total_rows + nrow + nrow;
   chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
-  chunk = rxvt_malloc (chunk_size);
+  chunk = chunk_alloc (chunk_size, 0);
   char *base = (char *)chunk + sizeof (line_t) * all_rows;
   for (int row = 0; row < all_rows; ++row)
     {
   drawn_buf = (line_t *)chunk;
   swap_buf  = drawn_buf + nrow;
   row_buf   = swap_buf  + nrow;
 }
+void
+rxvt_term::copy_line (line_t &dst, line_t &src)
+{
+  scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
+  dst.l = min (src.l, ncol);
+  memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
+  memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
+  dst.f = src.f;
+}
 void ecb_cold
 rxvt_term::scr_reset ()
 {
 #if ENABLE_OVERLAY
   scr_overlay_off ();
   screen.tscroll = 0;
   screen.bscroll = nrow - 1;
   void *prev_chunk = chunk;
+  size_t prev_chunk_size = chunk_size;
   line_t *prev_drawn_buf = drawn_buf;
   line_t *prev_swap_buf  = swap_buf;
   line_t *prev_row_buf   = row_buf;
-  int common_col = min (prev_ncol, ncol);
   scr_alloc ();
   if (!prev_row_buf)
     {
        * add or delete rows as appropriate
        */
       for (int row = min (nrow, prev_nrow); row--; )
         {
-          scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
+          copy_line (drawn_buf [row], prev_drawn_buf [row]);
-          scr_blank_screen_mem (swap_buf  [row], DEFAULT_RSTYLE);
+          copy_line (swap_buf [row], prev_swap_buf [row]);
-          memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
-          memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
-          memcpy (swap_buf  [row].t, prev_swap_buf  [row].t, sizeof (text_t) * common_col);
-          memcpy (swap_buf  [row].r, prev_swap_buf  [row].r, sizeof (rend_t) * common_col);
         }
       int p    = MOD (term_start + prev_nrow, prev_total_rows);  // previous row
       int pend = MOD (term_start + top_row  , prev_total_rows);
       int q    = total_rows; // rewrapped row
           for (int row = min (nrow, prev_nrow); row--; )
             {
               line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
               line_t &dst = row_buf [row];
-              scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
+              copy_line (dst, src);
-              memcpy (dst.t, src.t, sizeof (text_t) * common_col);
-              memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
             }
           for (int row = prev_nrow; row < nrow; row++)
             scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
       if (!ROW       (row).valid ()) scr_blank_screen_mem (ROW       (row), DEFAULT_RSTYLE);
       if (!swap_buf  [row].valid ()) scr_blank_screen_mem (swap_buf  [row], DEFAULT_RSTYLE);
       if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
     }
-  free (prev_chunk);
+  chunk_free (prev_chunk, prev_chunk_size);
   free (tabs);
   tabs = (char *)rxvt_malloc (ncol);
   for (int col = ncol; col--; )
 }
 void ecb_cold
 rxvt_term::scr_release () NOTHROW
 {
-  free (chunk); chunk = 0; row_buf = 0;
+  chunk_free (chunk, chunk_size);
-  free (tabs);  tabs  = 0;
+  chunk = 0;
+  row_buf = 0;
+  free (tabs);
+  tabs = 0;
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Hard/Soft reset
   if (rvideo_state != on)
     {
       rvideo_state = on;
       ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
-#ifdef HAVE_BG_PIXMAP
+#ifdef HAVE_IMG
-      if (bg_pixmap == None)
+      if (bg_img == 0)
 #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;
   bool have_bg = 0;
-#ifdef HAVE_BG_PIXMAP
+#ifdef HAVE_IMG
-  have_bg = bg_pixmap != None;
+  have_bg = bg_img != 0;
 #endif
   ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
   /*
    * B: reverse any characters which are selected
 void ecb_cold
 rxvt_term::scr_recolour (bool refresh) NOTHROW
 {
   bool transparent = false;
-#ifdef HAVE_BG_PIXMAP
+#ifdef HAVE_IMG
-  if (bg_pixmap != None)
+  if (bg_img != 0)
     {
-# ifdef ENABLE_TRANSPARENCY
+# if ENABLE_TRANSPARENCY
       if (bg_flags & BG_IS_TRANSPARENT)
         {
-          XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
+          XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
           XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
           transparent = true;
         }
       else
 # endif
         {
           XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
-          XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
+          XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
         }
     }
   else
 #endif
     {
   if (scrollBar.win)
     {
       if (transparent)
         XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
       else
-        XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
+        XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
       scrollBar.state = SB_STATE_IDLE;
       scrollBar.show (0);
     }
   if (refresh)
   XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
 }
 /* ------------------------------------------------------------------------- */
-#ifdef USE_XIM
+#if USE_XIM
 void ecb_cold
 rxvt_term::im_set_position (XPoint &pos) NOTHROW
 {
   XWindowAttributes xwa;

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.419 by root, Fri Jun 1 08:12:09 2012 UTC vs. Revision 1.432 by sf-exg, Sun Jan 13 22:30:47 2013 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.419 by root, Fri Jun 1 08:12:09 2012 UTC vs.
Revision 1.432 by sf-exg, Sun Jan 13 22:30:47 2013 UTC