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

Diff Legend

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