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.236 by root, Wed Jan 18 09:40:53 2006 UTC vs.
Revision 1.415 by root, Mon May 28 14:25:16 2012 UTC

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

Diff Legend

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