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