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.244 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.342 by root, Thu Jul 1 20:02:43 2010 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 <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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 seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 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) \ 84#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) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 86
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * 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 */ 89 */
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) \ 90#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 91 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 94 (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 95
114/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
117 99
… …
126 width = ncol; 108 width = ncol;
127 } 109 }
128 110
129 l.touch (); 111 l.touch ();
130 112
131 efs &= ~RS_baseattrMask; 113 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 114 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 115
134 text_t *et = l.t + col; 116 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 117 rend_t *er = l.r + col;
136 118
… …
148{ 130{
149 scr_blank_line (l, 0, ncol, efs); 131 scr_blank_line (l, 0, ncol, efs);
150 132
151 l.l = 0; 133 l.l = 0;
152 l.f = 0; 134 l.f = 0;
135}
136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
153} 154}
154 155
155/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
158 159
159void 160void
160rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
161{ 162{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
166 view_start = 0; 163 view_start = 0;
167 num_scr = 0; 164 num_scr = 0;
168 165
169 if (ncol == 0) 166 if (ncol == 0)
170 ncol = 80; 167 ncol = 80;
… …
174 171
175 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 173 return;
177 174
178 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
180 { 177 {
181 //TODO//FIXME 178 //TODO//FIXME
182 saveLines++; 179 saveLines++;
183 prev_nrow--; 180 prev_nrow--;
184 top_row--; 181 top_row--;
… …
195 if (!row_buf) 192 if (!row_buf)
196 { 193 {
197 /* 194 /*
198 * first time called so just malloc everything: don't rely on realloc 195 * first time called so just malloc everything: don't rely on realloc
199 */ 196 */
200 top_row = 0; /* no saved lines */ 197 top_row = 0;
201 term_start = 0; 198 term_start = 0;
202 199
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 200 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 202
… …
234 selection.text = NULL; 231 selection.text = NULL;
235 selection.len = 0; 232 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
238 selection.clicks = 0; 235 selection.clicks = 0;
239 rvideo = 0; 236 selection.clip_text = NULL;
237 selection.clip_len = 0;
240 } 238 }
241 else 239 else
242 { 240 {
243 /* 241 /*
244 * add or delete rows as appropriate 242 * add or delete rows as appropriate
… …
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 } 272 }
275 273
276 line_t *old_buf = row_buf; 274 line_t *old_buf = row_buf;
277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 275 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
278 276
279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start + top_row , prev_total_rows); 278 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 279 int q = total_rows; // rewrapped row
282 280
283 if (top_row) 281 if (top_row)
284 { 282 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb 283 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm. 284 // to come up with a lean and mean algorithm.
285 // TODO: maybe optimise when width didn't change
287 286
288 row_col_t ocur = screen.cur; 287 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 288 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 289
291 do 290 do
292 { 291 {
293 p = MOD (p - 1, prev_total_rows); 292 p = MOD (p - 1, prev_total_rows);
294#ifdef DEBUG_STRICT
295 assert (old_buf [MOD (p, prev_total_rows)].t); 293 assert (old_buf [MOD (p, prev_total_rows)].t);
296#endif
297 int plines = 1; 294 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l; 295 int llen = old_buf [MOD (p, prev_total_rows)].l;
299 296
300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301 { 298 {
… …
327 int qcol = 0; 324 int qcol = 0;
328 325
329 // see below for cursor adjustment rationale 326 // see below for cursor adjustment rationale
330 if (p == ocur.row) 327 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow); 328 screen.cur.row = q - (total_rows - nrow);
332 329
333 // fill a single destination line 330 // fill a single destination line
334 while (lofs < llen && qcol < ncol) 331 while (lofs < llen && qcol < ncol)
335 { 332 {
336 int prow = lofs / prev_ncol; 333 int prow = lofs / prev_ncol;
337 int pcol = lofs % prev_ncol; 334 int pcol = lofs % prev_ncol;
… …
347 344
348 line_t &pline = old_buf [prow]; 345 line_t &pline = old_buf [prow];
349 346
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 348
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)); 349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
359 351
360 lofs += len; 352 lofs += len;
361 qcol += len; 353 qcol += len;
… …
368 } 360 }
369 while (p != pend && q > 0); 361 while (p != pend && q > 0);
370 362
371 term_start = total_rows - nrow; 363 term_start = total_rows - nrow;
372 top_row = q - term_start; 364 top_row = q - term_start;
373 365
374 // make sure all terminal lines exist 366 // make sure all terminal lines exist
375 while (top_row > 0) 367 while (top_row > 0)
376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 368 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
377 } 369 }
378 else 370 else
379 { 371 {
380 // if no scrollback exists (yet), wing, instead of wrap 372 // if no scrollback exists (yet), wing, instead of wrap
381 373
382 for (int row = min (nrow, prev_nrow); row--; ) 374 for (int row = min (nrow, prev_nrow); row--; )
383 { 375 {
384 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 376 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
385 line_t &qline = row_buf [row]; 377 line_t &qline = row_buf [row];
386 378
… …
400 delete old_ta; 392 delete old_ta;
401 delete old_ra; 393 delete old_ra;
402 394
403 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
397 }
405 398
406 if (tabs)
407 free (tabs); 399 free (tabs);
408 } 400 tabs = (char *)rxvt_malloc (ncol);
401
402 for (int col = ncol; --col; )
403 tabs [col] = col % TABSIZE == 0;
409 404
410 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
411 406
412 prev_nrow = nrow; 407 prev_nrow = nrow;
413 prev_ncol = ncol; 408 prev_ncol = ncol;
414 409
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 (); 410 tt_winch ();
421 411
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 412 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 413}
424 414
… …
427 * Free everything. That way malloc debugging can find leakage. 417 * Free everything. That way malloc debugging can find leakage.
428 */ 418 */
429void 419void
430rxvt_term::scr_release () NOTHROW 420rxvt_term::scr_release () NOTHROW
431{ 421{
422 if (row_buf)
423 {
432 delete talloc; talloc = 0; 424 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0; 425 delete ralloc; ralloc = 0;
434 426
435 free (row_buf); 427 free (row_buf);
436 free (swap_buf); 428 free (swap_buf);
437 free (drawn_buf); 429 free (drawn_buf);
438 free (tabs);
439
440 row_buf = 0; // signal that we freed all the arrays 430 row_buf = 0; // signal that we freed all the arrays above
441}
442 431
432 free (tabs);
433 tabs = 0;
434 }
435}
436
443/* ------------------------------------------------------------------------- */ 437/* ------------------------------------------------------------------------- */
444/* 438/*
445 * Hard reset 439 * Hard/Soft reset
446 */ 440 */
447void 441void
448rxvt_term::scr_poweron () NOTHROW 442rxvt_term::scr_poweron ()
449{ 443{
450 scr_release (); 444 scr_release ();
451 prev_nrow = prev_ncol = 0; 445 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false;
447 scr_soft_reset ();
452 scr_reset (); 448 scr_reset ();
453 449
454 scr_clear (true); 450 scr_clear (true);
455 scr_refresh (); 451 scr_refresh ();
452}
453
454void
455rxvt_term::scr_soft_reset ()
456{
457 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY
459 scr_overlay_off ();
460#endif
461
462 if (current_screen != PRIMARY)
463 scr_swap_screen ();
464
465 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0);
456} 468}
457 469
458/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
459 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
460 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
498 } 510 }
499 511
500 /* boundary check in case screen size changed between SAVE and RESTORE */ 512 /* boundary check in case screen size changed between SAVE and RESTORE */
501 min_it (s->cur.row, nrow - 1); 513 min_it (s->cur.row, nrow - 1);
502 min_it (s->cur.col, ncol - 1); 514 min_it (s->cur.col, ncol - 1);
503#ifdef DEBUG_STRICT
504 assert (s->cur.row >= 0); 515 assert (s->cur.row >= 0);
505 assert (s->cur.col >= 0); 516 assert (s->cur.col >= 0);
506#endif 517}
518
519void
520rxvt_term::scr_swap_screen ()
521{
522 if (!option (Opt_secondaryScreen))
523 return;
524
525 for (int i = prev_nrow; i--; )
526 ::swap (ROW(i), swap_buf [i]);
527
528 ::swap (screen.cur, swap.cur);
529
530 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
531 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
507} 532}
508 533
509/* ------------------------------------------------------------------------- */ 534/* ------------------------------------------------------------------------- */
510/* 535/*
511 * Swap between primary and secondary screens 536 * Swap between primary and secondary screens
512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 537 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 538 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514 */ 539 */
515int 540void
516rxvt_term::scr_change_screen (int scrn) NOTHROW 541rxvt_term::scr_change_screen (int scrn)
517{ 542{
543 if (scrn == current_screen)
544 return;
545
518 want_refresh = 1; 546 want_refresh = 1;
519 view_start = 0; 547 view_start = 0;
520 548
521 if (current_screen == scrn)
522 return scrn;
523
524 selection_check (2); /* check for boundary cross */ 549 selection_check (2); /* check for boundary cross */
525 550
526 int i = current_screen; current_screen = scrn; scrn = i; 551 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 552
534#if NSCREENS 553#if NSCREENS
535 if (OPTION (Opt_secondaryScreen)) 554 if (option (Opt_secondaryScreen))
536 { 555 {
537 num_scr = 0; 556 num_scr = 0;
538 557
539 for (int i = prev_nrow; i--; ) 558 scr_swap_screen ();
540 ::swap (ROW(i), swap_buf [i]);
541 559
542 ::swap (screen.charset, swap.charset); 560 ::swap (screen.charset, swap.charset);
543 ::swap (screen.flags, swap.flags); 561 ::swap (screen.flags, swap.flags);
544 screen.flags |= Screen_VisibleCursor; 562 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 563 swap.flags |= Screen_VisibleCursor;
546 } 564 }
547 else 565 else
548#endif 566#endif
549 if (OPTION (Opt_secondaryScroll)) 567 if (option (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 568 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552 return scrn;
553} 569}
554 570
555// clear WrapNext indicator, solidifying position on next line 571// clear WrapNext indicator, solidifying position on next line
556void 572void
557rxvt_term::scr_do_wrap () NOTHROW 573rxvt_term::scr_do_wrap () NOTHROW
… …
589/* 605/*
590 * Change the rendition style for following text 606 * Change the rendition style for following text
591 */ 607 */
592void 608void
593rxvt_term::scr_rendition (int set, int style) NOTHROW 609rxvt_term::scr_rendition (int set, int style) NOTHROW
594 { 610{
595 if (set) 611 if (set)
596 rstyle |= style; 612 rstyle |= style;
597 else if (style == ~RS_None) 613 else if (style == ~RS_None)
598 rstyle = DEFAULT_RSTYLE; 614 rstyle = DEFAULT_RSTYLE;
599 else 615 else
600 rstyle &= ~style; 616 rstyle &= ~style;
601 } 617}
602 618
603/* ------------------------------------------------------------------------- */ 619/* ------------------------------------------------------------------------- */
604/* 620/*
605 * Scroll text between <row1> and <row2> inclusive, by <count> lines 621 * Scroll text between <row1> and <row2> inclusive, by <count> lines
606 * count positive ==> scroll up 622 * count positive ==> scroll up
… …
615 want_refresh = 1; 631 want_refresh = 1;
616 num_scr += count; 632 num_scr += count;
617 633
618 if (count > 0 634 if (count > 0
619 && row1 == 0 635 && row1 == 0
620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 636 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
621 { 637 {
622 top_row = max (top_row - count, -saveLines); 638 top_row = max (top_row - count, -saveLines);
623 639
624 // scroll everything up 'count' lines 640 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 641 term_start = (term_start + count) % total_rows;
… …
632 } 648 }
633 649
634 // erase newly scrolled-in lines 650 // erase newly scrolled-in lines
635 for (int i = count; i--; ) 651 for (int i = count; i--; )
636 { 652 {
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); 653 line_t &l = ROW(nrow - 1 - i);
640 654
655 // optimize if already cleared, can be significant on slow machines
656 // could be rolled into scr_blank_screen_mem
657 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
658 {
641 scr_blank_line (l, 0, l.l, rstyle); 659 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0; 660 l.l = 0;
644 l.f = 0; 661 l.f = 0;
662 }
663 else
664 scr_blank_screen_mem (l, rstyle);
645 } 665 }
646 666
647 // now copy lines below the scroll region bottom to the 667 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 668 // bottom of the screen again, so they look as if they
649 // hadn't moved. 669 // hadn't moved.
… …
653 line_t &l2 = ROW(i); 673 line_t &l2 = ROW(i);
654 674
655 ::swap (l1, l2); 675 ::swap (l1, l2);
656 l2.touch (); 676 l2.touch ();
657 } 677 }
658 678
659 // move and/or clear selection, if any 679 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 680 if (selection.op && current_screen == selection.screen)
661 { 681 {
662 selection.beg.row -= count; 682 selection.beg.row -= count;
663 selection.end.row -= count; 683 selection.end.row -= count;
… …
671 selection.op = SELECTION_CLEAR; 691 selection.op = SELECTION_CLEAR;
672 } 692 }
673 } 693 }
674 694
675 // finally move the view window, if desired 695 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 696 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 697 && view_start != 0
678 && view_start != -saveLines) 698 && view_start != -saveLines)
679 scr_page (UP, count); 699 scr_page (UP, count);
680 700
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 701 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
699 { 719 {
700 /* move selected region too */ 720 /* move selected region too */
701 selection.beg.row -= count; 721 selection.beg.row -= count;
702 selection.end.row -= count; 722 selection.end.row -= count;
703 selection.mark.row -= count; 723 selection.mark.row -= count;
704 724
705 selection_check (0); 725 selection_check (0);
706 } 726 }
707 } 727 }
708 728
709 // use a simple and robust scrolling algorithm, this 729 // use a simple and robust scrolling algorithm, this
… …
749 ZERO_SCROLLBACK (); 769 ZERO_SCROLLBACK ();
750 770
751 if (minlines > 0) 771 if (minlines > 0)
752 { 772 {
753 minlines += screen.cur.row - screen.bscroll; 773 minlines += screen.cur.row - screen.bscroll;
774 min_it (minlines, screen.cur.row - top_row);
754 775
755 if (minlines > 0 776 if (minlines > 0
756 && screen.tscroll == 0 777 && screen.tscroll == 0
757 && screen.bscroll == nrow - 1) 778 && screen.bscroll == nrow - 1)
758 { 779 {
… …
760 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 781 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
761 screen.cur.row -= minlines; 782 screen.cur.row -= minlines;
762 } 783 }
763 } 784 }
764 785
765#ifdef DEBUG_STRICT
766 assert (screen.cur.col < ncol); 786 assert (screen.cur.col < ncol);
767 assert (screen.cur.row < nrow 787 assert (screen.cur.row < nrow
768 && screen.cur.row >= top_row); 788 && screen.cur.row >= top_row);
769#endif
770 int row = screen.cur.row; 789 int row = screen.cur.row;
771 790
772 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 791 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
773 792
774 line_t *line = &ROW(row); 793 line_t *line = &ROW(row);
775 794
776 while (str < strend) 795 while (str < strend)
777 { 796 {
778 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 797 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
779 798
780 if (c < 0x20) 799 if (expect_false (c < 0x20))
781 if (c == C0_LF) 800 if (c == C0_LF)
782 { 801 {
783 max_it (line->l, screen.cur.col); 802 max_it (line->l, screen.cur.col);
784 803
785 screen.flags &= ~Screen_WrapNext; 804 screen.flags &= ~Screen_WrapNext;
… …
804 { 823 {
805 scr_tab (1, true); 824 scr_tab (1, true);
806 continue; 825 continue;
807 } 826 }
808 827
828 if (expect_false (
809 if (checksel /* see if we're writing within selection */ 829 checksel /* see if we're writing within selection */
810 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 830 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
811 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 831 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
832 ))
812 { 833 {
813 checksel = 0; 834 checksel = 0;
814 /* 835 /*
815 * If we wrote anywhere in the selected area, kill the selection 836 * If we wrote anywhere in the selected area, kill the selection
816 * XXX: should we kill the mark too? Possibly, but maybe that 837 * XXX: should we kill the mark too? Possibly, but maybe that
817 * should be a similar check. 838 * should be a similar check.
818 */ 839 */
819 CLEAR_SELECTION (); 840 CLEAR_SELECTION ();
820 } 841 }
821 842
822 if (screen.flags & Screen_WrapNext) 843 if (expect_false (screen.flags & Screen_WrapNext))
823 { 844 {
824 scr_do_wrap (); 845 scr_do_wrap ();
825 846
826 line->l = ncol; 847 line->l = ncol;
827 line->is_longer (1); 848 line->is_longer (1);
828 849
829 row = screen.cur.row; 850 row = screen.cur.row;
830 line = &ROW(row); /* _must_ refresh */ 851 line = &ROW(row); /* _must_ refresh */
831 } 852 }
832 853
833 // some utf-8 decoders "decode" surrogate characters: let's fix this. 854 // some utf-8 decoders "decode" surrogate characters: let's fix this.
834 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 855 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
835 c = 0xfffd; 856 c = 0xfffd;
836 857
837 // rely on wcwidth to tell us the character width, at least for non-latin1 858 // rely on wcwidth to tell us the character width, do wcwidth before
838 // do wcwidth before further replacements, as wcwidth might return -1 859 // 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 860 // drawing characters below as they might be invalid in the current
840 // locale. 861 // locale.
841 int width = c < 0x100 ? 1 : wcwidth (c); 862 int width = WCWIDTH (c);
842 863
843 if (charsets [screen.charset] == '0') // DEC SPECIAL 864 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
844 { 865 {
845 // vt100 special graphics and line drawing 866 // vt100 special graphics and line drawing
846 // 5f-7e standard vt100 867 // 5f-7e standard vt100
847 // 40-5e rxvt extension for extra curses acs chars 868 // 40-5e rxvt extension for extra curses acs chars
848 static uint16_t vt100_0[62] = { // 41 .. 7e 869 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
861 c = vt100_0[c - 0x41]; 882 c = vt100_0[c - 0x41];
862 width = 1; // vt100 line drawing characters are always single-width 883 width = 1; // vt100 line drawing characters are always single-width
863 } 884 }
864 } 885 }
865 886
866 if (screen.flags & Screen_Insert) 887 if (expect_false (screen.flags & Screen_Insert))
867 scr_insdel_chars (width, INSERT); 888 scr_insdel_chars (width, INSERT);
868 889
869 if (width != 0) 890 if (width != 0)
870 { 891 {
871#if !UNICODE_3 892#if !UNICODE_3
… …
877 c = 0xfffd; 898 c = 0xfffd;
878# endif 899# endif
879#endif 900#endif
880 901
881 // nuke the character at this position, if required 902 // nuke the character at this position, if required
903 if (expect_false (
882 if (line->t[screen.cur.col] == NOCHAR 904 line->t[screen.cur.col] == NOCHAR
883 || (screen.cur.col < ncol - 1 905 || (screen.cur.col < ncol - 1
884 && line->t[screen.cur.col + 1] == NOCHAR)) 906 && line->t[screen.cur.col + 1] == NOCHAR)
907 ))
908 scr_kill_char (*line, screen.cur.col);
909
910 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
911
912 // if the character doesn't fit into the remaining columns...
913 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
885 { 914 {
886 int col = screen.cur.col; 915 // ... artificially enlargen the previous one
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 = ' '; 916 c = NOCHAR;
909 // and try the same character next loop iteration 917 // and try the same character next loop iteration
910 --str; 918 --str;
911 } 919 }
912 920
913 line->touch (); 921 line->touch ();
… …
915 do 923 do
916 { 924 {
917 line->t[screen.cur.col] = c; 925 line->t[screen.cur.col] = c;
918 line->r[screen.cur.col] = rend; 926 line->r[screen.cur.col] = rend;
919 927
920 if (screen.cur.col < ncol - 1) 928 if (expect_true (screen.cur.col < ncol - 1))
921 screen.cur.col++; 929 screen.cur.col++;
922 else 930 else
923 { 931 {
924 line->l = ncol; 932 line->l = ncol;
925 if (screen.flags & Screen_Autowrap) 933 if (screen.flags & Screen_Autowrap)
… …
927 break; 935 break;
928 } 936 }
929 937
930 c = NOCHAR; 938 c = NOCHAR;
931 } 939 }
932 while (--width > 0); 940 while (expect_false (--width > 0));
933 941
934 // pad with spaces when overwriting wide character with smaller one 942 // pad with spaces when overwriting wide character with smaller one
935 if (!width) 943 if (expect_false (!width))
936 { 944 {
937 line->touch (); 945 line->touch ();
938 946
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
940 { 948 {
941 line->t[c] = ' '; 949 line->t[c] = ' ';
942 line->r[c] = rend; 950 line->r[c] = rend;
943 } 951 }
944 } 952 }
945 } 953 }
954#if ENABLE_COMBINING
946 else // width == 0 955 else // width == 0
947 { 956 {
948#if ENABLE_COMBINING 957 if (c != 0xfeff) // ignore BOM
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 { 958 {
959 // handle combining characters
960 // we just tag the accent on the previous on-screen character.
961 // this is arguably not correct, but also arguably not wrong.
962 // we don't handle double-width characters nicely yet.
963 line_t *linep;
964 text_t *tp;
965 rend_t *rp;
966
967 if (screen.cur.col > 0)
968 {
959 linep = line; 969 linep = line;
960 tp = line->t + screen.cur.col - 1; 970 tp = line->t + screen.cur.col - 1;
961 rp = line->r + screen.cur.col - 1; 971 rp = line->r + screen.cur.col - 1;
972 }
973 else if (screen.cur.row > 0
974 && ROW(screen.cur.row - 1).is_longer ())
975 {
976 linep = &ROW(screen.cur.row - 1);
977 tp = line->t + ncol - 1;
978 rp = line->r + ncol - 1;
979 }
980 else
981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
987
988 // first try to find a precomposed character
989 unicode_t n = rxvt_compose (*tp, c);
990 if (n == NOCHAR)
991 n = rxvt_composite.compose (*tp, c);
992
993 *tp = n;
994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
962 } 995 }
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 } 996 }
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 997#endif
986 }
987 } 998 }
988 999
989 max_it (line->l, screen.cur.col); 1000 max_it (line->l, screen.cur.col);
990 1001
991#ifdef DEBUG_STRICT
992 assert (screen.cur.row >= 0); 1002 assert (screen.cur.row >= 0);
993#endif
994} 1003}
995 1004
996/* ------------------------------------------------------------------------- */ 1005/* ------------------------------------------------------------------------- */
997/* 1006/*
998 * Process Backspace. Move back the cursor back a position, wrap if have to 1007 * Process Backspace. Move back the cursor back a position, wrap if have to
999 * XTERM_SEQ: CTRL-H 1008 * XTERM_SEQ: CTRL-H
1000 */ 1009 */
1001void 1010void
1002rxvt_term::scr_backspace () NOTHROW 1011rxvt_term::scr_backspace () NOTHROW
1003{ 1012{
1004 want_refresh = 1;
1005
1006 if (screen.cur.col == 0) 1013 if (screen.cur.col == 0)
1007 { 1014 {
1008 if (screen.cur.row > 0) 1015 if (screen.cur.row > 0)
1009 { 1016 {
1010#ifdef TERMCAP_HAS_BW 1017#ifdef TERMCAP_HAS_BW
1011 screen.cur.col = ncol - 1; 1018 screen.cur.col = ncol - 1;
1012 screen.cur.row--; 1019 --screen.cur.row;
1013 return; 1020
1021 want_refresh = 1;
1014#endif 1022#endif
1015 } 1023 }
1016 } 1024 }
1017 else if (!(screen.flags & Screen_WrapNext)) 1025 else
1018 scr_gotorc (0, -1, RELATIVE); 1026 scr_gotorc (0, -1, RELATIVE);
1019
1020 screen.flags &= ~Screen_WrapNext;
1021} 1027}
1022 1028
1023/* ------------------------------------------------------------------------- */ 1029/* ------------------------------------------------------------------------- */
1024/* 1030/*
1025 * Process Horizontal Tab 1031 * Process Horizontal Tab
… …
1048 x = i; 1054 x = i;
1049 1055
1050 if (!--count) 1056 if (!--count)
1051 break; 1057 break;
1052 } 1058 }
1053 else 1059 else
1054 ht &= l.t[i] == ' ' 1060 ht &= l.t[i] == ' '
1055 && RS_SAME (l.r[i], base_rend); 1061 && RS_SAME (l.r[i], base_rend);
1056 1062
1057 if (count) 1063 if (count)
1058 x = ncol - 1; 1064 x = ncol - 1;
1059 1065
1060 // store horizontal tab commands as characters inside the text 1066 // store horizontal tab commands as characters inside the text
1061 // buffer so they can be selected and pasted. 1067 // buffer so they can be selected and pasted.
1062 if (ht && OPTION (Opt_pastableTabs)) 1068 if (ht && option (Opt_pastableTabs))
1063 { 1069 {
1064 base_rend = SET_FONT (base_rend, 0); 1070 base_rend = SET_FONT (base_rend, 0);
1065 1071
1066 l.touch (x); 1072 l.touch (x);
1067 1073
… …
1100 * Process DEC Back Index 1106 * Process DEC Back Index
1101 * XTERM_SEQ: ESC 6 1107 * XTERM_SEQ: ESC 6
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1108 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1109 * in that row right. Clear left column.
1104 */ 1110 */
1105#if ENABLE_FRILLS 1111#if !ENABLE_MINIMAL
1106void 1112void
1107rxvt_term::scr_backindex () NOTHROW 1113rxvt_term::scr_backindex () NOTHROW
1108{ 1114{
1109 if (screen.cur.col > 0) 1115 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1116 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1117 * Process DEC Forward Index 1123 * Process DEC Forward Index
1118 * XTERM_SEQ: ESC 9 1124 * XTERM_SEQ: ESC 9
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1125 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1126 * in that row left. Clear right column.
1121 */ 1127 */
1122#if ENABLE_FRILLS 1128#if !ENABLE_MINIMAL
1123void 1129void
1124rxvt_term::scr_forwardindex () NOTHROW 1130rxvt_term::scr_forwardindex () NOTHROW
1125{ 1131{
1126 if (screen.cur.col < ncol - 1) 1132 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1133 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1174 } 1180 }
1175 } 1181 }
1176 else 1182 else
1177 { 1183 {
1178 if (screen.flags & Screen_Relative) 1184 if (screen.flags & Screen_Relative)
1185 {
1179 { /* relative origin mode */ 1186 /* relative origin mode */
1180 screen.cur.row = row + screen.tscroll; 1187 screen.cur.row = row + screen.tscroll;
1181 min_it (screen.cur.row, screen.bscroll); 1188 min_it (screen.cur.row, screen.bscroll);
1182 } 1189 }
1183 else 1190 else
1184 screen.cur.row = row; 1191 screen.cur.row = row;
… …
1217/* 1224/*
1218 * Erase part or whole of a line 1225 * Erase part or whole of a line
1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1226 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1227 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1228 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1229 * extension: clear to right unless wrapped: ESC [ 3 K
1222 */ 1230 */
1223void 1231void
1224rxvt_term::scr_erase_line (int mode) NOTHROW 1232rxvt_term::scr_erase_line (int mode) NOTHROW
1225{ 1233{
1226 unsigned int col, num; 1234 unsigned int col, num;
… …
1235 line.touch (); 1243 line.touch ();
1236 line.is_longer (0); 1244 line.is_longer (0);
1237 1245
1238 switch (mode) 1246 switch (mode)
1239 { 1247 {
1248 case 3:
1249 if (screen.flags & Screen_WrapNext)
1250 return;
1251
1252 /* fall through */
1253
1240 case 0: /* erase to end of line */ 1254 case 0: /* erase to end of line */
1241 col = screen.cur.col; 1255 col = screen.cur.col;
1242 num = ncol - col; 1256 num = ncol - col;
1243 min_it (line.l, col); 1257 min_it (line.l, col);
1258
1244 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1259 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1245 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1260 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1246 CLEAR_SELECTION (); 1261 CLEAR_SELECTION ();
1247 break; 1262 break;
1263
1248 case 1: /* erase to beginning of line */ 1264 case 1: /* erase to beginning of line */
1249 col = 0; 1265 col = 0;
1250 num = screen.cur.col + 1; 1266 num = screen.cur.col + 1;
1267
1251 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1268 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1252 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1269 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1253 CLEAR_SELECTION (); 1270 CLEAR_SELECTION ();
1254 break; 1271 break;
1272
1255 case 2: /* erase whole line */ 1273 case 2: /* erase whole line */
1256 col = 0; 1274 col = 0;
1257 num = ncol; 1275 num = ncol;
1258 line.l = 0; 1276 line.l = 0;
1259 if (selection.beg.row <= screen.cur.row 1277 if (selection.beg.row <= screen.cur.row
… …
1317 if (row >= nrow) /* Out Of Bounds */ 1335 if (row >= nrow) /* Out Of Bounds */
1318 return; 1336 return;
1319 1337
1320 min_it (num, nrow - row); 1338 min_it (num, nrow - row);
1321 1339
1340 // TODO: the code below does not work when view_start != 0
1341 // the workaround is to disable the clear and use a normal refresh
1342 // when view_start != 0. mysterious.
1322 if (rstyle & (RS_RVid | RS_Uline)) 1343 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1323 ren = (rend_t) ~RS_None; 1344 ren = (rend_t) ~RS_None;
1324 else if (GET_BASEBG (rstyle) == Color_bg) 1345 else if (GET_BASEBG (rstyle) == Color_bg)
1325 { 1346 {
1326 ren = DEFAULT_RSTYLE; 1347 ren = DEFAULT_RSTYLE;
1327 CLEAR_ROWS (row, num); 1348
1349 if (mapped && !view_start)
1350 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width,
1352 (unsigned int)Height2Pixel (num), False);
1328 } 1353 }
1329 else 1354 else
1330 { 1355 {
1331 ren = rstyle & (RS_fgMask | RS_bgMask); 1356 ren = rstyle & (RS_fgMask | RS_bgMask);
1357
1358 if (mapped && !view_start)
1359 {
1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1361 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 ERASE_ROWS (row, num); 1362 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start),
1364 (unsigned int)width,
1365 (unsigned int)Height2Pixel (num));
1335 gcvalue.foreground = pix_colors[Color_fg]; 1366 gcvalue.foreground = pix_colors[Color_fg];
1336 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 }
1337 } 1369 }
1338 1370
1339 for (; num--; row++) 1371 for (; num--; row++)
1340 { 1372 {
1341 scr_blank_screen_mem (ROW(row), rstyle); 1373 scr_blank_screen_mem (ROW(row), rstyle);
1374
1375 if (!view_start)
1342 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1376 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1343 } 1377 }
1344} 1378}
1345 1379
1346#if ENABLE_FRILLS 1380#if !ENABLE_MINIMAL
1347void 1381void
1348rxvt_term::scr_erase_savelines () NOTHROW 1382rxvt_term::scr_erase_savelines () NOTHROW
1349{ 1383{
1350 want_refresh = 1; 1384 want_refresh = 1;
1351 ZERO_SCROLLBACK (); 1385 ZERO_SCROLLBACK ();
… …
1421 * Insert/Delete <count> characters from the current position 1455 * Insert/Delete <count> characters from the current position
1422 */ 1456 */
1423void 1457void
1424rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1458rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1425{ 1459{
1426 int col, row;
1427 rend_t tr;
1428
1429 want_refresh = 1; 1460 want_refresh = 1;
1430 ZERO_SCROLLBACK (); 1461 ZERO_SCROLLBACK ();
1431 1462
1432 if (count <= 0) 1463 if (count <= 0)
1433 return; 1464 return;
… …
1435 scr_do_wrap (); 1466 scr_do_wrap ();
1436 1467
1437 selection_check (1); 1468 selection_check (1);
1438 min_it (count, ncol - screen.cur.col); 1469 min_it (count, ncol - screen.cur.col);
1439 1470
1440 row = screen.cur.row; 1471 int row = screen.cur.row;
1441 1472
1442 line_t *line = &ROW(row); 1473 line_t *line = &ROW(row);
1443 1474
1444 line->touch (); 1475 line->touch ();
1445 line->is_longer (0); 1476 line->is_longer (0);
1446 1477
1478 // nuke wide spanning the start
1479 if (line->t[screen.cur.col] == NOCHAR)
1480 scr_kill_char (*line, screen.cur.col);
1481
1447 switch (insdel) 1482 switch (insdel)
1448 { 1483 {
1449 case INSERT: 1484 case INSERT:
1450 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1485 line->l = min (line->l + count, ncol);
1486
1487 if (line->t[screen.cur.col] == NOCHAR)
1488 scr_kill_char (*line, screen.cur.col);
1489
1490 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1451 { 1491 {
1452 line->t[col] = line->t[col - count]; 1492 line->t[col] = line->t[col - count];
1453 line->r[col] = line->r[col - count]; 1493 line->r[col] = line->r[col - count];
1454 } 1494 }
1455
1456 line->l = min (line->l + count, ncol);
1457 1495
1458 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1460 { 1498 {
1461 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
1462 || (selection.end.col + count >= ncol)) 1500 || (selection.end.col + count >= ncol))
1463 CLEAR_SELECTION (); 1501 CLEAR_SELECTION ();
1464 else 1502 else
1503 {
1465 { /* shift selection */ 1504 /* shift selection */
1466 selection.beg.col += count; 1505 selection.beg.col += count;
1467 selection.mark.col += count; /* XXX: yes? */ 1506 selection.mark.col += count; /* XXX: yes? */
1468 selection.end.col += count; 1507 selection.end.col += count;
1469 } 1508 }
1470 } 1509 }
… …
1475 case ERASE: 1514 case ERASE:
1476 screen.cur.col += count; /* don't worry if > ncol */ 1515 screen.cur.col += count; /* don't worry if > ncol */
1477 selection_check (1); 1516 selection_check (1);
1478 screen.cur.col -= count; 1517 screen.cur.col -= count;
1479 1518
1480 line->l = max (line->l - count, 0); 1519 // nuke wide char after the end
1520 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1521 scr_kill_char (*line, screen.cur.col + count);
1522
1481 scr_blank_line (*line, screen.cur.col, count, rstyle); 1523 scr_blank_line (*line, screen.cur.col, count, rstyle);
1482 break; 1524 break;
1483 1525
1484 case DELETE: 1526 case DELETE:
1485 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1527 line->l = max (line->l - count, 0);
1486 1528
1529 // nuke wide char spanning the end
1530 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col + count);
1532
1487 for (col = screen.cur.col; (col + count) < ncol; col++) 1533 for (int col = screen.cur.col; (col + count) < ncol; col++)
1488 { 1534 {
1489 line->t[col] = line->t[col + count]; 1535 line->t[col] = line->t[col + count];
1490 line->r[col] = line->r[col + count]; 1536 line->r[col] = line->r[col + count];
1491 } 1537 }
1492 1538
1493 line->l = max (line->l - count, 0);
1494 scr_blank_line (*line, ncol - count, count, tr); 1539 scr_blank_line (*line, ncol - count, count, rstyle);
1495 1540
1496 if (selection.op && current_screen == selection.screen 1541 if (selection.op && current_screen == selection.screen
1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1498 { 1543 {
1499 if (selection.end.row != screen.cur.row 1544 if (selection.end.row != screen.cur.row
… …
1609 */ 1654 */
1610void 1655void
1611rxvt_term::scr_set_tab (int mode) NOTHROW 1656rxvt_term::scr_set_tab (int mode) NOTHROW
1612{ 1657{
1613 if (mode < 0) 1658 if (mode < 0)
1614 memset (tabs, 0, ncol * sizeof (char)); 1659 memset (tabs, 0, ncol);
1615 else if (screen.cur.col < ncol) 1660 else if (screen.cur.col < ncol)
1616 tabs [screen.cur.col] = !!mode; 1661 tabs [screen.cur.col] = !!mode;
1617} 1662}
1618 1663
1619/* ------------------------------------------------------------------------- */ 1664/* ------------------------------------------------------------------------- */
… …
1621 * Set reverse/normal video 1666 * Set reverse/normal video
1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1667 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1668 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1624 */ 1669 */
1625void 1670void
1626rxvt_term::scr_rvideo_mode (int mode) NOTHROW 1671rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1627{ 1672{
1628 XGCValues gcvalue; 1673 rvideo_mode = on;
1629 1674
1675#ifndef NO_BELL
1676 on ^= rvideo_bell;
1677#endif
1678
1630 if (rvideo != mode) 1679 if (rvideo_state != on)
1631 { 1680 {
1632 rvideo = mode; 1681 rvideo_state = on;
1682
1633 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1634#if XPM_BACKGROUND 1684#ifdef HAVE_BG_PIXMAP
1635 if (bgPixmap.pixmap == None) 1685 if (bgPixmap.pixmap == None)
1636#endif 1686#endif
1637#if TRANSPARENT 1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1638 if (! OPTION (Opt_transparent) || am_transparent == 0)
1639#endif
1640 XSetWindowBackground (display->display, vt,
1641 pix_colors[Color_bg]);
1642 1688
1689 XGCValues gcvalue;
1643 gcvalue.foreground = pix_colors[Color_fg]; 1690 gcvalue.foreground = pix_colors[Color_fg];
1644 gcvalue.background = pix_colors[Color_bg]; 1691 gcvalue.background = pix_colors[Color_bg];
1645 XChangeGC (display->display, gc, GCBackground | GCForeground, 1692 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1646 &gcvalue); 1693
1647 scr_clear (); 1694 scr_clear ();
1648 scr_touch (true); 1695 scr_touch (true);
1649 } 1696 }
1650} 1697}
1651 1698
… …
1735{ 1782{
1736 bool found = false; 1783 bool found = false;
1737 1784
1738 for (int i = 0; i < nrow; i++) 1785 for (int i = 0; i < nrow; i++)
1739 { 1786 {
1740 int col = 0;
1741 rend_t *drp = drawn_buf[i].r; 1787 rend_t *drp = drawn_buf[i].r;
1742 1788
1743 for (; col < ncol; col++, drp++) 1789 for (int col = 0; col < ncol; col++, drp++)
1744 if ((*drp & mask) == value) 1790 if ((*drp & mask) == value)
1745 { 1791 {
1746 found = true; 1792 found = true;
1747 *drp = ~value; 1793 *drp = ~value;
1748 } 1794 }
… …
1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1897 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1852 1898
1853 return true; 1899 return true;
1854} 1900}
1855 1901
1902#ifndef NO_BELL
1903void
1904rxvt_term::bell_cb (ev::timer &w, int revents)
1905{
1906 rvideo_bell = false;
1907 scr_rvideo_mode (rvideo_mode);
1908 refresh_check ();
1909}
1910#endif
1911
1856/* ------------------------------------------------------------------------- */ 1912/* ------------------------------------------------------------------------- */
1857void 1913void
1858rxvt_term::scr_bell () NOTHROW 1914rxvt_term::scr_bell () NOTHROW
1859{ 1915{
1860#ifndef NO_BELL 1916#ifndef NO_BELL
1861 1917
1862# ifndef NO_MAPALERT 1918# ifndef NO_MAPALERT
1863# ifdef MAPALERT_OPTION 1919# ifdef MAPALERT_OPTION
1864 if (OPTION (Opt_mapAlert)) 1920 if (option (Opt_mapAlert))
1865# endif 1921# endif
1866 XMapWindow (display->display, parent[0]); 1922 XMapWindow (dpy, parent[0]);
1867# endif 1923# endif
1868 1924
1925# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell))
1927 set_urgency (1);
1928# endif
1929
1869 if (OPTION (Opt_visualBell)) 1930 if (option (Opt_visualBell))
1870 { 1931 {
1871 scr_rvideo_mode (!rvideo); /* refresh also done */ 1932 rvideo_bell = true;
1933 scr_rvideo_mode (rvideo_mode);
1872 display->flush (); 1934 flush ();
1935
1873 rxvt_usleep (VISUAL_BELL_DURATION); 1936 bell_ev.start (VISUAL_BELL_DURATION);
1874 scr_rvideo_mode (!rvideo); /* refresh also done */
1875 } 1937 }
1876 else 1938 else
1877 XBell (display->display, 0); 1939 XBell (dpy, 0);
1878 1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1879#endif 1941#endif
1880} 1942}
1881 1943
1882/* ------------------------------------------------------------------------- */ 1944/* ------------------------------------------------------------------------- */
1883/* ARGSUSED */ 1945/* ARGSUSED */
1884void 1946void
1885rxvt_term::scr_printscreen (int fullhist) NOTHROW 1947rxvt_term::scr_printscreen (int fullhist) NOTHROW
1886{ 1948{
1887#ifdef PRINTPIPE 1949#ifdef PRINTPIPE
1888 int nrows, row_start; 1950 int nrows, row_start;
1889 FILE *fd; 1951 FILE *fd = popen_printer ();
1890 1952
1891 if ((fd = popen_printer ()) == NULL) 1953 if (!fd)
1892 return; 1954 return;
1893 1955
1894 if (fullhist) 1956 if (fullhist)
1895 { 1957 {
1896 nrows = nrow - top_row; 1958 nrows = nrow - top_row;
… …
1902 row_start = view_start; 1964 row_start = view_start;
1903 } 1965 }
1904 1966
1905 wctomb (0, 0); 1967 wctomb (0, 0);
1906 1968
1907 for (int r1 = 0; r1 < nrows; r1++) 1969 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1908 { 1970 {
1909 text_t *tp = ROW(r1).t; 1971 text_t *tp = ROW(r1).t;
1910 int len = ROW(r1).l; 1972 int len = ROW(r1).l;
1911 1973
1912 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1974 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1941 * screen.text/screen.rend contain what the screen will change to. 2003 * screen.text/screen.rend contain what the screen will change to.
1942 */ 2004 */
1943void 2005void
1944rxvt_term::scr_refresh () NOTHROW 2006rxvt_term::scr_refresh () NOTHROW
1945{ 2007{
1946 unsigned char must_clear, /* use draw_string not draw_image_string */
1947 showcursor; /* show the cursor */
1948 int16_t col, row, /* column/row we're processing */ 2008 int16_t col, row, /* column/row we're processing */
1949 ocrow; /* old cursor row */ 2009 ocrow; /* old cursor row */
1950 int i; /* tmp */ 2010 int i; /* tmp */
1951#ifndef NO_CURSORCOLOR 2011#ifndef NO_CURSORCOLOR
1952 rend_t cc1; /* store colours at cursor position (s) */ 2012 rend_t cc1; /* store colours at cursor position (s) */
1953#endif 2013#endif
1954 rend_t *crp; // cursor rendition pointer 2014 rend_t *crp; // cursor rendition pointer
2015 rend_t ccol1, /* Cursor colour */
2016 ccol2; /* Cursor colour2 */
1955 2017
1956 want_refresh = 0; /* screen is current */ 2018 want_refresh = 0; /* screen is current */
1957 2019
1958 if (refresh_type == NO_REFRESH || !mapped) 2020 if (refresh_type == NO_REFRESH || !mapped)
1959 return; 2021 return;
1960 2022
1961 /* 2023 /*
1962 * A: set up vars 2024 * A: set up vars
1963 */ 2025 */
1964 must_clear = 0;
1965 refresh_count = 0; 2026 refresh_count = 0;
1966 2027
1967#if XPM_BACKGROUND 2028 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP
1968 must_clear |= bgPixmap.pixmap != None; 2031 have_bg = bgPixmap.pixmap != None;
1969#endif
1970#if TRANSPARENT
1971 must_clear |= OPTION (Opt_transparent) && am_transparent;
1972#endif 2032#endif
1973 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1974 2034
1975 /* 2035 /*
1976 * B: reverse any characters which are selected 2036 * B: reverse any characters which are selected
1977 */ 2037 */
1978 scr_reverse_selection (); 2038 scr_reverse_selection ();
2039
2040 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2041#if ENABLE_OVERLAY
2042 scr_swap_overlay ();
2043#endif
2044
2045 char showcursor = screen.flags & Screen_VisibleCursor;
1979 2046
1980 /* 2047 /*
1981 * C: set the cursor character (s) 2048 * C: set the cursor character (s)
1982 */ 2049 */
1983 { 2050 {
1984 unsigned char setoldcursor; 2051 unsigned char setoldcursor;
1985 rend_t ccol1, /* Cursor colour */
1986 ccol2; /* Cursor colour2 */
1987 2052
1988 showcursor = (screen.flags & Screen_VisibleCursor);
1989#ifdef CURSOR_BLINK 2053#ifdef CURSOR_BLINK
1990 if (hidden_cursor) 2054 if (hidden_cursor)
1991 showcursor = 0; 2055 showcursor = 0;
1992#endif 2056#endif
1993 2057
… …
1998 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2062 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1999 col--; 2063 col--;
2000 2064
2001 crp = &ROW(screen.cur.row).r[col]; 2065 crp = &ROW(screen.cur.row).r[col];
2002 2066
2003 if (showcursor && focus) 2067#ifndef NO_CURSORCOLOR
2068 cc1 = *crp & (RS_fgMask | RS_bgMask);
2069 if (ISSET_PIXCOLOR (Color_cursor))
2070 ccol1 = Color_cursor;
2071 else
2072#endif
2073#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2074 ccol1 = fgcolor_of (rstyle);
2075#else
2076 ccol1 = Color_fg;
2077#endif
2078
2079#ifndef NO_CURSORCOLOR
2080 if (ISSET_PIXCOLOR (Color_cursor2))
2081 ccol2 = Color_cursor2;
2082 else
2083#endif
2084#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2085 ccol2 = bgcolor_of (rstyle);
2086#else
2087 ccol2 = Color_bg;
2088#endif
2089
2090 if (focus)
2004 { 2091 {
2005 if (OPTION (Opt_cursorUnderline)) 2092 if (option (Opt_cursorUnderline))
2006 *crp ^= RS_Uline; 2093 *crp ^= RS_Uline;
2007 else 2094 else
2008 { 2095 {
2009 *crp ^= RS_RVid; 2096 *crp ^= RS_RVid;
2010
2011#ifndef NO_CURSORCOLOR
2012 cc1 = *crp & (RS_fgMask | RS_bgMask);
2013 if (ISSET_PIXCOLOR (Color_cursor))
2014 ccol1 = Color_cursor;
2015 else
2016#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2017 ccol1 = fgcolor_of (rstyle);
2018#else
2019 ccol1 = Color_fg;
2020#endif
2021 if (ISSET_PIXCOLOR (Color_cursor2))
2022 ccol2 = Color_cursor2;
2023 else
2024#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2025 ccol2 = bgcolor_of (rstyle);
2026#else
2027 ccol2 = Color_bg;
2028#endif
2029 *crp = SET_FGCOLOR (*crp, ccol1); 2097 *crp = SET_FGCOLOR (*crp, ccol1);
2030 *crp = SET_BGCOLOR (*crp, ccol2); 2098 *crp = SET_BGCOLOR (*crp, ccol2);
2031#endif
2032 } 2099 }
2033 } 2100 }
2034 } 2101 }
2035 2102
2036 /* make sure no outline cursor is left around */ 2103 /* make sure no outline cursor is left around */
… …
2063 oldcursor.col = screen.cur.col; 2130 oldcursor.col = screen.cur.col;
2064 } 2131 }
2065 } 2132 }
2066 } 2133 }
2067 2134
2068 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2069#if ENABLE_OVERLAY
2070 scr_swap_overlay ();
2071#endif
2072
2073#ifndef NO_SLOW_LINK_SUPPORT 2135#ifndef NO_SLOW_LINK_SUPPORT
2074 /* 2136 /*
2075 * D: CopyArea pass - very useful for slower links 2137 * D: CopyArea pass - very useful for slower links
2076 * This has been deliberately kept simple. 2138 * This has been deliberately kept simple.
2077 */ 2139 */
2078 if (!display->is_local 2140 if (!display->is_local
2079 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2141 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2080 && abs (num_scr) < nrow && !must_clear) 2142 && abs (num_scr) < nrow && !have_bg)
2081 { 2143 {
2082 int16_t nits; 2144 int16_t nits;
2145 int i = num_scr;
2083 int j; 2146 int j;
2084 int len, wlen; 2147 int len, wlen;
2085 dLocal (int, num_scr); 2148 dLocal (int, num_scr);
2086 2149
2087 j = nrow; 2150 j = nrow;
2088 wlen = len = -1; 2151 wlen = len = -1;
2089 row = i > 0 ? 0 : j - 1; 2152 row = i > 0 ? 0 : j - 1;
2153
2090 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2154 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2091 { 2155 {
2092 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2156 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2093 { 2157 {
2094 line_t s = ROW(view_start + row); 2158 line_t s = ROW(view_start + row);
… …
2115 wlen = row; 2179 wlen = row;
2116 continue; 2180 continue;
2117 } 2181 }
2118 } 2182 }
2119 2183
2120 if (len != -1) 2184 if (len >= 0)
2121 { 2185 {
2122 /* also comes here at end if needed because of >= above */ 2186 /* also comes here at end if needed because of >= above */
2123 if (wlen < len) 2187 if (wlen < len)
2124 ::swap (wlen, len); 2188 ::swap (wlen, len);
2125 2189
2190 XGCValues gcv;
2191
2192 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2126 XCopyArea (display->display, vt, vt, 2193 XCopyArea (dpy, vt, vt,
2127 gc, 0, Row2Pixel (len + i), 2194 gc, 0, Row2Pixel (len + i),
2128 (unsigned int)this->width, 2195 (unsigned int)this->width,
2129 (unsigned int)Height2Pixel (wlen - len + 1), 2196 (unsigned int)Height2Pixel (wlen - len + 1),
2130 0, Row2Pixel (len)); 2197 0, Row2Pixel (len));
2198 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2199
2131 len = -1; 2200 len = -1;
2132 } 2201 }
2133 } 2202 }
2134 } 2203 }
2135#endif 2204#endif
… …
2159 continue; 2228 continue;
2160 2229
2161 // redraw one or more characters 2230 // redraw one or more characters
2162 2231
2163 // seek to the beginning of wide characters 2232 // seek to the beginning of wide characters
2164 while (stp[col] == NOCHAR && col > 0) 2233 while (expect_false (stp[col] == NOCHAR && col > 0))
2165 --col; 2234 --col;
2166 2235
2167 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2236 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2168 text_t *text = stp + col; 2237 text_t *text = stp + col;
2169 int count = 1; 2238 int count = 1;
2170 2239
2171 dtp[col] = stp[col]; 2240 dtp[col] = stp[col];
2172 drp[col] = rend; 2241 drp[col] = rend;
… …
2176 for (i = 0; ++col < ncol; ) 2245 for (i = 0; ++col < ncol; )
2177 { 2246 {
2178 if (stp[col] == NOCHAR) 2247 if (stp[col] == NOCHAR)
2179 { 2248 {
2180 dtp[col] = stp[col]; 2249 dtp[col] = stp[col];
2181 drp[col] = rend; 2250 drp[col] = srp[col];
2251
2182 count++; 2252 count++;
2183 i++; 2253 i++;
2184 2254
2185 continue; 2255 continue;
2186 } 2256 }
… …
2191 count++; 2261 count++;
2192 2262
2193 if (stp[col] != dtp[col] 2263 if (stp[col] != dtp[col]
2194 || !RS_SAME (srp[col], drp[col])) 2264 || !RS_SAME (srp[col], drp[col]))
2195 { 2265 {
2196 if (must_clear && (i++ > count / 2)) 2266 if (have_bg && (i++ > count / 2))
2197 break; 2267 break;
2198 2268
2199 dtp[col] = stp[col]; 2269 dtp[col] = stp[col];
2200 drp[col] = rend; 2270 drp[col] = rend;
2201 i = 0; 2271 i = 0;
2202 } 2272 }
2203 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2273 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2204 break; 2274 break;
2205 } 2275 }
2206 2276
2207 col--; /* went one too far. move back */ 2277 col--; /* went one too far. move back */
2208 count -= i; /* dump any matching trailing chars */ 2278 count -= i; /* dump any matching trailing chars */
2209 2279
2210 // sometimes we optimize away the trailing NOCHAR's, add them back 2280 // sometimes we optimize away the trailing NOCHAR's, add them back
2211 while (i && text[count] == NOCHAR) 2281 while (expect_false (i && text[count] == NOCHAR))
2212 count++, i--; 2282 count++, i--;
2213 2283
2214 /* 2284 /*
2215 * Determine the attributes for the string 2285 * Determine the attributes for the string
2216 */ 2286 */
2217 int fore = fgcolor_of (rend); // desired foreground 2287 int fore = fgcolor_of (rend); // desired foreground
2218 int back = bgcolor_of (rend); // desired background 2288 int back = bgcolor_of (rend); // desired background
2219 2289
2220 // only do special processing if any attributes are set, which is unlikely 2290 // only do special processing if any attributes are set, which is unlikely
2221 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2291 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2222 { 2292 {
2223#if ENABLE_STYLES
2224 // force redraw after "careful" characters to avoid pixel droppings
2225 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2226 drp[col + 1] = ~srp[col + 1];
2227
2228 // include previous careful character(s) if possible, looks nicer (best effort...)
2229 while (text > stp
2230 && srp[text - stp - 1] & RS_Careful
2231 && RS_SAME (rend, srp[text - stp - 1]))
2232 text--, count++, xpixel -= fwidth;
2233#endif
2234
2235 bool invert = rend & RS_RVid; 2293 bool invert = rend & RS_RVid;
2236 2294
2237#ifndef NO_BOLD_UNDERLINE_REVERSE 2295#ifndef NO_BOLD_UNDERLINE_REVERSE
2238 if (rend & RS_Bold
2239 && fore == Color_fg) 2296 if (rend & RS_Bold && fore == Color_fg)
2240 { 2297 {
2241 if (ISSET_PIXCOLOR (Color_BD)) 2298 if (ISSET_PIXCOLOR (Color_BD))
2242 fore = Color_BD; 2299 fore = Color_BD;
2243# if !ENABLE_STYLES 2300# if !ENABLE_STYLES
2244 else 2301 else
2245 invert = !invert; 2302 invert = !invert;
2246# endif 2303# endif
2247 } 2304 }
2248 2305
2249 if (rend & RS_Italic 2306 if (rend & RS_Italic && fore == Color_fg)
2250 && fore == Color_fg)
2251 { 2307 {
2252 if (ISSET_PIXCOLOR (Color_IT)) 2308 if (ISSET_PIXCOLOR (Color_IT))
2253 fore = Color_IT; 2309 fore = Color_IT;
2254# if !ENABLE_STYLES 2310# if !ENABLE_STYLES
2255 else 2311 else
2256 invert = !invert; 2312 invert = !invert;
2257# endif 2313# endif
2258 } 2314 }
2259 2315
2260 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2261 fore = Color_UL; 2317 fore = Color_UL;
2318#endif
2319
2320#ifdef OPTION_HC
2321 if (rend & RS_Sel)
2322 {
2323 /* invert the column if no highlightColor is set or it is the
2324 * current cursor column */
2325 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2326 && ISSET_PIXCOLOR (Color_HC))
2327 {
2328 if (ISSET_PIXCOLOR (Color_HTC))
2329 fore = Color_HTC;
2330 // if invert is 0 reverse video is set so we use bg color as fg color
2331 else if (!invert)
2332 fore = back;
2333
2334 back = Color_HC;
2335 invert = 0;
2336 }
2337 }
2262#endif 2338#endif
2263 2339
2264 if (invert) 2340 if (invert)
2265 { 2341 {
2266 ::swap (fore, back); 2342 ::swap (fore, back);
2267 2343
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2344#ifndef NO_BOLD_UNDERLINE_REVERSE
2269 if (ISSET_PIXCOLOR (Color_RV))
2270 back = Color_RV;
2271
2272 if (fore == back) 2345 if (fore == back)
2273 { 2346 {
2274 fore = Color_bg; 2347 fore = Color_bg;
2275 back = Color_fg; 2348 back = Color_fg;
2276 } 2349 }
… …
2278 } 2351 }
2279 2352
2280#ifdef TEXT_BLINK 2353#ifdef TEXT_BLINK
2281 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2354 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2282 { 2355 {
2283 if (!text_blink_ev.active) 2356 if (!text_blink_ev.is_active ())
2284 { 2357 {
2285 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2358 text_blink_ev.again ();
2286 hidden_text = 0; 2359 hidden_text = 0;
2287 } 2360 }
2288 else if (hidden_text) 2361 else if (hidden_text)
2289 fore = back; 2362 fore = back;
2290 } 2363 }
2291#endif 2364#endif
2365
2366#if ENABLE_STYLES
2367 // "careful" (too wide) character handling
2368
2369 // include previous careful character(s) if possible, looks nicer (best effort...)
2370 while (text > stp
2371 && srp[text - stp - 1] & RS_Careful
2372 && RS_SAME (rend, srp[text - stp - 1]))
2373 text--, count++, xpixel -= fwidth;
2374
2375 // force redraw after "careful" characters to avoid pixel droppings
2376 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2377 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2378
2379 // force redraw before "careful" characters to avoid pixel droppings
2380 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2381 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2382#endif
2292 } 2383 }
2293 2384
2294 /* 2385 /*
2295 * Actually do the drawing of the string here 2386 * Actually do the drawing of the string here
2296 */ 2387 */
2297 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2388 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2298 2389
2299 if (back == fore) 2390 if (expect_true (have_bg && back == Color_bg))
2300 font->clear_rect (*drawable, xpixel, ypixel,
2301 fwidth * count, fheight,
2302 back);
2303 else if (back == Color_bg)
2304 { 2391 {
2305 if (must_clear) 2392 // this is very ugly, maybe push it into ->draw?
2306 {
2307 CLEAR_CHARS (xpixel, ypixel, count);
2308 2393
2309 for (i = 0; i < count; i++) /* don't draw empty strings */ 2394 for (i = 0; i < count; i++) /* don't draw empty strings */
2310 if (text[i] != ' ') 2395 if (text[i] != ' ')
2311 { 2396 {
2312 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2397 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2313 break; 2398 goto did_clear;
2314 }
2315 } 2399 }
2316 else 2400
2317 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2401 CLEAR_CHARS (xpixel, ypixel, count);
2402 did_clear: ;
2318 } 2403 }
2319 else 2404 else
2320 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2405 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2321 2406
2322 if (rend & RS_Uline && font->descent > 1 && fore != back) 2407 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2323 { 2408 {
2324#if ENABLE_FRILLS 2409#if ENABLE_FRILLS
2325 if (ISSET_PIXCOLOR (Color_underline)) 2410 if (ISSET_PIXCOLOR (Color_underline))
2326 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2411 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2327 else 2412 else
2328#endif 2413#endif
2329 XSetForeground (display->display, gc, pix_colors[fore]); 2414 XSetForeground (dpy, gc, pix_colors[fore]);
2330 2415
2331 XDrawLine (display->display, drawBuffer, gc, 2416 XDrawLine (dpy, vt, gc,
2332 xpixel, ypixel + font->ascent + 1, 2417 xpixel, ypixel + font->ascent + 1,
2333 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2418 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2334 } 2419 }
2335 } /* for (col....) */ 2420 } /* for (col....) */
2336 } /* for (row....) */ 2421 } /* for (row....) */
2337 2422
2338#if ENABLE_OVERLAY
2339 scr_swap_overlay ();
2340#endif
2341 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2342
2343 /* 2423 /*
2344 * G: cleanup cursor and display outline cursor if necessary 2424 * G: cleanup cursor and display outline cursor if necessary
2345 */ 2425 */
2346 if (showcursor) 2426 if (showcursor)
2347 { 2427 {
2348 if (focus) 2428 if (focus)
2349 { 2429 {
2350 if (OPTION (Opt_cursorUnderline)) 2430 if (option (Opt_cursorUnderline))
2351 *crp ^= RS_Uline; 2431 *crp ^= RS_Uline;
2352 else 2432 else
2353 { 2433 {
2354 *crp ^= RS_RVid; 2434 *crp ^= RS_RVid;
2355#ifndef NO_CURSORCOLOR 2435#ifndef NO_CURSORCOLOR
… …
2369 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2449 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2370 cursorwidth++; 2450 cursorwidth++;
2371 2451
2372#ifndef NO_CURSORCOLOR 2452#ifndef NO_CURSORCOLOR
2373 if (ISSET_PIXCOLOR (Color_cursor)) 2453 if (ISSET_PIXCOLOR (Color_cursor))
2374 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2454 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2455 else
2375#endif 2456#endif
2457 XSetForeground (dpy, gc, pix_colors[ccol1]);
2376 2458
2377 XDrawRectangle (display->display, drawBuffer, gc, 2459 XDrawRectangle (dpy, vt, gc,
2378 Col2Pixel (col), 2460 Col2Pixel (col),
2379 Row2Pixel (oldcursor.row), 2461 Row2Pixel (oldcursor.row),
2380 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2462 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2381 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2463 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2382 } 2464 }
2383 } 2465 }
2384 2466
2385 /* 2467 /*
2386 * H: cleanup selection 2468 * H: cleanup selection
2387 */ 2469 */
2470#if ENABLE_OVERLAY
2471 scr_swap_overlay ();
2472#endif
2473 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2474
2388 scr_reverse_selection (); 2475 scr_reverse_selection ();
2389 2476
2477 screen.flags = old_screen_flags;
2390 num_scr = 0; 2478 num_scr = 0;
2391 num_scr_allow = 1; 2479 num_scr_allow = 1;
2392} 2480}
2393 2481
2394void 2482void
… …
2417} 2505}
2418 2506
2419void 2507void
2420rxvt_term::scr_recolour () NOTHROW 2508rxvt_term::scr_recolour () NOTHROW
2421{ 2509{
2422 if (1 2510#ifdef HAVE_BG_PIXMAP
2423#if TRANSPARENT 2511 bgPixmap.apply ();
2424 && !am_transparent 2512#else
2425#endif 2513
2426#if XPM_BACKGROUND
2427 && !bgPixmap.pixmap
2428#endif
2429 )
2430 {
2431 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2514 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2432 XClearWindow (display->display, parent[0]); 2515 XClearWindow (dpy, parent[0]);
2433 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2516 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2434#if HAVE_SCROLLBARS 2517
2435 if (scrollBar.win) 2518 if (scrollBar.win)
2436 { 2519 {
2437 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2520 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2438 scrollBar.setIdle (); 2521 scrollBar.state = STATE_IDLE;
2439 scrollbar_show (0); 2522 scrollBar.show (0);
2440 }
2441#endif
2442 } 2523 }
2443 2524
2525#endif
2526
2527 /* bgPixmap.apply () does not do the following : */
2444 scr_clear (); 2528 scr_clear ();
2445 scr_touch (true); 2529 scr_touch (true);
2446 want_refresh = 1; 2530 want_refresh = 1;
2447} 2531}
2448 2532
… …
2455 2539
2456 num_scr_allow = 0; 2540 num_scr_allow = 0;
2457 want_refresh = 1; 2541 want_refresh = 1;
2458 2542
2459 if (really) 2543 if (really)
2460 XClearWindow (display->display, vt); 2544 XClearWindow (dpy, vt);
2461} 2545}
2462 2546
2463void 2547void
2464rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2548rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2465{ 2549{
… …
2514{ 2598{
2515 if (selection.op 2599 if (selection.op
2516 && current_screen == selection.screen 2600 && current_screen == selection.screen
2517 && selection.end.row >= view_start) 2601 && selection.end.row >= view_start)
2518 { 2602 {
2519#if ENABLE_FRILLS 2603#if !ENABLE_MINIMAL
2520 if (selection.rect) 2604 if (selection.rect)
2521 scr_xor_rect (selection.beg.row, selection.beg.col, 2605 scr_xor_rect (selection.beg.row, selection.beg.col,
2522 selection.end.row, selection.end.col, 2606 selection.end.row, selection.end.col,
2523 RS_RVid, RS_RVid | RS_Uline); 2607 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2524 else 2608 else
2525#endif 2609#endif
2526 scr_xor_span (selection.beg.row, selection.beg.col, 2610 scr_xor_span (selection.beg.row, selection.beg.col,
2527 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2528 RS_RVid); 2612 RS_Sel | RS_RVid);
2529 } 2613 }
2530} 2614}
2531 2615
2532/* ------------------------------------------------------------------------- */ 2616/* ------------------------------------------------------------------------- */
2533/* 2617/*
… …
2540{ 2624{
2541 int row, wrote; 2625 int row, wrote;
2542 unsigned int width, towrite; 2626 unsigned int width, towrite;
2543 char r1[] = "\n"; 2627 char r1[] = "\n";
2544 2628
2545 for (row = saveLines - nsaved; 2629 for (row = saveLines + top_row;
2546 row < saveLines + nrow - 1; row++) 2630 row < saveLines + nrow - 1; row++)
2547 { 2631 {
2548 width = row_buf[row].l >= 0 ? row_buf[row].l 2632 width = row_buf[row].l >= 0 ? row_buf[row].l
2549 : ncol; 2633 : ncol;
2550 for (towrite = width; towrite; towrite -= wrote) 2634 for (towrite = width; towrite; towrite -= wrote)
… …
2601 /* convert normal newline chars into common keyboard Return key sequence */ 2685 /* convert normal newline chars into common keyboard Return key sequence */
2602 for (unsigned int i = 0; i < len; i++) 2686 for (unsigned int i = 0; i < len; i++)
2603 if (data[i] == C0_LF) 2687 if (data[i] == C0_LF)
2604 data[i] = C0_CR; 2688 data[i] = C0_CR;
2605 2689
2690 if (priv_modes & PrivMode_BracketPaste)
2691 tt_printf ("\e[200~");
2692
2606 tt_write (data, len); 2693 tt_write (data, len);
2694
2695 if (priv_modes & PrivMode_BracketPaste)
2696 tt_printf ("\e[201~");
2607} 2697}
2608 2698
2609/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2610/* 2700/*
2611 * Respond to a notification that a primary selection has been sent 2701 * Respond to a notification that a primary selection has been sent
… …
2640 } 2730 }
2641 2731
2642 unsigned long bytes_after; 2732 unsigned long bytes_after;
2643 XTextProperty ct; 2733 XTextProperty ct;
2644 2734
2645 if (XGetWindowProperty (display->display, win, prop, 2735 if (XGetWindowProperty (dpy, win, prop,
2646 0, PROP_SIZE / 4, 2736 0, PROP_SIZE / 4,
2647 delete_prop, AnyPropertyType, 2737 delete_prop, AnyPropertyType,
2648 &ct.encoding, &ct.format, 2738 &ct.encoding, &ct.format,
2649 &ct.nitems, &bytes_after, 2739 &ct.nitems, &bytes_after,
2650 &ct.value) != Success) 2740 &ct.value) != Success)
… …
2659 if (bytes_after) 2749 if (bytes_after)
2660 { 2750 {
2661 // fetch and append remaining data 2751 // fetch and append remaining data
2662 XTextProperty ct2; 2752 XTextProperty ct2;
2663 2753
2664 if (XGetWindowProperty (display->display, win, prop, 2754 if (XGetWindowProperty (dpy, win, prop,
2665 ct.nitems / 4, (bytes_after + 3) / 4, 2755 ct.nitems / 4, (bytes_after + 3) / 4,
2666 delete_prop, AnyPropertyType, 2756 delete_prop, AnyPropertyType,
2667 &ct2.encoding, &ct2.format, 2757 &ct2.encoding, &ct2.format,
2668 &ct2.nitems, &bytes_after, 2758 &ct2.nitems, &bytes_after,
2669 &ct2.value) != Success) 2759 &ct2.value) != Success)
… …
2682 2772
2683 if (ct.encoding == xa[XA_INCR]) 2773 if (ct.encoding == xa[XA_INCR])
2684 { 2774 {
2685 // INCR selection, start handshake 2775 // INCR selection, start handshake
2686 if (!delete_prop) 2776 if (!delete_prop)
2687 XDeleteProperty (display->display, win, prop); 2777 XDeleteProperty (dpy, win, prop);
2688 2778
2689 selection_wait = Sel_incr; 2779 selection_wait = Sel_incr;
2690 incr_buf_fill = 0; 2780 incr_buf_fill = 0;
2691 incr_ev.start (NOW + 10); 2781 incr_ev.start (10);
2692 2782
2693 goto bailout; 2783 goto bailout;
2694 } 2784 }
2695 2785
2696 if (ct.nitems == 0) 2786 if (ct.nitems == 0)
… …
2705 ct.nitems = incr_buf_fill; 2795 ct.nitems = incr_buf_fill;
2706 incr_buf = 0; 2796 incr_buf = 0;
2707 incr_buf_size = 0; 2797 incr_buf_size = 0;
2708 incr_ev.stop (); 2798 incr_ev.stop ();
2709 } 2799 }
2710 else 2800 else
2711 { 2801 {
2712 if (selection_wait == Sel_normal 2802 if (selection_wait == Sel_normal
2713 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2803 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2714 { 2804 {
2715 /* 2805 /*
… …
2722 goto bailout; 2812 goto bailout;
2723 } 2813 }
2724 } 2814 }
2725 else if (selection_wait == Sel_incr) 2815 else if (selection_wait == Sel_incr)
2726 { 2816 {
2727 incr_ev.start (NOW + 10); 2817 incr_ev.start (10);
2728 2818
2729 while (incr_buf_fill + ct.nitems > incr_buf_size) 2819 while (incr_buf_fill + ct.nitems > incr_buf_size)
2730 { 2820 {
2731 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2821 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2732 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2822 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2739 } 2829 }
2740 2830
2741 char **cl; 2831 char **cl;
2742 int cr; 2832 int cr;
2743 2833
2744#if ENABLE_FRILLS 2834#if !ENABLE_MINIMAL
2745 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2835 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2746 // so recode it manually 2836 // so recode it manually
2747 if (ct.encoding == xa[XA_UTF8_STRING]) 2837 if (ct.encoding == xa[XA_UTF8_STRING])
2748 { 2838 {
2749 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2839 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2753 paste (s, strlen (s)); 2843 paste (s, strlen (s));
2754 free (s); 2844 free (s);
2755 } 2845 }
2756 else 2846 else
2757#endif 2847#endif
2758 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2848 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2759 && cl) 2849 && cl)
2760 { 2850 {
2761 for (int i = 0; i < cr; i++) 2851 for (int i = 0; i < cr; i++)
2762 paste (cl[i], strlen (cl[i])); 2852 paste (cl[i], strlen (cl[i]));
2763 2853
… …
2772 if (selection_wait == Sel_normal) 2862 if (selection_wait == Sel_normal)
2773 selection_wait = Sel_none; 2863 selection_wait = Sel_none;
2774} 2864}
2775 2865
2776void 2866void
2777rxvt_term::incr_cb (time_watcher &w) NOTHROW 2867rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2778{ 2868{
2779 selection_wait = Sel_none; 2869 selection_wait = Sel_none;
2780 2870
2781 incr_buf_size = 0; 2871 incr_buf_size = 0;
2782 free (incr_buf); 2872 free (incr_buf);
… …
2793 selection_paste (win, prop, true); 2883 selection_paste (win, prop, true);
2794} 2884}
2795 2885
2796/* ------------------------------------------------------------------------- */ 2886/* ------------------------------------------------------------------------- */
2797/* 2887/*
2798 * Request the current selection: 2888 * Request the current selection:
2799 * Order: > internal selection if available 2889 * Order: > internal selection if available
2800 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2890 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2801 * > CUT_BUFFER0 2891 * > CUT_BUFFER0
2802 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2892 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2803 * will auto fallback to CUT_BUFFER0 2893 * will auto fallback to CUT_BUFFER0
2804 * EXT: button 2 release 2894 * EXT: button 2 release
2805 */ 2895 */
2806void 2896void
2807rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2897rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2808{ 2898{
2809/* After making a selection with selection_make this function will always 2899 if (selection.text && selnum == Sel_Primary)
2810 * return the internal selection, which is not correct IMO, now much more since 2900 {
2811 * I added the selnum parameter.
2812 */
2813#if 0
2814 if (selection.text)
2815 { /* internal selection */ 2901 /* internal selection */
2816 char *str = rxvt_wcstombs (selection.text, selection.len); 2902 char *str = rxvt_wcstombs (selection.text, selection.len);
2817 paste (str, strlen (str)); 2903 paste (str, strlen (str));
2818 free (str); 2904 free (str);
2819 return; 2905 return;
2820 } 2906 }
2821 else 2907 else
2822#endif
2823 { 2908 {
2824 selection_request_time = tm; 2909 selection_request_time = tm;
2825 selection_wait = Sel_normal; 2910 selection_wait = Sel_normal;
2826 2911
2827#if X_HAVE_UTF8_STRING 2912#if X_HAVE_UTF8_STRING
2828 selection_type = Sel_UTF8String; 2913 selection_type = Sel_UTF8String;
2829 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2914 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2830 return; 2915 return;
2831#else 2916#else
2832 selection_type = Sel_CompoundText; 2917 selection_type = Sel_CompoundText;
2833 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2918 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2834 return; 2919 return;
2835#endif 2920#endif
2836 } 2921 }
2837 2922
2838 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2923 selection_wait = Sel_none; /* don't loop in selection_paste () */
2839 selection_paste (display->root, XA_CUT_BUFFER0, false); 2924 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2851 else if (selnum == Sel_Secondary) 2936 else if (selnum == Sel_Secondary)
2852 sel = XA_SECONDARY; 2937 sel = XA_SECONDARY;
2853 else 2938 else
2854 sel = xa[XA_CLIPBOARD]; 2939 sel = xa[XA_CLIPBOARD];
2855 2940
2856 if (XGetSelectionOwner (display->display, sel) != None) 2941 if (XGetSelectionOwner (dpy, sel) != None)
2857 { 2942 {
2858 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2943 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2859 vt, selection_request_time); 2944 vt, selection_request_time);
2860 return 1; 2945 return 1;
2861 } 2946 }
2862 2947
2863 return 0; 2948 return 0;
… …
2867/* 2952/*
2868 * Clear all selected text 2953 * Clear all selected text
2869 * EXT: SelectionClear 2954 * EXT: SelectionClear
2870 */ 2955 */
2871void 2956void
2872rxvt_term::selection_clear () NOTHROW 2957rxvt_term::selection_clear (bool clipboard) NOTHROW
2873{ 2958{
2959 if (!clipboard)
2960 {
2874 want_refresh = 1; 2961 want_refresh = 1;
2875 free (selection.text); 2962 free (selection.text);
2876 selection.text = NULL; 2963 selection.text = NULL;
2877 selection.len = 0; 2964 selection.len = 0;
2878 CLEAR_SELECTION (); 2965 CLEAR_SELECTION ();
2879 2966
2880 if (display->selection_owner == this) 2967 if (display->selection_owner == this)
2881 display->selection_owner = 0; 2968 display->selection_owner = 0;
2969 }
2970 else
2971 {
2972 free (selection.clip_text);
2973 selection.clip_text = NULL;
2974 selection.clip_len = 0;
2975
2976 if (display->clipboard_owner == this)
2977 display->clipboard_owner = 0;
2978 }
2979}
2980
2981void
2982rxvt_term::clipboard_copy (Time tm)
2983{
2984 if (selection.len > 0)
2985 {
2986 free (selection.clip_text);
2987 selection.clip_len = selection.len;
2988 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2989 memcpy (selection.clip_text, selection.text,
2990 sizeof (wchar_t) * selection.clip_len);
2991 selection_grab (tm, true);
2992 }
2882} 2993}
2883 2994
2884/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2885/* 2996/*
2886 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
… …
2926 3037
2927 int end_col; 3038 int end_col;
2928 3039
2929 for (; row <= selection.end.row; row++, col = 0) 3040 for (; row <= selection.end.row; row++, col = 0)
2930 { 3041 {
2931#if ENABLE_FRILLS 3042#if !ENABLE_MINIMAL
2932 if (selection.rect) 3043 if (selection.rect)
2933 { 3044 {
2934 col = selection.beg.col; 3045 col = selection.beg.col;
2935 end_col = ncol + 1; 3046 end_col = ncol + 1;
2936 } 3047 }
… …
2939 end_col = ROW(row).l; 3050 end_col = ROW(row).l;
2940 3051
2941 col = max (col, 0); 3052 col = max (col, 0);
2942 3053
2943 if (row == selection.end.row 3054 if (row == selection.end.row
2944#if ENABLE_FRILLS 3055#if !ENABLE_MINIMAL
2945 || selection.rect 3056 || selection.rect
2946#endif 3057#endif
2947 ) 3058 )
2948 min_it (end_col, selection.end.col); 3059 min_it (end_col, selection.end.col);
2949 3060
… …
2972#endif 3083#endif
2973 else 3084 else
2974 new_selection_text[ofs++] = *t++; 3085 new_selection_text[ofs++] = *t++;
2975 } 3086 }
2976 3087
2977#if ENABLE_FRILLS 3088#if !ENABLE_MINIMAL
2978 if (selection.rect) 3089 if (selection.rect)
2979 { 3090 {
2980 while (ofs 3091 while (ofs
2981 && new_selection_text[ofs - 1] != C0_LF 3092 && new_selection_text[ofs - 1] != C0_LF
2982 && unicode::is_space (new_selection_text[ofs - 1])) 3093 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3012 3123
3013 selection_grab (tm); 3124 selection_grab (tm);
3014} 3125}
3015 3126
3016bool 3127bool
3017rxvt_term::selection_grab (Time tm) NOTHROW 3128rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3018{ 3129{
3130 Atom sel;
3131
3132 if (!clipboard)
3133 {
3019 selection_time = tm; 3134 selection_time = tm;
3020 3135 sel = XA_PRIMARY;
3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3023 { 3136 }
3137 else
3138 {
3139 clipboard_time = tm;
3140 sel = xa[XA_CLIPBOARD];
3141 }
3142
3143 XSetSelectionOwner (dpy, sel, vt, tm);
3144 if (XGetSelectionOwner (dpy, sel) == vt)
3145 {
3024 display->set_selection_owner (this); 3146 display->set_selection_owner (this, clipboard);
3025 return true; 3147 return true;
3026 } 3148 }
3027 else 3149 else
3028 { 3150 {
3029 selection_clear (); 3151 selection_clear (clipboard);
3030 return false; 3152 return false;
3031 } 3153 }
3032 3154
3033#if 0 3155#if 0
3034 XTextProperty ct; 3156 XTextProperty ct;
3035 3157
3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3158 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3037 { 3159 {
3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3160 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3039 XFree (ct.value); 3161 XFree (ct.value);
3040 } 3162 }
3041#endif 3163#endif
… …
3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3209 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3088 3210
3089 while (selection.mark.col > 0 3211 while (selection.mark.col > 0
3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3212 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3091 --selection.mark.col; 3213 --selection.mark.col;
3092 3214
3093 if (selection.op) 3215 if (selection.op)
3216 {
3094 { /* clear the old selection */ 3217 /* clear the old selection */
3095 selection.beg.row = selection.end.row = selection.mark.row; 3218 selection.beg.row = selection.end.row = selection.mark.row;
3096 selection.beg.col = selection.end.col = selection.mark.col; 3219 selection.beg.col = selection.end.col = selection.mark.col;
3097 } 3220 }
3098 3221
3099 selection.op = SELECTION_INIT; 3222 selection.op = SELECTION_INIT;
… …
3288 * a point/word/line which is either the start or end of the selection 3411 * a point/word/line which is either the start or end of the selection
3289 * and it was decided by whichever point/word/line was `fixed' at the 3412 * and it was decided by whichever point/word/line was `fixed' at the
3290 * time of the most recent button3 press 3413 * time of the most recent button3 press
3291 */ 3414 */
3292 if (button3 && buttonpress) 3415 if (button3 && buttonpress)
3416 {
3293 { /* button3 press */ 3417 /* button3 press */
3294 /* 3418 /*
3295 * first determine which edge of the selection we are closest to 3419 * first determine which edge of the selection we are closest to
3296 */ 3420 */
3297 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3421 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3298 || (!ROWCOL_IS_AFTER (pos, selection.end) 3422 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3316 selection.mark.row = selection.beg.row; 3440 selection.mark.row = selection.beg.row;
3317 selection.mark.col = selection.beg.col; 3441 selection.mark.col = selection.beg.col;
3318 } 3442 }
3319 } 3443 }
3320 else 3444 else
3445 {
3321 { /* button1 drag or button3 drag */ 3446 /* button1 drag or button3 drag */
3322 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3447 if (ROWCOL_IS_AFTER (selection.mark, pos))
3323 { 3448 {
3324 if (selection.mark.row == selection.end.row 3449 if (selection.mark.row == selection.end.row
3325 && selection.mark.col == selection.end.col 3450 && selection.mark.col == selection.end.col
3326 && clickchange 3451 && clickchange
… …
3343 3468
3344 if (selection.clicks == 1) 3469 if (selection.clicks == 1)
3345 { 3470 {
3346 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3471 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3347 && !ROW(selection.beg.row).is_longer () 3472 && !ROW(selection.beg.row).is_longer ()
3348#if ENABLE_FRILLS 3473#if !ENABLE_MINIMAL
3349 && !selection.rect 3474 && !selection.rect
3350#endif 3475#endif
3351 ) 3476 )
3352 selection.beg.col = ncol; 3477 selection.beg.col = ncol;
3353 3478
3354 if ( 3479 if (
3355 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3480 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3356 && !ROW(selection.end.row).is_longer () 3481 && !ROW(selection.end.row).is_longer ()
3357#if ENABLE_FRILLS 3482#if !ENABLE_MINIMAL
3358 && !selection.rect 3483 && !selection.rect
3359#endif 3484#endif
3360 ) 3485 )
3361 selection.end.col = ncol; 3486 selection.end.col = ncol;
3362 } 3487 }
… …
3369 selection_delimit_word (DN, &selection.end, &selection.end); 3494 selection_delimit_word (DN, &selection.end, &selection.end);
3370 } 3495 }
3371 else if (selection.clicks == 3) 3496 else if (selection.clicks == 3)
3372 { 3497 {
3373#if ENABLE_FRILLS 3498#if ENABLE_FRILLS
3374 if (OPTION (Opt_tripleclickwords)) 3499 if (option (Opt_tripleclickwords))
3375 { 3500 {
3376 selection_delimit_word (UP, &selection.beg, &selection.beg); 3501 selection_delimit_word (UP, &selection.beg, &selection.beg);
3377 3502
3378 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3503 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3379 { 3504 {
3380 if (!ROW(end_row).is_longer ()) 3505 if (!ROW(end_row).is_longer ())
3381 { 3506 {
3382 selection.end.row = end_row; 3507 selection.end.row = end_row;
3383 selection.end.col = ROW(end_row).l; 3508 selection.end.col = ROW(end_row).l;
3509# if !ENABLE_MINIMAL
3384 selection_remove_trailing_spaces (); 3510 selection_remove_trailing_spaces ();
3511# endif
3385 break; 3512 break;
3386 } 3513 }
3387 } 3514 }
3388 } 3515 }
3389 else 3516 else
… …
3405 selection.end.row++; 3532 selection.end.row++;
3406 } 3533 }
3407 } 3534 }
3408 3535
3409 if (button3 && buttonpress) 3536 if (button3 && buttonpress)
3537 {
3410 { /* mark may need to be changed */ 3538 /* mark may need to be changed */
3411 if (closeto == LEFT) 3539 if (closeto == LEFT)
3412 { 3540 {
3413 selection.mark.row = selection.end.row; 3541 selection.mark.row = selection.end.row;
3414 selection.mark.col = selection.end.col - (selection.clicks == 2); 3542 selection.mark.col = selection.end.col - (selection.clicks == 2);
3415 } 3543 }
… …
3418 selection.mark.row = selection.beg.row; 3546 selection.mark.row = selection.beg.row;
3419 selection.mark.col = selection.beg.col; 3547 selection.mark.col = selection.beg.col;
3420 } 3548 }
3421 } 3549 }
3422 3550
3423#if ENABLE_FRILLS 3551#if !ENABLE_MINIMAL
3424 if (selection.rect && selection.beg.col > selection.end.col) 3552 if (selection.rect && selection.beg.col > selection.end.col)
3425 ::swap (selection.beg.col, selection.end.col); 3553 ::swap (selection.beg.col, selection.end.col);
3426#endif 3554#endif
3427} 3555}
3428 3556
3429#if ENABLE_FRILLS 3557#if !ENABLE_MINIMAL
3430void 3558void
3431rxvt_term::selection_remove_trailing_spaces () NOTHROW 3559rxvt_term::selection_remove_trailing_spaces () NOTHROW
3432{ 3560{
3433 int32_t end_col, end_row; 3561 int32_t end_col, end_row;
3434 text_t *stp; 3562 text_t *stp;
… …
3489 */ 3617 */
3490void 3618void
3491rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3619rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3492{ 3620{
3493 XSelectionEvent ev; 3621 XSelectionEvent ev;
3494 dDisp;
3495 3622
3496 ev.type = SelectionNotify; 3623 ev.type = SelectionNotify;
3497 ev.property = None; 3624 ev.property = None;
3498 ev.display = rq.display; 3625 ev.display = rq.display;
3499 ev.requestor = rq.requestor; 3626 ev.requestor = rq.requestor;
… …
3513 *target++ = xa[XA_COMPOUND_TEXT]; 3640 *target++ = xa[XA_COMPOUND_TEXT];
3514#if X_HAVE_UTF8_STRING 3641#if X_HAVE_UTF8_STRING
3515 *target++ = xa[XA_UTF8_STRING]; 3642 *target++ = xa[XA_UTF8_STRING];
3516#endif 3643#endif
3517 3644
3518 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3645 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3519 32, PropModeReplace, 3646 32, PropModeReplace,
3520 (unsigned char *)target_list, target - target_list); 3647 (unsigned char *)target_list, target - target_list);
3521 ev.property = rq.property; 3648 ev.property = rq.property;
3522 } 3649 }
3523#if TODO // TODO 3650#if TODO // TODO
3524 else if (rq.target == xa[XA_MULTIPLE]) 3651 else if (rq.target == xa[XA_MULTIPLE])
3525 { 3652 {
3526 /* TODO: Handle MULTIPLE */ 3653 /* TODO: Handle MULTIPLE */
3527 } 3654 }
3528#endif 3655#endif
3529 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3530 { 3657 {
3531 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3532 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3659 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3660 ev.property = rq.property;
3661 }
3662 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3663 {
3664 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3665 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3533 ev.property = rq.property; 3666 ev.property = rq.property;
3534 } 3667 }
3535 else if (rq.target == XA_STRING 3668 else if (rq.target == XA_STRING
3536 || rq.target == xa[XA_TEXT] 3669 || rq.target == xa[XA_TEXT]
3537 || rq.target == xa[XA_COMPOUND_TEXT] 3670 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3560 style = enc_string; 3693 style = enc_string;
3561 else if (target == xa[XA_TEXT]) 3694 else if (target == xa[XA_TEXT])
3562 style = enc_text; 3695 style = enc_text;
3563 else if (target == xa[XA_COMPOUND_TEXT]) 3696 else if (target == xa[XA_COMPOUND_TEXT])
3564 style = enc_compound_text; 3697 style = enc_compound_text;
3565#if ENABLE_FRILLS 3698#if !ENABLE_MINIMAL
3566 else if (target == xa[XA_UTF8_STRING]) 3699 else if (target == xa[XA_UTF8_STRING])
3567 style = enc_utf8; 3700 style = enc_utf8;
3568#endif 3701#endif
3569 else 3702 else
3570 { 3703 {
3571 target = xa[XA_COMPOUND_TEXT]; 3704 target = xa[XA_COMPOUND_TEXT];
3572 style = enc_compound_text; 3705 style = enc_compound_text;
3573 } 3706 }
3574 3707
3575 if (selection.text) 3708 if (rq.selection == XA_PRIMARY && selection.text)
3576 { 3709 {
3577 cl = selection.text; 3710 cl = selection.text;
3578 selectlen = selection.len; 3711 selectlen = selection.len;
3579 } 3712 }
3713 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3714 {
3715 cl = selection.clip_text;
3716 selectlen = selection.clip_len;
3717 }
3580 else 3718 else
3581 { 3719 {
3582 cl = L""; 3720 cl = L"";
3583 selectlen = 0; 3721 selectlen = 0;
3584 } 3722 }
3585 3723
3586#if ENABLE_FRILLS 3724#if !ENABLE_MINIMAL
3587 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3725 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3588 // so recode it manually 3726 // so recode it manually
3589 if (style == enc_utf8) 3727 if (style == enc_utf8)
3590 { 3728 {
3591 freect = 1; 3729 freect = 1;
… …
3594 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3732 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3595 ct.nitems = strlen ((char *)ct.value); 3733 ct.nitems = strlen ((char *)ct.value);
3596 } 3734 }
3597 else 3735 else
3598#endif 3736#endif
3599 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3737 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3600 freect = 1; 3738 freect = 1;
3601 else 3739 else
3602 { 3740 {
3603 /* if we failed to convert then send it raw */ 3741 /* if we failed to convert then send it raw */
3604 ct.value = (unsigned char *)cl; 3742 ct.value = (unsigned char *)cl;
3605 ct.nitems = selectlen; 3743 ct.nitems = selectlen;
3606 ct.encoding = target; 3744 ct.encoding = target;
3607 } 3745 }
3608 3746
3609 XChangeProperty (disp, rq.requestor, rq.property, 3747 XChangeProperty (dpy, rq.requestor, rq.property,
3610 ct.encoding, 8, PropModeReplace, 3748 ct.encoding, 8, PropModeReplace,
3611 ct.value, (int)ct.nitems); 3749 ct.value, (int)ct.nitems);
3612 ev.property = rq.property; 3750 ev.property = rq.property;
3613 3751
3614 if (freect) 3752 if (freect)
3615 XFree (ct.value); 3753 XFree (ct.value);
3616 } 3754 }
3617 3755
3618 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3756 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3619}
3620
3621/* ------------------------------------------------------------------------- *
3622 * MOUSE ROUTINES *
3623 * ------------------------------------------------------------------------- */
3624
3625/*
3626 * return col/row values corresponding to x/y pixel values
3627 */
3628void
3629rxvt_term::pixel_position (int *x, int *y) NOTHROW
3630{
3631 *x = Pixel2Col (*x);
3632 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3633 *y = Pixel2Row (*y);
3634 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3635} 3757}
3636 3758
3637/* ------------------------------------------------------------------------- */ 3759/* ------------------------------------------------------------------------- */
3638#ifdef USE_XIM 3760#ifdef USE_XIM
3639void 3761void
3640rxvt_term::im_set_position (XPoint &pos) NOTHROW 3762rxvt_term::im_set_position (XPoint &pos) NOTHROW
3641{ 3763{
3642 XWindowAttributes xwa; 3764 XWindowAttributes xwa;
3643 3765
3644 XGetWindowAttributes (display->display, vt, &xwa); 3766 XGetWindowAttributes (dpy, vt, &xwa);
3645 3767
3646 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3768 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3647 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3769 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3648} 3770}
3649#endif 3771#endif
… …
3667 h += 2; min_it (h, nrow); 3789 h += 2; min_it (h, nrow);
3668 3790
3669 x -= 1; clamp_it (x, 0, ncol - w); 3791 x -= 1; clamp_it (x, 0, ncol - w);
3670 y -= 1; clamp_it (y, 0, nrow - h); 3792 y -= 1; clamp_it (y, 0, nrow - h);
3671 3793
3672 ov_x = x; ov_y = y; 3794 ov.x = x; ov.y = y;
3673 ov_w = w; ov_h = h; 3795 ov.w = w; ov.h = h;
3674 3796
3675 ov_text = new text_t *[h]; 3797 ov.text = new text_t *[h];
3676 ov_rend = new rend_t *[h]; 3798 ov.rend = new rend_t *[h];
3677 3799
3678 for (y = 0; y < h; y++) 3800 for (y = 0; y < h; y++)
3679 { 3801 {
3680 text_t *tp = ov_text[y] = new text_t[w]; 3802 text_t *tp = ov.text[y] = new text_t[w];
3681 rend_t *rp = ov_rend[y] = new rend_t[w]; 3803 rend_t *rp = ov.rend[y] = new rend_t[w];
3682 3804
3683 text_t t0, t1, t2; 3805 text_t t0, t1, t2;
3684 rend_t r = OVERLAY_RSTYLE; 3806 rend_t r = OVERLAY_RSTYLE;
3685 3807
3686 if (y == 0) 3808 if (y == 0)
… …
3705} 3827}
3706 3828
3707void 3829void
3708rxvt_term::scr_overlay_off () NOTHROW 3830rxvt_term::scr_overlay_off () NOTHROW
3709{ 3831{
3710 if (!ov_text) 3832 if (!ov.text)
3711 return; 3833 return;
3712 3834
3713 want_refresh = 1; 3835 want_refresh = 1;
3714 3836
3715 for (int y = 0; y < ov_h; y++) 3837 for (int y = 0; y < ov.h; y++)
3716 { 3838 {
3717 delete [] ov_text[y]; 3839 delete [] ov.text[y];
3718 delete [] ov_rend[y]; 3840 delete [] ov.rend[y];
3719 } 3841 }
3720 3842
3721 delete [] ov_text; ov_text = 0; 3843 delete [] ov.text; ov.text = 0;
3722 delete [] ov_rend; ov_rend = 0; 3844 delete [] ov.rend; ov.rend = 0;
3723} 3845}
3724 3846
3725void 3847void
3726rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3848rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3727{ 3849{
3728 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3850 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3729 return; 3851 return;
3730 3852
3731 x++, y++; 3853 x++, y++;
3732 3854
3733 ov_text[y][x] = text; 3855 ov.text[y][x] = text;
3734 ov_rend[y][x] = rend; 3856 ov.rend[y][x] = rend;
3735} 3857}
3736 3858
3737void 3859void
3738rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3860rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3739{ 3861{
… …
3745rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3867rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3746{ 3868{
3747 while (*s) 3869 while (*s)
3748 { 3870 {
3749 text_t t = *s++; 3871 text_t t = *s++;
3750 int width = wcwidth (t); 3872 int width = WCWIDTH (t);
3751 3873
3752 while (width--) 3874 while (width--)
3753 { 3875 {
3754 scr_overlay_set (x++, y, t); 3876 scr_overlay_set (x++, y, t);
3755 t = NOCHAR; 3877 t = NOCHAR;
… …
3758} 3880}
3759 3881
3760void 3882void
3761rxvt_term::scr_swap_overlay () NOTHROW 3883rxvt_term::scr_swap_overlay () NOTHROW
3762{ 3884{
3763 if (!ov_text) 3885 if (!ov.text)
3764 return; 3886 return;
3765 3887
3888 // hide cursor if it is within the overlay area
3889 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3890 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3891 screen.flags &= ~Screen_VisibleCursor;
3892
3766 // swap screen mem with overlay 3893 // swap screen mem with overlay
3767 for (int y = ov_h; y--; ) 3894 for (int y = ov.h; y--; )
3768 { 3895 {
3769 text_t *t1 = ov_text[y]; 3896 text_t *t1 = ov.text[y];
3770 rend_t *r1 = ov_rend[y]; 3897 rend_t *r1 = ov.rend[y];
3771 3898
3772 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3899 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3773 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3900 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3774 3901
3775 for (int x = ov_w; x--; ) 3902 for (int x = ov.w; x--; )
3776 { 3903 {
3777 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3904 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3778 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3905 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3779 } 3906 }
3780 } 3907 }

Diff Legend

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