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.174 by root, Mon Dec 19 02:40:14 2005 UTC vs.
Revision 1.211 by root, Fri Jan 6 01:16:58 2006 UTC

… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 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() \
… …
116 117
117/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
118void 119void
119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
120{ 121{
122 if (!l.t)
123 {
124 lalloc (l);
125 col = 0;
126 width = ncol;
127 }
128
129 l.touch ();
130
121 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123 133
124 text_t *et = l.t + col; 134 text_t *et = l.t + col;
125 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
134/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
135/* 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 */
136void 146void
137rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
138{ 148{
139 if (!l.t)
140 lalloc (l);
141
142 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
143} 150}
144 151
145/* ------------------------------------------------------------------------- * 152/* ------------------------------------------------------------------------- *
146 * SCREEN INITIALISATION * 153 * SCREEN INITIALISATION *
147 * ------------------------------------------------------------------------- */ 154 * ------------------------------------------------------------------------- */
155
148void 156void
149rxvt_term::scr_reset () 157rxvt_term::scr_reset ()
150{ 158{
151 unsigned int p, q;
152 int k;
153
154#if ENABLE_OVERLAY 159#if ENABLE_OVERLAY
155 scr_overlay_off (); 160 scr_overlay_off ();
156#endif 161#endif
157 162
158 view_start = 0; 163 view_start = 0;
… …
168 return; 173 return;
169 174
170 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
171 if (nrow + saveLines < 2) 176 if (nrow + saveLines < 2)
172 { 177 {
178 //TODO//FIXME
173 saveLines++; 179 saveLines++;
174 prev_nrow--; 180 prev_nrow--;
175 nscrolled++; 181 nsaved++;
176 } 182 }
177 183
178 want_refresh = 1; 184 want_refresh = 1;
179 185
180 int prev_total_rows = prev_nrow + saveLines; 186 int prev_total_rows = prev_nrow + saveLines;
181 int total_rows = nrow + saveLines; 187 total_rows = nrow + saveLines;
182 188
183 screen.tscroll = 0; 189 screen.tscroll = 0;
184 screen.bscroll = nrow - 1; 190 screen.bscroll = nrow - 1;
185 191
186 if (!save) 192 if (!row_buf)
187 { 193 {
188 /* 194 /*
189 * first time called so just malloc everything: don't rely on realloc 195 * first time called so just malloc everything: don't rely on realloc
190 * Note: this is still needed so that all the scrollback lines are NULL 196 * Note: this is still needed so that all the scrollback lines are NULL
191 */ 197 */
192 nscrolled = 0; /* no saved lines */ 198 nsaved = 0; /* no saved lines */
193 term_start = 0; 199 term_start = 0;
194 nsaved = 0;
195 200
196 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 201 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 203
199 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
200 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 204 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
205 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
201 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 206 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
202 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 207 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
203 208
204 screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *));
205
206 scr_update_term ();
207
208 for (p = nrow; p--; ) 209 for (int row = nrow; row--; )
209 { 210 {
210 scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE); 211 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 212 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213 } 214 }
214 215
215 memset (charsets, 'B', sizeof (charsets)); 216 memset (charsets, 'B', sizeof (charsets));
216 rstyle = DEFAULT_RSTYLE; 217 rstyle = DEFAULT_RSTYLE;
217 screen.flags = Screen_DefaultFlags; 218 screen.flags = Screen_DefaultFlags;
… …
241 { 242 {
242 /* 243 /*
243 * add or delete rows as appropriate 244 * add or delete rows as appropriate
244 */ 245 */
245 246
246 rxvt_salloc *old_ta; 247 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247 rxvt_salloc *old_ra; 248 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248 249
250#if 0
249 if (nrow < prev_nrow) 251 if (nrow < prev_nrow)
250 { 252 {
251 /* delete rows */
252 k = min (nscrolled, prev_nrow - nrow);
253 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
254 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
255
256 for (p = nrow; p < prev_nrow; p++) 253 for (int row = nrow; row < prev_nrow; row++)
257 { 254 {
258 lfree (save[p + saveLines]);
259 lfree (swap_save[p]); 255 lfree (swap_buf [row]);
260 lfree (drawn[p]); 256 lfree (drawn_buf[row]);
261 } 257 }
258 }
259#endif
262 260
263 /* we have fewer rows so fix up cursor position */ 261 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
264 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 262 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
265 264
266 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; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
267 } 278
268 else if (nrow > prev_nrow) 279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start - nsaved , prev_total_rows);
281 int q = total_rows; // rewrapped row
282
283 if (nsaved)
284 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm.
287
288 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290
269 { 291 do
270 /* add rows */
271 scr_reset_realloc (); /* realloc _first_ */
272
273 int ocol = ncol;
274 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
275
276 k = min (nscrolled, nrow - prev_nrow);
277
278 for (p = prev_total_rows; p < total_rows; p++)
279 save[p].clear ();
280
281 for (p = prev_total_rows; p < total_rows - k; p++)
282 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
283
284 scr_update_term ();
285
286 for (p = prev_nrow; p < nrow; p++)
287 { 292 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 293 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, 1);
295 screen.cur.row += k;
296 screen.s_cur.row += k;
297 nscrolled -= k;
298 }
299
300#ifdef DEBUG_STRICT 294#ifdef DEBUG_STRICT
301 assert (screen.cur.row < nrow); 295 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 296#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; 297 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l;
352 299
353 assert (llen >= 0); 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
354
355 while (p && save[p - 1].l < 0)
356 { 301 {
302 p = MOD (p - 1, prev_total_rows);
303
357 --p; 304 plines++;
358 llen += prev_ncol; 305 llen += prev_ncol;
359 } 306 }
360 307
361 int qlines = llen / ncol + 1; 308 int qlines = max (0, (llen - 1) / ncol) + 1;
309
310 // drop partial lines completely
311 if (q < qlines)
312 break;
313
314 q -= qlines;
315
362 int lofs = 0; 316 int lofs = 0;
317 line_t *qline;
363 318
364 q -= qlines; 319 // 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++) 320 for (int qrow = q; qlines--; qrow++)
370 { 321 {
322 qline = row_buf + qrow;
323 lalloc (*qline);
324 qline->l = ncol;
325 qline->is_longer (1);
326
371 if (qrow >= 0) 327 int qcol = 0;
328
329 // fill a single destination line
330 while (lofs < llen && qcol < ncol)
372 { 331 {
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; 332 int prow = lofs / prev_ncol;
382 int pcol = lofs % prev_ncol; 333 int pcol = lofs % prev_ncol;
383 334
335 prow = MOD (p + prow, prev_total_rows);
336
337 // we only adjust the cursor _row_ and put it into
338 // the topmost line of "long line" it was in, as
339 // this seems to upset applications/shells/readline
340 // least.
341 if (prow == ocur.row)
342 screen.cur.row = q - (total_rows - nrow);
343
344 line_t &pline = old_buf [prow];
345
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 346 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385 347
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); 348 assert (len);
349 assert (pline.t);
400 350
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 351 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 352 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403 353
404 lofs += len; 354 lofs += len;
405 qcol += len; 355 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 } 356 }
411 else
412 lofs += ncol;
413 } 357 }
358
359 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
360 qline->is_longer (0);
361 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414 } 362 }
363 while (p != pend && q > 0);
364
365 term_start = total_rows - nrow;
366 nsaved = term_start - q;
367
368 // make sure all terminal lines exist
369 while (nsaved < 0)
370 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
371 }
372 else
415 } 373 {
374 // if no scrollback exists (yet), wing, instead of wrap
375
376 for (int row = min (nrow, prev_nrow); row--; )
377 {
378 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
379 line_t &qline = row_buf [row];
416 380
417 free (screen.text); screen.text = tp; 381 qline = pline;
418 free (screen.rend); screen.rend = rp; 382 lresize (qline);
419 free (screen.tlen); screen.tlen = tl; 383 }
420 384
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 385 for (int row = prev_nrow; row < nrow; row++)
386 {
387 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
388 }
389
390 term_start = 0;
391 }
392
393#ifdef DEBUG_STRICT //TODO: remove
394 for (int i = -nsaved; i < nrow; i++)
395 assert (ROW (i).t);
422#endif 396#endif
397
398 free (old_buf);
399 delete old_ta;
400 delete old_ra;
401
402 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1);
423 404
424 if (tabs) 405 if (tabs)
425 free (tabs); 406 free (tabs);
426 } 407 }
427 408
428 prev_nrow = nrow; 409 prev_nrow = nrow;
429 prev_ncol = ncol; 410 prev_ncol = ncol;
430 411
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 413
433 for (p = 0; p < ncol; p++) 414 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 415 tabs [col] = col % TABSIZE == 0;
435 416
436 tt_winch (); 417 tt_winch ();
437}
438 418
439void 419 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
440rxvt_term::scr_reset_realloc ()
441{
442 unsigned int total_rows = nrow + saveLines;
443
444 screen.line = (line_t **)rxvt_realloc (screen.line, nrow * sizeof (line_t *));
445 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
446 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
447 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
448 buf = (line_t *) rxvt_realloc (buf , total_rows * sizeof (line_t));
449} 420}
450 421
451/* ------------------------------------------------------------------------- */ 422/* ------------------------------------------------------------------------- */
452/* 423/*
453 * Free everything. That way malloc debugging can find leakage. 424 * Free everything. That way malloc debugging can find leakage.
454 */ 425 */
455void 426void
456rxvt_term::scr_release () 427rxvt_term::scr_release ()
457{ 428{
458 unsigned int total_rows;
459
460 total_rows = nrow + saveLines;
461
462 delete talloc; talloc = 0; 429 delete talloc; talloc = 0;
463 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
464 431
465 free (screen.line); 432 free (row_buf);
466 free (save);
467 free (swap_save); 433 free (swap_buf);
468 free (drawn); 434 free (drawn_buf);
469 free (buf); 435 free (temp_buf);
470 free (tabs); 436 free (tabs);
437
438 row_buf = 0; // signal that we freed all the arrays
471} 439}
472 440
473/* ------------------------------------------------------------------------- */ 441/* ------------------------------------------------------------------------- */
474/* 442/*
475 * Hard reset 443 * Hard reset
… …
526 set_font_style (); 494 set_font_style ();
527 break; 495 break;
528 } 496 }
529 497
530 /* boundary check in case screen size changed between SAVE and RESTORE */ 498 /* boundary check in case screen size changed between SAVE and RESTORE */
531 MIN_IT (s->cur.row, nrow - 1); 499 min_it (s->cur.row, nrow - 1);
532 MIN_IT (s->cur.col, ncol - 1); 500 min_it (s->cur.col, ncol - 1);
533#ifdef DEBUG_STRICT 501#ifdef DEBUG_STRICT
534 assert (s->cur.row >= 0); 502 assert (s->cur.row >= 0);
535 assert (s->cur.col >= 0); 503 assert (s->cur.col >= 0);
536#else /* drive with your eyes closed */
537 MAX_IT (s->cur.row, 0);
538 MAX_IT (s->cur.col, 0);
539#endif 504#endif
540} 505}
541 506
542/* ------------------------------------------------------------------------- */ 507/* ------------------------------------------------------------------------- */
543/* 508/*
… …
546 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
547 */ 512 */
548int 513int
549rxvt_term::scr_change_screen (int scrn) 514rxvt_term::scr_change_screen (int scrn)
550{ 515{
551 int i;
552#if NSCREENS
553 int offset;
554#endif
555
556 want_refresh = 1; 516 want_refresh = 1;
557
558 view_start = 0; 517 view_start = 0;
559 518
560 if (current_screen == scrn) 519 if (current_screen == scrn)
561 return scrn; 520 return scrn;
562 521
563 selection_check (2); /* check for boundary cross */ 522 selection_check (2); /* check for boundary cross */
564 523
565 i = current_screen; current_screen = scrn; scrn = i; 524 int i = current_screen; current_screen = scrn; scrn = i;
566 525
567 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 526 ::swap (screen.cur.row, swap.cur.row);
568 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 527 ::swap (screen.cur.col, swap.cur.col);
569 MAX_IT (screen.cur.row, 0); 528
570 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
571 MAX_IT (screen.cur.col, 0); 530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
572 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
573 531
574#if NSCREENS 532#if NSCREENS
575 if (options & Opt_secondaryScreen) 533 if (OPTION (Opt_secondaryScreen))
576 { 534 {
577 num_scr = 0; 535 num_scr = 0;
578 offset = saveLines;
579 536
580 for (i = prev_nrow; i--;) 537 for (int i = prev_nrow; i--; )
581 SWAP_IT (*(screen.line[i]), swap_save[i], line_t); 538 ::swap (ROW(i), swap_buf [i]);
582 539
583 SWAP_IT (screen.charset, swap.charset, int16_t); 540 ::swap (screen.charset, swap.charset);
584 SWAP_IT (screen.flags, swap.flags, int); 541 ::swap (screen.flags, swap.flags);
585 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
586 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
587 } 544 }
588 else 545 else
589#endif 546#endif
590 if (options & Opt_secondaryScroll) 547 if (OPTION (Opt_secondaryScroll))
591 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
592 549
593 return scrn; 550 return scrn;
594} 551}
595 552
596// clear WrapNext indicator, solidifying position on next line 553// clear WrapNext indicator, solidifying position on next line
… …
603 screen.flags &= ~Screen_WrapNext; 560 screen.flags &= ~Screen_WrapNext;
604 561
605 screen.cur.col = 0; 562 screen.cur.col = 0;
606 563
607 if (screen.cur.row == screen.bscroll) 564 if (screen.cur.row == screen.bscroll)
608 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 565 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
609 else if (screen.cur.row < nrow - 1) 566 else if (screen.cur.row < nrow - 1)
610 screen.cur.row++; 567 screen.cur.row++;
611} 568}
612 569
613/* ------------------------------------------------------------------------- */ 570/* ------------------------------------------------------------------------- */
… …
639 rstyle = DEFAULT_RSTYLE; 596 rstyle = DEFAULT_RSTYLE;
640 else 597 else
641 rstyle &= ~style; 598 rstyle &= ~style;
642 } 599 }
643 600
644// set screen.line pointers to the actual lines in the save buffer
645void
646rxvt_term::scr_update_term ()
647{
648 for (int i = nrow; i--; )
649 screen.line[i] = save + saveLines + i;
650}
651
652/* ------------------------------------------------------------------------- */ 601/* ------------------------------------------------------------------------- */
653/* 602/*
654 * Scroll text between <row1> and <row2> inclusive, by <count> lines 603 * Scroll text between <row1> and <row2> inclusive, by <count> lines
655 * count positive ==> scroll up 604 * count positive ==> scroll up
656 * count negative ==> scroll down 605 * count negative ==> scroll down
657 * spec == 0 for normal routines
658 */ 606 */
659int 607int
660rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 608rxvt_term::scr_scroll_text (int row1, int row2, int count)
661{ 609{
662 int i, j;
663
664 if (count == 0 || (row1 > row2)) 610 if (count == 0 || (row1 > row2))
665 return 0; 611 return 0;
666 612
667 want_refresh = 1; 613 want_refresh = 1;
614 num_scr += count;
668 615
669 if (row1 == 0 && count > 0 616 if (count > 0
617 && row1 == 0
618 && row2 == nrow - 1
670 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
671 { 620 {
672 nscrolled += count; 621 nsaved = min (nsaved + count, saveLines);
673 622
674 if (nscrolled > saveLines) 623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
675 nscrolled = saveLines; 624
625 term_start = (term_start + count) % total_rows;
676 626
627 if (selection.op && current_screen == selection.screen)
628 {
629 selection.beg.row -= count;
630 selection.end.row -= count;
631 selection.mark.row -= count;
632
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 }
640 }
641
642 for (int i = count; i--; )
643 {
644 ROW(row2 - i).l = 0;
645 scr_blank_screen_mem (ROW(row2 - i), rstyle);
646 }
647
677 if ((options & Opt_scrollWithBuffer) 648 if (OPTION (Opt_scrollWithBuffer)
678 && view_start != 0 649 && view_start != 0
679 && view_start != saveLines) 650 && view_start != saveLines)
680 scr_page (UP, count); 651 scr_page (UP, count);
681 } 652 }
682 else if (!spec) 653 else
683 row1 += saveLines; 654 {
684
685 row2 += saveLines;
686
687 if (selection.op && current_screen == selection.screen) 655 if (selection.op && current_screen == selection.screen)
688 { 656 {
689 i = selection.beg.row + saveLines; 657 if ((selection.beg.row < row1 && selection.end.row > row1)
690 j = selection.end.row + saveLines; 658 || (selection.beg.row < row2 && selection.end.row > row2)
691 659 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
692 if ((i < row1 && j > row1) 660 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
693 || (i < row2 && j > row2) 661 || (selection.end.row - count < row1 && selection.end.row >= row1)
694 || (i - count < row1 && i >= row1) 662 || (selection.end.row - count > row2 && selection.end.row <= row2))
695 || (i - count > row2 && i <= row2)
696 || (j - count < row1 && j >= row1)
697 || (j - count > row2 && j <= row2))
698 { 663 {
699 CLEAR_ALL_SELECTION (); 664 CLEAR_ALL_SELECTION ();
700 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 665 selection.op = SELECTION_CLEAR;
701 } 666 }
702 else if (j >= row1 && j <= row2) 667 else if (selection.end.row >= row1 && selection.end.row <= row2)
703 { 668 {
704 /* move selected region too */ 669 /* move selected region too */
705 selection.beg.row -= count; 670 selection.beg.row -= count;
706 selection.end.row -= count; 671 selection.end.row -= count;
707 selection.mark.row -= count; 672 selection.mark.row -= count;
673
674 selection_check (0);
675 }
676 }
677
678 // use a simple and robust scrolling algorithm, this
679 // part of scr_scroll_text is not time-critical.
680
681 int rows = row2 - row1 + 1;
682
683 min_it (count, rows);
684
685 for (int row = 0; row < rows; row++)
708 } 686 {
709 } 687 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
710 688
711 selection_check (0); /* _after_ nscrolled update */ 689 if (!IN_RANGE_EXC (row + count, 0, rows))
690 scr_blank_screen_mem (temp_buf [row], rstyle);
691 }
712 692
713 num_scr += count; 693 for (int row = 0; row < rows; row++)
714 j = count; 694 ROW(row1 + row) = temp_buf [row];
715
716 if (count < 0)
717 count = -count;
718
719 i = row2 - row1 + 1;
720 MIN_IT (count, i);
721
722 if (j > 0)
723 { 695 }
724 /* scroll up */
725
726 /* Copy lines that will get clobbered by the rotation */
727 memcpy (buf, save + row1, count * sizeof (line_t));
728
729 /* Rotate lines */
730 i = row2 - row1 - count + 1;
731 memmove (save + row1, save + row1 + count, i * sizeof (line_t));
732
733 j = row2 - count + 1, i = count;
734 }
735 else /* if (j < 0) */
736 {
737 /* scroll down */
738
739 /* Copy lines that will get clobbered by the rotation */
740 for (i = 0, j = row2; i < count; i++, j--)
741 buf[i] = save[j];
742
743 /* Rotate lines */
744 for (j = row2, i = j - count; i >= row1; i--, j--)
745 save[j] = save[i];
746
747 j = row1, i = count;
748 count = -count;
749 }
750
751 /* Resurrect lines */
752 memcpy (save + j, buf, i * sizeof (line_t));
753
754 scr_update_term ();
755
756 if (!spec) /* line length may not equal ncol */
757 for (; i--; j++)
758 scr_blank_screen_mem (save[j], rstyle);
759 696
760 return count; 697 return count;
761} 698}
762 699
763/* ------------------------------------------------------------------------- */ 700/* ------------------------------------------------------------------------- */
… …
770 if (len <= 0) /* sanity */ 707 if (len <= 0) /* sanity */
771 return; 708 return;
772 709
773 unsigned char checksel; 710 unsigned char checksel;
774 unicode_t c; 711 unicode_t c;
775 int row, last_col; 712 int ncol = this->ncol;
776 const unicode_t *strend = str + len; 713 const unicode_t *strend = str + len;
777 714
778 want_refresh = 1; 715 want_refresh = 1;
779 ZERO_SCROLLBACK (); 716 ZERO_SCROLLBACK ();
780 last_col = ncol;
781 717
782 if (nlines > 0) 718 if (nlines > 0)
783 { 719 {
784 nlines += screen.cur.row - screen.bscroll; 720 nlines += screen.cur.row - screen.bscroll;
721
785 if ((nlines > 0) 722 if (nlines > 0
786 && (screen.tscroll == 0) 723 && screen.tscroll == 0
787 && (screen.bscroll == (nrow - 1))) 724 && screen.bscroll == nrow - 1)
788 { 725 {
789 /* _at least_ this many lines need to be scrolled */ 726 /* _at least_ this many lines need to be scrolled */
790 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 727 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
791 screen.cur.row -= nlines; 728 screen.cur.row -= nlines;
792 } 729 }
793 } 730 }
794 731
795#ifdef DEBUG_STRICT 732#ifdef DEBUG_STRICT
796 assert (screen.cur.col < last_col); 733 assert (screen.cur.col < ncol);
797 assert ((screen.cur.row < nrow) 734 assert (screen.cur.row < nrow
798 && (screen.cur.row >= - (int32_t)nscrolled)); 735 && screen.cur.row >= -nsaved);
799#else /* drive with your eyes closed */
800 MIN_IT (screen.cur.col, last_col - 1);
801 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
802 MAX_IT (screen.cur.row, - (int32_t)nscrolled);
803#endif 736#endif
804 row = screen.cur.row + saveLines; 737 int row = screen.cur.row;
805 738
806 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 739 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 740
808 line_t *line = save + row; 741 line_t *line = &ROW(row);
809 742
810 while (str < strend) 743 while (str < strend)
811 { 744 {
812 c = *str++; 745 c = *str++;
813 746
814 if (c < 0x20) 747 if (c < 0x20)
815 if (c == C0_LF) 748 if (c == C0_LF)
816 { 749 {
817 if (!line->is_longer ()) /* XXX: think about this */
818 MAX_IT (line->l, screen.cur.col); 750 max_it (line->l, screen.cur.col);
819 751
820 screen.flags &= ~Screen_WrapNext; 752 screen.flags &= ~Screen_WrapNext;
821 753
822 if (screen.cur.row == screen.bscroll) 754 if (screen.cur.row == screen.bscroll)
823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 755 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
824 else if (screen.cur.row < (nrow - 1)) 756 else if (screen.cur.row < (nrow - 1))
825 row = (++screen.cur.row) + saveLines; 757 row = ++screen.cur.row;
826 758
827 line = save + row; /* _must_ refresh */ 759 line = &ROW(row); /* _must_ refresh */
828 continue; 760 continue;
829 } 761 }
830 else if (c == C0_CR) 762 else if (c == C0_CR)
831 { 763 {
832 if (!line->is_longer ()) /* XXX: think about this */
833 MAX_IT (line->l, screen.cur.col); 764 max_it (line->l, screen.cur.col);
834 765
835 screen.flags &= ~Screen_WrapNext; 766 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 767 screen.cur.col = 0;
837 continue; 768 continue;
838 } 769 }
… …
855 CLEAR_SELECTION (); 786 CLEAR_SELECTION ();
856 } 787 }
857 788
858 if (screen.flags & Screen_WrapNext) 789 if (screen.flags & Screen_WrapNext)
859 { 790 {
791 max_it (line->l, ncol);
860 line->set_is_longer (); 792 line->is_longer (1);
861 793
862 scr_do_wrap (); 794 scr_do_wrap ();
863 795
864 row = screen.cur.row + saveLines; 796 row = screen.cur.row;
865 line = save + row; /* _must_ refresh */ 797 line = &ROW(row); /* _must_ refresh */
866 } 798 }
867 799
868 // some utf-8 decoders "decode" surrogate characters: let's fix this. 800 // some utf-8 decoders "decode" surrogate characters: let's fix this.
869 if (IN_RANGE (c, 0xd800, 0xdfff)) 801 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
870 c = 0xfffd; 802 c = 0xfffd;
871 803
872 // rely on wcwidth to tell us the character width, at least for non-latin1 804 // rely on wcwidth to tell us the character width, at least for non-latin1
873 // do wcwidth before further replacements, as wcwidth might return -1 805 // do wcwidth before further replacements, as wcwidth might return -1
874 // for the line drawing characters below as they might be invalid in the current 806 // for the line drawing characters below as they might be invalid in the current
875 // locale. 807 // locale.
876 int width = c < 0x100 ? 1 : wcwidth (c); 808 int width = c < 0x100 ? 1 : wcwidth (c);
877 809
878 if (charsets[screen.charset] == '0') // DEC SPECIAL 810 if (charsets [screen.charset] == '0') // DEC SPECIAL
879 { 811 {
880 // vt100 special graphics and line drawing 812 // vt100 special graphics and line drawing
881 // 5f-7e standard vt100 813 // 5f-7e standard vt100
882 // 40-5e rxvt extension for extra curses acs chars 814 // 40-5e rxvt extension for extra curses acs chars
883 static uint16_t vt100_0[62] = { // 41 .. 7e 815 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
935 } 867 }
936 868
937 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 869 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
938 870
939 // if the character doesn't fit into the remaining columns... 871 // if the character doesn't fit into the remaining columns...
940 if (screen.cur.col > last_col - width && last_col >= width) 872 if (screen.cur.col > ncol - width && ncol >= width)
941 { 873 {
942 // ...output spaces 874 // ...output spaces
943 c = ' '; 875 c = ' ';
944 // and try the same character next loop iteration 876 // and try the same character next loop iteration
945 --str; 877 --str;
946 } 878 }
947 879
880 line->touch ();
881
948 do 882 do
949 { 883 {
950 line->t[screen.cur.col] = c; 884 line->t[screen.cur.col] = c;
951 line->r[screen.cur.col] = rend; 885 line->r[screen.cur.col] = rend;
952 886
953 if (screen.cur.col < last_col - 1) 887 if (screen.cur.col < ncol - 1)
954 screen.cur.col++; 888 screen.cur.col++;
955 else 889 else
956 { 890 {
957 line->l = last_col; 891 line->l = ncol;
958 if (screen.flags & Screen_Autowrap) 892 if (screen.flags & Screen_Autowrap)
959 screen.flags |= Screen_WrapNext; 893 screen.flags |= Screen_WrapNext;
960 break; 894 break;
961 } 895 }
962 896
… …
964 } 898 }
965 while (--width > 0); 899 while (--width > 0);
966 900
967 // pad with spaces when overwriting wide character with smaller one 901 // pad with spaces when overwriting wide character with smaller one
968 if (!width) 902 if (!width)
903 {
904 line->touch ();
905
969 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 906 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
970 { 907 {
971 line->t[c] = ' '; 908 line->t[c] = ' ';
972 line->r[c] = rend; 909 line->r[c] = rend;
973 } 910 }
911 }
974 } 912 }
975 else // width == 0 913 else // width == 0
976 { 914 {
977#if ENABLE_COMBINING 915#if ENABLE_COMBINING
978 // handle combining characters 916 // handle combining characters
979 // we just tag the accent on the previous on-screen character. 917 // we just tag the accent on the previous on-screen character.
980 // this is arguably not correct, but also arguably not wrong. 918 // this is arguably not correct, but also arguably not wrong.
981 // we don't handle double-width characters nicely yet. 919 // we don't handle double-width characters nicely yet.
920 line_t *linep;
982 text_t *tp; 921 text_t *tp;
983 rend_t *rp; 922 rend_t *rp;
984 923
985 if (screen.cur.col > 0) 924 if (screen.cur.col > 0)
986 { 925 {
926 linep = line;
987 tp = line->t + screen.cur.col - 1; 927 tp = line->t + screen.cur.col - 1;
988 rp = line->r + screen.cur.col - 1; 928 rp = line->r + screen.cur.col - 1;
989
990 while (*tp == NOCHAR && tp > line->t)
991 tp--, rp--;
992 } 929 }
993 else if (screen.cur.row > 0 930 else if (screen.cur.row > 0
994 && save [screen.cur.row - 1 + saveLines].is_longer ()) 931 && ROW(screen.cur.row - 1).is_longer ())
995 { 932 {
996 line_t *line = save + (screen.cur.row - 1 + saveLines); 933 linep = &ROW(screen.cur.row - 1);
997
998 tp = line->t + last_col - 1; 934 tp = line->t + ncol - 1;
999 rp = line->r + last_col - 1; 935 rp = line->r + ncol - 1;
1000
1001 while (*tp == NOCHAR && tp > line->t)
1002 tp--, rp--;
1003 } 936 }
1004 else 937 else
1005 continue; 938 continue;
939
940 linep->touch ();
941
942 while (*tp == NOCHAR && tp > linep->t)
943 tp--, rp--;
1006 944
1007 // first try to find a precomposed character 945 // first try to find a precomposed character
1008 unicode_t n = rxvt_compose (*tp, c); 946 unicode_t n = rxvt_compose (*tp, c);
1009 if (n == NOCHAR) 947 if (n == NOCHAR)
1010 n = rxvt_composite.compose (*tp, c); 948 n = rxvt_composite.compose (*tp, c);
… …
1013 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1014#endif 952#endif
1015 } 953 }
1016 } 954 }
1017 955
1018 if (!line->is_longer ()) /* XXX: think about this */
1019 MAX_IT (line->l, screen.cur.col); 956 max_it (line->l, screen.cur.col);
1020 957
1021#ifdef DEBUG_STRICT 958#ifdef DEBUG_STRICT
1022 assert (screen.cur.row >= 0); 959 assert (screen.cur.row >= 0);
1023#else /* drive with your eyes closed */
1024 MAX_IT (screen.cur.row, 0);
1025#endif 960#endif
1026} 961}
1027 962
1028/* ------------------------------------------------------------------------- */ 963/* ------------------------------------------------------------------------- */
1029/* 964/*
… …
1068 1003
1069 if (count == 0) 1004 if (count == 0)
1070 return; 1005 return;
1071 else if (count > 0) 1006 else if (count > 0)
1072 { 1007 {
1073 int row = saveLines + screen.cur.row; 1008 line_t &l = ROW(screen.cur.row);
1074
1075 line_t &l = save[row];
1076 rend_t base_rend = l.r[i]; 1009 rend_t base_rend = l.r[i];
1077 ht &= l.t[i] == ' '; 1010 ht &= l.t[i] == ' ';
1078 1011
1079 for (; ++i < ncol; ) 1012 for (; ++i < ncol; )
1080 if (tabs[i]) 1013 if (tabs[i])
1081 { 1014 {
1082 x = i; 1015 x = i;
1016
1083 if (!--count) 1017 if (!--count)
1084 break; 1018 break;
1085 } 1019 }
1086 else 1020 else
1087 ht &= l.t[i] == ' ' 1021 ht &= l.t[i] == ' '
… …
1090 if (count) 1024 if (count)
1091 x = ncol - 1; 1025 x = ncol - 1;
1092 1026
1093 // store horizontal tab commands as characters inside the text 1027 // store horizontal tab commands as characters inside the text
1094 // buffer so they can be selected and pasted. 1028 // buffer so they can be selected and pasted.
1095 if (ht && options & Opt_pastableTabs) 1029 if (ht && OPTION (Opt_pastableTabs))
1096 { 1030 {
1097 base_rend = SET_FONT (base_rend, 0); 1031 base_rend = SET_FONT (base_rend, 0);
1098 1032
1099 if (!l.is_longer ()) /* XXX: think about this */ 1033 l.touch (x);
1100 MAX_IT (l.l, x);
1101 1034
1102 i = screen.cur.col; 1035 i = screen.cur.col;
1103 1036
1104 l.t[i] = '\t'; 1037 l.t[i] = '\t';
1105 l.r[i] = base_rend; 1038 l.r[i] = base_rend;
… …
1141rxvt_term::scr_backindex () 1074rxvt_term::scr_backindex ()
1142{ 1075{
1143 if (screen.cur.col > 0) 1076 if (screen.cur.col > 0)
1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1077 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145 else 1078 else
1146 {
1147 if (!save[screen.cur.row + saveLines].l)
1148 return; /* um, yeah? */
1149
1150 scr_insdel_chars (1, INSERT); 1079 scr_insdel_chars (1, INSERT);
1151 }
1152} 1080}
1153#endif 1081#endif
1154/* ------------------------------------------------------------------------- */ 1082/* ------------------------------------------------------------------------- */
1155/* 1083/*
1156 * Process DEC Forward Index 1084 * Process DEC Forward Index
… …
1160 */ 1088 */
1161#if ENABLE_FRILLS 1089#if ENABLE_FRILLS
1162void 1090void
1163rxvt_term::scr_forwardindex () 1091rxvt_term::scr_forwardindex ()
1164{ 1092{
1165 int row;
1166
1167 if (screen.cur.col < ncol - 1) 1093 if (screen.cur.col < ncol - 1)
1168 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1094 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1169 else 1095 else
1170 { 1096 {
1171 row = screen.cur.row + saveLines; 1097 line_t &l = ROW(screen.cur.row);
1172 1098
1173 if (!save[row].l) 1099 l.touch ();
1174 return; /* um, yeah? */ 1100 l.is_longer (0);
1175
1176 if (save[row].is_longer ()) //TODO//FIXME//LEN
1177 save[row].l = ncol;
1178 1101
1179 scr_gotorc (0, 0, R_RELATIVE); 1102 scr_gotorc (0, 0, R_RELATIVE);
1180 scr_insdel_chars (1, DELETE); 1103 scr_insdel_chars (1, DELETE);
1181 scr_gotorc (0, ncol - 1, R_RELATIVE); 1104 scr_gotorc (0, ncol - 1, R_RELATIVE);
1182 } 1105 }
… …
1192{ 1115{
1193 want_refresh = 1; 1116 want_refresh = 1;
1194 ZERO_SCROLLBACK (); 1117 ZERO_SCROLLBACK ();
1195 1118
1196 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1119 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1197 MAX_IT (screen.cur.col, 0); 1120 clamp_it (screen.cur.col, 0, ncol - 1);
1198 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1199 1121
1200 screen.flags &= ~Screen_WrapNext; 1122 screen.flags &= ~Screen_WrapNext;
1201 1123
1202 if (relative & R_RELATIVE) 1124 if (relative & R_RELATIVE)
1203 { 1125 {
… …
1221 else 1143 else
1222 { 1144 {
1223 if (screen.flags & Screen_Relative) 1145 if (screen.flags & Screen_Relative)
1224 { /* relative origin mode */ 1146 { /* relative origin mode */
1225 screen.cur.row = row + screen.tscroll; 1147 screen.cur.row = row + screen.tscroll;
1226 MIN_IT (screen.cur.row, screen.bscroll); 1148 min_it (screen.cur.row, screen.bscroll);
1227 } 1149 }
1228 else 1150 else
1229 screen.cur.row = row; 1151 screen.cur.row = row;
1230 } 1152 }
1231 1153
1232 MAX_IT (screen.cur.row, 0); 1154 clamp_it (screen.cur.row, 0, nrow - 1);
1233 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1234} 1155}
1235 1156
1236/* ------------------------------------------------------------------------- */ 1157/* ------------------------------------------------------------------------- */
1237/* 1158/*
1238 * direction should be UP or DN 1159 * direction should be UP or DN
… …
1249 1170
1250 screen.flags &= ~Screen_WrapNext; 1171 screen.flags &= ~Screen_WrapNext;
1251 1172
1252 if ((screen.cur.row == screen.bscroll && direction == UP) 1173 if ((screen.cur.row == screen.bscroll && direction == UP)
1253 || (screen.cur.row == screen.tscroll && direction == DN)) 1174 || (screen.cur.row == screen.tscroll && direction == DN))
1254 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1175 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1255 else 1176 else
1256 screen.cur.row += dirn; 1177 screen.cur.row += dirn;
1257 1178
1258 MAX_IT (screen.cur.row, 0); 1179 clamp_it (screen.cur.row, 0, nrow - 1);
1259 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1260 selection_check (0); 1180 selection_check (0);
1261} 1181}
1262 1182
1263/* ------------------------------------------------------------------------- */ 1183/* ------------------------------------------------------------------------- */
1264/* 1184/*
… …
1268 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1269 */ 1189 */
1270void 1190void
1271rxvt_term::scr_erase_line (int mode) 1191rxvt_term::scr_erase_line (int mode)
1272{ 1192{
1273 unsigned int row, col, num; 1193 unsigned int col, num;
1274 1194
1275 want_refresh = 1; 1195 want_refresh = 1;
1276 ZERO_SCROLLBACK (); 1196 ZERO_SCROLLBACK ();
1277 1197
1278 selection_check (1); 1198 selection_check (1);
1279 1199
1280 row = saveLines + screen.cur.row; 1200 line_t &line = ROW(screen.cur.row);
1201
1202 line.touch ();
1203 line.is_longer (0);
1281 1204
1282 switch (mode) 1205 switch (mode)
1283 { 1206 {
1284 case 0: /* erase to end of line */ 1207 case 0: /* erase to end of line */
1285 col = screen.cur.col; 1208 col = screen.cur.col;
1286 num = ncol - col; 1209 num = ncol - col;
1287 MIN_IT (save[row].l, (int16_t)col); 1210 min_it (line.l, col);
1288 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1211 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1289 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1212 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1290 CLEAR_SELECTION (); 1213 CLEAR_SELECTION ();
1291 break; 1214 break;
1292 case 1: /* erase to beginning of line */ 1215 case 1: /* erase to beginning of line */
… …
1297 CLEAR_SELECTION (); 1220 CLEAR_SELECTION ();
1298 break; 1221 break;
1299 case 2: /* erase whole line */ 1222 case 2: /* erase whole line */
1300 col = 0; 1223 col = 0;
1301 num = ncol; 1224 num = ncol;
1302 save[row].l = 0; 1225 line.l = 0;
1303 if (selection.beg.row <= screen.cur.row 1226 if (selection.beg.row <= screen.cur.row
1304 && selection.end.row >= screen.cur.row) 1227 && selection.end.row >= screen.cur.row)
1305 CLEAR_SELECTION (); 1228 CLEAR_SELECTION ();
1306 break; 1229 break;
1307 default: 1230 default:
1308 return; 1231 return;
1309 } 1232 }
1310 1233
1311 if (save[row].t)
1312 scr_blank_line (save[row], col, num, rstyle); 1234 scr_blank_line (line, col, num, rstyle);
1313 else
1314 scr_blank_screen_mem (save[row], rstyle);
1315} 1235}
1316 1236
1317/* ------------------------------------------------------------------------- */ 1237/* ------------------------------------------------------------------------- */
1318/* 1238/*
1319 * Erase part of whole of the screen 1239 * Erase part of whole of the screen
… …
1323 */ 1243 */
1324void 1244void
1325rxvt_term::scr_erase_screen (int mode) 1245rxvt_term::scr_erase_screen (int mode)
1326{ 1246{
1327 int num; 1247 int num;
1328 int32_t row, row_offset; 1248 int32_t row;
1329 rend_t ren; 1249 rend_t ren;
1330 XGCValues gcvalue; 1250 XGCValues gcvalue;
1331 1251
1332 want_refresh = 1; 1252 want_refresh = 1;
1333 ZERO_SCROLLBACK (); 1253 ZERO_SCROLLBACK ();
1334
1335 row_offset = (int32_t)saveLines;
1336 1254
1337 switch (mode) 1255 switch (mode)
1338 { 1256 {
1339 case 0: /* erase to end of screen */ 1257 case 0: /* erase to end of screen */
1340 selection_check (1); 1258 selection_check (1);
… …
1364 CLEAR_SELECTION (); 1282 CLEAR_SELECTION ();
1365 1283
1366 if (row >= nrow) /* Out Of Bounds */ 1284 if (row >= nrow) /* Out Of Bounds */
1367 return; 1285 return;
1368 1286
1369 MIN_IT (num, (nrow - row)); 1287 min_it (num, nrow - row);
1370 1288
1371 if (rstyle & (RS_RVid | RS_Uline)) 1289 if (rstyle & (RS_RVid | RS_Uline))
1372 ren = (rend_t) ~RS_None; 1290 ren = (rend_t) ~RS_None;
1373 else if (GET_BASEBG (rstyle) == Color_bg) 1291 else if (GET_BASEBG (rstyle) == Color_bg)
1374 { 1292 {
… …
1376 CLEAR_ROWS (row, num); 1294 CLEAR_ROWS (row, num);
1377 } 1295 }
1378 else 1296 else
1379 { 1297 {
1380 ren = rstyle & (RS_fgMask | RS_bgMask); 1298 ren = rstyle & (RS_fgMask | RS_bgMask);
1381 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1299 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1382 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1300 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1383 ERASE_ROWS (row, num); 1301 ERASE_ROWS (row, num);
1384 gcvalue.foreground = pix_colors[Color_fg]; 1302 gcvalue.foreground = pix_colors[Color_fg];
1385 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1303 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1386 } 1304 }
1387 1305
1388 for (; num--; row++) 1306 for (; num--; row++)
1389 { 1307 {
1308 line_t &l = ROW(row);
1309 l.l = 0;
1310 l.is_longer (0);
1390 scr_blank_screen_mem (save[row + row_offset], rstyle); 1311 scr_blank_screen_mem (l, rstyle);
1391 save[row + row_offset].l = 0;
1392 scr_blank_line (drawn[row], 0, ncol, ren); 1312 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1393 } 1313 }
1394} 1314}
1395 1315
1396#if ENABLE_FRILLS 1316#if ENABLE_FRILLS
1397void 1317void
1398rxvt_term::scr_erase_savelines () 1318rxvt_term::scr_erase_savelines ()
1399{ 1319{
1400 want_refresh = 1; 1320 want_refresh = 1;
1401 ZERO_SCROLLBACK (); 1321 ZERO_SCROLLBACK ();
1402 1322
1403 nscrolled = 0; 1323 nsaved = 0;
1404} 1324}
1405#endif 1325#endif
1406 1326
1407/* ------------------------------------------------------------------------- */ 1327/* ------------------------------------------------------------------------- */
1408/* 1328/*
… …
1410 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1330 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1411 */ 1331 */
1412void 1332void
1413rxvt_term::scr_E () 1333rxvt_term::scr_E ()
1414{ 1334{
1415 int i, j, k;
1416 rend_t *r1, fs; 1335 rend_t fs;
1417 1336
1418 want_refresh = 1; 1337 want_refresh = 1;
1419 ZERO_SCROLLBACK (); 1338 ZERO_SCROLLBACK ();
1420 1339
1421 num_scr_allow = 0; 1340 num_scr_allow = 0;
1422 selection_check (3); 1341 selection_check (3);
1423 1342
1424 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1343 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1425 for (k = saveLines, i = nrow; i--; k++) 1344 for (int row = nrow; row--; )
1426 { 1345 {
1427 line_t &line = save[k]; 1346 line_t &line = ROW(row);
1428 1347
1429 fill_text (line.t, 'E', ncol); 1348 fill_text (line.t, 'E', ncol);
1349 rend_t *r1 = line.r;
1430 1350
1431 for (r1 = line.r, j = ncol; j--; ) 1351 for (int j = ncol; j--; )
1432 *r1++ = fs; 1352 *r1++ = fs;
1433 1353
1434 line.l = ncol; /* make the `E's selectable */ 1354 line.is_longer (0);
1355 line.touch (ncol);
1435 } 1356 }
1436} 1357}
1437 1358
1438/* ------------------------------------------------------------------------- */ 1359/* ------------------------------------------------------------------------- */
1439/* 1360/*
… …
1460 count = end; 1381 count = end;
1461 } 1382 }
1462 1383
1463 scr_do_wrap (); 1384 scr_do_wrap ();
1464 1385
1465 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1386 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1466} 1387}
1467 1388
1468/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1469/* 1390/*
1470 * Insert/Delete <count> characters from the current position 1391 * Insert/Delete <count> characters from the current position
… …
1482 return; 1403 return;
1483 1404
1484 scr_do_wrap (); 1405 scr_do_wrap ();
1485 1406
1486 selection_check (1); 1407 selection_check (1);
1487 MIN_IT (count, (ncol - screen.cur.col)); 1408 min_it (count, ncol - screen.cur.col);
1488 1409
1489 row = screen.cur.row + saveLines; 1410 row = screen.cur.row;
1490 1411
1491 line_t *line = save + row; 1412 line_t *line = &ROW(row);
1413
1414 line->touch ();
1415 line->is_longer (0);
1492 1416
1493 switch (insdel) 1417 switch (insdel)
1494 { 1418 {
1495 case INSERT: 1419 case INSERT:
1496 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1420 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1497 { 1421 {
1498 line->t[col] = line->t[col - count]; 1422 line->t[col] = line->t[col - count];
1499 line->r[col] = line->r[col - count]; 1423 line->r[col] = line->r[col - count];
1500 } 1424 }
1501 1425
1502 if (!line->is_longer ()) 1426 line->l = min (line->l + count, ncol);
1503 {
1504 line->l += count;
1505 MIN_IT (line->l, ncol);
1506 }
1507 1427
1508 if (selection.op && current_screen == selection.screen 1428 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1429 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1430 {
1511 if (selection.end.row != screen.cur.row 1431 if (selection.end.row != screen.cur.row
… …
1517 selection.mark.col += count; /* XXX: yes? */ 1437 selection.mark.col += count; /* XXX: yes? */
1518 selection.end.col += count; 1438 selection.end.col += count;
1519 } 1439 }
1520 } 1440 }
1521 1441
1522 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1442 scr_blank_line (*line, screen.cur.col, count, rstyle);
1523 break; 1443 break;
1524 1444
1525 case ERASE: 1445 case ERASE:
1526 screen.cur.col += count; /* don't worry if > ncol */ 1446 screen.cur.col += count; /* don't worry if > ncol */
1527 selection_check (1); 1447 selection_check (1);
1528 screen.cur.col -= count; 1448 screen.cur.col -= count;
1449
1450 line->l = max (line->l - count, 0);
1529 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1451 scr_blank_line (*line, screen.cur.col, count, rstyle);
1530 break; 1452 break;
1531 1453
1532 case DELETE: 1454 case DELETE:
1533 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1455 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1534 1456
… …
1536 { 1458 {
1537 line->t[col] = line->t[col + count]; 1459 line->t[col] = line->t[col + count];
1538 line->r[col] = line->r[col + count]; 1460 line->r[col] = line->r[col + count];
1539 } 1461 }
1540 1462
1463 line->l = max (line->l - count, 0);
1541 scr_blank_line (*line, ncol - count, count, tr); 1464 scr_blank_line (*line, ncol - count, count, tr);
1542
1543 if (line->is_longer ()) /* break line continuation */
1544 line->l = ncol;
1545
1546 line->l -= count;
1547 MAX_IT (line->l, 0);
1548 1465
1549 if (selection.op && current_screen == selection.screen 1466 if (selection.op && current_screen == selection.screen
1550 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1467 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1551 { 1468 {
1552 if (selection.end.row != screen.cur.row 1469 if (selection.end.row != screen.cur.row
… …
1572 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1489 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1573 */ 1490 */
1574void 1491void
1575rxvt_term::scr_scroll_region (int top, int bot) 1492rxvt_term::scr_scroll_region (int top, int bot)
1576{ 1493{
1577 MAX_IT (top, 0); 1494 max_it (top, 0);
1578 MIN_IT (bot, (int)nrow - 1); 1495 min_it (bot, nrow - 1);
1579 1496
1580 if (top > bot) 1497 if (top > bot)
1581 return; 1498 return;
1582 1499
1583 screen.tscroll = top; 1500 screen.tscroll = top;
… …
1664rxvt_term::scr_set_tab (int mode) 1581rxvt_term::scr_set_tab (int mode)
1665{ 1582{
1666 if (mode < 0) 1583 if (mode < 0)
1667 memset (tabs, 0, ncol * sizeof (char)); 1584 memset (tabs, 0, ncol * sizeof (char));
1668 else if (screen.cur.col < ncol) 1585 else if (screen.cur.col < ncol)
1669 tabs[screen.cur.col] = (mode ? 1 : 0); 1586 tabs [screen.cur.col] = !!mode;
1670} 1587}
1671 1588
1672/* ------------------------------------------------------------------------- */ 1589/* ------------------------------------------------------------------------- */
1673/* 1590/*
1674 * Set reverse/normal video 1591 * Set reverse/normal video
… …
1681 XGCValues gcvalue; 1598 XGCValues gcvalue;
1682 1599
1683 if (rvideo != mode) 1600 if (rvideo != mode)
1684 { 1601 {
1685 rvideo = mode; 1602 rvideo = mode;
1686 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1603 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#if XPM_BACKGROUND 1604#if XPM_BACKGROUND
1688 if (bgPixmap.pixmap == None) 1605 if (bgPixmap.pixmap == None)
1689#endif 1606#endif
1690#if TRANSPARENT 1607#if TRANSPARENT
1691 if (! (options & Opt_transparent) || am_transparent == 0) 1608 if (! OPTION (Opt_transparent) || am_transparent == 0)
1692#endif 1609#endif
1693 XSetWindowBackground (display->display, vt, 1610 XSetWindowBackground (display->display, vt,
1694 pix_colors[Color_bg]); 1611 pix_colors[Color_bg]);
1695 1612
1696 gcvalue.foreground = pix_colors[Color_fg]; 1613 gcvalue.foreground = pix_colors[Color_fg];
… …
1721 * Set font style 1638 * Set font style
1722 */ 1639 */
1723void 1640void
1724rxvt_term::set_font_style () 1641rxvt_term::set_font_style ()
1725{ 1642{
1643#if 0
1726 switch (charsets[screen.charset]) 1644 switch (charsets [screen.charset])
1727 { 1645 {
1728 case '0': /* DEC Special Character & Line Drawing Set */ 1646 case '0': /* DEC Special Character & Line Drawing Set */
1729 break; 1647 break;
1730 case 'A': /* United Kingdom (UK) */ 1648 case 'A': /* United Kingdom (UK) */
1731 break; 1649 break;
… …
1738 case 'C': /* Finnish character set */ 1656 case 'C': /* Finnish character set */
1739 break; 1657 break;
1740 case 'K': /* German character set */ 1658 case 'K': /* German character set */
1741 break; 1659 break;
1742 } 1660 }
1661#endif
1743} 1662}
1744 1663
1745/* ------------------------------------------------------------------------- */ 1664/* ------------------------------------------------------------------------- */
1746/* 1665/*
1747 * Choose a font 1666 * Choose a font
… …
1787 bool found = false; 1706 bool found = false;
1788 1707
1789 for (int i = 0; i < nrow; i++) 1708 for (int i = 0; i < nrow; i++)
1790 { 1709 {
1791 int col = 0; 1710 int col = 0;
1792 rend_t *drp = drawn[i].r; 1711 rend_t *drp = drawn_buf[i].r;
1793 1712
1794 for (; col < ncol; col++, drp++) 1713 for (; col < ncol; col++, drp++)
1795 if ((*drp & mask) == value) 1714 if ((*drp & mask) == value)
1796 { 1715 {
1797 found = true; 1716 found = true;
… …
1815rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1734rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1816{ 1735{
1817 int i; 1736 int i;
1818 row_col_t rc[RC_COUNT]; 1737 row_col_t rc[RC_COUNT];
1819 1738
1820 if (!drawn) /* sanity check */ 1739 if (!drawn_buf) /* sanity check */
1821 return; 1740 return;
1822 1741
1823#ifndef NO_SLOW_LINK_SUPPORT 1742#ifndef NO_SLOW_LINK_SUPPORT
1824 if (refresh_type == FAST_REFRESH && !display->is_local) 1743 if (refresh_type == FAST_REFRESH && !display->is_local)
1825 { 1744 {
1826 y = 0; 1745 y = 0;
1827 eheight = height; 1746 eheight = height;
1828 } 1747 }
1829#endif
1830
1831#ifdef DEBUG_STRICT
1832 x = max (x, 0);
1833 x = min (x, (int)width);
1834 y = max (y, 0);
1835 y = min (y, (int)height);
1836#endif 1748#endif
1837 1749
1838 /* round down */ 1750 /* round down */
1839 rc[PART_BEG].col = Pixel2Col (x); 1751 rc[PART_BEG].col = Pixel2Col (x);
1840 rc[PART_BEG].row = Pixel2Row (y); 1752 rc[PART_BEG].row = Pixel2Row (y);
… …
1843 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1755 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1844 1756
1845 /* sanity checks */ 1757 /* sanity checks */
1846 for (i = PART_BEG; i < RC_COUNT; i++) 1758 for (i = PART_BEG; i < RC_COUNT; i++)
1847 { 1759 {
1848 MIN_IT (rc[i].col, ncol - 1); 1760 min_it (rc[i].col, ncol - 1);
1849 MIN_IT (rc[i].row, nrow - 1); 1761 min_it (rc[i].row, nrow - 1);
1850 } 1762 }
1851 1763
1852 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1764 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1853 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1765 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1854 1766
1855 if (refresh) 1767 if (refresh)
1856 scr_refresh (SLOW_REFRESH); 1768 scr_refresh (SLOW_REFRESH);
1857} 1769}
1858 1770
… …
1879 1791
1880 oldviewstart = view_start; 1792 oldviewstart = view_start;
1881 1793
1882 if (y < len) 1794 if (y < len)
1883 { 1795 {
1884 p = (nrow + nscrolled) * (len - y) / len; 1796 p = (nrow + nsaved) * (len - y) / len;
1885 p -= (long) (nrow - 1); 1797 p -= (long) (nrow - 1);
1886 p = max (p, 0); 1798 p = max (p, 0);
1887 } 1799 }
1888 1800
1889 view_start = (unsigned int)min (p, nscrolled); 1801 view_start = (unsigned int)min (p, nsaved);
1890 1802
1891 return scr_changeview (oldviewstart); 1803 return scr_changeview (oldviewstart);
1892} 1804}
1893 1805
1894/* ------------------------------------------------------------------------- */ 1806/* ------------------------------------------------------------------------- */
… …
1905 oldviewstart = view_start; 1817 oldviewstart = view_start;
1906 1818
1907 if (direction == UP) 1819 if (direction == UP)
1908 { 1820 {
1909 n = view_start + nlines; 1821 n = view_start + nlines;
1910 view_start = min (n, nscrolled); 1822 view_start = min (n, nsaved);
1911 } 1823 }
1912 else 1824 else
1913 { 1825 {
1914 n = view_start - nlines; 1826 n = view_start - nlines;
1915 view_start = max (n, 0); 1827 view_start = max (n, 0);
… …
1921int 1833int
1922rxvt_term::scr_changeview (unsigned int oldviewstart) 1834rxvt_term::scr_changeview (unsigned int oldviewstart)
1923{ 1835{
1924 if (view_start != oldviewstart) 1836 if (view_start != oldviewstart)
1925 { 1837 {
1838 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1839
1926 want_refresh = 1; 1840 want_refresh = 1;
1927 num_scr -= (view_start - oldviewstart); 1841 num_scr -= (view_start - oldviewstart);
1928 } 1842 }
1929 1843
1930 return (int) (view_start - oldviewstart); 1844 return (int)view_start - (int)oldviewstart;
1931} 1845}
1932 1846
1933/* ------------------------------------------------------------------------- */ 1847/* ------------------------------------------------------------------------- */
1934void 1848void
1935rxvt_term::scr_bell () 1849rxvt_term::scr_bell ()
1936{ 1850{
1937#ifndef NO_BELL 1851#ifndef NO_BELL
1938 1852
1939# ifndef NO_MAPALERT 1853# ifndef NO_MAPALERT
1940# ifdef MAPALERT_OPTION 1854# ifdef MAPALERT_OPTION
1941 if (options & Opt_mapAlert) 1855 if (OPTION (Opt_mapAlert))
1942# endif 1856# endif
1943 XMapWindow (display->display, parent[0]); 1857 XMapWindow (display->display, parent[0]);
1944# endif 1858# endif
1945 1859
1946 if (options & Opt_visualBell) 1860 if (OPTION (Opt_visualBell))
1947 { 1861 {
1948 scr_rvideo_mode (!rvideo); /* refresh also done */ 1862 scr_rvideo_mode (!rvideo); /* refresh also done */
1949 rxvt_usleep (VISUAL_BELL_DURATION); 1863 rxvt_usleep (VISUAL_BELL_DURATION);
1950 scr_rvideo_mode (!rvideo); /* refresh also done */ 1864 scr_rvideo_mode (!rvideo); /* refresh also done */
1951 } 1865 }
… …
1959/* ARGSUSED */ 1873/* ARGSUSED */
1960void 1874void
1961rxvt_term::scr_printscreen (int fullhist) 1875rxvt_term::scr_printscreen (int fullhist)
1962{ 1876{
1963#ifdef PRINTPIPE 1877#ifdef PRINTPIPE
1964 int i, r1, nrows, row_offset; 1878 int nrows, row_start;
1965 FILE *fd; 1879 FILE *fd;
1966 1880
1967 if ((fd = popen_printer ()) == NULL) 1881 if ((fd = popen_printer ()) == NULL)
1968 return; 1882 return;
1969 1883
1970 nrows = nrow;
1971 row_offset = saveLines;
1972
1973 if (!fullhist) 1884 if (fullhist)
1974 row_offset -= view_start; 1885 {
1886 nrows = nrow + nsaved;
1887 row_start = -nsaved;
1888 }
1975 else 1889 else
1976 { 1890 {
1977 nrows += nscrolled; 1891 nrows = nrow;
1978 row_offset -= nscrolled; 1892 row_start = -view_start;
1979 } 1893 }
1980 1894
1981 wctomb (0, 0); 1895 wctomb (0, 0);
1982 1896
1983 for (r1 = 0; r1 < nrows; r1++) 1897 for (int r1 = 0; r1 < nrows; r1++)
1984 { 1898 {
1985 text_t *tp = save[r1 + row_offset].t; 1899 text_t *tp = ROW(r1).t;
1986 int len = save[r1 + row_offset].l; 1900 int len = ROW(r1).l;
1987 1901
1988 for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1902 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1989 { 1903 {
1990 char mb[MB_LEN_MAX]; 1904 char mb[MB_LEN_MAX];
1991 text_t t = *tp++; 1905 text_t t = *tp++;
1992 if (t == NOCHAR) 1906 if (t == NOCHAR)
1993 continue; 1907 continue;
… …
2021{ 1935{
2022 unsigned char must_clear, /* use draw_string not draw_image_string */ 1936 unsigned char must_clear, /* use draw_string not draw_image_string */
2023 showcursor; /* show the cursor */ 1937 showcursor; /* show the cursor */
2024 int16_t col, row, /* column/row we're processing */ 1938 int16_t col, row, /* column/row we're processing */
2025 ocrow; /* old cursor row */ 1939 ocrow; /* old cursor row */
2026 int i, /* tmp */ 1940 int i; /* tmp */
2027 row_offset; /* basic offset in screen structure */
2028#ifndef NO_CURSORCOLOR 1941#ifndef NO_CURSORCOLOR
2029 rend_t cc1; /* store colours at cursor position (s) */ 1942 rend_t cc1; /* store colours at cursor position (s) */
2030#endif 1943#endif
2031 rend_t *crp; // cursor rendition pointer 1944 rend_t *crp; // cursor rendition pointer
2032 1945
… …
2039 * A: set up vars 1952 * A: set up vars
2040 */ 1953 */
2041 must_clear = 0; 1954 must_clear = 0;
2042 refresh_count = 0; 1955 refresh_count = 0;
2043 1956
2044 row_offset = saveLines - view_start;
2045
2046#if XPM_BACKGROUND 1957#if XPM_BACKGROUND
2047 must_clear |= bgPixmap.pixmap != None; 1958 must_clear |= bgPixmap.pixmap != None;
2048#endif 1959#endif
2049#if TRANSPARENT 1960#if TRANSPARENT
2050 must_clear |= (options & Opt_transparent) && am_transparent; 1961 must_clear |= OPTION (Opt_transparent) && am_transparent;
2051#endif 1962#endif
2052 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1963 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2053 1964
2054 /* 1965 /*
2055 * B: reverse any characters which are selected 1966 * B: reverse any characters which are selected
… …
2072 1983
2073 if (showcursor) 1984 if (showcursor)
2074 { 1985 {
2075 int col = screen.cur.col; 1986 int col = screen.cur.col;
2076 1987
2077 while (col && screen.line[screen.cur.row]->t[col] == NOCHAR) 1988 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2078 col--; 1989 col--;
2079 1990
2080 crp = &screen.line[screen.cur.row]->r[col]; 1991 crp = &ROW(screen.cur.row).r[col];
2081 1992
2082 if (showcursor && focus) 1993 if (showcursor && focus)
2083 { 1994 {
2084 if (options & Opt_cursorUnderline) 1995 if (OPTION (Opt_cursorUnderline))
2085 *crp ^= RS_Uline; 1996 *crp ^= RS_Uline;
2086 else 1997 else
2087 { 1998 {
2088 *crp ^= RS_RVid; 1999 *crp ^= RS_RVid;
2089 2000
… …
2091 cc1 = *crp & (RS_fgMask | RS_bgMask); 2002 cc1 = *crp & (RS_fgMask | RS_bgMask);
2092 if (ISSET_PIXCOLOR (Color_cursor)) 2003 if (ISSET_PIXCOLOR (Color_cursor))
2093 ccol1 = Color_cursor; 2004 ccol1 = Color_cursor;
2094 else 2005 else
2095#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2006#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2096 ccol1 = GET_FGCOLOR (rstyle); 2007 ccol1 = fgcolor_of (rstyle);
2097#else 2008#else
2098 ccol1 = Color_fg; 2009 ccol1 = Color_fg;
2099#endif 2010#endif
2100 if (ISSET_PIXCOLOR (Color_cursor2)) 2011 if (ISSET_PIXCOLOR (Color_cursor2))
2101 ccol2 = Color_cursor2; 2012 ccol2 = Color_cursor2;
2102 else 2013 else
2103#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2104 ccol2 = GET_BGCOLOR (rstyle); 2015 ccol2 = bgcolor_of (rstyle);
2105#else 2016#else
2106 ccol2 = Color_bg; 2017 ccol2 = Color_bg;
2107#endif 2018#endif
2108 *crp = SET_FGCOLOR (*crp, ccol1); 2019 *crp = SET_FGCOLOR (*crp, ccol1);
2109 *crp = SET_BGCOLOR (*crp, ccol2); 2020 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2119 if (screen.cur.row + view_start != ocrow 2030 if (screen.cur.row + view_start != ocrow
2120 || screen.cur.col != oldcursor.col) 2031 || screen.cur.col != oldcursor.col)
2121 { 2032 {
2122 if (ocrow < nrow 2033 if (ocrow < nrow
2123 && oldcursor.col < ncol) 2034 && oldcursor.col < ncol)
2124 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2035 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2125 2036
2126 if (focus || !showcursor) 2037 if (focus || !showcursor)
2127 oldcursor.row = -1; 2038 oldcursor.row = -1;
2128 else 2039 else
2129 setoldcursor = 1; 2040 setoldcursor = 1;
… …
2142 oldcursor.col = screen.cur.col; 2053 oldcursor.col = screen.cur.col;
2143 } 2054 }
2144 } 2055 }
2145 } 2056 }
2146 2057
2058 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2147#if ENABLE_OVERLAY 2059#if ENABLE_OVERLAY
2148 scr_swap_overlay (); 2060 scr_swap_overlay ();
2149#endif 2061#endif
2150 2062
2151#ifndef NO_SLOW_LINK_SUPPORT 2063#ifndef NO_SLOW_LINK_SUPPORT
… …
2153 * D: CopyArea pass - very useful for slower links 2065 * D: CopyArea pass - very useful for slower links
2154 * This has been deliberately kept simple. 2066 * This has been deliberately kept simple.
2155 */ 2067 */
2156 i = num_scr; 2068 i = num_scr;
2157 if (!display->is_local 2069 if (!display->is_local
2158 && refresh_type == FAST_REFRESH && num_scr_allow && i 2070 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2159 && abs (i) < nrow && !must_clear) 2071 && abs (num_scr) < nrow && !must_clear)
2160 { 2072 {
2161 int16_t nits; 2073 int16_t nits;
2162 int j; 2074 int j;
2163 int len, wlen; 2075 int len, wlen;
2164 2076
… …
2167 row = i > 0 ? 0 : j - 1; 2079 row = i > 0 ? 0 : j - 1;
2168 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2080 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2169 { 2081 {
2170 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2082 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2171 { 2083 {
2172 line_t s = save[row + row_offset]; 2084 line_t s = ROW(row - view_start);
2173 line_t d = drawn[row]; 2085 line_t d = drawn_buf[row];
2174 line_t d2 = drawn[row + i]; 2086 line_t d2 = drawn_buf[row + i];
2175 2087
2176 for (nits = 0, col = ncol; col--; ) 2088 for (nits = 0, col = ncol; col--; )
2177 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2089 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2178 nits--; 2090 nits--;
2179 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2091 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2197 2109
2198 if (len != -1) 2110 if (len != -1)
2199 { 2111 {
2200 /* also comes here at end if needed because of >= above */ 2112 /* also comes here at end if needed because of >= above */
2201 if (wlen < len) 2113 if (wlen < len)
2202 SWAP_IT (wlen, len, int); 2114 ::swap (wlen, len);
2203 2115
2204 XCopyArea (display->display, vt, vt, 2116 XCopyArea (display->display, vt, vt,
2205 gc, 0, Row2Pixel (len + i), 2117 gc, 0, Row2Pixel (len + i),
2206 (unsigned int)TermWin_TotalWidth (), 2118 (unsigned int)this->width,
2207 (unsigned int)Height2Pixel (wlen - len + 1), 2119 (unsigned int)Height2Pixel (wlen - len + 1),
2208 0, Row2Pixel (len)); 2120 0, Row2Pixel (len));
2209 len = -1; 2121 len = -1;
2210 } 2122 }
2211 } 2123 }
… …
2215 /* 2127 /*
2216 * E: main pass across every character 2128 * E: main pass across every character
2217 */ 2129 */
2218 for (row = 0; row < nrow; row++) 2130 for (row = 0; row < nrow; row++)
2219 { 2131 {
2220 text_t *stp = save[row + row_offset].t; 2132 text_t *stp = ROW(row - view_start).t;
2221 rend_t *srp = save[row + row_offset].r; 2133 rend_t *srp = ROW(row - view_start).r;
2222 text_t *dtp = drawn[row].t; 2134 text_t *dtp = drawn_buf[row].t;
2223 rend_t *drp = drawn[row].r; 2135 rend_t *drp = drawn_buf[row].r;
2224 2136
2225 /* 2137 /*
2226 * E2: OK, now the real pass 2138 * E2: OK, now the real pass
2227 */ 2139 */
2228 int ypixel = (int)Row2Pixel (row); 2140 int ypixel = (int)Row2Pixel (row);
… …
2290 count++, i--; 2202 count++, i--;
2291 2203
2292 /* 2204 /*
2293 * Determine the attributes for the string 2205 * Determine the attributes for the string
2294 */ 2206 */
2295 int fore = GET_FGCOLOR (rend); // desired foreground 2207 int fore = fgcolor_of (rend); // desired foreground
2296 int back = GET_BGCOLOR (rend); // desired background 2208 int back = bgcolor_of (rend); // desired background
2297 2209
2298 // only do special processing if any attributes are set, which is rare 2210 // only do special processing if any attributes are set, which is unlikely
2299 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2211 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2300 { 2212 {
2301#if ENABLE_STYLES 2213#if ENABLE_STYLES
2302 // force redraw after "careful" characters to avoid pixel droppings 2214 // force redraw after "careful" characters to avoid pixel droppings
2303 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2215 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2339 fore = Color_UL; 2251 fore = Color_UL;
2340#endif 2252#endif
2341 2253
2342 if (invert) 2254 if (invert)
2343 { 2255 {
2344 SWAP_IT (fore, back, int); 2256 ::swap (fore, back);
2345 2257
2346#ifndef NO_BOLD_UNDERLINE_REVERSE 2258#ifndef NO_BOLD_UNDERLINE_REVERSE
2347 if (ISSET_PIXCOLOR (Color_RV)) 2259 if (ISSET_PIXCOLOR (Color_RV))
2348 back = Color_RV; 2260 back = Color_RV;
2349 2261
… …
2414 } /* for (row....) */ 2326 } /* for (row....) */
2415 2327
2416#if ENABLE_OVERLAY 2328#if ENABLE_OVERLAY
2417 scr_swap_overlay (); 2329 scr_swap_overlay ();
2418#endif 2330#endif
2331 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2419 2332
2420 /* 2333 /*
2421 * G: cleanup cursor and display outline cursor if necessary 2334 * G: cleanup cursor and display outline cursor if necessary
2422 */ 2335 */
2423 if (showcursor) 2336 if (showcursor)
2424 { 2337 {
2425 if (focus) 2338 if (focus)
2426 { 2339 {
2427 if (options & Opt_cursorUnderline) 2340 if (OPTION (Opt_cursorUnderline))
2428 *crp ^= RS_Uline; 2341 *crp ^= RS_Uline;
2429 else 2342 else
2430 { 2343 {
2431 *crp ^= RS_RVid; 2344 *crp ^= RS_RVid;
2432#ifndef NO_CURSORCOLOR 2345#ifndef NO_CURSORCOLOR
… …
2437 else if (oldcursor.row >= 0) 2350 else if (oldcursor.row >= 0)
2438 { 2351 {
2439 int cursorwidth = 1; 2352 int cursorwidth = 1;
2440 int col = oldcursor.col; 2353 int col = oldcursor.col;
2441 2354
2442 while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR) 2355 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2443 col--; 2356 col--;
2444 2357
2445 while (col + cursorwidth < ncol 2358 while (col + cursorwidth < ncol
2446 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2359 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2447 cursorwidth++; 2360 cursorwidth++;
2448 2361
2449#ifndef NO_CURSORCOLOR 2362#ifndef NO_CURSORCOLOR
2450 if (ISSET_PIXCOLOR (Color_cursor)) 2363 if (ISSET_PIXCOLOR (Color_cursor))
2451 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2364 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2470 num_scr = 0; 2383 num_scr = 0;
2471 num_scr_allow = 1; 2384 num_scr_allow = 1;
2472} 2385}
2473 2386
2474void 2387void
2475rxvt_term::scr_remap_chars (const line_t &l) 2388rxvt_term::scr_remap_chars (line_t &l)
2476{ 2389{
2477 if (!l.t) 2390 if (!l.t)
2478 return; 2391 return;
2479 2392
2393 l.touch (); // maybe a bit of an overkill, but its not performance-relevant
2394
2480 for (int i = ncol; i--; ) 2395 for (int i = ncol; i--; )
2481 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2396 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2482} 2397}
2483 2398
2484void 2399void
2485rxvt_term::scr_remap_chars () 2400rxvt_term::scr_remap_chars ()
2486{ 2401{
2487 for (int i = nrow + saveLines; i--; ) 2402 for (int i = total_rows; i--; )
2488 scr_remap_chars (save[i]); 2403 scr_remap_chars (row_buf [i]);
2489 2404
2490 for (int i = nrow; i--; ) 2405 for (int i = nrow; i--; )
2491 { 2406 {
2492 scr_remap_chars (drawn[i]); 2407 scr_remap_chars (drawn_buf [i]);
2493 scr_remap_chars (swap_save[i]); 2408 scr_remap_chars (swap_buf [i]);
2494 } 2409 }
2495} 2410}
2496 2411
2497void 2412void
2498rxvt_term::scr_recolour () 2413rxvt_term::scr_recolour ()
… …
2540 2455
2541/* ------------------------------------------------------------------------- */ 2456/* ------------------------------------------------------------------------- */
2542void 2457void
2543rxvt_term::scr_reverse_selection () 2458rxvt_term::scr_reverse_selection ()
2544{ 2459{
2460 if (selection.op
2545 if (selection.op && current_screen == selection.screen) 2461 && current_screen == selection.screen
2462 && selection.end.row >= -view_start)
2546 { 2463 {
2547 int end_row = saveLines - view_start; 2464 int view_end = -view_start + nrow;
2548 int i = selection.beg.row + saveLines; 2465 int row, col;
2549 int col, row = selection.end.row + saveLines;
2550 rend_t *srp;
2551 2466
2552#if ENABLE_FRILLS 2467#if ENABLE_FRILLS
2553 if (selection.rect) 2468 if (selection.rect)
2554 { 2469 {
2555 end_row += nrow; 2470 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2471 {
2472 text_t *stp = ROW(row).t;
2473 rend_t *srp = ROW(row).r;
2556 2474
2557 for (; i <= row && i <= end_row; i++)
2558 for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++) 2475 for (col = selection.beg.col; col < selection.end.col; col++)
2559 srp[col] ^= RS_RVid; 2476 srp[col] ^= RS_RVid;
2477
2478 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2479 srp[col] ^= RS_RVid | RS_Uline;
2480
2481 if (++col < selection.end.col)
2482 srp[col] ^= RS_RVid | RS_Uline;
2483 }
2560 } 2484 }
2561 else 2485 else
2562#endif 2486#endif
2563 { 2487 {
2564 if (i >= end_row) 2488 if (selection.beg.row >= -view_start)
2489 {
2565 col = selection.beg.col; 2490 col = selection.beg.col;
2491 row = selection.beg.row;
2492 }
2566 else 2493 else
2567 { 2494 {
2568 col = 0; 2495 col = 0;
2569 i = end_row; 2496 row = -view_start;
2570 } 2497 }
2571 2498
2572 end_row += nrow; 2499 for (; row < min (selection.end.row, view_end); row++, col = 0)
2573
2574 for (; i < row && i < end_row; i++, col = 0)
2575 for (srp = save[i].r; col < ncol; col++) 2500 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2576 srp[col] ^= RS_RVid; 2501 srp[col] ^= RS_RVid;
2577 2502
2578 if (i == row && i < end_row) 2503 if (row == selection.end.row)
2579 for (srp = save[i].r; col < selection.end.col; col++) 2504 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2580 srp[col] ^= RS_RVid; 2505 srp[col] ^= RS_RVid;
2581 } 2506 }
2582 } 2507 }
2583} 2508}
2584 2509
… …
2593{ 2518{
2594 int row, wrote; 2519 int row, wrote;
2595 unsigned int width, towrite; 2520 unsigned int width, towrite;
2596 char r1[] = "\n"; 2521 char r1[] = "\n";
2597 2522
2598 for (row = saveLines - nscrolled; 2523 for (row = saveLines - nsaved;
2599 row < saveLines + nrow - 1; row++) 2524 row < saveLines + nrow - 1; row++)
2600 { 2525 {
2601 width = save[row].l >= 0 ? save[row].l 2526 width = row_buf[row].l >= 0 ? row_buf[row].l
2602 : ncol; 2527 : ncol;
2603 for (towrite = width; towrite; towrite -= wrote) 2528 for (towrite = width; towrite; towrite -= wrote)
2604 { 2529 {
2605 wrote = write (fd, & (save[row].t[width - towrite]), 2530 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2606 towrite); 2531 towrite);
2607 if (wrote < 0) 2532 if (wrote < 0)
2608 return; /* XXX: death, no report */ 2533 return; /* XXX: death, no report */
2609 } 2534 }
2610 if (save[row].l >= 0) 2535 if (row_buf[row].l >= 0)
2611 if (write (fd, r1, 1) <= 0) 2536 if (write (fd, r1, 1) <= 0)
2612 return; /* XXX: death, no report */ 2537 return; /* XXX: death, no report */
2613 } 2538 }
2614} 2539}
2615#endif 2540#endif
2616 2541
2617/* ------------------------------------------------------------------------- * 2542/* ------------------------------------------------------------------------- *
2618 * CHARACTER SELECTION * 2543 * CHARACTER SELECTION *
2619 * ------------------------------------------------------------------------- */ 2544 * ------------------------------------------------------------------------- */
2620
2621/*
2622 * -nscrolled <= (selection row) <= nrow - 1
2623 */
2624void 2545void
2625rxvt_term::selection_check (int check_more) 2546rxvt_term::selection_check (int check_more)
2626{ 2547{
2627 row_col_t pos; 2548 row_col_t pos;
2628 2549
2629 if (!selection.op) 2550 if (!selection.op)
2630 return; 2551 return;
2631 2552
2632 pos.row = pos.col = 0; 2553 pos.row = pos.col = 0;
2633 if ((selection.beg.row < - (int32_t)nscrolled) 2554 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2634 || (selection.beg.row >= nrow) 2555 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2635 || (selection.mark.row < - (int32_t)nscrolled) 2556 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2636 || (selection.mark.row >= nrow)
2637 || (selection.end.row < - (int32_t)nscrolled)
2638 || (selection.end.row >= nrow)
2639 || (check_more == 1 2557 || (check_more == 1
2640 && current_screen == selection.screen 2558 && current_screen == selection.screen
2641 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2559 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2642 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2560 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2643 || (check_more == 2 2561 || (check_more == 2
… …
2654/* ------------------------------------------------------------------------- */ 2572/* ------------------------------------------------------------------------- */
2655/* 2573/*
2656 * Paste a selection direct to the command fd 2574 * Paste a selection direct to the command fd
2657 */ 2575 */
2658void 2576void
2659rxvt_term::paste (unsigned char *data, unsigned int len) 2577rxvt_term::paste (char *data, unsigned int len)
2660{ 2578{
2661 /* convert normal newline chars into common keyboard Return key sequence */ 2579 /* convert normal newline chars into common keyboard Return key sequence */
2662 for (unsigned int i = 0; i < len; i++) 2580 for (unsigned int i = 0; i < len; i++)
2663 if (data[i] == C0_LF) 2581 if (data[i] == C0_LF)
2664 data[i] = C0_CR; 2582 data[i] = C0_CR;
… …
2808 { 2726 {
2809 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2727 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2810 char *s = rxvt_wcstombs (w); 2728 char *s = rxvt_wcstombs (w);
2811 free (w); 2729 free (w);
2812 // TODO: strlen == only the first element will be converted. well... 2730 // TODO: strlen == only the first element will be converted. well...
2813 paste ((unsigned char *)s, strlen (s)); 2731 paste (s, strlen (s));
2814 free (s); 2732 free (s);
2815 } 2733 }
2816 else 2734 else
2817#endif 2735#endif
2818 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2736 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2819 && cl) 2737 && cl)
2820 { 2738 {
2821 for (int i = 0; i < cr; i++) 2739 for (int i = 0; i < cr; i++)
2822 paste ((unsigned char *)cl[i], strlen (cl[i])); 2740 paste (cl[i], strlen (cl[i]));
2823 2741
2824 XFreeStringList (cl); 2742 XFreeStringList (cl);
2825 } 2743 }
2826 else 2744 else
2827 paste (ct.value, ct.nitems); // paste raw 2745 paste ((char *)ct.value, ct.nitems); // paste raw
2828 2746
2829bailout: 2747bailout:
2830 XFree (ct.value); 2748 XFree (ct.value);
2831 2749
2832 if (selection_wait == Sel_normal) 2750 if (selection_wait == Sel_normal)
… …
2870 return; /* outside window */ 2788 return; /* outside window */
2871 2789
2872 if (selection.text) 2790 if (selection.text)
2873 { /* internal selection */ 2791 { /* internal selection */
2874 char *str = rxvt_wcstombs (selection.text, selection.len); 2792 char *str = rxvt_wcstombs (selection.text, selection.len);
2875 paste ((unsigned char *)str, strlen (str)); 2793 paste (str, strlen (str));
2876 free (str); 2794 free (str);
2877 return; 2795 return;
2878 } 2796 }
2879 else 2797 else
2880 { 2798 {
… …
2949 * EXT: button 1 or 3 release 2867 * EXT: button 1 or 3 release
2950 */ 2868 */
2951void 2869void
2952rxvt_term::selection_make (Time tm) 2870rxvt_term::selection_make (Time tm)
2953{ 2871{
2954 int i, col, end_col, row, end_row; 2872 int i;
2955 wchar_t *new_selection_text; 2873 wchar_t *new_selection_text;
2956 text_t *t; 2874 text_t *t;
2957 2875
2958 switch (selection.op) 2876 switch (selection.op)
2959 { 2877 {
… …
2972 selection.op = SELECTION_DONE; 2890 selection.op = SELECTION_DONE;
2973 2891
2974 if (selection.clicks == 4) 2892 if (selection.clicks == 4)
2975 return; /* nothing selected, go away */ 2893 return; /* nothing selected, go away */
2976 2894
2895 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2896 return;
2897
2977 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2898 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2978 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2899 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2979 2900
2980 col = selection.beg.col;
2981 row = selection.beg.row + saveLines;
2982 end_row = selection.end.row + saveLines;
2983 int ofs = 0; 2901 int ofs = 0;
2984 int extra = 0; 2902 int extra = 0;
2985 2903
2904 int col = selection.beg.col;
2905 int row = selection.beg.row;
2906
2907 int end_col;
2908
2986 for (; row <= end_row; row++, col = 0) 2909 for (; row <= selection.end.row; row++, col = 0)
2987 { 2910 {
2988#if ENABLE_FRILLS 2911#if ENABLE_FRILLS
2989 if (selection.rect) 2912 if (selection.rect)
2990 { 2913 {
2991 col = selection.beg.col; 2914 col = selection.beg.col;
2992 end_col = ncol + 1; 2915 end_col = ncol + 1;
2993 } 2916 }
2994 else 2917 else
2995#endif 2918#endif
2996 end_col = save[row].is_longer () ? ncol : save[row].l; //TODO//FIXME//LEN 2919 end_col = ROW(row).l;
2997 2920
2998 MAX_IT (col, 0); 2921 col = max (col, 0);
2999 2922
3000 if (row == end_row || selection.rect) 2923 if (row == selection.end.row
2924#if ENABLE_FRILLS
2925 || selection.rect
2926#endif
2927 )
3001 MIN_IT (end_col, selection.end.col); 2928 min_it (end_col, selection.end.col);
3002 2929
3003 t = save[row].t + col; 2930 t = ROW(row).t + col;
2931
3004 for (; col < end_col; col++) 2932 for (; col < end_col; col++)
3005 { 2933 {
3006 if (*t == NOCHAR) 2934 if (*t == NOCHAR)
3007 t++; 2935 t++;
3008#if ENABLE_COMBINING 2936#if ENABLE_COMBINING
… …
3024#endif 2952#endif
3025 else 2953 else
3026 new_selection_text[ofs++] = *t++; 2954 new_selection_text[ofs++] = *t++;
3027 } 2955 }
3028 2956
3029 if (!save[row].is_longer () && row != end_row) 2957#if ENABLE_FRILLS
2958 if (selection.rect)
2959 {
2960 while (ofs
2961 && new_selection_text[ofs - 1] != C0_LF
2962 && unicode::is_space (new_selection_text[ofs - 1]))
2963 --ofs;
2964
3030 new_selection_text[ofs++] = C0_LF; 2965 new_selection_text[ofs++] = C0_LF;
2966 }
2967 else
2968#endif
2969 if (!ROW(row).is_longer () && row != selection.end.row)
2970 new_selection_text[ofs++] = C0_LF;
3031 } 2971 }
3032 2972
3033 if (end_col != selection.end.col) 2973 if (end_col != selection.end.col)
3034 new_selection_text[ofs++] = C0_LF; 2974 new_selection_text[ofs++] = C0_LF;
3035 2975
… …
3045 2985
3046 // we usually allocate much more than necessary, so realloc it smaller again 2986 // we usually allocate much more than necessary, so realloc it smaller again
3047 selection.len = ofs; 2987 selection.len = ofs;
3048 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2988 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3049 2989
2990 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2991 return;
2992
2993 selection_grab (tm);
2994}
2995
2996bool
2997rxvt_term::selection_grab (Time tm)
2998{
2999 selection_time = tm;
3000
3050 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3001 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3051 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3002 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3003 {
3052 display->set_selection_owner (this); 3004 display->set_selection_owner (this);
3005 return true;
3006 }
3053 else 3007 else
3054 rxvt_warn ("can't get primary selection, ignoring.\n"); 3008 return false;
3055 3009
3056#if 0 3010#if 0
3057 XTextProperty ct; 3011 XTextProperty ct;
3058 3012
3059 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3013 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3060 { 3014 {
3061 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3015 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3062 XFree (ct.value); 3016 XFree (ct.value);
3063 } 3017 }
3064#endif 3018#endif
3065
3066 selection_time = tm;
3067} 3019}
3068 3020
3069/* ------------------------------------------------------------------------- */ 3021/* ------------------------------------------------------------------------- */
3070/* 3022/*
3071 * Mark or select text based upon number of clicks: 1, 2, or 3 3023 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3093 */ 3045 */
3094void 3046void
3095rxvt_term::selection_start_colrow (int col, int row) 3047rxvt_term::selection_start_colrow (int col, int row)
3096{ 3048{
3097 want_refresh = 1; 3049 want_refresh = 1;
3050
3051 selection.mark.row = row - view_start;
3098 selection.mark.col = col; 3052 selection.mark.col = col;
3099 selection.mark.row = row - view_start;
3100 3053
3101 MAX_IT (selection.mark.row, - (int32_t)nscrolled); 3054 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3102 MIN_IT (selection.mark.row, (int32_t)nrow - 1); 3055 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3103 MAX_IT (selection.mark.col, 0);
3104 MIN_IT (selection.mark.col, (int32_t)ncol - 1);
3105 3056
3106 while (selection.mark.col > 0 3057 while (selection.mark.col > 0
3107 && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR) 3058 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3108 --selection.mark.col; 3059 --selection.mark.col;
3109 3060
3110 if (selection.op) 3061 if (selection.op)
3111 { /* clear the old selection */ 3062 { /* clear the old selection */
3112 selection.beg.row = selection.end.row = selection.mark.row; 3063 selection.beg.row = selection.end.row = selection.mark.row;
… …
3136 text_t *stp; 3087 text_t *stp;
3137 rend_t *srp; 3088 rend_t *srp;
3138 3089
3139 if (dirn == UP) 3090 if (dirn == UP)
3140 { 3091 {
3141 bound.row = saveLines - nscrolled - 1; 3092 bound.row = - nsaved - 1;
3142 bound.col = 0; 3093 bound.col = 0;
3143 dirnadd = -1; 3094 dirnadd = -1;
3144 } 3095 }
3145 else 3096 else
3146 { 3097 {
3147 bound.row = saveLines + nrow; 3098 bound.row = nrow;
3148 bound.col = ncol - 1; 3099 bound.col = ncol - 1;
3149 dirnadd = 1; 3100 dirnadd = 1;
3150 } 3101 }
3151 3102
3152 row = mark->row + saveLines; 3103 row = mark->row;
3153 col = mark->col; 3104 col = max (mark->col, 0);
3154 MAX_IT (col, 0); 3105
3155 /* find the edge of a word */ 3106 /* find the edge of a word */
3156 stp = save[row].t + col; w1 = DELIMIT_TEXT (*stp); 3107 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3157 srp = save[row].r + col; w2 = DELIMIT_REND (*srp); 3108 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3158 3109
3159 for (;;) 3110 for (;;)
3160 { 3111 {
3161 for (; col != bound.col; col += dirnadd) 3112 for (; col != bound.col; col += dirnadd)
3162 { 3113 {
… …
3172 break; 3123 break;
3173 } 3124 }
3174 3125
3175 if ((col == bound.col) && (row != bound.row)) 3126 if ((col == bound.col) && (row != bound.row))
3176 { 3127 {
3177 if (save[ (row - (dirn == UP ? 1 : 0))].is_longer ()) 3128 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3178 { 3129 {
3179 trow = row + dirnadd; 3130 trow = row + dirnadd;
3180 tcol = dirn == UP ? ncol - 1 : 0; 3131 tcol = dirn == UP ? ncol - 1 : 0;
3181 3132
3182 if (!save[trow].t) 3133 if (!ROW(trow).t)
3183 break; 3134 break;
3184 3135
3185 stp = save[trow].t + tcol; 3136 stp = ROW(trow).t + tcol;
3186 srp = save[trow].r + tcol; 3137 srp = ROW(trow).r + tcol;
3187 3138
3188 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3139 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3189 break; 3140 break;
3190 3141
3191 row = trow; 3142 row = trow;
… …
3194 } 3145 }
3195 } 3146 }
3196 break; 3147 break;
3197 } 3148 }
3198 3149
3199Old_Word_Selection_You_Die:
3200 if (dirn == DN) 3150 if (dirn == DN)
3201 col++; /* put us on one past the end */ 3151 col++; /* put us on one past the end */
3202 3152
3203 /* Poke the values back in */ 3153 /* Poke the values back in */
3204 ret->row = row - saveLines; 3154 ret->row = row;
3205 ret->col = col; 3155 ret->col = col;
3206} 3156}
3207 3157
3208/* ------------------------------------------------------------------------- */ 3158/* ------------------------------------------------------------------------- */
3209/* 3159/*
… …
3214 * flag == 2 ==> button 3 motion 3164 * flag == 2 ==> button 3 motion
3215 */ 3165 */
3216void 3166void
3217rxvt_term::selection_extend (int x, int y, int flag) 3167rxvt_term::selection_extend (int x, int y, int flag)
3218{ 3168{
3219 int col, row; 3169 int col = clamp (Pixel2Col (x), 0, ncol);
3220 3170 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3221 col = Pixel2Col (x);
3222 row = Pixel2Row (y);
3223 MAX_IT (row, 0);
3224 MIN_IT (row, (int)nrow - 1);
3225 MAX_IT (col, 0);
3226 MIN_IT (col, (int)ncol);
3227 3171
3228 /* 3172 /*
3229 * If we're selecting characters (single click) then we must check first 3173 * If we're selecting characters (single click) then we must check first
3230 * if we are at the same place as the original mark. If we are then 3174 * if we are at the same place as the original mark. If we are then
3231 * select nothing. Otherwise, if we're to the right of the mark, you have to 3175 * select nothing. Otherwise, if we're to the right of the mark, you have to
… …
3296 selection.beg.col = selection.end.col = selection.mark.col; 3240 selection.beg.col = selection.end.col = selection.mark.col;
3297 selection.beg.row = selection.end.row = selection.mark.row; 3241 selection.beg.row = selection.end.row = selection.mark.row;
3298 } 3242 }
3299 3243
3300 pos.col = col; 3244 pos.col = col;
3301 pos.row = row; 3245 pos.row = row - view_start;
3302
3303 pos.row -= view_start; /* adjust for scroll */
3304 3246
3305 /* 3247 /*
3306 * This is mainly xterm style selection with a couple of differences, mainly 3248 * This is mainly xterm style selection with a couple of differences, mainly
3307 * in the way button3 drag extension works. 3249 * in the way button3 drag extension works.
3308 * We're either doing: button1 drag; button3 press; or button3 drag 3250 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3367 } 3309 }
3368 } 3310 }
3369 3311
3370 if (selection.clicks == 1) 3312 if (selection.clicks == 1)
3371 { 3313 {
3372 if (selection.beg.col > save[selection.beg.row + saveLines].l //TODO//FIXME//LEN 3314 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3373 && !save[selection.beg.row + saveLines].is_longer () 3315 && !ROW(selection.beg.row).is_longer ()
3374#if ENABLE_FRILLS 3316#if ENABLE_FRILLS
3375 && !selection.rect 3317 && !selection.rect
3376#endif 3318#endif
3377 ) 3319 )
3378 selection.beg.col = ncol; 3320 selection.beg.col = ncol;
3379 3321
3380 if ( 3322 if (
3381 selection.end.col > save[selection.end.row + saveLines].l //TODO//FIXME//LEN 3323 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3382 && !save[selection.end.row + saveLines].is_longer () 3324 && !ROW(selection.end.row).is_longer ()
3383#if ENABLE_FRILLS 3325#if ENABLE_FRILLS
3384 && !selection.rect 3326 && !selection.rect
3385#endif 3327#endif
3386 ) 3328 )
3387 selection.end.col = ncol; 3329 selection.end.col = ncol;
… …
3389 else if (selection.clicks == 2) 3331 else if (selection.clicks == 2)
3390 { 3332 {
3391 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3333 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3392 selection.end.col--; 3334 selection.end.col--;
3393 3335
3336 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3337 {
3394 selection_delimit_word (UP, &selection.beg, &selection.beg); 3338 selection_delimit_word (UP, &selection.beg, &selection.beg);
3395 selection_delimit_word (DN, &selection.end, &selection.end); 3339 selection_delimit_word (DN, &selection.end, &selection.end);
3340 }
3396 } 3341 }
3397 else if (selection.clicks == 3) 3342 else if (selection.clicks == 3)
3398 { 3343 {
3399#if ENABLE_FRILLS 3344#if ENABLE_FRILLS
3400 if (options & Opt_tripleclickwords) 3345 if (OPTION (Opt_tripleclickwords))
3401 { 3346 {
3402 selection_delimit_word (UP, &selection.beg, &selection.beg); 3347 selection_delimit_word (UP, &selection.beg, &selection.beg);
3403 3348
3404 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3349 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3405 { 3350 {
3406 if (!save[end_row + saveLines].is_longer ()) 3351 if (!ROW(end_row).is_longer ())
3407 { 3352 {
3408 selection.end.row = end_row; 3353 selection.end.row = end_row;
3409 selection.end.col = save[end_row + saveLines].l; 3354 selection.end.col = ROW(end_row).l;
3410 selection_remove_trailing_spaces (); 3355 selection_remove_trailing_spaces ();
3411 break; 3356 break;
3412 } 3357 }
3413 } 3358 }
3414 } 3359 }
… …
3421 selection.beg.col = 0; 3366 selection.beg.col = 0;
3422 selection.end.col = ncol; 3367 selection.end.col = ncol;
3423 3368
3424 // select a complete logical line 3369 // select a complete logical line
3425 while (selection.beg.row > -saveLines 3370 while (selection.beg.row > -saveLines
3426 && save[selection.beg.row - 1 + saveLines].is_longer ()) 3371 && ROW(selection.beg.row - 1).is_longer ())
3427 selection.beg.row--; 3372 selection.beg.row--;
3428 3373
3429 while (selection.end.row < nrow 3374 while (selection.end.row < nrow
3430 && save[selection.end.row + saveLines].is_longer ()) 3375 && ROW(selection.end.row).is_longer ())
3431 selection.end.row++; 3376 selection.end.row++;
3432 } 3377 }
3433 } 3378 }
3434 3379
3435 if (button3 && buttonpress) 3380 if (button3 && buttonpress)
… …
3446 } 3391 }
3447 } 3392 }
3448 3393
3449#if ENABLE_FRILLS 3394#if ENABLE_FRILLS
3450 if (selection.rect && selection.beg.col > selection.end.col) 3395 if (selection.rect && selection.beg.col > selection.end.col)
3451 SWAP_IT (selection.beg.col, selection.end.col, int); 3396 ::swap (selection.beg.col, selection.end.col);
3452#endif 3397#endif
3453} 3398}
3454 3399
3455#if ENABLE_FRILLS 3400#if ENABLE_FRILLS
3456void 3401void
… …
3460 text_t *stp; 3405 text_t *stp;
3461 3406
3462 end_col = selection.end.col; 3407 end_col = selection.end.col;
3463 end_row = selection.end.row; 3408 end_row = selection.end.row;
3464 3409
3465 for ( ; end_row >= selection.beg.row; ) 3410 for (; end_row >= selection.beg.row; )
3466 { 3411 {
3467 stp = save[end_row + saveLines].t; 3412 stp = ROW(end_row).t;
3468 3413
3469 while (--end_col >= 0) 3414 while (--end_col >= 0)
3470 { 3415 {
3471 if (stp[end_col] != ' ' 3416 if (stp[end_col] != NOCHAR
3472 && stp[end_col] != '\t' 3417 && !unicode::is_space (stp[end_col]))
3473 && stp[end_col] != NOCHAR)
3474 break; 3418 break;
3475 } 3419 }
3476 3420
3477 if (end_col >= 0 3421 if (end_col >= 0
3478 || !save[end_row - 1 + saveLines].is_longer ()) 3422 || !ROW(end_row - 1).is_longer ())
3479 { 3423 {
3480 selection.end.col = end_col + 1; 3424 selection.end.col = end_col + 1;
3481 selection.end.row = end_row; 3425 selection.end.row = end_row;
3482 break; 3426 break;
3483 } 3427 }
… …
3654 */ 3598 */
3655void 3599void
3656rxvt_term::pixel_position (int *x, int *y) 3600rxvt_term::pixel_position (int *x, int *y)
3657{ 3601{
3658 *x = Pixel2Col (*x); 3602 *x = Pixel2Col (*x);
3659 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3603 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3660 *y = Pixel2Row (*y); 3604 *y = Pixel2Row (*y);
3661 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3605 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3662} 3606}
3663 3607
3664/* ------------------------------------------------------------------------- */ 3608/* ------------------------------------------------------------------------- */
3665#ifdef USE_XIM 3609#ifdef USE_XIM
3666void 3610void
… …
3677 3621
3678#if ENABLE_OVERLAY 3622#if ENABLE_OVERLAY
3679void 3623void
3680rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3624rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3681{ 3625{
3682 if (nrow < 3 || ncol < 3) 3626 if (nrow < 1 || ncol < 1)
3683 return; 3627 return;
3684 3628
3685 want_refresh = 1; 3629 want_refresh = 1;
3686 3630
3687 scr_overlay_off (); 3631 scr_overlay_off ();
3688 3632
3689 if (x < 0) x = ncol - w; 3633 if (x < 0) x = ncol - w;
3690 if (y < 0) y = nrow - h; 3634 if (y < 0) y = nrow - h;
3691 3635
3692 // make space for border 3636 // make space for border
3693 w += 2; MIN_IT (w, ncol); 3637 w += 2; min_it (w, ncol);
3694 h += 2; MIN_IT (h, nrow); 3638 h += 2; min_it (h, nrow);
3695 3639
3696 x -= 1; MAX_IT (x, 0); 3640 x -= 1; clamp_it (x, 0, ncol - w);
3697 y -= 1; MAX_IT (y, 0); 3641 y -= 1; clamp_it (y, 0, nrow - h);
3698
3699 MIN_IT (x, ncol - w);
3700 MIN_IT (y, nrow - h);
3701 3642
3702 ov_x = x; ov_y = y; 3643 ov_x = x; ov_y = y;
3703 ov_w = w; ov_h = h; 3644 ov_w = w; ov_h = h;
3704 3645
3705 ov_text = new text_t *[h]; 3646 ov_text = new text_t *[h];
… …
3791rxvt_term::scr_swap_overlay () 3732rxvt_term::scr_swap_overlay ()
3792{ 3733{
3793 if (!ov_text) 3734 if (!ov_text)
3794 return; 3735 return;
3795 3736
3796 int row_offset = ov_y + saveLines - view_start;
3797
3798 // swap screen mem with overlay 3737 // swap screen mem with overlay
3799 for (int y = ov_h; y--; ) 3738 for (int y = ov_h; y--; )
3800 { 3739 {
3801 text_t *t1 = ov_text[y]; 3740 text_t *t1 = ov_text[y];
3802 rend_t *r1 = ov_rend[y]; 3741 rend_t *r1 = ov_rend[y];
3803 3742
3804 text_t *t2 = save[y + row_offset].t + ov_x; 3743 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3805 rend_t *r2 = save[y + row_offset].r + ov_x; 3744 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3806 3745
3807 for (int x = ov_w; x--; ) 3746 for (int x = ov_w; x--; )
3808 { 3747 {
3809 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3748 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3810 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3749 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3812 } 3751 }
3813} 3752}
3814 3753
3815#endif 3754#endif
3816/* ------------------------------------------------------------------------- */ 3755/* ------------------------------------------------------------------------- */
3756

Diff Legend

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