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.400 by sf-exg, Tue Nov 15 02:24:25 2011 UTC vs.
Revision 1.441 by sf-exg, Thu Mar 28 09:21:46 2013 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a separate compile!
34
35static inline void 33static inline void
36fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
37{ 35{
38 while (len--) 36 while (len--)
39 *start++ = value; 37 *start++ = value;
… …
98 96
99/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
100void 98void
101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
102{ 100{
103 if (!l.t) 101 if (!l.valid ())
104 { 102 {
105 lalloc (l); 103 l.alloc ();
106 col = 0; 104 col = 0;
107 width = ncol; 105 width = ncol;
108 } 106 }
109 107
110 l.touch (); 108 l.touch ();
… …
152 l.r[col] = rend; 150 l.r[col] = rend;
153 col++; 151 col++;
154 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
155} 153}
156 154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
163}
164
157/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
160 168
161void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
162rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
163{ 215{
164#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
165 scr_overlay_off (); 217 scr_overlay_off ();
166#endif 218#endif
… …
192 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
193 245
194 screen.tscroll = 0; 246 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
196 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
197 if (!row_buf) 257 if (!prev_row_buf)
198 { 258 {
199 /*
200 * first time called so just malloc everything: don't rely on realloc
201 */
202 top_row = 0; 259 top_row = 0;
203 term_start = 0; 260 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 261
219 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 264 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 265 screen.cur.row = screen.cur.col = 0;
… …
245 { 288 {
246 /* 289 /*
247 * add or delete rows as appropriate 290 * add or delete rows as appropriate
248 */ 291 */
249 292
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 293 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 294
267 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
268 { 296 {
269 lresize (drawn_buf[row]); 297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 298 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
271 } 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
272 300
273 for (int row = prev_nrow; row < nrow; row++) 301 copy_line (swap_buf [row], prev_swap_buf [row]);
274 { 302 }
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 303
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 304 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
285 307
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 315 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 316
295 do 317 do
296 { 318 {
297 p = MOD (p - 1, prev_total_rows); 319 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 320 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 321 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 322 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 323
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 324 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 325 {
304 p = MOD (p - 1, prev_total_rows); 326 p = MOD (p - 1, prev_total_rows);
305 327
306 plines++; 328 plines++;
307 llen += prev_ncol; 329 llen += prev_ncol;
… …
320 342
321 // re-assemble the full line by destination lines 343 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 344 for (int qrow = q; qlines--; qrow++)
323 { 345 {
324 qline = row_buf + qrow; 346 qline = row_buf + qrow;
325 lalloc (*qline); 347 qline->alloc (); // redundant with next line
326 qline->l = ncol; 348 qline->l = ncol;
327 qline->is_longer (1); 349 qline->is_longer (1);
328 350
329 int qcol = 0; 351 int qcol = 0;
330 352
… …
345 // this seems to upset applications/shells/readline 367 // this seems to upset applications/shells/readline
346 // least. 368 // least.
347 if (prow == ocur.row) 369 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 370 screen.cur.row = q - (total_rows - nrow);
349 371
350 line_t &pline = old_buf [prow]; 372 line_t &pline = prev_row_buf [prow];
351 373
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 374 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 375
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 376 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 377 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 398 {
377 // if no scrollback exists (yet), wing, instead of wrap 399 // if no scrollback exists (yet), wing, instead of wrap
378 400
379 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
380 { 402 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 404 line_t &dst = row_buf [row];
383 405
384 qline = pline; 406 copy_line (dst, src);
385 lresize (qline);
386 } 407 }
387 408
388 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 411
393 term_start = 0; 412 term_start = 0;
394 } 413 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 414
400 clamp_it (screen.cur.row, 0, nrow - 1); 415 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 416 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 417 }
403 418
419 for (int row = nrow; row--; )
420 {
421 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
422 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
423 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
424 }
425
426 chunk_free (prev_chunk, prev_chunk_size);
427
404 free (tabs); 428 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 429 tabs = (char *)rxvt_malloc (ncol);
406 430
407 for (int col = ncol; col--; ) 431 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 432 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 439 tt_winch ();
416 440
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 441 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 442}
419 443
420/* ------------------------------------------------------------------------- */ 444void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 445rxvt_term::scr_release () NOTHROW
426{ 446{
427 if (row_buf) 447 chunk_free (chunk, chunk_size);
428 { 448 chunk = 0;
429 delete talloc; talloc = 0; 449 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 450
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); 451 free (tabs);
438 tabs = 0; 452 tabs = 0;
439 }
440} 453}
441 454
442/* ------------------------------------------------------------------------- */ 455/* ------------------------------------------------------------------------- */
443/* 456/*
444 * Hard/Soft reset 457 * Hard/Soft reset
445 */ 458 */
446void 459void ecb_cold
447rxvt_term::scr_poweron () 460rxvt_term::scr_poweron ()
448{ 461{
449 scr_release (); 462 scr_release ();
463
450 prev_nrow = prev_ncol = 0; 464 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 465 rvideo_mode = false;
452 scr_soft_reset (); 466 scr_soft_reset ();
453 scr_reset (); 467 scr_reset ();
454 468
455 scr_clear (true); 469 scr_clear (true);
456 scr_refresh (); 470 scr_refresh ();
457} 471}
458 472
459void 473void ecb_cold
460rxvt_term::scr_soft_reset () 474rxvt_term::scr_soft_reset () NOTHROW
461{ 475{
462 /* only affects modes, nothing drastic such as clearing the screen */ 476 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 477#if ENABLE_OVERLAY
464 scr_overlay_off (); 478 scr_overlay_off ();
465#endif 479#endif
… …
520 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 535 assert (s->cur.col >= 0);
522} 536}
523 537
524void 538void
525rxvt_term::scr_swap_screen () 539rxvt_term::scr_swap_screen () NOTHROW
526{ 540{
527 if (!option (Opt_secondaryScreen)) 541 if (!option (Opt_secondaryScreen))
528 return; 542 return;
529 543
530 for (int i = prev_nrow; i--; ) 544 for (int i = prev_nrow; i--; )
… …
549 return; 563 return;
550 564
551 want_refresh = 1; 565 want_refresh = 1;
552 view_start = 0; 566 view_start = 0;
553 567
554 selection_check (2); /* check for boundary cross */ 568 /* check for boundary cross */
569 row_col_t pos;
570 pos.row = pos.col = 0;
571 if (ROWCOL_IS_BEFORE (selection.beg, pos)
572 && ROWCOL_IS_AFTER (selection.end, pos))
573 CLEAR_SELECTION ();
555 574
556 current_screen = scrn; 575 current_screen = scrn;
557 576
558#if NSCREENS 577#if NSCREENS
559 if (option (Opt_secondaryScreen)) 578 if (option (Opt_secondaryScreen))
… …
625/* 644/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 645 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 646 * count positive ==> scroll up
628 * count negative ==> scroll down 647 * count negative ==> scroll down
629 */ 648 */
630int 649int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 651{
633 if (count == 0 || (row1 > row2)) 652 if (count == 0 || (row1 > row2))
634 return 0; 653 return 0;
635 654
… …
682 else 701 else
683 scr_blank_screen_mem (l, rstyle); 702 scr_blank_screen_mem (l, rstyle);
684 } 703 }
685 704
686 // move and/or clear selection, if any 705 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 706 if (selection.op && current_screen == selection.screen
707 && selection.beg.row <= row2)
688 { 708 {
689 selection.beg.row -= count; 709 selection.beg.row -= count;
690 selection.end.row -= count; 710 selection.end.row -= count;
691 selection.mark.row -= count; 711 selection.mark.row -= count;
692 712
… …
695 715
696 // finally move the view window, if desired 716 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 718 && view_start != 0
699 && view_start != -saveLines) 719 && view_start != -saveLines)
700 scr_page (UP, count); 720 scr_page (count);
701 721
702 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 722 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
703 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 723 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
704 } 724 }
705 else 725 else
… …
768 788
769/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
770/* 790/*
771 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
772 */ 792 */
773void 793void ecb_hot
774rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 794rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
775{ 795{
776 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
777 return; 797 return;
778 798
779 unsigned char checksel; 799 bool checksel;
780 unicode_t c; 800 unicode_t c;
781 int ncol = this->ncol; 801 int ncol = this->ncol;
782 const wchar_t *strend = str + len; 802 const wchar_t *strend = str + len;
783 803
784 want_refresh = 1; 804 want_refresh = 1;
… …
1128 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1129 * Move cursor left in row. If we're at the left boundary, shift everything 1149 * Move cursor left in row. If we're at the left boundary, shift everything
1130 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1131 */ 1151 */
1132#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1133void 1153void ecb_cold
1134rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1135{ 1155{
1136 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1137 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1138 else 1158 else
… …
1145 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1146 * Move cursor right in row. If we're at the right boundary, shift everything 1166 * Move cursor right in row. If we're at the right boundary, shift everything
1147 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1148 */ 1168 */
1149#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1150void 1170void ecb_cold
1151rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1152{ 1172{
1153 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1154 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1155 else 1175 else
… …
1220 * direction should be UP or DN 1240 * direction should be UP or DN
1221 */ 1241 */
1222void 1242void
1223rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1243rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1224{ 1244{
1225 int dirn;
1226
1227 want_refresh = 1; 1245 want_refresh = 1;
1228 ZERO_SCROLLBACK (); 1246 ZERO_SCROLLBACK ();
1229 1247
1230 dirn = ((direction == UP) ? 1 : -1);
1231
1232 screen.flags &= ~Screen_WrapNext; 1248 screen.flags &= ~Screen_WrapNext;
1233 1249
1234 if ((screen.cur.row == screen.bscroll && direction == UP) 1250 if ((screen.cur.row == screen.bscroll && direction == UP)
1235 || (screen.cur.row == screen.tscroll && direction == DN)) 1251 || (screen.cur.row == screen.tscroll && direction == DN))
1236 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1252 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1237 else 1253 else
1238 screen.cur.row += dirn; 1254 screen.cur.row += direction;
1239 1255
1240 clamp_it (screen.cur.row, 0, nrow - 1); 1256 clamp_it (screen.cur.row, 0, nrow - 1);
1241 selection_check (0); 1257 selection_check (0);
1242} 1258}
1243 1259
… …
1306 scr_blank_line (line, col, num, rstyle); 1322 scr_blank_line (line, col, num, rstyle);
1307} 1323}
1308 1324
1309/* ------------------------------------------------------------------------- */ 1325/* ------------------------------------------------------------------------- */
1310/* 1326/*
1311 * Erase part of whole of the screen 1327 * Erase part or whole of the screen
1312 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1328 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1313 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1329 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1314 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1330 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1315 */ 1331 */
1316void 1332void
… …
1325 ZERO_SCROLLBACK (); 1341 ZERO_SCROLLBACK ();
1326 1342
1327 switch (mode) 1343 switch (mode)
1328 { 1344 {
1329 case 0: /* erase to end of screen */ 1345 case 0: /* erase to end of screen */
1330 selection_check (1);
1331 scr_erase_line (0); 1346 scr_erase_line (0);
1332 row = screen.cur.row + 1; /* possible OOB */ 1347 row = screen.cur.row + 1; /* possible OOB */
1333 num = nrow - row; 1348 num = nrow - row;
1334 break; 1349 break;
1335 case 1: /* erase to beginning of screen */ 1350 case 1: /* erase to beginning of screen */
1336 selection_check (3);
1337 scr_erase_line (1); 1351 scr_erase_line (1);
1338 row = 0; 1352 row = 0;
1339 num = screen.cur.row; 1353 num = screen.cur.row;
1340 break; 1354 break;
1341 case 2: /* erase whole screen */ 1355 case 2: /* erase whole screen */
1342 selection_check (3);
1343 row = 0; 1356 row = 0;
1344 num = nrow; 1357 num = nrow;
1345 break; 1358 break;
1346 default: 1359 default:
1347 return; 1360 return;
… …
1364 { 1377 {
1365 ren = DEFAULT_RSTYLE; 1378 ren = DEFAULT_RSTYLE;
1366 1379
1367 if (mapped) 1380 if (mapped)
1368 XClearArea (dpy, vt, 0, 1381 XClearArea (dpy, vt, 0,
1369 Row2Pixel (row - view_start), (unsigned int)width, 1382 Row2Pixel (row - view_start), (unsigned int)vt_width,
1370 (unsigned int)Height2Pixel (num), False); 1383 (unsigned int)Height2Pixel (num), False);
1371 } 1384 }
1372 else 1385 else
1373 { 1386 {
1374 ren = rstyle & (RS_fgMask | RS_bgMask); 1387 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1377 { 1390 {
1378 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1391 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1379 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1392 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1380 XFillRectangle (dpy, vt, gc, 1393 XFillRectangle (dpy, vt, gc,
1381 0, Row2Pixel (row - view_start), 1394 0, Row2Pixel (row - view_start),
1382 (unsigned int)width, 1395 (unsigned int)vt_width,
1383 (unsigned int)Height2Pixel (num)); 1396 (unsigned int)Height2Pixel (num));
1384 gcvalue.foreground = pix_colors[Color_fg]; 1397 gcvalue.foreground = pix_colors[Color_fg];
1385 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1398 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1386 } 1399 }
1387 } 1400 }
… …
1409/* ------------------------------------------------------------------------- */ 1422/* ------------------------------------------------------------------------- */
1410/* 1423/*
1411 * Fill the screen with `E's 1424 * Fill the screen with `E's
1412 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1425 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1413 */ 1426 */
1414void 1427void ecb_cold
1415rxvt_term::scr_E () NOTHROW 1428rxvt_term::scr_E () NOTHROW
1416{ 1429{
1417 rend_t fs; 1430 rend_t fs;
1418 1431
1419 want_refresh = 1; 1432 want_refresh = 1;
1420 ZERO_SCROLLBACK (); 1433 ZERO_SCROLLBACK ();
1421 1434
1422 num_scr_allow = 0; 1435 num_scr_allow = 0;
1423 selection_check (3); 1436
1437 row_col_t pos;
1438 pos.row = pos.col = 0;
1439 if (ROWCOL_IS_AFTER (selection.end, pos))
1440 CLEAR_SELECTION ();
1424 1441
1425 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1442 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1426 for (int row = nrow; row--; ) 1443 for (int row = nrow; row--; )
1427 { 1444 {
1428 line_t &line = ROW(row); 1445 line_t &line = ROW(row);
… …
1579/* ------------------------------------------------------------------------- */ 1596/* ------------------------------------------------------------------------- */
1580/* 1597/*
1581 * Set the scrolling region 1598 * Set the scrolling region
1582 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1599 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1583 */ 1600 */
1584void 1601void ecb_cold
1585rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1602rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1586{ 1603{
1587 max_it (top, 0); 1604 max_it (top, 0);
1588 min_it (bot, nrow - 1); 1605 min_it (bot, nrow - 1);
1589 1606
… …
1599/* 1616/*
1600 * Make the cursor visible/invisible 1617 * Make the cursor visible/invisible
1601 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1618 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1602 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1619 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1603 */ 1620 */
1604void 1621void ecb_cold
1605rxvt_term::scr_cursor_visible (int mode) NOTHROW 1622rxvt_term::scr_cursor_visible (int mode) NOTHROW
1606{ 1623{
1607 want_refresh = 1; 1624 want_refresh = 1;
1608 1625
1609 if (mode) 1626 if (mode)
… …
1616/* 1633/*
1617 * Set/unset automatic wrapping 1634 * Set/unset automatic wrapping
1618 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1635 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1619 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1636 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1620 */ 1637 */
1621void 1638void ecb_cold
1622rxvt_term::scr_autowrap (int mode) NOTHROW 1639rxvt_term::scr_autowrap (int mode) NOTHROW
1623{ 1640{
1624 if (mode) 1641 if (mode)
1625 screen.flags |= Screen_Autowrap; 1642 screen.flags |= Screen_Autowrap;
1626 else 1643 else
… …
1635 * Relative mode: line numbers are relative to top margin of scrolling region 1652 * Relative mode: line numbers are relative to top margin of scrolling region
1636 * and the cursor cannot be moved outside. 1653 * and the cursor cannot be moved outside.
1637 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1654 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1638 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1655 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1639 */ 1656 */
1640void 1657void ecb_cold
1641rxvt_term::scr_relative_origin (int mode) NOTHROW 1658rxvt_term::scr_relative_origin (int mode) NOTHROW
1642{ 1659{
1643 if (mode) 1660 if (mode)
1644 screen.flags |= Screen_Relative; 1661 screen.flags |= Screen_Relative;
1645 else 1662 else
… …
1652/* 1669/*
1653 * Set insert/replace mode 1670 * Set insert/replace mode
1654 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1671 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1655 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1672 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1656 */ 1673 */
1657void 1674void ecb_cold
1658rxvt_term::scr_insert_mode (int mode) NOTHROW 1675rxvt_term::scr_insert_mode (int mode) NOTHROW
1659{ 1676{
1660 if (mode) 1677 if (mode)
1661 screen.flags |= Screen_Insert; 1678 screen.flags |= Screen_Insert;
1662 else 1679 else
… …
1668 * Set/Unset tabs 1685 * Set/Unset tabs
1669 * XTERM_SEQ: Set tab at current column : ESC H 1686 * XTERM_SEQ: Set tab at current column : ESC H
1670 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1687 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1671 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1688 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1672 */ 1689 */
1673void 1690void ecb_cold
1674rxvt_term::scr_set_tab (int mode) NOTHROW 1691rxvt_term::scr_set_tab (int mode) NOTHROW
1675{ 1692{
1676 if (mode < 0) 1693 if (mode < 0)
1677 memset (tabs, 0, ncol); 1694 memset (tabs, 0, ncol);
1678 else if (screen.cur.col < ncol) 1695 else if (screen.cur.col < ncol)
… …
1697 if (rvideo_state != on) 1714 if (rvideo_state != on)
1698 { 1715 {
1699 rvideo_state = on; 1716 rvideo_state = on;
1700 1717
1701 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1718 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1702#ifdef HAVE_BG_PIXMAP 1719#ifdef HAVE_IMG
1703 if (bg_pixmap == None) 1720 if (bg_img == 0)
1704#endif 1721#endif
1705 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1722 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1706 1723
1707 XGCValues gcvalue; 1724 XGCValues gcvalue;
1708 gcvalue.foreground = pix_colors[Color_fg]; 1725 gcvalue.foreground = pix_colors[Color_fg];
… …
1717/* ------------------------------------------------------------------------- */ 1734/* ------------------------------------------------------------------------- */
1718/* 1735/*
1719 * Report current cursor position 1736 * Report current cursor position
1720 * XTERM_SEQ: Report position: ESC [ 6 n 1737 * XTERM_SEQ: Report position: ESC [ 6 n
1721 */ 1738 */
1722void 1739void ecb_cold
1723rxvt_term::scr_report_position () NOTHROW 1740rxvt_term::scr_report_position () NOTHROW
1724{ 1741{
1725 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1742 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1726} 1743}
1727 1744
… …
1730 * ------------------------------------------------------------------------- */ 1747 * ------------------------------------------------------------------------- */
1731 1748
1732/* 1749/*
1733 * Set font style 1750 * Set font style
1734 */ 1751 */
1735void 1752void ecb_cold
1736rxvt_term::set_font_style () NOTHROW 1753rxvt_term::set_font_style () NOTHROW
1737{ 1754{
1738#if 0 1755#if 0
1739 switch (charsets [screen.charset]) 1756 switch (charsets [screen.charset])
1740 { 1757 {
… …
1762 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1779 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1763 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1780 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1764 * XTERM_SEQ: Invoke G2 character set: ESC N 1781 * XTERM_SEQ: Invoke G2 character set: ESC N
1765 * XTERM_SEQ: Invoke G3 character set: ESC O 1782 * XTERM_SEQ: Invoke G3 character set: ESC O
1766 */ 1783 */
1767void 1784void ecb_cold
1768rxvt_term::scr_charset_choose (int set) NOTHROW 1785rxvt_term::scr_charset_choose (int set) NOTHROW
1769{ 1786{
1770 screen.charset = set; 1787 screen.charset = set;
1771 set_font_style (); 1788 set_font_style ();
1772} 1789}
… …
1793 * ------------------------------------------------------------------------- */ 1810 * ------------------------------------------------------------------------- */
1794 1811
1795/* 1812/*
1796 * refresh matching text. 1813 * refresh matching text.
1797 */ 1814 */
1798bool 1815bool ecb_cold
1799rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1816rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1800{ 1817{
1801 bool found = false; 1818 bool found = false;
1802 1819
1803 for (int i = 0; i < nrow; i++) 1820 for (int i = 0; i < nrow; i++)
… …
1822 PART_BEG = 0, 1839 PART_BEG = 0,
1823 PART_END, 1840 PART_END,
1824 RC_COUNT 1841 RC_COUNT
1825}; 1842};
1826 1843
1827void 1844void ecb_hot
1828rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1845rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1829{ 1846{
1830 int i; 1847 int i;
1831 row_col_t rc[RC_COUNT]; 1848 row_col_t rc[RC_COUNT];
1832 1849
… …
1869 * Refresh the entire screen 1886 * Refresh the entire screen
1870 */ 1887 */
1871void 1888void
1872rxvt_term::scr_touch (bool refresh) NOTHROW 1889rxvt_term::scr_touch (bool refresh) NOTHROW
1873{ 1890{
1874 scr_expose (0, 0, width, height, refresh); 1891 scr_expose (0, 0, vt_width, vt_height, refresh);
1875} 1892}
1876 1893
1877/* ------------------------------------------------------------------------- */ 1894/* ------------------------------------------------------------------------- */
1878/* 1895/*
1879 * Move the display so that the line represented by scrollbar value Y is at 1896 * Move the display so that the line represented by scrollbar value Y is at
… …
1889/* 1906/*
1890 * Page the screen up/down nlines 1907 * Page the screen up/down nlines
1891 * direction should be UP or DN 1908 * direction should be UP or DN
1892 */ 1909 */
1893bool 1910bool
1894rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1911rxvt_term::scr_page (int nlines) NOTHROW
1895{ 1912{
1896 int new_view_start =
1897 direction == UP ? view_start - nlines
1898 : view_start + nlines;
1899
1900 return scr_changeview (new_view_start); 1913 return scr_changeview (view_start - nlines);
1901} 1914}
1902 1915
1903bool 1916bool
1904rxvt_term::scr_changeview (int new_view_start) NOTHROW 1917rxvt_term::scr_changeview (int new_view_start) NOTHROW
1905{ 1918{
… …
1958 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1971 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1959#endif 1972#endif
1960} 1973}
1961 1974
1962/* ------------------------------------------------------------------------- */ 1975/* ------------------------------------------------------------------------- */
1963void 1976void ecb_cold
1964rxvt_term::scr_printscreen (int fullhist) NOTHROW 1977rxvt_term::scr_printscreen (int fullhist) NOTHROW
1965{ 1978{
1966#ifdef PRINTPIPE 1979#ifdef PRINTPIPE
1967 int nrows, row_start; 1980 int nrows, row_start;
1968 FILE *fd = popen_printer (); 1981 FILE *fd = popen_printer ();
… …
2017/* 2030/*
2018 * Refresh the screen 2031 * Refresh the screen
2019 * drawn_text/drawn_rend contain the screen information before the update. 2032 * drawn_text/drawn_rend contain the screen information before the update.
2020 * screen.text/screen.rend contain what the screen will change to. 2033 * screen.text/screen.rend contain what the screen will change to.
2021 */ 2034 */
2022void 2035void ecb_hot
2023rxvt_term::scr_refresh () NOTHROW 2036rxvt_term::scr_refresh () NOTHROW
2024{ 2037{
2025 int16_t col, row, /* column/row we're processing */ 2038 int16_t col, row, /* column/row we're processing */
2026 ocrow; /* old cursor row */ 2039 ocrow; /* old cursor row */
2027 int i; /* tmp */ 2040 int i; /* tmp */
2028#ifndef NO_CURSORCOLOR
2029 rend_t cc1; /* store colours at cursor position (s) */
2030#endif
2031 rend_t *crp; // cursor rendition pointer
2032 rend_t ccol1, /* Cursor colour */ 2041 rend_t ccol1, /* Cursor colour */
2033 ccol2; /* Cursor colour2 */ 2042 ccol2; /* Cursor colour2 */
2043 rend_t cur_rend;
2044 int cur_col;
2045 int cursorwidth;
2034 2046
2035 want_refresh = 0; /* screen is current */ 2047 want_refresh = 0; /* screen is current */
2036 2048
2037 if (refresh_type == NO_REFRESH || !mapped) 2049 if (refresh_type == NO_REFRESH || !mapped)
2038 return; 2050 return;
… …
2041 * A: set up vars 2053 * A: set up vars
2042 */ 2054 */
2043 refresh_count = 0; 2055 refresh_count = 0;
2044 2056
2045 unsigned int old_screen_flags = screen.flags; 2057 unsigned int old_screen_flags = screen.flags;
2046 char have_bg = 0; 2058 bool have_bg = 0;
2047#ifdef HAVE_BG_PIXMAP 2059#ifdef HAVE_IMG
2048 have_bg = bg_pixmap != None; 2060 have_bg = bg_img != 0;
2049#endif 2061#endif
2050 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2051 2063
2052 /* 2064 /*
2053 * B: reverse any characters which are selected 2065 * B: reverse any characters which are selected
… …
2057 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2069 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2058#if ENABLE_OVERLAY 2070#if ENABLE_OVERLAY
2059 scr_swap_overlay (); 2071 scr_swap_overlay ();
2060#endif 2072#endif
2061 2073
2062 char showcursor = screen.flags & Screen_VisibleCursor; 2074 bool showcursor = screen.flags & Screen_VisibleCursor;
2063 2075
2064 /* 2076 /*
2065 * C: set the cursor character (s) 2077 * C: set the cursor character (s)
2066 */ 2078 */
2067 { 2079 {
2068 unsigned char setoldcursor;
2069
2070#ifdef CURSOR_BLINK 2080#ifdef CURSOR_BLINK
2071 if (hidden_cursor) 2081 if (hidden_cursor)
2072 showcursor = 0; 2082 showcursor = 0;
2073#endif 2083#endif
2074 2084
… …
2077 int col = screen.cur.col; 2087 int col = screen.cur.col;
2078 2088
2079 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2089 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2080 col--; 2090 col--;
2081 2091
2092 cursorwidth = 1;
2093 while (col + cursorwidth < ncol
2094 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2095 cursorwidth++;
2096
2082 crp = &ROW(screen.cur.row).r[col]; 2097 cur_rend = ROW(screen.cur.row).r[col];
2098 cur_col = col;
2083 2099
2084#ifndef NO_CURSORCOLOR 2100#ifndef NO_CURSORCOLOR
2085 cc1 = *crp & (RS_fgMask | RS_bgMask);
2086 if (ISSET_PIXCOLOR (Color_cursor)) 2101 if (ISSET_PIXCOLOR (Color_cursor))
2087 ccol1 = Color_cursor; 2102 ccol1 = Color_cursor;
2088 else 2103 else
2089#endif 2104#endif
2090#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2105#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2104 ccol2 = Color_bg; 2119 ccol2 = Color_bg;
2105#endif 2120#endif
2106 2121
2107 if (focus) 2122 if (focus)
2108 { 2123 {
2124 rend_t rend = cur_rend;
2125
2109 if (option (Opt_cursorUnderline)) 2126 if (option (Opt_cursorUnderline))
2110 *crp ^= RS_Uline; 2127 rend ^= RS_Uline;
2111 else 2128 else
2112 { 2129 {
2113 *crp ^= RS_RVid; 2130 rend ^= RS_RVid;
2114 *crp = SET_FGCOLOR (*crp, ccol1); 2131 rend = SET_FGCOLOR (rend, ccol1);
2115 *crp = SET_BGCOLOR (*crp, ccol2); 2132 rend = SET_BGCOLOR (rend, ccol2);
2116 } 2133 }
2134
2135 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2117 } 2136 }
2118 } 2137 }
2119 2138
2120 /* make sure no outline cursor is left around */ 2139 /* make sure no outline cursor is left around */
2121 setoldcursor = 0;
2122 if (ocrow != -1) 2140 if (ocrow != -1)
2123 { 2141 {
2124 if (screen.cur.row - view_start != ocrow 2142 if (screen.cur.row - view_start != ocrow
2125 || screen.cur.col != oldcursor.col) 2143 || screen.cur.col != oldcursor.col)
2126 { 2144 {
2127 if (ocrow < nrow 2145 if (ocrow < nrow
2128 && oldcursor.col < ncol) 2146 && oldcursor.col < ncol)
2129 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2147 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2130
2131 if (focus || !showcursor)
2132 oldcursor.row = -1;
2133 else
2134 setoldcursor = 1;
2135 } 2148 }
2136 } 2149 }
2137 else if (!focus)
2138 setoldcursor = 1;
2139 2150
2140 if (setoldcursor) 2151 // save the current cursor coordinates if the cursor is visible
2152 // and the window is unfocused, so as to clear the outline cursor
2153 // in the next refresh if the cursor moves
2154 if (showcursor && !focus && screen.cur.row - view_start < nrow)
2141 { 2155 {
2142 if (screen.cur.row - view_start >= nrow)
2143 oldcursor.row = -1;
2144 else
2145 {
2146 oldcursor.row = screen.cur.row - view_start; 2156 oldcursor.row = screen.cur.row - view_start;
2147 oldcursor.col = screen.cur.col; 2157 oldcursor.col = screen.cur.col;
2148 }
2149 } 2158 }
2159 else
2160 oldcursor.row = -1;
2150 } 2161 }
2151 2162
2152#ifndef NO_SLOW_LINK_SUPPORT 2163#ifndef NO_SLOW_LINK_SUPPORT
2153 /* 2164 /*
2154 * D: CopyArea pass - very useful for slower links 2165 * D: CopyArea pass - very useful for slower links
… …
2160 { 2171 {
2161 int16_t nits; 2172 int16_t nits;
2162 int i = num_scr; 2173 int i = num_scr;
2163 int j; 2174 int j;
2164 int len, wlen; 2175 int len, wlen;
2165 dLocal (int, num_scr);
2166 2176
2167 j = nrow; 2177 j = nrow;
2168 wlen = len = -1; 2178 wlen = len = -1;
2169 row = i > 0 ? 0 : j - 1; 2179 row = i > 0 ? 0 : j - 1;
2170 2180
… …
2421 else 2431 else
2422 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2432 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2423 2433
2424 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2434 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2425 { 2435 {
2436 if (showcursor && focus && row == screen.cur.row
2437 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2438 XSetForeground (dpy, gc, pix_colors[ccol1]);
2439 else
2426#if ENABLE_FRILLS 2440#if ENABLE_FRILLS
2427 if (ISSET_PIXCOLOR (Color_underline)) 2441 if (ISSET_PIXCOLOR (Color_underline))
2428 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2442 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2429 else 2443 else
2430#endif 2444#endif
… …
2441 * G: cleanup cursor and display outline cursor if necessary 2455 * G: cleanup cursor and display outline cursor if necessary
2442 */ 2456 */
2443 if (showcursor) 2457 if (showcursor)
2444 { 2458 {
2445 if (focus) 2459 if (focus)
2446 { 2460 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2447 if (option (Opt_cursorUnderline))
2448 *crp ^= RS_Uline;
2449 else
2450 {
2451 *crp ^= RS_RVid;
2452#ifndef NO_CURSORCOLOR
2453 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2454#endif
2455 }
2456 }
2457 else if (oldcursor.row >= 0) 2461 else if (oldcursor.row >= 0)
2458 { 2462 {
2459 int cursorwidth = 1;
2460 int col = oldcursor.col;
2461
2462 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2463 col--;
2464
2465 while (col + cursorwidth < ncol
2466 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2467 cursorwidth++;
2468
2469#ifndef NO_CURSORCOLOR
2470 if (ISSET_PIXCOLOR (Color_cursor))
2471 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2472 else
2473#endif
2474 XSetForeground (dpy, gc, pix_colors[ccol1]); 2463 XSetForeground (dpy, gc, pix_colors[ccol1]);
2475 2464
2476 XDrawRectangle (dpy, vt, gc, 2465 XDrawRectangle (dpy, vt, gc,
2477 Col2Pixel (col), 2466 Col2Pixel (cur_col),
2478 Row2Pixel (oldcursor.row), 2467 Row2Pixel (oldcursor.row),
2479 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2468 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2480 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2469 (unsigned int) (Height2Pixel (1) - 1));
2481 } 2470 }
2482 } 2471 }
2483 2472
2484 /* 2473 /*
2485 * H: cleanup selection 2474 * H: cleanup selection
… …
2494 screen.flags = old_screen_flags; 2483 screen.flags = old_screen_flags;
2495 num_scr = 0; 2484 num_scr = 0;
2496 num_scr_allow = 1; 2485 num_scr_allow = 1;
2497} 2486}
2498 2487
2499void 2488void ecb_cold
2500rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2489rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2501{ 2490{
2502 if (!l.t) 2491 if (!l.valid ())
2503 return; 2492 return;
2504 2493
2505 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2494 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2506 2495
2507 for (int i = ncol; i--; ) 2496 for (int i = ncol; i--; )
2508 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2497 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2509} 2498}
2510 2499
2511void 2500void ecb_cold
2512rxvt_term::scr_remap_chars () NOTHROW 2501rxvt_term::scr_remap_chars () NOTHROW
2513{ 2502{
2514 for (int i = total_rows; i--; ) 2503 for (int i = total_rows; i--; )
2515 scr_remap_chars (row_buf [i]); 2504 scr_remap_chars (row_buf [i]);
2516 2505
… …
2519 scr_remap_chars (drawn_buf [i]); 2508 scr_remap_chars (drawn_buf [i]);
2520 scr_remap_chars (swap_buf [i]); 2509 scr_remap_chars (swap_buf [i]);
2521 } 2510 }
2522} 2511}
2523 2512
2524void 2513void ecb_cold
2525rxvt_term::scr_recolour (bool refresh) NOTHROW 2514rxvt_term::scr_recolour (bool refresh) NOTHROW
2526{ 2515{
2527 bool transparent = false; 2516 bool transparent = false;
2528 2517
2529#ifdef HAVE_BG_PIXMAP 2518#ifdef HAVE_IMG
2530 if (bg_pixmap != None) 2519 if (bg_img != 0)
2531 { 2520 {
2532# ifdef ENABLE_TRANSPARENCY 2521# if ENABLE_TRANSPARENCY
2533 if (bg_flags & BG_IS_TRANSPARENT) 2522 if (bg_flags & BG_IS_TRANSPARENT)
2534 { 2523 {
2535 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2524 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2536 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2525 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2537 2526
2538 transparent = true; 2527 transparent = true;
2539 } 2528 }
2540 else 2529 else
2541# endif 2530# endif
2542 { 2531 {
2543 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2532 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2544 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2533 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2545 } 2534 }
2546 } 2535 }
2547 else 2536 else
2548#endif 2537#endif
2549 { 2538 {
… …
2556 if (scrollBar.win) 2545 if (scrollBar.win)
2557 { 2546 {
2558 if (transparent) 2547 if (transparent)
2559 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2548 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2560 else 2549 else
2561 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2550 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2562 scrollBar.state = SB_STATE_IDLE; 2551 scrollBar.state = SB_STATE_IDLE;
2563 scrollBar.show (0); 2552 scrollBar.show (0);
2564 } 2553 }
2565 2554
2566 if (refresh) 2555 if (refresh)
… …
2632 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2621 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2633 srp[col] ^= rstyle; 2622 srp[col] ^= rstyle;
2634} 2623}
2635 2624
2636/* ------------------------------------------------------------------------- */ 2625/* ------------------------------------------------------------------------- */
2637void 2626void ecb_hot
2638rxvt_term::scr_reverse_selection () NOTHROW 2627rxvt_term::scr_reverse_selection () NOTHROW
2639{ 2628{
2640 if (selection.op 2629 if (selection.op
2641 && current_screen == selection.screen 2630 && current_screen == selection.screen
2642 && selection.end.row >= view_start) 2631 && selection.end.row >= view_start)
… …
2661 */ 2650 */
2662#if 0 2651#if 0
2663void 2652void
2664rxvt_term::scr_dump (int fd) NOTHROW 2653rxvt_term::scr_dump (int fd) NOTHROW
2665{ 2654{
2666 int row, wrote; 2655 // if this method is needed, it can be implemented by factoring the
2667 unsigned int width, towrite; 2656 // relevant code in scr_printscreen
2668 const char r1[] = "\n";
2669
2670 for (row = saveLines + top_row;
2671 row < saveLines + nrow - 1; row++)
2672 {
2673 width = row_buf[row].l >= 0 ? row_buf[row].l
2674 : ncol;
2675 for (towrite = width; towrite; towrite -= wrote)
2676 {
2677 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2678 towrite);
2679 if (wrote < 0)
2680 return; /* XXX: death, no report */
2681 }
2682 if (row_buf[row].l >= 0)
2683 if (write (fd, r1, 1) <= 0)
2684 return; /* XXX: death, no report */
2685 }
2686} 2657}
2687#endif 2658#endif
2688 2659
2689/* ------------------------------------------------------------------------- * 2660/* ------------------------------------------------------------------------- *
2690 * CHARACTER SELECTION * 2661 * CHARACTER SELECTION *
… …
2692void 2663void
2693rxvt_term::selection_check (int check_more) NOTHROW 2664rxvt_term::selection_check (int check_more) NOTHROW
2694{ 2665{
2695 if (!selection.op) 2666 if (!selection.op)
2696 return; 2667 return;
2697
2698 row_col_t pos;
2699 pos.row = pos.col = 0;
2700 2668
2701 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2669 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2702 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2670 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2703 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2671 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2704 || (check_more == 1 2672 || (check_more == 1
2705 && current_screen == selection.screen 2673 && current_screen == selection.screen
2706 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2674 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2707 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2675 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2708 || (check_more == 2
2709 && ROWCOL_IS_BEFORE (selection.beg, pos)
2710 && ROWCOL_IS_AFTER (selection.end, pos))
2711 || (check_more == 3
2712 && ROWCOL_IS_AFTER (selection.end, pos)))
2713 CLEAR_ALL_SELECTION (); 2676 CLEAR_ALL_SELECTION ();
2677}
2678
2679void
2680rxvt_term::selection_changed () NOTHROW
2681{
2682 line_t &r1 = ROW (selection.beg.row);
2683 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2684 --selection.beg.col;
2685
2686 line_t &r2 = ROW (selection.end.row);
2687 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2688 ++selection.end.col;
2689
2690 want_refresh = 1;
2714} 2691}
2715 2692
2716/* ------------------------------------------------------------------------- */ 2693/* ------------------------------------------------------------------------- */
2717/* 2694/*
2718 * Paste a selection direct to the command fd 2695 * Paste a selection direct to the command fd
… …
2724 for (unsigned int i = 0; i < len; i++) 2701 for (unsigned int i = 0; i < len; i++)
2725 if (data[i] == C0_LF) 2702 if (data[i] == C0_LF)
2726 data[i] = C0_CR; 2703 data[i] = C0_CR;
2727 2704
2728 if (priv_modes & PrivMode_BracketPaste) 2705 if (priv_modes & PrivMode_BracketPaste)
2729 tt_printf ("\e[200~"); 2706 tt_printf ("\x1b[200~");
2730 2707
2731 tt_write (data, len); 2708 tt_write (data, len);
2732 2709
2733 if (priv_modes & PrivMode_BracketPaste) 2710 if (priv_modes & PrivMode_BracketPaste)
2734 tt_printf ("\e[201~"); 2711 tt_printf ("\x1b[201~");
2735} 2712}
2736 2713
2737void 2714void
2738rxvt_term::paste (char *data, unsigned int len) NOTHROW 2715rxvt_term::paste (char *data, unsigned int len) NOTHROW
2739{ 2716{
… …
2959/* ------------------------------------------------------------------------- */ 2936/* ------------------------------------------------------------------------- */
2960/* 2937/*
2961 * Mark or select text based upon number of clicks: 1, 2, or 3 2938 * Mark or select text based upon number of clicks: 1, 2, or 3
2962 * EXT: button 1 press 2939 * EXT: button 1 press
2963 */ 2940 */
2964void 2941void ecb_cold
2965rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2942rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2966{ 2943{
2967 clicks = ((clicks - 1) % 3) + 1; 2944 clicks = ((clicks - 1) % 3) + 1;
2968 selection.clicks = clicks; /* save clicks so extend will work */ 2945 selection.clicks = clicks; /* save clicks so extend will work */
2969 2946
… …
2988 2965
2989/* ------------------------------------------------------------------------- */ 2966/* ------------------------------------------------------------------------- */
2990/* 2967/*
2991 * Mark a selection at the specified col/row 2968 * Mark a selection at the specified col/row
2992 */ 2969 */
2993void 2970void ecb_cold
2994rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2971rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2995{ 2972{
2996 want_refresh = 1; 2973 want_refresh = 1;
2997 2974
2998 selection.mark.row = row + view_start; 2975 selection.mark.row = row + view_start;
… …
3021 * Word select: select text for 2 clicks 2998 * Word select: select text for 2 clicks
3022 * We now only find out the boundary in one direction 2999 * We now only find out the boundary in one direction
3023 */ 3000 */
3024 3001
3025/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3002/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3026#define DELIMIT_TEXT(x) \ 3003#define DELIMIT_TEXT(x) \
3027 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3004 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3028#define DELIMIT_REND(x) 1 3005#define DELIMIT_REND(x) 1
3029 3006
3030void 3007void ecb_cold
3031rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3008rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3032{ 3009{
3033 int col, row, dirnadd, tcol, trow, w1, w2; 3010 int col, row, dirnadd, tcol, trow, w1, w2;
3034 row_col_t bound; 3011 row_col_t bound;
3035 text_t *stp; 3012 text_t *stp;
… …
3109 * EXT: button 3 press; button 1 or 3 drag 3086 * EXT: button 3 press; button 1 or 3 drag
3110 * flag == 0 ==> button 1 3087 * flag == 0 ==> button 1
3111 * flag == 1 ==> button 3 press 3088 * flag == 1 ==> button 3 press
3112 * flag == 2 ==> button 3 motion 3089 * flag == 2 ==> button 3 motion
3113 */ 3090 */
3114void 3091void ecb_cold
3115rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3092rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3116{ 3093{
3117 int col = clamp (Pixel2Col (x), 0, ncol); 3094 int col = clamp (Pixel2Col (x), 0, ncol);
3118 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3095 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3119 3096
… …
3145 3122
3146/* ------------------------------------------------------------------------- */ 3123/* ------------------------------------------------------------------------- */
3147/* 3124/*
3148 * Extend the selection to the specified col/row 3125 * Extend the selection to the specified col/row
3149 */ 3126 */
3150void 3127void ecb_cold
3151rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3128rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3152{ 3129{
3153 row_col_t pos; 3130 row_col_t pos;
3154 enum { 3131 enum {
3155 LEFT, RIGHT 3132 LEFT, RIGHT
3156 } closeto = RIGHT; 3133 } closeto = RIGHT;
3157
3158 want_refresh = 1;
3159 3134
3160 switch (selection.op) 3135 switch (selection.op)
3161 { 3136 {
3162 case SELECTION_INIT: 3137 case SELECTION_INIT:
3163 CLEAR_SELECTION (); 3138 CLEAR_SELECTION ();
… …
3343 3318
3344#if !ENABLE_MINIMAL 3319#if !ENABLE_MINIMAL
3345 if (selection.rect && selection.beg.col > selection.end.col) 3320 if (selection.rect && selection.beg.col > selection.end.col)
3346 ::swap (selection.beg.col, selection.end.col); 3321 ::swap (selection.beg.col, selection.end.col);
3347#endif 3322#endif
3323
3324 selection_changed ();
3348} 3325}
3349 3326
3350#if !ENABLE_MINIMAL 3327#if !ENABLE_MINIMAL
3351void 3328void ecb_cold
3352rxvt_term::selection_remove_trailing_spaces () NOTHROW 3329rxvt_term::selection_remove_trailing_spaces () NOTHROW
3353{ 3330{
3354 int32_t end_col, end_row; 3331 int32_t end_col, end_row;
3355 text_t *stp; 3332 text_t *stp;
3356 3333
… …
3394/* ------------------------------------------------------------------------- */ 3371/* ------------------------------------------------------------------------- */
3395/* 3372/*
3396 * Double click on button 3 when already selected 3373 * Double click on button 3 when already selected
3397 * EXT: button 3 double click 3374 * EXT: button 3 double click
3398 */ 3375 */
3399void 3376void ecb_cold
3400rxvt_term::selection_rotate (int x, int y) NOTHROW 3377rxvt_term::selection_rotate (int x, int y) NOTHROW
3401{ 3378{
3402 selection.clicks = selection.clicks % 3 + 1; 3379 selection.clicks = selection.clicks % 3 + 1;
3403 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3380 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3404} 3381}
… …
3406/* ------------------------------------------------------------------------- */ 3383/* ------------------------------------------------------------------------- */
3407/* 3384/*
3408 * Respond to a request for our current selection 3385 * Respond to a request for our current selection
3409 * EXT: SelectionRequest 3386 * EXT: SelectionRequest
3410 */ 3387 */
3411void 3388void ecb_cold
3412rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3389rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3413{ 3390{
3414 Atom property = rq.property == None ? rq.target : rq.property; 3391 Atom property = rq.property == None ? rq.target : rq.property;
3415 XSelectionEvent ev; 3392 XSelectionEvent ev;
3416 3393
… …
3549 3526
3550 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3527 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3551} 3528}
3552 3529
3553/* ------------------------------------------------------------------------- */ 3530/* ------------------------------------------------------------------------- */
3554#ifdef USE_XIM 3531#if USE_XIM
3555void 3532void ecb_cold
3556rxvt_term::im_set_position (XPoint &pos) NOTHROW 3533rxvt_term::im_set_position (XPoint &pos) NOTHROW
3557{ 3534{
3558 XWindowAttributes xwa; 3535 XWindowAttributes xwa;
3559 3536
3560 XGetWindowAttributes (dpy, vt, &xwa); 3537 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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