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

Diff Legend

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