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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.416 by root, Mon May 28 14:26:11 2012 UTC vs.
Revision 1.431 by root, Sun Jan 13 20:19:24 2013 UTC

 /* ------------------------------------------------------------------------- *
  *                          SCREEN INITIALISATION                            *
  * ------------------------------------------------------------------------- */
 void
-rxvt_term::scr_alloc ()
+rxvt_term::scr_alloc () NOTHROW
 {
   int tsize = sizeof (text_t) * ncol;
   int rsize = sizeof (rend_t) * ncol;
   // we assume that rend_t size is a sufficient alignment
-  // factor for tetx_t and line_t values, and we only
+  // factor for text_t and line_t values, and we only
   // need to adjust tsize.
   tsize = (tsize + sizeof (rend_t) - 1);
   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
+void ecb_cold
 rxvt_term::scr_reset ()
 {
 #if ENABLE_OVERLAY
   scr_overlay_off ();
 #endif
   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)
     {
       /*
-       * first time called so just malloc everything: don't rely on realloc
+       * first time called (or after scr_release) so just malloc everything: don't rely on realloc
        */
       top_row    = 0;
       term_start = 0;
       memset (charsets, 'B', sizeof (charsets));
           scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
           scr_blank_screen_mem (swap_buf  [row], DEFAULT_RSTYLE);
           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);
+          swap_buf [row].l = min (prev_swap_buf [row].l, ncol);
+          swap_buf [row].f = prev_swap_buf [row].f;
         }
       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
               scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
               memcpy (dst.t, src.t, sizeof (text_t) * common_col);
               memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
+              dst.l = min (src.l, ncol);
+              dst.f = src.f;
             }
           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--; )
   tt_winch ();
   HOOK_INVOKE ((this, HOOK_RESET, DT_END));
 }
