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

Diff Legend

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