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.211 by root, Fri Jan 6 01:16:58 2006 UTC vs.
Revision 1.351 by sf-exg, Fri Oct 15 11:07:45 2010 UTC

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

Diff Legend

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