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

Diff Legend

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