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

Diff Legend

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