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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.392 by root, Sun Jul 10 00:40:10 2011 UTC vs.
Revision 1.426 by sf-exg, Tue Oct 2 10:29:12 2012 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 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
286 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
274 { 287 }
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 288
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 289 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 290 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 291 int q = total_rows; // rewrapped row
285 292
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 300 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 301
295 do 302 do
296 { 303 {
297 p = MOD (p - 1, prev_total_rows); 304 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 305 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 306 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 307 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 308
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 309 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 310 {
304 p = MOD (p - 1, prev_total_rows); 311 p = MOD (p - 1, prev_total_rows);
305 312
306 plines++; 313 plines++;
307 llen += prev_ncol; 314 llen += prev_ncol;
… …
320 327
321 // re-assemble the full line by destination lines 328 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 329 for (int qrow = q; qlines--; qrow++)
323 { 330 {
324 qline = row_buf + qrow; 331 qline = row_buf + qrow;
325 lalloc (*qline); 332 qline->alloc (); // redundant with next line
326 qline->l = ncol; 333 qline->l = ncol;
327 qline->is_longer (1); 334 qline->is_longer (1);
328 335
329 int qcol = 0; 336 int qcol = 0;
330 337
… …
345 // this seems to upset applications/shells/readline 352 // this seems to upset applications/shells/readline
346 // least. 353 // least.
347 if (prow == ocur.row) 354 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 355 screen.cur.row = q - (total_rows - nrow);
349 356
350 line_t &pline = old_buf [prow]; 357 line_t &pline = prev_row_buf [prow];
351 358
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 359 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 360
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 361 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 362 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 383 {
377 // if no scrollback exists (yet), wing, instead of wrap 384 // if no scrollback exists (yet), wing, instead of wrap
378 385
379 for (int row = min (nrow, prev_nrow); row--; ) 386 for (int row = min (nrow, prev_nrow); row--; )
380 { 387 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 388 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 389 line_t &dst = row_buf [row];
383 390
384 qline = pline; 391 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
385 lresize (qline); 392
393 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
394 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
386 } 395 }
387 396
388 for (int row = prev_nrow; row < nrow; row++) 397 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 398 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 399
393 term_start = 0; 400 term_start = 0;
394 } 401 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 402
400 clamp_it (screen.cur.row, 0, nrow - 1); 403 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 404 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 405 }
403 406
407 for (int row = nrow; row--; )
408 {
409 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
410 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
411 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
412 }
413
414 chunk_free (prev_chunk, prev_chunk_size);
415
404 free (tabs); 416 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 417 tabs = (char *)rxvt_malloc (ncol);
406 418
407 for (int col = ncol; col--; ) 419 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 420 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 427 tt_winch ();
416 428
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 429 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 430}
419 431
420/* ------------------------------------------------------------------------- */ 432void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 433rxvt_term::scr_release () NOTHROW
426{ 434{
427 if (row_buf) 435 chunk_free (chunk, chunk_size);
428 { 436 chunk = 0;
429 delete talloc; talloc = 0; 437 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 438
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); 439 free (tabs);
438 tabs = 0; 440 tabs = 0;
439 }
440} 441}
441 442
442/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
443/* 444/*
444 * Hard/Soft reset 445 * Hard/Soft reset
445 */ 446 */
446void 447void ecb_cold
447rxvt_term::scr_poweron () 448rxvt_term::scr_poweron ()
448{ 449{
449 scr_release (); 450 scr_release ();
451
450 prev_nrow = prev_ncol = 0; 452 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 453 rvideo_mode = false;
452 scr_soft_reset (); 454 scr_soft_reset ();
453 scr_reset (); 455 scr_reset ();
454 456
455 scr_clear (true); 457 scr_clear (true);
456 scr_refresh (); 458 scr_refresh ();
457} 459}
458 460
459void 461void ecb_cold
460rxvt_term::scr_soft_reset () 462rxvt_term::scr_soft_reset () NOTHROW
461{ 463{
462 /* only affects modes, nothing drastic such as clearing the screen */ 464 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 465#if ENABLE_OVERLAY
464 scr_overlay_off (); 466 scr_overlay_off ();
465#endif 467#endif
… …
520 assert (s->cur.row >= 0); 522 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 523 assert (s->cur.col >= 0);
522} 524}
523 525
524void 526void
525rxvt_term::scr_swap_screen () 527rxvt_term::scr_swap_screen () NOTHROW
526{ 528{
527 if (!option (Opt_secondaryScreen)) 529 if (!option (Opt_secondaryScreen))
528 return; 530 return;
529 531
530 for (int i = prev_nrow; i--; ) 532 for (int i = prev_nrow; i--; )
… …
549 return; 551 return;
550 552
551 want_refresh = 1; 553 want_refresh = 1;
552 view_start = 0; 554 view_start = 0;
553 555
554 selection_check (2); /* check for boundary cross */ 556 /* check for boundary cross */
557 row_col_t pos;
558 pos.row = pos.col = 0;
559 if (ROWCOL_IS_BEFORE (selection.beg, pos)
560 && ROWCOL_IS_AFTER (selection.end, pos))
561 CLEAR_SELECTION ();
555 562
556 current_screen = scrn; 563 current_screen = scrn;
557 564
558#if NSCREENS 565#if NSCREENS
559 if (option (Opt_secondaryScreen)) 566 if (option (Opt_secondaryScreen))
… …
625/* 632/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 633 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 634 * count positive ==> scroll up
628 * count negative ==> scroll down 635 * count negative ==> scroll down
629 */ 636 */
630int 637int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 638rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 639{
633 if (count == 0 || (row1 > row2)) 640 if (count == 0 || (row1 > row2))
634 return 0; 641 return 0;
635 642
… …
682 else 689 else
683 scr_blank_screen_mem (l, rstyle); 690 scr_blank_screen_mem (l, rstyle);
684 } 691 }
685 692
686 // move and/or clear selection, if any 693 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 694 if (selection.op && current_screen == selection.screen
695 && selection.beg.row <= row2)
688 { 696 {
689 selection.beg.row -= count; 697 selection.beg.row -= count;
690 selection.end.row -= count; 698 selection.end.row -= count;
691 selection.mark.row -= count; 699 selection.mark.row -= count;
692 700
693 if (selection.beg.row < top_row 701 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 } 702 }
701 703
702 // finally move the view window, if desired 704 // finally move the view window, if desired
703 if (option (Opt_scrollWithBuffer) 705 if (option (Opt_scrollWithBuffer)
704 && view_start != 0 706 && view_start != 0
… …
765 { 767 {
766 line_t &l = ROW(row2); 768 line_t &l = ROW(row2);
767 l.is_longer (0); 769 l.is_longer (0);
768 l.touch (); 770 l.touch ();
769 } 771 }
770
771 } 772 }
772 773
773 return count; 774 return count;
774} 775}
775 776
776/* ------------------------------------------------------------------------- */ 777/* ------------------------------------------------------------------------- */
777/* 778/*
778 * Add text given in <str> of length <len> to screen struct 779 * Add text given in <str> of length <len> to screen struct
779 */ 780 */
780void 781void ecb_hot
781rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 782rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
782{ 783{
783 if (len <= 0) /* sanity */ 784 if (len <= 0) /* sanity */
784 return; 785 return;
785 786
786 unsigned char checksel; 787 bool checksel;
787 unicode_t c; 788 unicode_t c;
788 int ncol = this->ncol; 789 int ncol = this->ncol;
789 const wchar_t *strend = str + len; 790 const wchar_t *strend = str + len;
790 791
791 want_refresh = 1; 792 want_refresh = 1;
… …
1135 * XTERM_SEQ: ESC 6 1136 * XTERM_SEQ: ESC 6
1136 * Move cursor left in row. If we're at the left boundary, shift everything 1137 * Move cursor left in row. If we're at the left boundary, shift everything
1137 * in that row right. Clear left column. 1138 * in that row right. Clear left column.
1138 */ 1139 */
1139#if !ENABLE_MINIMAL 1140#if !ENABLE_MINIMAL
1140void 1141void ecb_cold
1141rxvt_term::scr_backindex () NOTHROW 1142rxvt_term::scr_backindex () NOTHROW
1142{ 1143{
1143 if (screen.cur.col > 0) 1144 if (screen.cur.col > 0)
1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1145 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145 else 1146 else
… …
1152 * XTERM_SEQ: ESC 9 1153 * XTERM_SEQ: ESC 9
1153 * Move cursor right in row. If we're at the right boundary, shift everything 1154 * Move cursor right in row. If we're at the right boundary, shift everything
1154 * in that row left. Clear right column. 1155 * in that row left. Clear right column.
1155 */ 1156 */
1156#if !ENABLE_MINIMAL 1157#if !ENABLE_MINIMAL
1157void 1158void ecb_cold
1158rxvt_term::scr_forwardindex () NOTHROW 1159rxvt_term::scr_forwardindex () NOTHROW
1159{ 1160{
1160 if (screen.cur.col < ncol - 1) 1161 if (screen.cur.col < ncol - 1)
1161 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1162 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1162 else 1163 else
… …
1313 scr_blank_line (line, col, num, rstyle); 1314 scr_blank_line (line, col, num, rstyle);
1314} 1315}
1315 1316
1316/* ------------------------------------------------------------------------- */ 1317/* ------------------------------------------------------------------------- */
1317/* 1318/*
1318 * Erase part of whole of the screen 1319 * Erase part or whole of the screen
1319 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1320 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1320 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1321 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1321 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1322 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1322 */ 1323 */
1323void 1324void
… …
1332 ZERO_SCROLLBACK (); 1333 ZERO_SCROLLBACK ();
1333 1334
1334 switch (mode) 1335 switch (mode)
1335 { 1336 {
1336 case 0: /* erase to end of screen */ 1337 case 0: /* erase to end of screen */
1337 selection_check (1);
1338 scr_erase_line (0); 1338 scr_erase_line (0);
1339 row = screen.cur.row + 1; /* possible OOB */ 1339 row = screen.cur.row + 1; /* possible OOB */
1340 num = nrow - row; 1340 num = nrow - row;
1341 break; 1341 break;
1342 case 1: /* erase to beginning of screen */ 1342 case 1: /* erase to beginning of screen */
1343 selection_check (3);
1344 scr_erase_line (1); 1343 scr_erase_line (1);
1345 row = 0; 1344 row = 0;
1346 num = screen.cur.row; 1345 num = screen.cur.row;
1347 break; 1346 break;
1348 case 2: /* erase whole screen */ 1347 case 2: /* erase whole screen */
1349 selection_check (3);
1350 row = 0; 1348 row = 0;
1351 num = nrow; 1349 num = nrow;
1352 break; 1350 break;
1353 default: 1351 default:
1354 return; 1352 return;
… …
1371 { 1369 {
1372 ren = DEFAULT_RSTYLE; 1370 ren = DEFAULT_RSTYLE;
1373 1371
1374 if (mapped) 1372 if (mapped)
1375 XClearArea (dpy, vt, 0, 1373 XClearArea (dpy, vt, 0,
1376 Row2Pixel (row - view_start), (unsigned int)width, 1374 Row2Pixel (row - view_start), (unsigned int)vt_width,
1377 (unsigned int)Height2Pixel (num), False); 1375 (unsigned int)Height2Pixel (num), False);
1378 } 1376 }
1379 else 1377 else
1380 { 1378 {
1381 ren = rstyle & (RS_fgMask | RS_bgMask); 1379 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1384 { 1382 {
1385 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1383 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1386 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1384 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1387 XFillRectangle (dpy, vt, gc, 1385 XFillRectangle (dpy, vt, gc,
1388 0, Row2Pixel (row - view_start), 1386 0, Row2Pixel (row - view_start),
1389 (unsigned int)width, 1387 (unsigned int)vt_width,
1390 (unsigned int)Height2Pixel (num)); 1388 (unsigned int)Height2Pixel (num));
1391 gcvalue.foreground = pix_colors[Color_fg]; 1389 gcvalue.foreground = pix_colors[Color_fg];
1392 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1390 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1393 } 1391 }
1394 } 1392 }
… …
1416/* ------------------------------------------------------------------------- */ 1414/* ------------------------------------------------------------------------- */
1417/* 1415/*
1418 * Fill the screen with `E's 1416 * Fill the screen with `E's
1419 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1417 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1420 */ 1418 */
1421void 1419void ecb_cold
1422rxvt_term::scr_E () NOTHROW 1420rxvt_term::scr_E () NOTHROW
1423{ 1421{
1424 rend_t fs; 1422 rend_t fs;
1425 1423
1426 want_refresh = 1; 1424 want_refresh = 1;
1427 ZERO_SCROLLBACK (); 1425 ZERO_SCROLLBACK ();
1428 1426
1429 num_scr_allow = 0; 1427 num_scr_allow = 0;
1430 selection_check (3); 1428
1429 row_col_t pos;
1430 pos.row = pos.col = 0;
1431 if (ROWCOL_IS_AFTER (selection.end, pos))
1432 CLEAR_SELECTION ();
1431 1433
1432 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1434 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1433 for (int row = nrow; row--; ) 1435 for (int row = nrow; row--; )
1434 { 1436 {
1435 line_t &line = ROW(row); 1437 line_t &line = ROW(row);
… …
1586/* ------------------------------------------------------------------------- */ 1588/* ------------------------------------------------------------------------- */
1587/* 1589/*
1588 * Set the scrolling region 1590 * Set the scrolling region
1589 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1591 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1590 */ 1592 */
1591void 1593void ecb_cold
1592rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1594rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1593{ 1595{
1594 max_it (top, 0); 1596 max_it (top, 0);
1595 min_it (bot, nrow - 1); 1597 min_it (bot, nrow - 1);
1596 1598
… …
1606/* 1608/*
1607 * Make the cursor visible/invisible 1609 * Make the cursor visible/invisible
1608 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1610 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1609 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1611 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1610 */ 1612 */
1611void 1613void ecb_cold
1612rxvt_term::scr_cursor_visible (int mode) NOTHROW 1614rxvt_term::scr_cursor_visible (int mode) NOTHROW
1613{ 1615{
1614 want_refresh = 1; 1616 want_refresh = 1;
1615 1617
1616 if (mode) 1618 if (mode)
… …
1623/* 1625/*
1624 * Set/unset automatic wrapping 1626 * Set/unset automatic wrapping
1625 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1627 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1626 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1628 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1627 */ 1629 */
1628void 1630void ecb_cold
1629rxvt_term::scr_autowrap (int mode) NOTHROW 1631rxvt_term::scr_autowrap (int mode) NOTHROW
1630{ 1632{
1631 if (mode) 1633 if (mode)
1632 screen.flags |= Screen_Autowrap; 1634 screen.flags |= Screen_Autowrap;
1633 else 1635 else
… …
1642 * Relative mode: line numbers are relative to top margin of scrolling region 1644 * Relative mode: line numbers are relative to top margin of scrolling region
1643 * and the cursor cannot be moved outside. 1645 * and the cursor cannot be moved outside.
1644 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1646 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1645 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1647 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1646 */ 1648 */
1647void 1649void ecb_cold
1648rxvt_term::scr_relative_origin (int mode) NOTHROW 1650rxvt_term::scr_relative_origin (int mode) NOTHROW
1649{ 1651{
1650 if (mode) 1652 if (mode)
1651 screen.flags |= Screen_Relative; 1653 screen.flags |= Screen_Relative;
1652 else 1654 else
… …
1659/* 1661/*
1660 * Set insert/replace mode 1662 * Set insert/replace mode
1661 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1663 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1662 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1664 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1663 */ 1665 */
1664void 1666void ecb_cold
1665rxvt_term::scr_insert_mode (int mode) NOTHROW 1667rxvt_term::scr_insert_mode (int mode) NOTHROW
1666{ 1668{
1667 if (mode) 1669 if (mode)
1668 screen.flags |= Screen_Insert; 1670 screen.flags |= Screen_Insert;
1669 else 1671 else
… …
1675 * Set/Unset tabs 1677 * Set/Unset tabs
1676 * XTERM_SEQ: Set tab at current column : ESC H 1678 * XTERM_SEQ: Set tab at current column : ESC H
1677 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1679 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1678 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1680 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1679 */ 1681 */
1680void 1682void ecb_cold
1681rxvt_term::scr_set_tab (int mode) NOTHROW 1683rxvt_term::scr_set_tab (int mode) NOTHROW
1682{ 1684{
1683 if (mode < 0) 1685 if (mode < 0)
1684 memset (tabs, 0, ncol); 1686 memset (tabs, 0, ncol);
1685 else if (screen.cur.col < ncol) 1687 else if (screen.cur.col < ncol)
… …
1705 { 1707 {
1706 rvideo_state = on; 1708 rvideo_state = on;
1707 1709
1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1710 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1709#ifdef HAVE_BG_PIXMAP 1711#ifdef HAVE_BG_PIXMAP
1710 if (bg_pixmap == None) 1712 if (bg_img == 0)
1711#endif 1713#endif
1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1714 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1713 1715
1714 XGCValues gcvalue; 1716 XGCValues gcvalue;
1715 gcvalue.foreground = pix_colors[Color_fg]; 1717 gcvalue.foreground = pix_colors[Color_fg];
… …
1724/* ------------------------------------------------------------------------- */ 1726/* ------------------------------------------------------------------------- */
1725/* 1727/*
1726 * Report current cursor position 1728 * Report current cursor position
1727 * XTERM_SEQ: Report position: ESC [ 6 n 1729 * XTERM_SEQ: Report position: ESC [ 6 n
1728 */ 1730 */
1729void 1731void ecb_cold
1730rxvt_term::scr_report_position () NOTHROW 1732rxvt_term::scr_report_position () NOTHROW
1731{ 1733{
1732 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1734 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1733} 1735}
1734 1736
… …
1737 * ------------------------------------------------------------------------- */ 1739 * ------------------------------------------------------------------------- */
1738 1740
1739/* 1741/*
1740 * Set font style 1742 * Set font style
1741 */ 1743 */
1742void 1744void ecb_cold
1743rxvt_term::set_font_style () NOTHROW 1745rxvt_term::set_font_style () NOTHROW
1744{ 1746{
1745#if 0 1747#if 0
1746 switch (charsets [screen.charset]) 1748 switch (charsets [screen.charset])
1747 { 1749 {
… …
1769 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1771 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1770 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1772 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1771 * XTERM_SEQ: Invoke G2 character set: ESC N 1773 * XTERM_SEQ: Invoke G2 character set: ESC N
1772 * XTERM_SEQ: Invoke G3 character set: ESC O 1774 * XTERM_SEQ: Invoke G3 character set: ESC O
1773 */ 1775 */
1774void 1776void ecb_cold
1775rxvt_term::scr_charset_choose (int set) NOTHROW 1777rxvt_term::scr_charset_choose (int set) NOTHROW
1776{ 1778{
1777 screen.charset = set; 1779 screen.charset = set;
1778 set_font_style (); 1780 set_font_style ();
1779} 1781}
… …
1800 * ------------------------------------------------------------------------- */ 1802 * ------------------------------------------------------------------------- */
1801 1803
1802/* 1804/*
1803 * refresh matching text. 1805 * refresh matching text.
1804 */ 1806 */
1805bool 1807bool ecb_cold
1806rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1808rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1807{ 1809{
1808 bool found = false; 1810 bool found = false;
1809 1811
1810 for (int i = 0; i < nrow; i++) 1812 for (int i = 0; i < nrow; i++)
… …
1829 PART_BEG = 0, 1831 PART_BEG = 0,
1830 PART_END, 1832 PART_END,
1831 RC_COUNT 1833 RC_COUNT
1832}; 1834};
1833 1835
1834void 1836void ecb_hot
1835rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1837rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1836{ 1838{
1837 int i; 1839 int i;
1838 row_col_t rc[RC_COUNT]; 1840 row_col_t rc[RC_COUNT];
1839 1841
… …
1876 * Refresh the entire screen 1878 * Refresh the entire screen
1877 */ 1879 */
1878void 1880void
1879rxvt_term::scr_touch (bool refresh) NOTHROW 1881rxvt_term::scr_touch (bool refresh) NOTHROW
1880{ 1882{
1881 scr_expose (0, 0, width, height, refresh); 1883 scr_expose (0, 0, vt_width, vt_height, refresh);
1882} 1884}
1883 1885
1884/* ------------------------------------------------------------------------- */ 1886/* ------------------------------------------------------------------------- */
1885/* 1887/*
1886 * Move the display so that the line represented by scrollbar value Y is at 1888 * Move the display so that the line represented by scrollbar value Y is at
… …
1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1967 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1966#endif 1968#endif
1967} 1969}
1968 1970
1969/* ------------------------------------------------------------------------- */ 1971/* ------------------------------------------------------------------------- */
1970void 1972void ecb_cold
1971rxvt_term::scr_printscreen (int fullhist) NOTHROW 1973rxvt_term::scr_printscreen (int fullhist) NOTHROW
1972{ 1974{
1973#ifdef PRINTPIPE 1975#ifdef PRINTPIPE
1974 int nrows, row_start; 1976 int nrows, row_start;
1975 FILE *fd = popen_printer (); 1977 FILE *fd = popen_printer ();
… …
2024/* 2026/*
2025 * Refresh the screen 2027 * Refresh the screen
2026 * drawn_text/drawn_rend contain the screen information before the update. 2028 * drawn_text/drawn_rend contain the screen information before the update.
2027 * screen.text/screen.rend contain what the screen will change to. 2029 * screen.text/screen.rend contain what the screen will change to.
2028 */ 2030 */
2029void 2031void ecb_hot
2030rxvt_term::scr_refresh () NOTHROW 2032rxvt_term::scr_refresh () NOTHROW
2031{ 2033{
2032 int16_t col, row, /* column/row we're processing */ 2034 int16_t col, row, /* column/row we're processing */
2033 ocrow; /* old cursor row */ 2035 ocrow; /* old cursor row */
2034 int i; /* tmp */ 2036 int i; /* tmp */
… …
2048 * A: set up vars 2050 * A: set up vars
2049 */ 2051 */
2050 refresh_count = 0; 2052 refresh_count = 0;
2051 2053
2052 unsigned int old_screen_flags = screen.flags; 2054 unsigned int old_screen_flags = screen.flags;
2053 char have_bg = 0; 2055 bool have_bg = 0;
2054#ifdef HAVE_BG_PIXMAP 2056#ifdef HAVE_BG_PIXMAP
2055 have_bg = bg_pixmap != None; 2057 have_bg = bg_img != 0;
2056#endif 2058#endif
2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2059 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2058 2060
2059 /* 2061 /*
2060 * B: reverse any characters which are selected 2062 * B: reverse any characters which are selected
… …
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2066 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2065#if ENABLE_OVERLAY 2067#if ENABLE_OVERLAY
2066 scr_swap_overlay (); 2068 scr_swap_overlay ();
2067#endif 2069#endif
2068 2070
2069 char showcursor = screen.flags & Screen_VisibleCursor; 2071 bool showcursor = screen.flags & Screen_VisibleCursor;
2070 2072
2071 /* 2073 /*
2072 * C: set the cursor character (s) 2074 * C: set the cursor character (s)
2073 */ 2075 */
2074 { 2076 {
2075 unsigned char setoldcursor; 2077 bool setoldcursor;
2076 2078
2077#ifdef CURSOR_BLINK 2079#ifdef CURSOR_BLINK
2078 if (hidden_cursor) 2080 if (hidden_cursor)
2079 showcursor = 0; 2081 showcursor = 0;
2080#endif 2082#endif
… …
2167 { 2169 {
2168 int16_t nits; 2170 int16_t nits;
2169 int i = num_scr; 2171 int i = num_scr;
2170 int j; 2172 int j;
2171 int len, wlen; 2173 int len, wlen;
2172 dLocal (int, num_scr);
2173 2174
2174 j = nrow; 2175 j = nrow;
2175 wlen = len = -1; 2176 wlen = len = -1;
2176 row = i > 0 ? 0 : j - 1; 2177 row = i > 0 ? 0 : j - 1;
2177 2178
… …
2482 2483
2483 XDrawRectangle (dpy, vt, gc, 2484 XDrawRectangle (dpy, vt, gc,
2484 Col2Pixel (col), 2485 Col2Pixel (col),
2485 Row2Pixel (oldcursor.row), 2486 Row2Pixel (oldcursor.row),
2486 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2487 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2487 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2488 (unsigned int) (Height2Pixel (1) - 1));
2488 } 2489 }
2489 } 2490 }
2490 2491
2491 /* 2492 /*
2492 * H: cleanup selection 2493 * H: cleanup selection
… …
2501 screen.flags = old_screen_flags; 2502 screen.flags = old_screen_flags;
2502 num_scr = 0; 2503 num_scr = 0;
2503 num_scr_allow = 1; 2504 num_scr_allow = 1;
2504} 2505}
2505 2506
2506void 2507void ecb_cold
2507rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2508rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2508{ 2509{
2509 if (!l.t) 2510 if (!l.valid ())
2510 return; 2511 return;
2511 2512
2512 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2513 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2513 2514
2514 for (int i = ncol; i--; ) 2515 for (int i = ncol; i--; )
2515 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2516 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2516} 2517}
2517 2518
2518void 2519void ecb_cold
2519rxvt_term::scr_remap_chars () NOTHROW 2520rxvt_term::scr_remap_chars () NOTHROW
2520{ 2521{
2521 for (int i = total_rows; i--; ) 2522 for (int i = total_rows; i--; )
2522 scr_remap_chars (row_buf [i]); 2523 scr_remap_chars (row_buf [i]);
2523 2524
… …
2526 scr_remap_chars (drawn_buf [i]); 2527 scr_remap_chars (drawn_buf [i]);
2527 scr_remap_chars (swap_buf [i]); 2528 scr_remap_chars (swap_buf [i]);
2528 } 2529 }
2529} 2530}
2530 2531
2531void 2532void ecb_cold
2532rxvt_term::scr_recolour (bool refresh) NOTHROW 2533rxvt_term::scr_recolour (bool refresh) NOTHROW
2533{ 2534{
2534 bool transparent = false; 2535 bool transparent = false;
2535 2536
2536#ifdef HAVE_BG_PIXMAP 2537#ifdef HAVE_BG_PIXMAP
2537 if (bg_pixmap != None) 2538 if (bg_img != 0)
2538 { 2539 {
2539# ifdef ENABLE_TRANSPARENCY 2540# if ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT) 2541 if (bg_flags & BG_IS_TRANSPARENT)
2541 { 2542 {
2542 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2543 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2544 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2544 2545
2545 transparent = true; 2546 transparent = true;
2546 } 2547 }
2547 else 2548 else
2548# endif 2549# endif
2549 { 2550 {
2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2551 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2552 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2552 } 2553 }
2553 } 2554 }
2554 else 2555 else
2555#endif 2556#endif
2556 { 2557 {
… …
2563 if (scrollBar.win) 2564 if (scrollBar.win)
2564 { 2565 {
2565 if (transparent) 2566 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2567 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else 2568 else
2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2569 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2569 scrollBar.state = STATE_IDLE; 2570 scrollBar.state = SB_STATE_IDLE;
2570 scrollBar.show (0); 2571 scrollBar.show (0);
2571 } 2572 }
2572 2573
2573 if (refresh) 2574 if (refresh)
2574 { 2575 {
… …
2639 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2640 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2640 srp[col] ^= rstyle; 2641 srp[col] ^= rstyle;
2641} 2642}
2642 2643
2643/* ------------------------------------------------------------------------- */ 2644/* ------------------------------------------------------------------------- */
2644void 2645void ecb_hot
2645rxvt_term::scr_reverse_selection () NOTHROW 2646rxvt_term::scr_reverse_selection () NOTHROW
2646{ 2647{
2647 if (selection.op 2648 if (selection.op
2648 && current_screen == selection.screen 2649 && current_screen == selection.screen
2649 && selection.end.row >= view_start) 2650 && selection.end.row >= view_start)
… …
2668 */ 2669 */
2669#if 0 2670#if 0
2670void 2671void
2671rxvt_term::scr_dump (int fd) NOTHROW 2672rxvt_term::scr_dump (int fd) NOTHROW
2672{ 2673{
2673 int row, wrote; 2674 // if this method is needed, it can be implemented by factoring the
2674 unsigned int width, towrite; 2675 // relevant code in scr_printscreen
2675 const char r1[] = "\n";
2676
2677 for (row = saveLines + top_row;
2678 row < saveLines + nrow - 1; row++)
2679 {
2680 width = row_buf[row].l >= 0 ? row_buf[row].l
2681 : ncol;
2682 for (towrite = width; towrite; towrite -= wrote)
2683 {
2684 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2685 towrite);
2686 if (wrote < 0)
2687 return; /* XXX: death, no report */
2688 }
2689 if (row_buf[row].l >= 0)
2690 if (write (fd, r1, 1) <= 0)
2691 return; /* XXX: death, no report */
2692 }
2693} 2676}
2694#endif 2677#endif
2695 2678
2696/* ------------------------------------------------------------------------- * 2679/* ------------------------------------------------------------------------- *
2697 * CHARACTER SELECTION * 2680 * CHARACTER SELECTION *
2698 * ------------------------------------------------------------------------- */ 2681 * ------------------------------------------------------------------------- */
2699void 2682void
2700rxvt_term::selection_check (int check_more) NOTHROW 2683rxvt_term::selection_check (int check_more) NOTHROW
2701{ 2684{
2702 row_col_t pos;
2703
2704 if (!selection.op) 2685 if (!selection.op)
2705 return; 2686 return;
2706 2687
2707 pos.row = pos.col = 0;
2708 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2688 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2709 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2689 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2710 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2711 || (check_more == 1 2691 || (check_more == 1
2712 && current_screen == selection.screen 2692 && current_screen == selection.screen
2713 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2693 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2714 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2694 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2715 || (check_more == 2
2716 && ROWCOL_IS_BEFORE (selection.beg, pos)
2717 && ROWCOL_IS_AFTER (selection.end, pos))
2718 || (check_more == 3
2719 && ROWCOL_IS_AFTER (selection.end, pos))
2720 || (check_more == 4 /* screen width change */
2721 && (selection.beg.row != selection.end.row
2722 || selection.end.col > ncol)))
2723 CLEAR_SELECTION (); 2695 CLEAR_ALL_SELECTION ();
2724} 2696}
2725 2697
2726/* ------------------------------------------------------------------------- */ 2698/* ------------------------------------------------------------------------- */
2727/* 2699/*
2728 * Paste a selection direct to the command fd 2700 * Paste a selection direct to the command fd
… …
2734 for (unsigned int i = 0; i < len; i++) 2706 for (unsigned int i = 0; i < len; i++)
2735 if (data[i] == C0_LF) 2707 if (data[i] == C0_LF)
2736 data[i] = C0_CR; 2708 data[i] = C0_CR;
2737 2709
2738 if (priv_modes & PrivMode_BracketPaste) 2710 if (priv_modes & PrivMode_BracketPaste)
2739 tt_printf ("\e[200~"); 2711 tt_printf ("\x1b[200~");
2740 2712
2741 tt_write (data, len); 2713 tt_write (data, len);
2742 2714
2743 if (priv_modes & PrivMode_BracketPaste) 2715 if (priv_modes & PrivMode_BracketPaste)
2744 tt_printf ("\e[201~"); 2716 tt_printf ("\x1b[201~");
2745} 2717}
2746 2718
2747void 2719void
2748rxvt_term::paste (char *data, unsigned int len) NOTHROW 2720rxvt_term::paste (char *data, unsigned int len) NOTHROW
2749{ 2721{
… …
2969/* ------------------------------------------------------------------------- */ 2941/* ------------------------------------------------------------------------- */
2970/* 2942/*
2971 * Mark or select text based upon number of clicks: 1, 2, or 3 2943 * Mark or select text based upon number of clicks: 1, 2, or 3
2972 * EXT: button 1 press 2944 * EXT: button 1 press
2973 */ 2945 */
2974void 2946void ecb_cold
2975rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2947rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2976{ 2948{
2977 clicks = ((clicks - 1) % 3) + 1; 2949 clicks = ((clicks - 1) % 3) + 1;
2978 selection.clicks = clicks; /* save clicks so extend will work */ 2950 selection.clicks = clicks; /* save clicks so extend will work */
2979 2951
… …
2998 2970
2999/* ------------------------------------------------------------------------- */ 2971/* ------------------------------------------------------------------------- */
3000/* 2972/*
3001 * Mark a selection at the specified col/row 2973 * Mark a selection at the specified col/row
3002 */ 2974 */
3003void 2975void ecb_cold
3004rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2976rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3005{ 2977{
3006 want_refresh = 1; 2978 want_refresh = 1;
3007 2979
3008 selection.mark.row = row + view_start; 2980 selection.mark.row = row + view_start;
… …
3035/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3007/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3036#define DELIMIT_TEXT(x) \ 3008#define DELIMIT_TEXT(x) \
3037 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3009 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3038#define DELIMIT_REND(x) 1 3010#define DELIMIT_REND(x) 1
3039 3011
3040void 3012void ecb_cold
3041rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3013rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3042{ 3014{
3043 int col, row, dirnadd, tcol, trow, w1, w2; 3015 int col, row, dirnadd, tcol, trow, w1, w2;
3044 row_col_t bound; 3016 row_col_t bound;
3045 text_t *stp; 3017 text_t *stp;
… …
3119 * EXT: button 3 press; button 1 or 3 drag 3091 * EXT: button 3 press; button 1 or 3 drag
3120 * flag == 0 ==> button 1 3092 * flag == 0 ==> button 1
3121 * flag == 1 ==> button 3 press 3093 * flag == 1 ==> button 3 press
3122 * flag == 2 ==> button 3 motion 3094 * flag == 2 ==> button 3 motion
3123 */ 3095 */
3124void 3096void ecb_cold
3125rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3097rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3126{ 3098{
3127 int col = clamp (Pixel2Col (x), 0, ncol); 3099 int col = clamp (Pixel2Col (x), 0, ncol);
3128 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3100 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3129 3101
… …
3155 3127
3156/* ------------------------------------------------------------------------- */ 3128/* ------------------------------------------------------------------------- */
3157/* 3129/*
3158 * Extend the selection to the specified col/row 3130 * Extend the selection to the specified col/row
3159 */ 3131 */
3160void 3132void ecb_cold
3161rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3133rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3162{ 3134{
3163 row_col_t pos; 3135 row_col_t pos;
3164 enum { 3136 enum {
3165 LEFT, RIGHT 3137 LEFT, RIGHT
… …
3356 ::swap (selection.beg.col, selection.end.col); 3328 ::swap (selection.beg.col, selection.end.col);
3357#endif 3329#endif
3358} 3330}
3359 3331
3360#if !ENABLE_MINIMAL 3332#if !ENABLE_MINIMAL
3361void 3333void ecb_cold
3362rxvt_term::selection_remove_trailing_spaces () NOTHROW 3334rxvt_term::selection_remove_trailing_spaces () NOTHROW
3363{ 3335{
3364 int32_t end_col, end_row; 3336 int32_t end_col, end_row;
3365 text_t *stp; 3337 text_t *stp;
3366 3338
… …
3404/* ------------------------------------------------------------------------- */ 3376/* ------------------------------------------------------------------------- */
3405/* 3377/*
3406 * Double click on button 3 when already selected 3378 * Double click on button 3 when already selected
3407 * EXT: button 3 double click 3379 * EXT: button 3 double click
3408 */ 3380 */
3409void 3381void ecb_cold
3410rxvt_term::selection_rotate (int x, int y) NOTHROW 3382rxvt_term::selection_rotate (int x, int y) NOTHROW
3411{ 3383{
3412 selection.clicks = selection.clicks % 3 + 1; 3384 selection.clicks = selection.clicks % 3 + 1;
3413 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3385 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3414} 3386}
… …
3416/* ------------------------------------------------------------------------- */ 3388/* ------------------------------------------------------------------------- */
3417/* 3389/*
3418 * Respond to a request for our current selection 3390 * Respond to a request for our current selection
3419 * EXT: SelectionRequest 3391 * EXT: SelectionRequest
3420 */ 3392 */
3421void 3393void ecb_cold
3422rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3394rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3423{ 3395{
3424 Atom property = rq.property == None ? rq.target : rq.property; 3396 Atom property = rq.property == None ? rq.target : rq.property;
3425 XSelectionEvent ev; 3397 XSelectionEvent ev;
3426 3398
… …
3559 3531
3560 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3532 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3561} 3533}
3562 3534
3563/* ------------------------------------------------------------------------- */ 3535/* ------------------------------------------------------------------------- */
3564#ifdef USE_XIM 3536#if USE_XIM
3565void 3537void ecb_cold
3566rxvt_term::im_set_position (XPoint &pos) NOTHROW 3538rxvt_term::im_set_position (XPoint &pos) NOTHROW
3567{ 3539{
3568 XWindowAttributes xwa; 3540 XWindowAttributes xwa;
3569 3541
3570 XGetWindowAttributes (dpy, vt, &xwa); 3542 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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