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.309 by root, Mon Jul 21 16:51:31 2008 UTC vs.
Revision 1.441 by sf-exg, Thu Mar 28 09:21:46 2013 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! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
130{ 127{
131 scr_blank_line (l, 0, ncol, efs); 128 scr_blank_line (l, 0, ncol, efs);
132 129
133 l.l = 0; 130 l.l = 0;
134 l.f = 0; 131 l.f = 0;
132}
133
134// nuke a single wide character at the given column
135void
136rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
137{
138 // find begin
139 while (col > 0 && l.t[col] == NOCHAR)
140 col--;
141
142 rend_t rend = l.r[col] & ~RS_baseattrMask;
143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
146
147 // found start, nuke
148 do {
149 l.t[col] = ' ';
150 l.r[col] = rend;
151 col++;
152 } while (col < ncol && l.t[col] == NOCHAR);
153}
154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
135} 163}
136 164
137/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
140 168
141void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
142rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
143{ 215{
144#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
145 scr_overlay_off (); 217 scr_overlay_off ();
146#endif 218#endif
147 219
148 rvideo_mode = false;
149 view_start = 0; 220 view_start = 0;
150 num_scr = 0; 221 num_scr = 0;
151 222
152 if (ncol == 0) 223 if (ncol == 0)
153 ncol = 80; 224 ncol = 80;
… …
155 if (nrow == 0) 226 if (nrow == 0)
156 nrow = 24; 227 nrow = 24;
157 228
158 if (ncol == prev_ncol && nrow == prev_nrow) 229 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 230 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 231
164 // we need at least two lines for wrapping to work correctly 232 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 233 while (nrow + saveLines < 2)
166 { 234 {
167 //TODO//FIXME 235 //TODO//FIXME
… …
176 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
177 245
178 screen.tscroll = 0; 246 screen.tscroll = 0;
179 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
180 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
181 if (!row_buf) 257 if (!prev_row_buf)
182 { 258 {
183 /*
184 * first time called so just malloc everything: don't rely on realloc
185 */
186 top_row = 0; 259 top_row = 0;
187 term_start = 0; 260 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 261
203 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
204 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
205 screen.flags = Screen_DefaultFlags; 264 screen.flags = Screen_DefaultFlags;
206 screen.cur.row = screen.cur.col = 0; 265 screen.cur.row = screen.cur.col = 0;
… …
220 selection.text = NULL; 279 selection.text = NULL;
221 selection.len = 0; 280 selection.len = 0;
222 selection.op = SELECTION_CLEAR; 281 selection.op = SELECTION_CLEAR;
223 selection.screen = PRIMARY; 282 selection.screen = PRIMARY;
224 selection.clicks = 0; 283 selection.clicks = 0;
284 selection.clip_text = NULL;
285 selection.clip_len = 0;
225 } 286 }
226 else 287 else
227 { 288 {
228 /* 289 /*
229 * add or delete rows as appropriate 290 * add or delete rows as appropriate
230 */ 291 */
231 292
232 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 293 int common_col = min (prev_ncol, ncol);
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 294
249 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
250 { 296 {
251 lresize (drawn_buf[row]); 297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
252 lresize (swap_buf [row]); 298 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
253 } 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
254 300
255 for (int row = prev_nrow; row < nrow; row++) 301 copy_line (swap_buf [row], prev_swap_buf [row]);
256 { 302 }
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 303
264 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 304 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
265 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
266 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
267 307
268 if (top_row) 308 if (top_row)
269 { 309 {
270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 310 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
271 // to come up with a lean and mean algorithm. 311 // to come up with a lean and mean algorithm.
312 // TODO: maybe optimise when width didn't change
272 313
273 row_col_t ocur = screen.cur; 314 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 315 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 316
276 do 317 do
277 { 318 {
278 p = MOD (p - 1, prev_total_rows); 319 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 320 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 321 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 322 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
284 323
285 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 324 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
286 { 325 {
287 p = MOD (p - 1, prev_total_rows); 326 p = MOD (p - 1, prev_total_rows);
288 327
289 plines++; 328 plines++;
290 llen += prev_ncol; 329 llen += prev_ncol;
… …
303 342
304 // re-assemble the full line by destination lines 343 // re-assemble the full line by destination lines
305 for (int qrow = q; qlines--; qrow++) 344 for (int qrow = q; qlines--; qrow++)
306 { 345 {
307 qline = row_buf + qrow; 346 qline = row_buf + qrow;
308 lalloc (*qline); 347 qline->alloc (); // redundant with next line
309 qline->l = ncol; 348 qline->l = ncol;
310 qline->is_longer (1); 349 qline->is_longer (1);
311 350
312 int qcol = 0; 351 int qcol = 0;
313 352
… …
328 // this seems to upset applications/shells/readline 367 // this seems to upset applications/shells/readline
329 // least. 368 // least.
330 if (prow == ocur.row) 369 if (prow == ocur.row)
331 screen.cur.row = q - (total_rows - nrow); 370 screen.cur.row = q - (total_rows - nrow);
332 371
333 line_t &pline = old_buf [prow]; 372 line_t &pline = prev_row_buf [prow];
334 373
335 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 374 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
336 375
337 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 376 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
338 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 377 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
359 { 398 {
360 // if no scrollback exists (yet), wing, instead of wrap 399 // if no scrollback exists (yet), wing, instead of wrap
361 400
362 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
363 { 402 {
364 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
365 line_t &qline = row_buf [row]; 404 line_t &dst = row_buf [row];
366 405
367 qline = pline; 406 copy_line (dst, src);
368 lresize (qline);
369 } 407 }
370 408
371 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
372 {
373 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
374 }
375 411
376 term_start = 0; 412 term_start = 0;
377 } 413 }
378
379 free (old_buf);
380 delete old_ta;
381 delete old_ra;
382 414
383 clamp_it (screen.cur.row, 0, nrow - 1); 415 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 416 clamp_it (screen.cur.col, 0, ncol - 1);
417 }
385 418
419 for (int row = nrow; row--; )
420 {
421 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
422 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
423 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
424 }
425
426 chunk_free (prev_chunk, prev_chunk_size);
427
386 free (tabs); 428 free (tabs);
387 } 429 tabs = (char *)rxvt_malloc (ncol);
430
431 for (int col = ncol; col--; )
432 tabs [col] = col % TABSIZE == 0;
388 433
389 CLEAR_ALL_SELECTION (); 434 CLEAR_ALL_SELECTION ();
390 435
391 prev_nrow = nrow; 436 prev_nrow = nrow;
392 prev_ncol = ncol; 437 prev_ncol = ncol;
393 438
394 tabs = (char *)rxvt_malloc (ncol); 439 tt_winch ();
395 440
396 for (int col = ncol; --col; ) 441 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
397 tabs [col] = col % TABSIZE == 0; 442}
443
444void ecb_cold
445rxvt_term::scr_release () NOTHROW
446{
447 chunk_free (chunk, chunk_size);
448 chunk = 0;
449 row_buf = 0;
450
451 free (tabs);
452 tabs = 0;
453}
454
455/* ------------------------------------------------------------------------- */
456/*
457 * Hard/Soft reset
458 */
459void ecb_cold
460rxvt_term::scr_poweron ()
461{
462 scr_release ();
463
464 prev_nrow = prev_ncol = 0;
465 rvideo_mode = false;
466 scr_soft_reset ();
467 scr_reset ();
468
469 scr_clear (true);
470 scr_refresh ();
471}
472
473void ecb_cold
474rxvt_term::scr_soft_reset () NOTHROW
475{
476 /* only affects modes, nothing drastic such as clearing the screen */
477#if ENABLE_OVERLAY
478 scr_overlay_off ();
479#endif
398 480
399 if (current_screen != PRIMARY) 481 if (current_screen != PRIMARY)
400 scr_swap_screen (); 482 scr_swap_screen ();
401 483
402 tt_winch (); 484 scr_scroll_region (0, MAX_ROWS - 1);
403 485 scr_rendition (0, ~RS_None);
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 486 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} 487}
442 488
443/* ------------------------------------------------------------------------- * 489/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 490 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 491 * ------------------------------------------------------------------------- */
… …
483 } 529 }
484 530
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 531 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 532 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 533 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 535 assert (s->cur.col >= 0);
491#endif
492} 536}
493 537
494void 538void
495rxvt_term::scr_swap_screen () 539rxvt_term::scr_swap_screen () NOTHROW
496{ 540{
497 if (!option (Opt_secondaryScreen)) 541 if (!option (Opt_secondaryScreen))
498 return; 542 return;
499 543
500 for (int i = prev_nrow; i--; ) 544 for (int i = prev_nrow; i--; )
… …
519 return; 563 return;
520 564
521 want_refresh = 1; 565 want_refresh = 1;
522 view_start = 0; 566 view_start = 0;
523 567
524 selection_check (2); /* check for boundary cross */ 568 /* check for boundary cross */
569 row_col_t pos;
570 pos.row = pos.col = 0;
571 if (ROWCOL_IS_BEFORE (selection.beg, pos)
572 && ROWCOL_IS_AFTER (selection.end, pos))
573 CLEAR_SELECTION ();
525 574
526 int i = current_screen; current_screen = scrn; scrn = i; 575 current_screen = scrn;
527 576
528#if NSCREENS 577#if NSCREENS
529 if (option (Opt_secondaryScreen)) 578 if (option (Opt_secondaryScreen))
530 { 579 {
531 num_scr = 0; 580 num_scr = 0;
… …
595/* 644/*
596 * Scroll text between <row1> and <row2> inclusive, by <count> lines 645 * Scroll text between <row1> and <row2> inclusive, by <count> lines
597 * count positive ==> scroll up 646 * count positive ==> scroll up
598 * count negative ==> scroll down 647 * count negative ==> scroll down
599 */ 648 */
600int 649int ecb_hot
601rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
602{ 651{
603 if (count == 0 || (row1 > row2)) 652 if (count == 0 || (row1 > row2))
604 return 0; 653 return 0;
605 654
… …
608 657
609 if (count > 0 658 if (count > 0
610 && row1 == 0 659 && row1 == 0
611 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 660 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
612 { 661 {
662 min_it (count, total_rows - (nrow - (row2 + 1)));
663
613 top_row = max (top_row - count, -saveLines); 664 top_row = max (top_row - count, -saveLines);
614
615 // scroll everything up 'count' lines
616 term_start = (term_start + count) % total_rows;
617 665
618 // sever bottommost line 666 // sever bottommost line
619 { 667 {
620 line_t &l = ROW(row2 - count); 668 line_t &l = ROW(row2);
621 l.is_longer (0); 669 l.is_longer (0);
622 l.touch (); 670 l.touch ();
623 } 671 }
624 672
673 // scroll everything up 'count' lines
674 term_start = (term_start + count) % total_rows;
675
676 // now copy lines below the scroll region bottom to the
677 // bottom of the screen again, so they look as if they
678 // hadn't moved.
679 for (int i = nrow; --i > row2; )
680 {
681 line_t &l1 = ROW(i - count);
682 line_t &l2 = ROW(i);
683
684 ::swap (l1, l2);
685 l2.touch ();
686 }
687
625 // erase newly scrolled-in lines 688 // erase newly scrolled-in lines
626 for (int i = count; i--; ) 689 for (int i = count; i--; )
627 { 690 {
628 line_t &l = ROW(nrow - 1 - i); 691 line_t &l = ROW(row2 - i);
629 692
630 // optimize if already cleared, can be significant on slow machines 693 // optimise if already cleared, can be significant on slow machines
631 // could be rolled into scr_blank_screen_mem 694 // 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))) 695 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
633 { 696 {
634 scr_blank_line (l, 0, l.l, rstyle); 697 scr_blank_line (l, 0, l.l, rstyle);
635 l.l = 0; 698 l.l = 0;
… …
637 } 700 }
638 else 701 else
639 scr_blank_screen_mem (l, rstyle); 702 scr_blank_screen_mem (l, rstyle);
640 } 703 }
641 704
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 705 // move and/or clear selection, if any
655 if (selection.op && current_screen == selection.screen) 706 if (selection.op && current_screen == selection.screen
707 && selection.beg.row <= row2)
656 { 708 {
657 selection.beg.row -= count; 709 selection.beg.row -= count;
658 selection.end.row -= count; 710 selection.end.row -= count;
659 selection.mark.row -= count; 711 selection.mark.row -= count;
660 712
661 if (selection.beg.row < top_row 713 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 } 714 }
669 715
670 // finally move the view window, if desired 716 // finally move the view window, if desired
671 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
672 && view_start != 0 718 && view_start != 0
673 && view_start != -saveLines) 719 && view_start != -saveLines)
674 scr_page (UP, count); 720 scr_page (count);
675 721
676 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 722 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
677 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 723 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
678 } 724 }
679 else 725 else
… …
702 } 748 }
703 749
704 // use a simple and robust scrolling algorithm, this 750 // use a simple and robust scrolling algorithm, this
705 // part of scr_scroll_text is not time-critical. 751 // part of scr_scroll_text is not time-critical.
706 752
753 // sever line above scroll region
754 if (row1)
755 {
756 line_t &l = ROW(row1 - 1);
757 l.is_longer (0);
758 l.touch ();
759 }
760
707 int rows = row2 - row1 + 1; 761 int rows = row2 - row1 + 1;
708 762
709 min_it (count, rows); 763 min_it (count, rows);
710 764
711 line_t *temp_buf = row_buf + total_rows; 765 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
712 766
713 for (int row = 0; row < rows; row++) 767 for (int row = 0; row < rows; row++)
714 { 768 {
715 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 769 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
716 770
… …
718 scr_blank_screen_mem (temp_buf [row], rstyle); 772 scr_blank_screen_mem (temp_buf [row], rstyle);
719 } 773 }
720 774
721 for (int row = 0; row < rows; row++) 775 for (int row = 0; row < rows; row++)
722 ROW(row1 + row) = temp_buf [row]; 776 ROW(row1 + row) = temp_buf [row];
777
778 // sever bottommost line
779 {
780 line_t &l = ROW(row2);
781 l.is_longer (0);
782 l.touch ();
783 }
723 } 784 }
724 785
725 return count; 786 return count;
726} 787}
727 788
728/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
729/* 790/*
730 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
731 */ 792 */
732void 793void ecb_hot
733rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 794rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
734{ 795{
735 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
736 return; 797 return;
737 798
738 unsigned char checksel; 799 bool checksel;
739 unicode_t c; 800 unicode_t c;
740 int ncol = this->ncol; 801 int ncol = this->ncol;
741 const wchar_t *strend = str + len; 802 const wchar_t *strend = str + len;
742 803
743 want_refresh = 1; 804 want_refresh = 1;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 817 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 818 screen.cur.row -= minlines;
758 } 819 }
759 } 820 }
760 821
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 822 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 823 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 824 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 825 int row = screen.cur.row;
767 826
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 827 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 828
770 line_t *line = &ROW(row); 829 line_t *line = &ROW(row);
771 830
772 while (str < strend) 831 while (str < strend)
773 { 832 {
774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 833 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
775 834
776 if (expect_false (c < 0x20)) 835 if (ecb_unlikely (c < 0x20))
777 if (c == C0_LF) 836 if (c == C0_LF)
778 { 837 {
779 max_it (line->l, screen.cur.col); 838 max_it (line->l, screen.cur.col);
780 839
781 screen.flags &= ~Screen_WrapNext; 840 screen.flags &= ~Screen_WrapNext;
… …
800 { 859 {
801 scr_tab (1, true); 860 scr_tab (1, true);
802 continue; 861 continue;
803 } 862 }
804 863
805 if (expect_false ( 864 if (ecb_unlikely (
806 checksel /* see if we're writing within selection */ 865 checksel /* see if we're writing within selection */
807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
808 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 867 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
809 )) 868 ))
810 { 869 {
… …
815 * should be a similar check. 874 * should be a similar check.
816 */ 875 */
817 CLEAR_SELECTION (); 876 CLEAR_SELECTION ();
818 } 877 }
819 878
820 if (expect_false (screen.flags & Screen_WrapNext)) 879 if (ecb_unlikely (screen.flags & Screen_WrapNext))
821 { 880 {
822 scr_do_wrap (); 881 scr_do_wrap ();
823 882
824 line->l = ncol; 883 line->l = ncol;
825 line->is_longer (1); 884 line->is_longer (1);
… …
827 row = screen.cur.row; 886 row = screen.cur.row;
828 line = &ROW(row); /* _must_ refresh */ 887 line = &ROW(row); /* _must_ refresh */
829 } 888 }
830 889
831 // some utf-8 decoders "decode" surrogate characters: let's fix this. 890 // some utf-8 decoders "decode" surrogate characters: let's fix this.
832 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 891 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
833 c = 0xfffd; 892 c = 0xfffd;
834 893
835 // rely on wcwidth to tell us the character width, do wcwidth before 894 // rely on wcwidth to tell us the character width, do wcwidth before
836 // further replacements, as wcwidth might return -1 for the line 895 // further replacements, as wcwidth might return -1 for the line
837 // drawing characters below as they might be invalid in the current 896 // drawing characters below as they might be invalid in the current
838 // locale. 897 // locale.
839 int width = WCWIDTH (c); 898 int width = WCWIDTH (c);
840 899
841 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 900 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
842 { 901 {
843 // vt100 special graphics and line drawing 902 // vt100 special graphics and line drawing
844 // 5f-7e standard vt100 903 // 5f-7e standard vt100
845 // 40-5e rxvt extension for extra curses acs chars 904 // 40-5e rxvt extension for extra curses acs chars
846 static uint16_t vt100_0[62] = { // 41 .. 7e 905 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
859 c = vt100_0[c - 0x41]; 918 c = vt100_0[c - 0x41];
860 width = 1; // vt100 line drawing characters are always single-width 919 width = 1; // vt100 line drawing characters are always single-width
861 } 920 }
862 } 921 }
863 922
864 if (expect_false (screen.flags & Screen_Insert)) 923 if (ecb_unlikely (screen.flags & Screen_Insert))
865 scr_insdel_chars (width, INSERT); 924 scr_insdel_chars (width, INSERT);
866 925
867 if (width != 0) 926 if (width != 0)
868 { 927 {
869#if !UNICODE_3 928#if !UNICODE_3
… …
874# else 933# else
875 c = 0xfffd; 934 c = 0xfffd;
876# endif 935# endif
877#endif 936#endif
878 937
938 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
939
940 // if the character doesn't fit into the remaining columns...
941 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
942 {
943 if (screen.flags & Screen_Autowrap)
944 {
945 // ... artificially enlargen the previous one
946 c = NOCHAR;
947 // and try the same character next loop iteration
948 --str;
949 }
950 else
951 screen.cur.col = ncol - width;
952 }
953
879 // nuke the character at this position, if required 954 // nuke the character at this position, if required
880 if (expect_false ( 955 // due to wonderful coincidences everywhere else in this loop
956 // we never have to check for overwriting a wide char itself,
957 // only its tail.
881 line->t[screen.cur.col] == NOCHAR 958 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
882 || (screen.cur.col < ncol - 1 959 scr_kill_char (*line, screen.cur.col);
883 && line->t[screen.cur.col + 1] == NOCHAR)
884 ))
885 {
886 int col = screen.cur.col;
887
888 // find begin
889 while (col > 0 && line->t[col] == NOCHAR)
890 col--;
891
892 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
893
894 // found begin, nuke
895 do {
896 line->t[col] = ' ';
897 line->r[col] = rend;
898 col++;
899 } while (col < ncol && line->t[col] == NOCHAR);
900 }
901
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903
904 // if the character doesn't fit into the remaining columns...
905 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
906 {
907 // ...output spaces
908 c = ' ';
909 // and try the same character next loop iteration
910 --str;
911 }
912 960
913 line->touch (); 961 line->touch ();
914 962
915 do 963 do
916 { 964 {
917 line->t[screen.cur.col] = c; 965 line->t[screen.cur.col] = c;
918 line->r[screen.cur.col] = rend; 966 line->r[screen.cur.col] = rend;
919 967
920 if (expect_true (screen.cur.col < ncol - 1)) 968 if (ecb_likely (screen.cur.col < ncol - 1))
921 screen.cur.col++; 969 screen.cur.col++;
922 else 970 else
923 { 971 {
924 line->l = ncol; 972 line->l = ncol;
925 if (screen.flags & Screen_Autowrap) 973 if (screen.flags & Screen_Autowrap)
926 screen.flags |= Screen_WrapNext; 974 screen.flags |= Screen_WrapNext;
927 break; 975
976 goto end_of_line;
928 } 977 }
929 978
930 c = NOCHAR; 979 c = NOCHAR;
931 } 980 }
932 while (expect_false (--width > 0)); 981 while (ecb_unlikely (--width > 0));
933 982
934 // pad with spaces when overwriting wide character with smaller one 983 // pad with spaces when overwriting wide character with smaller one
935 if (expect_false (!width)) 984 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
936 { 985 {
937 line->touch ();
938
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
940 {
941 line->t[c] = ' '; 986 line->t[c] = ' ';
942 line->r[c] = rend; 987 line->r[c] = rend;
943 }
944 } 988 }
989
990end_of_line:
991 ;
945 } 992 }
946#if ENABLE_COMBINING 993#if ENABLE_COMBINING
947 else // width == 0 994 else // width == 0
948 { 995 {
949 if (c != 0xfeff) // ignore BOM 996 if (c != 0xfeff) // ignore BOM
… …
989#endif 1036#endif
990 } 1037 }
991 1038
992 max_it (line->l, screen.cur.col); 1039 max_it (line->l, screen.cur.col);
993 1040
994#ifdef DEBUG_STRICT
995 assert (screen.cur.row >= 0); 1041 assert (screen.cur.row >= 0);
996#endif
997} 1042}
998 1043
999/* ------------------------------------------------------------------------- */ 1044/* ------------------------------------------------------------------------- */
1000/* 1045/*
1001 * Process Backspace. Move back the cursor back a position, wrap if have to 1046 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1014 1059
1015 want_refresh = 1; 1060 want_refresh = 1;
1016#endif 1061#endif
1017 } 1062 }
1018 } 1063 }
1064 else if (screen.flags & Screen_WrapNext)
1065 screen.flags &= ~Screen_WrapNext;
1019 else 1066 else
1020 scr_gotorc (0, -1, RELATIVE); 1067 scr_gotorc (0, -1, RELATIVE);
1021} 1068}
1022 1069
1023/* ------------------------------------------------------------------------- */ 1070/* ------------------------------------------------------------------------- */
… …
1101 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1149 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1104 */ 1151 */
1105#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1106void 1153void ecb_cold
1107rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1108{ 1155{
1109 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1111 else 1158 else
… …
1118 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1166 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1121 */ 1168 */
1122#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1123void 1170void ecb_cold
1124rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1125{ 1172{
1126 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1128 else 1175 else
… …
1193 * direction should be UP or DN 1240 * direction should be UP or DN
1194 */ 1241 */
1195void 1242void
1196rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1243rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1197{ 1244{
1198 int dirn;
1199
1200 want_refresh = 1; 1245 want_refresh = 1;
1201 ZERO_SCROLLBACK (); 1246 ZERO_SCROLLBACK ();
1202 1247
1203 dirn = ((direction == UP) ? 1 : -1);
1204
1205 screen.flags &= ~Screen_WrapNext; 1248 screen.flags &= ~Screen_WrapNext;
1206 1249
1207 if ((screen.cur.row == screen.bscroll && direction == UP) 1250 if ((screen.cur.row == screen.bscroll && direction == UP)
1208 || (screen.cur.row == screen.tscroll && direction == DN)) 1251 || (screen.cur.row == screen.tscroll && direction == DN))
1209 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1252 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1210 else 1253 else
1211 screen.cur.row += dirn; 1254 screen.cur.row += direction;
1212 1255
1213 clamp_it (screen.cur.row, 0, nrow - 1); 1256 clamp_it (screen.cur.row, 0, nrow - 1);
1214 selection_check (0); 1257 selection_check (0);
1215} 1258}
1216 1259
… …
1279 scr_blank_line (line, col, num, rstyle); 1322 scr_blank_line (line, col, num, rstyle);
1280} 1323}
1281 1324
1282/* ------------------------------------------------------------------------- */ 1325/* ------------------------------------------------------------------------- */
1283/* 1326/*
1284 * Erase part of whole of the screen 1327 * Erase part or whole of the screen
1285 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1328 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1286 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1329 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1287 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1330 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1288 */ 1331 */
1289void 1332void
… …
1298 ZERO_SCROLLBACK (); 1341 ZERO_SCROLLBACK ();
1299 1342
1300 switch (mode) 1343 switch (mode)
1301 { 1344 {
1302 case 0: /* erase to end of screen */ 1345 case 0: /* erase to end of screen */
1303 selection_check (1);
1304 scr_erase_line (0); 1346 scr_erase_line (0);
1305 row = screen.cur.row + 1; /* possible OOB */ 1347 row = screen.cur.row + 1; /* possible OOB */
1306 num = nrow - row; 1348 num = nrow - row;
1307 break; 1349 break;
1308 case 1: /* erase to beginning of screen */ 1350 case 1: /* erase to beginning of screen */
1309 selection_check (3);
1310 scr_erase_line (1); 1351 scr_erase_line (1);
1311 row = 0; 1352 row = 0;
1312 num = screen.cur.row; 1353 num = screen.cur.row;
1313 break; 1354 break;
1314 case 2: /* erase whole screen */ 1355 case 2: /* erase whole screen */
1315 selection_check (3);
1316 row = 0; 1356 row = 0;
1317 num = nrow; 1357 num = nrow;
1318 break; 1358 break;
1319 default: 1359 default:
1320 return; 1360 return;
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1369 if (row >= nrow) /* Out Of Bounds */
1330 return; 1370 return;
1331 1371
1332 min_it (num, nrow - row); 1372 min_it (num, nrow - row);
1333 1373
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1335 if (rstyle & (RS_RVid | RS_Uline)) 1374 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1375 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1376 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1377 {
1339 ren = DEFAULT_RSTYLE; 1378 ren = DEFAULT_RSTYLE;
1340 1379
1341 if (mapped) 1380 if (mapped)
1342 XClearArea (dpy, vt, 0, 1381 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1382 Row2Pixel (row - view_start), (unsigned int)vt_width,
1344 (unsigned int)Height2Pixel (num), False); 1383 (unsigned int)Height2Pixel (num), False);
1345 } 1384 }
1346 else 1385 else
1347 { 1386 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1387 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1388
1389 if (mapped)
1390 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1391 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1392 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1393 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1394 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1395 (unsigned int)vt_width,
1355 (unsigned int)Height2Pixel (num)); 1396 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1397 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1398 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1399 }
1358 } 1400 }
1359 1401
1360 for (; num--; row++) 1402 for (; num--; row++)
1361 { 1403 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1404 scr_blank_screen_mem (ROW(row), rstyle);
1405
1406 if (row - view_start < nrow)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1407 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1364 } 1408 }
1365} 1409}
1366 1410
1367#if !ENABLE_MINIMAL 1411#if !ENABLE_MINIMAL
1368void 1412void
… …
1378/* ------------------------------------------------------------------------- */ 1422/* ------------------------------------------------------------------------- */
1379/* 1423/*
1380 * Fill the screen with `E's 1424 * Fill the screen with `E's
1381 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1425 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1382 */ 1426 */
1383void 1427void ecb_cold
1384rxvt_term::scr_E () NOTHROW 1428rxvt_term::scr_E () NOTHROW
1385{ 1429{
1386 rend_t fs; 1430 rend_t fs;
1387 1431
1388 want_refresh = 1; 1432 want_refresh = 1;
1389 ZERO_SCROLLBACK (); 1433 ZERO_SCROLLBACK ();
1390 1434
1391 num_scr_allow = 0; 1435 num_scr_allow = 0;
1392 selection_check (3); 1436
1437 row_col_t pos;
1438 pos.row = pos.col = 0;
1439 if (ROWCOL_IS_AFTER (selection.end, pos))
1440 CLEAR_SELECTION ();
1393 1441
1394 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1442 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1395 for (int row = nrow; row--; ) 1443 for (int row = nrow; row--; )
1396 { 1444 {
1397 line_t &line = ROW(row); 1445 line_t &line = ROW(row);
… …
1442 * Insert/Delete <count> characters from the current position 1490 * Insert/Delete <count> characters from the current position
1443 */ 1491 */
1444void 1492void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1493rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1494{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1495 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1496 ZERO_SCROLLBACK ();
1452 1497
1453 if (count <= 0) 1498 if (count <= 0)
1454 return; 1499 return;
… …
1456 scr_do_wrap (); 1501 scr_do_wrap ();
1457 1502
1458 selection_check (1); 1503 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1504 min_it (count, ncol - screen.cur.col);
1460 1505
1461 row = screen.cur.row; 1506 int row = screen.cur.row;
1462 1507
1463 line_t *line = &ROW(row); 1508 line_t *line = &ROW(row);
1464 1509
1465 line->touch (); 1510 line->touch ();
1466 line->is_longer (0); 1511 line->is_longer (0);
1467 1512
1513 // nuke wide spanning the start
1514 if (line->t[screen.cur.col] == NOCHAR)
1515 scr_kill_char (*line, screen.cur.col);
1516
1468 switch (insdel) 1517 switch (insdel)
1469 { 1518 {
1470 case INSERT: 1519 case INSERT:
1471 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1520 line->l = min (line->l + count, ncol);
1521
1522 if (line->t[screen.cur.col] == NOCHAR)
1523 scr_kill_char (*line, screen.cur.col);
1524
1525 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1472 { 1526 {
1473 line->t[col] = line->t[col - count]; 1527 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1528 line->r[col] = line->r[col - count];
1475 } 1529 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1530
1479 if (selection.op && current_screen == selection.screen 1531 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1532 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1533 {
1482 if (selection.end.row != screen.cur.row 1534 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1549 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1550 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1551 selection_check (1);
1500 screen.cur.col -= count; 1552 screen.cur.col -= count;
1501 1553
1502 line->l = max (line->l - count, 0); 1554 // nuke wide char after the end
1555 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1556 scr_kill_char (*line, screen.cur.col + count);
1557
1503 scr_blank_line (*line, screen.cur.col, count, rstyle); 1558 scr_blank_line (*line, screen.cur.col, count, rstyle);
1504 break; 1559 break;
1505 1560
1506 case DELETE: 1561 case DELETE:
1507 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1562 line->l = max (line->l - count, 0);
1508 1563
1564 // nuke wide char spanning the end
1565 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1566 scr_kill_char (*line, screen.cur.col + count);
1567
1509 for (col = screen.cur.col; (col + count) < ncol; col++) 1568 for (int col = screen.cur.col; (col + count) < ncol; col++)
1510 { 1569 {
1511 line->t[col] = line->t[col + count]; 1570 line->t[col] = line->t[col + count];
1512 line->r[col] = line->r[col + count]; 1571 line->r[col] = line->r[col + count];
1513 } 1572 }
1514 1573
1515 line->l = max (line->l - count, 0);
1516 scr_blank_line (*line, ncol - count, count, tr); 1574 scr_blank_line (*line, ncol - count, count, rstyle);
1517 1575
1518 if (selection.op && current_screen == selection.screen 1576 if (selection.op && current_screen == selection.screen
1519 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1577 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1520 { 1578 {
1521 if (selection.end.row != screen.cur.row 1579 if (selection.end.row != screen.cur.row
… …
1538/* ------------------------------------------------------------------------- */ 1596/* ------------------------------------------------------------------------- */
1539/* 1597/*
1540 * Set the scrolling region 1598 * Set the scrolling region
1541 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1599 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1542 */ 1600 */
1543void 1601void ecb_cold
1544rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1602rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1545{ 1603{
1546 max_it (top, 0); 1604 max_it (top, 0);
1547 min_it (bot, nrow - 1); 1605 min_it (bot, nrow - 1);
1548 1606
… …
1558/* 1616/*
1559 * Make the cursor visible/invisible 1617 * Make the cursor visible/invisible
1560 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1618 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1561 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1619 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1562 */ 1620 */
1563void 1621void ecb_cold
1564rxvt_term::scr_cursor_visible (int mode) NOTHROW 1622rxvt_term::scr_cursor_visible (int mode) NOTHROW
1565{ 1623{
1566 want_refresh = 1; 1624 want_refresh = 1;
1567 1625
1568 if (mode) 1626 if (mode)
… …
1575/* 1633/*
1576 * Set/unset automatic wrapping 1634 * Set/unset automatic wrapping
1577 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1635 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1578 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1636 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1579 */ 1637 */
1580void 1638void ecb_cold
1581rxvt_term::scr_autowrap (int mode) NOTHROW 1639rxvt_term::scr_autowrap (int mode) NOTHROW
1582{ 1640{
1583 if (mode) 1641 if (mode)
1584 screen.flags |= Screen_Autowrap; 1642 screen.flags |= Screen_Autowrap;
1585 else 1643 else
… …
1594 * Relative mode: line numbers are relative to top margin of scrolling region 1652 * Relative mode: line numbers are relative to top margin of scrolling region
1595 * and the cursor cannot be moved outside. 1653 * and the cursor cannot be moved outside.
1596 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1654 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1597 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1655 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1598 */ 1656 */
1599void 1657void ecb_cold
1600rxvt_term::scr_relative_origin (int mode) NOTHROW 1658rxvt_term::scr_relative_origin (int mode) NOTHROW
1601{ 1659{
1602 if (mode) 1660 if (mode)
1603 screen.flags |= Screen_Relative; 1661 screen.flags |= Screen_Relative;
1604 else 1662 else
… …
1611/* 1669/*
1612 * Set insert/replace mode 1670 * Set insert/replace mode
1613 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1671 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1614 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1672 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1615 */ 1673 */
1616void 1674void ecb_cold
1617rxvt_term::scr_insert_mode (int mode) NOTHROW 1675rxvt_term::scr_insert_mode (int mode) NOTHROW
1618{ 1676{
1619 if (mode) 1677 if (mode)
1620 screen.flags |= Screen_Insert; 1678 screen.flags |= Screen_Insert;
1621 else 1679 else
… …
1627 * Set/Unset tabs 1685 * Set/Unset tabs
1628 * XTERM_SEQ: Set tab at current column : ESC H 1686 * XTERM_SEQ: Set tab at current column : ESC H
1629 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1687 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1630 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1688 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1631 */ 1689 */
1632void 1690void ecb_cold
1633rxvt_term::scr_set_tab (int mode) NOTHROW 1691rxvt_term::scr_set_tab (int mode) NOTHROW
1634{ 1692{
1635 if (mode < 0) 1693 if (mode < 0)
1636 memset (tabs, 0, ncol); 1694 memset (tabs, 0, ncol);
1637 else if (screen.cur.col < ncol) 1695 else if (screen.cur.col < ncol)
… …
1656 if (rvideo_state != on) 1714 if (rvideo_state != on)
1657 { 1715 {
1658 rvideo_state = on; 1716 rvideo_state = on;
1659 1717
1660 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1718 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1661#ifdef HAVE_BG_PIXMAP 1719#ifdef HAVE_IMG
1662 if (bgPixmap.pixmap == None) 1720 if (bg_img == 0)
1663#endif 1721#endif
1664 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1722 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1665 1723
1666 XGCValues gcvalue; 1724 XGCValues gcvalue;
1667 gcvalue.foreground = pix_colors[Color_fg]; 1725 gcvalue.foreground = pix_colors[Color_fg];
… …
1676/* ------------------------------------------------------------------------- */ 1734/* ------------------------------------------------------------------------- */
1677/* 1735/*
1678 * Report current cursor position 1736 * Report current cursor position
1679 * XTERM_SEQ: Report position: ESC [ 6 n 1737 * XTERM_SEQ: Report position: ESC [ 6 n
1680 */ 1738 */
1681void 1739void ecb_cold
1682rxvt_term::scr_report_position () NOTHROW 1740rxvt_term::scr_report_position () NOTHROW
1683{ 1741{
1684 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1742 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1685} 1743}
1686 1744
… …
1689 * ------------------------------------------------------------------------- */ 1747 * ------------------------------------------------------------------------- */
1690 1748
1691/* 1749/*
1692 * Set font style 1750 * Set font style
1693 */ 1751 */
1694void 1752void ecb_cold
1695rxvt_term::set_font_style () NOTHROW 1753rxvt_term::set_font_style () NOTHROW
1696{ 1754{
1697#if 0 1755#if 0
1698 switch (charsets [screen.charset]) 1756 switch (charsets [screen.charset])
1699 { 1757 {
… …
1721 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1779 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1722 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1780 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1723 * XTERM_SEQ: Invoke G2 character set: ESC N 1781 * XTERM_SEQ: Invoke G2 character set: ESC N
1724 * XTERM_SEQ: Invoke G3 character set: ESC O 1782 * XTERM_SEQ: Invoke G3 character set: ESC O
1725 */ 1783 */
1726void 1784void ecb_cold
1727rxvt_term::scr_charset_choose (int set) NOTHROW 1785rxvt_term::scr_charset_choose (int set) NOTHROW
1728{ 1786{
1729 screen.charset = set; 1787 screen.charset = set;
1730 set_font_style (); 1788 set_font_style ();
1731} 1789}
… …
1752 * ------------------------------------------------------------------------- */ 1810 * ------------------------------------------------------------------------- */
1753 1811
1754/* 1812/*
1755 * refresh matching text. 1813 * refresh matching text.
1756 */ 1814 */
1757bool 1815bool ecb_cold
1758rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1816rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1759{ 1817{
1760 bool found = false; 1818 bool found = false;
1761 1819
1762 for (int i = 0; i < nrow; i++) 1820 for (int i = 0; i < nrow; i++)
… …
1781 PART_BEG = 0, 1839 PART_BEG = 0,
1782 PART_END, 1840 PART_END,
1783 RC_COUNT 1841 RC_COUNT
1784}; 1842};
1785 1843
1786void 1844void ecb_hot
1787rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1845rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1788{ 1846{
1789 int i; 1847 int i;
1790 row_col_t rc[RC_COUNT]; 1848 row_col_t rc[RC_COUNT];
1791 1849
… …
1811 for (i = PART_BEG; i < RC_COUNT; i++) 1869 for (i = PART_BEG; i < RC_COUNT; i++)
1812 { 1870 {
1813 min_it (rc[i].col, ncol - 1); 1871 min_it (rc[i].col, ncol - 1);
1814 min_it (rc[i].row, nrow - 1); 1872 min_it (rc[i].row, nrow - 1);
1815 } 1873 }
1816// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1874
1817 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1875 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1818 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1876 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1819 1877
1820 num_scr_allow = 0; 1878 num_scr_allow = 0;
1821 1879
… …
1828 * Refresh the entire screen 1886 * Refresh the entire screen
1829 */ 1887 */
1830void 1888void
1831rxvt_term::scr_touch (bool refresh) NOTHROW 1889rxvt_term::scr_touch (bool refresh) NOTHROW
1832{ 1890{
1833 scr_expose (0, 0, width, height, refresh); 1891 scr_expose (0, 0, vt_width, vt_height, refresh);
1834} 1892}
1835 1893
1836/* ------------------------------------------------------------------------- */ 1894/* ------------------------------------------------------------------------- */
1837/* 1895/*
1838 * Move the display so that the line represented by scrollbar value Y is at 1896 * Move the display so that the line represented by scrollbar value Y is at
… …
1848/* 1906/*
1849 * Page the screen up/down nlines 1907 * Page the screen up/down nlines
1850 * direction should be UP or DN 1908 * direction should be UP or DN
1851 */ 1909 */
1852bool 1910bool
1853rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1911rxvt_term::scr_page (int nlines) NOTHROW
1854{ 1912{
1855 int new_view_start =
1856 direction == UP ? view_start - nlines
1857 : view_start + nlines;
1858
1859 return scr_changeview (new_view_start); 1913 return scr_changeview (view_start - nlines);
1860} 1914}
1861 1915
1862bool 1916bool
1863rxvt_term::scr_changeview (int new_view_start) NOTHROW 1917rxvt_term::scr_changeview (int new_view_start) NOTHROW
1864{ 1918{
… …
1894 1948
1895# ifndef NO_MAPALERT 1949# ifndef NO_MAPALERT
1896# ifdef MAPALERT_OPTION 1950# ifdef MAPALERT_OPTION
1897 if (option (Opt_mapAlert)) 1951 if (option (Opt_mapAlert))
1898# endif 1952# endif
1899 XMapWindow (dpy, parent[0]); 1953 XMapWindow (dpy, parent);
1900# endif 1954# endif
1901 1955
1902# if ENABLE_FRILLS 1956# if ENABLE_FRILLS
1903 if (option (Opt_urgentOnBell)) 1957 if (option (Opt_urgentOnBell))
1904 { 1958 set_urgency (1);
1905 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1906 {
1907 h->flags |= XUrgencyHint;
1908 XSetWMHints (dpy, parent[0], h);
1909 }
1910 }
1911# endif 1959# endif
1912 1960
1913 if (option (Opt_visualBell)) 1961 if (option (Opt_visualBell))
1914 { 1962 {
1915 rvideo_bell = true; 1963 rvideo_bell = true;
… …
1918 1966
1919 bell_ev.start (VISUAL_BELL_DURATION); 1967 bell_ev.start (VISUAL_BELL_DURATION);
1920 } 1968 }
1921 else 1969 else
1922 XBell (dpy, 0); 1970 XBell (dpy, 0);
1971 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1923#endif 1972#endif
1924} 1973}
1925 1974
1926/* ------------------------------------------------------------------------- */ 1975/* ------------------------------------------------------------------------- */
1927/* ARGSUSED */ 1976void ecb_cold
1928void
1929rxvt_term::scr_printscreen (int fullhist) NOTHROW 1977rxvt_term::scr_printscreen (int fullhist) NOTHROW
1930{ 1978{
1931#ifdef PRINTPIPE 1979#ifdef PRINTPIPE
1932 int nrows, row_start; 1980 int nrows, row_start;
1933 FILE *fd = popen_printer (); 1981 FILE *fd = popen_printer ();
… …
1946 row_start = view_start; 1994 row_start = view_start;
1947 } 1995 }
1948 1996
1949 wctomb (0, 0); 1997 wctomb (0, 0);
1950 1998
1951 for (int r1 = 0; r1 < nrows; r1++) 1999 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1952 { 2000 {
1953 text_t *tp = ROW(r1).t; 2001 text_t *tp = ROW(r1).t;
1954 int len = ROW(r1).l; 2002 int len = ROW(r1).l;
1955 2003
1956 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2004 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1982/* 2030/*
1983 * Refresh the screen 2031 * Refresh the screen
1984 * drawn_text/drawn_rend contain the screen information before the update. 2032 * drawn_text/drawn_rend contain the screen information before the update.
1985 * screen.text/screen.rend contain what the screen will change to. 2033 * screen.text/screen.rend contain what the screen will change to.
1986 */ 2034 */
1987void 2035void ecb_hot
1988rxvt_term::scr_refresh () NOTHROW 2036rxvt_term::scr_refresh () NOTHROW
1989{ 2037{
1990 unsigned char have_bg,
1991 showcursor; /* show the cursor */
1992 int16_t col, row, /* column/row we're processing */ 2038 int16_t col, row, /* column/row we're processing */
1993 ocrow; /* old cursor row */ 2039 ocrow; /* old cursor row */
1994 int i; /* tmp */ 2040 int i; /* tmp */
1995#ifndef NO_CURSORCOLOR
1996 rend_t cc1; /* store colours at cursor position (s) */
1997#endif
1998 rend_t *crp; // cursor rendition pointer
1999 rend_t ccol1, /* Cursor colour */ 2041 rend_t ccol1, /* Cursor colour */
2000 ccol2; /* Cursor colour2 */ 2042 ccol2; /* Cursor colour2 */
2043 rend_t cur_rend;
2044 int cur_col;
2045 int cursorwidth;
2001 2046
2002 want_refresh = 0; /* screen is current */ 2047 want_refresh = 0; /* screen is current */
2003 2048
2004 if (refresh_type == NO_REFRESH || !mapped) 2049 if (refresh_type == NO_REFRESH || !mapped)
2005 return; 2050 return;
… …
2007 /* 2052 /*
2008 * A: set up vars 2053 * A: set up vars
2009 */ 2054 */
2010 refresh_count = 0; 2055 refresh_count = 0;
2011 2056
2057 unsigned int old_screen_flags = screen.flags;
2012 have_bg = 0; 2058 bool have_bg = 0;
2013#ifdef HAVE_BG_PIXMAP 2059#ifdef HAVE_IMG
2014 have_bg = bgPixmap.pixmap != None; 2060 have_bg = bg_img != 0;
2015#endif 2061#endif
2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2017 2063
2018 /* 2064 /*
2019 * B: reverse any characters which are selected 2065 * B: reverse any characters which are selected
2020 */ 2066 */
2021 scr_reverse_selection (); 2067 scr_reverse_selection ();
2022 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
2023 /* 2076 /*
2024 * C: set the cursor character (s) 2077 * C: set the cursor character (s)
2025 */ 2078 */
2026 { 2079 {
2027 unsigned char setoldcursor;
2028
2029 showcursor = (screen.flags & Screen_VisibleCursor);
2030#ifdef CURSOR_BLINK 2080#ifdef CURSOR_BLINK
2031 if (hidden_cursor) 2081 if (hidden_cursor)
2032 showcursor = 0; 2082 showcursor = 0;
2033#endif 2083#endif
2034 2084
… …
2037 int col = screen.cur.col; 2087 int col = screen.cur.col;
2038 2088
2039 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2089 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2040 col--; 2090 col--;
2041 2091
2092 cursorwidth = 1;
2093 while (col + cursorwidth < ncol
2094 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2095 cursorwidth++;
2096
2042 crp = &ROW(screen.cur.row).r[col]; 2097 cur_rend = ROW(screen.cur.row).r[col];
2098 cur_col = col;
2043 2099
2044#ifndef NO_CURSORCOLOR 2100#ifndef NO_CURSORCOLOR
2045 cc1 = *crp & (RS_fgMask | RS_bgMask);
2046 if (ISSET_PIXCOLOR (Color_cursor)) 2101 if (ISSET_PIXCOLOR (Color_cursor))
2047 ccol1 = Color_cursor; 2102 ccol1 = Color_cursor;
2048 else 2103 else
2049#endif 2104#endif
2050#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2105#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2062 ccol2 = bgcolor_of (rstyle); 2117 ccol2 = bgcolor_of (rstyle);
2063#else 2118#else
2064 ccol2 = Color_bg; 2119 ccol2 = Color_bg;
2065#endif 2120#endif
2066 2121
2067 if (showcursor && focus) 2122 if (focus)
2068 { 2123 {
2124 rend_t rend = cur_rend;
2125
2069 if (option (Opt_cursorUnderline)) 2126 if (option (Opt_cursorUnderline))
2070 *crp ^= RS_Uline; 2127 rend ^= RS_Uline;
2071 else 2128 else
2072 { 2129 {
2073 *crp ^= RS_RVid; 2130 rend ^= RS_RVid;
2074 *crp = SET_FGCOLOR (*crp, ccol1); 2131 rend = SET_FGCOLOR (rend, ccol1);
2075 *crp = SET_BGCOLOR (*crp, ccol2); 2132 rend = SET_BGCOLOR (rend, ccol2);
2076 } 2133 }
2134
2135 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2077 } 2136 }
2078 } 2137 }
2079 2138
2080 /* make sure no outline cursor is left around */ 2139 /* make sure no outline cursor is left around */
2081 setoldcursor = 0;
2082 if (ocrow != -1) 2140 if (ocrow != -1)
2083 { 2141 {
2084 if (screen.cur.row - view_start != ocrow 2142 if (screen.cur.row - view_start != ocrow
2085 || screen.cur.col != oldcursor.col) 2143 || screen.cur.col != oldcursor.col)
2086 { 2144 {
2087 if (ocrow < nrow 2145 if (ocrow < nrow
2088 && oldcursor.col < ncol) 2146 && oldcursor.col < ncol)
2089 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2147 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2090
2091 if (focus || !showcursor)
2092 oldcursor.row = -1;
2093 else
2094 setoldcursor = 1;
2095 } 2148 }
2096 } 2149 }
2097 else if (!focus)
2098 setoldcursor = 1;
2099 2150
2100 if (setoldcursor) 2151 // save the current cursor coordinates if the cursor is visible
2152 // and the window is unfocused, so as to clear the outline cursor
2153 // in the next refresh if the cursor moves
2154 if (showcursor && !focus && screen.cur.row - view_start < nrow)
2101 { 2155 {
2102 if (screen.cur.row - view_start >= nrow)
2103 oldcursor.row = -1;
2104 else
2105 {
2106 oldcursor.row = screen.cur.row - view_start; 2156 oldcursor.row = screen.cur.row - view_start;
2107 oldcursor.col = screen.cur.col; 2157 oldcursor.col = screen.cur.col;
2108 }
2109 } 2158 }
2159 else
2160 oldcursor.row = -1;
2110 } 2161 }
2111
2112 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2113#if ENABLE_OVERLAY
2114 scr_swap_overlay ();
2115#endif
2116 2162
2117#ifndef NO_SLOW_LINK_SUPPORT 2163#ifndef NO_SLOW_LINK_SUPPORT
2118 /* 2164 /*
2119 * D: CopyArea pass - very useful for slower links 2165 * D: CopyArea pass - very useful for slower links
2120 * This has been deliberately kept simple. 2166 * This has been deliberately kept simple.
… …
2125 { 2171 {
2126 int16_t nits; 2172 int16_t nits;
2127 int i = num_scr; 2173 int i = num_scr;
2128 int j; 2174 int j;
2129 int len, wlen; 2175 int len, wlen;
2130 dLocal (int, num_scr);
2131 2176
2132 j = nrow; 2177 j = nrow;
2133 wlen = len = -1; 2178 wlen = len = -1;
2134 row = i > 0 ? 0 : j - 1; 2179 row = i > 0 ? 0 : j - 1;
2135 2180
… …
2210 continue; 2255 continue;
2211 2256
2212 // redraw one or more characters 2257 // redraw one or more characters
2213 2258
2214 // seek to the beginning of wide characters 2259 // seek to the beginning of wide characters
2215 while (stp[col] == NOCHAR && col > 0) 2260 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2216 --col; 2261 --col;
2217 2262
2218 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2263 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2219 text_t *text = stp + col; 2264 text_t *text = stp + col;
2220 int count = 1; 2265 int count = 1;
2221 2266
2222 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2223 drp[col] = rend; 2268 drp[col] = rend;
… …
2227 for (i = 0; ++col < ncol; ) 2272 for (i = 0; ++col < ncol; )
2228 { 2273 {
2229 if (stp[col] == NOCHAR) 2274 if (stp[col] == NOCHAR)
2230 { 2275 {
2231 dtp[col] = stp[col]; 2276 dtp[col] = stp[col];
2232 drp[col] = rend; 2277 drp[col] = srp[col];
2278
2233 count++; 2279 count++;
2234 i++; 2280 i++;
2235 2281
2236 continue; 2282 continue;
2237 } 2283 }
… …
2257 2303
2258 col--; /* went one too far. move back */ 2304 col--; /* went one too far. move back */
2259 count -= i; /* dump any matching trailing chars */ 2305 count -= i; /* dump any matching trailing chars */
2260 2306
2261 // sometimes we optimize away the trailing NOCHAR's, add them back 2307 // sometimes we optimize away the trailing NOCHAR's, add them back
2262 while (i && text[count] == NOCHAR) 2308 while (ecb_unlikely (i && text[count] == NOCHAR))
2263 count++, i--; 2309 count++, i--;
2264 2310
2265 /* 2311 /*
2266 * Determine the attributes for the string 2312 * Determine the attributes for the string
2267 */ 2313 */
2268 int fore = fgcolor_of (rend); // desired foreground 2314 int fore = fgcolor_of (rend); // desired foreground
2269 int back = bgcolor_of (rend); // desired background 2315 int back = bgcolor_of (rend); // desired background
2270 2316
2271 // only do special processing if any attributes are set, which is unlikely 2317 // only do special processing if any attributes are set, which is unlikely
2272 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2318 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2273 { 2319 {
2274 bool invert = rend & RS_RVid; 2320 bool invert = rend & RS_RVid;
2275 2321
2276#ifndef NO_BOLD_UNDERLINE_REVERSE 2322#ifndef NO_BOLD_UNDERLINE_REVERSE
2277 if (rend & RS_Bold && fore == Color_fg) 2323 if (rend & RS_Bold && fore == Color_fg)
… …
2296 2342
2297 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2343 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2298 fore = Color_UL; 2344 fore = Color_UL;
2299#endif 2345#endif
2300 2346
2347#ifdef OPTION_HC
2348 if (rend & RS_Sel)
2349 {
2350 /* invert the column if no highlightColor is set or it is the
2351 * current cursor column */
2352 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2353 && ISSET_PIXCOLOR (Color_HC))
2354 {
2355 if (ISSET_PIXCOLOR (Color_HTC))
2356 fore = Color_HTC;
2357 // if invert is 0 reverse video is set so we use bg color as fg color
2358 else if (!invert)
2359 fore = back;
2360
2361 back = Color_HC;
2362 invert = 0;
2363 }
2364 }
2365#endif
2366
2301 if (invert) 2367 if (invert)
2302 { 2368 {
2303#ifdef OPTION_HC
2304 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2305 || !ISSET_PIXCOLOR (Color_HC))
2306#endif
2307 /* invert the column if no highlightColor is set or it is the
2308 * current cursor column */
2309 ::swap (fore, back); 2369 ::swap (fore, back);
2310#ifdef OPTION_HC
2311 else if (ISSET_PIXCOLOR (Color_HC))
2312 back = Color_HC;
2313#endif
2314 2370
2315#ifndef NO_BOLD_UNDERLINE_REVERSE 2371#ifndef NO_BOLD_UNDERLINE_REVERSE
2316# ifndef OPTION_HC
2317 if (ISSET_PIXCOLOR (Color_RV))
2318 back = Color_RV;
2319# endif
2320 if (fore == back) 2372 if (fore == back)
2321 { 2373 {
2322 fore = Color_bg; 2374 fore = Color_bg;
2323 back = Color_fg; 2375 back = Color_fg;
2324 } 2376 }
… …
2360 /* 2412 /*
2361 * Actually do the drawing of the string here 2413 * Actually do the drawing of the string here
2362 */ 2414 */
2363 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2415 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2364 2416
2365 if (have_bg && back == Color_bg) 2417 if (ecb_likely (have_bg && back == Color_bg))
2366 { 2418 {
2367 // this is very ugly, maybe push it into ->draw? 2419 // this is very ugly, maybe push it into ->draw?
2368 2420
2369 for (i = 0; i < count; i++) /* don't draw empty strings */ 2421 for (i = 0; i < count; i++) /* don't draw empty strings */
2370 if (text[i] != ' ') 2422 if (text[i] != ' ')
… …
2377 did_clear: ; 2429 did_clear: ;
2378 } 2430 }
2379 else 2431 else
2380 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2432 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2381 2433
2382 if (rend & RS_Uline && font->descent > 1 && fore != back) 2434 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2383 { 2435 {
2436 if (showcursor && focus && row == screen.cur.row
2437 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2438 XSetForeground (dpy, gc, pix_colors[ccol1]);
2439 else
2384#if ENABLE_FRILLS 2440#if ENABLE_FRILLS
2385 if (ISSET_PIXCOLOR (Color_underline)) 2441 if (ISSET_PIXCOLOR (Color_underline))
2386 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2442 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2387 else 2443 else
2388#endif 2444#endif
… …
2393 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2449 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2394 } 2450 }
2395 } /* for (col....) */ 2451 } /* for (col....) */
2396 } /* for (row....) */ 2452 } /* for (row....) */
2397 2453
2398#if ENABLE_OVERLAY
2399 scr_swap_overlay ();
2400#endif
2401 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2402
2403 /* 2454 /*
2404 * G: cleanup cursor and display outline cursor if necessary 2455 * G: cleanup cursor and display outline cursor if necessary
2405 */ 2456 */
2406 if (showcursor) 2457 if (showcursor)
2407 { 2458 {
2408 if (focus) 2459 if (focus)
2409 { 2460 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2410 if (option (Opt_cursorUnderline))
2411 *crp ^= RS_Uline;
2412 else
2413 {
2414 *crp ^= RS_RVid;
2415#ifndef NO_CURSORCOLOR
2416 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2417#endif
2418 }
2419 }
2420 else if (oldcursor.row >= 0) 2461 else if (oldcursor.row >= 0)
2421 { 2462 {
2422 int cursorwidth = 1;
2423 int col = oldcursor.col;
2424
2425 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2426 col--;
2427
2428 while (col + cursorwidth < ncol
2429 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2430 cursorwidth++;
2431
2432#ifndef NO_CURSORCOLOR
2433 if (ISSET_PIXCOLOR (Color_cursor))
2434 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2435 else
2436#endif
2437 XSetForeground (dpy, gc, pix_colors[ccol1]); 2463 XSetForeground (dpy, gc, pix_colors[ccol1]);
2438 2464
2439 XDrawRectangle (dpy, vt, gc, 2465 XDrawRectangle (dpy, vt, gc,
2440 Col2Pixel (col), 2466 Col2Pixel (cur_col),
2441 Row2Pixel (oldcursor.row), 2467 Row2Pixel (oldcursor.row),
2442 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2468 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2443 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2469 (unsigned int) (Height2Pixel (1) - 1));
2444 } 2470 }
2445 } 2471 }
2446 2472
2447 /* 2473 /*
2448 * H: cleanup selection 2474 * H: cleanup selection
2449 */ 2475 */
2476#if ENABLE_OVERLAY
2477 scr_swap_overlay ();
2478#endif
2479 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2480
2450 scr_reverse_selection (); 2481 scr_reverse_selection ();
2451 2482
2483 screen.flags = old_screen_flags;
2452 num_scr = 0; 2484 num_scr = 0;
2453 num_scr_allow = 1; 2485 num_scr_allow = 1;
2454} 2486}
2455 2487
2456void 2488void ecb_cold
2457rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2489rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2458{ 2490{
2459 if (!l.t) 2491 if (!l.valid ())
2460 return; 2492 return;
2461 2493
2462 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2494 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2463 2495
2464 for (int i = ncol; i--; ) 2496 for (int i = ncol; i--; )
2465 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2497 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2466} 2498}
2467 2499
2468void 2500void ecb_cold
2469rxvt_term::scr_remap_chars () NOTHROW 2501rxvt_term::scr_remap_chars () NOTHROW
2470{ 2502{
2471 for (int i = total_rows; i--; ) 2503 for (int i = total_rows; i--; )
2472 scr_remap_chars (row_buf [i]); 2504 scr_remap_chars (row_buf [i]);
2473 2505
… …
2476 scr_remap_chars (drawn_buf [i]); 2508 scr_remap_chars (drawn_buf [i]);
2477 scr_remap_chars (swap_buf [i]); 2509 scr_remap_chars (swap_buf [i]);
2478 } 2510 }
2479} 2511}
2480 2512
2481void 2513void ecb_cold
2482rxvt_term::scr_recolour () NOTHROW 2514rxvt_term::scr_recolour (bool refresh) NOTHROW
2483{ 2515{
2484#ifdef HAVE_BG_PIXMAP 2516 bool transparent = false;
2485 bgPixmap.apply ();
2486#else
2487 2517
2518#ifdef HAVE_IMG
2519 if (bg_img != 0)
2520 {
2521# if ENABLE_TRANSPARENCY
2522 if (bg_flags & BG_IS_TRANSPARENT)
2523 {
2524 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2525 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2526
2527 transparent = true;
2528 }
2529 else
2530# endif
2531 {
2532 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2533 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2534 }
2535 }
2536 else
2537#endif
2538 {
2488 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2539 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2489 XClearWindow (dpy, parent[0]);
2490 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2540 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2541 }
2542
2543 XClearWindow (dpy, parent);
2491 2544
2492 if (scrollBar.win) 2545 if (scrollBar.win)
2493 { 2546 {
2547 if (transparent)
2548 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2549 else
2494 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2550 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2495 scrollBar.state = STATE_IDLE; 2551 scrollBar.state = SB_STATE_IDLE;
2496 scrollBar.show (0); 2552 scrollBar.show (0);
2497 } 2553 }
2498 2554
2499#endif 2555 if (refresh)
2500 2556 {
2501 /* bgPixmap.apply () does not do the following : */
2502 scr_clear (); 2557 scr_clear ();
2503 scr_touch (true); 2558 scr_touch (true);
2559 }
2504 want_refresh = 1; 2560 want_refresh = 1;
2505} 2561}
2506 2562
2507/* ------------------------------------------------------------------------- */ 2563/* ------------------------------------------------------------------------- */
2508void 2564void
… …
2565 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2621 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2566 srp[col] ^= rstyle; 2622 srp[col] ^= rstyle;
2567} 2623}
2568 2624
2569/* ------------------------------------------------------------------------- */ 2625/* ------------------------------------------------------------------------- */
2570void 2626void ecb_hot
2571rxvt_term::scr_reverse_selection () NOTHROW 2627rxvt_term::scr_reverse_selection () NOTHROW
2572{ 2628{
2573 if (selection.op 2629 if (selection.op
2574 && current_screen == selection.screen 2630 && current_screen == selection.screen
2575 && selection.end.row >= view_start) 2631 && selection.end.row >= view_start)
2576 { 2632 {
2577#if !ENABLE_MINIMAL 2633#if !ENABLE_MINIMAL
2578 if (selection.rect) 2634 if (selection.rect)
2579 scr_xor_rect (selection.beg.row, selection.beg.col, 2635 scr_xor_rect (selection.beg.row, selection.beg.col,
2580 selection.end.row, selection.end.col, 2636 selection.end.row, selection.end.col,
2581 RS_RVid, RS_RVid | RS_Uline); 2637 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2582 else 2638 else
2583#endif 2639#endif
2584 scr_xor_span (selection.beg.row, selection.beg.col, 2640 scr_xor_span (selection.beg.row, selection.beg.col,
2585 selection.end.row, selection.end.col, 2641 selection.end.row, selection.end.col,
2586 RS_RVid); 2642 RS_Sel | RS_RVid);
2587 } 2643 }
2588} 2644}
2589 2645
2590/* ------------------------------------------------------------------------- */ 2646/* ------------------------------------------------------------------------- */
2591/* 2647/*
… …
2594 */ 2650 */
2595#if 0 2651#if 0
2596void 2652void
2597rxvt_term::scr_dump (int fd) NOTHROW 2653rxvt_term::scr_dump (int fd) NOTHROW
2598{ 2654{
2599 int row, wrote; 2655 // if this method is needed, it can be implemented by factoring the
2600 unsigned int width, towrite; 2656 // relevant code in scr_printscreen
2601 char r1[] = "\n";
2602
2603 for (row = saveLines + top_row;
2604 row < saveLines + nrow - 1; row++)
2605 {
2606 width = row_buf[row].l >= 0 ? row_buf[row].l
2607 : ncol;
2608 for (towrite = width; towrite; towrite -= wrote)
2609 {
2610 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2611 towrite);
2612 if (wrote < 0)
2613 return; /* XXX: death, no report */
2614 }
2615 if (row_buf[row].l >= 0)
2616 if (write (fd, r1, 1) <= 0)
2617 return; /* XXX: death, no report */
2618 }
2619} 2657}
2620#endif 2658#endif
2621 2659
2622/* ------------------------------------------------------------------------- * 2660/* ------------------------------------------------------------------------- *
2623 * CHARACTER SELECTION * 2661 * CHARACTER SELECTION *
2624 * ------------------------------------------------------------------------- */ 2662 * ------------------------------------------------------------------------- */
2625void 2663void
2626rxvt_term::selection_check (int check_more) NOTHROW 2664rxvt_term::selection_check (int check_more) NOTHROW
2627{ 2665{
2628 row_col_t pos;
2629
2630 if (!selection.op) 2666 if (!selection.op)
2631 return; 2667 return;
2632 2668
2633 pos.row = pos.col = 0;
2634 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2669 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2635 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2670 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2636 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2671 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2637 || (check_more == 1 2672 || (check_more == 1
2638 && current_screen == selection.screen 2673 && current_screen == selection.screen
2639 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2674 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2640 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2675 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2641 || (check_more == 2
2642 && ROWCOL_IS_BEFORE (selection.beg, pos)
2643 && ROWCOL_IS_AFTER (selection.end, pos))
2644 || (check_more == 3
2645 && ROWCOL_IS_AFTER (selection.end, pos))
2646 || (check_more == 4 /* screen width change */
2647 && (selection.beg.row != selection.end.row
2648 || selection.end.col > ncol)))
2649 CLEAR_SELECTION (); 2676 CLEAR_ALL_SELECTION ();
2677}
2678
2679void
2680rxvt_term::selection_changed () NOTHROW
2681{
2682 line_t &r1 = ROW (selection.beg.row);
2683 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2684 --selection.beg.col;
2685
2686 line_t &r2 = ROW (selection.end.row);
2687 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2688 ++selection.end.col;
2689
2690 want_refresh = 1;
2650} 2691}
2651 2692
2652/* ------------------------------------------------------------------------- */ 2693/* ------------------------------------------------------------------------- */
2653/* 2694/*
2654 * Paste a selection direct to the command fd 2695 * Paste a selection direct to the command fd
2655 */ 2696 */
2656void 2697void
2657rxvt_term::paste (char *data, unsigned int len) NOTHROW 2698rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2658{ 2699{
2659 /* convert normal newline chars into common keyboard Return key sequence */ 2700 /* convert normal newline chars into common keyboard Return key sequence */
2660 for (unsigned int i = 0; i < len; i++) 2701 for (unsigned int i = 0; i < len; i++)
2661 if (data[i] == C0_LF) 2702 if (data[i] == C0_LF)
2662 data[i] = C0_CR; 2703 data[i] = C0_CR;
2663 2704
2664 if (priv_modes & PrivMode_BracketPaste) 2705 if (priv_modes & PrivMode_BracketPaste)
2665 tt_printf ("\e[200~"); 2706 tt_printf ("\x1b[200~");
2666 2707
2667 tt_write (data, len); 2708 tt_write (data, len);
2668 2709
2669 if (priv_modes & PrivMode_BracketPaste) 2710 if (priv_modes & PrivMode_BracketPaste)
2670 tt_printf ("\e[201~"); 2711 tt_printf ("\x1b[201~");
2671} 2712}
2672 2713
2673/* ------------------------------------------------------------------------- */
2674/*
2675 * Respond to a notification that a primary selection has been sent
2676 * EXT: SelectionNotify
2677 */
2678void 2714void
2679rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2715rxvt_term::paste (char *data, unsigned int len) NOTHROW
2680{ 2716{
2681 if (prop == None) /* check for failed XConvertSelection */ 2717 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2682 {
2683 if ((selection_type & Sel_CompoundText))
2684 {
2685 int selnum = selection_type & Sel_whereMask;
2686
2687 selection_type = 0;
2688 if (selnum != Sel_direct)
2689 selection_request_other (XA_STRING, selnum);
2690 }
2691
2692 if ((selection_type & Sel_UTF8String))
2693 {
2694 int selnum = selection_type & Sel_whereMask;
2695
2696 selection_type = Sel_CompoundText;
2697 if (selnum != Sel_direct)
2698 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2699 else
2700 selection_type = 0;
2701 }
2702
2703 return;
2704 }
2705
2706 unsigned long bytes_after;
2707 XTextProperty ct;
2708
2709 if (XGetWindowProperty (dpy, win, prop,
2710 0, PROP_SIZE / 4,
2711 delete_prop, AnyPropertyType,
2712 &ct.encoding, &ct.format,
2713 &ct.nitems, &bytes_after,
2714 &ct.value) != Success)
2715 {
2716 ct.value = 0;
2717 goto bailout;
2718 }
2719
2720 if (ct.encoding == None)
2721 goto bailout;
2722
2723 if (bytes_after)
2724 {
2725 // fetch and append remaining data
2726 XTextProperty ct2;
2727
2728 if (XGetWindowProperty (dpy, win, prop,
2729 ct.nitems / 4, (bytes_after + 3) / 4,
2730 delete_prop, AnyPropertyType,
2731 &ct2.encoding, &ct2.format,
2732 &ct2.nitems, &bytes_after,
2733 &ct2.value) != Success)
2734 goto bailout;
2735
2736 // realloc should be compatible to XFree, here, and elsewhere, too
2737 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2738 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2739 ct.nitems += ct2.nitems;
2740
2741 XFree (ct2.value);
2742 }
2743
2744 if (ct.value == 0)
2745 goto bailout;
2746
2747 if (ct.encoding == xa[XA_INCR])
2748 {
2749 // INCR selection, start handshake
2750 if (!delete_prop)
2751 XDeleteProperty (dpy, win, prop);
2752
2753 selection_wait = Sel_incr;
2754 incr_buf_fill = 0;
2755 incr_ev.start (10);
2756
2757 goto bailout;
2758 }
2759
2760 if (ct.nitems == 0)
2761 {
2762 if (selection_wait == Sel_incr)
2763 {
2764 XFree (ct.value);
2765
2766 // finally complete, now paste the whole thing
2767 selection_wait = Sel_normal;
2768 ct.value = (unsigned char *)incr_buf;
2769 ct.nitems = incr_buf_fill;
2770 incr_buf = 0;
2771 incr_buf_size = 0;
2772 incr_ev.stop ();
2773 }
2774 else
2775 {
2776 if (selection_wait == Sel_normal
2777 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2778 {
2779 /*
2780 * pass through again trying CUT_BUFFER0 if we've come from
2781 * XConvertSelection () but nothing was presented
2782 */
2783 selection_paste (display->root, XA_CUT_BUFFER0, False);
2784 }
2785
2786 goto bailout;
2787 }
2788 }
2789 else if (selection_wait == Sel_incr)
2790 {
2791 incr_ev.start (10);
2792
2793 while (incr_buf_fill + ct.nitems > incr_buf_size)
2794 {
2795 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2796 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2797 }
2798
2799 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2800 incr_buf_fill += ct.nitems;
2801
2802 goto bailout;
2803 }
2804
2805 char **cl;
2806 int cr;
2807
2808#if !ENABLE_MINIMAL
2809 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2810 // so recode it manually
2811 if (ct.encoding == xa[XA_UTF8_STRING])
2812 {
2813 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2814 char *s = rxvt_wcstombs (w);
2815 free (w);
2816 // TODO: strlen == only the first element will be converted. well...
2817 paste (s, strlen (s));
2818 free (s);
2819 }
2820 else
2821#endif
2822 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2823 && cl)
2824 {
2825 for (int i = 0; i < cr; i++)
2826 paste (cl[i], strlen (cl[i]));
2827
2828 XFreeStringList (cl);
2829 }
2830 else
2831 paste ((char *)ct.value, ct.nitems); // paste raw
2832
2833bailout:
2834 XFree (ct.value);
2835
2836 if (selection_wait == Sel_normal)
2837 selection_wait = Sel_none;
2838}
2839
2840void
2841rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2842{
2843 selection_wait = Sel_none;
2844
2845 incr_buf_size = 0;
2846 free (incr_buf);
2847
2848 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2849}
2850
2851void
2852rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2853{
2854 if (prop == None || selection_wait != Sel_incr)
2855 return; 2718 return;
2856 2719
2857 selection_paste (win, prop, true); 2720 tt_paste (data, len);
2858} 2721}
2859 2722
2860/* ------------------------------------------------------------------------- */ 2723/* ------------------------------------------------------------------------- */
2861/* 2724/*
2862 * Request the current selection: 2725 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2863 * Order: > internal selection if available 2726 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2864 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2727 * as fallback
2865 * > CUT_BUFFER0
2866 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2867 * will auto fallback to CUT_BUFFER0
2868 * EXT: button 2 release 2728 * EXT: button 2 release
2869 */ 2729 */
2870void 2730void
2871rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2731rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2872{ 2732{
2873 if (selection.text && selnum == Sel_Primary) 2733 if (!selection_req)
2874 {
2875 /* internal selection */
2876 char *str = rxvt_wcstombs (selection.text, selection.len);
2877 paste (str, strlen (str));
2878 free (str);
2879 return;
2880 } 2734 {
2881 else 2735 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2736 selection_req->run ();
2882 { 2737 }
2883 selection_request_time = tm;
2884 selection_wait = Sel_normal;
2885
2886#if X_HAVE_UTF8_STRING
2887 selection_type = Sel_UTF8String;
2888 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2889 return;
2890#else
2891 selection_type = Sel_CompoundText;
2892 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2893 return;
2894#endif
2895 }
2896
2897 selection_wait = Sel_none; /* don't loop in selection_paste () */
2898 selection_paste (display->root, XA_CUT_BUFFER0, false);
2899}
2900
2901int
2902rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2903{
2904 Atom sel;
2905
2906 selection_type |= selnum;
2907
2908 if (selnum == Sel_Primary)
2909 sel = XA_PRIMARY;
2910 else if (selnum == Sel_Secondary)
2911 sel = XA_SECONDARY;
2912 else
2913 sel = xa[XA_CLIPBOARD];
2914
2915 if (XGetSelectionOwner (dpy, sel) != None)
2916 {
2917 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2918 vt, selection_request_time);
2919 return 1;
2920 }
2921
2922 return 0;
2923} 2738}
2924 2739
2925/* ------------------------------------------------------------------------- */ 2740/* ------------------------------------------------------------------------- */
2926/* 2741/*
2927 * Clear all selected text 2742 * Clear all selected text
2928 * EXT: SelectionClear 2743 * EXT: SelectionClear
2929 */ 2744 */
2930void 2745void
2931rxvt_term::selection_clear () NOTHROW 2746rxvt_term::selection_clear (bool clipboard) NOTHROW
2932{ 2747{
2748 if (!clipboard)
2749 {
2933 want_refresh = 1; 2750 want_refresh = 1;
2934 free (selection.text); 2751 free (selection.text);
2935 selection.text = NULL; 2752 selection.text = NULL;
2936 selection.len = 0; 2753 selection.len = 0;
2937 CLEAR_SELECTION (); 2754 CLEAR_SELECTION ();
2938 2755
2939 if (display->selection_owner == this) 2756 if (display->selection_owner == this)
2940 display->selection_owner = 0; 2757 display->selection_owner = 0;
2758 }
2759 else
2760 {
2761 free (selection.clip_text);
2762 selection.clip_text = NULL;
2763 selection.clip_len = 0;
2764
2765 if (display->clipboard_owner == this)
2766 display->clipboard_owner = 0;
2767 }
2941} 2768}
2942 2769
2943/* ------------------------------------------------------------------------- */ 2770/* ------------------------------------------------------------------------- */
2944/* 2771/*
2945 * Copy a selection into the cut buffer 2772 * Copy a selection into the cut buffer
2946 * EXT: button 1 or 3 release 2773 * EXT: button 1 or 3 release
2947 */ 2774 */
2948void 2775void
2949rxvt_term::selection_make (Time tm) 2776rxvt_term::selection_make (Time tm)
2950{ 2777{
2951 int i; 2778 int size;
2952 wchar_t *new_selection_text; 2779 wchar_t *new_selection_text;
2953 text_t *t; 2780 text_t *t;
2954 2781
2955 switch (selection.op) 2782 switch (selection.op)
2956 { 2783 {
… …
2972 return; /* nothing selected, go away */ 2799 return; /* nothing selected, go away */
2973 2800
2974 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2801 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2975 return; 2802 return;
2976 2803
2977 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2804 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2978 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2805 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2979 2806
2980 int ofs = 0; 2807 int ofs = 0;
2981 int extra = 0; 2808 int extra = 0;
2982 2809
2983 int col = selection.beg.col; 2810 int col = selection.beg.col;
… …
2989 { 2816 {
2990#if !ENABLE_MINIMAL 2817#if !ENABLE_MINIMAL
2991 if (selection.rect) 2818 if (selection.rect)
2992 { 2819 {
2993 col = selection.beg.col; 2820 col = selection.beg.col;
2994 end_col = ncol + 1; 2821 end_col = selection.end.col;
2995 } 2822 }
2996 else 2823 else
2997#endif 2824#endif
2998 end_col = ROW(row).l; 2825 end_col = ROW(row).l;
2999 2826
3000 col = max (col, 0); 2827 col = max (col, 0);
3001 2828
3002 if (row == selection.end.row 2829 if (row == selection.end.row)
3003#if !ENABLE_MINIMAL
3004 || selection.rect
3005#endif
3006 )
3007 min_it (end_col, selection.end.col); 2830 min_it (end_col, selection.end.col);
3008 2831
3009 t = ROW(row).t + col; 2832 t = ROW(row).t + col;
3010 2833
3011 for (; col < end_col; col++) 2834 for (; col < end_col; col++)
… …
3019 2842
3020 extra -= (len - 1); 2843 extra -= (len - 1);
3021 2844
3022 if (extra < 0) 2845 if (extra < 0)
3023 { 2846 {
3024 extra += i; 2847 extra += size;
3025 i += i; 2848 size += size;
3026 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2849 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3027 } 2850 }
3028 2851
3029 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2852 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3030 } 2853 }
3031#endif 2854#endif
… …
3043 2866
3044 new_selection_text[ofs++] = C0_LF; 2867 new_selection_text[ofs++] = C0_LF;
3045 } 2868 }
3046 else 2869 else
3047#endif 2870#endif
3048 if (!ROW(row).is_longer () && row != selection.end.row) 2871 if (!ROW(row).is_longer ()
2872 && (row != selection.end.row || end_col != selection.end.col)
2873 && (row != selection.beg.row || selection.beg.col < ncol))
3049 new_selection_text[ofs++] = C0_LF; 2874 new_selection_text[ofs++] = C0_LF;
3050 } 2875 }
3051
3052 if (end_col != selection.end.col)
3053 new_selection_text[ofs++] = C0_LF;
3054 2876
3055 new_selection_text[ofs] = 0; 2877 new_selection_text[ofs] = 0;
3056 2878
3057 if (ofs == 0) 2879 if (ofs == 0)
3058 { 2880 {
… …
3071 2893
3072 selection_grab (tm); 2894 selection_grab (tm);
3073} 2895}
3074 2896
3075bool 2897bool
3076rxvt_term::selection_grab (Time tm) NOTHROW 2898rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3077{ 2899{
2900 Atom sel;
2901
2902 if (!clipboard)
2903 {
3078 selection_time = tm; 2904 selection_time = tm;
2905 sel = XA_PRIMARY;
2906 }
2907 else
2908 {
2909 clipboard_time = tm;
2910 sel = xa[XA_CLIPBOARD];
2911 }
3079 2912
3080 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2913 XSetSelectionOwner (dpy, sel, vt, tm);
3081 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2914 if (XGetSelectionOwner (dpy, sel) == vt)
3082 { 2915 {
3083 display->set_selection_owner (this); 2916 display->set_selection_owner (this, clipboard);
3084 return true; 2917 return true;
3085 } 2918 }
3086 else 2919 else
3087 { 2920 {
3088 selection_clear (); 2921 selection_clear (clipboard);
3089 return false; 2922 return false;
3090 } 2923 }
3091 2924
3092#if 0 2925#if 0
3093 XTextProperty ct; 2926 XTextProperty ct;
… …
3103/* ------------------------------------------------------------------------- */ 2936/* ------------------------------------------------------------------------- */
3104/* 2937/*
3105 * Mark or select text based upon number of clicks: 1, 2, or 3 2938 * Mark or select text based upon number of clicks: 1, 2, or 3
3106 * EXT: button 1 press 2939 * EXT: button 1 press
3107 */ 2940 */
3108void 2941void ecb_cold
3109rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2942rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3110{ 2943{
3111 clicks = ((clicks - 1) % 3) + 1; 2944 clicks = ((clicks - 1) % 3) + 1;
3112 selection.clicks = clicks; /* save clicks so extend will work */ 2945 selection.clicks = clicks; /* save clicks so extend will work */
3113 2946
… …
3132 2965
3133/* ------------------------------------------------------------------------- */ 2966/* ------------------------------------------------------------------------- */
3134/* 2967/*
3135 * Mark a selection at the specified col/row 2968 * Mark a selection at the specified col/row
3136 */ 2969 */
3137void 2970void ecb_cold
3138rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2971rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3139{ 2972{
3140 want_refresh = 1; 2973 want_refresh = 1;
3141 2974
3142 selection.mark.row = row + view_start; 2975 selection.mark.row = row + view_start;
… …
3165 * Word select: select text for 2 clicks 2998 * Word select: select text for 2 clicks
3166 * We now only find out the boundary in one direction 2999 * We now only find out the boundary in one direction
3167 */ 3000 */
3168 3001
3169/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3002/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3170#define DELIMIT_TEXT(x) \ 3003#define DELIMIT_TEXT(x) \
3171 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3004 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3172#define DELIMIT_REND(x) 1 3005#define DELIMIT_REND(x) 1
3173 3006
3174void 3007void ecb_cold
3175rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3008rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3176{ 3009{
3177 int col, row, dirnadd, tcol, trow, w1, w2; 3010 int col, row, dirnadd, tcol, trow, w1, w2;
3178 row_col_t bound; 3011 row_col_t bound;
3179 text_t *stp; 3012 text_t *stp;
… …
3253 * EXT: button 3 press; button 1 or 3 drag 3086 * EXT: button 3 press; button 1 or 3 drag
3254 * flag == 0 ==> button 1 3087 * flag == 0 ==> button 1
3255 * flag == 1 ==> button 3 press 3088 * flag == 1 ==> button 3 press
3256 * flag == 2 ==> button 3 motion 3089 * flag == 2 ==> button 3 motion
3257 */ 3090 */
3258void 3091void ecb_cold
3259rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3092rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3260{ 3093{
3261 int col = clamp (Pixel2Col (x), 0, ncol); 3094 int col = clamp (Pixel2Col (x), 0, ncol);
3262 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3095 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3263 3096
… …
3289 3122
3290/* ------------------------------------------------------------------------- */ 3123/* ------------------------------------------------------------------------- */
3291/* 3124/*
3292 * Extend the selection to the specified col/row 3125 * Extend the selection to the specified col/row
3293 */ 3126 */
3294void 3127void ecb_cold
3295rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3128rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3296{ 3129{
3297 row_col_t pos; 3130 row_col_t pos;
3298 enum { 3131 enum {
3299 LEFT, RIGHT 3132 LEFT, RIGHT
3300 } closeto = RIGHT; 3133 } closeto = RIGHT;
3301
3302 want_refresh = 1;
3303 3134
3304 switch (selection.op) 3135 switch (selection.op)
3305 { 3136 {
3306 case SELECTION_INIT: 3137 case SELECTION_INIT:
3307 CLEAR_SELECTION (); 3138 CLEAR_SELECTION ();
… …
3487 3318
3488#if !ENABLE_MINIMAL 3319#if !ENABLE_MINIMAL
3489 if (selection.rect && selection.beg.col > selection.end.col) 3320 if (selection.rect && selection.beg.col > selection.end.col)
3490 ::swap (selection.beg.col, selection.end.col); 3321 ::swap (selection.beg.col, selection.end.col);
3491#endif 3322#endif
3323
3324 selection_changed ();
3492} 3325}
3493 3326
3494#if !ENABLE_MINIMAL 3327#if !ENABLE_MINIMAL
3495void 3328void ecb_cold
3496rxvt_term::selection_remove_trailing_spaces () NOTHROW 3329rxvt_term::selection_remove_trailing_spaces () NOTHROW
3497{ 3330{
3498 int32_t end_col, end_row; 3331 int32_t end_col, end_row;
3499 text_t *stp; 3332 text_t *stp;
3500 3333
… …
3538/* ------------------------------------------------------------------------- */ 3371/* ------------------------------------------------------------------------- */
3539/* 3372/*
3540 * Double click on button 3 when already selected 3373 * Double click on button 3 when already selected
3541 * EXT: button 3 double click 3374 * EXT: button 3 double click
3542 */ 3375 */
3543void 3376void ecb_cold
3544rxvt_term::selection_rotate (int x, int y) NOTHROW 3377rxvt_term::selection_rotate (int x, int y) NOTHROW
3545{ 3378{
3546 selection.clicks = selection.clicks % 3 + 1; 3379 selection.clicks = selection.clicks % 3 + 1;
3547 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3380 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3548} 3381}
… …
3550/* ------------------------------------------------------------------------- */ 3383/* ------------------------------------------------------------------------- */
3551/* 3384/*
3552 * Respond to a request for our current selection 3385 * Respond to a request for our current selection
3553 * EXT: SelectionRequest 3386 * EXT: SelectionRequest
3554 */ 3387 */
3555void 3388void ecb_cold
3556rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3389rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3557{ 3390{
3391 Atom property = rq.property == None ? rq.target : rq.property;
3558 XSelectionEvent ev; 3392 XSelectionEvent ev;
3559 3393
3560 ev.type = SelectionNotify; 3394 ev.type = SelectionNotify;
3561 ev.property = None; 3395 ev.property = None;
3562 ev.display = rq.display; 3396 ev.display = rq.display;
… …
3577 *target++ = xa[XA_COMPOUND_TEXT]; 3411 *target++ = xa[XA_COMPOUND_TEXT];
3578#if X_HAVE_UTF8_STRING 3412#if X_HAVE_UTF8_STRING
3579 *target++ = xa[XA_UTF8_STRING]; 3413 *target++ = xa[XA_UTF8_STRING];
3580#endif 3414#endif
3581 3415
3582 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3416 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3583 32, PropModeReplace, 3417 32, PropModeReplace,
3584 (unsigned char *)target_list, target - target_list); 3418 (unsigned char *)target_list, target - target_list);
3585 ev.property = rq.property; 3419 ev.property = property;
3586 } 3420 }
3587#if TODO // TODO 3421#if TODO // TODO
3588 else if (rq.target == xa[XA_MULTIPLE]) 3422 else if (rq.target == xa[XA_MULTIPLE])
3589 { 3423 {
3590 /* TODO: Handle MULTIPLE */ 3424 /* TODO: Handle MULTIPLE */
3591 } 3425 }
3592#endif 3426#endif
3593 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3427 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3594 { 3428 {
3595 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3429 XChangeProperty (dpy, rq.requestor, property, rq.target,
3596 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3430 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3597 ev.property = rq.property; 3431 ev.property = property;
3432 }
3433 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3434 {
3435 XChangeProperty (dpy, rq.requestor, property, rq.target,
3436 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3437 ev.property = property;
3598 } 3438 }
3599 else if (rq.target == XA_STRING 3439 else if (rq.target == XA_STRING
3600 || rq.target == xa[XA_TEXT] 3440 || rq.target == xa[XA_TEXT]
3601 || rq.target == xa[XA_COMPOUND_TEXT] 3441 || rq.target == xa[XA_COMPOUND_TEXT]
3602 || rq.target == xa[XA_UTF8_STRING] 3442 || rq.target == xa[XA_UTF8_STRING]
… …
3634 { 3474 {
3635 target = xa[XA_COMPOUND_TEXT]; 3475 target = xa[XA_COMPOUND_TEXT];
3636 style = enc_compound_text; 3476 style = enc_compound_text;
3637 } 3477 }
3638 3478
3639 if (selection.text) 3479 if (rq.selection == XA_PRIMARY && selection.text)
3640 { 3480 {
3641 cl = selection.text; 3481 cl = selection.text;
3642 selectlen = selection.len; 3482 selectlen = selection.len;
3483 }
3484 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3485 {
3486 cl = selection.clip_text;
3487 selectlen = selection.clip_len;
3643 } 3488 }
3644 else 3489 else
3645 { 3490 {
3646 cl = L""; 3491 cl = L"";
3647 selectlen = 0; 3492 selectlen = 0;
… …
3668 ct.value = (unsigned char *)cl; 3513 ct.value = (unsigned char *)cl;
3669 ct.nitems = selectlen; 3514 ct.nitems = selectlen;
3670 ct.encoding = target; 3515 ct.encoding = target;
3671 } 3516 }
3672 3517
3673 XChangeProperty (dpy, rq.requestor, rq.property, 3518 XChangeProperty (dpy, rq.requestor, property,
3674 ct.encoding, 8, PropModeReplace, 3519 ct.encoding, 8, PropModeReplace,
3675 ct.value, (int)ct.nitems); 3520 ct.value, (int)ct.nitems);
3676 ev.property = rq.property; 3521 ev.property = property;
3677 3522
3678 if (freect) 3523 if (freect)
3679 XFree (ct.value); 3524 XFree (ct.value);
3680 } 3525 }
3681 3526
3682 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3527 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3683} 3528}
3684 3529
3685/* ------------------------------------------------------------------------- */ 3530/* ------------------------------------------------------------------------- */
3686#ifdef USE_XIM 3531#if USE_XIM
3687void 3532void ecb_cold
3688rxvt_term::im_set_position (XPoint &pos) NOTHROW 3533rxvt_term::im_set_position (XPoint &pos) NOTHROW
3689{ 3534{
3690 XWindowAttributes xwa; 3535 XWindowAttributes xwa;
3691 3536
3692 XGetWindowAttributes (dpy, vt, &xwa); 3537 XGetWindowAttributes (dpy, vt, &xwa);
… …
3715 h += 2; min_it (h, nrow); 3560 h += 2; min_it (h, nrow);
3716 3561
3717 x -= 1; clamp_it (x, 0, ncol - w); 3562 x -= 1; clamp_it (x, 0, ncol - w);
3718 y -= 1; clamp_it (y, 0, nrow - h); 3563 y -= 1; clamp_it (y, 0, nrow - h);
3719 3564
3720 ov_x = x; ov_y = y; 3565 ov.x = x; ov.y = y;
3721 ov_w = w; ov_h = h; 3566 ov.w = w; ov.h = h;
3722 3567
3723 ov_text = new text_t *[h]; 3568 ov.text = new text_t *[h];
3724 ov_rend = new rend_t *[h]; 3569 ov.rend = new rend_t *[h];
3725 3570
3726 for (y = 0; y < h; y++) 3571 for (y = 0; y < h; y++)
3727 { 3572 {
3728 text_t *tp = ov_text[y] = new text_t[w]; 3573 text_t *tp = ov.text[y] = new text_t[w];
3729 rend_t *rp = ov_rend[y] = new rend_t[w]; 3574 rend_t *rp = ov.rend[y] = new rend_t[w];
3730 3575
3731 text_t t0, t1, t2; 3576 text_t t0, t1, t2;
3732 rend_t r = OVERLAY_RSTYLE; 3577 rend_t r = OVERLAY_RSTYLE;
3733 3578
3734 if (y == 0) 3579 if (y == 0)
… …
3753} 3598}
3754 3599
3755void 3600void
3756rxvt_term::scr_overlay_off () NOTHROW 3601rxvt_term::scr_overlay_off () NOTHROW
3757{ 3602{
3758 if (!ov_text) 3603 if (!ov.text)
3759 return; 3604 return;
3760 3605
3761 want_refresh = 1; 3606 want_refresh = 1;
3762 3607
3763 for (int y = 0; y < ov_h; y++) 3608 for (int y = 0; y < ov.h; y++)
3764 { 3609 {
3765 delete [] ov_text[y]; 3610 delete [] ov.text[y];
3766 delete [] ov_rend[y]; 3611 delete [] ov.rend[y];
3767 } 3612 }
3768 3613
3769 delete [] ov_text; ov_text = 0; 3614 delete [] ov.text; ov.text = 0;
3770 delete [] ov_rend; ov_rend = 0; 3615 delete [] ov.rend; ov.rend = 0;
3771} 3616}
3772 3617
3773void 3618void
3774rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3619rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3775{ 3620{
3776 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3621 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3777 return; 3622 return;
3778 3623
3779 x++, y++; 3624 x++, y++;
3780 3625
3781 ov_text[y][x] = text; 3626 ov.text[y][x] = text;
3782 ov_rend[y][x] = rend; 3627 ov.rend[y][x] = rend;
3783} 3628}
3784 3629
3785void 3630void
3786rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3631rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3787{ 3632{
… …
3806} 3651}
3807 3652
3808void 3653void
3809rxvt_term::scr_swap_overlay () NOTHROW 3654rxvt_term::scr_swap_overlay () NOTHROW
3810{ 3655{
3811 if (!ov_text) 3656 if (!ov.text)
3812 return; 3657 return;
3813 3658
3659 // hide cursor if it is within the overlay area
3660 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3661 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3662 screen.flags &= ~Screen_VisibleCursor;
3663
3814 // swap screen mem with overlay 3664 // swap screen mem with overlay
3815 for (int y = ov_h; y--; ) 3665 for (int y = ov.h; y--; )
3816 { 3666 {
3817 text_t *t1 = ov_text[y]; 3667 text_t *t1 = ov.text[y];
3818 rend_t *r1 = ov_rend[y]; 3668 rend_t *r1 = ov.rend[y];
3819 3669
3820 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3670 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3821 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3671 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3822 3672
3823 for (int x = ov_w; x--; ) 3673 for (int x = ov.w; x--; )
3824 { 3674 {
3825 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3675 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3826 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3676 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3827 } 3677 }
3828 } 3678 }

Diff Legend

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