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.315 by root, Tue Nov 4 14:38:29 2008 UTC vs.
Revision 1.422 by root, Thu Jun 28 15:19:15 2012 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 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_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
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
143 col--; 140 col--;
144 141
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 142 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 144
145 l.touch ();
146
148 // found begin, nuke 147 // found start, nuke
149 do { 148 do {
150 l.t[col] = ' '; 149 l.t[col] = ' ';
151 l.r[col] = rend; 150 l.r[col] = rend;
152 col++; 151 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
… …
156/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
159 158
160void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = chunk_alloc (chunk_size, 0);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
161rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
162{ 195{
163#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
164 scr_overlay_off (); 197 scr_overlay_off ();
165#endif 198#endif
166 199
167 rvideo_mode = false;
168 view_start = 0; 200 view_start = 0;
169 num_scr = 0; 201 num_scr = 0;
170 202
171 if (ncol == 0) 203 if (ncol == 0)
172 ncol = 80; 204 ncol = 80;
… …
174 if (nrow == 0) 206 if (nrow == 0)
175 nrow = 24; 207 nrow = 24;
176 208
177 if (ncol == prev_ncol && nrow == prev_nrow) 209 if (ncol == prev_ncol && nrow == prev_nrow)
178 return; 210 return;
179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182 211
183 // we need at least two lines for wrapping to work correctly 212 // we need at least two lines for wrapping to work correctly
184 while (nrow + saveLines < 2) 213 while (nrow + saveLines < 2)
185 { 214 {
186 //TODO//FIXME 215 //TODO//FIXME
… …
195 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
196 225
197 screen.tscroll = 0; 226 screen.tscroll = 0;
198 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
199 228
229 void *prev_chunk = chunk;
230 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf;
233
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc ();
237
200 if (!row_buf) 238 if (!prev_row_buf)
201 { 239 {
202 /* 240 /*
203 * first time called so just malloc everything: don't rely on realloc 241 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
204 */ 242 */
205 top_row = 0; 243 top_row = 0;
206 term_start = 0; 244 term_start = 0;
207
208 talloc = new rxvt_salloc (ncol * sizeof (text_t));
209 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
210
211 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
212 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
213 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
214
215 for (int row = nrow; row--; )
216 {
217 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
218 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
219 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
220 }
221 245
222 memset (charsets, 'B', sizeof (charsets)); 246 memset (charsets, 'B', sizeof (charsets));
223 rstyle = DEFAULT_RSTYLE; 247 rstyle = DEFAULT_RSTYLE;
224 screen.flags = Screen_DefaultFlags; 248 screen.flags = Screen_DefaultFlags;
225 screen.cur.row = screen.cur.col = 0; 249 screen.cur.row = screen.cur.col = 0;
… …
239 selection.text = NULL; 263 selection.text = NULL;
240 selection.len = 0; 264 selection.len = 0;
241 selection.op = SELECTION_CLEAR; 265 selection.op = SELECTION_CLEAR;
242 selection.screen = PRIMARY; 266 selection.screen = PRIMARY;
243 selection.clicks = 0; 267 selection.clicks = 0;
268 selection.clip_text = NULL;
269 selection.clip_len = 0;
244 } 270 }
245 else 271 else
246 { 272 {
247 /* 273 /*
248 * add or delete rows as appropriate 274 * add or delete rows as appropriate
249 */ 275 */
250 276
251 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
252 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
253
254#if 0
255 if (nrow < prev_nrow)
256 {
257 for (int row = nrow; row < prev_nrow; row++)
258 {
259 lfree (swap_buf [row]);
260 lfree (drawn_buf[row]);
261 }
262 }
263#endif
264
265 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
266 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267
268 for (int row = min (nrow, prev_nrow); row--; ) 277 for (int row = min (nrow, prev_nrow); row--; )
269 { 278 {
270 lresize (drawn_buf[row]); 279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
271 lresize (swap_buf [row]); 280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 }
273 281
274 for (int row = prev_nrow; row < nrow; row++) 282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
275 { 286 }
276 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
277 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
278 }
279
280 line_t *old_buf = row_buf;
281 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
282 287
283 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
284 int pend = MOD (term_start + top_row , prev_total_rows); 289 int pend = MOD (term_start + top_row , prev_total_rows);
285 int q = total_rows; // rewrapped row 290 int q = total_rows; // rewrapped row
286 291
287 if (top_row) 292 if (top_row)
288 { 293 {
289 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 294 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
290 // to come up with a lean and mean algorithm. 295 // to come up with a lean and mean algorithm.
296 // TODO: maybe optimise when width didn't change
291 297
292 row_col_t ocur = screen.cur; 298 row_col_t ocur = screen.cur;
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 299 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 300
295 do 301 do
296 { 302 {
297 p = MOD (p - 1, prev_total_rows); 303 p = MOD (p - 1, prev_total_rows);
298#ifdef DEBUG_STRICT
299 assert (old_buf [MOD (p, prev_total_rows)].t); 304 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
300#endif
301 int plines = 1; 305 int plines = 1;
302 int llen = old_buf [MOD (p, prev_total_rows)].l; 306 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
303 307
304 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 308 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
305 { 309 {
306 p = MOD (p - 1, prev_total_rows); 310 p = MOD (p - 1, prev_total_rows);
307 311
308 plines++; 312 plines++;
309 llen += prev_ncol; 313 llen += prev_ncol;
… …
322 326
323 // re-assemble the full line by destination lines 327 // re-assemble the full line by destination lines
324 for (int qrow = q; qlines--; qrow++) 328 for (int qrow = q; qlines--; qrow++)
325 { 329 {
326 qline = row_buf + qrow; 330 qline = row_buf + qrow;
327 lalloc (*qline); 331 qline->alloc (); // redundant with next line
328 qline->l = ncol; 332 qline->l = ncol;
329 qline->is_longer (1); 333 qline->is_longer (1);
330 334
331 int qcol = 0; 335 int qcol = 0;
332 336
… …
347 // this seems to upset applications/shells/readline 351 // this seems to upset applications/shells/readline
348 // least. 352 // least.
349 if (prow == ocur.row) 353 if (prow == ocur.row)
350 screen.cur.row = q - (total_rows - nrow); 354 screen.cur.row = q - (total_rows - nrow);
351 355
352 line_t &pline = old_buf [prow]; 356 line_t &pline = prev_row_buf [prow];
353 357
354 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 358 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
355 359
356 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 360 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
357 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 361 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
378 { 382 {
379 // if no scrollback exists (yet), wing, instead of wrap 383 // if no scrollback exists (yet), wing, instead of wrap
380 384
381 for (int row = min (nrow, prev_nrow); row--; ) 385 for (int row = min (nrow, prev_nrow); row--; )
382 { 386 {
383 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
384 line_t &qline = row_buf [row]; 388 line_t &dst = row_buf [row];
385 389
386 qline = pline; 390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
387 lresize (qline); 391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
388 } 394 }
389 395
390 for (int row = prev_nrow; row < nrow; row++) 396 for (int row = prev_nrow; row < nrow; row++)
391 {
392 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
393 }
394 398
395 term_start = 0; 399 term_start = 0;
396 } 400 }
397
398 free (old_buf);
399 delete old_ta;
400 delete old_ra;
401 401
402 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
404 }
404 405
406 for (int row = nrow; row--; )
407 {
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 }
412
413 free (prev_chunk);
414
405 free (tabs); 415 free (tabs);
406 } 416 tabs = (char *)rxvt_malloc (ncol);
417
418 for (int col = ncol; col--; )
419 tabs [col] = col % TABSIZE == 0;
407 420
408 CLEAR_ALL_SELECTION (); 421 CLEAR_ALL_SELECTION ();
409 422
410 prev_nrow = nrow; 423 prev_nrow = nrow;
411 prev_ncol = ncol; 424 prev_ncol = ncol;
412 425
413 tabs = (char *)rxvt_malloc (ncol); 426 tt_winch ();
414 427
415 for (int col = ncol; --col; ) 428 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416 tabs [col] = col % TABSIZE == 0; 429}
430
431void ecb_cold
432rxvt_term::scr_release () NOTHROW
433{
434 chunk_free (chunk, chunk_size);
435 chunk = 0;
436 row_buf = 0;
437
438 free (tabs);
439 tabs = 0;
440}
441
442/* ------------------------------------------------------------------------- */
443/*
444 * Hard/Soft reset
445 */
446void ecb_cold
447rxvt_term::scr_poweron ()
448{
449 scr_release ();
450
451 prev_nrow = prev_ncol = 0;
452 rvideo_mode = false;
453 scr_soft_reset ();
454 scr_reset ();
455
456 scr_clear (true);
457 scr_refresh ();
458}
459
460void ecb_cold
461rxvt_term::scr_soft_reset () NOTHROW
462{
463 /* only affects modes, nothing drastic such as clearing the screen */
464#if ENABLE_OVERLAY
465 scr_overlay_off ();
466#endif
417 467
418 if (current_screen != PRIMARY) 468 if (current_screen != PRIMARY)
419 scr_swap_screen (); 469 scr_swap_screen ();
420 470
421 tt_winch (); 471 scr_scroll_region (0, MAX_ROWS - 1);
422 472 scr_rendition (0, ~RS_None);
423 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 473 scr_insert_mode (0);
424}
425
426/* ------------------------------------------------------------------------- */
427/*
428 * Free everything. That way malloc debugging can find leakage.
429 */
430void
431rxvt_term::scr_release () NOTHROW
432{
433 if (row_buf)
434 {
435 delete talloc; talloc = 0;
436 delete ralloc; ralloc = 0;
437
438 free (row_buf);
439 free (swap_buf);
440 free (drawn_buf);
441 free (tabs);
442
443 row_buf = 0; // signal that we freed all the arrays
444 }
445}
446
447/* ------------------------------------------------------------------------- */
448/*
449 * Hard reset
450 */
451void
452rxvt_term::scr_poweron ()
453{
454 scr_release ();
455 prev_nrow = prev_ncol = 0;
456 scr_reset ();
457
458 scr_clear (true);
459 scr_refresh ();
460} 474}
461 475
462/* ------------------------------------------------------------------------- * 476/* ------------------------------------------------------------------------- *
463 * PROCESS SCREEN COMMANDS * 477 * PROCESS SCREEN COMMANDS *
464 * ------------------------------------------------------------------------- */ 478 * ------------------------------------------------------------------------- */
… …
502 } 516 }
503 517
504 /* boundary check in case screen size changed between SAVE and RESTORE */ 518 /* boundary check in case screen size changed between SAVE and RESTORE */
505 min_it (s->cur.row, nrow - 1); 519 min_it (s->cur.row, nrow - 1);
506 min_it (s->cur.col, ncol - 1); 520 min_it (s->cur.col, ncol - 1);
507#ifdef DEBUG_STRICT
508 assert (s->cur.row >= 0); 521 assert (s->cur.row >= 0);
509 assert (s->cur.col >= 0); 522 assert (s->cur.col >= 0);
510#endif
511} 523}
512 524
513void 525void
514rxvt_term::scr_swap_screen () 526rxvt_term::scr_swap_screen () NOTHROW
515{ 527{
516 if (!option (Opt_secondaryScreen)) 528 if (!option (Opt_secondaryScreen))
517 return; 529 return;
518 530
519 for (int i = prev_nrow; i--; ) 531 for (int i = prev_nrow; i--; )
… …
538 return; 550 return;
539 551
540 want_refresh = 1; 552 want_refresh = 1;
541 view_start = 0; 553 view_start = 0;
542 554
543 selection_check (2); /* check for boundary cross */ 555 /* check for boundary cross */
556 row_col_t pos;
557 pos.row = pos.col = 0;
558 if (ROWCOL_IS_BEFORE (selection.beg, pos)
559 && ROWCOL_IS_AFTER (selection.end, pos))
560 CLEAR_SELECTION ();
544 561
545 int i = current_screen; current_screen = scrn; scrn = i; 562 current_screen = scrn;
546 563
547#if NSCREENS 564#if NSCREENS
548 if (option (Opt_secondaryScreen)) 565 if (option (Opt_secondaryScreen))
549 { 566 {
550 num_scr = 0; 567 num_scr = 0;
… …
614/* 631/*
615 * Scroll text between <row1> and <row2> inclusive, by <count> lines 632 * Scroll text between <row1> and <row2> inclusive, by <count> lines
616 * count positive ==> scroll up 633 * count positive ==> scroll up
617 * count negative ==> scroll down 634 * count negative ==> scroll down
618 */ 635 */
619int 636int ecb_hot
620rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 637rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
621{ 638{
622 if (count == 0 || (row1 > row2)) 639 if (count == 0 || (row1 > row2))
623 return 0; 640 return 0;
624 641
… …
627 644
628 if (count > 0 645 if (count > 0
629 && row1 == 0 646 && row1 == 0
630 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 647 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
631 { 648 {
649 min_it (count, total_rows - (nrow - (row2 + 1)));
650
632 top_row = max (top_row - count, -saveLines); 651 top_row = max (top_row - count, -saveLines);
633
634 // scroll everything up 'count' lines
635 term_start = (term_start + count) % total_rows;
636 652
637 // sever bottommost line 653 // sever bottommost line
638 { 654 {
639 line_t &l = ROW(row2 - count); 655 line_t &l = ROW(row2);
640 l.is_longer (0); 656 l.is_longer (0);
641 l.touch (); 657 l.touch ();
642 } 658 }
643 659
660 // scroll everything up 'count' lines
661 term_start = (term_start + count) % total_rows;
662
663 // now copy lines below the scroll region bottom to the
664 // bottom of the screen again, so they look as if they
665 // hadn't moved.
666 for (int i = nrow; --i > row2; )
667 {
668 line_t &l1 = ROW(i - count);
669 line_t &l2 = ROW(i);
670
671 ::swap (l1, l2);
672 l2.touch ();
673 }
674
644 // erase newly scrolled-in lines 675 // erase newly scrolled-in lines
645 for (int i = count; i--; ) 676 for (int i = count; i--; )
646 { 677 {
647 line_t &l = ROW(nrow - 1 - i); 678 line_t &l = ROW(row2 - i);
648 679
649 // optimize if already cleared, can be significant on slow machines 680 // optimise if already cleared, can be significant on slow machines
650 // could be rolled into scr_blank_screen_mem 681 // could be rolled into scr_blank_screen_mem
651 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 682 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
652 { 683 {
653 scr_blank_line (l, 0, l.l, rstyle); 684 scr_blank_line (l, 0, l.l, rstyle);
654 l.l = 0; 685 l.l = 0;
… …
656 } 687 }
657 else 688 else
658 scr_blank_screen_mem (l, rstyle); 689 scr_blank_screen_mem (l, rstyle);
659 } 690 }
660 691
661 // now copy lines below the scroll region bottom to the
662 // bottom of the screen again, so they look as if they
663 // hadn't moved.
664 for (int i = nrow; --i > row2; )
665 {
666 line_t &l1 = ROW(i - count);
667 line_t &l2 = ROW(i);
668
669 ::swap (l1, l2);
670 l2.touch ();
671 }
672
673 // move and/or clear selection, if any 692 // move and/or clear selection, if any
674 if (selection.op && current_screen == selection.screen) 693 if (selection.op && current_screen == selection.screen
694 && selection.beg.row <= row2)
675 { 695 {
676 selection.beg.row -= count; 696 selection.beg.row -= count;
677 selection.end.row -= count; 697 selection.end.row -= count;
678 selection.mark.row -= count; 698 selection.mark.row -= count;
679 699
680 if (selection.beg.row < top_row 700 selection_check (0);
681 || selection.end.row < top_row
682 || selection.mark.row < top_row)
683 {
684 CLEAR_ALL_SELECTION ();
685 selection.op = SELECTION_CLEAR;
686 }
687 } 701 }
688 702
689 // finally move the view window, if desired 703 // finally move the view window, if desired
690 if (option (Opt_scrollWithBuffer) 704 if (option (Opt_scrollWithBuffer)
691 && view_start != 0 705 && view_start != 0
… …
721 } 735 }
722 736
723 // use a simple and robust scrolling algorithm, this 737 // use a simple and robust scrolling algorithm, this
724 // part of scr_scroll_text is not time-critical. 738 // part of scr_scroll_text is not time-critical.
725 739
740 // sever line above scroll region
741 if (row1)
742 {
743 line_t &l = ROW(row1 - 1);
744 l.is_longer (0);
745 l.touch ();
746 }
747
726 int rows = row2 - row1 + 1; 748 int rows = row2 - row1 + 1;
727 749
728 min_it (count, rows); 750 min_it (count, rows);
729 751
730 line_t *temp_buf = row_buf + total_rows; 752 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
731 753
732 for (int row = 0; row < rows; row++) 754 for (int row = 0; row < rows; row++)
733 { 755 {
734 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 756 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
735 757
… …
737 scr_blank_screen_mem (temp_buf [row], rstyle); 759 scr_blank_screen_mem (temp_buf [row], rstyle);
738 } 760 }
739 761
740 for (int row = 0; row < rows; row++) 762 for (int row = 0; row < rows; row++)
741 ROW(row1 + row) = temp_buf [row]; 763 ROW(row1 + row) = temp_buf [row];
764
765 // sever bottommost line
766 {
767 line_t &l = ROW(row2);
768 l.is_longer (0);
769 l.touch ();
770 }
742 } 771 }
743 772
744 return count; 773 return count;
745} 774}
746 775
747/* ------------------------------------------------------------------------- */ 776/* ------------------------------------------------------------------------- */
748/* 777/*
749 * Add text given in <str> of length <len> to screen struct 778 * Add text given in <str> of length <len> to screen struct
750 */ 779 */
751void 780void ecb_hot
752rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 781rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
753{ 782{
754 if (len <= 0) /* sanity */ 783 if (len <= 0) /* sanity */
755 return; 784 return;
756 785
757 unsigned char checksel; 786 bool checksel;
758 unicode_t c; 787 unicode_t c;
759 int ncol = this->ncol; 788 int ncol = this->ncol;
760 const wchar_t *strend = str + len; 789 const wchar_t *strend = str + len;
761 790
762 want_refresh = 1; 791 want_refresh = 1;
… …
775 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 804 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776 screen.cur.row -= minlines; 805 screen.cur.row -= minlines;
777 } 806 }
778 } 807 }
779 808
780#ifdef DEBUG_STRICT
781 assert (screen.cur.col < ncol); 809 assert (screen.cur.col < ncol);
782 assert (screen.cur.row < nrow 810 assert (screen.cur.row < nrow
783 && screen.cur.row >= top_row); 811 && screen.cur.row >= top_row);
784#endif
785 int row = screen.cur.row; 812 int row = screen.cur.row;
786 813
787 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 814 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788 815
789 line_t *line = &ROW(row); 816 line_t *line = &ROW(row);
790 817
791 while (str < strend) 818 while (str < strend)
792 { 819 {
793 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 820 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
794 821
795 if (expect_false (c < 0x20)) 822 if (ecb_unlikely (c < 0x20))
796 if (c == C0_LF) 823 if (c == C0_LF)
797 { 824 {
798 max_it (line->l, screen.cur.col); 825 max_it (line->l, screen.cur.col);
799 826
800 screen.flags &= ~Screen_WrapNext; 827 screen.flags &= ~Screen_WrapNext;
… …
819 { 846 {
820 scr_tab (1, true); 847 scr_tab (1, true);
821 continue; 848 continue;
822 } 849 }
823 850
824 if (expect_false ( 851 if (ecb_unlikely (
825 checksel /* see if we're writing within selection */ 852 checksel /* see if we're writing within selection */
826 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 853 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
827 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 854 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
828 )) 855 ))
829 { 856 {
… …
834 * should be a similar check. 861 * should be a similar check.
835 */ 862 */
836 CLEAR_SELECTION (); 863 CLEAR_SELECTION ();
837 } 864 }
838 865
839 if (expect_false (screen.flags & Screen_WrapNext)) 866 if (ecb_unlikely (screen.flags & Screen_WrapNext))
840 { 867 {
841 scr_do_wrap (); 868 scr_do_wrap ();
842 869
843 line->l = ncol; 870 line->l = ncol;
844 line->is_longer (1); 871 line->is_longer (1);
… …
846 row = screen.cur.row; 873 row = screen.cur.row;
847 line = &ROW(row); /* _must_ refresh */ 874 line = &ROW(row); /* _must_ refresh */
848 } 875 }
849 876
850 // some utf-8 decoders "decode" surrogate characters: let's fix this. 877 // some utf-8 decoders "decode" surrogate characters: let's fix this.
851 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 878 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
852 c = 0xfffd; 879 c = 0xfffd;
853 880
854 // rely on wcwidth to tell us the character width, do wcwidth before 881 // rely on wcwidth to tell us the character width, do wcwidth before
855 // further replacements, as wcwidth might return -1 for the line 882 // further replacements, as wcwidth might return -1 for the line
856 // drawing characters below as they might be invalid in the current 883 // drawing characters below as they might be invalid in the current
857 // locale. 884 // locale.
858 int width = WCWIDTH (c); 885 int width = WCWIDTH (c);
859 886
860 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 887 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
861 { 888 {
862 // vt100 special graphics and line drawing 889 // vt100 special graphics and line drawing
863 // 5f-7e standard vt100 890 // 5f-7e standard vt100
864 // 40-5e rxvt extension for extra curses acs chars 891 // 40-5e rxvt extension for extra curses acs chars
865 static uint16_t vt100_0[62] = { // 41 .. 7e 892 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
878 c = vt100_0[c - 0x41]; 905 c = vt100_0[c - 0x41];
879 width = 1; // vt100 line drawing characters are always single-width 906 width = 1; // vt100 line drawing characters are always single-width
880 } 907 }
881 } 908 }
882 909
883 if (expect_false (screen.flags & Screen_Insert)) 910 if (ecb_unlikely (screen.flags & Screen_Insert))
884 scr_insdel_chars (width, INSERT); 911 scr_insdel_chars (width, INSERT);
885 912
886 if (width != 0) 913 if (width != 0)
887 { 914 {
888#if !UNICODE_3 915#if !UNICODE_3
… …
893# else 920# else
894 c = 0xfffd; 921 c = 0xfffd;
895# endif 922# endif
896#endif 923#endif
897 924
925 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
926
927 // if the character doesn't fit into the remaining columns...
928 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
929 {
930 if (screen.flags & Screen_Autowrap)
931 {
932 // ... artificially enlargen the previous one
933 c = NOCHAR;
934 // and try the same character next loop iteration
935 --str;
936 }
937 else
938 screen.cur.col = ncol - width;
939 }
940
898 // nuke the character at this position, if required 941 // nuke the character at this position, if required
899 if (expect_false ( 942 // due to wonderful coincidences everywhere else in this loop
943 // we never have to check for overwriting a wide char itself,
944 // only its tail.
900 line->t[screen.cur.col] == NOCHAR 945 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
901 || (screen.cur.col < ncol - 1
902 && line->t[screen.cur.col + 1] == NOCHAR)
903 ))
904 scr_kill_char (*line, screen.cur.col); 946 scr_kill_char (*line, screen.cur.col);
905
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907
908 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 {
911 // ...output spaces
912 c = ' ';
913 // and try the same character next loop iteration
914 --str;
915 }
916 947
917 line->touch (); 948 line->touch ();
918 949
919 do 950 do
920 { 951 {
921 line->t[screen.cur.col] = c; 952 line->t[screen.cur.col] = c;
922 line->r[screen.cur.col] = rend; 953 line->r[screen.cur.col] = rend;
923 954
924 if (expect_true (screen.cur.col < ncol - 1)) 955 if (ecb_likely (screen.cur.col < ncol - 1))
925 screen.cur.col++; 956 screen.cur.col++;
926 else 957 else
927 { 958 {
928 line->l = ncol; 959 line->l = ncol;
929 if (screen.flags & Screen_Autowrap) 960 if (screen.flags & Screen_Autowrap)
930 screen.flags |= Screen_WrapNext; 961 screen.flags |= Screen_WrapNext;
931 break; 962
963 goto end_of_line;
932 } 964 }
933 965
934 c = NOCHAR; 966 c = NOCHAR;
935 } 967 }
936 while (expect_false (--width > 0)); 968 while (ecb_unlikely (--width > 0));
937 969
938 // pad with spaces when overwriting wide character with smaller one 970 // pad with spaces when overwriting wide character with smaller one
939 if (expect_false (!width)) 971 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
940 { 972 {
941 line->touch ();
942
943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
944 {
945 line->t[c] = ' '; 973 line->t[c] = ' ';
946 line->r[c] = rend; 974 line->r[c] = rend;
947 }
948 } 975 }
976
977end_of_line:
978 ;
949 } 979 }
950#if ENABLE_COMBINING 980#if ENABLE_COMBINING
951 else // width == 0 981 else // width == 0
952 { 982 {
953 if (c != 0xfeff) // ignore BOM 983 if (c != 0xfeff) // ignore BOM
… …
993#endif 1023#endif
994 } 1024 }
995 1025
996 max_it (line->l, screen.cur.col); 1026 max_it (line->l, screen.cur.col);
997 1027
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1028 assert (screen.cur.row >= 0);
1000#endif
1001} 1029}
1002 1030
1003/* ------------------------------------------------------------------------- */ 1031/* ------------------------------------------------------------------------- */
1004/* 1032/*
1005 * Process Backspace. Move back the cursor back a position, wrap if have to 1033 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1018 1046
1019 want_refresh = 1; 1047 want_refresh = 1;
1020#endif 1048#endif
1021 } 1049 }
1022 } 1050 }
1051 else if (screen.flags & Screen_WrapNext)
1052 screen.flags &= ~Screen_WrapNext;
1023 else 1053 else
1024 scr_gotorc (0, -1, RELATIVE); 1054 scr_gotorc (0, -1, RELATIVE);
1025} 1055}
1026 1056
1027/* ------------------------------------------------------------------------- */ 1057/* ------------------------------------------------------------------------- */
… …
1105 * XTERM_SEQ: ESC 6 1135 * XTERM_SEQ: ESC 6
1106 * Move cursor left in row. If we're at the left boundary, shift everything 1136 * Move cursor left in row. If we're at the left boundary, shift everything
1107 * in that row right. Clear left column. 1137 * in that row right. Clear left column.
1108 */ 1138 */
1109#if !ENABLE_MINIMAL 1139#if !ENABLE_MINIMAL
1110void 1140void ecb_cold
1111rxvt_term::scr_backindex () NOTHROW 1141rxvt_term::scr_backindex () NOTHROW
1112{ 1142{
1113 if (screen.cur.col > 0) 1143 if (screen.cur.col > 0)
1114 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1115 else 1145 else
… …
1122 * XTERM_SEQ: ESC 9 1152 * XTERM_SEQ: ESC 9
1123 * Move cursor right in row. If we're at the right boundary, shift everything 1153 * Move cursor right in row. If we're at the right boundary, shift everything
1124 * in that row left. Clear right column. 1154 * in that row left. Clear right column.
1125 */ 1155 */
1126#if !ENABLE_MINIMAL 1156#if !ENABLE_MINIMAL
1127void 1157void ecb_cold
1128rxvt_term::scr_forwardindex () NOTHROW 1158rxvt_term::scr_forwardindex () NOTHROW
1129{ 1159{
1130 if (screen.cur.col < ncol - 1) 1160 if (screen.cur.col < ncol - 1)
1131 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1161 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1132 else 1162 else
… …
1283 scr_blank_line (line, col, num, rstyle); 1313 scr_blank_line (line, col, num, rstyle);
1284} 1314}
1285 1315
1286/* ------------------------------------------------------------------------- */ 1316/* ------------------------------------------------------------------------- */
1287/* 1317/*
1288 * Erase part of whole of the screen 1318 * Erase part or whole of the screen
1289 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1319 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1290 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1320 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1291 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1321 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1292 */ 1322 */
1293void 1323void
… …
1302 ZERO_SCROLLBACK (); 1332 ZERO_SCROLLBACK ();
1303 1333
1304 switch (mode) 1334 switch (mode)
1305 { 1335 {
1306 case 0: /* erase to end of screen */ 1336 case 0: /* erase to end of screen */
1307 selection_check (1);
1308 scr_erase_line (0); 1337 scr_erase_line (0);
1309 row = screen.cur.row + 1; /* possible OOB */ 1338 row = screen.cur.row + 1; /* possible OOB */
1310 num = nrow - row; 1339 num = nrow - row;
1311 break; 1340 break;
1312 case 1: /* erase to beginning of screen */ 1341 case 1: /* erase to beginning of screen */
1313 selection_check (3);
1314 scr_erase_line (1); 1342 scr_erase_line (1);
1315 row = 0; 1343 row = 0;
1316 num = screen.cur.row; 1344 num = screen.cur.row;
1317 break; 1345 break;
1318 case 2: /* erase whole screen */ 1346 case 2: /* erase whole screen */
1319 selection_check (3);
1320 row = 0; 1347 row = 0;
1321 num = nrow; 1348 num = nrow;
1322 break; 1349 break;
1323 default: 1350 default:
1324 return; 1351 return;
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1360 if (row >= nrow) /* Out Of Bounds */
1334 return; 1361 return;
1335 1362
1336 min_it (num, nrow - row); 1363 min_it (num, nrow - row);
1337 1364
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1339 if (rstyle & (RS_RVid | RS_Uline)) 1365 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1366 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1367 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1368 {
1343 ren = DEFAULT_RSTYLE; 1369 ren = DEFAULT_RSTYLE;
1344 1370
1345 if (mapped) 1371 if (mapped)
1346 XClearArea (dpy, vt, 0, 1372 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1373 Row2Pixel (row - view_start), (unsigned int)vt_width,
1348 (unsigned int)Height2Pixel (num), False); 1374 (unsigned int)Height2Pixel (num), False);
1349 } 1375 }
1350 else 1376 else
1351 { 1377 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1378 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1379
1380 if (mapped)
1381 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1382 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1383 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1384 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1385 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1386 (unsigned int)vt_width,
1359 (unsigned int)Height2Pixel (num)); 1387 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1388 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1389 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1390 }
1362 } 1391 }
1363 1392
1364 for (; num--; row++) 1393 for (; num--; row++)
1365 { 1394 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1395 scr_blank_screen_mem (ROW(row), rstyle);
1396
1397 if (row - view_start < nrow)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1398 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1368 } 1399 }
1369} 1400}
1370 1401
1371#if !ENABLE_MINIMAL 1402#if !ENABLE_MINIMAL
1372void 1403void
… …
1382/* ------------------------------------------------------------------------- */ 1413/* ------------------------------------------------------------------------- */
1383/* 1414/*
1384 * Fill the screen with `E's 1415 * Fill the screen with `E's
1385 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1416 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1386 */ 1417 */
1387void 1418void ecb_cold
1388rxvt_term::scr_E () NOTHROW 1419rxvt_term::scr_E () NOTHROW
1389{ 1420{
1390 rend_t fs; 1421 rend_t fs;
1391 1422
1392 want_refresh = 1; 1423 want_refresh = 1;
1393 ZERO_SCROLLBACK (); 1424 ZERO_SCROLLBACK ();
1394 1425
1395 num_scr_allow = 0; 1426 num_scr_allow = 0;
1396 selection_check (3); 1427
1428 row_col_t pos;
1429 pos.row = pos.col = 0;
1430 if (ROWCOL_IS_AFTER (selection.end, pos))
1431 CLEAR_SELECTION ();
1397 1432
1398 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1433 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1399 for (int row = nrow; row--; ) 1434 for (int row = nrow; row--; )
1400 { 1435 {
1401 line_t &line = ROW(row); 1436 line_t &line = ROW(row);
… …
1464 line_t *line = &ROW(row); 1499 line_t *line = &ROW(row);
1465 1500
1466 line->touch (); 1501 line->touch ();
1467 line->is_longer (0); 1502 line->is_longer (0);
1468 1503
1469 // nuke wide char at beginning 1504 // nuke wide spanning the start
1470 if (line->t[screen.cur.col] == NOCHAR) 1505 if (line->t[screen.cur.col] == NOCHAR)
1471 scr_kill_char (*line, screen.cur.col); 1506 scr_kill_char (*line, screen.cur.col);
1472 1507
1473 switch (insdel) 1508 switch (insdel)
1474 { 1509 {
… …
1513 1548
1514 scr_blank_line (*line, screen.cur.col, count, rstyle); 1549 scr_blank_line (*line, screen.cur.col, count, rstyle);
1515 break; 1550 break;
1516 1551
1517 case DELETE: 1552 case DELETE:
1518 {
1519 line->l = max (line->l - count, 0); 1553 line->l = max (line->l - count, 0);
1520 1554
1521 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1555 // nuke wide char spanning the end
1556 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1557 scr_kill_char (*line, screen.cur.col + count);
1522 1558
1523 for (int col = screen.cur.col; (col + count) < ncol; col++) 1559 for (int col = screen.cur.col; (col + count) < ncol; col++)
1524 { 1560 {
1525 line->t[col] = line->t[col + count]; 1561 line->t[col] = line->t[col + count];
1526 line->r[col] = line->r[col + count]; 1562 line->r[col] = line->r[col + count];
1527 } 1563 }
1528 1564
1529 // nuke wide char at the end
1530 if (line->t[screen.cur.col] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col);
1532
1533 scr_blank_line (*line, ncol - count, count, tr); 1565 scr_blank_line (*line, ncol - count, count, rstyle);
1534 1566
1535 if (selection.op && current_screen == selection.screen 1567 if (selection.op && current_screen == selection.screen
1536 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1568 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1537 { 1569 {
1538 if (selection.end.row != screen.cur.row 1570 if (selection.end.row != screen.cur.row
1539 || (screen.cur.col >= selection.beg.col - count) 1571 || (screen.cur.col >= selection.beg.col - count)
1540 || selection.end.col >= ncol) 1572 || selection.end.col >= ncol)
1541 CLEAR_SELECTION (); 1573 CLEAR_SELECTION ();
1542 else 1574 else
1543 { 1575 {
1544 /* shift selection */ 1576 /* shift selection */
1545 selection.beg.col -= count; 1577 selection.beg.col -= count;
1546 selection.mark.col -= count; /* XXX: yes? */ 1578 selection.mark.col -= count; /* XXX: yes? */
1547 selection.end.col -= count; 1579 selection.end.col -= count;
1548 } 1580 }
1549 }
1550 } 1581 }
1551 1582
1552 break; 1583 break;
1553 } 1584 }
1554} 1585}
… …
1556/* ------------------------------------------------------------------------- */ 1587/* ------------------------------------------------------------------------- */
1557/* 1588/*
1558 * Set the scrolling region 1589 * Set the scrolling region
1559 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1590 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1560 */ 1591 */
1561void 1592void ecb_cold
1562rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1593rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1563{ 1594{
1564 max_it (top, 0); 1595 max_it (top, 0);
1565 min_it (bot, nrow - 1); 1596 min_it (bot, nrow - 1);
1566 1597
… …
1576/* 1607/*
1577 * Make the cursor visible/invisible 1608 * Make the cursor visible/invisible
1578 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1609 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1579 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1610 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1580 */ 1611 */
1581void 1612void ecb_cold
1582rxvt_term::scr_cursor_visible (int mode) NOTHROW 1613rxvt_term::scr_cursor_visible (int mode) NOTHROW
1583{ 1614{
1584 want_refresh = 1; 1615 want_refresh = 1;
1585 1616
1586 if (mode) 1617 if (mode)
… …
1593/* 1624/*
1594 * Set/unset automatic wrapping 1625 * Set/unset automatic wrapping
1595 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1626 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1596 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1627 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1597 */ 1628 */
1598void 1629void ecb_cold
1599rxvt_term::scr_autowrap (int mode) NOTHROW 1630rxvt_term::scr_autowrap (int mode) NOTHROW
1600{ 1631{
1601 if (mode) 1632 if (mode)
1602 screen.flags |= Screen_Autowrap; 1633 screen.flags |= Screen_Autowrap;
1603 else 1634 else
… …
1612 * Relative mode: line numbers are relative to top margin of scrolling region 1643 * Relative mode: line numbers are relative to top margin of scrolling region
1613 * and the cursor cannot be moved outside. 1644 * and the cursor cannot be moved outside.
1614 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1645 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1615 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1646 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1616 */ 1647 */
1617void 1648void ecb_cold
1618rxvt_term::scr_relative_origin (int mode) NOTHROW 1649rxvt_term::scr_relative_origin (int mode) NOTHROW
1619{ 1650{
1620 if (mode) 1651 if (mode)
1621 screen.flags |= Screen_Relative; 1652 screen.flags |= Screen_Relative;
1622 else 1653 else
… …
1629/* 1660/*
1630 * Set insert/replace mode 1661 * Set insert/replace mode
1631 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1662 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1632 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1663 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1633 */ 1664 */
1634void 1665void ecb_cold
1635rxvt_term::scr_insert_mode (int mode) NOTHROW 1666rxvt_term::scr_insert_mode (int mode) NOTHROW
1636{ 1667{
1637 if (mode) 1668 if (mode)
1638 screen.flags |= Screen_Insert; 1669 screen.flags |= Screen_Insert;
1639 else 1670 else
… …
1645 * Set/Unset tabs 1676 * Set/Unset tabs
1646 * XTERM_SEQ: Set tab at current column : ESC H 1677 * XTERM_SEQ: Set tab at current column : ESC H
1647 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1678 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1648 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1679 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1649 */ 1680 */
1650void 1681void ecb_cold
1651rxvt_term::scr_set_tab (int mode) NOTHROW 1682rxvt_term::scr_set_tab (int mode) NOTHROW
1652{ 1683{
1653 if (mode < 0) 1684 if (mode < 0)
1654 memset (tabs, 0, ncol); 1685 memset (tabs, 0, ncol);
1655 else if (screen.cur.col < ncol) 1686 else if (screen.cur.col < ncol)
… …
1675 { 1706 {
1676 rvideo_state = on; 1707 rvideo_state = on;
1677 1708
1678 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1709 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1679#ifdef HAVE_BG_PIXMAP 1710#ifdef HAVE_BG_PIXMAP
1680 if (bgPixmap.pixmap == None) 1711 if (bg_img == 0)
1681#endif 1712#endif
1682 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1713 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1683 1714
1684 XGCValues gcvalue; 1715 XGCValues gcvalue;
1685 gcvalue.foreground = pix_colors[Color_fg]; 1716 gcvalue.foreground = pix_colors[Color_fg];
… …
1694/* ------------------------------------------------------------------------- */ 1725/* ------------------------------------------------------------------------- */
1695/* 1726/*
1696 * Report current cursor position 1727 * Report current cursor position
1697 * XTERM_SEQ: Report position: ESC [ 6 n 1728 * XTERM_SEQ: Report position: ESC [ 6 n
1698 */ 1729 */
1699void 1730void ecb_cold
1700rxvt_term::scr_report_position () NOTHROW 1731rxvt_term::scr_report_position () NOTHROW
1701{ 1732{
1702 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1733 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1703} 1734}
1704 1735
… …
1707 * ------------------------------------------------------------------------- */ 1738 * ------------------------------------------------------------------------- */
1708 1739
1709/* 1740/*
1710 * Set font style 1741 * Set font style
1711 */ 1742 */
1712void 1743void ecb_cold
1713rxvt_term::set_font_style () NOTHROW 1744rxvt_term::set_font_style () NOTHROW
1714{ 1745{
1715#if 0 1746#if 0
1716 switch (charsets [screen.charset]) 1747 switch (charsets [screen.charset])
1717 { 1748 {
… …
1739 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1770 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1740 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1771 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1741 * XTERM_SEQ: Invoke G2 character set: ESC N 1772 * XTERM_SEQ: Invoke G2 character set: ESC N
1742 * XTERM_SEQ: Invoke G3 character set: ESC O 1773 * XTERM_SEQ: Invoke G3 character set: ESC O
1743 */ 1774 */
1744void 1775void ecb_cold
1745rxvt_term::scr_charset_choose (int set) NOTHROW 1776rxvt_term::scr_charset_choose (int set) NOTHROW
1746{ 1777{
1747 screen.charset = set; 1778 screen.charset = set;
1748 set_font_style (); 1779 set_font_style ();
1749} 1780}
… …
1770 * ------------------------------------------------------------------------- */ 1801 * ------------------------------------------------------------------------- */
1771 1802
1772/* 1803/*
1773 * refresh matching text. 1804 * refresh matching text.
1774 */ 1805 */
1775bool 1806bool ecb_cold
1776rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1807rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1777{ 1808{
1778 bool found = false; 1809 bool found = false;
1779 1810
1780 for (int i = 0; i < nrow; i++) 1811 for (int i = 0; i < nrow; i++)
… …
1799 PART_BEG = 0, 1830 PART_BEG = 0,
1800 PART_END, 1831 PART_END,
1801 RC_COUNT 1832 RC_COUNT
1802}; 1833};
1803 1834
1804void 1835void ecb_hot
1805rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1836rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1806{ 1837{
1807 int i; 1838 int i;
1808 row_col_t rc[RC_COUNT]; 1839 row_col_t rc[RC_COUNT];
1809 1840
… …
1829 for (i = PART_BEG; i < RC_COUNT; i++) 1860 for (i = PART_BEG; i < RC_COUNT; i++)
1830 { 1861 {
1831 min_it (rc[i].col, ncol - 1); 1862 min_it (rc[i].col, ncol - 1);
1832 min_it (rc[i].row, nrow - 1); 1863 min_it (rc[i].row, nrow - 1);
1833 } 1864 }
1834// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1865
1835 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1866 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1836 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1867 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1837 1868
1838 num_scr_allow = 0; 1869 num_scr_allow = 0;
1839 1870
… …
1846 * Refresh the entire screen 1877 * Refresh the entire screen
1847 */ 1878 */
1848void 1879void
1849rxvt_term::scr_touch (bool refresh) NOTHROW 1880rxvt_term::scr_touch (bool refresh) NOTHROW
1850{ 1881{
1851 scr_expose (0, 0, width, height, refresh); 1882 scr_expose (0, 0, vt_width, vt_height, refresh);
1852} 1883}
1853 1884
1854/* ------------------------------------------------------------------------- */ 1885/* ------------------------------------------------------------------------- */
1855/* 1886/*
1856 * Move the display so that the line represented by scrollbar value Y is at 1887 * Move the display so that the line represented by scrollbar value Y is at
… …
1912 1943
1913# ifndef NO_MAPALERT 1944# ifndef NO_MAPALERT
1914# ifdef MAPALERT_OPTION 1945# ifdef MAPALERT_OPTION
1915 if (option (Opt_mapAlert)) 1946 if (option (Opt_mapAlert))
1916# endif 1947# endif
1917 XMapWindow (dpy, parent[0]); 1948 XMapWindow (dpy, parent);
1918# endif 1949# endif
1919 1950
1920# if ENABLE_FRILLS 1951# if ENABLE_FRILLS
1921 if (option (Opt_urgentOnBell)) 1952 if (option (Opt_urgentOnBell))
1922 set_urgency (1); 1953 set_urgency (1);
… …
1930 1961
1931 bell_ev.start (VISUAL_BELL_DURATION); 1962 bell_ev.start (VISUAL_BELL_DURATION);
1932 } 1963 }
1933 else 1964 else
1934 XBell (dpy, 0); 1965 XBell (dpy, 0);
1966 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1935#endif 1967#endif
1936} 1968}
1937 1969
1938/* ------------------------------------------------------------------------- */ 1970/* ------------------------------------------------------------------------- */
1939/* ARGSUSED */ 1971void ecb_cold
1940void
1941rxvt_term::scr_printscreen (int fullhist) NOTHROW 1972rxvt_term::scr_printscreen (int fullhist) NOTHROW
1942{ 1973{
1943#ifdef PRINTPIPE 1974#ifdef PRINTPIPE
1944 int nrows, row_start; 1975 int nrows, row_start;
1945 FILE *fd = popen_printer (); 1976 FILE *fd = popen_printer ();
… …
1958 row_start = view_start; 1989 row_start = view_start;
1959 } 1990 }
1960 1991
1961 wctomb (0, 0); 1992 wctomb (0, 0);
1962 1993
1963 for (int r1 = 0; r1 < nrows; r1++) 1994 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1964 { 1995 {
1965 text_t *tp = ROW(r1).t; 1996 text_t *tp = ROW(r1).t;
1966 int len = ROW(r1).l; 1997 int len = ROW(r1).l;
1967 1998
1968 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1999 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1994/* 2025/*
1995 * Refresh the screen 2026 * Refresh the screen
1996 * drawn_text/drawn_rend contain the screen information before the update. 2027 * drawn_text/drawn_rend contain the screen information before the update.
1997 * screen.text/screen.rend contain what the screen will change to. 2028 * screen.text/screen.rend contain what the screen will change to.
1998 */ 2029 */
1999void 2030void ecb_hot
2000rxvt_term::scr_refresh () NOTHROW 2031rxvt_term::scr_refresh () NOTHROW
2001{ 2032{
2002 unsigned char have_bg,
2003 showcursor; /* show the cursor */
2004 int16_t col, row, /* column/row we're processing */ 2033 int16_t col, row, /* column/row we're processing */
2005 ocrow; /* old cursor row */ 2034 ocrow; /* old cursor row */
2006 int i; /* tmp */ 2035 int i; /* tmp */
2007#ifndef NO_CURSORCOLOR 2036#ifndef NO_CURSORCOLOR
2008 rend_t cc1; /* store colours at cursor position (s) */ 2037 rend_t cc1; /* store colours at cursor position (s) */
… …
2019 /* 2048 /*
2020 * A: set up vars 2049 * A: set up vars
2021 */ 2050 */
2022 refresh_count = 0; 2051 refresh_count = 0;
2023 2052
2053 unsigned int old_screen_flags = screen.flags;
2024 have_bg = 0; 2054 bool have_bg = 0;
2025#ifdef HAVE_BG_PIXMAP 2055#ifdef HAVE_BG_PIXMAP
2026 have_bg = bgPixmap.pixmap != None; 2056 have_bg = bg_img != 0;
2027#endif 2057#endif
2028 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2058 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2029 2059
2030 /* 2060 /*
2031 * B: reverse any characters which are selected 2061 * B: reverse any characters which are selected
2032 */ 2062 */
2033 scr_reverse_selection (); 2063 scr_reverse_selection ();
2034 2064
2065 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2066#if ENABLE_OVERLAY
2067 scr_swap_overlay ();
2068#endif
2069
2070 bool showcursor = screen.flags & Screen_VisibleCursor;
2071
2035 /* 2072 /*
2036 * C: set the cursor character (s) 2073 * C: set the cursor character (s)
2037 */ 2074 */
2038 { 2075 {
2039 unsigned char setoldcursor; 2076 bool setoldcursor;
2040 2077
2041 showcursor = (screen.flags & Screen_VisibleCursor);
2042#ifdef CURSOR_BLINK 2078#ifdef CURSOR_BLINK
2043 if (hidden_cursor) 2079 if (hidden_cursor)
2044 showcursor = 0; 2080 showcursor = 0;
2045#endif 2081#endif
2046 2082
… …
2074 ccol2 = bgcolor_of (rstyle); 2110 ccol2 = bgcolor_of (rstyle);
2075#else 2111#else
2076 ccol2 = Color_bg; 2112 ccol2 = Color_bg;
2077#endif 2113#endif
2078 2114
2079 if (showcursor && focus) 2115 if (focus)
2080 { 2116 {
2081 if (option (Opt_cursorUnderline)) 2117 if (option (Opt_cursorUnderline))
2082 *crp ^= RS_Uline; 2118 *crp ^= RS_Uline;
2083 else 2119 else
2084 { 2120 {
… …
2119 oldcursor.col = screen.cur.col; 2155 oldcursor.col = screen.cur.col;
2120 } 2156 }
2121 } 2157 }
2122 } 2158 }
2123 2159
2124 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2125#if ENABLE_OVERLAY
2126 scr_swap_overlay ();
2127#endif
2128
2129#ifndef NO_SLOW_LINK_SUPPORT 2160#ifndef NO_SLOW_LINK_SUPPORT
2130 /* 2161 /*
2131 * D: CopyArea pass - very useful for slower links 2162 * D: CopyArea pass - very useful for slower links
2132 * This has been deliberately kept simple. 2163 * This has been deliberately kept simple.
2133 */ 2164 */
… …
2137 { 2168 {
2138 int16_t nits; 2169 int16_t nits;
2139 int i = num_scr; 2170 int i = num_scr;
2140 int j; 2171 int j;
2141 int len, wlen; 2172 int len, wlen;
2142 dLocal (int, num_scr);
2143 2173
2144 j = nrow; 2174 j = nrow;
2145 wlen = len = -1; 2175 wlen = len = -1;
2146 row = i > 0 ? 0 : j - 1; 2176 row = i > 0 ? 0 : j - 1;
2147 2177
… …
2222 continue; 2252 continue;
2223 2253
2224 // redraw one or more characters 2254 // redraw one or more characters
2225 2255
2226 // seek to the beginning of wide characters 2256 // seek to the beginning of wide characters
2227 while (expect_false (stp[col] == NOCHAR && col > 0)) 2257 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2228 --col; 2258 --col;
2229 2259
2230 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2260 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2231 text_t *text = stp + col; 2261 text_t *text = stp + col;
2232 int count = 1; 2262 int count = 1;
2233 2263
2234 dtp[col] = stp[col]; 2264 dtp[col] = stp[col];
2235 drp[col] = rend; 2265 drp[col] = rend;
… …
2239 for (i = 0; ++col < ncol; ) 2269 for (i = 0; ++col < ncol; )
2240 { 2270 {
2241 if (stp[col] == NOCHAR) 2271 if (stp[col] == NOCHAR)
2242 { 2272 {
2243 dtp[col] = stp[col]; 2273 dtp[col] = stp[col];
2244 drp[col] = rend; 2274 drp[col] = srp[col];
2275
2245 count++; 2276 count++;
2246 i++; 2277 i++;
2247 2278
2248 continue; 2279 continue;
2249 } 2280 }
… …
2269 2300
2270 col--; /* went one too far. move back */ 2301 col--; /* went one too far. move back */
2271 count -= i; /* dump any matching trailing chars */ 2302 count -= i; /* dump any matching trailing chars */
2272 2303
2273 // sometimes we optimize away the trailing NOCHAR's, add them back 2304 // sometimes we optimize away the trailing NOCHAR's, add them back
2274 while (expect_false (i && text[count] == NOCHAR)) 2305 while (ecb_unlikely (i && text[count] == NOCHAR))
2275 count++, i--; 2306 count++, i--;
2276 2307
2277 /* 2308 /*
2278 * Determine the attributes for the string 2309 * Determine the attributes for the string
2279 */ 2310 */
2280 int fore = fgcolor_of (rend); // desired foreground 2311 int fore = fgcolor_of (rend); // desired foreground
2281 int back = bgcolor_of (rend); // desired background 2312 int back = bgcolor_of (rend); // desired background
2282 2313
2283 // only do special processing if any attributes are set, which is unlikely 2314 // only do special processing if any attributes are set, which is unlikely
2284 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2315 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2285 { 2316 {
2286 bool invert = rend & RS_RVid; 2317 bool invert = rend & RS_RVid;
2287 2318
2288#ifndef NO_BOLD_UNDERLINE_REVERSE 2319#ifndef NO_BOLD_UNDERLINE_REVERSE
2289 if (rend & RS_Bold && fore == Color_fg) 2320 if (rend & RS_Bold && fore == Color_fg)
… …
2308 2339
2309 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2340 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2310 fore = Color_UL; 2341 fore = Color_UL;
2311#endif 2342#endif
2312 2343
2344#ifdef OPTION_HC
2345 if (rend & RS_Sel)
2346 {
2347 /* invert the column if no highlightColor is set or it is the
2348 * current cursor column */
2349 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2350 && ISSET_PIXCOLOR (Color_HC))
2351 {
2352 if (ISSET_PIXCOLOR (Color_HTC))
2353 fore = Color_HTC;
2354 // if invert is 0 reverse video is set so we use bg color as fg color
2355 else if (!invert)
2356 fore = back;
2357
2358 back = Color_HC;
2359 invert = 0;
2360 }
2361 }
2362#endif
2363
2313 if (invert) 2364 if (invert)
2314 { 2365 {
2315#ifdef OPTION_HC
2316 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2317 || !ISSET_PIXCOLOR (Color_HC))
2318#endif
2319 /* invert the column if no highlightColor is set or it is the
2320 * current cursor column */
2321 ::swap (fore, back); 2366 ::swap (fore, back);
2322#ifdef OPTION_HC
2323 else if (ISSET_PIXCOLOR (Color_HC))
2324 back = Color_HC;
2325#endif
2326 2367
2327#ifndef NO_BOLD_UNDERLINE_REVERSE 2368#ifndef NO_BOLD_UNDERLINE_REVERSE
2328# ifndef OPTION_HC
2329 if (ISSET_PIXCOLOR (Color_RV))
2330 back = Color_RV;
2331# endif
2332 if (fore == back) 2369 if (fore == back)
2333 { 2370 {
2334 fore = Color_bg; 2371 fore = Color_bg;
2335 back = Color_fg; 2372 back = Color_fg;
2336 } 2373 }
… …
2372 /* 2409 /*
2373 * Actually do the drawing of the string here 2410 * Actually do the drawing of the string here
2374 */ 2411 */
2375 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2412 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2376 2413
2377 if (expect_true (have_bg && back == Color_bg)) 2414 if (ecb_likely (have_bg && back == Color_bg))
2378 { 2415 {
2379 // this is very ugly, maybe push it into ->draw? 2416 // this is very ugly, maybe push it into ->draw?
2380 2417
2381 for (i = 0; i < count; i++) /* don't draw empty strings */ 2418 for (i = 0; i < count; i++) /* don't draw empty strings */
2382 if (text[i] != ' ') 2419 if (text[i] != ' ')
… …
2389 did_clear: ; 2426 did_clear: ;
2390 } 2427 }
2391 else 2428 else
2392 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2429 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2393 2430
2394 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2431 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2395 { 2432 {
2396#if ENABLE_FRILLS 2433#if ENABLE_FRILLS
2397 if (ISSET_PIXCOLOR (Color_underline)) 2434 if (ISSET_PIXCOLOR (Color_underline))
2398 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2435 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2399 else 2436 else
… …
2404 xpixel, ypixel + font->ascent + 1, 2441 xpixel, ypixel + font->ascent + 1,
2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2442 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2406 } 2443 }
2407 } /* for (col....) */ 2444 } /* for (col....) */
2408 } /* for (row....) */ 2445 } /* for (row....) */
2409
2410#if ENABLE_OVERLAY
2411 scr_swap_overlay ();
2412#endif
2413 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2414 2446
2415 /* 2447 /*
2416 * G: cleanup cursor and display outline cursor if necessary 2448 * G: cleanup cursor and display outline cursor if necessary
2417 */ 2449 */
2418 if (showcursor) 2450 if (showcursor)
… …
2450 2482
2451 XDrawRectangle (dpy, vt, gc, 2483 XDrawRectangle (dpy, vt, gc,
2452 Col2Pixel (col), 2484 Col2Pixel (col),
2453 Row2Pixel (oldcursor.row), 2485 Row2Pixel (oldcursor.row),
2454 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2486 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2455 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2487 (unsigned int) (Height2Pixel (1) - 1));
2456 } 2488 }
2457 } 2489 }
2458 2490
2459 /* 2491 /*
2460 * H: cleanup selection 2492 * H: cleanup selection
2461 */ 2493 */
2494#if ENABLE_OVERLAY
2495 scr_swap_overlay ();
2496#endif
2497 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2498
2462 scr_reverse_selection (); 2499 scr_reverse_selection ();
2463 2500
2501 screen.flags = old_screen_flags;
2464 num_scr = 0; 2502 num_scr = 0;
2465 num_scr_allow = 1; 2503 num_scr_allow = 1;
2466} 2504}
2467 2505
2468void 2506void ecb_cold
2469rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2507rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2470{ 2508{
2471 if (!l.t) 2509 if (!l.valid ())
2472 return; 2510 return;
2473 2511
2474 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2512 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2475 2513
2476 for (int i = ncol; i--; ) 2514 for (int i = ncol; i--; )
2477 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2515 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2478} 2516}
2479 2517
2480void 2518void ecb_cold
2481rxvt_term::scr_remap_chars () NOTHROW 2519rxvt_term::scr_remap_chars () NOTHROW
2482{ 2520{
2483 for (int i = total_rows; i--; ) 2521 for (int i = total_rows; i--; )
2484 scr_remap_chars (row_buf [i]); 2522 scr_remap_chars (row_buf [i]);
2485 2523
… …
2488 scr_remap_chars (drawn_buf [i]); 2526 scr_remap_chars (drawn_buf [i]);
2489 scr_remap_chars (swap_buf [i]); 2527 scr_remap_chars (swap_buf [i]);
2490 } 2528 }
2491} 2529}
2492 2530
2493void 2531void ecb_cold
2494rxvt_term::scr_recolour () NOTHROW 2532rxvt_term::scr_recolour (bool refresh) NOTHROW
2495{ 2533{
2534 bool transparent = false;
2535
2496#ifdef HAVE_BG_PIXMAP 2536#ifdef HAVE_BG_PIXMAP
2497 bgPixmap.apply (); 2537 if (bg_img != 0)
2498#else 2538 {
2539# if ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT)
2541 {
2542 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2499 2544
2545 transparent = true;
2546 }
2547 else
2548# endif
2549 {
2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2551 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2552 }
2553 }
2554 else
2555#endif
2556 {
2500 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2557 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2501 XClearWindow (dpy, parent[0]);
2502 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2558 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2559 }
2560
2561 XClearWindow (dpy, parent);
2503 2562
2504 if (scrollBar.win) 2563 if (scrollBar.win)
2505 { 2564 {
2565 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else
2506 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2507 scrollBar.state = STATE_IDLE; 2569 scrollBar.state = SB_STATE_IDLE;
2508 scrollBar.show (0); 2570 scrollBar.show (0);
2509 } 2571 }
2510 2572
2511#endif 2573 if (refresh)
2512 2574 {
2513 /* bgPixmap.apply () does not do the following : */
2514 scr_clear (); 2575 scr_clear ();
2515 scr_touch (true); 2576 scr_touch (true);
2577 }
2516 want_refresh = 1; 2578 want_refresh = 1;
2517} 2579}
2518 2580
2519/* ------------------------------------------------------------------------- */ 2581/* ------------------------------------------------------------------------- */
2520void 2582void
… …
2577 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2639 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2578 srp[col] ^= rstyle; 2640 srp[col] ^= rstyle;
2579} 2641}
2580 2642
2581/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2582void 2644void ecb_hot
2583rxvt_term::scr_reverse_selection () NOTHROW 2645rxvt_term::scr_reverse_selection () NOTHROW
2584{ 2646{
2585 if (selection.op 2647 if (selection.op
2586 && current_screen == selection.screen 2648 && current_screen == selection.screen
2587 && selection.end.row >= view_start) 2649 && selection.end.row >= view_start)
2588 { 2650 {
2589#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2590 if (selection.rect) 2652 if (selection.rect)
2591 scr_xor_rect (selection.beg.row, selection.beg.col, 2653 scr_xor_rect (selection.beg.row, selection.beg.col,
2592 selection.end.row, selection.end.col, 2654 selection.end.row, selection.end.col,
2593 RS_RVid, RS_RVid | RS_Uline); 2655 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2594 else 2656 else
2595#endif 2657#endif
2596 scr_xor_span (selection.beg.row, selection.beg.col, 2658 scr_xor_span (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col, 2659 selection.end.row, selection.end.col,
2598 RS_RVid); 2660 RS_Sel | RS_RVid);
2599 } 2661 }
2600} 2662}
2601 2663
2602/* ------------------------------------------------------------------------- */ 2664/* ------------------------------------------------------------------------- */
2603/* 2665/*
… …
2606 */ 2668 */
2607#if 0 2669#if 0
2608void 2670void
2609rxvt_term::scr_dump (int fd) NOTHROW 2671rxvt_term::scr_dump (int fd) NOTHROW
2610{ 2672{
2611 int row, wrote; 2673 // if this method is needed, it can be implemented by factoring the
2612 unsigned int width, towrite; 2674 // relevant code in scr_printscreen
2613 char r1[] = "\n";
2614
2615 for (row = saveLines + top_row;
2616 row < saveLines + nrow - 1; row++)
2617 {
2618 width = row_buf[row].l >= 0 ? row_buf[row].l
2619 : ncol;
2620 for (towrite = width; towrite; towrite -= wrote)
2621 {
2622 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2623 towrite);
2624 if (wrote < 0)
2625 return; /* XXX: death, no report */
2626 }
2627 if (row_buf[row].l >= 0)
2628 if (write (fd, r1, 1) <= 0)
2629 return; /* XXX: death, no report */
2630 }
2631} 2675}
2632#endif 2676#endif
2633 2677
2634/* ------------------------------------------------------------------------- * 2678/* ------------------------------------------------------------------------- *
2635 * CHARACTER SELECTION * 2679 * CHARACTER SELECTION *
2636 * ------------------------------------------------------------------------- */ 2680 * ------------------------------------------------------------------------- */
2637void 2681void
2638rxvt_term::selection_check (int check_more) NOTHROW 2682rxvt_term::selection_check (int check_more) NOTHROW
2639{ 2683{
2640 row_col_t pos;
2641
2642 if (!selection.op) 2684 if (!selection.op)
2643 return; 2685 return;
2644 2686
2645 pos.row = pos.col = 0;
2646 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2647 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2648 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2649 || (check_more == 1 2690 || (check_more == 1
2650 && current_screen == selection.screen 2691 && current_screen == selection.screen
2651 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2652 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2653 || (check_more == 2
2654 && ROWCOL_IS_BEFORE (selection.beg, pos)
2655 && ROWCOL_IS_AFTER (selection.end, pos))
2656 || (check_more == 3
2657 && ROWCOL_IS_AFTER (selection.end, pos))
2658 || (check_more == 4 /* screen width change */
2659 && (selection.beg.row != selection.end.row
2660 || selection.end.col > ncol)))
2661 CLEAR_SELECTION (); 2694 CLEAR_ALL_SELECTION ();
2662} 2695}
2663 2696
2664/* ------------------------------------------------------------------------- */ 2697/* ------------------------------------------------------------------------- */
2665/* 2698/*
2666 * Paste a selection direct to the command fd 2699 * Paste a selection direct to the command fd
2667 */ 2700 */
2668void 2701void
2669rxvt_term::paste (char *data, unsigned int len) NOTHROW 2702rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2670{ 2703{
2671 /* convert normal newline chars into common keyboard Return key sequence */ 2704 /* convert normal newline chars into common keyboard Return key sequence */
2672 for (unsigned int i = 0; i < len; i++) 2705 for (unsigned int i = 0; i < len; i++)
2673 if (data[i] == C0_LF) 2706 if (data[i] == C0_LF)
2674 data[i] = C0_CR; 2707 data[i] = C0_CR;
2675 2708
2676 if (priv_modes & PrivMode_BracketPaste) 2709 if (priv_modes & PrivMode_BracketPaste)
2677 tt_printf ("\e[200~"); 2710 tt_printf ("\x1b[200~");
2678 2711
2679 tt_write (data, len); 2712 tt_write (data, len);
2680 2713
2681 if (priv_modes & PrivMode_BracketPaste) 2714 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[201~"); 2715 tt_printf ("\x1b[201~");
2683} 2716}
2684 2717
2685/* ------------------------------------------------------------------------- */
2686/*
2687 * Respond to a notification that a primary selection has been sent
2688 * EXT: SelectionNotify
2689 */
2690void 2718void
2691rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2719rxvt_term::paste (char *data, unsigned int len) NOTHROW
2692{ 2720{
2693 if (prop == None) /* check for failed XConvertSelection */ 2721 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2694 {
2695 if ((selection_type & Sel_CompoundText))
2696 {
2697 int selnum = selection_type & Sel_whereMask;
2698
2699 selection_type = 0;
2700 if (selnum != Sel_direct)
2701 selection_request_other (XA_STRING, selnum);
2702 }
2703
2704 if ((selection_type & Sel_UTF8String))
2705 {
2706 int selnum = selection_type & Sel_whereMask;
2707
2708 selection_type = Sel_CompoundText;
2709 if (selnum != Sel_direct)
2710 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2711 else
2712 selection_type = 0;
2713 }
2714
2715 return;
2716 }
2717
2718 unsigned long bytes_after;
2719 XTextProperty ct;
2720
2721 if (XGetWindowProperty (dpy, win, prop,
2722 0, PROP_SIZE / 4,
2723 delete_prop, AnyPropertyType,
2724 &ct.encoding, &ct.format,
2725 &ct.nitems, &bytes_after,
2726 &ct.value) != Success)
2727 {
2728 ct.value = 0;
2729 goto bailout;
2730 }
2731
2732 if (ct.encoding == None)
2733 goto bailout;
2734
2735 if (bytes_after)
2736 {
2737 // fetch and append remaining data
2738 XTextProperty ct2;
2739
2740 if (XGetWindowProperty (dpy, win, prop,
2741 ct.nitems / 4, (bytes_after + 3) / 4,
2742 delete_prop, AnyPropertyType,
2743 &ct2.encoding, &ct2.format,
2744 &ct2.nitems, &bytes_after,
2745 &ct2.value) != Success)
2746 goto bailout;
2747
2748 // realloc should be compatible to XFree, here, and elsewhere, too
2749 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2750 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2751 ct.nitems += ct2.nitems;
2752
2753 XFree (ct2.value);
2754 }
2755
2756 if (ct.value == 0)
2757 goto bailout;
2758
2759 if (ct.encoding == xa[XA_INCR])
2760 {
2761 // INCR selection, start handshake
2762 if (!delete_prop)
2763 XDeleteProperty (dpy, win, prop);
2764
2765 selection_wait = Sel_incr;
2766 incr_buf_fill = 0;
2767 incr_ev.start (10);
2768
2769 goto bailout;
2770 }
2771
2772 if (ct.nitems == 0)
2773 {
2774 if (selection_wait == Sel_incr)
2775 {
2776 XFree (ct.value);
2777
2778 // finally complete, now paste the whole thing
2779 selection_wait = Sel_normal;
2780 ct.value = (unsigned char *)incr_buf;
2781 ct.nitems = incr_buf_fill;
2782 incr_buf = 0;
2783 incr_buf_size = 0;
2784 incr_ev.stop ();
2785 }
2786 else
2787 {
2788 if (selection_wait == Sel_normal
2789 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2790 {
2791 /*
2792 * pass through again trying CUT_BUFFER0 if we've come from
2793 * XConvertSelection () but nothing was presented
2794 */
2795 selection_paste (display->root, XA_CUT_BUFFER0, False);
2796 }
2797
2798 goto bailout;
2799 }
2800 }
2801 else if (selection_wait == Sel_incr)
2802 {
2803 incr_ev.start (10);
2804
2805 while (incr_buf_fill + ct.nitems > incr_buf_size)
2806 {
2807 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2808 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2809 }
2810
2811 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2812 incr_buf_fill += ct.nitems;
2813
2814 goto bailout;
2815 }
2816
2817 char **cl;
2818 int cr;
2819
2820#if !ENABLE_MINIMAL
2821 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2822 // so recode it manually
2823 if (ct.encoding == xa[XA_UTF8_STRING])
2824 {
2825 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2826 char *s = rxvt_wcstombs (w);
2827 free (w);
2828 // TODO: strlen == only the first element will be converted. well...
2829 paste (s, strlen (s));
2830 free (s);
2831 }
2832 else
2833#endif
2834 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2835 && cl)
2836 {
2837 for (int i = 0; i < cr; i++)
2838 paste (cl[i], strlen (cl[i]));
2839
2840 XFreeStringList (cl);
2841 }
2842 else
2843 paste ((char *)ct.value, ct.nitems); // paste raw
2844
2845bailout:
2846 XFree (ct.value);
2847
2848 if (selection_wait == Sel_normal)
2849 selection_wait = Sel_none;
2850}
2851
2852void
2853rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2854{
2855 selection_wait = Sel_none;
2856
2857 incr_buf_size = 0;
2858 free (incr_buf);
2859
2860 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2861}
2862
2863void
2864rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2865{
2866 if (prop == None || selection_wait != Sel_incr)
2867 return; 2722 return;
2868 2723
2869 selection_paste (win, prop, true); 2724 tt_paste (data, len);
2870} 2725}
2871 2726
2872/* ------------------------------------------------------------------------- */ 2727/* ------------------------------------------------------------------------- */
2873/* 2728/*
2874 * Request the current selection: 2729 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2875 * Order: > internal selection if available 2730 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2876 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2731 * as fallback
2877 * > CUT_BUFFER0
2878 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2879 * will auto fallback to CUT_BUFFER0
2880 * EXT: button 2 release 2732 * EXT: button 2 release
2881 */ 2733 */
2882void 2734void
2883rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2735rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2884{ 2736{
2885 if (selection.text && selnum == Sel_Primary) 2737 if (!selection_req)
2886 {
2887 /* internal selection */
2888 char *str = rxvt_wcstombs (selection.text, selection.len);
2889 paste (str, strlen (str));
2890 free (str);
2891 return;
2892 } 2738 {
2893 else 2739 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2740 selection_req->run ();
2894 { 2741 }
2895 selection_request_time = tm;
2896 selection_wait = Sel_normal;
2897
2898#if X_HAVE_UTF8_STRING
2899 selection_type = Sel_UTF8String;
2900 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2901 return;
2902#else
2903 selection_type = Sel_CompoundText;
2904 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2905 return;
2906#endif
2907 }
2908
2909 selection_wait = Sel_none; /* don't loop in selection_paste () */
2910 selection_paste (display->root, XA_CUT_BUFFER0, false);
2911}
2912
2913int
2914rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2915{
2916 Atom sel;
2917
2918 selection_type |= selnum;
2919
2920 if (selnum == Sel_Primary)
2921 sel = XA_PRIMARY;
2922 else if (selnum == Sel_Secondary)
2923 sel = XA_SECONDARY;
2924 else
2925 sel = xa[XA_CLIPBOARD];
2926
2927 if (XGetSelectionOwner (dpy, sel) != None)
2928 {
2929 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2930 vt, selection_request_time);
2931 return 1;
2932 }
2933
2934 return 0;
2935} 2742}
2936 2743
2937/* ------------------------------------------------------------------------- */ 2744/* ------------------------------------------------------------------------- */
2938/* 2745/*
2939 * Clear all selected text 2746 * Clear all selected text
2940 * EXT: SelectionClear 2747 * EXT: SelectionClear
2941 */ 2748 */
2942void 2749void
2943rxvt_term::selection_clear () NOTHROW 2750rxvt_term::selection_clear (bool clipboard) NOTHROW
2944{ 2751{
2752 if (!clipboard)
2753 {
2945 want_refresh = 1; 2754 want_refresh = 1;
2946 free (selection.text); 2755 free (selection.text);
2947 selection.text = NULL; 2756 selection.text = NULL;
2948 selection.len = 0; 2757 selection.len = 0;
2949 CLEAR_SELECTION (); 2758 CLEAR_SELECTION ();
2950 2759
2951 if (display->selection_owner == this) 2760 if (display->selection_owner == this)
2952 display->selection_owner = 0; 2761 display->selection_owner = 0;
2762 }
2763 else
2764 {
2765 free (selection.clip_text);
2766 selection.clip_text = NULL;
2767 selection.clip_len = 0;
2768
2769 if (display->clipboard_owner == this)
2770 display->clipboard_owner = 0;
2771 }
2953} 2772}
2954 2773
2955/* ------------------------------------------------------------------------- */ 2774/* ------------------------------------------------------------------------- */
2956/* 2775/*
2957 * Copy a selection into the cut buffer 2776 * Copy a selection into the cut buffer
2958 * EXT: button 1 or 3 release 2777 * EXT: button 1 or 3 release
2959 */ 2778 */
2960void 2779void
2961rxvt_term::selection_make (Time tm) 2780rxvt_term::selection_make (Time tm)
2962{ 2781{
2963 int i; 2782 int size;
2964 wchar_t *new_selection_text; 2783 wchar_t *new_selection_text;
2965 text_t *t; 2784 text_t *t;
2966 2785
2967 switch (selection.op) 2786 switch (selection.op)
2968 { 2787 {
… …
2984 return; /* nothing selected, go away */ 2803 return; /* nothing selected, go away */
2985 2804
2986 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2805 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2987 return; 2806 return;
2988 2807
2989 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2808 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2990 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2809 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2991 2810
2992 int ofs = 0; 2811 int ofs = 0;
2993 int extra = 0; 2812 int extra = 0;
2994 2813
2995 int col = selection.beg.col; 2814 int col = selection.beg.col;
… …
3001 { 2820 {
3002#if !ENABLE_MINIMAL 2821#if !ENABLE_MINIMAL
3003 if (selection.rect) 2822 if (selection.rect)
3004 { 2823 {
3005 col = selection.beg.col; 2824 col = selection.beg.col;
3006 end_col = ncol + 1; 2825 end_col = selection.end.col;
3007 } 2826 }
3008 else 2827 else
3009#endif 2828#endif
3010 end_col = ROW(row).l; 2829 end_col = ROW(row).l;
3011 2830
3012 col = max (col, 0); 2831 col = max (col, 0);
3013 2832
3014 if (row == selection.end.row 2833 if (row == selection.end.row)
3015#if !ENABLE_MINIMAL
3016 || selection.rect
3017#endif
3018 )
3019 min_it (end_col, selection.end.col); 2834 min_it (end_col, selection.end.col);
3020 2835
3021 t = ROW(row).t + col; 2836 t = ROW(row).t + col;
3022 2837
3023 for (; col < end_col; col++) 2838 for (; col < end_col; col++)
… …
3031 2846
3032 extra -= (len - 1); 2847 extra -= (len - 1);
3033 2848
3034 if (extra < 0) 2849 if (extra < 0)
3035 { 2850 {
3036 extra += i; 2851 extra += size;
3037 i += i; 2852 size += size;
3038 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2853 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3039 } 2854 }
3040 2855
3041 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2856 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3042 } 2857 }
3043#endif 2858#endif
… …
3055 2870
3056 new_selection_text[ofs++] = C0_LF; 2871 new_selection_text[ofs++] = C0_LF;
3057 } 2872 }
3058 else 2873 else
3059#endif 2874#endif
3060 if (!ROW(row).is_longer () && row != selection.end.row) 2875 if (!ROW(row).is_longer ()
2876 && (row != selection.end.row || end_col != selection.end.col)
2877 && (row != selection.beg.row || selection.beg.col < ncol))
3061 new_selection_text[ofs++] = C0_LF; 2878 new_selection_text[ofs++] = C0_LF;
3062 } 2879 }
3063
3064 if (end_col != selection.end.col)
3065 new_selection_text[ofs++] = C0_LF;
3066 2880
3067 new_selection_text[ofs] = 0; 2881 new_selection_text[ofs] = 0;
3068 2882
3069 if (ofs == 0) 2883 if (ofs == 0)
3070 { 2884 {
… …
3083 2897
3084 selection_grab (tm); 2898 selection_grab (tm);
3085} 2899}
3086 2900
3087bool 2901bool
3088rxvt_term::selection_grab (Time tm) NOTHROW 2902rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3089{ 2903{
2904 Atom sel;
2905
2906 if (!clipboard)
2907 {
3090 selection_time = tm; 2908 selection_time = tm;
2909 sel = XA_PRIMARY;
2910 }
2911 else
2912 {
2913 clipboard_time = tm;
2914 sel = xa[XA_CLIPBOARD];
2915 }
3091 2916
3092 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2917 XSetSelectionOwner (dpy, sel, vt, tm);
3093 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2918 if (XGetSelectionOwner (dpy, sel) == vt)
3094 { 2919 {
3095 display->set_selection_owner (this); 2920 display->set_selection_owner (this, clipboard);
3096 return true; 2921 return true;
3097 } 2922 }
3098 else 2923 else
3099 { 2924 {
3100 selection_clear (); 2925 selection_clear (clipboard);
3101 return false; 2926 return false;
3102 } 2927 }
3103 2928
3104#if 0 2929#if 0
3105 XTextProperty ct; 2930 XTextProperty ct;
… …
3115/* ------------------------------------------------------------------------- */ 2940/* ------------------------------------------------------------------------- */
3116/* 2941/*
3117 * Mark or select text based upon number of clicks: 1, 2, or 3 2942 * Mark or select text based upon number of clicks: 1, 2, or 3
3118 * EXT: button 1 press 2943 * EXT: button 1 press
3119 */ 2944 */
3120void 2945void ecb_cold
3121rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2946rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3122{ 2947{
3123 clicks = ((clicks - 1) % 3) + 1; 2948 clicks = ((clicks - 1) % 3) + 1;
3124 selection.clicks = clicks; /* save clicks so extend will work */ 2949 selection.clicks = clicks; /* save clicks so extend will work */
3125 2950
… …
3144 2969
3145/* ------------------------------------------------------------------------- */ 2970/* ------------------------------------------------------------------------- */
3146/* 2971/*
3147 * Mark a selection at the specified col/row 2972 * Mark a selection at the specified col/row
3148 */ 2973 */
3149void 2974void ecb_cold
3150rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2975rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3151{ 2976{
3152 want_refresh = 1; 2977 want_refresh = 1;
3153 2978
3154 selection.mark.row = row + view_start; 2979 selection.mark.row = row + view_start;
… …
3181/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3006/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3182#define DELIMIT_TEXT(x) \ 3007#define DELIMIT_TEXT(x) \
3183 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3008 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3184#define DELIMIT_REND(x) 1 3009#define DELIMIT_REND(x) 1
3185 3010
3186void 3011void ecb_cold
3187rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3012rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3188{ 3013{
3189 int col, row, dirnadd, tcol, trow, w1, w2; 3014 int col, row, dirnadd, tcol, trow, w1, w2;
3190 row_col_t bound; 3015 row_col_t bound;
3191 text_t *stp; 3016 text_t *stp;
… …
3265 * EXT: button 3 press; button 1 or 3 drag 3090 * EXT: button 3 press; button 1 or 3 drag
3266 * flag == 0 ==> button 1 3091 * flag == 0 ==> button 1
3267 * flag == 1 ==> button 3 press 3092 * flag == 1 ==> button 3 press
3268 * flag == 2 ==> button 3 motion 3093 * flag == 2 ==> button 3 motion
3269 */ 3094 */
3270void 3095void ecb_cold
3271rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3096rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3272{ 3097{
3273 int col = clamp (Pixel2Col (x), 0, ncol); 3098 int col = clamp (Pixel2Col (x), 0, ncol);
3274 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3099 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3275 3100
… …
3301 3126
3302/* ------------------------------------------------------------------------- */ 3127/* ------------------------------------------------------------------------- */
3303/* 3128/*
3304 * Extend the selection to the specified col/row 3129 * Extend the selection to the specified col/row
3305 */ 3130 */
3306void 3131void ecb_cold
3307rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3132rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3308{ 3133{
3309 row_col_t pos; 3134 row_col_t pos;
3310 enum { 3135 enum {
3311 LEFT, RIGHT 3136 LEFT, RIGHT
… …
3502 ::swap (selection.beg.col, selection.end.col); 3327 ::swap (selection.beg.col, selection.end.col);
3503#endif 3328#endif
3504} 3329}
3505 3330
3506#if !ENABLE_MINIMAL 3331#if !ENABLE_MINIMAL
3507void 3332void ecb_cold
3508rxvt_term::selection_remove_trailing_spaces () NOTHROW 3333rxvt_term::selection_remove_trailing_spaces () NOTHROW
3509{ 3334{
3510 int32_t end_col, end_row; 3335 int32_t end_col, end_row;
3511 text_t *stp; 3336 text_t *stp;
3512 3337
… …
3550/* ------------------------------------------------------------------------- */ 3375/* ------------------------------------------------------------------------- */
3551/* 3376/*
3552 * Double click on button 3 when already selected 3377 * Double click on button 3 when already selected
3553 * EXT: button 3 double click 3378 * EXT: button 3 double click
3554 */ 3379 */
3555void 3380void ecb_cold
3556rxvt_term::selection_rotate (int x, int y) NOTHROW 3381rxvt_term::selection_rotate (int x, int y) NOTHROW
3557{ 3382{
3558 selection.clicks = selection.clicks % 3 + 1; 3383 selection.clicks = selection.clicks % 3 + 1;
3559 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3384 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3560} 3385}
… …
3562/* ------------------------------------------------------------------------- */ 3387/* ------------------------------------------------------------------------- */
3563/* 3388/*
3564 * Respond to a request for our current selection 3389 * Respond to a request for our current selection
3565 * EXT: SelectionRequest 3390 * EXT: SelectionRequest
3566 */ 3391 */
3567void 3392void ecb_cold
3568rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3393rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3569{ 3394{
3395 Atom property = rq.property == None ? rq.target : rq.property;
3570 XSelectionEvent ev; 3396 XSelectionEvent ev;
3571 3397
3572 ev.type = SelectionNotify; 3398 ev.type = SelectionNotify;
3573 ev.property = None; 3399 ev.property = None;
3574 ev.display = rq.display; 3400 ev.display = rq.display;
… …
3589 *target++ = xa[XA_COMPOUND_TEXT]; 3415 *target++ = xa[XA_COMPOUND_TEXT];
3590#if X_HAVE_UTF8_STRING 3416#if X_HAVE_UTF8_STRING
3591 *target++ = xa[XA_UTF8_STRING]; 3417 *target++ = xa[XA_UTF8_STRING];
3592#endif 3418#endif
3593 3419
3594 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3420 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3595 32, PropModeReplace, 3421 32, PropModeReplace,
3596 (unsigned char *)target_list, target - target_list); 3422 (unsigned char *)target_list, target - target_list);
3597 ev.property = rq.property; 3423 ev.property = property;
3598 } 3424 }
3599#if TODO // TODO 3425#if TODO // TODO
3600 else if (rq.target == xa[XA_MULTIPLE]) 3426 else if (rq.target == xa[XA_MULTIPLE])
3601 { 3427 {
3602 /* TODO: Handle MULTIPLE */ 3428 /* TODO: Handle MULTIPLE */
3603 } 3429 }
3604#endif 3430#endif
3605 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3431 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3606 { 3432 {
3607 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3433 XChangeProperty (dpy, rq.requestor, property, rq.target,
3608 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3434 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3609 ev.property = rq.property; 3435 ev.property = property;
3436 }
3437 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3438 {
3439 XChangeProperty (dpy, rq.requestor, property, rq.target,
3440 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3441 ev.property = property;
3610 } 3442 }
3611 else if (rq.target == XA_STRING 3443 else if (rq.target == XA_STRING
3612 || rq.target == xa[XA_TEXT] 3444 || rq.target == xa[XA_TEXT]
3613 || rq.target == xa[XA_COMPOUND_TEXT] 3445 || rq.target == xa[XA_COMPOUND_TEXT]
3614 || rq.target == xa[XA_UTF8_STRING] 3446 || rq.target == xa[XA_UTF8_STRING]
… …
3646 { 3478 {
3647 target = xa[XA_COMPOUND_TEXT]; 3479 target = xa[XA_COMPOUND_TEXT];
3648 style = enc_compound_text; 3480 style = enc_compound_text;
3649 } 3481 }
3650 3482
3651 if (selection.text) 3483 if (rq.selection == XA_PRIMARY && selection.text)
3652 { 3484 {
3653 cl = selection.text; 3485 cl = selection.text;
3654 selectlen = selection.len; 3486 selectlen = selection.len;
3487 }
3488 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3489 {
3490 cl = selection.clip_text;
3491 selectlen = selection.clip_len;
3655 } 3492 }
3656 else 3493 else
3657 { 3494 {
3658 cl = L""; 3495 cl = L"";
3659 selectlen = 0; 3496 selectlen = 0;
… …
3680 ct.value = (unsigned char *)cl; 3517 ct.value = (unsigned char *)cl;
3681 ct.nitems = selectlen; 3518 ct.nitems = selectlen;
3682 ct.encoding = target; 3519 ct.encoding = target;
3683 } 3520 }
3684 3521
3685 XChangeProperty (dpy, rq.requestor, rq.property, 3522 XChangeProperty (dpy, rq.requestor, property,
3686 ct.encoding, 8, PropModeReplace, 3523 ct.encoding, 8, PropModeReplace,
3687 ct.value, (int)ct.nitems); 3524 ct.value, (int)ct.nitems);
3688 ev.property = rq.property; 3525 ev.property = property;
3689 3526
3690 if (freect) 3527 if (freect)
3691 XFree (ct.value); 3528 XFree (ct.value);
3692 } 3529 }
3693 3530
3694 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3531 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3695} 3532}
3696 3533
3697/* ------------------------------------------------------------------------- */ 3534/* ------------------------------------------------------------------------- */
3698#ifdef USE_XIM 3535#if USE_XIM
3699void 3536void ecb_cold
3700rxvt_term::im_set_position (XPoint &pos) NOTHROW 3537rxvt_term::im_set_position (XPoint &pos) NOTHROW
3701{ 3538{
3702 XWindowAttributes xwa; 3539 XWindowAttributes xwa;
3703 3540
3704 XGetWindowAttributes (dpy, vt, &xwa); 3541 XGetWindowAttributes (dpy, vt, &xwa);
… …
3727 h += 2; min_it (h, nrow); 3564 h += 2; min_it (h, nrow);
3728 3565
3729 x -= 1; clamp_it (x, 0, ncol - w); 3566 x -= 1; clamp_it (x, 0, ncol - w);
3730 y -= 1; clamp_it (y, 0, nrow - h); 3567 y -= 1; clamp_it (y, 0, nrow - h);
3731 3568
3732 ov_x = x; ov_y = y; 3569 ov.x = x; ov.y = y;
3733 ov_w = w; ov_h = h; 3570 ov.w = w; ov.h = h;
3734 3571
3735 ov_text = new text_t *[h]; 3572 ov.text = new text_t *[h];
3736 ov_rend = new rend_t *[h]; 3573 ov.rend = new rend_t *[h];
3737 3574
3738 for (y = 0; y < h; y++) 3575 for (y = 0; y < h; y++)
3739 { 3576 {
3740 text_t *tp = ov_text[y] = new text_t[w]; 3577 text_t *tp = ov.text[y] = new text_t[w];
3741 rend_t *rp = ov_rend[y] = new rend_t[w]; 3578 rend_t *rp = ov.rend[y] = new rend_t[w];
3742 3579
3743 text_t t0, t1, t2; 3580 text_t t0, t1, t2;
3744 rend_t r = OVERLAY_RSTYLE; 3581 rend_t r = OVERLAY_RSTYLE;
3745 3582
3746 if (y == 0) 3583 if (y == 0)
… …
3765} 3602}
3766 3603
3767void 3604void
3768rxvt_term::scr_overlay_off () NOTHROW 3605rxvt_term::scr_overlay_off () NOTHROW
3769{ 3606{
3770 if (!ov_text) 3607 if (!ov.text)
3771 return; 3608 return;
3772 3609
3773 want_refresh = 1; 3610 want_refresh = 1;
3774 3611
3775 for (int y = 0; y < ov_h; y++) 3612 for (int y = 0; y < ov.h; y++)
3776 { 3613 {
3777 delete [] ov_text[y]; 3614 delete [] ov.text[y];
3778 delete [] ov_rend[y]; 3615 delete [] ov.rend[y];
3779 } 3616 }
3780 3617
3781 delete [] ov_text; ov_text = 0; 3618 delete [] ov.text; ov.text = 0;
3782 delete [] ov_rend; ov_rend = 0; 3619 delete [] ov.rend; ov.rend = 0;
3783} 3620}
3784 3621
3785void 3622void
3786rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3623rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3787{ 3624{
3788 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3625 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3789 return; 3626 return;
3790 3627
3791 x++, y++; 3628 x++, y++;
3792 3629
3793 ov_text[y][x] = text; 3630 ov.text[y][x] = text;
3794 ov_rend[y][x] = rend; 3631 ov.rend[y][x] = rend;
3795} 3632}
3796 3633
3797void 3634void
3798rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3635rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3799{ 3636{
… …
3818} 3655}
3819 3656
3820void 3657void
3821rxvt_term::scr_swap_overlay () NOTHROW 3658rxvt_term::scr_swap_overlay () NOTHROW
3822{ 3659{
3823 if (!ov_text) 3660 if (!ov.text)
3824 return; 3661 return;
3825 3662
3663 // hide cursor if it is within the overlay area
3664 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3665 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3666 screen.flags &= ~Screen_VisibleCursor;
3667
3826 // swap screen mem with overlay 3668 // swap screen mem with overlay
3827 for (int y = ov_h; y--; ) 3669 for (int y = ov.h; y--; )
3828 { 3670 {
3829 text_t *t1 = ov_text[y]; 3671 text_t *t1 = ov.text[y];
3830 rend_t *r1 = ov_rend[y]; 3672 rend_t *r1 = ov.rend[y];
3831 3673
3832 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3674 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3833 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3675 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3834 3676
3835 for (int x = ov_w; x--; ) 3677 for (int x = ov.w; x--; )
3836 { 3678 {
3837 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3679 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3838 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3680 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3839 } 3681 }
3840 } 3682 }

Diff Legend

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