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

Diff Legend

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