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

Diff Legend

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