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.306 by root, Sun Jun 15 10:15:39 2008 UTC vs.
Revision 1.422 by root, Thu Jun 28 15:19:15 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-2007 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.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 80 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 81#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 83
87/* 84/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 85 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 86 */
92#define CLEAR_ROWS(row, num) \
93 if (mapped) \
94 XClearArea (dpy, vt, 0, \
95 Row2Pixel (row), (unsigned int)width, \
96 (unsigned int)Height2Pixel (num), False)
97
98#define CLEAR_CHARS(x, y, num) \ 87#define CLEAR_CHARS(x, y, num) \
99 if (mapped) \ 88 if (mapped) \
100 XClearArea (dpy, vt, x, y, \ 89 XClearArea (dpy, vt, x, y, \
101 (unsigned int)Width2Pixel (num), \ 90 (unsigned int)Width2Pixel (num), \
102 (unsigned int)Height2Pixel (1), False) 91 (unsigned int)Height2Pixel (1), False)
103 92
104#define ERASE_ROWS(row, num) \
105 XFillRectangle (dpy, vt, gc, \
106 0, Row2Pixel (row), \
107 (unsigned int)width, \
108 (unsigned int)Height2Pixel (num))
109
110/* ------------------------------------------------------------------------- * 93/* ------------------------------------------------------------------------- *
111 * SCREEN `COMMON' ROUTINES * 94 * SCREEN `COMMON' ROUTINES *
112 * ------------------------------------------------------------------------- */ 95 * ------------------------------------------------------------------------- */
113 96
114/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
115void 98void
116rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
117{ 100{
118 if (!l.t) 101 if (!l.valid ())
119 { 102 {
120 lalloc (l); 103 l.alloc ();
121 col = 0; 104 col = 0;
122 width = ncol; 105 width = ncol;
123 } 106 }
124 107
125 l.touch (); 108 l.touch ();
… …
144{ 127{
145 scr_blank_line (l, 0, ncol, efs); 128 scr_blank_line (l, 0, ncol, efs);
146 129
147 l.l = 0; 130 l.l = 0;
148 l.f = 0; 131 l.f = 0;
132}
133
134// nuke a single wide character at the given column
135void
136rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
137{
138 // find begin
139 while (col > 0 && l.t[col] == NOCHAR)
140 col--;
141
142 rend_t rend = l.r[col] & ~RS_baseattrMask;
143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
146
147 // found start, nuke
148 do {
149 l.t[col] = ' ';
150 l.r[col] = rend;
151 col++;
152 } while (col < ncol && l.t[col] == NOCHAR);
149} 153}
150 154
151/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
152 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
153 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
154 158
155void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = chunk_alloc (chunk_size, 0);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
156rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
157{ 195{
158#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
159 scr_overlay_off (); 197 scr_overlay_off ();
160#endif 198#endif
161 199
162 rvideo_mode = false;
163 view_start = 0; 200 view_start = 0;
164 num_scr = 0; 201 num_scr = 0;
165 202
166 if (ncol == 0) 203 if (ncol == 0)
167 ncol = 80; 204 ncol = 80;
… …
169 if (nrow == 0) 206 if (nrow == 0)
170 nrow = 24; 207 nrow = 24;
171 208
172 if (ncol == prev_ncol && nrow == prev_nrow) 209 if (ncol == prev_ncol && nrow == prev_nrow)
173 return; 210 return;
174
175 if (current_screen != PRIMARY)
176 scr_swap_screen ();
177 211
178 // we need at least two lines for wrapping to work correctly 212 // we need at least two lines for wrapping to work correctly
179 while (nrow + saveLines < 2) 213 while (nrow + saveLines < 2)
180 { 214 {
181 //TODO//FIXME 215 //TODO//FIXME
… …
190 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
191 225
192 screen.tscroll = 0; 226 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
194 228
229 void *prev_chunk = chunk;
230 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf;
233
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc ();
237
195 if (!row_buf) 238 if (!prev_row_buf)
196 { 239 {
197 /* 240 /*
198 * first time called so just malloc everything: don't rely on realloc 241 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
199 */ 242 */
200 top_row = 0; 243 top_row = 0;
201 term_start = 0; 244 term_start = 0;
202
203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205
206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209
210 for (int row = nrow; row--; )
211 {
212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 }
216 245
217 memset (charsets, 'B', sizeof (charsets)); 246 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 247 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 248 screen.flags = Screen_DefaultFlags;
220 screen.cur.row = screen.cur.col = 0; 249 screen.cur.row = screen.cur.col = 0;
… …
234 selection.text = NULL; 263 selection.text = NULL;
235 selection.len = 0; 264 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 265 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 266 selection.screen = PRIMARY;
238 selection.clicks = 0; 267 selection.clicks = 0;
268 selection.clip_text = NULL;
269 selection.clip_len = 0;
239 } 270 }
240 else 271 else
241 { 272 {
242 /* 273 /*
243 * add or delete rows as appropriate 274 * add or delete rows as appropriate
244 */ 275 */
245 276
246 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248
249#if 0
250 if (nrow < prev_nrow)
251 {
252 for (int row = nrow; row < prev_nrow; row++)
253 {
254 lfree (swap_buf [row]);
255 lfree (drawn_buf[row]);
256 }
257 }
258#endif
259
260 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262
263 for (int row = min (nrow, prev_nrow); row--; ) 277 for (int row = min (nrow, prev_nrow); row--; )
264 { 278 {
265 lresize (drawn_buf[row]); 279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
266 lresize (swap_buf [row]); 280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
267 }
268 281
269 for (int row = prev_nrow; row < nrow; row++) 282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
270 { 286 }
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 }
274
275 line_t *old_buf = row_buf;
276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
277 287
278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279 int pend = MOD (term_start + top_row , prev_total_rows); 289 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row 290 int q = total_rows; // rewrapped row
281 291
282 if (top_row) 292 if (top_row)
283 { 293 {
284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 294 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
285 // to come up with a lean and mean algorithm. 295 // to come up with a lean and mean algorithm.
296 // TODO: maybe optimise when width didn't change
286 297
287 row_col_t ocur = screen.cur; 298 row_col_t ocur = screen.cur;
288 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 299 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289 300
290 do 301 do
291 { 302 {
292 p = MOD (p - 1, prev_total_rows); 303 p = MOD (p - 1, prev_total_rows);
293#ifdef DEBUG_STRICT
294 assert (old_buf [MOD (p, prev_total_rows)].t); 304 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
295#endif
296 int plines = 1; 305 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l; 306 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
298 307
299 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 308 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
300 { 309 {
301 p = MOD (p - 1, prev_total_rows); 310 p = MOD (p - 1, prev_total_rows);
302 311
303 plines++; 312 plines++;
304 llen += prev_ncol; 313 llen += prev_ncol;
… …
317 326
318 // re-assemble the full line by destination lines 327 // re-assemble the full line by destination lines
319 for (int qrow = q; qlines--; qrow++) 328 for (int qrow = q; qlines--; qrow++)
320 { 329 {
321 qline = row_buf + qrow; 330 qline = row_buf + qrow;
322 lalloc (*qline); 331 qline->alloc (); // redundant with next line
323 qline->l = ncol; 332 qline->l = ncol;
324 qline->is_longer (1); 333 qline->is_longer (1);
325 334
326 int qcol = 0; 335 int qcol = 0;
327 336
… …
342 // this seems to upset applications/shells/readline 351 // this seems to upset applications/shells/readline
343 // least. 352 // least.
344 if (prow == ocur.row) 353 if (prow == ocur.row)
345 screen.cur.row = q - (total_rows - nrow); 354 screen.cur.row = q - (total_rows - nrow);
346 355
347 line_t &pline = old_buf [prow]; 356 line_t &pline = prev_row_buf [prow];
348 357
349 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 358 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
350 359
351 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 360 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
352 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 361 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
373 { 382 {
374 // if no scrollback exists (yet), wing, instead of wrap 383 // if no scrollback exists (yet), wing, instead of wrap
375 384
376 for (int row = min (nrow, prev_nrow); row--; ) 385 for (int row = min (nrow, prev_nrow); row--; )
377 { 386 {
378 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
379 line_t &qline = row_buf [row]; 388 line_t &dst = row_buf [row];
380 389
381 qline = pline; 390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
382 lresize (qline); 391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
383 } 394 }
384 395
385 for (int row = prev_nrow; row < nrow; row++) 396 for (int row = prev_nrow; row < nrow; row++)
386 {
387 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
388 }
389 398
390 term_start = 0; 399 term_start = 0;
391 } 400 }
392
393 free (old_buf);
394 delete old_ta;
395 delete old_ra;
396 401
397 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
398 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
404 }
399 405
406 for (int row = nrow; row--; )
407 {
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 }
412
413 free (prev_chunk);
414
400 free (tabs); 415 free (tabs);
401 } 416 tabs = (char *)rxvt_malloc (ncol);
417
418 for (int col = ncol; col--; )
419 tabs [col] = col % TABSIZE == 0;
402 420
403 CLEAR_ALL_SELECTION (); 421 CLEAR_ALL_SELECTION ();
404 422
405 prev_nrow = nrow; 423 prev_nrow = nrow;
406 prev_ncol = ncol; 424 prev_ncol = ncol;
407 425
408 tabs = (char *)rxvt_malloc (ncol); 426 tt_winch ();
409 427
410 for (int col = ncol; --col; ) 428 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
411 tabs [col] = col % TABSIZE == 0; 429}
430
431void ecb_cold
432rxvt_term::scr_release () NOTHROW
433{
434 chunk_free (chunk, chunk_size);
435 chunk = 0;
436 row_buf = 0;
437
438 free (tabs);
439 tabs = 0;
440}
441
442/* ------------------------------------------------------------------------- */
443/*
444 * Hard/Soft reset
445 */
446void ecb_cold
447rxvt_term::scr_poweron ()
448{
449 scr_release ();
450
451 prev_nrow = prev_ncol = 0;
452 rvideo_mode = false;
453 scr_soft_reset ();
454 scr_reset ();
455
456 scr_clear (true);
457 scr_refresh ();
458}
459
460void ecb_cold
461rxvt_term::scr_soft_reset () NOTHROW
462{
463 /* only affects modes, nothing drastic such as clearing the screen */
464#if ENABLE_OVERLAY
465 scr_overlay_off ();
466#endif
412 467
413 if (current_screen != PRIMARY) 468 if (current_screen != PRIMARY)
414 scr_swap_screen (); 469 scr_swap_screen ();
415 470
416 tt_winch (); 471 scr_scroll_region (0, MAX_ROWS - 1);
417 472 scr_rendition (0, ~RS_None);
418 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 473 scr_insert_mode (0);
419}
420
421/* ------------------------------------------------------------------------- */
422/*
423 * Free everything. That way malloc debugging can find leakage.
424 */
425void
426rxvt_term::scr_release () NOTHROW
427{
428 if (row_buf)
429 {
430 delete talloc; talloc = 0;
431 delete ralloc; ralloc = 0;
432
433 free (row_buf);
434 free (swap_buf);
435 free (drawn_buf);
436 free (tabs);
437
438 row_buf = 0; // signal that we freed all the arrays
439 }
440}
441
442/* ------------------------------------------------------------------------- */
443/*
444 * Hard reset
445 */
446void
447rxvt_term::scr_poweron ()
448{
449 scr_release ();
450 prev_nrow = prev_ncol = 0;
451 scr_reset ();
452
453 scr_clear (true);
454 scr_refresh ();
455} 474}
456 475
457/* ------------------------------------------------------------------------- * 476/* ------------------------------------------------------------------------- *
458 * PROCESS SCREEN COMMANDS * 477 * PROCESS SCREEN COMMANDS *
459 * ------------------------------------------------------------------------- */ 478 * ------------------------------------------------------------------------- */
… …
497 } 516 }
498 517
499 /* boundary check in case screen size changed between SAVE and RESTORE */ 518 /* boundary check in case screen size changed between SAVE and RESTORE */
500 min_it (s->cur.row, nrow - 1); 519 min_it (s->cur.row, nrow - 1);
501 min_it (s->cur.col, ncol - 1); 520 min_it (s->cur.col, ncol - 1);
502#ifdef DEBUG_STRICT
503 assert (s->cur.row >= 0); 521 assert (s->cur.row >= 0);
504 assert (s->cur.col >= 0); 522 assert (s->cur.col >= 0);
505#endif
506} 523}
507 524
508void 525void
509rxvt_term::scr_swap_screen () 526rxvt_term::scr_swap_screen () NOTHROW
510{ 527{
511 if (!option (Opt_secondaryScreen)) 528 if (!option (Opt_secondaryScreen))
512 return; 529 return;
513 530
514 for (int i = prev_nrow; i--; ) 531 for (int i = prev_nrow; i--; )
… …
533 return; 550 return;
534 551
535 want_refresh = 1; 552 want_refresh = 1;
536 view_start = 0; 553 view_start = 0;
537 554
538 selection_check (2); /* check for boundary cross */ 555 /* check for boundary cross */
556 row_col_t pos;
557 pos.row = pos.col = 0;
558 if (ROWCOL_IS_BEFORE (selection.beg, pos)
559 && ROWCOL_IS_AFTER (selection.end, pos))
560 CLEAR_SELECTION ();
539 561
540 int i = current_screen; current_screen = scrn; scrn = i; 562 current_screen = scrn;
541 563
542#if NSCREENS 564#if NSCREENS
543 if (option (Opt_secondaryScreen)) 565 if (option (Opt_secondaryScreen))
544 { 566 {
545 num_scr = 0; 567 num_scr = 0;
… …
609/* 631/*
610 * Scroll text between <row1> and <row2> inclusive, by <count> lines 632 * Scroll text between <row1> and <row2> inclusive, by <count> lines
611 * count positive ==> scroll up 633 * count positive ==> scroll up
612 * count negative ==> scroll down 634 * count negative ==> scroll down
613 */ 635 */
614int 636int ecb_hot
615rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 637rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
616{ 638{
617 if (count == 0 || (row1 > row2)) 639 if (count == 0 || (row1 > row2))
618 return 0; 640 return 0;
619 641
… …
622 644
623 if (count > 0 645 if (count > 0
624 && row1 == 0 646 && row1 == 0
625 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 647 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
626 { 648 {
649 min_it (count, total_rows - (nrow - (row2 + 1)));
650
627 top_row = max (top_row - count, -saveLines); 651 top_row = max (top_row - count, -saveLines);
628
629 // scroll everything up 'count' lines
630 term_start = (term_start + count) % total_rows;
631 652
632 // sever bottommost line 653 // sever bottommost line
633 { 654 {
634 line_t &l = ROW(row2 - count); 655 line_t &l = ROW(row2);
635 l.is_longer (0); 656 l.is_longer (0);
636 l.touch (); 657 l.touch ();
637 } 658 }
638 659
660 // scroll everything up 'count' lines
661 term_start = (term_start + count) % total_rows;
662
663 // now copy lines below the scroll region bottom to the
664 // bottom of the screen again, so they look as if they
665 // hadn't moved.
666 for (int i = nrow; --i > row2; )
667 {
668 line_t &l1 = ROW(i - count);
669 line_t &l2 = ROW(i);
670
671 ::swap (l1, l2);
672 l2.touch ();
673 }
674
639 // erase newly scrolled-in lines 675 // erase newly scrolled-in lines
640 for (int i = count; i--; ) 676 for (int i = count; i--; )
641 { 677 {
642 line_t &l = ROW(nrow - 1 - i); 678 line_t &l = ROW(row2 - i);
643 679
644 // optimize if already cleared, can be significant on slow machines 680 // optimise if already cleared, can be significant on slow machines
645 // could be rolled into scr_blank_screen_mem 681 // could be rolled into scr_blank_screen_mem
646 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 682 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
647 { 683 {
648 scr_blank_line (l, 0, l.l, rstyle); 684 scr_blank_line (l, 0, l.l, rstyle);
649 l.l = 0; 685 l.l = 0;
… …
651 } 687 }
652 else 688 else
653 scr_blank_screen_mem (l, rstyle); 689 scr_blank_screen_mem (l, rstyle);
654 } 690 }
655 691
656 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they
658 // hadn't moved.
659 for (int i = nrow; --i > row2; )
660 {
661 line_t &l1 = ROW(i - count);
662 line_t &l2 = ROW(i);
663
664 ::swap (l1, l2);
665 l2.touch ();
666 }
667
668 // move and/or clear selection, if any 692 // move and/or clear selection, if any
669 if (selection.op && current_screen == selection.screen) 693 if (selection.op && current_screen == selection.screen
694 && selection.beg.row <= row2)
670 { 695 {
671 selection.beg.row -= count; 696 selection.beg.row -= count;
672 selection.end.row -= count; 697 selection.end.row -= count;
673 selection.mark.row -= count; 698 selection.mark.row -= count;
674 699
675 if (selection.beg.row < top_row 700 selection_check (0);
676 || selection.end.row < top_row
677 || selection.mark.row < top_row)
678 {
679 CLEAR_ALL_SELECTION ();
680 selection.op = SELECTION_CLEAR;
681 }
682 } 701 }
683 702
684 // finally move the view window, if desired 703 // finally move the view window, if desired
685 if (option (Opt_scrollWithBuffer) 704 if (option (Opt_scrollWithBuffer)
686 && view_start != 0 705 && view_start != 0
… …
716 } 735 }
717 736
718 // use a simple and robust scrolling algorithm, this 737 // use a simple and robust scrolling algorithm, this
719 // part of scr_scroll_text is not time-critical. 738 // part of scr_scroll_text is not time-critical.
720 739
740 // sever line above scroll region
741 if (row1)
742 {
743 line_t &l = ROW(row1 - 1);
744 l.is_longer (0);
745 l.touch ();
746 }
747
721 int rows = row2 - row1 + 1; 748 int rows = row2 - row1 + 1;
722 749
723 min_it (count, rows); 750 min_it (count, rows);
724 751
725 line_t *temp_buf = row_buf + total_rows; 752 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
726 753
727 for (int row = 0; row < rows; row++) 754 for (int row = 0; row < rows; row++)
728 { 755 {
729 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 756 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
730 757
… …
732 scr_blank_screen_mem (temp_buf [row], rstyle); 759 scr_blank_screen_mem (temp_buf [row], rstyle);
733 } 760 }
734 761
735 for (int row = 0; row < rows; row++) 762 for (int row = 0; row < rows; row++)
736 ROW(row1 + row) = temp_buf [row]; 763 ROW(row1 + row) = temp_buf [row];
764
765 // sever bottommost line
766 {
767 line_t &l = ROW(row2);
768 l.is_longer (0);
769 l.touch ();
770 }
737 } 771 }
738 772
739 return count; 773 return count;
740} 774}
741 775
742/* ------------------------------------------------------------------------- */ 776/* ------------------------------------------------------------------------- */
743/* 777/*
744 * Add text given in <str> of length <len> to screen struct 778 * Add text given in <str> of length <len> to screen struct
745 */ 779 */
746void 780void ecb_hot
747rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 781rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
748{ 782{
749 if (len <= 0) /* sanity */ 783 if (len <= 0) /* sanity */
750 return; 784 return;
751 785
752 unsigned char checksel; 786 bool checksel;
753 unicode_t c; 787 unicode_t c;
754 int ncol = this->ncol; 788 int ncol = this->ncol;
755 const wchar_t *strend = str + len; 789 const wchar_t *strend = str + len;
756 790
757 want_refresh = 1; 791 want_refresh = 1;
… …
770 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 804 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
771 screen.cur.row -= minlines; 805 screen.cur.row -= minlines;
772 } 806 }
773 } 807 }
774 808
775#ifdef DEBUG_STRICT
776 assert (screen.cur.col < ncol); 809 assert (screen.cur.col < ncol);
777 assert (screen.cur.row < nrow 810 assert (screen.cur.row < nrow
778 && screen.cur.row >= top_row); 811 && screen.cur.row >= top_row);
779#endif
780 int row = screen.cur.row; 812 int row = screen.cur.row;
781 813
782 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 814 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
783 815
784 line_t *line = &ROW(row); 816 line_t *line = &ROW(row);
785 817
786 while (str < strend) 818 while (str < strend)
787 { 819 {
788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 820 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
789 821
790 if (c < 0x20) 822 if (ecb_unlikely (c < 0x20))
791 if (c == C0_LF) 823 if (c == C0_LF)
792 { 824 {
793 max_it (line->l, screen.cur.col); 825 max_it (line->l, screen.cur.col);
794 826
795 screen.flags &= ~Screen_WrapNext; 827 screen.flags &= ~Screen_WrapNext;
… …
814 { 846 {
815 scr_tab (1, true); 847 scr_tab (1, true);
816 continue; 848 continue;
817 } 849 }
818 850
851 if (ecb_unlikely (
819 if (checksel /* see if we're writing within selection */ 852 checksel /* see if we're writing within selection */
820 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 853 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
821 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 854 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
855 ))
822 { 856 {
823 checksel = 0; 857 checksel = 0;
824 /* 858 /*
825 * If we wrote anywhere in the selected area, kill the selection 859 * If we wrote anywhere in the selected area, kill the selection
826 * XXX: should we kill the mark too? Possibly, but maybe that 860 * XXX: should we kill the mark too? Possibly, but maybe that
827 * should be a similar check. 861 * should be a similar check.
828 */ 862 */
829 CLEAR_SELECTION (); 863 CLEAR_SELECTION ();
830 } 864 }
831 865
832 if (screen.flags & Screen_WrapNext) 866 if (ecb_unlikely (screen.flags & Screen_WrapNext))
833 { 867 {
834 scr_do_wrap (); 868 scr_do_wrap ();
835 869
836 line->l = ncol; 870 line->l = ncol;
837 line->is_longer (1); 871 line->is_longer (1);
… …
839 row = screen.cur.row; 873 row = screen.cur.row;
840 line = &ROW(row); /* _must_ refresh */ 874 line = &ROW(row); /* _must_ refresh */
841 } 875 }
842 876
843 // some utf-8 decoders "decode" surrogate characters: let's fix this. 877 // some utf-8 decoders "decode" surrogate characters: let's fix this.
844 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 878 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
845 c = 0xfffd; 879 c = 0xfffd;
846 880
847 // rely on wcwidth to tell us the character width, do wcwidth before 881 // rely on wcwidth to tell us the character width, do wcwidth before
848 // further replacements, as wcwidth might return -1 for the line 882 // further replacements, as wcwidth might return -1 for the line
849 // drawing characters below as they might be invalid in the current 883 // drawing characters below as they might be invalid in the current
850 // locale. 884 // locale.
851 int width = WCWIDTH (c); 885 int width = WCWIDTH (c);
852 886
853 if (charsets [screen.charset] == '0') // DEC SPECIAL 887 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
854 { 888 {
855 // vt100 special graphics and line drawing 889 // vt100 special graphics and line drawing
856 // 5f-7e standard vt100 890 // 5f-7e standard vt100
857 // 40-5e rxvt extension for extra curses acs chars 891 // 40-5e rxvt extension for extra curses acs chars
858 static uint16_t vt100_0[62] = { // 41 .. 7e 892 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
871 c = vt100_0[c - 0x41]; 905 c = vt100_0[c - 0x41];
872 width = 1; // vt100 line drawing characters are always single-width 906 width = 1; // vt100 line drawing characters are always single-width
873 } 907 }
874 } 908 }
875 909
876 if (screen.flags & Screen_Insert) 910 if (ecb_unlikely (screen.flags & Screen_Insert))
877 scr_insdel_chars (width, INSERT); 911 scr_insdel_chars (width, INSERT);
878 912
879 if (width != 0) 913 if (width != 0)
880 { 914 {
881#if !UNICODE_3 915#if !UNICODE_3
… …
886# else 920# else
887 c = 0xfffd; 921 c = 0xfffd;
888# endif 922# endif
889#endif 923#endif
890 924
925 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
926
927 // if the character doesn't fit into the remaining columns...
928 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
929 {
930 if (screen.flags & Screen_Autowrap)
931 {
932 // ... artificially enlargen the previous one
933 c = NOCHAR;
934 // and try the same character next loop iteration
935 --str;
936 }
937 else
938 screen.cur.col = ncol - width;
939 }
940
891 // nuke the character at this position, if required 941 // nuke the character at this position, if required
942 // due to wonderful coincidences everywhere else in this loop
943 // we never have to check for overwriting a wide char itself,
944 // only its tail.
892 if (line->t[screen.cur.col] == NOCHAR 945 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
893 || (screen.cur.col < ncol - 1 946 scr_kill_char (*line, screen.cur.col);
894 && line->t[screen.cur.col + 1] == NOCHAR))
895 {
896 int col = screen.cur.col;
897
898 // find begin
899 while (col > 0 && line->t[col] == NOCHAR)
900 col--;
901
902 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
903
904 // found begin, nuke
905 do {
906 line->t[col] = ' ';
907 line->r[col] = rend;
908 col++;
909 } while (col < ncol && line->t[col] == NOCHAR);
910 }
911
912 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
913
914 // if the character doesn't fit into the remaining columns...
915 if (screen.cur.col > ncol - width && ncol >= width)
916 {
917 // ...output spaces
918 c = ' ';
919 // and try the same character next loop iteration
920 --str;
921 }
922 947
923 line->touch (); 948 line->touch ();
924 949
925 do 950 do
926 { 951 {
927 line->t[screen.cur.col] = c; 952 line->t[screen.cur.col] = c;
928 line->r[screen.cur.col] = rend; 953 line->r[screen.cur.col] = rend;
929 954
930 if (screen.cur.col < ncol - 1) 955 if (ecb_likely (screen.cur.col < ncol - 1))
931 screen.cur.col++; 956 screen.cur.col++;
932 else 957 else
933 { 958 {
934 line->l = ncol; 959 line->l = ncol;
935 if (screen.flags & Screen_Autowrap) 960 if (screen.flags & Screen_Autowrap)
936 screen.flags |= Screen_WrapNext; 961 screen.flags |= Screen_WrapNext;
937 break; 962
963 goto end_of_line;
938 } 964 }
939 965
940 c = NOCHAR; 966 c = NOCHAR;
941 } 967 }
942 while (--width > 0); 968 while (ecb_unlikely (--width > 0));
943 969
944 // pad with spaces when overwriting wide character with smaller one 970 // pad with spaces when overwriting wide character with smaller one
945 if (!width) 971 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
946 { 972 {
947 line->touch (); 973 line->t[c] = ' ';
974 line->r[c] = rend;
975 }
948 976
949 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 977end_of_line:
978 ;
979 }
980#if ENABLE_COMBINING
981 else // width == 0
982 {
983 if (c != 0xfeff) // ignore BOM
984 {
985 // handle combining characters
986 // we just tag the accent on the previous on-screen character.
987 // this is arguably not correct, but also arguably not wrong.
988 // we don't handle double-width characters nicely yet.
989 line_t *linep;
990 text_t *tp;
991 rend_t *rp;
992
993 if (screen.cur.col > 0)
950 { 994 {
951 line->t[c] = ' ';
952 line->r[c] = rend; 995 linep = line;
996 tp = line->t + screen.cur.col - 1;
997 rp = line->r + screen.cur.col - 1;
953 } 998 }
999 else if (screen.cur.row > 0
1000 && ROW(screen.cur.row - 1).is_longer ())
1001 {
1002 linep = &ROW(screen.cur.row - 1);
1003 tp = line->t + ncol - 1;
1004 rp = line->r + ncol - 1;
1005 }
1006 else
1007 continue;
1008
1009 linep->touch ();
1010
1011 while (*tp == NOCHAR && tp > linep->t)
1012 tp--, rp--;
1013
1014 // first try to find a precomposed character
1015 unicode_t n = rxvt_compose (*tp, c);
1016 if (n == NOCHAR)
1017 n = rxvt_composite.compose (*tp, c);
1018
1019 *tp = n;
1020 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
954 } 1021 }
955 } 1022 }
956 else // width == 0
957 {
958#if ENABLE_COMBINING
959 // handle combining characters
960 // we just tag the accent on the previous on-screen character.
961 // this is arguably not correct, but also arguably not wrong.
962 // we don't handle double-width characters nicely yet.
963 line_t *linep;
964 text_t *tp;
965 rend_t *rp;
966
967 if (screen.cur.col > 0)
968 {
969 linep = line;
970 tp = line->t + screen.cur.col - 1;
971 rp = line->r + screen.cur.col - 1;
972 }
973 else if (screen.cur.row > 0
974 && ROW(screen.cur.row - 1).is_longer ())
975 {
976 linep = &ROW(screen.cur.row - 1);
977 tp = line->t + ncol - 1;
978 rp = line->r + ncol - 1;
979 }
980 else
981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
987
988 // first try to find a precomposed character
989 unicode_t n = rxvt_compose (*tp, c);
990 if (n == NOCHAR)
991 n = rxvt_composite.compose (*tp, c);
992
993 *tp = n;
994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
995#endif 1023#endif
996 }
997 } 1024 }
998 1025
999 max_it (line->l, screen.cur.col); 1026 max_it (line->l, screen.cur.col);
1000 1027
1001#ifdef DEBUG_STRICT
1002 assert (screen.cur.row >= 0); 1028 assert (screen.cur.row >= 0);
1003#endif
1004} 1029}
1005 1030
1006/* ------------------------------------------------------------------------- */ 1031/* ------------------------------------------------------------------------- */
1007/* 1032/*
1008 * Process Backspace. Move back the cursor back a position, wrap if have to 1033 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1021 1046
1022 want_refresh = 1; 1047 want_refresh = 1;
1023#endif 1048#endif
1024 } 1049 }
1025 } 1050 }
1051 else if (screen.flags & Screen_WrapNext)
1052 screen.flags &= ~Screen_WrapNext;
1026 else 1053 else
1027 scr_gotorc (0, -1, RELATIVE); 1054 scr_gotorc (0, -1, RELATIVE);
1028} 1055}
1029 1056
1030/* ------------------------------------------------------------------------- */ 1057/* ------------------------------------------------------------------------- */
… …
1108 * XTERM_SEQ: ESC 6 1135 * XTERM_SEQ: ESC 6
1109 * Move cursor left in row. If we're at the left boundary, shift everything 1136 * Move cursor left in row. If we're at the left boundary, shift everything
1110 * in that row right. Clear left column. 1137 * in that row right. Clear left column.
1111 */ 1138 */
1112#if !ENABLE_MINIMAL 1139#if !ENABLE_MINIMAL
1113void 1140void ecb_cold
1114rxvt_term::scr_backindex () NOTHROW 1141rxvt_term::scr_backindex () NOTHROW
1115{ 1142{
1116 if (screen.cur.col > 0) 1143 if (screen.cur.col > 0)
1117 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1118 else 1145 else
… …
1125 * XTERM_SEQ: ESC 9 1152 * XTERM_SEQ: ESC 9
1126 * Move cursor right in row. If we're at the right boundary, shift everything 1153 * Move cursor right in row. If we're at the right boundary, shift everything
1127 * in that row left. Clear right column. 1154 * in that row left. Clear right column.
1128 */ 1155 */
1129#if !ENABLE_MINIMAL 1156#if !ENABLE_MINIMAL
1130void 1157void ecb_cold
1131rxvt_term::scr_forwardindex () NOTHROW 1158rxvt_term::scr_forwardindex () NOTHROW
1132{ 1159{
1133 if (screen.cur.col < ncol - 1) 1160 if (screen.cur.col < ncol - 1)
1134 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1161 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1135 else 1162 else
… …
1286 scr_blank_line (line, col, num, rstyle); 1313 scr_blank_line (line, col, num, rstyle);
1287} 1314}
1288 1315
1289/* ------------------------------------------------------------------------- */ 1316/* ------------------------------------------------------------------------- */
1290/* 1317/*
1291 * Erase part of whole of the screen 1318 * Erase part or whole of the screen
1292 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1319 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1293 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1320 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1294 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1321 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1295 */ 1322 */
1296void 1323void
… …
1305 ZERO_SCROLLBACK (); 1332 ZERO_SCROLLBACK ();
1306 1333
1307 switch (mode) 1334 switch (mode)
1308 { 1335 {
1309 case 0: /* erase to end of screen */ 1336 case 0: /* erase to end of screen */
1310 selection_check (1);
1311 scr_erase_line (0); 1337 scr_erase_line (0);
1312 row = screen.cur.row + 1; /* possible OOB */ 1338 row = screen.cur.row + 1; /* possible OOB */
1313 num = nrow - row; 1339 num = nrow - row;
1314 break; 1340 break;
1315 case 1: /* erase to beginning of screen */ 1341 case 1: /* erase to beginning of screen */
1316 selection_check (3);
1317 scr_erase_line (1); 1342 scr_erase_line (1);
1318 row = 0; 1343 row = 0;
1319 num = screen.cur.row; 1344 num = screen.cur.row;
1320 break; 1345 break;
1321 case 2: /* erase whole screen */ 1346 case 2: /* erase whole screen */
1322 selection_check (3);
1323 row = 0; 1347 row = 0;
1324 num = nrow; 1348 num = nrow;
1325 break; 1349 break;
1326 default: 1350 default:
1327 return; 1351 return;
… …
1336 if (row >= nrow) /* Out Of Bounds */ 1360 if (row >= nrow) /* Out Of Bounds */
1337 return; 1361 return;
1338 1362
1339 min_it (num, nrow - row); 1363 min_it (num, nrow - row);
1340 1364
1341 if (rstyle & (RS_RVid | RS_Uline)) 1365 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1366 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1367 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1368 {
1345 ren = DEFAULT_RSTYLE; 1369 ren = DEFAULT_RSTYLE;
1346 CLEAR_ROWS (row, num); 1370
1371 if (mapped)
1372 XClearArea (dpy, vt, 0,
1373 Row2Pixel (row - view_start), (unsigned int)vt_width,
1374 (unsigned int)Height2Pixel (num), False);
1347 } 1375 }
1348 else 1376 else
1349 { 1377 {
1350 ren = rstyle & (RS_fgMask | RS_bgMask); 1378 ren = rstyle & (RS_fgMask | RS_bgMask);
1379
1380 if (mapped)
1381 {
1351 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1382 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1352 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1383 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1353 ERASE_ROWS (row, num); 1384 XFillRectangle (dpy, vt, gc,
1385 0, Row2Pixel (row - view_start),
1386 (unsigned int)vt_width,
1387 (unsigned int)Height2Pixel (num));
1354 gcvalue.foreground = pix_colors[Color_fg]; 1388 gcvalue.foreground = pix_colors[Color_fg];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1389 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1390 }
1356 } 1391 }
1357 1392
1358 for (; num--; row++) 1393 for (; num--; row++)
1359 { 1394 {
1360 scr_blank_screen_mem (ROW(row), rstyle); 1395 scr_blank_screen_mem (ROW(row), rstyle);
1396
1397 if (row - view_start < nrow)
1361 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1398 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1362 } 1399 }
1363} 1400}
1364 1401
1365#if !ENABLE_MINIMAL 1402#if !ENABLE_MINIMAL
1366void 1403void
… …
1376/* ------------------------------------------------------------------------- */ 1413/* ------------------------------------------------------------------------- */
1377/* 1414/*
1378 * Fill the screen with `E's 1415 * Fill the screen with `E's
1379 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1416 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1380 */ 1417 */
1381void 1418void ecb_cold
1382rxvt_term::scr_E () NOTHROW 1419rxvt_term::scr_E () NOTHROW
1383{ 1420{
1384 rend_t fs; 1421 rend_t fs;
1385 1422
1386 want_refresh = 1; 1423 want_refresh = 1;
1387 ZERO_SCROLLBACK (); 1424 ZERO_SCROLLBACK ();
1388 1425
1389 num_scr_allow = 0; 1426 num_scr_allow = 0;
1390 selection_check (3); 1427
1428 row_col_t pos;
1429 pos.row = pos.col = 0;
1430 if (ROWCOL_IS_AFTER (selection.end, pos))
1431 CLEAR_SELECTION ();
1391 1432
1392 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1433 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1393 for (int row = nrow; row--; ) 1434 for (int row = nrow; row--; )
1394 { 1435 {
1395 line_t &line = ROW(row); 1436 line_t &line = ROW(row);
… …
1440 * Insert/Delete <count> characters from the current position 1481 * Insert/Delete <count> characters from the current position
1441 */ 1482 */
1442void 1483void
1443rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1484rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1444{ 1485{
1445 int col, row;
1446 rend_t tr;
1447
1448 want_refresh = 1; 1486 want_refresh = 1;
1449 ZERO_SCROLLBACK (); 1487 ZERO_SCROLLBACK ();
1450 1488
1451 if (count <= 0) 1489 if (count <= 0)
1452 return; 1490 return;
… …
1454 scr_do_wrap (); 1492 scr_do_wrap ();
1455 1493
1456 selection_check (1); 1494 selection_check (1);
1457 min_it (count, ncol - screen.cur.col); 1495 min_it (count, ncol - screen.cur.col);
1458 1496
1459 row = screen.cur.row; 1497 int row = screen.cur.row;
1460 1498
1461 line_t *line = &ROW(row); 1499 line_t *line = &ROW(row);
1462 1500
1463 line->touch (); 1501 line->touch ();
1464 line->is_longer (0); 1502 line->is_longer (0);
1465 1503
1504 // nuke wide spanning the start
1505 if (line->t[screen.cur.col] == NOCHAR)
1506 scr_kill_char (*line, screen.cur.col);
1507
1466 switch (insdel) 1508 switch (insdel)
1467 { 1509 {
1468 case INSERT: 1510 case INSERT:
1469 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1511 line->l = min (line->l + count, ncol);
1512
1513 if (line->t[screen.cur.col] == NOCHAR)
1514 scr_kill_char (*line, screen.cur.col);
1515
1516 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1470 { 1517 {
1471 line->t[col] = line->t[col - count]; 1518 line->t[col] = line->t[col - count];
1472 line->r[col] = line->r[col - count]; 1519 line->r[col] = line->r[col - count];
1473 } 1520 }
1474
1475 line->l = min (line->l + count, ncol);
1476 1521
1477 if (selection.op && current_screen == selection.screen 1522 if (selection.op && current_screen == selection.screen
1478 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1523 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1479 { 1524 {
1480 if (selection.end.row != screen.cur.row 1525 if (selection.end.row != screen.cur.row
… …
1495 case ERASE: 1540 case ERASE:
1496 screen.cur.col += count; /* don't worry if > ncol */ 1541 screen.cur.col += count; /* don't worry if > ncol */
1497 selection_check (1); 1542 selection_check (1);
1498 screen.cur.col -= count; 1543 screen.cur.col -= count;
1499 1544
1500 line->l = max (line->l - count, 0); 1545 // nuke wide char after the end
1546 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1547 scr_kill_char (*line, screen.cur.col + count);
1548
1501 scr_blank_line (*line, screen.cur.col, count, rstyle); 1549 scr_blank_line (*line, screen.cur.col, count, rstyle);
1502 break; 1550 break;
1503 1551
1504 case DELETE: 1552 case DELETE:
1505 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1553 line->l = max (line->l - count, 0);
1506 1554
1555 // nuke wide char spanning the end
1556 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1557 scr_kill_char (*line, screen.cur.col + count);
1558
1507 for (col = screen.cur.col; (col + count) < ncol; col++) 1559 for (int col = screen.cur.col; (col + count) < ncol; col++)
1508 { 1560 {
1509 line->t[col] = line->t[col + count]; 1561 line->t[col] = line->t[col + count];
1510 line->r[col] = line->r[col + count]; 1562 line->r[col] = line->r[col + count];
1511 } 1563 }
1512 1564
1513 line->l = max (line->l - count, 0);
1514 scr_blank_line (*line, ncol - count, count, tr); 1565 scr_blank_line (*line, ncol - count, count, rstyle);
1515 1566
1516 if (selection.op && current_screen == selection.screen 1567 if (selection.op && current_screen == selection.screen
1517 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1568 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1518 { 1569 {
1519 if (selection.end.row != screen.cur.row 1570 if (selection.end.row != screen.cur.row
… …
1536/* ------------------------------------------------------------------------- */ 1587/* ------------------------------------------------------------------------- */
1537/* 1588/*
1538 * Set the scrolling region 1589 * Set the scrolling region
1539 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1590 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1540 */ 1591 */
1541void 1592void ecb_cold
1542rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1593rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1543{ 1594{
1544 max_it (top, 0); 1595 max_it (top, 0);
1545 min_it (bot, nrow - 1); 1596 min_it (bot, nrow - 1);
1546 1597
… …
1556/* 1607/*
1557 * Make the cursor visible/invisible 1608 * Make the cursor visible/invisible
1558 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1609 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1559 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1610 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1560 */ 1611 */
1561void 1612void ecb_cold
1562rxvt_term::scr_cursor_visible (int mode) NOTHROW 1613rxvt_term::scr_cursor_visible (int mode) NOTHROW
1563{ 1614{
1564 want_refresh = 1; 1615 want_refresh = 1;
1565 1616
1566 if (mode) 1617 if (mode)
… …
1573/* 1624/*
1574 * Set/unset automatic wrapping 1625 * Set/unset automatic wrapping
1575 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1626 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1576 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1627 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1577 */ 1628 */
1578void 1629void ecb_cold
1579rxvt_term::scr_autowrap (int mode) NOTHROW 1630rxvt_term::scr_autowrap (int mode) NOTHROW
1580{ 1631{
1581 if (mode) 1632 if (mode)
1582 screen.flags |= Screen_Autowrap; 1633 screen.flags |= Screen_Autowrap;
1583 else 1634 else
… …
1592 * Relative mode: line numbers are relative to top margin of scrolling region 1643 * Relative mode: line numbers are relative to top margin of scrolling region
1593 * and the cursor cannot be moved outside. 1644 * and the cursor cannot be moved outside.
1594 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1645 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1595 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1646 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1596 */ 1647 */
1597void 1648void ecb_cold
1598rxvt_term::scr_relative_origin (int mode) NOTHROW 1649rxvt_term::scr_relative_origin (int mode) NOTHROW
1599{ 1650{
1600 if (mode) 1651 if (mode)
1601 screen.flags |= Screen_Relative; 1652 screen.flags |= Screen_Relative;
1602 else 1653 else
… …
1609/* 1660/*
1610 * Set insert/replace mode 1661 * Set insert/replace mode
1611 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1662 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1612 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1663 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1613 */ 1664 */
1614void 1665void ecb_cold
1615rxvt_term::scr_insert_mode (int mode) NOTHROW 1666rxvt_term::scr_insert_mode (int mode) NOTHROW
1616{ 1667{
1617 if (mode) 1668 if (mode)
1618 screen.flags |= Screen_Insert; 1669 screen.flags |= Screen_Insert;
1619 else 1670 else
… …
1625 * Set/Unset tabs 1676 * Set/Unset tabs
1626 * XTERM_SEQ: Set tab at current column : ESC H 1677 * XTERM_SEQ: Set tab at current column : ESC H
1627 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1678 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1628 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1679 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1629 */ 1680 */
1630void 1681void ecb_cold
1631rxvt_term::scr_set_tab (int mode) NOTHROW 1682rxvt_term::scr_set_tab (int mode) NOTHROW
1632{ 1683{
1633 if (mode < 0) 1684 if (mode < 0)
1634 memset (tabs, 0, ncol); 1685 memset (tabs, 0, ncol);
1635 else if (screen.cur.col < ncol) 1686 else if (screen.cur.col < ncol)
… …
1655 { 1706 {
1656 rvideo_state = on; 1707 rvideo_state = on;
1657 1708
1658 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1709 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1659#ifdef HAVE_BG_PIXMAP 1710#ifdef HAVE_BG_PIXMAP
1660 if (bgPixmap.pixmap == None) 1711 if (bg_img == 0)
1661#endif 1712#endif
1662 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1713 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1663 1714
1664 XGCValues gcvalue; 1715 XGCValues gcvalue;
1665 gcvalue.foreground = pix_colors[Color_fg]; 1716 gcvalue.foreground = pix_colors[Color_fg];
… …
1674/* ------------------------------------------------------------------------- */ 1725/* ------------------------------------------------------------------------- */
1675/* 1726/*
1676 * Report current cursor position 1727 * Report current cursor position
1677 * XTERM_SEQ: Report position: ESC [ 6 n 1728 * XTERM_SEQ: Report position: ESC [ 6 n
1678 */ 1729 */
1679void 1730void ecb_cold
1680rxvt_term::scr_report_position () NOTHROW 1731rxvt_term::scr_report_position () NOTHROW
1681{ 1732{
1682 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1733 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1683} 1734}
1684 1735
… …
1687 * ------------------------------------------------------------------------- */ 1738 * ------------------------------------------------------------------------- */
1688 1739
1689/* 1740/*
1690 * Set font style 1741 * Set font style
1691 */ 1742 */
1692void 1743void ecb_cold
1693rxvt_term::set_font_style () NOTHROW 1744rxvt_term::set_font_style () NOTHROW
1694{ 1745{
1695#if 0 1746#if 0
1696 switch (charsets [screen.charset]) 1747 switch (charsets [screen.charset])
1697 { 1748 {
… …
1719 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1770 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1720 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1771 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1721 * XTERM_SEQ: Invoke G2 character set: ESC N 1772 * XTERM_SEQ: Invoke G2 character set: ESC N
1722 * XTERM_SEQ: Invoke G3 character set: ESC O 1773 * XTERM_SEQ: Invoke G3 character set: ESC O
1723 */ 1774 */
1724void 1775void ecb_cold
1725rxvt_term::scr_charset_choose (int set) NOTHROW 1776rxvt_term::scr_charset_choose (int set) NOTHROW
1726{ 1777{
1727 screen.charset = set; 1778 screen.charset = set;
1728 set_font_style (); 1779 set_font_style ();
1729} 1780}
… …
1750 * ------------------------------------------------------------------------- */ 1801 * ------------------------------------------------------------------------- */
1751 1802
1752/* 1803/*
1753 * refresh matching text. 1804 * refresh matching text.
1754 */ 1805 */
1755bool 1806bool ecb_cold
1756rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1807rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1757{ 1808{
1758 bool found = false; 1809 bool found = false;
1759 1810
1760 for (int i = 0; i < nrow; i++) 1811 for (int i = 0; i < nrow; i++)
… …
1779 PART_BEG = 0, 1830 PART_BEG = 0,
1780 PART_END, 1831 PART_END,
1781 RC_COUNT 1832 RC_COUNT
1782}; 1833};
1783 1834
1784void 1835void ecb_hot
1785rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1836rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1786{ 1837{
1787 int i; 1838 int i;
1788 row_col_t rc[RC_COUNT]; 1839 row_col_t rc[RC_COUNT];
1789 1840
… …
1809 for (i = PART_BEG; i < RC_COUNT; i++) 1860 for (i = PART_BEG; i < RC_COUNT; i++)
1810 { 1861 {
1811 min_it (rc[i].col, ncol - 1); 1862 min_it (rc[i].col, ncol - 1);
1812 min_it (rc[i].row, nrow - 1); 1863 min_it (rc[i].row, nrow - 1);
1813 } 1864 }
1814// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1865
1815 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1866 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1816 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1867 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1817 1868
1818 num_scr_allow = 0; 1869 num_scr_allow = 0;
1819 1870
… …
1826 * Refresh the entire screen 1877 * Refresh the entire screen
1827 */ 1878 */
1828void 1879void
1829rxvt_term::scr_touch (bool refresh) NOTHROW 1880rxvt_term::scr_touch (bool refresh) NOTHROW
1830{ 1881{
1831 scr_expose (0, 0, width, height, refresh); 1882 scr_expose (0, 0, vt_width, vt_height, refresh);
1832} 1883}
1833 1884
1834/* ------------------------------------------------------------------------- */ 1885/* ------------------------------------------------------------------------- */
1835/* 1886/*
1836 * Move the display so that the line represented by scrollbar value Y is at 1887 * Move the display so that the line represented by scrollbar value Y is at
… …
1892 1943
1893# ifndef NO_MAPALERT 1944# ifndef NO_MAPALERT
1894# ifdef MAPALERT_OPTION 1945# ifdef MAPALERT_OPTION
1895 if (option (Opt_mapAlert)) 1946 if (option (Opt_mapAlert))
1896# endif 1947# endif
1897 XMapWindow (dpy, parent[0]); 1948 XMapWindow (dpy, parent);
1898# endif 1949# endif
1899 1950
1900# if ENABLE_FRILLS 1951# if ENABLE_FRILLS
1901 if (option (Opt_urgentOnBell)) 1952 if (option (Opt_urgentOnBell))
1902 { 1953 set_urgency (1);
1903 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1904 {
1905 h->flags |= XUrgencyHint;
1906 XSetWMHints (dpy, parent[0], h);
1907 }
1908 }
1909# endif 1954# endif
1910 1955
1911 if (option (Opt_visualBell)) 1956 if (option (Opt_visualBell))
1912 { 1957 {
1913 rvideo_bell = true; 1958 rvideo_bell = true;
… …
1916 1961
1917 bell_ev.start (VISUAL_BELL_DURATION); 1962 bell_ev.start (VISUAL_BELL_DURATION);
1918 } 1963 }
1919 else 1964 else
1920 XBell (dpy, 0); 1965 XBell (dpy, 0);
1966 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1921#endif 1967#endif
1922} 1968}
1923 1969
1924/* ------------------------------------------------------------------------- */ 1970/* ------------------------------------------------------------------------- */
1925/* ARGSUSED */ 1971void ecb_cold
1926void
1927rxvt_term::scr_printscreen (int fullhist) NOTHROW 1972rxvt_term::scr_printscreen (int fullhist) NOTHROW
1928{ 1973{
1929#ifdef PRINTPIPE 1974#ifdef PRINTPIPE
1930 int nrows, row_start; 1975 int nrows, row_start;
1931 FILE *fd; 1976 FILE *fd = popen_printer ();
1932 1977
1933 if ((fd = popen_printer ()) == NULL) 1978 if (!fd)
1934 return; 1979 return;
1935 1980
1936 if (fullhist) 1981 if (fullhist)
1937 { 1982 {
1938 nrows = nrow - top_row; 1983 nrows = nrow - top_row;
… …
1944 row_start = view_start; 1989 row_start = view_start;
1945 } 1990 }
1946 1991
1947 wctomb (0, 0); 1992 wctomb (0, 0);
1948 1993
1949 for (int r1 = 0; r1 < nrows; r1++) 1994 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1950 { 1995 {
1951 text_t *tp = ROW(r1).t; 1996 text_t *tp = ROW(r1).t;
1952 int len = ROW(r1).l; 1997 int len = ROW(r1).l;
1953 1998
1954 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1999 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1980/* 2025/*
1981 * Refresh the screen 2026 * Refresh the screen
1982 * drawn_text/drawn_rend contain the screen information before the update. 2027 * drawn_text/drawn_rend contain the screen information before the update.
1983 * screen.text/screen.rend contain what the screen will change to. 2028 * screen.text/screen.rend contain what the screen will change to.
1984 */ 2029 */
1985void 2030void ecb_hot
1986rxvt_term::scr_refresh () NOTHROW 2031rxvt_term::scr_refresh () NOTHROW
1987{ 2032{
1988 unsigned char have_bg,
1989 showcursor; /* show the cursor */
1990 int16_t col, row, /* column/row we're processing */ 2033 int16_t col, row, /* column/row we're processing */
1991 ocrow; /* old cursor row */ 2034 ocrow; /* old cursor row */
1992 int i; /* tmp */ 2035 int i; /* tmp */
1993#ifndef NO_CURSORCOLOR 2036#ifndef NO_CURSORCOLOR
1994 rend_t cc1; /* store colours at cursor position (s) */ 2037 rend_t cc1; /* store colours at cursor position (s) */
… …
2005 /* 2048 /*
2006 * A: set up vars 2049 * A: set up vars
2007 */ 2050 */
2008 refresh_count = 0; 2051 refresh_count = 0;
2009 2052
2053 unsigned int old_screen_flags = screen.flags;
2010 have_bg = 0; 2054 bool have_bg = 0;
2011#ifdef HAVE_BG_PIXMAP 2055#ifdef HAVE_BG_PIXMAP
2012 have_bg = bgPixmap.pixmap != None; 2056 have_bg = bg_img != 0;
2013#endif 2057#endif
2014 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2058 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2015 2059
2016 /* 2060 /*
2017 * B: reverse any characters which are selected 2061 * B: reverse any characters which are selected
2018 */ 2062 */
2019 scr_reverse_selection (); 2063 scr_reverse_selection ();
2020 2064
2065 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2066#if ENABLE_OVERLAY
2067 scr_swap_overlay ();
2068#endif
2069
2070 bool showcursor = screen.flags & Screen_VisibleCursor;
2071
2021 /* 2072 /*
2022 * C: set the cursor character (s) 2073 * C: set the cursor character (s)
2023 */ 2074 */
2024 { 2075 {
2025 unsigned char setoldcursor; 2076 bool setoldcursor;
2026 2077
2027 showcursor = (screen.flags & Screen_VisibleCursor);
2028#ifdef CURSOR_BLINK 2078#ifdef CURSOR_BLINK
2029 if (hidden_cursor) 2079 if (hidden_cursor)
2030 showcursor = 0; 2080 showcursor = 0;
2031#endif 2081#endif
2032 2082
… …
2060 ccol2 = bgcolor_of (rstyle); 2110 ccol2 = bgcolor_of (rstyle);
2061#else 2111#else
2062 ccol2 = Color_bg; 2112 ccol2 = Color_bg;
2063#endif 2113#endif
2064 2114
2065 if (showcursor && focus) 2115 if (focus)
2066 { 2116 {
2067 if (option (Opt_cursorUnderline)) 2117 if (option (Opt_cursorUnderline))
2068 *crp ^= RS_Uline; 2118 *crp ^= RS_Uline;
2069 else 2119 else
2070 { 2120 {
… …
2105 oldcursor.col = screen.cur.col; 2155 oldcursor.col = screen.cur.col;
2106 } 2156 }
2107 } 2157 }
2108 } 2158 }
2109 2159
2110 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2111#if ENABLE_OVERLAY
2112 scr_swap_overlay ();
2113#endif
2114
2115#ifndef NO_SLOW_LINK_SUPPORT 2160#ifndef NO_SLOW_LINK_SUPPORT
2116 /* 2161 /*
2117 * D: CopyArea pass - very useful for slower links 2162 * D: CopyArea pass - very useful for slower links
2118 * This has been deliberately kept simple. 2163 * This has been deliberately kept simple.
2119 */ 2164 */
… …
2123 { 2168 {
2124 int16_t nits; 2169 int16_t nits;
2125 int i = num_scr; 2170 int i = num_scr;
2126 int j; 2171 int j;
2127 int len, wlen; 2172 int len, wlen;
2128 dLocal (int, num_scr);
2129 2173
2130 j = nrow; 2174 j = nrow;
2131 wlen = len = -1; 2175 wlen = len = -1;
2132 row = i > 0 ? 0 : j - 1; 2176 row = i > 0 ? 0 : j - 1;
2133 2177
… …
2208 continue; 2252 continue;
2209 2253
2210 // redraw one or more characters 2254 // redraw one or more characters
2211 2255
2212 // seek to the beginning of wide characters 2256 // seek to the beginning of wide characters
2213 while (stp[col] == NOCHAR && col > 0) 2257 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2214 --col; 2258 --col;
2215 2259
2216 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2260 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2217 text_t *text = stp + col; 2261 text_t *text = stp + col;
2218 int count = 1; 2262 int count = 1;
2219 2263
2220 dtp[col] = stp[col]; 2264 dtp[col] = stp[col];
2221 drp[col] = rend; 2265 drp[col] = rend;
… …
2225 for (i = 0; ++col < ncol; ) 2269 for (i = 0; ++col < ncol; )
2226 { 2270 {
2227 if (stp[col] == NOCHAR) 2271 if (stp[col] == NOCHAR)
2228 { 2272 {
2229 dtp[col] = stp[col]; 2273 dtp[col] = stp[col];
2230 drp[col] = rend; 2274 drp[col] = srp[col];
2275
2231 count++; 2276 count++;
2232 i++; 2277 i++;
2233 2278
2234 continue; 2279 continue;
2235 } 2280 }
… …
2255 2300
2256 col--; /* went one too far. move back */ 2301 col--; /* went one too far. move back */
2257 count -= i; /* dump any matching trailing chars */ 2302 count -= i; /* dump any matching trailing chars */
2258 2303
2259 // sometimes we optimize away the trailing NOCHAR's, add them back 2304 // sometimes we optimize away the trailing NOCHAR's, add them back
2260 while (i && text[count] == NOCHAR) 2305 while (ecb_unlikely (i && text[count] == NOCHAR))
2261 count++, i--; 2306 count++, i--;
2262 2307
2263 /* 2308 /*
2264 * Determine the attributes for the string 2309 * Determine the attributes for the string
2265 */ 2310 */
2266 int fore = fgcolor_of (rend); // desired foreground 2311 int fore = fgcolor_of (rend); // desired foreground
2267 int back = bgcolor_of (rend); // desired background 2312 int back = bgcolor_of (rend); // desired background
2268 2313
2269 // only do special processing if any attributes are set, which is unlikely 2314 // only do special processing if any attributes are set, which is unlikely
2270 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2315 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2271 { 2316 {
2272 bool invert = rend & RS_RVid; 2317 bool invert = rend & RS_RVid;
2273 2318
2274#ifndef NO_BOLD_UNDERLINE_REVERSE 2319#ifndef NO_BOLD_UNDERLINE_REVERSE
2275 if (rend & RS_Bold && fore == Color_fg) 2320 if (rend & RS_Bold && fore == Color_fg)
… …
2294 2339
2295 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2340 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2296 fore = Color_UL; 2341 fore = Color_UL;
2297#endif 2342#endif
2298 2343
2344#ifdef OPTION_HC
2345 if (rend & RS_Sel)
2346 {
2347 /* invert the column if no highlightColor is set or it is the
2348 * current cursor column */
2349 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2350 && ISSET_PIXCOLOR (Color_HC))
2351 {
2352 if (ISSET_PIXCOLOR (Color_HTC))
2353 fore = Color_HTC;
2354 // if invert is 0 reverse video is set so we use bg color as fg color
2355 else if (!invert)
2356 fore = back;
2357
2358 back = Color_HC;
2359 invert = 0;
2360 }
2361 }
2362#endif
2363
2299 if (invert) 2364 if (invert)
2300 { 2365 {
2301#ifdef OPTION_HC
2302 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2303 || !ISSET_PIXCOLOR (Color_HC))
2304#endif
2305 /* invert the column if no highlightColor is set or it is the
2306 * current cursor column */
2307 ::swap (fore, back); 2366 ::swap (fore, back);
2308#ifdef OPTION_HC
2309 else if (ISSET_PIXCOLOR (Color_HC))
2310 back = Color_HC;
2311#endif
2312 2367
2313#ifndef NO_BOLD_UNDERLINE_REVERSE 2368#ifndef NO_BOLD_UNDERLINE_REVERSE
2314# ifndef OPTION_HC
2315 if (ISSET_PIXCOLOR (Color_RV))
2316 back = Color_RV;
2317# endif
2318 if (fore == back) 2369 if (fore == back)
2319 { 2370 {
2320 fore = Color_bg; 2371 fore = Color_bg;
2321 back = Color_fg; 2372 back = Color_fg;
2322 } 2373 }
… …
2358 /* 2409 /*
2359 * Actually do the drawing of the string here 2410 * Actually do the drawing of the string here
2360 */ 2411 */
2361 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2412 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2362 2413
2363 if (have_bg && back == Color_bg) 2414 if (ecb_likely (have_bg && back == Color_bg))
2364 { 2415 {
2365 // this is very ugly, maybe push it into ->draw? 2416 // this is very ugly, maybe push it into ->draw?
2366 2417
2367 for (i = 0; i < count; i++) /* don't draw empty strings */ 2418 for (i = 0; i < count; i++) /* don't draw empty strings */
2368 if (text[i] != ' ') 2419 if (text[i] != ' ')
… …
2375 did_clear: ; 2426 did_clear: ;
2376 } 2427 }
2377 else 2428 else
2378 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2429 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2379 2430
2380 if (rend & RS_Uline && font->descent > 1 && fore != back) 2431 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2381 { 2432 {
2382#if ENABLE_FRILLS 2433#if ENABLE_FRILLS
2383 if (ISSET_PIXCOLOR (Color_underline)) 2434 if (ISSET_PIXCOLOR (Color_underline))
2384 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2435 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2385 else 2436 else
… …
2390 xpixel, ypixel + font->ascent + 1, 2441 xpixel, ypixel + font->ascent + 1,
2391 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2442 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2392 } 2443 }
2393 } /* for (col....) */ 2444 } /* for (col....) */
2394 } /* for (row....) */ 2445 } /* for (row....) */
2395
2396#if ENABLE_OVERLAY
2397 scr_swap_overlay ();
2398#endif
2399 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2400 2446
2401 /* 2447 /*
2402 * G: cleanup cursor and display outline cursor if necessary 2448 * G: cleanup cursor and display outline cursor if necessary
2403 */ 2449 */
2404 if (showcursor) 2450 if (showcursor)
… …
2436 2482
2437 XDrawRectangle (dpy, vt, gc, 2483 XDrawRectangle (dpy, vt, gc,
2438 Col2Pixel (col), 2484 Col2Pixel (col),
2439 Row2Pixel (oldcursor.row), 2485 Row2Pixel (oldcursor.row),
2440 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2486 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2441 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2487 (unsigned int) (Height2Pixel (1) - 1));
2442 } 2488 }
2443 } 2489 }
2444 2490
2445 /* 2491 /*
2446 * H: cleanup selection 2492 * H: cleanup selection
2447 */ 2493 */
2494#if ENABLE_OVERLAY
2495 scr_swap_overlay ();
2496#endif
2497 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2498
2448 scr_reverse_selection (); 2499 scr_reverse_selection ();
2449 2500
2501 screen.flags = old_screen_flags;
2450 num_scr = 0; 2502 num_scr = 0;
2451 num_scr_allow = 1; 2503 num_scr_allow = 1;
2452} 2504}
2453 2505
2454void 2506void ecb_cold
2455rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2507rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2456{ 2508{
2457 if (!l.t) 2509 if (!l.valid ())
2458 return; 2510 return;
2459 2511
2460 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2512 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2461 2513
2462 for (int i = ncol; i--; ) 2514 for (int i = ncol; i--; )
2463 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2515 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2464} 2516}
2465 2517
2466void 2518void ecb_cold
2467rxvt_term::scr_remap_chars () NOTHROW 2519rxvt_term::scr_remap_chars () NOTHROW
2468{ 2520{
2469 for (int i = total_rows; i--; ) 2521 for (int i = total_rows; i--; )
2470 scr_remap_chars (row_buf [i]); 2522 scr_remap_chars (row_buf [i]);
2471 2523
… …
2474 scr_remap_chars (drawn_buf [i]); 2526 scr_remap_chars (drawn_buf [i]);
2475 scr_remap_chars (swap_buf [i]); 2527 scr_remap_chars (swap_buf [i]);
2476 } 2528 }
2477} 2529}
2478 2530
2479void 2531void ecb_cold
2480rxvt_term::scr_recolour () NOTHROW 2532rxvt_term::scr_recolour (bool refresh) NOTHROW
2481{ 2533{
2534 bool transparent = false;
2535
2482#ifdef HAVE_BG_PIXMAP 2536#ifdef HAVE_BG_PIXMAP
2483 bgPixmap.apply (); 2537 if (bg_img != 0)
2484#else 2538 {
2539# if ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT)
2541 {
2542 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2485 2544
2545 transparent = true;
2546 }
2547 else
2548# endif
2549 {
2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2551 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2552 }
2553 }
2554 else
2555#endif
2556 {
2486 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2557 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2487 XClearWindow (dpy, parent[0]);
2488 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2558 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2559 }
2560
2561 XClearWindow (dpy, parent);
2489 2562
2490 if (scrollBar.win) 2563 if (scrollBar.win)
2491 { 2564 {
2565 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else
2492 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2493 scrollBar.state = STATE_IDLE; 2569 scrollBar.state = SB_STATE_IDLE;
2494 scrollBar.show (0); 2570 scrollBar.show (0);
2495 } 2571 }
2496 2572
2497#endif 2573 if (refresh)
2498 2574 {
2499 /* bgPixmap.apply () does not do the following : */
2500 scr_clear (); 2575 scr_clear ();
2501 scr_touch (true); 2576 scr_touch (true);
2577 }
2502 want_refresh = 1; 2578 want_refresh = 1;
2503} 2579}
2504 2580
2505/* ------------------------------------------------------------------------- */ 2581/* ------------------------------------------------------------------------- */
2506void 2582void
… …
2563 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2639 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2564 srp[col] ^= rstyle; 2640 srp[col] ^= rstyle;
2565} 2641}
2566 2642
2567/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2568void 2644void ecb_hot
2569rxvt_term::scr_reverse_selection () NOTHROW 2645rxvt_term::scr_reverse_selection () NOTHROW
2570{ 2646{
2571 if (selection.op 2647 if (selection.op
2572 && current_screen == selection.screen 2648 && current_screen == selection.screen
2573 && selection.end.row >= view_start) 2649 && selection.end.row >= view_start)
2574 { 2650 {
2575#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2576 if (selection.rect) 2652 if (selection.rect)
2577 scr_xor_rect (selection.beg.row, selection.beg.col, 2653 scr_xor_rect (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2654 selection.end.row, selection.end.col,
2579 RS_RVid, RS_RVid | RS_Uline); 2655 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2580 else 2656 else
2581#endif 2657#endif
2582 scr_xor_span (selection.beg.row, selection.beg.col, 2658 scr_xor_span (selection.beg.row, selection.beg.col,
2583 selection.end.row, selection.end.col, 2659 selection.end.row, selection.end.col,
2584 RS_RVid); 2660 RS_Sel | RS_RVid);
2585 } 2661 }
2586} 2662}
2587 2663
2588/* ------------------------------------------------------------------------- */ 2664/* ------------------------------------------------------------------------- */
2589/* 2665/*
… …
2592 */ 2668 */
2593#if 0 2669#if 0
2594void 2670void
2595rxvt_term::scr_dump (int fd) NOTHROW 2671rxvt_term::scr_dump (int fd) NOTHROW
2596{ 2672{
2597 int row, wrote; 2673 // if this method is needed, it can be implemented by factoring the
2598 unsigned int width, towrite; 2674 // relevant code in scr_printscreen
2599 char r1[] = "\n";
2600
2601 for (row = saveLines + top_row;
2602 row < saveLines + nrow - 1; row++)
2603 {
2604 width = row_buf[row].l >= 0 ? row_buf[row].l
2605 : ncol;
2606 for (towrite = width; towrite; towrite -= wrote)
2607 {
2608 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2609 towrite);
2610 if (wrote < 0)
2611 return; /* XXX: death, no report */
2612 }
2613 if (row_buf[row].l >= 0)
2614 if (write (fd, r1, 1) <= 0)
2615 return; /* XXX: death, no report */
2616 }
2617} 2675}
2618#endif 2676#endif
2619 2677
2620/* ------------------------------------------------------------------------- * 2678/* ------------------------------------------------------------------------- *
2621 * CHARACTER SELECTION * 2679 * CHARACTER SELECTION *
2622 * ------------------------------------------------------------------------- */ 2680 * ------------------------------------------------------------------------- */
2623void 2681void
2624rxvt_term::selection_check (int check_more) NOTHROW 2682rxvt_term::selection_check (int check_more) NOTHROW
2625{ 2683{
2626 row_col_t pos;
2627
2628 if (!selection.op) 2684 if (!selection.op)
2629 return; 2685 return;
2630 2686
2631 pos.row = pos.col = 0;
2632 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2633 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2634 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2635 || (check_more == 1 2690 || (check_more == 1
2636 && current_screen == selection.screen 2691 && current_screen == selection.screen
2637 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2638 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2639 || (check_more == 2
2640 && ROWCOL_IS_BEFORE (selection.beg, pos)
2641 && ROWCOL_IS_AFTER (selection.end, pos))
2642 || (check_more == 3
2643 && ROWCOL_IS_AFTER (selection.end, pos))
2644 || (check_more == 4 /* screen width change */
2645 && (selection.beg.row != selection.end.row
2646 || selection.end.col > ncol)))
2647 CLEAR_SELECTION (); 2694 CLEAR_ALL_SELECTION ();
2648} 2695}
2649 2696
2650/* ------------------------------------------------------------------------- */ 2697/* ------------------------------------------------------------------------- */
2651/* 2698/*
2652 * Paste a selection direct to the command fd 2699 * Paste a selection direct to the command fd
2653 */ 2700 */
2654void 2701void
2655rxvt_term::paste (char *data, unsigned int len) NOTHROW 2702rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2656{ 2703{
2657 /* convert normal newline chars into common keyboard Return key sequence */ 2704 /* convert normal newline chars into common keyboard Return key sequence */
2658 for (unsigned int i = 0; i < len; i++) 2705 for (unsigned int i = 0; i < len; i++)
2659 if (data[i] == C0_LF) 2706 if (data[i] == C0_LF)
2660 data[i] = C0_CR; 2707 data[i] = C0_CR;
2661 2708
2662 if (priv_modes & PrivMode_BracketPaste) 2709 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[200~"); 2710 tt_printf ("\x1b[200~");
2664 2711
2665 tt_write (data, len); 2712 tt_write (data, len);
2666 2713
2667 if (priv_modes & PrivMode_BracketPaste) 2714 if (priv_modes & PrivMode_BracketPaste)
2668 tt_printf ("\e[201~"); 2715 tt_printf ("\x1b[201~");
2669} 2716}
2670 2717
2671/* ------------------------------------------------------------------------- */
2672/*
2673 * Respond to a notification that a primary selection has been sent
2674 * EXT: SelectionNotify
2675 */
2676void 2718void
2677rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2719rxvt_term::paste (char *data, unsigned int len) NOTHROW
2678{ 2720{
2679 if (prop == None) /* check for failed XConvertSelection */ 2721 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2680 {
2681 if ((selection_type & Sel_CompoundText))
2682 {
2683 int selnum = selection_type & Sel_whereMask;
2684
2685 selection_type = 0;
2686 if (selnum != Sel_direct)
2687 selection_request_other (XA_STRING, selnum);
2688 }
2689
2690 if ((selection_type & Sel_UTF8String))
2691 {
2692 int selnum = selection_type & Sel_whereMask;
2693
2694 selection_type = Sel_CompoundText;
2695 if (selnum != Sel_direct)
2696 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2697 else
2698 selection_type = 0;
2699 }
2700
2701 return;
2702 }
2703
2704 unsigned long bytes_after;
2705 XTextProperty ct;
2706
2707 if (XGetWindowProperty (dpy, win, prop,
2708 0, PROP_SIZE / 4,
2709 delete_prop, AnyPropertyType,
2710 &ct.encoding, &ct.format,
2711 &ct.nitems, &bytes_after,
2712 &ct.value) != Success)
2713 {
2714 ct.value = 0;
2715 goto bailout;
2716 }
2717
2718 if (ct.encoding == None)
2719 goto bailout;
2720
2721 if (bytes_after)
2722 {
2723 // fetch and append remaining data
2724 XTextProperty ct2;
2725
2726 if (XGetWindowProperty (dpy, win, prop,
2727 ct.nitems / 4, (bytes_after + 3) / 4,
2728 delete_prop, AnyPropertyType,
2729 &ct2.encoding, &ct2.format,
2730 &ct2.nitems, &bytes_after,
2731 &ct2.value) != Success)
2732 goto bailout;
2733
2734 // realloc should be compatible to XFree, here, and elsewhere, too
2735 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2736 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2737 ct.nitems += ct2.nitems;
2738
2739 XFree (ct2.value);
2740 }
2741
2742 if (ct.value == 0)
2743 goto bailout;
2744
2745 if (ct.encoding == xa[XA_INCR])
2746 {
2747 // INCR selection, start handshake
2748 if (!delete_prop)
2749 XDeleteProperty (dpy, win, prop);
2750
2751 selection_wait = Sel_incr;
2752 incr_buf_fill = 0;
2753 incr_ev.start (10);
2754
2755 goto bailout;
2756 }
2757
2758 if (ct.nitems == 0)
2759 {
2760 if (selection_wait == Sel_incr)
2761 {
2762 XFree (ct.value);
2763
2764 // finally complete, now paste the whole thing
2765 selection_wait = Sel_normal;
2766 ct.value = (unsigned char *)incr_buf;
2767 ct.nitems = incr_buf_fill;
2768 incr_buf = 0;
2769 incr_buf_size = 0;
2770 incr_ev.stop ();
2771 }
2772 else
2773 {
2774 if (selection_wait == Sel_normal
2775 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2776 {
2777 /*
2778 * pass through again trying CUT_BUFFER0 if we've come from
2779 * XConvertSelection () but nothing was presented
2780 */
2781 selection_paste (display->root, XA_CUT_BUFFER0, False);
2782 }
2783
2784 goto bailout;
2785 }
2786 }
2787 else if (selection_wait == Sel_incr)
2788 {
2789 incr_ev.start (10);
2790
2791 while (incr_buf_fill + ct.nitems > incr_buf_size)
2792 {
2793 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2794 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2795 }
2796
2797 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2798 incr_buf_fill += ct.nitems;
2799
2800 goto bailout;
2801 }
2802
2803 char **cl;
2804 int cr;
2805
2806#if !ENABLE_MINIMAL
2807 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2808 // so recode it manually
2809 if (ct.encoding == xa[XA_UTF8_STRING])
2810 {
2811 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2812 char *s = rxvt_wcstombs (w);
2813 free (w);
2814 // TODO: strlen == only the first element will be converted. well...
2815 paste (s, strlen (s));
2816 free (s);
2817 }
2818 else
2819#endif
2820 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2821 && cl)
2822 {
2823 for (int i = 0; i < cr; i++)
2824 paste (cl[i], strlen (cl[i]));
2825
2826 XFreeStringList (cl);
2827 }
2828 else
2829 paste ((char *)ct.value, ct.nitems); // paste raw
2830
2831bailout:
2832 XFree (ct.value);
2833
2834 if (selection_wait == Sel_normal)
2835 selection_wait = Sel_none;
2836}
2837
2838void
2839rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2840{
2841 selection_wait = Sel_none;
2842
2843 incr_buf_size = 0;
2844 free (incr_buf);
2845
2846 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2847}
2848
2849void
2850rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2851{
2852 if (prop == None || selection_wait != Sel_incr)
2853 return; 2722 return;
2854 2723
2855 selection_paste (win, prop, true); 2724 tt_paste (data, len);
2856} 2725}
2857 2726
2858/* ------------------------------------------------------------------------- */ 2727/* ------------------------------------------------------------------------- */
2859/* 2728/*
2860 * Request the current selection: 2729 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2861 * Order: > internal selection if available 2730 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2862 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2731 * as fallback
2863 * > CUT_BUFFER0
2864 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2865 * will auto fallback to CUT_BUFFER0
2866 * EXT: button 2 release 2732 * EXT: button 2 release
2867 */ 2733 */
2868void 2734void
2869rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2735rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2870{ 2736{
2871 if (selection.text && selnum == Sel_Primary) 2737 if (!selection_req)
2872 {
2873 /* internal selection */
2874 char *str = rxvt_wcstombs (selection.text, selection.len);
2875 paste (str, strlen (str));
2876 free (str);
2877 return;
2878 } 2738 {
2879 else 2739 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2740 selection_req->run ();
2880 { 2741 }
2881 selection_request_time = tm;
2882 selection_wait = Sel_normal;
2883
2884#if X_HAVE_UTF8_STRING
2885 selection_type = Sel_UTF8String;
2886 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2887 return;
2888#else
2889 selection_type = Sel_CompoundText;
2890 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2891 return;
2892#endif
2893 }
2894
2895 selection_wait = Sel_none; /* don't loop in selection_paste () */
2896 selection_paste (display->root, XA_CUT_BUFFER0, false);
2897}
2898
2899int
2900rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2901{
2902 Atom sel;
2903
2904 selection_type |= selnum;
2905
2906 if (selnum == Sel_Primary)
2907 sel = XA_PRIMARY;
2908 else if (selnum == Sel_Secondary)
2909 sel = XA_SECONDARY;
2910 else
2911 sel = xa[XA_CLIPBOARD];
2912
2913 if (XGetSelectionOwner (dpy, sel) != None)
2914 {
2915 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2916 vt, selection_request_time);
2917 return 1;
2918 }
2919
2920 return 0;
2921} 2742}
2922 2743
2923/* ------------------------------------------------------------------------- */ 2744/* ------------------------------------------------------------------------- */
2924/* 2745/*
2925 * Clear all selected text 2746 * Clear all selected text
2926 * EXT: SelectionClear 2747 * EXT: SelectionClear
2927 */ 2748 */
2928void 2749void
2929rxvt_term::selection_clear () NOTHROW 2750rxvt_term::selection_clear (bool clipboard) NOTHROW
2930{ 2751{
2752 if (!clipboard)
2753 {
2931 want_refresh = 1; 2754 want_refresh = 1;
2932 free (selection.text); 2755 free (selection.text);
2933 selection.text = NULL; 2756 selection.text = NULL;
2934 selection.len = 0; 2757 selection.len = 0;
2935 CLEAR_SELECTION (); 2758 CLEAR_SELECTION ();
2936 2759
2937 if (display->selection_owner == this) 2760 if (display->selection_owner == this)
2938 display->selection_owner = 0; 2761 display->selection_owner = 0;
2762 }
2763 else
2764 {
2765 free (selection.clip_text);
2766 selection.clip_text = NULL;
2767 selection.clip_len = 0;
2768
2769 if (display->clipboard_owner == this)
2770 display->clipboard_owner = 0;
2771 }
2939} 2772}
2940 2773
2941/* ------------------------------------------------------------------------- */ 2774/* ------------------------------------------------------------------------- */
2942/* 2775/*
2943 * Copy a selection into the cut buffer 2776 * Copy a selection into the cut buffer
2944 * EXT: button 1 or 3 release 2777 * EXT: button 1 or 3 release
2945 */ 2778 */
2946void 2779void
2947rxvt_term::selection_make (Time tm) 2780rxvt_term::selection_make (Time tm)
2948{ 2781{
2949 int i; 2782 int size;
2950 wchar_t *new_selection_text; 2783 wchar_t *new_selection_text;
2951 text_t *t; 2784 text_t *t;
2952 2785
2953 switch (selection.op) 2786 switch (selection.op)
2954 { 2787 {
… …
2970 return; /* nothing selected, go away */ 2803 return; /* nothing selected, go away */
2971 2804
2972 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2805 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2973 return; 2806 return;
2974 2807
2975 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2808 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2976 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2809 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2977 2810
2978 int ofs = 0; 2811 int ofs = 0;
2979 int extra = 0; 2812 int extra = 0;
2980 2813
2981 int col = selection.beg.col; 2814 int col = selection.beg.col;
… …
2987 { 2820 {
2988#if !ENABLE_MINIMAL 2821#if !ENABLE_MINIMAL
2989 if (selection.rect) 2822 if (selection.rect)
2990 { 2823 {
2991 col = selection.beg.col; 2824 col = selection.beg.col;
2992 end_col = ncol + 1; 2825 end_col = selection.end.col;
2993 } 2826 }
2994 else 2827 else
2995#endif 2828#endif
2996 end_col = ROW(row).l; 2829 end_col = ROW(row).l;
2997 2830
2998 col = max (col, 0); 2831 col = max (col, 0);
2999 2832
3000 if (row == selection.end.row 2833 if (row == selection.end.row)
3001#if !ENABLE_MINIMAL
3002 || selection.rect
3003#endif
3004 )
3005 min_it (end_col, selection.end.col); 2834 min_it (end_col, selection.end.col);
3006 2835
3007 t = ROW(row).t + col; 2836 t = ROW(row).t + col;
3008 2837
3009 for (; col < end_col; col++) 2838 for (; col < end_col; col++)
… …
3017 2846
3018 extra -= (len - 1); 2847 extra -= (len - 1);
3019 2848
3020 if (extra < 0) 2849 if (extra < 0)
3021 { 2850 {
3022 extra += i; 2851 extra += size;
3023 i += i; 2852 size += size;
3024 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2853 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3025 } 2854 }
3026 2855
3027 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2856 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3028 } 2857 }
3029#endif 2858#endif
… …
3041 2870
3042 new_selection_text[ofs++] = C0_LF; 2871 new_selection_text[ofs++] = C0_LF;
3043 } 2872 }
3044 else 2873 else
3045#endif 2874#endif
3046 if (!ROW(row).is_longer () && row != selection.end.row) 2875 if (!ROW(row).is_longer ()
2876 && (row != selection.end.row || end_col != selection.end.col)
2877 && (row != selection.beg.row || selection.beg.col < ncol))
3047 new_selection_text[ofs++] = C0_LF; 2878 new_selection_text[ofs++] = C0_LF;
3048 } 2879 }
3049
3050 if (end_col != selection.end.col)
3051 new_selection_text[ofs++] = C0_LF;
3052 2880
3053 new_selection_text[ofs] = 0; 2881 new_selection_text[ofs] = 0;
3054 2882
3055 if (ofs == 0) 2883 if (ofs == 0)
3056 { 2884 {
… …
3069 2897
3070 selection_grab (tm); 2898 selection_grab (tm);
3071} 2899}
3072 2900
3073bool 2901bool
3074rxvt_term::selection_grab (Time tm) NOTHROW 2902rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3075{ 2903{
2904 Atom sel;
2905
2906 if (!clipboard)
2907 {
3076 selection_time = tm; 2908 selection_time = tm;
2909 sel = XA_PRIMARY;
2910 }
2911 else
2912 {
2913 clipboard_time = tm;
2914 sel = xa[XA_CLIPBOARD];
2915 }
3077 2916
3078 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2917 XSetSelectionOwner (dpy, sel, vt, tm);
3079 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2918 if (XGetSelectionOwner (dpy, sel) == vt)
3080 { 2919 {
3081 display->set_selection_owner (this); 2920 display->set_selection_owner (this, clipboard);
3082 return true; 2921 return true;
3083 } 2922 }
3084 else 2923 else
3085 { 2924 {
3086 selection_clear (); 2925 selection_clear (clipboard);
3087 return false; 2926 return false;
3088 } 2927 }
3089 2928
3090#if 0 2929#if 0
3091 XTextProperty ct; 2930 XTextProperty ct;
… …
3101/* ------------------------------------------------------------------------- */ 2940/* ------------------------------------------------------------------------- */
3102/* 2941/*
3103 * Mark or select text based upon number of clicks: 1, 2, or 3 2942 * Mark or select text based upon number of clicks: 1, 2, or 3
3104 * EXT: button 1 press 2943 * EXT: button 1 press
3105 */ 2944 */
3106void 2945void ecb_cold
3107rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2946rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3108{ 2947{
3109 clicks = ((clicks - 1) % 3) + 1; 2948 clicks = ((clicks - 1) % 3) + 1;
3110 selection.clicks = clicks; /* save clicks so extend will work */ 2949 selection.clicks = clicks; /* save clicks so extend will work */
3111 2950
… …
3130 2969
3131/* ------------------------------------------------------------------------- */ 2970/* ------------------------------------------------------------------------- */
3132/* 2971/*
3133 * Mark a selection at the specified col/row 2972 * Mark a selection at the specified col/row
3134 */ 2973 */
3135void 2974void ecb_cold
3136rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2975rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3137{ 2976{
3138 want_refresh = 1; 2977 want_refresh = 1;
3139 2978
3140 selection.mark.row = row + view_start; 2979 selection.mark.row = row + view_start;
… …
3167/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3006/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3168#define DELIMIT_TEXT(x) \ 3007#define DELIMIT_TEXT(x) \
3169 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3008 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3170#define DELIMIT_REND(x) 1 3009#define DELIMIT_REND(x) 1
3171 3010
3172void 3011void ecb_cold
3173rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3012rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3174{ 3013{
3175 int col, row, dirnadd, tcol, trow, w1, w2; 3014 int col, row, dirnadd, tcol, trow, w1, w2;
3176 row_col_t bound; 3015 row_col_t bound;
3177 text_t *stp; 3016 text_t *stp;
… …
3251 * EXT: button 3 press; button 1 or 3 drag 3090 * EXT: button 3 press; button 1 or 3 drag
3252 * flag == 0 ==> button 1 3091 * flag == 0 ==> button 1
3253 * flag == 1 ==> button 3 press 3092 * flag == 1 ==> button 3 press
3254 * flag == 2 ==> button 3 motion 3093 * flag == 2 ==> button 3 motion
3255 */ 3094 */
3256void 3095void ecb_cold
3257rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3096rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3258{ 3097{
3259 int col = clamp (Pixel2Col (x), 0, ncol); 3098 int col = clamp (Pixel2Col (x), 0, ncol);
3260 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3099 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3261 3100
… …
3287 3126
3288/* ------------------------------------------------------------------------- */ 3127/* ------------------------------------------------------------------------- */
3289/* 3128/*
3290 * Extend the selection to the specified col/row 3129 * Extend the selection to the specified col/row
3291 */ 3130 */
3292void 3131void ecb_cold
3293rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3132rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3294{ 3133{
3295 row_col_t pos; 3134 row_col_t pos;
3296 enum { 3135 enum {
3297 LEFT, RIGHT 3136 LEFT, RIGHT
… …
3488 ::swap (selection.beg.col, selection.end.col); 3327 ::swap (selection.beg.col, selection.end.col);
3489#endif 3328#endif
3490} 3329}
3491 3330
3492#if !ENABLE_MINIMAL 3331#if !ENABLE_MINIMAL
3493void 3332void ecb_cold
3494rxvt_term::selection_remove_trailing_spaces () NOTHROW 3333rxvt_term::selection_remove_trailing_spaces () NOTHROW
3495{ 3334{
3496 int32_t end_col, end_row; 3335 int32_t end_col, end_row;
3497 text_t *stp; 3336 text_t *stp;
3498 3337
… …
3536/* ------------------------------------------------------------------------- */ 3375/* ------------------------------------------------------------------------- */
3537/* 3376/*
3538 * Double click on button 3 when already selected 3377 * Double click on button 3 when already selected
3539 * EXT: button 3 double click 3378 * EXT: button 3 double click
3540 */ 3379 */
3541void 3380void ecb_cold
3542rxvt_term::selection_rotate (int x, int y) NOTHROW 3381rxvt_term::selection_rotate (int x, int y) NOTHROW
3543{ 3382{
3544 selection.clicks = selection.clicks % 3 + 1; 3383 selection.clicks = selection.clicks % 3 + 1;
3545 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3384 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3546} 3385}
… …
3548/* ------------------------------------------------------------------------- */ 3387/* ------------------------------------------------------------------------- */
3549/* 3388/*
3550 * Respond to a request for our current selection 3389 * Respond to a request for our current selection
3551 * EXT: SelectionRequest 3390 * EXT: SelectionRequest
3552 */ 3391 */
3553void 3392void ecb_cold
3554rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3393rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3555{ 3394{
3395 Atom property = rq.property == None ? rq.target : rq.property;
3556 XSelectionEvent ev; 3396 XSelectionEvent ev;
3557 3397
3558 ev.type = SelectionNotify; 3398 ev.type = SelectionNotify;
3559 ev.property = None; 3399 ev.property = None;
3560 ev.display = rq.display; 3400 ev.display = rq.display;
… …
3575 *target++ = xa[XA_COMPOUND_TEXT]; 3415 *target++ = xa[XA_COMPOUND_TEXT];
3576#if X_HAVE_UTF8_STRING 3416#if X_HAVE_UTF8_STRING
3577 *target++ = xa[XA_UTF8_STRING]; 3417 *target++ = xa[XA_UTF8_STRING];
3578#endif 3418#endif
3579 3419
3580 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3420 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3581 32, PropModeReplace, 3421 32, PropModeReplace,
3582 (unsigned char *)target_list, target - target_list); 3422 (unsigned char *)target_list, target - target_list);
3583 ev.property = rq.property; 3423 ev.property = property;
3584 } 3424 }
3585#if TODO // TODO 3425#if TODO // TODO
3586 else if (rq.target == xa[XA_MULTIPLE]) 3426 else if (rq.target == xa[XA_MULTIPLE])
3587 { 3427 {
3588 /* TODO: Handle MULTIPLE */ 3428 /* TODO: Handle MULTIPLE */
3589 } 3429 }
3590#endif 3430#endif
3591 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3431 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3592 { 3432 {
3593 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3433 XChangeProperty (dpy, rq.requestor, property, rq.target,
3594 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3434 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3595 ev.property = rq.property; 3435 ev.property = property;
3436 }
3437 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3438 {
3439 XChangeProperty (dpy, rq.requestor, property, rq.target,
3440 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3441 ev.property = property;
3596 } 3442 }
3597 else if (rq.target == XA_STRING 3443 else if (rq.target == XA_STRING
3598 || rq.target == xa[XA_TEXT] 3444 || rq.target == xa[XA_TEXT]
3599 || rq.target == xa[XA_COMPOUND_TEXT] 3445 || rq.target == xa[XA_COMPOUND_TEXT]
3600 || rq.target == xa[XA_UTF8_STRING] 3446 || rq.target == xa[XA_UTF8_STRING]
… …
3632 { 3478 {
3633 target = xa[XA_COMPOUND_TEXT]; 3479 target = xa[XA_COMPOUND_TEXT];
3634 style = enc_compound_text; 3480 style = enc_compound_text;
3635 } 3481 }
3636 3482
3637 if (selection.text) 3483 if (rq.selection == XA_PRIMARY && selection.text)
3638 { 3484 {
3639 cl = selection.text; 3485 cl = selection.text;
3640 selectlen = selection.len; 3486 selectlen = selection.len;
3487 }
3488 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3489 {
3490 cl = selection.clip_text;
3491 selectlen = selection.clip_len;
3641 } 3492 }
3642 else 3493 else
3643 { 3494 {
3644 cl = L""; 3495 cl = L"";
3645 selectlen = 0; 3496 selectlen = 0;
… …
3666 ct.value = (unsigned char *)cl; 3517 ct.value = (unsigned char *)cl;
3667 ct.nitems = selectlen; 3518 ct.nitems = selectlen;
3668 ct.encoding = target; 3519 ct.encoding = target;
3669 } 3520 }
3670 3521
3671 XChangeProperty (dpy, rq.requestor, rq.property, 3522 XChangeProperty (dpy, rq.requestor, property,
3672 ct.encoding, 8, PropModeReplace, 3523 ct.encoding, 8, PropModeReplace,
3673 ct.value, (int)ct.nitems); 3524 ct.value, (int)ct.nitems);
3674 ev.property = rq.property; 3525 ev.property = property;
3675 3526
3676 if (freect) 3527 if (freect)
3677 XFree (ct.value); 3528 XFree (ct.value);
3678 } 3529 }
3679 3530
3680 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3531 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3681} 3532}
3682 3533
3683/* ------------------------------------------------------------------------- */ 3534/* ------------------------------------------------------------------------- */
3684#ifdef USE_XIM 3535#if USE_XIM
3685void 3536void ecb_cold
3686rxvt_term::im_set_position (XPoint &pos) NOTHROW 3537rxvt_term::im_set_position (XPoint &pos) NOTHROW
3687{ 3538{
3688 XWindowAttributes xwa; 3539 XWindowAttributes xwa;
3689 3540
3690 XGetWindowAttributes (dpy, vt, &xwa); 3541 XGetWindowAttributes (dpy, vt, &xwa);
… …
3713 h += 2; min_it (h, nrow); 3564 h += 2; min_it (h, nrow);
3714 3565
3715 x -= 1; clamp_it (x, 0, ncol - w); 3566 x -= 1; clamp_it (x, 0, ncol - w);
3716 y -= 1; clamp_it (y, 0, nrow - h); 3567 y -= 1; clamp_it (y, 0, nrow - h);
3717 3568
3718 ov_x = x; ov_y = y; 3569 ov.x = x; ov.y = y;
3719 ov_w = w; ov_h = h; 3570 ov.w = w; ov.h = h;
3720 3571
3721 ov_text = new text_t *[h]; 3572 ov.text = new text_t *[h];
3722 ov_rend = new rend_t *[h]; 3573 ov.rend = new rend_t *[h];
3723 3574
3724 for (y = 0; y < h; y++) 3575 for (y = 0; y < h; y++)
3725 { 3576 {
3726 text_t *tp = ov_text[y] = new text_t[w]; 3577 text_t *tp = ov.text[y] = new text_t[w];
3727 rend_t *rp = ov_rend[y] = new rend_t[w]; 3578 rend_t *rp = ov.rend[y] = new rend_t[w];
3728 3579
3729 text_t t0, t1, t2; 3580 text_t t0, t1, t2;
3730 rend_t r = OVERLAY_RSTYLE; 3581 rend_t r = OVERLAY_RSTYLE;
3731 3582
3732 if (y == 0) 3583 if (y == 0)
… …
3751} 3602}
3752 3603
3753void 3604void
3754rxvt_term::scr_overlay_off () NOTHROW 3605rxvt_term::scr_overlay_off () NOTHROW
3755{ 3606{
3756 if (!ov_text) 3607 if (!ov.text)
3757 return; 3608 return;
3758 3609
3759 want_refresh = 1; 3610 want_refresh = 1;
3760 3611
3761 for (int y = 0; y < ov_h; y++) 3612 for (int y = 0; y < ov.h; y++)
3762 { 3613 {
3763 delete [] ov_text[y]; 3614 delete [] ov.text[y];
3764 delete [] ov_rend[y]; 3615 delete [] ov.rend[y];
3765 } 3616 }
3766 3617
3767 delete [] ov_text; ov_text = 0; 3618 delete [] ov.text; ov.text = 0;
3768 delete [] ov_rend; ov_rend = 0; 3619 delete [] ov.rend; ov.rend = 0;
3769} 3620}
3770 3621
3771void 3622void
3772rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3623rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3773{ 3624{
3774 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3625 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3775 return; 3626 return;
3776 3627
3777 x++, y++; 3628 x++, y++;
3778 3629
3779 ov_text[y][x] = text; 3630 ov.text[y][x] = text;
3780 ov_rend[y][x] = rend; 3631 ov.rend[y][x] = rend;
3781} 3632}
3782 3633
3783void 3634void
3784rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3635rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3785{ 3636{
… …
3804} 3655}
3805 3656
3806void 3657void
3807rxvt_term::scr_swap_overlay () NOTHROW 3658rxvt_term::scr_swap_overlay () NOTHROW
3808{ 3659{
3809 if (!ov_text) 3660 if (!ov.text)
3810 return; 3661 return;
3811 3662
3663 // hide cursor if it is within the overlay area
3664 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3665 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3666 screen.flags &= ~Screen_VisibleCursor;
3667
3812 // swap screen mem with overlay 3668 // swap screen mem with overlay
3813 for (int y = ov_h; y--; ) 3669 for (int y = ov.h; y--; )
3814 { 3670 {
3815 text_t *t1 = ov_text[y]; 3671 text_t *t1 = ov.text[y];
3816 rend_t *r1 = ov_rend[y]; 3672 rend_t *r1 = ov.rend[y];
3817 3673
3818 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3674 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; 3675 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3820 3676
3821 for (int x = ov_w; x--; ) 3677 for (int x = ov.w; x--; )
3822 { 3678 {
3823 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3679 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3824 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3680 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3825 } 3681 }
3826 } 3682 }

Diff Legend

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