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.246 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.405 by sf-exg, Tue Nov 15 20:09:13 2011 UTC

1/*--------------------------------*-C-*--------------------------------------* 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-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
36 34
35static inline void
37inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
38{ 37{
39 while (len--) 38 while (len--)
40 *start++ = value; 39 *start++ = value;
41} 40}
42 41
43/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 256*1024
45#define PASTE_SIZE 32768
46#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
47 44
48/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 48#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 49 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 50 view_start = 0
54#define CLEAR_SELECTION() \ 51#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 52 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 53 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 54#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 85
89/* 86/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 87 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 88 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 89#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 90 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 91 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 92 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 93 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 94
114/* ------------------------------------------------------------------------- * 95/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 96 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 97 * ------------------------------------------------------------------------- */
117 98
… …
126 width = ncol; 107 width = ncol;
127 } 108 }
128 109
129 l.touch (); 110 l.touch ();
130 111
131 efs &= ~RS_baseattrMask; 112 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 113 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 114
134 text_t *et = l.t + col; 115 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 116 rend_t *er = l.r + col;
136 117
… …
148{ 129{
149 scr_blank_line (l, 0, ncol, efs); 130 scr_blank_line (l, 0, ncol, efs);
150 131
151 l.l = 0; 132 l.l = 0;
152 l.f = 0; 133 l.f = 0;
134}
135
136// nuke a single wide character at the given column
137void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
139{
140 // find begin
141 while (col > 0 && l.t[col] == NOCHAR)
142 col--;
143
144 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
153} 155}
154 156
155/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
… …
174 176
175 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 178 return;
177 179
178 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
180 { 182 {
181 //TODO//FIXME 183 //TODO//FIXME
182 saveLines++; 184 saveLines++;
183 prev_nrow--; 185 prev_nrow--;
184 top_row--; 186 top_row--;
… …
195 if (!row_buf) 197 if (!row_buf)
196 { 198 {
197 /* 199 /*
198 * first time called so just malloc everything: don't rely on realloc 200 * first time called so just malloc everything: don't rely on realloc
199 */ 201 */
200 top_row = 0; /* no saved lines */ 202 top_row = 0;
201 term_start = 0; 203 term_start = 0;
202 204
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 207
206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209 211
210 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
211 { 213 {
… …
234 selection.text = NULL; 236 selection.text = NULL;
235 selection.len = 0; 237 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
238 selection.clicks = 0; 240 selection.clicks = 0;
239 rvideo_state = rvideo_mode = false; 241 selection.clip_text = NULL;
242 selection.clip_len = 0;
240 } 243 }
241 else 244 else
242 { 245 {
243 /* 246 /*
244 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
272 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 } 277 }
275 278
276 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
278 281
279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
282 285
283 if (top_row) 286 if (top_row)
284 { 287 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
290 // TODO: maybe optimise when width didn't change
287 291
288 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 294
291 do 295 do
292 { 296 {
293 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
294#ifdef DEBUG_STRICT
295 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
296#endif
297 int plines = 1; 299 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
299 301
300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301 { 303 {
… …
327 int qcol = 0; 329 int qcol = 0;
328 330
329 // see below for cursor adjustment rationale 331 // see below for cursor adjustment rationale
330 if (p == ocur.row) 332 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow); 333 screen.cur.row = q - (total_rows - nrow);
332 334
333 // fill a single destination line 335 // fill a single destination line
334 while (lofs < llen && qcol < ncol) 336 while (lofs < llen && qcol < ncol)
335 { 337 {
336 int prow = lofs / prev_ncol; 338 int prow = lofs / prev_ncol;
337 int pcol = lofs % prev_ncol; 339 int pcol = lofs % prev_ncol;
… …
347 349
348 line_t &pline = old_buf [prow]; 350 line_t &pline = old_buf [prow];
349 351
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 353
352#if DEBUG_STRICT
353 assert (len);
354 assert (pline.t);
355#endif
356
357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
359 356
360 lofs += len; 357 lofs += len;
361 qcol += len; 358 qcol += len;
… …
368 } 365 }
369 while (p != pend && q > 0); 366 while (p != pend && q > 0);
370 367
371 term_start = total_rows - nrow; 368 term_start = total_rows - nrow;
372 top_row = q - term_start; 369 top_row = q - term_start;
373 370
374 // make sure all terminal lines exist 371 // make sure all terminal lines exist
375 while (top_row > 0) 372 while (top_row > 0)
376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 373 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
377 } 374 }
378 else 375 else
379 { 376 {
380 // if no scrollback exists (yet), wing, instead of wrap 377 // if no scrollback exists (yet), wing, instead of wrap
381 378
382 for (int row = min (nrow, prev_nrow); row--; ) 379 for (int row = min (nrow, prev_nrow); row--; )
383 { 380 {
384 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
385 line_t &qline = row_buf [row]; 382 line_t &qline = row_buf [row];
386 383
… …
400 delete old_ta; 397 delete old_ta;
401 delete old_ra; 398 delete old_ra;
402 399
403 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
402 }
405 403
406 if (tabs)
407 free (tabs); 404 free (tabs);
408 } 405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
409 409
410 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
411 411
412 prev_nrow = nrow; 412 prev_nrow = nrow;
413 prev_ncol = ncol; 413 prev_ncol = ncol;
414 414
415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
416
417 for (int col = ncol; col--; )
418 tabs [col] = col % TABSIZE == 0;
419
420 tt_winch (); 415 tt_winch ();
421 416
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 417 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 418}
424 419
… …
427 * Free everything. That way malloc debugging can find leakage. 422 * Free everything. That way malloc debugging can find leakage.
428 */ 423 */
429void 424void
430rxvt_term::scr_release () NOTHROW 425rxvt_term::scr_release () NOTHROW
431{ 426{
427 if (row_buf)
428 {
432 delete talloc; talloc = 0; 429 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
434 431
435 free (row_buf); 432 free (row_buf);
436 free (swap_buf); 433 free (swap_buf);
437 free (drawn_buf); 434 free (drawn_buf);
438 free (tabs);
439
440 row_buf = 0; // signal that we freed all the arrays 435 row_buf = 0; // signal that we freed all the arrays above
441}
442 436
437 free (tabs);
438 tabs = 0;
439 }
440}
441
443/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
444/* 443/*
445 * Hard reset 444 * Hard/Soft reset
446 */ 445 */
447void 446void
448rxvt_term::scr_poweron () NOTHROW 447rxvt_term::scr_poweron ()
449{ 448{
450 scr_release (); 449 scr_release ();
451 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
452 scr_soft_reset ();
452 scr_reset (); 453 scr_reset ();
453 454
454 scr_clear (true); 455 scr_clear (true);
455 scr_refresh (); 456 scr_refresh ();
457}
458
459void
460rxvt_term::scr_soft_reset ()
461{
462 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY
464 scr_overlay_off ();
465#endif
466
467 if (current_screen != PRIMARY)
468 scr_swap_screen ();
469
470 scr_scroll_region (0, MAX_ROWS - 1);
471 scr_rendition (0, ~RS_None);
472 scr_insert_mode (0);
456} 473}
457 474
458/* ------------------------------------------------------------------------- * 475/* ------------------------------------------------------------------------- *
459 * PROCESS SCREEN COMMANDS * 476 * PROCESS SCREEN COMMANDS *
460 * ------------------------------------------------------------------------- */ 477 * ------------------------------------------------------------------------- */
… …
498 } 515 }
499 516
500 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
501 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
502 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
503#ifdef DEBUG_STRICT
504 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
505 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
506#endif 522}
523
524void
525rxvt_term::scr_swap_screen ()
526{
527 if (!option (Opt_secondaryScreen))
528 return;
529
530 for (int i = prev_nrow; i--; )
531 ::swap (ROW(i), swap_buf [i]);
532
533 ::swap (screen.cur, swap.cur);
534
535 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
536 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
507} 537}
508 538
509/* ------------------------------------------------------------------------- */ 539/* ------------------------------------------------------------------------- */
510/* 540/*
511 * Swap between primary and secondary screens 541 * Swap between primary and secondary screens
512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 542 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 543 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514 */ 544 */
515int 545void
516rxvt_term::scr_change_screen (int scrn) NOTHROW 546rxvt_term::scr_change_screen (int scrn)
517{ 547{
548 if (scrn == current_screen)
549 return;
550
518 want_refresh = 1; 551 want_refresh = 1;
519 view_start = 0; 552 view_start = 0;
520 553
521 if (current_screen == scrn)
522 return scrn;
523
524 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
525 555
526 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
527
528 ::swap (screen.cur.row, swap.cur.row);
529 ::swap (screen.cur.col, swap.cur.col);
530
531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
533 557
534#if NSCREENS 558#if NSCREENS
535 if (OPTION (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
536 { 560 {
537 num_scr = 0; 561 num_scr = 0;
538 562
539 for (int i = prev_nrow; i--; ) 563 scr_swap_screen ();
540 ::swap (ROW(i), swap_buf [i]);
541 564
542 ::swap (screen.charset, swap.charset); 565 ::swap (screen.charset, swap.charset);
543 ::swap (screen.flags, swap.flags); 566 ::swap (screen.flags, swap.flags);
544 screen.flags |= Screen_VisibleCursor; 567 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 568 swap.flags |= Screen_VisibleCursor;
546 } 569 }
547 else 570 else
548#endif 571#endif
549 if (OPTION (Opt_secondaryScroll)) 572 if (option (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 573 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552 return scrn;
553} 574}
554 575
555// clear WrapNext indicator, solidifying position on next line 576// clear WrapNext indicator, solidifying position on next line
556void 577void
557rxvt_term::scr_do_wrap () NOTHROW 578rxvt_term::scr_do_wrap () NOTHROW
… …
589/* 610/*
590 * Change the rendition style for following text 611 * Change the rendition style for following text
591 */ 612 */
592void 613void
593rxvt_term::scr_rendition (int set, int style) NOTHROW 614rxvt_term::scr_rendition (int set, int style) NOTHROW
594 { 615{
595 if (set) 616 if (set)
596 rstyle |= style; 617 rstyle |= style;
597 else if (style == ~RS_None) 618 else if (style == ~RS_None)
598 rstyle = DEFAULT_RSTYLE; 619 rstyle = DEFAULT_RSTYLE;
599 else 620 else
600 rstyle &= ~style; 621 rstyle &= ~style;
601 } 622}
602 623
603/* ------------------------------------------------------------------------- */ 624/* ------------------------------------------------------------------------- */
604/* 625/*
605 * Scroll text between <row1> and <row2> inclusive, by <count> lines 626 * Scroll text between <row1> and <row2> inclusive, by <count> lines
606 * count positive ==> scroll up 627 * count positive ==> scroll up
… …
615 want_refresh = 1; 636 want_refresh = 1;
616 num_scr += count; 637 num_scr += count;
617 638
618 if (count > 0 639 if (count > 0
619 && row1 == 0 640 && row1 == 0
620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
621 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
622 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
623
624 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows;
626 646
627 // sever bottommost line 647 // sever bottommost line
628 { 648 {
629 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2);
630 l.is_longer (0); 650 l.is_longer (0);
631 l.touch (); 651 l.touch ();
632 } 652 }
633 653
634 // erase newly scrolled-in lines 654 // scroll everything up 'count' lines
635 for (int i = count; i--; ) 655 term_start = (term_start + count) % total_rows;
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - 1 - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646 656
647 // now copy lines below the scroll region bottom to the 657 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 658 // bottom of the screen again, so they look as if they
649 // hadn't moved. 659 // hadn't moved.
650 for (int i = nrow; --i > row2; ) 660 for (int i = nrow; --i > row2; )
… …
653 line_t &l2 = ROW(i); 663 line_t &l2 = ROW(i);
654 664
655 ::swap (l1, l2); 665 ::swap (l1, l2);
656 l2.touch (); 666 l2.touch ();
657 } 667 }
668
669 // erase newly scrolled-in lines
670 for (int i = count; i--; )
658 671 {
672 line_t &l = ROW(row2 - i);
673
674 // optimise if already cleared, can be significant on slow machines
675 // could be rolled into scr_blank_screen_mem
676 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
677 {
678 scr_blank_line (l, 0, l.l, rstyle);
679 l.l = 0;
680 l.f = 0;
681 }
682 else
683 scr_blank_screen_mem (l, rstyle);
684 }
685
659 // move and/or clear selection, if any 686 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen
688 && selection.beg.row <= row2)
661 { 689 {
662 selection.beg.row -= count; 690 selection.beg.row -= count;
663 selection.end.row -= count; 691 selection.end.row -= count;
664 selection.mark.row -= count; 692 selection.mark.row -= count;
665 693
666 if (selection.beg.row < top_row 694 selection_check (0);
667 || selection.end.row < top_row
668 || selection.mark.row < top_row)
669 {
670 CLEAR_ALL_SELECTION ();
671 selection.op = SELECTION_CLEAR;
672 }
673 } 695 }
674 696
675 // finally move the view window, if desired 697 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 698 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 699 && view_start != 0
678 && view_start != -saveLines) 700 && view_start != -saveLines)
679 scr_page (UP, count); 701 scr_page (UP, count);
680 702
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 703 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
699 { 721 {
700 /* move selected region too */ 722 /* move selected region too */
701 selection.beg.row -= count; 723 selection.beg.row -= count;
702 selection.end.row -= count; 724 selection.end.row -= count;
703 selection.mark.row -= count; 725 selection.mark.row -= count;
704 726
705 selection_check (0); 727 selection_check (0);
706 } 728 }
707 } 729 }
708 730
709 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
710 // part of scr_scroll_text is not time-critical. 732 // part of scr_scroll_text is not time-critical.
711 733
734 // sever line above scroll region
735 if (row1)
736 {
737 line_t &l = ROW(row1 - 1);
738 l.is_longer (0);
739 l.touch ();
740 }
741
712 int rows = row2 - row1 + 1; 742 int rows = row2 - row1 + 1;
713 743
714 min_it (count, rows); 744 min_it (count, rows);
715 745
716 line_t *temp_buf = row_buf + total_rows; 746 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
717 747
718 for (int row = 0; row < rows; row++) 748 for (int row = 0; row < rows; row++)
719 { 749 {
720 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 750 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
721 751
… …
723 scr_blank_screen_mem (temp_buf [row], rstyle); 753 scr_blank_screen_mem (temp_buf [row], rstyle);
724 } 754 }
725 755
726 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
727 ROW(row1 + row) = temp_buf [row]; 757 ROW(row1 + row) = temp_buf [row];
758
759 // sever bottommost line
760 {
761 line_t &l = ROW(row2);
762 l.is_longer (0);
763 l.touch ();
764 }
728 } 765 }
729 766
730 return count; 767 return count;
731} 768}
732 769
… …
738rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 775rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
739{ 776{
740 if (len <= 0) /* sanity */ 777 if (len <= 0) /* sanity */
741 return; 778 return;
742 779
743 unsigned char checksel; 780 bool checksel;
744 unicode_t c; 781 unicode_t c;
745 int ncol = this->ncol; 782 int ncol = this->ncol;
746 const wchar_t *strend = str + len; 783 const wchar_t *strend = str + len;
747 784
748 want_refresh = 1; 785 want_refresh = 1;
749 ZERO_SCROLLBACK (); 786 ZERO_SCROLLBACK ();
750 787
751 if (minlines > 0) 788 if (minlines > 0)
752 { 789 {
753 minlines += screen.cur.row - screen.bscroll; 790 minlines += screen.cur.row - screen.bscroll;
791 min_it (minlines, screen.cur.row - top_row);
754 792
755 if (minlines > 0 793 if (minlines > 0
756 && screen.tscroll == 0 794 && screen.tscroll == 0
757 && screen.bscroll == nrow - 1) 795 && screen.bscroll == nrow - 1)
758 { 796 {
… …
760 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 798 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
761 screen.cur.row -= minlines; 799 screen.cur.row -= minlines;
762 } 800 }
763 } 801 }
764 802
765#ifdef DEBUG_STRICT
766 assert (screen.cur.col < ncol); 803 assert (screen.cur.col < ncol);
767 assert (screen.cur.row < nrow 804 assert (screen.cur.row < nrow
768 && screen.cur.row >= top_row); 805 && screen.cur.row >= top_row);
769#endif
770 int row = screen.cur.row; 806 int row = screen.cur.row;
771 807
772 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 808 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
773 809
774 line_t *line = &ROW(row); 810 line_t *line = &ROW(row);
775 811
776 while (str < strend) 812 while (str < strend)
777 { 813 {
778 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 814 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
779 815
780 if (c < 0x20) 816 if (ecb_unlikely (c < 0x20))
781 if (c == C0_LF) 817 if (c == C0_LF)
782 { 818 {
783 max_it (line->l, screen.cur.col); 819 max_it (line->l, screen.cur.col);
784 820
785 screen.flags &= ~Screen_WrapNext; 821 screen.flags &= ~Screen_WrapNext;
… …
804 { 840 {
805 scr_tab (1, true); 841 scr_tab (1, true);
806 continue; 842 continue;
807 } 843 }
808 844
845 if (ecb_unlikely (
809 if (checksel /* see if we're writing within selection */ 846 checksel /* see if we're writing within selection */
810 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 847 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
811 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 848 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
849 ))
812 { 850 {
813 checksel = 0; 851 checksel = 0;
814 /* 852 /*
815 * If we wrote anywhere in the selected area, kill the selection 853 * If we wrote anywhere in the selected area, kill the selection
816 * XXX: should we kill the mark too? Possibly, but maybe that 854 * XXX: should we kill the mark too? Possibly, but maybe that
817 * should be a similar check. 855 * should be a similar check.
818 */ 856 */
819 CLEAR_SELECTION (); 857 CLEAR_SELECTION ();
820 } 858 }
821 859
822 if (screen.flags & Screen_WrapNext) 860 if (ecb_unlikely (screen.flags & Screen_WrapNext))
823 { 861 {
824 scr_do_wrap (); 862 scr_do_wrap ();
825 863
826 line->l = ncol; 864 line->l = ncol;
827 line->is_longer (1); 865 line->is_longer (1);
828 866
829 row = screen.cur.row; 867 row = screen.cur.row;
830 line = &ROW(row); /* _must_ refresh */ 868 line = &ROW(row); /* _must_ refresh */
831 } 869 }
832 870
833 // some utf-8 decoders "decode" surrogate characters: let's fix this. 871 // some utf-8 decoders "decode" surrogate characters: let's fix this.
834 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 872 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
835 c = 0xfffd; 873 c = 0xfffd;
836 874
837 // rely on wcwidth to tell us the character width, at least for non-latin1 875 // rely on wcwidth to tell us the character width, do wcwidth before
838 // do wcwidth before further replacements, as wcwidth might return -1 876 // further replacements, as wcwidth might return -1 for the line
839 // for the line drawing characters below as they might be invalid in the current 877 // drawing characters below as they might be invalid in the current
840 // locale. 878 // locale.
841 int width = c < 0x100 ? 1 : wcwidth (c); 879 int width = WCWIDTH (c);
842 880
843 if (charsets [screen.charset] == '0') // DEC SPECIAL 881 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
844 { 882 {
845 // vt100 special graphics and line drawing 883 // vt100 special graphics and line drawing
846 // 5f-7e standard vt100 884 // 5f-7e standard vt100
847 // 40-5e rxvt extension for extra curses acs chars 885 // 40-5e rxvt extension for extra curses acs chars
848 static uint16_t vt100_0[62] = { // 41 .. 7e 886 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
861 c = vt100_0[c - 0x41]; 899 c = vt100_0[c - 0x41];
862 width = 1; // vt100 line drawing characters are always single-width 900 width = 1; // vt100 line drawing characters are always single-width
863 } 901 }
864 } 902 }
865 903
866 if (screen.flags & Screen_Insert) 904 if (ecb_unlikely (screen.flags & Screen_Insert))
867 scr_insdel_chars (width, INSERT); 905 scr_insdel_chars (width, INSERT);
868 906
869 if (width != 0) 907 if (width != 0)
870 { 908 {
871#if !UNICODE_3 909#if !UNICODE_3
… …
876# else 914# else
877 c = 0xfffd; 915 c = 0xfffd;
878# endif 916# endif
879#endif 917#endif
880 918
919 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
920
921 // if the character doesn't fit into the remaining columns...
922 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
923 {
924 if (screen.flags & Screen_Autowrap)
925 {
926 // ... artificially enlargen the previous one
927 c = NOCHAR;
928 // and try the same character next loop iteration
929 --str;
930 }
931 else
932 screen.cur.col = ncol - width;
933 }
934
881 // nuke the character at this position, if required 935 // nuke the character at this position, if required
936 // due to wonderful coincidences everywhere else in this loop
937 // we never have to check for overwriting a wide char itself,
938 // only its tail.
882 if (line->t[screen.cur.col] == NOCHAR 939 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
883 || (screen.cur.col < ncol - 1 940 scr_kill_char (*line, screen.cur.col);
884 && line->t[screen.cur.col + 1] == NOCHAR))
885 {
886 int col = screen.cur.col;
887
888 // find begin
889 while (col > 0 && line->t[col] == NOCHAR)
890 col--;
891
892 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
893
894 // found begin, nuke
895 do {
896 line->t[col] = ' ';
897 line->r[col] = rend;
898 col++;
899 } while (col < ncol && line->t[col] == NOCHAR);
900 }
901
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903
904 // if the character doesn't fit into the remaining columns...
905 if (screen.cur.col > ncol - width && ncol >= width)
906 {
907 // ...output spaces
908 c = ' ';
909 // and try the same character next loop iteration
910 --str;
911 }
912 941
913 line->touch (); 942 line->touch ();
914 943
915 do 944 do
916 { 945 {
917 line->t[screen.cur.col] = c; 946 line->t[screen.cur.col] = c;
918 line->r[screen.cur.col] = rend; 947 line->r[screen.cur.col] = rend;
919 948
920 if (screen.cur.col < ncol - 1) 949 if (ecb_likely (screen.cur.col < ncol - 1))
921 screen.cur.col++; 950 screen.cur.col++;
922 else 951 else
923 { 952 {
924 line->l = ncol; 953 line->l = ncol;
925 if (screen.flags & Screen_Autowrap) 954 if (screen.flags & Screen_Autowrap)
926 screen.flags |= Screen_WrapNext; 955 screen.flags |= Screen_WrapNext;
927 break; 956
957 goto end_of_line;
928 } 958 }
929 959
930 c = NOCHAR; 960 c = NOCHAR;
931 } 961 }
932 while (--width > 0); 962 while (ecb_unlikely (--width > 0));
933 963
934 // pad with spaces when overwriting wide character with smaller one 964 // pad with spaces when overwriting wide character with smaller one
935 if (!width) 965 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
936 { 966 {
937 line->touch (); 967 line->t[c] = ' ';
968 line->r[c] = rend;
969 }
938 970
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 971end_of_line:
972 ;
973 }
974#if ENABLE_COMBINING
975 else // width == 0
976 {
977 if (c != 0xfeff) // ignore BOM
978 {
979 // handle combining characters
980 // we just tag the accent on the previous on-screen character.
981 // this is arguably not correct, but also arguably not wrong.
982 // we don't handle double-width characters nicely yet.
983 line_t *linep;
984 text_t *tp;
985 rend_t *rp;
986
987 if (screen.cur.col > 0)
940 { 988 {
941 line->t[c] = ' ';
942 line->r[c] = rend; 989 linep = line;
990 tp = line->t + screen.cur.col - 1;
991 rp = line->r + screen.cur.col - 1;
943 } 992 }
993 else if (screen.cur.row > 0
994 && ROW(screen.cur.row - 1).is_longer ())
995 {
996 linep = &ROW(screen.cur.row - 1);
997 tp = line->t + ncol - 1;
998 rp = line->r + ncol - 1;
999 }
1000 else
1001 continue;
1002
1003 linep->touch ();
1004
1005 while (*tp == NOCHAR && tp > linep->t)
1006 tp--, rp--;
1007
1008 // first try to find a precomposed character
1009 unicode_t n = rxvt_compose (*tp, c);
1010 if (n == NOCHAR)
1011 n = rxvt_composite.compose (*tp, c);
1012
1013 *tp = n;
1014 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
944 } 1015 }
945 } 1016 }
946 else // width == 0
947 {
948#if ENABLE_COMBINING
949 // handle combining characters
950 // we just tag the accent on the previous on-screen character.
951 // this is arguably not correct, but also arguably not wrong.
952 // we don't handle double-width characters nicely yet.
953 line_t *linep;
954 text_t *tp;
955 rend_t *rp;
956
957 if (screen.cur.col > 0)
958 {
959 linep = line;
960 tp = line->t + screen.cur.col - 1;
961 rp = line->r + screen.cur.col - 1;
962 }
963 else if (screen.cur.row > 0
964 && ROW(screen.cur.row - 1).is_longer ())
965 {
966 linep = &ROW(screen.cur.row - 1);
967 tp = line->t + ncol - 1;
968 rp = line->r + ncol - 1;
969 }
970 else
971 continue;
972
973 linep->touch ();
974
975 while (*tp == NOCHAR && tp > linep->t)
976 tp--, rp--;
977
978 // first try to find a precomposed character
979 unicode_t n = rxvt_compose (*tp, c);
980 if (n == NOCHAR)
981 n = rxvt_composite.compose (*tp, c);
982
983 *tp = n;
984 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
985#endif 1017#endif
986 }
987 } 1018 }
988 1019
989 max_it (line->l, screen.cur.col); 1020 max_it (line->l, screen.cur.col);
990 1021
991#ifdef DEBUG_STRICT
992 assert (screen.cur.row >= 0); 1022 assert (screen.cur.row >= 0);
993#endif
994} 1023}
995 1024
996/* ------------------------------------------------------------------------- */ 1025/* ------------------------------------------------------------------------- */
997/* 1026/*
998 * Process Backspace. Move back the cursor back a position, wrap if have to 1027 * Process Backspace. Move back the cursor back a position, wrap if have to
999 * XTERM_SEQ: CTRL-H 1028 * XTERM_SEQ: CTRL-H
1000 */ 1029 */
1001void 1030void
1002rxvt_term::scr_backspace () NOTHROW 1031rxvt_term::scr_backspace () NOTHROW
1003{ 1032{
1004 want_refresh = 1;
1005
1006 if (screen.cur.col == 0) 1033 if (screen.cur.col == 0)
1007 { 1034 {
1008 if (screen.cur.row > 0) 1035 if (screen.cur.row > 0)
1009 { 1036 {
1010#ifdef TERMCAP_HAS_BW 1037#ifdef TERMCAP_HAS_BW
1011 screen.cur.col = ncol - 1; 1038 screen.cur.col = ncol - 1;
1012 screen.cur.row--; 1039 --screen.cur.row;
1013 return; 1040
1041 want_refresh = 1;
1014#endif 1042#endif
1015 } 1043 }
1016 } 1044 }
1017 else if (!(screen.flags & Screen_WrapNext)) 1045 else if (screen.flags & Screen_WrapNext)
1046 screen.flags &= ~Screen_WrapNext;
1047 else
1018 scr_gotorc (0, -1, RELATIVE); 1048 scr_gotorc (0, -1, RELATIVE);
1019
1020 screen.flags &= ~Screen_WrapNext;
1021} 1049}
1022 1050
1023/* ------------------------------------------------------------------------- */ 1051/* ------------------------------------------------------------------------- */
1024/* 1052/*
1025 * Process Horizontal Tab 1053 * Process Horizontal Tab
… …
1048 x = i; 1076 x = i;
1049 1077
1050 if (!--count) 1078 if (!--count)
1051 break; 1079 break;
1052 } 1080 }
1053 else 1081 else
1054 ht &= l.t[i] == ' ' 1082 ht &= l.t[i] == ' '
1055 && RS_SAME (l.r[i], base_rend); 1083 && RS_SAME (l.r[i], base_rend);
1056 1084
1057 if (count) 1085 if (count)
1058 x = ncol - 1; 1086 x = ncol - 1;
1059 1087
1060 // store horizontal tab commands as characters inside the text 1088 // store horizontal tab commands as characters inside the text
1061 // buffer so they can be selected and pasted. 1089 // buffer so they can be selected and pasted.
1062 if (ht && OPTION (Opt_pastableTabs)) 1090 if (ht && option (Opt_pastableTabs))
1063 { 1091 {
1064 base_rend = SET_FONT (base_rend, 0); 1092 base_rend = SET_FONT (base_rend, 0);
1065 1093
1066 l.touch (x); 1094 l.touch (x);
1067 1095
… …
1100 * Process DEC Back Index 1128 * Process DEC Back Index
1101 * XTERM_SEQ: ESC 6 1129 * XTERM_SEQ: ESC 6
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1130 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1131 * in that row right. Clear left column.
1104 */ 1132 */
1105#if ENABLE_FRILLS 1133#if !ENABLE_MINIMAL
1106void 1134void
1107rxvt_term::scr_backindex () NOTHROW 1135rxvt_term::scr_backindex () NOTHROW
1108{ 1136{
1109 if (screen.cur.col > 0) 1137 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1138 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1117 * Process DEC Forward Index 1145 * Process DEC Forward Index
1118 * XTERM_SEQ: ESC 9 1146 * XTERM_SEQ: ESC 9
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1147 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1148 * in that row left. Clear right column.
1121 */ 1149 */
1122#if ENABLE_FRILLS 1150#if !ENABLE_MINIMAL
1123void 1151void
1124rxvt_term::scr_forwardindex () NOTHROW 1152rxvt_term::scr_forwardindex () NOTHROW
1125{ 1153{
1126 if (screen.cur.col < ncol - 1) 1154 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1155 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1174 } 1202 }
1175 } 1203 }
1176 else 1204 else
1177 { 1205 {
1178 if (screen.flags & Screen_Relative) 1206 if (screen.flags & Screen_Relative)
1207 {
1179 { /* relative origin mode */ 1208 /* relative origin mode */
1180 screen.cur.row = row + screen.tscroll; 1209 screen.cur.row = row + screen.tscroll;
1181 min_it (screen.cur.row, screen.bscroll); 1210 min_it (screen.cur.row, screen.bscroll);
1182 } 1211 }
1183 else 1212 else
1184 screen.cur.row = row; 1213 screen.cur.row = row;
… …
1217/* 1246/*
1218 * Erase part or whole of a line 1247 * Erase part or whole of a line
1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1248 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1249 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1250 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1251 * extension: clear to right unless wrapped: ESC [ 3 K
1222 */ 1252 */
1223void 1253void
1224rxvt_term::scr_erase_line (int mode) NOTHROW 1254rxvt_term::scr_erase_line (int mode) NOTHROW
1225{ 1255{
1226 unsigned int col, num; 1256 unsigned int col, num;
… …
1235 line.touch (); 1265 line.touch ();
1236 line.is_longer (0); 1266 line.is_longer (0);
1237 1267
1238 switch (mode) 1268 switch (mode)
1239 { 1269 {
1270 case 3:
1271 if (screen.flags & Screen_WrapNext)
1272 return;
1273
1274 /* fall through */
1275
1240 case 0: /* erase to end of line */ 1276 case 0: /* erase to end of line */
1241 col = screen.cur.col; 1277 col = screen.cur.col;
1242 num = ncol - col; 1278 num = ncol - col;
1243 min_it (line.l, col); 1279 min_it (line.l, col);
1280
1244 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1281 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1245 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1282 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1246 CLEAR_SELECTION (); 1283 CLEAR_SELECTION ();
1247 break; 1284 break;
1285
1248 case 1: /* erase to beginning of line */ 1286 case 1: /* erase to beginning of line */
1249 col = 0; 1287 col = 0;
1250 num = screen.cur.col + 1; 1288 num = screen.cur.col + 1;
1289
1251 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1290 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1252 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1291 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1253 CLEAR_SELECTION (); 1292 CLEAR_SELECTION ();
1254 break; 1293 break;
1294
1255 case 2: /* erase whole line */ 1295 case 2: /* erase whole line */
1256 col = 0; 1296 col = 0;
1257 num = ncol; 1297 num = ncol;
1258 line.l = 0; 1298 line.l = 0;
1259 if (selection.beg.row <= screen.cur.row 1299 if (selection.beg.row <= screen.cur.row
… …
1317 if (row >= nrow) /* Out Of Bounds */ 1357 if (row >= nrow) /* Out Of Bounds */
1318 return; 1358 return;
1319 1359
1320 min_it (num, nrow - row); 1360 min_it (num, nrow - row);
1321 1361
1322 if (rstyle & (RS_RVid | RS_Uline)) 1362 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1323 ren = (rend_t) ~RS_None; 1363 ren = (rend_t) ~RS_None;
1324 else if (GET_BASEBG (rstyle) == Color_bg) 1364 else if (GET_BASEBG (rstyle) == Color_bg)
1325 { 1365 {
1326 ren = DEFAULT_RSTYLE; 1366 ren = DEFAULT_RSTYLE;
1327 CLEAR_ROWS (row, num); 1367
1368 if (mapped)
1369 XClearArea (dpy, vt, 0,
1370 Row2Pixel (row - view_start), (unsigned int)width,
1371 (unsigned int)Height2Pixel (num), False);
1328 } 1372 }
1329 else 1373 else
1330 { 1374 {
1331 ren = rstyle & (RS_fgMask | RS_bgMask); 1375 ren = rstyle & (RS_fgMask | RS_bgMask);
1376
1377 if (mapped)
1378 {
1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1379 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1380 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 ERASE_ROWS (row, num); 1381 XFillRectangle (dpy, vt, gc,
1382 0, Row2Pixel (row - view_start),
1383 (unsigned int)width,
1384 (unsigned int)Height2Pixel (num));
1335 gcvalue.foreground = pix_colors[Color_fg]; 1385 gcvalue.foreground = pix_colors[Color_fg];
1336 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1386 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1387 }
1337 } 1388 }
1338 1389
1339 for (; num--; row++) 1390 for (; num--; row++)
1340 { 1391 {
1341 scr_blank_screen_mem (ROW(row), rstyle); 1392 scr_blank_screen_mem (ROW(row), rstyle);
1393
1394 if (row - view_start < nrow)
1342 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1395 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1343 } 1396 }
1344} 1397}
1345 1398
1346#if ENABLE_FRILLS 1399#if !ENABLE_MINIMAL
1347void 1400void
1348rxvt_term::scr_erase_savelines () NOTHROW 1401rxvt_term::scr_erase_savelines () NOTHROW
1349{ 1402{
1350 want_refresh = 1; 1403 want_refresh = 1;
1351 ZERO_SCROLLBACK (); 1404 ZERO_SCROLLBACK ();
… …
1421 * Insert/Delete <count> characters from the current position 1474 * Insert/Delete <count> characters from the current position
1422 */ 1475 */
1423void 1476void
1424rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1477rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1425{ 1478{
1426 int col, row;
1427 rend_t tr;
1428
1429 want_refresh = 1; 1479 want_refresh = 1;
1430 ZERO_SCROLLBACK (); 1480 ZERO_SCROLLBACK ();
1431 1481
1432 if (count <= 0) 1482 if (count <= 0)
1433 return; 1483 return;
… …
1435 scr_do_wrap (); 1485 scr_do_wrap ();
1436 1486
1437 selection_check (1); 1487 selection_check (1);
1438 min_it (count, ncol - screen.cur.col); 1488 min_it (count, ncol - screen.cur.col);
1439 1489
1440 row = screen.cur.row; 1490 int row = screen.cur.row;
1441 1491
1442 line_t *line = &ROW(row); 1492 line_t *line = &ROW(row);
1443 1493
1444 line->touch (); 1494 line->touch ();
1445 line->is_longer (0); 1495 line->is_longer (0);
1446 1496
1497 // nuke wide spanning the start
1498 if (line->t[screen.cur.col] == NOCHAR)
1499 scr_kill_char (*line, screen.cur.col);
1500
1447 switch (insdel) 1501 switch (insdel)
1448 { 1502 {
1449 case INSERT: 1503 case INSERT:
1450 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1504 line->l = min (line->l + count, ncol);
1505
1506 if (line->t[screen.cur.col] == NOCHAR)
1507 scr_kill_char (*line, screen.cur.col);
1508
1509 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1451 { 1510 {
1452 line->t[col] = line->t[col - count]; 1511 line->t[col] = line->t[col - count];
1453 line->r[col] = line->r[col - count]; 1512 line->r[col] = line->r[col - count];
1454 } 1513 }
1455
1456 line->l = min (line->l + count, ncol);
1457 1514
1458 if (selection.op && current_screen == selection.screen 1515 if (selection.op && current_screen == selection.screen
1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1516 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1460 { 1517 {
1461 if (selection.end.row != screen.cur.row 1518 if (selection.end.row != screen.cur.row
1462 || (selection.end.col + count >= ncol)) 1519 || (selection.end.col + count >= ncol))
1463 CLEAR_SELECTION (); 1520 CLEAR_SELECTION ();
1464 else 1521 else
1522 {
1465 { /* shift selection */ 1523 /* shift selection */
1466 selection.beg.col += count; 1524 selection.beg.col += count;
1467 selection.mark.col += count; /* XXX: yes? */ 1525 selection.mark.col += count; /* XXX: yes? */
1468 selection.end.col += count; 1526 selection.end.col += count;
1469 } 1527 }
1470 } 1528 }
… …
1475 case ERASE: 1533 case ERASE:
1476 screen.cur.col += count; /* don't worry if > ncol */ 1534 screen.cur.col += count; /* don't worry if > ncol */
1477 selection_check (1); 1535 selection_check (1);
1478 screen.cur.col -= count; 1536 screen.cur.col -= count;
1479 1537
1480 line->l = max (line->l - count, 0); 1538 // nuke wide char after the end
1539 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1540 scr_kill_char (*line, screen.cur.col + count);
1541
1481 scr_blank_line (*line, screen.cur.col, count, rstyle); 1542 scr_blank_line (*line, screen.cur.col, count, rstyle);
1482 break; 1543 break;
1483 1544
1484 case DELETE: 1545 case DELETE:
1485 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1546 line->l = max (line->l - count, 0);
1486 1547
1548 // nuke wide char spanning the end
1549 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1550 scr_kill_char (*line, screen.cur.col + count);
1551
1487 for (col = screen.cur.col; (col + count) < ncol; col++) 1552 for (int col = screen.cur.col; (col + count) < ncol; col++)
1488 { 1553 {
1489 line->t[col] = line->t[col + count]; 1554 line->t[col] = line->t[col + count];
1490 line->r[col] = line->r[col + count]; 1555 line->r[col] = line->r[col + count];
1491 } 1556 }
1492 1557
1493 line->l = max (line->l - count, 0);
1494 scr_blank_line (*line, ncol - count, count, tr); 1558 scr_blank_line (*line, ncol - count, count, rstyle);
1495 1559
1496 if (selection.op && current_screen == selection.screen 1560 if (selection.op && current_screen == selection.screen
1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1561 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1498 { 1562 {
1499 if (selection.end.row != screen.cur.row 1563 if (selection.end.row != screen.cur.row
… …
1609 */ 1673 */
1610void 1674void
1611rxvt_term::scr_set_tab (int mode) NOTHROW 1675rxvt_term::scr_set_tab (int mode) NOTHROW
1612{ 1676{
1613 if (mode < 0) 1677 if (mode < 0)
1614 memset (tabs, 0, ncol * sizeof (char)); 1678 memset (tabs, 0, ncol);
1615 else if (screen.cur.col < ncol) 1679 else if (screen.cur.col < ncol)
1616 tabs [screen.cur.col] = !!mode; 1680 tabs [screen.cur.col] = !!mode;
1617} 1681}
1618 1682
1619/* ------------------------------------------------------------------------- */ 1683/* ------------------------------------------------------------------------- */
… …
1634 if (rvideo_state != on) 1698 if (rvideo_state != on)
1635 { 1699 {
1636 rvideo_state = on; 1700 rvideo_state = on;
1637 1701
1638 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1702 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1639#if XPM_BACKGROUND 1703#ifdef HAVE_BG_PIXMAP
1640 if (bgPixmap.pixmap == None) 1704 if (bg_pixmap == None)
1641#endif 1705#endif
1642#if TRANSPARENT
1643 if (!OPTION (Opt_transparent) || am_transparent == 0)
1644#endif
1645 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1706 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1646 1707
1647 XGCValues gcvalue; 1708 XGCValues gcvalue;
1648 gcvalue.foreground = pix_colors[Color_fg]; 1709 gcvalue.foreground = pix_colors[Color_fg];
1649 gcvalue.background = pix_colors[Color_bg]; 1710 gcvalue.background = pix_colors[Color_bg];
1650 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1711 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1651 1712
1652 scr_clear (); 1713 scr_clear ();
1653 scr_touch (true); 1714 scr_touch (true);
1654 } 1715 }
1655} 1716}
… …
1740{ 1801{
1741 bool found = false; 1802 bool found = false;
1742 1803
1743 for (int i = 0; i < nrow; i++) 1804 for (int i = 0; i < nrow; i++)
1744 { 1805 {
1745 int col = 0;
1746 rend_t *drp = drawn_buf[i].r; 1806 rend_t *drp = drawn_buf[i].r;
1747 1807
1748 for (; col < ncol; col++, drp++) 1808 for (int col = 0; col < ncol; col++, drp++)
1749 if ((*drp & mask) == value) 1809 if ((*drp & mask) == value)
1750 { 1810 {
1751 found = true; 1811 found = true;
1752 *drp = ~value; 1812 *drp = ~value;
1753 } 1813 }
… …
1858 return true; 1918 return true;
1859} 1919}
1860 1920
1861#ifndef NO_BELL 1921#ifndef NO_BELL
1862void 1922void
1863rxvt_term::bell_cb (time_watcher &w) 1923rxvt_term::bell_cb (ev::timer &w, int revents)
1864{ 1924{
1865 rvideo_bell = false; 1925 rvideo_bell = false;
1866 scr_rvideo_mode (rvideo_mode); 1926 scr_rvideo_mode (rvideo_mode);
1927 refresh_check ();
1867} 1928}
1868#endif 1929#endif
1869 1930
1870/* ------------------------------------------------------------------------- */ 1931/* ------------------------------------------------------------------------- */
1871void 1932void
… …
1873{ 1934{
1874#ifndef NO_BELL 1935#ifndef NO_BELL
1875 1936
1876# ifndef NO_MAPALERT 1937# ifndef NO_MAPALERT
1877# ifdef MAPALERT_OPTION 1938# ifdef MAPALERT_OPTION
1878 if (OPTION (Opt_mapAlert)) 1939 if (option (Opt_mapAlert))
1879# endif 1940# endif
1880 XMapWindow (display->display, parent[0]); 1941 XMapWindow (dpy, parent);
1881# endif 1942# endif
1882 1943
1944# if ENABLE_FRILLS
1945 if (option (Opt_urgentOnBell))
1946 set_urgency (1);
1947# endif
1948
1883 if (OPTION (Opt_visualBell)) 1949 if (option (Opt_visualBell))
1884 { 1950 {
1885 rvideo_bell = true; 1951 rvideo_bell = true;
1886 scr_rvideo_mode (rvideo_mode); 1952 scr_rvideo_mode (rvideo_mode);
1887 display->flush (); 1953 flush ();
1888 1954
1889 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1955 bell_ev.start (VISUAL_BELL_DURATION);
1890 } 1956 }
1891 else 1957 else
1892 XBell (display->display, 0); 1958 XBell (dpy, 0);
1893 1959 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1894#endif 1960#endif
1895} 1961}
1896 1962
1897/* ------------------------------------------------------------------------- */ 1963/* ------------------------------------------------------------------------- */
1898/* ARGSUSED */
1899void 1964void
1900rxvt_term::scr_printscreen (int fullhist) NOTHROW 1965rxvt_term::scr_printscreen (int fullhist) NOTHROW
1901{ 1966{
1902#ifdef PRINTPIPE 1967#ifdef PRINTPIPE
1903 int nrows, row_start; 1968 int nrows, row_start;
1904 FILE *fd; 1969 FILE *fd = popen_printer ();
1905 1970
1906 if ((fd = popen_printer ()) == NULL) 1971 if (!fd)
1907 return; 1972 return;
1908 1973
1909 if (fullhist) 1974 if (fullhist)
1910 { 1975 {
1911 nrows = nrow - top_row; 1976 nrows = nrow - top_row;
… …
1917 row_start = view_start; 1982 row_start = view_start;
1918 } 1983 }
1919 1984
1920 wctomb (0, 0); 1985 wctomb (0, 0);
1921 1986
1922 for (int r1 = 0; r1 < nrows; r1++) 1987 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1923 { 1988 {
1924 text_t *tp = ROW(r1).t; 1989 text_t *tp = ROW(r1).t;
1925 int len = ROW(r1).l; 1990 int len = ROW(r1).l;
1926 1991
1927 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1992 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1956 * screen.text/screen.rend contain what the screen will change to. 2021 * screen.text/screen.rend contain what the screen will change to.
1957 */ 2022 */
1958void 2023void
1959rxvt_term::scr_refresh () NOTHROW 2024rxvt_term::scr_refresh () NOTHROW
1960{ 2025{
1961 unsigned char must_clear, /* use draw_string not draw_image_string */
1962 showcursor; /* show the cursor */
1963 int16_t col, row, /* column/row we're processing */ 2026 int16_t col, row, /* column/row we're processing */
1964 ocrow; /* old cursor row */ 2027 ocrow; /* old cursor row */
1965 int i; /* tmp */ 2028 int i; /* tmp */
1966#ifndef NO_CURSORCOLOR 2029#ifndef NO_CURSORCOLOR
1967 rend_t cc1; /* store colours at cursor position (s) */ 2030 rend_t cc1; /* store colours at cursor position (s) */
1968#endif 2031#endif
1969 rend_t *crp; // cursor rendition pointer 2032 rend_t *crp; // cursor rendition pointer
2033 rend_t ccol1, /* Cursor colour */
2034 ccol2; /* Cursor colour2 */
1970 2035
1971 want_refresh = 0; /* screen is current */ 2036 want_refresh = 0; /* screen is current */
1972 2037
1973 if (refresh_type == NO_REFRESH || !mapped) 2038 if (refresh_type == NO_REFRESH || !mapped)
1974 return; 2039 return;
1975 2040
1976 /* 2041 /*
1977 * A: set up vars 2042 * A: set up vars
1978 */ 2043 */
1979 must_clear = 0;
1980 refresh_count = 0; 2044 refresh_count = 0;
1981 2045
1982#if XPM_BACKGROUND 2046 unsigned int old_screen_flags = screen.flags;
1983 must_clear |= bgPixmap.pixmap != None; 2047 bool have_bg = 0;
1984#endif 2048#ifdef HAVE_BG_PIXMAP
1985#if TRANSPARENT 2049 have_bg = bg_pixmap != None;
1986 must_clear |= OPTION (Opt_transparent) && am_transparent;
1987#endif 2050#endif
1988 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1989 2052
1990 /* 2053 /*
1991 * B: reverse any characters which are selected 2054 * B: reverse any characters which are selected
1992 */ 2055 */
1993 scr_reverse_selection (); 2056 scr_reverse_selection ();
1994 2057
2058 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2059#if ENABLE_OVERLAY
2060 scr_swap_overlay ();
2061#endif
2062
2063 bool showcursor = screen.flags & Screen_VisibleCursor;
2064
1995 /* 2065 /*
1996 * C: set the cursor character (s) 2066 * C: set the cursor character (s)
1997 */ 2067 */
1998 { 2068 {
1999 unsigned char setoldcursor; 2069 bool setoldcursor;
2000 rend_t ccol1, /* Cursor colour */
2001 ccol2; /* Cursor colour2 */
2002 2070
2003 showcursor = (screen.flags & Screen_VisibleCursor);
2004#ifdef CURSOR_BLINK 2071#ifdef CURSOR_BLINK
2005 if (hidden_cursor) 2072 if (hidden_cursor)
2006 showcursor = 0; 2073 showcursor = 0;
2007#endif 2074#endif
2008 2075
… …
2013 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2080 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2014 col--; 2081 col--;
2015 2082
2016 crp = &ROW(screen.cur.row).r[col]; 2083 crp = &ROW(screen.cur.row).r[col];
2017 2084
2018 if (showcursor && focus) 2085#ifndef NO_CURSORCOLOR
2086 cc1 = *crp & (RS_fgMask | RS_bgMask);
2087 if (ISSET_PIXCOLOR (Color_cursor))
2088 ccol1 = Color_cursor;
2089 else
2090#endif
2091#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2092 ccol1 = fgcolor_of (rstyle);
2093#else
2094 ccol1 = Color_fg;
2095#endif
2096
2097#ifndef NO_CURSORCOLOR
2098 if (ISSET_PIXCOLOR (Color_cursor2))
2099 ccol2 = Color_cursor2;
2100 else
2101#endif
2102#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2103 ccol2 = bgcolor_of (rstyle);
2104#else
2105 ccol2 = Color_bg;
2106#endif
2107
2108 if (focus)
2019 { 2109 {
2020 if (OPTION (Opt_cursorUnderline)) 2110 if (option (Opt_cursorUnderline))
2021 *crp ^= RS_Uline; 2111 *crp ^= RS_Uline;
2022 else 2112 else
2023 { 2113 {
2024 *crp ^= RS_RVid; 2114 *crp ^= RS_RVid;
2025
2026#ifndef NO_CURSORCOLOR
2027 cc1 = *crp & (RS_fgMask | RS_bgMask);
2028 if (ISSET_PIXCOLOR (Color_cursor))
2029 ccol1 = Color_cursor;
2030 else
2031#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2032 ccol1 = fgcolor_of (rstyle);
2033#else
2034 ccol1 = Color_fg;
2035#endif
2036 if (ISSET_PIXCOLOR (Color_cursor2))
2037 ccol2 = Color_cursor2;
2038 else
2039#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2040 ccol2 = bgcolor_of (rstyle);
2041#else
2042 ccol2 = Color_bg;
2043#endif
2044 *crp = SET_FGCOLOR (*crp, ccol1); 2115 *crp = SET_FGCOLOR (*crp, ccol1);
2045 *crp = SET_BGCOLOR (*crp, ccol2); 2116 *crp = SET_BGCOLOR (*crp, ccol2);
2046#endif
2047 } 2117 }
2048 } 2118 }
2049 } 2119 }
2050 2120
2051 /* make sure no outline cursor is left around */ 2121 /* make sure no outline cursor is left around */
… …
2078 oldcursor.col = screen.cur.col; 2148 oldcursor.col = screen.cur.col;
2079 } 2149 }
2080 } 2150 }
2081 } 2151 }
2082 2152
2083 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2084#if ENABLE_OVERLAY
2085 scr_swap_overlay ();
2086#endif
2087
2088#ifndef NO_SLOW_LINK_SUPPORT 2153#ifndef NO_SLOW_LINK_SUPPORT
2089 /* 2154 /*
2090 * D: CopyArea pass - very useful for slower links 2155 * D: CopyArea pass - very useful for slower links
2091 * This has been deliberately kept simple. 2156 * This has been deliberately kept simple.
2092 */ 2157 */
2093 if (!display->is_local 2158 if (!display->is_local
2094 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2159 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2095 && abs (num_scr) < nrow && !must_clear) 2160 && abs (num_scr) < nrow && !have_bg)
2096 { 2161 {
2097 int16_t nits; 2162 int16_t nits;
2163 int i = num_scr;
2098 int j; 2164 int j;
2099 int len, wlen; 2165 int len, wlen;
2100 dLocal (int, num_scr); 2166 dLocal (int, num_scr);
2101 2167
2102 j = nrow; 2168 j = nrow;
2103 wlen = len = -1; 2169 wlen = len = -1;
2104 row = i > 0 ? 0 : j - 1; 2170 row = i > 0 ? 0 : j - 1;
2171
2105 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2172 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2106 { 2173 {
2107 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2174 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2108 { 2175 {
2109 line_t s = ROW(view_start + row); 2176 line_t s = ROW(view_start + row);
… …
2130 wlen = row; 2197 wlen = row;
2131 continue; 2198 continue;
2132 } 2199 }
2133 } 2200 }
2134 2201
2135 if (len != -1) 2202 if (len >= 0)
2136 { 2203 {
2137 /* also comes here at end if needed because of >= above */ 2204 /* also comes here at end if needed because of >= above */
2138 if (wlen < len) 2205 if (wlen < len)
2139 ::swap (wlen, len); 2206 ::swap (wlen, len);
2140 2207
2208 XGCValues gcv;
2209
2210 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2141 XCopyArea (display->display, vt, vt, 2211 XCopyArea (dpy, vt, vt,
2142 gc, 0, Row2Pixel (len + i), 2212 gc, 0, Row2Pixel (len + i),
2143 (unsigned int)this->width, 2213 (unsigned int)this->width,
2144 (unsigned int)Height2Pixel (wlen - len + 1), 2214 (unsigned int)Height2Pixel (wlen - len + 1),
2145 0, Row2Pixel (len)); 2215 0, Row2Pixel (len));
2216 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2217
2146 len = -1; 2218 len = -1;
2147 } 2219 }
2148 } 2220 }
2149 } 2221 }
2150#endif 2222#endif
… …
2174 continue; 2246 continue;
2175 2247
2176 // redraw one or more characters 2248 // redraw one or more characters
2177 2249
2178 // seek to the beginning of wide characters 2250 // seek to the beginning of wide characters
2179 while (stp[col] == NOCHAR && col > 0) 2251 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2180 --col; 2252 --col;
2181 2253
2182 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2254 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2183 text_t *text = stp + col; 2255 text_t *text = stp + col;
2184 int count = 1; 2256 int count = 1;
2185 2257
2186 dtp[col] = stp[col]; 2258 dtp[col] = stp[col];
2187 drp[col] = rend; 2259 drp[col] = rend;
… …
2191 for (i = 0; ++col < ncol; ) 2263 for (i = 0; ++col < ncol; )
2192 { 2264 {
2193 if (stp[col] == NOCHAR) 2265 if (stp[col] == NOCHAR)
2194 { 2266 {
2195 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2196 drp[col] = rend; 2268 drp[col] = srp[col];
2269
2197 count++; 2270 count++;
2198 i++; 2271 i++;
2199 2272
2200 continue; 2273 continue;
2201 } 2274 }
… …
2206 count++; 2279 count++;
2207 2280
2208 if (stp[col] != dtp[col] 2281 if (stp[col] != dtp[col]
2209 || !RS_SAME (srp[col], drp[col])) 2282 || !RS_SAME (srp[col], drp[col]))
2210 { 2283 {
2211 if (must_clear && (i++ > count / 2)) 2284 if (have_bg && (i++ > count / 2))
2212 break; 2285 break;
2213 2286
2214 dtp[col] = stp[col]; 2287 dtp[col] = stp[col];
2215 drp[col] = rend; 2288 drp[col] = rend;
2216 i = 0; 2289 i = 0;
2217 } 2290 }
2218 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2291 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2219 break; 2292 break;
2220 } 2293 }
2221 2294
2222 col--; /* went one too far. move back */ 2295 col--; /* went one too far. move back */
2223 count -= i; /* dump any matching trailing chars */ 2296 count -= i; /* dump any matching trailing chars */
2224 2297
2225 // sometimes we optimize away the trailing NOCHAR's, add them back 2298 // sometimes we optimize away the trailing NOCHAR's, add them back
2226 while (i && text[count] == NOCHAR) 2299 while (ecb_unlikely (i && text[count] == NOCHAR))
2227 count++, i--; 2300 count++, i--;
2228 2301
2229 /* 2302 /*
2230 * Determine the attributes for the string 2303 * Determine the attributes for the string
2231 */ 2304 */
2232 int fore = fgcolor_of (rend); // desired foreground 2305 int fore = fgcolor_of (rend); // desired foreground
2233 int back = bgcolor_of (rend); // desired background 2306 int back = bgcolor_of (rend); // desired background
2234 2307
2235 // only do special processing if any attributes are set, which is unlikely 2308 // only do special processing if any attributes are set, which is unlikely
2236 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2309 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2237 { 2310 {
2238#if ENABLE_STYLES
2239 // force redraw after "careful" characters to avoid pixel droppings
2240 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2241 drp[col + 1] = ~srp[col + 1];
2242
2243 // include previous careful character(s) if possible, looks nicer (best effort...)
2244 while (text > stp
2245 && srp[text - stp - 1] & RS_Careful
2246 && RS_SAME (rend, srp[text - stp - 1]))
2247 text--, count++, xpixel -= fwidth;
2248#endif
2249
2250 bool invert = rend & RS_RVid; 2311 bool invert = rend & RS_RVid;
2251 2312
2252#ifndef NO_BOLD_UNDERLINE_REVERSE 2313#ifndef NO_BOLD_UNDERLINE_REVERSE
2253 if (rend & RS_Bold
2254 && fore == Color_fg) 2314 if (rend & RS_Bold && fore == Color_fg)
2255 { 2315 {
2256 if (ISSET_PIXCOLOR (Color_BD)) 2316 if (ISSET_PIXCOLOR (Color_BD))
2257 fore = Color_BD; 2317 fore = Color_BD;
2258# if !ENABLE_STYLES 2318# if !ENABLE_STYLES
2259 else 2319 else
2260 invert = !invert; 2320 invert = !invert;
2261# endif 2321# endif
2262 } 2322 }
2263 2323
2264 if (rend & RS_Italic 2324 if (rend & RS_Italic && fore == Color_fg)
2265 && fore == Color_fg)
2266 { 2325 {
2267 if (ISSET_PIXCOLOR (Color_IT)) 2326 if (ISSET_PIXCOLOR (Color_IT))
2268 fore = Color_IT; 2327 fore = Color_IT;
2269# if !ENABLE_STYLES 2328# if !ENABLE_STYLES
2270 else 2329 else
2271 invert = !invert; 2330 invert = !invert;
2272# endif 2331# endif
2273 } 2332 }
2274 2333
2275 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2334 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2276 fore = Color_UL; 2335 fore = Color_UL;
2336#endif
2337
2338#ifdef OPTION_HC
2339 if (rend & RS_Sel)
2340 {
2341 /* invert the column if no highlightColor is set or it is the
2342 * current cursor column */
2343 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2344 && ISSET_PIXCOLOR (Color_HC))
2345 {
2346 if (ISSET_PIXCOLOR (Color_HTC))
2347 fore = Color_HTC;
2348 // if invert is 0 reverse video is set so we use bg color as fg color
2349 else if (!invert)
2350 fore = back;
2351
2352 back = Color_HC;
2353 invert = 0;
2354 }
2355 }
2277#endif 2356#endif
2278 2357
2279 if (invert) 2358 if (invert)
2280 { 2359 {
2281 ::swap (fore, back); 2360 ::swap (fore, back);
2282 2361
2283#ifndef NO_BOLD_UNDERLINE_REVERSE 2362#ifndef NO_BOLD_UNDERLINE_REVERSE
2284 if (ISSET_PIXCOLOR (Color_RV))
2285 back = Color_RV;
2286
2287 if (fore == back) 2363 if (fore == back)
2288 { 2364 {
2289 fore = Color_bg; 2365 fore = Color_bg;
2290 back = Color_fg; 2366 back = Color_fg;
2291 } 2367 }
… …
2293 } 2369 }
2294 2370
2295#ifdef TEXT_BLINK 2371#ifdef TEXT_BLINK
2296 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2372 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2297 { 2373 {
2298 if (!text_blink_ev.active) 2374 if (!text_blink_ev.is_active ())
2299 { 2375 {
2300 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2376 text_blink_ev.again ();
2301 hidden_text = 0; 2377 hidden_text = 0;
2302 } 2378 }
2303 else if (hidden_text) 2379 else if (hidden_text)
2304 fore = back; 2380 fore = back;
2305 } 2381 }
2306#endif 2382#endif
2383
2384#if ENABLE_STYLES
2385 // "careful" (too wide) character handling
2386
2387 // include previous careful character(s) if possible, looks nicer (best effort...)
2388 while (text > stp
2389 && srp[text - stp - 1] & RS_Careful
2390 && RS_SAME (rend, srp[text - stp - 1]))
2391 text--, count++, xpixel -= fwidth;
2392
2393 // force redraw after "careful" characters to avoid pixel droppings
2394 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2395 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2396
2397 // force redraw before "careful" characters to avoid pixel droppings
2398 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2399 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2400#endif
2307 } 2401 }
2308 2402
2309 /* 2403 /*
2310 * Actually do the drawing of the string here 2404 * Actually do the drawing of the string here
2311 */ 2405 */
2312 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2406 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2313 2407
2314 if (back == fore) 2408 if (ecb_likely (have_bg && back == Color_bg))
2315 font->clear_rect (*drawable, xpixel, ypixel,
2316 fwidth * count, fheight,
2317 back);
2318 else if (back == Color_bg)
2319 { 2409 {
2320 if (must_clear) 2410 // this is very ugly, maybe push it into ->draw?
2321 {
2322 CLEAR_CHARS (xpixel, ypixel, count);
2323 2411
2324 for (i = 0; i < count; i++) /* don't draw empty strings */ 2412 for (i = 0; i < count; i++) /* don't draw empty strings */
2325 if (text[i] != ' ') 2413 if (text[i] != ' ')
2326 { 2414 {
2327 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2415 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2328 break; 2416 goto did_clear;
2329 }
2330 } 2417 }
2331 else 2418
2332 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2419 CLEAR_CHARS (xpixel, ypixel, count);
2420 did_clear: ;
2333 } 2421 }
2334 else 2422 else
2335 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2423 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2336 2424
2337 if (rend & RS_Uline && font->descent > 1 && fore != back) 2425 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2338 { 2426 {
2339#if ENABLE_FRILLS 2427#if ENABLE_FRILLS
2340 if (ISSET_PIXCOLOR (Color_underline)) 2428 if (ISSET_PIXCOLOR (Color_underline))
2341 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2429 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2342 else 2430 else
2343#endif 2431#endif
2344 XSetForeground (display->display, gc, pix_colors[fore]); 2432 XSetForeground (dpy, gc, pix_colors[fore]);
2345 2433
2346 XDrawLine (display->display, drawBuffer, gc, 2434 XDrawLine (dpy, vt, gc,
2347 xpixel, ypixel + font->ascent + 1, 2435 xpixel, ypixel + font->ascent + 1,
2348 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2436 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2349 } 2437 }
2350 } /* for (col....) */ 2438 } /* for (col....) */
2351 } /* for (row....) */ 2439 } /* for (row....) */
2352 2440
2353#if ENABLE_OVERLAY
2354 scr_swap_overlay ();
2355#endif
2356 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2357
2358 /* 2441 /*
2359 * G: cleanup cursor and display outline cursor if necessary 2442 * G: cleanup cursor and display outline cursor if necessary
2360 */ 2443 */
2361 if (showcursor) 2444 if (showcursor)
2362 { 2445 {
2363 if (focus) 2446 if (focus)
2364 { 2447 {
2365 if (OPTION (Opt_cursorUnderline)) 2448 if (option (Opt_cursorUnderline))
2366 *crp ^= RS_Uline; 2449 *crp ^= RS_Uline;
2367 else 2450 else
2368 { 2451 {
2369 *crp ^= RS_RVid; 2452 *crp ^= RS_RVid;
2370#ifndef NO_CURSORCOLOR 2453#ifndef NO_CURSORCOLOR
… …
2384 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2467 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2385 cursorwidth++; 2468 cursorwidth++;
2386 2469
2387#ifndef NO_CURSORCOLOR 2470#ifndef NO_CURSORCOLOR
2388 if (ISSET_PIXCOLOR (Color_cursor)) 2471 if (ISSET_PIXCOLOR (Color_cursor))
2389 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2472 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2473 else
2390#endif 2474#endif
2475 XSetForeground (dpy, gc, pix_colors[ccol1]);
2391 2476
2392 XDrawRectangle (display->display, drawBuffer, gc, 2477 XDrawRectangle (dpy, vt, gc,
2393 Col2Pixel (col), 2478 Col2Pixel (col),
2394 Row2Pixel (oldcursor.row), 2479 Row2Pixel (oldcursor.row),
2395 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2480 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2396 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2481 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2397 } 2482 }
2398 } 2483 }
2399 2484
2400 /* 2485 /*
2401 * H: cleanup selection 2486 * H: cleanup selection
2402 */ 2487 */
2488#if ENABLE_OVERLAY
2489 scr_swap_overlay ();
2490#endif
2491 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2492
2403 scr_reverse_selection (); 2493 scr_reverse_selection ();
2404 2494
2495 screen.flags = old_screen_flags;
2405 num_scr = 0; 2496 num_scr = 0;
2406 num_scr_allow = 1; 2497 num_scr_allow = 1;
2407} 2498}
2408 2499
2409void 2500void
… …
2430 scr_remap_chars (swap_buf [i]); 2521 scr_remap_chars (swap_buf [i]);
2431 } 2522 }
2432} 2523}
2433 2524
2434void 2525void
2435rxvt_term::scr_recolour () NOTHROW 2526rxvt_term::scr_recolour (bool refresh) NOTHROW
2436{ 2527{
2437 if (1 2528 bool transparent = false;
2438#if TRANSPARENT 2529
2439 && !am_transparent 2530#ifdef HAVE_BG_PIXMAP
2531 if (bg_pixmap != None)
2532 {
2533# ifdef ENABLE_TRANSPARENCY
2534 if (bg_flags & BG_IS_TRANSPARENT)
2535 {
2536 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2537 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2538
2539 transparent = true;
2540 }
2541 else
2440#endif 2542# endif
2441#if XPM_BACKGROUND
2442 && !bgPixmap.pixmap
2443#endif
2444 ) 2543 {
2544 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2545 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2546 }
2445 { 2547 }
2548 else
2549#endif
2550 {
2446 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2447 XClearWindow (display->display, parent[0]);
2448 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2552 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2449#if HAVE_SCROLLBARS 2553 }
2554
2555 XClearWindow (dpy, parent);
2556
2450 if (scrollBar.win) 2557 if (scrollBar.win)
2451 { 2558 {
2559 if (transparent)
2560 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2561 else
2452 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2562 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2453 scrollBar.setIdle (); 2563 scrollBar.state = SB_STATE_IDLE;
2454 scrollbar_show (0); 2564 scrollBar.show (0);
2455 } 2565 }
2456#endif 2566
2567 if (refresh)
2457 } 2568 {
2458
2459 scr_clear (); 2569 scr_clear ();
2460 scr_touch (true); 2570 scr_touch (true);
2571 }
2461 want_refresh = 1; 2572 want_refresh = 1;
2462} 2573}
2463 2574
2464/* ------------------------------------------------------------------------- */ 2575/* ------------------------------------------------------------------------- */
2465void 2576void
… …
2470 2581
2471 num_scr_allow = 0; 2582 num_scr_allow = 0;
2472 want_refresh = 1; 2583 want_refresh = 1;
2473 2584
2474 if (really) 2585 if (really)
2475 XClearWindow (display->display, vt); 2586 XClearWindow (dpy, vt);
2476} 2587}
2477 2588
2478void 2589void
2479rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2590rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2480{ 2591{
… …
2529{ 2640{
2530 if (selection.op 2641 if (selection.op
2531 && current_screen == selection.screen 2642 && current_screen == selection.screen
2532 && selection.end.row >= view_start) 2643 && selection.end.row >= view_start)
2533 { 2644 {
2534#if ENABLE_FRILLS 2645#if !ENABLE_MINIMAL
2535 if (selection.rect) 2646 if (selection.rect)
2536 scr_xor_rect (selection.beg.row, selection.beg.col, 2647 scr_xor_rect (selection.beg.row, selection.beg.col,
2537 selection.end.row, selection.end.col, 2648 selection.end.row, selection.end.col,
2538 RS_RVid, RS_RVid | RS_Uline); 2649 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2539 else 2650 else
2540#endif 2651#endif
2541 scr_xor_span (selection.beg.row, selection.beg.col, 2652 scr_xor_span (selection.beg.row, selection.beg.col,
2542 selection.end.row, selection.end.col, 2653 selection.end.row, selection.end.col,
2543 RS_RVid); 2654 RS_Sel | RS_RVid);
2544 } 2655 }
2545} 2656}
2546 2657
2547/* ------------------------------------------------------------------------- */ 2658/* ------------------------------------------------------------------------- */
2548/* 2659/*
… …
2553void 2664void
2554rxvt_term::scr_dump (int fd) NOTHROW 2665rxvt_term::scr_dump (int fd) NOTHROW
2555{ 2666{
2556 int row, wrote; 2667 int row, wrote;
2557 unsigned int width, towrite; 2668 unsigned int width, towrite;
2558 char r1[] = "\n"; 2669 const char r1[] = "\n";
2559 2670
2560 for (row = saveLines - nsaved; 2671 for (row = saveLines + top_row;
2561 row < saveLines + nrow - 1; row++) 2672 row < saveLines + nrow - 1; row++)
2562 { 2673 {
2563 width = row_buf[row].l >= 0 ? row_buf[row].l 2674 width = row_buf[row].l >= 0 ? row_buf[row].l
2564 : ncol; 2675 : ncol;
2565 for (towrite = width; towrite; towrite -= wrote) 2676 for (towrite = width; towrite; towrite -= wrote)
… …
2580 * CHARACTER SELECTION * 2691 * CHARACTER SELECTION *
2581 * ------------------------------------------------------------------------- */ 2692 * ------------------------------------------------------------------------- */
2582void 2693void
2583rxvt_term::selection_check (int check_more) NOTHROW 2694rxvt_term::selection_check (int check_more) NOTHROW
2584{ 2695{
2585 row_col_t pos;
2586
2587 if (!selection.op) 2696 if (!selection.op)
2588 return; 2697 return;
2589 2698
2699 row_col_t pos;
2590 pos.row = pos.col = 0; 2700 pos.row = pos.col = 0;
2701
2591 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2702 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2592 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2703 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2593 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2704 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2594 || (check_more == 1 2705 || (check_more == 1
2595 && current_screen == selection.screen 2706 && current_screen == selection.screen
… …
2597 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2708 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2598 || (check_more == 2 2709 || (check_more == 2
2599 && ROWCOL_IS_BEFORE (selection.beg, pos) 2710 && ROWCOL_IS_BEFORE (selection.beg, pos)
2600 && ROWCOL_IS_AFTER (selection.end, pos)) 2711 && ROWCOL_IS_AFTER (selection.end, pos))
2601 || (check_more == 3 2712 || (check_more == 3
2602 && ROWCOL_IS_AFTER (selection.end, pos)) 2713 && ROWCOL_IS_AFTER (selection.end, pos)))
2603 || (check_more == 4 /* screen width change */
2604 && (selection.beg.row != selection.end.row
2605 || selection.end.col > ncol)))
2606 CLEAR_SELECTION (); 2714 CLEAR_ALL_SELECTION ();
2607} 2715}
2608 2716
2609/* ------------------------------------------------------------------------- */ 2717/* ------------------------------------------------------------------------- */
2610/* 2718/*
2611 * Paste a selection direct to the command fd 2719 * Paste a selection direct to the command fd
2612 */ 2720 */
2613void 2721void
2614rxvt_term::paste (char *data, unsigned int len) NOTHROW 2722rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2615{ 2723{
2616 /* convert normal newline chars into common keyboard Return key sequence */ 2724 /* convert normal newline chars into common keyboard Return key sequence */
2617 for (unsigned int i = 0; i < len; i++) 2725 for (unsigned int i = 0; i < len; i++)
2618 if (data[i] == C0_LF) 2726 if (data[i] == C0_LF)
2619 data[i] = C0_CR; 2727 data[i] = C0_CR;
2620 2728
2729 if (priv_modes & PrivMode_BracketPaste)
2730 tt_printf ("\e[200~");
2731
2621 tt_write (data, len); 2732 tt_write (data, len);
2622}
2623 2733
2624/* ------------------------------------------------------------------------- */ 2734 if (priv_modes & PrivMode_BracketPaste)
2625/* 2735 tt_printf ("\e[201~");
2626 * Respond to a notification that a primary selection has been sent
2627 * EXT: SelectionNotify
2628 */
2629void
2630rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2631{
2632 if (prop == None) /* check for failed XConvertSelection */
2633 {
2634 if ((selection_type & Sel_CompoundText))
2635 {
2636 int selnum = selection_type & Sel_whereMask;
2637
2638 selection_type = 0;
2639 if (selnum != Sel_direct)
2640 selection_request_other (XA_STRING, selnum);
2641 }
2642
2643 if ((selection_type & Sel_UTF8String))
2644 {
2645 int selnum = selection_type & Sel_whereMask;
2646
2647 selection_type = Sel_CompoundText;
2648 if (selnum != Sel_direct)
2649 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2650 else
2651 selection_type = 0;
2652 }
2653
2654 return;
2655 }
2656
2657 unsigned long bytes_after;
2658 XTextProperty ct;
2659
2660 if (XGetWindowProperty (display->display, win, prop,
2661 0, PROP_SIZE / 4,
2662 delete_prop, AnyPropertyType,
2663 &ct.encoding, &ct.format,
2664 &ct.nitems, &bytes_after,
2665 &ct.value) != Success)
2666 {
2667 ct.value = 0;
2668 goto bailout;
2669 }
2670
2671 if (ct.encoding == None)
2672 goto bailout;
2673
2674 if (bytes_after)
2675 {
2676 // fetch and append remaining data
2677 XTextProperty ct2;
2678
2679 if (XGetWindowProperty (display->display, win, prop,
2680 ct.nitems / 4, (bytes_after + 3) / 4,
2681 delete_prop, AnyPropertyType,
2682 &ct2.encoding, &ct2.format,
2683 &ct2.nitems, &bytes_after,
2684 &ct2.value) != Success)
2685 goto bailout;
2686
2687 // realloc should be compatible to XFree, here, and elsewhere, too
2688 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2689 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2690 ct.nitems += ct2.nitems;
2691
2692 XFree (ct2.value);
2693 }
2694
2695 if (ct.value == 0)
2696 goto bailout;
2697
2698 if (ct.encoding == xa[XA_INCR])
2699 {
2700 // INCR selection, start handshake
2701 if (!delete_prop)
2702 XDeleteProperty (display->display, win, prop);
2703
2704 selection_wait = Sel_incr;
2705 incr_buf_fill = 0;
2706 incr_ev.start (NOW + 10);
2707
2708 goto bailout;
2709 }
2710
2711 if (ct.nitems == 0)
2712 {
2713 if (selection_wait == Sel_incr)
2714 {
2715 XFree (ct.value);
2716
2717 // finally complete, now paste the whole thing
2718 selection_wait = Sel_normal;
2719 ct.value = (unsigned char *)incr_buf;
2720 ct.nitems = incr_buf_fill;
2721 incr_buf = 0;
2722 incr_buf_size = 0;
2723 incr_ev.stop ();
2724 }
2725 else
2726 {
2727 if (selection_wait == Sel_normal
2728 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2729 {
2730 /*
2731 * pass through again trying CUT_BUFFER0 if we've come from
2732 * XConvertSelection () but nothing was presented
2733 */
2734 selection_paste (display->root, XA_CUT_BUFFER0, False);
2735 }
2736
2737 goto bailout;
2738 }
2739 }
2740 else if (selection_wait == Sel_incr)
2741 {
2742 incr_ev.start (NOW + 10);
2743
2744 while (incr_buf_fill + ct.nitems > incr_buf_size)
2745 {
2746 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2747 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2748 }
2749
2750 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2751 incr_buf_fill += ct.nitems;
2752
2753 goto bailout;
2754 }
2755
2756 char **cl;
2757 int cr;
2758
2759#if ENABLE_FRILLS
2760 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2761 // so recode it manually
2762 if (ct.encoding == xa[XA_UTF8_STRING])
2763 {
2764 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2765 char *s = rxvt_wcstombs (w);
2766 free (w);
2767 // TODO: strlen == only the first element will be converted. well...
2768 paste (s, strlen (s));
2769 free (s);
2770 }
2771 else
2772#endif
2773 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2774 && cl)
2775 {
2776 for (int i = 0; i < cr; i++)
2777 paste (cl[i], strlen (cl[i]));
2778
2779 XFreeStringList (cl);
2780 }
2781 else
2782 paste ((char *)ct.value, ct.nitems); // paste raw
2783
2784bailout:
2785 XFree (ct.value);
2786
2787 if (selection_wait == Sel_normal)
2788 selection_wait = Sel_none;
2789} 2736}
2790 2737
2791void 2738void
2792rxvt_term::incr_cb (time_watcher &w) NOTHROW 2739rxvt_term::paste (char *data, unsigned int len) NOTHROW
2793{ 2740{
2794 selection_wait = Sel_none; 2741 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2795
2796 incr_buf_size = 0;
2797 free (incr_buf);
2798
2799 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2800}
2801
2802void
2803rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2804{
2805 if (prop == None || selection_wait != Sel_incr)
2806 return; 2742 return;
2807 2743
2808 selection_paste (win, prop, true); 2744 tt_paste (data, len);
2809} 2745}
2810 2746
2811/* ------------------------------------------------------------------------- */ 2747/* ------------------------------------------------------------------------- */
2812/* 2748/*
2813 * Request the current selection: 2749 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2814 * Order: > internal selection if available 2750 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2815 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2751 * as fallback
2816 * > CUT_BUFFER0
2817 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2818 * will auto fallback to CUT_BUFFER0
2819 * EXT: button 2 release 2752 * EXT: button 2 release
2820 */ 2753 */
2821void 2754void
2822rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2755rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2823{ 2756{
2824 if (selection.text && selnum == Sel_Primary) 2757 if (!selection_req)
2825 { /* internal selection */
2826 char *str = rxvt_wcstombs (selection.text, selection.len);
2827 paste (str, strlen (str));
2828 free (str);
2829 return;
2830 } 2758 {
2831 else 2759 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2760 selection_req->run ();
2832 { 2761 }
2833 selection_request_time = tm;
2834 selection_wait = Sel_normal;
2835
2836#if X_HAVE_UTF8_STRING
2837 selection_type = Sel_UTF8String;
2838 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2839 return;
2840#else
2841 selection_type = Sel_CompoundText;
2842 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2843 return;
2844#endif
2845 }
2846
2847 selection_wait = Sel_none; /* don't loop in selection_paste () */
2848 selection_paste (display->root, XA_CUT_BUFFER0, false);
2849}
2850
2851int
2852rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2853{
2854 Atom sel;
2855
2856 selection_type |= selnum;
2857
2858 if (selnum == Sel_Primary)
2859 sel = XA_PRIMARY;
2860 else if (selnum == Sel_Secondary)
2861 sel = XA_SECONDARY;
2862 else
2863 sel = xa[XA_CLIPBOARD];
2864
2865 if (XGetSelectionOwner (display->display, sel) != None)
2866 {
2867 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2868 vt, selection_request_time);
2869 return 1;
2870 }
2871
2872 return 0;
2873} 2762}
2874 2763
2875/* ------------------------------------------------------------------------- */ 2764/* ------------------------------------------------------------------------- */
2876/* 2765/*
2877 * Clear all selected text 2766 * Clear all selected text
2878 * EXT: SelectionClear 2767 * EXT: SelectionClear
2879 */ 2768 */
2880void 2769void
2881rxvt_term::selection_clear () NOTHROW 2770rxvt_term::selection_clear (bool clipboard) NOTHROW
2882{ 2771{
2772 if (!clipboard)
2773 {
2883 want_refresh = 1; 2774 want_refresh = 1;
2884 free (selection.text); 2775 free (selection.text);
2885 selection.text = NULL; 2776 selection.text = NULL;
2886 selection.len = 0; 2777 selection.len = 0;
2887 CLEAR_SELECTION (); 2778 CLEAR_SELECTION ();
2888 2779
2889 if (display->selection_owner == this) 2780 if (display->selection_owner == this)
2890 display->selection_owner = 0; 2781 display->selection_owner = 0;
2782 }
2783 else
2784 {
2785 free (selection.clip_text);
2786 selection.clip_text = NULL;
2787 selection.clip_len = 0;
2788
2789 if (display->clipboard_owner == this)
2790 display->clipboard_owner = 0;
2791 }
2891} 2792}
2892 2793
2893/* ------------------------------------------------------------------------- */ 2794/* ------------------------------------------------------------------------- */
2894/* 2795/*
2895 * Copy a selection into the cut buffer 2796 * Copy a selection into the cut buffer
2896 * EXT: button 1 or 3 release 2797 * EXT: button 1 or 3 release
2897 */ 2798 */
2898void 2799void
2899rxvt_term::selection_make (Time tm) 2800rxvt_term::selection_make (Time tm)
2900{ 2801{
2901 int i; 2802 int size;
2902 wchar_t *new_selection_text; 2803 wchar_t *new_selection_text;
2903 text_t *t; 2804 text_t *t;
2904 2805
2905 switch (selection.op) 2806 switch (selection.op)
2906 { 2807 {
… …
2922 return; /* nothing selected, go away */ 2823 return; /* nothing selected, go away */
2923 2824
2924 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2825 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2925 return; 2826 return;
2926 2827
2927 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2828 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2928 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2829 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2929 2830
2930 int ofs = 0; 2831 int ofs = 0;
2931 int extra = 0; 2832 int extra = 0;
2932 2833
2933 int col = selection.beg.col; 2834 int col = selection.beg.col;
… …
2935 2836
2936 int end_col; 2837 int end_col;
2937 2838
2938 for (; row <= selection.end.row; row++, col = 0) 2839 for (; row <= selection.end.row; row++, col = 0)
2939 { 2840 {
2940#if ENABLE_FRILLS 2841#if !ENABLE_MINIMAL
2941 if (selection.rect) 2842 if (selection.rect)
2942 { 2843 {
2943 col = selection.beg.col; 2844 col = selection.beg.col;
2944 end_col = ncol + 1; 2845 end_col = selection.end.col;
2945 } 2846 }
2946 else 2847 else
2947#endif 2848#endif
2948 end_col = ROW(row).l; 2849 end_col = ROW(row).l;
2949 2850
2950 col = max (col, 0); 2851 col = max (col, 0);
2951 2852
2952 if (row == selection.end.row 2853 if (row == selection.end.row)
2953#if ENABLE_FRILLS
2954 || selection.rect
2955#endif
2956 )
2957 min_it (end_col, selection.end.col); 2854 min_it (end_col, selection.end.col);
2958 2855
2959 t = ROW(row).t + col; 2856 t = ROW(row).t + col;
2960 2857
2961 for (; col < end_col; col++) 2858 for (; col < end_col; col++)
… …
2969 2866
2970 extra -= (len - 1); 2867 extra -= (len - 1);
2971 2868
2972 if (extra < 0) 2869 if (extra < 0)
2973 { 2870 {
2974 extra += i; 2871 extra += size;
2975 i += i; 2872 size += size;
2976 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2873 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2977 } 2874 }
2978 2875
2979 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2876 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2980 } 2877 }
2981#endif 2878#endif
2982 else 2879 else
2983 new_selection_text[ofs++] = *t++; 2880 new_selection_text[ofs++] = *t++;
2984 } 2881 }
2985 2882
2986#if ENABLE_FRILLS 2883#if !ENABLE_MINIMAL
2987 if (selection.rect) 2884 if (selection.rect)
2988 { 2885 {
2989 while (ofs 2886 while (ofs
2990 && new_selection_text[ofs - 1] != C0_LF 2887 && new_selection_text[ofs - 1] != C0_LF
2991 && unicode::is_space (new_selection_text[ofs - 1])) 2888 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2993 2890
2994 new_selection_text[ofs++] = C0_LF; 2891 new_selection_text[ofs++] = C0_LF;
2995 } 2892 }
2996 else 2893 else
2997#endif 2894#endif
2998 if (!ROW(row).is_longer () && row != selection.end.row) 2895 if (!ROW(row).is_longer ()
2896 && (row != selection.end.row || end_col != selection.end.col)
2897 && (row != selection.beg.row || selection.beg.col < ncol))
2999 new_selection_text[ofs++] = C0_LF; 2898 new_selection_text[ofs++] = C0_LF;
3000 } 2899 }
3001
3002 if (end_col != selection.end.col)
3003 new_selection_text[ofs++] = C0_LF;
3004 2900
3005 new_selection_text[ofs] = 0; 2901 new_selection_text[ofs] = 0;
3006 2902
3007 if (ofs == 0) 2903 if (ofs == 0)
3008 { 2904 {
… …
3021 2917
3022 selection_grab (tm); 2918 selection_grab (tm);
3023} 2919}
3024 2920
3025bool 2921bool
3026rxvt_term::selection_grab (Time tm) NOTHROW 2922rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3027{ 2923{
2924 Atom sel;
2925
2926 if (!clipboard)
2927 {
3028 selection_time = tm; 2928 selection_time = tm;
3029 2929 sel = XA_PRIMARY;
3030 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3031 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3032 { 2930 }
2931 else
2932 {
2933 clipboard_time = tm;
2934 sel = xa[XA_CLIPBOARD];
2935 }
2936
2937 XSetSelectionOwner (dpy, sel, vt, tm);
2938 if (XGetSelectionOwner (dpy, sel) == vt)
2939 {
3033 display->set_selection_owner (this); 2940 display->set_selection_owner (this, clipboard);
3034 return true; 2941 return true;
3035 } 2942 }
3036 else 2943 else
3037 { 2944 {
3038 selection_clear (); 2945 selection_clear (clipboard);
3039 return false; 2946 return false;
3040 } 2947 }
3041 2948
3042#if 0 2949#if 0
3043 XTextProperty ct; 2950 XTextProperty ct;
3044 2951
3045 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 2952 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3046 { 2953 {
3047 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 2954 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3048 XFree (ct.value); 2955 XFree (ct.value);
3049 } 2956 }
3050#endif 2957#endif
… …
3096 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3003 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3097 3004
3098 while (selection.mark.col > 0 3005 while (selection.mark.col > 0
3099 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3006 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3100 --selection.mark.col; 3007 --selection.mark.col;
3101 3008
3102 if (selection.op) 3009 if (selection.op)
3010 {
3103 { /* clear the old selection */ 3011 /* clear the old selection */
3104 selection.beg.row = selection.end.row = selection.mark.row; 3012 selection.beg.row = selection.end.row = selection.mark.row;
3105 selection.beg.col = selection.end.col = selection.mark.col; 3013 selection.beg.col = selection.end.col = selection.mark.col;
3106 } 3014 }
3107 3015
3108 selection.op = SELECTION_INIT; 3016 selection.op = SELECTION_INIT;
… …
3297 * a point/word/line which is either the start or end of the selection 3205 * a point/word/line which is either the start or end of the selection
3298 * and it was decided by whichever point/word/line was `fixed' at the 3206 * and it was decided by whichever point/word/line was `fixed' at the
3299 * time of the most recent button3 press 3207 * time of the most recent button3 press
3300 */ 3208 */
3301 if (button3 && buttonpress) 3209 if (button3 && buttonpress)
3210 {
3302 { /* button3 press */ 3211 /* button3 press */
3303 /* 3212 /*
3304 * first determine which edge of the selection we are closest to 3213 * first determine which edge of the selection we are closest to
3305 */ 3214 */
3306 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3215 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3307 || (!ROWCOL_IS_AFTER (pos, selection.end) 3216 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3325 selection.mark.row = selection.beg.row; 3234 selection.mark.row = selection.beg.row;
3326 selection.mark.col = selection.beg.col; 3235 selection.mark.col = selection.beg.col;
3327 } 3236 }
3328 } 3237 }
3329 else 3238 else
3239 {
3330 { /* button1 drag or button3 drag */ 3240 /* button1 drag or button3 drag */
3331 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3241 if (ROWCOL_IS_AFTER (selection.mark, pos))
3332 { 3242 {
3333 if (selection.mark.row == selection.end.row 3243 if (selection.mark.row == selection.end.row
3334 && selection.mark.col == selection.end.col 3244 && selection.mark.col == selection.end.col
3335 && clickchange 3245 && clickchange
… …
3352 3262
3353 if (selection.clicks == 1) 3263 if (selection.clicks == 1)
3354 { 3264 {
3355 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3265 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3356 && !ROW(selection.beg.row).is_longer () 3266 && !ROW(selection.beg.row).is_longer ()
3357#if ENABLE_FRILLS 3267#if !ENABLE_MINIMAL
3358 && !selection.rect 3268 && !selection.rect
3359#endif 3269#endif
3360 ) 3270 )
3361 selection.beg.col = ncol; 3271 selection.beg.col = ncol;
3362 3272
3363 if ( 3273 if (
3364 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3274 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3365 && !ROW(selection.end.row).is_longer () 3275 && !ROW(selection.end.row).is_longer ()
3366#if ENABLE_FRILLS 3276#if !ENABLE_MINIMAL
3367 && !selection.rect 3277 && !selection.rect
3368#endif 3278#endif
3369 ) 3279 )
3370 selection.end.col = ncol; 3280 selection.end.col = ncol;
3371 } 3281 }
… …
3378 selection_delimit_word (DN, &selection.end, &selection.end); 3288 selection_delimit_word (DN, &selection.end, &selection.end);
3379 } 3289 }
3380 else if (selection.clicks == 3) 3290 else if (selection.clicks == 3)
3381 { 3291 {
3382#if ENABLE_FRILLS 3292#if ENABLE_FRILLS
3383 if (OPTION (Opt_tripleclickwords)) 3293 if (option (Opt_tripleclickwords))
3384 { 3294 {
3385 selection_delimit_word (UP, &selection.beg, &selection.beg); 3295 selection_delimit_word (UP, &selection.beg, &selection.beg);
3386 3296
3387 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3297 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3388 { 3298 {
3389 if (!ROW(end_row).is_longer ()) 3299 if (!ROW(end_row).is_longer ())
3390 { 3300 {
3391 selection.end.row = end_row; 3301 selection.end.row = end_row;
3392 selection.end.col = ROW(end_row).l; 3302 selection.end.col = ROW(end_row).l;
3303# if !ENABLE_MINIMAL
3393 selection_remove_trailing_spaces (); 3304 selection_remove_trailing_spaces ();
3305# endif
3394 break; 3306 break;
3395 } 3307 }
3396 } 3308 }
3397 } 3309 }
3398 else 3310 else
… …
3414 selection.end.row++; 3326 selection.end.row++;
3415 } 3327 }
3416 } 3328 }
3417 3329
3418 if (button3 && buttonpress) 3330 if (button3 && buttonpress)
3331 {
3419 { /* mark may need to be changed */ 3332 /* mark may need to be changed */
3420 if (closeto == LEFT) 3333 if (closeto == LEFT)
3421 { 3334 {
3422 selection.mark.row = selection.end.row; 3335 selection.mark.row = selection.end.row;
3423 selection.mark.col = selection.end.col - (selection.clicks == 2); 3336 selection.mark.col = selection.end.col - (selection.clicks == 2);
3424 } 3337 }
… …
3427 selection.mark.row = selection.beg.row; 3340 selection.mark.row = selection.beg.row;
3428 selection.mark.col = selection.beg.col; 3341 selection.mark.col = selection.beg.col;
3429 } 3342 }
3430 } 3343 }
3431 3344
3432#if ENABLE_FRILLS 3345#if !ENABLE_MINIMAL
3433 if (selection.rect && selection.beg.col > selection.end.col) 3346 if (selection.rect && selection.beg.col > selection.end.col)
3434 ::swap (selection.beg.col, selection.end.col); 3347 ::swap (selection.beg.col, selection.end.col);
3435#endif 3348#endif
3436} 3349}
3437 3350
3438#if ENABLE_FRILLS 3351#if !ENABLE_MINIMAL
3439void 3352void
3440rxvt_term::selection_remove_trailing_spaces () NOTHROW 3353rxvt_term::selection_remove_trailing_spaces () NOTHROW
3441{ 3354{
3442 int32_t end_col, end_row; 3355 int32_t end_col, end_row;
3443 text_t *stp; 3356 text_t *stp;
… …
3497 * EXT: SelectionRequest 3410 * EXT: SelectionRequest
3498 */ 3411 */
3499void 3412void
3500rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3413rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3501{ 3414{
3415 Atom property = rq.property == None ? rq.target : rq.property;
3502 XSelectionEvent ev; 3416 XSelectionEvent ev;
3503 dDisp;
3504 3417
3505 ev.type = SelectionNotify; 3418 ev.type = SelectionNotify;
3506 ev.property = None; 3419 ev.property = None;
3507 ev.display = rq.display; 3420 ev.display = rq.display;
3508 ev.requestor = rq.requestor; 3421 ev.requestor = rq.requestor;
… …
3522 *target++ = xa[XA_COMPOUND_TEXT]; 3435 *target++ = xa[XA_COMPOUND_TEXT];
3523#if X_HAVE_UTF8_STRING 3436#if X_HAVE_UTF8_STRING
3524 *target++ = xa[XA_UTF8_STRING]; 3437 *target++ = xa[XA_UTF8_STRING];
3525#endif 3438#endif
3526 3439
3527 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3440 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3528 32, PropModeReplace, 3441 32, PropModeReplace,
3529 (unsigned char *)target_list, target - target_list); 3442 (unsigned char *)target_list, target - target_list);
3530 ev.property = rq.property; 3443 ev.property = property;
3531 } 3444 }
3532#if TODO // TODO 3445#if TODO // TODO
3533 else if (rq.target == xa[XA_MULTIPLE]) 3446 else if (rq.target == xa[XA_MULTIPLE])
3534 { 3447 {
3535 /* TODO: Handle MULTIPLE */ 3448 /* TODO: Handle MULTIPLE */
3536 } 3449 }
3537#endif 3450#endif
3538 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3451 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3539 { 3452 {
3540 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3453 XChangeProperty (dpy, rq.requestor, property, rq.target,
3541 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3454 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3542 ev.property = rq.property; 3455 ev.property = property;
3456 }
3457 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3458 {
3459 XChangeProperty (dpy, rq.requestor, property, rq.target,
3460 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3461 ev.property = property;
3543 } 3462 }
3544 else if (rq.target == XA_STRING 3463 else if (rq.target == XA_STRING
3545 || rq.target == xa[XA_TEXT] 3464 || rq.target == xa[XA_TEXT]
3546 || rq.target == xa[XA_COMPOUND_TEXT] 3465 || rq.target == xa[XA_COMPOUND_TEXT]
3547 || rq.target == xa[XA_UTF8_STRING] 3466 || rq.target == xa[XA_UTF8_STRING]
… …
3569 style = enc_string; 3488 style = enc_string;
3570 else if (target == xa[XA_TEXT]) 3489 else if (target == xa[XA_TEXT])
3571 style = enc_text; 3490 style = enc_text;
3572 else if (target == xa[XA_COMPOUND_TEXT]) 3491 else if (target == xa[XA_COMPOUND_TEXT])
3573 style = enc_compound_text; 3492 style = enc_compound_text;
3574#if ENABLE_FRILLS 3493#if !ENABLE_MINIMAL
3575 else if (target == xa[XA_UTF8_STRING]) 3494 else if (target == xa[XA_UTF8_STRING])
3576 style = enc_utf8; 3495 style = enc_utf8;
3577#endif 3496#endif
3578 else 3497 else
3579 { 3498 {
3580 target = xa[XA_COMPOUND_TEXT]; 3499 target = xa[XA_COMPOUND_TEXT];
3581 style = enc_compound_text; 3500 style = enc_compound_text;
3582 } 3501 }
3583 3502
3584 if (selection.text) 3503 if (rq.selection == XA_PRIMARY && selection.text)
3585 { 3504 {
3586 cl = selection.text; 3505 cl = selection.text;
3587 selectlen = selection.len; 3506 selectlen = selection.len;
3588 } 3507 }
3508 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3509 {
3510 cl = selection.clip_text;
3511 selectlen = selection.clip_len;
3512 }
3589 else 3513 else
3590 { 3514 {
3591 cl = L""; 3515 cl = L"";
3592 selectlen = 0; 3516 selectlen = 0;
3593 } 3517 }
3594 3518
3595#if ENABLE_FRILLS 3519#if !ENABLE_MINIMAL
3596 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3520 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3597 // so recode it manually 3521 // so recode it manually
3598 if (style == enc_utf8) 3522 if (style == enc_utf8)
3599 { 3523 {
3600 freect = 1; 3524 freect = 1;
… …
3603 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3527 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3604 ct.nitems = strlen ((char *)ct.value); 3528 ct.nitems = strlen ((char *)ct.value);
3605 } 3529 }
3606 else 3530 else
3607#endif 3531#endif
3608 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3532 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3609 freect = 1; 3533 freect = 1;
3610 else 3534 else
3611 { 3535 {
3612 /* if we failed to convert then send it raw */ 3536 /* if we failed to convert then send it raw */
3613 ct.value = (unsigned char *)cl; 3537 ct.value = (unsigned char *)cl;
3614 ct.nitems = selectlen; 3538 ct.nitems = selectlen;
3615 ct.encoding = target; 3539 ct.encoding = target;
3616 } 3540 }
3617 3541
3618 XChangeProperty (disp, rq.requestor, rq.property, 3542 XChangeProperty (dpy, rq.requestor, property,
3619 ct.encoding, 8, PropModeReplace, 3543 ct.encoding, 8, PropModeReplace,
3620 ct.value, (int)ct.nitems); 3544 ct.value, (int)ct.nitems);
3621 ev.property = rq.property; 3545 ev.property = property;
3622 3546
3623 if (freect) 3547 if (freect)
3624 XFree (ct.value); 3548 XFree (ct.value);
3625 } 3549 }
3626 3550
3627 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3551 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3628}
3629
3630/* ------------------------------------------------------------------------- *
3631 * MOUSE ROUTINES *
3632 * ------------------------------------------------------------------------- */
3633
3634/*
3635 * return col/row values corresponding to x/y pixel values
3636 */
3637void
3638rxvt_term::pixel_position (int *x, int *y) NOTHROW
3639{
3640 *x = Pixel2Col (*x);
3641 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3642 *y = Pixel2Row (*y);
3643 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3644} 3552}
3645 3553
3646/* ------------------------------------------------------------------------- */ 3554/* ------------------------------------------------------------------------- */
3647#ifdef USE_XIM 3555#ifdef USE_XIM
3648void 3556void
3649rxvt_term::im_set_position (XPoint &pos) NOTHROW 3557rxvt_term::im_set_position (XPoint &pos) NOTHROW
3650{ 3558{
3651 XWindowAttributes xwa; 3559 XWindowAttributes xwa;
3652 3560
3653 XGetWindowAttributes (display->display, vt, &xwa); 3561 XGetWindowAttributes (dpy, vt, &xwa);
3654 3562
3655 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3563 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3656 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3564 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3657} 3565}
3658#endif 3566#endif
… …
3676 h += 2; min_it (h, nrow); 3584 h += 2; min_it (h, nrow);
3677 3585
3678 x -= 1; clamp_it (x, 0, ncol - w); 3586 x -= 1; clamp_it (x, 0, ncol - w);
3679 y -= 1; clamp_it (y, 0, nrow - h); 3587 y -= 1; clamp_it (y, 0, nrow - h);
3680 3588
3681 ov_x = x; ov_y = y; 3589 ov.x = x; ov.y = y;
3682 ov_w = w; ov_h = h; 3590 ov.w = w; ov.h = h;
3683 3591
3684 ov_text = new text_t *[h]; 3592 ov.text = new text_t *[h];
3685 ov_rend = new rend_t *[h]; 3593 ov.rend = new rend_t *[h];
3686 3594
3687 for (y = 0; y < h; y++) 3595 for (y = 0; y < h; y++)
3688 { 3596 {
3689 text_t *tp = ov_text[y] = new text_t[w]; 3597 text_t *tp = ov.text[y] = new text_t[w];
3690 rend_t *rp = ov_rend[y] = new rend_t[w]; 3598 rend_t *rp = ov.rend[y] = new rend_t[w];
3691 3599
3692 text_t t0, t1, t2; 3600 text_t t0, t1, t2;
3693 rend_t r = OVERLAY_RSTYLE; 3601 rend_t r = OVERLAY_RSTYLE;
3694 3602
3695 if (y == 0) 3603 if (y == 0)
… …
3714} 3622}
3715 3623
3716void 3624void
3717rxvt_term::scr_overlay_off () NOTHROW 3625rxvt_term::scr_overlay_off () NOTHROW
3718{ 3626{
3719 if (!ov_text) 3627 if (!ov.text)
3720 return; 3628 return;
3721 3629
3722 want_refresh = 1; 3630 want_refresh = 1;
3723 3631
3724 for (int y = 0; y < ov_h; y++) 3632 for (int y = 0; y < ov.h; y++)
3725 { 3633 {
3726 delete [] ov_text[y]; 3634 delete [] ov.text[y];
3727 delete [] ov_rend[y]; 3635 delete [] ov.rend[y];
3728 } 3636 }
3729 3637
3730 delete [] ov_text; ov_text = 0; 3638 delete [] ov.text; ov.text = 0;
3731 delete [] ov_rend; ov_rend = 0; 3639 delete [] ov.rend; ov.rend = 0;
3732} 3640}
3733 3641
3734void 3642void
3735rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3643rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3736{ 3644{
3737 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3645 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3738 return; 3646 return;
3739 3647
3740 x++, y++; 3648 x++, y++;
3741 3649
3742 ov_text[y][x] = text; 3650 ov.text[y][x] = text;
3743 ov_rend[y][x] = rend; 3651 ov.rend[y][x] = rend;
3744} 3652}
3745 3653
3746void 3654void
3747rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3655rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3748{ 3656{
… …
3754rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3662rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3755{ 3663{
3756 while (*s) 3664 while (*s)
3757 { 3665 {
3758 text_t t = *s++; 3666 text_t t = *s++;
3759 int width = wcwidth (t); 3667 int width = WCWIDTH (t);
3760 3668
3761 while (width--) 3669 while (width--)
3762 { 3670 {
3763 scr_overlay_set (x++, y, t); 3671 scr_overlay_set (x++, y, t);
3764 t = NOCHAR; 3672 t = NOCHAR;
… …
3767} 3675}
3768 3676
3769void 3677void
3770rxvt_term::scr_swap_overlay () NOTHROW 3678rxvt_term::scr_swap_overlay () NOTHROW
3771{ 3679{
3772 if (!ov_text) 3680 if (!ov.text)
3773 return; 3681 return;
3774 3682
3683 // hide cursor if it is within the overlay area
3684 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3685 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3686 screen.flags &= ~Screen_VisibleCursor;
3687
3775 // swap screen mem with overlay 3688 // swap screen mem with overlay
3776 for (int y = ov_h; y--; ) 3689 for (int y = ov.h; y--; )
3777 { 3690 {
3778 text_t *t1 = ov_text[y]; 3691 text_t *t1 = ov.text[y];
3779 rend_t *r1 = ov_rend[y]; 3692 rend_t *r1 = ov.rend[y];
3780 3693
3781 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3694 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3782 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3695 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3783 3696
3784 for (int x = ov_w; x--; ) 3697 for (int x = ov.w; x--; )
3785 { 3698 {
3786 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3699 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3787 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3700 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3788 } 3701 }
3789 } 3702 }

Diff Legend

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