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.341 by root, Sat Apr 17 23:05:48 2010 UTC

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

Diff Legend

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