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.266 by root, Mon Oct 9 23:12:45 2006 UTC vs.
Revision 1.415 by root, Mon May 28 14:25:16 2012 UTC

1/*---------------------------------------------------------------------------* 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 (dpy, 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 (dpy, 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 (dpy, 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 NOTHROW 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 ();
… …
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
… …
172 if (nrow == 0) 208 if (nrow == 0)
173 nrow = 24; 209 nrow = 24;
174 210
175 if (ncol == prev_ncol && nrow == prev_nrow) 211 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 212 return;
177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180 213
181 // we need at least two lines for wrapping to work correctly 214 // we need at least two lines for wrapping to work correctly
182 while (nrow + saveLines < 2) 215 while (nrow + saveLines < 2)
183 { 216 {
184 //TODO//FIXME 217 //TODO//FIXME
… …
193 total_rows = nrow + saveLines; 226 total_rows = nrow + saveLines;
194 227
195 screen.tscroll = 0; 228 screen.tscroll = 0;
196 screen.bscroll = nrow - 1; 229 screen.bscroll = nrow - 1;
197 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
198 if (!row_buf) 240 if (!prev_row_buf)
199 { 241 {
200 /* 242 /*
201 * 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
202 */ 244 */
203 top_row = 0; 245 top_row = 0;
204 term_start = 0; 246 term_start = 0;
205
206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
208
209 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
212
213 for (int row = nrow; row--; )
214 {
215 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
216 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
217 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
218 }
219 247
220 memset (charsets, 'B', sizeof (charsets)); 248 memset (charsets, 'B', sizeof (charsets));
221 rstyle = DEFAULT_RSTYLE; 249 rstyle = DEFAULT_RSTYLE;
222 screen.flags = Screen_DefaultFlags; 250 screen.flags = Screen_DefaultFlags;
223 screen.cur.row = screen.cur.col = 0; 251 screen.cur.row = screen.cur.col = 0;
… …
237 selection.text = NULL; 265 selection.text = NULL;
238 selection.len = 0; 266 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 267 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 268 selection.screen = PRIMARY;
241 selection.clicks = 0; 269 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false; 270 selection.clip_text = NULL;
271 selection.clip_len = 0;
243 } 272 }
244 else 273 else
245 { 274 {
246 /* 275 /*
247 * add or delete rows as appropriate 276 * add or delete rows as appropriate
248 */ 277 */
249 278
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253#if 0
254 if (nrow < prev_nrow)
255 {
256 for (int row = nrow; row < prev_nrow; row++)
257 {
258 lfree (swap_buf [row]);
259 lfree (drawn_buf[row]);
260 }
261 }
262#endif
263
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266
267 for (int row = min (nrow, prev_nrow); row--; ) 279 for (int row = min (nrow, prev_nrow); row--; )
268 { 280 {
269 lresize (drawn_buf[row]);
270 lresize (swap_buf [row]);
271 }
272
273 for (int row = prev_nrow; row < nrow; row++)
274 {
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 281 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
277 } 282 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
278 283
279 line_t *old_buf = row_buf; 284 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
280 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);
281 288 }
289
282 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
283 int pend = MOD (term_start + top_row , prev_total_rows); 291 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 292 int q = total_rows; // rewrapped row
285 293
286 if (top_row) 294 if (top_row)
287 { 295 {
288 // 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
289 // 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
290 299
291 row_col_t ocur = screen.cur; 300 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 301 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 302
294 do 303 do
295 { 304 {
296 p = MOD (p - 1, prev_total_rows); 305 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t); 306 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1; 307 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l; 308 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
302 309
303 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 ())
304 { 311 {
305 p = MOD (p - 1, prev_total_rows); 312 p = MOD (p - 1, prev_total_rows);
306 313
307 plines++; 314 plines++;
308 llen += prev_ncol; 315 llen += prev_ncol;
… …
321 328
322 // re-assemble the full line by destination lines 329 // re-assemble the full line by destination lines
323 for (int qrow = q; qlines--; qrow++) 330 for (int qrow = q; qlines--; qrow++)
324 { 331 {
325 qline = row_buf + qrow; 332 qline = row_buf + qrow;
326 lalloc (*qline); 333 qline->alloc (); // redundant with next line
327 qline->l = ncol; 334 qline->l = ncol;
328 qline->is_longer (1); 335 qline->is_longer (1);
329 336
330 int qcol = 0; 337 int qcol = 0;
331 338
332 // see below for cursor adjustment rationale 339 // see below for cursor adjustment rationale
333 if (p == ocur.row) 340 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 341 screen.cur.row = q - (total_rows - nrow);
335 342
336 // fill a single destination line 343 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 344 while (lofs < llen && qcol < ncol)
338 { 345 {
339 int prow = lofs / prev_ncol; 346 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 347 int pcol = lofs % prev_ncol;
… …
346 // this seems to upset applications/shells/readline 353 // this seems to upset applications/shells/readline
347 // least. 354 // least.
348 if (prow == ocur.row) 355 if (prow == ocur.row)
349 screen.cur.row = q - (total_rows - nrow); 356 screen.cur.row = q - (total_rows - nrow);
350 357
351 line_t &pline = old_buf [prow]; 358 line_t &pline = prev_row_buf [prow];
352 359
353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 360 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
354 361
355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 362 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 363 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
366 } 373 }
367 while (p != pend && q > 0); 374 while (p != pend && q > 0);
368 375
369 term_start = total_rows - nrow; 376 term_start = total_rows - nrow;
370 top_row = q - term_start; 377 top_row = q - term_start;
371 378
372 // make sure all terminal lines exist 379 // make sure all terminal lines exist
373 while (top_row > 0) 380 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 381 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 382 }
376 else 383 else
377 { 384 {
378 // if no scrollback exists (yet), wing, instead of wrap 385 // if no scrollback exists (yet), wing, instead of wrap
379 386
380 for (int row = min (nrow, prev_nrow); row--; ) 387 for (int row = min (nrow, prev_nrow); row--; )
381 { 388 {
382 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)];
383 line_t &qline = row_buf [row]; 390 line_t &dst = row_buf [row];
384 391
385 qline = pline; 392 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
386 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);
387 } 396 }
388 397
389 for (int row = prev_nrow; row < nrow; row++) 398 for (int row = prev_nrow; row < nrow; row++)
390 {
391 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 399 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
392 }
393 400
394 term_start = 0; 401 term_start = 0;
395 } 402 }
396
397 free (old_buf);
398 delete old_ta;
399 delete old_ra;
400 403
401 clamp_it (screen.cur.row, 0, nrow - 1); 404 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 405 clamp_it (screen.cur.col, 0, ncol - 1);
406 }
403 407
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
404 free (tabs); 417 free (tabs);
405 } 418 tabs = (char *)rxvt_malloc (ncol);
419
420 for (int col = ncol; col--; )
421 tabs [col] = col % TABSIZE == 0;
406 422
407 CLEAR_ALL_SELECTION (); 423 CLEAR_ALL_SELECTION ();
408 424
409 prev_nrow = nrow; 425 prev_nrow = nrow;
410 prev_ncol = ncol; 426 prev_ncol = ncol;
411 427
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 428 tt_winch ();
413 429
414 for (int col = ncol; --col; ) 430 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
415 tabs [col] = col % TABSIZE == 0; 431}
432
433/* ------------------------------------------------------------------------- */
434/*
435 * Free everything. That way malloc debugging can find leakage.
436 */
437void
438rxvt_term::scr_release () NOTHROW
439{
440 free (chunk);
441 free (tabs);
442}
443
444/* ------------------------------------------------------------------------- */
445/*
446 * Hard/Soft reset
447 */
448void
449rxvt_term::scr_poweron ()
450{
451 scr_release ();
452
453 row_buf = 0;
454 tabs = 0;
455 prev_nrow = prev_ncol = 0;
456 rvideo_mode = false;
457 scr_soft_reset ();
458 scr_reset ();
459
460 scr_clear (true);
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
416 471
417 if (current_screen != PRIMARY) 472 if (current_screen != PRIMARY)
418 scr_swap_screen (); 473 scr_swap_screen ();
419 474
420 tt_winch (); 475 scr_scroll_region (0, MAX_ROWS - 1);
421 476 scr_rendition (0, ~RS_None);
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 477 scr_insert_mode (0);
423}
424
425/* ------------------------------------------------------------------------- */
426/*
427 * Free everything. That way malloc debugging can find leakage.
428 */
429void
430rxvt_term::scr_release () NOTHROW
431{
432 if (row_buf)
433 {
434 delete talloc; talloc = 0;
435 delete ralloc; ralloc = 0;
436
437 free (row_buf);
438 free (swap_buf);
439 free (drawn_buf);
440 free (tabs);
441
442 row_buf = 0; // signal that we freed all the arrays
443 }
444}
445
446/* ------------------------------------------------------------------------- */
447/*
448 * Hard reset
449 */
450void
451rxvt_term::scr_poweron ()
452{
453 scr_release ();
454 prev_nrow = prev_ncol = 0;
455 scr_reset ();
456
457 scr_clear (true);
458 scr_refresh ();
459} 478}
460 479
461/* ------------------------------------------------------------------------- * 480/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 481 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 482 * ------------------------------------------------------------------------- */
… …
501 } 520 }
502 521
503 /* boundary check in case screen size changed between SAVE and RESTORE */ 522 /* boundary check in case screen size changed between SAVE and RESTORE */
504 min_it (s->cur.row, nrow - 1); 523 min_it (s->cur.row, nrow - 1);
505 min_it (s->cur.col, ncol - 1); 524 min_it (s->cur.col, ncol - 1);
506#ifdef DEBUG_STRICT
507 assert (s->cur.row >= 0); 525 assert (s->cur.row >= 0);
508 assert (s->cur.col >= 0); 526 assert (s->cur.col >= 0);
509#endif
510} 527}
511 528
512void 529void
513rxvt_term::scr_swap_screen () 530rxvt_term::scr_swap_screen () NOTHROW
514{ 531{
515 if (!OPTION (Opt_secondaryScreen)) 532 if (!option (Opt_secondaryScreen))
516 return; 533 return;
517 534
518 for (int i = prev_nrow; i--; ) 535 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 536 ::swap (ROW(i), swap_buf [i]);
520 537
… …
537 return; 554 return;
538 555
539 want_refresh = 1; 556 want_refresh = 1;
540 view_start = 0; 557 view_start = 0;
541 558
542 selection_check (2); /* check for boundary cross */ 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 ();
543 565
544 int i = current_screen; current_screen = scrn; scrn = i; 566 current_screen = scrn;
545 567
546#if NSCREENS 568#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 569 if (option (Opt_secondaryScreen))
548 { 570 {
549 num_scr = 0; 571 num_scr = 0;
550 572
551 scr_swap_screen (); 573 scr_swap_screen ();
552 574
… …
555 screen.flags |= Screen_VisibleCursor; 577 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 578 swap.flags |= Screen_VisibleCursor;
557 } 579 }
558 else 580 else
559#endif 581#endif
560 if (OPTION (Opt_secondaryScroll)) 582 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 583 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 584}
563 585
564// clear WrapNext indicator, solidifying position on next line 586// clear WrapNext indicator, solidifying position on next line
565void 587void
… …
598/* 620/*
599 * Change the rendition style for following text 621 * Change the rendition style for following text
600 */ 622 */
601void 623void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 624rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 625{
604 if (set) 626 if (set)
605 rstyle |= style; 627 rstyle |= style;
606 else if (style == ~RS_None) 628 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 629 rstyle = DEFAULT_RSTYLE;
608 else 630 else
609 rstyle &= ~style; 631 rstyle &= ~style;
610 } 632}
611 633
612/* ------------------------------------------------------------------------- */ 634/* ------------------------------------------------------------------------- */
613/* 635/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 636 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 637 * count positive ==> scroll up
… …
624 want_refresh = 1; 646 want_refresh = 1;
625 num_scr += count; 647 num_scr += count;
626 648
627 if (count > 0 649 if (count > 0
628 && row1 == 0 650 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 651 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 652 {
653 min_it (count, total_rows - (nrow - (row2 + 1)));
654
631 top_row = max (top_row - count, -saveLines); 655 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows;
635 656
636 // sever bottommost line 657 // sever bottommost line
637 { 658 {
638 line_t &l = ROW(row2 - count); 659 line_t &l = ROW(row2);
639 l.is_longer (0); 660 l.is_longer (0);
640 l.touch (); 661 l.touch ();
641 } 662 }
642 663
664 // scroll everything up 'count' lines
665 term_start = (term_start + count) % total_rows;
666
667 // now copy lines below the scroll region bottom to the
668 // bottom of the screen again, so they look as if they
669 // hadn't moved.
670 for (int i = nrow; --i > row2; )
671 {
672 line_t &l1 = ROW(i - count);
673 line_t &l2 = ROW(i);
674
675 ::swap (l1, l2);
676 l2.touch ();
677 }
678
643 // erase newly scrolled-in lines 679 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 680 for (int i = count; i--; )
645 { 681 {
646 line_t &l = ROW(nrow - 1 - i); 682 line_t &l = ROW(row2 - i);
647 683
648 // optimize if already cleared, can be significant on slow machines 684 // optimise if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem 685 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 686 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 { 687 {
652 scr_blank_line (l, 0, l.l, rstyle); 688 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0; 689 l.l = 0;
… …
655 } 691 }
656 else 692 else
657 scr_blank_screen_mem (l, rstyle); 693 scr_blank_screen_mem (l, rstyle);
658 } 694 }
659 695
660 // now copy lines below the scroll region bottom to the
661 // bottom of the screen again, so they look as if they
662 // hadn't moved.
663 for (int i = nrow; --i > row2; )
664 {
665 line_t &l1 = ROW(i - count);
666 line_t &l2 = ROW(i);
667
668 ::swap (l1, l2);
669 l2.touch ();
670 }
671
672 // move and/or clear selection, if any 696 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 697 if (selection.op && current_screen == selection.screen
698 && selection.beg.row <= row2)
674 { 699 {
675 selection.beg.row -= count; 700 selection.beg.row -= count;
676 selection.end.row -= count; 701 selection.end.row -= count;
677 selection.mark.row -= count; 702 selection.mark.row -= count;
678 703
679 if (selection.beg.row < top_row 704 selection_check (0);
680 || selection.end.row < top_row
681 || selection.mark.row < top_row)
682 {
683 CLEAR_ALL_SELECTION ();
684 selection.op = SELECTION_CLEAR;
685 }
686 } 705 }
687 706
688 // finally move the view window, if desired 707 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 708 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 709 && view_start != 0
691 && view_start != -saveLines) 710 && view_start != -saveLines)
692 scr_page (UP, count); 711 scr_page (UP, count);
693 712
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 713 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
712 { 731 {
713 /* move selected region too */ 732 /* move selected region too */
714 selection.beg.row -= count; 733 selection.beg.row -= count;
715 selection.end.row -= count; 734 selection.end.row -= count;
716 selection.mark.row -= count; 735 selection.mark.row -= count;
717 736
718 selection_check (0); 737 selection_check (0);
719 } 738 }
720 } 739 }
721 740
722 // use a simple and robust scrolling algorithm, this 741 // use a simple and robust scrolling algorithm, this
723 // part of scr_scroll_text is not time-critical. 742 // part of scr_scroll_text is not time-critical.
724 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
725 int rows = row2 - row1 + 1; 752 int rows = row2 - row1 + 1;
726 753
727 min_it (count, rows); 754 min_it (count, rows);
728 755
729 line_t *temp_buf = row_buf + total_rows; 756 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
730 757
731 for (int row = 0; row < rows; row++) 758 for (int row = 0; row < rows; row++)
732 { 759 {
733 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 760 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
734 761
… …
736 scr_blank_screen_mem (temp_buf [row], rstyle); 763 scr_blank_screen_mem (temp_buf [row], rstyle);
737 } 764 }
738 765
739 for (int row = 0; row < rows; row++) 766 for (int row = 0; row < rows; row++)
740 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 }
741 } 775 }
742 776
743 return count; 777 return count;
744} 778}
745 779
… …
751rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 785rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
752{ 786{
753 if (len <= 0) /* sanity */ 787 if (len <= 0) /* sanity */
754 return; 788 return;
755 789
756 unsigned char checksel; 790 bool checksel;
757 unicode_t c; 791 unicode_t c;
758 int ncol = this->ncol; 792 int ncol = this->ncol;
759 const wchar_t *strend = str + len; 793 const wchar_t *strend = str + len;
760 794
761 want_refresh = 1; 795 want_refresh = 1;
… …
774 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 808 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
775 screen.cur.row -= minlines; 809 screen.cur.row -= minlines;
776 } 810 }
777 } 811 }
778 812
779#ifdef DEBUG_STRICT
780 assert (screen.cur.col < ncol); 813 assert (screen.cur.col < ncol);
781 assert (screen.cur.row < nrow 814 assert (screen.cur.row < nrow
782 && screen.cur.row >= top_row); 815 && screen.cur.row >= top_row);
783#endif
784 int row = screen.cur.row; 816 int row = screen.cur.row;
785 817
786 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 818 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
787 819
788 line_t *line = &ROW(row); 820 line_t *line = &ROW(row);
789 821
790 while (str < strend) 822 while (str < strend)
791 { 823 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 824 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 825
794 if (c < 0x20) 826 if (ecb_unlikely (c < 0x20))
795 if (c == C0_LF) 827 if (c == C0_LF)
796 { 828 {
797 max_it (line->l, screen.cur.col); 829 max_it (line->l, screen.cur.col);
798 830
799 screen.flags &= ~Screen_WrapNext; 831 screen.flags &= ~Screen_WrapNext;
… …
818 { 850 {
819 scr_tab (1, true); 851 scr_tab (1, true);
820 continue; 852 continue;
821 } 853 }
822 854
855 if (ecb_unlikely (
823 if (checksel /* see if we're writing within selection */ 856 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 857 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 858 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
859 ))
826 { 860 {
827 checksel = 0; 861 checksel = 0;
828 /* 862 /*
829 * If we wrote anywhere in the selected area, kill the selection 863 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 864 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 865 * should be a similar check.
832 */ 866 */
833 CLEAR_SELECTION (); 867 CLEAR_SELECTION ();
834 } 868 }
835 869
836 if (screen.flags & Screen_WrapNext) 870 if (ecb_unlikely (screen.flags & Screen_WrapNext))
837 { 871 {
838 scr_do_wrap (); 872 scr_do_wrap ();
839 873
840 line->l = ncol; 874 line->l = ncol;
841 line->is_longer (1); 875 line->is_longer (1);
842 876
843 row = screen.cur.row; 877 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 878 line = &ROW(row); /* _must_ refresh */
845 } 879 }
846 880
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 881 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 882 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 883 c = 0xfffd;
850 884
851 // rely on wcwidth to tell us the character width, do wcwidth before 885 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 886 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 887 // drawing characters below as they might be invalid in the current
854 // locale. 888 // locale.
855 int width = WCWIDTH (c); 889 int width = WCWIDTH (c);
856 890
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 891 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 892 {
859 // vt100 special graphics and line drawing 893 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 894 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 895 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 896 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 909 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 910 width = 1; // vt100 line drawing characters are always single-width
877 } 911 }
878 } 912 }
879 913
880 if (screen.flags & Screen_Insert) 914 if (ecb_unlikely (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 915 scr_insdel_chars (width, INSERT);
882 916
883 if (width != 0) 917 if (width != 0)
884 { 918 {
885#if !UNICODE_3 919#if !UNICODE_3
… …
890# else 924# else
891 c = 0xfffd; 925 c = 0xfffd;
892# endif 926# endif
893#endif 927#endif
894 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
895 // 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.
896 if (line->t[screen.cur.col] == NOCHAR 949 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
897 || (screen.cur.col < ncol - 1 950 scr_kill_char (*line, screen.cur.col);
898 && line->t[screen.cur.col + 1] == NOCHAR))
899 {
900 int col = screen.cur.col;
901
902 // find begin
903 while (col > 0 && line->t[col] == NOCHAR)
904 col--;
905
906 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
907
908 // found begin, nuke
909 do {
910 line->t[col] = ' ';
911 line->r[col] = rend;
912 col++;
913 } while (col < ncol && line->t[col] == NOCHAR);
914 }
915
916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917
918 // if the character doesn't fit into the remaining columns...
919 if (screen.cur.col > ncol - width && ncol >= width)
920 {
921 // ...output spaces
922 c = ' ';
923 // and try the same character next loop iteration
924 --str;
925 }
926 951
927 line->touch (); 952 line->touch ();
928 953
929 do 954 do
930 { 955 {
931 line->t[screen.cur.col] = c; 956 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 957 line->r[screen.cur.col] = rend;
933 958
934 if (screen.cur.col < ncol - 1) 959 if (ecb_likely (screen.cur.col < ncol - 1))
935 screen.cur.col++; 960 screen.cur.col++;
936 else 961 else
937 { 962 {
938 line->l = ncol; 963 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 964 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 965 screen.flags |= Screen_WrapNext;
941 break; 966
967 goto end_of_line;
942 } 968 }
943 969
944 c = NOCHAR; 970 c = NOCHAR;
945 } 971 }
946 while (--width > 0); 972 while (ecb_unlikely (--width > 0));
947 973
948 // pad with spaces when overwriting wide character with smaller one 974 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 975 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 976 {
951 line->touch (); 977 line->t[c] = ' ';
978 line->r[c] = rend;
979 }
952 980
953 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)
954 { 998 {
955 line->t[c] = ' ';
956 line->r[c] = rend; 999 linep = line;
1000 tp = line->t + screen.cur.col - 1;
1001 rp = line->r + screen.cur.col - 1;
957 } 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));
958 } 1025 }
959 } 1026 }
960 else // width == 0
961 {
962#if ENABLE_COMBINING
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 {
973 linep = line;
974 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1;
976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
999#endif 1027#endif
1000 }
1001 } 1028 }
1002 1029
1003 max_it (line->l, screen.cur.col); 1030 max_it (line->l, screen.cur.col);
1004 1031
1005#ifdef DEBUG_STRICT
1006 assert (screen.cur.row >= 0); 1032 assert (screen.cur.row >= 0);
1007#endif
1008} 1033}
1009 1034
1010/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
1011/* 1036/*
1012 * 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
1013 * XTERM_SEQ: CTRL-H 1038 * XTERM_SEQ: CTRL-H
1014 */ 1039 */
1015void 1040void
1016rxvt_term::scr_backspace () NOTHROW 1041rxvt_term::scr_backspace () NOTHROW
1017{ 1042{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1043 if (screen.cur.col == 0)
1021 { 1044 {
1022 if (screen.cur.row > 0) 1045 if (screen.cur.row > 0)
1023 { 1046 {
1024#ifdef TERMCAP_HAS_BW 1047#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1048 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1049 --screen.cur.row;
1027 return; 1050
1051 want_refresh = 1;
1028#endif 1052#endif
1029 } 1053 }
1030 } 1054 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1055 else if (screen.flags & Screen_WrapNext)
1056 screen.flags &= ~Screen_WrapNext;
1057 else
1032 scr_gotorc (0, -1, RELATIVE); 1058 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1059}
1036 1060
1037/* ------------------------------------------------------------------------- */ 1061/* ------------------------------------------------------------------------- */
1038/* 1062/*
1039 * Process Horizontal Tab 1063 * Process Horizontal Tab
… …
1062 x = i; 1086 x = i;
1063 1087
1064 if (!--count) 1088 if (!--count)
1065 break; 1089 break;
1066 } 1090 }
1067 else 1091 else
1068 ht &= l.t[i] == ' ' 1092 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1093 && RS_SAME (l.r[i], base_rend);
1070 1094
1071 if (count) 1095 if (count)
1072 x = ncol - 1; 1096 x = ncol - 1;
1073 1097
1074 // store horizontal tab commands as characters inside the text 1098 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1099 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1100 if (ht && option (Opt_pastableTabs))
1077 { 1101 {
1078 base_rend = SET_FONT (base_rend, 0); 1102 base_rend = SET_FONT (base_rend, 0);
1079 1103
1080 l.touch (x); 1104 l.touch (x);
1081 1105
… …
1188 } 1212 }
1189 } 1213 }
1190 else 1214 else
1191 { 1215 {
1192 if (screen.flags & Screen_Relative) 1216 if (screen.flags & Screen_Relative)
1217 {
1193 { /* relative origin mode */ 1218 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1219 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1220 min_it (screen.cur.row, screen.bscroll);
1196 } 1221 }
1197 else 1222 else
1198 screen.cur.row = row; 1223 screen.cur.row = row;
… …
1231/* 1256/*
1232 * Erase part or whole of a line 1257 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1258 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1259 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * 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
1236 */ 1262 */
1237void 1263void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1264rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1265{
1240 unsigned int col, num; 1266 unsigned int col, num;
… …
1249 line.touch (); 1275 line.touch ();
1250 line.is_longer (0); 1276 line.is_longer (0);
1251 1277
1252 switch (mode) 1278 switch (mode)
1253 { 1279 {
1280 case 3:
1281 if (screen.flags & Screen_WrapNext)
1282 return;
1283
1284 /* fall through */
1285
1254 case 0: /* erase to end of line */ 1286 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1287 col = screen.cur.col;
1256 num = ncol - col; 1288 num = ncol - col;
1257 min_it (line.l, col); 1289 min_it (line.l, col);
1290
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1291 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1292 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1293 CLEAR_SELECTION ();
1261 break; 1294 break;
1295
1262 case 1: /* erase to beginning of line */ 1296 case 1: /* erase to beginning of line */
1263 col = 0; 1297 col = 0;
1264 num = screen.cur.col + 1; 1298 num = screen.cur.col + 1;
1299
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1300 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1301 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1302 CLEAR_SELECTION ();
1268 break; 1303 break;
1304
1269 case 2: /* erase whole line */ 1305 case 2: /* erase whole line */
1270 col = 0; 1306 col = 0;
1271 num = ncol; 1307 num = ncol;
1272 line.l = 0; 1308 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1309 if (selection.beg.row <= screen.cur.row
… …
1281 scr_blank_line (line, col, num, rstyle); 1317 scr_blank_line (line, col, num, rstyle);
1282} 1318}
1283 1319
1284/* ------------------------------------------------------------------------- */ 1320/* ------------------------------------------------------------------------- */
1285/* 1321/*
1286 * Erase part of whole of the screen 1322 * Erase part or whole of the screen
1287 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1323 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1288 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1324 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1289 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1325 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1290 */ 1326 */
1291void 1327void
… …
1300 ZERO_SCROLLBACK (); 1336 ZERO_SCROLLBACK ();
1301 1337
1302 switch (mode) 1338 switch (mode)
1303 { 1339 {
1304 case 0: /* erase to end of screen */ 1340 case 0: /* erase to end of screen */
1305 selection_check (1);
1306 scr_erase_line (0); 1341 scr_erase_line (0);
1307 row = screen.cur.row + 1; /* possible OOB */ 1342 row = screen.cur.row + 1; /* possible OOB */
1308 num = nrow - row; 1343 num = nrow - row;
1309 break; 1344 break;
1310 case 1: /* erase to beginning of screen */ 1345 case 1: /* erase to beginning of screen */
1311 selection_check (3);
1312 scr_erase_line (1); 1346 scr_erase_line (1);
1313 row = 0; 1347 row = 0;
1314 num = screen.cur.row; 1348 num = screen.cur.row;
1315 break; 1349 break;
1316 case 2: /* erase whole screen */ 1350 case 2: /* erase whole screen */
1317 selection_check (3);
1318 row = 0; 1351 row = 0;
1319 num = nrow; 1352 num = nrow;
1320 break; 1353 break;
1321 default: 1354 default:
1322 return; 1355 return;
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1364 if (row >= nrow) /* Out Of Bounds */
1332 return; 1365 return;
1333 1366
1334 min_it (num, nrow - row); 1367 min_it (num, nrow - row);
1335 1368
1336 if (rstyle & (RS_RVid | RS_Uline)) 1369 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1370 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1371 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1372 {
1340 ren = DEFAULT_RSTYLE; 1373 ren = DEFAULT_RSTYLE;
1341 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);
1342 } 1379 }
1343 else 1380 else
1344 { 1381 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1382 ren = rstyle & (RS_fgMask | RS_bgMask);
1383
1384 if (mapped)
1385 {
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1386 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1387 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 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));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1392 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1394 }
1351 } 1395 }
1352 1396
1353 for (; num--; row++) 1397 for (; num--; row++)
1354 { 1398 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1399 scr_blank_screen_mem (ROW(row), rstyle);
1400
1401 if (row - view_start < nrow)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1402 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1357 } 1403 }
1358} 1404}
1359 1405
1360#if !ENABLE_MINIMAL 1406#if !ENABLE_MINIMAL
1361void 1407void
… …
1380 1426
1381 want_refresh = 1; 1427 want_refresh = 1;
1382 ZERO_SCROLLBACK (); 1428 ZERO_SCROLLBACK ();
1383 1429
1384 num_scr_allow = 0; 1430 num_scr_allow = 0;
1385 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 ();
1386 1436
1387 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1437 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1388 for (int row = nrow; row--; ) 1438 for (int row = nrow; row--; )
1389 { 1439 {
1390 line_t &line = ROW(row); 1440 line_t &line = ROW(row);
… …
1435 * Insert/Delete <count> characters from the current position 1485 * Insert/Delete <count> characters from the current position
1436 */ 1486 */
1437void 1487void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1488rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1489{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1490 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1491 ZERO_SCROLLBACK ();
1445 1492
1446 if (count <= 0) 1493 if (count <= 0)
1447 return; 1494 return;
… …
1449 scr_do_wrap (); 1496 scr_do_wrap ();
1450 1497
1451 selection_check (1); 1498 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1499 min_it (count, ncol - screen.cur.col);
1453 1500
1454 row = screen.cur.row; 1501 int row = screen.cur.row;
1455 1502
1456 line_t *line = &ROW(row); 1503 line_t *line = &ROW(row);
1457 1504
1458 line->touch (); 1505 line->touch ();
1459 line->is_longer (0); 1506 line->is_longer (0);
1460 1507
1508 // nuke wide spanning the start
1509 if (line->t[screen.cur.col] == NOCHAR)
1510 scr_kill_char (*line, screen.cur.col);
1511
1461 switch (insdel) 1512 switch (insdel)
1462 { 1513 {
1463 case INSERT: 1514 case INSERT:
1464 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--)
1465 { 1521 {
1466 line->t[col] = line->t[col - count]; 1522 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1523 line->r[col] = line->r[col - count];
1468 } 1524 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1525
1472 if (selection.op && current_screen == selection.screen 1526 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1527 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1528 {
1475 if (selection.end.row != screen.cur.row 1529 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1530 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1531 CLEAR_SELECTION ();
1478 else 1532 else
1533 {
1479 { /* shift selection */ 1534 /* shift selection */
1480 selection.beg.col += count; 1535 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1536 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1537 selection.end.col += count;
1483 } 1538 }
1484 } 1539 }
… …
1489 case ERASE: 1544 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1545 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1546 selection_check (1);
1492 screen.cur.col -= count; 1547 screen.cur.col -= count;
1493 1548
1494 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
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1553 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1554 break;
1497 1555
1498 case DELETE: 1556 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1557 line->l = max (line->l - count, 0);
1500 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
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1563 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1564 {
1503 line->t[col] = line->t[col + count]; 1565 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1566 line->r[col] = line->r[col + count];
1505 } 1567 }
1506 1568
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1569 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1570
1510 if (selection.op && current_screen == selection.screen 1571 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1572 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1573 {
1513 if (selection.end.row != screen.cur.row 1574 if (selection.end.row != screen.cur.row
… …
1623 */ 1684 */
1624void 1685void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1686rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1687{
1627 if (mode < 0) 1688 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1689 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1690 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1691 tabs [screen.cur.col] = !!mode;
1631} 1692}
1632 1693
1633/* ------------------------------------------------------------------------- */ 1694/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1709 if (rvideo_state != on)
1649 { 1710 {
1650 rvideo_state = on; 1711 rvideo_state = on;
1651 1712
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1713 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1714#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1715 if (bg_pixmap == None)
1655#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif 1716#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1717 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1718
1661 XGCValues gcvalue; 1719 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1720 gcvalue.foreground = pix_colors[Color_fg];
… …
1823 * Refresh the entire screen 1881 * Refresh the entire screen
1824 */ 1882 */
1825void 1883void
1826rxvt_term::scr_touch (bool refresh) NOTHROW 1884rxvt_term::scr_touch (bool refresh) NOTHROW
1827{ 1885{
1828 scr_expose (0, 0, width, height, refresh); 1886 scr_expose (0, 0, vt_width, vt_height, refresh);
1829} 1887}
1830 1888
1831/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
1832/* 1890/*
1833 * 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
… …
1871 return true; 1929 return true;
1872} 1930}
1873 1931
1874#ifndef NO_BELL 1932#ifndef NO_BELL
1875void 1933void
1876rxvt_term::bell_cb (time_watcher &w) 1934rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1935{
1878 rvideo_bell = false; 1936 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1937 scr_rvideo_mode (rvideo_mode);
1938 refresh_check ();
1880} 1939}
1881#endif 1940#endif
1882 1941
1883/* ------------------------------------------------------------------------- */ 1942/* ------------------------------------------------------------------------- */
1884void 1943void
… …
1886{ 1945{
1887#ifndef NO_BELL 1946#ifndef NO_BELL
1888 1947
1889# ifndef NO_MAPALERT 1948# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1949# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1950 if (option (Opt_mapAlert))
1892# endif 1951# endif
1893 XMapWindow (dpy, parent[0]); 1952 XMapWindow (dpy, parent);
1894# endif 1953# endif
1895 1954
1955# if ENABLE_FRILLS
1956 if (option (Opt_urgentOnBell))
1957 set_urgency (1);
1958# endif
1959
1896 if (OPTION (Opt_visualBell)) 1960 if (option (Opt_visualBell))
1897 { 1961 {
1898 rvideo_bell = true; 1962 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1963 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1964 flush ();
1901 1965
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1966 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1967 }
1904 else 1968 else
1905 XBell (dpy, 0); 1969 XBell (dpy, 0);
1906 1970 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1907#endif 1971#endif
1908} 1972}
1909 1973
1910/* ------------------------------------------------------------------------- */ 1974/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */
1912void 1975void
1913rxvt_term::scr_printscreen (int fullhist) NOTHROW 1976rxvt_term::scr_printscreen (int fullhist) NOTHROW
1914{ 1977{
1915#ifdef PRINTPIPE 1978#ifdef PRINTPIPE
1916 int nrows, row_start; 1979 int nrows, row_start;
1917 FILE *fd; 1980 FILE *fd = popen_printer ();
1918 1981
1919 if ((fd = popen_printer ()) == NULL) 1982 if (!fd)
1920 return; 1983 return;
1921 1984
1922 if (fullhist) 1985 if (fullhist)
1923 { 1986 {
1924 nrows = nrow - top_row; 1987 nrows = nrow - top_row;
… …
1930 row_start = view_start; 1993 row_start = view_start;
1931 } 1994 }
1932 1995
1933 wctomb (0, 0); 1996 wctomb (0, 0);
1934 1997
1935 for (int r1 = 0; r1 < nrows; r1++) 1998 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1936 { 1999 {
1937 text_t *tp = ROW(r1).t; 2000 text_t *tp = ROW(r1).t;
1938 int len = ROW(r1).l; 2001 int len = ROW(r1).l;
1939 2002
1940 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
… …
1969 * screen.text/screen.rend contain what the screen will change to. 2032 * screen.text/screen.rend contain what the screen will change to.
1970 */ 2033 */
1971void 2034void
1972rxvt_term::scr_refresh () NOTHROW 2035rxvt_term::scr_refresh () NOTHROW
1973{ 2036{
1974 unsigned char have_bg,
1975 showcursor; /* show the cursor */
1976 int16_t col, row, /* column/row we're processing */ 2037 int16_t col, row, /* column/row we're processing */
1977 ocrow; /* old cursor row */ 2038 ocrow; /* old cursor row */
1978 int i; /* tmp */ 2039 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 2040#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 2041 rend_t cc1; /* store colours at cursor position (s) */
… …
1989 return; 2050 return;
1990 2051
1991 /* 2052 /*
1992 * A: set up vars 2053 * A: set up vars
1993 */ 2054 */
1994 have_bg = 0;
1995 refresh_count = 0; 2055 refresh_count = 0;
1996 2056
1997#if XPM_BACKGROUND 2057 unsigned int old_screen_flags = screen.flags;
2058 bool have_bg = 0;
2059#ifdef HAVE_BG_PIXMAP
1998 have_bg |= bgPixmap.pixmap != None; 2060 have_bg = bg_pixmap != None;
1999#endif
2000#if TRANSPARENT
2001 have_bg |= OPTION (Opt_transparent) && am_transparent;
2002#endif 2061#endif
2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2004 2063
2005 /* 2064 /*
2006 * B: reverse any characters which are selected 2065 * B: reverse any characters which are selected
2007 */ 2066 */
2008 scr_reverse_selection (); 2067 scr_reverse_selection ();
2009 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
2010 /* 2076 /*
2011 * C: set the cursor character (s) 2077 * C: set the cursor character (s)
2012 */ 2078 */
2013 { 2079 {
2014 unsigned char setoldcursor; 2080 bool setoldcursor;
2015 2081
2016 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2083 if (hidden_cursor)
2019 showcursor = 0; 2084 showcursor = 0;
2020#endif 2085#endif
2021 2086
… …
2049 ccol2 = bgcolor_of (rstyle); 2114 ccol2 = bgcolor_of (rstyle);
2050#else 2115#else
2051 ccol2 = Color_bg; 2116 ccol2 = Color_bg;
2052#endif 2117#endif
2053 2118
2054 if (showcursor && focus) 2119 if (focus)
2055 { 2120 {
2056 if (OPTION (Opt_cursorUnderline)) 2121 if (option (Opt_cursorUnderline))
2057 *crp ^= RS_Uline; 2122 *crp ^= RS_Uline;
2058 else 2123 else
2059 { 2124 {
2060 *crp ^= RS_RVid; 2125 *crp ^= RS_RVid;
2061 *crp = SET_FGCOLOR (*crp, ccol1); 2126 *crp = SET_FGCOLOR (*crp, ccol1);
… …
2094 oldcursor.col = screen.cur.col; 2159 oldcursor.col = screen.cur.col;
2095 } 2160 }
2096 } 2161 }
2097 } 2162 }
2098 2163
2099 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2100#if ENABLE_OVERLAY
2101 scr_swap_overlay ();
2102#endif
2103
2104#ifndef NO_SLOW_LINK_SUPPORT 2164#ifndef NO_SLOW_LINK_SUPPORT
2105 /* 2165 /*
2106 * D: CopyArea pass - very useful for slower links 2166 * D: CopyArea pass - very useful for slower links
2107 * This has been deliberately kept simple. 2167 * This has been deliberately kept simple.
2108 */ 2168 */
… …
2112 { 2172 {
2113 int16_t nits; 2173 int16_t nits;
2114 int i = num_scr; 2174 int i = num_scr;
2115 int j; 2175 int j;
2116 int len, wlen; 2176 int len, wlen;
2117 dLocal (int, num_scr);
2118 2177
2119 j = nrow; 2178 j = nrow;
2120 wlen = len = -1; 2179 wlen = len = -1;
2121 row = i > 0 ? 0 : j - 1; 2180 row = i > 0 ? 0 : j - 1;
2122 2181
… …
2197 continue; 2256 continue;
2198 2257
2199 // redraw one or more characters 2258 // redraw one or more characters
2200 2259
2201 // seek to the beginning of wide characters 2260 // seek to the beginning of wide characters
2202 while (stp[col] == NOCHAR && col > 0) 2261 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2203 --col; 2262 --col;
2204 2263
2205 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2264 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2206 text_t *text = stp + col; 2265 text_t *text = stp + col;
2207 int count = 1; 2266 int count = 1;
2208 2267
2209 dtp[col] = stp[col]; 2268 dtp[col] = stp[col];
2210 drp[col] = rend; 2269 drp[col] = rend;
… …
2214 for (i = 0; ++col < ncol; ) 2273 for (i = 0; ++col < ncol; )
2215 { 2274 {
2216 if (stp[col] == NOCHAR) 2275 if (stp[col] == NOCHAR)
2217 { 2276 {
2218 dtp[col] = stp[col]; 2277 dtp[col] = stp[col];
2219 drp[col] = rend; 2278 drp[col] = srp[col];
2279
2220 count++; 2280 count++;
2221 i++; 2281 i++;
2222 2282
2223 continue; 2283 continue;
2224 } 2284 }
… …
2244 2304
2245 col--; /* went one too far. move back */ 2305 col--; /* went one too far. move back */
2246 count -= i; /* dump any matching trailing chars */ 2306 count -= i; /* dump any matching trailing chars */
2247 2307
2248 // sometimes we optimize away the trailing NOCHAR's, add them back 2308 // sometimes we optimize away the trailing NOCHAR's, add them back
2249 while (i && text[count] == NOCHAR) 2309 while (ecb_unlikely (i && text[count] == NOCHAR))
2250 count++, i--; 2310 count++, i--;
2251 2311
2252 /* 2312 /*
2253 * Determine the attributes for the string 2313 * Determine the attributes for the string
2254 */ 2314 */
2255 int fore = fgcolor_of (rend); // desired foreground 2315 int fore = fgcolor_of (rend); // desired foreground
2256 int back = bgcolor_of (rend); // desired background 2316 int back = bgcolor_of (rend); // desired background
2257 2317
2258 // 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
2259 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)))
2260 { 2320 {
2261 bool invert = rend & RS_RVid; 2321 bool invert = rend & RS_RVid;
2262 2322
2263#ifndef NO_BOLD_UNDERLINE_REVERSE 2323#ifndef NO_BOLD_UNDERLINE_REVERSE
2264 if (rend & RS_Bold
2265 && fore == Color_fg) 2324 if (rend & RS_Bold && fore == Color_fg)
2266 { 2325 {
2267 if (ISSET_PIXCOLOR (Color_BD)) 2326 if (ISSET_PIXCOLOR (Color_BD))
2268 fore = Color_BD; 2327 fore = Color_BD;
2269# if !ENABLE_STYLES 2328# if !ENABLE_STYLES
2270 else 2329 else
2271 invert = !invert; 2330 invert = !invert;
2272# endif 2331# endif
2273 } 2332 }
2274 2333
2275 if (rend & RS_Italic 2334 if (rend & RS_Italic && fore == Color_fg)
2276 && fore == Color_fg)
2277 { 2335 {
2278 if (ISSET_PIXCOLOR (Color_IT)) 2336 if (ISSET_PIXCOLOR (Color_IT))
2279 fore = Color_IT; 2337 fore = Color_IT;
2280# if !ENABLE_STYLES 2338# if !ENABLE_STYLES
2281 else 2339 else
… …
2285 2343
2286 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2344 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2287 fore = Color_UL; 2345 fore = Color_UL;
2288#endif 2346#endif
2289 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 }
2366#endif
2367
2290 if (invert) 2368 if (invert)
2291 { 2369 {
2292#ifdef OPTION_HC
2293 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2294 || !ISSET_PIXCOLOR (Color_HC))
2295#endif
2296 /* invert the column if no highlightColor is set or it is the
2297 * current cursor column */
2298 ::swap (fore, back); 2370 ::swap (fore, back);
2299#ifdef OPTION_HC
2300 else if (ISSET_PIXCOLOR (Color_HC))
2301 back = Color_HC;
2302#endif
2303 2371
2304#ifndef NO_BOLD_UNDERLINE_REVERSE 2372#ifndef NO_BOLD_UNDERLINE_REVERSE
2305# ifndef OPTION_HC
2306 if (ISSET_PIXCOLOR (Color_RV))
2307 back = Color_RV;
2308# endif
2309 if (fore == back) 2373 if (fore == back)
2310 { 2374 {
2311 fore = Color_bg; 2375 fore = Color_bg;
2312 back = Color_fg; 2376 back = Color_fg;
2313 } 2377 }
… …
2315 } 2379 }
2316 2380
2317#ifdef TEXT_BLINK 2381#ifdef TEXT_BLINK
2318 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2382 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2319 { 2383 {
2320 if (!text_blink_ev.active) 2384 if (!text_blink_ev.is_active ())
2321 { 2385 {
2322 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2386 text_blink_ev.again ();
2323 hidden_text = 0; 2387 hidden_text = 0;
2324 } 2388 }
2325 else if (hidden_text) 2389 else if (hidden_text)
2326 fore = back; 2390 fore = back;
2327 } 2391 }
… …
2349 /* 2413 /*
2350 * Actually do the drawing of the string here 2414 * Actually do the drawing of the string here
2351 */ 2415 */
2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2416 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2353 2417
2354 if (back == Color_bg && have_bg) 2418 if (ecb_likely (have_bg && back == Color_bg))
2355 { 2419 {
2356 // this is very ugly, maybe push it into ->draw? 2420 // this is very ugly, maybe push it into ->draw?
2357 2421
2358 for (i = 0; i < count; i++) /* don't draw empty strings */ 2422 for (i = 0; i < count; i++) /* don't draw empty strings */
2359 if (text[i] != ' ') 2423 if (text[i] != ' ')
2360 { 2424 {
2361 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2425 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2362 goto did_clear; 2426 goto did_clear;
2363 } 2427 }
2364 2428
2365 CLEAR_CHARS (xpixel, ypixel, count); 2429 CLEAR_CHARS (xpixel, ypixel, count);
2366 did_clear: ; 2430 did_clear: ;
2367 } 2431 }
2368 else 2432 else
2369 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2433 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2370 2434
2371 if (rend & RS_Uline && font->descent > 1 && fore != back) 2435 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2372 { 2436 {
2373#if ENABLE_FRILLS 2437#if ENABLE_FRILLS
2374 if (ISSET_PIXCOLOR (Color_underline)) 2438 if (ISSET_PIXCOLOR (Color_underline))
2375 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2439 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2376 else 2440 else
2377#endif 2441#endif
2378 XSetForeground (dpy, gc, pix_colors[fore]); 2442 XSetForeground (dpy, gc, pix_colors[fore]);
2379 2443
2380 XDrawLine (dpy, drawBuffer, gc, 2444 XDrawLine (dpy, vt, gc,
2381 xpixel, ypixel + font->ascent + 1, 2445 xpixel, ypixel + font->ascent + 1,
2382 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2446 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2383 } 2447 }
2384 } /* for (col....) */ 2448 } /* for (col....) */
2385 } /* for (row....) */ 2449 } /* for (row....) */
2386 2450
2387#if ENABLE_OVERLAY
2388 scr_swap_overlay ();
2389#endif
2390 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2391
2392 /* 2451 /*
2393 * G: cleanup cursor and display outline cursor if necessary 2452 * G: cleanup cursor and display outline cursor if necessary
2394 */ 2453 */
2395 if (showcursor) 2454 if (showcursor)
2396 { 2455 {
2397 if (focus) 2456 if (focus)
2398 { 2457 {
2399 if (OPTION (Opt_cursorUnderline)) 2458 if (option (Opt_cursorUnderline))
2400 *crp ^= RS_Uline; 2459 *crp ^= RS_Uline;
2401 else 2460 else
2402 { 2461 {
2403 *crp ^= RS_RVid; 2462 *crp ^= RS_RVid;
2404#ifndef NO_CURSORCOLOR 2463#ifndef NO_CURSORCOLOR
… …
2423 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2482 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2424 else 2483 else
2425#endif 2484#endif
2426 XSetForeground (dpy, gc, pix_colors[ccol1]); 2485 XSetForeground (dpy, gc, pix_colors[ccol1]);
2427 2486
2428 XDrawRectangle (dpy, drawBuffer, gc, 2487 XDrawRectangle (dpy, vt, gc,
2429 Col2Pixel (col), 2488 Col2Pixel (col),
2430 Row2Pixel (oldcursor.row), 2489 Row2Pixel (oldcursor.row),
2431 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2490 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2432 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2491 (unsigned int) (Height2Pixel (1) - 1));
2433 } 2492 }
2434 } 2493 }
2435 2494
2436 /* 2495 /*
2437 * H: cleanup selection 2496 * H: cleanup selection
2438 */ 2497 */
2498#if ENABLE_OVERLAY
2499 scr_swap_overlay ();
2500#endif
2501 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2502
2439 scr_reverse_selection (); 2503 scr_reverse_selection ();
2440 2504
2505 screen.flags = old_screen_flags;
2441 num_scr = 0; 2506 num_scr = 0;
2442 num_scr_allow = 1; 2507 num_scr_allow = 1;
2443} 2508}
2444 2509
2445void 2510void
2446rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2511rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2447{ 2512{
2448 if (!l.t) 2513 if (!l.valid ())
2449 return; 2514 return;
2450 2515
2451 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
2452 2517
2453 for (int i = ncol; i--; ) 2518 for (int i = ncol; i--; )
… …
2466 scr_remap_chars (swap_buf [i]); 2531 scr_remap_chars (swap_buf [i]);
2467 } 2532 }
2468} 2533}
2469 2534
2470void 2535void
2471rxvt_term::scr_recolour () NOTHROW 2536rxvt_term::scr_recolour (bool refresh) NOTHROW
2472{ 2537{
2473 if (1 2538 bool transparent = false;
2474#if TRANSPARENT 2539
2475 && !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
2476#endif 2552# endif
2477#if XPM_BACKGROUND
2478 && !bgPixmap.pixmap
2479#endif
2480 ) 2553 {
2554 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2555 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2556 }
2481 { 2557 }
2558 else
2559#endif
2560 {
2482 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2561 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2483 XClearWindow (dpy, parent[0]);
2484 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2562 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2485#if HAVE_SCROLLBARS 2563 }
2564
2565 XClearWindow (dpy, parent);
2566
2486 if (scrollBar.win) 2567 if (scrollBar.win)
2487 { 2568 {
2569 if (transparent)
2570 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2571 else
2488 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2572 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2489 scrollBar.setIdle (); 2573 scrollBar.state = SB_STATE_IDLE;
2490 scrollbar_show (0); 2574 scrollBar.show (0);
2491 } 2575 }
2492#endif 2576
2577 if (refresh)
2493 } 2578 {
2494
2495 scr_clear (); 2579 scr_clear ();
2496 scr_touch (true); 2580 scr_touch (true);
2581 }
2497 want_refresh = 1; 2582 want_refresh = 1;
2498} 2583}
2499 2584
2500/* ------------------------------------------------------------------------- */ 2585/* ------------------------------------------------------------------------- */
2501void 2586void
… …
2569 { 2654 {
2570#if !ENABLE_MINIMAL 2655#if !ENABLE_MINIMAL
2571 if (selection.rect) 2656 if (selection.rect)
2572 scr_xor_rect (selection.beg.row, selection.beg.col, 2657 scr_xor_rect (selection.beg.row, selection.beg.col,
2573 selection.end.row, selection.end.col, 2658 selection.end.row, selection.end.col,
2574 RS_RVid, RS_RVid | RS_Uline); 2659 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2575 else 2660 else
2576#endif 2661#endif
2577 scr_xor_span (selection.beg.row, selection.beg.col, 2662 scr_xor_span (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2663 selection.end.row, selection.end.col,
2579 RS_RVid); 2664 RS_Sel | RS_RVid);
2580 } 2665 }
2581} 2666}
2582 2667
2583/* ------------------------------------------------------------------------- */ 2668/* ------------------------------------------------------------------------- */
2584/* 2669/*
… …
2587 */ 2672 */
2588#if 0 2673#if 0
2589void 2674void
2590rxvt_term::scr_dump (int fd) NOTHROW 2675rxvt_term::scr_dump (int fd) NOTHROW
2591{ 2676{
2592 int row, wrote; 2677 // if this method is needed, it can be implemented by factoring the
2593 unsigned int width, towrite; 2678 // relevant code in scr_printscreen
2594 char r1[] = "\n";
2595
2596 for (row = saveLines - nsaved;
2597 row < saveLines + nrow - 1; row++)
2598 {
2599 width = row_buf[row].l >= 0 ? row_buf[row].l
2600 : ncol;
2601 for (towrite = width; towrite; towrite -= wrote)
2602 {
2603 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2604 towrite);
2605 if (wrote < 0)
2606 return; /* XXX: death, no report */
2607 }
2608 if (row_buf[row].l >= 0)
2609 if (write (fd, r1, 1) <= 0)
2610 return; /* XXX: death, no report */
2611 }
2612} 2679}
2613#endif 2680#endif
2614 2681
2615/* ------------------------------------------------------------------------- * 2682/* ------------------------------------------------------------------------- *
2616 * CHARACTER SELECTION * 2683 * CHARACTER SELECTION *
2617 * ------------------------------------------------------------------------- */ 2684 * ------------------------------------------------------------------------- */
2618void 2685void
2619rxvt_term::selection_check (int check_more) NOTHROW 2686rxvt_term::selection_check (int check_more) NOTHROW
2620{ 2687{
2621 row_col_t pos;
2622
2623 if (!selection.op) 2688 if (!selection.op)
2624 return; 2689 return;
2625 2690
2626 pos.row = pos.col = 0;
2627 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2691 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2628 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2692 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2629 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2630 || (check_more == 1 2694 || (check_more == 1
2631 && current_screen == selection.screen 2695 && current_screen == selection.screen
2632 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2696 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2633 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2697 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2634 || (check_more == 2
2635 && ROWCOL_IS_BEFORE (selection.beg, pos)
2636 && ROWCOL_IS_AFTER (selection.end, pos))
2637 || (check_more == 3
2638 && ROWCOL_IS_AFTER (selection.end, pos))
2639 || (check_more == 4 /* screen width change */
2640 && (selection.beg.row != selection.end.row
2641 || selection.end.col > ncol)))
2642 CLEAR_SELECTION (); 2698 CLEAR_ALL_SELECTION ();
2643} 2699}
2644 2700
2645/* ------------------------------------------------------------------------- */ 2701/* ------------------------------------------------------------------------- */
2646/* 2702/*
2647 * Paste a selection direct to the command fd 2703 * Paste a selection direct to the command fd
2648 */ 2704 */
2649void 2705void
2650rxvt_term::paste (char *data, unsigned int len) NOTHROW 2706rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2651{ 2707{
2652 /* convert normal newline chars into common keyboard Return key sequence */ 2708 /* convert normal newline chars into common keyboard Return key sequence */
2653 for (unsigned int i = 0; i < len; i++) 2709 for (unsigned int i = 0; i < len; i++)
2654 if (data[i] == C0_LF) 2710 if (data[i] == C0_LF)
2655 data[i] = C0_CR; 2711 data[i] = C0_CR;
2656 2712
2713 if (priv_modes & PrivMode_BracketPaste)
2714 tt_printf ("\x1b[200~");
2715
2657 tt_write (data, len); 2716 tt_write (data, len);
2658}
2659 2717
2660/* ------------------------------------------------------------------------- */ 2718 if (priv_modes & PrivMode_BracketPaste)
2661/* 2719 tt_printf ("\x1b[201~");
2662 * Respond to a notification that a primary selection has been sent
2663 * EXT: SelectionNotify
2664 */
2665void
2666rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2667{
2668 if (prop == None) /* check for failed XConvertSelection */
2669 {
2670 if ((selection_type & Sel_CompoundText))
2671 {
2672 int selnum = selection_type & Sel_whereMask;
2673
2674 selection_type = 0;
2675 if (selnum != Sel_direct)
2676 selection_request_other (XA_STRING, selnum);
2677 }
2678
2679 if ((selection_type & Sel_UTF8String))
2680 {
2681 int selnum = selection_type & Sel_whereMask;
2682
2683 selection_type = Sel_CompoundText;
2684 if (selnum != Sel_direct)
2685 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2686 else
2687 selection_type = 0;
2688 }
2689
2690 return;
2691 }
2692
2693 unsigned long bytes_after;
2694 XTextProperty ct;
2695
2696 if (XGetWindowProperty (dpy, win, prop,
2697 0, PROP_SIZE / 4,
2698 delete_prop, AnyPropertyType,
2699 &ct.encoding, &ct.format,
2700 &ct.nitems, &bytes_after,
2701 &ct.value) != Success)
2702 {
2703 ct.value = 0;
2704 goto bailout;
2705 }
2706
2707 if (ct.encoding == None)
2708 goto bailout;
2709
2710 if (bytes_after)
2711 {
2712 // fetch and append remaining data
2713 XTextProperty ct2;
2714
2715 if (XGetWindowProperty (dpy, win, prop,
2716 ct.nitems / 4, (bytes_after + 3) / 4,
2717 delete_prop, AnyPropertyType,
2718 &ct2.encoding, &ct2.format,
2719 &ct2.nitems, &bytes_after,
2720 &ct2.value) != Success)
2721 goto bailout;
2722
2723 // realloc should be compatible to XFree, here, and elsewhere, too
2724 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2725 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2726 ct.nitems += ct2.nitems;
2727
2728 XFree (ct2.value);
2729 }
2730
2731 if (ct.value == 0)
2732 goto bailout;
2733
2734 if (ct.encoding == xa[XA_INCR])
2735 {
2736 // INCR selection, start handshake
2737 if (!delete_prop)
2738 XDeleteProperty (dpy, win, prop);
2739
2740 selection_wait = Sel_incr;
2741 incr_buf_fill = 0;
2742 incr_ev.start (NOW + 10);
2743
2744 goto bailout;
2745 }
2746
2747 if (ct.nitems == 0)
2748 {
2749 if (selection_wait == Sel_incr)
2750 {
2751 XFree (ct.value);
2752
2753 // finally complete, now paste the whole thing
2754 selection_wait = Sel_normal;
2755 ct.value = (unsigned char *)incr_buf;
2756 ct.nitems = incr_buf_fill;
2757 incr_buf = 0;
2758 incr_buf_size = 0;
2759 incr_ev.stop ();
2760 }
2761 else
2762 {
2763 if (selection_wait == Sel_normal
2764 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2765 {
2766 /*
2767 * pass through again trying CUT_BUFFER0 if we've come from
2768 * XConvertSelection () but nothing was presented
2769 */
2770 selection_paste (display->root, XA_CUT_BUFFER0, False);
2771 }
2772
2773 goto bailout;
2774 }
2775 }
2776 else if (selection_wait == Sel_incr)
2777 {
2778 incr_ev.start (NOW + 10);
2779
2780 while (incr_buf_fill + ct.nitems > incr_buf_size)
2781 {
2782 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2783 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2784 }
2785
2786 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2787 incr_buf_fill += ct.nitems;
2788
2789 goto bailout;
2790 }
2791
2792 char **cl;
2793 int cr;
2794
2795#if !ENABLE_MINIMAL
2796 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2797 // so recode it manually
2798 if (ct.encoding == xa[XA_UTF8_STRING])
2799 {
2800 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2801 char *s = rxvt_wcstombs (w);
2802 free (w);
2803 // TODO: strlen == only the first element will be converted. well...
2804 paste (s, strlen (s));
2805 free (s);
2806 }
2807 else
2808#endif
2809 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2810 && cl)
2811 {
2812 for (int i = 0; i < cr; i++)
2813 paste (cl[i], strlen (cl[i]));
2814
2815 XFreeStringList (cl);
2816 }
2817 else
2818 paste ((char *)ct.value, ct.nitems); // paste raw
2819
2820bailout:
2821 XFree (ct.value);
2822
2823 if (selection_wait == Sel_normal)
2824 selection_wait = Sel_none;
2825} 2720}
2826 2721
2827void 2722void
2828rxvt_term::incr_cb (time_watcher &w) NOTHROW 2723rxvt_term::paste (char *data, unsigned int len) NOTHROW
2829{ 2724{
2830 selection_wait = Sel_none; 2725 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2831
2832 incr_buf_size = 0;
2833 free (incr_buf);
2834
2835 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2836}
2837
2838void
2839rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2840{
2841 if (prop == None || selection_wait != Sel_incr)
2842 return; 2726 return;
2843 2727
2844 selection_paste (win, prop, true); 2728 tt_paste (data, len);
2845} 2729}
2846 2730
2847/* ------------------------------------------------------------------------- */ 2731/* ------------------------------------------------------------------------- */
2848/* 2732/*
2849 * Request the current selection: 2733 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2850 * Order: > internal selection if available 2734 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2851 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2735 * as fallback
2852 * > CUT_BUFFER0
2853 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2854 * will auto fallback to CUT_BUFFER0
2855 * EXT: button 2 release 2736 * EXT: button 2 release
2856 */ 2737 */
2857void 2738void
2858rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2739rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2859{ 2740{
2860 if (selection.text && selnum == Sel_Primary) 2741 if (!selection_req)
2861 { /* internal selection */
2862 char *str = rxvt_wcstombs (selection.text, selection.len);
2863 paste (str, strlen (str));
2864 free (str);
2865 return;
2866 } 2742 {
2867 else 2743 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2744 selection_req->run ();
2868 { 2745 }
2869 selection_request_time = tm;
2870 selection_wait = Sel_normal;
2871
2872#if X_HAVE_UTF8_STRING
2873 selection_type = Sel_UTF8String;
2874 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2875 return;
2876#else
2877 selection_type = Sel_CompoundText;
2878 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2879 return;
2880#endif
2881 }
2882
2883 selection_wait = Sel_none; /* don't loop in selection_paste () */
2884 selection_paste (display->root, XA_CUT_BUFFER0, false);
2885}
2886
2887int
2888rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2889{
2890 Atom sel;
2891
2892 selection_type |= selnum;
2893
2894 if (selnum == Sel_Primary)
2895 sel = XA_PRIMARY;
2896 else if (selnum == Sel_Secondary)
2897 sel = XA_SECONDARY;
2898 else
2899 sel = xa[XA_CLIPBOARD];
2900
2901 if (XGetSelectionOwner (dpy, sel) != None)
2902 {
2903 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2904 vt, selection_request_time);
2905 return 1;
2906 }
2907
2908 return 0;
2909} 2746}
2910 2747
2911/* ------------------------------------------------------------------------- */ 2748/* ------------------------------------------------------------------------- */
2912/* 2749/*
2913 * Clear all selected text 2750 * Clear all selected text
2914 * EXT: SelectionClear 2751 * EXT: SelectionClear
2915 */ 2752 */
2916void 2753void
2917rxvt_term::selection_clear () NOTHROW 2754rxvt_term::selection_clear (bool clipboard) NOTHROW
2918{ 2755{
2756 if (!clipboard)
2757 {
2919 want_refresh = 1; 2758 want_refresh = 1;
2920 free (selection.text); 2759 free (selection.text);
2921 selection.text = NULL; 2760 selection.text = NULL;
2922 selection.len = 0; 2761 selection.len = 0;
2923 CLEAR_SELECTION (); 2762 CLEAR_SELECTION ();
2924 2763
2925 if (display->selection_owner == this) 2764 if (display->selection_owner == this)
2926 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 }
2927} 2776}
2928 2777
2929/* ------------------------------------------------------------------------- */ 2778/* ------------------------------------------------------------------------- */
2930/* 2779/*
2931 * Copy a selection into the cut buffer 2780 * Copy a selection into the cut buffer
2932 * EXT: button 1 or 3 release 2781 * EXT: button 1 or 3 release
2933 */ 2782 */
2934void 2783void
2935rxvt_term::selection_make (Time tm) 2784rxvt_term::selection_make (Time tm)
2936{ 2785{
2937 int i; 2786 int size;
2938 wchar_t *new_selection_text; 2787 wchar_t *new_selection_text;
2939 text_t *t; 2788 text_t *t;
2940 2789
2941 switch (selection.op) 2790 switch (selection.op)
2942 { 2791 {
… …
2958 return; /* nothing selected, go away */ 2807 return; /* nothing selected, go away */
2959 2808
2960 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)))
2961 return; 2810 return;
2962 2811
2963 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2812 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2964 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));
2965 2814
2966 int ofs = 0; 2815 int ofs = 0;
2967 int extra = 0; 2816 int extra = 0;
2968 2817
2969 int col = selection.beg.col; 2818 int col = selection.beg.col;
… …
2975 { 2824 {
2976#if !ENABLE_MINIMAL 2825#if !ENABLE_MINIMAL
2977 if (selection.rect) 2826 if (selection.rect)
2978 { 2827 {
2979 col = selection.beg.col; 2828 col = selection.beg.col;
2980 end_col = ncol + 1; 2829 end_col = selection.end.col;
2981 } 2830 }
2982 else 2831 else
2983#endif 2832#endif
2984 end_col = ROW(row).l; 2833 end_col = ROW(row).l;
2985 2834
2986 col = max (col, 0); 2835 col = max (col, 0);
2987 2836
2988 if (row == selection.end.row 2837 if (row == selection.end.row)
2989#if !ENABLE_MINIMAL
2990 || selection.rect
2991#endif
2992 )
2993 min_it (end_col, selection.end.col); 2838 min_it (end_col, selection.end.col);
2994 2839
2995 t = ROW(row).t + col; 2840 t = ROW(row).t + col;
2996 2841
2997 for (; col < end_col; col++) 2842 for (; col < end_col; col++)
… …
3005 2850
3006 extra -= (len - 1); 2851 extra -= (len - 1);
3007 2852
3008 if (extra < 0) 2853 if (extra < 0)
3009 { 2854 {
3010 extra += i; 2855 extra += size;
3011 i += i; 2856 size += size;
3012 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));
3013 } 2858 }
3014 2859
3015 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2860 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3016 } 2861 }
3017#endif 2862#endif
… …
3029 2874
3030 new_selection_text[ofs++] = C0_LF; 2875 new_selection_text[ofs++] = C0_LF;
3031 } 2876 }
3032 else 2877 else
3033#endif 2878#endif
3034 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))
3035 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3036 } 2883 }
3037
3038 if (end_col != selection.end.col)
3039 new_selection_text[ofs++] = C0_LF;
3040 2884
3041 new_selection_text[ofs] = 0; 2885 new_selection_text[ofs] = 0;
3042 2886
3043 if (ofs == 0) 2887 if (ofs == 0)
3044 { 2888 {
… …
3057 2901
3058 selection_grab (tm); 2902 selection_grab (tm);
3059} 2903}
3060 2904
3061bool 2905bool
3062rxvt_term::selection_grab (Time tm) NOTHROW 2906rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3063{ 2907{
2908 Atom sel;
2909
2910 if (!clipboard)
2911 {
3064 selection_time = tm; 2912 selection_time = tm;
2913 sel = XA_PRIMARY;
2914 }
2915 else
2916 {
2917 clipboard_time = tm;
2918 sel = xa[XA_CLIPBOARD];
2919 }
3065 2920
3066 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2921 XSetSelectionOwner (dpy, sel, vt, tm);
3067 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2922 if (XGetSelectionOwner (dpy, sel) == vt)
3068 { 2923 {
3069 display->set_selection_owner (this); 2924 display->set_selection_owner (this, clipboard);
3070 return true; 2925 return true;
3071 } 2926 }
3072 else 2927 else
3073 { 2928 {
3074 selection_clear (); 2929 selection_clear (clipboard);
3075 return false; 2930 return false;
3076 } 2931 }
3077 2932
3078#if 0 2933#if 0
3079 XTextProperty ct; 2934 XTextProperty ct;
… …
3132 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 2987 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3133 2988
3134 while (selection.mark.col > 0 2989 while (selection.mark.col > 0
3135 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 2990 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3136 --selection.mark.col; 2991 --selection.mark.col;
3137 2992
3138 if (selection.op) 2993 if (selection.op)
2994 {
3139 { /* clear the old selection */ 2995 /* clear the old selection */
3140 selection.beg.row = selection.end.row = selection.mark.row; 2996 selection.beg.row = selection.end.row = selection.mark.row;
3141 selection.beg.col = selection.end.col = selection.mark.col; 2997 selection.beg.col = selection.end.col = selection.mark.col;
3142 } 2998 }
3143 2999
3144 selection.op = SELECTION_INIT; 3000 selection.op = SELECTION_INIT;
… …
3333 * 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
3334 * 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
3335 * time of the most recent button3 press 3191 * time of the most recent button3 press
3336 */ 3192 */
3337 if (button3 && buttonpress) 3193 if (button3 && buttonpress)
3194 {
3338 { /* button3 press */ 3195 /* button3 press */
3339 /* 3196 /*
3340 * first determine which edge of the selection we are closest to 3197 * first determine which edge of the selection we are closest to
3341 */ 3198 */
3342 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3199 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3343 || (!ROWCOL_IS_AFTER (pos, selection.end) 3200 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3361 selection.mark.row = selection.beg.row; 3218 selection.mark.row = selection.beg.row;
3362 selection.mark.col = selection.beg.col; 3219 selection.mark.col = selection.beg.col;
3363 } 3220 }
3364 } 3221 }
3365 else 3222 else
3223 {
3366 { /* button1 drag or button3 drag */ 3224 /* button1 drag or button3 drag */
3367 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3225 if (ROWCOL_IS_AFTER (selection.mark, pos))
3368 { 3226 {
3369 if (selection.mark.row == selection.end.row 3227 if (selection.mark.row == selection.end.row
3370 && selection.mark.col == selection.end.col 3228 && selection.mark.col == selection.end.col
3371 && clickchange 3229 && clickchange
… …
3414 selection_delimit_word (DN, &selection.end, &selection.end); 3272 selection_delimit_word (DN, &selection.end, &selection.end);
3415 } 3273 }
3416 else if (selection.clicks == 3) 3274 else if (selection.clicks == 3)
3417 { 3275 {
3418#if ENABLE_FRILLS 3276#if ENABLE_FRILLS
3419 if (OPTION (Opt_tripleclickwords)) 3277 if (option (Opt_tripleclickwords))
3420 { 3278 {
3421 selection_delimit_word (UP, &selection.beg, &selection.beg); 3279 selection_delimit_word (UP, &selection.beg, &selection.beg);
3422 3280
3423 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++)
3424 { 3282 {
… …
3452 selection.end.row++; 3310 selection.end.row++;
3453 } 3311 }
3454 } 3312 }
3455 3313
3456 if (button3 && buttonpress) 3314 if (button3 && buttonpress)
3315 {
3457 { /* mark may need to be changed */ 3316 /* mark may need to be changed */
3458 if (closeto == LEFT) 3317 if (closeto == LEFT)
3459 { 3318 {
3460 selection.mark.row = selection.end.row; 3319 selection.mark.row = selection.end.row;
3461 selection.mark.col = selection.end.col - (selection.clicks == 2); 3320 selection.mark.col = selection.end.col - (selection.clicks == 2);
3462 } 3321 }
… …
3535 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3536 */ 3395 */
3537void 3396void
3538rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3539{ 3398{
3399 Atom property = rq.property == None ? rq.target : rq.property;
3540 XSelectionEvent ev; 3400 XSelectionEvent ev;
3541 3401
3542 ev.type = SelectionNotify; 3402 ev.type = SelectionNotify;
3543 ev.property = None; 3403 ev.property = None;
3544 ev.display = rq.display; 3404 ev.display = rq.display;
… …
3559 *target++ = xa[XA_COMPOUND_TEXT]; 3419 *target++ = xa[XA_COMPOUND_TEXT];
3560#if X_HAVE_UTF8_STRING 3420#if X_HAVE_UTF8_STRING
3561 *target++ = xa[XA_UTF8_STRING]; 3421 *target++ = xa[XA_UTF8_STRING];
3562#endif 3422#endif
3563 3423
3564 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3424 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3565 32, PropModeReplace, 3425 32, PropModeReplace,
3566 (unsigned char *)target_list, target - target_list); 3426 (unsigned char *)target_list, target - target_list);
3567 ev.property = rq.property; 3427 ev.property = property;
3568 } 3428 }
3569#if TODO // TODO 3429#if TODO // TODO
3570 else if (rq.target == xa[XA_MULTIPLE]) 3430 else if (rq.target == xa[XA_MULTIPLE])
3571 { 3431 {
3572 /* TODO: Handle MULTIPLE */ 3432 /* TODO: Handle MULTIPLE */
3573 } 3433 }
3574#endif 3434#endif
3575 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3435 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3576 { 3436 {
3577 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3437 XChangeProperty (dpy, rq.requestor, property, rq.target,
3578 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3438 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3579 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;
3580 } 3446 }
3581 else if (rq.target == XA_STRING 3447 else if (rq.target == XA_STRING
3582 || rq.target == xa[XA_TEXT] 3448 || rq.target == xa[XA_TEXT]
3583 || rq.target == xa[XA_COMPOUND_TEXT] 3449 || rq.target == xa[XA_COMPOUND_TEXT]
3584 || rq.target == xa[XA_UTF8_STRING] 3450 || rq.target == xa[XA_UTF8_STRING]
… …
3616 { 3482 {
3617 target = xa[XA_COMPOUND_TEXT]; 3483 target = xa[XA_COMPOUND_TEXT];
3618 style = enc_compound_text; 3484 style = enc_compound_text;
3619 } 3485 }
3620 3486
3621 if (selection.text) 3487 if (rq.selection == XA_PRIMARY && selection.text)
3622 { 3488 {
3623 cl = selection.text; 3489 cl = selection.text;
3624 selectlen = selection.len; 3490 selectlen = selection.len;
3491 }
3492 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3493 {
3494 cl = selection.clip_text;
3495 selectlen = selection.clip_len;
3625 } 3496 }
3626 else 3497 else
3627 { 3498 {
3628 cl = L""; 3499 cl = L"";
3629 selectlen = 0; 3500 selectlen = 0;
… …
3650 ct.value = (unsigned char *)cl; 3521 ct.value = (unsigned char *)cl;
3651 ct.nitems = selectlen; 3522 ct.nitems = selectlen;
3652 ct.encoding = target; 3523 ct.encoding = target;
3653 } 3524 }
3654 3525
3655 XChangeProperty (dpy, rq.requestor, rq.property, 3526 XChangeProperty (dpy, rq.requestor, property,
3656 ct.encoding, 8, PropModeReplace, 3527 ct.encoding, 8, PropModeReplace,
3657 ct.value, (int)ct.nitems); 3528 ct.value, (int)ct.nitems);
3658 ev.property = rq.property; 3529 ev.property = property;
3659 3530
3660 if (freect) 3531 if (freect)
3661 XFree (ct.value); 3532 XFree (ct.value);
3662 } 3533 }
3663 3534
3664 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3535 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3665}
3666
3667/* ------------------------------------------------------------------------- *
3668 * MOUSE ROUTINES *
3669 * ------------------------------------------------------------------------- */
3670
3671/*
3672 * return col/row values corresponding to x/y pixel values
3673 */
3674void
3675rxvt_term::pixel_position (int *x, int *y) NOTHROW
3676{
3677 *x = Pixel2Col (*x);
3678 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3679 *y = Pixel2Row (*y);
3680 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3681} 3536}
3682 3537
3683/* ------------------------------------------------------------------------- */ 3538/* ------------------------------------------------------------------------- */
3684#ifdef USE_XIM 3539#ifdef USE_XIM
3685void 3540void
… …
3713 h += 2; min_it (h, nrow); 3568 h += 2; min_it (h, nrow);
3714 3569
3715 x -= 1; clamp_it (x, 0, ncol - w); 3570 x -= 1; clamp_it (x, 0, ncol - w);
3716 y -= 1; clamp_it (y, 0, nrow - h); 3571 y -= 1; clamp_it (y, 0, nrow - h);
3717 3572
3718 ov_x = x; ov_y = y; 3573 ov.x = x; ov.y = y;
3719 ov_w = w; ov_h = h; 3574 ov.w = w; ov.h = h;
3720 3575
3721 ov_text = new text_t *[h]; 3576 ov.text = new text_t *[h];
3722 ov_rend = new rend_t *[h]; 3577 ov.rend = new rend_t *[h];
3723 3578
3724 for (y = 0; y < h; y++) 3579 for (y = 0; y < h; y++)
3725 { 3580 {
3726 text_t *tp = ov_text[y] = new text_t[w]; 3581 text_t *tp = ov.text[y] = new text_t[w];
3727 rend_t *rp = ov_rend[y] = new rend_t[w]; 3582 rend_t *rp = ov.rend[y] = new rend_t[w];
3728 3583
3729 text_t t0, t1, t2; 3584 text_t t0, t1, t2;
3730 rend_t r = OVERLAY_RSTYLE; 3585 rend_t r = OVERLAY_RSTYLE;
3731 3586
3732 if (y == 0) 3587 if (y == 0)
… …
3751} 3606}
3752 3607
3753void 3608void
3754rxvt_term::scr_overlay_off () NOTHROW 3609rxvt_term::scr_overlay_off () NOTHROW
3755{ 3610{
3756 if (!ov_text) 3611 if (!ov.text)
3757 return; 3612 return;
3758 3613
3759 want_refresh = 1; 3614 want_refresh = 1;
3760 3615
3761 for (int y = 0; y < ov_h; y++) 3616 for (int y = 0; y < ov.h; y++)
3762 { 3617 {
3763 delete [] ov_text[y]; 3618 delete [] ov.text[y];
3764 delete [] ov_rend[y]; 3619 delete [] ov.rend[y];
3765 } 3620 }
3766 3621
3767 delete [] ov_text; ov_text = 0; 3622 delete [] ov.text; ov.text = 0;
3768 delete [] ov_rend; ov_rend = 0; 3623 delete [] ov.rend; ov.rend = 0;
3769} 3624}
3770 3625
3771void 3626void
3772rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3627rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3773{ 3628{
3774 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3629 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3775 return; 3630 return;
3776 3631
3777 x++, y++; 3632 x++, y++;
3778 3633
3779 ov_text[y][x] = text; 3634 ov.text[y][x] = text;
3780 ov_rend[y][x] = rend; 3635 ov.rend[y][x] = rend;
3781} 3636}
3782 3637
3783void 3638void
3784rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3639rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3785{ 3640{
… …
3804} 3659}
3805 3660
3806void 3661void
3807rxvt_term::scr_swap_overlay () NOTHROW 3662rxvt_term::scr_swap_overlay () NOTHROW
3808{ 3663{
3809 if (!ov_text) 3664 if (!ov.text)
3810 return; 3665 return;
3811 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
3812 // swap screen mem with overlay 3672 // swap screen mem with overlay
3813 for (int y = ov_h; y--; ) 3673 for (int y = ov.h; y--; )
3814 { 3674 {
3815 text_t *t1 = ov_text[y]; 3675 text_t *t1 = ov.text[y];
3816 rend_t *r1 = ov_rend[y]; 3676 rend_t *r1 = ov.rend[y];
3817 3677
3818 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;
3819 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;
3820 3680
3821 for (int x = ov_w; x--; ) 3681 for (int x = ov.w; x--; )
3822 { 3682 {
3823 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3683 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3824 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));
3825 } 3685 }
3826 } 3686 }

Diff Legend

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