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.261 by root, Sat Feb 18 15:44:26 2006 UTC vs.
Revision 1.422 by root, Thu Jun 28 15:19:15 2012 UTC

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

Diff Legend

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