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.314 by root, Tue Nov 4 14:34:13 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 begin, 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 * ------------------------------------------------------------------------- */
… …
161{ 162{
162#if ENABLE_OVERLAY 163#if ENABLE_OVERLAY
163 scr_overlay_off (); 164 scr_overlay_off ();
164#endif 165#endif
165 166
167 rvideo_mode = false;
166 view_start = 0; 168 view_start = 0;
167 num_scr = 0; 169 num_scr = 0;
168 170
169 if (ncol == 0) 171 if (ncol == 0)
170 ncol = 80; 172 ncol = 80;
… …
173 nrow = 24; 175 nrow = 24;
174 176
175 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 178 return;
177 179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182
178 // we need at least two lines for wrapping to work correctly 183 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 184 while (nrow + saveLines < 2)
180 { 185 {
181 //TODO//FIXME 186 //TODO//FIXME
182 saveLines++; 187 saveLines++;
183 prev_nrow--; 188 prev_nrow--;
184 top_row--; 189 top_row--;
… …
195 if (!row_buf) 200 if (!row_buf)
196 { 201 {
197 /* 202 /*
198 * first time called so just malloc everything: don't rely on realloc 203 * first time called so just malloc everything: don't rely on realloc
199 */ 204 */
200 top_row = 0; /* no saved lines */ 205 top_row = 0;
201 term_start = 0; 206 term_start = 0;
202 207
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 208 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 209 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 210
… …
234 selection.text = NULL; 239 selection.text = NULL;
235 selection.len = 0; 240 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 241 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 242 selection.screen = PRIMARY;
238 selection.clicks = 0; 243 selection.clicks = 0;
239 rvideo = 0;
240 } 244 }
241 else 245 else
242 { 246 {
243 /* 247 /*
244 * add or delete rows as appropriate 248 * add or delete rows as appropriate
… …
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 277 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 } 278 }
275 279
276 line_t *old_buf = row_buf; 280 line_t *old_buf = row_buf;
277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 281 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
278 282
279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 283 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start + top_row , prev_total_rows); 284 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 285 int q = total_rows; // rewrapped row
282 286
283 if (top_row) 287 if (top_row)
284 { 288 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb 289 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm. 290 // to come up with a lean and mean algorithm.
287 291
288 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 294
… …
327 int qcol = 0; 331 int qcol = 0;
328 332
329 // see below for cursor adjustment rationale 333 // see below for cursor adjustment rationale
330 if (p == ocur.row) 334 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow); 335 screen.cur.row = q - (total_rows - nrow);
332 336
333 // fill a single destination line 337 // fill a single destination line
334 while (lofs < llen && qcol < ncol) 338 while (lofs < llen && qcol < ncol)
335 { 339 {
336 int prow = lofs / prev_ncol; 340 int prow = lofs / prev_ncol;
337 int pcol = lofs % prev_ncol; 341 int pcol = lofs % prev_ncol;
… …
347 351
348 line_t &pline = old_buf [prow]; 352 line_t &pline = old_buf [prow];
349 353
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 354 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 355
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)); 356 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 357 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
359 358
360 lofs += len; 359 lofs += len;
361 qcol += len; 360 qcol += len;
… …
368 } 367 }
369 while (p != pend && q > 0); 368 while (p != pend && q > 0);
370 369
371 term_start = total_rows - nrow; 370 term_start = total_rows - nrow;
372 top_row = q - term_start; 371 top_row = q - term_start;
373 372
374 // make sure all terminal lines exist 373 // make sure all terminal lines exist
375 while (top_row > 0) 374 while (top_row > 0)
376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 375 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
377 } 376 }
378 else 377 else
379 { 378 {
380 // if no scrollback exists (yet), wing, instead of wrap 379 // if no scrollback exists (yet), wing, instead of wrap
381 380
382 for (int row = min (nrow, prev_nrow); row--; ) 381 for (int row = min (nrow, prev_nrow); row--; )
383 { 382 {
384 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 383 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
385 line_t &qline = row_buf [row]; 384 line_t &qline = row_buf [row];
386 385
… …
401 delete old_ra; 400 delete old_ra;
402 401
403 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
405 404
406 if (tabs)
407 free (tabs); 405 free (tabs);
408 } 406 }
409 407
410 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
411 409
412 prev_nrow = nrow; 410 prev_nrow = nrow;
413 prev_ncol = ncol; 411 prev_ncol = ncol;
414 412
415 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 413 tabs = (char *)rxvt_malloc (ncol);
416 414
417 for (int col = ncol; col--; ) 415 for (int col = ncol; --col; )
418 tabs [col] = col % TABSIZE == 0; 416 tabs [col] = col % TABSIZE == 0;
419 417
418 if (current_screen != PRIMARY)
419 scr_swap_screen ();
420
420 tt_winch (); 421 tt_winch ();
421 422
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 423 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 424}
424 425
… …
427 * Free everything. That way malloc debugging can find leakage. 428 * Free everything. That way malloc debugging can find leakage.
428 */ 429 */
429void 430void
430rxvt_term::scr_release () NOTHROW 431rxvt_term::scr_release () NOTHROW
431{ 432{
433 if (row_buf)
434 {
432 delete talloc; talloc = 0; 435 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0; 436 delete ralloc; ralloc = 0;
434 437
435 free (row_buf); 438 free (row_buf);
436 free (swap_buf); 439 free (swap_buf);
437 free (drawn_buf); 440 free (drawn_buf);
438 free (tabs); 441 free (tabs);
439 442
440 row_buf = 0; // signal that we freed all the arrays 443 row_buf = 0; // signal that we freed all the arrays
444 }
441} 445}
442 446
443/* ------------------------------------------------------------------------- */ 447/* ------------------------------------------------------------------------- */
444/* 448/*
445 * Hard reset 449 * Hard reset
446 */ 450 */
447void 451void
448rxvt_term::scr_poweron () NOTHROW 452rxvt_term::scr_poweron ()
449{ 453{
450 scr_release (); 454 scr_release ();
451 prev_nrow = prev_ncol = 0; 455 prev_nrow = prev_ncol = 0;
452 scr_reset (); 456 scr_reset ();
453 457
… …
504 assert (s->cur.row >= 0); 508 assert (s->cur.row >= 0);
505 assert (s->cur.col >= 0); 509 assert (s->cur.col >= 0);
506#endif 510#endif
507} 511}
508 512
513void
514rxvt_term::scr_swap_screen ()
515{
516 if (!option (Opt_secondaryScreen))
517 return;
518
519 for (int i = prev_nrow; i--; )
520 ::swap (ROW(i), swap_buf [i]);
521
522 ::swap (screen.cur, swap.cur);
523
524 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
525 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
526}
527
509/* ------------------------------------------------------------------------- */ 528/* ------------------------------------------------------------------------- */
510/* 529/*
511 * Swap between primary and secondary screens 530 * Swap between primary and secondary screens
512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 531 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 532 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514 */ 533 */
515int 534void
516rxvt_term::scr_change_screen (int scrn) NOTHROW 535rxvt_term::scr_change_screen (int scrn)
517{ 536{
537 if (scrn == current_screen)
538 return;
539
518 want_refresh = 1; 540 want_refresh = 1;
519 view_start = 0; 541 view_start = 0;
520 542
521 if (current_screen == scrn)
522 return scrn;
523
524 selection_check (2); /* check for boundary cross */ 543 selection_check (2); /* check for boundary cross */
525 544
526 int i = current_screen; current_screen = scrn; scrn = i; 545 int i = current_screen; current_screen = scrn; scrn = i;
527 546
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 547#if NSCREENS
535 if (OPTION (Opt_secondaryScreen)) 548 if (option (Opt_secondaryScreen))
536 { 549 {
537 num_scr = 0; 550 num_scr = 0;
538 551
539 for (int i = prev_nrow; i--; ) 552 scr_swap_screen ();
540 ::swap (ROW(i), swap_buf [i]);
541 553
542 ::swap (screen.charset, swap.charset); 554 ::swap (screen.charset, swap.charset);
543 ::swap (screen.flags, swap.flags); 555 ::swap (screen.flags, swap.flags);
544 screen.flags |= Screen_VisibleCursor; 556 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 557 swap.flags |= Screen_VisibleCursor;
546 } 558 }
547 else 559 else
548#endif 560#endif
549 if (OPTION (Opt_secondaryScroll)) 561 if (option (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 562 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552 return scrn;
553} 563}
554 564
555// clear WrapNext indicator, solidifying position on next line 565// clear WrapNext indicator, solidifying position on next line
556void 566void
557rxvt_term::scr_do_wrap () NOTHROW 567rxvt_term::scr_do_wrap () NOTHROW
… …
589/* 599/*
590 * Change the rendition style for following text 600 * Change the rendition style for following text
591 */ 601 */
592void 602void
593rxvt_term::scr_rendition (int set, int style) NOTHROW 603rxvt_term::scr_rendition (int set, int style) NOTHROW
594 { 604{
595 if (set) 605 if (set)
596 rstyle |= style; 606 rstyle |= style;
597 else if (style == ~RS_None) 607 else if (style == ~RS_None)
598 rstyle = DEFAULT_RSTYLE; 608 rstyle = DEFAULT_RSTYLE;
599 else 609 else
600 rstyle &= ~style; 610 rstyle &= ~style;
601 } 611}
602 612
603/* ------------------------------------------------------------------------- */ 613/* ------------------------------------------------------------------------- */
604/* 614/*
605 * Scroll text between <row1> and <row2> inclusive, by <count> lines 615 * Scroll text between <row1> and <row2> inclusive, by <count> lines
606 * count positive ==> scroll up 616 * count positive ==> scroll up
… …
615 want_refresh = 1; 625 want_refresh = 1;
616 num_scr += count; 626 num_scr += count;
617 627
618 if (count > 0 628 if (count > 0
619 && row1 == 0 629 && row1 == 0
620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 630 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
621 { 631 {
622 top_row = max (top_row - count, -saveLines); 632 top_row = max (top_row - count, -saveLines);
623 633
624 // scroll everything up 'count' lines 634 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 635 term_start = (term_start + count) % total_rows;
… …
632 } 642 }
633 643
634 // erase newly scrolled-in lines 644 // erase newly scrolled-in lines
635 for (int i = count; i--; ) 645 for (int i = count; i--; )
636 { 646 {
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); 647 line_t &l = ROW(nrow - 1 - i);
640 648
649 // optimize if already cleared, can be significant on slow machines
650 // could be rolled into scr_blank_screen_mem
651 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
652 {
641 scr_blank_line (l, 0, l.l, rstyle); 653 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0; 654 l.l = 0;
644 l.f = 0; 655 l.f = 0;
656 }
657 else
658 scr_blank_screen_mem (l, rstyle);
645 } 659 }
646 660
647 // now copy lines below the scroll region bottom to the 661 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 662 // bottom of the screen again, so they look as if they
649 // hadn't moved. 663 // hadn't moved.
… …
653 line_t &l2 = ROW(i); 667 line_t &l2 = ROW(i);
654 668
655 ::swap (l1, l2); 669 ::swap (l1, l2);
656 l2.touch (); 670 l2.touch ();
657 } 671 }
658 672
659 // move and/or clear selection, if any 673 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 674 if (selection.op && current_screen == selection.screen)
661 { 675 {
662 selection.beg.row -= count; 676 selection.beg.row -= count;
663 selection.end.row -= count; 677 selection.end.row -= count;
… …
671 selection.op = SELECTION_CLEAR; 685 selection.op = SELECTION_CLEAR;
672 } 686 }
673 } 687 }
674 688
675 // finally move the view window, if desired 689 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 690 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 691 && view_start != 0
678 && view_start != -saveLines) 692 && view_start != -saveLines)
679 scr_page (UP, count); 693 scr_page (UP, count);
680 694
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 695 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
699 { 713 {
700 /* move selected region too */ 714 /* move selected region too */
701 selection.beg.row -= count; 715 selection.beg.row -= count;
702 selection.end.row -= count; 716 selection.end.row -= count;
703 selection.mark.row -= count; 717 selection.mark.row -= count;
704 718
705 selection_check (0); 719 selection_check (0);
706 } 720 }
707 } 721 }
708 722
709 // use a simple and robust scrolling algorithm, this 723 // use a simple and robust scrolling algorithm, this
… …
749 ZERO_SCROLLBACK (); 763 ZERO_SCROLLBACK ();
750 764
751 if (minlines > 0) 765 if (minlines > 0)
752 { 766 {
753 minlines += screen.cur.row - screen.bscroll; 767 minlines += screen.cur.row - screen.bscroll;
768 min_it (minlines, screen.cur.row - top_row);
754 769
755 if (minlines > 0 770 if (minlines > 0
756 && screen.tscroll == 0 771 && screen.tscroll == 0
757 && screen.bscroll == nrow - 1) 772 && screen.bscroll == nrow - 1)
758 { 773 {
… …
775 790
776 while (str < strend) 791 while (str < strend)
777 { 792 {
778 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 793 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
779 794
780 if (c < 0x20) 795 if (expect_false (c < 0x20))
781 if (c == C0_LF) 796 if (c == C0_LF)
782 { 797 {
783 max_it (line->l, screen.cur.col); 798 max_it (line->l, screen.cur.col);
784 799
785 screen.flags &= ~Screen_WrapNext; 800 screen.flags &= ~Screen_WrapNext;
… …
804 { 819 {
805 scr_tab (1, true); 820 scr_tab (1, true);
806 continue; 821 continue;
807 } 822 }
808 823
824 if (expect_false (
809 if (checksel /* see if we're writing within selection */ 825 checksel /* see if we're writing within selection */
810 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 826 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
811 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 827 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
828 ))
812 { 829 {
813 checksel = 0; 830 checksel = 0;
814 /* 831 /*
815 * If we wrote anywhere in the selected area, kill the selection 832 * If we wrote anywhere in the selected area, kill the selection
816 * XXX: should we kill the mark too? Possibly, but maybe that 833 * XXX: should we kill the mark too? Possibly, but maybe that
817 * should be a similar check. 834 * should be a similar check.
818 */ 835 */
819 CLEAR_SELECTION (); 836 CLEAR_SELECTION ();
820 } 837 }
821 838
822 if (screen.flags & Screen_WrapNext) 839 if (expect_false (screen.flags & Screen_WrapNext))
823 { 840 {
824 scr_do_wrap (); 841 scr_do_wrap ();
825 842
826 line->l = ncol; 843 line->l = ncol;
827 line->is_longer (1); 844 line->is_longer (1);
828 845
829 row = screen.cur.row; 846 row = screen.cur.row;
830 line = &ROW(row); /* _must_ refresh */ 847 line = &ROW(row); /* _must_ refresh */
831 } 848 }
832 849
833 // some utf-8 decoders "decode" surrogate characters: let's fix this. 850 // some utf-8 decoders "decode" surrogate characters: let's fix this.
834 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 851 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
835 c = 0xfffd; 852 c = 0xfffd;
836 853
837 // rely on wcwidth to tell us the character width, at least for non-latin1 854 // rely on wcwidth to tell us the character width, do wcwidth before
838 // do wcwidth before further replacements, as wcwidth might return -1 855 // 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 856 // drawing characters below as they might be invalid in the current
840 // locale. 857 // locale.
841 int width = c < 0x100 ? 1 : wcwidth (c); 858 int width = WCWIDTH (c);
842 859
843 if (charsets [screen.charset] == '0') // DEC SPECIAL 860 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
844 { 861 {
845 // vt100 special graphics and line drawing 862 // vt100 special graphics and line drawing
846 // 5f-7e standard vt100 863 // 5f-7e standard vt100
847 // 40-5e rxvt extension for extra curses acs chars 864 // 40-5e rxvt extension for extra curses acs chars
848 static uint16_t vt100_0[62] = { // 41 .. 7e 865 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
861 c = vt100_0[c - 0x41]; 878 c = vt100_0[c - 0x41];
862 width = 1; // vt100 line drawing characters are always single-width 879 width = 1; // vt100 line drawing characters are always single-width
863 } 880 }
864 } 881 }
865 882
866 if (screen.flags & Screen_Insert) 883 if (expect_false (screen.flags & Screen_Insert))
867 scr_insdel_chars (width, INSERT); 884 scr_insdel_chars (width, INSERT);
868 885
869 if (width != 0) 886 if (width != 0)
870 { 887 {
871#if !UNICODE_3 888#if !UNICODE_3
… …
877 c = 0xfffd; 894 c = 0xfffd;
878# endif 895# endif
879#endif 896#endif
880 897
881 // nuke the character at this position, if required 898 // nuke the character at this position, if required
899 if (expect_false (
882 if (line->t[screen.cur.col] == NOCHAR 900 line->t[screen.cur.col] == NOCHAR
883 || (screen.cur.col < ncol - 1 901 || (screen.cur.col < ncol - 1
884 && line->t[screen.cur.col + 1] == NOCHAR)) 902 && line->t[screen.cur.col + 1] == NOCHAR)
885 { 903 ))
886 int col = screen.cur.col; 904 scr_kill_char (*line, 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 905
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903 907
904 // if the character doesn't fit into the remaining columns... 908 // if the character doesn't fit into the remaining columns...
905 if (screen.cur.col > ncol - width && ncol >= width) 909 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
906 { 910 {
907 // ...output spaces 911 // ...output spaces
908 c = ' '; 912 c = ' ';
909 // and try the same character next loop iteration 913 // and try the same character next loop iteration
910 --str; 914 --str;
… …
915 do 919 do
916 { 920 {
917 line->t[screen.cur.col] = c; 921 line->t[screen.cur.col] = c;
918 line->r[screen.cur.col] = rend; 922 line->r[screen.cur.col] = rend;
919 923
920 if (screen.cur.col < ncol - 1) 924 if (expect_true (screen.cur.col < ncol - 1))
921 screen.cur.col++; 925 screen.cur.col++;
922 else 926 else
923 { 927 {
924 line->l = ncol; 928 line->l = ncol;
925 if (screen.flags & Screen_Autowrap) 929 if (screen.flags & Screen_Autowrap)
… …
927 break; 931 break;
928 } 932 }
929 933
930 c = NOCHAR; 934 c = NOCHAR;
931 } 935 }
932 while (--width > 0); 936 while (expect_false (--width > 0));
933 937
934 // pad with spaces when overwriting wide character with smaller one 938 // pad with spaces when overwriting wide character with smaller one
935 if (!width) 939 if (expect_false (!width))
936 { 940 {
937 line->touch (); 941 line->touch ();
938 942
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
940 { 944 {
941 line->t[c] = ' '; 945 line->t[c] = ' ';
942 line->r[c] = rend; 946 line->r[c] = rend;
943 } 947 }
944 } 948 }
945 } 949 }
950#if ENABLE_COMBINING
946 else // width == 0 951 else // width == 0
947 { 952 {
948#if ENABLE_COMBINING 953 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 { 954 {
955 // handle combining characters
956 // we just tag the accent on the previous on-screen character.
957 // this is arguably not correct, but also arguably not wrong.
958 // we don't handle double-width characters nicely yet.
959 line_t *linep;
960 text_t *tp;
961 rend_t *rp;
962
963 if (screen.cur.col > 0)
964 {
959 linep = line; 965 linep = line;
960 tp = line->t + screen.cur.col - 1; 966 tp = line->t + screen.cur.col - 1;
961 rp = line->r + screen.cur.col - 1; 967 rp = line->r + screen.cur.col - 1;
968 }
969 else if (screen.cur.row > 0
970 && ROW(screen.cur.row - 1).is_longer ())
971 {
972 linep = &ROW(screen.cur.row - 1);
973 tp = line->t + ncol - 1;
974 rp = line->r + ncol - 1;
975 }
976 else
977 continue;
978
979 linep->touch ();
980
981 while (*tp == NOCHAR && tp > linep->t)
982 tp--, rp--;
983
984 // first try to find a precomposed character
985 unicode_t n = rxvt_compose (*tp, c);
986 if (n == NOCHAR)
987 n = rxvt_composite.compose (*tp, c);
988
989 *tp = n;
990 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
962 } 991 }
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 } 992 }
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 993#endif
986 }
987 } 994 }
988 995
989 max_it (line->l, screen.cur.col); 996 max_it (line->l, screen.cur.col);
990 997
991#ifdef DEBUG_STRICT 998#ifdef DEBUG_STRICT
… …
999 * XTERM_SEQ: CTRL-H 1006 * XTERM_SEQ: CTRL-H
1000 */ 1007 */
1001void 1008void
1002rxvt_term::scr_backspace () NOTHROW 1009rxvt_term::scr_backspace () NOTHROW
1003{ 1010{
1004 want_refresh = 1;
1005
1006 if (screen.cur.col == 0) 1011 if (screen.cur.col == 0)
1007 { 1012 {
1008 if (screen.cur.row > 0) 1013 if (screen.cur.row > 0)
1009 { 1014 {
1010#ifdef TERMCAP_HAS_BW 1015#ifdef TERMCAP_HAS_BW
1011 screen.cur.col = ncol - 1; 1016 screen.cur.col = ncol - 1;
1012 screen.cur.row--; 1017 --screen.cur.row;
1013 return; 1018
1019 want_refresh = 1;
1014#endif 1020#endif
1015 } 1021 }
1016 } 1022 }
1017 else if (!(screen.flags & Screen_WrapNext)) 1023 else
1018 scr_gotorc (0, -1, RELATIVE); 1024 scr_gotorc (0, -1, RELATIVE);
1019
1020 screen.flags &= ~Screen_WrapNext;
1021} 1025}
1022 1026
1023/* ------------------------------------------------------------------------- */ 1027/* ------------------------------------------------------------------------- */
1024/* 1028/*
1025 * Process Horizontal Tab 1029 * Process Horizontal Tab
… …
1048 x = i; 1052 x = i;
1049 1053
1050 if (!--count) 1054 if (!--count)
1051 break; 1055 break;
1052 } 1056 }
1053 else 1057 else
1054 ht &= l.t[i] == ' ' 1058 ht &= l.t[i] == ' '
1055 && RS_SAME (l.r[i], base_rend); 1059 && RS_SAME (l.r[i], base_rend);
1056 1060
1057 if (count) 1061 if (count)
1058 x = ncol - 1; 1062 x = ncol - 1;
1059 1063
1060 // store horizontal tab commands as characters inside the text 1064 // store horizontal tab commands as characters inside the text
1061 // buffer so they can be selected and pasted. 1065 // buffer so they can be selected and pasted.
1062 if (ht && OPTION (Opt_pastableTabs)) 1066 if (ht && option (Opt_pastableTabs))
1063 { 1067 {
1064 base_rend = SET_FONT (base_rend, 0); 1068 base_rend = SET_FONT (base_rend, 0);
1065 1069
1066 l.touch (x); 1070 l.touch (x);
1067 1071
… …
1100 * Process DEC Back Index 1104 * Process DEC Back Index
1101 * XTERM_SEQ: ESC 6 1105 * XTERM_SEQ: ESC 6
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1106 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1107 * in that row right. Clear left column.
1104 */ 1108 */
1105#if ENABLE_FRILLS 1109#if !ENABLE_MINIMAL
1106void 1110void
1107rxvt_term::scr_backindex () NOTHROW 1111rxvt_term::scr_backindex () NOTHROW
1108{ 1112{
1109 if (screen.cur.col > 0) 1113 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1114 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1117 * Process DEC Forward Index 1121 * Process DEC Forward Index
1118 * XTERM_SEQ: ESC 9 1122 * XTERM_SEQ: ESC 9
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1123 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1124 * in that row left. Clear right column.
1121 */ 1125 */
1122#if ENABLE_FRILLS 1126#if !ENABLE_MINIMAL
1123void 1127void
1124rxvt_term::scr_forwardindex () NOTHROW 1128rxvt_term::scr_forwardindex () NOTHROW
1125{ 1129{
1126 if (screen.cur.col < ncol - 1) 1130 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1131 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1174 } 1178 }
1175 } 1179 }
1176 else 1180 else
1177 { 1181 {
1178 if (screen.flags & Screen_Relative) 1182 if (screen.flags & Screen_Relative)
1183 {
1179 { /* relative origin mode */ 1184 /* relative origin mode */
1180 screen.cur.row = row + screen.tscroll; 1185 screen.cur.row = row + screen.tscroll;
1181 min_it (screen.cur.row, screen.bscroll); 1186 min_it (screen.cur.row, screen.bscroll);
1182 } 1187 }
1183 else 1188 else
1184 screen.cur.row = row; 1189 screen.cur.row = row;
… …
1217/* 1222/*
1218 * Erase part or whole of a line 1223 * Erase part or whole of a line
1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1224 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1225 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1226 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1227 * extension: clear to right unless wrapped: ESC [ 3 K
1222 */ 1228 */
1223void 1229void
1224rxvt_term::scr_erase_line (int mode) NOTHROW 1230rxvt_term::scr_erase_line (int mode) NOTHROW
1225{ 1231{
1226 unsigned int col, num; 1232 unsigned int col, num;
… …
1235 line.touch (); 1241 line.touch ();
1236 line.is_longer (0); 1242 line.is_longer (0);
1237 1243
1238 switch (mode) 1244 switch (mode)
1239 { 1245 {
1246 case 3:
1247 if (screen.flags & Screen_WrapNext)
1248 return;
1249
1250 /* fall through */
1251
1240 case 0: /* erase to end of line */ 1252 case 0: /* erase to end of line */
1241 col = screen.cur.col; 1253 col = screen.cur.col;
1242 num = ncol - col; 1254 num = ncol - col;
1243 min_it (line.l, col); 1255 min_it (line.l, col);
1256
1244 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1245 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1246 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1247 break; 1260 break;
1261
1248 case 1: /* erase to beginning of line */ 1262 case 1: /* erase to beginning of line */
1249 col = 0; 1263 col = 0;
1250 num = screen.cur.col + 1; 1264 num = screen.cur.col + 1;
1265
1251 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1252 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1253 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1254 break; 1269 break;
1270
1255 case 2: /* erase whole line */ 1271 case 2: /* erase whole line */
1256 col = 0; 1272 col = 0;
1257 num = ncol; 1273 num = ncol;
1258 line.l = 0; 1274 line.l = 0;
1259 if (selection.beg.row <= screen.cur.row 1275 if (selection.beg.row <= screen.cur.row
… …
1317 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1318 return; 1334 return;
1319 1335
1320 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1321 1337
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1322 if (rstyle & (RS_RVid | RS_Uline)) 1339 if (rstyle & (RS_RVid | RS_Uline))
1323 ren = (rend_t) ~RS_None; 1340 ren = (rend_t) ~RS_None;
1324 else if (GET_BASEBG (rstyle) == Color_bg) 1341 else if (GET_BASEBG (rstyle) == Color_bg)
1325 { 1342 {
1326 ren = DEFAULT_RSTYLE; 1343 ren = DEFAULT_RSTYLE;
1327 CLEAR_ROWS (row, num); 1344
1345 if (mapped)
1346 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False);
1328 } 1349 }
1329 else 1350 else
1330 { 1351 {
1331 ren = rstyle & (RS_fgMask | RS_bgMask); 1352 ren = rstyle & (RS_fgMask | RS_bgMask);
1353
1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1355 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 ERASE_ROWS (row, num); 1356 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row),
1358 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num));
1335 gcvalue.foreground = pix_colors[Color_fg]; 1360 gcvalue.foreground = pix_colors[Color_fg];
1336 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1361 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1337 } 1362 }
1338 1363
1339 for (; num--; row++) 1364 for (; num--; row++)
1340 { 1365 {
1341 scr_blank_screen_mem (ROW(row), rstyle); 1366 scr_blank_screen_mem (ROW(row), rstyle);
1342 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1367 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1343 } 1368 }
1344} 1369}
1345 1370
1346#if ENABLE_FRILLS 1371#if !ENABLE_MINIMAL
1347void 1372void
1348rxvt_term::scr_erase_savelines () NOTHROW 1373rxvt_term::scr_erase_savelines () NOTHROW
1349{ 1374{
1350 want_refresh = 1; 1375 want_refresh = 1;
1351 ZERO_SCROLLBACK (); 1376 ZERO_SCROLLBACK ();
… …
1421 * Insert/Delete <count> characters from the current position 1446 * Insert/Delete <count> characters from the current position
1422 */ 1447 */
1423void 1448void
1424rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1449rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1425{ 1450{
1426 int col, row;
1427 rend_t tr;
1428
1429 want_refresh = 1; 1451 want_refresh = 1;
1430 ZERO_SCROLLBACK (); 1452 ZERO_SCROLLBACK ();
1431 1453
1432 if (count <= 0) 1454 if (count <= 0)
1433 return; 1455 return;
… …
1435 scr_do_wrap (); 1457 scr_do_wrap ();
1436 1458
1437 selection_check (1); 1459 selection_check (1);
1438 min_it (count, ncol - screen.cur.col); 1460 min_it (count, ncol - screen.cur.col);
1439 1461
1440 row = screen.cur.row; 1462 int row = screen.cur.row;
1441 1463
1442 line_t *line = &ROW(row); 1464 line_t *line = &ROW(row);
1443 1465
1444 line->touch (); 1466 line->touch ();
1445 line->is_longer (0); 1467 line->is_longer (0);
1446 1468
1447 switch (insdel) 1469 switch (insdel)
1448 { 1470 {
1449 case INSERT: 1471 case INSERT:
1450 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1472 line->l = min (line->l + count, ncol);
1473
1474 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1451 { 1475 {
1452 line->t[col] = line->t[col - count]; 1476 line->t[col] = line->t[col - count];
1453 line->r[col] = line->r[col - count]; 1477 line->r[col] = line->r[col - count];
1454 } 1478 }
1455
1456 line->l = min (line->l + count, ncol);
1457 1479
1458 if (selection.op && current_screen == selection.screen 1480 if (selection.op && current_screen == selection.screen
1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1481 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1460 { 1482 {
1461 if (selection.end.row != screen.cur.row 1483 if (selection.end.row != screen.cur.row
1462 || (selection.end.col + count >= ncol)) 1484 || (selection.end.col + count >= ncol))
1463 CLEAR_SELECTION (); 1485 CLEAR_SELECTION ();
1464 else 1486 else
1487 {
1465 { /* shift selection */ 1488 /* shift selection */
1466 selection.beg.col += count; 1489 selection.beg.col += count;
1467 selection.mark.col += count; /* XXX: yes? */ 1490 selection.mark.col += count; /* XXX: yes? */
1468 selection.end.col += count; 1491 selection.end.col += count;
1469 } 1492 }
1470 } 1493 }
… …
1475 case ERASE: 1498 case ERASE:
1476 screen.cur.col += count; /* don't worry if > ncol */ 1499 screen.cur.col += count; /* don't worry if > ncol */
1477 selection_check (1); 1500 selection_check (1);
1478 screen.cur.col -= count; 1501 screen.cur.col -= count;
1479 1502
1480 line->l = max (line->l - count, 0);
1481 scr_blank_line (*line, screen.cur.col, count, rstyle); 1503 scr_blank_line (*line, screen.cur.col, count, rstyle);
1482 break; 1504 break;
1483 1505
1484 case DELETE: 1506 case DELETE:
1507 {
1508 line->l = max (line->l - count, 0);
1509
1485 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1510 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1486 1511
1487 for (col = screen.cur.col; (col + count) < ncol; col++) 1512 for (int col = screen.cur.col; (col + count) < ncol; col++)
1488 { 1513 {
1489 line->t[col] = line->t[col + count]; 1514 line->t[col] = line->t[col + count];
1490 line->r[col] = line->r[col + count]; 1515 line->r[col] = line->r[col + count];
1491 } 1516 }
1492 1517
1493 line->l = max (line->l - count, 0); 1518 // nuke wide char at the end
1519 if (line->t[screen.cur.col] == NOCHAR)
1520 scr_kill_char (*line, screen.cur.col);
1521
1494 scr_blank_line (*line, ncol - count, count, tr); 1522 scr_blank_line (*line, ncol - count, count, tr);
1495 1523
1496 if (selection.op && current_screen == selection.screen 1524 if (selection.op && current_screen == selection.screen
1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1525 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1498 { 1526 {
1499 if (selection.end.row != screen.cur.row 1527 if (selection.end.row != screen.cur.row
1500 || (screen.cur.col >= selection.beg.col - count) 1528 || (screen.cur.col >= selection.beg.col - count)
1501 || selection.end.col >= ncol) 1529 || selection.end.col >= ncol)
1502 CLEAR_SELECTION (); 1530 CLEAR_SELECTION ();
1503 else 1531 else
1504 { 1532 {
1505 /* shift selection */ 1533 /* shift selection */
1506 selection.beg.col -= count; 1534 selection.beg.col -= count;
1507 selection.mark.col -= count; /* XXX: yes? */ 1535 selection.mark.col -= count; /* XXX: yes? */
1508 selection.end.col -= count; 1536 selection.end.col -= count;
1509 } 1537 }
1538 }
1510 } 1539 }
1511 1540
1512 break; 1541 break;
1513 } 1542 }
1514} 1543}
… …
1609 */ 1638 */
1610void 1639void
1611rxvt_term::scr_set_tab (int mode) NOTHROW 1640rxvt_term::scr_set_tab (int mode) NOTHROW
1612{ 1641{
1613 if (mode < 0) 1642 if (mode < 0)
1614 memset (tabs, 0, ncol * sizeof (char)); 1643 memset (tabs, 0, ncol);
1615 else if (screen.cur.col < ncol) 1644 else if (screen.cur.col < ncol)
1616 tabs [screen.cur.col] = !!mode; 1645 tabs [screen.cur.col] = !!mode;
1617} 1646}
1618 1647
1619/* ------------------------------------------------------------------------- */ 1648/* ------------------------------------------------------------------------- */
… …
1621 * Set reverse/normal video 1650 * Set reverse/normal video
1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1651 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1652 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1624 */ 1653 */
1625void 1654void
1626rxvt_term::scr_rvideo_mode (int mode) NOTHROW 1655rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1627{ 1656{
1628 XGCValues gcvalue; 1657 rvideo_mode = on;
1629 1658
1659#ifndef NO_BELL
1660 on ^= rvideo_bell;
1661#endif
1662
1630 if (rvideo != mode) 1663 if (rvideo_state != on)
1631 { 1664 {
1632 rvideo = mode; 1665 rvideo_state = on;
1666
1633 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1667 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1634#if XPM_BACKGROUND 1668#ifdef HAVE_BG_PIXMAP
1635 if (bgPixmap.pixmap == None) 1669 if (bgPixmap.pixmap == None)
1636#endif 1670#endif
1637#if TRANSPARENT 1671 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 1672
1673 XGCValues gcvalue;
1643 gcvalue.foreground = pix_colors[Color_fg]; 1674 gcvalue.foreground = pix_colors[Color_fg];
1644 gcvalue.background = pix_colors[Color_bg]; 1675 gcvalue.background = pix_colors[Color_bg];
1645 XChangeGC (display->display, gc, GCBackground | GCForeground, 1676 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1646 &gcvalue); 1677
1647 scr_clear (); 1678 scr_clear ();
1648 scr_touch (true); 1679 scr_touch (true);
1649 } 1680 }
1650} 1681}
1651 1682
… …
1735{ 1766{
1736 bool found = false; 1767 bool found = false;
1737 1768
1738 for (int i = 0; i < nrow; i++) 1769 for (int i = 0; i < nrow; i++)
1739 { 1770 {
1740 int col = 0;
1741 rend_t *drp = drawn_buf[i].r; 1771 rend_t *drp = drawn_buf[i].r;
1742 1772
1743 for (; col < ncol; col++, drp++) 1773 for (int col = 0; col < ncol; col++, drp++)
1744 if ((*drp & mask) == value) 1774 if ((*drp & mask) == value)
1745 { 1775 {
1746 found = true; 1776 found = true;
1747 *drp = ~value; 1777 *drp = ~value;
1748 } 1778 }
… …
1788 for (i = PART_BEG; i < RC_COUNT; i++) 1818 for (i = PART_BEG; i < RC_COUNT; i++)
1789 { 1819 {
1790 min_it (rc[i].col, ncol - 1); 1820 min_it (rc[i].col, ncol - 1);
1791 min_it (rc[i].row, nrow - 1); 1821 min_it (rc[i].row, nrow - 1);
1792 } 1822 }
1793 1823// 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++) 1824 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); 1825 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1796 1826
1797 num_scr_allow = 0; 1827 num_scr_allow = 0;
1798 1828
… …
1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1881 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1852 1882
1853 return true; 1883 return true;
1854} 1884}
1855 1885
1886#ifndef NO_BELL
1887void
1888rxvt_term::bell_cb (ev::timer &w, int revents)
1889{
1890 rvideo_bell = false;
1891 scr_rvideo_mode (rvideo_mode);
1892 refresh_check ();
1893}
1894#endif
1895
1856/* ------------------------------------------------------------------------- */ 1896/* ------------------------------------------------------------------------- */
1857void 1897void
1858rxvt_term::scr_bell () NOTHROW 1898rxvt_term::scr_bell () NOTHROW
1859{ 1899{
1860#ifndef NO_BELL 1900#ifndef NO_BELL
1861 1901
1862# ifndef NO_MAPALERT 1902# ifndef NO_MAPALERT
1863# ifdef MAPALERT_OPTION 1903# ifdef MAPALERT_OPTION
1864 if (OPTION (Opt_mapAlert)) 1904 if (option (Opt_mapAlert))
1865# endif 1905# endif
1866 XMapWindow (display->display, parent[0]); 1906 XMapWindow (dpy, parent[0]);
1867# endif 1907# endif
1868 1908
1909# if ENABLE_FRILLS
1910 if (option (Opt_urgentOnBell))
1911 set_urgency (1);
1912# endif
1913
1869 if (OPTION (Opt_visualBell)) 1914 if (option (Opt_visualBell))
1870 { 1915 {
1871 scr_rvideo_mode (!rvideo); /* refresh also done */ 1916 rvideo_bell = true;
1917 scr_rvideo_mode (rvideo_mode);
1872 display->flush (); 1918 flush ();
1919
1873 rxvt_usleep (VISUAL_BELL_DURATION); 1920 bell_ev.start (VISUAL_BELL_DURATION);
1874 scr_rvideo_mode (!rvideo); /* refresh also done */
1875 } 1921 }
1876 else 1922 else
1877 XBell (display->display, 0); 1923 XBell (dpy, 0);
1878
1879#endif 1924#endif
1880} 1925}
1881 1926
1882/* ------------------------------------------------------------------------- */ 1927/* ------------------------------------------------------------------------- */
1883/* ARGSUSED */ 1928/* ARGSUSED */
1884void 1929void
1885rxvt_term::scr_printscreen (int fullhist) NOTHROW 1930rxvt_term::scr_printscreen (int fullhist) NOTHROW
1886{ 1931{
1887#ifdef PRINTPIPE 1932#ifdef PRINTPIPE
1888 int nrows, row_start; 1933 int nrows, row_start;
1889 FILE *fd; 1934 FILE *fd = popen_printer ();
1890 1935
1891 if ((fd = popen_printer ()) == NULL) 1936 if (!fd)
1892 return; 1937 return;
1893 1938
1894 if (fullhist) 1939 if (fullhist)
1895 { 1940 {
1896 nrows = nrow - top_row; 1941 nrows = nrow - top_row;
… …
1941 * screen.text/screen.rend contain what the screen will change to. 1986 * screen.text/screen.rend contain what the screen will change to.
1942 */ 1987 */
1943void 1988void
1944rxvt_term::scr_refresh () NOTHROW 1989rxvt_term::scr_refresh () NOTHROW
1945{ 1990{
1946 unsigned char must_clear, /* use draw_string not draw_image_string */ 1991 unsigned char have_bg,
1947 showcursor; /* show the cursor */ 1992 showcursor; /* show the cursor */
1948 int16_t col, row, /* column/row we're processing */ 1993 int16_t col, row, /* column/row we're processing */
1949 ocrow; /* old cursor row */ 1994 ocrow; /* old cursor row */
1950 int i; /* tmp */ 1995 int i; /* tmp */
1951#ifndef NO_CURSORCOLOR 1996#ifndef NO_CURSORCOLOR
1952 rend_t cc1; /* store colours at cursor position (s) */ 1997 rend_t cc1; /* store colours at cursor position (s) */
1953#endif 1998#endif
1954 rend_t *crp; // cursor rendition pointer 1999 rend_t *crp; // cursor rendition pointer
2000 rend_t ccol1, /* Cursor colour */
2001 ccol2; /* Cursor colour2 */
1955 2002
1956 want_refresh = 0; /* screen is current */ 2003 want_refresh = 0; /* screen is current */
1957 2004
1958 if (refresh_type == NO_REFRESH || !mapped) 2005 if (refresh_type == NO_REFRESH || !mapped)
1959 return; 2006 return;
1960 2007
1961 /* 2008 /*
1962 * A: set up vars 2009 * A: set up vars
1963 */ 2010 */
1964 must_clear = 0;
1965 refresh_count = 0; 2011 refresh_count = 0;
1966 2012
1967#if XPM_BACKGROUND 2013 have_bg = 0;
2014#ifdef HAVE_BG_PIXMAP
1968 must_clear |= bgPixmap.pixmap != None; 2015 have_bg = bgPixmap.pixmap != None;
1969#endif
1970#if TRANSPARENT
1971 must_clear |= OPTION (Opt_transparent) && am_transparent;
1972#endif 2016#endif
1973 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2017 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1974 2018
1975 /* 2019 /*
1976 * B: reverse any characters which are selected 2020 * B: reverse any characters which are selected
… …
1980 /* 2024 /*
1981 * C: set the cursor character (s) 2025 * C: set the cursor character (s)
1982 */ 2026 */
1983 { 2027 {
1984 unsigned char setoldcursor; 2028 unsigned char setoldcursor;
1985 rend_t ccol1, /* Cursor colour */
1986 ccol2; /* Cursor colour2 */
1987 2029
1988 showcursor = (screen.flags & Screen_VisibleCursor); 2030 showcursor = (screen.flags & Screen_VisibleCursor);
1989#ifdef CURSOR_BLINK 2031#ifdef CURSOR_BLINK
1990 if (hidden_cursor) 2032 if (hidden_cursor)
1991 showcursor = 0; 2033 showcursor = 0;
… …
1998 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2040 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1999 col--; 2041 col--;
2000 2042
2001 crp = &ROW(screen.cur.row).r[col]; 2043 crp = &ROW(screen.cur.row).r[col];
2002 2044
2045#ifndef NO_CURSORCOLOR
2046 cc1 = *crp & (RS_fgMask | RS_bgMask);
2047 if (ISSET_PIXCOLOR (Color_cursor))
2048 ccol1 = Color_cursor;
2049 else
2050#endif
2051#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2052 ccol1 = fgcolor_of (rstyle);
2053#else
2054 ccol1 = Color_fg;
2055#endif
2056
2057#ifndef NO_CURSORCOLOR
2058 if (ISSET_PIXCOLOR (Color_cursor2))
2059 ccol2 = Color_cursor2;
2060 else
2061#endif
2062#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2063 ccol2 = bgcolor_of (rstyle);
2064#else
2065 ccol2 = Color_bg;
2066#endif
2067
2003 if (showcursor && focus) 2068 if (showcursor && focus)
2004 { 2069 {
2005 if (OPTION (Opt_cursorUnderline)) 2070 if (option (Opt_cursorUnderline))
2006 *crp ^= RS_Uline; 2071 *crp ^= RS_Uline;
2007 else 2072 else
2008 { 2073 {
2009 *crp ^= RS_RVid; 2074 *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); 2075 *crp = SET_FGCOLOR (*crp, ccol1);
2030 *crp = SET_BGCOLOR (*crp, ccol2); 2076 *crp = SET_BGCOLOR (*crp, ccol2);
2031#endif
2032 } 2077 }
2033 } 2078 }
2034 } 2079 }
2035 2080
2036 /* make sure no outline cursor is left around */ 2081 /* make sure no outline cursor is left around */
… …
2075 * D: CopyArea pass - very useful for slower links 2120 * D: CopyArea pass - very useful for slower links
2076 * This has been deliberately kept simple. 2121 * This has been deliberately kept simple.
2077 */ 2122 */
2078 if (!display->is_local 2123 if (!display->is_local
2079 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2124 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2080 && abs (num_scr) < nrow && !must_clear) 2125 && abs (num_scr) < nrow && !have_bg)
2081 { 2126 {
2082 int16_t nits; 2127 int16_t nits;
2128 int i = num_scr;
2083 int j; 2129 int j;
2084 int len, wlen; 2130 int len, wlen;
2085 dLocal (int, num_scr); 2131 dLocal (int, num_scr);
2086 2132
2087 j = nrow; 2133 j = nrow;
2088 wlen = len = -1; 2134 wlen = len = -1;
2089 row = i > 0 ? 0 : j - 1; 2135 row = i > 0 ? 0 : j - 1;
2136
2090 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2137 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2091 { 2138 {
2092 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2139 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2093 { 2140 {
2094 line_t s = ROW(view_start + row); 2141 line_t s = ROW(view_start + row);
… …
2115 wlen = row; 2162 wlen = row;
2116 continue; 2163 continue;
2117 } 2164 }
2118 } 2165 }
2119 2166
2120 if (len != -1) 2167 if (len >= 0)
2121 { 2168 {
2122 /* also comes here at end if needed because of >= above */ 2169 /* also comes here at end if needed because of >= above */
2123 if (wlen < len) 2170 if (wlen < len)
2124 ::swap (wlen, len); 2171 ::swap (wlen, len);
2125 2172
2173 XGCValues gcv;
2174
2175 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2126 XCopyArea (display->display, vt, vt, 2176 XCopyArea (dpy, vt, vt,
2127 gc, 0, Row2Pixel (len + i), 2177 gc, 0, Row2Pixel (len + i),
2128 (unsigned int)this->width, 2178 (unsigned int)this->width,
2129 (unsigned int)Height2Pixel (wlen - len + 1), 2179 (unsigned int)Height2Pixel (wlen - len + 1),
2130 0, Row2Pixel (len)); 2180 0, Row2Pixel (len));
2181 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2182
2131 len = -1; 2183 len = -1;
2132 } 2184 }
2133 } 2185 }
2134 } 2186 }
2135#endif 2187#endif
… …
2159 continue; 2211 continue;
2160 2212
2161 // redraw one or more characters 2213 // redraw one or more characters
2162 2214
2163 // seek to the beginning of wide characters 2215 // seek to the beginning of wide characters
2164 while (stp[col] == NOCHAR && col > 0) 2216 while (expect_false (stp[col] == NOCHAR && col > 0))
2165 --col; 2217 --col;
2166 2218
2167 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2219 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2168 text_t *text = stp + col; 2220 text_t *text = stp + col;
2169 int count = 1; 2221 int count = 1;
… …
2191 count++; 2243 count++;
2192 2244
2193 if (stp[col] != dtp[col] 2245 if (stp[col] != dtp[col]
2194 || !RS_SAME (srp[col], drp[col])) 2246 || !RS_SAME (srp[col], drp[col]))
2195 { 2247 {
2196 if (must_clear && (i++ > count / 2)) 2248 if (have_bg && (i++ > count / 2))
2197 break; 2249 break;
2198 2250
2199 dtp[col] = stp[col]; 2251 dtp[col] = stp[col];
2200 drp[col] = rend; 2252 drp[col] = rend;
2201 i = 0; 2253 i = 0;
2202 } 2254 }
2203 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2255 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2204 break; 2256 break;
2205 } 2257 }
2206 2258
2207 col--; /* went one too far. move back */ 2259 col--; /* went one too far. move back */
2208 count -= i; /* dump any matching trailing chars */ 2260 count -= i; /* dump any matching trailing chars */
2209 2261
2210 // sometimes we optimize away the trailing NOCHAR's, add them back 2262 // sometimes we optimize away the trailing NOCHAR's, add them back
2211 while (i && text[count] == NOCHAR) 2263 while (expect_false (i && text[count] == NOCHAR))
2212 count++, i--; 2264 count++, i--;
2213 2265
2214 /* 2266 /*
2215 * Determine the attributes for the string 2267 * Determine the attributes for the string
2216 */ 2268 */
2217 int fore = fgcolor_of (rend); // desired foreground 2269 int fore = fgcolor_of (rend); // desired foreground
2218 int back = bgcolor_of (rend); // desired background 2270 int back = bgcolor_of (rend); // desired background
2219 2271
2220 // only do special processing if any attributes are set, which is unlikely 2272 // 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)) 2273 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2222 { 2274 {
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; 2275 bool invert = rend & RS_RVid;
2236 2276
2237#ifndef NO_BOLD_UNDERLINE_REVERSE 2277#ifndef NO_BOLD_UNDERLINE_REVERSE
2238 if (rend & RS_Bold
2239 && fore == Color_fg) 2278 if (rend & RS_Bold && fore == Color_fg)
2240 { 2279 {
2241 if (ISSET_PIXCOLOR (Color_BD)) 2280 if (ISSET_PIXCOLOR (Color_BD))
2242 fore = Color_BD; 2281 fore = Color_BD;
2243# if !ENABLE_STYLES 2282# if !ENABLE_STYLES
2244 else 2283 else
2245 invert = !invert; 2284 invert = !invert;
2246# endif 2285# endif
2247 } 2286 }
2248 2287
2249 if (rend & RS_Italic 2288 if (rend & RS_Italic && fore == Color_fg)
2250 && fore == Color_fg)
2251 { 2289 {
2252 if (ISSET_PIXCOLOR (Color_IT)) 2290 if (ISSET_PIXCOLOR (Color_IT))
2253 fore = Color_IT; 2291 fore = Color_IT;
2254# if !ENABLE_STYLES 2292# if !ENABLE_STYLES
2255 else 2293 else
2256 invert = !invert; 2294 invert = !invert;
2257# endif 2295# endif
2258 } 2296 }
2259 2297
2260 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2298 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2261 fore = Color_UL; 2299 fore = Color_UL;
2262#endif 2300#endif
2263 2301
2264 if (invert) 2302 if (invert)
2265 { 2303 {
2304#ifdef OPTION_HC
2305 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2306 || !ISSET_PIXCOLOR (Color_HC))
2307#endif
2308 /* invert the column if no highlightColor is set or it is the
2309 * current cursor column */
2266 ::swap (fore, back); 2310 ::swap (fore, back);
2311#ifdef OPTION_HC
2312 else if (ISSET_PIXCOLOR (Color_HC))
2313 back = Color_HC;
2314#endif
2267 2315
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2316#ifndef NO_BOLD_UNDERLINE_REVERSE
2317# ifndef OPTION_HC
2269 if (ISSET_PIXCOLOR (Color_RV)) 2318 if (ISSET_PIXCOLOR (Color_RV))
2270 back = Color_RV; 2319 back = Color_RV;
2271 2320# endif
2272 if (fore == back) 2321 if (fore == back)
2273 { 2322 {
2274 fore = Color_bg; 2323 fore = Color_bg;
2275 back = Color_fg; 2324 back = Color_fg;
2276 } 2325 }
… …
2278 } 2327 }
2279 2328
2280#ifdef TEXT_BLINK 2329#ifdef TEXT_BLINK
2281 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2330 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2282 { 2331 {
2283 if (!text_blink_ev.active) 2332 if (!text_blink_ev.is_active ())
2284 { 2333 {
2285 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2334 text_blink_ev.again ();
2286 hidden_text = 0; 2335 hidden_text = 0;
2287 } 2336 }
2288 else if (hidden_text) 2337 else if (hidden_text)
2289 fore = back; 2338 fore = back;
2290 } 2339 }
2291#endif 2340#endif
2341
2342#if ENABLE_STYLES
2343 // "careful" (too wide) character handling
2344
2345 // include previous careful character(s) if possible, looks nicer (best effort...)
2346 while (text > stp
2347 && srp[text - stp - 1] & RS_Careful
2348 && RS_SAME (rend, srp[text - stp - 1]))
2349 text--, count++, xpixel -= fwidth;
2350
2351 // force redraw after "careful" characters to avoid pixel droppings
2352 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2353 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2354
2355 // force redraw before "careful" characters to avoid pixel droppings
2356 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2357 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2358#endif
2292 } 2359 }
2293 2360
2294 /* 2361 /*
2295 * Actually do the drawing of the string here 2362 * Actually do the drawing of the string here
2296 */ 2363 */
2297 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2364 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2298 2365
2299 if (back == fore) 2366 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 { 2367 {
2305 if (must_clear) 2368 // this is very ugly, maybe push it into ->draw?
2306 {
2307 CLEAR_CHARS (xpixel, ypixel, count);
2308 2369
2309 for (i = 0; i < count; i++) /* don't draw empty strings */ 2370 for (i = 0; i < count; i++) /* don't draw empty strings */
2310 if (text[i] != ' ') 2371 if (text[i] != ' ')
2311 { 2372 {
2312 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2313 break; 2374 goto did_clear;
2314 }
2315 } 2375 }
2316 else 2376
2317 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2377 CLEAR_CHARS (xpixel, ypixel, count);
2378 did_clear: ;
2318 } 2379 }
2319 else 2380 else
2320 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2381 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2321 2382
2322 if (rend & RS_Uline && font->descent > 1 && fore != back) 2383 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2323 { 2384 {
2324#if ENABLE_FRILLS 2385#if ENABLE_FRILLS
2325 if (ISSET_PIXCOLOR (Color_underline)) 2386 if (ISSET_PIXCOLOR (Color_underline))
2326 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2387 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2327 else 2388 else
2328#endif 2389#endif
2329 XSetForeground (display->display, gc, pix_colors[fore]); 2390 XSetForeground (dpy, gc, pix_colors[fore]);
2330 2391
2331 XDrawLine (display->display, drawBuffer, gc, 2392 XDrawLine (dpy, vt, gc,
2332 xpixel, ypixel + font->ascent + 1, 2393 xpixel, ypixel + font->ascent + 1,
2333 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2394 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2334 } 2395 }
2335 } /* for (col....) */ 2396 } /* for (col....) */
2336 } /* for (row....) */ 2397 } /* for (row....) */
… …
2345 */ 2406 */
2346 if (showcursor) 2407 if (showcursor)
2347 { 2408 {
2348 if (focus) 2409 if (focus)
2349 { 2410 {
2350 if (OPTION (Opt_cursorUnderline)) 2411 if (option (Opt_cursorUnderline))
2351 *crp ^= RS_Uline; 2412 *crp ^= RS_Uline;
2352 else 2413 else
2353 { 2414 {
2354 *crp ^= RS_RVid; 2415 *crp ^= RS_RVid;
2355#ifndef NO_CURSORCOLOR 2416#ifndef NO_CURSORCOLOR
… …
2369 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2430 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2370 cursorwidth++; 2431 cursorwidth++;
2371 2432
2372#ifndef NO_CURSORCOLOR 2433#ifndef NO_CURSORCOLOR
2373 if (ISSET_PIXCOLOR (Color_cursor)) 2434 if (ISSET_PIXCOLOR (Color_cursor))
2374 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2435 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2436 else
2375#endif 2437#endif
2438 XSetForeground (dpy, gc, pix_colors[ccol1]);
2376 2439
2377 XDrawRectangle (display->display, drawBuffer, gc, 2440 XDrawRectangle (dpy, vt, gc,
2378 Col2Pixel (col), 2441 Col2Pixel (col),
2379 Row2Pixel (oldcursor.row), 2442 Row2Pixel (oldcursor.row),
2380 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2443 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2381 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2444 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2382 } 2445 }
… …
2417} 2480}
2418 2481
2419void 2482void
2420rxvt_term::scr_recolour () NOTHROW 2483rxvt_term::scr_recolour () NOTHROW
2421{ 2484{
2422 if (1 2485#ifdef HAVE_BG_PIXMAP
2423#if TRANSPARENT 2486 bgPixmap.apply ();
2424 && !am_transparent 2487#else
2425#endif 2488
2426#if XPM_BACKGROUND
2427 && !bgPixmap.pixmap
2428#endif
2429 )
2430 {
2431 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2489 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2432 XClearWindow (display->display, parent[0]); 2490 XClearWindow (dpy, parent[0]);
2433 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2491 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2434#if HAVE_SCROLLBARS 2492
2435 if (scrollBar.win) 2493 if (scrollBar.win)
2436 { 2494 {
2437 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2495 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2438 scrollBar.setIdle (); 2496 scrollBar.state = STATE_IDLE;
2439 scrollbar_show (0); 2497 scrollBar.show (0);
2440 }
2441#endif
2442 } 2498 }
2443 2499
2500#endif
2501
2502 /* bgPixmap.apply () does not do the following : */
2444 scr_clear (); 2503 scr_clear ();
2445 scr_touch (true); 2504 scr_touch (true);
2446 want_refresh = 1; 2505 want_refresh = 1;
2447} 2506}
2448 2507
… …
2455 2514
2456 num_scr_allow = 0; 2515 num_scr_allow = 0;
2457 want_refresh = 1; 2516 want_refresh = 1;
2458 2517
2459 if (really) 2518 if (really)
2460 XClearWindow (display->display, vt); 2519 XClearWindow (dpy, vt);
2461} 2520}
2462 2521
2463void 2522void
2464rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2523rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2465{ 2524{
… …
2514{ 2573{
2515 if (selection.op 2574 if (selection.op
2516 && current_screen == selection.screen 2575 && current_screen == selection.screen
2517 && selection.end.row >= view_start) 2576 && selection.end.row >= view_start)
2518 { 2577 {
2519#if ENABLE_FRILLS 2578#if !ENABLE_MINIMAL
2520 if (selection.rect) 2579 if (selection.rect)
2521 scr_xor_rect (selection.beg.row, selection.beg.col, 2580 scr_xor_rect (selection.beg.row, selection.beg.col,
2522 selection.end.row, selection.end.col, 2581 selection.end.row, selection.end.col,
2523 RS_RVid, RS_RVid | RS_Uline); 2582 RS_RVid, RS_RVid | RS_Uline);
2524 else 2583 else
… …
2540{ 2599{
2541 int row, wrote; 2600 int row, wrote;
2542 unsigned int width, towrite; 2601 unsigned int width, towrite;
2543 char r1[] = "\n"; 2602 char r1[] = "\n";
2544 2603
2545 for (row = saveLines - nsaved; 2604 for (row = saveLines + top_row;
2546 row < saveLines + nrow - 1; row++) 2605 row < saveLines + nrow - 1; row++)
2547 { 2606 {
2548 width = row_buf[row].l >= 0 ? row_buf[row].l 2607 width = row_buf[row].l >= 0 ? row_buf[row].l
2549 : ncol; 2608 : ncol;
2550 for (towrite = width; towrite; towrite -= wrote) 2609 for (towrite = width; towrite; towrite -= wrote)
… …
2601 /* convert normal newline chars into common keyboard Return key sequence */ 2660 /* convert normal newline chars into common keyboard Return key sequence */
2602 for (unsigned int i = 0; i < len; i++) 2661 for (unsigned int i = 0; i < len; i++)
2603 if (data[i] == C0_LF) 2662 if (data[i] == C0_LF)
2604 data[i] = C0_CR; 2663 data[i] = C0_CR;
2605 2664
2665 if (priv_modes & PrivMode_BracketPaste)
2666 tt_printf ("\e[200~");
2667
2606 tt_write (data, len); 2668 tt_write (data, len);
2669
2670 if (priv_modes & PrivMode_BracketPaste)
2671 tt_printf ("\e[201~");
2607} 2672}
2608 2673
2609/* ------------------------------------------------------------------------- */ 2674/* ------------------------------------------------------------------------- */
2610/* 2675/*
2611 * Respond to a notification that a primary selection has been sent 2676 * Respond to a notification that a primary selection has been sent
… …
2640 } 2705 }
2641 2706
2642 unsigned long bytes_after; 2707 unsigned long bytes_after;
2643 XTextProperty ct; 2708 XTextProperty ct;
2644 2709
2645 if (XGetWindowProperty (display->display, win, prop, 2710 if (XGetWindowProperty (dpy, win, prop,
2646 0, PROP_SIZE / 4, 2711 0, PROP_SIZE / 4,
2647 delete_prop, AnyPropertyType, 2712 delete_prop, AnyPropertyType,
2648 &ct.encoding, &ct.format, 2713 &ct.encoding, &ct.format,
2649 &ct.nitems, &bytes_after, 2714 &ct.nitems, &bytes_after,
2650 &ct.value) != Success) 2715 &ct.value) != Success)
… …
2659 if (bytes_after) 2724 if (bytes_after)
2660 { 2725 {
2661 // fetch and append remaining data 2726 // fetch and append remaining data
2662 XTextProperty ct2; 2727 XTextProperty ct2;
2663 2728
2664 if (XGetWindowProperty (display->display, win, prop, 2729 if (XGetWindowProperty (dpy, win, prop,
2665 ct.nitems / 4, (bytes_after + 3) / 4, 2730 ct.nitems / 4, (bytes_after + 3) / 4,
2666 delete_prop, AnyPropertyType, 2731 delete_prop, AnyPropertyType,
2667 &ct2.encoding, &ct2.format, 2732 &ct2.encoding, &ct2.format,
2668 &ct2.nitems, &bytes_after, 2733 &ct2.nitems, &bytes_after,
2669 &ct2.value) != Success) 2734 &ct2.value) != Success)
… …
2682 2747
2683 if (ct.encoding == xa[XA_INCR]) 2748 if (ct.encoding == xa[XA_INCR])
2684 { 2749 {
2685 // INCR selection, start handshake 2750 // INCR selection, start handshake
2686 if (!delete_prop) 2751 if (!delete_prop)
2687 XDeleteProperty (display->display, win, prop); 2752 XDeleteProperty (dpy, win, prop);
2688 2753
2689 selection_wait = Sel_incr; 2754 selection_wait = Sel_incr;
2690 incr_buf_fill = 0; 2755 incr_buf_fill = 0;
2691 incr_ev.start (NOW + 10); 2756 incr_ev.start (10);
2692 2757
2693 goto bailout; 2758 goto bailout;
2694 } 2759 }
2695 2760
2696 if (ct.nitems == 0) 2761 if (ct.nitems == 0)
… …
2705 ct.nitems = incr_buf_fill; 2770 ct.nitems = incr_buf_fill;
2706 incr_buf = 0; 2771 incr_buf = 0;
2707 incr_buf_size = 0; 2772 incr_buf_size = 0;
2708 incr_ev.stop (); 2773 incr_ev.stop ();
2709 } 2774 }
2710 else 2775 else
2711 { 2776 {
2712 if (selection_wait == Sel_normal 2777 if (selection_wait == Sel_normal
2713 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2778 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2714 { 2779 {
2715 /* 2780 /*
… …
2722 goto bailout; 2787 goto bailout;
2723 } 2788 }
2724 } 2789 }
2725 else if (selection_wait == Sel_incr) 2790 else if (selection_wait == Sel_incr)
2726 { 2791 {
2727 incr_ev.start (NOW + 10); 2792 incr_ev.start (10);
2728 2793
2729 while (incr_buf_fill + ct.nitems > incr_buf_size) 2794 while (incr_buf_fill + ct.nitems > incr_buf_size)
2730 { 2795 {
2731 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2796 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2732 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2797 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2739 } 2804 }
2740 2805
2741 char **cl; 2806 char **cl;
2742 int cr; 2807 int cr;
2743 2808
2744#if ENABLE_FRILLS 2809#if !ENABLE_MINIMAL
2745 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2810 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2746 // so recode it manually 2811 // so recode it manually
2747 if (ct.encoding == xa[XA_UTF8_STRING]) 2812 if (ct.encoding == xa[XA_UTF8_STRING])
2748 { 2813 {
2749 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2814 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2753 paste (s, strlen (s)); 2818 paste (s, strlen (s));
2754 free (s); 2819 free (s);
2755 } 2820 }
2756 else 2821 else
2757#endif 2822#endif
2758 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2823 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2759 && cl) 2824 && cl)
2760 { 2825 {
2761 for (int i = 0; i < cr; i++) 2826 for (int i = 0; i < cr; i++)
2762 paste (cl[i], strlen (cl[i])); 2827 paste (cl[i], strlen (cl[i]));
2763 2828
… …
2772 if (selection_wait == Sel_normal) 2837 if (selection_wait == Sel_normal)
2773 selection_wait = Sel_none; 2838 selection_wait = Sel_none;
2774} 2839}
2775 2840
2776void 2841void
2777rxvt_term::incr_cb (time_watcher &w) NOTHROW 2842rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2778{ 2843{
2779 selection_wait = Sel_none; 2844 selection_wait = Sel_none;
2780 2845
2781 incr_buf_size = 0; 2846 incr_buf_size = 0;
2782 free (incr_buf); 2847 free (incr_buf);
… …
2793 selection_paste (win, prop, true); 2858 selection_paste (win, prop, true);
2794} 2859}
2795 2860
2796/* ------------------------------------------------------------------------- */ 2861/* ------------------------------------------------------------------------- */
2797/* 2862/*
2798 * Request the current selection: 2863 * Request the current selection:
2799 * Order: > internal selection if available 2864 * Order: > internal selection if available
2800 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2865 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2801 * > CUT_BUFFER0 2866 * > CUT_BUFFER0
2802 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2867 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2803 * will auto fallback to CUT_BUFFER0 2868 * will auto fallback to CUT_BUFFER0
… …
2805 */ 2870 */
2806void 2871void
2807rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2872rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2808{ 2873{
2809 if (selection.text && selnum == Sel_Primary) 2874 if (selection.text && selnum == Sel_Primary)
2875 {
2810 { /* internal selection */ 2876 /* internal selection */
2811 char *str = rxvt_wcstombs (selection.text, selection.len); 2877 char *str = rxvt_wcstombs (selection.text, selection.len);
2812 paste (str, strlen (str)); 2878 paste (str, strlen (str));
2813 free (str); 2879 free (str);
2814 return; 2880 return;
2815 } 2881 }
… …
2845 else if (selnum == Sel_Secondary) 2911 else if (selnum == Sel_Secondary)
2846 sel = XA_SECONDARY; 2912 sel = XA_SECONDARY;
2847 else 2913 else
2848 sel = xa[XA_CLIPBOARD]; 2914 sel = xa[XA_CLIPBOARD];
2849 2915
2850 if (XGetSelectionOwner (display->display, sel) != None) 2916 if (XGetSelectionOwner (dpy, sel) != None)
2851 { 2917 {
2852 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2918 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2853 vt, selection_request_time); 2919 vt, selection_request_time);
2854 return 1; 2920 return 1;
2855 } 2921 }
2856 2922
2857 return 0; 2923 return 0;
… …
2920 2986
2921 int end_col; 2987 int end_col;
2922 2988
2923 for (; row <= selection.end.row; row++, col = 0) 2989 for (; row <= selection.end.row; row++, col = 0)
2924 { 2990 {
2925#if ENABLE_FRILLS 2991#if !ENABLE_MINIMAL
2926 if (selection.rect) 2992 if (selection.rect)
2927 { 2993 {
2928 col = selection.beg.col; 2994 col = selection.beg.col;
2929 end_col = ncol + 1; 2995 end_col = ncol + 1;
2930 } 2996 }
… …
2933 end_col = ROW(row).l; 2999 end_col = ROW(row).l;
2934 3000
2935 col = max (col, 0); 3001 col = max (col, 0);
2936 3002
2937 if (row == selection.end.row 3003 if (row == selection.end.row
2938#if ENABLE_FRILLS 3004#if !ENABLE_MINIMAL
2939 || selection.rect 3005 || selection.rect
2940#endif 3006#endif
2941 ) 3007 )
2942 min_it (end_col, selection.end.col); 3008 min_it (end_col, selection.end.col);
2943 3009
… …
2966#endif 3032#endif
2967 else 3033 else
2968 new_selection_text[ofs++] = *t++; 3034 new_selection_text[ofs++] = *t++;
2969 } 3035 }
2970 3036
2971#if ENABLE_FRILLS 3037#if !ENABLE_MINIMAL
2972 if (selection.rect) 3038 if (selection.rect)
2973 { 3039 {
2974 while (ofs 3040 while (ofs
2975 && new_selection_text[ofs - 1] != C0_LF 3041 && new_selection_text[ofs - 1] != C0_LF
2976 && unicode::is_space (new_selection_text[ofs - 1])) 3042 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3010bool 3076bool
3011rxvt_term::selection_grab (Time tm) NOTHROW 3077rxvt_term::selection_grab (Time tm) NOTHROW
3012{ 3078{
3013 selection_time = tm; 3079 selection_time = tm;
3014 3080
3015 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3081 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3016 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3082 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3017 { 3083 {
3018 display->set_selection_owner (this); 3084 display->set_selection_owner (this);
3019 return true; 3085 return true;
3020 } 3086 }
3021 else 3087 else
… …
3025 } 3091 }
3026 3092
3027#if 0 3093#if 0
3028 XTextProperty ct; 3094 XTextProperty ct;
3029 3095
3030 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3096 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3031 { 3097 {
3032 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3098 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3033 XFree (ct.value); 3099 XFree (ct.value);
3034 } 3100 }
3035#endif 3101#endif
… …
3081 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3147 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3082 3148
3083 while (selection.mark.col > 0 3149 while (selection.mark.col > 0
3084 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3150 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3085 --selection.mark.col; 3151 --selection.mark.col;
3086 3152
3087 if (selection.op) 3153 if (selection.op)
3154 {
3088 { /* clear the old selection */ 3155 /* clear the old selection */
3089 selection.beg.row = selection.end.row = selection.mark.row; 3156 selection.beg.row = selection.end.row = selection.mark.row;
3090 selection.beg.col = selection.end.col = selection.mark.col; 3157 selection.beg.col = selection.end.col = selection.mark.col;
3091 } 3158 }
3092 3159
3093 selection.op = SELECTION_INIT; 3160 selection.op = SELECTION_INIT;
… …
3282 * a point/word/line which is either the start or end of the selection 3349 * 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 3350 * and it was decided by whichever point/word/line was `fixed' at the
3284 * time of the most recent button3 press 3351 * time of the most recent button3 press
3285 */ 3352 */
3286 if (button3 && buttonpress) 3353 if (button3 && buttonpress)
3354 {
3287 { /* button3 press */ 3355 /* button3 press */
3288 /* 3356 /*
3289 * first determine which edge of the selection we are closest to 3357 * first determine which edge of the selection we are closest to
3290 */ 3358 */
3291 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3359 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3292 || (!ROWCOL_IS_AFTER (pos, selection.end) 3360 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3310 selection.mark.row = selection.beg.row; 3378 selection.mark.row = selection.beg.row;
3311 selection.mark.col = selection.beg.col; 3379 selection.mark.col = selection.beg.col;
3312 } 3380 }
3313 } 3381 }
3314 else 3382 else
3383 {
3315 { /* button1 drag or button3 drag */ 3384 /* button1 drag or button3 drag */
3316 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3385 if (ROWCOL_IS_AFTER (selection.mark, pos))
3317 { 3386 {
3318 if (selection.mark.row == selection.end.row 3387 if (selection.mark.row == selection.end.row
3319 && selection.mark.col == selection.end.col 3388 && selection.mark.col == selection.end.col
3320 && clickchange 3389 && clickchange
… …
3337 3406
3338 if (selection.clicks == 1) 3407 if (selection.clicks == 1)
3339 { 3408 {
3340 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3409 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3341 && !ROW(selection.beg.row).is_longer () 3410 && !ROW(selection.beg.row).is_longer ()
3342#if ENABLE_FRILLS 3411#if !ENABLE_MINIMAL
3343 && !selection.rect 3412 && !selection.rect
3344#endif 3413#endif
3345 ) 3414 )
3346 selection.beg.col = ncol; 3415 selection.beg.col = ncol;
3347 3416
3348 if ( 3417 if (
3349 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3418 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3350 && !ROW(selection.end.row).is_longer () 3419 && !ROW(selection.end.row).is_longer ()
3351#if ENABLE_FRILLS 3420#if !ENABLE_MINIMAL
3352 && !selection.rect 3421 && !selection.rect
3353#endif 3422#endif
3354 ) 3423 )
3355 selection.end.col = ncol; 3424 selection.end.col = ncol;
3356 } 3425 }
… …
3363 selection_delimit_word (DN, &selection.end, &selection.end); 3432 selection_delimit_word (DN, &selection.end, &selection.end);
3364 } 3433 }
3365 else if (selection.clicks == 3) 3434 else if (selection.clicks == 3)
3366 { 3435 {
3367#if ENABLE_FRILLS 3436#if ENABLE_FRILLS
3368 if (OPTION (Opt_tripleclickwords)) 3437 if (option (Opt_tripleclickwords))
3369 { 3438 {
3370 selection_delimit_word (UP, &selection.beg, &selection.beg); 3439 selection_delimit_word (UP, &selection.beg, &selection.beg);
3371 3440
3372 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3441 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3373 { 3442 {
3374 if (!ROW(end_row).is_longer ()) 3443 if (!ROW(end_row).is_longer ())
3375 { 3444 {
3376 selection.end.row = end_row; 3445 selection.end.row = end_row;
3377 selection.end.col = ROW(end_row).l; 3446 selection.end.col = ROW(end_row).l;
3447# if !ENABLE_MINIMAL
3378 selection_remove_trailing_spaces (); 3448 selection_remove_trailing_spaces ();
3449# endif
3379 break; 3450 break;
3380 } 3451 }
3381 } 3452 }
3382 } 3453 }
3383 else 3454 else
… …
3399 selection.end.row++; 3470 selection.end.row++;
3400 } 3471 }
3401 } 3472 }
3402 3473
3403 if (button3 && buttonpress) 3474 if (button3 && buttonpress)
3475 {
3404 { /* mark may need to be changed */ 3476 /* mark may need to be changed */
3405 if (closeto == LEFT) 3477 if (closeto == LEFT)
3406 { 3478 {
3407 selection.mark.row = selection.end.row; 3479 selection.mark.row = selection.end.row;
3408 selection.mark.col = selection.end.col - (selection.clicks == 2); 3480 selection.mark.col = selection.end.col - (selection.clicks == 2);
3409 } 3481 }
… …
3412 selection.mark.row = selection.beg.row; 3484 selection.mark.row = selection.beg.row;
3413 selection.mark.col = selection.beg.col; 3485 selection.mark.col = selection.beg.col;
3414 } 3486 }
3415 } 3487 }
3416 3488
3417#if ENABLE_FRILLS 3489#if !ENABLE_MINIMAL
3418 if (selection.rect && selection.beg.col > selection.end.col) 3490 if (selection.rect && selection.beg.col > selection.end.col)
3419 ::swap (selection.beg.col, selection.end.col); 3491 ::swap (selection.beg.col, selection.end.col);
3420#endif 3492#endif
3421} 3493}
3422 3494
3423#if ENABLE_FRILLS 3495#if !ENABLE_MINIMAL
3424void 3496void
3425rxvt_term::selection_remove_trailing_spaces () NOTHROW 3497rxvt_term::selection_remove_trailing_spaces () NOTHROW
3426{ 3498{
3427 int32_t end_col, end_row; 3499 int32_t end_col, end_row;
3428 text_t *stp; 3500 text_t *stp;
… …
3483 */ 3555 */
3484void 3556void
3485rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3557rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3486{ 3558{
3487 XSelectionEvent ev; 3559 XSelectionEvent ev;
3488 dDisp;
3489 3560
3490 ev.type = SelectionNotify; 3561 ev.type = SelectionNotify;
3491 ev.property = None; 3562 ev.property = None;
3492 ev.display = rq.display; 3563 ev.display = rq.display;
3493 ev.requestor = rq.requestor; 3564 ev.requestor = rq.requestor;
… …
3507 *target++ = xa[XA_COMPOUND_TEXT]; 3578 *target++ = xa[XA_COMPOUND_TEXT];
3508#if X_HAVE_UTF8_STRING 3579#if X_HAVE_UTF8_STRING
3509 *target++ = xa[XA_UTF8_STRING]; 3580 *target++ = xa[XA_UTF8_STRING];
3510#endif 3581#endif
3511 3582
3512 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3583 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3513 32, PropModeReplace, 3584 32, PropModeReplace,
3514 (unsigned char *)target_list, target - target_list); 3585 (unsigned char *)target_list, target - target_list);
3515 ev.property = rq.property; 3586 ev.property = rq.property;
3516 } 3587 }
3517#if TODO // TODO 3588#if TODO // TODO
… …
3520 /* TODO: Handle MULTIPLE */ 3591 /* TODO: Handle MULTIPLE */
3521 } 3592 }
3522#endif 3593#endif
3523 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3594 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3524 { 3595 {
3525 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3596 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3526 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3597 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3527 ev.property = rq.property; 3598 ev.property = rq.property;
3528 } 3599 }
3529 else if (rq.target == XA_STRING 3600 else if (rq.target == XA_STRING
3530 || rq.target == xa[XA_TEXT] 3601 || rq.target == xa[XA_TEXT]
… …
3554 style = enc_string; 3625 style = enc_string;
3555 else if (target == xa[XA_TEXT]) 3626 else if (target == xa[XA_TEXT])
3556 style = enc_text; 3627 style = enc_text;
3557 else if (target == xa[XA_COMPOUND_TEXT]) 3628 else if (target == xa[XA_COMPOUND_TEXT])
3558 style = enc_compound_text; 3629 style = enc_compound_text;
3559#if ENABLE_FRILLS 3630#if !ENABLE_MINIMAL
3560 else if (target == xa[XA_UTF8_STRING]) 3631 else if (target == xa[XA_UTF8_STRING])
3561 style = enc_utf8; 3632 style = enc_utf8;
3562#endif 3633#endif
3563 else 3634 else
3564 { 3635 {
… …
3575 { 3646 {
3576 cl = L""; 3647 cl = L"";
3577 selectlen = 0; 3648 selectlen = 0;
3578 } 3649 }
3579 3650
3580#if ENABLE_FRILLS 3651#if !ENABLE_MINIMAL
3581 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3652 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3582 // so recode it manually 3653 // so recode it manually
3583 if (style == enc_utf8) 3654 if (style == enc_utf8)
3584 { 3655 {
3585 freect = 1; 3656 freect = 1;
… …
3588 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3659 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3589 ct.nitems = strlen ((char *)ct.value); 3660 ct.nitems = strlen ((char *)ct.value);
3590 } 3661 }
3591 else 3662 else
3592#endif 3663#endif
3593 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3664 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3594 freect = 1; 3665 freect = 1;
3595 else 3666 else
3596 { 3667 {
3597 /* if we failed to convert then send it raw */ 3668 /* if we failed to convert then send it raw */
3598 ct.value = (unsigned char *)cl; 3669 ct.value = (unsigned char *)cl;
3599 ct.nitems = selectlen; 3670 ct.nitems = selectlen;
3600 ct.encoding = target; 3671 ct.encoding = target;
3601 } 3672 }
3602 3673
3603 XChangeProperty (disp, rq.requestor, rq.property, 3674 XChangeProperty (dpy, rq.requestor, rq.property,
3604 ct.encoding, 8, PropModeReplace, 3675 ct.encoding, 8, PropModeReplace,
3605 ct.value, (int)ct.nitems); 3676 ct.value, (int)ct.nitems);
3606 ev.property = rq.property; 3677 ev.property = rq.property;
3607 3678
3608 if (freect) 3679 if (freect)
3609 XFree (ct.value); 3680 XFree (ct.value);
3610 } 3681 }
3611 3682
3612 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3683 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} 3684}
3630 3685
3631/* ------------------------------------------------------------------------- */ 3686/* ------------------------------------------------------------------------- */
3632#ifdef USE_XIM 3687#ifdef USE_XIM
3633void 3688void
3634rxvt_term::im_set_position (XPoint &pos) NOTHROW 3689rxvt_term::im_set_position (XPoint &pos) NOTHROW
3635{ 3690{
3636 XWindowAttributes xwa; 3691 XWindowAttributes xwa;
3637 3692
3638 XGetWindowAttributes (display->display, vt, &xwa); 3693 XGetWindowAttributes (dpy, vt, &xwa);
3639 3694
3640 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3695 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3641 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3696 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3642} 3697}
3643#endif 3698#endif
… …
3739rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3794rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3740{ 3795{
3741 while (*s) 3796 while (*s)
3742 { 3797 {
3743 text_t t = *s++; 3798 text_t t = *s++;
3744 int width = wcwidth (t); 3799 int width = WCWIDTH (t);
3745 3800
3746 while (width--) 3801 while (width--)
3747 { 3802 {
3748 scr_overlay_set (x++, y, t); 3803 scr_overlay_set (x++, y, t);
3749 t = NOCHAR; 3804 t = NOCHAR;

Diff Legend

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