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.391 by root, Sun Jul 10 00:39:53 2011 UTC vs.
Revision 1.436 by sf-exg, Sun Mar 24 10:15:27 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
693 if (selection.beg.row < top_row 713 selection_check (0);
694 || selection.end.row < top_row
695 || selection.mark.row < top_row)
696 {
697 CLEAR_ALL_SELECTION ();
698 selection.op = SELECTION_CLEAR;
699 }
700 } 714 }
701 715
702 // finally move the view window, if desired 716 // finally move the view window, if desired
703 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
704 && view_start != 0 718 && view_start != 0
… …
761 for (int row = 0; row < rows; row++) 775 for (int row = 0; row < rows; row++)
762 ROW(row1 + row) = temp_buf [row]; 776 ROW(row1 + row) = temp_buf [row];
763 777
764 // sever bottommost line 778 // sever bottommost line
765 { 779 {
766 line_t &l = ROW(row2 - 1); 780 line_t &l = ROW(row2);
767 l.is_longer (0); 781 l.is_longer (0);
768 l.touch (); 782 l.touch ();
769 } 783 }
770
771 } 784 }
772 785
773 return count; 786 return count;
774} 787}
775 788
776/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
777/* 790/*
778 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
779 */ 792 */
780void 793void ecb_hot
781rxvt_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
782{ 795{
783 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
784 return; 797 return;
785 798
786 unsigned char checksel; 799 bool checksel;
787 unicode_t c; 800 unicode_t c;
788 int ncol = this->ncol; 801 int ncol = this->ncol;
789 const wchar_t *strend = str + len; 802 const wchar_t *strend = str + len;
790 803
791 want_refresh = 1; 804 want_refresh = 1;
… …
1135 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1136 * 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
1137 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1138 */ 1151 */
1139#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1140void 1153void ecb_cold
1141rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1142{ 1155{
1143 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145 else 1158 else
… …
1152 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1153 * 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
1154 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1155 */ 1168 */
1156#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1157void 1170void ecb_cold
1158rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1159{ 1172{
1160 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1161 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1162 else 1175 else
… …
1313 scr_blank_line (line, col, num, rstyle); 1326 scr_blank_line (line, col, num, rstyle);
1314} 1327}
1315 1328
1316/* ------------------------------------------------------------------------- */ 1329/* ------------------------------------------------------------------------- */
1317/* 1330/*
1318 * Erase part of whole of the screen 1331 * Erase part or whole of the screen
1319 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1332 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1320 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1333 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1321 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1334 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1322 */ 1335 */
1323void 1336void
… …
1332 ZERO_SCROLLBACK (); 1345 ZERO_SCROLLBACK ();
1333 1346
1334 switch (mode) 1347 switch (mode)
1335 { 1348 {
1336 case 0: /* erase to end of screen */ 1349 case 0: /* erase to end of screen */
1337 selection_check (1);
1338 scr_erase_line (0); 1350 scr_erase_line (0);
1339 row = screen.cur.row + 1; /* possible OOB */ 1351 row = screen.cur.row + 1; /* possible OOB */
1340 num = nrow - row; 1352 num = nrow - row;
1341 break; 1353 break;
1342 case 1: /* erase to beginning of screen */ 1354 case 1: /* erase to beginning of screen */
1343 selection_check (3);
1344 scr_erase_line (1); 1355 scr_erase_line (1);
1345 row = 0; 1356 row = 0;
1346 num = screen.cur.row; 1357 num = screen.cur.row;
1347 break; 1358 break;
1348 case 2: /* erase whole screen */ 1359 case 2: /* erase whole screen */
1349 selection_check (3);
1350 row = 0; 1360 row = 0;
1351 num = nrow; 1361 num = nrow;
1352 break; 1362 break;
1353 default: 1363 default:
1354 return; 1364 return;
… …
1371 { 1381 {
1372 ren = DEFAULT_RSTYLE; 1382 ren = DEFAULT_RSTYLE;
1373 1383
1374 if (mapped) 1384 if (mapped)
1375 XClearArea (dpy, vt, 0, 1385 XClearArea (dpy, vt, 0,
1376 Row2Pixel (row - view_start), (unsigned int)width, 1386 Row2Pixel (row - view_start), (unsigned int)vt_width,
1377 (unsigned int)Height2Pixel (num), False); 1387 (unsigned int)Height2Pixel (num), False);
1378 } 1388 }
1379 else 1389 else
1380 { 1390 {
1381 ren = rstyle & (RS_fgMask | RS_bgMask); 1391 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1384 { 1394 {
1385 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1395 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1386 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1396 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1387 XFillRectangle (dpy, vt, gc, 1397 XFillRectangle (dpy, vt, gc,
1388 0, Row2Pixel (row - view_start), 1398 0, Row2Pixel (row - view_start),
1389 (unsigned int)width, 1399 (unsigned int)vt_width,
1390 (unsigned int)Height2Pixel (num)); 1400 (unsigned int)Height2Pixel (num));
1391 gcvalue.foreground = pix_colors[Color_fg]; 1401 gcvalue.foreground = pix_colors[Color_fg];
1392 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1402 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1393 } 1403 }
1394 } 1404 }
… …
1416/* ------------------------------------------------------------------------- */ 1426/* ------------------------------------------------------------------------- */
1417/* 1427/*
1418 * Fill the screen with `E's 1428 * Fill the screen with `E's
1419 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1429 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1420 */ 1430 */
1421void 1431void ecb_cold
1422rxvt_term::scr_E () NOTHROW 1432rxvt_term::scr_E () NOTHROW
1423{ 1433{
1424 rend_t fs; 1434 rend_t fs;
1425 1435
1426 want_refresh = 1; 1436 want_refresh = 1;
1427 ZERO_SCROLLBACK (); 1437 ZERO_SCROLLBACK ();
1428 1438
1429 num_scr_allow = 0; 1439 num_scr_allow = 0;
1430 selection_check (3); 1440
1441 row_col_t pos;
1442 pos.row = pos.col = 0;
1443 if (ROWCOL_IS_AFTER (selection.end, pos))
1444 CLEAR_SELECTION ();
1431 1445
1432 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1446 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1433 for (int row = nrow; row--; ) 1447 for (int row = nrow; row--; )
1434 { 1448 {
1435 line_t &line = ROW(row); 1449 line_t &line = ROW(row);
… …
1586/* ------------------------------------------------------------------------- */ 1600/* ------------------------------------------------------------------------- */
1587/* 1601/*
1588 * Set the scrolling region 1602 * Set the scrolling region
1589 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1603 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1590 */ 1604 */
1591void 1605void ecb_cold
1592rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1606rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1593{ 1607{
1594 max_it (top, 0); 1608 max_it (top, 0);
1595 min_it (bot, nrow - 1); 1609 min_it (bot, nrow - 1);
1596 1610
… …
1606/* 1620/*
1607 * Make the cursor visible/invisible 1621 * Make the cursor visible/invisible
1608 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1622 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1609 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1623 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1610 */ 1624 */
1611void 1625void ecb_cold
1612rxvt_term::scr_cursor_visible (int mode) NOTHROW 1626rxvt_term::scr_cursor_visible (int mode) NOTHROW
1613{ 1627{
1614 want_refresh = 1; 1628 want_refresh = 1;
1615 1629
1616 if (mode) 1630 if (mode)
… …
1623/* 1637/*
1624 * Set/unset automatic wrapping 1638 * Set/unset automatic wrapping
1625 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1639 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1626 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1640 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1627 */ 1641 */
1628void 1642void ecb_cold
1629rxvt_term::scr_autowrap (int mode) NOTHROW 1643rxvt_term::scr_autowrap (int mode) NOTHROW
1630{ 1644{
1631 if (mode) 1645 if (mode)
1632 screen.flags |= Screen_Autowrap; 1646 screen.flags |= Screen_Autowrap;
1633 else 1647 else
… …
1642 * Relative mode: line numbers are relative to top margin of scrolling region 1656 * Relative mode: line numbers are relative to top margin of scrolling region
1643 * and the cursor cannot be moved outside. 1657 * and the cursor cannot be moved outside.
1644 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1658 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1645 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1659 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1646 */ 1660 */
1647void 1661void ecb_cold
1648rxvt_term::scr_relative_origin (int mode) NOTHROW 1662rxvt_term::scr_relative_origin (int mode) NOTHROW
1649{ 1663{
1650 if (mode) 1664 if (mode)
1651 screen.flags |= Screen_Relative; 1665 screen.flags |= Screen_Relative;
1652 else 1666 else
… …
1659/* 1673/*
1660 * Set insert/replace mode 1674 * Set insert/replace mode
1661 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1675 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1662 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1676 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1663 */ 1677 */
1664void 1678void ecb_cold
1665rxvt_term::scr_insert_mode (int mode) NOTHROW 1679rxvt_term::scr_insert_mode (int mode) NOTHROW
1666{ 1680{
1667 if (mode) 1681 if (mode)
1668 screen.flags |= Screen_Insert; 1682 screen.flags |= Screen_Insert;
1669 else 1683 else
… …
1675 * Set/Unset tabs 1689 * Set/Unset tabs
1676 * XTERM_SEQ: Set tab at current column : ESC H 1690 * XTERM_SEQ: Set tab at current column : ESC H
1677 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1691 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1678 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1692 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1679 */ 1693 */
1680void 1694void ecb_cold
1681rxvt_term::scr_set_tab (int mode) NOTHROW 1695rxvt_term::scr_set_tab (int mode) NOTHROW
1682{ 1696{
1683 if (mode < 0) 1697 if (mode < 0)
1684 memset (tabs, 0, ncol); 1698 memset (tabs, 0, ncol);
1685 else if (screen.cur.col < ncol) 1699 else if (screen.cur.col < ncol)
… …
1704 if (rvideo_state != on) 1718 if (rvideo_state != on)
1705 { 1719 {
1706 rvideo_state = on; 1720 rvideo_state = on;
1707 1721
1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1709#ifdef HAVE_BG_PIXMAP 1723#ifdef HAVE_IMG
1710 if (bg_pixmap == None) 1724 if (bg_img == 0)
1711#endif 1725#endif
1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1713 1727
1714 XGCValues gcvalue; 1728 XGCValues gcvalue;
1715 gcvalue.foreground = pix_colors[Color_fg]; 1729 gcvalue.foreground = pix_colors[Color_fg];
… …
1724/* ------------------------------------------------------------------------- */ 1738/* ------------------------------------------------------------------------- */
1725/* 1739/*
1726 * Report current cursor position 1740 * Report current cursor position
1727 * XTERM_SEQ: Report position: ESC [ 6 n 1741 * XTERM_SEQ: Report position: ESC [ 6 n
1728 */ 1742 */
1729void 1743void ecb_cold
1730rxvt_term::scr_report_position () NOTHROW 1744rxvt_term::scr_report_position () NOTHROW
1731{ 1745{
1732 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1746 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1733} 1747}
1734 1748
… …
1737 * ------------------------------------------------------------------------- */ 1751 * ------------------------------------------------------------------------- */
1738 1752
1739/* 1753/*
1740 * Set font style 1754 * Set font style
1741 */ 1755 */
1742void 1756void ecb_cold
1743rxvt_term::set_font_style () NOTHROW 1757rxvt_term::set_font_style () NOTHROW
1744{ 1758{
1745#if 0 1759#if 0
1746 switch (charsets [screen.charset]) 1760 switch (charsets [screen.charset])
1747 { 1761 {
… …
1769 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1783 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1770 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1784 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1771 * XTERM_SEQ: Invoke G2 character set: ESC N 1785 * XTERM_SEQ: Invoke G2 character set: ESC N
1772 * XTERM_SEQ: Invoke G3 character set: ESC O 1786 * XTERM_SEQ: Invoke G3 character set: ESC O
1773 */ 1787 */
1774void 1788void ecb_cold
1775rxvt_term::scr_charset_choose (int set) NOTHROW 1789rxvt_term::scr_charset_choose (int set) NOTHROW
1776{ 1790{
1777 screen.charset = set; 1791 screen.charset = set;
1778 set_font_style (); 1792 set_font_style ();
1779} 1793}
… …
1800 * ------------------------------------------------------------------------- */ 1814 * ------------------------------------------------------------------------- */
1801 1815
1802/* 1816/*
1803 * refresh matching text. 1817 * refresh matching text.
1804 */ 1818 */
1805bool 1819bool ecb_cold
1806rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1820rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1807{ 1821{
1808 bool found = false; 1822 bool found = false;
1809 1823
1810 for (int i = 0; i < nrow; i++) 1824 for (int i = 0; i < nrow; i++)
… …
1829 PART_BEG = 0, 1843 PART_BEG = 0,
1830 PART_END, 1844 PART_END,
1831 RC_COUNT 1845 RC_COUNT
1832}; 1846};
1833 1847
1834void 1848void ecb_hot
1835rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1849rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1836{ 1850{
1837 int i; 1851 int i;
1838 row_col_t rc[RC_COUNT]; 1852 row_col_t rc[RC_COUNT];
1839 1853
… …
1876 * Refresh the entire screen 1890 * Refresh the entire screen
1877 */ 1891 */
1878void 1892void
1879rxvt_term::scr_touch (bool refresh) NOTHROW 1893rxvt_term::scr_touch (bool refresh) NOTHROW
1880{ 1894{
1881 scr_expose (0, 0, width, height, refresh); 1895 scr_expose (0, 0, vt_width, vt_height, refresh);
1882} 1896}
1883 1897
1884/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
1885/* 1899/*
1886 * Move the display so that the line represented by scrollbar value Y is at 1900 * Move the display so that the line represented by scrollbar value Y is at
… …
1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1979 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1966#endif 1980#endif
1967} 1981}
1968 1982
1969/* ------------------------------------------------------------------------- */ 1983/* ------------------------------------------------------------------------- */
1970void 1984void ecb_cold
1971rxvt_term::scr_printscreen (int fullhist) NOTHROW 1985rxvt_term::scr_printscreen (int fullhist) NOTHROW
1972{ 1986{
1973#ifdef PRINTPIPE 1987#ifdef PRINTPIPE
1974 int nrows, row_start; 1988 int nrows, row_start;
1975 FILE *fd = popen_printer (); 1989 FILE *fd = popen_printer ();
… …
2024/* 2038/*
2025 * Refresh the screen 2039 * Refresh the screen
2026 * drawn_text/drawn_rend contain the screen information before the update. 2040 * drawn_text/drawn_rend contain the screen information before the update.
2027 * screen.text/screen.rend contain what the screen will change to. 2041 * screen.text/screen.rend contain what the screen will change to.
2028 */ 2042 */
2029void 2043void ecb_hot
2030rxvt_term::scr_refresh () NOTHROW 2044rxvt_term::scr_refresh () NOTHROW
2031{ 2045{
2032 int16_t col, row, /* column/row we're processing */ 2046 int16_t col, row, /* column/row we're processing */
2033 ocrow; /* old cursor row */ 2047 ocrow; /* old cursor row */
2034 int i; /* tmp */ 2048 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 */ 2049 rend_t ccol1, /* Cursor colour */
2040 ccol2; /* Cursor colour2 */ 2050 ccol2; /* Cursor colour2 */
2051 rend_t cur_rend;
2052 int cur_col;
2041 2053
2042 want_refresh = 0; /* screen is current */ 2054 want_refresh = 0; /* screen is current */
2043 2055
2044 if (refresh_type == NO_REFRESH || !mapped) 2056 if (refresh_type == NO_REFRESH || !mapped)
2045 return; 2057 return;
… …
2048 * A: set up vars 2060 * A: set up vars
2049 */ 2061 */
2050 refresh_count = 0; 2062 refresh_count = 0;
2051 2063
2052 unsigned int old_screen_flags = screen.flags; 2064 unsigned int old_screen_flags = screen.flags;
2053 char have_bg = 0; 2065 bool have_bg = 0;
2054#ifdef HAVE_BG_PIXMAP 2066#ifdef HAVE_IMG
2055 have_bg = bg_pixmap != None; 2067 have_bg = bg_img != 0;
2056#endif 2068#endif
2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2069 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2058 2070
2059 /* 2071 /*
2060 * B: reverse any characters which are selected 2072 * B: reverse any characters which are selected
… …
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2076 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2065#if ENABLE_OVERLAY 2077#if ENABLE_OVERLAY
2066 scr_swap_overlay (); 2078 scr_swap_overlay ();
2067#endif 2079#endif
2068 2080
2069 char showcursor = screen.flags & Screen_VisibleCursor; 2081 bool showcursor = screen.flags & Screen_VisibleCursor;
2070 2082
2071 /* 2083 /*
2072 * C: set the cursor character (s) 2084 * C: set the cursor character (s)
2073 */ 2085 */
2074 { 2086 {
2075 unsigned char setoldcursor; 2087 bool setoldcursor;
2076 2088
2077#ifdef CURSOR_BLINK 2089#ifdef CURSOR_BLINK
2078 if (hidden_cursor) 2090 if (hidden_cursor)
2079 showcursor = 0; 2091 showcursor = 0;
2080#endif 2092#endif
… …
2084 int col = screen.cur.col; 2096 int col = screen.cur.col;
2085 2097
2086 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2098 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2087 col--; 2099 col--;
2088 2100
2089 crp = &ROW(screen.cur.row).r[col]; 2101 cur_rend = ROW(screen.cur.row).r[col];
2102 cur_col = col;
2090 2103
2091#ifndef NO_CURSORCOLOR 2104#ifndef NO_CURSORCOLOR
2092 cc1 = *crp & (RS_fgMask | RS_bgMask);
2093 if (ISSET_PIXCOLOR (Color_cursor)) 2105 if (ISSET_PIXCOLOR (Color_cursor))
2094 ccol1 = Color_cursor; 2106 ccol1 = Color_cursor;
2095 else 2107 else
2096#endif 2108#endif
2097#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2109#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2111 ccol2 = Color_bg; 2123 ccol2 = Color_bg;
2112#endif 2124#endif
2113 2125
2114 if (focus) 2126 if (focus)
2115 { 2127 {
2128 rend_t rend = cur_rend;
2129
2116 if (option (Opt_cursorUnderline)) 2130 if (option (Opt_cursorUnderline))
2117 *crp ^= RS_Uline; 2131 rend ^= RS_Uline;
2118 else 2132 else
2119 { 2133 {
2120 *crp ^= RS_RVid; 2134 rend ^= RS_RVid;
2121 *crp = SET_FGCOLOR (*crp, ccol1); 2135 rend = SET_FGCOLOR (rend, ccol1);
2122 *crp = SET_BGCOLOR (*crp, ccol2); 2136 rend = SET_BGCOLOR (rend, ccol2);
2123 } 2137 }
2138
2139 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2124 } 2140 }
2125 } 2141 }
2126 2142
2127 /* make sure no outline cursor is left around */ 2143 /* make sure no outline cursor is left around */
2128 setoldcursor = 0; 2144 setoldcursor = 0;
… …
2167 { 2183 {
2168 int16_t nits; 2184 int16_t nits;
2169 int i = num_scr; 2185 int i = num_scr;
2170 int j; 2186 int j;
2171 int len, wlen; 2187 int len, wlen;
2172 dLocal (int, num_scr);
2173 2188
2174 j = nrow; 2189 j = nrow;
2175 wlen = len = -1; 2190 wlen = len = -1;
2176 row = i > 0 ? 0 : j - 1; 2191 row = i > 0 ? 0 : j - 1;
2177 2192
… …
2448 * G: cleanup cursor and display outline cursor if necessary 2463 * G: cleanup cursor and display outline cursor if necessary
2449 */ 2464 */
2450 if (showcursor) 2465 if (showcursor)
2451 { 2466 {
2452 if (focus) 2467 if (focus)
2453 { 2468 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2454 if (option (Opt_cursorUnderline))
2455 *crp ^= RS_Uline;
2456 else
2457 {
2458 *crp ^= RS_RVid;
2459#ifndef NO_CURSORCOLOR
2460 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2461#endif
2462 }
2463 }
2464 else if (oldcursor.row >= 0) 2469 else if (oldcursor.row >= 0)
2465 { 2470 {
2466 int cursorwidth = 1; 2471 int cursorwidth = 1;
2467 int col = oldcursor.col; 2472 int col = oldcursor.col;
2468 2473
… …
2482 2487
2483 XDrawRectangle (dpy, vt, gc, 2488 XDrawRectangle (dpy, vt, gc,
2484 Col2Pixel (col), 2489 Col2Pixel (col),
2485 Row2Pixel (oldcursor.row), 2490 Row2Pixel (oldcursor.row),
2486 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2491 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2487 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2492 (unsigned int) (Height2Pixel (1) - 1));
2488 } 2493 }
2489 } 2494 }
2490 2495
2491 /* 2496 /*
2492 * H: cleanup selection 2497 * H: cleanup selection
… …
2501 screen.flags = old_screen_flags; 2506 screen.flags = old_screen_flags;
2502 num_scr = 0; 2507 num_scr = 0;
2503 num_scr_allow = 1; 2508 num_scr_allow = 1;
2504} 2509}
2505 2510
2506void 2511void ecb_cold
2507rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2512rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2508{ 2513{
2509 if (!l.t) 2514 if (!l.valid ())
2510 return; 2515 return;
2511 2516
2512 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2517 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2513 2518
2514 for (int i = ncol; i--; ) 2519 for (int i = ncol; i--; )
2515 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2520 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2516} 2521}
2517 2522
2518void 2523void ecb_cold
2519rxvt_term::scr_remap_chars () NOTHROW 2524rxvt_term::scr_remap_chars () NOTHROW
2520{ 2525{
2521 for (int i = total_rows; i--; ) 2526 for (int i = total_rows; i--; )
2522 scr_remap_chars (row_buf [i]); 2527 scr_remap_chars (row_buf [i]);
2523 2528
… …
2526 scr_remap_chars (drawn_buf [i]); 2531 scr_remap_chars (drawn_buf [i]);
2527 scr_remap_chars (swap_buf [i]); 2532 scr_remap_chars (swap_buf [i]);
2528 } 2533 }
2529} 2534}
2530 2535
2531void 2536void ecb_cold
2532rxvt_term::scr_recolour (bool refresh) NOTHROW 2537rxvt_term::scr_recolour (bool refresh) NOTHROW
2533{ 2538{
2534 bool transparent = false; 2539 bool transparent = false;
2535 2540
2536#ifdef HAVE_BG_PIXMAP 2541#ifdef HAVE_IMG
2537 if (bg_pixmap != None) 2542 if (bg_img != 0)
2538 { 2543 {
2539# ifdef ENABLE_TRANSPARENCY 2544# if ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT) 2545 if (bg_flags & BG_IS_TRANSPARENT)
2541 { 2546 {
2542 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2547 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2548 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2544 2549
2545 transparent = true; 2550 transparent = true;
2546 } 2551 }
2547 else 2552 else
2548# endif 2553# endif
2549 { 2554 {
2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2555 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2551 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2556 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2552 } 2557 }
2553 } 2558 }
2554 else 2559 else
2555#endif 2560#endif
2556 { 2561 {
… …
2563 if (scrollBar.win) 2568 if (scrollBar.win)
2564 { 2569 {
2565 if (transparent) 2570 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2571 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else 2572 else
2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2573 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2569 scrollBar.state = STATE_IDLE; 2574 scrollBar.state = SB_STATE_IDLE;
2570 scrollBar.show (0); 2575 scrollBar.show (0);
2571 } 2576 }
2572 2577
2573 if (refresh) 2578 if (refresh)
2574 { 2579 {
… …
2639 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2644 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2640 srp[col] ^= rstyle; 2645 srp[col] ^= rstyle;
2641} 2646}
2642 2647
2643/* ------------------------------------------------------------------------- */ 2648/* ------------------------------------------------------------------------- */
2644void 2649void ecb_hot
2645rxvt_term::scr_reverse_selection () NOTHROW 2650rxvt_term::scr_reverse_selection () NOTHROW
2646{ 2651{
2647 if (selection.op 2652 if (selection.op
2648 && current_screen == selection.screen 2653 && current_screen == selection.screen
2649 && selection.end.row >= view_start) 2654 && selection.end.row >= view_start)
… …
2668 */ 2673 */
2669#if 0 2674#if 0
2670void 2675void
2671rxvt_term::scr_dump (int fd) NOTHROW 2676rxvt_term::scr_dump (int fd) NOTHROW
2672{ 2677{
2673 int row, wrote; 2678 // if this method is needed, it can be implemented by factoring the
2674 unsigned int width, towrite; 2679 // relevant code in scr_printscreen
2675 const char r1[] = "\n";
2676
2677 for (row = saveLines + top_row;
2678 row < saveLines + nrow - 1; row++)
2679 {
2680 width = row_buf[row].l >= 0 ? row_buf[row].l
2681 : ncol;
2682 for (towrite = width; towrite; towrite -= wrote)
2683 {
2684 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2685 towrite);
2686 if (wrote < 0)
2687 return; /* XXX: death, no report */
2688 }
2689 if (row_buf[row].l >= 0)
2690 if (write (fd, r1, 1) <= 0)
2691 return; /* XXX: death, no report */
2692 }
2693} 2680}
2694#endif 2681#endif
2695 2682
2696/* ------------------------------------------------------------------------- * 2683/* ------------------------------------------------------------------------- *
2697 * CHARACTER SELECTION * 2684 * CHARACTER SELECTION *
2698 * ------------------------------------------------------------------------- */ 2685 * ------------------------------------------------------------------------- */
2699void 2686void
2700rxvt_term::selection_check (int check_more) NOTHROW 2687rxvt_term::selection_check (int check_more) NOTHROW
2701{ 2688{
2702 row_col_t pos;
2703
2704 if (!selection.op) 2689 if (!selection.op)
2705 return; 2690 return;
2706 2691
2707 pos.row = pos.col = 0;
2708 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2709 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2710 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2694 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2711 || (check_more == 1 2695 || (check_more == 1
2712 && current_screen == selection.screen 2696 && current_screen == selection.screen
2713 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2714 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2715 || (check_more == 2
2716 && ROWCOL_IS_BEFORE (selection.beg, pos)
2717 && ROWCOL_IS_AFTER (selection.end, pos))
2718 || (check_more == 3
2719 && ROWCOL_IS_AFTER (selection.end, pos))
2720 || (check_more == 4 /* screen width change */
2721 && (selection.beg.row != selection.end.row
2722 || selection.end.col > ncol)))
2723 CLEAR_SELECTION (); 2699 CLEAR_ALL_SELECTION ();
2700}
2701
2702void
2703rxvt_term::selection_changed () NOTHROW
2704{
2705 line_t &r1 = ROW (selection.beg.row);
2706 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2707 --selection.beg.col;
2708
2709 line_t &r2 = ROW (selection.end.row);
2710 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2711 ++selection.end.col;
2712
2713 want_refresh = 1;
2724} 2714}
2725 2715
2726/* ------------------------------------------------------------------------- */ 2716/* ------------------------------------------------------------------------- */
2727/* 2717/*
2728 * Paste a selection direct to the command fd 2718 * Paste a selection direct to the command fd
… …
2734 for (unsigned int i = 0; i < len; i++) 2724 for (unsigned int i = 0; i < len; i++)
2735 if (data[i] == C0_LF) 2725 if (data[i] == C0_LF)
2736 data[i] = C0_CR; 2726 data[i] = C0_CR;
2737 2727
2738 if (priv_modes & PrivMode_BracketPaste) 2728 if (priv_modes & PrivMode_BracketPaste)
2739 tt_printf ("\e[200~"); 2729 tt_printf ("\x1b[200~");
2740 2730
2741 tt_write (data, len); 2731 tt_write (data, len);
2742 2732
2743 if (priv_modes & PrivMode_BracketPaste) 2733 if (priv_modes & PrivMode_BracketPaste)
2744 tt_printf ("\e[201~"); 2734 tt_printf ("\x1b[201~");
2745} 2735}
2746 2736
2747void 2737void
2748rxvt_term::paste (char *data, unsigned int len) NOTHROW 2738rxvt_term::paste (char *data, unsigned int len) NOTHROW
2749{ 2739{
… …
2969/* ------------------------------------------------------------------------- */ 2959/* ------------------------------------------------------------------------- */
2970/* 2960/*
2971 * Mark or select text based upon number of clicks: 1, 2, or 3 2961 * Mark or select text based upon number of clicks: 1, 2, or 3
2972 * EXT: button 1 press 2962 * EXT: button 1 press
2973 */ 2963 */
2974void 2964void ecb_cold
2975rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2965rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2976{ 2966{
2977 clicks = ((clicks - 1) % 3) + 1; 2967 clicks = ((clicks - 1) % 3) + 1;
2978 selection.clicks = clicks; /* save clicks so extend will work */ 2968 selection.clicks = clicks; /* save clicks so extend will work */
2979 2969
… …
2998 2988
2999/* ------------------------------------------------------------------------- */ 2989/* ------------------------------------------------------------------------- */
3000/* 2990/*
3001 * Mark a selection at the specified col/row 2991 * Mark a selection at the specified col/row
3002 */ 2992 */
3003void 2993void ecb_cold
3004rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2994rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3005{ 2995{
3006 want_refresh = 1; 2996 want_refresh = 1;
3007 2997
3008 selection.mark.row = row + view_start; 2998 selection.mark.row = row + view_start;
… …
3031 * Word select: select text for 2 clicks 3021 * Word select: select text for 2 clicks
3032 * We now only find out the boundary in one direction 3022 * We now only find out the boundary in one direction
3033 */ 3023 */
3034 3024
3035/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3025/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3036#define DELIMIT_TEXT(x) \ 3026#define DELIMIT_TEXT(x) \
3037 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3027 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3038#define DELIMIT_REND(x) 1 3028#define DELIMIT_REND(x) 1
3039 3029
3040void 3030void ecb_cold
3041rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3031rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3042{ 3032{
3043 int col, row, dirnadd, tcol, trow, w1, w2; 3033 int col, row, dirnadd, tcol, trow, w1, w2;
3044 row_col_t bound; 3034 row_col_t bound;
3045 text_t *stp; 3035 text_t *stp;
… …
3119 * EXT: button 3 press; button 1 or 3 drag 3109 * EXT: button 3 press; button 1 or 3 drag
3120 * flag == 0 ==> button 1 3110 * flag == 0 ==> button 1
3121 * flag == 1 ==> button 3 press 3111 * flag == 1 ==> button 3 press
3122 * flag == 2 ==> button 3 motion 3112 * flag == 2 ==> button 3 motion
3123 */ 3113 */
3124void 3114void ecb_cold
3125rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3115rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3126{ 3116{
3127 int col = clamp (Pixel2Col (x), 0, ncol); 3117 int col = clamp (Pixel2Col (x), 0, ncol);
3128 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3118 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3129 3119
… …
3155 3145
3156/* ------------------------------------------------------------------------- */ 3146/* ------------------------------------------------------------------------- */
3157/* 3147/*
3158 * Extend the selection to the specified col/row 3148 * Extend the selection to the specified col/row
3159 */ 3149 */
3160void 3150void ecb_cold
3161rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3151rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3162{ 3152{
3163 row_col_t pos; 3153 row_col_t pos;
3164 enum { 3154 enum {
3165 LEFT, RIGHT 3155 LEFT, RIGHT
3166 } closeto = RIGHT; 3156 } closeto = RIGHT;
3167
3168 want_refresh = 1;
3169 3157
3170 switch (selection.op) 3158 switch (selection.op)
3171 { 3159 {
3172 case SELECTION_INIT: 3160 case SELECTION_INIT:
3173 CLEAR_SELECTION (); 3161 CLEAR_SELECTION ();
… …
3353 3341
3354#if !ENABLE_MINIMAL 3342#if !ENABLE_MINIMAL
3355 if (selection.rect && selection.beg.col > selection.end.col) 3343 if (selection.rect && selection.beg.col > selection.end.col)
3356 ::swap (selection.beg.col, selection.end.col); 3344 ::swap (selection.beg.col, selection.end.col);
3357#endif 3345#endif
3346
3347 selection_changed ();
3358} 3348}
3359 3349
3360#if !ENABLE_MINIMAL 3350#if !ENABLE_MINIMAL
3361void 3351void ecb_cold
3362rxvt_term::selection_remove_trailing_spaces () NOTHROW 3352rxvt_term::selection_remove_trailing_spaces () NOTHROW
3363{ 3353{
3364 int32_t end_col, end_row; 3354 int32_t end_col, end_row;
3365 text_t *stp; 3355 text_t *stp;
3366 3356
… …
3404/* ------------------------------------------------------------------------- */ 3394/* ------------------------------------------------------------------------- */
3405/* 3395/*
3406 * Double click on button 3 when already selected 3396 * Double click on button 3 when already selected
3407 * EXT: button 3 double click 3397 * EXT: button 3 double click
3408 */ 3398 */
3409void 3399void ecb_cold
3410rxvt_term::selection_rotate (int x, int y) NOTHROW 3400rxvt_term::selection_rotate (int x, int y) NOTHROW
3411{ 3401{
3412 selection.clicks = selection.clicks % 3 + 1; 3402 selection.clicks = selection.clicks % 3 + 1;
3413 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3403 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3414} 3404}
… …
3416/* ------------------------------------------------------------------------- */ 3406/* ------------------------------------------------------------------------- */
3417/* 3407/*
3418 * Respond to a request for our current selection 3408 * Respond to a request for our current selection
3419 * EXT: SelectionRequest 3409 * EXT: SelectionRequest
3420 */ 3410 */
3421void 3411void ecb_cold
3422rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3412rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3423{ 3413{
3424 Atom property = rq.property == None ? rq.target : rq.property; 3414 Atom property = rq.property == None ? rq.target : rq.property;
3425 XSelectionEvent ev; 3415 XSelectionEvent ev;
3426 3416
… …
3559 3549
3560 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3550 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3561} 3551}
3562 3552
3563/* ------------------------------------------------------------------------- */ 3553/* ------------------------------------------------------------------------- */
3564#ifdef USE_XIM 3554#if USE_XIM
3565void 3555void ecb_cold
3566rxvt_term::im_set_position (XPoint &pos) NOTHROW 3556rxvt_term::im_set_position (XPoint &pos) NOTHROW
3567{ 3557{
3568 XWindowAttributes xwa; 3558 XWindowAttributes xwa;
3569 3559
3570 XGetWindowAttributes (dpy, vt, &xwa); 3560 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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