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.176 by root, Tue Dec 20 20:58:31 2005 UTC vs.
Revision 1.227 by root, Sun Jan 15 05:14:12 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
… …
600 * Change the colour for following text 572 * Change the colour for following text
601 */ 573 */
602void 574void
603rxvt_term::scr_color (unsigned int color, int fgbg) 575rxvt_term::scr_color (unsigned int color, int fgbg)
604{ 576{
605 if (color > maxTermCOLOR) 577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
606 color = fgbg; 578 color = fgbg;
607 579
608 if (fgbg == Color_fg) 580 if (fgbg == Color_fg)
609 rstyle = SET_FGCOLOR (rstyle, color); 581 rstyle = SET_FGCOLOR (rstyle, color);
610 else 582 else
… …
639 return 0; 611 return 0;
640 612
641 want_refresh = 1; 613 want_refresh = 1;
642 num_scr += count; 614 num_scr += count;
643 615
644 if (row1 == 0 && count > 0 616 if (count > 0
617 && row1 == 0
645 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
646 { 619 {
647 nsaved = min (nsaved + count, saveLines); 620 nsaved = min (nsaved + count, saveLines);
621
622 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
623
624 // scroll everything up 'count' lines
648 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
649 626
627 {
628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count);
630 l.touch ();
631 l.is_longer (0);
632 }
633
634 // erase newly scorlled-in lines
635 for (int i = count; i; --i )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
658
659 // move and/or clear selection, if any
650 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
651 { 661 {
652 selection.beg.row -= count; 662 selection.beg.row -= count;
653 selection.end.row -= count; 663 selection.end.row -= count;
654 selection.mark.row -= count; 664 selection.mark.row -= count;
655 665
656 selection_check (0); 666 if (selection.beg.row < -nsaved
667 || selection.end.row < -nsaved
668 || selection.mark.row < -nsaved)
669 {
670 CLEAR_ALL_SELECTION ();
671 selection.op = SELECTION_CLEAR;
657 } 672 }
658
659 for (int i = count; i--; )
660 scr_blank_screen_mem (ROW(row2 - i), rstyle);
661 673 }
674
675 // finally move the view window, if desired
662 if ((options & Opt_scrollWithBuffer) 676 if (OPTION (Opt_scrollWithBuffer)
663 && view_start != 0 677 && view_start != 0
664 && view_start != saveLines) 678 && view_start != saveLines)
665 scr_page (UP, count); 679 scr_page (UP, count);
666 } 680 }
667 else 681 else
668 { 682 {
669 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
670 { 684 {
671 int i = selection.beg.row; 685 if ((selection.beg.row < row1 && selection.end.row > row1)
672 int j = selection.end.row; 686 || (selection.beg.row < row2 && selection.end.row > row2)
673
674 if ((i < row1 && j > row1)
675 || (i < row2 && j > row2)
676 || (i - count < row1 && i >= row1) 687 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
677 || (i - count > row2 && i <= row2) 688 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
678 || (j - count < row1 && j >= row1) 689 || (selection.end.row - count < row1 && selection.end.row >= row1)
679 || (j - count > row2 && j <= row2)) 690 || (selection.end.row - count > row2 && selection.end.row <= row2))
680 { 691 {
681 CLEAR_ALL_SELECTION (); 692 CLEAR_ALL_SELECTION ();
682 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 693 selection.op = SELECTION_CLEAR;
683 } 694 }
684 else if (j >= row1 && j <= row2) 695 else if (selection.end.row >= row1 && selection.end.row <= row2)
685 { 696 {
686 /* move selected region too */ 697 /* move selected region too */
687 selection.beg.row -= count; 698 selection.beg.row -= count;
688 selection.end.row -= count; 699 selection.end.row -= count;
689 selection.mark.row -= count; 700 selection.mark.row -= count;
… …
695 // use a simple and robust scrolling algorithm, this 706 // use a simple and robust scrolling algorithm, this
696 // part of scr_scroll_text is not time-critical. 707 // part of scr_scroll_text is not time-critical.
697 708
698 int rows = row2 - row1 + 1; 709 int rows = row2 - row1 + 1;
699 710
711 min_it (count, rows);
712
713 line_t *temp_buf = row_buf + total_rows;
714
700 for (int row = 0; row < rows; row++) 715 for (int row = 0; row < rows; row++)
701 { 716 {
702 buf [row] = ROW(row1 + (row + count + rows) % rows); 717 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
703 718
704 if (!IN_RANGE_EXC (row + count, 0, rows)) 719 if (!IN_RANGE_EXC (row + count, 0, rows))
705 scr_blank_screen_mem (buf [row], rstyle); 720 scr_blank_screen_mem (temp_buf [row], rstyle);
706 } 721 }
707 722
708 for (int row = 0; row < rows; row++) 723 for (int row = 0; row < rows; row++)
709 ROW(row1 + row) = buf [row]; 724 ROW(row1 + row) = temp_buf [row];
710 } 725 }
711 726
712 return count; 727 return count;
713} 728}
714 729
715/* ------------------------------------------------------------------------- */ 730/* ------------------------------------------------------------------------- */
716/* 731/*
717 * Add text given in <str> of length <len> to screen struct 732 * Add text given in <str> of length <len> to screen struct
718 */ 733 */
719void 734void
720rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 735rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
721{ 736{
722 if (len <= 0) /* sanity */ 737 if (len <= 0) /* sanity */
723 return; 738 return;
724 739
725 unsigned char checksel; 740 unsigned char checksel;
726 unicode_t c; 741 unicode_t c;
727 int row, last_col; 742 int ncol = this->ncol;
728 const unicode_t *strend = str + len; 743 const wchar_t *strend = str + len;
729 744
730 want_refresh = 1; 745 want_refresh = 1;
731 ZERO_SCROLLBACK (); 746 ZERO_SCROLLBACK ();
732 last_col = ncol;
733 747
734 if (nlines > 0) 748 if (minlines > 0)
735 { 749 {
736 nlines += screen.cur.row - screen.bscroll; 750 minlines += screen.cur.row - screen.bscroll;
751
737 if ((nlines > 0) 752 if (minlines > 0
738 && (screen.tscroll == 0) 753 && screen.tscroll == 0
739 && (screen.bscroll == (nrow - 1))) 754 && screen.bscroll == nrow - 1)
740 { 755 {
741 /* _at least_ this many lines need to be scrolled */ 756 /* _at least_ this many lines need to be scrolled */
742 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 757 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
743 screen.cur.row -= nlines; 758 screen.cur.row -= minlines;
744 } 759 }
745 } 760 }
746 761
747#ifdef DEBUG_STRICT 762#ifdef DEBUG_STRICT
748 assert (screen.cur.col < last_col); 763 assert (screen.cur.col < ncol);
749 assert ((screen.cur.row < nrow) 764 assert (screen.cur.row < nrow
750 && (screen.cur.row >= - (int32_t)nsaved)); 765 && screen.cur.row >= -nsaved);
751#else /* drive with your eyes closed */
752 MIN_IT (screen.cur.col, last_col - 1);
753 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
754 MAX_IT (screen.cur.row, - (int32_t)nsaved);
755#endif 766#endif
756 row = screen.cur.row; 767 int row = screen.cur.row;
757 768
758 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 769 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
759 770
760 line_t *line = &ROW(row); 771 line_t *line = &ROW(row);
761 772
762 while (str < strend) 773 while (str < strend)
763 { 774 {
764 c = *str++; 775 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
765 776
766 if (c < 0x20) 777 if (c < 0x20)
767 if (c == C0_LF) 778 if (c == C0_LF)
768 { 779 {
769 if (!line->is_longer ()) /* XXX: think about this */
770 MAX_IT (line->l, screen.cur.col); 780 max_it (line->l, screen.cur.col);
771 781
772 screen.flags &= ~Screen_WrapNext; 782 screen.flags &= ~Screen_WrapNext;
773 783
774 if (screen.cur.row == screen.bscroll) 784 if (screen.cur.row == screen.bscroll)
775 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 785 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
779 line = &ROW(row); /* _must_ refresh */ 789 line = &ROW(row); /* _must_ refresh */
780 continue; 790 continue;
781 } 791 }
782 else if (c == C0_CR) 792 else if (c == C0_CR)
783 { 793 {
784 if (!line->is_longer ()) /* XXX: think about this */
785 MAX_IT (line->l, screen.cur.col); 794 max_it (line->l, screen.cur.col);
786 795
787 screen.flags &= ~Screen_WrapNext; 796 screen.flags &= ~Screen_WrapNext;
788 screen.cur.col = 0; 797 screen.cur.col = 0;
789 continue; 798 continue;
790 } 799 }
… …
807 CLEAR_SELECTION (); 816 CLEAR_SELECTION ();
808 } 817 }
809 818
810 if (screen.flags & Screen_WrapNext) 819 if (screen.flags & Screen_WrapNext)
811 { 820 {
821 max_it (line->l, ncol);
812 line->set_is_longer (); 822 line->is_longer (1);
813 823
814 scr_do_wrap (); 824 scr_do_wrap ();
815 825
816 row = screen.cur.row; 826 row = screen.cur.row;
817 line = &ROW(row); /* _must_ refresh */ 827 line = &ROW(row); /* _must_ refresh */
… …
825 // do wcwidth before further replacements, as wcwidth might return -1 835 // do wcwidth before further replacements, as wcwidth might return -1
826 // for the line drawing characters below as they might be invalid in the current 836 // for the line drawing characters below as they might be invalid in the current
827 // locale. 837 // locale.
828 int width = c < 0x100 ? 1 : wcwidth (c); 838 int width = c < 0x100 ? 1 : wcwidth (c);
829 839
830 if (charsets[screen.charset] == '0') // DEC SPECIAL 840 if (charsets [screen.charset] == '0') // DEC SPECIAL
831 { 841 {
832 // vt100 special graphics and line drawing 842 // vt100 special graphics and line drawing
833 // 5f-7e standard vt100 843 // 5f-7e standard vt100
834 // 40-5e rxvt extension for extra curses acs chars 844 // 40-5e rxvt extension for extra curses acs chars
835 static uint16_t vt100_0[62] = { // 41 .. 7e 845 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
887 } 897 }
888 898
889 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 899 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
890 900
891 // if the character doesn't fit into the remaining columns... 901 // if the character doesn't fit into the remaining columns...
892 if (screen.cur.col > last_col - width && last_col >= width) 902 if (screen.cur.col > ncol - width && ncol >= width)
893 { 903 {
894 // ...output spaces 904 // ...output spaces
895 c = ' '; 905 c = ' ';
896 // and try the same character next loop iteration 906 // and try the same character next loop iteration
897 --str; 907 --str;
898 } 908 }
899 909
910 line->touch ();
911
900 do 912 do
901 { 913 {
902 line->t[screen.cur.col] = c; 914 line->t[screen.cur.col] = c;
903 line->r[screen.cur.col] = rend; 915 line->r[screen.cur.col] = rend;
904 916
905 if (screen.cur.col < last_col - 1) 917 if (screen.cur.col < ncol - 1)
906 screen.cur.col++; 918 screen.cur.col++;
907 else 919 else
908 { 920 {
909 line->l = last_col; 921 line->l = ncol;
910 if (screen.flags & Screen_Autowrap) 922 if (screen.flags & Screen_Autowrap)
911 screen.flags |= Screen_WrapNext; 923 screen.flags |= Screen_WrapNext;
912 break; 924 break;
913 } 925 }
914 926
… …
916 } 928 }
917 while (--width > 0); 929 while (--width > 0);
918 930
919 // pad with spaces when overwriting wide character with smaller one 931 // pad with spaces when overwriting wide character with smaller one
920 if (!width) 932 if (!width)
933 {
934 line->touch ();
935
921 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 936 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
922 { 937 {
923 line->t[c] = ' '; 938 line->t[c] = ' ';
924 line->r[c] = rend; 939 line->r[c] = rend;
925 } 940 }
941 }
926 } 942 }
927 else // width == 0 943 else // width == 0
928 { 944 {
929#if ENABLE_COMBINING 945#if ENABLE_COMBINING
930 // handle combining characters 946 // handle combining characters
931 // we just tag the accent on the previous on-screen character. 947 // we just tag the accent on the previous on-screen character.
932 // this is arguably not correct, but also arguably not wrong. 948 // this is arguably not correct, but also arguably not wrong.
933 // we don't handle double-width characters nicely yet. 949 // we don't handle double-width characters nicely yet.
950 line_t *linep;
934 text_t *tp; 951 text_t *tp;
935 rend_t *rp; 952 rend_t *rp;
936 953
937 if (screen.cur.col > 0) 954 if (screen.cur.col > 0)
938 { 955 {
956 linep = line;
939 tp = line->t + screen.cur.col - 1; 957 tp = line->t + screen.cur.col - 1;
940 rp = line->r + screen.cur.col - 1; 958 rp = line->r + screen.cur.col - 1;
941
942 while (*tp == NOCHAR && tp > line->t)
943 tp--, rp--;
944 } 959 }
945 else if (screen.cur.row > 0 960 else if (screen.cur.row > 0
946 && ROW(screen.cur.row - 1).is_longer ()) 961 && ROW(screen.cur.row - 1).is_longer ())
947 { 962 {
948 line_t *line = &ROW(screen.cur.row - 1); 963 linep = &ROW(screen.cur.row - 1);
949
950 tp = line->t + last_col - 1; 964 tp = line->t + ncol - 1;
951 rp = line->r + last_col - 1; 965 rp = line->r + ncol - 1;
952
953 while (*tp == NOCHAR && tp > line->t)
954 tp--, rp--;
955 } 966 }
956 else 967 else
957 continue; 968 continue;
969
970 linep->touch ();
971
972 while (*tp == NOCHAR && tp > linep->t)
973 tp--, rp--;
958 974
959 // first try to find a precomposed character 975 // first try to find a precomposed character
960 unicode_t n = rxvt_compose (*tp, c); 976 unicode_t n = rxvt_compose (*tp, c);
961 if (n == NOCHAR) 977 if (n == NOCHAR)
962 n = rxvt_composite.compose (*tp, c); 978 n = rxvt_composite.compose (*tp, c);
… …
965 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 981 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
966#endif 982#endif
967 } 983 }
968 } 984 }
969 985
970 if (!line->is_longer ()) /* XXX: think about this */
971 MAX_IT (line->l, screen.cur.col); 986 max_it (line->l, screen.cur.col);
972 987
973#ifdef DEBUG_STRICT 988#ifdef DEBUG_STRICT
974 assert (screen.cur.row >= 0); 989 assert (screen.cur.row >= 0);
975#else /* drive with your eyes closed */
976 MAX_IT (screen.cur.row, 0);
977#endif 990#endif
978} 991}
979 992
980/* ------------------------------------------------------------------------- */ 993/* ------------------------------------------------------------------------- */
981/* 994/*
… …
1020 1033
1021 if (count == 0) 1034 if (count == 0)
1022 return; 1035 return;
1023 else if (count > 0) 1036 else if (count > 0)
1024 { 1037 {
1025 int row = screen.cur.row;
1026
1027 line_t &l = ROW(row); 1038 line_t &l = ROW(screen.cur.row);
1028 rend_t base_rend = l.r[i]; 1039 rend_t base_rend = l.r[i];
1029 ht &= l.t[i] == ' '; 1040 ht &= l.t[i] == ' ';
1030 1041
1031 for (; ++i < ncol; ) 1042 for (; ++i < ncol; )
1032 if (tabs[i]) 1043 if (tabs[i])
1033 { 1044 {
1034 x = i; 1045 x = i;
1046
1035 if (!--count) 1047 if (!--count)
1036 break; 1048 break;
1037 } 1049 }
1038 else 1050 else
1039 ht &= l.t[i] == ' ' 1051 ht &= l.t[i] == ' '
… …
1042 if (count) 1054 if (count)
1043 x = ncol - 1; 1055 x = ncol - 1;
1044 1056
1045 // store horizontal tab commands as characters inside the text 1057 // store horizontal tab commands as characters inside the text
1046 // buffer so they can be selected and pasted. 1058 // buffer so they can be selected and pasted.
1047 if (ht && options & Opt_pastableTabs) 1059 if (ht && OPTION (Opt_pastableTabs))
1048 { 1060 {
1049 base_rend = SET_FONT (base_rend, 0); 1061 base_rend = SET_FONT (base_rend, 0);
1050 1062
1051 if (!l.is_longer ()) /* XXX: think about this */ 1063 l.touch (x);
1052 MAX_IT (l.l, x);
1053 1064
1054 i = screen.cur.col; 1065 i = screen.cur.col;
1055 1066
1056 l.t[i] = '\t'; 1067 l.t[i] = '\t';
1057 l.r[i] = base_rend; 1068 l.r[i] = base_rend;
… …
1107 */ 1118 */
1108#if ENABLE_FRILLS 1119#if ENABLE_FRILLS
1109void 1120void
1110rxvt_term::scr_forwardindex () 1121rxvt_term::scr_forwardindex ()
1111{ 1122{
1112 int row;
1113
1114 if (screen.cur.col < ncol - 1) 1123 if (screen.cur.col < ncol - 1)
1115 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1116 else 1125 else
1117 { 1126 {
1118 row = screen.cur.row; 1127 line_t &l = ROW(screen.cur.row);
1119 1128
1120 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1129 l.touch ();
1121 ROW(row).l = ncol; 1130 l.is_longer (0);
1122 1131
1123 scr_gotorc (0, 0, R_RELATIVE); 1132 scr_gotorc (0, 0, R_RELATIVE);
1124 scr_insdel_chars (1, DELETE); 1133 scr_insdel_chars (1, DELETE);
1125 scr_gotorc (0, ncol - 1, R_RELATIVE); 1134 scr_gotorc (0, ncol - 1, R_RELATIVE);
1126 } 1135 }
… …
1136{ 1145{
1137 want_refresh = 1; 1146 want_refresh = 1;
1138 ZERO_SCROLLBACK (); 1147 ZERO_SCROLLBACK ();
1139 1148
1140 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1149 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1141 MAX_IT (screen.cur.col, 0); 1150 clamp_it (screen.cur.col, 0, ncol - 1);
1142 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1143 1151
1144 screen.flags &= ~Screen_WrapNext; 1152 screen.flags &= ~Screen_WrapNext;
1145 1153
1146 if (relative & R_RELATIVE) 1154 if (relative & R_RELATIVE)
1147 { 1155 {
… …
1165 else 1173 else
1166 { 1174 {
1167 if (screen.flags & Screen_Relative) 1175 if (screen.flags & Screen_Relative)
1168 { /* relative origin mode */ 1176 { /* relative origin mode */
1169 screen.cur.row = row + screen.tscroll; 1177 screen.cur.row = row + screen.tscroll;
1170 MIN_IT (screen.cur.row, screen.bscroll); 1178 min_it (screen.cur.row, screen.bscroll);
1171 } 1179 }
1172 else 1180 else
1173 screen.cur.row = row; 1181 screen.cur.row = row;
1174 } 1182 }
1175 1183
1176 MAX_IT (screen.cur.row, 0); 1184 clamp_it (screen.cur.row, 0, nrow - 1);
1177 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1178} 1185}
1179 1186
1180/* ------------------------------------------------------------------------- */ 1187/* ------------------------------------------------------------------------- */
1181/* 1188/*
1182 * direction should be UP or DN 1189 * direction should be UP or DN
… …
1197 || (screen.cur.row == screen.tscroll && direction == DN)) 1204 || (screen.cur.row == screen.tscroll && direction == DN))
1198 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1205 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1199 else 1206 else
1200 screen.cur.row += dirn; 1207 screen.cur.row += dirn;
1201 1208
1202 MAX_IT (screen.cur.row, 0); 1209 clamp_it (screen.cur.row, 0, nrow - 1);
1203 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1204 selection_check (0); 1210 selection_check (0);
1205} 1211}
1206 1212
1207/* ------------------------------------------------------------------------- */ 1213/* ------------------------------------------------------------------------- */
1208/* 1214/*
… …
1212 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1218 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1213 */ 1219 */
1214void 1220void
1215rxvt_term::scr_erase_line (int mode) 1221rxvt_term::scr_erase_line (int mode)
1216{ 1222{
1217 unsigned int row, col, num; 1223 unsigned int col, num;
1218 1224
1219 want_refresh = 1; 1225 want_refresh = 1;
1220 ZERO_SCROLLBACK (); 1226 ZERO_SCROLLBACK ();
1221 1227
1222 selection_check (1); 1228 selection_check (1);
1223 1229
1224 row = screen.cur.row; 1230 line_t &line = ROW(screen.cur.row);
1231
1232 line.touch ();
1233 line.is_longer (0);
1225 1234
1226 switch (mode) 1235 switch (mode)
1227 { 1236 {
1228 case 0: /* erase to end of line */ 1237 case 0: /* erase to end of line */
1229 col = screen.cur.col; 1238 col = screen.cur.col;
1230 num = ncol - col; 1239 num = ncol - col;
1231 MIN_IT (ROW(row).l, (int16_t)col); 1240 min_it (line.l, col);
1232 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1241 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1233 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1242 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1234 CLEAR_SELECTION (); 1243 CLEAR_SELECTION ();
1235 break; 1244 break;
1236 case 1: /* erase to beginning of line */ 1245 case 1: /* erase to beginning of line */
… …
1241 CLEAR_SELECTION (); 1250 CLEAR_SELECTION ();
1242 break; 1251 break;
1243 case 2: /* erase whole line */ 1252 case 2: /* erase whole line */
1244 col = 0; 1253 col = 0;
1245 num = ncol; 1254 num = ncol;
1246 ROW(row).l = 0; 1255 line.l = 0;
1247 if (selection.beg.row <= screen.cur.row 1256 if (selection.beg.row <= screen.cur.row
1248 && selection.end.row >= screen.cur.row) 1257 && selection.end.row >= screen.cur.row)
1249 CLEAR_SELECTION (); 1258 CLEAR_SELECTION ();
1250 break; 1259 break;
1251 default: 1260 default:
1252 return; 1261 return;
1253 } 1262 }
1254 1263
1255 scr_blank_line (ROW(row), col, num, rstyle); 1264 scr_blank_line (line, col, num, rstyle);
1256} 1265}
1257 1266
1258/* ------------------------------------------------------------------------- */ 1267/* ------------------------------------------------------------------------- */
1259/* 1268/*
1260 * Erase part of whole of the screen 1269 * Erase part of whole of the screen
… …
1303 CLEAR_SELECTION (); 1312 CLEAR_SELECTION ();
1304 1313
1305 if (row >= nrow) /* Out Of Bounds */ 1314 if (row >= nrow) /* Out Of Bounds */
1306 return; 1315 return;
1307 1316
1308 MIN_IT (num, (nrow - row)); 1317 min_it (num, nrow - row);
1309 1318
1310 if (rstyle & (RS_RVid | RS_Uline)) 1319 if (rstyle & (RS_RVid | RS_Uline))
1311 ren = (rend_t) ~RS_None; 1320 ren = (rend_t) ~RS_None;
1312 else if (GET_BASEBG (rstyle) == Color_bg) 1321 else if (GET_BASEBG (rstyle) == Color_bg)
1313 { 1322 {
… …
1315 CLEAR_ROWS (row, num); 1324 CLEAR_ROWS (row, num);
1316 } 1325 }
1317 else 1326 else
1318 { 1327 {
1319 ren = rstyle & (RS_fgMask | RS_bgMask); 1328 ren = rstyle & (RS_fgMask | RS_bgMask);
1320 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1321 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1330 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1322 ERASE_ROWS (row, num); 1331 ERASE_ROWS (row, num);
1323 gcvalue.foreground = pix_colors[Color_fg]; 1332 gcvalue.foreground = pix_colors[Color_fg];
1324 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1325 } 1334 }
1326 1335
1327 for (; num--; row++) 1336 for (; num--; row++)
1328 { 1337 {
1329 scr_blank_screen_mem (ROW (row), rstyle); 1338 scr_blank_screen_mem (ROW(row), rstyle);
1330 ROW (row).l = 0;
1331 scr_blank_line (drawn[row], 0, ncol, ren); 1339 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1332 } 1340 }
1333} 1341}
1334 1342
1335#if ENABLE_FRILLS 1343#if ENABLE_FRILLS
1336void 1344void
… …
1368 rend_t *r1 = line.r; 1376 rend_t *r1 = line.r;
1369 1377
1370 for (int j = ncol; j--; ) 1378 for (int j = ncol; j--; )
1371 *r1++ = fs; 1379 *r1++ = fs;
1372 1380
1373 line.l = ncol; /* make the `E's selectable */ 1381 line.is_longer (0);
1382 line.touch (ncol);
1374 } 1383 }
1375} 1384}
1376 1385
1377/* ------------------------------------------------------------------------- */ 1386/* ------------------------------------------------------------------------- */
1378/* 1387/*
… …
1421 return; 1430 return;
1422 1431
1423 scr_do_wrap (); 1432 scr_do_wrap ();
1424 1433
1425 selection_check (1); 1434 selection_check (1);
1426 MIN_IT (count, (ncol - screen.cur.col)); 1435 min_it (count, ncol - screen.cur.col);
1427 1436
1428 row = screen.cur.row; 1437 row = screen.cur.row;
1429 1438
1430 line_t *line = &ROW(row); 1439 line_t *line = &ROW(row);
1440
1441 line->touch ();
1442 line->is_longer (0);
1431 1443
1432 switch (insdel) 1444 switch (insdel)
1433 { 1445 {
1434 case INSERT: 1446 case INSERT:
1435 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1436 { 1448 {
1437 line->t[col] = line->t[col - count]; 1449 line->t[col] = line->t[col - count];
1438 line->r[col] = line->r[col - count]; 1450 line->r[col] = line->r[col - count];
1439 } 1451 }
1440 1452
1441 if (!line->is_longer ()) 1453 line->l = min (line->l + count, ncol);
1442 {
1443 line->l += count;
1444 MIN_IT (line->l, ncol);
1445 }
1446 1454
1447 if (selection.op && current_screen == selection.screen 1455 if (selection.op && current_screen == selection.screen
1448 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1449 { 1457 {
1450 if (selection.end.row != screen.cur.row 1458 if (selection.end.row != screen.cur.row
… …
1463 1471
1464 case ERASE: 1472 case ERASE:
1465 screen.cur.col += count; /* don't worry if > ncol */ 1473 screen.cur.col += count; /* don't worry if > ncol */
1466 selection_check (1); 1474 selection_check (1);
1467 screen.cur.col -= count; 1475 screen.cur.col -= count;
1476
1477 line->l = max (line->l - count, 0);
1468 scr_blank_line (*line, screen.cur.col, count, rstyle); 1478 scr_blank_line (*line, screen.cur.col, count, rstyle);
1469 break; 1479 break;
1470 1480
1471 case DELETE: 1481 case DELETE:
1472 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1475 { 1485 {
1476 line->t[col] = line->t[col + count]; 1486 line->t[col] = line->t[col + count];
1477 line->r[col] = line->r[col + count]; 1487 line->r[col] = line->r[col + count];
1478 } 1488 }
1479 1489
1490 line->l = max (line->l - count, 0);
1480 scr_blank_line (*line, ncol - count, count, tr); 1491 scr_blank_line (*line, ncol - count, count, tr);
1481
1482 if (line->is_longer ()) /* break line continuation */
1483 line->l = ncol;
1484
1485 line->l = max (line->l - count, 0);
1486 1492
1487 if (selection.op && current_screen == selection.screen 1493 if (selection.op && current_screen == selection.screen
1488 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1489 { 1495 {
1490 if (selection.end.row != screen.cur.row 1496 if (selection.end.row != screen.cur.row
… …
1510 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1516 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1511 */ 1517 */
1512void 1518void
1513rxvt_term::scr_scroll_region (int top, int bot) 1519rxvt_term::scr_scroll_region (int top, int bot)
1514{ 1520{
1515 MAX_IT (top, 0); 1521 max_it (top, 0);
1516 MIN_IT (bot, (int)nrow - 1); 1522 min_it (bot, nrow - 1);
1517 1523
1518 if (top > bot) 1524 if (top > bot)
1519 return; 1525 return;
1520 1526
1521 screen.tscroll = top; 1527 screen.tscroll = top;
… …
1602rxvt_term::scr_set_tab (int mode) 1608rxvt_term::scr_set_tab (int mode)
1603{ 1609{
1604 if (mode < 0) 1610 if (mode < 0)
1605 memset (tabs, 0, ncol * sizeof (char)); 1611 memset (tabs, 0, ncol * sizeof (char));
1606 else if (screen.cur.col < ncol) 1612 else if (screen.cur.col < ncol)
1607 tabs[screen.cur.col] = (mode ? 1 : 0); 1613 tabs [screen.cur.col] = !!mode;
1608} 1614}
1609 1615
1610/* ------------------------------------------------------------------------- */ 1616/* ------------------------------------------------------------------------- */
1611/* 1617/*
1612 * Set reverse/normal video 1618 * Set reverse/normal video
… …
1619 XGCValues gcvalue; 1625 XGCValues gcvalue;
1620 1626
1621 if (rvideo != mode) 1627 if (rvideo != mode)
1622 { 1628 {
1623 rvideo = mode; 1629 rvideo = mode;
1624 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1625#if XPM_BACKGROUND 1631#if XPM_BACKGROUND
1626 if (bgPixmap.pixmap == None) 1632 if (bgPixmap.pixmap == None)
1627#endif 1633#endif
1628#if TRANSPARENT 1634#if TRANSPARENT
1629 if (! (options & Opt_transparent) || am_transparent == 0) 1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1630#endif 1636#endif
1631 XSetWindowBackground (display->display, vt, 1637 XSetWindowBackground (display->display, vt,
1632 pix_colors[Color_bg]); 1638 pix_colors[Color_bg]);
1633 1639
1634 gcvalue.foreground = pix_colors[Color_fg]; 1640 gcvalue.foreground = pix_colors[Color_fg];
… …
1659 * Set font style 1665 * Set font style
1660 */ 1666 */
1661void 1667void
1662rxvt_term::set_font_style () 1668rxvt_term::set_font_style ()
1663{ 1669{
1670#if 0
1664 switch (charsets[screen.charset]) 1671 switch (charsets [screen.charset])
1665 { 1672 {
1666 case '0': /* DEC Special Character & Line Drawing Set */ 1673 case '0': /* DEC Special Character & Line Drawing Set */
1667 break; 1674 break;
1668 case 'A': /* United Kingdom (UK) */ 1675 case 'A': /* United Kingdom (UK) */
1669 break; 1676 break;
… …
1676 case 'C': /* Finnish character set */ 1683 case 'C': /* Finnish character set */
1677 break; 1684 break;
1678 case 'K': /* German character set */ 1685 case 'K': /* German character set */
1679 break; 1686 break;
1680 } 1687 }
1688#endif
1681} 1689}
1682 1690
1683/* ------------------------------------------------------------------------- */ 1691/* ------------------------------------------------------------------------- */
1684/* 1692/*
1685 * Choose a font 1693 * Choose a font
… …
1725 bool found = false; 1733 bool found = false;
1726 1734
1727 for (int i = 0; i < nrow; i++) 1735 for (int i = 0; i < nrow; i++)
1728 { 1736 {
1729 int col = 0; 1737 int col = 0;
1730 rend_t *drp = drawn[i].r; 1738 rend_t *drp = drawn_buf[i].r;
1731 1739
1732 for (; col < ncol; col++, drp++) 1740 for (; col < ncol; col++, drp++)
1733 if ((*drp & mask) == value) 1741 if ((*drp & mask) == value)
1734 { 1742 {
1735 found = true; 1743 found = true;
… …
1753rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1761rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1754{ 1762{
1755 int i; 1763 int i;
1756 row_col_t rc[RC_COUNT]; 1764 row_col_t rc[RC_COUNT];
1757 1765
1758 if (!drawn) /* sanity check */ 1766 if (!drawn_buf) /* sanity check */
1759 return; 1767 return;
1760 1768
1761#ifndef NO_SLOW_LINK_SUPPORT 1769#ifndef NO_SLOW_LINK_SUPPORT
1762 if (refresh_type == FAST_REFRESH && !display->is_local) 1770 if (refresh_type == FAST_REFRESH && !display->is_local)
1763 { 1771 {
1764 y = 0; 1772 y = 0;
1765 eheight = height; 1773 eheight = height;
1766 } 1774 }
1767#endif
1768
1769#ifdef DEBUG_STRICT
1770 x = max (x, 0);
1771 x = min (x, (int)width);
1772 y = max (y, 0);
1773 y = min (y, (int)height);
1774#endif 1775#endif
1775 1776
1776 /* round down */ 1777 /* round down */
1777 rc[PART_BEG].col = Pixel2Col (x); 1778 rc[PART_BEG].col = Pixel2Col (x);
1778 rc[PART_BEG].row = Pixel2Row (y); 1779 rc[PART_BEG].row = Pixel2Row (y);
… …
1781 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1782 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1782 1783
1783 /* sanity checks */ 1784 /* sanity checks */
1784 for (i = PART_BEG; i < RC_COUNT; i++) 1785 for (i = PART_BEG; i < RC_COUNT; i++)
1785 { 1786 {
1786 MIN_IT (rc[i].col, ncol - 1); 1787 min_it (rc[i].col, ncol - 1);
1787 MIN_IT (rc[i].row, nrow - 1); 1788 min_it (rc[i].row, nrow - 1);
1788 } 1789 }
1789 1790
1790 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1791 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1791 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1792 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1792 1793
1793 if (refresh) 1794 if (refresh)
1794 scr_refresh (SLOW_REFRESH); 1795 scr_refresh (SLOW_REFRESH);
1795} 1796}
1796 1797
… …
1859int 1860int
1860rxvt_term::scr_changeview (unsigned int oldviewstart) 1861rxvt_term::scr_changeview (unsigned int oldviewstart)
1861{ 1862{
1862 if (view_start != oldviewstart) 1863 if (view_start != oldviewstart)
1863 { 1864 {
1865 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1866
1864 want_refresh = 1; 1867 want_refresh = 1;
1865 num_scr -= (view_start - oldviewstart); 1868 num_scr -= (view_start - oldviewstart);
1866 } 1869 }
1867 1870
1868 return (int) (view_start - oldviewstart); 1871 return (int)view_start - (int)oldviewstart;
1869} 1872}
1870 1873
1871/* ------------------------------------------------------------------------- */ 1874/* ------------------------------------------------------------------------- */
1872void 1875void
1873rxvt_term::scr_bell () 1876rxvt_term::scr_bell ()
1874{ 1877{
1875#ifndef NO_BELL 1878#ifndef NO_BELL
1876 1879
1877# ifndef NO_MAPALERT 1880# ifndef NO_MAPALERT
1878# ifdef MAPALERT_OPTION 1881# ifdef MAPALERT_OPTION
1879 if (options & Opt_mapAlert) 1882 if (OPTION (Opt_mapAlert))
1880# endif 1883# endif
1881 XMapWindow (display->display, parent[0]); 1884 XMapWindow (display->display, parent[0]);
1882# endif 1885# endif
1883 1886
1884 if (options & Opt_visualBell) 1887 if (OPTION (Opt_visualBell))
1885 { 1888 {
1886 scr_rvideo_mode (!rvideo); /* refresh also done */ 1889 scr_rvideo_mode (!rvideo); /* refresh also done */
1890 display->flush ();
1887 rxvt_usleep (VISUAL_BELL_DURATION); 1891 rxvt_usleep (VISUAL_BELL_DURATION);
1888 scr_rvideo_mode (!rvideo); /* refresh also done */ 1892 scr_rvideo_mode (!rvideo); /* refresh also done */
1889 } 1893 }
1890 else 1894 else
1891 XBell (display->display, 0); 1895 XBell (display->display, 0);
… …
1959{ 1963{
1960 unsigned char must_clear, /* use draw_string not draw_image_string */ 1964 unsigned char must_clear, /* use draw_string not draw_image_string */
1961 showcursor; /* show the cursor */ 1965 showcursor; /* show the cursor */
1962 int16_t col, row, /* column/row we're processing */ 1966 int16_t col, row, /* column/row we're processing */
1963 ocrow; /* old cursor row */ 1967 ocrow; /* old cursor row */
1964 int i, /* tmp */ 1968 int i; /* tmp */
1965 row_offset; /* basic offset in screen structure */
1966#ifndef NO_CURSORCOLOR 1969#ifndef NO_CURSORCOLOR
1967 rend_t cc1; /* store colours at cursor position (s) */ 1970 rend_t cc1; /* store colours at cursor position (s) */
1968#endif 1971#endif
1969 rend_t *crp; // cursor rendition pointer 1972 rend_t *crp; // cursor rendition pointer
1970 1973
… …
1977 * A: set up vars 1980 * A: set up vars
1978 */ 1981 */
1979 must_clear = 0; 1982 must_clear = 0;
1980 refresh_count = 0; 1983 refresh_count = 0;
1981 1984
1982 row_offset = term_start - view_start;
1983
1984#if XPM_BACKGROUND 1985#if XPM_BACKGROUND
1985 must_clear |= bgPixmap.pixmap != None; 1986 must_clear |= bgPixmap.pixmap != None;
1986#endif 1987#endif
1987#if TRANSPARENT 1988#if TRANSPARENT
1988 must_clear |= (options & Opt_transparent) && am_transparent; 1989 must_clear |= OPTION (Opt_transparent) && am_transparent;
1989#endif 1990#endif
1990 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1991 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1991 1992
1992 /* 1993 /*
1993 * B: reverse any characters which are selected 1994 * B: reverse any characters which are selected
… …
2017 2018
2018 crp = &ROW(screen.cur.row).r[col]; 2019 crp = &ROW(screen.cur.row).r[col];
2019 2020
2020 if (showcursor && focus) 2021 if (showcursor && focus)
2021 { 2022 {
2022 if (options & Opt_cursorUnderline) 2023 if (OPTION (Opt_cursorUnderline))
2023 *crp ^= RS_Uline; 2024 *crp ^= RS_Uline;
2024 else 2025 else
2025 { 2026 {
2026 *crp ^= RS_RVid; 2027 *crp ^= RS_RVid;
2027 2028
… …
2029 cc1 = *crp & (RS_fgMask | RS_bgMask); 2030 cc1 = *crp & (RS_fgMask | RS_bgMask);
2030 if (ISSET_PIXCOLOR (Color_cursor)) 2031 if (ISSET_PIXCOLOR (Color_cursor))
2031 ccol1 = Color_cursor; 2032 ccol1 = Color_cursor;
2032 else 2033 else
2033#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2034#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2034 ccol1 = GET_FGCOLOR (rstyle); 2035 ccol1 = fgcolor_of (rstyle);
2035#else 2036#else
2036 ccol1 = Color_fg; 2037 ccol1 = Color_fg;
2037#endif 2038#endif
2038 if (ISSET_PIXCOLOR (Color_cursor2)) 2039 if (ISSET_PIXCOLOR (Color_cursor2))
2039 ccol2 = Color_cursor2; 2040 ccol2 = Color_cursor2;
2040 else 2041 else
2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2042#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2042 ccol2 = GET_BGCOLOR (rstyle); 2043 ccol2 = bgcolor_of (rstyle);
2043#else 2044#else
2044 ccol2 = Color_bg; 2045 ccol2 = Color_bg;
2045#endif 2046#endif
2046 *crp = SET_FGCOLOR (*crp, ccol1); 2047 *crp = SET_FGCOLOR (*crp, ccol1);
2047 *crp = SET_BGCOLOR (*crp, ccol2); 2048 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2057 if (screen.cur.row + view_start != ocrow 2058 if (screen.cur.row + view_start != ocrow
2058 || screen.cur.col != oldcursor.col) 2059 || screen.cur.col != oldcursor.col)
2059 { 2060 {
2060 if (ocrow < nrow 2061 if (ocrow < nrow
2061 && oldcursor.col < ncol) 2062 && oldcursor.col < ncol)
2062 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2063 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2063 2064
2064 if (focus || !showcursor) 2065 if (focus || !showcursor)
2065 oldcursor.row = -1; 2066 oldcursor.row = -1;
2066 else 2067 else
2067 setoldcursor = 1; 2068 setoldcursor = 1;
… …
2080 oldcursor.col = screen.cur.col; 2081 oldcursor.col = screen.cur.col;
2081 } 2082 }
2082 } 2083 }
2083 } 2084 }
2084 2085
2086 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2085#if ENABLE_OVERLAY 2087#if ENABLE_OVERLAY
2086 scr_swap_overlay (); 2088 scr_swap_overlay ();
2087#endif 2089#endif
2088 2090
2089#ifndef NO_SLOW_LINK_SUPPORT 2091#ifndef NO_SLOW_LINK_SUPPORT
… …
2105 row = i > 0 ? 0 : j - 1; 2107 row = i > 0 ? 0 : j - 1;
2106 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2108 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2107 { 2109 {
2108 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2110 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2109 { 2111 {
2110 line_t s = save[(row + row_offset) % total_rows]; 2112 line_t s = ROW(row - view_start);
2111 line_t d = drawn[row]; 2113 line_t d = drawn_buf[row];
2112 line_t d2 = drawn[row + i]; 2114 line_t d2 = drawn_buf[row + i];
2113 2115
2114 for (nits = 0, col = ncol; col--; ) 2116 for (nits = 0, col = ncol; col--; )
2115 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2117 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2116 nits--; 2118 nits--;
2117 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2119 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2135 2137
2136 if (len != -1) 2138 if (len != -1)
2137 { 2139 {
2138 /* also comes here at end if needed because of >= above */ 2140 /* also comes here at end if needed because of >= above */
2139 if (wlen < len) 2141 if (wlen < len)
2140 SWAP_IT (wlen, len, int); 2142 ::swap (wlen, len);
2141 2143
2142 XCopyArea (display->display, vt, vt, 2144 XCopyArea (display->display, vt, vt,
2143 gc, 0, Row2Pixel (len + i), 2145 gc, 0, Row2Pixel (len + i),
2144 (unsigned int)TermWin_TotalWidth (), 2146 (unsigned int)this->width,
2145 (unsigned int)Height2Pixel (wlen - len + 1), 2147 (unsigned int)Height2Pixel (wlen - len + 1),
2146 0, Row2Pixel (len)); 2148 0, Row2Pixel (len));
2147 len = -1; 2149 len = -1;
2148 } 2150 }
2149 } 2151 }
… …
2153 /* 2155 /*
2154 * E: main pass across every character 2156 * E: main pass across every character
2155 */ 2157 */
2156 for (row = 0; row < nrow; row++) 2158 for (row = 0; row < nrow; row++)
2157 { 2159 {
2158 text_t *stp = save[(row + row_offset) % total_rows].t; 2160 text_t *stp = ROW(row - view_start).t;
2159 rend_t *srp = save[(row + row_offset) % total_rows].r; 2161 rend_t *srp = ROW(row - view_start).r;
2160 text_t *dtp = drawn[row].t; 2162 text_t *dtp = drawn_buf[row].t;
2161 rend_t *drp = drawn[row].r; 2163 rend_t *drp = drawn_buf[row].r;
2162 2164
2163 /* 2165 /*
2164 * E2: OK, now the real pass 2166 * E2: OK, now the real pass
2165 */ 2167 */
2166 int ypixel = (int)Row2Pixel (row); 2168 int ypixel = (int)Row2Pixel (row);
… …
2228 count++, i--; 2230 count++, i--;
2229 2231
2230 /* 2232 /*
2231 * Determine the attributes for the string 2233 * Determine the attributes for the string
2232 */ 2234 */
2233 int fore = GET_FGCOLOR (rend); // desired foreground 2235 int fore = fgcolor_of (rend); // desired foreground
2234 int back = GET_BGCOLOR (rend); // desired background 2236 int back = bgcolor_of (rend); // desired background
2235 2237
2236 // only do special processing if any attributes are set, which is rare 2238 // only do special processing if any attributes are set, which is unlikely
2237 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2239 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2238 { 2240 {
2239#if ENABLE_STYLES 2241#if ENABLE_STYLES
2240 // force redraw after "careful" characters to avoid pixel droppings 2242 // force redraw after "careful" characters to avoid pixel droppings
2241 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2243 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2277 fore = Color_UL; 2279 fore = Color_UL;
2278#endif 2280#endif
2279 2281
2280 if (invert) 2282 if (invert)
2281 { 2283 {
2282 SWAP_IT (fore, back, int); 2284 ::swap (fore, back);
2283 2285
2284#ifndef NO_BOLD_UNDERLINE_REVERSE 2286#ifndef NO_BOLD_UNDERLINE_REVERSE
2285 if (ISSET_PIXCOLOR (Color_RV)) 2287 if (ISSET_PIXCOLOR (Color_RV))
2286 back = Color_RV; 2288 back = Color_RV;
2287 2289
… …
2352 } /* for (row....) */ 2354 } /* for (row....) */
2353 2355
2354#if ENABLE_OVERLAY 2356#if ENABLE_OVERLAY
2355 scr_swap_overlay (); 2357 scr_swap_overlay ();
2356#endif 2358#endif
2359 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2357 2360
2358 /* 2361 /*
2359 * G: cleanup cursor and display outline cursor if necessary 2362 * G: cleanup cursor and display outline cursor if necessary
2360 */ 2363 */
2361 if (showcursor) 2364 if (showcursor)
2362 { 2365 {
2363 if (focus) 2366 if (focus)
2364 { 2367 {
2365 if (options & Opt_cursorUnderline) 2368 if (OPTION (Opt_cursorUnderline))
2366 *crp ^= RS_Uline; 2369 *crp ^= RS_Uline;
2367 else 2370 else
2368 { 2371 {
2369 *crp ^= RS_RVid; 2372 *crp ^= RS_RVid;
2370#ifndef NO_CURSORCOLOR 2373#ifndef NO_CURSORCOLOR
… …
2379 2382
2380 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2383 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2381 col--; 2384 col--;
2382 2385
2383 while (col + cursorwidth < ncol 2386 while (col + cursorwidth < ncol
2384 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2387 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2385 cursorwidth++; 2388 cursorwidth++;
2386 2389
2387#ifndef NO_CURSORCOLOR 2390#ifndef NO_CURSORCOLOR
2388 if (ISSET_PIXCOLOR (Color_cursor)) 2391 if (ISSET_PIXCOLOR (Color_cursor))
2389 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2392 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2400 /* 2403 /*
2401 * H: cleanup selection 2404 * H: cleanup selection
2402 */ 2405 */
2403 scr_reverse_selection (); 2406 scr_reverse_selection ();
2404 2407
2405 if (refresh_type & SMOOTH_REFRESH)
2406 XFlush (display->display);
2407
2408 num_scr = 0; 2408 num_scr = 0;
2409 num_scr_allow = 1; 2409 num_scr_allow = 1;
2410} 2410}
2411 2411
2412void 2412void
2413rxvt_term::scr_remap_chars (const line_t &l) 2413rxvt_term::scr_remap_chars (line_t &l)
2414{ 2414{
2415 if (!l.t) 2415 if (!l.t)
2416 return; 2416 return;
2417 2417
2418 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2419
2418 for (int i = ncol; i--; ) 2420 for (int i = ncol; i--; )
2419 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2421 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2420} 2422}
2421 2423
2422void 2424void
2423rxvt_term::scr_remap_chars () 2425rxvt_term::scr_remap_chars ()
2424{ 2426{
2425 for (int i = total_rows; i--; ) 2427 for (int i = total_rows; i--; )
2426 scr_remap_chars (save[i]); 2428 scr_remap_chars (row_buf [i]);
2427 2429
2428 for (int i = nrow; i--; ) 2430 for (int i = nrow; i--; )
2429 { 2431 {
2430 scr_remap_chars (drawn[i]); 2432 scr_remap_chars (drawn_buf [i]);
2431 scr_remap_chars (swap_save[i]); 2433 scr_remap_chars (swap_buf [i]);
2432 } 2434 }
2433} 2435}
2434 2436
2435void 2437void
2436rxvt_term::scr_recolour () 2438rxvt_term::scr_recolour ()
… …
2474 2476
2475 if (really) 2477 if (really)
2476 XClearWindow (display->display, vt); 2478 XClearWindow (display->display, vt);
2477} 2479}
2478 2480
2481void
2482rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2483{
2484 int view_end = -view_start + nrow;
2485 int row, col;
2486
2487 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++)
2488 {
2489 text_t *stp = ROW(row).t;
2490 rend_t *srp = ROW(row).r;
2491
2492 for (col = beg_col; col < end_col; col++)
2493 srp[col] ^= rstyle1;
2494
2495 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2496 srp[col] ^= rstyle2;
2497
2498 if (++col < end_col)
2499 srp[col] ^= rstyle2;
2500 }
2501}
2502
2503void
2504rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2505{
2506 int view_end = -view_start + nrow;
2507 int row, col;
2508
2509 if (beg_row >= -view_start)
2510 {
2511 col = beg_col;
2512 row = beg_row;
2513 }
2514 else
2515 {
2516 col = 0;
2517 row = -view_start;
2518 }
2519
2520 for (; row < min (end_row, view_end); row++, col = 0)
2521 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2522 srp[col] ^= rstyle;
2523
2524 if (row == end_row)
2525 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2526 srp[col] ^= rstyle;
2527}
2528
2479/* ------------------------------------------------------------------------- */ 2529/* ------------------------------------------------------------------------- */
2480void 2530void
2481rxvt_term::scr_reverse_selection () 2531rxvt_term::scr_reverse_selection ()
2482{ 2532{
2483 if (selection.op 2533 if (selection.op
2484 && current_screen == selection.screen 2534 && current_screen == selection.screen
2485 && selection.end.row >= -view_start) 2535 && selection.end.row >= -view_start)
2486 { 2536 {
2487 int view_end = -view_start + nrow;
2488 int row, col;
2489
2490#if ENABLE_FRILLS 2537#if ENABLE_FRILLS
2491 if (selection.rect) 2538 if (selection.rect)
2492 { 2539 scr_xor_rect (selection.beg.row, selection.beg.col,
2493 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2540 selection.end.row, selection.end.col,
2494 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2541 RS_RVid, RS_RVid | RS_Uline);
2495 srp[col] ^= RS_RVid;
2496 }
2497 else 2542 else
2498#endif 2543#endif
2499 { 2544 scr_xor_span (selection.beg.row, selection.beg.col,
2500 if (selection.beg.row >= -view_start) 2545 selection.end.row, selection.end.col,
2501 { 2546 RS_RVid);
2502 col = selection.beg.col;
2503 row = selection.beg.row;
2504 }
2505 else
2506 {
2507 col = 0;
2508 row = view_start;
2509 }
2510
2511 for (; row < min (selection.end.row, view_end); row++, col = 0)
2512 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2513 srp[col] ^= RS_RVid;
2514
2515 if (row == selection.end.row)
2516 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2517 srp[col] ^= RS_RVid;
2518 }
2519 } 2547 }
2520} 2548}
2521 2549
2522/* ------------------------------------------------------------------------- */ 2550/* ------------------------------------------------------------------------- */
2523/* 2551/*
… …
2533 char r1[] = "\n"; 2561 char r1[] = "\n";
2534 2562
2535 for (row = saveLines - nsaved; 2563 for (row = saveLines - nsaved;
2536 row < saveLines + nrow - 1; row++) 2564 row < saveLines + nrow - 1; row++)
2537 { 2565 {
2538 width = save[row].l >= 0 ? save[row].l 2566 width = row_buf[row].l >= 0 ? row_buf[row].l
2539 : ncol; 2567 : ncol;
2540 for (towrite = width; towrite; towrite -= wrote) 2568 for (towrite = width; towrite; towrite -= wrote)
2541 { 2569 {
2542 wrote = write (fd, & (save[row].t[width - towrite]), 2570 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2543 towrite); 2571 towrite);
2544 if (wrote < 0) 2572 if (wrote < 0)
2545 return; /* XXX: death, no report */ 2573 return; /* XXX: death, no report */
2546 } 2574 }
2547 if (save[row].l >= 0) 2575 if (row_buf[row].l >= 0)
2548 if (write (fd, r1, 1) <= 0) 2576 if (write (fd, r1, 1) <= 0)
2549 return; /* XXX: death, no report */ 2577 return; /* XXX: death, no report */
2550 } 2578 }
2551} 2579}
2552#endif 2580#endif
… …
2584/* ------------------------------------------------------------------------- */ 2612/* ------------------------------------------------------------------------- */
2585/* 2613/*
2586 * Paste a selection direct to the command fd 2614 * Paste a selection direct to the command fd
2587 */ 2615 */
2588void 2616void
2589rxvt_term::paste (unsigned char *data, unsigned int len) 2617rxvt_term::paste (char *data, unsigned int len)
2590{ 2618{
2591 /* convert normal newline chars into common keyboard Return key sequence */ 2619 /* convert normal newline chars into common keyboard Return key sequence */
2592 for (unsigned int i = 0; i < len; i++) 2620 for (unsigned int i = 0; i < len; i++)
2593 if (data[i] == C0_LF) 2621 if (data[i] == C0_LF)
2594 data[i] = C0_CR; 2622 data[i] = C0_CR;
… …
2738 { 2766 {
2739 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2767 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2740 char *s = rxvt_wcstombs (w); 2768 char *s = rxvt_wcstombs (w);
2741 free (w); 2769 free (w);
2742 // TODO: strlen == only the first element will be converted. well... 2770 // TODO: strlen == only the first element will be converted. well...
2743 paste ((unsigned char *)s, strlen (s)); 2771 paste (s, strlen (s));
2744 free (s); 2772 free (s);
2745 } 2773 }
2746 else 2774 else
2747#endif 2775#endif
2748 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2776 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2749 && cl) 2777 && cl)
2750 { 2778 {
2751 for (int i = 0; i < cr; i++) 2779 for (int i = 0; i < cr; i++)
2752 paste ((unsigned char *)cl[i], strlen (cl[i])); 2780 paste (cl[i], strlen (cl[i]));
2753 2781
2754 XFreeStringList (cl); 2782 XFreeStringList (cl);
2755 } 2783 }
2756 else 2784 else
2757 paste (ct.value, ct.nitems); // paste raw 2785 paste ((char *)ct.value, ct.nitems); // paste raw
2758 2786
2759bailout: 2787bailout:
2760 XFree (ct.value); 2788 XFree (ct.value);
2761 2789
2762 if (selection_wait == Sel_normal) 2790 if (selection_wait == Sel_normal)
… …
2800 return; /* outside window */ 2828 return; /* outside window */
2801 2829
2802 if (selection.text) 2830 if (selection.text)
2803 { /* internal selection */ 2831 { /* internal selection */
2804 char *str = rxvt_wcstombs (selection.text, selection.len); 2832 char *str = rxvt_wcstombs (selection.text, selection.len);
2805 paste ((unsigned char *)str, strlen (str)); 2833 paste (str, strlen (str));
2806 free (str); 2834 free (str);
2807 return; 2835 return;
2808 } 2836 }
2809 else 2837 else
2810 { 2838 {
… …
2902 selection.op = SELECTION_DONE; 2930 selection.op = SELECTION_DONE;
2903 2931
2904 if (selection.clicks == 4) 2932 if (selection.clicks == 4)
2905 return; /* nothing selected, go away */ 2933 return; /* nothing selected, go away */
2906 2934
2935 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2936 return;
2937
2907 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2938 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2908 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2939 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2909 2940
2910 int ofs = 0; 2941 int ofs = 0;
2911 int extra = 0; 2942 int extra = 0;
… …
2923 col = selection.beg.col; 2954 col = selection.beg.col;
2924 end_col = ncol + 1; 2955 end_col = ncol + 1;
2925 } 2956 }
2926 else 2957 else
2927#endif 2958#endif
2928 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2959 end_col = ROW(row).l;
2929 2960
2930 col = max (col, 0); 2961 col = max (col, 0);
2931 2962
2932 if (row == selection.end.row || selection.rect) 2963 if (row == selection.end.row
2964#if ENABLE_FRILLS
2965 || selection.rect
2966#endif
2967 )
2933 end_col = min (end_col, selection.end.col); 2968 min_it (end_col, selection.end.col);
2934 2969
2935 t = ROW(row).t + col; 2970 t = ROW(row).t + col;
2971
2936 for (; col < end_col; col++) 2972 for (; col < end_col; col++)
2937 { 2973 {
2938 if (*t == NOCHAR) 2974 if (*t == NOCHAR)
2939 t++; 2975 t++;
2940#if ENABLE_COMBINING 2976#if ENABLE_COMBINING
… …
2956#endif 2992#endif
2957 else 2993 else
2958 new_selection_text[ofs++] = *t++; 2994 new_selection_text[ofs++] = *t++;
2959 } 2995 }
2960 2996
2997#if ENABLE_FRILLS
2998 if (selection.rect)
2999 {
3000 while (ofs
3001 && new_selection_text[ofs - 1] != C0_LF
3002 && unicode::is_space (new_selection_text[ofs - 1]))
3003 --ofs;
3004
3005 new_selection_text[ofs++] = C0_LF;
3006 }
3007 else
3008#endif
2961 if (!ROW(row).is_longer () && row != selection.end.row) 3009 if (!ROW(row).is_longer () && row != selection.end.row)
2962 new_selection_text[ofs++] = C0_LF; 3010 new_selection_text[ofs++] = C0_LF;
2963 } 3011 }
2964 3012
2965 if (end_col != selection.end.col) 3013 if (end_col != selection.end.col)
2966 new_selection_text[ofs++] = C0_LF; 3014 new_selection_text[ofs++] = C0_LF;
2967 3015
… …
2977 3025
2978 // we usually allocate much more than necessary, so realloc it smaller again 3026 // we usually allocate much more than necessary, so realloc it smaller again
2979 selection.len = ofs; 3027 selection.len = ofs;
2980 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3028 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2981 3029
3030 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3031 return;
3032
3033 selection_grab (tm);
3034}
3035
3036bool
3037rxvt_term::selection_grab (Time tm)
3038{
3039 selection_time = tm;
3040
2982 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3041 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2983 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3042 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3043 {
2984 display->set_selection_owner (this); 3044 display->set_selection_owner (this);
3045 return true;
3046 }
2985 else 3047 else
2986 rxvt_warn ("can't get primary selection, ignoring.\n"); 3048 {
3049 selection_clear ();
3050 return false;
3051 }
2987 3052
2988#if 0 3053#if 0
2989 XTextProperty ct; 3054 XTextProperty ct;
2990 3055
2991 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3056 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2992 { 3057 {
2993 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3058 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2994 XFree (ct.value); 3059 XFree (ct.value);
2995 } 3060 }
2996#endif 3061#endif
2997
2998 selection_time = tm;
2999} 3062}
3000 3063
3001/* ------------------------------------------------------------------------- */ 3064/* ------------------------------------------------------------------------- */
3002/* 3065/*
3003 * Mark or select text based upon number of clicks: 1, 2, or 3 3066 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3006void 3069void
3007rxvt_term::selection_click (int clicks, int x, int y) 3070rxvt_term::selection_click (int clicks, int x, int y)
3008{ 3071{
3009 clicks = ((clicks - 1) % 3) + 1; 3072 clicks = ((clicks - 1) % 3) + 1;
3010 selection.clicks = clicks; /* save clicks so extend will work */ 3073 selection.clicks = clicks; /* save clicks so extend will work */
3074
3075 if (clicks == 2 && !selection.rect
3076 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3077 {
3078 MEvent.clicks = 1; // what a mess
3079 selection.screen = current_screen;
3080 selection.op = SELECTION_CONT;
3081 return;
3082 }
3011 3083
3012 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3084 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3013 3085
3014 if (clicks == 2 || clicks == 3) 3086 if (clicks == 2 || clicks == 3)
3015 selection_extend_colrow (selection.mark.col, 3087 selection_extend_colrow (selection.mark.col,
… …
3029 want_refresh = 1; 3101 want_refresh = 1;
3030 3102
3031 selection.mark.row = row - view_start; 3103 selection.mark.row = row - view_start;
3032 selection.mark.col = col; 3104 selection.mark.col = col;
3033 3105
3034 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); 3106 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3035 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); 3107 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3036 3108
3037 while (selection.mark.col > 0 3109 while (selection.mark.col > 0
3038 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3110 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3039 --selection.mark.col; 3111 --selection.mark.col;
3040 3112
… …
3125 } 3197 }
3126 } 3198 }
3127 break; 3199 break;
3128 } 3200 }
3129 3201
3130Old_Word_Selection_You_Die:
3131 if (dirn == DN) 3202 if (dirn == DN)
3132 col++; /* put us on one past the end */ 3203 col++; /* put us on one past the end */
3133 3204
3134 /* Poke the values back in */ 3205 /* Poke the values back in */
3135 ret->row = row; 3206 ret->row = row;
… …
3145 * flag == 2 ==> button 3 motion 3216 * flag == 2 ==> button 3 motion
3146 */ 3217 */
3147void 3218void
3148rxvt_term::selection_extend (int x, int y, int flag) 3219rxvt_term::selection_extend (int x, int y, int flag)
3149{ 3220{
3150 int col = min (max (Pixel2Col (x), 0), nrow - 1); 3221 int col = clamp (Pixel2Col (x), 0, ncol);
3151 int row = min (max (Pixel2Row (y), 0), ncol); 3222 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3152 3223
3153 /* 3224 /*
3154 * If we're selecting characters (single click) then we must check first 3225 * If we're selecting characters (single click) then we must check first
3155 * if we are at the same place as the original mark. If we are then 3226 * if we are at the same place as the original mark. If we are then
3156 * select nothing. Otherwise, if we're to the right of the mark, you have to 3227 * select nothing. Otherwise, if we're to the right of the mark, you have to
… …
3318 selection_delimit_word (DN, &selection.end, &selection.end); 3389 selection_delimit_word (DN, &selection.end, &selection.end);
3319 } 3390 }
3320 else if (selection.clicks == 3) 3391 else if (selection.clicks == 3)
3321 { 3392 {
3322#if ENABLE_FRILLS 3393#if ENABLE_FRILLS
3323 if (options & Opt_tripleclickwords) 3394 if (OPTION (Opt_tripleclickwords))
3324 { 3395 {
3325 selection_delimit_word (UP, &selection.beg, &selection.beg); 3396 selection_delimit_word (UP, &selection.beg, &selection.beg);
3326 3397
3327 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3398 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3328 { 3399 {
… …
3369 } 3440 }
3370 } 3441 }
3371 3442
3372#if ENABLE_FRILLS 3443#if ENABLE_FRILLS
3373 if (selection.rect && selection.beg.col > selection.end.col) 3444 if (selection.rect && selection.beg.col > selection.end.col)
3374 SWAP_IT (selection.beg.col, selection.end.col, int); 3445 ::swap (selection.beg.col, selection.end.col);
3375#endif 3446#endif
3376} 3447}
3377 3448
3378#if ENABLE_FRILLS 3449#if ENABLE_FRILLS
3379void 3450void
… …
3389 { 3460 {
3390 stp = ROW(end_row).t; 3461 stp = ROW(end_row).t;
3391 3462
3392 while (--end_col >= 0) 3463 while (--end_col >= 0)
3393 { 3464 {
3394 if (stp[end_col] != ' ' 3465 if (stp[end_col] != NOCHAR
3395 && stp[end_col] != '\t' 3466 && !unicode::is_space (stp[end_col]))
3396 && stp[end_col] != NOCHAR)
3397 break; 3467 break;
3398 } 3468 }
3399 3469
3400 if (end_col >= 0 3470 if (end_col >= 0
3401 || !ROW(end_row - 1).is_longer ()) 3471 || !ROW(end_row - 1).is_longer ())
… …
3577 */ 3647 */
3578void 3648void
3579rxvt_term::pixel_position (int *x, int *y) 3649rxvt_term::pixel_position (int *x, int *y)
3580{ 3650{
3581 *x = Pixel2Col (*x); 3651 *x = Pixel2Col (*x);
3582 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3652 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3583 *y = Pixel2Row (*y); 3653 *y = Pixel2Row (*y);
3584 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3654 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3585} 3655}
3586 3656
3587/* ------------------------------------------------------------------------- */ 3657/* ------------------------------------------------------------------------- */
3588#ifdef USE_XIM 3658#ifdef USE_XIM
3589void 3659void
… …
3600 3670
3601#if ENABLE_OVERLAY 3671#if ENABLE_OVERLAY
3602void 3672void
3603rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3673rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3604{ 3674{
3605 if (nrow < 3 || ncol < 3) 3675 if (nrow < 1 || ncol < 1)
3606 return; 3676 return;
3607 3677
3608 want_refresh = 1; 3678 want_refresh = 1;
3609 3679
3610 scr_overlay_off (); 3680 scr_overlay_off ();
3611 3681
3612 if (x < 0) x = ncol - w; 3682 if (x < 0) x = ncol - w;
3613 if (y < 0) y = nrow - h; 3683 if (y < 0) y = nrow - h;
3614 3684
3615 // make space for border 3685 // make space for border
3616 w += 2; MIN_IT (w, ncol); 3686 w += 2; min_it (w, ncol);
3617 h += 2; MIN_IT (h, nrow); 3687 h += 2; min_it (h, nrow);
3618 3688
3619 x -= 1; MAX_IT (x, 0); 3689 x -= 1; clamp_it (x, 0, ncol - w);
3620 y -= 1; MAX_IT (y, 0); 3690 y -= 1; clamp_it (y, 0, nrow - h);
3621
3622 MIN_IT (x, ncol - w);
3623 MIN_IT (y, nrow - h);
3624 3691
3625 ov_x = x; ov_y = y; 3692 ov_x = x; ov_y = y;
3626 ov_w = w; ov_h = h; 3693 ov_w = w; ov_h = h;
3627 3694
3628 ov_text = new text_t *[h]; 3695 ov_text = new text_t *[h];
… …
3720 for (int y = ov_h; y--; ) 3787 for (int y = ov_h; y--; )
3721 { 3788 {
3722 text_t *t1 = ov_text[y]; 3789 text_t *t1 = ov_text[y];
3723 rend_t *r1 = ov_rend[y]; 3790 rend_t *r1 = ov_rend[y];
3724 3791
3725 text_t *t2 = ROW(y - view_start).t + ov_x; 3792 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3726 rend_t *r2 = ROW(y - view_start).r + ov_x; 3793 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3727 3794
3728 for (int x = ov_w; x--; ) 3795 for (int x = ov_w; x--; )
3729 { 3796 {
3730 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3797 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3731 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3798 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