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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.245 by root, Fri Jan 20 10:35:25 2006 UTC vs.
Revision 1.323 by root, Tue Nov 4 23:53:29 2008 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 86
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 89 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 91 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 95
114/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
117 99
… …
126 width = ncol; 108 width = ncol;
127 } 109 }
128 110
129 l.touch (); 111 l.touch ();
130 112
131 efs &= ~RS_baseattrMask; 113 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 114 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 115
134 text_t *et = l.t + col; 116 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 117 rend_t *er = l.r + col;
136 118
… …
148{ 130{
149 scr_blank_line (l, 0, ncol, efs); 131 scr_blank_line (l, 0, ncol, efs);
150 132
151 l.l = 0; 133 l.l = 0;
152 l.f = 0; 134 l.f = 0;
135}
136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
153} 154}
154 155
155/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
158 159
159void 160void
160rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
161{ 162{
162#if ENABLE_OVERLAY 163 scr_soft_reset ();
163 scr_overlay_off ();
164#endif
165 164
166 view_start = 0; 165 view_start = 0;
167 num_scr = 0; 166 num_scr = 0;
168 167
169 if (ncol == 0) 168 if (ncol == 0)
… …
174 173
175 if (ncol == prev_ncol && nrow == prev_nrow) 174 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 175 return;
177 176
178 // we need at least two lines for wrapping to work correctly 177 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 178 while (nrow + saveLines < 2)
180 { 179 {
181 //TODO//FIXME 180 //TODO//FIXME
182 saveLines++; 181 saveLines++;
183 prev_nrow--; 182 prev_nrow--;
184 top_row--; 183 top_row--;
… …
195 if (!row_buf) 194 if (!row_buf)
196 { 195 {
197 /* 196 /*
198 * first time called so just malloc everything: don't rely on realloc 197 * first time called so just malloc everything: don't rely on realloc
199 */ 198 */
200 top_row = 0; /* no saved lines */ 199 top_row = 0;
201 term_start = 0; 200 term_start = 0;
202 201
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 202 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 203 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 204
… …
234 selection.text = NULL; 233 selection.text = NULL;
235 selection.len = 0; 234 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 235 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 236 selection.screen = PRIMARY;
238 selection.clicks = 0; 237 selection.clicks = 0;
239 rvideo = 0;
240 } 238 }
241 else 239 else
242 { 240 {
243 /* 241 /*
244 * add or delete rows as appropriate 242 * add or delete rows as appropriate
… …
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 } 272 }
275 273
276 line_t *old_buf = row_buf; 274 line_t *old_buf = row_buf;
277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 275 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
278 276
279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start + top_row , prev_total_rows); 278 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 279 int q = total_rows; // rewrapped row
282 280
283 if (top_row) 281 if (top_row)
284 { 282 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb 283 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm. 284 // to come up with a lean and mean algorithm.
287 285
288 row_col_t ocur = screen.cur; 286 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 287 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 288
… …
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);
405
406 if (tabs)
407 free (tabs);
408 } 398 }
409 399
410 CLEAR_ALL_SELECTION (); 400 CLEAR_ALL_SELECTION ();
411 401
412 prev_nrow = nrow; 402 prev_nrow = nrow;
413 prev_ncol = ncol; 403 prev_ncol = ncol;
414 404
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 (); 405 tt_winch ();
421 406
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 407 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 408}
424 409
… …
427 * Free everything. That way malloc debugging can find leakage. 412 * Free everything. That way malloc debugging can find leakage.
428 */ 413 */
429void 414void
430rxvt_term::scr_release () NOTHROW 415rxvt_term::scr_release () NOTHROW
431{ 416{
417 if (row_buf)
418 {
432 delete talloc; talloc = 0; 419 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0; 420 delete ralloc; ralloc = 0;
434 421
435 free (row_buf); 422 free (row_buf);
436 free (swap_buf); 423 free (swap_buf);
437 free (drawn_buf); 424 free (drawn_buf);
438 free (tabs);
439
440 row_buf = 0; // signal that we freed all the arrays 425 row_buf = 0; // signal that we freed all the arrays above
441}
442 426
427 free (tabs);
428 tabs = 0;
429 }
430}
431
443/* ------------------------------------------------------------------------- */ 432/* ------------------------------------------------------------------------- */
444/* 433/*
445 * Hard reset 434 * Hard/Soft reset
446 */ 435 */
447void 436void
448rxvt_term::scr_poweron () NOTHROW 437rxvt_term::scr_poweron ()
449{ 438{
450 scr_release (); 439 scr_release ();
451 prev_nrow = prev_ncol = 0; 440 prev_nrow = prev_ncol = 0;
452 scr_reset (); 441 scr_reset ();
453 442
454 scr_clear (true); 443 scr_clear (true);
455 scr_refresh (); 444 scr_refresh ();
445}
446
447void
448rxvt_term::scr_soft_reset ()
449{
450 /* only affects modes, nothing drastic such as clearing the screen */
451#if ENABLE_OVERLAY
452 scr_overlay_off ();
453#endif
454
455 rvideo_mode = false;
456
457 if (current_screen != PRIMARY)
458 scr_swap_screen ();
459
460 free (tabs);
461 tabs = (char *)rxvt_malloc (ncol);
462
463 for (int col = ncol; --col; )
464 tabs [col] = col % TABSIZE == 0;
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 * ------------------------------------------------------------------------- */
… …
504 assert (s->cur.row >= 0); 517 assert (s->cur.row >= 0);
505 assert (s->cur.col >= 0); 518 assert (s->cur.col >= 0);
506#endif 519#endif
507} 520}
508 521
522void
523rxvt_term::scr_swap_screen ()
524{
525 if (!option (Opt_secondaryScreen))
526 return;
527
528 for (int i = prev_nrow; i--; )
529 ::swap (ROW(i), swap_buf [i]);
530
531 ::swap (screen.cur, swap.cur);
532
533 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
534 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
535}
536
509/* ------------------------------------------------------------------------- */ 537/* ------------------------------------------------------------------------- */
510/* 538/*
511 * Swap between primary and secondary screens 539 * Swap between primary and secondary screens
512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 540 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 541 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514 */ 542 */
515int 543void
516rxvt_term::scr_change_screen (int scrn) NOTHROW 544rxvt_term::scr_change_screen (int scrn)
517{ 545{
546 if (scrn == current_screen)
547 return;
548
518 want_refresh = 1; 549 want_refresh = 1;
519 view_start = 0; 550 view_start = 0;
520 551
521 if (current_screen == scrn)
522 return scrn;
523
524 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
525 553
526 int i = current_screen; current_screen = scrn; scrn = i; 554 int i = current_screen; current_screen = scrn; scrn = i;
527 555
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
534#if NSCREENS 556#if NSCREENS
535 if (OPTION (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
536 { 558 {
537 num_scr = 0; 559 num_scr = 0;
538 560
539 for (int i = prev_nrow; i--; ) 561 scr_swap_screen ();
540 ::swap (ROW(i), swap_buf [i]);
541 562
542 ::swap (screen.charset, swap.charset); 563 ::swap (screen.charset, swap.charset);
543 ::swap (screen.flags, swap.flags); 564 ::swap (screen.flags, swap.flags);
544 screen.flags |= Screen_VisibleCursor; 565 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 566 swap.flags |= Screen_VisibleCursor;
546 } 567 }
547 else 568 else
548#endif 569#endif
549 if (OPTION (Opt_secondaryScroll)) 570 if (option (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 571 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552 return scrn;
553} 572}
554 573
555// clear WrapNext indicator, solidifying position on next line 574// clear WrapNext indicator, solidifying position on next line
556void 575void
557rxvt_term::scr_do_wrap () NOTHROW 576rxvt_term::scr_do_wrap () NOTHROW
… …
589/* 608/*
590 * Change the rendition style for following text 609 * Change the rendition style for following text
591 */ 610 */
592void 611void
593rxvt_term::scr_rendition (int set, int style) NOTHROW 612rxvt_term::scr_rendition (int set, int style) NOTHROW
594 { 613{
595 if (set) 614 if (set)
596 rstyle |= style; 615 rstyle |= style;
597 else if (style == ~RS_None) 616 else if (style == ~RS_None)
598 rstyle = DEFAULT_RSTYLE; 617 rstyle = DEFAULT_RSTYLE;
599 else 618 else
600 rstyle &= ~style; 619 rstyle &= ~style;
601 } 620}
602 621
603/* ------------------------------------------------------------------------- */ 622/* ------------------------------------------------------------------------- */
604/* 623/*
605 * Scroll text between <row1> and <row2> inclusive, by <count> lines 624 * Scroll text between <row1> and <row2> inclusive, by <count> lines
606 * count positive ==> scroll up 625 * count positive ==> scroll up
… …
615 want_refresh = 1; 634 want_refresh = 1;
616 num_scr += count; 635 num_scr += count;
617 636
618 if (count > 0 637 if (count > 0
619 && row1 == 0 638 && row1 == 0
620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 639 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
621 { 640 {
622 top_row = max (top_row - count, -saveLines); 641 top_row = max (top_row - count, -saveLines);
623 642
624 // scroll everything up 'count' lines 643 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 644 term_start = (term_start + count) % total_rows;
… …
632 } 651 }
633 652
634 // erase newly scrolled-in lines 653 // erase newly scrolled-in lines
635 for (int i = count; i--; ) 654 for (int i = count; i--; )
636 { 655 {
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); 656 line_t &l = ROW(nrow - 1 - i);
640 657
658 // optimize if already cleared, can be significant on slow machines
659 // could be rolled into scr_blank_screen_mem
660 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
661 {
641 scr_blank_line (l, 0, l.l, rstyle); 662 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0; 663 l.l = 0;
644 l.f = 0; 664 l.f = 0;
665 }
666 else
667 scr_blank_screen_mem (l, rstyle);
645 } 668 }
646 669
647 // now copy lines below the scroll region bottom to the 670 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 671 // bottom of the screen again, so they look as if they
649 // hadn't moved. 672 // hadn't moved.
… …
653 line_t &l2 = ROW(i); 676 line_t &l2 = ROW(i);
654 677
655 ::swap (l1, l2); 678 ::swap (l1, l2);
656 l2.touch (); 679 l2.touch ();
657 } 680 }
658 681
659 // move and/or clear selection, if any 682 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
661 { 684 {
662 selection.beg.row -= count; 685 selection.beg.row -= count;
663 selection.end.row -= count; 686 selection.end.row -= count;
… …
671 selection.op = SELECTION_CLEAR; 694 selection.op = SELECTION_CLEAR;
672 } 695 }
673 } 696 }
674 697
675 // finally move the view window, if desired 698 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 699 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 700 && view_start != 0
678 && view_start != -saveLines) 701 && view_start != -saveLines)
679 scr_page (UP, count); 702 scr_page (UP, count);
680 703
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 704 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
699 { 722 {
700 /* move selected region too */ 723 /* move selected region too */
701 selection.beg.row -= count; 724 selection.beg.row -= count;
702 selection.end.row -= count; 725 selection.end.row -= count;
703 selection.mark.row -= count; 726 selection.mark.row -= count;
704 727
705 selection_check (0); 728 selection_check (0);
706 } 729 }
707 } 730 }
708 731
709 // use a simple and robust scrolling algorithm, this 732 // use a simple and robust scrolling algorithm, this
… …
749 ZERO_SCROLLBACK (); 772 ZERO_SCROLLBACK ();
750 773
751 if (minlines > 0) 774 if (minlines > 0)
752 { 775 {
753 minlines += screen.cur.row - screen.bscroll; 776 minlines += screen.cur.row - screen.bscroll;
777 min_it (minlines, screen.cur.row - top_row);
754 778
755 if (minlines > 0 779 if (minlines > 0
756 && screen.tscroll == 0 780 && screen.tscroll == 0
757 && screen.bscroll == nrow - 1) 781 && screen.bscroll == nrow - 1)
758 { 782 {
… …
775 799
776 while (str < strend) 800 while (str < strend)
777 { 801 {
778 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
779 803
780 if (c < 0x20) 804 if (expect_false (c < 0x20))
781 if (c == C0_LF) 805 if (c == C0_LF)
782 { 806 {
783 max_it (line->l, screen.cur.col); 807 max_it (line->l, screen.cur.col);
784 808
785 screen.flags &= ~Screen_WrapNext; 809 screen.flags &= ~Screen_WrapNext;
… …
804 { 828 {
805 scr_tab (1, true); 829 scr_tab (1, true);
806 continue; 830 continue;
807 } 831 }
808 832
833 if (expect_false (
809 if (checksel /* see if we're writing within selection */ 834 checksel /* see if we're writing within selection */
810 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
811 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 836 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
837 ))
812 { 838 {
813 checksel = 0; 839 checksel = 0;
814 /* 840 /*
815 * If we wrote anywhere in the selected area, kill the selection 841 * If we wrote anywhere in the selected area, kill the selection
816 * XXX: should we kill the mark too? Possibly, but maybe that 842 * XXX: should we kill the mark too? Possibly, but maybe that
817 * should be a similar check. 843 * should be a similar check.
818 */ 844 */
819 CLEAR_SELECTION (); 845 CLEAR_SELECTION ();
820 } 846 }
821 847
822 if (screen.flags & Screen_WrapNext) 848 if (expect_false (screen.flags & Screen_WrapNext))
823 { 849 {
824 scr_do_wrap (); 850 scr_do_wrap ();
825 851
826 line->l = ncol; 852 line->l = ncol;
827 line->is_longer (1); 853 line->is_longer (1);
828 854
829 row = screen.cur.row; 855 row = screen.cur.row;
830 line = &ROW(row); /* _must_ refresh */ 856 line = &ROW(row); /* _must_ refresh */
831 } 857 }
832 858
833 // some utf-8 decoders "decode" surrogate characters: let's fix this. 859 // some utf-8 decoders "decode" surrogate characters: let's fix this.
834 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 860 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
835 c = 0xfffd; 861 c = 0xfffd;
836 862
837 // rely on wcwidth to tell us the character width, at least for non-latin1 863 // rely on wcwidth to tell us the character width, do wcwidth before
838 // do wcwidth before further replacements, as wcwidth might return -1 864 // 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 865 // drawing characters below as they might be invalid in the current
840 // locale. 866 // locale.
841 int width = c < 0x100 ? 1 : wcwidth (c); 867 int width = WCWIDTH (c);
842 868
843 if (charsets [screen.charset] == '0') // DEC SPECIAL 869 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
844 { 870 {
845 // vt100 special graphics and line drawing 871 // vt100 special graphics and line drawing
846 // 5f-7e standard vt100 872 // 5f-7e standard vt100
847 // 40-5e rxvt extension for extra curses acs chars 873 // 40-5e rxvt extension for extra curses acs chars
848 static uint16_t vt100_0[62] = { // 41 .. 7e 874 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
861 c = vt100_0[c - 0x41]; 887 c = vt100_0[c - 0x41];
862 width = 1; // vt100 line drawing characters are always single-width 888 width = 1; // vt100 line drawing characters are always single-width
863 } 889 }
864 } 890 }
865 891
866 if (screen.flags & Screen_Insert) 892 if (expect_false (screen.flags & Screen_Insert))
867 scr_insdel_chars (width, INSERT); 893 scr_insdel_chars (width, INSERT);
868 894
869 if (width != 0) 895 if (width != 0)
870 { 896 {
871#if !UNICODE_3 897#if !UNICODE_3
… …
877 c = 0xfffd; 903 c = 0xfffd;
878# endif 904# endif
879#endif 905#endif
880 906
881 // nuke the character at this position, if required 907 // nuke the character at this position, if required
908 if (expect_false (
882 if (line->t[screen.cur.col] == NOCHAR 909 line->t[screen.cur.col] == NOCHAR
883 || (screen.cur.col < ncol - 1 910 || (screen.cur.col < ncol - 1
884 && line->t[screen.cur.col + 1] == NOCHAR)) 911 && line->t[screen.cur.col + 1] == NOCHAR)
912 ))
913 scr_kill_char (*line, screen.cur.col);
914
915 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
916
917 // if the character doesn't fit into the remaining columns...
918 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
885 { 919 {
886 int col = screen.cur.col; 920 // ... artificially enlargen the previous one
887
888 // find begin
889 while (col > 0 && line->t[col] == NOCHAR)
890 col--;
891
892 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
893
894 // found begin, nuke
895 do {
896 line->t[col] = ' ';
897 line->r[col] = rend;
898 col++;
899 } while (col < ncol && line->t[col] == NOCHAR);
900 }
901
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903
904 // if the character doesn't fit into the remaining columns...
905 if (screen.cur.col > ncol - width && ncol >= width)
906 {
907 // ...output spaces
908 c = ' '; 921 c = NOCHAR;
909 // and try the same character next loop iteration 922 // and try the same character next loop iteration
910 --str; 923 --str;
911 } 924 }
912 925
913 line->touch (); 926 line->touch ();
… …
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)
… …
927 break; 940 break;
928 } 941 }
929 942
930 c = NOCHAR; 943 c = NOCHAR;
931 } 944 }
932 while (--width > 0); 945 while (expect_false (--width > 0));
933 946
934 // pad with spaces when overwriting wide character with smaller one 947 // pad with spaces when overwriting wide character with smaller one
935 if (!width) 948 if (expect_false (!width))
936 { 949 {
937 line->touch (); 950 line->touch ();
938 951
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 952 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
940 { 953 {
941 line->t[c] = ' '; 954 line->t[c] = ' ';
942 line->r[c] = rend; 955 line->r[c] = rend;
943 } 956 }
944 } 957 }
945 } 958 }
959#if ENABLE_COMBINING
946 else // width == 0 960 else // width == 0
947 { 961 {
948#if ENABLE_COMBINING 962 if (c != 0xfeff) // ignore BOM
949 // handle combining characters
950 // we just tag the accent on the previous on-screen character.
951 // this is arguably not correct, but also arguably not wrong.
952 // we don't handle double-width characters nicely yet.
953 line_t *linep;
954 text_t *tp;
955 rend_t *rp;
956
957 if (screen.cur.col > 0)
958 { 963 {
964 // handle combining characters
965 // we just tag the accent on the previous on-screen character.
966 // this is arguably not correct, but also arguably not wrong.
967 // we don't handle double-width characters nicely yet.
968 line_t *linep;
969 text_t *tp;
970 rend_t *rp;
971
972 if (screen.cur.col > 0)
973 {
959 linep = line; 974 linep = line;
960 tp = line->t + screen.cur.col - 1; 975 tp = line->t + screen.cur.col - 1;
961 rp = line->r + screen.cur.col - 1; 976 rp = line->r + screen.cur.col - 1;
977 }
978 else if (screen.cur.row > 0
979 && ROW(screen.cur.row - 1).is_longer ())
980 {
981 linep = &ROW(screen.cur.row - 1);
982 tp = line->t + ncol - 1;
983 rp = line->r + ncol - 1;
984 }
985 else
986 continue;
987
988 linep->touch ();
989
990 while (*tp == NOCHAR && tp > linep->t)
991 tp--, rp--;
992
993 // first try to find a precomposed character
994 unicode_t n = rxvt_compose (*tp, c);
995 if (n == NOCHAR)
996 n = rxvt_composite.compose (*tp, c);
997
998 *tp = n;
999 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
962 } 1000 }
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 } 1001 }
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 1002#endif
986 }
987 } 1003 }
988 1004
989 max_it (line->l, screen.cur.col); 1005 max_it (line->l, screen.cur.col);
990 1006
991#ifdef DEBUG_STRICT 1007#ifdef DEBUG_STRICT
… …
999 * XTERM_SEQ: CTRL-H 1015 * XTERM_SEQ: CTRL-H
1000 */ 1016 */
1001void 1017void
1002rxvt_term::scr_backspace () NOTHROW 1018rxvt_term::scr_backspace () NOTHROW
1003{ 1019{
1004 want_refresh = 1;
1005
1006 if (screen.cur.col == 0) 1020 if (screen.cur.col == 0)
1007 { 1021 {
1008 if (screen.cur.row > 0) 1022 if (screen.cur.row > 0)
1009 { 1023 {
1010#ifdef TERMCAP_HAS_BW 1024#ifdef TERMCAP_HAS_BW
1011 screen.cur.col = ncol - 1; 1025 screen.cur.col = ncol - 1;
1012 screen.cur.row--; 1026 --screen.cur.row;
1013 return; 1027
1028 want_refresh = 1;
1014#endif 1029#endif
1015 } 1030 }
1016 } 1031 }
1017 else if (!(screen.flags & Screen_WrapNext)) 1032 else
1018 scr_gotorc (0, -1, RELATIVE); 1033 scr_gotorc (0, -1, RELATIVE);
1019
1020 screen.flags &= ~Screen_WrapNext;
1021} 1034}
1022 1035
1023/* ------------------------------------------------------------------------- */ 1036/* ------------------------------------------------------------------------- */
1024/* 1037/*
1025 * Process Horizontal Tab 1038 * Process Horizontal Tab
… …
1048 x = i; 1061 x = i;
1049 1062
1050 if (!--count) 1063 if (!--count)
1051 break; 1064 break;
1052 } 1065 }
1053 else 1066 else
1054 ht &= l.t[i] == ' ' 1067 ht &= l.t[i] == ' '
1055 && RS_SAME (l.r[i], base_rend); 1068 && RS_SAME (l.r[i], base_rend);
1056 1069
1057 if (count) 1070 if (count)
1058 x = ncol - 1; 1071 x = ncol - 1;
1059 1072
1060 // store horizontal tab commands as characters inside the text 1073 // store horizontal tab commands as characters inside the text
1061 // buffer so they can be selected and pasted. 1074 // buffer so they can be selected and pasted.
1062 if (ht && OPTION (Opt_pastableTabs)) 1075 if (ht && option (Opt_pastableTabs))
1063 { 1076 {
1064 base_rend = SET_FONT (base_rend, 0); 1077 base_rend = SET_FONT (base_rend, 0);
1065 1078
1066 l.touch (x); 1079 l.touch (x);
1067 1080
… …
1100 * Process DEC Back Index 1113 * Process DEC Back Index
1101 * XTERM_SEQ: ESC 6 1114 * XTERM_SEQ: ESC 6
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1115 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1116 * in that row right. Clear left column.
1104 */ 1117 */
1105#if ENABLE_FRILLS 1118#if !ENABLE_MINIMAL
1106void 1119void
1107rxvt_term::scr_backindex () NOTHROW 1120rxvt_term::scr_backindex () NOTHROW
1108{ 1121{
1109 if (screen.cur.col > 0) 1122 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1123 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1117 * Process DEC Forward Index 1130 * Process DEC Forward Index
1118 * XTERM_SEQ: ESC 9 1131 * XTERM_SEQ: ESC 9
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1132 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1133 * in that row left. Clear right column.
1121 */ 1134 */
1122#if ENABLE_FRILLS 1135#if !ENABLE_MINIMAL
1123void 1136void
1124rxvt_term::scr_forwardindex () NOTHROW 1137rxvt_term::scr_forwardindex () NOTHROW
1125{ 1138{
1126 if (screen.cur.col < ncol - 1) 1139 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1140 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1174 } 1187 }
1175 } 1188 }
1176 else 1189 else
1177 { 1190 {
1178 if (screen.flags & Screen_Relative) 1191 if (screen.flags & Screen_Relative)
1192 {
1179 { /* relative origin mode */ 1193 /* relative origin mode */
1180 screen.cur.row = row + screen.tscroll; 1194 screen.cur.row = row + screen.tscroll;
1181 min_it (screen.cur.row, screen.bscroll); 1195 min_it (screen.cur.row, screen.bscroll);
1182 } 1196 }
1183 else 1197 else
1184 screen.cur.row = row; 1198 screen.cur.row = row;
… …
1217/* 1231/*
1218 * Erase part or whole of a line 1232 * Erase part or whole of a line
1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1236 * extension: clear to right unless wrapped: ESC [ 3 K
1222 */ 1237 */
1223void 1238void
1224rxvt_term::scr_erase_line (int mode) NOTHROW 1239rxvt_term::scr_erase_line (int mode) NOTHROW
1225{ 1240{
1226 unsigned int col, num; 1241 unsigned int col, num;
… …
1235 line.touch (); 1250 line.touch ();
1236 line.is_longer (0); 1251 line.is_longer (0);
1237 1252
1238 switch (mode) 1253 switch (mode)
1239 { 1254 {
1255 case 3:
1256 if (screen.flags & Screen_WrapNext)
1257 return;
1258
1259 /* fall through */
1260
1240 case 0: /* erase to end of line */ 1261 case 0: /* erase to end of line */
1241 col = screen.cur.col; 1262 col = screen.cur.col;
1242 num = ncol - col; 1263 num = ncol - col;
1243 min_it (line.l, col); 1264 min_it (line.l, col);
1265
1244 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1245 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1246 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1247 break; 1269 break;
1270
1248 case 1: /* erase to beginning of line */ 1271 case 1: /* erase to beginning of line */
1249 col = 0; 1272 col = 0;
1250 num = screen.cur.col + 1; 1273 num = screen.cur.col + 1;
1274
1251 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1275 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1252 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1276 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1253 CLEAR_SELECTION (); 1277 CLEAR_SELECTION ();
1254 break; 1278 break;
1279
1255 case 2: /* erase whole line */ 1280 case 2: /* erase whole line */
1256 col = 0; 1281 col = 0;
1257 num = ncol; 1282 num = ncol;
1258 line.l = 0; 1283 line.l = 0;
1259 if (selection.beg.row <= screen.cur.row 1284 if (selection.beg.row <= screen.cur.row
… …
1317 if (row >= nrow) /* Out Of Bounds */ 1342 if (row >= nrow) /* Out Of Bounds */
1318 return; 1343 return;
1319 1344
1320 min_it (num, nrow - row); 1345 min_it (num, nrow - row);
1321 1346
1347 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1322 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_RVid | RS_Uline))
1323 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1324 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1325 { 1351 {
1326 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1327 CLEAR_ROWS (row, num); 1353
1354 if (mapped && !view_start)
1355 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False);
1328 } 1358 }
1329 else 1359 else
1330 { 1360 {
1331 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1362
1363 if (mapped && !view_start)
1364 {
1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 ERASE_ROWS (row, num); 1367 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start),
1369 (unsigned int)width,
1370 (unsigned int)Height2Pixel (num));
1335 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1336 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 }
1337 } 1374 }
1338 1375
1339 for (; num--; row++) 1376 for (; num--; row++)
1340 { 1377 {
1341 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1379 if (!view_start)
1342 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1380 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1343 } 1381 }
1344} 1382}
1345 1383
1346#if ENABLE_FRILLS 1384#if !ENABLE_MINIMAL
1347void 1385void
1348rxvt_term::scr_erase_savelines () NOTHROW 1386rxvt_term::scr_erase_savelines () NOTHROW
1349{ 1387{
1350 want_refresh = 1; 1388 want_refresh = 1;
1351 ZERO_SCROLLBACK (); 1389 ZERO_SCROLLBACK ();
… …
1421 * Insert/Delete <count> characters from the current position 1459 * Insert/Delete <count> characters from the current position
1422 */ 1460 */
1423void 1461void
1424rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1462rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1425{ 1463{
1426 int col, row;
1427 rend_t tr;
1428
1429 want_refresh = 1; 1464 want_refresh = 1;
1430 ZERO_SCROLLBACK (); 1465 ZERO_SCROLLBACK ();
1431 1466
1432 if (count <= 0) 1467 if (count <= 0)
1433 return; 1468 return;
… …
1435 scr_do_wrap (); 1470 scr_do_wrap ();
1436 1471
1437 selection_check (1); 1472 selection_check (1);
1438 min_it (count, ncol - screen.cur.col); 1473 min_it (count, ncol - screen.cur.col);
1439 1474
1440 row = screen.cur.row; 1475 int row = screen.cur.row;
1441 1476
1442 line_t *line = &ROW(row); 1477 line_t *line = &ROW(row);
1443 1478
1444 line->touch (); 1479 line->touch ();
1445 line->is_longer (0); 1480 line->is_longer (0);
1446 1481
1482 // nuke wide spanning the start
1483 if (line->t[screen.cur.col] == NOCHAR)
1484 scr_kill_char (*line, screen.cur.col);
1485
1447 switch (insdel) 1486 switch (insdel)
1448 { 1487 {
1449 case INSERT: 1488 case INSERT:
1450 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1489 line->l = min (line->l + count, ncol);
1490
1491 if (line->t[screen.cur.col] == NOCHAR)
1492 scr_kill_char (*line, screen.cur.col);
1493
1494 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1451 { 1495 {
1452 line->t[col] = line->t[col - count]; 1496 line->t[col] = line->t[col - count];
1453 line->r[col] = line->r[col - count]; 1497 line->r[col] = line->r[col - count];
1454 } 1498 }
1455
1456 line->l = min (line->l + count, ncol);
1457 1499
1458 if (selection.op && current_screen == selection.screen 1500 if (selection.op && current_screen == selection.screen
1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1501 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1460 { 1502 {
1461 if (selection.end.row != screen.cur.row 1503 if (selection.end.row != screen.cur.row
1462 || (selection.end.col + count >= ncol)) 1504 || (selection.end.col + count >= ncol))
1463 CLEAR_SELECTION (); 1505 CLEAR_SELECTION ();
1464 else 1506 else
1507 {
1465 { /* shift selection */ 1508 /* shift selection */
1466 selection.beg.col += count; 1509 selection.beg.col += count;
1467 selection.mark.col += count; /* XXX: yes? */ 1510 selection.mark.col += count; /* XXX: yes? */
1468 selection.end.col += count; 1511 selection.end.col += count;
1469 } 1512 }
1470 } 1513 }
… …
1475 case ERASE: 1518 case ERASE:
1476 screen.cur.col += count; /* don't worry if > ncol */ 1519 screen.cur.col += count; /* don't worry if > ncol */
1477 selection_check (1); 1520 selection_check (1);
1478 screen.cur.col -= count; 1521 screen.cur.col -= count;
1479 1522
1480 line->l = max (line->l - count, 0); 1523 // nuke wide char after the end
1524 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1525 scr_kill_char (*line, screen.cur.col + count);
1526
1481 scr_blank_line (*line, screen.cur.col, count, rstyle); 1527 scr_blank_line (*line, screen.cur.col, count, rstyle);
1482 break; 1528 break;
1483 1529
1484 case DELETE: 1530 case DELETE:
1485 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1531 line->l = max (line->l - count, 0);
1486 1532
1533 // nuke wide char spanning the end
1534 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1535 scr_kill_char (*line, screen.cur.col + count);
1536
1487 for (col = screen.cur.col; (col + count) < ncol; col++) 1537 for (int col = screen.cur.col; (col + count) < ncol; col++)
1488 { 1538 {
1489 line->t[col] = line->t[col + count]; 1539 line->t[col] = line->t[col + count];
1490 line->r[col] = line->r[col + count]; 1540 line->r[col] = line->r[col + count];
1491 } 1541 }
1492 1542
1493 line->l = max (line->l - count, 0);
1494 scr_blank_line (*line, ncol - count, count, tr); 1543 scr_blank_line (*line, ncol - count, count,
1544 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1495 1545
1496 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1498 { 1548 {
1499 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1609 */ 1659 */
1610void 1660void
1611rxvt_term::scr_set_tab (int mode) NOTHROW 1661rxvt_term::scr_set_tab (int mode) NOTHROW
1612{ 1662{
1613 if (mode < 0) 1663 if (mode < 0)
1614 memset (tabs, 0, ncol * sizeof (char)); 1664 memset (tabs, 0, ncol);
1615 else if (screen.cur.col < ncol) 1665 else if (screen.cur.col < ncol)
1616 tabs [screen.cur.col] = !!mode; 1666 tabs [screen.cur.col] = !!mode;
1617} 1667}
1618 1668
1619/* ------------------------------------------------------------------------- */ 1669/* ------------------------------------------------------------------------- */
… …
1621 * Set reverse/normal video 1671 * Set reverse/normal video
1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1672 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1673 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1624 */ 1674 */
1625void 1675void
1626rxvt_term::scr_rvideo_mode (int mode) NOTHROW 1676rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1627{ 1677{
1628 XGCValues gcvalue; 1678 rvideo_mode = on;
1629 1679
1680#ifndef NO_BELL
1681 on ^= rvideo_bell;
1682#endif
1683
1630 if (rvideo != mode) 1684 if (rvideo_state != on)
1631 { 1685 {
1632 rvideo = mode; 1686 rvideo_state = on;
1687
1633 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1634#if XPM_BACKGROUND 1689#ifdef HAVE_BG_PIXMAP
1635 if (bgPixmap.pixmap == None) 1690 if (bgPixmap.pixmap == None)
1636#endif 1691#endif
1637#if TRANSPARENT 1692 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 1693
1694 XGCValues gcvalue;
1643 gcvalue.foreground = pix_colors[Color_fg]; 1695 gcvalue.foreground = pix_colors[Color_fg];
1644 gcvalue.background = pix_colors[Color_bg]; 1696 gcvalue.background = pix_colors[Color_bg];
1645 XChangeGC (display->display, gc, GCBackground | GCForeground, 1697 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1646 &gcvalue); 1698
1647 scr_clear (); 1699 scr_clear ();
1648 scr_touch (true); 1700 scr_touch (true);
1649 } 1701 }
1650} 1702}
1651 1703
… …
1735{ 1787{
1736 bool found = false; 1788 bool found = false;
1737 1789
1738 for (int i = 0; i < nrow; i++) 1790 for (int i = 0; i < nrow; i++)
1739 { 1791 {
1740 int col = 0;
1741 rend_t *drp = drawn_buf[i].r; 1792 rend_t *drp = drawn_buf[i].r;
1742 1793
1743 for (; col < ncol; col++, drp++) 1794 for (int col = 0; col < ncol; col++, drp++)
1744 if ((*drp & mask) == value) 1795 if ((*drp & mask) == value)
1745 { 1796 {
1746 found = true; 1797 found = true;
1747 *drp = ~value; 1798 *drp = ~value;
1748 } 1799 }
… …
1788 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1789 { 1840 {
1790 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1791 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1792 } 1843 }
1793 1844// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1794 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1845 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1795 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1846 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1796 1847
1797 num_scr_allow = 0; 1848 num_scr_allow = 0;
1798 1849
… …
1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1902 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1852 1903
1853 return true; 1904 return true;
1854} 1905}
1855 1906
1907#ifndef NO_BELL
1908void
1909rxvt_term::bell_cb (ev::timer &w, int revents)
1910{
1911 rvideo_bell = false;
1912 scr_rvideo_mode (rvideo_mode);
1913 refresh_check ();
1914}
1915#endif
1916
1856/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1857void 1918void
1858rxvt_term::scr_bell () NOTHROW 1919rxvt_term::scr_bell () NOTHROW
1859{ 1920{
1860#ifndef NO_BELL 1921#ifndef NO_BELL
1861 1922
1862# ifndef NO_MAPALERT 1923# ifndef NO_MAPALERT
1863# ifdef MAPALERT_OPTION 1924# ifdef MAPALERT_OPTION
1864 if (OPTION (Opt_mapAlert)) 1925 if (option (Opt_mapAlert))
1865# endif 1926# endif
1866 XMapWindow (display->display, parent[0]); 1927 XMapWindow (dpy, parent[0]);
1867# endif 1928# endif
1868 1929
1930# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell))
1932 set_urgency (1);
1933# endif
1934
1869 if (OPTION (Opt_visualBell)) 1935 if (option (Opt_visualBell))
1870 { 1936 {
1871 scr_rvideo_mode (!rvideo); /* refresh also done */ 1937 rvideo_bell = true;
1938 scr_rvideo_mode (rvideo_mode);
1872 display->flush (); 1939 flush ();
1940
1873 rxvt_usleep (VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1874 scr_rvideo_mode (!rvideo); /* refresh also done */
1875 } 1942 }
1876 else 1943 else
1877 XBell (display->display, 0); 1944 XBell (dpy, 0);
1878
1879#endif 1945#endif
1880} 1946}
1881 1947
1882/* ------------------------------------------------------------------------- */ 1948/* ------------------------------------------------------------------------- */
1883/* ARGSUSED */ 1949/* ARGSUSED */
1884void 1950void
1885rxvt_term::scr_printscreen (int fullhist) NOTHROW 1951rxvt_term::scr_printscreen (int fullhist) NOTHROW
1886{ 1952{
1887#ifdef PRINTPIPE 1953#ifdef PRINTPIPE
1888 int nrows, row_start; 1954 int nrows, row_start;
1889 FILE *fd; 1955 FILE *fd = popen_printer ();
1890 1956
1891 if ((fd = popen_printer ()) == NULL) 1957 if (!fd)
1892 return; 1958 return;
1893 1959
1894 if (fullhist) 1960 if (fullhist)
1895 { 1961 {
1896 nrows = nrow - top_row; 1962 nrows = nrow - top_row;
… …
1941 * screen.text/screen.rend contain what the screen will change to. 2007 * screen.text/screen.rend contain what the screen will change to.
1942 */ 2008 */
1943void 2009void
1944rxvt_term::scr_refresh () NOTHROW 2010rxvt_term::scr_refresh () NOTHROW
1945{ 2011{
1946 unsigned char must_clear, /* use draw_string not draw_image_string */ 2012 unsigned char have_bg,
1947 showcursor; /* show the cursor */ 2013 showcursor; /* show the cursor */
1948 int16_t col, row, /* column/row we're processing */ 2014 int16_t col, row, /* column/row we're processing */
1949 ocrow; /* old cursor row */ 2015 ocrow; /* old cursor row */
1950 int i; /* tmp */ 2016 int i; /* tmp */
1951#ifndef NO_CURSORCOLOR 2017#ifndef NO_CURSORCOLOR
1952 rend_t cc1; /* store colours at cursor position (s) */ 2018 rend_t cc1; /* store colours at cursor position (s) */
1953#endif 2019#endif
1954 rend_t *crp; // cursor rendition pointer 2020 rend_t *crp; // cursor rendition pointer
2021 rend_t ccol1, /* Cursor colour */
2022 ccol2; /* Cursor colour2 */
1955 2023
1956 want_refresh = 0; /* screen is current */ 2024 want_refresh = 0; /* screen is current */
1957 2025
1958 if (refresh_type == NO_REFRESH || !mapped) 2026 if (refresh_type == NO_REFRESH || !mapped)
1959 return; 2027 return;
1960 2028
1961 /* 2029 /*
1962 * A: set up vars 2030 * A: set up vars
1963 */ 2031 */
1964 must_clear = 0;
1965 refresh_count = 0; 2032 refresh_count = 0;
1966 2033
1967#if XPM_BACKGROUND 2034 have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP
1968 must_clear |= bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
1969#endif
1970#if TRANSPARENT
1971 must_clear |= OPTION (Opt_transparent) && am_transparent;
1972#endif 2037#endif
1973 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1974 2039
1975 /* 2040 /*
1976 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
… …
1980 /* 2045 /*
1981 * C: set the cursor character (s) 2046 * C: set the cursor character (s)
1982 */ 2047 */
1983 { 2048 {
1984 unsigned char setoldcursor; 2049 unsigned char setoldcursor;
1985 rend_t ccol1, /* Cursor colour */
1986 ccol2; /* Cursor colour2 */
1987 2050
1988 showcursor = (screen.flags & Screen_VisibleCursor); 2051 showcursor = (screen.flags & Screen_VisibleCursor);
1989#ifdef CURSOR_BLINK 2052#ifdef CURSOR_BLINK
1990 if (hidden_cursor) 2053 if (hidden_cursor)
1991 showcursor = 0; 2054 showcursor = 0;
… …
1998 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2061 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1999 col--; 2062 col--;
2000 2063
2001 crp = &ROW(screen.cur.row).r[col]; 2064 crp = &ROW(screen.cur.row).r[col];
2002 2065
2066#ifndef NO_CURSORCOLOR
2067 cc1 = *crp & (RS_fgMask | RS_bgMask);
2068 if (ISSET_PIXCOLOR (Color_cursor))
2069 ccol1 = Color_cursor;
2070 else
2071#endif
2072#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2073 ccol1 = fgcolor_of (rstyle);
2074#else
2075 ccol1 = Color_fg;
2076#endif
2077
2078#ifndef NO_CURSORCOLOR
2079 if (ISSET_PIXCOLOR (Color_cursor2))
2080 ccol2 = Color_cursor2;
2081 else
2082#endif
2083#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2084 ccol2 = bgcolor_of (rstyle);
2085#else
2086 ccol2 = Color_bg;
2087#endif
2088
2003 if (showcursor && focus) 2089 if (showcursor && focus)
2004 { 2090 {
2005 if (OPTION (Opt_cursorUnderline)) 2091 if (option (Opt_cursorUnderline))
2006 *crp ^= RS_Uline; 2092 *crp ^= RS_Uline;
2007 else 2093 else
2008 { 2094 {
2009 *crp ^= RS_RVid; 2095 *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); 2096 *crp = SET_FGCOLOR (*crp, ccol1);
2030 *crp = SET_BGCOLOR (*crp, ccol2); 2097 *crp = SET_BGCOLOR (*crp, ccol2);
2031#endif
2032 } 2098 }
2033 } 2099 }
2034 } 2100 }
2035 2101
2036 /* make sure no outline cursor is left around */ 2102 /* make sure no outline cursor is left around */
… …
2075 * D: CopyArea pass - very useful for slower links 2141 * D: CopyArea pass - very useful for slower links
2076 * This has been deliberately kept simple. 2142 * This has been deliberately kept simple.
2077 */ 2143 */
2078 if (!display->is_local 2144 if (!display->is_local
2079 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2145 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2080 && abs (num_scr) < nrow && !must_clear) 2146 && abs (num_scr) < nrow && !have_bg)
2081 { 2147 {
2082 int16_t nits; 2148 int16_t nits;
2149 int i = num_scr;
2083 int j; 2150 int j;
2084 int len, wlen; 2151 int len, wlen;
2085 dLocal (int, num_scr); 2152 dLocal (int, num_scr);
2086 2153
2087 j = nrow; 2154 j = nrow;
2088 wlen = len = -1; 2155 wlen = len = -1;
2089 row = i > 0 ? 0 : j - 1; 2156 row = i > 0 ? 0 : j - 1;
2157
2090 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2158 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2091 { 2159 {
2092 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2160 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2093 { 2161 {
2094 line_t s = ROW(view_start + row); 2162 line_t s = ROW(view_start + row);
… …
2115 wlen = row; 2183 wlen = row;
2116 continue; 2184 continue;
2117 } 2185 }
2118 } 2186 }
2119 2187
2120 if (len != -1) 2188 if (len >= 0)
2121 { 2189 {
2122 /* also comes here at end if needed because of >= above */ 2190 /* also comes here at end if needed because of >= above */
2123 if (wlen < len) 2191 if (wlen < len)
2124 ::swap (wlen, len); 2192 ::swap (wlen, len);
2125 2193
2194 XGCValues gcv;
2195
2196 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2126 XCopyArea (display->display, vt, vt, 2197 XCopyArea (dpy, vt, vt,
2127 gc, 0, Row2Pixel (len + i), 2198 gc, 0, Row2Pixel (len + i),
2128 (unsigned int)this->width, 2199 (unsigned int)this->width,
2129 (unsigned int)Height2Pixel (wlen - len + 1), 2200 (unsigned int)Height2Pixel (wlen - len + 1),
2130 0, Row2Pixel (len)); 2201 0, Row2Pixel (len));
2202 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2203
2131 len = -1; 2204 len = -1;
2132 } 2205 }
2133 } 2206 }
2134 } 2207 }
2135#endif 2208#endif
… …
2159 continue; 2232 continue;
2160 2233
2161 // redraw one or more characters 2234 // redraw one or more characters
2162 2235
2163 // seek to the beginning of wide characters 2236 // seek to the beginning of wide characters
2164 while (stp[col] == NOCHAR && col > 0) 2237 while (expect_false (stp[col] == NOCHAR && col > 0))
2165 --col; 2238 --col;
2166 2239
2167 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2240 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2168 text_t *text = stp + col; 2241 text_t *text = stp + col;
2169 int count = 1; 2242 int count = 1;
… …
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_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
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;
2262#endif 2321#endif
2263 2322
2264 if (invert) 2323 if (invert)
2265 { 2324 {
2325#ifdef OPTION_HC
2326 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2327 || !ISSET_PIXCOLOR (Color_HC))
2328#endif
2329 /* invert the column if no highlightColor is set or it is the
2330 * current cursor column */
2266 ::swap (fore, back); 2331 ::swap (fore, back);
2332#ifdef OPTION_HC
2333 else if (ISSET_PIXCOLOR (Color_HC))
2334 back = Color_HC;
2335#endif
2267 2336
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2337#ifndef NO_BOLD_UNDERLINE_REVERSE
2338# ifndef OPTION_HC
2269 if (ISSET_PIXCOLOR (Color_RV)) 2339 if (ISSET_PIXCOLOR (Color_RV))
2270 back = Color_RV; 2340 back = Color_RV;
2271 2341# endif
2272 if (fore == back) 2342 if (fore == back)
2273 { 2343 {
2274 fore = Color_bg; 2344 fore = Color_bg;
2275 back = Color_fg; 2345 back = Color_fg;
2276 } 2346 }
… …
2278 } 2348 }
2279 2349
2280#ifdef TEXT_BLINK 2350#ifdef TEXT_BLINK
2281 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2351 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2282 { 2352 {
2283 if (!text_blink_ev.active) 2353 if (!text_blink_ev.is_active ())
2284 { 2354 {
2285 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2355 text_blink_ev.again ();
2286 hidden_text = 0; 2356 hidden_text = 0;
2287 } 2357 }
2288 else if (hidden_text) 2358 else if (hidden_text)
2289 fore = back; 2359 fore = back;
2290 } 2360 }
2291#endif 2361#endif
2362
2363#if ENABLE_STYLES
2364 // "careful" (too wide) character handling
2365
2366 // include previous careful character(s) if possible, looks nicer (best effort...)
2367 while (text > stp
2368 && srp[text - stp - 1] & RS_Careful
2369 && RS_SAME (rend, srp[text - stp - 1]))
2370 text--, count++, xpixel -= fwidth;
2371
2372 // force redraw after "careful" characters to avoid pixel droppings
2373 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2374 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2375
2376 // force redraw before "careful" characters to avoid pixel droppings
2377 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2378 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2379#endif
2292 } 2380 }
2293 2381
2294 /* 2382 /*
2295 * Actually do the drawing of the string here 2383 * Actually do the drawing of the string here
2296 */ 2384 */
2297 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2385 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2298 2386
2299 if (back == fore) 2387 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 { 2388 {
2305 if (must_clear) 2389 // this is very ugly, maybe push it into ->draw?
2306 {
2307 CLEAR_CHARS (xpixel, ypixel, count);
2308 2390
2309 for (i = 0; i < count; i++) /* don't draw empty strings */ 2391 for (i = 0; i < count; i++) /* don't draw empty strings */
2310 if (text[i] != ' ') 2392 if (text[i] != ' ')
2311 { 2393 {
2312 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2394 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2313 break; 2395 goto did_clear;
2314 }
2315 } 2396 }
2316 else 2397
2317 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2398 CLEAR_CHARS (xpixel, ypixel, count);
2399 did_clear: ;
2318 } 2400 }
2319 else 2401 else
2320 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2402 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2321 2403
2322 if (rend & RS_Uline && font->descent > 1 && fore != back) 2404 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2323 { 2405 {
2324#if ENABLE_FRILLS 2406#if ENABLE_FRILLS
2325 if (ISSET_PIXCOLOR (Color_underline)) 2407 if (ISSET_PIXCOLOR (Color_underline))
2326 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2408 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2327 else 2409 else
2328#endif 2410#endif
2329 XSetForeground (display->display, gc, pix_colors[fore]); 2411 XSetForeground (dpy, gc, pix_colors[fore]);
2330 2412
2331 XDrawLine (display->display, drawBuffer, gc, 2413 XDrawLine (dpy, vt, gc,
2332 xpixel, ypixel + font->ascent + 1, 2414 xpixel, ypixel + font->ascent + 1,
2333 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2415 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2334 } 2416 }
2335 } /* for (col....) */ 2417 } /* for (col....) */
2336 } /* for (row....) */ 2418 } /* for (row....) */
… …
2345 */ 2427 */
2346 if (showcursor) 2428 if (showcursor)
2347 { 2429 {
2348 if (focus) 2430 if (focus)
2349 { 2431 {
2350 if (OPTION (Opt_cursorUnderline)) 2432 if (option (Opt_cursorUnderline))
2351 *crp ^= RS_Uline; 2433 *crp ^= RS_Uline;
2352 else 2434 else
2353 { 2435 {
2354 *crp ^= RS_RVid; 2436 *crp ^= RS_RVid;
2355#ifndef NO_CURSORCOLOR 2437#ifndef NO_CURSORCOLOR
… …
2369 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2451 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2370 cursorwidth++; 2452 cursorwidth++;
2371 2453
2372#ifndef NO_CURSORCOLOR 2454#ifndef NO_CURSORCOLOR
2373 if (ISSET_PIXCOLOR (Color_cursor)) 2455 if (ISSET_PIXCOLOR (Color_cursor))
2374 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2456 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2457 else
2375#endif 2458#endif
2459 XSetForeground (dpy, gc, pix_colors[ccol1]);
2376 2460
2377 XDrawRectangle (display->display, drawBuffer, gc, 2461 XDrawRectangle (dpy, vt, gc,
2378 Col2Pixel (col), 2462 Col2Pixel (col),
2379 Row2Pixel (oldcursor.row), 2463 Row2Pixel (oldcursor.row),
2380 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2464 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2381 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2465 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2382 } 2466 }
… …
2417} 2501}
2418 2502
2419void 2503void
2420rxvt_term::scr_recolour () NOTHROW 2504rxvt_term::scr_recolour () NOTHROW
2421{ 2505{
2422 if (1 2506#ifdef HAVE_BG_PIXMAP
2423#if TRANSPARENT 2507 bgPixmap.apply ();
2424 && !am_transparent 2508#else
2425#endif 2509
2426#if XPM_BACKGROUND
2427 && !bgPixmap.pixmap
2428#endif
2429 )
2430 {
2431 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2510 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2432 XClearWindow (display->display, parent[0]); 2511 XClearWindow (dpy, parent[0]);
2433 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2512 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2434#if HAVE_SCROLLBARS 2513
2435 if (scrollBar.win) 2514 if (scrollBar.win)
2436 { 2515 {
2437 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2516 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2438 scrollBar.setIdle (); 2517 scrollBar.state = STATE_IDLE;
2439 scrollbar_show (0); 2518 scrollBar.show (0);
2440 }
2441#endif
2442 } 2519 }
2443 2520
2521#endif
2522
2523 /* bgPixmap.apply () does not do the following : */
2444 scr_clear (); 2524 scr_clear ();
2445 scr_touch (true); 2525 scr_touch (true);
2446 want_refresh = 1; 2526 want_refresh = 1;
2447} 2527}
2448 2528
… …
2455 2535
2456 num_scr_allow = 0; 2536 num_scr_allow = 0;
2457 want_refresh = 1; 2537 want_refresh = 1;
2458 2538
2459 if (really) 2539 if (really)
2460 XClearWindow (display->display, vt); 2540 XClearWindow (dpy, vt);
2461} 2541}
2462 2542
2463void 2543void
2464rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2544rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2465{ 2545{
… …
2514{ 2594{
2515 if (selection.op 2595 if (selection.op
2516 && current_screen == selection.screen 2596 && current_screen == selection.screen
2517 && selection.end.row >= view_start) 2597 && selection.end.row >= view_start)
2518 { 2598 {
2519#if ENABLE_FRILLS 2599#if !ENABLE_MINIMAL
2520 if (selection.rect) 2600 if (selection.rect)
2521 scr_xor_rect (selection.beg.row, selection.beg.col, 2601 scr_xor_rect (selection.beg.row, selection.beg.col,
2522 selection.end.row, selection.end.col, 2602 selection.end.row, selection.end.col,
2523 RS_RVid, RS_RVid | RS_Uline); 2603 RS_RVid, RS_RVid | RS_Uline);
2524 else 2604 else
… …
2540{ 2620{
2541 int row, wrote; 2621 int row, wrote;
2542 unsigned int width, towrite; 2622 unsigned int width, towrite;
2543 char r1[] = "\n"; 2623 char r1[] = "\n";
2544 2624
2545 for (row = saveLines - nsaved; 2625 for (row = saveLines + top_row;
2546 row < saveLines + nrow - 1; row++) 2626 row < saveLines + nrow - 1; row++)
2547 { 2627 {
2548 width = row_buf[row].l >= 0 ? row_buf[row].l 2628 width = row_buf[row].l >= 0 ? row_buf[row].l
2549 : ncol; 2629 : ncol;
2550 for (towrite = width; towrite; towrite -= wrote) 2630 for (towrite = width; towrite; towrite -= wrote)
… …
2601 /* convert normal newline chars into common keyboard Return key sequence */ 2681 /* convert normal newline chars into common keyboard Return key sequence */
2602 for (unsigned int i = 0; i < len; i++) 2682 for (unsigned int i = 0; i < len; i++)
2603 if (data[i] == C0_LF) 2683 if (data[i] == C0_LF)
2604 data[i] = C0_CR; 2684 data[i] = C0_CR;
2605 2685
2686 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[200~");
2688
2606 tt_write (data, len); 2689 tt_write (data, len);
2690
2691 if (priv_modes & PrivMode_BracketPaste)
2692 tt_printf ("\e[201~");
2607} 2693}
2608 2694
2609/* ------------------------------------------------------------------------- */ 2695/* ------------------------------------------------------------------------- */
2610/* 2696/*
2611 * Respond to a notification that a primary selection has been sent 2697 * Respond to a notification that a primary selection has been sent
… …
2640 } 2726 }
2641 2727
2642 unsigned long bytes_after; 2728 unsigned long bytes_after;
2643 XTextProperty ct; 2729 XTextProperty ct;
2644 2730
2645 if (XGetWindowProperty (display->display, win, prop, 2731 if (XGetWindowProperty (dpy, win, prop,
2646 0, PROP_SIZE / 4, 2732 0, PROP_SIZE / 4,
2647 delete_prop, AnyPropertyType, 2733 delete_prop, AnyPropertyType,
2648 &ct.encoding, &ct.format, 2734 &ct.encoding, &ct.format,
2649 &ct.nitems, &bytes_after, 2735 &ct.nitems, &bytes_after,
2650 &ct.value) != Success) 2736 &ct.value) != Success)
… …
2659 if (bytes_after) 2745 if (bytes_after)
2660 { 2746 {
2661 // fetch and append remaining data 2747 // fetch and append remaining data
2662 XTextProperty ct2; 2748 XTextProperty ct2;
2663 2749
2664 if (XGetWindowProperty (display->display, win, prop, 2750 if (XGetWindowProperty (dpy, win, prop,
2665 ct.nitems / 4, (bytes_after + 3) / 4, 2751 ct.nitems / 4, (bytes_after + 3) / 4,
2666 delete_prop, AnyPropertyType, 2752 delete_prop, AnyPropertyType,
2667 &ct2.encoding, &ct2.format, 2753 &ct2.encoding, &ct2.format,
2668 &ct2.nitems, &bytes_after, 2754 &ct2.nitems, &bytes_after,
2669 &ct2.value) != Success) 2755 &ct2.value) != Success)
… …
2682 2768
2683 if (ct.encoding == xa[XA_INCR]) 2769 if (ct.encoding == xa[XA_INCR])
2684 { 2770 {
2685 // INCR selection, start handshake 2771 // INCR selection, start handshake
2686 if (!delete_prop) 2772 if (!delete_prop)
2687 XDeleteProperty (display->display, win, prop); 2773 XDeleteProperty (dpy, win, prop);
2688 2774
2689 selection_wait = Sel_incr; 2775 selection_wait = Sel_incr;
2690 incr_buf_fill = 0; 2776 incr_buf_fill = 0;
2691 incr_ev.start (NOW + 10); 2777 incr_ev.start (10);
2692 2778
2693 goto bailout; 2779 goto bailout;
2694 } 2780 }
2695 2781
2696 if (ct.nitems == 0) 2782 if (ct.nitems == 0)
… …
2705 ct.nitems = incr_buf_fill; 2791 ct.nitems = incr_buf_fill;
2706 incr_buf = 0; 2792 incr_buf = 0;
2707 incr_buf_size = 0; 2793 incr_buf_size = 0;
2708 incr_ev.stop (); 2794 incr_ev.stop ();
2709 } 2795 }
2710 else 2796 else
2711 { 2797 {
2712 if (selection_wait == Sel_normal 2798 if (selection_wait == Sel_normal
2713 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2799 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2714 { 2800 {
2715 /* 2801 /*
… …
2722 goto bailout; 2808 goto bailout;
2723 } 2809 }
2724 } 2810 }
2725 else if (selection_wait == Sel_incr) 2811 else if (selection_wait == Sel_incr)
2726 { 2812 {
2727 incr_ev.start (NOW + 10); 2813 incr_ev.start (10);
2728 2814
2729 while (incr_buf_fill + ct.nitems > incr_buf_size) 2815 while (incr_buf_fill + ct.nitems > incr_buf_size)
2730 { 2816 {
2731 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2817 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2732 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2818 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2739 } 2825 }
2740 2826
2741 char **cl; 2827 char **cl;
2742 int cr; 2828 int cr;
2743 2829
2744#if ENABLE_FRILLS 2830#if !ENABLE_MINIMAL
2745 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2831 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2746 // so recode it manually 2832 // so recode it manually
2747 if (ct.encoding == xa[XA_UTF8_STRING]) 2833 if (ct.encoding == xa[XA_UTF8_STRING])
2748 { 2834 {
2749 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2835 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2753 paste (s, strlen (s)); 2839 paste (s, strlen (s));
2754 free (s); 2840 free (s);
2755 } 2841 }
2756 else 2842 else
2757#endif 2843#endif
2758 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2844 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2759 && cl) 2845 && cl)
2760 { 2846 {
2761 for (int i = 0; i < cr; i++) 2847 for (int i = 0; i < cr; i++)
2762 paste (cl[i], strlen (cl[i])); 2848 paste (cl[i], strlen (cl[i]));
2763 2849
… …
2772 if (selection_wait == Sel_normal) 2858 if (selection_wait == Sel_normal)
2773 selection_wait = Sel_none; 2859 selection_wait = Sel_none;
2774} 2860}
2775 2861
2776void 2862void
2777rxvt_term::incr_cb (time_watcher &w) NOTHROW 2863rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2778{ 2864{
2779 selection_wait = Sel_none; 2865 selection_wait = Sel_none;
2780 2866
2781 incr_buf_size = 0; 2867 incr_buf_size = 0;
2782 free (incr_buf); 2868 free (incr_buf);
… …
2793 selection_paste (win, prop, true); 2879 selection_paste (win, prop, true);
2794} 2880}
2795 2881
2796/* ------------------------------------------------------------------------- */ 2882/* ------------------------------------------------------------------------- */
2797/* 2883/*
2798 * Request the current selection: 2884 * Request the current selection:
2799 * Order: > internal selection if available 2885 * Order: > internal selection if available
2800 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2886 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2801 * > CUT_BUFFER0 2887 * > CUT_BUFFER0
2802 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2888 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2803 * will auto fallback to CUT_BUFFER0 2889 * will auto fallback to CUT_BUFFER0
… …
2805 */ 2891 */
2806void 2892void
2807rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2893rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2808{ 2894{
2809 if (selection.text && selnum == Sel_Primary) 2895 if (selection.text && selnum == Sel_Primary)
2896 {
2810 { /* internal selection */ 2897 /* internal selection */
2811 char *str = rxvt_wcstombs (selection.text, selection.len); 2898 char *str = rxvt_wcstombs (selection.text, selection.len);
2812 paste (str, strlen (str)); 2899 paste (str, strlen (str));
2813 free (str); 2900 free (str);
2814 return; 2901 return;
2815 } 2902 }
… …
2845 else if (selnum == Sel_Secondary) 2932 else if (selnum == Sel_Secondary)
2846 sel = XA_SECONDARY; 2933 sel = XA_SECONDARY;
2847 else 2934 else
2848 sel = xa[XA_CLIPBOARD]; 2935 sel = xa[XA_CLIPBOARD];
2849 2936
2850 if (XGetSelectionOwner (display->display, sel) != None) 2937 if (XGetSelectionOwner (dpy, sel) != None)
2851 { 2938 {
2852 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2939 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2853 vt, selection_request_time); 2940 vt, selection_request_time);
2854 return 1; 2941 return 1;
2855 } 2942 }
2856 2943
2857 return 0; 2944 return 0;
… …
2920 3007
2921 int end_col; 3008 int end_col;
2922 3009
2923 for (; row <= selection.end.row; row++, col = 0) 3010 for (; row <= selection.end.row; row++, col = 0)
2924 { 3011 {
2925#if ENABLE_FRILLS 3012#if !ENABLE_MINIMAL
2926 if (selection.rect) 3013 if (selection.rect)
2927 { 3014 {
2928 col = selection.beg.col; 3015 col = selection.beg.col;
2929 end_col = ncol + 1; 3016 end_col = ncol + 1;
2930 } 3017 }
… …
2933 end_col = ROW(row).l; 3020 end_col = ROW(row).l;
2934 3021
2935 col = max (col, 0); 3022 col = max (col, 0);
2936 3023
2937 if (row == selection.end.row 3024 if (row == selection.end.row
2938#if ENABLE_FRILLS 3025#if !ENABLE_MINIMAL
2939 || selection.rect 3026 || selection.rect
2940#endif 3027#endif
2941 ) 3028 )
2942 min_it (end_col, selection.end.col); 3029 min_it (end_col, selection.end.col);
2943 3030
… …
2966#endif 3053#endif
2967 else 3054 else
2968 new_selection_text[ofs++] = *t++; 3055 new_selection_text[ofs++] = *t++;
2969 } 3056 }
2970 3057
2971#if ENABLE_FRILLS 3058#if !ENABLE_MINIMAL
2972 if (selection.rect) 3059 if (selection.rect)
2973 { 3060 {
2974 while (ofs 3061 while (ofs
2975 && new_selection_text[ofs - 1] != C0_LF 3062 && new_selection_text[ofs - 1] != C0_LF
2976 && unicode::is_space (new_selection_text[ofs - 1])) 3063 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3010bool 3097bool
3011rxvt_term::selection_grab (Time tm) NOTHROW 3098rxvt_term::selection_grab (Time tm) NOTHROW
3012{ 3099{
3013 selection_time = tm; 3100 selection_time = tm;
3014 3101
3015 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3102 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3016 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3103 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3017 { 3104 {
3018 display->set_selection_owner (this); 3105 display->set_selection_owner (this);
3019 return true; 3106 return true;
3020 } 3107 }
3021 else 3108 else
… …
3025 } 3112 }
3026 3113
3027#if 0 3114#if 0
3028 XTextProperty ct; 3115 XTextProperty ct;
3029 3116
3030 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3117 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3031 { 3118 {
3032 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3119 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3033 XFree (ct.value); 3120 XFree (ct.value);
3034 } 3121 }
3035#endif 3122#endif
… …
3081 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3168 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3082 3169
3083 while (selection.mark.col > 0 3170 while (selection.mark.col > 0
3084 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3171 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3085 --selection.mark.col; 3172 --selection.mark.col;
3086 3173
3087 if (selection.op) 3174 if (selection.op)
3175 {
3088 { /* clear the old selection */ 3176 /* clear the old selection */
3089 selection.beg.row = selection.end.row = selection.mark.row; 3177 selection.beg.row = selection.end.row = selection.mark.row;
3090 selection.beg.col = selection.end.col = selection.mark.col; 3178 selection.beg.col = selection.end.col = selection.mark.col;
3091 } 3179 }
3092 3180
3093 selection.op = SELECTION_INIT; 3181 selection.op = SELECTION_INIT;
… …
3282 * a point/word/line which is either the start or end of the selection 3370 * a point/word/line which is either the start or end of the selection
3283 * and it was decided by whichever point/word/line was `fixed' at the 3371 * and it was decided by whichever point/word/line was `fixed' at the
3284 * time of the most recent button3 press 3372 * time of the most recent button3 press
3285 */ 3373 */
3286 if (button3 && buttonpress) 3374 if (button3 && buttonpress)
3375 {
3287 { /* button3 press */ 3376 /* button3 press */
3288 /* 3377 /*
3289 * first determine which edge of the selection we are closest to 3378 * first determine which edge of the selection we are closest to
3290 */ 3379 */
3291 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3380 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3292 || (!ROWCOL_IS_AFTER (pos, selection.end) 3381 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3310 selection.mark.row = selection.beg.row; 3399 selection.mark.row = selection.beg.row;
3311 selection.mark.col = selection.beg.col; 3400 selection.mark.col = selection.beg.col;
3312 } 3401 }
3313 } 3402 }
3314 else 3403 else
3404 {
3315 { /* button1 drag or button3 drag */ 3405 /* button1 drag or button3 drag */
3316 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3406 if (ROWCOL_IS_AFTER (selection.mark, pos))
3317 { 3407 {
3318 if (selection.mark.row == selection.end.row 3408 if (selection.mark.row == selection.end.row
3319 && selection.mark.col == selection.end.col 3409 && selection.mark.col == selection.end.col
3320 && clickchange 3410 && clickchange
… …
3337 3427
3338 if (selection.clicks == 1) 3428 if (selection.clicks == 1)
3339 { 3429 {
3340 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3430 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3341 && !ROW(selection.beg.row).is_longer () 3431 && !ROW(selection.beg.row).is_longer ()
3342#if ENABLE_FRILLS 3432#if !ENABLE_MINIMAL
3343 && !selection.rect 3433 && !selection.rect
3344#endif 3434#endif
3345 ) 3435 )
3346 selection.beg.col = ncol; 3436 selection.beg.col = ncol;
3347 3437
3348 if ( 3438 if (
3349 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3439 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3350 && !ROW(selection.end.row).is_longer () 3440 && !ROW(selection.end.row).is_longer ()
3351#if ENABLE_FRILLS 3441#if !ENABLE_MINIMAL
3352 && !selection.rect 3442 && !selection.rect
3353#endif 3443#endif
3354 ) 3444 )
3355 selection.end.col = ncol; 3445 selection.end.col = ncol;
3356 } 3446 }
… …
3363 selection_delimit_word (DN, &selection.end, &selection.end); 3453 selection_delimit_word (DN, &selection.end, &selection.end);
3364 } 3454 }
3365 else if (selection.clicks == 3) 3455 else if (selection.clicks == 3)
3366 { 3456 {
3367#if ENABLE_FRILLS 3457#if ENABLE_FRILLS
3368 if (OPTION (Opt_tripleclickwords)) 3458 if (option (Opt_tripleclickwords))
3369 { 3459 {
3370 selection_delimit_word (UP, &selection.beg, &selection.beg); 3460 selection_delimit_word (UP, &selection.beg, &selection.beg);
3371 3461
3372 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3462 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3373 { 3463 {
3374 if (!ROW(end_row).is_longer ()) 3464 if (!ROW(end_row).is_longer ())
3375 { 3465 {
3376 selection.end.row = end_row; 3466 selection.end.row = end_row;
3377 selection.end.col = ROW(end_row).l; 3467 selection.end.col = ROW(end_row).l;
3468# if !ENABLE_MINIMAL
3378 selection_remove_trailing_spaces (); 3469 selection_remove_trailing_spaces ();
3470# endif
3379 break; 3471 break;
3380 } 3472 }
3381 } 3473 }
3382 } 3474 }
3383 else 3475 else
… …
3399 selection.end.row++; 3491 selection.end.row++;
3400 } 3492 }
3401 } 3493 }
3402 3494
3403 if (button3 && buttonpress) 3495 if (button3 && buttonpress)
3496 {
3404 { /* mark may need to be changed */ 3497 /* mark may need to be changed */
3405 if (closeto == LEFT) 3498 if (closeto == LEFT)
3406 { 3499 {
3407 selection.mark.row = selection.end.row; 3500 selection.mark.row = selection.end.row;
3408 selection.mark.col = selection.end.col - (selection.clicks == 2); 3501 selection.mark.col = selection.end.col - (selection.clicks == 2);
3409 } 3502 }
… …
3412 selection.mark.row = selection.beg.row; 3505 selection.mark.row = selection.beg.row;
3413 selection.mark.col = selection.beg.col; 3506 selection.mark.col = selection.beg.col;
3414 } 3507 }
3415 } 3508 }
3416 3509
3417#if ENABLE_FRILLS 3510#if !ENABLE_MINIMAL
3418 if (selection.rect && selection.beg.col > selection.end.col) 3511 if (selection.rect && selection.beg.col > selection.end.col)
3419 ::swap (selection.beg.col, selection.end.col); 3512 ::swap (selection.beg.col, selection.end.col);
3420#endif 3513#endif
3421} 3514}
3422 3515
3423#if ENABLE_FRILLS 3516#if !ENABLE_MINIMAL
3424void 3517void
3425rxvt_term::selection_remove_trailing_spaces () NOTHROW 3518rxvt_term::selection_remove_trailing_spaces () NOTHROW
3426{ 3519{
3427 int32_t end_col, end_row; 3520 int32_t end_col, end_row;
3428 text_t *stp; 3521 text_t *stp;
… …
3483 */ 3576 */
3484void 3577void
3485rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3578rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3486{ 3579{
3487 XSelectionEvent ev; 3580 XSelectionEvent ev;
3488 dDisp;
3489 3581
3490 ev.type = SelectionNotify; 3582 ev.type = SelectionNotify;
3491 ev.property = None; 3583 ev.property = None;
3492 ev.display = rq.display; 3584 ev.display = rq.display;
3493 ev.requestor = rq.requestor; 3585 ev.requestor = rq.requestor;
… …
3507 *target++ = xa[XA_COMPOUND_TEXT]; 3599 *target++ = xa[XA_COMPOUND_TEXT];
3508#if X_HAVE_UTF8_STRING 3600#if X_HAVE_UTF8_STRING
3509 *target++ = xa[XA_UTF8_STRING]; 3601 *target++ = xa[XA_UTF8_STRING];
3510#endif 3602#endif
3511 3603
3512 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3604 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3513 32, PropModeReplace, 3605 32, PropModeReplace,
3514 (unsigned char *)target_list, target - target_list); 3606 (unsigned char *)target_list, target - target_list);
3515 ev.property = rq.property; 3607 ev.property = rq.property;
3516 } 3608 }
3517#if TODO // TODO 3609#if TODO // TODO
… …
3520 /* TODO: Handle MULTIPLE */ 3612 /* TODO: Handle MULTIPLE */
3521 } 3613 }
3522#endif 3614#endif
3523 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3615 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3524 { 3616 {
3525 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3617 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3526 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3618 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3527 ev.property = rq.property; 3619 ev.property = rq.property;
3528 } 3620 }
3529 else if (rq.target == XA_STRING 3621 else if (rq.target == XA_STRING
3530 || rq.target == xa[XA_TEXT] 3622 || rq.target == xa[XA_TEXT]
… …
3554 style = enc_string; 3646 style = enc_string;
3555 else if (target == xa[XA_TEXT]) 3647 else if (target == xa[XA_TEXT])
3556 style = enc_text; 3648 style = enc_text;
3557 else if (target == xa[XA_COMPOUND_TEXT]) 3649 else if (target == xa[XA_COMPOUND_TEXT])
3558 style = enc_compound_text; 3650 style = enc_compound_text;
3559#if ENABLE_FRILLS 3651#if !ENABLE_MINIMAL
3560 else if (target == xa[XA_UTF8_STRING]) 3652 else if (target == xa[XA_UTF8_STRING])
3561 style = enc_utf8; 3653 style = enc_utf8;
3562#endif 3654#endif
3563 else 3655 else
3564 { 3656 {
… …
3575 { 3667 {
3576 cl = L""; 3668 cl = L"";
3577 selectlen = 0; 3669 selectlen = 0;
3578 } 3670 }
3579 3671
3580#if ENABLE_FRILLS 3672#if !ENABLE_MINIMAL
3581 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3673 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3582 // so recode it manually 3674 // so recode it manually
3583 if (style == enc_utf8) 3675 if (style == enc_utf8)
3584 { 3676 {
3585 freect = 1; 3677 freect = 1;
… …
3588 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3680 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3589 ct.nitems = strlen ((char *)ct.value); 3681 ct.nitems = strlen ((char *)ct.value);
3590 } 3682 }
3591 else 3683 else
3592#endif 3684#endif
3593 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3685 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3594 freect = 1; 3686 freect = 1;
3595 else 3687 else
3596 { 3688 {
3597 /* if we failed to convert then send it raw */ 3689 /* if we failed to convert then send it raw */
3598 ct.value = (unsigned char *)cl; 3690 ct.value = (unsigned char *)cl;
3599 ct.nitems = selectlen; 3691 ct.nitems = selectlen;
3600 ct.encoding = target; 3692 ct.encoding = target;
3601 } 3693 }
3602 3694
3603 XChangeProperty (disp, rq.requestor, rq.property, 3695 XChangeProperty (dpy, rq.requestor, rq.property,
3604 ct.encoding, 8, PropModeReplace, 3696 ct.encoding, 8, PropModeReplace,
3605 ct.value, (int)ct.nitems); 3697 ct.value, (int)ct.nitems);
3606 ev.property = rq.property; 3698 ev.property = rq.property;
3607 3699
3608 if (freect) 3700 if (freect)
3609 XFree (ct.value); 3701 XFree (ct.value);
3610 } 3702 }
3611 3703
3612 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3704 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3613}
3614
3615/* ------------------------------------------------------------------------- *
3616 * MOUSE ROUTINES *
3617 * ------------------------------------------------------------------------- */
3618
3619/*
3620 * return col/row values corresponding to x/y pixel values
3621 */
3622void
3623rxvt_term::pixel_position (int *x, int *y) NOTHROW
3624{
3625 *x = Pixel2Col (*x);
3626 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3627 *y = Pixel2Row (*y);
3628 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3629} 3705}
3630 3706
3631/* ------------------------------------------------------------------------- */ 3707/* ------------------------------------------------------------------------- */
3632#ifdef USE_XIM 3708#ifdef USE_XIM
3633void 3709void
3634rxvt_term::im_set_position (XPoint &pos) NOTHROW 3710rxvt_term::im_set_position (XPoint &pos) NOTHROW
3635{ 3711{
3636 XWindowAttributes xwa; 3712 XWindowAttributes xwa;
3637 3713
3638 XGetWindowAttributes (display->display, vt, &xwa); 3714 XGetWindowAttributes (dpy, vt, &xwa);
3639 3715
3640 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3716 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3641 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3717 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3642} 3718}
3643#endif 3719#endif
… …
3739rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3815rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3740{ 3816{
3741 while (*s) 3817 while (*s)
3742 { 3818 {
3743 text_t t = *s++; 3819 text_t t = *s++;
3744 int width = wcwidth (t); 3820 int width = WCWIDTH (t);
3745 3821
3746 while (width--) 3822 while (width--)
3747 { 3823 {
3748 scr_overlay_set (x++, y, t); 3824 scr_overlay_set (x++, y, t);
3749 t = NOCHAR; 3825 t = NOCHAR;

Diff Legend

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