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

Diff Legend

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