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

Diff Legend

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