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.346 by sf-exg, Mon Jul 26 09:57:53 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 // ... artificially enlargen the previous one
854
855 // find begin
856 while (col > 0 && line->t[col] == NOCHAR)
857 col--;
858
859 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
860
861 // found begin, nuke
862 do {
863 line->t[col] = ' ';
864 line->r[col] = rend;
865 col++;
866 } while (col < ncol && line->t[col] == NOCHAR);
867 }
868
869 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
870
871 // if the character doesn't fit into the remaining columns...
872 if (screen.cur.col > ncol - width && ncol >= width)
873 {
874 // ...output spaces
875 c = ' '; 917 c = NOCHAR;
876 // and try the same character next loop iteration 918 // and try the same character next loop iteration
877 --str; 919 --str;
878 } 920 }
879 921
880 line->touch (); 922 line->touch ();
… …
882 do 924 do
883 { 925 {
884 line->t[screen.cur.col] = c; 926 line->t[screen.cur.col] = c;
885 line->r[screen.cur.col] = rend; 927 line->r[screen.cur.col] = rend;
886 928
887 if (screen.cur.col < ncol - 1) 929 if (expect_true (screen.cur.col < ncol - 1))
888 screen.cur.col++; 930 screen.cur.col++;
889 else 931 else
890 { 932 {
891 line->l = ncol; 933 line->l = ncol;
892 if (screen.flags & Screen_Autowrap) 934 if (screen.flags & Screen_Autowrap)
… …
894 break; 936 break;
895 } 937 }
896 938
897 c = NOCHAR; 939 c = NOCHAR;
898 } 940 }
899 while (--width > 0); 941 while (expect_false (--width > 0));
900 942
901 // pad with spaces when overwriting wide character with smaller one 943 // pad with spaces when overwriting wide character with smaller one
902 if (!width) 944 if (expect_false (!width))
903 { 945 {
904 line->touch (); 946 line->touch ();
905 947
906 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
907 { 949 {
908 line->t[c] = ' '; 950 line->t[c] = ' ';
909 line->r[c] = rend; 951 line->r[c] = rend;
910 } 952 }
911 } 953 }
912 } 954 }
955#if ENABLE_COMBINING
913 else // width == 0 956 else // width == 0
914 { 957 {
915#if ENABLE_COMBINING 958 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 { 959 {
960 // handle combining characters
961 // we just tag the accent on the previous on-screen character.
962 // this is arguably not correct, but also arguably not wrong.
963 // we don't handle double-width characters nicely yet.
964 line_t *linep;
965 text_t *tp;
966 rend_t *rp;
967
968 if (screen.cur.col > 0)
969 {
926 linep = line; 970 linep = line;
927 tp = line->t + screen.cur.col - 1; 971 tp = line->t + screen.cur.col - 1;
928 rp = line->r + screen.cur.col - 1; 972 rp = line->r + screen.cur.col - 1;
973 }
974 else if (screen.cur.row > 0
975 && ROW(screen.cur.row - 1).is_longer ())
976 {
977 linep = &ROW(screen.cur.row - 1);
978 tp = line->t + ncol - 1;
979 rp = line->r + ncol - 1;
980 }
981 else
982 continue;
983
984 linep->touch ();
985
986 while (*tp == NOCHAR && tp > linep->t)
987 tp--, rp--;
988
989 // first try to find a precomposed character
990 unicode_t n = rxvt_compose (*tp, c);
991 if (n == NOCHAR)
992 n = rxvt_composite.compose (*tp, c);
993
994 *tp = n;
995 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
929 } 996 }
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 } 997 }
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 998#endif
953 }
954 } 999 }
955 1000
956 max_it (line->l, screen.cur.col); 1001 max_it (line->l, screen.cur.col);
957 1002
958#ifdef DEBUG_STRICT
959 assert (screen.cur.row >= 0); 1003 assert (screen.cur.row >= 0);
960#endif
961} 1004}
962 1005
963/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
964/* 1007/*
965 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
966 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
967 */ 1010 */
968void 1011void
969rxvt_term::scr_backspace () 1012rxvt_term::scr_backspace () NOTHROW
970{ 1013{
971 want_refresh = 1;
972
973 if (screen.cur.col == 0) 1014 if (screen.cur.col == 0)
974 { 1015 {
975 if (screen.cur.row > 0) 1016 if (screen.cur.row > 0)
976 { 1017 {
977#ifdef TERMCAP_HAS_BW 1018#ifdef TERMCAP_HAS_BW
978 screen.cur.col = ncol - 1; 1019 screen.cur.col = ncol - 1;
979 screen.cur.row--; 1020 --screen.cur.row;
980 return; 1021
1022 want_refresh = 1;
981#endif 1023#endif
982 } 1024 }
983 } 1025 }
984 else if (!(screen.flags & Screen_WrapNext)) 1026 else
985 scr_gotorc (0, -1, RELATIVE); 1027 scr_gotorc (0, -1, RELATIVE);
986
987 screen.flags &= ~Screen_WrapNext;
988} 1028}
989 1029
990/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
991/* 1031/*
992 * Process Horizontal Tab 1032 * Process Horizontal Tab
993 * count: +ve = forward; -ve = backwards 1033 * count: +ve = forward; -ve = backwards
994 * XTERM_SEQ: CTRL-I 1034 * XTERM_SEQ: CTRL-I
995 */ 1035 */
996void 1036void
997rxvt_term::scr_tab (int count, bool ht) 1037rxvt_term::scr_tab (int count, bool ht) NOTHROW
998{ 1038{
999 int i, x; 1039 int i, x;
1000 1040
1001 want_refresh = 1; 1041 want_refresh = 1;
1002 i = x = screen.cur.col; 1042 i = x = screen.cur.col;
… …
1015 x = i; 1055 x = i;
1016 1056
1017 if (!--count) 1057 if (!--count)
1018 break; 1058 break;
1019 } 1059 }
1020 else 1060 else
1021 ht &= l.t[i] == ' ' 1061 ht &= l.t[i] == ' '
1022 && RS_SAME (l.r[i], base_rend); 1062 && RS_SAME (l.r[i], base_rend);
1023 1063
1024 if (count) 1064 if (count)
1025 x = ncol - 1; 1065 x = ncol - 1;
1026 1066
1027 // store horizontal tab commands as characters inside the text 1067 // store horizontal tab commands as characters inside the text
1028 // buffer so they can be selected and pasted. 1068 // buffer so they can be selected and pasted.
1029 if (ht && OPTION (Opt_pastableTabs)) 1069 if (ht && option (Opt_pastableTabs))
1030 { 1070 {
1031 base_rend = SET_FONT (base_rend, 0); 1071 base_rend = SET_FONT (base_rend, 0);
1032 1072
1033 l.touch (x); 1073 l.touch (x);
1034 1074
… …
1067 * Process DEC Back Index 1107 * Process DEC Back Index
1068 * XTERM_SEQ: ESC 6 1108 * XTERM_SEQ: ESC 6
1069 * Move cursor left in row. If we're at the left boundary, shift everything 1109 * Move cursor left in row. If we're at the left boundary, shift everything
1070 * in that row right. Clear left column. 1110 * in that row right. Clear left column.
1071 */ 1111 */
1072#if ENABLE_FRILLS 1112#if !ENABLE_MINIMAL
1073void 1113void
1074rxvt_term::scr_backindex () 1114rxvt_term::scr_backindex () NOTHROW
1075{ 1115{
1076 if (screen.cur.col > 0) 1116 if (screen.cur.col > 0)
1077 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1117 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1078 else 1118 else
1079 scr_insdel_chars (1, INSERT); 1119 scr_insdel_chars (1, INSERT);
… …
1084 * Process DEC Forward Index 1124 * Process DEC Forward Index
1085 * XTERM_SEQ: ESC 9 1125 * XTERM_SEQ: ESC 9
1086 * Move cursor right in row. If we're at the right boundary, shift everything 1126 * Move cursor right in row. If we're at the right boundary, shift everything
1087 * in that row left. Clear right column. 1127 * in that row left. Clear right column.
1088 */ 1128 */
1089#if ENABLE_FRILLS 1129#if !ENABLE_MINIMAL
1090void 1130void
1091rxvt_term::scr_forwardindex () 1131rxvt_term::scr_forwardindex () NOTHROW
1092{ 1132{
1093 if (screen.cur.col < ncol - 1) 1133 if (screen.cur.col < ncol - 1)
1094 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1134 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1095 else 1135 else
1096 { 1136 {
… …
1109/* ------------------------------------------------------------------------- */ 1149/* ------------------------------------------------------------------------- */
1110/* 1150/*
1111 * Goto Row/Column 1151 * Goto Row/Column
1112 */ 1152 */
1113void 1153void
1114rxvt_term::scr_gotorc (int row, int col, int relative) 1154rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1115{ 1155{
1116 want_refresh = 1; 1156 want_refresh = 1;
1117 ZERO_SCROLLBACK (); 1157 ZERO_SCROLLBACK ();
1118 1158
1119 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1159 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1141 } 1181 }
1142 } 1182 }
1143 else 1183 else
1144 { 1184 {
1145 if (screen.flags & Screen_Relative) 1185 if (screen.flags & Screen_Relative)
1186 {
1146 { /* relative origin mode */ 1187 /* relative origin mode */
1147 screen.cur.row = row + screen.tscroll; 1188 screen.cur.row = row + screen.tscroll;
1148 min_it (screen.cur.row, screen.bscroll); 1189 min_it (screen.cur.row, screen.bscroll);
1149 } 1190 }
1150 else 1191 else
1151 screen.cur.row = row; 1192 screen.cur.row = row;
… …
1157/* ------------------------------------------------------------------------- */ 1198/* ------------------------------------------------------------------------- */
1158/* 1199/*
1159 * direction should be UP or DN 1200 * direction should be UP or DN
1160 */ 1201 */
1161void 1202void
1162rxvt_term::scr_index (enum page_dirn direction) 1203rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1163{ 1204{
1164 int dirn; 1205 int dirn;
1165 1206
1166 want_refresh = 1; 1207 want_refresh = 1;
1167 ZERO_SCROLLBACK (); 1208 ZERO_SCROLLBACK ();
… …
1184/* 1225/*
1185 * Erase part or whole of a line 1226 * Erase part or whole of a line
1186 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1187 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1230 * extension: clear to right unless wrapped: ESC [ 3 K
1189 */ 1231 */
1190void 1232void
1191rxvt_term::scr_erase_line (int mode) 1233rxvt_term::scr_erase_line (int mode) NOTHROW
1192{ 1234{
1193 unsigned int col, num; 1235 unsigned int col, num;
1194 1236
1195 want_refresh = 1; 1237 want_refresh = 1;
1196 ZERO_SCROLLBACK (); 1238 ZERO_SCROLLBACK ();
… …
1202 line.touch (); 1244 line.touch ();
1203 line.is_longer (0); 1245 line.is_longer (0);
1204 1246
1205 switch (mode) 1247 switch (mode)
1206 { 1248 {
1249 case 3:
1250 if (screen.flags & Screen_WrapNext)
1251 return;
1252
1253 /* fall through */
1254
1207 case 0: /* erase to end of line */ 1255 case 0: /* erase to end of line */
1208 col = screen.cur.col; 1256 col = screen.cur.col;
1209 num = ncol - col; 1257 num = ncol - col;
1210 min_it (line.l, col); 1258 min_it (line.l, col);
1259
1211 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1260 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1212 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1261 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1213 CLEAR_SELECTION (); 1262 CLEAR_SELECTION ();
1214 break; 1263 break;
1264
1215 case 1: /* erase to beginning of line */ 1265 case 1: /* erase to beginning of line */
1216 col = 0; 1266 col = 0;
1217 num = screen.cur.col + 1; 1267 num = screen.cur.col + 1;
1268
1218 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1269 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1219 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1270 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1220 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1221 break; 1272 break;
1273
1222 case 2: /* erase whole line */ 1274 case 2: /* erase whole line */
1223 col = 0; 1275 col = 0;
1224 num = ncol; 1276 num = ncol;
1225 line.l = 0; 1277 line.l = 0;
1226 if (selection.beg.row <= screen.cur.row 1278 if (selection.beg.row <= screen.cur.row
… …
1240 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1292 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1241 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1293 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1242 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1294 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1243 */ 1295 */
1244void 1296void
1245rxvt_term::scr_erase_screen (int mode) 1297rxvt_term::scr_erase_screen (int mode) NOTHROW
1246{ 1298{
1247 int num; 1299 int num;
1248 int32_t row; 1300 int32_t row;
1249 rend_t ren; 1301 rend_t ren;
1250 XGCValues gcvalue; 1302 XGCValues gcvalue;
… …
1284 if (row >= nrow) /* Out Of Bounds */ 1336 if (row >= nrow) /* Out Of Bounds */
1285 return; 1337 return;
1286 1338
1287 min_it (num, nrow - row); 1339 min_it (num, nrow - row);
1288 1340
1341 // TODO: the code below does not work when view_start != 0
1342 // the workaround is to disable the clear and use a normal refresh
1343 // when view_start != 0. mysterious.
1289 if (rstyle & (RS_RVid | RS_Uline)) 1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1290 ren = (rend_t) ~RS_None; 1345 ren = (rend_t) ~RS_None;
1291 else if (GET_BASEBG (rstyle) == Color_bg) 1346 else if (GET_BASEBG (rstyle) == Color_bg)
1292 { 1347 {
1293 ren = DEFAULT_RSTYLE; 1348 ren = DEFAULT_RSTYLE;
1294 CLEAR_ROWS (row, num); 1349
1350 if (mapped && !view_start)
1351 XClearArea (dpy, vt, 0,
1352 Row2Pixel (row - view_start), (unsigned int)width,
1353 (unsigned int)Height2Pixel (num), False);
1295 } 1354 }
1296 else 1355 else
1297 { 1356 {
1298 ren = rstyle & (RS_fgMask | RS_bgMask); 1357 ren = rstyle & (RS_fgMask | RS_bgMask);
1358
1359 if (mapped && !view_start)
1360 {
1299 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1300 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1362 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1301 ERASE_ROWS (row, num); 1363 XFillRectangle (dpy, vt, gc,
1364 0, Row2Pixel (row - view_start),
1365 (unsigned int)width,
1366 (unsigned int)Height2Pixel (num));
1302 gcvalue.foreground = pix_colors[Color_fg]; 1367 gcvalue.foreground = pix_colors[Color_fg];
1303 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 }
1304 } 1370 }
1305 1371
1306 for (; num--; row++) 1372 for (; num--; row++)
1307 { 1373 {
1308 scr_blank_screen_mem (ROW(row), rstyle); 1374 scr_blank_screen_mem (ROW(row), rstyle);
1375
1376 if (!view_start)
1309 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1377 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1310 } 1378 }
1311} 1379}
1312 1380
1313#if ENABLE_FRILLS 1381#if !ENABLE_MINIMAL
1314void 1382void
1315rxvt_term::scr_erase_savelines () 1383rxvt_term::scr_erase_savelines () NOTHROW
1316{ 1384{
1317 want_refresh = 1; 1385 want_refresh = 1;
1318 ZERO_SCROLLBACK (); 1386 ZERO_SCROLLBACK ();
1319 1387
1320 nsaved = 0; 1388 top_row = 0;
1321} 1389}
1322#endif 1390#endif
1323 1391
1324/* ------------------------------------------------------------------------- */ 1392/* ------------------------------------------------------------------------- */
1325/* 1393/*
1326 * Fill the screen with `E's 1394 * Fill the screen with `E's
1327 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1395 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1328 */ 1396 */
1329void 1397void
1330rxvt_term::scr_E () 1398rxvt_term::scr_E () NOTHROW
1331{ 1399{
1332 rend_t fs; 1400 rend_t fs;
1333 1401
1334 want_refresh = 1; 1402 want_refresh = 1;
1335 ZERO_SCROLLBACK (); 1403 ZERO_SCROLLBACK ();
… …
1356/* ------------------------------------------------------------------------- */ 1424/* ------------------------------------------------------------------------- */
1357/* 1425/*
1358 * Insert/Delete <count> lines 1426 * Insert/Delete <count> lines
1359 */ 1427 */
1360void 1428void
1361rxvt_term::scr_insdel_lines (int count, int insdel) 1429rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1362{ 1430{
1363 int end; 1431 int end;
1364 1432
1365 ZERO_SCROLLBACK (); 1433 ZERO_SCROLLBACK ();
1366 1434
… …
1386/* ------------------------------------------------------------------------- */ 1454/* ------------------------------------------------------------------------- */
1387/* 1455/*
1388 * Insert/Delete <count> characters from the current position 1456 * Insert/Delete <count> characters from the current position
1389 */ 1457 */
1390void 1458void
1391rxvt_term::scr_insdel_chars (int count, int insdel) 1459rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1392{ 1460{
1393 int col, row;
1394 rend_t tr;
1395
1396 want_refresh = 1; 1461 want_refresh = 1;
1397 ZERO_SCROLLBACK (); 1462 ZERO_SCROLLBACK ();
1398 1463
1399 if (count <= 0) 1464 if (count <= 0)
1400 return; 1465 return;
… …
1402 scr_do_wrap (); 1467 scr_do_wrap ();
1403 1468
1404 selection_check (1); 1469 selection_check (1);
1405 min_it (count, ncol - screen.cur.col); 1470 min_it (count, ncol - screen.cur.col);
1406 1471
1407 row = screen.cur.row; 1472 int row = screen.cur.row;
1408 1473
1409 line_t *line = &ROW(row); 1474 line_t *line = &ROW(row);
1410 1475
1411 line->touch (); 1476 line->touch ();
1412 line->is_longer (0); 1477 line->is_longer (0);
1413 1478
1479 // nuke wide spanning the start
1480 if (line->t[screen.cur.col] == NOCHAR)
1481 scr_kill_char (*line, screen.cur.col);
1482
1414 switch (insdel) 1483 switch (insdel)
1415 { 1484 {
1416 case INSERT: 1485 case INSERT:
1417 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1486 line->l = min (line->l + count, ncol);
1487
1488 if (line->t[screen.cur.col] == NOCHAR)
1489 scr_kill_char (*line, screen.cur.col);
1490
1491 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1418 { 1492 {
1419 line->t[col] = line->t[col - count]; 1493 line->t[col] = line->t[col - count];
1420 line->r[col] = line->r[col - count]; 1494 line->r[col] = line->r[col - count];
1421 } 1495 }
1422
1423 line->l = min (line->l + count, ncol);
1424 1496
1425 if (selection.op && current_screen == selection.screen 1497 if (selection.op && current_screen == selection.screen
1426 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1498 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1427 { 1499 {
1428 if (selection.end.row != screen.cur.row 1500 if (selection.end.row != screen.cur.row
1429 || (selection.end.col + count >= ncol)) 1501 || (selection.end.col + count >= ncol))
1430 CLEAR_SELECTION (); 1502 CLEAR_SELECTION ();
1431 else 1503 else
1504 {
1432 { /* shift selection */ 1505 /* shift selection */
1433 selection.beg.col += count; 1506 selection.beg.col += count;
1434 selection.mark.col += count; /* XXX: yes? */ 1507 selection.mark.col += count; /* XXX: yes? */
1435 selection.end.col += count; 1508 selection.end.col += count;
1436 } 1509 }
1437 } 1510 }
… …
1442 case ERASE: 1515 case ERASE:
1443 screen.cur.col += count; /* don't worry if > ncol */ 1516 screen.cur.col += count; /* don't worry if > ncol */
1444 selection_check (1); 1517 selection_check (1);
1445 screen.cur.col -= count; 1518 screen.cur.col -= count;
1446 1519
1447 line->l = max (line->l - count, 0); 1520 // nuke wide char after the end
1521 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1522 scr_kill_char (*line, screen.cur.col + count);
1523
1448 scr_blank_line (*line, screen.cur.col, count, rstyle); 1524 scr_blank_line (*line, screen.cur.col, count, rstyle);
1449 break; 1525 break;
1450 1526
1451 case DELETE: 1527 case DELETE:
1452 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1528 line->l = max (line->l - count, 0);
1453 1529
1530 // nuke wide char spanning the end
1531 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1532 scr_kill_char (*line, screen.cur.col + count);
1533
1454 for (col = screen.cur.col; (col + count) < ncol; col++) 1534 for (int col = screen.cur.col; (col + count) < ncol; col++)
1455 { 1535 {
1456 line->t[col] = line->t[col + count]; 1536 line->t[col] = line->t[col + count];
1457 line->r[col] = line->r[col + count]; 1537 line->r[col] = line->r[col + count];
1458 } 1538 }
1459 1539
1460 line->l = max (line->l - count, 0);
1461 scr_blank_line (*line, ncol - count, count, tr); 1540 scr_blank_line (*line, ncol - count, count, rstyle);
1462 1541
1463 if (selection.op && current_screen == selection.screen 1542 if (selection.op && current_screen == selection.screen
1464 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1465 { 1544 {
1466 if (selection.end.row != screen.cur.row 1545 if (selection.end.row != screen.cur.row
… …
1484/* 1563/*
1485 * Set the scrolling region 1564 * Set the scrolling region
1486 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1565 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1487 */ 1566 */
1488void 1567void
1489rxvt_term::scr_scroll_region (int top, int bot) 1568rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1490{ 1569{
1491 max_it (top, 0); 1570 max_it (top, 0);
1492 min_it (bot, nrow - 1); 1571 min_it (bot, nrow - 1);
1493 1572
1494 if (top > bot) 1573 if (top > bot)
… …
1504 * Make the cursor visible/invisible 1583 * Make the cursor visible/invisible
1505 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1584 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1506 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1585 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1507 */ 1586 */
1508void 1587void
1509rxvt_term::scr_cursor_visible (int mode) 1588rxvt_term::scr_cursor_visible (int mode) NOTHROW
1510{ 1589{
1511 want_refresh = 1; 1590 want_refresh = 1;
1512 1591
1513 if (mode) 1592 if (mode)
1514 screen.flags |= Screen_VisibleCursor; 1593 screen.flags |= Screen_VisibleCursor;
… …
1521 * Set/unset automatic wrapping 1600 * Set/unset automatic wrapping
1522 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1601 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1523 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1602 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1524 */ 1603 */
1525void 1604void
1526rxvt_term::scr_autowrap (int mode) 1605rxvt_term::scr_autowrap (int mode) NOTHROW
1527{ 1606{
1528 if (mode) 1607 if (mode)
1529 screen.flags |= Screen_Autowrap; 1608 screen.flags |= Screen_Autowrap;
1530 else 1609 else
1531 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1610 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1540 * and the cursor cannot be moved outside. 1619 * and the cursor cannot be moved outside.
1541 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1620 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1542 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1621 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1543 */ 1622 */
1544void 1623void
1545rxvt_term::scr_relative_origin (int mode) 1624rxvt_term::scr_relative_origin (int mode) NOTHROW
1546{ 1625{
1547 if (mode) 1626 if (mode)
1548 screen.flags |= Screen_Relative; 1627 screen.flags |= Screen_Relative;
1549 else 1628 else
1550 screen.flags &= ~Screen_Relative; 1629 screen.flags &= ~Screen_Relative;
… …
1557 * Set insert/replace mode 1636 * Set insert/replace mode
1558 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1637 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1559 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1638 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1560 */ 1639 */
1561void 1640void
1562rxvt_term::scr_insert_mode (int mode) 1641rxvt_term::scr_insert_mode (int mode) NOTHROW
1563{ 1642{
1564 if (mode) 1643 if (mode)
1565 screen.flags |= Screen_Insert; 1644 screen.flags |= Screen_Insert;
1566 else 1645 else
1567 screen.flags &= ~Screen_Insert; 1646 screen.flags &= ~Screen_Insert;
… …
1573 * XTERM_SEQ: Set tab at current column : ESC H 1652 * XTERM_SEQ: Set tab at current column : ESC H
1574 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1653 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1575 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1654 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1576 */ 1655 */
1577void 1656void
1578rxvt_term::scr_set_tab (int mode) 1657rxvt_term::scr_set_tab (int mode) NOTHROW
1579{ 1658{
1580 if (mode < 0) 1659 if (mode < 0)
1581 memset (tabs, 0, ncol * sizeof (char)); 1660 memset (tabs, 0, ncol);
1582 else if (screen.cur.col < ncol) 1661 else if (screen.cur.col < ncol)
1583 tabs [screen.cur.col] = !!mode; 1662 tabs [screen.cur.col] = !!mode;
1584} 1663}
1585 1664
1586/* ------------------------------------------------------------------------- */ 1665/* ------------------------------------------------------------------------- */
… …
1588 * Set reverse/normal video 1667 * Set reverse/normal video
1589 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1668 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1590 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1669 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1591 */ 1670 */
1592void 1671void
1593rxvt_term::scr_rvideo_mode (int mode) 1672rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1594{ 1673{
1595 XGCValues gcvalue; 1674 rvideo_mode = on;
1596 1675
1676#ifndef NO_BELL
1677 on ^= rvideo_bell;
1678#endif
1679
1597 if (rvideo != mode) 1680 if (rvideo_state != on)
1598 { 1681 {
1599 rvideo = mode; 1682 rvideo_state = on;
1683
1600 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1684 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1601#if XPM_BACKGROUND 1685#ifdef HAVE_BG_PIXMAP
1602 if (bgPixmap.pixmap == None) 1686 if (bgPixmap.pixmap == None)
1603#endif 1687#endif
1604#if TRANSPARENT 1688 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 1689
1690 XGCValues gcvalue;
1610 gcvalue.foreground = pix_colors[Color_fg]; 1691 gcvalue.foreground = pix_colors[Color_fg];
1611 gcvalue.background = pix_colors[Color_bg]; 1692 gcvalue.background = pix_colors[Color_bg];
1612 XChangeGC (display->display, gc, GCBackground | GCForeground, 1693 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1613 &gcvalue); 1694
1614 scr_clear (); 1695 scr_clear ();
1615 scr_touch (true); 1696 scr_touch (true);
1616 } 1697 }
1617} 1698}
1618 1699
… …
1620/* 1701/*
1621 * Report current cursor position 1702 * Report current cursor position
1622 * XTERM_SEQ: Report position: ESC [ 6 n 1703 * XTERM_SEQ: Report position: ESC [ 6 n
1623 */ 1704 */
1624void 1705void
1625rxvt_term::scr_report_position () 1706rxvt_term::scr_report_position () NOTHROW
1626{ 1707{
1627 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1708 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1628} 1709}
1629 1710
1630/* ------------------------------------------------------------------------- * 1711/* ------------------------------------------------------------------------- *
… …
1633 1714
1634/* 1715/*
1635 * Set font style 1716 * Set font style
1636 */ 1717 */
1637void 1718void
1638rxvt_term::set_font_style () 1719rxvt_term::set_font_style () NOTHROW
1639{ 1720{
1640#if 0 1721#if 0
1641 switch (charsets [screen.charset]) 1722 switch (charsets [screen.charset])
1642 { 1723 {
1643 case '0': /* DEC Special Character & Line Drawing Set */ 1724 case '0': /* DEC Special Character & Line Drawing Set */
… …
1665 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1746 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1666 * XTERM_SEQ: Invoke G2 character set: ESC N 1747 * XTERM_SEQ: Invoke G2 character set: ESC N
1667 * XTERM_SEQ: Invoke G3 character set: ESC O 1748 * XTERM_SEQ: Invoke G3 character set: ESC O
1668 */ 1749 */
1669void 1750void
1670rxvt_term::scr_charset_choose (int set) 1751rxvt_term::scr_charset_choose (int set) NOTHROW
1671{ 1752{
1672 screen.charset = set; 1753 screen.charset = set;
1673 set_font_style (); 1754 set_font_style ();
1674} 1755}
1675 1756
… …
1681 * XTERM_SEQ: Set G2 character set: ESC * <C> 1762 * XTERM_SEQ: Set G2 character set: ESC * <C>
1682 * XTERM_SEQ: Set G3 character set: ESC + <C> 1763 * XTERM_SEQ: Set G3 character set: ESC + <C>
1683 * See set_font_style for possible values for <C> 1764 * See set_font_style for possible values for <C>
1684 */ 1765 */
1685void 1766void
1686rxvt_term::scr_charset_set (int set, unsigned int ch) 1767rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1687{ 1768{
1688 charsets[set] = (unsigned char)ch; 1769 charsets[set] = (unsigned char)ch;
1689 set_font_style (); 1770 set_font_style ();
1690} 1771}
1691 1772
… …
1696 1777
1697/* 1778/*
1698 * refresh matching text. 1779 * refresh matching text.
1699 */ 1780 */
1700bool 1781bool
1701rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1782rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1702{ 1783{
1703 bool found = false; 1784 bool found = false;
1704 1785
1705 for (int i = 0; i < nrow; i++) 1786 for (int i = 0; i < nrow; i++)
1706 { 1787 {
1707 int col = 0;
1708 rend_t *drp = drawn_buf[i].r; 1788 rend_t *drp = drawn_buf[i].r;
1709 1789
1710 for (; col < ncol; col++, drp++) 1790 for (int col = 0; col < ncol; col++, drp++)
1711 if ((*drp & mask) == value) 1791 if ((*drp & mask) == value)
1712 { 1792 {
1713 found = true; 1793 found = true;
1714 *drp = ~value; 1794 *drp = ~value;
1715 } 1795 }
… …
1726 PART_END, 1806 PART_END,
1727 RC_COUNT 1807 RC_COUNT
1728}; 1808};
1729 1809
1730void 1810void
1731rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1811rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1732{ 1812{
1733 int i; 1813 int i;
1734 row_col_t rc[RC_COUNT]; 1814 row_col_t rc[RC_COUNT];
1735 1815
1736 if (!drawn_buf) /* sanity check */ 1816 if (!drawn_buf) /* sanity check */
… …
1759 } 1839 }
1760 1840
1761 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1841 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); 1842 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1763 1843
1844 num_scr_allow = 0;
1845
1764 if (refresh) 1846 if (refresh)
1765 scr_refresh (SLOW_REFRESH); 1847 scr_refresh ();
1766} 1848}
1767 1849
1768/* ------------------------------------------------------------------------- */ 1850/* ------------------------------------------------------------------------- */
1769/* 1851/*
1770 * Refresh the entire screen 1852 * Refresh the entire screen
1771 */ 1853 */
1772void 1854void
1773rxvt_term::scr_touch (bool refresh) 1855rxvt_term::scr_touch (bool refresh) NOTHROW
1774{ 1856{
1775 scr_expose (0, 0, width, height, refresh); 1857 scr_expose (0, 0, width, height, refresh);
1776} 1858}
1777 1859
1778/* ------------------------------------------------------------------------- */ 1860/* ------------------------------------------------------------------------- */
1779/* 1861/*
1780 * Move the display so that the line represented by scrollbar value Y is at 1862 * Move the display so that the line represented by scrollbar value Y is at
1781 * the top of the screen 1863 * the top of the screen
1782 */ 1864 */
1783int 1865void
1784rxvt_term::scr_move_to (int y, int len) 1866rxvt_term::scr_move_to (int y, int len) NOTHROW
1785{ 1867{
1786 long p = 0; 1868 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} 1869}
1802 1870
1803/* ------------------------------------------------------------------------- */ 1871/* ------------------------------------------------------------------------- */
1804/* 1872/*
1805 * Page the screen up/down nlines 1873 * Page the screen up/down nlines
1806 * direction should be UP or DN 1874 * direction should be UP or DN
1807 */ 1875 */
1808int 1876bool
1809rxvt_term::scr_page (enum page_dirn direction, int nlines) 1877rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1810{ 1878{
1811 int n; 1879 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; 1880 direction == UP ? view_start - nlines
1824 view_start = max (n, 0); 1881 : view_start + nlines;
1825 }
1826 1882
1827 return scr_changeview (oldviewstart); 1883 return scr_changeview (new_view_start);
1828} 1884}
1829 1885
1830int 1886bool
1831rxvt_term::scr_changeview (unsigned int oldviewstart) 1887rxvt_term::scr_changeview (int new_view_start) NOTHROW
1832{ 1888{
1889 clamp_it (new_view_start, top_row, 0);
1890
1833 if (view_start != oldviewstart) 1891 if (new_view_start == view_start)
1834 { 1892 return false;
1893
1894 num_scr += new_view_start - view_start;
1895 view_start = new_view_start;
1896 want_refresh = 1;
1897
1835 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1898 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1836 1899
1837 want_refresh = 1; 1900 return true;
1838 num_scr -= (view_start - oldviewstart);
1839 }
1840
1841 return (int)view_start - (int)oldviewstart;
1842} 1901}
1843 1902
1844/* ------------------------------------------------------------------------- */ 1903#ifndef NO_BELL
1845void 1904void
1905rxvt_term::bell_cb (ev::timer &w, int revents)
1906{
1907 rvideo_bell = false;
1908 scr_rvideo_mode (rvideo_mode);
1909 refresh_check ();
1910}
1911#endif
1912
1913/* ------------------------------------------------------------------------- */
1914void
1846rxvt_term::scr_bell () 1915rxvt_term::scr_bell () NOTHROW
1847{ 1916{
1848#ifndef NO_BELL 1917#ifndef NO_BELL
1849 1918
1850# ifndef NO_MAPALERT 1919# ifndef NO_MAPALERT
1851# ifdef MAPALERT_OPTION 1920# ifdef MAPALERT_OPTION
1852 if (OPTION (Opt_mapAlert)) 1921 if (option (Opt_mapAlert))
1853# endif 1922# endif
1854 XMapWindow (display->display, parent[0]); 1923 XMapWindow (dpy, parent[0]);
1855# endif 1924# endif
1856 1925
1926# if ENABLE_FRILLS
1927 if (option (Opt_urgentOnBell))
1928 set_urgency (1);
1929# endif
1930
1857 if (OPTION (Opt_visualBell)) 1931 if (option (Opt_visualBell))
1858 { 1932 {
1859 scr_rvideo_mode (!rvideo); /* refresh also done */ 1933 rvideo_bell = true;
1934 scr_rvideo_mode (rvideo_mode);
1935 flush ();
1936
1860 rxvt_usleep (VISUAL_BELL_DURATION); 1937 bell_ev.start (VISUAL_BELL_DURATION);
1861 scr_rvideo_mode (!rvideo); /* refresh also done */
1862 } 1938 }
1863 else 1939 else
1864 XBell (display->display, 0); 1940 XBell (dpy, 0);
1865 1941 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1866#endif 1942#endif
1867} 1943}
1868 1944
1869/* ------------------------------------------------------------------------- */ 1945/* ------------------------------------------------------------------------- */
1870/* ARGSUSED */ 1946/* ARGSUSED */
1871void 1947void
1872rxvt_term::scr_printscreen (int fullhist) 1948rxvt_term::scr_printscreen (int fullhist) NOTHROW
1873{ 1949{
1874#ifdef PRINTPIPE 1950#ifdef PRINTPIPE
1875 int nrows, row_start; 1951 int nrows, row_start;
1876 FILE *fd; 1952 FILE *fd = popen_printer ();
1877 1953
1878 if ((fd = popen_printer ()) == NULL) 1954 if (!fd)
1879 return; 1955 return;
1880 1956
1881 if (fullhist) 1957 if (fullhist)
1882 { 1958 {
1883 nrows = nrow + nsaved; 1959 nrows = nrow - top_row;
1884 row_start = -nsaved; 1960 row_start = top_row;
1885 } 1961 }
1886 else 1962 else
1887 { 1963 {
1888 nrows = nrow; 1964 nrows = nrow;
1889 row_start = -view_start; 1965 row_start = view_start;
1890 } 1966 }
1891 1967
1892 wctomb (0, 0); 1968 wctomb (0, 0);
1893 1969
1894 for (int r1 = 0; r1 < nrows; r1++) 1970 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1895 { 1971 {
1896 text_t *tp = ROW(r1).t; 1972 text_t *tp = ROW(r1).t;
1897 int len = ROW(r1).l; 1973 int len = ROW(r1).l;
1898 1974
1899 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1975 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1926 * Refresh the screen 2002 * Refresh the screen
1927 * drawn_text/drawn_rend contain the screen information before the update. 2003 * drawn_text/drawn_rend contain the screen information before the update.
1928 * screen.text/screen.rend contain what the screen will change to. 2004 * screen.text/screen.rend contain what the screen will change to.
1929 */ 2005 */
1930void 2006void
1931rxvt_term::scr_refresh (unsigned char refresh_type) 2007rxvt_term::scr_refresh () NOTHROW
1932{ 2008{
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 */ 2009 int16_t col, row, /* column/row we're processing */
1936 ocrow; /* old cursor row */ 2010 ocrow; /* old cursor row */
1937 int i; /* tmp */ 2011 int i; /* tmp */
1938#ifndef NO_CURSORCOLOR 2012#ifndef NO_CURSORCOLOR
1939 rend_t cc1; /* store colours at cursor position (s) */ 2013 rend_t cc1; /* store colours at cursor position (s) */
1940#endif 2014#endif
1941 rend_t *crp; // cursor rendition pointer 2015 rend_t *crp; // cursor rendition pointer
2016 rend_t ccol1, /* Cursor colour */
2017 ccol2; /* Cursor colour2 */
1942 2018
1943 want_refresh = 0; /* screen is current */ 2019 want_refresh = 0; /* screen is current */
1944 2020
1945 if (refresh_type == NO_REFRESH || !mapped) 2021 if (refresh_type == NO_REFRESH || !mapped)
1946 return; 2022 return;
1947 2023
1948 /* 2024 /*
1949 * A: set up vars 2025 * A: set up vars
1950 */ 2026 */
1951 must_clear = 0;
1952 refresh_count = 0; 2027 refresh_count = 0;
1953 2028
1954#if XPM_BACKGROUND 2029 unsigned int old_screen_flags = screen.flags;
2030 char have_bg = 0;
2031#ifdef HAVE_BG_PIXMAP
1955 must_clear |= bgPixmap.pixmap != None; 2032 have_bg = bgPixmap.pixmap != None;
1956#endif
1957#if TRANSPARENT
1958 must_clear |= OPTION (Opt_transparent) && am_transparent;
1959#endif 2033#endif
1960 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1961 2035
1962 /* 2036 /*
1963 * B: reverse any characters which are selected 2037 * B: reverse any characters which are selected
1964 */ 2038 */
1965 scr_reverse_selection (); 2039 scr_reverse_selection ();
2040
2041 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2042#if ENABLE_OVERLAY
2043 scr_swap_overlay ();
2044#endif
2045
2046 char showcursor = screen.flags & Screen_VisibleCursor;
1966 2047
1967 /* 2048 /*
1968 * C: set the cursor character (s) 2049 * C: set the cursor character (s)
1969 */ 2050 */
1970 { 2051 {
1971 unsigned char setoldcursor; 2052 unsigned char setoldcursor;
1972 rend_t ccol1, /* Cursor colour */
1973 ccol2; /* Cursor colour2 */
1974 2053
1975 showcursor = (screen.flags & Screen_VisibleCursor);
1976#ifdef CURSOR_BLINK 2054#ifdef CURSOR_BLINK
1977 if (hidden_cursor) 2055 if (hidden_cursor)
1978 showcursor = 0; 2056 showcursor = 0;
1979#endif 2057#endif
1980 2058
… …
1985 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2063 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1986 col--; 2064 col--;
1987 2065
1988 crp = &ROW(screen.cur.row).r[col]; 2066 crp = &ROW(screen.cur.row).r[col];
1989 2067
1990 if (showcursor && focus) 2068#ifndef NO_CURSORCOLOR
2069 cc1 = *crp & (RS_fgMask | RS_bgMask);
2070 if (ISSET_PIXCOLOR (Color_cursor))
2071 ccol1 = Color_cursor;
2072 else
2073#endif
2074#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2075 ccol1 = fgcolor_of (rstyle);
2076#else
2077 ccol1 = Color_fg;
2078#endif
2079
2080#ifndef NO_CURSORCOLOR
2081 if (ISSET_PIXCOLOR (Color_cursor2))
2082 ccol2 = Color_cursor2;
2083 else
2084#endif
2085#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2086 ccol2 = bgcolor_of (rstyle);
2087#else
2088 ccol2 = Color_bg;
2089#endif
2090
2091 if (focus)
1991 { 2092 {
1992 if (OPTION (Opt_cursorUnderline)) 2093 if (option (Opt_cursorUnderline))
1993 *crp ^= RS_Uline; 2094 *crp ^= RS_Uline;
1994 else 2095 else
1995 { 2096 {
1996 *crp ^= RS_RVid; 2097 *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); 2098 *crp = SET_FGCOLOR (*crp, ccol1);
2017 *crp = SET_BGCOLOR (*crp, ccol2); 2099 *crp = SET_BGCOLOR (*crp, ccol2);
2018#endif
2019 } 2100 }
2020 } 2101 }
2021 } 2102 }
2022 2103
2023 /* make sure no outline cursor is left around */ 2104 /* make sure no outline cursor is left around */
2024 setoldcursor = 0; 2105 setoldcursor = 0;
2025 if (ocrow != -1) 2106 if (ocrow != -1)
2026 { 2107 {
2027 if (screen.cur.row + view_start != ocrow 2108 if (screen.cur.row - view_start != ocrow
2028 || screen.cur.col != oldcursor.col) 2109 || screen.cur.col != oldcursor.col)
2029 { 2110 {
2030 if (ocrow < nrow 2111 if (ocrow < nrow
2031 && oldcursor.col < ncol) 2112 && oldcursor.col < ncol)
2032 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2113 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2040 else if (!focus) 2121 else if (!focus)
2041 setoldcursor = 1; 2122 setoldcursor = 1;
2042 2123
2043 if (setoldcursor) 2124 if (setoldcursor)
2044 { 2125 {
2045 if (screen.cur.row + view_start >= nrow) 2126 if (screen.cur.row - view_start >= nrow)
2046 oldcursor.row = -1; 2127 oldcursor.row = -1;
2047 else 2128 else
2048 { 2129 {
2049 oldcursor.row = screen.cur.row + view_start; 2130 oldcursor.row = screen.cur.row - view_start;
2050 oldcursor.col = screen.cur.col; 2131 oldcursor.col = screen.cur.col;
2051 } 2132 }
2052 } 2133 }
2053 } 2134 }
2054
2055 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2056#if ENABLE_OVERLAY
2057 scr_swap_overlay ();
2058#endif
2059 2135
2060#ifndef NO_SLOW_LINK_SUPPORT 2136#ifndef NO_SLOW_LINK_SUPPORT
2061 /* 2137 /*
2062 * D: CopyArea pass - very useful for slower links 2138 * D: CopyArea pass - very useful for slower links
2063 * This has been deliberately kept simple. 2139 * This has been deliberately kept simple.
2064 */ 2140 */
2065 i = num_scr;
2066 if (!display->is_local 2141 if (!display->is_local
2067 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2142 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2068 && abs (num_scr) < nrow && !must_clear) 2143 && abs (num_scr) < nrow && !have_bg)
2069 { 2144 {
2070 int16_t nits; 2145 int16_t nits;
2146 int i = num_scr;
2071 int j; 2147 int j;
2072 int len, wlen; 2148 int len, wlen;
2149 dLocal (int, num_scr);
2073 2150
2074 j = nrow; 2151 j = nrow;
2075 wlen = len = -1; 2152 wlen = len = -1;
2076 row = i > 0 ? 0 : j - 1; 2153 row = i > 0 ? 0 : j - 1;
2154
2077 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2155 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2078 { 2156 {
2079 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2157 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2080 { 2158 {
2081 line_t s = ROW(row - view_start); 2159 line_t s = ROW(view_start + row);
2082 line_t d = drawn_buf[row]; 2160 line_t d = drawn_buf[row];
2083 line_t d2 = drawn_buf[row + i]; 2161 line_t d2 = drawn_buf[row + i];
2084 2162
2085 for (nits = 0, col = ncol; col--; ) 2163 for (nits = 0, col = ncol; col--; )
2086 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2164 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2102 wlen = row; 2180 wlen = row;
2103 continue; 2181 continue;
2104 } 2182 }
2105 } 2183 }
2106 2184
2107 if (len != -1) 2185 if (len >= 0)
2108 { 2186 {
2109 /* also comes here at end if needed because of >= above */ 2187 /* also comes here at end if needed because of >= above */
2110 if (wlen < len) 2188 if (wlen < len)
2111 ::swap (wlen, len); 2189 ::swap (wlen, len);
2112 2190
2191 XGCValues gcv;
2192
2193 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2113 XCopyArea (display->display, vt, vt, 2194 XCopyArea (dpy, vt, vt,
2114 gc, 0, Row2Pixel (len + i), 2195 gc, 0, Row2Pixel (len + i),
2115 (unsigned int)this->width, 2196 (unsigned int)this->width,
2116 (unsigned int)Height2Pixel (wlen - len + 1), 2197 (unsigned int)Height2Pixel (wlen - len + 1),
2117 0, Row2Pixel (len)); 2198 0, Row2Pixel (len));
2199 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2200
2118 len = -1; 2201 len = -1;
2119 } 2202 }
2120 } 2203 }
2121 } 2204 }
2122#endif 2205#endif
… …
2124 /* 2207 /*
2125 * E: main pass across every character 2208 * E: main pass across every character
2126 */ 2209 */
2127 for (row = 0; row < nrow; row++) 2210 for (row = 0; row < nrow; row++)
2128 { 2211 {
2129 text_t *stp = ROW(row - view_start).t; 2212 text_t *stp = ROW(view_start + row).t;
2130 rend_t *srp = ROW(row - view_start).r; 2213 rend_t *srp = ROW(view_start + row).r;
2131 text_t *dtp = drawn_buf[row].t; 2214 text_t *dtp = drawn_buf[row].t;
2132 rend_t *drp = drawn_buf[row].r; 2215 rend_t *drp = drawn_buf[row].r;
2133 2216
2134 /* 2217 /*
2135 * E2: OK, now the real pass 2218 * E2: OK, now the real pass
… …
2146 continue; 2229 continue;
2147 2230
2148 // redraw one or more characters 2231 // redraw one or more characters
2149 2232
2150 // seek to the beginning of wide characters 2233 // seek to the beginning of wide characters
2151 while (stp[col] == NOCHAR && col > 0) 2234 while (expect_false (stp[col] == NOCHAR && col > 0))
2152 --col; 2235 --col;
2153 2236
2154 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2237 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2155 text_t *text = stp + col; 2238 text_t *text = stp + col;
2156 int count = 1; 2239 int count = 1;
2157 2240
2158 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2159 drp[col] = rend; 2242 drp[col] = rend;
… …
2163 for (i = 0; ++col < ncol; ) 2246 for (i = 0; ++col < ncol; )
2164 { 2247 {
2165 if (stp[col] == NOCHAR) 2248 if (stp[col] == NOCHAR)
2166 { 2249 {
2167 dtp[col] = stp[col]; 2250 dtp[col] = stp[col];
2168 drp[col] = rend; 2251 drp[col] = srp[col];
2252
2169 count++; 2253 count++;
2170 i++; 2254 i++;
2171 2255
2172 continue; 2256 continue;
2173 } 2257 }
… …
2178 count++; 2262 count++;
2179 2263
2180 if (stp[col] != dtp[col] 2264 if (stp[col] != dtp[col]
2181 || !RS_SAME (srp[col], drp[col])) 2265 || !RS_SAME (srp[col], drp[col]))
2182 { 2266 {
2183 if (must_clear && (i++ > count / 2)) 2267 if (have_bg && (i++ > count / 2))
2184 break; 2268 break;
2185 2269
2186 dtp[col] = stp[col]; 2270 dtp[col] = stp[col];
2187 drp[col] = rend; 2271 drp[col] = rend;
2188 i = 0; 2272 i = 0;
2189 } 2273 }
2190 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2274 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2191 break; 2275 break;
2192 } 2276 }
2193 2277
2194 col--; /* went one too far. move back */ 2278 col--; /* went one too far. move back */
2195 count -= i; /* dump any matching trailing chars */ 2279 count -= i; /* dump any matching trailing chars */
2196 2280
2197 // sometimes we optimize away the trailing NOCHAR's, add them back 2281 // sometimes we optimize away the trailing NOCHAR's, add them back
2198 while (i && text[count] == NOCHAR) 2282 while (expect_false (i && text[count] == NOCHAR))
2199 count++, i--; 2283 count++, i--;
2200 2284
2201 /* 2285 /*
2202 * Determine the attributes for the string 2286 * Determine the attributes for the string
2203 */ 2287 */
2204 int fore = fgcolor_of (rend); // desired foreground 2288 int fore = fgcolor_of (rend); // desired foreground
2205 int back = bgcolor_of (rend); // desired background 2289 int back = bgcolor_of (rend); // desired background
2206 2290
2207 // only do special processing if any attributes are set, which is unlikely 2291 // 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)) 2292 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2209 { 2293 {
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; 2294 bool invert = rend & RS_RVid;
2223 2295
2224#ifndef NO_BOLD_UNDERLINE_REVERSE 2296#ifndef NO_BOLD_UNDERLINE_REVERSE
2225 if (rend & RS_Bold
2226 && fore == Color_fg) 2297 if (rend & RS_Bold && fore == Color_fg)
2227 { 2298 {
2228 if (ISSET_PIXCOLOR (Color_BD)) 2299 if (ISSET_PIXCOLOR (Color_BD))
2229 fore = Color_BD; 2300 fore = Color_BD;
2230# if !ENABLE_STYLES 2301# if !ENABLE_STYLES
2231 else 2302 else
2232 invert = !invert; 2303 invert = !invert;
2233# endif 2304# endif
2234 } 2305 }
2235 2306
2236 if (rend & RS_Italic 2307 if (rend & RS_Italic && fore == Color_fg)
2237 && fore == Color_fg)
2238 { 2308 {
2239 if (ISSET_PIXCOLOR (Color_IT)) 2309 if (ISSET_PIXCOLOR (Color_IT))
2240 fore = Color_IT; 2310 fore = Color_IT;
2241# if !ENABLE_STYLES 2311# if !ENABLE_STYLES
2242 else 2312 else
2243 invert = !invert; 2313 invert = !invert;
2244# endif 2314# endif
2245 } 2315 }
2246 2316
2247 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2248 fore = Color_UL; 2318 fore = Color_UL;
2319#endif
2320
2321#ifdef OPTION_HC
2322 if (rend & RS_Sel)
2323 {
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2327 && ISSET_PIXCOLOR (Color_HC))
2328 {
2329 if (ISSET_PIXCOLOR (Color_HTC))
2330 fore = Color_HTC;
2331 // if invert is 0 reverse video is set so we use bg color as fg color
2332 else if (!invert)
2333 fore = back;
2334
2335 back = Color_HC;
2336 invert = 0;
2337 }
2338 }
2249#endif 2339#endif
2250 2340
2251 if (invert) 2341 if (invert)
2252 { 2342 {
2253 ::swap (fore, back); 2343 ::swap (fore, back);
2254 2344
2255#ifndef NO_BOLD_UNDERLINE_REVERSE 2345#ifndef NO_BOLD_UNDERLINE_REVERSE
2256 if (ISSET_PIXCOLOR (Color_RV))
2257 back = Color_RV;
2258
2259 if (fore == back) 2346 if (fore == back)
2260 { 2347 {
2261 fore = Color_bg; 2348 fore = Color_bg;
2262 back = Color_fg; 2349 back = Color_fg;
2263 } 2350 }
… …
2265 } 2352 }
2266 2353
2267#ifdef TEXT_BLINK 2354#ifdef TEXT_BLINK
2268 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2355 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2269 { 2356 {
2270 if (!text_blink_ev.active) 2357 if (!text_blink_ev.is_active ())
2271 { 2358 {
2272 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2359 text_blink_ev.again ();
2273 hidden_text = 0; 2360 hidden_text = 0;
2274 } 2361 }
2275 else if (hidden_text) 2362 else if (hidden_text)
2276 fore = back; 2363 fore = back;
2277 } 2364 }
2278#endif 2365#endif
2366
2367#if ENABLE_STYLES
2368 // "careful" (too wide) character handling
2369
2370 // include previous careful character(s) if possible, looks nicer (best effort...)
2371 while (text > stp
2372 && srp[text - stp - 1] & RS_Careful
2373 && RS_SAME (rend, srp[text - stp - 1]))
2374 text--, count++, xpixel -= fwidth;
2375
2376 // force redraw after "careful" characters to avoid pixel droppings
2377 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2378 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2379
2380 // force redraw before "careful" characters to avoid pixel droppings
2381 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2382 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2383#endif
2279 } 2384 }
2280 2385
2281 /* 2386 /*
2282 * Actually do the drawing of the string here 2387 * Actually do the drawing of the string here
2283 */ 2388 */
2284 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2389 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2285 2390
2286 if (back == fore) 2391 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 { 2392 {
2292 if (must_clear) 2393 // this is very ugly, maybe push it into ->draw?
2293 {
2294 CLEAR_CHARS (xpixel, ypixel, count);
2295 2394
2296 for (i = 0; i < count; i++) /* don't draw empty strings */ 2395 for (i = 0; i < count; i++) /* don't draw empty strings */
2297 if (text[i] != ' ') 2396 if (text[i] != ' ')
2298 { 2397 {
2299 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2398 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2300 break; 2399 goto did_clear;
2301 }
2302 } 2400 }
2303 else 2401
2304 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2402 CLEAR_CHARS (xpixel, ypixel, count);
2403 did_clear: ;
2305 } 2404 }
2306 else 2405 else
2307 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2406 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2308 2407
2309 if (rend & RS_Uline && font->descent > 1 && fore != back) 2408 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2310 { 2409 {
2311#if ENABLE_FRILLS 2410#if ENABLE_FRILLS
2312 if (ISSET_PIXCOLOR (Color_underline)) 2411 if (ISSET_PIXCOLOR (Color_underline))
2313 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2412 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2314 else 2413 else
2315#endif 2414#endif
2316 XSetForeground (display->display, gc, pix_colors[fore]); 2415 XSetForeground (dpy, gc, pix_colors[fore]);
2317 2416
2318 XDrawLine (display->display, drawBuffer, gc, 2417 XDrawLine (dpy, vt, gc,
2319 xpixel, ypixel + font->ascent + 1, 2418 xpixel, ypixel + font->ascent + 1,
2320 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2419 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2321 } 2420 }
2322 } /* for (col....) */ 2421 } /* for (col....) */
2323 } /* for (row....) */ 2422 } /* for (row....) */
2324 2423
2325#if ENABLE_OVERLAY
2326 scr_swap_overlay ();
2327#endif
2328 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2329
2330 /* 2424 /*
2331 * G: cleanup cursor and display outline cursor if necessary 2425 * G: cleanup cursor and display outline cursor if necessary
2332 */ 2426 */
2333 if (showcursor) 2427 if (showcursor)
2334 { 2428 {
2335 if (focus) 2429 if (focus)
2336 { 2430 {
2337 if (OPTION (Opt_cursorUnderline)) 2431 if (option (Opt_cursorUnderline))
2338 *crp ^= RS_Uline; 2432 *crp ^= RS_Uline;
2339 else 2433 else
2340 { 2434 {
2341 *crp ^= RS_RVid; 2435 *crp ^= RS_RVid;
2342#ifndef NO_CURSORCOLOR 2436#ifndef NO_CURSORCOLOR
… …
2356 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2450 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2357 cursorwidth++; 2451 cursorwidth++;
2358 2452
2359#ifndef NO_CURSORCOLOR 2453#ifndef NO_CURSORCOLOR
2360 if (ISSET_PIXCOLOR (Color_cursor)) 2454 if (ISSET_PIXCOLOR (Color_cursor))
2361 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2455 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2456 else
2362#endif 2457#endif
2458 XSetForeground (dpy, gc, pix_colors[ccol1]);
2363 2459
2364 XDrawRectangle (display->display, drawBuffer, gc, 2460 XDrawRectangle (dpy, vt, gc,
2365 Col2Pixel (col), 2461 Col2Pixel (col),
2366 Row2Pixel (oldcursor.row), 2462 Row2Pixel (oldcursor.row),
2367 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2463 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2368 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2464 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2369 } 2465 }
2370 } 2466 }
2371 2467
2372 /* 2468 /*
2373 * H: cleanup selection 2469 * H: cleanup selection
2374 */ 2470 */
2471#if ENABLE_OVERLAY
2472 scr_swap_overlay ();
2473#endif
2474 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2475
2375 scr_reverse_selection (); 2476 scr_reverse_selection ();
2376 2477
2377 if (refresh_type & SMOOTH_REFRESH) 2478 screen.flags = old_screen_flags;
2378 XFlush (display->display);
2379
2380 num_scr = 0; 2479 num_scr = 0;
2381 num_scr_allow = 1; 2480 num_scr_allow = 1;
2382} 2481}
2383 2482
2384void 2483void
2385rxvt_term::scr_remap_chars (line_t &l) 2484rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2386{ 2485{
2387 if (!l.t) 2486 if (!l.t)
2388 return; 2487 return;
2389 2488
2390 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2489 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2392 for (int i = ncol; i--; ) 2491 for (int i = ncol; i--; )
2393 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2492 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2394} 2493}
2395 2494
2396void 2495void
2397rxvt_term::scr_remap_chars () 2496rxvt_term::scr_remap_chars () NOTHROW
2398{ 2497{
2399 for (int i = total_rows; i--; ) 2498 for (int i = total_rows; i--; )
2400 scr_remap_chars (row_buf [i]); 2499 scr_remap_chars (row_buf [i]);
2401 2500
2402 for (int i = nrow; i--; ) 2501 for (int i = nrow; i--; )
… …
2405 scr_remap_chars (swap_buf [i]); 2504 scr_remap_chars (swap_buf [i]);
2406 } 2505 }
2407} 2506}
2408 2507
2409void 2508void
2410rxvt_term::scr_recolour () 2509rxvt_term::scr_recolour () NOTHROW
2411{ 2510{
2412 if (1 2511#ifdef HAVE_BG_PIXMAP
2413#if TRANSPARENT 2512 bgPixmap.apply ();
2414 && !am_transparent 2513#else
2415#endif 2514
2416#if XPM_BACKGROUND
2417 && !bgPixmap.pixmap
2418#endif
2419 )
2420 {
2421 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2515 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2422 XClearWindow (display->display, parent[0]); 2516 XClearWindow (dpy, parent[0]);
2423 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2517 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2424#if HAVE_SCROLLBARS 2518
2425 if (scrollBar.win) 2519 if (scrollBar.win)
2426 { 2520 {
2427 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2521 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2428 scrollBar.setIdle (); 2522 scrollBar.state = STATE_IDLE;
2429 scrollbar_show (0); 2523 scrollBar.show (0);
2430 }
2431#endif
2432 } 2524 }
2433 2525
2526#endif
2527
2528 /* bgPixmap.apply () does not do the following : */
2434 scr_clear (); 2529 scr_clear ();
2435 scr_touch (true); 2530 scr_touch (true);
2436 want_refresh = 1; 2531 want_refresh = 1;
2437} 2532}
2438 2533
2439/* ------------------------------------------------------------------------- */ 2534/* ------------------------------------------------------------------------- */
2440void 2535void
2441rxvt_term::scr_clear (bool really) 2536rxvt_term::scr_clear (bool really) NOTHROW
2442{ 2537{
2443 if (!mapped) 2538 if (!mapped)
2444 return; 2539 return;
2445 2540
2446 num_scr_allow = 0; 2541 num_scr_allow = 0;
2447 want_refresh = 1; 2542 want_refresh = 1;
2448 2543
2449 if (really) 2544 if (really)
2450 XClearWindow (display->display, vt); 2545 XClearWindow (dpy, vt);
2451} 2546}
2452 2547
2453/* ------------------------------------------------------------------------- */
2454void 2548void
2549rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2550{
2551 int view_end = view_start + nrow;
2552 int row, col;
2553
2554 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2555 {
2556 text_t *stp = ROW(row).t;
2557 rend_t *srp = ROW(row).r;
2558
2559 for (col = beg_col; col < end_col; col++)
2560 srp[col] ^= rstyle1;
2561
2562 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2563 srp[col] ^= rstyle2;
2564
2565 if (++col < end_col)
2566 srp[col] ^= rstyle2;
2567 }
2568}
2569
2570void
2571rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2572{
2573 int view_end = view_start + nrow;
2574 int row, col;
2575
2576 if (beg_row >= view_start)
2577 {
2578 col = beg_col;
2579 row = beg_row;
2580 }
2581 else
2582 {
2583 col = 0;
2584 row = view_start;
2585 }
2586
2587 for (; row < min (end_row, view_end); row++, col = 0)
2588 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2589 srp[col] ^= rstyle;
2590
2591 if (row == end_row)
2592 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2593 srp[col] ^= rstyle;
2594}
2595
2596/* ------------------------------------------------------------------------- */
2597void
2455rxvt_term::scr_reverse_selection () 2598rxvt_term::scr_reverse_selection () NOTHROW
2456{ 2599{
2457 if (selection.op 2600 if (selection.op
2458 && current_screen == selection.screen 2601 && current_screen == selection.screen
2459 && selection.end.row >= -view_start) 2602 && selection.end.row >= view_start)
2460 { 2603 {
2461 int view_end = -view_start + nrow; 2604#if !ENABLE_MINIMAL
2462 int row, col;
2463
2464#if ENABLE_FRILLS
2465 if (selection.rect) 2605 if (selection.rect)
2466 { 2606 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++) 2607 selection.end.row, selection.end.col,
2468 { 2608 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 2609 else
2483#endif 2610#endif
2484 { 2611 scr_xor_span (selection.beg.row, selection.beg.col,
2485 if (selection.beg.row >= -view_start) 2612 selection.end.row, selection.end.col,
2486 { 2613 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 } 2614 }
2505} 2615}
2506 2616
2507/* ------------------------------------------------------------------------- */ 2617/* ------------------------------------------------------------------------- */
2508/* 2618/*
2509 * Dump the whole scrollback and screen to the passed filedescriptor. The 2619 * Dump the whole scrollback and screen to the passed filedescriptor. The
2510 * invoking routine must close the fd. 2620 * invoking routine must close the fd.
2511 */ 2621 */
2512#if 0 2622#if 0
2513void 2623void
2514rxvt_term::scr_dump (int fd) 2624rxvt_term::scr_dump (int fd) NOTHROW
2515{ 2625{
2516 int row, wrote; 2626 int row, wrote;
2517 unsigned int width, towrite; 2627 unsigned int width, towrite;
2518 char r1[] = "\n"; 2628 char r1[] = "\n";
2519 2629
2520 for (row = saveLines - nsaved; 2630 for (row = saveLines + top_row;
2521 row < saveLines + nrow - 1; row++) 2631 row < saveLines + nrow - 1; row++)
2522 { 2632 {
2523 width = row_buf[row].l >= 0 ? row_buf[row].l 2633 width = row_buf[row].l >= 0 ? row_buf[row].l
2524 : ncol; 2634 : ncol;
2525 for (towrite = width; towrite; towrite -= wrote) 2635 for (towrite = width; towrite; towrite -= wrote)
… …
2538 2648
2539/* ------------------------------------------------------------------------- * 2649/* ------------------------------------------------------------------------- *
2540 * CHARACTER SELECTION * 2650 * CHARACTER SELECTION *
2541 * ------------------------------------------------------------------------- */ 2651 * ------------------------------------------------------------------------- */
2542void 2652void
2543rxvt_term::selection_check (int check_more) 2653rxvt_term::selection_check (int check_more) NOTHROW
2544{ 2654{
2545 row_col_t pos; 2655 row_col_t pos;
2546 2656
2547 if (!selection.op) 2657 if (!selection.op)
2548 return; 2658 return;
2549 2659
2550 pos.row = pos.col = 0; 2660 pos.row = pos.col = 0;
2551 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2661 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2552 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2662 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2553 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2663 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2554 || (check_more == 1 2664 || (check_more == 1
2555 && current_screen == selection.screen 2665 && current_screen == selection.screen
2556 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2666 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2557 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2667 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2558 || (check_more == 2 2668 || (check_more == 2
… …
2569/* ------------------------------------------------------------------------- */ 2679/* ------------------------------------------------------------------------- */
2570/* 2680/*
2571 * Paste a selection direct to the command fd 2681 * Paste a selection direct to the command fd
2572 */ 2682 */
2573void 2683void
2574rxvt_term::paste (char *data, unsigned int len) 2684rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2575{ 2685{
2576 /* convert normal newline chars into common keyboard Return key sequence */ 2686 /* convert normal newline chars into common keyboard Return key sequence */
2577 for (unsigned int i = 0; i < len; i++) 2687 for (unsigned int i = 0; i < len; i++)
2578 if (data[i] == C0_LF) 2688 if (data[i] == C0_LF)
2579 data[i] = C0_CR; 2689 data[i] = C0_CR;
2580 2690
2691 if (priv_modes & PrivMode_BracketPaste)
2692 tt_printf ("\e[200~");
2693
2581 tt_write (data, len); 2694 tt_write (data, len);
2695
2696 if (priv_modes & PrivMode_BracketPaste)
2697 tt_printf ("\e[201~");
2698}
2699
2700void
2701rxvt_term::paste (char *data, unsigned int len) NOTHROW
2702{
2703 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2704 return;
2705
2706 tt_paste (data, len);
2582} 2707}
2583 2708
2584/* ------------------------------------------------------------------------- */ 2709/* ------------------------------------------------------------------------- */
2585/* 2710/*
2586 * Respond to a notification that a primary selection has been sent 2711 * Respond to a notification that a primary selection has been sent
2587 * EXT: SelectionNotify 2712 * EXT: SelectionNotify
2588 */ 2713 */
2589void 2714void
2590rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2715rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2591{ 2716{
2592 if (prop == None) /* check for failed XConvertSelection */ 2717 if (prop == None) /* check for failed XConvertSelection */
2593 { 2718 {
2594 if ((selection_type & Sel_CompoundText)) 2719 if ((selection_type & Sel_CompoundText))
2595 { 2720 {
… …
2615 } 2740 }
2616 2741
2617 unsigned long bytes_after; 2742 unsigned long bytes_after;
2618 XTextProperty ct; 2743 XTextProperty ct;
2619 2744
2620 if (XGetWindowProperty (display->display, win, prop, 2745 if (XGetWindowProperty (dpy, win, prop,
2621 0, PROP_SIZE / 4, 2746 0, PROP_SIZE / 4,
2622 delete_prop, AnyPropertyType, 2747 delete_prop, AnyPropertyType,
2623 &ct.encoding, &ct.format, 2748 &ct.encoding, &ct.format,
2624 &ct.nitems, &bytes_after, 2749 &ct.nitems, &bytes_after,
2625 &ct.value) != Success) 2750 &ct.value) != Success)
… …
2634 if (bytes_after) 2759 if (bytes_after)
2635 { 2760 {
2636 // fetch and append remaining data 2761 // fetch and append remaining data
2637 XTextProperty ct2; 2762 XTextProperty ct2;
2638 2763
2639 if (XGetWindowProperty (display->display, win, prop, 2764 if (XGetWindowProperty (dpy, win, prop,
2640 ct.nitems / 4, (bytes_after + 3) / 4, 2765 ct.nitems / 4, (bytes_after + 3) / 4,
2641 delete_prop, AnyPropertyType, 2766 delete_prop, AnyPropertyType,
2642 &ct2.encoding, &ct2.format, 2767 &ct2.encoding, &ct2.format,
2643 &ct2.nitems, &bytes_after, 2768 &ct2.nitems, &bytes_after,
2644 &ct2.value) != Success) 2769 &ct2.value) != Success)
… …
2657 2782
2658 if (ct.encoding == xa[XA_INCR]) 2783 if (ct.encoding == xa[XA_INCR])
2659 { 2784 {
2660 // INCR selection, start handshake 2785 // INCR selection, start handshake
2661 if (!delete_prop) 2786 if (!delete_prop)
2662 XDeleteProperty (display->display, win, prop); 2787 XDeleteProperty (dpy, win, prop);
2663 2788
2664 selection_wait = Sel_incr; 2789 selection_wait = Sel_incr;
2665 incr_buf_fill = 0; 2790 incr_buf_fill = 0;
2666 incr_ev.start (NOW + 10); 2791 incr_ev.start (10);
2667 2792
2668 goto bailout; 2793 goto bailout;
2669 } 2794 }
2670 2795
2671 if (ct.nitems == 0) 2796 if (ct.nitems == 0)
… …
2680 ct.nitems = incr_buf_fill; 2805 ct.nitems = incr_buf_fill;
2681 incr_buf = 0; 2806 incr_buf = 0;
2682 incr_buf_size = 0; 2807 incr_buf_size = 0;
2683 incr_ev.stop (); 2808 incr_ev.stop ();
2684 } 2809 }
2685 else 2810 else
2686 { 2811 {
2687 if (selection_wait == Sel_normal 2812 if (selection_wait == Sel_normal
2688 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2813 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2689 { 2814 {
2690 /* 2815 /*
… …
2697 goto bailout; 2822 goto bailout;
2698 } 2823 }
2699 } 2824 }
2700 else if (selection_wait == Sel_incr) 2825 else if (selection_wait == Sel_incr)
2701 { 2826 {
2702 incr_ev.start (NOW + 10); 2827 incr_ev.start (10);
2703 2828
2704 while (incr_buf_fill + ct.nitems > incr_buf_size) 2829 while (incr_buf_fill + ct.nitems > incr_buf_size)
2705 { 2830 {
2706 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2831 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2707 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2832 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2714 } 2839 }
2715 2840
2716 char **cl; 2841 char **cl;
2717 int cr; 2842 int cr;
2718 2843
2719#if ENABLE_FRILLS 2844#if !ENABLE_MINIMAL
2720 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2845 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2721 // so recode it manually 2846 // so recode it manually
2722 if (ct.encoding == xa[XA_UTF8_STRING]) 2847 if (ct.encoding == xa[XA_UTF8_STRING])
2723 { 2848 {
2724 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2849 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2728 paste (s, strlen (s)); 2853 paste (s, strlen (s));
2729 free (s); 2854 free (s);
2730 } 2855 }
2731 else 2856 else
2732#endif 2857#endif
2733 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2858 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2734 && cl) 2859 && cl)
2735 { 2860 {
2736 for (int i = 0; i < cr; i++) 2861 for (int i = 0; i < cr; i++)
2737 paste (cl[i], strlen (cl[i])); 2862 paste (cl[i], strlen (cl[i]));
2738 2863
… …
2747 if (selection_wait == Sel_normal) 2872 if (selection_wait == Sel_normal)
2748 selection_wait = Sel_none; 2873 selection_wait = Sel_none;
2749} 2874}
2750 2875
2751void 2876void
2752rxvt_term::incr_cb (time_watcher &w) 2877rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2753{ 2878{
2754 selection_wait = Sel_none; 2879 selection_wait = Sel_none;
2755 2880
2756 incr_buf_size = 0; 2881 incr_buf_size = 0;
2757 free (incr_buf); 2882 free (incr_buf);
2758 2883
2759 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2884 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2760} 2885}
2761 2886
2762void 2887void
2763rxvt_term::selection_property (Window win, Atom prop) 2888rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2764{ 2889{
2765 if (prop == None || selection_wait != Sel_incr) 2890 if (prop == None || selection_wait != Sel_incr)
2766 return; 2891 return;
2767 2892
2768 selection_paste (win, prop, true); 2893 selection_paste (win, prop, true);
2769} 2894}
2770 2895
2771/* ------------------------------------------------------------------------- */ 2896/* ------------------------------------------------------------------------- */
2772/* 2897/*
2773 * Request the current selection: 2898 * Request the current selection:
2774 * Order: > internal selection if available 2899 * Order: > internal selection if available
2775 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2900 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2776 * > CUT_BUFFER0 2901 * > CUT_BUFFER0
2777 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2902 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2778 * will auto fallback to CUT_BUFFER0 2903 * will auto fallback to CUT_BUFFER0
2779 * EXT: button 2 release 2904 * EXT: button 2 release
2780 */ 2905 */
2781void 2906void
2782rxvt_term::selection_request (Time tm, int x, int y) 2907rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2783{ 2908{
2784 if (x < 0 || x >= width || y < 0 || y >= height) 2909 if (selection.text && selnum == Sel_Primary)
2785 return; /* outside window */ 2910 {
2786
2787 if (selection.text)
2788 { /* internal selection */ 2911 /* internal selection */
2789 char *str = rxvt_wcstombs (selection.text, selection.len); 2912 char *str = rxvt_wcstombs (selection.text, selection.len);
2790 paste (str, strlen (str)); 2913 paste (str, strlen (str));
2791 free (str); 2914 free (str);
2792 return; 2915 return;
2793 } 2916 }
2794 else 2917 else
2795 { 2918 {
2796 int i;
2797
2798 selection_request_time = tm; 2919 selection_request_time = tm;
2799 selection_wait = Sel_normal; 2920 selection_wait = Sel_normal;
2800 2921
2801 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2802 {
2803#if X_HAVE_UTF8_STRING 2922#if X_HAVE_UTF8_STRING
2804 selection_type = Sel_UTF8String; 2923 selection_type = Sel_UTF8String;
2805 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2924 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2806 return; 2925 return;
2807#else 2926#else
2808 selection_type = Sel_CompoundText; 2927 selection_type = Sel_CompoundText;
2809 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2928 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2810 return; 2929 return;
2811#endif 2930#endif
2812 }
2813 } 2931 }
2814 2932
2815 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2933 selection_wait = Sel_none; /* don't loop in selection_paste () */
2816 selection_paste (display->root, XA_CUT_BUFFER0, false); 2934 selection_paste (display->root, XA_CUT_BUFFER0, false);
2817} 2935}
2818 2936
2819int 2937int
2820rxvt_term::selection_request_other (Atom target, int selnum) 2938rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2821{ 2939{
2822 Atom sel; 2940 Atom sel;
2823 2941
2824 selection_type |= selnum; 2942 selection_type |= selnum;
2825 2943
… …
2828 else if (selnum == Sel_Secondary) 2946 else if (selnum == Sel_Secondary)
2829 sel = XA_SECONDARY; 2947 sel = XA_SECONDARY;
2830 else 2948 else
2831 sel = xa[XA_CLIPBOARD]; 2949 sel = xa[XA_CLIPBOARD];
2832 2950
2833 if (XGetSelectionOwner (display->display, sel) != None) 2951 if (XGetSelectionOwner (dpy, sel) != None)
2834 { 2952 {
2835 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2953 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2836 vt, selection_request_time); 2954 vt, selection_request_time);
2837 return 1; 2955 return 1;
2838 } 2956 }
2839 2957
2840 return 0; 2958 return 0;
… …
2844/* 2962/*
2845 * Clear all selected text 2963 * Clear all selected text
2846 * EXT: SelectionClear 2964 * EXT: SelectionClear
2847 */ 2965 */
2848void 2966void
2849rxvt_term::selection_clear () 2967rxvt_term::selection_clear (bool clipboard) NOTHROW
2850{ 2968{
2969 if (!clipboard)
2970 {
2851 want_refresh = 1; 2971 want_refresh = 1;
2852 free (selection.text); 2972 free (selection.text);
2853 selection.text = NULL; 2973 selection.text = NULL;
2854 selection.len = 0; 2974 selection.len = 0;
2855 CLEAR_SELECTION (); 2975 CLEAR_SELECTION ();
2856 2976
2857 if (display->selection_owner == this) 2977 if (display->selection_owner == this)
2858 display->selection_owner = 0; 2978 display->selection_owner = 0;
2979 }
2980 else
2981 {
2982 free (selection.clip_text);
2983 selection.clip_text = NULL;
2984 selection.clip_len = 0;
2985
2986 if (display->clipboard_owner == this)
2987 display->clipboard_owner = 0;
2988 }
2859} 2989}
2860 2990
2861/* ------------------------------------------------------------------------- */ 2991/* ------------------------------------------------------------------------- */
2862/* 2992/*
2863 * Copy a selection into the cut buffer 2993 * Copy a selection into the cut buffer
… …
2903 3033
2904 int end_col; 3034 int end_col;
2905 3035
2906 for (; row <= selection.end.row; row++, col = 0) 3036 for (; row <= selection.end.row; row++, col = 0)
2907 { 3037 {
2908#if ENABLE_FRILLS 3038#if !ENABLE_MINIMAL
2909 if (selection.rect) 3039 if (selection.rect)
2910 { 3040 {
2911 col = selection.beg.col; 3041 col = selection.beg.col;
2912 end_col = ncol + 1; 3042 end_col = ncol + 1;
2913 } 3043 }
… …
2916 end_col = ROW(row).l; 3046 end_col = ROW(row).l;
2917 3047
2918 col = max (col, 0); 3048 col = max (col, 0);
2919 3049
2920 if (row == selection.end.row 3050 if (row == selection.end.row
2921#if ENABLE_FRILLS 3051#if !ENABLE_MINIMAL
2922 || selection.rect 3052 || selection.rect
2923#endif 3053#endif
2924 ) 3054 )
2925 min_it (end_col, selection.end.col); 3055 min_it (end_col, selection.end.col);
2926 3056
… …
2949#endif 3079#endif
2950 else 3080 else
2951 new_selection_text[ofs++] = *t++; 3081 new_selection_text[ofs++] = *t++;
2952 } 3082 }
2953 3083
2954#if ENABLE_FRILLS 3084#if !ENABLE_MINIMAL
2955 if (selection.rect) 3085 if (selection.rect)
2956 { 3086 {
2957 while (ofs 3087 while (ofs
2958 && new_selection_text[ofs - 1] != C0_LF 3088 && new_selection_text[ofs - 1] != C0_LF
2959 && unicode::is_space (new_selection_text[ofs - 1])) 3089 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2989 3119
2990 selection_grab (tm); 3120 selection_grab (tm);
2991} 3121}
2992 3122
2993bool 3123bool
2994rxvt_term::selection_grab (Time tm) 3124rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
2995{ 3125{
3126 Atom sel;
3127
3128 if (!clipboard)
3129 {
2996 selection_time = tm; 3130 selection_time = tm;
2997 3131 sel = XA_PRIMARY;
2998 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2999 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3000 { 3132 }
3133 else
3134 {
3135 clipboard_time = tm;
3136 sel = xa[XA_CLIPBOARD];
3137 }
3138
3139 XSetSelectionOwner (dpy, sel, vt, tm);
3140 if (XGetSelectionOwner (dpy, sel) == vt)
3141 {
3001 display->set_selection_owner (this); 3142 display->set_selection_owner (this, clipboard);
3002 return true; 3143 return true;
3003 } 3144 }
3004 else 3145 else
3146 {
3147 selection_clear (clipboard);
3005 return false; 3148 return false;
3149 }
3006 3150
3007#if 0 3151#if 0
3008 XTextProperty ct; 3152 XTextProperty ct;
3009 3153
3010 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3154 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3011 { 3155 {
3012 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3156 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3013 XFree (ct.value); 3157 XFree (ct.value);
3014 } 3158 }
3015#endif 3159#endif
… …
3019/* 3163/*
3020 * Mark or select text based upon number of clicks: 1, 2, or 3 3164 * Mark or select text based upon number of clicks: 1, 2, or 3
3021 * EXT: button 1 press 3165 * EXT: button 1 press
3022 */ 3166 */
3023void 3167void
3024rxvt_term::selection_click (int clicks, int x, int y) 3168rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3025{ 3169{
3026 clicks = ((clicks - 1) % 3) + 1; 3170 clicks = ((clicks - 1) % 3) + 1;
3027 selection.clicks = clicks; /* save clicks so extend will work */ 3171 selection.clicks = clicks; /* save clicks so extend will work */
3028 3172
3173 if (clicks == 2 && !selection.rect
3174 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3175 {
3176 MEvent.clicks = 1; // what a mess
3177 selection.screen = current_screen;
3178 selection.op = SELECTION_CONT;
3179 return;
3180 }
3181
3029 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3182 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3030 3183
3031 if (clicks == 2 || clicks == 3) 3184 if (clicks == 2 || clicks == 3)
3032 selection_extend_colrow (selection.mark.col, 3185 selection_extend_colrow (selection.mark.col,
3033 selection.mark.row + view_start, 3186 selection.mark.row - view_start,
3034 0, /* button 3 */ 3187 0, /* button 3 */
3035 1, /* button press */ 3188 1, /* button press */
3036 0); /* click change */ 3189 0); /* click change */
3037} 3190}
3038 3191
3039/* ------------------------------------------------------------------------- */ 3192/* ------------------------------------------------------------------------- */
3040/* 3193/*
3041 * Mark a selection at the specified col/row 3194 * Mark a selection at the specified col/row
3042 */ 3195 */
3043void 3196void
3044rxvt_term::selection_start_colrow (int col, int row) 3197rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3045{ 3198{
3046 want_refresh = 1; 3199 want_refresh = 1;
3047 3200
3048 selection.mark.row = row - view_start; 3201 selection.mark.row = row + view_start;
3049 selection.mark.col = col; 3202 selection.mark.col = col;
3050 3203
3051 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3204 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3052 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3205 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3053 3206
3054 while (selection.mark.col > 0 3207 while (selection.mark.col > 0
3055 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3208 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3056 --selection.mark.col; 3209 --selection.mark.col;
3057 3210
3058 if (selection.op) 3211 if (selection.op)
3212 {
3059 { /* clear the old selection */ 3213 /* clear the old selection */
3060 selection.beg.row = selection.end.row = selection.mark.row; 3214 selection.beg.row = selection.end.row = selection.mark.row;
3061 selection.beg.col = selection.end.col = selection.mark.col; 3215 selection.beg.col = selection.end.col = selection.mark.col;
3062 } 3216 }
3063 3217
3064 selection.op = SELECTION_INIT; 3218 selection.op = SELECTION_INIT;
… …
3075#define DELIMIT_TEXT(x) \ 3229#define DELIMIT_TEXT(x) \
3076 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3230 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3077#define DELIMIT_REND(x) 1 3231#define DELIMIT_REND(x) 1
3078 3232
3079void 3233void
3080rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3234rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3081{ 3235{
3082 int col, row, dirnadd, tcol, trow, w1, w2; 3236 int col, row, dirnadd, tcol, trow, w1, w2;
3083 row_col_t bound; 3237 row_col_t bound;
3084 text_t *stp; 3238 text_t *stp;
3085 rend_t *srp; 3239 rend_t *srp;
3086 3240
3087 if (dirn == UP) 3241 if (dirn == UP)
3088 { 3242 {
3089 bound.row = - nsaved - 1; 3243 bound.row = top_row - 1;
3090 bound.col = 0; 3244 bound.col = 0;
3091 dirnadd = -1; 3245 dirnadd = -1;
3092 } 3246 }
3093 else 3247 else
3094 { 3248 {
… …
3159 * flag == 0 ==> button 1 3313 * flag == 0 ==> button 1
3160 * flag == 1 ==> button 3 press 3314 * flag == 1 ==> button 3 press
3161 * flag == 2 ==> button 3 motion 3315 * flag == 2 ==> button 3 motion
3162 */ 3316 */
3163void 3317void
3164rxvt_term::selection_extend (int x, int y, int flag) 3318rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3165{ 3319{
3166 int col = clamp (Pixel2Col (x), 0, ncol); 3320 int col = clamp (Pixel2Col (x), 0, ncol);
3167 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3321 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3168 3322
3169 /* 3323 /*
… …
3172 * select nothing. Otherwise, if we're to the right of the mark, you have to 3326 * 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. 3327 * be _past_ a character for it to be selected.
3174 */ 3328 */
3175 if (((selection.clicks % 3) == 1) && !flag 3329 if (((selection.clicks % 3) == 1) && !flag
3176 && (col == selection.mark.col 3330 && (col == selection.mark.col
3177 && (row == selection.mark.row + view_start))) 3331 && (row == selection.mark.row - view_start)))
3178 { 3332 {
3179 /* select nothing */ 3333 /* select nothing */
3180 selection.beg.row = selection.end.row = 0; 3334 selection.beg.row = selection.end.row = 0;
3181 selection.beg.col = selection.end.col = 0; 3335 selection.beg.col = selection.end.col = 0;
3182 selection.clicks = 4; 3336 selection.clicks = 4;
… …
3195/* ------------------------------------------------------------------------- */ 3349/* ------------------------------------------------------------------------- */
3196/* 3350/*
3197 * Extend the selection to the specified col/row 3351 * Extend the selection to the specified col/row
3198 */ 3352 */
3199void 3353void
3200rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3354rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3201{ 3355{
3202 row_col_t pos; 3356 row_col_t pos;
3203 enum { 3357 enum {
3204 LEFT, RIGHT 3358 LEFT, RIGHT
3205 } closeto = RIGHT; 3359 } closeto = RIGHT;
… …
3237 selection.beg.col = selection.end.col = selection.mark.col; 3391 selection.beg.col = selection.end.col = selection.mark.col;
3238 selection.beg.row = selection.end.row = selection.mark.row; 3392 selection.beg.row = selection.end.row = selection.mark.row;
3239 } 3393 }
3240 3394
3241 pos.col = col; 3395 pos.col = col;
3242 pos.row = row - view_start; 3396 pos.row = view_start + row;
3243 3397
3244 /* 3398 /*
3245 * This is mainly xterm style selection with a couple of differences, mainly 3399 * This is mainly xterm style selection with a couple of differences, mainly
3246 * in the way button3 drag extension works. 3400 * in the way button3 drag extension works.
3247 * We're either doing: button1 drag; button3 press; or button3 drag 3401 * 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 3407 * 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 3408 * and it was decided by whichever point/word/line was `fixed' at the
3255 * time of the most recent button3 press 3409 * time of the most recent button3 press
3256 */ 3410 */
3257 if (button3 && buttonpress) 3411 if (button3 && buttonpress)
3412 {
3258 { /* button3 press */ 3413 /* button3 press */
3259 /* 3414 /*
3260 * first determine which edge of the selection we are closest to 3415 * first determine which edge of the selection we are closest to
3261 */ 3416 */
3262 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3417 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3263 || (!ROWCOL_IS_AFTER (pos, selection.end) 3418 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3281 selection.mark.row = selection.beg.row; 3436 selection.mark.row = selection.beg.row;
3282 selection.mark.col = selection.beg.col; 3437 selection.mark.col = selection.beg.col;
3283 } 3438 }
3284 } 3439 }
3285 else 3440 else
3441 {
3286 { /* button1 drag or button3 drag */ 3442 /* button1 drag or button3 drag */
3287 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3443 if (ROWCOL_IS_AFTER (selection.mark, pos))
3288 { 3444 {
3289 if (selection.mark.row == selection.end.row 3445 if (selection.mark.row == selection.end.row
3290 && selection.mark.col == selection.end.col 3446 && selection.mark.col == selection.end.col
3291 && clickchange 3447 && clickchange
… …
3308 3464
3309 if (selection.clicks == 1) 3465 if (selection.clicks == 1)
3310 { 3466 {
3311 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3467 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3312 && !ROW(selection.beg.row).is_longer () 3468 && !ROW(selection.beg.row).is_longer ()
3313#if ENABLE_FRILLS 3469#if !ENABLE_MINIMAL
3314 && !selection.rect 3470 && !selection.rect
3315#endif 3471#endif
3316 ) 3472 )
3317 selection.beg.col = ncol; 3473 selection.beg.col = ncol;
3318 3474
3319 if ( 3475 if (
3320 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3476 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3321 && !ROW(selection.end.row).is_longer () 3477 && !ROW(selection.end.row).is_longer ()
3322#if ENABLE_FRILLS 3478#if !ENABLE_MINIMAL
3323 && !selection.rect 3479 && !selection.rect
3324#endif 3480#endif
3325 ) 3481 )
3326 selection.end.col = ncol; 3482 selection.end.col = ncol;
3327 } 3483 }
3328 else if (selection.clicks == 2) 3484 else if (selection.clicks == 2)
3329 { 3485 {
3330 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3486 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3331 selection.end.col--; 3487 selection.end.col--;
3332 3488
3333 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3334 {
3335 selection_delimit_word (UP, &selection.beg, &selection.beg); 3489 selection_delimit_word (UP, &selection.beg, &selection.beg);
3336 selection_delimit_word (DN, &selection.end, &selection.end); 3490 selection_delimit_word (DN, &selection.end, &selection.end);
3337 }
3338 } 3491 }
3339 else if (selection.clicks == 3) 3492 else if (selection.clicks == 3)
3340 { 3493 {
3341#if ENABLE_FRILLS 3494#if ENABLE_FRILLS
3342 if (OPTION (Opt_tripleclickwords)) 3495 if (option (Opt_tripleclickwords))
3343 { 3496 {
3344 selection_delimit_word (UP, &selection.beg, &selection.beg); 3497 selection_delimit_word (UP, &selection.beg, &selection.beg);
3345 3498
3346 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3499 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3347 { 3500 {
3348 if (!ROW(end_row).is_longer ()) 3501 if (!ROW(end_row).is_longer ())
3349 { 3502 {
3350 selection.end.row = end_row; 3503 selection.end.row = end_row;
3351 selection.end.col = ROW(end_row).l; 3504 selection.end.col = ROW(end_row).l;
3505# if !ENABLE_MINIMAL
3352 selection_remove_trailing_spaces (); 3506 selection_remove_trailing_spaces ();
3507# endif
3353 break; 3508 break;
3354 } 3509 }
3355 } 3510 }
3356 } 3511 }
3357 else 3512 else
… …
3373 selection.end.row++; 3528 selection.end.row++;
3374 } 3529 }
3375 } 3530 }
3376 3531
3377 if (button3 && buttonpress) 3532 if (button3 && buttonpress)
3533 {
3378 { /* mark may need to be changed */ 3534 /* mark may need to be changed */
3379 if (closeto == LEFT) 3535 if (closeto == LEFT)
3380 { 3536 {
3381 selection.mark.row = selection.end.row; 3537 selection.mark.row = selection.end.row;
3382 selection.mark.col = selection.end.col - (selection.clicks == 2); 3538 selection.mark.col = selection.end.col - (selection.clicks == 2);
3383 } 3539 }
… …
3386 selection.mark.row = selection.beg.row; 3542 selection.mark.row = selection.beg.row;
3387 selection.mark.col = selection.beg.col; 3543 selection.mark.col = selection.beg.col;
3388 } 3544 }
3389 } 3545 }
3390 3546
3391#if ENABLE_FRILLS 3547#if !ENABLE_MINIMAL
3392 if (selection.rect && selection.beg.col > selection.end.col) 3548 if (selection.rect && selection.beg.col > selection.end.col)
3393 ::swap (selection.beg.col, selection.end.col); 3549 ::swap (selection.beg.col, selection.end.col);
3394#endif 3550#endif
3395} 3551}
3396 3552
3397#if ENABLE_FRILLS 3553#if !ENABLE_MINIMAL
3398void 3554void
3399rxvt_term::selection_remove_trailing_spaces () 3555rxvt_term::selection_remove_trailing_spaces () NOTHROW
3400{ 3556{
3401 int32_t end_col, end_row; 3557 int32_t end_col, end_row;
3402 text_t *stp; 3558 text_t *stp;
3403 3559
3404 end_col = selection.end.col; 3560 end_col = selection.end.col;
… …
3442/* 3598/*
3443 * Double click on button 3 when already selected 3599 * Double click on button 3 when already selected
3444 * EXT: button 3 double click 3600 * EXT: button 3 double click
3445 */ 3601 */
3446void 3602void
3447rxvt_term::selection_rotate (int x, int y) 3603rxvt_term::selection_rotate (int x, int y) NOTHROW
3448{ 3604{
3449 selection.clicks = selection.clicks % 3 + 1; 3605 selection.clicks = selection.clicks % 3 + 1;
3450 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3606 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3451} 3607}
3452 3608
… …
3454/* 3610/*
3455 * Respond to a request for our current selection 3611 * Respond to a request for our current selection
3456 * EXT: SelectionRequest 3612 * EXT: SelectionRequest
3457 */ 3613 */
3458void 3614void
3459rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3615rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3460{ 3616{
3461 XSelectionEvent ev; 3617 XSelectionEvent ev;
3462 dDisp;
3463 3618
3464 ev.type = SelectionNotify; 3619 ev.type = SelectionNotify;
3465 ev.property = None; 3620 ev.property = None;
3466 ev.display = rq.display; 3621 ev.display = rq.display;
3467 ev.requestor = rq.requestor; 3622 ev.requestor = rq.requestor;
… …
3481 *target++ = xa[XA_COMPOUND_TEXT]; 3636 *target++ = xa[XA_COMPOUND_TEXT];
3482#if X_HAVE_UTF8_STRING 3637#if X_HAVE_UTF8_STRING
3483 *target++ = xa[XA_UTF8_STRING]; 3638 *target++ = xa[XA_UTF8_STRING];
3484#endif 3639#endif
3485 3640
3486 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3641 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3487 32, PropModeReplace, 3642 32, PropModeReplace,
3488 (unsigned char *)target_list, target - target_list); 3643 (unsigned char *)target_list, target - target_list);
3489 ev.property = rq.property; 3644 ev.property = rq.property;
3490 } 3645 }
3491#if TODO // TODO 3646#if TODO // TODO
3492 else if (rq.target == xa[XA_MULTIPLE]) 3647 else if (rq.target == xa[XA_MULTIPLE])
3493 { 3648 {
3494 /* TODO: Handle MULTIPLE */ 3649 /* TODO: Handle MULTIPLE */
3495 } 3650 }
3496#endif 3651#endif
3497 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3652 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3498 { 3653 {
3499 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3654 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3500 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3655 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3656 ev.property = rq.property;
3657 }
3658 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3659 {
3660 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3661 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3501 ev.property = rq.property; 3662 ev.property = rq.property;
3502 } 3663 }
3503 else if (rq.target == XA_STRING 3664 else if (rq.target == XA_STRING
3504 || rq.target == xa[XA_TEXT] 3665 || rq.target == xa[XA_TEXT]
3505 || rq.target == xa[XA_COMPOUND_TEXT] 3666 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3528 style = enc_string; 3689 style = enc_string;
3529 else if (target == xa[XA_TEXT]) 3690 else if (target == xa[XA_TEXT])
3530 style = enc_text; 3691 style = enc_text;
3531 else if (target == xa[XA_COMPOUND_TEXT]) 3692 else if (target == xa[XA_COMPOUND_TEXT])
3532 style = enc_compound_text; 3693 style = enc_compound_text;
3533#if ENABLE_FRILLS 3694#if !ENABLE_MINIMAL
3534 else if (target == xa[XA_UTF8_STRING]) 3695 else if (target == xa[XA_UTF8_STRING])
3535 style = enc_utf8; 3696 style = enc_utf8;
3536#endif 3697#endif
3537 else 3698 else
3538 { 3699 {
3539 target = xa[XA_COMPOUND_TEXT]; 3700 target = xa[XA_COMPOUND_TEXT];
3540 style = enc_compound_text; 3701 style = enc_compound_text;
3541 } 3702 }
3542 3703
3543 if (selection.text) 3704 if (rq.selection == XA_PRIMARY && selection.text)
3544 { 3705 {
3545 cl = selection.text; 3706 cl = selection.text;
3546 selectlen = selection.len; 3707 selectlen = selection.len;
3547 } 3708 }
3709 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3710 {
3711 cl = selection.clip_text;
3712 selectlen = selection.clip_len;
3713 }
3548 else 3714 else
3549 { 3715 {
3550 cl = L""; 3716 cl = L"";
3551 selectlen = 0; 3717 selectlen = 0;
3552 } 3718 }
3553 3719
3554#if ENABLE_FRILLS 3720#if !ENABLE_MINIMAL
3555 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3721 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3556 // so recode it manually 3722 // so recode it manually
3557 if (style == enc_utf8) 3723 if (style == enc_utf8)
3558 { 3724 {
3559 freect = 1; 3725 freect = 1;
… …
3562 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3728 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3563 ct.nitems = strlen ((char *)ct.value); 3729 ct.nitems = strlen ((char *)ct.value);
3564 } 3730 }
3565 else 3731 else
3566#endif 3732#endif
3567 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3733 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3568 freect = 1; 3734 freect = 1;
3569 else 3735 else
3570 { 3736 {
3571 /* if we failed to convert then send it raw */ 3737 /* if we failed to convert then send it raw */
3572 ct.value = (unsigned char *)cl; 3738 ct.value = (unsigned char *)cl;
3573 ct.nitems = selectlen; 3739 ct.nitems = selectlen;
3574 ct.encoding = target; 3740 ct.encoding = target;
3575 } 3741 }
3576 3742
3577 XChangeProperty (disp, rq.requestor, rq.property, 3743 XChangeProperty (dpy, rq.requestor, rq.property,
3578 ct.encoding, 8, PropModeReplace, 3744 ct.encoding, 8, PropModeReplace,
3579 ct.value, (int)ct.nitems); 3745 ct.value, (int)ct.nitems);
3580 ev.property = rq.property; 3746 ev.property = rq.property;
3581 3747
3582 if (freect) 3748 if (freect)
3583 XFree (ct.value); 3749 XFree (ct.value);
3584 } 3750 }
3585 3751
3586 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3752 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} 3753}
3604 3754
3605/* ------------------------------------------------------------------------- */ 3755/* ------------------------------------------------------------------------- */
3606#ifdef USE_XIM 3756#ifdef USE_XIM
3607void 3757void
3608rxvt_term::im_set_position (XPoint &pos) 3758rxvt_term::im_set_position (XPoint &pos) NOTHROW
3609{ 3759{
3610 XWindowAttributes xwa; 3760 XWindowAttributes xwa;
3611 3761
3612 XGetWindowAttributes (display->display, vt, &xwa); 3762 XGetWindowAttributes (dpy, vt, &xwa);
3613 3763
3614 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3764 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3615 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3765 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3616} 3766}
3617#endif 3767#endif
3618 3768
3619#if ENABLE_OVERLAY 3769#if ENABLE_OVERLAY
3620void 3770void
3621rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3771rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3622{ 3772{
3623 if (nrow < 1 || ncol < 1) 3773 if (nrow < 1 || ncol < 1)
3624 return; 3774 return;
3625 3775
3626 want_refresh = 1; 3776 want_refresh = 1;
… …
3635 h += 2; min_it (h, nrow); 3785 h += 2; min_it (h, nrow);
3636 3786
3637 x -= 1; clamp_it (x, 0, ncol - w); 3787 x -= 1; clamp_it (x, 0, ncol - w);
3638 y -= 1; clamp_it (y, 0, nrow - h); 3788 y -= 1; clamp_it (y, 0, nrow - h);
3639 3789
3640 ov_x = x; ov_y = y; 3790 ov.x = x; ov.y = y;
3641 ov_w = w; ov_h = h; 3791 ov.w = w; ov.h = h;
3642 3792
3643 ov_text = new text_t *[h]; 3793 ov.text = new text_t *[h];
3644 ov_rend = new rend_t *[h]; 3794 ov.rend = new rend_t *[h];
3645 3795
3646 for (y = 0; y < h; y++) 3796 for (y = 0; y < h; y++)
3647 { 3797 {
3648 text_t *tp = ov_text[y] = new text_t[w]; 3798 text_t *tp = ov.text[y] = new text_t[w];
3649 rend_t *rp = ov_rend[y] = new rend_t[w]; 3799 rend_t *rp = ov.rend[y] = new rend_t[w];
3650 3800
3651 text_t t0, t1, t2; 3801 text_t t0, t1, t2;
3652 rend_t r = OVERLAY_RSTYLE; 3802 rend_t r = OVERLAY_RSTYLE;
3653 3803
3654 if (y == 0) 3804 if (y == 0)
… …
3671 *rp = r; 3821 *rp = r;
3672 } 3822 }
3673} 3823}
3674 3824
3675void 3825void
3676rxvt_term::scr_overlay_off () 3826rxvt_term::scr_overlay_off () NOTHROW
3677{ 3827{
3678 if (!ov_text) 3828 if (!ov.text)
3679 return; 3829 return;
3680 3830
3681 want_refresh = 1; 3831 want_refresh = 1;
3682 3832
3683 for (int y = 0; y < ov_h; y++) 3833 for (int y = 0; y < ov.h; y++)
3684 { 3834 {
3685 delete [] ov_text[y]; 3835 delete [] ov.text[y];
3686 delete [] ov_rend[y]; 3836 delete [] ov.rend[y];
3687 } 3837 }
3688 3838
3689 delete [] ov_text; ov_text = 0; 3839 delete [] ov.text; ov.text = 0;
3690 delete [] ov_rend; ov_rend = 0; 3840 delete [] ov.rend; ov.rend = 0;
3691} 3841}
3692 3842
3693void 3843void
3694rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3844rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3695{ 3845{
3696 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3846 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3697 return; 3847 return;
3698 3848
3699 x++, y++; 3849 x++, y++;
3700 3850
3701 ov_text[y][x] = text; 3851 ov.text[y][x] = text;
3702 ov_rend[y][x] = rend; 3852 ov.rend[y][x] = rend;
3703} 3853}
3704 3854
3705void 3855void
3706rxvt_term::scr_overlay_set (int x, int y, const char *s) 3856rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3707{ 3857{
3708 while (*s) 3858 while (*s)
3709 scr_overlay_set (x++, y, *s++); 3859 scr_overlay_set (x++, y, *s++);
3710} 3860}
3711 3861
3712void 3862void
3713rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3863rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3714{ 3864{
3715 while (*s) 3865 while (*s)
3716 { 3866 {
3717 text_t t = *s++; 3867 text_t t = *s++;
3718 int width = wcwidth (t); 3868 int width = WCWIDTH (t);
3719 3869
3720 while (width--) 3870 while (width--)
3721 { 3871 {
3722 scr_overlay_set (x++, y, t); 3872 scr_overlay_set (x++, y, t);
3723 t = NOCHAR; 3873 t = NOCHAR;
3724 } 3874 }
3725 } 3875 }
3726} 3876}
3727 3877
3728void 3878void
3729rxvt_term::scr_swap_overlay () 3879rxvt_term::scr_swap_overlay () NOTHROW
3730{ 3880{
3731 if (!ov_text) 3881 if (!ov.text)
3732 return; 3882 return;
3733 3883
3884 // hide cursor if it is within the overlay area
3885 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3886 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3887 screen.flags &= ~Screen_VisibleCursor;
3888
3734 // swap screen mem with overlay 3889 // swap screen mem with overlay
3735 for (int y = ov_h; y--; ) 3890 for (int y = ov.h; y--; )
3736 { 3891 {
3737 text_t *t1 = ov_text[y]; 3892 text_t *t1 = ov.text[y];
3738 rend_t *r1 = ov_rend[y]; 3893 rend_t *r1 = ov.rend[y];
3739 3894
3740 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3895 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; 3896 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3742 3897
3743 for (int x = ov_w; x--; ) 3898 for (int x = ov.w; x--; )
3744 { 3899 {
3745 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3900 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3746 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3901 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3747 } 3902 }
3748 } 3903 }

Diff Legend

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