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.245 by root, Fri Jan 20 10:35:25 2006 UTC vs.
Revision 1.404 by sf-exg, Tue Nov 15 20:07:10 2011 UTC

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

Diff Legend

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