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.396 by root, Wed Nov 2 10:53:12 2011 UTC vs.
Revision 1.431 by root, Sun Jan 13 20:19:24 2013 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a separate compile!
34
35static inline void 33static inline void
36fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
37{ 35{
38 while (len--) 36 while (len--)
39 *start++ = value; 37 *start++ = value;
… …
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 = min (src.l, ncol);
399 dst.f = src.f;
386 } 400 }
387 401
388 for (int row = prev_nrow; row < nrow; row++) 402 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 403 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 404
393 term_start = 0; 405 term_start = 0;
394 } 406 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 407
400 clamp_it (screen.cur.row, 0, nrow - 1); 408 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 409 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 410 }
403 411
412 for (int row = nrow; row--; )
413 {
414 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
415 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
416 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
417 }
418
419 chunk_free (prev_chunk, prev_chunk_size);
420
404 free (tabs); 421 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 422 tabs = (char *)rxvt_malloc (ncol);
406 423
407 for (int col = ncol; col--; ) 424 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 425 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 432 tt_winch ();
416 433
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 434 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 435}
419 436
420/* ------------------------------------------------------------------------- */ 437void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 438rxvt_term::scr_release () NOTHROW
426{ 439{
427 if (row_buf) 440 chunk_free (chunk, chunk_size);
428 { 441 chunk = 0;
429 delete talloc; talloc = 0; 442 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 443
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); 444 free (tabs);
438 tabs = 0; 445 tabs = 0;
439 }
440} 446}
441 447
442/* ------------------------------------------------------------------------- */ 448/* ------------------------------------------------------------------------- */
443/* 449/*
444 * Hard/Soft reset 450 * Hard/Soft reset
445 */ 451 */
446void 452void ecb_cold
447rxvt_term::scr_poweron () 453rxvt_term::scr_poweron ()
448{ 454{
449 scr_release (); 455 scr_release ();
456
450 prev_nrow = prev_ncol = 0; 457 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 458 rvideo_mode = false;
452 scr_soft_reset (); 459 scr_soft_reset ();
453 scr_reset (); 460 scr_reset ();
454 461
455 scr_clear (true); 462 scr_clear (true);
456 scr_refresh (); 463 scr_refresh ();
457} 464}
458 465
459void 466void ecb_cold
460rxvt_term::scr_soft_reset () 467rxvt_term::scr_soft_reset () NOTHROW
461{ 468{
462 /* only affects modes, nothing drastic such as clearing the screen */ 469 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 470#if ENABLE_OVERLAY
464 scr_overlay_off (); 471 scr_overlay_off ();
465#endif 472#endif
… …
520 assert (s->cur.row >= 0); 527 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 528 assert (s->cur.col >= 0);
522} 529}
523 530
524void 531void
525rxvt_term::scr_swap_screen () 532rxvt_term::scr_swap_screen () NOTHROW
526{ 533{
527 if (!option (Opt_secondaryScreen)) 534 if (!option (Opt_secondaryScreen))
528 return; 535 return;
529 536
530 for (int i = prev_nrow; i--; ) 537 for (int i = prev_nrow; i--; )
… …
549 return; 556 return;
550 557
551 want_refresh = 1; 558 want_refresh = 1;
552 view_start = 0; 559 view_start = 0;
553 560
554 selection_check (2); /* check for boundary cross */ 561 /* check for boundary cross */
562 row_col_t pos;
563 pos.row = pos.col = 0;
564 if (ROWCOL_IS_BEFORE (selection.beg, pos)
565 && ROWCOL_IS_AFTER (selection.end, pos))
566 CLEAR_SELECTION ();
555 567
556 current_screen = scrn; 568 current_screen = scrn;
557 569
558#if NSCREENS 570#if NSCREENS
559 if (option (Opt_secondaryScreen)) 571 if (option (Opt_secondaryScreen))
… …
625/* 637/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 638 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 639 * count positive ==> scroll up
628 * count negative ==> scroll down 640 * count negative ==> scroll down
629 */ 641 */
630int 642int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 643rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 644{
633 if (count == 0 || (row1 > row2)) 645 if (count == 0 || (row1 > row2))
634 return 0; 646 return 0;
635 647
… …
682 else 694 else
683 scr_blank_screen_mem (l, rstyle); 695 scr_blank_screen_mem (l, rstyle);
684 } 696 }
685 697
686 // move and/or clear selection, if any 698 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 699 if (selection.op && current_screen == selection.screen
700 && selection.beg.row <= row2)
688 { 701 {
689 selection.beg.row -= count; 702 selection.beg.row -= count;
690 selection.end.row -= count; 703 selection.end.row -= count;
691 selection.mark.row -= count; 704 selection.mark.row -= count;
692 705
… …
768 781
769/* ------------------------------------------------------------------------- */ 782/* ------------------------------------------------------------------------- */
770/* 783/*
771 * Add text given in <str> of length <len> to screen struct 784 * Add text given in <str> of length <len> to screen struct
772 */ 785 */
773void 786void ecb_hot
774rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 787rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
775{ 788{
776 if (len <= 0) /* sanity */ 789 if (len <= 0) /* sanity */
777 return; 790 return;
778 791
779 unsigned char checksel; 792 bool checksel;
780 unicode_t c; 793 unicode_t c;
781 int ncol = this->ncol; 794 int ncol = this->ncol;
782 const wchar_t *strend = str + len; 795 const wchar_t *strend = str + len;
783 796
784 want_refresh = 1; 797 want_refresh = 1;
… …
1128 * XTERM_SEQ: ESC 6 1141 * XTERM_SEQ: ESC 6
1129 * Move cursor left in row. If we're at the left boundary, shift everything 1142 * Move cursor left in row. If we're at the left boundary, shift everything
1130 * in that row right. Clear left column. 1143 * in that row right. Clear left column.
1131 */ 1144 */
1132#if !ENABLE_MINIMAL 1145#if !ENABLE_MINIMAL
1133void 1146void ecb_cold
1134rxvt_term::scr_backindex () NOTHROW 1147rxvt_term::scr_backindex () NOTHROW
1135{ 1148{
1136 if (screen.cur.col > 0) 1149 if (screen.cur.col > 0)
1137 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1150 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1138 else 1151 else
… …
1145 * XTERM_SEQ: ESC 9 1158 * XTERM_SEQ: ESC 9
1146 * Move cursor right in row. If we're at the right boundary, shift everything 1159 * Move cursor right in row. If we're at the right boundary, shift everything
1147 * in that row left. Clear right column. 1160 * in that row left. Clear right column.
1148 */ 1161 */
1149#if !ENABLE_MINIMAL 1162#if !ENABLE_MINIMAL
1150void 1163void ecb_cold
1151rxvt_term::scr_forwardindex () NOTHROW 1164rxvt_term::scr_forwardindex () NOTHROW
1152{ 1165{
1153 if (screen.cur.col < ncol - 1) 1166 if (screen.cur.col < ncol - 1)
1154 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1167 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1155 else 1168 else
… …
1306 scr_blank_line (line, col, num, rstyle); 1319 scr_blank_line (line, col, num, rstyle);
1307} 1320}
1308 1321
1309/* ------------------------------------------------------------------------- */ 1322/* ------------------------------------------------------------------------- */
1310/* 1323/*
1311 * Erase part of whole of the screen 1324 * Erase part or whole of the screen
1312 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1325 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1313 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1326 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1314 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1327 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1315 */ 1328 */
1316void 1329void
… …
1325 ZERO_SCROLLBACK (); 1338 ZERO_SCROLLBACK ();
1326 1339
1327 switch (mode) 1340 switch (mode)
1328 { 1341 {
1329 case 0: /* erase to end of screen */ 1342 case 0: /* erase to end of screen */
1330 selection_check (1);
1331 scr_erase_line (0); 1343 scr_erase_line (0);
1332 row = screen.cur.row + 1; /* possible OOB */ 1344 row = screen.cur.row + 1; /* possible OOB */
1333 num = nrow - row; 1345 num = nrow - row;
1334 break; 1346 break;
1335 case 1: /* erase to beginning of screen */ 1347 case 1: /* erase to beginning of screen */
1336 selection_check (3);
1337 scr_erase_line (1); 1348 scr_erase_line (1);
1338 row = 0; 1349 row = 0;
1339 num = screen.cur.row; 1350 num = screen.cur.row;
1340 break; 1351 break;
1341 case 2: /* erase whole screen */ 1352 case 2: /* erase whole screen */
1342 selection_check (3);
1343 row = 0; 1353 row = 0;
1344 num = nrow; 1354 num = nrow;
1345 break; 1355 break;
1346 default: 1356 default:
1347 return; 1357 return;
… …
1364 { 1374 {
1365 ren = DEFAULT_RSTYLE; 1375 ren = DEFAULT_RSTYLE;
1366 1376
1367 if (mapped) 1377 if (mapped)
1368 XClearArea (dpy, vt, 0, 1378 XClearArea (dpy, vt, 0,
1369 Row2Pixel (row - view_start), (unsigned int)width, 1379 Row2Pixel (row - view_start), (unsigned int)vt_width,
1370 (unsigned int)Height2Pixel (num), False); 1380 (unsigned int)Height2Pixel (num), False);
1371 } 1381 }
1372 else 1382 else
1373 { 1383 {
1374 ren = rstyle & (RS_fgMask | RS_bgMask); 1384 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1377 { 1387 {
1378 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1388 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1379 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1389 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1380 XFillRectangle (dpy, vt, gc, 1390 XFillRectangle (dpy, vt, gc,
1381 0, Row2Pixel (row - view_start), 1391 0, Row2Pixel (row - view_start),
1382 (unsigned int)width, 1392 (unsigned int)vt_width,
1383 (unsigned int)Height2Pixel (num)); 1393 (unsigned int)Height2Pixel (num));
1384 gcvalue.foreground = pix_colors[Color_fg]; 1394 gcvalue.foreground = pix_colors[Color_fg];
1385 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1395 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1386 } 1396 }
1387 } 1397 }
… …
1409/* ------------------------------------------------------------------------- */ 1419/* ------------------------------------------------------------------------- */
1410/* 1420/*
1411 * Fill the screen with `E's 1421 * Fill the screen with `E's
1412 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1422 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1413 */ 1423 */
1414void 1424void ecb_cold
1415rxvt_term::scr_E () NOTHROW 1425rxvt_term::scr_E () NOTHROW
1416{ 1426{
1417 rend_t fs; 1427 rend_t fs;
1418 1428
1419 want_refresh = 1; 1429 want_refresh = 1;
1420 ZERO_SCROLLBACK (); 1430 ZERO_SCROLLBACK ();
1421 1431
1422 num_scr_allow = 0; 1432 num_scr_allow = 0;
1423 selection_check (3); 1433
1434 row_col_t pos;
1435 pos.row = pos.col = 0;
1436 if (ROWCOL_IS_AFTER (selection.end, pos))
1437 CLEAR_SELECTION ();
1424 1438
1425 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1439 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1426 for (int row = nrow; row--; ) 1440 for (int row = nrow; row--; )
1427 { 1441 {
1428 line_t &line = ROW(row); 1442 line_t &line = ROW(row);
… …
1579/* ------------------------------------------------------------------------- */ 1593/* ------------------------------------------------------------------------- */
1580/* 1594/*
1581 * Set the scrolling region 1595 * Set the scrolling region
1582 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1596 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1583 */ 1597 */
1584void 1598void ecb_cold
1585rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1599rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1586{ 1600{
1587 max_it (top, 0); 1601 max_it (top, 0);
1588 min_it (bot, nrow - 1); 1602 min_it (bot, nrow - 1);
1589 1603
… …
1599/* 1613/*
1600 * Make the cursor visible/invisible 1614 * Make the cursor visible/invisible
1601 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1615 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1602 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1616 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1603 */ 1617 */
1604void 1618void ecb_cold
1605rxvt_term::scr_cursor_visible (int mode) NOTHROW 1619rxvt_term::scr_cursor_visible (int mode) NOTHROW
1606{ 1620{
1607 want_refresh = 1; 1621 want_refresh = 1;
1608 1622
1609 if (mode) 1623 if (mode)
… …
1616/* 1630/*
1617 * Set/unset automatic wrapping 1631 * Set/unset automatic wrapping
1618 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1632 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1619 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1633 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1620 */ 1634 */
1621void 1635void ecb_cold
1622rxvt_term::scr_autowrap (int mode) NOTHROW 1636rxvt_term::scr_autowrap (int mode) NOTHROW
1623{ 1637{
1624 if (mode) 1638 if (mode)
1625 screen.flags |= Screen_Autowrap; 1639 screen.flags |= Screen_Autowrap;
1626 else 1640 else
… …
1635 * Relative mode: line numbers are relative to top margin of scrolling region 1649 * Relative mode: line numbers are relative to top margin of scrolling region
1636 * and the cursor cannot be moved outside. 1650 * and the cursor cannot be moved outside.
1637 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1651 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1638 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1652 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1639 */ 1653 */
1640void 1654void ecb_cold
1641rxvt_term::scr_relative_origin (int mode) NOTHROW 1655rxvt_term::scr_relative_origin (int mode) NOTHROW
1642{ 1656{
1643 if (mode) 1657 if (mode)
1644 screen.flags |= Screen_Relative; 1658 screen.flags |= Screen_Relative;
1645 else 1659 else
… …
1652/* 1666/*
1653 * Set insert/replace mode 1667 * Set insert/replace mode
1654 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1668 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1655 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1669 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1656 */ 1670 */
1657void 1671void ecb_cold
1658rxvt_term::scr_insert_mode (int mode) NOTHROW 1672rxvt_term::scr_insert_mode (int mode) NOTHROW
1659{ 1673{
1660 if (mode) 1674 if (mode)
1661 screen.flags |= Screen_Insert; 1675 screen.flags |= Screen_Insert;
1662 else 1676 else
… …
1668 * Set/Unset tabs 1682 * Set/Unset tabs
1669 * XTERM_SEQ: Set tab at current column : ESC H 1683 * XTERM_SEQ: Set tab at current column : ESC H
1670 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1684 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1671 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1685 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1672 */ 1686 */
1673void 1687void ecb_cold
1674rxvt_term::scr_set_tab (int mode) NOTHROW 1688rxvt_term::scr_set_tab (int mode) NOTHROW
1675{ 1689{
1676 if (mode < 0) 1690 if (mode < 0)
1677 memset (tabs, 0, ncol); 1691 memset (tabs, 0, ncol);
1678 else if (screen.cur.col < ncol) 1692 else if (screen.cur.col < ncol)
… …
1697 if (rvideo_state != on) 1711 if (rvideo_state != on)
1698 { 1712 {
1699 rvideo_state = on; 1713 rvideo_state = on;
1700 1714
1701 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1715 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1702#ifdef HAVE_BG_PIXMAP 1716#ifdef HAVE_IMG
1703 if (bg_pixmap == None) 1717 if (bg_img == 0)
1704#endif 1718#endif
1705 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1719 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1706 1720
1707 XGCValues gcvalue; 1721 XGCValues gcvalue;
1708 gcvalue.foreground = pix_colors[Color_fg]; 1722 gcvalue.foreground = pix_colors[Color_fg];
… …
1717/* ------------------------------------------------------------------------- */ 1731/* ------------------------------------------------------------------------- */
1718/* 1732/*
1719 * Report current cursor position 1733 * Report current cursor position
1720 * XTERM_SEQ: Report position: ESC [ 6 n 1734 * XTERM_SEQ: Report position: ESC [ 6 n
1721 */ 1735 */
1722void 1736void ecb_cold
1723rxvt_term::scr_report_position () NOTHROW 1737rxvt_term::scr_report_position () NOTHROW
1724{ 1738{
1725 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1739 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1726} 1740}
1727 1741
… …
1730 * ------------------------------------------------------------------------- */ 1744 * ------------------------------------------------------------------------- */
1731 1745
1732/* 1746/*
1733 * Set font style 1747 * Set font style
1734 */ 1748 */
1735void 1749void ecb_cold
1736rxvt_term::set_font_style () NOTHROW 1750rxvt_term::set_font_style () NOTHROW
1737{ 1751{
1738#if 0 1752#if 0
1739 switch (charsets [screen.charset]) 1753 switch (charsets [screen.charset])
1740 { 1754 {
… …
1762 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1776 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1763 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1777 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1764 * XTERM_SEQ: Invoke G2 character set: ESC N 1778 * XTERM_SEQ: Invoke G2 character set: ESC N
1765 * XTERM_SEQ: Invoke G3 character set: ESC O 1779 * XTERM_SEQ: Invoke G3 character set: ESC O
1766 */ 1780 */
1767void 1781void ecb_cold
1768rxvt_term::scr_charset_choose (int set) NOTHROW 1782rxvt_term::scr_charset_choose (int set) NOTHROW
1769{ 1783{
1770 screen.charset = set; 1784 screen.charset = set;
1771 set_font_style (); 1785 set_font_style ();
1772} 1786}
… …
1793 * ------------------------------------------------------------------------- */ 1807 * ------------------------------------------------------------------------- */
1794 1808
1795/* 1809/*
1796 * refresh matching text. 1810 * refresh matching text.
1797 */ 1811 */
1798bool 1812bool ecb_cold
1799rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1813rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1800{ 1814{
1801 bool found = false; 1815 bool found = false;
1802 1816
1803 for (int i = 0; i < nrow; i++) 1817 for (int i = 0; i < nrow; i++)
… …
1822 PART_BEG = 0, 1836 PART_BEG = 0,
1823 PART_END, 1837 PART_END,
1824 RC_COUNT 1838 RC_COUNT
1825}; 1839};
1826 1840
1827void 1841void ecb_hot
1828rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1842rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1829{ 1843{
1830 int i; 1844 int i;
1831 row_col_t rc[RC_COUNT]; 1845 row_col_t rc[RC_COUNT];
1832 1846
… …
1869 * Refresh the entire screen 1883 * Refresh the entire screen
1870 */ 1884 */
1871void 1885void
1872rxvt_term::scr_touch (bool refresh) NOTHROW 1886rxvt_term::scr_touch (bool refresh) NOTHROW
1873{ 1887{
1874 scr_expose (0, 0, width, height, refresh); 1888 scr_expose (0, 0, vt_width, vt_height, refresh);
1875} 1889}
1876 1890
1877/* ------------------------------------------------------------------------- */ 1891/* ------------------------------------------------------------------------- */
1878/* 1892/*
1879 * Move the display so that the line represented by scrollbar value Y is at 1893 * Move the display so that the line represented by scrollbar value Y is at
… …
1958 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1972 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1959#endif 1973#endif
1960} 1974}
1961 1975
1962/* ------------------------------------------------------------------------- */ 1976/* ------------------------------------------------------------------------- */
1963void 1977void ecb_cold
1964rxvt_term::scr_printscreen (int fullhist) NOTHROW 1978rxvt_term::scr_printscreen (int fullhist) NOTHROW
1965{ 1979{
1966#ifdef PRINTPIPE 1980#ifdef PRINTPIPE
1967 int nrows, row_start; 1981 int nrows, row_start;
1968 FILE *fd = popen_printer (); 1982 FILE *fd = popen_printer ();
… …
2017/* 2031/*
2018 * Refresh the screen 2032 * Refresh the screen
2019 * drawn_text/drawn_rend contain the screen information before the update. 2033 * drawn_text/drawn_rend contain the screen information before the update.
2020 * screen.text/screen.rend contain what the screen will change to. 2034 * screen.text/screen.rend contain what the screen will change to.
2021 */ 2035 */
2022void 2036void ecb_hot
2023rxvt_term::scr_refresh () NOTHROW 2037rxvt_term::scr_refresh () NOTHROW
2024{ 2038{
2025 int16_t col, row, /* column/row we're processing */ 2039 int16_t col, row, /* column/row we're processing */
2026 ocrow; /* old cursor row */ 2040 ocrow; /* old cursor row */
2027 int i; /* tmp */ 2041 int i; /* tmp */
… …
2041 * A: set up vars 2055 * A: set up vars
2042 */ 2056 */
2043 refresh_count = 0; 2057 refresh_count = 0;
2044 2058
2045 unsigned int old_screen_flags = screen.flags; 2059 unsigned int old_screen_flags = screen.flags;
2046 char have_bg = 0; 2060 bool have_bg = 0;
2047#ifdef HAVE_BG_PIXMAP 2061#ifdef HAVE_IMG
2048 have_bg = bg_pixmap != None; 2062 have_bg = bg_img != 0;
2049#endif 2063#endif
2050 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2051 2065
2052 /* 2066 /*
2053 * B: reverse any characters which are selected 2067 * B: reverse any characters which are selected
… …
2057 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2071 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2058#if ENABLE_OVERLAY 2072#if ENABLE_OVERLAY
2059 scr_swap_overlay (); 2073 scr_swap_overlay ();
2060#endif 2074#endif
2061 2075
2062 char showcursor = screen.flags & Screen_VisibleCursor; 2076 bool showcursor = screen.flags & Screen_VisibleCursor;
2063 2077
2064 /* 2078 /*
2065 * C: set the cursor character (s) 2079 * C: set the cursor character (s)
2066 */ 2080 */
2067 { 2081 {
2068 unsigned char setoldcursor; 2082 bool setoldcursor;
2069 2083
2070#ifdef CURSOR_BLINK 2084#ifdef CURSOR_BLINK
2071 if (hidden_cursor) 2085 if (hidden_cursor)
2072 showcursor = 0; 2086 showcursor = 0;
2073#endif 2087#endif
… …
2160 { 2174 {
2161 int16_t nits; 2175 int16_t nits;
2162 int i = num_scr; 2176 int i = num_scr;
2163 int j; 2177 int j;
2164 int len, wlen; 2178 int len, wlen;
2165 dLocal (int, num_scr);
2166 2179
2167 j = nrow; 2180 j = nrow;
2168 wlen = len = -1; 2181 wlen = len = -1;
2169 row = i > 0 ? 0 : j - 1; 2182 row = i > 0 ? 0 : j - 1;
2170 2183
… …
2475 2488
2476 XDrawRectangle (dpy, vt, gc, 2489 XDrawRectangle (dpy, vt, gc,
2477 Col2Pixel (col), 2490 Col2Pixel (col),
2478 Row2Pixel (oldcursor.row), 2491 Row2Pixel (oldcursor.row),
2479 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2492 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2480 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2493 (unsigned int) (Height2Pixel (1) - 1));
2481 } 2494 }
2482 } 2495 }
2483 2496
2484 /* 2497 /*
2485 * H: cleanup selection 2498 * H: cleanup selection
… …
2494 screen.flags = old_screen_flags; 2507 screen.flags = old_screen_flags;
2495 num_scr = 0; 2508 num_scr = 0;
2496 num_scr_allow = 1; 2509 num_scr_allow = 1;
2497} 2510}
2498 2511
2499void 2512void ecb_cold
2500rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2513rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2501{ 2514{
2502 if (!l.t) 2515 if (!l.valid ())
2503 return; 2516 return;
2504 2517
2505 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2518 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2506 2519
2507 for (int i = ncol; i--; ) 2520 for (int i = ncol; i--; )
2508 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2521 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2509} 2522}
2510 2523
2511void 2524void ecb_cold
2512rxvt_term::scr_remap_chars () NOTHROW 2525rxvt_term::scr_remap_chars () NOTHROW
2513{ 2526{
2514 for (int i = total_rows; i--; ) 2527 for (int i = total_rows; i--; )
2515 scr_remap_chars (row_buf [i]); 2528 scr_remap_chars (row_buf [i]);
2516 2529
… …
2519 scr_remap_chars (drawn_buf [i]); 2532 scr_remap_chars (drawn_buf [i]);
2520 scr_remap_chars (swap_buf [i]); 2533 scr_remap_chars (swap_buf [i]);
2521 } 2534 }
2522} 2535}
2523 2536
2524void 2537void ecb_cold
2525rxvt_term::scr_recolour (bool refresh) NOTHROW 2538rxvt_term::scr_recolour (bool refresh) NOTHROW
2526{ 2539{
2527 bool transparent = false; 2540 bool transparent = false;
2528 2541
2529#ifdef HAVE_BG_PIXMAP 2542#ifdef HAVE_IMG
2530 if (bg_pixmap != None) 2543 if (bg_img != 0)
2531 { 2544 {
2532# ifdef ENABLE_TRANSPARENCY 2545# if ENABLE_TRANSPARENCY
2533 if (bg_flags & BG_IS_TRANSPARENT) 2546 if (bg_flags & BG_IS_TRANSPARENT)
2534 { 2547 {
2535 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2548 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2536 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2549 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2537 2550
2538 transparent = true; 2551 transparent = true;
2539 } 2552 }
2540 else 2553 else
2541# endif 2554# endif
2542 { 2555 {
2543 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2544 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2557 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2545 } 2558 }
2546 } 2559 }
2547 else 2560 else
2548#endif 2561#endif
2549 { 2562 {
… …
2556 if (scrollBar.win) 2569 if (scrollBar.win)
2557 { 2570 {
2558 if (transparent) 2571 if (transparent)
2559 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2572 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2560 else 2573 else
2561 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2574 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2562 scrollBar.state = SB_STATE_IDLE; 2575 scrollBar.state = SB_STATE_IDLE;
2563 scrollBar.show (0); 2576 scrollBar.show (0);
2564 } 2577 }
2565 2578
2566 if (refresh) 2579 if (refresh)
… …
2632 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2645 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2633 srp[col] ^= rstyle; 2646 srp[col] ^= rstyle;
2634} 2647}
2635 2648
2636/* ------------------------------------------------------------------------- */ 2649/* ------------------------------------------------------------------------- */
2637void 2650void ecb_hot
2638rxvt_term::scr_reverse_selection () NOTHROW 2651rxvt_term::scr_reverse_selection () NOTHROW
2639{ 2652{
2640 if (selection.op 2653 if (selection.op
2641 && current_screen == selection.screen 2654 && current_screen == selection.screen
2642 && selection.end.row >= view_start) 2655 && selection.end.row >= view_start)
… …
2661 */ 2674 */
2662#if 0 2675#if 0
2663void 2676void
2664rxvt_term::scr_dump (int fd) NOTHROW 2677rxvt_term::scr_dump (int fd) NOTHROW
2665{ 2678{
2666 int row, wrote; 2679 // if this method is needed, it can be implemented by factoring the
2667 unsigned int width, towrite; 2680 // relevant code in scr_printscreen
2668 const char r1[] = "\n";
2669
2670 for (row = saveLines + top_row;
2671 row < saveLines + nrow - 1; row++)
2672 {
2673 width = row_buf[row].l >= 0 ? row_buf[row].l
2674 : ncol;
2675 for (towrite = width; towrite; towrite -= wrote)
2676 {
2677 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2678 towrite);
2679 if (wrote < 0)
2680 return; /* XXX: death, no report */
2681 }
2682 if (row_buf[row].l >= 0)
2683 if (write (fd, r1, 1) <= 0)
2684 return; /* XXX: death, no report */
2685 }
2686} 2681}
2687#endif 2682#endif
2688 2683
2689/* ------------------------------------------------------------------------- * 2684/* ------------------------------------------------------------------------- *
2690 * CHARACTER SELECTION * 2685 * CHARACTER SELECTION *
2691 * ------------------------------------------------------------------------- */ 2686 * ------------------------------------------------------------------------- */
2692void 2687void
2693rxvt_term::selection_check (int check_more) NOTHROW 2688rxvt_term::selection_check (int check_more) NOTHROW
2694{ 2689{
2695 row_col_t pos;
2696
2697 if (!selection.op) 2690 if (!selection.op)
2698 return; 2691 return;
2699 2692
2700 pos.row = pos.col = 0;
2701 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2693 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2702 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2694 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2703 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2695 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2704 || (check_more == 1 2696 || (check_more == 1
2705 && current_screen == selection.screen 2697 && current_screen == selection.screen
2706 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2698 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2707 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2699 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2708 || (check_more == 2
2709 && ROWCOL_IS_BEFORE (selection.beg, pos)
2710 && ROWCOL_IS_AFTER (selection.end, pos))
2711 || (check_more == 3
2712 && ROWCOL_IS_AFTER (selection.end, pos))
2713 || (check_more == 4 /* screen width change */
2714 && (selection.beg.row != selection.end.row
2715 || selection.end.col > ncol)))
2716 CLEAR_ALL_SELECTION (); 2700 CLEAR_ALL_SELECTION ();
2717} 2701}
2718 2702
2719/* ------------------------------------------------------------------------- */ 2703/* ------------------------------------------------------------------------- */
2720/* 2704/*
… …
2727 for (unsigned int i = 0; i < len; i++) 2711 for (unsigned int i = 0; i < len; i++)
2728 if (data[i] == C0_LF) 2712 if (data[i] == C0_LF)
2729 data[i] = C0_CR; 2713 data[i] = C0_CR;
2730 2714
2731 if (priv_modes & PrivMode_BracketPaste) 2715 if (priv_modes & PrivMode_BracketPaste)
2732 tt_printf ("\e[200~"); 2716 tt_printf ("\x1b[200~");
2733 2717
2734 tt_write (data, len); 2718 tt_write (data, len);
2735 2719
2736 if (priv_modes & PrivMode_BracketPaste) 2720 if (priv_modes & PrivMode_BracketPaste)
2737 tt_printf ("\e[201~"); 2721 tt_printf ("\x1b[201~");
2738} 2722}
2739 2723
2740void 2724void
2741rxvt_term::paste (char *data, unsigned int len) NOTHROW 2725rxvt_term::paste (char *data, unsigned int len) NOTHROW
2742{ 2726{
… …
2962/* ------------------------------------------------------------------------- */ 2946/* ------------------------------------------------------------------------- */
2963/* 2947/*
2964 * Mark or select text based upon number of clicks: 1, 2, or 3 2948 * Mark or select text based upon number of clicks: 1, 2, or 3
2965 * EXT: button 1 press 2949 * EXT: button 1 press
2966 */ 2950 */
2967void 2951void ecb_cold
2968rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2952rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2969{ 2953{
2970 clicks = ((clicks - 1) % 3) + 1; 2954 clicks = ((clicks - 1) % 3) + 1;
2971 selection.clicks = clicks; /* save clicks so extend will work */ 2955 selection.clicks = clicks; /* save clicks so extend will work */
2972 2956
… …
2991 2975
2992/* ------------------------------------------------------------------------- */ 2976/* ------------------------------------------------------------------------- */
2993/* 2977/*
2994 * Mark a selection at the specified col/row 2978 * Mark a selection at the specified col/row
2995 */ 2979 */
2996void 2980void ecb_cold
2997rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2981rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2998{ 2982{
2999 want_refresh = 1; 2983 want_refresh = 1;
3000 2984
3001 selection.mark.row = row + view_start; 2985 selection.mark.row = row + view_start;
… …
3028/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3012/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3029#define DELIMIT_TEXT(x) \ 3013#define DELIMIT_TEXT(x) \
3030 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3014 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3031#define DELIMIT_REND(x) 1 3015#define DELIMIT_REND(x) 1
3032 3016
3033void 3017void ecb_cold
3034rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3018rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3035{ 3019{
3036 int col, row, dirnadd, tcol, trow, w1, w2; 3020 int col, row, dirnadd, tcol, trow, w1, w2;
3037 row_col_t bound; 3021 row_col_t bound;
3038 text_t *stp; 3022 text_t *stp;
… …
3112 * EXT: button 3 press; button 1 or 3 drag 3096 * EXT: button 3 press; button 1 or 3 drag
3113 * flag == 0 ==> button 1 3097 * flag == 0 ==> button 1
3114 * flag == 1 ==> button 3 press 3098 * flag == 1 ==> button 3 press
3115 * flag == 2 ==> button 3 motion 3099 * flag == 2 ==> button 3 motion
3116 */ 3100 */
3117void 3101void ecb_cold
3118rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3102rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3119{ 3103{
3120 int col = clamp (Pixel2Col (x), 0, ncol); 3104 int col = clamp (Pixel2Col (x), 0, ncol);
3121 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3105 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3122 3106
… …
3148 3132
3149/* ------------------------------------------------------------------------- */ 3133/* ------------------------------------------------------------------------- */
3150/* 3134/*
3151 * Extend the selection to the specified col/row 3135 * Extend the selection to the specified col/row
3152 */ 3136 */
3153void 3137void ecb_cold
3154rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3138rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3155{ 3139{
3156 row_col_t pos; 3140 row_col_t pos;
3157 enum { 3141 enum {
3158 LEFT, RIGHT 3142 LEFT, RIGHT
… …
3349 ::swap (selection.beg.col, selection.end.col); 3333 ::swap (selection.beg.col, selection.end.col);
3350#endif 3334#endif
3351} 3335}
3352 3336
3353#if !ENABLE_MINIMAL 3337#if !ENABLE_MINIMAL
3354void 3338void ecb_cold
3355rxvt_term::selection_remove_trailing_spaces () NOTHROW 3339rxvt_term::selection_remove_trailing_spaces () NOTHROW
3356{ 3340{
3357 int32_t end_col, end_row; 3341 int32_t end_col, end_row;
3358 text_t *stp; 3342 text_t *stp;
3359 3343
… …
3397/* ------------------------------------------------------------------------- */ 3381/* ------------------------------------------------------------------------- */
3398/* 3382/*
3399 * Double click on button 3 when already selected 3383 * Double click on button 3 when already selected
3400 * EXT: button 3 double click 3384 * EXT: button 3 double click
3401 */ 3385 */
3402void 3386void ecb_cold
3403rxvt_term::selection_rotate (int x, int y) NOTHROW 3387rxvt_term::selection_rotate (int x, int y) NOTHROW
3404{ 3388{
3405 selection.clicks = selection.clicks % 3 + 1; 3389 selection.clicks = selection.clicks % 3 + 1;
3406 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3390 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3407} 3391}
… …
3409/* ------------------------------------------------------------------------- */ 3393/* ------------------------------------------------------------------------- */
3410/* 3394/*
3411 * Respond to a request for our current selection 3395 * Respond to a request for our current selection
3412 * EXT: SelectionRequest 3396 * EXT: SelectionRequest
3413 */ 3397 */
3414void 3398void ecb_cold
3415rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3399rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3416{ 3400{
3417 Atom property = rq.property == None ? rq.target : rq.property; 3401 Atom property = rq.property == None ? rq.target : rq.property;
3418 XSelectionEvent ev; 3402 XSelectionEvent ev;
3419 3403
… …
3552 3536
3553 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3537 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3554} 3538}
3555 3539
3556/* ------------------------------------------------------------------------- */ 3540/* ------------------------------------------------------------------------- */
3557#ifdef USE_XIM 3541#if USE_XIM
3558void 3542void ecb_cold
3559rxvt_term::im_set_position (XPoint &pos) NOTHROW 3543rxvt_term::im_set_position (XPoint &pos) NOTHROW
3560{ 3544{
3561 XWindowAttributes xwa; 3545 XWindowAttributes xwa;
3562 3546
3563 XGetWindowAttributes (dpy, vt, &xwa); 3547 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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