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.282 by ayin, Wed Oct 31 10:06:42 2007 UTC vs.
Revision 1.415 by root, Mon May 28 14:25:16 2012 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! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 82 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) \ 83#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) 84 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 85
87/* 86/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 87 * 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 */ 88 */
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) \ 89#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 90 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 91 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 92 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 93 (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 94
112/* ------------------------------------------------------------------------- * 95/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 96 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 97 * ------------------------------------------------------------------------- */
115 98
116/* Fill part/all of a line with blanks. */ 99/* Fill part/all of a line with blanks. */
117void 100void
118rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
119{ 102{
120 if (!l.t) 103 if (!l.valid ())
121 { 104 {
122 lalloc (l); 105 l.alloc ();
123 col = 0; 106 col = 0;
124 width = ncol; 107 width = ncol;
125 } 108 }
126 109
127 l.touch (); 110 l.touch ();
… …
146{ 129{
147 scr_blank_line (l, 0, ncol, efs); 130 scr_blank_line (l, 0, ncol, efs);
148 131
149 l.l = 0; 132 l.l = 0;
150 l.f = 0; 133 l.f = 0;
134}
135
136// nuke a single wide character at the given column
137void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
139{
140 // find begin
141 while (col > 0 && l.t[col] == NOCHAR)
142 col--;
143
144 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
151} 155}
152 156
153/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
156 160
157void 161void
162rxvt_term::scr_alloc ()
163{
164 int tsize = sizeof (text_t) * ncol;
165 int rsize = sizeof (rend_t) * ncol;
166
167 // we assume that rend_t size is a sufficient alignment
168 // factor for tetx_t and line_t values, and we only
169 // need to adjust tsize.
170 tsize = (tsize + sizeof (rend_t) - 1);
171 tsize -= tsize % sizeof (rend_t);
172
173 int all_rows = total_rows + nrow + nrow;
174
175 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
176 chunk = rxvt_malloc (chunk_size);
177
178 char *base = (char *)chunk + sizeof (line_t) * all_rows;
179
180 for (int row = 0; row < all_rows; ++row)
181 {
182 line_t &l = ((line_t *)chunk) [row];
183
184 l.t = (text_t *)base; base += tsize;
185 l.r = (rend_t *)base; base += rsize;
186 l.l = -1;
187 l.f = 0;
188 }
189
190 drawn_buf = (line_t *)chunk;
191 swap_buf = drawn_buf + nrow;
192 row_buf = swap_buf + nrow;
193}
194
195void
158rxvt_term::scr_reset () 196rxvt_term::scr_reset ()
159{ 197{
160#if ENABLE_OVERLAY 198#if ENABLE_OVERLAY
161 scr_overlay_off (); 199 scr_overlay_off ();
162#endif 200#endif
163 201
164 rvideo_mode = false;
165 view_start = 0; 202 view_start = 0;
166 num_scr = 0; 203 num_scr = 0;
167 204
168 if (ncol == 0) 205 if (ncol == 0)
169 ncol = 80; 206 ncol = 80;
… …
171 if (nrow == 0) 208 if (nrow == 0)
172 nrow = 24; 209 nrow = 24;
173 210
174 if (ncol == prev_ncol && nrow == prev_nrow) 211 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 212 return;
176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179 213
180 // we need at least two lines for wrapping to work correctly 214 // we need at least two lines for wrapping to work correctly
181 while (nrow + saveLines < 2) 215 while (nrow + saveLines < 2)
182 { 216 {
183 //TODO//FIXME 217 //TODO//FIXME
… …
192 total_rows = nrow + saveLines; 226 total_rows = nrow + saveLines;
193 227
194 screen.tscroll = 0; 228 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 229 screen.bscroll = nrow - 1;
196 230
231 void *prev_chunk = chunk;
232 line_t *prev_drawn_buf = drawn_buf;
233 line_t *prev_swap_buf = swap_buf;
234 line_t *prev_row_buf = row_buf;
235
236 int common_col = min (prev_ncol, ncol);
237
238 scr_alloc ();
239
197 if (!row_buf) 240 if (!prev_row_buf)
198 { 241 {
199 /* 242 /*
200 * first time called so just malloc everything: don't rely on realloc 243 * first time called so just malloc everything: don't rely on realloc
201 */ 244 */
202 top_row = 0; 245 top_row = 0;
203 term_start = 0; 246 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 247
219 memset (charsets, 'B', sizeof (charsets)); 248 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 249 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 250 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 251 screen.cur.row = screen.cur.col = 0;
… …
236 selection.text = NULL; 265 selection.text = NULL;
237 selection.len = 0; 266 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 267 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 268 selection.screen = PRIMARY;
240 selection.clicks = 0; 269 selection.clicks = 0;
270 selection.clip_text = NULL;
271 selection.clip_len = 0;
241 } 272 }
242 else 273 else
243 { 274 {
244 /* 275 /*
245 * add or delete rows as appropriate 276 * add or delete rows as appropriate
246 */ 277 */
247 278
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--; ) 279 for (int row = min (nrow, prev_nrow); row--; )
266 { 280 {
267 lresize (drawn_buf[row]); 281 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268 lresize (swap_buf [row]); 282 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 }
270 283
271 for (int row = prev_nrow; row < nrow; row++) 284 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
272 { 288 }
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 289
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 290 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 291 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 292 int q = total_rows; // rewrapped row
283 293
284 if (top_row) 294 if (top_row)
285 { 295 {
286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 296 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 297 // to come up with a lean and mean algorithm.
298 // TODO: maybe optimise when width didn't change
288 299
289 row_col_t ocur = screen.cur; 300 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 301 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 302
292 do 303 do
293 { 304 {
294 p = MOD (p - 1, prev_total_rows); 305 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 306 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 307 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 308 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
300 309
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 310 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 { 311 {
303 p = MOD (p - 1, prev_total_rows); 312 p = MOD (p - 1, prev_total_rows);
304 313
305 plines++; 314 plines++;
306 llen += prev_ncol; 315 llen += prev_ncol;
… …
319 328
320 // re-assemble the full line by destination lines 329 // re-assemble the full line by destination lines
321 for (int qrow = q; qlines--; qrow++) 330 for (int qrow = q; qlines--; qrow++)
322 { 331 {
323 qline = row_buf + qrow; 332 qline = row_buf + qrow;
324 lalloc (*qline); 333 qline->alloc (); // redundant with next line
325 qline->l = ncol; 334 qline->l = ncol;
326 qline->is_longer (1); 335 qline->is_longer (1);
327 336
328 int qcol = 0; 337 int qcol = 0;
329 338
… …
344 // this seems to upset applications/shells/readline 353 // this seems to upset applications/shells/readline
345 // least. 354 // least.
346 if (prow == ocur.row) 355 if (prow == ocur.row)
347 screen.cur.row = q - (total_rows - nrow); 356 screen.cur.row = q - (total_rows - nrow);
348 357
349 line_t &pline = old_buf [prow]; 358 line_t &pline = prev_row_buf [prow];
350 359
351 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 360 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
352 361
353 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 362 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
354 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 363 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
375 { 384 {
376 // if no scrollback exists (yet), wing, instead of wrap 385 // if no scrollback exists (yet), wing, instead of wrap
377 386
378 for (int row = min (nrow, prev_nrow); row--; ) 387 for (int row = min (nrow, prev_nrow); row--; )
379 { 388 {
380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 389 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
381 line_t &qline = row_buf [row]; 390 line_t &dst = row_buf [row];
382 391
383 qline = pline; 392 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
384 lresize (qline); 393
394 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
395 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
385 } 396 }
386 397
387 for (int row = prev_nrow; row < nrow; row++) 398 for (int row = prev_nrow; row < nrow; row++)
388 {
389 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 399 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
390 }
391 400
392 term_start = 0; 401 term_start = 0;
393 } 402 }
394
395 free (old_buf);
396 delete old_ta;
397 delete old_ra;
398 403
399 clamp_it (screen.cur.row, 0, nrow - 1); 404 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 405 clamp_it (screen.cur.col, 0, ncol - 1);
406 }
401 407
408 for (int row = nrow; row--; )
409 {
410 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
411 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
412 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
413 }
414
415 free (prev_chunk);
416
402 free (tabs); 417 free (tabs);
403 } 418 tabs = (char *)rxvt_malloc (ncol);
419
420 for (int col = ncol; col--; )
421 tabs [col] = col % TABSIZE == 0;
404 422
405 CLEAR_ALL_SELECTION (); 423 CLEAR_ALL_SELECTION ();
406 424
407 prev_nrow = nrow; 425 prev_nrow = nrow;
408 prev_ncol = ncol; 426 prev_ncol = ncol;
409 427
410 tabs = (char *)rxvt_malloc (ncol); 428 tt_winch ();
411 429
412 for (int col = ncol; --col; ) 430 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
413 tabs [col] = col % TABSIZE == 0; 431}
432
433/* ------------------------------------------------------------------------- */
434/*
435 * Free everything. That way malloc debugging can find leakage.
436 */
437void
438rxvt_term::scr_release () NOTHROW
439{
440 free (chunk);
441 free (tabs);
442}
443
444/* ------------------------------------------------------------------------- */
445/*
446 * Hard/Soft reset
447 */
448void
449rxvt_term::scr_poweron ()
450{
451 scr_release ();
452
453 row_buf = 0;
454 tabs = 0;
455 prev_nrow = prev_ncol = 0;
456 rvideo_mode = false;
457 scr_soft_reset ();
458 scr_reset ();
459
460 scr_clear (true);
461 scr_refresh ();
462}
463
464void
465rxvt_term::scr_soft_reset () NOTHROW
466{
467 /* only affects modes, nothing drastic such as clearing the screen */
468#if ENABLE_OVERLAY
469 scr_overlay_off ();
470#endif
414 471
415 if (current_screen != PRIMARY) 472 if (current_screen != PRIMARY)
416 scr_swap_screen (); 473 scr_swap_screen ();
417 474
418 tt_winch (); 475 scr_scroll_region (0, MAX_ROWS - 1);
419 476 scr_rendition (0, ~RS_None);
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 477 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} 478}
458 479
459/* ------------------------------------------------------------------------- * 480/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 481 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 482 * ------------------------------------------------------------------------- */
… …
499 } 520 }
500 521
501 /* boundary check in case screen size changed between SAVE and RESTORE */ 522 /* boundary check in case screen size changed between SAVE and RESTORE */
502 min_it (s->cur.row, nrow - 1); 523 min_it (s->cur.row, nrow - 1);
503 min_it (s->cur.col, ncol - 1); 524 min_it (s->cur.col, ncol - 1);
504#ifdef DEBUG_STRICT
505 assert (s->cur.row >= 0); 525 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 526 assert (s->cur.col >= 0);
507#endif
508} 527}
509 528
510void 529void
511rxvt_term::scr_swap_screen () 530rxvt_term::scr_swap_screen () NOTHROW
512{ 531{
513 if (!option (Opt_secondaryScreen)) 532 if (!option (Opt_secondaryScreen))
514 return; 533 return;
515 534
516 for (int i = prev_nrow; i--; ) 535 for (int i = prev_nrow; i--; )
… …
535 return; 554 return;
536 555
537 want_refresh = 1; 556 want_refresh = 1;
538 view_start = 0; 557 view_start = 0;
539 558
540 selection_check (2); /* check for boundary cross */ 559 /* check for boundary cross */
560 row_col_t pos;
561 pos.row = pos.col = 0;
562 if (ROWCOL_IS_BEFORE (selection.beg, pos)
563 && ROWCOL_IS_AFTER (selection.end, pos))
564 CLEAR_SELECTION ();
541 565
542 int i = current_screen; current_screen = scrn; scrn = i; 566 current_screen = scrn;
543 567
544#if NSCREENS 568#if NSCREENS
545 if (option (Opt_secondaryScreen)) 569 if (option (Opt_secondaryScreen))
546 { 570 {
547 num_scr = 0; 571 num_scr = 0;
… …
596/* 620/*
597 * Change the rendition style for following text 621 * Change the rendition style for following text
598 */ 622 */
599void 623void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 624rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 625{
602 if (set) 626 if (set)
603 rstyle |= style; 627 rstyle |= style;
604 else if (style == ~RS_None) 628 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 629 rstyle = DEFAULT_RSTYLE;
606 else 630 else
607 rstyle &= ~style; 631 rstyle &= ~style;
608 } 632}
609 633
610/* ------------------------------------------------------------------------- */ 634/* ------------------------------------------------------------------------- */
611/* 635/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 636 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 637 * count positive ==> scroll up
… …
624 648
625 if (count > 0 649 if (count > 0
626 && row1 == 0 650 && row1 == 0
627 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 651 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
628 { 652 {
653 min_it (count, total_rows - (nrow - (row2 + 1)));
654
629 top_row = max (top_row - count, -saveLines); 655 top_row = max (top_row - count, -saveLines);
630
631 // scroll everything up 'count' lines
632 term_start = (term_start + count) % total_rows;
633 656
634 // sever bottommost line 657 // sever bottommost line
635 { 658 {
636 line_t &l = ROW(row2 - count); 659 line_t &l = ROW(row2);
637 l.is_longer (0); 660 l.is_longer (0);
638 l.touch (); 661 l.touch ();
639 } 662 }
640 663
664 // scroll everything up 'count' lines
665 term_start = (term_start + count) % total_rows;
666
667 // now copy lines below the scroll region bottom to the
668 // bottom of the screen again, so they look as if they
669 // hadn't moved.
670 for (int i = nrow; --i > row2; )
671 {
672 line_t &l1 = ROW(i - count);
673 line_t &l2 = ROW(i);
674
675 ::swap (l1, l2);
676 l2.touch ();
677 }
678
641 // erase newly scrolled-in lines 679 // erase newly scrolled-in lines
642 for (int i = count; i--; ) 680 for (int i = count; i--; )
643 { 681 {
644 line_t &l = ROW(nrow - 1 - i); 682 line_t &l = ROW(row2 - i);
645 683
646 // optimize if already cleared, can be significant on slow machines 684 // optimise if already cleared, can be significant on slow machines
647 // could be rolled into scr_blank_screen_mem 685 // 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))) 686 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
649 { 687 {
650 scr_blank_line (l, 0, l.l, rstyle); 688 scr_blank_line (l, 0, l.l, rstyle);
651 l.l = 0; 689 l.l = 0;
… …
653 } 691 }
654 else 692 else
655 scr_blank_screen_mem (l, rstyle); 693 scr_blank_screen_mem (l, rstyle);
656 } 694 }
657 695
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 696 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 697 if (selection.op && current_screen == selection.screen
698 && selection.beg.row <= row2)
672 { 699 {
673 selection.beg.row -= count; 700 selection.beg.row -= count;
674 selection.end.row -= count; 701 selection.end.row -= count;
675 selection.mark.row -= count; 702 selection.mark.row -= count;
676 703
677 if (selection.beg.row < top_row 704 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 } 705 }
685 706
686 // finally move the view window, if desired 707 // finally move the view window, if desired
687 if (option (Opt_scrollWithBuffer) 708 if (option (Opt_scrollWithBuffer)
688 && view_start != 0 709 && view_start != 0
… …
718 } 739 }
719 740
720 // use a simple and robust scrolling algorithm, this 741 // use a simple and robust scrolling algorithm, this
721 // part of scr_scroll_text is not time-critical. 742 // part of scr_scroll_text is not time-critical.
722 743
744 // sever line above scroll region
745 if (row1)
746 {
747 line_t &l = ROW(row1 - 1);
748 l.is_longer (0);
749 l.touch ();
750 }
751
723 int rows = row2 - row1 + 1; 752 int rows = row2 - row1 + 1;
724 753
725 min_it (count, rows); 754 min_it (count, rows);
726 755
727 line_t *temp_buf = row_buf + total_rows; 756 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
728 757
729 for (int row = 0; row < rows; row++) 758 for (int row = 0; row < rows; row++)
730 { 759 {
731 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 760 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
732 761
… …
734 scr_blank_screen_mem (temp_buf [row], rstyle); 763 scr_blank_screen_mem (temp_buf [row], rstyle);
735 } 764 }
736 765
737 for (int row = 0; row < rows; row++) 766 for (int row = 0; row < rows; row++)
738 ROW(row1 + row) = temp_buf [row]; 767 ROW(row1 + row) = temp_buf [row];
768
769 // sever bottommost line
770 {
771 line_t &l = ROW(row2);
772 l.is_longer (0);
773 l.touch ();
774 }
739 } 775 }
740 776
741 return count; 777 return count;
742} 778}
743 779
… …
749rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 785rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
750{ 786{
751 if (len <= 0) /* sanity */ 787 if (len <= 0) /* sanity */
752 return; 788 return;
753 789
754 unsigned char checksel; 790 bool checksel;
755 unicode_t c; 791 unicode_t c;
756 int ncol = this->ncol; 792 int ncol = this->ncol;
757 const wchar_t *strend = str + len; 793 const wchar_t *strend = str + len;
758 794
759 want_refresh = 1; 795 want_refresh = 1;
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 808 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 809 screen.cur.row -= minlines;
774 } 810 }
775 } 811 }
776 812
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 813 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 814 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 815 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 816 int row = screen.cur.row;
783 817
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 818 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 819
786 line_t *line = &ROW(row); 820 line_t *line = &ROW(row);
787 821
788 while (str < strend) 822 while (str < strend)
789 { 823 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 824 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 825
792 if (c < 0x20) 826 if (ecb_unlikely (c < 0x20))
793 if (c == C0_LF) 827 if (c == C0_LF)
794 { 828 {
795 max_it (line->l, screen.cur.col); 829 max_it (line->l, screen.cur.col);
796 830
797 screen.flags &= ~Screen_WrapNext; 831 screen.flags &= ~Screen_WrapNext;
… …
816 { 850 {
817 scr_tab (1, true); 851 scr_tab (1, true);
818 continue; 852 continue;
819 } 853 }
820 854
855 if (ecb_unlikely (
821 if (checksel /* see if we're writing within selection */ 856 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 857 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 858 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
859 ))
824 { 860 {
825 checksel = 0; 861 checksel = 0;
826 /* 862 /*
827 * If we wrote anywhere in the selected area, kill the selection 863 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 864 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 865 * should be a similar check.
830 */ 866 */
831 CLEAR_SELECTION (); 867 CLEAR_SELECTION ();
832 } 868 }
833 869
834 if (screen.flags & Screen_WrapNext) 870 if (ecb_unlikely (screen.flags & Screen_WrapNext))
835 { 871 {
836 scr_do_wrap (); 872 scr_do_wrap ();
837 873
838 line->l = ncol; 874 line->l = ncol;
839 line->is_longer (1); 875 line->is_longer (1);
… …
841 row = screen.cur.row; 877 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 878 line = &ROW(row); /* _must_ refresh */
843 } 879 }
844 880
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 881 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 882 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 883 c = 0xfffd;
848 884
849 // rely on wcwidth to tell us the character width, do wcwidth before 885 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 886 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 887 // drawing characters below as they might be invalid in the current
852 // locale. 888 // locale.
853 int width = WCWIDTH (c); 889 int width = WCWIDTH (c);
854 890
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 891 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 892 {
857 // vt100 special graphics and line drawing 893 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 894 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 895 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 896 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 909 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 910 width = 1; // vt100 line drawing characters are always single-width
875 } 911 }
876 } 912 }
877 913
878 if (screen.flags & Screen_Insert) 914 if (ecb_unlikely (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 915 scr_insdel_chars (width, INSERT);
880 916
881 if (width != 0) 917 if (width != 0)
882 { 918 {
883#if !UNICODE_3 919#if !UNICODE_3
… …
888# else 924# else
889 c = 0xfffd; 925 c = 0xfffd;
890# endif 926# endif
891#endif 927#endif
892 928
929 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
930
931 // if the character doesn't fit into the remaining columns...
932 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
933 {
934 if (screen.flags & Screen_Autowrap)
935 {
936 // ... artificially enlargen the previous one
937 c = NOCHAR;
938 // and try the same character next loop iteration
939 --str;
940 }
941 else
942 screen.cur.col = ncol - width;
943 }
944
893 // nuke the character at this position, if required 945 // nuke the character at this position, if required
946 // due to wonderful coincidences everywhere else in this loop
947 // we never have to check for overwriting a wide char itself,
948 // only its tail.
894 if (line->t[screen.cur.col] == NOCHAR 949 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
895 || (screen.cur.col < ncol - 1 950 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 951
925 line->touch (); 952 line->touch ();
926 953
927 do 954 do
928 { 955 {
929 line->t[screen.cur.col] = c; 956 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 957 line->r[screen.cur.col] = rend;
931 958
932 if (screen.cur.col < ncol - 1) 959 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 960 screen.cur.col++;
934 else 961 else
935 { 962 {
936 line->l = ncol; 963 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 964 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 965 screen.flags |= Screen_WrapNext;
939 break; 966
967 goto end_of_line;
940 } 968 }
941 969
942 c = NOCHAR; 970 c = NOCHAR;
943 } 971 }
944 while (--width > 0); 972 while (ecb_unlikely (--width > 0));
945 973
946 // pad with spaces when overwriting wide character with smaller one 974 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 975 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 976 {
949 line->touch (); 977 line->t[c] = ' ';
978 line->r[c] = rend;
979 }
950 980
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 981end_of_line:
982 ;
983 }
984#if ENABLE_COMBINING
985 else // width == 0
986 {
987 if (c != 0xfeff) // ignore BOM
988 {
989 // handle combining characters
990 // we just tag the accent on the previous on-screen character.
991 // this is arguably not correct, but also arguably not wrong.
992 // we don't handle double-width characters nicely yet.
993 line_t *linep;
994 text_t *tp;
995 rend_t *rp;
996
997 if (screen.cur.col > 0)
952 { 998 {
953 line->t[c] = ' ';
954 line->r[c] = rend; 999 linep = line;
1000 tp = line->t + screen.cur.col - 1;
1001 rp = line->r + screen.cur.col - 1;
955 } 1002 }
1003 else if (screen.cur.row > 0
1004 && ROW(screen.cur.row - 1).is_longer ())
1005 {
1006 linep = &ROW(screen.cur.row - 1);
1007 tp = line->t + ncol - 1;
1008 rp = line->r + ncol - 1;
1009 }
1010 else
1011 continue;
1012
1013 linep->touch ();
1014
1015 while (*tp == NOCHAR && tp > linep->t)
1016 tp--, rp--;
1017
1018 // first try to find a precomposed character
1019 unicode_t n = rxvt_compose (*tp, c);
1020 if (n == NOCHAR)
1021 n = rxvt_composite.compose (*tp, c);
1022
1023 *tp = n;
1024 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
956 } 1025 }
957 } 1026 }
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 1027#endif
998 }
999 } 1028 }
1000 1029
1001 max_it (line->l, screen.cur.col); 1030 max_it (line->l, screen.cur.col);
1002 1031
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1032 assert (screen.cur.row >= 0);
1005#endif
1006} 1033}
1007 1034
1008/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
1009/* 1036/*
1010 * Process Backspace. Move back the cursor back a position, wrap if have to 1037 * Process Backspace. Move back the cursor back a position, wrap if have to
1011 * XTERM_SEQ: CTRL-H 1038 * XTERM_SEQ: CTRL-H
1012 */ 1039 */
1013void 1040void
1014rxvt_term::scr_backspace () NOTHROW 1041rxvt_term::scr_backspace () NOTHROW
1015{ 1042{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1043 if (screen.cur.col == 0)
1019 { 1044 {
1020 if (screen.cur.row > 0) 1045 if (screen.cur.row > 0)
1021 { 1046 {
1022#ifdef TERMCAP_HAS_BW 1047#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1048 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1049 --screen.cur.row;
1025 return; 1050
1051 want_refresh = 1;
1026#endif 1052#endif
1027 } 1053 }
1028 } 1054 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1055 else if (screen.flags & Screen_WrapNext)
1056 screen.flags &= ~Screen_WrapNext;
1057 else
1030 scr_gotorc (0, -1, RELATIVE); 1058 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1059}
1034 1060
1035/* ------------------------------------------------------------------------- */ 1061/* ------------------------------------------------------------------------- */
1036/* 1062/*
1037 * Process Horizontal Tab 1063 * Process Horizontal Tab
… …
1186 } 1212 }
1187 } 1213 }
1188 else 1214 else
1189 { 1215 {
1190 if (screen.flags & Screen_Relative) 1216 if (screen.flags & Screen_Relative)
1217 {
1191 { /* relative origin mode */ 1218 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1219 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1220 min_it (screen.cur.row, screen.bscroll);
1194 } 1221 }
1195 else 1222 else
1196 screen.cur.row = row; 1223 screen.cur.row = row;
… …
1229/* 1256/*
1230 * Erase part or whole of a line 1257 * Erase part or whole of a line
1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1258 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1259 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1233 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1260 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1261 * extension: clear to right unless wrapped: ESC [ 3 K
1234 */ 1262 */
1235void 1263void
1236rxvt_term::scr_erase_line (int mode) NOTHROW 1264rxvt_term::scr_erase_line (int mode) NOTHROW
1237{ 1265{
1238 unsigned int col, num; 1266 unsigned int col, num;
… …
1247 line.touch (); 1275 line.touch ();
1248 line.is_longer (0); 1276 line.is_longer (0);
1249 1277
1250 switch (mode) 1278 switch (mode)
1251 { 1279 {
1280 case 3:
1281 if (screen.flags & Screen_WrapNext)
1282 return;
1283
1284 /* fall through */
1285
1252 case 0: /* erase to end of line */ 1286 case 0: /* erase to end of line */
1253 col = screen.cur.col; 1287 col = screen.cur.col;
1254 num = ncol - col; 1288 num = ncol - col;
1255 min_it (line.l, col); 1289 min_it (line.l, col);
1290
1256 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1291 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1257 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1292 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1258 CLEAR_SELECTION (); 1293 CLEAR_SELECTION ();
1259 break; 1294 break;
1295
1260 case 1: /* erase to beginning of line */ 1296 case 1: /* erase to beginning of line */
1261 col = 0; 1297 col = 0;
1262 num = screen.cur.col + 1; 1298 num = screen.cur.col + 1;
1299
1263 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1300 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1264 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1301 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1265 CLEAR_SELECTION (); 1302 CLEAR_SELECTION ();
1266 break; 1303 break;
1304
1267 case 2: /* erase whole line */ 1305 case 2: /* erase whole line */
1268 col = 0; 1306 col = 0;
1269 num = ncol; 1307 num = ncol;
1270 line.l = 0; 1308 line.l = 0;
1271 if (selection.beg.row <= screen.cur.row 1309 if (selection.beg.row <= screen.cur.row
… …
1279 scr_blank_line (line, col, num, rstyle); 1317 scr_blank_line (line, col, num, rstyle);
1280} 1318}
1281 1319
1282/* ------------------------------------------------------------------------- */ 1320/* ------------------------------------------------------------------------- */
1283/* 1321/*
1284 * Erase part of whole of the screen 1322 * Erase part or whole of the screen
1285 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1323 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1286 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1324 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1287 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1325 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1288 */ 1326 */
1289void 1327void
… …
1298 ZERO_SCROLLBACK (); 1336 ZERO_SCROLLBACK ();
1299 1337
1300 switch (mode) 1338 switch (mode)
1301 { 1339 {
1302 case 0: /* erase to end of screen */ 1340 case 0: /* erase to end of screen */
1303 selection_check (1);
1304 scr_erase_line (0); 1341 scr_erase_line (0);
1305 row = screen.cur.row + 1; /* possible OOB */ 1342 row = screen.cur.row + 1; /* possible OOB */
1306 num = nrow - row; 1343 num = nrow - row;
1307 break; 1344 break;
1308 case 1: /* erase to beginning of screen */ 1345 case 1: /* erase to beginning of screen */
1309 selection_check (3);
1310 scr_erase_line (1); 1346 scr_erase_line (1);
1311 row = 0; 1347 row = 0;
1312 num = screen.cur.row; 1348 num = screen.cur.row;
1313 break; 1349 break;
1314 case 2: /* erase whole screen */ 1350 case 2: /* erase whole screen */
1315 selection_check (3);
1316 row = 0; 1351 row = 0;
1317 num = nrow; 1352 num = nrow;
1318 break; 1353 break;
1319 default: 1354 default:
1320 return; 1355 return;
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1364 if (row >= nrow) /* Out Of Bounds */
1330 return; 1365 return;
1331 1366
1332 min_it (num, nrow - row); 1367 min_it (num, nrow - row);
1333 1368
1334 if (rstyle & (RS_RVid | RS_Uline)) 1369 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1335 ren = (rend_t) ~RS_None; 1370 ren = (rend_t) ~RS_None;
1336 else if (GET_BASEBG (rstyle) == Color_bg) 1371 else if (GET_BASEBG (rstyle) == Color_bg)
1337 { 1372 {
1338 ren = DEFAULT_RSTYLE; 1373 ren = DEFAULT_RSTYLE;
1339 CLEAR_ROWS (row, num); 1374
1375 if (mapped)
1376 XClearArea (dpy, vt, 0,
1377 Row2Pixel (row - view_start), (unsigned int)vt_width,
1378 (unsigned int)Height2Pixel (num), False);
1340 } 1379 }
1341 else 1380 else
1342 { 1381 {
1343 ren = rstyle & (RS_fgMask | RS_bgMask); 1382 ren = rstyle & (RS_fgMask | RS_bgMask);
1383
1384 if (mapped)
1385 {
1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1386 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1345 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1387 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346 ERASE_ROWS (row, num); 1388 XFillRectangle (dpy, vt, gc,
1389 0, Row2Pixel (row - view_start),
1390 (unsigned int)vt_width,
1391 (unsigned int)Height2Pixel (num));
1347 gcvalue.foreground = pix_colors[Color_fg]; 1392 gcvalue.foreground = pix_colors[Color_fg];
1348 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1394 }
1349 } 1395 }
1350 1396
1351 for (; num--; row++) 1397 for (; num--; row++)
1352 { 1398 {
1353 scr_blank_screen_mem (ROW(row), rstyle); 1399 scr_blank_screen_mem (ROW(row), rstyle);
1400
1401 if (row - view_start < nrow)
1354 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1402 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1355 } 1403 }
1356} 1404}
1357 1405
1358#if !ENABLE_MINIMAL 1406#if !ENABLE_MINIMAL
1359void 1407void
… …
1378 1426
1379 want_refresh = 1; 1427 want_refresh = 1;
1380 ZERO_SCROLLBACK (); 1428 ZERO_SCROLLBACK ();
1381 1429
1382 num_scr_allow = 0; 1430 num_scr_allow = 0;
1383 selection_check (3); 1431
1432 row_col_t pos;
1433 pos.row = pos.col = 0;
1434 if (ROWCOL_IS_AFTER (selection.end, pos))
1435 CLEAR_SELECTION ();
1384 1436
1385 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1437 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1386 for (int row = nrow; row--; ) 1438 for (int row = nrow; row--; )
1387 { 1439 {
1388 line_t &line = ROW(row); 1440 line_t &line = ROW(row);
… …
1433 * Insert/Delete <count> characters from the current position 1485 * Insert/Delete <count> characters from the current position
1434 */ 1486 */
1435void 1487void
1436rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1488rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1437{ 1489{
1438 int col, row;
1439 rend_t tr;
1440
1441 want_refresh = 1; 1490 want_refresh = 1;
1442 ZERO_SCROLLBACK (); 1491 ZERO_SCROLLBACK ();
1443 1492
1444 if (count <= 0) 1493 if (count <= 0)
1445 return; 1494 return;
… …
1447 scr_do_wrap (); 1496 scr_do_wrap ();
1448 1497
1449 selection_check (1); 1498 selection_check (1);
1450 min_it (count, ncol - screen.cur.col); 1499 min_it (count, ncol - screen.cur.col);
1451 1500
1452 row = screen.cur.row; 1501 int row = screen.cur.row;
1453 1502
1454 line_t *line = &ROW(row); 1503 line_t *line = &ROW(row);
1455 1504
1456 line->touch (); 1505 line->touch ();
1457 line->is_longer (0); 1506 line->is_longer (0);
1458 1507
1508 // nuke wide spanning the start
1509 if (line->t[screen.cur.col] == NOCHAR)
1510 scr_kill_char (*line, screen.cur.col);
1511
1459 switch (insdel) 1512 switch (insdel)
1460 { 1513 {
1461 case INSERT: 1514 case INSERT:
1462 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1515 line->l = min (line->l + count, ncol);
1516
1517 if (line->t[screen.cur.col] == NOCHAR)
1518 scr_kill_char (*line, screen.cur.col);
1519
1520 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1463 { 1521 {
1464 line->t[col] = line->t[col - count]; 1522 line->t[col] = line->t[col - count];
1465 line->r[col] = line->r[col - count]; 1523 line->r[col] = line->r[col - count];
1466 } 1524 }
1467
1468 line->l = min (line->l + count, ncol);
1469 1525
1470 if (selection.op && current_screen == selection.screen 1526 if (selection.op && current_screen == selection.screen
1471 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1527 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1472 { 1528 {
1473 if (selection.end.row != screen.cur.row 1529 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1530 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1531 CLEAR_SELECTION ();
1476 else 1532 else
1533 {
1477 { /* shift selection */ 1534 /* shift selection */
1478 selection.beg.col += count; 1535 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1536 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1537 selection.end.col += count;
1481 } 1538 }
1482 } 1539 }
… …
1487 case ERASE: 1544 case ERASE:
1488 screen.cur.col += count; /* don't worry if > ncol */ 1545 screen.cur.col += count; /* don't worry if > ncol */
1489 selection_check (1); 1546 selection_check (1);
1490 screen.cur.col -= count; 1547 screen.cur.col -= count;
1491 1548
1492 line->l = max (line->l - count, 0); 1549 // nuke wide char after the end
1550 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1551 scr_kill_char (*line, screen.cur.col + count);
1552
1493 scr_blank_line (*line, screen.cur.col, count, rstyle); 1553 scr_blank_line (*line, screen.cur.col, count, rstyle);
1494 break; 1554 break;
1495 1555
1496 case DELETE: 1556 case DELETE:
1497 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1557 line->l = max (line->l - count, 0);
1498 1558
1559 // nuke wide char spanning the end
1560 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1561 scr_kill_char (*line, screen.cur.col + count);
1562
1499 for (col = screen.cur.col; (col + count) < ncol; col++) 1563 for (int col = screen.cur.col; (col + count) < ncol; col++)
1500 { 1564 {
1501 line->t[col] = line->t[col + count]; 1565 line->t[col] = line->t[col + count];
1502 line->r[col] = line->r[col + count]; 1566 line->r[col] = line->r[col + count];
1503 } 1567 }
1504 1568
1505 line->l = max (line->l - count, 0);
1506 scr_blank_line (*line, ncol - count, count, tr); 1569 scr_blank_line (*line, ncol - count, count, rstyle);
1507 1570
1508 if (selection.op && current_screen == selection.screen 1571 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1572 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1573 {
1511 if (selection.end.row != screen.cur.row 1574 if (selection.end.row != screen.cur.row
… …
1647 { 1710 {
1648 rvideo_state = on; 1711 rvideo_state = on;
1649 1712
1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1713 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1651#ifdef HAVE_BG_PIXMAP 1714#ifdef HAVE_BG_PIXMAP
1652 if (bgPixmap.pixmap == None) 1715 if (bg_pixmap == None)
1653#endif 1716#endif
1654 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1717 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1655 1718
1656 XGCValues gcvalue; 1719 XGCValues gcvalue;
1657 gcvalue.foreground = pix_colors[Color_fg]; 1720 gcvalue.foreground = pix_colors[Color_fg];
… …
1801 for (i = PART_BEG; i < RC_COUNT; i++) 1864 for (i = PART_BEG; i < RC_COUNT; i++)
1802 { 1865 {
1803 min_it (rc[i].col, ncol - 1); 1866 min_it (rc[i].col, ncol - 1);
1804 min_it (rc[i].row, nrow - 1); 1867 min_it (rc[i].row, nrow - 1);
1805 } 1868 }
1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1869
1807 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1870 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); 1871 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1809 1872
1810 num_scr_allow = 0; 1873 num_scr_allow = 0;
1811 1874
… …
1818 * Refresh the entire screen 1881 * Refresh the entire screen
1819 */ 1882 */
1820void 1883void
1821rxvt_term::scr_touch (bool refresh) NOTHROW 1884rxvt_term::scr_touch (bool refresh) NOTHROW
1822{ 1885{
1823 scr_expose (0, 0, width, height, refresh); 1886 scr_expose (0, 0, vt_width, vt_height, refresh);
1824} 1887}
1825 1888
1826/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
1827/* 1890/*
1828 * Move the display so that the line represented by scrollbar value Y is at 1891 * Move the display so that the line represented by scrollbar value Y is at
… …
1866 return true; 1929 return true;
1867} 1930}
1868 1931
1869#ifndef NO_BELL 1932#ifndef NO_BELL
1870void 1933void
1871rxvt_term::bell_cb (time_watcher &w) 1934rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1935{
1873 rvideo_bell = false; 1936 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1937 scr_rvideo_mode (rvideo_mode);
1938 refresh_check ();
1875} 1939}
1876#endif 1940#endif
1877 1941
1878/* ------------------------------------------------------------------------- */ 1942/* ------------------------------------------------------------------------- */
1879void 1943void
… …
1883 1947
1884# ifndef NO_MAPALERT 1948# ifndef NO_MAPALERT
1885# ifdef MAPALERT_OPTION 1949# ifdef MAPALERT_OPTION
1886 if (option (Opt_mapAlert)) 1950 if (option (Opt_mapAlert))
1887# endif 1951# endif
1888 XMapWindow (dpy, parent[0]); 1952 XMapWindow (dpy, parent);
1889# endif 1953# endif
1890 1954
1891# if ENABLE_FRILLS 1955# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell)) 1956 if (option (Opt_urgentOnBell))
1893 { 1957 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 1958# endif
1901 1959
1902 if (option (Opt_visualBell)) 1960 if (option (Opt_visualBell))
1903 { 1961 {
1904 rvideo_bell = true; 1962 rvideo_bell = true;
1905 scr_rvideo_mode (rvideo_mode); 1963 scr_rvideo_mode (rvideo_mode);
1906 display->flush (); 1964 flush ();
1907 1965
1908 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1966 bell_ev.start (VISUAL_BELL_DURATION);
1909 } 1967 }
1910 else 1968 else
1911 XBell (dpy, 0); 1969 XBell (dpy, 0);
1970 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1912#endif 1971#endif
1913} 1972}
1914 1973
1915/* ------------------------------------------------------------------------- */ 1974/* ------------------------------------------------------------------------- */
1916/* ARGSUSED */
1917void 1975void
1918rxvt_term::scr_printscreen (int fullhist) NOTHROW 1976rxvt_term::scr_printscreen (int fullhist) NOTHROW
1919{ 1977{
1920#ifdef PRINTPIPE 1978#ifdef PRINTPIPE
1921 int nrows, row_start; 1979 int nrows, row_start;
1922 FILE *fd; 1980 FILE *fd = popen_printer ();
1923 1981
1924 if ((fd = popen_printer ()) == NULL) 1982 if (!fd)
1925 return; 1983 return;
1926 1984
1927 if (fullhist) 1985 if (fullhist)
1928 { 1986 {
1929 nrows = nrow - top_row; 1987 nrows = nrow - top_row;
… …
1935 row_start = view_start; 1993 row_start = view_start;
1936 } 1994 }
1937 1995
1938 wctomb (0, 0); 1996 wctomb (0, 0);
1939 1997
1940 for (int r1 = 0; r1 < nrows; r1++) 1998 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1941 { 1999 {
1942 text_t *tp = ROW(r1).t; 2000 text_t *tp = ROW(r1).t;
1943 int len = ROW(r1).l; 2001 int len = ROW(r1).l;
1944 2002
1945 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2003 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1974 * screen.text/screen.rend contain what the screen will change to. 2032 * screen.text/screen.rend contain what the screen will change to.
1975 */ 2033 */
1976void 2034void
1977rxvt_term::scr_refresh () NOTHROW 2035rxvt_term::scr_refresh () NOTHROW
1978{ 2036{
1979 unsigned char have_bg,
1980 showcursor; /* show the cursor */
1981 int16_t col, row, /* column/row we're processing */ 2037 int16_t col, row, /* column/row we're processing */
1982 ocrow; /* old cursor row */ 2038 ocrow; /* old cursor row */
1983 int i; /* tmp */ 2039 int i; /* tmp */
1984#ifndef NO_CURSORCOLOR 2040#ifndef NO_CURSORCOLOR
1985 rend_t cc1; /* store colours at cursor position (s) */ 2041 rend_t cc1; /* store colours at cursor position (s) */
… …
1994 return; 2050 return;
1995 2051
1996 /* 2052 /*
1997 * A: set up vars 2053 * A: set up vars
1998 */ 2054 */
1999 have_bg = 0;
2000 refresh_count = 0; 2055 refresh_count = 0;
2001 2056
2057 unsigned int old_screen_flags = screen.flags;
2058 bool have_bg = 0;
2002#ifdef HAVE_BG_PIXMAP 2059#ifdef HAVE_BG_PIXMAP
2003 have_bg |= bgPixmap.pixmap != None; 2060 have_bg = bg_pixmap != None;
2004#endif 2061#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2063
2007 /* 2064 /*
2008 * B: reverse any characters which are selected 2065 * B: reverse any characters which are selected
2009 */ 2066 */
2010 scr_reverse_selection (); 2067 scr_reverse_selection ();
2011 2068
2069 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2070#if ENABLE_OVERLAY
2071 scr_swap_overlay ();
2072#endif
2073
2074 bool showcursor = screen.flags & Screen_VisibleCursor;
2075
2012 /* 2076 /*
2013 * C: set the cursor character (s) 2077 * C: set the cursor character (s)
2014 */ 2078 */
2015 { 2079 {
2016 unsigned char setoldcursor; 2080 bool setoldcursor;
2017 2081
2018 showcursor = (screen.flags & Screen_VisibleCursor);
2019#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2020 if (hidden_cursor) 2083 if (hidden_cursor)
2021 showcursor = 0; 2084 showcursor = 0;
2022#endif 2085#endif
2023 2086
… …
2051 ccol2 = bgcolor_of (rstyle); 2114 ccol2 = bgcolor_of (rstyle);
2052#else 2115#else
2053 ccol2 = Color_bg; 2116 ccol2 = Color_bg;
2054#endif 2117#endif
2055 2118
2056 if (showcursor && focus) 2119 if (focus)
2057 { 2120 {
2058 if (option (Opt_cursorUnderline)) 2121 if (option (Opt_cursorUnderline))
2059 *crp ^= RS_Uline; 2122 *crp ^= RS_Uline;
2060 else 2123 else
2061 { 2124 {
… …
2096 oldcursor.col = screen.cur.col; 2159 oldcursor.col = screen.cur.col;
2097 } 2160 }
2098 } 2161 }
2099 } 2162 }
2100 2163
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 2164#ifndef NO_SLOW_LINK_SUPPORT
2107 /* 2165 /*
2108 * D: CopyArea pass - very useful for slower links 2166 * D: CopyArea pass - very useful for slower links
2109 * This has been deliberately kept simple. 2167 * This has been deliberately kept simple.
2110 */ 2168 */
… …
2114 { 2172 {
2115 int16_t nits; 2173 int16_t nits;
2116 int i = num_scr; 2174 int i = num_scr;
2117 int j; 2175 int j;
2118 int len, wlen; 2176 int len, wlen;
2119 dLocal (int, num_scr);
2120 2177
2121 j = nrow; 2178 j = nrow;
2122 wlen = len = -1; 2179 wlen = len = -1;
2123 row = i > 0 ? 0 : j - 1; 2180 row = i > 0 ? 0 : j - 1;
2124 2181
… …
2199 continue; 2256 continue;
2200 2257
2201 // redraw one or more characters 2258 // redraw one or more characters
2202 2259
2203 // seek to the beginning of wide characters 2260 // seek to the beginning of wide characters
2204 while (stp[col] == NOCHAR && col > 0) 2261 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2205 --col; 2262 --col;
2206 2263
2207 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2264 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2208 text_t *text = stp + col; 2265 text_t *text = stp + col;
2209 int count = 1; 2266 int count = 1;
2210 2267
2211 dtp[col] = stp[col]; 2268 dtp[col] = stp[col];
2212 drp[col] = rend; 2269 drp[col] = rend;
… …
2216 for (i = 0; ++col < ncol; ) 2273 for (i = 0; ++col < ncol; )
2217 { 2274 {
2218 if (stp[col] == NOCHAR) 2275 if (stp[col] == NOCHAR)
2219 { 2276 {
2220 dtp[col] = stp[col]; 2277 dtp[col] = stp[col];
2221 drp[col] = rend; 2278 drp[col] = srp[col];
2279
2222 count++; 2280 count++;
2223 i++; 2281 i++;
2224 2282
2225 continue; 2283 continue;
2226 } 2284 }
… …
2246 2304
2247 col--; /* went one too far. move back */ 2305 col--; /* went one too far. move back */
2248 count -= i; /* dump any matching trailing chars */ 2306 count -= i; /* dump any matching trailing chars */
2249 2307
2250 // sometimes we optimize away the trailing NOCHAR's, add them back 2308 // sometimes we optimize away the trailing NOCHAR's, add them back
2251 while (i && text[count] == NOCHAR) 2309 while (ecb_unlikely (i && text[count] == NOCHAR))
2252 count++, i--; 2310 count++, i--;
2253 2311
2254 /* 2312 /*
2255 * Determine the attributes for the string 2313 * Determine the attributes for the string
2256 */ 2314 */
2257 int fore = fgcolor_of (rend); // desired foreground 2315 int fore = fgcolor_of (rend); // desired foreground
2258 int back = bgcolor_of (rend); // desired background 2316 int back = bgcolor_of (rend); // desired background
2259 2317
2260 // only do special processing if any attributes are set, which is unlikely 2318 // 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)) 2319 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2262 { 2320 {
2263 bool invert = rend & RS_RVid; 2321 bool invert = rend & RS_RVid;
2264 2322
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2323#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold
2267 && fore == Color_fg) 2324 if (rend & RS_Bold && fore == Color_fg)
2268 { 2325 {
2269 if (ISSET_PIXCOLOR (Color_BD)) 2326 if (ISSET_PIXCOLOR (Color_BD))
2270 fore = Color_BD; 2327 fore = Color_BD;
2271# if !ENABLE_STYLES 2328# if !ENABLE_STYLES
2272 else 2329 else
2273 invert = !invert; 2330 invert = !invert;
2274# endif 2331# endif
2275 } 2332 }
2276 2333
2277 if (rend & RS_Italic 2334 if (rend & RS_Italic && fore == Color_fg)
2278 && fore == Color_fg)
2279 { 2335 {
2280 if (ISSET_PIXCOLOR (Color_IT)) 2336 if (ISSET_PIXCOLOR (Color_IT))
2281 fore = Color_IT; 2337 fore = Color_IT;
2282# if !ENABLE_STYLES 2338# if !ENABLE_STYLES
2283 else 2339 else
… …
2287 2343
2288 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2344 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2289 fore = Color_UL; 2345 fore = Color_UL;
2290#endif 2346#endif
2291 2347
2348#ifdef OPTION_HC
2349 if (rend & RS_Sel)
2350 {
2351 /* invert the column if no highlightColor is set or it is the
2352 * current cursor column */
2353 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2354 && ISSET_PIXCOLOR (Color_HC))
2355 {
2356 if (ISSET_PIXCOLOR (Color_HTC))
2357 fore = Color_HTC;
2358 // if invert is 0 reverse video is set so we use bg color as fg color
2359 else if (!invert)
2360 fore = back;
2361
2362 back = Color_HC;
2363 invert = 0;
2364 }
2365 }
2366#endif
2367
2292 if (invert) 2368 if (invert)
2293 { 2369 {
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); 2370 ::swap (fore, back);
2301#ifdef OPTION_HC
2302 else if (ISSET_PIXCOLOR (Color_HC))
2303 back = Color_HC;
2304#endif
2305 2371
2306#ifndef NO_BOLD_UNDERLINE_REVERSE 2372#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) 2373 if (fore == back)
2312 { 2374 {
2313 fore = Color_bg; 2375 fore = Color_bg;
2314 back = Color_fg; 2376 back = Color_fg;
2315 } 2377 }
… …
2317 } 2379 }
2318 2380
2319#ifdef TEXT_BLINK 2381#ifdef TEXT_BLINK
2320 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2382 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2321 { 2383 {
2322 if (!text_blink_ev.active) 2384 if (!text_blink_ev.is_active ())
2323 { 2385 {
2324 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2386 text_blink_ev.again ();
2325 hidden_text = 0; 2387 hidden_text = 0;
2326 } 2388 }
2327 else if (hidden_text) 2389 else if (hidden_text)
2328 fore = back; 2390 fore = back;
2329 } 2391 }
… …
2351 /* 2413 /*
2352 * Actually do the drawing of the string here 2414 * Actually do the drawing of the string here
2353 */ 2415 */
2354 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2416 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2355 2417
2356 if (have_bg && back == Color_bg) 2418 if (ecb_likely (have_bg && back == Color_bg))
2357 { 2419 {
2358 // this is very ugly, maybe push it into ->draw? 2420 // this is very ugly, maybe push it into ->draw?
2359 2421
2360 for (i = 0; i < count; i++) /* don't draw empty strings */ 2422 for (i = 0; i < count; i++) /* don't draw empty strings */
2361 if (text[i] != ' ') 2423 if (text[i] != ' ')
… …
2368 did_clear: ; 2430 did_clear: ;
2369 } 2431 }
2370 else 2432 else
2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2433 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2372 2434
2373 if (rend & RS_Uline && font->descent > 1 && fore != back) 2435 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2374 { 2436 {
2375#if ENABLE_FRILLS 2437#if ENABLE_FRILLS
2376 if (ISSET_PIXCOLOR (Color_underline)) 2438 if (ISSET_PIXCOLOR (Color_underline))
2377 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2439 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2378 else 2440 else
2379#endif 2441#endif
2380 XSetForeground (dpy, gc, pix_colors[fore]); 2442 XSetForeground (dpy, gc, pix_colors[fore]);
2381 2443
2382 XDrawLine (dpy, drawBuffer, gc, 2444 XDrawLine (dpy, vt, gc,
2383 xpixel, ypixel + font->ascent + 1, 2445 xpixel, ypixel + font->ascent + 1,
2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2446 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2385 } 2447 }
2386 } /* for (col....) */ 2448 } /* for (col....) */
2387 } /* for (row....) */ 2449 } /* for (row....) */
2388
2389#if ENABLE_OVERLAY
2390 scr_swap_overlay ();
2391#endif
2392 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2393 2450
2394 /* 2451 /*
2395 * G: cleanup cursor and display outline cursor if necessary 2452 * G: cleanup cursor and display outline cursor if necessary
2396 */ 2453 */
2397 if (showcursor) 2454 if (showcursor)
… …
2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2482 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else 2483 else
2427#endif 2484#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]); 2485 XSetForeground (dpy, gc, pix_colors[ccol1]);
2429 2486
2430 XDrawRectangle (dpy, drawBuffer, gc, 2487 XDrawRectangle (dpy, vt, gc,
2431 Col2Pixel (col), 2488 Col2Pixel (col),
2432 Row2Pixel (oldcursor.row), 2489 Row2Pixel (oldcursor.row),
2433 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2490 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2491 (unsigned int) (Height2Pixel (1) - 1));
2435 } 2492 }
2436 } 2493 }
2437 2494
2438 /* 2495 /*
2439 * H: cleanup selection 2496 * H: cleanup selection
2440 */ 2497 */
2498#if ENABLE_OVERLAY
2499 scr_swap_overlay ();
2500#endif
2501 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2502
2441 scr_reverse_selection (); 2503 scr_reverse_selection ();
2442 2504
2505 screen.flags = old_screen_flags;
2443 num_scr = 0; 2506 num_scr = 0;
2444 num_scr_allow = 1; 2507 num_scr_allow = 1;
2445} 2508}
2446 2509
2447void 2510void
2448rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2511rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2449{ 2512{
2450 if (!l.t) 2513 if (!l.valid ())
2451 return; 2514 return;
2452 2515
2453 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2516 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2454 2517
2455 for (int i = ncol; i--; ) 2518 for (int i = ncol; i--; )
… …
2468 scr_remap_chars (swap_buf [i]); 2531 scr_remap_chars (swap_buf [i]);
2469 } 2532 }
2470} 2533}
2471 2534
2472void 2535void
2473rxvt_term::scr_recolour () NOTHROW 2536rxvt_term::scr_recolour (bool refresh) NOTHROW
2474{ 2537{
2538 bool transparent = false;
2539
2475#ifdef HAVE_BG_PIXMAP 2540#ifdef HAVE_BG_PIXMAP
2476 bgPixmap.apply (); 2541 if (bg_pixmap != None)
2477#else 2542 {
2543# ifdef ENABLE_TRANSPARENCY
2544 if (bg_flags & BG_IS_TRANSPARENT)
2545 {
2546 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2547 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2548
2549 transparent = true;
2550 }
2551 else
2552# endif
2553 {
2554 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2555 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2556 }
2557 }
2558 else
2559#endif
2560 {
2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2561 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2479 XClearWindow (dpy, parent[0]);
2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2562 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2481# if HAVE_SCROLLBARS 2563 }
2564
2565 XClearWindow (dpy, parent);
2566
2482 if (scrollBar.win) 2567 if (scrollBar.win)
2483 { 2568 {
2569 if (transparent)
2570 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2571 else
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2572 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2573 scrollBar.state = SB_STATE_IDLE;
2486 scrollbar_show (0); 2574 scrollBar.show (0);
2487 } 2575 }
2488# endif 2576
2577 if (refresh)
2578 {
2489 scr_clear (); 2579 scr_clear ();
2490 scr_touch (true); 2580 scr_touch (true);
2581 }
2491 want_refresh = 1; 2582 want_refresh = 1;
2492#endif
2493
2494} 2583}
2495 2584
2496/* ------------------------------------------------------------------------- */ 2585/* ------------------------------------------------------------------------- */
2497void 2586void
2498rxvt_term::scr_clear (bool really) NOTHROW 2587rxvt_term::scr_clear (bool really) NOTHROW
… …
2565 { 2654 {
2566#if !ENABLE_MINIMAL 2655#if !ENABLE_MINIMAL
2567 if (selection.rect) 2656 if (selection.rect)
2568 scr_xor_rect (selection.beg.row, selection.beg.col, 2657 scr_xor_rect (selection.beg.row, selection.beg.col,
2569 selection.end.row, selection.end.col, 2658 selection.end.row, selection.end.col,
2570 RS_RVid, RS_RVid | RS_Uline); 2659 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2571 else 2660 else
2572#endif 2661#endif
2573 scr_xor_span (selection.beg.row, selection.beg.col, 2662 scr_xor_span (selection.beg.row, selection.beg.col,
2574 selection.end.row, selection.end.col, 2663 selection.end.row, selection.end.col,
2575 RS_RVid); 2664 RS_Sel | RS_RVid);
2576 } 2665 }
2577} 2666}
2578 2667
2579/* ------------------------------------------------------------------------- */ 2668/* ------------------------------------------------------------------------- */
2580/* 2669/*
… …
2583 */ 2672 */
2584#if 0 2673#if 0
2585void 2674void
2586rxvt_term::scr_dump (int fd) NOTHROW 2675rxvt_term::scr_dump (int fd) NOTHROW
2587{ 2676{
2588 int row, wrote; 2677 // if this method is needed, it can be implemented by factoring the
2589 unsigned int width, towrite; 2678 // 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} 2679}
2609#endif 2680#endif
2610 2681
2611/* ------------------------------------------------------------------------- * 2682/* ------------------------------------------------------------------------- *
2612 * CHARACTER SELECTION * 2683 * CHARACTER SELECTION *
2613 * ------------------------------------------------------------------------- */ 2684 * ------------------------------------------------------------------------- */
2614void 2685void
2615rxvt_term::selection_check (int check_more) NOTHROW 2686rxvt_term::selection_check (int check_more) NOTHROW
2616{ 2687{
2617 row_col_t pos;
2618
2619 if (!selection.op) 2688 if (!selection.op)
2620 return; 2689 return;
2621 2690
2622 pos.row = pos.col = 0;
2623 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2691 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2624 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2692 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2625 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2626 || (check_more == 1 2694 || (check_more == 1
2627 && current_screen == selection.screen 2695 && current_screen == selection.screen
2628 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2696 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2629 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2697 && 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 (); 2698 CLEAR_ALL_SELECTION ();
2639} 2699}
2640 2700
2641/* ------------------------------------------------------------------------- */ 2701/* ------------------------------------------------------------------------- */
2642/* 2702/*
2643 * Paste a selection direct to the command fd 2703 * Paste a selection direct to the command fd
2644 */ 2704 */
2645void 2705void
2646rxvt_term::paste (char *data, unsigned int len) NOTHROW 2706rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2647{ 2707{
2648 /* convert normal newline chars into common keyboard Return key sequence */ 2708 /* convert normal newline chars into common keyboard Return key sequence */
2649 for (unsigned int i = 0; i < len; i++) 2709 for (unsigned int i = 0; i < len; i++)
2650 if (data[i] == C0_LF) 2710 if (data[i] == C0_LF)
2651 data[i] = C0_CR; 2711 data[i] = C0_CR;
2652 2712
2713 if (priv_modes & PrivMode_BracketPaste)
2714 tt_printf ("\x1b[200~");
2715
2653 tt_write (data, len); 2716 tt_write (data, len);
2654}
2655 2717
2656/* ------------------------------------------------------------------------- */ 2718 if (priv_modes & PrivMode_BracketPaste)
2657/* 2719 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} 2720}
2822 2721
2823void 2722void
2824rxvt_term::incr_cb (time_watcher &w) NOTHROW 2723rxvt_term::paste (char *data, unsigned int len) NOTHROW
2825{ 2724{
2826 selection_wait = Sel_none; 2725 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; 2726 return;
2839 2727
2840 selection_paste (win, prop, true); 2728 tt_paste (data, len);
2841} 2729}
2842 2730
2843/* ------------------------------------------------------------------------- */ 2731/* ------------------------------------------------------------------------- */
2844/* 2732/*
2845 * Request the current selection: 2733 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2846 * Order: > internal selection if available 2734 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2847 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2735 * 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 2736 * EXT: button 2 release
2852 */ 2737 */
2853void 2738void
2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2739rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2855{ 2740{
2856 if (selection.text && selnum == Sel_Primary) 2741 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 } 2742 {
2863 else 2743 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2744 selection_req->run ();
2864 { 2745 }
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} 2746}
2906 2747
2907/* ------------------------------------------------------------------------- */ 2748/* ------------------------------------------------------------------------- */
2908/* 2749/*
2909 * Clear all selected text 2750 * Clear all selected text
2910 * EXT: SelectionClear 2751 * EXT: SelectionClear
2911 */ 2752 */
2912void 2753void
2913rxvt_term::selection_clear () NOTHROW 2754rxvt_term::selection_clear (bool clipboard) NOTHROW
2914{ 2755{
2756 if (!clipboard)
2757 {
2915 want_refresh = 1; 2758 want_refresh = 1;
2916 free (selection.text); 2759 free (selection.text);
2917 selection.text = NULL; 2760 selection.text = NULL;
2918 selection.len = 0; 2761 selection.len = 0;
2919 CLEAR_SELECTION (); 2762 CLEAR_SELECTION ();
2920 2763
2921 if (display->selection_owner == this) 2764 if (display->selection_owner == this)
2922 display->selection_owner = 0; 2765 display->selection_owner = 0;
2766 }
2767 else
2768 {
2769 free (selection.clip_text);
2770 selection.clip_text = NULL;
2771 selection.clip_len = 0;
2772
2773 if (display->clipboard_owner == this)
2774 display->clipboard_owner = 0;
2775 }
2923} 2776}
2924 2777
2925/* ------------------------------------------------------------------------- */ 2778/* ------------------------------------------------------------------------- */
2926/* 2779/*
2927 * Copy a selection into the cut buffer 2780 * Copy a selection into the cut buffer
2928 * EXT: button 1 or 3 release 2781 * EXT: button 1 or 3 release
2929 */ 2782 */
2930void 2783void
2931rxvt_term::selection_make (Time tm) 2784rxvt_term::selection_make (Time tm)
2932{ 2785{
2933 int i; 2786 int size;
2934 wchar_t *new_selection_text; 2787 wchar_t *new_selection_text;
2935 text_t *t; 2788 text_t *t;
2936 2789
2937 switch (selection.op) 2790 switch (selection.op)
2938 { 2791 {
… …
2954 return; /* nothing selected, go away */ 2807 return; /* nothing selected, go away */
2955 2808
2956 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2809 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2957 return; 2810 return;
2958 2811
2959 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2812 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2960 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2813 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2961 2814
2962 int ofs = 0; 2815 int ofs = 0;
2963 int extra = 0; 2816 int extra = 0;
2964 2817
2965 int col = selection.beg.col; 2818 int col = selection.beg.col;
… …
2971 { 2824 {
2972#if !ENABLE_MINIMAL 2825#if !ENABLE_MINIMAL
2973 if (selection.rect) 2826 if (selection.rect)
2974 { 2827 {
2975 col = selection.beg.col; 2828 col = selection.beg.col;
2976 end_col = ncol + 1; 2829 end_col = selection.end.col;
2977 } 2830 }
2978 else 2831 else
2979#endif 2832#endif
2980 end_col = ROW(row).l; 2833 end_col = ROW(row).l;
2981 2834
2982 col = max (col, 0); 2835 col = max (col, 0);
2983 2836
2984 if (row == selection.end.row 2837 if (row == selection.end.row)
2985#if !ENABLE_MINIMAL
2986 || selection.rect
2987#endif
2988 )
2989 min_it (end_col, selection.end.col); 2838 min_it (end_col, selection.end.col);
2990 2839
2991 t = ROW(row).t + col; 2840 t = ROW(row).t + col;
2992 2841
2993 for (; col < end_col; col++) 2842 for (; col < end_col; col++)
… …
3001 2850
3002 extra -= (len - 1); 2851 extra -= (len - 1);
3003 2852
3004 if (extra < 0) 2853 if (extra < 0)
3005 { 2854 {
3006 extra += i; 2855 extra += size;
3007 i += i; 2856 size += size;
3008 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2857 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3009 } 2858 }
3010 2859
3011 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2860 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3012 } 2861 }
3013#endif 2862#endif
… …
3025 2874
3026 new_selection_text[ofs++] = C0_LF; 2875 new_selection_text[ofs++] = C0_LF;
3027 } 2876 }
3028 else 2877 else
3029#endif 2878#endif
3030 if (!ROW(row).is_longer () && row != selection.end.row) 2879 if (!ROW(row).is_longer ()
2880 && (row != selection.end.row || end_col != selection.end.col)
2881 && (row != selection.beg.row || selection.beg.col < ncol))
3031 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3032 } 2883 }
3033
3034 if (end_col != selection.end.col)
3035 new_selection_text[ofs++] = C0_LF;
3036 2884
3037 new_selection_text[ofs] = 0; 2885 new_selection_text[ofs] = 0;
3038 2886
3039 if (ofs == 0) 2887 if (ofs == 0)
3040 { 2888 {
… …
3053 2901
3054 selection_grab (tm); 2902 selection_grab (tm);
3055} 2903}
3056 2904
3057bool 2905bool
3058rxvt_term::selection_grab (Time tm) NOTHROW 2906rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3059{ 2907{
2908 Atom sel;
2909
2910 if (!clipboard)
2911 {
3060 selection_time = tm; 2912 selection_time = tm;
2913 sel = XA_PRIMARY;
2914 }
2915 else
2916 {
2917 clipboard_time = tm;
2918 sel = xa[XA_CLIPBOARD];
2919 }
3061 2920
3062 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2921 XSetSelectionOwner (dpy, sel, vt, tm);
3063 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2922 if (XGetSelectionOwner (dpy, sel) == vt)
3064 { 2923 {
3065 display->set_selection_owner (this); 2924 display->set_selection_owner (this, clipboard);
3066 return true; 2925 return true;
3067 } 2926 }
3068 else 2927 else
3069 { 2928 {
3070 selection_clear (); 2929 selection_clear (clipboard);
3071 return false; 2930 return false;
3072 } 2931 }
3073 2932
3074#if 0 2933#if 0
3075 XTextProperty ct; 2934 XTextProperty ct;
… …
3130 while (selection.mark.col > 0 2989 while (selection.mark.col > 0
3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 2990 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3132 --selection.mark.col; 2991 --selection.mark.col;
3133 2992
3134 if (selection.op) 2993 if (selection.op)
2994 {
3135 { /* clear the old selection */ 2995 /* clear the old selection */
3136 selection.beg.row = selection.end.row = selection.mark.row; 2996 selection.beg.row = selection.end.row = selection.mark.row;
3137 selection.beg.col = selection.end.col = selection.mark.col; 2997 selection.beg.col = selection.end.col = selection.mark.col;
3138 } 2998 }
3139 2999
3140 selection.op = SELECTION_INIT; 3000 selection.op = SELECTION_INIT;
… …
3329 * a point/word/line which is either the start or end of the selection 3189 * 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 3190 * and it was decided by whichever point/word/line was `fixed' at the
3331 * time of the most recent button3 press 3191 * time of the most recent button3 press
3332 */ 3192 */
3333 if (button3 && buttonpress) 3193 if (button3 && buttonpress)
3194 {
3334 { /* button3 press */ 3195 /* button3 press */
3335 /* 3196 /*
3336 * first determine which edge of the selection we are closest to 3197 * first determine which edge of the selection we are closest to
3337 */ 3198 */
3338 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3199 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3339 || (!ROWCOL_IS_AFTER (pos, selection.end) 3200 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3357 selection.mark.row = selection.beg.row; 3218 selection.mark.row = selection.beg.row;
3358 selection.mark.col = selection.beg.col; 3219 selection.mark.col = selection.beg.col;
3359 } 3220 }
3360 } 3221 }
3361 else 3222 else
3223 {
3362 { /* button1 drag or button3 drag */ 3224 /* button1 drag or button3 drag */
3363 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3225 if (ROWCOL_IS_AFTER (selection.mark, pos))
3364 { 3226 {
3365 if (selection.mark.row == selection.end.row 3227 if (selection.mark.row == selection.end.row
3366 && selection.mark.col == selection.end.col 3228 && selection.mark.col == selection.end.col
3367 && clickchange 3229 && clickchange
… …
3448 selection.end.row++; 3310 selection.end.row++;
3449 } 3311 }
3450 } 3312 }
3451 3313
3452 if (button3 && buttonpress) 3314 if (button3 && buttonpress)
3315 {
3453 { /* mark may need to be changed */ 3316 /* mark may need to be changed */
3454 if (closeto == LEFT) 3317 if (closeto == LEFT)
3455 { 3318 {
3456 selection.mark.row = selection.end.row; 3319 selection.mark.row = selection.end.row;
3457 selection.mark.col = selection.end.col - (selection.clicks == 2); 3320 selection.mark.col = selection.end.col - (selection.clicks == 2);
3458 } 3321 }
… …
3531 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3532 */ 3395 */
3533void 3396void
3534rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3535{ 3398{
3399 Atom property = rq.property == None ? rq.target : rq.property;
3536 XSelectionEvent ev; 3400 XSelectionEvent ev;
3537 3401
3538 ev.type = SelectionNotify; 3402 ev.type = SelectionNotify;
3539 ev.property = None; 3403 ev.property = None;
3540 ev.display = rq.display; 3404 ev.display = rq.display;
… …
3555 *target++ = xa[XA_COMPOUND_TEXT]; 3419 *target++ = xa[XA_COMPOUND_TEXT];
3556#if X_HAVE_UTF8_STRING 3420#if X_HAVE_UTF8_STRING
3557 *target++ = xa[XA_UTF8_STRING]; 3421 *target++ = xa[XA_UTF8_STRING];
3558#endif 3422#endif
3559 3423
3560 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3424 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3561 32, PropModeReplace, 3425 32, PropModeReplace,
3562 (unsigned char *)target_list, target - target_list); 3426 (unsigned char *)target_list, target - target_list);
3563 ev.property = rq.property; 3427 ev.property = property;
3564 } 3428 }
3565#if TODO // TODO 3429#if TODO // TODO
3566 else if (rq.target == xa[XA_MULTIPLE]) 3430 else if (rq.target == xa[XA_MULTIPLE])
3567 { 3431 {
3568 /* TODO: Handle MULTIPLE */ 3432 /* TODO: Handle MULTIPLE */
3569 } 3433 }
3570#endif 3434#endif
3571 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3435 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3572 { 3436 {
3573 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3437 XChangeProperty (dpy, rq.requestor, property, rq.target,
3574 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3438 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3575 ev.property = rq.property; 3439 ev.property = property;
3440 }
3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3442 {
3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3444 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3445 ev.property = property;
3576 } 3446 }
3577 else if (rq.target == XA_STRING 3447 else if (rq.target == XA_STRING
3578 || rq.target == xa[XA_TEXT] 3448 || rq.target == xa[XA_TEXT]
3579 || rq.target == xa[XA_COMPOUND_TEXT] 3449 || rq.target == xa[XA_COMPOUND_TEXT]
3580 || rq.target == xa[XA_UTF8_STRING] 3450 || rq.target == xa[XA_UTF8_STRING]
… …
3612 { 3482 {
3613 target = xa[XA_COMPOUND_TEXT]; 3483 target = xa[XA_COMPOUND_TEXT];
3614 style = enc_compound_text; 3484 style = enc_compound_text;
3615 } 3485 }
3616 3486
3617 if (selection.text) 3487 if (rq.selection == XA_PRIMARY && selection.text)
3618 { 3488 {
3619 cl = selection.text; 3489 cl = selection.text;
3620 selectlen = selection.len; 3490 selectlen = selection.len;
3491 }
3492 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3493 {
3494 cl = selection.clip_text;
3495 selectlen = selection.clip_len;
3621 } 3496 }
3622 else 3497 else
3623 { 3498 {
3624 cl = L""; 3499 cl = L"";
3625 selectlen = 0; 3500 selectlen = 0;
… …
3646 ct.value = (unsigned char *)cl; 3521 ct.value = (unsigned char *)cl;
3647 ct.nitems = selectlen; 3522 ct.nitems = selectlen;
3648 ct.encoding = target; 3523 ct.encoding = target;
3649 } 3524 }
3650 3525
3651 XChangeProperty (dpy, rq.requestor, rq.property, 3526 XChangeProperty (dpy, rq.requestor, property,
3652 ct.encoding, 8, PropModeReplace, 3527 ct.encoding, 8, PropModeReplace,
3653 ct.value, (int)ct.nitems); 3528 ct.value, (int)ct.nitems);
3654 ev.property = rq.property; 3529 ev.property = property;
3655 3530
3656 if (freect) 3531 if (freect)
3657 XFree (ct.value); 3532 XFree (ct.value);
3658 } 3533 }
3659 3534
… …
3693 h += 2; min_it (h, nrow); 3568 h += 2; min_it (h, nrow);
3694 3569
3695 x -= 1; clamp_it (x, 0, ncol - w); 3570 x -= 1; clamp_it (x, 0, ncol - w);
3696 y -= 1; clamp_it (y, 0, nrow - h); 3571 y -= 1; clamp_it (y, 0, nrow - h);
3697 3572
3698 ov_x = x; ov_y = y; 3573 ov.x = x; ov.y = y;
3699 ov_w = w; ov_h = h; 3574 ov.w = w; ov.h = h;
3700 3575
3701 ov_text = new text_t *[h]; 3576 ov.text = new text_t *[h];
3702 ov_rend = new rend_t *[h]; 3577 ov.rend = new rend_t *[h];
3703 3578
3704 for (y = 0; y < h; y++) 3579 for (y = 0; y < h; y++)
3705 { 3580 {
3706 text_t *tp = ov_text[y] = new text_t[w]; 3581 text_t *tp = ov.text[y] = new text_t[w];
3707 rend_t *rp = ov_rend[y] = new rend_t[w]; 3582 rend_t *rp = ov.rend[y] = new rend_t[w];
3708 3583
3709 text_t t0, t1, t2; 3584 text_t t0, t1, t2;
3710 rend_t r = OVERLAY_RSTYLE; 3585 rend_t r = OVERLAY_RSTYLE;
3711 3586
3712 if (y == 0) 3587 if (y == 0)
… …
3731} 3606}
3732 3607
3733void 3608void
3734rxvt_term::scr_overlay_off () NOTHROW 3609rxvt_term::scr_overlay_off () NOTHROW
3735{ 3610{
3736 if (!ov_text) 3611 if (!ov.text)
3737 return; 3612 return;
3738 3613
3739 want_refresh = 1; 3614 want_refresh = 1;
3740 3615
3741 for (int y = 0; y < ov_h; y++) 3616 for (int y = 0; y < ov.h; y++)
3742 { 3617 {
3743 delete [] ov_text[y]; 3618 delete [] ov.text[y];
3744 delete [] ov_rend[y]; 3619 delete [] ov.rend[y];
3745 } 3620 }
3746 3621
3747 delete [] ov_text; ov_text = 0; 3622 delete [] ov.text; ov.text = 0;
3748 delete [] ov_rend; ov_rend = 0; 3623 delete [] ov.rend; ov.rend = 0;
3749} 3624}
3750 3625
3751void 3626void
3752rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3627rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3753{ 3628{
3754 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3629 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3755 return; 3630 return;
3756 3631
3757 x++, y++; 3632 x++, y++;
3758 3633
3759 ov_text[y][x] = text; 3634 ov.text[y][x] = text;
3760 ov_rend[y][x] = rend; 3635 ov.rend[y][x] = rend;
3761} 3636}
3762 3637
3763void 3638void
3764rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3639rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3765{ 3640{
… …
3784} 3659}
3785 3660
3786void 3661void
3787rxvt_term::scr_swap_overlay () NOTHROW 3662rxvt_term::scr_swap_overlay () NOTHROW
3788{ 3663{
3789 if (!ov_text) 3664 if (!ov.text)
3790 return; 3665 return;
3791 3666
3667 // hide cursor if it is within the overlay area
3668 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3669 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3670 screen.flags &= ~Screen_VisibleCursor;
3671
3792 // swap screen mem with overlay 3672 // swap screen mem with overlay
3793 for (int y = ov_h; y--; ) 3673 for (int y = ov.h; y--; )
3794 { 3674 {
3795 text_t *t1 = ov_text[y]; 3675 text_t *t1 = ov.text[y];
3796 rend_t *r1 = ov_rend[y]; 3676 rend_t *r1 = ov.rend[y];
3797 3677
3798 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3678 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3799 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3679 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3800 3680
3801 for (int x = ov_w; x--; ) 3681 for (int x = ov.w; x--; )
3802 { 3682 {
3803 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3683 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3804 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3684 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3805 } 3685 }
3806 } 3686 }

Diff Legend

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