-/* ------------------------------------------------------------------------- */
+void ecb_cold
-/*
- * Free everything.  That way malloc debugging can find leakage.
- */
-void
 rxvt_term::scr_release () NOTHROW
 {
-  free (chunk);
+  chunk_free (chunk, chunk_size);
+  chunk = 0;
+  row_buf = 0;
   free (tabs);
+  tabs = 0;
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Hard/Soft reset
  */
-void
+void ecb_cold
 rxvt_term::scr_poweron ()
 {
   scr_release ();
-  row_buf = 0;
-  tabs = 0;
   prev_nrow = prev_ncol = 0;
   rvideo_mode = false;
   scr_soft_reset ();
   scr_reset ();
   scr_clear (true);
   scr_refresh ();
 }
-void
+void ecb_cold
 rxvt_term::scr_soft_reset () NOTHROW
 {
   /* only affects modes, nothing drastic such as clearing the screen */
 #if ENABLE_OVERLAY
   scr_overlay_off ();
 /*
  * Scroll text between <row1> and <row2> inclusive, by <count> lines
  * count positive ==> scroll up
  * count negative ==> scroll down
  */
-int
+int ecb_hot
 rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
 {
   if (count == 0 || (row1 > row2))
     return 0;
 /* ------------------------------------------------------------------------- */
 /*
  * Add text given in <str> of length <len> to screen struct
  */
-void
+void ecb_hot
 rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
 {
   if (len <= 0)               /* sanity */
     return;
  * XTERM_SEQ: ESC 6
  * Move cursor left in row.  If we're at the left boundary, shift everything
  * in that row right.  Clear left column.
  */
 #if !ENABLE_MINIMAL
-void
+void ecb_cold
 rxvt_term::scr_backindex () NOTHROW
 {
   if (screen.cur.col > 0)
     scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
   else
  * XTERM_SEQ: ESC 9
  * Move cursor right in row.  If we're at the right boundary, shift everything
  * in that row left.  Clear right column.
  */
 #if !ENABLE_MINIMAL
-void
+void ecb_cold
 rxvt_term::scr_forwardindex () NOTHROW
 {
   if (screen.cur.col < ncol - 1)
     scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
   else
 /* ------------------------------------------------------------------------- */
 /*
  * Fill the screen with `E's
  * XTERM_SEQ: Screen Alignment Test: ESC # 8
  */
-void
+void ecb_cold
 rxvt_term::scr_E () NOTHROW
 {
   rend_t fs;
   want_refresh = 1;
 /* ------------------------------------------------------------------------- */
 /*
  * Set the scrolling region
  * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
  */
-void
+void ecb_cold
 rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
 {
   max_it (top, 0);
   min_it (bot, nrow - 1);
 /*
  * Make the cursor visible/invisible
  * XTERM_SEQ: Make cursor visible  : ESC [ ? 25 h
  * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
  */
-void
+void ecb_cold
 rxvt_term::scr_cursor_visible (int mode) NOTHROW
 {
   want_refresh = 1;
   if (mode)
 /*
  * Set/unset automatic wrapping
  * XTERM_SEQ: Set Wraparound  : ESC [ ? 7 h
  * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
  */
-void
+void ecb_cold
 rxvt_term::scr_autowrap (int mode) NOTHROW
 {
   if (mode)
     screen.flags |= Screen_Autowrap;
   else
  * Relative mode: line numbers are relative to top margin of scrolling region
  *      and the cursor cannot be moved outside.
  * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
  * XTERM_SEQ: Set Relative: ESC [ ? 6 l
  */
-void
+void ecb_cold
 rxvt_term::scr_relative_origin (int mode) NOTHROW
 {
   if (mode)
     screen.flags |= Screen_Relative;
   else
 /*
  * Set insert/replace mode
  * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
  * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
  */
-void
+void ecb_cold
 rxvt_term::scr_insert_mode (int mode) NOTHROW
 {
   if (mode)
     screen.flags |= Screen_Insert;
   else
  * Set/Unset tabs
  * XTERM_SEQ: Set tab at current column  : ESC H
  * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
  * XTERM_SEQ: Clear all tabs             : ESC [ 3 g
  */
-void
+void ecb_cold
 rxvt_term::scr_set_tab (int mode) NOTHROW
 {
   if (mode < 0)
     memset (tabs, 0, ncol);
   else if (screen.cur.col < ncol)
   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];
 /* ------------------------------------------------------------------------- */
 /*
  * Report current cursor position
  * XTERM_SEQ: Report position: ESC [ 6 n
  */
-void
+void ecb_cold
 rxvt_term::scr_report_position () NOTHROW
 {
   tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
 }
  * ------------------------------------------------------------------------- */
 /*
  * Set font style
  */
-void
+void ecb_cold
 rxvt_term::set_font_style () NOTHROW
 {
 #if 0
   switch (charsets [screen.charset])
     {
  * XTERM_SEQ: Invoke G0 character set: CTRL-O
  * XTERM_SEQ: Invoke G1 character set: CTRL-N
  * XTERM_SEQ: Invoke G2 character set: ESC N
  * XTERM_SEQ: Invoke G3 character set: ESC O
  */
-void
+void ecb_cold
 rxvt_term::scr_charset_choose (int set) NOTHROW
 {
   screen.charset = set;
   set_font_style ();
 }
  * ------------------------------------------------------------------------- */
 /*
  * refresh matching text.
  */
-bool
+bool ecb_cold
 rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
 {
   bool found = false;
   for (int i = 0; i < nrow; i++)
   PART_BEG = 0,
   PART_END,
   RC_COUNT
 };
-void
+void ecb_hot
 rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
 {
   int i;
   row_col_t rc[RC_COUNT];
   HOOK_INVOKE ((this, HOOK_BELL, DT_END));
 #endif
 }
 /* ------------------------------------------------------------------------- */
-void
+void ecb_cold
 rxvt_term::scr_printscreen (int fullhist) NOTHROW
 {
 #ifdef PRINTPIPE
   int nrows, row_start;
   FILE *fd = popen_printer ();
 /*
  * Refresh the screen
  * drawn_text/drawn_rend contain the screen information before the update.
  * screen.text/screen.rend contain what the screen will change to.
  */
-void
+void ecb_hot
 rxvt_term::scr_refresh () NOTHROW
 {
   int16_t col, row,   /* column/row we're processing               */
           ocrow;      /* old cursor row                            */
   int i;              /* tmp                                       */
    */
   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
   screen.flags = old_screen_flags;
   num_scr = 0;
   num_scr_allow = 1;
 }
-void
+void ecb_cold
 rxvt_term::scr_remap_chars (line_t &l) NOTHROW
 {
   if (!l.valid ())
     return;
   for (int i = ncol; i--; )
     l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
 }
-void
+void ecb_cold
 rxvt_term::scr_remap_chars () NOTHROW
 {
   for (int i = total_rows; i--; )
     scr_remap_chars (row_buf [i]);
       scr_remap_chars (drawn_buf [i]);
       scr_remap_chars (swap_buf [i]);
     }
 }
-void
+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)
     for (rend_t *srp = ROW(row).r; col < end_col; col++)
       srp[col] ^= rstyle;
 }
 /* ------------------------------------------------------------------------- */
-void
+void ecb_hot
 rxvt_term::scr_reverse_selection () NOTHROW
 {
   if (selection.op
       && current_screen == selection.screen
       && selection.end.row >= view_start)
 /* ------------------------------------------------------------------------- */
 /*
  * Mark or select text based upon number of clicks: 1, 2, or 3
  * EXT: button 1 press
  */
-void
+void ecb_cold
 rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
 {
   clicks = ((clicks - 1) % 3) + 1;
   selection.clicks = clicks;       /* save clicks so extend will work */
 /* ------------------------------------------------------------------------- */
 /*
  * Mark a selection at the specified col/row
  */
-void
+void ecb_cold
 rxvt_term::selection_start_colrow (int col, int row) NOTHROW
 {
   want_refresh = 1;
   selection.mark.row = row + view_start;
 /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
 #define DELIMIT_TEXT(x) 		\
     (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
 #define DELIMIT_REND(x)        1
-void
+void ecb_cold
 rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
 {
   int col, row, dirnadd, tcol, trow, w1, w2;
   row_col_t bound;
   text_t *stp;
  * EXT: button 3 press; button 1 or 3 drag
  * flag == 0 ==> button 1
  * flag == 1 ==> button 3 press
  * flag == 2 ==> button 3 motion
  */
-void
+void ecb_cold
 rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
 {
   int col = clamp (Pixel2Col (x), 0, ncol);
   int row = clamp (Pixel2Row (y), 0, nrow - 1);
 /* ------------------------------------------------------------------------- */
 /*
  * Extend the selection to the specified col/row
  */
-void
+void ecb_cold
 rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
 {
   row_col_t pos;
   enum {
     LEFT, RIGHT
     ::swap (selection.beg.col, selection.end.col);
 #endif
 }
 #if !ENABLE_MINIMAL
-void
+void ecb_cold
 rxvt_term::selection_remove_trailing_spaces () NOTHROW
 {
   int32_t end_col, end_row;
   text_t *stp;
 /* ------------------------------------------------------------------------- */
 /*
  * Double click on button 3 when already selected
  * EXT: button 3 double click
  */
-void
+void ecb_cold
 rxvt_term::selection_rotate (int x, int y) NOTHROW
 {
   selection.clicks = selection.clicks % 3 + 1;
   selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Respond to a request for our current selection
  * EXT: SelectionRequest
  */
-void
+void ecb_cold
 rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
 {
   Atom property = rq.property == None ? rq.target : rq.property;
   XSelectionEvent ev;
   XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
 }
 /* ------------------------------------------------------------------------- */
-#ifdef USE_XIM
+#if USE_XIM
-void
+void ecb_cold
 rxvt_term::im_set_position (XPoint &pos) NOTHROW
 {
   XWindowAttributes xwa;
   XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.416 by root, Mon May 28 14:26:11 2012 UTC vs. Revision 1.431 by root, Sun Jan 13 20:19:24 2013 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.416 by root, Mon May 28 14:26:11 2012 UTC vs.
Revision 1.431 by root, Sun Jan 13 20:19:24 2013 UTC