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

Diff Legend

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