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.184 by root, Wed Dec 21 14:23:30 2005 UTC vs.
Revision 1.215 by root, Sun Jan 8 06:35:23 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
123 lalloc (l); 124 lalloc (l);
124 col = 0; 125 col = 0;
125 width = ncol; 126 width = ncol;
126 } 127 }
127 128
129 l.touch ();
130
128 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130 133
131 text_t *et = l.t + col; 134 text_t *et = l.t + col;
132 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
142/* 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 */
143void 146void
144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
145{ 148{
146 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
158
152void 159void
153rxvt_term::scr_reset () 160rxvt_term::scr_reset ()
154{ 161{
155 unsigned int p, q;
156 int k;
157
158#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
159 scr_overlay_off (); 163 scr_overlay_off ();
160#endif 164#endif
161 165
162 view_start = 0; 166 view_start = 0;
… …
172 return; 176 return;
173 177
174 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
175 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
176 { 180 {
181 //TODO//FIXME
177 saveLines++; 182 saveLines++;
178 prev_nrow--; 183 prev_nrow--;
179 nsaved++; 184 nsaved++;
180 } 185 }
181 186
… …
185 total_rows = nrow + saveLines; 190 total_rows = nrow + saveLines;
186 191
187 screen.tscroll = 0; 192 screen.tscroll = 0;
188 screen.bscroll = nrow - 1; 193 screen.bscroll = nrow - 1;
189 194
190 if (!save) 195 if (!row_buf)
191 { 196 {
192 /* 197 /*
193 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
194 * Note: this is still needed so that all the scrollback lines are NULL 199 * Note: this is still needed so that all the scrollback lines are NULL
195 */ 200 */
… …
197 term_start = 0; 202 term_start = 0;
198 203
199 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 204 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 205 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201 206
202 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 207 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
208 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
204 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 211
207 for (p = nrow; p--; ) 212 for (int row = nrow; row--; )
208 { 213 {
209 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); 214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 216 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 } 217 }
213 218
214 memset (charsets, 'B', sizeof (charsets)); 219 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 220 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 221 screen.flags = Screen_DefaultFlags;
… …
240 { 245 {
241 /* 246 /*
242 * add or delete rows as appropriate 247 * add or delete rows as appropriate
243 */ 248 */
244 249
245 rxvt_salloc *old_ta; 250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
246 rxvt_salloc *old_ra; 251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
247 252
253#if 0
248 if (nrow < prev_nrow) 254 if (nrow < prev_nrow)
249 { 255 {
250 /* delete rows */
251 k = min (nsaved, prev_nrow - nrow);
252 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
253 scr_scroll_text (0, (int)prev_nrow - 1, k);
254
255 for (p = nrow; p < prev_nrow; p++) 256 for (int row = nrow; row < prev_nrow; row++)
256 { 257 {
257 lfree (ROW(p));
258 lfree (swap_save[p]); 258 lfree (swap_buf [row]);
259 lfree (drawn[p]); 259 lfree (drawn_buf[row]);
260 } 260 }
261 }
262#endif
261 263
262 /* we have fewer rows so fix up cursor position */ 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 min_it (screen.cur.row, (int32_t)nrow - 1); 265 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
266 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264 267
265 scr_reset_realloc (); /* realloc _last_ */ 268 for (int row = min (nrow, prev_nrow); row--; )
269 {
270 lresize (drawn_buf[row]);
271 lresize (swap_buf [row]);
272 }
273
274 for (int row = prev_nrow; row < nrow; row++)
275 {
276 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
277 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
278 }
279
280 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
266 } 281
267 else if (nrow > prev_nrow) 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start - nsaved , prev_total_rows);
284 int q = total_rows; // rewrapped row
285
286 if (nsaved)
287 {
288 // re-wrap lines, this is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm.
290
291 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293
268 { 294 do
269 /* add rows */
270 scr_reset_realloc (); /* realloc _first_ */
271
272 int ocol = ncol;
273 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
274
275 k = min (nsaved, nrow - prev_nrow);
276
277 for (p = prev_total_rows; p < total_rows; p++)
278 save[p].clear ();
279
280 for (p = prev_total_rows; p < total_rows - k; p++)
281 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
282
283 for (p = prev_nrow; p < nrow; p++)
284 { 295 {
285 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 296 p = MOD (p - 1, prev_total_rows);
286 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
287 }
288
289 if (k > 0)
290 {
291 scr_scroll_text (0, (int)nrow - 1, -k);
292 screen.cur.row += k;
293 screen.s_cur.row += k;
294 nsaved -= k;
295 }
296
297#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
298 assert (screen.cur.row < nrow); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
299#else /* drive with your eyes closed */
300 min_it (screen.cur.row, nrow - 1);
301#endif 299#endif
302 ncol = ocol; // save b/c scr_blank_screen_mem uses this
303 }
304
305 /* resize columns */
306 if (ncol != prev_ncol)
307 {
308 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
309 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
310
311 for (p = total_rows; p--; )
312 lresize (save[p]);
313
314 for (p = nrow; p--; )
315 {
316 lresize (drawn[p]);
317 lresize (swap_save[p]);
318 }
319
320 min_it (screen.cur.col, (int16_t)ncol - 1);
321
322 delete old_ta;
323 delete old_ra;
324 }
325
326#if 0
327 // re-wrap lines, this is rather ugly, possibly because I am too dumb
328 // to come up with a lean and mean algorithm.
329 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
330 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
331
332 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
333 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
334 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
335
336 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
337
338 p = prev_total_rows;
339 q = total_rows;
340
341 while (p > 0 && q > 0)
342 {
343 --p;
344
345 printf ("pq %d:%d\n", p, q);
346 if (save[p].t)
347 {
348 int llen = save[p].l; 300 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l;
349 302
350 assert (llen >= 0); 303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
351
352 while (p && save[p - 1].l < 0)
353 { 304 {
305 p = MOD (p - 1, prev_total_rows);
306
354 --p; 307 plines++;
355 llen += prev_ncol; 308 llen += prev_ncol;
356 } 309 }
357 310
358 int qlines = llen / ncol + 1; 311 int qlines = max (0, (llen - 1) / ncol) + 1;
312
313 // drop partial lines completely
314 if (q < qlines)
315 break;
316
317 q -= qlines;
318
359 int lofs = 0; 319 int lofs = 0;
320 line_t *qline;
360 321
361 q -= qlines; 322 // re-assemble the full line by destination lines
362
363 int qrow = q;
364
365 printf ("QL %d llen %d\n", qlines, llen);//D
366 for (; qlines--; qrow++) 323 for (int qrow = q; qlines--; qrow++)
367 { 324 {
325 qline = row_buf + qrow;
326 lalloc (*qline);
327 qline->l = ncol;
328 qline->is_longer (1);
329
368 if (qrow >= 0) 330 int qcol = 0;
331
332 // fill a single destination line
333 while (lofs < llen && qcol < ncol)
369 { 334 {
370 tp [qrow] = (text_t *)ta->alloc ();
371 rp [qrow] = (rend_t *)ra->alloc ();
372 tl [qrow] = LINE_CONT1;
373
374 int qcol = 0;
375
376 for (;;)
377 {
378 int prow = lofs / prev_ncol + p; 335 int prow = lofs / prev_ncol;
379 int pcol = lofs % prev_ncol; 336 int pcol = lofs % prev_ncol;
380 337
338 prow = MOD (p + prow, prev_total_rows);
339
340 // we only adjust the cursor _row_ and put it into
341 // the topmost line of "long line" it was in, as
342 // this seems to upset applications/shells/readline
343 // least.
344 if (prow == ocur.row)
345 screen.cur.row = q - (total_rows - nrow);
346
347 line_t &pline = old_buf [prow];
348
381 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 349 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
382 350
383 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);
384
385 if (len <= 0)
386 {
387 tl [qrow] = qcol;
388
389 TODO
390 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
391 ncol - qcol, DEFAULT_RSTYLE);
392
393 break;
394 }
395
396 assert (lofs < 1000); 351 assert (len);
352 assert (pline.t);
397 353
398 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
399 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
400 356
401 lofs += len; 357 lofs += len;
402 qcol += len; 358 qcol += len;
403
404 if (qcol == ncol)
405 break;
406 }
407 } 359 }
408 else
409 lofs += ncol;
410 } 360 }
361
362 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
363 qline->is_longer (0);
364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
411 } 365 }
366 while (p != pend && q > 0);
367
368 term_start = total_rows - nrow;
369 nsaved = term_start - q;
370
371 // make sure all terminal lines exist
372 while (nsaved < 0)
373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
374 }
375 else
412 } 376 {
377 // if no scrollback exists (yet), wing, instead of wrap
378
379 for (int row = min (nrow, prev_nrow); row--; )
380 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row];
413 383
414 free (screen.text); screen.text = tp; 384 qline = pline;
415 free (screen.rend); screen.rend = rp; 385 lresize (qline);
416 free (screen.tlen); screen.tlen = tl; 386 }
417 387
418 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 388 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392
393 term_start = 0;
394 }
395
396#ifdef DEBUG_STRICT //TODO: remove
397 for (int i = -nsaved; i < nrow; i++)
398 assert (ROW (i).t);
419#endif 399#endif
400
401 free (old_buf);
402 delete old_ta;
403 delete old_ra;
404
405 clamp_it (screen.cur.row, 0, nrow - 1);
406 clamp_it (screen.cur.col, 0, ncol - 1);
420 407
421 if (tabs) 408 if (tabs)
422 free (tabs); 409 free (tabs);
423 } 410 }
424 411
425 prev_nrow = nrow; 412 prev_nrow = nrow;
426 prev_ncol = ncol; 413 prev_ncol = ncol;
427 414
428 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
429 416
430 for (p = 0; p < ncol; p++) 417 for (int col = ncol; col--; )
431 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 418 tabs [col] = col % TABSIZE == 0;
432 419
433 tt_winch (); 420 tt_winch ();
434}
435 421
436void 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
437rxvt_term::scr_reset_realloc ()
438{
439 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
440 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
441 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
442 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
443} 423}
444 424
445/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
446/* 426/*
447 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
… …
450rxvt_term::scr_release () 430rxvt_term::scr_release ()
451{ 431{
452 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
453 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
454 434
455 free (save); 435 free (row_buf);
456 free (swap_save); 436 free (swap_buf);
457 free (drawn); 437 free (drawn_buf);
458 free (buf); 438 free (temp_buf);
459 free (tabs); 439 free (tabs);
440
441 row_buf = 0; // signal that we freed all the arrays
460} 442}
461 443
462/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
463/* 445/*
464 * Hard reset 446 * Hard reset
… …
520 min_it (s->cur.row, nrow - 1); 502 min_it (s->cur.row, nrow - 1);
521 min_it (s->cur.col, ncol - 1); 503 min_it (s->cur.col, ncol - 1);
522#ifdef DEBUG_STRICT 504#ifdef DEBUG_STRICT
523 assert (s->cur.row >= 0); 505 assert (s->cur.row >= 0);
524 assert (s->cur.col >= 0); 506 assert (s->cur.col >= 0);
525#else /* drive with your eyes closed */
526 max_it (s->cur.row, 0);
527 max_it (s->cur.col, 0);
528#endif 507#endif
529} 508}
530 509
531/* ------------------------------------------------------------------------- */ 510/* ------------------------------------------------------------------------- */
532/* 511/*
… …
552 531
553 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 532 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
554 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 533 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
555 534
556#if NSCREENS 535#if NSCREENS
557 if (options & Opt_secondaryScreen) 536 if (OPTION (Opt_secondaryScreen))
558 { 537 {
559 num_scr = 0; 538 num_scr = 0;
560 539
561 for (int i = nrow; i--; ) 540 for (int i = prev_nrow; i--; )
562 ::swap (ROW(i), swap_save[i]); 541 ::swap (ROW(i), swap_buf [i]);
563 542
564 ::swap (screen.charset, swap.charset); 543 ::swap (screen.charset, swap.charset);
565 ::swap (screen.flags, swap.flags); 544 ::swap (screen.flags, swap.flags);
566 screen.flags |= Screen_VisibleCursor; 545 screen.flags |= Screen_VisibleCursor;
567 swap.flags |= Screen_VisibleCursor; 546 swap.flags |= Screen_VisibleCursor;
568 } 547 }
569 else 548 else
570#endif 549#endif
571 if (options & Opt_secondaryScroll) 550 if (OPTION (Opt_secondaryScroll))
572 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 551 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
573 552
574 return scrn; 553 return scrn;
575} 554}
576 555
… …
638 num_scr += count; 617 num_scr += count;
639 618
640 if (count > 0 619 if (count > 0
641 && row1 == 0 620 && row1 == 0
642 && row2 == nrow - 1 621 && row2 == nrow - 1
643 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 622 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
644 { 623 {
645 nsaved = min (nsaved + count, saveLines); 624 nsaved = min (nsaved + count, saveLines);
625
626 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
627
646 term_start = (term_start + count) % total_rows; 628 term_start = (term_start + count) % total_rows;
647 629
648 if (selection.op && current_screen == selection.screen) 630 if (selection.op && current_screen == selection.screen)
649 { 631 {
650 selection.beg.row -= count; 632 selection.beg.row -= count;
651 selection.end.row -= count; 633 selection.end.row -= count;
652 selection.mark.row -= count; 634 selection.mark.row -= count;
653 635
654 selection_check (0); 636 if (selection.beg.row < -nsaved
637 || selection.end.row < -nsaved
638 || selection.mark.row < -nsaved)
639 {
640 CLEAR_ALL_SELECTION ();
641 selection.op = SELECTION_CLEAR;
642 }
655 } 643 }
656 644
657 for (int i = count; i--; ) 645 for (int i = count; i--; )
658 scr_blank_screen_mem (ROW(row2 - i), rstyle); 646 scr_blank_screen_mem (ROW(row2 - i), rstyle);
659 647
660 if ((options & Opt_scrollWithBuffer) 648 if (OPTION (Opt_scrollWithBuffer)
661 && view_start != 0 649 && view_start != 0
662 && view_start != saveLines) 650 && view_start != saveLines)
663 scr_page (UP, count); 651 scr_page (UP, count);
664 } 652 }
665 else 653 else
666 { 654 {
667 if (selection.op && current_screen == selection.screen) 655 if (selection.op && current_screen == selection.screen)
668 { 656 {
669 int i = selection.beg.row; 657 if ((selection.beg.row < row1 && selection.end.row > row1)
670 int j = selection.end.row; 658 || (selection.beg.row < row2 && selection.end.row > row2)
671
672 if ((i < row1 && j > row1)
673 || (i < row2 && j > row2)
674 || (i - count < row1 && i >= row1) 659 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
675 || (i - count > row2 && i <= row2) 660 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
676 || (j - count < row1 && j >= row1) 661 || (selection.end.row - count < row1 && selection.end.row >= row1)
677 || (j - count > row2 && j <= row2)) 662 || (selection.end.row - count > row2 && selection.end.row <= row2))
678 { 663 {
679 CLEAR_ALL_SELECTION (); 664 CLEAR_ALL_SELECTION ();
680 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 665 selection.op = SELECTION_CLEAR;
681 } 666 }
682 else if (j >= row1 && j <= row2) 667 else if (selection.end.row >= row1 && selection.end.row <= row2)
683 { 668 {
684 /* move selected region too */ 669 /* move selected region too */
685 selection.beg.row -= count; 670 selection.beg.row -= count;
686 selection.end.row -= count; 671 selection.end.row -= count;
687 selection.mark.row -= count; 672 selection.mark.row -= count;
… …
693 // use a simple and robust scrolling algorithm, this 678 // use a simple and robust scrolling algorithm, this
694 // part of scr_scroll_text is not time-critical. 679 // part of scr_scroll_text is not time-critical.
695 680
696 int rows = row2 - row1 + 1; 681 int rows = row2 - row1 + 1;
697 682
683 min_it (count, rows);
684
698 for (int row = 0; row < rows; row++) 685 for (int row = 0; row < rows; row++)
699 { 686 {
700 buf [row] = ROW(row1 + (row + count + rows) % rows); 687 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
701 688
702 if (!IN_RANGE_EXC (row + count, 0, rows)) 689 if (!IN_RANGE_EXC (row + count, 0, rows))
703 scr_blank_screen_mem (buf [row], rstyle); 690 scr_blank_screen_mem (temp_buf [row], rstyle);
704 } 691 }
705 692
706 for (int row = 0; row < rows; row++) 693 for (int row = 0; row < rows; row++)
707 ROW(row1 + row) = buf [row]; 694 ROW(row1 + row) = temp_buf [row];
708 } 695 }
709 696
710 return count; 697 return count;
711} 698}
712 699
713/* ------------------------------------------------------------------------- */ 700/* ------------------------------------------------------------------------- */
714/* 701/*
715 * Add text given in <str> of length <len> to screen struct 702 * Add text given in <str> of length <len> to screen struct
716 */ 703 */
717void 704void
718rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 705rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
719{ 706{
720 if (len <= 0) /* sanity */ 707 if (len <= 0) /* sanity */
721 return; 708 return;
722 709
723 unsigned char checksel; 710 unsigned char checksel;
724 unicode_t c; 711 unicode_t c;
725 int row, last_col; 712 int ncol = this->ncol;
726 const unicode_t *strend = str + len; 713 const wchar_t *strend = str + len;
727 714
728 want_refresh = 1; 715 want_refresh = 1;
729 ZERO_SCROLLBACK (); 716 ZERO_SCROLLBACK ();
730 last_col = ncol;
731 717
732 if (nlines > 0) 718 if (minlines > 0)
733 { 719 {
734 nlines += screen.cur.row - screen.bscroll; 720 minlines += screen.cur.row - screen.bscroll;
721
735 if ((nlines > 0) 722 if (minlines > 0
736 && (screen.tscroll == 0) 723 && screen.tscroll == 0
737 && (screen.bscroll == (nrow - 1))) 724 && screen.bscroll == nrow - 1)
738 { 725 {
739 /* _at least_ this many lines need to be scrolled */ 726 /* _at least_ this many lines need to be scrolled */
740 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 727 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
741 screen.cur.row -= nlines; 728 screen.cur.row -= minlines;
742 } 729 }
743 } 730 }
744 731
745#ifdef DEBUG_STRICT 732#ifdef DEBUG_STRICT
746 assert (screen.cur.col < last_col); 733 assert (screen.cur.col < ncol);
747 assert ((screen.cur.row < nrow) 734 assert (screen.cur.row < nrow
748 && (screen.cur.row >= - (int32_t)nsaved)); 735 && screen.cur.row >= -nsaved);
749#else /* drive with your eyes closed */
750 min_it (screen.cur.col, last_col - 1);
751 min_it (screen.cur.row, (int32_t)nrow - 1);
752 max_it (screen.cur.row, - (int32_t)nsaved);
753#endif 736#endif
754 row = screen.cur.row; 737 int row = screen.cur.row;
755 738
756 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 739 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
757 740
758 line_t *line = &ROW(row); 741 line_t *line = &ROW(row);
759 742
760 while (str < strend) 743 while (str < strend)
761 { 744 {
762 c = *str++; 745 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
763 746
764 if (c < 0x20) 747 if (c < 0x20)
765 if (c == C0_LF) 748 if (c == C0_LF)
766 { 749 {
767 if (!line->is_longer ()) /* XXX: think about this */
768 max_it (line->l, screen.cur.col); 750 max_it (line->l, screen.cur.col);
769 751
770 screen.flags &= ~Screen_WrapNext; 752 screen.flags &= ~Screen_WrapNext;
771 753
772 if (screen.cur.row == screen.bscroll) 754 if (screen.cur.row == screen.bscroll)
773 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 755 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
777 line = &ROW(row); /* _must_ refresh */ 759 line = &ROW(row); /* _must_ refresh */
778 continue; 760 continue;
779 } 761 }
780 else if (c == C0_CR) 762 else if (c == C0_CR)
781 { 763 {
782 if (!line->is_longer ()) /* XXX: think about this */
783 max_it (line->l, screen.cur.col); 764 max_it (line->l, screen.cur.col);
784 765
785 screen.flags &= ~Screen_WrapNext; 766 screen.flags &= ~Screen_WrapNext;
786 screen.cur.col = 0; 767 screen.cur.col = 0;
787 continue; 768 continue;
788 } 769 }
… …
805 CLEAR_SELECTION (); 786 CLEAR_SELECTION ();
806 } 787 }
807 788
808 if (screen.flags & Screen_WrapNext) 789 if (screen.flags & Screen_WrapNext)
809 { 790 {
791 max_it (line->l, ncol);
810 line->set_is_longer (); 792 line->is_longer (1);
811 793
812 scr_do_wrap (); 794 scr_do_wrap ();
813 795
814 row = screen.cur.row; 796 row = screen.cur.row;
815 line = &ROW(row); /* _must_ refresh */ 797 line = &ROW(row); /* _must_ refresh */
… …
823 // do wcwidth before further replacements, as wcwidth might return -1 805 // do wcwidth before further replacements, as wcwidth might return -1
824 // 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
825 // locale. 807 // locale.
826 int width = c < 0x100 ? 1 : wcwidth (c); 808 int width = c < 0x100 ? 1 : wcwidth (c);
827 809
828 if (charsets[screen.charset] == '0') // DEC SPECIAL 810 if (charsets [screen.charset] == '0') // DEC SPECIAL
829 { 811 {
830 // vt100 special graphics and line drawing 812 // vt100 special graphics and line drawing
831 // 5f-7e standard vt100 813 // 5f-7e standard vt100
832 // 40-5e rxvt extension for extra curses acs chars 814 // 40-5e rxvt extension for extra curses acs chars
833 static uint16_t vt100_0[62] = { // 41 .. 7e 815 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
885 } 867 }
886 868
887 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 869 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
888 870
889 // if the character doesn't fit into the remaining columns... 871 // if the character doesn't fit into the remaining columns...
890 if (screen.cur.col > last_col - width && last_col >= width) 872 if (screen.cur.col > ncol - width && ncol >= width)
891 { 873 {
892 // ...output spaces 874 // ...output spaces
893 c = ' '; 875 c = ' ';
894 // and try the same character next loop iteration 876 // and try the same character next loop iteration
895 --str; 877 --str;
896 } 878 }
897 879
880 line->touch ();
881
898 do 882 do
899 { 883 {
900 line->t[screen.cur.col] = c; 884 line->t[screen.cur.col] = c;
901 line->r[screen.cur.col] = rend; 885 line->r[screen.cur.col] = rend;
902 886
903 if (screen.cur.col < last_col - 1) 887 if (screen.cur.col < ncol - 1)
904 screen.cur.col++; 888 screen.cur.col++;
905 else 889 else
906 { 890 {
907 line->l = last_col; 891 line->l = ncol;
908 if (screen.flags & Screen_Autowrap) 892 if (screen.flags & Screen_Autowrap)
909 screen.flags |= Screen_WrapNext; 893 screen.flags |= Screen_WrapNext;
910 break; 894 break;
911 } 895 }
912 896
… …
914 } 898 }
915 while (--width > 0); 899 while (--width > 0);
916 900
917 // pad with spaces when overwriting wide character with smaller one 901 // pad with spaces when overwriting wide character with smaller one
918 if (!width) 902 if (!width)
903 {
904 line->touch ();
905
919 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++)
920 { 907 {
921 line->t[c] = ' '; 908 line->t[c] = ' ';
922 line->r[c] = rend; 909 line->r[c] = rend;
923 } 910 }
911 }
924 } 912 }
925 else // width == 0 913 else // width == 0
926 { 914 {
927#if ENABLE_COMBINING 915#if ENABLE_COMBINING
928 // handle combining characters 916 // handle combining characters
929 // we just tag the accent on the previous on-screen character. 917 // we just tag the accent on the previous on-screen character.
930 // this is arguably not correct, but also arguably not wrong. 918 // this is arguably not correct, but also arguably not wrong.
931 // we don't handle double-width characters nicely yet. 919 // we don't handle double-width characters nicely yet.
920 line_t *linep;
932 text_t *tp; 921 text_t *tp;
933 rend_t *rp; 922 rend_t *rp;
934 923
935 if (screen.cur.col > 0) 924 if (screen.cur.col > 0)
936 { 925 {
926 linep = line;
937 tp = line->t + screen.cur.col - 1; 927 tp = line->t + screen.cur.col - 1;
938 rp = line->r + screen.cur.col - 1; 928 rp = line->r + screen.cur.col - 1;
939
940 while (*tp == NOCHAR && tp > line->t)
941 tp--, rp--;
942 } 929 }
943 else if (screen.cur.row > 0 930 else if (screen.cur.row > 0
944 && ROW(screen.cur.row - 1).is_longer ()) 931 && ROW(screen.cur.row - 1).is_longer ())
945 { 932 {
946 line_t *line = &ROW(screen.cur.row - 1); 933 linep = &ROW(screen.cur.row - 1);
947
948 tp = line->t + last_col - 1; 934 tp = line->t + ncol - 1;
949 rp = line->r + last_col - 1; 935 rp = line->r + ncol - 1;
950
951 while (*tp == NOCHAR && tp > line->t)
952 tp--, rp--;
953 } 936 }
954 else 937 else
955 continue; 938 continue;
939
940 linep->touch ();
941
942 while (*tp == NOCHAR && tp > linep->t)
943 tp--, rp--;
956 944
957 // first try to find a precomposed character 945 // first try to find a precomposed character
958 unicode_t n = rxvt_compose (*tp, c); 946 unicode_t n = rxvt_compose (*tp, c);
959 if (n == NOCHAR) 947 if (n == NOCHAR)
960 n = rxvt_composite.compose (*tp, c); 948 n = rxvt_composite.compose (*tp, c);
… …
963 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
964#endif 952#endif
965 } 953 }
966 } 954 }
967 955
968 if (!line->is_longer ()) /* XXX: think about this */
969 max_it (line->l, screen.cur.col); 956 max_it (line->l, screen.cur.col);
970 957
971#ifdef DEBUG_STRICT 958#ifdef DEBUG_STRICT
972 assert (screen.cur.row >= 0); 959 assert (screen.cur.row >= 0);
973#else /* drive with your eyes closed */
974 max_it (screen.cur.row, 0);
975#endif 960#endif
976} 961}
977 962
978/* ------------------------------------------------------------------------- */ 963/* ------------------------------------------------------------------------- */
979/* 964/*
… …
1018 1003
1019 if (count == 0) 1004 if (count == 0)
1020 return; 1005 return;
1021 else if (count > 0) 1006 else if (count > 0)
1022 { 1007 {
1023 int row = screen.cur.row;
1024
1025 line_t &l = ROW(row); 1008 line_t &l = ROW(screen.cur.row);
1026 rend_t base_rend = l.r[i]; 1009 rend_t base_rend = l.r[i];
1027 ht &= l.t[i] == ' '; 1010 ht &= l.t[i] == ' ';
1028 1011
1029 for (; ++i < ncol; ) 1012 for (; ++i < ncol; )
1030 if (tabs[i]) 1013 if (tabs[i])
1031 { 1014 {
1032 x = i; 1015 x = i;
1016
1033 if (!--count) 1017 if (!--count)
1034 break; 1018 break;
1035 } 1019 }
1036 else 1020 else
1037 ht &= l.t[i] == ' ' 1021 ht &= l.t[i] == ' '
… …
1040 if (count) 1024 if (count)
1041 x = ncol - 1; 1025 x = ncol - 1;
1042 1026
1043 // store horizontal tab commands as characters inside the text 1027 // store horizontal tab commands as characters inside the text
1044 // buffer so they can be selected and pasted. 1028 // buffer so they can be selected and pasted.
1045 if (ht && options & Opt_pastableTabs) 1029 if (ht && OPTION (Opt_pastableTabs))
1046 { 1030 {
1047 base_rend = SET_FONT (base_rend, 0); 1031 base_rend = SET_FONT (base_rend, 0);
1048 1032
1049 if (!l.is_longer ()) /* XXX: think about this */ 1033 l.touch (x);
1050 max_it (l.l, x);
1051 1034
1052 i = screen.cur.col; 1035 i = screen.cur.col;
1053 1036
1054 l.t[i] = '\t'; 1037 l.t[i] = '\t';
1055 l.r[i] = base_rend; 1038 l.r[i] = base_rend;
… …
1105 */ 1088 */
1106#if ENABLE_FRILLS 1089#if ENABLE_FRILLS
1107void 1090void
1108rxvt_term::scr_forwardindex () 1091rxvt_term::scr_forwardindex ()
1109{ 1092{
1110 int row;
1111
1112 if (screen.cur.col < ncol - 1) 1093 if (screen.cur.col < ncol - 1)
1113 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1094 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1114 else 1095 else
1115 { 1096 {
1116 row = screen.cur.row; 1097 line_t &l = ROW(screen.cur.row);
1117 1098
1118 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1099 l.touch ();
1119 ROW(row).l = ncol; 1100 l.is_longer (0);
1120 1101
1121 scr_gotorc (0, 0, R_RELATIVE); 1102 scr_gotorc (0, 0, R_RELATIVE);
1122 scr_insdel_chars (1, DELETE); 1103 scr_insdel_chars (1, DELETE);
1123 scr_gotorc (0, ncol - 1, R_RELATIVE); 1104 scr_gotorc (0, ncol - 1, R_RELATIVE);
1124 } 1105 }
… …
1134{ 1115{
1135 want_refresh = 1; 1116 want_refresh = 1;
1136 ZERO_SCROLLBACK (); 1117 ZERO_SCROLLBACK ();
1137 1118
1138 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1119 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1139 max_it (screen.cur.col, 0);
1140 min_it (screen.cur.col, (int32_t)ncol - 1); 1120 clamp_it (screen.cur.col, 0, ncol - 1);
1141 1121
1142 screen.flags &= ~Screen_WrapNext; 1122 screen.flags &= ~Screen_WrapNext;
1143 1123
1144 if (relative & R_RELATIVE) 1124 if (relative & R_RELATIVE)
1145 { 1125 {
… …
1169 } 1149 }
1170 else 1150 else
1171 screen.cur.row = row; 1151 screen.cur.row = row;
1172 } 1152 }
1173 1153
1174 max_it (screen.cur.row, 0);
1175 min_it (screen.cur.row, (int32_t)nrow - 1); 1154 clamp_it (screen.cur.row, 0, nrow - 1);
1176} 1155}
1177 1156
1178/* ------------------------------------------------------------------------- */ 1157/* ------------------------------------------------------------------------- */
1179/* 1158/*
1180 * direction should be UP or DN 1159 * direction should be UP or DN
… …
1195 || (screen.cur.row == screen.tscroll && direction == DN)) 1174 || (screen.cur.row == screen.tscroll && direction == DN))
1196 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1175 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1197 else 1176 else
1198 screen.cur.row += dirn; 1177 screen.cur.row += dirn;
1199 1178
1200 max_it (screen.cur.row, 0);
1201 min_it (screen.cur.row, (int32_t)nrow - 1); 1179 clamp_it (screen.cur.row, 0, nrow - 1);
1202 selection_check (0); 1180 selection_check (0);
1203} 1181}
1204 1182
1205/* ------------------------------------------------------------------------- */ 1183/* ------------------------------------------------------------------------- */
1206/* 1184/*
… …
1210 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1211 */ 1189 */
1212void 1190void
1213rxvt_term::scr_erase_line (int mode) 1191rxvt_term::scr_erase_line (int mode)
1214{ 1192{
1215 unsigned int row, col, num; 1193 unsigned int col, num;
1216 1194
1217 want_refresh = 1; 1195 want_refresh = 1;
1218 ZERO_SCROLLBACK (); 1196 ZERO_SCROLLBACK ();
1219 1197
1220 selection_check (1); 1198 selection_check (1);
1221 1199
1222 row = screen.cur.row; 1200 line_t &line = ROW(screen.cur.row);
1201
1202 line.touch ();
1203 line.is_longer (0);
1223 1204
1224 switch (mode) 1205 switch (mode)
1225 { 1206 {
1226 case 0: /* erase to end of line */ 1207 case 0: /* erase to end of line */
1227 col = screen.cur.col; 1208 col = screen.cur.col;
1228 num = ncol - col; 1209 num = ncol - col;
1229 min_it (ROW(row).l, (int16_t)col); 1210 min_it (line.l, col);
1230 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1211 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1231 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1212 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1232 CLEAR_SELECTION (); 1213 CLEAR_SELECTION ();
1233 break; 1214 break;
1234 case 1: /* erase to beginning of line */ 1215 case 1: /* erase to beginning of line */
… …
1239 CLEAR_SELECTION (); 1220 CLEAR_SELECTION ();
1240 break; 1221 break;
1241 case 2: /* erase whole line */ 1222 case 2: /* erase whole line */
1242 col = 0; 1223 col = 0;
1243 num = ncol; 1224 num = ncol;
1244 ROW(row).l = 0; 1225 line.l = 0;
1245 if (selection.beg.row <= screen.cur.row 1226 if (selection.beg.row <= screen.cur.row
1246 && selection.end.row >= screen.cur.row) 1227 && selection.end.row >= screen.cur.row)
1247 CLEAR_SELECTION (); 1228 CLEAR_SELECTION ();
1248 break; 1229 break;
1249 default: 1230 default:
1250 return; 1231 return;
1251 } 1232 }
1252 1233
1253 scr_blank_line (ROW(row), col, num, rstyle); 1234 scr_blank_line (line, col, num, rstyle);
1254} 1235}
1255 1236
1256/* ------------------------------------------------------------------------- */ 1237/* ------------------------------------------------------------------------- */
1257/* 1238/*
1258 * Erase part of whole of the screen 1239 * Erase part of whole of the screen
… …
1301 CLEAR_SELECTION (); 1282 CLEAR_SELECTION ();
1302 1283
1303 if (row >= nrow) /* Out Of Bounds */ 1284 if (row >= nrow) /* Out Of Bounds */
1304 return; 1285 return;
1305 1286
1306 min_it (num, (nrow - row)); 1287 min_it (num, nrow - row);
1307 1288
1308 if (rstyle & (RS_RVid | RS_Uline)) 1289 if (rstyle & (RS_RVid | RS_Uline))
1309 ren = (rend_t) ~RS_None; 1290 ren = (rend_t) ~RS_None;
1310 else if (GET_BASEBG (rstyle) == Color_bg) 1291 else if (GET_BASEBG (rstyle) == Color_bg)
1311 { 1292 {
… …
1313 CLEAR_ROWS (row, num); 1294 CLEAR_ROWS (row, num);
1314 } 1295 }
1315 else 1296 else
1316 { 1297 {
1317 ren = rstyle & (RS_fgMask | RS_bgMask); 1298 ren = rstyle & (RS_fgMask | RS_bgMask);
1318 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1299 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1319 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1300 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1320 ERASE_ROWS (row, num); 1301 ERASE_ROWS (row, num);
1321 gcvalue.foreground = pix_colors[Color_fg]; 1302 gcvalue.foreground = pix_colors[Color_fg];
1322 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1303 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1323 } 1304 }
1324 1305
1325 for (; num--; row++) 1306 for (; num--; row++)
1326 { 1307 {
1327 scr_blank_screen_mem (ROW (row), rstyle); 1308 scr_blank_screen_mem (ROW(row), rstyle);
1328 ROW (row).l = 0;
1329 scr_blank_line (drawn[row], 0, ncol, ren); 1309 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1330 } 1310 }
1331} 1311}
1332 1312
1333#if ENABLE_FRILLS 1313#if ENABLE_FRILLS
1334void 1314void
… …
1366 rend_t *r1 = line.r; 1346 rend_t *r1 = line.r;
1367 1347
1368 for (int j = ncol; j--; ) 1348 for (int j = ncol; j--; )
1369 *r1++ = fs; 1349 *r1++ = fs;
1370 1350
1371 line.l = ncol; /* make the `E's selectable */ 1351 line.is_longer (0);
1352 line.touch (ncol);
1372 } 1353 }
1373} 1354}
1374 1355
1375/* ------------------------------------------------------------------------- */ 1356/* ------------------------------------------------------------------------- */
1376/* 1357/*
… …
1419 return; 1400 return;
1420 1401
1421 scr_do_wrap (); 1402 scr_do_wrap ();
1422 1403
1423 selection_check (1); 1404 selection_check (1);
1424 min_it (count, (ncol - screen.cur.col)); 1405 min_it (count, ncol - screen.cur.col);
1425 1406
1426 row = screen.cur.row; 1407 row = screen.cur.row;
1427 1408
1428 line_t *line = &ROW(row); 1409 line_t *line = &ROW(row);
1410
1411 line->touch ();
1412 line->is_longer (0);
1429 1413
1430 switch (insdel) 1414 switch (insdel)
1431 { 1415 {
1432 case INSERT: 1416 case INSERT:
1433 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1417 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1434 { 1418 {
1435 line->t[col] = line->t[col - count]; 1419 line->t[col] = line->t[col - count];
1436 line->r[col] = line->r[col - count]; 1420 line->r[col] = line->r[col - count];
1437 } 1421 }
1438 1422
1439 if (!line->is_longer ()) 1423 line->l = min (line->l + count, ncol);
1440 {
1441 line->l += count;
1442 min_it (line->l, ncol);
1443 }
1444 1424
1445 if (selection.op && current_screen == selection.screen 1425 if (selection.op && current_screen == selection.screen
1446 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1426 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1447 { 1427 {
1448 if (selection.end.row != screen.cur.row 1428 if (selection.end.row != screen.cur.row
… …
1461 1441
1462 case ERASE: 1442 case ERASE:
1463 screen.cur.col += count; /* don't worry if > ncol */ 1443 screen.cur.col += count; /* don't worry if > ncol */
1464 selection_check (1); 1444 selection_check (1);
1465 screen.cur.col -= count; 1445 screen.cur.col -= count;
1446
1447 line->l = max (line->l - count, 0);
1466 scr_blank_line (*line, screen.cur.col, count, rstyle); 1448 scr_blank_line (*line, screen.cur.col, count, rstyle);
1467 break; 1449 break;
1468 1450
1469 case DELETE: 1451 case DELETE:
1470 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1452 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1473 { 1455 {
1474 line->t[col] = line->t[col + count]; 1456 line->t[col] = line->t[col + count];
1475 line->r[col] = line->r[col + count]; 1457 line->r[col] = line->r[col + count];
1476 } 1458 }
1477 1459
1460 line->l = max (line->l - count, 0);
1478 scr_blank_line (*line, ncol - count, count, tr); 1461 scr_blank_line (*line, ncol - count, count, tr);
1479
1480 if (line->is_longer ()) /* break line continuation */
1481 line->l = ncol;
1482
1483 max_it (line->l - count, 0);
1484 1462
1485 if (selection.op && current_screen == selection.screen 1463 if (selection.op && current_screen == selection.screen
1486 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1464 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1487 { 1465 {
1488 if (selection.end.row != screen.cur.row 1466 if (selection.end.row != screen.cur.row
… …
1509 */ 1487 */
1510void 1488void
1511rxvt_term::scr_scroll_region (int top, int bot) 1489rxvt_term::scr_scroll_region (int top, int bot)
1512{ 1490{
1513 max_it (top, 0); 1491 max_it (top, 0);
1514 min_it (bot, (int)nrow - 1); 1492 min_it (bot, nrow - 1);
1515 1493
1516 if (top > bot) 1494 if (top > bot)
1517 return; 1495 return;
1518 1496
1519 screen.tscroll = top; 1497 screen.tscroll = top;
… …
1600rxvt_term::scr_set_tab (int mode) 1578rxvt_term::scr_set_tab (int mode)
1601{ 1579{
1602 if (mode < 0) 1580 if (mode < 0)
1603 memset (tabs, 0, ncol * sizeof (char)); 1581 memset (tabs, 0, ncol * sizeof (char));
1604 else if (screen.cur.col < ncol) 1582 else if (screen.cur.col < ncol)
1605 tabs[screen.cur.col] = (mode ? 1 : 0); 1583 tabs [screen.cur.col] = !!mode;
1606} 1584}
1607 1585
1608/* ------------------------------------------------------------------------- */ 1586/* ------------------------------------------------------------------------- */
1609/* 1587/*
1610 * Set reverse/normal video 1588 * Set reverse/normal video
… …
1622 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1600 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1623#if XPM_BACKGROUND 1601#if XPM_BACKGROUND
1624 if (bgPixmap.pixmap == None) 1602 if (bgPixmap.pixmap == None)
1625#endif 1603#endif
1626#if TRANSPARENT 1604#if TRANSPARENT
1627 if (! (options & Opt_transparent) || am_transparent == 0) 1605 if (! OPTION (Opt_transparent) || am_transparent == 0)
1628#endif 1606#endif
1629 XSetWindowBackground (display->display, vt, 1607 XSetWindowBackground (display->display, vt,
1630 pix_colors[Color_bg]); 1608 pix_colors[Color_bg]);
1631 1609
1632 gcvalue.foreground = pix_colors[Color_fg]; 1610 gcvalue.foreground = pix_colors[Color_fg];
… …
1657 * Set font style 1635 * Set font style
1658 */ 1636 */
1659void 1637void
1660rxvt_term::set_font_style () 1638rxvt_term::set_font_style ()
1661{ 1639{
1640#if 0
1662 switch (charsets[screen.charset]) 1641 switch (charsets [screen.charset])
1663 { 1642 {
1664 case '0': /* DEC Special Character & Line Drawing Set */ 1643 case '0': /* DEC Special Character & Line Drawing Set */
1665 break; 1644 break;
1666 case 'A': /* United Kingdom (UK) */ 1645 case 'A': /* United Kingdom (UK) */
1667 break; 1646 break;
… …
1674 case 'C': /* Finnish character set */ 1653 case 'C': /* Finnish character set */
1675 break; 1654 break;
1676 case 'K': /* German character set */ 1655 case 'K': /* German character set */
1677 break; 1656 break;
1678 } 1657 }
1658#endif
1679} 1659}
1680 1660
1681/* ------------------------------------------------------------------------- */ 1661/* ------------------------------------------------------------------------- */
1682/* 1662/*
1683 * Choose a font 1663 * Choose a font
… …
1723 bool found = false; 1703 bool found = false;
1724 1704
1725 for (int i = 0; i < nrow; i++) 1705 for (int i = 0; i < nrow; i++)
1726 { 1706 {
1727 int col = 0; 1707 int col = 0;
1728 rend_t *drp = drawn[i].r; 1708 rend_t *drp = drawn_buf[i].r;
1729 1709
1730 for (; col < ncol; col++, drp++) 1710 for (; col < ncol; col++, drp++)
1731 if ((*drp & mask) == value) 1711 if ((*drp & mask) == value)
1732 { 1712 {
1733 found = true; 1713 found = true;
… …
1751rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1731rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1752{ 1732{
1753 int i; 1733 int i;
1754 row_col_t rc[RC_COUNT]; 1734 row_col_t rc[RC_COUNT];
1755 1735
1756 if (!drawn) /* sanity check */ 1736 if (!drawn_buf) /* sanity check */
1757 return; 1737 return;
1758 1738
1759#ifndef NO_SLOW_LINK_SUPPORT 1739#ifndef NO_SLOW_LINK_SUPPORT
1760 if (refresh_type == FAST_REFRESH && !display->is_local) 1740 if (refresh_type == FAST_REFRESH && !display->is_local)
1761 { 1741 {
1762 y = 0; 1742 y = 0;
1763 eheight = height; 1743 eheight = height;
1764 } 1744 }
1765#endif
1766
1767#ifdef DEBUG_STRICT
1768#if 0
1769 // that's not debugging //TODO //FIXME
1770 clamp_it (x, 0, width);
1771 clamp_it (y, 0, height);
1772#endif
1773#endif 1745#endif
1774 1746
1775 /* round down */ 1747 /* round down */
1776 rc[PART_BEG].col = Pixel2Col (x); 1748 rc[PART_BEG].col = Pixel2Col (x);
1777 rc[PART_BEG].row = Pixel2Row (y); 1749 rc[PART_BEG].row = Pixel2Row (y);
… …
1785 min_it (rc[i].col, ncol - 1); 1757 min_it (rc[i].col, ncol - 1);
1786 min_it (rc[i].row, nrow - 1); 1758 min_it (rc[i].row, nrow - 1);
1787 } 1759 }
1788 1760
1789 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1761 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1790 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1762 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1791 1763
1792 if (refresh) 1764 if (refresh)
1793 scr_refresh (SLOW_REFRESH); 1765 scr_refresh (SLOW_REFRESH);
1794} 1766}
1795 1767
… …
1858int 1830int
1859rxvt_term::scr_changeview (unsigned int oldviewstart) 1831rxvt_term::scr_changeview (unsigned int oldviewstart)
1860{ 1832{
1861 if (view_start != oldviewstart) 1833 if (view_start != oldviewstart)
1862 { 1834 {
1835 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1836
1863 want_refresh = 1; 1837 want_refresh = 1;
1864 num_scr -= (view_start - oldviewstart); 1838 num_scr -= (view_start - oldviewstart);
1865 } 1839 }
1866 1840
1867 return (int) (view_start - oldviewstart); 1841 return (int)view_start - (int)oldviewstart;
1868} 1842}
1869 1843
1870/* ------------------------------------------------------------------------- */ 1844/* ------------------------------------------------------------------------- */
1871void 1845void
1872rxvt_term::scr_bell () 1846rxvt_term::scr_bell ()
1873{ 1847{
1874#ifndef NO_BELL 1848#ifndef NO_BELL
1875 1849
1876# ifndef NO_MAPALERT 1850# ifndef NO_MAPALERT
1877# ifdef MAPALERT_OPTION 1851# ifdef MAPALERT_OPTION
1878 if (options & Opt_mapAlert) 1852 if (OPTION (Opt_mapAlert))
1879# endif 1853# endif
1880 XMapWindow (display->display, parent[0]); 1854 XMapWindow (display->display, parent[0]);
1881# endif 1855# endif
1882 1856
1883 if (options & Opt_visualBell) 1857 if (OPTION (Opt_visualBell))
1884 { 1858 {
1885 scr_rvideo_mode (!rvideo); /* refresh also done */ 1859 scr_rvideo_mode (!rvideo); /* refresh also done */
1886 rxvt_usleep (VISUAL_BELL_DURATION); 1860 rxvt_usleep (VISUAL_BELL_DURATION);
1887 scr_rvideo_mode (!rvideo); /* refresh also done */ 1861 scr_rvideo_mode (!rvideo); /* refresh also done */
1888 } 1862 }
… …
1979 1953
1980#if XPM_BACKGROUND 1954#if XPM_BACKGROUND
1981 must_clear |= bgPixmap.pixmap != None; 1955 must_clear |= bgPixmap.pixmap != None;
1982#endif 1956#endif
1983#if TRANSPARENT 1957#if TRANSPARENT
1984 must_clear |= (options & Opt_transparent) && am_transparent; 1958 must_clear |= OPTION (Opt_transparent) && am_transparent;
1985#endif 1959#endif
1986 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1960 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1987 1961
1988 /* 1962 /*
1989 * B: reverse any characters which are selected 1963 * B: reverse any characters which are selected
… …
2013 1987
2014 crp = &ROW(screen.cur.row).r[col]; 1988 crp = &ROW(screen.cur.row).r[col];
2015 1989
2016 if (showcursor && focus) 1990 if (showcursor && focus)
2017 { 1991 {
2018 if (options & Opt_cursorUnderline) 1992 if (OPTION (Opt_cursorUnderline))
2019 *crp ^= RS_Uline; 1993 *crp ^= RS_Uline;
2020 else 1994 else
2021 { 1995 {
2022 *crp ^= RS_RVid; 1996 *crp ^= RS_RVid;
2023 1997
… …
2025 cc1 = *crp & (RS_fgMask | RS_bgMask); 1999 cc1 = *crp & (RS_fgMask | RS_bgMask);
2026 if (ISSET_PIXCOLOR (Color_cursor)) 2000 if (ISSET_PIXCOLOR (Color_cursor))
2027 ccol1 = Color_cursor; 2001 ccol1 = Color_cursor;
2028 else 2002 else
2029#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2003#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2030 ccol1 = GET_FGCOLOR (rstyle); 2004 ccol1 = fgcolor_of (rstyle);
2031#else 2005#else
2032 ccol1 = Color_fg; 2006 ccol1 = Color_fg;
2033#endif 2007#endif
2034 if (ISSET_PIXCOLOR (Color_cursor2)) 2008 if (ISSET_PIXCOLOR (Color_cursor2))
2035 ccol2 = Color_cursor2; 2009 ccol2 = Color_cursor2;
2036 else 2010 else
2037#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2011#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2038 ccol2 = GET_BGCOLOR (rstyle); 2012 ccol2 = bgcolor_of (rstyle);
2039#else 2013#else
2040 ccol2 = Color_bg; 2014 ccol2 = Color_bg;
2041#endif 2015#endif
2042 *crp = SET_FGCOLOR (*crp, ccol1); 2016 *crp = SET_FGCOLOR (*crp, ccol1);
2043 *crp = SET_BGCOLOR (*crp, ccol2); 2017 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2053 if (screen.cur.row + view_start != ocrow 2027 if (screen.cur.row + view_start != ocrow
2054 || screen.cur.col != oldcursor.col) 2028 || screen.cur.col != oldcursor.col)
2055 { 2029 {
2056 if (ocrow < nrow 2030 if (ocrow < nrow
2057 && oldcursor.col < ncol) 2031 && oldcursor.col < ncol)
2058 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2032 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2059 2033
2060 if (focus || !showcursor) 2034 if (focus || !showcursor)
2061 oldcursor.row = -1; 2035 oldcursor.row = -1;
2062 else 2036 else
2063 setoldcursor = 1; 2037 setoldcursor = 1;
… …
2076 oldcursor.col = screen.cur.col; 2050 oldcursor.col = screen.cur.col;
2077 } 2051 }
2078 } 2052 }
2079 } 2053 }
2080 2054
2055 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2081#if ENABLE_OVERLAY 2056#if ENABLE_OVERLAY
2082 scr_swap_overlay (); 2057 scr_swap_overlay ();
2083#endif 2058#endif
2084 2059
2085#ifndef NO_SLOW_LINK_SUPPORT 2060#ifndef NO_SLOW_LINK_SUPPORT
… …
2102 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2077 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2103 { 2078 {
2104 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2079 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2105 { 2080 {
2106 line_t s = ROW(row - view_start); 2081 line_t s = ROW(row - view_start);
2107 line_t d = drawn[row]; 2082 line_t d = drawn_buf[row];
2108 line_t d2 = drawn[row + i]; 2083 line_t d2 = drawn_buf[row + i];
2109 2084
2110 for (nits = 0, col = ncol; col--; ) 2085 for (nits = 0, col = ncol; col--; )
2111 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2086 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2112 nits--; 2087 nits--;
2113 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2088 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2135 if (wlen < len) 2110 if (wlen < len)
2136 ::swap (wlen, len); 2111 ::swap (wlen, len);
2137 2112
2138 XCopyArea (display->display, vt, vt, 2113 XCopyArea (display->display, vt, vt,
2139 gc, 0, Row2Pixel (len + i), 2114 gc, 0, Row2Pixel (len + i),
2140 (unsigned int)TermWin_TotalWidth (), 2115 (unsigned int)this->width,
2141 (unsigned int)Height2Pixel (wlen - len + 1), 2116 (unsigned int)Height2Pixel (wlen - len + 1),
2142 0, Row2Pixel (len)); 2117 0, Row2Pixel (len));
2143 len = -1; 2118 len = -1;
2144 } 2119 }
2145 } 2120 }
… …
2151 */ 2126 */
2152 for (row = 0; row < nrow; row++) 2127 for (row = 0; row < nrow; row++)
2153 { 2128 {
2154 text_t *stp = ROW(row - view_start).t; 2129 text_t *stp = ROW(row - view_start).t;
2155 rend_t *srp = ROW(row - view_start).r; 2130 rend_t *srp = ROW(row - view_start).r;
2156 text_t *dtp = drawn[row].t; 2131 text_t *dtp = drawn_buf[row].t;
2157 rend_t *drp = drawn[row].r; 2132 rend_t *drp = drawn_buf[row].r;
2158 2133
2159 /* 2134 /*
2160 * E2: OK, now the real pass 2135 * E2: OK, now the real pass
2161 */ 2136 */
2162 int ypixel = (int)Row2Pixel (row); 2137 int ypixel = (int)Row2Pixel (row);
… …
2224 count++, i--; 2199 count++, i--;
2225 2200
2226 /* 2201 /*
2227 * Determine the attributes for the string 2202 * Determine the attributes for the string
2228 */ 2203 */
2229 int fore = GET_FGCOLOR (rend); // desired foreground 2204 int fore = fgcolor_of (rend); // desired foreground
2230 int back = GET_BGCOLOR (rend); // desired background 2205 int back = bgcolor_of (rend); // desired background
2231 2206
2232 // only do special processing if any attributes are set, which is rare 2207 // only do special processing if any attributes are set, which is unlikely
2233 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2208 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2234 { 2209 {
2235#if ENABLE_STYLES 2210#if ENABLE_STYLES
2236 // force redraw after "careful" characters to avoid pixel droppings 2211 // force redraw after "careful" characters to avoid pixel droppings
2237 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2212 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2348 } /* for (row....) */ 2323 } /* for (row....) */
2349 2324
2350#if ENABLE_OVERLAY 2325#if ENABLE_OVERLAY
2351 scr_swap_overlay (); 2326 scr_swap_overlay ();
2352#endif 2327#endif
2328 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2353 2329
2354 /* 2330 /*
2355 * G: cleanup cursor and display outline cursor if necessary 2331 * G: cleanup cursor and display outline cursor if necessary
2356 */ 2332 */
2357 if (showcursor) 2333 if (showcursor)
2358 { 2334 {
2359 if (focus) 2335 if (focus)
2360 { 2336 {
2361 if (options & Opt_cursorUnderline) 2337 if (OPTION (Opt_cursorUnderline))
2362 *crp ^= RS_Uline; 2338 *crp ^= RS_Uline;
2363 else 2339 else
2364 { 2340 {
2365 *crp ^= RS_RVid; 2341 *crp ^= RS_RVid;
2366#ifndef NO_CURSORCOLOR 2342#ifndef NO_CURSORCOLOR
… …
2375 2351
2376 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2352 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2377 col--; 2353 col--;
2378 2354
2379 while (col + cursorwidth < ncol 2355 while (col + cursorwidth < ncol
2380 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2356 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2381 cursorwidth++; 2357 cursorwidth++;
2382 2358
2383#ifndef NO_CURSORCOLOR 2359#ifndef NO_CURSORCOLOR
2384 if (ISSET_PIXCOLOR (Color_cursor)) 2360 if (ISSET_PIXCOLOR (Color_cursor))
2385 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2361 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2404 num_scr = 0; 2380 num_scr = 0;
2405 num_scr_allow = 1; 2381 num_scr_allow = 1;
2406} 2382}
2407 2383
2408void 2384void
2409rxvt_term::scr_remap_chars (const line_t &l) 2385rxvt_term::scr_remap_chars (line_t &l)
2410{ 2386{
2411 if (!l.t) 2387 if (!l.t)
2412 return; 2388 return;
2413 2389
2390 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2391
2414 for (int i = ncol; i--; ) 2392 for (int i = ncol; i--; )
2415 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2393 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2416} 2394}
2417 2395
2418void 2396void
2419rxvt_term::scr_remap_chars () 2397rxvt_term::scr_remap_chars ()
2420{ 2398{
2421 for (int i = total_rows; i--; ) 2399 for (int i = total_rows; i--; )
2422 scr_remap_chars (save[i]); 2400 scr_remap_chars (row_buf [i]);
2423 2401
2424 for (int i = nrow; i--; ) 2402 for (int i = nrow; i--; )
2425 { 2403 {
2426 scr_remap_chars (drawn[i]); 2404 scr_remap_chars (drawn_buf [i]);
2427 scr_remap_chars (swap_save[i]); 2405 scr_remap_chars (swap_buf [i]);
2428 } 2406 }
2429} 2407}
2430 2408
2431void 2409void
2432rxvt_term::scr_recolour () 2410rxvt_term::scr_recolour ()
… …
2485 2463
2486#if ENABLE_FRILLS 2464#if ENABLE_FRILLS
2487 if (selection.rect) 2465 if (selection.rect)
2488 { 2466 {
2489 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2467 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2468 {
2469 text_t *stp = ROW(row).t;
2470 rend_t *srp = ROW(row).r;
2471
2490 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2472 for (col = selection.beg.col; col < selection.end.col; col++)
2491 srp[col] ^= RS_RVid; 2473 srp[col] ^= RS_RVid;
2474
2475 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2476 srp[col] ^= RS_RVid | RS_Uline;
2477
2478 if (++col < selection.end.col)
2479 srp[col] ^= RS_RVid | RS_Uline;
2480 }
2492 } 2481 }
2493 else 2482 else
2494#endif 2483#endif
2495 { 2484 {
2496 if (selection.beg.row >= -view_start) 2485 if (selection.beg.row >= -view_start)
… …
2499 row = selection.beg.row; 2488 row = selection.beg.row;
2500 } 2489 }
2501 else 2490 else
2502 { 2491 {
2503 col = 0; 2492 col = 0;
2504 row = view_start; 2493 row = -view_start;
2505 } 2494 }
2506 2495
2507 for (; row < min (selection.end.row, view_end); row++, col = 0) 2496 for (; row < min (selection.end.row, view_end); row++, col = 0)
2508 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2497 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2509 srp[col] ^= RS_RVid; 2498 srp[col] ^= RS_RVid;
… …
2529 char r1[] = "\n"; 2518 char r1[] = "\n";
2530 2519
2531 for (row = saveLines - nsaved; 2520 for (row = saveLines - nsaved;
2532 row < saveLines + nrow - 1; row++) 2521 row < saveLines + nrow - 1; row++)
2533 { 2522 {
2534 width = save[row].l >= 0 ? save[row].l 2523 width = row_buf[row].l >= 0 ? row_buf[row].l
2535 : ncol; 2524 : ncol;
2536 for (towrite = width; towrite; towrite -= wrote) 2525 for (towrite = width; towrite; towrite -= wrote)
2537 { 2526 {
2538 wrote = write (fd, & (save[row].t[width - towrite]), 2527 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2539 towrite); 2528 towrite);
2540 if (wrote < 0) 2529 if (wrote < 0)
2541 return; /* XXX: death, no report */ 2530 return; /* XXX: death, no report */
2542 } 2531 }
2543 if (save[row].l >= 0) 2532 if (row_buf[row].l >= 0)
2544 if (write (fd, r1, 1) <= 0) 2533 if (write (fd, r1, 1) <= 0)
2545 return; /* XXX: death, no report */ 2534 return; /* XXX: death, no report */
2546 } 2535 }
2547} 2536}
2548#endif 2537#endif
… …
2580/* ------------------------------------------------------------------------- */ 2569/* ------------------------------------------------------------------------- */
2581/* 2570/*
2582 * Paste a selection direct to the command fd 2571 * Paste a selection direct to the command fd
2583 */ 2572 */
2584void 2573void
2585rxvt_term::paste (unsigned char *data, unsigned int len) 2574rxvt_term::paste (char *data, unsigned int len)
2586{ 2575{
2587 /* convert normal newline chars into common keyboard Return key sequence */ 2576 /* convert normal newline chars into common keyboard Return key sequence */
2588 for (unsigned int i = 0; i < len; i++) 2577 for (unsigned int i = 0; i < len; i++)
2589 if (data[i] == C0_LF) 2578 if (data[i] == C0_LF)
2590 data[i] = C0_CR; 2579 data[i] = C0_CR;
… …
2734 { 2723 {
2735 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2724 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2736 char *s = rxvt_wcstombs (w); 2725 char *s = rxvt_wcstombs (w);
2737 free (w); 2726 free (w);
2738 // TODO: strlen == only the first element will be converted. well... 2727 // TODO: strlen == only the first element will be converted. well...
2739 paste ((unsigned char *)s, strlen (s)); 2728 paste (s, strlen (s));
2740 free (s); 2729 free (s);
2741 } 2730 }
2742 else 2731 else
2743#endif 2732#endif
2744 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2733 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2745 && cl) 2734 && cl)
2746 { 2735 {
2747 for (int i = 0; i < cr; i++) 2736 for (int i = 0; i < cr; i++)
2748 paste ((unsigned char *)cl[i], strlen (cl[i])); 2737 paste (cl[i], strlen (cl[i]));
2749 2738
2750 XFreeStringList (cl); 2739 XFreeStringList (cl);
2751 } 2740 }
2752 else 2741 else
2753 paste (ct.value, ct.nitems); // paste raw 2742 paste ((char *)ct.value, ct.nitems); // paste raw
2754 2743
2755bailout: 2744bailout:
2756 XFree (ct.value); 2745 XFree (ct.value);
2757 2746
2758 if (selection_wait == Sel_normal) 2747 if (selection_wait == Sel_normal)
… …
2796 return; /* outside window */ 2785 return; /* outside window */
2797 2786
2798 if (selection.text) 2787 if (selection.text)
2799 { /* internal selection */ 2788 { /* internal selection */
2800 char *str = rxvt_wcstombs (selection.text, selection.len); 2789 char *str = rxvt_wcstombs (selection.text, selection.len);
2801 paste ((unsigned char *)str, strlen (str)); 2790 paste (str, strlen (str));
2802 free (str); 2791 free (str);
2803 return; 2792 return;
2804 } 2793 }
2805 else 2794 else
2806 { 2795 {
… …
2898 selection.op = SELECTION_DONE; 2887 selection.op = SELECTION_DONE;
2899 2888
2900 if (selection.clicks == 4) 2889 if (selection.clicks == 4)
2901 return; /* nothing selected, go away */ 2890 return; /* nothing selected, go away */
2902 2891
2892 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2893 return;
2894
2903 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2895 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2904 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2896 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2905 2897
2906 int ofs = 0; 2898 int ofs = 0;
2907 int extra = 0; 2899 int extra = 0;
… …
2919 col = selection.beg.col; 2911 col = selection.beg.col;
2920 end_col = ncol + 1; 2912 end_col = ncol + 1;
2921 } 2913 }
2922 else 2914 else
2923#endif 2915#endif
2924 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2916 end_col = ROW(row).l;
2925 2917
2926 col = max (col, 0); 2918 col = max (col, 0);
2927 2919
2928 if (row == selection.end.row || selection.rect) 2920 if (row == selection.end.row
2921#if ENABLE_FRILLS
2922 || selection.rect
2923#endif
2924 )
2929 end_col = min (end_col, selection.end.col); 2925 min_it (end_col, selection.end.col);
2930 2926
2931 t = ROW(row).t + col; 2927 t = ROW(row).t + col;
2928
2932 for (; col < end_col; col++) 2929 for (; col < end_col; col++)
2933 { 2930 {
2934 if (*t == NOCHAR) 2931 if (*t == NOCHAR)
2935 t++; 2932 t++;
2936#if ENABLE_COMBINING 2933#if ENABLE_COMBINING
… …
2952#endif 2949#endif
2953 else 2950 else
2954 new_selection_text[ofs++] = *t++; 2951 new_selection_text[ofs++] = *t++;
2955 } 2952 }
2956 2953
2954#if ENABLE_FRILLS
2955 if (selection.rect)
2956 {
2957 while (ofs
2958 && new_selection_text[ofs - 1] != C0_LF
2959 && unicode::is_space (new_selection_text[ofs - 1]))
2960 --ofs;
2961
2962 new_selection_text[ofs++] = C0_LF;
2963 }
2964 else
2965#endif
2957 if (!ROW(row).is_longer () && row != selection.end.row) 2966 if (!ROW(row).is_longer () && row != selection.end.row)
2958 new_selection_text[ofs++] = C0_LF; 2967 new_selection_text[ofs++] = C0_LF;
2959 } 2968 }
2960 2969
2961 if (end_col != selection.end.col) 2970 if (end_col != selection.end.col)
2962 new_selection_text[ofs++] = C0_LF; 2971 new_selection_text[ofs++] = C0_LF;
2963 2972
… …
2973 2982
2974 // we usually allocate much more than necessary, so realloc it smaller again 2983 // we usually allocate much more than necessary, so realloc it smaller again
2975 selection.len = ofs; 2984 selection.len = ofs;
2976 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2985 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2977 2986
2987 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2988 return;
2989
2990 selection_grab (tm);
2991}
2992
2993bool
2994rxvt_term::selection_grab (Time tm)
2995{
2996 selection_time = tm;
2997
2978 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 2998 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2979 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 2999 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3000 {
2980 display->set_selection_owner (this); 3001 display->set_selection_owner (this);
3002 return true;
3003 }
2981 else 3004 else
2982 rxvt_warn ("can't get primary selection, ignoring.\n"); 3005 return false;
2983 3006
2984#if 0 3007#if 0
2985 XTextProperty ct; 3008 XTextProperty ct;
2986 3009
2987 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3010 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2988 { 3011 {
2989 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3012 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2990 XFree (ct.value); 3013 XFree (ct.value);
2991 } 3014 }
2992#endif 3015#endif
2993
2994 selection_time = tm;
2995} 3016}
2996 3017
2997/* ------------------------------------------------------------------------- */ 3018/* ------------------------------------------------------------------------- */
2998/* 3019/*
2999 * Mark or select text based upon number of clicks: 1, 2, or 3 3020 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3121 } 3142 }
3122 } 3143 }
3123 break; 3144 break;
3124 } 3145 }
3125 3146
3126Old_Word_Selection_You_Die:
3127 if (dirn == DN) 3147 if (dirn == DN)
3128 col++; /* put us on one past the end */ 3148 col++; /* put us on one past the end */
3129 3149
3130 /* Poke the values back in */ 3150 /* Poke the values back in */
3131 ret->row = row; 3151 ret->row = row;
… …
3308 else if (selection.clicks == 2) 3328 else if (selection.clicks == 2)
3309 { 3329 {
3310 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3330 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3311 selection.end.col--; 3331 selection.end.col--;
3312 3332
3333 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3334 {
3313 selection_delimit_word (UP, &selection.beg, &selection.beg); 3335 selection_delimit_word (UP, &selection.beg, &selection.beg);
3314 selection_delimit_word (DN, &selection.end, &selection.end); 3336 selection_delimit_word (DN, &selection.end, &selection.end);
3337 }
3315 } 3338 }
3316 else if (selection.clicks == 3) 3339 else if (selection.clicks == 3)
3317 { 3340 {
3318#if ENABLE_FRILLS 3341#if ENABLE_FRILLS
3319 if (options & Opt_tripleclickwords) 3342 if (OPTION (Opt_tripleclickwords))
3320 { 3343 {
3321 selection_delimit_word (UP, &selection.beg, &selection.beg); 3344 selection_delimit_word (UP, &selection.beg, &selection.beg);
3322 3345
3323 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3346 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3324 { 3347 {
… …
3385 { 3408 {
3386 stp = ROW(end_row).t; 3409 stp = ROW(end_row).t;
3387 3410
3388 while (--end_col >= 0) 3411 while (--end_col >= 0)
3389 { 3412 {
3390 if (stp[end_col] != ' ' 3413 if (stp[end_col] != NOCHAR
3391 && stp[end_col] != '\t' 3414 && !unicode::is_space (stp[end_col]))
3392 && stp[end_col] != NOCHAR)
3393 break; 3415 break;
3394 } 3416 }
3395 3417
3396 if (end_col >= 0 3418 if (end_col >= 0
3397 || !ROW(end_row - 1).is_longer ()) 3419 || !ROW(end_row - 1).is_longer ())
… …
3596 3618
3597#if ENABLE_OVERLAY 3619#if ENABLE_OVERLAY
3598void 3620void
3599rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3621rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3600{ 3622{
3601 if (nrow < 3 || ncol < 3) 3623 if (nrow < 1 || ncol < 1)
3602 return; 3624 return;
3603 3625
3604 want_refresh = 1; 3626 want_refresh = 1;
3605 3627
3606 scr_overlay_off (); 3628 scr_overlay_off ();
… …
3610 3632
3611 // make space for border 3633 // make space for border
3612 w += 2; min_it (w, ncol); 3634 w += 2; min_it (w, ncol);
3613 h += 2; min_it (h, nrow); 3635 h += 2; min_it (h, nrow);
3614 3636
3615 x -= 1; max_it (x, 0); 3637 x -= 1; clamp_it (x, 0, ncol - w);
3616 y -= 1; max_it (y, 0); 3638 y -= 1; clamp_it (y, 0, nrow - h);
3617
3618 min_it (x, ncol - w);
3619 min_it (y, nrow - h);
3620 3639
3621 ov_x = x; ov_y = y; 3640 ov_x = x; ov_y = y;
3622 ov_w = w; ov_h = h; 3641 ov_w = w; ov_h = h;
3623 3642
3624 ov_text = new text_t *[h]; 3643 ov_text = new text_t *[h];
… …
3716 for (int y = ov_h; y--; ) 3735 for (int y = ov_h; y--; )
3717 { 3736 {
3718 text_t *t1 = ov_text[y]; 3737 text_t *t1 = ov_text[y];
3719 rend_t *r1 = ov_rend[y]; 3738 rend_t *r1 = ov_rend[y];
3720 3739
3721 text_t *t2 = ROW(y - view_start).t + ov_x; 3740 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3722 rend_t *r2 = ROW(y - view_start).r + ov_x; 3741 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3723 3742
3724 for (int x = ov_w; x--; ) 3743 for (int x = ov_w; x--; )
3725 { 3744 {
3726 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3745 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3727 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3746 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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