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.404 by sf-exg, Tue Nov 15 20:07:10 2011 UTC vs.
Revision 1.433 by sf-exg, Thu Jan 31 08:07:14 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;
… …
49 if (option (Opt_scrollTtyOutput)) \ 47 if (option (Opt_scrollTtyOutput)) \
50 view_start = 0 48 view_start = 0
51#define CLEAR_SELECTION() \ 49#define CLEAR_SELECTION() \
52 selection.beg.row = selection.beg.col \ 50 selection.beg.row = selection.beg.col \
53 = selection.end.row = selection.end.col = 0 51 = selection.end.row = selection.end.col = 0
54#define CLEAR_SELECTION_MARK() \ 52#define CLEAR_ALL_SELECTION() \
53 selection.beg.row = selection.beg.col \
54 = selection.mark.row = selection.mark.col \
55 selection.mark.row = selection.mark.col = 0 55 = selection.end.row = selection.end.col = 0
56 56
57#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 57#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
58 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 58 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
59#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 59#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
60 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 60 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
… …
96 96
97/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
98void 98void
99rxvt_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
100{ 100{
101 if (!l.t) 101 if (!l.valid ())
102 { 102 {
103 lalloc (l); 103 l.alloc ();
104 col = 0; 104 col = 0;
105 width = ncol; 105 width = ncol;
106 } 106 }
107 107
108 l.touch (); 108 l.touch ();
… …
150 l.r[col] = rend; 150 l.r[col] = rend;
151 col++; 151 col++;
152 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
153} 153}
154 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
155/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
158 168
159void 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
160rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
161{ 215{
162#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
163 scr_overlay_off (); 217 scr_overlay_off ();
164#endif 218#endif
… …
190 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
191 245
192 screen.tscroll = 0; 246 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
194 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
195 if (!row_buf) 257 if (!prev_row_buf)
196 { 258 {
197 /* 259 /*
198 * 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
199 */ 261 */
200 top_row = 0; 262 top_row = 0;
201 term_start = 0; 263 term_start = 0;
202
203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205
206 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209
210 for (int row = nrow; row--; )
211 {
212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 }
216 264
217 memset (charsets, 'B', sizeof (charsets)); 265 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 266 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 267 screen.flags = Screen_DefaultFlags;
220 screen.cur.row = screen.cur.col = 0; 268 screen.cur.row = screen.cur.col = 0;
… …
243 { 291 {
244 /* 292 /*
245 * add or delete rows as appropriate 293 * add or delete rows as appropriate
246 */ 294 */
247 295
248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250
251#if 0
252 if (nrow < prev_nrow)
253 {
254 for (int row = nrow; row < prev_nrow; row++)
255 {
256 lfree (swap_buf [row]);
257 lfree (drawn_buf[row]);
258 }
259 }
260#endif
261
262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264
265 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
266 { 297 {
267 lresize (drawn_buf[row]); 298 copy_line (drawn_buf [row], prev_drawn_buf [row]);
268 lresize (swap_buf [row]); 299 copy_line (swap_buf [row], prev_swap_buf [row]);
269 }
270
271 for (int row = prev_nrow; row < nrow; row++)
272 { 300 }
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 }
276
277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
279 301
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 302 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 303 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 304 int q = total_rows; // rewrapped row
283 305
… …
291 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 313 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
292 314
293 do 315 do
294 { 316 {
295 p = MOD (p - 1, prev_total_rows); 317 p = MOD (p - 1, prev_total_rows);
296 assert (old_buf [MOD (p, prev_total_rows)].t); 318 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297 int plines = 1; 319 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l; 320 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
299 321
300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 322 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301 { 323 {
302 p = MOD (p - 1, prev_total_rows); 324 p = MOD (p - 1, prev_total_rows);
303 325
304 plines++; 326 plines++;
305 llen += prev_ncol; 327 llen += prev_ncol;
… …
318 340
319 // re-assemble the full line by destination lines 341 // re-assemble the full line by destination lines
320 for (int qrow = q; qlines--; qrow++) 342 for (int qrow = q; qlines--; qrow++)
321 { 343 {
322 qline = row_buf + qrow; 344 qline = row_buf + qrow;
323 lalloc (*qline); 345 qline->alloc (); // redundant with next line
324 qline->l = ncol; 346 qline->l = ncol;
325 qline->is_longer (1); 347 qline->is_longer (1);
326 348
327 int qcol = 0; 349 int qcol = 0;
328 350
… …
343 // this seems to upset applications/shells/readline 365 // this seems to upset applications/shells/readline
344 // least. 366 // least.
345 if (prow == ocur.row) 367 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow); 368 screen.cur.row = q - (total_rows - nrow);
347 369
348 line_t &pline = old_buf [prow]; 370 line_t &pline = prev_row_buf [prow];
349 371
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 372 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 373
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 374 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 375 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
374 { 396 {
375 // if no scrollback exists (yet), wing, instead of wrap 397 // if no scrollback exists (yet), wing, instead of wrap
376 398
377 for (int row = min (nrow, prev_nrow); row--; ) 399 for (int row = min (nrow, prev_nrow); row--; )
378 { 400 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 401 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row]; 402 line_t &dst = row_buf [row];
381 403
382 qline = pline; 404 copy_line (dst, src);
383 lresize (qline);
384 } 405 }
385 406
386 for (int row = prev_nrow; row < nrow; row++) 407 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 408 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390 409
391 term_start = 0; 410 term_start = 0;
392 } 411 }
393
394 free (old_buf);
395 delete old_ta;
396 delete old_ra;
397 412
398 clamp_it (screen.cur.row, 0, nrow - 1); 413 clamp_it (screen.cur.row, 0, nrow - 1);
399 clamp_it (screen.cur.col, 0, ncol - 1); 414 clamp_it (screen.cur.col, 0, ncol - 1);
400 } 415 }
401 416
417 for (int row = nrow; row--; )
418 {
419 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
420 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
421 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
422 }
423
424 chunk_free (prev_chunk, prev_chunk_size);
425
402 free (tabs); 426 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol); 427 tabs = (char *)rxvt_malloc (ncol);
404 428
405 for (int col = ncol; col--; ) 429 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0; 430 tabs [col] = col % TABSIZE == 0;
407 431
408 CLEAR_SELECTION (); 432 CLEAR_ALL_SELECTION ();
409 CLEAR_SELECTION_MARK ();
410 433
411 prev_nrow = nrow; 434 prev_nrow = nrow;
412 prev_ncol = ncol; 435 prev_ncol = ncol;
413 436
414 tt_winch (); 437 tt_winch ();
415 438
416 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 439 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
417} 440}
418 441
419/* ------------------------------------------------------------------------- */ 442void ecb_cold
420/*
421 * Free everything. That way malloc debugging can find leakage.
422 */
423void
424rxvt_term::scr_release () NOTHROW 443rxvt_term::scr_release () NOTHROW
425{ 444{
426 if (row_buf) 445 chunk_free (chunk, chunk_size);
427 { 446 chunk = 0;
428 delete talloc; talloc = 0; 447 row_buf = 0;
429 delete ralloc; ralloc = 0;
430 448
431 free (row_buf);
432 free (swap_buf);
433 free (drawn_buf);
434 row_buf = 0; // signal that we freed all the arrays above
435
436 free (tabs); 449 free (tabs);
437 tabs = 0; 450 tabs = 0;
438 }
439} 451}
440 452
441/* ------------------------------------------------------------------------- */ 453/* ------------------------------------------------------------------------- */
442/* 454/*
443 * Hard/Soft reset 455 * Hard/Soft reset
444 */ 456 */
445void 457void ecb_cold
446rxvt_term::scr_poweron () 458rxvt_term::scr_poweron ()
447{ 459{
448 scr_release (); 460 scr_release ();
461
449 prev_nrow = prev_ncol = 0; 462 prev_nrow = prev_ncol = 0;
450 rvideo_mode = false; 463 rvideo_mode = false;
451 scr_soft_reset (); 464 scr_soft_reset ();
452 scr_reset (); 465 scr_reset ();
453 466
454 scr_clear (true); 467 scr_clear (true);
455 scr_refresh (); 468 scr_refresh ();
456} 469}
457 470
458void 471void ecb_cold
459rxvt_term::scr_soft_reset () 472rxvt_term::scr_soft_reset () NOTHROW
460{ 473{
461 /* only affects modes, nothing drastic such as clearing the screen */ 474 /* only affects modes, nothing drastic such as clearing the screen */
462#if ENABLE_OVERLAY 475#if ENABLE_OVERLAY
463 scr_overlay_off (); 476 scr_overlay_off ();
464#endif 477#endif
… …
519 assert (s->cur.row >= 0); 532 assert (s->cur.row >= 0);
520 assert (s->cur.col >= 0); 533 assert (s->cur.col >= 0);
521} 534}
522 535
523void 536void
524rxvt_term::scr_swap_screen () 537rxvt_term::scr_swap_screen () NOTHROW
525{ 538{
526 if (!option (Opt_secondaryScreen)) 539 if (!option (Opt_secondaryScreen))
527 return; 540 return;
528 541
529 for (int i = prev_nrow; i--; ) 542 for (int i = prev_nrow; i--; )
… …
548 return; 561 return;
549 562
550 want_refresh = 1; 563 want_refresh = 1;
551 view_start = 0; 564 view_start = 0;
552 565
553 selection_check (2); /* check for boundary cross */ 566 /* check for boundary cross */
567 row_col_t pos;
568 pos.row = pos.col = 0;
569 if (ROWCOL_IS_BEFORE (selection.beg, pos)
570 && ROWCOL_IS_AFTER (selection.end, pos))
571 CLEAR_SELECTION ();
554 572
555 current_screen = scrn; 573 current_screen = scrn;
556 574
557#if NSCREENS 575#if NSCREENS
558 if (option (Opt_secondaryScreen)) 576 if (option (Opt_secondaryScreen))
… …
624/* 642/*
625 * Scroll text between <row1> and <row2> inclusive, by <count> lines 643 * Scroll text between <row1> and <row2> inclusive, by <count> lines
626 * count positive ==> scroll up 644 * count positive ==> scroll up
627 * count negative ==> scroll down 645 * count negative ==> scroll down
628 */ 646 */
629int 647int ecb_hot
630rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 648rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
631{ 649{
632 if (count == 0 || (row1 > row2)) 650 if (count == 0 || (row1 > row2))
633 return 0; 651 return 0;
634 652
… …
711 || (selection.beg.row - count < row1 && selection.beg.row >= row1) 729 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
712 || (selection.beg.row - count > row2 && selection.beg.row <= row2) 730 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
713 || (selection.end.row - count < row1 && selection.end.row >= row1) 731 || (selection.end.row - count < row1 && selection.end.row >= row1)
714 || (selection.end.row - count > row2 && selection.end.row <= row2)) 732 || (selection.end.row - count > row2 && selection.end.row <= row2))
715 { 733 {
716 CLEAR_SELECTION (); 734 CLEAR_ALL_SELECTION ();
717 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow)) 735 selection.op = SELECTION_CLEAR;
718 CLEAR_SELECTION_MARK ();
719 } 736 }
720 else if (selection.end.row >= row1 && selection.end.row <= row2) 737 else if (selection.end.row >= row1 && selection.end.row <= row2)
721 { 738 {
722 /* move selected region too */ 739 /* move selected region too */
723 selection.beg.row -= count; 740 selection.beg.row -= count;
… …
769 786
770/* ------------------------------------------------------------------------- */ 787/* ------------------------------------------------------------------------- */
771/* 788/*
772 * Add text given in <str> of length <len> to screen struct 789 * Add text given in <str> of length <len> to screen struct
773 */ 790 */
774void 791void ecb_hot
775rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 792rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
776{ 793{
777 if (len <= 0) /* sanity */ 794 if (len <= 0) /* sanity */
778 return; 795 return;
779 796
… …
1129 * XTERM_SEQ: ESC 6 1146 * XTERM_SEQ: ESC 6
1130 * Move cursor left in row. If we're at the left boundary, shift everything 1147 * Move cursor left in row. If we're at the left boundary, shift everything
1131 * in that row right. Clear left column. 1148 * in that row right. Clear left column.
1132 */ 1149 */
1133#if !ENABLE_MINIMAL 1150#if !ENABLE_MINIMAL
1134void 1151void ecb_cold
1135rxvt_term::scr_backindex () NOTHROW 1152rxvt_term::scr_backindex () NOTHROW
1136{ 1153{
1137 if (screen.cur.col > 0) 1154 if (screen.cur.col > 0)
1138 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1139 else 1156 else
… …
1146 * XTERM_SEQ: ESC 9 1163 * XTERM_SEQ: ESC 9
1147 * Move cursor right in row. If we're at the right boundary, shift everything 1164 * Move cursor right in row. If we're at the right boundary, shift everything
1148 * in that row left. Clear right column. 1165 * in that row left. Clear right column.
1149 */ 1166 */
1150#if !ENABLE_MINIMAL 1167#if !ENABLE_MINIMAL
1151void 1168void ecb_cold
1152rxvt_term::scr_forwardindex () NOTHROW 1169rxvt_term::scr_forwardindex () NOTHROW
1153{ 1170{
1154 if (screen.cur.col < ncol - 1) 1171 if (screen.cur.col < ncol - 1)
1155 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1172 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1156 else 1173 else
… …
1307 scr_blank_line (line, col, num, rstyle); 1324 scr_blank_line (line, col, num, rstyle);
1308} 1325}
1309 1326
1310/* ------------------------------------------------------------------------- */ 1327/* ------------------------------------------------------------------------- */
1311/* 1328/*
1312 * Erase part of whole of the screen 1329 * Erase part or whole of the screen
1313 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1330 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1314 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1331 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1315 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1332 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1316 */ 1333 */
1317void 1334void
… …
1326 ZERO_SCROLLBACK (); 1343 ZERO_SCROLLBACK ();
1327 1344
1328 switch (mode) 1345 switch (mode)
1329 { 1346 {
1330 case 0: /* erase to end of screen */ 1347 case 0: /* erase to end of screen */
1331 selection_check (1);
1332 scr_erase_line (0); 1348 scr_erase_line (0);
1333 row = screen.cur.row + 1; /* possible OOB */ 1349 row = screen.cur.row + 1; /* possible OOB */
1334 num = nrow - row; 1350 num = nrow - row;
1335 break; 1351 break;
1336 case 1: /* erase to beginning of screen */ 1352 case 1: /* erase to beginning of screen */
1337 selection_check (3);
1338 scr_erase_line (1); 1353 scr_erase_line (1);
1339 row = 0; 1354 row = 0;
1340 num = screen.cur.row; 1355 num = screen.cur.row;
1341 break; 1356 break;
1342 case 2: /* erase whole screen */ 1357 case 2: /* erase whole screen */
1343 selection_check (3);
1344 row = 0; 1358 row = 0;
1345 num = nrow; 1359 num = nrow;
1346 break; 1360 break;
1347 default: 1361 default:
1348 return; 1362 return;
… …
1365 { 1379 {
1366 ren = DEFAULT_RSTYLE; 1380 ren = DEFAULT_RSTYLE;
1367 1381
1368 if (mapped) 1382 if (mapped)
1369 XClearArea (dpy, vt, 0, 1383 XClearArea (dpy, vt, 0,
1370 Row2Pixel (row - view_start), (unsigned int)width, 1384 Row2Pixel (row - view_start), (unsigned int)vt_width,
1371 (unsigned int)Height2Pixel (num), False); 1385 (unsigned int)Height2Pixel (num), False);
1372 } 1386 }
1373 else 1387 else
1374 { 1388 {
1375 ren = rstyle & (RS_fgMask | RS_bgMask); 1389 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1378 { 1392 {
1379 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1393 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1380 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1394 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1381 XFillRectangle (dpy, vt, gc, 1395 XFillRectangle (dpy, vt, gc,
1382 0, Row2Pixel (row - view_start), 1396 0, Row2Pixel (row - view_start),
1383 (unsigned int)width, 1397 (unsigned int)vt_width,
1384 (unsigned int)Height2Pixel (num)); 1398 (unsigned int)Height2Pixel (num));
1385 gcvalue.foreground = pix_colors[Color_fg]; 1399 gcvalue.foreground = pix_colors[Color_fg];
1386 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1400 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1387 } 1401 }
1388 } 1402 }
… …
1410/* ------------------------------------------------------------------------- */ 1424/* ------------------------------------------------------------------------- */
1411/* 1425/*
1412 * Fill the screen with `E's 1426 * Fill the screen with `E's
1413 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1427 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1414 */ 1428 */
1415void 1429void ecb_cold
1416rxvt_term::scr_E () NOTHROW 1430rxvt_term::scr_E () NOTHROW
1417{ 1431{
1418 rend_t fs; 1432 rend_t fs;
1419 1433
1420 want_refresh = 1; 1434 want_refresh = 1;
1421 ZERO_SCROLLBACK (); 1435 ZERO_SCROLLBACK ();
1422 1436
1423 num_scr_allow = 0; 1437 num_scr_allow = 0;
1424 selection_check (3); 1438
1439 row_col_t pos;
1440 pos.row = pos.col = 0;
1441 if (ROWCOL_IS_AFTER (selection.end, pos))
1442 CLEAR_SELECTION ();
1425 1443
1426 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1444 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1427 for (int row = nrow; row--; ) 1445 for (int row = nrow; row--; )
1428 { 1446 {
1429 line_t &line = ROW(row); 1447 line_t &line = ROW(row);
… …
1580/* ------------------------------------------------------------------------- */ 1598/* ------------------------------------------------------------------------- */
1581/* 1599/*
1582 * Set the scrolling region 1600 * Set the scrolling region
1583 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1601 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1584 */ 1602 */
1585void 1603void ecb_cold
1586rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1604rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1587{ 1605{
1588 max_it (top, 0); 1606 max_it (top, 0);
1589 min_it (bot, nrow - 1); 1607 min_it (bot, nrow - 1);
1590 1608
… …
1600/* 1618/*
1601 * Make the cursor visible/invisible 1619 * Make the cursor visible/invisible
1602 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1620 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1603 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1621 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1604 */ 1622 */
1605void 1623void ecb_cold
1606rxvt_term::scr_cursor_visible (int mode) NOTHROW 1624rxvt_term::scr_cursor_visible (int mode) NOTHROW
1607{ 1625{
1608 want_refresh = 1; 1626 want_refresh = 1;
1609 1627
1610 if (mode) 1628 if (mode)
… …
1617/* 1635/*
1618 * Set/unset automatic wrapping 1636 * Set/unset automatic wrapping
1619 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1637 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1620 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1638 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1621 */ 1639 */
1622void 1640void ecb_cold
1623rxvt_term::scr_autowrap (int mode) NOTHROW 1641rxvt_term::scr_autowrap (int mode) NOTHROW
1624{ 1642{
1625 if (mode) 1643 if (mode)
1626 screen.flags |= Screen_Autowrap; 1644 screen.flags |= Screen_Autowrap;
1627 else 1645 else
… …
1636 * Relative mode: line numbers are relative to top margin of scrolling region 1654 * Relative mode: line numbers are relative to top margin of scrolling region
1637 * and the cursor cannot be moved outside. 1655 * and the cursor cannot be moved outside.
1638 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1656 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1639 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1657 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1640 */ 1658 */
1641void 1659void ecb_cold
1642rxvt_term::scr_relative_origin (int mode) NOTHROW 1660rxvt_term::scr_relative_origin (int mode) NOTHROW
1643{ 1661{
1644 if (mode) 1662 if (mode)
1645 screen.flags |= Screen_Relative; 1663 screen.flags |= Screen_Relative;
1646 else 1664 else
… …
1653/* 1671/*
1654 * Set insert/replace mode 1672 * Set insert/replace mode
1655 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1673 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1656 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1674 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1657 */ 1675 */
1658void 1676void ecb_cold
1659rxvt_term::scr_insert_mode (int mode) NOTHROW 1677rxvt_term::scr_insert_mode (int mode) NOTHROW
1660{ 1678{
1661 if (mode) 1679 if (mode)
1662 screen.flags |= Screen_Insert; 1680 screen.flags |= Screen_Insert;
1663 else 1681 else
… …
1669 * Set/Unset tabs 1687 * Set/Unset tabs
1670 * XTERM_SEQ: Set tab at current column : ESC H 1688 * XTERM_SEQ: Set tab at current column : ESC H
1671 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1689 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1672 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1690 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1673 */ 1691 */
1674void 1692void ecb_cold
1675rxvt_term::scr_set_tab (int mode) NOTHROW 1693rxvt_term::scr_set_tab (int mode) NOTHROW
1676{ 1694{
1677 if (mode < 0) 1695 if (mode < 0)
1678 memset (tabs, 0, ncol); 1696 memset (tabs, 0, ncol);
1679 else if (screen.cur.col < ncol) 1697 else if (screen.cur.col < ncol)
… …
1698 if (rvideo_state != on) 1716 if (rvideo_state != on)
1699 { 1717 {
1700 rvideo_state = on; 1718 rvideo_state = on;
1701 1719
1702 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1720 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1703#ifdef HAVE_BG_PIXMAP 1721#ifdef HAVE_IMG
1704 if (bg_pixmap == None) 1722 if (bg_img == 0)
1705#endif 1723#endif
1706 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1724 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1707 1725
1708 XGCValues gcvalue; 1726 XGCValues gcvalue;
1709 gcvalue.foreground = pix_colors[Color_fg]; 1727 gcvalue.foreground = pix_colors[Color_fg];
… …
1718/* ------------------------------------------------------------------------- */ 1736/* ------------------------------------------------------------------------- */
1719/* 1737/*
1720 * Report current cursor position 1738 * Report current cursor position
1721 * XTERM_SEQ: Report position: ESC [ 6 n 1739 * XTERM_SEQ: Report position: ESC [ 6 n
1722 */ 1740 */
1723void 1741void ecb_cold
1724rxvt_term::scr_report_position () NOTHROW 1742rxvt_term::scr_report_position () NOTHROW
1725{ 1743{
1726 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1744 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1727} 1745}
1728 1746
… …
1731 * ------------------------------------------------------------------------- */ 1749 * ------------------------------------------------------------------------- */
1732 1750
1733/* 1751/*
1734 * Set font style 1752 * Set font style
1735 */ 1753 */
1736void 1754void ecb_cold
1737rxvt_term::set_font_style () NOTHROW 1755rxvt_term::set_font_style () NOTHROW
1738{ 1756{
1739#if 0 1757#if 0
1740 switch (charsets [screen.charset]) 1758 switch (charsets [screen.charset])
1741 { 1759 {
… …
1763 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1781 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1764 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1782 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1765 * XTERM_SEQ: Invoke G2 character set: ESC N 1783 * XTERM_SEQ: Invoke G2 character set: ESC N
1766 * XTERM_SEQ: Invoke G3 character set: ESC O 1784 * XTERM_SEQ: Invoke G3 character set: ESC O
1767 */ 1785 */
1768void 1786void ecb_cold
1769rxvt_term::scr_charset_choose (int set) NOTHROW 1787rxvt_term::scr_charset_choose (int set) NOTHROW
1770{ 1788{
1771 screen.charset = set; 1789 screen.charset = set;
1772 set_font_style (); 1790 set_font_style ();
1773} 1791}
… …
1794 * ------------------------------------------------------------------------- */ 1812 * ------------------------------------------------------------------------- */
1795 1813
1796/* 1814/*
1797 * refresh matching text. 1815 * refresh matching text.
1798 */ 1816 */
1799bool 1817bool ecb_cold
1800rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1818rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1801{ 1819{
1802 bool found = false; 1820 bool found = false;
1803 1821
1804 for (int i = 0; i < nrow; i++) 1822 for (int i = 0; i < nrow; i++)
… …
1823 PART_BEG = 0, 1841 PART_BEG = 0,
1824 PART_END, 1842 PART_END,
1825 RC_COUNT 1843 RC_COUNT
1826}; 1844};
1827 1845
1828void 1846void ecb_hot
1829rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1847rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1830{ 1848{
1831 int i; 1849 int i;
1832 row_col_t rc[RC_COUNT]; 1850 row_col_t rc[RC_COUNT];
1833 1851
… …
1870 * Refresh the entire screen 1888 * Refresh the entire screen
1871 */ 1889 */
1872void 1890void
1873rxvt_term::scr_touch (bool refresh) NOTHROW 1891rxvt_term::scr_touch (bool refresh) NOTHROW
1874{ 1892{
1875 scr_expose (0, 0, width, height, refresh); 1893 scr_expose (0, 0, vt_width, vt_height, refresh);
1876} 1894}
1877 1895
1878/* ------------------------------------------------------------------------- */ 1896/* ------------------------------------------------------------------------- */
1879/* 1897/*
1880 * Move the display so that the line represented by scrollbar value Y is at 1898 * Move the display so that the line represented by scrollbar value Y is at
… …
1959 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1977 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1960#endif 1978#endif
1961} 1979}
1962 1980
1963/* ------------------------------------------------------------------------- */ 1981/* ------------------------------------------------------------------------- */
1964void 1982void ecb_cold
1965rxvt_term::scr_printscreen (int fullhist) NOTHROW 1983rxvt_term::scr_printscreen (int fullhist) NOTHROW
1966{ 1984{
1967#ifdef PRINTPIPE 1985#ifdef PRINTPIPE
1968 int nrows, row_start; 1986 int nrows, row_start;
1969 FILE *fd = popen_printer (); 1987 FILE *fd = popen_printer ();
… …
2018/* 2036/*
2019 * Refresh the screen 2037 * Refresh the screen
2020 * drawn_text/drawn_rend contain the screen information before the update. 2038 * drawn_text/drawn_rend contain the screen information before the update.
2021 * screen.text/screen.rend contain what the screen will change to. 2039 * screen.text/screen.rend contain what the screen will change to.
2022 */ 2040 */
2023void 2041void ecb_hot
2024rxvt_term::scr_refresh () NOTHROW 2042rxvt_term::scr_refresh () NOTHROW
2025{ 2043{
2026 int16_t col, row, /* column/row we're processing */ 2044 int16_t col, row, /* column/row we're processing */
2027 ocrow; /* old cursor row */ 2045 ocrow; /* old cursor row */
2028 int i; /* tmp */ 2046 int i; /* tmp */
2029#ifndef NO_CURSORCOLOR
2030 rend_t cc1; /* store colours at cursor position (s) */
2031#endif
2032 rend_t *crp; // cursor rendition pointer
2033 rend_t ccol1, /* Cursor colour */ 2047 rend_t ccol1, /* Cursor colour */
2034 ccol2; /* Cursor colour2 */ 2048 ccol2; /* Cursor colour2 */
2049 rend_t cur_rend;
2050 int cur_col;
2035 2051
2036 want_refresh = 0; /* screen is current */ 2052 want_refresh = 0; /* screen is current */
2037 2053
2038 if (refresh_type == NO_REFRESH || !mapped) 2054 if (refresh_type == NO_REFRESH || !mapped)
2039 return; 2055 return;
… …
2043 */ 2059 */
2044 refresh_count = 0; 2060 refresh_count = 0;
2045 2061
2046 unsigned int old_screen_flags = screen.flags; 2062 unsigned int old_screen_flags = screen.flags;
2047 bool have_bg = 0; 2063 bool have_bg = 0;
2048#ifdef HAVE_BG_PIXMAP 2064#ifdef HAVE_IMG
2049 have_bg = bg_pixmap != None; 2065 have_bg = bg_img != 0;
2050#endif 2066#endif
2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2067 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2052 2068
2053 /* 2069 /*
2054 * B: reverse any characters which are selected 2070 * B: reverse any characters which are selected
… …
2078 int col = screen.cur.col; 2094 int col = screen.cur.col;
2079 2095
2080 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2096 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2081 col--; 2097 col--;
2082 2098
2083 crp = &ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col;
2084 2101
2085#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
2086 cc1 = *crp & (RS_fgMask | RS_bgMask);
2087 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2088 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2089 else 2105 else
2090#endif 2106#endif
2091#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2105 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2106#endif 2122#endif
2107 2123
2108 if (focus) 2124 if (focus)
2109 { 2125 {
2126 rend_t rend = cur_rend;
2127
2110 if (option (Opt_cursorUnderline)) 2128 if (option (Opt_cursorUnderline))
2111 *crp ^= RS_Uline; 2129 rend ^= RS_Uline;
2112 else 2130 else
2113 { 2131 {
2114 *crp ^= RS_RVid; 2132 rend ^= RS_RVid;
2115 *crp = SET_FGCOLOR (*crp, ccol1); 2133 rend = SET_FGCOLOR (rend, ccol1);
2116 *crp = SET_BGCOLOR (*crp, ccol2); 2134 rend = SET_BGCOLOR (rend, ccol2);
2117 } 2135 }
2136
2137 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2118 } 2138 }
2119 } 2139 }
2120 2140
2121 /* make sure no outline cursor is left around */ 2141 /* make sure no outline cursor is left around */
2122 setoldcursor = 0; 2142 setoldcursor = 0;
… …
2161 { 2181 {
2162 int16_t nits; 2182 int16_t nits;
2163 int i = num_scr; 2183 int i = num_scr;
2164 int j; 2184 int j;
2165 int len, wlen; 2185 int len, wlen;
2166 dLocal (int, num_scr);
2167 2186
2168 j = nrow; 2187 j = nrow;
2169 wlen = len = -1; 2188 wlen = len = -1;
2170 row = i > 0 ? 0 : j - 1; 2189 row = i > 0 ? 0 : j - 1;
2171 2190
… …
2442 * G: cleanup cursor and display outline cursor if necessary 2461 * G: cleanup cursor and display outline cursor if necessary
2443 */ 2462 */
2444 if (showcursor) 2463 if (showcursor)
2445 { 2464 {
2446 if (focus) 2465 if (focus)
2447 { 2466 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2448 if (option (Opt_cursorUnderline))
2449 *crp ^= RS_Uline;
2450 else
2451 {
2452 *crp ^= RS_RVid;
2453#ifndef NO_CURSORCOLOR
2454 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2455#endif
2456 }
2457 }
2458 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2459 { 2468 {
2460 int cursorwidth = 1; 2469 int cursorwidth = 1;
2461 int col = oldcursor.col; 2470 int col = oldcursor.col;
2462 2471
… …
2476 2485
2477 XDrawRectangle (dpy, vt, gc, 2486 XDrawRectangle (dpy, vt, gc,
2478 Col2Pixel (col), 2487 Col2Pixel (col),
2479 Row2Pixel (oldcursor.row), 2488 Row2Pixel (oldcursor.row),
2480 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2489 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2481 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2490 (unsigned int) (Height2Pixel (1) - 1));
2482 } 2491 }
2483 } 2492 }
2484 2493
2485 /* 2494 /*
2486 * H: cleanup selection 2495 * H: cleanup selection
… …
2495 screen.flags = old_screen_flags; 2504 screen.flags = old_screen_flags;
2496 num_scr = 0; 2505 num_scr = 0;
2497 num_scr_allow = 1; 2506 num_scr_allow = 1;
2498} 2507}
2499 2508
2500void 2509void ecb_cold
2501rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2510rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2502{ 2511{
2503 if (!l.t) 2512 if (!l.valid ())
2504 return; 2513 return;
2505 2514
2506 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2515 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2507 2516
2508 for (int i = ncol; i--; ) 2517 for (int i = ncol; i--; )
2509 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2518 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2510} 2519}
2511 2520
2512void 2521void ecb_cold
2513rxvt_term::scr_remap_chars () NOTHROW 2522rxvt_term::scr_remap_chars () NOTHROW
2514{ 2523{
2515 for (int i = total_rows; i--; ) 2524 for (int i = total_rows; i--; )
2516 scr_remap_chars (row_buf [i]); 2525 scr_remap_chars (row_buf [i]);
2517 2526
… …
2520 scr_remap_chars (drawn_buf [i]); 2529 scr_remap_chars (drawn_buf [i]);
2521 scr_remap_chars (swap_buf [i]); 2530 scr_remap_chars (swap_buf [i]);
2522 } 2531 }
2523} 2532}
2524 2533
2525void 2534void ecb_cold
2526rxvt_term::scr_recolour (bool refresh) NOTHROW 2535rxvt_term::scr_recolour (bool refresh) NOTHROW
2527{ 2536{
2528 bool transparent = false; 2537 bool transparent = false;
2529 2538
2530#ifdef HAVE_BG_PIXMAP 2539#ifdef HAVE_IMG
2531 if (bg_pixmap != None) 2540 if (bg_img != 0)
2532 { 2541 {
2533# ifdef ENABLE_TRANSPARENCY 2542# if ENABLE_TRANSPARENCY
2534 if (bg_flags & BG_IS_TRANSPARENT) 2543 if (bg_flags & BG_IS_TRANSPARENT)
2535 { 2544 {
2536 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2545 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2537 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2546 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2538 2547
2539 transparent = true; 2548 transparent = true;
2540 } 2549 }
2541 else 2550 else
2542# endif 2551# endif
2543 { 2552 {
2544 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2545 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2554 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2546 } 2555 }
2547 } 2556 }
2548 else 2557 else
2549#endif 2558#endif
2550 { 2559 {
… …
2557 if (scrollBar.win) 2566 if (scrollBar.win)
2558 { 2567 {
2559 if (transparent) 2568 if (transparent)
2560 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2569 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2561 else 2570 else
2562 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2571 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2563 scrollBar.state = SB_STATE_IDLE; 2572 scrollBar.state = SB_STATE_IDLE;
2564 scrollBar.show (0); 2573 scrollBar.show (0);
2565 } 2574 }
2566 2575
2567 if (refresh) 2576 if (refresh)
… …
2633 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2642 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2634 srp[col] ^= rstyle; 2643 srp[col] ^= rstyle;
2635} 2644}
2636 2645
2637/* ------------------------------------------------------------------------- */ 2646/* ------------------------------------------------------------------------- */
2638void 2647void ecb_hot
2639rxvt_term::scr_reverse_selection () NOTHROW 2648rxvt_term::scr_reverse_selection () NOTHROW
2640{ 2649{
2641 if (selection.op 2650 if (selection.op
2642 && current_screen == selection.screen 2651 && current_screen == selection.screen
2643 && selection.end.row >= view_start) 2652 && selection.end.row >= view_start)
… …
2662 */ 2671 */
2663#if 0 2672#if 0
2664void 2673void
2665rxvt_term::scr_dump (int fd) NOTHROW 2674rxvt_term::scr_dump (int fd) NOTHROW
2666{ 2675{
2667 int row, wrote; 2676 // if this method is needed, it can be implemented by factoring the
2668 unsigned int width, towrite; 2677 // relevant code in scr_printscreen
2669 const char r1[] = "\n";
2670
2671 for (row = saveLines + top_row;
2672 row < saveLines + nrow - 1; row++)
2673 {
2674 width = row_buf[row].l >= 0 ? row_buf[row].l
2675 : ncol;
2676 for (towrite = width; towrite; towrite -= wrote)
2677 {
2678 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2679 towrite);
2680 if (wrote < 0)
2681 return; /* XXX: death, no report */
2682 }
2683 if (row_buf[row].l >= 0)
2684 if (write (fd, r1, 1) <= 0)
2685 return; /* XXX: death, no report */
2686 }
2687} 2678}
2688#endif 2679#endif
2689 2680
2690/* ------------------------------------------------------------------------- * 2681/* ------------------------------------------------------------------------- *
2691 * CHARACTER SELECTION * 2682 * CHARACTER SELECTION *
… …
2694rxvt_term::selection_check (int check_more) NOTHROW 2685rxvt_term::selection_check (int check_more) NOTHROW
2695{ 2686{
2696 if (!selection.op) 2687 if (!selection.op)
2697 return; 2688 return;
2698 2689
2699 row_col_t pos;
2700 pos.row = pos.col = 0;
2701
2702 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2690 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2691 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2703 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2692 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2704 || (check_more == 1 2693 || (check_more == 1
2705 && current_screen == selection.screen 2694 && current_screen == selection.screen
2706 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2695 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2707 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2696 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2708 || (check_more == 2
2709 && ROWCOL_IS_BEFORE (selection.beg, pos)
2710 && ROWCOL_IS_AFTER (selection.end, pos))
2711 || (check_more == 3
2712 && ROWCOL_IS_AFTER (selection.end, pos)))
2713 CLEAR_SELECTION (); 2697 CLEAR_ALL_SELECTION ();
2714
2715 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))
2716 CLEAR_SELECTION_MARK ();
2717} 2698}
2718 2699
2719/* ------------------------------------------------------------------------- */ 2700/* ------------------------------------------------------------------------- */
2720/* 2701/*
2721 * Paste a selection direct to the command fd 2702 * Paste a selection direct to the command fd
… …
2727 for (unsigned int i = 0; i < len; i++) 2708 for (unsigned int i = 0; i < len; i++)
2728 if (data[i] == C0_LF) 2709 if (data[i] == C0_LF)
2729 data[i] = C0_CR; 2710 data[i] = C0_CR;
2730 2711
2731 if (priv_modes & PrivMode_BracketPaste) 2712 if (priv_modes & PrivMode_BracketPaste)
2732 tt_printf ("\e[200~"); 2713 tt_printf ("\x1b[200~");
2733 2714
2734 tt_write (data, len); 2715 tt_write (data, len);
2735 2716
2736 if (priv_modes & PrivMode_BracketPaste) 2717 if (priv_modes & PrivMode_BracketPaste)
2737 tt_printf ("\e[201~"); 2718 tt_printf ("\x1b[201~");
2738} 2719}
2739 2720
2740void 2721void
2741rxvt_term::paste (char *data, unsigned int len) NOTHROW 2722rxvt_term::paste (char *data, unsigned int len) NOTHROW
2742{ 2723{
… …
2962/* ------------------------------------------------------------------------- */ 2943/* ------------------------------------------------------------------------- */
2963/* 2944/*
2964 * Mark or select text based upon number of clicks: 1, 2, or 3 2945 * Mark or select text based upon number of clicks: 1, 2, or 3
2965 * EXT: button 1 press 2946 * EXT: button 1 press
2966 */ 2947 */
2967void 2948void ecb_cold
2968rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2949rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2969{ 2950{
2970 clicks = ((clicks - 1) % 3) + 1; 2951 clicks = ((clicks - 1) % 3) + 1;
2971 selection.clicks = clicks; /* save clicks so extend will work */ 2952 selection.clicks = clicks; /* save clicks so extend will work */
2972 2953
… …
2991 2972
2992/* ------------------------------------------------------------------------- */ 2973/* ------------------------------------------------------------------------- */
2993/* 2974/*
2994 * Mark a selection at the specified col/row 2975 * Mark a selection at the specified col/row
2995 */ 2976 */
2996void 2977void ecb_cold
2997rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2978rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2998{ 2979{
2999 want_refresh = 1; 2980 want_refresh = 1;
3000 2981
3001 selection.mark.row = row + view_start; 2982 selection.mark.row = row + view_start;
… …
3028/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3009/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3029#define DELIMIT_TEXT(x) \ 3010#define DELIMIT_TEXT(x) \
3030 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3011 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3031#define DELIMIT_REND(x) 1 3012#define DELIMIT_REND(x) 1
3032 3013
3033void 3014void ecb_cold
3034rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3015rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3035{ 3016{
3036 int col, row, dirnadd, tcol, trow, w1, w2; 3017 int col, row, dirnadd, tcol, trow, w1, w2;
3037 row_col_t bound; 3018 row_col_t bound;
3038 text_t *stp; 3019 text_t *stp;
… …
3112 * EXT: button 3 press; button 1 or 3 drag 3093 * EXT: button 3 press; button 1 or 3 drag
3113 * flag == 0 ==> button 1 3094 * flag == 0 ==> button 1
3114 * flag == 1 ==> button 3 press 3095 * flag == 1 ==> button 3 press
3115 * flag == 2 ==> button 3 motion 3096 * flag == 2 ==> button 3 motion
3116 */ 3097 */
3117void 3098void ecb_cold
3118rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3099rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3119{ 3100{
3120 int col = clamp (Pixel2Col (x), 0, ncol); 3101 int col = clamp (Pixel2Col (x), 0, ncol);
3121 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3102 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3122 3103
… …
3148 3129
3149/* ------------------------------------------------------------------------- */ 3130/* ------------------------------------------------------------------------- */
3150/* 3131/*
3151 * Extend the selection to the specified col/row 3132 * Extend the selection to the specified col/row
3152 */ 3133 */
3153void 3134void ecb_cold
3154rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3135rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3155{ 3136{
3156 row_col_t pos; 3137 row_col_t pos;
3157 enum { 3138 enum {
3158 LEFT, RIGHT 3139 LEFT, RIGHT
… …
3349 ::swap (selection.beg.col, selection.end.col); 3330 ::swap (selection.beg.col, selection.end.col);
3350#endif 3331#endif
3351} 3332}
3352 3333
3353#if !ENABLE_MINIMAL 3334#if !ENABLE_MINIMAL
3354void 3335void ecb_cold
3355rxvt_term::selection_remove_trailing_spaces () NOTHROW 3336rxvt_term::selection_remove_trailing_spaces () NOTHROW
3356{ 3337{
3357 int32_t end_col, end_row; 3338 int32_t end_col, end_row;
3358 text_t *stp; 3339 text_t *stp;
3359 3340
… …
3397/* ------------------------------------------------------------------------- */ 3378/* ------------------------------------------------------------------------- */
3398/* 3379/*
3399 * Double click on button 3 when already selected 3380 * Double click on button 3 when already selected
3400 * EXT: button 3 double click 3381 * EXT: button 3 double click
3401 */ 3382 */
3402void 3383void ecb_cold
3403rxvt_term::selection_rotate (int x, int y) NOTHROW 3384rxvt_term::selection_rotate (int x, int y) NOTHROW
3404{ 3385{
3405 selection.clicks = selection.clicks % 3 + 1; 3386 selection.clicks = selection.clicks % 3 + 1;
3406 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3387 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3407} 3388}
… …
3409/* ------------------------------------------------------------------------- */ 3390/* ------------------------------------------------------------------------- */
3410/* 3391/*
3411 * Respond to a request for our current selection 3392 * Respond to a request for our current selection
3412 * EXT: SelectionRequest 3393 * EXT: SelectionRequest
3413 */ 3394 */
3414void 3395void ecb_cold
3415rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3396rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3416{ 3397{
3417 Atom property = rq.property == None ? rq.target : rq.property; 3398 Atom property = rq.property == None ? rq.target : rq.property;
3418 XSelectionEvent ev; 3399 XSelectionEvent ev;
3419 3400
… …
3552 3533
3553 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3534 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3554} 3535}
3555 3536
3556/* ------------------------------------------------------------------------- */ 3537/* ------------------------------------------------------------------------- */
3557#ifdef USE_XIM 3538#if USE_XIM
3558void 3539void ecb_cold
3559rxvt_term::im_set_position (XPoint &pos) NOTHROW 3540rxvt_term::im_set_position (XPoint &pos) NOTHROW
3560{ 3541{
3561 XWindowAttributes xwa; 3542 XWindowAttributes xwa;
3562 3543
3563 XGetWindowAttributes (dpy, vt, &xwa); 3544 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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