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.273 by ayin, Mon Aug 13 07:18:58 2007 UTC vs.
Revision 1.445 by sf-exg, Fri Apr 12 07:54:15 2013 UTC

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

Diff Legend

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