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

Diff Legend

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