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.314 by root, Tue Nov 4 14:34:13 2008 UTC

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

Diff Legend

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