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.308 by root, Tue Jul 15 16:41:22 2008 UTC vs.
Revision 1.415 by root, Mon May 28 14:25:16 2012 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
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-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
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.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
99 98
100/* Fill part/all of a line with blanks. */ 99/* Fill part/all of a line with blanks. */
101void 100void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 102{
104 if (!l.t) 103 if (!l.valid ())
105 { 104 {
106 lalloc (l); 105 l.alloc ();
107 col = 0; 106 col = 0;
108 width = ncol; 107 width = ncol;
109 } 108 }
110 109
111 l.touch (); 110 l.touch ();
… …
130{ 129{
131 scr_blank_line (l, 0, ncol, efs); 130 scr_blank_line (l, 0, ncol, efs);
132 131
133 l.l = 0; 132 l.l = 0;
134 l.f = 0; 133 l.f = 0;
134}
135
136// nuke a single wide character at the given column
137void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
139{
140 // find begin
141 while (col > 0 && l.t[col] == NOCHAR)
142 col--;
143
144 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
135} 155}
136 156
137/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
140 160
141void 161void
162rxvt_term::scr_alloc ()
163{
164 int tsize = sizeof (text_t) * ncol;
165 int rsize = sizeof (rend_t) * ncol;
166
167 // we assume that rend_t size is a sufficient alignment
168 // factor for tetx_t and line_t values, and we only
169 // need to adjust tsize.
170 tsize = (tsize + sizeof (rend_t) - 1);
171 tsize -= tsize % sizeof (rend_t);
172
173 int all_rows = total_rows + nrow + nrow;
174
175 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
176 chunk = rxvt_malloc (chunk_size);
177
178 char *base = (char *)chunk + sizeof (line_t) * all_rows;
179
180 for (int row = 0; row < all_rows; ++row)
181 {
182 line_t &l = ((line_t *)chunk) [row];
183
184 l.t = (text_t *)base; base += tsize;
185 l.r = (rend_t *)base; base += rsize;
186 l.l = -1;
187 l.f = 0;
188 }
189
190 drawn_buf = (line_t *)chunk;
191 swap_buf = drawn_buf + nrow;
192 row_buf = swap_buf + nrow;
193}
194
195void
142rxvt_term::scr_reset () 196rxvt_term::scr_reset ()
143{ 197{
144#if ENABLE_OVERLAY 198#if ENABLE_OVERLAY
145 scr_overlay_off (); 199 scr_overlay_off ();
146#endif 200#endif
147 201
148 rvideo_mode = false;
149 view_start = 0; 202 view_start = 0;
150 num_scr = 0; 203 num_scr = 0;
151 204
152 if (ncol == 0) 205 if (ncol == 0)
153 ncol = 80; 206 ncol = 80;
… …
155 if (nrow == 0) 208 if (nrow == 0)
156 nrow = 24; 209 nrow = 24;
157 210
158 if (ncol == prev_ncol && nrow == prev_nrow) 211 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 212 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 213
164 // we need at least two lines for wrapping to work correctly 214 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 215 while (nrow + saveLines < 2)
166 { 216 {
167 //TODO//FIXME 217 //TODO//FIXME
… …
176 total_rows = nrow + saveLines; 226 total_rows = nrow + saveLines;
177 227
178 screen.tscroll = 0; 228 screen.tscroll = 0;
179 screen.bscroll = nrow - 1; 229 screen.bscroll = nrow - 1;
180 230
231 void *prev_chunk = chunk;
232 line_t *prev_drawn_buf = drawn_buf;
233 line_t *prev_swap_buf = swap_buf;
234 line_t *prev_row_buf = row_buf;
235
236 int common_col = min (prev_ncol, ncol);
237
238 scr_alloc ();
239
181 if (!row_buf) 240 if (!prev_row_buf)
182 { 241 {
183 /* 242 /*
184 * first time called so just malloc everything: don't rely on realloc 243 * first time called so just malloc everything: don't rely on realloc
185 */ 244 */
186 top_row = 0; 245 top_row = 0;
187 term_start = 0; 246 term_start = 0;
188
189 talloc = new rxvt_salloc (ncol * sizeof (text_t));
190 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
191
192 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
193 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
194 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
195
196 for (int row = nrow; row--; )
197 {
198 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
199 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
200 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
201 }
202 247
203 memset (charsets, 'B', sizeof (charsets)); 248 memset (charsets, 'B', sizeof (charsets));
204 rstyle = DEFAULT_RSTYLE; 249 rstyle = DEFAULT_RSTYLE;
205 screen.flags = Screen_DefaultFlags; 250 screen.flags = Screen_DefaultFlags;
206 screen.cur.row = screen.cur.col = 0; 251 screen.cur.row = screen.cur.col = 0;
… …
220 selection.text = NULL; 265 selection.text = NULL;
221 selection.len = 0; 266 selection.len = 0;
222 selection.op = SELECTION_CLEAR; 267 selection.op = SELECTION_CLEAR;
223 selection.screen = PRIMARY; 268 selection.screen = PRIMARY;
224 selection.clicks = 0; 269 selection.clicks = 0;
270 selection.clip_text = NULL;
271 selection.clip_len = 0;
225 } 272 }
226 else 273 else
227 { 274 {
228 /* 275 /*
229 * add or delete rows as appropriate 276 * add or delete rows as appropriate
230 */ 277 */
231 278
232 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
233 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
234
235#if 0
236 if (nrow < prev_nrow)
237 {
238 for (int row = nrow; row < prev_nrow; row++)
239 {
240 lfree (swap_buf [row]);
241 lfree (drawn_buf[row]);
242 }
243 }
244#endif
245
246 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
247 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
248
249 for (int row = min (nrow, prev_nrow); row--; ) 279 for (int row = min (nrow, prev_nrow); row--; )
250 { 280 {
251 lresize (drawn_buf[row]); 281 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
252 lresize (swap_buf [row]); 282 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
253 }
254 283
255 for (int row = prev_nrow; row < nrow; row++) 284 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
256 { 288 }
257 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
258 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
259 }
260
261 line_t *old_buf = row_buf;
262 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
263 289
264 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 290 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
265 int pend = MOD (term_start + top_row , prev_total_rows); 291 int pend = MOD (term_start + top_row , prev_total_rows);
266 int q = total_rows; // rewrapped row 292 int q = total_rows; // rewrapped row
267 293
268 if (top_row) 294 if (top_row)
269 { 295 {
270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 296 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
271 // to come up with a lean and mean algorithm. 297 // to come up with a lean and mean algorithm.
298 // TODO: maybe optimise when width didn't change
272 299
273 row_col_t ocur = screen.cur; 300 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 301 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 302
276 do 303 do
277 { 304 {
278 p = MOD (p - 1, prev_total_rows); 305 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 306 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 307 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 308 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
284 309
285 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 310 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
286 { 311 {
287 p = MOD (p - 1, prev_total_rows); 312 p = MOD (p - 1, prev_total_rows);
288 313
289 plines++; 314 plines++;
290 llen += prev_ncol; 315 llen += prev_ncol;
… …
303 328
304 // re-assemble the full line by destination lines 329 // re-assemble the full line by destination lines
305 for (int qrow = q; qlines--; qrow++) 330 for (int qrow = q; qlines--; qrow++)
306 { 331 {
307 qline = row_buf + qrow; 332 qline = row_buf + qrow;
308 lalloc (*qline); 333 qline->alloc (); // redundant with next line
309 qline->l = ncol; 334 qline->l = ncol;
310 qline->is_longer (1); 335 qline->is_longer (1);
311 336
312 int qcol = 0; 337 int qcol = 0;
313 338
… …
328 // this seems to upset applications/shells/readline 353 // this seems to upset applications/shells/readline
329 // least. 354 // least.
330 if (prow == ocur.row) 355 if (prow == ocur.row)
331 screen.cur.row = q - (total_rows - nrow); 356 screen.cur.row = q - (total_rows - nrow);
332 357
333 line_t &pline = old_buf [prow]; 358 line_t &pline = prev_row_buf [prow];
334 359
335 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 360 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
336 361
337 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 362 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
338 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 363 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
359 { 384 {
360 // if no scrollback exists (yet), wing, instead of wrap 385 // if no scrollback exists (yet), wing, instead of wrap
361 386
362 for (int row = min (nrow, prev_nrow); row--; ) 387 for (int row = min (nrow, prev_nrow); row--; )
363 { 388 {
364 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 389 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
365 line_t &qline = row_buf [row]; 390 line_t &dst = row_buf [row];
366 391
367 qline = pline; 392 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
368 lresize (qline); 393
394 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
395 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
369 } 396 }
370 397
371 for (int row = prev_nrow; row < nrow; row++) 398 for (int row = prev_nrow; row < nrow; row++)
372 {
373 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 399 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
374 }
375 400
376 term_start = 0; 401 term_start = 0;
377 } 402 }
378
379 free (old_buf);
380 delete old_ta;
381 delete old_ra;
382 403
383 clamp_it (screen.cur.row, 0, nrow - 1); 404 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 405 clamp_it (screen.cur.col, 0, ncol - 1);
406 }
385 407
408 for (int row = nrow; row--; )
409 {
410 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
411 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
412 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
413 }
414
415 free (prev_chunk);
416
386 free (tabs); 417 free (tabs);
387 } 418 tabs = (char *)rxvt_malloc (ncol);
419
420 for (int col = ncol; col--; )
421 tabs [col] = col % TABSIZE == 0;
388 422
389 CLEAR_ALL_SELECTION (); 423 CLEAR_ALL_SELECTION ();
390 424
391 prev_nrow = nrow; 425 prev_nrow = nrow;
392 prev_ncol = ncol; 426 prev_ncol = ncol;
393 427
394 tabs = (char *)rxvt_malloc (ncol); 428 tt_winch ();
395 429
396 for (int col = ncol; --col; ) 430 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
397 tabs [col] = col % TABSIZE == 0; 431}
432
433/* ------------------------------------------------------------------------- */
434/*
435 * Free everything. That way malloc debugging can find leakage.
436 */
437void
438rxvt_term::scr_release () NOTHROW
439{
440 free (chunk);
441 free (tabs);
442}
443
444/* ------------------------------------------------------------------------- */
445/*
446 * Hard/Soft reset
447 */
448void
449rxvt_term::scr_poweron ()
450{
451 scr_release ();
452
453 row_buf = 0;
454 tabs = 0;
455 prev_nrow = prev_ncol = 0;
456 rvideo_mode = false;
457 scr_soft_reset ();
458 scr_reset ();
459
460 scr_clear (true);
461 scr_refresh ();
462}
463
464void
465rxvt_term::scr_soft_reset () NOTHROW
466{
467 /* only affects modes, nothing drastic such as clearing the screen */
468#if ENABLE_OVERLAY
469 scr_overlay_off ();
470#endif
398 471
399 if (current_screen != PRIMARY) 472 if (current_screen != PRIMARY)
400 scr_swap_screen (); 473 scr_swap_screen ();
401 474
402 tt_winch (); 475 scr_scroll_region (0, MAX_ROWS - 1);
403 476 scr_rendition (0, ~RS_None);
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 477 scr_insert_mode (0);
405}
406
407/* ------------------------------------------------------------------------- */
408/*
409 * Free everything. That way malloc debugging can find leakage.
410 */
411void
412rxvt_term::scr_release () NOTHROW
413{
414 if (row_buf)
415 {
416 delete talloc; talloc = 0;
417 delete ralloc; ralloc = 0;
418
419 free (row_buf);
420 free (swap_buf);
421 free (drawn_buf);
422 free (tabs);
423
424 row_buf = 0; // signal that we freed all the arrays
425 }
426}
427
428/* ------------------------------------------------------------------------- */
429/*
430 * Hard reset
431 */
432void
433rxvt_term::scr_poweron ()
434{
435 scr_release ();
436 prev_nrow = prev_ncol = 0;
437 scr_reset ();
438
439 scr_clear (true);
440 scr_refresh ();
441} 478}
442 479
443/* ------------------------------------------------------------------------- * 480/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 481 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 482 * ------------------------------------------------------------------------- */
… …
483 } 520 }
484 521
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 522 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 523 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 524 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 525 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 526 assert (s->cur.col >= 0);
491#endif
492} 527}
493 528
494void 529void
495rxvt_term::scr_swap_screen () 530rxvt_term::scr_swap_screen () NOTHROW
496{ 531{
497 if (!option (Opt_secondaryScreen)) 532 if (!option (Opt_secondaryScreen))
498 return; 533 return;
499 534
500 for (int i = prev_nrow; i--; ) 535 for (int i = prev_nrow; i--; )
… …
519 return; 554 return;
520 555
521 want_refresh = 1; 556 want_refresh = 1;
522 view_start = 0; 557 view_start = 0;
523 558
524 selection_check (2); /* check for boundary cross */ 559 /* check for boundary cross */
560 row_col_t pos;
561 pos.row = pos.col = 0;
562 if (ROWCOL_IS_BEFORE (selection.beg, pos)
563 && ROWCOL_IS_AFTER (selection.end, pos))
564 CLEAR_SELECTION ();
525 565
526 int i = current_screen; current_screen = scrn; scrn = i; 566 current_screen = scrn;
527 567
528#if NSCREENS 568#if NSCREENS
529 if (option (Opt_secondaryScreen)) 569 if (option (Opt_secondaryScreen))
530 { 570 {
531 num_scr = 0; 571 num_scr = 0;
… …
608 648
609 if (count > 0 649 if (count > 0
610 && row1 == 0 650 && row1 == 0
611 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 651 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
612 { 652 {
653 min_it (count, total_rows - (nrow - (row2 + 1)));
654
613 top_row = max (top_row - count, -saveLines); 655 top_row = max (top_row - count, -saveLines);
614
615 // scroll everything up 'count' lines
616 term_start = (term_start + count) % total_rows;
617 656
618 // sever bottommost line 657 // sever bottommost line
619 { 658 {
620 line_t &l = ROW(row2 - count); 659 line_t &l = ROW(row2);
621 l.is_longer (0); 660 l.is_longer (0);
622 l.touch (); 661 l.touch ();
623 } 662 }
624 663
664 // scroll everything up 'count' lines
665 term_start = (term_start + count) % total_rows;
666
667 // now copy lines below the scroll region bottom to the
668 // bottom of the screen again, so they look as if they
669 // hadn't moved.
670 for (int i = nrow; --i > row2; )
671 {
672 line_t &l1 = ROW(i - count);
673 line_t &l2 = ROW(i);
674
675 ::swap (l1, l2);
676 l2.touch ();
677 }
678
625 // erase newly scrolled-in lines 679 // erase newly scrolled-in lines
626 for (int i = count; i--; ) 680 for (int i = count; i--; )
627 { 681 {
628 line_t &l = ROW(nrow - 1 - i); 682 line_t &l = ROW(row2 - i);
629 683
630 // optimize if already cleared, can be significant on slow machines 684 // optimise if already cleared, can be significant on slow machines
631 // could be rolled into scr_blank_screen_mem 685 // could be rolled into scr_blank_screen_mem
632 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 686 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
633 { 687 {
634 scr_blank_line (l, 0, l.l, rstyle); 688 scr_blank_line (l, 0, l.l, rstyle);
635 l.l = 0; 689 l.l = 0;
… …
637 } 691 }
638 else 692 else
639 scr_blank_screen_mem (l, rstyle); 693 scr_blank_screen_mem (l, rstyle);
640 } 694 }
641 695
642 // now copy lines below the scroll region bottom to the
643 // bottom of the screen again, so they look as if they
644 // hadn't moved.
645 for (int i = nrow; --i > row2; )
646 {
647 line_t &l1 = ROW(i - count);
648 line_t &l2 = ROW(i);
649
650 ::swap (l1, l2);
651 l2.touch ();
652 }
653
654 // move and/or clear selection, if any 696 // move and/or clear selection, if any
655 if (selection.op && current_screen == selection.screen) 697 if (selection.op && current_screen == selection.screen
698 && selection.beg.row <= row2)
656 { 699 {
657 selection.beg.row -= count; 700 selection.beg.row -= count;
658 selection.end.row -= count; 701 selection.end.row -= count;
659 selection.mark.row -= count; 702 selection.mark.row -= count;
660 703
661 if (selection.beg.row < top_row 704 selection_check (0);
662 || selection.end.row < top_row
663 || selection.mark.row < top_row)
664 {
665 CLEAR_ALL_SELECTION ();
666 selection.op = SELECTION_CLEAR;
667 }
668 } 705 }
669 706
670 // finally move the view window, if desired 707 // finally move the view window, if desired
671 if (option (Opt_scrollWithBuffer) 708 if (option (Opt_scrollWithBuffer)
672 && view_start != 0 709 && view_start != 0
… …
702 } 739 }
703 740
704 // use a simple and robust scrolling algorithm, this 741 // use a simple and robust scrolling algorithm, this
705 // part of scr_scroll_text is not time-critical. 742 // part of scr_scroll_text is not time-critical.
706 743
744 // sever line above scroll region
745 if (row1)
746 {
747 line_t &l = ROW(row1 - 1);
748 l.is_longer (0);
749 l.touch ();
750 }
751
707 int rows = row2 - row1 + 1; 752 int rows = row2 - row1 + 1;
708 753
709 min_it (count, rows); 754 min_it (count, rows);
710 755
711 line_t *temp_buf = row_buf + total_rows; 756 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
712 757
713 for (int row = 0; row < rows; row++) 758 for (int row = 0; row < rows; row++)
714 { 759 {
715 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 760 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
716 761
… …
718 scr_blank_screen_mem (temp_buf [row], rstyle); 763 scr_blank_screen_mem (temp_buf [row], rstyle);
719 } 764 }
720 765
721 for (int row = 0; row < rows; row++) 766 for (int row = 0; row < rows; row++)
722 ROW(row1 + row) = temp_buf [row]; 767 ROW(row1 + row) = temp_buf [row];
768
769 // sever bottommost line
770 {
771 line_t &l = ROW(row2);
772 l.is_longer (0);
773 l.touch ();
774 }
723 } 775 }
724 776
725 return count; 777 return count;
726} 778}
727 779
… …
733rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 785rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
734{ 786{
735 if (len <= 0) /* sanity */ 787 if (len <= 0) /* sanity */
736 return; 788 return;
737 789
738 unsigned char checksel; 790 bool checksel;
739 unicode_t c; 791 unicode_t c;
740 int ncol = this->ncol; 792 int ncol = this->ncol;
741 const wchar_t *strend = str + len; 793 const wchar_t *strend = str + len;
742 794
743 want_refresh = 1; 795 want_refresh = 1;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 808 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 809 screen.cur.row -= minlines;
758 } 810 }
759 } 811 }
760 812
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 813 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 814 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 815 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 816 int row = screen.cur.row;
767 817
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 818 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 819
770 line_t *line = &ROW(row); 820 line_t *line = &ROW(row);
771 821
772 while (str < strend) 822 while (str < strend)
773 { 823 {
774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 824 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
775 825
776 if (c < 0x20) 826 if (ecb_unlikely (c < 0x20))
777 if (c == C0_LF) 827 if (c == C0_LF)
778 { 828 {
779 max_it (line->l, screen.cur.col); 829 max_it (line->l, screen.cur.col);
780 830
781 screen.flags &= ~Screen_WrapNext; 831 screen.flags &= ~Screen_WrapNext;
… …
800 { 850 {
801 scr_tab (1, true); 851 scr_tab (1, true);
802 continue; 852 continue;
803 } 853 }
804 854
855 if (ecb_unlikely (
805 if (checksel /* see if we're writing within selection */ 856 checksel /* see if we're writing within selection */
806 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 857 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
807 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 858 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
859 ))
808 { 860 {
809 checksel = 0; 861 checksel = 0;
810 /* 862 /*
811 * If we wrote anywhere in the selected area, kill the selection 863 * If we wrote anywhere in the selected area, kill the selection
812 * XXX: should we kill the mark too? Possibly, but maybe that 864 * XXX: should we kill the mark too? Possibly, but maybe that
813 * should be a similar check. 865 * should be a similar check.
814 */ 866 */
815 CLEAR_SELECTION (); 867 CLEAR_SELECTION ();
816 } 868 }
817 869
818 if (screen.flags & Screen_WrapNext) 870 if (ecb_unlikely (screen.flags & Screen_WrapNext))
819 { 871 {
820 scr_do_wrap (); 872 scr_do_wrap ();
821 873
822 line->l = ncol; 874 line->l = ncol;
823 line->is_longer (1); 875 line->is_longer (1);
… …
825 row = screen.cur.row; 877 row = screen.cur.row;
826 line = &ROW(row); /* _must_ refresh */ 878 line = &ROW(row); /* _must_ refresh */
827 } 879 }
828 880
829 // some utf-8 decoders "decode" surrogate characters: let's fix this. 881 // some utf-8 decoders "decode" surrogate characters: let's fix this.
830 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 882 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
831 c = 0xfffd; 883 c = 0xfffd;
832 884
833 // rely on wcwidth to tell us the character width, do wcwidth before 885 // rely on wcwidth to tell us the character width, do wcwidth before
834 // further replacements, as wcwidth might return -1 for the line 886 // further replacements, as wcwidth might return -1 for the line
835 // drawing characters below as they might be invalid in the current 887 // drawing characters below as they might be invalid in the current
836 // locale. 888 // locale.
837 int width = WCWIDTH (c); 889 int width = WCWIDTH (c);
838 890
839 if (charsets [screen.charset] == '0') // DEC SPECIAL 891 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
840 { 892 {
841 // vt100 special graphics and line drawing 893 // vt100 special graphics and line drawing
842 // 5f-7e standard vt100 894 // 5f-7e standard vt100
843 // 40-5e rxvt extension for extra curses acs chars 895 // 40-5e rxvt extension for extra curses acs chars
844 static uint16_t vt100_0[62] = { // 41 .. 7e 896 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
857 c = vt100_0[c - 0x41]; 909 c = vt100_0[c - 0x41];
858 width = 1; // vt100 line drawing characters are always single-width 910 width = 1; // vt100 line drawing characters are always single-width
859 } 911 }
860 } 912 }
861 913
862 if (screen.flags & Screen_Insert) 914 if (ecb_unlikely (screen.flags & Screen_Insert))
863 scr_insdel_chars (width, INSERT); 915 scr_insdel_chars (width, INSERT);
864 916
865 if (width != 0) 917 if (width != 0)
866 { 918 {
867#if !UNICODE_3 919#if !UNICODE_3
… …
872# else 924# else
873 c = 0xfffd; 925 c = 0xfffd;
874# endif 926# endif
875#endif 927#endif
876 928
929 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
930
931 // if the character doesn't fit into the remaining columns...
932 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
933 {
934 if (screen.flags & Screen_Autowrap)
935 {
936 // ... artificially enlargen the previous one
937 c = NOCHAR;
938 // and try the same character next loop iteration
939 --str;
940 }
941 else
942 screen.cur.col = ncol - width;
943 }
944
877 // nuke the character at this position, if required 945 // nuke the character at this position, if required
946 // due to wonderful coincidences everywhere else in this loop
947 // we never have to check for overwriting a wide char itself,
948 // only its tail.
878 if (line->t[screen.cur.col] == NOCHAR 949 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
879 || (screen.cur.col < ncol - 1 950 scr_kill_char (*line, screen.cur.col);
880 && line->t[screen.cur.col + 1] == NOCHAR))
881 {
882 int col = screen.cur.col;
883
884 // find begin
885 while (col > 0 && line->t[col] == NOCHAR)
886 col--;
887
888 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
889
890 // found begin, nuke
891 do {
892 line->t[col] = ' ';
893 line->r[col] = rend;
894 col++;
895 } while (col < ncol && line->t[col] == NOCHAR);
896 }
897
898 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
899
900 // if the character doesn't fit into the remaining columns...
901 if (screen.cur.col > ncol - width && ncol >= width)
902 {
903 // ...output spaces
904 c = ' ';
905 // and try the same character next loop iteration
906 --str;
907 }
908 951
909 line->touch (); 952 line->touch ();
910 953
911 do 954 do
912 { 955 {
913 line->t[screen.cur.col] = c; 956 line->t[screen.cur.col] = c;
914 line->r[screen.cur.col] = rend; 957 line->r[screen.cur.col] = rend;
915 958
916 if (screen.cur.col < ncol - 1) 959 if (ecb_likely (screen.cur.col < ncol - 1))
917 screen.cur.col++; 960 screen.cur.col++;
918 else 961 else
919 { 962 {
920 line->l = ncol; 963 line->l = ncol;
921 if (screen.flags & Screen_Autowrap) 964 if (screen.flags & Screen_Autowrap)
922 screen.flags |= Screen_WrapNext; 965 screen.flags |= Screen_WrapNext;
923 break; 966
967 goto end_of_line;
924 } 968 }
925 969
926 c = NOCHAR; 970 c = NOCHAR;
927 } 971 }
928 while (--width > 0); 972 while (ecb_unlikely (--width > 0));
929 973
930 // pad with spaces when overwriting wide character with smaller one 974 // pad with spaces when overwriting wide character with smaller one
931 if (!width) 975 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
932 { 976 {
933 line->touch (); 977 line->t[c] = ' ';
978 line->r[c] = rend;
979 }
934 980
935 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 981end_of_line:
982 ;
983 }
984#if ENABLE_COMBINING
985 else // width == 0
986 {
987 if (c != 0xfeff) // ignore BOM
988 {
989 // handle combining characters
990 // we just tag the accent on the previous on-screen character.
991 // this is arguably not correct, but also arguably not wrong.
992 // we don't handle double-width characters nicely yet.
993 line_t *linep;
994 text_t *tp;
995 rend_t *rp;
996
997 if (screen.cur.col > 0)
936 { 998 {
937 line->t[c] = ' ';
938 line->r[c] = rend; 999 linep = line;
1000 tp = line->t + screen.cur.col - 1;
1001 rp = line->r + screen.cur.col - 1;
939 } 1002 }
1003 else if (screen.cur.row > 0
1004 && ROW(screen.cur.row - 1).is_longer ())
1005 {
1006 linep = &ROW(screen.cur.row - 1);
1007 tp = line->t + ncol - 1;
1008 rp = line->r + ncol - 1;
1009 }
1010 else
1011 continue;
1012
1013 linep->touch ();
1014
1015 while (*tp == NOCHAR && tp > linep->t)
1016 tp--, rp--;
1017
1018 // first try to find a precomposed character
1019 unicode_t n = rxvt_compose (*tp, c);
1020 if (n == NOCHAR)
1021 n = rxvt_composite.compose (*tp, c);
1022
1023 *tp = n;
1024 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
940 } 1025 }
941 } 1026 }
942 else // width == 0
943 {
944#if ENABLE_COMBINING
945 // handle combining characters
946 // we just tag the accent on the previous on-screen character.
947 // this is arguably not correct, but also arguably not wrong.
948 // we don't handle double-width characters nicely yet.
949 line_t *linep;
950 text_t *tp;
951 rend_t *rp;
952
953 if (screen.cur.col > 0)
954 {
955 linep = line;
956 tp = line->t + screen.cur.col - 1;
957 rp = line->r + screen.cur.col - 1;
958 }
959 else if (screen.cur.row > 0
960 && ROW(screen.cur.row - 1).is_longer ())
961 {
962 linep = &ROW(screen.cur.row - 1);
963 tp = line->t + ncol - 1;
964 rp = line->r + ncol - 1;
965 }
966 else
967 continue;
968
969 linep->touch ();
970
971 while (*tp == NOCHAR && tp > linep->t)
972 tp--, rp--;
973
974 // first try to find a precomposed character
975 unicode_t n = rxvt_compose (*tp, c);
976 if (n == NOCHAR)
977 n = rxvt_composite.compose (*tp, c);
978
979 *tp = n;
980 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
981#endif 1027#endif
982 }
983 } 1028 }
984 1029
985 max_it (line->l, screen.cur.col); 1030 max_it (line->l, screen.cur.col);
986 1031
987#ifdef DEBUG_STRICT
988 assert (screen.cur.row >= 0); 1032 assert (screen.cur.row >= 0);
989#endif
990} 1033}
991 1034
992/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
993/* 1036/*
994 * Process Backspace. Move back the cursor back a position, wrap if have to 1037 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1007 1050
1008 want_refresh = 1; 1051 want_refresh = 1;
1009#endif 1052#endif
1010 } 1053 }
1011 } 1054 }
1055 else if (screen.flags & Screen_WrapNext)
1056 screen.flags &= ~Screen_WrapNext;
1012 else 1057 else
1013 scr_gotorc (0, -1, RELATIVE); 1058 scr_gotorc (0, -1, RELATIVE);
1014} 1059}
1015 1060
1016/* ------------------------------------------------------------------------- */ 1061/* ------------------------------------------------------------------------- */
… …
1272 scr_blank_line (line, col, num, rstyle); 1317 scr_blank_line (line, col, num, rstyle);
1273} 1318}
1274 1319
1275/* ------------------------------------------------------------------------- */ 1320/* ------------------------------------------------------------------------- */
1276/* 1321/*
1277 * Erase part of whole of the screen 1322 * Erase part or whole of the screen
1278 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1323 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1279 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1324 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1280 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1325 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1281 */ 1326 */
1282void 1327void
… …
1291 ZERO_SCROLLBACK (); 1336 ZERO_SCROLLBACK ();
1292 1337
1293 switch (mode) 1338 switch (mode)
1294 { 1339 {
1295 case 0: /* erase to end of screen */ 1340 case 0: /* erase to end of screen */
1296 selection_check (1);
1297 scr_erase_line (0); 1341 scr_erase_line (0);
1298 row = screen.cur.row + 1; /* possible OOB */ 1342 row = screen.cur.row + 1; /* possible OOB */
1299 num = nrow - row; 1343 num = nrow - row;
1300 break; 1344 break;
1301 case 1: /* erase to beginning of screen */ 1345 case 1: /* erase to beginning of screen */
1302 selection_check (3);
1303 scr_erase_line (1); 1346 scr_erase_line (1);
1304 row = 0; 1347 row = 0;
1305 num = screen.cur.row; 1348 num = screen.cur.row;
1306 break; 1349 break;
1307 case 2: /* erase whole screen */ 1350 case 2: /* erase whole screen */
1308 selection_check (3);
1309 row = 0; 1351 row = 0;
1310 num = nrow; 1352 num = nrow;
1311 break; 1353 break;
1312 default: 1354 default:
1313 return; 1355 return;
… …
1322 if (row >= nrow) /* Out Of Bounds */ 1364 if (row >= nrow) /* Out Of Bounds */
1323 return; 1365 return;
1324 1366
1325 min_it (num, nrow - row); 1367 min_it (num, nrow - row);
1326 1368
1327 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1328 if (rstyle & (RS_RVid | RS_Uline)) 1369 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1329 ren = (rend_t) ~RS_None; 1370 ren = (rend_t) ~RS_None;
1330 else if (GET_BASEBG (rstyle) == Color_bg) 1371 else if (GET_BASEBG (rstyle) == Color_bg)
1331 { 1372 {
1332 ren = DEFAULT_RSTYLE; 1373 ren = DEFAULT_RSTYLE;
1333 1374
1334 if (mapped) 1375 if (mapped)
1335 XClearArea (dpy, vt, 0, 1376 XClearArea (dpy, vt, 0,
1336 Row2Pixel (row), (unsigned int)width, 1377 Row2Pixel (row - view_start), (unsigned int)vt_width,
1337 (unsigned int)Height2Pixel (num), False); 1378 (unsigned int)Height2Pixel (num), False);
1338 } 1379 }
1339 else 1380 else
1340 { 1381 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1382 ren = rstyle & (RS_fgMask | RS_bgMask);
1342 1383
1384 if (mapped)
1385 {
1343 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1386 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1344 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1387 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1345 XFillRectangle (dpy, vt, gc, 1388 XFillRectangle (dpy, vt, gc,
1346 0, Row2Pixel (row), 1389 0, Row2Pixel (row - view_start),
1347 (unsigned int)width, 1390 (unsigned int)vt_width,
1348 (unsigned int)Height2Pixel (num)); 1391 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1392 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1394 }
1351 } 1395 }
1352 1396
1353 for (; num--; row++) 1397 for (; num--; row++)
1354 { 1398 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1399 scr_blank_screen_mem (ROW(row), rstyle);
1400
1401 if (row - view_start < nrow)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1402 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1357 } 1403 }
1358} 1404}
1359 1405
1360#if !ENABLE_MINIMAL 1406#if !ENABLE_MINIMAL
1361void 1407void
… …
1380 1426
1381 want_refresh = 1; 1427 want_refresh = 1;
1382 ZERO_SCROLLBACK (); 1428 ZERO_SCROLLBACK ();
1383 1429
1384 num_scr_allow = 0; 1430 num_scr_allow = 0;
1385 selection_check (3); 1431
1432 row_col_t pos;
1433 pos.row = pos.col = 0;
1434 if (ROWCOL_IS_AFTER (selection.end, pos))
1435 CLEAR_SELECTION ();
1386 1436
1387 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1437 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1388 for (int row = nrow; row--; ) 1438 for (int row = nrow; row--; )
1389 { 1439 {
1390 line_t &line = ROW(row); 1440 line_t &line = ROW(row);
… …
1435 * Insert/Delete <count> characters from the current position 1485 * Insert/Delete <count> characters from the current position
1436 */ 1486 */
1437void 1487void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1488rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1489{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1490 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1491 ZERO_SCROLLBACK ();
1445 1492
1446 if (count <= 0) 1493 if (count <= 0)
1447 return; 1494 return;
… …
1449 scr_do_wrap (); 1496 scr_do_wrap ();
1450 1497
1451 selection_check (1); 1498 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1499 min_it (count, ncol - screen.cur.col);
1453 1500
1454 row = screen.cur.row; 1501 int row = screen.cur.row;
1455 1502
1456 line_t *line = &ROW(row); 1503 line_t *line = &ROW(row);
1457 1504
1458 line->touch (); 1505 line->touch ();
1459 line->is_longer (0); 1506 line->is_longer (0);
1460 1507
1508 // nuke wide spanning the start
1509 if (line->t[screen.cur.col] == NOCHAR)
1510 scr_kill_char (*line, screen.cur.col);
1511
1461 switch (insdel) 1512 switch (insdel)
1462 { 1513 {
1463 case INSERT: 1514 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1515 line->l = min (line->l + count, ncol);
1516
1517 if (line->t[screen.cur.col] == NOCHAR)
1518 scr_kill_char (*line, screen.cur.col);
1519
1520 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1521 {
1466 line->t[col] = line->t[col - count]; 1522 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1523 line->r[col] = line->r[col - count];
1468 } 1524 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1525
1472 if (selection.op && current_screen == selection.screen 1526 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1527 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1528 {
1475 if (selection.end.row != screen.cur.row 1529 if (selection.end.row != screen.cur.row
… …
1490 case ERASE: 1544 case ERASE:
1491 screen.cur.col += count; /* don't worry if > ncol */ 1545 screen.cur.col += count; /* don't worry if > ncol */
1492 selection_check (1); 1546 selection_check (1);
1493 screen.cur.col -= count; 1547 screen.cur.col -= count;
1494 1548
1495 line->l = max (line->l - count, 0); 1549 // nuke wide char after the end
1550 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1551 scr_kill_char (*line, screen.cur.col + count);
1552
1496 scr_blank_line (*line, screen.cur.col, count, rstyle); 1553 scr_blank_line (*line, screen.cur.col, count, rstyle);
1497 break; 1554 break;
1498 1555
1499 case DELETE: 1556 case DELETE:
1500 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1557 line->l = max (line->l - count, 0);
1501 1558
1559 // nuke wide char spanning the end
1560 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1561 scr_kill_char (*line, screen.cur.col + count);
1562
1502 for (col = screen.cur.col; (col + count) < ncol; col++) 1563 for (int col = screen.cur.col; (col + count) < ncol; col++)
1503 { 1564 {
1504 line->t[col] = line->t[col + count]; 1565 line->t[col] = line->t[col + count];
1505 line->r[col] = line->r[col + count]; 1566 line->r[col] = line->r[col + count];
1506 } 1567 }
1507 1568
1508 line->l = max (line->l - count, 0);
1509 scr_blank_line (*line, ncol - count, count, tr); 1569 scr_blank_line (*line, ncol - count, count, rstyle);
1510 1570
1511 if (selection.op && current_screen == selection.screen 1571 if (selection.op && current_screen == selection.screen
1512 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1572 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1513 { 1573 {
1514 if (selection.end.row != screen.cur.row 1574 if (selection.end.row != screen.cur.row
… …
1650 { 1710 {
1651 rvideo_state = on; 1711 rvideo_state = on;
1652 1712
1653 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1713 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1654#ifdef HAVE_BG_PIXMAP 1714#ifdef HAVE_BG_PIXMAP
1655 if (bgPixmap.pixmap == None) 1715 if (bg_pixmap == None)
1656#endif 1716#endif
1657 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1717 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1658 1718
1659 XGCValues gcvalue; 1719 XGCValues gcvalue;
1660 gcvalue.foreground = pix_colors[Color_fg]; 1720 gcvalue.foreground = pix_colors[Color_fg];
… …
1804 for (i = PART_BEG; i < RC_COUNT; i++) 1864 for (i = PART_BEG; i < RC_COUNT; i++)
1805 { 1865 {
1806 min_it (rc[i].col, ncol - 1); 1866 min_it (rc[i].col, ncol - 1);
1807 min_it (rc[i].row, nrow - 1); 1867 min_it (rc[i].row, nrow - 1);
1808 } 1868 }
1809// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1869
1810 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1870 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1811 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1871 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1812 1872
1813 num_scr_allow = 0; 1873 num_scr_allow = 0;
1814 1874
… …
1821 * Refresh the entire screen 1881 * Refresh the entire screen
1822 */ 1882 */
1823void 1883void
1824rxvt_term::scr_touch (bool refresh) NOTHROW 1884rxvt_term::scr_touch (bool refresh) NOTHROW
1825{ 1885{
1826 scr_expose (0, 0, width, height, refresh); 1886 scr_expose (0, 0, vt_width, vt_height, refresh);
1827} 1887}
1828 1888
1829/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
1830/* 1890/*
1831 * Move the display so that the line represented by scrollbar value Y is at 1891 * Move the display so that the line represented by scrollbar value Y is at
… …
1887 1947
1888# ifndef NO_MAPALERT 1948# ifndef NO_MAPALERT
1889# ifdef MAPALERT_OPTION 1949# ifdef MAPALERT_OPTION
1890 if (option (Opt_mapAlert)) 1950 if (option (Opt_mapAlert))
1891# endif 1951# endif
1892 XMapWindow (dpy, parent[0]); 1952 XMapWindow (dpy, parent);
1893# endif 1953# endif
1894 1954
1895# if ENABLE_FRILLS 1955# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell)) 1956 if (option (Opt_urgentOnBell))
1897 { 1957 set_urgency (1);
1898 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1899 {
1900 h->flags |= XUrgencyHint;
1901 XSetWMHints (dpy, parent[0], h);
1902 }
1903 }
1904# endif 1958# endif
1905 1959
1906 if (option (Opt_visualBell)) 1960 if (option (Opt_visualBell))
1907 { 1961 {
1908 rvideo_bell = true; 1962 rvideo_bell = true;
… …
1911 1965
1912 bell_ev.start (VISUAL_BELL_DURATION); 1966 bell_ev.start (VISUAL_BELL_DURATION);
1913 } 1967 }
1914 else 1968 else
1915 XBell (dpy, 0); 1969 XBell (dpy, 0);
1970 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1916#endif 1971#endif
1917} 1972}
1918 1973
1919/* ------------------------------------------------------------------------- */ 1974/* ------------------------------------------------------------------------- */
1920/* ARGSUSED */
1921void 1975void
1922rxvt_term::scr_printscreen (int fullhist) NOTHROW 1976rxvt_term::scr_printscreen (int fullhist) NOTHROW
1923{ 1977{
1924#ifdef PRINTPIPE 1978#ifdef PRINTPIPE
1925 int nrows, row_start; 1979 int nrows, row_start;
… …
1939 row_start = view_start; 1993 row_start = view_start;
1940 } 1994 }
1941 1995
1942 wctomb (0, 0); 1996 wctomb (0, 0);
1943 1997
1944 for (int r1 = 0; r1 < nrows; r1++) 1998 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1945 { 1999 {
1946 text_t *tp = ROW(r1).t; 2000 text_t *tp = ROW(r1).t;
1947 int len = ROW(r1).l; 2001 int len = ROW(r1).l;
1948 2002
1949 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2003 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1978 * screen.text/screen.rend contain what the screen will change to. 2032 * screen.text/screen.rend contain what the screen will change to.
1979 */ 2033 */
1980void 2034void
1981rxvt_term::scr_refresh () NOTHROW 2035rxvt_term::scr_refresh () NOTHROW
1982{ 2036{
1983 unsigned char have_bg,
1984 showcursor; /* show the cursor */
1985 int16_t col, row, /* column/row we're processing */ 2037 int16_t col, row, /* column/row we're processing */
1986 ocrow; /* old cursor row */ 2038 ocrow; /* old cursor row */
1987 int i; /* tmp */ 2039 int i; /* tmp */
1988#ifndef NO_CURSORCOLOR 2040#ifndef NO_CURSORCOLOR
1989 rend_t cc1; /* store colours at cursor position (s) */ 2041 rend_t cc1; /* store colours at cursor position (s) */
… …
2000 /* 2052 /*
2001 * A: set up vars 2053 * A: set up vars
2002 */ 2054 */
2003 refresh_count = 0; 2055 refresh_count = 0;
2004 2056
2057 unsigned int old_screen_flags = screen.flags;
2005 have_bg = 0; 2058 bool have_bg = 0;
2006#ifdef HAVE_BG_PIXMAP 2059#ifdef HAVE_BG_PIXMAP
2007 have_bg = bgPixmap.pixmap != None; 2060 have_bg = bg_pixmap != None;
2008#endif 2061#endif
2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2010 2063
2011 /* 2064 /*
2012 * B: reverse any characters which are selected 2065 * B: reverse any characters which are selected
2013 */ 2066 */
2014 scr_reverse_selection (); 2067 scr_reverse_selection ();
2015 2068
2069 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2070#if ENABLE_OVERLAY
2071 scr_swap_overlay ();
2072#endif
2073
2074 bool showcursor = screen.flags & Screen_VisibleCursor;
2075
2016 /* 2076 /*
2017 * C: set the cursor character (s) 2077 * C: set the cursor character (s)
2018 */ 2078 */
2019 { 2079 {
2020 unsigned char setoldcursor; 2080 bool setoldcursor;
2021 2081
2022 showcursor = (screen.flags & Screen_VisibleCursor);
2023#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2024 if (hidden_cursor) 2083 if (hidden_cursor)
2025 showcursor = 0; 2084 showcursor = 0;
2026#endif 2085#endif
2027 2086
… …
2055 ccol2 = bgcolor_of (rstyle); 2114 ccol2 = bgcolor_of (rstyle);
2056#else 2115#else
2057 ccol2 = Color_bg; 2116 ccol2 = Color_bg;
2058#endif 2117#endif
2059 2118
2060 if (showcursor && focus) 2119 if (focus)
2061 { 2120 {
2062 if (option (Opt_cursorUnderline)) 2121 if (option (Opt_cursorUnderline))
2063 *crp ^= RS_Uline; 2122 *crp ^= RS_Uline;
2064 else 2123 else
2065 { 2124 {
… …
2100 oldcursor.col = screen.cur.col; 2159 oldcursor.col = screen.cur.col;
2101 } 2160 }
2102 } 2161 }
2103 } 2162 }
2104 2163
2105 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2106#if ENABLE_OVERLAY
2107 scr_swap_overlay ();
2108#endif
2109
2110#ifndef NO_SLOW_LINK_SUPPORT 2164#ifndef NO_SLOW_LINK_SUPPORT
2111 /* 2165 /*
2112 * D: CopyArea pass - very useful for slower links 2166 * D: CopyArea pass - very useful for slower links
2113 * This has been deliberately kept simple. 2167 * This has been deliberately kept simple.
2114 */ 2168 */
… …
2118 { 2172 {
2119 int16_t nits; 2173 int16_t nits;
2120 int i = num_scr; 2174 int i = num_scr;
2121 int j; 2175 int j;
2122 int len, wlen; 2176 int len, wlen;
2123 dLocal (int, num_scr);
2124 2177
2125 j = nrow; 2178 j = nrow;
2126 wlen = len = -1; 2179 wlen = len = -1;
2127 row = i > 0 ? 0 : j - 1; 2180 row = i > 0 ? 0 : j - 1;
2128 2181
… …
2203 continue; 2256 continue;
2204 2257
2205 // redraw one or more characters 2258 // redraw one or more characters
2206 2259
2207 // seek to the beginning of wide characters 2260 // seek to the beginning of wide characters
2208 while (stp[col] == NOCHAR && col > 0) 2261 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2209 --col; 2262 --col;
2210 2263
2211 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2264 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2212 text_t *text = stp + col; 2265 text_t *text = stp + col;
2213 int count = 1; 2266 int count = 1;
2214 2267
2215 dtp[col] = stp[col]; 2268 dtp[col] = stp[col];
2216 drp[col] = rend; 2269 drp[col] = rend;
… …
2220 for (i = 0; ++col < ncol; ) 2273 for (i = 0; ++col < ncol; )
2221 { 2274 {
2222 if (stp[col] == NOCHAR) 2275 if (stp[col] == NOCHAR)
2223 { 2276 {
2224 dtp[col] = stp[col]; 2277 dtp[col] = stp[col];
2225 drp[col] = rend; 2278 drp[col] = srp[col];
2279
2226 count++; 2280 count++;
2227 i++; 2281 i++;
2228 2282
2229 continue; 2283 continue;
2230 } 2284 }
… …
2250 2304
2251 col--; /* went one too far. move back */ 2305 col--; /* went one too far. move back */
2252 count -= i; /* dump any matching trailing chars */ 2306 count -= i; /* dump any matching trailing chars */
2253 2307
2254 // sometimes we optimize away the trailing NOCHAR's, add them back 2308 // sometimes we optimize away the trailing NOCHAR's, add them back
2255 while (i && text[count] == NOCHAR) 2309 while (ecb_unlikely (i && text[count] == NOCHAR))
2256 count++, i--; 2310 count++, i--;
2257 2311
2258 /* 2312 /*
2259 * Determine the attributes for the string 2313 * Determine the attributes for the string
2260 */ 2314 */
2261 int fore = fgcolor_of (rend); // desired foreground 2315 int fore = fgcolor_of (rend); // desired foreground
2262 int back = bgcolor_of (rend); // desired background 2316 int back = bgcolor_of (rend); // desired background
2263 2317
2264 // only do special processing if any attributes are set, which is unlikely 2318 // only do special processing if any attributes are set, which is unlikely
2265 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2319 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2266 { 2320 {
2267 bool invert = rend & RS_RVid; 2321 bool invert = rend & RS_RVid;
2268 2322
2269#ifndef NO_BOLD_UNDERLINE_REVERSE 2323#ifndef NO_BOLD_UNDERLINE_REVERSE
2270 if (rend & RS_Bold && fore == Color_fg) 2324 if (rend & RS_Bold && fore == Color_fg)
… …
2289 2343
2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2344 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2291 fore = Color_UL; 2345 fore = Color_UL;
2292#endif 2346#endif
2293 2347
2348#ifdef OPTION_HC
2349 if (rend & RS_Sel)
2350 {
2351 /* invert the column if no highlightColor is set or it is the
2352 * current cursor column */
2353 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2354 && ISSET_PIXCOLOR (Color_HC))
2355 {
2356 if (ISSET_PIXCOLOR (Color_HTC))
2357 fore = Color_HTC;
2358 // if invert is 0 reverse video is set so we use bg color as fg color
2359 else if (!invert)
2360 fore = back;
2361
2362 back = Color_HC;
2363 invert = 0;
2364 }
2365 }
2366#endif
2367
2294 if (invert) 2368 if (invert)
2295 { 2369 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2302 ::swap (fore, back); 2370 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2307 2371
2308#ifndef NO_BOLD_UNDERLINE_REVERSE 2372#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2310 if (ISSET_PIXCOLOR (Color_RV))
2311 back = Color_RV;
2312# endif
2313 if (fore == back) 2373 if (fore == back)
2314 { 2374 {
2315 fore = Color_bg; 2375 fore = Color_bg;
2316 back = Color_fg; 2376 back = Color_fg;
2317 } 2377 }
… …
2353 /* 2413 /*
2354 * Actually do the drawing of the string here 2414 * Actually do the drawing of the string here
2355 */ 2415 */
2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2416 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2357 2417
2358 if (have_bg && back == Color_bg) 2418 if (ecb_likely (have_bg && back == Color_bg))
2359 { 2419 {
2360 // this is very ugly, maybe push it into ->draw? 2420 // this is very ugly, maybe push it into ->draw?
2361 2421
2362 for (i = 0; i < count; i++) /* don't draw empty strings */ 2422 for (i = 0; i < count; i++) /* don't draw empty strings */
2363 if (text[i] != ' ') 2423 if (text[i] != ' ')
… …
2370 did_clear: ; 2430 did_clear: ;
2371 } 2431 }
2372 else 2432 else
2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2433 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2374 2434
2375 if (rend & RS_Uline && font->descent > 1 && fore != back) 2435 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2376 { 2436 {
2377#if ENABLE_FRILLS 2437#if ENABLE_FRILLS
2378 if (ISSET_PIXCOLOR (Color_underline)) 2438 if (ISSET_PIXCOLOR (Color_underline))
2379 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2439 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380 else 2440 else
… …
2385 xpixel, ypixel + font->ascent + 1, 2445 xpixel, ypixel + font->ascent + 1,
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2446 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2447 }
2388 } /* for (col....) */ 2448 } /* for (col....) */
2389 } /* for (row....) */ 2449 } /* for (row....) */
2390
2391#if ENABLE_OVERLAY
2392 scr_swap_overlay ();
2393#endif
2394 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2395 2450
2396 /* 2451 /*
2397 * G: cleanup cursor and display outline cursor if necessary 2452 * G: cleanup cursor and display outline cursor if necessary
2398 */ 2453 */
2399 if (showcursor) 2454 if (showcursor)
… …
2431 2486
2432 XDrawRectangle (dpy, vt, gc, 2487 XDrawRectangle (dpy, vt, gc,
2433 Col2Pixel (col), 2488 Col2Pixel (col),
2434 Row2Pixel (oldcursor.row), 2489 Row2Pixel (oldcursor.row),
2435 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2490 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2491 (unsigned int) (Height2Pixel (1) - 1));
2437 } 2492 }
2438 } 2493 }
2439 2494
2440 /* 2495 /*
2441 * H: cleanup selection 2496 * H: cleanup selection
2442 */ 2497 */
2498#if ENABLE_OVERLAY
2499 scr_swap_overlay ();
2500#endif
2501 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2502
2443 scr_reverse_selection (); 2503 scr_reverse_selection ();
2444 2504
2505 screen.flags = old_screen_flags;
2445 num_scr = 0; 2506 num_scr = 0;
2446 num_scr_allow = 1; 2507 num_scr_allow = 1;
2447} 2508}
2448 2509
2449void 2510void
2450rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2511rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2451{ 2512{
2452 if (!l.t) 2513 if (!l.valid ())
2453 return; 2514 return;
2454 2515
2455 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2516 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2456 2517
2457 for (int i = ncol; i--; ) 2518 for (int i = ncol; i--; )
… …
2470 scr_remap_chars (swap_buf [i]); 2531 scr_remap_chars (swap_buf [i]);
2471 } 2532 }
2472} 2533}
2473 2534
2474void 2535void
2475rxvt_term::scr_recolour () NOTHROW 2536rxvt_term::scr_recolour (bool refresh) NOTHROW
2476{ 2537{
2538 bool transparent = false;
2539
2477#ifdef HAVE_BG_PIXMAP 2540#ifdef HAVE_BG_PIXMAP
2478 bgPixmap.apply (); 2541 if (bg_pixmap != None)
2479#else 2542 {
2543# ifdef ENABLE_TRANSPARENCY
2544 if (bg_flags & BG_IS_TRANSPARENT)
2545 {
2546 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2547 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2480 2548
2549 transparent = true;
2550 }
2551 else
2552# endif
2553 {
2554 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2555 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2556 }
2557 }
2558 else
2559#endif
2560 {
2481 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2561 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2482 XClearWindow (dpy, parent[0]);
2483 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2562 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2563 }
2564
2565 XClearWindow (dpy, parent);
2484 2566
2485 if (scrollBar.win) 2567 if (scrollBar.win)
2486 { 2568 {
2569 if (transparent)
2570 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2571 else
2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2572 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2488 scrollBar.state = STATE_IDLE; 2573 scrollBar.state = SB_STATE_IDLE;
2489 scrollBar.show (0); 2574 scrollBar.show (0);
2490 } 2575 }
2491 2576
2492#endif 2577 if (refresh)
2493 2578 {
2494 /* bgPixmap.apply () does not do the following : */
2495 scr_clear (); 2579 scr_clear ();
2496 scr_touch (true); 2580 scr_touch (true);
2581 }
2497 want_refresh = 1; 2582 want_refresh = 1;
2498} 2583}
2499 2584
2500/* ------------------------------------------------------------------------- */ 2585/* ------------------------------------------------------------------------- */
2501void 2586void
… …
2569 { 2654 {
2570#if !ENABLE_MINIMAL 2655#if !ENABLE_MINIMAL
2571 if (selection.rect) 2656 if (selection.rect)
2572 scr_xor_rect (selection.beg.row, selection.beg.col, 2657 scr_xor_rect (selection.beg.row, selection.beg.col,
2573 selection.end.row, selection.end.col, 2658 selection.end.row, selection.end.col,
2574 RS_RVid, RS_RVid | RS_Uline); 2659 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2575 else 2660 else
2576#endif 2661#endif
2577 scr_xor_span (selection.beg.row, selection.beg.col, 2662 scr_xor_span (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2663 selection.end.row, selection.end.col,
2579 RS_RVid); 2664 RS_Sel | RS_RVid);
2580 } 2665 }
2581} 2666}
2582 2667
2583/* ------------------------------------------------------------------------- */ 2668/* ------------------------------------------------------------------------- */
2584/* 2669/*
… …
2587 */ 2672 */
2588#if 0 2673#if 0
2589void 2674void
2590rxvt_term::scr_dump (int fd) NOTHROW 2675rxvt_term::scr_dump (int fd) NOTHROW
2591{ 2676{
2592 int row, wrote; 2677 // if this method is needed, it can be implemented by factoring the
2593 unsigned int width, towrite; 2678 // relevant code in scr_printscreen
2594 char r1[] = "\n";
2595
2596 for (row = saveLines + top_row;
2597 row < saveLines + nrow - 1; row++)
2598 {
2599 width = row_buf[row].l >= 0 ? row_buf[row].l
2600 : ncol;
2601 for (towrite = width; towrite; towrite -= wrote)
2602 {
2603 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2604 towrite);
2605 if (wrote < 0)
2606 return; /* XXX: death, no report */
2607 }
2608 if (row_buf[row].l >= 0)
2609 if (write (fd, r1, 1) <= 0)
2610 return; /* XXX: death, no report */
2611 }
2612} 2679}
2613#endif 2680#endif
2614 2681
2615/* ------------------------------------------------------------------------- * 2682/* ------------------------------------------------------------------------- *
2616 * CHARACTER SELECTION * 2683 * CHARACTER SELECTION *
2617 * ------------------------------------------------------------------------- */ 2684 * ------------------------------------------------------------------------- */
2618void 2685void
2619rxvt_term::selection_check (int check_more) NOTHROW 2686rxvt_term::selection_check (int check_more) NOTHROW
2620{ 2687{
2621 row_col_t pos;
2622
2623 if (!selection.op) 2688 if (!selection.op)
2624 return; 2689 return;
2625 2690
2626 pos.row = pos.col = 0;
2627 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2691 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2628 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2692 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2629 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2630 || (check_more == 1 2694 || (check_more == 1
2631 && current_screen == selection.screen 2695 && current_screen == selection.screen
2632 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2696 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2633 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2697 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2634 || (check_more == 2
2635 && ROWCOL_IS_BEFORE (selection.beg, pos)
2636 && ROWCOL_IS_AFTER (selection.end, pos))
2637 || (check_more == 3
2638 && ROWCOL_IS_AFTER (selection.end, pos))
2639 || (check_more == 4 /* screen width change */
2640 && (selection.beg.row != selection.end.row
2641 || selection.end.col > ncol)))
2642 CLEAR_SELECTION (); 2698 CLEAR_ALL_SELECTION ();
2643} 2699}
2644 2700
2645/* ------------------------------------------------------------------------- */ 2701/* ------------------------------------------------------------------------- */
2646/* 2702/*
2647 * Paste a selection direct to the command fd 2703 * Paste a selection direct to the command fd
2648 */ 2704 */
2649void 2705void
2650rxvt_term::paste (char *data, unsigned int len) NOTHROW 2706rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2651{ 2707{
2652 /* convert normal newline chars into common keyboard Return key sequence */ 2708 /* convert normal newline chars into common keyboard Return key sequence */
2653 for (unsigned int i = 0; i < len; i++) 2709 for (unsigned int i = 0; i < len; i++)
2654 if (data[i] == C0_LF) 2710 if (data[i] == C0_LF)
2655 data[i] = C0_CR; 2711 data[i] = C0_CR;
2656 2712
2657 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2658 tt_printf ("\e[200~"); 2714 tt_printf ("\x1b[200~");
2659 2715
2660 tt_write (data, len); 2716 tt_write (data, len);
2661 2717
2662 if (priv_modes & PrivMode_BracketPaste) 2718 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[201~"); 2719 tt_printf ("\x1b[201~");
2664} 2720}
2665 2721
2666/* ------------------------------------------------------------------------- */
2667/*
2668 * Respond to a notification that a primary selection has been sent
2669 * EXT: SelectionNotify
2670 */
2671void 2722void
2672rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2723rxvt_term::paste (char *data, unsigned int len) NOTHROW
2673{ 2724{
2674 if (prop == None) /* check for failed XConvertSelection */ 2725 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2675 {
2676 if ((selection_type & Sel_CompoundText))
2677 {
2678 int selnum = selection_type & Sel_whereMask;
2679
2680 selection_type = 0;
2681 if (selnum != Sel_direct)
2682 selection_request_other (XA_STRING, selnum);
2683 }
2684
2685 if ((selection_type & Sel_UTF8String))
2686 {
2687 int selnum = selection_type & Sel_whereMask;
2688
2689 selection_type = Sel_CompoundText;
2690 if (selnum != Sel_direct)
2691 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2692 else
2693 selection_type = 0;
2694 }
2695
2696 return;
2697 }
2698
2699 unsigned long bytes_after;
2700 XTextProperty ct;
2701
2702 if (XGetWindowProperty (dpy, win, prop,
2703 0, PROP_SIZE / 4,
2704 delete_prop, AnyPropertyType,
2705 &ct.encoding, &ct.format,
2706 &ct.nitems, &bytes_after,
2707 &ct.value) != Success)
2708 {
2709 ct.value = 0;
2710 goto bailout;
2711 }
2712
2713 if (ct.encoding == None)
2714 goto bailout;
2715
2716 if (bytes_after)
2717 {
2718 // fetch and append remaining data
2719 XTextProperty ct2;
2720
2721 if (XGetWindowProperty (dpy, win, prop,
2722 ct.nitems / 4, (bytes_after + 3) / 4,
2723 delete_prop, AnyPropertyType,
2724 &ct2.encoding, &ct2.format,
2725 &ct2.nitems, &bytes_after,
2726 &ct2.value) != Success)
2727 goto bailout;
2728
2729 // realloc should be compatible to XFree, here, and elsewhere, too
2730 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2731 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2732 ct.nitems += ct2.nitems;
2733
2734 XFree (ct2.value);
2735 }
2736
2737 if (ct.value == 0)
2738 goto bailout;
2739
2740 if (ct.encoding == xa[XA_INCR])
2741 {
2742 // INCR selection, start handshake
2743 if (!delete_prop)
2744 XDeleteProperty (dpy, win, prop);
2745
2746 selection_wait = Sel_incr;
2747 incr_buf_fill = 0;
2748 incr_ev.start (10);
2749
2750 goto bailout;
2751 }
2752
2753 if (ct.nitems == 0)
2754 {
2755 if (selection_wait == Sel_incr)
2756 {
2757 XFree (ct.value);
2758
2759 // finally complete, now paste the whole thing
2760 selection_wait = Sel_normal;
2761 ct.value = (unsigned char *)incr_buf;
2762 ct.nitems = incr_buf_fill;
2763 incr_buf = 0;
2764 incr_buf_size = 0;
2765 incr_ev.stop ();
2766 }
2767 else
2768 {
2769 if (selection_wait == Sel_normal
2770 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2771 {
2772 /*
2773 * pass through again trying CUT_BUFFER0 if we've come from
2774 * XConvertSelection () but nothing was presented
2775 */
2776 selection_paste (display->root, XA_CUT_BUFFER0, False);
2777 }
2778
2779 goto bailout;
2780 }
2781 }
2782 else if (selection_wait == Sel_incr)
2783 {
2784 incr_ev.start (10);
2785
2786 while (incr_buf_fill + ct.nitems > incr_buf_size)
2787 {
2788 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2789 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2790 }
2791
2792 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2793 incr_buf_fill += ct.nitems;
2794
2795 goto bailout;
2796 }
2797
2798 char **cl;
2799 int cr;
2800
2801#if !ENABLE_MINIMAL
2802 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2803 // so recode it manually
2804 if (ct.encoding == xa[XA_UTF8_STRING])
2805 {
2806 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2807 char *s = rxvt_wcstombs (w);
2808 free (w);
2809 // TODO: strlen == only the first element will be converted. well...
2810 paste (s, strlen (s));
2811 free (s);
2812 }
2813 else
2814#endif
2815 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2816 && cl)
2817 {
2818 for (int i = 0; i < cr; i++)
2819 paste (cl[i], strlen (cl[i]));
2820
2821 XFreeStringList (cl);
2822 }
2823 else
2824 paste ((char *)ct.value, ct.nitems); // paste raw
2825
2826bailout:
2827 XFree (ct.value);
2828
2829 if (selection_wait == Sel_normal)
2830 selection_wait = Sel_none;
2831}
2832
2833void
2834rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2835{
2836 selection_wait = Sel_none;
2837
2838 incr_buf_size = 0;
2839 free (incr_buf);
2840
2841 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2842}
2843
2844void
2845rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2846{
2847 if (prop == None || selection_wait != Sel_incr)
2848 return; 2726 return;
2849 2727
2850 selection_paste (win, prop, true); 2728 tt_paste (data, len);
2851} 2729}
2852 2730
2853/* ------------------------------------------------------------------------- */ 2731/* ------------------------------------------------------------------------- */
2854/* 2732/*
2855 * Request the current selection: 2733 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2856 * Order: > internal selection if available 2734 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2857 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2735 * as fallback
2858 * > CUT_BUFFER0
2859 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2860 * will auto fallback to CUT_BUFFER0
2861 * EXT: button 2 release 2736 * EXT: button 2 release
2862 */ 2737 */
2863void 2738void
2864rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2739rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2865{ 2740{
2866 if (selection.text && selnum == Sel_Primary) 2741 if (!selection_req)
2867 {
2868 /* internal selection */
2869 char *str = rxvt_wcstombs (selection.text, selection.len);
2870 paste (str, strlen (str));
2871 free (str);
2872 return;
2873 } 2742 {
2874 else 2743 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2744 selection_req->run ();
2875 { 2745 }
2876 selection_request_time = tm;
2877 selection_wait = Sel_normal;
2878
2879#if X_HAVE_UTF8_STRING
2880 selection_type = Sel_UTF8String;
2881 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2882 return;
2883#else
2884 selection_type = Sel_CompoundText;
2885 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2886 return;
2887#endif
2888 }
2889
2890 selection_wait = Sel_none; /* don't loop in selection_paste () */
2891 selection_paste (display->root, XA_CUT_BUFFER0, false);
2892}
2893
2894int
2895rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2896{
2897 Atom sel;
2898
2899 selection_type |= selnum;
2900
2901 if (selnum == Sel_Primary)
2902 sel = XA_PRIMARY;
2903 else if (selnum == Sel_Secondary)
2904 sel = XA_SECONDARY;
2905 else
2906 sel = xa[XA_CLIPBOARD];
2907
2908 if (XGetSelectionOwner (dpy, sel) != None)
2909 {
2910 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2911 vt, selection_request_time);
2912 return 1;
2913 }
2914
2915 return 0;
2916} 2746}
2917 2747
2918/* ------------------------------------------------------------------------- */ 2748/* ------------------------------------------------------------------------- */
2919/* 2749/*
2920 * Clear all selected text 2750 * Clear all selected text
2921 * EXT: SelectionClear 2751 * EXT: SelectionClear
2922 */ 2752 */
2923void 2753void
2924rxvt_term::selection_clear () NOTHROW 2754rxvt_term::selection_clear (bool clipboard) NOTHROW
2925{ 2755{
2756 if (!clipboard)
2757 {
2926 want_refresh = 1; 2758 want_refresh = 1;
2927 free (selection.text); 2759 free (selection.text);
2928 selection.text = NULL; 2760 selection.text = NULL;
2929 selection.len = 0; 2761 selection.len = 0;
2930 CLEAR_SELECTION (); 2762 CLEAR_SELECTION ();
2931 2763
2932 if (display->selection_owner == this) 2764 if (display->selection_owner == this)
2933 display->selection_owner = 0; 2765 display->selection_owner = 0;
2766 }
2767 else
2768 {
2769 free (selection.clip_text);
2770 selection.clip_text = NULL;
2771 selection.clip_len = 0;
2772
2773 if (display->clipboard_owner == this)
2774 display->clipboard_owner = 0;
2775 }
2934} 2776}
2935 2777
2936/* ------------------------------------------------------------------------- */ 2778/* ------------------------------------------------------------------------- */
2937/* 2779/*
2938 * Copy a selection into the cut buffer 2780 * Copy a selection into the cut buffer
2939 * EXT: button 1 or 3 release 2781 * EXT: button 1 or 3 release
2940 */ 2782 */
2941void 2783void
2942rxvt_term::selection_make (Time tm) 2784rxvt_term::selection_make (Time tm)
2943{ 2785{
2944 int i; 2786 int size;
2945 wchar_t *new_selection_text; 2787 wchar_t *new_selection_text;
2946 text_t *t; 2788 text_t *t;
2947 2789
2948 switch (selection.op) 2790 switch (selection.op)
2949 { 2791 {
… …
2965 return; /* nothing selected, go away */ 2807 return; /* nothing selected, go away */
2966 2808
2967 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2809 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2968 return; 2810 return;
2969 2811
2970 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2812 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2971 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2813 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2972 2814
2973 int ofs = 0; 2815 int ofs = 0;
2974 int extra = 0; 2816 int extra = 0;
2975 2817
2976 int col = selection.beg.col; 2818 int col = selection.beg.col;
… …
2982 { 2824 {
2983#if !ENABLE_MINIMAL 2825#if !ENABLE_MINIMAL
2984 if (selection.rect) 2826 if (selection.rect)
2985 { 2827 {
2986 col = selection.beg.col; 2828 col = selection.beg.col;
2987 end_col = ncol + 1; 2829 end_col = selection.end.col;
2988 } 2830 }
2989 else 2831 else
2990#endif 2832#endif
2991 end_col = ROW(row).l; 2833 end_col = ROW(row).l;
2992 2834
2993 col = max (col, 0); 2835 col = max (col, 0);
2994 2836
2995 if (row == selection.end.row 2837 if (row == selection.end.row)
2996#if !ENABLE_MINIMAL
2997 || selection.rect
2998#endif
2999 )
3000 min_it (end_col, selection.end.col); 2838 min_it (end_col, selection.end.col);
3001 2839
3002 t = ROW(row).t + col; 2840 t = ROW(row).t + col;
3003 2841
3004 for (; col < end_col; col++) 2842 for (; col < end_col; col++)
… …
3012 2850
3013 extra -= (len - 1); 2851 extra -= (len - 1);
3014 2852
3015 if (extra < 0) 2853 if (extra < 0)
3016 { 2854 {
3017 extra += i; 2855 extra += size;
3018 i += i; 2856 size += size;
3019 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2857 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3020 } 2858 }
3021 2859
3022 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2860 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3023 } 2861 }
3024#endif 2862#endif
… …
3036 2874
3037 new_selection_text[ofs++] = C0_LF; 2875 new_selection_text[ofs++] = C0_LF;
3038 } 2876 }
3039 else 2877 else
3040#endif 2878#endif
3041 if (!ROW(row).is_longer () && row != selection.end.row) 2879 if (!ROW(row).is_longer ()
2880 && (row != selection.end.row || end_col != selection.end.col)
2881 && (row != selection.beg.row || selection.beg.col < ncol))
3042 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3043 } 2883 }
3044
3045 if (end_col != selection.end.col)
3046 new_selection_text[ofs++] = C0_LF;
3047 2884
3048 new_selection_text[ofs] = 0; 2885 new_selection_text[ofs] = 0;
3049 2886
3050 if (ofs == 0) 2887 if (ofs == 0)
3051 { 2888 {
… …
3064 2901
3065 selection_grab (tm); 2902 selection_grab (tm);
3066} 2903}
3067 2904
3068bool 2905bool
3069rxvt_term::selection_grab (Time tm) NOTHROW 2906rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3070{ 2907{
2908 Atom sel;
2909
2910 if (!clipboard)
2911 {
3071 selection_time = tm; 2912 selection_time = tm;
2913 sel = XA_PRIMARY;
2914 }
2915 else
2916 {
2917 clipboard_time = tm;
2918 sel = xa[XA_CLIPBOARD];
2919 }
3072 2920
3073 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2921 XSetSelectionOwner (dpy, sel, vt, tm);
3074 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2922 if (XGetSelectionOwner (dpy, sel) == vt)
3075 { 2923 {
3076 display->set_selection_owner (this); 2924 display->set_selection_owner (this, clipboard);
3077 return true; 2925 return true;
3078 } 2926 }
3079 else 2927 else
3080 { 2928 {
3081 selection_clear (); 2929 selection_clear (clipboard);
3082 return false; 2930 return false;
3083 } 2931 }
3084 2932
3085#if 0 2933#if 0
3086 XTextProperty ct; 2934 XTextProperty ct;
… …
3546 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3547 */ 3395 */
3548void 3396void
3549rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3550{ 3398{
3399 Atom property = rq.property == None ? rq.target : rq.property;
3551 XSelectionEvent ev; 3400 XSelectionEvent ev;
3552 3401
3553 ev.type = SelectionNotify; 3402 ev.type = SelectionNotify;
3554 ev.property = None; 3403 ev.property = None;
3555 ev.display = rq.display; 3404 ev.display = rq.display;
… …
3570 *target++ = xa[XA_COMPOUND_TEXT]; 3419 *target++ = xa[XA_COMPOUND_TEXT];
3571#if X_HAVE_UTF8_STRING 3420#if X_HAVE_UTF8_STRING
3572 *target++ = xa[XA_UTF8_STRING]; 3421 *target++ = xa[XA_UTF8_STRING];
3573#endif 3422#endif
3574 3423
3575 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3424 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3576 32, PropModeReplace, 3425 32, PropModeReplace,
3577 (unsigned char *)target_list, target - target_list); 3426 (unsigned char *)target_list, target - target_list);
3578 ev.property = rq.property; 3427 ev.property = property;
3579 } 3428 }
3580#if TODO // TODO 3429#if TODO // TODO
3581 else if (rq.target == xa[XA_MULTIPLE]) 3430 else if (rq.target == xa[XA_MULTIPLE])
3582 { 3431 {
3583 /* TODO: Handle MULTIPLE */ 3432 /* TODO: Handle MULTIPLE */
3584 } 3433 }
3585#endif 3434#endif
3586 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3435 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3587 { 3436 {
3588 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3437 XChangeProperty (dpy, rq.requestor, property, rq.target,
3589 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3438 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3590 ev.property = rq.property; 3439 ev.property = property;
3440 }
3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3442 {
3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3444 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3445 ev.property = property;
3591 } 3446 }
3592 else if (rq.target == XA_STRING 3447 else if (rq.target == XA_STRING
3593 || rq.target == xa[XA_TEXT] 3448 || rq.target == xa[XA_TEXT]
3594 || rq.target == xa[XA_COMPOUND_TEXT] 3449 || rq.target == xa[XA_COMPOUND_TEXT]
3595 || rq.target == xa[XA_UTF8_STRING] 3450 || rq.target == xa[XA_UTF8_STRING]
… …
3627 { 3482 {
3628 target = xa[XA_COMPOUND_TEXT]; 3483 target = xa[XA_COMPOUND_TEXT];
3629 style = enc_compound_text; 3484 style = enc_compound_text;
3630 } 3485 }
3631 3486
3632 if (selection.text) 3487 if (rq.selection == XA_PRIMARY && selection.text)
3633 { 3488 {
3634 cl = selection.text; 3489 cl = selection.text;
3635 selectlen = selection.len; 3490 selectlen = selection.len;
3491 }
3492 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3493 {
3494 cl = selection.clip_text;
3495 selectlen = selection.clip_len;
3636 } 3496 }
3637 else 3497 else
3638 { 3498 {
3639 cl = L""; 3499 cl = L"";
3640 selectlen = 0; 3500 selectlen = 0;
… …
3661 ct.value = (unsigned char *)cl; 3521 ct.value = (unsigned char *)cl;
3662 ct.nitems = selectlen; 3522 ct.nitems = selectlen;
3663 ct.encoding = target; 3523 ct.encoding = target;
3664 } 3524 }
3665 3525
3666 XChangeProperty (dpy, rq.requestor, rq.property, 3526 XChangeProperty (dpy, rq.requestor, property,
3667 ct.encoding, 8, PropModeReplace, 3527 ct.encoding, 8, PropModeReplace,
3668 ct.value, (int)ct.nitems); 3528 ct.value, (int)ct.nitems);
3669 ev.property = rq.property; 3529 ev.property = property;
3670 3530
3671 if (freect) 3531 if (freect)
3672 XFree (ct.value); 3532 XFree (ct.value);
3673 } 3533 }
3674 3534
… …
3708 h += 2; min_it (h, nrow); 3568 h += 2; min_it (h, nrow);
3709 3569
3710 x -= 1; clamp_it (x, 0, ncol - w); 3570 x -= 1; clamp_it (x, 0, ncol - w);
3711 y -= 1; clamp_it (y, 0, nrow - h); 3571 y -= 1; clamp_it (y, 0, nrow - h);
3712 3572
3713 ov_x = x; ov_y = y; 3573 ov.x = x; ov.y = y;
3714 ov_w = w; ov_h = h; 3574 ov.w = w; ov.h = h;
3715 3575
3716 ov_text = new text_t *[h]; 3576 ov.text = new text_t *[h];
3717 ov_rend = new rend_t *[h]; 3577 ov.rend = new rend_t *[h];
3718 3578
3719 for (y = 0; y < h; y++) 3579 for (y = 0; y < h; y++)
3720 { 3580 {
3721 text_t *tp = ov_text[y] = new text_t[w]; 3581 text_t *tp = ov.text[y] = new text_t[w];
3722 rend_t *rp = ov_rend[y] = new rend_t[w]; 3582 rend_t *rp = ov.rend[y] = new rend_t[w];
3723 3583
3724 text_t t0, t1, t2; 3584 text_t t0, t1, t2;
3725 rend_t r = OVERLAY_RSTYLE; 3585 rend_t r = OVERLAY_RSTYLE;
3726 3586
3727 if (y == 0) 3587 if (y == 0)
… …
3746} 3606}
3747 3607
3748void 3608void
3749rxvt_term::scr_overlay_off () NOTHROW 3609rxvt_term::scr_overlay_off () NOTHROW
3750{ 3610{
3751 if (!ov_text) 3611 if (!ov.text)
3752 return; 3612 return;
3753 3613
3754 want_refresh = 1; 3614 want_refresh = 1;
3755 3615
3756 for (int y = 0; y < ov_h; y++) 3616 for (int y = 0; y < ov.h; y++)
3757 { 3617 {
3758 delete [] ov_text[y]; 3618 delete [] ov.text[y];
3759 delete [] ov_rend[y]; 3619 delete [] ov.rend[y];
3760 } 3620 }
3761 3621
3762 delete [] ov_text; ov_text = 0; 3622 delete [] ov.text; ov.text = 0;
3763 delete [] ov_rend; ov_rend = 0; 3623 delete [] ov.rend; ov.rend = 0;
3764} 3624}
3765 3625
3766void 3626void
3767rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3627rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3768{ 3628{
3769 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3629 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3770 return; 3630 return;
3771 3631
3772 x++, y++; 3632 x++, y++;
3773 3633
3774 ov_text[y][x] = text; 3634 ov.text[y][x] = text;
3775 ov_rend[y][x] = rend; 3635 ov.rend[y][x] = rend;
3776} 3636}
3777 3637
3778void 3638void
3779rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3639rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3780{ 3640{
… …
3799} 3659}
3800 3660
3801void 3661void
3802rxvt_term::scr_swap_overlay () NOTHROW 3662rxvt_term::scr_swap_overlay () NOTHROW
3803{ 3663{
3804 if (!ov_text) 3664 if (!ov.text)
3805 return; 3665 return;
3806 3666
3667 // hide cursor if it is within the overlay area
3668 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3669 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3670 screen.flags &= ~Screen_VisibleCursor;
3671
3807 // swap screen mem with overlay 3672 // swap screen mem with overlay
3808 for (int y = ov_h; y--; ) 3673 for (int y = ov.h; y--; )
3809 { 3674 {
3810 text_t *t1 = ov_text[y]; 3675 text_t *t1 = ov.text[y];
3811 rend_t *r1 = ov_rend[y]; 3676 rend_t *r1 = ov.rend[y];
3812 3677
3813 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3678 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3814 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3679 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3815 3680
3816 for (int x = ov_w; x--; ) 3681 for (int x = ov.w; x--; )
3817 { 3682 {
3818 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3683 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3819 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3684 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3820 } 3685 }
3821 } 3686 }

Diff Legend

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