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.392 by root, Sun Jul 10 00:40:10 2011 UTC vs.
Revision 1.457 by sf-exg, Tue Jun 21 12:03:56 2016 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
… …
27#include "../config.h" /* NECESSARY */ 28#include "../config.h" /* NECESSARY */
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#include "salloc.C" // HACK, should be a separate compile!
34 33
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--)
… …
98 97
99/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
100void 99void
101rxvt_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
102{ 101{
103 if (!l.t) 102 if (!l.valid ())
104 { 103 {
105 lalloc (l); 104 l.alloc ();
106 col = 0; 105 col = 0;
107 width = ncol; 106 width = ncol;
108 } 107 }
109 108
110 l.touch (); 109 l.touch ();
… …
152 l.r[col] = rend; 151 l.r[col] = rend;
153 col++; 152 col++;
154 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
155} 154}
156 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
157/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
160 169
161void 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
162rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
163{ 216{
164#if ENABLE_OVERLAY 217#if ENABLE_OVERLAY
165 scr_overlay_off (); 218 scr_overlay_off ();
166#endif 219#endif
… …
192 total_rows = nrow + saveLines; 245 total_rows = nrow + saveLines;
193 246
194 screen.tscroll = 0; 247 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
196 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
197 if (!row_buf) 258 if (!prev_row_buf)
198 { 259 {
199 /*
200 * first time called so just malloc everything: don't rely on realloc
201 */
202 top_row = 0; 260 top_row = 0;
203 term_start = 0; 261 term_start = 0;
204
205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
207
208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211
212 for (int row = nrow; row--; )
213 {
214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
216 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
217 }
218 262
219 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 265 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 266 screen.cur.row = screen.cur.col = 0;
… …
245 { 289 {
246 /* 290 /*
247 * add or delete rows as appropriate 291 * add or delete rows as appropriate
248 */ 292 */
249 293
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 294 int common_col = min (prev_ncol, ncol);
251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253#if 0
254 if (nrow < prev_nrow)
255 {
256 for (int row = nrow; row < prev_nrow; row++)
257 {
258 lfree (swap_buf [row]);
259 lfree (drawn_buf[row]);
260 }
261 }
262#endif
263
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266 295
267 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
268 { 297 {
269 lresize (drawn_buf[row]); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
271 } 300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
272 301
273 for (int row = prev_nrow; row < nrow; row++) 302 copy_line (swap_buf [row], prev_swap_buf [row]);
274 { 303 }
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 }
278
279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
281 304
282 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
283 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
285 308
… …
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 assert (old_buf [MOD (p, prev_total_rows)].t); 321 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 322 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 323 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 324
302 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 ())
303 { 326 {
304 p = MOD (p - 1, prev_total_rows); 327 p = MOD (p - 1, prev_total_rows);
305 328
306 plines++; 329 plines++;
307 llen += prev_ncol; 330 llen += prev_ncol;
… …
320 343
321 // re-assemble the full line by destination lines 344 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 345 for (int qrow = q; qlines--; qrow++)
323 { 346 {
324 qline = row_buf + qrow; 347 qline = row_buf + qrow;
325 lalloc (*qline); 348 qline->alloc (); // redundant with next line
326 qline->l = ncol; 349 qline->l = ncol;
327 qline->is_longer (1); 350 qline->is_longer (1);
328 351
329 int qcol = 0; 352 int qcol = 0;
330 353
… …
345 // this seems to upset applications/shells/readline 368 // this seems to upset applications/shells/readline
346 // least. 369 // least.
347 if (prow == ocur.row) 370 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 371 screen.cur.row = q - (total_rows - nrow);
349 372
350 line_t &pline = old_buf [prow]; 373 line_t &pline = prev_row_buf [prow];
351 374
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 375 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 376
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 377 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 378 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 399 {
377 // if no scrollback exists (yet), wing, instead of wrap 400 // if no scrollback exists (yet), wing, instead of wrap
378 401
379 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
380 { 403 {
381 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)];
382 line_t &qline = row_buf [row]; 405 line_t &dst = row_buf [row];
383 406
384 qline = pline; 407 copy_line (dst, src);
385 lresize (qline);
386 } 408 }
387 409
388 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 412
393 term_start = 0; 413 term_start = 0;
394 } 414 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 415
400 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 418 }
403 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
404 free (tabs); 429 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 430 tabs = (char *)rxvt_malloc (ncol);
406 431
407 for (int col = ncol; col--; ) 432 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 433 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 440 tt_winch ();
416 441
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 443}
419 444
420/* ------------------------------------------------------------------------- */ 445void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 446rxvt_term::scr_release () NOTHROW
426{ 447{
427 if (row_buf) 448 chunk_free (chunk, chunk_size);
428 { 449 chunk = 0;
429 delete talloc; talloc = 0; 450 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 451
432 free (row_buf);
433 free (swap_buf);
434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
437 free (tabs); 452 free (tabs);
438 tabs = 0; 453 tabs = 0;
439 }
440} 454}
441 455
442/* ------------------------------------------------------------------------- */ 456/* ------------------------------------------------------------------------- */
443/* 457/*
444 * Hard/Soft reset 458 * Hard/Soft reset
445 */ 459 */
446void 460void ecb_cold
447rxvt_term::scr_poweron () 461rxvt_term::scr_poweron ()
448{ 462{
449 scr_release (); 463 scr_release ();
464
450 prev_nrow = prev_ncol = 0; 465 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 466 rvideo_mode = false;
452 scr_soft_reset (); 467 scr_soft_reset ();
453 scr_reset (); 468 scr_reset ();
454 469
455 scr_clear (true); 470 scr_clear (true);
456 scr_refresh (); 471 scr_refresh ();
457} 472}
458 473
459void 474void ecb_cold
460rxvt_term::scr_soft_reset () 475rxvt_term::scr_soft_reset () NOTHROW
461{ 476{
462 /* only affects modes, nothing drastic such as clearing the screen */ 477 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 478#if ENABLE_OVERLAY
464 scr_overlay_off (); 479 scr_overlay_off ();
465#endif 480#endif
… …
520 assert (s->cur.row >= 0); 535 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 536 assert (s->cur.col >= 0);
522} 537}
523 538
524void 539void
525rxvt_term::scr_swap_screen () 540rxvt_term::scr_swap_screen () NOTHROW
526{ 541{
527 if (!option (Opt_secondaryScreen)) 542 if (!option (Opt_secondaryScreen))
528 return; 543 return;
529 544
530 for (int i = prev_nrow; i--; ) 545 for (int i = prev_nrow; i--; )
… …
549 return; 564 return;
550 565
551 want_refresh = 1; 566 want_refresh = 1;
552 view_start = 0; 567 view_start = 0;
553 568
554 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 ();
555 575
556 current_screen = scrn; 576 current_screen = scrn;
557 577
558#if NSCREENS 578#if NSCREENS
559 if (option (Opt_secondaryScreen)) 579 if (option (Opt_secondaryScreen))
… …
595 * Change the colour for following text 615 * Change the colour for following text
596 */ 616 */
597void 617void
598rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 618rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
599{ 619{
600 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 620 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
601 color = fgbg; 621 color = fgbg;
602 622
603 if (fgbg == Color_fg) 623 if (fgbg == Color_fg)
604 rstyle = SET_FGCOLOR (rstyle, color); 624 rstyle = SET_FGCOLOR (rstyle, color);
605 else 625 else
… …
625/* 645/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 647 * count positive ==> scroll up
628 * count negative ==> scroll down 648 * count negative ==> scroll down
629 */ 649 */
630int 650int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 652{
633 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
634 return 0; 654 return 0;
635 655
… …
682 else 702 else
683 scr_blank_screen_mem (l, rstyle); 703 scr_blank_screen_mem (l, rstyle);
684 } 704 }
685 705
686 // move and/or clear selection, if any 706 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 707 if (selection.op && current_screen == selection.screen
708 && selection.beg.row <= row2)
688 { 709 {
689 selection.beg.row -= count; 710 selection.beg.row -= count;
690 selection.end.row -= count; 711 selection.end.row -= count;
691 selection.mark.row -= count; 712 selection.mark.row -= count;
692 713
693 if (selection.beg.row < top_row 714 selection_check (0);
694 || selection.end.row < top_row
695 || selection.mark.row < top_row)
696 {
697 CLEAR_ALL_SELECTION ();
698 selection.op = SELECTION_CLEAR;
699 }
700 } 715 }
701 716
702 // finally move the view window, if desired 717 // finally move the view window, if desired
703 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
704 && view_start != 0 719 && view_start != 0
705 && view_start != -saveLines) 720 && view_start != -saveLines)
706 scr_page (UP, count); 721 scr_page (count);
707 722
708 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
709 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));
710 } 725 }
711 else 726 else
… …
765 { 780 {
766 line_t &l = ROW(row2); 781 line_t &l = ROW(row2);
767 l.is_longer (0); 782 l.is_longer (0);
768 l.touch (); 783 l.touch ();
769 } 784 }
770
771 } 785 }
772 786
773 return count; 787 return count;
774} 788}
775 789
776/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
777/* 791/*
778 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
779 */ 793 */
780void 794void ecb_hot
781rxvt_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
782{ 796{
783 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
784 return; 798 return;
785 799
786 unsigned char checksel; 800 bool checksel;
787 unicode_t c; 801 unicode_t c;
788 int ncol = this->ncol; 802 int ncol = this->ncol;
789 const wchar_t *strend = str + len; 803 const wchar_t *strend = str + len;
790 804
791 want_refresh = 1; 805 want_refresh = 1;
… …
998 } 1012 }
999 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
1000 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
1001 { 1015 {
1002 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
1003 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
1004 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
1005 } 1019 }
1006 else 1020 else
1007 continue; 1021 continue;
1008 1022
1009 linep->touch (); 1023 linep->touch ();
… …
1135 * XTERM_SEQ: ESC 6 1149 * XTERM_SEQ: ESC 6
1136 * 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
1137 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1138 */ 1152 */
1139#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1140void 1154void ecb_cold
1141rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () NOTHROW
1142{ 1156{
1143 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145 else 1159 else
… …
1152 * XTERM_SEQ: ESC 9 1166 * XTERM_SEQ: ESC 9
1153 * 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
1154 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1155 */ 1169 */
1156#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1157void 1171void ecb_cold
1158rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () NOTHROW
1159{ 1173{
1160 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1161 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1162 else 1176 else
… …
1227 * direction should be UP or DN 1241 * direction should be UP or DN
1228 */ 1242 */
1229void 1243void
1230rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1231{ 1245{
1232 int dirn;
1233
1234 want_refresh = 1; 1246 want_refresh = 1;
1235 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1236 1248
1237 dirn = ((direction == UP) ? 1 : -1);
1238
1239 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1240 1250
1241 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1242 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1243 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1244 else 1254 else
1245 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1246 1256
1247 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1248 selection_check (0); 1258 selection_check (0);
1249} 1259}
1250 1260
… …
1313 scr_blank_line (line, col, num, rstyle); 1323 scr_blank_line (line, col, num, rstyle);
1314} 1324}
1315 1325
1316/* ------------------------------------------------------------------------- */ 1326/* ------------------------------------------------------------------------- */
1317/* 1327/*
1318 * Erase part of whole of the screen 1328 * Erase part or whole of the screen
1319 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1320 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1321 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1322 */ 1332 */
1323void 1333void
… …
1332 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1333 1343
1334 switch (mode) 1344 switch (mode)
1335 { 1345 {
1336 case 0: /* erase to end of screen */ 1346 case 0: /* erase to end of screen */
1337 selection_check (1);
1338 scr_erase_line (0); 1347 scr_erase_line (0);
1339 row = screen.cur.row + 1; /* possible OOB */ 1348 row = screen.cur.row + 1; /* possible OOB */
1340 num = nrow - row; 1349 num = nrow - row;
1341 break; 1350 break;
1342 case 1: /* erase to beginning of screen */ 1351 case 1: /* erase to beginning of screen */
1343 selection_check (3);
1344 scr_erase_line (1); 1352 scr_erase_line (1);
1345 row = 0; 1353 row = 0;
1346 num = screen.cur.row; 1354 num = screen.cur.row;
1347 break; 1355 break;
1348 case 2: /* erase whole screen */ 1356 case 2: /* erase whole screen */
1349 selection_check (3);
1350 row = 0; 1357 row = 0;
1351 num = nrow; 1358 num = nrow;
1352 break; 1359 break;
1353 default: 1360 default:
1354 return; 1361 return;
… …
1371 { 1378 {
1372 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1373 1380
1374 if (mapped) 1381 if (mapped)
1375 XClearArea (dpy, vt, 0, 1382 XClearArea (dpy, vt, 0,
1376 Row2Pixel (row - view_start), (unsigned int)width, 1383 Row2Pixel (row - view_start), (unsigned int)vt_width,
1377 (unsigned int)Height2Pixel (num), False); 1384 (unsigned int)Height2Pixel (num), False);
1378 } 1385 }
1379 else 1386 else
1380 { 1387 {
1381 ren = rstyle & (RS_fgMask | RS_bgMask); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1384 { 1391 {
1385 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1392 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1386 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1387 XFillRectangle (dpy, vt, gc, 1394 XFillRectangle (dpy, vt, gc,
1388 0, Row2Pixel (row - view_start), 1395 0, Row2Pixel (row - view_start),
1389 (unsigned int)width, 1396 (unsigned int)vt_width,
1390 (unsigned int)Height2Pixel (num)); 1397 (unsigned int)Height2Pixel (num));
1391 gcvalue.foreground = pix_colors[Color_fg]; 1398 gcvalue.foreground = pix_colors[Color_fg];
1392 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1393 } 1400 }
1394 } 1401 }
… …
1416/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1417/* 1424/*
1418 * Fill the screen with `E's 1425 * Fill the screen with `E's
1419 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1420 */ 1427 */
1421void 1428void ecb_cold
1422rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () NOTHROW
1423{ 1430{
1424 rend_t fs; 1431 rend_t fs;
1425 1432
1426 want_refresh = 1; 1433 want_refresh = 1;
1427 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
1428 1435
1429 num_scr_allow = 0; 1436 num_scr_allow = 0;
1430 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 ();
1431 1442
1432 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1443 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1433 for (int row = nrow; row--; ) 1444 for (int row = nrow; row--; )
1434 { 1445 {
1435 line_t &line = ROW(row); 1446 line_t &line = ROW(row);
… …
1586/* ------------------------------------------------------------------------- */ 1597/* ------------------------------------------------------------------------- */
1587/* 1598/*
1588 * Set the scrolling region 1599 * Set the scrolling region
1589 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1590 */ 1601 */
1591void 1602void ecb_cold
1592rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1603rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1593{ 1604{
1594 max_it (top, 0); 1605 max_it (top, 0);
1595 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1596 1607
… …
1606/* 1617/*
1607 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1608 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1609 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1610 */ 1621 */
1611void 1622void ecb_cold
1612rxvt_term::scr_cursor_visible (int mode) NOTHROW 1623rxvt_term::scr_cursor_visible (int mode) NOTHROW
1613{ 1624{
1614 want_refresh = 1; 1625 want_refresh = 1;
1615 1626
1616 if (mode) 1627 if (mode)
… …
1623/* 1634/*
1624 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1625 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1626 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1627 */ 1638 */
1628void 1639void ecb_cold
1629rxvt_term::scr_autowrap (int mode) NOTHROW 1640rxvt_term::scr_autowrap (int mode) NOTHROW
1630{ 1641{
1631 if (mode) 1642 if (mode)
1632 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1633 else 1644 else
… …
1642 * 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
1643 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1644 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1645 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1646 */ 1657 */
1647void 1658void ecb_cold
1648rxvt_term::scr_relative_origin (int mode) NOTHROW 1659rxvt_term::scr_relative_origin (int mode) NOTHROW
1649{ 1660{
1650 if (mode) 1661 if (mode)
1651 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1652 else 1663 else
… …
1659/* 1670/*
1660 * Set insert/replace mode 1671 * Set insert/replace mode
1661 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1662 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1663 */ 1674 */
1664void 1675void ecb_cold
1665rxvt_term::scr_insert_mode (int mode) NOTHROW 1676rxvt_term::scr_insert_mode (int mode) NOTHROW
1666{ 1677{
1667 if (mode) 1678 if (mode)
1668 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1669 else 1680 else
… …
1675 * Set/Unset tabs 1686 * Set/Unset tabs
1676 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1677 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1678 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1679 */ 1690 */
1680void 1691void ecb_cold
1681rxvt_term::scr_set_tab (int mode) NOTHROW 1692rxvt_term::scr_set_tab (int mode) NOTHROW
1682{ 1693{
1683 if (mode < 0) 1694 if (mode < 0)
1684 memset (tabs, 0, ncol); 1695 memset (tabs, 0, ncol);
1685 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
… …
1704 if (rvideo_state != on) 1715 if (rvideo_state != on)
1705 { 1716 {
1706 rvideo_state = on; 1717 rvideo_state = on;
1707 1718
1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1719 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1709#ifdef HAVE_BG_PIXMAP 1720#ifdef HAVE_IMG
1710 if (bg_pixmap == None) 1721 if (bg_img == 0)
1711#endif 1722#endif
1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1723 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1713 1724
1714 XGCValues gcvalue; 1725 XGCValues gcvalue;
1715 gcvalue.foreground = pix_colors[Color_fg]; 1726 gcvalue.foreground = pix_colors[Color_fg];
… …
1724/* ------------------------------------------------------------------------- */ 1735/* ------------------------------------------------------------------------- */
1725/* 1736/*
1726 * Report current cursor position 1737 * Report current cursor position
1727 * XTERM_SEQ: Report position: ESC [ 6 n 1738 * XTERM_SEQ: Report position: ESC [ 6 n
1728 */ 1739 */
1729void 1740void ecb_cold
1730rxvt_term::scr_report_position () NOTHROW 1741rxvt_term::scr_report_position () NOTHROW
1731{ 1742{
1732 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);
1733} 1744}
1734 1745
… …
1737 * ------------------------------------------------------------------------- */ 1748 * ------------------------------------------------------------------------- */
1738 1749
1739/* 1750/*
1740 * Set font style 1751 * Set font style
1741 */ 1752 */
1742void 1753void ecb_cold
1743rxvt_term::set_font_style () NOTHROW 1754rxvt_term::set_font_style () NOTHROW
1744{ 1755{
1745#if 0 1756#if 0
1746 switch (charsets [screen.charset]) 1757 switch (charsets [screen.charset])
1747 { 1758 {
… …
1769 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1780 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1770 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1781 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1771 * XTERM_SEQ: Invoke G2 character set: ESC N 1782 * XTERM_SEQ: Invoke G2 character set: ESC N
1772 * XTERM_SEQ: Invoke G3 character set: ESC O 1783 * XTERM_SEQ: Invoke G3 character set: ESC O
1773 */ 1784 */
1774void 1785void ecb_cold
1775rxvt_term::scr_charset_choose (int set) NOTHROW 1786rxvt_term::scr_charset_choose (int set) NOTHROW
1776{ 1787{
1777 screen.charset = set; 1788 screen.charset = set;
1778 set_font_style (); 1789 set_font_style ();
1779} 1790}
… …
1800 * ------------------------------------------------------------------------- */ 1811 * ------------------------------------------------------------------------- */
1801 1812
1802/* 1813/*
1803 * refresh matching text. 1814 * refresh matching text.
1804 */ 1815 */
1805bool 1816bool ecb_cold
1806rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1817rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1807{ 1818{
1808 bool found = false; 1819 bool found = false;
1809 1820
1810 for (int i = 0; i < nrow; i++) 1821 for (int i = 0; i < nrow; i++)
… …
1829 PART_BEG = 0, 1840 PART_BEG = 0,
1830 PART_END, 1841 PART_END,
1831 RC_COUNT 1842 RC_COUNT
1832}; 1843};
1833 1844
1834void 1845void ecb_hot
1835rxvt_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
1836{ 1847{
1837 int i; 1848 int i;
1838 row_col_t rc[RC_COUNT]; 1849 row_col_t rc[RC_COUNT];
1839 1850
… …
1876 * Refresh the entire screen 1887 * Refresh the entire screen
1877 */ 1888 */
1878void 1889void
1879rxvt_term::scr_touch (bool refresh) NOTHROW 1890rxvt_term::scr_touch (bool refresh) NOTHROW
1880{ 1891{
1881 scr_expose (0, 0, width, height, refresh); 1892 scr_expose (0, 0, vt_width, vt_height, refresh);
1882} 1893}
1883 1894
1884/* ------------------------------------------------------------------------- */ 1895/* ------------------------------------------------------------------------- */
1885/* 1896/*
1886 * 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
1887 * the top of the screen 1898 * the top of the screen
1888 */ 1899 */
1889void 1900void
1890rxvt_term::scr_move_to (int y, int len) NOTHROW 1901rxvt_term::scr_move_to (int y, int len) NOTHROW
1891{ 1902{
1892 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);
1893} 1905}
1894 1906
1895/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1896/* 1908/*
1897 * Page the screen up/down nlines 1909 * Page the screen up/down nlines
1898 * direction should be UP or DN 1910 * direction should be UP or DN
1899 */ 1911 */
1900bool 1912bool
1901rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1913rxvt_term::scr_page (int nlines) NOTHROW
1902{ 1914{
1903 int new_view_start =
1904 direction == UP ? view_start - nlines
1905 : view_start + nlines;
1906
1907 return scr_changeview (new_view_start); 1915 return scr_changeview (view_start - nlines);
1908} 1916}
1909 1917
1910bool 1918bool
1911rxvt_term::scr_changeview (int new_view_start) NOTHROW 1919rxvt_term::scr_changeview (int new_view_start) NOTHROW
1912{ 1920{
… …
1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1973 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1966#endif 1974#endif
1967} 1975}
1968 1976
1969/* ------------------------------------------------------------------------- */ 1977/* ------------------------------------------------------------------------- */
1970void 1978void ecb_cold
1971rxvt_term::scr_printscreen (int fullhist) NOTHROW 1979rxvt_term::scr_printscreen (int fullhist) NOTHROW
1972{ 1980{
1973#ifdef PRINTPIPE 1981#ifdef PRINTPIPE
1974 int nrows, row_start; 1982 int nrows, row_start;
1975 FILE *fd = popen_printer (); 1983 FILE *fd = popen_printer ();
… …
2024/* 2032/*
2025 * Refresh the screen 2033 * Refresh the screen
2026 * drawn_text/drawn_rend contain the screen information before the update. 2034 * drawn_text/drawn_rend contain the screen information before the update.
2027 * screen.text/screen.rend contain what the screen will change to. 2035 * screen.text/screen.rend contain what the screen will change to.
2028 */ 2036 */
2029void 2037void ecb_hot
2030rxvt_term::scr_refresh () NOTHROW 2038rxvt_term::scr_refresh () NOTHROW
2031{ 2039{
2032 int16_t col, row, /* column/row we're processing */ 2040 int16_t col, row, /* column/row we're processing */
2033 ocrow; /* old cursor row */ 2041 ocrow; /* old cursor row */
2034 int i; /* tmp */ 2042 int i; /* tmp */
2035#ifndef NO_CURSORCOLOR
2036 rend_t cc1; /* store colours at cursor position (s) */
2037#endif
2038 rend_t *crp; // cursor rendition pointer
2039 rend_t ccol1, /* Cursor colour */ 2043 rend_t ccol1, /* Cursor colour */
2040 ccol2; /* Cursor colour2 */ 2044 ccol2; /* Cursor colour2 */
2045 rend_t cur_rend;
2046 int cur_col;
2047 int cursorwidth;
2041 2048
2042 want_refresh = 0; /* screen is current */ 2049 want_refresh = 0; /* screen is current */
2043 2050
2044 if (refresh_type == NO_REFRESH || !mapped) 2051 if (refresh_type == NO_REFRESH || !mapped)
2045 return; 2052 return;
… …
2048 * A: set up vars 2055 * A: set up vars
2049 */ 2056 */
2050 refresh_count = 0; 2057 refresh_count = 0;
2051 2058
2052 unsigned int old_screen_flags = screen.flags; 2059 unsigned int old_screen_flags = screen.flags;
2053 char have_bg = 0; 2060 bool have_bg = 0;
2054#ifdef HAVE_BG_PIXMAP 2061#ifdef HAVE_IMG
2055 have_bg = bg_pixmap != None; 2062 have_bg = bg_img != 0;
2056#endif 2063#endif
2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2058 2065
2059 /* 2066 /*
2060 * B: reverse any characters which are selected 2067 * B: reverse any characters which are selected
… …
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2071 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2065#if ENABLE_OVERLAY 2072#if ENABLE_OVERLAY
2066 scr_swap_overlay (); 2073 scr_swap_overlay ();
2067#endif 2074#endif
2068 2075
2069 char showcursor = screen.flags & Screen_VisibleCursor; 2076 bool showcursor = screen.flags & Screen_VisibleCursor;
2070 2077
2071 /* 2078 /*
2072 * C: set the cursor character (s) 2079 * C: set the cursor character (s)
2073 */ 2080 */
2074 { 2081 {
2075 unsigned char setoldcursor;
2076
2077#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2078 if (hidden_cursor) 2083 if (hidden_cursor)
2079 showcursor = 0; 2084 showcursor = 0;
2080#endif 2085#endif
2081 2086
… …
2084 int col = screen.cur.col; 2089 int col = screen.cur.col;
2085 2090
2086 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2091 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2087 col--; 2092 col--;
2088 2093
2094 cursorwidth = 1;
2095 while (col + cursorwidth < ncol
2096 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2097 cursorwidth++;
2098
2089 crp = &ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col;
2090 2101
2091#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
2092 cc1 = *crp & (RS_fgMask | RS_bgMask);
2093 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2094 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2095 else 2105 else
2096#endif 2106#endif
2097#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2109 ccol2 = bgcolor_of (rstyle); 2119 ccol2 = bgcolor_of (rstyle);
2110#else 2120#else
2111 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2112#endif 2122#endif
2113 2123
2114 if (focus) 2124 if (focus && cursor_type == 0)
2115 { 2125 {
2116 if (option (Opt_cursorUnderline)) 2126 rend_t rend = cur_rend;
2117 *crp ^= RS_Uline; 2127
2118 else
2119 {
2120 *crp ^= RS_RVid; 2128 rend ^= RS_RVid;
2121 *crp = SET_FGCOLOR (*crp, ccol1); 2129 rend = SET_FGCOLOR (rend, ccol1);
2122 *crp = SET_BGCOLOR (*crp, ccol2); 2130 rend = SET_BGCOLOR (rend, ccol2);
2123 } 2131
2132 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2124 } 2133 }
2125 } 2134 }
2126 2135
2127 /* make sure no outline cursor is left around */ 2136 /* make sure no outline cursor is left around */
2128 setoldcursor = 0; 2137 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2129 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)
2130 { 2145 {
2131 if (screen.cur.row - view_start != ocrow 2146 oldcursor.row = screen.cur.row - view_start;
2132 || screen.cur.col != oldcursor.col) 2147 oldcursor.col = screen.cur.col;
2133 {
2134 if (ocrow < nrow
2135 && oldcursor.col < ncol)
2136 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2137
2138 if (focus || !showcursor)
2139 oldcursor.row = -1;
2140 else
2141 setoldcursor = 1;
2142 }
2143 } 2148 }
2144 else if (!focus) 2149 else
2145 setoldcursor = 1;
2146
2147 if (setoldcursor)
2148 {
2149 if (screen.cur.row - view_start >= nrow)
2150 oldcursor.row = -1; 2150 oldcursor.row = -1;
2151 else
2152 {
2153 oldcursor.row = screen.cur.row - view_start;
2154 oldcursor.col = screen.cur.col;
2155 }
2156 }
2157 } 2151 }
2158 2152
2159#ifndef NO_SLOW_LINK_SUPPORT 2153#ifndef NO_SLOW_LINK_SUPPORT
2160 /* 2154 /*
2161 * D: CopyArea pass - very useful for slower links 2155 * D: CopyArea pass - very useful for slower links
… …
2167 { 2161 {
2168 int16_t nits; 2162 int16_t nits;
2169 int i = num_scr; 2163 int i = num_scr;
2170 int j; 2164 int j;
2171 int len, wlen; 2165 int len, wlen;
2172 dLocal (int, num_scr);
2173 2166
2174 j = nrow; 2167 j = nrow;
2175 wlen = len = -1; 2168 wlen = len = -1;
2176 row = i > 0 ? 0 : j - 1; 2169 row = i > 0 ? 0 : j - 1;
2177 2170
… …
2243 int ypixel = (int)Row2Pixel (row); 2236 int ypixel = (int)Row2Pixel (row);
2244 2237
2245 for (col = 0; col < ncol; col++) 2238 for (col = 0; col < ncol; col++)
2246 { 2239 {
2247 /* compare new text with old - if exactly the same then continue */ 2240 /* compare new text with old - if exactly the same then continue */
2248 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2241 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2249 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2250 || (stp[col] == ' ' /* space w/ no background change */
2251 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2252 continue; 2242 continue;
2253 2243
2254 // redraw one or more characters 2244 // redraw one or more characters
2255 2245
2256 // seek to the beginning of wide characters 2246 // seek to the beginning of wide characters
… …
2428 else 2418 else
2429 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2419 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2430 2420
2431 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2421 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2432 { 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
2433#if ENABLE_FRILLS 2427#if ENABLE_FRILLS
2434 if (ISSET_PIXCOLOR (Color_underline)) 2428 if (ISSET_PIXCOLOR (Color_underline))
2435 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2429 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2436 else 2430 else
2437#endif 2431#endif
… …
2449 */ 2443 */
2450 if (showcursor) 2444 if (showcursor)
2451 { 2445 {
2452 if (focus) 2446 if (focus)
2453 { 2447 {
2454 if (option (Opt_cursorUnderline)) 2448 if (cursor_type == 0)
2455 *crp ^= RS_Uline; 2449 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2456 else 2450 else if (oldcursor.row >= 0)
2457 { 2451 {
2458 *crp ^= RS_RVid; 2452 XSetForeground (dpy, gc, pix_colors[ccol1]);
2459#ifndef NO_CURSORCOLOR 2453 if (cursor_type == 1)
2460 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2454 XFillRectangle (dpy, vt, gc,
2461#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));
2462 } 2465 }
2463 } 2466 }
2464 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2465 { 2468 {
2466 int cursorwidth = 1;
2467 int col = oldcursor.col;
2468
2469 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2470 col--;
2471
2472 while (col + cursorwidth < ncol
2473 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2474 cursorwidth++;
2475
2476#ifndef NO_CURSORCOLOR
2477 if (ISSET_PIXCOLOR (Color_cursor))
2478 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2479 else
2480#endif
2481 XSetForeground (dpy, gc, pix_colors[ccol1]); 2469 XSetForeground (dpy, gc, pix_colors[ccol1]);
2482 2470
2483 XDrawRectangle (dpy, vt, gc, 2471 XDrawRectangle (dpy, vt, gc,
2484 Col2Pixel (col), 2472 Col2Pixel (cur_col),
2485 Row2Pixel (oldcursor.row), 2473 Row2Pixel (oldcursor.row),
2486 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2474 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2487 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2475 (unsigned int) (Height2Pixel (1) - 1));
2488 } 2476 }
2489 } 2477 }
2490 2478
2491 /* 2479 /*
2492 * H: cleanup selection 2480 * H: cleanup selection
… …
2501 screen.flags = old_screen_flags; 2489 screen.flags = old_screen_flags;
2502 num_scr = 0; 2490 num_scr = 0;
2503 num_scr_allow = 1; 2491 num_scr_allow = 1;
2504} 2492}
2505 2493
2506void 2494void ecb_cold
2507rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2495rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2508{ 2496{
2509 if (!l.t) 2497 if (!l.valid ())
2510 return; 2498 return;
2511 2499
2512 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
2513 2501
2514 for (int i = ncol; i--; ) 2502 for (int i = ncol; i--; )
2515 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]));
2516} 2504}
2517 2505
2518void 2506void ecb_cold
2519rxvt_term::scr_remap_chars () NOTHROW 2507rxvt_term::scr_remap_chars () NOTHROW
2520{ 2508{
2521 for (int i = total_rows; i--; ) 2509 for (int i = total_rows; i--; )
2522 scr_remap_chars (row_buf [i]); 2510 scr_remap_chars (row_buf [i]);
2523 2511
… …
2526 scr_remap_chars (drawn_buf [i]); 2514 scr_remap_chars (drawn_buf [i]);
2527 scr_remap_chars (swap_buf [i]); 2515 scr_remap_chars (swap_buf [i]);
2528 } 2516 }
2529} 2517}
2530 2518
2531void 2519void ecb_cold
2532rxvt_term::scr_recolour (bool refresh) NOTHROW 2520rxvt_term::scr_recolor (bool refresh) NOTHROW
2533{ 2521{
2534 bool transparent = false; 2522 bool transparent = false;
2535 2523
2536#ifdef HAVE_BG_PIXMAP 2524#ifdef HAVE_IMG
2537 if (bg_pixmap != None) 2525 if (bg_img != 0)
2538 { 2526 {
2539# ifdef ENABLE_TRANSPARENCY 2527# if ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT) 2528 if (bg_flags & BG_IS_TRANSPARENT)
2541 { 2529 {
2542 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2530 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2531 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2544 2532
2545 transparent = true; 2533 transparent = true;
2546 } 2534 }
2547 else 2535 else
2548# endif 2536# endif
2549 { 2537 {
2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2551 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2539 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2552 } 2540 }
2553 } 2541 }
2554 else 2542 else
2555#endif 2543#endif
2556 { 2544 {
… …
2558 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2546 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2559 } 2547 }
2560 2548
2561 XClearWindow (dpy, parent); 2549 XClearWindow (dpy, parent);
2562 2550
2563 if (scrollBar.win) 2551 if (scrollBar.state && scrollBar.win)
2564 { 2552 {
2565 if (transparent) 2553 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2554 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else 2555 else
2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2569 scrollBar.state = STATE_IDLE; 2557 scrollBar.state = SB_STATE_IDLE;
2570 scrollBar.show (0); 2558 scrollBar.show (0);
2571 } 2559 }
2572 2560
2573 if (refresh) 2561 if (refresh)
2574 { 2562 {
… …
2639 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2627 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2640 srp[col] ^= rstyle; 2628 srp[col] ^= rstyle;
2641} 2629}
2642 2630
2643/* ------------------------------------------------------------------------- */ 2631/* ------------------------------------------------------------------------- */
2644void 2632void ecb_hot
2645rxvt_term::scr_reverse_selection () NOTHROW 2633rxvt_term::scr_reverse_selection () NOTHROW
2646{ 2634{
2647 if (selection.op 2635 if (selection.op
2648 && current_screen == selection.screen 2636 && current_screen == selection.screen
2649 && selection.end.row >= view_start) 2637 && selection.end.row >= view_start)
… …
2668 */ 2656 */
2669#if 0 2657#if 0
2670void 2658void
2671rxvt_term::scr_dump (int fd) NOTHROW 2659rxvt_term::scr_dump (int fd) NOTHROW
2672{ 2660{
2673 int row, wrote; 2661 // if this method is needed, it can be implemented by factoring the
2674 unsigned int width, towrite; 2662 // relevant code in scr_printscreen
2675 const char r1[] = "\n";
2676
2677 for (row = saveLines + top_row;
2678 row < saveLines + nrow - 1; row++)
2679 {
2680 width = row_buf[row].l >= 0 ? row_buf[row].l
2681 : ncol;
2682 for (towrite = width; towrite; towrite -= wrote)
2683 {
2684 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2685 towrite);
2686 if (wrote < 0)
2687 return; /* XXX: death, no report */
2688 }
2689 if (row_buf[row].l >= 0)
2690 if (write (fd, r1, 1) <= 0)
2691 return; /* XXX: death, no report */
2692 }
2693} 2663}
2694#endif 2664#endif
2695 2665
2696/* ------------------------------------------------------------------------- * 2666/* ------------------------------------------------------------------------- *
2697 * CHARACTER SELECTION * 2667 * CHARACTER SELECTION *
2698 * ------------------------------------------------------------------------- */ 2668 * ------------------------------------------------------------------------- */
2699void 2669void
2700rxvt_term::selection_check (int check_more) NOTHROW 2670rxvt_term::selection_check (int check_more) NOTHROW
2701{ 2671{
2702 row_col_t pos;
2703
2704 if (!selection.op) 2672 if (!selection.op)
2705 return; 2673 return;
2706 2674
2707 pos.row = pos.col = 0;
2708 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2675 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2709 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2676 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2710 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2677 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2711 || (check_more == 1 2678 || (check_more == 1
2712 && current_screen == selection.screen 2679 && current_screen == selection.screen
2713 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2680 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2714 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2681 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2715 || (check_more == 2
2716 && ROWCOL_IS_BEFORE (selection.beg, pos)
2717 && ROWCOL_IS_AFTER (selection.end, pos))
2718 || (check_more == 3
2719 && ROWCOL_IS_AFTER (selection.end, pos))
2720 || (check_more == 4 /* screen width change */
2721 && (selection.beg.row != selection.end.row
2722 || selection.end.col > ncol)))
2723 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;
2724} 2697}
2725 2698
2726/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2727/* 2700/*
2728 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
… …
2734 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2735 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2736 data[i] = C0_CR; 2709 data[i] = C0_CR;
2737 2710
2738 if (priv_modes & PrivMode_BracketPaste) 2711 if (priv_modes & PrivMode_BracketPaste)
2739 tt_printf ("\e[200~"); 2712 tt_printf ("\x1b[200~");
2740 2713
2741 tt_write (data, len); 2714 tt_write (data, len);
2742 2715
2743 if (priv_modes & PrivMode_BracketPaste) 2716 if (priv_modes & PrivMode_BracketPaste)
2744 tt_printf ("\e[201~"); 2717 tt_printf ("\x1b[201~");
2745} 2718}
2746 2719
2747void 2720void
2748rxvt_term::paste (char *data, unsigned int len) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2749{ 2722{
… …
2969/* ------------------------------------------------------------------------- */ 2942/* ------------------------------------------------------------------------- */
2970/* 2943/*
2971 * 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
2972 * EXT: button 1 press 2945 * EXT: button 1 press
2973 */ 2946 */
2974void 2947void ecb_cold
2975rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2976{ 2949{
2977 clicks = ((clicks - 1) % 3) + 1; 2950 clicks = ((clicks - 1) % 3) + 1;
2978 selection.clicks = clicks; /* save clicks so extend will work */ 2951 selection.clicks = clicks; /* save clicks so extend will work */
2979 2952
… …
2998 2971
2999/* ------------------------------------------------------------------------- */ 2972/* ------------------------------------------------------------------------- */
3000/* 2973/*
3001 * Mark a selection at the specified col/row 2974 * Mark a selection at the specified col/row
3002 */ 2975 */
3003void 2976void ecb_cold
3004rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3005{ 2978{
3006 want_refresh = 1; 2979 want_refresh = 1;
3007 2980
3008 selection.mark.row = row + view_start; 2981 selection.mark.row = row + view_start;
… …
3031 * Word select: select text for 2 clicks 3004 * Word select: select text for 2 clicks
3032 * We now only find out the boundary in one direction 3005 * We now only find out the boundary in one direction
3033 */ 3006 */
3034 3007
3035/* 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 */
3036#define DELIMIT_TEXT(x) \ 3009#define DELIMIT_TEXT(x) \
3037 (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)))
3038#define DELIMIT_REND(x) 1 3011#define DELIMIT_REND(x) 1
3039 3012
3040void 3013void ecb_cold
3041rxvt_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
3042{ 3015{
3043 int col, row, dirnadd, tcol, trow, w1, w2; 3016 int col, row, dirnadd, tcol, trow, w1, w2;
3044 row_col_t bound; 3017 row_col_t bound;
3045 text_t *stp; 3018 text_t *stp;
… …
3119 * EXT: button 3 press; button 1 or 3 drag 3092 * EXT: button 3 press; button 1 or 3 drag
3120 * flag == 0 ==> button 1 3093 * flag == 0 ==> button 1
3121 * flag == 1 ==> button 3 press 3094 * flag == 1 ==> button 3 press
3122 * flag == 2 ==> button 3 motion 3095 * flag == 2 ==> button 3 motion
3123 */ 3096 */
3124void 3097void ecb_cold
3125rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3126{ 3099{
3127 int col = clamp (Pixel2Col (x), 0, ncol); 3100 int col = clamp (Pixel2Col (x), 0, ncol);
3128 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3101 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3129 3102
… …
3155 3128
3156/* ------------------------------------------------------------------------- */ 3129/* ------------------------------------------------------------------------- */
3157/* 3130/*
3158 * Extend the selection to the specified col/row 3131 * Extend the selection to the specified col/row
3159 */ 3132 */
3160void 3133void ecb_cold
3161rxvt_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
3162{ 3135{
3163 row_col_t pos; 3136 row_col_t pos;
3164 enum { 3137 enum {
3165 LEFT, RIGHT 3138 LEFT, RIGHT
3166 } closeto = RIGHT; 3139 } closeto = RIGHT;
3167
3168 want_refresh = 1;
3169 3140
3170 switch (selection.op) 3141 switch (selection.op)
3171 { 3142 {
3172 case SELECTION_INIT: 3143 case SELECTION_INIT:
3173 CLEAR_SELECTION (); 3144 CLEAR_SELECTION ();
… …
3353 3324
3354#if !ENABLE_MINIMAL 3325#if !ENABLE_MINIMAL
3355 if (selection.rect && selection.beg.col > selection.end.col) 3326 if (selection.rect && selection.beg.col > selection.end.col)
3356 ::swap (selection.beg.col, selection.end.col); 3327 ::swap (selection.beg.col, selection.end.col);
3357#endif 3328#endif
3329
3330 selection_changed ();
3358} 3331}
3359 3332
3360#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3361void 3334void ecb_cold
3362rxvt_term::selection_remove_trailing_spaces () NOTHROW 3335rxvt_term::selection_remove_trailing_spaces () NOTHROW
3363{ 3336{
3364 int32_t end_col, end_row; 3337 int32_t end_col, end_row;
3365 text_t *stp; 3338 text_t *stp;
3366 3339
… …
3404/* ------------------------------------------------------------------------- */ 3377/* ------------------------------------------------------------------------- */
3405/* 3378/*
3406 * Double click on button 3 when already selected 3379 * Double click on button 3 when already selected
3407 * EXT: button 3 double click 3380 * EXT: button 3 double click
3408 */ 3381 */
3409void 3382void ecb_cold
3410rxvt_term::selection_rotate (int x, int y) NOTHROW 3383rxvt_term::selection_rotate (int x, int y) NOTHROW
3411{ 3384{
3412 selection.clicks = selection.clicks % 3 + 1; 3385 selection.clicks = selection.clicks % 3 + 1;
3413 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3414} 3387}
… …
3416/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3417/* 3390/*
3418 * Respond to a request for our current selection 3391 * Respond to a request for our current selection
3419 * EXT: SelectionRequest 3392 * EXT: SelectionRequest
3420 */ 3393 */
3421void 3394void ecb_cold
3422rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3423{ 3396{
3424 Atom property = rq.property == None ? rq.target : rq.property; 3397 Atom property = rq.property == None ? rq.target : rq.property;
3425 XSelectionEvent ev; 3398 XSelectionEvent ev;
3426 3399
… …
3559 3532
3560 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3561} 3534}
3562 3535
3563/* ------------------------------------------------------------------------- */ 3536/* ------------------------------------------------------------------------- */
3564#ifdef USE_XIM 3537#if USE_XIM
3565void 3538void ecb_cold
3566rxvt_term::im_set_position (XPoint &pos) NOTHROW 3539rxvt_term::im_set_position (XPoint &pos) NOTHROW
3567{ 3540{
3568 XWindowAttributes xwa; 3541 XWindowAttributes xwa;
3569 3542
3570 XGetWindowAttributes (dpy, vt, &xwa); 3543 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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