… | |
… | |
145 | /* Fill a full line with blanks - make sure it is allocated first */ |
145 | /* Fill a full line with blanks - make sure it is allocated first */ |
146 | void |
146 | void |
147 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
147 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
148 | { |
148 | { |
149 | scr_blank_line (l, 0, ncol, efs); |
149 | scr_blank_line (l, 0, ncol, efs); |
|
|
150 | |
|
|
151 | l.l = 0; |
|
|
152 | l.f = 0; |
150 | } |
153 | } |
151 | |
154 | |
152 | /* ------------------------------------------------------------------------- * |
155 | /* ------------------------------------------------------------------------- * |
153 | * SCREEN INITIALISATION * |
156 | * SCREEN INITIALISATION * |
154 | * ------------------------------------------------------------------------- */ |
157 | * ------------------------------------------------------------------------- */ |
… | |
… | |
191 | |
194 | |
192 | if (!row_buf) |
195 | if (!row_buf) |
193 | { |
196 | { |
194 | /* |
197 | /* |
195 | * first time called so just malloc everything: don't rely on realloc |
198 | * first time called so just malloc everything: don't rely on realloc |
196 | * Note: this is still needed so that all the scrollback lines are NULL |
|
|
197 | */ |
199 | */ |
198 | nsaved = 0; /* no saved lines */ |
200 | nsaved = 0; /* no saved lines */ |
199 | term_start = 0; |
201 | term_start = 0; |
200 | |
202 | |
201 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
202 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
203 | |
205 | |
204 | row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
206 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
205 | temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
206 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
207 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
207 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
208 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
208 | |
209 | |
209 | for (int row = nrow; row--; ) |
210 | for (int row = nrow; row--; ) |
210 | { |
211 | { |
211 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
212 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
212 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
213 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
… | |
… | |
257 | } |
258 | } |
258 | } |
259 | } |
259 | #endif |
260 | #endif |
260 | |
261 | |
261 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
262 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
262 | temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t)); |
|
|
263 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
263 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
264 | |
264 | |
265 | for (int row = min (nrow, prev_nrow); row--; ) |
265 | for (int row = min (nrow, prev_nrow); row--; ) |
266 | { |
266 | { |
267 | lresize (drawn_buf[row]); |
267 | lresize (drawn_buf[row]); |
… | |
… | |
272 | { |
272 | { |
273 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
273 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
274 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
274 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
275 | } |
275 | } |
276 | |
276 | |
|
|
277 | line_t *old_buf = row_buf; |
277 | line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
278 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
278 | |
279 | |
279 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
280 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
280 | int pend = MOD (term_start - nsaved , prev_total_rows); |
281 | int pend = MOD (term_start - nsaved , prev_total_rows); |
281 | int q = total_rows; // rewrapped row |
282 | int q = total_rows; // rewrapped row |
282 | |
283 | |
… | |
… | |
430 | delete ralloc; ralloc = 0; |
431 | delete ralloc; ralloc = 0; |
431 | |
432 | |
432 | free (row_buf); |
433 | free (row_buf); |
433 | free (swap_buf); |
434 | free (swap_buf); |
434 | free (drawn_buf); |
435 | free (drawn_buf); |
435 | free (temp_buf); |
|
|
436 | free (tabs); |
436 | free (tabs); |
437 | |
437 | |
438 | row_buf = 0; // signal that we freed all the arrays |
438 | row_buf = 0; // signal that we freed all the arrays |
439 | } |
439 | } |
440 | |
440 | |
… | |
… | |
639 | } |
639 | } |
640 | } |
640 | } |
641 | |
641 | |
642 | for (int i = count; i--; ) |
642 | for (int i = count; i--; ) |
643 | { |
643 | { |
644 | ROW(row2 - i).l = 0; |
644 | // basically thi is a slightly optimized scr_blank_screen_mem |
645 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
645 | // it is worth the effort on slower machines |
|
|
646 | line_t &l = ROW(row2 - i); |
|
|
647 | |
|
|
648 | scr_blank_line (l, 0, l.l, rstyle); |
|
|
649 | |
|
|
650 | l.l = 0; |
|
|
651 | l.f = 0; |
646 | } |
652 | } |
647 | |
653 | |
648 | if (OPTION (Opt_scrollWithBuffer) |
654 | if (OPTION (Opt_scrollWithBuffer) |
649 | && view_start != 0 |
655 | && view_start != 0 |
650 | && view_start != saveLines) |
656 | && view_start != saveLines) |
… | |
… | |
679 | // part of scr_scroll_text is not time-critical. |
685 | // part of scr_scroll_text is not time-critical. |
680 | |
686 | |
681 | int rows = row2 - row1 + 1; |
687 | int rows = row2 - row1 + 1; |
682 | |
688 | |
683 | min_it (count, rows); |
689 | min_it (count, rows); |
|
|
690 | |
|
|
691 | line_t *temp_buf = row_buf + total_rows; |
684 | |
692 | |
685 | for (int row = 0; row < rows; row++) |
693 | for (int row = 0; row < rows; row++) |
686 | { |
694 | { |
687 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
695 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
688 | |
696 | |
… | |
… | |
1303 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1311 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1304 | } |
1312 | } |
1305 | |
1313 | |
1306 | for (; num--; row++) |
1314 | for (; num--; row++) |
1307 | { |
1315 | { |
1308 | line_t &l = ROW(row); |
|
|
1309 | l.l = 0; |
|
|
1310 | l.is_longer (0); |
|
|
1311 | scr_blank_screen_mem (l, rstyle); |
1316 | scr_blank_screen_mem (ROW(row), rstyle); |
1312 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1317 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1313 | } |
1318 | } |
1314 | } |
1319 | } |
1315 | |
1320 | |
1316 | #if ENABLE_FRILLS |
1321 | #if ENABLE_FRILLS |
… | |
… | |
2388 | rxvt_term::scr_remap_chars (line_t &l) |
2393 | rxvt_term::scr_remap_chars (line_t &l) |
2389 | { |
2394 | { |
2390 | if (!l.t) |
2395 | if (!l.t) |
2391 | return; |
2396 | return; |
2392 | |
2397 | |
2393 | l.touch (); // maybe a bit of an overkill, but its not performance-relevant |
2398 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2394 | |
2399 | |
2395 | for (int i = ncol; i--; ) |
2400 | for (int i = ncol; i--; ) |
2396 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2401 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2397 | } |
2402 | } |
2398 | |
2403 | |