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

Diff Legend

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