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.404 by sf-exg, Tue Nov 15 20:07:10 2011 UTC vs.
Revision 1.456 by sf-exg, Tue Oct 13 08:10:43 2015 UTC

… …
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 <schmorp@schmorp.de> 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 separate compile!
34
35static inline void 34static inline void
36fill_text (text_t *start, text_t value, int len) 35fill_text (text_t *start, text_t value, int len)
37{ 36{
38 while (len--) 37 while (len--)
39 *start++ = value; 38 *start++ = value;
… …
49 if (option (Opt_scrollTtyOutput)) \ 48 if (option (Opt_scrollTtyOutput)) \
50 view_start = 0 49 view_start = 0
51#define CLEAR_SELECTION() \ 50#define CLEAR_SELECTION() \
52 selection.beg.row = selection.beg.col \ 51 selection.beg.row = selection.beg.col \
53 = selection.end.row = selection.end.col = 0 52 = selection.end.row = selection.end.col = 0
54#define CLEAR_SELECTION_MARK() \ 53#define CLEAR_ALL_SELECTION() \
54 selection.beg.row = selection.beg.col \
55 = selection.mark.row = selection.mark.col \
55 selection.mark.row = selection.mark.col = 0 56 = selection.end.row = selection.end.col = 0
56 57
57#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 58#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
58 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 59 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
59#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 60#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
60 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 61 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
… …
96 97
97/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
98void 99void
99rxvt_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
100{ 101{
101 if (!l.t) 102 if (!l.valid ())
102 { 103 {
103 lalloc (l); 104 l.alloc ();
104 col = 0; 105 col = 0;
105 width = ncol; 106 width = ncol;
106 } 107 }
107 108
108 l.touch (); 109 l.touch ();
… …
150 l.r[col] = rend; 151 l.r[col] = rend;
151 col++; 152 col++;
152 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
153} 154}
154 155
156// set the rendition of a single wide character beginning at the given column
157void
158rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
159{
160 do {
161 l.r[col] = rend;
162 col++;
163 } while (col < ncol && l.t[col] == NOCHAR);
164}
165
155/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
158 169
159void 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
160rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
161{ 216{
162#if ENABLE_OVERLAY 217#if ENABLE_OVERLAY
163 scr_overlay_off (); 218 scr_overlay_off ();
164#endif 219#endif
… …
190 total_rows = nrow + saveLines; 245 total_rows = nrow + saveLines;
191 246
192 screen.tscroll = 0; 247 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
194 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
195 if (!row_buf) 258 if (!prev_row_buf)
196 { 259 {
197 /*
198 * first time called so just malloc everything: don't rely on realloc
199 */
200 top_row = 0; 260 top_row = 0;
201 term_start = 0; 261 term_start = 0;
202
203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205
206 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209
210 for (int row = nrow; row--; )
211 {
212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 }
216 262
217 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 265 screen.flags = Screen_DefaultFlags;
220 screen.cur.row = screen.cur.col = 0; 266 screen.cur.row = screen.cur.col = 0;
… …
243 { 289 {
244 /* 290 /*
245 * add or delete rows as appropriate 291 * add or delete rows as appropriate
246 */ 292 */
247 293
248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 294 int common_col = min (prev_ncol, ncol);
249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250
251#if 0
252 if (nrow < prev_nrow)
253 {
254 for (int row = nrow; row < prev_nrow; row++)
255 {
256 lfree (swap_buf [row]);
257 lfree (drawn_buf[row]);
258 }
259 }
260#endif
261
262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264 295
265 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
266 { 297 {
267 lresize (drawn_buf[row]); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268 lresize (swap_buf [row]); 299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
269 } 300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
270 301
271 for (int row = prev_nrow; row < nrow; row++) 302 copy_line (swap_buf [row], prev_swap_buf [row]);
272 { 303 }
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 }
276
277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
279 304
280 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
281 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
283 308
… …
291 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 316 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
292 317
293 do 318 do
294 { 319 {
295 p = MOD (p - 1, prev_total_rows); 320 p = MOD (p - 1, prev_total_rows);
296 assert (old_buf [MOD (p, prev_total_rows)].t); 321 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297 int plines = 1; 322 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l; 323 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
299 324
300 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 ())
301 { 326 {
302 p = MOD (p - 1, prev_total_rows); 327 p = MOD (p - 1, prev_total_rows);
303 328
304 plines++; 329 plines++;
305 llen += prev_ncol; 330 llen += prev_ncol;
… …
318 343
319 // re-assemble the full line by destination lines 344 // re-assemble the full line by destination lines
320 for (int qrow = q; qlines--; qrow++) 345 for (int qrow = q; qlines--; qrow++)
321 { 346 {
322 qline = row_buf + qrow; 347 qline = row_buf + qrow;
323 lalloc (*qline); 348 qline->alloc (); // redundant with next line
324 qline->l = ncol; 349 qline->l = ncol;
325 qline->is_longer (1); 350 qline->is_longer (1);
326 351
327 int qcol = 0; 352 int qcol = 0;
328 353
… …
343 // this seems to upset applications/shells/readline 368 // this seems to upset applications/shells/readline
344 // least. 369 // least.
345 if (prow == ocur.row) 370 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow); 371 screen.cur.row = q - (total_rows - nrow);
347 372
348 line_t &pline = old_buf [prow]; 373 line_t &pline = prev_row_buf [prow];
349 374
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 375 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 376
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 377 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 378 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
374 { 399 {
375 // if no scrollback exists (yet), wing, instead of wrap 400 // if no scrollback exists (yet), wing, instead of wrap
376 401
377 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
378 { 403 {
379 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)];
380 line_t &qline = row_buf [row]; 405 line_t &dst = row_buf [row];
381 406
382 qline = pline; 407 copy_line (dst, src);
383 lresize (qline);
384 } 408 }
385 409
386 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390 412
391 term_start = 0; 413 term_start = 0;
392 } 414 }
393
394 free (old_buf);
395 delete old_ta;
396 delete old_ra;
397 415
398 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
399 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
400 } 418 }
401 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
402 free (tabs); 429 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol); 430 tabs = (char *)rxvt_malloc (ncol);
404 431
405 for (int col = ncol; col--; ) 432 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0; 433 tabs [col] = col % TABSIZE == 0;
407 434
408 CLEAR_SELECTION (); 435 CLEAR_ALL_SELECTION ();
409 CLEAR_SELECTION_MARK ();
410 436
411 prev_nrow = nrow; 437 prev_nrow = nrow;
412 prev_ncol = ncol; 438 prev_ncol = ncol;
413 439
414 tt_winch (); 440 tt_winch ();
415 441
416 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
417} 443}
418 444
419/* ------------------------------------------------------------------------- */ 445void ecb_cold
420/*
421 * Free everything. That way malloc debugging can find leakage.
422 */
423void
424rxvt_term::scr_release () NOTHROW 446rxvt_term::scr_release () NOTHROW
425{ 447{
426 if (row_buf) 448 chunk_free (chunk, chunk_size);
427 { 449 chunk = 0;
428 delete talloc; talloc = 0; 450 row_buf = 0;
429 delete ralloc; ralloc = 0;
430 451
431 free (row_buf);
432 free (swap_buf);
433 free (drawn_buf);
434 row_buf = 0; // signal that we freed all the arrays above
435
436 free (tabs); 452 free (tabs);
437 tabs = 0; 453 tabs = 0;
438 }
439} 454}
440 455
441/* ------------------------------------------------------------------------- */ 456/* ------------------------------------------------------------------------- */
442/* 457/*
443 * Hard/Soft reset 458 * Hard/Soft reset
444 */ 459 */
445void 460void ecb_cold
446rxvt_term::scr_poweron () 461rxvt_term::scr_poweron ()
447{ 462{
448 scr_release (); 463 scr_release ();
464
449 prev_nrow = prev_ncol = 0; 465 prev_nrow = prev_ncol = 0;
450 rvideo_mode = false; 466 rvideo_mode = false;
451 scr_soft_reset (); 467 scr_soft_reset ();
452 scr_reset (); 468 scr_reset ();
453 469
454 scr_clear (true); 470 scr_clear (true);
455 scr_refresh (); 471 scr_refresh ();
456} 472}
457 473
458void 474void ecb_cold
459rxvt_term::scr_soft_reset () 475rxvt_term::scr_soft_reset () NOTHROW
460{ 476{
461 /* only affects modes, nothing drastic such as clearing the screen */ 477 /* only affects modes, nothing drastic such as clearing the screen */
462#if ENABLE_OVERLAY 478#if ENABLE_OVERLAY
463 scr_overlay_off (); 479 scr_overlay_off ();
464#endif 480#endif
… …
519 assert (s->cur.row >= 0); 535 assert (s->cur.row >= 0);
520 assert (s->cur.col >= 0); 536 assert (s->cur.col >= 0);
521} 537}
522 538
523void 539void
524rxvt_term::scr_swap_screen () 540rxvt_term::scr_swap_screen () NOTHROW
525{ 541{
526 if (!option (Opt_secondaryScreen)) 542 if (!option (Opt_secondaryScreen))
527 return; 543 return;
528 544
529 for (int i = prev_nrow; i--; ) 545 for (int i = prev_nrow; i--; )
… …
548 return; 564 return;
549 565
550 want_refresh = 1; 566 want_refresh = 1;
551 view_start = 0; 567 view_start = 0;
552 568
553 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 ();
554 575
555 current_screen = scrn; 576 current_screen = scrn;
556 577
557#if NSCREENS 578#if NSCREENS
558 if (option (Opt_secondaryScreen)) 579 if (option (Opt_secondaryScreen))
… …
624/* 645/*
625 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
626 * count positive ==> scroll up 647 * count positive ==> scroll up
627 * count negative ==> scroll down 648 * count negative ==> scroll down
628 */ 649 */
629int 650int ecb_hot
630rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
631{ 652{
632 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
633 return 0; 654 return 0;
634 655
… …
695 716
696 // finally move the view window, if desired 717 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 719 && view_start != 0
699 && view_start != -saveLines) 720 && view_start != -saveLines)
700 scr_page (UP, count); 721 scr_page (count);
701 722
702 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
703 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));
704 } 725 }
705 else 726 else
… …
711 || (selection.beg.row - count < row1 && selection.beg.row >= row1) 732 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
712 || (selection.beg.row - count > row2 && selection.beg.row <= row2) 733 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
713 || (selection.end.row - count < row1 && selection.end.row >= row1) 734 || (selection.end.row - count < row1 && selection.end.row >= row1)
714 || (selection.end.row - count > row2 && selection.end.row <= row2)) 735 || (selection.end.row - count > row2 && selection.end.row <= row2))
715 { 736 {
716 CLEAR_SELECTION (); 737 CLEAR_ALL_SELECTION ();
717 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow)) 738 selection.op = SELECTION_CLEAR;
718 CLEAR_SELECTION_MARK ();
719 } 739 }
720 else if (selection.end.row >= row1 && selection.end.row <= row2) 740 else if (selection.end.row >= row1 && selection.end.row <= row2)
721 { 741 {
722 /* move selected region too */ 742 /* move selected region too */
723 selection.beg.row -= count; 743 selection.beg.row -= count;
… …
769 789
770/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
771/* 791/*
772 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
773 */ 793 */
774void 794void ecb_hot
775rxvt_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
776{ 796{
777 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
778 return; 798 return;
779 799
… …
992 } 1012 }
993 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
994 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
995 { 1015 {
996 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
997 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
998 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
999 } 1019 }
1000 else 1020 else
1001 continue; 1021 continue;
1002 1022
1003 linep->touch (); 1023 linep->touch ();
… …
1129 * XTERM_SEQ: ESC 6 1149 * XTERM_SEQ: ESC 6
1130 * 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
1131 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1132 */ 1152 */
1133#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1134void 1154void ecb_cold
1135rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () NOTHROW
1136{ 1156{
1137 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1138 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1139 else 1159 else
… …
1146 * XTERM_SEQ: ESC 9 1166 * XTERM_SEQ: ESC 9
1147 * 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
1148 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1149 */ 1169 */
1150#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1151void 1171void ecb_cold
1152rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () NOTHROW
1153{ 1173{
1154 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1155 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1156 else 1176 else
… …
1221 * direction should be UP or DN 1241 * direction should be UP or DN
1222 */ 1242 */
1223void 1243void
1224rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1225{ 1245{
1226 int dirn;
1227
1228 want_refresh = 1; 1246 want_refresh = 1;
1229 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1230 1248
1231 dirn = ((direction == UP) ? 1 : -1);
1232
1233 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1234 1250
1235 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1236 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1237 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1238 else 1254 else
1239 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1240 1256
1241 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1242 selection_check (0); 1258 selection_check (0);
1243} 1259}
1244 1260
… …
1307 scr_blank_line (line, col, num, rstyle); 1323 scr_blank_line (line, col, num, rstyle);
1308} 1324}
1309 1325
1310/* ------------------------------------------------------------------------- */ 1326/* ------------------------------------------------------------------------- */
1311/* 1327/*
1312 * Erase part of whole of the screen 1328 * Erase part or whole of the screen
1313 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1314 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1315 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1316 */ 1332 */
1317void 1333void
… …
1326 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1327 1343
1328 switch (mode) 1344 switch (mode)
1329 { 1345 {
1330 case 0: /* erase to end of screen */ 1346 case 0: /* erase to end of screen */
1331 selection_check (1);
1332 scr_erase_line (0); 1347 scr_erase_line (0);
1333 row = screen.cur.row + 1; /* possible OOB */ 1348 row = screen.cur.row + 1; /* possible OOB */
1334 num = nrow - row; 1349 num = nrow - row;
1335 break; 1350 break;
1336 case 1: /* erase to beginning of screen */ 1351 case 1: /* erase to beginning of screen */
1337 selection_check (3);
1338 scr_erase_line (1); 1352 scr_erase_line (1);
1339 row = 0; 1353 row = 0;
1340 num = screen.cur.row; 1354 num = screen.cur.row;
1341 break; 1355 break;
1342 case 2: /* erase whole screen */ 1356 case 2: /* erase whole screen */
1343 selection_check (3);
1344 row = 0; 1357 row = 0;
1345 num = nrow; 1358 num = nrow;
1346 break; 1359 break;
1347 default: 1360 default:
1348 return; 1361 return;
… …
1365 { 1378 {
1366 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1367 1380
1368 if (mapped) 1381 if (mapped)
1369 XClearArea (dpy, vt, 0, 1382 XClearArea (dpy, vt, 0,
1370 Row2Pixel (row - view_start), (unsigned int)width, 1383 Row2Pixel (row - view_start), (unsigned int)vt_width,
1371 (unsigned int)Height2Pixel (num), False); 1384 (unsigned int)Height2Pixel (num), False);
1372 } 1385 }
1373 else 1386 else
1374 { 1387 {
1375 ren = rstyle & (RS_fgMask | RS_bgMask); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1378 { 1391 {
1379 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1392 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1380 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1381 XFillRectangle (dpy, vt, gc, 1394 XFillRectangle (dpy, vt, gc,
1382 0, Row2Pixel (row - view_start), 1395 0, Row2Pixel (row - view_start),
1383 (unsigned int)width, 1396 (unsigned int)vt_width,
1384 (unsigned int)Height2Pixel (num)); 1397 (unsigned int)Height2Pixel (num));
1385 gcvalue.foreground = pix_colors[Color_fg]; 1398 gcvalue.foreground = pix_colors[Color_fg];
1386 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1387 } 1400 }
1388 } 1401 }
… …
1410/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1411/* 1424/*
1412 * Fill the screen with `E's 1425 * Fill the screen with `E's
1413 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1414 */ 1427 */
1415void 1428void ecb_cold
1416rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () NOTHROW
1417{ 1430{
1418 rend_t fs; 1431 rend_t fs;
1419 1432
1420 want_refresh = 1; 1433 want_refresh = 1;
1421 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
1422 1435
1423 num_scr_allow = 0; 1436 num_scr_allow = 0;
1424 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 ();
1425 1442
1426 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1443 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1427 for (int row = nrow; row--; ) 1444 for (int row = nrow; row--; )
1428 { 1445 {
1429 line_t &line = ROW(row); 1446 line_t &line = ROW(row);
… …
1580/* ------------------------------------------------------------------------- */ 1597/* ------------------------------------------------------------------------- */
1581/* 1598/*
1582 * Set the scrolling region 1599 * Set the scrolling region
1583 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1584 */ 1601 */
1585void 1602void ecb_cold
1586rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1603rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1587{ 1604{
1588 max_it (top, 0); 1605 max_it (top, 0);
1589 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1590 1607
… …
1600/* 1617/*
1601 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1602 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1603 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1604 */ 1621 */
1605void 1622void ecb_cold
1606rxvt_term::scr_cursor_visible (int mode) NOTHROW 1623rxvt_term::scr_cursor_visible (int mode) NOTHROW
1607{ 1624{
1608 want_refresh = 1; 1625 want_refresh = 1;
1609 1626
1610 if (mode) 1627 if (mode)
… …
1617/* 1634/*
1618 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1619 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1620 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1621 */ 1638 */
1622void 1639void ecb_cold
1623rxvt_term::scr_autowrap (int mode) NOTHROW 1640rxvt_term::scr_autowrap (int mode) NOTHROW
1624{ 1641{
1625 if (mode) 1642 if (mode)
1626 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1627 else 1644 else
… …
1636 * 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
1637 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1638 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1639 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1640 */ 1657 */
1641void 1658void ecb_cold
1642rxvt_term::scr_relative_origin (int mode) NOTHROW 1659rxvt_term::scr_relative_origin (int mode) NOTHROW
1643{ 1660{
1644 if (mode) 1661 if (mode)
1645 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1646 else 1663 else
… …
1653/* 1670/*
1654 * Set insert/replace mode 1671 * Set insert/replace mode
1655 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1656 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1657 */ 1674 */
1658void 1675void ecb_cold
1659rxvt_term::scr_insert_mode (int mode) NOTHROW 1676rxvt_term::scr_insert_mode (int mode) NOTHROW
1660{ 1677{
1661 if (mode) 1678 if (mode)
1662 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1663 else 1680 else
… …
1669 * Set/Unset tabs 1686 * Set/Unset tabs
1670 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1671 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1672 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1673 */ 1690 */
1674void 1691void ecb_cold
1675rxvt_term::scr_set_tab (int mode) NOTHROW 1692rxvt_term::scr_set_tab (int mode) NOTHROW
1676{ 1693{
1677 if (mode < 0) 1694 if (mode < 0)
1678 memset (tabs, 0, ncol); 1695 memset (tabs, 0, ncol);
1679 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
… …
1698 if (rvideo_state != on) 1715 if (rvideo_state != on)
1699 { 1716 {
1700 rvideo_state = on; 1717 rvideo_state = on;
1701 1718
1702 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1719 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1703#ifdef HAVE_BG_PIXMAP 1720#ifdef HAVE_IMG
1704 if (bg_pixmap == None) 1721 if (bg_img == 0)
1705#endif 1722#endif
1706 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1723 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1707 1724
1708 XGCValues gcvalue; 1725 XGCValues gcvalue;
1709 gcvalue.foreground = pix_colors[Color_fg]; 1726 gcvalue.foreground = pix_colors[Color_fg];
… …
1718/* ------------------------------------------------------------------------- */ 1735/* ------------------------------------------------------------------------- */
1719/* 1736/*
1720 * Report current cursor position 1737 * Report current cursor position
1721 * XTERM_SEQ: Report position: ESC [ 6 n 1738 * XTERM_SEQ: Report position: ESC [ 6 n
1722 */ 1739 */
1723void 1740void ecb_cold
1724rxvt_term::scr_report_position () NOTHROW 1741rxvt_term::scr_report_position () NOTHROW
1725{ 1742{
1726 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);
1727} 1744}
1728 1745
… …
1731 * ------------------------------------------------------------------------- */ 1748 * ------------------------------------------------------------------------- */
1732 1749
1733/* 1750/*
1734 * Set font style 1751 * Set font style
1735 */ 1752 */
1736void 1753void ecb_cold
1737rxvt_term::set_font_style () NOTHROW 1754rxvt_term::set_font_style () NOTHROW
1738{ 1755{
1739#if 0 1756#if 0
1740 switch (charsets [screen.charset]) 1757 switch (charsets [screen.charset])
1741 { 1758 {
… …
1763 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1780 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1764 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1781 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1765 * XTERM_SEQ: Invoke G2 character set: ESC N 1782 * XTERM_SEQ: Invoke G2 character set: ESC N
1766 * XTERM_SEQ: Invoke G3 character set: ESC O 1783 * XTERM_SEQ: Invoke G3 character set: ESC O
1767 */ 1784 */
1768void 1785void ecb_cold
1769rxvt_term::scr_charset_choose (int set) NOTHROW 1786rxvt_term::scr_charset_choose (int set) NOTHROW
1770{ 1787{
1771 screen.charset = set; 1788 screen.charset = set;
1772 set_font_style (); 1789 set_font_style ();
1773} 1790}
… …
1794 * ------------------------------------------------------------------------- */ 1811 * ------------------------------------------------------------------------- */
1795 1812
1796/* 1813/*
1797 * refresh matching text. 1814 * refresh matching text.
1798 */ 1815 */
1799bool 1816bool ecb_cold
1800rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1817rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1801{ 1818{
1802 bool found = false; 1819 bool found = false;
1803 1820
1804 for (int i = 0; i < nrow; i++) 1821 for (int i = 0; i < nrow; i++)
… …
1823 PART_BEG = 0, 1840 PART_BEG = 0,
1824 PART_END, 1841 PART_END,
1825 RC_COUNT 1842 RC_COUNT
1826}; 1843};
1827 1844
1828void 1845void ecb_hot
1829rxvt_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
1830{ 1847{
1831 int i; 1848 int i;
1832 row_col_t rc[RC_COUNT]; 1849 row_col_t rc[RC_COUNT];
1833 1850
… …
1870 * Refresh the entire screen 1887 * Refresh the entire screen
1871 */ 1888 */
1872void 1889void
1873rxvt_term::scr_touch (bool refresh) NOTHROW 1890rxvt_term::scr_touch (bool refresh) NOTHROW
1874{ 1891{
1875 scr_expose (0, 0, width, height, refresh); 1892 scr_expose (0, 0, vt_width, vt_height, refresh);
1876} 1893}
1877 1894
1878/* ------------------------------------------------------------------------- */ 1895/* ------------------------------------------------------------------------- */
1879/* 1896/*
1880 * 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
1881 * the top of the screen 1898 * the top of the screen
1882 */ 1899 */
1883void 1900void
1884rxvt_term::scr_move_to (int y, int len) NOTHROW 1901rxvt_term::scr_move_to (int y, int len) NOTHROW
1885{ 1902{
1886 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);
1887} 1905}
1888 1906
1889/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1890/* 1908/*
1891 * Page the screen up/down nlines 1909 * Page the screen up/down nlines
1892 * direction should be UP or DN 1910 * direction should be UP or DN
1893 */ 1911 */
1894bool 1912bool
1895rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1913rxvt_term::scr_page (int nlines) NOTHROW
1896{ 1914{
1897 int new_view_start =
1898 direction == UP ? view_start - nlines
1899 : view_start + nlines;
1900
1901 return scr_changeview (new_view_start); 1915 return scr_changeview (view_start - nlines);
1902} 1916}
1903 1917
1904bool 1918bool
1905rxvt_term::scr_changeview (int new_view_start) NOTHROW 1919rxvt_term::scr_changeview (int new_view_start) NOTHROW
1906{ 1920{
… …
1959 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1973 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1960#endif 1974#endif
1961} 1975}
1962 1976
1963/* ------------------------------------------------------------------------- */ 1977/* ------------------------------------------------------------------------- */
1964void 1978void ecb_cold
1965rxvt_term::scr_printscreen (int fullhist) NOTHROW 1979rxvt_term::scr_printscreen (int fullhist) NOTHROW
1966{ 1980{
1967#ifdef PRINTPIPE 1981#ifdef PRINTPIPE
1968 int nrows, row_start; 1982 int nrows, row_start;
1969 FILE *fd = popen_printer (); 1983 FILE *fd = popen_printer ();
… …
2018/* 2032/*
2019 * Refresh the screen 2033 * Refresh the screen
2020 * drawn_text/drawn_rend contain the screen information before the update. 2034 * drawn_text/drawn_rend contain the screen information before the update.
2021 * screen.text/screen.rend contain what the screen will change to. 2035 * screen.text/screen.rend contain what the screen will change to.
2022 */ 2036 */
2023void 2037void ecb_hot
2024rxvt_term::scr_refresh () NOTHROW 2038rxvt_term::scr_refresh () NOTHROW
2025{ 2039{
2026 int16_t col, row, /* column/row we're processing */ 2040 int16_t col, row, /* column/row we're processing */
2027 ocrow; /* old cursor row */ 2041 ocrow; /* old cursor row */
2028 int i; /* tmp */ 2042 int i; /* tmp */
2029#ifndef NO_CURSORCOLOR
2030 rend_t cc1; /* store colours at cursor position (s) */
2031#endif
2032 rend_t *crp; // cursor rendition pointer
2033 rend_t ccol1, /* Cursor colour */ 2043 rend_t ccol1, /* Cursor colour */
2034 ccol2; /* Cursor colour2 */ 2044 ccol2; /* Cursor colour2 */
2045 rend_t cur_rend;
2046 int cur_col;
2047 int cursorwidth;
2035 2048
2036 want_refresh = 0; /* screen is current */ 2049 want_refresh = 0; /* screen is current */
2037 2050
2038 if (refresh_type == NO_REFRESH || !mapped) 2051 if (refresh_type == NO_REFRESH || !mapped)
2039 return; 2052 return;
… …
2043 */ 2056 */
2044 refresh_count = 0; 2057 refresh_count = 0;
2045 2058
2046 unsigned int old_screen_flags = screen.flags; 2059 unsigned int old_screen_flags = screen.flags;
2047 bool have_bg = 0; 2060 bool have_bg = 0;
2048#ifdef HAVE_BG_PIXMAP 2061#ifdef HAVE_IMG
2049 have_bg = bg_pixmap != None; 2062 have_bg = bg_img != 0;
2050#endif 2063#endif
2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2052 2065
2053 /* 2066 /*
2054 * B: reverse any characters which are selected 2067 * B: reverse any characters which are selected
… …
2064 2077
2065 /* 2078 /*
2066 * C: set the cursor character (s) 2079 * C: set the cursor character (s)
2067 */ 2080 */
2068 { 2081 {
2069 bool setoldcursor;
2070
2071#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2072 if (hidden_cursor) 2083 if (hidden_cursor)
2073 showcursor = 0; 2084 showcursor = 0;
2074#endif 2085#endif
2075 2086
… …
2078 int col = screen.cur.col; 2089 int col = screen.cur.col;
2079 2090
2080 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2091 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2081 col--; 2092 col--;
2082 2093
2094 cursorwidth = 1;
2095 while (col + cursorwidth < ncol
2096 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2097 cursorwidth++;
2098
2083 crp = &ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col;
2084 2101
2085#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
2086 cc1 = *crp & (RS_fgMask | RS_bgMask);
2087 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2088 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2089 else 2105 else
2090#endif 2106#endif
2091#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2103 ccol2 = bgcolor_of (rstyle); 2119 ccol2 = bgcolor_of (rstyle);
2104#else 2120#else
2105 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2106#endif 2122#endif
2107 2123
2108 if (focus) 2124 if (focus && cursor_type == 0)
2109 { 2125 {
2110 if (option (Opt_cursorUnderline)) 2126 rend_t rend = cur_rend;
2111 *crp ^= RS_Uline; 2127
2112 else
2113 {
2114 *crp ^= RS_RVid; 2128 rend ^= RS_RVid;
2115 *crp = SET_FGCOLOR (*crp, ccol1); 2129 rend = SET_FGCOLOR (rend, ccol1);
2116 *crp = SET_BGCOLOR (*crp, ccol2); 2130 rend = SET_BGCOLOR (rend, ccol2);
2117 } 2131
2132 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2118 } 2133 }
2119 } 2134 }
2120 2135
2121 /* make sure no outline cursor is left around */ 2136 /* make sure no outline cursor is left around */
2122 setoldcursor = 0; 2137 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2123 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)
2124 { 2145 {
2125 if (screen.cur.row - view_start != ocrow 2146 oldcursor.row = screen.cur.row - view_start;
2126 || screen.cur.col != oldcursor.col) 2147 oldcursor.col = screen.cur.col;
2127 {
2128 if (ocrow < nrow
2129 && oldcursor.col < ncol)
2130 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2131
2132 if (focus || !showcursor)
2133 oldcursor.row = -1;
2134 else
2135 setoldcursor = 1;
2136 }
2137 } 2148 }
2138 else if (!focus) 2149 else
2139 setoldcursor = 1;
2140
2141 if (setoldcursor)
2142 {
2143 if (screen.cur.row - view_start >= nrow)
2144 oldcursor.row = -1; 2150 oldcursor.row = -1;
2145 else
2146 {
2147 oldcursor.row = screen.cur.row - view_start;
2148 oldcursor.col = screen.cur.col;
2149 }
2150 }
2151 } 2151 }
2152 2152
2153#ifndef NO_SLOW_LINK_SUPPORT 2153#ifndef NO_SLOW_LINK_SUPPORT
2154 /* 2154 /*
2155 * D: CopyArea pass - very useful for slower links 2155 * D: CopyArea pass - very useful for slower links
… …
2161 { 2161 {
2162 int16_t nits; 2162 int16_t nits;
2163 int i = num_scr; 2163 int i = num_scr;
2164 int j; 2164 int j;
2165 int len, wlen; 2165 int len, wlen;
2166 dLocal (int, num_scr);
2167 2166
2168 j = nrow; 2167 j = nrow;
2169 wlen = len = -1; 2168 wlen = len = -1;
2170 row = i > 0 ? 0 : j - 1; 2169 row = i > 0 ? 0 : j - 1;
2171 2170
… …
2237 int ypixel = (int)Row2Pixel (row); 2236 int ypixel = (int)Row2Pixel (row);
2238 2237
2239 for (col = 0; col < ncol; col++) 2238 for (col = 0; col < ncol; col++)
2240 { 2239 {
2241 /* compare new text with old - if exactly the same then continue */ 2240 /* compare new text with old - if exactly the same then continue */
2242 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2241 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2243 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2244 || (stp[col] == ' ' /* space w/ no background change */
2245 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2246 continue; 2242 continue;
2247 2243
2248 // redraw one or more characters 2244 // redraw one or more characters
2249 2245
2250 // seek to the beginning of wide characters 2246 // seek to the beginning of wide characters
… …
2422 else 2418 else
2423 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2419 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2424 2420
2425 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2421 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2426 { 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
2427#if ENABLE_FRILLS 2427#if ENABLE_FRILLS
2428 if (ISSET_PIXCOLOR (Color_underline)) 2428 if (ISSET_PIXCOLOR (Color_underline))
2429 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2429 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2430 else 2430 else
2431#endif 2431#endif
… …
2443 */ 2443 */
2444 if (showcursor) 2444 if (showcursor)
2445 { 2445 {
2446 if (focus) 2446 if (focus)
2447 { 2447 {
2448 if (option (Opt_cursorUnderline)) 2448 if (cursor_type == 0)
2449 *crp ^= RS_Uline; 2449 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2450 else 2450 else if (oldcursor.row >= 0)
2451 { 2451 {
2452 *crp ^= RS_RVid; 2452 XSetForeground (dpy, gc, pix_colors[ccol1]);
2453#ifndef NO_CURSORCOLOR 2453 if (cursor_type == 1)
2454 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2454 XFillRectangle (dpy, vt, gc,
2455#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));
2456 } 2465 }
2457 } 2466 }
2458 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2459 { 2468 {
2460 int cursorwidth = 1;
2461 int col = oldcursor.col;
2462
2463 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2464 col--;
2465
2466 while (col + cursorwidth < ncol
2467 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2468 cursorwidth++;
2469
2470#ifndef NO_CURSORCOLOR
2471 if (ISSET_PIXCOLOR (Color_cursor))
2472 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2473 else
2474#endif
2475 XSetForeground (dpy, gc, pix_colors[ccol1]); 2469 XSetForeground (dpy, gc, pix_colors[ccol1]);
2476 2470
2477 XDrawRectangle (dpy, vt, gc, 2471 XDrawRectangle (dpy, vt, gc,
2478 Col2Pixel (col), 2472 Col2Pixel (cur_col),
2479 Row2Pixel (oldcursor.row), 2473 Row2Pixel (oldcursor.row),
2480 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2474 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2481 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2475 (unsigned int) (Height2Pixel (1) - 1));
2482 } 2476 }
2483 } 2477 }
2484 2478
2485 /* 2479 /*
2486 * H: cleanup selection 2480 * H: cleanup selection
… …
2495 screen.flags = old_screen_flags; 2489 screen.flags = old_screen_flags;
2496 num_scr = 0; 2490 num_scr = 0;
2497 num_scr_allow = 1; 2491 num_scr_allow = 1;
2498} 2492}
2499 2493
2500void 2494void ecb_cold
2501rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2495rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2502{ 2496{
2503 if (!l.t) 2497 if (!l.valid ())
2504 return; 2498 return;
2505 2499
2506 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
2507 2501
2508 for (int i = ncol; i--; ) 2502 for (int i = ncol; i--; )
2509 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]));
2510} 2504}
2511 2505
2512void 2506void ecb_cold
2513rxvt_term::scr_remap_chars () NOTHROW 2507rxvt_term::scr_remap_chars () NOTHROW
2514{ 2508{
2515 for (int i = total_rows; i--; ) 2509 for (int i = total_rows; i--; )
2516 scr_remap_chars (row_buf [i]); 2510 scr_remap_chars (row_buf [i]);
2517 2511
… …
2520 scr_remap_chars (drawn_buf [i]); 2514 scr_remap_chars (drawn_buf [i]);
2521 scr_remap_chars (swap_buf [i]); 2515 scr_remap_chars (swap_buf [i]);
2522 } 2516 }
2523} 2517}
2524 2518
2525void 2519void ecb_cold
2526rxvt_term::scr_recolour (bool refresh) NOTHROW 2520rxvt_term::scr_recolor (bool refresh) NOTHROW
2527{ 2521{
2528 bool transparent = false; 2522 bool transparent = false;
2529 2523
2530#ifdef HAVE_BG_PIXMAP 2524#ifdef HAVE_IMG
2531 if (bg_pixmap != None) 2525 if (bg_img != 0)
2532 { 2526 {
2533# ifdef ENABLE_TRANSPARENCY 2527# if ENABLE_TRANSPARENCY
2534 if (bg_flags & BG_IS_TRANSPARENT) 2528 if (bg_flags & BG_IS_TRANSPARENT)
2535 { 2529 {
2536 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2530 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2537 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2531 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2538 2532
2539 transparent = true; 2533 transparent = true;
2540 } 2534 }
2541 else 2535 else
2542# endif 2536# endif
2543 { 2537 {
2544 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2545 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2539 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2546 } 2540 }
2547 } 2541 }
2548 else 2542 else
2549#endif 2543#endif
2550 { 2544 {
… …
2552 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2546 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2553 } 2547 }
2554 2548
2555 XClearWindow (dpy, parent); 2549 XClearWindow (dpy, parent);
2556 2550
2557 if (scrollBar.win) 2551 if (scrollBar.state && scrollBar.win)
2558 { 2552 {
2559 if (transparent) 2553 if (transparent)
2560 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2554 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2561 else 2555 else
2562 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2563 scrollBar.state = SB_STATE_IDLE; 2557 scrollBar.state = SB_STATE_IDLE;
2564 scrollBar.show (0); 2558 scrollBar.show (0);
2565 } 2559 }
2566 2560
2567 if (refresh) 2561 if (refresh)
… …
2633 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2627 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2634 srp[col] ^= rstyle; 2628 srp[col] ^= rstyle;
2635} 2629}
2636 2630
2637/* ------------------------------------------------------------------------- */ 2631/* ------------------------------------------------------------------------- */
2638void 2632void ecb_hot
2639rxvt_term::scr_reverse_selection () NOTHROW 2633rxvt_term::scr_reverse_selection () NOTHROW
2640{ 2634{
2641 if (selection.op 2635 if (selection.op
2642 && current_screen == selection.screen 2636 && current_screen == selection.screen
2643 && selection.end.row >= view_start) 2637 && selection.end.row >= view_start)
… …
2662 */ 2656 */
2663#if 0 2657#if 0
2664void 2658void
2665rxvt_term::scr_dump (int fd) NOTHROW 2659rxvt_term::scr_dump (int fd) NOTHROW
2666{ 2660{
2667 int row, wrote; 2661 // if this method is needed, it can be implemented by factoring the
2668 unsigned int width, towrite; 2662 // relevant code in scr_printscreen
2669 const char r1[] = "\n";
2670
2671 for (row = saveLines + top_row;
2672 row < saveLines + nrow - 1; row++)
2673 {
2674 width = row_buf[row].l >= 0 ? row_buf[row].l
2675 : ncol;
2676 for (towrite = width; towrite; towrite -= wrote)
2677 {
2678 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2679 towrite);
2680 if (wrote < 0)
2681 return; /* XXX: death, no report */
2682 }
2683 if (row_buf[row].l >= 0)
2684 if (write (fd, r1, 1) <= 0)
2685 return; /* XXX: death, no report */
2686 }
2687} 2663}
2688#endif 2664#endif
2689 2665
2690/* ------------------------------------------------------------------------- * 2666/* ------------------------------------------------------------------------- *
2691 * CHARACTER SELECTION * 2667 * CHARACTER SELECTION *
… …
2694rxvt_term::selection_check (int check_more) NOTHROW 2670rxvt_term::selection_check (int check_more) NOTHROW
2695{ 2671{
2696 if (!selection.op) 2672 if (!selection.op)
2697 return; 2673 return;
2698 2674
2699 row_col_t pos;
2700 pos.row = pos.col = 0;
2701
2702 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2675 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2676 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2703 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2677 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2704 || (check_more == 1 2678 || (check_more == 1
2705 && current_screen == selection.screen 2679 && current_screen == selection.screen
2706 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2680 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2707 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2681 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2708 || (check_more == 2
2709 && ROWCOL_IS_BEFORE (selection.beg, pos)
2710 && ROWCOL_IS_AFTER (selection.end, pos))
2711 || (check_more == 3
2712 && ROWCOL_IS_AFTER (selection.end, pos)))
2713 CLEAR_SELECTION (); 2682 CLEAR_ALL_SELECTION ();
2683}
2714 2684
2715 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow)) 2685void
2716 CLEAR_SELECTION_MARK (); 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;
2717} 2697}
2718 2698
2719/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2720/* 2700/*
2721 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
… …
2727 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2728 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2729 data[i] = C0_CR; 2709 data[i] = C0_CR;
2730 2710
2731 if (priv_modes & PrivMode_BracketPaste) 2711 if (priv_modes & PrivMode_BracketPaste)
2732 tt_printf ("\e[200~"); 2712 tt_printf ("\x1b[200~");
2733 2713
2734 tt_write (data, len); 2714 tt_write (data, len);
2735 2715
2736 if (priv_modes & PrivMode_BracketPaste) 2716 if (priv_modes & PrivMode_BracketPaste)
2737 tt_printf ("\e[201~"); 2717 tt_printf ("\x1b[201~");
2738} 2718}
2739 2719
2740void 2720void
2741rxvt_term::paste (char *data, unsigned int len) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2742{ 2722{
… …
2962/* ------------------------------------------------------------------------- */ 2942/* ------------------------------------------------------------------------- */
2963/* 2943/*
2964 * 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
2965 * EXT: button 1 press 2945 * EXT: button 1 press
2966 */ 2946 */
2967void 2947void ecb_cold
2968rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2969{ 2949{
2970 clicks = ((clicks - 1) % 3) + 1; 2950 clicks = ((clicks - 1) % 3) + 1;
2971 selection.clicks = clicks; /* save clicks so extend will work */ 2951 selection.clicks = clicks; /* save clicks so extend will work */
2972 2952
… …
2991 2971
2992/* ------------------------------------------------------------------------- */ 2972/* ------------------------------------------------------------------------- */
2993/* 2973/*
2994 * Mark a selection at the specified col/row 2974 * Mark a selection at the specified col/row
2995 */ 2975 */
2996void 2976void ecb_cold
2997rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2998{ 2978{
2999 want_refresh = 1; 2979 want_refresh = 1;
3000 2980
3001 selection.mark.row = row + view_start; 2981 selection.mark.row = row + view_start;
… …
3024 * Word select: select text for 2 clicks 3004 * Word select: select text for 2 clicks
3025 * We now only find out the boundary in one direction 3005 * We now only find out the boundary in one direction
3026 */ 3006 */
3027 3007
3028/* 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 */
3029#define DELIMIT_TEXT(x) \ 3009#define DELIMIT_TEXT(x) \
3030 (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)))
3031#define DELIMIT_REND(x) 1 3011#define DELIMIT_REND(x) 1
3032 3012
3033void 3013void ecb_cold
3034rxvt_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
3035{ 3015{
3036 int col, row, dirnadd, tcol, trow, w1, w2; 3016 int col, row, dirnadd, tcol, trow, w1, w2;
3037 row_col_t bound; 3017 row_col_t bound;
3038 text_t *stp; 3018 text_t *stp;
… …
3112 * EXT: button 3 press; button 1 or 3 drag 3092 * EXT: button 3 press; button 1 or 3 drag
3113 * flag == 0 ==> button 1 3093 * flag == 0 ==> button 1
3114 * flag == 1 ==> button 3 press 3094 * flag == 1 ==> button 3 press
3115 * flag == 2 ==> button 3 motion 3095 * flag == 2 ==> button 3 motion
3116 */ 3096 */
3117void 3097void ecb_cold
3118rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3119{ 3099{
3120 int col = clamp (Pixel2Col (x), 0, ncol); 3100 int col = clamp (Pixel2Col (x), 0, ncol);
3121 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3101 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3122 3102
… …
3148 3128
3149/* ------------------------------------------------------------------------- */ 3129/* ------------------------------------------------------------------------- */
3150/* 3130/*
3151 * Extend the selection to the specified col/row 3131 * Extend the selection to the specified col/row
3152 */ 3132 */
3153void 3133void ecb_cold
3154rxvt_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
3155{ 3135{
3156 row_col_t pos; 3136 row_col_t pos;
3157 enum { 3137 enum {
3158 LEFT, RIGHT 3138 LEFT, RIGHT
3159 } closeto = RIGHT; 3139 } closeto = RIGHT;
3160
3161 want_refresh = 1;
3162 3140
3163 switch (selection.op) 3141 switch (selection.op)
3164 { 3142 {
3165 case SELECTION_INIT: 3143 case SELECTION_INIT:
3166 CLEAR_SELECTION (); 3144 CLEAR_SELECTION ();
… …
3346 3324
3347#if !ENABLE_MINIMAL 3325#if !ENABLE_MINIMAL
3348 if (selection.rect && selection.beg.col > selection.end.col) 3326 if (selection.rect && selection.beg.col > selection.end.col)
3349 ::swap (selection.beg.col, selection.end.col); 3327 ::swap (selection.beg.col, selection.end.col);
3350#endif 3328#endif
3329
3330 selection_changed ();
3351} 3331}
3352 3332
3353#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3354void 3334void ecb_cold
3355rxvt_term::selection_remove_trailing_spaces () NOTHROW 3335rxvt_term::selection_remove_trailing_spaces () NOTHROW
3356{ 3336{
3357 int32_t end_col, end_row; 3337 int32_t end_col, end_row;
3358 text_t *stp; 3338 text_t *stp;
3359 3339
… …
3397/* ------------------------------------------------------------------------- */ 3377/* ------------------------------------------------------------------------- */
3398/* 3378/*
3399 * Double click on button 3 when already selected 3379 * Double click on button 3 when already selected
3400 * EXT: button 3 double click 3380 * EXT: button 3 double click
3401 */ 3381 */
3402void 3382void ecb_cold
3403rxvt_term::selection_rotate (int x, int y) NOTHROW 3383rxvt_term::selection_rotate (int x, int y) NOTHROW
3404{ 3384{
3405 selection.clicks = selection.clicks % 3 + 1; 3385 selection.clicks = selection.clicks % 3 + 1;
3406 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3407} 3387}
… …
3409/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3410/* 3390/*
3411 * Respond to a request for our current selection 3391 * Respond to a request for our current selection
3412 * EXT: SelectionRequest 3392 * EXT: SelectionRequest
3413 */ 3393 */
3414void 3394void ecb_cold
3415rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3416{ 3396{
3417 Atom property = rq.property == None ? rq.target : rq.property; 3397 Atom property = rq.property == None ? rq.target : rq.property;
3418 XSelectionEvent ev; 3398 XSelectionEvent ev;
3419 3399
… …
3552 3532
3553 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3554} 3534}
3555 3535
3556/* ------------------------------------------------------------------------- */ 3536/* ------------------------------------------------------------------------- */
3557#ifdef USE_XIM 3537#if USE_XIM
3558void 3538void ecb_cold
3559rxvt_term::im_set_position (XPoint &pos) NOTHROW 3539rxvt_term::im_set_position (XPoint &pos) NOTHROW
3560{ 3540{
3561 XWindowAttributes xwa; 3541 XWindowAttributes xwa;
3562 3542
3563 XGetWindowAttributes (dpy, vt, &xwa); 3543 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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