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

Diff Legend

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