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.294 by root, Wed Jan 9 00:51:50 2008 UTC vs.
Revision 1.419 by root, Fri Jun 1 08:12:09 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-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 80 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 81#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 83
87/* 84/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 85 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 86 */
92#define drawBuffer vt
93
94#define CLEAR_ROWS(row, num) \
95 if (mapped) \
96 XClearArea (dpy, drawBuffer, 0, \
97 Row2Pixel (row), (unsigned int)width, \
98 (unsigned int)Height2Pixel (num), False)
99
100#define CLEAR_CHARS(x, y, num) \ 87#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 88 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 89 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 90 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 91 (unsigned int)Height2Pixel (1), False)
105
106#define ERASE_ROWS(row, num) \
107 XFillRectangle (dpy, drawBuffer, gc, \
108 0, Row2Pixel (row), \
109 (unsigned int)width, \
110 (unsigned int)Height2Pixel (num))
111 92
112/* ------------------------------------------------------------------------- * 93/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 94 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 95 * ------------------------------------------------------------------------- */
115 96
116/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
117void 98void
118rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
119{ 100{
120 if (!l.t) 101 if (!l.valid ())
121 { 102 {
122 lalloc (l); 103 l.alloc ();
123 col = 0; 104 col = 0;
124 width = ncol; 105 width = ncol;
125 } 106 }
126 107
127 l.touch (); 108 l.touch ();
… …
146{ 127{
147 scr_blank_line (l, 0, ncol, efs); 128 scr_blank_line (l, 0, ncol, efs);
148 129
149 l.l = 0; 130 l.l = 0;
150 l.f = 0; 131 l.f = 0;
132}
133
134// nuke a single wide character at the given column
135void
136rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
137{
138 // find begin
139 while (col > 0 && l.t[col] == NOCHAR)
140 col--;
141
142 rend_t rend = l.r[col] & ~RS_baseattrMask;
143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
146
147 // found start, nuke
148 do {
149 l.t[col] = ' ';
150 l.r[col] = rend;
151 col++;
152 } while (col < ncol && l.t[col] == NOCHAR);
151} 153}
152 154
153/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
156 158
157void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = rxvt_malloc (chunk_size);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
158rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
159{ 195{
160#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
161 scr_overlay_off (); 197 scr_overlay_off ();
162#endif 198#endif
163 199
164 rvideo_mode = false;
165 view_start = 0; 200 view_start = 0;
166 num_scr = 0; 201 num_scr = 0;
167 202
168 if (ncol == 0) 203 if (ncol == 0)
169 ncol = 80; 204 ncol = 80;
… …
171 if (nrow == 0) 206 if (nrow == 0)
172 nrow = 24; 207 nrow = 24;
173 208
174 if (ncol == prev_ncol && nrow == prev_nrow) 209 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 210 return;
176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179 211
180 // we need at least two lines for wrapping to work correctly 212 // we need at least two lines for wrapping to work correctly
181 while (nrow + saveLines < 2) 213 while (nrow + saveLines < 2)
182 { 214 {
183 //TODO//FIXME 215 //TODO//FIXME
… …
192 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
193 225
194 screen.tscroll = 0; 226 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
196 228
229 void *prev_chunk = chunk;
230 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf;
233
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc ();
237
197 if (!row_buf) 238 if (!prev_row_buf)
198 { 239 {
199 /* 240 /*
200 * first time called so just malloc everything: don't rely on realloc 241 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
201 */ 242 */
202 top_row = 0; 243 top_row = 0;
203 term_start = 0; 244 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 245
219 memset (charsets, 'B', sizeof (charsets)); 246 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 247 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 248 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 249 screen.cur.row = screen.cur.col = 0;
… …
236 selection.text = NULL; 263 selection.text = NULL;
237 selection.len = 0; 264 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 265 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 266 selection.screen = PRIMARY;
240 selection.clicks = 0; 267 selection.clicks = 0;
268 selection.clip_text = NULL;
269 selection.clip_len = 0;
241 } 270 }
242 else 271 else
243 { 272 {
244 /* 273 /*
245 * add or delete rows as appropriate 274 * add or delete rows as appropriate
246 */ 275 */
247 276
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--; ) 277 for (int row = min (nrow, prev_nrow); row--; )
266 { 278 {
267 lresize (drawn_buf[row]); 279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268 lresize (swap_buf [row]); 280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 }
270 281
271 for (int row = prev_nrow; row < nrow; row++) 282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
272 { 286 }
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 287
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 289 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 290 int q = total_rows; // rewrapped row
283 291
284 if (top_row) 292 if (top_row)
285 { 293 {
286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 294 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 295 // to come up with a lean and mean algorithm.
296 // TODO: maybe optimise when width didn't change
288 297
289 row_col_t ocur = screen.cur; 298 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 299 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 300
292 do 301 do
293 { 302 {
294 p = MOD (p - 1, prev_total_rows); 303 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 304 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 305 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 306 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
300 307
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 308 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 { 309 {
303 p = MOD (p - 1, prev_total_rows); 310 p = MOD (p - 1, prev_total_rows);
304 311
305 plines++; 312 plines++;
306 llen += prev_ncol; 313 llen += prev_ncol;
… …
319 326
320 // re-assemble the full line by destination lines 327 // re-assemble the full line by destination lines
321 for (int qrow = q; qlines--; qrow++) 328 for (int qrow = q; qlines--; qrow++)
322 { 329 {
323 qline = row_buf + qrow; 330 qline = row_buf + qrow;
324 lalloc (*qline); 331 qline->alloc (); // redundant with next line
325 qline->l = ncol; 332 qline->l = ncol;
326 qline->is_longer (1); 333 qline->is_longer (1);
327 334
328 int qcol = 0; 335 int qcol = 0;
329 336
… …
344 // this seems to upset applications/shells/readline 351 // this seems to upset applications/shells/readline
345 // least. 352 // least.
346 if (prow == ocur.row) 353 if (prow == ocur.row)
347 screen.cur.row = q - (total_rows - nrow); 354 screen.cur.row = q - (total_rows - nrow);
348 355
349 line_t &pline = old_buf [prow]; 356 line_t &pline = prev_row_buf [prow];
350 357
351 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 358 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
352 359
353 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 360 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
354 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 361 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
375 { 382 {
376 // if no scrollback exists (yet), wing, instead of wrap 383 // if no scrollback exists (yet), wing, instead of wrap
377 384
378 for (int row = min (nrow, prev_nrow); row--; ) 385 for (int row = min (nrow, prev_nrow); row--; )
379 { 386 {
380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
381 line_t &qline = row_buf [row]; 388 line_t &dst = row_buf [row];
382 389
383 qline = pline; 390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
384 lresize (qline); 391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
385 } 394 }
386 395
387 for (int row = prev_nrow; row < nrow; row++) 396 for (int row = prev_nrow; row < nrow; row++)
388 {
389 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
390 }
391 398
392 term_start = 0; 399 term_start = 0;
393 } 400 }
394
395 free (old_buf);
396 delete old_ta;
397 delete old_ra;
398 401
399 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
404 }
401 405
406 for (int row = nrow; row--; )
407 {
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 }
412
413 free (prev_chunk);
414
402 free (tabs); 415 free (tabs);
403 } 416 tabs = (char *)rxvt_malloc (ncol);
417
418 for (int col = ncol; col--; )
419 tabs [col] = col % TABSIZE == 0;
404 420
405 CLEAR_ALL_SELECTION (); 421 CLEAR_ALL_SELECTION ();
406 422
407 prev_nrow = nrow; 423 prev_nrow = nrow;
408 prev_ncol = ncol; 424 prev_ncol = ncol;
409 425
410 tabs = (char *)rxvt_malloc (ncol); 426 tt_winch ();
411 427
412 for (int col = ncol; --col; ) 428 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
413 tabs [col] = col % TABSIZE == 0; 429}
430
431void ecb_cold
432rxvt_term::scr_release () NOTHROW
433{
434 free (chunk); chunk = 0; row_buf = 0;
435 free (tabs); tabs = 0;
436}
437
438/* ------------------------------------------------------------------------- */
439/*
440 * Hard/Soft reset
441 */
442void ecb_cold
443rxvt_term::scr_poweron ()
444{
445 scr_release ();
446
447 prev_nrow = prev_ncol = 0;
448 rvideo_mode = false;
449 scr_soft_reset ();
450 scr_reset ();
451
452 scr_clear (true);
453 scr_refresh ();
454}
455
456void ecb_cold
457rxvt_term::scr_soft_reset () NOTHROW
458{
459 /* only affects modes, nothing drastic such as clearing the screen */
460#if ENABLE_OVERLAY
461 scr_overlay_off ();
462#endif
414 463
415 if (current_screen != PRIMARY) 464 if (current_screen != PRIMARY)
416 scr_swap_screen (); 465 scr_swap_screen ();
417 466
418 tt_winch (); 467 scr_scroll_region (0, MAX_ROWS - 1);
419 468 scr_rendition (0, ~RS_None);
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 469 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} 470}
458 471
459/* ------------------------------------------------------------------------- * 472/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 473 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 474 * ------------------------------------------------------------------------- */
… …
499 } 512 }
500 513
501 /* boundary check in case screen size changed between SAVE and RESTORE */ 514 /* boundary check in case screen size changed between SAVE and RESTORE */
502 min_it (s->cur.row, nrow - 1); 515 min_it (s->cur.row, nrow - 1);
503 min_it (s->cur.col, ncol - 1); 516 min_it (s->cur.col, ncol - 1);
504#ifdef DEBUG_STRICT
505 assert (s->cur.row >= 0); 517 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 518 assert (s->cur.col >= 0);
507#endif
508} 519}
509 520
510void 521void
511rxvt_term::scr_swap_screen () 522rxvt_term::scr_swap_screen () NOTHROW
512{ 523{
513 if (!option (Opt_secondaryScreen)) 524 if (!option (Opt_secondaryScreen))
514 return; 525 return;
515 526
516 for (int i = prev_nrow; i--; ) 527 for (int i = prev_nrow; i--; )
… …
535 return; 546 return;
536 547
537 want_refresh = 1; 548 want_refresh = 1;
538 view_start = 0; 549 view_start = 0;
539 550
540 selection_check (2); /* check for boundary cross */ 551 /* check for boundary cross */
552 row_col_t pos;
553 pos.row = pos.col = 0;
554 if (ROWCOL_IS_BEFORE (selection.beg, pos)
555 && ROWCOL_IS_AFTER (selection.end, pos))
556 CLEAR_SELECTION ();
541 557
542 int i = current_screen; current_screen = scrn; scrn = i; 558 current_screen = scrn;
543 559
544#if NSCREENS 560#if NSCREENS
545 if (option (Opt_secondaryScreen)) 561 if (option (Opt_secondaryScreen))
546 { 562 {
547 num_scr = 0; 563 num_scr = 0;
… …
611/* 627/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 628 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 629 * count positive ==> scroll up
614 * count negative ==> scroll down 630 * count negative ==> scroll down
615 */ 631 */
616int 632int ecb_hot
617rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 633rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
618{ 634{
619 if (count == 0 || (row1 > row2)) 635 if (count == 0 || (row1 > row2))
620 return 0; 636 return 0;
621 637
… …
624 640
625 if (count > 0 641 if (count > 0
626 && row1 == 0 642 && row1 == 0
627 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 643 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
628 { 644 {
645 min_it (count, total_rows - (nrow - (row2 + 1)));
646
629 top_row = max (top_row - count, -saveLines); 647 top_row = max (top_row - count, -saveLines);
630
631 // scroll everything up 'count' lines
632 term_start = (term_start + count) % total_rows;
633 648
634 // sever bottommost line 649 // sever bottommost line
635 { 650 {
636 line_t &l = ROW(row2 - count); 651 line_t &l = ROW(row2);
637 l.is_longer (0); 652 l.is_longer (0);
638 l.touch (); 653 l.touch ();
639 } 654 }
640 655
656 // scroll everything up 'count' lines
657 term_start = (term_start + count) % total_rows;
658
659 // now copy lines below the scroll region bottom to the
660 // bottom of the screen again, so they look as if they
661 // hadn't moved.
662 for (int i = nrow; --i > row2; )
663 {
664 line_t &l1 = ROW(i - count);
665 line_t &l2 = ROW(i);
666
667 ::swap (l1, l2);
668 l2.touch ();
669 }
670
641 // erase newly scrolled-in lines 671 // erase newly scrolled-in lines
642 for (int i = count; i--; ) 672 for (int i = count; i--; )
643 { 673 {
644 line_t &l = ROW(nrow - 1 - i); 674 line_t &l = ROW(row2 - i);
645 675
646 // optimize if already cleared, can be significant on slow machines 676 // optimise if already cleared, can be significant on slow machines
647 // could be rolled into scr_blank_screen_mem 677 // 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))) 678 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
649 { 679 {
650 scr_blank_line (l, 0, l.l, rstyle); 680 scr_blank_line (l, 0, l.l, rstyle);
651 l.l = 0; 681 l.l = 0;
… …
653 } 683 }
654 else 684 else
655 scr_blank_screen_mem (l, rstyle); 685 scr_blank_screen_mem (l, rstyle);
656 } 686 }
657 687
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 688 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 689 if (selection.op && current_screen == selection.screen
690 && selection.beg.row <= row2)
672 { 691 {
673 selection.beg.row -= count; 692 selection.beg.row -= count;
674 selection.end.row -= count; 693 selection.end.row -= count;
675 selection.mark.row -= count; 694 selection.mark.row -= count;
676 695
677 if (selection.beg.row < top_row 696 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 } 697 }
685 698
686 // finally move the view window, if desired 699 // finally move the view window, if desired
687 if (option (Opt_scrollWithBuffer) 700 if (option (Opt_scrollWithBuffer)
688 && view_start != 0 701 && view_start != 0
… …
718 } 731 }
719 732
720 // use a simple and robust scrolling algorithm, this 733 // use a simple and robust scrolling algorithm, this
721 // part of scr_scroll_text is not time-critical. 734 // part of scr_scroll_text is not time-critical.
722 735
736 // sever line above scroll region
737 if (row1)
738 {
739 line_t &l = ROW(row1 - 1);
740 l.is_longer (0);
741 l.touch ();
742 }
743
723 int rows = row2 - row1 + 1; 744 int rows = row2 - row1 + 1;
724 745
725 min_it (count, rows); 746 min_it (count, rows);
726 747
727 line_t *temp_buf = row_buf + total_rows; 748 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
728 749
729 for (int row = 0; row < rows; row++) 750 for (int row = 0; row < rows; row++)
730 { 751 {
731 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 752 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
732 753
… …
734 scr_blank_screen_mem (temp_buf [row], rstyle); 755 scr_blank_screen_mem (temp_buf [row], rstyle);
735 } 756 }
736 757
737 for (int row = 0; row < rows; row++) 758 for (int row = 0; row < rows; row++)
738 ROW(row1 + row) = temp_buf [row]; 759 ROW(row1 + row) = temp_buf [row];
760
761 // sever bottommost line
762 {
763 line_t &l = ROW(row2);
764 l.is_longer (0);
765 l.touch ();
766 }
739 } 767 }
740 768
741 return count; 769 return count;
742} 770}
743 771
744/* ------------------------------------------------------------------------- */ 772/* ------------------------------------------------------------------------- */
745/* 773/*
746 * Add text given in <str> of length <len> to screen struct 774 * Add text given in <str> of length <len> to screen struct
747 */ 775 */
748void 776void ecb_hot
749rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 777rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
750{ 778{
751 if (len <= 0) /* sanity */ 779 if (len <= 0) /* sanity */
752 return; 780 return;
753 781
754 unsigned char checksel; 782 bool checksel;
755 unicode_t c; 783 unicode_t c;
756 int ncol = this->ncol; 784 int ncol = this->ncol;
757 const wchar_t *strend = str + len; 785 const wchar_t *strend = str + len;
758 786
759 want_refresh = 1; 787 want_refresh = 1;
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 800 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 801 screen.cur.row -= minlines;
774 } 802 }
775 } 803 }
776 804
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 805 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 806 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 807 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 808 int row = screen.cur.row;
783 809
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 810 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 811
786 line_t *line = &ROW(row); 812 line_t *line = &ROW(row);
787 813
788 while (str < strend) 814 while (str < strend)
789 { 815 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 816 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 817
792 if (c < 0x20) 818 if (ecb_unlikely (c < 0x20))
793 if (c == C0_LF) 819 if (c == C0_LF)
794 { 820 {
795 max_it (line->l, screen.cur.col); 821 max_it (line->l, screen.cur.col);
796 822
797 screen.flags &= ~Screen_WrapNext; 823 screen.flags &= ~Screen_WrapNext;
… …
816 { 842 {
817 scr_tab (1, true); 843 scr_tab (1, true);
818 continue; 844 continue;
819 } 845 }
820 846
847 if (ecb_unlikely (
821 if (checksel /* see if we're writing within selection */ 848 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 849 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 850 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
851 ))
824 { 852 {
825 checksel = 0; 853 checksel = 0;
826 /* 854 /*
827 * If we wrote anywhere in the selected area, kill the selection 855 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 856 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 857 * should be a similar check.
830 */ 858 */
831 CLEAR_SELECTION (); 859 CLEAR_SELECTION ();
832 } 860 }
833 861
834 if (screen.flags & Screen_WrapNext) 862 if (ecb_unlikely (screen.flags & Screen_WrapNext))
835 { 863 {
836 scr_do_wrap (); 864 scr_do_wrap ();
837 865
838 line->l = ncol; 866 line->l = ncol;
839 line->is_longer (1); 867 line->is_longer (1);
… …
841 row = screen.cur.row; 869 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 870 line = &ROW(row); /* _must_ refresh */
843 } 871 }
844 872
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 873 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 874 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 875 c = 0xfffd;
848 876
849 // rely on wcwidth to tell us the character width, do wcwidth before 877 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 878 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 879 // drawing characters below as they might be invalid in the current
852 // locale. 880 // locale.
853 int width = WCWIDTH (c); 881 int width = WCWIDTH (c);
854 882
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 883 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 884 {
857 // vt100 special graphics and line drawing 885 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 886 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 887 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 888 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 901 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 902 width = 1; // vt100 line drawing characters are always single-width
875 } 903 }
876 } 904 }
877 905
878 if (screen.flags & Screen_Insert) 906 if (ecb_unlikely (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 907 scr_insdel_chars (width, INSERT);
880 908
881 if (width != 0) 909 if (width != 0)
882 { 910 {
883#if !UNICODE_3 911#if !UNICODE_3
… …
888# else 916# else
889 c = 0xfffd; 917 c = 0xfffd;
890# endif 918# endif
891#endif 919#endif
892 920
921 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
922
923 // if the character doesn't fit into the remaining columns...
924 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
925 {
926 if (screen.flags & Screen_Autowrap)
927 {
928 // ... artificially enlargen the previous one
929 c = NOCHAR;
930 // and try the same character next loop iteration
931 --str;
932 }
933 else
934 screen.cur.col = ncol - width;
935 }
936
893 // nuke the character at this position, if required 937 // nuke the character at this position, if required
938 // due to wonderful coincidences everywhere else in this loop
939 // we never have to check for overwriting a wide char itself,
940 // only its tail.
894 if (line->t[screen.cur.col] == NOCHAR 941 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
895 || (screen.cur.col < ncol - 1 942 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 943
925 line->touch (); 944 line->touch ();
926 945
927 do 946 do
928 { 947 {
929 line->t[screen.cur.col] = c; 948 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 949 line->r[screen.cur.col] = rend;
931 950
932 if (screen.cur.col < ncol - 1) 951 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 952 screen.cur.col++;
934 else 953 else
935 { 954 {
936 line->l = ncol; 955 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 956 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 957 screen.flags |= Screen_WrapNext;
939 break; 958
959 goto end_of_line;
940 } 960 }
941 961
942 c = NOCHAR; 962 c = NOCHAR;
943 } 963 }
944 while (--width > 0); 964 while (ecb_unlikely (--width > 0));
945 965
946 // pad with spaces when overwriting wide character with smaller one 966 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 967 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 968 {
949 line->touch (); 969 line->t[c] = ' ';
970 line->r[c] = rend;
971 }
950 972
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 973end_of_line:
974 ;
975 }
976#if ENABLE_COMBINING
977 else // width == 0
978 {
979 if (c != 0xfeff) // ignore BOM
980 {
981 // handle combining characters
982 // we just tag the accent on the previous on-screen character.
983 // this is arguably not correct, but also arguably not wrong.
984 // we don't handle double-width characters nicely yet.
985 line_t *linep;
986 text_t *tp;
987 rend_t *rp;
988
989 if (screen.cur.col > 0)
952 { 990 {
953 line->t[c] = ' ';
954 line->r[c] = rend; 991 linep = line;
992 tp = line->t + screen.cur.col - 1;
993 rp = line->r + screen.cur.col - 1;
955 } 994 }
995 else if (screen.cur.row > 0
996 && ROW(screen.cur.row - 1).is_longer ())
997 {
998 linep = &ROW(screen.cur.row - 1);
999 tp = line->t + ncol - 1;
1000 rp = line->r + ncol - 1;
1001 }
1002 else
1003 continue;
1004
1005 linep->touch ();
1006
1007 while (*tp == NOCHAR && tp > linep->t)
1008 tp--, rp--;
1009
1010 // first try to find a precomposed character
1011 unicode_t n = rxvt_compose (*tp, c);
1012 if (n == NOCHAR)
1013 n = rxvt_composite.compose (*tp, c);
1014
1015 *tp = n;
1016 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
956 } 1017 }
957 } 1018 }
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 1019#endif
998 }
999 } 1020 }
1000 1021
1001 max_it (line->l, screen.cur.col); 1022 max_it (line->l, screen.cur.col);
1002 1023
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1024 assert (screen.cur.row >= 0);
1005#endif
1006} 1025}
1007 1026
1008/* ------------------------------------------------------------------------- */ 1027/* ------------------------------------------------------------------------- */
1009/* 1028/*
1010 * Process Backspace. Move back the cursor back a position, wrap if have to 1029 * Process Backspace. Move back the cursor back a position, wrap if have to
1011 * XTERM_SEQ: CTRL-H 1030 * XTERM_SEQ: CTRL-H
1012 */ 1031 */
1013void 1032void
1014rxvt_term::scr_backspace () NOTHROW 1033rxvt_term::scr_backspace () NOTHROW
1015{ 1034{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1035 if (screen.cur.col == 0)
1019 { 1036 {
1020 if (screen.cur.row > 0) 1037 if (screen.cur.row > 0)
1021 { 1038 {
1022#ifdef TERMCAP_HAS_BW 1039#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1040 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1041 --screen.cur.row;
1025 return; 1042
1043 want_refresh = 1;
1026#endif 1044#endif
1027 } 1045 }
1028 } 1046 }
1047 else if (screen.flags & Screen_WrapNext)
1048 screen.flags &= ~Screen_WrapNext;
1029 else 1049 else
1030 scr_gotorc (0, -1, RELATIVE); 1050 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1051}
1034 1052
1035/* ------------------------------------------------------------------------- */ 1053/* ------------------------------------------------------------------------- */
1036/* 1054/*
1037 * Process Horizontal Tab 1055 * Process Horizontal Tab
… …
1113 * XTERM_SEQ: ESC 6 1131 * XTERM_SEQ: ESC 6
1114 * Move cursor left in row. If we're at the left boundary, shift everything 1132 * Move cursor left in row. If we're at the left boundary, shift everything
1115 * in that row right. Clear left column. 1133 * in that row right. Clear left column.
1116 */ 1134 */
1117#if !ENABLE_MINIMAL 1135#if !ENABLE_MINIMAL
1118void 1136void ecb_cold
1119rxvt_term::scr_backindex () NOTHROW 1137rxvt_term::scr_backindex () NOTHROW
1120{ 1138{
1121 if (screen.cur.col > 0) 1139 if (screen.cur.col > 0)
1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1140 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1123 else 1141 else
… …
1130 * XTERM_SEQ: ESC 9 1148 * XTERM_SEQ: ESC 9
1131 * Move cursor right in row. If we're at the right boundary, shift everything 1149 * Move cursor right in row. If we're at the right boundary, shift everything
1132 * in that row left. Clear right column. 1150 * in that row left. Clear right column.
1133 */ 1151 */
1134#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1135void 1153void ecb_cold
1136rxvt_term::scr_forwardindex () NOTHROW 1154rxvt_term::scr_forwardindex () NOTHROW
1137{ 1155{
1138 if (screen.cur.col < ncol - 1) 1156 if (screen.cur.col < ncol - 1)
1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1140 else 1158 else
… …
1230/* 1248/*
1231 * Erase part or whole of a line 1249 * Erase part or whole of a line
1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1250 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1251 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1252 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1253 * extension: clear to right unless wrapped: ESC [ 3 K
1235 */ 1254 */
1236void 1255void
1237rxvt_term::scr_erase_line (int mode) NOTHROW 1256rxvt_term::scr_erase_line (int mode) NOTHROW
1238{ 1257{
1239 unsigned int col, num; 1258 unsigned int col, num;
… …
1248 line.touch (); 1267 line.touch ();
1249 line.is_longer (0); 1268 line.is_longer (0);
1250 1269
1251 switch (mode) 1270 switch (mode)
1252 { 1271 {
1272 case 3:
1273 if (screen.flags & Screen_WrapNext)
1274 return;
1275
1276 /* fall through */
1277
1253 case 0: /* erase to end of line */ 1278 case 0: /* erase to end of line */
1254 col = screen.cur.col; 1279 col = screen.cur.col;
1255 num = ncol - col; 1280 num = ncol - col;
1256 min_it (line.l, col); 1281 min_it (line.l, col);
1282
1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1283 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1284 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1259 CLEAR_SELECTION (); 1285 CLEAR_SELECTION ();
1260 break; 1286 break;
1287
1261 case 1: /* erase to beginning of line */ 1288 case 1: /* erase to beginning of line */
1262 col = 0; 1289 col = 0;
1263 num = screen.cur.col + 1; 1290 num = screen.cur.col + 1;
1291
1264 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1292 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1265 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1293 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1266 CLEAR_SELECTION (); 1294 CLEAR_SELECTION ();
1267 break; 1295 break;
1296
1268 case 2: /* erase whole line */ 1297 case 2: /* erase whole line */
1269 col = 0; 1298 col = 0;
1270 num = ncol; 1299 num = ncol;
1271 line.l = 0; 1300 line.l = 0;
1272 if (selection.beg.row <= screen.cur.row 1301 if (selection.beg.row <= screen.cur.row
… …
1280 scr_blank_line (line, col, num, rstyle); 1309 scr_blank_line (line, col, num, rstyle);
1281} 1310}
1282 1311
1283/* ------------------------------------------------------------------------- */ 1312/* ------------------------------------------------------------------------- */
1284/* 1313/*
1285 * Erase part of whole of the screen 1314 * Erase part or whole of the screen
1286 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1315 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1287 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1316 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1288 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1317 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1289 */ 1318 */
1290void 1319void
… …
1299 ZERO_SCROLLBACK (); 1328 ZERO_SCROLLBACK ();
1300 1329
1301 switch (mode) 1330 switch (mode)
1302 { 1331 {
1303 case 0: /* erase to end of screen */ 1332 case 0: /* erase to end of screen */
1304 selection_check (1);
1305 scr_erase_line (0); 1333 scr_erase_line (0);
1306 row = screen.cur.row + 1; /* possible OOB */ 1334 row = screen.cur.row + 1; /* possible OOB */
1307 num = nrow - row; 1335 num = nrow - row;
1308 break; 1336 break;
1309 case 1: /* erase to beginning of screen */ 1337 case 1: /* erase to beginning of screen */
1310 selection_check (3);
1311 scr_erase_line (1); 1338 scr_erase_line (1);
1312 row = 0; 1339 row = 0;
1313 num = screen.cur.row; 1340 num = screen.cur.row;
1314 break; 1341 break;
1315 case 2: /* erase whole screen */ 1342 case 2: /* erase whole screen */
1316 selection_check (3);
1317 row = 0; 1343 row = 0;
1318 num = nrow; 1344 num = nrow;
1319 break; 1345 break;
1320 default: 1346 default:
1321 return; 1347 return;
… …
1330 if (row >= nrow) /* Out Of Bounds */ 1356 if (row >= nrow) /* Out Of Bounds */
1331 return; 1357 return;
1332 1358
1333 min_it (num, nrow - row); 1359 min_it (num, nrow - row);
1334 1360
1335 if (rstyle & (RS_RVid | RS_Uline)) 1361 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1362 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1363 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1364 {
1339 ren = DEFAULT_RSTYLE; 1365 ren = DEFAULT_RSTYLE;
1340 CLEAR_ROWS (row, num); 1366
1367 if (mapped)
1368 XClearArea (dpy, vt, 0,
1369 Row2Pixel (row - view_start), (unsigned int)vt_width,
1370 (unsigned int)Height2Pixel (num), False);
1341 } 1371 }
1342 else 1372 else
1343 { 1373 {
1344 ren = rstyle & (RS_fgMask | RS_bgMask); 1374 ren = rstyle & (RS_fgMask | RS_bgMask);
1375
1376 if (mapped)
1377 {
1345 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1378 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1346 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1379 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1347 ERASE_ROWS (row, num); 1380 XFillRectangle (dpy, vt, gc,
1381 0, Row2Pixel (row - view_start),
1382 (unsigned int)vt_width,
1383 (unsigned int)Height2Pixel (num));
1348 gcvalue.foreground = pix_colors[Color_fg]; 1384 gcvalue.foreground = pix_colors[Color_fg];
1349 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1386 }
1350 } 1387 }
1351 1388
1352 for (; num--; row++) 1389 for (; num--; row++)
1353 { 1390 {
1354 scr_blank_screen_mem (ROW(row), rstyle); 1391 scr_blank_screen_mem (ROW(row), rstyle);
1392
1393 if (row - view_start < nrow)
1355 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1394 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1356 } 1395 }
1357} 1396}
1358 1397
1359#if !ENABLE_MINIMAL 1398#if !ENABLE_MINIMAL
1360void 1399void
… …
1370/* ------------------------------------------------------------------------- */ 1409/* ------------------------------------------------------------------------- */
1371/* 1410/*
1372 * Fill the screen with `E's 1411 * Fill the screen with `E's
1373 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1412 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1374 */ 1413 */
1375void 1414void ecb_cold
1376rxvt_term::scr_E () NOTHROW 1415rxvt_term::scr_E () NOTHROW
1377{ 1416{
1378 rend_t fs; 1417 rend_t fs;
1379 1418
1380 want_refresh = 1; 1419 want_refresh = 1;
1381 ZERO_SCROLLBACK (); 1420 ZERO_SCROLLBACK ();
1382 1421
1383 num_scr_allow = 0; 1422 num_scr_allow = 0;
1384 selection_check (3); 1423
1424 row_col_t pos;
1425 pos.row = pos.col = 0;
1426 if (ROWCOL_IS_AFTER (selection.end, pos))
1427 CLEAR_SELECTION ();
1385 1428
1386 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1429 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1387 for (int row = nrow; row--; ) 1430 for (int row = nrow; row--; )
1388 { 1431 {
1389 line_t &line = ROW(row); 1432 line_t &line = ROW(row);
… …
1434 * Insert/Delete <count> characters from the current position 1477 * Insert/Delete <count> characters from the current position
1435 */ 1478 */
1436void 1479void
1437rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1480rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1438{ 1481{
1439 int col, row;
1440 rend_t tr;
1441
1442 want_refresh = 1; 1482 want_refresh = 1;
1443 ZERO_SCROLLBACK (); 1483 ZERO_SCROLLBACK ();
1444 1484
1445 if (count <= 0) 1485 if (count <= 0)
1446 return; 1486 return;
… …
1448 scr_do_wrap (); 1488 scr_do_wrap ();
1449 1489
1450 selection_check (1); 1490 selection_check (1);
1451 min_it (count, ncol - screen.cur.col); 1491 min_it (count, ncol - screen.cur.col);
1452 1492
1453 row = screen.cur.row; 1493 int row = screen.cur.row;
1454 1494
1455 line_t *line = &ROW(row); 1495 line_t *line = &ROW(row);
1456 1496
1457 line->touch (); 1497 line->touch ();
1458 line->is_longer (0); 1498 line->is_longer (0);
1459 1499
1500 // nuke wide spanning the start
1501 if (line->t[screen.cur.col] == NOCHAR)
1502 scr_kill_char (*line, screen.cur.col);
1503
1460 switch (insdel) 1504 switch (insdel)
1461 { 1505 {
1462 case INSERT: 1506 case INSERT:
1463 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1507 line->l = min (line->l + count, ncol);
1508
1509 if (line->t[screen.cur.col] == NOCHAR)
1510 scr_kill_char (*line, screen.cur.col);
1511
1512 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1464 { 1513 {
1465 line->t[col] = line->t[col - count]; 1514 line->t[col] = line->t[col - count];
1466 line->r[col] = line->r[col - count]; 1515 line->r[col] = line->r[col - count];
1467 } 1516 }
1468
1469 line->l = min (line->l + count, ncol);
1470 1517
1471 if (selection.op && current_screen == selection.screen 1518 if (selection.op && current_screen == selection.screen
1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1519 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1473 { 1520 {
1474 if (selection.end.row != screen.cur.row 1521 if (selection.end.row != screen.cur.row
… …
1489 case ERASE: 1536 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1537 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1538 selection_check (1);
1492 screen.cur.col -= count; 1539 screen.cur.col -= count;
1493 1540
1494 line->l = max (line->l - count, 0); 1541 // nuke wide char after the end
1542 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1543 scr_kill_char (*line, screen.cur.col + count);
1544
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1545 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1546 break;
1497 1547
1498 case DELETE: 1548 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1549 line->l = max (line->l - count, 0);
1500 1550
1551 // nuke wide char spanning the end
1552 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1553 scr_kill_char (*line, screen.cur.col + count);
1554
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1555 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1556 {
1503 line->t[col] = line->t[col + count]; 1557 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1558 line->r[col] = line->r[col + count];
1505 } 1559 }
1506 1560
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1561 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1562
1510 if (selection.op && current_screen == selection.screen 1563 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1564 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1565 {
1513 if (selection.end.row != screen.cur.row 1566 if (selection.end.row != screen.cur.row
… …
1530/* ------------------------------------------------------------------------- */ 1583/* ------------------------------------------------------------------------- */
1531/* 1584/*
1532 * Set the scrolling region 1585 * Set the scrolling region
1533 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1586 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1534 */ 1587 */
1535void 1588void ecb_cold
1536rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1589rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1537{ 1590{
1538 max_it (top, 0); 1591 max_it (top, 0);
1539 min_it (bot, nrow - 1); 1592 min_it (bot, nrow - 1);
1540 1593
… …
1550/* 1603/*
1551 * Make the cursor visible/invisible 1604 * Make the cursor visible/invisible
1552 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1605 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1553 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1606 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1554 */ 1607 */
1555void 1608void ecb_cold
1556rxvt_term::scr_cursor_visible (int mode) NOTHROW 1609rxvt_term::scr_cursor_visible (int mode) NOTHROW
1557{ 1610{
1558 want_refresh = 1; 1611 want_refresh = 1;
1559 1612
1560 if (mode) 1613 if (mode)
… …
1567/* 1620/*
1568 * Set/unset automatic wrapping 1621 * Set/unset automatic wrapping
1569 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1622 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1570 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1623 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1571 */ 1624 */
1572void 1625void ecb_cold
1573rxvt_term::scr_autowrap (int mode) NOTHROW 1626rxvt_term::scr_autowrap (int mode) NOTHROW
1574{ 1627{
1575 if (mode) 1628 if (mode)
1576 screen.flags |= Screen_Autowrap; 1629 screen.flags |= Screen_Autowrap;
1577 else 1630 else
… …
1586 * Relative mode: line numbers are relative to top margin of scrolling region 1639 * Relative mode: line numbers are relative to top margin of scrolling region
1587 * and the cursor cannot be moved outside. 1640 * and the cursor cannot be moved outside.
1588 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1641 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1589 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1642 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1590 */ 1643 */
1591void 1644void ecb_cold
1592rxvt_term::scr_relative_origin (int mode) NOTHROW 1645rxvt_term::scr_relative_origin (int mode) NOTHROW
1593{ 1646{
1594 if (mode) 1647 if (mode)
1595 screen.flags |= Screen_Relative; 1648 screen.flags |= Screen_Relative;
1596 else 1649 else
… …
1603/* 1656/*
1604 * Set insert/replace mode 1657 * Set insert/replace mode
1605 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1658 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1606 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1659 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1607 */ 1660 */
1608void 1661void ecb_cold
1609rxvt_term::scr_insert_mode (int mode) NOTHROW 1662rxvt_term::scr_insert_mode (int mode) NOTHROW
1610{ 1663{
1611 if (mode) 1664 if (mode)
1612 screen.flags |= Screen_Insert; 1665 screen.flags |= Screen_Insert;
1613 else 1666 else
… …
1619 * Set/Unset tabs 1672 * Set/Unset tabs
1620 * XTERM_SEQ: Set tab at current column : ESC H 1673 * XTERM_SEQ: Set tab at current column : ESC H
1621 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1674 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1622 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1675 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1623 */ 1676 */
1624void 1677void ecb_cold
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1678rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1679{
1627 if (mode < 0) 1680 if (mode < 0)
1628 memset (tabs, 0, ncol); 1681 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1682 else if (screen.cur.col < ncol)
… …
1649 { 1702 {
1650 rvideo_state = on; 1703 rvideo_state = on;
1651 1704
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1705 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#ifdef HAVE_BG_PIXMAP 1706#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1707 if (bg_pixmap == None)
1655#endif 1708#endif
1656 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1709 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1657 1710
1658 XGCValues gcvalue; 1711 XGCValues gcvalue;
1659 gcvalue.foreground = pix_colors[Color_fg]; 1712 gcvalue.foreground = pix_colors[Color_fg];
… …
1668/* ------------------------------------------------------------------------- */ 1721/* ------------------------------------------------------------------------- */
1669/* 1722/*
1670 * Report current cursor position 1723 * Report current cursor position
1671 * XTERM_SEQ: Report position: ESC [ 6 n 1724 * XTERM_SEQ: Report position: ESC [ 6 n
1672 */ 1725 */
1673void 1726void ecb_cold
1674rxvt_term::scr_report_position () NOTHROW 1727rxvt_term::scr_report_position () NOTHROW
1675{ 1728{
1676 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1729 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1677} 1730}
1678 1731
… …
1681 * ------------------------------------------------------------------------- */ 1734 * ------------------------------------------------------------------------- */
1682 1735
1683/* 1736/*
1684 * Set font style 1737 * Set font style
1685 */ 1738 */
1686void 1739void ecb_cold
1687rxvt_term::set_font_style () NOTHROW 1740rxvt_term::set_font_style () NOTHROW
1688{ 1741{
1689#if 0 1742#if 0
1690 switch (charsets [screen.charset]) 1743 switch (charsets [screen.charset])
1691 { 1744 {
… …
1713 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1766 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1714 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1767 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1715 * XTERM_SEQ: Invoke G2 character set: ESC N 1768 * XTERM_SEQ: Invoke G2 character set: ESC N
1716 * XTERM_SEQ: Invoke G3 character set: ESC O 1769 * XTERM_SEQ: Invoke G3 character set: ESC O
1717 */ 1770 */
1718void 1771void ecb_cold
1719rxvt_term::scr_charset_choose (int set) NOTHROW 1772rxvt_term::scr_charset_choose (int set) NOTHROW
1720{ 1773{
1721 screen.charset = set; 1774 screen.charset = set;
1722 set_font_style (); 1775 set_font_style ();
1723} 1776}
… …
1744 * ------------------------------------------------------------------------- */ 1797 * ------------------------------------------------------------------------- */
1745 1798
1746/* 1799/*
1747 * refresh matching text. 1800 * refresh matching text.
1748 */ 1801 */
1749bool 1802bool ecb_cold
1750rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1803rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1751{ 1804{
1752 bool found = false; 1805 bool found = false;
1753 1806
1754 for (int i = 0; i < nrow; i++) 1807 for (int i = 0; i < nrow; i++)
… …
1773 PART_BEG = 0, 1826 PART_BEG = 0,
1774 PART_END, 1827 PART_END,
1775 RC_COUNT 1828 RC_COUNT
1776}; 1829};
1777 1830
1778void 1831void ecb_hot
1779rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1832rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1780{ 1833{
1781 int i; 1834 int i;
1782 row_col_t rc[RC_COUNT]; 1835 row_col_t rc[RC_COUNT];
1783 1836
… …
1803 for (i = PART_BEG; i < RC_COUNT; i++) 1856 for (i = PART_BEG; i < RC_COUNT; i++)
1804 { 1857 {
1805 min_it (rc[i].col, ncol - 1); 1858 min_it (rc[i].col, ncol - 1);
1806 min_it (rc[i].row, nrow - 1); 1859 min_it (rc[i].row, nrow - 1);
1807 } 1860 }
1808// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1861
1809 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1862 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1863 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1811 1864
1812 num_scr_allow = 0; 1865 num_scr_allow = 0;
1813 1866
… …
1820 * Refresh the entire screen 1873 * Refresh the entire screen
1821 */ 1874 */
1822void 1875void
1823rxvt_term::scr_touch (bool refresh) NOTHROW 1876rxvt_term::scr_touch (bool refresh) NOTHROW
1824{ 1877{
1825 scr_expose (0, 0, width, height, refresh); 1878 scr_expose (0, 0, vt_width, vt_height, refresh);
1826} 1879}
1827 1880
1828/* ------------------------------------------------------------------------- */ 1881/* ------------------------------------------------------------------------- */
1829/* 1882/*
1830 * Move the display so that the line represented by scrollbar value Y is at 1883 * Move the display so that the line represented by scrollbar value Y is at
… …
1886 1939
1887# ifndef NO_MAPALERT 1940# ifndef NO_MAPALERT
1888# ifdef MAPALERT_OPTION 1941# ifdef MAPALERT_OPTION
1889 if (option (Opt_mapAlert)) 1942 if (option (Opt_mapAlert))
1890# endif 1943# endif
1891 XMapWindow (dpy, parent[0]); 1944 XMapWindow (dpy, parent);
1892# endif 1945# endif
1893 1946
1894# if ENABLE_FRILLS 1947# if ENABLE_FRILLS
1895 if (option (Opt_urgentOnBell)) 1948 if (option (Opt_urgentOnBell))
1896 { 1949 set_urgency (1);
1897 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1898 {
1899 h->flags |= XUrgencyHint;
1900 XSetWMHints (dpy, parent[0], h);
1901 }
1902 }
1903# endif 1950# endif
1904 1951
1905 if (option (Opt_visualBell)) 1952 if (option (Opt_visualBell))
1906 { 1953 {
1907 rvideo_bell = true; 1954 rvideo_bell = true;
… …
1910 1957
1911 bell_ev.start (VISUAL_BELL_DURATION); 1958 bell_ev.start (VISUAL_BELL_DURATION);
1912 } 1959 }
1913 else 1960 else
1914 XBell (dpy, 0); 1961 XBell (dpy, 0);
1962 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1915#endif 1963#endif
1916} 1964}
1917 1965
1918/* ------------------------------------------------------------------------- */ 1966/* ------------------------------------------------------------------------- */
1919/* ARGSUSED */ 1967void ecb_cold
1920void
1921rxvt_term::scr_printscreen (int fullhist) NOTHROW 1968rxvt_term::scr_printscreen (int fullhist) NOTHROW
1922{ 1969{
1923#ifdef PRINTPIPE 1970#ifdef PRINTPIPE
1924 int nrows, row_start; 1971 int nrows, row_start;
1925 FILE *fd; 1972 FILE *fd = popen_printer ();
1926 1973
1927 if ((fd = popen_printer ()) == NULL) 1974 if (!fd)
1928 return; 1975 return;
1929 1976
1930 if (fullhist) 1977 if (fullhist)
1931 { 1978 {
1932 nrows = nrow - top_row; 1979 nrows = nrow - top_row;
… …
1938 row_start = view_start; 1985 row_start = view_start;
1939 } 1986 }
1940 1987
1941 wctomb (0, 0); 1988 wctomb (0, 0);
1942 1989
1943 for (int r1 = 0; r1 < nrows; r1++) 1990 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1944 { 1991 {
1945 text_t *tp = ROW(r1).t; 1992 text_t *tp = ROW(r1).t;
1946 int len = ROW(r1).l; 1993 int len = ROW(r1).l;
1947 1994
1948 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1995 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1974/* 2021/*
1975 * Refresh the screen 2022 * Refresh the screen
1976 * drawn_text/drawn_rend contain the screen information before the update. 2023 * drawn_text/drawn_rend contain the screen information before the update.
1977 * screen.text/screen.rend contain what the screen will change to. 2024 * screen.text/screen.rend contain what the screen will change to.
1978 */ 2025 */
1979void 2026void ecb_hot
1980rxvt_term::scr_refresh () NOTHROW 2027rxvt_term::scr_refresh () NOTHROW
1981{ 2028{
1982 unsigned char have_bg,
1983 showcursor; /* show the cursor */
1984 int16_t col, row, /* column/row we're processing */ 2029 int16_t col, row, /* column/row we're processing */
1985 ocrow; /* old cursor row */ 2030 ocrow; /* old cursor row */
1986 int i; /* tmp */ 2031 int i; /* tmp */
1987#ifndef NO_CURSORCOLOR 2032#ifndef NO_CURSORCOLOR
1988 rend_t cc1; /* store colours at cursor position (s) */ 2033 rend_t cc1; /* store colours at cursor position (s) */
… …
1997 return; 2042 return;
1998 2043
1999 /* 2044 /*
2000 * A: set up vars 2045 * A: set up vars
2001 */ 2046 */
2002 have_bg = 0;
2003 refresh_count = 0; 2047 refresh_count = 0;
2004 2048
2049 unsigned int old_screen_flags = screen.flags;
2050 bool have_bg = 0;
2005#ifdef HAVE_BG_PIXMAP 2051#ifdef HAVE_BG_PIXMAP
2006 have_bg |= bgPixmap.pixmap != None; 2052 have_bg = bg_pixmap != None;
2007#endif 2053#endif
2008 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2054 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2009 2055
2010 /* 2056 /*
2011 * B: reverse any characters which are selected 2057 * B: reverse any characters which are selected
2012 */ 2058 */
2013 scr_reverse_selection (); 2059 scr_reverse_selection ();
2014 2060
2061 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2062#if ENABLE_OVERLAY
2063 scr_swap_overlay ();
2064#endif
2065
2066 bool showcursor = screen.flags & Screen_VisibleCursor;
2067
2015 /* 2068 /*
2016 * C: set the cursor character (s) 2069 * C: set the cursor character (s)
2017 */ 2070 */
2018 { 2071 {
2019 unsigned char setoldcursor; 2072 bool setoldcursor;
2020 2073
2021 showcursor = (screen.flags & Screen_VisibleCursor);
2022#ifdef CURSOR_BLINK 2074#ifdef CURSOR_BLINK
2023 if (hidden_cursor) 2075 if (hidden_cursor)
2024 showcursor = 0; 2076 showcursor = 0;
2025#endif 2077#endif
2026 2078
… …
2054 ccol2 = bgcolor_of (rstyle); 2106 ccol2 = bgcolor_of (rstyle);
2055#else 2107#else
2056 ccol2 = Color_bg; 2108 ccol2 = Color_bg;
2057#endif 2109#endif
2058 2110
2059 if (showcursor && focus) 2111 if (focus)
2060 { 2112 {
2061 if (option (Opt_cursorUnderline)) 2113 if (option (Opt_cursorUnderline))
2062 *crp ^= RS_Uline; 2114 *crp ^= RS_Uline;
2063 else 2115 else
2064 { 2116 {
… …
2099 oldcursor.col = screen.cur.col; 2151 oldcursor.col = screen.cur.col;
2100 } 2152 }
2101 } 2153 }
2102 } 2154 }
2103 2155
2104 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2105#if ENABLE_OVERLAY
2106 scr_swap_overlay ();
2107#endif
2108
2109#ifndef NO_SLOW_LINK_SUPPORT 2156#ifndef NO_SLOW_LINK_SUPPORT
2110 /* 2157 /*
2111 * D: CopyArea pass - very useful for slower links 2158 * D: CopyArea pass - very useful for slower links
2112 * This has been deliberately kept simple. 2159 * This has been deliberately kept simple.
2113 */ 2160 */
… …
2117 { 2164 {
2118 int16_t nits; 2165 int16_t nits;
2119 int i = num_scr; 2166 int i = num_scr;
2120 int j; 2167 int j;
2121 int len, wlen; 2168 int len, wlen;
2122 dLocal (int, num_scr);
2123 2169
2124 j = nrow; 2170 j = nrow;
2125 wlen = len = -1; 2171 wlen = len = -1;
2126 row = i > 0 ? 0 : j - 1; 2172 row = i > 0 ? 0 : j - 1;
2127 2173
… …
2202 continue; 2248 continue;
2203 2249
2204 // redraw one or more characters 2250 // redraw one or more characters
2205 2251
2206 // seek to the beginning of wide characters 2252 // seek to the beginning of wide characters
2207 while (stp[col] == NOCHAR && col > 0) 2253 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2208 --col; 2254 --col;
2209 2255
2210 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2256 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2211 text_t *text = stp + col; 2257 text_t *text = stp + col;
2212 int count = 1; 2258 int count = 1;
2213 2259
2214 dtp[col] = stp[col]; 2260 dtp[col] = stp[col];
2215 drp[col] = rend; 2261 drp[col] = rend;
… …
2219 for (i = 0; ++col < ncol; ) 2265 for (i = 0; ++col < ncol; )
2220 { 2266 {
2221 if (stp[col] == NOCHAR) 2267 if (stp[col] == NOCHAR)
2222 { 2268 {
2223 dtp[col] = stp[col]; 2269 dtp[col] = stp[col];
2224 drp[col] = rend; 2270 drp[col] = srp[col];
2271
2225 count++; 2272 count++;
2226 i++; 2273 i++;
2227 2274
2228 continue; 2275 continue;
2229 } 2276 }
… …
2249 2296
2250 col--; /* went one too far. move back */ 2297 col--; /* went one too far. move back */
2251 count -= i; /* dump any matching trailing chars */ 2298 count -= i; /* dump any matching trailing chars */
2252 2299
2253 // sometimes we optimize away the trailing NOCHAR's, add them back 2300 // sometimes we optimize away the trailing NOCHAR's, add them back
2254 while (i && text[count] == NOCHAR) 2301 while (ecb_unlikely (i && text[count] == NOCHAR))
2255 count++, i--; 2302 count++, i--;
2256 2303
2257 /* 2304 /*
2258 * Determine the attributes for the string 2305 * Determine the attributes for the string
2259 */ 2306 */
2260 int fore = fgcolor_of (rend); // desired foreground 2307 int fore = fgcolor_of (rend); // desired foreground
2261 int back = bgcolor_of (rend); // desired background 2308 int back = bgcolor_of (rend); // desired background
2262 2309
2263 // only do special processing if any attributes are set, which is unlikely 2310 // only do special processing if any attributes are set, which is unlikely
2264 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2311 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2265 { 2312 {
2266 bool invert = rend & RS_RVid; 2313 bool invert = rend & RS_RVid;
2267 2314
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2315#ifndef NO_BOLD_UNDERLINE_REVERSE
2269 if (rend & RS_Bold && fore == Color_fg) 2316 if (rend & RS_Bold && fore == Color_fg)
… …
2288 2335
2289 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2336 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2290 fore = Color_UL; 2337 fore = Color_UL;
2291#endif 2338#endif
2292 2339
2340#ifdef OPTION_HC
2341 if (rend & RS_Sel)
2342 {
2343 /* invert the column if no highlightColor is set or it is the
2344 * current cursor column */
2345 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2346 && ISSET_PIXCOLOR (Color_HC))
2347 {
2348 if (ISSET_PIXCOLOR (Color_HTC))
2349 fore = Color_HTC;
2350 // if invert is 0 reverse video is set so we use bg color as fg color
2351 else if (!invert)
2352 fore = back;
2353
2354 back = Color_HC;
2355 invert = 0;
2356 }
2357 }
2358#endif
2359
2293 if (invert) 2360 if (invert)
2294 { 2361 {
2295#ifdef OPTION_HC
2296 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2297 || !ISSET_PIXCOLOR (Color_HC))
2298#endif
2299 /* invert the column if no highlightColor is set or it is the
2300 * current cursor column */
2301 ::swap (fore, back); 2362 ::swap (fore, back);
2302#ifdef OPTION_HC
2303 else if (ISSET_PIXCOLOR (Color_HC))
2304 back = Color_HC;
2305#endif
2306 2363
2307#ifndef NO_BOLD_UNDERLINE_REVERSE 2364#ifndef NO_BOLD_UNDERLINE_REVERSE
2308# ifndef OPTION_HC
2309 if (ISSET_PIXCOLOR (Color_RV))
2310 back = Color_RV;
2311# endif
2312 if (fore == back) 2365 if (fore == back)
2313 { 2366 {
2314 fore = Color_bg; 2367 fore = Color_bg;
2315 back = Color_fg; 2368 back = Color_fg;
2316 } 2369 }
… …
2352 /* 2405 /*
2353 * Actually do the drawing of the string here 2406 * Actually do the drawing of the string here
2354 */ 2407 */
2355 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2408 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2356 2409
2357 if (have_bg && back == Color_bg) 2410 if (ecb_likely (have_bg && back == Color_bg))
2358 { 2411 {
2359 // this is very ugly, maybe push it into ->draw? 2412 // this is very ugly, maybe push it into ->draw?
2360 2413
2361 for (i = 0; i < count; i++) /* don't draw empty strings */ 2414 for (i = 0; i < count; i++) /* don't draw empty strings */
2362 if (text[i] != ' ') 2415 if (text[i] != ' ')
… …
2369 did_clear: ; 2422 did_clear: ;
2370 } 2423 }
2371 else 2424 else
2372 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2425 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2373 2426
2374 if (rend & RS_Uline && font->descent > 1 && fore != back) 2427 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2375 { 2428 {
2376#if ENABLE_FRILLS 2429#if ENABLE_FRILLS
2377 if (ISSET_PIXCOLOR (Color_underline)) 2430 if (ISSET_PIXCOLOR (Color_underline))
2378 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2431 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2379 else 2432 else
2380#endif 2433#endif
2381 XSetForeground (dpy, gc, pix_colors[fore]); 2434 XSetForeground (dpy, gc, pix_colors[fore]);
2382 2435
2383 XDrawLine (dpy, drawBuffer, gc, 2436 XDrawLine (dpy, vt, gc,
2384 xpixel, ypixel + font->ascent + 1, 2437 xpixel, ypixel + font->ascent + 1,
2385 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2438 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2386 } 2439 }
2387 } /* for (col....) */ 2440 } /* for (col....) */
2388 } /* for (row....) */ 2441 } /* for (row....) */
2389
2390#if ENABLE_OVERLAY
2391 scr_swap_overlay ();
2392#endif
2393 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2394 2442
2395 /* 2443 /*
2396 * G: cleanup cursor and display outline cursor if necessary 2444 * G: cleanup cursor and display outline cursor if necessary
2397 */ 2445 */
2398 if (showcursor) 2446 if (showcursor)
… …
2426 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2474 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2427 else 2475 else
2428#endif 2476#endif
2429 XSetForeground (dpy, gc, pix_colors[ccol1]); 2477 XSetForeground (dpy, gc, pix_colors[ccol1]);
2430 2478
2431 XDrawRectangle (dpy, drawBuffer, gc, 2479 XDrawRectangle (dpy, vt, gc,
2432 Col2Pixel (col), 2480 Col2Pixel (col),
2433 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2434 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2435 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2436 } 2484 }
2437 } 2485 }
2438 2486
2439 /* 2487 /*
2440 * H: cleanup selection 2488 * H: cleanup selection
2441 */ 2489 */
2490#if ENABLE_OVERLAY
2491 scr_swap_overlay ();
2492#endif
2493 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2494
2442 scr_reverse_selection (); 2495 scr_reverse_selection ();
2443 2496
2497 screen.flags = old_screen_flags;
2444 num_scr = 0; 2498 num_scr = 0;
2445 num_scr_allow = 1; 2499 num_scr_allow = 1;
2446} 2500}
2447 2501
2448void 2502void ecb_cold
2449rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2503rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2450{ 2504{
2451 if (!l.t) 2505 if (!l.valid ())
2452 return; 2506 return;
2453 2507
2454 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2508 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2455 2509
2456 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2457 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2511 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2458} 2512}
2459 2513
2460void 2514void ecb_cold
2461rxvt_term::scr_remap_chars () NOTHROW 2515rxvt_term::scr_remap_chars () NOTHROW
2462{ 2516{
2463 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2464 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2465 2519
… …
2468 scr_remap_chars (drawn_buf [i]); 2522 scr_remap_chars (drawn_buf [i]);
2469 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2470 } 2524 }
2471} 2525}
2472 2526
2473void 2527void ecb_cold
2474rxvt_term::scr_recolour () NOTHROW 2528rxvt_term::scr_recolour (bool refresh) NOTHROW
2475{ 2529{
2530 bool transparent = false;
2531
2476#ifdef HAVE_BG_PIXMAP 2532#ifdef HAVE_BG_PIXMAP
2477 bgPixmap.apply (); 2533 if (bg_pixmap != None)
2478#else 2534 {
2535# ifdef ENABLE_TRANSPARENCY
2536 if (bg_flags & BG_IS_TRANSPARENT)
2537 {
2538 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2539 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2479 2540
2541 transparent = true;
2542 }
2543 else
2544# endif
2545 {
2546 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2547 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2548 }
2549 }
2550 else
2551#endif
2552 {
2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2481 XClearWindow (dpy, parent[0]);
2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2555 }
2483 2556
2484# if HAVE_SCROLLBARS 2557 XClearWindow (dpy, parent);
2558
2485 if (scrollBar.win) 2559 if (scrollBar.win)
2486 { 2560 {
2561 if (transparent)
2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2563 else
2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2488 scrollBar.setIdle (); 2565 scrollBar.state = SB_STATE_IDLE;
2489 scrollbar_show (0); 2566 scrollBar.show (0);
2490 } 2567 }
2491# endif
2492 2568
2569 if (refresh)
2570 {
2493 scr_clear (); 2571 scr_clear ();
2494 scr_touch (true); 2572 scr_touch (true);
2573 }
2495 want_refresh = 1; 2574 want_refresh = 1;
2496
2497#endif
2498} 2575}
2499 2576
2500/* ------------------------------------------------------------------------- */ 2577/* ------------------------------------------------------------------------- */
2501void 2578void
2502rxvt_term::scr_clear (bool really) NOTHROW 2579rxvt_term::scr_clear (bool really) NOTHROW
… …
2558 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2635 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2559 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2560} 2637}
2561 2638
2562/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2563void 2640void ecb_hot
2564rxvt_term::scr_reverse_selection () NOTHROW 2641rxvt_term::scr_reverse_selection () NOTHROW
2565{ 2642{
2566 if (selection.op 2643 if (selection.op
2567 && current_screen == selection.screen 2644 && current_screen == selection.screen
2568 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
2569 { 2646 {
2570#if !ENABLE_MINIMAL 2647#if !ENABLE_MINIMAL
2571 if (selection.rect) 2648 if (selection.rect)
2572 scr_xor_rect (selection.beg.row, selection.beg.col, 2649 scr_xor_rect (selection.beg.row, selection.beg.col,
2573 selection.end.row, selection.end.col, 2650 selection.end.row, selection.end.col,
2574 RS_RVid, RS_RVid | RS_Uline); 2651 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2575 else 2652 else
2576#endif 2653#endif
2577 scr_xor_span (selection.beg.row, selection.beg.col, 2654 scr_xor_span (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2655 selection.end.row, selection.end.col,
2579 RS_RVid); 2656 RS_Sel | RS_RVid);
2580 } 2657 }
2581} 2658}
2582 2659
2583/* ------------------------------------------------------------------------- */ 2660/* ------------------------------------------------------------------------- */
2584/* 2661/*
… …
2587 */ 2664 */
2588#if 0 2665#if 0
2589void 2666void
2590rxvt_term::scr_dump (int fd) NOTHROW 2667rxvt_term::scr_dump (int fd) NOTHROW
2591{ 2668{
2592 int row, wrote; 2669 // if this method is needed, it can be implemented by factoring the
2593 unsigned int width, towrite; 2670 // relevant code in scr_printscreen
2594 char r1[] = "\n";
2595
2596 for (row = saveLines - nsaved;
2597 row < saveLines + nrow - 1; row++)
2598 {
2599 width = row_buf[row].l >= 0 ? row_buf[row].l
2600 : ncol;
2601 for (towrite = width; towrite; towrite -= wrote)
2602 {
2603 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2604 towrite);
2605 if (wrote < 0)
2606 return; /* XXX: death, no report */
2607 }
2608 if (row_buf[row].l >= 0)
2609 if (write (fd, r1, 1) <= 0)
2610 return; /* XXX: death, no report */
2611 }
2612} 2671}
2613#endif 2672#endif
2614 2673
2615/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2616 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
2617 * ------------------------------------------------------------------------- */ 2676 * ------------------------------------------------------------------------- */
2618void 2677void
2619rxvt_term::selection_check (int check_more) NOTHROW 2678rxvt_term::selection_check (int check_more) NOTHROW
2620{ 2679{
2621 row_col_t pos;
2622
2623 if (!selection.op) 2680 if (!selection.op)
2624 return; 2681 return;
2625 2682
2626 pos.row = pos.col = 0;
2627 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2628 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2684 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2629 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2685 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2630 || (check_more == 1 2686 || (check_more == 1
2631 && current_screen == selection.screen 2687 && current_screen == selection.screen
2632 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2633 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2634 || (check_more == 2
2635 && ROWCOL_IS_BEFORE (selection.beg, pos)
2636 && ROWCOL_IS_AFTER (selection.end, pos))
2637 || (check_more == 3
2638 && ROWCOL_IS_AFTER (selection.end, pos))
2639 || (check_more == 4 /* screen width change */
2640 && (selection.beg.row != selection.end.row
2641 || selection.end.col > ncol)))
2642 CLEAR_SELECTION (); 2690 CLEAR_ALL_SELECTION ();
2643} 2691}
2644 2692
2645/* ------------------------------------------------------------------------- */ 2693/* ------------------------------------------------------------------------- */
2646/* 2694/*
2647 * Paste a selection direct to the command fd 2695 * Paste a selection direct to the command fd
2648 */ 2696 */
2649void 2697void
2650rxvt_term::paste (char *data, unsigned int len) NOTHROW 2698rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2651{ 2699{
2652 /* convert normal newline chars into common keyboard Return key sequence */ 2700 /* convert normal newline chars into common keyboard Return key sequence */
2653 for (unsigned int i = 0; i < len; i++) 2701 for (unsigned int i = 0; i < len; i++)
2654 if (data[i] == C0_LF) 2702 if (data[i] == C0_LF)
2655 data[i] = C0_CR; 2703 data[i] = C0_CR;
2656 2704
2705 if (priv_modes & PrivMode_BracketPaste)
2706 tt_printf ("\x1b[200~");
2707
2657 tt_write (data, len); 2708 tt_write (data, len);
2658}
2659 2709
2660/* ------------------------------------------------------------------------- */ 2710 if (priv_modes & PrivMode_BracketPaste)
2661/* 2711 tt_printf ("\x1b[201~");
2662 * Respond to a notification that a primary selection has been sent
2663 * EXT: SelectionNotify
2664 */
2665void
2666rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2667{
2668 if (prop == None) /* check for failed XConvertSelection */
2669 {
2670 if ((selection_type & Sel_CompoundText))
2671 {
2672 int selnum = selection_type & Sel_whereMask;
2673
2674 selection_type = 0;
2675 if (selnum != Sel_direct)
2676 selection_request_other (XA_STRING, selnum);
2677 }
2678
2679 if ((selection_type & Sel_UTF8String))
2680 {
2681 int selnum = selection_type & Sel_whereMask;
2682
2683 selection_type = Sel_CompoundText;
2684 if (selnum != Sel_direct)
2685 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2686 else
2687 selection_type = 0;
2688 }
2689
2690 return;
2691 }
2692
2693 unsigned long bytes_after;
2694 XTextProperty ct;
2695
2696 if (XGetWindowProperty (dpy, win, prop,
2697 0, PROP_SIZE / 4,
2698 delete_prop, AnyPropertyType,
2699 &ct.encoding, &ct.format,
2700 &ct.nitems, &bytes_after,
2701 &ct.value) != Success)
2702 {
2703 ct.value = 0;
2704 goto bailout;
2705 }
2706
2707 if (ct.encoding == None)
2708 goto bailout;
2709
2710 if (bytes_after)
2711 {
2712 // fetch and append remaining data
2713 XTextProperty ct2;
2714
2715 if (XGetWindowProperty (dpy, win, prop,
2716 ct.nitems / 4, (bytes_after + 3) / 4,
2717 delete_prop, AnyPropertyType,
2718 &ct2.encoding, &ct2.format,
2719 &ct2.nitems, &bytes_after,
2720 &ct2.value) != Success)
2721 goto bailout;
2722
2723 // realloc should be compatible to XFree, here, and elsewhere, too
2724 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2725 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2726 ct.nitems += ct2.nitems;
2727
2728 XFree (ct2.value);
2729 }
2730
2731 if (ct.value == 0)
2732 goto bailout;
2733
2734 if (ct.encoding == xa[XA_INCR])
2735 {
2736 // INCR selection, start handshake
2737 if (!delete_prop)
2738 XDeleteProperty (dpy, win, prop);
2739
2740 selection_wait = Sel_incr;
2741 incr_buf_fill = 0;
2742 incr_ev.start (10);
2743
2744 goto bailout;
2745 }
2746
2747 if (ct.nitems == 0)
2748 {
2749 if (selection_wait == Sel_incr)
2750 {
2751 XFree (ct.value);
2752
2753 // finally complete, now paste the whole thing
2754 selection_wait = Sel_normal;
2755 ct.value = (unsigned char *)incr_buf;
2756 ct.nitems = incr_buf_fill;
2757 incr_buf = 0;
2758 incr_buf_size = 0;
2759 incr_ev.stop ();
2760 }
2761 else
2762 {
2763 if (selection_wait == Sel_normal
2764 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2765 {
2766 /*
2767 * pass through again trying CUT_BUFFER0 if we've come from
2768 * XConvertSelection () but nothing was presented
2769 */
2770 selection_paste (display->root, XA_CUT_BUFFER0, False);
2771 }
2772
2773 goto bailout;
2774 }
2775 }
2776 else if (selection_wait == Sel_incr)
2777 {
2778 incr_ev.start (10);
2779
2780 while (incr_buf_fill + ct.nitems > incr_buf_size)
2781 {
2782 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2783 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2784 }
2785
2786 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2787 incr_buf_fill += ct.nitems;
2788
2789 goto bailout;
2790 }
2791
2792 char **cl;
2793 int cr;
2794
2795#if !ENABLE_MINIMAL
2796 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2797 // so recode it manually
2798 if (ct.encoding == xa[XA_UTF8_STRING])
2799 {
2800 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2801 char *s = rxvt_wcstombs (w);
2802 free (w);
2803 // TODO: strlen == only the first element will be converted. well...
2804 paste (s, strlen (s));
2805 free (s);
2806 }
2807 else
2808#endif
2809 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2810 && cl)
2811 {
2812 for (int i = 0; i < cr; i++)
2813 paste (cl[i], strlen (cl[i]));
2814
2815 XFreeStringList (cl);
2816 }
2817 else
2818 paste ((char *)ct.value, ct.nitems); // paste raw
2819
2820bailout:
2821 XFree (ct.value);
2822
2823 if (selection_wait == Sel_normal)
2824 selection_wait = Sel_none;
2825} 2712}
2826 2713
2827void 2714void
2828rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW 2715rxvt_term::paste (char *data, unsigned int len) NOTHROW
2829{ 2716{
2830 selection_wait = Sel_none; 2717 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2831
2832 incr_buf_size = 0;
2833 free (incr_buf);
2834
2835 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2836}
2837
2838void
2839rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2840{
2841 if (prop == None || selection_wait != Sel_incr)
2842 return; 2718 return;
2843 2719
2844 selection_paste (win, prop, true); 2720 tt_paste (data, len);
2845} 2721}
2846 2722
2847/* ------------------------------------------------------------------------- */ 2723/* ------------------------------------------------------------------------- */
2848/* 2724/*
2849 * Request the current selection: 2725 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2850 * Order: > internal selection if available 2726 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2851 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2727 * as fallback
2852 * > CUT_BUFFER0
2853 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2854 * will auto fallback to CUT_BUFFER0
2855 * EXT: button 2 release 2728 * EXT: button 2 release
2856 */ 2729 */
2857void 2730void
2858rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2731rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2859{ 2732{
2860 if (selection.text && selnum == Sel_Primary) 2733 if (!selection_req)
2861 {
2862 /* internal selection */
2863 char *str = rxvt_wcstombs (selection.text, selection.len);
2864 paste (str, strlen (str));
2865 free (str);
2866 return;
2867 } 2734 {
2868 else 2735 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2736 selection_req->run ();
2869 { 2737 }
2870 selection_request_time = tm;
2871 selection_wait = Sel_normal;
2872
2873#if X_HAVE_UTF8_STRING
2874 selection_type = Sel_UTF8String;
2875 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2876 return;
2877#else
2878 selection_type = Sel_CompoundText;
2879 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2880 return;
2881#endif
2882 }
2883
2884 selection_wait = Sel_none; /* don't loop in selection_paste () */
2885 selection_paste (display->root, XA_CUT_BUFFER0, false);
2886}
2887
2888int
2889rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2890{
2891 Atom sel;
2892
2893 selection_type |= selnum;
2894
2895 if (selnum == Sel_Primary)
2896 sel = XA_PRIMARY;
2897 else if (selnum == Sel_Secondary)
2898 sel = XA_SECONDARY;
2899 else
2900 sel = xa[XA_CLIPBOARD];
2901
2902 if (XGetSelectionOwner (dpy, sel) != None)
2903 {
2904 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2905 vt, selection_request_time);
2906 return 1;
2907 }
2908
2909 return 0;
2910} 2738}
2911 2739
2912/* ------------------------------------------------------------------------- */ 2740/* ------------------------------------------------------------------------- */
2913/* 2741/*
2914 * Clear all selected text 2742 * Clear all selected text
2915 * EXT: SelectionClear 2743 * EXT: SelectionClear
2916 */ 2744 */
2917void 2745void
2918rxvt_term::selection_clear () NOTHROW 2746rxvt_term::selection_clear (bool clipboard) NOTHROW
2919{ 2747{
2748 if (!clipboard)
2749 {
2920 want_refresh = 1; 2750 want_refresh = 1;
2921 free (selection.text); 2751 free (selection.text);
2922 selection.text = NULL; 2752 selection.text = NULL;
2923 selection.len = 0; 2753 selection.len = 0;
2924 CLEAR_SELECTION (); 2754 CLEAR_SELECTION ();
2925 2755
2926 if (display->selection_owner == this) 2756 if (display->selection_owner == this)
2927 display->selection_owner = 0; 2757 display->selection_owner = 0;
2758 }
2759 else
2760 {
2761 free (selection.clip_text);
2762 selection.clip_text = NULL;
2763 selection.clip_len = 0;
2764
2765 if (display->clipboard_owner == this)
2766 display->clipboard_owner = 0;
2767 }
2928} 2768}
2929 2769
2930/* ------------------------------------------------------------------------- */ 2770/* ------------------------------------------------------------------------- */
2931/* 2771/*
2932 * Copy a selection into the cut buffer 2772 * Copy a selection into the cut buffer
2933 * EXT: button 1 or 3 release 2773 * EXT: button 1 or 3 release
2934 */ 2774 */
2935void 2775void
2936rxvt_term::selection_make (Time tm) 2776rxvt_term::selection_make (Time tm)
2937{ 2777{
2938 int i; 2778 int size;
2939 wchar_t *new_selection_text; 2779 wchar_t *new_selection_text;
2940 text_t *t; 2780 text_t *t;
2941 2781
2942 switch (selection.op) 2782 switch (selection.op)
2943 { 2783 {
… …
2959 return; /* nothing selected, go away */ 2799 return; /* nothing selected, go away */
2960 2800
2961 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2801 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2962 return; 2802 return;
2963 2803
2964 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2804 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2965 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2805 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2966 2806
2967 int ofs = 0; 2807 int ofs = 0;
2968 int extra = 0; 2808 int extra = 0;
2969 2809
2970 int col = selection.beg.col; 2810 int col = selection.beg.col;
… …
2976 { 2816 {
2977#if !ENABLE_MINIMAL 2817#if !ENABLE_MINIMAL
2978 if (selection.rect) 2818 if (selection.rect)
2979 { 2819 {
2980 col = selection.beg.col; 2820 col = selection.beg.col;
2981 end_col = ncol + 1; 2821 end_col = selection.end.col;
2982 } 2822 }
2983 else 2823 else
2984#endif 2824#endif
2985 end_col = ROW(row).l; 2825 end_col = ROW(row).l;
2986 2826
2987 col = max (col, 0); 2827 col = max (col, 0);
2988 2828
2989 if (row == selection.end.row 2829 if (row == selection.end.row)
2990#if !ENABLE_MINIMAL
2991 || selection.rect
2992#endif
2993 )
2994 min_it (end_col, selection.end.col); 2830 min_it (end_col, selection.end.col);
2995 2831
2996 t = ROW(row).t + col; 2832 t = ROW(row).t + col;
2997 2833
2998 for (; col < end_col; col++) 2834 for (; col < end_col; col++)
… …
3006 2842
3007 extra -= (len - 1); 2843 extra -= (len - 1);
3008 2844
3009 if (extra < 0) 2845 if (extra < 0)
3010 { 2846 {
3011 extra += i; 2847 extra += size;
3012 i += i; 2848 size += size;
3013 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2849 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3014 } 2850 }
3015 2851
3016 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2852 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3017 } 2853 }
3018#endif 2854#endif
… …
3030 2866
3031 new_selection_text[ofs++] = C0_LF; 2867 new_selection_text[ofs++] = C0_LF;
3032 } 2868 }
3033 else 2869 else
3034#endif 2870#endif
3035 if (!ROW(row).is_longer () && row != selection.end.row) 2871 if (!ROW(row).is_longer ()
2872 && (row != selection.end.row || end_col != selection.end.col)
2873 && (row != selection.beg.row || selection.beg.col < ncol))
3036 new_selection_text[ofs++] = C0_LF; 2874 new_selection_text[ofs++] = C0_LF;
3037 } 2875 }
3038
3039 if (end_col != selection.end.col)
3040 new_selection_text[ofs++] = C0_LF;
3041 2876
3042 new_selection_text[ofs] = 0; 2877 new_selection_text[ofs] = 0;
3043 2878
3044 if (ofs == 0) 2879 if (ofs == 0)
3045 { 2880 {
… …
3058 2893
3059 selection_grab (tm); 2894 selection_grab (tm);
3060} 2895}
3061 2896
3062bool 2897bool
3063rxvt_term::selection_grab (Time tm) NOTHROW 2898rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3064{ 2899{
2900 Atom sel;
2901
2902 if (!clipboard)
2903 {
3065 selection_time = tm; 2904 selection_time = tm;
2905 sel = XA_PRIMARY;
2906 }
2907 else
2908 {
2909 clipboard_time = tm;
2910 sel = xa[XA_CLIPBOARD];
2911 }
3066 2912
3067 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2913 XSetSelectionOwner (dpy, sel, vt, tm);
3068 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2914 if (XGetSelectionOwner (dpy, sel) == vt)
3069 { 2915 {
3070 display->set_selection_owner (this); 2916 display->set_selection_owner (this, clipboard);
3071 return true; 2917 return true;
3072 } 2918 }
3073 else 2919 else
3074 { 2920 {
3075 selection_clear (); 2921 selection_clear (clipboard);
3076 return false; 2922 return false;
3077 } 2923 }
3078 2924
3079#if 0 2925#if 0
3080 XTextProperty ct; 2926 XTextProperty ct;
… …
3090/* ------------------------------------------------------------------------- */ 2936/* ------------------------------------------------------------------------- */
3091/* 2937/*
3092 * Mark or select text based upon number of clicks: 1, 2, or 3 2938 * Mark or select text based upon number of clicks: 1, 2, or 3
3093 * EXT: button 1 press 2939 * EXT: button 1 press
3094 */ 2940 */
3095void 2941void ecb_cold
3096rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2942rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3097{ 2943{
3098 clicks = ((clicks - 1) % 3) + 1; 2944 clicks = ((clicks - 1) % 3) + 1;
3099 selection.clicks = clicks; /* save clicks so extend will work */ 2945 selection.clicks = clicks; /* save clicks so extend will work */
3100 2946
… …
3119 2965
3120/* ------------------------------------------------------------------------- */ 2966/* ------------------------------------------------------------------------- */
3121/* 2967/*
3122 * Mark a selection at the specified col/row 2968 * Mark a selection at the specified col/row
3123 */ 2969 */
3124void 2970void ecb_cold
3125rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2971rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3126{ 2972{
3127 want_refresh = 1; 2973 want_refresh = 1;
3128 2974
3129 selection.mark.row = row + view_start; 2975 selection.mark.row = row + view_start;
… …
3156/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3002/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3157#define DELIMIT_TEXT(x) \ 3003#define DELIMIT_TEXT(x) \
3158 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3004 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3159#define DELIMIT_REND(x) 1 3005#define DELIMIT_REND(x) 1
3160 3006
3161void 3007void ecb_cold
3162rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3008rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3163{ 3009{
3164 int col, row, dirnadd, tcol, trow, w1, w2; 3010 int col, row, dirnadd, tcol, trow, w1, w2;
3165 row_col_t bound; 3011 row_col_t bound;
3166 text_t *stp; 3012 text_t *stp;
… …
3240 * EXT: button 3 press; button 1 or 3 drag 3086 * EXT: button 3 press; button 1 or 3 drag
3241 * flag == 0 ==> button 1 3087 * flag == 0 ==> button 1
3242 * flag == 1 ==> button 3 press 3088 * flag == 1 ==> button 3 press
3243 * flag == 2 ==> button 3 motion 3089 * flag == 2 ==> button 3 motion
3244 */ 3090 */
3245void 3091void ecb_cold
3246rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3092rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3247{ 3093{
3248 int col = clamp (Pixel2Col (x), 0, ncol); 3094 int col = clamp (Pixel2Col (x), 0, ncol);
3249 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3095 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3250 3096
… …
3276 3122
3277/* ------------------------------------------------------------------------- */ 3123/* ------------------------------------------------------------------------- */
3278/* 3124/*
3279 * Extend the selection to the specified col/row 3125 * Extend the selection to the specified col/row
3280 */ 3126 */
3281void 3127void ecb_cold
3282rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3128rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3283{ 3129{
3284 row_col_t pos; 3130 row_col_t pos;
3285 enum { 3131 enum {
3286 LEFT, RIGHT 3132 LEFT, RIGHT
… …
3477 ::swap (selection.beg.col, selection.end.col); 3323 ::swap (selection.beg.col, selection.end.col);
3478#endif 3324#endif
3479} 3325}
3480 3326
3481#if !ENABLE_MINIMAL 3327#if !ENABLE_MINIMAL
3482void 3328void ecb_cold
3483rxvt_term::selection_remove_trailing_spaces () NOTHROW 3329rxvt_term::selection_remove_trailing_spaces () NOTHROW
3484{ 3330{
3485 int32_t end_col, end_row; 3331 int32_t end_col, end_row;
3486 text_t *stp; 3332 text_t *stp;
3487 3333
… …
3525/* ------------------------------------------------------------------------- */ 3371/* ------------------------------------------------------------------------- */
3526/* 3372/*
3527 * Double click on button 3 when already selected 3373 * Double click on button 3 when already selected
3528 * EXT: button 3 double click 3374 * EXT: button 3 double click
3529 */ 3375 */
3530void 3376void ecb_cold
3531rxvt_term::selection_rotate (int x, int y) NOTHROW 3377rxvt_term::selection_rotate (int x, int y) NOTHROW
3532{ 3378{
3533 selection.clicks = selection.clicks % 3 + 1; 3379 selection.clicks = selection.clicks % 3 + 1;
3534 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3380 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3535} 3381}
… …
3537/* ------------------------------------------------------------------------- */ 3383/* ------------------------------------------------------------------------- */
3538/* 3384/*
3539 * Respond to a request for our current selection 3385 * Respond to a request for our current selection
3540 * EXT: SelectionRequest 3386 * EXT: SelectionRequest
3541 */ 3387 */
3542void 3388void ecb_cold
3543rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3389rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3544{ 3390{
3391 Atom property = rq.property == None ? rq.target : rq.property;
3545 XSelectionEvent ev; 3392 XSelectionEvent ev;
3546 3393
3547 ev.type = SelectionNotify; 3394 ev.type = SelectionNotify;
3548 ev.property = None; 3395 ev.property = None;
3549 ev.display = rq.display; 3396 ev.display = rq.display;
… …
3564 *target++ = xa[XA_COMPOUND_TEXT]; 3411 *target++ = xa[XA_COMPOUND_TEXT];
3565#if X_HAVE_UTF8_STRING 3412#if X_HAVE_UTF8_STRING
3566 *target++ = xa[XA_UTF8_STRING]; 3413 *target++ = xa[XA_UTF8_STRING];
3567#endif 3414#endif
3568 3415
3569 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3416 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3570 32, PropModeReplace, 3417 32, PropModeReplace,
3571 (unsigned char *)target_list, target - target_list); 3418 (unsigned char *)target_list, target - target_list);
3572 ev.property = rq.property; 3419 ev.property = property;
3573 } 3420 }
3574#if TODO // TODO 3421#if TODO // TODO
3575 else if (rq.target == xa[XA_MULTIPLE]) 3422 else if (rq.target == xa[XA_MULTIPLE])
3576 { 3423 {
3577 /* TODO: Handle MULTIPLE */ 3424 /* TODO: Handle MULTIPLE */
3578 } 3425 }
3579#endif 3426#endif
3580 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3427 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3581 { 3428 {
3582 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3429 XChangeProperty (dpy, rq.requestor, property, rq.target,
3583 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3430 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3584 ev.property = rq.property; 3431 ev.property = property;
3432 }
3433 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3434 {
3435 XChangeProperty (dpy, rq.requestor, property, rq.target,
3436 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3437 ev.property = property;
3585 } 3438 }
3586 else if (rq.target == XA_STRING 3439 else if (rq.target == XA_STRING
3587 || rq.target == xa[XA_TEXT] 3440 || rq.target == xa[XA_TEXT]
3588 || rq.target == xa[XA_COMPOUND_TEXT] 3441 || rq.target == xa[XA_COMPOUND_TEXT]
3589 || rq.target == xa[XA_UTF8_STRING] 3442 || rq.target == xa[XA_UTF8_STRING]
… …
3621 { 3474 {
3622 target = xa[XA_COMPOUND_TEXT]; 3475 target = xa[XA_COMPOUND_TEXT];
3623 style = enc_compound_text; 3476 style = enc_compound_text;
3624 } 3477 }
3625 3478
3626 if (selection.text) 3479 if (rq.selection == XA_PRIMARY && selection.text)
3627 { 3480 {
3628 cl = selection.text; 3481 cl = selection.text;
3629 selectlen = selection.len; 3482 selectlen = selection.len;
3483 }
3484 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3485 {
3486 cl = selection.clip_text;
3487 selectlen = selection.clip_len;
3630 } 3488 }
3631 else 3489 else
3632 { 3490 {
3633 cl = L""; 3491 cl = L"";
3634 selectlen = 0; 3492 selectlen = 0;
… …
3655 ct.value = (unsigned char *)cl; 3513 ct.value = (unsigned char *)cl;
3656 ct.nitems = selectlen; 3514 ct.nitems = selectlen;
3657 ct.encoding = target; 3515 ct.encoding = target;
3658 } 3516 }
3659 3517
3660 XChangeProperty (dpy, rq.requestor, rq.property, 3518 XChangeProperty (dpy, rq.requestor, property,
3661 ct.encoding, 8, PropModeReplace, 3519 ct.encoding, 8, PropModeReplace,
3662 ct.value, (int)ct.nitems); 3520 ct.value, (int)ct.nitems);
3663 ev.property = rq.property; 3521 ev.property = property;
3664 3522
3665 if (freect) 3523 if (freect)
3666 XFree (ct.value); 3524 XFree (ct.value);
3667 } 3525 }
3668 3526
3669 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3527 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3670} 3528}
3671 3529
3672/* ------------------------------------------------------------------------- */ 3530/* ------------------------------------------------------------------------- */
3673#ifdef USE_XIM 3531#ifdef USE_XIM
3674void 3532void ecb_cold
3675rxvt_term::im_set_position (XPoint &pos) NOTHROW 3533rxvt_term::im_set_position (XPoint &pos) NOTHROW
3676{ 3534{
3677 XWindowAttributes xwa; 3535 XWindowAttributes xwa;
3678 3536
3679 XGetWindowAttributes (dpy, vt, &xwa); 3537 XGetWindowAttributes (dpy, vt, &xwa);
… …
3702 h += 2; min_it (h, nrow); 3560 h += 2; min_it (h, nrow);
3703 3561
3704 x -= 1; clamp_it (x, 0, ncol - w); 3562 x -= 1; clamp_it (x, 0, ncol - w);
3705 y -= 1; clamp_it (y, 0, nrow - h); 3563 y -= 1; clamp_it (y, 0, nrow - h);
3706 3564
3707 ov_x = x; ov_y = y; 3565 ov.x = x; ov.y = y;
3708 ov_w = w; ov_h = h; 3566 ov.w = w; ov.h = h;
3709 3567
3710 ov_text = new text_t *[h]; 3568 ov.text = new text_t *[h];
3711 ov_rend = new rend_t *[h]; 3569 ov.rend = new rend_t *[h];
3712 3570
3713 for (y = 0; y < h; y++) 3571 for (y = 0; y < h; y++)
3714 { 3572 {
3715 text_t *tp = ov_text[y] = new text_t[w]; 3573 text_t *tp = ov.text[y] = new text_t[w];
3716 rend_t *rp = ov_rend[y] = new rend_t[w]; 3574 rend_t *rp = ov.rend[y] = new rend_t[w];
3717 3575
3718 text_t t0, t1, t2; 3576 text_t t0, t1, t2;
3719 rend_t r = OVERLAY_RSTYLE; 3577 rend_t r = OVERLAY_RSTYLE;
3720 3578
3721 if (y == 0) 3579 if (y == 0)
… …
3740} 3598}
3741 3599
3742void 3600void
3743rxvt_term::scr_overlay_off () NOTHROW 3601rxvt_term::scr_overlay_off () NOTHROW
3744{ 3602{
3745 if (!ov_text) 3603 if (!ov.text)
3746 return; 3604 return;
3747 3605
3748 want_refresh = 1; 3606 want_refresh = 1;
3749 3607
3750 for (int y = 0; y < ov_h; y++) 3608 for (int y = 0; y < ov.h; y++)
3751 { 3609 {
3752 delete [] ov_text[y]; 3610 delete [] ov.text[y];
3753 delete [] ov_rend[y]; 3611 delete [] ov.rend[y];
3754 } 3612 }
3755 3613
3756 delete [] ov_text; ov_text = 0; 3614 delete [] ov.text; ov.text = 0;
3757 delete [] ov_rend; ov_rend = 0; 3615 delete [] ov.rend; ov.rend = 0;
3758} 3616}
3759 3617
3760void 3618void
3761rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3619rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3762{ 3620{
3763 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3621 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3764 return; 3622 return;
3765 3623
3766 x++, y++; 3624 x++, y++;
3767 3625
3768 ov_text[y][x] = text; 3626 ov.text[y][x] = text;
3769 ov_rend[y][x] = rend; 3627 ov.rend[y][x] = rend;
3770} 3628}
3771 3629
3772void 3630void
3773rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3631rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3774{ 3632{
… …
3793} 3651}
3794 3652
3795void 3653void
3796rxvt_term::scr_swap_overlay () NOTHROW 3654rxvt_term::scr_swap_overlay () NOTHROW
3797{ 3655{
3798 if (!ov_text) 3656 if (!ov.text)
3799 return; 3657 return;
3800 3658
3659 // hide cursor if it is within the overlay area
3660 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3661 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3662 screen.flags &= ~Screen_VisibleCursor;
3663
3801 // swap screen mem with overlay 3664 // swap screen mem with overlay
3802 for (int y = ov_h; y--; ) 3665 for (int y = ov.h; y--; )
3803 { 3666 {
3804 text_t *t1 = ov_text[y]; 3667 text_t *t1 = ov.text[y];
3805 rend_t *r1 = ov_rend[y]; 3668 rend_t *r1 = ov.rend[y];
3806 3669
3807 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3670 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3808 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3671 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3809 3672
3810 for (int x = ov_w; x--; ) 3673 for (int x = ov.w; x--; )
3811 { 3674 {
3812 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3675 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3813 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3676 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3814 } 3677 }
3815 } 3678 }

Diff Legend

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