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.228 by root, Sun Jan 15 06:02:41 2006 UTC vs.
Revision 1.316 by root, Tue Nov 4 15:02:35 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) 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) 129rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 130{
149 scr_blank_line (l, 0, ncol, efs); 131 scr_blank_line (l, 0, ncol, efs);
150 132
151 l.l = 0; 133 l.l = 0;
152 l.f = 0; 134 l.f = 0;
135}
136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
153} 154}
154 155
155/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
… …
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 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
623
624 // scroll everything up 'count' lines 634 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 635 term_start = (term_start + count) % total_rows;
626 636
637 // sever bottommost line
627 { 638 {
628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count); 639 line_t &l = ROW(row2 - count);
640 l.is_longer (0);
630 l.touch (); 641 l.touch ();
631 l.is_longer (0);
632 } 642 }
633 643
634 // erase newly scorlled-in lines 644 // erase newly scrolled-in lines
635 for (int i = count; i; --i ) 645 for (int i = count; i--; )
636 { 646 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i); 647 line_t &l = ROW(nrow - 1 - i);
640 648
649 // optimize if already cleared, can be significant on slow machines
650 // could be rolled into scr_blank_screen_mem
651 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
652 {
641 scr_blank_line (l, 0, l.l, rstyle); 653 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0; 654 l.l = 0;
644 l.f = 0; 655 l.f = 0;
656 }
657 else
658 scr_blank_screen_mem (l, rstyle);
645 } 659 }
646 660
647 // now copy lines below the scroll region bottom to the 661 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 662 // bottom of the screen again, so they look as if they
649 // hadn't moved. 663 // hadn't moved.
… …
653 line_t &l2 = ROW(i); 667 line_t &l2 = ROW(i);
654 668
655 ::swap (l1, l2); 669 ::swap (l1, l2);
656 l2.touch (); 670 l2.touch ();
657 } 671 }
658 672
659 // move and/or clear selection, if any 673 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 674 if (selection.op && current_screen == selection.screen)
661 { 675 {
662 selection.beg.row -= count; 676 selection.beg.row -= count;
663 selection.end.row -= count; 677 selection.end.row -= count;
… …
671 selection.op = SELECTION_CLEAR; 685 selection.op = SELECTION_CLEAR;
672 } 686 }
673 } 687 }
674 688
675 // finally move the view window, if desired 689 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 690 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 691 && view_start != 0
678 && view_start != -saveLines) 692 && view_start != -saveLines)
679 scr_page (UP, count); 693 scr_page (UP, count);
694
695 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
696 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
680 } 697 }
681 else 698 else
682 { 699 {
683 if (selection.op && current_screen == selection.screen) 700 if (selection.op && current_screen == selection.screen)
684 { 701 {
… …
696 { 713 {
697 /* move selected region too */ 714 /* move selected region too */
698 selection.beg.row -= count; 715 selection.beg.row -= count;
699 selection.end.row -= count; 716 selection.end.row -= count;
700 selection.mark.row -= count; 717 selection.mark.row -= count;
701 718
702 selection_check (0); 719 selection_check (0);
703 } 720 }
704 } 721 }
705 722
706 // use a simple and robust scrolling algorithm, this 723 // use a simple and robust scrolling algorithm, this
… …
730/* ------------------------------------------------------------------------- */ 747/* ------------------------------------------------------------------------- */
731/* 748/*
732 * Add text given in <str> of length <len> to screen struct 749 * Add text given in <str> of length <len> to screen struct
733 */ 750 */
734void 751void
735rxvt_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
736{ 753{
737 if (len <= 0) /* sanity */ 754 if (len <= 0) /* sanity */
738 return; 755 return;
739 756
740 unsigned char checksel; 757 unsigned char checksel;
… …
746 ZERO_SCROLLBACK (); 763 ZERO_SCROLLBACK ();
747 764
748 if (minlines > 0) 765 if (minlines > 0)
749 { 766 {
750 minlines += screen.cur.row - screen.bscroll; 767 minlines += screen.cur.row - screen.bscroll;
768 min_it (minlines, screen.cur.row - top_row);
751 769
752 if (minlines > 0 770 if (minlines > 0
753 && screen.tscroll == 0 771 && screen.tscroll == 0
754 && screen.bscroll == nrow - 1) 772 && screen.bscroll == nrow - 1)
755 { 773 {
… …
772 790
773 while (str < strend) 791 while (str < strend)
774 { 792 {
775 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 793 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
776 794
777 if (c < 0x20) 795 if (expect_false (c < 0x20))
778 if (c == C0_LF) 796 if (c == C0_LF)
779 { 797 {
780 max_it (line->l, screen.cur.col); 798 max_it (line->l, screen.cur.col);
781 799
782 screen.flags &= ~Screen_WrapNext; 800 screen.flags &= ~Screen_WrapNext;
… …
801 { 819 {
802 scr_tab (1, true); 820 scr_tab (1, true);
803 continue; 821 continue;
804 } 822 }
805 823
824 if (expect_false (
806 if (checksel /* see if we're writing within selection */ 825 checksel /* see if we're writing within selection */
807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 826 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
808 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 827 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
828 ))
809 { 829 {
810 checksel = 0; 830 checksel = 0;
811 /* 831 /*
812 * If we wrote anywhere in the selected area, kill the selection 832 * If we wrote anywhere in the selected area, kill the selection
813 * XXX: should we kill the mark too? Possibly, but maybe that 833 * XXX: should we kill the mark too? Possibly, but maybe that
814 * should be a similar check. 834 * should be a similar check.
815 */ 835 */
816 CLEAR_SELECTION (); 836 CLEAR_SELECTION ();
817 } 837 }
818 838
819 if (screen.flags & Screen_WrapNext) 839 if (expect_false (screen.flags & Screen_WrapNext))
820 { 840 {
841 scr_do_wrap ();
842
821 max_it (line->l, ncol); 843 line->l = ncol;
822 line->is_longer (1); 844 line->is_longer (1);
823 845
824 scr_do_wrap ();
825
826 row = screen.cur.row; 846 row = screen.cur.row;
827 line = &ROW(row); /* _must_ refresh */ 847 line = &ROW(row); /* _must_ refresh */
828 } 848 }
829 849
830 // some utf-8 decoders "decode" surrogate characters: let's fix this. 850 // some utf-8 decoders "decode" surrogate characters: let's fix this.
831 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 851 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
832 c = 0xfffd; 852 c = 0xfffd;
833 853
834 // 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
835 // do wcwidth before further replacements, as wcwidth might return -1 855 // further replacements, as wcwidth might return -1 for the line
836 // 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
837 // locale. 857 // locale.
838 int width = c < 0x100 ? 1 : wcwidth (c); 858 int width = WCWIDTH (c);
839 859
840 if (charsets [screen.charset] == '0') // DEC SPECIAL 860 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
841 { 861 {
842 // vt100 special graphics and line drawing 862 // vt100 special graphics and line drawing
843 // 5f-7e standard vt100 863 // 5f-7e standard vt100
844 // 40-5e rxvt extension for extra curses acs chars 864 // 40-5e rxvt extension for extra curses acs chars
845 static uint16_t vt100_0[62] = { // 41 .. 7e 865 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
858 c = vt100_0[c - 0x41]; 878 c = vt100_0[c - 0x41];
859 width = 1; // vt100 line drawing characters are always single-width 879 width = 1; // vt100 line drawing characters are always single-width
860 } 880 }
861 } 881 }
862 882
863 if (screen.flags & Screen_Insert) 883 if (expect_false (screen.flags & Screen_Insert))
864 scr_insdel_chars (width, INSERT); 884 scr_insdel_chars (width, INSERT);
865 885
866 if (width != 0) 886 if (width != 0)
867 { 887 {
868#if !UNICODE_3 888#if !UNICODE_3
… …
874 c = 0xfffd; 894 c = 0xfffd;
875# endif 895# endif
876#endif 896#endif
877 897
878 // nuke the character at this position, if required 898 // nuke the character at this position, if required
899 if (expect_false (
879 if (line->t[screen.cur.col] == NOCHAR 900 line->t[screen.cur.col] == NOCHAR
880 || (screen.cur.col < ncol - 1 901 || (screen.cur.col < ncol - 1
881 && line->t[screen.cur.col + 1] == NOCHAR)) 902 && line->t[screen.cur.col + 1] == NOCHAR)
882 { 903 ))
883 int col = screen.cur.col; 904 scr_kill_char (*line, screen.cur.col);
884
885 // find begin
886 while (col > 0 && line->t[col] == NOCHAR)
887 col--;
888
889 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
890
891 // found begin, nuke
892 do {
893 line->t[col] = ' ';
894 line->r[col] = rend;
895 col++;
896 } while (col < ncol && line->t[col] == NOCHAR);
897 }
898 905
899 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
900 907
901 // if the character doesn't fit into the remaining columns... 908 // if the character doesn't fit into the remaining columns...
902 if (screen.cur.col > ncol - width && ncol >= width) 909 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
903 { 910 {
904 // ...output spaces 911 // ...output spaces
905 c = ' '; 912 c = ' ';
906 // and try the same character next loop iteration 913 // and try the same character next loop iteration
907 --str; 914 --str;
… …
912 do 919 do
913 { 920 {
914 line->t[screen.cur.col] = c; 921 line->t[screen.cur.col] = c;
915 line->r[screen.cur.col] = rend; 922 line->r[screen.cur.col] = rend;
916 923
917 if (screen.cur.col < ncol - 1) 924 if (expect_true (screen.cur.col < ncol - 1))
918 screen.cur.col++; 925 screen.cur.col++;
919 else 926 else
920 { 927 {
921 line->l = ncol; 928 line->l = ncol;
922 if (screen.flags & Screen_Autowrap) 929 if (screen.flags & Screen_Autowrap)
… …
924 break; 931 break;
925 } 932 }
926 933
927 c = NOCHAR; 934 c = NOCHAR;
928 } 935 }
929 while (--width > 0); 936 while (expect_false (--width > 0));
930 937
931 // pad with spaces when overwriting wide character with smaller one 938 // pad with spaces when overwriting wide character with smaller one
932 if (!width) 939 if (expect_false (!width))
933 { 940 {
934 line->touch (); 941 line->touch ();
935 942
936 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++)
937 { 944 {
938 line->t[c] = ' '; 945 line->t[c] = ' ';
939 line->r[c] = rend; 946 line->r[c] = rend;
940 } 947 }
941 } 948 }
942 } 949 }
950#if ENABLE_COMBINING
943 else // width == 0 951 else // width == 0
944 { 952 {
945#if ENABLE_COMBINING 953 if (c != 0xfeff) // ignore BOM
946 // handle combining characters
947 // we just tag the accent on the previous on-screen character.
948 // this is arguably not correct, but also arguably not wrong.
949 // we don't handle double-width characters nicely yet.
950 line_t *linep;
951 text_t *tp;
952 rend_t *rp;
953
954 if (screen.cur.col > 0)
955 { 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 {
956 linep = line; 965 linep = line;
957 tp = line->t + screen.cur.col - 1; 966 tp = line->t + screen.cur.col - 1;
958 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));
959 } 991 }
960 else if (screen.cur.row > 0
961 && ROW(screen.cur.row - 1).is_longer ())
962 {
963 linep = &ROW(screen.cur.row - 1);
964 tp = line->t + ncol - 1;
965 rp = line->r + ncol - 1;
966 } 992 }
967 else
968 continue;
969
970 linep->touch ();
971
972 while (*tp == NOCHAR && tp > linep->t)
973 tp--, rp--;
974
975 // first try to find a precomposed character
976 unicode_t n = rxvt_compose (*tp, c);
977 if (n == NOCHAR)
978 n = rxvt_composite.compose (*tp, c);
979
980 *tp = n;
981 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
982#endif 993#endif
983 }
984 } 994 }
985 995
986 max_it (line->l, screen.cur.col); 996 max_it (line->l, screen.cur.col);
987 997
988#ifdef DEBUG_STRICT 998#ifdef DEBUG_STRICT
… …
994/* 1004/*
995 * 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
996 * XTERM_SEQ: CTRL-H 1006 * XTERM_SEQ: CTRL-H
997 */ 1007 */
998void 1008void
999rxvt_term::scr_backspace () 1009rxvt_term::scr_backspace () NOTHROW
1000{ 1010{
1001 want_refresh = 1;
1002
1003 if (screen.cur.col == 0) 1011 if (screen.cur.col == 0)
1004 { 1012 {
1005 if (screen.cur.row > 0) 1013 if (screen.cur.row > 0)
1006 { 1014 {
1007#ifdef TERMCAP_HAS_BW 1015#ifdef TERMCAP_HAS_BW
1008 screen.cur.col = ncol - 1; 1016 screen.cur.col = ncol - 1;
1009 screen.cur.row--; 1017 --screen.cur.row;
1010 return; 1018
1019 want_refresh = 1;
1011#endif 1020#endif
1012 } 1021 }
1013 } 1022 }
1014 else if (!(screen.flags & Screen_WrapNext)) 1023 else
1015 scr_gotorc (0, -1, RELATIVE); 1024 scr_gotorc (0, -1, RELATIVE);
1016
1017 screen.flags &= ~Screen_WrapNext;
1018} 1025}
1019 1026
1020/* ------------------------------------------------------------------------- */ 1027/* ------------------------------------------------------------------------- */
1021/* 1028/*
1022 * Process Horizontal Tab 1029 * Process Horizontal Tab
1023 * count: +ve = forward; -ve = backwards 1030 * count: +ve = forward; -ve = backwards
1024 * XTERM_SEQ: CTRL-I 1031 * XTERM_SEQ: CTRL-I
1025 */ 1032 */
1026void 1033void
1027rxvt_term::scr_tab (int count, bool ht) 1034rxvt_term::scr_tab (int count, bool ht) NOTHROW
1028{ 1035{
1029 int i, x; 1036 int i, x;
1030 1037
1031 want_refresh = 1; 1038 want_refresh = 1;
1032 i = x = screen.cur.col; 1039 i = x = screen.cur.col;
… …
1045 x = i; 1052 x = i;
1046 1053
1047 if (!--count) 1054 if (!--count)
1048 break; 1055 break;
1049 } 1056 }
1050 else 1057 else
1051 ht &= l.t[i] == ' ' 1058 ht &= l.t[i] == ' '
1052 && RS_SAME (l.r[i], base_rend); 1059 && RS_SAME (l.r[i], base_rend);
1053 1060
1054 if (count) 1061 if (count)
1055 x = ncol - 1; 1062 x = ncol - 1;
1056 1063
1057 // store horizontal tab commands as characters inside the text 1064 // store horizontal tab commands as characters inside the text
1058 // buffer so they can be selected and pasted. 1065 // buffer so they can be selected and pasted.
1059 if (ht && OPTION (Opt_pastableTabs)) 1066 if (ht && option (Opt_pastableTabs))
1060 { 1067 {
1061 base_rend = SET_FONT (base_rend, 0); 1068 base_rend = SET_FONT (base_rend, 0);
1062 1069
1063 l.touch (x); 1070 l.touch (x);
1064 1071
… …
1097 * Process DEC Back Index 1104 * Process DEC Back Index
1098 * XTERM_SEQ: ESC 6 1105 * XTERM_SEQ: ESC 6
1099 * 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
1100 * in that row right. Clear left column. 1107 * in that row right. Clear left column.
1101 */ 1108 */
1102#if ENABLE_FRILLS 1109#if !ENABLE_MINIMAL
1103void 1110void
1104rxvt_term::scr_backindex () 1111rxvt_term::scr_backindex () NOTHROW
1105{ 1112{
1106 if (screen.cur.col > 0) 1113 if (screen.cur.col > 0)
1107 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1114 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1108 else 1115 else
1109 scr_insdel_chars (1, INSERT); 1116 scr_insdel_chars (1, INSERT);
… …
1114 * Process DEC Forward Index 1121 * Process DEC Forward Index
1115 * XTERM_SEQ: ESC 9 1122 * XTERM_SEQ: ESC 9
1116 * 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
1117 * in that row left. Clear right column. 1124 * in that row left. Clear right column.
1118 */ 1125 */
1119#if ENABLE_FRILLS 1126#if !ENABLE_MINIMAL
1120void 1127void
1121rxvt_term::scr_forwardindex () 1128rxvt_term::scr_forwardindex () NOTHROW
1122{ 1129{
1123 if (screen.cur.col < ncol - 1) 1130 if (screen.cur.col < ncol - 1)
1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1131 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1125 else 1132 else
1126 { 1133 {
… …
1139/* ------------------------------------------------------------------------- */ 1146/* ------------------------------------------------------------------------- */
1140/* 1147/*
1141 * Goto Row/Column 1148 * Goto Row/Column
1142 */ 1149 */
1143void 1150void
1144rxvt_term::scr_gotorc (int row, int col, int relative) 1151rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1145{ 1152{
1146 want_refresh = 1; 1153 want_refresh = 1;
1147 ZERO_SCROLLBACK (); 1154 ZERO_SCROLLBACK ();
1148 1155
1149 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1156 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1171 } 1178 }
1172 } 1179 }
1173 else 1180 else
1174 { 1181 {
1175 if (screen.flags & Screen_Relative) 1182 if (screen.flags & Screen_Relative)
1183 {
1176 { /* relative origin mode */ 1184 /* relative origin mode */
1177 screen.cur.row = row + screen.tscroll; 1185 screen.cur.row = row + screen.tscroll;
1178 min_it (screen.cur.row, screen.bscroll); 1186 min_it (screen.cur.row, screen.bscroll);
1179 } 1187 }
1180 else 1188 else
1181 screen.cur.row = row; 1189 screen.cur.row = row;
… …
1187/* ------------------------------------------------------------------------- */ 1195/* ------------------------------------------------------------------------- */
1188/* 1196/*
1189 * direction should be UP or DN 1197 * direction should be UP or DN
1190 */ 1198 */
1191void 1199void
1192rxvt_term::scr_index (enum page_dirn direction) 1200rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1193{ 1201{
1194 int dirn; 1202 int dirn;
1195 1203
1196 want_refresh = 1; 1204 want_refresh = 1;
1197 ZERO_SCROLLBACK (); 1205 ZERO_SCROLLBACK ();
… …
1214/* 1222/*
1215 * Erase part or whole of a line 1223 * Erase part or whole of a line
1216 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1224 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1217 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1225 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1218 * 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
1219 */ 1228 */
1220void 1229void
1221rxvt_term::scr_erase_line (int mode) 1230rxvt_term::scr_erase_line (int mode) NOTHROW
1222{ 1231{
1223 unsigned int col, num; 1232 unsigned int col, num;
1224 1233
1225 want_refresh = 1; 1234 want_refresh = 1;
1226 ZERO_SCROLLBACK (); 1235 ZERO_SCROLLBACK ();
… …
1232 line.touch (); 1241 line.touch ();
1233 line.is_longer (0); 1242 line.is_longer (0);
1234 1243
1235 switch (mode) 1244 switch (mode)
1236 { 1245 {
1246 case 3:
1247 if (screen.flags & Screen_WrapNext)
1248 return;
1249
1250 /* fall through */
1251
1237 case 0: /* erase to end of line */ 1252 case 0: /* erase to end of line */
1238 col = screen.cur.col; 1253 col = screen.cur.col;
1239 num = ncol - col; 1254 num = ncol - col;
1240 min_it (line.l, col); 1255 min_it (line.l, col);
1256
1241 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1242 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1243 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1244 break; 1260 break;
1261
1245 case 1: /* erase to beginning of line */ 1262 case 1: /* erase to beginning of line */
1246 col = 0; 1263 col = 0;
1247 num = screen.cur.col + 1; 1264 num = screen.cur.col + 1;
1265
1248 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1249 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1250 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1251 break; 1269 break;
1270
1252 case 2: /* erase whole line */ 1271 case 2: /* erase whole line */
1253 col = 0; 1272 col = 0;
1254 num = ncol; 1273 num = ncol;
1255 line.l = 0; 1274 line.l = 0;
1256 if (selection.beg.row <= screen.cur.row 1275 if (selection.beg.row <= screen.cur.row
… …
1270 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1289 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1271 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1290 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1272 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1291 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1273 */ 1292 */
1274void 1293void
1275rxvt_term::scr_erase_screen (int mode) 1294rxvt_term::scr_erase_screen (int mode) NOTHROW
1276{ 1295{
1277 int num; 1296 int num;
1278 int32_t row; 1297 int32_t row;
1279 rend_t ren; 1298 rend_t ren;
1280 XGCValues gcvalue; 1299 XGCValues gcvalue;
… …
1314 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1315 return; 1334 return;
1316 1335
1317 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1318 1337
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1319 if (rstyle & (RS_RVid | RS_Uline)) 1339 if (rstyle & (RS_RVid | RS_Uline))
1320 ren = (rend_t) ~RS_None; 1340 ren = (rend_t) ~RS_None;
1321 else if (GET_BASEBG (rstyle) == Color_bg) 1341 else if (GET_BASEBG (rstyle) == Color_bg)
1322 { 1342 {
1323 ren = DEFAULT_RSTYLE; 1343 ren = DEFAULT_RSTYLE;
1324 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);
1325 } 1349 }
1326 else 1350 else
1327 { 1351 {
1328 ren = rstyle & (RS_fgMask | RS_bgMask); 1352 ren = rstyle & (RS_fgMask | RS_bgMask);
1353
1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1330 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1355 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1331 ERASE_ROWS (row, num); 1356 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row),
1358 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num));
1332 gcvalue.foreground = pix_colors[Color_fg]; 1360 gcvalue.foreground = pix_colors[Color_fg];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1361 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 } 1362 }
1335 1363
1336 for (; num--; row++) 1364 for (; num--; row++)
1337 { 1365 {
1338 scr_blank_screen_mem (ROW(row), rstyle); 1366 scr_blank_screen_mem (ROW(row), rstyle);
1339 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1367 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1340 } 1368 }
1341} 1369}
1342 1370
1343#if ENABLE_FRILLS 1371#if !ENABLE_MINIMAL
1344void 1372void
1345rxvt_term::scr_erase_savelines () 1373rxvt_term::scr_erase_savelines () NOTHROW
1346{ 1374{
1347 want_refresh = 1; 1375 want_refresh = 1;
1348 ZERO_SCROLLBACK (); 1376 ZERO_SCROLLBACK ();
1349 1377
1350 top_row = 0; 1378 top_row = 0;
… …
1355/* 1383/*
1356 * Fill the screen with `E's 1384 * Fill the screen with `E's
1357 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1385 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1358 */ 1386 */
1359void 1387void
1360rxvt_term::scr_E () 1388rxvt_term::scr_E () NOTHROW
1361{ 1389{
1362 rend_t fs; 1390 rend_t fs;
1363 1391
1364 want_refresh = 1; 1392 want_refresh = 1;
1365 ZERO_SCROLLBACK (); 1393 ZERO_SCROLLBACK ();
… …
1386/* ------------------------------------------------------------------------- */ 1414/* ------------------------------------------------------------------------- */
1387/* 1415/*
1388 * Insert/Delete <count> lines 1416 * Insert/Delete <count> lines
1389 */ 1417 */
1390void 1418void
1391rxvt_term::scr_insdel_lines (int count, int insdel) 1419rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1392{ 1420{
1393 int end; 1421 int end;
1394 1422
1395 ZERO_SCROLLBACK (); 1423 ZERO_SCROLLBACK ();
1396 1424
… …
1416/* ------------------------------------------------------------------------- */ 1444/* ------------------------------------------------------------------------- */
1417/* 1445/*
1418 * Insert/Delete <count> characters from the current position 1446 * Insert/Delete <count> characters from the current position
1419 */ 1447 */
1420void 1448void
1421rxvt_term::scr_insdel_chars (int count, int insdel) 1449rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1422{ 1450{
1423 int col, row;
1424 rend_t tr;
1425
1426 want_refresh = 1; 1451 want_refresh = 1;
1427 ZERO_SCROLLBACK (); 1452 ZERO_SCROLLBACK ();
1428 1453
1429 if (count <= 0) 1454 if (count <= 0)
1430 return; 1455 return;
… …
1432 scr_do_wrap (); 1457 scr_do_wrap ();
1433 1458
1434 selection_check (1); 1459 selection_check (1);
1435 min_it (count, ncol - screen.cur.col); 1460 min_it (count, ncol - screen.cur.col);
1436 1461
1437 row = screen.cur.row; 1462 int row = screen.cur.row;
1438 1463
1439 line_t *line = &ROW(row); 1464 line_t *line = &ROW(row);
1440 1465
1441 line->touch (); 1466 line->touch ();
1442 line->is_longer (0); 1467 line->is_longer (0);
1443 1468
1469 // nuke wide spanning the start
1470 if (line->t[screen.cur.col] == NOCHAR)
1471 scr_kill_char (*line, screen.cur.col);
1472
1444 switch (insdel) 1473 switch (insdel)
1445 { 1474 {
1446 case INSERT: 1475 case INSERT:
1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1476 line->l = min (line->l + count, ncol);
1477
1478 if (line->t[screen.cur.col] == NOCHAR)
1479 scr_kill_char (*line, screen.cur.col);
1480
1481 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1448 { 1482 {
1449 line->t[col] = line->t[col - count]; 1483 line->t[col] = line->t[col - count];
1450 line->r[col] = line->r[col - count]; 1484 line->r[col] = line->r[col - count];
1451 } 1485 }
1452
1453 line->l = min (line->l + count, ncol);
1454 1486
1455 if (selection.op && current_screen == selection.screen 1487 if (selection.op && current_screen == selection.screen
1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1488 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1457 { 1489 {
1458 if (selection.end.row != screen.cur.row 1490 if (selection.end.row != screen.cur.row
1459 || (selection.end.col + count >= ncol)) 1491 || (selection.end.col + count >= ncol))
1460 CLEAR_SELECTION (); 1492 CLEAR_SELECTION ();
1461 else 1493 else
1494 {
1462 { /* shift selection */ 1495 /* shift selection */
1463 selection.beg.col += count; 1496 selection.beg.col += count;
1464 selection.mark.col += count; /* XXX: yes? */ 1497 selection.mark.col += count; /* XXX: yes? */
1465 selection.end.col += count; 1498 selection.end.col += count;
1466 } 1499 }
1467 } 1500 }
… …
1472 case ERASE: 1505 case ERASE:
1473 screen.cur.col += count; /* don't worry if > ncol */ 1506 screen.cur.col += count; /* don't worry if > ncol */
1474 selection_check (1); 1507 selection_check (1);
1475 screen.cur.col -= count; 1508 screen.cur.col -= count;
1476 1509
1477 line->l = max (line->l - count, 0); 1510 // nuke wide char after the end
1511 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1512 scr_kill_char (*line, screen.cur.col + count);
1513
1478 scr_blank_line (*line, screen.cur.col, count, rstyle); 1514 scr_blank_line (*line, screen.cur.col, count, rstyle);
1479 break; 1515 break;
1480 1516
1481 case DELETE: 1517 case DELETE:
1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1518 line->l = max (line->l - count, 0);
1483 1519
1520 // nuke wide char spanning the end
1521 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1522 scr_kill_char (*line, screen.cur.col + count);
1523
1484 for (col = screen.cur.col; (col + count) < ncol; col++) 1524 for (int col = screen.cur.col; (col + count) < ncol; col++)
1485 { 1525 {
1486 line->t[col] = line->t[col + count]; 1526 line->t[col] = line->t[col + count];
1487 line->r[col] = line->r[col + count]; 1527 line->r[col] = line->r[col + count];
1488 } 1528 }
1489 1529
1490 line->l = max (line->l - count, 0);
1491 scr_blank_line (*line, ncol - count, count, tr); 1530 scr_blank_line (*line, ncol - count, count,
1531 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1492 1532
1493 if (selection.op && current_screen == selection.screen 1533 if (selection.op && current_screen == selection.screen
1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1534 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1495 { 1535 {
1496 if (selection.end.row != screen.cur.row 1536 if (selection.end.row != screen.cur.row
… …
1514/* 1554/*
1515 * Set the scrolling region 1555 * Set the scrolling region
1516 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1556 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1517 */ 1557 */
1518void 1558void
1519rxvt_term::scr_scroll_region (int top, int bot) 1559rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1520{ 1560{
1521 max_it (top, 0); 1561 max_it (top, 0);
1522 min_it (bot, nrow - 1); 1562 min_it (bot, nrow - 1);
1523 1563
1524 if (top > bot) 1564 if (top > bot)
… …
1534 * Make the cursor visible/invisible 1574 * Make the cursor visible/invisible
1535 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1575 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1536 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1576 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1537 */ 1577 */
1538void 1578void
1539rxvt_term::scr_cursor_visible (int mode) 1579rxvt_term::scr_cursor_visible (int mode) NOTHROW
1540{ 1580{
1541 want_refresh = 1; 1581 want_refresh = 1;
1542 1582
1543 if (mode) 1583 if (mode)
1544 screen.flags |= Screen_VisibleCursor; 1584 screen.flags |= Screen_VisibleCursor;
… …
1551 * Set/unset automatic wrapping 1591 * Set/unset automatic wrapping
1552 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1592 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1553 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1593 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1554 */ 1594 */
1555void 1595void
1556rxvt_term::scr_autowrap (int mode) 1596rxvt_term::scr_autowrap (int mode) NOTHROW
1557{ 1597{
1558 if (mode) 1598 if (mode)
1559 screen.flags |= Screen_Autowrap; 1599 screen.flags |= Screen_Autowrap;
1560 else 1600 else
1561 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1601 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1570 * and the cursor cannot be moved outside. 1610 * and the cursor cannot be moved outside.
1571 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1611 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1572 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1612 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1573 */ 1613 */
1574void 1614void
1575rxvt_term::scr_relative_origin (int mode) 1615rxvt_term::scr_relative_origin (int mode) NOTHROW
1576{ 1616{
1577 if (mode) 1617 if (mode)
1578 screen.flags |= Screen_Relative; 1618 screen.flags |= Screen_Relative;
1579 else 1619 else
1580 screen.flags &= ~Screen_Relative; 1620 screen.flags &= ~Screen_Relative;
… …
1587 * Set insert/replace mode 1627 * Set insert/replace mode
1588 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1628 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1589 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1629 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1590 */ 1630 */
1591void 1631void
1592rxvt_term::scr_insert_mode (int mode) 1632rxvt_term::scr_insert_mode (int mode) NOTHROW
1593{ 1633{
1594 if (mode) 1634 if (mode)
1595 screen.flags |= Screen_Insert; 1635 screen.flags |= Screen_Insert;
1596 else 1636 else
1597 screen.flags &= ~Screen_Insert; 1637 screen.flags &= ~Screen_Insert;
… …
1603 * XTERM_SEQ: Set tab at current column : ESC H 1643 * XTERM_SEQ: Set tab at current column : ESC H
1604 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1644 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1605 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1645 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1606 */ 1646 */
1607void 1647void
1608rxvt_term::scr_set_tab (int mode) 1648rxvt_term::scr_set_tab (int mode) NOTHROW
1609{ 1649{
1610 if (mode < 0) 1650 if (mode < 0)
1611 memset (tabs, 0, ncol * sizeof (char)); 1651 memset (tabs, 0, ncol);
1612 else if (screen.cur.col < ncol) 1652 else if (screen.cur.col < ncol)
1613 tabs [screen.cur.col] = !!mode; 1653 tabs [screen.cur.col] = !!mode;
1614} 1654}
1615 1655
1616/* ------------------------------------------------------------------------- */ 1656/* ------------------------------------------------------------------------- */
… …
1618 * Set reverse/normal video 1658 * Set reverse/normal video
1619 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1659 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1620 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1660 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1621 */ 1661 */
1622void 1662void
1623rxvt_term::scr_rvideo_mode (int mode) 1663rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1624{ 1664{
1625 XGCValues gcvalue; 1665 rvideo_mode = on;
1626 1666
1667#ifndef NO_BELL
1668 on ^= rvideo_bell;
1669#endif
1670
1627 if (rvideo != mode) 1671 if (rvideo_state != on)
1628 { 1672 {
1629 rvideo = mode; 1673 rvideo_state = on;
1674
1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1675 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1631#if XPM_BACKGROUND 1676#ifdef HAVE_BG_PIXMAP
1632 if (bgPixmap.pixmap == None) 1677 if (bgPixmap.pixmap == None)
1633#endif 1678#endif
1634#if TRANSPARENT 1679 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1636#endif
1637 XSetWindowBackground (display->display, vt,
1638 pix_colors[Color_bg]);
1639 1680
1681 XGCValues gcvalue;
1640 gcvalue.foreground = pix_colors[Color_fg]; 1682 gcvalue.foreground = pix_colors[Color_fg];
1641 gcvalue.background = pix_colors[Color_bg]; 1683 gcvalue.background = pix_colors[Color_bg];
1642 XChangeGC (display->display, gc, GCBackground | GCForeground, 1684 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1643 &gcvalue); 1685
1644 scr_clear (); 1686 scr_clear ();
1645 scr_touch (true); 1687 scr_touch (true);
1646 } 1688 }
1647} 1689}
1648 1690
… …
1650/* 1692/*
1651 * Report current cursor position 1693 * Report current cursor position
1652 * XTERM_SEQ: Report position: ESC [ 6 n 1694 * XTERM_SEQ: Report position: ESC [ 6 n
1653 */ 1695 */
1654void 1696void
1655rxvt_term::scr_report_position () 1697rxvt_term::scr_report_position () NOTHROW
1656{ 1698{
1657 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1699 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1658} 1700}
1659 1701
1660/* ------------------------------------------------------------------------- * 1702/* ------------------------------------------------------------------------- *
… …
1663 1705
1664/* 1706/*
1665 * Set font style 1707 * Set font style
1666 */ 1708 */
1667void 1709void
1668rxvt_term::set_font_style () 1710rxvt_term::set_font_style () NOTHROW
1669{ 1711{
1670#if 0 1712#if 0
1671 switch (charsets [screen.charset]) 1713 switch (charsets [screen.charset])
1672 { 1714 {
1673 case '0': /* DEC Special Character & Line Drawing Set */ 1715 case '0': /* DEC Special Character & Line Drawing Set */
… …
1695 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1737 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1696 * XTERM_SEQ: Invoke G2 character set: ESC N 1738 * XTERM_SEQ: Invoke G2 character set: ESC N
1697 * XTERM_SEQ: Invoke G3 character set: ESC O 1739 * XTERM_SEQ: Invoke G3 character set: ESC O
1698 */ 1740 */
1699void 1741void
1700rxvt_term::scr_charset_choose (int set) 1742rxvt_term::scr_charset_choose (int set) NOTHROW
1701{ 1743{
1702 screen.charset = set; 1744 screen.charset = set;
1703 set_font_style (); 1745 set_font_style ();
1704} 1746}
1705 1747
… …
1711 * XTERM_SEQ: Set G2 character set: ESC * <C> 1753 * XTERM_SEQ: Set G2 character set: ESC * <C>
1712 * XTERM_SEQ: Set G3 character set: ESC + <C> 1754 * XTERM_SEQ: Set G3 character set: ESC + <C>
1713 * See set_font_style for possible values for <C> 1755 * See set_font_style for possible values for <C>
1714 */ 1756 */
1715void 1757void
1716rxvt_term::scr_charset_set (int set, unsigned int ch) 1758rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1717{ 1759{
1718 charsets[set] = (unsigned char)ch; 1760 charsets[set] = (unsigned char)ch;
1719 set_font_style (); 1761 set_font_style ();
1720} 1762}
1721 1763
… …
1726 1768
1727/* 1769/*
1728 * refresh matching text. 1770 * refresh matching text.
1729 */ 1771 */
1730bool 1772bool
1731rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1773rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1732{ 1774{
1733 bool found = false; 1775 bool found = false;
1734 1776
1735 for (int i = 0; i < nrow; i++) 1777 for (int i = 0; i < nrow; i++)
1736 { 1778 {
1737 int col = 0;
1738 rend_t *drp = drawn_buf[i].r; 1779 rend_t *drp = drawn_buf[i].r;
1739 1780
1740 for (; col < ncol; col++, drp++) 1781 for (int col = 0; col < ncol; col++, drp++)
1741 if ((*drp & mask) == value) 1782 if ((*drp & mask) == value)
1742 { 1783 {
1743 found = true; 1784 found = true;
1744 *drp = ~value; 1785 *drp = ~value;
1745 } 1786 }
… …
1756 PART_END, 1797 PART_END,
1757 RC_COUNT 1798 RC_COUNT
1758}; 1799};
1759 1800
1760void 1801void
1761rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1802rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1762{ 1803{
1763 int i; 1804 int i;
1764 row_col_t rc[RC_COUNT]; 1805 row_col_t rc[RC_COUNT];
1765 1806
1766 if (!drawn_buf) /* sanity check */ 1807 if (!drawn_buf) /* sanity check */
… …
1785 for (i = PART_BEG; i < RC_COUNT; i++) 1826 for (i = PART_BEG; i < RC_COUNT; i++)
1786 { 1827 {
1787 min_it (rc[i].col, ncol - 1); 1828 min_it (rc[i].col, ncol - 1);
1788 min_it (rc[i].row, nrow - 1); 1829 min_it (rc[i].row, nrow - 1);
1789 } 1830 }
1790 1831// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1791 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1832 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1792 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1833 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1793 1834
1835 num_scr_allow = 0;
1836
1794 if (refresh) 1837 if (refresh)
1795 scr_refresh (SLOW_REFRESH); 1838 scr_refresh ();
1796} 1839}
1797 1840
1798/* ------------------------------------------------------------------------- */ 1841/* ------------------------------------------------------------------------- */
1799/* 1842/*
1800 * Refresh the entire screen 1843 * Refresh the entire screen
1801 */ 1844 */
1802void 1845void
1803rxvt_term::scr_touch (bool refresh) 1846rxvt_term::scr_touch (bool refresh) NOTHROW
1804{ 1847{
1805 scr_expose (0, 0, width, height, refresh); 1848 scr_expose (0, 0, width, height, refresh);
1806} 1849}
1807 1850
1808/* ------------------------------------------------------------------------- */ 1851/* ------------------------------------------------------------------------- */
1809/* 1852/*
1810 * Move the display so that the line represented by scrollbar value Y is at 1853 * Move the display so that the line represented by scrollbar value Y is at
1811 * the top of the screen 1854 * the top of the screen
1812 */ 1855 */
1813void 1856void
1814rxvt_term::scr_move_to (int y, int len) 1857rxvt_term::scr_move_to (int y, int len) NOTHROW
1815{ 1858{
1816 int p = (top_row - nrow) * (len - y) / len + (nrow - 1); 1859 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1817
1818 scr_changeview (p);
1819} 1860}
1820 1861
1821/* ------------------------------------------------------------------------- */ 1862/* ------------------------------------------------------------------------- */
1822/* 1863/*
1823 * Page the screen up/down nlines 1864 * Page the screen up/down nlines
1824 * direction should be UP or DN 1865 * direction should be UP or DN
1825 */ 1866 */
1826bool 1867bool
1827rxvt_term::scr_page (enum page_dirn direction, int nlines) 1868rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1828{ 1869{
1829 int new_view_start = 1870 int new_view_start =
1830 direction == UP ? view_start - nlines 1871 direction == UP ? view_start - nlines
1831 : view_start + nlines; 1872 : view_start + nlines;
1832 1873
1833 return scr_changeview (new_view_start); 1874 return scr_changeview (new_view_start);
1834} 1875}
1835 1876
1836bool 1877bool
1837rxvt_term::scr_changeview (int new_view_start) 1878rxvt_term::scr_changeview (int new_view_start) NOTHROW
1838{ 1879{
1839 clamp_it (new_view_start, top_row, 0); 1880 clamp_it (new_view_start, top_row, 0);
1840 1881
1841 if (new_view_start != view_start) 1882 if (new_view_start == view_start)
1842 {
1843 num_scr += new_view_start - view_start;
1844 view_start = new_view_start;
1845 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1846 want_refresh = 1;
1847
1848 return true;
1849 }
1850 else
1851 return false; 1883 return false;
1852}
1853 1884
1854/* ------------------------------------------------------------------------- */ 1885 num_scr += new_view_start - view_start;
1886 view_start = new_view_start;
1887 want_refresh = 1;
1888
1889 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1890
1891 return true;
1892}
1893
1894#ifndef NO_BELL
1855void 1895void
1896rxvt_term::bell_cb (ev::timer &w, int revents)
1897{
1898 rvideo_bell = false;
1899 scr_rvideo_mode (rvideo_mode);
1900 refresh_check ();
1901}
1902#endif
1903
1904/* ------------------------------------------------------------------------- */
1905void
1856rxvt_term::scr_bell () 1906rxvt_term::scr_bell () NOTHROW
1857{ 1907{
1858#ifndef NO_BELL 1908#ifndef NO_BELL
1859 1909
1860# ifndef NO_MAPALERT 1910# ifndef NO_MAPALERT
1861# ifdef MAPALERT_OPTION 1911# ifdef MAPALERT_OPTION
1862 if (OPTION (Opt_mapAlert)) 1912 if (option (Opt_mapAlert))
1863# endif 1913# endif
1864 XMapWindow (display->display, parent[0]); 1914 XMapWindow (dpy, parent[0]);
1865# endif 1915# endif
1866 1916
1917# if ENABLE_FRILLS
1918 if (option (Opt_urgentOnBell))
1919 set_urgency (1);
1920# endif
1921
1867 if (OPTION (Opt_visualBell)) 1922 if (option (Opt_visualBell))
1868 { 1923 {
1869 scr_rvideo_mode (!rvideo); /* refresh also done */ 1924 rvideo_bell = true;
1925 scr_rvideo_mode (rvideo_mode);
1870 display->flush (); 1926 flush ();
1927
1871 rxvt_usleep (VISUAL_BELL_DURATION); 1928 bell_ev.start (VISUAL_BELL_DURATION);
1872 scr_rvideo_mode (!rvideo); /* refresh also done */
1873 } 1929 }
1874 else 1930 else
1875 XBell (display->display, 0); 1931 XBell (dpy, 0);
1876
1877#endif 1932#endif
1878} 1933}
1879 1934
1880/* ------------------------------------------------------------------------- */ 1935/* ------------------------------------------------------------------------- */
1881/* ARGSUSED */ 1936/* ARGSUSED */
1882void 1937void
1883rxvt_term::scr_printscreen (int fullhist) 1938rxvt_term::scr_printscreen (int fullhist) NOTHROW
1884{ 1939{
1885#ifdef PRINTPIPE 1940#ifdef PRINTPIPE
1886 int nrows, row_start; 1941 int nrows, row_start;
1887 FILE *fd; 1942 FILE *fd = popen_printer ();
1888 1943
1889 if ((fd = popen_printer ()) == NULL) 1944 if (!fd)
1890 return; 1945 return;
1891 1946
1892 if (fullhist) 1947 if (fullhist)
1893 { 1948 {
1894 nrows = nrow - top_row; 1949 nrows = nrow - top_row;
… …
1937 * Refresh the screen 1992 * Refresh the screen
1938 * drawn_text/drawn_rend contain the screen information before the update. 1993 * drawn_text/drawn_rend contain the screen information before the update.
1939 * screen.text/screen.rend contain what the screen will change to. 1994 * screen.text/screen.rend contain what the screen will change to.
1940 */ 1995 */
1941void 1996void
1942rxvt_term::scr_refresh (unsigned char refresh_type) 1997rxvt_term::scr_refresh () NOTHROW
1943{ 1998{
1944 unsigned char must_clear, /* use draw_string not draw_image_string */ 1999 unsigned char have_bg,
1945 showcursor; /* show the cursor */ 2000 showcursor; /* show the cursor */
1946 int16_t col, row, /* column/row we're processing */ 2001 int16_t col, row, /* column/row we're processing */
1947 ocrow; /* old cursor row */ 2002 ocrow; /* old cursor row */
1948 int i; /* tmp */ 2003 int i; /* tmp */
1949#ifndef NO_CURSORCOLOR 2004#ifndef NO_CURSORCOLOR
1950 rend_t cc1; /* store colours at cursor position (s) */ 2005 rend_t cc1; /* store colours at cursor position (s) */
1951#endif 2006#endif
1952 rend_t *crp; // cursor rendition pointer 2007 rend_t *crp; // cursor rendition pointer
2008 rend_t ccol1, /* Cursor colour */
2009 ccol2; /* Cursor colour2 */
1953 2010
1954 want_refresh = 0; /* screen is current */ 2011 want_refresh = 0; /* screen is current */
1955 2012
1956 if (refresh_type == NO_REFRESH || !mapped) 2013 if (refresh_type == NO_REFRESH || !mapped)
1957 return; 2014 return;
1958 2015
1959 /* 2016 /*
1960 * A: set up vars 2017 * A: set up vars
1961 */ 2018 */
1962 must_clear = 0;
1963 refresh_count = 0; 2019 refresh_count = 0;
1964 2020
1965#if XPM_BACKGROUND 2021 have_bg = 0;
2022#ifdef HAVE_BG_PIXMAP
1966 must_clear |= bgPixmap.pixmap != None; 2023 have_bg = bgPixmap.pixmap != None;
1967#endif
1968#if TRANSPARENT
1969 must_clear |= OPTION (Opt_transparent) && am_transparent;
1970#endif 2024#endif
1971 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2025 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1972 2026
1973 /* 2027 /*
1974 * B: reverse any characters which are selected 2028 * B: reverse any characters which are selected
… …
1978 /* 2032 /*
1979 * C: set the cursor character (s) 2033 * C: set the cursor character (s)
1980 */ 2034 */
1981 { 2035 {
1982 unsigned char setoldcursor; 2036 unsigned char setoldcursor;
1983 rend_t ccol1, /* Cursor colour */
1984 ccol2; /* Cursor colour2 */
1985 2037
1986 showcursor = (screen.flags & Screen_VisibleCursor); 2038 showcursor = (screen.flags & Screen_VisibleCursor);
1987#ifdef CURSOR_BLINK 2039#ifdef CURSOR_BLINK
1988 if (hidden_cursor) 2040 if (hidden_cursor)
1989 showcursor = 0; 2041 showcursor = 0;
… …
1996 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2048 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1997 col--; 2049 col--;
1998 2050
1999 crp = &ROW(screen.cur.row).r[col]; 2051 crp = &ROW(screen.cur.row).r[col];
2000 2052
2053#ifndef NO_CURSORCOLOR
2054 cc1 = *crp & (RS_fgMask | RS_bgMask);
2055 if (ISSET_PIXCOLOR (Color_cursor))
2056 ccol1 = Color_cursor;
2057 else
2058#endif
2059#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2060 ccol1 = fgcolor_of (rstyle);
2061#else
2062 ccol1 = Color_fg;
2063#endif
2064
2065#ifndef NO_CURSORCOLOR
2066 if (ISSET_PIXCOLOR (Color_cursor2))
2067 ccol2 = Color_cursor2;
2068 else
2069#endif
2070#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2071 ccol2 = bgcolor_of (rstyle);
2072#else
2073 ccol2 = Color_bg;
2074#endif
2075
2001 if (showcursor && focus) 2076 if (showcursor && focus)
2002 { 2077 {
2003 if (OPTION (Opt_cursorUnderline)) 2078 if (option (Opt_cursorUnderline))
2004 *crp ^= RS_Uline; 2079 *crp ^= RS_Uline;
2005 else 2080 else
2006 { 2081 {
2007 *crp ^= RS_RVid; 2082 *crp ^= RS_RVid;
2008
2009#ifndef NO_CURSORCOLOR
2010 cc1 = *crp & (RS_fgMask | RS_bgMask);
2011 if (ISSET_PIXCOLOR (Color_cursor))
2012 ccol1 = Color_cursor;
2013 else
2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2015 ccol1 = fgcolor_of (rstyle);
2016#else
2017 ccol1 = Color_fg;
2018#endif
2019 if (ISSET_PIXCOLOR (Color_cursor2))
2020 ccol2 = Color_cursor2;
2021 else
2022#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2023 ccol2 = bgcolor_of (rstyle);
2024#else
2025 ccol2 = Color_bg;
2026#endif
2027 *crp = SET_FGCOLOR (*crp, ccol1); 2083 *crp = SET_FGCOLOR (*crp, ccol1);
2028 *crp = SET_BGCOLOR (*crp, ccol2); 2084 *crp = SET_BGCOLOR (*crp, ccol2);
2029#endif
2030 } 2085 }
2031 } 2086 }
2032 } 2087 }
2033 2088
2034 /* make sure no outline cursor is left around */ 2089 /* make sure no outline cursor is left around */
… …
2071#ifndef NO_SLOW_LINK_SUPPORT 2126#ifndef NO_SLOW_LINK_SUPPORT
2072 /* 2127 /*
2073 * D: CopyArea pass - very useful for slower links 2128 * D: CopyArea pass - very useful for slower links
2074 * This has been deliberately kept simple. 2129 * This has been deliberately kept simple.
2075 */ 2130 */
2076 i = num_scr;
2077 if (!display->is_local 2131 if (!display->is_local
2078 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2132 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2079 && abs (num_scr) < nrow && !must_clear) 2133 && abs (num_scr) < nrow && !have_bg)
2080 { 2134 {
2081 int16_t nits; 2135 int16_t nits;
2136 int i = num_scr;
2082 int j; 2137 int j;
2083 int len, wlen; 2138 int len, wlen;
2139 dLocal (int, num_scr);
2084 2140
2085 j = nrow; 2141 j = nrow;
2086 wlen = len = -1; 2142 wlen = len = -1;
2087 row = i > 0 ? 0 : j - 1; 2143 row = i > 0 ? 0 : j - 1;
2144
2088 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2145 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2089 { 2146 {
2090 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2147 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2091 { 2148 {
2092 line_t s = ROW(view_start + row); 2149 line_t s = ROW(view_start + row);
… …
2113 wlen = row; 2170 wlen = row;
2114 continue; 2171 continue;
2115 } 2172 }
2116 } 2173 }
2117 2174
2118 if (len != -1) 2175 if (len >= 0)
2119 { 2176 {
2120 /* also comes here at end if needed because of >= above */ 2177 /* also comes here at end if needed because of >= above */
2121 if (wlen < len) 2178 if (wlen < len)
2122 ::swap (wlen, len); 2179 ::swap (wlen, len);
2123 2180
2181 XGCValues gcv;
2182
2183 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2124 XCopyArea (display->display, vt, vt, 2184 XCopyArea (dpy, vt, vt,
2125 gc, 0, Row2Pixel (len + i), 2185 gc, 0, Row2Pixel (len + i),
2126 (unsigned int)this->width, 2186 (unsigned int)this->width,
2127 (unsigned int)Height2Pixel (wlen - len + 1), 2187 (unsigned int)Height2Pixel (wlen - len + 1),
2128 0, Row2Pixel (len)); 2188 0, Row2Pixel (len));
2189 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2190
2129 len = -1; 2191 len = -1;
2130 } 2192 }
2131 } 2193 }
2132 } 2194 }
2133#endif 2195#endif
… …
2157 continue; 2219 continue;
2158 2220
2159 // redraw one or more characters 2221 // redraw one or more characters
2160 2222
2161 // seek to the beginning of wide characters 2223 // seek to the beginning of wide characters
2162 while (stp[col] == NOCHAR && col > 0) 2224 while (expect_false (stp[col] == NOCHAR && col > 0))
2163 --col; 2225 --col;
2164 2226
2165 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2227 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2166 text_t *text = stp + col; 2228 text_t *text = stp + col;
2167 int count = 1; 2229 int count = 1;
… …
2189 count++; 2251 count++;
2190 2252
2191 if (stp[col] != dtp[col] 2253 if (stp[col] != dtp[col]
2192 || !RS_SAME (srp[col], drp[col])) 2254 || !RS_SAME (srp[col], drp[col]))
2193 { 2255 {
2194 if (must_clear && (i++ > count / 2)) 2256 if (have_bg && (i++ > count / 2))
2195 break; 2257 break;
2196 2258
2197 dtp[col] = stp[col]; 2259 dtp[col] = stp[col];
2198 drp[col] = rend; 2260 drp[col] = rend;
2199 i = 0; 2261 i = 0;
2200 } 2262 }
2201 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2263 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2202 break; 2264 break;
2203 } 2265 }
2204 2266
2205 col--; /* went one too far. move back */ 2267 col--; /* went one too far. move back */
2206 count -= i; /* dump any matching trailing chars */ 2268 count -= i; /* dump any matching trailing chars */
2207 2269
2208 // sometimes we optimize away the trailing NOCHAR's, add them back 2270 // sometimes we optimize away the trailing NOCHAR's, add them back
2209 while (i && text[count] == NOCHAR) 2271 while (expect_false (i && text[count] == NOCHAR))
2210 count++, i--; 2272 count++, i--;
2211 2273
2212 /* 2274 /*
2213 * Determine the attributes for the string 2275 * Determine the attributes for the string
2214 */ 2276 */
2215 int fore = fgcolor_of (rend); // desired foreground 2277 int fore = fgcolor_of (rend); // desired foreground
2216 int back = bgcolor_of (rend); // desired background 2278 int back = bgcolor_of (rend); // desired background
2217 2279
2218 // only do special processing if any attributes are set, which is unlikely 2280 // only do special processing if any attributes are set, which is unlikely
2219 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2281 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2220 { 2282 {
2221#if ENABLE_STYLES
2222 // force redraw after "careful" characters to avoid pixel droppings
2223 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2224 drp[col + 1] = ~srp[col + 1];
2225
2226 // include previous careful character(s) if possible, looks nicer (best effort...)
2227 while (text > stp
2228 && srp[text - stp - 1] & RS_Careful
2229 && RS_SAME (rend, srp[text - stp - 1]))
2230 text--, count++, xpixel -= fwidth;
2231#endif
2232
2233 bool invert = rend & RS_RVid; 2283 bool invert = rend & RS_RVid;
2234 2284
2235#ifndef NO_BOLD_UNDERLINE_REVERSE 2285#ifndef NO_BOLD_UNDERLINE_REVERSE
2236 if (rend & RS_Bold
2237 && fore == Color_fg) 2286 if (rend & RS_Bold && fore == Color_fg)
2238 { 2287 {
2239 if (ISSET_PIXCOLOR (Color_BD)) 2288 if (ISSET_PIXCOLOR (Color_BD))
2240 fore = Color_BD; 2289 fore = Color_BD;
2241# if !ENABLE_STYLES 2290# if !ENABLE_STYLES
2242 else 2291 else
2243 invert = !invert; 2292 invert = !invert;
2244# endif 2293# endif
2245 } 2294 }
2246 2295
2247 if (rend & RS_Italic 2296 if (rend & RS_Italic && fore == Color_fg)
2248 && fore == Color_fg)
2249 { 2297 {
2250 if (ISSET_PIXCOLOR (Color_IT)) 2298 if (ISSET_PIXCOLOR (Color_IT))
2251 fore = Color_IT; 2299 fore = Color_IT;
2252# if !ENABLE_STYLES 2300# if !ENABLE_STYLES
2253 else 2301 else
2254 invert = !invert; 2302 invert = !invert;
2255# endif 2303# endif
2256 } 2304 }
2257 2305
2258 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2306 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2259 fore = Color_UL; 2307 fore = Color_UL;
2260#endif 2308#endif
2261 2309
2262 if (invert) 2310 if (invert)
2263 { 2311 {
2312#ifdef OPTION_HC
2313 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2314 || !ISSET_PIXCOLOR (Color_HC))
2315#endif
2316 /* invert the column if no highlightColor is set or it is the
2317 * current cursor column */
2264 ::swap (fore, back); 2318 ::swap (fore, back);
2319#ifdef OPTION_HC
2320 else if (ISSET_PIXCOLOR (Color_HC))
2321 back = Color_HC;
2322#endif
2265 2323
2266#ifndef NO_BOLD_UNDERLINE_REVERSE 2324#ifndef NO_BOLD_UNDERLINE_REVERSE
2325# ifndef OPTION_HC
2267 if (ISSET_PIXCOLOR (Color_RV)) 2326 if (ISSET_PIXCOLOR (Color_RV))
2268 back = Color_RV; 2327 back = Color_RV;
2269 2328# endif
2270 if (fore == back) 2329 if (fore == back)
2271 { 2330 {
2272 fore = Color_bg; 2331 fore = Color_bg;
2273 back = Color_fg; 2332 back = Color_fg;
2274 } 2333 }
… …
2276 } 2335 }
2277 2336
2278#ifdef TEXT_BLINK 2337#ifdef TEXT_BLINK
2279 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2338 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2280 { 2339 {
2281 if (!text_blink_ev.active) 2340 if (!text_blink_ev.is_active ())
2282 { 2341 {
2283 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2342 text_blink_ev.again ();
2284 hidden_text = 0; 2343 hidden_text = 0;
2285 } 2344 }
2286 else if (hidden_text) 2345 else if (hidden_text)
2287 fore = back; 2346 fore = back;
2288 } 2347 }
2289#endif 2348#endif
2349
2350#if ENABLE_STYLES
2351 // "careful" (too wide) character handling
2352
2353 // include previous careful character(s) if possible, looks nicer (best effort...)
2354 while (text > stp
2355 && srp[text - stp - 1] & RS_Careful
2356 && RS_SAME (rend, srp[text - stp - 1]))
2357 text--, count++, xpixel -= fwidth;
2358
2359 // force redraw after "careful" characters to avoid pixel droppings
2360 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2361 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2362
2363 // force redraw before "careful" characters to avoid pixel droppings
2364 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2365 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2366#endif
2290 } 2367 }
2291 2368
2292 /* 2369 /*
2293 * Actually do the drawing of the string here 2370 * Actually do the drawing of the string here
2294 */ 2371 */
2295 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2372 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2296 2373
2297 if (back == fore) 2374 if (expect_true (have_bg && back == Color_bg))
2298 font->clear_rect (*drawable, xpixel, ypixel,
2299 fwidth * count, fheight,
2300 back);
2301 else if (back == Color_bg)
2302 { 2375 {
2303 if (must_clear) 2376 // this is very ugly, maybe push it into ->draw?
2304 {
2305 CLEAR_CHARS (xpixel, ypixel, count);
2306 2377
2307 for (i = 0; i < count; i++) /* don't draw empty strings */ 2378 for (i = 0; i < count; i++) /* don't draw empty strings */
2308 if (text[i] != ' ') 2379 if (text[i] != ' ')
2309 { 2380 {
2310 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2381 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2311 break; 2382 goto did_clear;
2312 }
2313 } 2383 }
2314 else 2384
2315 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2385 CLEAR_CHARS (xpixel, ypixel, count);
2386 did_clear: ;
2316 } 2387 }
2317 else 2388 else
2318 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2389 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2319 2390
2320 if (rend & RS_Uline && font->descent > 1 && fore != back) 2391 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2321 { 2392 {
2322#if ENABLE_FRILLS 2393#if ENABLE_FRILLS
2323 if (ISSET_PIXCOLOR (Color_underline)) 2394 if (ISSET_PIXCOLOR (Color_underline))
2324 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2395 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2325 else 2396 else
2326#endif 2397#endif
2327 XSetForeground (display->display, gc, pix_colors[fore]); 2398 XSetForeground (dpy, gc, pix_colors[fore]);
2328 2399
2329 XDrawLine (display->display, drawBuffer, gc, 2400 XDrawLine (dpy, vt, gc,
2330 xpixel, ypixel + font->ascent + 1, 2401 xpixel, ypixel + font->ascent + 1,
2331 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2402 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2332 } 2403 }
2333 } /* for (col....) */ 2404 } /* for (col....) */
2334 } /* for (row....) */ 2405 } /* for (row....) */
… …
2343 */ 2414 */
2344 if (showcursor) 2415 if (showcursor)
2345 { 2416 {
2346 if (focus) 2417 if (focus)
2347 { 2418 {
2348 if (OPTION (Opt_cursorUnderline)) 2419 if (option (Opt_cursorUnderline))
2349 *crp ^= RS_Uline; 2420 *crp ^= RS_Uline;
2350 else 2421 else
2351 { 2422 {
2352 *crp ^= RS_RVid; 2423 *crp ^= RS_RVid;
2353#ifndef NO_CURSORCOLOR 2424#ifndef NO_CURSORCOLOR
… …
2367 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2438 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2368 cursorwidth++; 2439 cursorwidth++;
2369 2440
2370#ifndef NO_CURSORCOLOR 2441#ifndef NO_CURSORCOLOR
2371 if (ISSET_PIXCOLOR (Color_cursor)) 2442 if (ISSET_PIXCOLOR (Color_cursor))
2372 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2443 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2444 else
2373#endif 2445#endif
2446 XSetForeground (dpy, gc, pix_colors[ccol1]);
2374 2447
2375 XDrawRectangle (display->display, drawBuffer, gc, 2448 XDrawRectangle (dpy, vt, gc,
2376 Col2Pixel (col), 2449 Col2Pixel (col),
2377 Row2Pixel (oldcursor.row), 2450 Row2Pixel (oldcursor.row),
2378 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2451 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2379 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2452 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2380 } 2453 }
… …
2388 num_scr = 0; 2461 num_scr = 0;
2389 num_scr_allow = 1; 2462 num_scr_allow = 1;
2390} 2463}
2391 2464
2392void 2465void
2393rxvt_term::scr_remap_chars (line_t &l) 2466rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2394{ 2467{
2395 if (!l.t) 2468 if (!l.t)
2396 return; 2469 return;
2397 2470
2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2471 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2400 for (int i = ncol; i--; ) 2473 for (int i = ncol; i--; )
2401 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2474 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2402} 2475}
2403 2476
2404void 2477void
2405rxvt_term::scr_remap_chars () 2478rxvt_term::scr_remap_chars () NOTHROW
2406{ 2479{
2407 for (int i = total_rows; i--; ) 2480 for (int i = total_rows; i--; )
2408 scr_remap_chars (row_buf [i]); 2481 scr_remap_chars (row_buf [i]);
2409 2482
2410 for (int i = nrow; i--; ) 2483 for (int i = nrow; i--; )
… …
2413 scr_remap_chars (swap_buf [i]); 2486 scr_remap_chars (swap_buf [i]);
2414 } 2487 }
2415} 2488}
2416 2489
2417void 2490void
2418rxvt_term::scr_recolour () 2491rxvt_term::scr_recolour () NOTHROW
2419{ 2492{
2420 if (1 2493#ifdef HAVE_BG_PIXMAP
2421#if TRANSPARENT 2494 bgPixmap.apply ();
2422 && !am_transparent 2495#else
2423#endif 2496
2424#if XPM_BACKGROUND
2425 && !bgPixmap.pixmap
2426#endif
2427 )
2428 {
2429 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2497 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2430 XClearWindow (display->display, parent[0]); 2498 XClearWindow (dpy, parent[0]);
2431 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2499 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2432#if HAVE_SCROLLBARS 2500
2433 if (scrollBar.win) 2501 if (scrollBar.win)
2434 { 2502 {
2435 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2503 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2436 scrollBar.setIdle (); 2504 scrollBar.state = STATE_IDLE;
2437 scrollbar_show (0); 2505 scrollBar.show (0);
2438 }
2439#endif
2440 } 2506 }
2441 2507
2508#endif
2509
2510 /* bgPixmap.apply () does not do the following : */
2442 scr_clear (); 2511 scr_clear ();
2443 scr_touch (true); 2512 scr_touch (true);
2444 want_refresh = 1; 2513 want_refresh = 1;
2445} 2514}
2446 2515
2447/* ------------------------------------------------------------------------- */ 2516/* ------------------------------------------------------------------------- */
2448void 2517void
2449rxvt_term::scr_clear (bool really) 2518rxvt_term::scr_clear (bool really) NOTHROW
2450{ 2519{
2451 if (!mapped) 2520 if (!mapped)
2452 return; 2521 return;
2453 2522
2454 num_scr_allow = 0; 2523 num_scr_allow = 0;
2455 want_refresh = 1; 2524 want_refresh = 1;
2456 2525
2457 if (really) 2526 if (really)
2458 XClearWindow (display->display, vt); 2527 XClearWindow (dpy, vt);
2459} 2528}
2460 2529
2461void 2530void
2462rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2531rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2463{ 2532{
2464 int view_end = view_start + nrow; 2533 int view_end = view_start + nrow;
2465 int row, col; 2534 int row, col;
2466 2535
2467 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2536 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2479 srp[col] ^= rstyle2; 2548 srp[col] ^= rstyle2;
2480 } 2549 }
2481} 2550}
2482 2551
2483void 2552void
2484rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2553rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2485{ 2554{
2486 int view_end = view_start + nrow; 2555 int view_end = view_start + nrow;
2487 int row, col; 2556 int row, col;
2488 2557
2489 if (beg_row >= view_start) 2558 if (beg_row >= view_start)
… …
2506 srp[col] ^= rstyle; 2575 srp[col] ^= rstyle;
2507} 2576}
2508 2577
2509/* ------------------------------------------------------------------------- */ 2578/* ------------------------------------------------------------------------- */
2510void 2579void
2511rxvt_term::scr_reverse_selection () 2580rxvt_term::scr_reverse_selection () NOTHROW
2512{ 2581{
2513 if (selection.op 2582 if (selection.op
2514 && current_screen == selection.screen 2583 && current_screen == selection.screen
2515 && selection.end.row >= view_start) 2584 && selection.end.row >= view_start)
2516 { 2585 {
2517#if ENABLE_FRILLS 2586#if !ENABLE_MINIMAL
2518 if (selection.rect) 2587 if (selection.rect)
2519 scr_xor_rect (selection.beg.row, selection.beg.col, 2588 scr_xor_rect (selection.beg.row, selection.beg.col,
2520 selection.end.row, selection.end.col, 2589 selection.end.row, selection.end.col,
2521 RS_RVid, RS_RVid | RS_Uline); 2590 RS_RVid, RS_RVid | RS_Uline);
2522 else 2591 else
… …
2532 * Dump the whole scrollback and screen to the passed filedescriptor. The 2601 * Dump the whole scrollback and screen to the passed filedescriptor. The
2533 * invoking routine must close the fd. 2602 * invoking routine must close the fd.
2534 */ 2603 */
2535#if 0 2604#if 0
2536void 2605void
2537rxvt_term::scr_dump (int fd) 2606rxvt_term::scr_dump (int fd) NOTHROW
2538{ 2607{
2539 int row, wrote; 2608 int row, wrote;
2540 unsigned int width, towrite; 2609 unsigned int width, towrite;
2541 char r1[] = "\n"; 2610 char r1[] = "\n";
2542 2611
2543 for (row = saveLines - nsaved; 2612 for (row = saveLines + top_row;
2544 row < saveLines + nrow - 1; row++) 2613 row < saveLines + nrow - 1; row++)
2545 { 2614 {
2546 width = row_buf[row].l >= 0 ? row_buf[row].l 2615 width = row_buf[row].l >= 0 ? row_buf[row].l
2547 : ncol; 2616 : ncol;
2548 for (towrite = width; towrite; towrite -= wrote) 2617 for (towrite = width; towrite; towrite -= wrote)
… …
2561 2630
2562/* ------------------------------------------------------------------------- * 2631/* ------------------------------------------------------------------------- *
2563 * CHARACTER SELECTION * 2632 * CHARACTER SELECTION *
2564 * ------------------------------------------------------------------------- */ 2633 * ------------------------------------------------------------------------- */
2565void 2634void
2566rxvt_term::selection_check (int check_more) 2635rxvt_term::selection_check (int check_more) NOTHROW
2567{ 2636{
2568 row_col_t pos; 2637 row_col_t pos;
2569 2638
2570 if (!selection.op) 2639 if (!selection.op)
2571 return; 2640 return;
… …
2592/* ------------------------------------------------------------------------- */ 2661/* ------------------------------------------------------------------------- */
2593/* 2662/*
2594 * Paste a selection direct to the command fd 2663 * Paste a selection direct to the command fd
2595 */ 2664 */
2596void 2665void
2597rxvt_term::paste (char *data, unsigned int len) 2666rxvt_term::paste (char *data, unsigned int len) NOTHROW
2598{ 2667{
2599 /* convert normal newline chars into common keyboard Return key sequence */ 2668 /* convert normal newline chars into common keyboard Return key sequence */
2600 for (unsigned int i = 0; i < len; i++) 2669 for (unsigned int i = 0; i < len; i++)
2601 if (data[i] == C0_LF) 2670 if (data[i] == C0_LF)
2602 data[i] = C0_CR; 2671 data[i] = C0_CR;
2603 2672
2673 if (priv_modes & PrivMode_BracketPaste)
2674 tt_printf ("\e[200~");
2675
2604 tt_write (data, len); 2676 tt_write (data, len);
2677
2678 if (priv_modes & PrivMode_BracketPaste)
2679 tt_printf ("\e[201~");
2605} 2680}
2606 2681
2607/* ------------------------------------------------------------------------- */ 2682/* ------------------------------------------------------------------------- */
2608/* 2683/*
2609 * Respond to a notification that a primary selection has been sent 2684 * Respond to a notification that a primary selection has been sent
2610 * EXT: SelectionNotify 2685 * EXT: SelectionNotify
2611 */ 2686 */
2612void 2687void
2613rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2614{ 2689{
2615 if (prop == None) /* check for failed XConvertSelection */ 2690 if (prop == None) /* check for failed XConvertSelection */
2616 { 2691 {
2617 if ((selection_type & Sel_CompoundText)) 2692 if ((selection_type & Sel_CompoundText))
2618 { 2693 {
… …
2638 } 2713 }
2639 2714
2640 unsigned long bytes_after; 2715 unsigned long bytes_after;
2641 XTextProperty ct; 2716 XTextProperty ct;
2642 2717
2643 if (XGetWindowProperty (display->display, win, prop, 2718 if (XGetWindowProperty (dpy, win, prop,
2644 0, PROP_SIZE / 4, 2719 0, PROP_SIZE / 4,
2645 delete_prop, AnyPropertyType, 2720 delete_prop, AnyPropertyType,
2646 &ct.encoding, &ct.format, 2721 &ct.encoding, &ct.format,
2647 &ct.nitems, &bytes_after, 2722 &ct.nitems, &bytes_after,
2648 &ct.value) != Success) 2723 &ct.value) != Success)
… …
2657 if (bytes_after) 2732 if (bytes_after)
2658 { 2733 {
2659 // fetch and append remaining data 2734 // fetch and append remaining data
2660 XTextProperty ct2; 2735 XTextProperty ct2;
2661 2736
2662 if (XGetWindowProperty (display->display, win, prop, 2737 if (XGetWindowProperty (dpy, win, prop,
2663 ct.nitems / 4, (bytes_after + 3) / 4, 2738 ct.nitems / 4, (bytes_after + 3) / 4,
2664 delete_prop, AnyPropertyType, 2739 delete_prop, AnyPropertyType,
2665 &ct2.encoding, &ct2.format, 2740 &ct2.encoding, &ct2.format,
2666 &ct2.nitems, &bytes_after, 2741 &ct2.nitems, &bytes_after,
2667 &ct2.value) != Success) 2742 &ct2.value) != Success)
… …
2680 2755
2681 if (ct.encoding == xa[XA_INCR]) 2756 if (ct.encoding == xa[XA_INCR])
2682 { 2757 {
2683 // INCR selection, start handshake 2758 // INCR selection, start handshake
2684 if (!delete_prop) 2759 if (!delete_prop)
2685 XDeleteProperty (display->display, win, prop); 2760 XDeleteProperty (dpy, win, prop);
2686 2761
2687 selection_wait = Sel_incr; 2762 selection_wait = Sel_incr;
2688 incr_buf_fill = 0; 2763 incr_buf_fill = 0;
2689 incr_ev.start (NOW + 10); 2764 incr_ev.start (10);
2690 2765
2691 goto bailout; 2766 goto bailout;
2692 } 2767 }
2693 2768
2694 if (ct.nitems == 0) 2769 if (ct.nitems == 0)
… …
2703 ct.nitems = incr_buf_fill; 2778 ct.nitems = incr_buf_fill;
2704 incr_buf = 0; 2779 incr_buf = 0;
2705 incr_buf_size = 0; 2780 incr_buf_size = 0;
2706 incr_ev.stop (); 2781 incr_ev.stop ();
2707 } 2782 }
2708 else 2783 else
2709 { 2784 {
2710 if (selection_wait == Sel_normal 2785 if (selection_wait == Sel_normal
2711 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2786 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2712 { 2787 {
2713 /* 2788 /*
… …
2720 goto bailout; 2795 goto bailout;
2721 } 2796 }
2722 } 2797 }
2723 else if (selection_wait == Sel_incr) 2798 else if (selection_wait == Sel_incr)
2724 { 2799 {
2725 incr_ev.start (NOW + 10); 2800 incr_ev.start (10);
2726 2801
2727 while (incr_buf_fill + ct.nitems > incr_buf_size) 2802 while (incr_buf_fill + ct.nitems > incr_buf_size)
2728 { 2803 {
2729 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2804 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2730 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2805 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2737 } 2812 }
2738 2813
2739 char **cl; 2814 char **cl;
2740 int cr; 2815 int cr;
2741 2816
2742#if ENABLE_FRILLS 2817#if !ENABLE_MINIMAL
2743 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2818 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2744 // so recode it manually 2819 // so recode it manually
2745 if (ct.encoding == xa[XA_UTF8_STRING]) 2820 if (ct.encoding == xa[XA_UTF8_STRING])
2746 { 2821 {
2747 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2822 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2751 paste (s, strlen (s)); 2826 paste (s, strlen (s));
2752 free (s); 2827 free (s);
2753 } 2828 }
2754 else 2829 else
2755#endif 2830#endif
2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2831 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2757 && cl) 2832 && cl)
2758 { 2833 {
2759 for (int i = 0; i < cr; i++) 2834 for (int i = 0; i < cr; i++)
2760 paste (cl[i], strlen (cl[i])); 2835 paste (cl[i], strlen (cl[i]));
2761 2836
… …
2770 if (selection_wait == Sel_normal) 2845 if (selection_wait == Sel_normal)
2771 selection_wait = Sel_none; 2846 selection_wait = Sel_none;
2772} 2847}
2773 2848
2774void 2849void
2775rxvt_term::incr_cb (time_watcher &w) 2850rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2776{ 2851{
2777 selection_wait = Sel_none; 2852 selection_wait = Sel_none;
2778 2853
2779 incr_buf_size = 0; 2854 incr_buf_size = 0;
2780 free (incr_buf); 2855 free (incr_buf);
2781 2856
2782 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2857 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2783} 2858}
2784 2859
2785void 2860void
2786rxvt_term::selection_property (Window win, Atom prop) 2861rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2787{ 2862{
2788 if (prop == None || selection_wait != Sel_incr) 2863 if (prop == None || selection_wait != Sel_incr)
2789 return; 2864 return;
2790 2865
2791 selection_paste (win, prop, true); 2866 selection_paste (win, prop, true);
2792} 2867}
2793 2868
2794/* ------------------------------------------------------------------------- */ 2869/* ------------------------------------------------------------------------- */
2795/* 2870/*
2796 * Request the current selection: 2871 * Request the current selection:
2797 * Order: > internal selection if available 2872 * Order: > internal selection if available
2798 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2873 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2799 * > CUT_BUFFER0 2874 * > CUT_BUFFER0
2800 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2875 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2801 * will auto fallback to CUT_BUFFER0 2876 * will auto fallback to CUT_BUFFER0
2802 * EXT: button 2 release 2877 * EXT: button 2 release
2803 */ 2878 */
2804void 2879void
2805rxvt_term::selection_request (Time tm, int x, int y) 2880rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2806{ 2881{
2807 if (x < 0 || x >= width || y < 0 || y >= height) 2882 if (selection.text && selnum == Sel_Primary)
2808 return; /* outside window */ 2883 {
2809
2810 if (selection.text)
2811 { /* internal selection */ 2884 /* internal selection */
2812 char *str = rxvt_wcstombs (selection.text, selection.len); 2885 char *str = rxvt_wcstombs (selection.text, selection.len);
2813 paste (str, strlen (str)); 2886 paste (str, strlen (str));
2814 free (str); 2887 free (str);
2815 return; 2888 return;
2816 } 2889 }
2817 else 2890 else
2818 { 2891 {
2819 int i;
2820
2821 selection_request_time = tm; 2892 selection_request_time = tm;
2822 selection_wait = Sel_normal; 2893 selection_wait = Sel_normal;
2823 2894
2824 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2825 {
2826#if X_HAVE_UTF8_STRING 2895#if X_HAVE_UTF8_STRING
2827 selection_type = Sel_UTF8String; 2896 selection_type = Sel_UTF8String;
2828 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2897 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2829 return; 2898 return;
2830#else 2899#else
2831 selection_type = Sel_CompoundText; 2900 selection_type = Sel_CompoundText;
2832 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2901 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2833 return; 2902 return;
2834#endif 2903#endif
2835 }
2836 } 2904 }
2837 2905
2838 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2906 selection_wait = Sel_none; /* don't loop in selection_paste () */
2839 selection_paste (display->root, XA_CUT_BUFFER0, false); 2907 selection_paste (display->root, XA_CUT_BUFFER0, false);
2840} 2908}
2841 2909
2842int 2910int
2843rxvt_term::selection_request_other (Atom target, int selnum) 2911rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2844{ 2912{
2845 Atom sel; 2913 Atom sel;
2846 2914
2847 selection_type |= selnum; 2915 selection_type |= selnum;
2848 2916
… …
2851 else if (selnum == Sel_Secondary) 2919 else if (selnum == Sel_Secondary)
2852 sel = XA_SECONDARY; 2920 sel = XA_SECONDARY;
2853 else 2921 else
2854 sel = xa[XA_CLIPBOARD]; 2922 sel = xa[XA_CLIPBOARD];
2855 2923
2856 if (XGetSelectionOwner (display->display, sel) != None) 2924 if (XGetSelectionOwner (dpy, sel) != None)
2857 { 2925 {
2858 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2926 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2859 vt, selection_request_time); 2927 vt, selection_request_time);
2860 return 1; 2928 return 1;
2861 } 2929 }
2862 2930
2863 return 0; 2931 return 0;
… …
2867/* 2935/*
2868 * Clear all selected text 2936 * Clear all selected text
2869 * EXT: SelectionClear 2937 * EXT: SelectionClear
2870 */ 2938 */
2871void 2939void
2872rxvt_term::selection_clear () 2940rxvt_term::selection_clear () NOTHROW
2873{ 2941{
2874 want_refresh = 1; 2942 want_refresh = 1;
2875 free (selection.text); 2943 free (selection.text);
2876 selection.text = NULL; 2944 selection.text = NULL;
2877 selection.len = 0; 2945 selection.len = 0;
… …
2926 2994
2927 int end_col; 2995 int end_col;
2928 2996
2929 for (; row <= selection.end.row; row++, col = 0) 2997 for (; row <= selection.end.row; row++, col = 0)
2930 { 2998 {
2931#if ENABLE_FRILLS 2999#if !ENABLE_MINIMAL
2932 if (selection.rect) 3000 if (selection.rect)
2933 { 3001 {
2934 col = selection.beg.col; 3002 col = selection.beg.col;
2935 end_col = ncol + 1; 3003 end_col = ncol + 1;
2936 } 3004 }
… …
2939 end_col = ROW(row).l; 3007 end_col = ROW(row).l;
2940 3008
2941 col = max (col, 0); 3009 col = max (col, 0);
2942 3010
2943 if (row == selection.end.row 3011 if (row == selection.end.row
2944#if ENABLE_FRILLS 3012#if !ENABLE_MINIMAL
2945 || selection.rect 3013 || selection.rect
2946#endif 3014#endif
2947 ) 3015 )
2948 min_it (end_col, selection.end.col); 3016 min_it (end_col, selection.end.col);
2949 3017
… …
2972#endif 3040#endif
2973 else 3041 else
2974 new_selection_text[ofs++] = *t++; 3042 new_selection_text[ofs++] = *t++;
2975 } 3043 }
2976 3044
2977#if ENABLE_FRILLS 3045#if !ENABLE_MINIMAL
2978 if (selection.rect) 3046 if (selection.rect)
2979 { 3047 {
2980 while (ofs 3048 while (ofs
2981 && new_selection_text[ofs - 1] != C0_LF 3049 && new_selection_text[ofs - 1] != C0_LF
2982 && unicode::is_space (new_selection_text[ofs - 1])) 3050 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3012 3080
3013 selection_grab (tm); 3081 selection_grab (tm);
3014} 3082}
3015 3083
3016bool 3084bool
3017rxvt_term::selection_grab (Time tm) 3085rxvt_term::selection_grab (Time tm) NOTHROW
3018{ 3086{
3019 selection_time = tm; 3087 selection_time = tm;
3020 3088
3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3089 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3090 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3023 { 3091 {
3024 display->set_selection_owner (this); 3092 display->set_selection_owner (this);
3025 return true; 3093 return true;
3026 } 3094 }
3027 else 3095 else
… …
3031 } 3099 }
3032 3100
3033#if 0 3101#if 0
3034 XTextProperty ct; 3102 XTextProperty ct;
3035 3103
3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3104 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3037 { 3105 {
3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3106 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3039 XFree (ct.value); 3107 XFree (ct.value);
3040 } 3108 }
3041#endif 3109#endif
… …
3045/* 3113/*
3046 * Mark or select text based upon number of clicks: 1, 2, or 3 3114 * Mark or select text based upon number of clicks: 1, 2, or 3
3047 * EXT: button 1 press 3115 * EXT: button 1 press
3048 */ 3116 */
3049void 3117void
3050rxvt_term::selection_click (int clicks, int x, int y) 3118rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3051{ 3119{
3052 clicks = ((clicks - 1) % 3) + 1; 3120 clicks = ((clicks - 1) % 3) + 1;
3053 selection.clicks = clicks; /* save clicks so extend will work */ 3121 selection.clicks = clicks; /* save clicks so extend will work */
3054 3122
3055 if (clicks == 2 && !selection.rect 3123 if (clicks == 2 && !selection.rect
… …
3074/* ------------------------------------------------------------------------- */ 3142/* ------------------------------------------------------------------------- */
3075/* 3143/*
3076 * Mark a selection at the specified col/row 3144 * Mark a selection at the specified col/row
3077 */ 3145 */
3078void 3146void
3079rxvt_term::selection_start_colrow (int col, int row) 3147rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3080{ 3148{
3081 want_refresh = 1; 3149 want_refresh = 1;
3082 3150
3083 selection.mark.row = row + view_start; 3151 selection.mark.row = row + view_start;
3084 selection.mark.col = col; 3152 selection.mark.col = col;
… …
3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3155 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3088 3156
3089 while (selection.mark.col > 0 3157 while (selection.mark.col > 0
3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3158 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3091 --selection.mark.col; 3159 --selection.mark.col;
3092 3160
3093 if (selection.op) 3161 if (selection.op)
3162 {
3094 { /* clear the old selection */ 3163 /* clear the old selection */
3095 selection.beg.row = selection.end.row = selection.mark.row; 3164 selection.beg.row = selection.end.row = selection.mark.row;
3096 selection.beg.col = selection.end.col = selection.mark.col; 3165 selection.beg.col = selection.end.col = selection.mark.col;
3097 } 3166 }
3098 3167
3099 selection.op = SELECTION_INIT; 3168 selection.op = SELECTION_INIT;
… …
3110#define DELIMIT_TEXT(x) \ 3179#define DELIMIT_TEXT(x) \
3111 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3180 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3112#define DELIMIT_REND(x) 1 3181#define DELIMIT_REND(x) 1
3113 3182
3114void 3183void
3115rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3184rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3116{ 3185{
3117 int col, row, dirnadd, tcol, trow, w1, w2; 3186 int col, row, dirnadd, tcol, trow, w1, w2;
3118 row_col_t bound; 3187 row_col_t bound;
3119 text_t *stp; 3188 text_t *stp;
3120 rend_t *srp; 3189 rend_t *srp;
… …
3194 * flag == 0 ==> button 1 3263 * flag == 0 ==> button 1
3195 * flag == 1 ==> button 3 press 3264 * flag == 1 ==> button 3 press
3196 * flag == 2 ==> button 3 motion 3265 * flag == 2 ==> button 3 motion
3197 */ 3266 */
3198void 3267void
3199rxvt_term::selection_extend (int x, int y, int flag) 3268rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3200{ 3269{
3201 int col = clamp (Pixel2Col (x), 0, ncol); 3270 int col = clamp (Pixel2Col (x), 0, ncol);
3202 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3271 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3203 3272
3204 /* 3273 /*
… …
3230/* ------------------------------------------------------------------------- */ 3299/* ------------------------------------------------------------------------- */
3231/* 3300/*
3232 * Extend the selection to the specified col/row 3301 * Extend the selection to the specified col/row
3233 */ 3302 */
3234void 3303void
3235rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3304rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3236{ 3305{
3237 row_col_t pos; 3306 row_col_t pos;
3238 enum { 3307 enum {
3239 LEFT, RIGHT 3308 LEFT, RIGHT
3240 } closeto = RIGHT; 3309 } closeto = RIGHT;
… …
3288 * a point/word/line which is either the start or end of the selection 3357 * a point/word/line which is either the start or end of the selection
3289 * and it was decided by whichever point/word/line was `fixed' at the 3358 * and it was decided by whichever point/word/line was `fixed' at the
3290 * time of the most recent button3 press 3359 * time of the most recent button3 press
3291 */ 3360 */
3292 if (button3 && buttonpress) 3361 if (button3 && buttonpress)
3362 {
3293 { /* button3 press */ 3363 /* button3 press */
3294 /* 3364 /*
3295 * first determine which edge of the selection we are closest to 3365 * first determine which edge of the selection we are closest to
3296 */ 3366 */
3297 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3367 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3298 || (!ROWCOL_IS_AFTER (pos, selection.end) 3368 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3316 selection.mark.row = selection.beg.row; 3386 selection.mark.row = selection.beg.row;
3317 selection.mark.col = selection.beg.col; 3387 selection.mark.col = selection.beg.col;
3318 } 3388 }
3319 } 3389 }
3320 else 3390 else
3391 {
3321 { /* button1 drag or button3 drag */ 3392 /* button1 drag or button3 drag */
3322 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3393 if (ROWCOL_IS_AFTER (selection.mark, pos))
3323 { 3394 {
3324 if (selection.mark.row == selection.end.row 3395 if (selection.mark.row == selection.end.row
3325 && selection.mark.col == selection.end.col 3396 && selection.mark.col == selection.end.col
3326 && clickchange 3397 && clickchange
… …
3343 3414
3344 if (selection.clicks == 1) 3415 if (selection.clicks == 1)
3345 { 3416 {
3346 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3417 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3347 && !ROW(selection.beg.row).is_longer () 3418 && !ROW(selection.beg.row).is_longer ()
3348#if ENABLE_FRILLS 3419#if !ENABLE_MINIMAL
3349 && !selection.rect 3420 && !selection.rect
3350#endif 3421#endif
3351 ) 3422 )
3352 selection.beg.col = ncol; 3423 selection.beg.col = ncol;
3353 3424
3354 if ( 3425 if (
3355 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3426 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3356 && !ROW(selection.end.row).is_longer () 3427 && !ROW(selection.end.row).is_longer ()
3357#if ENABLE_FRILLS 3428#if !ENABLE_MINIMAL
3358 && !selection.rect 3429 && !selection.rect
3359#endif 3430#endif
3360 ) 3431 )
3361 selection.end.col = ncol; 3432 selection.end.col = ncol;
3362 } 3433 }
… …
3369 selection_delimit_word (DN, &selection.end, &selection.end); 3440 selection_delimit_word (DN, &selection.end, &selection.end);
3370 } 3441 }
3371 else if (selection.clicks == 3) 3442 else if (selection.clicks == 3)
3372 { 3443 {
3373#if ENABLE_FRILLS 3444#if ENABLE_FRILLS
3374 if (OPTION (Opt_tripleclickwords)) 3445 if (option (Opt_tripleclickwords))
3375 { 3446 {
3376 selection_delimit_word (UP, &selection.beg, &selection.beg); 3447 selection_delimit_word (UP, &selection.beg, &selection.beg);
3377 3448
3378 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3449 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3379 { 3450 {
3380 if (!ROW(end_row).is_longer ()) 3451 if (!ROW(end_row).is_longer ())
3381 { 3452 {
3382 selection.end.row = end_row; 3453 selection.end.row = end_row;
3383 selection.end.col = ROW(end_row).l; 3454 selection.end.col = ROW(end_row).l;
3455# if !ENABLE_MINIMAL
3384 selection_remove_trailing_spaces (); 3456 selection_remove_trailing_spaces ();
3457# endif
3385 break; 3458 break;
3386 } 3459 }
3387 } 3460 }
3388 } 3461 }
3389 else 3462 else
… …
3405 selection.end.row++; 3478 selection.end.row++;
3406 } 3479 }
3407 } 3480 }
3408 3481
3409 if (button3 && buttonpress) 3482 if (button3 && buttonpress)
3483 {
3410 { /* mark may need to be changed */ 3484 /* mark may need to be changed */
3411 if (closeto == LEFT) 3485 if (closeto == LEFT)
3412 { 3486 {
3413 selection.mark.row = selection.end.row; 3487 selection.mark.row = selection.end.row;
3414 selection.mark.col = selection.end.col - (selection.clicks == 2); 3488 selection.mark.col = selection.end.col - (selection.clicks == 2);
3415 } 3489 }
… …
3418 selection.mark.row = selection.beg.row; 3492 selection.mark.row = selection.beg.row;
3419 selection.mark.col = selection.beg.col; 3493 selection.mark.col = selection.beg.col;
3420 } 3494 }
3421 } 3495 }
3422 3496
3423#if ENABLE_FRILLS 3497#if !ENABLE_MINIMAL
3424 if (selection.rect && selection.beg.col > selection.end.col) 3498 if (selection.rect && selection.beg.col > selection.end.col)
3425 ::swap (selection.beg.col, selection.end.col); 3499 ::swap (selection.beg.col, selection.end.col);
3426#endif 3500#endif
3427} 3501}
3428 3502
3429#if ENABLE_FRILLS 3503#if !ENABLE_MINIMAL
3430void 3504void
3431rxvt_term::selection_remove_trailing_spaces () 3505rxvt_term::selection_remove_trailing_spaces () NOTHROW
3432{ 3506{
3433 int32_t end_col, end_row; 3507 int32_t end_col, end_row;
3434 text_t *stp; 3508 text_t *stp;
3435 3509
3436 end_col = selection.end.col; 3510 end_col = selection.end.col;
… …
3474/* 3548/*
3475 * Double click on button 3 when already selected 3549 * Double click on button 3 when already selected
3476 * EXT: button 3 double click 3550 * EXT: button 3 double click
3477 */ 3551 */
3478void 3552void
3479rxvt_term::selection_rotate (int x, int y) 3553rxvt_term::selection_rotate (int x, int y) NOTHROW
3480{ 3554{
3481 selection.clicks = selection.clicks % 3 + 1; 3555 selection.clicks = selection.clicks % 3 + 1;
3482 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3556 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3483} 3557}
3484 3558
… …
3486/* 3560/*
3487 * Respond to a request for our current selection 3561 * Respond to a request for our current selection
3488 * EXT: SelectionRequest 3562 * EXT: SelectionRequest
3489 */ 3563 */
3490void 3564void
3491rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3565rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3492{ 3566{
3493 XSelectionEvent ev; 3567 XSelectionEvent ev;
3494 dDisp;
3495 3568
3496 ev.type = SelectionNotify; 3569 ev.type = SelectionNotify;
3497 ev.property = None; 3570 ev.property = None;
3498 ev.display = rq.display; 3571 ev.display = rq.display;
3499 ev.requestor = rq.requestor; 3572 ev.requestor = rq.requestor;
… …
3513 *target++ = xa[XA_COMPOUND_TEXT]; 3586 *target++ = xa[XA_COMPOUND_TEXT];
3514#if X_HAVE_UTF8_STRING 3587#if X_HAVE_UTF8_STRING
3515 *target++ = xa[XA_UTF8_STRING]; 3588 *target++ = xa[XA_UTF8_STRING];
3516#endif 3589#endif
3517 3590
3518 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3591 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3519 32, PropModeReplace, 3592 32, PropModeReplace,
3520 (unsigned char *)target_list, target - target_list); 3593 (unsigned char *)target_list, target - target_list);
3521 ev.property = rq.property; 3594 ev.property = rq.property;
3522 } 3595 }
3523#if TODO // TODO 3596#if TODO // TODO
… …
3526 /* TODO: Handle MULTIPLE */ 3599 /* TODO: Handle MULTIPLE */
3527 } 3600 }
3528#endif 3601#endif
3529 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3602 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3530 { 3603 {
3531 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3604 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3532 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3605 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3533 ev.property = rq.property; 3606 ev.property = rq.property;
3534 } 3607 }
3535 else if (rq.target == XA_STRING 3608 else if (rq.target == XA_STRING
3536 || rq.target == xa[XA_TEXT] 3609 || rq.target == xa[XA_TEXT]
… …
3560 style = enc_string; 3633 style = enc_string;
3561 else if (target == xa[XA_TEXT]) 3634 else if (target == xa[XA_TEXT])
3562 style = enc_text; 3635 style = enc_text;
3563 else if (target == xa[XA_COMPOUND_TEXT]) 3636 else if (target == xa[XA_COMPOUND_TEXT])
3564 style = enc_compound_text; 3637 style = enc_compound_text;
3565#if ENABLE_FRILLS 3638#if !ENABLE_MINIMAL
3566 else if (target == xa[XA_UTF8_STRING]) 3639 else if (target == xa[XA_UTF8_STRING])
3567 style = enc_utf8; 3640 style = enc_utf8;
3568#endif 3641#endif
3569 else 3642 else
3570 { 3643 {
… …
3581 { 3654 {
3582 cl = L""; 3655 cl = L"";
3583 selectlen = 0; 3656 selectlen = 0;
3584 } 3657 }
3585 3658
3586#if ENABLE_FRILLS 3659#if !ENABLE_MINIMAL
3587 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3660 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3588 // so recode it manually 3661 // so recode it manually
3589 if (style == enc_utf8) 3662 if (style == enc_utf8)
3590 { 3663 {
3591 freect = 1; 3664 freect = 1;
… …
3594 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3667 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3595 ct.nitems = strlen ((char *)ct.value); 3668 ct.nitems = strlen ((char *)ct.value);
3596 } 3669 }
3597 else 3670 else
3598#endif 3671#endif
3599 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3672 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3600 freect = 1; 3673 freect = 1;
3601 else 3674 else
3602 { 3675 {
3603 /* if we failed to convert then send it raw */ 3676 /* if we failed to convert then send it raw */
3604 ct.value = (unsigned char *)cl; 3677 ct.value = (unsigned char *)cl;
3605 ct.nitems = selectlen; 3678 ct.nitems = selectlen;
3606 ct.encoding = target; 3679 ct.encoding = target;
3607 } 3680 }
3608 3681
3609 XChangeProperty (disp, rq.requestor, rq.property, 3682 XChangeProperty (dpy, rq.requestor, rq.property,
3610 ct.encoding, 8, PropModeReplace, 3683 ct.encoding, 8, PropModeReplace,
3611 ct.value, (int)ct.nitems); 3684 ct.value, (int)ct.nitems);
3612 ev.property = rq.property; 3685 ev.property = rq.property;
3613 3686
3614 if (freect) 3687 if (freect)
3615 XFree (ct.value); 3688 XFree (ct.value);
3616 } 3689 }
3617 3690
3618 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3691 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3619}
3620
3621/* ------------------------------------------------------------------------- *
3622 * MOUSE ROUTINES *
3623 * ------------------------------------------------------------------------- */
3624
3625/*
3626 * return col/row values corresponding to x/y pixel values
3627 */
3628void
3629rxvt_term::pixel_position (int *x, int *y)
3630{
3631 *x = Pixel2Col (*x);
3632 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3633 *y = Pixel2Row (*y);
3634 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3635} 3692}
3636 3693
3637/* ------------------------------------------------------------------------- */ 3694/* ------------------------------------------------------------------------- */
3638#ifdef USE_XIM 3695#ifdef USE_XIM
3639void 3696void
3640rxvt_term::im_set_position (XPoint &pos) 3697rxvt_term::im_set_position (XPoint &pos) NOTHROW
3641{ 3698{
3642 XWindowAttributes xwa; 3699 XWindowAttributes xwa;
3643 3700
3644 XGetWindowAttributes (display->display, vt, &xwa); 3701 XGetWindowAttributes (dpy, vt, &xwa);
3645 3702
3646 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3703 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3647 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3704 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3648} 3705}
3649#endif 3706#endif
3650 3707
3651#if ENABLE_OVERLAY 3708#if ENABLE_OVERLAY
3652void 3709void
3653rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3710rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3654{ 3711{
3655 if (nrow < 1 || ncol < 1) 3712 if (nrow < 1 || ncol < 1)
3656 return; 3713 return;
3657 3714
3658 want_refresh = 1; 3715 want_refresh = 1;
… …
3703 *rp = r; 3760 *rp = r;
3704 } 3761 }
3705} 3762}
3706 3763
3707void 3764void
3708rxvt_term::scr_overlay_off () 3765rxvt_term::scr_overlay_off () NOTHROW
3709{ 3766{
3710 if (!ov_text) 3767 if (!ov_text)
3711 return; 3768 return;
3712 3769
3713 want_refresh = 1; 3770 want_refresh = 1;
… …
3721 delete [] ov_text; ov_text = 0; 3778 delete [] ov_text; ov_text = 0;
3722 delete [] ov_rend; ov_rend = 0; 3779 delete [] ov_rend; ov_rend = 0;
3723} 3780}
3724 3781
3725void 3782void
3726rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3783rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3727{ 3784{
3728 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3785 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3729 return; 3786 return;
3730 3787
3731 x++, y++; 3788 x++, y++;
… …
3733 ov_text[y][x] = text; 3790 ov_text[y][x] = text;
3734 ov_rend[y][x] = rend; 3791 ov_rend[y][x] = rend;
3735} 3792}
3736 3793
3737void 3794void
3738rxvt_term::scr_overlay_set (int x, int y, const char *s) 3795rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3739{ 3796{
3740 while (*s) 3797 while (*s)
3741 scr_overlay_set (x++, y, *s++); 3798 scr_overlay_set (x++, y, *s++);
3742} 3799}
3743 3800
3744void 3801void
3745rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3802rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3746{ 3803{
3747 while (*s) 3804 while (*s)
3748 { 3805 {
3749 text_t t = *s++; 3806 text_t t = *s++;
3750 int width = wcwidth (t); 3807 int width = WCWIDTH (t);
3751 3808
3752 while (width--) 3809 while (width--)
3753 { 3810 {
3754 scr_overlay_set (x++, y, t); 3811 scr_overlay_set (x++, y, t);
3755 t = NOCHAR; 3812 t = NOCHAR;
3756 } 3813 }
3757 } 3814 }
3758} 3815}
3759 3816
3760void 3817void
3761rxvt_term::scr_swap_overlay () 3818rxvt_term::scr_swap_overlay () NOTHROW
3762{ 3819{
3763 if (!ov_text) 3820 if (!ov_text)
3764 return; 3821 return;
3765 3822
3766 // swap screen mem with overlay 3823 // swap screen mem with overlay

Diff Legend

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