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

Diff Legend

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