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.410 by sf-exg, Thu Nov 24 18:09:54 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
… …
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--; )
… …
630/* 645/*
631 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
632 * count positive ==> scroll up 647 * count positive ==> scroll up
633 * count negative ==> scroll down 648 * count negative ==> scroll down
634 */ 649 */
635int 650int ecb_hot
636rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
637{ 652{
638 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
639 return 0; 654 return 0;
640 655
… …
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
… …
774 789
775/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
776/* 791/*
777 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
778 */ 793 */
779void 794void ecb_hot
780rxvt_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
781{ 796{
782 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
783 return; 798 return;
784 799
… …
997 } 1012 }
998 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
999 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
1000 { 1015 {
1001 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
1002 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
1003 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
1004 } 1019 }
1005 else 1020 else
1006 continue; 1021 continue;
1007 1022
1008 linep->touch (); 1023 linep->touch ();
… …
1134 * XTERM_SEQ: ESC 6 1149 * XTERM_SEQ: ESC 6
1135 * 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
1136 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1137 */ 1152 */
1138#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1139void 1154void ecb_cold
1140rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () NOTHROW
1141{ 1156{
1142 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1143 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1144 else 1159 else
… …
1151 * XTERM_SEQ: ESC 9 1166 * XTERM_SEQ: ESC 9
1152 * 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
1153 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1154 */ 1169 */
1155#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1156void 1171void ecb_cold
1157rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () NOTHROW
1158{ 1173{
1159 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1160 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1161 else 1176 else
… …
1226 * direction should be UP or DN 1241 * direction should be UP or DN
1227 */ 1242 */
1228void 1243void
1229rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1230{ 1245{
1231 int dirn;
1232
1233 want_refresh = 1; 1246 want_refresh = 1;
1234 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1235 1248
1236 dirn = ((direction == UP) ? 1 : -1);
1237
1238 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1239 1250
1240 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1241 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1242 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1243 else 1254 else
1244 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1245 1256
1246 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1247 selection_check (0); 1258 selection_check (0);
1248} 1259}
1249 1260
… …
1367 { 1378 {
1368 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1369 1380
1370 if (mapped) 1381 if (mapped)
1371 XClearArea (dpy, vt, 0, 1382 XClearArea (dpy, vt, 0,
1372 Row2Pixel (row - view_start), (unsigned int)width, 1383 Row2Pixel (row - view_start), (unsigned int)vt_width,
1373 (unsigned int)Height2Pixel (num), False); 1384 (unsigned int)Height2Pixel (num), False);
1374 } 1385 }
1375 else 1386 else
1376 { 1387 {
1377 ren = rstyle & (RS_fgMask | RS_bgMask); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1380 { 1391 {
1381 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1392 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1382 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1383 XFillRectangle (dpy, vt, gc, 1394 XFillRectangle (dpy, vt, gc,
1384 0, Row2Pixel (row - view_start), 1395 0, Row2Pixel (row - view_start),
1385 (unsigned int)width, 1396 (unsigned int)vt_width,
1386 (unsigned int)Height2Pixel (num)); 1397 (unsigned int)Height2Pixel (num));
1387 gcvalue.foreground = pix_colors[Color_fg]; 1398 gcvalue.foreground = pix_colors[Color_fg];
1388 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1389 } 1400 }
1390 } 1401 }
… …
1412/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1413/* 1424/*
1414 * Fill the screen with `E's 1425 * Fill the screen with `E's
1415 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1416 */ 1427 */
1417void 1428void ecb_cold
1418rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () NOTHROW
1419{ 1430{
1420 rend_t fs; 1431 rend_t fs;
1421 1432
1422 want_refresh = 1; 1433 want_refresh = 1;
… …
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;
… …
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 bool 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
… …
2070 2077
2071 /* 2078 /*
2072 * C: set the cursor character (s) 2079 * C: set the cursor character (s)
2073 */ 2080 */
2074 { 2081 {
2075 bool 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
… …
2242 int ypixel = (int)Row2Pixel (row); 2236 int ypixel = (int)Row2Pixel (row);
2243 2237
2244 for (col = 0; col < ncol; col++) 2238 for (col = 0; col < ncol; col++)
2245 { 2239 {
2246 /* compare new text with old - if exactly the same then continue */ 2240 /* compare new text with old - if exactly the same then continue */
2247 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2241 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2248 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2249 || (stp[col] == ' ' /* space w/ no background change */
2250 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2251 continue; 2242 continue;
2252 2243
2253 // redraw one or more characters 2244 // redraw one or more characters
2254 2245
2255 // seek to the beginning of wide characters 2246 // seek to the beginning of wide characters
… …
2427 else 2418 else
2428 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2419 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2429 2420
2430 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2421 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2431 { 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
2432#if ENABLE_FRILLS 2427#if ENABLE_FRILLS
2433 if (ISSET_PIXCOLOR (Color_underline)) 2428 if (ISSET_PIXCOLOR (Color_underline))
2434 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2429 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2435 else 2430 else
2436#endif 2431#endif
… …
2448 */ 2443 */
2449 if (showcursor) 2444 if (showcursor)
2450 { 2445 {
2451 if (focus) 2446 if (focus)
2452 { 2447 {
2453 if (option (Opt_cursorUnderline)) 2448 if (cursor_type == 0)
2454 *crp ^= RS_Uline; 2449 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2455 else 2450 else if (oldcursor.row >= 0)
2456 { 2451 {
2457 *crp ^= RS_RVid; 2452 XSetForeground (dpy, gc, pix_colors[ccol1]);
2458#ifndef NO_CURSORCOLOR 2453 if (cursor_type == 1)
2459 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2454 XFillRectangle (dpy, vt, gc,
2460#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));
2461 } 2465 }
2462 } 2466 }
2463 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2464 { 2468 {
2465 int cursorwidth = 1;
2466 int col = oldcursor.col;
2467
2468 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2469 col--;
2470
2471 while (col + cursorwidth < ncol
2472 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2473 cursorwidth++;
2474
2475#ifndef NO_CURSORCOLOR
2476 if (ISSET_PIXCOLOR (Color_cursor))
2477 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2478 else
2479#endif
2480 XSetForeground (dpy, gc, pix_colors[ccol1]); 2469 XSetForeground (dpy, gc, pix_colors[ccol1]);
2481 2470
2482 XDrawRectangle (dpy, vt, gc, 2471 XDrawRectangle (dpy, vt, gc,
2483 Col2Pixel (col), 2472 Col2Pixel (cur_col),
2484 Row2Pixel (oldcursor.row), 2473 Row2Pixel (oldcursor.row),
2485 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2474 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2486 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2475 (unsigned int) (Height2Pixel (1) - 1));
2487 } 2476 }
2488 } 2477 }
2489 2478
2490 /* 2479 /*
2491 * H: cleanup selection 2480 * H: cleanup selection
… …
2500 screen.flags = old_screen_flags; 2489 screen.flags = old_screen_flags;
2501 num_scr = 0; 2490 num_scr = 0;
2502 num_scr_allow = 1; 2491 num_scr_allow = 1;
2503} 2492}
2504 2493
2505void 2494void ecb_cold
2506rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2495rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2507{ 2496{
2508 if (!l.t) 2497 if (!l.valid ())
2509 return; 2498 return;
2510 2499
2511 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
2512 2501
2513 for (int i = ncol; i--; ) 2502 for (int i = ncol; i--; )
2514 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]));
2515} 2504}
2516 2505
2517void 2506void ecb_cold
2518rxvt_term::scr_remap_chars () NOTHROW 2507rxvt_term::scr_remap_chars () NOTHROW
2519{ 2508{
2520 for (int i = total_rows; i--; ) 2509 for (int i = total_rows; i--; )
2521 scr_remap_chars (row_buf [i]); 2510 scr_remap_chars (row_buf [i]);
2522 2511
… …
2525 scr_remap_chars (drawn_buf [i]); 2514 scr_remap_chars (drawn_buf [i]);
2526 scr_remap_chars (swap_buf [i]); 2515 scr_remap_chars (swap_buf [i]);
2527 } 2516 }
2528} 2517}
2529 2518
2530void 2519void ecb_cold
2531rxvt_term::scr_recolour (bool refresh) NOTHROW 2520rxvt_term::scr_recolor (bool refresh) NOTHROW
2532{ 2521{
2533 bool transparent = false; 2522 bool transparent = false;
2534 2523
2535#ifdef HAVE_BG_PIXMAP 2524#ifdef HAVE_IMG
2536 if (bg_pixmap != None) 2525 if (bg_img != 0)
2537 { 2526 {
2538# ifdef ENABLE_TRANSPARENCY 2527# if ENABLE_TRANSPARENCY
2539 if (bg_flags & BG_IS_TRANSPARENT) 2528 if (bg_flags & BG_IS_TRANSPARENT)
2540 { 2529 {
2541 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2530 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2542 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2531 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2543 2532
2544 transparent = true; 2533 transparent = true;
2545 } 2534 }
2546 else 2535 else
2547# endif 2536# endif
2548 { 2537 {
2549 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2550 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2539 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2551 } 2540 }
2552 } 2541 }
2553 else 2542 else
2554#endif 2543#endif
2555 { 2544 {
… …
2557 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2546 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2558 } 2547 }
2559 2548
2560 XClearWindow (dpy, parent); 2549 XClearWindow (dpy, parent);
2561 2550
2562 if (scrollBar.win) 2551 if (scrollBar.state && scrollBar.win)
2563 { 2552 {
2564 if (transparent) 2553 if (transparent)
2565 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2554 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2566 else 2555 else
2567 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2568 scrollBar.state = SB_STATE_IDLE; 2557 scrollBar.state = SB_STATE_IDLE;
2569 scrollBar.show (0); 2558 scrollBar.show (0);
2570 } 2559 }
2571 2560
2572 if (refresh) 2561 if (refresh)
… …
2638 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2627 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2639 srp[col] ^= rstyle; 2628 srp[col] ^= rstyle;
2640} 2629}
2641 2630
2642/* ------------------------------------------------------------------------- */ 2631/* ------------------------------------------------------------------------- */
2643void 2632void ecb_hot
2644rxvt_term::scr_reverse_selection () NOTHROW 2633rxvt_term::scr_reverse_selection () NOTHROW
2645{ 2634{
2646 if (selection.op 2635 if (selection.op
2647 && current_screen == selection.screen 2636 && current_screen == selection.screen
2648 && selection.end.row >= view_start) 2637 && selection.end.row >= view_start)
… …
2691 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2680 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2692 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2681 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2693 CLEAR_ALL_SELECTION (); 2682 CLEAR_ALL_SELECTION ();
2694} 2683}
2695 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;
2697}
2698
2696/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2697/* 2700/*
2698 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
2699 */ 2702 */
2700void 2703void
… …
2704 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2705 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2706 data[i] = C0_CR; 2709 data[i] = C0_CR;
2707 2710
2708 if (priv_modes & PrivMode_BracketPaste) 2711 if (priv_modes & PrivMode_BracketPaste)
2709 tt_printf ("\e[200~"); 2712 tt_printf ("\x1b[200~");
2710 2713
2711 tt_write (data, len); 2714 tt_write (data, len);
2712 2715
2713 if (priv_modes & PrivMode_BracketPaste) 2716 if (priv_modes & PrivMode_BracketPaste)
2714 tt_printf ("\e[201~"); 2717 tt_printf ("\x1b[201~");
2715} 2718}
2716 2719
2717void 2720void
2718rxvt_term::paste (char *data, unsigned int len) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2719{ 2722{
… …
2939/* ------------------------------------------------------------------------- */ 2942/* ------------------------------------------------------------------------- */
2940/* 2943/*
2941 * 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
2942 * EXT: button 1 press 2945 * EXT: button 1 press
2943 */ 2946 */
2944void 2947void ecb_cold
2945rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2946{ 2949{
2947 clicks = ((clicks - 1) % 3) + 1; 2950 clicks = ((clicks - 1) % 3) + 1;
2948 selection.clicks = clicks; /* save clicks so extend will work */ 2951 selection.clicks = clicks; /* save clicks so extend will work */
2949 2952
… …
2968 2971
2969/* ------------------------------------------------------------------------- */ 2972/* ------------------------------------------------------------------------- */
2970/* 2973/*
2971 * Mark a selection at the specified col/row 2974 * Mark a selection at the specified col/row
2972 */ 2975 */
2973void 2976void ecb_cold
2974rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2975{ 2978{
2976 want_refresh = 1; 2979 want_refresh = 1;
2977 2980
2978 selection.mark.row = row + view_start; 2981 selection.mark.row = row + view_start;
… …
3001 * Word select: select text for 2 clicks 3004 * Word select: select text for 2 clicks
3002 * We now only find out the boundary in one direction 3005 * We now only find out the boundary in one direction
3003 */ 3006 */
3004 3007
3005/* 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 */
3006#define DELIMIT_TEXT(x) \ 3009#define DELIMIT_TEXT(x) \
3007 (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)))
3008#define DELIMIT_REND(x) 1 3011#define DELIMIT_REND(x) 1
3009 3012
3010void 3013void ecb_cold
3011rxvt_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
3012{ 3015{
3013 int col, row, dirnadd, tcol, trow, w1, w2; 3016 int col, row, dirnadd, tcol, trow, w1, w2;
3014 row_col_t bound; 3017 row_col_t bound;
3015 text_t *stp; 3018 text_t *stp;
… …
3089 * EXT: button 3 press; button 1 or 3 drag 3092 * EXT: button 3 press; button 1 or 3 drag
3090 * flag == 0 ==> button 1 3093 * flag == 0 ==> button 1
3091 * flag == 1 ==> button 3 press 3094 * flag == 1 ==> button 3 press
3092 * flag == 2 ==> button 3 motion 3095 * flag == 2 ==> button 3 motion
3093 */ 3096 */
3094void 3097void ecb_cold
3095rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3096{ 3099{
3097 int col = clamp (Pixel2Col (x), 0, ncol); 3100 int col = clamp (Pixel2Col (x), 0, ncol);
3098 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3101 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3099 3102
… …
3125 3128
3126/* ------------------------------------------------------------------------- */ 3129/* ------------------------------------------------------------------------- */
3127/* 3130/*
3128 * Extend the selection to the specified col/row 3131 * Extend the selection to the specified col/row
3129 */ 3132 */
3130void 3133void ecb_cold
3131rxvt_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
3132{ 3135{
3133 row_col_t pos; 3136 row_col_t pos;
3134 enum { 3137 enum {
3135 LEFT, RIGHT 3138 LEFT, RIGHT
3136 } closeto = RIGHT; 3139 } closeto = RIGHT;
3137
3138 want_refresh = 1;
3139 3140
3140 switch (selection.op) 3141 switch (selection.op)
3141 { 3142 {
3142 case SELECTION_INIT: 3143 case SELECTION_INIT:
3143 CLEAR_SELECTION (); 3144 CLEAR_SELECTION ();
… …
3323 3324
3324#if !ENABLE_MINIMAL 3325#if !ENABLE_MINIMAL
3325 if (selection.rect && selection.beg.col > selection.end.col) 3326 if (selection.rect && selection.beg.col > selection.end.col)
3326 ::swap (selection.beg.col, selection.end.col); 3327 ::swap (selection.beg.col, selection.end.col);
3327#endif 3328#endif
3329
3330 selection_changed ();
3328} 3331}
3329 3332
3330#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3331void 3334void ecb_cold
3332rxvt_term::selection_remove_trailing_spaces () NOTHROW 3335rxvt_term::selection_remove_trailing_spaces () NOTHROW
3333{ 3336{
3334 int32_t end_col, end_row; 3337 int32_t end_col, end_row;
3335 text_t *stp; 3338 text_t *stp;
3336 3339
… …
3374/* ------------------------------------------------------------------------- */ 3377/* ------------------------------------------------------------------------- */
3375/* 3378/*
3376 * Double click on button 3 when already selected 3379 * Double click on button 3 when already selected
3377 * EXT: button 3 double click 3380 * EXT: button 3 double click
3378 */ 3381 */
3379void 3382void ecb_cold
3380rxvt_term::selection_rotate (int x, int y) NOTHROW 3383rxvt_term::selection_rotate (int x, int y) NOTHROW
3381{ 3384{
3382 selection.clicks = selection.clicks % 3 + 1; 3385 selection.clicks = selection.clicks % 3 + 1;
3383 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3384} 3387}
… …
3386/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3387/* 3390/*
3388 * Respond to a request for our current selection 3391 * Respond to a request for our current selection
3389 * EXT: SelectionRequest 3392 * EXT: SelectionRequest
3390 */ 3393 */
3391void 3394void ecb_cold
3392rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3393{ 3396{
3394 Atom property = rq.property == None ? rq.target : rq.property; 3397 Atom property = rq.property == None ? rq.target : rq.property;
3395 XSelectionEvent ev; 3398 XSelectionEvent ev;
3396 3399
… …
3529 3532
3530 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3531} 3534}
3532 3535
3533/* ------------------------------------------------------------------------- */ 3536/* ------------------------------------------------------------------------- */
3534#ifdef USE_XIM 3537#if USE_XIM
3535void 3538void ecb_cold
3536rxvt_term::im_set_position (XPoint &pos) NOTHROW 3539rxvt_term::im_set_position (XPoint &pos) NOTHROW
3537{ 3540{
3538 XWindowAttributes xwa; 3541 XWindowAttributes xwa;
3539 3542
3540 XGetWindowAttributes (dpy, vt, &xwa); 3543 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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