ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.244 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.409 by sf-exg, Mon Nov 21 18:35:52 2011 UTC

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

Diff Legend

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