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.402 by root, Tue Nov 15 18:23:46 2011 UTC vs.
Revision 1.440 by root, Wed Mar 27 17:24:16 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 ();
… …
152 l.r[col] = rend; 150 l.r[col] = rend;
153 col++; 151 col++;
154 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
155} 153}
156 154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
163}
164
157/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
160 168
161void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
162rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
163{ 215{
164#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
165 scr_overlay_off (); 217 scr_overlay_off ();
166#endif 218#endif
… …
192 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
193 245
194 screen.tscroll = 0; 246 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
196 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
197 if (!row_buf) 257 if (!prev_row_buf)
198 { 258 {
199 /*
200 * first time called so just malloc everything: don't rely on realloc
201 */
202 top_row = 0; 259 top_row = 0;
203 term_start = 0; 260 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 261
219 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 264 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 265 screen.cur.row = screen.cur.col = 0;
… …
245 { 288 {
246 /* 289 /*
247 * add or delete rows as appropriate 290 * add or delete rows as appropriate
248 */ 291 */
249 292
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 293 int common_col = min (prev_ncol, ncol);
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 294
267 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
268 { 296 {
269 lresize (drawn_buf[row]); 297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 298 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
271 } 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
272 300
273 for (int row = prev_nrow; row < nrow; row++) 301 copy_line (swap_buf [row], prev_swap_buf [row]);
274 { 302 }
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 303
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 304 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
285 307
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 315 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 316
295 do 317 do
296 { 318 {
297 p = MOD (p - 1, prev_total_rows); 319 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 320 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 321 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 322 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 323
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 324 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 325 {
304 p = MOD (p - 1, prev_total_rows); 326 p = MOD (p - 1, prev_total_rows);
305 327
306 plines++; 328 plines++;
307 llen += prev_ncol; 329 llen += prev_ncol;
… …
320 342
321 // re-assemble the full line by destination lines 343 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 344 for (int qrow = q; qlines--; qrow++)
323 { 345 {
324 qline = row_buf + qrow; 346 qline = row_buf + qrow;
325 lalloc (*qline); 347 qline->alloc (); // redundant with next line
326 qline->l = ncol; 348 qline->l = ncol;
327 qline->is_longer (1); 349 qline->is_longer (1);
328 350
329 int qcol = 0; 351 int qcol = 0;
330 352
… …
345 // this seems to upset applications/shells/readline 367 // this seems to upset applications/shells/readline
346 // least. 368 // least.
347 if (prow == ocur.row) 369 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 370 screen.cur.row = q - (total_rows - nrow);
349 371
350 line_t &pline = old_buf [prow]; 372 line_t &pline = prev_row_buf [prow];
351 373
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 374 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 375
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 376 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 377 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 398 {
377 // if no scrollback exists (yet), wing, instead of wrap 399 // if no scrollback exists (yet), wing, instead of wrap
378 400
379 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
380 { 402 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 404 line_t &dst = row_buf [row];
383 405
384 qline = pline; 406 copy_line (dst, src);
385 lresize (qline);
386 } 407 }
387 408
388 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 411
393 term_start = 0; 412 term_start = 0;
394 } 413 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 414
400 clamp_it (screen.cur.row, 0, nrow - 1); 415 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 416 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 417 }
403 418
419 for (int row = nrow; row--; )
420 {
421 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
422 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
423 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
424 }
425
426 chunk_free (prev_chunk, prev_chunk_size);
427
404 free (tabs); 428 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 429 tabs = (char *)rxvt_malloc (ncol);
406 430
407 for (int col = ncol; col--; ) 431 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 432 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 439 tt_winch ();
416 440
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 441 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 442}
419 443
420/* ------------------------------------------------------------------------- */ 444void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 445rxvt_term::scr_release () NOTHROW
426{ 446{
427 if (row_buf) 447 chunk_free (chunk, chunk_size);
428 { 448 chunk = 0;
429 delete talloc; talloc = 0; 449 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 450
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); 451 free (tabs);
438 tabs = 0; 452 tabs = 0;
439 }
440} 453}
441 454
442/* ------------------------------------------------------------------------- */ 455/* ------------------------------------------------------------------------- */
443/* 456/*
444 * Hard/Soft reset 457 * Hard/Soft reset
445 */ 458 */
446void 459void ecb_cold
447rxvt_term::scr_poweron () 460rxvt_term::scr_poweron ()
448{ 461{
449 scr_release (); 462 scr_release ();
463
450 prev_nrow = prev_ncol = 0; 464 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 465 rvideo_mode = false;
452 scr_soft_reset (); 466 scr_soft_reset ();
453 scr_reset (); 467 scr_reset ();
454 468
455 scr_clear (true); 469 scr_clear (true);
456 scr_refresh (); 470 scr_refresh ();
457} 471}
458 472
459void 473void ecb_cold
460rxvt_term::scr_soft_reset () 474rxvt_term::scr_soft_reset () NOTHROW
461{ 475{
462 /* only affects modes, nothing drastic such as clearing the screen */ 476 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 477#if ENABLE_OVERLAY
464 scr_overlay_off (); 478 scr_overlay_off ();
465#endif 479#endif
… …
520 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 535 assert (s->cur.col >= 0);
522} 536}
523 537
524void 538void
525rxvt_term::scr_swap_screen () 539rxvt_term::scr_swap_screen () NOTHROW
526{ 540{
527 if (!option (Opt_secondaryScreen)) 541 if (!option (Opt_secondaryScreen))
528 return; 542 return;
529 543
530 for (int i = prev_nrow; i--; ) 544 for (int i = prev_nrow; i--; )
… …
549 return; 563 return;
550 564
551 want_refresh = 1; 565 want_refresh = 1;
552 view_start = 0; 566 view_start = 0;
553 567
554 selection_check (2); /* check for boundary cross */ 568 /* check for boundary cross */
569 row_col_t pos;
570 pos.row = pos.col = 0;
571 if (ROWCOL_IS_BEFORE (selection.beg, pos)
572 && ROWCOL_IS_AFTER (selection.end, pos))
573 CLEAR_SELECTION ();
555 574
556 current_screen = scrn; 575 current_screen = scrn;
557 576
558#if NSCREENS 577#if NSCREENS
559 if (option (Opt_secondaryScreen)) 578 if (option (Opt_secondaryScreen))
… …
625/* 644/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 645 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 646 * count positive ==> scroll up
628 * count negative ==> scroll down 647 * count negative ==> scroll down
629 */ 648 */
630int 649int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 651{
633 if (count == 0 || (row1 > row2)) 652 if (count == 0 || (row1 > row2))
634 return 0; 653 return 0;
635 654
… …
696 715
697 // finally move the view window, if desired 716 // finally move the view window, if desired
698 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
699 && view_start != 0 718 && view_start != 0
700 && view_start != -saveLines) 719 && view_start != -saveLines)
701 scr_page (UP, count); 720 scr_page (count);
702 721
703 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 722 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
704 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 723 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
705 } 724 }
706 else 725 else
… …
769 788
770/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
771/* 790/*
772 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
773 */ 792 */
774void 793void ecb_hot
775rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 794rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
776{ 795{
777 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
778 return; 797 return;
779 798
780 unsigned char checksel; 799 bool checksel;
781 unicode_t c; 800 unicode_t c;
782 int ncol = this->ncol; 801 int ncol = this->ncol;
783 const wchar_t *strend = str + len; 802 const wchar_t *strend = str + len;
784 803
785 want_refresh = 1; 804 want_refresh = 1;
… …
1129 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1130 * Move cursor left in row. If we're at the left boundary, shift everything 1149 * Move cursor left in row. If we're at the left boundary, shift everything
1131 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1132 */ 1151 */
1133#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1134void 1153void ecb_cold
1135rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1136{ 1155{
1137 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1138 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1139 else 1158 else
… …
1146 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1147 * Move cursor right in row. If we're at the right boundary, shift everything 1166 * Move cursor right in row. If we're at the right boundary, shift everything
1148 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1149 */ 1168 */
1150#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1151void 1170void ecb_cold
1152rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1153{ 1172{
1154 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1155 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1156 else 1175 else
… …
1307 scr_blank_line (line, col, num, rstyle); 1326 scr_blank_line (line, col, num, rstyle);
1308} 1327}
1309 1328
1310/* ------------------------------------------------------------------------- */ 1329/* ------------------------------------------------------------------------- */
1311/* 1330/*
1312 * Erase part of whole of the screen 1331 * Erase part or whole of the screen
1313 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1332 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1314 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1333 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1315 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1334 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1316 */ 1335 */
1317void 1336void
… …
1326 ZERO_SCROLLBACK (); 1345 ZERO_SCROLLBACK ();
1327 1346
1328 switch (mode) 1347 switch (mode)
1329 { 1348 {
1330 case 0: /* erase to end of screen */ 1349 case 0: /* erase to end of screen */
1331 selection_check (1);
1332 scr_erase_line (0); 1350 scr_erase_line (0);
1333 row = screen.cur.row + 1; /* possible OOB */ 1351 row = screen.cur.row + 1; /* possible OOB */
1334 num = nrow - row; 1352 num = nrow - row;
1335 break; 1353 break;
1336 case 1: /* erase to beginning of screen */ 1354 case 1: /* erase to beginning of screen */
1337 selection_check (3);
1338 scr_erase_line (1); 1355 scr_erase_line (1);
1339 row = 0; 1356 row = 0;
1340 num = screen.cur.row; 1357 num = screen.cur.row;
1341 break; 1358 break;
1342 case 2: /* erase whole screen */ 1359 case 2: /* erase whole screen */
1343 selection_check (3);
1344 row = 0; 1360 row = 0;
1345 num = nrow; 1361 num = nrow;
1346 break; 1362 break;
1347 default: 1363 default:
1348 return; 1364 return;
… …
1365 { 1381 {
1366 ren = DEFAULT_RSTYLE; 1382 ren = DEFAULT_RSTYLE;
1367 1383
1368 if (mapped) 1384 if (mapped)
1369 XClearArea (dpy, vt, 0, 1385 XClearArea (dpy, vt, 0,
1370 Row2Pixel (row - view_start), (unsigned int)width, 1386 Row2Pixel (row - view_start), (unsigned int)vt_width,
1371 (unsigned int)Height2Pixel (num), False); 1387 (unsigned int)Height2Pixel (num), False);
1372 } 1388 }
1373 else 1389 else
1374 { 1390 {
1375 ren = rstyle & (RS_fgMask | RS_bgMask); 1391 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1378 { 1394 {
1379 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1395 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1380 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1396 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1381 XFillRectangle (dpy, vt, gc, 1397 XFillRectangle (dpy, vt, gc,
1382 0, Row2Pixel (row - view_start), 1398 0, Row2Pixel (row - view_start),
1383 (unsigned int)width, 1399 (unsigned int)vt_width,
1384 (unsigned int)Height2Pixel (num)); 1400 (unsigned int)Height2Pixel (num));
1385 gcvalue.foreground = pix_colors[Color_fg]; 1401 gcvalue.foreground = pix_colors[Color_fg];
1386 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1402 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1387 } 1403 }
1388 } 1404 }
… …
1410/* ------------------------------------------------------------------------- */ 1426/* ------------------------------------------------------------------------- */
1411/* 1427/*
1412 * Fill the screen with `E's 1428 * Fill the screen with `E's
1413 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1429 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1414 */ 1430 */
1415void 1431void ecb_cold
1416rxvt_term::scr_E () NOTHROW 1432rxvt_term::scr_E () NOTHROW
1417{ 1433{
1418 rend_t fs; 1434 rend_t fs;
1419 1435
1420 want_refresh = 1; 1436 want_refresh = 1;
1421 ZERO_SCROLLBACK (); 1437 ZERO_SCROLLBACK ();
1422 1438
1423 num_scr_allow = 0; 1439 num_scr_allow = 0;
1424 selection_check (3); 1440
1441 row_col_t pos;
1442 pos.row = pos.col = 0;
1443 if (ROWCOL_IS_AFTER (selection.end, pos))
1444 CLEAR_SELECTION ();
1425 1445
1426 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1446 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1427 for (int row = nrow; row--; ) 1447 for (int row = nrow; row--; )
1428 { 1448 {
1429 line_t &line = ROW(row); 1449 line_t &line = ROW(row);
… …
1580/* ------------------------------------------------------------------------- */ 1600/* ------------------------------------------------------------------------- */
1581/* 1601/*
1582 * Set the scrolling region 1602 * Set the scrolling region
1583 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1603 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1584 */ 1604 */
1585void 1605void ecb_cold
1586rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1606rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1587{ 1607{
1588 max_it (top, 0); 1608 max_it (top, 0);
1589 min_it (bot, nrow - 1); 1609 min_it (bot, nrow - 1);
1590 1610
… …
1600/* 1620/*
1601 * Make the cursor visible/invisible 1621 * Make the cursor visible/invisible
1602 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1622 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1603 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1623 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1604 */ 1624 */
1605void 1625void ecb_cold
1606rxvt_term::scr_cursor_visible (int mode) NOTHROW 1626rxvt_term::scr_cursor_visible (int mode) NOTHROW
1607{ 1627{
1608 want_refresh = 1; 1628 want_refresh = 1;
1609 1629
1610 if (mode) 1630 if (mode)
… …
1617/* 1637/*
1618 * Set/unset automatic wrapping 1638 * Set/unset automatic wrapping
1619 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1639 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1620 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1640 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1621 */ 1641 */
1622void 1642void ecb_cold
1623rxvt_term::scr_autowrap (int mode) NOTHROW 1643rxvt_term::scr_autowrap (int mode) NOTHROW
1624{ 1644{
1625 if (mode) 1645 if (mode)
1626 screen.flags |= Screen_Autowrap; 1646 screen.flags |= Screen_Autowrap;
1627 else 1647 else
… …
1636 * Relative mode: line numbers are relative to top margin of scrolling region 1656 * Relative mode: line numbers are relative to top margin of scrolling region
1637 * and the cursor cannot be moved outside. 1657 * and the cursor cannot be moved outside.
1638 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1658 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1639 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1659 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1640 */ 1660 */
1641void 1661void ecb_cold
1642rxvt_term::scr_relative_origin (int mode) NOTHROW 1662rxvt_term::scr_relative_origin (int mode) NOTHROW
1643{ 1663{
1644 if (mode) 1664 if (mode)
1645 screen.flags |= Screen_Relative; 1665 screen.flags |= Screen_Relative;
1646 else 1666 else
… …
1653/* 1673/*
1654 * Set insert/replace mode 1674 * Set insert/replace mode
1655 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1675 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1656 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1676 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1657 */ 1677 */
1658void 1678void ecb_cold
1659rxvt_term::scr_insert_mode (int mode) NOTHROW 1679rxvt_term::scr_insert_mode (int mode) NOTHROW
1660{ 1680{
1661 if (mode) 1681 if (mode)
1662 screen.flags |= Screen_Insert; 1682 screen.flags |= Screen_Insert;
1663 else 1683 else
… …
1669 * Set/Unset tabs 1689 * Set/Unset tabs
1670 * XTERM_SEQ: Set tab at current column : ESC H 1690 * XTERM_SEQ: Set tab at current column : ESC H
1671 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1691 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1672 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1692 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1673 */ 1693 */
1674void 1694void ecb_cold
1675rxvt_term::scr_set_tab (int mode) NOTHROW 1695rxvt_term::scr_set_tab (int mode) NOTHROW
1676{ 1696{
1677 if (mode < 0) 1697 if (mode < 0)
1678 memset (tabs, 0, ncol); 1698 memset (tabs, 0, ncol);
1679 else if (screen.cur.col < ncol) 1699 else if (screen.cur.col < ncol)
… …
1698 if (rvideo_state != on) 1718 if (rvideo_state != on)
1699 { 1719 {
1700 rvideo_state = on; 1720 rvideo_state = on;
1701 1721
1702 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1703#ifdef HAVE_BG_PIXMAP 1723#ifdef HAVE_IMG
1704 if (bg_pixmap == None) 1724 if (bg_img == 0)
1705#endif 1725#endif
1706 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1707 1727
1708 XGCValues gcvalue; 1728 XGCValues gcvalue;
1709 gcvalue.foreground = pix_colors[Color_fg]; 1729 gcvalue.foreground = pix_colors[Color_fg];
… …
1718/* ------------------------------------------------------------------------- */ 1738/* ------------------------------------------------------------------------- */
1719/* 1739/*
1720 * Report current cursor position 1740 * Report current cursor position
1721 * XTERM_SEQ: Report position: ESC [ 6 n 1741 * XTERM_SEQ: Report position: ESC [ 6 n
1722 */ 1742 */
1723void 1743void ecb_cold
1724rxvt_term::scr_report_position () NOTHROW 1744rxvt_term::scr_report_position () NOTHROW
1725{ 1745{
1726 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1746 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1727} 1747}
1728 1748
… …
1731 * ------------------------------------------------------------------------- */ 1751 * ------------------------------------------------------------------------- */
1732 1752
1733/* 1753/*
1734 * Set font style 1754 * Set font style
1735 */ 1755 */
1736void 1756void ecb_cold
1737rxvt_term::set_font_style () NOTHROW 1757rxvt_term::set_font_style () NOTHROW
1738{ 1758{
1739#if 0 1759#if 0
1740 switch (charsets [screen.charset]) 1760 switch (charsets [screen.charset])
1741 { 1761 {
… …
1763 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1783 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1764 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1784 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1765 * XTERM_SEQ: Invoke G2 character set: ESC N 1785 * XTERM_SEQ: Invoke G2 character set: ESC N
1766 * XTERM_SEQ: Invoke G3 character set: ESC O 1786 * XTERM_SEQ: Invoke G3 character set: ESC O
1767 */ 1787 */
1768void 1788void ecb_cold
1769rxvt_term::scr_charset_choose (int set) NOTHROW 1789rxvt_term::scr_charset_choose (int set) NOTHROW
1770{ 1790{
1771 screen.charset = set; 1791 screen.charset = set;
1772 set_font_style (); 1792 set_font_style ();
1773} 1793}
… …
1794 * ------------------------------------------------------------------------- */ 1814 * ------------------------------------------------------------------------- */
1795 1815
1796/* 1816/*
1797 * refresh matching text. 1817 * refresh matching text.
1798 */ 1818 */
1799bool 1819bool ecb_cold
1800rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1820rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1801{ 1821{
1802 bool found = false; 1822 bool found = false;
1803 1823
1804 for (int i = 0; i < nrow; i++) 1824 for (int i = 0; i < nrow; i++)
… …
1823 PART_BEG = 0, 1843 PART_BEG = 0,
1824 PART_END, 1844 PART_END,
1825 RC_COUNT 1845 RC_COUNT
1826}; 1846};
1827 1847
1828void 1848void ecb_hot
1829rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1849rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1830{ 1850{
1831 int i; 1851 int i;
1832 row_col_t rc[RC_COUNT]; 1852 row_col_t rc[RC_COUNT];
1833 1853
… …
1870 * Refresh the entire screen 1890 * Refresh the entire screen
1871 */ 1891 */
1872void 1892void
1873rxvt_term::scr_touch (bool refresh) NOTHROW 1893rxvt_term::scr_touch (bool refresh) NOTHROW
1874{ 1894{
1875 scr_expose (0, 0, width, height, refresh); 1895 scr_expose (0, 0, vt_width, vt_height, refresh);
1876} 1896}
1877 1897
1878/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
1879/* 1899/*
1880 * Move the display so that the line represented by scrollbar value Y is at 1900 * Move the display so that the line represented by scrollbar value Y is at
… …
1890/* 1910/*
1891 * Page the screen up/down nlines 1911 * Page the screen up/down nlines
1892 * direction should be UP or DN 1912 * direction should be UP or DN
1893 */ 1913 */
1894bool 1914bool
1895rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1915rxvt_term::scr_page (int nlines) NOTHROW
1896{ 1916{
1897 int new_view_start =
1898 direction == UP ? view_start - nlines
1899 : view_start + nlines;
1900
1901 return scr_changeview (new_view_start); 1917 return scr_changeview (view_start - nlines);
1902} 1918}
1903 1919
1904bool 1920bool
1905rxvt_term::scr_changeview (int new_view_start) NOTHROW 1921rxvt_term::scr_changeview (int new_view_start) NOTHROW
1906{ 1922{
… …
1959 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1975 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1960#endif 1976#endif
1961} 1977}
1962 1978
1963/* ------------------------------------------------------------------------- */ 1979/* ------------------------------------------------------------------------- */
1964void 1980void ecb_cold
1965rxvt_term::scr_printscreen (int fullhist) NOTHROW 1981rxvt_term::scr_printscreen (int fullhist) NOTHROW
1966{ 1982{
1967#ifdef PRINTPIPE 1983#ifdef PRINTPIPE
1968 int nrows, row_start; 1984 int nrows, row_start;
1969 FILE *fd = popen_printer (); 1985 FILE *fd = popen_printer ();
… …
2018/* 2034/*
2019 * Refresh the screen 2035 * Refresh the screen
2020 * drawn_text/drawn_rend contain the screen information before the update. 2036 * drawn_text/drawn_rend contain the screen information before the update.
2021 * screen.text/screen.rend contain what the screen will change to. 2037 * screen.text/screen.rend contain what the screen will change to.
2022 */ 2038 */
2023void 2039void ecb_hot
2024rxvt_term::scr_refresh () NOTHROW 2040rxvt_term::scr_refresh () NOTHROW
2025{ 2041{
2026 int16_t col, row, /* column/row we're processing */ 2042 int16_t col, row, /* column/row we're processing */
2027 ocrow; /* old cursor row */ 2043 ocrow; /* old cursor row */
2028 int i; /* tmp */ 2044 int i; /* tmp */
2029#ifndef NO_CURSORCOLOR
2030 rend_t cc1; /* store colours at cursor position (s) */
2031#endif
2032 rend_t *crp; // cursor rendition pointer
2033 rend_t ccol1, /* Cursor colour */ 2045 rend_t ccol1, /* Cursor colour */
2034 ccol2; /* Cursor colour2 */ 2046 ccol2; /* Cursor colour2 */
2047 rend_t cur_rend;
2048 int cur_col;
2049 int cursorwidth;
2035 2050
2036 want_refresh = 0; /* screen is current */ 2051 want_refresh = 0; /* screen is current */
2037 2052
2038 if (refresh_type == NO_REFRESH || !mapped) 2053 if (refresh_type == NO_REFRESH || !mapped)
2039 return; 2054 return;
… …
2042 * A: set up vars 2057 * A: set up vars
2043 */ 2058 */
2044 refresh_count = 0; 2059 refresh_count = 0;
2045 2060
2046 unsigned int old_screen_flags = screen.flags; 2061 unsigned int old_screen_flags = screen.flags;
2047 char have_bg = 0; 2062 bool have_bg = 0;
2048#ifdef HAVE_BG_PIXMAP 2063#ifdef HAVE_IMG
2049 have_bg = bg_pixmap != None; 2064 have_bg = bg_img != 0;
2050#endif 2065#endif
2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2066 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2052 2067
2053 /* 2068 /*
2054 * B: reverse any characters which are selected 2069 * B: reverse any characters which are selected
… …
2058 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2073 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2059#if ENABLE_OVERLAY 2074#if ENABLE_OVERLAY
2060 scr_swap_overlay (); 2075 scr_swap_overlay ();
2061#endif 2076#endif
2062 2077
2063 char showcursor = screen.flags & Screen_VisibleCursor; 2078 bool showcursor = screen.flags & Screen_VisibleCursor;
2064 2079
2065 /* 2080 /*
2066 * C: set the cursor character (s) 2081 * C: set the cursor character (s)
2067 */ 2082 */
2068 { 2083 {
2069 unsigned char setoldcursor;
2070
2071#ifdef CURSOR_BLINK 2084#ifdef CURSOR_BLINK
2072 if (hidden_cursor) 2085 if (hidden_cursor)
2073 showcursor = 0; 2086 showcursor = 0;
2074#endif 2087#endif
2075 2088
… …
2078 int col = screen.cur.col; 2091 int col = screen.cur.col;
2079 2092
2080 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2093 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2081 col--; 2094 col--;
2082 2095
2096 cursorwidth = 1;
2097 while (col + cursorwidth < ncol
2098 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2099 cursorwidth++;
2100
2083 crp = &ROW(screen.cur.row).r[col]; 2101 cur_rend = ROW(screen.cur.row).r[col];
2102 cur_col = col;
2084 2103
2085#ifndef NO_CURSORCOLOR 2104#ifndef NO_CURSORCOLOR
2086 cc1 = *crp & (RS_fgMask | RS_bgMask);
2087 if (ISSET_PIXCOLOR (Color_cursor)) 2105 if (ISSET_PIXCOLOR (Color_cursor))
2088 ccol1 = Color_cursor; 2106 ccol1 = Color_cursor;
2089 else 2107 else
2090#endif 2108#endif
2091#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2109#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2105 ccol2 = Color_bg; 2123 ccol2 = Color_bg;
2106#endif 2124#endif
2107 2125
2108 if (focus) 2126 if (focus)
2109 { 2127 {
2128 rend_t rend = cur_rend;
2129
2110 if (option (Opt_cursorUnderline)) 2130 if (option (Opt_cursorUnderline))
2111 *crp ^= RS_Uline; 2131 rend ^= RS_Uline;
2112 else 2132 else
2113 { 2133 {
2114 *crp ^= RS_RVid; 2134 rend ^= RS_RVid;
2115 *crp = SET_FGCOLOR (*crp, ccol1); 2135 rend = SET_FGCOLOR (rend, ccol1);
2116 *crp = SET_BGCOLOR (*crp, ccol2); 2136 rend = SET_BGCOLOR (rend, ccol2);
2117 } 2137 }
2138
2139 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2118 } 2140 }
2119 } 2141 }
2120 2142
2121 /* make sure no outline cursor is left around */ 2143 /* make sure no outline cursor is left around */
2122 setoldcursor = 0;
2123 if (ocrow != -1) 2144 if (ocrow != -1)
2124 { 2145 {
2125 if (screen.cur.row - view_start != ocrow 2146 if (screen.cur.row - view_start != ocrow
2126 || screen.cur.col != oldcursor.col) 2147 || screen.cur.col != oldcursor.col)
2127 { 2148 {
2128 if (ocrow < nrow 2149 if (ocrow < nrow
2129 && oldcursor.col < ncol) 2150 && oldcursor.col < ncol)
2130 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2151 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2131
2132 if (focus || !showcursor)
2133 oldcursor.row = -1;
2134 else
2135 setoldcursor = 1;
2136 } 2152 }
2137 } 2153 }
2138 else if (!focus)
2139 setoldcursor = 1;
2140 2154
2141 if (setoldcursor) 2155 // save the current cursor coordinates if the cursor is visible
2156 // and the window is unfocused, so as to clear the outline cursor
2157 // in the next refresh if the cursor moves
2158 if (showcursor && !focus && screen.cur.row - view_start < nrow)
2142 { 2159 {
2143 if (screen.cur.row - view_start >= nrow)
2144 oldcursor.row = -1;
2145 else
2146 {
2147 oldcursor.row = screen.cur.row - view_start; 2160 oldcursor.row = screen.cur.row - view_start;
2148 oldcursor.col = screen.cur.col; 2161 oldcursor.col = screen.cur.col;
2149 }
2150 } 2162 }
2163 else
2164 oldcursor.row = -1;
2151 } 2165 }
2152 2166
2153#ifndef NO_SLOW_LINK_SUPPORT 2167#ifndef NO_SLOW_LINK_SUPPORT
2154 /* 2168 /*
2155 * D: CopyArea pass - very useful for slower links 2169 * D: CopyArea pass - very useful for slower links
… …
2161 { 2175 {
2162 int16_t nits; 2176 int16_t nits;
2163 int i = num_scr; 2177 int i = num_scr;
2164 int j; 2178 int j;
2165 int len, wlen; 2179 int len, wlen;
2166 dLocal (int, num_scr);
2167 2180
2168 j = nrow; 2181 j = nrow;
2169 wlen = len = -1; 2182 wlen = len = -1;
2170 row = i > 0 ? 0 : j - 1; 2183 row = i > 0 ? 0 : j - 1;
2171 2184
… …
2422 else 2435 else
2423 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2436 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2424 2437
2425 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2438 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2426 { 2439 {
2440 if (showcursor && focus && row == screen.cur.row
2441 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2442 XSetForeground (dpy, gc, pix_colors[ccol1]);
2443 else
2427#if ENABLE_FRILLS 2444#if ENABLE_FRILLS
2428 if (ISSET_PIXCOLOR (Color_underline)) 2445 if (ISSET_PIXCOLOR (Color_underline))
2429 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2446 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2430 else 2447 else
2431#endif 2448#endif
… …
2442 * G: cleanup cursor and display outline cursor if necessary 2459 * G: cleanup cursor and display outline cursor if necessary
2443 */ 2460 */
2444 if (showcursor) 2461 if (showcursor)
2445 { 2462 {
2446 if (focus) 2463 if (focus)
2447 { 2464 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2448 if (option (Opt_cursorUnderline))
2449 *crp ^= RS_Uline;
2450 else
2451 {
2452 *crp ^= RS_RVid;
2453#ifndef NO_CURSORCOLOR
2454 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2455#endif
2456 }
2457 }
2458 else if (oldcursor.row >= 0) 2465 else if (oldcursor.row >= 0)
2459 { 2466 {
2460 int cursorwidth = 1;
2461 int col = oldcursor.col;
2462
2463 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2464 col--;
2465
2466 while (col + cursorwidth < ncol
2467 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2468 cursorwidth++;
2469
2470#ifndef NO_CURSORCOLOR
2471 if (ISSET_PIXCOLOR (Color_cursor))
2472 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2473 else
2474#endif
2475 XSetForeground (dpy, gc, pix_colors[ccol1]); 2467 XSetForeground (dpy, gc, pix_colors[ccol1]);
2476 2468
2477 XDrawRectangle (dpy, vt, gc, 2469 XDrawRectangle (dpy, vt, gc,
2478 Col2Pixel (col), 2470 Col2Pixel (cur_col),
2479 Row2Pixel (oldcursor.row), 2471 Row2Pixel (oldcursor.row),
2480 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2472 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2481 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2473 (unsigned int) (Height2Pixel (1) - 1));
2482 } 2474 }
2483 } 2475 }
2484 2476
2485 /* 2477 /*
2486 * H: cleanup selection 2478 * H: cleanup selection
… …
2495 screen.flags = old_screen_flags; 2487 screen.flags = old_screen_flags;
2496 num_scr = 0; 2488 num_scr = 0;
2497 num_scr_allow = 1; 2489 num_scr_allow = 1;
2498} 2490}
2499 2491
2500void 2492void ecb_cold
2501rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2493rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2502{ 2494{
2503 if (!l.t) 2495 if (!l.valid ())
2504 return; 2496 return;
2505 2497
2506 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2498 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2507 2499
2508 for (int i = ncol; i--; ) 2500 for (int i = ncol; i--; )
2509 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2501 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2510} 2502}
2511 2503
2512void 2504void ecb_cold
2513rxvt_term::scr_remap_chars () NOTHROW 2505rxvt_term::scr_remap_chars () NOTHROW
2514{ 2506{
2515 for (int i = total_rows; i--; ) 2507 for (int i = total_rows; i--; )
2516 scr_remap_chars (row_buf [i]); 2508 scr_remap_chars (row_buf [i]);
2517 2509
… …
2520 scr_remap_chars (drawn_buf [i]); 2512 scr_remap_chars (drawn_buf [i]);
2521 scr_remap_chars (swap_buf [i]); 2513 scr_remap_chars (swap_buf [i]);
2522 } 2514 }
2523} 2515}
2524 2516
2525void 2517void ecb_cold
2526rxvt_term::scr_recolour (bool refresh) NOTHROW 2518rxvt_term::scr_recolour (bool refresh) NOTHROW
2527{ 2519{
2528 bool transparent = false; 2520 bool transparent = false;
2529 2521
2530#ifdef HAVE_BG_PIXMAP 2522#ifdef HAVE_IMG
2531 if (bg_pixmap != None) 2523 if (bg_img != 0)
2532 { 2524 {
2533# ifdef ENABLE_TRANSPARENCY 2525# if ENABLE_TRANSPARENCY
2534 if (bg_flags & BG_IS_TRANSPARENT) 2526 if (bg_flags & BG_IS_TRANSPARENT)
2535 { 2527 {
2536 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2528 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2537 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2529 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2538 2530
2539 transparent = true; 2531 transparent = true;
2540 } 2532 }
2541 else 2533 else
2542# endif 2534# endif
2543 { 2535 {
2544 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2536 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2545 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2537 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2546 } 2538 }
2547 } 2539 }
2548 else 2540 else
2549#endif 2541#endif
2550 { 2542 {
… …
2557 if (scrollBar.win) 2549 if (scrollBar.win)
2558 { 2550 {
2559 if (transparent) 2551 if (transparent)
2560 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2552 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2561 else 2553 else
2562 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2554 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2563 scrollBar.state = SB_STATE_IDLE; 2555 scrollBar.state = SB_STATE_IDLE;
2564 scrollBar.show (0); 2556 scrollBar.show (0);
2565 } 2557 }
2566 2558
2567 if (refresh) 2559 if (refresh)
… …
2633 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2625 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2634 srp[col] ^= rstyle; 2626 srp[col] ^= rstyle;
2635} 2627}
2636 2628
2637/* ------------------------------------------------------------------------- */ 2629/* ------------------------------------------------------------------------- */
2638void 2630void ecb_hot
2639rxvt_term::scr_reverse_selection () NOTHROW 2631rxvt_term::scr_reverse_selection () NOTHROW
2640{ 2632{
2641 if (selection.op 2633 if (selection.op
2642 && current_screen == selection.screen 2634 && current_screen == selection.screen
2643 && selection.end.row >= view_start) 2635 && selection.end.row >= view_start)
… …
2662 */ 2654 */
2663#if 0 2655#if 0
2664void 2656void
2665rxvt_term::scr_dump (int fd) NOTHROW 2657rxvt_term::scr_dump (int fd) NOTHROW
2666{ 2658{
2667 int row, wrote; 2659 // if this method is needed, it can be implemented by factoring the
2668 unsigned int width, towrite; 2660 // relevant code in scr_printscreen
2669 const char r1[] = "\n";
2670
2671 for (row = saveLines + top_row;
2672 row < saveLines + nrow - 1; row++)
2673 {
2674 width = row_buf[row].l >= 0 ? row_buf[row].l
2675 : ncol;
2676 for (towrite = width; towrite; towrite -= wrote)
2677 {
2678 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2679 towrite);
2680 if (wrote < 0)
2681 return; /* XXX: death, no report */
2682 }
2683 if (row_buf[row].l >= 0)
2684 if (write (fd, r1, 1) <= 0)
2685 return; /* XXX: death, no report */
2686 }
2687} 2661}
2688#endif 2662#endif
2689 2663
2690/* ------------------------------------------------------------------------- * 2664/* ------------------------------------------------------------------------- *
2691 * CHARACTER SELECTION * 2665 * CHARACTER SELECTION *
… …
2693void 2667void
2694rxvt_term::selection_check (int check_more) NOTHROW 2668rxvt_term::selection_check (int check_more) NOTHROW
2695{ 2669{
2696 if (!selection.op) 2670 if (!selection.op)
2697 return; 2671 return;
2698
2699 row_col_t pos;
2700 pos.row = pos.col = 0;
2701 2672
2702 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2673 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2703 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2674 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2704 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2675 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2705 || (check_more == 1 2676 || (check_more == 1
2706 && current_screen == selection.screen 2677 && current_screen == selection.screen
2707 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2678 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2708 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2679 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2709 || (check_more == 2
2710 && ROWCOL_IS_BEFORE (selection.beg, pos)
2711 && ROWCOL_IS_AFTER (selection.end, pos))
2712 || (check_more == 3
2713 && ROWCOL_IS_AFTER (selection.end, pos)))
2714 CLEAR_ALL_SELECTION (); 2680 CLEAR_ALL_SELECTION ();
2681}
2682
2683void
2684rxvt_term::selection_changed () NOTHROW
2685{
2686 line_t &r1 = ROW (selection.beg.row);
2687 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2688 --selection.beg.col;
2689
2690 line_t &r2 = ROW (selection.end.row);
2691 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2692 ++selection.end.col;
2693
2694 want_refresh = 1;
2715} 2695}
2716 2696
2717/* ------------------------------------------------------------------------- */ 2697/* ------------------------------------------------------------------------- */
2718/* 2698/*
2719 * Paste a selection direct to the command fd 2699 * Paste a selection direct to the command fd
… …
2725 for (unsigned int i = 0; i < len; i++) 2705 for (unsigned int i = 0; i < len; i++)
2726 if (data[i] == C0_LF) 2706 if (data[i] == C0_LF)
2727 data[i] = C0_CR; 2707 data[i] = C0_CR;
2728 2708
2729 if (priv_modes & PrivMode_BracketPaste) 2709 if (priv_modes & PrivMode_BracketPaste)
2730 tt_printf ("\e[200~"); 2710 tt_printf ("\x1b[200~");
2731 2711
2732 tt_write (data, len); 2712 tt_write (data, len);
2733 2713
2734 if (priv_modes & PrivMode_BracketPaste) 2714 if (priv_modes & PrivMode_BracketPaste)
2735 tt_printf ("\e[201~"); 2715 tt_printf ("\x1b[201~");
2736} 2716}
2737 2717
2738void 2718void
2739rxvt_term::paste (char *data, unsigned int len) NOTHROW 2719rxvt_term::paste (char *data, unsigned int len) NOTHROW
2740{ 2720{
… …
2960/* ------------------------------------------------------------------------- */ 2940/* ------------------------------------------------------------------------- */
2961/* 2941/*
2962 * Mark or select text based upon number of clicks: 1, 2, or 3 2942 * Mark or select text based upon number of clicks: 1, 2, or 3
2963 * EXT: button 1 press 2943 * EXT: button 1 press
2964 */ 2944 */
2965void 2945void ecb_cold
2966rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2946rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2967{ 2947{
2968 clicks = ((clicks - 1) % 3) + 1; 2948 clicks = ((clicks - 1) % 3) + 1;
2969 selection.clicks = clicks; /* save clicks so extend will work */ 2949 selection.clicks = clicks; /* save clicks so extend will work */
2970 2950
… …
2989 2969
2990/* ------------------------------------------------------------------------- */ 2970/* ------------------------------------------------------------------------- */
2991/* 2971/*
2992 * Mark a selection at the specified col/row 2972 * Mark a selection at the specified col/row
2993 */ 2973 */
2994void 2974void ecb_cold
2995rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2975rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2996{ 2976{
2997 want_refresh = 1; 2977 want_refresh = 1;
2998 2978
2999 selection.mark.row = row + view_start; 2979 selection.mark.row = row + view_start;
… …
3022 * Word select: select text for 2 clicks 3002 * Word select: select text for 2 clicks
3023 * We now only find out the boundary in one direction 3003 * We now only find out the boundary in one direction
3024 */ 3004 */
3025 3005
3026/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3006/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3027#define DELIMIT_TEXT(x) \ 3007#define DELIMIT_TEXT(x) \
3028 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3008 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3029#define DELIMIT_REND(x) 1 3009#define DELIMIT_REND(x) 1
3030 3010
3031void 3011void ecb_cold
3032rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3012rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3033{ 3013{
3034 int col, row, dirnadd, tcol, trow, w1, w2; 3014 int col, row, dirnadd, tcol, trow, w1, w2;
3035 row_col_t bound; 3015 row_col_t bound;
3036 text_t *stp; 3016 text_t *stp;
… …
3110 * EXT: button 3 press; button 1 or 3 drag 3090 * EXT: button 3 press; button 1 or 3 drag
3111 * flag == 0 ==> button 1 3091 * flag == 0 ==> button 1
3112 * flag == 1 ==> button 3 press 3092 * flag == 1 ==> button 3 press
3113 * flag == 2 ==> button 3 motion 3093 * flag == 2 ==> button 3 motion
3114 */ 3094 */
3115void 3095void ecb_cold
3116rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3096rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3117{ 3097{
3118 int col = clamp (Pixel2Col (x), 0, ncol); 3098 int col = clamp (Pixel2Col (x), 0, ncol);
3119 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3099 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3120 3100
… …
3146 3126
3147/* ------------------------------------------------------------------------- */ 3127/* ------------------------------------------------------------------------- */
3148/* 3128/*
3149 * Extend the selection to the specified col/row 3129 * Extend the selection to the specified col/row
3150 */ 3130 */
3151void 3131void ecb_cold
3152rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3132rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3153{ 3133{
3154 row_col_t pos; 3134 row_col_t pos;
3155 enum { 3135 enum {
3156 LEFT, RIGHT 3136 LEFT, RIGHT
3157 } closeto = RIGHT; 3137 } closeto = RIGHT;
3158
3159 want_refresh = 1;
3160 3138
3161 switch (selection.op) 3139 switch (selection.op)
3162 { 3140 {
3163 case SELECTION_INIT: 3141 case SELECTION_INIT:
3164 CLEAR_SELECTION (); 3142 CLEAR_SELECTION ();
… …
3344 3322
3345#if !ENABLE_MINIMAL 3323#if !ENABLE_MINIMAL
3346 if (selection.rect && selection.beg.col > selection.end.col) 3324 if (selection.rect && selection.beg.col > selection.end.col)
3347 ::swap (selection.beg.col, selection.end.col); 3325 ::swap (selection.beg.col, selection.end.col);
3348#endif 3326#endif
3327
3328 selection_changed ();
3349} 3329}
3350 3330
3351#if !ENABLE_MINIMAL 3331#if !ENABLE_MINIMAL
3352void 3332void ecb_cold
3353rxvt_term::selection_remove_trailing_spaces () NOTHROW 3333rxvt_term::selection_remove_trailing_spaces () NOTHROW
3354{ 3334{
3355 int32_t end_col, end_row; 3335 int32_t end_col, end_row;
3356 text_t *stp; 3336 text_t *stp;
3357 3337
… …
3395/* ------------------------------------------------------------------------- */ 3375/* ------------------------------------------------------------------------- */
3396/* 3376/*
3397 * Double click on button 3 when already selected 3377 * Double click on button 3 when already selected
3398 * EXT: button 3 double click 3378 * EXT: button 3 double click
3399 */ 3379 */
3400void 3380void ecb_cold
3401rxvt_term::selection_rotate (int x, int y) NOTHROW 3381rxvt_term::selection_rotate (int x, int y) NOTHROW
3402{ 3382{
3403 selection.clicks = selection.clicks % 3 + 1; 3383 selection.clicks = selection.clicks % 3 + 1;
3404 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3384 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3405} 3385}
… …
3407/* ------------------------------------------------------------------------- */ 3387/* ------------------------------------------------------------------------- */
3408/* 3388/*
3409 * Respond to a request for our current selection 3389 * Respond to a request for our current selection
3410 * EXT: SelectionRequest 3390 * EXT: SelectionRequest
3411 */ 3391 */
3412void 3392void ecb_cold
3413rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3393rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3414{ 3394{
3415 Atom property = rq.property == None ? rq.target : rq.property; 3395 Atom property = rq.property == None ? rq.target : rq.property;
3416 XSelectionEvent ev; 3396 XSelectionEvent ev;
3417 3397
… …
3550 3530
3551 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3531 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3552} 3532}
3553 3533
3554/* ------------------------------------------------------------------------- */ 3534/* ------------------------------------------------------------------------- */
3555#ifdef USE_XIM 3535#if USE_XIM
3556void 3536void ecb_cold
3557rxvt_term::im_set_position (XPoint &pos) NOTHROW 3537rxvt_term::im_set_position (XPoint &pos) NOTHROW
3558{ 3538{
3559 XWindowAttributes xwa; 3539 XWindowAttributes xwa;
3560 3540
3561 XGetWindowAttributes (dpy, vt, &xwa); 3541 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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