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.233 by root, Mon Jan 16 06:37:52 2006 UTC vs.
Revision 1.426 by sf-exg, Tue Oct 2 10:29:12 2012 UTC

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

Diff Legend

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