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

Diff Legend

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