ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.392 by root, Sun Jul 10 00:40:10 2011 UTC vs.
Revision 1.435 by sf-exg, Sun Mar 24 10:12:04 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 /* 259 /*
200 * first time called so just malloc everything: don't rely on realloc 260 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
201 */ 261 */
202 top_row = 0; 262 top_row = 0;
203 term_start = 0; 263 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 264
219 memset (charsets, 'B', sizeof (charsets)); 265 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 266 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 267 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 268 screen.cur.row = screen.cur.col = 0;
… …
245 { 291 {
246 /* 292 /*
247 * add or delete rows as appropriate 293 * add or delete rows as appropriate
248 */ 294 */
249 295
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 296 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 297
267 for (int row = min (nrow, prev_nrow); row--; ) 298 for (int row = min (nrow, prev_nrow); row--; )
268 { 299 {
269 lresize (drawn_buf[row]); 300 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 301 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
271 } 302 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
272 303
273 for (int row = prev_nrow; row < nrow; row++) 304 copy_line (swap_buf [row], prev_swap_buf [row]);
274 { 305 }
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 306
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 307 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 308 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 309 int q = total_rows; // rewrapped row
285 310
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 318 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 319
295 do 320 do
296 { 321 {
297 p = MOD (p - 1, prev_total_rows); 322 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 323 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 324 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 325 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 326
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 327 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 328 {
304 p = MOD (p - 1, prev_total_rows); 329 p = MOD (p - 1, prev_total_rows);
305 330
306 plines++; 331 plines++;
307 llen += prev_ncol; 332 llen += prev_ncol;
… …
320 345
321 // re-assemble the full line by destination lines 346 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 347 for (int qrow = q; qlines--; qrow++)
323 { 348 {
324 qline = row_buf + qrow; 349 qline = row_buf + qrow;
325 lalloc (*qline); 350 qline->alloc (); // redundant with next line
326 qline->l = ncol; 351 qline->l = ncol;
327 qline->is_longer (1); 352 qline->is_longer (1);
328 353
329 int qcol = 0; 354 int qcol = 0;
330 355
… …
345 // this seems to upset applications/shells/readline 370 // this seems to upset applications/shells/readline
346 // least. 371 // least.
347 if (prow == ocur.row) 372 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 373 screen.cur.row = q - (total_rows - nrow);
349 374
350 line_t &pline = old_buf [prow]; 375 line_t &pline = prev_row_buf [prow];
351 376
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 377 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 378
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 379 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 380 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 401 {
377 // if no scrollback exists (yet), wing, instead of wrap 402 // if no scrollback exists (yet), wing, instead of wrap
378 403
379 for (int row = min (nrow, prev_nrow); row--; ) 404 for (int row = min (nrow, prev_nrow); row--; )
380 { 405 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 406 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 407 line_t &dst = row_buf [row];
383 408
384 qline = pline; 409 copy_line (dst, src);
385 lresize (qline);
386 } 410 }
387 411
388 for (int row = prev_nrow; row < nrow; row++) 412 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 413 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 414
393 term_start = 0; 415 term_start = 0;
394 } 416 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 417
400 clamp_it (screen.cur.row, 0, nrow - 1); 418 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 419 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 420 }
403 421
422 for (int row = nrow; row--; )
423 {
424 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
425 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
426 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
427 }
428
429 chunk_free (prev_chunk, prev_chunk_size);
430
404 free (tabs); 431 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 432 tabs = (char *)rxvt_malloc (ncol);
406 433
407 for (int col = ncol; col--; ) 434 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 435 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 442 tt_winch ();
416 443
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 444 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 445}
419 446
420/* ------------------------------------------------------------------------- */ 447void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 448rxvt_term::scr_release () NOTHROW
426{ 449{
427 if (row_buf) 450 chunk_free (chunk, chunk_size);
428 { 451 chunk = 0;
429 delete talloc; talloc = 0; 452 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 453
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); 454 free (tabs);
438 tabs = 0; 455 tabs = 0;
439 }
440} 456}
441 457
442/* ------------------------------------------------------------------------- */ 458/* ------------------------------------------------------------------------- */
443/* 459/*
444 * Hard/Soft reset 460 * Hard/Soft reset
445 */ 461 */
446void 462void ecb_cold
447rxvt_term::scr_poweron () 463rxvt_term::scr_poweron ()
448{ 464{
449 scr_release (); 465 scr_release ();
466
450 prev_nrow = prev_ncol = 0; 467 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 468 rvideo_mode = false;
452 scr_soft_reset (); 469 scr_soft_reset ();
453 scr_reset (); 470 scr_reset ();
454 471
455 scr_clear (true); 472 scr_clear (true);
456 scr_refresh (); 473 scr_refresh ();
457} 474}
458 475
459void 476void ecb_cold
460rxvt_term::scr_soft_reset () 477rxvt_term::scr_soft_reset () NOTHROW
461{ 478{
462 /* only affects modes, nothing drastic such as clearing the screen */ 479 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 480#if ENABLE_OVERLAY
464 scr_overlay_off (); 481 scr_overlay_off ();
465#endif 482#endif
… …
520 assert (s->cur.row >= 0); 537 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 538 assert (s->cur.col >= 0);
522} 539}
523 540
524void 541void
525rxvt_term::scr_swap_screen () 542rxvt_term::scr_swap_screen () NOTHROW
526{ 543{
527 if (!option (Opt_secondaryScreen)) 544 if (!option (Opt_secondaryScreen))
528 return; 545 return;
529 546
530 for (int i = prev_nrow; i--; ) 547 for (int i = prev_nrow; i--; )
… …
549 return; 566 return;
550 567
551 want_refresh = 1; 568 want_refresh = 1;
552 view_start = 0; 569 view_start = 0;
553 570
554 selection_check (2); /* check for boundary cross */ 571 /* check for boundary cross */
572 row_col_t pos;
573 pos.row = pos.col = 0;
574 if (ROWCOL_IS_BEFORE (selection.beg, pos)
575 && ROWCOL_IS_AFTER (selection.end, pos))
576 CLEAR_SELECTION ();
555 577
556 current_screen = scrn; 578 current_screen = scrn;
557 579
558#if NSCREENS 580#if NSCREENS
559 if (option (Opt_secondaryScreen)) 581 if (option (Opt_secondaryScreen))
… …
625/* 647/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 648 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 649 * count positive ==> scroll up
628 * count negative ==> scroll down 650 * count negative ==> scroll down
629 */ 651 */
630int 652int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 653rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 654{
633 if (count == 0 || (row1 > row2)) 655 if (count == 0 || (row1 > row2))
634 return 0; 656 return 0;
635 657
… …
682 else 704 else
683 scr_blank_screen_mem (l, rstyle); 705 scr_blank_screen_mem (l, rstyle);
684 } 706 }
685 707
686 // move and/or clear selection, if any 708 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 709 if (selection.op && current_screen == selection.screen
710 && selection.beg.row <= row2)
688 { 711 {
689 selection.beg.row -= count; 712 selection.beg.row -= count;
690 selection.end.row -= count; 713 selection.end.row -= count;
691 selection.mark.row -= count; 714 selection.mark.row -= count;
692 715
693 if (selection.beg.row < top_row 716 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 } 717 }
701 718
702 // finally move the view window, if desired 719 // finally move the view window, if desired
703 if (option (Opt_scrollWithBuffer) 720 if (option (Opt_scrollWithBuffer)
704 && view_start != 0 721 && view_start != 0
… …
765 { 782 {
766 line_t &l = ROW(row2); 783 line_t &l = ROW(row2);
767 l.is_longer (0); 784 l.is_longer (0);
768 l.touch (); 785 l.touch ();
769 } 786 }
770
771 } 787 }
772 788
773 return count; 789 return count;
774} 790}
775 791
776/* ------------------------------------------------------------------------- */ 792/* ------------------------------------------------------------------------- */
777/* 793/*
778 * Add text given in <str> of length <len> to screen struct 794 * Add text given in <str> of length <len> to screen struct
779 */ 795 */
780void 796void ecb_hot
781rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 797rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
782{ 798{
783 if (len <= 0) /* sanity */ 799 if (len <= 0) /* sanity */
784 return; 800 return;
785 801
786 unsigned char checksel; 802 bool checksel;
787 unicode_t c; 803 unicode_t c;
788 int ncol = this->ncol; 804 int ncol = this->ncol;
789 const wchar_t *strend = str + len; 805 const wchar_t *strend = str + len;
790 806
791 want_refresh = 1; 807 want_refresh = 1;
… …
1135 * XTERM_SEQ: ESC 6 1151 * XTERM_SEQ: ESC 6
1136 * Move cursor left in row. If we're at the left boundary, shift everything 1152 * Move cursor left in row. If we're at the left boundary, shift everything
1137 * in that row right. Clear left column. 1153 * in that row right. Clear left column.
1138 */ 1154 */
1139#if !ENABLE_MINIMAL 1155#if !ENABLE_MINIMAL
1140void 1156void ecb_cold
1141rxvt_term::scr_backindex () NOTHROW 1157rxvt_term::scr_backindex () NOTHROW
1142{ 1158{
1143 if (screen.cur.col > 0) 1159 if (screen.cur.col > 0)
1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1160 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145 else 1161 else
… …
1152 * XTERM_SEQ: ESC 9 1168 * XTERM_SEQ: ESC 9
1153 * Move cursor right in row. If we're at the right boundary, shift everything 1169 * Move cursor right in row. If we're at the right boundary, shift everything
1154 * in that row left. Clear right column. 1170 * in that row left. Clear right column.
1155 */ 1171 */
1156#if !ENABLE_MINIMAL 1172#if !ENABLE_MINIMAL
1157void 1173void ecb_cold
1158rxvt_term::scr_forwardindex () NOTHROW 1174rxvt_term::scr_forwardindex () NOTHROW
1159{ 1175{
1160 if (screen.cur.col < ncol - 1) 1176 if (screen.cur.col < ncol - 1)
1161 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1177 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1162 else 1178 else
… …
1313 scr_blank_line (line, col, num, rstyle); 1329 scr_blank_line (line, col, num, rstyle);
1314} 1330}
1315 1331
1316/* ------------------------------------------------------------------------- */ 1332/* ------------------------------------------------------------------------- */
1317/* 1333/*
1318 * Erase part of whole of the screen 1334 * Erase part or whole of the screen
1319 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1335 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1320 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1336 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1321 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1337 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1322 */ 1338 */
1323void 1339void
… …
1332 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1333 1349
1334 switch (mode) 1350 switch (mode)
1335 { 1351 {
1336 case 0: /* erase to end of screen */ 1352 case 0: /* erase to end of screen */
1337 selection_check (1);
1338 scr_erase_line (0); 1353 scr_erase_line (0);
1339 row = screen.cur.row + 1; /* possible OOB */ 1354 row = screen.cur.row + 1; /* possible OOB */
1340 num = nrow - row; 1355 num = nrow - row;
1341 break; 1356 break;
1342 case 1: /* erase to beginning of screen */ 1357 case 1: /* erase to beginning of screen */
1343 selection_check (3);
1344 scr_erase_line (1); 1358 scr_erase_line (1);
1345 row = 0; 1359 row = 0;
1346 num = screen.cur.row; 1360 num = screen.cur.row;
1347 break; 1361 break;
1348 case 2: /* erase whole screen */ 1362 case 2: /* erase whole screen */
1349 selection_check (3);
1350 row = 0; 1363 row = 0;
1351 num = nrow; 1364 num = nrow;
1352 break; 1365 break;
1353 default: 1366 default:
1354 return; 1367 return;
… …
1371 { 1384 {
1372 ren = DEFAULT_RSTYLE; 1385 ren = DEFAULT_RSTYLE;
1373 1386
1374 if (mapped) 1387 if (mapped)
1375 XClearArea (dpy, vt, 0, 1388 XClearArea (dpy, vt, 0,
1376 Row2Pixel (row - view_start), (unsigned int)width, 1389 Row2Pixel (row - view_start), (unsigned int)vt_width,
1377 (unsigned int)Height2Pixel (num), False); 1390 (unsigned int)Height2Pixel (num), False);
1378 } 1391 }
1379 else 1392 else
1380 { 1393 {
1381 ren = rstyle & (RS_fgMask | RS_bgMask); 1394 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1384 { 1397 {
1385 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1398 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1386 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1387 XFillRectangle (dpy, vt, gc, 1400 XFillRectangle (dpy, vt, gc,
1388 0, Row2Pixel (row - view_start), 1401 0, Row2Pixel (row - view_start),
1389 (unsigned int)width, 1402 (unsigned int)vt_width,
1390 (unsigned int)Height2Pixel (num)); 1403 (unsigned int)Height2Pixel (num));
1391 gcvalue.foreground = pix_colors[Color_fg]; 1404 gcvalue.foreground = pix_colors[Color_fg];
1392 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1405 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1393 } 1406 }
1394 } 1407 }
… …
1416/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1417/* 1430/*
1418 * Fill the screen with `E's 1431 * Fill the screen with `E's
1419 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1432 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1420 */ 1433 */
1421void 1434void ecb_cold
1422rxvt_term::scr_E () NOTHROW 1435rxvt_term::scr_E () NOTHROW
1423{ 1436{
1424 rend_t fs; 1437 rend_t fs;
1425 1438
1426 want_refresh = 1; 1439 want_refresh = 1;
1427 ZERO_SCROLLBACK (); 1440 ZERO_SCROLLBACK ();
1428 1441
1429 num_scr_allow = 0; 1442 num_scr_allow = 0;
1430 selection_check (3); 1443
1444 row_col_t pos;
1445 pos.row = pos.col = 0;
1446 if (ROWCOL_IS_AFTER (selection.end, pos))
1447 CLEAR_SELECTION ();
1431 1448
1432 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1449 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1433 for (int row = nrow; row--; ) 1450 for (int row = nrow; row--; )
1434 { 1451 {
1435 line_t &line = ROW(row); 1452 line_t &line = ROW(row);
… …
1586/* ------------------------------------------------------------------------- */ 1603/* ------------------------------------------------------------------------- */
1587/* 1604/*
1588 * Set the scrolling region 1605 * Set the scrolling region
1589 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1606 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1590 */ 1607 */
1591void 1608void ecb_cold
1592rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1609rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1593{ 1610{
1594 max_it (top, 0); 1611 max_it (top, 0);
1595 min_it (bot, nrow - 1); 1612 min_it (bot, nrow - 1);
1596 1613
… …
1606/* 1623/*
1607 * Make the cursor visible/invisible 1624 * Make the cursor visible/invisible
1608 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1625 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1609 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1626 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1610 */ 1627 */
1611void 1628void ecb_cold
1612rxvt_term::scr_cursor_visible (int mode) NOTHROW 1629rxvt_term::scr_cursor_visible (int mode) NOTHROW
1613{ 1630{
1614 want_refresh = 1; 1631 want_refresh = 1;
1615 1632
1616 if (mode) 1633 if (mode)
… …
1623/* 1640/*
1624 * Set/unset automatic wrapping 1641 * Set/unset automatic wrapping
1625 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1642 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1626 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1643 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1627 */ 1644 */
1628void 1645void ecb_cold
1629rxvt_term::scr_autowrap (int mode) NOTHROW 1646rxvt_term::scr_autowrap (int mode) NOTHROW
1630{ 1647{
1631 if (mode) 1648 if (mode)
1632 screen.flags |= Screen_Autowrap; 1649 screen.flags |= Screen_Autowrap;
1633 else 1650 else
… …
1642 * Relative mode: line numbers are relative to top margin of scrolling region 1659 * Relative mode: line numbers are relative to top margin of scrolling region
1643 * and the cursor cannot be moved outside. 1660 * and the cursor cannot be moved outside.
1644 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1661 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1645 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1662 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1646 */ 1663 */
1647void 1664void ecb_cold
1648rxvt_term::scr_relative_origin (int mode) NOTHROW 1665rxvt_term::scr_relative_origin (int mode) NOTHROW
1649{ 1666{
1650 if (mode) 1667 if (mode)
1651 screen.flags |= Screen_Relative; 1668 screen.flags |= Screen_Relative;
1652 else 1669 else
… …
1659/* 1676/*
1660 * Set insert/replace mode 1677 * Set insert/replace mode
1661 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1678 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1662 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1679 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1663 */ 1680 */
1664void 1681void ecb_cold
1665rxvt_term::scr_insert_mode (int mode) NOTHROW 1682rxvt_term::scr_insert_mode (int mode) NOTHROW
1666{ 1683{
1667 if (mode) 1684 if (mode)
1668 screen.flags |= Screen_Insert; 1685 screen.flags |= Screen_Insert;
1669 else 1686 else
… …
1675 * Set/Unset tabs 1692 * Set/Unset tabs
1676 * XTERM_SEQ: Set tab at current column : ESC H 1693 * XTERM_SEQ: Set tab at current column : ESC H
1677 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1694 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1678 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1695 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1679 */ 1696 */
1680void 1697void ecb_cold
1681rxvt_term::scr_set_tab (int mode) NOTHROW 1698rxvt_term::scr_set_tab (int mode) NOTHROW
1682{ 1699{
1683 if (mode < 0) 1700 if (mode < 0)
1684 memset (tabs, 0, ncol); 1701 memset (tabs, 0, ncol);
1685 else if (screen.cur.col < ncol) 1702 else if (screen.cur.col < ncol)
… …
1704 if (rvideo_state != on) 1721 if (rvideo_state != on)
1705 { 1722 {
1706 rvideo_state = on; 1723 rvideo_state = on;
1707 1724
1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1725 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1709#ifdef HAVE_BG_PIXMAP 1726#ifdef HAVE_IMG
1710 if (bg_pixmap == None) 1727 if (bg_img == 0)
1711#endif 1728#endif
1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1729 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1713 1730
1714 XGCValues gcvalue; 1731 XGCValues gcvalue;
1715 gcvalue.foreground = pix_colors[Color_fg]; 1732 gcvalue.foreground = pix_colors[Color_fg];
… …
1724/* ------------------------------------------------------------------------- */ 1741/* ------------------------------------------------------------------------- */
1725/* 1742/*
1726 * Report current cursor position 1743 * Report current cursor position
1727 * XTERM_SEQ: Report position: ESC [ 6 n 1744 * XTERM_SEQ: Report position: ESC [ 6 n
1728 */ 1745 */
1729void 1746void ecb_cold
1730rxvt_term::scr_report_position () NOTHROW 1747rxvt_term::scr_report_position () NOTHROW
1731{ 1748{
1732 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1749 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1733} 1750}
1734 1751
… …
1737 * ------------------------------------------------------------------------- */ 1754 * ------------------------------------------------------------------------- */
1738 1755
1739/* 1756/*
1740 * Set font style 1757 * Set font style
1741 */ 1758 */
1742void 1759void ecb_cold
1743rxvt_term::set_font_style () NOTHROW 1760rxvt_term::set_font_style () NOTHROW
1744{ 1761{
1745#if 0 1762#if 0
1746 switch (charsets [screen.charset]) 1763 switch (charsets [screen.charset])
1747 { 1764 {
… …
1769 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1786 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1770 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1787 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1771 * XTERM_SEQ: Invoke G2 character set: ESC N 1788 * XTERM_SEQ: Invoke G2 character set: ESC N
1772 * XTERM_SEQ: Invoke G3 character set: ESC O 1789 * XTERM_SEQ: Invoke G3 character set: ESC O
1773 */ 1790 */
1774void 1791void ecb_cold
1775rxvt_term::scr_charset_choose (int set) NOTHROW 1792rxvt_term::scr_charset_choose (int set) NOTHROW
1776{ 1793{
1777 screen.charset = set; 1794 screen.charset = set;
1778 set_font_style (); 1795 set_font_style ();
1779} 1796}
… …
1800 * ------------------------------------------------------------------------- */ 1817 * ------------------------------------------------------------------------- */
1801 1818
1802/* 1819/*
1803 * refresh matching text. 1820 * refresh matching text.
1804 */ 1821 */
1805bool 1822bool ecb_cold
1806rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1823rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1807{ 1824{
1808 bool found = false; 1825 bool found = false;
1809 1826
1810 for (int i = 0; i < nrow; i++) 1827 for (int i = 0; i < nrow; i++)
… …
1829 PART_BEG = 0, 1846 PART_BEG = 0,
1830 PART_END, 1847 PART_END,
1831 RC_COUNT 1848 RC_COUNT
1832}; 1849};
1833 1850
1834void 1851void ecb_hot
1835rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1852rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1836{ 1853{
1837 int i; 1854 int i;
1838 row_col_t rc[RC_COUNT]; 1855 row_col_t rc[RC_COUNT];
1839 1856
… …
1876 * Refresh the entire screen 1893 * Refresh the entire screen
1877 */ 1894 */
1878void 1895void
1879rxvt_term::scr_touch (bool refresh) NOTHROW 1896rxvt_term::scr_touch (bool refresh) NOTHROW
1880{ 1897{
1881 scr_expose (0, 0, width, height, refresh); 1898 scr_expose (0, 0, vt_width, vt_height, refresh);
1882} 1899}
1883 1900
1884/* ------------------------------------------------------------------------- */ 1901/* ------------------------------------------------------------------------- */
1885/* 1902/*
1886 * Move the display so that the line represented by scrollbar value Y is at 1903 * Move the display so that the line represented by scrollbar value Y is at
… …
1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1982 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1966#endif 1983#endif
1967} 1984}
1968 1985
1969/* ------------------------------------------------------------------------- */ 1986/* ------------------------------------------------------------------------- */
1970void 1987void ecb_cold
1971rxvt_term::scr_printscreen (int fullhist) NOTHROW 1988rxvt_term::scr_printscreen (int fullhist) NOTHROW
1972{ 1989{
1973#ifdef PRINTPIPE 1990#ifdef PRINTPIPE
1974 int nrows, row_start; 1991 int nrows, row_start;
1975 FILE *fd = popen_printer (); 1992 FILE *fd = popen_printer ();
… …
2024/* 2041/*
2025 * Refresh the screen 2042 * Refresh the screen
2026 * drawn_text/drawn_rend contain the screen information before the update. 2043 * drawn_text/drawn_rend contain the screen information before the update.
2027 * screen.text/screen.rend contain what the screen will change to. 2044 * screen.text/screen.rend contain what the screen will change to.
2028 */ 2045 */
2029void 2046void ecb_hot
2030rxvt_term::scr_refresh () NOTHROW 2047rxvt_term::scr_refresh () NOTHROW
2031{ 2048{
2032 int16_t col, row, /* column/row we're processing */ 2049 int16_t col, row, /* column/row we're processing */
2033 ocrow; /* old cursor row */ 2050 ocrow; /* old cursor row */
2034 int i; /* tmp */ 2051 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 */ 2052 rend_t ccol1, /* Cursor colour */
2040 ccol2; /* Cursor colour2 */ 2053 ccol2; /* Cursor colour2 */
2054 rend_t cur_rend;
2055 int cur_col;
2041 2056
2042 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
2043 2058
2044 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
2045 return; 2060 return;
… …
2048 * A: set up vars 2063 * A: set up vars
2049 */ 2064 */
2050 refresh_count = 0; 2065 refresh_count = 0;
2051 2066
2052 unsigned int old_screen_flags = screen.flags; 2067 unsigned int old_screen_flags = screen.flags;
2053 char have_bg = 0; 2068 bool have_bg = 0;
2054#ifdef HAVE_BG_PIXMAP 2069#ifdef HAVE_IMG
2055 have_bg = bg_pixmap != None; 2070 have_bg = bg_img != 0;
2056#endif 2071#endif
2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2058 2073
2059 /* 2074 /*
2060 * B: reverse any characters which are selected 2075 * B: reverse any characters which are selected
… …
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2079 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2065#if ENABLE_OVERLAY 2080#if ENABLE_OVERLAY
2066 scr_swap_overlay (); 2081 scr_swap_overlay ();
2067#endif 2082#endif
2068 2083
2069 char showcursor = screen.flags & Screen_VisibleCursor; 2084 bool showcursor = screen.flags & Screen_VisibleCursor;
2070 2085
2071 /* 2086 /*
2072 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
2073 */ 2088 */
2074 { 2089 {
2075 unsigned char setoldcursor; 2090 bool setoldcursor;
2076 2091
2077#ifdef CURSOR_BLINK 2092#ifdef CURSOR_BLINK
2078 if (hidden_cursor) 2093 if (hidden_cursor)
2079 showcursor = 0; 2094 showcursor = 0;
2080#endif 2095#endif
… …
2084 int col = screen.cur.col; 2099 int col = screen.cur.col;
2085 2100
2086 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2101 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2087 col--; 2102 col--;
2088 2103
2089 crp = &ROW(screen.cur.row).r[col]; 2104 cur_rend = ROW(screen.cur.row).r[col];
2105 cur_col = col;
2090 2106
2091#ifndef NO_CURSORCOLOR 2107#ifndef NO_CURSORCOLOR
2092 cc1 = *crp & (RS_fgMask | RS_bgMask);
2093 if (ISSET_PIXCOLOR (Color_cursor)) 2108 if (ISSET_PIXCOLOR (Color_cursor))
2094 ccol1 = Color_cursor; 2109 ccol1 = Color_cursor;
2095 else 2110 else
2096#endif 2111#endif
2097#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2112#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2111 ccol2 = Color_bg; 2126 ccol2 = Color_bg;
2112#endif 2127#endif
2113 2128
2114 if (focus) 2129 if (focus)
2115 { 2130 {
2131 rend_t rend = cur_rend;
2132
2116 if (option (Opt_cursorUnderline)) 2133 if (option (Opt_cursorUnderline))
2117 *crp ^= RS_Uline; 2134 rend ^= RS_Uline;
2118 else 2135 else
2119 { 2136 {
2120 *crp ^= RS_RVid; 2137 rend ^= RS_RVid;
2121 *crp = SET_FGCOLOR (*crp, ccol1); 2138 rend = SET_FGCOLOR (rend, ccol1);
2122 *crp = SET_BGCOLOR (*crp, ccol2); 2139 rend = SET_BGCOLOR (rend, ccol2);
2123 } 2140 }
2141
2142 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2124 } 2143 }
2125 } 2144 }
2126 2145
2127 /* make sure no outline cursor is left around */ 2146 /* make sure no outline cursor is left around */
2128 setoldcursor = 0; 2147 setoldcursor = 0;
… …
2167 { 2186 {
2168 int16_t nits; 2187 int16_t nits;
2169 int i = num_scr; 2188 int i = num_scr;
2170 int j; 2189 int j;
2171 int len, wlen; 2190 int len, wlen;
2172 dLocal (int, num_scr);
2173 2191
2174 j = nrow; 2192 j = nrow;
2175 wlen = len = -1; 2193 wlen = len = -1;
2176 row = i > 0 ? 0 : j - 1; 2194 row = i > 0 ? 0 : j - 1;
2177 2195
… …
2448 * G: cleanup cursor and display outline cursor if necessary 2466 * G: cleanup cursor and display outline cursor if necessary
2449 */ 2467 */
2450 if (showcursor) 2468 if (showcursor)
2451 { 2469 {
2452 if (focus) 2470 if (focus)
2453 { 2471 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) 2472 else if (oldcursor.row >= 0)
2465 { 2473 {
2466 int cursorwidth = 1; 2474 int cursorwidth = 1;
2467 int col = oldcursor.col; 2475 int col = oldcursor.col;
2468 2476
… …
2482 2490
2483 XDrawRectangle (dpy, vt, gc, 2491 XDrawRectangle (dpy, vt, gc,
2484 Col2Pixel (col), 2492 Col2Pixel (col),
2485 Row2Pixel (oldcursor.row), 2493 Row2Pixel (oldcursor.row),
2486 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2494 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2487 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2495 (unsigned int) (Height2Pixel (1) - 1));
2488 } 2496 }
2489 } 2497 }
2490 2498
2491 /* 2499 /*
2492 * H: cleanup selection 2500 * H: cleanup selection
… …
2501 screen.flags = old_screen_flags; 2509 screen.flags = old_screen_flags;
2502 num_scr = 0; 2510 num_scr = 0;
2503 num_scr_allow = 1; 2511 num_scr_allow = 1;
2504} 2512}
2505 2513
2506void 2514void ecb_cold
2507rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2515rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2508{ 2516{
2509 if (!l.t) 2517 if (!l.valid ())
2510 return; 2518 return;
2511 2519
2512 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2520 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2513 2521
2514 for (int i = ncol; i--; ) 2522 for (int i = ncol; i--; )
2515 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2523 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2516} 2524}
2517 2525
2518void 2526void ecb_cold
2519rxvt_term::scr_remap_chars () NOTHROW 2527rxvt_term::scr_remap_chars () NOTHROW
2520{ 2528{
2521 for (int i = total_rows; i--; ) 2529 for (int i = total_rows; i--; )
2522 scr_remap_chars (row_buf [i]); 2530 scr_remap_chars (row_buf [i]);
2523 2531
… …
2526 scr_remap_chars (drawn_buf [i]); 2534 scr_remap_chars (drawn_buf [i]);
2527 scr_remap_chars (swap_buf [i]); 2535 scr_remap_chars (swap_buf [i]);
2528 } 2536 }
2529} 2537}
2530 2538
2531void 2539void ecb_cold
2532rxvt_term::scr_recolour (bool refresh) NOTHROW 2540rxvt_term::scr_recolour (bool refresh) NOTHROW
2533{ 2541{
2534 bool transparent = false; 2542 bool transparent = false;
2535 2543
2536#ifdef HAVE_BG_PIXMAP 2544#ifdef HAVE_IMG
2537 if (bg_pixmap != None) 2545 if (bg_img != 0)
2538 { 2546 {
2539# ifdef ENABLE_TRANSPARENCY 2547# if ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT) 2548 if (bg_flags & BG_IS_TRANSPARENT)
2541 { 2549 {
2542 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2550 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2551 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2544 2552
2545 transparent = true; 2553 transparent = true;
2546 } 2554 }
2547 else 2555 else
2548# endif 2556# endif
2549 { 2557 {
2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2558 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2551 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2559 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2552 } 2560 }
2553 } 2561 }
2554 else 2562 else
2555#endif 2563#endif
2556 { 2564 {
… …
2563 if (scrollBar.win) 2571 if (scrollBar.win)
2564 { 2572 {
2565 if (transparent) 2573 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2574 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else 2575 else
2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2576 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2569 scrollBar.state = STATE_IDLE; 2577 scrollBar.state = SB_STATE_IDLE;
2570 scrollBar.show (0); 2578 scrollBar.show (0);
2571 } 2579 }
2572 2580
2573 if (refresh) 2581 if (refresh)
2574 { 2582 {
… …
2639 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2647 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2640 srp[col] ^= rstyle; 2648 srp[col] ^= rstyle;
2641} 2649}
2642 2650
2643/* ------------------------------------------------------------------------- */ 2651/* ------------------------------------------------------------------------- */
2644void 2652void ecb_hot
2645rxvt_term::scr_reverse_selection () NOTHROW 2653rxvt_term::scr_reverse_selection () NOTHROW
2646{ 2654{
2647 if (selection.op 2655 if (selection.op
2648 && current_screen == selection.screen 2656 && current_screen == selection.screen
2649 && selection.end.row >= view_start) 2657 && selection.end.row >= view_start)
… …
2668 */ 2676 */
2669#if 0 2677#if 0
2670void 2678void
2671rxvt_term::scr_dump (int fd) NOTHROW 2679rxvt_term::scr_dump (int fd) NOTHROW
2672{ 2680{
2673 int row, wrote; 2681 // if this method is needed, it can be implemented by factoring the
2674 unsigned int width, towrite; 2682 // 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} 2683}
2694#endif 2684#endif
2695 2685
2696/* ------------------------------------------------------------------------- * 2686/* ------------------------------------------------------------------------- *
2697 * CHARACTER SELECTION * 2687 * CHARACTER SELECTION *
2698 * ------------------------------------------------------------------------- */ 2688 * ------------------------------------------------------------------------- */
2699void 2689void
2700rxvt_term::selection_check (int check_more) NOTHROW 2690rxvt_term::selection_check (int check_more) NOTHROW
2701{ 2691{
2702 row_col_t pos;
2703
2704 if (!selection.op) 2692 if (!selection.op)
2705 return; 2693 return;
2706 2694
2707 pos.row = pos.col = 0;
2708 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2695 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2709 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2696 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2710 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2697 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2711 || (check_more == 1 2698 || (check_more == 1
2712 && current_screen == selection.screen 2699 && current_screen == selection.screen
2713 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2700 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2714 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2701 && 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 (); 2702 CLEAR_ALL_SELECTION ();
2703}
2704
2705void
2706rxvt_term::selection_changed () NOTHROW
2707{
2708 line_t &r1 = ROW (selection.beg.row);
2709 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2710 --selection.beg.col;
2711
2712 line_t &r2 = ROW (selection.end.row);
2713 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2714 ++selection.end.col;
2715
2716 want_refresh = 1;
2724} 2717}
2725 2718
2726/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2727/* 2720/*
2728 * Paste a selection direct to the command fd 2721 * Paste a selection direct to the command fd
… …
2734 for (unsigned int i = 0; i < len; i++) 2727 for (unsigned int i = 0; i < len; i++)
2735 if (data[i] == C0_LF) 2728 if (data[i] == C0_LF)
2736 data[i] = C0_CR; 2729 data[i] = C0_CR;
2737 2730
2738 if (priv_modes & PrivMode_BracketPaste) 2731 if (priv_modes & PrivMode_BracketPaste)
2739 tt_printf ("\e[200~"); 2732 tt_printf ("\x1b[200~");
2740 2733
2741 tt_write (data, len); 2734 tt_write (data, len);
2742 2735
2743 if (priv_modes & PrivMode_BracketPaste) 2736 if (priv_modes & PrivMode_BracketPaste)
2744 tt_printf ("\e[201~"); 2737 tt_printf ("\x1b[201~");
2745} 2738}
2746 2739
2747void 2740void
2748rxvt_term::paste (char *data, unsigned int len) NOTHROW 2741rxvt_term::paste (char *data, unsigned int len) NOTHROW
2749{ 2742{
… …
2969/* ------------------------------------------------------------------------- */ 2962/* ------------------------------------------------------------------------- */
2970/* 2963/*
2971 * Mark or select text based upon number of clicks: 1, 2, or 3 2964 * Mark or select text based upon number of clicks: 1, 2, or 3
2972 * EXT: button 1 press 2965 * EXT: button 1 press
2973 */ 2966 */
2974void 2967void ecb_cold
2975rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2968rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2976{ 2969{
2977 clicks = ((clicks - 1) % 3) + 1; 2970 clicks = ((clicks - 1) % 3) + 1;
2978 selection.clicks = clicks; /* save clicks so extend will work */ 2971 selection.clicks = clicks; /* save clicks so extend will work */
2979 2972
… …
2998 2991
2999/* ------------------------------------------------------------------------- */ 2992/* ------------------------------------------------------------------------- */
3000/* 2993/*
3001 * Mark a selection at the specified col/row 2994 * Mark a selection at the specified col/row
3002 */ 2995 */
3003void 2996void ecb_cold
3004rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2997rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3005{ 2998{
3006 want_refresh = 1; 2999 want_refresh = 1;
3007 3000
3008 selection.mark.row = row + view_start; 3001 selection.mark.row = row + view_start;
… …
3031 * Word select: select text for 2 clicks 3024 * Word select: select text for 2 clicks
3032 * We now only find out the boundary in one direction 3025 * We now only find out the boundary in one direction
3033 */ 3026 */
3034 3027
3035/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3028/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3036#define DELIMIT_TEXT(x) \ 3029#define DELIMIT_TEXT(x) \
3037 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3030 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3038#define DELIMIT_REND(x) 1 3031#define DELIMIT_REND(x) 1
3039 3032
3040void 3033void ecb_cold
3041rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3034rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3042{ 3035{
3043 int col, row, dirnadd, tcol, trow, w1, w2; 3036 int col, row, dirnadd, tcol, trow, w1, w2;
3044 row_col_t bound; 3037 row_col_t bound;
3045 text_t *stp; 3038 text_t *stp;
… …
3119 * EXT: button 3 press; button 1 or 3 drag 3112 * EXT: button 3 press; button 1 or 3 drag
3120 * flag == 0 ==> button 1 3113 * flag == 0 ==> button 1
3121 * flag == 1 ==> button 3 press 3114 * flag == 1 ==> button 3 press
3122 * flag == 2 ==> button 3 motion 3115 * flag == 2 ==> button 3 motion
3123 */ 3116 */
3124void 3117void ecb_cold
3125rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3118rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3126{ 3119{
3127 int col = clamp (Pixel2Col (x), 0, ncol); 3120 int col = clamp (Pixel2Col (x), 0, ncol);
3128 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3121 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3129 3122
… …
3155 3148
3156/* ------------------------------------------------------------------------- */ 3149/* ------------------------------------------------------------------------- */
3157/* 3150/*
3158 * Extend the selection to the specified col/row 3151 * Extend the selection to the specified col/row
3159 */ 3152 */
3160void 3153void ecb_cold
3161rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3154rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3162{ 3155{
3163 row_col_t pos; 3156 row_col_t pos;
3164 enum { 3157 enum {
3165 LEFT, RIGHT 3158 LEFT, RIGHT
3166 } closeto = RIGHT; 3159 } closeto = RIGHT;
3167
3168 want_refresh = 1;
3169 3160
3170 switch (selection.op) 3161 switch (selection.op)
3171 { 3162 {
3172 case SELECTION_INIT: 3163 case SELECTION_INIT:
3173 CLEAR_SELECTION (); 3164 CLEAR_SELECTION ();
… …
3353 3344
3354#if !ENABLE_MINIMAL 3345#if !ENABLE_MINIMAL
3355 if (selection.rect && selection.beg.col > selection.end.col) 3346 if (selection.rect && selection.beg.col > selection.end.col)
3356 ::swap (selection.beg.col, selection.end.col); 3347 ::swap (selection.beg.col, selection.end.col);
3357#endif 3348#endif
3349
3350 selection_changed ();
3358} 3351}
3359 3352
3360#if !ENABLE_MINIMAL 3353#if !ENABLE_MINIMAL
3361void 3354void ecb_cold
3362rxvt_term::selection_remove_trailing_spaces () NOTHROW 3355rxvt_term::selection_remove_trailing_spaces () NOTHROW
3363{ 3356{
3364 int32_t end_col, end_row; 3357 int32_t end_col, end_row;
3365 text_t *stp; 3358 text_t *stp;
3366 3359
… …
3404/* ------------------------------------------------------------------------- */ 3397/* ------------------------------------------------------------------------- */
3405/* 3398/*
3406 * Double click on button 3 when already selected 3399 * Double click on button 3 when already selected
3407 * EXT: button 3 double click 3400 * EXT: button 3 double click
3408 */ 3401 */
3409void 3402void ecb_cold
3410rxvt_term::selection_rotate (int x, int y) NOTHROW 3403rxvt_term::selection_rotate (int x, int y) NOTHROW
3411{ 3404{
3412 selection.clicks = selection.clicks % 3 + 1; 3405 selection.clicks = selection.clicks % 3 + 1;
3413 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3406 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3414} 3407}
… …
3416/* ------------------------------------------------------------------------- */ 3409/* ------------------------------------------------------------------------- */
3417/* 3410/*
3418 * Respond to a request for our current selection 3411 * Respond to a request for our current selection
3419 * EXT: SelectionRequest 3412 * EXT: SelectionRequest
3420 */ 3413 */
3421void 3414void ecb_cold
3422rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3415rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3423{ 3416{
3424 Atom property = rq.property == None ? rq.target : rq.property; 3417 Atom property = rq.property == None ? rq.target : rq.property;
3425 XSelectionEvent ev; 3418 XSelectionEvent ev;
3426 3419
… …
3559 3552
3560 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3553 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3561} 3554}
3562 3555
3563/* ------------------------------------------------------------------------- */ 3556/* ------------------------------------------------------------------------- */
3564#ifdef USE_XIM 3557#if USE_XIM
3565void 3558void ecb_cold
3566rxvt_term::im_set_position (XPoint &pos) NOTHROW 3559rxvt_term::im_set_position (XPoint &pos) NOTHROW
3567{ 3560{
3568 XWindowAttributes xwa; 3561 XWindowAttributes xwa;
3569 3562
3570 XGetWindowAttributes (dpy, vt, &xwa); 3563 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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