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.289 by root, Fri Dec 14 05:25:26 2007 UTC vs.
Revision 1.426 by sf-exg, Tue Oct 2 10:29:12 2012 UTC

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

Diff Legend

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