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.212 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.340 by sf-exg, Sat Apr 17 23:00:45 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines