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.348 by sf-exg, Sat Oct 9 22:33:45 2010 UTC

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

Diff Legend

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