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.428 by sf-exg, Sun Jan 13 17:42:24 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 ();
… …
155/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
158 158
159void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = chunk_alloc (chunk_size, 0);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
160rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
161{ 195{
162#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
163 scr_overlay_off (); 197 scr_overlay_off ();
164#endif 198#endif
… …
190 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
191 225
192 screen.tscroll = 0; 226 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
194 228
229 void *prev_chunk = chunk;
230 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf;
234
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc ();
238
195 if (!row_buf) 239 if (!prev_row_buf)
196 { 240 {
197 /* 241 /*
198 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
199 */ 243 */
200 top_row = 0; 244 top_row = 0;
201 term_start = 0; 245 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 246
217 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
220 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
243 { 273 {
244 /* 274 /*
245 * add or delete rows as appropriate 275 * add or delete rows as appropriate
246 */ 276 */
247 277
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--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
266 { 279 {
267 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 }
270 282
271 for (int row = prev_nrow; row < nrow; row++) 283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
286 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
272 { 287 }
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 288
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 289 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 290 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 291 int q = total_rows; // rewrapped row
283 292
… …
291 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 300 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
292 301
293 do 302 do
294 { 303 {
295 p = MOD (p - 1, prev_total_rows); 304 p = MOD (p - 1, prev_total_rows);
296 assert (old_buf [MOD (p, prev_total_rows)].t); 305 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297 int plines = 1; 306 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l; 307 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
299 308
300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 309 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301 { 310 {
302 p = MOD (p - 1, prev_total_rows); 311 p = MOD (p - 1, prev_total_rows);
303 312
304 plines++; 313 plines++;
305 llen += prev_ncol; 314 llen += prev_ncol;
… …
318 327
319 // re-assemble the full line by destination lines 328 // re-assemble the full line by destination lines
320 for (int qrow = q; qlines--; qrow++) 329 for (int qrow = q; qlines--; qrow++)
321 { 330 {
322 qline = row_buf + qrow; 331 qline = row_buf + qrow;
323 lalloc (*qline); 332 qline->alloc (); // redundant with next line
324 qline->l = ncol; 333 qline->l = ncol;
325 qline->is_longer (1); 334 qline->is_longer (1);
326 335
327 int qcol = 0; 336 int qcol = 0;
328 337
… …
343 // this seems to upset applications/shells/readline 352 // this seems to upset applications/shells/readline
344 // least. 353 // least.
345 if (prow == ocur.row) 354 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow); 355 screen.cur.row = q - (total_rows - nrow);
347 356
348 line_t &pline = old_buf [prow]; 357 line_t &pline = prev_row_buf [prow];
349 358
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 359 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 360
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 361 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 362 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
374 { 383 {
375 // if no scrollback exists (yet), wing, instead of wrap 384 // if no scrollback exists (yet), wing, instead of wrap
376 385
377 for (int row = min (nrow, prev_nrow); row--; ) 386 for (int row = min (nrow, prev_nrow); row--; )
378 { 387 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 388 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row]; 389 line_t &dst = row_buf [row];
381 390
382 qline = pline; 391 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
383 lresize (qline); 392
393 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
394 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
395 dst.l = common_col;
384 } 396 }
385 397
386 for (int row = prev_nrow; row < nrow; row++) 398 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 399 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390 400
391 term_start = 0; 401 term_start = 0;
392 } 402 }
393
394 free (old_buf);
395 delete old_ta;
396 delete old_ra;
397 403
398 clamp_it (screen.cur.row, 0, nrow - 1); 404 clamp_it (screen.cur.row, 0, nrow - 1);
399 clamp_it (screen.cur.col, 0, ncol - 1); 405 clamp_it (screen.cur.col, 0, ncol - 1);
400 } 406 }
401 407
408 for (int row = nrow; row--; )
409 {
410 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
411 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
412 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
413 }
414
415 chunk_free (prev_chunk, prev_chunk_size);
416
402 free (tabs); 417 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol); 418 tabs = (char *)rxvt_malloc (ncol);
404 419
405 for (int col = ncol; col--; ) 420 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0; 421 tabs [col] = col % TABSIZE == 0;
407 422
408 CLEAR_SELECTION (); 423 CLEAR_ALL_SELECTION ();
409 CLEAR_SELECTION_MARK ();
410 424
411 prev_nrow = nrow; 425 prev_nrow = nrow;
412 prev_ncol = ncol; 426 prev_ncol = ncol;
413 427
414 tt_winch (); 428 tt_winch ();
415 429
416 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 430 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
417} 431}
418 432
419/* ------------------------------------------------------------------------- */ 433void ecb_cold
420/*
421 * Free everything. That way malloc debugging can find leakage.
422 */
423void
424rxvt_term::scr_release () NOTHROW 434rxvt_term::scr_release () NOTHROW
425{ 435{
426 if (row_buf) 436 chunk_free (chunk, chunk_size);
427 { 437 chunk = 0;
428 delete talloc; talloc = 0; 438 row_buf = 0;
429 delete ralloc; ralloc = 0;
430 439
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); 440 free (tabs);
437 tabs = 0; 441 tabs = 0;
438 }
439} 442}
440 443
441/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
442/* 445/*
443 * Hard/Soft reset 446 * Hard/Soft reset
444 */ 447 */
445void 448void ecb_cold
446rxvt_term::scr_poweron () 449rxvt_term::scr_poweron ()
447{ 450{
448 scr_release (); 451 scr_release ();
452
449 prev_nrow = prev_ncol = 0; 453 prev_nrow = prev_ncol = 0;
450 rvideo_mode = false; 454 rvideo_mode = false;
451 scr_soft_reset (); 455 scr_soft_reset ();
452 scr_reset (); 456 scr_reset ();
453 457
454 scr_clear (true); 458 scr_clear (true);
455 scr_refresh (); 459 scr_refresh ();
456} 460}
457 461
458void 462void ecb_cold
459rxvt_term::scr_soft_reset () 463rxvt_term::scr_soft_reset () NOTHROW
460{ 464{
461 /* only affects modes, nothing drastic such as clearing the screen */ 465 /* only affects modes, nothing drastic such as clearing the screen */
462#if ENABLE_OVERLAY 466#if ENABLE_OVERLAY
463 scr_overlay_off (); 467 scr_overlay_off ();
464#endif 468#endif
… …
519 assert (s->cur.row >= 0); 523 assert (s->cur.row >= 0);
520 assert (s->cur.col >= 0); 524 assert (s->cur.col >= 0);
521} 525}
522 526
523void 527void
524rxvt_term::scr_swap_screen () 528rxvt_term::scr_swap_screen () NOTHROW
525{ 529{
526 if (!option (Opt_secondaryScreen)) 530 if (!option (Opt_secondaryScreen))
527 return; 531 return;
528 532
529 for (int i = prev_nrow; i--; ) 533 for (int i = prev_nrow; i--; )
… …
548 return; 552 return;
549 553
550 want_refresh = 1; 554 want_refresh = 1;
551 view_start = 0; 555 view_start = 0;
552 556
553 selection_check (2); /* check for boundary cross */ 557 /* check for boundary cross */
558 row_col_t pos;
559 pos.row = pos.col = 0;
560 if (ROWCOL_IS_BEFORE (selection.beg, pos)
561 && ROWCOL_IS_AFTER (selection.end, pos))
562 CLEAR_SELECTION ();
554 563
555 current_screen = scrn; 564 current_screen = scrn;
556 565
557#if NSCREENS 566#if NSCREENS
558 if (option (Opt_secondaryScreen)) 567 if (option (Opt_secondaryScreen))
… …
624/* 633/*
625 * Scroll text between <row1> and <row2> inclusive, by <count> lines 634 * Scroll text between <row1> and <row2> inclusive, by <count> lines
626 * count positive ==> scroll up 635 * count positive ==> scroll up
627 * count negative ==> scroll down 636 * count negative ==> scroll down
628 */ 637 */
629int 638int ecb_hot
630rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 639rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
631{ 640{
632 if (count == 0 || (row1 > row2)) 641 if (count == 0 || (row1 > row2))
633 return 0; 642 return 0;
634 643
… …
711 || (selection.beg.row - count < row1 && selection.beg.row >= row1) 720 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
712 || (selection.beg.row - count > row2 && selection.beg.row <= row2) 721 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
713 || (selection.end.row - count < row1 && selection.end.row >= row1) 722 || (selection.end.row - count < row1 && selection.end.row >= row1)
714 || (selection.end.row - count > row2 && selection.end.row <= row2)) 723 || (selection.end.row - count > row2 && selection.end.row <= row2))
715 { 724 {
716 CLEAR_SELECTION (); 725 CLEAR_ALL_SELECTION ();
717 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow)) 726 selection.op = SELECTION_CLEAR;
718 CLEAR_SELECTION_MARK ();
719 } 727 }
720 else if (selection.end.row >= row1 && selection.end.row <= row2) 728 else if (selection.end.row >= row1 && selection.end.row <= row2)
721 { 729 {
722 /* move selected region too */ 730 /* move selected region too */
723 selection.beg.row -= count; 731 selection.beg.row -= count;
… …
769 777
770/* ------------------------------------------------------------------------- */ 778/* ------------------------------------------------------------------------- */
771/* 779/*
772 * Add text given in <str> of length <len> to screen struct 780 * Add text given in <str> of length <len> to screen struct
773 */ 781 */
774void 782void ecb_hot
775rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 783rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
776{ 784{
777 if (len <= 0) /* sanity */ 785 if (len <= 0) /* sanity */
778 return; 786 return;
779 787
… …
1129 * XTERM_SEQ: ESC 6 1137 * XTERM_SEQ: ESC 6
1130 * Move cursor left in row. If we're at the left boundary, shift everything 1138 * Move cursor left in row. If we're at the left boundary, shift everything
1131 * in that row right. Clear left column. 1139 * in that row right. Clear left column.
1132 */ 1140 */
1133#if !ENABLE_MINIMAL 1141#if !ENABLE_MINIMAL
1134void 1142void ecb_cold
1135rxvt_term::scr_backindex () NOTHROW 1143rxvt_term::scr_backindex () NOTHROW
1136{ 1144{
1137 if (screen.cur.col > 0) 1145 if (screen.cur.col > 0)
1138 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1146 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1139 else 1147 else
… …
1146 * XTERM_SEQ: ESC 9 1154 * XTERM_SEQ: ESC 9
1147 * Move cursor right in row. If we're at the right boundary, shift everything 1155 * Move cursor right in row. If we're at the right boundary, shift everything
1148 * in that row left. Clear right column. 1156 * in that row left. Clear right column.
1149 */ 1157 */
1150#if !ENABLE_MINIMAL 1158#if !ENABLE_MINIMAL
1151void 1159void ecb_cold
1152rxvt_term::scr_forwardindex () NOTHROW 1160rxvt_term::scr_forwardindex () NOTHROW
1153{ 1161{
1154 if (screen.cur.col < ncol - 1) 1162 if (screen.cur.col < ncol - 1)
1155 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1163 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1156 else 1164 else
… …
1307 scr_blank_line (line, col, num, rstyle); 1315 scr_blank_line (line, col, num, rstyle);
1308} 1316}
1309 1317
1310/* ------------------------------------------------------------------------- */ 1318/* ------------------------------------------------------------------------- */
1311/* 1319/*
1312 * Erase part of whole of the screen 1320 * Erase part or whole of the screen
1313 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1321 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1314 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1322 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1315 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1323 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1316 */ 1324 */
1317void 1325void
… …
1326 ZERO_SCROLLBACK (); 1334 ZERO_SCROLLBACK ();
1327 1335
1328 switch (mode) 1336 switch (mode)
1329 { 1337 {
1330 case 0: /* erase to end of screen */ 1338 case 0: /* erase to end of screen */
1331 selection_check (1);
1332 scr_erase_line (0); 1339 scr_erase_line (0);
1333 row = screen.cur.row + 1; /* possible OOB */ 1340 row = screen.cur.row + 1; /* possible OOB */
1334 num = nrow - row; 1341 num = nrow - row;
1335 break; 1342 break;
1336 case 1: /* erase to beginning of screen */ 1343 case 1: /* erase to beginning of screen */
1337 selection_check (3);
1338 scr_erase_line (1); 1344 scr_erase_line (1);
1339 row = 0; 1345 row = 0;
1340 num = screen.cur.row; 1346 num = screen.cur.row;
1341 break; 1347 break;
1342 case 2: /* erase whole screen */ 1348 case 2: /* erase whole screen */
1343 selection_check (3);
1344 row = 0; 1349 row = 0;
1345 num = nrow; 1350 num = nrow;
1346 break; 1351 break;
1347 default: 1352 default:
1348 return; 1353 return;
… …
1365 { 1370 {
1366 ren = DEFAULT_RSTYLE; 1371 ren = DEFAULT_RSTYLE;
1367 1372
1368 if (mapped) 1373 if (mapped)
1369 XClearArea (dpy, vt, 0, 1374 XClearArea (dpy, vt, 0,
1370 Row2Pixel (row - view_start), (unsigned int)width, 1375 Row2Pixel (row - view_start), (unsigned int)vt_width,
1371 (unsigned int)Height2Pixel (num), False); 1376 (unsigned int)Height2Pixel (num), False);
1372 } 1377 }
1373 else 1378 else
1374 { 1379 {
1375 ren = rstyle & (RS_fgMask | RS_bgMask); 1380 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1378 { 1383 {
1379 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1384 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1380 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1381 XFillRectangle (dpy, vt, gc, 1386 XFillRectangle (dpy, vt, gc,
1382 0, Row2Pixel (row - view_start), 1387 0, Row2Pixel (row - view_start),
1383 (unsigned int)width, 1388 (unsigned int)vt_width,
1384 (unsigned int)Height2Pixel (num)); 1389 (unsigned int)Height2Pixel (num));
1385 gcvalue.foreground = pix_colors[Color_fg]; 1390 gcvalue.foreground = pix_colors[Color_fg];
1386 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1391 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1387 } 1392 }
1388 } 1393 }
… …
1410/* ------------------------------------------------------------------------- */ 1415/* ------------------------------------------------------------------------- */
1411/* 1416/*
1412 * Fill the screen with `E's 1417 * Fill the screen with `E's
1413 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1418 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1414 */ 1419 */
1415void 1420void ecb_cold
1416rxvt_term::scr_E () NOTHROW 1421rxvt_term::scr_E () NOTHROW
1417{ 1422{
1418 rend_t fs; 1423 rend_t fs;
1419 1424
1420 want_refresh = 1; 1425 want_refresh = 1;
1421 ZERO_SCROLLBACK (); 1426 ZERO_SCROLLBACK ();
1422 1427
1423 num_scr_allow = 0; 1428 num_scr_allow = 0;
1424 selection_check (3); 1429
1430 row_col_t pos;
1431 pos.row = pos.col = 0;
1432 if (ROWCOL_IS_AFTER (selection.end, pos))
1433 CLEAR_SELECTION ();
1425 1434
1426 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1427 for (int row = nrow; row--; ) 1436 for (int row = nrow; row--; )
1428 { 1437 {
1429 line_t &line = ROW(row); 1438 line_t &line = ROW(row);
… …
1580/* ------------------------------------------------------------------------- */ 1589/* ------------------------------------------------------------------------- */
1581/* 1590/*
1582 * Set the scrolling region 1591 * Set the scrolling region
1583 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1592 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1584 */ 1593 */
1585void 1594void ecb_cold
1586rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1595rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1587{ 1596{
1588 max_it (top, 0); 1597 max_it (top, 0);
1589 min_it (bot, nrow - 1); 1598 min_it (bot, nrow - 1);
1590 1599
… …
1600/* 1609/*
1601 * Make the cursor visible/invisible 1610 * Make the cursor visible/invisible
1602 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1611 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1603 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1612 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1604 */ 1613 */
1605void 1614void ecb_cold
1606rxvt_term::scr_cursor_visible (int mode) NOTHROW 1615rxvt_term::scr_cursor_visible (int mode) NOTHROW
1607{ 1616{
1608 want_refresh = 1; 1617 want_refresh = 1;
1609 1618
1610 if (mode) 1619 if (mode)
… …
1617/* 1626/*
1618 * Set/unset automatic wrapping 1627 * Set/unset automatic wrapping
1619 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1628 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1620 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1629 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1621 */ 1630 */
1622void 1631void ecb_cold
1623rxvt_term::scr_autowrap (int mode) NOTHROW 1632rxvt_term::scr_autowrap (int mode) NOTHROW
1624{ 1633{
1625 if (mode) 1634 if (mode)
1626 screen.flags |= Screen_Autowrap; 1635 screen.flags |= Screen_Autowrap;
1627 else 1636 else
… …
1636 * Relative mode: line numbers are relative to top margin of scrolling region 1645 * Relative mode: line numbers are relative to top margin of scrolling region
1637 * and the cursor cannot be moved outside. 1646 * and the cursor cannot be moved outside.
1638 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1647 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1639 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1648 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1640 */ 1649 */
1641void 1650void ecb_cold
1642rxvt_term::scr_relative_origin (int mode) NOTHROW 1651rxvt_term::scr_relative_origin (int mode) NOTHROW
1643{ 1652{
1644 if (mode) 1653 if (mode)
1645 screen.flags |= Screen_Relative; 1654 screen.flags |= Screen_Relative;
1646 else 1655 else
… …
1653/* 1662/*
1654 * Set insert/replace mode 1663 * Set insert/replace mode
1655 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1664 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1656 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1665 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1657 */ 1666 */
1658void 1667void ecb_cold
1659rxvt_term::scr_insert_mode (int mode) NOTHROW 1668rxvt_term::scr_insert_mode (int mode) NOTHROW
1660{ 1669{
1661 if (mode) 1670 if (mode)
1662 screen.flags |= Screen_Insert; 1671 screen.flags |= Screen_Insert;
1663 else 1672 else
… …
1669 * Set/Unset tabs 1678 * Set/Unset tabs
1670 * XTERM_SEQ: Set tab at current column : ESC H 1679 * XTERM_SEQ: Set tab at current column : ESC H
1671 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1680 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1672 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1681 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1673 */ 1682 */
1674void 1683void ecb_cold
1675rxvt_term::scr_set_tab (int mode) NOTHROW 1684rxvt_term::scr_set_tab (int mode) NOTHROW
1676{ 1685{
1677 if (mode < 0) 1686 if (mode < 0)
1678 memset (tabs, 0, ncol); 1687 memset (tabs, 0, ncol);
1679 else if (screen.cur.col < ncol) 1688 else if (screen.cur.col < ncol)
… …
1698 if (rvideo_state != on) 1707 if (rvideo_state != on)
1699 { 1708 {
1700 rvideo_state = on; 1709 rvideo_state = on;
1701 1710
1702 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1703#ifdef HAVE_BG_PIXMAP 1712#ifdef HAVE_IMG
1704 if (bg_pixmap == None) 1713 if (bg_img == 0)
1705#endif 1714#endif
1706 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1707 1716
1708 XGCValues gcvalue; 1717 XGCValues gcvalue;
1709 gcvalue.foreground = pix_colors[Color_fg]; 1718 gcvalue.foreground = pix_colors[Color_fg];
… …
1718/* ------------------------------------------------------------------------- */ 1727/* ------------------------------------------------------------------------- */
1719/* 1728/*
1720 * Report current cursor position 1729 * Report current cursor position
1721 * XTERM_SEQ: Report position: ESC [ 6 n 1730 * XTERM_SEQ: Report position: ESC [ 6 n
1722 */ 1731 */
1723void 1732void ecb_cold
1724rxvt_term::scr_report_position () NOTHROW 1733rxvt_term::scr_report_position () NOTHROW
1725{ 1734{
1726 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1735 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1727} 1736}
1728 1737
… …
1731 * ------------------------------------------------------------------------- */ 1740 * ------------------------------------------------------------------------- */
1732 1741
1733/* 1742/*
1734 * Set font style 1743 * Set font style
1735 */ 1744 */
1736void 1745void ecb_cold
1737rxvt_term::set_font_style () NOTHROW 1746rxvt_term::set_font_style () NOTHROW
1738{ 1747{
1739#if 0 1748#if 0
1740 switch (charsets [screen.charset]) 1749 switch (charsets [screen.charset])
1741 { 1750 {
… …
1763 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1772 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1764 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1773 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1765 * XTERM_SEQ: Invoke G2 character set: ESC N 1774 * XTERM_SEQ: Invoke G2 character set: ESC N
1766 * XTERM_SEQ: Invoke G3 character set: ESC O 1775 * XTERM_SEQ: Invoke G3 character set: ESC O
1767 */ 1776 */
1768void 1777void ecb_cold
1769rxvt_term::scr_charset_choose (int set) NOTHROW 1778rxvt_term::scr_charset_choose (int set) NOTHROW
1770{ 1779{
1771 screen.charset = set; 1780 screen.charset = set;
1772 set_font_style (); 1781 set_font_style ();
1773} 1782}
… …
1794 * ------------------------------------------------------------------------- */ 1803 * ------------------------------------------------------------------------- */
1795 1804
1796/* 1805/*
1797 * refresh matching text. 1806 * refresh matching text.
1798 */ 1807 */
1799bool 1808bool ecb_cold
1800rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1809rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1801{ 1810{
1802 bool found = false; 1811 bool found = false;
1803 1812
1804 for (int i = 0; i < nrow; i++) 1813 for (int i = 0; i < nrow; i++)
… …
1823 PART_BEG = 0, 1832 PART_BEG = 0,
1824 PART_END, 1833 PART_END,
1825 RC_COUNT 1834 RC_COUNT
1826}; 1835};
1827 1836
1828void 1837void ecb_hot
1829rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1838rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1830{ 1839{
1831 int i; 1840 int i;
1832 row_col_t rc[RC_COUNT]; 1841 row_col_t rc[RC_COUNT];
1833 1842
… …
1870 * Refresh the entire screen 1879 * Refresh the entire screen
1871 */ 1880 */
1872void 1881void
1873rxvt_term::scr_touch (bool refresh) NOTHROW 1882rxvt_term::scr_touch (bool refresh) NOTHROW
1874{ 1883{
1875 scr_expose (0, 0, width, height, refresh); 1884 scr_expose (0, 0, vt_width, vt_height, refresh);
1876} 1885}
1877 1886
1878/* ------------------------------------------------------------------------- */ 1887/* ------------------------------------------------------------------------- */
1879/* 1888/*
1880 * Move the display so that the line represented by scrollbar value Y is at 1889 * Move the display so that the line represented by scrollbar value Y is at
… …
1959 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1968 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1960#endif 1969#endif
1961} 1970}
1962 1971
1963/* ------------------------------------------------------------------------- */ 1972/* ------------------------------------------------------------------------- */
1964void 1973void ecb_cold
1965rxvt_term::scr_printscreen (int fullhist) NOTHROW 1974rxvt_term::scr_printscreen (int fullhist) NOTHROW
1966{ 1975{
1967#ifdef PRINTPIPE 1976#ifdef PRINTPIPE
1968 int nrows, row_start; 1977 int nrows, row_start;
1969 FILE *fd = popen_printer (); 1978 FILE *fd = popen_printer ();
… …
2018/* 2027/*
2019 * Refresh the screen 2028 * Refresh the screen
2020 * drawn_text/drawn_rend contain the screen information before the update. 2029 * drawn_text/drawn_rend contain the screen information before the update.
2021 * screen.text/screen.rend contain what the screen will change to. 2030 * screen.text/screen.rend contain what the screen will change to.
2022 */ 2031 */
2023void 2032void ecb_hot
2024rxvt_term::scr_refresh () NOTHROW 2033rxvt_term::scr_refresh () NOTHROW
2025{ 2034{
2026 int16_t col, row, /* column/row we're processing */ 2035 int16_t col, row, /* column/row we're processing */
2027 ocrow; /* old cursor row */ 2036 ocrow; /* old cursor row */
2028 int i; /* tmp */ 2037 int i; /* tmp */
… …
2043 */ 2052 */
2044 refresh_count = 0; 2053 refresh_count = 0;
2045 2054
2046 unsigned int old_screen_flags = screen.flags; 2055 unsigned int old_screen_flags = screen.flags;
2047 bool have_bg = 0; 2056 bool have_bg = 0;
2048#ifdef HAVE_BG_PIXMAP 2057#ifdef HAVE_IMG
2049 have_bg = bg_pixmap != None; 2058 have_bg = bg_img != 0;
2050#endif 2059#endif
2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2052 2061
2053 /* 2062 /*
2054 * B: reverse any characters which are selected 2063 * B: reverse any characters which are selected
… …
2161 { 2170 {
2162 int16_t nits; 2171 int16_t nits;
2163 int i = num_scr; 2172 int i = num_scr;
2164 int j; 2173 int j;
2165 int len, wlen; 2174 int len, wlen;
2166 dLocal (int, num_scr);
2167 2175
2168 j = nrow; 2176 j = nrow;
2169 wlen = len = -1; 2177 wlen = len = -1;
2170 row = i > 0 ? 0 : j - 1; 2178 row = i > 0 ? 0 : j - 1;
2171 2179
… …
2476 2484
2477 XDrawRectangle (dpy, vt, gc, 2485 XDrawRectangle (dpy, vt, gc,
2478 Col2Pixel (col), 2486 Col2Pixel (col),
2479 Row2Pixel (oldcursor.row), 2487 Row2Pixel (oldcursor.row),
2480 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2488 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2481 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2489 (unsigned int) (Height2Pixel (1) - 1));
2482 } 2490 }
2483 } 2491 }
2484 2492
2485 /* 2493 /*
2486 * H: cleanup selection 2494 * H: cleanup selection
… …
2495 screen.flags = old_screen_flags; 2503 screen.flags = old_screen_flags;
2496 num_scr = 0; 2504 num_scr = 0;
2497 num_scr_allow = 1; 2505 num_scr_allow = 1;
2498} 2506}
2499 2507
2500void 2508void ecb_cold
2501rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2509rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2502{ 2510{
2503 if (!l.t) 2511 if (!l.valid ())
2504 return; 2512 return;
2505 2513
2506 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2514 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2507 2515
2508 for (int i = ncol; i--; ) 2516 for (int i = ncol; i--; )
2509 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2517 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2510} 2518}
2511 2519
2512void 2520void ecb_cold
2513rxvt_term::scr_remap_chars () NOTHROW 2521rxvt_term::scr_remap_chars () NOTHROW
2514{ 2522{
2515 for (int i = total_rows; i--; ) 2523 for (int i = total_rows; i--; )
2516 scr_remap_chars (row_buf [i]); 2524 scr_remap_chars (row_buf [i]);
2517 2525
… …
2520 scr_remap_chars (drawn_buf [i]); 2528 scr_remap_chars (drawn_buf [i]);
2521 scr_remap_chars (swap_buf [i]); 2529 scr_remap_chars (swap_buf [i]);
2522 } 2530 }
2523} 2531}
2524 2532
2525void 2533void ecb_cold
2526rxvt_term::scr_recolour (bool refresh) NOTHROW 2534rxvt_term::scr_recolour (bool refresh) NOTHROW
2527{ 2535{
2528 bool transparent = false; 2536 bool transparent = false;
2529 2537
2530#ifdef HAVE_BG_PIXMAP 2538#ifdef HAVE_IMG
2531 if (bg_pixmap != None) 2539 if (bg_img != 0)
2532 { 2540 {
2533# ifdef ENABLE_TRANSPARENCY 2541# if ENABLE_TRANSPARENCY
2534 if (bg_flags & BG_IS_TRANSPARENT) 2542 if (bg_flags & BG_IS_TRANSPARENT)
2535 { 2543 {
2536 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2544 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2537 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2545 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2538 2546
2539 transparent = true; 2547 transparent = true;
2540 } 2548 }
2541 else 2549 else
2542# endif 2550# endif
2543 { 2551 {
2544 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2552 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2545 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2553 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2546 } 2554 }
2547 } 2555 }
2548 else 2556 else
2549#endif 2557#endif
2550 { 2558 {
… …
2557 if (scrollBar.win) 2565 if (scrollBar.win)
2558 { 2566 {
2559 if (transparent) 2567 if (transparent)
2560 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2568 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2561 else 2569 else
2562 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2570 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2563 scrollBar.state = SB_STATE_IDLE; 2571 scrollBar.state = SB_STATE_IDLE;
2564 scrollBar.show (0); 2572 scrollBar.show (0);
2565 } 2573 }
2566 2574
2567 if (refresh) 2575 if (refresh)
… …
2633 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2641 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2634 srp[col] ^= rstyle; 2642 srp[col] ^= rstyle;
2635} 2643}
2636 2644
2637/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2638void 2646void ecb_hot
2639rxvt_term::scr_reverse_selection () NOTHROW 2647rxvt_term::scr_reverse_selection () NOTHROW
2640{ 2648{
2641 if (selection.op 2649 if (selection.op
2642 && current_screen == selection.screen 2650 && current_screen == selection.screen
2643 && selection.end.row >= view_start) 2651 && selection.end.row >= view_start)
… …
2662 */ 2670 */
2663#if 0 2671#if 0
2664void 2672void
2665rxvt_term::scr_dump (int fd) NOTHROW 2673rxvt_term::scr_dump (int fd) NOTHROW
2666{ 2674{
2667 int row, wrote; 2675 // if this method is needed, it can be implemented by factoring the
2668 unsigned int width, towrite; 2676 // 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} 2677}
2688#endif 2678#endif
2689 2679
2690/* ------------------------------------------------------------------------- * 2680/* ------------------------------------------------------------------------- *
2691 * CHARACTER SELECTION * 2681 * CHARACTER SELECTION *
… …
2694rxvt_term::selection_check (int check_more) NOTHROW 2684rxvt_term::selection_check (int check_more) NOTHROW
2695{ 2685{
2696 if (!selection.op) 2686 if (!selection.op)
2697 return; 2687 return;
2698 2688
2699 row_col_t pos;
2700 pos.row = pos.col = 0;
2701
2702 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2703 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2704 || (check_more == 1 2692 || (check_more == 1
2705 && current_screen == selection.screen 2693 && current_screen == selection.screen
2706 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2707 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2695 && 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 (); 2696 CLEAR_ALL_SELECTION ();
2714
2715 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))
2716 CLEAR_SELECTION_MARK ();
2717} 2697}
2718 2698
2719/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2720/* 2700/*
2721 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
… …
2727 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2728 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2729 data[i] = C0_CR; 2709 data[i] = C0_CR;
2730 2710
2731 if (priv_modes & PrivMode_BracketPaste) 2711 if (priv_modes & PrivMode_BracketPaste)
2732 tt_printf ("\e[200~"); 2712 tt_printf ("\x1b[200~");
2733 2713
2734 tt_write (data, len); 2714 tt_write (data, len);
2735 2715
2736 if (priv_modes & PrivMode_BracketPaste) 2716 if (priv_modes & PrivMode_BracketPaste)
2737 tt_printf ("\e[201~"); 2717 tt_printf ("\x1b[201~");
2738} 2718}
2739 2719
2740void 2720void
2741rxvt_term::paste (char *data, unsigned int len) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2742{ 2722{
… …
2962/* ------------------------------------------------------------------------- */ 2942/* ------------------------------------------------------------------------- */
2963/* 2943/*
2964 * Mark or select text based upon number of clicks: 1, 2, or 3 2944 * Mark or select text based upon number of clicks: 1, 2, or 3
2965 * EXT: button 1 press 2945 * EXT: button 1 press
2966 */ 2946 */
2967void 2947void ecb_cold
2968rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2969{ 2949{
2970 clicks = ((clicks - 1) % 3) + 1; 2950 clicks = ((clicks - 1) % 3) + 1;
2971 selection.clicks = clicks; /* save clicks so extend will work */ 2951 selection.clicks = clicks; /* save clicks so extend will work */
2972 2952
… …
2991 2971
2992/* ------------------------------------------------------------------------- */ 2972/* ------------------------------------------------------------------------- */
2993/* 2973/*
2994 * Mark a selection at the specified col/row 2974 * Mark a selection at the specified col/row
2995 */ 2975 */
2996void 2976void ecb_cold
2997rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2998{ 2978{
2999 want_refresh = 1; 2979 want_refresh = 1;
3000 2980
3001 selection.mark.row = row + view_start; 2981 selection.mark.row = row + view_start;
… …
3028/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3008/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3029#define DELIMIT_TEXT(x) \ 3009#define DELIMIT_TEXT(x) \
3030 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3010 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3031#define DELIMIT_REND(x) 1 3011#define DELIMIT_REND(x) 1
3032 3012
3033void 3013void ecb_cold
3034rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3014rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3035{ 3015{
3036 int col, row, dirnadd, tcol, trow, w1, w2; 3016 int col, row, dirnadd, tcol, trow, w1, w2;
3037 row_col_t bound; 3017 row_col_t bound;
3038 text_t *stp; 3018 text_t *stp;
… …
3112 * EXT: button 3 press; button 1 or 3 drag 3092 * EXT: button 3 press; button 1 or 3 drag
3113 * flag == 0 ==> button 1 3093 * flag == 0 ==> button 1
3114 * flag == 1 ==> button 3 press 3094 * flag == 1 ==> button 3 press
3115 * flag == 2 ==> button 3 motion 3095 * flag == 2 ==> button 3 motion
3116 */ 3096 */
3117void 3097void ecb_cold
3118rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3119{ 3099{
3120 int col = clamp (Pixel2Col (x), 0, ncol); 3100 int col = clamp (Pixel2Col (x), 0, ncol);
3121 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3101 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3122 3102
… …
3148 3128
3149/* ------------------------------------------------------------------------- */ 3129/* ------------------------------------------------------------------------- */
3150/* 3130/*
3151 * Extend the selection to the specified col/row 3131 * Extend the selection to the specified col/row
3152 */ 3132 */
3153void 3133void ecb_cold
3154rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3134rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3155{ 3135{
3156 row_col_t pos; 3136 row_col_t pos;
3157 enum { 3137 enum {
3158 LEFT, RIGHT 3138 LEFT, RIGHT
… …
3349 ::swap (selection.beg.col, selection.end.col); 3329 ::swap (selection.beg.col, selection.end.col);
3350#endif 3330#endif
3351} 3331}
3352 3332
3353#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3354void 3334void ecb_cold
3355rxvt_term::selection_remove_trailing_spaces () NOTHROW 3335rxvt_term::selection_remove_trailing_spaces () NOTHROW
3356{ 3336{
3357 int32_t end_col, end_row; 3337 int32_t end_col, end_row;
3358 text_t *stp; 3338 text_t *stp;
3359 3339
… …
3397/* ------------------------------------------------------------------------- */ 3377/* ------------------------------------------------------------------------- */
3398/* 3378/*
3399 * Double click on button 3 when already selected 3379 * Double click on button 3 when already selected
3400 * EXT: button 3 double click 3380 * EXT: button 3 double click
3401 */ 3381 */
3402void 3382void ecb_cold
3403rxvt_term::selection_rotate (int x, int y) NOTHROW 3383rxvt_term::selection_rotate (int x, int y) NOTHROW
3404{ 3384{
3405 selection.clicks = selection.clicks % 3 + 1; 3385 selection.clicks = selection.clicks % 3 + 1;
3406 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3407} 3387}
… …
3409/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3410/* 3390/*
3411 * Respond to a request for our current selection 3391 * Respond to a request for our current selection
3412 * EXT: SelectionRequest 3392 * EXT: SelectionRequest
3413 */ 3393 */
3414void 3394void ecb_cold
3415rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3416{ 3396{
3417 Atom property = rq.property == None ? rq.target : rq.property; 3397 Atom property = rq.property == None ? rq.target : rq.property;
3418 XSelectionEvent ev; 3398 XSelectionEvent ev;
3419 3399
… …
3552 3532
3553 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3554} 3534}
3555 3535
3556/* ------------------------------------------------------------------------- */ 3536/* ------------------------------------------------------------------------- */
3557#ifdef USE_XIM 3537#if USE_XIM
3558void 3538void ecb_cold
3559rxvt_term::im_set_position (XPoint &pos) NOTHROW 3539rxvt_term::im_set_position (XPoint &pos) NOTHROW
3560{ 3540{
3561 XWindowAttributes xwa; 3541 XWindowAttributes xwa;
3562 3542
3563 XGetWindowAttributes (dpy, vt, &xwa); 3543 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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