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.217 by root, Mon Jan 9 19:01:56 2006 UTC vs.
Revision 1.318 by root, Tue Nov 4 22:44:09 2008 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 86
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 89 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 91 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 95
114/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
117 99
118/* Fill part/all of a line with blanks. */ 100/* Fill part/all of a line with blanks. */
119void 101void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 103{
122 if (!l.t) 104 if (!l.t)
123 { 105 {
124 lalloc (l); 106 lalloc (l);
125 col = 0; 107 col = 0;
126 width = ncol; 108 width = ncol;
127 } 109 }
128 110
129 l.touch (); 111 l.touch ();
130 112
131 efs &= ~RS_baseattrMask; 113 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 114 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 115
134 text_t *et = l.t + col; 116 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 117 rend_t *er = l.r + col;
136 118
… …
142} 124}
143 125
144/* ------------------------------------------------------------------------- */ 126/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 127/* Fill a full line with blanks - make sure it is allocated first */
146void 128void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 129rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 130{
149 scr_blank_line (l, 0, ncol, efs); 131 scr_blank_line (l, 0, ncol, efs);
150 132
151 l.l = 0; 133 l.l = 0;
152 l.f = 0; 134 l.f = 0;
135}
136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
153} 154}
154 155
155/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
158 159
159void 160void
160rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
161{ 162{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
166 view_start = 0; 163 view_start = 0;
167 num_scr = 0; 164 num_scr = 0;
168 165
169 if (ncol == 0) 166 if (ncol == 0)
170 ncol = 80; 167 ncol = 80;
… …
174 171
175 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 173 return;
177 174
178 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
180 { 177 {
181 //TODO//FIXME 178 //TODO//FIXME
182 saveLines++; 179 saveLines++;
183 prev_nrow--; 180 prev_nrow--;
184 nsaved++; 181 top_row--;
185 } 182 }
186 183
187 want_refresh = 1; 184 want_refresh = 1;
188 185
189 int prev_total_rows = prev_nrow + saveLines; 186 int prev_total_rows = prev_nrow + saveLines;
… …
195 if (!row_buf) 192 if (!row_buf)
196 { 193 {
197 /* 194 /*
198 * first time called so just malloc everything: don't rely on realloc 195 * first time called so just malloc everything: don't rely on realloc
199 */ 196 */
200 nsaved = 0; /* no saved lines */ 197 top_row = 0;
201 term_start = 0; 198 term_start = 0;
202 199
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 200 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 202
… …
234 selection.text = NULL; 231 selection.text = NULL;
235 selection.len = 0; 232 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
238 selection.clicks = 0; 235 selection.clicks = 0;
239 CLEAR_ALL_SELECTION ();
240 rvideo = 0;
241 } 236 }
242 else 237 else
243 { 238 {
244 /* 239 /*
245 * add or delete rows as appropriate 240 * add or delete rows as appropriate
… …
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 270 }
276 271
277 line_t *old_buf = row_buf; 272 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 274
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start - nsaved , prev_total_rows); 276 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 277 int q = total_rows; // rewrapped row
283 278
284 if (nsaved) 279 if (top_row)
285 { 280 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb 281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 282 // to come up with a lean and mean algorithm.
288 283
289 row_col_t ocur = screen.cur; 284 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 285 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 286
… …
325 qline->l = ncol; 320 qline->l = ncol;
326 qline->is_longer (1); 321 qline->is_longer (1);
327 322
328 int qcol = 0; 323 int qcol = 0;
329 324
325 // see below for cursor adjustment rationale
326 if (p == ocur.row)
327 screen.cur.row = q - (total_rows - nrow);
328
330 // fill a single destination line 329 // fill a single destination line
331 while (lofs < llen && qcol < ncol) 330 while (lofs < llen && qcol < ncol)
332 { 331 {
333 int prow = lofs / prev_ncol; 332 int prow = lofs / prev_ncol;
334 int pcol = lofs % prev_ncol; 333 int pcol = lofs % prev_ncol;
… …
344 343
345 line_t &pline = old_buf [prow]; 344 line_t &pline = old_buf [prow];
346 345
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 346 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 347
349 assert (len);
350 assert (pline.t);
351
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354 350
355 lofs += len; 351 lofs += len;
356 qcol += len; 352 qcol += len;
… …
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 358 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
363 } 359 }
364 while (p != pend && q > 0); 360 while (p != pend && q > 0);
365 361
366 term_start = total_rows - nrow; 362 term_start = total_rows - nrow;
367 nsaved = term_start - q; 363 top_row = q - term_start;
368 364
369 // make sure all terminal lines exist 365 // make sure all terminal lines exist
370 while (nsaved < 0) 366 while (top_row > 0)
371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 367 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 } 368 }
373 else 369 else
374 { 370 {
375 // if no scrollback exists (yet), wing, instead of wrap 371 // if no scrollback exists (yet), wing, instead of wrap
376 372
377 for (int row = min (nrow, prev_nrow); row--; ) 373 for (int row = min (nrow, prev_nrow); row--; )
378 { 374 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 375 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row]; 376 line_t &qline = row_buf [row];
381 377
… …
389 } 385 }
390 386
391 term_start = 0; 387 term_start = 0;
392 } 388 }
393 389
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = -nsaved; i < nrow; i++)
396 assert (ROW (i).t);
397#endif
398
399 free (old_buf); 390 free (old_buf);
400 delete old_ta; 391 delete old_ta;
401 delete old_ra; 392 delete old_ra;
402 393
403 clamp_it (screen.cur.row, 0, nrow - 1); 394 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 395 clamp_it (screen.cur.col, 0, ncol - 1);
405
406 if (tabs)
407 free (tabs);
408 } 396 }
397
398 CLEAR_ALL_SELECTION ();
409 399
410 prev_nrow = nrow; 400 prev_nrow = nrow;
411 prev_ncol = ncol; 401 prev_ncol = ncol;
412 402
413 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
414
415 for (int col = ncol; col--; )
416 tabs [col] = col % TABSIZE == 0;
417
418 tt_winch (); 403 tt_winch ();
419 404
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 405 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 406}
422 407
423/* ------------------------------------------------------------------------- */ 408/* ------------------------------------------------------------------------- */
424/* 409/*
425 * Free everything. That way malloc debugging can find leakage. 410 * Free everything. That way malloc debugging can find leakage.
426 */ 411 */
427void 412void
428rxvt_term::scr_release () 413rxvt_term::scr_release () NOTHROW
429{ 414{
415 if (row_buf)
416 {
430 delete talloc; talloc = 0; 417 delete talloc; talloc = 0;
431 delete ralloc; ralloc = 0; 418 delete ralloc; ralloc = 0;
432 419
433 free (row_buf); 420 free (row_buf);
434 free (swap_buf); 421 free (swap_buf);
435 free (drawn_buf); 422 free (drawn_buf);
436 free (tabs);
437
438 row_buf = 0; // signal that we freed all the arrays 423 row_buf = 0; // signal that we freed all the arrays above
439}
440 424
425 free (tabs);
426 tabs = 0;
427 }
428}
429
441/* ------------------------------------------------------------------------- */ 430/* ------------------------------------------------------------------------- */
442/* 431/*
443 * Hard reset 432 * Hard/Soft reset
444 */ 433 */
445void 434void
446rxvt_term::scr_poweron () 435rxvt_term::scr_poweron ()
447{ 436{
448 scr_release (); 437 scr_release ();
449 prev_nrow = prev_ncol = 0; 438 prev_nrow = prev_ncol = 0;
439 scr_soft_reset ();
450 scr_reset (); 440 scr_reset ();
451 441
452 scr_clear (true); 442 scr_clear (true);
453 scr_refresh (SLOW_REFRESH); 443 scr_refresh ();
444}
445
446void
447rxvt_term::scr_soft_reset ()
448{
449 /* only affects modes, nothing drastic such as clearing the screen */
450#if ENABLE_OVERLAY
451 scr_overlay_off ();
452#endif
453
454 rvideo_mode = false;
455
456 if (current_screen != PRIMARY)
457 scr_swap_screen ();
458
459 free (tabs);
460 tabs = (char *)rxvt_malloc (ncol);
461
462 for (int col = ncol; --col; )
463 tabs [col] = col % TABSIZE == 0;
464
465 if (current_screen != PRIMARY)
466 scr_swap_screen ();
467
468 scr_scroll_region (0, MAX_ROWS - 1);
469 scr_rendition (0, ~RS_None);
470 scr_insert_mode (0);
454} 471}
455 472
456/* ------------------------------------------------------------------------- * 473/* ------------------------------------------------------------------------- *
457 * PROCESS SCREEN COMMANDS * 474 * PROCESS SCREEN COMMANDS *
458 * ------------------------------------------------------------------------- */ 475 * ------------------------------------------------------------------------- */
… …
460 * Save and Restore cursor 477 * Save and Restore cursor
461 * XTERM_SEQ: Save cursor : ESC 7 478 * XTERM_SEQ: Save cursor : ESC 7
462 * XTERM_SEQ: Restore cursor: ESC 8 479 * XTERM_SEQ: Restore cursor: ESC 8
463 */ 480 */
464void 481void
465rxvt_term::scr_cursor (int mode) 482rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
466{ 483{
467 screen_t *s; 484 screen_t *s;
468 485
469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 486#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
470 if (current_screen == SECONDARY) 487 if (current_screen == SECONDARY)
… …
502 assert (s->cur.row >= 0); 519 assert (s->cur.row >= 0);
503 assert (s->cur.col >= 0); 520 assert (s->cur.col >= 0);
504#endif 521#endif
505} 522}
506 523
524void
525rxvt_term::scr_swap_screen ()
526{
527 if (!option (Opt_secondaryScreen))
528 return;
529
530 for (int i = prev_nrow; i--; )
531 ::swap (ROW(i), swap_buf [i]);
532
533 ::swap (screen.cur, swap.cur);
534
535 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
536 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
537}
538
507/* ------------------------------------------------------------------------- */ 539/* ------------------------------------------------------------------------- */
508/* 540/*
509 * Swap between primary and secondary screens 541 * Swap between primary and secondary screens
510 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 542 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 543 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
512 */ 544 */
513int 545void
514rxvt_term::scr_change_screen (int scrn) 546rxvt_term::scr_change_screen (int scrn)
515{ 547{
548 if (scrn == current_screen)
549 return;
550
516 want_refresh = 1; 551 want_refresh = 1;
517 view_start = 0; 552 view_start = 0;
518 553
519 if (current_screen == scrn)
520 return scrn;
521
522 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
523 555
524 int i = current_screen; current_screen = scrn; scrn = i; 556 int i = current_screen; current_screen = scrn; scrn = i;
525 557
526 ::swap (screen.cur.row, swap.cur.row);
527 ::swap (screen.cur.col, swap.cur.col);
528
529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
531
532#if NSCREENS 558#if NSCREENS
533 if (OPTION (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
534 { 560 {
535 num_scr = 0; 561 num_scr = 0;
536 562
537 for (int i = prev_nrow; i--; ) 563 scr_swap_screen ();
538 ::swap (ROW(i), swap_buf [i]);
539 564
540 ::swap (screen.charset, swap.charset); 565 ::swap (screen.charset, swap.charset);
541 ::swap (screen.flags, swap.flags); 566 ::swap (screen.flags, swap.flags);
542 screen.flags |= Screen_VisibleCursor; 567 screen.flags |= Screen_VisibleCursor;
543 swap.flags |= Screen_VisibleCursor; 568 swap.flags |= Screen_VisibleCursor;
544 } 569 }
545 else 570 else
546#endif 571#endif
547 if (OPTION (Opt_secondaryScroll)) 572 if (option (Opt_secondaryScroll))
548 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 573 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
549
550 return scrn;
551} 574}
552 575
553// clear WrapNext indicator, solidifying position on next line 576// clear WrapNext indicator, solidifying position on next line
554void 577void
555rxvt_term::scr_do_wrap () 578rxvt_term::scr_do_wrap () NOTHROW
556{ 579{
557 if (!(screen.flags & Screen_WrapNext)) 580 if (!(screen.flags & Screen_WrapNext))
558 return; 581 return;
559 582
560 screen.flags &= ~Screen_WrapNext; 583 screen.flags &= ~Screen_WrapNext;
… …
570/* ------------------------------------------------------------------------- */ 593/* ------------------------------------------------------------------------- */
571/* 594/*
572 * Change the colour for following text 595 * Change the colour for following text
573 */ 596 */
574void 597void
575rxvt_term::scr_color (unsigned int color, int fgbg) 598rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
576{ 599{
577 if (color > maxTermCOLOR) 600 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 601 color = fgbg;
579 602
580 if (fgbg == Color_fg) 603 if (fgbg == Color_fg)
581 rstyle = SET_FGCOLOR (rstyle, color); 604 rstyle = SET_FGCOLOR (rstyle, color);
582 else 605 else
… …
586/* ------------------------------------------------------------------------- */ 609/* ------------------------------------------------------------------------- */
587/* 610/*
588 * Change the rendition style for following text 611 * Change the rendition style for following text
589 */ 612 */
590void 613void
591rxvt_term::scr_rendition (int set, int style) 614rxvt_term::scr_rendition (int set, int style) NOTHROW
592 { 615{
593 if (set) 616 if (set)
594 rstyle |= style; 617 rstyle |= style;
595 else if (style == ~RS_None) 618 else if (style == ~RS_None)
596 rstyle = DEFAULT_RSTYLE; 619 rstyle = DEFAULT_RSTYLE;
597 else 620 else
598 rstyle &= ~style; 621 rstyle &= ~style;
599 } 622}
600 623
601/* ------------------------------------------------------------------------- */ 624/* ------------------------------------------------------------------------- */
602/* 625/*
603 * Scroll text between <row1> and <row2> inclusive, by <count> lines 626 * Scroll text between <row1> and <row2> inclusive, by <count> lines
604 * count positive ==> scroll up 627 * count positive ==> scroll up
605 * count negative ==> scroll down 628 * count negative ==> scroll down
606 */ 629 */
607int 630int
608rxvt_term::scr_scroll_text (int row1, int row2, int count) 631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
609{ 632{
610 if (count == 0 || (row1 > row2)) 633 if (count == 0 || (row1 > row2))
611 return 0; 634 return 0;
612 635
613 want_refresh = 1; 636 want_refresh = 1;
614 num_scr += count; 637 num_scr += count;
615 638
616 if (count > 0 639 if (count > 0
617 && row1 == 0 640 && row1 == 0
618 && row2 == nrow - 1
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
620 { 642 {
621 nsaved = min (nsaved + count, saveLines); 643 top_row = max (top_row - count, -saveLines);
622 644
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 645 // scroll everything up 'count' lines
624
625 term_start = (term_start + count) % total_rows; 646 term_start = (term_start + count) % total_rows;
626 647
648 // sever bottommost line
649 {
650 line_t &l = ROW(row2 - count);
651 l.is_longer (0);
652 l.touch ();
653 }
654
655 // erase newly scrolled-in lines
656 for (int i = count; i--; )
657 {
658 line_t &l = ROW(nrow - 1 - i);
659
660 // optimize if already cleared, can be significant on slow machines
661 // could be rolled into scr_blank_screen_mem
662 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
663 {
664 scr_blank_line (l, 0, l.l, rstyle);
665 l.l = 0;
666 l.f = 0;
667 }
668 else
669 scr_blank_screen_mem (l, rstyle);
670 }
671
672 // now copy lines below the scroll region bottom to the
673 // bottom of the screen again, so they look as if they
674 // hadn't moved.
675 for (int i = nrow; --i > row2; )
676 {
677 line_t &l1 = ROW(i - count);
678 line_t &l2 = ROW(i);
679
680 ::swap (l1, l2);
681 l2.touch ();
682 }
683
684 // move and/or clear selection, if any
627 if (selection.op && current_screen == selection.screen) 685 if (selection.op && current_screen == selection.screen)
628 { 686 {
629 selection.beg.row -= count; 687 selection.beg.row -= count;
630 selection.end.row -= count; 688 selection.end.row -= count;
631 selection.mark.row -= count; 689 selection.mark.row -= count;
632 690
633 if (selection.beg.row < -nsaved 691 if (selection.beg.row < top_row
634 || selection.end.row < -nsaved 692 || selection.end.row < top_row
635 || selection.mark.row < -nsaved) 693 || selection.mark.row < top_row)
636 { 694 {
637 CLEAR_ALL_SELECTION (); 695 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; 696 selection.op = SELECTION_CLEAR;
639 } 697 }
640 } 698 }
641 699
642 for (int i = count; i--; ) 700 // finally move the view window, if desired
643 {
644 // basically thi is a slightly optimized scr_blank_screen_mem
645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
652 }
653
654 if (OPTION (Opt_scrollWithBuffer) 701 if (option (Opt_scrollWithBuffer)
655 && view_start != 0 702 && view_start != 0
656 && view_start != saveLines) 703 && view_start != -saveLines)
657 scr_page (UP, count); 704 scr_page (UP, count);
705
706 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
707 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
658 } 708 }
659 else 709 else
660 { 710 {
661 if (selection.op && current_screen == selection.screen) 711 if (selection.op && current_screen == selection.screen)
662 { 712 {
… …
674 { 724 {
675 /* move selected region too */ 725 /* move selected region too */
676 selection.beg.row -= count; 726 selection.beg.row -= count;
677 selection.end.row -= count; 727 selection.end.row -= count;
678 selection.mark.row -= count; 728 selection.mark.row -= count;
679 729
680 selection_check (0); 730 selection_check (0);
681 } 731 }
682 } 732 }
683 733
684 // use a simple and robust scrolling algorithm, this 734 // use a simple and robust scrolling algorithm, this
… …
708/* ------------------------------------------------------------------------- */ 758/* ------------------------------------------------------------------------- */
709/* 759/*
710 * Add text given in <str> of length <len> to screen struct 760 * Add text given in <str> of length <len> to screen struct
711 */ 761 */
712void 762void
713rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 763rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
714{ 764{
715 if (len <= 0) /* sanity */ 765 if (len <= 0) /* sanity */
716 return; 766 return;
717 767
718 unsigned char checksel; 768 unsigned char checksel;
… …
724 ZERO_SCROLLBACK (); 774 ZERO_SCROLLBACK ();
725 775
726 if (minlines > 0) 776 if (minlines > 0)
727 { 777 {
728 minlines += screen.cur.row - screen.bscroll; 778 minlines += screen.cur.row - screen.bscroll;
779 min_it (minlines, screen.cur.row - top_row);
729 780
730 if (minlines > 0 781 if (minlines > 0
731 && screen.tscroll == 0 782 && screen.tscroll == 0
732 && screen.bscroll == nrow - 1) 783 && screen.bscroll == nrow - 1)
733 { 784 {
… …
738 } 789 }
739 790
740#ifdef DEBUG_STRICT 791#ifdef DEBUG_STRICT
741 assert (screen.cur.col < ncol); 792 assert (screen.cur.col < ncol);
742 assert (screen.cur.row < nrow 793 assert (screen.cur.row < nrow
743 && screen.cur.row >= -nsaved); 794 && screen.cur.row >= top_row);
744#endif 795#endif
745 int row = screen.cur.row; 796 int row = screen.cur.row;
746 797
747 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 798 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
748 799
… …
750 801
751 while (str < strend) 802 while (str < strend)
752 { 803 {
753 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 804 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
754 805
755 if (c < 0x20) 806 if (expect_false (c < 0x20))
756 if (c == C0_LF) 807 if (c == C0_LF)
757 { 808 {
758 max_it (line->l, screen.cur.col); 809 max_it (line->l, screen.cur.col);
759 810
760 screen.flags &= ~Screen_WrapNext; 811 screen.flags &= ~Screen_WrapNext;
… …
779 { 830 {
780 scr_tab (1, true); 831 scr_tab (1, true);
781 continue; 832 continue;
782 } 833 }
783 834
835 if (expect_false (
784 if (checksel /* see if we're writing within selection */ 836 checksel /* see if we're writing within selection */
785 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 837 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
786 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 838 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
839 ))
787 { 840 {
788 checksel = 0; 841 checksel = 0;
789 /* 842 /*
790 * If we wrote anywhere in the selected area, kill the selection 843 * If we wrote anywhere in the selected area, kill the selection
791 * XXX: should we kill the mark too? Possibly, but maybe that 844 * XXX: should we kill the mark too? Possibly, but maybe that
792 * should be a similar check. 845 * should be a similar check.
793 */ 846 */
794 CLEAR_SELECTION (); 847 CLEAR_SELECTION ();
795 } 848 }
796 849
797 if (screen.flags & Screen_WrapNext) 850 if (expect_false (screen.flags & Screen_WrapNext))
798 { 851 {
852 scr_do_wrap ();
853
799 max_it (line->l, ncol); 854 line->l = ncol;
800 line->is_longer (1); 855 line->is_longer (1);
801 856
802 scr_do_wrap ();
803
804 row = screen.cur.row; 857 row = screen.cur.row;
805 line = &ROW(row); /* _must_ refresh */ 858 line = &ROW(row); /* _must_ refresh */
806 } 859 }
807 860
808 // some utf-8 decoders "decode" surrogate characters: let's fix this. 861 // some utf-8 decoders "decode" surrogate characters: let's fix this.
809 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 862 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
810 c = 0xfffd; 863 c = 0xfffd;
811 864
812 // rely on wcwidth to tell us the character width, at least for non-latin1 865 // rely on wcwidth to tell us the character width, do wcwidth before
813 // do wcwidth before further replacements, as wcwidth might return -1 866 // further replacements, as wcwidth might return -1 for the line
814 // for the line drawing characters below as they might be invalid in the current 867 // drawing characters below as they might be invalid in the current
815 // locale. 868 // locale.
816 int width = c < 0x100 ? 1 : wcwidth (c); 869 int width = WCWIDTH (c);
817 870
818 if (charsets [screen.charset] == '0') // DEC SPECIAL 871 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
819 { 872 {
820 // vt100 special graphics and line drawing 873 // vt100 special graphics and line drawing
821 // 5f-7e standard vt100 874 // 5f-7e standard vt100
822 // 40-5e rxvt extension for extra curses acs chars 875 // 40-5e rxvt extension for extra curses acs chars
823 static uint16_t vt100_0[62] = { // 41 .. 7e 876 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
836 c = vt100_0[c - 0x41]; 889 c = vt100_0[c - 0x41];
837 width = 1; // vt100 line drawing characters are always single-width 890 width = 1; // vt100 line drawing characters are always single-width
838 } 891 }
839 } 892 }
840 893
841 if (screen.flags & Screen_Insert) 894 if (expect_false (screen.flags & Screen_Insert))
842 scr_insdel_chars (width, INSERT); 895 scr_insdel_chars (width, INSERT);
843 896
844 if (width != 0) 897 if (width != 0)
845 { 898 {
846#if !UNICODE_3 899#if !UNICODE_3
… …
852 c = 0xfffd; 905 c = 0xfffd;
853# endif 906# endif
854#endif 907#endif
855 908
856 // nuke the character at this position, if required 909 // nuke the character at this position, if required
910 if (expect_false (
857 if (line->t[screen.cur.col] == NOCHAR 911 line->t[screen.cur.col] == NOCHAR
858 || (screen.cur.col < ncol - 1 912 || (screen.cur.col < ncol - 1
859 && line->t[screen.cur.col + 1] == NOCHAR)) 913 && line->t[screen.cur.col + 1] == NOCHAR)
914 ))
915 scr_kill_char (*line, screen.cur.col);
916
917 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
918
919 // if the character doesn't fit into the remaining columns...
920 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
860 { 921 {
861 int col = screen.cur.col; 922 // ... artificially enlargen the previous one
862
863 // find begin
864 while (col > 0 && line->t[col] == NOCHAR)
865 col--;
866
867 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
868
869 // found begin, nuke
870 do {
871 line->t[col] = ' ';
872 line->r[col] = rend;
873 col++;
874 } while (col < ncol && line->t[col] == NOCHAR);
875 }
876
877 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
878
879 // if the character doesn't fit into the remaining columns...
880 if (screen.cur.col > ncol - width && ncol >= width)
881 {
882 // ...output spaces
883 c = ' '; 923 c = NOCHAR;
884 // and try the same character next loop iteration 924 // and try the same character next loop iteration
885 --str; 925 --str;
886 } 926 }
887 927
888 line->touch (); 928 line->touch ();
… …
890 do 930 do
891 { 931 {
892 line->t[screen.cur.col] = c; 932 line->t[screen.cur.col] = c;
893 line->r[screen.cur.col] = rend; 933 line->r[screen.cur.col] = rend;
894 934
895 if (screen.cur.col < ncol - 1) 935 if (expect_true (screen.cur.col < ncol - 1))
896 screen.cur.col++; 936 screen.cur.col++;
897 else 937 else
898 { 938 {
899 line->l = ncol; 939 line->l = ncol;
900 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
… …
902 break; 942 break;
903 } 943 }
904 944
905 c = NOCHAR; 945 c = NOCHAR;
906 } 946 }
907 while (--width > 0); 947 while (expect_false (--width > 0));
908 948
909 // pad with spaces when overwriting wide character with smaller one 949 // pad with spaces when overwriting wide character with smaller one
910 if (!width) 950 if (expect_false (!width))
911 { 951 {
912 line->touch (); 952 line->touch ();
913 953
914 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 954 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
915 { 955 {
916 line->t[c] = ' '; 956 line->t[c] = ' ';
917 line->r[c] = rend; 957 line->r[c] = rend;
918 } 958 }
919 } 959 }
920 } 960 }
961#if ENABLE_COMBINING
921 else // width == 0 962 else // width == 0
922 { 963 {
923#if ENABLE_COMBINING 964 if (c != 0xfeff) // ignore BOM
924 // handle combining characters
925 // we just tag the accent on the previous on-screen character.
926 // this is arguably not correct, but also arguably not wrong.
927 // we don't handle double-width characters nicely yet.
928 line_t *linep;
929 text_t *tp;
930 rend_t *rp;
931
932 if (screen.cur.col > 0)
933 { 965 {
966 // handle combining characters
967 // we just tag the accent on the previous on-screen character.
968 // this is arguably not correct, but also arguably not wrong.
969 // we don't handle double-width characters nicely yet.
970 line_t *linep;
971 text_t *tp;
972 rend_t *rp;
973
974 if (screen.cur.col > 0)
975 {
934 linep = line; 976 linep = line;
935 tp = line->t + screen.cur.col - 1; 977 tp = line->t + screen.cur.col - 1;
936 rp = line->r + screen.cur.col - 1; 978 rp = line->r + screen.cur.col - 1;
979 }
980 else if (screen.cur.row > 0
981 && ROW(screen.cur.row - 1).is_longer ())
982 {
983 linep = &ROW(screen.cur.row - 1);
984 tp = line->t + ncol - 1;
985 rp = line->r + ncol - 1;
986 }
987 else
988 continue;
989
990 linep->touch ();
991
992 while (*tp == NOCHAR && tp > linep->t)
993 tp--, rp--;
994
995 // first try to find a precomposed character
996 unicode_t n = rxvt_compose (*tp, c);
997 if (n == NOCHAR)
998 n = rxvt_composite.compose (*tp, c);
999
1000 *tp = n;
1001 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
937 } 1002 }
938 else if (screen.cur.row > 0
939 && ROW(screen.cur.row - 1).is_longer ())
940 {
941 linep = &ROW(screen.cur.row - 1);
942 tp = line->t + ncol - 1;
943 rp = line->r + ncol - 1;
944 } 1003 }
945 else
946 continue;
947
948 linep->touch ();
949
950 while (*tp == NOCHAR && tp > linep->t)
951 tp--, rp--;
952
953 // first try to find a precomposed character
954 unicode_t n = rxvt_compose (*tp, c);
955 if (n == NOCHAR)
956 n = rxvt_composite.compose (*tp, c);
957
958 *tp = n;
959 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
960#endif 1004#endif
961 }
962 } 1005 }
963 1006
964 max_it (line->l, screen.cur.col); 1007 max_it (line->l, screen.cur.col);
965 1008
966#ifdef DEBUG_STRICT 1009#ifdef DEBUG_STRICT
… …
972/* 1015/*
973 * Process Backspace. Move back the cursor back a position, wrap if have to 1016 * Process Backspace. Move back the cursor back a position, wrap if have to
974 * XTERM_SEQ: CTRL-H 1017 * XTERM_SEQ: CTRL-H
975 */ 1018 */
976void 1019void
977rxvt_term::scr_backspace () 1020rxvt_term::scr_backspace () NOTHROW
978{ 1021{
979 want_refresh = 1;
980
981 if (screen.cur.col == 0) 1022 if (screen.cur.col == 0)
982 { 1023 {
983 if (screen.cur.row > 0) 1024 if (screen.cur.row > 0)
984 { 1025 {
985#ifdef TERMCAP_HAS_BW 1026#ifdef TERMCAP_HAS_BW
986 screen.cur.col = ncol - 1; 1027 screen.cur.col = ncol - 1;
987 screen.cur.row--; 1028 --screen.cur.row;
988 return; 1029
1030 want_refresh = 1;
989#endif 1031#endif
990 } 1032 }
991 } 1033 }
992 else if (!(screen.flags & Screen_WrapNext)) 1034 else
993 scr_gotorc (0, -1, RELATIVE); 1035 scr_gotorc (0, -1, RELATIVE);
994
995 screen.flags &= ~Screen_WrapNext;
996} 1036}
997 1037
998/* ------------------------------------------------------------------------- */ 1038/* ------------------------------------------------------------------------- */
999/* 1039/*
1000 * Process Horizontal Tab 1040 * Process Horizontal Tab
1001 * count: +ve = forward; -ve = backwards 1041 * count: +ve = forward; -ve = backwards
1002 * XTERM_SEQ: CTRL-I 1042 * XTERM_SEQ: CTRL-I
1003 */ 1043 */
1004void 1044void
1005rxvt_term::scr_tab (int count, bool ht) 1045rxvt_term::scr_tab (int count, bool ht) NOTHROW
1006{ 1046{
1007 int i, x; 1047 int i, x;
1008 1048
1009 want_refresh = 1; 1049 want_refresh = 1;
1010 i = x = screen.cur.col; 1050 i = x = screen.cur.col;
… …
1023 x = i; 1063 x = i;
1024 1064
1025 if (!--count) 1065 if (!--count)
1026 break; 1066 break;
1027 } 1067 }
1028 else 1068 else
1029 ht &= l.t[i] == ' ' 1069 ht &= l.t[i] == ' '
1030 && RS_SAME (l.r[i], base_rend); 1070 && RS_SAME (l.r[i], base_rend);
1031 1071
1032 if (count) 1072 if (count)
1033 x = ncol - 1; 1073 x = ncol - 1;
1034 1074
1035 // store horizontal tab commands as characters inside the text 1075 // store horizontal tab commands as characters inside the text
1036 // buffer so they can be selected and pasted. 1076 // buffer so they can be selected and pasted.
1037 if (ht && OPTION (Opt_pastableTabs)) 1077 if (ht && option (Opt_pastableTabs))
1038 { 1078 {
1039 base_rend = SET_FONT (base_rend, 0); 1079 base_rend = SET_FONT (base_rend, 0);
1040 1080
1041 l.touch (x); 1081 l.touch (x);
1042 1082
… …
1075 * Process DEC Back Index 1115 * Process DEC Back Index
1076 * XTERM_SEQ: ESC 6 1116 * XTERM_SEQ: ESC 6
1077 * Move cursor left in row. If we're at the left boundary, shift everything 1117 * Move cursor left in row. If we're at the left boundary, shift everything
1078 * in that row right. Clear left column. 1118 * in that row right. Clear left column.
1079 */ 1119 */
1080#if ENABLE_FRILLS 1120#if !ENABLE_MINIMAL
1081void 1121void
1082rxvt_term::scr_backindex () 1122rxvt_term::scr_backindex () NOTHROW
1083{ 1123{
1084 if (screen.cur.col > 0) 1124 if (screen.cur.col > 0)
1085 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1125 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1086 else 1126 else
1087 scr_insdel_chars (1, INSERT); 1127 scr_insdel_chars (1, INSERT);
… …
1092 * Process DEC Forward Index 1132 * Process DEC Forward Index
1093 * XTERM_SEQ: ESC 9 1133 * XTERM_SEQ: ESC 9
1094 * Move cursor right in row. If we're at the right boundary, shift everything 1134 * Move cursor right in row. If we're at the right boundary, shift everything
1095 * in that row left. Clear right column. 1135 * in that row left. Clear right column.
1096 */ 1136 */
1097#if ENABLE_FRILLS 1137#if !ENABLE_MINIMAL
1098void 1138void
1099rxvt_term::scr_forwardindex () 1139rxvt_term::scr_forwardindex () NOTHROW
1100{ 1140{
1101 if (screen.cur.col < ncol - 1) 1141 if (screen.cur.col < ncol - 1)
1102 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1142 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1103 else 1143 else
1104 { 1144 {
… …
1117/* ------------------------------------------------------------------------- */ 1157/* ------------------------------------------------------------------------- */
1118/* 1158/*
1119 * Goto Row/Column 1159 * Goto Row/Column
1120 */ 1160 */
1121void 1161void
1122rxvt_term::scr_gotorc (int row, int col, int relative) 1162rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1123{ 1163{
1124 want_refresh = 1; 1164 want_refresh = 1;
1125 ZERO_SCROLLBACK (); 1165 ZERO_SCROLLBACK ();
1126 1166
1127 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1167 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1149 } 1189 }
1150 } 1190 }
1151 else 1191 else
1152 { 1192 {
1153 if (screen.flags & Screen_Relative) 1193 if (screen.flags & Screen_Relative)
1194 {
1154 { /* relative origin mode */ 1195 /* relative origin mode */
1155 screen.cur.row = row + screen.tscroll; 1196 screen.cur.row = row + screen.tscroll;
1156 min_it (screen.cur.row, screen.bscroll); 1197 min_it (screen.cur.row, screen.bscroll);
1157 } 1198 }
1158 else 1199 else
1159 screen.cur.row = row; 1200 screen.cur.row = row;
… …
1165/* ------------------------------------------------------------------------- */ 1206/* ------------------------------------------------------------------------- */
1166/* 1207/*
1167 * direction should be UP or DN 1208 * direction should be UP or DN
1168 */ 1209 */
1169void 1210void
1170rxvt_term::scr_index (enum page_dirn direction) 1211rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1171{ 1212{
1172 int dirn; 1213 int dirn;
1173 1214
1174 want_refresh = 1; 1215 want_refresh = 1;
1175 ZERO_SCROLLBACK (); 1216 ZERO_SCROLLBACK ();
… …
1192/* 1233/*
1193 * Erase part or whole of a line 1234 * Erase part or whole of a line
1194 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1235 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1195 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1236 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1196 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1237 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1238 * extension: clear to right unless wrapped: ESC [ 3 K
1197 */ 1239 */
1198void 1240void
1199rxvt_term::scr_erase_line (int mode) 1241rxvt_term::scr_erase_line (int mode) NOTHROW
1200{ 1242{
1201 unsigned int col, num; 1243 unsigned int col, num;
1202 1244
1203 want_refresh = 1; 1245 want_refresh = 1;
1204 ZERO_SCROLLBACK (); 1246 ZERO_SCROLLBACK ();
… …
1210 line.touch (); 1252 line.touch ();
1211 line.is_longer (0); 1253 line.is_longer (0);
1212 1254
1213 switch (mode) 1255 switch (mode)
1214 { 1256 {
1257 case 3:
1258 if (screen.flags & Screen_WrapNext)
1259 return;
1260
1261 /* fall through */
1262
1215 case 0: /* erase to end of line */ 1263 case 0: /* erase to end of line */
1216 col = screen.cur.col; 1264 col = screen.cur.col;
1217 num = ncol - col; 1265 num = ncol - col;
1218 min_it (line.l, col); 1266 min_it (line.l, col);
1267
1219 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1268 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1220 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1269 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1221 CLEAR_SELECTION (); 1270 CLEAR_SELECTION ();
1222 break; 1271 break;
1272
1223 case 1: /* erase to beginning of line */ 1273 case 1: /* erase to beginning of line */
1224 col = 0; 1274 col = 0;
1225 num = screen.cur.col + 1; 1275 num = screen.cur.col + 1;
1276
1226 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1277 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1227 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1278 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1228 CLEAR_SELECTION (); 1279 CLEAR_SELECTION ();
1229 break; 1280 break;
1281
1230 case 2: /* erase whole line */ 1282 case 2: /* erase whole line */
1231 col = 0; 1283 col = 0;
1232 num = ncol; 1284 num = ncol;
1233 line.l = 0; 1285 line.l = 0;
1234 if (selection.beg.row <= screen.cur.row 1286 if (selection.beg.row <= screen.cur.row
… …
1248 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1300 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1249 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1301 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1250 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1302 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1251 */ 1303 */
1252void 1304void
1253rxvt_term::scr_erase_screen (int mode) 1305rxvt_term::scr_erase_screen (int mode) NOTHROW
1254{ 1306{
1255 int num; 1307 int num;
1256 int32_t row; 1308 int32_t row;
1257 rend_t ren; 1309 rend_t ren;
1258 XGCValues gcvalue; 1310 XGCValues gcvalue;
… …
1292 if (row >= nrow) /* Out Of Bounds */ 1344 if (row >= nrow) /* Out Of Bounds */
1293 return; 1345 return;
1294 1346
1295 min_it (num, nrow - row); 1347 min_it (num, nrow - row);
1296 1348
1349 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1297 if (rstyle & (RS_RVid | RS_Uline)) 1350 if (rstyle & (RS_RVid | RS_Uline))
1298 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1299 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1300 { 1353 {
1301 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1302 CLEAR_ROWS (row, num); 1355
1356 if (mapped)
1357 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row), (unsigned int)width,
1359 (unsigned int)Height2Pixel (num), False);
1303 } 1360 }
1304 else 1361 else
1305 { 1362 {
1306 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1364
1307 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1308 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1309 ERASE_ROWS (row, num); 1367 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row),
1369 (unsigned int)width,
1370 (unsigned int)Height2Pixel (num));
1310 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1311 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1312 } 1373 }
1313 1374
1314 for (; num--; row++) 1375 for (; num--; row++)
1315 { 1376 {
1316 scr_blank_screen_mem (ROW(row), rstyle); 1377 scr_blank_screen_mem (ROW(row), rstyle);
1317 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1378 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1318 } 1379 }
1319} 1380}
1320 1381
1321#if ENABLE_FRILLS 1382#if !ENABLE_MINIMAL
1322void 1383void
1323rxvt_term::scr_erase_savelines () 1384rxvt_term::scr_erase_savelines () NOTHROW
1324{ 1385{
1325 want_refresh = 1; 1386 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1387 ZERO_SCROLLBACK ();
1327 1388
1328 nsaved = 0; 1389 top_row = 0;
1329} 1390}
1330#endif 1391#endif
1331 1392
1332/* ------------------------------------------------------------------------- */ 1393/* ------------------------------------------------------------------------- */
1333/* 1394/*
1334 * Fill the screen with `E's 1395 * Fill the screen with `E's
1335 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1396 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1336 */ 1397 */
1337void 1398void
1338rxvt_term::scr_E () 1399rxvt_term::scr_E () NOTHROW
1339{ 1400{
1340 rend_t fs; 1401 rend_t fs;
1341 1402
1342 want_refresh = 1; 1403 want_refresh = 1;
1343 ZERO_SCROLLBACK (); 1404 ZERO_SCROLLBACK ();
… …
1364/* ------------------------------------------------------------------------- */ 1425/* ------------------------------------------------------------------------- */
1365/* 1426/*
1366 * Insert/Delete <count> lines 1427 * Insert/Delete <count> lines
1367 */ 1428 */
1368void 1429void
1369rxvt_term::scr_insdel_lines (int count, int insdel) 1430rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1370{ 1431{
1371 int end; 1432 int end;
1372 1433
1373 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
1374 1435
… …
1394/* ------------------------------------------------------------------------- */ 1455/* ------------------------------------------------------------------------- */
1395/* 1456/*
1396 * Insert/Delete <count> characters from the current position 1457 * Insert/Delete <count> characters from the current position
1397 */ 1458 */
1398void 1459void
1399rxvt_term::scr_insdel_chars (int count, int insdel) 1460rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1400{ 1461{
1401 int col, row;
1402 rend_t tr;
1403
1404 want_refresh = 1; 1462 want_refresh = 1;
1405 ZERO_SCROLLBACK (); 1463 ZERO_SCROLLBACK ();
1406 1464
1407 if (count <= 0) 1465 if (count <= 0)
1408 return; 1466 return;
… …
1410 scr_do_wrap (); 1468 scr_do_wrap ();
1411 1469
1412 selection_check (1); 1470 selection_check (1);
1413 min_it (count, ncol - screen.cur.col); 1471 min_it (count, ncol - screen.cur.col);
1414 1472
1415 row = screen.cur.row; 1473 int row = screen.cur.row;
1416 1474
1417 line_t *line = &ROW(row); 1475 line_t *line = &ROW(row);
1418 1476
1419 line->touch (); 1477 line->touch ();
1420 line->is_longer (0); 1478 line->is_longer (0);
1421 1479
1480 // nuke wide spanning the start
1481 if (line->t[screen.cur.col] == NOCHAR)
1482 scr_kill_char (*line, screen.cur.col);
1483
1422 switch (insdel) 1484 switch (insdel)
1423 { 1485 {
1424 case INSERT: 1486 case INSERT:
1425 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1487 line->l = min (line->l + count, ncol);
1488
1489 if (line->t[screen.cur.col] == NOCHAR)
1490 scr_kill_char (*line, screen.cur.col);
1491
1492 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1426 { 1493 {
1427 line->t[col] = line->t[col - count]; 1494 line->t[col] = line->t[col - count];
1428 line->r[col] = line->r[col - count]; 1495 line->r[col] = line->r[col - count];
1429 } 1496 }
1430
1431 line->l = min (line->l + count, ncol);
1432 1497
1433 if (selection.op && current_screen == selection.screen 1498 if (selection.op && current_screen == selection.screen
1434 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1499 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1435 { 1500 {
1436 if (selection.end.row != screen.cur.row 1501 if (selection.end.row != screen.cur.row
1437 || (selection.end.col + count >= ncol)) 1502 || (selection.end.col + count >= ncol))
1438 CLEAR_SELECTION (); 1503 CLEAR_SELECTION ();
1439 else 1504 else
1505 {
1440 { /* shift selection */ 1506 /* shift selection */
1441 selection.beg.col += count; 1507 selection.beg.col += count;
1442 selection.mark.col += count; /* XXX: yes? */ 1508 selection.mark.col += count; /* XXX: yes? */
1443 selection.end.col += count; 1509 selection.end.col += count;
1444 } 1510 }
1445 } 1511 }
… …
1450 case ERASE: 1516 case ERASE:
1451 screen.cur.col += count; /* don't worry if > ncol */ 1517 screen.cur.col += count; /* don't worry if > ncol */
1452 selection_check (1); 1518 selection_check (1);
1453 screen.cur.col -= count; 1519 screen.cur.col -= count;
1454 1520
1455 line->l = max (line->l - count, 0); 1521 // nuke wide char after the end
1522 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1523 scr_kill_char (*line, screen.cur.col + count);
1524
1456 scr_blank_line (*line, screen.cur.col, count, rstyle); 1525 scr_blank_line (*line, screen.cur.col, count, rstyle);
1457 break; 1526 break;
1458 1527
1459 case DELETE: 1528 case DELETE:
1460 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1529 line->l = max (line->l - count, 0);
1461 1530
1531 // nuke wide char spanning the end
1532 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1533 scr_kill_char (*line, screen.cur.col + count);
1534
1462 for (col = screen.cur.col; (col + count) < ncol; col++) 1535 for (int col = screen.cur.col; (col + count) < ncol; col++)
1463 { 1536 {
1464 line->t[col] = line->t[col + count]; 1537 line->t[col] = line->t[col + count];
1465 line->r[col] = line->r[col + count]; 1538 line->r[col] = line->r[col + count];
1466 } 1539 }
1467 1540
1468 line->l = max (line->l - count, 0);
1469 scr_blank_line (*line, ncol - count, count, tr); 1541 scr_blank_line (*line, ncol - count, count,
1542 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1470 1543
1471 if (selection.op && current_screen == selection.screen 1544 if (selection.op && current_screen == selection.screen
1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1473 { 1546 {
1474 if (selection.end.row != screen.cur.row 1547 if (selection.end.row != screen.cur.row
… …
1492/* 1565/*
1493 * Set the scrolling region 1566 * Set the scrolling region
1494 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1567 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1495 */ 1568 */
1496void 1569void
1497rxvt_term::scr_scroll_region (int top, int bot) 1570rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1498{ 1571{
1499 max_it (top, 0); 1572 max_it (top, 0);
1500 min_it (bot, nrow - 1); 1573 min_it (bot, nrow - 1);
1501 1574
1502 if (top > bot) 1575 if (top > bot)
… …
1512 * Make the cursor visible/invisible 1585 * Make the cursor visible/invisible
1513 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1586 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1514 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1587 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1515 */ 1588 */
1516void 1589void
1517rxvt_term::scr_cursor_visible (int mode) 1590rxvt_term::scr_cursor_visible (int mode) NOTHROW
1518{ 1591{
1519 want_refresh = 1; 1592 want_refresh = 1;
1520 1593
1521 if (mode) 1594 if (mode)
1522 screen.flags |= Screen_VisibleCursor; 1595 screen.flags |= Screen_VisibleCursor;
… …
1529 * Set/unset automatic wrapping 1602 * Set/unset automatic wrapping
1530 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1603 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1531 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1604 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1532 */ 1605 */
1533void 1606void
1534rxvt_term::scr_autowrap (int mode) 1607rxvt_term::scr_autowrap (int mode) NOTHROW
1535{ 1608{
1536 if (mode) 1609 if (mode)
1537 screen.flags |= Screen_Autowrap; 1610 screen.flags |= Screen_Autowrap;
1538 else 1611 else
1539 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1612 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1548 * and the cursor cannot be moved outside. 1621 * and the cursor cannot be moved outside.
1549 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1622 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1550 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1623 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1551 */ 1624 */
1552void 1625void
1553rxvt_term::scr_relative_origin (int mode) 1626rxvt_term::scr_relative_origin (int mode) NOTHROW
1554{ 1627{
1555 if (mode) 1628 if (mode)
1556 screen.flags |= Screen_Relative; 1629 screen.flags |= Screen_Relative;
1557 else 1630 else
1558 screen.flags &= ~Screen_Relative; 1631 screen.flags &= ~Screen_Relative;
… …
1565 * Set insert/replace mode 1638 * Set insert/replace mode
1566 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1639 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1567 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1640 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1568 */ 1641 */
1569void 1642void
1570rxvt_term::scr_insert_mode (int mode) 1643rxvt_term::scr_insert_mode (int mode) NOTHROW
1571{ 1644{
1572 if (mode) 1645 if (mode)
1573 screen.flags |= Screen_Insert; 1646 screen.flags |= Screen_Insert;
1574 else 1647 else
1575 screen.flags &= ~Screen_Insert; 1648 screen.flags &= ~Screen_Insert;
… …
1581 * XTERM_SEQ: Set tab at current column : ESC H 1654 * XTERM_SEQ: Set tab at current column : ESC H
1582 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1655 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1583 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1656 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1584 */ 1657 */
1585void 1658void
1586rxvt_term::scr_set_tab (int mode) 1659rxvt_term::scr_set_tab (int mode) NOTHROW
1587{ 1660{
1588 if (mode < 0) 1661 if (mode < 0)
1589 memset (tabs, 0, ncol * sizeof (char)); 1662 memset (tabs, 0, ncol);
1590 else if (screen.cur.col < ncol) 1663 else if (screen.cur.col < ncol)
1591 tabs [screen.cur.col] = !!mode; 1664 tabs [screen.cur.col] = !!mode;
1592} 1665}
1593 1666
1594/* ------------------------------------------------------------------------- */ 1667/* ------------------------------------------------------------------------- */
… …
1596 * Set reverse/normal video 1669 * Set reverse/normal video
1597 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1670 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1598 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1671 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1599 */ 1672 */
1600void 1673void
1601rxvt_term::scr_rvideo_mode (int mode) 1674rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1602{ 1675{
1603 XGCValues gcvalue; 1676 rvideo_mode = on;
1604 1677
1678#ifndef NO_BELL
1679 on ^= rvideo_bell;
1680#endif
1681
1605 if (rvideo != mode) 1682 if (rvideo_state != on)
1606 { 1683 {
1607 rvideo = mode; 1684 rvideo_state = on;
1685
1608 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1609#if XPM_BACKGROUND 1687#ifdef HAVE_BG_PIXMAP
1610 if (bgPixmap.pixmap == None) 1688 if (bgPixmap.pixmap == None)
1611#endif 1689#endif
1612#if TRANSPARENT 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1613 if (! OPTION (Opt_transparent) || am_transparent == 0)
1614#endif
1615 XSetWindowBackground (display->display, vt,
1616 pix_colors[Color_bg]);
1617 1691
1692 XGCValues gcvalue;
1618 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
1619 gcvalue.background = pix_colors[Color_bg]; 1694 gcvalue.background = pix_colors[Color_bg];
1620 XChangeGC (display->display, gc, GCBackground | GCForeground, 1695 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1621 &gcvalue); 1696
1622 scr_clear (); 1697 scr_clear ();
1623 scr_touch (true); 1698 scr_touch (true);
1624 } 1699 }
1625} 1700}
1626 1701
… …
1628/* 1703/*
1629 * Report current cursor position 1704 * Report current cursor position
1630 * XTERM_SEQ: Report position: ESC [ 6 n 1705 * XTERM_SEQ: Report position: ESC [ 6 n
1631 */ 1706 */
1632void 1707void
1633rxvt_term::scr_report_position () 1708rxvt_term::scr_report_position () NOTHROW
1634{ 1709{
1635 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1710 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1636} 1711}
1637 1712
1638/* ------------------------------------------------------------------------- * 1713/* ------------------------------------------------------------------------- *
… …
1641 1716
1642/* 1717/*
1643 * Set font style 1718 * Set font style
1644 */ 1719 */
1645void 1720void
1646rxvt_term::set_font_style () 1721rxvt_term::set_font_style () NOTHROW
1647{ 1722{
1648#if 0 1723#if 0
1649 switch (charsets [screen.charset]) 1724 switch (charsets [screen.charset])
1650 { 1725 {
1651 case '0': /* DEC Special Character & Line Drawing Set */ 1726 case '0': /* DEC Special Character & Line Drawing Set */
… …
1673 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1748 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1674 * XTERM_SEQ: Invoke G2 character set: ESC N 1749 * XTERM_SEQ: Invoke G2 character set: ESC N
1675 * XTERM_SEQ: Invoke G3 character set: ESC O 1750 * XTERM_SEQ: Invoke G3 character set: ESC O
1676 */ 1751 */
1677void 1752void
1678rxvt_term::scr_charset_choose (int set) 1753rxvt_term::scr_charset_choose (int set) NOTHROW
1679{ 1754{
1680 screen.charset = set; 1755 screen.charset = set;
1681 set_font_style (); 1756 set_font_style ();
1682} 1757}
1683 1758
… …
1689 * XTERM_SEQ: Set G2 character set: ESC * <C> 1764 * XTERM_SEQ: Set G2 character set: ESC * <C>
1690 * XTERM_SEQ: Set G3 character set: ESC + <C> 1765 * XTERM_SEQ: Set G3 character set: ESC + <C>
1691 * See set_font_style for possible values for <C> 1766 * See set_font_style for possible values for <C>
1692 */ 1767 */
1693void 1768void
1694rxvt_term::scr_charset_set (int set, unsigned int ch) 1769rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1695{ 1770{
1696 charsets[set] = (unsigned char)ch; 1771 charsets[set] = (unsigned char)ch;
1697 set_font_style (); 1772 set_font_style ();
1698} 1773}
1699 1774
… …
1704 1779
1705/* 1780/*
1706 * refresh matching text. 1781 * refresh matching text.
1707 */ 1782 */
1708bool 1783bool
1709rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1784rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1710{ 1785{
1711 bool found = false; 1786 bool found = false;
1712 1787
1713 for (int i = 0; i < nrow; i++) 1788 for (int i = 0; i < nrow; i++)
1714 { 1789 {
1715 int col = 0;
1716 rend_t *drp = drawn_buf[i].r; 1790 rend_t *drp = drawn_buf[i].r;
1717 1791
1718 for (; col < ncol; col++, drp++) 1792 for (int col = 0; col < ncol; col++, drp++)
1719 if ((*drp & mask) == value) 1793 if ((*drp & mask) == value)
1720 { 1794 {
1721 found = true; 1795 found = true;
1722 *drp = ~value; 1796 *drp = ~value;
1723 } 1797 }
… …
1734 PART_END, 1808 PART_END,
1735 RC_COUNT 1809 RC_COUNT
1736}; 1810};
1737 1811
1738void 1812void
1739rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1813rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1740{ 1814{
1741 int i; 1815 int i;
1742 row_col_t rc[RC_COUNT]; 1816 row_col_t rc[RC_COUNT];
1743 1817
1744 if (!drawn_buf) /* sanity check */ 1818 if (!drawn_buf) /* sanity check */
… …
1763 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1764 { 1838 {
1765 min_it (rc[i].col, ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1766 min_it (rc[i].row, nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1767 } 1841 }
1768 1842// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1769 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1843 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1770 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1844 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1771 1845
1846 num_scr_allow = 0;
1847
1772 if (refresh) 1848 if (refresh)
1773 scr_refresh (SLOW_REFRESH); 1849 scr_refresh ();
1774} 1850}
1775 1851
1776/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1777/* 1853/*
1778 * Refresh the entire screen 1854 * Refresh the entire screen
1779 */ 1855 */
1780void 1856void
1781rxvt_term::scr_touch (bool refresh) 1857rxvt_term::scr_touch (bool refresh) NOTHROW
1782{ 1858{
1783 scr_expose (0, 0, width, height, refresh); 1859 scr_expose (0, 0, width, height, refresh);
1784} 1860}
1785 1861
1786/* ------------------------------------------------------------------------- */ 1862/* ------------------------------------------------------------------------- */
1787/* 1863/*
1788 * Move the display so that the line represented by scrollbar value Y is at 1864 * Move the display so that the line represented by scrollbar value Y is at
1789 * the top of the screen 1865 * the top of the screen
1790 */ 1866 */
1791int 1867void
1792rxvt_term::scr_move_to (int y, int len) 1868rxvt_term::scr_move_to (int y, int len) NOTHROW
1793{ 1869{
1794 long p = 0; 1870 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1795 unsigned int oldviewstart;
1796
1797 oldviewstart = view_start;
1798
1799 if (y < len)
1800 {
1801 p = (nrow + nsaved) * (len - y) / len;
1802 p -= (long) (nrow - 1);
1803 p = max (p, 0);
1804 }
1805
1806 view_start = (unsigned int)min (p, nsaved);
1807
1808 return scr_changeview (oldviewstart);
1809} 1871}
1810 1872
1811/* ------------------------------------------------------------------------- */ 1873/* ------------------------------------------------------------------------- */
1812/* 1874/*
1813 * Page the screen up/down nlines 1875 * Page the screen up/down nlines
1814 * direction should be UP or DN 1876 * direction should be UP or DN
1815 */ 1877 */
1816int 1878bool
1817rxvt_term::scr_page (enum page_dirn direction, int nlines) 1879rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1818{ 1880{
1819 int n; 1881 int new_view_start =
1820 unsigned int oldviewstart;
1821
1822 oldviewstart = view_start;
1823
1824 if (direction == UP)
1825 {
1826 n = view_start + nlines;
1827 view_start = min (n, nsaved);
1828 }
1829 else
1830 {
1831 n = view_start - nlines; 1882 direction == UP ? view_start - nlines
1832 view_start = max (n, 0); 1883 : view_start + nlines;
1833 }
1834 1884
1835 return scr_changeview (oldviewstart); 1885 return scr_changeview (new_view_start);
1836} 1886}
1837 1887
1838int 1888bool
1839rxvt_term::scr_changeview (unsigned int oldviewstart) 1889rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840{ 1890{
1891 clamp_it (new_view_start, top_row, 0);
1892
1841 if (view_start != oldviewstart) 1893 if (new_view_start == view_start)
1842 { 1894 return false;
1895
1896 num_scr += new_view_start - view_start;
1897 view_start = new_view_start;
1898 want_refresh = 1;
1899
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1900 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844 1901
1845 want_refresh = 1; 1902 return true;
1846 num_scr -= (view_start - oldviewstart);
1847 }
1848
1849 return (int)view_start - (int)oldviewstart;
1850} 1903}
1851 1904
1852/* ------------------------------------------------------------------------- */ 1905#ifndef NO_BELL
1853void 1906void
1907rxvt_term::bell_cb (ev::timer &w, int revents)
1908{
1909 rvideo_bell = false;
1910 scr_rvideo_mode (rvideo_mode);
1911 refresh_check ();
1912}
1913#endif
1914
1915/* ------------------------------------------------------------------------- */
1916void
1854rxvt_term::scr_bell () 1917rxvt_term::scr_bell () NOTHROW
1855{ 1918{
1856#ifndef NO_BELL 1919#ifndef NO_BELL
1857 1920
1858# ifndef NO_MAPALERT 1921# ifndef NO_MAPALERT
1859# ifdef MAPALERT_OPTION 1922# ifdef MAPALERT_OPTION
1860 if (OPTION (Opt_mapAlert)) 1923 if (option (Opt_mapAlert))
1861# endif 1924# endif
1862 XMapWindow (display->display, parent[0]); 1925 XMapWindow (dpy, parent[0]);
1863# endif 1926# endif
1864 1927
1928# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell))
1930 set_urgency (1);
1931# endif
1932
1865 if (OPTION (Opt_visualBell)) 1933 if (option (Opt_visualBell))
1866 { 1934 {
1867 scr_rvideo_mode (!rvideo); /* refresh also done */ 1935 rvideo_bell = true;
1936 scr_rvideo_mode (rvideo_mode);
1937 flush ();
1938
1868 rxvt_usleep (VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1869 scr_rvideo_mode (!rvideo); /* refresh also done */
1870 } 1940 }
1871 else 1941 else
1872 XBell (display->display, 0); 1942 XBell (dpy, 0);
1873
1874#endif 1943#endif
1875} 1944}
1876 1945
1877/* ------------------------------------------------------------------------- */ 1946/* ------------------------------------------------------------------------- */
1878/* ARGSUSED */ 1947/* ARGSUSED */
1879void 1948void
1880rxvt_term::scr_printscreen (int fullhist) 1949rxvt_term::scr_printscreen (int fullhist) NOTHROW
1881{ 1950{
1882#ifdef PRINTPIPE 1951#ifdef PRINTPIPE
1883 int nrows, row_start; 1952 int nrows, row_start;
1884 FILE *fd; 1953 FILE *fd = popen_printer ();
1885 1954
1886 if ((fd = popen_printer ()) == NULL) 1955 if (!fd)
1887 return; 1956 return;
1888 1957
1889 if (fullhist) 1958 if (fullhist)
1890 { 1959 {
1891 nrows = nrow + nsaved; 1960 nrows = nrow - top_row;
1892 row_start = -nsaved; 1961 row_start = top_row;
1893 } 1962 }
1894 else 1963 else
1895 { 1964 {
1896 nrows = nrow; 1965 nrows = nrow;
1897 row_start = -view_start; 1966 row_start = view_start;
1898 } 1967 }
1899 1968
1900 wctomb (0, 0); 1969 wctomb (0, 0);
1901 1970
1902 for (int r1 = 0; r1 < nrows; r1++) 1971 for (int r1 = 0; r1 < nrows; r1++)
… …
1934 * Refresh the screen 2003 * Refresh the screen
1935 * drawn_text/drawn_rend contain the screen information before the update. 2004 * drawn_text/drawn_rend contain the screen information before the update.
1936 * screen.text/screen.rend contain what the screen will change to. 2005 * screen.text/screen.rend contain what the screen will change to.
1937 */ 2006 */
1938void 2007void
1939rxvt_term::scr_refresh (unsigned char refresh_type) 2008rxvt_term::scr_refresh () NOTHROW
1940{ 2009{
1941 unsigned char must_clear, /* use draw_string not draw_image_string */ 2010 unsigned char have_bg,
1942 showcursor; /* show the cursor */ 2011 showcursor; /* show the cursor */
1943 int16_t col, row, /* column/row we're processing */ 2012 int16_t col, row, /* column/row we're processing */
1944 ocrow; /* old cursor row */ 2013 ocrow; /* old cursor row */
1945 int i; /* tmp */ 2014 int i; /* tmp */
1946#ifndef NO_CURSORCOLOR 2015#ifndef NO_CURSORCOLOR
1947 rend_t cc1; /* store colours at cursor position (s) */ 2016 rend_t cc1; /* store colours at cursor position (s) */
1948#endif 2017#endif
1949 rend_t *crp; // cursor rendition pointer 2018 rend_t *crp; // cursor rendition pointer
2019 rend_t ccol1, /* Cursor colour */
2020 ccol2; /* Cursor colour2 */
1950 2021
1951 want_refresh = 0; /* screen is current */ 2022 want_refresh = 0; /* screen is current */
1952 2023
1953 if (refresh_type == NO_REFRESH || !mapped) 2024 if (refresh_type == NO_REFRESH || !mapped)
1954 return; 2025 return;
1955 2026
1956 /* 2027 /*
1957 * A: set up vars 2028 * A: set up vars
1958 */ 2029 */
1959 must_clear = 0;
1960 refresh_count = 0; 2030 refresh_count = 0;
1961 2031
1962#if XPM_BACKGROUND 2032 have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP
1963 must_clear |= bgPixmap.pixmap != None; 2034 have_bg = bgPixmap.pixmap != None;
1964#endif
1965#if TRANSPARENT
1966 must_clear |= OPTION (Opt_transparent) && am_transparent;
1967#endif 2035#endif
1968 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1969 2037
1970 /* 2038 /*
1971 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
… …
1975 /* 2043 /*
1976 * C: set the cursor character (s) 2044 * C: set the cursor character (s)
1977 */ 2045 */
1978 { 2046 {
1979 unsigned char setoldcursor; 2047 unsigned char setoldcursor;
1980 rend_t ccol1, /* Cursor colour */
1981 ccol2; /* Cursor colour2 */
1982 2048
1983 showcursor = (screen.flags & Screen_VisibleCursor); 2049 showcursor = (screen.flags & Screen_VisibleCursor);
1984#ifdef CURSOR_BLINK 2050#ifdef CURSOR_BLINK
1985 if (hidden_cursor) 2051 if (hidden_cursor)
1986 showcursor = 0; 2052 showcursor = 0;
… …
1993 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2059 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1994 col--; 2060 col--;
1995 2061
1996 crp = &ROW(screen.cur.row).r[col]; 2062 crp = &ROW(screen.cur.row).r[col];
1997 2063
2064#ifndef NO_CURSORCOLOR
2065 cc1 = *crp & (RS_fgMask | RS_bgMask);
2066 if (ISSET_PIXCOLOR (Color_cursor))
2067 ccol1 = Color_cursor;
2068 else
2069#endif
2070#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2071 ccol1 = fgcolor_of (rstyle);
2072#else
2073 ccol1 = Color_fg;
2074#endif
2075
2076#ifndef NO_CURSORCOLOR
2077 if (ISSET_PIXCOLOR (Color_cursor2))
2078 ccol2 = Color_cursor2;
2079 else
2080#endif
2081#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2082 ccol2 = bgcolor_of (rstyle);
2083#else
2084 ccol2 = Color_bg;
2085#endif
2086
1998 if (showcursor && focus) 2087 if (showcursor && focus)
1999 { 2088 {
2000 if (OPTION (Opt_cursorUnderline)) 2089 if (option (Opt_cursorUnderline))
2001 *crp ^= RS_Uline; 2090 *crp ^= RS_Uline;
2002 else 2091 else
2003 { 2092 {
2004 *crp ^= RS_RVid; 2093 *crp ^= RS_RVid;
2005
2006#ifndef NO_CURSORCOLOR
2007 cc1 = *crp & (RS_fgMask | RS_bgMask);
2008 if (ISSET_PIXCOLOR (Color_cursor))
2009 ccol1 = Color_cursor;
2010 else
2011#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2012 ccol1 = fgcolor_of (rstyle);
2013#else
2014 ccol1 = Color_fg;
2015#endif
2016 if (ISSET_PIXCOLOR (Color_cursor2))
2017 ccol2 = Color_cursor2;
2018 else
2019#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2020 ccol2 = bgcolor_of (rstyle);
2021#else
2022 ccol2 = Color_bg;
2023#endif
2024 *crp = SET_FGCOLOR (*crp, ccol1); 2094 *crp = SET_FGCOLOR (*crp, ccol1);
2025 *crp = SET_BGCOLOR (*crp, ccol2); 2095 *crp = SET_BGCOLOR (*crp, ccol2);
2026#endif
2027 } 2096 }
2028 } 2097 }
2029 } 2098 }
2030 2099
2031 /* make sure no outline cursor is left around */ 2100 /* make sure no outline cursor is left around */
2032 setoldcursor = 0; 2101 setoldcursor = 0;
2033 if (ocrow != -1) 2102 if (ocrow != -1)
2034 { 2103 {
2035 if (screen.cur.row + view_start != ocrow 2104 if (screen.cur.row - view_start != ocrow
2036 || screen.cur.col != oldcursor.col) 2105 || screen.cur.col != oldcursor.col)
2037 { 2106 {
2038 if (ocrow < nrow 2107 if (ocrow < nrow
2039 && oldcursor.col < ncol) 2108 && oldcursor.col < ncol)
2040 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2109 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2048 else if (!focus) 2117 else if (!focus)
2049 setoldcursor = 1; 2118 setoldcursor = 1;
2050 2119
2051 if (setoldcursor) 2120 if (setoldcursor)
2052 { 2121 {
2053 if (screen.cur.row + view_start >= nrow) 2122 if (screen.cur.row - view_start >= nrow)
2054 oldcursor.row = -1; 2123 oldcursor.row = -1;
2055 else 2124 else
2056 { 2125 {
2057 oldcursor.row = screen.cur.row + view_start; 2126 oldcursor.row = screen.cur.row - view_start;
2058 oldcursor.col = screen.cur.col; 2127 oldcursor.col = screen.cur.col;
2059 } 2128 }
2060 } 2129 }
2061 } 2130 }
2062 2131
… …
2068#ifndef NO_SLOW_LINK_SUPPORT 2137#ifndef NO_SLOW_LINK_SUPPORT
2069 /* 2138 /*
2070 * D: CopyArea pass - very useful for slower links 2139 * D: CopyArea pass - very useful for slower links
2071 * This has been deliberately kept simple. 2140 * This has been deliberately kept simple.
2072 */ 2141 */
2073 i = num_scr;
2074 if (!display->is_local 2142 if (!display->is_local
2075 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2143 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2076 && abs (num_scr) < nrow && !must_clear) 2144 && abs (num_scr) < nrow && !have_bg)
2077 { 2145 {
2078 int16_t nits; 2146 int16_t nits;
2147 int i = num_scr;
2079 int j; 2148 int j;
2080 int len, wlen; 2149 int len, wlen;
2150 dLocal (int, num_scr);
2081 2151
2082 j = nrow; 2152 j = nrow;
2083 wlen = len = -1; 2153 wlen = len = -1;
2084 row = i > 0 ? 0 : j - 1; 2154 row = i > 0 ? 0 : j - 1;
2155
2085 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2156 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2086 { 2157 {
2087 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2158 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2088 { 2159 {
2089 line_t s = ROW(row - view_start); 2160 line_t s = ROW(view_start + row);
2090 line_t d = drawn_buf[row]; 2161 line_t d = drawn_buf[row];
2091 line_t d2 = drawn_buf[row + i]; 2162 line_t d2 = drawn_buf[row + i];
2092 2163
2093 for (nits = 0, col = ncol; col--; ) 2164 for (nits = 0, col = ncol; col--; )
2094 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2165 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2110 wlen = row; 2181 wlen = row;
2111 continue; 2182 continue;
2112 } 2183 }
2113 } 2184 }
2114 2185
2115 if (len != -1) 2186 if (len >= 0)
2116 { 2187 {
2117 /* also comes here at end if needed because of >= above */ 2188 /* also comes here at end if needed because of >= above */
2118 if (wlen < len) 2189 if (wlen < len)
2119 ::swap (wlen, len); 2190 ::swap (wlen, len);
2120 2191
2192 XGCValues gcv;
2193
2194 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2121 XCopyArea (display->display, vt, vt, 2195 XCopyArea (dpy, vt, vt,
2122 gc, 0, Row2Pixel (len + i), 2196 gc, 0, Row2Pixel (len + i),
2123 (unsigned int)this->width, 2197 (unsigned int)this->width,
2124 (unsigned int)Height2Pixel (wlen - len + 1), 2198 (unsigned int)Height2Pixel (wlen - len + 1),
2125 0, Row2Pixel (len)); 2199 0, Row2Pixel (len));
2200 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2201
2126 len = -1; 2202 len = -1;
2127 } 2203 }
2128 } 2204 }
2129 } 2205 }
2130#endif 2206#endif
… …
2132 /* 2208 /*
2133 * E: main pass across every character 2209 * E: main pass across every character
2134 */ 2210 */
2135 for (row = 0; row < nrow; row++) 2211 for (row = 0; row < nrow; row++)
2136 { 2212 {
2137 text_t *stp = ROW(row - view_start).t; 2213 text_t *stp = ROW(view_start + row).t;
2138 rend_t *srp = ROW(row - view_start).r; 2214 rend_t *srp = ROW(view_start + row).r;
2139 text_t *dtp = drawn_buf[row].t; 2215 text_t *dtp = drawn_buf[row].t;
2140 rend_t *drp = drawn_buf[row].r; 2216 rend_t *drp = drawn_buf[row].r;
2141 2217
2142 /* 2218 /*
2143 * E2: OK, now the real pass 2219 * E2: OK, now the real pass
… …
2154 continue; 2230 continue;
2155 2231
2156 // redraw one or more characters 2232 // redraw one or more characters
2157 2233
2158 // seek to the beginning of wide characters 2234 // seek to the beginning of wide characters
2159 while (stp[col] == NOCHAR && col > 0) 2235 while (expect_false (stp[col] == NOCHAR && col > 0))
2160 --col; 2236 --col;
2161 2237
2162 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2238 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2163 text_t *text = stp + col; 2239 text_t *text = stp + col;
2164 int count = 1; 2240 int count = 1;
… …
2186 count++; 2262 count++;
2187 2263
2188 if (stp[col] != dtp[col] 2264 if (stp[col] != dtp[col]
2189 || !RS_SAME (srp[col], drp[col])) 2265 || !RS_SAME (srp[col], drp[col]))
2190 { 2266 {
2191 if (must_clear && (i++ > count / 2)) 2267 if (have_bg && (i++ > count / 2))
2192 break; 2268 break;
2193 2269
2194 dtp[col] = stp[col]; 2270 dtp[col] = stp[col];
2195 drp[col] = rend; 2271 drp[col] = rend;
2196 i = 0; 2272 i = 0;
2197 } 2273 }
2198 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2274 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2199 break; 2275 break;
2200 } 2276 }
2201 2277
2202 col--; /* went one too far. move back */ 2278 col--; /* went one too far. move back */
2203 count -= i; /* dump any matching trailing chars */ 2279 count -= i; /* dump any matching trailing chars */
2204 2280
2205 // sometimes we optimize away the trailing NOCHAR's, add them back 2281 // sometimes we optimize away the trailing NOCHAR's, add them back
2206 while (i && text[count] == NOCHAR) 2282 while (expect_false (i && text[count] == NOCHAR))
2207 count++, i--; 2283 count++, i--;
2208 2284
2209 /* 2285 /*
2210 * Determine the attributes for the string 2286 * Determine the attributes for the string
2211 */ 2287 */
2212 int fore = fgcolor_of (rend); // desired foreground 2288 int fore = fgcolor_of (rend); // desired foreground
2213 int back = bgcolor_of (rend); // desired background 2289 int back = bgcolor_of (rend); // desired background
2214 2290
2215 // only do special processing if any attributes are set, which is unlikely 2291 // only do special processing if any attributes are set, which is unlikely
2216 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2292 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2217 { 2293 {
2218#if ENABLE_STYLES
2219 // force redraw after "careful" characters to avoid pixel droppings
2220 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2221 drp[col + 1] = ~srp[col + 1];
2222
2223 // include previous careful character(s) if possible, looks nicer (best effort...)
2224 while (text > stp
2225 && srp[text - stp - 1] & RS_Careful
2226 && RS_SAME (rend, srp[text - stp - 1]))
2227 text--, count++, xpixel -= fwidth;
2228#endif
2229
2230 bool invert = rend & RS_RVid; 2294 bool invert = rend & RS_RVid;
2231 2295
2232#ifndef NO_BOLD_UNDERLINE_REVERSE 2296#ifndef NO_BOLD_UNDERLINE_REVERSE
2233 if (rend & RS_Bold
2234 && fore == Color_fg) 2297 if (rend & RS_Bold && fore == Color_fg)
2235 { 2298 {
2236 if (ISSET_PIXCOLOR (Color_BD)) 2299 if (ISSET_PIXCOLOR (Color_BD))
2237 fore = Color_BD; 2300 fore = Color_BD;
2238# if !ENABLE_STYLES 2301# if !ENABLE_STYLES
2239 else 2302 else
2240 invert = !invert; 2303 invert = !invert;
2241# endif 2304# endif
2242 } 2305 }
2243 2306
2244 if (rend & RS_Italic 2307 if (rend & RS_Italic && fore == Color_fg)
2245 && fore == Color_fg)
2246 { 2308 {
2247 if (ISSET_PIXCOLOR (Color_IT)) 2309 if (ISSET_PIXCOLOR (Color_IT))
2248 fore = Color_IT; 2310 fore = Color_IT;
2249# if !ENABLE_STYLES 2311# if !ENABLE_STYLES
2250 else 2312 else
2251 invert = !invert; 2313 invert = !invert;
2252# endif 2314# endif
2253 } 2315 }
2254 2316
2255 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2256 fore = Color_UL; 2318 fore = Color_UL;
2257#endif 2319#endif
2258 2320
2259 if (invert) 2321 if (invert)
2260 { 2322 {
2323#ifdef OPTION_HC
2324 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2325 || !ISSET_PIXCOLOR (Color_HC))
2326#endif
2327 /* invert the column if no highlightColor is set or it is the
2328 * current cursor column */
2261 ::swap (fore, back); 2329 ::swap (fore, back);
2330#ifdef OPTION_HC
2331 else if (ISSET_PIXCOLOR (Color_HC))
2332 back = Color_HC;
2333#endif
2262 2334
2263#ifndef NO_BOLD_UNDERLINE_REVERSE 2335#ifndef NO_BOLD_UNDERLINE_REVERSE
2336# ifndef OPTION_HC
2264 if (ISSET_PIXCOLOR (Color_RV)) 2337 if (ISSET_PIXCOLOR (Color_RV))
2265 back = Color_RV; 2338 back = Color_RV;
2266 2339# endif
2267 if (fore == back) 2340 if (fore == back)
2268 { 2341 {
2269 fore = Color_bg; 2342 fore = Color_bg;
2270 back = Color_fg; 2343 back = Color_fg;
2271 } 2344 }
… …
2273 } 2346 }
2274 2347
2275#ifdef TEXT_BLINK 2348#ifdef TEXT_BLINK
2276 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2349 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2277 { 2350 {
2278 if (!text_blink_ev.active) 2351 if (!text_blink_ev.is_active ())
2279 { 2352 {
2280 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2353 text_blink_ev.again ();
2281 hidden_text = 0; 2354 hidden_text = 0;
2282 } 2355 }
2283 else if (hidden_text) 2356 else if (hidden_text)
2284 fore = back; 2357 fore = back;
2285 } 2358 }
2286#endif 2359#endif
2360
2361#if ENABLE_STYLES
2362 // "careful" (too wide) character handling
2363
2364 // include previous careful character(s) if possible, looks nicer (best effort...)
2365 while (text > stp
2366 && srp[text - stp - 1] & RS_Careful
2367 && RS_SAME (rend, srp[text - stp - 1]))
2368 text--, count++, xpixel -= fwidth;
2369
2370 // force redraw after "careful" characters to avoid pixel droppings
2371 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2372 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2373
2374 // force redraw before "careful" characters to avoid pixel droppings
2375 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2376 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2377#endif
2287 } 2378 }
2288 2379
2289 /* 2380 /*
2290 * Actually do the drawing of the string here 2381 * Actually do the drawing of the string here
2291 */ 2382 */
2292 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2383 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2293 2384
2294 if (back == fore) 2385 if (expect_true (have_bg && back == Color_bg))
2295 font->clear_rect (*drawable, xpixel, ypixel,
2296 fwidth * count, fheight,
2297 back);
2298 else if (back == Color_bg)
2299 { 2386 {
2300 if (must_clear) 2387 // this is very ugly, maybe push it into ->draw?
2301 {
2302 CLEAR_CHARS (xpixel, ypixel, count);
2303 2388
2304 for (i = 0; i < count; i++) /* don't draw empty strings */ 2389 for (i = 0; i < count; i++) /* don't draw empty strings */
2305 if (text[i] != ' ') 2390 if (text[i] != ' ')
2306 { 2391 {
2307 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2392 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2308 break; 2393 goto did_clear;
2309 }
2310 } 2394 }
2311 else 2395
2312 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2396 CLEAR_CHARS (xpixel, ypixel, count);
2397 did_clear: ;
2313 } 2398 }
2314 else 2399 else
2315 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2400 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2316 2401
2317 if (rend & RS_Uline && font->descent > 1 && fore != back) 2402 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2318 { 2403 {
2319#if ENABLE_FRILLS 2404#if ENABLE_FRILLS
2320 if (ISSET_PIXCOLOR (Color_underline)) 2405 if (ISSET_PIXCOLOR (Color_underline))
2321 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2406 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2322 else 2407 else
2323#endif 2408#endif
2324 XSetForeground (display->display, gc, pix_colors[fore]); 2409 XSetForeground (dpy, gc, pix_colors[fore]);
2325 2410
2326 XDrawLine (display->display, drawBuffer, gc, 2411 XDrawLine (dpy, vt, gc,
2327 xpixel, ypixel + font->ascent + 1, 2412 xpixel, ypixel + font->ascent + 1,
2328 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2413 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2329 } 2414 }
2330 } /* for (col....) */ 2415 } /* for (col....) */
2331 } /* for (row....) */ 2416 } /* for (row....) */
… …
2340 */ 2425 */
2341 if (showcursor) 2426 if (showcursor)
2342 { 2427 {
2343 if (focus) 2428 if (focus)
2344 { 2429 {
2345 if (OPTION (Opt_cursorUnderline)) 2430 if (option (Opt_cursorUnderline))
2346 *crp ^= RS_Uline; 2431 *crp ^= RS_Uline;
2347 else 2432 else
2348 { 2433 {
2349 *crp ^= RS_RVid; 2434 *crp ^= RS_RVid;
2350#ifndef NO_CURSORCOLOR 2435#ifndef NO_CURSORCOLOR
… …
2364 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2449 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2365 cursorwidth++; 2450 cursorwidth++;
2366 2451
2367#ifndef NO_CURSORCOLOR 2452#ifndef NO_CURSORCOLOR
2368 if (ISSET_PIXCOLOR (Color_cursor)) 2453 if (ISSET_PIXCOLOR (Color_cursor))
2369 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2454 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2455 else
2370#endif 2456#endif
2457 XSetForeground (dpy, gc, pix_colors[ccol1]);
2371 2458
2372 XDrawRectangle (display->display, drawBuffer, gc, 2459 XDrawRectangle (dpy, vt, gc,
2373 Col2Pixel (col), 2460 Col2Pixel (col),
2374 Row2Pixel (oldcursor.row), 2461 Row2Pixel (oldcursor.row),
2375 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2462 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2376 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2463 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2377 } 2464 }
… …
2380 /* 2467 /*
2381 * H: cleanup selection 2468 * H: cleanup selection
2382 */ 2469 */
2383 scr_reverse_selection (); 2470 scr_reverse_selection ();
2384 2471
2385 if (refresh_type & SMOOTH_REFRESH)
2386 XFlush (display->display);
2387
2388 num_scr = 0; 2472 num_scr = 0;
2389 num_scr_allow = 1; 2473 num_scr_allow = 1;
2390} 2474}
2391 2475
2392void 2476void
2393rxvt_term::scr_remap_chars (line_t &l) 2477rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2394{ 2478{
2395 if (!l.t) 2479 if (!l.t)
2396 return; 2480 return;
2397 2481
2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2482 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2400 for (int i = ncol; i--; ) 2484 for (int i = ncol; i--; )
2401 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2485 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2402} 2486}
2403 2487
2404void 2488void
2405rxvt_term::scr_remap_chars () 2489rxvt_term::scr_remap_chars () NOTHROW
2406{ 2490{
2407 for (int i = total_rows; i--; ) 2491 for (int i = total_rows; i--; )
2408 scr_remap_chars (row_buf [i]); 2492 scr_remap_chars (row_buf [i]);
2409 2493
2410 for (int i = nrow; i--; ) 2494 for (int i = nrow; i--; )
… …
2413 scr_remap_chars (swap_buf [i]); 2497 scr_remap_chars (swap_buf [i]);
2414 } 2498 }
2415} 2499}
2416 2500
2417void 2501void
2418rxvt_term::scr_recolour () 2502rxvt_term::scr_recolour () NOTHROW
2419{ 2503{
2420 if (1 2504#ifdef HAVE_BG_PIXMAP
2421#if TRANSPARENT 2505 bgPixmap.apply ();
2422 && !am_transparent 2506#else
2423#endif 2507
2424#if XPM_BACKGROUND
2425 && !bgPixmap.pixmap
2426#endif
2427 )
2428 {
2429 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2508 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2430 XClearWindow (display->display, parent[0]); 2509 XClearWindow (dpy, parent[0]);
2431 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2510 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2432#if HAVE_SCROLLBARS 2511
2433 if (scrollBar.win) 2512 if (scrollBar.win)
2434 { 2513 {
2435 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2514 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2436 scrollBar.setIdle (); 2515 scrollBar.state = STATE_IDLE;
2437 scrollbar_show (0); 2516 scrollBar.show (0);
2438 }
2439#endif
2440 } 2517 }
2441 2518
2519#endif
2520
2521 /* bgPixmap.apply () does not do the following : */
2442 scr_clear (); 2522 scr_clear ();
2443 scr_touch (true); 2523 scr_touch (true);
2444 want_refresh = 1; 2524 want_refresh = 1;
2445} 2525}
2446 2526
2447/* ------------------------------------------------------------------------- */ 2527/* ------------------------------------------------------------------------- */
2448void 2528void
2449rxvt_term::scr_clear (bool really) 2529rxvt_term::scr_clear (bool really) NOTHROW
2450{ 2530{
2451 if (!mapped) 2531 if (!mapped)
2452 return; 2532 return;
2453 2533
2454 num_scr_allow = 0; 2534 num_scr_allow = 0;
2455 want_refresh = 1; 2535 want_refresh = 1;
2456 2536
2457 if (really) 2537 if (really)
2458 XClearWindow (display->display, vt); 2538 XClearWindow (dpy, vt);
2459} 2539}
2460 2540
2461/* ------------------------------------------------------------------------- */
2462void 2541void
2542rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2543{
2544 int view_end = view_start + nrow;
2545 int row, col;
2546
2547 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2548 {
2549 text_t *stp = ROW(row).t;
2550 rend_t *srp = ROW(row).r;
2551
2552 for (col = beg_col; col < end_col; col++)
2553 srp[col] ^= rstyle1;
2554
2555 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2556 srp[col] ^= rstyle2;
2557
2558 if (++col < end_col)
2559 srp[col] ^= rstyle2;
2560 }
2561}
2562
2563void
2564rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2565{
2566 int view_end = view_start + nrow;
2567 int row, col;
2568
2569 if (beg_row >= view_start)
2570 {
2571 col = beg_col;
2572 row = beg_row;
2573 }
2574 else
2575 {
2576 col = 0;
2577 row = view_start;
2578 }
2579
2580 for (; row < min (end_row, view_end); row++, col = 0)
2581 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2582 srp[col] ^= rstyle;
2583
2584 if (row == end_row)
2585 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2586 srp[col] ^= rstyle;
2587}
2588
2589/* ------------------------------------------------------------------------- */
2590void
2463rxvt_term::scr_reverse_selection () 2591rxvt_term::scr_reverse_selection () NOTHROW
2464{ 2592{
2465 if (selection.op 2593 if (selection.op
2466 && current_screen == selection.screen 2594 && current_screen == selection.screen
2467 && selection.end.row >= -view_start) 2595 && selection.end.row >= view_start)
2468 { 2596 {
2469 int view_end = -view_start + nrow; 2597#if !ENABLE_MINIMAL
2470 int row, col;
2471
2472#if ENABLE_FRILLS
2473 if (selection.rect) 2598 if (selection.rect)
2474 { 2599 scr_xor_rect (selection.beg.row, selection.beg.col,
2475 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2600 selection.end.row, selection.end.col,
2476 { 2601 RS_RVid, RS_RVid | RS_Uline);
2477 text_t *stp = ROW(row).t;
2478 rend_t *srp = ROW(row).r;
2479
2480 for (col = selection.beg.col; col < selection.end.col; col++)
2481 srp[col] ^= RS_RVid;
2482
2483 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2484 srp[col] ^= RS_RVid | RS_Uline;
2485
2486 if (++col < selection.end.col)
2487 srp[col] ^= RS_RVid | RS_Uline;
2488 }
2489 }
2490 else 2602 else
2491#endif 2603#endif
2492 { 2604 scr_xor_span (selection.beg.row, selection.beg.col,
2493 if (selection.beg.row >= -view_start) 2605 selection.end.row, selection.end.col,
2494 { 2606 RS_RVid);
2495 col = selection.beg.col;
2496 row = selection.beg.row;
2497 }
2498 else
2499 {
2500 col = 0;
2501 row = -view_start;
2502 }
2503
2504 for (; row < min (selection.end.row, view_end); row++, col = 0)
2505 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2506 srp[col] ^= RS_RVid;
2507
2508 if (row == selection.end.row)
2509 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2510 srp[col] ^= RS_RVid;
2511 }
2512 } 2607 }
2513} 2608}
2514 2609
2515/* ------------------------------------------------------------------------- */ 2610/* ------------------------------------------------------------------------- */
2516/* 2611/*
2517 * Dump the whole scrollback and screen to the passed filedescriptor. The 2612 * Dump the whole scrollback and screen to the passed filedescriptor. The
2518 * invoking routine must close the fd. 2613 * invoking routine must close the fd.
2519 */ 2614 */
2520#if 0 2615#if 0
2521void 2616void
2522rxvt_term::scr_dump (int fd) 2617rxvt_term::scr_dump (int fd) NOTHROW
2523{ 2618{
2524 int row, wrote; 2619 int row, wrote;
2525 unsigned int width, towrite; 2620 unsigned int width, towrite;
2526 char r1[] = "\n"; 2621 char r1[] = "\n";
2527 2622
2528 for (row = saveLines - nsaved; 2623 for (row = saveLines + top_row;
2529 row < saveLines + nrow - 1; row++) 2624 row < saveLines + nrow - 1; row++)
2530 { 2625 {
2531 width = row_buf[row].l >= 0 ? row_buf[row].l 2626 width = row_buf[row].l >= 0 ? row_buf[row].l
2532 : ncol; 2627 : ncol;
2533 for (towrite = width; towrite; towrite -= wrote) 2628 for (towrite = width; towrite; towrite -= wrote)
… …
2546 2641
2547/* ------------------------------------------------------------------------- * 2642/* ------------------------------------------------------------------------- *
2548 * CHARACTER SELECTION * 2643 * CHARACTER SELECTION *
2549 * ------------------------------------------------------------------------- */ 2644 * ------------------------------------------------------------------------- */
2550void 2645void
2551rxvt_term::selection_check (int check_more) 2646rxvt_term::selection_check (int check_more) NOTHROW
2552{ 2647{
2553 row_col_t pos; 2648 row_col_t pos;
2554 2649
2555 if (!selection.op) 2650 if (!selection.op)
2556 return; 2651 return;
2557 2652
2558 pos.row = pos.col = 0; 2653 pos.row = pos.col = 0;
2559 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2654 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2560 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2655 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2561 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2656 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2562 || (check_more == 1 2657 || (check_more == 1
2563 && current_screen == selection.screen 2658 && current_screen == selection.screen
2564 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2659 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2565 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2660 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2566 || (check_more == 2 2661 || (check_more == 2
… …
2577/* ------------------------------------------------------------------------- */ 2672/* ------------------------------------------------------------------------- */
2578/* 2673/*
2579 * Paste a selection direct to the command fd 2674 * Paste a selection direct to the command fd
2580 */ 2675 */
2581void 2676void
2582rxvt_term::paste (char *data, unsigned int len) 2677rxvt_term::paste (char *data, unsigned int len) NOTHROW
2583{ 2678{
2584 /* convert normal newline chars into common keyboard Return key sequence */ 2679 /* convert normal newline chars into common keyboard Return key sequence */
2585 for (unsigned int i = 0; i < len; i++) 2680 for (unsigned int i = 0; i < len; i++)
2586 if (data[i] == C0_LF) 2681 if (data[i] == C0_LF)
2587 data[i] = C0_CR; 2682 data[i] = C0_CR;
2588 2683
2684 if (priv_modes & PrivMode_BracketPaste)
2685 tt_printf ("\e[200~");
2686
2589 tt_write (data, len); 2687 tt_write (data, len);
2688
2689 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~");
2590} 2691}
2591 2692
2592/* ------------------------------------------------------------------------- */ 2693/* ------------------------------------------------------------------------- */
2593/* 2694/*
2594 * Respond to a notification that a primary selection has been sent 2695 * Respond to a notification that a primary selection has been sent
2595 * EXT: SelectionNotify 2696 * EXT: SelectionNotify
2596 */ 2697 */
2597void 2698void
2598rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2699rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2599{ 2700{
2600 if (prop == None) /* check for failed XConvertSelection */ 2701 if (prop == None) /* check for failed XConvertSelection */
2601 { 2702 {
2602 if ((selection_type & Sel_CompoundText)) 2703 if ((selection_type & Sel_CompoundText))
2603 { 2704 {
… …
2623 } 2724 }
2624 2725
2625 unsigned long bytes_after; 2726 unsigned long bytes_after;
2626 XTextProperty ct; 2727 XTextProperty ct;
2627 2728
2628 if (XGetWindowProperty (display->display, win, prop, 2729 if (XGetWindowProperty (dpy, win, prop,
2629 0, PROP_SIZE / 4, 2730 0, PROP_SIZE / 4,
2630 delete_prop, AnyPropertyType, 2731 delete_prop, AnyPropertyType,
2631 &ct.encoding, &ct.format, 2732 &ct.encoding, &ct.format,
2632 &ct.nitems, &bytes_after, 2733 &ct.nitems, &bytes_after,
2633 &ct.value) != Success) 2734 &ct.value) != Success)
… …
2642 if (bytes_after) 2743 if (bytes_after)
2643 { 2744 {
2644 // fetch and append remaining data 2745 // fetch and append remaining data
2645 XTextProperty ct2; 2746 XTextProperty ct2;
2646 2747
2647 if (XGetWindowProperty (display->display, win, prop, 2748 if (XGetWindowProperty (dpy, win, prop,
2648 ct.nitems / 4, (bytes_after + 3) / 4, 2749 ct.nitems / 4, (bytes_after + 3) / 4,
2649 delete_prop, AnyPropertyType, 2750 delete_prop, AnyPropertyType,
2650 &ct2.encoding, &ct2.format, 2751 &ct2.encoding, &ct2.format,
2651 &ct2.nitems, &bytes_after, 2752 &ct2.nitems, &bytes_after,
2652 &ct2.value) != Success) 2753 &ct2.value) != Success)
… …
2665 2766
2666 if (ct.encoding == xa[XA_INCR]) 2767 if (ct.encoding == xa[XA_INCR])
2667 { 2768 {
2668 // INCR selection, start handshake 2769 // INCR selection, start handshake
2669 if (!delete_prop) 2770 if (!delete_prop)
2670 XDeleteProperty (display->display, win, prop); 2771 XDeleteProperty (dpy, win, prop);
2671 2772
2672 selection_wait = Sel_incr; 2773 selection_wait = Sel_incr;
2673 incr_buf_fill = 0; 2774 incr_buf_fill = 0;
2674 incr_ev.start (NOW + 10); 2775 incr_ev.start (10);
2675 2776
2676 goto bailout; 2777 goto bailout;
2677 } 2778 }
2678 2779
2679 if (ct.nitems == 0) 2780 if (ct.nitems == 0)
… …
2688 ct.nitems = incr_buf_fill; 2789 ct.nitems = incr_buf_fill;
2689 incr_buf = 0; 2790 incr_buf = 0;
2690 incr_buf_size = 0; 2791 incr_buf_size = 0;
2691 incr_ev.stop (); 2792 incr_ev.stop ();
2692 } 2793 }
2693 else 2794 else
2694 { 2795 {
2695 if (selection_wait == Sel_normal 2796 if (selection_wait == Sel_normal
2696 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2797 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2697 { 2798 {
2698 /* 2799 /*
… …
2705 goto bailout; 2806 goto bailout;
2706 } 2807 }
2707 } 2808 }
2708 else if (selection_wait == Sel_incr) 2809 else if (selection_wait == Sel_incr)
2709 { 2810 {
2710 incr_ev.start (NOW + 10); 2811 incr_ev.start (10);
2711 2812
2712 while (incr_buf_fill + ct.nitems > incr_buf_size) 2813 while (incr_buf_fill + ct.nitems > incr_buf_size)
2713 { 2814 {
2714 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2815 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2715 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2816 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2722 } 2823 }
2723 2824
2724 char **cl; 2825 char **cl;
2725 int cr; 2826 int cr;
2726 2827
2727#if ENABLE_FRILLS 2828#if !ENABLE_MINIMAL
2728 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2829 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2729 // so recode it manually 2830 // so recode it manually
2730 if (ct.encoding == xa[XA_UTF8_STRING]) 2831 if (ct.encoding == xa[XA_UTF8_STRING])
2731 { 2832 {
2732 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2833 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2736 paste (s, strlen (s)); 2837 paste (s, strlen (s));
2737 free (s); 2838 free (s);
2738 } 2839 }
2739 else 2840 else
2740#endif 2841#endif
2741 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2842 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2742 && cl) 2843 && cl)
2743 { 2844 {
2744 for (int i = 0; i < cr; i++) 2845 for (int i = 0; i < cr; i++)
2745 paste (cl[i], strlen (cl[i])); 2846 paste (cl[i], strlen (cl[i]));
2746 2847
… …
2755 if (selection_wait == Sel_normal) 2856 if (selection_wait == Sel_normal)
2756 selection_wait = Sel_none; 2857 selection_wait = Sel_none;
2757} 2858}
2758 2859
2759void 2860void
2760rxvt_term::incr_cb (time_watcher &w) 2861rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2761{ 2862{
2762 selection_wait = Sel_none; 2863 selection_wait = Sel_none;
2763 2864
2764 incr_buf_size = 0; 2865 incr_buf_size = 0;
2765 free (incr_buf); 2866 free (incr_buf);
2766 2867
2767 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2868 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2768} 2869}
2769 2870
2770void 2871void
2771rxvt_term::selection_property (Window win, Atom prop) 2872rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2772{ 2873{
2773 if (prop == None || selection_wait != Sel_incr) 2874 if (prop == None || selection_wait != Sel_incr)
2774 return; 2875 return;
2775 2876
2776 selection_paste (win, prop, true); 2877 selection_paste (win, prop, true);
2777} 2878}
2778 2879
2779/* ------------------------------------------------------------------------- */ 2880/* ------------------------------------------------------------------------- */
2780/* 2881/*
2781 * Request the current selection: 2882 * Request the current selection:
2782 * Order: > internal selection if available 2883 * Order: > internal selection if available
2783 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2884 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2784 * > CUT_BUFFER0 2885 * > CUT_BUFFER0
2785 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2886 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2786 * will auto fallback to CUT_BUFFER0 2887 * will auto fallback to CUT_BUFFER0
2787 * EXT: button 2 release 2888 * EXT: button 2 release
2788 */ 2889 */
2789void 2890void
2790rxvt_term::selection_request (Time tm, int x, int y) 2891rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2791{ 2892{
2792 if (x < 0 || x >= width || y < 0 || y >= height) 2893 if (selection.text && selnum == Sel_Primary)
2793 return; /* outside window */ 2894 {
2794
2795 if (selection.text)
2796 { /* internal selection */ 2895 /* internal selection */
2797 char *str = rxvt_wcstombs (selection.text, selection.len); 2896 char *str = rxvt_wcstombs (selection.text, selection.len);
2798 paste (str, strlen (str)); 2897 paste (str, strlen (str));
2799 free (str); 2898 free (str);
2800 return; 2899 return;
2801 } 2900 }
2802 else 2901 else
2803 { 2902 {
2804 int i;
2805
2806 selection_request_time = tm; 2903 selection_request_time = tm;
2807 selection_wait = Sel_normal; 2904 selection_wait = Sel_normal;
2808 2905
2809 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2810 {
2811#if X_HAVE_UTF8_STRING 2906#if X_HAVE_UTF8_STRING
2812 selection_type = Sel_UTF8String; 2907 selection_type = Sel_UTF8String;
2813 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2908 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2814 return; 2909 return;
2815#else 2910#else
2816 selection_type = Sel_CompoundText; 2911 selection_type = Sel_CompoundText;
2817 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2818 return; 2913 return;
2819#endif 2914#endif
2820 }
2821 } 2915 }
2822 2916
2823 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2917 selection_wait = Sel_none; /* don't loop in selection_paste () */
2824 selection_paste (display->root, XA_CUT_BUFFER0, false); 2918 selection_paste (display->root, XA_CUT_BUFFER0, false);
2825} 2919}
2826 2920
2827int 2921int
2828rxvt_term::selection_request_other (Atom target, int selnum) 2922rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2829{ 2923{
2830 Atom sel; 2924 Atom sel;
2831 2925
2832 selection_type |= selnum; 2926 selection_type |= selnum;
2833 2927
… …
2836 else if (selnum == Sel_Secondary) 2930 else if (selnum == Sel_Secondary)
2837 sel = XA_SECONDARY; 2931 sel = XA_SECONDARY;
2838 else 2932 else
2839 sel = xa[XA_CLIPBOARD]; 2933 sel = xa[XA_CLIPBOARD];
2840 2934
2841 if (XGetSelectionOwner (display->display, sel) != None) 2935 if (XGetSelectionOwner (dpy, sel) != None)
2842 { 2936 {
2843 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2937 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2844 vt, selection_request_time); 2938 vt, selection_request_time);
2845 return 1; 2939 return 1;
2846 } 2940 }
2847 2941
2848 return 0; 2942 return 0;
… …
2852/* 2946/*
2853 * Clear all selected text 2947 * Clear all selected text
2854 * EXT: SelectionClear 2948 * EXT: SelectionClear
2855 */ 2949 */
2856void 2950void
2857rxvt_term::selection_clear () 2951rxvt_term::selection_clear () NOTHROW
2858{ 2952{
2859 want_refresh = 1; 2953 want_refresh = 1;
2860 free (selection.text); 2954 free (selection.text);
2861 selection.text = NULL; 2955 selection.text = NULL;
2862 selection.len = 0; 2956 selection.len = 0;
… …
2911 3005
2912 int end_col; 3006 int end_col;
2913 3007
2914 for (; row <= selection.end.row; row++, col = 0) 3008 for (; row <= selection.end.row; row++, col = 0)
2915 { 3009 {
2916#if ENABLE_FRILLS 3010#if !ENABLE_MINIMAL
2917 if (selection.rect) 3011 if (selection.rect)
2918 { 3012 {
2919 col = selection.beg.col; 3013 col = selection.beg.col;
2920 end_col = ncol + 1; 3014 end_col = ncol + 1;
2921 } 3015 }
… …
2924 end_col = ROW(row).l; 3018 end_col = ROW(row).l;
2925 3019
2926 col = max (col, 0); 3020 col = max (col, 0);
2927 3021
2928 if (row == selection.end.row 3022 if (row == selection.end.row
2929#if ENABLE_FRILLS 3023#if !ENABLE_MINIMAL
2930 || selection.rect 3024 || selection.rect
2931#endif 3025#endif
2932 ) 3026 )
2933 min_it (end_col, selection.end.col); 3027 min_it (end_col, selection.end.col);
2934 3028
… …
2957#endif 3051#endif
2958 else 3052 else
2959 new_selection_text[ofs++] = *t++; 3053 new_selection_text[ofs++] = *t++;
2960 } 3054 }
2961 3055
2962#if ENABLE_FRILLS 3056#if !ENABLE_MINIMAL
2963 if (selection.rect) 3057 if (selection.rect)
2964 { 3058 {
2965 while (ofs 3059 while (ofs
2966 && new_selection_text[ofs - 1] != C0_LF 3060 && new_selection_text[ofs - 1] != C0_LF
2967 && unicode::is_space (new_selection_text[ofs - 1])) 3061 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2997 3091
2998 selection_grab (tm); 3092 selection_grab (tm);
2999} 3093}
3000 3094
3001bool 3095bool
3002rxvt_term::selection_grab (Time tm) 3096rxvt_term::selection_grab (Time tm) NOTHROW
3003{ 3097{
3004 selection_time = tm; 3098 selection_time = tm;
3005 3099
3006 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3100 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3007 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3101 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3008 { 3102 {
3009 display->set_selection_owner (this); 3103 display->set_selection_owner (this);
3010 return true; 3104 return true;
3011 } 3105 }
3012 else 3106 else
3107 {
3108 selection_clear ();
3013 return false; 3109 return false;
3110 }
3014 3111
3015#if 0 3112#if 0
3016 XTextProperty ct; 3113 XTextProperty ct;
3017 3114
3018 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3115 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3019 { 3116 {
3020 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3117 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3021 XFree (ct.value); 3118 XFree (ct.value);
3022 } 3119 }
3023#endif 3120#endif
… …
3027/* 3124/*
3028 * Mark or select text based upon number of clicks: 1, 2, or 3 3125 * Mark or select text based upon number of clicks: 1, 2, or 3
3029 * EXT: button 1 press 3126 * EXT: button 1 press
3030 */ 3127 */
3031void 3128void
3032rxvt_term::selection_click (int clicks, int x, int y) 3129rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3033{ 3130{
3034 clicks = ((clicks - 1) % 3) + 1; 3131 clicks = ((clicks - 1) % 3) + 1;
3035 selection.clicks = clicks; /* save clicks so extend will work */ 3132 selection.clicks = clicks; /* save clicks so extend will work */
3036 3133
3134 if (clicks == 2 && !selection.rect
3135 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3136 {
3137 MEvent.clicks = 1; // what a mess
3138 selection.screen = current_screen;
3139 selection.op = SELECTION_CONT;
3140 return;
3141 }
3142
3037 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3143 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3038 3144
3039 if (clicks == 2 || clicks == 3) 3145 if (clicks == 2 || clicks == 3)
3040 selection_extend_colrow (selection.mark.col, 3146 selection_extend_colrow (selection.mark.col,
3041 selection.mark.row + view_start, 3147 selection.mark.row - view_start,
3042 0, /* button 3 */ 3148 0, /* button 3 */
3043 1, /* button press */ 3149 1, /* button press */
3044 0); /* click change */ 3150 0); /* click change */
3045} 3151}
3046 3152
3047/* ------------------------------------------------------------------------- */ 3153/* ------------------------------------------------------------------------- */
3048/* 3154/*
3049 * Mark a selection at the specified col/row 3155 * Mark a selection at the specified col/row
3050 */ 3156 */
3051void 3157void
3052rxvt_term::selection_start_colrow (int col, int row) 3158rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3053{ 3159{
3054 want_refresh = 1; 3160 want_refresh = 1;
3055 3161
3056 selection.mark.row = row - view_start; 3162 selection.mark.row = row + view_start;
3057 selection.mark.col = col; 3163 selection.mark.col = col;
3058 3164
3059 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3165 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3060 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3166 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3061 3167
3062 while (selection.mark.col > 0 3168 while (selection.mark.col > 0
3063 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3169 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3064 --selection.mark.col; 3170 --selection.mark.col;
3065 3171
3066 if (selection.op) 3172 if (selection.op)
3173 {
3067 { /* clear the old selection */ 3174 /* clear the old selection */
3068 selection.beg.row = selection.end.row = selection.mark.row; 3175 selection.beg.row = selection.end.row = selection.mark.row;
3069 selection.beg.col = selection.end.col = selection.mark.col; 3176 selection.beg.col = selection.end.col = selection.mark.col;
3070 } 3177 }
3071 3178
3072 selection.op = SELECTION_INIT; 3179 selection.op = SELECTION_INIT;
… …
3083#define DELIMIT_TEXT(x) \ 3190#define DELIMIT_TEXT(x) \
3084 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3191 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3085#define DELIMIT_REND(x) 1 3192#define DELIMIT_REND(x) 1
3086 3193
3087void 3194void
3088rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3195rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3089{ 3196{
3090 int col, row, dirnadd, tcol, trow, w1, w2; 3197 int col, row, dirnadd, tcol, trow, w1, w2;
3091 row_col_t bound; 3198 row_col_t bound;
3092 text_t *stp; 3199 text_t *stp;
3093 rend_t *srp; 3200 rend_t *srp;
3094 3201
3095 if (dirn == UP) 3202 if (dirn == UP)
3096 { 3203 {
3097 bound.row = - nsaved - 1; 3204 bound.row = top_row - 1;
3098 bound.col = 0; 3205 bound.col = 0;
3099 dirnadd = -1; 3206 dirnadd = -1;
3100 } 3207 }
3101 else 3208 else
3102 { 3209 {
… …
3167 * flag == 0 ==> button 1 3274 * flag == 0 ==> button 1
3168 * flag == 1 ==> button 3 press 3275 * flag == 1 ==> button 3 press
3169 * flag == 2 ==> button 3 motion 3276 * flag == 2 ==> button 3 motion
3170 */ 3277 */
3171void 3278void
3172rxvt_term::selection_extend (int x, int y, int flag) 3279rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3173{ 3280{
3174 int col = clamp (Pixel2Col (x), 0, ncol); 3281 int col = clamp (Pixel2Col (x), 0, ncol);
3175 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3282 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3176 3283
3177 /* 3284 /*
… …
3180 * select nothing. Otherwise, if we're to the right of the mark, you have to 3287 * select nothing. Otherwise, if we're to the right of the mark, you have to
3181 * be _past_ a character for it to be selected. 3288 * be _past_ a character for it to be selected.
3182 */ 3289 */
3183 if (((selection.clicks % 3) == 1) && !flag 3290 if (((selection.clicks % 3) == 1) && !flag
3184 && (col == selection.mark.col 3291 && (col == selection.mark.col
3185 && (row == selection.mark.row + view_start))) 3292 && (row == selection.mark.row - view_start)))
3186 { 3293 {
3187 /* select nothing */ 3294 /* select nothing */
3188 selection.beg.row = selection.end.row = 0; 3295 selection.beg.row = selection.end.row = 0;
3189 selection.beg.col = selection.end.col = 0; 3296 selection.beg.col = selection.end.col = 0;
3190 selection.clicks = 4; 3297 selection.clicks = 4;
… …
3203/* ------------------------------------------------------------------------- */ 3310/* ------------------------------------------------------------------------- */
3204/* 3311/*
3205 * Extend the selection to the specified col/row 3312 * Extend the selection to the specified col/row
3206 */ 3313 */
3207void 3314void
3208rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3315rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3209{ 3316{
3210 row_col_t pos; 3317 row_col_t pos;
3211 enum { 3318 enum {
3212 LEFT, RIGHT 3319 LEFT, RIGHT
3213 } closeto = RIGHT; 3320 } closeto = RIGHT;
… …
3245 selection.beg.col = selection.end.col = selection.mark.col; 3352 selection.beg.col = selection.end.col = selection.mark.col;
3246 selection.beg.row = selection.end.row = selection.mark.row; 3353 selection.beg.row = selection.end.row = selection.mark.row;
3247 } 3354 }
3248 3355
3249 pos.col = col; 3356 pos.col = col;
3250 pos.row = row - view_start; 3357 pos.row = view_start + row;
3251 3358
3252 /* 3359 /*
3253 * This is mainly xterm style selection with a couple of differences, mainly 3360 * This is mainly xterm style selection with a couple of differences, mainly
3254 * in the way button3 drag extension works. 3361 * in the way button3 drag extension works.
3255 * We're either doing: button1 drag; button3 press; or button3 drag 3362 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3261 * a point/word/line which is either the start or end of the selection 3368 * a point/word/line which is either the start or end of the selection
3262 * and it was decided by whichever point/word/line was `fixed' at the 3369 * and it was decided by whichever point/word/line was `fixed' at the
3263 * time of the most recent button3 press 3370 * time of the most recent button3 press
3264 */ 3371 */
3265 if (button3 && buttonpress) 3372 if (button3 && buttonpress)
3373 {
3266 { /* button3 press */ 3374 /* button3 press */
3267 /* 3375 /*
3268 * first determine which edge of the selection we are closest to 3376 * first determine which edge of the selection we are closest to
3269 */ 3377 */
3270 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3378 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3271 || (!ROWCOL_IS_AFTER (pos, selection.end) 3379 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3289 selection.mark.row = selection.beg.row; 3397 selection.mark.row = selection.beg.row;
3290 selection.mark.col = selection.beg.col; 3398 selection.mark.col = selection.beg.col;
3291 } 3399 }
3292 } 3400 }
3293 else 3401 else
3402 {
3294 { /* button1 drag or button3 drag */ 3403 /* button1 drag or button3 drag */
3295 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3404 if (ROWCOL_IS_AFTER (selection.mark, pos))
3296 { 3405 {
3297 if (selection.mark.row == selection.end.row 3406 if (selection.mark.row == selection.end.row
3298 && selection.mark.col == selection.end.col 3407 && selection.mark.col == selection.end.col
3299 && clickchange 3408 && clickchange
… …
3316 3425
3317 if (selection.clicks == 1) 3426 if (selection.clicks == 1)
3318 { 3427 {
3319 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3428 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3320 && !ROW(selection.beg.row).is_longer () 3429 && !ROW(selection.beg.row).is_longer ()
3321#if ENABLE_FRILLS 3430#if !ENABLE_MINIMAL
3322 && !selection.rect 3431 && !selection.rect
3323#endif 3432#endif
3324 ) 3433 )
3325 selection.beg.col = ncol; 3434 selection.beg.col = ncol;
3326 3435
3327 if ( 3436 if (
3328 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3437 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3329 && !ROW(selection.end.row).is_longer () 3438 && !ROW(selection.end.row).is_longer ()
3330#if ENABLE_FRILLS 3439#if !ENABLE_MINIMAL
3331 && !selection.rect 3440 && !selection.rect
3332#endif 3441#endif
3333 ) 3442 )
3334 selection.end.col = ncol; 3443 selection.end.col = ncol;
3335 } 3444 }
3336 else if (selection.clicks == 2) 3445 else if (selection.clicks == 2)
3337 { 3446 {
3338 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3447 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3339 selection.end.col--; 3448 selection.end.col--;
3340 3449
3341 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3342 {
3343 selection_delimit_word (UP, &selection.beg, &selection.beg); 3450 selection_delimit_word (UP, &selection.beg, &selection.beg);
3344 selection_delimit_word (DN, &selection.end, &selection.end); 3451 selection_delimit_word (DN, &selection.end, &selection.end);
3345 }
3346 } 3452 }
3347 else if (selection.clicks == 3) 3453 else if (selection.clicks == 3)
3348 { 3454 {
3349#if ENABLE_FRILLS 3455#if ENABLE_FRILLS
3350 if (OPTION (Opt_tripleclickwords)) 3456 if (option (Opt_tripleclickwords))
3351 { 3457 {
3352 selection_delimit_word (UP, &selection.beg, &selection.beg); 3458 selection_delimit_word (UP, &selection.beg, &selection.beg);
3353 3459
3354 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3460 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3355 { 3461 {
3356 if (!ROW(end_row).is_longer ()) 3462 if (!ROW(end_row).is_longer ())
3357 { 3463 {
3358 selection.end.row = end_row; 3464 selection.end.row = end_row;
3359 selection.end.col = ROW(end_row).l; 3465 selection.end.col = ROW(end_row).l;
3466# if !ENABLE_MINIMAL
3360 selection_remove_trailing_spaces (); 3467 selection_remove_trailing_spaces ();
3468# endif
3361 break; 3469 break;
3362 } 3470 }
3363 } 3471 }
3364 } 3472 }
3365 else 3473 else
… …
3381 selection.end.row++; 3489 selection.end.row++;
3382 } 3490 }
3383 } 3491 }
3384 3492
3385 if (button3 && buttonpress) 3493 if (button3 && buttonpress)
3494 {
3386 { /* mark may need to be changed */ 3495 /* mark may need to be changed */
3387 if (closeto == LEFT) 3496 if (closeto == LEFT)
3388 { 3497 {
3389 selection.mark.row = selection.end.row; 3498 selection.mark.row = selection.end.row;
3390 selection.mark.col = selection.end.col - (selection.clicks == 2); 3499 selection.mark.col = selection.end.col - (selection.clicks == 2);
3391 } 3500 }
… …
3394 selection.mark.row = selection.beg.row; 3503 selection.mark.row = selection.beg.row;
3395 selection.mark.col = selection.beg.col; 3504 selection.mark.col = selection.beg.col;
3396 } 3505 }
3397 } 3506 }
3398 3507
3399#if ENABLE_FRILLS 3508#if !ENABLE_MINIMAL
3400 if (selection.rect && selection.beg.col > selection.end.col) 3509 if (selection.rect && selection.beg.col > selection.end.col)
3401 ::swap (selection.beg.col, selection.end.col); 3510 ::swap (selection.beg.col, selection.end.col);
3402#endif 3511#endif
3403} 3512}
3404 3513
3405#if ENABLE_FRILLS 3514#if !ENABLE_MINIMAL
3406void 3515void
3407rxvt_term::selection_remove_trailing_spaces () 3516rxvt_term::selection_remove_trailing_spaces () NOTHROW
3408{ 3517{
3409 int32_t end_col, end_row; 3518 int32_t end_col, end_row;
3410 text_t *stp; 3519 text_t *stp;
3411 3520
3412 end_col = selection.end.col; 3521 end_col = selection.end.col;
… …
3450/* 3559/*
3451 * Double click on button 3 when already selected 3560 * Double click on button 3 when already selected
3452 * EXT: button 3 double click 3561 * EXT: button 3 double click
3453 */ 3562 */
3454void 3563void
3455rxvt_term::selection_rotate (int x, int y) 3564rxvt_term::selection_rotate (int x, int y) NOTHROW
3456{ 3565{
3457 selection.clicks = selection.clicks % 3 + 1; 3566 selection.clicks = selection.clicks % 3 + 1;
3458 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3567 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3459} 3568}
3460 3569
… …
3462/* 3571/*
3463 * Respond to a request for our current selection 3572 * Respond to a request for our current selection
3464 * EXT: SelectionRequest 3573 * EXT: SelectionRequest
3465 */ 3574 */
3466void 3575void
3467rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3576rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3468{ 3577{
3469 XSelectionEvent ev; 3578 XSelectionEvent ev;
3470 dDisp;
3471 3579
3472 ev.type = SelectionNotify; 3580 ev.type = SelectionNotify;
3473 ev.property = None; 3581 ev.property = None;
3474 ev.display = rq.display; 3582 ev.display = rq.display;
3475 ev.requestor = rq.requestor; 3583 ev.requestor = rq.requestor;
… …
3489 *target++ = xa[XA_COMPOUND_TEXT]; 3597 *target++ = xa[XA_COMPOUND_TEXT];
3490#if X_HAVE_UTF8_STRING 3598#if X_HAVE_UTF8_STRING
3491 *target++ = xa[XA_UTF8_STRING]; 3599 *target++ = xa[XA_UTF8_STRING];
3492#endif 3600#endif
3493 3601
3494 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3602 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3495 32, PropModeReplace, 3603 32, PropModeReplace,
3496 (unsigned char *)target_list, target - target_list); 3604 (unsigned char *)target_list, target - target_list);
3497 ev.property = rq.property; 3605 ev.property = rq.property;
3498 } 3606 }
3499#if TODO // TODO 3607#if TODO // TODO
… …
3502 /* TODO: Handle MULTIPLE */ 3610 /* TODO: Handle MULTIPLE */
3503 } 3611 }
3504#endif 3612#endif
3505 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3613 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3506 { 3614 {
3507 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3615 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3508 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3616 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3509 ev.property = rq.property; 3617 ev.property = rq.property;
3510 } 3618 }
3511 else if (rq.target == XA_STRING 3619 else if (rq.target == XA_STRING
3512 || rq.target == xa[XA_TEXT] 3620 || rq.target == xa[XA_TEXT]
… …
3536 style = enc_string; 3644 style = enc_string;
3537 else if (target == xa[XA_TEXT]) 3645 else if (target == xa[XA_TEXT])
3538 style = enc_text; 3646 style = enc_text;
3539 else if (target == xa[XA_COMPOUND_TEXT]) 3647 else if (target == xa[XA_COMPOUND_TEXT])
3540 style = enc_compound_text; 3648 style = enc_compound_text;
3541#if ENABLE_FRILLS 3649#if !ENABLE_MINIMAL
3542 else if (target == xa[XA_UTF8_STRING]) 3650 else if (target == xa[XA_UTF8_STRING])
3543 style = enc_utf8; 3651 style = enc_utf8;
3544#endif 3652#endif
3545 else 3653 else
3546 { 3654 {
… …
3557 { 3665 {
3558 cl = L""; 3666 cl = L"";
3559 selectlen = 0; 3667 selectlen = 0;
3560 } 3668 }
3561 3669
3562#if ENABLE_FRILLS 3670#if !ENABLE_MINIMAL
3563 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3671 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3564 // so recode it manually 3672 // so recode it manually
3565 if (style == enc_utf8) 3673 if (style == enc_utf8)
3566 { 3674 {
3567 freect = 1; 3675 freect = 1;
… …
3570 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3678 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3571 ct.nitems = strlen ((char *)ct.value); 3679 ct.nitems = strlen ((char *)ct.value);
3572 } 3680 }
3573 else 3681 else
3574#endif 3682#endif
3575 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3683 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3576 freect = 1; 3684 freect = 1;
3577 else 3685 else
3578 { 3686 {
3579 /* if we failed to convert then send it raw */ 3687 /* if we failed to convert then send it raw */
3580 ct.value = (unsigned char *)cl; 3688 ct.value = (unsigned char *)cl;
3581 ct.nitems = selectlen; 3689 ct.nitems = selectlen;
3582 ct.encoding = target; 3690 ct.encoding = target;
3583 } 3691 }
3584 3692
3585 XChangeProperty (disp, rq.requestor, rq.property, 3693 XChangeProperty (dpy, rq.requestor, rq.property,
3586 ct.encoding, 8, PropModeReplace, 3694 ct.encoding, 8, PropModeReplace,
3587 ct.value, (int)ct.nitems); 3695 ct.value, (int)ct.nitems);
3588 ev.property = rq.property; 3696 ev.property = rq.property;
3589 3697
3590 if (freect) 3698 if (freect)
3591 XFree (ct.value); 3699 XFree (ct.value);
3592 } 3700 }
3593 3701
3594 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3702 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3595}
3596
3597/* ------------------------------------------------------------------------- *
3598 * MOUSE ROUTINES *
3599 * ------------------------------------------------------------------------- */
3600
3601/*
3602 * return col/row values corresponding to x/y pixel values
3603 */
3604void
3605rxvt_term::pixel_position (int *x, int *y)
3606{
3607 *x = Pixel2Col (*x);
3608 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3609 *y = Pixel2Row (*y);
3610 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3611} 3703}
3612 3704
3613/* ------------------------------------------------------------------------- */ 3705/* ------------------------------------------------------------------------- */
3614#ifdef USE_XIM 3706#ifdef USE_XIM
3615void 3707void
3616rxvt_term::im_set_position (XPoint &pos) 3708rxvt_term::im_set_position (XPoint &pos) NOTHROW
3617{ 3709{
3618 XWindowAttributes xwa; 3710 XWindowAttributes xwa;
3619 3711
3620 XGetWindowAttributes (display->display, vt, &xwa); 3712 XGetWindowAttributes (dpy, vt, &xwa);
3621 3713
3622 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3714 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3623 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3715 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3624} 3716}
3625#endif 3717#endif
3626 3718
3627#if ENABLE_OVERLAY 3719#if ENABLE_OVERLAY
3628void 3720void
3629rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3721rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3630{ 3722{
3631 if (nrow < 1 || ncol < 1) 3723 if (nrow < 1 || ncol < 1)
3632 return; 3724 return;
3633 3725
3634 want_refresh = 1; 3726 want_refresh = 1;
… …
3679 *rp = r; 3771 *rp = r;
3680 } 3772 }
3681} 3773}
3682 3774
3683void 3775void
3684rxvt_term::scr_overlay_off () 3776rxvt_term::scr_overlay_off () NOTHROW
3685{ 3777{
3686 if (!ov_text) 3778 if (!ov_text)
3687 return; 3779 return;
3688 3780
3689 want_refresh = 1; 3781 want_refresh = 1;
… …
3697 delete [] ov_text; ov_text = 0; 3789 delete [] ov_text; ov_text = 0;
3698 delete [] ov_rend; ov_rend = 0; 3790 delete [] ov_rend; ov_rend = 0;
3699} 3791}
3700 3792
3701void 3793void
3702rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3794rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3703{ 3795{
3704 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3796 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3705 return; 3797 return;
3706 3798
3707 x++, y++; 3799 x++, y++;
… …
3709 ov_text[y][x] = text; 3801 ov_text[y][x] = text;
3710 ov_rend[y][x] = rend; 3802 ov_rend[y][x] = rend;
3711} 3803}
3712 3804
3713void 3805void
3714rxvt_term::scr_overlay_set (int x, int y, const char *s) 3806rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3715{ 3807{
3716 while (*s) 3808 while (*s)
3717 scr_overlay_set (x++, y, *s++); 3809 scr_overlay_set (x++, y, *s++);
3718} 3810}
3719 3811
3720void 3812void
3721rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3813rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3722{ 3814{
3723 while (*s) 3815 while (*s)
3724 { 3816 {
3725 text_t t = *s++; 3817 text_t t = *s++;
3726 int width = wcwidth (t); 3818 int width = WCWIDTH (t);
3727 3819
3728 while (width--) 3820 while (width--)
3729 { 3821 {
3730 scr_overlay_set (x++, y, t); 3822 scr_overlay_set (x++, y, t);
3731 t = NOCHAR; 3823 t = NOCHAR;
3732 } 3824 }
3733 } 3825 }
3734} 3826}
3735 3827
3736void 3828void
3737rxvt_term::scr_swap_overlay () 3829rxvt_term::scr_swap_overlay () NOTHROW
3738{ 3830{
3739 if (!ov_text) 3831 if (!ov_text)
3740 return; 3832 return;
3741 3833
3742 // swap screen mem with overlay 3834 // swap screen mem with overlay
3743 for (int y = ov_h; y--; ) 3835 for (int y = ov_h; y--; )
3744 { 3836 {
3745 text_t *t1 = ov_text[y]; 3837 text_t *t1 = ov_text[y];
3746 rend_t *r1 = ov_rend[y]; 3838 rend_t *r1 = ov_rend[y];
3747 3839
3748 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3840 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3749 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3841 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3750 3842
3751 for (int x = ov_w; x--; ) 3843 for (int x = ov_w; x--; )
3752 { 3844 {
3753 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3845 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3754 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3846 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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