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.246 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.315 by root, Tue Nov 4 14:38: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 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_state = rvideo_mode = false;
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
1469 // nuke wide char at beginning
1470 if (line->t[screen.cur.col] == NOCHAR)
1471 scr_kill_char (*line, screen.cur.col);
1472
1447 switch (insdel) 1473 switch (insdel)
1448 { 1474 {
1449 case INSERT: 1475 case INSERT:
1450 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1476 line->l = min (line->l + count, ncol);
1477
1478 if (line->t[screen.cur.col] == NOCHAR)
1479 scr_kill_char (*line, screen.cur.col);
1480
1481 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1451 { 1482 {
1452 line->t[col] = line->t[col - count]; 1483 line->t[col] = line->t[col - count];
1453 line->r[col] = line->r[col - count]; 1484 line->r[col] = line->r[col - count];
1454 } 1485 }
1455
1456 line->l = min (line->l + count, ncol);
1457 1486
1458 if (selection.op && current_screen == selection.screen 1487 if (selection.op && current_screen == selection.screen
1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1488 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1460 { 1489 {
1461 if (selection.end.row != screen.cur.row 1490 if (selection.end.row != screen.cur.row
1462 || (selection.end.col + count >= ncol)) 1491 || (selection.end.col + count >= ncol))
1463 CLEAR_SELECTION (); 1492 CLEAR_SELECTION ();
1464 else 1493 else
1494 {
1465 { /* shift selection */ 1495 /* shift selection */
1466 selection.beg.col += count; 1496 selection.beg.col += count;
1467 selection.mark.col += count; /* XXX: yes? */ 1497 selection.mark.col += count; /* XXX: yes? */
1468 selection.end.col += count; 1498 selection.end.col += count;
1469 } 1499 }
1470 } 1500 }
… …
1475 case ERASE: 1505 case ERASE:
1476 screen.cur.col += count; /* don't worry if > ncol */ 1506 screen.cur.col += count; /* don't worry if > ncol */
1477 selection_check (1); 1507 selection_check (1);
1478 screen.cur.col -= count; 1508 screen.cur.col -= count;
1479 1509
1480 line->l = max (line->l - count, 0); 1510 // nuke wide char after the end
1511 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1512 scr_kill_char (*line, screen.cur.col + count);
1513
1481 scr_blank_line (*line, screen.cur.col, count, rstyle); 1514 scr_blank_line (*line, screen.cur.col, count, rstyle);
1482 break; 1515 break;
1483 1516
1484 case DELETE: 1517 case DELETE:
1518 {
1519 line->l = max (line->l - count, 0);
1520
1485 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1521 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1486 1522
1487 for (col = screen.cur.col; (col + count) < ncol; col++) 1523 for (int col = screen.cur.col; (col + count) < ncol; col++)
1488 { 1524 {
1489 line->t[col] = line->t[col + count]; 1525 line->t[col] = line->t[col + count];
1490 line->r[col] = line->r[col + count]; 1526 line->r[col] = line->r[col + count];
1491 } 1527 }
1492 1528
1493 line->l = max (line->l - count, 0); 1529 // nuke wide char at the end
1530 if (line->t[screen.cur.col] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col);
1532
1494 scr_blank_line (*line, ncol - count, count, tr); 1533 scr_blank_line (*line, ncol - count, count, tr);
1495 1534
1496 if (selection.op && current_screen == selection.screen 1535 if (selection.op && current_screen == selection.screen
1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1536 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1498 { 1537 {
1499 if (selection.end.row != screen.cur.row 1538 if (selection.end.row != screen.cur.row
1500 || (screen.cur.col >= selection.beg.col - count) 1539 || (screen.cur.col >= selection.beg.col - count)
1501 || selection.end.col >= ncol) 1540 || selection.end.col >= ncol)
1502 CLEAR_SELECTION (); 1541 CLEAR_SELECTION ();
1503 else 1542 else
1504 { 1543 {
1505 /* shift selection */ 1544 /* shift selection */
1506 selection.beg.col -= count; 1545 selection.beg.col -= count;
1507 selection.mark.col -= count; /* XXX: yes? */ 1546 selection.mark.col -= count; /* XXX: yes? */
1508 selection.end.col -= count; 1547 selection.end.col -= count;
1509 } 1548 }
1549 }
1510 } 1550 }
1511 1551
1512 break; 1552 break;
1513 } 1553 }
1514} 1554}
… …
1609 */ 1649 */
1610void 1650void
1611rxvt_term::scr_set_tab (int mode) NOTHROW 1651rxvt_term::scr_set_tab (int mode) NOTHROW
1612{ 1652{
1613 if (mode < 0) 1653 if (mode < 0)
1614 memset (tabs, 0, ncol * sizeof (char)); 1654 memset (tabs, 0, ncol);
1615 else if (screen.cur.col < ncol) 1655 else if (screen.cur.col < ncol)
1616 tabs [screen.cur.col] = !!mode; 1656 tabs [screen.cur.col] = !!mode;
1617} 1657}
1618 1658
1619/* ------------------------------------------------------------------------- */ 1659/* ------------------------------------------------------------------------- */
… …
1634 if (rvideo_state != on) 1674 if (rvideo_state != on)
1635 { 1675 {
1636 rvideo_state = on; 1676 rvideo_state = on;
1637 1677
1638 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1678 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1639#if XPM_BACKGROUND 1679#ifdef HAVE_BG_PIXMAP
1640 if (bgPixmap.pixmap == None) 1680 if (bgPixmap.pixmap == None)
1641#endif 1681#endif
1642#if TRANSPARENT
1643 if (!OPTION (Opt_transparent) || am_transparent == 0)
1644#endif
1645 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1682 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1646 1683
1647 XGCValues gcvalue; 1684 XGCValues gcvalue;
1648 gcvalue.foreground = pix_colors[Color_fg]; 1685 gcvalue.foreground = pix_colors[Color_fg];
1649 gcvalue.background = pix_colors[Color_bg]; 1686 gcvalue.background = pix_colors[Color_bg];
1650 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1687 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1651 1688
1652 scr_clear (); 1689 scr_clear ();
1653 scr_touch (true); 1690 scr_touch (true);
1654 } 1691 }
1655} 1692}
… …
1740{ 1777{
1741 bool found = false; 1778 bool found = false;
1742 1779
1743 for (int i = 0; i < nrow; i++) 1780 for (int i = 0; i < nrow; i++)
1744 { 1781 {
1745 int col = 0;
1746 rend_t *drp = drawn_buf[i].r; 1782 rend_t *drp = drawn_buf[i].r;
1747 1783
1748 for (; col < ncol; col++, drp++) 1784 for (int col = 0; col < ncol; col++, drp++)
1749 if ((*drp & mask) == value) 1785 if ((*drp & mask) == value)
1750 { 1786 {
1751 found = true; 1787 found = true;
1752 *drp = ~value; 1788 *drp = ~value;
1753 } 1789 }
… …
1793 for (i = PART_BEG; i < RC_COUNT; i++) 1829 for (i = PART_BEG; i < RC_COUNT; i++)
1794 { 1830 {
1795 min_it (rc[i].col, ncol - 1); 1831 min_it (rc[i].col, ncol - 1);
1796 min_it (rc[i].row, nrow - 1); 1832 min_it (rc[i].row, nrow - 1);
1797 } 1833 }
1798 1834// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1799 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1835 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1800 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1836 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1801 1837
1802 num_scr_allow = 0; 1838 num_scr_allow = 0;
1803 1839
… …
1858 return true; 1894 return true;
1859} 1895}
1860 1896
1861#ifndef NO_BELL 1897#ifndef NO_BELL
1862void 1898void
1863rxvt_term::bell_cb (time_watcher &w) 1899rxvt_term::bell_cb (ev::timer &w, int revents)
1864{ 1900{
1865 rvideo_bell = false; 1901 rvideo_bell = false;
1866 scr_rvideo_mode (rvideo_mode); 1902 scr_rvideo_mode (rvideo_mode);
1903 refresh_check ();
1867} 1904}
1868#endif 1905#endif
1869 1906
1870/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1871void 1908void
… …
1873{ 1910{
1874#ifndef NO_BELL 1911#ifndef NO_BELL
1875 1912
1876# ifndef NO_MAPALERT 1913# ifndef NO_MAPALERT
1877# ifdef MAPALERT_OPTION 1914# ifdef MAPALERT_OPTION
1878 if (OPTION (Opt_mapAlert)) 1915 if (option (Opt_mapAlert))
1879# endif 1916# endif
1880 XMapWindow (display->display, parent[0]); 1917 XMapWindow (dpy, parent[0]);
1881# endif 1918# endif
1882 1919
1920# if ENABLE_FRILLS
1921 if (option (Opt_urgentOnBell))
1922 set_urgency (1);
1923# endif
1924
1883 if (OPTION (Opt_visualBell)) 1925 if (option (Opt_visualBell))
1884 { 1926 {
1885 rvideo_bell = true; 1927 rvideo_bell = true;
1886 scr_rvideo_mode (rvideo_mode); 1928 scr_rvideo_mode (rvideo_mode);
1887 display->flush (); 1929 flush ();
1888 1930
1889 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1931 bell_ev.start (VISUAL_BELL_DURATION);
1890 } 1932 }
1891 else 1933 else
1892 XBell (display->display, 0); 1934 XBell (dpy, 0);
1893
1894#endif 1935#endif
1895} 1936}
1896 1937
1897/* ------------------------------------------------------------------------- */ 1938/* ------------------------------------------------------------------------- */
1898/* ARGSUSED */ 1939/* ARGSUSED */
1899void 1940void
1900rxvt_term::scr_printscreen (int fullhist) NOTHROW 1941rxvt_term::scr_printscreen (int fullhist) NOTHROW
1901{ 1942{
1902#ifdef PRINTPIPE 1943#ifdef PRINTPIPE
1903 int nrows, row_start; 1944 int nrows, row_start;
1904 FILE *fd; 1945 FILE *fd = popen_printer ();
1905 1946
1906 if ((fd = popen_printer ()) == NULL) 1947 if (!fd)
1907 return; 1948 return;
1908 1949
1909 if (fullhist) 1950 if (fullhist)
1910 { 1951 {
1911 nrows = nrow - top_row; 1952 nrows = nrow - top_row;
… …
1956 * screen.text/screen.rend contain what the screen will change to. 1997 * screen.text/screen.rend contain what the screen will change to.
1957 */ 1998 */
1958void 1999void
1959rxvt_term::scr_refresh () NOTHROW 2000rxvt_term::scr_refresh () NOTHROW
1960{ 2001{
1961 unsigned char must_clear, /* use draw_string not draw_image_string */ 2002 unsigned char have_bg,
1962 showcursor; /* show the cursor */ 2003 showcursor; /* show the cursor */
1963 int16_t col, row, /* column/row we're processing */ 2004 int16_t col, row, /* column/row we're processing */
1964 ocrow; /* old cursor row */ 2005 ocrow; /* old cursor row */
1965 int i; /* tmp */ 2006 int i; /* tmp */
1966#ifndef NO_CURSORCOLOR 2007#ifndef NO_CURSORCOLOR
1967 rend_t cc1; /* store colours at cursor position (s) */ 2008 rend_t cc1; /* store colours at cursor position (s) */
1968#endif 2009#endif
1969 rend_t *crp; // cursor rendition pointer 2010 rend_t *crp; // cursor rendition pointer
2011 rend_t ccol1, /* Cursor colour */
2012 ccol2; /* Cursor colour2 */
1970 2013
1971 want_refresh = 0; /* screen is current */ 2014 want_refresh = 0; /* screen is current */
1972 2015
1973 if (refresh_type == NO_REFRESH || !mapped) 2016 if (refresh_type == NO_REFRESH || !mapped)
1974 return; 2017 return;
1975 2018
1976 /* 2019 /*
1977 * A: set up vars 2020 * A: set up vars
1978 */ 2021 */
1979 must_clear = 0;
1980 refresh_count = 0; 2022 refresh_count = 0;
1981 2023
1982#if XPM_BACKGROUND 2024 have_bg = 0;
2025#ifdef HAVE_BG_PIXMAP
1983 must_clear |= bgPixmap.pixmap != None; 2026 have_bg = bgPixmap.pixmap != None;
1984#endif
1985#if TRANSPARENT
1986 must_clear |= OPTION (Opt_transparent) && am_transparent;
1987#endif 2027#endif
1988 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2028 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1989 2029
1990 /* 2030 /*
1991 * B: reverse any characters which are selected 2031 * B: reverse any characters which are selected
… …
1995 /* 2035 /*
1996 * C: set the cursor character (s) 2036 * C: set the cursor character (s)
1997 */ 2037 */
1998 { 2038 {
1999 unsigned char setoldcursor; 2039 unsigned char setoldcursor;
2000 rend_t ccol1, /* Cursor colour */
2001 ccol2; /* Cursor colour2 */
2002 2040
2003 showcursor = (screen.flags & Screen_VisibleCursor); 2041 showcursor = (screen.flags & Screen_VisibleCursor);
2004#ifdef CURSOR_BLINK 2042#ifdef CURSOR_BLINK
2005 if (hidden_cursor) 2043 if (hidden_cursor)
2006 showcursor = 0; 2044 showcursor = 0;
… …
2013 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2051 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2014 col--; 2052 col--;
2015 2053
2016 crp = &ROW(screen.cur.row).r[col]; 2054 crp = &ROW(screen.cur.row).r[col];
2017 2055
2056#ifndef NO_CURSORCOLOR
2057 cc1 = *crp & (RS_fgMask | RS_bgMask);
2058 if (ISSET_PIXCOLOR (Color_cursor))
2059 ccol1 = Color_cursor;
2060 else
2061#endif
2062#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2063 ccol1 = fgcolor_of (rstyle);
2064#else
2065 ccol1 = Color_fg;
2066#endif
2067
2068#ifndef NO_CURSORCOLOR
2069 if (ISSET_PIXCOLOR (Color_cursor2))
2070 ccol2 = Color_cursor2;
2071 else
2072#endif
2073#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2074 ccol2 = bgcolor_of (rstyle);
2075#else
2076 ccol2 = Color_bg;
2077#endif
2078
2018 if (showcursor && focus) 2079 if (showcursor && focus)
2019 { 2080 {
2020 if (OPTION (Opt_cursorUnderline)) 2081 if (option (Opt_cursorUnderline))
2021 *crp ^= RS_Uline; 2082 *crp ^= RS_Uline;
2022 else 2083 else
2023 { 2084 {
2024 *crp ^= RS_RVid; 2085 *crp ^= RS_RVid;
2025
2026#ifndef NO_CURSORCOLOR
2027 cc1 = *crp & (RS_fgMask | RS_bgMask);
2028 if (ISSET_PIXCOLOR (Color_cursor))
2029 ccol1 = Color_cursor;
2030 else
2031#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2032 ccol1 = fgcolor_of (rstyle);
2033#else
2034 ccol1 = Color_fg;
2035#endif
2036 if (ISSET_PIXCOLOR (Color_cursor2))
2037 ccol2 = Color_cursor2;
2038 else
2039#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2040 ccol2 = bgcolor_of (rstyle);
2041#else
2042 ccol2 = Color_bg;
2043#endif
2044 *crp = SET_FGCOLOR (*crp, ccol1); 2086 *crp = SET_FGCOLOR (*crp, ccol1);
2045 *crp = SET_BGCOLOR (*crp, ccol2); 2087 *crp = SET_BGCOLOR (*crp, ccol2);
2046#endif
2047 } 2088 }
2048 } 2089 }
2049 } 2090 }
2050 2091
2051 /* make sure no outline cursor is left around */ 2092 /* make sure no outline cursor is left around */
… …
2090 * D: CopyArea pass - very useful for slower links 2131 * D: CopyArea pass - very useful for slower links
2091 * This has been deliberately kept simple. 2132 * This has been deliberately kept simple.
2092 */ 2133 */
2093 if (!display->is_local 2134 if (!display->is_local
2094 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2135 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2095 && abs (num_scr) < nrow && !must_clear) 2136 && abs (num_scr) < nrow && !have_bg)
2096 { 2137 {
2097 int16_t nits; 2138 int16_t nits;
2139 int i = num_scr;
2098 int j; 2140 int j;
2099 int len, wlen; 2141 int len, wlen;
2100 dLocal (int, num_scr); 2142 dLocal (int, num_scr);
2101 2143
2102 j = nrow; 2144 j = nrow;
2103 wlen = len = -1; 2145 wlen = len = -1;
2104 row = i > 0 ? 0 : j - 1; 2146 row = i > 0 ? 0 : j - 1;
2147
2105 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2148 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2106 { 2149 {
2107 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2150 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2108 { 2151 {
2109 line_t s = ROW(view_start + row); 2152 line_t s = ROW(view_start + row);
… …
2130 wlen = row; 2173 wlen = row;
2131 continue; 2174 continue;
2132 } 2175 }
2133 } 2176 }
2134 2177
2135 if (len != -1) 2178 if (len >= 0)
2136 { 2179 {
2137 /* also comes here at end if needed because of >= above */ 2180 /* also comes here at end if needed because of >= above */
2138 if (wlen < len) 2181 if (wlen < len)
2139 ::swap (wlen, len); 2182 ::swap (wlen, len);
2140 2183
2184 XGCValues gcv;
2185
2186 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2141 XCopyArea (display->display, vt, vt, 2187 XCopyArea (dpy, vt, vt,
2142 gc, 0, Row2Pixel (len + i), 2188 gc, 0, Row2Pixel (len + i),
2143 (unsigned int)this->width, 2189 (unsigned int)this->width,
2144 (unsigned int)Height2Pixel (wlen - len + 1), 2190 (unsigned int)Height2Pixel (wlen - len + 1),
2145 0, Row2Pixel (len)); 2191 0, Row2Pixel (len));
2192 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2193
2146 len = -1; 2194 len = -1;
2147 } 2195 }
2148 } 2196 }
2149 } 2197 }
2150#endif 2198#endif
… …
2174 continue; 2222 continue;
2175 2223
2176 // redraw one or more characters 2224 // redraw one or more characters
2177 2225
2178 // seek to the beginning of wide characters 2226 // seek to the beginning of wide characters
2179 while (stp[col] == NOCHAR && col > 0) 2227 while (expect_false (stp[col] == NOCHAR && col > 0))
2180 --col; 2228 --col;
2181 2229
2182 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2230 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2183 text_t *text = stp + col; 2231 text_t *text = stp + col;
2184 int count = 1; 2232 int count = 1;
… …
2206 count++; 2254 count++;
2207 2255
2208 if (stp[col] != dtp[col] 2256 if (stp[col] != dtp[col]
2209 || !RS_SAME (srp[col], drp[col])) 2257 || !RS_SAME (srp[col], drp[col]))
2210 { 2258 {
2211 if (must_clear && (i++ > count / 2)) 2259 if (have_bg && (i++ > count / 2))
2212 break; 2260 break;
2213 2261
2214 dtp[col] = stp[col]; 2262 dtp[col] = stp[col];
2215 drp[col] = rend; 2263 drp[col] = rend;
2216 i = 0; 2264 i = 0;
2217 } 2265 }
2218 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2266 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2219 break; 2267 break;
2220 } 2268 }
2221 2269
2222 col--; /* went one too far. move back */ 2270 col--; /* went one too far. move back */
2223 count -= i; /* dump any matching trailing chars */ 2271 count -= i; /* dump any matching trailing chars */
2224 2272
2225 // sometimes we optimize away the trailing NOCHAR's, add them back 2273 // sometimes we optimize away the trailing NOCHAR's, add them back
2226 while (i && text[count] == NOCHAR) 2274 while (expect_false (i && text[count] == NOCHAR))
2227 count++, i--; 2275 count++, i--;
2228 2276
2229 /* 2277 /*
2230 * Determine the attributes for the string 2278 * Determine the attributes for the string
2231 */ 2279 */
2232 int fore = fgcolor_of (rend); // desired foreground 2280 int fore = fgcolor_of (rend); // desired foreground
2233 int back = bgcolor_of (rend); // desired background 2281 int back = bgcolor_of (rend); // desired background
2234 2282
2235 // only do special processing if any attributes are set, which is unlikely 2283 // only do special processing if any attributes are set, which is unlikely
2236 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2284 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2237 { 2285 {
2238#if ENABLE_STYLES
2239 // force redraw after "careful" characters to avoid pixel droppings
2240 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2241 drp[col + 1] = ~srp[col + 1];
2242
2243 // include previous careful character(s) if possible, looks nicer (best effort...)
2244 while (text > stp
2245 && srp[text - stp - 1] & RS_Careful
2246 && RS_SAME (rend, srp[text - stp - 1]))
2247 text--, count++, xpixel -= fwidth;
2248#endif
2249
2250 bool invert = rend & RS_RVid; 2286 bool invert = rend & RS_RVid;
2251 2287
2252#ifndef NO_BOLD_UNDERLINE_REVERSE 2288#ifndef NO_BOLD_UNDERLINE_REVERSE
2253 if (rend & RS_Bold
2254 && fore == Color_fg) 2289 if (rend & RS_Bold && fore == Color_fg)
2255 { 2290 {
2256 if (ISSET_PIXCOLOR (Color_BD)) 2291 if (ISSET_PIXCOLOR (Color_BD))
2257 fore = Color_BD; 2292 fore = Color_BD;
2258# if !ENABLE_STYLES 2293# if !ENABLE_STYLES
2259 else 2294 else
2260 invert = !invert; 2295 invert = !invert;
2261# endif 2296# endif
2262 } 2297 }
2263 2298
2264 if (rend & RS_Italic 2299 if (rend & RS_Italic && fore == Color_fg)
2265 && fore == Color_fg)
2266 { 2300 {
2267 if (ISSET_PIXCOLOR (Color_IT)) 2301 if (ISSET_PIXCOLOR (Color_IT))
2268 fore = Color_IT; 2302 fore = Color_IT;
2269# if !ENABLE_STYLES 2303# if !ENABLE_STYLES
2270 else 2304 else
2271 invert = !invert; 2305 invert = !invert;
2272# endif 2306# endif
2273 } 2307 }
2274 2308
2275 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2309 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2276 fore = Color_UL; 2310 fore = Color_UL;
2277#endif 2311#endif
2278 2312
2279 if (invert) 2313 if (invert)
2280 { 2314 {
2315#ifdef OPTION_HC
2316 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2317 || !ISSET_PIXCOLOR (Color_HC))
2318#endif
2319 /* invert the column if no highlightColor is set or it is the
2320 * current cursor column */
2281 ::swap (fore, back); 2321 ::swap (fore, back);
2322#ifdef OPTION_HC
2323 else if (ISSET_PIXCOLOR (Color_HC))
2324 back = Color_HC;
2325#endif
2282 2326
2283#ifndef NO_BOLD_UNDERLINE_REVERSE 2327#ifndef NO_BOLD_UNDERLINE_REVERSE
2328# ifndef OPTION_HC
2284 if (ISSET_PIXCOLOR (Color_RV)) 2329 if (ISSET_PIXCOLOR (Color_RV))
2285 back = Color_RV; 2330 back = Color_RV;
2286 2331# endif
2287 if (fore == back) 2332 if (fore == back)
2288 { 2333 {
2289 fore = Color_bg; 2334 fore = Color_bg;
2290 back = Color_fg; 2335 back = Color_fg;
2291 } 2336 }
… …
2293 } 2338 }
2294 2339
2295#ifdef TEXT_BLINK 2340#ifdef TEXT_BLINK
2296 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2341 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2297 { 2342 {
2298 if (!text_blink_ev.active) 2343 if (!text_blink_ev.is_active ())
2299 { 2344 {
2300 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2345 text_blink_ev.again ();
2301 hidden_text = 0; 2346 hidden_text = 0;
2302 } 2347 }
2303 else if (hidden_text) 2348 else if (hidden_text)
2304 fore = back; 2349 fore = back;
2305 } 2350 }
2306#endif 2351#endif
2352
2353#if ENABLE_STYLES
2354 // "careful" (too wide) character handling
2355
2356 // include previous careful character(s) if possible, looks nicer (best effort...)
2357 while (text > stp
2358 && srp[text - stp - 1] & RS_Careful
2359 && RS_SAME (rend, srp[text - stp - 1]))
2360 text--, count++, xpixel -= fwidth;
2361
2362 // force redraw after "careful" characters to avoid pixel droppings
2363 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2364 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2365
2366 // force redraw before "careful" characters to avoid pixel droppings
2367 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2368 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2369#endif
2307 } 2370 }
2308 2371
2309 /* 2372 /*
2310 * Actually do the drawing of the string here 2373 * Actually do the drawing of the string here
2311 */ 2374 */
2312 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2375 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2313 2376
2314 if (back == fore) 2377 if (expect_true (have_bg && back == Color_bg))
2315 font->clear_rect (*drawable, xpixel, ypixel,
2316 fwidth * count, fheight,
2317 back);
2318 else if (back == Color_bg)
2319 { 2378 {
2320 if (must_clear) 2379 // this is very ugly, maybe push it into ->draw?
2321 {
2322 CLEAR_CHARS (xpixel, ypixel, count);
2323 2380
2324 for (i = 0; i < count; i++) /* don't draw empty strings */ 2381 for (i = 0; i < count; i++) /* don't draw empty strings */
2325 if (text[i] != ' ') 2382 if (text[i] != ' ')
2326 { 2383 {
2327 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2384 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2328 break; 2385 goto did_clear;
2329 }
2330 } 2386 }
2331 else 2387
2332 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2388 CLEAR_CHARS (xpixel, ypixel, count);
2389 did_clear: ;
2333 } 2390 }
2334 else 2391 else
2335 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2392 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2336 2393
2337 if (rend & RS_Uline && font->descent > 1 && fore != back) 2394 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2338 { 2395 {
2339#if ENABLE_FRILLS 2396#if ENABLE_FRILLS
2340 if (ISSET_PIXCOLOR (Color_underline)) 2397 if (ISSET_PIXCOLOR (Color_underline))
2341 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2398 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2342 else 2399 else
2343#endif 2400#endif
2344 XSetForeground (display->display, gc, pix_colors[fore]); 2401 XSetForeground (dpy, gc, pix_colors[fore]);
2345 2402
2346 XDrawLine (display->display, drawBuffer, gc, 2403 XDrawLine (dpy, vt, gc,
2347 xpixel, ypixel + font->ascent + 1, 2404 xpixel, ypixel + font->ascent + 1,
2348 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2349 } 2406 }
2350 } /* for (col....) */ 2407 } /* for (col....) */
2351 } /* for (row....) */ 2408 } /* for (row....) */
… …
2360 */ 2417 */
2361 if (showcursor) 2418 if (showcursor)
2362 { 2419 {
2363 if (focus) 2420 if (focus)
2364 { 2421 {
2365 if (OPTION (Opt_cursorUnderline)) 2422 if (option (Opt_cursorUnderline))
2366 *crp ^= RS_Uline; 2423 *crp ^= RS_Uline;
2367 else 2424 else
2368 { 2425 {
2369 *crp ^= RS_RVid; 2426 *crp ^= RS_RVid;
2370#ifndef NO_CURSORCOLOR 2427#ifndef NO_CURSORCOLOR
… …
2384 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2441 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2385 cursorwidth++; 2442 cursorwidth++;
2386 2443
2387#ifndef NO_CURSORCOLOR 2444#ifndef NO_CURSORCOLOR
2388 if (ISSET_PIXCOLOR (Color_cursor)) 2445 if (ISSET_PIXCOLOR (Color_cursor))
2389 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2446 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2447 else
2390#endif 2448#endif
2449 XSetForeground (dpy, gc, pix_colors[ccol1]);
2391 2450
2392 XDrawRectangle (display->display, drawBuffer, gc, 2451 XDrawRectangle (dpy, vt, gc,
2393 Col2Pixel (col), 2452 Col2Pixel (col),
2394 Row2Pixel (oldcursor.row), 2453 Row2Pixel (oldcursor.row),
2395 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2454 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2396 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2455 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2397 } 2456 }
… …
2432} 2491}
2433 2492
2434void 2493void
2435rxvt_term::scr_recolour () NOTHROW 2494rxvt_term::scr_recolour () NOTHROW
2436{ 2495{
2437 if (1 2496#ifdef HAVE_BG_PIXMAP
2438#if TRANSPARENT 2497 bgPixmap.apply ();
2439 && !am_transparent 2498#else
2440#endif 2499
2441#if XPM_BACKGROUND
2442 && !bgPixmap.pixmap
2443#endif
2444 )
2445 {
2446 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2500 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2447 XClearWindow (display->display, parent[0]); 2501 XClearWindow (dpy, parent[0]);
2448 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2502 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2449#if HAVE_SCROLLBARS 2503
2450 if (scrollBar.win) 2504 if (scrollBar.win)
2451 { 2505 {
2452 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2506 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2453 scrollBar.setIdle (); 2507 scrollBar.state = STATE_IDLE;
2454 scrollbar_show (0); 2508 scrollBar.show (0);
2455 }
2456#endif
2457 } 2509 }
2458 2510
2511#endif
2512
2513 /* bgPixmap.apply () does not do the following : */
2459 scr_clear (); 2514 scr_clear ();
2460 scr_touch (true); 2515 scr_touch (true);
2461 want_refresh = 1; 2516 want_refresh = 1;
2462} 2517}
2463 2518
… …
2470 2525
2471 num_scr_allow = 0; 2526 num_scr_allow = 0;
2472 want_refresh = 1; 2527 want_refresh = 1;
2473 2528
2474 if (really) 2529 if (really)
2475 XClearWindow (display->display, vt); 2530 XClearWindow (dpy, vt);
2476} 2531}
2477 2532
2478void 2533void
2479rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2534rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2480{ 2535{
… …
2529{ 2584{
2530 if (selection.op 2585 if (selection.op
2531 && current_screen == selection.screen 2586 && current_screen == selection.screen
2532 && selection.end.row >= view_start) 2587 && selection.end.row >= view_start)
2533 { 2588 {
2534#if ENABLE_FRILLS 2589#if !ENABLE_MINIMAL
2535 if (selection.rect) 2590 if (selection.rect)
2536 scr_xor_rect (selection.beg.row, selection.beg.col, 2591 scr_xor_rect (selection.beg.row, selection.beg.col,
2537 selection.end.row, selection.end.col, 2592 selection.end.row, selection.end.col,
2538 RS_RVid, RS_RVid | RS_Uline); 2593 RS_RVid, RS_RVid | RS_Uline);
2539 else 2594 else
… …
2555{ 2610{
2556 int row, wrote; 2611 int row, wrote;
2557 unsigned int width, towrite; 2612 unsigned int width, towrite;
2558 char r1[] = "\n"; 2613 char r1[] = "\n";
2559 2614
2560 for (row = saveLines - nsaved; 2615 for (row = saveLines + top_row;
2561 row < saveLines + nrow - 1; row++) 2616 row < saveLines + nrow - 1; row++)
2562 { 2617 {
2563 width = row_buf[row].l >= 0 ? row_buf[row].l 2618 width = row_buf[row].l >= 0 ? row_buf[row].l
2564 : ncol; 2619 : ncol;
2565 for (towrite = width; towrite; towrite -= wrote) 2620 for (towrite = width; towrite; towrite -= wrote)
… …
2616 /* convert normal newline chars into common keyboard Return key sequence */ 2671 /* convert normal newline chars into common keyboard Return key sequence */
2617 for (unsigned int i = 0; i < len; i++) 2672 for (unsigned int i = 0; i < len; i++)
2618 if (data[i] == C0_LF) 2673 if (data[i] == C0_LF)
2619 data[i] = C0_CR; 2674 data[i] = C0_CR;
2620 2675
2676 if (priv_modes & PrivMode_BracketPaste)
2677 tt_printf ("\e[200~");
2678
2621 tt_write (data, len); 2679 tt_write (data, len);
2680
2681 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[201~");
2622} 2683}
2623 2684
2624/* ------------------------------------------------------------------------- */ 2685/* ------------------------------------------------------------------------- */
2625/* 2686/*
2626 * Respond to a notification that a primary selection has been sent 2687 * Respond to a notification that a primary selection has been sent
… …
2655 } 2716 }
2656 2717
2657 unsigned long bytes_after; 2718 unsigned long bytes_after;
2658 XTextProperty ct; 2719 XTextProperty ct;
2659 2720
2660 if (XGetWindowProperty (display->display, win, prop, 2721 if (XGetWindowProperty (dpy, win, prop,
2661 0, PROP_SIZE / 4, 2722 0, PROP_SIZE / 4,
2662 delete_prop, AnyPropertyType, 2723 delete_prop, AnyPropertyType,
2663 &ct.encoding, &ct.format, 2724 &ct.encoding, &ct.format,
2664 &ct.nitems, &bytes_after, 2725 &ct.nitems, &bytes_after,
2665 &ct.value) != Success) 2726 &ct.value) != Success)
… …
2674 if (bytes_after) 2735 if (bytes_after)
2675 { 2736 {
2676 // fetch and append remaining data 2737 // fetch and append remaining data
2677 XTextProperty ct2; 2738 XTextProperty ct2;
2678 2739
2679 if (XGetWindowProperty (display->display, win, prop, 2740 if (XGetWindowProperty (dpy, win, prop,
2680 ct.nitems / 4, (bytes_after + 3) / 4, 2741 ct.nitems / 4, (bytes_after + 3) / 4,
2681 delete_prop, AnyPropertyType, 2742 delete_prop, AnyPropertyType,
2682 &ct2.encoding, &ct2.format, 2743 &ct2.encoding, &ct2.format,
2683 &ct2.nitems, &bytes_after, 2744 &ct2.nitems, &bytes_after,
2684 &ct2.value) != Success) 2745 &ct2.value) != Success)
… …
2697 2758
2698 if (ct.encoding == xa[XA_INCR]) 2759 if (ct.encoding == xa[XA_INCR])
2699 { 2760 {
2700 // INCR selection, start handshake 2761 // INCR selection, start handshake
2701 if (!delete_prop) 2762 if (!delete_prop)
2702 XDeleteProperty (display->display, win, prop); 2763 XDeleteProperty (dpy, win, prop);
2703 2764
2704 selection_wait = Sel_incr; 2765 selection_wait = Sel_incr;
2705 incr_buf_fill = 0; 2766 incr_buf_fill = 0;
2706 incr_ev.start (NOW + 10); 2767 incr_ev.start (10);
2707 2768
2708 goto bailout; 2769 goto bailout;
2709 } 2770 }
2710 2771
2711 if (ct.nitems == 0) 2772 if (ct.nitems == 0)
… …
2720 ct.nitems = incr_buf_fill; 2781 ct.nitems = incr_buf_fill;
2721 incr_buf = 0; 2782 incr_buf = 0;
2722 incr_buf_size = 0; 2783 incr_buf_size = 0;
2723 incr_ev.stop (); 2784 incr_ev.stop ();
2724 } 2785 }
2725 else 2786 else
2726 { 2787 {
2727 if (selection_wait == Sel_normal 2788 if (selection_wait == Sel_normal
2728 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2789 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2729 { 2790 {
2730 /* 2791 /*
… …
2737 goto bailout; 2798 goto bailout;
2738 } 2799 }
2739 } 2800 }
2740 else if (selection_wait == Sel_incr) 2801 else if (selection_wait == Sel_incr)
2741 { 2802 {
2742 incr_ev.start (NOW + 10); 2803 incr_ev.start (10);
2743 2804
2744 while (incr_buf_fill + ct.nitems > incr_buf_size) 2805 while (incr_buf_fill + ct.nitems > incr_buf_size)
2745 { 2806 {
2746 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2807 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2747 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2808 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2754 } 2815 }
2755 2816
2756 char **cl; 2817 char **cl;
2757 int cr; 2818 int cr;
2758 2819
2759#if ENABLE_FRILLS 2820#if !ENABLE_MINIMAL
2760 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2821 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2761 // so recode it manually 2822 // so recode it manually
2762 if (ct.encoding == xa[XA_UTF8_STRING]) 2823 if (ct.encoding == xa[XA_UTF8_STRING])
2763 { 2824 {
2764 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2825 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2768 paste (s, strlen (s)); 2829 paste (s, strlen (s));
2769 free (s); 2830 free (s);
2770 } 2831 }
2771 else 2832 else
2772#endif 2833#endif
2773 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2834 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2774 && cl) 2835 && cl)
2775 { 2836 {
2776 for (int i = 0; i < cr; i++) 2837 for (int i = 0; i < cr; i++)
2777 paste (cl[i], strlen (cl[i])); 2838 paste (cl[i], strlen (cl[i]));
2778 2839
… …
2787 if (selection_wait == Sel_normal) 2848 if (selection_wait == Sel_normal)
2788 selection_wait = Sel_none; 2849 selection_wait = Sel_none;
2789} 2850}
2790 2851
2791void 2852void
2792rxvt_term::incr_cb (time_watcher &w) NOTHROW 2853rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2793{ 2854{
2794 selection_wait = Sel_none; 2855 selection_wait = Sel_none;
2795 2856
2796 incr_buf_size = 0; 2857 incr_buf_size = 0;
2797 free (incr_buf); 2858 free (incr_buf);
… …
2808 selection_paste (win, prop, true); 2869 selection_paste (win, prop, true);
2809} 2870}
2810 2871
2811/* ------------------------------------------------------------------------- */ 2872/* ------------------------------------------------------------------------- */
2812/* 2873/*
2813 * Request the current selection: 2874 * Request the current selection:
2814 * Order: > internal selection if available 2875 * Order: > internal selection if available
2815 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2876 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2816 * > CUT_BUFFER0 2877 * > CUT_BUFFER0
2817 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2878 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2818 * will auto fallback to CUT_BUFFER0 2879 * will auto fallback to CUT_BUFFER0
… …
2820 */ 2881 */
2821void 2882void
2822rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2883rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2823{ 2884{
2824 if (selection.text && selnum == Sel_Primary) 2885 if (selection.text && selnum == Sel_Primary)
2886 {
2825 { /* internal selection */ 2887 /* internal selection */
2826 char *str = rxvt_wcstombs (selection.text, selection.len); 2888 char *str = rxvt_wcstombs (selection.text, selection.len);
2827 paste (str, strlen (str)); 2889 paste (str, strlen (str));
2828 free (str); 2890 free (str);
2829 return; 2891 return;
2830 } 2892 }
… …
2860 else if (selnum == Sel_Secondary) 2922 else if (selnum == Sel_Secondary)
2861 sel = XA_SECONDARY; 2923 sel = XA_SECONDARY;
2862 else 2924 else
2863 sel = xa[XA_CLIPBOARD]; 2925 sel = xa[XA_CLIPBOARD];
2864 2926
2865 if (XGetSelectionOwner (display->display, sel) != None) 2927 if (XGetSelectionOwner (dpy, sel) != None)
2866 { 2928 {
2867 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2929 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2868 vt, selection_request_time); 2930 vt, selection_request_time);
2869 return 1; 2931 return 1;
2870 } 2932 }
2871 2933
2872 return 0; 2934 return 0;
… …
2935 2997
2936 int end_col; 2998 int end_col;
2937 2999
2938 for (; row <= selection.end.row; row++, col = 0) 3000 for (; row <= selection.end.row; row++, col = 0)
2939 { 3001 {
2940#if ENABLE_FRILLS 3002#if !ENABLE_MINIMAL
2941 if (selection.rect) 3003 if (selection.rect)
2942 { 3004 {
2943 col = selection.beg.col; 3005 col = selection.beg.col;
2944 end_col = ncol + 1; 3006 end_col = ncol + 1;
2945 } 3007 }
… …
2948 end_col = ROW(row).l; 3010 end_col = ROW(row).l;
2949 3011
2950 col = max (col, 0); 3012 col = max (col, 0);
2951 3013
2952 if (row == selection.end.row 3014 if (row == selection.end.row
2953#if ENABLE_FRILLS 3015#if !ENABLE_MINIMAL
2954 || selection.rect 3016 || selection.rect
2955#endif 3017#endif
2956 ) 3018 )
2957 min_it (end_col, selection.end.col); 3019 min_it (end_col, selection.end.col);
2958 3020
… …
2981#endif 3043#endif
2982 else 3044 else
2983 new_selection_text[ofs++] = *t++; 3045 new_selection_text[ofs++] = *t++;
2984 } 3046 }
2985 3047
2986#if ENABLE_FRILLS 3048#if !ENABLE_MINIMAL
2987 if (selection.rect) 3049 if (selection.rect)
2988 { 3050 {
2989 while (ofs 3051 while (ofs
2990 && new_selection_text[ofs - 1] != C0_LF 3052 && new_selection_text[ofs - 1] != C0_LF
2991 && unicode::is_space (new_selection_text[ofs - 1])) 3053 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3025bool 3087bool
3026rxvt_term::selection_grab (Time tm) NOTHROW 3088rxvt_term::selection_grab (Time tm) NOTHROW
3027{ 3089{
3028 selection_time = tm; 3090 selection_time = tm;
3029 3091
3030 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3092 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3031 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3093 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3032 { 3094 {
3033 display->set_selection_owner (this); 3095 display->set_selection_owner (this);
3034 return true; 3096 return true;
3035 } 3097 }
3036 else 3098 else
… …
3040 } 3102 }
3041 3103
3042#if 0 3104#if 0
3043 XTextProperty ct; 3105 XTextProperty ct;
3044 3106
3045 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3107 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3046 { 3108 {
3047 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3109 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3048 XFree (ct.value); 3110 XFree (ct.value);
3049 } 3111 }
3050#endif 3112#endif
… …
3096 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3158 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3097 3159
3098 while (selection.mark.col > 0 3160 while (selection.mark.col > 0
3099 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3161 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3100 --selection.mark.col; 3162 --selection.mark.col;
3101 3163
3102 if (selection.op) 3164 if (selection.op)
3165 {
3103 { /* clear the old selection */ 3166 /* clear the old selection */
3104 selection.beg.row = selection.end.row = selection.mark.row; 3167 selection.beg.row = selection.end.row = selection.mark.row;
3105 selection.beg.col = selection.end.col = selection.mark.col; 3168 selection.beg.col = selection.end.col = selection.mark.col;
3106 } 3169 }
3107 3170
3108 selection.op = SELECTION_INIT; 3171 selection.op = SELECTION_INIT;
… …
3297 * a point/word/line which is either the start or end of the selection 3360 * a point/word/line which is either the start or end of the selection
3298 * and it was decided by whichever point/word/line was `fixed' at the 3361 * and it was decided by whichever point/word/line was `fixed' at the
3299 * time of the most recent button3 press 3362 * time of the most recent button3 press
3300 */ 3363 */
3301 if (button3 && buttonpress) 3364 if (button3 && buttonpress)
3365 {
3302 { /* button3 press */ 3366 /* button3 press */
3303 /* 3367 /*
3304 * first determine which edge of the selection we are closest to 3368 * first determine which edge of the selection we are closest to
3305 */ 3369 */
3306 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3370 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3307 || (!ROWCOL_IS_AFTER (pos, selection.end) 3371 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3325 selection.mark.row = selection.beg.row; 3389 selection.mark.row = selection.beg.row;
3326 selection.mark.col = selection.beg.col; 3390 selection.mark.col = selection.beg.col;
3327 } 3391 }
3328 } 3392 }
3329 else 3393 else
3394 {
3330 { /* button1 drag or button3 drag */ 3395 /* button1 drag or button3 drag */
3331 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3396 if (ROWCOL_IS_AFTER (selection.mark, pos))
3332 { 3397 {
3333 if (selection.mark.row == selection.end.row 3398 if (selection.mark.row == selection.end.row
3334 && selection.mark.col == selection.end.col 3399 && selection.mark.col == selection.end.col
3335 && clickchange 3400 && clickchange
… …
3352 3417
3353 if (selection.clicks == 1) 3418 if (selection.clicks == 1)
3354 { 3419 {
3355 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3420 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3356 && !ROW(selection.beg.row).is_longer () 3421 && !ROW(selection.beg.row).is_longer ()
3357#if ENABLE_FRILLS 3422#if !ENABLE_MINIMAL
3358 && !selection.rect 3423 && !selection.rect
3359#endif 3424#endif
3360 ) 3425 )
3361 selection.beg.col = ncol; 3426 selection.beg.col = ncol;
3362 3427
3363 if ( 3428 if (
3364 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3429 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3365 && !ROW(selection.end.row).is_longer () 3430 && !ROW(selection.end.row).is_longer ()
3366#if ENABLE_FRILLS 3431#if !ENABLE_MINIMAL
3367 && !selection.rect 3432 && !selection.rect
3368#endif 3433#endif
3369 ) 3434 )
3370 selection.end.col = ncol; 3435 selection.end.col = ncol;
3371 } 3436 }
… …
3378 selection_delimit_word (DN, &selection.end, &selection.end); 3443 selection_delimit_word (DN, &selection.end, &selection.end);
3379 } 3444 }
3380 else if (selection.clicks == 3) 3445 else if (selection.clicks == 3)
3381 { 3446 {
3382#if ENABLE_FRILLS 3447#if ENABLE_FRILLS
3383 if (OPTION (Opt_tripleclickwords)) 3448 if (option (Opt_tripleclickwords))
3384 { 3449 {
3385 selection_delimit_word (UP, &selection.beg, &selection.beg); 3450 selection_delimit_word (UP, &selection.beg, &selection.beg);
3386 3451
3387 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3452 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3388 { 3453 {
3389 if (!ROW(end_row).is_longer ()) 3454 if (!ROW(end_row).is_longer ())
3390 { 3455 {
3391 selection.end.row = end_row; 3456 selection.end.row = end_row;
3392 selection.end.col = ROW(end_row).l; 3457 selection.end.col = ROW(end_row).l;
3458# if !ENABLE_MINIMAL
3393 selection_remove_trailing_spaces (); 3459 selection_remove_trailing_spaces ();
3460# endif
3394 break; 3461 break;
3395 } 3462 }
3396 } 3463 }
3397 } 3464 }
3398 else 3465 else
… …
3414 selection.end.row++; 3481 selection.end.row++;
3415 } 3482 }
3416 } 3483 }
3417 3484
3418 if (button3 && buttonpress) 3485 if (button3 && buttonpress)
3486 {
3419 { /* mark may need to be changed */ 3487 /* mark may need to be changed */
3420 if (closeto == LEFT) 3488 if (closeto == LEFT)
3421 { 3489 {
3422 selection.mark.row = selection.end.row; 3490 selection.mark.row = selection.end.row;
3423 selection.mark.col = selection.end.col - (selection.clicks == 2); 3491 selection.mark.col = selection.end.col - (selection.clicks == 2);
3424 } 3492 }
… …
3427 selection.mark.row = selection.beg.row; 3495 selection.mark.row = selection.beg.row;
3428 selection.mark.col = selection.beg.col; 3496 selection.mark.col = selection.beg.col;
3429 } 3497 }
3430 } 3498 }
3431 3499
3432#if ENABLE_FRILLS 3500#if !ENABLE_MINIMAL
3433 if (selection.rect && selection.beg.col > selection.end.col) 3501 if (selection.rect && selection.beg.col > selection.end.col)
3434 ::swap (selection.beg.col, selection.end.col); 3502 ::swap (selection.beg.col, selection.end.col);
3435#endif 3503#endif
3436} 3504}
3437 3505
3438#if ENABLE_FRILLS 3506#if !ENABLE_MINIMAL
3439void 3507void
3440rxvt_term::selection_remove_trailing_spaces () NOTHROW 3508rxvt_term::selection_remove_trailing_spaces () NOTHROW
3441{ 3509{
3442 int32_t end_col, end_row; 3510 int32_t end_col, end_row;
3443 text_t *stp; 3511 text_t *stp;
… …
3498 */ 3566 */
3499void 3567void
3500rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3568rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3501{ 3569{
3502 XSelectionEvent ev; 3570 XSelectionEvent ev;
3503 dDisp;
3504 3571
3505 ev.type = SelectionNotify; 3572 ev.type = SelectionNotify;
3506 ev.property = None; 3573 ev.property = None;
3507 ev.display = rq.display; 3574 ev.display = rq.display;
3508 ev.requestor = rq.requestor; 3575 ev.requestor = rq.requestor;
… …
3522 *target++ = xa[XA_COMPOUND_TEXT]; 3589 *target++ = xa[XA_COMPOUND_TEXT];
3523#if X_HAVE_UTF8_STRING 3590#if X_HAVE_UTF8_STRING
3524 *target++ = xa[XA_UTF8_STRING]; 3591 *target++ = xa[XA_UTF8_STRING];
3525#endif 3592#endif
3526 3593
3527 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3594 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3528 32, PropModeReplace, 3595 32, PropModeReplace,
3529 (unsigned char *)target_list, target - target_list); 3596 (unsigned char *)target_list, target - target_list);
3530 ev.property = rq.property; 3597 ev.property = rq.property;
3531 } 3598 }
3532#if TODO // TODO 3599#if TODO // TODO
… …
3535 /* TODO: Handle MULTIPLE */ 3602 /* TODO: Handle MULTIPLE */
3536 } 3603 }
3537#endif 3604#endif
3538 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3605 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3539 { 3606 {
3540 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3607 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3541 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3608 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3542 ev.property = rq.property; 3609 ev.property = rq.property;
3543 } 3610 }
3544 else if (rq.target == XA_STRING 3611 else if (rq.target == XA_STRING
3545 || rq.target == xa[XA_TEXT] 3612 || rq.target == xa[XA_TEXT]
… …
3569 style = enc_string; 3636 style = enc_string;
3570 else if (target == xa[XA_TEXT]) 3637 else if (target == xa[XA_TEXT])
3571 style = enc_text; 3638 style = enc_text;
3572 else if (target == xa[XA_COMPOUND_TEXT]) 3639 else if (target == xa[XA_COMPOUND_TEXT])
3573 style = enc_compound_text; 3640 style = enc_compound_text;
3574#if ENABLE_FRILLS 3641#if !ENABLE_MINIMAL
3575 else if (target == xa[XA_UTF8_STRING]) 3642 else if (target == xa[XA_UTF8_STRING])
3576 style = enc_utf8; 3643 style = enc_utf8;
3577#endif 3644#endif
3578 else 3645 else
3579 { 3646 {
… …
3590 { 3657 {
3591 cl = L""; 3658 cl = L"";
3592 selectlen = 0; 3659 selectlen = 0;
3593 } 3660 }
3594 3661
3595#if ENABLE_FRILLS 3662#if !ENABLE_MINIMAL
3596 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3663 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3597 // so recode it manually 3664 // so recode it manually
3598 if (style == enc_utf8) 3665 if (style == enc_utf8)
3599 { 3666 {
3600 freect = 1; 3667 freect = 1;
… …
3603 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3670 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3604 ct.nitems = strlen ((char *)ct.value); 3671 ct.nitems = strlen ((char *)ct.value);
3605 } 3672 }
3606 else 3673 else
3607#endif 3674#endif
3608 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3675 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3609 freect = 1; 3676 freect = 1;
3610 else 3677 else
3611 { 3678 {
3612 /* if we failed to convert then send it raw */ 3679 /* if we failed to convert then send it raw */
3613 ct.value = (unsigned char *)cl; 3680 ct.value = (unsigned char *)cl;
3614 ct.nitems = selectlen; 3681 ct.nitems = selectlen;
3615 ct.encoding = target; 3682 ct.encoding = target;
3616 } 3683 }
3617 3684
3618 XChangeProperty (disp, rq.requestor, rq.property, 3685 XChangeProperty (dpy, rq.requestor, rq.property,
3619 ct.encoding, 8, PropModeReplace, 3686 ct.encoding, 8, PropModeReplace,
3620 ct.value, (int)ct.nitems); 3687 ct.value, (int)ct.nitems);
3621 ev.property = rq.property; 3688 ev.property = rq.property;
3622 3689
3623 if (freect) 3690 if (freect)
3624 XFree (ct.value); 3691 XFree (ct.value);
3625 } 3692 }
3626 3693
3627 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3694 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3628}
3629
3630/* ------------------------------------------------------------------------- *
3631 * MOUSE ROUTINES *
3632 * ------------------------------------------------------------------------- */
3633
3634/*
3635 * return col/row values corresponding to x/y pixel values
3636 */
3637void
3638rxvt_term::pixel_position (int *x, int *y) NOTHROW
3639{
3640 *x = Pixel2Col (*x);
3641 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3642 *y = Pixel2Row (*y);
3643 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3644} 3695}
3645 3696
3646/* ------------------------------------------------------------------------- */ 3697/* ------------------------------------------------------------------------- */
3647#ifdef USE_XIM 3698#ifdef USE_XIM
3648void 3699void
3649rxvt_term::im_set_position (XPoint &pos) NOTHROW 3700rxvt_term::im_set_position (XPoint &pos) NOTHROW
3650{ 3701{
3651 XWindowAttributes xwa; 3702 XWindowAttributes xwa;
3652 3703
3653 XGetWindowAttributes (display->display, vt, &xwa); 3704 XGetWindowAttributes (dpy, vt, &xwa);
3654 3705
3655 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3706 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3656 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3707 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3657} 3708}
3658#endif 3709#endif
… …
3754rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3805rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3755{ 3806{
3756 while (*s) 3807 while (*s)
3757 { 3808 {
3758 text_t t = *s++; 3809 text_t t = *s++;
3759 int width = wcwidth (t); 3810 int width = WCWIDTH (t);
3760 3811
3761 while (width--) 3812 while (width--)
3762 { 3813 {
3763 scr_overlay_set (x++, y, t); 3814 scr_overlay_set (x++, y, t);
3764 t = NOCHAR; 3815 t = NOCHAR;

Diff Legend

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