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.303 by ayin, Sat Feb 16 13:35:45 2008 UTC vs.
Revision 1.442 by sf-exg, Sat Mar 30 08:47:06 2013 UTC

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

Diff Legend

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