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

Diff Legend

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