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

Diff Legend

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