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.290 by root, Fri Dec 14 05:52:34 2007 UTC vs.
Revision 1.435 by sf-exg, Sun Mar 24 10:12:04 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-2007 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
35static inline 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 /* 259 /*
200 * first time called so just malloc everything: don't rely on realloc 260 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
201 */ 261 */
202 top_row = 0; 262 top_row = 0;
203 term_start = 0; 263 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 264
219 memset (charsets, 'B', sizeof (charsets)); 265 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 266 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 267 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 268 screen.cur.row = screen.cur.col = 0;
… …
236 selection.text = NULL; 282 selection.text = NULL;
237 selection.len = 0; 283 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 284 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 285 selection.screen = PRIMARY;
240 selection.clicks = 0; 286 selection.clicks = 0;
287 selection.clip_text = NULL;
288 selection.clip_len = 0;
241 } 289 }
242 else 290 else
243 { 291 {
244 /* 292 /*
245 * add or delete rows as appropriate 293 * add or delete rows as appropriate
246 */ 294 */
247 295
248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 296 int common_col = min (prev_ncol, ncol);
249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250
251#if 0
252 if (nrow < prev_nrow)
253 {
254 for (int row = nrow; row < prev_nrow; row++)
255 {
256 lfree (swap_buf [row]);
257 lfree (drawn_buf[row]);
258 }
259 }
260#endif
261
262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264 297
265 for (int row = min (nrow, prev_nrow); row--; ) 298 for (int row = min (nrow, prev_nrow); row--; )
266 { 299 {
267 lresize (drawn_buf[row]); 300 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268 lresize (swap_buf [row]); 301 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
269 } 302 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
270 303
271 for (int row = prev_nrow; row < nrow; row++) 304 copy_line (swap_buf [row], prev_swap_buf [row]);
272 { 305 }
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);
275 }
276
277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 306
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 307 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 308 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 309 int q = total_rows; // rewrapped row
283 310
284 if (top_row) 311 if (top_row)
285 { 312 {
286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 313 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 314 // to come up with a lean and mean algorithm.
315 // TODO: maybe optimise when width didn't change
288 316
289 row_col_t ocur = screen.cur; 317 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 318 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 319
292 do 320 do
293 { 321 {
294 p = MOD (p - 1, prev_total_rows); 322 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 323 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 324 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 325 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
300 326
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 327 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 { 328 {
303 p = MOD (p - 1, prev_total_rows); 329 p = MOD (p - 1, prev_total_rows);
304 330
305 plines++; 331 plines++;
306 llen += prev_ncol; 332 llen += prev_ncol;
… …
319 345
320 // re-assemble the full line by destination lines 346 // re-assemble the full line by destination lines
321 for (int qrow = q; qlines--; qrow++) 347 for (int qrow = q; qlines--; qrow++)
322 { 348 {
323 qline = row_buf + qrow; 349 qline = row_buf + qrow;
324 lalloc (*qline); 350 qline->alloc (); // redundant with next line
325 qline->l = ncol; 351 qline->l = ncol;
326 qline->is_longer (1); 352 qline->is_longer (1);
327 353
328 int qcol = 0; 354 int qcol = 0;
329 355
… …
344 // this seems to upset applications/shells/readline 370 // this seems to upset applications/shells/readline
345 // least. 371 // least.
346 if (prow == ocur.row) 372 if (prow == ocur.row)
347 screen.cur.row = q - (total_rows - nrow); 373 screen.cur.row = q - (total_rows - nrow);
348 374
349 line_t &pline = old_buf [prow]; 375 line_t &pline = prev_row_buf [prow];
350 376
351 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 377 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
352 378
353 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 379 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
354 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 380 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
375 { 401 {
376 // if no scrollback exists (yet), wing, instead of wrap 402 // if no scrollback exists (yet), wing, instead of wrap
377 403
378 for (int row = min (nrow, prev_nrow); row--; ) 404 for (int row = min (nrow, prev_nrow); row--; )
379 { 405 {
380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 406 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
381 line_t &qline = row_buf [row]; 407 line_t &dst = row_buf [row];
382 408
383 qline = pline; 409 copy_line (dst, src);
384 lresize (qline);
385 } 410 }
386 411
387 for (int row = prev_nrow; row < nrow; row++) 412 for (int row = prev_nrow; row < nrow; row++)
388 {
389 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 413 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
390 }
391 414
392 term_start = 0; 415 term_start = 0;
393 } 416 }
394
395 free (old_buf);
396 delete old_ta;
397 delete old_ra;
398 417
399 clamp_it (screen.cur.row, 0, nrow - 1); 418 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 419 clamp_it (screen.cur.col, 0, ncol - 1);
420 }
401 421
422 for (int row = nrow; row--; )
423 {
424 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
425 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
426 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
427 }
428
429 chunk_free (prev_chunk, prev_chunk_size);
430
402 free (tabs); 431 free (tabs);
403 } 432 tabs = (char *)rxvt_malloc (ncol);
433
434 for (int col = ncol; col--; )
435 tabs [col] = col % TABSIZE == 0;
404 436
405 CLEAR_ALL_SELECTION (); 437 CLEAR_ALL_SELECTION ();
406 438
407 prev_nrow = nrow; 439 prev_nrow = nrow;
408 prev_ncol = ncol; 440 prev_ncol = ncol;
409 441
410 tabs = (char *)rxvt_malloc (ncol); 442 tt_winch ();
411 443
412 for (int col = ncol; --col; ) 444 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
413 tabs [col] = col % TABSIZE == 0; 445}
446
447void ecb_cold
448rxvt_term::scr_release () NOTHROW
449{
450 chunk_free (chunk, chunk_size);
451 chunk = 0;
452 row_buf = 0;
453
454 free (tabs);
455 tabs = 0;
456}
457
458/* ------------------------------------------------------------------------- */
459/*
460 * Hard/Soft reset
461 */
462void ecb_cold
463rxvt_term::scr_poweron ()
464{
465 scr_release ();
466
467 prev_nrow = prev_ncol = 0;
468 rvideo_mode = false;
469 scr_soft_reset ();
470 scr_reset ();
471
472 scr_clear (true);
473 scr_refresh ();
474}
475
476void ecb_cold
477rxvt_term::scr_soft_reset () NOTHROW
478{
479 /* only affects modes, nothing drastic such as clearing the screen */
480#if ENABLE_OVERLAY
481 scr_overlay_off ();
482#endif
414 483
415 if (current_screen != PRIMARY) 484 if (current_screen != PRIMARY)
416 scr_swap_screen (); 485 scr_swap_screen ();
417 486
418 tt_winch (); 487 scr_scroll_region (0, MAX_ROWS - 1);
419 488 scr_rendition (0, ~RS_None);
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 489 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} 490}
458 491
459/* ------------------------------------------------------------------------- * 492/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 493 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 494 * ------------------------------------------------------------------------- */
… …
499 } 532 }
500 533
501 /* boundary check in case screen size changed between SAVE and RESTORE */ 534 /* boundary check in case screen size changed between SAVE and RESTORE */
502 min_it (s->cur.row, nrow - 1); 535 min_it (s->cur.row, nrow - 1);
503 min_it (s->cur.col, ncol - 1); 536 min_it (s->cur.col, ncol - 1);
504#ifdef DEBUG_STRICT
505 assert (s->cur.row >= 0); 537 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 538 assert (s->cur.col >= 0);
507#endif
508} 539}
509 540
510void 541void
511rxvt_term::scr_swap_screen () 542rxvt_term::scr_swap_screen () NOTHROW
512{ 543{
513 if (!option (Opt_secondaryScreen)) 544 if (!option (Opt_secondaryScreen))
514 return; 545 return;
515 546
516 for (int i = prev_nrow; i--; ) 547 for (int i = prev_nrow; i--; )
… …
535 return; 566 return;
536 567
537 want_refresh = 1; 568 want_refresh = 1;
538 view_start = 0; 569 view_start = 0;
539 570
540 selection_check (2); /* check for boundary cross */ 571 /* check for boundary cross */
572 row_col_t pos;
573 pos.row = pos.col = 0;
574 if (ROWCOL_IS_BEFORE (selection.beg, pos)
575 && ROWCOL_IS_AFTER (selection.end, pos))
576 CLEAR_SELECTION ();
541 577
542 int i = current_screen; current_screen = scrn; scrn = i; 578 current_screen = scrn;
543 579
544#if NSCREENS 580#if NSCREENS
545 if (option (Opt_secondaryScreen)) 581 if (option (Opt_secondaryScreen))
546 { 582 {
547 num_scr = 0; 583 num_scr = 0;
… …
611/* 647/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 648 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 649 * count positive ==> scroll up
614 * count negative ==> scroll down 650 * count negative ==> scroll down
615 */ 651 */
616int 652int ecb_hot
617rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 653rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
618{ 654{
619 if (count == 0 || (row1 > row2)) 655 if (count == 0 || (row1 > row2))
620 return 0; 656 return 0;
621 657
… …
624 660
625 if (count > 0 661 if (count > 0
626 && row1 == 0 662 && row1 == 0
627 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 663 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
628 { 664 {
665 min_it (count, total_rows - (nrow - (row2 + 1)));
666
629 top_row = max (top_row - count, -saveLines); 667 top_row = max (top_row - count, -saveLines);
630
631 // scroll everything up 'count' lines
632 term_start = (term_start + count) % total_rows;
633 668
634 // sever bottommost line 669 // sever bottommost line
635 { 670 {
636 line_t &l = ROW(row2 - count); 671 line_t &l = ROW(row2);
637 l.is_longer (0); 672 l.is_longer (0);
638 l.touch (); 673 l.touch ();
639 } 674 }
640 675
676 // scroll everything up 'count' lines
677 term_start = (term_start + count) % total_rows;
678
679 // now copy lines below the scroll region bottom to the
680 // bottom of the screen again, so they look as if they
681 // hadn't moved.
682 for (int i = nrow; --i > row2; )
683 {
684 line_t &l1 = ROW(i - count);
685 line_t &l2 = ROW(i);
686
687 ::swap (l1, l2);
688 l2.touch ();
689 }
690
641 // erase newly scrolled-in lines 691 // erase newly scrolled-in lines
642 for (int i = count; i--; ) 692 for (int i = count; i--; )
643 { 693 {
644 line_t &l = ROW(nrow - 1 - i); 694 line_t &l = ROW(row2 - i);
645 695
646 // optimize if already cleared, can be significant on slow machines 696 // optimise if already cleared, can be significant on slow machines
647 // could be rolled into scr_blank_screen_mem 697 // 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))) 698 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
649 { 699 {
650 scr_blank_line (l, 0, l.l, rstyle); 700 scr_blank_line (l, 0, l.l, rstyle);
651 l.l = 0; 701 l.l = 0;
… …
653 } 703 }
654 else 704 else
655 scr_blank_screen_mem (l, rstyle); 705 scr_blank_screen_mem (l, rstyle);
656 } 706 }
657 707
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 708 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 709 if (selection.op && current_screen == selection.screen
710 && selection.beg.row <= row2)
672 { 711 {
673 selection.beg.row -= count; 712 selection.beg.row -= count;
674 selection.end.row -= count; 713 selection.end.row -= count;
675 selection.mark.row -= count; 714 selection.mark.row -= count;
676 715
677 if (selection.beg.row < top_row 716 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 } 717 }
685 718
686 // finally move the view window, if desired 719 // finally move the view window, if desired
687 if (option (Opt_scrollWithBuffer) 720 if (option (Opt_scrollWithBuffer)
688 && view_start != 0 721 && view_start != 0
… …
718 } 751 }
719 752
720 // use a simple and robust scrolling algorithm, this 753 // use a simple and robust scrolling algorithm, this
721 // part of scr_scroll_text is not time-critical. 754 // part of scr_scroll_text is not time-critical.
722 755
756 // sever line above scroll region
757 if (row1)
758 {
759 line_t &l = ROW(row1 - 1);
760 l.is_longer (0);
761 l.touch ();
762 }
763
723 int rows = row2 - row1 + 1; 764 int rows = row2 - row1 + 1;
724 765
725 min_it (count, rows); 766 min_it (count, rows);
726 767
727 line_t *temp_buf = row_buf + total_rows; 768 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
728 769
729 for (int row = 0; row < rows; row++) 770 for (int row = 0; row < rows; row++)
730 { 771 {
731 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 772 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
732 773
… …
734 scr_blank_screen_mem (temp_buf [row], rstyle); 775 scr_blank_screen_mem (temp_buf [row], rstyle);
735 } 776 }
736 777
737 for (int row = 0; row < rows; row++) 778 for (int row = 0; row < rows; row++)
738 ROW(row1 + row) = temp_buf [row]; 779 ROW(row1 + row) = temp_buf [row];
780
781 // sever bottommost line
782 {
783 line_t &l = ROW(row2);
784 l.is_longer (0);
785 l.touch ();
786 }
739 } 787 }
740 788
741 return count; 789 return count;
742} 790}
743 791
744/* ------------------------------------------------------------------------- */ 792/* ------------------------------------------------------------------------- */
745/* 793/*
746 * Add text given in <str> of length <len> to screen struct 794 * Add text given in <str> of length <len> to screen struct
747 */ 795 */
748void 796void ecb_hot
749rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 797rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
750{ 798{
751 if (len <= 0) /* sanity */ 799 if (len <= 0) /* sanity */
752 return; 800 return;
753 801
754 unsigned char checksel; 802 bool checksel;
755 unicode_t c; 803 unicode_t c;
756 int ncol = this->ncol; 804 int ncol = this->ncol;
757 const wchar_t *strend = str + len; 805 const wchar_t *strend = str + len;
758 806
759 want_refresh = 1; 807 want_refresh = 1;
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 820 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 821 screen.cur.row -= minlines;
774 } 822 }
775 } 823 }
776 824
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 825 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 826 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 827 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 828 int row = screen.cur.row;
783 829
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 830 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 831
786 line_t *line = &ROW(row); 832 line_t *line = &ROW(row);
787 833
788 while (str < strend) 834 while (str < strend)
789 { 835 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 836 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 837
792 if (c < 0x20) 838 if (ecb_unlikely (c < 0x20))
793 if (c == C0_LF) 839 if (c == C0_LF)
794 { 840 {
795 max_it (line->l, screen.cur.col); 841 max_it (line->l, screen.cur.col);
796 842
797 screen.flags &= ~Screen_WrapNext; 843 screen.flags &= ~Screen_WrapNext;
… …
816 { 862 {
817 scr_tab (1, true); 863 scr_tab (1, true);
818 continue; 864 continue;
819 } 865 }
820 866
867 if (ecb_unlikely (
821 if (checksel /* see if we're writing within selection */ 868 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 869 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 870 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
871 ))
824 { 872 {
825 checksel = 0; 873 checksel = 0;
826 /* 874 /*
827 * If we wrote anywhere in the selected area, kill the selection 875 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 876 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 877 * should be a similar check.
830 */ 878 */
831 CLEAR_SELECTION (); 879 CLEAR_SELECTION ();
832 } 880 }
833 881
834 if (screen.flags & Screen_WrapNext) 882 if (ecb_unlikely (screen.flags & Screen_WrapNext))
835 { 883 {
836 scr_do_wrap (); 884 scr_do_wrap ();
837 885
838 line->l = ncol; 886 line->l = ncol;
839 line->is_longer (1); 887 line->is_longer (1);
… …
841 row = screen.cur.row; 889 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 890 line = &ROW(row); /* _must_ refresh */
843 } 891 }
844 892
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 893 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 894 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 895 c = 0xfffd;
848 896
849 // rely on wcwidth to tell us the character width, do wcwidth before 897 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 898 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 899 // drawing characters below as they might be invalid in the current
852 // locale. 900 // locale.
853 int width = WCWIDTH (c); 901 int width = WCWIDTH (c);
854 902
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 903 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 904 {
857 // vt100 special graphics and line drawing 905 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 906 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 907 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 908 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 921 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 922 width = 1; // vt100 line drawing characters are always single-width
875 } 923 }
876 } 924 }
877 925
878 if (screen.flags & Screen_Insert) 926 if (ecb_unlikely (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 927 scr_insdel_chars (width, INSERT);
880 928
881 if (width != 0) 929 if (width != 0)
882 { 930 {
883#if !UNICODE_3 931#if !UNICODE_3
… …
888# else 936# else
889 c = 0xfffd; 937 c = 0xfffd;
890# endif 938# endif
891#endif 939#endif
892 940
941 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
942
943 // if the character doesn't fit into the remaining columns...
944 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
945 {
946 if (screen.flags & Screen_Autowrap)
947 {
948 // ... artificially enlargen the previous one
949 c = NOCHAR;
950 // and try the same character next loop iteration
951 --str;
952 }
953 else
954 screen.cur.col = ncol - width;
955 }
956
893 // nuke the character at this position, if required 957 // nuke the character at this position, if required
958 // due to wonderful coincidences everywhere else in this loop
959 // we never have to check for overwriting a wide char itself,
960 // only its tail.
894 if (line->t[screen.cur.col] == NOCHAR 961 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
895 || (screen.cur.col < ncol - 1 962 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 963
925 line->touch (); 964 line->touch ();
926 965
927 do 966 do
928 { 967 {
929 line->t[screen.cur.col] = c; 968 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 969 line->r[screen.cur.col] = rend;
931 970
932 if (screen.cur.col < ncol - 1) 971 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 972 screen.cur.col++;
934 else 973 else
935 { 974 {
936 line->l = ncol; 975 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 976 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 977 screen.flags |= Screen_WrapNext;
939 break; 978
979 goto end_of_line;
940 } 980 }
941 981
942 c = NOCHAR; 982 c = NOCHAR;
943 } 983 }
944 while (--width > 0); 984 while (ecb_unlikely (--width > 0));
945 985
946 // pad with spaces when overwriting wide character with smaller one 986 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 987 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 988 {
949 line->touch (); 989 line->t[c] = ' ';
990 line->r[c] = rend;
991 }
950 992
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 993end_of_line:
994 ;
995 }
996#if ENABLE_COMBINING
997 else // width == 0
998 {
999 if (c != 0xfeff) // ignore BOM
1000 {
1001 // handle combining characters
1002 // we just tag the accent on the previous on-screen character.
1003 // this is arguably not correct, but also arguably not wrong.
1004 // we don't handle double-width characters nicely yet.
1005 line_t *linep;
1006 text_t *tp;
1007 rend_t *rp;
1008
1009 if (screen.cur.col > 0)
952 { 1010 {
953 line->t[c] = ' ';
954 line->r[c] = rend; 1011 linep = line;
1012 tp = line->t + screen.cur.col - 1;
1013 rp = line->r + screen.cur.col - 1;
955 } 1014 }
1015 else if (screen.cur.row > 0
1016 && ROW(screen.cur.row - 1).is_longer ())
1017 {
1018 linep = &ROW(screen.cur.row - 1);
1019 tp = line->t + ncol - 1;
1020 rp = line->r + ncol - 1;
1021 }
1022 else
1023 continue;
1024
1025 linep->touch ();
1026
1027 while (*tp == NOCHAR && tp > linep->t)
1028 tp--, rp--;
1029
1030 // first try to find a precomposed character
1031 unicode_t n = rxvt_compose (*tp, c);
1032 if (n == NOCHAR)
1033 n = rxvt_composite.compose (*tp, c);
1034
1035 *tp = n;
1036 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
956 } 1037 }
957 } 1038 }
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 1039#endif
998 }
999 } 1040 }
1000 1041
1001 max_it (line->l, screen.cur.col); 1042 max_it (line->l, screen.cur.col);
1002 1043
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1044 assert (screen.cur.row >= 0);
1005#endif
1006} 1045}
1007 1046
1008/* ------------------------------------------------------------------------- */ 1047/* ------------------------------------------------------------------------- */
1009/* 1048/*
1010 * Process Backspace. Move back the cursor back a position, wrap if have to 1049 * Process Backspace. Move back the cursor back a position, wrap if have to
1011 * XTERM_SEQ: CTRL-H 1050 * XTERM_SEQ: CTRL-H
1012 */ 1051 */
1013void 1052void
1014rxvt_term::scr_backspace () NOTHROW 1053rxvt_term::scr_backspace () NOTHROW
1015{ 1054{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1055 if (screen.cur.col == 0)
1019 { 1056 {
1020 if (screen.cur.row > 0) 1057 if (screen.cur.row > 0)
1021 { 1058 {
1022#ifdef TERMCAP_HAS_BW 1059#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1060 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1061 --screen.cur.row;
1025 return; 1062
1063 want_refresh = 1;
1026#endif 1064#endif
1027 } 1065 }
1028 } 1066 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1067 else if (screen.flags & Screen_WrapNext)
1068 screen.flags &= ~Screen_WrapNext;
1069 else
1030 scr_gotorc (0, -1, RELATIVE); 1070 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1071}
1034 1072
1035/* ------------------------------------------------------------------------- */ 1073/* ------------------------------------------------------------------------- */
1036/* 1074/*
1037 * Process Horizontal Tab 1075 * Process Horizontal Tab
… …
1113 * XTERM_SEQ: ESC 6 1151 * XTERM_SEQ: ESC 6
1114 * Move cursor left in row. If we're at the left boundary, shift everything 1152 * Move cursor left in row. If we're at the left boundary, shift everything
1115 * in that row right. Clear left column. 1153 * in that row right. Clear left column.
1116 */ 1154 */
1117#if !ENABLE_MINIMAL 1155#if !ENABLE_MINIMAL
1118void 1156void ecb_cold
1119rxvt_term::scr_backindex () NOTHROW 1157rxvt_term::scr_backindex () NOTHROW
1120{ 1158{
1121 if (screen.cur.col > 0) 1159 if (screen.cur.col > 0)
1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1160 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1123 else 1161 else
… …
1130 * XTERM_SEQ: ESC 9 1168 * XTERM_SEQ: ESC 9
1131 * Move cursor right in row. If we're at the right boundary, shift everything 1169 * Move cursor right in row. If we're at the right boundary, shift everything
1132 * in that row left. Clear right column. 1170 * in that row left. Clear right column.
1133 */ 1171 */
1134#if !ENABLE_MINIMAL 1172#if !ENABLE_MINIMAL
1135void 1173void ecb_cold
1136rxvt_term::scr_forwardindex () NOTHROW 1174rxvt_term::scr_forwardindex () NOTHROW
1137{ 1175{
1138 if (screen.cur.col < ncol - 1) 1176 if (screen.cur.col < ncol - 1)
1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1177 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1140 else 1178 else
… …
1230/* 1268/*
1231 * Erase part or whole of a line 1269 * Erase part or whole of a line
1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1270 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1271 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1272 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1273 * extension: clear to right unless wrapped: ESC [ 3 K
1235 */ 1274 */
1236void 1275void
1237rxvt_term::scr_erase_line (int mode) NOTHROW 1276rxvt_term::scr_erase_line (int mode) NOTHROW
1238{ 1277{
1239 unsigned int col, num; 1278 unsigned int col, num;
… …
1248 line.touch (); 1287 line.touch ();
1249 line.is_longer (0); 1288 line.is_longer (0);
1250 1289
1251 switch (mode) 1290 switch (mode)
1252 { 1291 {
1292 case 3:
1293 if (screen.flags & Screen_WrapNext)
1294 return;
1295
1296 /* fall through */
1297
1253 case 0: /* erase to end of line */ 1298 case 0: /* erase to end of line */
1254 col = screen.cur.col; 1299 col = screen.cur.col;
1255 num = ncol - col; 1300 num = ncol - col;
1256 min_it (line.l, col); 1301 min_it (line.l, col);
1302
1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1303 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1304 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1259 CLEAR_SELECTION (); 1305 CLEAR_SELECTION ();
1260 break; 1306 break;
1307
1261 case 1: /* erase to beginning of line */ 1308 case 1: /* erase to beginning of line */
1262 col = 0; 1309 col = 0;
1263 num = screen.cur.col + 1; 1310 num = screen.cur.col + 1;
1311
1264 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1312 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1265 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1313 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1266 CLEAR_SELECTION (); 1314 CLEAR_SELECTION ();
1267 break; 1315 break;
1316
1268 case 2: /* erase whole line */ 1317 case 2: /* erase whole line */
1269 col = 0; 1318 col = 0;
1270 num = ncol; 1319 num = ncol;
1271 line.l = 0; 1320 line.l = 0;
1272 if (selection.beg.row <= screen.cur.row 1321 if (selection.beg.row <= screen.cur.row
… …
1280 scr_blank_line (line, col, num, rstyle); 1329 scr_blank_line (line, col, num, rstyle);
1281} 1330}
1282 1331
1283/* ------------------------------------------------------------------------- */ 1332/* ------------------------------------------------------------------------- */
1284/* 1333/*
1285 * Erase part of whole of the screen 1334 * Erase part or whole of the screen
1286 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1335 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1287 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1336 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1288 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1337 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1289 */ 1338 */
1290void 1339void
… …
1299 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1300 1349
1301 switch (mode) 1350 switch (mode)
1302 { 1351 {
1303 case 0: /* erase to end of screen */ 1352 case 0: /* erase to end of screen */
1304 selection_check (1);
1305 scr_erase_line (0); 1353 scr_erase_line (0);
1306 row = screen.cur.row + 1; /* possible OOB */ 1354 row = screen.cur.row + 1; /* possible OOB */
1307 num = nrow - row; 1355 num = nrow - row;
1308 break; 1356 break;
1309 case 1: /* erase to beginning of screen */ 1357 case 1: /* erase to beginning of screen */
1310 selection_check (3);
1311 scr_erase_line (1); 1358 scr_erase_line (1);
1312 row = 0; 1359 row = 0;
1313 num = screen.cur.row; 1360 num = screen.cur.row;
1314 break; 1361 break;
1315 case 2: /* erase whole screen */ 1362 case 2: /* erase whole screen */
1316 selection_check (3);
1317 row = 0; 1363 row = 0;
1318 num = nrow; 1364 num = nrow;
1319 break; 1365 break;
1320 default: 1366 default:
1321 return; 1367 return;
… …
1330 if (row >= nrow) /* Out Of Bounds */ 1376 if (row >= nrow) /* Out Of Bounds */
1331 return; 1377 return;
1332 1378
1333 min_it (num, nrow - row); 1379 min_it (num, nrow - row);
1334 1380
1335 if (rstyle & (RS_RVid | RS_Uline)) 1381 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1382 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1383 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1384 {
1339 ren = DEFAULT_RSTYLE; 1385 ren = DEFAULT_RSTYLE;
1340 CLEAR_ROWS (row, num); 1386
1387 if (mapped)
1388 XClearArea (dpy, vt, 0,
1389 Row2Pixel (row - view_start), (unsigned int)vt_width,
1390 (unsigned int)Height2Pixel (num), False);
1341 } 1391 }
1342 else 1392 else
1343 { 1393 {
1344 ren = rstyle & (RS_fgMask | RS_bgMask); 1394 ren = rstyle & (RS_fgMask | RS_bgMask);
1395
1396 if (mapped)
1397 {
1345 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1398 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1346 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1347 ERASE_ROWS (row, num); 1400 XFillRectangle (dpy, vt, gc,
1401 0, Row2Pixel (row - view_start),
1402 (unsigned int)vt_width,
1403 (unsigned int)Height2Pixel (num));
1348 gcvalue.foreground = pix_colors[Color_fg]; 1404 gcvalue.foreground = pix_colors[Color_fg];
1349 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1405 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1406 }
1350 } 1407 }
1351 1408
1352 for (; num--; row++) 1409 for (; num--; row++)
1353 { 1410 {
1354 scr_blank_screen_mem (ROW(row), rstyle); 1411 scr_blank_screen_mem (ROW(row), rstyle);
1412
1413 if (row - view_start < nrow)
1355 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1414 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1356 } 1415 }
1357} 1416}
1358 1417
1359#if !ENABLE_MINIMAL 1418#if !ENABLE_MINIMAL
1360void 1419void
… …
1370/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1371/* 1430/*
1372 * Fill the screen with `E's 1431 * Fill the screen with `E's
1373 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1432 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1374 */ 1433 */
1375void 1434void ecb_cold
1376rxvt_term::scr_E () NOTHROW 1435rxvt_term::scr_E () NOTHROW
1377{ 1436{
1378 rend_t fs; 1437 rend_t fs;
1379 1438
1380 want_refresh = 1; 1439 want_refresh = 1;
1381 ZERO_SCROLLBACK (); 1440 ZERO_SCROLLBACK ();
1382 1441
1383 num_scr_allow = 0; 1442 num_scr_allow = 0;
1384 selection_check (3); 1443
1444 row_col_t pos;
1445 pos.row = pos.col = 0;
1446 if (ROWCOL_IS_AFTER (selection.end, pos))
1447 CLEAR_SELECTION ();
1385 1448
1386 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1449 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1387 for (int row = nrow; row--; ) 1450 for (int row = nrow; row--; )
1388 { 1451 {
1389 line_t &line = ROW(row); 1452 line_t &line = ROW(row);
… …
1434 * Insert/Delete <count> characters from the current position 1497 * Insert/Delete <count> characters from the current position
1435 */ 1498 */
1436void 1499void
1437rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1500rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1438{ 1501{
1439 int col, row;
1440 rend_t tr;
1441
1442 want_refresh = 1; 1502 want_refresh = 1;
1443 ZERO_SCROLLBACK (); 1503 ZERO_SCROLLBACK ();
1444 1504
1445 if (count <= 0) 1505 if (count <= 0)
1446 return; 1506 return;
… …
1448 scr_do_wrap (); 1508 scr_do_wrap ();
1449 1509
1450 selection_check (1); 1510 selection_check (1);
1451 min_it (count, ncol - screen.cur.col); 1511 min_it (count, ncol - screen.cur.col);
1452 1512
1453 row = screen.cur.row; 1513 int row = screen.cur.row;
1454 1514
1455 line_t *line = &ROW(row); 1515 line_t *line = &ROW(row);
1456 1516
1457 line->touch (); 1517 line->touch ();
1458 line->is_longer (0); 1518 line->is_longer (0);
1459 1519
1520 // nuke wide spanning the start
1521 if (line->t[screen.cur.col] == NOCHAR)
1522 scr_kill_char (*line, screen.cur.col);
1523
1460 switch (insdel) 1524 switch (insdel)
1461 { 1525 {
1462 case INSERT: 1526 case INSERT:
1463 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1527 line->l = min (line->l + count, ncol);
1528
1529 if (line->t[screen.cur.col] == NOCHAR)
1530 scr_kill_char (*line, screen.cur.col);
1531
1532 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1464 { 1533 {
1465 line->t[col] = line->t[col - count]; 1534 line->t[col] = line->t[col - count];
1466 line->r[col] = line->r[col - count]; 1535 line->r[col] = line->r[col - count];
1467 } 1536 }
1468
1469 line->l = min (line->l + count, ncol);
1470 1537
1471 if (selection.op && current_screen == selection.screen 1538 if (selection.op && current_screen == selection.screen
1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1539 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1473 { 1540 {
1474 if (selection.end.row != screen.cur.row 1541 if (selection.end.row != screen.cur.row
… …
1489 case ERASE: 1556 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1557 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1558 selection_check (1);
1492 screen.cur.col -= count; 1559 screen.cur.col -= count;
1493 1560
1494 line->l = max (line->l - count, 0); 1561 // nuke wide char after the end
1562 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1563 scr_kill_char (*line, screen.cur.col + count);
1564
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1565 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1566 break;
1497 1567
1498 case DELETE: 1568 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1569 line->l = max (line->l - count, 0);
1500 1570
1571 // nuke wide char spanning the end
1572 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1573 scr_kill_char (*line, screen.cur.col + count);
1574
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1575 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1576 {
1503 line->t[col] = line->t[col + count]; 1577 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1578 line->r[col] = line->r[col + count];
1505 } 1579 }
1506 1580
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1581 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1582
1510 if (selection.op && current_screen == selection.screen 1583 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1584 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1585 {
1513 if (selection.end.row != screen.cur.row 1586 if (selection.end.row != screen.cur.row
… …
1530/* ------------------------------------------------------------------------- */ 1603/* ------------------------------------------------------------------------- */
1531/* 1604/*
1532 * Set the scrolling region 1605 * Set the scrolling region
1533 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1606 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1534 */ 1607 */
1535void 1608void ecb_cold
1536rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1609rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1537{ 1610{
1538 max_it (top, 0); 1611 max_it (top, 0);
1539 min_it (bot, nrow - 1); 1612 min_it (bot, nrow - 1);
1540 1613
… …
1550/* 1623/*
1551 * Make the cursor visible/invisible 1624 * Make the cursor visible/invisible
1552 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1625 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1553 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1626 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1554 */ 1627 */
1555void 1628void ecb_cold
1556rxvt_term::scr_cursor_visible (int mode) NOTHROW 1629rxvt_term::scr_cursor_visible (int mode) NOTHROW
1557{ 1630{
1558 want_refresh = 1; 1631 want_refresh = 1;
1559 1632
1560 if (mode) 1633 if (mode)
… …
1567/* 1640/*
1568 * Set/unset automatic wrapping 1641 * Set/unset automatic wrapping
1569 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1642 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1570 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1643 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1571 */ 1644 */
1572void 1645void ecb_cold
1573rxvt_term::scr_autowrap (int mode) NOTHROW 1646rxvt_term::scr_autowrap (int mode) NOTHROW
1574{ 1647{
1575 if (mode) 1648 if (mode)
1576 screen.flags |= Screen_Autowrap; 1649 screen.flags |= Screen_Autowrap;
1577 else 1650 else
… …
1586 * Relative mode: line numbers are relative to top margin of scrolling region 1659 * Relative mode: line numbers are relative to top margin of scrolling region
1587 * and the cursor cannot be moved outside. 1660 * and the cursor cannot be moved outside.
1588 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1661 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1589 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1662 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1590 */ 1663 */
1591void 1664void ecb_cold
1592rxvt_term::scr_relative_origin (int mode) NOTHROW 1665rxvt_term::scr_relative_origin (int mode) NOTHROW
1593{ 1666{
1594 if (mode) 1667 if (mode)
1595 screen.flags |= Screen_Relative; 1668 screen.flags |= Screen_Relative;
1596 else 1669 else
… …
1603/* 1676/*
1604 * Set insert/replace mode 1677 * Set insert/replace mode
1605 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1678 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1606 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1679 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1607 */ 1680 */
1608void 1681void ecb_cold
1609rxvt_term::scr_insert_mode (int mode) NOTHROW 1682rxvt_term::scr_insert_mode (int mode) NOTHROW
1610{ 1683{
1611 if (mode) 1684 if (mode)
1612 screen.flags |= Screen_Insert; 1685 screen.flags |= Screen_Insert;
1613 else 1686 else
… …
1619 * Set/Unset tabs 1692 * Set/Unset tabs
1620 * XTERM_SEQ: Set tab at current column : ESC H 1693 * XTERM_SEQ: Set tab at current column : ESC H
1621 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1694 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1622 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1695 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1623 */ 1696 */
1624void 1697void ecb_cold
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1698rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1699{
1627 if (mode < 0) 1700 if (mode < 0)
1628 memset (tabs, 0, ncol); 1701 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1702 else if (screen.cur.col < ncol)
… …
1648 if (rvideo_state != on) 1721 if (rvideo_state != on)
1649 { 1722 {
1650 rvideo_state = on; 1723 rvideo_state = on;
1651 1724
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1725 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#ifdef HAVE_BG_PIXMAP 1726#ifdef HAVE_IMG
1654 if (bgPixmap.pixmap == None) 1727 if (bg_img == 0)
1655#endif 1728#endif
1656 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1729 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1657 1730
1658 XGCValues gcvalue; 1731 XGCValues gcvalue;
1659 gcvalue.foreground = pix_colors[Color_fg]; 1732 gcvalue.foreground = pix_colors[Color_fg];
… …
1668/* ------------------------------------------------------------------------- */ 1741/* ------------------------------------------------------------------------- */
1669/* 1742/*
1670 * Report current cursor position 1743 * Report current cursor position
1671 * XTERM_SEQ: Report position: ESC [ 6 n 1744 * XTERM_SEQ: Report position: ESC [ 6 n
1672 */ 1745 */
1673void 1746void ecb_cold
1674rxvt_term::scr_report_position () NOTHROW 1747rxvt_term::scr_report_position () NOTHROW
1675{ 1748{
1676 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1749 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1677} 1750}
1678 1751
… …
1681 * ------------------------------------------------------------------------- */ 1754 * ------------------------------------------------------------------------- */
1682 1755
1683/* 1756/*
1684 * Set font style 1757 * Set font style
1685 */ 1758 */
1686void 1759void ecb_cold
1687rxvt_term::set_font_style () NOTHROW 1760rxvt_term::set_font_style () NOTHROW
1688{ 1761{
1689#if 0 1762#if 0
1690 switch (charsets [screen.charset]) 1763 switch (charsets [screen.charset])
1691 { 1764 {
… …
1713 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1786 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1714 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1787 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1715 * XTERM_SEQ: Invoke G2 character set: ESC N 1788 * XTERM_SEQ: Invoke G2 character set: ESC N
1716 * XTERM_SEQ: Invoke G3 character set: ESC O 1789 * XTERM_SEQ: Invoke G3 character set: ESC O
1717 */ 1790 */
1718void 1791void ecb_cold
1719rxvt_term::scr_charset_choose (int set) NOTHROW 1792rxvt_term::scr_charset_choose (int set) NOTHROW
1720{ 1793{
1721 screen.charset = set; 1794 screen.charset = set;
1722 set_font_style (); 1795 set_font_style ();
1723} 1796}
… …
1744 * ------------------------------------------------------------------------- */ 1817 * ------------------------------------------------------------------------- */
1745 1818
1746/* 1819/*
1747 * refresh matching text. 1820 * refresh matching text.
1748 */ 1821 */
1749bool 1822bool ecb_cold
1750rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1823rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1751{ 1824{
1752 bool found = false; 1825 bool found = false;
1753 1826
1754 for (int i = 0; i < nrow; i++) 1827 for (int i = 0; i < nrow; i++)
… …
1773 PART_BEG = 0, 1846 PART_BEG = 0,
1774 PART_END, 1847 PART_END,
1775 RC_COUNT 1848 RC_COUNT
1776}; 1849};
1777 1850
1778void 1851void ecb_hot
1779rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1852rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1780{ 1853{
1781 int i; 1854 int i;
1782 row_col_t rc[RC_COUNT]; 1855 row_col_t rc[RC_COUNT];
1783 1856
… …
1803 for (i = PART_BEG; i < RC_COUNT; i++) 1876 for (i = PART_BEG; i < RC_COUNT; i++)
1804 { 1877 {
1805 min_it (rc[i].col, ncol - 1); 1878 min_it (rc[i].col, ncol - 1);
1806 min_it (rc[i].row, nrow - 1); 1879 min_it (rc[i].row, nrow - 1);
1807 } 1880 }
1808// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1881
1809 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1882 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1883 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1811 1884
1812 num_scr_allow = 0; 1885 num_scr_allow = 0;
1813 1886
… …
1820 * Refresh the entire screen 1893 * Refresh the entire screen
1821 */ 1894 */
1822void 1895void
1823rxvt_term::scr_touch (bool refresh) NOTHROW 1896rxvt_term::scr_touch (bool refresh) NOTHROW
1824{ 1897{
1825 scr_expose (0, 0, width, height, refresh); 1898 scr_expose (0, 0, vt_width, vt_height, refresh);
1826} 1899}
1827 1900
1828/* ------------------------------------------------------------------------- */ 1901/* ------------------------------------------------------------------------- */
1829/* 1902/*
1830 * Move the display so that the line represented by scrollbar value Y is at 1903 * Move the display so that the line represented by scrollbar value Y is at
… …
1872void 1945void
1873rxvt_term::bell_cb (ev::timer &w, int revents) 1946rxvt_term::bell_cb (ev::timer &w, int revents)
1874{ 1947{
1875 rvideo_bell = false; 1948 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode); 1949 scr_rvideo_mode (rvideo_mode);
1950 refresh_check ();
1877} 1951}
1878#endif 1952#endif
1879 1953
1880/* ------------------------------------------------------------------------- */ 1954/* ------------------------------------------------------------------------- */
1881void 1955void
… …
1885 1959
1886# ifndef NO_MAPALERT 1960# ifndef NO_MAPALERT
1887# ifdef MAPALERT_OPTION 1961# ifdef MAPALERT_OPTION
1888 if (option (Opt_mapAlert)) 1962 if (option (Opt_mapAlert))
1889# endif 1963# endif
1890 XMapWindow (dpy, parent[0]); 1964 XMapWindow (dpy, parent);
1891# endif 1965# endif
1892 1966
1893# if ENABLE_FRILLS 1967# if ENABLE_FRILLS
1894 if (option (Opt_urgentOnBell)) 1968 if (option (Opt_urgentOnBell))
1895 { 1969 set_urgency (1);
1896 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1897 {
1898 h->flags |= XUrgencyHint;
1899 XSetWMHints (dpy, parent[0], h);
1900 }
1901 }
1902# endif 1970# endif
1903 1971
1904 if (option (Opt_visualBell)) 1972 if (option (Opt_visualBell))
1905 { 1973 {
1906 rvideo_bell = true; 1974 rvideo_bell = true;
… …
1909 1977
1910 bell_ev.start (VISUAL_BELL_DURATION); 1978 bell_ev.start (VISUAL_BELL_DURATION);
1911 } 1979 }
1912 else 1980 else
1913 XBell (dpy, 0); 1981 XBell (dpy, 0);
1982 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1914#endif 1983#endif
1915} 1984}
1916 1985
1917/* ------------------------------------------------------------------------- */ 1986/* ------------------------------------------------------------------------- */
1918/* ARGSUSED */ 1987void ecb_cold
1919void
1920rxvt_term::scr_printscreen (int fullhist) NOTHROW 1988rxvt_term::scr_printscreen (int fullhist) NOTHROW
1921{ 1989{
1922#ifdef PRINTPIPE 1990#ifdef PRINTPIPE
1923 int nrows, row_start; 1991 int nrows, row_start;
1924 FILE *fd; 1992 FILE *fd = popen_printer ();
1925 1993
1926 if ((fd = popen_printer ()) == NULL) 1994 if (!fd)
1927 return; 1995 return;
1928 1996
1929 if (fullhist) 1997 if (fullhist)
1930 { 1998 {
1931 nrows = nrow - top_row; 1999 nrows = nrow - top_row;
… …
1937 row_start = view_start; 2005 row_start = view_start;
1938 } 2006 }
1939 2007
1940 wctomb (0, 0); 2008 wctomb (0, 0);
1941 2009
1942 for (int r1 = 0; r1 < nrows; r1++) 2010 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1943 { 2011 {
1944 text_t *tp = ROW(r1).t; 2012 text_t *tp = ROW(r1).t;
1945 int len = ROW(r1).l; 2013 int len = ROW(r1).l;
1946 2014
1947 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2015 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1973/* 2041/*
1974 * Refresh the screen 2042 * Refresh the screen
1975 * drawn_text/drawn_rend contain the screen information before the update. 2043 * drawn_text/drawn_rend contain the screen information before the update.
1976 * screen.text/screen.rend contain what the screen will change to. 2044 * screen.text/screen.rend contain what the screen will change to.
1977 */ 2045 */
1978void 2046void ecb_hot
1979rxvt_term::scr_refresh () NOTHROW 2047rxvt_term::scr_refresh () NOTHROW
1980{ 2048{
1981 unsigned char have_bg,
1982 showcursor; /* show the cursor */
1983 int16_t col, row, /* column/row we're processing */ 2049 int16_t col, row, /* column/row we're processing */
1984 ocrow; /* old cursor row */ 2050 ocrow; /* old cursor row */
1985 int i; /* tmp */ 2051 int i; /* tmp */
1986#ifndef NO_CURSORCOLOR
1987 rend_t cc1; /* store colours at cursor position (s) */
1988#endif
1989 rend_t *crp; // cursor rendition pointer
1990 rend_t ccol1, /* Cursor colour */ 2052 rend_t ccol1, /* Cursor colour */
1991 ccol2; /* Cursor colour2 */ 2053 ccol2; /* Cursor colour2 */
2054 rend_t cur_rend;
2055 int cur_col;
1992 2056
1993 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
1994 2058
1995 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
1996 return; 2060 return;
1997 2061
1998 /* 2062 /*
1999 * A: set up vars 2063 * A: set up vars
2000 */ 2064 */
2001 have_bg = 0;
2002 refresh_count = 0; 2065 refresh_count = 0;
2003 2066
2004#ifdef HAVE_BG_PIXMAP 2067 unsigned int old_screen_flags = screen.flags;
2005 have_bg |= bgPixmap.pixmap != None; 2068 bool have_bg = 0;
2069#ifdef HAVE_IMG
2070 have_bg = bg_img != 0;
2006#endif 2071#endif
2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2008 2073
2009 /* 2074 /*
2010 * B: reverse any characters which are selected 2075 * B: reverse any characters which are selected
2011 */ 2076 */
2012 scr_reverse_selection (); 2077 scr_reverse_selection ();
2013 2078
2079 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2080#if ENABLE_OVERLAY
2081 scr_swap_overlay ();
2082#endif
2083
2084 bool showcursor = screen.flags & Screen_VisibleCursor;
2085
2014 /* 2086 /*
2015 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
2016 */ 2088 */
2017 { 2089 {
2018 unsigned char setoldcursor; 2090 bool setoldcursor;
2019 2091
2020 showcursor = (screen.flags & Screen_VisibleCursor);
2021#ifdef CURSOR_BLINK 2092#ifdef CURSOR_BLINK
2022 if (hidden_cursor) 2093 if (hidden_cursor)
2023 showcursor = 0; 2094 showcursor = 0;
2024#endif 2095#endif
2025 2096
… …
2028 int col = screen.cur.col; 2099 int col = screen.cur.col;
2029 2100
2030 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2101 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2031 col--; 2102 col--;
2032 2103
2033 crp = &ROW(screen.cur.row).r[col]; 2104 cur_rend = ROW(screen.cur.row).r[col];
2105 cur_col = col;
2034 2106
2035#ifndef NO_CURSORCOLOR 2107#ifndef NO_CURSORCOLOR
2036 cc1 = *crp & (RS_fgMask | RS_bgMask);
2037 if (ISSET_PIXCOLOR (Color_cursor)) 2108 if (ISSET_PIXCOLOR (Color_cursor))
2038 ccol1 = Color_cursor; 2109 ccol1 = Color_cursor;
2039 else 2110 else
2040#endif 2111#endif
2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2112#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2053 ccol2 = bgcolor_of (rstyle); 2124 ccol2 = bgcolor_of (rstyle);
2054#else 2125#else
2055 ccol2 = Color_bg; 2126 ccol2 = Color_bg;
2056#endif 2127#endif
2057 2128
2058 if (showcursor && focus) 2129 if (focus)
2059 { 2130 {
2131 rend_t rend = cur_rend;
2132
2060 if (option (Opt_cursorUnderline)) 2133 if (option (Opt_cursorUnderline))
2061 *crp ^= RS_Uline; 2134 rend ^= RS_Uline;
2062 else 2135 else
2063 { 2136 {
2064 *crp ^= RS_RVid; 2137 rend ^= RS_RVid;
2065 *crp = SET_FGCOLOR (*crp, ccol1); 2138 rend = SET_FGCOLOR (rend, ccol1);
2066 *crp = SET_BGCOLOR (*crp, ccol2); 2139 rend = SET_BGCOLOR (rend, ccol2);
2067 } 2140 }
2141
2142 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2068 } 2143 }
2069 } 2144 }
2070 2145
2071 /* make sure no outline cursor is left around */ 2146 /* make sure no outline cursor is left around */
2072 setoldcursor = 0; 2147 setoldcursor = 0;
… …
2098 oldcursor.col = screen.cur.col; 2173 oldcursor.col = screen.cur.col;
2099 } 2174 }
2100 } 2175 }
2101 } 2176 }
2102 2177
2103 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2104#if ENABLE_OVERLAY
2105 scr_swap_overlay ();
2106#endif
2107
2108#ifndef NO_SLOW_LINK_SUPPORT 2178#ifndef NO_SLOW_LINK_SUPPORT
2109 /* 2179 /*
2110 * D: CopyArea pass - very useful for slower links 2180 * D: CopyArea pass - very useful for slower links
2111 * This has been deliberately kept simple. 2181 * This has been deliberately kept simple.
2112 */ 2182 */
… …
2116 { 2186 {
2117 int16_t nits; 2187 int16_t nits;
2118 int i = num_scr; 2188 int i = num_scr;
2119 int j; 2189 int j;
2120 int len, wlen; 2190 int len, wlen;
2121 dLocal (int, num_scr);
2122 2191
2123 j = nrow; 2192 j = nrow;
2124 wlen = len = -1; 2193 wlen = len = -1;
2125 row = i > 0 ? 0 : j - 1; 2194 row = i > 0 ? 0 : j - 1;
2126 2195
… …
2201 continue; 2270 continue;
2202 2271
2203 // redraw one or more characters 2272 // redraw one or more characters
2204 2273
2205 // seek to the beginning of wide characters 2274 // seek to the beginning of wide characters
2206 while (stp[col] == NOCHAR && col > 0) 2275 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2207 --col; 2276 --col;
2208 2277
2209 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2278 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2210 text_t *text = stp + col; 2279 text_t *text = stp + col;
2211 int count = 1; 2280 int count = 1;
2212 2281
2213 dtp[col] = stp[col]; 2282 dtp[col] = stp[col];
2214 drp[col] = rend; 2283 drp[col] = rend;
… …
2218 for (i = 0; ++col < ncol; ) 2287 for (i = 0; ++col < ncol; )
2219 { 2288 {
2220 if (stp[col] == NOCHAR) 2289 if (stp[col] == NOCHAR)
2221 { 2290 {
2222 dtp[col] = stp[col]; 2291 dtp[col] = stp[col];
2223 drp[col] = rend; 2292 drp[col] = srp[col];
2293
2224 count++; 2294 count++;
2225 i++; 2295 i++;
2226 2296
2227 continue; 2297 continue;
2228 } 2298 }
… …
2248 2318
2249 col--; /* went one too far. move back */ 2319 col--; /* went one too far. move back */
2250 count -= i; /* dump any matching trailing chars */ 2320 count -= i; /* dump any matching trailing chars */
2251 2321
2252 // sometimes we optimize away the trailing NOCHAR's, add them back 2322 // sometimes we optimize away the trailing NOCHAR's, add them back
2253 while (i && text[count] == NOCHAR) 2323 while (ecb_unlikely (i && text[count] == NOCHAR))
2254 count++, i--; 2324 count++, i--;
2255 2325
2256 /* 2326 /*
2257 * Determine the attributes for the string 2327 * Determine the attributes for the string
2258 */ 2328 */
2259 int fore = fgcolor_of (rend); // desired foreground 2329 int fore = fgcolor_of (rend); // desired foreground
2260 int back = bgcolor_of (rend); // desired background 2330 int back = bgcolor_of (rend); // desired background
2261 2331
2262 // only do special processing if any attributes are set, which is unlikely 2332 // only do special processing if any attributes are set, which is unlikely
2263 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2333 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2264 { 2334 {
2265 bool invert = rend & RS_RVid; 2335 bool invert = rend & RS_RVid;
2266 2336
2267#ifndef NO_BOLD_UNDERLINE_REVERSE 2337#ifndef NO_BOLD_UNDERLINE_REVERSE
2268 if (rend & RS_Bold && fore == Color_fg) 2338 if (rend & RS_Bold && fore == Color_fg)
… …
2287 2357
2288 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2358 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2289 fore = Color_UL; 2359 fore = Color_UL;
2290#endif 2360#endif
2291 2361
2362#ifdef OPTION_HC
2363 if (rend & RS_Sel)
2364 {
2365 /* invert the column if no highlightColor is set or it is the
2366 * current cursor column */
2367 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2368 && ISSET_PIXCOLOR (Color_HC))
2369 {
2370 if (ISSET_PIXCOLOR (Color_HTC))
2371 fore = Color_HTC;
2372 // if invert is 0 reverse video is set so we use bg color as fg color
2373 else if (!invert)
2374 fore = back;
2375
2376 back = Color_HC;
2377 invert = 0;
2378 }
2379 }
2380#endif
2381
2292 if (invert) 2382 if (invert)
2293 { 2383 {
2294#ifdef OPTION_HC
2295 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2296 || !ISSET_PIXCOLOR (Color_HC))
2297#endif
2298 /* invert the column if no highlightColor is set or it is the
2299 * current cursor column */
2300 ::swap (fore, back); 2384 ::swap (fore, back);
2301#ifdef OPTION_HC
2302 else if (ISSET_PIXCOLOR (Color_HC))
2303 back = Color_HC;
2304#endif
2305 2385
2306#ifndef NO_BOLD_UNDERLINE_REVERSE 2386#ifndef NO_BOLD_UNDERLINE_REVERSE
2307# ifndef OPTION_HC
2308 if (ISSET_PIXCOLOR (Color_RV))
2309 back = Color_RV;
2310# endif
2311 if (fore == back) 2387 if (fore == back)
2312 { 2388 {
2313 fore = Color_bg; 2389 fore = Color_bg;
2314 back = Color_fg; 2390 back = Color_fg;
2315 } 2391 }
… …
2351 /* 2427 /*
2352 * Actually do the drawing of the string here 2428 * Actually do the drawing of the string here
2353 */ 2429 */
2354 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2430 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2355 2431
2356 if (have_bg && back == Color_bg) 2432 if (ecb_likely (have_bg && back == Color_bg))
2357 { 2433 {
2358 // this is very ugly, maybe push it into ->draw? 2434 // this is very ugly, maybe push it into ->draw?
2359 2435
2360 for (i = 0; i < count; i++) /* don't draw empty strings */ 2436 for (i = 0; i < count; i++) /* don't draw empty strings */
2361 if (text[i] != ' ') 2437 if (text[i] != ' ')
… …
2368 did_clear: ; 2444 did_clear: ;
2369 } 2445 }
2370 else 2446 else
2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2447 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2372 2448
2373 if (rend & RS_Uline && font->descent > 1 && fore != back) 2449 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2374 { 2450 {
2375#if ENABLE_FRILLS 2451#if ENABLE_FRILLS
2376 if (ISSET_PIXCOLOR (Color_underline)) 2452 if (ISSET_PIXCOLOR (Color_underline))
2377 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2453 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2378 else 2454 else
2379#endif 2455#endif
2380 XSetForeground (dpy, gc, pix_colors[fore]); 2456 XSetForeground (dpy, gc, pix_colors[fore]);
2381 2457
2382 XDrawLine (dpy, drawBuffer, gc, 2458 XDrawLine (dpy, vt, gc,
2383 xpixel, ypixel + font->ascent + 1, 2459 xpixel, ypixel + font->ascent + 1,
2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2460 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2385 } 2461 }
2386 } /* for (col....) */ 2462 } /* for (col....) */
2387 } /* for (row....) */ 2463 } /* for (row....) */
2388 2464
2389#if ENABLE_OVERLAY
2390 scr_swap_overlay ();
2391#endif
2392 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2393
2394 /* 2465 /*
2395 * G: cleanup cursor and display outline cursor if necessary 2466 * G: cleanup cursor and display outline cursor if necessary
2396 */ 2467 */
2397 if (showcursor) 2468 if (showcursor)
2398 { 2469 {
2399 if (focus) 2470 if (focus)
2400 { 2471 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2401 if (option (Opt_cursorUnderline))
2402 *crp ^= RS_Uline;
2403 else
2404 {
2405 *crp ^= RS_RVid;
2406#ifndef NO_CURSORCOLOR
2407 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2408#endif
2409 }
2410 }
2411 else if (oldcursor.row >= 0) 2472 else if (oldcursor.row >= 0)
2412 { 2473 {
2413 int cursorwidth = 1; 2474 int cursorwidth = 1;
2414 int col = oldcursor.col; 2475 int col = oldcursor.col;
2415 2476
… …
2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2486 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else 2487 else
2427#endif 2488#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]); 2489 XSetForeground (dpy, gc, pix_colors[ccol1]);
2429 2490
2430 XDrawRectangle (dpy, drawBuffer, gc, 2491 XDrawRectangle (dpy, vt, gc,
2431 Col2Pixel (col), 2492 Col2Pixel (col),
2432 Row2Pixel (oldcursor.row), 2493 Row2Pixel (oldcursor.row),
2433 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2494 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2495 (unsigned int) (Height2Pixel (1) - 1));
2435 } 2496 }
2436 } 2497 }
2437 2498
2438 /* 2499 /*
2439 * H: cleanup selection 2500 * H: cleanup selection
2440 */ 2501 */
2502#if ENABLE_OVERLAY
2503 scr_swap_overlay ();
2504#endif
2505 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2506
2441 scr_reverse_selection (); 2507 scr_reverse_selection ();
2442 2508
2509 screen.flags = old_screen_flags;
2443 num_scr = 0; 2510 num_scr = 0;
2444 num_scr_allow = 1; 2511 num_scr_allow = 1;
2445} 2512}
2446 2513
2447void 2514void ecb_cold
2448rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2515rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2449{ 2516{
2450 if (!l.t) 2517 if (!l.valid ())
2451 return; 2518 return;
2452 2519
2453 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2520 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2454 2521
2455 for (int i = ncol; i--; ) 2522 for (int i = ncol; i--; )
2456 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2523 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2457} 2524}
2458 2525
2459void 2526void ecb_cold
2460rxvt_term::scr_remap_chars () NOTHROW 2527rxvt_term::scr_remap_chars () NOTHROW
2461{ 2528{
2462 for (int i = total_rows; i--; ) 2529 for (int i = total_rows; i--; )
2463 scr_remap_chars (row_buf [i]); 2530 scr_remap_chars (row_buf [i]);
2464 2531
… …
2467 scr_remap_chars (drawn_buf [i]); 2534 scr_remap_chars (drawn_buf [i]);
2468 scr_remap_chars (swap_buf [i]); 2535 scr_remap_chars (swap_buf [i]);
2469 } 2536 }
2470} 2537}
2471 2538
2472void 2539void ecb_cold
2473rxvt_term::scr_recolour () NOTHROW 2540rxvt_term::scr_recolour (bool refresh) NOTHROW
2474{ 2541{
2475#ifdef HAVE_BG_PIXMAP 2542 bool transparent = false;
2476 bgPixmap.apply ();
2477#else
2478 2543
2544#ifdef HAVE_IMG
2545 if (bg_img != 0)
2546 {
2547# if ENABLE_TRANSPARENCY
2548 if (bg_flags & BG_IS_TRANSPARENT)
2549 {
2550 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2551 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2552
2553 transparent = true;
2554 }
2555 else
2556# endif
2557 {
2558 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2559 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2560 }
2561 }
2562 else
2563#endif
2564 {
2479 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2565 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2480 XClearWindow (dpy, parent[0]);
2481 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2566 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2567 }
2482 2568
2483# if HAVE_SCROLLBARS 2569 XClearWindow (dpy, parent);
2570
2484 if (scrollBar.win) 2571 if (scrollBar.win)
2485 { 2572 {
2573 if (transparent)
2574 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2575 else
2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2576 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2487 scrollBar.setIdle (); 2577 scrollBar.state = SB_STATE_IDLE;
2488 scrollbar_show (0); 2578 scrollBar.show (0);
2489 } 2579 }
2490# endif
2491 2580
2581 if (refresh)
2582 {
2492 scr_clear (); 2583 scr_clear ();
2493 scr_touch (true); 2584 scr_touch (true);
2585 }
2494 want_refresh = 1; 2586 want_refresh = 1;
2495
2496#endif
2497} 2587}
2498 2588
2499/* ------------------------------------------------------------------------- */ 2589/* ------------------------------------------------------------------------- */
2500void 2590void
2501rxvt_term::scr_clear (bool really) NOTHROW 2591rxvt_term::scr_clear (bool really) NOTHROW
… …
2557 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2647 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2558 srp[col] ^= rstyle; 2648 srp[col] ^= rstyle;
2559} 2649}
2560 2650
2561/* ------------------------------------------------------------------------- */ 2651/* ------------------------------------------------------------------------- */
2562void 2652void ecb_hot
2563rxvt_term::scr_reverse_selection () NOTHROW 2653rxvt_term::scr_reverse_selection () NOTHROW
2564{ 2654{
2565 if (selection.op 2655 if (selection.op
2566 && current_screen == selection.screen 2656 && current_screen == selection.screen
2567 && selection.end.row >= view_start) 2657 && selection.end.row >= view_start)
2568 { 2658 {
2569#if !ENABLE_MINIMAL 2659#if !ENABLE_MINIMAL
2570 if (selection.rect) 2660 if (selection.rect)
2571 scr_xor_rect (selection.beg.row, selection.beg.col, 2661 scr_xor_rect (selection.beg.row, selection.beg.col,
2572 selection.end.row, selection.end.col, 2662 selection.end.row, selection.end.col,
2573 RS_RVid, RS_RVid | RS_Uline); 2663 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2574 else 2664 else
2575#endif 2665#endif
2576 scr_xor_span (selection.beg.row, selection.beg.col, 2666 scr_xor_span (selection.beg.row, selection.beg.col,
2577 selection.end.row, selection.end.col, 2667 selection.end.row, selection.end.col,
2578 RS_RVid); 2668 RS_Sel | RS_RVid);
2579 } 2669 }
2580} 2670}
2581 2671
2582/* ------------------------------------------------------------------------- */ 2672/* ------------------------------------------------------------------------- */
2583/* 2673/*
… …
2586 */ 2676 */
2587#if 0 2677#if 0
2588void 2678void
2589rxvt_term::scr_dump (int fd) NOTHROW 2679rxvt_term::scr_dump (int fd) NOTHROW
2590{ 2680{
2591 int row, wrote; 2681 // if this method is needed, it can be implemented by factoring the
2592 unsigned int width, towrite; 2682 // relevant code in scr_printscreen
2593 char r1[] = "\n";
2594
2595 for (row = saveLines - nsaved;
2596 row < saveLines + nrow - 1; row++)
2597 {
2598 width = row_buf[row].l >= 0 ? row_buf[row].l
2599 : ncol;
2600 for (towrite = width; towrite; towrite -= wrote)
2601 {
2602 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2603 towrite);
2604 if (wrote < 0)
2605 return; /* XXX: death, no report */
2606 }
2607 if (row_buf[row].l >= 0)
2608 if (write (fd, r1, 1) <= 0)
2609 return; /* XXX: death, no report */
2610 }
2611} 2683}
2612#endif 2684#endif
2613 2685
2614/* ------------------------------------------------------------------------- * 2686/* ------------------------------------------------------------------------- *
2615 * CHARACTER SELECTION * 2687 * CHARACTER SELECTION *
2616 * ------------------------------------------------------------------------- */ 2688 * ------------------------------------------------------------------------- */
2617void 2689void
2618rxvt_term::selection_check (int check_more) NOTHROW 2690rxvt_term::selection_check (int check_more) NOTHROW
2619{ 2691{
2620 row_col_t pos;
2621
2622 if (!selection.op) 2692 if (!selection.op)
2623 return; 2693 return;
2624 2694
2625 pos.row = pos.col = 0;
2626 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2695 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2627 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2696 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2628 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2697 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2629 || (check_more == 1 2698 || (check_more == 1
2630 && current_screen == selection.screen 2699 && current_screen == selection.screen
2631 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2700 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2632 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2701 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2633 || (check_more == 2
2634 && ROWCOL_IS_BEFORE (selection.beg, pos)
2635 && ROWCOL_IS_AFTER (selection.end, pos))
2636 || (check_more == 3
2637 && ROWCOL_IS_AFTER (selection.end, pos))
2638 || (check_more == 4 /* screen width change */
2639 && (selection.beg.row != selection.end.row
2640 || selection.end.col > ncol)))
2641 CLEAR_SELECTION (); 2702 CLEAR_ALL_SELECTION ();
2703}
2704
2705void
2706rxvt_term::selection_changed () NOTHROW
2707{
2708 line_t &r1 = ROW (selection.beg.row);
2709 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2710 --selection.beg.col;
2711
2712 line_t &r2 = ROW (selection.end.row);
2713 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2714 ++selection.end.col;
2715
2716 want_refresh = 1;
2642} 2717}
2643 2718
2644/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2645/* 2720/*
2646 * Paste a selection direct to the command fd 2721 * Paste a selection direct to the command fd
2647 */ 2722 */
2648void 2723void
2649rxvt_term::paste (char *data, unsigned int len) NOTHROW 2724rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2650{ 2725{
2651 /* convert normal newline chars into common keyboard Return key sequence */ 2726 /* convert normal newline chars into common keyboard Return key sequence */
2652 for (unsigned int i = 0; i < len; i++) 2727 for (unsigned int i = 0; i < len; i++)
2653 if (data[i] == C0_LF) 2728 if (data[i] == C0_LF)
2654 data[i] = C0_CR; 2729 data[i] = C0_CR;
2655 2730
2731 if (priv_modes & PrivMode_BracketPaste)
2732 tt_printf ("\x1b[200~");
2733
2656 tt_write (data, len); 2734 tt_write (data, len);
2657}
2658 2735
2659/* ------------------------------------------------------------------------- */ 2736 if (priv_modes & PrivMode_BracketPaste)
2660/* 2737 tt_printf ("\x1b[201~");
2661 * Respond to a notification that a primary selection has been sent
2662 * EXT: SelectionNotify
2663 */
2664void
2665rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2666{
2667 if (prop == None) /* check for failed XConvertSelection */
2668 {
2669 if ((selection_type & Sel_CompoundText))
2670 {
2671 int selnum = selection_type & Sel_whereMask;
2672
2673 selection_type = 0;
2674 if (selnum != Sel_direct)
2675 selection_request_other (XA_STRING, selnum);
2676 }
2677
2678 if ((selection_type & Sel_UTF8String))
2679 {
2680 int selnum = selection_type & Sel_whereMask;
2681
2682 selection_type = Sel_CompoundText;
2683 if (selnum != Sel_direct)
2684 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2685 else
2686 selection_type = 0;
2687 }
2688
2689 return;
2690 }
2691
2692 unsigned long bytes_after;
2693 XTextProperty ct;
2694
2695 if (XGetWindowProperty (dpy, win, prop,
2696 0, PROP_SIZE / 4,
2697 delete_prop, AnyPropertyType,
2698 &ct.encoding, &ct.format,
2699 &ct.nitems, &bytes_after,
2700 &ct.value) != Success)
2701 {
2702 ct.value = 0;
2703 goto bailout;
2704 }
2705
2706 if (ct.encoding == None)
2707 goto bailout;
2708
2709 if (bytes_after)
2710 {
2711 // fetch and append remaining data
2712 XTextProperty ct2;
2713
2714 if (XGetWindowProperty (dpy, win, prop,
2715 ct.nitems / 4, (bytes_after + 3) / 4,
2716 delete_prop, AnyPropertyType,
2717 &ct2.encoding, &ct2.format,
2718 &ct2.nitems, &bytes_after,
2719 &ct2.value) != Success)
2720 goto bailout;
2721
2722 // realloc should be compatible to XFree, here, and elsewhere, too
2723 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2724 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2725 ct.nitems += ct2.nitems;
2726
2727 XFree (ct2.value);
2728 }
2729
2730 if (ct.value == 0)
2731 goto bailout;
2732
2733 if (ct.encoding == xa[XA_INCR])
2734 {
2735 // INCR selection, start handshake
2736 if (!delete_prop)
2737 XDeleteProperty (dpy, win, prop);
2738
2739 selection_wait = Sel_incr;
2740 incr_buf_fill = 0;
2741 incr_ev.start (10);
2742
2743 goto bailout;
2744 }
2745
2746 if (ct.nitems == 0)
2747 {
2748 if (selection_wait == Sel_incr)
2749 {
2750 XFree (ct.value);
2751
2752 // finally complete, now paste the whole thing
2753 selection_wait = Sel_normal;
2754 ct.value = (unsigned char *)incr_buf;
2755 ct.nitems = incr_buf_fill;
2756 incr_buf = 0;
2757 incr_buf_size = 0;
2758 incr_ev.stop ();
2759 }
2760 else
2761 {
2762 if (selection_wait == Sel_normal
2763 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2764 {
2765 /*
2766 * pass through again trying CUT_BUFFER0 if we've come from
2767 * XConvertSelection () but nothing was presented
2768 */
2769 selection_paste (display->root, XA_CUT_BUFFER0, False);
2770 }
2771
2772 goto bailout;
2773 }
2774 }
2775 else if (selection_wait == Sel_incr)
2776 {
2777 incr_ev.start (10);
2778
2779 while (incr_buf_fill + ct.nitems > incr_buf_size)
2780 {
2781 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2782 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2783 }
2784
2785 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2786 incr_buf_fill += ct.nitems;
2787
2788 goto bailout;
2789 }
2790
2791 char **cl;
2792 int cr;
2793
2794#if !ENABLE_MINIMAL
2795 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2796 // so recode it manually
2797 if (ct.encoding == xa[XA_UTF8_STRING])
2798 {
2799 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2800 char *s = rxvt_wcstombs (w);
2801 free (w);
2802 // TODO: strlen == only the first element will be converted. well...
2803 paste (s, strlen (s));
2804 free (s);
2805 }
2806 else
2807#endif
2808 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2809 && cl)
2810 {
2811 for (int i = 0; i < cr; i++)
2812 paste (cl[i], strlen (cl[i]));
2813
2814 XFreeStringList (cl);
2815 }
2816 else
2817 paste ((char *)ct.value, ct.nitems); // paste raw
2818
2819bailout:
2820 XFree (ct.value);
2821
2822 if (selection_wait == Sel_normal)
2823 selection_wait = Sel_none;
2824} 2738}
2825 2739
2826void 2740void
2827rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW 2741rxvt_term::paste (char *data, unsigned int len) NOTHROW
2828{ 2742{
2829 selection_wait = Sel_none; 2743 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2830
2831 incr_buf_size = 0;
2832 free (incr_buf);
2833
2834 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2835}
2836
2837void
2838rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2839{
2840 if (prop == None || selection_wait != Sel_incr)
2841 return; 2744 return;
2842 2745
2843 selection_paste (win, prop, true); 2746 tt_paste (data, len);
2844} 2747}
2845 2748
2846/* ------------------------------------------------------------------------- */ 2749/* ------------------------------------------------------------------------- */
2847/* 2750/*
2848 * Request the current selection: 2751 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2849 * Order: > internal selection if available 2752 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2850 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2753 * as fallback
2851 * > CUT_BUFFER0
2852 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2853 * will auto fallback to CUT_BUFFER0
2854 * EXT: button 2 release 2754 * EXT: button 2 release
2855 */ 2755 */
2856void 2756void
2857rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2757rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2858{ 2758{
2859 if (selection.text && selnum == Sel_Primary) 2759 if (!selection_req)
2860 {
2861 /* internal selection */
2862 char *str = rxvt_wcstombs (selection.text, selection.len);
2863 paste (str, strlen (str));
2864 free (str);
2865 return;
2866 } 2760 {
2867 else 2761 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2762 selection_req->run ();
2868 { 2763 }
2869 selection_request_time = tm;
2870 selection_wait = Sel_normal;
2871
2872#if X_HAVE_UTF8_STRING
2873 selection_type = Sel_UTF8String;
2874 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2875 return;
2876#else
2877 selection_type = Sel_CompoundText;
2878 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2879 return;
2880#endif
2881 }
2882
2883 selection_wait = Sel_none; /* don't loop in selection_paste () */
2884 selection_paste (display->root, XA_CUT_BUFFER0, false);
2885}
2886
2887int
2888rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2889{
2890 Atom sel;
2891
2892 selection_type |= selnum;
2893
2894 if (selnum == Sel_Primary)
2895 sel = XA_PRIMARY;
2896 else if (selnum == Sel_Secondary)
2897 sel = XA_SECONDARY;
2898 else
2899 sel = xa[XA_CLIPBOARD];
2900
2901 if (XGetSelectionOwner (dpy, sel) != None)
2902 {
2903 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2904 vt, selection_request_time);
2905 return 1;
2906 }
2907
2908 return 0;
2909} 2764}
2910 2765
2911/* ------------------------------------------------------------------------- */ 2766/* ------------------------------------------------------------------------- */
2912/* 2767/*
2913 * Clear all selected text 2768 * Clear all selected text
2914 * EXT: SelectionClear 2769 * EXT: SelectionClear
2915 */ 2770 */
2916void 2771void
2917rxvt_term::selection_clear () NOTHROW 2772rxvt_term::selection_clear (bool clipboard) NOTHROW
2918{ 2773{
2774 if (!clipboard)
2775 {
2919 want_refresh = 1; 2776 want_refresh = 1;
2920 free (selection.text); 2777 free (selection.text);
2921 selection.text = NULL; 2778 selection.text = NULL;
2922 selection.len = 0; 2779 selection.len = 0;
2923 CLEAR_SELECTION (); 2780 CLEAR_SELECTION ();
2924 2781
2925 if (display->selection_owner == this) 2782 if (display->selection_owner == this)
2926 display->selection_owner = 0; 2783 display->selection_owner = 0;
2784 }
2785 else
2786 {
2787 free (selection.clip_text);
2788 selection.clip_text = NULL;
2789 selection.clip_len = 0;
2790
2791 if (display->clipboard_owner == this)
2792 display->clipboard_owner = 0;
2793 }
2927} 2794}
2928 2795
2929/* ------------------------------------------------------------------------- */ 2796/* ------------------------------------------------------------------------- */
2930/* 2797/*
2931 * Copy a selection into the cut buffer 2798 * Copy a selection into the cut buffer
2932 * EXT: button 1 or 3 release 2799 * EXT: button 1 or 3 release
2933 */ 2800 */
2934void 2801void
2935rxvt_term::selection_make (Time tm) 2802rxvt_term::selection_make (Time tm)
2936{ 2803{
2937 int i; 2804 int size;
2938 wchar_t *new_selection_text; 2805 wchar_t *new_selection_text;
2939 text_t *t; 2806 text_t *t;
2940 2807
2941 switch (selection.op) 2808 switch (selection.op)
2942 { 2809 {
… …
2958 return; /* nothing selected, go away */ 2825 return; /* nothing selected, go away */
2959 2826
2960 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2827 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2961 return; 2828 return;
2962 2829
2963 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2830 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2964 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2831 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2965 2832
2966 int ofs = 0; 2833 int ofs = 0;
2967 int extra = 0; 2834 int extra = 0;
2968 2835
2969 int col = selection.beg.col; 2836 int col = selection.beg.col;
… …
2975 { 2842 {
2976#if !ENABLE_MINIMAL 2843#if !ENABLE_MINIMAL
2977 if (selection.rect) 2844 if (selection.rect)
2978 { 2845 {
2979 col = selection.beg.col; 2846 col = selection.beg.col;
2980 end_col = ncol + 1; 2847 end_col = selection.end.col;
2981 } 2848 }
2982 else 2849 else
2983#endif 2850#endif
2984 end_col = ROW(row).l; 2851 end_col = ROW(row).l;
2985 2852
2986 col = max (col, 0); 2853 col = max (col, 0);
2987 2854
2988 if (row == selection.end.row 2855 if (row == selection.end.row)
2989#if !ENABLE_MINIMAL
2990 || selection.rect
2991#endif
2992 )
2993 min_it (end_col, selection.end.col); 2856 min_it (end_col, selection.end.col);
2994 2857
2995 t = ROW(row).t + col; 2858 t = ROW(row).t + col;
2996 2859
2997 for (; col < end_col; col++) 2860 for (; col < end_col; col++)
… …
3005 2868
3006 extra -= (len - 1); 2869 extra -= (len - 1);
3007 2870
3008 if (extra < 0) 2871 if (extra < 0)
3009 { 2872 {
3010 extra += i; 2873 extra += size;
3011 i += i; 2874 size += size;
3012 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2875 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3013 } 2876 }
3014 2877
3015 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2878 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3016 } 2879 }
3017#endif 2880#endif
… …
3029 2892
3030 new_selection_text[ofs++] = C0_LF; 2893 new_selection_text[ofs++] = C0_LF;
3031 } 2894 }
3032 else 2895 else
3033#endif 2896#endif
3034 if (!ROW(row).is_longer () && row != selection.end.row) 2897 if (!ROW(row).is_longer ()
2898 && (row != selection.end.row || end_col != selection.end.col)
2899 && (row != selection.beg.row || selection.beg.col < ncol))
3035 new_selection_text[ofs++] = C0_LF; 2900 new_selection_text[ofs++] = C0_LF;
3036 } 2901 }
3037
3038 if (end_col != selection.end.col)
3039 new_selection_text[ofs++] = C0_LF;
3040 2902
3041 new_selection_text[ofs] = 0; 2903 new_selection_text[ofs] = 0;
3042 2904
3043 if (ofs == 0) 2905 if (ofs == 0)
3044 { 2906 {
… …
3057 2919
3058 selection_grab (tm); 2920 selection_grab (tm);
3059} 2921}
3060 2922
3061bool 2923bool
3062rxvt_term::selection_grab (Time tm) NOTHROW 2924rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3063{ 2925{
2926 Atom sel;
2927
2928 if (!clipboard)
2929 {
3064 selection_time = tm; 2930 selection_time = tm;
2931 sel = XA_PRIMARY;
2932 }
2933 else
2934 {
2935 clipboard_time = tm;
2936 sel = xa[XA_CLIPBOARD];
2937 }
3065 2938
3066 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2939 XSetSelectionOwner (dpy, sel, vt, tm);
3067 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2940 if (XGetSelectionOwner (dpy, sel) == vt)
3068 { 2941 {
3069 display->set_selection_owner (this); 2942 display->set_selection_owner (this, clipboard);
3070 return true; 2943 return true;
3071 } 2944 }
3072 else 2945 else
3073 { 2946 {
3074 selection_clear (); 2947 selection_clear (clipboard);
3075 return false; 2948 return false;
3076 } 2949 }
3077 2950
3078#if 0 2951#if 0
3079 XTextProperty ct; 2952 XTextProperty ct;
… …
3089/* ------------------------------------------------------------------------- */ 2962/* ------------------------------------------------------------------------- */
3090/* 2963/*
3091 * Mark or select text based upon number of clicks: 1, 2, or 3 2964 * Mark or select text based upon number of clicks: 1, 2, or 3
3092 * EXT: button 1 press 2965 * EXT: button 1 press
3093 */ 2966 */
3094void 2967void ecb_cold
3095rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2968rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3096{ 2969{
3097 clicks = ((clicks - 1) % 3) + 1; 2970 clicks = ((clicks - 1) % 3) + 1;
3098 selection.clicks = clicks; /* save clicks so extend will work */ 2971 selection.clicks = clicks; /* save clicks so extend will work */
3099 2972
… …
3118 2991
3119/* ------------------------------------------------------------------------- */ 2992/* ------------------------------------------------------------------------- */
3120/* 2993/*
3121 * Mark a selection at the specified col/row 2994 * Mark a selection at the specified col/row
3122 */ 2995 */
3123void 2996void ecb_cold
3124rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2997rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3125{ 2998{
3126 want_refresh = 1; 2999 want_refresh = 1;
3127 3000
3128 selection.mark.row = row + view_start; 3001 selection.mark.row = row + view_start;
… …
3151 * Word select: select text for 2 clicks 3024 * Word select: select text for 2 clicks
3152 * We now only find out the boundary in one direction 3025 * We now only find out the boundary in one direction
3153 */ 3026 */
3154 3027
3155/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3028/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3156#define DELIMIT_TEXT(x) \ 3029#define DELIMIT_TEXT(x) \
3157 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3030 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3158#define DELIMIT_REND(x) 1 3031#define DELIMIT_REND(x) 1
3159 3032
3160void 3033void ecb_cold
3161rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3034rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3162{ 3035{
3163 int col, row, dirnadd, tcol, trow, w1, w2; 3036 int col, row, dirnadd, tcol, trow, w1, w2;
3164 row_col_t bound; 3037 row_col_t bound;
3165 text_t *stp; 3038 text_t *stp;
… …
3239 * EXT: button 3 press; button 1 or 3 drag 3112 * EXT: button 3 press; button 1 or 3 drag
3240 * flag == 0 ==> button 1 3113 * flag == 0 ==> button 1
3241 * flag == 1 ==> button 3 press 3114 * flag == 1 ==> button 3 press
3242 * flag == 2 ==> button 3 motion 3115 * flag == 2 ==> button 3 motion
3243 */ 3116 */
3244void 3117void ecb_cold
3245rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3118rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3246{ 3119{
3247 int col = clamp (Pixel2Col (x), 0, ncol); 3120 int col = clamp (Pixel2Col (x), 0, ncol);
3248 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3121 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3249 3122
… …
3275 3148
3276/* ------------------------------------------------------------------------- */ 3149/* ------------------------------------------------------------------------- */
3277/* 3150/*
3278 * Extend the selection to the specified col/row 3151 * Extend the selection to the specified col/row
3279 */ 3152 */
3280void 3153void ecb_cold
3281rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3154rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3282{ 3155{
3283 row_col_t pos; 3156 row_col_t pos;
3284 enum { 3157 enum {
3285 LEFT, RIGHT 3158 LEFT, RIGHT
3286 } closeto = RIGHT; 3159 } closeto = RIGHT;
3287
3288 want_refresh = 1;
3289 3160
3290 switch (selection.op) 3161 switch (selection.op)
3291 { 3162 {
3292 case SELECTION_INIT: 3163 case SELECTION_INIT:
3293 CLEAR_SELECTION (); 3164 CLEAR_SELECTION ();
… …
3473 3344
3474#if !ENABLE_MINIMAL 3345#if !ENABLE_MINIMAL
3475 if (selection.rect && selection.beg.col > selection.end.col) 3346 if (selection.rect && selection.beg.col > selection.end.col)
3476 ::swap (selection.beg.col, selection.end.col); 3347 ::swap (selection.beg.col, selection.end.col);
3477#endif 3348#endif
3349
3350 selection_changed ();
3478} 3351}
3479 3352
3480#if !ENABLE_MINIMAL 3353#if !ENABLE_MINIMAL
3481void 3354void ecb_cold
3482rxvt_term::selection_remove_trailing_spaces () NOTHROW 3355rxvt_term::selection_remove_trailing_spaces () NOTHROW
3483{ 3356{
3484 int32_t end_col, end_row; 3357 int32_t end_col, end_row;
3485 text_t *stp; 3358 text_t *stp;
3486 3359
… …
3524/* ------------------------------------------------------------------------- */ 3397/* ------------------------------------------------------------------------- */
3525/* 3398/*
3526 * Double click on button 3 when already selected 3399 * Double click on button 3 when already selected
3527 * EXT: button 3 double click 3400 * EXT: button 3 double click
3528 */ 3401 */
3529void 3402void ecb_cold
3530rxvt_term::selection_rotate (int x, int y) NOTHROW 3403rxvt_term::selection_rotate (int x, int y) NOTHROW
3531{ 3404{
3532 selection.clicks = selection.clicks % 3 + 1; 3405 selection.clicks = selection.clicks % 3 + 1;
3533 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3406 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3534} 3407}
… …
3536/* ------------------------------------------------------------------------- */ 3409/* ------------------------------------------------------------------------- */
3537/* 3410/*
3538 * Respond to a request for our current selection 3411 * Respond to a request for our current selection
3539 * EXT: SelectionRequest 3412 * EXT: SelectionRequest
3540 */ 3413 */
3541void 3414void ecb_cold
3542rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3415rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3543{ 3416{
3417 Atom property = rq.property == None ? rq.target : rq.property;
3544 XSelectionEvent ev; 3418 XSelectionEvent ev;
3545 3419
3546 ev.type = SelectionNotify; 3420 ev.type = SelectionNotify;
3547 ev.property = None; 3421 ev.property = None;
3548 ev.display = rq.display; 3422 ev.display = rq.display;
… …
3563 *target++ = xa[XA_COMPOUND_TEXT]; 3437 *target++ = xa[XA_COMPOUND_TEXT];
3564#if X_HAVE_UTF8_STRING 3438#if X_HAVE_UTF8_STRING
3565 *target++ = xa[XA_UTF8_STRING]; 3439 *target++ = xa[XA_UTF8_STRING];
3566#endif 3440#endif
3567 3441
3568 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3442 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3569 32, PropModeReplace, 3443 32, PropModeReplace,
3570 (unsigned char *)target_list, target - target_list); 3444 (unsigned char *)target_list, target - target_list);
3571 ev.property = rq.property; 3445 ev.property = property;
3572 } 3446 }
3573#if TODO // TODO 3447#if TODO // TODO
3574 else if (rq.target == xa[XA_MULTIPLE]) 3448 else if (rq.target == xa[XA_MULTIPLE])
3575 { 3449 {
3576 /* TODO: Handle MULTIPLE */ 3450 /* TODO: Handle MULTIPLE */
3577 } 3451 }
3578#endif 3452#endif
3579 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3453 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3580 { 3454 {
3581 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3455 XChangeProperty (dpy, rq.requestor, property, rq.target,
3582 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3456 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3583 ev.property = rq.property; 3457 ev.property = property;
3458 }
3459 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3460 {
3461 XChangeProperty (dpy, rq.requestor, property, rq.target,
3462 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3463 ev.property = property;
3584 } 3464 }
3585 else if (rq.target == XA_STRING 3465 else if (rq.target == XA_STRING
3586 || rq.target == xa[XA_TEXT] 3466 || rq.target == xa[XA_TEXT]
3587 || rq.target == xa[XA_COMPOUND_TEXT] 3467 || rq.target == xa[XA_COMPOUND_TEXT]
3588 || rq.target == xa[XA_UTF8_STRING] 3468 || rq.target == xa[XA_UTF8_STRING]
… …
3620 { 3500 {
3621 target = xa[XA_COMPOUND_TEXT]; 3501 target = xa[XA_COMPOUND_TEXT];
3622 style = enc_compound_text; 3502 style = enc_compound_text;
3623 } 3503 }
3624 3504
3625 if (selection.text) 3505 if (rq.selection == XA_PRIMARY && selection.text)
3626 { 3506 {
3627 cl = selection.text; 3507 cl = selection.text;
3628 selectlen = selection.len; 3508 selectlen = selection.len;
3509 }
3510 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3511 {
3512 cl = selection.clip_text;
3513 selectlen = selection.clip_len;
3629 } 3514 }
3630 else 3515 else
3631 { 3516 {
3632 cl = L""; 3517 cl = L"";
3633 selectlen = 0; 3518 selectlen = 0;
… …
3654 ct.value = (unsigned char *)cl; 3539 ct.value = (unsigned char *)cl;
3655 ct.nitems = selectlen; 3540 ct.nitems = selectlen;
3656 ct.encoding = target; 3541 ct.encoding = target;
3657 } 3542 }
3658 3543
3659 XChangeProperty (dpy, rq.requestor, rq.property, 3544 XChangeProperty (dpy, rq.requestor, property,
3660 ct.encoding, 8, PropModeReplace, 3545 ct.encoding, 8, PropModeReplace,
3661 ct.value, (int)ct.nitems); 3546 ct.value, (int)ct.nitems);
3662 ev.property = rq.property; 3547 ev.property = property;
3663 3548
3664 if (freect) 3549 if (freect)
3665 XFree (ct.value); 3550 XFree (ct.value);
3666 } 3551 }
3667 3552
3668 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3553 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3669} 3554}
3670 3555
3671/* ------------------------------------------------------------------------- */ 3556/* ------------------------------------------------------------------------- */
3672#ifdef USE_XIM 3557#if USE_XIM
3673void 3558void ecb_cold
3674rxvt_term::im_set_position (XPoint &pos) NOTHROW 3559rxvt_term::im_set_position (XPoint &pos) NOTHROW
3675{ 3560{
3676 XWindowAttributes xwa; 3561 XWindowAttributes xwa;
3677 3562
3678 XGetWindowAttributes (dpy, vt, &xwa); 3563 XGetWindowAttributes (dpy, vt, &xwa);
… …
3701 h += 2; min_it (h, nrow); 3586 h += 2; min_it (h, nrow);
3702 3587
3703 x -= 1; clamp_it (x, 0, ncol - w); 3588 x -= 1; clamp_it (x, 0, ncol - w);
3704 y -= 1; clamp_it (y, 0, nrow - h); 3589 y -= 1; clamp_it (y, 0, nrow - h);
3705 3590
3706 ov_x = x; ov_y = y; 3591 ov.x = x; ov.y = y;
3707 ov_w = w; ov_h = h; 3592 ov.w = w; ov.h = h;
3708 3593
3709 ov_text = new text_t *[h]; 3594 ov.text = new text_t *[h];
3710 ov_rend = new rend_t *[h]; 3595 ov.rend = new rend_t *[h];
3711 3596
3712 for (y = 0; y < h; y++) 3597 for (y = 0; y < h; y++)
3713 { 3598 {
3714 text_t *tp = ov_text[y] = new text_t[w]; 3599 text_t *tp = ov.text[y] = new text_t[w];
3715 rend_t *rp = ov_rend[y] = new rend_t[w]; 3600 rend_t *rp = ov.rend[y] = new rend_t[w];
3716 3601
3717 text_t t0, t1, t2; 3602 text_t t0, t1, t2;
3718 rend_t r = OVERLAY_RSTYLE; 3603 rend_t r = OVERLAY_RSTYLE;
3719 3604
3720 if (y == 0) 3605 if (y == 0)
… …
3739} 3624}
3740 3625
3741void 3626void
3742rxvt_term::scr_overlay_off () NOTHROW 3627rxvt_term::scr_overlay_off () NOTHROW
3743{ 3628{
3744 if (!ov_text) 3629 if (!ov.text)
3745 return; 3630 return;
3746 3631
3747 want_refresh = 1; 3632 want_refresh = 1;
3748 3633
3749 for (int y = 0; y < ov_h; y++) 3634 for (int y = 0; y < ov.h; y++)
3750 { 3635 {
3751 delete [] ov_text[y]; 3636 delete [] ov.text[y];
3752 delete [] ov_rend[y]; 3637 delete [] ov.rend[y];
3753 } 3638 }
3754 3639
3755 delete [] ov_text; ov_text = 0; 3640 delete [] ov.text; ov.text = 0;
3756 delete [] ov_rend; ov_rend = 0; 3641 delete [] ov.rend; ov.rend = 0;
3757} 3642}
3758 3643
3759void 3644void
3760rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3645rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3761{ 3646{
3762 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3647 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3763 return; 3648 return;
3764 3649
3765 x++, y++; 3650 x++, y++;
3766 3651
3767 ov_text[y][x] = text; 3652 ov.text[y][x] = text;
3768 ov_rend[y][x] = rend; 3653 ov.rend[y][x] = rend;
3769} 3654}
3770 3655
3771void 3656void
3772rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3657rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3773{ 3658{
… …
3792} 3677}
3793 3678
3794void 3679void
3795rxvt_term::scr_swap_overlay () NOTHROW 3680rxvt_term::scr_swap_overlay () NOTHROW
3796{ 3681{
3797 if (!ov_text) 3682 if (!ov.text)
3798 return; 3683 return;
3799 3684
3685 // hide cursor if it is within the overlay area
3686 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3687 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3688 screen.flags &= ~Screen_VisibleCursor;
3689
3800 // swap screen mem with overlay 3690 // swap screen mem with overlay
3801 for (int y = ov_h; y--; ) 3691 for (int y = ov.h; y--; )
3802 { 3692 {
3803 text_t *t1 = ov_text[y]; 3693 text_t *t1 = ov.text[y];
3804 rend_t *r1 = ov_rend[y]; 3694 rend_t *r1 = ov.rend[y];
3805 3695
3806 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3696 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3807 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3697 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3808 3698
3809 for (int x = ov_w; x--; ) 3699 for (int x = ov.w; x--; )
3810 { 3700 {
3811 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3701 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3812 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3702 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3813 } 3703 }
3814 } 3704 }

Diff Legend

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