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

Diff Legend

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