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.298 by ayin, Sun Jan 20 14:12:39 2008 UTC vs.
Revision 1.429 by root, Sun Jan 13 20:11:21 2013 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-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 = chunk_alloc (chunk_size, 0);
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 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf;
234
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc ();
238
197 if (!row_buf) 239 if (!prev_row_buf)
198 { 240 {
199 /* 241 /*
200 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
201 */ 243 */
202 top_row = 0; 244 top_row = 0;
203 term_start = 0; 245 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 246
219 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
236 selection.text = NULL; 264 selection.text = NULL;
237 selection.len = 0; 265 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 266 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 267 selection.screen = PRIMARY;
240 selection.clicks = 0; 268 selection.clicks = 0;
269 selection.clip_text = NULL;
270 selection.clip_len = 0;
241 } 271 }
242 else 272 else
243 { 273 {
244 /* 274 /*
245 * add or delete rows as appropriate 275 * add or delete rows as appropriate
246 */ 276 */
247 277
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--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
266 { 279 {
267 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 }
270 282
271 for (int row = prev_nrow; row < nrow; row++) 283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
288 swap_buf [row].l = prev_swap_buf [row].l;
272 { 289 }
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 290
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 291 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 292 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 293 int q = total_rows; // rewrapped row
283 294
284 if (top_row) 295 if (top_row)
285 { 296 {
286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 297 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 298 // to come up with a lean and mean algorithm.
299 // TODO: maybe optimise when width didn't change
288 300
289 row_col_t ocur = screen.cur; 301 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 302 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 303
292 do 304 do
293 { 305 {
294 p = MOD (p - 1, prev_total_rows); 306 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 307 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 308 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 309 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
300 310
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 311 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 { 312 {
303 p = MOD (p - 1, prev_total_rows); 313 p = MOD (p - 1, prev_total_rows);
304 314
305 plines++; 315 plines++;
306 llen += prev_ncol; 316 llen += prev_ncol;
… …
319 329
320 // re-assemble the full line by destination lines 330 // re-assemble the full line by destination lines
321 for (int qrow = q; qlines--; qrow++) 331 for (int qrow = q; qlines--; qrow++)
322 { 332 {
323 qline = row_buf + qrow; 333 qline = row_buf + qrow;
324 lalloc (*qline); 334 qline->alloc (); // redundant with next line
325 qline->l = ncol; 335 qline->l = ncol;
326 qline->is_longer (1); 336 qline->is_longer (1);
327 337
328 int qcol = 0; 338 int qcol = 0;
329 339
… …
344 // this seems to upset applications/shells/readline 354 // this seems to upset applications/shells/readline
345 // least. 355 // least.
346 if (prow == ocur.row) 356 if (prow == ocur.row)
347 screen.cur.row = q - (total_rows - nrow); 357 screen.cur.row = q - (total_rows - nrow);
348 358
349 line_t &pline = old_buf [prow]; 359 line_t &pline = prev_row_buf [prow];
350 360
351 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 361 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
352 362
353 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 363 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
354 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 364 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
375 { 385 {
376 // if no scrollback exists (yet), wing, instead of wrap 386 // if no scrollback exists (yet), wing, instead of wrap
377 387
378 for (int row = min (nrow, prev_nrow); row--; ) 388 for (int row = min (nrow, prev_nrow); row--; )
379 { 389 {
380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 390 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
381 line_t &qline = row_buf [row]; 391 line_t &dst = row_buf [row];
382 392
383 qline = pline; 393 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
384 lresize (qline); 394
395 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
396 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
397 dst.l = common_col;
385 } 398 }
386 399
387 for (int row = prev_nrow; row < nrow; row++) 400 for (int row = prev_nrow; row < nrow; row++)
388 {
389 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 401 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
390 }
391 402
392 term_start = 0; 403 term_start = 0;
393 } 404 }
394
395 free (old_buf);
396 delete old_ta;
397 delete old_ra;
398 405
399 clamp_it (screen.cur.row, 0, nrow - 1); 406 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 407 clamp_it (screen.cur.col, 0, ncol - 1);
408 }
401 409
410 for (int row = nrow; row--; )
411 {
412 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
413 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
414 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
415 }
416
417 chunk_free (prev_chunk, prev_chunk_size);
418
402 free (tabs); 419 free (tabs);
403 } 420 tabs = (char *)rxvt_malloc (ncol);
421
422 for (int col = ncol; col--; )
423 tabs [col] = col % TABSIZE == 0;
404 424
405 CLEAR_ALL_SELECTION (); 425 CLEAR_ALL_SELECTION ();
406 426
407 prev_nrow = nrow; 427 prev_nrow = nrow;
408 prev_ncol = ncol; 428 prev_ncol = ncol;
409 429
410 tabs = (char *)rxvt_malloc (ncol); 430 tt_winch ();
411 431
412 for (int col = ncol; --col; ) 432 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
413 tabs [col] = col % TABSIZE == 0; 433}
434
435void ecb_cold
436rxvt_term::scr_release () NOTHROW
437{
438 chunk_free (chunk, chunk_size);
439 chunk = 0;
440 row_buf = 0;
441
442 free (tabs);
443 tabs = 0;
444}
445
446/* ------------------------------------------------------------------------- */
447/*
448 * Hard/Soft reset
449 */
450void ecb_cold
451rxvt_term::scr_poweron ()
452{
453 scr_release ();
454
455 prev_nrow = prev_ncol = 0;
456 rvideo_mode = false;
457 scr_soft_reset ();
458 scr_reset ();
459
460 scr_clear (true);
461 scr_refresh ();
462}
463
464void ecb_cold
465rxvt_term::scr_soft_reset () NOTHROW
466{
467 /* only affects modes, nothing drastic such as clearing the screen */
468#if ENABLE_OVERLAY
469 scr_overlay_off ();
470#endif
414 471
415 if (current_screen != PRIMARY) 472 if (current_screen != PRIMARY)
416 scr_swap_screen (); 473 scr_swap_screen ();
417 474
418 tt_winch (); 475 scr_scroll_region (0, MAX_ROWS - 1);
419 476 scr_rendition (0, ~RS_None);
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 477 scr_insert_mode (0);
421}
422
423/* ------------------------------------------------------------------------- */
424/*
425 * Free everything. That way malloc debugging can find leakage.
426 */
427void
428rxvt_term::scr_release () NOTHROW
429{
430 if (row_buf)
431 {
432 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0;
434
435 free (row_buf);
436 free (swap_buf);
437 free (drawn_buf);
438 free (tabs);
439
440 row_buf = 0; // signal that we freed all the arrays
441 }
442}
443
444/* ------------------------------------------------------------------------- */
445/*
446 * Hard reset
447 */
448void
449rxvt_term::scr_poweron ()
450{
451 scr_release ();
452 prev_nrow = prev_ncol = 0;
453 scr_reset ();
454
455 scr_clear (true);
456 scr_refresh ();
457} 478}
458 479
459/* ------------------------------------------------------------------------- * 480/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 481 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 482 * ------------------------------------------------------------------------- */
… …
499 } 520 }
500 521
501 /* boundary check in case screen size changed between SAVE and RESTORE */ 522 /* boundary check in case screen size changed between SAVE and RESTORE */
502 min_it (s->cur.row, nrow - 1); 523 min_it (s->cur.row, nrow - 1);
503 min_it (s->cur.col, ncol - 1); 524 min_it (s->cur.col, ncol - 1);
504#ifdef DEBUG_STRICT
505 assert (s->cur.row >= 0); 525 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 526 assert (s->cur.col >= 0);
507#endif
508} 527}
509 528
510void 529void
511rxvt_term::scr_swap_screen () 530rxvt_term::scr_swap_screen () NOTHROW
512{ 531{
513 if (!option (Opt_secondaryScreen)) 532 if (!option (Opt_secondaryScreen))
514 return; 533 return;
515 534
516 for (int i = prev_nrow; i--; ) 535 for (int i = prev_nrow; i--; )
… …
535 return; 554 return;
536 555
537 want_refresh = 1; 556 want_refresh = 1;
538 view_start = 0; 557 view_start = 0;
539 558
540 selection_check (2); /* check for boundary cross */ 559 /* check for boundary cross */
560 row_col_t pos;
561 pos.row = pos.col = 0;
562 if (ROWCOL_IS_BEFORE (selection.beg, pos)
563 && ROWCOL_IS_AFTER (selection.end, pos))
564 CLEAR_SELECTION ();
541 565
542 int i = current_screen; current_screen = scrn; scrn = i; 566 current_screen = scrn;
543 567
544#if NSCREENS 568#if NSCREENS
545 if (option (Opt_secondaryScreen)) 569 if (option (Opt_secondaryScreen))
546 { 570 {
547 num_scr = 0; 571 num_scr = 0;
… …
611/* 635/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 636 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 637 * count positive ==> scroll up
614 * count negative ==> scroll down 638 * count negative ==> scroll down
615 */ 639 */
616int 640int ecb_hot
617rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 641rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
618{ 642{
619 if (count == 0 || (row1 > row2)) 643 if (count == 0 || (row1 > row2))
620 return 0; 644 return 0;
621 645
… …
624 648
625 if (count > 0 649 if (count > 0
626 && row1 == 0 650 && row1 == 0
627 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 651 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
628 { 652 {
653 min_it (count, total_rows - (nrow - (row2 + 1)));
654
629 top_row = max (top_row - count, -saveLines); 655 top_row = max (top_row - count, -saveLines);
630
631 // scroll everything up 'count' lines
632 term_start = (term_start + count) % total_rows;
633 656
634 // sever bottommost line 657 // sever bottommost line
635 { 658 {
636 line_t &l = ROW(row2 - count); 659 line_t &l = ROW(row2);
637 l.is_longer (0); 660 l.is_longer (0);
638 l.touch (); 661 l.touch ();
639 } 662 }
640 663
664 // scroll everything up 'count' lines
665 term_start = (term_start + count) % total_rows;
666
667 // now copy lines below the scroll region bottom to the
668 // bottom of the screen again, so they look as if they
669 // hadn't moved.
670 for (int i = nrow; --i > row2; )
671 {
672 line_t &l1 = ROW(i - count);
673 line_t &l2 = ROW(i);
674
675 ::swap (l1, l2);
676 l2.touch ();
677 }
678
641 // erase newly scrolled-in lines 679 // erase newly scrolled-in lines
642 for (int i = count; i--; ) 680 for (int i = count; i--; )
643 { 681 {
644 line_t &l = ROW(nrow - 1 - i); 682 line_t &l = ROW(row2 - i);
645 683
646 // optimize if already cleared, can be significant on slow machines 684 // optimise if already cleared, can be significant on slow machines
647 // could be rolled into scr_blank_screen_mem 685 // could be rolled into scr_blank_screen_mem
648 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 686 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
649 { 687 {
650 scr_blank_line (l, 0, l.l, rstyle); 688 scr_blank_line (l, 0, l.l, rstyle);
651 l.l = 0; 689 l.l = 0;
… …
653 } 691 }
654 else 692 else
655 scr_blank_screen_mem (l, rstyle); 693 scr_blank_screen_mem (l, rstyle);
656 } 694 }
657 695
658 // now copy lines below the scroll region bottom to the
659 // bottom of the screen again, so they look as if they
660 // hadn't moved.
661 for (int i = nrow; --i > row2; )
662 {
663 line_t &l1 = ROW(i - count);
664 line_t &l2 = ROW(i);
665
666 ::swap (l1, l2);
667 l2.touch ();
668 }
669
670 // move and/or clear selection, if any 696 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 697 if (selection.op && current_screen == selection.screen
698 && selection.beg.row <= row2)
672 { 699 {
673 selection.beg.row -= count; 700 selection.beg.row -= count;
674 selection.end.row -= count; 701 selection.end.row -= count;
675 selection.mark.row -= count; 702 selection.mark.row -= count;
676 703
677 if (selection.beg.row < top_row 704 selection_check (0);
678 || selection.end.row < top_row
679 || selection.mark.row < top_row)
680 {
681 CLEAR_ALL_SELECTION ();
682 selection.op = SELECTION_CLEAR;
683 }
684 } 705 }
685 706
686 // finally move the view window, if desired 707 // finally move the view window, if desired
687 if (option (Opt_scrollWithBuffer) 708 if (option (Opt_scrollWithBuffer)
688 && view_start != 0 709 && view_start != 0
… …
718 } 739 }
719 740
720 // use a simple and robust scrolling algorithm, this 741 // use a simple and robust scrolling algorithm, this
721 // part of scr_scroll_text is not time-critical. 742 // part of scr_scroll_text is not time-critical.
722 743
744 // sever line above scroll region
745 if (row1)
746 {
747 line_t &l = ROW(row1 - 1);
748 l.is_longer (0);
749 l.touch ();
750 }
751
723 int rows = row2 - row1 + 1; 752 int rows = row2 - row1 + 1;
724 753
725 min_it (count, rows); 754 min_it (count, rows);
726 755
727 line_t *temp_buf = row_buf + total_rows; 756 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
728 757
729 for (int row = 0; row < rows; row++) 758 for (int row = 0; row < rows; row++)
730 { 759 {
731 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 760 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
732 761
… …
734 scr_blank_screen_mem (temp_buf [row], rstyle); 763 scr_blank_screen_mem (temp_buf [row], rstyle);
735 } 764 }
736 765
737 for (int row = 0; row < rows; row++) 766 for (int row = 0; row < rows; row++)
738 ROW(row1 + row) = temp_buf [row]; 767 ROW(row1 + row) = temp_buf [row];
768
769 // sever bottommost line
770 {
771 line_t &l = ROW(row2);
772 l.is_longer (0);
773 l.touch ();
774 }
739 } 775 }
740 776
741 return count; 777 return count;
742} 778}
743 779
744/* ------------------------------------------------------------------------- */ 780/* ------------------------------------------------------------------------- */
745/* 781/*
746 * Add text given in <str> of length <len> to screen struct 782 * Add text given in <str> of length <len> to screen struct
747 */ 783 */
748void 784void ecb_hot
749rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 785rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
750{ 786{
751 if (len <= 0) /* sanity */ 787 if (len <= 0) /* sanity */
752 return; 788 return;
753 789
754 unsigned char checksel; 790 bool checksel;
755 unicode_t c; 791 unicode_t c;
756 int ncol = this->ncol; 792 int ncol = this->ncol;
757 const wchar_t *strend = str + len; 793 const wchar_t *strend = str + len;
758 794
759 want_refresh = 1; 795 want_refresh = 1;
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 808 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 809 screen.cur.row -= minlines;
774 } 810 }
775 } 811 }
776 812
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 813 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 814 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 815 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 816 int row = screen.cur.row;
783 817
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 818 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 819
786 line_t *line = &ROW(row); 820 line_t *line = &ROW(row);
787 821
788 while (str < strend) 822 while (str < strend)
789 { 823 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 824 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 825
792 if (c < 0x20) 826 if (ecb_unlikely (c < 0x20))
793 if (c == C0_LF) 827 if (c == C0_LF)
794 { 828 {
795 max_it (line->l, screen.cur.col); 829 max_it (line->l, screen.cur.col);
796 830
797 screen.flags &= ~Screen_WrapNext; 831 screen.flags &= ~Screen_WrapNext;
… …
816 { 850 {
817 scr_tab (1, true); 851 scr_tab (1, true);
818 continue; 852 continue;
819 } 853 }
820 854
855 if (ecb_unlikely (
821 if (checksel /* see if we're writing within selection */ 856 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 857 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 858 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
859 ))
824 { 860 {
825 checksel = 0; 861 checksel = 0;
826 /* 862 /*
827 * If we wrote anywhere in the selected area, kill the selection 863 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 864 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 865 * should be a similar check.
830 */ 866 */
831 CLEAR_SELECTION (); 867 CLEAR_SELECTION ();
832 } 868 }
833 869
834 if (screen.flags & Screen_WrapNext) 870 if (ecb_unlikely (screen.flags & Screen_WrapNext))
835 { 871 {
836 scr_do_wrap (); 872 scr_do_wrap ();
837 873
838 line->l = ncol; 874 line->l = ncol;
839 line->is_longer (1); 875 line->is_longer (1);
… …
841 row = screen.cur.row; 877 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 878 line = &ROW(row); /* _must_ refresh */
843 } 879 }
844 880
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 881 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 882 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 883 c = 0xfffd;
848 884
849 // rely on wcwidth to tell us the character width, do wcwidth before 885 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 886 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 887 // drawing characters below as they might be invalid in the current
852 // locale. 888 // locale.
853 int width = WCWIDTH (c); 889 int width = WCWIDTH (c);
854 890
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 891 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 892 {
857 // vt100 special graphics and line drawing 893 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 894 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 895 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 896 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 909 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 910 width = 1; // vt100 line drawing characters are always single-width
875 } 911 }
876 } 912 }
877 913
878 if (screen.flags & Screen_Insert) 914 if (ecb_unlikely (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 915 scr_insdel_chars (width, INSERT);
880 916
881 if (width != 0) 917 if (width != 0)
882 { 918 {
883#if !UNICODE_3 919#if !UNICODE_3
… …
888# else 924# else
889 c = 0xfffd; 925 c = 0xfffd;
890# endif 926# endif
891#endif 927#endif
892 928
929 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
930
931 // if the character doesn't fit into the remaining columns...
932 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
933 {
934 if (screen.flags & Screen_Autowrap)
935 {
936 // ... artificially enlargen the previous one
937 c = NOCHAR;
938 // and try the same character next loop iteration
939 --str;
940 }
941 else
942 screen.cur.col = ncol - width;
943 }
944
893 // nuke the character at this position, if required 945 // nuke the character at this position, if required
946 // due to wonderful coincidences everywhere else in this loop
947 // we never have to check for overwriting a wide char itself,
948 // only its tail.
894 if (line->t[screen.cur.col] == NOCHAR 949 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
895 || (screen.cur.col < ncol - 1 950 scr_kill_char (*line, screen.cur.col);
896 && line->t[screen.cur.col + 1] == NOCHAR))
897 {
898 int col = screen.cur.col;
899
900 // find begin
901 while (col > 0 && line->t[col] == NOCHAR)
902 col--;
903
904 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
905
906 // found begin, nuke
907 do {
908 line->t[col] = ' ';
909 line->r[col] = rend;
910 col++;
911 } while (col < ncol && line->t[col] == NOCHAR);
912 }
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (screen.cur.col > ncol - width && ncol >= width)
918 {
919 // ...output spaces
920 c = ' ';
921 // and try the same character next loop iteration
922 --str;
923 }
924 951
925 line->touch (); 952 line->touch ();
926 953
927 do 954 do
928 { 955 {
929 line->t[screen.cur.col] = c; 956 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 957 line->r[screen.cur.col] = rend;
931 958
932 if (screen.cur.col < ncol - 1) 959 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 960 screen.cur.col++;
934 else 961 else
935 { 962 {
936 line->l = ncol; 963 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 964 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 965 screen.flags |= Screen_WrapNext;
939 break; 966
967 goto end_of_line;
940 } 968 }
941 969
942 c = NOCHAR; 970 c = NOCHAR;
943 } 971 }
944 while (--width > 0); 972 while (ecb_unlikely (--width > 0));
945 973
946 // pad with spaces when overwriting wide character with smaller one 974 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 975 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 976 {
949 line->touch (); 977 line->t[c] = ' ';
978 line->r[c] = rend;
979 }
950 980
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 981end_of_line:
982 ;
983 }
984#if ENABLE_COMBINING
985 else // width == 0
986 {
987 if (c != 0xfeff) // ignore BOM
988 {
989 // handle combining characters
990 // we just tag the accent on the previous on-screen character.
991 // this is arguably not correct, but also arguably not wrong.
992 // we don't handle double-width characters nicely yet.
993 line_t *linep;
994 text_t *tp;
995 rend_t *rp;
996
997 if (screen.cur.col > 0)
952 { 998 {
953 line->t[c] = ' ';
954 line->r[c] = rend; 999 linep = line;
1000 tp = line->t + screen.cur.col - 1;
1001 rp = line->r + screen.cur.col - 1;
955 } 1002 }
1003 else if (screen.cur.row > 0
1004 && ROW(screen.cur.row - 1).is_longer ())
1005 {
1006 linep = &ROW(screen.cur.row - 1);
1007 tp = line->t + ncol - 1;
1008 rp = line->r + ncol - 1;
1009 }
1010 else
1011 continue;
1012
1013 linep->touch ();
1014
1015 while (*tp == NOCHAR && tp > linep->t)
1016 tp--, rp--;
1017
1018 // first try to find a precomposed character
1019 unicode_t n = rxvt_compose (*tp, c);
1020 if (n == NOCHAR)
1021 n = rxvt_composite.compose (*tp, c);
1022
1023 *tp = n;
1024 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
956 } 1025 }
957 } 1026 }
958 else // width == 0
959 {
960#if ENABLE_COMBINING
961 // handle combining characters
962 // we just tag the accent on the previous on-screen character.
963 // this is arguably not correct, but also arguably not wrong.
964 // we don't handle double-width characters nicely yet.
965 line_t *linep;
966 text_t *tp;
967 rend_t *rp;
968
969 if (screen.cur.col > 0)
970 {
971 linep = line;
972 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1;
974 }
975 else if (screen.cur.row > 0
976 && ROW(screen.cur.row - 1).is_longer ())
977 {
978 linep = &ROW(screen.cur.row - 1);
979 tp = line->t + ncol - 1;
980 rp = line->r + ncol - 1;
981 }
982 else
983 continue;
984
985 linep->touch ();
986
987 while (*tp == NOCHAR && tp > linep->t)
988 tp--, rp--;
989
990 // first try to find a precomposed character
991 unicode_t n = rxvt_compose (*tp, c);
992 if (n == NOCHAR)
993 n = rxvt_composite.compose (*tp, c);
994
995 *tp = n;
996 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
997#endif 1027#endif
998 }
999 } 1028 }
1000 1029
1001 max_it (line->l, screen.cur.col); 1030 max_it (line->l, screen.cur.col);
1002 1031
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1032 assert (screen.cur.row >= 0);
1005#endif
1006} 1033}
1007 1034
1008/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
1009/* 1036/*
1010 * Process Backspace. Move back the cursor back a position, wrap if have to 1037 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1023 1050
1024 want_refresh = 1; 1051 want_refresh = 1;
1025#endif 1052#endif
1026 } 1053 }
1027 } 1054 }
1055 else if (screen.flags & Screen_WrapNext)
1056 screen.flags &= ~Screen_WrapNext;
1028 else 1057 else
1029 scr_gotorc (0, -1, RELATIVE); 1058 scr_gotorc (0, -1, RELATIVE);
1030} 1059}
1031 1060
1032/* ------------------------------------------------------------------------- */ 1061/* ------------------------------------------------------------------------- */
… …
1110 * XTERM_SEQ: ESC 6 1139 * XTERM_SEQ: ESC 6
1111 * Move cursor left in row. If we're at the left boundary, shift everything 1140 * Move cursor left in row. If we're at the left boundary, shift everything
1112 * in that row right. Clear left column. 1141 * in that row right. Clear left column.
1113 */ 1142 */
1114#if !ENABLE_MINIMAL 1143#if !ENABLE_MINIMAL
1115void 1144void ecb_cold
1116rxvt_term::scr_backindex () NOTHROW 1145rxvt_term::scr_backindex () NOTHROW
1117{ 1146{
1118 if (screen.cur.col > 0) 1147 if (screen.cur.col > 0)
1119 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1148 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1120 else 1149 else
… …
1127 * XTERM_SEQ: ESC 9 1156 * XTERM_SEQ: ESC 9
1128 * Move cursor right in row. If we're at the right boundary, shift everything 1157 * Move cursor right in row. If we're at the right boundary, shift everything
1129 * in that row left. Clear right column. 1158 * in that row left. Clear right column.
1130 */ 1159 */
1131#if !ENABLE_MINIMAL 1160#if !ENABLE_MINIMAL
1132void 1161void ecb_cold
1133rxvt_term::scr_forwardindex () NOTHROW 1162rxvt_term::scr_forwardindex () NOTHROW
1134{ 1163{
1135 if (screen.cur.col < ncol - 1) 1164 if (screen.cur.col < ncol - 1)
1136 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1165 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1137 else 1166 else
… …
1227/* 1256/*
1228 * Erase part or whole of a line 1257 * Erase part or whole of a line
1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1258 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1259 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1260 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1261 * extension: clear to right unless wrapped: ESC [ 3 K
1232 */ 1262 */
1233void 1263void
1234rxvt_term::scr_erase_line (int mode) NOTHROW 1264rxvt_term::scr_erase_line (int mode) NOTHROW
1235{ 1265{
1236 unsigned int col, num; 1266 unsigned int col, num;
… …
1245 line.touch (); 1275 line.touch ();
1246 line.is_longer (0); 1276 line.is_longer (0);
1247 1277
1248 switch (mode) 1278 switch (mode)
1249 { 1279 {
1280 case 3:
1281 if (screen.flags & Screen_WrapNext)
1282 return;
1283
1284 /* fall through */
1285
1250 case 0: /* erase to end of line */ 1286 case 0: /* erase to end of line */
1251 col = screen.cur.col; 1287 col = screen.cur.col;
1252 num = ncol - col; 1288 num = ncol - col;
1253 min_it (line.l, col); 1289 min_it (line.l, col);
1290
1254 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1291 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1255 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1292 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1256 CLEAR_SELECTION (); 1293 CLEAR_SELECTION ();
1257 break; 1294 break;
1295
1258 case 1: /* erase to beginning of line */ 1296 case 1: /* erase to beginning of line */
1259 col = 0; 1297 col = 0;
1260 num = screen.cur.col + 1; 1298 num = screen.cur.col + 1;
1299
1261 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1300 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1262 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1301 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1263 CLEAR_SELECTION (); 1302 CLEAR_SELECTION ();
1264 break; 1303 break;
1304
1265 case 2: /* erase whole line */ 1305 case 2: /* erase whole line */
1266 col = 0; 1306 col = 0;
1267 num = ncol; 1307 num = ncol;
1268 line.l = 0; 1308 line.l = 0;
1269 if (selection.beg.row <= screen.cur.row 1309 if (selection.beg.row <= screen.cur.row
… …
1277 scr_blank_line (line, col, num, rstyle); 1317 scr_blank_line (line, col, num, rstyle);
1278} 1318}
1279 1319
1280/* ------------------------------------------------------------------------- */ 1320/* ------------------------------------------------------------------------- */
1281/* 1321/*
1282 * Erase part of whole of the screen 1322 * Erase part or whole of the screen
1283 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1323 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1284 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1324 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1285 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1325 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1286 */ 1326 */
1287void 1327void
… …
1296 ZERO_SCROLLBACK (); 1336 ZERO_SCROLLBACK ();
1297 1337
1298 switch (mode) 1338 switch (mode)
1299 { 1339 {
1300 case 0: /* erase to end of screen */ 1340 case 0: /* erase to end of screen */
1301 selection_check (1);
1302 scr_erase_line (0); 1341 scr_erase_line (0);
1303 row = screen.cur.row + 1; /* possible OOB */ 1342 row = screen.cur.row + 1; /* possible OOB */
1304 num = nrow - row; 1343 num = nrow - row;
1305 break; 1344 break;
1306 case 1: /* erase to beginning of screen */ 1345 case 1: /* erase to beginning of screen */
1307 selection_check (3);
1308 scr_erase_line (1); 1346 scr_erase_line (1);
1309 row = 0; 1347 row = 0;
1310 num = screen.cur.row; 1348 num = screen.cur.row;
1311 break; 1349 break;
1312 case 2: /* erase whole screen */ 1350 case 2: /* erase whole screen */
1313 selection_check (3);
1314 row = 0; 1351 row = 0;
1315 num = nrow; 1352 num = nrow;
1316 break; 1353 break;
1317 default: 1354 default:
1318 return; 1355 return;
… …
1327 if (row >= nrow) /* Out Of Bounds */ 1364 if (row >= nrow) /* Out Of Bounds */
1328 return; 1365 return;
1329 1366
1330 min_it (num, nrow - row); 1367 min_it (num, nrow - row);
1331 1368
1332 if (rstyle & (RS_RVid | RS_Uline)) 1369 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1333 ren = (rend_t) ~RS_None; 1370 ren = (rend_t) ~RS_None;
1334 else if (GET_BASEBG (rstyle) == Color_bg) 1371 else if (GET_BASEBG (rstyle) == Color_bg)
1335 { 1372 {
1336 ren = DEFAULT_RSTYLE; 1373 ren = DEFAULT_RSTYLE;
1337 CLEAR_ROWS (row, num); 1374
1375 if (mapped)
1376 XClearArea (dpy, vt, 0,
1377 Row2Pixel (row - view_start), (unsigned int)vt_width,
1378 (unsigned int)Height2Pixel (num), False);
1338 } 1379 }
1339 else 1380 else
1340 { 1381 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1382 ren = rstyle & (RS_fgMask | RS_bgMask);
1383
1384 if (mapped)
1385 {
1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1386 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1343 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1387 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1344 ERASE_ROWS (row, num); 1388 XFillRectangle (dpy, vt, gc,
1389 0, Row2Pixel (row - view_start),
1390 (unsigned int)vt_width,
1391 (unsigned int)Height2Pixel (num));
1345 gcvalue.foreground = pix_colors[Color_fg]; 1392 gcvalue.foreground = pix_colors[Color_fg];
1346 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1394 }
1347 } 1395 }
1348 1396
1349 for (; num--; row++) 1397 for (; num--; row++)
1350 { 1398 {
1351 scr_blank_screen_mem (ROW(row), rstyle); 1399 scr_blank_screen_mem (ROW(row), rstyle);
1400
1401 if (row - view_start < nrow)
1352 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1402 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1353 } 1403 }
1354} 1404}
1355 1405
1356#if !ENABLE_MINIMAL 1406#if !ENABLE_MINIMAL
1357void 1407void
… …
1367/* ------------------------------------------------------------------------- */ 1417/* ------------------------------------------------------------------------- */
1368/* 1418/*
1369 * Fill the screen with `E's 1419 * Fill the screen with `E's
1370 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1420 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1371 */ 1421 */
1372void 1422void ecb_cold
1373rxvt_term::scr_E () NOTHROW 1423rxvt_term::scr_E () NOTHROW
1374{ 1424{
1375 rend_t fs; 1425 rend_t fs;
1376 1426
1377 want_refresh = 1; 1427 want_refresh = 1;
1378 ZERO_SCROLLBACK (); 1428 ZERO_SCROLLBACK ();
1379 1429
1380 num_scr_allow = 0; 1430 num_scr_allow = 0;
1381 selection_check (3); 1431
1432 row_col_t pos;
1433 pos.row = pos.col = 0;
1434 if (ROWCOL_IS_AFTER (selection.end, pos))
1435 CLEAR_SELECTION ();
1382 1436
1383 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1437 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1384 for (int row = nrow; row--; ) 1438 for (int row = nrow; row--; )
1385 { 1439 {
1386 line_t &line = ROW(row); 1440 line_t &line = ROW(row);
… …
1431 * Insert/Delete <count> characters from the current position 1485 * Insert/Delete <count> characters from the current position
1432 */ 1486 */
1433void 1487void
1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1488rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1435{ 1489{
1436 int col, row;
1437 rend_t tr;
1438
1439 want_refresh = 1; 1490 want_refresh = 1;
1440 ZERO_SCROLLBACK (); 1491 ZERO_SCROLLBACK ();
1441 1492
1442 if (count <= 0) 1493 if (count <= 0)
1443 return; 1494 return;
… …
1445 scr_do_wrap (); 1496 scr_do_wrap ();
1446 1497
1447 selection_check (1); 1498 selection_check (1);
1448 min_it (count, ncol - screen.cur.col); 1499 min_it (count, ncol - screen.cur.col);
1449 1500
1450 row = screen.cur.row; 1501 int row = screen.cur.row;
1451 1502
1452 line_t *line = &ROW(row); 1503 line_t *line = &ROW(row);
1453 1504
1454 line->touch (); 1505 line->touch ();
1455 line->is_longer (0); 1506 line->is_longer (0);
1456 1507
1508 // nuke wide spanning the start
1509 if (line->t[screen.cur.col] == NOCHAR)
1510 scr_kill_char (*line, screen.cur.col);
1511
1457 switch (insdel) 1512 switch (insdel)
1458 { 1513 {
1459 case INSERT: 1514 case INSERT:
1460 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1515 line->l = min (line->l + count, ncol);
1516
1517 if (line->t[screen.cur.col] == NOCHAR)
1518 scr_kill_char (*line, screen.cur.col);
1519
1520 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1461 { 1521 {
1462 line->t[col] = line->t[col - count]; 1522 line->t[col] = line->t[col - count];
1463 line->r[col] = line->r[col - count]; 1523 line->r[col] = line->r[col - count];
1464 } 1524 }
1465
1466 line->l = min (line->l + count, ncol);
1467 1525
1468 if (selection.op && current_screen == selection.screen 1526 if (selection.op && current_screen == selection.screen
1469 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1527 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1470 { 1528 {
1471 if (selection.end.row != screen.cur.row 1529 if (selection.end.row != screen.cur.row
… …
1486 case ERASE: 1544 case ERASE:
1487 screen.cur.col += count; /* don't worry if > ncol */ 1545 screen.cur.col += count; /* don't worry if > ncol */
1488 selection_check (1); 1546 selection_check (1);
1489 screen.cur.col -= count; 1547 screen.cur.col -= count;
1490 1548
1491 line->l = max (line->l - count, 0); 1549 // nuke wide char after the end
1550 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1551 scr_kill_char (*line, screen.cur.col + count);
1552
1492 scr_blank_line (*line, screen.cur.col, count, rstyle); 1553 scr_blank_line (*line, screen.cur.col, count, rstyle);
1493 break; 1554 break;
1494 1555
1495 case DELETE: 1556 case DELETE:
1496 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1557 line->l = max (line->l - count, 0);
1497 1558
1559 // nuke wide char spanning the end
1560 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1561 scr_kill_char (*line, screen.cur.col + count);
1562
1498 for (col = screen.cur.col; (col + count) < ncol; col++) 1563 for (int col = screen.cur.col; (col + count) < ncol; col++)
1499 { 1564 {
1500 line->t[col] = line->t[col + count]; 1565 line->t[col] = line->t[col + count];
1501 line->r[col] = line->r[col + count]; 1566 line->r[col] = line->r[col + count];
1502 } 1567 }
1503 1568
1504 line->l = max (line->l - count, 0);
1505 scr_blank_line (*line, ncol - count, count, tr); 1569 scr_blank_line (*line, ncol - count, count, rstyle);
1506 1570
1507 if (selection.op && current_screen == selection.screen 1571 if (selection.op && current_screen == selection.screen
1508 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1572 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1509 { 1573 {
1510 if (selection.end.row != screen.cur.row 1574 if (selection.end.row != screen.cur.row
… …
1527/* ------------------------------------------------------------------------- */ 1591/* ------------------------------------------------------------------------- */
1528/* 1592/*
1529 * Set the scrolling region 1593 * Set the scrolling region
1530 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1594 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1531 */ 1595 */
1532void 1596void ecb_cold
1533rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1597rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1534{ 1598{
1535 max_it (top, 0); 1599 max_it (top, 0);
1536 min_it (bot, nrow - 1); 1600 min_it (bot, nrow - 1);
1537 1601
… …
1547/* 1611/*
1548 * Make the cursor visible/invisible 1612 * Make the cursor visible/invisible
1549 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1613 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1550 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1614 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1551 */ 1615 */
1552void 1616void ecb_cold
1553rxvt_term::scr_cursor_visible (int mode) NOTHROW 1617rxvt_term::scr_cursor_visible (int mode) NOTHROW
1554{ 1618{
1555 want_refresh = 1; 1619 want_refresh = 1;
1556 1620
1557 if (mode) 1621 if (mode)
… …
1564/* 1628/*
1565 * Set/unset automatic wrapping 1629 * Set/unset automatic wrapping
1566 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1630 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1567 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1631 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1568 */ 1632 */
1569void 1633void ecb_cold
1570rxvt_term::scr_autowrap (int mode) NOTHROW 1634rxvt_term::scr_autowrap (int mode) NOTHROW
1571{ 1635{
1572 if (mode) 1636 if (mode)
1573 screen.flags |= Screen_Autowrap; 1637 screen.flags |= Screen_Autowrap;
1574 else 1638 else
… …
1583 * Relative mode: line numbers are relative to top margin of scrolling region 1647 * Relative mode: line numbers are relative to top margin of scrolling region
1584 * and the cursor cannot be moved outside. 1648 * and the cursor cannot be moved outside.
1585 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1649 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1586 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1650 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1587 */ 1651 */
1588void 1652void ecb_cold
1589rxvt_term::scr_relative_origin (int mode) NOTHROW 1653rxvt_term::scr_relative_origin (int mode) NOTHROW
1590{ 1654{
1591 if (mode) 1655 if (mode)
1592 screen.flags |= Screen_Relative; 1656 screen.flags |= Screen_Relative;
1593 else 1657 else
… …
1600/* 1664/*
1601 * Set insert/replace mode 1665 * Set insert/replace mode
1602 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1666 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1603 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1667 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1604 */ 1668 */
1605void 1669void ecb_cold
1606rxvt_term::scr_insert_mode (int mode) NOTHROW 1670rxvt_term::scr_insert_mode (int mode) NOTHROW
1607{ 1671{
1608 if (mode) 1672 if (mode)
1609 screen.flags |= Screen_Insert; 1673 screen.flags |= Screen_Insert;
1610 else 1674 else
… …
1616 * Set/Unset tabs 1680 * Set/Unset tabs
1617 * XTERM_SEQ: Set tab at current column : ESC H 1681 * XTERM_SEQ: Set tab at current column : ESC H
1618 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1682 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1619 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1683 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1620 */ 1684 */
1621void 1685void ecb_cold
1622rxvt_term::scr_set_tab (int mode) NOTHROW 1686rxvt_term::scr_set_tab (int mode) NOTHROW
1623{ 1687{
1624 if (mode < 0) 1688 if (mode < 0)
1625 memset (tabs, 0, ncol); 1689 memset (tabs, 0, ncol);
1626 else if (screen.cur.col < ncol) 1690 else if (screen.cur.col < ncol)
… …
1645 if (rvideo_state != on) 1709 if (rvideo_state != on)
1646 { 1710 {
1647 rvideo_state = on; 1711 rvideo_state = on;
1648 1712
1649 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1713 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1650#ifdef HAVE_BG_PIXMAP 1714#ifdef HAVE_IMG
1651 if (bgPixmap.pixmap == None) 1715 if (bg_img == 0)
1652#endif 1716#endif
1653 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1717 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1654 1718
1655 XGCValues gcvalue; 1719 XGCValues gcvalue;
1656 gcvalue.foreground = pix_colors[Color_fg]; 1720 gcvalue.foreground = pix_colors[Color_fg];
… …
1665/* ------------------------------------------------------------------------- */ 1729/* ------------------------------------------------------------------------- */
1666/* 1730/*
1667 * Report current cursor position 1731 * Report current cursor position
1668 * XTERM_SEQ: Report position: ESC [ 6 n 1732 * XTERM_SEQ: Report position: ESC [ 6 n
1669 */ 1733 */
1670void 1734void ecb_cold
1671rxvt_term::scr_report_position () NOTHROW 1735rxvt_term::scr_report_position () NOTHROW
1672{ 1736{
1673 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1737 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1674} 1738}
1675 1739
… …
1678 * ------------------------------------------------------------------------- */ 1742 * ------------------------------------------------------------------------- */
1679 1743
1680/* 1744/*
1681 * Set font style 1745 * Set font style
1682 */ 1746 */
1683void 1747void ecb_cold
1684rxvt_term::set_font_style () NOTHROW 1748rxvt_term::set_font_style () NOTHROW
1685{ 1749{
1686#if 0 1750#if 0
1687 switch (charsets [screen.charset]) 1751 switch (charsets [screen.charset])
1688 { 1752 {
… …
1710 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1774 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1711 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1775 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1712 * XTERM_SEQ: Invoke G2 character set: ESC N 1776 * XTERM_SEQ: Invoke G2 character set: ESC N
1713 * XTERM_SEQ: Invoke G3 character set: ESC O 1777 * XTERM_SEQ: Invoke G3 character set: ESC O
1714 */ 1778 */
1715void 1779void ecb_cold
1716rxvt_term::scr_charset_choose (int set) NOTHROW 1780rxvt_term::scr_charset_choose (int set) NOTHROW
1717{ 1781{
1718 screen.charset = set; 1782 screen.charset = set;
1719 set_font_style (); 1783 set_font_style ();
1720} 1784}
… …
1741 * ------------------------------------------------------------------------- */ 1805 * ------------------------------------------------------------------------- */
1742 1806
1743/* 1807/*
1744 * refresh matching text. 1808 * refresh matching text.
1745 */ 1809 */
1746bool 1810bool ecb_cold
1747rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1811rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1748{ 1812{
1749 bool found = false; 1813 bool found = false;
1750 1814
1751 for (int i = 0; i < nrow; i++) 1815 for (int i = 0; i < nrow; i++)
… …
1770 PART_BEG = 0, 1834 PART_BEG = 0,
1771 PART_END, 1835 PART_END,
1772 RC_COUNT 1836 RC_COUNT
1773}; 1837};
1774 1838
1775void 1839void ecb_hot
1776rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1840rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1777{ 1841{
1778 int i; 1842 int i;
1779 row_col_t rc[RC_COUNT]; 1843 row_col_t rc[RC_COUNT];
1780 1844
… …
1800 for (i = PART_BEG; i < RC_COUNT; i++) 1864 for (i = PART_BEG; i < RC_COUNT; i++)
1801 { 1865 {
1802 min_it (rc[i].col, ncol - 1); 1866 min_it (rc[i].col, ncol - 1);
1803 min_it (rc[i].row, nrow - 1); 1867 min_it (rc[i].row, nrow - 1);
1804 } 1868 }
1805// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1869
1806 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1870 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1807 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1871 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1808 1872
1809 num_scr_allow = 0; 1873 num_scr_allow = 0;
1810 1874
… …
1817 * Refresh the entire screen 1881 * Refresh the entire screen
1818 */ 1882 */
1819void 1883void
1820rxvt_term::scr_touch (bool refresh) NOTHROW 1884rxvt_term::scr_touch (bool refresh) NOTHROW
1821{ 1885{
1822 scr_expose (0, 0, width, height, refresh); 1886 scr_expose (0, 0, vt_width, vt_height, refresh);
1823} 1887}
1824 1888
1825/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
1826/* 1890/*
1827 * Move the display so that the line represented by scrollbar value Y is at 1891 * Move the display so that the line represented by scrollbar value Y is at
… …
1883 1947
1884# ifndef NO_MAPALERT 1948# ifndef NO_MAPALERT
1885# ifdef MAPALERT_OPTION 1949# ifdef MAPALERT_OPTION
1886 if (option (Opt_mapAlert)) 1950 if (option (Opt_mapAlert))
1887# endif 1951# endif
1888 XMapWindow (dpy, parent[0]); 1952 XMapWindow (dpy, parent);
1889# endif 1953# endif
1890 1954
1891# if ENABLE_FRILLS 1955# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell)) 1956 if (option (Opt_urgentOnBell))
1893 { 1957 set_urgency (1);
1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1895 {
1896 h->flags |= XUrgencyHint;
1897 XSetWMHints (dpy, parent[0], h);
1898 }
1899 }
1900# endif 1958# endif
1901 1959
1902 if (option (Opt_visualBell)) 1960 if (option (Opt_visualBell))
1903 { 1961 {
1904 rvideo_bell = true; 1962 rvideo_bell = true;
… …
1907 1965
1908 bell_ev.start (VISUAL_BELL_DURATION); 1966 bell_ev.start (VISUAL_BELL_DURATION);
1909 } 1967 }
1910 else 1968 else
1911 XBell (dpy, 0); 1969 XBell (dpy, 0);
1970 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1912#endif 1971#endif
1913} 1972}
1914 1973
1915/* ------------------------------------------------------------------------- */ 1974/* ------------------------------------------------------------------------- */
1916/* ARGSUSED */ 1975void ecb_cold
1917void
1918rxvt_term::scr_printscreen (int fullhist) NOTHROW 1976rxvt_term::scr_printscreen (int fullhist) NOTHROW
1919{ 1977{
1920#ifdef PRINTPIPE 1978#ifdef PRINTPIPE
1921 int nrows, row_start; 1979 int nrows, row_start;
1922 FILE *fd; 1980 FILE *fd = popen_printer ();
1923 1981
1924 if ((fd = popen_printer ()) == NULL) 1982 if (!fd)
1925 return; 1983 return;
1926 1984
1927 if (fullhist) 1985 if (fullhist)
1928 { 1986 {
1929 nrows = nrow - top_row; 1987 nrows = nrow - top_row;
… …
1935 row_start = view_start; 1993 row_start = view_start;
1936 } 1994 }
1937 1995
1938 wctomb (0, 0); 1996 wctomb (0, 0);
1939 1997
1940 for (int r1 = 0; r1 < nrows; r1++) 1998 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1941 { 1999 {
1942 text_t *tp = ROW(r1).t; 2000 text_t *tp = ROW(r1).t;
1943 int len = ROW(r1).l; 2001 int len = ROW(r1).l;
1944 2002
1945 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2003 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1971/* 2029/*
1972 * Refresh the screen 2030 * Refresh the screen
1973 * drawn_text/drawn_rend contain the screen information before the update. 2031 * drawn_text/drawn_rend contain the screen information before the update.
1974 * screen.text/screen.rend contain what the screen will change to. 2032 * screen.text/screen.rend contain what the screen will change to.
1975 */ 2033 */
1976void 2034void ecb_hot
1977rxvt_term::scr_refresh () NOTHROW 2035rxvt_term::scr_refresh () NOTHROW
1978{ 2036{
1979 unsigned char have_bg,
1980 showcursor; /* show the cursor */
1981 int16_t col, row, /* column/row we're processing */ 2037 int16_t col, row, /* column/row we're processing */
1982 ocrow; /* old cursor row */ 2038 ocrow; /* old cursor row */
1983 int i; /* tmp */ 2039 int i; /* tmp */
1984#ifndef NO_CURSORCOLOR 2040#ifndef NO_CURSORCOLOR
1985 rend_t cc1; /* store colours at cursor position (s) */ 2041 rend_t cc1; /* store colours at cursor position (s) */
… …
1994 return; 2050 return;
1995 2051
1996 /* 2052 /*
1997 * A: set up vars 2053 * A: set up vars
1998 */ 2054 */
1999 have_bg = 0;
2000 refresh_count = 0; 2055 refresh_count = 0;
2001 2056
2002#ifdef HAVE_BG_PIXMAP 2057 unsigned int old_screen_flags = screen.flags;
2003 have_bg |= bgPixmap.pixmap != None; 2058 bool have_bg = 0;
2059#ifdef HAVE_IMG
2060 have_bg = bg_img != 0;
2004#endif 2061#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2063
2007 /* 2064 /*
2008 * B: reverse any characters which are selected 2065 * B: reverse any characters which are selected
2009 */ 2066 */
2010 scr_reverse_selection (); 2067 scr_reverse_selection ();
2011 2068
2069 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2070#if ENABLE_OVERLAY
2071 scr_swap_overlay ();
2072#endif
2073
2074 bool showcursor = screen.flags & Screen_VisibleCursor;
2075
2012 /* 2076 /*
2013 * C: set the cursor character (s) 2077 * C: set the cursor character (s)
2014 */ 2078 */
2015 { 2079 {
2016 unsigned char setoldcursor; 2080 bool setoldcursor;
2017 2081
2018 showcursor = (screen.flags & Screen_VisibleCursor);
2019#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2020 if (hidden_cursor) 2083 if (hidden_cursor)
2021 showcursor = 0; 2084 showcursor = 0;
2022#endif 2085#endif
2023 2086
… …
2051 ccol2 = bgcolor_of (rstyle); 2114 ccol2 = bgcolor_of (rstyle);
2052#else 2115#else
2053 ccol2 = Color_bg; 2116 ccol2 = Color_bg;
2054#endif 2117#endif
2055 2118
2056 if (showcursor && focus) 2119 if (focus)
2057 { 2120 {
2058 if (option (Opt_cursorUnderline)) 2121 if (option (Opt_cursorUnderline))
2059 *crp ^= RS_Uline; 2122 *crp ^= RS_Uline;
2060 else 2123 else
2061 { 2124 {
… …
2096 oldcursor.col = screen.cur.col; 2159 oldcursor.col = screen.cur.col;
2097 } 2160 }
2098 } 2161 }
2099 } 2162 }
2100 2163
2101 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2102#if ENABLE_OVERLAY
2103 scr_swap_overlay ();
2104#endif
2105
2106#ifndef NO_SLOW_LINK_SUPPORT 2164#ifndef NO_SLOW_LINK_SUPPORT
2107 /* 2165 /*
2108 * D: CopyArea pass - very useful for slower links 2166 * D: CopyArea pass - very useful for slower links
2109 * This has been deliberately kept simple. 2167 * This has been deliberately kept simple.
2110 */ 2168 */
… …
2114 { 2172 {
2115 int16_t nits; 2173 int16_t nits;
2116 int i = num_scr; 2174 int i = num_scr;
2117 int j; 2175 int j;
2118 int len, wlen; 2176 int len, wlen;
2119 dLocal (int, num_scr);
2120 2177
2121 j = nrow; 2178 j = nrow;
2122 wlen = len = -1; 2179 wlen = len = -1;
2123 row = i > 0 ? 0 : j - 1; 2180 row = i > 0 ? 0 : j - 1;
2124 2181
… …
2199 continue; 2256 continue;
2200 2257
2201 // redraw one or more characters 2258 // redraw one or more characters
2202 2259
2203 // seek to the beginning of wide characters 2260 // seek to the beginning of wide characters
2204 while (stp[col] == NOCHAR && col > 0) 2261 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2205 --col; 2262 --col;
2206 2263
2207 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2264 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2208 text_t *text = stp + col; 2265 text_t *text = stp + col;
2209 int count = 1; 2266 int count = 1;
2210 2267
2211 dtp[col] = stp[col]; 2268 dtp[col] = stp[col];
2212 drp[col] = rend; 2269 drp[col] = rend;
… …
2216 for (i = 0; ++col < ncol; ) 2273 for (i = 0; ++col < ncol; )
2217 { 2274 {
2218 if (stp[col] == NOCHAR) 2275 if (stp[col] == NOCHAR)
2219 { 2276 {
2220 dtp[col] = stp[col]; 2277 dtp[col] = stp[col];
2221 drp[col] = rend; 2278 drp[col] = srp[col];
2279
2222 count++; 2280 count++;
2223 i++; 2281 i++;
2224 2282
2225 continue; 2283 continue;
2226 } 2284 }
… …
2246 2304
2247 col--; /* went one too far. move back */ 2305 col--; /* went one too far. move back */
2248 count -= i; /* dump any matching trailing chars */ 2306 count -= i; /* dump any matching trailing chars */
2249 2307
2250 // sometimes we optimize away the trailing NOCHAR's, add them back 2308 // sometimes we optimize away the trailing NOCHAR's, add them back
2251 while (i && text[count] == NOCHAR) 2309 while (ecb_unlikely (i && text[count] == NOCHAR))
2252 count++, i--; 2310 count++, i--;
2253 2311
2254 /* 2312 /*
2255 * Determine the attributes for the string 2313 * Determine the attributes for the string
2256 */ 2314 */
2257 int fore = fgcolor_of (rend); // desired foreground 2315 int fore = fgcolor_of (rend); // desired foreground
2258 int back = bgcolor_of (rend); // desired background 2316 int back = bgcolor_of (rend); // desired background
2259 2317
2260 // only do special processing if any attributes are set, which is unlikely 2318 // only do special processing if any attributes are set, which is unlikely
2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2319 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2262 { 2320 {
2263 bool invert = rend & RS_RVid; 2321 bool invert = rend & RS_RVid;
2264 2322
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2323#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold && fore == Color_fg) 2324 if (rend & RS_Bold && fore == Color_fg)
… …
2285 2343
2286 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2344 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2287 fore = Color_UL; 2345 fore = Color_UL;
2288#endif 2346#endif
2289 2347
2348#ifdef OPTION_HC
2349 if (rend & RS_Sel)
2350 {
2351 /* invert the column if no highlightColor is set or it is the
2352 * current cursor column */
2353 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2354 && ISSET_PIXCOLOR (Color_HC))
2355 {
2356 if (ISSET_PIXCOLOR (Color_HTC))
2357 fore = Color_HTC;
2358 // if invert is 0 reverse video is set so we use bg color as fg color
2359 else if (!invert)
2360 fore = back;
2361
2362 back = Color_HC;
2363 invert = 0;
2364 }
2365 }
2366#endif
2367
2290 if (invert) 2368 if (invert)
2291 { 2369 {
2292#ifdef OPTION_HC
2293 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2294 || !ISSET_PIXCOLOR (Color_HC))
2295#endif
2296 /* invert the column if no highlightColor is set or it is the
2297 * current cursor column */
2298 ::swap (fore, back); 2370 ::swap (fore, back);
2299#ifdef OPTION_HC
2300 else if (ISSET_PIXCOLOR (Color_HC))
2301 back = Color_HC;
2302#endif
2303 2371
2304#ifndef NO_BOLD_UNDERLINE_REVERSE 2372#ifndef NO_BOLD_UNDERLINE_REVERSE
2305# ifndef OPTION_HC
2306 if (ISSET_PIXCOLOR (Color_RV))
2307 back = Color_RV;
2308# endif
2309 if (fore == back) 2373 if (fore == back)
2310 { 2374 {
2311 fore = Color_bg; 2375 fore = Color_bg;
2312 back = Color_fg; 2376 back = Color_fg;
2313 } 2377 }
… …
2349 /* 2413 /*
2350 * Actually do the drawing of the string here 2414 * Actually do the drawing of the string here
2351 */ 2415 */
2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2416 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2353 2417
2354 if (have_bg && back == Color_bg) 2418 if (ecb_likely (have_bg && back == Color_bg))
2355 { 2419 {
2356 // this is very ugly, maybe push it into ->draw? 2420 // this is very ugly, maybe push it into ->draw?
2357 2421
2358 for (i = 0; i < count; i++) /* don't draw empty strings */ 2422 for (i = 0; i < count; i++) /* don't draw empty strings */
2359 if (text[i] != ' ') 2423 if (text[i] != ' ')
… …
2366 did_clear: ; 2430 did_clear: ;
2367 } 2431 }
2368 else 2432 else
2369 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2433 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2370 2434
2371 if (rend & RS_Uline && font->descent > 1 && fore != back) 2435 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2372 { 2436 {
2373#if ENABLE_FRILLS 2437#if ENABLE_FRILLS
2374 if (ISSET_PIXCOLOR (Color_underline)) 2438 if (ISSET_PIXCOLOR (Color_underline))
2375 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2439 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2376 else 2440 else
2377#endif 2441#endif
2378 XSetForeground (dpy, gc, pix_colors[fore]); 2442 XSetForeground (dpy, gc, pix_colors[fore]);
2379 2443
2380 XDrawLine (dpy, drawBuffer, gc, 2444 XDrawLine (dpy, vt, gc,
2381 xpixel, ypixel + font->ascent + 1, 2445 xpixel, ypixel + font->ascent + 1,
2382 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2446 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2383 } 2447 }
2384 } /* for (col....) */ 2448 } /* for (col....) */
2385 } /* for (row....) */ 2449 } /* for (row....) */
2386
2387#if ENABLE_OVERLAY
2388 scr_swap_overlay ();
2389#endif
2390 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2391 2450
2392 /* 2451 /*
2393 * G: cleanup cursor and display outline cursor if necessary 2452 * G: cleanup cursor and display outline cursor if necessary
2394 */ 2453 */
2395 if (showcursor) 2454 if (showcursor)
… …
2423 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2482 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2424 else 2483 else
2425#endif 2484#endif
2426 XSetForeground (dpy, gc, pix_colors[ccol1]); 2485 XSetForeground (dpy, gc, pix_colors[ccol1]);
2427 2486
2428 XDrawRectangle (dpy, drawBuffer, gc, 2487 XDrawRectangle (dpy, vt, gc,
2429 Col2Pixel (col), 2488 Col2Pixel (col),
2430 Row2Pixel (oldcursor.row), 2489 Row2Pixel (oldcursor.row),
2431 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2490 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2432 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2491 (unsigned int) (Height2Pixel (1) - 1));
2433 } 2492 }
2434 } 2493 }
2435 2494
2436 /* 2495 /*
2437 * H: cleanup selection 2496 * H: cleanup selection
2438 */ 2497 */
2498#if ENABLE_OVERLAY
2499 scr_swap_overlay ();
2500#endif
2501 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2502
2439 scr_reverse_selection (); 2503 scr_reverse_selection ();
2440 2504
2505 screen.flags = old_screen_flags;
2441 num_scr = 0; 2506 num_scr = 0;
2442 num_scr_allow = 1; 2507 num_scr_allow = 1;
2443} 2508}
2444 2509
2445void 2510void ecb_cold
2446rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2511rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2447{ 2512{
2448 if (!l.t) 2513 if (!l.valid ())
2449 return; 2514 return;
2450 2515
2451 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2516 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2452 2517
2453 for (int i = ncol; i--; ) 2518 for (int i = ncol; i--; )
2454 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2519 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2455} 2520}
2456 2521
2457void 2522void ecb_cold
2458rxvt_term::scr_remap_chars () NOTHROW 2523rxvt_term::scr_remap_chars () NOTHROW
2459{ 2524{
2460 for (int i = total_rows; i--; ) 2525 for (int i = total_rows; i--; )
2461 scr_remap_chars (row_buf [i]); 2526 scr_remap_chars (row_buf [i]);
2462 2527
… …
2465 scr_remap_chars (drawn_buf [i]); 2530 scr_remap_chars (drawn_buf [i]);
2466 scr_remap_chars (swap_buf [i]); 2531 scr_remap_chars (swap_buf [i]);
2467 } 2532 }
2468} 2533}
2469 2534
2470void 2535void ecb_cold
2471rxvt_term::scr_recolour () NOTHROW 2536rxvt_term::scr_recolour (bool refresh) NOTHROW
2472{ 2537{
2473#ifdef HAVE_BG_PIXMAP 2538 bool transparent = false;
2474 bgPixmap.apply ();
2475#else
2476 2539
2540#ifdef HAVE_IMG
2541 if (bg_img != 0)
2542 {
2543# if ENABLE_TRANSPARENCY
2544 if (bg_flags & BG_IS_TRANSPARENT)
2545 {
2546 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2547 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2548
2549 transparent = true;
2550 }
2551 else
2552# endif
2553 {
2554 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2555 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2556 }
2557 }
2558 else
2559#endif
2560 {
2477 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2561 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2478 XClearWindow (dpy, parent[0]);
2479 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2562 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2563 }
2480 2564
2481# if HAVE_SCROLLBARS 2565 XClearWindow (dpy, parent);
2566
2482 if (scrollBar.win) 2567 if (scrollBar.win)
2483 { 2568 {
2569 if (transparent)
2570 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2571 else
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2572 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2485 scrollBar.setIdle (); 2573 scrollBar.state = SB_STATE_IDLE;
2486 scrollbar_show (0); 2574 scrollBar.show (0);
2487 } 2575 }
2488# endif
2489 2576
2577 if (refresh)
2578 {
2490 scr_clear (); 2579 scr_clear ();
2491 scr_touch (true); 2580 scr_touch (true);
2581 }
2492 want_refresh = 1; 2582 want_refresh = 1;
2493
2494#endif
2495} 2583}
2496 2584
2497/* ------------------------------------------------------------------------- */ 2585/* ------------------------------------------------------------------------- */
2498void 2586void
2499rxvt_term::scr_clear (bool really) NOTHROW 2587rxvt_term::scr_clear (bool really) NOTHROW
… …
2555 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2643 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2556 srp[col] ^= rstyle; 2644 srp[col] ^= rstyle;
2557} 2645}
2558 2646
2559/* ------------------------------------------------------------------------- */ 2647/* ------------------------------------------------------------------------- */
2560void 2648void ecb_hot
2561rxvt_term::scr_reverse_selection () NOTHROW 2649rxvt_term::scr_reverse_selection () NOTHROW
2562{ 2650{
2563 if (selection.op 2651 if (selection.op
2564 && current_screen == selection.screen 2652 && current_screen == selection.screen
2565 && selection.end.row >= view_start) 2653 && selection.end.row >= view_start)
2566 { 2654 {
2567#if !ENABLE_MINIMAL 2655#if !ENABLE_MINIMAL
2568 if (selection.rect) 2656 if (selection.rect)
2569 scr_xor_rect (selection.beg.row, selection.beg.col, 2657 scr_xor_rect (selection.beg.row, selection.beg.col,
2570 selection.end.row, selection.end.col, 2658 selection.end.row, selection.end.col,
2571 RS_RVid, RS_RVid | RS_Uline); 2659 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2572 else 2660 else
2573#endif 2661#endif
2574 scr_xor_span (selection.beg.row, selection.beg.col, 2662 scr_xor_span (selection.beg.row, selection.beg.col,
2575 selection.end.row, selection.end.col, 2663 selection.end.row, selection.end.col,
2576 RS_RVid); 2664 RS_Sel | RS_RVid);
2577 } 2665 }
2578} 2666}
2579 2667
2580/* ------------------------------------------------------------------------- */ 2668/* ------------------------------------------------------------------------- */
2581/* 2669/*
… …
2584 */ 2672 */
2585#if 0 2673#if 0
2586void 2674void
2587rxvt_term::scr_dump (int fd) NOTHROW 2675rxvt_term::scr_dump (int fd) NOTHROW
2588{ 2676{
2589 int row, wrote; 2677 // if this method is needed, it can be implemented by factoring the
2590 unsigned int width, towrite; 2678 // relevant code in scr_printscreen
2591 char r1[] = "\n";
2592
2593 for (row = saveLines - nsaved;
2594 row < saveLines + nrow - 1; row++)
2595 {
2596 width = row_buf[row].l >= 0 ? row_buf[row].l
2597 : ncol;
2598 for (towrite = width; towrite; towrite -= wrote)
2599 {
2600 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2601 towrite);
2602 if (wrote < 0)
2603 return; /* XXX: death, no report */
2604 }
2605 if (row_buf[row].l >= 0)
2606 if (write (fd, r1, 1) <= 0)
2607 return; /* XXX: death, no report */
2608 }
2609} 2679}
2610#endif 2680#endif
2611 2681
2612/* ------------------------------------------------------------------------- * 2682/* ------------------------------------------------------------------------- *
2613 * CHARACTER SELECTION * 2683 * CHARACTER SELECTION *
2614 * ------------------------------------------------------------------------- */ 2684 * ------------------------------------------------------------------------- */
2615void 2685void
2616rxvt_term::selection_check (int check_more) NOTHROW 2686rxvt_term::selection_check (int check_more) NOTHROW
2617{ 2687{
2618 row_col_t pos;
2619
2620 if (!selection.op) 2688 if (!selection.op)
2621 return; 2689 return;
2622 2690
2623 pos.row = pos.col = 0;
2624 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2691 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2625 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2692 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2626 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2627 || (check_more == 1 2694 || (check_more == 1
2628 && current_screen == selection.screen 2695 && current_screen == selection.screen
2629 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2696 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2630 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2697 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2631 || (check_more == 2
2632 && ROWCOL_IS_BEFORE (selection.beg, pos)
2633 && ROWCOL_IS_AFTER (selection.end, pos))
2634 || (check_more == 3
2635 && ROWCOL_IS_AFTER (selection.end, pos))
2636 || (check_more == 4 /* screen width change */
2637 && (selection.beg.row != selection.end.row
2638 || selection.end.col > ncol)))
2639 CLEAR_SELECTION (); 2698 CLEAR_ALL_SELECTION ();
2640} 2699}
2641 2700
2642/* ------------------------------------------------------------------------- */ 2701/* ------------------------------------------------------------------------- */
2643/* 2702/*
2644 * Paste a selection direct to the command fd 2703 * Paste a selection direct to the command fd
2645 */ 2704 */
2646void 2705void
2647rxvt_term::paste (char *data, unsigned int len) NOTHROW 2706rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2648{ 2707{
2649 /* convert normal newline chars into common keyboard Return key sequence */ 2708 /* convert normal newline chars into common keyboard Return key sequence */
2650 for (unsigned int i = 0; i < len; i++) 2709 for (unsigned int i = 0; i < len; i++)
2651 if (data[i] == C0_LF) 2710 if (data[i] == C0_LF)
2652 data[i] = C0_CR; 2711 data[i] = C0_CR;
2653 2712
2654 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2655 tt_printf ("\e[200~"); 2714 tt_printf ("\x1b[200~");
2656 2715
2657 tt_write (data, len); 2716 tt_write (data, len);
2658 2717
2659 if (priv_modes & PrivMode_BracketPaste) 2718 if (priv_modes & PrivMode_BracketPaste)
2660 tt_printf ("\e[201~"); 2719 tt_printf ("\x1b[201~");
2661} 2720}
2662 2721
2663/* ------------------------------------------------------------------------- */
2664/*
2665 * Respond to a notification that a primary selection has been sent
2666 * EXT: SelectionNotify
2667 */
2668void 2722void
2669rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2723rxvt_term::paste (char *data, unsigned int len) NOTHROW
2670{ 2724{
2671 if (prop == None) /* check for failed XConvertSelection */ 2725 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2672 {
2673 if ((selection_type & Sel_CompoundText))
2674 {
2675 int selnum = selection_type & Sel_whereMask;
2676
2677 selection_type = 0;
2678 if (selnum != Sel_direct)
2679 selection_request_other (XA_STRING, selnum);
2680 }
2681
2682 if ((selection_type & Sel_UTF8String))
2683 {
2684 int selnum = selection_type & Sel_whereMask;
2685
2686 selection_type = Sel_CompoundText;
2687 if (selnum != Sel_direct)
2688 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2689 else
2690 selection_type = 0;
2691 }
2692
2693 return;
2694 }
2695
2696 unsigned long bytes_after;
2697 XTextProperty ct;
2698
2699 if (XGetWindowProperty (dpy, win, prop,
2700 0, PROP_SIZE / 4,
2701 delete_prop, AnyPropertyType,
2702 &ct.encoding, &ct.format,
2703 &ct.nitems, &bytes_after,
2704 &ct.value) != Success)
2705 {
2706 ct.value = 0;
2707 goto bailout;
2708 }
2709
2710 if (ct.encoding == None)
2711 goto bailout;
2712
2713 if (bytes_after)
2714 {
2715 // fetch and append remaining data
2716 XTextProperty ct2;
2717
2718 if (XGetWindowProperty (dpy, win, prop,
2719 ct.nitems / 4, (bytes_after + 3) / 4,
2720 delete_prop, AnyPropertyType,
2721 &ct2.encoding, &ct2.format,
2722 &ct2.nitems, &bytes_after,
2723 &ct2.value) != Success)
2724 goto bailout;
2725
2726 // realloc should be compatible to XFree, here, and elsewhere, too
2727 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2728 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2729 ct.nitems += ct2.nitems;
2730
2731 XFree (ct2.value);
2732 }
2733
2734 if (ct.value == 0)
2735 goto bailout;
2736
2737 if (ct.encoding == xa[XA_INCR])
2738 {
2739 // INCR selection, start handshake
2740 if (!delete_prop)
2741 XDeleteProperty (dpy, win, prop);
2742
2743 selection_wait = Sel_incr;
2744 incr_buf_fill = 0;
2745 incr_ev.start (10);
2746
2747 goto bailout;
2748 }
2749
2750 if (ct.nitems == 0)
2751 {
2752 if (selection_wait == Sel_incr)
2753 {
2754 XFree (ct.value);
2755
2756 // finally complete, now paste the whole thing
2757 selection_wait = Sel_normal;
2758 ct.value = (unsigned char *)incr_buf;
2759 ct.nitems = incr_buf_fill;
2760 incr_buf = 0;
2761 incr_buf_size = 0;
2762 incr_ev.stop ();
2763 }
2764 else
2765 {
2766 if (selection_wait == Sel_normal
2767 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2768 {
2769 /*
2770 * pass through again trying CUT_BUFFER0 if we've come from
2771 * XConvertSelection () but nothing was presented
2772 */
2773 selection_paste (display->root, XA_CUT_BUFFER0, False);
2774 }
2775
2776 goto bailout;
2777 }
2778 }
2779 else if (selection_wait == Sel_incr)
2780 {
2781 incr_ev.start (10);
2782
2783 while (incr_buf_fill + ct.nitems > incr_buf_size)
2784 {
2785 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2786 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2787 }
2788
2789 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2790 incr_buf_fill += ct.nitems;
2791
2792 goto bailout;
2793 }
2794
2795 char **cl;
2796 int cr;
2797
2798#if !ENABLE_MINIMAL
2799 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2800 // so recode it manually
2801 if (ct.encoding == xa[XA_UTF8_STRING])
2802 {
2803 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2804 char *s = rxvt_wcstombs (w);
2805 free (w);
2806 // TODO: strlen == only the first element will be converted. well...
2807 paste (s, strlen (s));
2808 free (s);
2809 }
2810 else
2811#endif
2812 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2813 && cl)
2814 {
2815 for (int i = 0; i < cr; i++)
2816 paste (cl[i], strlen (cl[i]));
2817
2818 XFreeStringList (cl);
2819 }
2820 else
2821 paste ((char *)ct.value, ct.nitems); // paste raw
2822
2823bailout:
2824 XFree (ct.value);
2825
2826 if (selection_wait == Sel_normal)
2827 selection_wait = Sel_none;
2828}
2829
2830void
2831rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2832{
2833 selection_wait = Sel_none;
2834
2835 incr_buf_size = 0;
2836 free (incr_buf);
2837
2838 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2839}
2840
2841void
2842rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2843{
2844 if (prop == None || selection_wait != Sel_incr)
2845 return; 2726 return;
2846 2727
2847 selection_paste (win, prop, true); 2728 tt_paste (data, len);
2848} 2729}
2849 2730
2850/* ------------------------------------------------------------------------- */ 2731/* ------------------------------------------------------------------------- */
2851/* 2732/*
2852 * Request the current selection: 2733 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2853 * Order: > internal selection if available 2734 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2854 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2735 * as fallback
2855 * > CUT_BUFFER0
2856 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2857 * will auto fallback to CUT_BUFFER0
2858 * EXT: button 2 release 2736 * EXT: button 2 release
2859 */ 2737 */
2860void 2738void
2861rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2739rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2862{ 2740{
2863 if (selection.text && selnum == Sel_Primary) 2741 if (!selection_req)
2864 {
2865 /* internal selection */
2866 char *str = rxvt_wcstombs (selection.text, selection.len);
2867 paste (str, strlen (str));
2868 free (str);
2869 return;
2870 } 2742 {
2871 else 2743 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2744 selection_req->run ();
2872 { 2745 }
2873 selection_request_time = tm;
2874 selection_wait = Sel_normal;
2875
2876#if X_HAVE_UTF8_STRING
2877 selection_type = Sel_UTF8String;
2878 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2879 return;
2880#else
2881 selection_type = Sel_CompoundText;
2882 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2883 return;
2884#endif
2885 }
2886
2887 selection_wait = Sel_none; /* don't loop in selection_paste () */
2888 selection_paste (display->root, XA_CUT_BUFFER0, false);
2889}
2890
2891int
2892rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2893{
2894 Atom sel;
2895
2896 selection_type |= selnum;
2897
2898 if (selnum == Sel_Primary)
2899 sel = XA_PRIMARY;
2900 else if (selnum == Sel_Secondary)
2901 sel = XA_SECONDARY;
2902 else
2903 sel = xa[XA_CLIPBOARD];
2904
2905 if (XGetSelectionOwner (dpy, sel) != None)
2906 {
2907 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2908 vt, selection_request_time);
2909 return 1;
2910 }
2911
2912 return 0;
2913} 2746}
2914 2747
2915/* ------------------------------------------------------------------------- */ 2748/* ------------------------------------------------------------------------- */
2916/* 2749/*
2917 * Clear all selected text 2750 * Clear all selected text
2918 * EXT: SelectionClear 2751 * EXT: SelectionClear
2919 */ 2752 */
2920void 2753void
2921rxvt_term::selection_clear () NOTHROW 2754rxvt_term::selection_clear (bool clipboard) NOTHROW
2922{ 2755{
2756 if (!clipboard)
2757 {
2923 want_refresh = 1; 2758 want_refresh = 1;
2924 free (selection.text); 2759 free (selection.text);
2925 selection.text = NULL; 2760 selection.text = NULL;
2926 selection.len = 0; 2761 selection.len = 0;
2927 CLEAR_SELECTION (); 2762 CLEAR_SELECTION ();
2928 2763
2929 if (display->selection_owner == this) 2764 if (display->selection_owner == this)
2930 display->selection_owner = 0; 2765 display->selection_owner = 0;
2766 }
2767 else
2768 {
2769 free (selection.clip_text);
2770 selection.clip_text = NULL;
2771 selection.clip_len = 0;
2772
2773 if (display->clipboard_owner == this)
2774 display->clipboard_owner = 0;
2775 }
2931} 2776}
2932 2777
2933/* ------------------------------------------------------------------------- */ 2778/* ------------------------------------------------------------------------- */
2934/* 2779/*
2935 * Copy a selection into the cut buffer 2780 * Copy a selection into the cut buffer
2936 * EXT: button 1 or 3 release 2781 * EXT: button 1 or 3 release
2937 */ 2782 */
2938void 2783void
2939rxvt_term::selection_make (Time tm) 2784rxvt_term::selection_make (Time tm)
2940{ 2785{
2941 int i; 2786 int size;
2942 wchar_t *new_selection_text; 2787 wchar_t *new_selection_text;
2943 text_t *t; 2788 text_t *t;
2944 2789
2945 switch (selection.op) 2790 switch (selection.op)
2946 { 2791 {
… …
2962 return; /* nothing selected, go away */ 2807 return; /* nothing selected, go away */
2963 2808
2964 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2809 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2965 return; 2810 return;
2966 2811
2967 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2812 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2968 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2813 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2969 2814
2970 int ofs = 0; 2815 int ofs = 0;
2971 int extra = 0; 2816 int extra = 0;
2972 2817
2973 int col = selection.beg.col; 2818 int col = selection.beg.col;
… …
2979 { 2824 {
2980#if !ENABLE_MINIMAL 2825#if !ENABLE_MINIMAL
2981 if (selection.rect) 2826 if (selection.rect)
2982 { 2827 {
2983 col = selection.beg.col; 2828 col = selection.beg.col;
2984 end_col = ncol + 1; 2829 end_col = selection.end.col;
2985 } 2830 }
2986 else 2831 else
2987#endif 2832#endif
2988 end_col = ROW(row).l; 2833 end_col = ROW(row).l;
2989 2834
2990 col = max (col, 0); 2835 col = max (col, 0);
2991 2836
2992 if (row == selection.end.row 2837 if (row == selection.end.row)
2993#if !ENABLE_MINIMAL
2994 || selection.rect
2995#endif
2996 )
2997 min_it (end_col, selection.end.col); 2838 min_it (end_col, selection.end.col);
2998 2839
2999 t = ROW(row).t + col; 2840 t = ROW(row).t + col;
3000 2841
3001 for (; col < end_col; col++) 2842 for (; col < end_col; col++)
… …
3009 2850
3010 extra -= (len - 1); 2851 extra -= (len - 1);
3011 2852
3012 if (extra < 0) 2853 if (extra < 0)
3013 { 2854 {
3014 extra += i; 2855 extra += size;
3015 i += i; 2856 size += size;
3016 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2857 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3017 } 2858 }
3018 2859
3019 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2860 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3020 } 2861 }
3021#endif 2862#endif
… …
3033 2874
3034 new_selection_text[ofs++] = C0_LF; 2875 new_selection_text[ofs++] = C0_LF;
3035 } 2876 }
3036 else 2877 else
3037#endif 2878#endif
3038 if (!ROW(row).is_longer () && row != selection.end.row) 2879 if (!ROW(row).is_longer ()
2880 && (row != selection.end.row || end_col != selection.end.col)
2881 && (row != selection.beg.row || selection.beg.col < ncol))
3039 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3040 } 2883 }
3041
3042 if (end_col != selection.end.col)
3043 new_selection_text[ofs++] = C0_LF;
3044 2884
3045 new_selection_text[ofs] = 0; 2885 new_selection_text[ofs] = 0;
3046 2886
3047 if (ofs == 0) 2887 if (ofs == 0)
3048 { 2888 {
… …
3061 2901
3062 selection_grab (tm); 2902 selection_grab (tm);
3063} 2903}
3064 2904
3065bool 2905bool
3066rxvt_term::selection_grab (Time tm) NOTHROW 2906rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3067{ 2907{
2908 Atom sel;
2909
2910 if (!clipboard)
2911 {
3068 selection_time = tm; 2912 selection_time = tm;
2913 sel = XA_PRIMARY;
2914 }
2915 else
2916 {
2917 clipboard_time = tm;
2918 sel = xa[XA_CLIPBOARD];
2919 }
3069 2920
3070 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2921 XSetSelectionOwner (dpy, sel, vt, tm);
3071 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2922 if (XGetSelectionOwner (dpy, sel) == vt)
3072 { 2923 {
3073 display->set_selection_owner (this); 2924 display->set_selection_owner (this, clipboard);
3074 return true; 2925 return true;
3075 } 2926 }
3076 else 2927 else
3077 { 2928 {
3078 selection_clear (); 2929 selection_clear (clipboard);
3079 return false; 2930 return false;
3080 } 2931 }
3081 2932
3082#if 0 2933#if 0
3083 XTextProperty ct; 2934 XTextProperty ct;
… …
3093/* ------------------------------------------------------------------------- */ 2944/* ------------------------------------------------------------------------- */
3094/* 2945/*
3095 * Mark or select text based upon number of clicks: 1, 2, or 3 2946 * Mark or select text based upon number of clicks: 1, 2, or 3
3096 * EXT: button 1 press 2947 * EXT: button 1 press
3097 */ 2948 */
3098void 2949void ecb_cold
3099rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2950rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3100{ 2951{
3101 clicks = ((clicks - 1) % 3) + 1; 2952 clicks = ((clicks - 1) % 3) + 1;
3102 selection.clicks = clicks; /* save clicks so extend will work */ 2953 selection.clicks = clicks; /* save clicks so extend will work */
3103 2954
… …
3122 2973
3123/* ------------------------------------------------------------------------- */ 2974/* ------------------------------------------------------------------------- */
3124/* 2975/*
3125 * Mark a selection at the specified col/row 2976 * Mark a selection at the specified col/row
3126 */ 2977 */
3127void 2978void ecb_cold
3128rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2979rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3129{ 2980{
3130 want_refresh = 1; 2981 want_refresh = 1;
3131 2982
3132 selection.mark.row = row + view_start; 2983 selection.mark.row = row + view_start;
… …
3159/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3010/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3160#define DELIMIT_TEXT(x) \ 3011#define DELIMIT_TEXT(x) \
3161 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3012 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3162#define DELIMIT_REND(x) 1 3013#define DELIMIT_REND(x) 1
3163 3014
3164void 3015void ecb_cold
3165rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3016rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3166{ 3017{
3167 int col, row, dirnadd, tcol, trow, w1, w2; 3018 int col, row, dirnadd, tcol, trow, w1, w2;
3168 row_col_t bound; 3019 row_col_t bound;
3169 text_t *stp; 3020 text_t *stp;
… …
3243 * EXT: button 3 press; button 1 or 3 drag 3094 * EXT: button 3 press; button 1 or 3 drag
3244 * flag == 0 ==> button 1 3095 * flag == 0 ==> button 1
3245 * flag == 1 ==> button 3 press 3096 * flag == 1 ==> button 3 press
3246 * flag == 2 ==> button 3 motion 3097 * flag == 2 ==> button 3 motion
3247 */ 3098 */
3248void 3099void ecb_cold
3249rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3100rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3250{ 3101{
3251 int col = clamp (Pixel2Col (x), 0, ncol); 3102 int col = clamp (Pixel2Col (x), 0, ncol);
3252 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3103 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3253 3104
… …
3279 3130
3280/* ------------------------------------------------------------------------- */ 3131/* ------------------------------------------------------------------------- */
3281/* 3132/*
3282 * Extend the selection to the specified col/row 3133 * Extend the selection to the specified col/row
3283 */ 3134 */
3284void 3135void ecb_cold
3285rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3136rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3286{ 3137{
3287 row_col_t pos; 3138 row_col_t pos;
3288 enum { 3139 enum {
3289 LEFT, RIGHT 3140 LEFT, RIGHT
… …
3480 ::swap (selection.beg.col, selection.end.col); 3331 ::swap (selection.beg.col, selection.end.col);
3481#endif 3332#endif
3482} 3333}
3483 3334
3484#if !ENABLE_MINIMAL 3335#if !ENABLE_MINIMAL
3485void 3336void ecb_cold
3486rxvt_term::selection_remove_trailing_spaces () NOTHROW 3337rxvt_term::selection_remove_trailing_spaces () NOTHROW
3487{ 3338{
3488 int32_t end_col, end_row; 3339 int32_t end_col, end_row;
3489 text_t *stp; 3340 text_t *stp;
3490 3341
… …
3528/* ------------------------------------------------------------------------- */ 3379/* ------------------------------------------------------------------------- */
3529/* 3380/*
3530 * Double click on button 3 when already selected 3381 * Double click on button 3 when already selected
3531 * EXT: button 3 double click 3382 * EXT: button 3 double click
3532 */ 3383 */
3533void 3384void ecb_cold
3534rxvt_term::selection_rotate (int x, int y) NOTHROW 3385rxvt_term::selection_rotate (int x, int y) NOTHROW
3535{ 3386{
3536 selection.clicks = selection.clicks % 3 + 1; 3387 selection.clicks = selection.clicks % 3 + 1;
3537 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3388 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3538} 3389}
… …
3540/* ------------------------------------------------------------------------- */ 3391/* ------------------------------------------------------------------------- */
3541/* 3392/*
3542 * Respond to a request for our current selection 3393 * Respond to a request for our current selection
3543 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3544 */ 3395 */
3545void 3396void ecb_cold
3546rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3547{ 3398{
3399 Atom property = rq.property == None ? rq.target : rq.property;
3548 XSelectionEvent ev; 3400 XSelectionEvent ev;
3549 3401
3550 ev.type = SelectionNotify; 3402 ev.type = SelectionNotify;
3551 ev.property = None; 3403 ev.property = None;
3552 ev.display = rq.display; 3404 ev.display = rq.display;
… …
3567 *target++ = xa[XA_COMPOUND_TEXT]; 3419 *target++ = xa[XA_COMPOUND_TEXT];
3568#if X_HAVE_UTF8_STRING 3420#if X_HAVE_UTF8_STRING
3569 *target++ = xa[XA_UTF8_STRING]; 3421 *target++ = xa[XA_UTF8_STRING];
3570#endif 3422#endif
3571 3423
3572 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3424 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3573 32, PropModeReplace, 3425 32, PropModeReplace,
3574 (unsigned char *)target_list, target - target_list); 3426 (unsigned char *)target_list, target - target_list);
3575 ev.property = rq.property; 3427 ev.property = property;
3576 } 3428 }
3577#if TODO // TODO 3429#if TODO // TODO
3578 else if (rq.target == xa[XA_MULTIPLE]) 3430 else if (rq.target == xa[XA_MULTIPLE])
3579 { 3431 {
3580 /* TODO: Handle MULTIPLE */ 3432 /* TODO: Handle MULTIPLE */
3581 } 3433 }
3582#endif 3434#endif
3583 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3435 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3584 { 3436 {
3585 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3437 XChangeProperty (dpy, rq.requestor, property, rq.target,
3586 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3438 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3587 ev.property = rq.property; 3439 ev.property = property;
3440 }
3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3442 {
3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3444 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3445 ev.property = property;
3588 } 3446 }
3589 else if (rq.target == XA_STRING 3447 else if (rq.target == XA_STRING
3590 || rq.target == xa[XA_TEXT] 3448 || rq.target == xa[XA_TEXT]
3591 || rq.target == xa[XA_COMPOUND_TEXT] 3449 || rq.target == xa[XA_COMPOUND_TEXT]
3592 || rq.target == xa[XA_UTF8_STRING] 3450 || rq.target == xa[XA_UTF8_STRING]
… …
3624 { 3482 {
3625 target = xa[XA_COMPOUND_TEXT]; 3483 target = xa[XA_COMPOUND_TEXT];
3626 style = enc_compound_text; 3484 style = enc_compound_text;
3627 } 3485 }
3628 3486
3629 if (selection.text) 3487 if (rq.selection == XA_PRIMARY && selection.text)
3630 { 3488 {
3631 cl = selection.text; 3489 cl = selection.text;
3632 selectlen = selection.len; 3490 selectlen = selection.len;
3491 }
3492 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3493 {
3494 cl = selection.clip_text;
3495 selectlen = selection.clip_len;
3633 } 3496 }
3634 else 3497 else
3635 { 3498 {
3636 cl = L""; 3499 cl = L"";
3637 selectlen = 0; 3500 selectlen = 0;
… …
3658 ct.value = (unsigned char *)cl; 3521 ct.value = (unsigned char *)cl;
3659 ct.nitems = selectlen; 3522 ct.nitems = selectlen;
3660 ct.encoding = target; 3523 ct.encoding = target;
3661 } 3524 }
3662 3525
3663 XChangeProperty (dpy, rq.requestor, rq.property, 3526 XChangeProperty (dpy, rq.requestor, property,
3664 ct.encoding, 8, PropModeReplace, 3527 ct.encoding, 8, PropModeReplace,
3665 ct.value, (int)ct.nitems); 3528 ct.value, (int)ct.nitems);
3666 ev.property = rq.property; 3529 ev.property = property;
3667 3530
3668 if (freect) 3531 if (freect)
3669 XFree (ct.value); 3532 XFree (ct.value);
3670 } 3533 }
3671 3534
3672 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3535 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3673} 3536}
3674 3537
3675/* ------------------------------------------------------------------------- */ 3538/* ------------------------------------------------------------------------- */
3676#ifdef USE_XIM 3539#if USE_XIM
3677void 3540void ecb_cold
3678rxvt_term::im_set_position (XPoint &pos) NOTHROW 3541rxvt_term::im_set_position (XPoint &pos) NOTHROW
3679{ 3542{
3680 XWindowAttributes xwa; 3543 XWindowAttributes xwa;
3681 3544
3682 XGetWindowAttributes (dpy, vt, &xwa); 3545 XGetWindowAttributes (dpy, vt, &xwa);
… …
3705 h += 2; min_it (h, nrow); 3568 h += 2; min_it (h, nrow);
3706 3569
3707 x -= 1; clamp_it (x, 0, ncol - w); 3570 x -= 1; clamp_it (x, 0, ncol - w);
3708 y -= 1; clamp_it (y, 0, nrow - h); 3571 y -= 1; clamp_it (y, 0, nrow - h);
3709 3572
3710 ov_x = x; ov_y = y; 3573 ov.x = x; ov.y = y;
3711 ov_w = w; ov_h = h; 3574 ov.w = w; ov.h = h;
3712 3575
3713 ov_text = new text_t *[h]; 3576 ov.text = new text_t *[h];
3714 ov_rend = new rend_t *[h]; 3577 ov.rend = new rend_t *[h];
3715 3578
3716 for (y = 0; y < h; y++) 3579 for (y = 0; y < h; y++)
3717 { 3580 {
3718 text_t *tp = ov_text[y] = new text_t[w]; 3581 text_t *tp = ov.text[y] = new text_t[w];
3719 rend_t *rp = ov_rend[y] = new rend_t[w]; 3582 rend_t *rp = ov.rend[y] = new rend_t[w];
3720 3583
3721 text_t t0, t1, t2; 3584 text_t t0, t1, t2;
3722 rend_t r = OVERLAY_RSTYLE; 3585 rend_t r = OVERLAY_RSTYLE;
3723 3586
3724 if (y == 0) 3587 if (y == 0)
… …
3743} 3606}
3744 3607
3745void 3608void
3746rxvt_term::scr_overlay_off () NOTHROW 3609rxvt_term::scr_overlay_off () NOTHROW
3747{ 3610{
3748 if (!ov_text) 3611 if (!ov.text)
3749 return; 3612 return;
3750 3613
3751 want_refresh = 1; 3614 want_refresh = 1;
3752 3615
3753 for (int y = 0; y < ov_h; y++) 3616 for (int y = 0; y < ov.h; y++)
3754 { 3617 {
3755 delete [] ov_text[y]; 3618 delete [] ov.text[y];
3756 delete [] ov_rend[y]; 3619 delete [] ov.rend[y];
3757 } 3620 }
3758 3621
3759 delete [] ov_text; ov_text = 0; 3622 delete [] ov.text; ov.text = 0;
3760 delete [] ov_rend; ov_rend = 0; 3623 delete [] ov.rend; ov.rend = 0;
3761} 3624}
3762 3625
3763void 3626void
3764rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3627rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3765{ 3628{
3766 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3629 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3767 return; 3630 return;
3768 3631
3769 x++, y++; 3632 x++, y++;
3770 3633
3771 ov_text[y][x] = text; 3634 ov.text[y][x] = text;
3772 ov_rend[y][x] = rend; 3635 ov.rend[y][x] = rend;
3773} 3636}
3774 3637
3775void 3638void
3776rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3639rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3777{ 3640{
… …
3796} 3659}
3797 3660
3798void 3661void
3799rxvt_term::scr_swap_overlay () NOTHROW 3662rxvt_term::scr_swap_overlay () NOTHROW
3800{ 3663{
3801 if (!ov_text) 3664 if (!ov.text)
3802 return; 3665 return;
3803 3666
3667 // hide cursor if it is within the overlay area
3668 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3669 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3670 screen.flags &= ~Screen_VisibleCursor;
3671
3804 // swap screen mem with overlay 3672 // swap screen mem with overlay
3805 for (int y = ov_h; y--; ) 3673 for (int y = ov.h; y--; )
3806 { 3674 {
3807 text_t *t1 = ov_text[y]; 3675 text_t *t1 = ov.text[y];
3808 rend_t *r1 = ov_rend[y]; 3676 rend_t *r1 = ov.rend[y];
3809 3677
3810 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3678 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3811 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3679 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3812 3680
3813 for (int x = ov_w; x--; ) 3681 for (int x = ov.w; x--; )
3814 { 3682 {
3815 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3683 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3816 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3684 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3817 } 3685 }
3818 } 3686 }

Diff Legend

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