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

Diff Legend

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