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.214 by root, Sun Jan 8 00:07:18 2006 UTC vs.
Revision 1.382 by sf-exg, Tue Apr 26 16:19:45 2011 UTC

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

Diff Legend

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