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

Diff Legend

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