ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.171 by root, Fri Dec 16 13:05:49 2005 UTC vs.
Revision 1.204 by root, Mon Jan 2 15:35:43 2006 UTC

… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 TermWin.view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
57 selection.beg.row = selection.beg.col \ 58 selection.beg.row = selection.beg.col \
… …
88/* 89/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92 */ 93 */
93#define drawBuffer TermWin.vt 94#define drawBuffer vt
94 95
95#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
96 if (TermWin.mapped) \ 97 if (mapped) \
97 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (display->display, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)TermWin.width, \ 99 Row2Pixel (row), (unsigned int)width, \
99 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
100 101
101#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
102 if (TermWin.mapped) \ 103 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (display->display, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
106 107
107#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 109 XFillRectangle (display->display, drawBuffer, gc, \
109 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
110 (unsigned int)TermWin.width, \ 111 (unsigned int)width, \
111 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
112 113
113/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
116 117
117/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
118void 119void
119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
120{ 121{
122 if (!l.t)
123 {
124 lalloc (l);
125 col = 0;
126 width = ncol;
127 }
128
121 efs &= ~RS_baseattrMask; 129 efs &= ~RS_baseattrMask;
122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123 131
132 text_t *et = l.t + col;
133 rend_t *er = l.r + col;
134
124 while (width--) 135 while (width--)
125 { 136 {
126 *et++ = ' '; 137 *et++ = ' ';
127 *er++ = efs; 138 *er++ = efs;
128 } 139 }
129} 140}
130 141
131/* ------------------------------------------------------------------------- */ 142/* ------------------------------------------------------------------------- */
132/* Fill a full line with blanks - make sure it is allocated first */ 143/* Fill a full line with blanks - make sure it is allocated first */
133void 144void
134rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 145rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
135{ 146{
136#ifdef DEBUG_STRICT 147 scr_blank_line (l, 0, ncol, efs);
137 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
138#endif
139 if (tp[row] == NULL)
140 {
141 tp[row] = (text_t *)talloc->alloc ();
142 rp[row] = (rend_t *)ralloc->alloc ();
143 }
144
145 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs);
146} 148}
147 149
148/* ------------------------------------------------------------------------- * 150/* ------------------------------------------------------------------------- *
149 * SCREEN INITIALISATION * 151 * SCREEN INITIALISATION *
150 * ------------------------------------------------------------------------- */ 152 * ------------------------------------------------------------------------- */
153
151void 154void
152rxvt_term::scr_reset () 155rxvt_term::scr_reset ()
153{ 156{
154 unsigned int ncol, nrow, total_rows, prev_total_rows;
155 unsigned int p, q;
156 int k;
157 rend_t setrstyle;
158
159#if ENABLE_OVERLAY 157#if ENABLE_OVERLAY
160 scr_overlay_off (); 158 scr_overlay_off ();
161#endif 159#endif
162 160
163 TermWin.view_start = 0; 161 view_start = 0;
164 num_scr = 0; 162 num_scr = 0;
165 163
166 if (TermWin.ncol == 0) 164 if (ncol == 0)
167 TermWin.ncol = 80; 165 ncol = 80;
168 166
169 if (TermWin.nrow == 0) 167 if (nrow == 0)
170 TermWin.nrow = 24; 168 nrow = 24;
171
172 ncol = TermWin.ncol;
173 nrow = TermWin.nrow;
174 169
175 if (ncol == prev_ncol && nrow == prev_nrow) 170 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 171 return;
177 172
178 // we need at least two lines for wrapping to work correctly 173 // we need at least two lines for wrapping to work correctly
179 if (nrow + TermWin.saveLines < 2) 174 if (nrow + saveLines < 2)
180 { 175 {
176 //TODO//FIXME
181 TermWin.saveLines++; 177 saveLines++;
182 prev_nrow--; 178 prev_nrow--;
183 TermWin.nscrolled++; 179 nsaved++;
184 } 180 }
185 181
186 want_refresh = 1; 182 want_refresh = 1;
187 183
188 prev_total_rows = prev_nrow + TermWin.saveLines; 184 int prev_total_rows = prev_nrow + saveLines;
189 total_rows = nrow + TermWin.saveLines; 185 total_rows = nrow + saveLines;
190 186
191 screen.tscroll = 0; 187 screen.tscroll = 0;
192 screen.bscroll = nrow - 1; 188 screen.bscroll = nrow - 1;
193 189
194 if (!talloc) 190 if (!row_buf)
195 {
196 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 }
199
200 if (!screen.text)
201 { 191 {
202 /* 192 /*
203 * first time called so just malloc everything: don't rely on realloc 193 * first time called so just malloc everything: don't rely on realloc
204 * Note: this is still needed so that all the scrollback lines are NULL 194 * Note: this is still needed so that all the scrollback lines are NULL
205 */ 195 */
196 nsaved = 0; /* no saved lines */
197 term_start = 0;
198
199 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201
202 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 203 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
210
211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); 205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
213 206
214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 207 for (int row = nrow; row--; )
215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218
219 for (p = 0; p < nrow; p++)
220 { 208 {
221 q = p + TermWin.saveLines;
222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
224 screen.tlen[q] = swap.tlen[p] = 0;
225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 211 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
226 } 212 }
227 213
228 memset (charsets, 'B', sizeof (charsets)); 214 memset (charsets, 'B', sizeof (charsets));
229 TermWin.nscrolled = 0; /* no saved lines */
230 rstyle = DEFAULT_RSTYLE; 215 rstyle = DEFAULT_RSTYLE;
231 screen.flags = Screen_DefaultFlags; 216 screen.flags = Screen_DefaultFlags;
232 screen.cur.row = screen.cur.col = 0; 217 screen.cur.row = screen.cur.col = 0;
233 screen.charset = 0; 218 screen.charset = 0;
234 current_screen = PRIMARY; 219 current_screen = PRIMARY;
… …
254 else 239 else
255 { 240 {
256 /* 241 /*
257 * add or delete rows as appropriate 242 * add or delete rows as appropriate
258 */ 243 */
259 setrstyle = DEFAULT_RSTYLE;
260 244
245 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
246 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
247
248#if 0
261 if (nrow < prev_nrow) 249 if (nrow < prev_nrow)
262 { 250 {
263 /* delete rows */
264 k = min (TermWin.nscrolled, prev_nrow - nrow);
265 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
266 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
267
268 for (p = nrow; p < prev_nrow; p++) 251 for (int row = nrow; row < prev_nrow; row++)
269 { 252 {
270 q = p + TermWin.saveLines; 253 lfree (swap_buf [row]);
254 lfree (drawn_buf[row]);
255 }
256 }
257#endif
271 258
272 if (screen.text[q]) 259 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
260 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262
263 for (int row = min (nrow, prev_nrow); row--; )
264 {
265 lresize (drawn_buf[row]);
266 lresize (swap_buf [row]);
267 }
268
269 for (int row = prev_nrow; row < nrow; row++)
270 {
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 }
274
275 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
276
277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start - nsaved , prev_total_rows);
279 int q = total_rows; // rewrapped row
280
281 if (nsaved)
282 {
283 // re-wrap lines, this is rather ugly, possibly because I am too dumb
284 // to come up with a lean and mean algorithm.
285
286 row_col_t ocur = screen.cur;
287 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
288
289 do
290 {
291 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t);
294#endif
295
296 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l;
298
299 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
273 { 300 {
274#ifdef DEBUG_STRICT 301 p = MOD (p - 1, prev_total_rows);
275 assert (screen.rend[q]); 302
276#endif 303 plines++;
277 talloc->free (screen.text[q]); 304 llen += prev_ncol;
278 ralloc->free (screen.rend[q]);
279 } 305 }
280 306
281 if (swap.text[p]) 307 int qlines = max (0, (llen - 1) / ncol) + 1;
308
309 // drop partial lines completely
310 if (q < qlines)
311 break;
312
313 q -= qlines;
314
315 int lofs = 0;
316 line_t *qline;
317
318 // re-assemble the full line by destination lines
319 for (int qrow = q; qlines--; qrow++)
282 { 320 {
283#ifdef DEBUG_STRICT 321 qline = row_buf + qrow;
322 lalloc (*qline);
323 qline->set_is_longer ();
324
325 int qcol = 0;
326
327 // fill a single destination line
328 while (lofs < llen && qcol < ncol)
329 {
330 int prow = lofs / prev_ncol;
331 int pcol = lofs % prev_ncol;
332
333 prow = MOD (p + prow, prev_total_rows);
334
335 // we only adjust the cursor _row_ and put it into
336 // the topmost line of "long line" it was in, as
337 // this seems to upset applications/shells/readline
338 // least.
339 if (prow == ocur.row)
340 screen.cur.row = q - (total_rows - nrow);
341
342 line_t &pline = old_buf [prow];
343
344 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
345
284 assert (swap.rend[p]); 346 assert (len);
285#endif 347 assert (pline.t);
286 talloc->free (swap.text[p]); 348
287 ralloc->free (swap.rend[p]); 349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
351
352 lofs += len;
353 qcol += len;
354 }
288 } 355 }
289 356
290#ifdef DEBUG_STRICT 357 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
291 assert (drawn_text[p] && drawn_rend[p]); 358#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY
359 if (qline->l < 0)
360 {
361 fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
362 qline->l = 0;
363 }
292#endif 364#endif
293 talloc->free (drawn_text[p]); 365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
294 ralloc->free (drawn_rend[p]);
295 } 366 }
367 while (p != pend && q > 0);
296 368
297 /* we have fewer rows so fix up cursor position */ 369 term_start = total_rows - nrow;
298 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 370 nsaved = term_start - q;
371
372 // make sure all terminal lines exist
373 while (nsaved < 0)
374 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
299 375
300 scr_reset_realloc (); /* realloc _last_ */
301 }
302 else if (nrow > prev_nrow)
303 { 376 }
304 /* add rows */ 377 else
305 scr_reset_realloc (); /* realloc _first_ */ 378 {
306 379 // if no scrollback exists (yet), wing, instead of wrap
307 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 380
308 381 for (int row = min (nrow, prev_nrow); row--; )
309 k = min (TermWin.nscrolled, nrow - prev_nrow);
310
311 for (p = prev_total_rows; p < total_rows; p++)
312 { 382 {
313 screen.tlen[p] = 0; 383 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
314 screen.text[p] = NULL; 384 line_t &qline = row_buf [row];
315 screen.rend[p] = NULL; 385
386 qline = pline;
387 lresize (qline);
316 } 388 }
317 389
318 for (p = prev_total_rows; p < total_rows - k; p++)
319 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle);
320
321 for (p = prev_nrow; p < nrow; p++) 390 for (int row = prev_nrow; row < nrow; row++)
322 { 391 {
323 swap.tlen[p] = 0; 392 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
324 swap.text[p] = NULL;
325 swap.rend[p] = NULL;
326 drawn_text[p] = NULL;
327 drawn_rend[p] = NULL;
328 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
329 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
330 } 393 }
331 394
332 if (k > 0) 395 term_start = 0;
333 {
334 scr_scroll_text (0, (int)nrow - 1, -k, 1);
335 screen.cur.row += k;
336 screen.s_cur.row += k;
337 TermWin.nscrolled -= k;
338 }
339
340#ifdef DEBUG_STRICT
341 assert (screen.cur.row < TermWin.nrow);
342#else /* drive with your eyes closed */
343 MIN_IT (screen.cur.row, nrow - 1);
344#endif
345 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
346 }
347
348 /* resize columns */
349 if (ncol != prev_ncol)
350 { 396 }
351 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
352 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
353 397
354 for (p = 0; p < total_rows; p++) 398#ifdef DEBUG_STRICT //TODO: remove
355 { 399 for (int i = -nsaved; i < nrow; i++)
356 if (screen.text[p]) 400 assert (ROW (i).t);
357 { 401#endif
358 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t));
359 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
360 402
361 MIN_IT (screen.tlen[p], (int16_t)ncol); 403 free (old_buf);
404 delete old_ta;
405 delete old_ra;
362 406
363 if (ncol > prev_ncol) 407 clamp_it (screen.cur.row, 0, nrow - 1);
364 scr_blank_line (&screen.text[p][prev_ncol], 408 clamp_it (screen.cur.col, 0, ncol - 1);
365 &screen.rend[p][prev_ncol],
366 ncol - prev_ncol, setrstyle);
367 }
368 }
369
370 for (p = 0; p < nrow; p++)
371 {
372 drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
373 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
374
375 if (ncol > prev_ncol)
376 scr_blank_line (&drawn_text[p][prev_ncol],
377 &drawn_rend[p][prev_ncol],
378 ncol - prev_ncol, setrstyle);
379
380 if (swap.text[p])
381 {
382 swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
383 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
384
385 MIN_IT (swap.tlen[p], (int16_t)ncol);
386
387 if (ncol > prev_ncol)
388 scr_blank_line (&swap.text[p][prev_ncol],
389 &swap.rend[p][prev_ncol],
390 ncol - prev_ncol, setrstyle);
391 }
392
393 }
394
395 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
396
397 delete talloc; talloc = ta;
398 delete ralloc; ralloc = ra;
399 }
400 409
401 if (tabs) 410 if (tabs)
402 free (tabs); 411 free (tabs);
403 } 412 }
404 413
405 prev_nrow = nrow; 414 prev_nrow = nrow;
406 prev_ncol = ncol; 415 prev_ncol = ncol;
407 416
408 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 417 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
409 418
410 for (p = 0; p < ncol; p++) 419 for (int col = ncol; col--; )
411 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 420 tabs [col] = col % TABSIZE == 0;
412 421
413 tt_winch (); 422 tt_winch ();
414}
415 423
416void 424 PERL_INVOKE ((this, HOOK_RESET, DT_END));
417rxvt_term::scr_reset_realloc ()
418{
419 unsigned int total_rows, nrow;
420
421 nrow = TermWin.nrow;
422 total_rows = nrow + TermWin.saveLines;
423 /* *INDENT-OFF* */
424 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
425 buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
426 drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
427 swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *));
428
429 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t));
430 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t));
431
432 screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
433 buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
434 drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
435 swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
436 /* *INDENT-ON* */
437} 425}
438 426
439/* ------------------------------------------------------------------------- */ 427/* ------------------------------------------------------------------------- */
440/* 428/*
441 * Free everything. That way malloc debugging can find leakage. 429 * Free everything. That way malloc debugging can find leakage.
442 */ 430 */
443void 431void
444rxvt_term::scr_release () 432rxvt_term::scr_release ()
445{ 433{
446 unsigned int total_rows;
447
448 total_rows = TermWin.nrow + TermWin.saveLines;
449
450 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
451 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
452 436
453 free (screen.text); 437 free (row_buf);
454 free (screen.tlen); 438 free (swap_buf);
455 free (screen.rend);
456 free (drawn_text); 439 free (drawn_buf);
457 free (drawn_rend); 440 free (temp_buf);
458 free (swap.text);
459 free (swap.tlen);
460 free (swap.rend);
461 free (buf_text);
462 free (buf_rend);
463 free (tabs); 441 free (tabs);
464 442
465 /* NULL these so if anything tries to use them, we'll know about it */ 443 row_buf = 0; // signal that we freed all the arrays
466 screen.text = drawn_text = swap.text = NULL;
467 screen.rend = drawn_rend = swap.rend = NULL;
468 screen.tlen = swap.tlen = NULL;
469 buf_text = NULL;
470 buf_rend = NULL;
471 tabs = NULL;
472} 444}
473 445
474/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
475/* 447/*
476 * Hard reset 448 * Hard reset
… …
527 set_font_style (); 499 set_font_style ();
528 break; 500 break;
529 } 501 }
530 502
531 /* boundary check in case screen size changed between SAVE and RESTORE */ 503 /* boundary check in case screen size changed between SAVE and RESTORE */
532 MIN_IT (s->cur.row, TermWin.nrow - 1); 504 min_it (s->cur.row, nrow - 1);
533 MIN_IT (s->cur.col, TermWin.ncol - 1); 505 min_it (s->cur.col, ncol - 1);
534#ifdef DEBUG_STRICT 506#ifdef DEBUG_STRICT
535 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
536 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
537#else /* drive with your eyes closed */
538 MAX_IT (s->cur.row, 0);
539 MAX_IT (s->cur.col, 0);
540#endif 509#endif
541} 510}
542 511
543/* ------------------------------------------------------------------------- */ 512/* ------------------------------------------------------------------------- */
544/* 513/*
… …
547 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 516 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
548 */ 517 */
549int 518int
550rxvt_term::scr_change_screen (int scrn) 519rxvt_term::scr_change_screen (int scrn)
551{ 520{
552 int i;
553#if NSCREENS
554 int offset;
555#endif
556
557 want_refresh = 1; 521 want_refresh = 1;
558
559 TermWin.view_start = 0; 522 view_start = 0;
560 523
561 if (current_screen == scrn) 524 if (current_screen == scrn)
562 return scrn; 525 return scrn;
563 526
564 selection_check (2); /* check for boundary cross */ 527 selection_check (2); /* check for boundary cross */
565 528
566 i = current_screen; current_screen = scrn; scrn = i; 529 int i = current_screen; current_screen = scrn; scrn = i;
567 530
568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 531 ::swap (screen.cur.row, swap.cur.row);
569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 532 ::swap (screen.cur.col, swap.cur.col);
570 MAX_IT (screen.cur.row, 0); 533
571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 534 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
572 MAX_IT (screen.cur.col, 0); 535 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
574 536
575#if NSCREENS 537#if NSCREENS
576 if (options & Opt_secondaryScreen) 538 if (OPTION (Opt_secondaryScreen))
577 { 539 {
578 num_scr = 0; 540 num_scr = 0;
579 offset = TermWin.saveLines;
580 541
581 for (i = prev_nrow; i--;) 542 for (int i = prev_nrow; i--; )
582 { 543 ::swap (ROW(i), swap_buf [i]);
583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
586 }
587 544
588 SWAP_IT (screen.charset, swap.charset, int16_t); 545 ::swap (screen.charset, swap.charset);
589 SWAP_IT (screen.flags, swap.flags, int); 546 ::swap (screen.flags, swap.flags);
590 screen.flags |= Screen_VisibleCursor; 547 screen.flags |= Screen_VisibleCursor;
591 swap.flags |= Screen_VisibleCursor; 548 swap.flags |= Screen_VisibleCursor;
592 } 549 }
593 else 550 else
594#endif 551#endif
595 if (options & Opt_secondaryScroll) 552 if (OPTION (Opt_secondaryScroll))
596 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 553 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
597 554
598 return scrn; 555 return scrn;
599} 556}
600 557
601// clear WrapNext indicator, solidifying position on next line 558// clear WrapNext indicator, solidifying position on next line
… …
608 screen.flags &= ~Screen_WrapNext; 565 screen.flags &= ~Screen_WrapNext;
609 566
610 screen.cur.col = 0; 567 screen.cur.col = 0;
611 568
612 if (screen.cur.row == screen.bscroll) 569 if (screen.cur.row == screen.bscroll)
613 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 570 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
614 else if (screen.cur.row < TermWin.nrow - 1) 571 else if (screen.cur.row < nrow - 1)
615 screen.cur.row++; 572 screen.cur.row++;
616} 573}
617 574
618/* ------------------------------------------------------------------------- */ 575/* ------------------------------------------------------------------------- */
619/* 576/*
… …
649/* ------------------------------------------------------------------------- */ 606/* ------------------------------------------------------------------------- */
650/* 607/*
651 * Scroll text between <row1> and <row2> inclusive, by <count> lines 608 * Scroll text between <row1> and <row2> inclusive, by <count> lines
652 * count positive ==> scroll up 609 * count positive ==> scroll up
653 * count negative ==> scroll down 610 * count negative ==> scroll down
654 * spec == 0 for normal routines
655 */ 611 */
656int 612int
657rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 613rxvt_term::scr_scroll_text (int row1, int row2, int count)
658{ 614{
659 int i, j;
660 long nscrolled;
661
662 if (count == 0 || (row1 > row2)) 615 if (count == 0 || (row1 > row2))
663 return 0; 616 return 0;
664 617
665 want_refresh = 1; 618 want_refresh = 1;
619 num_scr += count;
666 620
667 if (row1 == 0 && count > 0 621 if (count > 0
622 && row1 == 0
623 && row2 == nrow - 1
668 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 624 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
669 {
670 nscrolled = (long)TermWin.nscrolled + (long)count;
671
672 if (nscrolled > (long)TermWin.saveLines)
673 TermWin.nscrolled = TermWin.saveLines;
674 else
675 TermWin.nscrolled = (unsigned int)nscrolled;
676
677 if ((options & Opt_scrollWithBuffer)
678 && TermWin.view_start != 0
679 && TermWin.view_start != TermWin.saveLines)
680 scr_page (UP, count);
681 } 625 {
682 else if (!spec) 626 nsaved = min (nsaved + count, saveLines);
683 row1 += TermWin.saveLines;
684 627
685 row2 += TermWin.saveLines; 628 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
629
630 term_start = (term_start + count) % total_rows;
686 631
687 if (selection.op && current_screen == selection.screen) 632 if (selection.op && current_screen == selection.screen)
688 {
689 i = selection.beg.row + TermWin.saveLines;
690 j = selection.end.row + TermWin.saveLines;
691 if ((i < row1 && j > row1)
692 || (i < row2 && j > row2)
693 || (i - count < row1 && i >= row1)
694 || (i - count > row2 && i <= row2)
695 || (j - count < row1 && j >= row1)
696 || (j - count > row2 && j <= row2))
697 {
698 CLEAR_ALL_SELECTION ();
699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
700 } 633 {
701 else if (j >= row1 && j <= row2)
702 {
703 /* move selected region too */
704 selection.beg.row -= count; 634 selection.beg.row -= count;
705 selection.end.row -= count; 635 selection.end.row -= count;
706 selection.mark.row -= count; 636 selection.mark.row -= count;
637
638 if (selection.beg.row < -nsaved
639 || selection.end.row < -nsaved
640 || selection.mark.row < -nsaved)
641 {
642 CLEAR_ALL_SELECTION ();
643 selection.op = SELECTION_CLEAR;
707 } 644 }
708 }
709
710 selection_check (0); /* _after_ TermWin.nscrolled update */
711
712 num_scr += count;
713 j = count;
714
715 if (count < 0)
716 count = -count;
717
718 i = row2 - row1 + 1;
719 MIN_IT (count, i);
720
721 if (j > 0)
722 {
723 /* scroll up */
724
725 /* Copy lines that will get clobbered by the rotation */
726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
728
729 /* Rotate lines */
730 i = row2 - row1 - count + 1;
731 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
732 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
733 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
734
735 j = row2 - count + 1, i = count;
736 }
737 else /* if (j < 0) */
738 {
739 /* scroll down */
740
741 /* Copy lines that will get clobbered by the rotation */
742 for (i = 0, j = row2; i < count; i++, j--)
743 { 645 }
744 buf_text[i] = screen.text[j]; 646
745 buf_rend[i] = screen.rend[j]; 647 for (int i = count; i--; )
746 } 648 {
747 649 ROW(row2 - i).l = 0;
748 /* Rotate lines */ 650 scr_blank_screen_mem (ROW(row2 - i), rstyle);
749 for (j = row2, i = j - count; i >= row1; i--, j--)
750 { 651 }
751 screen.tlen[j] = screen.tlen[i]; 652
752 screen.text[j] = screen.text[i]; 653 if (OPTION (Opt_scrollWithBuffer)
753 screen.rend[j] = screen.rend[i]; 654 && view_start != 0
655 && view_start != saveLines)
656 scr_page (UP, count);
657 }
658 else
659 {
660 if (selection.op && current_screen == selection.screen)
754 } 661 {
662 if ((selection.beg.row < row1 && selection.end.row > row1)
663 || (selection.beg.row < row2 && selection.end.row > row2)
664 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
665 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
666 || (selection.end.row - count < row1 && selection.end.row >= row1)
667 || (selection.end.row - count > row2 && selection.end.row <= row2))
668 {
669 CLEAR_ALL_SELECTION ();
670 selection.op = SELECTION_CLEAR;
671 }
672 else if (selection.end.row >= row1 && selection.end.row <= row2)
673 {
674 /* move selected region too */
675 selection.beg.row -= count;
676 selection.end.row -= count;
677 selection.mark.row -= count;
678
679 selection_check (0);
680 }
681 }
755 682
756 j = row1, i = count; 683 // use a simple and robust scrolling algorithm, this
757 count = -count; 684 // part of scr_scroll_text is not time-critical.
758 }
759 685
760 /* Resurrect lines */ 686 int rows = row2 - row1 + 1;
761 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 687
762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 688 min_it (count, rows);
763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); 689
764 if (!spec) /* line length may not equal TermWin.ncol */ 690 for (int row = 0; row < rows; row++)
765 for (; i--; j++) 691 {
766 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); 692 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
693
694 if (!IN_RANGE_EXC (row + count, 0, rows))
695 scr_blank_screen_mem (temp_buf [row], rstyle);
696 }
697
698 for (int row = 0; row < rows; row++)
699 ROW(row1 + row) = temp_buf [row];
700 }
767 701
768 return count; 702 return count;
769} 703}
770 704
771/* ------------------------------------------------------------------------- */ 705/* ------------------------------------------------------------------------- */
… …
778 if (len <= 0) /* sanity */ 712 if (len <= 0) /* sanity */
779 return; 713 return;
780 714
781 unsigned char checksel; 715 unsigned char checksel;
782 unicode_t c; 716 unicode_t c;
783 int row, last_col; 717 int last_col;
784 text_t *stp;
785 rend_t *srp;
786 const unicode_t *strend = str + len; 718 const unicode_t *strend = str + len;
787 719
788 want_refresh = 1; 720 want_refresh = 1;
789 ZERO_SCROLLBACK (); 721 ZERO_SCROLLBACK ();
790 last_col = TermWin.ncol; 722 last_col = ncol;
791 723
792 if (nlines > 0) 724 if (nlines > 0)
793 { 725 {
794 nlines += screen.cur.row - screen.bscroll; 726 nlines += screen.cur.row - screen.bscroll;
795 if ((nlines > 0) 727 if (nlines > 0
796 && (screen.tscroll == 0) 728 && screen.tscroll == 0
797 && (screen.bscroll == (TermWin.nrow - 1))) 729 && screen.bscroll == (nrow - 1))
798 { 730 {
799 /* _at least_ this many lines need to be scrolled */ 731 /* _at least_ this many lines need to be scrolled */
800 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 732 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
801 screen.cur.row -= nlines; 733 screen.cur.row -= nlines;
802 } 734 }
803 } 735 }
804 736
805#ifdef DEBUG_STRICT 737#ifdef DEBUG_STRICT
806 assert (screen.cur.col < last_col); 738 assert (screen.cur.col < last_col);
807 assert ((screen.cur.row < TermWin.nrow) 739 assert (screen.cur.row < nrow
808 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 740 && screen.cur.row >= -nsaved);
809#else /* drive with your eyes closed */
810 MIN_IT (screen.cur.col, last_col - 1);
811 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
812 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
813#endif 741#endif
814 row = screen.cur.row + TermWin.saveLines; 742 int row = screen.cur.row;
815 743
816 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 744 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
817 745
818 stp = screen.text[row]; 746 line_t *line = &ROW(row);
819 srp = screen.rend[row];
820 747
821 while (str < strend) 748 while (str < strend)
822 { 749 {
823 c = *str++; 750 c = *str++;
824 751
825 if (c < 0x20) 752 if (c < 0x20)
826 if (c == C0_LF) 753 if (c == C0_LF)
827 { 754 {
828 if (screen.tlen[row] != -1) /* XXX: think about this */ 755 if (!line->is_longer ()) /* XXX: think about this */
829 MAX_IT (screen.tlen[row], screen.cur.col); 756 max_it (line->l, screen.cur.col);
830 757
831 screen.flags &= ~Screen_WrapNext; 758 screen.flags &= ~Screen_WrapNext;
832 759
833 if (screen.cur.row == screen.bscroll) 760 if (screen.cur.row == screen.bscroll)
834 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 761 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
835 else if (screen.cur.row < (TermWin.nrow - 1)) 762 else if (screen.cur.row < (nrow - 1))
836 row = (++screen.cur.row) + TermWin.saveLines; 763 row = ++screen.cur.row;
837 764
838 stp = screen.text[row]; /* _must_ refresh */ 765 line = &ROW(row); /* _must_ refresh */
839 srp = screen.rend[row]; /* _must_ refresh */
840 continue; 766 continue;
841 } 767 }
842 else if (c == C0_CR) 768 else if (c == C0_CR)
843 { 769 {
844 if (screen.tlen[row] != -1) /* XXX: think about this */ 770 if (!line->is_longer ()) /* XXX: think about this */
845 MAX_IT (screen.tlen[row], screen.cur.col); 771 max_it (line->l, screen.cur.col);
846 772
847 screen.flags &= ~Screen_WrapNext; 773 screen.flags &= ~Screen_WrapNext;
848 screen.cur.col = 0; 774 screen.cur.col = 0;
849 continue; 775 continue;
850 } 776 }
… …
867 CLEAR_SELECTION (); 793 CLEAR_SELECTION ();
868 } 794 }
869 795
870 if (screen.flags & Screen_WrapNext) 796 if (screen.flags & Screen_WrapNext)
871 { 797 {
872 screen.tlen[row] = -1; 798 line->set_is_longer ();
873 799
874 scr_do_wrap (); 800 scr_do_wrap ();
875 801
876 row = screen.cur.row + TermWin.saveLines; 802 row = screen.cur.row;
877 stp = screen.text[row]; /* _must_ refresh */ 803 line = &ROW(row); /* _must_ refresh */
878 srp = screen.rend[row]; /* _must_ refresh */
879 } 804 }
880 805
881 // some utf-8 decoders "decode" surrogate characters: let's fix this. 806 // some utf-8 decoders "decode" surrogate characters: let's fix this.
882 if (IN_RANGE (c, 0xd800, 0xdfff)) 807 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
883 c = 0xfffd; 808 c = 0xfffd;
884 809
885 // rely on wcwidth to tell us the character width, at least for non-latin1 810 // rely on wcwidth to tell us the character width, at least for non-latin1
886 // do wcwidth before further replacements, as wcwidth might return -1 811 // do wcwidth before further replacements, as wcwidth might return -1
887 // for the line drawing characters below as they might be invalid in the current 812 // for the line drawing characters below as they might be invalid in the current
… …
925 c = 0xfffd; 850 c = 0xfffd;
926# endif 851# endif
927#endif 852#endif
928 853
929 // nuke the character at this position, if required 854 // nuke the character at this position, if required
930 if (stp[screen.cur.col] == NOCHAR 855 if (line->t[screen.cur.col] == NOCHAR
931 || (screen.cur.col < TermWin.ncol - 1 856 || (screen.cur.col < ncol - 1
932 && stp[screen.cur.col + 1] == NOCHAR)) 857 && line->t[screen.cur.col + 1] == NOCHAR))
933 { 858 {
934 int col = screen.cur.col; 859 int col = screen.cur.col;
935 860
936 // find begin 861 // find begin
937 while (col > 0 && stp[col] == NOCHAR) 862 while (col > 0 && line->t[col] == NOCHAR)
938 col--; 863 col--;
939 864
940 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); 865 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
941 866
942 // found begin, nuke 867 // found begin, nuke
943 do { 868 do {
944 stp[col] = ' '; 869 line->t[col] = ' ';
945 srp[col] = rend; 870 line->r[col] = rend;
946 col++; 871 col++;
947 } while (col < TermWin.ncol && stp[col] == NOCHAR); 872 } while (col < ncol && line->t[col] == NOCHAR);
948 } 873 }
949 874
950 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 875 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
951 876
952 // if the character doesn't fit into the remaining columns... 877 // if the character doesn't fit into the remaining columns...
… …
958 --str; 883 --str;
959 } 884 }
960 885
961 do 886 do
962 { 887 {
963 stp[screen.cur.col] = c; 888 line->t[screen.cur.col] = c;
964 srp[screen.cur.col] = rend; 889 line->r[screen.cur.col] = rend;
965 890
966 if (screen.cur.col < last_col - 1) 891 if (screen.cur.col < last_col - 1)
967 screen.cur.col++; 892 screen.cur.col++;
968 else 893 else
969 { 894 {
970 screen.tlen[row] = last_col; 895 line->l = last_col;
971 if (screen.flags & Screen_Autowrap) 896 if (screen.flags & Screen_Autowrap)
972 screen.flags |= Screen_WrapNext; 897 screen.flags |= Screen_WrapNext;
973 break; 898 break;
974 } 899 }
975 900
… …
977 } 902 }
978 while (--width > 0); 903 while (--width > 0);
979 904
980 // pad with spaces when overwriting wide character with smaller one 905 // pad with spaces when overwriting wide character with smaller one
981 if (!width) 906 if (!width)
982 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 907 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)
983 { 908 {
984 stp[c] = ' '; 909 line->t[c] = ' ';
985 srp[c] = rend; 910 line->r[c] = rend;
986 } 911 }
987 } 912 }
988 else // width == 0 913 else // width == 0
989 { 914 {
990#if ENABLE_COMBINING 915#if ENABLE_COMBINING
… …
995 text_t *tp; 920 text_t *tp;
996 rend_t *rp; 921 rend_t *rp;
997 922
998 if (screen.cur.col > 0) 923 if (screen.cur.col > 0)
999 { 924 {
1000 tp = stp + screen.cur.col - 1; 925 tp = line->t + screen.cur.col - 1;
1001 rp = srp + screen.cur.col - 1; 926 rp = line->r + screen.cur.col - 1;
1002 927
1003 while (*tp == NOCHAR && tp > stp) 928 while (*tp == NOCHAR && tp > line->t)
1004 tp--, rp--; 929 tp--, rp--;
1005 } 930 }
1006 else if (screen.cur.row > 0 931 else if (screen.cur.row > 0
1007 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 932 && ROW(screen.cur.row - 1).is_longer ())
1008 { 933 {
1009 int line = screen.cur.row - 1 + TermWin.saveLines; 934 line_t *line = &ROW(screen.cur.row - 1);
1010 935
1011 tp = screen.text[line] + last_col - 1; 936 tp = line->t + last_col - 1;
1012 rp = screen.rend[line] + last_col - 1; 937 rp = line->r + last_col - 1;
1013 938
1014 while (*tp == NOCHAR && tp > screen.text[line]) 939 while (*tp == NOCHAR && tp > line->t)
1015 tp--, rp--; 940 tp--, rp--;
1016 } 941 }
1017 else 942 else
1018 continue; 943 continue;
1019 944
… …
1026 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1027#endif 952#endif
1028 } 953 }
1029 } 954 }
1030 955
1031 if (screen.tlen[row] != -1) /* XXX: think about this */ 956 if (!line->is_longer ()) /* XXX: think about this */
1032 MAX_IT (screen.tlen[row], screen.cur.col); 957 max_it (line->l, screen.cur.col);
1033 958
1034#ifdef DEBUG_STRICT 959#ifdef DEBUG_STRICT
1035 assert (screen.cur.row >= 0); 960 assert (screen.cur.row >= 0);
1036#else /* drive with your eyes closed */
1037 MAX_IT (screen.cur.row, 0);
1038#endif 961#endif
1039} 962}
1040 963
1041/* ------------------------------------------------------------------------- */ 964/* ------------------------------------------------------------------------- */
1042/* 965/*
… …
1051 if (screen.cur.col == 0) 974 if (screen.cur.col == 0)
1052 { 975 {
1053 if (screen.cur.row > 0) 976 if (screen.cur.row > 0)
1054 { 977 {
1055#ifdef TERMCAP_HAS_BW 978#ifdef TERMCAP_HAS_BW
1056 screen.cur.col = TermWin.ncol - 1; 979 screen.cur.col = ncol - 1;
1057 screen.cur.row--; 980 screen.cur.row--;
1058 return; 981 return;
1059#endif 982#endif
1060 } 983 }
1061 } 984 }
… …
1081 1004
1082 if (count == 0) 1005 if (count == 0)
1083 return; 1006 return;
1084 else if (count > 0) 1007 else if (count > 0)
1085 { 1008 {
1086 int row = TermWin.saveLines + screen.cur.row; 1009 line_t &l = ROW(screen.cur.row);
1087 text_t *tp = screen.text[row];
1088 rend_t *rp = screen.rend[row];
1089 rend_t base_rend = rp[i]; 1010 rend_t base_rend = l.r[i];
1090 ht &= tp[i] == ' '; 1011 ht &= l.t[i] == ' ';
1091 1012
1092 for (; ++i < TermWin.ncol; ) 1013 for (; ++i < ncol; )
1093 if (tabs[i]) 1014 if (tabs[i])
1094 { 1015 {
1095 x = i; 1016 x = i;
1096 if (!--count) 1017 if (!--count)
1097 break; 1018 break;
1098 } 1019 }
1099 else 1020 else
1100 ht &= tp[i] == ' ' 1021 ht &= l.t[i] == ' '
1101 && RS_SAME (rp[i], base_rend); 1022 && RS_SAME (l.r[i], base_rend);
1102 1023
1103 if (count) 1024 if (count)
1104 x = TermWin.ncol - 1; 1025 x = ncol - 1;
1105 1026
1106 // store horizontal tab commands as characters inside the text 1027 // store horizontal tab commands as characters inside the text
1107 // buffer so they can be selected and pasted. 1028 // buffer so they can be selected and pasted.
1108 if (ht && options & Opt_pastableTabs) 1029 if (ht && OPTION (Opt_pastableTabs))
1109 { 1030 {
1110 base_rend = SET_FONT (base_rend, 0); 1031 base_rend = SET_FONT (base_rend, 0);
1111 1032
1112 if (screen.tlen[row] != -1) /* XXX: think about this */ 1033 if (!l.is_longer ()) /* XXX: think about this */
1113 MAX_IT (screen.tlen[row], x); 1034 max_it (l.l, x);
1114 1035
1115 i = screen.cur.col; 1036 i = screen.cur.col;
1116 1037
1117 tp[i] = '\t'; 1038 l.t[i] = '\t';
1118 rp[i] = base_rend; 1039 l.r[i] = base_rend;
1119 1040
1120 while (++i < x) 1041 while (++i < x)
1121 { 1042 {
1122 tp[i] = NOCHAR; 1043 l.t[i] = NOCHAR;
1123 rp[i] = base_rend; 1044 l.r[i] = base_rend;
1124 } 1045 }
1125 } 1046 }
1126 } 1047 }
1127 else /* if (count < 0) */ 1048 else /* if (count < 0) */
1128 { 1049 {
… …
1154rxvt_term::scr_backindex () 1075rxvt_term::scr_backindex ()
1155{ 1076{
1156 if (screen.cur.col > 0) 1077 if (screen.cur.col > 0)
1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1078 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1158 else 1079 else
1159 {
1160 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1161 return; /* um, yeah? */
1162
1163 scr_insdel_chars (1, INSERT); 1080 scr_insdel_chars (1, INSERT);
1164 }
1165} 1081}
1166#endif 1082#endif
1167/* ------------------------------------------------------------------------- */ 1083/* ------------------------------------------------------------------------- */
1168/* 1084/*
1169 * Process DEC Forward Index 1085 * Process DEC Forward Index
… …
1173 */ 1089 */
1174#if ENABLE_FRILLS 1090#if ENABLE_FRILLS
1175void 1091void
1176rxvt_term::scr_forwardindex () 1092rxvt_term::scr_forwardindex ()
1177{ 1093{
1178 int row;
1179
1180 if (screen.cur.col < TermWin.ncol - 1) 1094 if (screen.cur.col < ncol - 1)
1181 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1182 else 1096 else
1183 { 1097 {
1184 row = screen.cur.row + TermWin.saveLines; 1098 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1185 1099 ROW(screen.cur.row).l = ncol;
1186 if (screen.tlen[row] == 0)
1187 return; /* um, yeah? */
1188 else if (screen.tlen[row] == -1)
1189 screen.tlen[row] = TermWin.ncol;
1190 1100
1191 scr_gotorc (0, 0, R_RELATIVE); 1101 scr_gotorc (0, 0, R_RELATIVE);
1192 scr_insdel_chars (1, DELETE); 1102 scr_insdel_chars (1, DELETE);
1193 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1103 scr_gotorc (0, ncol - 1, R_RELATIVE);
1194 } 1104 }
1195} 1105}
1196#endif 1106#endif
1197 1107
1198/* ------------------------------------------------------------------------- */ 1108/* ------------------------------------------------------------------------- */
… …
1204{ 1114{
1205 want_refresh = 1; 1115 want_refresh = 1;
1206 ZERO_SCROLLBACK (); 1116 ZERO_SCROLLBACK ();
1207 1117
1208 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1118 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1209 MAX_IT (screen.cur.col, 0); 1119 clamp_it (screen.cur.col, 0, ncol - 1);
1210 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1211 1120
1212 screen.flags &= ~Screen_WrapNext; 1121 screen.flags &= ~Screen_WrapNext;
1213 1122
1214 if (relative & R_RELATIVE) 1123 if (relative & R_RELATIVE)
1215 { 1124 {
… …
1233 else 1142 else
1234 { 1143 {
1235 if (screen.flags & Screen_Relative) 1144 if (screen.flags & Screen_Relative)
1236 { /* relative origin mode */ 1145 { /* relative origin mode */
1237 screen.cur.row = row + screen.tscroll; 1146 screen.cur.row = row + screen.tscroll;
1238 MIN_IT (screen.cur.row, screen.bscroll); 1147 min_it (screen.cur.row, screen.bscroll);
1239 } 1148 }
1240 else 1149 else
1241 screen.cur.row = row; 1150 screen.cur.row = row;
1242 } 1151 }
1243 1152
1244 MAX_IT (screen.cur.row, 0); 1153 clamp_it (screen.cur.row, 0, nrow - 1);
1245 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1246} 1154}
1247 1155
1248/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
1249/* 1157/*
1250 * direction should be UP or DN 1158 * direction should be UP or DN
… …
1261 1169
1262 screen.flags &= ~Screen_WrapNext; 1170 screen.flags &= ~Screen_WrapNext;
1263 1171
1264 if ((screen.cur.row == screen.bscroll && direction == UP) 1172 if ((screen.cur.row == screen.bscroll && direction == UP)
1265 || (screen.cur.row == screen.tscroll && direction == DN)) 1173 || (screen.cur.row == screen.tscroll && direction == DN))
1266 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1174 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1267 else 1175 else
1268 screen.cur.row += dirn; 1176 screen.cur.row += dirn;
1269 1177
1270 MAX_IT (screen.cur.row, 0); 1178 clamp_it (screen.cur.row, 0, nrow - 1);
1271 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1272 selection_check (0); 1179 selection_check (0);
1273} 1180}
1274 1181
1275/* ------------------------------------------------------------------------- */ 1182/* ------------------------------------------------------------------------- */
1276/* 1183/*
… …
1280 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1187 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1281 */ 1188 */
1282void 1189void
1283rxvt_term::scr_erase_line (int mode) 1190rxvt_term::scr_erase_line (int mode)
1284{ 1191{
1285 unsigned int row, col, num; 1192 unsigned int col, num;
1286 1193
1287 want_refresh = 1; 1194 want_refresh = 1;
1288 ZERO_SCROLLBACK (); 1195 ZERO_SCROLLBACK ();
1289 1196
1290 selection_check (1); 1197 selection_check (1);
1291 1198
1292 row = TermWin.saveLines + screen.cur.row; 1199 line_t &line = ROW(screen.cur.row);
1200
1293 switch (mode) 1201 switch (mode)
1294 { 1202 {
1295 case 0: /* erase to end of line */ 1203 case 0: /* erase to end of line */
1296 col = screen.cur.col; 1204 col = screen.cur.col;
1297 num = TermWin.ncol - col; 1205 num = ncol - col;
1298 MIN_IT (screen.tlen[row], (int16_t)col); 1206 min_it (line.l, col);
1299 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1207 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1300 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1208 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1301 CLEAR_SELECTION (); 1209 CLEAR_SELECTION ();
1302 break; 1210 break;
1303 case 1: /* erase to beginning of line */ 1211 case 1: /* erase to beginning of line */
… …
1307 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1215 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1308 CLEAR_SELECTION (); 1216 CLEAR_SELECTION ();
1309 break; 1217 break;
1310 case 2: /* erase whole line */ 1218 case 2: /* erase whole line */
1311 col = 0; 1219 col = 0;
1312 num = TermWin.ncol; 1220 num = ncol;
1313 screen.tlen[row] = 0; 1221 line.l = 0;
1314 if (selection.beg.row <= screen.cur.row 1222 if (selection.beg.row <= screen.cur.row
1315 && selection.end.row >= screen.cur.row) 1223 && selection.end.row >= screen.cur.row)
1316 CLEAR_SELECTION (); 1224 CLEAR_SELECTION ();
1317 break; 1225 break;
1318 default: 1226 default:
1319 return; 1227 return;
1320 } 1228 }
1321 1229
1322 if (screen.text[row]) 1230 scr_blank_line (line, col, num, rstyle);
1323 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1324 else
1325 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1326} 1231}
1327 1232
1328/* ------------------------------------------------------------------------- */ 1233/* ------------------------------------------------------------------------- */
1329/* 1234/*
1330 * Erase part of whole of the screen 1235 * Erase part of whole of the screen
… …
1334 */ 1239 */
1335void 1240void
1336rxvt_term::scr_erase_screen (int mode) 1241rxvt_term::scr_erase_screen (int mode)
1337{ 1242{
1338 int num; 1243 int num;
1339 int32_t row, row_offset; 1244 int32_t row;
1340 rend_t ren; 1245 rend_t ren;
1341 XGCValues gcvalue; 1246 XGCValues gcvalue;
1342 1247
1343 want_refresh = 1; 1248 want_refresh = 1;
1344 ZERO_SCROLLBACK (); 1249 ZERO_SCROLLBACK ();
1345
1346 row_offset = (int32_t)TermWin.saveLines;
1347 1250
1348 switch (mode) 1251 switch (mode)
1349 { 1252 {
1350 case 0: /* erase to end of screen */ 1253 case 0: /* erase to end of screen */
1351 selection_check (1); 1254 selection_check (1);
1352 scr_erase_line (0); 1255 scr_erase_line (0);
1353 row = screen.cur.row + 1; /* possible OOB */ 1256 row = screen.cur.row + 1; /* possible OOB */
1354 num = TermWin.nrow - row; 1257 num = nrow - row;
1355 break; 1258 break;
1356 case 1: /* erase to beginning of screen */ 1259 case 1: /* erase to beginning of screen */
1357 selection_check (3); 1260 selection_check (3);
1358 scr_erase_line (1); 1261 scr_erase_line (1);
1359 row = 0; 1262 row = 0;
1360 num = screen.cur.row; 1263 num = screen.cur.row;
1361 break; 1264 break;
1362 case 2: /* erase whole screen */ 1265 case 2: /* erase whole screen */
1363 selection_check (3); 1266 selection_check (3);
1364 row = 0; 1267 row = 0;
1365 num = TermWin.nrow; 1268 num = nrow;
1366 break; 1269 break;
1367 default: 1270 default:
1368 return; 1271 return;
1369 } 1272 }
1370 1273
… …
1372 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1275 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1373 || (selection.end.row >= row 1276 || (selection.end.row >= row
1374 && selection.end.row <= row + num))) 1277 && selection.end.row <= row + num)))
1375 CLEAR_SELECTION (); 1278 CLEAR_SELECTION ();
1376 1279
1377 if (row >= TermWin.nrow) /* Out Of Bounds */ 1280 if (row >= nrow) /* Out Of Bounds */
1378 return; 1281 return;
1379 1282
1380 MIN_IT (num, (TermWin.nrow - row)); 1283 min_it (num, nrow - row);
1381 1284
1382 if (rstyle & (RS_RVid | RS_Uline)) 1285 if (rstyle & (RS_RVid | RS_Uline))
1383 ren = (rend_t) ~RS_None; 1286 ren = (rend_t) ~RS_None;
1384 else if (GET_BASEBG (rstyle) == Color_bg) 1287 else if (GET_BASEBG (rstyle) == Color_bg)
1385 { 1288 {
… …
1387 CLEAR_ROWS (row, num); 1290 CLEAR_ROWS (row, num);
1388 } 1291 }
1389 else 1292 else
1390 { 1293 {
1391 ren = rstyle & (RS_fgMask | RS_bgMask); 1294 ren = rstyle & (RS_fgMask | RS_bgMask);
1392 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1295 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1393 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1296 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1394 ERASE_ROWS (row, num); 1297 ERASE_ROWS (row, num);
1395 gcvalue.foreground = pix_colors[Color_fg]; 1298 gcvalue.foreground = pix_colors[Color_fg];
1396 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1299 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1397 } 1300 }
1398 1301
1399 for (; num--; row++) 1302 for (; num--; row++)
1400 { 1303 {
1401 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1304 ROW (row).l = 0;
1402 screen.tlen[row + row_offset] = 0; 1305 scr_blank_screen_mem (ROW (row), rstyle);
1403 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1306 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1404 } 1307 }
1405} 1308}
1406 1309
1407#if ENABLE_FRILLS 1310#if ENABLE_FRILLS
1408void 1311void
1409rxvt_term::scr_erase_savelines () 1312rxvt_term::scr_erase_savelines ()
1410{ 1313{
1411 want_refresh = 1; 1314 want_refresh = 1;
1412 ZERO_SCROLLBACK (); 1315 ZERO_SCROLLBACK ();
1413 1316
1414 TermWin.nscrolled = 0; 1317 nsaved = 0;
1415} 1318}
1416#endif 1319#endif
1417 1320
1418/* ------------------------------------------------------------------------- */ 1321/* ------------------------------------------------------------------------- */
1419/* 1322/*
… …
1421 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1324 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1422 */ 1325 */
1423void 1326void
1424rxvt_term::scr_E () 1327rxvt_term::scr_E ()
1425{ 1328{
1426 int i, j, k;
1427 rend_t *r1, fs; 1329 rend_t fs;
1428 1330
1429 want_refresh = 1; 1331 want_refresh = 1;
1430 ZERO_SCROLLBACK (); 1332 ZERO_SCROLLBACK ();
1431 1333
1432 num_scr_allow = 0; 1334 num_scr_allow = 0;
1433 selection_check (3); 1335 selection_check (3);
1434 1336
1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1337 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1436 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1338 for (int row = nrow; row--; )
1437 { 1339 {
1438 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1340 line_t &line = ROW(row);
1341
1439 fill_text (screen.text[k], 'E', TermWin.ncol); 1342 fill_text (line.t, 'E', ncol);
1440 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1343 rend_t *r1 = line.r;
1344
1345 for (int j = ncol; j--; )
1441 *r1++ = fs; 1346 *r1++ = fs;
1347
1348 line.l = ncol; /* make the `E's selectable */
1442 } 1349 }
1443} 1350}
1444 1351
1445/* ------------------------------------------------------------------------- */ 1352/* ------------------------------------------------------------------------- */
1446/* 1353/*
… …
1467 count = end; 1374 count = end;
1468 } 1375 }
1469 1376
1470 scr_do_wrap (); 1377 scr_do_wrap ();
1471 1378
1472 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1379 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1473} 1380}
1474 1381
1475/* ------------------------------------------------------------------------- */ 1382/* ------------------------------------------------------------------------- */
1476/* 1383/*
1477 * Insert/Delete <count> characters from the current position 1384 * Insert/Delete <count> characters from the current position
… …
1479void 1386void
1480rxvt_term::scr_insdel_chars (int count, int insdel) 1387rxvt_term::scr_insdel_chars (int count, int insdel)
1481{ 1388{
1482 int col, row; 1389 int col, row;
1483 rend_t tr; 1390 rend_t tr;
1484 text_t *stp;
1485 rend_t *srp;
1486 int16_t *slp;
1487 1391
1488 want_refresh = 1; 1392 want_refresh = 1;
1489 ZERO_SCROLLBACK (); 1393 ZERO_SCROLLBACK ();
1490 1394
1491 if (count <= 0) 1395 if (count <= 0)
1492 return; 1396 return;
1493 1397
1494 scr_do_wrap (); 1398 scr_do_wrap ();
1495 1399
1496 selection_check (1); 1400 selection_check (1);
1497 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1401 min_it (count, ncol - screen.cur.col);
1498 1402
1499 row = screen.cur.row + TermWin.saveLines;
1500
1501 stp = screen.text[row];
1502 srp = screen.rend[row]; 1403 row = screen.cur.row;
1503 slp = &screen.tlen[row]; 1404
1405 line_t *line = &ROW(row);
1504 1406
1505 switch (insdel) 1407 switch (insdel)
1506 { 1408 {
1507 case INSERT: 1409 case INSERT:
1508 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1410 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1509 { 1411 {
1510 stp[col] = stp[col - count]; 1412 line->t[col] = line->t[col - count];
1511 srp[col] = srp[col - count]; 1413 line->r[col] = line->r[col - count];
1512 } 1414 }
1513 1415
1514 if (*slp != -1) 1416 if (!line->is_longer ())
1515 { 1417 {
1516 *slp += count; 1418 line->l += count;
1517 MIN_IT (*slp, TermWin.ncol); 1419 min_it (line->l, ncol);
1518 } 1420 }
1519 1421
1520 if (selection.op && current_screen == selection.screen 1422 if (selection.op && current_screen == selection.screen
1521 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1423 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1522 { 1424 {
1523 if (selection.end.row != screen.cur.row 1425 if (selection.end.row != screen.cur.row
1524 || (selection.end.col + count >= TermWin.ncol)) 1426 || (selection.end.col + count >= ncol))
1525 CLEAR_SELECTION (); 1427 CLEAR_SELECTION ();
1526 else 1428 else
1527 { /* shift selection */ 1429 { /* shift selection */
1528 selection.beg.col += count; 1430 selection.beg.col += count;
1529 selection.mark.col += count; /* XXX: yes? */ 1431 selection.mark.col += count; /* XXX: yes? */
1530 selection.end.col += count; 1432 selection.end.col += count;
1531 } 1433 }
1532 } 1434 }
1533 1435
1534 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1436 scr_blank_line (*line, screen.cur.col, count, rstyle);
1535 (unsigned int)count, rstyle);
1536 break; 1437 break;
1537 1438
1538 case ERASE: 1439 case ERASE:
1539 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1440 screen.cur.col += count; /* don't worry if > ncol */
1540 selection_check (1); 1441 selection_check (1);
1541 screen.cur.col -= count; 1442 screen.cur.col -= count;
1542 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1443 scr_blank_line (*line, screen.cur.col, count, rstyle);
1543 (unsigned int)count, rstyle);
1544 break; 1444 break;
1545 1445
1546 case DELETE: 1446 case DELETE:
1547 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1447 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1548 1448
1549 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1449 for (col = screen.cur.col; (col + count) < ncol; col++)
1550 { 1450 {
1551 stp[col] = stp[col + count]; 1451 line->t[col] = line->t[col + count];
1552 srp[col] = srp[col + count]; 1452 line->r[col] = line->r[col + count];
1553 } 1453 }
1554 1454
1555 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1455 scr_blank_line (*line, ncol - count, count, tr);
1556 (unsigned int)count, tr);
1557 1456
1558 if (*slp == -1) /* break line continuation */ 1457 if (line->is_longer ()) /* break line continuation */
1559 *slp = TermWin.ncol; 1458 line->l = ncol;
1560 1459
1561 *slp -= count; 1460 line->l = max (line->l - count, 0);
1562 MAX_IT (*slp, 0);
1563 1461
1564 if (selection.op && current_screen == selection.screen 1462 if (selection.op && current_screen == selection.screen
1565 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1463 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1566 { 1464 {
1567 if (selection.end.row != screen.cur.row 1465 if (selection.end.row != screen.cur.row
1568 || (screen.cur.col >= selection.beg.col - count) 1466 || (screen.cur.col >= selection.beg.col - count)
1569 || selection.end.col >= TermWin.ncol) 1467 || selection.end.col >= ncol)
1570 CLEAR_SELECTION (); 1468 CLEAR_SELECTION ();
1571 else 1469 else
1572 { 1470 {
1573 /* shift selection */ 1471 /* shift selection */
1574 selection.beg.col -= count; 1472 selection.beg.col -= count;
… …
1587 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1485 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1588 */ 1486 */
1589void 1487void
1590rxvt_term::scr_scroll_region (int top, int bot) 1488rxvt_term::scr_scroll_region (int top, int bot)
1591{ 1489{
1592 MAX_IT (top, 0); 1490 max_it (top, 0);
1593 MIN_IT (bot, (int)TermWin.nrow - 1); 1491 min_it (bot, nrow - 1);
1594 1492
1595 if (top > bot) 1493 if (top > bot)
1596 return; 1494 return;
1597 1495
1598 screen.tscroll = top; 1496 screen.tscroll = top;
… …
1677 */ 1575 */
1678void 1576void
1679rxvt_term::scr_set_tab (int mode) 1577rxvt_term::scr_set_tab (int mode)
1680{ 1578{
1681 if (mode < 0) 1579 if (mode < 0)
1682 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1580 memset (tabs, 0, ncol * sizeof (char));
1683 else if (screen.cur.col < TermWin.ncol) 1581 else if (screen.cur.col < ncol)
1684 tabs[screen.cur.col] = (mode ? 1 : 0); 1582 tabs[screen.cur.col] = (mode ? 1 : 0);
1685} 1583}
1686 1584
1687/* ------------------------------------------------------------------------- */ 1585/* ------------------------------------------------------------------------- */
1688/* 1586/*
… …
1696 XGCValues gcvalue; 1594 XGCValues gcvalue;
1697 1595
1698 if (rvideo != mode) 1596 if (rvideo != mode)
1699 { 1597 {
1700 rvideo = mode; 1598 rvideo = mode;
1701 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1599 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1702#if XPM_BACKGROUND 1600#if XPM_BACKGROUND
1703 if (bgPixmap.pixmap == None) 1601 if (bgPixmap.pixmap == None)
1704#endif 1602#endif
1705#if TRANSPARENT 1603#if TRANSPARENT
1706 if (! (options & Opt_transparent) || am_transparent == 0) 1604 if (! OPTION (Opt_transparent) || am_transparent == 0)
1707#endif 1605#endif
1708 XSetWindowBackground (display->display, TermWin.vt, 1606 XSetWindowBackground (display->display, vt,
1709 pix_colors[Color_bg]); 1607 pix_colors[Color_bg]);
1710 1608
1711 gcvalue.foreground = pix_colors[Color_fg]; 1609 gcvalue.foreground = pix_colors[Color_fg];
1712 gcvalue.background = pix_colors[Color_bg]; 1610 gcvalue.background = pix_colors[Color_bg];
1713 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1611 XChangeGC (display->display, gc, GCBackground | GCForeground,
1714 &gcvalue); 1612 &gcvalue);
1715 scr_clear (); 1613 scr_clear ();
1716 scr_touch (true); 1614 scr_touch (true);
1717 } 1615 }
1718} 1616}
… …
1799bool 1697bool
1800rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1698rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1801{ 1699{
1802 bool found = false; 1700 bool found = false;
1803 1701
1804 for (int i = 0; i < TermWin.nrow; i++) 1702 for (int i = 0; i < nrow; i++)
1805 { 1703 {
1806 int col = 0; 1704 int col = 0;
1807 rend_t *drp = drawn_rend [i]; 1705 rend_t *drp = drawn_buf[i].r;
1808 1706
1809 for (; col < TermWin.ncol; col++, drp++) 1707 for (; col < ncol; col++, drp++)
1810 if ((*drp & mask) == value) 1708 if ((*drp & mask) == value)
1811 { 1709 {
1812 found = true; 1710 found = true;
1813 *drp = ~value; 1711 *drp = ~value;
1814 } 1712 }
… …
1825 PART_END, 1723 PART_END,
1826 RC_COUNT 1724 RC_COUNT
1827}; 1725};
1828 1726
1829void 1727void
1830rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1728rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1831{ 1729{
1832 int i; 1730 int i;
1833 row_col_t rc[RC_COUNT]; 1731 row_col_t rc[RC_COUNT];
1834 1732
1835 if (drawn_text == NULL) /* sanity check */ 1733 if (!drawn_buf) /* sanity check */
1836 return; 1734 return;
1837 1735
1838#ifndef NO_SLOW_LINK_SUPPORT 1736#ifndef NO_SLOW_LINK_SUPPORT
1839 if (refresh_type == FAST_REFRESH && !display->is_local) 1737 if (refresh_type == FAST_REFRESH && !display->is_local)
1840 { 1738 {
1841 y = 0; 1739 y = 0;
1842 height = TermWin.height; 1740 eheight = height;
1843 } 1741 }
1844#endif
1845
1846#ifdef DEBUG_STRICT
1847 x = max (x, 0);
1848 x = min (x, (int)TermWin.width);
1849 y = max (y, 0);
1850 y = min (y, (int)TermWin.height);
1851#endif 1742#endif
1852 1743
1853 /* round down */ 1744 /* round down */
1854 rc[PART_BEG].col = Pixel2Col (x); 1745 rc[PART_BEG].col = Pixel2Col (x);
1855 rc[PART_BEG].row = Pixel2Row (y); 1746 rc[PART_BEG].row = Pixel2Row (y);
1856 /* round up */ 1747 /* round up */
1857 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1748 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1858 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1749 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1859 1750
1860 /* sanity checks */ 1751 /* sanity checks */
1861 for (i = PART_BEG; i < RC_COUNT; i++) 1752 for (i = PART_BEG; i < RC_COUNT; i++)
1862 { 1753 {
1863 MIN_IT (rc[i].col, TermWin.ncol - 1); 1754 min_it (rc[i].col, ncol - 1);
1864 MIN_IT (rc[i].row, TermWin.nrow - 1); 1755 min_it (rc[i].row, nrow - 1);
1865 } 1756 }
1866 1757
1867 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1758 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1868 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1759 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1869 1760
1870 if (refresh) 1761 if (refresh)
1871 scr_refresh (SLOW_REFRESH); 1762 scr_refresh (SLOW_REFRESH);
1872} 1763}
1873 1764
… …
1876 * Refresh the entire screen 1767 * Refresh the entire screen
1877 */ 1768 */
1878void 1769void
1879rxvt_term::scr_touch (bool refresh) 1770rxvt_term::scr_touch (bool refresh)
1880{ 1771{
1881 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1772 scr_expose (0, 0, width, height, refresh);
1882} 1773}
1883 1774
1884/* ------------------------------------------------------------------------- */ 1775/* ------------------------------------------------------------------------- */
1885/* 1776/*
1886 * Move the display so that the line represented by scrollbar value Y is at 1777 * Move the display so that the line represented by scrollbar value Y is at
… …
1890rxvt_term::scr_move_to (int y, int len) 1781rxvt_term::scr_move_to (int y, int len)
1891{ 1782{
1892 long p = 0; 1783 long p = 0;
1893 unsigned int oldviewstart; 1784 unsigned int oldviewstart;
1894 1785
1895 oldviewstart = TermWin.view_start; 1786 oldviewstart = view_start;
1896 1787
1897 if (y < len) 1788 if (y < len)
1898 { 1789 {
1899 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1790 p = (nrow + nsaved) * (len - y) / len;
1900 p -= (long) (TermWin.nrow - 1); 1791 p -= (long) (nrow - 1);
1901 p = max (p, 0); 1792 p = max (p, 0);
1902 } 1793 }
1903 1794
1904 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); 1795 view_start = (unsigned int)min (p, nsaved);
1905 1796
1906 return scr_changeview (oldviewstart); 1797 return scr_changeview (oldviewstart);
1907} 1798}
1908 1799
1909/* ------------------------------------------------------------------------- */ 1800/* ------------------------------------------------------------------------- */
… …
1915rxvt_term::scr_page (enum page_dirn direction, int nlines) 1806rxvt_term::scr_page (enum page_dirn direction, int nlines)
1916{ 1807{
1917 int n; 1808 int n;
1918 unsigned int oldviewstart; 1809 unsigned int oldviewstart;
1919 1810
1920 oldviewstart = TermWin.view_start; 1811 oldviewstart = view_start;
1921 1812
1922 if (direction == UP) 1813 if (direction == UP)
1923 { 1814 {
1924 n = TermWin.view_start + nlines; 1815 n = view_start + nlines;
1925 TermWin.view_start = min (n, TermWin.nscrolled); 1816 view_start = min (n, nsaved);
1926 } 1817 }
1927 else 1818 else
1928 { 1819 {
1929 n = TermWin.view_start - nlines; 1820 n = view_start - nlines;
1930 TermWin.view_start = max (n, 0); 1821 view_start = max (n, 0);
1931 } 1822 }
1932 1823
1933 return scr_changeview (oldviewstart); 1824 return scr_changeview (oldviewstart);
1934} 1825}
1935 1826
1936int 1827int
1937rxvt_term::scr_changeview (unsigned int oldviewstart) 1828rxvt_term::scr_changeview (unsigned int oldviewstart)
1938{ 1829{
1830 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831
1939 if (TermWin.view_start != oldviewstart) 1832 if (view_start != oldviewstart)
1940 { 1833 {
1941 want_refresh = 1; 1834 want_refresh = 1;
1942 num_scr -= (TermWin.view_start - oldviewstart); 1835 num_scr -= (view_start - oldviewstart);
1943 } 1836 }
1944 1837
1945 return (int) (TermWin.view_start - oldviewstart); 1838 return (int) (view_start - oldviewstart);
1946} 1839}
1947 1840
1948/* ------------------------------------------------------------------------- */ 1841/* ------------------------------------------------------------------------- */
1949void 1842void
1950rxvt_term::scr_bell () 1843rxvt_term::scr_bell ()
1951{ 1844{
1952#ifndef NO_BELL 1845#ifndef NO_BELL
1953 1846
1954# ifndef NO_MAPALERT 1847# ifndef NO_MAPALERT
1955# ifdef MAPALERT_OPTION 1848# ifdef MAPALERT_OPTION
1956 if (options & Opt_mapAlert) 1849 if (OPTION (Opt_mapAlert))
1957# endif 1850# endif
1958 XMapWindow (display->display, TermWin.parent[0]); 1851 XMapWindow (display->display, parent[0]);
1959# endif 1852# endif
1960 1853
1961 if (options & Opt_visualBell) 1854 if (OPTION (Opt_visualBell))
1962 { 1855 {
1963 scr_rvideo_mode (!rvideo); /* refresh also done */ 1856 scr_rvideo_mode (!rvideo); /* refresh also done */
1964 rxvt_usleep (VISUAL_BELL_DURATION); 1857 rxvt_usleep (VISUAL_BELL_DURATION);
1965 scr_rvideo_mode (!rvideo); /* refresh also done */ 1858 scr_rvideo_mode (!rvideo); /* refresh also done */
1966 } 1859 }
… …
1974/* ARGSUSED */ 1867/* ARGSUSED */
1975void 1868void
1976rxvt_term::scr_printscreen (int fullhist) 1869rxvt_term::scr_printscreen (int fullhist)
1977{ 1870{
1978#ifdef PRINTPIPE 1871#ifdef PRINTPIPE
1979 int i, r1, nrows, row_offset; 1872 int nrows, row_start;
1980 FILE *fd; 1873 FILE *fd;
1981 1874
1982 if ((fd = popen_printer ()) == NULL) 1875 if ((fd = popen_printer ()) == NULL)
1983 return; 1876 return;
1984 1877
1985 nrows = TermWin.nrow;
1986 row_offset = TermWin.saveLines;
1987
1988 if (!fullhist) 1878 if (fullhist)
1989 row_offset -= TermWin.view_start; 1879 {
1880 nrows = nrow + nsaved;
1881 row_start = -nsaved;
1882 }
1990 else 1883 else
1991 { 1884 {
1992 nrows += TermWin.nscrolled; 1885 nrows = nrow;
1993 row_offset -= TermWin.nscrolled; 1886 row_start = -view_start;
1994 } 1887 }
1995 1888
1996 wctomb (0, 0); 1889 wctomb (0, 0);
1997 1890
1998 for (r1 = 0; r1 < nrows; r1++) 1891 for (int r1 = 0; r1 < nrows; r1++)
1999 { 1892 {
2000 text_t *tp = screen.text[r1 + row_offset]; 1893 text_t *tp = ROW(r1).t;
2001 int len = screen.tlen[r1 + row_offset]; 1894 int len = ROW(r1).l;
2002 1895
2003 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1896 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
2004 { 1897 {
2005 char mb[MB_LEN_MAX]; 1898 char mb[MB_LEN_MAX];
2006 text_t t = *tp++; 1899 text_t t = *tp++;
2007 if (t == NOCHAR) 1900 if (t == NOCHAR)
2008 continue; 1901 continue;
… …
2036{ 1929{
2037 unsigned char must_clear, /* use draw_string not draw_image_string */ 1930 unsigned char must_clear, /* use draw_string not draw_image_string */
2038 showcursor; /* show the cursor */ 1931 showcursor; /* show the cursor */
2039 int16_t col, row, /* column/row we're processing */ 1932 int16_t col, row, /* column/row we're processing */
2040 ocrow; /* old cursor row */ 1933 ocrow; /* old cursor row */
2041 int i, /* tmp */ 1934 int i; /* tmp */
2042 row_offset; /* basic offset in screen structure */
2043#ifndef NO_CURSORCOLOR 1935#ifndef NO_CURSORCOLOR
2044 rend_t cc1; /* store colours at cursor position (s) */ 1936 rend_t cc1; /* store colours at cursor position (s) */
2045#endif 1937#endif
2046 rend_t *crp; // cursor rendition pointer 1938 rend_t *crp; // cursor rendition pointer
2047 1939
2048 want_refresh = 0; /* screen is current */ 1940 want_refresh = 0; /* screen is current */
2049 1941
2050 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1942 if (refresh_type == NO_REFRESH || !mapped)
2051 return; 1943 return;
2052 1944
2053 /* 1945 /*
2054 * A: set up vars 1946 * A: set up vars
2055 */ 1947 */
2056 must_clear = 0; 1948 must_clear = 0;
2057 refresh_count = 0; 1949 refresh_count = 0;
2058 1950
2059 row_offset = TermWin.saveLines - TermWin.view_start;
2060
2061#if XPM_BACKGROUND 1951#if XPM_BACKGROUND
2062 must_clear |= bgPixmap.pixmap != None; 1952 must_clear |= bgPixmap.pixmap != None;
2063#endif 1953#endif
2064#if TRANSPARENT 1954#if TRANSPARENT
2065 must_clear |= (options & Opt_transparent) && am_transparent; 1955 must_clear |= OPTION (Opt_transparent) && am_transparent;
2066#endif 1956#endif
2067 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1957 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2068 1958
2069 /* 1959 /*
2070 * B: reverse any characters which are selected 1960 * B: reverse any characters which are selected
2071 */ 1961 */
1962 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2072 scr_reverse_selection (); 1963 scr_reverse_selection ();
2073 1964
2074 /* 1965 /*
2075 * C: set the cursor character (s) 1966 * C: set the cursor character (s)
2076 */ 1967 */
… …
2087 1978
2088 if (showcursor) 1979 if (showcursor)
2089 { 1980 {
2090 int col = screen.cur.col; 1981 int col = screen.cur.col;
2091 1982
2092 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 1983 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2093 col--; 1984 col--;
2094 1985
2095 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 1986 crp = &ROW(screen.cur.row).r[col];
2096 1987
2097 if (showcursor && TermWin.focus) 1988 if (showcursor && focus)
2098 { 1989 {
2099 if (options & Opt_cursorUnderline) 1990 if (OPTION (Opt_cursorUnderline))
2100 *crp ^= RS_Uline; 1991 *crp ^= RS_Uline;
2101 else 1992 else
2102 { 1993 {
2103 *crp ^= RS_RVid; 1994 *crp ^= RS_RVid;
2104 1995
… …
2106 cc1 = *crp & (RS_fgMask | RS_bgMask); 1997 cc1 = *crp & (RS_fgMask | RS_bgMask);
2107 if (ISSET_PIXCOLOR (Color_cursor)) 1998 if (ISSET_PIXCOLOR (Color_cursor))
2108 ccol1 = Color_cursor; 1999 ccol1 = Color_cursor;
2109 else 2000 else
2110#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2001#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2111 ccol1 = GET_FGCOLOR (rstyle); 2002 ccol1 = fgcolor_of (rstyle);
2112#else 2003#else
2113 ccol1 = Color_fg; 2004 ccol1 = Color_fg;
2114#endif 2005#endif
2115 if (ISSET_PIXCOLOR (Color_cursor2)) 2006 if (ISSET_PIXCOLOR (Color_cursor2))
2116 ccol2 = Color_cursor2; 2007 ccol2 = Color_cursor2;
2117 else 2008 else
2118#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2009#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2119 ccol2 = GET_BGCOLOR (rstyle); 2010 ccol2 = bgcolor_of (rstyle);
2120#else 2011#else
2121 ccol2 = Color_bg; 2012 ccol2 = Color_bg;
2122#endif 2013#endif
2123 *crp = SET_FGCOLOR (*crp, ccol1); 2014 *crp = SET_FGCOLOR (*crp, ccol1);
2124 *crp = SET_BGCOLOR (*crp, ccol2); 2015 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2129 2020
2130 /* make sure no outline cursor is left around */ 2021 /* make sure no outline cursor is left around */
2131 setoldcursor = 0; 2022 setoldcursor = 0;
2132 if (ocrow != -1) 2023 if (ocrow != -1)
2133 { 2024 {
2134 if (screen.cur.row + TermWin.view_start != ocrow 2025 if (screen.cur.row + view_start != ocrow
2135 || screen.cur.col != oldcursor.col) 2026 || screen.cur.col != oldcursor.col)
2136 { 2027 {
2137 if (ocrow < TermWin.nrow 2028 if (ocrow < nrow
2138 && oldcursor.col < TermWin.ncol) 2029 && oldcursor.col < ncol)
2139 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2030 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2140 2031
2141 if (TermWin.focus || !showcursor) 2032 if (focus || !showcursor)
2142 oldcursor.row = -1; 2033 oldcursor.row = -1;
2143 else 2034 else
2144 setoldcursor = 1; 2035 setoldcursor = 1;
2145 } 2036 }
2146 } 2037 }
2147 else if (!TermWin.focus) 2038 else if (!focus)
2148 setoldcursor = 1; 2039 setoldcursor = 1;
2149 2040
2150 if (setoldcursor) 2041 if (setoldcursor)
2151 { 2042 {
2152 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2043 if (screen.cur.row + view_start >= nrow)
2153 oldcursor.row = -1; 2044 oldcursor.row = -1;
2154 else 2045 else
2155 { 2046 {
2156 oldcursor.row = screen.cur.row + TermWin.view_start; 2047 oldcursor.row = screen.cur.row + view_start;
2157 oldcursor.col = screen.cur.col; 2048 oldcursor.col = screen.cur.col;
2158 } 2049 }
2159 } 2050 }
2160 } 2051 }
2161 2052
… …
2168 * D: CopyArea pass - very useful for slower links 2059 * D: CopyArea pass - very useful for slower links
2169 * This has been deliberately kept simple. 2060 * This has been deliberately kept simple.
2170 */ 2061 */
2171 i = num_scr; 2062 i = num_scr;
2172 if (!display->is_local 2063 if (!display->is_local
2173 && refresh_type == FAST_REFRESH && num_scr_allow && i 2064 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2174 && abs (i) < TermWin.nrow && !must_clear) 2065 && abs (num_scr) < nrow && !must_clear)
2175 { 2066 {
2176 int16_t nits; 2067 int16_t nits;
2177 int j; 2068 int j;
2178 int len, wlen; 2069 int len, wlen;
2179 2070
2180 j = TermWin.nrow; 2071 j = nrow;
2181 wlen = len = -1; 2072 wlen = len = -1;
2182 row = i > 0 ? 0 : j - 1; 2073 row = i > 0 ? 0 : j - 1;
2183 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2074 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2184 { 2075 {
2185 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2076 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2186 { 2077 {
2187 text_t *stp = screen.text[row + row_offset]; 2078 line_t s = ROW(row - view_start);
2188 rend_t *srp = screen.rend[row + row_offset];
2189 text_t *dtp = drawn_text[row]; 2079 line_t d = drawn_buf[row];
2190 text_t *dtp2 = drawn_text[row + i]; 2080 line_t d2 = drawn_buf[row + i];
2191 rend_t *drp = drawn_rend[row];
2192 rend_t *drp2 = drawn_rend[row + i];
2193 2081
2194 for (nits = 0, col = TermWin.ncol; col--; ) 2082 for (nits = 0, col = ncol; col--; )
2195 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2083 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2196 nits--; 2084 nits--;
2197 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2085 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2198 nits++; 2086 nits++;
2199 2087
2200 if (nits > 8) /* XXX: arbitrary choice */ 2088 if (nits > 8) /* XXX: arbitrary choice */
2201 { 2089 {
2202 for (col = TermWin.ncol; col--; ) 2090 for (col = ncol; col--; )
2203 { 2091 {
2204 *dtp++ = *dtp2++; 2092 *d.t++ = *d2.t++;
2205 *drp++ = *drp2++; 2093 *d.r++ = *d2.r++;
2206 } 2094 }
2207 2095
2208 if (len == -1) 2096 if (len == -1)
2209 len = row; 2097 len = row;
2210 2098
… …
2215 2103
2216 if (len != -1) 2104 if (len != -1)
2217 { 2105 {
2218 /* also comes here at end if needed because of >= above */ 2106 /* also comes here at end if needed because of >= above */
2219 if (wlen < len) 2107 if (wlen < len)
2220 SWAP_IT (wlen, len, int); 2108 ::swap (wlen, len);
2221 2109
2222 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2110 XCopyArea (display->display, vt, vt,
2223 TermWin.gc, 0, Row2Pixel (len + i), 2111 gc, 0, Row2Pixel (len + i),
2224 (unsigned int)TermWin_TotalWidth (), 2112 (unsigned int)TermWin_TotalWidth (),
2225 (unsigned int)Height2Pixel (wlen - len + 1), 2113 (unsigned int)Height2Pixel (wlen - len + 1),
2226 0, Row2Pixel (len)); 2114 0, Row2Pixel (len));
2227 len = -1; 2115 len = -1;
2228 } 2116 }
… …
2231#endif 2119#endif
2232 2120
2233 /* 2121 /*
2234 * E: main pass across every character 2122 * E: main pass across every character
2235 */ 2123 */
2236 for (row = 0; row < TermWin.nrow; row++) 2124 for (row = 0; row < nrow; row++)
2237 { 2125 {
2238 text_t *stp = screen.text[row + row_offset]; 2126 text_t *stp = ROW(row - view_start).t;
2239 rend_t *srp = screen.rend[row + row_offset]; 2127 rend_t *srp = ROW(row - view_start).r;
2240 text_t *dtp = drawn_text[row]; 2128 text_t *dtp = drawn_buf[row].t;
2241 rend_t *drp = drawn_rend[row]; 2129 rend_t *drp = drawn_buf[row].r;
2242 2130
2243 /* 2131 /*
2244 * E2: OK, now the real pass 2132 * E2: OK, now the real pass
2245 */ 2133 */
2246 int ypixel = (int)Row2Pixel (row); 2134 int ypixel = (int)Row2Pixel (row);
2247 2135
2248 for (col = 0; col < TermWin.ncol; col++) 2136 for (col = 0; col < ncol; col++)
2249 { 2137 {
2250 /* compare new text with old - if exactly the same then continue */ 2138 /* compare new text with old - if exactly the same then continue */
2251 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2139 if (stp[col] == dtp[col] /* Must match characters to skip. */
2252 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2140 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2253 || (stp[col] == ' ' /* space w/ no background change */ 2141 || (stp[col] == ' ' /* space w/ no background change */
… …
2267 dtp[col] = stp[col]; 2155 dtp[col] = stp[col];
2268 drp[col] = rend; 2156 drp[col] = rend;
2269 2157
2270 int xpixel = Col2Pixel (col); 2158 int xpixel = Col2Pixel (col);
2271 2159
2272 for (i = 0; ++col < TermWin.ncol; ) 2160 for (i = 0; ++col < ncol; )
2273 { 2161 {
2274 if (stp[col] == NOCHAR) 2162 if (stp[col] == NOCHAR)
2275 { 2163 {
2276 dtp[col] = stp[col]; 2164 dtp[col] = stp[col];
2277 drp[col] = rend; 2165 drp[col] = rend;
… …
2308 count++, i--; 2196 count++, i--;
2309 2197
2310 /* 2198 /*
2311 * Determine the attributes for the string 2199 * Determine the attributes for the string
2312 */ 2200 */
2313 int fore = GET_FGCOLOR (rend); // desired foreground 2201 int fore = fgcolor_of (rend); // desired foreground
2314 int back = GET_BGCOLOR (rend); // desired background 2202 int back = bgcolor_of (rend); // desired background
2315 2203
2316 // only do special processing if any attributes are set, which is rare 2204 // only do special processing if any attributes are set, which is unlikely
2317 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2205 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2318 { 2206 {
2319#if ENABLE_STYLES 2207#if ENABLE_STYLES
2320 // force redraw after "careful" characters to avoid pixel droppings 2208 // force redraw after "careful" characters to avoid pixel droppings
2321 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) 2209 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2322 drp[col + 1] = ~srp[col + 1]; 2210 drp[col + 1] = ~srp[col + 1];
2323 2211
2324 // include previous careful character(s) if possible, looks nicer (best effort...) 2212 // include previous careful character(s) if possible, looks nicer (best effort...)
2325 while (text > stp 2213 while (text > stp
2326 && srp[text - stp - 1] & RS_Careful 2214 && srp[text - stp - 1] & RS_Careful
2327 && RS_SAME (rend, srp[text - stp - 1])) 2215 && RS_SAME (rend, srp[text - stp - 1]))
2328 text--, count++, xpixel -= TermWin.fwidth; 2216 text--, count++, xpixel -= fwidth;
2329#endif 2217#endif
2330 2218
2331 bool invert = rend & RS_RVid; 2219 bool invert = rend & RS_RVid;
2332 2220
2333#ifndef NO_BOLD_UNDERLINE_REVERSE 2221#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2357 fore = Color_UL; 2245 fore = Color_UL;
2358#endif 2246#endif
2359 2247
2360 if (invert) 2248 if (invert)
2361 { 2249 {
2362 SWAP_IT (fore, back, int); 2250 ::swap (fore, back);
2363 2251
2364#ifndef NO_BOLD_UNDERLINE_REVERSE 2252#ifndef NO_BOLD_UNDERLINE_REVERSE
2365 if (ISSET_PIXCOLOR (Color_RV)) 2253 if (ISSET_PIXCOLOR (Color_RV))
2366 back = Color_RV; 2254 back = Color_RV;
2367 2255
… …
2388 } 2276 }
2389 2277
2390 /* 2278 /*
2391 * Actually do the drawing of the string here 2279 * Actually do the drawing of the string here
2392 */ 2280 */
2393 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2281 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2394 2282
2395 if (back == fore) 2283 if (back == fore)
2396 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2284 font->clear_rect (*drawable, xpixel, ypixel,
2397 TermWin.fwidth * count, TermWin.fheight, 2285 fwidth * count, fheight,
2398 back); 2286 back);
2399 else if (back == Color_bg) 2287 else if (back == Color_bg)
2400 { 2288 {
2401 if (must_clear) 2289 if (must_clear)
2402 { 2290 {
2403 CLEAR_CHARS (xpixel, ypixel, count); 2291 CLEAR_CHARS (xpixel, ypixel, count);
2404 2292
2405 for (i = 0; i < count; i++) /* don't draw empty strings */ 2293 for (i = 0; i < count; i++) /* don't draw empty strings */
2406 if (text[i] != ' ') 2294 if (text[i] != ' ')
2407 { 2295 {
2408 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2296 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2409 break; 2297 break;
2410 } 2298 }
2411 } 2299 }
2412 else 2300 else
2413 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2301 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2414 } 2302 }
2415 else 2303 else
2416 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2304 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2417 2305
2418 if (rend & RS_Uline && font->descent > 1 && fore != back) 2306 if (rend & RS_Uline && font->descent > 1 && fore != back)
2419 { 2307 {
2420#if ENABLE_FRILLS 2308#if ENABLE_FRILLS
2421 if (ISSET_PIXCOLOR (Color_underline)) 2309 if (ISSET_PIXCOLOR (Color_underline))
2422 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); 2310 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2423 else 2311 else
2424#endif 2312#endif
2425 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2313 XSetForeground (display->display, gc, pix_colors[fore]);
2426 2314
2427 XDrawLine (display->display, drawBuffer, TermWin.gc, 2315 XDrawLine (display->display, drawBuffer, gc,
2428 xpixel, ypixel + font->ascent + 1, 2316 xpixel, ypixel + font->ascent + 1,
2429 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2317 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2430 } 2318 }
2431 } /* for (col....) */ 2319 } /* for (col....) */
2432 } /* for (row....) */ 2320 } /* for (row....) */
… …
2438 /* 2326 /*
2439 * G: cleanup cursor and display outline cursor if necessary 2327 * G: cleanup cursor and display outline cursor if necessary
2440 */ 2328 */
2441 if (showcursor) 2329 if (showcursor)
2442 { 2330 {
2443 if (TermWin.focus) 2331 if (focus)
2444 { 2332 {
2445 if (options & Opt_cursorUnderline) 2333 if (OPTION (Opt_cursorUnderline))
2446 *crp ^= RS_Uline; 2334 *crp ^= RS_Uline;
2447 else 2335 else
2448 { 2336 {
2449 *crp ^= RS_RVid; 2337 *crp ^= RS_RVid;
2450#ifndef NO_CURSORCOLOR 2338#ifndef NO_CURSORCOLOR
… …
2455 else if (oldcursor.row >= 0) 2343 else if (oldcursor.row >= 0)
2456 { 2344 {
2457 int cursorwidth = 1; 2345 int cursorwidth = 1;
2458 int col = oldcursor.col; 2346 int col = oldcursor.col;
2459 2347
2460 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2348 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2461 col--; 2349 col--;
2462 2350
2463 while (col + cursorwidth < TermWin.ncol 2351 while (col + cursorwidth < ncol
2464 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR) 2352 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2465 cursorwidth++; 2353 cursorwidth++;
2466 2354
2467#ifndef NO_CURSORCOLOR 2355#ifndef NO_CURSORCOLOR
2468 if (ISSET_PIXCOLOR (Color_cursor)) 2356 if (ISSET_PIXCOLOR (Color_cursor))
2469 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2357 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2470#endif 2358#endif
2471 2359
2472 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2360 XDrawRectangle (display->display, drawBuffer, gc,
2473 Col2Pixel (col), 2361 Col2Pixel (col),
2474 Row2Pixel (oldcursor.row), 2362 Row2Pixel (oldcursor.row),
2475 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2363 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2476 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2364 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2477 } 2365 }
2478 } 2366 }
2479 2367
2480 /* 2368 /*
2481 * H: cleanup selection 2369 * H: cleanup selection
2482 */ 2370 */
2483 scr_reverse_selection (); 2371 scr_reverse_selection ();
2372 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2484 2373
2485 if (refresh_type & SMOOTH_REFRESH) 2374 if (refresh_type & SMOOTH_REFRESH)
2486 XFlush (display->display); 2375 XFlush (display->display);
2487 2376
2488 num_scr = 0; 2377 num_scr = 0;
2489 num_scr_allow = 1; 2378 num_scr_allow = 1;
2490} 2379}
2491 2380
2492void 2381void
2493rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2382rxvt_term::scr_remap_chars (const line_t &l)
2494{ 2383{
2495 if (!rp || !tp) 2384 if (!l.t)
2496 return; 2385 return;
2497 2386
2498 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2387 for (int i = ncol; i--; )
2499 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2388 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2500} 2389}
2501 2390
2502void 2391void
2503rxvt_term::scr_remap_chars () 2392rxvt_term::scr_remap_chars ()
2504{ 2393{
2505 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2394 for (int i = total_rows; i--; )
2506 scr_remap_chars (screen.text[i], screen.rend[i]); 2395 scr_remap_chars (row_buf [i]);
2507 2396
2508 for (int i = TermWin.nrow; i--; ) 2397 for (int i = nrow; i--; )
2509 { 2398 {
2510 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2399 scr_remap_chars (drawn_buf [i]);
2511 scr_remap_chars (swap.text[i], swap.rend[i]); 2400 scr_remap_chars (swap_buf [i]);
2512 } 2401 }
2513} 2402}
2514 2403
2515void 2404void
2516rxvt_term::scr_recolour () 2405rxvt_term::scr_recolour ()
… …
2522#if XPM_BACKGROUND 2411#if XPM_BACKGROUND
2523 && !bgPixmap.pixmap 2412 && !bgPixmap.pixmap
2524#endif 2413#endif
2525 ) 2414 )
2526 { 2415 {
2527 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2416 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2528 XClearWindow (display->display, TermWin.parent[0]); 2417 XClearWindow (display->display, parent[0]);
2529 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2418 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2530#if HAVE_SCROLLBARS 2419#if HAVE_SCROLLBARS
2531 if (scrollBar.win) 2420 if (scrollBar.win)
2532 { 2421 {
2533 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2422 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2534 scrollBar.setIdle (); 2423 scrollBar.setIdle ();
… …
2544 2433
2545/* ------------------------------------------------------------------------- */ 2434/* ------------------------------------------------------------------------- */
2546void 2435void
2547rxvt_term::scr_clear (bool really) 2436rxvt_term::scr_clear (bool really)
2548{ 2437{
2549 if (!TermWin.mapped) 2438 if (!mapped)
2550 return; 2439 return;
2551 2440
2552 num_scr_allow = 0; 2441 num_scr_allow = 0;
2553 want_refresh = 1; 2442 want_refresh = 1;
2554 2443
2555 if (really) 2444 if (really)
2556 XClearWindow (display->display, TermWin.vt); 2445 XClearWindow (display->display, vt);
2557} 2446}
2558 2447
2559/* ------------------------------------------------------------------------- */ 2448/* ------------------------------------------------------------------------- */
2560void 2449void
2561rxvt_term::scr_reverse_selection () 2450rxvt_term::scr_reverse_selection ()
2562{ 2451{
2452 if (selection.op
2563 if (selection.op && current_screen == selection.screen) 2453 && current_screen == selection.screen
2454 && selection.end.row >= -view_start)
2564 { 2455 {
2565 int end_row = TermWin.saveLines - TermWin.view_start; 2456 int view_end = -view_start + nrow;
2566 int i = selection.beg.row + TermWin.saveLines; 2457 int row, col;
2567 int col, row = selection.end.row + TermWin.saveLines;
2568 rend_t *srp;
2569 2458
2570#if ENABLE_FRILLS 2459#if ENABLE_FRILLS
2571 if (selection.rect) 2460 if (selection.rect)
2572 { 2461 {
2573 end_row += TermWin.nrow; 2462 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2463 {
2464 text_t *stp = ROW(row).t;
2465 rend_t *srp = ROW(row).r;
2574 2466
2575 for (; i <= row && i <= end_row; i++)
2576 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) 2467 for (col = selection.beg.col; col < selection.end.col; col++)
2577 srp[col] ^= RS_RVid; 2468 srp[col] ^= RS_RVid;
2469
2470 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2471 srp[col] ^= RS_RVid | RS_Uline;
2472
2473 if (++col < selection.end.col)
2474 srp[col] ^= RS_RVid | RS_Uline;
2475 }
2578 } 2476 }
2579 else 2477 else
2580#endif 2478#endif
2581 { 2479 {
2582 if (i >= end_row) 2480 if (selection.beg.row >= -view_start)
2481 {
2583 col = selection.beg.col; 2482 col = selection.beg.col;
2483 row = selection.beg.row;
2484 }
2584 else 2485 else
2585 { 2486 {
2586 col = 0; 2487 col = 0;
2587 i = end_row; 2488 row = -view_start;
2588 } 2489 }
2589 2490
2590 end_row += TermWin.nrow; 2491 for (; row < min (selection.end.row, view_end); row++, col = 0)
2591 2492 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2592 for (; i < row && i < end_row; i++, col = 0)
2593 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2594 srp[col] ^= RS_RVid; 2493 srp[col] ^= RS_RVid;
2595 2494
2596 if (i == row && i < end_row) 2495 if (row == selection.end.row)
2597 for (srp = screen.rend[i]; col < selection.end.col; col++) 2496 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2598 srp[col] ^= RS_RVid; 2497 srp[col] ^= RS_RVid;
2599 } 2498 }
2600 } 2499 }
2601} 2500}
2602 2501
… …
2611{ 2510{
2612 int row, wrote; 2511 int row, wrote;
2613 unsigned int width, towrite; 2512 unsigned int width, towrite;
2614 char r1[] = "\n"; 2513 char r1[] = "\n";
2615 2514
2616 for (row = TermWin.saveLines - TermWin.nscrolled; 2515 for (row = saveLines - nsaved;
2617 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2516 row < saveLines + nrow - 1; row++)
2618 { 2517 {
2619 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2518 width = row_buf[row].l >= 0 ? row_buf[row].l
2620 : TermWin.ncol; 2519 : ncol;
2621 for (towrite = width; towrite; towrite -= wrote) 2520 for (towrite = width; towrite; towrite -= wrote)
2622 { 2521 {
2623 wrote = write (fd, & (screen.text[row][width - towrite]), 2522 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2624 towrite); 2523 towrite);
2625 if (wrote < 0) 2524 if (wrote < 0)
2626 return; /* XXX: death, no report */ 2525 return; /* XXX: death, no report */
2627 } 2526 }
2628 if (screen.tlen[row] >= 0) 2527 if (row_buf[row].l >= 0)
2629 if (write (fd, r1, 1) <= 0) 2528 if (write (fd, r1, 1) <= 0)
2630 return; /* XXX: death, no report */ 2529 return; /* XXX: death, no report */
2631 } 2530 }
2632} 2531}
2633#endif 2532#endif
2634 2533
2635/* ------------------------------------------------------------------------- * 2534/* ------------------------------------------------------------------------- *
2636 * CHARACTER SELECTION * 2535 * CHARACTER SELECTION *
2637 * ------------------------------------------------------------------------- */ 2536 * ------------------------------------------------------------------------- */
2638
2639/*
2640 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2641 */
2642void 2537void
2643rxvt_term::selection_check (int check_more) 2538rxvt_term::selection_check (int check_more)
2644{ 2539{
2645 row_col_t pos; 2540 row_col_t pos;
2646 2541
2647 if (!selection.op) 2542 if (!selection.op)
2648 return; 2543 return;
2649 2544
2650 pos.row = pos.col = 0; 2545 pos.row = pos.col = 0;
2651 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2546 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2652 || (selection.beg.row >= TermWin.nrow) 2547 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2653 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2548 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2654 || (selection.mark.row >= TermWin.nrow)
2655 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2656 || (selection.end.row >= TermWin.nrow)
2657 || (check_more == 1 2549 || (check_more == 1
2658 && current_screen == selection.screen 2550 && current_screen == selection.screen
2659 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2551 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2660 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2552 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2661 || (check_more == 2 2553 || (check_more == 2
… …
2663 && ROWCOL_IS_AFTER (selection.end, pos)) 2555 && ROWCOL_IS_AFTER (selection.end, pos))
2664 || (check_more == 3 2556 || (check_more == 3
2665 && ROWCOL_IS_AFTER (selection.end, pos)) 2557 && ROWCOL_IS_AFTER (selection.end, pos))
2666 || (check_more == 4 /* screen width change */ 2558 || (check_more == 4 /* screen width change */
2667 && (selection.beg.row != selection.end.row 2559 && (selection.beg.row != selection.end.row
2668 || selection.end.col > TermWin.ncol))) 2560 || selection.end.col > ncol)))
2669 CLEAR_SELECTION (); 2561 CLEAR_SELECTION ();
2670} 2562}
2671 2563
2672/* ------------------------------------------------------------------------- */ 2564/* ------------------------------------------------------------------------- */
2673/* 2565/*
… …
2882 * EXT: button 2 release 2774 * EXT: button 2 release
2883 */ 2775 */
2884void 2776void
2885rxvt_term::selection_request (Time tm, int x, int y) 2777rxvt_term::selection_request (Time tm, int x, int y)
2886{ 2778{
2887 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2779 if (x < 0 || x >= width || y < 0 || y >= height)
2888 return; /* outside window */ 2780 return; /* outside window */
2889 2781
2890 if (selection.text) 2782 if (selection.text)
2891 { /* internal selection */ 2783 { /* internal selection */
2892 char *str = rxvt_wcstombs (selection.text, selection.len); 2784 char *str = rxvt_wcstombs (selection.text, selection.len);
… …
2934 sel = xa[XA_CLIPBOARD]; 2826 sel = xa[XA_CLIPBOARD];
2935 2827
2936 if (XGetSelectionOwner (display->display, sel) != None) 2828 if (XGetSelectionOwner (display->display, sel) != None)
2937 { 2829 {
2938 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2830 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2939 TermWin.vt, selection_request_time); 2831 vt, selection_request_time);
2940 return 1; 2832 return 1;
2941 } 2833 }
2942 2834
2943 return 0; 2835 return 0;
2944} 2836}
… …
2967 * EXT: button 1 or 3 release 2859 * EXT: button 1 or 3 release
2968 */ 2860 */
2969void 2861void
2970rxvt_term::selection_make (Time tm) 2862rxvt_term::selection_make (Time tm)
2971{ 2863{
2972 int i, col, end_col, row, end_row; 2864 int i;
2973 wchar_t *new_selection_text; 2865 wchar_t *new_selection_text;
2974 text_t *t; 2866 text_t *t;
2975 2867
2976 switch (selection.op) 2868 switch (selection.op)
2977 { 2869 {
… …
2990 selection.op = SELECTION_DONE; 2882 selection.op = SELECTION_DONE;
2991 2883
2992 if (selection.clicks == 4) 2884 if (selection.clicks == 4)
2993 return; /* nothing selected, go away */ 2885 return; /* nothing selected, go away */
2994 2886
2887 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2888 return;
2889
2995 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2890 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2996 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2891 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2997 2892
2998 col = selection.beg.col;
2999 row = selection.beg.row + TermWin.saveLines;
3000 end_row = selection.end.row + TermWin.saveLines;
3001 int ofs = 0; 2893 int ofs = 0;
3002 int extra = 0; 2894 int extra = 0;
3003 2895
2896 int col = selection.beg.col;
2897 int row = selection.beg.row;
2898
2899 int end_col;
2900
3004 for (; row <= end_row; row++, col = 0) 2901 for (; row <= selection.end.row; row++, col = 0)
3005 { 2902 {
3006 end_col = screen.tlen[row];
3007
3008#if ENABLE_FRILLS 2903#if ENABLE_FRILLS
3009 if (selection.rect) 2904 if (selection.rect)
3010 { 2905 {
3011 col = selection.beg.col; 2906 col = selection.beg.col;
3012 end_col = TermWin.ncol + 1; 2907 end_col = ncol + 1;
2908 }
2909 else
2910#endif
2911 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2912
2913 col = max (col, 0);
2914
2915 if (row == selection.end.row
2916#if ENABLE_FRILLS
2917 || selection.rect
2918#endif
3013 } 2919 )
3014#endif
3015
3016 MAX_IT (col, 0);
3017
3018 if (end_col == -1)
3019 end_col = TermWin.ncol;
3020
3021 if (row == end_row || selection.rect)
3022 MIN_IT (end_col, selection.end.col); 2920 min_it (end_col, selection.end.col);
3023 2921
3024 t = &screen.text[row][col]; 2922 t = ROW(row).t + col;
3025 for (; col < end_col; col++) 2923 for (; col < end_col; col++)
3026 { 2924 {
3027 if (*t == NOCHAR) 2925 if (*t == NOCHAR)
3028 t++; 2926 t++;
3029#if ENABLE_COMBINING 2927#if ENABLE_COMBINING
… …
3045#endif 2943#endif
3046 else 2944 else
3047 new_selection_text[ofs++] = *t++; 2945 new_selection_text[ofs++] = *t++;
3048 } 2946 }
3049 2947
3050 if (screen.tlen[row] != -1 && row != end_row) 2948#if ENABLE_FRILLS
2949 if (selection.rect)
2950 {
2951 while (ofs
2952 && new_selection_text[ofs - 1] != C0_LF
2953 && unicode::is_space (new_selection_text[ofs - 1]))
2954 --ofs;
2955
3051 new_selection_text[ofs++] = C0_LF; 2956 new_selection_text[ofs++] = C0_LF;
2957 }
2958 else
2959#endif
2960 if (!ROW(row).is_longer () && row != selection.end.row)
2961 new_selection_text[ofs++] = C0_LF;
3052 } 2962 }
3053 2963
3054 if (end_col != selection.end.col) 2964 if (end_col != selection.end.col)
3055 new_selection_text[ofs++] = C0_LF; 2965 new_selection_text[ofs++] = C0_LF;
3056 2966
… …
3066 2976
3067 // we usually allocate much more than necessary, so realloc it smaller again 2977 // we usually allocate much more than necessary, so realloc it smaller again
3068 selection.len = ofs; 2978 selection.len = ofs;
3069 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2979 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3070 2980
2981 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2982 return;
2983
2984 selection_grab (tm);
2985}
2986
2987bool
2988rxvt_term::selection_grab (Time tm)
2989{
2990 selection_time = tm;
2991
3071 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2992 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3072 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2993 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2994 {
3073 display->set_selection_owner (this); 2995 display->set_selection_owner (this);
2996 return true;
2997 }
3074 else 2998 else
3075 rxvt_warn ("can't get primary selection, ignoring.\n"); 2999 return false;
3076 3000
3077#if 0 3001#if 0
3078 XTextProperty ct; 3002 XTextProperty ct;
3079 3003
3080 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3004 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3081 { 3005 {
3082 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3006 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3083 XFree (ct.value); 3007 XFree (ct.value);
3084 } 3008 }
3085#endif 3009#endif
3086
3087 selection_time = tm;
3088} 3010}
3089 3011
3090/* ------------------------------------------------------------------------- */ 3012/* ------------------------------------------------------------------------- */
3091/* 3013/*
3092 * Mark or select text based upon number of clicks: 1, 2, or 3 3014 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3100 3022
3101 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3023 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3102 3024
3103 if (clicks == 2 || clicks == 3) 3025 if (clicks == 2 || clicks == 3)
3104 selection_extend_colrow (selection.mark.col, 3026 selection_extend_colrow (selection.mark.col,
3105 selection.mark.row + TermWin.view_start, 3027 selection.mark.row + view_start,
3106 0, /* button 3 */ 3028 0, /* button 3 */
3107 1, /* button press */ 3029 1, /* button press */
3108 0); /* click change */ 3030 0); /* click change */
3109} 3031}
3110 3032
… …
3114 */ 3036 */
3115void 3037void
3116rxvt_term::selection_start_colrow (int col, int row) 3038rxvt_term::selection_start_colrow (int col, int row)
3117{ 3039{
3118 want_refresh = 1; 3040 want_refresh = 1;
3041
3042 selection.mark.row = row - view_start;
3119 selection.mark.col = col; 3043 selection.mark.col = col;
3120 selection.mark.row = row - TermWin.view_start;
3121 3044
3122 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3045 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3123 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3046 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3124 MAX_IT (selection.mark.col, 0);
3125 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3126 3047
3127 while (selection.mark.col > 0 3048 while (selection.mark.col > 0
3128 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3049 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3129 --selection.mark.col; 3050 --selection.mark.col;
3130 3051
3131 if (selection.op) 3052 if (selection.op)
3132 { /* clear the old selection */ 3053 { /* clear the old selection */
3133 selection.beg.row = selection.end.row = selection.mark.row; 3054 selection.beg.row = selection.end.row = selection.mark.row;
… …
3157 text_t *stp; 3078 text_t *stp;
3158 rend_t *srp; 3079 rend_t *srp;
3159 3080
3160 if (dirn == UP) 3081 if (dirn == UP)
3161 { 3082 {
3162 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3083 bound.row = - nsaved - 1;
3163 bound.col = 0; 3084 bound.col = 0;
3164 dirnadd = -1; 3085 dirnadd = -1;
3165 } 3086 }
3166 else 3087 else
3167 { 3088 {
3168 bound.row = TermWin.saveLines + TermWin.nrow; 3089 bound.row = nrow;
3169 bound.col = TermWin.ncol - 1; 3090 bound.col = ncol - 1;
3170 dirnadd = 1; 3091 dirnadd = 1;
3171 } 3092 }
3172 3093
3173 row = mark->row + TermWin.saveLines; 3094 row = mark->row;
3174 col = mark->col; 3095 col = max (mark->col, 0);
3175 MAX_IT (col, 0); 3096
3176 /* find the edge of a word */ 3097 /* find the edge of a word */
3177 stp = &screen.text[row][col]; 3098 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3178 w1 = DELIMIT_TEXT (*stp); 3099 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3179
3180 srp = &screen.rend[row][col];
3181 w2 = DELIMIT_REND (*srp);
3182 3100
3183 for (;;) 3101 for (;;)
3184 { 3102 {
3185 for (; col != bound.col; col += dirnadd) 3103 for (; col != bound.col; col += dirnadd)
3186 { 3104 {
… …
3196 break; 3114 break;
3197 } 3115 }
3198 3116
3199 if ((col == bound.col) && (row != bound.row)) 3117 if ((col == bound.col) && (row != bound.row))
3200 { 3118 {
3201 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3119 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3202 { 3120 {
3203 trow = row + dirnadd; 3121 trow = row + dirnadd;
3204 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3122 tcol = dirn == UP ? ncol - 1 : 0;
3205 3123
3206 if (screen.text[trow] == NULL) 3124 if (!ROW(trow).t)
3207 break; 3125 break;
3208 3126
3209 stp = & (screen.text[trow][tcol]); 3127 stp = ROW(trow).t + tcol;
3210 srp = & (screen.rend[trow][tcol]); 3128 srp = ROW(trow).r + tcol;
3211 3129
3212 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3130 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3213 break; 3131 break;
3214 3132
3215 row = trow; 3133 row = trow;
… …
3223Old_Word_Selection_You_Die: 3141Old_Word_Selection_You_Die:
3224 if (dirn == DN) 3142 if (dirn == DN)
3225 col++; /* put us on one past the end */ 3143 col++; /* put us on one past the end */
3226 3144
3227 /* Poke the values back in */ 3145 /* Poke the values back in */
3228 ret->row = row - TermWin.saveLines; 3146 ret->row = row;
3229 ret->col = col; 3147 ret->col = col;
3230} 3148}
3231 3149
3232/* ------------------------------------------------------------------------- */ 3150/* ------------------------------------------------------------------------- */
3233/* 3151/*
… …
3238 * flag == 2 ==> button 3 motion 3156 * flag == 2 ==> button 3 motion
3239 */ 3157 */
3240void 3158void
3241rxvt_term::selection_extend (int x, int y, int flag) 3159rxvt_term::selection_extend (int x, int y, int flag)
3242{ 3160{
3243 int col, row; 3161 int col = clamp (Pixel2Col (x), 0, ncol);
3244 3162 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3245 col = Pixel2Col (x);
3246 row = Pixel2Row (y);
3247 MAX_IT (row, 0);
3248 MIN_IT (row, (int)TermWin.nrow - 1);
3249 MAX_IT (col, 0);
3250 MIN_IT (col, (int)TermWin.ncol);
3251 3163
3252 /* 3164 /*
3253 * If we're selecting characters (single click) then we must check first 3165 * If we're selecting characters (single click) then we must check first
3254 * if we are at the same place as the original mark. If we are then 3166 * if we are at the same place as the original mark. If we are then
3255 * select nothing. Otherwise, if we're to the right of the mark, you have to 3167 * select nothing. Otherwise, if we're to the right of the mark, you have to
3256 * be _past_ a character for it to be selected. 3168 * be _past_ a character for it to be selected.
3257 */ 3169 */
3258 if (((selection.clicks % 3) == 1) && !flag 3170 if (((selection.clicks % 3) == 1) && !flag
3259 && (col == selection.mark.col 3171 && (col == selection.mark.col
3260 && (row == selection.mark.row + TermWin.view_start))) 3172 && (row == selection.mark.row + view_start)))
3261 { 3173 {
3262 /* select nothing */ 3174 /* select nothing */
3263 selection.beg.row = selection.end.row = 0; 3175 selection.beg.row = selection.end.row = 0;
3264 selection.beg.col = selection.end.col = 0; 3176 selection.beg.col = selection.end.col = 0;
3265 selection.clicks = 4; 3177 selection.clicks = 4;
… …
3280 * Extend the selection to the specified col/row 3192 * Extend the selection to the specified col/row
3281 */ 3193 */
3282void 3194void
3283rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3195rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3284{ 3196{
3285 int16_t ncol = TermWin.ncol;
3286 int end_col;
3287 row_col_t pos; 3197 row_col_t pos;
3288 enum { 3198 enum {
3289 LEFT, RIGHT 3199 LEFT, RIGHT
3290 } closeto = RIGHT; 3200 } closeto = RIGHT;
3291 3201
… …
3322 selection.beg.col = selection.end.col = selection.mark.col; 3232 selection.beg.col = selection.end.col = selection.mark.col;
3323 selection.beg.row = selection.end.row = selection.mark.row; 3233 selection.beg.row = selection.end.row = selection.mark.row;
3324 } 3234 }
3325 3235
3326 pos.col = col; 3236 pos.col = col;
3327 pos.row = row; 3237 pos.row = row - view_start;
3328
3329 pos.row -= TermWin.view_start; /* adjust for scroll */
3330 3238
3331 /* 3239 /*
3332 * This is mainly xterm style selection with a couple of differences, mainly 3240 * This is mainly xterm style selection with a couple of differences, mainly
3333 * in the way button3 drag extension works. 3241 * in the way button3 drag extension works.
3334 * We're either doing: button1 drag; button3 press; or button3 drag 3242 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3393 } 3301 }
3394 } 3302 }
3395 3303
3396 if (selection.clicks == 1) 3304 if (selection.clicks == 1)
3397 { 3305 {
3398 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3306 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3399 3307 && !ROW(selection.beg.row).is_longer ()
3400 if (selection.beg.col > end_col
3401 && end_col != -1
3402#if ENABLE_FRILLS 3308#if ENABLE_FRILLS
3403 && !selection.rect 3309 && !selection.rect
3404#endif 3310#endif
3405 ) 3311 )
3406 selection.beg.col = ncol; 3312 selection.beg.col = ncol;
3407 3313
3408 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3409
3410 if ( 3314 if (
3411 selection.end.col > end_col 3315 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3412 && end_col != -1 3316 && !ROW(selection.end.row).is_longer ()
3413#if ENABLE_FRILLS 3317#if ENABLE_FRILLS
3414 && !selection.rect 3318 && !selection.rect
3415#endif 3319#endif
3416 ) 3320 )
3417 selection.end.col = ncol; 3321 selection.end.col = ncol;
… …
3425 selection_delimit_word (DN, &selection.end, &selection.end); 3329 selection_delimit_word (DN, &selection.end, &selection.end);
3426 } 3330 }
3427 else if (selection.clicks == 3) 3331 else if (selection.clicks == 3)
3428 { 3332 {
3429#if ENABLE_FRILLS 3333#if ENABLE_FRILLS
3430 if (options & Opt_tripleclickwords) 3334 if (OPTION (Opt_tripleclickwords))
3431 { 3335 {
3432 int end_row;
3433
3434 selection_delimit_word (UP, &selection.beg, &selection.beg); 3336 selection_delimit_word (UP, &selection.beg, &selection.beg);
3435 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3436 3337
3437 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3338 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3438 { 3339 {
3439 end_col = screen.tlen[end_row + TermWin.saveLines]; 3340 if (!ROW(end_row).is_longer ())
3440
3441 if (end_col != -1)
3442 { 3341 {
3443 selection.end.row = end_row; 3342 selection.end.row = end_row;
3444 selection.end.col = end_col; 3343 selection.end.col = ROW(end_row).l;
3445 selection_remove_trailing_spaces (); 3344 selection_remove_trailing_spaces ();
3446 break; 3345 break;
3447 } 3346 }
3448 } 3347 }
3449 } 3348 }
… …
3455 3354
3456 selection.beg.col = 0; 3355 selection.beg.col = 0;
3457 selection.end.col = ncol; 3356 selection.end.col = ncol;
3458 3357
3459 // select a complete logical line 3358 // select a complete logical line
3460 while (selection.beg.row > -TermWin.saveLines 3359 while (selection.beg.row > -saveLines
3461 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) 3360 && ROW(selection.beg.row - 1).is_longer ())
3462 selection.beg.row--; 3361 selection.beg.row--;
3463 3362
3464 while (selection.end.row < TermWin.nrow 3363 while (selection.end.row < nrow
3465 && screen.tlen[selection.end.row + TermWin.saveLines] == -1) 3364 && ROW(selection.end.row).is_longer ())
3466 selection.end.row++; 3365 selection.end.row++;
3467 } 3366 }
3468 } 3367 }
3469 3368
3470 if (button3 && buttonpress) 3369 if (button3 && buttonpress)
… …
3481 } 3380 }
3482 } 3381 }
3483 3382
3484#if ENABLE_FRILLS 3383#if ENABLE_FRILLS
3485 if (selection.rect && selection.beg.col > selection.end.col) 3384 if (selection.rect && selection.beg.col > selection.end.col)
3486 SWAP_IT (selection.beg.col, selection.end.col, int); 3385 ::swap (selection.beg.col, selection.end.col);
3487#endif 3386#endif
3488} 3387}
3489 3388
3490#if ENABLE_FRILLS 3389#if ENABLE_FRILLS
3491void 3390void
… …
3495 text_t *stp; 3394 text_t *stp;
3496 3395
3497 end_col = selection.end.col; 3396 end_col = selection.end.col;
3498 end_row = selection.end.row; 3397 end_row = selection.end.row;
3499 3398
3500 for ( ; end_row >= selection.beg.row; ) 3399 for (; end_row >= selection.beg.row; )
3501 { 3400 {
3502 stp = screen.text[end_row + TermWin.saveLines]; 3401 stp = ROW(end_row).t;
3503 3402
3504 while (--end_col >= 0) 3403 while (--end_col >= 0)
3505 { 3404 {
3506 if (stp[end_col] != ' ' 3405 if (stp[end_col] != NOCHAR
3507 && stp[end_col] != '\t' 3406 && !unicode::is_space (stp[end_col]))
3508 && stp[end_col] != NOCHAR)
3509 break; 3407 break;
3510 } 3408 }
3511 3409
3512 if (end_col >= 0 3410 if (end_col >= 0
3513 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3411 || !ROW(end_row - 1).is_longer ())
3514 { 3412 {
3515 selection.end.col = end_col + 1; 3413 selection.end.col = end_col + 1;
3516 selection.end.row = end_row; 3414 selection.end.row = end_row;
3517 break; 3415 break;
3518 } 3416 }
3519 3417
3520 end_row--; 3418 end_row--;
3521 end_col = TermWin.ncol; 3419 end_col = ncol;
3522 } 3420 }
3523 3421
3524 if (selection.mark.row > selection.end.row) 3422 if (selection.mark.row > selection.end.row)
3525 { 3423 {
3526 selection.mark.row = selection.end.row; 3424 selection.mark.row = selection.end.row;
… …
3689 */ 3587 */
3690void 3588void
3691rxvt_term::pixel_position (int *x, int *y) 3589rxvt_term::pixel_position (int *x, int *y)
3692{ 3590{
3693 *x = Pixel2Col (*x); 3591 *x = Pixel2Col (*x);
3694 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3592 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3695 *y = Pixel2Row (*y); 3593 *y = Pixel2Row (*y);
3696 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3594 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3697} 3595}
3698 3596
3699/* ------------------------------------------------------------------------- */ 3597/* ------------------------------------------------------------------------- */
3700#ifdef USE_XIM 3598#ifdef USE_XIM
3701void 3599void
3702rxvt_term::im_set_position (XPoint &pos) 3600rxvt_term::im_set_position (XPoint &pos)
3703{ 3601{
3704 XWindowAttributes xwa; 3602 XWindowAttributes xwa;
3705 3603
3706 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3604 XGetWindowAttributes (display->display, vt, &xwa);
3707 3605
3708 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3606 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3709 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3607 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3710} 3608}
3711#endif 3609#endif
3712 3610
3713#if ENABLE_OVERLAY 3611#if ENABLE_OVERLAY
3714void 3612void
3715rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3613rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3716{ 3614{
3717 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3615 if (nrow < 1 || ncol < 1)
3718 return; 3616 return;
3719 3617
3720 want_refresh = 1; 3618 want_refresh = 1;
3721 3619
3722 scr_overlay_off (); 3620 scr_overlay_off ();
3723 3621
3724 if (x < 0) x = TermWin.ncol - w; 3622 if (x < 0) x = ncol - w;
3725 if (y < 0) y = TermWin.nrow - h; 3623 if (y < 0) y = nrow - h;
3726 3624
3727 // make space for border 3625 // make space for border
3728 w += 2; MIN_IT (w, TermWin.ncol); 3626 w += 2; min_it (w, ncol);
3729 h += 2; MIN_IT (h, TermWin.nrow); 3627 h += 2; min_it (h, nrow);
3730 3628
3731 x -= 1; MAX_IT (x, 0); 3629 x -= 1; clamp_it (x, 0, ncol - w);
3732 y -= 1; MAX_IT (y, 0); 3630 y -= 1; clamp_it (y, 0, nrow - h);
3733
3734 MIN_IT (x, TermWin.ncol - w);
3735 MIN_IT (y, TermWin.nrow - h);
3736 3631
3737 ov_x = x; ov_y = y; 3632 ov_x = x; ov_y = y;
3738 ov_w = w; ov_h = h; 3633 ov_w = w; ov_h = h;
3739 3634
3740 ov_text = new text_t *[h]; 3635 ov_text = new text_t *[h];
… …
3826rxvt_term::scr_swap_overlay () 3721rxvt_term::scr_swap_overlay ()
3827{ 3722{
3828 if (!ov_text) 3723 if (!ov_text)
3829 return; 3724 return;
3830 3725
3831 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3832
3833 // swap screen mem with overlay 3726 // swap screen mem with overlay
3834 for (int y = ov_h; y--; ) 3727 for (int y = ov_h; y--; )
3835 { 3728 {
3836 text_t *t1 = ov_text[y]; 3729 text_t *t1 = ov_text[y];
3837 rend_t *r1 = ov_rend[y]; 3730 rend_t *r1 = ov_rend[y];
3838 3731
3839 text_t *t2 = screen.text[y + row_offset] + ov_x; 3732 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3840 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3733 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3841 3734
3842 for (int x = ov_w; x--; ) 3735 for (int x = ov_w; x--; )
3843 { 3736 {
3844 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3737 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3845 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3738 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3847 } 3740 }
3848} 3741}
3849 3742
3850#endif 3743#endif
3851/* ------------------------------------------------------------------------- */ 3744/* ------------------------------------------------------------------------- */
3745

Diff Legend

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