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.306 by root, Sun Jun 15 10:15:39 2008 UTC vs.
Revision 1.433 by sf-exg, Thu Jan 31 08:07:14 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);
153}
154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
149} 163}
150 164
151/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
152 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
153 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
154 168
155void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
156rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
157{ 215{
158#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
159 scr_overlay_off (); 217 scr_overlay_off ();
160#endif 218#endif
161 219
162 rvideo_mode = false;
163 view_start = 0; 220 view_start = 0;
164 num_scr = 0; 221 num_scr = 0;
165 222
166 if (ncol == 0) 223 if (ncol == 0)
167 ncol = 80; 224 ncol = 80;
… …
169 if (nrow == 0) 226 if (nrow == 0)
170 nrow = 24; 227 nrow = 24;
171 228
172 if (ncol == prev_ncol && nrow == prev_nrow) 229 if (ncol == prev_ncol && nrow == prev_nrow)
173 return; 230 return;
174
175 if (current_screen != PRIMARY)
176 scr_swap_screen ();
177 231
178 // we need at least two lines for wrapping to work correctly 232 // we need at least two lines for wrapping to work correctly
179 while (nrow + saveLines < 2) 233 while (nrow + saveLines < 2)
180 { 234 {
181 //TODO//FIXME 235 //TODO//FIXME
… …
190 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
191 245
192 screen.tscroll = 0; 246 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
194 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
195 if (!row_buf) 257 if (!prev_row_buf)
196 { 258 {
197 /* 259 /*
198 * first time called so just malloc everything: don't rely on realloc 260 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
199 */ 261 */
200 top_row = 0; 262 top_row = 0;
201 term_start = 0; 263 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 264
217 memset (charsets, 'B', sizeof (charsets)); 265 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 266 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 267 screen.flags = Screen_DefaultFlags;
220 screen.cur.row = screen.cur.col = 0; 268 screen.cur.row = screen.cur.col = 0;
… …
234 selection.text = NULL; 282 selection.text = NULL;
235 selection.len = 0; 283 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 284 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 285 selection.screen = PRIMARY;
238 selection.clicks = 0; 286 selection.clicks = 0;
287 selection.clip_text = NULL;
288 selection.clip_len = 0;
239 } 289 }
240 else 290 else
241 { 291 {
242 /* 292 /*
243 * add or delete rows as appropriate 293 * add or delete rows as appropriate
244 */ 294 */
245 295
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--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
264 { 297 {
265 lresize (drawn_buf[row]); 298 copy_line (drawn_buf [row], prev_drawn_buf [row]);
266 lresize (swap_buf [row]); 299 copy_line (swap_buf [row], prev_swap_buf [row]);
267 }
268
269 for (int row = prev_nrow; row < nrow; row++)
270 { 300 }
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 301
278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 302 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279 int pend = MOD (term_start + top_row , prev_total_rows); 303 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row 304 int q = total_rows; // rewrapped row
281 305
282 if (top_row) 306 if (top_row)
283 { 307 {
284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 308 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
285 // to come up with a lean and mean algorithm. 309 // to come up with a lean and mean algorithm.
310 // TODO: maybe optimise when width didn't change
286 311
287 row_col_t ocur = screen.cur; 312 row_col_t ocur = screen.cur;
288 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 313 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289 314
290 do 315 do
291 { 316 {
292 p = MOD (p - 1, prev_total_rows); 317 p = MOD (p - 1, prev_total_rows);
293#ifdef DEBUG_STRICT
294 assert (old_buf [MOD (p, prev_total_rows)].t); 318 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
295#endif
296 int plines = 1; 319 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l; 320 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
298 321
299 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 322 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
300 { 323 {
301 p = MOD (p - 1, prev_total_rows); 324 p = MOD (p - 1, prev_total_rows);
302 325
303 plines++; 326 plines++;
304 llen += prev_ncol; 327 llen += prev_ncol;
… …
317 340
318 // re-assemble the full line by destination lines 341 // re-assemble the full line by destination lines
319 for (int qrow = q; qlines--; qrow++) 342 for (int qrow = q; qlines--; qrow++)
320 { 343 {
321 qline = row_buf + qrow; 344 qline = row_buf + qrow;
322 lalloc (*qline); 345 qline->alloc (); // redundant with next line
323 qline->l = ncol; 346 qline->l = ncol;
324 qline->is_longer (1); 347 qline->is_longer (1);
325 348
326 int qcol = 0; 349 int qcol = 0;
327 350
… …
342 // this seems to upset applications/shells/readline 365 // this seems to upset applications/shells/readline
343 // least. 366 // least.
344 if (prow == ocur.row) 367 if (prow == ocur.row)
345 screen.cur.row = q - (total_rows - nrow); 368 screen.cur.row = q - (total_rows - nrow);
346 369
347 line_t &pline = old_buf [prow]; 370 line_t &pline = prev_row_buf [prow];
348 371
349 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 372 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
350 373
351 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 374 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
352 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 375 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
373 { 396 {
374 // if no scrollback exists (yet), wing, instead of wrap 397 // if no scrollback exists (yet), wing, instead of wrap
375 398
376 for (int row = min (nrow, prev_nrow); row--; ) 399 for (int row = min (nrow, prev_nrow); row--; )
377 { 400 {
378 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 401 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
379 line_t &qline = row_buf [row]; 402 line_t &dst = row_buf [row];
380 403
381 qline = pline; 404 copy_line (dst, src);
382 lresize (qline);
383 } 405 }
384 406
385 for (int row = prev_nrow; row < nrow; row++) 407 for (int row = prev_nrow; row < nrow; row++)
386 {
387 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 408 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
388 }
389 409
390 term_start = 0; 410 term_start = 0;
391 } 411 }
392
393 free (old_buf);
394 delete old_ta;
395 delete old_ra;
396 412
397 clamp_it (screen.cur.row, 0, nrow - 1); 413 clamp_it (screen.cur.row, 0, nrow - 1);
398 clamp_it (screen.cur.col, 0, ncol - 1); 414 clamp_it (screen.cur.col, 0, ncol - 1);
415 }
399 416
417 for (int row = nrow; row--; )
418 {
419 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
420 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
421 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
422 }
423
424 chunk_free (prev_chunk, prev_chunk_size);
425
400 free (tabs); 426 free (tabs);
401 } 427 tabs = (char *)rxvt_malloc (ncol);
428
429 for (int col = ncol; col--; )
430 tabs [col] = col % TABSIZE == 0;
402 431
403 CLEAR_ALL_SELECTION (); 432 CLEAR_ALL_SELECTION ();
404 433
405 prev_nrow = nrow; 434 prev_nrow = nrow;
406 prev_ncol = ncol; 435 prev_ncol = ncol;
407 436
408 tabs = (char *)rxvt_malloc (ncol); 437 tt_winch ();
409 438
410 for (int col = ncol; --col; ) 439 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
411 tabs [col] = col % TABSIZE == 0; 440}
441
442void ecb_cold
443rxvt_term::scr_release () NOTHROW
444{
445 chunk_free (chunk, chunk_size);
446 chunk = 0;
447 row_buf = 0;
448
449 free (tabs);
450 tabs = 0;
451}
452
453/* ------------------------------------------------------------------------- */
454/*
455 * Hard/Soft reset
456 */
457void ecb_cold
458rxvt_term::scr_poweron ()
459{
460 scr_release ();
461
462 prev_nrow = prev_ncol = 0;
463 rvideo_mode = false;
464 scr_soft_reset ();
465 scr_reset ();
466
467 scr_clear (true);
468 scr_refresh ();
469}
470
471void ecb_cold
472rxvt_term::scr_soft_reset () NOTHROW
473{
474 /* only affects modes, nothing drastic such as clearing the screen */
475#if ENABLE_OVERLAY
476 scr_overlay_off ();
477#endif
412 478
413 if (current_screen != PRIMARY) 479 if (current_screen != PRIMARY)
414 scr_swap_screen (); 480 scr_swap_screen ();
415 481
416 tt_winch (); 482 scr_scroll_region (0, MAX_ROWS - 1);
417 483 scr_rendition (0, ~RS_None);
418 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 484 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} 485}
456 486
457/* ------------------------------------------------------------------------- * 487/* ------------------------------------------------------------------------- *
458 * PROCESS SCREEN COMMANDS * 488 * PROCESS SCREEN COMMANDS *
459 * ------------------------------------------------------------------------- */ 489 * ------------------------------------------------------------------------- */
… …
497 } 527 }
498 528
499 /* boundary check in case screen size changed between SAVE and RESTORE */ 529 /* boundary check in case screen size changed between SAVE and RESTORE */
500 min_it (s->cur.row, nrow - 1); 530 min_it (s->cur.row, nrow - 1);
501 min_it (s->cur.col, ncol - 1); 531 min_it (s->cur.col, ncol - 1);
502#ifdef DEBUG_STRICT
503 assert (s->cur.row >= 0); 532 assert (s->cur.row >= 0);
504 assert (s->cur.col >= 0); 533 assert (s->cur.col >= 0);
505#endif
506} 534}
507 535
508void 536void
509rxvt_term::scr_swap_screen () 537rxvt_term::scr_swap_screen () NOTHROW
510{ 538{
511 if (!option (Opt_secondaryScreen)) 539 if (!option (Opt_secondaryScreen))
512 return; 540 return;
513 541
514 for (int i = prev_nrow; i--; ) 542 for (int i = prev_nrow; i--; )
… …
533 return; 561 return;
534 562
535 want_refresh = 1; 563 want_refresh = 1;
536 view_start = 0; 564 view_start = 0;
537 565
538 selection_check (2); /* check for boundary cross */ 566 /* check for boundary cross */
567 row_col_t pos;
568 pos.row = pos.col = 0;
569 if (ROWCOL_IS_BEFORE (selection.beg, pos)
570 && ROWCOL_IS_AFTER (selection.end, pos))
571 CLEAR_SELECTION ();
539 572
540 int i = current_screen; current_screen = scrn; scrn = i; 573 current_screen = scrn;
541 574
542#if NSCREENS 575#if NSCREENS
543 if (option (Opt_secondaryScreen)) 576 if (option (Opt_secondaryScreen))
544 { 577 {
545 num_scr = 0; 578 num_scr = 0;
… …
609/* 642/*
610 * Scroll text between <row1> and <row2> inclusive, by <count> lines 643 * Scroll text between <row1> and <row2> inclusive, by <count> lines
611 * count positive ==> scroll up 644 * count positive ==> scroll up
612 * count negative ==> scroll down 645 * count negative ==> scroll down
613 */ 646 */
614int 647int ecb_hot
615rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 648rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
616{ 649{
617 if (count == 0 || (row1 > row2)) 650 if (count == 0 || (row1 > row2))
618 return 0; 651 return 0;
619 652
… …
622 655
623 if (count > 0 656 if (count > 0
624 && row1 == 0 657 && row1 == 0
625 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 658 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
626 { 659 {
660 min_it (count, total_rows - (nrow - (row2 + 1)));
661
627 top_row = max (top_row - count, -saveLines); 662 top_row = max (top_row - count, -saveLines);
628
629 // scroll everything up 'count' lines
630 term_start = (term_start + count) % total_rows;
631 663
632 // sever bottommost line 664 // sever bottommost line
633 { 665 {
634 line_t &l = ROW(row2 - count); 666 line_t &l = ROW(row2);
635 l.is_longer (0); 667 l.is_longer (0);
636 l.touch (); 668 l.touch ();
637 } 669 }
638 670
671 // scroll everything up 'count' lines
672 term_start = (term_start + count) % total_rows;
673
674 // now copy lines below the scroll region bottom to the
675 // bottom of the screen again, so they look as if they
676 // hadn't moved.
677 for (int i = nrow; --i > row2; )
678 {
679 line_t &l1 = ROW(i - count);
680 line_t &l2 = ROW(i);
681
682 ::swap (l1, l2);
683 l2.touch ();
684 }
685
639 // erase newly scrolled-in lines 686 // erase newly scrolled-in lines
640 for (int i = count; i--; ) 687 for (int i = count; i--; )
641 { 688 {
642 line_t &l = ROW(nrow - 1 - i); 689 line_t &l = ROW(row2 - i);
643 690
644 // optimize if already cleared, can be significant on slow machines 691 // optimise if already cleared, can be significant on slow machines
645 // could be rolled into scr_blank_screen_mem 692 // 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))) 693 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
647 { 694 {
648 scr_blank_line (l, 0, l.l, rstyle); 695 scr_blank_line (l, 0, l.l, rstyle);
649 l.l = 0; 696 l.l = 0;
… …
651 } 698 }
652 else 699 else
653 scr_blank_screen_mem (l, rstyle); 700 scr_blank_screen_mem (l, rstyle);
654 } 701 }
655 702
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 703 // move and/or clear selection, if any
669 if (selection.op && current_screen == selection.screen) 704 if (selection.op && current_screen == selection.screen
705 && selection.beg.row <= row2)
670 { 706 {
671 selection.beg.row -= count; 707 selection.beg.row -= count;
672 selection.end.row -= count; 708 selection.end.row -= count;
673 selection.mark.row -= count; 709 selection.mark.row -= count;
674 710
675 if (selection.beg.row < top_row 711 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 } 712 }
683 713
684 // finally move the view window, if desired 714 // finally move the view window, if desired
685 if (option (Opt_scrollWithBuffer) 715 if (option (Opt_scrollWithBuffer)
686 && view_start != 0 716 && view_start != 0
… …
716 } 746 }
717 747
718 // use a simple and robust scrolling algorithm, this 748 // use a simple and robust scrolling algorithm, this
719 // part of scr_scroll_text is not time-critical. 749 // part of scr_scroll_text is not time-critical.
720 750
751 // sever line above scroll region
752 if (row1)
753 {
754 line_t &l = ROW(row1 - 1);
755 l.is_longer (0);
756 l.touch ();
757 }
758
721 int rows = row2 - row1 + 1; 759 int rows = row2 - row1 + 1;
722 760
723 min_it (count, rows); 761 min_it (count, rows);
724 762
725 line_t *temp_buf = row_buf + total_rows; 763 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
726 764
727 for (int row = 0; row < rows; row++) 765 for (int row = 0; row < rows; row++)
728 { 766 {
729 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 767 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
730 768
… …
732 scr_blank_screen_mem (temp_buf [row], rstyle); 770 scr_blank_screen_mem (temp_buf [row], rstyle);
733 } 771 }
734 772
735 for (int row = 0; row < rows; row++) 773 for (int row = 0; row < rows; row++)
736 ROW(row1 + row) = temp_buf [row]; 774 ROW(row1 + row) = temp_buf [row];
775
776 // sever bottommost line
777 {
778 line_t &l = ROW(row2);
779 l.is_longer (0);
780 l.touch ();
781 }
737 } 782 }
738 783
739 return count; 784 return count;
740} 785}
741 786
742/* ------------------------------------------------------------------------- */ 787/* ------------------------------------------------------------------------- */
743/* 788/*
744 * Add text given in <str> of length <len> to screen struct 789 * Add text given in <str> of length <len> to screen struct
745 */ 790 */
746void 791void ecb_hot
747rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 792rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
748{ 793{
749 if (len <= 0) /* sanity */ 794 if (len <= 0) /* sanity */
750 return; 795 return;
751 796
752 unsigned char checksel; 797 bool checksel;
753 unicode_t c; 798 unicode_t c;
754 int ncol = this->ncol; 799 int ncol = this->ncol;
755 const wchar_t *strend = str + len; 800 const wchar_t *strend = str + len;
756 801
757 want_refresh = 1; 802 want_refresh = 1;
… …
770 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 815 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
771 screen.cur.row -= minlines; 816 screen.cur.row -= minlines;
772 } 817 }
773 } 818 }
774 819
775#ifdef DEBUG_STRICT
776 assert (screen.cur.col < ncol); 820 assert (screen.cur.col < ncol);
777 assert (screen.cur.row < nrow 821 assert (screen.cur.row < nrow
778 && screen.cur.row >= top_row); 822 && screen.cur.row >= top_row);
779#endif
780 int row = screen.cur.row; 823 int row = screen.cur.row;
781 824
782 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 825 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
783 826
784 line_t *line = &ROW(row); 827 line_t *line = &ROW(row);
785 828
786 while (str < strend) 829 while (str < strend)
787 { 830 {
788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 831 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
789 832
790 if (c < 0x20) 833 if (ecb_unlikely (c < 0x20))
791 if (c == C0_LF) 834 if (c == C0_LF)
792 { 835 {
793 max_it (line->l, screen.cur.col); 836 max_it (line->l, screen.cur.col);
794 837
795 screen.flags &= ~Screen_WrapNext; 838 screen.flags &= ~Screen_WrapNext;
… …
814 { 857 {
815 scr_tab (1, true); 858 scr_tab (1, true);
816 continue; 859 continue;
817 } 860 }
818 861
862 if (ecb_unlikely (
819 if (checksel /* see if we're writing within selection */ 863 checksel /* see if we're writing within selection */
820 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 864 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
821 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 865 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
866 ))
822 { 867 {
823 checksel = 0; 868 checksel = 0;
824 /* 869 /*
825 * If we wrote anywhere in the selected area, kill the selection 870 * If we wrote anywhere in the selected area, kill the selection
826 * XXX: should we kill the mark too? Possibly, but maybe that 871 * XXX: should we kill the mark too? Possibly, but maybe that
827 * should be a similar check. 872 * should be a similar check.
828 */ 873 */
829 CLEAR_SELECTION (); 874 CLEAR_SELECTION ();
830 } 875 }
831 876
832 if (screen.flags & Screen_WrapNext) 877 if (ecb_unlikely (screen.flags & Screen_WrapNext))
833 { 878 {
834 scr_do_wrap (); 879 scr_do_wrap ();
835 880
836 line->l = ncol; 881 line->l = ncol;
837 line->is_longer (1); 882 line->is_longer (1);
… …
839 row = screen.cur.row; 884 row = screen.cur.row;
840 line = &ROW(row); /* _must_ refresh */ 885 line = &ROW(row); /* _must_ refresh */
841 } 886 }
842 887
843 // some utf-8 decoders "decode" surrogate characters: let's fix this. 888 // some utf-8 decoders "decode" surrogate characters: let's fix this.
844 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 889 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
845 c = 0xfffd; 890 c = 0xfffd;
846 891
847 // rely on wcwidth to tell us the character width, do wcwidth before 892 // rely on wcwidth to tell us the character width, do wcwidth before
848 // further replacements, as wcwidth might return -1 for the line 893 // further replacements, as wcwidth might return -1 for the line
849 // drawing characters below as they might be invalid in the current 894 // drawing characters below as they might be invalid in the current
850 // locale. 895 // locale.
851 int width = WCWIDTH (c); 896 int width = WCWIDTH (c);
852 897
853 if (charsets [screen.charset] == '0') // DEC SPECIAL 898 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
854 { 899 {
855 // vt100 special graphics and line drawing 900 // vt100 special graphics and line drawing
856 // 5f-7e standard vt100 901 // 5f-7e standard vt100
857 // 40-5e rxvt extension for extra curses acs chars 902 // 40-5e rxvt extension for extra curses acs chars
858 static uint16_t vt100_0[62] = { // 41 .. 7e 903 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
871 c = vt100_0[c - 0x41]; 916 c = vt100_0[c - 0x41];
872 width = 1; // vt100 line drawing characters are always single-width 917 width = 1; // vt100 line drawing characters are always single-width
873 } 918 }
874 } 919 }
875 920
876 if (screen.flags & Screen_Insert) 921 if (ecb_unlikely (screen.flags & Screen_Insert))
877 scr_insdel_chars (width, INSERT); 922 scr_insdel_chars (width, INSERT);
878 923
879 if (width != 0) 924 if (width != 0)
880 { 925 {
881#if !UNICODE_3 926#if !UNICODE_3
… …
886# else 931# else
887 c = 0xfffd; 932 c = 0xfffd;
888# endif 933# endif
889#endif 934#endif
890 935
936 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
937
938 // if the character doesn't fit into the remaining columns...
939 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
940 {
941 if (screen.flags & Screen_Autowrap)
942 {
943 // ... artificially enlargen the previous one
944 c = NOCHAR;
945 // and try the same character next loop iteration
946 --str;
947 }
948 else
949 screen.cur.col = ncol - width;
950 }
951
891 // nuke the character at this position, if required 952 // nuke the character at this position, if required
953 // due to wonderful coincidences everywhere else in this loop
954 // we never have to check for overwriting a wide char itself,
955 // only its tail.
892 if (line->t[screen.cur.col] == NOCHAR 956 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
893 || (screen.cur.col < ncol - 1 957 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 958
923 line->touch (); 959 line->touch ();
924 960
925 do 961 do
926 { 962 {
927 line->t[screen.cur.col] = c; 963 line->t[screen.cur.col] = c;
928 line->r[screen.cur.col] = rend; 964 line->r[screen.cur.col] = rend;
929 965
930 if (screen.cur.col < ncol - 1) 966 if (ecb_likely (screen.cur.col < ncol - 1))
931 screen.cur.col++; 967 screen.cur.col++;
932 else 968 else
933 { 969 {
934 line->l = ncol; 970 line->l = ncol;
935 if (screen.flags & Screen_Autowrap) 971 if (screen.flags & Screen_Autowrap)
936 screen.flags |= Screen_WrapNext; 972 screen.flags |= Screen_WrapNext;
937 break; 973
974 goto end_of_line;
938 } 975 }
939 976
940 c = NOCHAR; 977 c = NOCHAR;
941 } 978 }
942 while (--width > 0); 979 while (ecb_unlikely (--width > 0));
943 980
944 // pad with spaces when overwriting wide character with smaller one 981 // pad with spaces when overwriting wide character with smaller one
945 if (!width) 982 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
946 { 983 {
947 line->touch (); 984 line->t[c] = ' ';
985 line->r[c] = rend;
986 }
948 987
949 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 988end_of_line:
989 ;
990 }
991#if ENABLE_COMBINING
992 else // width == 0
993 {
994 if (c != 0xfeff) // ignore BOM
995 {
996 // handle combining characters
997 // we just tag the accent on the previous on-screen character.
998 // this is arguably not correct, but also arguably not wrong.
999 // we don't handle double-width characters nicely yet.
1000 line_t *linep;
1001 text_t *tp;
1002 rend_t *rp;
1003
1004 if (screen.cur.col > 0)
950 { 1005 {
951 line->t[c] = ' ';
952 line->r[c] = rend; 1006 linep = line;
1007 tp = line->t + screen.cur.col - 1;
1008 rp = line->r + screen.cur.col - 1;
953 } 1009 }
1010 else if (screen.cur.row > 0
1011 && ROW(screen.cur.row - 1).is_longer ())
1012 {
1013 linep = &ROW(screen.cur.row - 1);
1014 tp = line->t + ncol - 1;
1015 rp = line->r + ncol - 1;
1016 }
1017 else
1018 continue;
1019
1020 linep->touch ();
1021
1022 while (*tp == NOCHAR && tp > linep->t)
1023 tp--, rp--;
1024
1025 // first try to find a precomposed character
1026 unicode_t n = rxvt_compose (*tp, c);
1027 if (n == NOCHAR)
1028 n = rxvt_composite.compose (*tp, c);
1029
1030 *tp = n;
1031 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
954 } 1032 }
955 } 1033 }
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 1034#endif
996 }
997 } 1035 }
998 1036
999 max_it (line->l, screen.cur.col); 1037 max_it (line->l, screen.cur.col);
1000 1038
1001#ifdef DEBUG_STRICT
1002 assert (screen.cur.row >= 0); 1039 assert (screen.cur.row >= 0);
1003#endif
1004} 1040}
1005 1041
1006/* ------------------------------------------------------------------------- */ 1042/* ------------------------------------------------------------------------- */
1007/* 1043/*
1008 * Process Backspace. Move back the cursor back a position, wrap if have to 1044 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1021 1057
1022 want_refresh = 1; 1058 want_refresh = 1;
1023#endif 1059#endif
1024 } 1060 }
1025 } 1061 }
1062 else if (screen.flags & Screen_WrapNext)
1063 screen.flags &= ~Screen_WrapNext;
1026 else 1064 else
1027 scr_gotorc (0, -1, RELATIVE); 1065 scr_gotorc (0, -1, RELATIVE);
1028} 1066}
1029 1067
1030/* ------------------------------------------------------------------------- */ 1068/* ------------------------------------------------------------------------- */
… …
1108 * XTERM_SEQ: ESC 6 1146 * XTERM_SEQ: ESC 6
1109 * Move cursor left in row. If we're at the left boundary, shift everything 1147 * Move cursor left in row. If we're at the left boundary, shift everything
1110 * in that row right. Clear left column. 1148 * in that row right. Clear left column.
1111 */ 1149 */
1112#if !ENABLE_MINIMAL 1150#if !ENABLE_MINIMAL
1113void 1151void ecb_cold
1114rxvt_term::scr_backindex () NOTHROW 1152rxvt_term::scr_backindex () NOTHROW
1115{ 1153{
1116 if (screen.cur.col > 0) 1154 if (screen.cur.col > 0)
1117 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1118 else 1156 else
… …
1125 * XTERM_SEQ: ESC 9 1163 * XTERM_SEQ: ESC 9
1126 * Move cursor right in row. If we're at the right boundary, shift everything 1164 * Move cursor right in row. If we're at the right boundary, shift everything
1127 * in that row left. Clear right column. 1165 * in that row left. Clear right column.
1128 */ 1166 */
1129#if !ENABLE_MINIMAL 1167#if !ENABLE_MINIMAL
1130void 1168void ecb_cold
1131rxvt_term::scr_forwardindex () NOTHROW 1169rxvt_term::scr_forwardindex () NOTHROW
1132{ 1170{
1133 if (screen.cur.col < ncol - 1) 1171 if (screen.cur.col < ncol - 1)
1134 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1172 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1135 else 1173 else
… …
1286 scr_blank_line (line, col, num, rstyle); 1324 scr_blank_line (line, col, num, rstyle);
1287} 1325}
1288 1326
1289/* ------------------------------------------------------------------------- */ 1327/* ------------------------------------------------------------------------- */
1290/* 1328/*
1291 * Erase part of whole of the screen 1329 * Erase part or whole of the screen
1292 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1330 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1293 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1331 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1294 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1332 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1295 */ 1333 */
1296void 1334void
… …
1305 ZERO_SCROLLBACK (); 1343 ZERO_SCROLLBACK ();
1306 1344
1307 switch (mode) 1345 switch (mode)
1308 { 1346 {
1309 case 0: /* erase to end of screen */ 1347 case 0: /* erase to end of screen */
1310 selection_check (1);
1311 scr_erase_line (0); 1348 scr_erase_line (0);
1312 row = screen.cur.row + 1; /* possible OOB */ 1349 row = screen.cur.row + 1; /* possible OOB */
1313 num = nrow - row; 1350 num = nrow - row;
1314 break; 1351 break;
1315 case 1: /* erase to beginning of screen */ 1352 case 1: /* erase to beginning of screen */
1316 selection_check (3);
1317 scr_erase_line (1); 1353 scr_erase_line (1);
1318 row = 0; 1354 row = 0;
1319 num = screen.cur.row; 1355 num = screen.cur.row;
1320 break; 1356 break;
1321 case 2: /* erase whole screen */ 1357 case 2: /* erase whole screen */
1322 selection_check (3);
1323 row = 0; 1358 row = 0;
1324 num = nrow; 1359 num = nrow;
1325 break; 1360 break;
1326 default: 1361 default:
1327 return; 1362 return;
… …
1336 if (row >= nrow) /* Out Of Bounds */ 1371 if (row >= nrow) /* Out Of Bounds */
1337 return; 1372 return;
1338 1373
1339 min_it (num, nrow - row); 1374 min_it (num, nrow - row);
1340 1375
1341 if (rstyle & (RS_RVid | RS_Uline)) 1376 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1377 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1378 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1379 {
1345 ren = DEFAULT_RSTYLE; 1380 ren = DEFAULT_RSTYLE;
1346 CLEAR_ROWS (row, num); 1381
1382 if (mapped)
1383 XClearArea (dpy, vt, 0,
1384 Row2Pixel (row - view_start), (unsigned int)vt_width,
1385 (unsigned int)Height2Pixel (num), False);
1347 } 1386 }
1348 else 1387 else
1349 { 1388 {
1350 ren = rstyle & (RS_fgMask | RS_bgMask); 1389 ren = rstyle & (RS_fgMask | RS_bgMask);
1390
1391 if (mapped)
1392 {
1351 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1393 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1352 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1394 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1353 ERASE_ROWS (row, num); 1395 XFillRectangle (dpy, vt, gc,
1396 0, Row2Pixel (row - view_start),
1397 (unsigned int)vt_width,
1398 (unsigned int)Height2Pixel (num));
1354 gcvalue.foreground = pix_colors[Color_fg]; 1399 gcvalue.foreground = pix_colors[Color_fg];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1400 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1401 }
1356 } 1402 }
1357 1403
1358 for (; num--; row++) 1404 for (; num--; row++)
1359 { 1405 {
1360 scr_blank_screen_mem (ROW(row), rstyle); 1406 scr_blank_screen_mem (ROW(row), rstyle);
1407
1408 if (row - view_start < nrow)
1361 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1409 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1362 } 1410 }
1363} 1411}
1364 1412
1365#if !ENABLE_MINIMAL 1413#if !ENABLE_MINIMAL
1366void 1414void
… …
1376/* ------------------------------------------------------------------------- */ 1424/* ------------------------------------------------------------------------- */
1377/* 1425/*
1378 * Fill the screen with `E's 1426 * Fill the screen with `E's
1379 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1427 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1380 */ 1428 */
1381void 1429void ecb_cold
1382rxvt_term::scr_E () NOTHROW 1430rxvt_term::scr_E () NOTHROW
1383{ 1431{
1384 rend_t fs; 1432 rend_t fs;
1385 1433
1386 want_refresh = 1; 1434 want_refresh = 1;
1387 ZERO_SCROLLBACK (); 1435 ZERO_SCROLLBACK ();
1388 1436
1389 num_scr_allow = 0; 1437 num_scr_allow = 0;
1390 selection_check (3); 1438
1439 row_col_t pos;
1440 pos.row = pos.col = 0;
1441 if (ROWCOL_IS_AFTER (selection.end, pos))
1442 CLEAR_SELECTION ();
1391 1443
1392 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1444 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1393 for (int row = nrow; row--; ) 1445 for (int row = nrow; row--; )
1394 { 1446 {
1395 line_t &line = ROW(row); 1447 line_t &line = ROW(row);
… …
1440 * Insert/Delete <count> characters from the current position 1492 * Insert/Delete <count> characters from the current position
1441 */ 1493 */
1442void 1494void
1443rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1495rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1444{ 1496{
1445 int col, row;
1446 rend_t tr;
1447
1448 want_refresh = 1; 1497 want_refresh = 1;
1449 ZERO_SCROLLBACK (); 1498 ZERO_SCROLLBACK ();
1450 1499
1451 if (count <= 0) 1500 if (count <= 0)
1452 return; 1501 return;
… …
1454 scr_do_wrap (); 1503 scr_do_wrap ();
1455 1504
1456 selection_check (1); 1505 selection_check (1);
1457 min_it (count, ncol - screen.cur.col); 1506 min_it (count, ncol - screen.cur.col);
1458 1507
1459 row = screen.cur.row; 1508 int row = screen.cur.row;
1460 1509
1461 line_t *line = &ROW(row); 1510 line_t *line = &ROW(row);
1462 1511
1463 line->touch (); 1512 line->touch ();
1464 line->is_longer (0); 1513 line->is_longer (0);
1465 1514
1515 // nuke wide spanning the start
1516 if (line->t[screen.cur.col] == NOCHAR)
1517 scr_kill_char (*line, screen.cur.col);
1518
1466 switch (insdel) 1519 switch (insdel)
1467 { 1520 {
1468 case INSERT: 1521 case INSERT:
1469 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1522 line->l = min (line->l + count, ncol);
1523
1524 if (line->t[screen.cur.col] == NOCHAR)
1525 scr_kill_char (*line, screen.cur.col);
1526
1527 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1470 { 1528 {
1471 line->t[col] = line->t[col - count]; 1529 line->t[col] = line->t[col - count];
1472 line->r[col] = line->r[col - count]; 1530 line->r[col] = line->r[col - count];
1473 } 1531 }
1474
1475 line->l = min (line->l + count, ncol);
1476 1532
1477 if (selection.op && current_screen == selection.screen 1533 if (selection.op && current_screen == selection.screen
1478 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1534 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1479 { 1535 {
1480 if (selection.end.row != screen.cur.row 1536 if (selection.end.row != screen.cur.row
… …
1495 case ERASE: 1551 case ERASE:
1496 screen.cur.col += count; /* don't worry if > ncol */ 1552 screen.cur.col += count; /* don't worry if > ncol */
1497 selection_check (1); 1553 selection_check (1);
1498 screen.cur.col -= count; 1554 screen.cur.col -= count;
1499 1555
1500 line->l = max (line->l - count, 0); 1556 // nuke wide char after the end
1557 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1558 scr_kill_char (*line, screen.cur.col + count);
1559
1501 scr_blank_line (*line, screen.cur.col, count, rstyle); 1560 scr_blank_line (*line, screen.cur.col, count, rstyle);
1502 break; 1561 break;
1503 1562
1504 case DELETE: 1563 case DELETE:
1505 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1564 line->l = max (line->l - count, 0);
1506 1565
1566 // nuke wide char spanning the end
1567 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1568 scr_kill_char (*line, screen.cur.col + count);
1569
1507 for (col = screen.cur.col; (col + count) < ncol; col++) 1570 for (int col = screen.cur.col; (col + count) < ncol; col++)
1508 { 1571 {
1509 line->t[col] = line->t[col + count]; 1572 line->t[col] = line->t[col + count];
1510 line->r[col] = line->r[col + count]; 1573 line->r[col] = line->r[col + count];
1511 } 1574 }
1512 1575
1513 line->l = max (line->l - count, 0);
1514 scr_blank_line (*line, ncol - count, count, tr); 1576 scr_blank_line (*line, ncol - count, count, rstyle);
1515 1577
1516 if (selection.op && current_screen == selection.screen 1578 if (selection.op && current_screen == selection.screen
1517 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1579 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1518 { 1580 {
1519 if (selection.end.row != screen.cur.row 1581 if (selection.end.row != screen.cur.row
… …
1536/* ------------------------------------------------------------------------- */ 1598/* ------------------------------------------------------------------------- */
1537/* 1599/*
1538 * Set the scrolling region 1600 * Set the scrolling region
1539 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1601 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1540 */ 1602 */
1541void 1603void ecb_cold
1542rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1604rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1543{ 1605{
1544 max_it (top, 0); 1606 max_it (top, 0);
1545 min_it (bot, nrow - 1); 1607 min_it (bot, nrow - 1);
1546 1608
… …
1556/* 1618/*
1557 * Make the cursor visible/invisible 1619 * Make the cursor visible/invisible
1558 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1620 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1559 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1621 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1560 */ 1622 */
1561void 1623void ecb_cold
1562rxvt_term::scr_cursor_visible (int mode) NOTHROW 1624rxvt_term::scr_cursor_visible (int mode) NOTHROW
1563{ 1625{
1564 want_refresh = 1; 1626 want_refresh = 1;
1565 1627
1566 if (mode) 1628 if (mode)
… …
1573/* 1635/*
1574 * Set/unset automatic wrapping 1636 * Set/unset automatic wrapping
1575 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1637 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1576 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1638 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1577 */ 1639 */
1578void 1640void ecb_cold
1579rxvt_term::scr_autowrap (int mode) NOTHROW 1641rxvt_term::scr_autowrap (int mode) NOTHROW
1580{ 1642{
1581 if (mode) 1643 if (mode)
1582 screen.flags |= Screen_Autowrap; 1644 screen.flags |= Screen_Autowrap;
1583 else 1645 else
… …
1592 * Relative mode: line numbers are relative to top margin of scrolling region 1654 * Relative mode: line numbers are relative to top margin of scrolling region
1593 * and the cursor cannot be moved outside. 1655 * and the cursor cannot be moved outside.
1594 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1656 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1595 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1657 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1596 */ 1658 */
1597void 1659void ecb_cold
1598rxvt_term::scr_relative_origin (int mode) NOTHROW 1660rxvt_term::scr_relative_origin (int mode) NOTHROW
1599{ 1661{
1600 if (mode) 1662 if (mode)
1601 screen.flags |= Screen_Relative; 1663 screen.flags |= Screen_Relative;
1602 else 1664 else
… …
1609/* 1671/*
1610 * Set insert/replace mode 1672 * Set insert/replace mode
1611 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1673 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1612 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1674 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1613 */ 1675 */
1614void 1676void ecb_cold
1615rxvt_term::scr_insert_mode (int mode) NOTHROW 1677rxvt_term::scr_insert_mode (int mode) NOTHROW
1616{ 1678{
1617 if (mode) 1679 if (mode)
1618 screen.flags |= Screen_Insert; 1680 screen.flags |= Screen_Insert;
1619 else 1681 else
… …
1625 * Set/Unset tabs 1687 * Set/Unset tabs
1626 * XTERM_SEQ: Set tab at current column : ESC H 1688 * XTERM_SEQ: Set tab at current column : ESC H
1627 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1689 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1628 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1690 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1629 */ 1691 */
1630void 1692void ecb_cold
1631rxvt_term::scr_set_tab (int mode) NOTHROW 1693rxvt_term::scr_set_tab (int mode) NOTHROW
1632{ 1694{
1633 if (mode < 0) 1695 if (mode < 0)
1634 memset (tabs, 0, ncol); 1696 memset (tabs, 0, ncol);
1635 else if (screen.cur.col < ncol) 1697 else if (screen.cur.col < ncol)
… …
1654 if (rvideo_state != on) 1716 if (rvideo_state != on)
1655 { 1717 {
1656 rvideo_state = on; 1718 rvideo_state = on;
1657 1719
1658 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1720 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1659#ifdef HAVE_BG_PIXMAP 1721#ifdef HAVE_IMG
1660 if (bgPixmap.pixmap == None) 1722 if (bg_img == 0)
1661#endif 1723#endif
1662 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1724 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1663 1725
1664 XGCValues gcvalue; 1726 XGCValues gcvalue;
1665 gcvalue.foreground = pix_colors[Color_fg]; 1727 gcvalue.foreground = pix_colors[Color_fg];
… …
1674/* ------------------------------------------------------------------------- */ 1736/* ------------------------------------------------------------------------- */
1675/* 1737/*
1676 * Report current cursor position 1738 * Report current cursor position
1677 * XTERM_SEQ: Report position: ESC [ 6 n 1739 * XTERM_SEQ: Report position: ESC [ 6 n
1678 */ 1740 */
1679void 1741void ecb_cold
1680rxvt_term::scr_report_position () NOTHROW 1742rxvt_term::scr_report_position () NOTHROW
1681{ 1743{
1682 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1744 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1683} 1745}
1684 1746
… …
1687 * ------------------------------------------------------------------------- */ 1749 * ------------------------------------------------------------------------- */
1688 1750
1689/* 1751/*
1690 * Set font style 1752 * Set font style
1691 */ 1753 */
1692void 1754void ecb_cold
1693rxvt_term::set_font_style () NOTHROW 1755rxvt_term::set_font_style () NOTHROW
1694{ 1756{
1695#if 0 1757#if 0
1696 switch (charsets [screen.charset]) 1758 switch (charsets [screen.charset])
1697 { 1759 {
… …
1719 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1781 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1720 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1782 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1721 * XTERM_SEQ: Invoke G2 character set: ESC N 1783 * XTERM_SEQ: Invoke G2 character set: ESC N
1722 * XTERM_SEQ: Invoke G3 character set: ESC O 1784 * XTERM_SEQ: Invoke G3 character set: ESC O
1723 */ 1785 */
1724void 1786void ecb_cold
1725rxvt_term::scr_charset_choose (int set) NOTHROW 1787rxvt_term::scr_charset_choose (int set) NOTHROW
1726{ 1788{
1727 screen.charset = set; 1789 screen.charset = set;
1728 set_font_style (); 1790 set_font_style ();
1729} 1791}
… …
1750 * ------------------------------------------------------------------------- */ 1812 * ------------------------------------------------------------------------- */
1751 1813
1752/* 1814/*
1753 * refresh matching text. 1815 * refresh matching text.
1754 */ 1816 */
1755bool 1817bool ecb_cold
1756rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1818rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1757{ 1819{
1758 bool found = false; 1820 bool found = false;
1759 1821
1760 for (int i = 0; i < nrow; i++) 1822 for (int i = 0; i < nrow; i++)
… …
1779 PART_BEG = 0, 1841 PART_BEG = 0,
1780 PART_END, 1842 PART_END,
1781 RC_COUNT 1843 RC_COUNT
1782}; 1844};
1783 1845
1784void 1846void ecb_hot
1785rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1847rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1786{ 1848{
1787 int i; 1849 int i;
1788 row_col_t rc[RC_COUNT]; 1850 row_col_t rc[RC_COUNT];
1789 1851
… …
1809 for (i = PART_BEG; i < RC_COUNT; i++) 1871 for (i = PART_BEG; i < RC_COUNT; i++)
1810 { 1872 {
1811 min_it (rc[i].col, ncol - 1); 1873 min_it (rc[i].col, ncol - 1);
1812 min_it (rc[i].row, nrow - 1); 1874 min_it (rc[i].row, nrow - 1);
1813 } 1875 }
1814// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1876
1815 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1877 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1816 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1878 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1817 1879
1818 num_scr_allow = 0; 1880 num_scr_allow = 0;
1819 1881
… …
1826 * Refresh the entire screen 1888 * Refresh the entire screen
1827 */ 1889 */
1828void 1890void
1829rxvt_term::scr_touch (bool refresh) NOTHROW 1891rxvt_term::scr_touch (bool refresh) NOTHROW
1830{ 1892{
1831 scr_expose (0, 0, width, height, refresh); 1893 scr_expose (0, 0, vt_width, vt_height, refresh);
1832} 1894}
1833 1895
1834/* ------------------------------------------------------------------------- */ 1896/* ------------------------------------------------------------------------- */
1835/* 1897/*
1836 * Move the display so that the line represented by scrollbar value Y is at 1898 * Move the display so that the line represented by scrollbar value Y is at
… …
1892 1954
1893# ifndef NO_MAPALERT 1955# ifndef NO_MAPALERT
1894# ifdef MAPALERT_OPTION 1956# ifdef MAPALERT_OPTION
1895 if (option (Opt_mapAlert)) 1957 if (option (Opt_mapAlert))
1896# endif 1958# endif
1897 XMapWindow (dpy, parent[0]); 1959 XMapWindow (dpy, parent);
1898# endif 1960# endif
1899 1961
1900# if ENABLE_FRILLS 1962# if ENABLE_FRILLS
1901 if (option (Opt_urgentOnBell)) 1963 if (option (Opt_urgentOnBell))
1902 { 1964 set_urgency (1);
1903 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1904 {
1905 h->flags |= XUrgencyHint;
1906 XSetWMHints (dpy, parent[0], h);
1907 }
1908 }
1909# endif 1965# endif
1910 1966
1911 if (option (Opt_visualBell)) 1967 if (option (Opt_visualBell))
1912 { 1968 {
1913 rvideo_bell = true; 1969 rvideo_bell = true;
… …
1916 1972
1917 bell_ev.start (VISUAL_BELL_DURATION); 1973 bell_ev.start (VISUAL_BELL_DURATION);
1918 } 1974 }
1919 else 1975 else
1920 XBell (dpy, 0); 1976 XBell (dpy, 0);
1977 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1921#endif 1978#endif
1922} 1979}
1923 1980
1924/* ------------------------------------------------------------------------- */ 1981/* ------------------------------------------------------------------------- */
1925/* ARGSUSED */ 1982void ecb_cold
1926void
1927rxvt_term::scr_printscreen (int fullhist) NOTHROW 1983rxvt_term::scr_printscreen (int fullhist) NOTHROW
1928{ 1984{
1929#ifdef PRINTPIPE 1985#ifdef PRINTPIPE
1930 int nrows, row_start; 1986 int nrows, row_start;
1931 FILE *fd; 1987 FILE *fd = popen_printer ();
1932 1988
1933 if ((fd = popen_printer ()) == NULL) 1989 if (!fd)
1934 return; 1990 return;
1935 1991
1936 if (fullhist) 1992 if (fullhist)
1937 { 1993 {
1938 nrows = nrow - top_row; 1994 nrows = nrow - top_row;
… …
1944 row_start = view_start; 2000 row_start = view_start;
1945 } 2001 }
1946 2002
1947 wctomb (0, 0); 2003 wctomb (0, 0);
1948 2004
1949 for (int r1 = 0; r1 < nrows; r1++) 2005 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1950 { 2006 {
1951 text_t *tp = ROW(r1).t; 2007 text_t *tp = ROW(r1).t;
1952 int len = ROW(r1).l; 2008 int len = ROW(r1).l;
1953 2009
1954 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2010 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1980/* 2036/*
1981 * Refresh the screen 2037 * Refresh the screen
1982 * drawn_text/drawn_rend contain the screen information before the update. 2038 * drawn_text/drawn_rend contain the screen information before the update.
1983 * screen.text/screen.rend contain what the screen will change to. 2039 * screen.text/screen.rend contain what the screen will change to.
1984 */ 2040 */
1985void 2041void ecb_hot
1986rxvt_term::scr_refresh () NOTHROW 2042rxvt_term::scr_refresh () NOTHROW
1987{ 2043{
1988 unsigned char have_bg,
1989 showcursor; /* show the cursor */
1990 int16_t col, row, /* column/row we're processing */ 2044 int16_t col, row, /* column/row we're processing */
1991 ocrow; /* old cursor row */ 2045 ocrow; /* old cursor row */
1992 int i; /* tmp */ 2046 int i; /* tmp */
1993#ifndef NO_CURSORCOLOR
1994 rend_t cc1; /* store colours at cursor position (s) */
1995#endif
1996 rend_t *crp; // cursor rendition pointer
1997 rend_t ccol1, /* Cursor colour */ 2047 rend_t ccol1, /* Cursor colour */
1998 ccol2; /* Cursor colour2 */ 2048 ccol2; /* Cursor colour2 */
2049 rend_t cur_rend;
2050 int cur_col;
1999 2051
2000 want_refresh = 0; /* screen is current */ 2052 want_refresh = 0; /* screen is current */
2001 2053
2002 if (refresh_type == NO_REFRESH || !mapped) 2054 if (refresh_type == NO_REFRESH || !mapped)
2003 return; 2055 return;
… …
2005 /* 2057 /*
2006 * A: set up vars 2058 * A: set up vars
2007 */ 2059 */
2008 refresh_count = 0; 2060 refresh_count = 0;
2009 2061
2062 unsigned int old_screen_flags = screen.flags;
2010 have_bg = 0; 2063 bool have_bg = 0;
2011#ifdef HAVE_BG_PIXMAP 2064#ifdef HAVE_IMG
2012 have_bg = bgPixmap.pixmap != None; 2065 have_bg = bg_img != 0;
2013#endif 2066#endif
2014 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2067 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2015 2068
2016 /* 2069 /*
2017 * B: reverse any characters which are selected 2070 * B: reverse any characters which are selected
2018 */ 2071 */
2019 scr_reverse_selection (); 2072 scr_reverse_selection ();
2020 2073
2074 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2075#if ENABLE_OVERLAY
2076 scr_swap_overlay ();
2077#endif
2078
2079 bool showcursor = screen.flags & Screen_VisibleCursor;
2080
2021 /* 2081 /*
2022 * C: set the cursor character (s) 2082 * C: set the cursor character (s)
2023 */ 2083 */
2024 { 2084 {
2025 unsigned char setoldcursor; 2085 bool setoldcursor;
2026 2086
2027 showcursor = (screen.flags & Screen_VisibleCursor);
2028#ifdef CURSOR_BLINK 2087#ifdef CURSOR_BLINK
2029 if (hidden_cursor) 2088 if (hidden_cursor)
2030 showcursor = 0; 2089 showcursor = 0;
2031#endif 2090#endif
2032 2091
… …
2035 int col = screen.cur.col; 2094 int col = screen.cur.col;
2036 2095
2037 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2096 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2038 col--; 2097 col--;
2039 2098
2040 crp = &ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col;
2041 2101
2042#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
2043 cc1 = *crp & (RS_fgMask | RS_bgMask);
2044 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2045 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2046 else 2105 else
2047#endif 2106#endif
2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2060 ccol2 = bgcolor_of (rstyle); 2119 ccol2 = bgcolor_of (rstyle);
2061#else 2120#else
2062 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2063#endif 2122#endif
2064 2123
2065 if (showcursor && focus) 2124 if (focus)
2066 { 2125 {
2126 rend_t rend = cur_rend;
2127
2067 if (option (Opt_cursorUnderline)) 2128 if (option (Opt_cursorUnderline))
2068 *crp ^= RS_Uline; 2129 rend ^= RS_Uline;
2069 else 2130 else
2070 { 2131 {
2071 *crp ^= RS_RVid; 2132 rend ^= RS_RVid;
2072 *crp = SET_FGCOLOR (*crp, ccol1); 2133 rend = SET_FGCOLOR (rend, ccol1);
2073 *crp = SET_BGCOLOR (*crp, ccol2); 2134 rend = SET_BGCOLOR (rend, ccol2);
2074 } 2135 }
2136
2137 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2075 } 2138 }
2076 } 2139 }
2077 2140
2078 /* make sure no outline cursor is left around */ 2141 /* make sure no outline cursor is left around */
2079 setoldcursor = 0; 2142 setoldcursor = 0;
… …
2105 oldcursor.col = screen.cur.col; 2168 oldcursor.col = screen.cur.col;
2106 } 2169 }
2107 } 2170 }
2108 } 2171 }
2109 2172
2110 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2111#if ENABLE_OVERLAY
2112 scr_swap_overlay ();
2113#endif
2114
2115#ifndef NO_SLOW_LINK_SUPPORT 2173#ifndef NO_SLOW_LINK_SUPPORT
2116 /* 2174 /*
2117 * D: CopyArea pass - very useful for slower links 2175 * D: CopyArea pass - very useful for slower links
2118 * This has been deliberately kept simple. 2176 * This has been deliberately kept simple.
2119 */ 2177 */
… …
2123 { 2181 {
2124 int16_t nits; 2182 int16_t nits;
2125 int i = num_scr; 2183 int i = num_scr;
2126 int j; 2184 int j;
2127 int len, wlen; 2185 int len, wlen;
2128 dLocal (int, num_scr);
2129 2186
2130 j = nrow; 2187 j = nrow;
2131 wlen = len = -1; 2188 wlen = len = -1;
2132 row = i > 0 ? 0 : j - 1; 2189 row = i > 0 ? 0 : j - 1;
2133 2190
… …
2208 continue; 2265 continue;
2209 2266
2210 // redraw one or more characters 2267 // redraw one or more characters
2211 2268
2212 // seek to the beginning of wide characters 2269 // seek to the beginning of wide characters
2213 while (stp[col] == NOCHAR && col > 0) 2270 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2214 --col; 2271 --col;
2215 2272
2216 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2273 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2217 text_t *text = stp + col; 2274 text_t *text = stp + col;
2218 int count = 1; 2275 int count = 1;
2219 2276
2220 dtp[col] = stp[col]; 2277 dtp[col] = stp[col];
2221 drp[col] = rend; 2278 drp[col] = rend;
… …
2225 for (i = 0; ++col < ncol; ) 2282 for (i = 0; ++col < ncol; )
2226 { 2283 {
2227 if (stp[col] == NOCHAR) 2284 if (stp[col] == NOCHAR)
2228 { 2285 {
2229 dtp[col] = stp[col]; 2286 dtp[col] = stp[col];
2230 drp[col] = rend; 2287 drp[col] = srp[col];
2288
2231 count++; 2289 count++;
2232 i++; 2290 i++;
2233 2291
2234 continue; 2292 continue;
2235 } 2293 }
… …
2255 2313
2256 col--; /* went one too far. move back */ 2314 col--; /* went one too far. move back */
2257 count -= i; /* dump any matching trailing chars */ 2315 count -= i; /* dump any matching trailing chars */
2258 2316
2259 // sometimes we optimize away the trailing NOCHAR's, add them back 2317 // sometimes we optimize away the trailing NOCHAR's, add them back
2260 while (i && text[count] == NOCHAR) 2318 while (ecb_unlikely (i && text[count] == NOCHAR))
2261 count++, i--; 2319 count++, i--;
2262 2320
2263 /* 2321 /*
2264 * Determine the attributes for the string 2322 * Determine the attributes for the string
2265 */ 2323 */
2266 int fore = fgcolor_of (rend); // desired foreground 2324 int fore = fgcolor_of (rend); // desired foreground
2267 int back = bgcolor_of (rend); // desired background 2325 int back = bgcolor_of (rend); // desired background
2268 2326
2269 // only do special processing if any attributes are set, which is unlikely 2327 // only do special processing if any attributes are set, which is unlikely
2270 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2328 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2271 { 2329 {
2272 bool invert = rend & RS_RVid; 2330 bool invert = rend & RS_RVid;
2273 2331
2274#ifndef NO_BOLD_UNDERLINE_REVERSE 2332#ifndef NO_BOLD_UNDERLINE_REVERSE
2275 if (rend & RS_Bold && fore == Color_fg) 2333 if (rend & RS_Bold && fore == Color_fg)
… …
2294 2352
2295 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2353 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2296 fore = Color_UL; 2354 fore = Color_UL;
2297#endif 2355#endif
2298 2356
2357#ifdef OPTION_HC
2358 if (rend & RS_Sel)
2359 {
2360 /* invert the column if no highlightColor is set or it is the
2361 * current cursor column */
2362 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2363 && ISSET_PIXCOLOR (Color_HC))
2364 {
2365 if (ISSET_PIXCOLOR (Color_HTC))
2366 fore = Color_HTC;
2367 // if invert is 0 reverse video is set so we use bg color as fg color
2368 else if (!invert)
2369 fore = back;
2370
2371 back = Color_HC;
2372 invert = 0;
2373 }
2374 }
2375#endif
2376
2299 if (invert) 2377 if (invert)
2300 { 2378 {
2301#ifdef OPTION_HC
2302 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2303 || !ISSET_PIXCOLOR (Color_HC))
2304#endif
2305 /* invert the column if no highlightColor is set or it is the
2306 * current cursor column */
2307 ::swap (fore, back); 2379 ::swap (fore, back);
2308#ifdef OPTION_HC
2309 else if (ISSET_PIXCOLOR (Color_HC))
2310 back = Color_HC;
2311#endif
2312 2380
2313#ifndef NO_BOLD_UNDERLINE_REVERSE 2381#ifndef NO_BOLD_UNDERLINE_REVERSE
2314# ifndef OPTION_HC
2315 if (ISSET_PIXCOLOR (Color_RV))
2316 back = Color_RV;
2317# endif
2318 if (fore == back) 2382 if (fore == back)
2319 { 2383 {
2320 fore = Color_bg; 2384 fore = Color_bg;
2321 back = Color_fg; 2385 back = Color_fg;
2322 } 2386 }
… …
2358 /* 2422 /*
2359 * Actually do the drawing of the string here 2423 * Actually do the drawing of the string here
2360 */ 2424 */
2361 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2425 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2362 2426
2363 if (have_bg && back == Color_bg) 2427 if (ecb_likely (have_bg && back == Color_bg))
2364 { 2428 {
2365 // this is very ugly, maybe push it into ->draw? 2429 // this is very ugly, maybe push it into ->draw?
2366 2430
2367 for (i = 0; i < count; i++) /* don't draw empty strings */ 2431 for (i = 0; i < count; i++) /* don't draw empty strings */
2368 if (text[i] != ' ') 2432 if (text[i] != ' ')
… …
2375 did_clear: ; 2439 did_clear: ;
2376 } 2440 }
2377 else 2441 else
2378 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2442 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2379 2443
2380 if (rend & RS_Uline && font->descent > 1 && fore != back) 2444 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2381 { 2445 {
2382#if ENABLE_FRILLS 2446#if ENABLE_FRILLS
2383 if (ISSET_PIXCOLOR (Color_underline)) 2447 if (ISSET_PIXCOLOR (Color_underline))
2384 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2448 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2385 else 2449 else
… …
2391 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2455 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2392 } 2456 }
2393 } /* for (col....) */ 2457 } /* for (col....) */
2394 } /* for (row....) */ 2458 } /* for (row....) */
2395 2459
2396#if ENABLE_OVERLAY
2397 scr_swap_overlay ();
2398#endif
2399 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2400
2401 /* 2460 /*
2402 * G: cleanup cursor and display outline cursor if necessary 2461 * G: cleanup cursor and display outline cursor if necessary
2403 */ 2462 */
2404 if (showcursor) 2463 if (showcursor)
2405 { 2464 {
2406 if (focus) 2465 if (focus)
2407 { 2466 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2408 if (option (Opt_cursorUnderline))
2409 *crp ^= RS_Uline;
2410 else
2411 {
2412 *crp ^= RS_RVid;
2413#ifndef NO_CURSORCOLOR
2414 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2415#endif
2416 }
2417 }
2418 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2419 { 2468 {
2420 int cursorwidth = 1; 2469 int cursorwidth = 1;
2421 int col = oldcursor.col; 2470 int col = oldcursor.col;
2422 2471
… …
2436 2485
2437 XDrawRectangle (dpy, vt, gc, 2486 XDrawRectangle (dpy, vt, gc,
2438 Col2Pixel (col), 2487 Col2Pixel (col),
2439 Row2Pixel (oldcursor.row), 2488 Row2Pixel (oldcursor.row),
2440 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2489 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2441 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2490 (unsigned int) (Height2Pixel (1) - 1));
2442 } 2491 }
2443 } 2492 }
2444 2493
2445 /* 2494 /*
2446 * H: cleanup selection 2495 * H: cleanup selection
2447 */ 2496 */
2497#if ENABLE_OVERLAY
2498 scr_swap_overlay ();
2499#endif
2500 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2501
2448 scr_reverse_selection (); 2502 scr_reverse_selection ();
2449 2503
2504 screen.flags = old_screen_flags;
2450 num_scr = 0; 2505 num_scr = 0;
2451 num_scr_allow = 1; 2506 num_scr_allow = 1;
2452} 2507}
2453 2508
2454void 2509void ecb_cold
2455rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2510rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2456{ 2511{
2457 if (!l.t) 2512 if (!l.valid ())
2458 return; 2513 return;
2459 2514
2460 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2515 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2461 2516
2462 for (int i = ncol; i--; ) 2517 for (int i = ncol; i--; )
2463 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2518 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2464} 2519}
2465 2520
2466void 2521void ecb_cold
2467rxvt_term::scr_remap_chars () NOTHROW 2522rxvt_term::scr_remap_chars () NOTHROW
2468{ 2523{
2469 for (int i = total_rows; i--; ) 2524 for (int i = total_rows; i--; )
2470 scr_remap_chars (row_buf [i]); 2525 scr_remap_chars (row_buf [i]);
2471 2526
… …
2474 scr_remap_chars (drawn_buf [i]); 2529 scr_remap_chars (drawn_buf [i]);
2475 scr_remap_chars (swap_buf [i]); 2530 scr_remap_chars (swap_buf [i]);
2476 } 2531 }
2477} 2532}
2478 2533
2479void 2534void ecb_cold
2480rxvt_term::scr_recolour () NOTHROW 2535rxvt_term::scr_recolour (bool refresh) NOTHROW
2481{ 2536{
2482#ifdef HAVE_BG_PIXMAP 2537 bool transparent = false;
2483 bgPixmap.apply ();
2484#else
2485 2538
2539#ifdef HAVE_IMG
2540 if (bg_img != 0)
2541 {
2542# if ENABLE_TRANSPARENCY
2543 if (bg_flags & BG_IS_TRANSPARENT)
2544 {
2545 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2546 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2547
2548 transparent = true;
2549 }
2550 else
2551# endif
2552 {
2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2554 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2555 }
2556 }
2557 else
2558#endif
2559 {
2486 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2560 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2487 XClearWindow (dpy, parent[0]);
2488 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2561 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2562 }
2563
2564 XClearWindow (dpy, parent);
2489 2565
2490 if (scrollBar.win) 2566 if (scrollBar.win)
2491 { 2567 {
2568 if (transparent)
2569 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2570 else
2492 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2571 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2493 scrollBar.state = STATE_IDLE; 2572 scrollBar.state = SB_STATE_IDLE;
2494 scrollBar.show (0); 2573 scrollBar.show (0);
2495 } 2574 }
2496 2575
2497#endif 2576 if (refresh)
2498 2577 {
2499 /* bgPixmap.apply () does not do the following : */
2500 scr_clear (); 2578 scr_clear ();
2501 scr_touch (true); 2579 scr_touch (true);
2580 }
2502 want_refresh = 1; 2581 want_refresh = 1;
2503} 2582}
2504 2583
2505/* ------------------------------------------------------------------------- */ 2584/* ------------------------------------------------------------------------- */
2506void 2585void
… …
2563 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2642 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2564 srp[col] ^= rstyle; 2643 srp[col] ^= rstyle;
2565} 2644}
2566 2645
2567/* ------------------------------------------------------------------------- */ 2646/* ------------------------------------------------------------------------- */
2568void 2647void ecb_hot
2569rxvt_term::scr_reverse_selection () NOTHROW 2648rxvt_term::scr_reverse_selection () NOTHROW
2570{ 2649{
2571 if (selection.op 2650 if (selection.op
2572 && current_screen == selection.screen 2651 && current_screen == selection.screen
2573 && selection.end.row >= view_start) 2652 && selection.end.row >= view_start)
2574 { 2653 {
2575#if !ENABLE_MINIMAL 2654#if !ENABLE_MINIMAL
2576 if (selection.rect) 2655 if (selection.rect)
2577 scr_xor_rect (selection.beg.row, selection.beg.col, 2656 scr_xor_rect (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2657 selection.end.row, selection.end.col,
2579 RS_RVid, RS_RVid | RS_Uline); 2658 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2580 else 2659 else
2581#endif 2660#endif
2582 scr_xor_span (selection.beg.row, selection.beg.col, 2661 scr_xor_span (selection.beg.row, selection.beg.col,
2583 selection.end.row, selection.end.col, 2662 selection.end.row, selection.end.col,
2584 RS_RVid); 2663 RS_Sel | RS_RVid);
2585 } 2664 }
2586} 2665}
2587 2666
2588/* ------------------------------------------------------------------------- */ 2667/* ------------------------------------------------------------------------- */
2589/* 2668/*
… …
2592 */ 2671 */
2593#if 0 2672#if 0
2594void 2673void
2595rxvt_term::scr_dump (int fd) NOTHROW 2674rxvt_term::scr_dump (int fd) NOTHROW
2596{ 2675{
2597 int row, wrote; 2676 // if this method is needed, it can be implemented by factoring the
2598 unsigned int width, towrite; 2677 // relevant code in scr_printscreen
2599 char r1[] = "\n";
2600
2601 for (row = saveLines + top_row;
2602 row < saveLines + nrow - 1; row++)
2603 {
2604 width = row_buf[row].l >= 0 ? row_buf[row].l
2605 : ncol;
2606 for (towrite = width; towrite; towrite -= wrote)
2607 {
2608 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2609 towrite);
2610 if (wrote < 0)
2611 return; /* XXX: death, no report */
2612 }
2613 if (row_buf[row].l >= 0)
2614 if (write (fd, r1, 1) <= 0)
2615 return; /* XXX: death, no report */
2616 }
2617} 2678}
2618#endif 2679#endif
2619 2680
2620/* ------------------------------------------------------------------------- * 2681/* ------------------------------------------------------------------------- *
2621 * CHARACTER SELECTION * 2682 * CHARACTER SELECTION *
2622 * ------------------------------------------------------------------------- */ 2683 * ------------------------------------------------------------------------- */
2623void 2684void
2624rxvt_term::selection_check (int check_more) NOTHROW 2685rxvt_term::selection_check (int check_more) NOTHROW
2625{ 2686{
2626 row_col_t pos;
2627
2628 if (!selection.op) 2687 if (!selection.op)
2629 return; 2688 return;
2630 2689
2631 pos.row = pos.col = 0;
2632 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2690 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2633 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2634 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2692 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2635 || (check_more == 1 2693 || (check_more == 1
2636 && current_screen == selection.screen 2694 && current_screen == selection.screen
2637 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2695 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2638 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2696 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2639 || (check_more == 2
2640 && ROWCOL_IS_BEFORE (selection.beg, pos)
2641 && ROWCOL_IS_AFTER (selection.end, pos))
2642 || (check_more == 3
2643 && ROWCOL_IS_AFTER (selection.end, pos))
2644 || (check_more == 4 /* screen width change */
2645 && (selection.beg.row != selection.end.row
2646 || selection.end.col > ncol)))
2647 CLEAR_SELECTION (); 2697 CLEAR_ALL_SELECTION ();
2648} 2698}
2649 2699
2650/* ------------------------------------------------------------------------- */ 2700/* ------------------------------------------------------------------------- */
2651/* 2701/*
2652 * Paste a selection direct to the command fd 2702 * Paste a selection direct to the command fd
2653 */ 2703 */
2654void 2704void
2655rxvt_term::paste (char *data, unsigned int len) NOTHROW 2705rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2656{ 2706{
2657 /* convert normal newline chars into common keyboard Return key sequence */ 2707 /* convert normal newline chars into common keyboard Return key sequence */
2658 for (unsigned int i = 0; i < len; i++) 2708 for (unsigned int i = 0; i < len; i++)
2659 if (data[i] == C0_LF) 2709 if (data[i] == C0_LF)
2660 data[i] = C0_CR; 2710 data[i] = C0_CR;
2661 2711
2662 if (priv_modes & PrivMode_BracketPaste) 2712 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[200~"); 2713 tt_printf ("\x1b[200~");
2664 2714
2665 tt_write (data, len); 2715 tt_write (data, len);
2666 2716
2667 if (priv_modes & PrivMode_BracketPaste) 2717 if (priv_modes & PrivMode_BracketPaste)
2668 tt_printf ("\e[201~"); 2718 tt_printf ("\x1b[201~");
2669} 2719}
2670 2720
2671/* ------------------------------------------------------------------------- */
2672/*
2673 * Respond to a notification that a primary selection has been sent
2674 * EXT: SelectionNotify
2675 */
2676void 2721void
2677rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2722rxvt_term::paste (char *data, unsigned int len) NOTHROW
2678{ 2723{
2679 if (prop == None) /* check for failed XConvertSelection */ 2724 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2680 {
2681 if ((selection_type & Sel_CompoundText))
2682 {
2683 int selnum = selection_type & Sel_whereMask;
2684
2685 selection_type = 0;
2686 if (selnum != Sel_direct)
2687 selection_request_other (XA_STRING, selnum);
2688 }
2689
2690 if ((selection_type & Sel_UTF8String))
2691 {
2692 int selnum = selection_type & Sel_whereMask;
2693
2694 selection_type = Sel_CompoundText;
2695 if (selnum != Sel_direct)
2696 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2697 else
2698 selection_type = 0;
2699 }
2700
2701 return;
2702 }
2703
2704 unsigned long bytes_after;
2705 XTextProperty ct;
2706
2707 if (XGetWindowProperty (dpy, win, prop,
2708 0, PROP_SIZE / 4,
2709 delete_prop, AnyPropertyType,
2710 &ct.encoding, &ct.format,
2711 &ct.nitems, &bytes_after,
2712 &ct.value) != Success)
2713 {
2714 ct.value = 0;
2715 goto bailout;
2716 }
2717
2718 if (ct.encoding == None)
2719 goto bailout;
2720
2721 if (bytes_after)
2722 {
2723 // fetch and append remaining data
2724 XTextProperty ct2;
2725
2726 if (XGetWindowProperty (dpy, win, prop,
2727 ct.nitems / 4, (bytes_after + 3) / 4,
2728 delete_prop, AnyPropertyType,
2729 &ct2.encoding, &ct2.format,
2730 &ct2.nitems, &bytes_after,
2731 &ct2.value) != Success)
2732 goto bailout;
2733
2734 // realloc should be compatible to XFree, here, and elsewhere, too
2735 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2736 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2737 ct.nitems += ct2.nitems;
2738
2739 XFree (ct2.value);
2740 }
2741
2742 if (ct.value == 0)
2743 goto bailout;
2744
2745 if (ct.encoding == xa[XA_INCR])
2746 {
2747 // INCR selection, start handshake
2748 if (!delete_prop)
2749 XDeleteProperty (dpy, win, prop);
2750
2751 selection_wait = Sel_incr;
2752 incr_buf_fill = 0;
2753 incr_ev.start (10);
2754
2755 goto bailout;
2756 }
2757
2758 if (ct.nitems == 0)
2759 {
2760 if (selection_wait == Sel_incr)
2761 {
2762 XFree (ct.value);
2763
2764 // finally complete, now paste the whole thing
2765 selection_wait = Sel_normal;
2766 ct.value = (unsigned char *)incr_buf;
2767 ct.nitems = incr_buf_fill;
2768 incr_buf = 0;
2769 incr_buf_size = 0;
2770 incr_ev.stop ();
2771 }
2772 else
2773 {
2774 if (selection_wait == Sel_normal
2775 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2776 {
2777 /*
2778 * pass through again trying CUT_BUFFER0 if we've come from
2779 * XConvertSelection () but nothing was presented
2780 */
2781 selection_paste (display->root, XA_CUT_BUFFER0, False);
2782 }
2783
2784 goto bailout;
2785 }
2786 }
2787 else if (selection_wait == Sel_incr)
2788 {
2789 incr_ev.start (10);
2790
2791 while (incr_buf_fill + ct.nitems > incr_buf_size)
2792 {
2793 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2794 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2795 }
2796
2797 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2798 incr_buf_fill += ct.nitems;
2799
2800 goto bailout;
2801 }
2802
2803 char **cl;
2804 int cr;
2805
2806#if !ENABLE_MINIMAL
2807 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2808 // so recode it manually
2809 if (ct.encoding == xa[XA_UTF8_STRING])
2810 {
2811 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2812 char *s = rxvt_wcstombs (w);
2813 free (w);
2814 // TODO: strlen == only the first element will be converted. well...
2815 paste (s, strlen (s));
2816 free (s);
2817 }
2818 else
2819#endif
2820 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2821 && cl)
2822 {
2823 for (int i = 0; i < cr; i++)
2824 paste (cl[i], strlen (cl[i]));
2825
2826 XFreeStringList (cl);
2827 }
2828 else
2829 paste ((char *)ct.value, ct.nitems); // paste raw
2830
2831bailout:
2832 XFree (ct.value);
2833
2834 if (selection_wait == Sel_normal)
2835 selection_wait = Sel_none;
2836}
2837
2838void
2839rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2840{
2841 selection_wait = Sel_none;
2842
2843 incr_buf_size = 0;
2844 free (incr_buf);
2845
2846 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2847}
2848
2849void
2850rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2851{
2852 if (prop == None || selection_wait != Sel_incr)
2853 return; 2725 return;
2854 2726
2855 selection_paste (win, prop, true); 2727 tt_paste (data, len);
2856} 2728}
2857 2729
2858/* ------------------------------------------------------------------------- */ 2730/* ------------------------------------------------------------------------- */
2859/* 2731/*
2860 * Request the current selection: 2732 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2861 * Order: > internal selection if available 2733 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2862 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2734 * as fallback
2863 * > CUT_BUFFER0
2864 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2865 * will auto fallback to CUT_BUFFER0
2866 * EXT: button 2 release 2735 * EXT: button 2 release
2867 */ 2736 */
2868void 2737void
2869rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2738rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2870{ 2739{
2871 if (selection.text && selnum == Sel_Primary) 2740 if (!selection_req)
2872 {
2873 /* internal selection */
2874 char *str = rxvt_wcstombs (selection.text, selection.len);
2875 paste (str, strlen (str));
2876 free (str);
2877 return;
2878 } 2741 {
2879 else 2742 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2743 selection_req->run ();
2880 { 2744 }
2881 selection_request_time = tm;
2882 selection_wait = Sel_normal;
2883
2884#if X_HAVE_UTF8_STRING
2885 selection_type = Sel_UTF8String;
2886 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2887 return;
2888#else
2889 selection_type = Sel_CompoundText;
2890 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2891 return;
2892#endif
2893 }
2894
2895 selection_wait = Sel_none; /* don't loop in selection_paste () */
2896 selection_paste (display->root, XA_CUT_BUFFER0, false);
2897}
2898
2899int
2900rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2901{
2902 Atom sel;
2903
2904 selection_type |= selnum;
2905
2906 if (selnum == Sel_Primary)
2907 sel = XA_PRIMARY;
2908 else if (selnum == Sel_Secondary)
2909 sel = XA_SECONDARY;
2910 else
2911 sel = xa[XA_CLIPBOARD];
2912
2913 if (XGetSelectionOwner (dpy, sel) != None)
2914 {
2915 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2916 vt, selection_request_time);
2917 return 1;
2918 }
2919
2920 return 0;
2921} 2745}
2922 2746
2923/* ------------------------------------------------------------------------- */ 2747/* ------------------------------------------------------------------------- */
2924/* 2748/*
2925 * Clear all selected text 2749 * Clear all selected text
2926 * EXT: SelectionClear 2750 * EXT: SelectionClear
2927 */ 2751 */
2928void 2752void
2929rxvt_term::selection_clear () NOTHROW 2753rxvt_term::selection_clear (bool clipboard) NOTHROW
2930{ 2754{
2755 if (!clipboard)
2756 {
2931 want_refresh = 1; 2757 want_refresh = 1;
2932 free (selection.text); 2758 free (selection.text);
2933 selection.text = NULL; 2759 selection.text = NULL;
2934 selection.len = 0; 2760 selection.len = 0;
2935 CLEAR_SELECTION (); 2761 CLEAR_SELECTION ();
2936 2762
2937 if (display->selection_owner == this) 2763 if (display->selection_owner == this)
2938 display->selection_owner = 0; 2764 display->selection_owner = 0;
2765 }
2766 else
2767 {
2768 free (selection.clip_text);
2769 selection.clip_text = NULL;
2770 selection.clip_len = 0;
2771
2772 if (display->clipboard_owner == this)
2773 display->clipboard_owner = 0;
2774 }
2939} 2775}
2940 2776
2941/* ------------------------------------------------------------------------- */ 2777/* ------------------------------------------------------------------------- */
2942/* 2778/*
2943 * Copy a selection into the cut buffer 2779 * Copy a selection into the cut buffer
2944 * EXT: button 1 or 3 release 2780 * EXT: button 1 or 3 release
2945 */ 2781 */
2946void 2782void
2947rxvt_term::selection_make (Time tm) 2783rxvt_term::selection_make (Time tm)
2948{ 2784{
2949 int i; 2785 int size;
2950 wchar_t *new_selection_text; 2786 wchar_t *new_selection_text;
2951 text_t *t; 2787 text_t *t;
2952 2788
2953 switch (selection.op) 2789 switch (selection.op)
2954 { 2790 {
… …
2970 return; /* nothing selected, go away */ 2806 return; /* nothing selected, go away */
2971 2807
2972 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2808 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2973 return; 2809 return;
2974 2810
2975 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2811 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2976 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2812 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2977 2813
2978 int ofs = 0; 2814 int ofs = 0;
2979 int extra = 0; 2815 int extra = 0;
2980 2816
2981 int col = selection.beg.col; 2817 int col = selection.beg.col;
… …
2987 { 2823 {
2988#if !ENABLE_MINIMAL 2824#if !ENABLE_MINIMAL
2989 if (selection.rect) 2825 if (selection.rect)
2990 { 2826 {
2991 col = selection.beg.col; 2827 col = selection.beg.col;
2992 end_col = ncol + 1; 2828 end_col = selection.end.col;
2993 } 2829 }
2994 else 2830 else
2995#endif 2831#endif
2996 end_col = ROW(row).l; 2832 end_col = ROW(row).l;
2997 2833
2998 col = max (col, 0); 2834 col = max (col, 0);
2999 2835
3000 if (row == selection.end.row 2836 if (row == selection.end.row)
3001#if !ENABLE_MINIMAL
3002 || selection.rect
3003#endif
3004 )
3005 min_it (end_col, selection.end.col); 2837 min_it (end_col, selection.end.col);
3006 2838
3007 t = ROW(row).t + col; 2839 t = ROW(row).t + col;
3008 2840
3009 for (; col < end_col; col++) 2841 for (; col < end_col; col++)
… …
3017 2849
3018 extra -= (len - 1); 2850 extra -= (len - 1);
3019 2851
3020 if (extra < 0) 2852 if (extra < 0)
3021 { 2853 {
3022 extra += i; 2854 extra += size;
3023 i += i; 2855 size += size;
3024 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2856 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3025 } 2857 }
3026 2858
3027 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2859 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3028 } 2860 }
3029#endif 2861#endif
… …
3041 2873
3042 new_selection_text[ofs++] = C0_LF; 2874 new_selection_text[ofs++] = C0_LF;
3043 } 2875 }
3044 else 2876 else
3045#endif 2877#endif
3046 if (!ROW(row).is_longer () && row != selection.end.row) 2878 if (!ROW(row).is_longer ()
2879 && (row != selection.end.row || end_col != selection.end.col)
2880 && (row != selection.beg.row || selection.beg.col < ncol))
3047 new_selection_text[ofs++] = C0_LF; 2881 new_selection_text[ofs++] = C0_LF;
3048 } 2882 }
3049
3050 if (end_col != selection.end.col)
3051 new_selection_text[ofs++] = C0_LF;
3052 2883
3053 new_selection_text[ofs] = 0; 2884 new_selection_text[ofs] = 0;
3054 2885
3055 if (ofs == 0) 2886 if (ofs == 0)
3056 { 2887 {
… …
3069 2900
3070 selection_grab (tm); 2901 selection_grab (tm);
3071} 2902}
3072 2903
3073bool 2904bool
3074rxvt_term::selection_grab (Time tm) NOTHROW 2905rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3075{ 2906{
2907 Atom sel;
2908
2909 if (!clipboard)
2910 {
3076 selection_time = tm; 2911 selection_time = tm;
2912 sel = XA_PRIMARY;
2913 }
2914 else
2915 {
2916 clipboard_time = tm;
2917 sel = xa[XA_CLIPBOARD];
2918 }
3077 2919
3078 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2920 XSetSelectionOwner (dpy, sel, vt, tm);
3079 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2921 if (XGetSelectionOwner (dpy, sel) == vt)
3080 { 2922 {
3081 display->set_selection_owner (this); 2923 display->set_selection_owner (this, clipboard);
3082 return true; 2924 return true;
3083 } 2925 }
3084 else 2926 else
3085 { 2927 {
3086 selection_clear (); 2928 selection_clear (clipboard);
3087 return false; 2929 return false;
3088 } 2930 }
3089 2931
3090#if 0 2932#if 0
3091 XTextProperty ct; 2933 XTextProperty ct;
… …
3101/* ------------------------------------------------------------------------- */ 2943/* ------------------------------------------------------------------------- */
3102/* 2944/*
3103 * Mark or select text based upon number of clicks: 1, 2, or 3 2945 * Mark or select text based upon number of clicks: 1, 2, or 3
3104 * EXT: button 1 press 2946 * EXT: button 1 press
3105 */ 2947 */
3106void 2948void ecb_cold
3107rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2949rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3108{ 2950{
3109 clicks = ((clicks - 1) % 3) + 1; 2951 clicks = ((clicks - 1) % 3) + 1;
3110 selection.clicks = clicks; /* save clicks so extend will work */ 2952 selection.clicks = clicks; /* save clicks so extend will work */
3111 2953
… …
3130 2972
3131/* ------------------------------------------------------------------------- */ 2973/* ------------------------------------------------------------------------- */
3132/* 2974/*
3133 * Mark a selection at the specified col/row 2975 * Mark a selection at the specified col/row
3134 */ 2976 */
3135void 2977void ecb_cold
3136rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2978rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3137{ 2979{
3138 want_refresh = 1; 2980 want_refresh = 1;
3139 2981
3140 selection.mark.row = row + view_start; 2982 selection.mark.row = row + view_start;
… …
3167/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3009/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3168#define DELIMIT_TEXT(x) \ 3010#define DELIMIT_TEXT(x) \
3169 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3011 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3170#define DELIMIT_REND(x) 1 3012#define DELIMIT_REND(x) 1
3171 3013
3172void 3014void ecb_cold
3173rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3015rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3174{ 3016{
3175 int col, row, dirnadd, tcol, trow, w1, w2; 3017 int col, row, dirnadd, tcol, trow, w1, w2;
3176 row_col_t bound; 3018 row_col_t bound;
3177 text_t *stp; 3019 text_t *stp;
… …
3251 * EXT: button 3 press; button 1 or 3 drag 3093 * EXT: button 3 press; button 1 or 3 drag
3252 * flag == 0 ==> button 1 3094 * flag == 0 ==> button 1
3253 * flag == 1 ==> button 3 press 3095 * flag == 1 ==> button 3 press
3254 * flag == 2 ==> button 3 motion 3096 * flag == 2 ==> button 3 motion
3255 */ 3097 */
3256void 3098void ecb_cold
3257rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3099rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3258{ 3100{
3259 int col = clamp (Pixel2Col (x), 0, ncol); 3101 int col = clamp (Pixel2Col (x), 0, ncol);
3260 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3102 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3261 3103
… …
3287 3129
3288/* ------------------------------------------------------------------------- */ 3130/* ------------------------------------------------------------------------- */
3289/* 3131/*
3290 * Extend the selection to the specified col/row 3132 * Extend the selection to the specified col/row
3291 */ 3133 */
3292void 3134void ecb_cold
3293rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3135rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3294{ 3136{
3295 row_col_t pos; 3137 row_col_t pos;
3296 enum { 3138 enum {
3297 LEFT, RIGHT 3139 LEFT, RIGHT
… …
3488 ::swap (selection.beg.col, selection.end.col); 3330 ::swap (selection.beg.col, selection.end.col);
3489#endif 3331#endif
3490} 3332}
3491 3333
3492#if !ENABLE_MINIMAL 3334#if !ENABLE_MINIMAL
3493void 3335void ecb_cold
3494rxvt_term::selection_remove_trailing_spaces () NOTHROW 3336rxvt_term::selection_remove_trailing_spaces () NOTHROW
3495{ 3337{
3496 int32_t end_col, end_row; 3338 int32_t end_col, end_row;
3497 text_t *stp; 3339 text_t *stp;
3498 3340
… …
3536/* ------------------------------------------------------------------------- */ 3378/* ------------------------------------------------------------------------- */
3537/* 3379/*
3538 * Double click on button 3 when already selected 3380 * Double click on button 3 when already selected
3539 * EXT: button 3 double click 3381 * EXT: button 3 double click
3540 */ 3382 */
3541void 3383void ecb_cold
3542rxvt_term::selection_rotate (int x, int y) NOTHROW 3384rxvt_term::selection_rotate (int x, int y) NOTHROW
3543{ 3385{
3544 selection.clicks = selection.clicks % 3 + 1; 3386 selection.clicks = selection.clicks % 3 + 1;
3545 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3387 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3546} 3388}
… …
3548/* ------------------------------------------------------------------------- */ 3390/* ------------------------------------------------------------------------- */
3549/* 3391/*
3550 * Respond to a request for our current selection 3392 * Respond to a request for our current selection
3551 * EXT: SelectionRequest 3393 * EXT: SelectionRequest
3552 */ 3394 */
3553void 3395void ecb_cold
3554rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3396rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3555{ 3397{
3398 Atom property = rq.property == None ? rq.target : rq.property;
3556 XSelectionEvent ev; 3399 XSelectionEvent ev;
3557 3400
3558 ev.type = SelectionNotify; 3401 ev.type = SelectionNotify;
3559 ev.property = None; 3402 ev.property = None;
3560 ev.display = rq.display; 3403 ev.display = rq.display;
… …
3575 *target++ = xa[XA_COMPOUND_TEXT]; 3418 *target++ = xa[XA_COMPOUND_TEXT];
3576#if X_HAVE_UTF8_STRING 3419#if X_HAVE_UTF8_STRING
3577 *target++ = xa[XA_UTF8_STRING]; 3420 *target++ = xa[XA_UTF8_STRING];
3578#endif 3421#endif
3579 3422
3580 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3423 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3581 32, PropModeReplace, 3424 32, PropModeReplace,
3582 (unsigned char *)target_list, target - target_list); 3425 (unsigned char *)target_list, target - target_list);
3583 ev.property = rq.property; 3426 ev.property = property;
3584 } 3427 }
3585#if TODO // TODO 3428#if TODO // TODO
3586 else if (rq.target == xa[XA_MULTIPLE]) 3429 else if (rq.target == xa[XA_MULTIPLE])
3587 { 3430 {
3588 /* TODO: Handle MULTIPLE */ 3431 /* TODO: Handle MULTIPLE */
3589 } 3432 }
3590#endif 3433#endif
3591 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3434 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3592 { 3435 {
3593 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3436 XChangeProperty (dpy, rq.requestor, property, rq.target,
3594 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3437 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3595 ev.property = rq.property; 3438 ev.property = property;
3439 }
3440 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3441 {
3442 XChangeProperty (dpy, rq.requestor, property, rq.target,
3443 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3444 ev.property = property;
3596 } 3445 }
3597 else if (rq.target == XA_STRING 3446 else if (rq.target == XA_STRING
3598 || rq.target == xa[XA_TEXT] 3447 || rq.target == xa[XA_TEXT]
3599 || rq.target == xa[XA_COMPOUND_TEXT] 3448 || rq.target == xa[XA_COMPOUND_TEXT]
3600 || rq.target == xa[XA_UTF8_STRING] 3449 || rq.target == xa[XA_UTF8_STRING]
… …
3632 { 3481 {
3633 target = xa[XA_COMPOUND_TEXT]; 3482 target = xa[XA_COMPOUND_TEXT];
3634 style = enc_compound_text; 3483 style = enc_compound_text;
3635 } 3484 }
3636 3485
3637 if (selection.text) 3486 if (rq.selection == XA_PRIMARY && selection.text)
3638 { 3487 {
3639 cl = selection.text; 3488 cl = selection.text;
3640 selectlen = selection.len; 3489 selectlen = selection.len;
3490 }
3491 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3492 {
3493 cl = selection.clip_text;
3494 selectlen = selection.clip_len;
3641 } 3495 }
3642 else 3496 else
3643 { 3497 {
3644 cl = L""; 3498 cl = L"";
3645 selectlen = 0; 3499 selectlen = 0;
… …
3666 ct.value = (unsigned char *)cl; 3520 ct.value = (unsigned char *)cl;
3667 ct.nitems = selectlen; 3521 ct.nitems = selectlen;
3668 ct.encoding = target; 3522 ct.encoding = target;
3669 } 3523 }
3670 3524
3671 XChangeProperty (dpy, rq.requestor, rq.property, 3525 XChangeProperty (dpy, rq.requestor, property,
3672 ct.encoding, 8, PropModeReplace, 3526 ct.encoding, 8, PropModeReplace,
3673 ct.value, (int)ct.nitems); 3527 ct.value, (int)ct.nitems);
3674 ev.property = rq.property; 3528 ev.property = property;
3675 3529
3676 if (freect) 3530 if (freect)
3677 XFree (ct.value); 3531 XFree (ct.value);
3678 } 3532 }
3679 3533
3680 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3534 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3681} 3535}
3682 3536
3683/* ------------------------------------------------------------------------- */ 3537/* ------------------------------------------------------------------------- */
3684#ifdef USE_XIM 3538#if USE_XIM
3685void 3539void ecb_cold
3686rxvt_term::im_set_position (XPoint &pos) NOTHROW 3540rxvt_term::im_set_position (XPoint &pos) NOTHROW
3687{ 3541{
3688 XWindowAttributes xwa; 3542 XWindowAttributes xwa;
3689 3543
3690 XGetWindowAttributes (dpy, vt, &xwa); 3544 XGetWindowAttributes (dpy, vt, &xwa);
… …
3713 h += 2; min_it (h, nrow); 3567 h += 2; min_it (h, nrow);
3714 3568
3715 x -= 1; clamp_it (x, 0, ncol - w); 3569 x -= 1; clamp_it (x, 0, ncol - w);
3716 y -= 1; clamp_it (y, 0, nrow - h); 3570 y -= 1; clamp_it (y, 0, nrow - h);
3717 3571
3718 ov_x = x; ov_y = y; 3572 ov.x = x; ov.y = y;
3719 ov_w = w; ov_h = h; 3573 ov.w = w; ov.h = h;
3720 3574
3721 ov_text = new text_t *[h]; 3575 ov.text = new text_t *[h];
3722 ov_rend = new rend_t *[h]; 3576 ov.rend = new rend_t *[h];
3723 3577
3724 for (y = 0; y < h; y++) 3578 for (y = 0; y < h; y++)
3725 { 3579 {
3726 text_t *tp = ov_text[y] = new text_t[w]; 3580 text_t *tp = ov.text[y] = new text_t[w];
3727 rend_t *rp = ov_rend[y] = new rend_t[w]; 3581 rend_t *rp = ov.rend[y] = new rend_t[w];
3728 3582
3729 text_t t0, t1, t2; 3583 text_t t0, t1, t2;
3730 rend_t r = OVERLAY_RSTYLE; 3584 rend_t r = OVERLAY_RSTYLE;
3731 3585
3732 if (y == 0) 3586 if (y == 0)
… …
3751} 3605}
3752 3606
3753void 3607void
3754rxvt_term::scr_overlay_off () NOTHROW 3608rxvt_term::scr_overlay_off () NOTHROW
3755{ 3609{
3756 if (!ov_text) 3610 if (!ov.text)
3757 return; 3611 return;
3758 3612
3759 want_refresh = 1; 3613 want_refresh = 1;
3760 3614
3761 for (int y = 0; y < ov_h; y++) 3615 for (int y = 0; y < ov.h; y++)
3762 { 3616 {
3763 delete [] ov_text[y]; 3617 delete [] ov.text[y];
3764 delete [] ov_rend[y]; 3618 delete [] ov.rend[y];
3765 } 3619 }
3766 3620
3767 delete [] ov_text; ov_text = 0; 3621 delete [] ov.text; ov.text = 0;
3768 delete [] ov_rend; ov_rend = 0; 3622 delete [] ov.rend; ov.rend = 0;
3769} 3623}
3770 3624
3771void 3625void
3772rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3626rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3773{ 3627{
3774 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3628 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3775 return; 3629 return;
3776 3630
3777 x++, y++; 3631 x++, y++;
3778 3632
3779 ov_text[y][x] = text; 3633 ov.text[y][x] = text;
3780 ov_rend[y][x] = rend; 3634 ov.rend[y][x] = rend;
3781} 3635}
3782 3636
3783void 3637void
3784rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3638rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3785{ 3639{
… …
3804} 3658}
3805 3659
3806void 3660void
3807rxvt_term::scr_swap_overlay () NOTHROW 3661rxvt_term::scr_swap_overlay () NOTHROW
3808{ 3662{
3809 if (!ov_text) 3663 if (!ov.text)
3810 return; 3664 return;
3811 3665
3666 // hide cursor if it is within the overlay area
3667 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3668 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3669 screen.flags &= ~Screen_VisibleCursor;
3670
3812 // swap screen mem with overlay 3671 // swap screen mem with overlay
3813 for (int y = ov_h; y--; ) 3672 for (int y = ov.h; y--; )
3814 { 3673 {
3815 text_t *t1 = ov_text[y]; 3674 text_t *t1 = ov.text[y];
3816 rend_t *r1 = ov_rend[y]; 3675 rend_t *r1 = ov.rend[y];
3817 3676
3818 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3677 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3819 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3678 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3820 3679
3821 for (int x = ov_w; x--; ) 3680 for (int x = ov.w; x--; )
3822 { 3681 {
3823 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3682 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3824 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3683 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3825 } 3684 }
3826 } 3685 }

Diff Legend

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