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.177 by root, Tue Dec 20 21:49:55 2005 UTC vs.
Revision 1.220 by root, Mon Jan 9 23:18:49 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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 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() \
… …
83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87 88
88#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
89#define ROW(n) (save [LINENO (n)])
90
91/* 89/*
92 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
93 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
94 * 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
95 */ 93 */
… …
126 lalloc (l); 124 lalloc (l);
127 col = 0; 125 col = 0;
128 width = ncol; 126 width = ncol;
129 } 127 }
130 128
129 l.touch ();
130
131 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 133
134 text_t *et = l.t + col; 134 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
145/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
146void 146void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
148{ 148{
149 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
150} 153}
151 154
152/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
153 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
154 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
158
155void 159void
156rxvt_term::scr_reset () 160rxvt_term::scr_reset ()
157{ 161{
158 unsigned int p, q;
159 int k;
160
161#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
162 scr_overlay_off (); 163 scr_overlay_off ();
163#endif 164#endif
164 165
165 view_start = 0; 166 view_start = 0;
… …
175 return; 176 return;
176 177
177 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
178 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
179 { 180 {
181 //TODO//FIXME
180 saveLines++; 182 saveLines++;
181 prev_nrow--; 183 prev_nrow--;
182 nsaved++; 184 nsaved++;
183 } 185 }
184 186
… …
188 total_rows = nrow + saveLines; 190 total_rows = nrow + saveLines;
189 191
190 screen.tscroll = 0; 192 screen.tscroll = 0;
191 screen.bscroll = nrow - 1; 193 screen.bscroll = nrow - 1;
192 194
193 if (!save) 195 if (!row_buf)
194 { 196 {
195 /* 197 /*
196 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
197 * Note: this is still needed so that all the scrollback lines are NULL
198 */ 199 */
199 nsaved = 0; /* no saved lines */ 200 nsaved = 0; /* no saved lines */
200 term_start = 0; 201 term_start = 0;
201 202
202 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
203 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
204 205
205 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
207 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209 209
210 for (p = nrow; p--; ) 210 for (int row = nrow; row--; )
211 { 211 {
212 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 } 215 }
216 216
217 memset (charsets, 'B', sizeof (charsets)); 217 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 218 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 219 screen.flags = Screen_DefaultFlags;
… …
243 { 243 {
244 /* 244 /*
245 * add or delete rows as appropriate 245 * add or delete rows as appropriate
246 */ 246 */
247 247
248 rxvt_salloc *old_ta; 248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
249 rxvt_salloc *old_ra; 249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250 250
251#if 0
251 if (nrow < prev_nrow) 252 if (nrow < prev_nrow)
252 { 253 {
253 /* delete rows */
254 k = min (nsaved, prev_nrow - nrow);
255 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
256 scr_scroll_text (0, (int)prev_nrow - 1, k);
257
258 for (p = nrow; p < prev_nrow; p++) 254 for (int row = nrow; row < prev_nrow; row++)
259 { 255 {
260 lfree (ROW(p));
261 lfree (swap_save[p]); 256 lfree (swap_buf [row]);
262 lfree (drawn[p]); 257 lfree (drawn_buf[row]);
263 } 258 }
259 }
260#endif
264 261
265 /* we have fewer rows so fix up cursor position */ 262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
266 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267 264
268 scr_reset_realloc (); /* realloc _last_ */ 265 for (int row = min (nrow, prev_nrow); row--; )
266 {
267 lresize (drawn_buf[row]);
268 lresize (swap_buf [row]);
269 }
270
271 for (int row = prev_nrow; row < nrow; row++)
272 {
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 }
276
277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
269 } 279
270 else if (nrow > prev_nrow) 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start - nsaved , prev_total_rows);
282 int q = total_rows; // rewrapped row
283
284 if (nsaved)
285 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm.
288
289 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291
271 { 292 do
272 /* add rows */
273 scr_reset_realloc (); /* realloc _first_ */
274
275 int ocol = ncol;
276 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
277
278 k = min (nsaved, nrow - prev_nrow);
279
280 for (p = prev_total_rows; p < total_rows; p++)
281 save[p].clear ();
282
283 for (p = prev_total_rows; p < total_rows - k; p++)
284 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
285
286 for (p = prev_nrow; p < nrow; p++)
287 { 293 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 294 p = MOD (p - 1, prev_total_rows);
289 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
290 }
291
292 if (k > 0)
293 {
294 scr_scroll_text (0, (int)nrow - 1, -k);
295 screen.cur.row += k;
296 screen.s_cur.row += k;
297 nsaved -= k;
298 }
299
300#ifdef DEBUG_STRICT 295#ifdef DEBUG_STRICT
301 assert (screen.cur.row < nrow); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
302#else /* drive with your eyes closed */
303 MIN_IT (screen.cur.row, nrow - 1);
304#endif 297#endif
305 ncol = ocol; // save b/c scr_blank_screen_mem uses this
306 }
307
308 /* resize columns */
309 if (ncol != prev_ncol)
310 {
311 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
312 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
313
314 for (p = total_rows; p--; )
315 lresize (save[p]);
316
317 for (p = nrow; p--; )
318 {
319 lresize (drawn[p]);
320 lresize (swap_save[p]);
321 }
322
323 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
324
325 delete old_ta;
326 delete old_ra;
327 }
328
329#if 0
330 // re-wrap lines, this is rather ugly, possibly because I am too dumb
331 // to come up with a lean and mean algorithm.
332 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
333 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
334
335 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
336 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
337 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
338
339 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
340
341 p = prev_total_rows;
342 q = total_rows;
343
344 while (p > 0 && q > 0)
345 {
346 --p;
347
348 printf ("pq %d:%d\n", p, q);
349 if (save[p].t)
350 {
351 int llen = save[p].l; 298 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l;
352 300
353 assert (llen >= 0); 301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
354
355 while (p && save[p - 1].l < 0)
356 { 302 {
303 p = MOD (p - 1, prev_total_rows);
304
357 --p; 305 plines++;
358 llen += prev_ncol; 306 llen += prev_ncol;
359 } 307 }
360 308
361 int qlines = llen / ncol + 1; 309 int qlines = max (0, (llen - 1) / ncol) + 1;
310
311 // drop partial lines completely
312 if (q < qlines)
313 break;
314
315 q -= qlines;
316
362 int lofs = 0; 317 int lofs = 0;
318 line_t *qline;
363 319
364 q -= qlines; 320 // re-assemble the full line by destination lines
365
366 int qrow = q;
367
368 printf ("QL %d llen %d\n", qlines, llen);//D
369 for (; qlines--; qrow++) 321 for (int qrow = q; qlines--; qrow++)
370 { 322 {
323 qline = row_buf + qrow;
324 lalloc (*qline);
325 qline->l = ncol;
326 qline->is_longer (1);
327
371 if (qrow >= 0) 328 int qcol = 0;
329
330 // fill a single destination line
331 while (lofs < llen && qcol < ncol)
372 { 332 {
373 tp [qrow] = (text_t *)ta->alloc ();
374 rp [qrow] = (rend_t *)ra->alloc ();
375 tl [qrow] = LINE_CONT1;
376
377 int qcol = 0;
378
379 for (;;)
380 {
381 int prow = lofs / prev_ncol + p; 333 int prow = lofs / prev_ncol;
382 int pcol = lofs % prev_ncol; 334 int pcol = lofs % prev_ncol;
383 335
336 prow = MOD (p + prow, prev_total_rows);
337
338 // we only adjust the cursor _row_ and put it into
339 // the topmost line of "long line" it was in, as
340 // this seems to upset applications/shells/readline
341 // least.
342 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow);
344
345 line_t &pline = old_buf [prow];
346
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385 348
386 printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
387
388 if (len <= 0)
389 {
390 tl [qrow] = qcol;
391
392 TODO
393 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
394 ncol - qcol, DEFAULT_RSTYLE);
395
396 break;
397 }
398
399 assert (lofs < 1000); 349 assert (len);
350 assert (pline.t);
400 351
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403 354
404 lofs += len; 355 lofs += len;
405 qcol += len; 356 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 } 357 }
411 else
412 lofs += ncol;
413 } 358 }
359
360 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
361 qline->is_longer (0);
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414 } 363 }
364 while (p != pend && q > 0);
365
366 term_start = total_rows - nrow;
367 nsaved = term_start - q;
368
369 // make sure all terminal lines exist
370 while (nsaved < 0)
371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
372 }
373 else
415 } 374 {
375 // if no scrollback exists (yet), wing, instead of wrap
376
377 for (int row = min (nrow, prev_nrow); row--; )
378 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row];
416 381
417 free (screen.text); screen.text = tp; 382 qline = pline;
418 free (screen.rend); screen.rend = rp; 383 lresize (qline);
419 free (screen.tlen); screen.tlen = tl; 384 }
420 385
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 386 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390
391 term_start = 0;
392 }
393
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = -nsaved; i < nrow; i++)
396 assert (ROW (i).t);
422#endif 397#endif
398
399 free (old_buf);
400 delete old_ta;
401 delete old_ra;
402
403 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1);
423 405
424 if (tabs) 406 if (tabs)
425 free (tabs); 407 free (tabs);
426 } 408 }
427 409
428 prev_nrow = nrow; 410 prev_nrow = nrow;
429 prev_ncol = ncol; 411 prev_ncol = ncol;
430 412
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 413 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 414
433 for (p = 0; p < ncol; p++) 415 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 416 tabs [col] = col % TABSIZE == 0;
435 417
436 tt_winch (); 418 tt_winch ();
437}
438 419
439void 420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
440rxvt_term::scr_reset_realloc ()
441{
442 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
443 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
444 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
445 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
446} 421}
447 422
448/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
449/* 424/*
450 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
… …
453rxvt_term::scr_release () 428rxvt_term::scr_release ()
454{ 429{
455 delete talloc; talloc = 0; 430 delete talloc; talloc = 0;
456 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
457 432
458 free (save); 433 free (row_buf);
459 free (swap_save); 434 free (swap_buf);
460 free (drawn); 435 free (drawn_buf);
461 free (buf);
462 free (tabs); 436 free (tabs);
437
438 row_buf = 0; // signal that we freed all the arrays
463} 439}
464 440
465/* ------------------------------------------------------------------------- */ 441/* ------------------------------------------------------------------------- */
466/* 442/*
467 * Hard reset 443 * Hard reset
… …
518 set_font_style (); 494 set_font_style ();
519 break; 495 break;
520 } 496 }
521 497
522 /* boundary check in case screen size changed between SAVE and RESTORE */ 498 /* boundary check in case screen size changed between SAVE and RESTORE */
523 MIN_IT (s->cur.row, nrow - 1); 499 min_it (s->cur.row, nrow - 1);
524 MIN_IT (s->cur.col, ncol - 1); 500 min_it (s->cur.col, ncol - 1);
525#ifdef DEBUG_STRICT 501#ifdef DEBUG_STRICT
526 assert (s->cur.row >= 0); 502 assert (s->cur.row >= 0);
527 assert (s->cur.col >= 0); 503 assert (s->cur.col >= 0);
528#else /* drive with your eyes closed */
529 MAX_IT (s->cur.row, 0);
530 MAX_IT (s->cur.col, 0);
531#endif 504#endif
532} 505}
533 506
534/* ------------------------------------------------------------------------- */ 507/* ------------------------------------------------------------------------- */
535/* 508/*
… …
546 if (current_screen == scrn) 519 if (current_screen == scrn)
547 return scrn; 520 return scrn;
548 521
549 selection_check (2); /* check for boundary cross */ 522 selection_check (2); /* check for boundary cross */
550 523
551 SWAP_IT (scrn, current_screen, int); 524 int i = current_screen; current_screen = scrn; scrn = i;
552 525
553 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 526 ::swap (screen.cur.row, swap.cur.row);
554 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 527 ::swap (screen.cur.col, swap.cur.col);
555 MAX_IT (screen.cur.row, 0); 528
556 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
557 MAX_IT (screen.cur.col, 0); 530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
558 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
559 531
560#if NSCREENS 532#if NSCREENS
561 if (options & Opt_secondaryScreen) 533 if (OPTION (Opt_secondaryScreen))
562 { 534 {
563 num_scr = 0; 535 num_scr = 0;
564 536
565 for (int i = nrow; i--; ) 537 for (int i = prev_nrow; i--; )
566 SWAP_IT (ROW(i), swap_save[i], line_t); 538 ::swap (ROW(i), swap_buf [i]);
567 539
568 SWAP_IT (screen.charset, swap.charset, int16_t); 540 ::swap (screen.charset, swap.charset);
569 SWAP_IT (screen.flags, swap.flags, int); 541 ::swap (screen.flags, swap.flags);
570 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
571 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
572 } 544 }
573 else 545 else
574#endif 546#endif
575 if (options & Opt_secondaryScroll) 547 if (OPTION (Opt_secondaryScroll))
576 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
577 549
578 return scrn; 550 return scrn;
579} 551}
580 552
… …
642 num_scr += count; 614 num_scr += count;
643 615
644 if (count > 0 616 if (count > 0
645 && row1 == 0 617 && row1 == 0
646 && row2 == nrow - 1 618 && row2 == nrow - 1
647 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
648 { 620 {
649 nsaved = min (nsaved + count, saveLines); 621 nsaved = min (nsaved + count, saveLines);
622
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
624
650 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
651 626
652 if (selection.op && current_screen == selection.screen) 627 if (selection.op && current_screen == selection.screen)
653 { 628 {
654 selection.beg.row -= count; 629 selection.beg.row -= count;
655 selection.end.row -= count; 630 selection.end.row -= count;
656 selection.mark.row -= count; 631 selection.mark.row -= count;
657 632
658 selection_check (0); 633 if (selection.beg.row < -nsaved
634 || selection.end.row < -nsaved
635 || selection.mark.row < -nsaved)
636 {
637 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR;
639 }
659 } 640 }
660 641
661 for (int i = count; i--; ) 642 for (int i = count; i--; )
662 scr_blank_screen_mem (ROW(row2 - i), rstyle); 643 {
644 // basically thi is a slightly optimized scr_blank_screen_mem
645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
652 }
663 653
664 if ((options & Opt_scrollWithBuffer) 654 if (OPTION (Opt_scrollWithBuffer)
665 && view_start != 0 655 && view_start != 0
666 && view_start != saveLines) 656 && view_start != saveLines)
667 scr_page (UP, count); 657 scr_page (UP, count);
668 } 658 }
669 else 659 else
670 { 660 {
671 if (selection.op && current_screen == selection.screen) 661 if (selection.op && current_screen == selection.screen)
672 { 662 {
673 int i = selection.beg.row; 663 if ((selection.beg.row < row1 && selection.end.row > row1)
674 int j = selection.end.row; 664 || (selection.beg.row < row2 && selection.end.row > row2)
675
676 if ((i < row1 && j > row1)
677 || (i < row2 && j > row2)
678 || (i - count < row1 && i >= row1) 665 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
679 || (i - count > row2 && i <= row2) 666 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
680 || (j - count < row1 && j >= row1) 667 || (selection.end.row - count < row1 && selection.end.row >= row1)
681 || (j - count > row2 && j <= row2)) 668 || (selection.end.row - count > row2 && selection.end.row <= row2))
682 { 669 {
683 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
684 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
685 } 672 }
686 else if (j >= row1 && j <= row2) 673 else if (selection.end.row >= row1 && selection.end.row <= row2)
687 { 674 {
688 /* move selected region too */ 675 /* move selected region too */
689 selection.beg.row -= count; 676 selection.beg.row -= count;
690 selection.end.row -= count; 677 selection.end.row -= count;
691 selection.mark.row -= count; 678 selection.mark.row -= count;
… …
697 // use a simple and robust scrolling algorithm, this 684 // use a simple and robust scrolling algorithm, this
698 // part of scr_scroll_text is not time-critical. 685 // part of scr_scroll_text is not time-critical.
699 686
700 int rows = row2 - row1 + 1; 687 int rows = row2 - row1 + 1;
701 688
689 min_it (count, rows);
690
691 line_t *temp_buf = row_buf + total_rows;
692
702 for (int row = 0; row < rows; row++) 693 for (int row = 0; row < rows; row++)
703 { 694 {
704 buf [row] = ROW(row1 + (row + count + rows) % rows); 695 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
705 696
706 if (!IN_RANGE_EXC (row + count, 0, rows)) 697 if (!IN_RANGE_EXC (row + count, 0, rows))
707 scr_blank_screen_mem (buf [row], rstyle); 698 scr_blank_screen_mem (temp_buf [row], rstyle);
708 } 699 }
709 700
710 for (int row = 0; row < rows; row++) 701 for (int row = 0; row < rows; row++)
711 ROW(row1 + row) = buf [row]; 702 ROW(row1 + row) = temp_buf [row];
712 } 703 }
713 704
714 return count; 705 return count;
715} 706}
716 707
717/* ------------------------------------------------------------------------- */ 708/* ------------------------------------------------------------------------- */
718/* 709/*
719 * Add text given in <str> of length <len> to screen struct 710 * Add text given in <str> of length <len> to screen struct
720 */ 711 */
721void 712void
722rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 713rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
723{ 714{
724 if (len <= 0) /* sanity */ 715 if (len <= 0) /* sanity */
725 return; 716 return;
726 717
727 unsigned char checksel; 718 unsigned char checksel;
728 unicode_t c; 719 unicode_t c;
729 int row, last_col; 720 int ncol = this->ncol;
730 const unicode_t *strend = str + len; 721 const wchar_t *strend = str + len;
731 722
732 want_refresh = 1; 723 want_refresh = 1;
733 ZERO_SCROLLBACK (); 724 ZERO_SCROLLBACK ();
734 last_col = ncol;
735 725
736 if (nlines > 0) 726 if (minlines > 0)
737 { 727 {
738 nlines += screen.cur.row - screen.bscroll; 728 minlines += screen.cur.row - screen.bscroll;
729
739 if ((nlines > 0) 730 if (minlines > 0
740 && (screen.tscroll == 0) 731 && screen.tscroll == 0
741 && (screen.bscroll == (nrow - 1))) 732 && screen.bscroll == nrow - 1)
742 { 733 {
743 /* _at least_ this many lines need to be scrolled */ 734 /* _at least_ this many lines need to be scrolled */
744 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 735 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
745 screen.cur.row -= nlines; 736 screen.cur.row -= minlines;
746 } 737 }
747 } 738 }
748 739
749#ifdef DEBUG_STRICT 740#ifdef DEBUG_STRICT
750 assert (screen.cur.col < last_col); 741 assert (screen.cur.col < ncol);
751 assert ((screen.cur.row < nrow) 742 assert (screen.cur.row < nrow
752 && (screen.cur.row >= - (int32_t)nsaved)); 743 && screen.cur.row >= -nsaved);
753#else /* drive with your eyes closed */
754 MIN_IT (screen.cur.col, last_col - 1);
755 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
756 MAX_IT (screen.cur.row, - (int32_t)nsaved);
757#endif 744#endif
758 row = screen.cur.row; 745 int row = screen.cur.row;
759 746
760 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 747 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
761 748
762 line_t *line = &ROW(row); 749 line_t *line = &ROW(row);
763 750
764 while (str < strend) 751 while (str < strend)
765 { 752 {
766 c = *str++; 753 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
767 754
768 if (c < 0x20) 755 if (c < 0x20)
769 if (c == C0_LF) 756 if (c == C0_LF)
770 { 757 {
771 if (!line->is_longer ()) /* XXX: think about this */
772 MAX_IT (line->l, screen.cur.col); 758 max_it (line->l, screen.cur.col);
773 759
774 screen.flags &= ~Screen_WrapNext; 760 screen.flags &= ~Screen_WrapNext;
775 761
776 if (screen.cur.row == screen.bscroll) 762 if (screen.cur.row == screen.bscroll)
777 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 763 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
781 line = &ROW(row); /* _must_ refresh */ 767 line = &ROW(row); /* _must_ refresh */
782 continue; 768 continue;
783 } 769 }
784 else if (c == C0_CR) 770 else if (c == C0_CR)
785 { 771 {
786 if (!line->is_longer ()) /* XXX: think about this */
787 MAX_IT (line->l, screen.cur.col); 772 max_it (line->l, screen.cur.col);
788 773
789 screen.flags &= ~Screen_WrapNext; 774 screen.flags &= ~Screen_WrapNext;
790 screen.cur.col = 0; 775 screen.cur.col = 0;
791 continue; 776 continue;
792 } 777 }
… …
809 CLEAR_SELECTION (); 794 CLEAR_SELECTION ();
810 } 795 }
811 796
812 if (screen.flags & Screen_WrapNext) 797 if (screen.flags & Screen_WrapNext)
813 { 798 {
799 max_it (line->l, ncol);
814 line->set_is_longer (); 800 line->is_longer (1);
815 801
816 scr_do_wrap (); 802 scr_do_wrap ();
817 803
818 row = screen.cur.row; 804 row = screen.cur.row;
819 line = &ROW(row); /* _must_ refresh */ 805 line = &ROW(row); /* _must_ refresh */
… …
827 // do wcwidth before further replacements, as wcwidth might return -1 813 // do wcwidth before further replacements, as wcwidth might return -1
828 // for the line drawing characters below as they might be invalid in the current 814 // for the line drawing characters below as they might be invalid in the current
829 // locale. 815 // locale.
830 int width = c < 0x100 ? 1 : wcwidth (c); 816 int width = c < 0x100 ? 1 : wcwidth (c);
831 817
832 if (charsets[screen.charset] == '0') // DEC SPECIAL 818 if (charsets [screen.charset] == '0') // DEC SPECIAL
833 { 819 {
834 // vt100 special graphics and line drawing 820 // vt100 special graphics and line drawing
835 // 5f-7e standard vt100 821 // 5f-7e standard vt100
836 // 40-5e rxvt extension for extra curses acs chars 822 // 40-5e rxvt extension for extra curses acs chars
837 static uint16_t vt100_0[62] = { // 41 .. 7e 823 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
889 } 875 }
890 876
891 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 877 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
892 878
893 // if the character doesn't fit into the remaining columns... 879 // if the character doesn't fit into the remaining columns...
894 if (screen.cur.col > last_col - width && last_col >= width) 880 if (screen.cur.col > ncol - width && ncol >= width)
895 { 881 {
896 // ...output spaces 882 // ...output spaces
897 c = ' '; 883 c = ' ';
898 // and try the same character next loop iteration 884 // and try the same character next loop iteration
899 --str; 885 --str;
900 } 886 }
901 887
888 line->touch ();
889
902 do 890 do
903 { 891 {
904 line->t[screen.cur.col] = c; 892 line->t[screen.cur.col] = c;
905 line->r[screen.cur.col] = rend; 893 line->r[screen.cur.col] = rend;
906 894
907 if (screen.cur.col < last_col - 1) 895 if (screen.cur.col < ncol - 1)
908 screen.cur.col++; 896 screen.cur.col++;
909 else 897 else
910 { 898 {
911 line->l = last_col; 899 line->l = ncol;
912 if (screen.flags & Screen_Autowrap) 900 if (screen.flags & Screen_Autowrap)
913 screen.flags |= Screen_WrapNext; 901 screen.flags |= Screen_WrapNext;
914 break; 902 break;
915 } 903 }
916 904
… …
918 } 906 }
919 while (--width > 0); 907 while (--width > 0);
920 908
921 // pad with spaces when overwriting wide character with smaller one 909 // pad with spaces when overwriting wide character with smaller one
922 if (!width) 910 if (!width)
911 {
912 line->touch ();
913
923 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 914 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
924 { 915 {
925 line->t[c] = ' '; 916 line->t[c] = ' ';
926 line->r[c] = rend; 917 line->r[c] = rend;
927 } 918 }
919 }
928 } 920 }
929 else // width == 0 921 else // width == 0
930 { 922 {
931#if ENABLE_COMBINING 923#if ENABLE_COMBINING
932 // handle combining characters 924 // handle combining characters
933 // we just tag the accent on the previous on-screen character. 925 // we just tag the accent on the previous on-screen character.
934 // this is arguably not correct, but also arguably not wrong. 926 // this is arguably not correct, but also arguably not wrong.
935 // we don't handle double-width characters nicely yet. 927 // we don't handle double-width characters nicely yet.
928 line_t *linep;
936 text_t *tp; 929 text_t *tp;
937 rend_t *rp; 930 rend_t *rp;
938 931
939 if (screen.cur.col > 0) 932 if (screen.cur.col > 0)
940 { 933 {
934 linep = line;
941 tp = line->t + screen.cur.col - 1; 935 tp = line->t + screen.cur.col - 1;
942 rp = line->r + screen.cur.col - 1; 936 rp = line->r + screen.cur.col - 1;
943
944 while (*tp == NOCHAR && tp > line->t)
945 tp--, rp--;
946 } 937 }
947 else if (screen.cur.row > 0 938 else if (screen.cur.row > 0
948 && ROW(screen.cur.row - 1).is_longer ()) 939 && ROW(screen.cur.row - 1).is_longer ())
949 { 940 {
950 line_t *line = &ROW(screen.cur.row - 1); 941 linep = &ROW(screen.cur.row - 1);
951
952 tp = line->t + last_col - 1; 942 tp = line->t + ncol - 1;
953 rp = line->r + last_col - 1; 943 rp = line->r + ncol - 1;
954
955 while (*tp == NOCHAR && tp > line->t)
956 tp--, rp--;
957 } 944 }
958 else 945 else
959 continue; 946 continue;
947
948 linep->touch ();
949
950 while (*tp == NOCHAR && tp > linep->t)
951 tp--, rp--;
960 952
961 // first try to find a precomposed character 953 // first try to find a precomposed character
962 unicode_t n = rxvt_compose (*tp, c); 954 unicode_t n = rxvt_compose (*tp, c);
963 if (n == NOCHAR) 955 if (n == NOCHAR)
964 n = rxvt_composite.compose (*tp, c); 956 n = rxvt_composite.compose (*tp, c);
… …
967 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 959 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
968#endif 960#endif
969 } 961 }
970 } 962 }
971 963
972 if (!line->is_longer ()) /* XXX: think about this */
973 MAX_IT (line->l, screen.cur.col); 964 max_it (line->l, screen.cur.col);
974 965
975#ifdef DEBUG_STRICT 966#ifdef DEBUG_STRICT
976 assert (screen.cur.row >= 0); 967 assert (screen.cur.row >= 0);
977#else /* drive with your eyes closed */
978 MAX_IT (screen.cur.row, 0);
979#endif 968#endif
980} 969}
981 970
982/* ------------------------------------------------------------------------- */ 971/* ------------------------------------------------------------------------- */
983/* 972/*
… …
1022 1011
1023 if (count == 0) 1012 if (count == 0)
1024 return; 1013 return;
1025 else if (count > 0) 1014 else if (count > 0)
1026 { 1015 {
1027 int row = screen.cur.row;
1028
1029 line_t &l = ROW(row); 1016 line_t &l = ROW(screen.cur.row);
1030 rend_t base_rend = l.r[i]; 1017 rend_t base_rend = l.r[i];
1031 ht &= l.t[i] == ' '; 1018 ht &= l.t[i] == ' ';
1032 1019
1033 for (; ++i < ncol; ) 1020 for (; ++i < ncol; )
1034 if (tabs[i]) 1021 if (tabs[i])
1035 { 1022 {
1036 x = i; 1023 x = i;
1024
1037 if (!--count) 1025 if (!--count)
1038 break; 1026 break;
1039 } 1027 }
1040 else 1028 else
1041 ht &= l.t[i] == ' ' 1029 ht &= l.t[i] == ' '
… …
1044 if (count) 1032 if (count)
1045 x = ncol - 1; 1033 x = ncol - 1;
1046 1034
1047 // store horizontal tab commands as characters inside the text 1035 // store horizontal tab commands as characters inside the text
1048 // buffer so they can be selected and pasted. 1036 // buffer so they can be selected and pasted.
1049 if (ht && options & Opt_pastableTabs) 1037 if (ht && OPTION (Opt_pastableTabs))
1050 { 1038 {
1051 base_rend = SET_FONT (base_rend, 0); 1039 base_rend = SET_FONT (base_rend, 0);
1052 1040
1053 if (!l.is_longer ()) /* XXX: think about this */ 1041 l.touch (x);
1054 MAX_IT (l.l, x);
1055 1042
1056 i = screen.cur.col; 1043 i = screen.cur.col;
1057 1044
1058 l.t[i] = '\t'; 1045 l.t[i] = '\t';
1059 l.r[i] = base_rend; 1046 l.r[i] = base_rend;
… …
1109 */ 1096 */
1110#if ENABLE_FRILLS 1097#if ENABLE_FRILLS
1111void 1098void
1112rxvt_term::scr_forwardindex () 1099rxvt_term::scr_forwardindex ()
1113{ 1100{
1114 int row;
1115
1116 if (screen.cur.col < ncol - 1) 1101 if (screen.cur.col < ncol - 1)
1117 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1102 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1118 else 1103 else
1119 { 1104 {
1120 row = screen.cur.row; 1105 line_t &l = ROW(screen.cur.row);
1121 1106
1122 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1107 l.touch ();
1123 ROW(row).l = ncol; 1108 l.is_longer (0);
1124 1109
1125 scr_gotorc (0, 0, R_RELATIVE); 1110 scr_gotorc (0, 0, R_RELATIVE);
1126 scr_insdel_chars (1, DELETE); 1111 scr_insdel_chars (1, DELETE);
1127 scr_gotorc (0, ncol - 1, R_RELATIVE); 1112 scr_gotorc (0, ncol - 1, R_RELATIVE);
1128 } 1113 }
… …
1138{ 1123{
1139 want_refresh = 1; 1124 want_refresh = 1;
1140 ZERO_SCROLLBACK (); 1125 ZERO_SCROLLBACK ();
1141 1126
1142 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1127 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1143 MAX_IT (screen.cur.col, 0); 1128 clamp_it (screen.cur.col, 0, ncol - 1);
1144 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1145 1129
1146 screen.flags &= ~Screen_WrapNext; 1130 screen.flags &= ~Screen_WrapNext;
1147 1131
1148 if (relative & R_RELATIVE) 1132 if (relative & R_RELATIVE)
1149 { 1133 {
… …
1167 else 1151 else
1168 { 1152 {
1169 if (screen.flags & Screen_Relative) 1153 if (screen.flags & Screen_Relative)
1170 { /* relative origin mode */ 1154 { /* relative origin mode */
1171 screen.cur.row = row + screen.tscroll; 1155 screen.cur.row = row + screen.tscroll;
1172 MIN_IT (screen.cur.row, screen.bscroll); 1156 min_it (screen.cur.row, screen.bscroll);
1173 } 1157 }
1174 else 1158 else
1175 screen.cur.row = row; 1159 screen.cur.row = row;
1176 } 1160 }
1177 1161
1178 MAX_IT (screen.cur.row, 0); 1162 clamp_it (screen.cur.row, 0, nrow - 1);
1179 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1180} 1163}
1181 1164
1182/* ------------------------------------------------------------------------- */ 1165/* ------------------------------------------------------------------------- */
1183/* 1166/*
1184 * direction should be UP or DN 1167 * direction should be UP or DN
… …
1199 || (screen.cur.row == screen.tscroll && direction == DN)) 1182 || (screen.cur.row == screen.tscroll && direction == DN))
1200 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1183 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1201 else 1184 else
1202 screen.cur.row += dirn; 1185 screen.cur.row += dirn;
1203 1186
1204 MAX_IT (screen.cur.row, 0); 1187 clamp_it (screen.cur.row, 0, nrow - 1);
1205 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1206 selection_check (0); 1188 selection_check (0);
1207} 1189}
1208 1190
1209/* ------------------------------------------------------------------------- */ 1191/* ------------------------------------------------------------------------- */
1210/* 1192/*
… …
1214 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1196 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1215 */ 1197 */
1216void 1198void
1217rxvt_term::scr_erase_line (int mode) 1199rxvt_term::scr_erase_line (int mode)
1218{ 1200{
1219 unsigned int row, col, num; 1201 unsigned int col, num;
1220 1202
1221 want_refresh = 1; 1203 want_refresh = 1;
1222 ZERO_SCROLLBACK (); 1204 ZERO_SCROLLBACK ();
1223 1205
1224 selection_check (1); 1206 selection_check (1);
1225 1207
1226 row = screen.cur.row; 1208 line_t &line = ROW(screen.cur.row);
1209
1210 line.touch ();
1211 line.is_longer (0);
1227 1212
1228 switch (mode) 1213 switch (mode)
1229 { 1214 {
1230 case 0: /* erase to end of line */ 1215 case 0: /* erase to end of line */
1231 col = screen.cur.col; 1216 col = screen.cur.col;
1232 num = ncol - col; 1217 num = ncol - col;
1233 MIN_IT (ROW(row).l, (int16_t)col); 1218 min_it (line.l, col);
1234 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1219 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1235 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1220 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1236 CLEAR_SELECTION (); 1221 CLEAR_SELECTION ();
1237 break; 1222 break;
1238 case 1: /* erase to beginning of line */ 1223 case 1: /* erase to beginning of line */
… …
1243 CLEAR_SELECTION (); 1228 CLEAR_SELECTION ();
1244 break; 1229 break;
1245 case 2: /* erase whole line */ 1230 case 2: /* erase whole line */
1246 col = 0; 1231 col = 0;
1247 num = ncol; 1232 num = ncol;
1248 ROW(row).l = 0; 1233 line.l = 0;
1249 if (selection.beg.row <= screen.cur.row 1234 if (selection.beg.row <= screen.cur.row
1250 && selection.end.row >= screen.cur.row) 1235 && selection.end.row >= screen.cur.row)
1251 CLEAR_SELECTION (); 1236 CLEAR_SELECTION ();
1252 break; 1237 break;
1253 default: 1238 default:
1254 return; 1239 return;
1255 } 1240 }
1256 1241
1257 scr_blank_line (ROW(row), col, num, rstyle); 1242 scr_blank_line (line, col, num, rstyle);
1258} 1243}
1259 1244
1260/* ------------------------------------------------------------------------- */ 1245/* ------------------------------------------------------------------------- */
1261/* 1246/*
1262 * Erase part of whole of the screen 1247 * Erase part of whole of the screen
… …
1305 CLEAR_SELECTION (); 1290 CLEAR_SELECTION ();
1306 1291
1307 if (row >= nrow) /* Out Of Bounds */ 1292 if (row >= nrow) /* Out Of Bounds */
1308 return; 1293 return;
1309 1294
1310 MIN_IT (num, (nrow - row)); 1295 min_it (num, nrow - row);
1311 1296
1312 if (rstyle & (RS_RVid | RS_Uline)) 1297 if (rstyle & (RS_RVid | RS_Uline))
1313 ren = (rend_t) ~RS_None; 1298 ren = (rend_t) ~RS_None;
1314 else if (GET_BASEBG (rstyle) == Color_bg) 1299 else if (GET_BASEBG (rstyle) == Color_bg)
1315 { 1300 {
… …
1317 CLEAR_ROWS (row, num); 1302 CLEAR_ROWS (row, num);
1318 } 1303 }
1319 else 1304 else
1320 { 1305 {
1321 ren = rstyle & (RS_fgMask | RS_bgMask); 1306 ren = rstyle & (RS_fgMask | RS_bgMask);
1322 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1307 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1323 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1308 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1324 ERASE_ROWS (row, num); 1309 ERASE_ROWS (row, num);
1325 gcvalue.foreground = pix_colors[Color_fg]; 1310 gcvalue.foreground = pix_colors[Color_fg];
1326 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1311 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1327 } 1312 }
1328 1313
1329 for (; num--; row++) 1314 for (; num--; row++)
1330 { 1315 {
1331 scr_blank_screen_mem (ROW (row), rstyle); 1316 scr_blank_screen_mem (ROW(row), rstyle);
1332 ROW (row).l = 0;
1333 scr_blank_line (drawn[row], 0, ncol, ren); 1317 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1334 } 1318 }
1335} 1319}
1336 1320
1337#if ENABLE_FRILLS 1321#if ENABLE_FRILLS
1338void 1322void
… …
1370 rend_t *r1 = line.r; 1354 rend_t *r1 = line.r;
1371 1355
1372 for (int j = ncol; j--; ) 1356 for (int j = ncol; j--; )
1373 *r1++ = fs; 1357 *r1++ = fs;
1374 1358
1375 line.l = ncol; /* make the `E's selectable */ 1359 line.is_longer (0);
1360 line.touch (ncol);
1376 } 1361 }
1377} 1362}
1378 1363
1379/* ------------------------------------------------------------------------- */ 1364/* ------------------------------------------------------------------------- */
1380/* 1365/*
… …
1423 return; 1408 return;
1424 1409
1425 scr_do_wrap (); 1410 scr_do_wrap ();
1426 1411
1427 selection_check (1); 1412 selection_check (1);
1428 MIN_IT (count, (ncol - screen.cur.col)); 1413 min_it (count, ncol - screen.cur.col);
1429 1414
1430 row = screen.cur.row; 1415 row = screen.cur.row;
1431 1416
1432 line_t *line = &ROW(row); 1417 line_t *line = &ROW(row);
1418
1419 line->touch ();
1420 line->is_longer (0);
1433 1421
1434 switch (insdel) 1422 switch (insdel)
1435 { 1423 {
1436 case INSERT: 1424 case INSERT:
1437 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1425 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1438 { 1426 {
1439 line->t[col] = line->t[col - count]; 1427 line->t[col] = line->t[col - count];
1440 line->r[col] = line->r[col - count]; 1428 line->r[col] = line->r[col - count];
1441 } 1429 }
1442 1430
1443 if (!line->is_longer ()) 1431 line->l = min (line->l + count, ncol);
1444 {
1445 line->l += count;
1446 MIN_IT (line->l, ncol);
1447 }
1448 1432
1449 if (selection.op && current_screen == selection.screen 1433 if (selection.op && current_screen == selection.screen
1450 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1434 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1451 { 1435 {
1452 if (selection.end.row != screen.cur.row 1436 if (selection.end.row != screen.cur.row
… …
1465 1449
1466 case ERASE: 1450 case ERASE:
1467 screen.cur.col += count; /* don't worry if > ncol */ 1451 screen.cur.col += count; /* don't worry if > ncol */
1468 selection_check (1); 1452 selection_check (1);
1469 screen.cur.col -= count; 1453 screen.cur.col -= count;
1454
1455 line->l = max (line->l - count, 0);
1470 scr_blank_line (*line, screen.cur.col, count, rstyle); 1456 scr_blank_line (*line, screen.cur.col, count, rstyle);
1471 break; 1457 break;
1472 1458
1473 case DELETE: 1459 case DELETE:
1474 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1460 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1477 { 1463 {
1478 line->t[col] = line->t[col + count]; 1464 line->t[col] = line->t[col + count];
1479 line->r[col] = line->r[col + count]; 1465 line->r[col] = line->r[col + count];
1480 } 1466 }
1481 1467
1468 line->l = max (line->l - count, 0);
1482 scr_blank_line (*line, ncol - count, count, tr); 1469 scr_blank_line (*line, ncol - count, count, tr);
1483
1484 if (line->is_longer ()) /* break line continuation */
1485 line->l = ncol;
1486
1487 line->l = max (line->l - count, 0);
1488 1470
1489 if (selection.op && current_screen == selection.screen 1471 if (selection.op && current_screen == selection.screen
1490 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1491 { 1473 {
1492 if (selection.end.row != screen.cur.row 1474 if (selection.end.row != screen.cur.row
… …
1512 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1494 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1513 */ 1495 */
1514void 1496void
1515rxvt_term::scr_scroll_region (int top, int bot) 1497rxvt_term::scr_scroll_region (int top, int bot)
1516{ 1498{
1517 MAX_IT (top, 0); 1499 max_it (top, 0);
1518 MIN_IT (bot, (int)nrow - 1); 1500 min_it (bot, nrow - 1);
1519 1501
1520 if (top > bot) 1502 if (top > bot)
1521 return; 1503 return;
1522 1504
1523 screen.tscroll = top; 1505 screen.tscroll = top;
… …
1604rxvt_term::scr_set_tab (int mode) 1586rxvt_term::scr_set_tab (int mode)
1605{ 1587{
1606 if (mode < 0) 1588 if (mode < 0)
1607 memset (tabs, 0, ncol * sizeof (char)); 1589 memset (tabs, 0, ncol * sizeof (char));
1608 else if (screen.cur.col < ncol) 1590 else if (screen.cur.col < ncol)
1609 tabs[screen.cur.col] = (mode ? 1 : 0); 1591 tabs [screen.cur.col] = !!mode;
1610} 1592}
1611 1593
1612/* ------------------------------------------------------------------------- */ 1594/* ------------------------------------------------------------------------- */
1613/* 1595/*
1614 * Set reverse/normal video 1596 * Set reverse/normal video
… …
1621 XGCValues gcvalue; 1603 XGCValues gcvalue;
1622 1604
1623 if (rvideo != mode) 1605 if (rvideo != mode)
1624 { 1606 {
1625 rvideo = mode; 1607 rvideo = mode;
1626 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1608 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1627#if XPM_BACKGROUND 1609#if XPM_BACKGROUND
1628 if (bgPixmap.pixmap == None) 1610 if (bgPixmap.pixmap == None)
1629#endif 1611#endif
1630#if TRANSPARENT 1612#if TRANSPARENT
1631 if (! (options & Opt_transparent) || am_transparent == 0) 1613 if (! OPTION (Opt_transparent) || am_transparent == 0)
1632#endif 1614#endif
1633 XSetWindowBackground (display->display, vt, 1615 XSetWindowBackground (display->display, vt,
1634 pix_colors[Color_bg]); 1616 pix_colors[Color_bg]);
1635 1617
1636 gcvalue.foreground = pix_colors[Color_fg]; 1618 gcvalue.foreground = pix_colors[Color_fg];
… …
1661 * Set font style 1643 * Set font style
1662 */ 1644 */
1663void 1645void
1664rxvt_term::set_font_style () 1646rxvt_term::set_font_style ()
1665{ 1647{
1648#if 0
1666 switch (charsets[screen.charset]) 1649 switch (charsets [screen.charset])
1667 { 1650 {
1668 case '0': /* DEC Special Character & Line Drawing Set */ 1651 case '0': /* DEC Special Character & Line Drawing Set */
1669 break; 1652 break;
1670 case 'A': /* United Kingdom (UK) */ 1653 case 'A': /* United Kingdom (UK) */
1671 break; 1654 break;
… …
1678 case 'C': /* Finnish character set */ 1661 case 'C': /* Finnish character set */
1679 break; 1662 break;
1680 case 'K': /* German character set */ 1663 case 'K': /* German character set */
1681 break; 1664 break;
1682 } 1665 }
1666#endif
1683} 1667}
1684 1668
1685/* ------------------------------------------------------------------------- */ 1669/* ------------------------------------------------------------------------- */
1686/* 1670/*
1687 * Choose a font 1671 * Choose a font
… …
1727 bool found = false; 1711 bool found = false;
1728 1712
1729 for (int i = 0; i < nrow; i++) 1713 for (int i = 0; i < nrow; i++)
1730 { 1714 {
1731 int col = 0; 1715 int col = 0;
1732 rend_t *drp = drawn[i].r; 1716 rend_t *drp = drawn_buf[i].r;
1733 1717
1734 for (; col < ncol; col++, drp++) 1718 for (; col < ncol; col++, drp++)
1735 if ((*drp & mask) == value) 1719 if ((*drp & mask) == value)
1736 { 1720 {
1737 found = true; 1721 found = true;
… …
1755rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1739rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1756{ 1740{
1757 int i; 1741 int i;
1758 row_col_t rc[RC_COUNT]; 1742 row_col_t rc[RC_COUNT];
1759 1743
1760 if (!drawn) /* sanity check */ 1744 if (!drawn_buf) /* sanity check */
1761 return; 1745 return;
1762 1746
1763#ifndef NO_SLOW_LINK_SUPPORT 1747#ifndef NO_SLOW_LINK_SUPPORT
1764 if (refresh_type == FAST_REFRESH && !display->is_local) 1748 if (refresh_type == FAST_REFRESH && !display->is_local)
1765 { 1749 {
1766 y = 0; 1750 y = 0;
1767 eheight = height; 1751 eheight = height;
1768 } 1752 }
1769#endif
1770
1771#ifdef DEBUG_STRICT
1772 x = max (x, 0);
1773 x = min (x, (int)width);
1774 y = max (y, 0);
1775 y = min (y, (int)height);
1776#endif 1753#endif
1777 1754
1778 /* round down */ 1755 /* round down */
1779 rc[PART_BEG].col = Pixel2Col (x); 1756 rc[PART_BEG].col = Pixel2Col (x);
1780 rc[PART_BEG].row = Pixel2Row (y); 1757 rc[PART_BEG].row = Pixel2Row (y);
… …
1783 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1760 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1784 1761
1785 /* sanity checks */ 1762 /* sanity checks */
1786 for (i = PART_BEG; i < RC_COUNT; i++) 1763 for (i = PART_BEG; i < RC_COUNT; i++)
1787 { 1764 {
1788 MIN_IT (rc[i].col, ncol - 1); 1765 min_it (rc[i].col, ncol - 1);
1789 MIN_IT (rc[i].row, nrow - 1); 1766 min_it (rc[i].row, nrow - 1);
1790 } 1767 }
1791 1768
1792 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1769 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1793 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1770 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1794 1771
1795 if (refresh) 1772 if (refresh)
1796 scr_refresh (SLOW_REFRESH); 1773 scr_refresh (SLOW_REFRESH);
1797} 1774}
1798 1775
… …
1861int 1838int
1862rxvt_term::scr_changeview (unsigned int oldviewstart) 1839rxvt_term::scr_changeview (unsigned int oldviewstart)
1863{ 1840{
1864 if (view_start != oldviewstart) 1841 if (view_start != oldviewstart)
1865 { 1842 {
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844
1866 want_refresh = 1; 1845 want_refresh = 1;
1867 num_scr -= (view_start - oldviewstart); 1846 num_scr -= (view_start - oldviewstart);
1868 } 1847 }
1869 1848
1870 return (int) (view_start - oldviewstart); 1849 return (int)view_start - (int)oldviewstart;
1871} 1850}
1872 1851
1873/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1874void 1853void
1875rxvt_term::scr_bell () 1854rxvt_term::scr_bell ()
1876{ 1855{
1877#ifndef NO_BELL 1856#ifndef NO_BELL
1878 1857
1879# ifndef NO_MAPALERT 1858# ifndef NO_MAPALERT
1880# ifdef MAPALERT_OPTION 1859# ifdef MAPALERT_OPTION
1881 if (options & Opt_mapAlert) 1860 if (OPTION (Opt_mapAlert))
1882# endif 1861# endif
1883 XMapWindow (display->display, parent[0]); 1862 XMapWindow (display->display, parent[0]);
1884# endif 1863# endif
1885 1864
1886 if (options & Opt_visualBell) 1865 if (OPTION (Opt_visualBell))
1887 { 1866 {
1888 scr_rvideo_mode (!rvideo); /* refresh also done */ 1867 scr_rvideo_mode (!rvideo); /* refresh also done */
1868 display->flush ();
1889 rxvt_usleep (VISUAL_BELL_DURATION); 1869 rxvt_usleep (VISUAL_BELL_DURATION);
1890 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1891 } 1871 }
1892 else 1872 else
1893 XBell (display->display, 0); 1873 XBell (display->display, 0);
… …
1961{ 1941{
1962 unsigned char must_clear, /* use draw_string not draw_image_string */ 1942 unsigned char must_clear, /* use draw_string not draw_image_string */
1963 showcursor; /* show the cursor */ 1943 showcursor; /* show the cursor */
1964 int16_t col, row, /* column/row we're processing */ 1944 int16_t col, row, /* column/row we're processing */
1965 ocrow; /* old cursor row */ 1945 ocrow; /* old cursor row */
1966 int i, /* tmp */ 1946 int i; /* tmp */
1967 row_offset; /* basic offset in screen structure */
1968#ifndef NO_CURSORCOLOR 1947#ifndef NO_CURSORCOLOR
1969 rend_t cc1; /* store colours at cursor position (s) */ 1948 rend_t cc1; /* store colours at cursor position (s) */
1970#endif 1949#endif
1971 rend_t *crp; // cursor rendition pointer 1950 rend_t *crp; // cursor rendition pointer
1972 1951
… …
1979 * A: set up vars 1958 * A: set up vars
1980 */ 1959 */
1981 must_clear = 0; 1960 must_clear = 0;
1982 refresh_count = 0; 1961 refresh_count = 0;
1983 1962
1984 row_offset = term_start - view_start;
1985
1986#if XPM_BACKGROUND 1963#if XPM_BACKGROUND
1987 must_clear |= bgPixmap.pixmap != None; 1964 must_clear |= bgPixmap.pixmap != None;
1988#endif 1965#endif
1989#if TRANSPARENT 1966#if TRANSPARENT
1990 must_clear |= (options & Opt_transparent) && am_transparent; 1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
1991#endif 1968#endif
1992 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1993 1970
1994 /* 1971 /*
1995 * B: reverse any characters which are selected 1972 * B: reverse any characters which are selected
… …
2019 1996
2020 crp = &ROW(screen.cur.row).r[col]; 1997 crp = &ROW(screen.cur.row).r[col];
2021 1998
2022 if (showcursor && focus) 1999 if (showcursor && focus)
2023 { 2000 {
2024 if (options & Opt_cursorUnderline) 2001 if (OPTION (Opt_cursorUnderline))
2025 *crp ^= RS_Uline; 2002 *crp ^= RS_Uline;
2026 else 2003 else
2027 { 2004 {
2028 *crp ^= RS_RVid; 2005 *crp ^= RS_RVid;
2029 2006
… …
2031 cc1 = *crp & (RS_fgMask | RS_bgMask); 2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
2032 if (ISSET_PIXCOLOR (Color_cursor)) 2009 if (ISSET_PIXCOLOR (Color_cursor))
2033 ccol1 = Color_cursor; 2010 ccol1 = Color_cursor;
2034 else 2011 else
2035#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2036 ccol1 = GET_FGCOLOR (rstyle); 2013 ccol1 = fgcolor_of (rstyle);
2037#else 2014#else
2038 ccol1 = Color_fg; 2015 ccol1 = Color_fg;
2039#endif 2016#endif
2040 if (ISSET_PIXCOLOR (Color_cursor2)) 2017 if (ISSET_PIXCOLOR (Color_cursor2))
2041 ccol2 = Color_cursor2; 2018 ccol2 = Color_cursor2;
2042 else 2019 else
2043#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2044 ccol2 = GET_BGCOLOR (rstyle); 2021 ccol2 = bgcolor_of (rstyle);
2045#else 2022#else
2046 ccol2 = Color_bg; 2023 ccol2 = Color_bg;
2047#endif 2024#endif
2048 *crp = SET_FGCOLOR (*crp, ccol1); 2025 *crp = SET_FGCOLOR (*crp, ccol1);
2049 *crp = SET_BGCOLOR (*crp, ccol2); 2026 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2059 if (screen.cur.row + view_start != ocrow 2036 if (screen.cur.row + view_start != ocrow
2060 || screen.cur.col != oldcursor.col) 2037 || screen.cur.col != oldcursor.col)
2061 { 2038 {
2062 if (ocrow < nrow 2039 if (ocrow < nrow
2063 && oldcursor.col < ncol) 2040 && oldcursor.col < ncol)
2064 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2065 2042
2066 if (focus || !showcursor) 2043 if (focus || !showcursor)
2067 oldcursor.row = -1; 2044 oldcursor.row = -1;
2068 else 2045 else
2069 setoldcursor = 1; 2046 setoldcursor = 1;
… …
2082 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
2083 } 2060 }
2084 } 2061 }
2085 } 2062 }
2086 2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2087#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2088 scr_swap_overlay (); 2066 scr_swap_overlay ();
2089#endif 2067#endif
2090 2068
2091#ifndef NO_SLOW_LINK_SUPPORT 2069#ifndef NO_SLOW_LINK_SUPPORT
… …
2107 row = i > 0 ? 0 : j - 1; 2085 row = i > 0 ? 0 : j - 1;
2108 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2109 { 2087 {
2110 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2111 { 2089 {
2112 line_t s = save[(row + row_offset) % total_rows]; 2090 line_t s = ROW(row - view_start);
2113 line_t d = drawn[row]; 2091 line_t d = drawn_buf[row];
2114 line_t d2 = drawn[row + i]; 2092 line_t d2 = drawn_buf[row + i];
2115 2093
2116 for (nits = 0, col = ncol; col--; ) 2094 for (nits = 0, col = ncol; col--; )
2117 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2118 nits--; 2096 nits--;
2119 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2097 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2137 2115
2138 if (len != -1) 2116 if (len != -1)
2139 { 2117 {
2140 /* also comes here at end if needed because of >= above */ 2118 /* also comes here at end if needed because of >= above */
2141 if (wlen < len) 2119 if (wlen < len)
2142 SWAP_IT (wlen, len, int); 2120 ::swap (wlen, len);
2143 2121
2144 XCopyArea (display->display, vt, vt, 2122 XCopyArea (display->display, vt, vt,
2145 gc, 0, Row2Pixel (len + i), 2123 gc, 0, Row2Pixel (len + i),
2146 (unsigned int)TermWin_TotalWidth (), 2124 (unsigned int)this->width,
2147 (unsigned int)Height2Pixel (wlen - len + 1), 2125 (unsigned int)Height2Pixel (wlen - len + 1),
2148 0, Row2Pixel (len)); 2126 0, Row2Pixel (len));
2149 len = -1; 2127 len = -1;
2150 } 2128 }
2151 } 2129 }
… …
2155 /* 2133 /*
2156 * E: main pass across every character 2134 * E: main pass across every character
2157 */ 2135 */
2158 for (row = 0; row < nrow; row++) 2136 for (row = 0; row < nrow; row++)
2159 { 2137 {
2160 text_t *stp = save[(row + row_offset) % total_rows].t; 2138 text_t *stp = ROW(row - view_start).t;
2161 rend_t *srp = save[(row + row_offset) % total_rows].r; 2139 rend_t *srp = ROW(row - view_start).r;
2162 text_t *dtp = drawn[row].t; 2140 text_t *dtp = drawn_buf[row].t;
2163 rend_t *drp = drawn[row].r; 2141 rend_t *drp = drawn_buf[row].r;
2164 2142
2165 /* 2143 /*
2166 * E2: OK, now the real pass 2144 * E2: OK, now the real pass
2167 */ 2145 */
2168 int ypixel = (int)Row2Pixel (row); 2146 int ypixel = (int)Row2Pixel (row);
… …
2230 count++, i--; 2208 count++, i--;
2231 2209
2232 /* 2210 /*
2233 * Determine the attributes for the string 2211 * Determine the attributes for the string
2234 */ 2212 */
2235 int fore = GET_FGCOLOR (rend); // desired foreground 2213 int fore = fgcolor_of (rend); // desired foreground
2236 int back = GET_BGCOLOR (rend); // desired background 2214 int back = bgcolor_of (rend); // desired background
2237 2215
2238 // only do special processing if any attributes are set, which is rare 2216 // only do special processing if any attributes are set, which is unlikely
2239 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2217 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2240 { 2218 {
2241#if ENABLE_STYLES 2219#if ENABLE_STYLES
2242 // force redraw after "careful" characters to avoid pixel droppings 2220 // force redraw after "careful" characters to avoid pixel droppings
2243 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2221 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2279 fore = Color_UL; 2257 fore = Color_UL;
2280#endif 2258#endif
2281 2259
2282 if (invert) 2260 if (invert)
2283 { 2261 {
2284 SWAP_IT (fore, back, int); 2262 ::swap (fore, back);
2285 2263
2286#ifndef NO_BOLD_UNDERLINE_REVERSE 2264#ifndef NO_BOLD_UNDERLINE_REVERSE
2287 if (ISSET_PIXCOLOR (Color_RV)) 2265 if (ISSET_PIXCOLOR (Color_RV))
2288 back = Color_RV; 2266 back = Color_RV;
2289 2267
… …
2354 } /* for (row....) */ 2332 } /* for (row....) */
2355 2333
2356#if ENABLE_OVERLAY 2334#if ENABLE_OVERLAY
2357 scr_swap_overlay (); 2335 scr_swap_overlay ();
2358#endif 2336#endif
2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2359 2338
2360 /* 2339 /*
2361 * G: cleanup cursor and display outline cursor if necessary 2340 * G: cleanup cursor and display outline cursor if necessary
2362 */ 2341 */
2363 if (showcursor) 2342 if (showcursor)
2364 { 2343 {
2365 if (focus) 2344 if (focus)
2366 { 2345 {
2367 if (options & Opt_cursorUnderline) 2346 if (OPTION (Opt_cursorUnderline))
2368 *crp ^= RS_Uline; 2347 *crp ^= RS_Uline;
2369 else 2348 else
2370 { 2349 {
2371 *crp ^= RS_RVid; 2350 *crp ^= RS_RVid;
2372#ifndef NO_CURSORCOLOR 2351#ifndef NO_CURSORCOLOR
… …
2381 2360
2382 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2361 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2383 col--; 2362 col--;
2384 2363
2385 while (col + cursorwidth < ncol 2364 while (col + cursorwidth < ncol
2386 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2365 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2387 cursorwidth++; 2366 cursorwidth++;
2388 2367
2389#ifndef NO_CURSORCOLOR 2368#ifndef NO_CURSORCOLOR
2390 if (ISSET_PIXCOLOR (Color_cursor)) 2369 if (ISSET_PIXCOLOR (Color_cursor))
2391 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2370 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2410 num_scr = 0; 2389 num_scr = 0;
2411 num_scr_allow = 1; 2390 num_scr_allow = 1;
2412} 2391}
2413 2392
2414void 2393void
2415rxvt_term::scr_remap_chars (const line_t &l) 2394rxvt_term::scr_remap_chars (line_t &l)
2416{ 2395{
2417 if (!l.t) 2396 if (!l.t)
2418 return; 2397 return;
2419 2398
2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2400
2420 for (int i = ncol; i--; ) 2401 for (int i = ncol; i--; )
2421 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2402 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2422} 2403}
2423 2404
2424void 2405void
2425rxvt_term::scr_remap_chars () 2406rxvt_term::scr_remap_chars ()
2426{ 2407{
2427 for (int i = total_rows; i--; ) 2408 for (int i = total_rows; i--; )
2428 scr_remap_chars (save[i]); 2409 scr_remap_chars (row_buf [i]);
2429 2410
2430 for (int i = nrow; i--; ) 2411 for (int i = nrow; i--; )
2431 { 2412 {
2432 scr_remap_chars (drawn[i]); 2413 scr_remap_chars (drawn_buf [i]);
2433 scr_remap_chars (swap_save[i]); 2414 scr_remap_chars (swap_buf [i]);
2434 } 2415 }
2435} 2416}
2436 2417
2437void 2418void
2438rxvt_term::scr_recolour () 2419rxvt_term::scr_recolour ()
… …
2476 2457
2477 if (really) 2458 if (really)
2478 XClearWindow (display->display, vt); 2459 XClearWindow (display->display, vt);
2479} 2460}
2480 2461
2462void
2463rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2464{
2465 int view_end = -view_start + nrow;
2466 int row, col;
2467
2468 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++)
2469 {
2470 text_t *stp = ROW(row).t;
2471 rend_t *srp = ROW(row).r;
2472
2473 for (col = beg_col; col < end_col; col++)
2474 srp[col] ^= rstyle1;
2475
2476 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2477 srp[col] ^= rstyle2;
2478
2479 if (++col < end_col)
2480 srp[col] ^= rstyle2;
2481 }
2482}
2483
2484void
2485rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2486{
2487 int view_end = -view_start + nrow;
2488 int row, col;
2489
2490 if (beg_row >= -view_start)
2491 {
2492 col = beg_col;
2493 row = beg_row;
2494 }
2495 else
2496 {
2497 col = 0;
2498 row = -view_start;
2499 }
2500
2501 for (; row < min (end_row, view_end); row++, col = 0)
2502 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2503 srp[col] ^= rstyle;
2504
2505 if (row == end_row)
2506 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2507 srp[col] ^= rstyle;
2508}
2509
2481/* ------------------------------------------------------------------------- */ 2510/* ------------------------------------------------------------------------- */
2482void 2511void
2483rxvt_term::scr_reverse_selection () 2512rxvt_term::scr_reverse_selection ()
2484{ 2513{
2485 if (selection.op 2514 if (selection.op
2486 && current_screen == selection.screen 2515 && current_screen == selection.screen
2487 && selection.end.row >= -view_start) 2516 && selection.end.row >= -view_start)
2488 { 2517 {
2489 int view_end = -view_start + nrow;
2490 int row, col;
2491
2492#if ENABLE_FRILLS 2518#if ENABLE_FRILLS
2493 if (selection.rect) 2519 if (selection.rect)
2494 { 2520 scr_xor_rect (selection.beg.row, selection.beg.col,
2495 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2521 selection.end.row, selection.end.col,
2496 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2522 RS_RVid, RS_RVid | RS_Uline);
2497 srp[col] ^= RS_RVid;
2498 }
2499 else 2523 else
2500#endif 2524#endif
2501 { 2525 scr_xor_span (selection.beg.row, selection.beg.col,
2502 if (selection.beg.row >= -view_start) 2526 selection.end.row, selection.end.col,
2503 { 2527 RS_RVid);
2504 col = selection.beg.col;
2505 row = selection.beg.row;
2506 }
2507 else
2508 {
2509 col = 0;
2510 row = view_start;
2511 }
2512
2513 for (; row < min (selection.end.row, view_end); row++, col = 0)
2514 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2515 srp[col] ^= RS_RVid;
2516
2517 if (row == selection.end.row)
2518 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2519 srp[col] ^= RS_RVid;
2520 }
2521 } 2528 }
2522} 2529}
2523 2530
2524/* ------------------------------------------------------------------------- */ 2531/* ------------------------------------------------------------------------- */
2525/* 2532/*
… …
2535 char r1[] = "\n"; 2542 char r1[] = "\n";
2536 2543
2537 for (row = saveLines - nsaved; 2544 for (row = saveLines - nsaved;
2538 row < saveLines + nrow - 1; row++) 2545 row < saveLines + nrow - 1; row++)
2539 { 2546 {
2540 width = save[row].l >= 0 ? save[row].l 2547 width = row_buf[row].l >= 0 ? row_buf[row].l
2541 : ncol; 2548 : ncol;
2542 for (towrite = width; towrite; towrite -= wrote) 2549 for (towrite = width; towrite; towrite -= wrote)
2543 { 2550 {
2544 wrote = write (fd, & (save[row].t[width - towrite]), 2551 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2545 towrite); 2552 towrite);
2546 if (wrote < 0) 2553 if (wrote < 0)
2547 return; /* XXX: death, no report */ 2554 return; /* XXX: death, no report */
2548 } 2555 }
2549 if (save[row].l >= 0) 2556 if (row_buf[row].l >= 0)
2550 if (write (fd, r1, 1) <= 0) 2557 if (write (fd, r1, 1) <= 0)
2551 return; /* XXX: death, no report */ 2558 return; /* XXX: death, no report */
2552 } 2559 }
2553} 2560}
2554#endif 2561#endif
… …
2586/* ------------------------------------------------------------------------- */ 2593/* ------------------------------------------------------------------------- */
2587/* 2594/*
2588 * Paste a selection direct to the command fd 2595 * Paste a selection direct to the command fd
2589 */ 2596 */
2590void 2597void
2591rxvt_term::paste (unsigned char *data, unsigned int len) 2598rxvt_term::paste (char *data, unsigned int len)
2592{ 2599{
2593 /* convert normal newline chars into common keyboard Return key sequence */ 2600 /* convert normal newline chars into common keyboard Return key sequence */
2594 for (unsigned int i = 0; i < len; i++) 2601 for (unsigned int i = 0; i < len; i++)
2595 if (data[i] == C0_LF) 2602 if (data[i] == C0_LF)
2596 data[i] = C0_CR; 2603 data[i] = C0_CR;
… …
2740 { 2747 {
2741 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2748 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2742 char *s = rxvt_wcstombs (w); 2749 char *s = rxvt_wcstombs (w);
2743 free (w); 2750 free (w);
2744 // TODO: strlen == only the first element will be converted. well... 2751 // TODO: strlen == only the first element will be converted. well...
2745 paste ((unsigned char *)s, strlen (s)); 2752 paste (s, strlen (s));
2746 free (s); 2753 free (s);
2747 } 2754 }
2748 else 2755 else
2749#endif 2756#endif
2750 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2757 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2751 && cl) 2758 && cl)
2752 { 2759 {
2753 for (int i = 0; i < cr; i++) 2760 for (int i = 0; i < cr; i++)
2754 paste ((unsigned char *)cl[i], strlen (cl[i])); 2761 paste (cl[i], strlen (cl[i]));
2755 2762
2756 XFreeStringList (cl); 2763 XFreeStringList (cl);
2757 } 2764 }
2758 else 2765 else
2759 paste (ct.value, ct.nitems); // paste raw 2766 paste ((char *)ct.value, ct.nitems); // paste raw
2760 2767
2761bailout: 2768bailout:
2762 XFree (ct.value); 2769 XFree (ct.value);
2763 2770
2764 if (selection_wait == Sel_normal) 2771 if (selection_wait == Sel_normal)
… …
2802 return; /* outside window */ 2809 return; /* outside window */
2803 2810
2804 if (selection.text) 2811 if (selection.text)
2805 { /* internal selection */ 2812 { /* internal selection */
2806 char *str = rxvt_wcstombs (selection.text, selection.len); 2813 char *str = rxvt_wcstombs (selection.text, selection.len);
2807 paste ((unsigned char *)str, strlen (str)); 2814 paste (str, strlen (str));
2808 free (str); 2815 free (str);
2809 return; 2816 return;
2810 } 2817 }
2811 else 2818 else
2812 { 2819 {
… …
2904 selection.op = SELECTION_DONE; 2911 selection.op = SELECTION_DONE;
2905 2912
2906 if (selection.clicks == 4) 2913 if (selection.clicks == 4)
2907 return; /* nothing selected, go away */ 2914 return; /* nothing selected, go away */
2908 2915
2916 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2917 return;
2918
2909 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2919 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2910 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2920 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2911 2921
2912 int ofs = 0; 2922 int ofs = 0;
2913 int extra = 0; 2923 int extra = 0;
… …
2925 col = selection.beg.col; 2935 col = selection.beg.col;
2926 end_col = ncol + 1; 2936 end_col = ncol + 1;
2927 } 2937 }
2928 else 2938 else
2929#endif 2939#endif
2930 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2940 end_col = ROW(row).l;
2931 2941
2932 col = max (col, 0); 2942 col = max (col, 0);
2933 2943
2934 if (row == selection.end.row || selection.rect) 2944 if (row == selection.end.row
2945#if ENABLE_FRILLS
2946 || selection.rect
2947#endif
2948 )
2935 end_col = min (end_col, selection.end.col); 2949 min_it (end_col, selection.end.col);
2936 2950
2937 t = ROW(row).t + col; 2951 t = ROW(row).t + col;
2952
2938 for (; col < end_col; col++) 2953 for (; col < end_col; col++)
2939 { 2954 {
2940 if (*t == NOCHAR) 2955 if (*t == NOCHAR)
2941 t++; 2956 t++;
2942#if ENABLE_COMBINING 2957#if ENABLE_COMBINING
… …
2958#endif 2973#endif
2959 else 2974 else
2960 new_selection_text[ofs++] = *t++; 2975 new_selection_text[ofs++] = *t++;
2961 } 2976 }
2962 2977
2978#if ENABLE_FRILLS
2979 if (selection.rect)
2980 {
2981 while (ofs
2982 && new_selection_text[ofs - 1] != C0_LF
2983 && unicode::is_space (new_selection_text[ofs - 1]))
2984 --ofs;
2985
2986 new_selection_text[ofs++] = C0_LF;
2987 }
2988 else
2989#endif
2963 if (!ROW(row).is_longer () && row != selection.end.row) 2990 if (!ROW(row).is_longer () && row != selection.end.row)
2964 new_selection_text[ofs++] = C0_LF; 2991 new_selection_text[ofs++] = C0_LF;
2965 } 2992 }
2966 2993
2967 if (end_col != selection.end.col) 2994 if (end_col != selection.end.col)
2968 new_selection_text[ofs++] = C0_LF; 2995 new_selection_text[ofs++] = C0_LF;
2969 2996
… …
2979 3006
2980 // we usually allocate much more than necessary, so realloc it smaller again 3007 // we usually allocate much more than necessary, so realloc it smaller again
2981 selection.len = ofs; 3008 selection.len = ofs;
2982 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3009 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2983 3010
3011 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3012 return;
3013
3014 selection_grab (tm);
3015}
3016
3017bool
3018rxvt_term::selection_grab (Time tm)
3019{
3020 selection_time = tm;
3021
2984 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3022 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2985 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3023 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3024 {
2986 display->set_selection_owner (this); 3025 display->set_selection_owner (this);
3026 return true;
3027 }
2987 else 3028 else
2988 rxvt_warn ("can't get primary selection, ignoring.\n"); 3029 return false;
2989 3030
2990#if 0 3031#if 0
2991 XTextProperty ct; 3032 XTextProperty ct;
2992 3033
2993 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2994 { 3035 {
2995 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3036 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2996 XFree (ct.value); 3037 XFree (ct.value);
2997 } 3038 }
2998#endif 3039#endif
2999
3000 selection_time = tm;
3001} 3040}
3002 3041
3003/* ------------------------------------------------------------------------- */ 3042/* ------------------------------------------------------------------------- */
3004/* 3043/*
3005 * Mark or select text based upon number of clicks: 1, 2, or 3 3044 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3031 want_refresh = 1; 3070 want_refresh = 1;
3032 3071
3033 selection.mark.row = row - view_start; 3072 selection.mark.row = row - view_start;
3034 selection.mark.col = col; 3073 selection.mark.col = col;
3035 3074
3036 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); 3075 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3037 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); 3076 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3038 3077
3039 while (selection.mark.col > 0 3078 while (selection.mark.col > 0
3040 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3079 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3041 --selection.mark.col; 3080 --selection.mark.col;
3042 3081
… …
3127 } 3166 }
3128 } 3167 }
3129 break; 3168 break;
3130 } 3169 }
3131 3170
3132Old_Word_Selection_You_Die:
3133 if (dirn == DN) 3171 if (dirn == DN)
3134 col++; /* put us on one past the end */ 3172 col++; /* put us on one past the end */
3135 3173
3136 /* Poke the values back in */ 3174 /* Poke the values back in */
3137 ret->row = row; 3175 ret->row = row;
… …
3147 * flag == 2 ==> button 3 motion 3185 * flag == 2 ==> button 3 motion
3148 */ 3186 */
3149void 3187void
3150rxvt_term::selection_extend (int x, int y, int flag) 3188rxvt_term::selection_extend (int x, int y, int flag)
3151{ 3189{
3152 int col = min (max (Pixel2Col (x), 0), nrow - 1); 3190 int col = clamp (Pixel2Col (x), 0, ncol);
3153 int row = min (max (Pixel2Row (y), 0), ncol); 3191 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3154 3192
3155 /* 3193 /*
3156 * If we're selecting characters (single click) then we must check first 3194 * If we're selecting characters (single click) then we must check first
3157 * if we are at the same place as the original mark. If we are then 3195 * if we are at the same place as the original mark. If we are then
3158 * select nothing. Otherwise, if we're to the right of the mark, you have to 3196 * select nothing. Otherwise, if we're to the right of the mark, you have to
… …
3314 else if (selection.clicks == 2) 3352 else if (selection.clicks == 2)
3315 { 3353 {
3316 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3354 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3317 selection.end.col--; 3355 selection.end.col--;
3318 3356
3357 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3358 {
3319 selection_delimit_word (UP, &selection.beg, &selection.beg); 3359 selection_delimit_word (UP, &selection.beg, &selection.beg);
3320 selection_delimit_word (DN, &selection.end, &selection.end); 3360 selection_delimit_word (DN, &selection.end, &selection.end);
3361 }
3321 } 3362 }
3322 else if (selection.clicks == 3) 3363 else if (selection.clicks == 3)
3323 { 3364 {
3324#if ENABLE_FRILLS 3365#if ENABLE_FRILLS
3325 if (options & Opt_tripleclickwords) 3366 if (OPTION (Opt_tripleclickwords))
3326 { 3367 {
3327 selection_delimit_word (UP, &selection.beg, &selection.beg); 3368 selection_delimit_word (UP, &selection.beg, &selection.beg);
3328 3369
3329 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3370 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3330 { 3371 {
… …
3371 } 3412 }
3372 } 3413 }
3373 3414
3374#if ENABLE_FRILLS 3415#if ENABLE_FRILLS
3375 if (selection.rect && selection.beg.col > selection.end.col) 3416 if (selection.rect && selection.beg.col > selection.end.col)
3376 SWAP_IT (selection.beg.col, selection.end.col, int); 3417 ::swap (selection.beg.col, selection.end.col);
3377#endif 3418#endif
3378} 3419}
3379 3420
3380#if ENABLE_FRILLS 3421#if ENABLE_FRILLS
3381void 3422void
… …
3391 { 3432 {
3392 stp = ROW(end_row).t; 3433 stp = ROW(end_row).t;
3393 3434
3394 while (--end_col >= 0) 3435 while (--end_col >= 0)
3395 { 3436 {
3396 if (stp[end_col] != ' ' 3437 if (stp[end_col] != NOCHAR
3397 && stp[end_col] != '\t' 3438 && !unicode::is_space (stp[end_col]))
3398 && stp[end_col] != NOCHAR)
3399 break; 3439 break;
3400 } 3440 }
3401 3441
3402 if (end_col >= 0 3442 if (end_col >= 0
3403 || !ROW(end_row - 1).is_longer ()) 3443 || !ROW(end_row - 1).is_longer ())
… …
3579 */ 3619 */
3580void 3620void
3581rxvt_term::pixel_position (int *x, int *y) 3621rxvt_term::pixel_position (int *x, int *y)
3582{ 3622{
3583 *x = Pixel2Col (*x); 3623 *x = Pixel2Col (*x);
3584 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3624 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3585 *y = Pixel2Row (*y); 3625 *y = Pixel2Row (*y);
3586 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3626 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3587} 3627}
3588 3628
3589/* ------------------------------------------------------------------------- */ 3629/* ------------------------------------------------------------------------- */
3590#ifdef USE_XIM 3630#ifdef USE_XIM
3591void 3631void
… …
3602 3642
3603#if ENABLE_OVERLAY 3643#if ENABLE_OVERLAY
3604void 3644void
3605rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3645rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3606{ 3646{
3607 if (nrow < 3 || ncol < 3) 3647 if (nrow < 1 || ncol < 1)
3608 return; 3648 return;
3609 3649
3610 want_refresh = 1; 3650 want_refresh = 1;
3611 3651
3612 scr_overlay_off (); 3652 scr_overlay_off ();
3613 3653
3614 if (x < 0) x = ncol - w; 3654 if (x < 0) x = ncol - w;
3615 if (y < 0) y = nrow - h; 3655 if (y < 0) y = nrow - h;
3616 3656
3617 // make space for border 3657 // make space for border
3618 w += 2; MIN_IT (w, ncol); 3658 w += 2; min_it (w, ncol);
3619 h += 2; MIN_IT (h, nrow); 3659 h += 2; min_it (h, nrow);
3620 3660
3621 x -= 1; MAX_IT (x, 0); 3661 x -= 1; clamp_it (x, 0, ncol - w);
3622 y -= 1; MAX_IT (y, 0); 3662 y -= 1; clamp_it (y, 0, nrow - h);
3623
3624 MIN_IT (x, ncol - w);
3625 MIN_IT (y, nrow - h);
3626 3663
3627 ov_x = x; ov_y = y; 3664 ov_x = x; ov_y = y;
3628 ov_w = w; ov_h = h; 3665 ov_w = w; ov_h = h;
3629 3666
3630 ov_text = new text_t *[h]; 3667 ov_text = new text_t *[h];
… …
3722 for (int y = ov_h; y--; ) 3759 for (int y = ov_h; y--; )
3723 { 3760 {
3724 text_t *t1 = ov_text[y]; 3761 text_t *t1 = ov_text[y];
3725 rend_t *r1 = ov_rend[y]; 3762 rend_t *r1 = ov_rend[y];
3726 3763
3727 text_t *t2 = ROW(y - view_start).t + ov_x; 3764 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3728 rend_t *r2 = ROW(y - view_start).r + ov_x; 3765 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3729 3766
3730 for (int x = ov_w; x--; ) 3767 for (int x = ov_w; x--; )
3731 { 3768 {
3732 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3769 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3733 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3770 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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