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.394 by sf-exg, Thu Sep 1 08:11:27 2011 UTC vs.
Revision 1.430 by root, Sun Jan 13 20:16:40 2013 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a separate compile!
34
35static inline void 33static inline void
36fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
37{ 35{
38 while (len--) 36 while (len--)
39 *start++ = value; 37 *start++ = value;
… …
98 96
99/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
100void 98void
101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
102{ 100{
103 if (!l.t) 101 if (!l.valid ())
104 { 102 {
105 lalloc (l); 103 l.alloc ();
106 col = 0; 104 col = 0;
107 width = ncol; 105 width = ncol;
108 } 106 }
109 107
110 l.touch (); 108 l.touch ();
… …
157/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
160 158
161void 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
162rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
163{ 195{
164#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
165 scr_overlay_off (); 197 scr_overlay_off ();
166#endif 198#endif
… …
192 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
193 225
194 screen.tscroll = 0; 226 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
196 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
197 if (!row_buf) 239 if (!prev_row_buf)
198 { 240 {
199 /* 241 /*
200 * 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
201 */ 243 */
202 top_row = 0; 244 top_row = 0;
203 term_start = 0; 245 term_start = 0;
204
205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
207
208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211
212 for (int row = nrow; row--; )
213 {
214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
216 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
217 }
218 246
219 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
245 { 273 {
246 /* 274 /*
247 * add or delete rows as appropriate 275 * add or delete rows as appropriate
248 */ 276 */
249 277
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253#if 0
254 if (nrow < prev_nrow)
255 {
256 for (int row = nrow; row < prev_nrow; row++)
257 {
258 lfree (swap_buf [row]);
259 lfree (drawn_buf[row]);
260 }
261 }
262#endif
263
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266
267 for (int row = min (nrow, prev_nrow); row--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
268 { 279 {
269 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 }
272 282
273 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 = min (prev_swap_buf [row].l, ncol);
289 swap_buf [row].f = prev_swap_buf [row].f;
274 { 290 }
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 }
278
279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
281 291
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 292 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 293 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 294 int q = total_rows; // rewrapped row
285 295
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 303 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 304
295 do 305 do
296 { 306 {
297 p = MOD (p - 1, prev_total_rows); 307 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 308 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 309 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 310 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 311
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 312 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 313 {
304 p = MOD (p - 1, prev_total_rows); 314 p = MOD (p - 1, prev_total_rows);
305 315
306 plines++; 316 plines++;
307 llen += prev_ncol; 317 llen += prev_ncol;
… …
320 330
321 // re-assemble the full line by destination lines 331 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 332 for (int qrow = q; qlines--; qrow++)
323 { 333 {
324 qline = row_buf + qrow; 334 qline = row_buf + qrow;
325 lalloc (*qline); 335 qline->alloc (); // redundant with next line
326 qline->l = ncol; 336 qline->l = ncol;
327 qline->is_longer (1); 337 qline->is_longer (1);
328 338
329 int qcol = 0; 339 int qcol = 0;
330 340
… …
345 // this seems to upset applications/shells/readline 355 // this seems to upset applications/shells/readline
346 // least. 356 // least.
347 if (prow == ocur.row) 357 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 358 screen.cur.row = q - (total_rows - nrow);
349 359
350 line_t &pline = old_buf [prow]; 360 line_t &pline = prev_row_buf [prow];
351 361
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 362 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 363
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 364 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 365 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 386 {
377 // if no scrollback exists (yet), wing, instead of wrap 387 // if no scrollback exists (yet), wing, instead of wrap
378 388
379 for (int row = min (nrow, prev_nrow); row--; ) 389 for (int row = min (nrow, prev_nrow); row--; )
380 { 390 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 391 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 392 line_t &dst = row_buf [row];
383 393
384 qline = pline; 394 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
385 lresize (qline); 395
396 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
397 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
398 dst.l = common_col;
386 } 399 }
387 400
388 for (int row = prev_nrow; row < nrow; row++) 401 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 402 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 403
393 term_start = 0; 404 term_start = 0;
394 } 405 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 406
400 clamp_it (screen.cur.row, 0, nrow - 1); 407 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 408 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 409 }
403 410
411 for (int row = nrow; row--; )
412 {
413 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
414 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
415 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
416 }
417
418 chunk_free (prev_chunk, prev_chunk_size);
419
404 free (tabs); 420 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 421 tabs = (char *)rxvt_malloc (ncol);
406 422
407 for (int col = ncol; col--; ) 423 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 424 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 431 tt_winch ();
416 432
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 433 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 434}
419 435
420/* ------------------------------------------------------------------------- */ 436void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 437rxvt_term::scr_release () NOTHROW
426{ 438{
427 if (row_buf) 439 chunk_free (chunk, chunk_size);
428 { 440 chunk = 0;
429 delete talloc; talloc = 0; 441 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 442
432 free (row_buf);
433 free (swap_buf);
434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
437 free (tabs); 443 free (tabs);
438 tabs = 0; 444 tabs = 0;
439 }
440} 445}
441 446
442/* ------------------------------------------------------------------------- */ 447/* ------------------------------------------------------------------------- */
443/* 448/*
444 * Hard/Soft reset 449 * Hard/Soft reset
445 */ 450 */
446void 451void ecb_cold
447rxvt_term::scr_poweron () 452rxvt_term::scr_poweron ()
448{ 453{
449 scr_release (); 454 scr_release ();
455
450 prev_nrow = prev_ncol = 0; 456 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 457 rvideo_mode = false;
452 scr_soft_reset (); 458 scr_soft_reset ();
453 scr_reset (); 459 scr_reset ();
454 460
455 scr_clear (true); 461 scr_clear (true);
456 scr_refresh (); 462 scr_refresh ();
457} 463}
458 464
459void 465void ecb_cold
460rxvt_term::scr_soft_reset () 466rxvt_term::scr_soft_reset () NOTHROW
461{ 467{
462 /* only affects modes, nothing drastic such as clearing the screen */ 468 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 469#if ENABLE_OVERLAY
464 scr_overlay_off (); 470 scr_overlay_off ();
465#endif 471#endif
… …
520 assert (s->cur.row >= 0); 526 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 527 assert (s->cur.col >= 0);
522} 528}
523 529
524void 530void
525rxvt_term::scr_swap_screen () 531rxvt_term::scr_swap_screen () NOTHROW
526{ 532{
527 if (!option (Opt_secondaryScreen)) 533 if (!option (Opt_secondaryScreen))
528 return; 534 return;
529 535
530 for (int i = prev_nrow; i--; ) 536 for (int i = prev_nrow; i--; )
… …
549 return; 555 return;
550 556
551 want_refresh = 1; 557 want_refresh = 1;
552 view_start = 0; 558 view_start = 0;
553 559
554 selection_check (2); /* check for boundary cross */ 560 /* check for boundary cross */
561 row_col_t pos;
562 pos.row = pos.col = 0;
563 if (ROWCOL_IS_BEFORE (selection.beg, pos)
564 && ROWCOL_IS_AFTER (selection.end, pos))
565 CLEAR_SELECTION ();
555 566
556 current_screen = scrn; 567 current_screen = scrn;
557 568
558#if NSCREENS 569#if NSCREENS
559 if (option (Opt_secondaryScreen)) 570 if (option (Opt_secondaryScreen))
… …
625/* 636/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 637 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 638 * count positive ==> scroll up
628 * count negative ==> scroll down 639 * count negative ==> scroll down
629 */ 640 */
630int 641int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 642rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 643{
633 if (count == 0 || (row1 > row2)) 644 if (count == 0 || (row1 > row2))
634 return 0; 645 return 0;
635 646
… …
682 else 693 else
683 scr_blank_screen_mem (l, rstyle); 694 scr_blank_screen_mem (l, rstyle);
684 } 695 }
685 696
686 // move and/or clear selection, if any 697 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 698 if (selection.op && current_screen == selection.screen
699 && selection.beg.row <= row2)
688 { 700 {
689 selection.beg.row -= count; 701 selection.beg.row -= count;
690 selection.end.row -= count; 702 selection.end.row -= count;
691 selection.mark.row -= count; 703 selection.mark.row -= count;
692 704
693 if (selection.beg.row < top_row 705 selection_check (0);
694 || selection.end.row < top_row
695 || selection.mark.row < top_row)
696 {
697 CLEAR_ALL_SELECTION ();
698 selection.op = SELECTION_CLEAR;
699 }
700 } 706 }
701 707
702 // finally move the view window, if desired 708 // finally move the view window, if desired
703 if (option (Opt_scrollWithBuffer) 709 if (option (Opt_scrollWithBuffer)
704 && view_start != 0 710 && view_start != 0
… …
774 780
775/* ------------------------------------------------------------------------- */ 781/* ------------------------------------------------------------------------- */
776/* 782/*
777 * Add text given in <str> of length <len> to screen struct 783 * Add text given in <str> of length <len> to screen struct
778 */ 784 */
779void 785void ecb_hot
780rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 786rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
781{ 787{
782 if (len <= 0) /* sanity */ 788 if (len <= 0) /* sanity */
783 return; 789 return;
784 790
785 unsigned char checksel; 791 bool checksel;
786 unicode_t c; 792 unicode_t c;
787 int ncol = this->ncol; 793 int ncol = this->ncol;
788 const wchar_t *strend = str + len; 794 const wchar_t *strend = str + len;
789 795
790 want_refresh = 1; 796 want_refresh = 1;
… …
1134 * XTERM_SEQ: ESC 6 1140 * XTERM_SEQ: ESC 6
1135 * Move cursor left in row. If we're at the left boundary, shift everything 1141 * Move cursor left in row. If we're at the left boundary, shift everything
1136 * in that row right. Clear left column. 1142 * in that row right. Clear left column.
1137 */ 1143 */
1138#if !ENABLE_MINIMAL 1144#if !ENABLE_MINIMAL
1139void 1145void ecb_cold
1140rxvt_term::scr_backindex () NOTHROW 1146rxvt_term::scr_backindex () NOTHROW
1141{ 1147{
1142 if (screen.cur.col > 0) 1148 if (screen.cur.col > 0)
1143 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1149 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1144 else 1150 else
… …
1151 * XTERM_SEQ: ESC 9 1157 * XTERM_SEQ: ESC 9
1152 * Move cursor right in row. If we're at the right boundary, shift everything 1158 * Move cursor right in row. If we're at the right boundary, shift everything
1153 * in that row left. Clear right column. 1159 * in that row left. Clear right column.
1154 */ 1160 */
1155#if !ENABLE_MINIMAL 1161#if !ENABLE_MINIMAL
1156void 1162void ecb_cold
1157rxvt_term::scr_forwardindex () NOTHROW 1163rxvt_term::scr_forwardindex () NOTHROW
1158{ 1164{
1159 if (screen.cur.col < ncol - 1) 1165 if (screen.cur.col < ncol - 1)
1160 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1166 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1161 else 1167 else
… …
1312 scr_blank_line (line, col, num, rstyle); 1318 scr_blank_line (line, col, num, rstyle);
1313} 1319}
1314 1320
1315/* ------------------------------------------------------------------------- */ 1321/* ------------------------------------------------------------------------- */
1316/* 1322/*
1317 * Erase part of whole of the screen 1323 * Erase part or whole of the screen
1318 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1324 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1319 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1325 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1320 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1326 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1321 */ 1327 */
1322void 1328void
… …
1331 ZERO_SCROLLBACK (); 1337 ZERO_SCROLLBACK ();
1332 1338
1333 switch (mode) 1339 switch (mode)
1334 { 1340 {
1335 case 0: /* erase to end of screen */ 1341 case 0: /* erase to end of screen */
1336 selection_check (1);
1337 scr_erase_line (0); 1342 scr_erase_line (0);
1338 row = screen.cur.row + 1; /* possible OOB */ 1343 row = screen.cur.row + 1; /* possible OOB */
1339 num = nrow - row; 1344 num = nrow - row;
1340 break; 1345 break;
1341 case 1: /* erase to beginning of screen */ 1346 case 1: /* erase to beginning of screen */
1342 selection_check (3);
1343 scr_erase_line (1); 1347 scr_erase_line (1);
1344 row = 0; 1348 row = 0;
1345 num = screen.cur.row; 1349 num = screen.cur.row;
1346 break; 1350 break;
1347 case 2: /* erase whole screen */ 1351 case 2: /* erase whole screen */
1348 selection_check (3);
1349 row = 0; 1352 row = 0;
1350 num = nrow; 1353 num = nrow;
1351 break; 1354 break;
1352 default: 1355 default:
1353 return; 1356 return;
… …
1370 { 1373 {
1371 ren = DEFAULT_RSTYLE; 1374 ren = DEFAULT_RSTYLE;
1372 1375
1373 if (mapped) 1376 if (mapped)
1374 XClearArea (dpy, vt, 0, 1377 XClearArea (dpy, vt, 0,
1375 Row2Pixel (row - view_start), (unsigned int)width, 1378 Row2Pixel (row - view_start), (unsigned int)vt_width,
1376 (unsigned int)Height2Pixel (num), False); 1379 (unsigned int)Height2Pixel (num), False);
1377 } 1380 }
1378 else 1381 else
1379 { 1382 {
1380 ren = rstyle & (RS_fgMask | RS_bgMask); 1383 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1383 { 1386 {
1384 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1387 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1385 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1388 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1386 XFillRectangle (dpy, vt, gc, 1389 XFillRectangle (dpy, vt, gc,
1387 0, Row2Pixel (row - view_start), 1390 0, Row2Pixel (row - view_start),
1388 (unsigned int)width, 1391 (unsigned int)vt_width,
1389 (unsigned int)Height2Pixel (num)); 1392 (unsigned int)Height2Pixel (num));
1390 gcvalue.foreground = pix_colors[Color_fg]; 1393 gcvalue.foreground = pix_colors[Color_fg];
1391 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1394 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1392 } 1395 }
1393 } 1396 }
… …
1415/* ------------------------------------------------------------------------- */ 1418/* ------------------------------------------------------------------------- */
1416/* 1419/*
1417 * Fill the screen with `E's 1420 * Fill the screen with `E's
1418 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1421 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1419 */ 1422 */
1420void 1423void ecb_cold
1421rxvt_term::scr_E () NOTHROW 1424rxvt_term::scr_E () NOTHROW
1422{ 1425{
1423 rend_t fs; 1426 rend_t fs;
1424 1427
1425 want_refresh = 1; 1428 want_refresh = 1;
1426 ZERO_SCROLLBACK (); 1429 ZERO_SCROLLBACK ();
1427 1430
1428 num_scr_allow = 0; 1431 num_scr_allow = 0;
1429 selection_check (3); 1432
1433 row_col_t pos;
1434 pos.row = pos.col = 0;
1435 if (ROWCOL_IS_AFTER (selection.end, pos))
1436 CLEAR_SELECTION ();
1430 1437
1431 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1438 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1432 for (int row = nrow; row--; ) 1439 for (int row = nrow; row--; )
1433 { 1440 {
1434 line_t &line = ROW(row); 1441 line_t &line = ROW(row);
… …
1585/* ------------------------------------------------------------------------- */ 1592/* ------------------------------------------------------------------------- */
1586/* 1593/*
1587 * Set the scrolling region 1594 * Set the scrolling region
1588 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1595 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1589 */ 1596 */
1590void 1597void ecb_cold
1591rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1598rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1592{ 1599{
1593 max_it (top, 0); 1600 max_it (top, 0);
1594 min_it (bot, nrow - 1); 1601 min_it (bot, nrow - 1);
1595 1602
… …
1605/* 1612/*
1606 * Make the cursor visible/invisible 1613 * Make the cursor visible/invisible
1607 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1614 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1608 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1615 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1609 */ 1616 */
1610void 1617void ecb_cold
1611rxvt_term::scr_cursor_visible (int mode) NOTHROW 1618rxvt_term::scr_cursor_visible (int mode) NOTHROW
1612{ 1619{
1613 want_refresh = 1; 1620 want_refresh = 1;
1614 1621
1615 if (mode) 1622 if (mode)
… …
1622/* 1629/*
1623 * Set/unset automatic wrapping 1630 * Set/unset automatic wrapping
1624 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1631 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1625 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1632 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1626 */ 1633 */
1627void 1634void ecb_cold
1628rxvt_term::scr_autowrap (int mode) NOTHROW 1635rxvt_term::scr_autowrap (int mode) NOTHROW
1629{ 1636{
1630 if (mode) 1637 if (mode)
1631 screen.flags |= Screen_Autowrap; 1638 screen.flags |= Screen_Autowrap;
1632 else 1639 else
… …
1641 * Relative mode: line numbers are relative to top margin of scrolling region 1648 * Relative mode: line numbers are relative to top margin of scrolling region
1642 * and the cursor cannot be moved outside. 1649 * and the cursor cannot be moved outside.
1643 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1650 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1644 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1651 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1645 */ 1652 */
1646void 1653void ecb_cold
1647rxvt_term::scr_relative_origin (int mode) NOTHROW 1654rxvt_term::scr_relative_origin (int mode) NOTHROW
1648{ 1655{
1649 if (mode) 1656 if (mode)
1650 screen.flags |= Screen_Relative; 1657 screen.flags |= Screen_Relative;
1651 else 1658 else
… …
1658/* 1665/*
1659 * Set insert/replace mode 1666 * Set insert/replace mode
1660 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1667 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1661 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1668 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1662 */ 1669 */
1663void 1670void ecb_cold
1664rxvt_term::scr_insert_mode (int mode) NOTHROW 1671rxvt_term::scr_insert_mode (int mode) NOTHROW
1665{ 1672{
1666 if (mode) 1673 if (mode)
1667 screen.flags |= Screen_Insert; 1674 screen.flags |= Screen_Insert;
1668 else 1675 else
… …
1674 * Set/Unset tabs 1681 * Set/Unset tabs
1675 * XTERM_SEQ: Set tab at current column : ESC H 1682 * XTERM_SEQ: Set tab at current column : ESC H
1676 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1683 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1677 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1684 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1678 */ 1685 */
1679void 1686void ecb_cold
1680rxvt_term::scr_set_tab (int mode) NOTHROW 1687rxvt_term::scr_set_tab (int mode) NOTHROW
1681{ 1688{
1682 if (mode < 0) 1689 if (mode < 0)
1683 memset (tabs, 0, ncol); 1690 memset (tabs, 0, ncol);
1684 else if (screen.cur.col < ncol) 1691 else if (screen.cur.col < ncol)
… …
1703 if (rvideo_state != on) 1710 if (rvideo_state != on)
1704 { 1711 {
1705 rvideo_state = on; 1712 rvideo_state = on;
1706 1713
1707 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1714 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1708#ifdef HAVE_BG_PIXMAP 1715#ifdef HAVE_IMG
1709 if (bg_pixmap == None) 1716 if (bg_img == 0)
1710#endif 1717#endif
1711 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1718 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1712 1719
1713 XGCValues gcvalue; 1720 XGCValues gcvalue;
1714 gcvalue.foreground = pix_colors[Color_fg]; 1721 gcvalue.foreground = pix_colors[Color_fg];
… …
1723/* ------------------------------------------------------------------------- */ 1730/* ------------------------------------------------------------------------- */
1724/* 1731/*
1725 * Report current cursor position 1732 * Report current cursor position
1726 * XTERM_SEQ: Report position: ESC [ 6 n 1733 * XTERM_SEQ: Report position: ESC [ 6 n
1727 */ 1734 */
1728void 1735void ecb_cold
1729rxvt_term::scr_report_position () NOTHROW 1736rxvt_term::scr_report_position () NOTHROW
1730{ 1737{
1731 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1738 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1732} 1739}
1733 1740
… …
1736 * ------------------------------------------------------------------------- */ 1743 * ------------------------------------------------------------------------- */
1737 1744
1738/* 1745/*
1739 * Set font style 1746 * Set font style
1740 */ 1747 */
1741void 1748void ecb_cold
1742rxvt_term::set_font_style () NOTHROW 1749rxvt_term::set_font_style () NOTHROW
1743{ 1750{
1744#if 0 1751#if 0
1745 switch (charsets [screen.charset]) 1752 switch (charsets [screen.charset])
1746 { 1753 {
… …
1768 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1775 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1769 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1776 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1770 * XTERM_SEQ: Invoke G2 character set: ESC N 1777 * XTERM_SEQ: Invoke G2 character set: ESC N
1771 * XTERM_SEQ: Invoke G3 character set: ESC O 1778 * XTERM_SEQ: Invoke G3 character set: ESC O
1772 */ 1779 */
1773void 1780void ecb_cold
1774rxvt_term::scr_charset_choose (int set) NOTHROW 1781rxvt_term::scr_charset_choose (int set) NOTHROW
1775{ 1782{
1776 screen.charset = set; 1783 screen.charset = set;
1777 set_font_style (); 1784 set_font_style ();
1778} 1785}
… …
1799 * ------------------------------------------------------------------------- */ 1806 * ------------------------------------------------------------------------- */
1800 1807
1801/* 1808/*
1802 * refresh matching text. 1809 * refresh matching text.
1803 */ 1810 */
1804bool 1811bool ecb_cold
1805rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1812rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1806{ 1813{
1807 bool found = false; 1814 bool found = false;
1808 1815
1809 for (int i = 0; i < nrow; i++) 1816 for (int i = 0; i < nrow; i++)
… …
1828 PART_BEG = 0, 1835 PART_BEG = 0,
1829 PART_END, 1836 PART_END,
1830 RC_COUNT 1837 RC_COUNT
1831}; 1838};
1832 1839
1833void 1840void ecb_hot
1834rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1841rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1835{ 1842{
1836 int i; 1843 int i;
1837 row_col_t rc[RC_COUNT]; 1844 row_col_t rc[RC_COUNT];
1838 1845
… …
1875 * Refresh the entire screen 1882 * Refresh the entire screen
1876 */ 1883 */
1877void 1884void
1878rxvt_term::scr_touch (bool refresh) NOTHROW 1885rxvt_term::scr_touch (bool refresh) NOTHROW
1879{ 1886{
1880 scr_expose (0, 0, width, height, refresh); 1887 scr_expose (0, 0, vt_width, vt_height, refresh);
1881} 1888}
1882 1889
1883/* ------------------------------------------------------------------------- */ 1890/* ------------------------------------------------------------------------- */
1884/* 1891/*
1885 * Move the display so that the line represented by scrollbar value Y is at 1892 * Move the display so that the line represented by scrollbar value Y is at
… …
1964 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1971 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1965#endif 1972#endif
1966} 1973}
1967 1974
1968/* ------------------------------------------------------------------------- */ 1975/* ------------------------------------------------------------------------- */
1969void 1976void ecb_cold
1970rxvt_term::scr_printscreen (int fullhist) NOTHROW 1977rxvt_term::scr_printscreen (int fullhist) NOTHROW
1971{ 1978{
1972#ifdef PRINTPIPE 1979#ifdef PRINTPIPE
1973 int nrows, row_start; 1980 int nrows, row_start;
1974 FILE *fd = popen_printer (); 1981 FILE *fd = popen_printer ();
… …
2023/* 2030/*
2024 * Refresh the screen 2031 * Refresh the screen
2025 * drawn_text/drawn_rend contain the screen information before the update. 2032 * drawn_text/drawn_rend contain the screen information before the update.
2026 * screen.text/screen.rend contain what the screen will change to. 2033 * screen.text/screen.rend contain what the screen will change to.
2027 */ 2034 */
2028void 2035void ecb_hot
2029rxvt_term::scr_refresh () NOTHROW 2036rxvt_term::scr_refresh () NOTHROW
2030{ 2037{
2031 int16_t col, row, /* column/row we're processing */ 2038 int16_t col, row, /* column/row we're processing */
2032 ocrow; /* old cursor row */ 2039 ocrow; /* old cursor row */
2033 int i; /* tmp */ 2040 int i; /* tmp */
… …
2047 * A: set up vars 2054 * A: set up vars
2048 */ 2055 */
2049 refresh_count = 0; 2056 refresh_count = 0;
2050 2057
2051 unsigned int old_screen_flags = screen.flags; 2058 unsigned int old_screen_flags = screen.flags;
2052 char have_bg = 0; 2059 bool have_bg = 0;
2053#ifdef HAVE_BG_PIXMAP 2060#ifdef HAVE_IMG
2054 have_bg = bg_pixmap != None; 2061 have_bg = bg_img != 0;
2055#endif 2062#endif
2056 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2063 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2057 2064
2058 /* 2065 /*
2059 * B: reverse any characters which are selected 2066 * B: reverse any characters which are selected
… …
2063 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2070 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2064#if ENABLE_OVERLAY 2071#if ENABLE_OVERLAY
2065 scr_swap_overlay (); 2072 scr_swap_overlay ();
2066#endif 2073#endif
2067 2074
2068 char showcursor = screen.flags & Screen_VisibleCursor; 2075 bool showcursor = screen.flags & Screen_VisibleCursor;
2069 2076
2070 /* 2077 /*
2071 * C: set the cursor character (s) 2078 * C: set the cursor character (s)
2072 */ 2079 */
2073 { 2080 {
2074 unsigned char setoldcursor; 2081 bool setoldcursor;
2075 2082
2076#ifdef CURSOR_BLINK 2083#ifdef CURSOR_BLINK
2077 if (hidden_cursor) 2084 if (hidden_cursor)
2078 showcursor = 0; 2085 showcursor = 0;
2079#endif 2086#endif
… …
2166 { 2173 {
2167 int16_t nits; 2174 int16_t nits;
2168 int i = num_scr; 2175 int i = num_scr;
2169 int j; 2176 int j;
2170 int len, wlen; 2177 int len, wlen;
2171 dLocal (int, num_scr);
2172 2178
2173 j = nrow; 2179 j = nrow;
2174 wlen = len = -1; 2180 wlen = len = -1;
2175 row = i > 0 ? 0 : j - 1; 2181 row = i > 0 ? 0 : j - 1;
2176 2182
… …
2481 2487
2482 XDrawRectangle (dpy, vt, gc, 2488 XDrawRectangle (dpy, vt, gc,
2483 Col2Pixel (col), 2489 Col2Pixel (col),
2484 Row2Pixel (oldcursor.row), 2490 Row2Pixel (oldcursor.row),
2485 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2491 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2486 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2492 (unsigned int) (Height2Pixel (1) - 1));
2487 } 2493 }
2488 } 2494 }
2489 2495
2490 /* 2496 /*
2491 * H: cleanup selection 2497 * H: cleanup selection
… …
2500 screen.flags = old_screen_flags; 2506 screen.flags = old_screen_flags;
2501 num_scr = 0; 2507 num_scr = 0;
2502 num_scr_allow = 1; 2508 num_scr_allow = 1;
2503} 2509}
2504 2510
2505void 2511void ecb_cold
2506rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2512rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2507{ 2513{
2508 if (!l.t) 2514 if (!l.valid ())
2509 return; 2515 return;
2510 2516
2511 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2517 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2512 2518
2513 for (int i = ncol; i--; ) 2519 for (int i = ncol; i--; )
2514 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2520 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2515} 2521}
2516 2522
2517void 2523void ecb_cold
2518rxvt_term::scr_remap_chars () NOTHROW 2524rxvt_term::scr_remap_chars () NOTHROW
2519{ 2525{
2520 for (int i = total_rows; i--; ) 2526 for (int i = total_rows; i--; )
2521 scr_remap_chars (row_buf [i]); 2527 scr_remap_chars (row_buf [i]);
2522 2528
… …
2525 scr_remap_chars (drawn_buf [i]); 2531 scr_remap_chars (drawn_buf [i]);
2526 scr_remap_chars (swap_buf [i]); 2532 scr_remap_chars (swap_buf [i]);
2527 } 2533 }
2528} 2534}
2529 2535
2530void 2536void ecb_cold
2531rxvt_term::scr_recolour (bool refresh) NOTHROW 2537rxvt_term::scr_recolour (bool refresh) NOTHROW
2532{ 2538{
2533 bool transparent = false; 2539 bool transparent = false;
2534 2540
2535#ifdef HAVE_BG_PIXMAP 2541#ifdef HAVE_IMG
2536 if (bg_pixmap != None) 2542 if (bg_img != 0)
2537 { 2543 {
2538# ifdef ENABLE_TRANSPARENCY 2544# if ENABLE_TRANSPARENCY
2539 if (bg_flags & BG_IS_TRANSPARENT) 2545 if (bg_flags & BG_IS_TRANSPARENT)
2540 { 2546 {
2541 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2547 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2542 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2548 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2543 2549
2544 transparent = true; 2550 transparent = true;
2545 } 2551 }
2546 else 2552 else
2547# endif 2553# endif
2548 { 2554 {
2549 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2555 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2550 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2556 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2551 } 2557 }
2552 } 2558 }
2553 else 2559 else
2554#endif 2560#endif
2555 { 2561 {
… …
2562 if (scrollBar.win) 2568 if (scrollBar.win)
2563 { 2569 {
2564 if (transparent) 2570 if (transparent)
2565 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2571 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2566 else 2572 else
2567 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2573 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2568 scrollBar.state = SB_STATE_IDLE; 2574 scrollBar.state = SB_STATE_IDLE;
2569 scrollBar.show (0); 2575 scrollBar.show (0);
2570 } 2576 }
2571 2577
2572 if (refresh) 2578 if (refresh)
… …
2638 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2644 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2639 srp[col] ^= rstyle; 2645 srp[col] ^= rstyle;
2640} 2646}
2641 2647
2642/* ------------------------------------------------------------------------- */ 2648/* ------------------------------------------------------------------------- */
2643void 2649void ecb_hot
2644rxvt_term::scr_reverse_selection () NOTHROW 2650rxvt_term::scr_reverse_selection () NOTHROW
2645{ 2651{
2646 if (selection.op 2652 if (selection.op
2647 && current_screen == selection.screen 2653 && current_screen == selection.screen
2648 && selection.end.row >= view_start) 2654 && selection.end.row >= view_start)
… …
2667 */ 2673 */
2668#if 0 2674#if 0
2669void 2675void
2670rxvt_term::scr_dump (int fd) NOTHROW 2676rxvt_term::scr_dump (int fd) NOTHROW
2671{ 2677{
2672 int row, wrote; 2678 // if this method is needed, it can be implemented by factoring the
2673 unsigned int width, towrite; 2679 // relevant code in scr_printscreen
2674 const char r1[] = "\n";
2675
2676 for (row = saveLines + top_row;
2677 row < saveLines + nrow - 1; row++)
2678 {
2679 width = row_buf[row].l >= 0 ? row_buf[row].l
2680 : ncol;
2681 for (towrite = width; towrite; towrite -= wrote)
2682 {
2683 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2684 towrite);
2685 if (wrote < 0)
2686 return; /* XXX: death, no report */
2687 }
2688 if (row_buf[row].l >= 0)
2689 if (write (fd, r1, 1) <= 0)
2690 return; /* XXX: death, no report */
2691 }
2692} 2680}
2693#endif 2681#endif
2694 2682
2695/* ------------------------------------------------------------------------- * 2683/* ------------------------------------------------------------------------- *
2696 * CHARACTER SELECTION * 2684 * CHARACTER SELECTION *
2697 * ------------------------------------------------------------------------- */ 2685 * ------------------------------------------------------------------------- */
2698void 2686void
2699rxvt_term::selection_check (int check_more) NOTHROW 2687rxvt_term::selection_check (int check_more) NOTHROW
2700{ 2688{
2701 row_col_t pos;
2702
2703 if (!selection.op) 2689 if (!selection.op)
2704 return; 2690 return;
2705 2691
2706 pos.row = pos.col = 0;
2707 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2708 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2709 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2694 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2710 || (check_more == 1 2695 || (check_more == 1
2711 && current_screen == selection.screen 2696 && current_screen == selection.screen
2712 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2713 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2714 || (check_more == 2
2715 && ROWCOL_IS_BEFORE (selection.beg, pos)
2716 && ROWCOL_IS_AFTER (selection.end, pos))
2717 || (check_more == 3
2718 && ROWCOL_IS_AFTER (selection.end, pos))
2719 || (check_more == 4 /* screen width change */
2720 && (selection.beg.row != selection.end.row
2721 || selection.end.col > ncol)))
2722 CLEAR_SELECTION (); 2699 CLEAR_ALL_SELECTION ();
2723} 2700}
2724 2701
2725/* ------------------------------------------------------------------------- */ 2702/* ------------------------------------------------------------------------- */
2726/* 2703/*
2727 * Paste a selection direct to the command fd 2704 * Paste a selection direct to the command fd
… …
2733 for (unsigned int i = 0; i < len; i++) 2710 for (unsigned int i = 0; i < len; i++)
2734 if (data[i] == C0_LF) 2711 if (data[i] == C0_LF)
2735 data[i] = C0_CR; 2712 data[i] = C0_CR;
2736 2713
2737 if (priv_modes & PrivMode_BracketPaste) 2714 if (priv_modes & PrivMode_BracketPaste)
2738 tt_printf ("\e[200~"); 2715 tt_printf ("\x1b[200~");
2739 2716
2740 tt_write (data, len); 2717 tt_write (data, len);
2741 2718
2742 if (priv_modes & PrivMode_BracketPaste) 2719 if (priv_modes & PrivMode_BracketPaste)
2743 tt_printf ("\e[201~"); 2720 tt_printf ("\x1b[201~");
2744} 2721}
2745 2722
2746void 2723void
2747rxvt_term::paste (char *data, unsigned int len) NOTHROW 2724rxvt_term::paste (char *data, unsigned int len) NOTHROW
2748{ 2725{
… …
2968/* ------------------------------------------------------------------------- */ 2945/* ------------------------------------------------------------------------- */
2969/* 2946/*
2970 * Mark or select text based upon number of clicks: 1, 2, or 3 2947 * Mark or select text based upon number of clicks: 1, 2, or 3
2971 * EXT: button 1 press 2948 * EXT: button 1 press
2972 */ 2949 */
2973void 2950void ecb_cold
2974rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2951rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2975{ 2952{
2976 clicks = ((clicks - 1) % 3) + 1; 2953 clicks = ((clicks - 1) % 3) + 1;
2977 selection.clicks = clicks; /* save clicks so extend will work */ 2954 selection.clicks = clicks; /* save clicks so extend will work */
2978 2955
… …
2997 2974
2998/* ------------------------------------------------------------------------- */ 2975/* ------------------------------------------------------------------------- */
2999/* 2976/*
3000 * Mark a selection at the specified col/row 2977 * Mark a selection at the specified col/row
3001 */ 2978 */
3002void 2979void ecb_cold
3003rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2980rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3004{ 2981{
3005 want_refresh = 1; 2982 want_refresh = 1;
3006 2983
3007 selection.mark.row = row + view_start; 2984 selection.mark.row = row + view_start;
… …
3034/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3011/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3035#define DELIMIT_TEXT(x) \ 3012#define DELIMIT_TEXT(x) \
3036 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3013 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3037#define DELIMIT_REND(x) 1 3014#define DELIMIT_REND(x) 1
3038 3015
3039void 3016void ecb_cold
3040rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3017rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3041{ 3018{
3042 int col, row, dirnadd, tcol, trow, w1, w2; 3019 int col, row, dirnadd, tcol, trow, w1, w2;
3043 row_col_t bound; 3020 row_col_t bound;
3044 text_t *stp; 3021 text_t *stp;
… …
3118 * EXT: button 3 press; button 1 or 3 drag 3095 * EXT: button 3 press; button 1 or 3 drag
3119 * flag == 0 ==> button 1 3096 * flag == 0 ==> button 1
3120 * flag == 1 ==> button 3 press 3097 * flag == 1 ==> button 3 press
3121 * flag == 2 ==> button 3 motion 3098 * flag == 2 ==> button 3 motion
3122 */ 3099 */
3123void 3100void ecb_cold
3124rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3101rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3125{ 3102{
3126 int col = clamp (Pixel2Col (x), 0, ncol); 3103 int col = clamp (Pixel2Col (x), 0, ncol);
3127 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3104 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3128 3105
… …
3154 3131
3155/* ------------------------------------------------------------------------- */ 3132/* ------------------------------------------------------------------------- */
3156/* 3133/*
3157 * Extend the selection to the specified col/row 3134 * Extend the selection to the specified col/row
3158 */ 3135 */
3159void 3136void ecb_cold
3160rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3137rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3161{ 3138{
3162 row_col_t pos; 3139 row_col_t pos;
3163 enum { 3140 enum {
3164 LEFT, RIGHT 3141 LEFT, RIGHT
… …
3355 ::swap (selection.beg.col, selection.end.col); 3332 ::swap (selection.beg.col, selection.end.col);
3356#endif 3333#endif
3357} 3334}
3358 3335
3359#if !ENABLE_MINIMAL 3336#if !ENABLE_MINIMAL
3360void 3337void ecb_cold
3361rxvt_term::selection_remove_trailing_spaces () NOTHROW 3338rxvt_term::selection_remove_trailing_spaces () NOTHROW
3362{ 3339{
3363 int32_t end_col, end_row; 3340 int32_t end_col, end_row;
3364 text_t *stp; 3341 text_t *stp;
3365 3342
… …
3403/* ------------------------------------------------------------------------- */ 3380/* ------------------------------------------------------------------------- */
3404/* 3381/*
3405 * Double click on button 3 when already selected 3382 * Double click on button 3 when already selected
3406 * EXT: button 3 double click 3383 * EXT: button 3 double click
3407 */ 3384 */
3408void 3385void ecb_cold
3409rxvt_term::selection_rotate (int x, int y) NOTHROW 3386rxvt_term::selection_rotate (int x, int y) NOTHROW
3410{ 3387{
3411 selection.clicks = selection.clicks % 3 + 1; 3388 selection.clicks = selection.clicks % 3 + 1;
3412 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3389 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3413} 3390}
… …
3415/* ------------------------------------------------------------------------- */ 3392/* ------------------------------------------------------------------------- */
3416/* 3393/*
3417 * Respond to a request for our current selection 3394 * Respond to a request for our current selection
3418 * EXT: SelectionRequest 3395 * EXT: SelectionRequest
3419 */ 3396 */
3420void 3397void ecb_cold
3421rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3398rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3422{ 3399{
3423 Atom property = rq.property == None ? rq.target : rq.property; 3400 Atom property = rq.property == None ? rq.target : rq.property;
3424 XSelectionEvent ev; 3401 XSelectionEvent ev;
3425 3402
… …
3558 3535
3559 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3536 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3560} 3537}
3561 3538
3562/* ------------------------------------------------------------------------- */ 3539/* ------------------------------------------------------------------------- */
3563#ifdef USE_XIM 3540#if USE_XIM
3564void 3541void ecb_cold
3565rxvt_term::im_set_position (XPoint &pos) NOTHROW 3542rxvt_term::im_set_position (XPoint &pos) NOTHROW
3566{ 3543{
3567 XWindowAttributes xwa; 3544 XWindowAttributes xwa;
3568 3545
3569 XGetWindowAttributes (dpy, vt, &xwa); 3546 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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