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

Diff Legend

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