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.238 by root, Thu Jan 19 16:22:13 2006 UTC vs.
Revision 1.319 by root, Tue Nov 4 23:08:44 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
118/* Fill part/all of a line with blanks. */ 100/* Fill part/all of a line with blanks. */
119void 101void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const 102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 103{
122 if (!l.t) 104 if (!l.t)
123 { 105 {
124 lalloc (l); 106 lalloc (l);
125 col = 0; 107 col = 0;
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
… …
142} 124}
143 125
144/* ------------------------------------------------------------------------- */ 126/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 127/* Fill a full line with blanks - make sure it is allocated first */
146void 128void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const 129rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 130{
149 scr_blank_line (l, 0, ncol, efs); 131 scr_blank_line (l, 0, ncol, efs);
150 132
151 l.l = 0; 133 l.l = 0;
152 l.f = 0; 134 l.f = 0;
135}
136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
153} 154}
154 155
155/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
158 159
159void 160void
160rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
161{ 162{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
166 view_start = 0; 163 view_start = 0;
167 num_scr = 0; 164 num_scr = 0;
168 165
169 if (ncol == 0) 166 if (ncol == 0)
170 ncol = 80; 167 ncol = 80;
… …
174 171
175 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 173 return;
177 174
178 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
180 { 177 {
181 //TODO//FIXME 178 //TODO//FIXME
182 saveLines++; 179 saveLines++;
183 prev_nrow--; 180 prev_nrow--;
184 top_row--; 181 top_row--;
… …
195 if (!row_buf) 192 if (!row_buf)
196 { 193 {
197 /* 194 /*
198 * first time called so just malloc everything: don't rely on realloc 195 * first time called so just malloc everything: don't rely on realloc
199 */ 196 */
200 top_row = 0; /* no saved lines */ 197 top_row = 0;
201 term_start = 0; 198 term_start = 0;
202 199
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 200 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 202
… …
234 selection.text = NULL; 231 selection.text = NULL;
235 selection.len = 0; 232 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
238 selection.clicks = 0; 235 selection.clicks = 0;
239 CLEAR_ALL_SELECTION ();
240 rvideo = 0;
241 } 236 }
242 else 237 else
243 { 238 {
244 /* 239 /*
245 * add or delete rows as appropriate 240 * add or delete rows as appropriate
… …
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 270 }
276 271
277 line_t *old_buf = row_buf; 272 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 274
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 276 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 277 int q = total_rows; // rewrapped row
283 278
284 if (top_row) 279 if (top_row)
285 { 280 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb 281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 282 // to come up with a lean and mean algorithm.
288 283
289 row_col_t ocur = screen.cur; 284 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 285 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 286
… …
325 qline->l = ncol; 320 qline->l = ncol;
326 qline->is_longer (1); 321 qline->is_longer (1);
327 322
328 int qcol = 0; 323 int qcol = 0;
329 324
325 // see below for cursor adjustment rationale
326 if (p == ocur.row)
327 screen.cur.row = q - (total_rows - nrow);
328
330 // fill a single destination line 329 // fill a single destination line
331 while (lofs < llen && qcol < ncol) 330 while (lofs < llen && qcol < ncol)
332 { 331 {
333 int prow = lofs / prev_ncol; 332 int prow = lofs / prev_ncol;
334 int pcol = lofs % prev_ncol; 333 int pcol = lofs % prev_ncol;
… …
344 343
345 line_t &pline = old_buf [prow]; 344 line_t &pline = old_buf [prow];
346 345
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 346 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 347
349 assert (len);
350 assert (pline.t);
351
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354 350
355 lofs += len; 351 lofs += len;
356 qcol += len; 352 qcol += len;
… …
363 } 359 }
364 while (p != pend && q > 0); 360 while (p != pend && q > 0);
365 361
366 term_start = total_rows - nrow; 362 term_start = total_rows - nrow;
367 top_row = q - term_start; 363 top_row = q - term_start;
368 364
369 // make sure all terminal lines exist 365 // make sure all terminal lines exist
370 while (top_row > 0) 366 while (top_row > 0)
371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 367 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 } 368 }
373 else 369 else
374 { 370 {
375 // if no scrollback exists (yet), wing, instead of wrap 371 // if no scrollback exists (yet), wing, instead of wrap
376 372
377 for (int row = min (nrow, prev_nrow); row--; ) 373 for (int row = min (nrow, prev_nrow); row--; )
378 { 374 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 375 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row]; 376 line_t &qline = row_buf [row];
381 377
… …
389 } 385 }
390 386
391 term_start = 0; 387 term_start = 0;
392 } 388 }
393 389
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = top_row; i < nrow; i++)
396 assert (ROW (i).t);
397#endif
398
399 free (old_buf); 390 free (old_buf);
400 delete old_ta; 391 delete old_ta;
401 delete old_ra; 392 delete old_ra;
402 393
403 clamp_it (screen.cur.row, 0, nrow - 1); 394 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 395 clamp_it (screen.cur.col, 0, ncol - 1);
405
406 if (tabs)
407 free (tabs);
408 } 396 }
397
398 CLEAR_ALL_SELECTION ();
409 399
410 prev_nrow = nrow; 400 prev_nrow = nrow;
411 prev_ncol = ncol; 401 prev_ncol = ncol;
412 402
413 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
414
415 for (int col = ncol; col--; )
416 tabs [col] = col % TABSIZE == 0;
417
418 tt_winch (); 403 tt_winch ();
419 404
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 405 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 406}
422 407
423/* ------------------------------------------------------------------------- */ 408/* ------------------------------------------------------------------------- */
424/* 409/*
425 * Free everything. That way malloc debugging can find leakage. 410 * Free everything. That way malloc debugging can find leakage.
426 */ 411 */
427void 412void
428rxvt_term::scr_release () 413rxvt_term::scr_release () NOTHROW
429{ 414{
415 if (row_buf)
416 {
430 delete talloc; talloc = 0; 417 delete talloc; talloc = 0;
431 delete ralloc; ralloc = 0; 418 delete ralloc; ralloc = 0;
432 419
433 free (row_buf); 420 free (row_buf);
434 free (swap_buf); 421 free (swap_buf);
435 free (drawn_buf); 422 free (drawn_buf);
436 free (tabs);
437
438 row_buf = 0; // signal that we freed all the arrays 423 row_buf = 0; // signal that we freed all the arrays above
439}
440 424
425 free (tabs);
426 tabs = 0;
427 }
428}
429
441/* ------------------------------------------------------------------------- */ 430/* ------------------------------------------------------------------------- */
442/* 431/*
443 * Hard reset 432 * Hard/Soft reset
444 */ 433 */
445void 434void
446rxvt_term::scr_poweron () 435rxvt_term::scr_poweron ()
447{ 436{
448 scr_release (); 437 scr_release ();
449 prev_nrow = prev_ncol = 0; 438 prev_nrow = prev_ncol = 0;
439 scr_soft_reset ();
450 scr_reset (); 440 scr_reset ();
451 441
452 scr_clear (true); 442 scr_clear (true);
453 scr_refresh (); 443 scr_refresh ();
444}
445
446void
447rxvt_term::scr_soft_reset ()
448{
449 /* only affects modes, nothing drastic such as clearing the screen */
450#if ENABLE_OVERLAY
451 scr_overlay_off ();
452#endif
453
454 rvideo_mode = false;
455
456 if (current_screen != PRIMARY)
457 scr_swap_screen ();
458
459 free (tabs);
460 tabs = (char *)rxvt_malloc (ncol);
461
462 for (int col = ncol; --col; )
463 tabs [col] = col % TABSIZE == 0;
464
465 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0);
454} 468}
455 469
456/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
457 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
458 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
460 * Save and Restore cursor 474 * Save and Restore cursor
461 * XTERM_SEQ: Save cursor : ESC 7 475 * XTERM_SEQ: Save cursor : ESC 7
462 * XTERM_SEQ: Restore cursor: ESC 8 476 * XTERM_SEQ: Restore cursor: ESC 8
463 */ 477 */
464void 478void
465rxvt_term::scr_cursor (int mode) 479rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
466{ 480{
467 screen_t *s; 481 screen_t *s;
468 482
469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 483#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
470 if (current_screen == SECONDARY) 484 if (current_screen == SECONDARY)
… …
502 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
503 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
504#endif 518#endif
505} 519}
506 520
521void
522rxvt_term::scr_swap_screen ()
523{
524 if (!option (Opt_secondaryScreen))
525 return;
526
527 for (int i = prev_nrow; i--; )
528 ::swap (ROW(i), swap_buf [i]);
529
530 ::swap (screen.cur, swap.cur);
531
532 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
533 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
534}
535
507/* ------------------------------------------------------------------------- */ 536/* ------------------------------------------------------------------------- */
508/* 537/*
509 * Swap between primary and secondary screens 538 * Swap between primary and secondary screens
510 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 539 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 540 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
512 */ 541 */
513int 542void
514rxvt_term::scr_change_screen (int scrn) 543rxvt_term::scr_change_screen (int scrn)
515{ 544{
545 if (scrn == current_screen)
546 return;
547
516 want_refresh = 1; 548 want_refresh = 1;
517 view_start = 0; 549 view_start = 0;
518 550
519 if (current_screen == scrn)
520 return scrn;
521
522 selection_check (2); /* check for boundary cross */ 551 selection_check (2); /* check for boundary cross */
523 552
524 int i = current_screen; current_screen = scrn; scrn = i; 553 int i = current_screen; current_screen = scrn; scrn = i;
525 554
526 ::swap (screen.cur.row, swap.cur.row);
527 ::swap (screen.cur.col, swap.cur.col);
528
529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
531
532#if NSCREENS 555#if NSCREENS
533 if (OPTION (Opt_secondaryScreen)) 556 if (option (Opt_secondaryScreen))
534 { 557 {
535 num_scr = 0; 558 num_scr = 0;
536 559
537 for (int i = prev_nrow; i--; ) 560 scr_swap_screen ();
538 ::swap (ROW(i), swap_buf [i]);
539 561
540 ::swap (screen.charset, swap.charset); 562 ::swap (screen.charset, swap.charset);
541 ::swap (screen.flags, swap.flags); 563 ::swap (screen.flags, swap.flags);
542 screen.flags |= Screen_VisibleCursor; 564 screen.flags |= Screen_VisibleCursor;
543 swap.flags |= Screen_VisibleCursor; 565 swap.flags |= Screen_VisibleCursor;
544 } 566 }
545 else 567 else
546#endif 568#endif
547 if (OPTION (Opt_secondaryScroll)) 569 if (option (Opt_secondaryScroll))
548 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 570 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
549
550 return scrn;
551} 571}
552 572
553// clear WrapNext indicator, solidifying position on next line 573// clear WrapNext indicator, solidifying position on next line
554void 574void
555rxvt_term::scr_do_wrap () 575rxvt_term::scr_do_wrap () NOTHROW
556{ 576{
557 if (!(screen.flags & Screen_WrapNext)) 577 if (!(screen.flags & Screen_WrapNext))
558 return; 578 return;
559 579
560 screen.flags &= ~Screen_WrapNext; 580 screen.flags &= ~Screen_WrapNext;
… …
570/* ------------------------------------------------------------------------- */ 590/* ------------------------------------------------------------------------- */
571/* 591/*
572 * Change the colour for following text 592 * Change the colour for following text
573 */ 593 */
574void 594void
575rxvt_term::scr_color (unsigned int color, int fgbg) 595rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
576{ 596{
577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 597 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 598 color = fgbg;
579 599
580 if (fgbg == Color_fg) 600 if (fgbg == Color_fg)
… …
586/* ------------------------------------------------------------------------- */ 606/* ------------------------------------------------------------------------- */
587/* 607/*
588 * Change the rendition style for following text 608 * Change the rendition style for following text
589 */ 609 */
590void 610void
591rxvt_term::scr_rendition (int set, int style) 611rxvt_term::scr_rendition (int set, int style) NOTHROW
592 { 612{
593 if (set) 613 if (set)
594 rstyle |= style; 614 rstyle |= style;
595 else if (style == ~RS_None) 615 else if (style == ~RS_None)
596 rstyle = DEFAULT_RSTYLE; 616 rstyle = DEFAULT_RSTYLE;
597 else 617 else
598 rstyle &= ~style; 618 rstyle &= ~style;
599 } 619}
600 620
601/* ------------------------------------------------------------------------- */ 621/* ------------------------------------------------------------------------- */
602/* 622/*
603 * Scroll text between <row1> and <row2> inclusive, by <count> lines 623 * Scroll text between <row1> and <row2> inclusive, by <count> lines
604 * count positive ==> scroll up 624 * count positive ==> scroll up
605 * count negative ==> scroll down 625 * count negative ==> scroll down
606 */ 626 */
607int 627int
608rxvt_term::scr_scroll_text (int row1, int row2, int count) 628rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
609{ 629{
610 if (count == 0 || (row1 > row2)) 630 if (count == 0 || (row1 > row2))
611 return 0; 631 return 0;
612 632
613 want_refresh = 1; 633 want_refresh = 1;
614 num_scr += count; 634 num_scr += count;
615 635
616 if (count > 0 636 if (count > 0
617 && row1 == 0 637 && row1 == 0
618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 638 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
619 { 639 {
620 top_row = max (top_row - count, -saveLines); 640 top_row = max (top_row - count, -saveLines);
621 641
622 // scroll everything up 'count' lines 642 // scroll everything up 'count' lines
623 term_start = (term_start + count) % total_rows; 643 term_start = (term_start + count) % total_rows;
… …
630 } 650 }
631 651
632 // erase newly scrolled-in lines 652 // erase newly scrolled-in lines
633 for (int i = count; i--; ) 653 for (int i = count; i--; )
634 { 654 {
635 // basically this is a slightly optimized scr_blank_screen_mem
636 // it is worth the effort on slower machines
637 line_t &l = ROW(nrow - 1 - i); 655 line_t &l = ROW(nrow - 1 - i);
638 656
657 // optimize if already cleared, can be significant on slow machines
658 // could be rolled into scr_blank_screen_mem
659 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
660 {
639 scr_blank_line (l, 0, l.l, rstyle); 661 scr_blank_line (l, 0, l.l, rstyle);
640
641 l.l = 0; 662 l.l = 0;
642 l.f = 0; 663 l.f = 0;
664 }
665 else
666 scr_blank_screen_mem (l, rstyle);
643 } 667 }
644 668
645 // now copy lines below the scroll region bottom to the 669 // now copy lines below the scroll region bottom to the
646 // bottom of the screen again, so they look as if they 670 // bottom of the screen again, so they look as if they
647 // hadn't moved. 671 // hadn't moved.
… …
651 line_t &l2 = ROW(i); 675 line_t &l2 = ROW(i);
652 676
653 ::swap (l1, l2); 677 ::swap (l1, l2);
654 l2.touch (); 678 l2.touch ();
655 } 679 }
656 680
657 // move and/or clear selection, if any 681 // move and/or clear selection, if any
658 if (selection.op && current_screen == selection.screen) 682 if (selection.op && current_screen == selection.screen)
659 { 683 {
660 selection.beg.row -= count; 684 selection.beg.row -= count;
661 selection.end.row -= count; 685 selection.end.row -= count;
… …
669 selection.op = SELECTION_CLEAR; 693 selection.op = SELECTION_CLEAR;
670 } 694 }
671 } 695 }
672 696
673 // finally move the view window, if desired 697 // finally move the view window, if desired
674 if (OPTION (Opt_scrollWithBuffer) 698 if (option (Opt_scrollWithBuffer)
675 && view_start != 0 699 && view_start != 0
676 && view_start != -saveLines) 700 && view_start != -saveLines)
677 scr_page (UP, count); 701 scr_page (UP, count);
678 702
679 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 703 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
697 { 721 {
698 /* move selected region too */ 722 /* move selected region too */
699 selection.beg.row -= count; 723 selection.beg.row -= count;
700 selection.end.row -= count; 724 selection.end.row -= count;
701 selection.mark.row -= count; 725 selection.mark.row -= count;
702 726
703 selection_check (0); 727 selection_check (0);
704 } 728 }
705 } 729 }
706 730
707 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
… …
731/* ------------------------------------------------------------------------- */ 755/* ------------------------------------------------------------------------- */
732/* 756/*
733 * Add text given in <str> of length <len> to screen struct 757 * Add text given in <str> of length <len> to screen struct
734 */ 758 */
735void 759void
736rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 760rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
737{ 761{
738 if (len <= 0) /* sanity */ 762 if (len <= 0) /* sanity */
739 return; 763 return;
740 764
741 unsigned char checksel; 765 unsigned char checksel;
… …
747 ZERO_SCROLLBACK (); 771 ZERO_SCROLLBACK ();
748 772
749 if (minlines > 0) 773 if (minlines > 0)
750 { 774 {
751 minlines += screen.cur.row - screen.bscroll; 775 minlines += screen.cur.row - screen.bscroll;
776 min_it (minlines, screen.cur.row - top_row);
752 777
753 if (minlines > 0 778 if (minlines > 0
754 && screen.tscroll == 0 779 && screen.tscroll == 0
755 && screen.bscroll == nrow - 1) 780 && screen.bscroll == nrow - 1)
756 { 781 {
… …
773 798
774 while (str < strend) 799 while (str < strend)
775 { 800 {
776 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
777 802
778 if (c < 0x20) 803 if (expect_false (c < 0x20))
779 if (c == C0_LF) 804 if (c == C0_LF)
780 { 805 {
781 max_it (line->l, screen.cur.col); 806 max_it (line->l, screen.cur.col);
782 807
783 screen.flags &= ~Screen_WrapNext; 808 screen.flags &= ~Screen_WrapNext;
… …
802 { 827 {
803 scr_tab (1, true); 828 scr_tab (1, true);
804 continue; 829 continue;
805 } 830 }
806 831
832 if (expect_false (
807 if (checksel /* see if we're writing within selection */ 833 checksel /* see if we're writing within selection */
808 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
809 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 835 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
836 ))
810 { 837 {
811 checksel = 0; 838 checksel = 0;
812 /* 839 /*
813 * If we wrote anywhere in the selected area, kill the selection 840 * If we wrote anywhere in the selected area, kill the selection
814 * XXX: should we kill the mark too? Possibly, but maybe that 841 * XXX: should we kill the mark too? Possibly, but maybe that
815 * should be a similar check. 842 * should be a similar check.
816 */ 843 */
817 CLEAR_SELECTION (); 844 CLEAR_SELECTION ();
818 } 845 }
819 846
820 if (screen.flags & Screen_WrapNext) 847 if (expect_false (screen.flags & Screen_WrapNext))
821 { 848 {
822 scr_do_wrap (); 849 scr_do_wrap ();
823 850
824 line->l = ncol; 851 line->l = ncol;
825 line->is_longer (1); 852 line->is_longer (1);
826 853
827 row = screen.cur.row; 854 row = screen.cur.row;
828 line = &ROW(row); /* _must_ refresh */ 855 line = &ROW(row); /* _must_ refresh */
829 } 856 }
830 857
831 // some utf-8 decoders "decode" surrogate characters: let's fix this. 858 // some utf-8 decoders "decode" surrogate characters: let's fix this.
832 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 859 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
833 c = 0xfffd; 860 c = 0xfffd;
834 861
835 // rely on wcwidth to tell us the character width, at least for non-latin1 862 // rely on wcwidth to tell us the character width, do wcwidth before
836 // do wcwidth before further replacements, as wcwidth might return -1 863 // further replacements, as wcwidth might return -1 for the line
837 // for the line drawing characters below as they might be invalid in the current 864 // drawing characters below as they might be invalid in the current
838 // locale. 865 // locale.
839 int width = c < 0x100 ? 1 : wcwidth (c); 866 int width = WCWIDTH (c);
840 867
841 if (charsets [screen.charset] == '0') // DEC SPECIAL 868 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
842 { 869 {
843 // vt100 special graphics and line drawing 870 // vt100 special graphics and line drawing
844 // 5f-7e standard vt100 871 // 5f-7e standard vt100
845 // 40-5e rxvt extension for extra curses acs chars 872 // 40-5e rxvt extension for extra curses acs chars
846 static uint16_t vt100_0[62] = { // 41 .. 7e 873 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
859 c = vt100_0[c - 0x41]; 886 c = vt100_0[c - 0x41];
860 width = 1; // vt100 line drawing characters are always single-width 887 width = 1; // vt100 line drawing characters are always single-width
861 } 888 }
862 } 889 }
863 890
864 if (screen.flags & Screen_Insert) 891 if (expect_false (screen.flags & Screen_Insert))
865 scr_insdel_chars (width, INSERT); 892 scr_insdel_chars (width, INSERT);
866 893
867 if (width != 0) 894 if (width != 0)
868 { 895 {
869#if !UNICODE_3 896#if !UNICODE_3
… …
875 c = 0xfffd; 902 c = 0xfffd;
876# endif 903# endif
877#endif 904#endif
878 905
879 // nuke the character at this position, if required 906 // nuke the character at this position, if required
907 if (expect_false (
880 if (line->t[screen.cur.col] == NOCHAR 908 line->t[screen.cur.col] == NOCHAR
881 || (screen.cur.col < ncol - 1 909 || (screen.cur.col < ncol - 1
882 && line->t[screen.cur.col + 1] == NOCHAR)) 910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
883 { 918 {
884 int col = screen.cur.col; 919 // ... artificially enlargen the previous one
885
886 // find begin
887 while (col > 0 && line->t[col] == NOCHAR)
888 col--;
889
890 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
891
892 // found begin, nuke
893 do {
894 line->t[col] = ' ';
895 line->r[col] = rend;
896 col++;
897 } while (col < ncol && line->t[col] == NOCHAR);
898 }
899
900 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
901
902 // if the character doesn't fit into the remaining columns...
903 if (screen.cur.col > ncol - width && ncol >= width)
904 {
905 // ...output spaces
906 c = ' '; 920 c = NOCHAR;
907 // and try the same character next loop iteration 921 // and try the same character next loop iteration
908 --str; 922 --str;
909 } 923 }
910 924
911 line->touch (); 925 line->touch ();
… …
913 do 927 do
914 { 928 {
915 line->t[screen.cur.col] = c; 929 line->t[screen.cur.col] = c;
916 line->r[screen.cur.col] = rend; 930 line->r[screen.cur.col] = rend;
917 931
918 if (screen.cur.col < ncol - 1) 932 if (expect_true (screen.cur.col < ncol - 1))
919 screen.cur.col++; 933 screen.cur.col++;
920 else 934 else
921 { 935 {
922 line->l = ncol; 936 line->l = ncol;
923 if (screen.flags & Screen_Autowrap) 937 if (screen.flags & Screen_Autowrap)
… …
925 break; 939 break;
926 } 940 }
927 941
928 c = NOCHAR; 942 c = NOCHAR;
929 } 943 }
930 while (--width > 0); 944 while (expect_false (--width > 0));
931 945
932 // pad with spaces when overwriting wide character with smaller one 946 // pad with spaces when overwriting wide character with smaller one
933 if (!width) 947 if (expect_false (!width))
934 { 948 {
935 line->touch (); 949 line->touch ();
936 950
937 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
938 { 952 {
939 line->t[c] = ' '; 953 line->t[c] = ' ';
940 line->r[c] = rend; 954 line->r[c] = rend;
941 } 955 }
942 } 956 }
943 } 957 }
958#if ENABLE_COMBINING
944 else // width == 0 959 else // width == 0
945 { 960 {
946#if ENABLE_COMBINING 961 if (c != 0xfeff) // ignore BOM
947 // handle combining characters
948 // we just tag the accent on the previous on-screen character.
949 // this is arguably not correct, but also arguably not wrong.
950 // we don't handle double-width characters nicely yet.
951 line_t *linep;
952 text_t *tp;
953 rend_t *rp;
954
955 if (screen.cur.col > 0)
956 { 962 {
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 {
957 linep = line; 973 linep = line;
958 tp = line->t + screen.cur.col - 1; 974 tp = line->t + screen.cur.col - 1;
959 rp = line->r + screen.cur.col - 1; 975 rp = line->r + screen.cur.col - 1;
976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
960 } 999 }
961 else if (screen.cur.row > 0
962 && ROW(screen.cur.row - 1).is_longer ())
963 {
964 linep = &ROW(screen.cur.row - 1);
965 tp = line->t + ncol - 1;
966 rp = line->r + ncol - 1;
967 } 1000 }
968 else
969 continue;
970
971 linep->touch ();
972
973 while (*tp == NOCHAR && tp > linep->t)
974 tp--, rp--;
975
976 // first try to find a precomposed character
977 unicode_t n = rxvt_compose (*tp, c);
978 if (n == NOCHAR)
979 n = rxvt_composite.compose (*tp, c);
980
981 *tp = n;
982 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
983#endif 1001#endif
984 }
985 } 1002 }
986 1003
987 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
988 1005
989#ifdef DEBUG_STRICT 1006#ifdef DEBUG_STRICT
… …
995/* 1012/*
996 * Process Backspace. Move back the cursor back a position, wrap if have to 1013 * Process Backspace. Move back the cursor back a position, wrap if have to
997 * XTERM_SEQ: CTRL-H 1014 * XTERM_SEQ: CTRL-H
998 */ 1015 */
999void 1016void
1000rxvt_term::scr_backspace () 1017rxvt_term::scr_backspace () NOTHROW
1001{ 1018{
1002 want_refresh = 1;
1003
1004 if (screen.cur.col == 0) 1019 if (screen.cur.col == 0)
1005 { 1020 {
1006 if (screen.cur.row > 0) 1021 if (screen.cur.row > 0)
1007 { 1022 {
1008#ifdef TERMCAP_HAS_BW 1023#ifdef TERMCAP_HAS_BW
1009 screen.cur.col = ncol - 1; 1024 screen.cur.col = ncol - 1;
1010 screen.cur.row--; 1025 --screen.cur.row;
1011 return; 1026
1027 want_refresh = 1;
1012#endif 1028#endif
1013 } 1029 }
1014 } 1030 }
1015 else if (!(screen.flags & Screen_WrapNext)) 1031 else
1016 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1017
1018 screen.flags &= ~Screen_WrapNext;
1019} 1033}
1020 1034
1021/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
1022/* 1036/*
1023 * Process Horizontal Tab 1037 * Process Horizontal Tab
1024 * count: +ve = forward; -ve = backwards 1038 * count: +ve = forward; -ve = backwards
1025 * XTERM_SEQ: CTRL-I 1039 * XTERM_SEQ: CTRL-I
1026 */ 1040 */
1027void 1041void
1028rxvt_term::scr_tab (int count, bool ht) 1042rxvt_term::scr_tab (int count, bool ht) NOTHROW
1029{ 1043{
1030 int i, x; 1044 int i, x;
1031 1045
1032 want_refresh = 1; 1046 want_refresh = 1;
1033 i = x = screen.cur.col; 1047 i = x = screen.cur.col;
… …
1046 x = i; 1060 x = i;
1047 1061
1048 if (!--count) 1062 if (!--count)
1049 break; 1063 break;
1050 } 1064 }
1051 else 1065 else
1052 ht &= l.t[i] == ' ' 1066 ht &= l.t[i] == ' '
1053 && RS_SAME (l.r[i], base_rend); 1067 && RS_SAME (l.r[i], base_rend);
1054 1068
1055 if (count) 1069 if (count)
1056 x = ncol - 1; 1070 x = ncol - 1;
1057 1071
1058 // store horizontal tab commands as characters inside the text 1072 // store horizontal tab commands as characters inside the text
1059 // buffer so they can be selected and pasted. 1073 // buffer so they can be selected and pasted.
1060 if (ht && OPTION (Opt_pastableTabs)) 1074 if (ht && option (Opt_pastableTabs))
1061 { 1075 {
1062 base_rend = SET_FONT (base_rend, 0); 1076 base_rend = SET_FONT (base_rend, 0);
1063 1077
1064 l.touch (x); 1078 l.touch (x);
1065 1079
… …
1098 * Process DEC Back Index 1112 * Process DEC Back Index
1099 * XTERM_SEQ: ESC 6 1113 * XTERM_SEQ: ESC 6
1100 * Move cursor left in row. If we're at the left boundary, shift everything 1114 * Move cursor left in row. If we're at the left boundary, shift everything
1101 * in that row right. Clear left column. 1115 * in that row right. Clear left column.
1102 */ 1116 */
1103#if ENABLE_FRILLS 1117#if !ENABLE_MINIMAL
1104void 1118void
1105rxvt_term::scr_backindex () 1119rxvt_term::scr_backindex () NOTHROW
1106{ 1120{
1107 if (screen.cur.col > 0) 1121 if (screen.cur.col > 0)
1108 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1109 else 1123 else
1110 scr_insdel_chars (1, INSERT); 1124 scr_insdel_chars (1, INSERT);
… …
1115 * Process DEC Forward Index 1129 * Process DEC Forward Index
1116 * XTERM_SEQ: ESC 9 1130 * XTERM_SEQ: ESC 9
1117 * Move cursor right in row. If we're at the right boundary, shift everything 1131 * Move cursor right in row. If we're at the right boundary, shift everything
1118 * in that row left. Clear right column. 1132 * in that row left. Clear right column.
1119 */ 1133 */
1120#if ENABLE_FRILLS 1134#if !ENABLE_MINIMAL
1121void 1135void
1122rxvt_term::scr_forwardindex () 1136rxvt_term::scr_forwardindex () NOTHROW
1123{ 1137{
1124 if (screen.cur.col < ncol - 1) 1138 if (screen.cur.col < ncol - 1)
1125 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1126 else 1140 else
1127 { 1141 {
… …
1140/* ------------------------------------------------------------------------- */ 1154/* ------------------------------------------------------------------------- */
1141/* 1155/*
1142 * Goto Row/Column 1156 * Goto Row/Column
1143 */ 1157 */
1144void 1158void
1145rxvt_term::scr_gotorc (int row, int col, int relative) 1159rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1146{ 1160{
1147 want_refresh = 1; 1161 want_refresh = 1;
1148 ZERO_SCROLLBACK (); 1162 ZERO_SCROLLBACK ();
1149 1163
1150 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1164 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1172 } 1186 }
1173 } 1187 }
1174 else 1188 else
1175 { 1189 {
1176 if (screen.flags & Screen_Relative) 1190 if (screen.flags & Screen_Relative)
1191 {
1177 { /* relative origin mode */ 1192 /* relative origin mode */
1178 screen.cur.row = row + screen.tscroll; 1193 screen.cur.row = row + screen.tscroll;
1179 min_it (screen.cur.row, screen.bscroll); 1194 min_it (screen.cur.row, screen.bscroll);
1180 } 1195 }
1181 else 1196 else
1182 screen.cur.row = row; 1197 screen.cur.row = row;
… …
1188/* ------------------------------------------------------------------------- */ 1203/* ------------------------------------------------------------------------- */
1189/* 1204/*
1190 * direction should be UP or DN 1205 * direction should be UP or DN
1191 */ 1206 */
1192void 1207void
1193rxvt_term::scr_index (enum page_dirn direction) 1208rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1194{ 1209{
1195 int dirn; 1210 int dirn;
1196 1211
1197 want_refresh = 1; 1212 want_refresh = 1;
1198 ZERO_SCROLLBACK (); 1213 ZERO_SCROLLBACK ();
… …
1215/* 1230/*
1216 * Erase part or whole of a line 1231 * Erase part or whole of a line
1217 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1218 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1219 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1235 * extension: clear to right unless wrapped: ESC [ 3 K
1220 */ 1236 */
1221void 1237void
1222rxvt_term::scr_erase_line (int mode) 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1223{ 1239{
1224 unsigned int col, num; 1240 unsigned int col, num;
1225 1241
1226 want_refresh = 1; 1242 want_refresh = 1;
1227 ZERO_SCROLLBACK (); 1243 ZERO_SCROLLBACK ();
… …
1233 line.touch (); 1249 line.touch ();
1234 line.is_longer (0); 1250 line.is_longer (0);
1235 1251
1236 switch (mode) 1252 switch (mode)
1237 { 1253 {
1254 case 3:
1255 if (screen.flags & Screen_WrapNext)
1256 return;
1257
1258 /* fall through */
1259
1238 case 0: /* erase to end of line */ 1260 case 0: /* erase to end of line */
1239 col = screen.cur.col; 1261 col = screen.cur.col;
1240 num = ncol - col; 1262 num = ncol - col;
1241 min_it (line.l, col); 1263 min_it (line.l, col);
1264
1242 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1265 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1243 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1266 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1244 CLEAR_SELECTION (); 1267 CLEAR_SELECTION ();
1245 break; 1268 break;
1269
1246 case 1: /* erase to beginning of line */ 1270 case 1: /* erase to beginning of line */
1247 col = 0; 1271 col = 0;
1248 num = screen.cur.col + 1; 1272 num = screen.cur.col + 1;
1273
1249 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1274 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1250 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1275 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1251 CLEAR_SELECTION (); 1276 CLEAR_SELECTION ();
1252 break; 1277 break;
1278
1253 case 2: /* erase whole line */ 1279 case 2: /* erase whole line */
1254 col = 0; 1280 col = 0;
1255 num = ncol; 1281 num = ncol;
1256 line.l = 0; 1282 line.l = 0;
1257 if (selection.beg.row <= screen.cur.row 1283 if (selection.beg.row <= screen.cur.row
… …
1271 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1297 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1272 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1298 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1273 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1299 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1274 */ 1300 */
1275void 1301void
1276rxvt_term::scr_erase_screen (int mode) 1302rxvt_term::scr_erase_screen (int mode) NOTHROW
1277{ 1303{
1278 int num; 1304 int num;
1279 int32_t row; 1305 int32_t row;
1280 rend_t ren; 1306 rend_t ren;
1281 XGCValues gcvalue; 1307 XGCValues gcvalue;
… …
1315 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1316 return; 1342 return;
1317 1343
1318 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1319 1345
1346 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1320 if (rstyle & (RS_RVid | RS_Uline)) 1347 if (rstyle & (RS_RVid | RS_Uline))
1321 ren = (rend_t) ~RS_None; 1348 ren = (rend_t) ~RS_None;
1322 else if (GET_BASEBG (rstyle) == Color_bg) 1349 else if (GET_BASEBG (rstyle) == Color_bg)
1323 { 1350 {
1324 ren = DEFAULT_RSTYLE; 1351 ren = DEFAULT_RSTYLE;
1325 CLEAR_ROWS (row, num); 1352
1353 if (mapped)
1354 XClearArea (dpy, vt, 0,
1355 Row2Pixel (row), (unsigned int)width,
1356 (unsigned int)Height2Pixel (num), False);
1326 } 1357 }
1327 else 1358 else
1328 { 1359 {
1329 ren = rstyle & (RS_fgMask | RS_bgMask); 1360 ren = rstyle & (RS_fgMask | RS_bgMask);
1361
1330 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1362 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1331 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1363 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1332 ERASE_ROWS (row, num); 1364 XFillRectangle (dpy, vt, gc,
1365 0, Row2Pixel (row),
1366 (unsigned int)width,
1367 (unsigned int)Height2Pixel (num));
1333 gcvalue.foreground = pix_colors[Color_fg]; 1368 gcvalue.foreground = pix_colors[Color_fg];
1334 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1369 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1335 } 1370 }
1336 1371
1337 for (; num--; row++) 1372 for (; num--; row++)
1338 { 1373 {
1339 scr_blank_screen_mem (ROW(row), rstyle); 1374 scr_blank_screen_mem (ROW(row), rstyle);
1340 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1375 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1341 } 1376 }
1342} 1377}
1343 1378
1344#if ENABLE_FRILLS 1379#if !ENABLE_MINIMAL
1345void 1380void
1346rxvt_term::scr_erase_savelines () 1381rxvt_term::scr_erase_savelines () NOTHROW
1347{ 1382{
1348 want_refresh = 1; 1383 want_refresh = 1;
1349 ZERO_SCROLLBACK (); 1384 ZERO_SCROLLBACK ();
1350 1385
1351 top_row = 0; 1386 top_row = 0;
… …
1356/* 1391/*
1357 * Fill the screen with `E's 1392 * Fill the screen with `E's
1358 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1393 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1359 */ 1394 */
1360void 1395void
1361rxvt_term::scr_E () 1396rxvt_term::scr_E () NOTHROW
1362{ 1397{
1363 rend_t fs; 1398 rend_t fs;
1364 1399
1365 want_refresh = 1; 1400 want_refresh = 1;
1366 ZERO_SCROLLBACK (); 1401 ZERO_SCROLLBACK ();
… …
1387/* ------------------------------------------------------------------------- */ 1422/* ------------------------------------------------------------------------- */
1388/* 1423/*
1389 * Insert/Delete <count> lines 1424 * Insert/Delete <count> lines
1390 */ 1425 */
1391void 1426void
1392rxvt_term::scr_insdel_lines (int count, int insdel) 1427rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1393{ 1428{
1394 int end; 1429 int end;
1395 1430
1396 ZERO_SCROLLBACK (); 1431 ZERO_SCROLLBACK ();
1397 1432
… …
1417/* ------------------------------------------------------------------------- */ 1452/* ------------------------------------------------------------------------- */
1418/* 1453/*
1419 * Insert/Delete <count> characters from the current position 1454 * Insert/Delete <count> characters from the current position
1420 */ 1455 */
1421void 1456void
1422rxvt_term::scr_insdel_chars (int count, int insdel) 1457rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1423{ 1458{
1424 int col, row;
1425 rend_t tr;
1426
1427 want_refresh = 1; 1459 want_refresh = 1;
1428 ZERO_SCROLLBACK (); 1460 ZERO_SCROLLBACK ();
1429 1461
1430 if (count <= 0) 1462 if (count <= 0)
1431 return; 1463 return;
… …
1433 scr_do_wrap (); 1465 scr_do_wrap ();
1434 1466
1435 selection_check (1); 1467 selection_check (1);
1436 min_it (count, ncol - screen.cur.col); 1468 min_it (count, ncol - screen.cur.col);
1437 1469
1438 row = screen.cur.row; 1470 int row = screen.cur.row;
1439 1471
1440 line_t *line = &ROW(row); 1472 line_t *line = &ROW(row);
1441 1473
1442 line->touch (); 1474 line->touch ();
1443 line->is_longer (0); 1475 line->is_longer (0);
1444 1476
1477 // nuke wide spanning the start
1478 if (line->t[screen.cur.col] == NOCHAR)
1479 scr_kill_char (*line, screen.cur.col);
1480
1445 switch (insdel) 1481 switch (insdel)
1446 { 1482 {
1447 case INSERT: 1483 case INSERT:
1448 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1484 line->l = min (line->l + count, ncol);
1485
1486 if (line->t[screen.cur.col] == NOCHAR)
1487 scr_kill_char (*line, screen.cur.col);
1488
1489 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1449 { 1490 {
1450 line->t[col] = line->t[col - count]; 1491 line->t[col] = line->t[col - count];
1451 line->r[col] = line->r[col - count]; 1492 line->r[col] = line->r[col - count];
1452 } 1493 }
1453
1454 line->l = min (line->l + count, ncol);
1455 1494
1456 if (selection.op && current_screen == selection.screen 1495 if (selection.op && current_screen == selection.screen
1457 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1496 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1458 { 1497 {
1459 if (selection.end.row != screen.cur.row 1498 if (selection.end.row != screen.cur.row
1460 || (selection.end.col + count >= ncol)) 1499 || (selection.end.col + count >= ncol))
1461 CLEAR_SELECTION (); 1500 CLEAR_SELECTION ();
1462 else 1501 else
1502 {
1463 { /* shift selection */ 1503 /* shift selection */
1464 selection.beg.col += count; 1504 selection.beg.col += count;
1465 selection.mark.col += count; /* XXX: yes? */ 1505 selection.mark.col += count; /* XXX: yes? */
1466 selection.end.col += count; 1506 selection.end.col += count;
1467 } 1507 }
1468 } 1508 }
… …
1473 case ERASE: 1513 case ERASE:
1474 screen.cur.col += count; /* don't worry if > ncol */ 1514 screen.cur.col += count; /* don't worry if > ncol */
1475 selection_check (1); 1515 selection_check (1);
1476 screen.cur.col -= count; 1516 screen.cur.col -= count;
1477 1517
1478 line->l = max (line->l - count, 0); 1518 // nuke wide char after the end
1519 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1520 scr_kill_char (*line, screen.cur.col + count);
1521
1479 scr_blank_line (*line, screen.cur.col, count, rstyle); 1522 scr_blank_line (*line, screen.cur.col, count, rstyle);
1480 break; 1523 break;
1481 1524
1482 case DELETE: 1525 case DELETE:
1483 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1526 line->l = max (line->l - count, 0);
1484 1527
1528 // nuke wide char spanning the end
1529 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1530 scr_kill_char (*line, screen.cur.col + count);
1531
1485 for (col = screen.cur.col; (col + count) < ncol; col++) 1532 for (int col = screen.cur.col; (col + count) < ncol; col++)
1486 { 1533 {
1487 line->t[col] = line->t[col + count]; 1534 line->t[col] = line->t[col + count];
1488 line->r[col] = line->r[col + count]; 1535 line->r[col] = line->r[col + count];
1489 } 1536 }
1490 1537
1491 line->l = max (line->l - count, 0);
1492 scr_blank_line (*line, ncol - count, count, tr); 1538 scr_blank_line (*line, ncol - count, count,
1539 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1493 1540
1494 if (selection.op && current_screen == selection.screen 1541 if (selection.op && current_screen == selection.screen
1495 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1496 { 1543 {
1497 if (selection.end.row != screen.cur.row 1544 if (selection.end.row != screen.cur.row
… …
1515/* 1562/*
1516 * Set the scrolling region 1563 * Set the scrolling region
1517 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1564 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1518 */ 1565 */
1519void 1566void
1520rxvt_term::scr_scroll_region (int top, int bot) 1567rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1521{ 1568{
1522 max_it (top, 0); 1569 max_it (top, 0);
1523 min_it (bot, nrow - 1); 1570 min_it (bot, nrow - 1);
1524 1571
1525 if (top > bot) 1572 if (top > bot)
… …
1535 * Make the cursor visible/invisible 1582 * Make the cursor visible/invisible
1536 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1583 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1537 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1584 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1538 */ 1585 */
1539void 1586void
1540rxvt_term::scr_cursor_visible (int mode) 1587rxvt_term::scr_cursor_visible (int mode) NOTHROW
1541{ 1588{
1542 want_refresh = 1; 1589 want_refresh = 1;
1543 1590
1544 if (mode) 1591 if (mode)
1545 screen.flags |= Screen_VisibleCursor; 1592 screen.flags |= Screen_VisibleCursor;
… …
1552 * Set/unset automatic wrapping 1599 * Set/unset automatic wrapping
1553 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1600 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1554 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1601 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1555 */ 1602 */
1556void 1603void
1557rxvt_term::scr_autowrap (int mode) 1604rxvt_term::scr_autowrap (int mode) NOTHROW
1558{ 1605{
1559 if (mode) 1606 if (mode)
1560 screen.flags |= Screen_Autowrap; 1607 screen.flags |= Screen_Autowrap;
1561 else 1608 else
1562 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1609 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1571 * and the cursor cannot be moved outside. 1618 * and the cursor cannot be moved outside.
1572 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1619 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1573 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1620 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1574 */ 1621 */
1575void 1622void
1576rxvt_term::scr_relative_origin (int mode) 1623rxvt_term::scr_relative_origin (int mode) NOTHROW
1577{ 1624{
1578 if (mode) 1625 if (mode)
1579 screen.flags |= Screen_Relative; 1626 screen.flags |= Screen_Relative;
1580 else 1627 else
1581 screen.flags &= ~Screen_Relative; 1628 screen.flags &= ~Screen_Relative;
… …
1588 * Set insert/replace mode 1635 * Set insert/replace mode
1589 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1636 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1590 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1637 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1591 */ 1638 */
1592void 1639void
1593rxvt_term::scr_insert_mode (int mode) 1640rxvt_term::scr_insert_mode (int mode) NOTHROW
1594{ 1641{
1595 if (mode) 1642 if (mode)
1596 screen.flags |= Screen_Insert; 1643 screen.flags |= Screen_Insert;
1597 else 1644 else
1598 screen.flags &= ~Screen_Insert; 1645 screen.flags &= ~Screen_Insert;
… …
1604 * XTERM_SEQ: Set tab at current column : ESC H 1651 * XTERM_SEQ: Set tab at current column : ESC H
1605 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1652 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1606 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1653 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1607 */ 1654 */
1608void 1655void
1609rxvt_term::scr_set_tab (int mode) 1656rxvt_term::scr_set_tab (int mode) NOTHROW
1610{ 1657{
1611 if (mode < 0) 1658 if (mode < 0)
1612 memset (tabs, 0, ncol * sizeof (char)); 1659 memset (tabs, 0, ncol);
1613 else if (screen.cur.col < ncol) 1660 else if (screen.cur.col < ncol)
1614 tabs [screen.cur.col] = !!mode; 1661 tabs [screen.cur.col] = !!mode;
1615} 1662}
1616 1663
1617/* ------------------------------------------------------------------------- */ 1664/* ------------------------------------------------------------------------- */
… …
1619 * Set reverse/normal video 1666 * Set reverse/normal video
1620 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1667 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1621 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1668 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1622 */ 1669 */
1623void 1670void
1624rxvt_term::scr_rvideo_mode (int mode) 1671rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1625{ 1672{
1626 XGCValues gcvalue; 1673 rvideo_mode = on;
1627 1674
1675#ifndef NO_BELL
1676 on ^= rvideo_bell;
1677#endif
1678
1628 if (rvideo != mode) 1679 if (rvideo_state != on)
1629 { 1680 {
1630 rvideo = mode; 1681 rvideo_state = on;
1682
1631 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1632#if XPM_BACKGROUND 1684#ifdef HAVE_BG_PIXMAP
1633 if (bgPixmap.pixmap == None) 1685 if (bgPixmap.pixmap == None)
1634#endif 1686#endif
1635#if TRANSPARENT 1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1636 if (! OPTION (Opt_transparent) || am_transparent == 0)
1637#endif
1638 XSetWindowBackground (display->display, vt,
1639 pix_colors[Color_bg]);
1640 1688
1689 XGCValues gcvalue;
1641 gcvalue.foreground = pix_colors[Color_fg]; 1690 gcvalue.foreground = pix_colors[Color_fg];
1642 gcvalue.background = pix_colors[Color_bg]; 1691 gcvalue.background = pix_colors[Color_bg];
1643 XChangeGC (display->display, gc, GCBackground | GCForeground, 1692 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1644 &gcvalue); 1693
1645 scr_clear (); 1694 scr_clear ();
1646 scr_touch (true); 1695 scr_touch (true);
1647 } 1696 }
1648} 1697}
1649 1698
… …
1651/* 1700/*
1652 * Report current cursor position 1701 * Report current cursor position
1653 * XTERM_SEQ: Report position: ESC [ 6 n 1702 * XTERM_SEQ: Report position: ESC [ 6 n
1654 */ 1703 */
1655void 1704void
1656rxvt_term::scr_report_position () 1705rxvt_term::scr_report_position () NOTHROW
1657{ 1706{
1658 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1707 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1659} 1708}
1660 1709
1661/* ------------------------------------------------------------------------- * 1710/* ------------------------------------------------------------------------- *
… …
1664 1713
1665/* 1714/*
1666 * Set font style 1715 * Set font style
1667 */ 1716 */
1668void 1717void
1669rxvt_term::set_font_style () 1718rxvt_term::set_font_style () NOTHROW
1670{ 1719{
1671#if 0 1720#if 0
1672 switch (charsets [screen.charset]) 1721 switch (charsets [screen.charset])
1673 { 1722 {
1674 case '0': /* DEC Special Character & Line Drawing Set */ 1723 case '0': /* DEC Special Character & Line Drawing Set */
… …
1696 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1745 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1697 * XTERM_SEQ: Invoke G2 character set: ESC N 1746 * XTERM_SEQ: Invoke G2 character set: ESC N
1698 * XTERM_SEQ: Invoke G3 character set: ESC O 1747 * XTERM_SEQ: Invoke G3 character set: ESC O
1699 */ 1748 */
1700void 1749void
1701rxvt_term::scr_charset_choose (int set) 1750rxvt_term::scr_charset_choose (int set) NOTHROW
1702{ 1751{
1703 screen.charset = set; 1752 screen.charset = set;
1704 set_font_style (); 1753 set_font_style ();
1705} 1754}
1706 1755
… …
1712 * XTERM_SEQ: Set G2 character set: ESC * <C> 1761 * XTERM_SEQ: Set G2 character set: ESC * <C>
1713 * XTERM_SEQ: Set G3 character set: ESC + <C> 1762 * XTERM_SEQ: Set G3 character set: ESC + <C>
1714 * See set_font_style for possible values for <C> 1763 * See set_font_style for possible values for <C>
1715 */ 1764 */
1716void 1765void
1717rxvt_term::scr_charset_set (int set, unsigned int ch) 1766rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1718{ 1767{
1719 charsets[set] = (unsigned char)ch; 1768 charsets[set] = (unsigned char)ch;
1720 set_font_style (); 1769 set_font_style ();
1721} 1770}
1722 1771
… …
1727 1776
1728/* 1777/*
1729 * refresh matching text. 1778 * refresh matching text.
1730 */ 1779 */
1731bool 1780bool
1732rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1781rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1733{ 1782{
1734 bool found = false; 1783 bool found = false;
1735 1784
1736 for (int i = 0; i < nrow; i++) 1785 for (int i = 0; i < nrow; i++)
1737 { 1786 {
1738 int col = 0;
1739 rend_t *drp = drawn_buf[i].r; 1787 rend_t *drp = drawn_buf[i].r;
1740 1788
1741 for (; col < ncol; col++, drp++) 1789 for (int col = 0; col < ncol; col++, drp++)
1742 if ((*drp & mask) == value) 1790 if ((*drp & mask) == value)
1743 { 1791 {
1744 found = true; 1792 found = true;
1745 *drp = ~value; 1793 *drp = ~value;
1746 } 1794 }
… …
1757 PART_END, 1805 PART_END,
1758 RC_COUNT 1806 RC_COUNT
1759}; 1807};
1760 1808
1761void 1809void
1762rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1810rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1763{ 1811{
1764 int i; 1812 int i;
1765 row_col_t rc[RC_COUNT]; 1813 row_col_t rc[RC_COUNT];
1766 1814
1767 if (!drawn_buf) /* sanity check */ 1815 if (!drawn_buf) /* sanity check */
… …
1786 for (i = PART_BEG; i < RC_COUNT; i++) 1834 for (i = PART_BEG; i < RC_COUNT; i++)
1787 { 1835 {
1788 min_it (rc[i].col, ncol - 1); 1836 min_it (rc[i].col, ncol - 1);
1789 min_it (rc[i].row, nrow - 1); 1837 min_it (rc[i].row, nrow - 1);
1790 } 1838 }
1791 1839// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1792 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1840 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1793 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1841 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1794 1842
1795 num_scr_allow = 0; 1843 num_scr_allow = 0;
1796 1844
… …
1801/* ------------------------------------------------------------------------- */ 1849/* ------------------------------------------------------------------------- */
1802/* 1850/*
1803 * Refresh the entire screen 1851 * Refresh the entire screen
1804 */ 1852 */
1805void 1853void
1806rxvt_term::scr_touch (bool refresh) 1854rxvt_term::scr_touch (bool refresh) NOTHROW
1807{ 1855{
1808 scr_expose (0, 0, width, height, refresh); 1856 scr_expose (0, 0, width, height, refresh);
1809} 1857}
1810 1858
1811/* ------------------------------------------------------------------------- */ 1859/* ------------------------------------------------------------------------- */
1812/* 1860/*
1813 * Move the display so that the line represented by scrollbar value Y is at 1861 * Move the display so that the line represented by scrollbar value Y is at
1814 * the top of the screen 1862 * the top of the screen
1815 */ 1863 */
1816void 1864void
1817rxvt_term::scr_move_to (int y, int len) 1865rxvt_term::scr_move_to (int y, int len) NOTHROW
1818{ 1866{
1819 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1867 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1820} 1868}
1821 1869
1822/* ------------------------------------------------------------------------- */ 1870/* ------------------------------------------------------------------------- */
1823/* 1871/*
1824 * Page the screen up/down nlines 1872 * Page the screen up/down nlines
1825 * direction should be UP or DN 1873 * direction should be UP or DN
1826 */ 1874 */
1827bool 1875bool
1828rxvt_term::scr_page (enum page_dirn direction, int nlines) 1876rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1829{ 1877{
1830 int new_view_start = 1878 int new_view_start =
1831 direction == UP ? view_start - nlines 1879 direction == UP ? view_start - nlines
1832 : view_start + nlines; 1880 : view_start + nlines;
1833 1881
1834 return scr_changeview (new_view_start); 1882 return scr_changeview (new_view_start);
1835} 1883}
1836 1884
1837bool 1885bool
1838rxvt_term::scr_changeview (int new_view_start) 1886rxvt_term::scr_changeview (int new_view_start) NOTHROW
1839{ 1887{
1840 clamp_it (new_view_start, top_row, 0); 1888 clamp_it (new_view_start, top_row, 0);
1841 1889
1842 if (new_view_start == view_start) 1890 if (new_view_start == view_start)
1843 return false; 1891 return false;
… …
1849 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1897 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1850 1898
1851 return true; 1899 return true;
1852} 1900}
1853 1901
1854/* ------------------------------------------------------------------------- */ 1902#ifndef NO_BELL
1855void 1903void
1904rxvt_term::bell_cb (ev::timer &w, int revents)
1905{
1906 rvideo_bell = false;
1907 scr_rvideo_mode (rvideo_mode);
1908 refresh_check ();
1909}
1910#endif
1911
1912/* ------------------------------------------------------------------------- */
1913void
1856rxvt_term::scr_bell () 1914rxvt_term::scr_bell () NOTHROW
1857{ 1915{
1858#ifndef NO_BELL 1916#ifndef NO_BELL
1859 1917
1860# ifndef NO_MAPALERT 1918# ifndef NO_MAPALERT
1861# ifdef MAPALERT_OPTION 1919# ifdef MAPALERT_OPTION
1862 if (OPTION (Opt_mapAlert)) 1920 if (option (Opt_mapAlert))
1863# endif 1921# endif
1864 XMapWindow (display->display, parent[0]); 1922 XMapWindow (dpy, parent[0]);
1865# endif 1923# endif
1866 1924
1925# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell))
1927 set_urgency (1);
1928# endif
1929
1867 if (OPTION (Opt_visualBell)) 1930 if (option (Opt_visualBell))
1868 { 1931 {
1869 scr_rvideo_mode (!rvideo); /* refresh also done */ 1932 rvideo_bell = true;
1933 scr_rvideo_mode (rvideo_mode);
1870 display->flush (); 1934 flush ();
1935
1871 rxvt_usleep (VISUAL_BELL_DURATION); 1936 bell_ev.start (VISUAL_BELL_DURATION);
1872 scr_rvideo_mode (!rvideo); /* refresh also done */
1873 } 1937 }
1874 else 1938 else
1875 XBell (display->display, 0); 1939 XBell (dpy, 0);
1876
1877#endif 1940#endif
1878} 1941}
1879 1942
1880/* ------------------------------------------------------------------------- */ 1943/* ------------------------------------------------------------------------- */
1881/* ARGSUSED */ 1944/* ARGSUSED */
1882void 1945void
1883rxvt_term::scr_printscreen (int fullhist) 1946rxvt_term::scr_printscreen (int fullhist) NOTHROW
1884{ 1947{
1885#ifdef PRINTPIPE 1948#ifdef PRINTPIPE
1886 int nrows, row_start; 1949 int nrows, row_start;
1887 FILE *fd; 1950 FILE *fd = popen_printer ();
1888 1951
1889 if ((fd = popen_printer ()) == NULL) 1952 if (!fd)
1890 return; 1953 return;
1891 1954
1892 if (fullhist) 1955 if (fullhist)
1893 { 1956 {
1894 nrows = nrow - top_row; 1957 nrows = nrow - top_row;
… …
1937 * Refresh the screen 2000 * Refresh the screen
1938 * drawn_text/drawn_rend contain the screen information before the update. 2001 * drawn_text/drawn_rend contain the screen information before the update.
1939 * screen.text/screen.rend contain what the screen will change to. 2002 * screen.text/screen.rend contain what the screen will change to.
1940 */ 2003 */
1941void 2004void
1942rxvt_term::scr_refresh () 2005rxvt_term::scr_refresh () NOTHROW
1943{ 2006{
1944 unsigned char must_clear, /* use draw_string not draw_image_string */ 2007 unsigned char have_bg,
1945 showcursor; /* show the cursor */ 2008 showcursor; /* show the cursor */
1946 int16_t col, row, /* column/row we're processing */ 2009 int16_t col, row, /* column/row we're processing */
1947 ocrow; /* old cursor row */ 2010 ocrow; /* old cursor row */
1948 int i; /* tmp */ 2011 int i; /* tmp */
1949#ifndef NO_CURSORCOLOR 2012#ifndef NO_CURSORCOLOR
1950 rend_t cc1; /* store colours at cursor position (s) */ 2013 rend_t cc1; /* store colours at cursor position (s) */
1951#endif 2014#endif
1952 rend_t *crp; // cursor rendition pointer 2015 rend_t *crp; // cursor rendition pointer
2016 rend_t ccol1, /* Cursor colour */
2017 ccol2; /* Cursor colour2 */
1953 2018
1954 want_refresh = 0; /* screen is current */ 2019 want_refresh = 0; /* screen is current */
1955 2020
1956 if (refresh_type == NO_REFRESH || !mapped) 2021 if (refresh_type == NO_REFRESH || !mapped)
1957 return; 2022 return;
1958 2023
1959 /* 2024 /*
1960 * A: set up vars 2025 * A: set up vars
1961 */ 2026 */
1962 must_clear = 0;
1963 refresh_count = 0; 2027 refresh_count = 0;
1964 2028
1965#if XPM_BACKGROUND 2029 have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP
1966 must_clear |= bgPixmap.pixmap != None; 2031 have_bg = bgPixmap.pixmap != None;
1967#endif
1968#if TRANSPARENT
1969 must_clear |= OPTION (Opt_transparent) && am_transparent;
1970#endif 2032#endif
1971 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1972 2034
1973 /* 2035 /*
1974 * B: reverse any characters which are selected 2036 * B: reverse any characters which are selected
… …
1978 /* 2040 /*
1979 * C: set the cursor character (s) 2041 * C: set the cursor character (s)
1980 */ 2042 */
1981 { 2043 {
1982 unsigned char setoldcursor; 2044 unsigned char setoldcursor;
1983 rend_t ccol1, /* Cursor colour */
1984 ccol2; /* Cursor colour2 */
1985 2045
1986 showcursor = (screen.flags & Screen_VisibleCursor); 2046 showcursor = (screen.flags & Screen_VisibleCursor);
1987#ifdef CURSOR_BLINK 2047#ifdef CURSOR_BLINK
1988 if (hidden_cursor) 2048 if (hidden_cursor)
1989 showcursor = 0; 2049 showcursor = 0;
… …
1996 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2056 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1997 col--; 2057 col--;
1998 2058
1999 crp = &ROW(screen.cur.row).r[col]; 2059 crp = &ROW(screen.cur.row).r[col];
2000 2060
2061#ifndef NO_CURSORCOLOR
2062 cc1 = *crp & (RS_fgMask | RS_bgMask);
2063 if (ISSET_PIXCOLOR (Color_cursor))
2064 ccol1 = Color_cursor;
2065 else
2066#endif
2067#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2068 ccol1 = fgcolor_of (rstyle);
2069#else
2070 ccol1 = Color_fg;
2071#endif
2072
2073#ifndef NO_CURSORCOLOR
2074 if (ISSET_PIXCOLOR (Color_cursor2))
2075 ccol2 = Color_cursor2;
2076 else
2077#endif
2078#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2079 ccol2 = bgcolor_of (rstyle);
2080#else
2081 ccol2 = Color_bg;
2082#endif
2083
2001 if (showcursor && focus) 2084 if (showcursor && focus)
2002 { 2085 {
2003 if (OPTION (Opt_cursorUnderline)) 2086 if (option (Opt_cursorUnderline))
2004 *crp ^= RS_Uline; 2087 *crp ^= RS_Uline;
2005 else 2088 else
2006 { 2089 {
2007 *crp ^= RS_RVid; 2090 *crp ^= RS_RVid;
2008
2009#ifndef NO_CURSORCOLOR
2010 cc1 = *crp & (RS_fgMask | RS_bgMask);
2011 if (ISSET_PIXCOLOR (Color_cursor))
2012 ccol1 = Color_cursor;
2013 else
2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2015 ccol1 = fgcolor_of (rstyle);
2016#else
2017 ccol1 = Color_fg;
2018#endif
2019 if (ISSET_PIXCOLOR (Color_cursor2))
2020 ccol2 = Color_cursor2;
2021 else
2022#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2023 ccol2 = bgcolor_of (rstyle);
2024#else
2025 ccol2 = Color_bg;
2026#endif
2027 *crp = SET_FGCOLOR (*crp, ccol1); 2091 *crp = SET_FGCOLOR (*crp, ccol1);
2028 *crp = SET_BGCOLOR (*crp, ccol2); 2092 *crp = SET_BGCOLOR (*crp, ccol2);
2029#endif
2030 } 2093 }
2031 } 2094 }
2032 } 2095 }
2033 2096
2034 /* make sure no outline cursor is left around */ 2097 /* make sure no outline cursor is left around */
… …
2073 * D: CopyArea pass - very useful for slower links 2136 * D: CopyArea pass - very useful for slower links
2074 * This has been deliberately kept simple. 2137 * This has been deliberately kept simple.
2075 */ 2138 */
2076 if (!display->is_local 2139 if (!display->is_local
2077 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2140 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2078 && abs (num_scr) < nrow && !must_clear) 2141 && abs (num_scr) < nrow && !have_bg)
2079 { 2142 {
2080 int16_t nits; 2143 int16_t nits;
2144 int i = num_scr;
2081 int j; 2145 int j;
2082 int len, wlen; 2146 int len, wlen;
2083 dLocal (int, num_scr); 2147 dLocal (int, num_scr);
2084 2148
2085 j = nrow; 2149 j = nrow;
2086 wlen = len = -1; 2150 wlen = len = -1;
2087 row = i > 0 ? 0 : j - 1; 2151 row = i > 0 ? 0 : j - 1;
2152
2088 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2153 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2089 { 2154 {
2090 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2155 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2091 { 2156 {
2092 line_t s = ROW(view_start + row); 2157 line_t s = ROW(view_start + row);
… …
2113 wlen = row; 2178 wlen = row;
2114 continue; 2179 continue;
2115 } 2180 }
2116 } 2181 }
2117 2182
2118 if (len != -1) 2183 if (len >= 0)
2119 { 2184 {
2120 /* also comes here at end if needed because of >= above */ 2185 /* also comes here at end if needed because of >= above */
2121 if (wlen < len) 2186 if (wlen < len)
2122 ::swap (wlen, len); 2187 ::swap (wlen, len);
2123 2188
2189 XGCValues gcv;
2190
2191 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2124 XCopyArea (display->display, vt, vt, 2192 XCopyArea (dpy, vt, vt,
2125 gc, 0, Row2Pixel (len + i), 2193 gc, 0, Row2Pixel (len + i),
2126 (unsigned int)this->width, 2194 (unsigned int)this->width,
2127 (unsigned int)Height2Pixel (wlen - len + 1), 2195 (unsigned int)Height2Pixel (wlen - len + 1),
2128 0, Row2Pixel (len)); 2196 0, Row2Pixel (len));
2197 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2198
2129 len = -1; 2199 len = -1;
2130 } 2200 }
2131 } 2201 }
2132 } 2202 }
2133#endif 2203#endif
… …
2157 continue; 2227 continue;
2158 2228
2159 // redraw one or more characters 2229 // redraw one or more characters
2160 2230
2161 // seek to the beginning of wide characters 2231 // seek to the beginning of wide characters
2162 while (stp[col] == NOCHAR && col > 0) 2232 while (expect_false (stp[col] == NOCHAR && col > 0))
2163 --col; 2233 --col;
2164 2234
2165 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2235 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2166 text_t *text = stp + col; 2236 text_t *text = stp + col;
2167 int count = 1; 2237 int count = 1;
… …
2189 count++; 2259 count++;
2190 2260
2191 if (stp[col] != dtp[col] 2261 if (stp[col] != dtp[col]
2192 || !RS_SAME (srp[col], drp[col])) 2262 || !RS_SAME (srp[col], drp[col]))
2193 { 2263 {
2194 if (must_clear && (i++ > count / 2)) 2264 if (have_bg && (i++ > count / 2))
2195 break; 2265 break;
2196 2266
2197 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2198 drp[col] = rend; 2268 drp[col] = rend;
2199 i = 0; 2269 i = 0;
2200 } 2270 }
2201 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2271 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2202 break; 2272 break;
2203 } 2273 }
2204 2274
2205 col--; /* went one too far. move back */ 2275 col--; /* went one too far. move back */
2206 count -= i; /* dump any matching trailing chars */ 2276 count -= i; /* dump any matching trailing chars */
2207 2277
2208 // sometimes we optimize away the trailing NOCHAR's, add them back 2278 // sometimes we optimize away the trailing NOCHAR's, add them back
2209 while (i && text[count] == NOCHAR) 2279 while (expect_false (i && text[count] == NOCHAR))
2210 count++, i--; 2280 count++, i--;
2211 2281
2212 /* 2282 /*
2213 * Determine the attributes for the string 2283 * Determine the attributes for the string
2214 */ 2284 */
2215 int fore = fgcolor_of (rend); // desired foreground 2285 int fore = fgcolor_of (rend); // desired foreground
2216 int back = bgcolor_of (rend); // desired background 2286 int back = bgcolor_of (rend); // desired background
2217 2287
2218 // only do special processing if any attributes are set, which is unlikely 2288 // only do special processing if any attributes are set, which is unlikely
2219 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2289 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2220 { 2290 {
2221#if ENABLE_STYLES
2222 // force redraw after "careful" characters to avoid pixel droppings
2223 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2224 drp[col + 1] = ~srp[col + 1];
2225
2226 // include previous careful character(s) if possible, looks nicer (best effort...)
2227 while (text > stp
2228 && srp[text - stp - 1] & RS_Careful
2229 && RS_SAME (rend, srp[text - stp - 1]))
2230 text--, count++, xpixel -= fwidth;
2231#endif
2232
2233 bool invert = rend & RS_RVid; 2291 bool invert = rend & RS_RVid;
2234 2292
2235#ifndef NO_BOLD_UNDERLINE_REVERSE 2293#ifndef NO_BOLD_UNDERLINE_REVERSE
2236 if (rend & RS_Bold
2237 && fore == Color_fg) 2294 if (rend & RS_Bold && fore == Color_fg)
2238 { 2295 {
2239 if (ISSET_PIXCOLOR (Color_BD)) 2296 if (ISSET_PIXCOLOR (Color_BD))
2240 fore = Color_BD; 2297 fore = Color_BD;
2241# if !ENABLE_STYLES 2298# if !ENABLE_STYLES
2242 else 2299 else
2243 invert = !invert; 2300 invert = !invert;
2244# endif 2301# endif
2245 } 2302 }
2246 2303
2247 if (rend & RS_Italic 2304 if (rend & RS_Italic && fore == Color_fg)
2248 && fore == Color_fg)
2249 { 2305 {
2250 if (ISSET_PIXCOLOR (Color_IT)) 2306 if (ISSET_PIXCOLOR (Color_IT))
2251 fore = Color_IT; 2307 fore = Color_IT;
2252# if !ENABLE_STYLES 2308# if !ENABLE_STYLES
2253 else 2309 else
2254 invert = !invert; 2310 invert = !invert;
2255# endif 2311# endif
2256 } 2312 }
2257 2313
2258 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2259 fore = Color_UL; 2315 fore = Color_UL;
2260#endif 2316#endif
2261 2317
2262 if (invert) 2318 if (invert)
2263 { 2319 {
2320#ifdef OPTION_HC
2321 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2322 || !ISSET_PIXCOLOR (Color_HC))
2323#endif
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2264 ::swap (fore, back); 2326 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2265 2331
2266#ifndef NO_BOLD_UNDERLINE_REVERSE 2332#ifndef NO_BOLD_UNDERLINE_REVERSE
2333# ifndef OPTION_HC
2267 if (ISSET_PIXCOLOR (Color_RV)) 2334 if (ISSET_PIXCOLOR (Color_RV))
2268 back = Color_RV; 2335 back = Color_RV;
2269 2336# endif
2270 if (fore == back) 2337 if (fore == back)
2271 { 2338 {
2272 fore = Color_bg; 2339 fore = Color_bg;
2273 back = Color_fg; 2340 back = Color_fg;
2274 } 2341 }
… …
2276 } 2343 }
2277 2344
2278#ifdef TEXT_BLINK 2345#ifdef TEXT_BLINK
2279 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2346 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2280 { 2347 {
2281 if (!text_blink_ev.active) 2348 if (!text_blink_ev.is_active ())
2282 { 2349 {
2283 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2350 text_blink_ev.again ();
2284 hidden_text = 0; 2351 hidden_text = 0;
2285 } 2352 }
2286 else if (hidden_text) 2353 else if (hidden_text)
2287 fore = back; 2354 fore = back;
2288 } 2355 }
2289#endif 2356#endif
2357
2358#if ENABLE_STYLES
2359 // "careful" (too wide) character handling
2360
2361 // include previous careful character(s) if possible, looks nicer (best effort...)
2362 while (text > stp
2363 && srp[text - stp - 1] & RS_Careful
2364 && RS_SAME (rend, srp[text - stp - 1]))
2365 text--, count++, xpixel -= fwidth;
2366
2367 // force redraw after "careful" characters to avoid pixel droppings
2368 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2369 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2370
2371 // force redraw before "careful" characters to avoid pixel droppings
2372 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2373 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2374#endif
2290 } 2375 }
2291 2376
2292 /* 2377 /*
2293 * Actually do the drawing of the string here 2378 * Actually do the drawing of the string here
2294 */ 2379 */
2295 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2380 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2296 2381
2297 if (back == fore) 2382 if (expect_true (have_bg && back == Color_bg))
2298 font->clear_rect (*drawable, xpixel, ypixel,
2299 fwidth * count, fheight,
2300 back);
2301 else if (back == Color_bg)
2302 { 2383 {
2303 if (must_clear) 2384 // this is very ugly, maybe push it into ->draw?
2304 {
2305 CLEAR_CHARS (xpixel, ypixel, count);
2306 2385
2307 for (i = 0; i < count; i++) /* don't draw empty strings */ 2386 for (i = 0; i < count; i++) /* don't draw empty strings */
2308 if (text[i] != ' ') 2387 if (text[i] != ' ')
2309 { 2388 {
2310 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2389 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2311 break; 2390 goto did_clear;
2312 }
2313 } 2391 }
2314 else 2392
2315 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2393 CLEAR_CHARS (xpixel, ypixel, count);
2394 did_clear: ;
2316 } 2395 }
2317 else 2396 else
2318 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2397 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2319 2398
2320 if (rend & RS_Uline && font->descent > 1 && fore != back) 2399 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2321 { 2400 {
2322#if ENABLE_FRILLS 2401#if ENABLE_FRILLS
2323 if (ISSET_PIXCOLOR (Color_underline)) 2402 if (ISSET_PIXCOLOR (Color_underline))
2324 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2403 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2325 else 2404 else
2326#endif 2405#endif
2327 XSetForeground (display->display, gc, pix_colors[fore]); 2406 XSetForeground (dpy, gc, pix_colors[fore]);
2328 2407
2329 XDrawLine (display->display, drawBuffer, gc, 2408 XDrawLine (dpy, vt, gc,
2330 xpixel, ypixel + font->ascent + 1, 2409 xpixel, ypixel + font->ascent + 1,
2331 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2410 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2332 } 2411 }
2333 } /* for (col....) */ 2412 } /* for (col....) */
2334 } /* for (row....) */ 2413 } /* for (row....) */
… …
2343 */ 2422 */
2344 if (showcursor) 2423 if (showcursor)
2345 { 2424 {
2346 if (focus) 2425 if (focus)
2347 { 2426 {
2348 if (OPTION (Opt_cursorUnderline)) 2427 if (option (Opt_cursorUnderline))
2349 *crp ^= RS_Uline; 2428 *crp ^= RS_Uline;
2350 else 2429 else
2351 { 2430 {
2352 *crp ^= RS_RVid; 2431 *crp ^= RS_RVid;
2353#ifndef NO_CURSORCOLOR 2432#ifndef NO_CURSORCOLOR
… …
2367 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2446 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2368 cursorwidth++; 2447 cursorwidth++;
2369 2448
2370#ifndef NO_CURSORCOLOR 2449#ifndef NO_CURSORCOLOR
2371 if (ISSET_PIXCOLOR (Color_cursor)) 2450 if (ISSET_PIXCOLOR (Color_cursor))
2372 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2451 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2452 else
2373#endif 2453#endif
2454 XSetForeground (dpy, gc, pix_colors[ccol1]);
2374 2455
2375 XDrawRectangle (display->display, drawBuffer, gc, 2456 XDrawRectangle (dpy, vt, gc,
2376 Col2Pixel (col), 2457 Col2Pixel (col),
2377 Row2Pixel (oldcursor.row), 2458 Row2Pixel (oldcursor.row),
2378 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2459 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2379 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2460 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2380 } 2461 }
… …
2388 num_scr = 0; 2469 num_scr = 0;
2389 num_scr_allow = 1; 2470 num_scr_allow = 1;
2390} 2471}
2391 2472
2392void 2473void
2393rxvt_term::scr_remap_chars (line_t &l) 2474rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2394{ 2475{
2395 if (!l.t) 2476 if (!l.t)
2396 return; 2477 return;
2397 2478
2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2479 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2400 for (int i = ncol; i--; ) 2481 for (int i = ncol; i--; )
2401 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2482 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2402} 2483}
2403 2484
2404void 2485void
2405rxvt_term::scr_remap_chars () 2486rxvt_term::scr_remap_chars () NOTHROW
2406{ 2487{
2407 for (int i = total_rows; i--; ) 2488 for (int i = total_rows; i--; )
2408 scr_remap_chars (row_buf [i]); 2489 scr_remap_chars (row_buf [i]);
2409 2490
2410 for (int i = nrow; i--; ) 2491 for (int i = nrow; i--; )
… …
2413 scr_remap_chars (swap_buf [i]); 2494 scr_remap_chars (swap_buf [i]);
2414 } 2495 }
2415} 2496}
2416 2497
2417void 2498void
2418rxvt_term::scr_recolour () 2499rxvt_term::scr_recolour () NOTHROW
2419{ 2500{
2420 if (1 2501#ifdef HAVE_BG_PIXMAP
2421#if TRANSPARENT 2502 bgPixmap.apply ();
2422 && !am_transparent 2503#else
2423#endif 2504
2424#if XPM_BACKGROUND
2425 && !bgPixmap.pixmap
2426#endif
2427 )
2428 {
2429 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2505 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2430 XClearWindow (display->display, parent[0]); 2506 XClearWindow (dpy, parent[0]);
2431 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2507 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2432#if HAVE_SCROLLBARS 2508
2433 if (scrollBar.win) 2509 if (scrollBar.win)
2434 { 2510 {
2435 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2511 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2436 scrollBar.setIdle (); 2512 scrollBar.state = STATE_IDLE;
2437 scrollbar_show (0); 2513 scrollBar.show (0);
2438 }
2439#endif
2440 } 2514 }
2441 2515
2516#endif
2517
2518 /* bgPixmap.apply () does not do the following : */
2442 scr_clear (); 2519 scr_clear ();
2443 scr_touch (true); 2520 scr_touch (true);
2444 want_refresh = 1; 2521 want_refresh = 1;
2445} 2522}
2446 2523
2447/* ------------------------------------------------------------------------- */ 2524/* ------------------------------------------------------------------------- */
2448void 2525void
2449rxvt_term::scr_clear (bool really) 2526rxvt_term::scr_clear (bool really) NOTHROW
2450{ 2527{
2451 if (!mapped) 2528 if (!mapped)
2452 return; 2529 return;
2453 2530
2454 num_scr_allow = 0; 2531 num_scr_allow = 0;
2455 want_refresh = 1; 2532 want_refresh = 1;
2456 2533
2457 if (really) 2534 if (really)
2458 XClearWindow (display->display, vt); 2535 XClearWindow (dpy, vt);
2459} 2536}
2460 2537
2461void 2538void
2462rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2539rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2463{ 2540{
2464 int view_end = view_start + nrow; 2541 int view_end = view_start + nrow;
2465 int row, col; 2542 int row, col;
2466 2543
2467 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2544 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2479 srp[col] ^= rstyle2; 2556 srp[col] ^= rstyle2;
2480 } 2557 }
2481} 2558}
2482 2559
2483void 2560void
2484rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2561rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2485{ 2562{
2486 int view_end = view_start + nrow; 2563 int view_end = view_start + nrow;
2487 int row, col; 2564 int row, col;
2488 2565
2489 if (beg_row >= view_start) 2566 if (beg_row >= view_start)
… …
2506 srp[col] ^= rstyle; 2583 srp[col] ^= rstyle;
2507} 2584}
2508 2585
2509/* ------------------------------------------------------------------------- */ 2586/* ------------------------------------------------------------------------- */
2510void 2587void
2511rxvt_term::scr_reverse_selection () 2588rxvt_term::scr_reverse_selection () NOTHROW
2512{ 2589{
2513 if (selection.op 2590 if (selection.op
2514 && current_screen == selection.screen 2591 && current_screen == selection.screen
2515 && selection.end.row >= view_start) 2592 && selection.end.row >= view_start)
2516 { 2593 {
2517#if ENABLE_FRILLS 2594#if !ENABLE_MINIMAL
2518 if (selection.rect) 2595 if (selection.rect)
2519 scr_xor_rect (selection.beg.row, selection.beg.col, 2596 scr_xor_rect (selection.beg.row, selection.beg.col,
2520 selection.end.row, selection.end.col, 2597 selection.end.row, selection.end.col,
2521 RS_RVid, RS_RVid | RS_Uline); 2598 RS_RVid, RS_RVid | RS_Uline);
2522 else 2599 else
… …
2532 * Dump the whole scrollback and screen to the passed filedescriptor. The 2609 * Dump the whole scrollback and screen to the passed filedescriptor. The
2533 * invoking routine must close the fd. 2610 * invoking routine must close the fd.
2534 */ 2611 */
2535#if 0 2612#if 0
2536void 2613void
2537rxvt_term::scr_dump (int fd) 2614rxvt_term::scr_dump (int fd) NOTHROW
2538{ 2615{
2539 int row, wrote; 2616 int row, wrote;
2540 unsigned int width, towrite; 2617 unsigned int width, towrite;
2541 char r1[] = "\n"; 2618 char r1[] = "\n";
2542 2619
2543 for (row = saveLines - nsaved; 2620 for (row = saveLines + top_row;
2544 row < saveLines + nrow - 1; row++) 2621 row < saveLines + nrow - 1; row++)
2545 { 2622 {
2546 width = row_buf[row].l >= 0 ? row_buf[row].l 2623 width = row_buf[row].l >= 0 ? row_buf[row].l
2547 : ncol; 2624 : ncol;
2548 for (towrite = width; towrite; towrite -= wrote) 2625 for (towrite = width; towrite; towrite -= wrote)
… …
2561 2638
2562/* ------------------------------------------------------------------------- * 2639/* ------------------------------------------------------------------------- *
2563 * CHARACTER SELECTION * 2640 * CHARACTER SELECTION *
2564 * ------------------------------------------------------------------------- */ 2641 * ------------------------------------------------------------------------- */
2565void 2642void
2566rxvt_term::selection_check (int check_more) 2643rxvt_term::selection_check (int check_more) NOTHROW
2567{ 2644{
2568 row_col_t pos; 2645 row_col_t pos;
2569 2646
2570 if (!selection.op) 2647 if (!selection.op)
2571 return; 2648 return;
… …
2592/* ------------------------------------------------------------------------- */ 2669/* ------------------------------------------------------------------------- */
2593/* 2670/*
2594 * Paste a selection direct to the command fd 2671 * Paste a selection direct to the command fd
2595 */ 2672 */
2596void 2673void
2597rxvt_term::paste (char *data, unsigned int len) 2674rxvt_term::paste (char *data, unsigned int len) NOTHROW
2598{ 2675{
2599 /* convert normal newline chars into common keyboard Return key sequence */ 2676 /* convert normal newline chars into common keyboard Return key sequence */
2600 for (unsigned int i = 0; i < len; i++) 2677 for (unsigned int i = 0; i < len; i++)
2601 if (data[i] == C0_LF) 2678 if (data[i] == C0_LF)
2602 data[i] = C0_CR; 2679 data[i] = C0_CR;
2603 2680
2681 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[200~");
2683
2604 tt_write (data, len); 2684 tt_write (data, len);
2685
2686 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[201~");
2605} 2688}
2606 2689
2607/* ------------------------------------------------------------------------- */ 2690/* ------------------------------------------------------------------------- */
2608/* 2691/*
2609 * Respond to a notification that a primary selection has been sent 2692 * Respond to a notification that a primary selection has been sent
2610 * EXT: SelectionNotify 2693 * EXT: SelectionNotify
2611 */ 2694 */
2612void 2695void
2613rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2696rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2614{ 2697{
2615 if (prop == None) /* check for failed XConvertSelection */ 2698 if (prop == None) /* check for failed XConvertSelection */
2616 { 2699 {
2617 if ((selection_type & Sel_CompoundText)) 2700 if ((selection_type & Sel_CompoundText))
2618 { 2701 {
… …
2638 } 2721 }
2639 2722
2640 unsigned long bytes_after; 2723 unsigned long bytes_after;
2641 XTextProperty ct; 2724 XTextProperty ct;
2642 2725
2643 if (XGetWindowProperty (display->display, win, prop, 2726 if (XGetWindowProperty (dpy, win, prop,
2644 0, PROP_SIZE / 4, 2727 0, PROP_SIZE / 4,
2645 delete_prop, AnyPropertyType, 2728 delete_prop, AnyPropertyType,
2646 &ct.encoding, &ct.format, 2729 &ct.encoding, &ct.format,
2647 &ct.nitems, &bytes_after, 2730 &ct.nitems, &bytes_after,
2648 &ct.value) != Success) 2731 &ct.value) != Success)
… …
2657 if (bytes_after) 2740 if (bytes_after)
2658 { 2741 {
2659 // fetch and append remaining data 2742 // fetch and append remaining data
2660 XTextProperty ct2; 2743 XTextProperty ct2;
2661 2744
2662 if (XGetWindowProperty (display->display, win, prop, 2745 if (XGetWindowProperty (dpy, win, prop,
2663 ct.nitems / 4, (bytes_after + 3) / 4, 2746 ct.nitems / 4, (bytes_after + 3) / 4,
2664 delete_prop, AnyPropertyType, 2747 delete_prop, AnyPropertyType,
2665 &ct2.encoding, &ct2.format, 2748 &ct2.encoding, &ct2.format,
2666 &ct2.nitems, &bytes_after, 2749 &ct2.nitems, &bytes_after,
2667 &ct2.value) != Success) 2750 &ct2.value) != Success)
… …
2680 2763
2681 if (ct.encoding == xa[XA_INCR]) 2764 if (ct.encoding == xa[XA_INCR])
2682 { 2765 {
2683 // INCR selection, start handshake 2766 // INCR selection, start handshake
2684 if (!delete_prop) 2767 if (!delete_prop)
2685 XDeleteProperty (display->display, win, prop); 2768 XDeleteProperty (dpy, win, prop);
2686 2769
2687 selection_wait = Sel_incr; 2770 selection_wait = Sel_incr;
2688 incr_buf_fill = 0; 2771 incr_buf_fill = 0;
2689 incr_ev.start (NOW + 10); 2772 incr_ev.start (10);
2690 2773
2691 goto bailout; 2774 goto bailout;
2692 } 2775 }
2693 2776
2694 if (ct.nitems == 0) 2777 if (ct.nitems == 0)
… …
2703 ct.nitems = incr_buf_fill; 2786 ct.nitems = incr_buf_fill;
2704 incr_buf = 0; 2787 incr_buf = 0;
2705 incr_buf_size = 0; 2788 incr_buf_size = 0;
2706 incr_ev.stop (); 2789 incr_ev.stop ();
2707 } 2790 }
2708 else 2791 else
2709 { 2792 {
2710 if (selection_wait == Sel_normal 2793 if (selection_wait == Sel_normal
2711 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2794 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2712 { 2795 {
2713 /* 2796 /*
… …
2720 goto bailout; 2803 goto bailout;
2721 } 2804 }
2722 } 2805 }
2723 else if (selection_wait == Sel_incr) 2806 else if (selection_wait == Sel_incr)
2724 { 2807 {
2725 incr_ev.start (NOW + 10); 2808 incr_ev.start (10);
2726 2809
2727 while (incr_buf_fill + ct.nitems > incr_buf_size) 2810 while (incr_buf_fill + ct.nitems > incr_buf_size)
2728 { 2811 {
2729 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2812 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2730 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2813 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2737 } 2820 }
2738 2821
2739 char **cl; 2822 char **cl;
2740 int cr; 2823 int cr;
2741 2824
2742#if ENABLE_FRILLS 2825#if !ENABLE_MINIMAL
2743 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2826 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2744 // so recode it manually 2827 // so recode it manually
2745 if (ct.encoding == xa[XA_UTF8_STRING]) 2828 if (ct.encoding == xa[XA_UTF8_STRING])
2746 { 2829 {
2747 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2830 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2751 paste (s, strlen (s)); 2834 paste (s, strlen (s));
2752 free (s); 2835 free (s);
2753 } 2836 }
2754 else 2837 else
2755#endif 2838#endif
2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2839 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2757 && cl) 2840 && cl)
2758 { 2841 {
2759 for (int i = 0; i < cr; i++) 2842 for (int i = 0; i < cr; i++)
2760 paste (cl[i], strlen (cl[i])); 2843 paste (cl[i], strlen (cl[i]));
2761 2844
… …
2770 if (selection_wait == Sel_normal) 2853 if (selection_wait == Sel_normal)
2771 selection_wait = Sel_none; 2854 selection_wait = Sel_none;
2772} 2855}
2773 2856
2774void 2857void
2775rxvt_term::incr_cb (time_watcher &w) 2858rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2776{ 2859{
2777 selection_wait = Sel_none; 2860 selection_wait = Sel_none;
2778 2861
2779 incr_buf_size = 0; 2862 incr_buf_size = 0;
2780 free (incr_buf); 2863 free (incr_buf);
2781 2864
2782 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2865 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2783} 2866}
2784 2867
2785void 2868void
2786rxvt_term::selection_property (Window win, Atom prop) 2869rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2787{ 2870{
2788 if (prop == None || selection_wait != Sel_incr) 2871 if (prop == None || selection_wait != Sel_incr)
2789 return; 2872 return;
2790 2873
2791 selection_paste (win, prop, true); 2874 selection_paste (win, prop, true);
2792} 2875}
2793 2876
2794/* ------------------------------------------------------------------------- */ 2877/* ------------------------------------------------------------------------- */
2795/* 2878/*
2796 * Request the current selection: 2879 * Request the current selection:
2797 * Order: > internal selection if available 2880 * Order: > internal selection if available
2798 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2881 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2799 * > CUT_BUFFER0 2882 * > CUT_BUFFER0
2800 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2883 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2801 * will auto fallback to CUT_BUFFER0 2884 * will auto fallback to CUT_BUFFER0
2802 * EXT: button 2 release 2885 * EXT: button 2 release
2803 */ 2886 */
2804void 2887void
2805rxvt_term::selection_request (Time tm) 2888rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2806{ 2889{
2807 if (selection.text) 2890 if (selection.text && selnum == Sel_Primary)
2891 {
2808 { /* internal selection */ 2892 /* internal selection */
2809 char *str = rxvt_wcstombs (selection.text, selection.len); 2893 char *str = rxvt_wcstombs (selection.text, selection.len);
2810 paste (str, strlen (str)); 2894 paste (str, strlen (str));
2811 free (str); 2895 free (str);
2812 return; 2896 return;
2813 } 2897 }
2814 else 2898 else
2815 { 2899 {
2816 int i;
2817
2818 selection_request_time = tm; 2900 selection_request_time = tm;
2819 selection_wait = Sel_normal; 2901 selection_wait = Sel_normal;
2820 2902
2821 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2822 {
2823#if X_HAVE_UTF8_STRING 2903#if X_HAVE_UTF8_STRING
2824 selection_type = Sel_UTF8String; 2904 selection_type = Sel_UTF8String;
2825 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2905 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2826 return; 2906 return;
2827#else 2907#else
2828 selection_type = Sel_CompoundText; 2908 selection_type = Sel_CompoundText;
2829 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2909 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2830 return; 2910 return;
2831#endif 2911#endif
2832 }
2833 } 2912 }
2834 2913
2835 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2914 selection_wait = Sel_none; /* don't loop in selection_paste () */
2836 selection_paste (display->root, XA_CUT_BUFFER0, false); 2915 selection_paste (display->root, XA_CUT_BUFFER0, false);
2837} 2916}
2838 2917
2839int 2918int
2840rxvt_term::selection_request_other (Atom target, int selnum) 2919rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2841{ 2920{
2842 Atom sel; 2921 Atom sel;
2843 2922
2844 selection_type |= selnum; 2923 selection_type |= selnum;
2845 2924
… …
2848 else if (selnum == Sel_Secondary) 2927 else if (selnum == Sel_Secondary)
2849 sel = XA_SECONDARY; 2928 sel = XA_SECONDARY;
2850 else 2929 else
2851 sel = xa[XA_CLIPBOARD]; 2930 sel = xa[XA_CLIPBOARD];
2852 2931
2853 if (XGetSelectionOwner (display->display, sel) != None) 2932 if (XGetSelectionOwner (dpy, sel) != None)
2854 { 2933 {
2855 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2934 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2856 vt, selection_request_time); 2935 vt, selection_request_time);
2857 return 1; 2936 return 1;
2858 } 2937 }
2859 2938
2860 return 0; 2939 return 0;
… …
2864/* 2943/*
2865 * Clear all selected text 2944 * Clear all selected text
2866 * EXT: SelectionClear 2945 * EXT: SelectionClear
2867 */ 2946 */
2868void 2947void
2869rxvt_term::selection_clear () 2948rxvt_term::selection_clear () NOTHROW
2870{ 2949{
2871 want_refresh = 1; 2950 want_refresh = 1;
2872 free (selection.text); 2951 free (selection.text);
2873 selection.text = NULL; 2952 selection.text = NULL;
2874 selection.len = 0; 2953 selection.len = 0;
… …
2923 3002
2924 int end_col; 3003 int end_col;
2925 3004
2926 for (; row <= selection.end.row; row++, col = 0) 3005 for (; row <= selection.end.row; row++, col = 0)
2927 { 3006 {
2928#if ENABLE_FRILLS 3007#if !ENABLE_MINIMAL
2929 if (selection.rect) 3008 if (selection.rect)
2930 { 3009 {
2931 col = selection.beg.col; 3010 col = selection.beg.col;
2932 end_col = ncol + 1; 3011 end_col = ncol + 1;
2933 } 3012 }
… …
2936 end_col = ROW(row).l; 3015 end_col = ROW(row).l;
2937 3016
2938 col = max (col, 0); 3017 col = max (col, 0);
2939 3018
2940 if (row == selection.end.row 3019 if (row == selection.end.row
2941#if ENABLE_FRILLS 3020#if !ENABLE_MINIMAL
2942 || selection.rect 3021 || selection.rect
2943#endif 3022#endif
2944 ) 3023 )
2945 min_it (end_col, selection.end.col); 3024 min_it (end_col, selection.end.col);
2946 3025
… …
2969#endif 3048#endif
2970 else 3049 else
2971 new_selection_text[ofs++] = *t++; 3050 new_selection_text[ofs++] = *t++;
2972 } 3051 }
2973 3052
2974#if ENABLE_FRILLS 3053#if !ENABLE_MINIMAL
2975 if (selection.rect) 3054 if (selection.rect)
2976 { 3055 {
2977 while (ofs 3056 while (ofs
2978 && new_selection_text[ofs - 1] != C0_LF 3057 && new_selection_text[ofs - 1] != C0_LF
2979 && unicode::is_space (new_selection_text[ofs - 1])) 3058 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3009 3088
3010 selection_grab (tm); 3089 selection_grab (tm);
3011} 3090}
3012 3091
3013bool 3092bool
3014rxvt_term::selection_grab (Time tm) 3093rxvt_term::selection_grab (Time tm) NOTHROW
3015{ 3094{
3016 selection_time = tm; 3095 selection_time = tm;
3017 3096
3018 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3097 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3019 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3098 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3020 { 3099 {
3021 display->set_selection_owner (this); 3100 display->set_selection_owner (this);
3022 return true; 3101 return true;
3023 } 3102 }
3024 else 3103 else
… …
3028 } 3107 }
3029 3108
3030#if 0 3109#if 0
3031 XTextProperty ct; 3110 XTextProperty ct;
3032 3111
3033 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3112 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3034 { 3113 {
3035 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3114 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3036 XFree (ct.value); 3115 XFree (ct.value);
3037 } 3116 }
3038#endif 3117#endif
… …
3042/* 3121/*
3043 * Mark or select text based upon number of clicks: 1, 2, or 3 3122 * Mark or select text based upon number of clicks: 1, 2, or 3
3044 * EXT: button 1 press 3123 * EXT: button 1 press
3045 */ 3124 */
3046void 3125void
3047rxvt_term::selection_click (int clicks, int x, int y) 3126rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3048{ 3127{
3049 clicks = ((clicks - 1) % 3) + 1; 3128 clicks = ((clicks - 1) % 3) + 1;
3050 selection.clicks = clicks; /* save clicks so extend will work */ 3129 selection.clicks = clicks; /* save clicks so extend will work */
3051 3130
3052 if (clicks == 2 && !selection.rect 3131 if (clicks == 2 && !selection.rect
… …
3071/* ------------------------------------------------------------------------- */ 3150/* ------------------------------------------------------------------------- */
3072/* 3151/*
3073 * Mark a selection at the specified col/row 3152 * Mark a selection at the specified col/row
3074 */ 3153 */
3075void 3154void
3076rxvt_term::selection_start_colrow (int col, int row) 3155rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3077{ 3156{
3078 want_refresh = 1; 3157 want_refresh = 1;
3079 3158
3080 selection.mark.row = row + view_start; 3159 selection.mark.row = row + view_start;
3081 selection.mark.col = col; 3160 selection.mark.col = col;
… …
3084 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3163 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3085 3164
3086 while (selection.mark.col > 0 3165 while (selection.mark.col > 0
3087 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3166 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3088 --selection.mark.col; 3167 --selection.mark.col;
3089 3168
3090 if (selection.op) 3169 if (selection.op)
3170 {
3091 { /* clear the old selection */ 3171 /* clear the old selection */
3092 selection.beg.row = selection.end.row = selection.mark.row; 3172 selection.beg.row = selection.end.row = selection.mark.row;
3093 selection.beg.col = selection.end.col = selection.mark.col; 3173 selection.beg.col = selection.end.col = selection.mark.col;
3094 } 3174 }
3095 3175
3096 selection.op = SELECTION_INIT; 3176 selection.op = SELECTION_INIT;
… …
3107#define DELIMIT_TEXT(x) \ 3187#define DELIMIT_TEXT(x) \
3108 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3188 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3109#define DELIMIT_REND(x) 1 3189#define DELIMIT_REND(x) 1
3110 3190
3111void 3191void
3112rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3192rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3113{ 3193{
3114 int col, row, dirnadd, tcol, trow, w1, w2; 3194 int col, row, dirnadd, tcol, trow, w1, w2;
3115 row_col_t bound; 3195 row_col_t bound;
3116 text_t *stp; 3196 text_t *stp;
3117 rend_t *srp; 3197 rend_t *srp;
… …
3191 * flag == 0 ==> button 1 3271 * flag == 0 ==> button 1
3192 * flag == 1 ==> button 3 press 3272 * flag == 1 ==> button 3 press
3193 * flag == 2 ==> button 3 motion 3273 * flag == 2 ==> button 3 motion
3194 */ 3274 */
3195void 3275void
3196rxvt_term::selection_extend (int x, int y, int flag) 3276rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3197{ 3277{
3198 int col = clamp (Pixel2Col (x), 0, ncol); 3278 int col = clamp (Pixel2Col (x), 0, ncol);
3199 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3279 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3200 3280
3201 /* 3281 /*
… …
3227/* ------------------------------------------------------------------------- */ 3307/* ------------------------------------------------------------------------- */
3228/* 3308/*
3229 * Extend the selection to the specified col/row 3309 * Extend the selection to the specified col/row
3230 */ 3310 */
3231void 3311void
3232rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3312rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3233{ 3313{
3234 row_col_t pos; 3314 row_col_t pos;
3235 enum { 3315 enum {
3236 LEFT, RIGHT 3316 LEFT, RIGHT
3237 } closeto = RIGHT; 3317 } closeto = RIGHT;
… …
3285 * a point/word/line which is either the start or end of the selection 3365 * a point/word/line which is either the start or end of the selection
3286 * and it was decided by whichever point/word/line was `fixed' at the 3366 * and it was decided by whichever point/word/line was `fixed' at the
3287 * time of the most recent button3 press 3367 * time of the most recent button3 press
3288 */ 3368 */
3289 if (button3 && buttonpress) 3369 if (button3 && buttonpress)
3370 {
3290 { /* button3 press */ 3371 /* button3 press */
3291 /* 3372 /*
3292 * first determine which edge of the selection we are closest to 3373 * first determine which edge of the selection we are closest to
3293 */ 3374 */
3294 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3375 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3295 || (!ROWCOL_IS_AFTER (pos, selection.end) 3376 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3313 selection.mark.row = selection.beg.row; 3394 selection.mark.row = selection.beg.row;
3314 selection.mark.col = selection.beg.col; 3395 selection.mark.col = selection.beg.col;
3315 } 3396 }
3316 } 3397 }
3317 else 3398 else
3399 {
3318 { /* button1 drag or button3 drag */ 3400 /* button1 drag or button3 drag */
3319 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3401 if (ROWCOL_IS_AFTER (selection.mark, pos))
3320 { 3402 {
3321 if (selection.mark.row == selection.end.row 3403 if (selection.mark.row == selection.end.row
3322 && selection.mark.col == selection.end.col 3404 && selection.mark.col == selection.end.col
3323 && clickchange 3405 && clickchange
… …
3340 3422
3341 if (selection.clicks == 1) 3423 if (selection.clicks == 1)
3342 { 3424 {
3343 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3425 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3344 && !ROW(selection.beg.row).is_longer () 3426 && !ROW(selection.beg.row).is_longer ()
3345#if ENABLE_FRILLS 3427#if !ENABLE_MINIMAL
3346 && !selection.rect 3428 && !selection.rect
3347#endif 3429#endif
3348 ) 3430 )
3349 selection.beg.col = ncol; 3431 selection.beg.col = ncol;
3350 3432
3351 if ( 3433 if (
3352 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3434 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3353 && !ROW(selection.end.row).is_longer () 3435 && !ROW(selection.end.row).is_longer ()
3354#if ENABLE_FRILLS 3436#if !ENABLE_MINIMAL
3355 && !selection.rect 3437 && !selection.rect
3356#endif 3438#endif
3357 ) 3439 )
3358 selection.end.col = ncol; 3440 selection.end.col = ncol;
3359 } 3441 }
… …
3366 selection_delimit_word (DN, &selection.end, &selection.end); 3448 selection_delimit_word (DN, &selection.end, &selection.end);
3367 } 3449 }
3368 else if (selection.clicks == 3) 3450 else if (selection.clicks == 3)
3369 { 3451 {
3370#if ENABLE_FRILLS 3452#if ENABLE_FRILLS
3371 if (OPTION (Opt_tripleclickwords)) 3453 if (option (Opt_tripleclickwords))
3372 { 3454 {
3373 selection_delimit_word (UP, &selection.beg, &selection.beg); 3455 selection_delimit_word (UP, &selection.beg, &selection.beg);
3374 3456
3375 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3457 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3376 { 3458 {
3377 if (!ROW(end_row).is_longer ()) 3459 if (!ROW(end_row).is_longer ())
3378 { 3460 {
3379 selection.end.row = end_row; 3461 selection.end.row = end_row;
3380 selection.end.col = ROW(end_row).l; 3462 selection.end.col = ROW(end_row).l;
3463# if !ENABLE_MINIMAL
3381 selection_remove_trailing_spaces (); 3464 selection_remove_trailing_spaces ();
3465# endif
3382 break; 3466 break;
3383 } 3467 }
3384 } 3468 }
3385 } 3469 }
3386 else 3470 else
… …
3402 selection.end.row++; 3486 selection.end.row++;
3403 } 3487 }
3404 } 3488 }
3405 3489
3406 if (button3 && buttonpress) 3490 if (button3 && buttonpress)
3491 {
3407 { /* mark may need to be changed */ 3492 /* mark may need to be changed */
3408 if (closeto == LEFT) 3493 if (closeto == LEFT)
3409 { 3494 {
3410 selection.mark.row = selection.end.row; 3495 selection.mark.row = selection.end.row;
3411 selection.mark.col = selection.end.col - (selection.clicks == 2); 3496 selection.mark.col = selection.end.col - (selection.clicks == 2);
3412 } 3497 }
… …
3415 selection.mark.row = selection.beg.row; 3500 selection.mark.row = selection.beg.row;
3416 selection.mark.col = selection.beg.col; 3501 selection.mark.col = selection.beg.col;
3417 } 3502 }
3418 } 3503 }
3419 3504
3420#if ENABLE_FRILLS 3505#if !ENABLE_MINIMAL
3421 if (selection.rect && selection.beg.col > selection.end.col) 3506 if (selection.rect && selection.beg.col > selection.end.col)
3422 ::swap (selection.beg.col, selection.end.col); 3507 ::swap (selection.beg.col, selection.end.col);
3423#endif 3508#endif
3424} 3509}
3425 3510
3426#if ENABLE_FRILLS 3511#if !ENABLE_MINIMAL
3427void 3512void
3428rxvt_term::selection_remove_trailing_spaces () 3513rxvt_term::selection_remove_trailing_spaces () NOTHROW
3429{ 3514{
3430 int32_t end_col, end_row; 3515 int32_t end_col, end_row;
3431 text_t *stp; 3516 text_t *stp;
3432 3517
3433 end_col = selection.end.col; 3518 end_col = selection.end.col;
… …
3471/* 3556/*
3472 * Double click on button 3 when already selected 3557 * Double click on button 3 when already selected
3473 * EXT: button 3 double click 3558 * EXT: button 3 double click
3474 */ 3559 */
3475void 3560void
3476rxvt_term::selection_rotate (int x, int y) 3561rxvt_term::selection_rotate (int x, int y) NOTHROW
3477{ 3562{
3478 selection.clicks = selection.clicks % 3 + 1; 3563 selection.clicks = selection.clicks % 3 + 1;
3479 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3564 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3480} 3565}
3481 3566
… …
3483/* 3568/*
3484 * Respond to a request for our current selection 3569 * Respond to a request for our current selection
3485 * EXT: SelectionRequest 3570 * EXT: SelectionRequest
3486 */ 3571 */
3487void 3572void
3488rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3573rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3489{ 3574{
3490 XSelectionEvent ev; 3575 XSelectionEvent ev;
3491 dDisp;
3492 3576
3493 ev.type = SelectionNotify; 3577 ev.type = SelectionNotify;
3494 ev.property = None; 3578 ev.property = None;
3495 ev.display = rq.display; 3579 ev.display = rq.display;
3496 ev.requestor = rq.requestor; 3580 ev.requestor = rq.requestor;
… …
3510 *target++ = xa[XA_COMPOUND_TEXT]; 3594 *target++ = xa[XA_COMPOUND_TEXT];
3511#if X_HAVE_UTF8_STRING 3595#if X_HAVE_UTF8_STRING
3512 *target++ = xa[XA_UTF8_STRING]; 3596 *target++ = xa[XA_UTF8_STRING];
3513#endif 3597#endif
3514 3598
3515 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3599 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3516 32, PropModeReplace, 3600 32, PropModeReplace,
3517 (unsigned char *)target_list, target - target_list); 3601 (unsigned char *)target_list, target - target_list);
3518 ev.property = rq.property; 3602 ev.property = rq.property;
3519 } 3603 }
3520#if TODO // TODO 3604#if TODO // TODO
… …
3523 /* TODO: Handle MULTIPLE */ 3607 /* TODO: Handle MULTIPLE */
3524 } 3608 }
3525#endif 3609#endif
3526 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3527 { 3611 {
3528 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3612 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3529 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3613 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3530 ev.property = rq.property; 3614 ev.property = rq.property;
3531 } 3615 }
3532 else if (rq.target == XA_STRING 3616 else if (rq.target == XA_STRING
3533 || rq.target == xa[XA_TEXT] 3617 || rq.target == xa[XA_TEXT]
… …
3557 style = enc_string; 3641 style = enc_string;
3558 else if (target == xa[XA_TEXT]) 3642 else if (target == xa[XA_TEXT])
3559 style = enc_text; 3643 style = enc_text;
3560 else if (target == xa[XA_COMPOUND_TEXT]) 3644 else if (target == xa[XA_COMPOUND_TEXT])
3561 style = enc_compound_text; 3645 style = enc_compound_text;
3562#if ENABLE_FRILLS 3646#if !ENABLE_MINIMAL
3563 else if (target == xa[XA_UTF8_STRING]) 3647 else if (target == xa[XA_UTF8_STRING])
3564 style = enc_utf8; 3648 style = enc_utf8;
3565#endif 3649#endif
3566 else 3650 else
3567 { 3651 {
… …
3578 { 3662 {
3579 cl = L""; 3663 cl = L"";
3580 selectlen = 0; 3664 selectlen = 0;
3581 } 3665 }
3582 3666
3583#if ENABLE_FRILLS 3667#if !ENABLE_MINIMAL
3584 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3668 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3585 // so recode it manually 3669 // so recode it manually
3586 if (style == enc_utf8) 3670 if (style == enc_utf8)
3587 { 3671 {
3588 freect = 1; 3672 freect = 1;
… …
3591 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3675 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3592 ct.nitems = strlen ((char *)ct.value); 3676 ct.nitems = strlen ((char *)ct.value);
3593 } 3677 }
3594 else 3678 else
3595#endif 3679#endif
3596 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3680 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3597 freect = 1; 3681 freect = 1;
3598 else 3682 else
3599 { 3683 {
3600 /* if we failed to convert then send it raw */ 3684 /* if we failed to convert then send it raw */
3601 ct.value = (unsigned char *)cl; 3685 ct.value = (unsigned char *)cl;
3602 ct.nitems = selectlen; 3686 ct.nitems = selectlen;
3603 ct.encoding = target; 3687 ct.encoding = target;
3604 } 3688 }
3605 3689
3606 XChangeProperty (disp, rq.requestor, rq.property, 3690 XChangeProperty (dpy, rq.requestor, rq.property,
3607 ct.encoding, 8, PropModeReplace, 3691 ct.encoding, 8, PropModeReplace,
3608 ct.value, (int)ct.nitems); 3692 ct.value, (int)ct.nitems);
3609 ev.property = rq.property; 3693 ev.property = rq.property;
3610 3694
3611 if (freect) 3695 if (freect)
3612 XFree (ct.value); 3696 XFree (ct.value);
3613 } 3697 }
3614 3698
3615 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3699 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3616}
3617
3618/* ------------------------------------------------------------------------- *
3619 * MOUSE ROUTINES *
3620 * ------------------------------------------------------------------------- */
3621
3622/*
3623 * return col/row values corresponding to x/y pixel values
3624 */
3625void
3626rxvt_term::pixel_position (int *x, int *y)
3627{
3628 *x = Pixel2Col (*x);
3629 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3630 *y = Pixel2Row (*y);
3631 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3632} 3700}
3633 3701
3634/* ------------------------------------------------------------------------- */ 3702/* ------------------------------------------------------------------------- */
3635#ifdef USE_XIM 3703#ifdef USE_XIM
3636void 3704void
3637rxvt_term::im_set_position (XPoint &pos) 3705rxvt_term::im_set_position (XPoint &pos) NOTHROW
3638{ 3706{
3639 XWindowAttributes xwa; 3707 XWindowAttributes xwa;
3640 3708
3641 XGetWindowAttributes (display->display, vt, &xwa); 3709 XGetWindowAttributes (dpy, vt, &xwa);
3642 3710
3643 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3711 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3644 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3712 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3645} 3713}
3646#endif 3714#endif
3647 3715
3648#if ENABLE_OVERLAY 3716#if ENABLE_OVERLAY
3649void 3717void
3650rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3718rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3651{ 3719{
3652 if (nrow < 1 || ncol < 1) 3720 if (nrow < 1 || ncol < 1)
3653 return; 3721 return;
3654 3722
3655 want_refresh = 1; 3723 want_refresh = 1;
… …
3700 *rp = r; 3768 *rp = r;
3701 } 3769 }
3702} 3770}
3703 3771
3704void 3772void
3705rxvt_term::scr_overlay_off () 3773rxvt_term::scr_overlay_off () NOTHROW
3706{ 3774{
3707 if (!ov_text) 3775 if (!ov_text)
3708 return; 3776 return;
3709 3777
3710 want_refresh = 1; 3778 want_refresh = 1;
… …
3718 delete [] ov_text; ov_text = 0; 3786 delete [] ov_text; ov_text = 0;
3719 delete [] ov_rend; ov_rend = 0; 3787 delete [] ov_rend; ov_rend = 0;
3720} 3788}
3721 3789
3722void 3790void
3723rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3791rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3724{ 3792{
3725 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3793 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3726 return; 3794 return;
3727 3795
3728 x++, y++; 3796 x++, y++;
… …
3730 ov_text[y][x] = text; 3798 ov_text[y][x] = text;
3731 ov_rend[y][x] = rend; 3799 ov_rend[y][x] = rend;
3732} 3800}
3733 3801
3734void 3802void
3735rxvt_term::scr_overlay_set (int x, int y, const char *s) 3803rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3736{ 3804{
3737 while (*s) 3805 while (*s)
3738 scr_overlay_set (x++, y, *s++); 3806 scr_overlay_set (x++, y, *s++);
3739} 3807}
3740 3808
3741void 3809void
3742rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3810rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3743{ 3811{
3744 while (*s) 3812 while (*s)
3745 { 3813 {
3746 text_t t = *s++; 3814 text_t t = *s++;
3747 int width = wcwidth (t); 3815 int width = WCWIDTH (t);
3748 3816
3749 while (width--) 3817 while (width--)
3750 { 3818 {
3751 scr_overlay_set (x++, y, t); 3819 scr_overlay_set (x++, y, t);
3752 t = NOCHAR; 3820 t = NOCHAR;
3753 } 3821 }
3754 } 3822 }
3755} 3823}
3756 3824
3757void 3825void
3758rxvt_term::scr_swap_overlay () 3826rxvt_term::scr_swap_overlay () NOTHROW
3759{ 3827{
3760 if (!ov_text) 3828 if (!ov_text)
3761 return; 3829 return;
3762 3830
3763 // swap screen mem with overlay 3831 // swap screen mem with overlay

Diff Legend

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