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.281 by ayin, Wed Oct 31 09:55:24 2007 UTC vs.
Revision 1.433 by sf-exg, Thu Jan 31 08:07:14 2013 UTC

1/*---------------------------------------------------------------------------* 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 <schmorp@schmorp.de>
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.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 80 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 81#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 83
87/* 84/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 85 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 86 */
92#define drawBuffer vt
93
94#define CLEAR_ROWS(row, num) \
95 if (mapped) \
96 XClearArea (dpy, drawBuffer, 0, \
97 Row2Pixel (row), (unsigned int)width, \
98 (unsigned int)Height2Pixel (num), False)
99
100#define CLEAR_CHARS(x, y, num) \ 87#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 88 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 89 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 90 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 91 (unsigned int)Height2Pixel (1), False)
105
106#define ERASE_ROWS(row, num) \
107 XFillRectangle (dpy, drawBuffer, gc, \
108 0, Row2Pixel (row), \
109 (unsigned int)width, \
110 (unsigned int)Height2Pixel (num))
111 92
112/* ------------------------------------------------------------------------- * 93/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 94 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 95 * ------------------------------------------------------------------------- */
115 96
116/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
117void 98void
118rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
119{ 100{
120 if (!l.t) 101 if (!l.valid ())
121 { 102 {
122 lalloc (l); 103 l.alloc ();
123 col = 0; 104 col = 0;
124 width = ncol; 105 width = ncol;
125 } 106 }
126 107
127 l.touch (); 108 l.touch ();
… …
146{ 127{
147 scr_blank_line (l, 0, ncol, efs); 128 scr_blank_line (l, 0, ncol, efs);
148 129
149 l.l = 0; 130 l.l = 0;
150 l.f = 0; 131 l.f = 0;
132}
133
134// nuke a single wide character at the given column
135void
136rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
137{
138 // find begin
139 while (col > 0 && l.t[col] == NOCHAR)
140 col--;
141
142 rend_t rend = l.r[col] & ~RS_baseattrMask;
143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
146
147 // found start, nuke
148 do {
149 l.t[col] = ' ';
150 l.r[col] = rend;
151 col++;
152 } while (col < ncol && l.t[col] == NOCHAR);
153}
154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
151} 163}
152 164
153/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
156 168
157void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
158rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
159{ 215{
160#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
161 scr_overlay_off (); 217 scr_overlay_off ();
162#endif 218#endif
163 219
164 rvideo_mode = false;
165 view_start = 0; 220 view_start = 0;
166 num_scr = 0; 221 num_scr = 0;
167 222
168 if (ncol == 0) 223 if (ncol == 0)
169 ncol = 80; 224 ncol = 80;
… …
171 if (nrow == 0) 226 if (nrow == 0)
172 nrow = 24; 227 nrow = 24;
173 228
174 if (ncol == prev_ncol && nrow == prev_nrow) 229 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 230 return;
176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179 231
180 // we need at least two lines for wrapping to work correctly 232 // we need at least two lines for wrapping to work correctly
181 while (nrow + saveLines < 2) 233 while (nrow + saveLines < 2)
182 { 234 {
183 //TODO//FIXME 235 //TODO//FIXME
… …
192 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
193 245
194 screen.tscroll = 0; 246 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
196 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
197 if (!row_buf) 257 if (!prev_row_buf)
198 { 258 {
199 /* 259 /*
200 * first time called so just malloc everything: don't rely on realloc 260 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
201 */ 261 */
202 top_row = 0; 262 top_row = 0;
203 term_start = 0; 263 term_start = 0;
204
205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
207
208 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211
212 for (int row = nrow; row--; )
213 {
214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
216 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
217 }
218 264
219 memset (charsets, 'B', sizeof (charsets)); 265 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 266 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 267 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 268 screen.cur.row = screen.cur.col = 0;
… …
236 selection.text = NULL; 282 selection.text = NULL;
237 selection.len = 0; 283 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 284 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 285 selection.screen = PRIMARY;
240 selection.clicks = 0; 286 selection.clicks = 0;
287 selection.clip_text = NULL;
288 selection.clip_len = 0;
241 } 289 }
242 else 290 else
243 { 291 {
244 /* 292 /*
245 * add or delete rows as appropriate 293 * add or delete rows as appropriate
246 */ 294 */
247 295
248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250
251#if 0
252 if (nrow < prev_nrow)
253 {
254 for (int row = nrow; row < prev_nrow; row++)
255 {
256 lfree (swap_buf [row]);
257 lfree (drawn_buf[row]);
258 }
259 }
260#endif
261
262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264
265 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
266 { 297 {
267 lresize (drawn_buf[row]); 298 copy_line (drawn_buf [row], prev_drawn_buf [row]);
268 lresize (swap_buf [row]); 299 copy_line (swap_buf [row], prev_swap_buf [row]);
269 }
270
271 for (int row = prev_nrow; row < nrow; row++)
272 { 300 }
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 }
276
277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 301
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 302 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 303 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 304 int q = total_rows; // rewrapped row
283 305
284 if (top_row) 306 if (top_row)
285 { 307 {
286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 308 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 309 // to come up with a lean and mean algorithm.
310 // TODO: maybe optimise when width didn't change
288 311
289 row_col_t ocur = screen.cur; 312 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 313 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 314
292 do 315 do
293 { 316 {
294 p = MOD (p - 1, prev_total_rows); 317 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 318 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 319 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 320 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
300 321
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 322 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 { 323 {
303 p = MOD (p - 1, prev_total_rows); 324 p = MOD (p - 1, prev_total_rows);
304 325
305 plines++; 326 plines++;
306 llen += prev_ncol; 327 llen += prev_ncol;
… …
319 340
320 // re-assemble the full line by destination lines 341 // re-assemble the full line by destination lines
321 for (int qrow = q; qlines--; qrow++) 342 for (int qrow = q; qlines--; qrow++)
322 { 343 {
323 qline = row_buf + qrow; 344 qline = row_buf + qrow;
324 lalloc (*qline); 345 qline->alloc (); // redundant with next line
325 qline->l = ncol; 346 qline->l = ncol;
326 qline->is_longer (1); 347 qline->is_longer (1);
327 348
328 int qcol = 0; 349 int qcol = 0;
329 350
… …
344 // this seems to upset applications/shells/readline 365 // this seems to upset applications/shells/readline
345 // least. 366 // least.
346 if (prow == ocur.row) 367 if (prow == ocur.row)
347 screen.cur.row = q - (total_rows - nrow); 368 screen.cur.row = q - (total_rows - nrow);
348 369
349 line_t &pline = old_buf [prow]; 370 line_t &pline = prev_row_buf [prow];
350 371
351 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 372 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
352 373
353 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 374 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
354 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 375 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
375 { 396 {
376 // if no scrollback exists (yet), wing, instead of wrap 397 // if no scrollback exists (yet), wing, instead of wrap
377 398
378 for (int row = min (nrow, prev_nrow); row--; ) 399 for (int row = min (nrow, prev_nrow); row--; )
379 { 400 {
380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 401 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
381 line_t &qline = row_buf [row]; 402 line_t &dst = row_buf [row];
382 403
383 qline = pline; 404 copy_line (dst, src);
384 lresize (qline);
385 } 405 }
386 406
387 for (int row = prev_nrow; row < nrow; row++) 407 for (int row = prev_nrow; row < nrow; row++)
388 {
389 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 408 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
390 }
391 409
392 term_start = 0; 410 term_start = 0;
393 } 411 }
394
395 free (old_buf);
396 delete old_ta;
397 delete old_ra;
398 412
399 clamp_it (screen.cur.row, 0, nrow - 1); 413 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 414 clamp_it (screen.cur.col, 0, ncol - 1);
415 }
401 416
417 for (int row = nrow; row--; )
418 {
419 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
420 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
421 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
422 }
423
424 chunk_free (prev_chunk, prev_chunk_size);
425
402 free (tabs); 426 free (tabs);
403 } 427 tabs = (char *)rxvt_malloc (ncol);
428
429 for (int col = ncol; col--; )
430 tabs [col] = col % TABSIZE == 0;
404 431
405 CLEAR_ALL_SELECTION (); 432 CLEAR_ALL_SELECTION ();
406 433
407 prev_nrow = nrow; 434 prev_nrow = nrow;
408 prev_ncol = ncol; 435 prev_ncol = ncol;
409 436
410 tabs = (char *)rxvt_malloc (ncol); 437 tt_winch ();
411 438
412 for (int col = ncol; --col; ) 439 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
413 tabs [col] = col % TABSIZE == 0; 440}
441
442void ecb_cold
443rxvt_term::scr_release () NOTHROW
444{
445 chunk_free (chunk, chunk_size);
446 chunk = 0;
447 row_buf = 0;
448
449 free (tabs);
450 tabs = 0;
451}
452
453/* ------------------------------------------------------------------------- */
454/*
455 * Hard/Soft reset
456 */
457void ecb_cold
458rxvt_term::scr_poweron ()
459{
460 scr_release ();
461
462 prev_nrow = prev_ncol = 0;
463 rvideo_mode = false;
464 scr_soft_reset ();
465 scr_reset ();
466
467 scr_clear (true);
468 scr_refresh ();
469}
470
471void ecb_cold
472rxvt_term::scr_soft_reset () NOTHROW
473{
474 /* only affects modes, nothing drastic such as clearing the screen */
475#if ENABLE_OVERLAY
476 scr_overlay_off ();
477#endif
414 478
415 if (current_screen != PRIMARY) 479 if (current_screen != PRIMARY)
416 scr_swap_screen (); 480 scr_swap_screen ();
417 481
418 tt_winch (); 482 scr_scroll_region (0, MAX_ROWS - 1);
419 483 scr_rendition (0, ~RS_None);
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 484 scr_insert_mode (0);
421}
422
423/* ------------------------------------------------------------------------- */
424/*
425 * Free everything. That way malloc debugging can find leakage.
426 */
427void
428rxvt_term::scr_release () NOTHROW
429{
430 if (row_buf)
431 {
432 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0;
434
435 free (row_buf);
436 free (swap_buf);
437 free (drawn_buf);
438 free (tabs);
439
440 row_buf = 0; // signal that we freed all the arrays
441 }
442}
443
444/* ------------------------------------------------------------------------- */
445/*
446 * Hard reset
447 */
448void
449rxvt_term::scr_poweron ()
450{
451 scr_release ();
452 prev_nrow = prev_ncol = 0;
453 scr_reset ();
454
455 scr_clear (true);
456 scr_refresh ();
457} 485}
458 486
459/* ------------------------------------------------------------------------- * 487/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 488 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 489 * ------------------------------------------------------------------------- */
… …
499 } 527 }
500 528
501 /* boundary check in case screen size changed between SAVE and RESTORE */ 529 /* boundary check in case screen size changed between SAVE and RESTORE */
502 min_it (s->cur.row, nrow - 1); 530 min_it (s->cur.row, nrow - 1);
503 min_it (s->cur.col, ncol - 1); 531 min_it (s->cur.col, ncol - 1);
504#ifdef DEBUG_STRICT
505 assert (s->cur.row >= 0); 532 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 533 assert (s->cur.col >= 0);
507#endif
508} 534}
509 535
510void 536void
511rxvt_term::scr_swap_screen () 537rxvt_term::scr_swap_screen () NOTHROW
512{ 538{
513 if (!option (Opt_secondaryScreen)) 539 if (!option (Opt_secondaryScreen))
514 return; 540 return;
515 541
516 for (int i = prev_nrow; i--; ) 542 for (int i = prev_nrow; i--; )
… …
535 return; 561 return;
536 562
537 want_refresh = 1; 563 want_refresh = 1;
538 view_start = 0; 564 view_start = 0;
539 565
540 selection_check (2); /* check for boundary cross */ 566 /* check for boundary cross */
567 row_col_t pos;
568 pos.row = pos.col = 0;
569 if (ROWCOL_IS_BEFORE (selection.beg, pos)
570 && ROWCOL_IS_AFTER (selection.end, pos))
571 CLEAR_SELECTION ();
541 572
542 int i = current_screen; current_screen = scrn; scrn = i; 573 current_screen = scrn;
543 574
544#if NSCREENS 575#if NSCREENS
545 if (option (Opt_secondaryScreen)) 576 if (option (Opt_secondaryScreen))
546 { 577 {
547 num_scr = 0; 578 num_scr = 0;
… …
596/* 627/*
597 * Change the rendition style for following text 628 * Change the rendition style for following text
598 */ 629 */
599void 630void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 631rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 632{
602 if (set) 633 if (set)
603 rstyle |= style; 634 rstyle |= style;
604 else if (style == ~RS_None) 635 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 636 rstyle = DEFAULT_RSTYLE;
606 else 637 else
607 rstyle &= ~style; 638 rstyle &= ~style;
608 } 639}
609 640
610/* ------------------------------------------------------------------------- */ 641/* ------------------------------------------------------------------------- */
611/* 642/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 643 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 644 * count positive ==> scroll up
614 * count negative ==> scroll down 645 * count negative ==> scroll down
615 */ 646 */
616int 647int ecb_hot
617rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 648rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
618{ 649{
619 if (count == 0 || (row1 > row2)) 650 if (count == 0 || (row1 > row2))
620 return 0; 651 return 0;
621 652
… …
624 655
625 if (count > 0 656 if (count > 0
626 && row1 == 0 657 && row1 == 0
627 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 658 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
628 { 659 {
660 min_it (count, total_rows - (nrow - (row2 + 1)));
661
629 top_row = max (top_row - count, -saveLines); 662 top_row = max (top_row - count, -saveLines);
630
631 // scroll everything up 'count' lines
632 term_start = (term_start + count) % total_rows;
633 663
634 // sever bottommost line 664 // sever bottommost line
635 { 665 {
636 line_t &l = ROW(row2 - count); 666 line_t &l = ROW(row2);
637 l.is_longer (0); 667 l.is_longer (0);
638 l.touch (); 668 l.touch ();
639 } 669 }
640 670
671 // scroll everything up 'count' lines
672 term_start = (term_start + count) % total_rows;
673
674 // now copy lines below the scroll region bottom to the
675 // bottom of the screen again, so they look as if they
676 // hadn't moved.
677 for (int i = nrow; --i > row2; )
678 {
679 line_t &l1 = ROW(i - count);
680 line_t &l2 = ROW(i);
681
682 ::swap (l1, l2);
683 l2.touch ();
684 }
685
641 // erase newly scrolled-in lines 686 // erase newly scrolled-in lines
642 for (int i = count; i--; ) 687 for (int i = count; i--; )
643 { 688 {
644 line_t &l = ROW(nrow - 1 - i); 689 line_t &l = ROW(row2 - i);
645 690
646 // optimize if already cleared, can be significant on slow machines 691 // optimise if already cleared, can be significant on slow machines
647 // could be rolled into scr_blank_screen_mem 692 // could be rolled into scr_blank_screen_mem
648 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 693 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
649 { 694 {
650 scr_blank_line (l, 0, l.l, rstyle); 695 scr_blank_line (l, 0, l.l, rstyle);
651 l.l = 0; 696 l.l = 0;
… …
653 } 698 }
654 else 699 else
655 scr_blank_screen_mem (l, rstyle); 700 scr_blank_screen_mem (l, rstyle);
656 } 701 }
657 702
658 // now copy lines below the scroll region bottom to the
659 // bottom of the screen again, so they look as if they
660 // hadn't moved.
661 for (int i = nrow; --i > row2; )
662 {
663 line_t &l1 = ROW(i - count);
664 line_t &l2 = ROW(i);
665
666 ::swap (l1, l2);
667 l2.touch ();
668 }
669
670 // move and/or clear selection, if any 703 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 704 if (selection.op && current_screen == selection.screen
705 && selection.beg.row <= row2)
672 { 706 {
673 selection.beg.row -= count; 707 selection.beg.row -= count;
674 selection.end.row -= count; 708 selection.end.row -= count;
675 selection.mark.row -= count; 709 selection.mark.row -= count;
676 710
677 if (selection.beg.row < top_row 711 selection_check (0);
678 || selection.end.row < top_row
679 || selection.mark.row < top_row)
680 {
681 CLEAR_ALL_SELECTION ();
682 selection.op = SELECTION_CLEAR;
683 }
684 } 712 }
685 713
686 // finally move the view window, if desired 714 // finally move the view window, if desired
687 if (option (Opt_scrollWithBuffer) 715 if (option (Opt_scrollWithBuffer)
688 && view_start != 0 716 && view_start != 0
… …
718 } 746 }
719 747
720 // use a simple and robust scrolling algorithm, this 748 // use a simple and robust scrolling algorithm, this
721 // part of scr_scroll_text is not time-critical. 749 // part of scr_scroll_text is not time-critical.
722 750
751 // sever line above scroll region
752 if (row1)
753 {
754 line_t &l = ROW(row1 - 1);
755 l.is_longer (0);
756 l.touch ();
757 }
758
723 int rows = row2 - row1 + 1; 759 int rows = row2 - row1 + 1;
724 760
725 min_it (count, rows); 761 min_it (count, rows);
726 762
727 line_t *temp_buf = row_buf + total_rows; 763 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
728 764
729 for (int row = 0; row < rows; row++) 765 for (int row = 0; row < rows; row++)
730 { 766 {
731 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 767 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
732 768
… …
734 scr_blank_screen_mem (temp_buf [row], rstyle); 770 scr_blank_screen_mem (temp_buf [row], rstyle);
735 } 771 }
736 772
737 for (int row = 0; row < rows; row++) 773 for (int row = 0; row < rows; row++)
738 ROW(row1 + row) = temp_buf [row]; 774 ROW(row1 + row) = temp_buf [row];
775
776 // sever bottommost line
777 {
778 line_t &l = ROW(row2);
779 l.is_longer (0);
780 l.touch ();
781 }
739 } 782 }
740 783
741 return count; 784 return count;
742} 785}
743 786
744/* ------------------------------------------------------------------------- */ 787/* ------------------------------------------------------------------------- */
745/* 788/*
746 * Add text given in <str> of length <len> to screen struct 789 * Add text given in <str> of length <len> to screen struct
747 */ 790 */
748void 791void ecb_hot
749rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 792rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
750{ 793{
751 if (len <= 0) /* sanity */ 794 if (len <= 0) /* sanity */
752 return; 795 return;
753 796
754 unsigned char checksel; 797 bool checksel;
755 unicode_t c; 798 unicode_t c;
756 int ncol = this->ncol; 799 int ncol = this->ncol;
757 const wchar_t *strend = str + len; 800 const wchar_t *strend = str + len;
758 801
759 want_refresh = 1; 802 want_refresh = 1;
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 815 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 816 screen.cur.row -= minlines;
774 } 817 }
775 } 818 }
776 819
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 820 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 821 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 822 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 823 int row = screen.cur.row;
783 824
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 825 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 826
786 line_t *line = &ROW(row); 827 line_t *line = &ROW(row);
787 828
788 while (str < strend) 829 while (str < strend)
789 { 830 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 831 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 832
792 if (c < 0x20) 833 if (ecb_unlikely (c < 0x20))
793 if (c == C0_LF) 834 if (c == C0_LF)
794 { 835 {
795 max_it (line->l, screen.cur.col); 836 max_it (line->l, screen.cur.col);
796 837
797 screen.flags &= ~Screen_WrapNext; 838 screen.flags &= ~Screen_WrapNext;
… …
816 { 857 {
817 scr_tab (1, true); 858 scr_tab (1, true);
818 continue; 859 continue;
819 } 860 }
820 861
862 if (ecb_unlikely (
821 if (checksel /* see if we're writing within selection */ 863 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 864 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 865 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
866 ))
824 { 867 {
825 checksel = 0; 868 checksel = 0;
826 /* 869 /*
827 * If we wrote anywhere in the selected area, kill the selection 870 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 871 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 872 * should be a similar check.
830 */ 873 */
831 CLEAR_SELECTION (); 874 CLEAR_SELECTION ();
832 } 875 }
833 876
834 if (screen.flags & Screen_WrapNext) 877 if (ecb_unlikely (screen.flags & Screen_WrapNext))
835 { 878 {
836 scr_do_wrap (); 879 scr_do_wrap ();
837 880
838 line->l = ncol; 881 line->l = ncol;
839 line->is_longer (1); 882 line->is_longer (1);
… …
841 row = screen.cur.row; 884 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 885 line = &ROW(row); /* _must_ refresh */
843 } 886 }
844 887
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 888 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 889 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 890 c = 0xfffd;
848 891
849 // rely on wcwidth to tell us the character width, do wcwidth before 892 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 893 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 894 // drawing characters below as they might be invalid in the current
852 // locale. 895 // locale.
853 int width = WCWIDTH (c); 896 int width = WCWIDTH (c);
854 897
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 898 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 899 {
857 // vt100 special graphics and line drawing 900 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 901 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 902 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 903 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 916 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 917 width = 1; // vt100 line drawing characters are always single-width
875 } 918 }
876 } 919 }
877 920
878 if (screen.flags & Screen_Insert) 921 if (ecb_unlikely (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 922 scr_insdel_chars (width, INSERT);
880 923
881 if (width != 0) 924 if (width != 0)
882 { 925 {
883#if !UNICODE_3 926#if !UNICODE_3
… …
888# else 931# else
889 c = 0xfffd; 932 c = 0xfffd;
890# endif 933# endif
891#endif 934#endif
892 935
936 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
937
938 // if the character doesn't fit into the remaining columns...
939 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
940 {
941 if (screen.flags & Screen_Autowrap)
942 {
943 // ... artificially enlargen the previous one
944 c = NOCHAR;
945 // and try the same character next loop iteration
946 --str;
947 }
948 else
949 screen.cur.col = ncol - width;
950 }
951
893 // nuke the character at this position, if required 952 // nuke the character at this position, if required
953 // due to wonderful coincidences everywhere else in this loop
954 // we never have to check for overwriting a wide char itself,
955 // only its tail.
894 if (line->t[screen.cur.col] == NOCHAR 956 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
895 || (screen.cur.col < ncol - 1 957 scr_kill_char (*line, screen.cur.col);
896 && line->t[screen.cur.col + 1] == NOCHAR))
897 {
898 int col = screen.cur.col;
899
900 // find begin
901 while (col > 0 && line->t[col] == NOCHAR)
902 col--;
903
904 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
905
906 // found begin, nuke
907 do {
908 line->t[col] = ' ';
909 line->r[col] = rend;
910 col++;
911 } while (col < ncol && line->t[col] == NOCHAR);
912 }
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (screen.cur.col > ncol - width && ncol >= width)
918 {
919 // ...output spaces
920 c = ' ';
921 // and try the same character next loop iteration
922 --str;
923 }
924 958
925 line->touch (); 959 line->touch ();
926 960
927 do 961 do
928 { 962 {
929 line->t[screen.cur.col] = c; 963 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 964 line->r[screen.cur.col] = rend;
931 965
932 if (screen.cur.col < ncol - 1) 966 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 967 screen.cur.col++;
934 else 968 else
935 { 969 {
936 line->l = ncol; 970 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 971 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 972 screen.flags |= Screen_WrapNext;
939 break; 973
974 goto end_of_line;
940 } 975 }
941 976
942 c = NOCHAR; 977 c = NOCHAR;
943 } 978 }
944 while (--width > 0); 979 while (ecb_unlikely (--width > 0));
945 980
946 // pad with spaces when overwriting wide character with smaller one 981 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 982 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 983 {
949 line->touch (); 984 line->t[c] = ' ';
985 line->r[c] = rend;
986 }
950 987
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 988end_of_line:
989 ;
990 }
991#if ENABLE_COMBINING
992 else // width == 0
993 {
994 if (c != 0xfeff) // ignore BOM
995 {
996 // handle combining characters
997 // we just tag the accent on the previous on-screen character.
998 // this is arguably not correct, but also arguably not wrong.
999 // we don't handle double-width characters nicely yet.
1000 line_t *linep;
1001 text_t *tp;
1002 rend_t *rp;
1003
1004 if (screen.cur.col > 0)
952 { 1005 {
953 line->t[c] = ' ';
954 line->r[c] = rend; 1006 linep = line;
1007 tp = line->t + screen.cur.col - 1;
1008 rp = line->r + screen.cur.col - 1;
955 } 1009 }
1010 else if (screen.cur.row > 0
1011 && ROW(screen.cur.row - 1).is_longer ())
1012 {
1013 linep = &ROW(screen.cur.row - 1);
1014 tp = line->t + ncol - 1;
1015 rp = line->r + ncol - 1;
1016 }
1017 else
1018 continue;
1019
1020 linep->touch ();
1021
1022 while (*tp == NOCHAR && tp > linep->t)
1023 tp--, rp--;
1024
1025 // first try to find a precomposed character
1026 unicode_t n = rxvt_compose (*tp, c);
1027 if (n == NOCHAR)
1028 n = rxvt_composite.compose (*tp, c);
1029
1030 *tp = n;
1031 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
956 } 1032 }
957 } 1033 }
958 else // width == 0
959 {
960#if ENABLE_COMBINING
961 // handle combining characters
962 // we just tag the accent on the previous on-screen character.
963 // this is arguably not correct, but also arguably not wrong.
964 // we don't handle double-width characters nicely yet.
965 line_t *linep;
966 text_t *tp;
967 rend_t *rp;
968
969 if (screen.cur.col > 0)
970 {
971 linep = line;
972 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1;
974 }
975 else if (screen.cur.row > 0
976 && ROW(screen.cur.row - 1).is_longer ())
977 {
978 linep = &ROW(screen.cur.row - 1);
979 tp = line->t + ncol - 1;
980 rp = line->r + ncol - 1;
981 }
982 else
983 continue;
984
985 linep->touch ();
986
987 while (*tp == NOCHAR && tp > linep->t)
988 tp--, rp--;
989
990 // first try to find a precomposed character
991 unicode_t n = rxvt_compose (*tp, c);
992 if (n == NOCHAR)
993 n = rxvt_composite.compose (*tp, c);
994
995 *tp = n;
996 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
997#endif 1034#endif
998 }
999 } 1035 }
1000 1036
1001 max_it (line->l, screen.cur.col); 1037 max_it (line->l, screen.cur.col);
1002 1038
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1039 assert (screen.cur.row >= 0);
1005#endif
1006} 1040}
1007 1041
1008/* ------------------------------------------------------------------------- */ 1042/* ------------------------------------------------------------------------- */
1009/* 1043/*
1010 * Process Backspace. Move back the cursor back a position, wrap if have to 1044 * Process Backspace. Move back the cursor back a position, wrap if have to
1011 * XTERM_SEQ: CTRL-H 1045 * XTERM_SEQ: CTRL-H
1012 */ 1046 */
1013void 1047void
1014rxvt_term::scr_backspace () NOTHROW 1048rxvt_term::scr_backspace () NOTHROW
1015{ 1049{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1050 if (screen.cur.col == 0)
1019 { 1051 {
1020 if (screen.cur.row > 0) 1052 if (screen.cur.row > 0)
1021 { 1053 {
1022#ifdef TERMCAP_HAS_BW 1054#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1055 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1056 --screen.cur.row;
1025 return; 1057
1058 want_refresh = 1;
1026#endif 1059#endif
1027 } 1060 }
1028 } 1061 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1062 else if (screen.flags & Screen_WrapNext)
1063 screen.flags &= ~Screen_WrapNext;
1064 else
1030 scr_gotorc (0, -1, RELATIVE); 1065 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1066}
1034 1067
1035/* ------------------------------------------------------------------------- */ 1068/* ------------------------------------------------------------------------- */
1036/* 1069/*
1037 * Process Horizontal Tab 1070 * Process Horizontal Tab
… …
1113 * XTERM_SEQ: ESC 6 1146 * XTERM_SEQ: ESC 6
1114 * Move cursor left in row. If we're at the left boundary, shift everything 1147 * Move cursor left in row. If we're at the left boundary, shift everything
1115 * in that row right. Clear left column. 1148 * in that row right. Clear left column.
1116 */ 1149 */
1117#if !ENABLE_MINIMAL 1150#if !ENABLE_MINIMAL
1118void 1151void ecb_cold
1119rxvt_term::scr_backindex () NOTHROW 1152rxvt_term::scr_backindex () NOTHROW
1120{ 1153{
1121 if (screen.cur.col > 0) 1154 if (screen.cur.col > 0)
1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1123 else 1156 else
… …
1130 * XTERM_SEQ: ESC 9 1163 * XTERM_SEQ: ESC 9
1131 * Move cursor right in row. If we're at the right boundary, shift everything 1164 * Move cursor right in row. If we're at the right boundary, shift everything
1132 * in that row left. Clear right column. 1165 * in that row left. Clear right column.
1133 */ 1166 */
1134#if !ENABLE_MINIMAL 1167#if !ENABLE_MINIMAL
1135void 1168void ecb_cold
1136rxvt_term::scr_forwardindex () NOTHROW 1169rxvt_term::scr_forwardindex () NOTHROW
1137{ 1170{
1138 if (screen.cur.col < ncol - 1) 1171 if (screen.cur.col < ncol - 1)
1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1172 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1140 else 1173 else
… …
1186 } 1219 }
1187 } 1220 }
1188 else 1221 else
1189 { 1222 {
1190 if (screen.flags & Screen_Relative) 1223 if (screen.flags & Screen_Relative)
1224 {
1191 { /* relative origin mode */ 1225 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1226 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1227 min_it (screen.cur.row, screen.bscroll);
1194 } 1228 }
1195 else 1229 else
1196 screen.cur.row = row; 1230 screen.cur.row = row;
… …
1229/* 1263/*
1230 * Erase part or whole of a line 1264 * Erase part or whole of a line
1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1265 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1266 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1233 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1267 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1268 * extension: clear to right unless wrapped: ESC [ 3 K
1234 */ 1269 */
1235void 1270void
1236rxvt_term::scr_erase_line (int mode) NOTHROW 1271rxvt_term::scr_erase_line (int mode) NOTHROW
1237{ 1272{
1238 unsigned int col, num; 1273 unsigned int col, num;
… …
1247 line.touch (); 1282 line.touch ();
1248 line.is_longer (0); 1283 line.is_longer (0);
1249 1284
1250 switch (mode) 1285 switch (mode)
1251 { 1286 {
1287 case 3:
1288 if (screen.flags & Screen_WrapNext)
1289 return;
1290
1291 /* fall through */
1292
1252 case 0: /* erase to end of line */ 1293 case 0: /* erase to end of line */
1253 col = screen.cur.col; 1294 col = screen.cur.col;
1254 num = ncol - col; 1295 num = ncol - col;
1255 min_it (line.l, col); 1296 min_it (line.l, col);
1297
1256 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1298 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1257 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1299 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1258 CLEAR_SELECTION (); 1300 CLEAR_SELECTION ();
1259 break; 1301 break;
1302
1260 case 1: /* erase to beginning of line */ 1303 case 1: /* erase to beginning of line */
1261 col = 0; 1304 col = 0;
1262 num = screen.cur.col + 1; 1305 num = screen.cur.col + 1;
1306
1263 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1307 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1264 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1308 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1265 CLEAR_SELECTION (); 1309 CLEAR_SELECTION ();
1266 break; 1310 break;
1311
1267 case 2: /* erase whole line */ 1312 case 2: /* erase whole line */
1268 col = 0; 1313 col = 0;
1269 num = ncol; 1314 num = ncol;
1270 line.l = 0; 1315 line.l = 0;
1271 if (selection.beg.row <= screen.cur.row 1316 if (selection.beg.row <= screen.cur.row
… …
1279 scr_blank_line (line, col, num, rstyle); 1324 scr_blank_line (line, col, num, rstyle);
1280} 1325}
1281 1326
1282/* ------------------------------------------------------------------------- */ 1327/* ------------------------------------------------------------------------- */
1283/* 1328/*
1284 * Erase part of whole of the screen 1329 * Erase part or whole of the screen
1285 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1330 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1286 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1331 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1287 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1332 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1288 */ 1333 */
1289void 1334void
… …
1298 ZERO_SCROLLBACK (); 1343 ZERO_SCROLLBACK ();
1299 1344
1300 switch (mode) 1345 switch (mode)
1301 { 1346 {
1302 case 0: /* erase to end of screen */ 1347 case 0: /* erase to end of screen */
1303 selection_check (1);
1304 scr_erase_line (0); 1348 scr_erase_line (0);
1305 row = screen.cur.row + 1; /* possible OOB */ 1349 row = screen.cur.row + 1; /* possible OOB */
1306 num = nrow - row; 1350 num = nrow - row;
1307 break; 1351 break;
1308 case 1: /* erase to beginning of screen */ 1352 case 1: /* erase to beginning of screen */
1309 selection_check (3);
1310 scr_erase_line (1); 1353 scr_erase_line (1);
1311 row = 0; 1354 row = 0;
1312 num = screen.cur.row; 1355 num = screen.cur.row;
1313 break; 1356 break;
1314 case 2: /* erase whole screen */ 1357 case 2: /* erase whole screen */
1315 selection_check (3);
1316 row = 0; 1358 row = 0;
1317 num = nrow; 1359 num = nrow;
1318 break; 1360 break;
1319 default: 1361 default:
1320 return; 1362 return;
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1371 if (row >= nrow) /* Out Of Bounds */
1330 return; 1372 return;
1331 1373
1332 min_it (num, nrow - row); 1374 min_it (num, nrow - row);
1333 1375
1334 if (rstyle & (RS_RVid | RS_Uline)) 1376 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1335 ren = (rend_t) ~RS_None; 1377 ren = (rend_t) ~RS_None;
1336 else if (GET_BASEBG (rstyle) == Color_bg) 1378 else if (GET_BASEBG (rstyle) == Color_bg)
1337 { 1379 {
1338 ren = DEFAULT_RSTYLE; 1380 ren = DEFAULT_RSTYLE;
1339 CLEAR_ROWS (row, num); 1381
1382 if (mapped)
1383 XClearArea (dpy, vt, 0,
1384 Row2Pixel (row - view_start), (unsigned int)vt_width,
1385 (unsigned int)Height2Pixel (num), False);
1340 } 1386 }
1341 else 1387 else
1342 { 1388 {
1343 ren = rstyle & (RS_fgMask | RS_bgMask); 1389 ren = rstyle & (RS_fgMask | RS_bgMask);
1390
1391 if (mapped)
1392 {
1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1393 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1345 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1394 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346 ERASE_ROWS (row, num); 1395 XFillRectangle (dpy, vt, gc,
1396 0, Row2Pixel (row - view_start),
1397 (unsigned int)vt_width,
1398 (unsigned int)Height2Pixel (num));
1347 gcvalue.foreground = pix_colors[Color_fg]; 1399 gcvalue.foreground = pix_colors[Color_fg];
1348 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1400 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1401 }
1349 } 1402 }
1350 1403
1351 for (; num--; row++) 1404 for (; num--; row++)
1352 { 1405 {
1353 scr_blank_screen_mem (ROW(row), rstyle); 1406 scr_blank_screen_mem (ROW(row), rstyle);
1407
1408 if (row - view_start < nrow)
1354 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1409 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1355 } 1410 }
1356} 1411}
1357 1412
1358#if !ENABLE_MINIMAL 1413#if !ENABLE_MINIMAL
1359void 1414void
… …
1369/* ------------------------------------------------------------------------- */ 1424/* ------------------------------------------------------------------------- */
1370/* 1425/*
1371 * Fill the screen with `E's 1426 * Fill the screen with `E's
1372 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1427 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1373 */ 1428 */
1374void 1429void ecb_cold
1375rxvt_term::scr_E () NOTHROW 1430rxvt_term::scr_E () NOTHROW
1376{ 1431{
1377 rend_t fs; 1432 rend_t fs;
1378 1433
1379 want_refresh = 1; 1434 want_refresh = 1;
1380 ZERO_SCROLLBACK (); 1435 ZERO_SCROLLBACK ();
1381 1436
1382 num_scr_allow = 0; 1437 num_scr_allow = 0;
1383 selection_check (3); 1438
1439 row_col_t pos;
1440 pos.row = pos.col = 0;
1441 if (ROWCOL_IS_AFTER (selection.end, pos))
1442 CLEAR_SELECTION ();
1384 1443
1385 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1444 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1386 for (int row = nrow; row--; ) 1445 for (int row = nrow; row--; )
1387 { 1446 {
1388 line_t &line = ROW(row); 1447 line_t &line = ROW(row);
… …
1433 * Insert/Delete <count> characters from the current position 1492 * Insert/Delete <count> characters from the current position
1434 */ 1493 */
1435void 1494void
1436rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1495rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1437{ 1496{
1438 int col, row;
1439 rend_t tr;
1440
1441 want_refresh = 1; 1497 want_refresh = 1;
1442 ZERO_SCROLLBACK (); 1498 ZERO_SCROLLBACK ();
1443 1499
1444 if (count <= 0) 1500 if (count <= 0)
1445 return; 1501 return;
… …
1447 scr_do_wrap (); 1503 scr_do_wrap ();
1448 1504
1449 selection_check (1); 1505 selection_check (1);
1450 min_it (count, ncol - screen.cur.col); 1506 min_it (count, ncol - screen.cur.col);
1451 1507
1452 row = screen.cur.row; 1508 int row = screen.cur.row;
1453 1509
1454 line_t *line = &ROW(row); 1510 line_t *line = &ROW(row);
1455 1511
1456 line->touch (); 1512 line->touch ();
1457 line->is_longer (0); 1513 line->is_longer (0);
1458 1514
1515 // nuke wide spanning the start
1516 if (line->t[screen.cur.col] == NOCHAR)
1517 scr_kill_char (*line, screen.cur.col);
1518
1459 switch (insdel) 1519 switch (insdel)
1460 { 1520 {
1461 case INSERT: 1521 case INSERT:
1462 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1522 line->l = min (line->l + count, ncol);
1523
1524 if (line->t[screen.cur.col] == NOCHAR)
1525 scr_kill_char (*line, screen.cur.col);
1526
1527 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1463 { 1528 {
1464 line->t[col] = line->t[col - count]; 1529 line->t[col] = line->t[col - count];
1465 line->r[col] = line->r[col - count]; 1530 line->r[col] = line->r[col - count];
1466 } 1531 }
1467
1468 line->l = min (line->l + count, ncol);
1469 1532
1470 if (selection.op && current_screen == selection.screen 1533 if (selection.op && current_screen == selection.screen
1471 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1534 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1472 { 1535 {
1473 if (selection.end.row != screen.cur.row 1536 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1537 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1538 CLEAR_SELECTION ();
1476 else 1539 else
1540 {
1477 { /* shift selection */ 1541 /* shift selection */
1478 selection.beg.col += count; 1542 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1543 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1544 selection.end.col += count;
1481 } 1545 }
1482 } 1546 }
… …
1487 case ERASE: 1551 case ERASE:
1488 screen.cur.col += count; /* don't worry if > ncol */ 1552 screen.cur.col += count; /* don't worry if > ncol */
1489 selection_check (1); 1553 selection_check (1);
1490 screen.cur.col -= count; 1554 screen.cur.col -= count;
1491 1555
1492 line->l = max (line->l - count, 0); 1556 // nuke wide char after the end
1557 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1558 scr_kill_char (*line, screen.cur.col + count);
1559
1493 scr_blank_line (*line, screen.cur.col, count, rstyle); 1560 scr_blank_line (*line, screen.cur.col, count, rstyle);
1494 break; 1561 break;
1495 1562
1496 case DELETE: 1563 case DELETE:
1497 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1564 line->l = max (line->l - count, 0);
1498 1565
1566 // nuke wide char spanning the end
1567 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1568 scr_kill_char (*line, screen.cur.col + count);
1569
1499 for (col = screen.cur.col; (col + count) < ncol; col++) 1570 for (int col = screen.cur.col; (col + count) < ncol; col++)
1500 { 1571 {
1501 line->t[col] = line->t[col + count]; 1572 line->t[col] = line->t[col + count];
1502 line->r[col] = line->r[col + count]; 1573 line->r[col] = line->r[col + count];
1503 } 1574 }
1504 1575
1505 line->l = max (line->l - count, 0);
1506 scr_blank_line (*line, ncol - count, count, tr); 1576 scr_blank_line (*line, ncol - count, count, rstyle);
1507 1577
1508 if (selection.op && current_screen == selection.screen 1578 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1579 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1580 {
1511 if (selection.end.row != screen.cur.row 1581 if (selection.end.row != screen.cur.row
… …
1528/* ------------------------------------------------------------------------- */ 1598/* ------------------------------------------------------------------------- */
1529/* 1599/*
1530 * Set the scrolling region 1600 * Set the scrolling region
1531 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1601 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1532 */ 1602 */
1533void 1603void ecb_cold
1534rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1604rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1535{ 1605{
1536 max_it (top, 0); 1606 max_it (top, 0);
1537 min_it (bot, nrow - 1); 1607 min_it (bot, nrow - 1);
1538 1608
… …
1548/* 1618/*
1549 * Make the cursor visible/invisible 1619 * Make the cursor visible/invisible
1550 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1620 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1551 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1621 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1552 */ 1622 */
1553void 1623void ecb_cold
1554rxvt_term::scr_cursor_visible (int mode) NOTHROW 1624rxvt_term::scr_cursor_visible (int mode) NOTHROW
1555{ 1625{
1556 want_refresh = 1; 1626 want_refresh = 1;
1557 1627
1558 if (mode) 1628 if (mode)
… …
1565/* 1635/*
1566 * Set/unset automatic wrapping 1636 * Set/unset automatic wrapping
1567 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1637 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1568 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1638 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1569 */ 1639 */
1570void 1640void ecb_cold
1571rxvt_term::scr_autowrap (int mode) NOTHROW 1641rxvt_term::scr_autowrap (int mode) NOTHROW
1572{ 1642{
1573 if (mode) 1643 if (mode)
1574 screen.flags |= Screen_Autowrap; 1644 screen.flags |= Screen_Autowrap;
1575 else 1645 else
… …
1584 * Relative mode: line numbers are relative to top margin of scrolling region 1654 * Relative mode: line numbers are relative to top margin of scrolling region
1585 * and the cursor cannot be moved outside. 1655 * and the cursor cannot be moved outside.
1586 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1656 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1587 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1657 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1588 */ 1658 */
1589void 1659void ecb_cold
1590rxvt_term::scr_relative_origin (int mode) NOTHROW 1660rxvt_term::scr_relative_origin (int mode) NOTHROW
1591{ 1661{
1592 if (mode) 1662 if (mode)
1593 screen.flags |= Screen_Relative; 1663 screen.flags |= Screen_Relative;
1594 else 1664 else
… …
1601/* 1671/*
1602 * Set insert/replace mode 1672 * Set insert/replace mode
1603 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1673 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1604 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1674 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1605 */ 1675 */
1606void 1676void ecb_cold
1607rxvt_term::scr_insert_mode (int mode) NOTHROW 1677rxvt_term::scr_insert_mode (int mode) NOTHROW
1608{ 1678{
1609 if (mode) 1679 if (mode)
1610 screen.flags |= Screen_Insert; 1680 screen.flags |= Screen_Insert;
1611 else 1681 else
… …
1617 * Set/Unset tabs 1687 * Set/Unset tabs
1618 * XTERM_SEQ: Set tab at current column : ESC H 1688 * XTERM_SEQ: Set tab at current column : ESC H
1619 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1689 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1620 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1690 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1621 */ 1691 */
1622void 1692void ecb_cold
1623rxvt_term::scr_set_tab (int mode) NOTHROW 1693rxvt_term::scr_set_tab (int mode) NOTHROW
1624{ 1694{
1625 if (mode < 0) 1695 if (mode < 0)
1626 memset (tabs, 0, ncol); 1696 memset (tabs, 0, ncol);
1627 else if (screen.cur.col < ncol) 1697 else if (screen.cur.col < ncol)
… …
1646 if (rvideo_state != on) 1716 if (rvideo_state != on)
1647 { 1717 {
1648 rvideo_state = on; 1718 rvideo_state = on;
1649 1719
1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1720 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1651#ifdef HAVE_BG_PIXMAP 1721#ifdef HAVE_IMG
1652 if (bgPixmap.pixmap == None) 1722 if (bg_img == 0)
1653#endif 1723#endif
1654 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1724 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1655 1725
1656 XGCValues gcvalue; 1726 XGCValues gcvalue;
1657 gcvalue.foreground = pix_colors[Color_fg]; 1727 gcvalue.foreground = pix_colors[Color_fg];
… …
1666/* ------------------------------------------------------------------------- */ 1736/* ------------------------------------------------------------------------- */
1667/* 1737/*
1668 * Report current cursor position 1738 * Report current cursor position
1669 * XTERM_SEQ: Report position: ESC [ 6 n 1739 * XTERM_SEQ: Report position: ESC [ 6 n
1670 */ 1740 */
1671void 1741void ecb_cold
1672rxvt_term::scr_report_position () NOTHROW 1742rxvt_term::scr_report_position () NOTHROW
1673{ 1743{
1674 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1744 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1675} 1745}
1676 1746
1677/* ------------------------------------------------------------------------- * 1747/* ------------------------------------------------------------------------- *
1678 * FONTS * 1748 * FONTS *
1679 * ------------------------------------------------------------------------- */ 1749 * ------------------------------------------------------------------------- */
1680 1750
1681/* 1751/*
1682 * Set font style 1752 * Set font style
1683 */ 1753 */
1684void 1754void ecb_cold
1685rxvt_term::set_font_style () NOTHROW 1755rxvt_term::set_font_style () NOTHROW
1686{ 1756{
1687#if 0 1757#if 0
1688 switch (charsets [screen.charset]) 1758 switch (charsets [screen.charset])
1689 { 1759 {
… …
1711 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1781 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1712 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1782 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1713 * XTERM_SEQ: Invoke G2 character set: ESC N 1783 * XTERM_SEQ: Invoke G2 character set: ESC N
1714 * XTERM_SEQ: Invoke G3 character set: ESC O 1784 * XTERM_SEQ: Invoke G3 character set: ESC O
1715 */ 1785 */
1716void 1786void ecb_cold
1717rxvt_term::scr_charset_choose (int set) NOTHROW 1787rxvt_term::scr_charset_choose (int set) NOTHROW
1718{ 1788{
1719 screen.charset = set; 1789 screen.charset = set;
1720 set_font_style (); 1790 set_font_style ();
1721} 1791}
… …
1734{ 1804{
1735 charsets[set] = (unsigned char)ch; 1805 charsets[set] = (unsigned char)ch;
1736 set_font_style (); 1806 set_font_style ();
1737} 1807}
1738 1808
1739 1809
1740/* ------------------------------------------------------------------------- * 1810/* ------------------------------------------------------------------------- *
1741 * MAJOR SCREEN MANIPULATION * 1811 * MAJOR SCREEN MANIPULATION *
1742 * ------------------------------------------------------------------------- */ 1812 * ------------------------------------------------------------------------- */
1743 1813
1744/* 1814/*
1745 * refresh matching text. 1815 * refresh matching text.
1746 */ 1816 */
1747bool 1817bool ecb_cold
1748rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1818rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1749{ 1819{
1750 bool found = false; 1820 bool found = false;
1751 1821
1752 for (int i = 0; i < nrow; i++) 1822 for (int i = 0; i < nrow; i++)
… …
1771 PART_BEG = 0, 1841 PART_BEG = 0,
1772 PART_END, 1842 PART_END,
1773 RC_COUNT 1843 RC_COUNT
1774}; 1844};
1775 1845
1776void 1846void ecb_hot
1777rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1847rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1778{ 1848{
1779 int i; 1849 int i;
1780 row_col_t rc[RC_COUNT]; 1850 row_col_t rc[RC_COUNT];
1781 1851
… …
1801 for (i = PART_BEG; i < RC_COUNT; i++) 1871 for (i = PART_BEG; i < RC_COUNT; i++)
1802 { 1872 {
1803 min_it (rc[i].col, ncol - 1); 1873 min_it (rc[i].col, ncol - 1);
1804 min_it (rc[i].row, nrow - 1); 1874 min_it (rc[i].row, nrow - 1);
1805 } 1875 }
1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1876
1807 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1877 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1808 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1878 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1809 1879
1810 num_scr_allow = 0; 1880 num_scr_allow = 0;
1811 1881
… …
1818 * Refresh the entire screen 1888 * Refresh the entire screen
1819 */ 1889 */
1820void 1890void
1821rxvt_term::scr_touch (bool refresh) NOTHROW 1891rxvt_term::scr_touch (bool refresh) NOTHROW
1822{ 1892{
1823 scr_expose (0, 0, width, height, refresh); 1893 scr_expose (0, 0, vt_width, vt_height, refresh);
1824} 1894}
1825 1895
1826/* ------------------------------------------------------------------------- */ 1896/* ------------------------------------------------------------------------- */
1827/* 1897/*
1828 * Move the display so that the line represented by scrollbar value Y is at 1898 * Move the display so that the line represented by scrollbar value Y is at
… …
1866 return true; 1936 return true;
1867} 1937}
1868 1938
1869#ifndef NO_BELL 1939#ifndef NO_BELL
1870void 1940void
1871rxvt_term::bell_cb (time_watcher &w) 1941rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1942{
1873 rvideo_bell = false; 1943 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1944 scr_rvideo_mode (rvideo_mode);
1945 refresh_check ();
1875} 1946}
1876#endif 1947#endif
1877 1948
1878/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1879void 1950void
… …
1883 1954
1884# ifndef NO_MAPALERT 1955# ifndef NO_MAPALERT
1885# ifdef MAPALERT_OPTION 1956# ifdef MAPALERT_OPTION
1886 if (option (Opt_mapAlert)) 1957 if (option (Opt_mapAlert))
1887# endif 1958# endif
1888 XMapWindow (dpy, parent[0]); 1959 XMapWindow (dpy, parent);
1889# endif 1960# endif
1890 1961
1891# if ENABLE_FRILLS 1962# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell)) 1963 if (option (Opt_urgentOnBell))
1893 { 1964 set_urgency (1);
1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1895 {
1896 h->flags |= XUrgencyHint;
1897 XSetWMHints (dpy, parent[0], h);
1898 }
1899 }
1900# endif 1965# endif
1901 1966
1902 if (option (Opt_visualBell)) 1967 if (option (Opt_visualBell))
1903 { 1968 {
1904 rvideo_bell = true; 1969 rvideo_bell = true;
1905 scr_rvideo_mode (rvideo_mode); 1970 scr_rvideo_mode (rvideo_mode);
1906 display->flush (); 1971 flush ();
1907 1972
1908 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1973 bell_ev.start (VISUAL_BELL_DURATION);
1909 } 1974 }
1910 else 1975 else
1911 XBell (dpy, 0); 1976 XBell (dpy, 0);
1977 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1912#endif 1978#endif
1913} 1979}
1914 1980
1915/* ------------------------------------------------------------------------- */ 1981/* ------------------------------------------------------------------------- */
1916/* ARGSUSED */ 1982void ecb_cold
1917void
1918rxvt_term::scr_printscreen (int fullhist) NOTHROW 1983rxvt_term::scr_printscreen (int fullhist) NOTHROW
1919{ 1984{
1920#ifdef PRINTPIPE 1985#ifdef PRINTPIPE
1921 int nrows, row_start; 1986 int nrows, row_start;
1922 FILE *fd; 1987 FILE *fd = popen_printer ();
1923 1988
1924 if ((fd = popen_printer ()) == NULL) 1989 if (!fd)
1925 return; 1990 return;
1926 1991
1927 if (fullhist) 1992 if (fullhist)
1928 { 1993 {
1929 nrows = nrow - top_row; 1994 nrows = nrow - top_row;
… …
1935 row_start = view_start; 2000 row_start = view_start;
1936 } 2001 }
1937 2002
1938 wctomb (0, 0); 2003 wctomb (0, 0);
1939 2004
1940 for (int r1 = 0; r1 < nrows; r1++) 2005 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1941 { 2006 {
1942 text_t *tp = ROW(r1).t; 2007 text_t *tp = ROW(r1).t;
1943 int len = ROW(r1).l; 2008 int len = ROW(r1).l;
1944 2009
1945 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2010 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1971/* 2036/*
1972 * Refresh the screen 2037 * Refresh the screen
1973 * drawn_text/drawn_rend contain the screen information before the update. 2038 * drawn_text/drawn_rend contain the screen information before the update.
1974 * screen.text/screen.rend contain what the screen will change to. 2039 * screen.text/screen.rend contain what the screen will change to.
1975 */ 2040 */
1976void 2041void ecb_hot
1977rxvt_term::scr_refresh () NOTHROW 2042rxvt_term::scr_refresh () NOTHROW
1978{ 2043{
1979 unsigned char have_bg,
1980 showcursor; /* show the cursor */
1981 int16_t col, row, /* column/row we're processing */ 2044 int16_t col, row, /* column/row we're processing */
1982 ocrow; /* old cursor row */ 2045 ocrow; /* old cursor row */
1983 int i; /* tmp */ 2046 int i; /* tmp */
1984#ifndef NO_CURSORCOLOR
1985 rend_t cc1; /* store colours at cursor position (s) */
1986#endif
1987 rend_t *crp; // cursor rendition pointer
1988 rend_t ccol1, /* Cursor colour */ 2047 rend_t ccol1, /* Cursor colour */
1989 ccol2; /* Cursor colour2 */ 2048 ccol2; /* Cursor colour2 */
2049 rend_t cur_rend;
2050 int cur_col;
1990 2051
1991 want_refresh = 0; /* screen is current */ 2052 want_refresh = 0; /* screen is current */
1992 2053
1993 if (refresh_type == NO_REFRESH || !mapped) 2054 if (refresh_type == NO_REFRESH || !mapped)
1994 return; 2055 return;
1995 2056
1996 /* 2057 /*
1997 * A: set up vars 2058 * A: set up vars
1998 */ 2059 */
1999 have_bg = 0;
2000 refresh_count = 0; 2060 refresh_count = 0;
2001 2061
2002#ifdef HAVE_BG_PIXMAP 2062 unsigned int old_screen_flags = screen.flags;
2003 have_bg |= bgPixmap.pixmap != None; 2063 bool have_bg = 0;
2064#ifdef HAVE_IMG
2065 have_bg = bg_img != 0;
2004#endif 2066#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2067 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2068
2007 /* 2069 /*
2008 * B: reverse any characters which are selected 2070 * B: reverse any characters which are selected
2009 */ 2071 */
2010 scr_reverse_selection (); 2072 scr_reverse_selection ();
2011 2073
2074 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2075#if ENABLE_OVERLAY
2076 scr_swap_overlay ();
2077#endif
2078
2079 bool showcursor = screen.flags & Screen_VisibleCursor;
2080
2012 /* 2081 /*
2013 * C: set the cursor character (s) 2082 * C: set the cursor character (s)
2014 */ 2083 */
2015 { 2084 {
2016 unsigned char setoldcursor; 2085 bool setoldcursor;
2017 2086
2018 showcursor = (screen.flags & Screen_VisibleCursor);
2019#ifdef CURSOR_BLINK 2087#ifdef CURSOR_BLINK
2020 if (hidden_cursor) 2088 if (hidden_cursor)
2021 showcursor = 0; 2089 showcursor = 0;
2022#endif 2090#endif
2023 2091
… …
2026 int col = screen.cur.col; 2094 int col = screen.cur.col;
2027 2095
2028 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2096 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2029 col--; 2097 col--;
2030 2098
2031 crp = &ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col;
2032 2101
2033#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
2034 cc1 = *crp & (RS_fgMask | RS_bgMask);
2035 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2036 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2037 else 2105 else
2038#endif 2106#endif
2039#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2051 ccol2 = bgcolor_of (rstyle); 2119 ccol2 = bgcolor_of (rstyle);
2052#else 2120#else
2053 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2054#endif 2122#endif
2055 2123
2056 if (showcursor && focus) 2124 if (focus)
2057 { 2125 {
2126 rend_t rend = cur_rend;
2127
2058 if (option (Opt_cursorUnderline)) 2128 if (option (Opt_cursorUnderline))
2059 *crp ^= RS_Uline; 2129 rend ^= RS_Uline;
2060 else 2130 else
2061 { 2131 {
2062 *crp ^= RS_RVid; 2132 rend ^= RS_RVid;
2063 *crp = SET_FGCOLOR (*crp, ccol1); 2133 rend = SET_FGCOLOR (rend, ccol1);
2064 *crp = SET_BGCOLOR (*crp, ccol2); 2134 rend = SET_BGCOLOR (rend, ccol2);
2065 } 2135 }
2136
2137 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2066 } 2138 }
2067 } 2139 }
2068 2140
2069 /* make sure no outline cursor is left around */ 2141 /* make sure no outline cursor is left around */
2070 setoldcursor = 0; 2142 setoldcursor = 0;
… …
2096 oldcursor.col = screen.cur.col; 2168 oldcursor.col = screen.cur.col;
2097 } 2169 }
2098 } 2170 }
2099 } 2171 }
2100 2172
2101 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2102#if ENABLE_OVERLAY
2103 scr_swap_overlay ();
2104#endif
2105
2106#ifndef NO_SLOW_LINK_SUPPORT 2173#ifndef NO_SLOW_LINK_SUPPORT
2107 /* 2174 /*
2108 * D: CopyArea pass - very useful for slower links 2175 * D: CopyArea pass - very useful for slower links
2109 * This has been deliberately kept simple. 2176 * This has been deliberately kept simple.
2110 */ 2177 */
… …
2114 { 2181 {
2115 int16_t nits; 2182 int16_t nits;
2116 int i = num_scr; 2183 int i = num_scr;
2117 int j; 2184 int j;
2118 int len, wlen; 2185 int len, wlen;
2119 dLocal (int, num_scr);
2120 2186
2121 j = nrow; 2187 j = nrow;
2122 wlen = len = -1; 2188 wlen = len = -1;
2123 row = i > 0 ? 0 : j - 1; 2189 row = i > 0 ? 0 : j - 1;
2124 2190
… …
2199 continue; 2265 continue;
2200 2266
2201 // redraw one or more characters 2267 // redraw one or more characters
2202 2268
2203 // seek to the beginning of wide characters 2269 // seek to the beginning of wide characters
2204 while (stp[col] == NOCHAR && col > 0) 2270 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2205 --col; 2271 --col;
2206 2272
2207 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2273 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2208 text_t *text = stp + col; 2274 text_t *text = stp + col;
2209 int count = 1; 2275 int count = 1;
2210 2276
2211 dtp[col] = stp[col]; 2277 dtp[col] = stp[col];
2212 drp[col] = rend; 2278 drp[col] = rend;
… …
2216 for (i = 0; ++col < ncol; ) 2282 for (i = 0; ++col < ncol; )
2217 { 2283 {
2218 if (stp[col] == NOCHAR) 2284 if (stp[col] == NOCHAR)
2219 { 2285 {
2220 dtp[col] = stp[col]; 2286 dtp[col] = stp[col];
2221 drp[col] = rend; 2287 drp[col] = srp[col];
2288
2222 count++; 2289 count++;
2223 i++; 2290 i++;
2224 2291
2225 continue; 2292 continue;
2226 } 2293 }
… …
2246 2313
2247 col--; /* went one too far. move back */ 2314 col--; /* went one too far. move back */
2248 count -= i; /* dump any matching trailing chars */ 2315 count -= i; /* dump any matching trailing chars */
2249 2316
2250 // sometimes we optimize away the trailing NOCHAR's, add them back 2317 // sometimes we optimize away the trailing NOCHAR's, add them back
2251 while (i && text[count] == NOCHAR) 2318 while (ecb_unlikely (i && text[count] == NOCHAR))
2252 count++, i--; 2319 count++, i--;
2253 2320
2254 /* 2321 /*
2255 * Determine the attributes for the string 2322 * Determine the attributes for the string
2256 */ 2323 */
2257 int fore = fgcolor_of (rend); // desired foreground 2324 int fore = fgcolor_of (rend); // desired foreground
2258 int back = bgcolor_of (rend); // desired background 2325 int back = bgcolor_of (rend); // desired background
2259 2326
2260 // only do special processing if any attributes are set, which is unlikely 2327 // only do special processing if any attributes are set, which is unlikely
2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2328 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2262 { 2329 {
2263 bool invert = rend & RS_RVid; 2330 bool invert = rend & RS_RVid;
2264 2331
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2332#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold
2267 && fore == Color_fg) 2333 if (rend & RS_Bold && fore == Color_fg)
2268 { 2334 {
2269 if (ISSET_PIXCOLOR (Color_BD)) 2335 if (ISSET_PIXCOLOR (Color_BD))
2270 fore = Color_BD; 2336 fore = Color_BD;
2271# if !ENABLE_STYLES 2337# if !ENABLE_STYLES
2272 else 2338 else
2273 invert = !invert; 2339 invert = !invert;
2274# endif 2340# endif
2275 } 2341 }
2276 2342
2277 if (rend & RS_Italic 2343 if (rend & RS_Italic && fore == Color_fg)
2278 && fore == Color_fg)
2279 { 2344 {
2280 if (ISSET_PIXCOLOR (Color_IT)) 2345 if (ISSET_PIXCOLOR (Color_IT))
2281 fore = Color_IT; 2346 fore = Color_IT;
2282# if !ENABLE_STYLES 2347# if !ENABLE_STYLES
2283 else 2348 else
… …
2287 2352
2288 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2353 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2289 fore = Color_UL; 2354 fore = Color_UL;
2290#endif 2355#endif
2291 2356
2357#ifdef OPTION_HC
2358 if (rend & RS_Sel)
2359 {
2360 /* invert the column if no highlightColor is set or it is the
2361 * current cursor column */
2362 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2363 && ISSET_PIXCOLOR (Color_HC))
2364 {
2365 if (ISSET_PIXCOLOR (Color_HTC))
2366 fore = Color_HTC;
2367 // if invert is 0 reverse video is set so we use bg color as fg color
2368 else if (!invert)
2369 fore = back;
2370
2371 back = Color_HC;
2372 invert = 0;
2373 }
2374 }
2375#endif
2376
2292 if (invert) 2377 if (invert)
2293 { 2378 {
2294#ifdef OPTION_HC
2295 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2296 || !ISSET_PIXCOLOR (Color_HC))
2297#endif
2298 /* invert the column if no highlightColor is set or it is the
2299 * current cursor column */
2300 ::swap (fore, back); 2379 ::swap (fore, back);
2301#ifdef OPTION_HC
2302 else if (ISSET_PIXCOLOR (Color_HC))
2303 back = Color_HC;
2304#endif
2305 2380
2306#ifndef NO_BOLD_UNDERLINE_REVERSE 2381#ifndef NO_BOLD_UNDERLINE_REVERSE
2307# ifndef OPTION_HC
2308 if (ISSET_PIXCOLOR (Color_RV))
2309 back = Color_RV;
2310# endif
2311 if (fore == back) 2382 if (fore == back)
2312 { 2383 {
2313 fore = Color_bg; 2384 fore = Color_bg;
2314 back = Color_fg; 2385 back = Color_fg;
2315 } 2386 }
… …
2317 } 2388 }
2318 2389
2319#ifdef TEXT_BLINK 2390#ifdef TEXT_BLINK
2320 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2391 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2321 { 2392 {
2322 if (!text_blink_ev.active) 2393 if (!text_blink_ev.is_active ())
2323 { 2394 {
2324 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2395 text_blink_ev.again ();
2325 hidden_text = 0; 2396 hidden_text = 0;
2326 } 2397 }
2327 else if (hidden_text) 2398 else if (hidden_text)
2328 fore = back; 2399 fore = back;
2329 } 2400 }
… …
2351 /* 2422 /*
2352 * Actually do the drawing of the string here 2423 * Actually do the drawing of the string here
2353 */ 2424 */
2354 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2425 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2355 2426
2356 if (have_bg && back == Color_bg) 2427 if (ecb_likely (have_bg && back == Color_bg))
2357 { 2428 {
2358 // this is very ugly, maybe push it into ->draw? 2429 // this is very ugly, maybe push it into ->draw?
2359 2430
2360 for (i = 0; i < count; i++) /* don't draw empty strings */ 2431 for (i = 0; i < count; i++) /* don't draw empty strings */
2361 if (text[i] != ' ') 2432 if (text[i] != ' ')
… …
2368 did_clear: ; 2439 did_clear: ;
2369 } 2440 }
2370 else 2441 else
2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2442 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2372 2443
2373 if (rend & RS_Uline && font->descent > 1 && fore != back) 2444 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2374 { 2445 {
2375#if ENABLE_FRILLS 2446#if ENABLE_FRILLS
2376 if (ISSET_PIXCOLOR (Color_underline)) 2447 if (ISSET_PIXCOLOR (Color_underline))
2377 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2448 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2378 else 2449 else
2379#endif 2450#endif
2380 XSetForeground (dpy, gc, pix_colors[fore]); 2451 XSetForeground (dpy, gc, pix_colors[fore]);
2381 2452
2382 XDrawLine (dpy, drawBuffer, gc, 2453 XDrawLine (dpy, vt, gc,
2383 xpixel, ypixel + font->ascent + 1, 2454 xpixel, ypixel + font->ascent + 1,
2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2455 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2385 } 2456 }
2386 } /* for (col....) */ 2457 } /* for (col....) */
2387 } /* for (row....) */ 2458 } /* for (row....) */
2388 2459
2389#if ENABLE_OVERLAY
2390 scr_swap_overlay ();
2391#endif
2392 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2393
2394 /* 2460 /*
2395 * G: cleanup cursor and display outline cursor if necessary 2461 * G: cleanup cursor and display outline cursor if necessary
2396 */ 2462 */
2397 if (showcursor) 2463 if (showcursor)
2398 { 2464 {
2399 if (focus) 2465 if (focus)
2400 { 2466 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2401 if (option (Opt_cursorUnderline))
2402 *crp ^= RS_Uline;
2403 else
2404 {
2405 *crp ^= RS_RVid;
2406#ifndef NO_CURSORCOLOR
2407 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2408#endif
2409 }
2410 }
2411 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2412 { 2468 {
2413 int cursorwidth = 1; 2469 int cursorwidth = 1;
2414 int col = oldcursor.col; 2470 int col = oldcursor.col;
2415 2471
… …
2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2481 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else 2482 else
2427#endif 2483#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]); 2484 XSetForeground (dpy, gc, pix_colors[ccol1]);
2429 2485
2430 XDrawRectangle (dpy, drawBuffer, gc, 2486 XDrawRectangle (dpy, vt, gc,
2431 Col2Pixel (col), 2487 Col2Pixel (col),
2432 Row2Pixel (oldcursor.row), 2488 Row2Pixel (oldcursor.row),
2433 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2489 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2490 (unsigned int) (Height2Pixel (1) - 1));
2435 } 2491 }
2436 } 2492 }
2437 2493
2438 /* 2494 /*
2439 * H: cleanup selection 2495 * H: cleanup selection
2440 */ 2496 */
2497#if ENABLE_OVERLAY
2498 scr_swap_overlay ();
2499#endif
2500 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2501
2441 scr_reverse_selection (); 2502 scr_reverse_selection ();
2442 2503
2504 screen.flags = old_screen_flags;
2443 num_scr = 0; 2505 num_scr = 0;
2444 num_scr_allow = 1; 2506 num_scr_allow = 1;
2445} 2507}
2446 2508
2447void 2509void ecb_cold
2448rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2510rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2449{ 2511{
2450 if (!l.t) 2512 if (!l.valid ())
2451 return; 2513 return;
2452 2514
2453 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2515 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2454 2516
2455 for (int i = ncol; i--; ) 2517 for (int i = ncol; i--; )
2456 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2518 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2457} 2519}
2458 2520
2459void 2521void ecb_cold
2460rxvt_term::scr_remap_chars () NOTHROW 2522rxvt_term::scr_remap_chars () NOTHROW
2461{ 2523{
2462 for (int i = total_rows; i--; ) 2524 for (int i = total_rows; i--; )
2463 scr_remap_chars (row_buf [i]); 2525 scr_remap_chars (row_buf [i]);
2464 2526
… …
2467 scr_remap_chars (drawn_buf [i]); 2529 scr_remap_chars (drawn_buf [i]);
2468 scr_remap_chars (swap_buf [i]); 2530 scr_remap_chars (swap_buf [i]);
2469 } 2531 }
2470} 2532}
2471 2533
2472void 2534void ecb_cold
2473rxvt_term::scr_recolour () NOTHROW 2535rxvt_term::scr_recolour (bool refresh) NOTHROW
2474{ 2536{
2475#ifdef HAVE_BG_PIXMAP 2537 bool transparent = false;
2476 bgPixmap.apply (); 2538
2477#else 2539#ifdef HAVE_IMG
2540 if (bg_img != 0)
2541 {
2542# if ENABLE_TRANSPARENCY
2543 if (bg_flags & BG_IS_TRANSPARENT)
2544 {
2545 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2546 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2547
2548 transparent = true;
2549 }
2550 else
2551# endif
2552 {
2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2554 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2555 }
2556 }
2557 else
2558#endif
2559 {
2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2560 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2479 XClearWindow (dpy, parent[0]);
2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2561 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2481# if HAVE_SCROLLBARS 2562 }
2563
2564 XClearWindow (dpy, parent);
2565
2482 if (scrollBar.win) 2566 if (scrollBar.win)
2483 { 2567 {
2568 if (transparent)
2569 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2570 else
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2571 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2485 scrollBar.setIdle (); 2572 scrollBar.state = SB_STATE_IDLE;
2486 scrollbar_show (0); 2573 scrollBar.show (0);
2487 } 2574 }
2488# endif 2575
2576 if (refresh)
2577 {
2489 scr_clear (); 2578 scr_clear ();
2490 scr_touch (true); 2579 scr_touch (true);
2580 }
2491 want_refresh = 1; 2581 want_refresh = 1;
2492#endif
2493
2494} 2582}
2495 2583
2496/* ------------------------------------------------------------------------- */ 2584/* ------------------------------------------------------------------------- */
2497void 2585void
2498rxvt_term::scr_clear (bool really) NOTHROW 2586rxvt_term::scr_clear (bool really) NOTHROW
… …
2554 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2642 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2555 srp[col] ^= rstyle; 2643 srp[col] ^= rstyle;
2556} 2644}
2557 2645
2558/* ------------------------------------------------------------------------- */ 2646/* ------------------------------------------------------------------------- */
2559void 2647void ecb_hot
2560rxvt_term::scr_reverse_selection () NOTHROW 2648rxvt_term::scr_reverse_selection () NOTHROW
2561{ 2649{
2562 if (selection.op 2650 if (selection.op
2563 && current_screen == selection.screen 2651 && current_screen == selection.screen
2564 && selection.end.row >= view_start) 2652 && selection.end.row >= view_start)
2565 { 2653 {
2566#if !ENABLE_MINIMAL 2654#if !ENABLE_MINIMAL
2567 if (selection.rect) 2655 if (selection.rect)
2568 scr_xor_rect (selection.beg.row, selection.beg.col, 2656 scr_xor_rect (selection.beg.row, selection.beg.col,
2569 selection.end.row, selection.end.col, 2657 selection.end.row, selection.end.col,
2570 RS_RVid, RS_RVid | RS_Uline); 2658 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2571 else 2659 else
2572#endif 2660#endif
2573 scr_xor_span (selection.beg.row, selection.beg.col, 2661 scr_xor_span (selection.beg.row, selection.beg.col,
2574 selection.end.row, selection.end.col, 2662 selection.end.row, selection.end.col,
2575 RS_RVid); 2663 RS_Sel | RS_RVid);
2576 } 2664 }
2577} 2665}
2578 2666
2579/* ------------------------------------------------------------------------- */ 2667/* ------------------------------------------------------------------------- */
2580/* 2668/*
… …
2583 */ 2671 */
2584#if 0 2672#if 0
2585void 2673void
2586rxvt_term::scr_dump (int fd) NOTHROW 2674rxvt_term::scr_dump (int fd) NOTHROW
2587{ 2675{
2588 int row, wrote; 2676 // if this method is needed, it can be implemented by factoring the
2589 unsigned int width, towrite; 2677 // relevant code in scr_printscreen
2590 char r1[] = "\n";
2591
2592 for (row = saveLines - nsaved;
2593 row < saveLines + nrow - 1; row++)
2594 {
2595 width = row_buf[row].l >= 0 ? row_buf[row].l
2596 : ncol;
2597 for (towrite = width; towrite; towrite -= wrote)
2598 {
2599 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2600 towrite);
2601 if (wrote < 0)
2602 return; /* XXX: death, no report */
2603 }
2604 if (row_buf[row].l >= 0)
2605 if (write (fd, r1, 1) <= 0)
2606 return; /* XXX: death, no report */
2607 }
2608} 2678}
2609#endif 2679#endif
2610 2680
2611/* ------------------------------------------------------------------------- * 2681/* ------------------------------------------------------------------------- *
2612 * CHARACTER SELECTION * 2682 * CHARACTER SELECTION *
2613 * ------------------------------------------------------------------------- */ 2683 * ------------------------------------------------------------------------- */
2614void 2684void
2615rxvt_term::selection_check (int check_more) NOTHROW 2685rxvt_term::selection_check (int check_more) NOTHROW
2616{ 2686{
2617 row_col_t pos;
2618
2619 if (!selection.op) 2687 if (!selection.op)
2620 return; 2688 return;
2621 2689
2622 pos.row = pos.col = 0;
2623 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2690 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2624 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2625 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2692 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2626 || (check_more == 1 2693 || (check_more == 1
2627 && current_screen == selection.screen 2694 && current_screen == selection.screen
2628 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2695 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2629 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2696 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2630 || (check_more == 2
2631 && ROWCOL_IS_BEFORE (selection.beg, pos)
2632 && ROWCOL_IS_AFTER (selection.end, pos))
2633 || (check_more == 3
2634 && ROWCOL_IS_AFTER (selection.end, pos))
2635 || (check_more == 4 /* screen width change */
2636 && (selection.beg.row != selection.end.row
2637 || selection.end.col > ncol)))
2638 CLEAR_SELECTION (); 2697 CLEAR_ALL_SELECTION ();
2639} 2698}
2640 2699
2641/* ------------------------------------------------------------------------- */ 2700/* ------------------------------------------------------------------------- */
2642/* 2701/*
2643 * Paste a selection direct to the command fd 2702 * Paste a selection direct to the command fd
2644 */ 2703 */
2645void 2704void
2646rxvt_term::paste (char *data, unsigned int len) NOTHROW 2705rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2647{ 2706{
2648 /* convert normal newline chars into common keyboard Return key sequence */ 2707 /* convert normal newline chars into common keyboard Return key sequence */
2649 for (unsigned int i = 0; i < len; i++) 2708 for (unsigned int i = 0; i < len; i++)
2650 if (data[i] == C0_LF) 2709 if (data[i] == C0_LF)
2651 data[i] = C0_CR; 2710 data[i] = C0_CR;
2652 2711
2712 if (priv_modes & PrivMode_BracketPaste)
2713 tt_printf ("\x1b[200~");
2714
2653 tt_write (data, len); 2715 tt_write (data, len);
2654}
2655 2716
2656/* ------------------------------------------------------------------------- */ 2717 if (priv_modes & PrivMode_BracketPaste)
2657/* 2718 tt_printf ("\x1b[201~");
2658 * Respond to a notification that a primary selection has been sent
2659 * EXT: SelectionNotify
2660 */
2661void
2662rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2663{
2664 if (prop == None) /* check for failed XConvertSelection */
2665 {
2666 if ((selection_type & Sel_CompoundText))
2667 {
2668 int selnum = selection_type & Sel_whereMask;
2669
2670 selection_type = 0;
2671 if (selnum != Sel_direct)
2672 selection_request_other (XA_STRING, selnum);
2673 }
2674
2675 if ((selection_type & Sel_UTF8String))
2676 {
2677 int selnum = selection_type & Sel_whereMask;
2678
2679 selection_type = Sel_CompoundText;
2680 if (selnum != Sel_direct)
2681 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2682 else
2683 selection_type = 0;
2684 }
2685
2686 return;
2687 }
2688
2689 unsigned long bytes_after;
2690 XTextProperty ct;
2691
2692 if (XGetWindowProperty (dpy, win, prop,
2693 0, PROP_SIZE / 4,
2694 delete_prop, AnyPropertyType,
2695 &ct.encoding, &ct.format,
2696 &ct.nitems, &bytes_after,
2697 &ct.value) != Success)
2698 {
2699 ct.value = 0;
2700 goto bailout;
2701 }
2702
2703 if (ct.encoding == None)
2704 goto bailout;
2705
2706 if (bytes_after)
2707 {
2708 // fetch and append remaining data
2709 XTextProperty ct2;
2710
2711 if (XGetWindowProperty (dpy, win, prop,
2712 ct.nitems / 4, (bytes_after + 3) / 4,
2713 delete_prop, AnyPropertyType,
2714 &ct2.encoding, &ct2.format,
2715 &ct2.nitems, &bytes_after,
2716 &ct2.value) != Success)
2717 goto bailout;
2718
2719 // realloc should be compatible to XFree, here, and elsewhere, too
2720 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2721 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2722 ct.nitems += ct2.nitems;
2723
2724 XFree (ct2.value);
2725 }
2726
2727 if (ct.value == 0)
2728 goto bailout;
2729
2730 if (ct.encoding == xa[XA_INCR])
2731 {
2732 // INCR selection, start handshake
2733 if (!delete_prop)
2734 XDeleteProperty (dpy, win, prop);
2735
2736 selection_wait = Sel_incr;
2737 incr_buf_fill = 0;
2738 incr_ev.start (NOW + 10);
2739
2740 goto bailout;
2741 }
2742
2743 if (ct.nitems == 0)
2744 {
2745 if (selection_wait == Sel_incr)
2746 {
2747 XFree (ct.value);
2748
2749 // finally complete, now paste the whole thing
2750 selection_wait = Sel_normal;
2751 ct.value = (unsigned char *)incr_buf;
2752 ct.nitems = incr_buf_fill;
2753 incr_buf = 0;
2754 incr_buf_size = 0;
2755 incr_ev.stop ();
2756 }
2757 else
2758 {
2759 if (selection_wait == Sel_normal
2760 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2761 {
2762 /*
2763 * pass through again trying CUT_BUFFER0 if we've come from
2764 * XConvertSelection () but nothing was presented
2765 */
2766 selection_paste (display->root, XA_CUT_BUFFER0, False);
2767 }
2768
2769 goto bailout;
2770 }
2771 }
2772 else if (selection_wait == Sel_incr)
2773 {
2774 incr_ev.start (NOW + 10);
2775
2776 while (incr_buf_fill + ct.nitems > incr_buf_size)
2777 {
2778 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2779 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2780 }
2781
2782 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2783 incr_buf_fill += ct.nitems;
2784
2785 goto bailout;
2786 }
2787
2788 char **cl;
2789 int cr;
2790
2791#if !ENABLE_MINIMAL
2792 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2793 // so recode it manually
2794 if (ct.encoding == xa[XA_UTF8_STRING])
2795 {
2796 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2797 char *s = rxvt_wcstombs (w);
2798 free (w);
2799 // TODO: strlen == only the first element will be converted. well...
2800 paste (s, strlen (s));
2801 free (s);
2802 }
2803 else
2804#endif
2805 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2806 && cl)
2807 {
2808 for (int i = 0; i < cr; i++)
2809 paste (cl[i], strlen (cl[i]));
2810
2811 XFreeStringList (cl);
2812 }
2813 else
2814 paste ((char *)ct.value, ct.nitems); // paste raw
2815
2816bailout:
2817 XFree (ct.value);
2818
2819 if (selection_wait == Sel_normal)
2820 selection_wait = Sel_none;
2821} 2719}
2822 2720
2823void 2721void
2824rxvt_term::incr_cb (time_watcher &w) NOTHROW 2722rxvt_term::paste (char *data, unsigned int len) NOTHROW
2825{ 2723{
2826 selection_wait = Sel_none; 2724 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2827
2828 incr_buf_size = 0;
2829 free (incr_buf);
2830
2831 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2832}
2833
2834void
2835rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2836{
2837 if (prop == None || selection_wait != Sel_incr)
2838 return; 2725 return;
2839 2726
2840 selection_paste (win, prop, true); 2727 tt_paste (data, len);
2841} 2728}
2842 2729
2843/* ------------------------------------------------------------------------- */ 2730/* ------------------------------------------------------------------------- */
2844/* 2731/*
2845 * Request the current selection: 2732 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2846 * Order: > internal selection if available 2733 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2847 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2734 * as fallback
2848 * > CUT_BUFFER0
2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2850 * will auto fallback to CUT_BUFFER0
2851 * EXT: button 2 release 2735 * EXT: button 2 release
2852 */ 2736 */
2853void 2737void
2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2738rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2855{ 2739{
2856 if (selection.text && selnum == Sel_Primary) 2740 if (!selection_req)
2857 { /* internal selection */
2858 char *str = rxvt_wcstombs (selection.text, selection.len);
2859 paste (str, strlen (str));
2860 free (str);
2861 return;
2862 } 2741 {
2863 else 2742 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2743 selection_req->run ();
2864 { 2744 }
2865 selection_request_time = tm;
2866 selection_wait = Sel_normal;
2867
2868#if X_HAVE_UTF8_STRING
2869 selection_type = Sel_UTF8String;
2870 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2871 return;
2872#else
2873 selection_type = Sel_CompoundText;
2874 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2875 return;
2876#endif
2877 }
2878
2879 selection_wait = Sel_none; /* don't loop in selection_paste () */
2880 selection_paste (display->root, XA_CUT_BUFFER0, false);
2881}
2882
2883int
2884rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2885{
2886 Atom sel;
2887
2888 selection_type |= selnum;
2889
2890 if (selnum == Sel_Primary)
2891 sel = XA_PRIMARY;
2892 else if (selnum == Sel_Secondary)
2893 sel = XA_SECONDARY;
2894 else
2895 sel = xa[XA_CLIPBOARD];
2896
2897 if (XGetSelectionOwner (dpy, sel) != None)
2898 {
2899 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2900 vt, selection_request_time);
2901 return 1;
2902 }
2903
2904 return 0;
2905} 2745}
2906 2746
2907/* ------------------------------------------------------------------------- */ 2747/* ------------------------------------------------------------------------- */
2908/* 2748/*
2909 * Clear all selected text 2749 * Clear all selected text
2910 * EXT: SelectionClear 2750 * EXT: SelectionClear
2911 */ 2751 */
2912void 2752void
2913rxvt_term::selection_clear () NOTHROW 2753rxvt_term::selection_clear (bool clipboard) NOTHROW
2914{ 2754{
2755 if (!clipboard)
2756 {
2915 want_refresh = 1; 2757 want_refresh = 1;
2916 free (selection.text); 2758 free (selection.text);
2917 selection.text = NULL; 2759 selection.text = NULL;
2918 selection.len = 0; 2760 selection.len = 0;
2919 CLEAR_SELECTION (); 2761 CLEAR_SELECTION ();
2920 2762
2921 if (display->selection_owner == this) 2763 if (display->selection_owner == this)
2922 display->selection_owner = 0; 2764 display->selection_owner = 0;
2765 }
2766 else
2767 {
2768 free (selection.clip_text);
2769 selection.clip_text = NULL;
2770 selection.clip_len = 0;
2771
2772 if (display->clipboard_owner == this)
2773 display->clipboard_owner = 0;
2774 }
2923} 2775}
2924 2776
2925/* ------------------------------------------------------------------------- */ 2777/* ------------------------------------------------------------------------- */
2926/* 2778/*
2927 * Copy a selection into the cut buffer 2779 * Copy a selection into the cut buffer
2928 * EXT: button 1 or 3 release 2780 * EXT: button 1 or 3 release
2929 */ 2781 */
2930void 2782void
2931rxvt_term::selection_make (Time tm) 2783rxvt_term::selection_make (Time tm)
2932{ 2784{
2933 int i; 2785 int size;
2934 wchar_t *new_selection_text; 2786 wchar_t *new_selection_text;
2935 text_t *t; 2787 text_t *t;
2936 2788
2937 switch (selection.op) 2789 switch (selection.op)
2938 { 2790 {
… …
2954 return; /* nothing selected, go away */ 2806 return; /* nothing selected, go away */
2955 2807
2956 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2808 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2957 return; 2809 return;
2958 2810
2959 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2811 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2960 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2812 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2961 2813
2962 int ofs = 0; 2814 int ofs = 0;
2963 int extra = 0; 2815 int extra = 0;
2964 2816
2965 int col = selection.beg.col; 2817 int col = selection.beg.col;
… …
2971 { 2823 {
2972#if !ENABLE_MINIMAL 2824#if !ENABLE_MINIMAL
2973 if (selection.rect) 2825 if (selection.rect)
2974 { 2826 {
2975 col = selection.beg.col; 2827 col = selection.beg.col;
2976 end_col = ncol + 1; 2828 end_col = selection.end.col;
2977 } 2829 }
2978 else 2830 else
2979#endif 2831#endif
2980 end_col = ROW(row).l; 2832 end_col = ROW(row).l;
2981 2833
2982 col = max (col, 0); 2834 col = max (col, 0);
2983 2835
2984 if (row == selection.end.row 2836 if (row == selection.end.row)
2985#if !ENABLE_MINIMAL
2986 || selection.rect
2987#endif
2988 )
2989 min_it (end_col, selection.end.col); 2837 min_it (end_col, selection.end.col);
2990 2838
2991 t = ROW(row).t + col; 2839 t = ROW(row).t + col;
2992 2840
2993 for (; col < end_col; col++) 2841 for (; col < end_col; col++)
… …
3001 2849
3002 extra -= (len - 1); 2850 extra -= (len - 1);
3003 2851
3004 if (extra < 0) 2852 if (extra < 0)
3005 { 2853 {
3006 extra += i; 2854 extra += size;
3007 i += i; 2855 size += size;
3008 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2856 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3009 } 2857 }
3010 2858
3011 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2859 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3012 } 2860 }
3013#endif 2861#endif
… …
3025 2873
3026 new_selection_text[ofs++] = C0_LF; 2874 new_selection_text[ofs++] = C0_LF;
3027 } 2875 }
3028 else 2876 else
3029#endif 2877#endif
3030 if (!ROW(row).is_longer () && row != selection.end.row) 2878 if (!ROW(row).is_longer ()
2879 && (row != selection.end.row || end_col != selection.end.col)
2880 && (row != selection.beg.row || selection.beg.col < ncol))
3031 new_selection_text[ofs++] = C0_LF; 2881 new_selection_text[ofs++] = C0_LF;
3032 } 2882 }
3033
3034 if (end_col != selection.end.col)
3035 new_selection_text[ofs++] = C0_LF;
3036 2883
3037 new_selection_text[ofs] = 0; 2884 new_selection_text[ofs] = 0;
3038 2885
3039 if (ofs == 0) 2886 if (ofs == 0)
3040 { 2887 {
… …
3053 2900
3054 selection_grab (tm); 2901 selection_grab (tm);
3055} 2902}
3056 2903
3057bool 2904bool
3058rxvt_term::selection_grab (Time tm) NOTHROW 2905rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3059{ 2906{
2907 Atom sel;
2908
2909 if (!clipboard)
2910 {
3060 selection_time = tm; 2911 selection_time = tm;
2912 sel = XA_PRIMARY;
2913 }
2914 else
2915 {
2916 clipboard_time = tm;
2917 sel = xa[XA_CLIPBOARD];
2918 }
3061 2919
3062 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2920 XSetSelectionOwner (dpy, sel, vt, tm);
3063 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2921 if (XGetSelectionOwner (dpy, sel) == vt)
3064 { 2922 {
3065 display->set_selection_owner (this); 2923 display->set_selection_owner (this, clipboard);
3066 return true; 2924 return true;
3067 } 2925 }
3068 else 2926 else
3069 { 2927 {
3070 selection_clear (); 2928 selection_clear (clipboard);
3071 return false; 2929 return false;
3072 } 2930 }
3073 2931
3074#if 0 2932#if 0
3075 XTextProperty ct; 2933 XTextProperty ct;
… …
3085/* ------------------------------------------------------------------------- */ 2943/* ------------------------------------------------------------------------- */
3086/* 2944/*
3087 * Mark or select text based upon number of clicks: 1, 2, or 3 2945 * Mark or select text based upon number of clicks: 1, 2, or 3
3088 * EXT: button 1 press 2946 * EXT: button 1 press
3089 */ 2947 */
3090void 2948void ecb_cold
3091rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2949rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3092{ 2950{
3093 clicks = ((clicks - 1) % 3) + 1; 2951 clicks = ((clicks - 1) % 3) + 1;
3094 selection.clicks = clicks; /* save clicks so extend will work */ 2952 selection.clicks = clicks; /* save clicks so extend will work */
3095 2953
… …
3114 2972
3115/* ------------------------------------------------------------------------- */ 2973/* ------------------------------------------------------------------------- */
3116/* 2974/*
3117 * Mark a selection at the specified col/row 2975 * Mark a selection at the specified col/row
3118 */ 2976 */
3119void 2977void ecb_cold
3120rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2978rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3121{ 2979{
3122 want_refresh = 1; 2980 want_refresh = 1;
3123 2981
3124 selection.mark.row = row + view_start; 2982 selection.mark.row = row + view_start;
… …
3130 while (selection.mark.col > 0 2988 while (selection.mark.col > 0
3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 2989 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3132 --selection.mark.col; 2990 --selection.mark.col;
3133 2991
3134 if (selection.op) 2992 if (selection.op)
2993 {
3135 { /* clear the old selection */ 2994 /* clear the old selection */
3136 selection.beg.row = selection.end.row = selection.mark.row; 2995 selection.beg.row = selection.end.row = selection.mark.row;
3137 selection.beg.col = selection.end.col = selection.mark.col; 2996 selection.beg.col = selection.end.col = selection.mark.col;
3138 } 2997 }
3139 2998
3140 selection.op = SELECTION_INIT; 2999 selection.op = SELECTION_INIT;
… …
3150/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3009/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3151#define DELIMIT_TEXT(x) \ 3010#define DELIMIT_TEXT(x) \
3152 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3011 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3153#define DELIMIT_REND(x) 1 3012#define DELIMIT_REND(x) 1
3154 3013
3155void 3014void ecb_cold
3156rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3015rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3157{ 3016{
3158 int col, row, dirnadd, tcol, trow, w1, w2; 3017 int col, row, dirnadd, tcol, trow, w1, w2;
3159 row_col_t bound; 3018 row_col_t bound;
3160 text_t *stp; 3019 text_t *stp;
… …
3234 * EXT: button 3 press; button 1 or 3 drag 3093 * EXT: button 3 press; button 1 or 3 drag
3235 * flag == 0 ==> button 1 3094 * flag == 0 ==> button 1
3236 * flag == 1 ==> button 3 press 3095 * flag == 1 ==> button 3 press
3237 * flag == 2 ==> button 3 motion 3096 * flag == 2 ==> button 3 motion
3238 */ 3097 */
3239void 3098void ecb_cold
3240rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3099rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3241{ 3100{
3242 int col = clamp (Pixel2Col (x), 0, ncol); 3101 int col = clamp (Pixel2Col (x), 0, ncol);
3243 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3102 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3244 3103
… …
3270 3129
3271/* ------------------------------------------------------------------------- */ 3130/* ------------------------------------------------------------------------- */
3272/* 3131/*
3273 * Extend the selection to the specified col/row 3132 * Extend the selection to the specified col/row
3274 */ 3133 */
3275void 3134void ecb_cold
3276rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3135rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3277{ 3136{
3278 row_col_t pos; 3137 row_col_t pos;
3279 enum { 3138 enum {
3280 LEFT, RIGHT 3139 LEFT, RIGHT
… …
3329 * a point/word/line which is either the start or end of the selection 3188 * a point/word/line which is either the start or end of the selection
3330 * and it was decided by whichever point/word/line was `fixed' at the 3189 * and it was decided by whichever point/word/line was `fixed' at the
3331 * time of the most recent button3 press 3190 * time of the most recent button3 press
3332 */ 3191 */
3333 if (button3 && buttonpress) 3192 if (button3 && buttonpress)
3193 {
3334 { /* button3 press */ 3194 /* button3 press */
3335 /* 3195 /*
3336 * first determine which edge of the selection we are closest to 3196 * first determine which edge of the selection we are closest to
3337 */ 3197 */
3338 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3198 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3339 || (!ROWCOL_IS_AFTER (pos, selection.end) 3199 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3357 selection.mark.row = selection.beg.row; 3217 selection.mark.row = selection.beg.row;
3358 selection.mark.col = selection.beg.col; 3218 selection.mark.col = selection.beg.col;
3359 } 3219 }
3360 } 3220 }
3361 else 3221 else
3222 {
3362 { /* button1 drag or button3 drag */ 3223 /* button1 drag or button3 drag */
3363 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3224 if (ROWCOL_IS_AFTER (selection.mark, pos))
3364 { 3225 {
3365 if (selection.mark.row == selection.end.row 3226 if (selection.mark.row == selection.end.row
3366 && selection.mark.col == selection.end.col 3227 && selection.mark.col == selection.end.col
3367 && clickchange 3228 && clickchange
… …
3448 selection.end.row++; 3309 selection.end.row++;
3449 } 3310 }
3450 } 3311 }
3451 3312
3452 if (button3 && buttonpress) 3313 if (button3 && buttonpress)
3314 {
3453 { /* mark may need to be changed */ 3315 /* mark may need to be changed */
3454 if (closeto == LEFT) 3316 if (closeto == LEFT)
3455 { 3317 {
3456 selection.mark.row = selection.end.row; 3318 selection.mark.row = selection.end.row;
3457 selection.mark.col = selection.end.col - (selection.clicks == 2); 3319 selection.mark.col = selection.end.col - (selection.clicks == 2);
3458 } 3320 }
… …
3468 ::swap (selection.beg.col, selection.end.col); 3330 ::swap (selection.beg.col, selection.end.col);
3469#endif 3331#endif
3470} 3332}
3471 3333
3472#if !ENABLE_MINIMAL 3334#if !ENABLE_MINIMAL
3473void 3335void ecb_cold
3474rxvt_term::selection_remove_trailing_spaces () NOTHROW 3336rxvt_term::selection_remove_trailing_spaces () NOTHROW
3475{ 3337{
3476 int32_t end_col, end_row; 3338 int32_t end_col, end_row;
3477 text_t *stp; 3339 text_t *stp;
3478 3340
… …
3516/* ------------------------------------------------------------------------- */ 3378/* ------------------------------------------------------------------------- */
3517/* 3379/*
3518 * Double click on button 3 when already selected 3380 * Double click on button 3 when already selected
3519 * EXT: button 3 double click 3381 * EXT: button 3 double click
3520 */ 3382 */
3521void 3383void ecb_cold
3522rxvt_term::selection_rotate (int x, int y) NOTHROW 3384rxvt_term::selection_rotate (int x, int y) NOTHROW
3523{ 3385{
3524 selection.clicks = selection.clicks % 3 + 1; 3386 selection.clicks = selection.clicks % 3 + 1;
3525 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3387 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3526} 3388}
… …
3528/* ------------------------------------------------------------------------- */ 3390/* ------------------------------------------------------------------------- */
3529/* 3391/*
3530 * Respond to a request for our current selection 3392 * Respond to a request for our current selection
3531 * EXT: SelectionRequest 3393 * EXT: SelectionRequest
3532 */ 3394 */
3533void 3395void ecb_cold
3534rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3396rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3535{ 3397{
3398 Atom property = rq.property == None ? rq.target : rq.property;
3536 XSelectionEvent ev; 3399 XSelectionEvent ev;
3537 3400
3538 ev.type = SelectionNotify; 3401 ev.type = SelectionNotify;
3539 ev.property = None; 3402 ev.property = None;
3540 ev.display = rq.display; 3403 ev.display = rq.display;
… …
3555 *target++ = xa[XA_COMPOUND_TEXT]; 3418 *target++ = xa[XA_COMPOUND_TEXT];
3556#if X_HAVE_UTF8_STRING 3419#if X_HAVE_UTF8_STRING
3557 *target++ = xa[XA_UTF8_STRING]; 3420 *target++ = xa[XA_UTF8_STRING];
3558#endif 3421#endif
3559 3422
3560 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3423 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3561 32, PropModeReplace, 3424 32, PropModeReplace,
3562 (unsigned char *)target_list, target - target_list); 3425 (unsigned char *)target_list, target - target_list);
3563 ev.property = rq.property; 3426 ev.property = property;
3564 } 3427 }
3565#if TODO // TODO 3428#if TODO // TODO
3566 else if (rq.target == xa[XA_MULTIPLE]) 3429 else if (rq.target == xa[XA_MULTIPLE])
3567 { 3430 {
3568 /* TODO: Handle MULTIPLE */ 3431 /* TODO: Handle MULTIPLE */
3569 } 3432 }
3570#endif 3433#endif
3571 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3434 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3572 { 3435 {
3573 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3436 XChangeProperty (dpy, rq.requestor, property, rq.target,
3574 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3437 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3575 ev.property = rq.property; 3438 ev.property = property;
3439 }
3440 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3441 {
3442 XChangeProperty (dpy, rq.requestor, property, rq.target,
3443 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3444 ev.property = property;
3576 } 3445 }
3577 else if (rq.target == XA_STRING 3446 else if (rq.target == XA_STRING
3578 || rq.target == xa[XA_TEXT] 3447 || rq.target == xa[XA_TEXT]
3579 || rq.target == xa[XA_COMPOUND_TEXT] 3448 || rq.target == xa[XA_COMPOUND_TEXT]
3580 || rq.target == xa[XA_UTF8_STRING] 3449 || rq.target == xa[XA_UTF8_STRING]
… …
3612 { 3481 {
3613 target = xa[XA_COMPOUND_TEXT]; 3482 target = xa[XA_COMPOUND_TEXT];
3614 style = enc_compound_text; 3483 style = enc_compound_text;
3615 } 3484 }
3616 3485
3617 if (selection.text) 3486 if (rq.selection == XA_PRIMARY && selection.text)
3618 { 3487 {
3619 cl = selection.text; 3488 cl = selection.text;
3620 selectlen = selection.len; 3489 selectlen = selection.len;
3490 }
3491 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3492 {
3493 cl = selection.clip_text;
3494 selectlen = selection.clip_len;
3621 } 3495 }
3622 else 3496 else
3623 { 3497 {
3624 cl = L""; 3498 cl = L"";
3625 selectlen = 0; 3499 selectlen = 0;
… …
3646 ct.value = (unsigned char *)cl; 3520 ct.value = (unsigned char *)cl;
3647 ct.nitems = selectlen; 3521 ct.nitems = selectlen;
3648 ct.encoding = target; 3522 ct.encoding = target;
3649 } 3523 }
3650 3524
3651 XChangeProperty (dpy, rq.requestor, rq.property, 3525 XChangeProperty (dpy, rq.requestor, property,
3652 ct.encoding, 8, PropModeReplace, 3526 ct.encoding, 8, PropModeReplace,
3653 ct.value, (int)ct.nitems); 3527 ct.value, (int)ct.nitems);
3654 ev.property = rq.property; 3528 ev.property = property;
3655 3529
3656 if (freect) 3530 if (freect)
3657 XFree (ct.value); 3531 XFree (ct.value);
3658 } 3532 }
3659 3533
3660 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3534 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3661} 3535}
3662 3536
3663/* ------------------------------------------------------------------------- * 3537/* ------------------------------------------------------------------------- */
3664 * MOUSE ROUTINES *
3665 * ------------------------------------------------------------------------- */
3666
3667/* ------------------------------------------------------------------------- */
3668#ifdef USE_XIM 3538#if USE_XIM
3669void 3539void ecb_cold
3670rxvt_term::im_set_position (XPoint &pos) NOTHROW 3540rxvt_term::im_set_position (XPoint &pos) NOTHROW
3671{ 3541{
3672 XWindowAttributes xwa; 3542 XWindowAttributes xwa;
3673 3543
3674 XGetWindowAttributes (dpy, vt, &xwa); 3544 XGetWindowAttributes (dpy, vt, &xwa);
… …
3697 h += 2; min_it (h, nrow); 3567 h += 2; min_it (h, nrow);
3698 3568
3699 x -= 1; clamp_it (x, 0, ncol - w); 3569 x -= 1; clamp_it (x, 0, ncol - w);
3700 y -= 1; clamp_it (y, 0, nrow - h); 3570 y -= 1; clamp_it (y, 0, nrow - h);
3701 3571
3702 ov_x = x; ov_y = y; 3572 ov.x = x; ov.y = y;
3703 ov_w = w; ov_h = h; 3573 ov.w = w; ov.h = h;
3704 3574
3705 ov_text = new text_t *[h]; 3575 ov.text = new text_t *[h];
3706 ov_rend = new rend_t *[h]; 3576 ov.rend = new rend_t *[h];
3707 3577
3708 for (y = 0; y < h; y++) 3578 for (y = 0; y < h; y++)
3709 { 3579 {
3710 text_t *tp = ov_text[y] = new text_t[w]; 3580 text_t *tp = ov.text[y] = new text_t[w];
3711 rend_t *rp = ov_rend[y] = new rend_t[w]; 3581 rend_t *rp = ov.rend[y] = new rend_t[w];
3712 3582
3713 text_t t0, t1, t2; 3583 text_t t0, t1, t2;
3714 rend_t r = OVERLAY_RSTYLE; 3584 rend_t r = OVERLAY_RSTYLE;
3715 3585
3716 if (y == 0) 3586 if (y == 0)
… …
3735} 3605}
3736 3606
3737void 3607void
3738rxvt_term::scr_overlay_off () NOTHROW 3608rxvt_term::scr_overlay_off () NOTHROW
3739{ 3609{
3740 if (!ov_text) 3610 if (!ov.text)
3741 return; 3611 return;
3742 3612
3743 want_refresh = 1; 3613 want_refresh = 1;
3744 3614
3745 for (int y = 0; y < ov_h; y++) 3615 for (int y = 0; y < ov.h; y++)
3746 { 3616 {
3747 delete [] ov_text[y]; 3617 delete [] ov.text[y];
3748 delete [] ov_rend[y]; 3618 delete [] ov.rend[y];
3749 } 3619 }
3750 3620
3751 delete [] ov_text; ov_text = 0; 3621 delete [] ov.text; ov.text = 0;
3752 delete [] ov_rend; ov_rend = 0; 3622 delete [] ov.rend; ov.rend = 0;
3753} 3623}
3754 3624
3755void 3625void
3756rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3626rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3757{ 3627{
3758 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3628 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3759 return; 3629 return;
3760 3630
3761 x++, y++; 3631 x++, y++;
3762 3632
3763 ov_text[y][x] = text; 3633 ov.text[y][x] = text;
3764 ov_rend[y][x] = rend; 3634 ov.rend[y][x] = rend;
3765} 3635}
3766 3636
3767void 3637void
3768rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3638rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3769{ 3639{
… …
3788} 3658}
3789 3659
3790void 3660void
3791rxvt_term::scr_swap_overlay () NOTHROW 3661rxvt_term::scr_swap_overlay () NOTHROW
3792{ 3662{
3793 if (!ov_text) 3663 if (!ov.text)
3794 return; 3664 return;
3795 3665
3666 // hide cursor if it is within the overlay area
3667 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3668 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3669 screen.flags &= ~Screen_VisibleCursor;
3670
3796 // swap screen mem with overlay 3671 // swap screen mem with overlay
3797 for (int y = ov_h; y--; ) 3672 for (int y = ov.h; y--; )
3798 { 3673 {
3799 text_t *t1 = ov_text[y]; 3674 text_t *t1 = ov.text[y];
3800 rend_t *r1 = ov_rend[y]; 3675 rend_t *r1 = ov.rend[y];
3801 3676
3802 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3677 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3803 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3678 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3804 3679
3805 for (int x = ov_w; x--; ) 3680 for (int x = ov.w; x--; )
3806 { 3681 {
3807 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3682 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3808 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3683 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3809 } 3684 }
3810 } 3685 }

Diff Legend

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