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.217 by root, Mon Jan 9 19:01:56 2006 UTC vs.
Revision 1.463 by root, Sat Jul 3 04:04:13 2021 UTC

1/*--------------------------------*-C-*--------------------------------------* 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-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
26 27
27#include "../config.h" /* NECESSARY */ 28#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 30#include "rxvtperl.h" /* NECESSARY */
30 31
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 32#include <inttypes.h>
34 33
35#include "salloc.C" // HACK, should be a seperate compile! 34static inline void
36
37inline void fill_text (text_t *start, text_t value, int len) 35fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
43/* ------------------------------------------------------------------------- */ 41/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 256*1024
45#define PASTE_SIZE 32768
46#define TABSIZE 8 /* default tab size */ 42#define TABSIZE 8 /* default tab size */
47 43
48/* ------------------------------------------------------------------------- * 44/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 45 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 46 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 47#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 48 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 49 view_start = 0
54#define CLEAR_SELECTION() \ 50#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 51 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 52 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 53#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 81 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 82#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 84
89/* 85/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 86 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 87 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 88#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 89 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 90 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 91 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 92 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 93
114/* ------------------------------------------------------------------------- * 94/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 95 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 96 * ------------------------------------------------------------------------- */
117 97
118/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
119void 99void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 100rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const noexcept
121{ 101{
122 if (!l.t) 102 if (!l.valid ())
123 { 103 {
124 lalloc (l); 104 l.alloc ();
125 col = 0; 105 col = 0;
126 width = ncol; 106 width = ncol;
127 } 107 }
128 108
129 l.touch (); 109 l.touch ();
130 110
131 efs &= ~RS_baseattrMask; 111 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 112 efs = SET_FONT (efs, FONTSET (efs)->find_space_font ());
133 113
134 text_t *et = l.t + col; 114 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 115 rend_t *er = l.r + col;
136 116
137 while (width--) 117 while (width--)
… …
142} 122}
143 123
144/* ------------------------------------------------------------------------- */ 124/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 125/* Fill a full line with blanks - make sure it is allocated first */
146void 126void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 127rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const noexcept
148{ 128{
149 scr_blank_line (l, 0, ncol, efs); 129 scr_blank_line (l, 0, ncol, efs);
150 130
151 l.l = 0; 131 l.l = 0;
152 l.f = 0; 132 l.f = 0;
133}
134
135// nuke a single wide character at the given column
136void
137rxvt_term::scr_kill_char (line_t &l, int col) const noexcept
138{
139 // find begin
140 while (col > 0 && l.t[col] == NOCHAR)
141 col--;
142
143 rend_t rend = l.r[col] & ~RS_baseattrMask;
144 rend = SET_FONT (rend, FONTSET (rend)->find_space_font ());
145
146 l.touch ();
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
154}
155
156// set the rendition of a single wide character beginning at the given column
157void
158rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
159{
160 do {
161 l.r[col] = rend;
162 col++;
163 } while (col < ncol && l.t[col] == NOCHAR);
153} 164}
154 165
155/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
158 169
159void 170void
171rxvt_term::scr_alloc () noexcept
172{
173 int tsize = sizeof (text_t) * ncol;
174 int rsize = sizeof (rend_t) * ncol;
175
176 // we assume that rend_t size is a sufficient alignment
177 // factor for text_t and line_t values, and we only
178 // need to adjust tsize.
179 tsize = (tsize + sizeof (rend_t) - 1);
180 tsize -= tsize % sizeof (rend_t);
181
182 int all_rows = total_rows + nrow + nrow;
183
184 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
185 chunk = chunk_alloc (chunk_size, 0);
186
187 char *base = (char *)chunk + sizeof (line_t) * all_rows;
188
189 for (int row = 0; row < all_rows; ++row)
190 {
191 line_t &l = ((line_t *)chunk) [row];
192
193 l.t = (text_t *)base; base += tsize;
194 l.r = (rend_t *)base; base += rsize;
195 l.l = -1;
196 l.f = 0;
197 }
198
199 drawn_buf = (line_t *)chunk;
200 swap_buf = drawn_buf + nrow;
201 row_buf = swap_buf + nrow;
202}
203
204void
205rxvt_term::copy_line (line_t &dst, line_t &src)
206{
207 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
208 dst.l = min (src.l, ncol);
209 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
210 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
211 dst.f = src.f;
212}
213
214void ecb_cold
160rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
161{ 216{
162#if ENABLE_OVERLAY 217#if ENABLE_OVERLAY
163 scr_overlay_off (); 218 scr_overlay_off ();
164#endif 219#endif
… …
174 229
175 if (ncol == prev_ncol && nrow == prev_nrow) 230 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 231 return;
177 232
178 // we need at least two lines for wrapping to work correctly 233 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 234 while (nrow + saveLines < 2)
180 { 235 {
181 //TODO//FIXME 236 //TODO//FIXME
182 saveLines++; 237 saveLines++;
183 prev_nrow--; 238 prev_nrow--;
184 nsaved++; 239 top_row--;
185 } 240 }
186 241
187 want_refresh = 1; 242 want_refresh = 1;
188 243
189 int prev_total_rows = prev_nrow + saveLines; 244 int prev_total_rows = prev_nrow + saveLines;
190 total_rows = nrow + saveLines; 245 total_rows = nrow + saveLines;
191 246
192 screen.tscroll = 0; 247 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
194 249
250 void *prev_chunk = chunk;
251 size_t prev_chunk_size = chunk_size;
252 line_t *prev_drawn_buf = drawn_buf;
253 line_t *prev_swap_buf = swap_buf;
254 line_t *prev_row_buf = row_buf;
255
256 scr_alloc ();
257
195 if (!row_buf) 258 if (!prev_row_buf)
196 { 259 {
197 /* 260 top_row = 0;
198 * first time called so just malloc everything: don't rely on realloc
199 */
200 nsaved = 0; /* no saved lines */
201 term_start = 0; 261 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 262
217 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 265 screen.flags = Screen_DefaultFlags;
220 screen.cur.row = screen.cur.col = 0; 266 screen.cur.row = screen.cur.col = 0;
… …
234 selection.text = NULL; 280 selection.text = NULL;
235 selection.len = 0; 281 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 282 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 283 selection.screen = PRIMARY;
238 selection.clicks = 0; 284 selection.clicks = 0;
239 CLEAR_ALL_SELECTION (); 285 selection.clip_text = NULL;
240 rvideo = 0; 286 selection.clip_len = 0;
241 } 287 }
242 else 288 else
243 { 289 {
244 /* 290 /*
245 * add or delete rows as appropriate 291 * add or delete rows as appropriate
246 */ 292 */
247 293
248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 294 int common_col = min (prev_ncol, ncol);
249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250
251#if 0
252 if (nrow < prev_nrow)
253 {
254 for (int row = nrow; row < prev_nrow; row++)
255 {
256 lfree (swap_buf [row]);
257 lfree (drawn_buf[row]);
258 }
259 }
260#endif
261
262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264 295
265 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
266 { 297 {
267 lresize (drawn_buf[row]);
268 lresize (swap_buf [row]);
269 }
270
271 for (int row = prev_nrow; row < nrow; row++)
272 {
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
275 } 299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
276 301
277 line_t *old_buf = row_buf; 302 copy_line (swap_buf [row], prev_swap_buf [row]);
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 303 }
304
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 305 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start - nsaved , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
283 308
284 if (nsaved) 309 if ((rewrap_always || top_row) && !rewrap_never)
285 { 310 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb 311 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 312 // to come up with a lean and mean algorithm.
313 // TODO: maybe optimise when width didn't change
288 314
289 row_col_t ocur = screen.cur; 315 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 316 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 317
292 do 318 do
293 { 319 {
294 p = MOD (p - 1, prev_total_rows); 320 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 321 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 322 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 323 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
300 324
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 325 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 { 326 {
303 p = MOD (p - 1, prev_total_rows); 327 p = MOD (p - 1, prev_total_rows);
304 328
305 plines++; 329 plines++;
306 llen += prev_ncol; 330 llen += prev_ncol;
… …
319 343
320 // re-assemble the full line by destination lines 344 // re-assemble the full line by destination lines
321 for (int qrow = q; qlines--; qrow++) 345 for (int qrow = q; qlines--; qrow++)
322 { 346 {
323 qline = row_buf + qrow; 347 qline = row_buf + qrow;
324 lalloc (*qline); 348 qline->alloc (); // redundant with next line
325 qline->l = ncol; 349 qline->l = ncol;
326 qline->is_longer (1); 350 qline->is_longer (1);
327 351
328 int qcol = 0; 352 int qcol = 0;
353
354 // see below for cursor adjustment rationale
355 if (p == ocur.row)
356 screen.cur.row = q - (total_rows - nrow);
329 357
330 // fill a single destination line 358 // fill a single destination line
331 while (lofs < llen && qcol < ncol) 359 while (lofs < llen && qcol < ncol)
332 { 360 {
333 int prow = lofs / prev_ncol; 361 int prow = lofs / prev_ncol;
… …
340 // this seems to upset applications/shells/readline 368 // this seems to upset applications/shells/readline
341 // least. 369 // least.
342 if (prow == ocur.row) 370 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow); 371 screen.cur.row = q - (total_rows - nrow);
344 372
345 line_t &pline = old_buf [prow]; 373 line_t &pline = prev_row_buf [prow];
346 374
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 375 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348
349 assert (len);
350 assert (pline.t);
351 376
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 377 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 378 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354 379
355 lofs += len; 380 lofs += len;
… …
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 387 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
363 } 388 }
364 while (p != pend && q > 0); 389 while (p != pend && q > 0);
365 390
366 term_start = total_rows - nrow; 391 term_start = total_rows - nrow;
367 nsaved = term_start - q; 392 top_row = q - term_start;
368 393
369 // make sure all terminal lines exist 394 // make sure all terminal lines exist
370 while (nsaved < 0) 395 while (top_row > 0)
371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 396 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 } 397 }
373 else 398 else
374 { 399 {
375 // if no scrollback exists (yet), wing, instead of wrap 400 // if no scrollback exists (yet), wing, instead of wrap
376 401
377 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
378 { 403 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 404 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row]; 405 line_t &dst = row_buf [row];
381 406
382 qline = pline; 407 copy_line (dst, src);
383 lresize (qline);
384 } 408 }
385 409
386 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390 412
391 term_start = 0; 413 term_start = 0;
392 } 414 }
393
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = -nsaved; i < nrow; i++)
396 assert (ROW (i).t);
397#endif
398
399 free (old_buf);
400 delete old_ta;
401 delete old_ra;
402 415
403 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
418 }
405 419
406 if (tabs) 420 for (int row = nrow; row--; )
421 {
422 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
423 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
424 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
425 }
426
427 chunk_free (prev_chunk, prev_chunk_size);
428
407 free (tabs); 429 free (tabs);
408 } 430 tabs = (char *)rxvt_malloc (ncol);
431
432 for (int col = ncol; col--; )
433 tabs [col] = col % TABSIZE == 0;
434
435 CLEAR_ALL_SELECTION ();
409 436
410 prev_nrow = nrow; 437 prev_nrow = nrow;
411 prev_ncol = ncol; 438 prev_ncol = ncol;
412 439
413 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
414
415 for (int col = ncol; col--; )
416 tabs [col] = col % TABSIZE == 0;
417
418 tt_winch (); 440 tt_winch ();
419 441
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 443}
422 444
423/* ------------------------------------------------------------------------- */ 445void ecb_cold
424/*
425 * Free everything. That way malloc debugging can find leakage.
426 */
427void
428rxvt_term::scr_release () 446rxvt_term::scr_release () noexcept
429{ 447{
430 delete talloc; talloc = 0; 448 chunk_free (chunk, chunk_size);
431 delete ralloc; ralloc = 0; 449 chunk = 0;
450 row_buf = 0;
432 451
433 free (row_buf);
434 free (swap_buf);
435 free (drawn_buf);
436 free (tabs); 452 free (tabs);
437 453 tabs = 0;
438 row_buf = 0; // signal that we freed all the arrays
439} 454}
440 455
441/* ------------------------------------------------------------------------- */ 456/* ------------------------------------------------------------------------- */
442/* 457/*
443 * Hard reset 458 * Hard/Soft reset
444 */ 459 */
445void 460void ecb_cold
446rxvt_term::scr_poweron () 461rxvt_term::scr_poweron ()
447{ 462{
448 scr_release (); 463 scr_release ();
464
449 prev_nrow = prev_ncol = 0; 465 prev_nrow = prev_ncol = 0;
466 rvideo_mode = false;
467 scr_soft_reset ();
450 scr_reset (); 468 scr_reset ();
451 469
452 scr_clear (true); 470 scr_clear (true);
453 scr_refresh (SLOW_REFRESH); 471 scr_refresh ();
472}
473
474void ecb_cold
475rxvt_term::scr_soft_reset () noexcept
476{
477 /* only affects modes, nothing drastic such as clearing the screen */
478#if ENABLE_OVERLAY
479 scr_overlay_off ();
480#endif
481
482 if (current_screen != PRIMARY)
483 scr_swap_screen ();
484
485 scr_scroll_region (0, MAX_ROWS - 1);
486 scr_rendition (0, ~RS_None);
487 scr_insert_mode (0);
454} 488}
455 489
456/* ------------------------------------------------------------------------- * 490/* ------------------------------------------------------------------------- *
457 * PROCESS SCREEN COMMANDS * 491 * PROCESS SCREEN COMMANDS *
458 * ------------------------------------------------------------------------- */ 492 * ------------------------------------------------------------------------- */
… …
460 * Save and Restore cursor 494 * Save and Restore cursor
461 * XTERM_SEQ: Save cursor : ESC 7 495 * XTERM_SEQ: Save cursor : ESC 7
462 * XTERM_SEQ: Restore cursor: ESC 8 496 * XTERM_SEQ: Restore cursor: ESC 8
463 */ 497 */
464void 498void
465rxvt_term::scr_cursor (int mode) 499rxvt_term::scr_cursor (cursor_mode mode) noexcept
466{ 500{
467 screen_t *s; 501 screen_t *s;
468 502
469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 503#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
470 if (current_screen == SECONDARY) 504 if (current_screen == SECONDARY)
… …
496 } 530 }
497 531
498 /* boundary check in case screen size changed between SAVE and RESTORE */ 532 /* boundary check in case screen size changed between SAVE and RESTORE */
499 min_it (s->cur.row, nrow - 1); 533 min_it (s->cur.row, nrow - 1);
500 min_it (s->cur.col, ncol - 1); 534 min_it (s->cur.col, ncol - 1);
501#ifdef DEBUG_STRICT
502 assert (s->cur.row >= 0); 535 assert (s->cur.row >= 0);
503 assert (s->cur.col >= 0); 536 assert (s->cur.col >= 0);
504#endif 537}
538
539void
540rxvt_term::scr_swap_screen () noexcept
541{
542 if (!option (Opt_secondaryScreen))
543 return;
544
545 for (int i = prev_nrow; i--; )
546 ::swap (ROW(i), swap_buf [i]);
547
548 ::swap (screen.cur, swap.cur);
549
550 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
551 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
505} 552}
506 553
507/* ------------------------------------------------------------------------- */ 554/* ------------------------------------------------------------------------- */
508/* 555/*
509 * Swap between primary and secondary screens 556 * Swap between primary and secondary screens
510 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 557 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 558 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
512 */ 559 */
513int 560void
514rxvt_term::scr_change_screen (int scrn) 561rxvt_term::scr_change_screen (int scrn)
515{ 562{
563 if (scrn == current_screen)
564 return;
565
516 want_refresh = 1; 566 want_refresh = 1;
517 view_start = 0; 567 view_start = 0;
518 568
569 /* check for boundary cross */
570 row_col_t pos;
571 pos.row = pos.col = 0;
572 if (ROWCOL_IS_BEFORE (selection.beg, pos)
573 && ROWCOL_IS_AFTER (selection.end, pos))
574 CLEAR_SELECTION ();
575
519 if (current_screen == scrn) 576 current_screen = scrn;
520 return scrn;
521
522 selection_check (2); /* check for boundary cross */
523
524 int i = current_screen; current_screen = scrn; scrn = i;
525
526 ::swap (screen.cur.row, swap.cur.row);
527 ::swap (screen.cur.col, swap.cur.col);
528
529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
531 577
532#if NSCREENS 578#if NSCREENS
533 if (OPTION (Opt_secondaryScreen)) 579 if (option (Opt_secondaryScreen))
534 { 580 {
535 num_scr = 0; 581 num_scr = 0;
536 582
537 for (int i = prev_nrow; i--; ) 583 scr_swap_screen ();
538 ::swap (ROW(i), swap_buf [i]);
539 584
540 ::swap (screen.charset, swap.charset); 585 ::swap (screen.charset, swap.charset);
541 ::swap (screen.flags, swap.flags); 586 ::swap (screen.flags, swap.flags);
542 screen.flags |= Screen_VisibleCursor; 587 screen.flags |= Screen_VisibleCursor;
543 swap.flags |= Screen_VisibleCursor; 588 swap.flags |= Screen_VisibleCursor;
544 } 589 }
545 else 590 else
546#endif 591#endif
547 if (OPTION (Opt_secondaryScroll)) 592 if (option (Opt_secondaryScroll))
548 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 593 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
549
550 return scrn;
551} 594}
552 595
553// clear WrapNext indicator, solidifying position on next line 596// clear WrapNext indicator, solidifying position on next line
554void 597void
555rxvt_term::scr_do_wrap () 598rxvt_term::scr_do_wrap () noexcept
556{ 599{
557 if (!(screen.flags & Screen_WrapNext)) 600 if (!(screen.flags & Screen_WrapNext))
558 return; 601 return;
559 602
560 screen.flags &= ~Screen_WrapNext; 603 screen.flags &= ~Screen_WrapNext;
… …
570/* ------------------------------------------------------------------------- */ 613/* ------------------------------------------------------------------------- */
571/* 614/*
572 * Change the colour for following text 615 * Change the colour for following text
573 */ 616 */
574void 617void
575rxvt_term::scr_color (unsigned int color, int fgbg) 618rxvt_term::scr_color (unsigned int color, int fgbg) noexcept
576{ 619{
577 if (color > maxTermCOLOR) 620 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
578 color = fgbg; 621 color = fgbg;
579 622
580 if (fgbg == Color_fg) 623 if (fgbg == Color_fg)
581 rstyle = SET_FGCOLOR (rstyle, color); 624 rstyle = SET_FGCOLOR (rstyle, color);
582 else 625 else
… …
586/* ------------------------------------------------------------------------- */ 629/* ------------------------------------------------------------------------- */
587/* 630/*
588 * Change the rendition style for following text 631 * Change the rendition style for following text
589 */ 632 */
590void 633void
591rxvt_term::scr_rendition (int set, int style) 634rxvt_term::scr_rendition (int set, int style) noexcept
592 { 635{
593 if (set) 636 if (set)
594 rstyle |= style; 637 rstyle |= style;
595 else if (style == ~RS_None) 638 else if (style == ~RS_None)
596 rstyle = DEFAULT_RSTYLE; 639 rstyle = DEFAULT_RSTYLE;
597 else 640 else
598 rstyle &= ~style; 641 rstyle &= ~style;
599 } 642}
600 643
601/* ------------------------------------------------------------------------- */ 644/* ------------------------------------------------------------------------- */
602/* 645/*
603 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
604 * count positive ==> scroll up 647 * count positive ==> scroll up
605 * count negative ==> scroll down 648 * count negative ==> scroll down
606 */ 649 */
607int 650int ecb_hot
608rxvt_term::scr_scroll_text (int row1, int row2, int count) 651rxvt_term::scr_scroll_text (int row1, int row2, int count) noexcept
609{ 652{
610 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
611 return 0; 654 return 0;
612 655
613 want_refresh = 1; 656 want_refresh = 1;
614 num_scr += count; 657 num_scr += count;
615 658
616 if (count > 0 659 if (count > 0
617 && row1 == 0 660 && row1 == 0
618 && row2 == nrow - 1
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 661 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
620 { 662 {
621 nsaved = min (nsaved + count, saveLines); 663 min_it (count, total_rows - (nrow - (row2 + 1)));
622 664
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 665 top_row = max (top_row - count, -saveLines);
666
667 // sever bottommost line
624 668 {
669 line_t &l = ROW(row2);
670 l.is_longer (0);
671 l.touch ();
672 }
673
674 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 675 term_start = (term_start + count) % total_rows;
626 676
677 // now copy lines below the scroll region bottom to the
678 // bottom of the screen again, so they look as if they
679 // hadn't moved.
680 for (int i = nrow; --i > row2; )
681 {
682 line_t &l1 = ROW(i - count);
683 line_t &l2 = ROW(i);
684
685 ::swap (l1, l2);
686 l2.touch ();
687 }
688
689 // erase newly scrolled-in lines
690 for (int i = count; i--; )
691 {
692 line_t &l = ROW(row2 - i);
693
694 // optimise if already cleared, can be significant on slow machines
695 // could be rolled into scr_blank_screen_mem
696 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
697 {
698 scr_blank_line (l, 0, l.l, rstyle);
699 l.l = 0;
700 l.f = 0;
701 }
702 else
703 scr_blank_screen_mem (l, rstyle);
704 }
705
706 // move and/or clear selection, if any
627 if (selection.op && current_screen == selection.screen) 707 if (selection.op && current_screen == selection.screen
708 && selection.beg.row <= row2)
628 { 709 {
629 selection.beg.row -= count; 710 selection.beg.row -= count;
630 selection.end.row -= count; 711 selection.end.row -= count;
631 selection.mark.row -= count; 712 selection.mark.row -= count;
632 713
633 if (selection.beg.row < -nsaved 714 selection_check (0);
634 || selection.end.row < -nsaved
635 || selection.mark.row < -nsaved)
636 {
637 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR;
639 }
640 }
641
642 for (int i = count; i--; )
643 { 715 }
644 // basically thi is a slightly optimized scr_blank_screen_mem
645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647 716
648 scr_blank_line (l, 0, l.l, rstyle); 717 // finally move the view window, if desired
649
650 l.l = 0;
651 l.f = 0;
652 }
653
654 if (OPTION (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
655 && view_start != 0 719 && view_start != 0
656 && view_start != saveLines) 720 && view_start != -saveLines)
657 scr_page (UP, count); 721 scr_page (count);
722
723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
724 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
658 } 725 }
659 else 726 else
660 { 727 {
661 if (selection.op && current_screen == selection.screen) 728 if (selection.op && current_screen == selection.screen)
662 { 729 {
… …
674 { 741 {
675 /* move selected region too */ 742 /* move selected region too */
676 selection.beg.row -= count; 743 selection.beg.row -= count;
677 selection.end.row -= count; 744 selection.end.row -= count;
678 selection.mark.row -= count; 745 selection.mark.row -= count;
679 746
680 selection_check (0); 747 selection_check (0);
681 } 748 }
682 } 749 }
683 750
684 // use a simple and robust scrolling algorithm, this 751 // use a simple and robust scrolling algorithm, this
685 // part of scr_scroll_text is not time-critical. 752 // part of scr_scroll_text is not time-critical.
686 753
754 // sever line above scroll region
755 if (row1)
756 {
757 line_t &l = ROW(row1 - 1);
758 l.is_longer (0);
759 l.touch ();
760 }
761
687 int rows = row2 - row1 + 1; 762 int rows = row2 - row1 + 1;
688 763
689 min_it (count, rows); 764 min_it (count, rows);
690 765
691 line_t *temp_buf = row_buf + total_rows; 766 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
692 767
693 for (int row = 0; row < rows; row++) 768 for (int row = 0; row < rows; row++)
694 { 769 {
695 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 770 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
696 771
… …
698 scr_blank_screen_mem (temp_buf [row], rstyle); 773 scr_blank_screen_mem (temp_buf [row], rstyle);
699 } 774 }
700 775
701 for (int row = 0; row < rows; row++) 776 for (int row = 0; row < rows; row++)
702 ROW(row1 + row) = temp_buf [row]; 777 ROW(row1 + row) = temp_buf [row];
778
779 // sever bottommost line
780 {
781 line_t &l = ROW(row2);
782 l.is_longer (0);
783 l.touch ();
784 }
703 } 785 }
704 786
705 return count; 787 return count;
706} 788}
707 789
708/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
709/* 791/*
710 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
711 */ 793 */
712void 794void ecb_hot
713rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 795rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) noexcept
714{ 796{
715 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
716 return; 798 return;
717 799
718 unsigned char checksel; 800 bool checksel;
719 unicode_t c; 801 unicode_t c;
720 int ncol = this->ncol; 802 int ncol = this->ncol;
721 const wchar_t *strend = str + len; 803 const wchar_t *strend = str + len;
722 804
723 want_refresh = 1; 805 want_refresh = 1;
724 ZERO_SCROLLBACK (); 806 ZERO_SCROLLBACK ();
725 807
726 if (minlines > 0) 808 if (minlines > 0)
727 { 809 {
728 minlines += screen.cur.row - screen.bscroll; 810 minlines += screen.cur.row - screen.bscroll;
811 min_it (minlines, screen.cur.row - top_row);
729 812
730 if (minlines > 0 813 if (minlines > 0
731 && screen.tscroll == 0 814 && screen.tscroll == 0
732 && screen.bscroll == nrow - 1) 815 && screen.bscroll == nrow - 1)
733 { 816 {
… …
735 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 818 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
736 screen.cur.row -= minlines; 819 screen.cur.row -= minlines;
737 } 820 }
738 } 821 }
739 822
740#ifdef DEBUG_STRICT
741 assert (screen.cur.col < ncol); 823 assert (screen.cur.col < ncol);
742 assert (screen.cur.row < nrow 824 assert (screen.cur.row < nrow
743 && screen.cur.row >= -nsaved); 825 && screen.cur.row >= top_row);
744#endif
745 int row = screen.cur.row; 826 int row = screen.cur.row;
746 827
747 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 828 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
748 829
749 line_t *line = &ROW(row); 830 line_t *line = &ROW(row);
750 831
751 while (str < strend) 832 while (str < strend)
752 { 833 {
753 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 834 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
754 835
755 if (c < 0x20) 836 if (ecb_unlikely (c < 0x20))
756 if (c == C0_LF) 837 if (c == C0_LF)
757 { 838 {
758 max_it (line->l, screen.cur.col); 839 max_it (line->l, screen.cur.col);
759 840
760 screen.flags &= ~Screen_WrapNext; 841 screen.flags &= ~Screen_WrapNext;
… …
779 { 860 {
780 scr_tab (1, true); 861 scr_tab (1, true);
781 continue; 862 continue;
782 } 863 }
783 864
865 if (ecb_unlikely (
784 if (checksel /* see if we're writing within selection */ 866 checksel /* see if we're writing within selection */
785 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 867 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
786 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 868 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
869 ))
787 { 870 {
788 checksel = 0; 871 checksel = 0;
789 /* 872 /*
790 * If we wrote anywhere in the selected area, kill the selection 873 * If we wrote anywhere in the selected area, kill the selection
791 * XXX: should we kill the mark too? Possibly, but maybe that 874 * XXX: should we kill the mark too? Possibly, but maybe that
792 * should be a similar check. 875 * should be a similar check.
793 */ 876 */
794 CLEAR_SELECTION (); 877 CLEAR_SELECTION ();
795 } 878 }
796 879
797 if (screen.flags & Screen_WrapNext) 880 if (ecb_unlikely (screen.flags & Screen_WrapNext))
798 { 881 {
882 scr_do_wrap ();
883
799 max_it (line->l, ncol); 884 line->l = ncol;
800 line->is_longer (1); 885 line->is_longer (1);
801 886
802 scr_do_wrap ();
803
804 row = screen.cur.row; 887 row = screen.cur.row;
805 line = &ROW(row); /* _must_ refresh */ 888 line = &ROW(row); /* _must_ refresh */
806 } 889 }
807 890
808 // some utf-8 decoders "decode" surrogate characters: let's fix this. 891 // some utf-8 decoders "decode" surrogate characters: let's fix this.
809 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 892 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
810 c = 0xfffd; 893 c = 0xfffd;
811 894
812 // rely on wcwidth to tell us the character width, at least for non-latin1 895 // rely on wcwidth to tell us the character width, do wcwidth before
813 // do wcwidth before further replacements, as wcwidth might return -1 896 // further replacements, as wcwidth might return -1 for the line
814 // for the line drawing characters below as they might be invalid in the current 897 // drawing characters below as they might be invalid in the current
815 // locale. 898 // locale.
816 int width = c < 0x100 ? 1 : wcwidth (c); 899 int width = WCWIDTH (c);
817 900
818 if (charsets [screen.charset] == '0') // DEC SPECIAL 901 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
819 { 902 {
820 // vt100 special graphics and line drawing 903 // vt100 special graphics and line drawing
821 // 5f-7e standard vt100 904 // 5f-7e standard vt100
822 // 40-5e rxvt extension for extra curses acs chars 905 // 40-5e rxvt extension for extra curses acs chars
823 static uint16_t vt100_0[62] = { // 41 .. 7e 906 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
836 c = vt100_0[c - 0x41]; 919 c = vt100_0[c - 0x41];
837 width = 1; // vt100 line drawing characters are always single-width 920 width = 1; // vt100 line drawing characters are always single-width
838 } 921 }
839 } 922 }
840 923
841 if (screen.flags & Screen_Insert) 924 if (ecb_unlikely (screen.flags & Screen_Insert))
842 scr_insdel_chars (width, INSERT); 925 scr_insdel_chars (width, INSERT);
843 926
844 if (width != 0) 927 if (width != 0)
845 { 928 {
846#if !UNICODE_3 929#if !UNICODE_3
… …
851# else 934# else
852 c = 0xfffd; 935 c = 0xfffd;
853# endif 936# endif
854#endif 937#endif
855 938
939 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
940
941 // if the character doesn't fit into the remaining columns...
942 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
943 {
944 if (screen.flags & Screen_Autowrap)
945 {
946 // ... artificially enlargen the previous one
947 c = NOCHAR;
948 // and try the same character next loop iteration
949 --str;
950 }
951 else
952 screen.cur.col = ncol - width;
953 }
954
856 // nuke the character at this position, if required 955 // nuke the character at this position, if required
956 // due to wonderful coincidences everywhere else in this loop
957 // we never have to check for overwriting a wide char itself,
958 // only its tail.
857 if (line->t[screen.cur.col] == NOCHAR 959 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
858 || (screen.cur.col < ncol - 1 960 scr_kill_char (*line, screen.cur.col);
859 && line->t[screen.cur.col + 1] == NOCHAR))
860 {
861 int col = screen.cur.col;
862
863 // find begin
864 while (col > 0 && line->t[col] == NOCHAR)
865 col--;
866
867 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
868
869 // found begin, nuke
870 do {
871 line->t[col] = ' ';
872 line->r[col] = rend;
873 col++;
874 } while (col < ncol && line->t[col] == NOCHAR);
875 }
876
877 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
878
879 // if the character doesn't fit into the remaining columns...
880 if (screen.cur.col > ncol - width && ncol >= width)
881 {
882 // ...output spaces
883 c = ' ';
884 // and try the same character next loop iteration
885 --str;
886 }
887 961
888 line->touch (); 962 line->touch ();
889 963
890 do 964 do
891 { 965 {
892 line->t[screen.cur.col] = c; 966 line->t[screen.cur.col] = c;
893 line->r[screen.cur.col] = rend; 967 line->r[screen.cur.col] = rend;
894 968
895 if (screen.cur.col < ncol - 1) 969 if (ecb_likely (screen.cur.col < ncol - 1))
896 screen.cur.col++; 970 screen.cur.col++;
897 else 971 else
898 { 972 {
899 line->l = ncol; 973 line->l = ncol;
900 if (screen.flags & Screen_Autowrap) 974 if (screen.flags & Screen_Autowrap)
901 screen.flags |= Screen_WrapNext; 975 screen.flags |= Screen_WrapNext;
902 break; 976
977 goto end_of_line;
903 } 978 }
904 979
905 c = NOCHAR; 980 c = NOCHAR;
906 } 981 }
907 while (--width > 0); 982 while (ecb_unlikely (--width > 0));
908 983
909 // pad with spaces when overwriting wide character with smaller one 984 // pad with spaces when overwriting wide character with smaller one
910 if (!width) 985 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
911 { 986 {
912 line->touch (); 987 line->t[c] = ' ';
988 line->r[c] = rend;
989 }
913 990
914 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 991end_of_line:
992 ;
993 }
994#if ENABLE_COMBINING
995 else // width == 0
996 {
997 if (c != 0xfeff) // ignore BOM
998 {
999 // handle combining characters
1000 // we just tag the accent on the previous on-screen character.
1001 // this is arguably not correct, but also arguably not wrong.
1002 // we don't handle double-width characters nicely yet.
1003 line_t *linep;
1004 text_t *tp;
1005 rend_t *rp;
1006
1007 if (screen.cur.col > 0)
915 { 1008 {
916 line->t[c] = ' ';
917 line->r[c] = rend; 1009 linep = line;
1010 tp = line->t + screen.cur.col - 1;
1011 rp = line->r + screen.cur.col - 1;
918 } 1012 }
1013 else if (screen.cur.row > 0
1014 && ROW(screen.cur.row - 1).is_longer ())
1015 {
1016 linep = &ROW(screen.cur.row - 1);
1017 tp = linep->t + ncol - 1;
1018 rp = linep->r + ncol - 1;
1019 }
1020 else
1021 continue;
1022
1023 linep->touch ();
1024
1025 while (*tp == NOCHAR && tp > linep->t)
1026 tp--, rp--;
1027
1028 // first try to find a precomposed character
1029 unicode_t n = rxvt_compose (*tp, c);
1030 if (n == NOCHAR)
1031 n = rxvt_composite.compose (*tp, c);
1032
1033 *tp = n;
1034 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
919 } 1035 }
920 } 1036 }
921 else // width == 0
922 {
923#if ENABLE_COMBINING
924 // handle combining characters
925 // we just tag the accent on the previous on-screen character.
926 // this is arguably not correct, but also arguably not wrong.
927 // we don't handle double-width characters nicely yet.
928 line_t *linep;
929 text_t *tp;
930 rend_t *rp;
931
932 if (screen.cur.col > 0)
933 {
934 linep = line;
935 tp = line->t + screen.cur.col - 1;
936 rp = line->r + screen.cur.col - 1;
937 }
938 else if (screen.cur.row > 0
939 && ROW(screen.cur.row - 1).is_longer ())
940 {
941 linep = &ROW(screen.cur.row - 1);
942 tp = line->t + ncol - 1;
943 rp = line->r + ncol - 1;
944 }
945 else
946 continue;
947
948 linep->touch ();
949
950 while (*tp == NOCHAR && tp > linep->t)
951 tp--, rp--;
952
953 // first try to find a precomposed character
954 unicode_t n = rxvt_compose (*tp, c);
955 if (n == NOCHAR)
956 n = rxvt_composite.compose (*tp, c);
957
958 *tp = n;
959 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
960#endif 1037#endif
961 }
962 } 1038 }
963 1039
964 max_it (line->l, screen.cur.col); 1040 max_it (line->l, screen.cur.col);
965 1041
966#ifdef DEBUG_STRICT
967 assert (screen.cur.row >= 0); 1042 assert (screen.cur.row >= 0);
968#endif
969} 1043}
970 1044
971/* ------------------------------------------------------------------------- */ 1045/* ------------------------------------------------------------------------- */
972/* 1046/*
973 * Process Backspace. Move back the cursor back a position, wrap if have to 1047 * Process Backspace. Move back the cursor back a position, wrap if have to
974 * XTERM_SEQ: CTRL-H 1048 * XTERM_SEQ: CTRL-H
975 */ 1049 */
976void 1050void
977rxvt_term::scr_backspace () 1051rxvt_term::scr_backspace () noexcept
978{ 1052{
979 want_refresh = 1;
980
981 if (screen.cur.col == 0) 1053 if (screen.cur.col == 0)
982 { 1054 {
983 if (screen.cur.row > 0) 1055 if (screen.cur.row > 0)
984 { 1056 {
985#ifdef TERMCAP_HAS_BW 1057#ifdef TERMCAP_HAS_BW
986 screen.cur.col = ncol - 1; 1058 screen.cur.col = ncol - 1;
987 screen.cur.row--; 1059 --screen.cur.row;
988 return; 1060
1061 want_refresh = 1;
989#endif 1062#endif
990 } 1063 }
991 } 1064 }
992 else if (!(screen.flags & Screen_WrapNext)) 1065 else if (screen.flags & Screen_WrapNext)
1066 screen.flags &= ~Screen_WrapNext;
1067 else
993 scr_gotorc (0, -1, RELATIVE); 1068 scr_gotorc (0, -1, RELATIVE);
994
995 screen.flags &= ~Screen_WrapNext;
996} 1069}
997 1070
998/* ------------------------------------------------------------------------- */ 1071/* ------------------------------------------------------------------------- */
999/* 1072/*
1000 * Process Horizontal Tab 1073 * Process Horizontal Tab
1001 * count: +ve = forward; -ve = backwards 1074 * count: +ve = forward; -ve = backwards
1002 * XTERM_SEQ: CTRL-I 1075 * XTERM_SEQ: CTRL-I
1003 */ 1076 */
1004void 1077void
1005rxvt_term::scr_tab (int count, bool ht) 1078rxvt_term::scr_tab (int count, bool ht) noexcept
1006{ 1079{
1007 int i, x; 1080 int i, x;
1008 1081
1009 want_refresh = 1; 1082 want_refresh = 1;
1010 i = x = screen.cur.col; 1083 i = x = screen.cur.col;
… …
1023 x = i; 1096 x = i;
1024 1097
1025 if (!--count) 1098 if (!--count)
1026 break; 1099 break;
1027 } 1100 }
1028 else 1101 else
1029 ht &= l.t[i] == ' ' 1102 ht &= l.t[i] == ' '
1030 && RS_SAME (l.r[i], base_rend); 1103 && RS_SAME (l.r[i], base_rend);
1031 1104
1032 if (count) 1105 if (count)
1033 x = ncol - 1; 1106 x = ncol - 1;
1034 1107
1035 // store horizontal tab commands as characters inside the text 1108 // store horizontal tab commands as characters inside the text
1036 // buffer so they can be selected and pasted. 1109 // buffer so they can be selected and pasted.
1037 if (ht && OPTION (Opt_pastableTabs)) 1110 if (ht && option (Opt_pastableTabs))
1038 { 1111 {
1039 base_rend = SET_FONT (base_rend, 0); 1112 base_rend = SET_FONT (base_rend, 0);
1040 1113
1041 l.touch (x); 1114 l.touch (x);
1042 1115
… …
1075 * Process DEC Back Index 1148 * Process DEC Back Index
1076 * XTERM_SEQ: ESC 6 1149 * XTERM_SEQ: ESC 6
1077 * Move cursor left in row. If we're at the left boundary, shift everything 1150 * Move cursor left in row. If we're at the left boundary, shift everything
1078 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1079 */ 1152 */
1080#if ENABLE_FRILLS 1153#if !ENABLE_MINIMAL
1081void 1154void ecb_cold
1082rxvt_term::scr_backindex () 1155rxvt_term::scr_backindex () noexcept
1083{ 1156{
1084 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1085 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1086 else 1159 else
1087 scr_insdel_chars (1, INSERT); 1160 scr_insdel_chars (1, INSERT);
… …
1092 * Process DEC Forward Index 1165 * Process DEC Forward Index
1093 * XTERM_SEQ: ESC 9 1166 * XTERM_SEQ: ESC 9
1094 * Move cursor right in row. If we're at the right boundary, shift everything 1167 * Move cursor right in row. If we're at the right boundary, shift everything
1095 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1096 */ 1169 */
1097#if ENABLE_FRILLS 1170#if !ENABLE_MINIMAL
1098void 1171void ecb_cold
1099rxvt_term::scr_forwardindex () 1172rxvt_term::scr_forwardindex () noexcept
1100{ 1173{
1101 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1102 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1103 else 1176 else
1104 { 1177 {
… …
1117/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1118/* 1191/*
1119 * Goto Row/Column 1192 * Goto Row/Column
1120 */ 1193 */
1121void 1194void
1122rxvt_term::scr_gotorc (int row, int col, int relative) 1195rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1123{ 1196{
1124 want_refresh = 1; 1197 want_refresh = 1;
1125 ZERO_SCROLLBACK (); 1198 ZERO_SCROLLBACK ();
1126 1199
1127 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1200 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1149 } 1222 }
1150 } 1223 }
1151 else 1224 else
1152 { 1225 {
1153 if (screen.flags & Screen_Relative) 1226 if (screen.flags & Screen_Relative)
1227 {
1154 { /* relative origin mode */ 1228 /* relative origin mode */
1155 screen.cur.row = row + screen.tscroll; 1229 screen.cur.row = row + screen.tscroll;
1156 min_it (screen.cur.row, screen.bscroll); 1230 min_it (screen.cur.row, screen.bscroll);
1157 } 1231 }
1158 else 1232 else
1159 screen.cur.row = row; 1233 screen.cur.row = row;
… …
1165/* ------------------------------------------------------------------------- */ 1239/* ------------------------------------------------------------------------- */
1166/* 1240/*
1167 * direction should be UP or DN 1241 * direction should be UP or DN
1168 */ 1242 */
1169void 1243void
1170rxvt_term::scr_index (enum page_dirn direction) 1244rxvt_term::scr_index (enum page_dirn direction) noexcept
1171{ 1245{
1172 int dirn;
1173
1174 want_refresh = 1; 1246 want_refresh = 1;
1175 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1176 1248
1177 dirn = ((direction == UP) ? 1 : -1);
1178
1179 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1180 1250
1181 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1182 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1183 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1184 else 1254 else
1185 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1186 1256
1187 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1188 selection_check (0); 1258 selection_check (0);
1189} 1259}
1190 1260
… …
1192/* 1262/*
1193 * Erase part or whole of a line 1263 * Erase part or whole of a line
1194 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1264 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1195 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1265 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1196 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1266 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1267 * extension: clear to right unless wrapped: ESC [ 3 K
1197 */ 1268 */
1198void 1269void
1199rxvt_term::scr_erase_line (int mode) 1270rxvt_term::scr_erase_line (int mode) noexcept
1200{ 1271{
1201 unsigned int col, num; 1272 unsigned int col, num;
1202 1273
1203 want_refresh = 1; 1274 want_refresh = 1;
1204 ZERO_SCROLLBACK (); 1275 ZERO_SCROLLBACK ();
… …
1210 line.touch (); 1281 line.touch ();
1211 line.is_longer (0); 1282 line.is_longer (0);
1212 1283
1213 switch (mode) 1284 switch (mode)
1214 { 1285 {
1286 case 3:
1287 if (screen.flags & Screen_WrapNext)
1288 return;
1289
1290 /* fall through */
1291
1215 case 0: /* erase to end of line */ 1292 case 0: /* erase to end of line */
1216 col = screen.cur.col; 1293 col = screen.cur.col;
1217 num = ncol - col; 1294 num = ncol - col;
1218 min_it (line.l, col); 1295 min_it (line.l, col);
1296
1219 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1297 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1220 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1298 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1221 CLEAR_SELECTION (); 1299 CLEAR_SELECTION ();
1222 break; 1300 break;
1301
1223 case 1: /* erase to beginning of line */ 1302 case 1: /* erase to beginning of line */
1224 col = 0; 1303 col = 0;
1225 num = screen.cur.col + 1; 1304 num = screen.cur.col + 1;
1305
1226 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1306 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1227 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1307 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1228 CLEAR_SELECTION (); 1308 CLEAR_SELECTION ();
1229 break; 1309 break;
1310
1230 case 2: /* erase whole line */ 1311 case 2: /* erase whole line */
1231 col = 0; 1312 col = 0;
1232 num = ncol; 1313 num = ncol;
1233 line.l = 0; 1314 line.l = 0;
1234 if (selection.beg.row <= screen.cur.row 1315 if (selection.beg.row <= screen.cur.row
… …
1242 scr_blank_line (line, col, num, rstyle); 1323 scr_blank_line (line, col, num, rstyle);
1243} 1324}
1244 1325
1245/* ------------------------------------------------------------------------- */ 1326/* ------------------------------------------------------------------------- */
1246/* 1327/*
1247 * Erase part of whole of the screen 1328 * Erase part or whole of the screen
1248 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1249 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1250 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1251 */ 1332 */
1252void 1333void
1253rxvt_term::scr_erase_screen (int mode) 1334rxvt_term::scr_erase_screen (int mode) noexcept
1254{ 1335{
1255 int num; 1336 int num;
1256 int32_t row; 1337 int32_t row;
1257 rend_t ren; 1338 rend_t ren;
1258 XGCValues gcvalue; 1339 XGCValues gcvalue;
… …
1261 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1262 1343
1263 switch (mode) 1344 switch (mode)
1264 { 1345 {
1265 case 0: /* erase to end of screen */ 1346 case 0: /* erase to end of screen */
1266 selection_check (1);
1267 scr_erase_line (0); 1347 scr_erase_line (0);
1268 row = screen.cur.row + 1; /* possible OOB */ 1348 row = screen.cur.row + 1; /* possible OOB */
1269 num = nrow - row; 1349 num = nrow - row;
1270 break; 1350 break;
1271 case 1: /* erase to beginning of screen */ 1351 case 1: /* erase to beginning of screen */
1272 selection_check (3);
1273 scr_erase_line (1); 1352 scr_erase_line (1);
1274 row = 0; 1353 row = 0;
1275 num = screen.cur.row; 1354 num = screen.cur.row;
1276 break; 1355 break;
1277 case 2: /* erase whole screen */ 1356 case 2: /* erase whole screen */
1278 selection_check (3);
1279 row = 0; 1357 row = 0;
1280 num = nrow; 1358 num = nrow;
1281 break; 1359 break;
1282 default: 1360 default:
1283 return; 1361 return;
… …
1292 if (row >= nrow) /* Out Of Bounds */ 1370 if (row >= nrow) /* Out Of Bounds */
1293 return; 1371 return;
1294 1372
1295 min_it (num, nrow - row); 1373 min_it (num, nrow - row);
1296 1374
1297 if (rstyle & (RS_RVid | RS_Uline)) 1375 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1298 ren = (rend_t) ~RS_None; 1376 ren = (rend_t) ~RS_None;
1299 else if (GET_BASEBG (rstyle) == Color_bg) 1377 else if (GET_BASEBG (rstyle) == Color_bg)
1300 { 1378 {
1301 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1302 CLEAR_ROWS (row, num); 1380
1381 if (mapped)
1382 XClearArea (dpy, vt, 0,
1383 Row2Pixel (row - view_start), (unsigned int)vt_width,
1384 (unsigned int)Height2Pixel (num), False);
1303 } 1385 }
1304 else 1386 else
1305 { 1387 {
1306 ren = rstyle & (RS_fgMask | RS_bgMask); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
1389
1390 if (mapped)
1391 {
1307 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1392 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1308 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1309 ERASE_ROWS (row, num); 1394 XFillRectangle (dpy, vt, gc,
1395 0, Row2Pixel (row - view_start),
1396 (unsigned int)vt_width,
1397 (unsigned int)Height2Pixel (num));
1310 gcvalue.foreground = pix_colors[Color_fg]; 1398 gcvalue.foreground = pix_colors[Color_fg];
1311 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1400 }
1312 } 1401 }
1313 1402
1314 for (; num--; row++) 1403 for (; num--; row++)
1315 { 1404 {
1316 scr_blank_screen_mem (ROW(row), rstyle); 1405 scr_blank_screen_mem (ROW(row), rstyle);
1406
1407 if (row - view_start < nrow)
1317 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1408 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1318 } 1409 }
1319} 1410}
1320 1411
1321#if ENABLE_FRILLS 1412#if !ENABLE_MINIMAL
1322void 1413void
1323rxvt_term::scr_erase_savelines () 1414rxvt_term::scr_erase_savelines () noexcept
1324{ 1415{
1325 want_refresh = 1; 1416 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1417 ZERO_SCROLLBACK ();
1327 1418
1328 nsaved = 0; 1419 top_row = 0;
1329} 1420}
1330#endif 1421#endif
1331 1422
1332/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1333/* 1424/*
1334 * Fill the screen with `E's 1425 * Fill the screen with `E's
1335 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1336 */ 1427 */
1337void 1428void ecb_cold
1338rxvt_term::scr_E () 1429rxvt_term::scr_E () noexcept
1339{ 1430{
1340 rend_t fs; 1431 rend_t fs;
1341 1432
1342 want_refresh = 1; 1433 want_refresh = 1;
1343 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
1344 1435
1345 num_scr_allow = 0; 1436 num_scr_allow = 0;
1346 selection_check (3); 1437
1438 row_col_t pos;
1439 pos.row = pos.col = 0;
1440 if (ROWCOL_IS_AFTER (selection.end, pos))
1441 CLEAR_SELECTION ();
1347 1442
1348 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1443 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1349 for (int row = nrow; row--; ) 1444 for (int row = nrow; row--; )
1350 { 1445 {
1351 line_t &line = ROW(row); 1446 line_t &line = ROW(row);
… …
1364/* ------------------------------------------------------------------------- */ 1459/* ------------------------------------------------------------------------- */
1365/* 1460/*
1366 * Insert/Delete <count> lines 1461 * Insert/Delete <count> lines
1367 */ 1462 */
1368void 1463void
1369rxvt_term::scr_insdel_lines (int count, int insdel) 1464rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1370{ 1465{
1371 int end; 1466 int end;
1372 1467
1373 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1374 1469
… …
1394/* ------------------------------------------------------------------------- */ 1489/* ------------------------------------------------------------------------- */
1395/* 1490/*
1396 * Insert/Delete <count> characters from the current position 1491 * Insert/Delete <count> characters from the current position
1397 */ 1492 */
1398void 1493void
1399rxvt_term::scr_insdel_chars (int count, int insdel) 1494rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1400{ 1495{
1401 int col, row;
1402 rend_t tr;
1403
1404 want_refresh = 1; 1496 want_refresh = 1;
1405 ZERO_SCROLLBACK (); 1497 ZERO_SCROLLBACK ();
1406 1498
1407 if (count <= 0) 1499 if (count <= 0)
1408 return; 1500 return;
… …
1410 scr_do_wrap (); 1502 scr_do_wrap ();
1411 1503
1412 selection_check (1); 1504 selection_check (1);
1413 min_it (count, ncol - screen.cur.col); 1505 min_it (count, ncol - screen.cur.col);
1414 1506
1415 row = screen.cur.row; 1507 int row = screen.cur.row;
1416 1508
1417 line_t *line = &ROW(row); 1509 line_t *line = &ROW(row);
1418 1510
1419 line->touch (); 1511 line->touch ();
1420 line->is_longer (0); 1512 line->is_longer (0);
1421 1513
1514 // nuke wide spanning the start
1515 if (line->t[screen.cur.col] == NOCHAR)
1516 scr_kill_char (*line, screen.cur.col);
1517
1422 switch (insdel) 1518 switch (insdel)
1423 { 1519 {
1424 case INSERT: 1520 case INSERT:
1425 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1521 line->l = min (line->l + count, ncol);
1522
1523 if (line->t[screen.cur.col] == NOCHAR)
1524 scr_kill_char (*line, screen.cur.col);
1525
1526 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1426 { 1527 {
1427 line->t[col] = line->t[col - count]; 1528 line->t[col] = line->t[col - count];
1428 line->r[col] = line->r[col - count]; 1529 line->r[col] = line->r[col - count];
1429 } 1530 }
1430
1431 line->l = min (line->l + count, ncol);
1432 1531
1433 if (selection.op && current_screen == selection.screen 1532 if (selection.op && current_screen == selection.screen
1434 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1533 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1435 { 1534 {
1436 if (selection.end.row != screen.cur.row 1535 if (selection.end.row != screen.cur.row
1437 || (selection.end.col + count >= ncol)) 1536 || (selection.end.col + count >= ncol))
1438 CLEAR_SELECTION (); 1537 CLEAR_SELECTION ();
1439 else 1538 else
1539 {
1440 { /* shift selection */ 1540 /* shift selection */
1441 selection.beg.col += count; 1541 selection.beg.col += count;
1442 selection.mark.col += count; /* XXX: yes? */ 1542 selection.mark.col += count; /* XXX: yes? */
1443 selection.end.col += count; 1543 selection.end.col += count;
1444 } 1544 }
1445 } 1545 }
… …
1450 case ERASE: 1550 case ERASE:
1451 screen.cur.col += count; /* don't worry if > ncol */ 1551 screen.cur.col += count; /* don't worry if > ncol */
1452 selection_check (1); 1552 selection_check (1);
1453 screen.cur.col -= count; 1553 screen.cur.col -= count;
1454 1554
1455 line->l = max (line->l - count, 0); 1555 // nuke wide char after the end
1556 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1557 scr_kill_char (*line, screen.cur.col + count);
1558
1456 scr_blank_line (*line, screen.cur.col, count, rstyle); 1559 scr_blank_line (*line, screen.cur.col, count, rstyle);
1457 break; 1560 break;
1458 1561
1459 case DELETE: 1562 case DELETE:
1460 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1563 line->l = max (line->l - count, 0);
1461 1564
1565 // nuke wide char spanning the end
1566 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1567 scr_kill_char (*line, screen.cur.col + count);
1568
1462 for (col = screen.cur.col; (col + count) < ncol; col++) 1569 for (int col = screen.cur.col; (col + count) < ncol; col++)
1463 { 1570 {
1464 line->t[col] = line->t[col + count]; 1571 line->t[col] = line->t[col + count];
1465 line->r[col] = line->r[col + count]; 1572 line->r[col] = line->r[col + count];
1466 } 1573 }
1467 1574
1468 line->l = max (line->l - count, 0);
1469 scr_blank_line (*line, ncol - count, count, tr); 1575 scr_blank_line (*line, ncol - count, count, rstyle);
1470 1576
1471 if (selection.op && current_screen == selection.screen 1577 if (selection.op && current_screen == selection.screen
1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1578 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1473 { 1579 {
1474 if (selection.end.row != screen.cur.row 1580 if (selection.end.row != screen.cur.row
… …
1491/* ------------------------------------------------------------------------- */ 1597/* ------------------------------------------------------------------------- */
1492/* 1598/*
1493 * Set the scrolling region 1599 * Set the scrolling region
1494 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1495 */ 1601 */
1496void 1602void ecb_cold
1497rxvt_term::scr_scroll_region (int top, int bot) 1603rxvt_term::scr_scroll_region (int top, int bot) noexcept
1498{ 1604{
1499 max_it (top, 0); 1605 max_it (top, 0);
1500 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1501 1607
1502 if (top > bot) 1608 if (top > bot)
… …
1511/* 1617/*
1512 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1513 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1514 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1515 */ 1621 */
1516void 1622void ecb_cold
1517rxvt_term::scr_cursor_visible (int mode) 1623rxvt_term::scr_cursor_visible (int mode) noexcept
1518{ 1624{
1519 want_refresh = 1; 1625 want_refresh = 1;
1520 1626
1521 if (mode) 1627 if (mode)
1522 screen.flags |= Screen_VisibleCursor; 1628 screen.flags |= Screen_VisibleCursor;
… …
1528/* 1634/*
1529 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1530 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1531 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1532 */ 1638 */
1533void 1639void ecb_cold
1534rxvt_term::scr_autowrap (int mode) 1640rxvt_term::scr_autowrap (int mode) noexcept
1535{ 1641{
1536 if (mode) 1642 if (mode)
1537 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1538 else 1644 else
1539 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1645 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1547 * Relative mode: line numbers are relative to top margin of scrolling region 1653 * Relative mode: line numbers are relative to top margin of scrolling region
1548 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1549 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1550 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1551 */ 1657 */
1552void 1658void ecb_cold
1553rxvt_term::scr_relative_origin (int mode) 1659rxvt_term::scr_relative_origin (int mode) noexcept
1554{ 1660{
1555 if (mode) 1661 if (mode)
1556 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1557 else 1663 else
1558 screen.flags &= ~Screen_Relative; 1664 screen.flags &= ~Screen_Relative;
… …
1564/* 1670/*
1565 * Set insert/replace mode 1671 * Set insert/replace mode
1566 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1567 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1568 */ 1674 */
1569void 1675void ecb_cold
1570rxvt_term::scr_insert_mode (int mode) 1676rxvt_term::scr_insert_mode (int mode) noexcept
1571{ 1677{
1572 if (mode) 1678 if (mode)
1573 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1574 else 1680 else
1575 screen.flags &= ~Screen_Insert; 1681 screen.flags &= ~Screen_Insert;
… …
1580 * Set/Unset tabs 1686 * Set/Unset tabs
1581 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1582 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1583 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1584 */ 1690 */
1585void 1691void ecb_cold
1586rxvt_term::scr_set_tab (int mode) 1692rxvt_term::scr_set_tab (int mode) noexcept
1587{ 1693{
1588 if (mode < 0) 1694 if (mode < 0)
1589 memset (tabs, 0, ncol * sizeof (char)); 1695 memset (tabs, 0, ncol);
1590 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
1591 tabs [screen.cur.col] = !!mode; 1697 tabs [screen.cur.col] = !!mode;
1592} 1698}
1593 1699
1594/* ------------------------------------------------------------------------- */ 1700/* ------------------------------------------------------------------------- */
… …
1596 * Set reverse/normal video 1702 * Set reverse/normal video
1597 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1703 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1598 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1704 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1599 */ 1705 */
1600void 1706void
1601rxvt_term::scr_rvideo_mode (int mode) 1707rxvt_term::scr_rvideo_mode (bool on) noexcept
1602{ 1708{
1603 XGCValues gcvalue; 1709 rvideo_mode = on;
1604 1710
1711#ifndef NO_BELL
1712 on ^= rvideo_bell;
1713#endif
1714
1605 if (rvideo != mode) 1715 if (rvideo_state != on)
1606 { 1716 {
1607 rvideo = mode; 1717 rvideo_state = on;
1718
1719#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade])
1721 {
1722 ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
1723 ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
1724 }
1725 else
1726#endif
1608 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1727 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1609#if XPM_BACKGROUND 1728#ifdef HAVE_IMG
1610 if (bgPixmap.pixmap == None) 1729 if (bg_img == 0)
1611#endif 1730#endif
1612#if TRANSPARENT 1731 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1613 if (! OPTION (Opt_transparent) || am_transparent == 0)
1614#endif
1615 XSetWindowBackground (display->display, vt,
1616 pix_colors[Color_bg]);
1617 1732
1733 XGCValues gcvalue;
1618 gcvalue.foreground = pix_colors[Color_fg]; 1734 gcvalue.foreground = pix_colors[Color_fg];
1619 gcvalue.background = pix_colors[Color_bg]; 1735 gcvalue.background = pix_colors[Color_bg];
1620 XChangeGC (display->display, gc, GCBackground | GCForeground, 1736 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1621 &gcvalue); 1737
1622 scr_clear (); 1738 scr_clear ();
1623 scr_touch (true); 1739 scr_touch (true);
1624 } 1740 }
1625} 1741}
1626 1742
1627/* ------------------------------------------------------------------------- */ 1743/* ------------------------------------------------------------------------- */
1628/* 1744/*
1629 * Report current cursor position 1745 * Report current cursor position
1630 * XTERM_SEQ: Report position: ESC [ 6 n 1746 * XTERM_SEQ: Report position: ESC [ 6 n
1631 */ 1747 */
1632void 1748void ecb_cold
1633rxvt_term::scr_report_position () 1749rxvt_term::scr_report_position () noexcept
1634{ 1750{
1635 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1751 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1636} 1752}
1637 1753
1638/* ------------------------------------------------------------------------- * 1754/* ------------------------------------------------------------------------- *
… …
1640 * ------------------------------------------------------------------------- */ 1756 * ------------------------------------------------------------------------- */
1641 1757
1642/* 1758/*
1643 * Set font style 1759 * Set font style
1644 */ 1760 */
1645void 1761void ecb_cold
1646rxvt_term::set_font_style () 1762rxvt_term::set_font_style () noexcept
1647{ 1763{
1648#if 0 1764#if 0
1649 switch (charsets [screen.charset]) 1765 switch (charsets [screen.charset])
1650 { 1766 {
1651 case '0': /* DEC Special Character & Line Drawing Set */ 1767 case '0': /* DEC Special Character & Line Drawing Set */
… …
1672 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1788 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1673 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1789 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1674 * XTERM_SEQ: Invoke G2 character set: ESC N 1790 * XTERM_SEQ: Invoke G2 character set: ESC N
1675 * XTERM_SEQ: Invoke G3 character set: ESC O 1791 * XTERM_SEQ: Invoke G3 character set: ESC O
1676 */ 1792 */
1677void 1793void ecb_cold
1678rxvt_term::scr_charset_choose (int set) 1794rxvt_term::scr_charset_choose (int set) noexcept
1679{ 1795{
1680 screen.charset = set; 1796 screen.charset = set;
1681 set_font_style (); 1797 set_font_style ();
1682} 1798}
1683 1799
… …
1689 * XTERM_SEQ: Set G2 character set: ESC * <C> 1805 * XTERM_SEQ: Set G2 character set: ESC * <C>
1690 * XTERM_SEQ: Set G3 character set: ESC + <C> 1806 * XTERM_SEQ: Set G3 character set: ESC + <C>
1691 * See set_font_style for possible values for <C> 1807 * See set_font_style for possible values for <C>
1692 */ 1808 */
1693void 1809void
1694rxvt_term::scr_charset_set (int set, unsigned int ch) 1810rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1695{ 1811{
1696 charsets[set] = (unsigned char)ch; 1812 charsets[set] = (unsigned char)ch;
1697 set_font_style (); 1813 set_font_style ();
1698} 1814}
1699 1815
… …
1703 * ------------------------------------------------------------------------- */ 1819 * ------------------------------------------------------------------------- */
1704 1820
1705/* 1821/*
1706 * refresh matching text. 1822 * refresh matching text.
1707 */ 1823 */
1708bool 1824bool ecb_cold
1709rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1825rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1710{ 1826{
1711 bool found = false; 1827 bool found = false;
1712 1828
1713 for (int i = 0; i < nrow; i++) 1829 for (int i = 0; i < nrow; i++)
1714 { 1830 {
1715 int col = 0;
1716 rend_t *drp = drawn_buf[i].r; 1831 rend_t *drp = drawn_buf[i].r;
1717 1832
1718 for (; col < ncol; col++, drp++) 1833 for (int col = 0; col < ncol; col++, drp++)
1719 if ((*drp & mask) == value) 1834 if ((*drp & mask) == value)
1720 { 1835 {
1721 found = true; 1836 found = true;
1722 *drp = ~value; 1837 *drp = ~value;
1723 } 1838 }
… …
1733 PART_BEG = 0, 1848 PART_BEG = 0,
1734 PART_END, 1849 PART_END,
1735 RC_COUNT 1850 RC_COUNT
1736}; 1851};
1737 1852
1738void 1853void ecb_hot
1739rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1854rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) noexcept
1740{ 1855{
1741 int i; 1856 int i;
1742 row_col_t rc[RC_COUNT]; 1857 row_col_t rc[RC_COUNT];
1743 1858
1744 if (!drawn_buf) /* sanity check */ 1859 if (!drawn_buf) /* sanity check */
… …
1767 } 1882 }
1768 1883
1769 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1884 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1770 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1885 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1771 1886
1887 num_scr_allow = 0;
1888
1772 if (refresh) 1889 if (refresh)
1773 scr_refresh (SLOW_REFRESH); 1890 scr_refresh ();
1774} 1891}
1775 1892
1776/* ------------------------------------------------------------------------- */ 1893/* ------------------------------------------------------------------------- */
1777/* 1894/*
1778 * Refresh the entire screen 1895 * Refresh the entire screen
1779 */ 1896 */
1780void 1897void
1781rxvt_term::scr_touch (bool refresh) 1898rxvt_term::scr_touch (bool refresh) noexcept
1782{ 1899{
1783 scr_expose (0, 0, width, height, refresh); 1900 scr_expose (0, 0, vt_width, vt_height, refresh);
1784} 1901}
1785 1902
1786/* ------------------------------------------------------------------------- */ 1903/* ------------------------------------------------------------------------- */
1787/* 1904/*
1788 * Move the display so that the line represented by scrollbar value Y is at 1905 * Move the display so that the line represented by scrollbar value Y is at
1789 * the top of the screen 1906 * the top of the screen
1790 */ 1907 */
1791int 1908void
1792rxvt_term::scr_move_to (int y, int len) 1909rxvt_term::scr_move_to (int y, int len) noexcept
1793{ 1910{
1794 long p = 0; 1911 // lerp (y, 0, len, top_row, nrow - 1)
1795 unsigned int oldviewstart; 1912 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1796
1797 oldviewstart = view_start;
1798
1799 if (y < len)
1800 {
1801 p = (nrow + nsaved) * (len - y) / len;
1802 p -= (long) (nrow - 1);
1803 p = max (p, 0);
1804 }
1805
1806 view_start = (unsigned int)min (p, nsaved);
1807
1808 return scr_changeview (oldviewstart);
1809} 1913}
1810 1914
1811/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1812/* 1916/*
1813 * Page the screen up/down nlines 1917 * Page the screen up/down nlines
1814 * direction should be UP or DN 1918 * direction should be UP or DN
1815 */ 1919 */
1816int 1920bool
1817rxvt_term::scr_page (enum page_dirn direction, int nlines) 1921rxvt_term::scr_page (int nlines) noexcept
1818{ 1922{
1819 int n; 1923 return scr_changeview (view_start - nlines);
1820 unsigned int oldviewstart; 1924}
1821 1925
1926bool
1927rxvt_term::scr_changeview (int new_view_start) noexcept
1928{
1929 clamp_it (new_view_start, top_row, 0);
1930
1931 if (new_view_start == view_start)
1932 return false;
1933
1934 num_scr += new_view_start - view_start;
1822 oldviewstart = view_start; 1935 view_start = new_view_start;
1936 want_refresh = 1;
1823 1937
1824 if (direction == UP)
1825 {
1826 n = view_start + nlines;
1827 view_start = min (n, nsaved);
1828 }
1829 else
1830 {
1831 n = view_start - nlines;
1832 view_start = max (n, 0);
1833 }
1834
1835 return scr_changeview (oldviewstart);
1836}
1837
1838int
1839rxvt_term::scr_changeview (unsigned int oldviewstart)
1840{
1841 if (view_start != oldviewstart)
1842 {
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1938 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844 1939
1845 want_refresh = 1; 1940 return true;
1846 num_scr -= (view_start - oldviewstart);
1847 }
1848
1849 return (int)view_start - (int)oldviewstart;
1850} 1941}
1851 1942
1852/* ------------------------------------------------------------------------- */ 1943#ifndef NO_BELL
1853void 1944void
1945rxvt_term::bell_cb (ev::timer &w, int revents)
1946{
1947 rvideo_bell = false;
1948 scr_rvideo_mode (rvideo_mode);
1949 refresh_check ();
1950}
1951#endif
1952
1953/* ------------------------------------------------------------------------- */
1954void
1854rxvt_term::scr_bell () 1955rxvt_term::scr_bell () noexcept
1855{ 1956{
1856#ifndef NO_BELL 1957#ifndef NO_BELL
1857 1958
1858# ifndef NO_MAPALERT 1959# ifndef NO_MAPALERT
1859# ifdef MAPALERT_OPTION 1960# ifdef MAPALERT_OPTION
1860 if (OPTION (Opt_mapAlert)) 1961 if (option (Opt_mapAlert))
1861# endif 1962# endif
1862 XMapWindow (display->display, parent[0]); 1963 XMapWindow (dpy, parent);
1863# endif 1964# endif
1864 1965
1966# if ENABLE_FRILLS
1967 if (option (Opt_urgentOnBell))
1968 set_urgency (1);
1969# endif
1970
1865 if (OPTION (Opt_visualBell)) 1971 if (option (Opt_visualBell))
1866 { 1972 {
1867 scr_rvideo_mode (!rvideo); /* refresh also done */ 1973 rvideo_bell = true;
1974 scr_rvideo_mode (rvideo_mode);
1975 flush ();
1976
1868 rxvt_usleep (VISUAL_BELL_DURATION); 1977 bell_ev.start (VISUAL_BELL_DURATION);
1869 scr_rvideo_mode (!rvideo); /* refresh also done */
1870 } 1978 }
1871 else 1979 else
1872 XBell (display->display, 0); 1980 XBell (dpy, 0);
1873 1981 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1874#endif 1982#endif
1875} 1983}
1876 1984
1877/* ------------------------------------------------------------------------- */ 1985/* ------------------------------------------------------------------------- */
1878/* ARGSUSED */ 1986void ecb_cold
1879void
1880rxvt_term::scr_printscreen (int fullhist) 1987rxvt_term::scr_printscreen (int fullhist) noexcept
1881{ 1988{
1882#ifdef PRINTPIPE 1989#ifdef PRINTPIPE
1883 int nrows, row_start; 1990 int nrows, row_start;
1884 FILE *fd; 1991 FILE *fd = popen_printer ();
1885 1992
1886 if ((fd = popen_printer ()) == NULL) 1993 if (!fd)
1887 return; 1994 return;
1888 1995
1889 if (fullhist) 1996 if (fullhist)
1890 { 1997 {
1891 nrows = nrow + nsaved; 1998 nrows = nrow - top_row;
1892 row_start = -nsaved; 1999 row_start = top_row;
1893 } 2000 }
1894 else 2001 else
1895 { 2002 {
1896 nrows = nrow; 2003 nrows = nrow;
1897 row_start = -view_start; 2004 row_start = view_start;
1898 } 2005 }
1899 2006
1900 wctomb (0, 0); 2007 wctomb (0, 0);
1901 2008
1902 for (int r1 = 0; r1 < nrows; r1++) 2009 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1903 { 2010 {
1904 text_t *tp = ROW(r1).t; 2011 text_t *tp = ROW(r1).t;
1905 int len = ROW(r1).l; 2012 int len = ROW(r1).l;
1906 2013
1907 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2014 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1933/* 2040/*
1934 * Refresh the screen 2041 * Refresh the screen
1935 * drawn_text/drawn_rend contain the screen information before the update. 2042 * drawn_text/drawn_rend contain the screen information before the update.
1936 * screen.text/screen.rend contain what the screen will change to. 2043 * screen.text/screen.rend contain what the screen will change to.
1937 */ 2044 */
1938void 2045void ecb_hot
1939rxvt_term::scr_refresh (unsigned char refresh_type) 2046rxvt_term::scr_refresh () noexcept
1940{ 2047{
1941 unsigned char must_clear, /* use draw_string not draw_image_string */
1942 showcursor; /* show the cursor */
1943 int16_t col, row, /* column/row we're processing */ 2048 int16_t col, row, /* column/row we're processing */
1944 ocrow; /* old cursor row */ 2049 ocrow; /* old cursor row */
1945 int i; /* tmp */ 2050 int i; /* tmp */
1946#ifndef NO_CURSORCOLOR 2051 rend_t ccol1, /* Cursor colour */
1947 rend_t cc1; /* store colours at cursor position (s) */ 2052 ccol2; /* Cursor colour2 */
1948#endif 2053 rend_t cur_rend;
1949 rend_t *crp; // cursor rendition pointer 2054 int cur_col;
2055 int cursorwidth;
1950 2056
1951 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
1952 2058
1953 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
1954 return; 2060 return;
1955 2061
1956 /* 2062 /*
1957 * A: set up vars 2063 * A: set up vars
1958 */ 2064 */
1959 must_clear = 0;
1960 refresh_count = 0; 2065 refresh_count = 0;
1961 2066
1962#if XPM_BACKGROUND 2067 unsigned int old_screen_flags = screen.flags;
1963 must_clear |= bgPixmap.pixmap != None; 2068 bool have_bg = 0;
1964#endif 2069#ifdef HAVE_IMG
1965#if TRANSPARENT 2070 have_bg = bg_img != 0;
1966 must_clear |= OPTION (Opt_transparent) && am_transparent;
1967#endif 2071#endif
1968 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1969 2073
1970 /* 2074 /*
1971 * B: reverse any characters which are selected 2075 * B: reverse any characters which are selected
1972 */ 2076 */
1973 scr_reverse_selection (); 2077 scr_reverse_selection ();
1974 2078
2079 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2080#if ENABLE_OVERLAY
2081 scr_swap_overlay ();
2082#endif
2083
2084 bool showcursor = screen.flags & Screen_VisibleCursor;
2085
1975 /* 2086 /*
1976 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
1977 */ 2088 */
1978 { 2089 {
1979 unsigned char setoldcursor;
1980 rend_t ccol1, /* Cursor colour */
1981 ccol2; /* Cursor colour2 */
1982
1983 showcursor = (screen.flags & Screen_VisibleCursor);
1984#ifdef CURSOR_BLINK 2090#ifdef CURSOR_BLINK
1985 if (hidden_cursor) 2091 if (hidden_cursor)
1986 showcursor = 0; 2092 showcursor = 0;
1987#endif 2093#endif
1988 2094
… …
1991 int col = screen.cur.col; 2097 int col = screen.cur.col;
1992 2098
1993 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2099 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1994 col--; 2100 col--;
1995 2101
2102 cursorwidth = 1;
2103 while (col + cursorwidth < ncol
2104 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2105 cursorwidth++;
2106
1996 crp = &ROW(screen.cur.row).r[col]; 2107 cur_rend = ROW(screen.cur.row).r[col];
2108 cur_col = col;
1997 2109
1998 if (showcursor && focus) 2110#ifndef NO_CURSORCOLOR
2111 if (ISSET_PIXCOLOR (Color_cursor))
2112 ccol1 = Color_cursor;
2113 else
2114#endif
2115#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2116 ccol1 = fgcolor_of (rstyle);
2117#else
2118 ccol1 = Color_fg;
2119#endif
2120
2121#ifndef NO_CURSORCOLOR
2122 if (ISSET_PIXCOLOR (Color_cursor2))
2123 ccol2 = Color_cursor2;
2124 else
2125#endif
2126#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2127 ccol2 = bgcolor_of (rstyle);
2128#else
2129 ccol2 = Color_bg;
2130#endif
2131
2132 if (focus && cursor_type == 0)
1999 { 2133 {
2000 if (OPTION (Opt_cursorUnderline)) 2134 rend_t rend = cur_rend;
2001 *crp ^= RS_Uline; 2135
2002 else
2003 {
2004 *crp ^= RS_RVid; 2136 rend ^= RS_RVid;
2005
2006#ifndef NO_CURSORCOLOR
2007 cc1 = *crp & (RS_fgMask | RS_bgMask);
2008 if (ISSET_PIXCOLOR (Color_cursor))
2009 ccol1 = Color_cursor;
2010 else
2011#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2012 ccol1 = fgcolor_of (rstyle);
2013#else
2014 ccol1 = Color_fg;
2015#endif
2016 if (ISSET_PIXCOLOR (Color_cursor2))
2017 ccol2 = Color_cursor2;
2018 else
2019#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2020 ccol2 = bgcolor_of (rstyle);
2021#else
2022 ccol2 = Color_bg;
2023#endif
2024 *crp = SET_FGCOLOR (*crp, ccol1); 2137 rend = SET_FGCOLOR (rend, ccol1);
2025 *crp = SET_BGCOLOR (*crp, ccol2); 2138 rend = SET_BGCOLOR (rend, ccol2);
2026#endif 2139
2027 } 2140 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2028 } 2141 }
2029 } 2142 }
2030 2143
2031 /* make sure no outline cursor is left around */ 2144 /* make sure no outline cursor is left around */
2032 setoldcursor = 0; 2145 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2033 if (ocrow != -1) 2146 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2147
2148 // save the current cursor coordinates if the cursor is visible
2149 // and either the window is unfocused or the cursor style is
2150 // underline or vertical bar, so as to clear the outline cursor in
2151 // the next refresh if the cursor moves or becomes invisible
2152 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2034 { 2153 {
2035 if (screen.cur.row + view_start != ocrow 2154 oldcursor.row = screen.cur.row - view_start;
2036 || screen.cur.col != oldcursor.col) 2155 oldcursor.col = screen.cur.col;
2037 {
2038 if (ocrow < nrow
2039 && oldcursor.col < ncol)
2040 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2041
2042 if (focus || !showcursor)
2043 oldcursor.row = -1;
2044 else
2045 setoldcursor = 1;
2046 }
2047 } 2156 }
2048 else if (!focus) 2157 else
2049 setoldcursor = 1;
2050
2051 if (setoldcursor)
2052 {
2053 if (screen.cur.row + view_start >= nrow)
2054 oldcursor.row = -1; 2158 oldcursor.row = -1;
2055 else
2056 {
2057 oldcursor.row = screen.cur.row + view_start;
2058 oldcursor.col = screen.cur.col;
2059 }
2060 }
2061 } 2159 }
2062
2063 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2064#if ENABLE_OVERLAY
2065 scr_swap_overlay ();
2066#endif
2067 2160
2068#ifndef NO_SLOW_LINK_SUPPORT 2161#ifndef NO_SLOW_LINK_SUPPORT
2069 /* 2162 /*
2070 * D: CopyArea pass - very useful for slower links 2163 * D: CopyArea pass - very useful for slower links
2071 * This has been deliberately kept simple. 2164 * This has been deliberately kept simple.
2072 */ 2165 */
2073 i = num_scr;
2074 if (!display->is_local 2166 if (!display->is_local
2075 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2167 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2076 && abs (num_scr) < nrow && !must_clear) 2168 && abs (num_scr) < nrow && !have_bg)
2077 { 2169 {
2078 int16_t nits; 2170 int16_t nits;
2171 int i = num_scr;
2079 int j; 2172 int j;
2080 int len, wlen; 2173 int len, wlen;
2081 2174
2082 j = nrow; 2175 j = nrow;
2083 wlen = len = -1; 2176 wlen = len = -1;
2084 row = i > 0 ? 0 : j - 1; 2177 row = i > 0 ? 0 : j - 1;
2178
2085 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2179 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2086 { 2180 {
2087 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2181 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2088 { 2182 {
2089 line_t s = ROW(row - view_start); 2183 line_t s = ROW(view_start + row);
2090 line_t d = drawn_buf[row]; 2184 line_t d = drawn_buf[row];
2091 line_t d2 = drawn_buf[row + i]; 2185 line_t d2 = drawn_buf[row + i];
2092 2186
2093 for (nits = 0, col = ncol; col--; ) 2187 for (nits = 0, col = ncol; col--; )
2094 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2188 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2110 wlen = row; 2204 wlen = row;
2111 continue; 2205 continue;
2112 } 2206 }
2113 } 2207 }
2114 2208
2115 if (len != -1) 2209 if (len >= 0)
2116 { 2210 {
2117 /* also comes here at end if needed because of >= above */ 2211 /* also comes here at end if needed because of >= above */
2118 if (wlen < len) 2212 if (wlen < len)
2119 ::swap (wlen, len); 2213 ::swap (wlen, len);
2120 2214
2215 XGCValues gcv;
2216
2217 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2121 XCopyArea (display->display, vt, vt, 2218 XCopyArea (dpy, vt, vt,
2122 gc, 0, Row2Pixel (len + i), 2219 gc, 0, Row2Pixel (len + i),
2123 (unsigned int)this->width, 2220 (unsigned int)this->width,
2124 (unsigned int)Height2Pixel (wlen - len + 1), 2221 (unsigned int)Height2Pixel (wlen - len + 1),
2125 0, Row2Pixel (len)); 2222 0, Row2Pixel (len));
2223 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2224
2126 len = -1; 2225 len = -1;
2127 } 2226 }
2128 } 2227 }
2129 } 2228 }
2130#endif 2229#endif
… …
2132 /* 2231 /*
2133 * E: main pass across every character 2232 * E: main pass across every character
2134 */ 2233 */
2135 for (row = 0; row < nrow; row++) 2234 for (row = 0; row < nrow; row++)
2136 { 2235 {
2137 text_t *stp = ROW(row - view_start).t; 2236 text_t *stp = ROW(view_start + row).t;
2138 rend_t *srp = ROW(row - view_start).r; 2237 rend_t *srp = ROW(view_start + row).r;
2139 text_t *dtp = drawn_buf[row].t; 2238 text_t *dtp = drawn_buf[row].t;
2140 rend_t *drp = drawn_buf[row].r; 2239 rend_t *drp = drawn_buf[row].r;
2141 2240
2142 /* 2241 /*
2143 * E2: OK, now the real pass 2242 * E2: OK, now the real pass
… …
2145 int ypixel = (int)Row2Pixel (row); 2244 int ypixel = (int)Row2Pixel (row);
2146 2245
2147 for (col = 0; col < ncol; col++) 2246 for (col = 0; col < ncol; col++)
2148 { 2247 {
2149 /* compare new text with old - if exactly the same then continue */ 2248 /* compare new text with old - if exactly the same then continue */
2150 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2249 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2151 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2152 || (stp[col] == ' ' /* space w/ no background change */
2153 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2154 continue; 2250 continue;
2155 2251
2156 // redraw one or more characters 2252 // redraw one or more characters
2157 2253
2158 // seek to the beginning of wide characters 2254 // seek to the beginning of wide characters
2159 while (stp[col] == NOCHAR && col > 0) 2255 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2160 --col; 2256 --col;
2161 2257
2162 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2258 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2163 text_t *text = stp + col; 2259 text_t *text = stp + col;
2164 int count = 1; 2260 int count = 1;
2165 2261
2166 dtp[col] = stp[col]; 2262 dtp[col] = stp[col];
2167 drp[col] = rend; 2263 drp[col] = rend;
… …
2171 for (i = 0; ++col < ncol; ) 2267 for (i = 0; ++col < ncol; )
2172 { 2268 {
2173 if (stp[col] == NOCHAR) 2269 if (stp[col] == NOCHAR)
2174 { 2270 {
2175 dtp[col] = stp[col]; 2271 dtp[col] = stp[col];
2176 drp[col] = rend; 2272 drp[col] = srp[col];
2273
2177 count++; 2274 count++;
2178 i++; 2275 i++;
2179 2276
2180 continue; 2277 continue;
2181 } 2278 }
… …
2186 count++; 2283 count++;
2187 2284
2188 if (stp[col] != dtp[col] 2285 if (stp[col] != dtp[col]
2189 || !RS_SAME (srp[col], drp[col])) 2286 || !RS_SAME (srp[col], drp[col]))
2190 { 2287 {
2191 if (must_clear && (i++ > count / 2)) 2288 if (have_bg && (i++ > count / 2))
2192 break; 2289 break;
2193 2290
2194 dtp[col] = stp[col]; 2291 dtp[col] = stp[col];
2195 drp[col] = rend; 2292 drp[col] = rend;
2196 i = 0; 2293 i = 0;
2197 } 2294 }
2198 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2295 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2199 break; 2296 break;
2200 } 2297 }
2201 2298
2202 col--; /* went one too far. move back */ 2299 col--; /* went one too far. move back */
2203 count -= i; /* dump any matching trailing chars */ 2300 count -= i; /* dump any matching trailing chars */
2204 2301
2205 // sometimes we optimize away the trailing NOCHAR's, add them back 2302 // sometimes we optimize away the trailing NOCHAR's, add them back
2206 while (i && text[count] == NOCHAR) 2303 while (ecb_unlikely (i && text[count] == NOCHAR))
2207 count++, i--; 2304 count++, i--;
2208 2305
2209 /* 2306 /*
2210 * Determine the attributes for the string 2307 * Determine the attributes for the string
2211 */ 2308 */
2212 int fore = fgcolor_of (rend); // desired foreground 2309 int fore = fgcolor_of (rend); // desired foreground
2213 int back = bgcolor_of (rend); // desired background 2310 int back = bgcolor_of (rend); // desired background
2214 2311
2215 // only do special processing if any attributes are set, which is unlikely 2312 // only do special processing if any attributes are set, which is unlikely
2216 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2313 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2217 { 2314 {
2218#if ENABLE_STYLES
2219 // force redraw after "careful" characters to avoid pixel droppings
2220 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2221 drp[col + 1] = ~srp[col + 1];
2222
2223 // include previous careful character(s) if possible, looks nicer (best effort...)
2224 while (text > stp
2225 && srp[text - stp - 1] & RS_Careful
2226 && RS_SAME (rend, srp[text - stp - 1]))
2227 text--, count++, xpixel -= fwidth;
2228#endif
2229
2230 bool invert = rend & RS_RVid; 2315 bool invert = rend & RS_RVid;
2231 2316
2232#ifndef NO_BOLD_UNDERLINE_REVERSE 2317#ifndef NO_BOLD_UNDERLINE_REVERSE
2233 if (rend & RS_Bold
2234 && fore == Color_fg) 2318 if (rend & RS_Bold && fore == Color_fg)
2235 { 2319 {
2236 if (ISSET_PIXCOLOR (Color_BD)) 2320 if (ISSET_PIXCOLOR (Color_BD))
2237 fore = Color_BD; 2321 fore = Color_BD;
2238# if !ENABLE_STYLES 2322# if !ENABLE_STYLES
2239 else 2323 else
2240 invert = !invert; 2324 invert = !invert;
2241# endif 2325# endif
2242 } 2326 }
2243 2327
2244 if (rend & RS_Italic 2328 if (rend & RS_Italic && fore == Color_fg)
2245 && fore == Color_fg)
2246 { 2329 {
2247 if (ISSET_PIXCOLOR (Color_IT)) 2330 if (ISSET_PIXCOLOR (Color_IT))
2248 fore = Color_IT; 2331 fore = Color_IT;
2249# if !ENABLE_STYLES 2332# if !ENABLE_STYLES
2250 else 2333 else
2251 invert = !invert; 2334 invert = !invert;
2252# endif 2335# endif
2253 } 2336 }
2254 2337
2255 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2338 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2256 fore = Color_UL; 2339 fore = Color_UL;
2340#endif
2341
2342#ifdef OPTION_HC
2343 if (rend & RS_Sel)
2344 {
2345 /* invert the column if no highlightColor is set or it is the
2346 * current cursor column */
2347 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2348 && ISSET_PIXCOLOR (Color_HC))
2349 {
2350 if (ISSET_PIXCOLOR (Color_HTC))
2351 fore = Color_HTC;
2352 // if invert is 0 reverse video is set so we use bg color as fg color
2353 else if (!invert)
2354 fore = back;
2355
2356 back = Color_HC;
2357 invert = 0;
2358 }
2359 }
2257#endif 2360#endif
2258 2361
2259 if (invert) 2362 if (invert)
2260 { 2363 {
2261 ::swap (fore, back); 2364 ::swap (fore, back);
2262 2365
2263#ifndef NO_BOLD_UNDERLINE_REVERSE 2366#ifndef NO_BOLD_UNDERLINE_REVERSE
2264 if (ISSET_PIXCOLOR (Color_RV))
2265 back = Color_RV;
2266
2267 if (fore == back) 2367 if (fore == back)
2268 { 2368 {
2269 fore = Color_bg; 2369 fore = Color_bg;
2270 back = Color_fg; 2370 back = Color_fg;
2271 } 2371 }
… …
2273 } 2373 }
2274 2374
2275#ifdef TEXT_BLINK 2375#ifdef TEXT_BLINK
2276 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2376 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2277 { 2377 {
2278 if (!text_blink_ev.active) 2378 if (!text_blink_ev.is_active ())
2279 { 2379 {
2280 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2380 text_blink_ev.again ();
2281 hidden_text = 0; 2381 hidden_text = 0;
2282 } 2382 }
2283 else if (hidden_text) 2383 else if (hidden_text)
2284 fore = back; 2384 fore = back;
2285 } 2385 }
2286#endif 2386#endif
2387
2388#if ENABLE_STYLES
2389 // "careful" (too wide) character handling
2390
2391 // include previous careful character(s) if possible, looks nicer (best effort...)
2392 while (text > stp
2393 && srp[text - stp - 1] & RS_Careful
2394 && RS_SAME (rend, srp[text - stp - 1]))
2395 text--, count++, xpixel -= fwidth;
2396
2397 // force redraw after "careful" characters to avoid pixel droppings
2398 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2399 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2400
2401 // force redraw before "careful" characters to avoid pixel droppings
2402 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2403 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2404#endif
2287 } 2405 }
2288 2406
2289 /* 2407 /*
2290 * Actually do the drawing of the string here 2408 * Actually do the drawing of the string here
2291 */ 2409 */
2292 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2410 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2293 2411
2294 if (back == fore) 2412 if (ecb_likely (have_bg && back == Color_bg))
2295 font->clear_rect (*drawable, xpixel, ypixel,
2296 fwidth * count, fheight,
2297 back);
2298 else if (back == Color_bg)
2299 { 2413 {
2300 if (must_clear) 2414 // this is very ugly, maybe push it into ->draw?
2301 {
2302 CLEAR_CHARS (xpixel, ypixel, count);
2303 2415
2304 for (i = 0; i < count; i++) /* don't draw empty strings */ 2416 for (i = 0; i < count; i++) /* don't draw empty strings */
2305 if (text[i] != ' ') 2417 if (text[i] != ' ')
2306 { 2418 {
2307 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2419 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2308 break; 2420 goto did_clear;
2309 }
2310 } 2421 }
2311 else 2422
2312 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2423 CLEAR_CHARS (xpixel, ypixel, count);
2424 did_clear: ;
2313 } 2425 }
2314 else 2426 else
2315 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2427 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2316 2428
2317 if (rend & RS_Uline && font->descent > 1 && fore != back) 2429 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2318 { 2430 {
2431 if (showcursor && focus && row == screen.cur.row
2432 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2433 XSetForeground (dpy, gc, pix_colors[ccol1]);
2434 else
2319#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2320 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2321 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2322 else 2438 else
2323#endif 2439#endif
2324 XSetForeground (display->display, gc, pix_colors[fore]); 2440 XSetForeground (dpy, gc, pix_colors[fore]);
2325 2441
2326 XDrawLine (display->display, drawBuffer, gc, 2442 XDrawLine (dpy, vt, gc,
2327 xpixel, ypixel + font->ascent + 1, 2443 xpixel, ypixel + font->ascent + 1,
2328 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2444 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2329 } 2445 }
2330 } /* for (col....) */ 2446 } /* for (col....) */
2331 } /* for (row....) */ 2447 } /* for (row....) */
2332 2448
2333#if ENABLE_OVERLAY
2334 scr_swap_overlay ();
2335#endif
2336 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2337
2338 /* 2449 /*
2339 * G: cleanup cursor and display outline cursor if necessary 2450 * G: cleanup cursor and display outline cursor if necessary
2340 */ 2451 */
2341 if (showcursor) 2452 if (showcursor)
2342 { 2453 {
2343 if (focus) 2454 if (focus)
2344 { 2455 {
2345 if (OPTION (Opt_cursorUnderline)) 2456 if (cursor_type == 0)
2346 *crp ^= RS_Uline; 2457 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2347 else 2458 else if (oldcursor.row >= 0)
2348 { 2459 {
2349 *crp ^= RS_RVid; 2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2350#ifndef NO_CURSORCOLOR 2461 if (cursor_type == 1)
2351 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2462 XFillRectangle (dpy, vt, gc,
2352#endif 2463 Col2Pixel (cur_col),
2464 Row2Pixel (oldcursor.row + 1) - 2,
2465 Width2Pixel (1),
2466 2);
2467 else
2468 XFillRectangle (dpy, vt, gc,
2469 Col2Pixel (cur_col),
2470 Row2Pixel (oldcursor.row),
2471 2,
2472 Height2Pixel (1));
2353 } 2473 }
2354 } 2474 }
2355 else if (oldcursor.row >= 0) 2475 else if (oldcursor.row >= 0)
2356 { 2476 {
2357 int cursorwidth = 1;
2358 int col = oldcursor.col;
2359
2360 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2361 col--;
2362
2363 while (col + cursorwidth < ncol
2364 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2365 cursorwidth++;
2366
2367#ifndef NO_CURSORCOLOR
2368 if (ISSET_PIXCOLOR (Color_cursor))
2369 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2477 XSetForeground (dpy, gc, pix_colors[ccol1]);
2370#endif
2371 2478
2372 XDrawRectangle (display->display, drawBuffer, gc, 2479 XDrawRectangle (dpy, vt, gc,
2373 Col2Pixel (col), 2480 Col2Pixel (cur_col),
2374 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2375 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2376 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2377 } 2484 }
2378 } 2485 }
2379 2486
2380 /* 2487 /*
2381 * H: cleanup selection 2488 * H: cleanup selection
2382 */ 2489 */
2490#if ENABLE_OVERLAY
2491 scr_swap_overlay ();
2492#endif
2493 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2494
2383 scr_reverse_selection (); 2495 scr_reverse_selection ();
2384 2496
2385 if (refresh_type & SMOOTH_REFRESH) 2497 screen.flags = old_screen_flags;
2386 XFlush (display->display);
2387
2388 num_scr = 0; 2498 num_scr = 0;
2389 num_scr_allow = 1; 2499 num_scr_allow = 1;
2390} 2500}
2391 2501
2392void 2502void ecb_cold
2393rxvt_term::scr_remap_chars (line_t &l) 2503rxvt_term::scr_remap_chars (line_t &l) noexcept
2394{ 2504{
2395 if (!l.t) 2505 if (!l.valid ())
2396 return; 2506 return;
2397 2507
2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2508 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2399 2509
2400 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2401 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2511 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2402} 2512}
2403 2513
2404void 2514void ecb_cold
2405rxvt_term::scr_remap_chars () 2515rxvt_term::scr_remap_chars () noexcept
2406{ 2516{
2407 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2408 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2409 2519
2410 for (int i = nrow; i--; ) 2520 for (int i = nrow; i--; )
… …
2412 scr_remap_chars (drawn_buf [i]); 2522 scr_remap_chars (drawn_buf [i]);
2413 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2414 } 2524 }
2415} 2525}
2416 2526
2417void 2527void ecb_cold
2418rxvt_term::scr_recolour () 2528rxvt_term::scr_recolor (bool refresh) noexcept
2419{ 2529{
2420 if (1 2530 bool transparent = false;
2421#if TRANSPARENT 2531
2422 && !am_transparent 2532#ifdef HAVE_IMG
2533 if (bg_img != 0)
2534 {
2535# if ENABLE_TRANSPARENCY
2536 if (bg_flags & BG_IS_TRANSPARENT)
2537 {
2538 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2539 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2540
2541 transparent = true;
2542 }
2543 else
2423#endif 2544# endif
2424#if XPM_BACKGROUND
2425 && !bgPixmap.pixmap
2426#endif
2427 ) 2545 {
2546 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2547 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2548 }
2428 { 2549 }
2550 else
2551#endif
2552 {
2429 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2430 XClearWindow (display->display, parent[0]);
2431 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2432#if HAVE_SCROLLBARS 2555 }
2433 if (scrollBar.win) 2556
2434 { 2557 XClearWindow (dpy, parent);
2558
2559 if (scrollBar.state && scrollBar.win)
2560 {
2561 if (transparent)
2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2563 else
2435 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2436 scrollBar.setIdle (); 2565 scrollBar.state = SB_STATE_IDLE;
2437 scrollbar_show (0); 2566 scrollBar.show (0);
2438 } 2567 }
2439#endif 2568
2569 if (refresh)
2440 } 2570 {
2441
2442 scr_clear (); 2571 scr_clear ();
2443 scr_touch (true); 2572 scr_touch (true);
2573 }
2444 want_refresh = 1; 2574 want_refresh = 1;
2445} 2575}
2446 2576
2447/* ------------------------------------------------------------------------- */ 2577/* ------------------------------------------------------------------------- */
2448void 2578void
2449rxvt_term::scr_clear (bool really) 2579rxvt_term::scr_clear (bool really) noexcept
2450{ 2580{
2451 if (!mapped) 2581 if (!mapped)
2452 return; 2582 return;
2453 2583
2454 num_scr_allow = 0; 2584 num_scr_allow = 0;
2455 want_refresh = 1; 2585 want_refresh = 1;
2456 2586
2457 if (really) 2587 if (really)
2458 XClearWindow (display->display, vt); 2588 XClearWindow (dpy, vt);
2459} 2589}
2460 2590
2461/* ------------------------------------------------------------------------- */
2462void 2591void
2592rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept
2593{
2594 int view_end = view_start + nrow;
2595 int row, col;
2596
2597 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2598 {
2599 text_t *stp = ROW(row).t;
2600 rend_t *srp = ROW(row).r;
2601
2602 for (col = beg_col; col < end_col; col++)
2603 srp[col] ^= rstyle1;
2604
2605 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2606 srp[col] ^= rstyle2;
2607
2608 if (++col < end_col)
2609 srp[col] ^= rstyle2;
2610 }
2611}
2612
2613void
2614rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept
2615{
2616 int view_end = view_start + nrow;
2617 int row, col;
2618
2619 if (beg_row >= view_start)
2620 {
2621 col = beg_col;
2622 row = beg_row;
2623 }
2624 else
2625 {
2626 col = 0;
2627 row = view_start;
2628 }
2629
2630 for (; row < min (end_row, view_end); row++, col = 0)
2631 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2632 srp[col] ^= rstyle;
2633
2634 if (row == end_row)
2635 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2636 srp[col] ^= rstyle;
2637}
2638
2639/* ------------------------------------------------------------------------- */
2640void ecb_hot
2463rxvt_term::scr_reverse_selection () 2641rxvt_term::scr_reverse_selection () noexcept
2464{ 2642{
2465 if (selection.op 2643 if (selection.op
2466 && current_screen == selection.screen 2644 && current_screen == selection.screen
2467 && selection.end.row >= -view_start) 2645 && selection.end.row >= view_start)
2468 { 2646 {
2469 int view_end = -view_start + nrow; 2647#if !ENABLE_MINIMAL
2470 int row, col;
2471
2472#if ENABLE_FRILLS
2473 if (selection.rect) 2648 if (selection.rect)
2474 { 2649 scr_xor_rect (selection.beg.row, selection.beg.col,
2475 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2650 selection.end.row, selection.end.col,
2476 { 2651 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2477 text_t *stp = ROW(row).t;
2478 rend_t *srp = ROW(row).r;
2479
2480 for (col = selection.beg.col; col < selection.end.col; col++)
2481 srp[col] ^= RS_RVid;
2482
2483 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2484 srp[col] ^= RS_RVid | RS_Uline;
2485
2486 if (++col < selection.end.col)
2487 srp[col] ^= RS_RVid | RS_Uline;
2488 }
2489 }
2490 else 2652 else
2491#endif 2653#endif
2492 { 2654 scr_xor_span (selection.beg.row, selection.beg.col,
2493 if (selection.beg.row >= -view_start) 2655 selection.end.row, selection.end.col,
2494 { 2656 RS_Sel | RS_RVid);
2495 col = selection.beg.col;
2496 row = selection.beg.row;
2497 }
2498 else
2499 {
2500 col = 0;
2501 row = -view_start;
2502 }
2503
2504 for (; row < min (selection.end.row, view_end); row++, col = 0)
2505 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2506 srp[col] ^= RS_RVid;
2507
2508 if (row == selection.end.row)
2509 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2510 srp[col] ^= RS_RVid;
2511 }
2512 } 2657 }
2513} 2658}
2514 2659
2515/* ------------------------------------------------------------------------- */ 2660/* ------------------------------------------------------------------------- */
2516/* 2661/*
2517 * Dump the whole scrollback and screen to the passed filedescriptor. The 2662 * Dump the whole scrollback and screen to the passed filedescriptor. The
2518 * invoking routine must close the fd. 2663 * invoking routine must close the fd.
2519 */ 2664 */
2520#if 0 2665#if 0
2521void 2666void
2522rxvt_term::scr_dump (int fd) 2667rxvt_term::scr_dump (int fd) noexcept
2523{ 2668{
2524 int row, wrote; 2669 // if this method is needed, it can be implemented by factoring the
2525 unsigned int width, towrite; 2670 // relevant code in scr_printscreen
2526 char r1[] = "\n";
2527
2528 for (row = saveLines - nsaved;
2529 row < saveLines + nrow - 1; row++)
2530 {
2531 width = row_buf[row].l >= 0 ? row_buf[row].l
2532 : ncol;
2533 for (towrite = width; towrite; towrite -= wrote)
2534 {
2535 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2536 towrite);
2537 if (wrote < 0)
2538 return; /* XXX: death, no report */
2539 }
2540 if (row_buf[row].l >= 0)
2541 if (write (fd, r1, 1) <= 0)
2542 return; /* XXX: death, no report */
2543 }
2544} 2671}
2545#endif 2672#endif
2546 2673
2547/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2548 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
2549 * ------------------------------------------------------------------------- */ 2676 * ------------------------------------------------------------------------- */
2550void 2677void
2551rxvt_term::selection_check (int check_more) 2678rxvt_term::selection_check (int check_more) noexcept
2552{ 2679{
2553 row_col_t pos;
2554
2555 if (!selection.op) 2680 if (!selection.op)
2556 return; 2681 return;
2557 2682
2558 pos.row = pos.col = 0;
2559 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2560 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2684 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2561 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2685 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2562 || (check_more == 1 2686 || (check_more == 1
2563 && current_screen == selection.screen 2687 && current_screen == selection.screen
2564 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2565 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2566 || (check_more == 2
2567 && ROWCOL_IS_BEFORE (selection.beg, pos)
2568 && ROWCOL_IS_AFTER (selection.end, pos))
2569 || (check_more == 3
2570 && ROWCOL_IS_AFTER (selection.end, pos))
2571 || (check_more == 4 /* screen width change */
2572 && (selection.beg.row != selection.end.row
2573 || selection.end.col > ncol)))
2574 CLEAR_SELECTION (); 2690 CLEAR_ALL_SELECTION ();
2691}
2692
2693void
2694rxvt_term::selection_changed () noexcept
2695{
2696 line_t &r1 = ROW (selection.beg.row);
2697 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2698 ++selection.beg.col;
2699
2700 line_t &r2 = ROW (selection.end.row);
2701 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2702 ++selection.end.col;
2703
2704 want_refresh = 1;
2575} 2705}
2576 2706
2577/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2578/* 2708/*
2579 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2580 */ 2710 */
2581void 2711void
2582rxvt_term::paste (char *data, unsigned int len) 2712rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2583{ 2713{
2584 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2585 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2586 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2587 data[i] = C0_CR; 2717 data[i] = C0_CR;
2588 2718
2719 #if ENABLE_FRILLS
2720 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2721 tt_printf ("\x1b[200~");
2722 #endif
2723
2589 tt_write (data, len); 2724 tt_write (data, len);
2590}
2591 2725
2592/* ------------------------------------------------------------------------- */
2593/*
2594 * Respond to a notification that a primary selection has been sent
2595 * EXT: SelectionNotify
2596 */
2597void
2598rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2599{
2600 if (prop == None) /* check for failed XConvertSelection */
2601 {
2602 if ((selection_type & Sel_CompoundText))
2603 {
2604 int selnum = selection_type & Sel_whereMask;
2605
2606 selection_type = 0;
2607 if (selnum != Sel_direct)
2608 selection_request_other (XA_STRING, selnum);
2609 }
2610
2611 if ((selection_type & Sel_UTF8String))
2612 {
2613 int selnum = selection_type & Sel_whereMask;
2614
2615 selection_type = Sel_CompoundText;
2616 if (selnum != Sel_direct)
2617 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2618 else
2619 selection_type = 0;
2620 }
2621
2622 return;
2623 }
2624
2625 unsigned long bytes_after;
2626 XTextProperty ct;
2627
2628 if (XGetWindowProperty (display->display, win, prop,
2629 0, PROP_SIZE / 4,
2630 delete_prop, AnyPropertyType,
2631 &ct.encoding, &ct.format,
2632 &ct.nitems, &bytes_after,
2633 &ct.value) != Success)
2634 {
2635 ct.value = 0;
2636 goto bailout;
2637 }
2638
2639 if (ct.encoding == None)
2640 goto bailout;
2641
2642 if (bytes_after)
2643 {
2644 // fetch and append remaining data
2645 XTextProperty ct2;
2646
2647 if (XGetWindowProperty (display->display, win, prop,
2648 ct.nitems / 4, (bytes_after + 3) / 4,
2649 delete_prop, AnyPropertyType,
2650 &ct2.encoding, &ct2.format,
2651 &ct2.nitems, &bytes_after,
2652 &ct2.value) != Success)
2653 goto bailout;
2654
2655 // realloc should be compatible to XFree, here, and elsewhere, too
2656 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2657 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2658 ct.nitems += ct2.nitems;
2659
2660 XFree (ct2.value);
2661 }
2662
2663 if (ct.value == 0)
2664 goto bailout;
2665
2666 if (ct.encoding == xa[XA_INCR])
2667 {
2668 // INCR selection, start handshake
2669 if (!delete_prop)
2670 XDeleteProperty (display->display, win, prop);
2671
2672 selection_wait = Sel_incr;
2673 incr_buf_fill = 0;
2674 incr_ev.start (NOW + 10);
2675
2676 goto bailout;
2677 }
2678
2679 if (ct.nitems == 0)
2680 {
2681 if (selection_wait == Sel_incr)
2682 {
2683 XFree (ct.value);
2684
2685 // finally complete, now paste the whole thing
2686 selection_wait = Sel_normal;
2687 ct.value = (unsigned char *)incr_buf;
2688 ct.nitems = incr_buf_fill;
2689 incr_buf = 0;
2690 incr_buf_size = 0;
2691 incr_ev.stop ();
2692 }
2693 else
2694 {
2695 if (selection_wait == Sel_normal
2696 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2697 {
2698 /*
2699 * pass through again trying CUT_BUFFER0 if we've come from
2700 * XConvertSelection () but nothing was presented
2701 */
2702 selection_paste (display->root, XA_CUT_BUFFER0, False);
2703 }
2704
2705 goto bailout;
2706 }
2707 }
2708 else if (selection_wait == Sel_incr)
2709 {
2710 incr_ev.start (NOW + 10);
2711
2712 while (incr_buf_fill + ct.nitems > incr_buf_size)
2713 {
2714 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2715 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2716 }
2717
2718 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2719 incr_buf_fill += ct.nitems;
2720
2721 goto bailout;
2722 }
2723
2724 char **cl;
2725 int cr;
2726
2727#if ENABLE_FRILLS 2726 #if ENABLE_FRILLS
2728 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2727 if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
2729 // so recode it manually 2728 tt_printf ("\x1b[201~");
2730 if (ct.encoding == xa[XA_UTF8_STRING])
2731 {
2732 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2733 char *s = rxvt_wcstombs (w);
2734 free (w);
2735 // TODO: strlen == only the first element will be converted. well...
2736 paste (s, strlen (s));
2737 free (s);
2738 }
2739 else
2740#endif 2729 #endif
2741 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2742 && cl)
2743 {
2744 for (int i = 0; i < cr; i++)
2745 paste (cl[i], strlen (cl[i]));
2746
2747 XFreeStringList (cl);
2748 }
2749 else
2750 paste ((char *)ct.value, ct.nitems); // paste raw
2751
2752bailout:
2753 XFree (ct.value);
2754
2755 if (selection_wait == Sel_normal)
2756 selection_wait = Sel_none;
2757} 2730}
2758 2731
2759void 2732void
2760rxvt_term::incr_cb (time_watcher &w) 2733rxvt_term::paste (char *data, unsigned int len) noexcept
2761{ 2734{
2762 selection_wait = Sel_none; 2735 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2763
2764 incr_buf_size = 0;
2765 free (incr_buf);
2766
2767 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2768}
2769
2770void
2771rxvt_term::selection_property (Window win, Atom prop)
2772{
2773 if (prop == None || selection_wait != Sel_incr)
2774 return; 2736 return;
2775 2737
2776 selection_paste (win, prop, true); 2738 tt_paste (data, len);
2777} 2739}
2778 2740
2779/* ------------------------------------------------------------------------- */ 2741/* ------------------------------------------------------------------------- */
2780/* 2742/*
2781 * Request the current selection: 2743 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2782 * Order: > internal selection if available 2744 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2783 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2745 * as fallback
2784 * > CUT_BUFFER0
2785 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2786 * will auto fallback to CUT_BUFFER0
2787 * EXT: button 2 release 2746 * EXT: button 2 release
2788 */ 2747 */
2789void 2748void
2790rxvt_term::selection_request (Time tm, int x, int y) 2749rxvt_term::selection_request (Time tm, int selnum) noexcept
2791{ 2750{
2792 if (x < 0 || x >= width || y < 0 || y >= height)
2793 return; /* outside window */
2794
2795 if (selection.text) 2751 if (!selection_req)
2796 { /* internal selection */
2797 char *str = rxvt_wcstombs (selection.text, selection.len);
2798 paste (str, strlen (str));
2799 free (str);
2800 return;
2801 } 2752 {
2802 else 2753 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2754 selection_req->run ();
2803 { 2755 }
2804 int i;
2805
2806 selection_request_time = tm;
2807 selection_wait = Sel_normal;
2808
2809 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2810 {
2811#if X_HAVE_UTF8_STRING
2812 selection_type = Sel_UTF8String;
2813 if (selection_request_other (xa[XA_UTF8_STRING], i))
2814 return;
2815#else
2816 selection_type = Sel_CompoundText;
2817 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2818 return;
2819#endif
2820 }
2821 }
2822
2823 selection_wait = Sel_none; /* don't loop in selection_paste () */
2824 selection_paste (display->root, XA_CUT_BUFFER0, false);
2825}
2826
2827int
2828rxvt_term::selection_request_other (Atom target, int selnum)
2829{
2830 Atom sel;
2831
2832 selection_type |= selnum;
2833
2834 if (selnum == Sel_Primary)
2835 sel = XA_PRIMARY;
2836 else if (selnum == Sel_Secondary)
2837 sel = XA_SECONDARY;
2838 else
2839 sel = xa[XA_CLIPBOARD];
2840
2841 if (XGetSelectionOwner (display->display, sel) != None)
2842 {
2843 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2844 vt, selection_request_time);
2845 return 1;
2846 }
2847
2848 return 0;
2849} 2756}
2850 2757
2851/* ------------------------------------------------------------------------- */ 2758/* ------------------------------------------------------------------------- */
2852/* 2759/*
2853 * Clear all selected text 2760 * Clear all selected text
2854 * EXT: SelectionClear 2761 * EXT: SelectionClear
2855 */ 2762 */
2856void 2763void
2857rxvt_term::selection_clear () 2764rxvt_term::selection_clear (bool clipboard) noexcept
2858{ 2765{
2766 if (!clipboard)
2767 {
2859 want_refresh = 1; 2768 want_refresh = 1;
2860 free (selection.text); 2769 free (selection.text);
2861 selection.text = NULL; 2770 selection.text = NULL;
2862 selection.len = 0; 2771 selection.len = 0;
2863 CLEAR_SELECTION (); 2772 CLEAR_SELECTION ();
2864 2773
2865 if (display->selection_owner == this) 2774 if (display->selection_owner == this)
2866 display->selection_owner = 0; 2775 display->selection_owner = 0;
2776 }
2777 else
2778 {
2779 free (selection.clip_text);
2780 selection.clip_text = NULL;
2781 selection.clip_len = 0;
2782
2783 if (display->clipboard_owner == this)
2784 display->clipboard_owner = 0;
2785 }
2867} 2786}
2868 2787
2869/* ------------------------------------------------------------------------- */ 2788/* ------------------------------------------------------------------------- */
2870/* 2789/*
2871 * Copy a selection into the cut buffer 2790 * Copy a selection into the cut buffer
2872 * EXT: button 1 or 3 release 2791 * EXT: button 1 or 3 release
2873 */ 2792 */
2874void 2793void
2875rxvt_term::selection_make (Time tm) 2794rxvt_term::selection_make (Time tm)
2876{ 2795{
2877 int i; 2796 int size;
2878 wchar_t *new_selection_text; 2797 wchar_t *new_selection_text;
2879 text_t *t; 2798 text_t *t;
2880 2799
2881 switch (selection.op) 2800 switch (selection.op)
2882 { 2801 {
… …
2898 return; /* nothing selected, go away */ 2817 return; /* nothing selected, go away */
2899 2818
2900 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2819 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2901 return; 2820 return;
2902 2821
2903 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2822 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2904 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2823 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2905 2824
2906 int ofs = 0; 2825 int ofs = 0;
2907 int extra = 0; 2826 int extra = 0;
2908 2827
2909 int col = selection.beg.col; 2828 int col = selection.beg.col;
… …
2911 2830
2912 int end_col; 2831 int end_col;
2913 2832
2914 for (; row <= selection.end.row; row++, col = 0) 2833 for (; row <= selection.end.row; row++, col = 0)
2915 { 2834 {
2916#if ENABLE_FRILLS 2835#if !ENABLE_MINIMAL
2917 if (selection.rect) 2836 if (selection.rect)
2918 { 2837 {
2919 col = selection.beg.col; 2838 col = selection.beg.col;
2920 end_col = ncol + 1; 2839 end_col = selection.end.col;
2921 } 2840 }
2922 else 2841 else
2923#endif 2842#endif
2924 end_col = ROW(row).l; 2843 end_col = ROW(row).l;
2925 2844
2926 col = max (col, 0); 2845 col = max (col, 0);
2927 2846
2928 if (row == selection.end.row 2847 if (row == selection.end.row)
2929#if ENABLE_FRILLS
2930 || selection.rect
2931#endif
2932 )
2933 min_it (end_col, selection.end.col); 2848 min_it (end_col, selection.end.col);
2934 2849
2935 t = ROW(row).t + col; 2850 t = ROW(row).t + col;
2936 2851
2937 for (; col < end_col; col++) 2852 for (; col < end_col; col++)
… …
2939 if (*t == NOCHAR) 2854 if (*t == NOCHAR)
2940 t++; 2855 t++;
2941#if ENABLE_COMBINING 2856#if ENABLE_COMBINING
2942 else if (IS_COMPOSE (*t)) 2857 else if (IS_COMPOSE (*t))
2943 { 2858 {
2944 int len = rxvt_composite.expand (*t, 0); 2859 int len = rxvt_composite.expand (*t);
2945 2860
2946 extra -= (len - 1); 2861 extra -= (len - 1);
2947 2862
2948 if (extra < 0) 2863 if (extra < 0)
2949 { 2864 {
2950 extra += i; 2865 extra += size;
2951 i += i; 2866 size += size;
2952 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2867 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2953 } 2868 }
2954 2869
2955 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2870 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2956 } 2871 }
2957#endif 2872#endif
2958 else 2873 else
2959 new_selection_text[ofs++] = *t++; 2874 new_selection_text[ofs++] = *t++;
2960 } 2875 }
2961 2876
2962#if ENABLE_FRILLS 2877#if !ENABLE_MINIMAL
2963 if (selection.rect) 2878 if (selection.rect)
2964 { 2879 {
2965 while (ofs 2880 while (ofs
2966 && new_selection_text[ofs - 1] != C0_LF 2881 && new_selection_text[ofs - 1] != C0_LF
2967 && unicode::is_space (new_selection_text[ofs - 1])) 2882 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2969 2884
2970 new_selection_text[ofs++] = C0_LF; 2885 new_selection_text[ofs++] = C0_LF;
2971 } 2886 }
2972 else 2887 else
2973#endif 2888#endif
2974 if (!ROW(row).is_longer () && row != selection.end.row) 2889 if (!ROW(row).is_longer ()
2890 && (row != selection.end.row || end_col != selection.end.col)
2891 && (row != selection.beg.row || selection.beg.col < ncol))
2975 new_selection_text[ofs++] = C0_LF; 2892 new_selection_text[ofs++] = C0_LF;
2976 } 2893 }
2977
2978 if (end_col != selection.end.col)
2979 new_selection_text[ofs++] = C0_LF;
2980 2894
2981 new_selection_text[ofs] = 0; 2895 new_selection_text[ofs] = 0;
2982 2896
2983 if (ofs == 0) 2897 if (ofs == 0)
2984 { 2898 {
… …
2997 2911
2998 selection_grab (tm); 2912 selection_grab (tm);
2999} 2913}
3000 2914
3001bool 2915bool
3002rxvt_term::selection_grab (Time tm) 2916rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
3003{ 2917{
2918 Atom sel;
2919
2920 if (!clipboard)
2921 {
3004 selection_time = tm; 2922 selection_time = tm;
3005 2923 sel = XA_PRIMARY;
3006 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3007 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3008 { 2924 }
2925 else
2926 {
2927 clipboard_time = tm;
2928 sel = xa[XA_CLIPBOARD];
2929 }
2930
2931 XSetSelectionOwner (dpy, sel, vt, tm);
2932 if (XGetSelectionOwner (dpy, sel) == vt)
2933 {
3009 display->set_selection_owner (this); 2934 display->set_selection_owner (this, clipboard);
3010 return true; 2935 return true;
3011 } 2936 }
3012 else 2937 else
2938 {
2939 selection_clear (clipboard);
3013 return false; 2940 return false;
2941 }
3014 2942
3015#if 0 2943#if 0
3016 XTextProperty ct; 2944 XTextProperty ct;
3017 2945
3018 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 2946 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3019 { 2947 {
3020 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 2948 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3021 XFree (ct.value); 2949 XFree (ct.value);
3022 } 2950 }
3023#endif 2951#endif
… …
3026/* ------------------------------------------------------------------------- */ 2954/* ------------------------------------------------------------------------- */
3027/* 2955/*
3028 * Mark or select text based upon number of clicks: 1, 2, or 3 2956 * Mark or select text based upon number of clicks: 1, 2, or 3
3029 * EXT: button 1 press 2957 * EXT: button 1 press
3030 */ 2958 */
3031void 2959void ecb_cold
3032rxvt_term::selection_click (int clicks, int x, int y) 2960rxvt_term::selection_click (int clicks, int x, int y) noexcept
3033{ 2961{
3034 clicks = ((clicks - 1) % 3) + 1; 2962 clicks = ((clicks - 1) % 3) + 1;
3035 selection.clicks = clicks; /* save clicks so extend will work */ 2963 selection.clicks = clicks; /* save clicks so extend will work */
3036 2964
2965 if (clicks == 2 && !selection.rect
2966 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
2967 {
2968 MEvent.clicks = 1; // what a mess
2969 selection.screen = current_screen;
2970 selection.op = SELECTION_CONT;
2971 return;
2972 }
2973
3037 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 2974 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3038 2975
3039 if (clicks == 2 || clicks == 3) 2976 if (clicks == 2 || clicks == 3)
3040 selection_extend_colrow (selection.mark.col, 2977 selection_extend_colrow (selection.mark.col,
3041 selection.mark.row + view_start, 2978 selection.mark.row - view_start,
3042 0, /* button 3 */ 2979 0, /* button 3 */
3043 1, /* button press */ 2980 1, /* button press */
3044 0); /* click change */ 2981 0); /* click change */
3045} 2982}
3046 2983
3047/* ------------------------------------------------------------------------- */ 2984/* ------------------------------------------------------------------------- */
3048/* 2985/*
3049 * Mark a selection at the specified col/row 2986 * Mark a selection at the specified col/row
3050 */ 2987 */
3051void 2988void ecb_cold
3052rxvt_term::selection_start_colrow (int col, int row) 2989rxvt_term::selection_start_colrow (int col, int row) noexcept
3053{ 2990{
3054 want_refresh = 1; 2991 want_refresh = 1;
3055 2992
3056 selection.mark.row = row - view_start; 2993 selection.mark.row = row + view_start;
3057 selection.mark.col = col; 2994 selection.mark.col = col;
3058 2995
3059 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 2996 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3060 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 2997 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3061 2998
3062 while (selection.mark.col > 0 2999 while (selection.mark.col > 0
3063 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3000 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3064 --selection.mark.col; 3001 --selection.mark.col;
3065 3002
3066 if (selection.op) 3003 if (selection.op)
3004 {
3067 { /* clear the old selection */ 3005 /* clear the old selection */
3068 selection.beg.row = selection.end.row = selection.mark.row; 3006 selection.beg.row = selection.end.row = selection.mark.row;
3069 selection.beg.col = selection.end.col = selection.mark.col; 3007 selection.beg.col = selection.end.col = selection.mark.col;
3070 } 3008 }
3071 3009
3072 selection.op = SELECTION_INIT; 3010 selection.op = SELECTION_INIT;
… …
3078 * Word select: select text for 2 clicks 3016 * Word select: select text for 2 clicks
3079 * We now only find out the boundary in one direction 3017 * We now only find out the boundary in one direction
3080 */ 3018 */
3081 3019
3082/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3020/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3083#define DELIMIT_TEXT(x) \ 3021#define DELIMIT_TEXT(x) \
3084 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3022 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3085#define DELIMIT_REND(x) 1 3023#define DELIMIT_REND(x) 1
3086 3024
3087void 3025void ecb_cold
3088rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3026rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept
3089{ 3027{
3090 int col, row, dirnadd, tcol, trow, w1, w2; 3028 int col, row, dirnadd, tcol, trow, w1, w2;
3091 row_col_t bound; 3029 row_col_t bound;
3092 text_t *stp; 3030 text_t *stp;
3093 rend_t *srp; 3031 rend_t *srp;
3094 3032
3095 if (dirn == UP) 3033 if (dirn == UP)
3096 { 3034 {
3097 bound.row = - nsaved - 1; 3035 bound.row = top_row - 1;
3098 bound.col = 0; 3036 bound.col = 0;
3099 dirnadd = -1; 3037 dirnadd = -1;
3100 } 3038 }
3101 else 3039 else
3102 { 3040 {
… …
3166 * EXT: button 3 press; button 1 or 3 drag 3104 * EXT: button 3 press; button 1 or 3 drag
3167 * flag == 0 ==> button 1 3105 * flag == 0 ==> button 1
3168 * flag == 1 ==> button 3 press 3106 * flag == 1 ==> button 3 press
3169 * flag == 2 ==> button 3 motion 3107 * flag == 2 ==> button 3 motion
3170 */ 3108 */
3171void 3109void ecb_cold
3172rxvt_term::selection_extend (int x, int y, int flag) 3110rxvt_term::selection_extend (int x, int y, int flag) noexcept
3173{ 3111{
3174 int col = clamp (Pixel2Col (x), 0, ncol); 3112 int col = clamp (Pixel2Col (x), 0, ncol);
3175 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3113 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3176 3114
3177 /* 3115 /*
… …
3180 * select nothing. Otherwise, if we're to the right of the mark, you have to 3118 * select nothing. Otherwise, if we're to the right of the mark, you have to
3181 * be _past_ a character for it to be selected. 3119 * be _past_ a character for it to be selected.
3182 */ 3120 */
3183 if (((selection.clicks % 3) == 1) && !flag 3121 if (((selection.clicks % 3) == 1) && !flag
3184 && (col == selection.mark.col 3122 && (col == selection.mark.col
3185 && (row == selection.mark.row + view_start))) 3123 && (row == selection.mark.row - view_start)))
3186 { 3124 {
3187 /* select nothing */ 3125 /* select nothing */
3188 selection.beg.row = selection.end.row = 0; 3126 selection.beg.row = selection.end.row = 0;
3189 selection.beg.col = selection.end.col = 0; 3127 selection.beg.col = selection.end.col = 0;
3190 selection.clicks = 4; 3128 selection.clicks = 4;
… …
3202 3140
3203/* ------------------------------------------------------------------------- */ 3141/* ------------------------------------------------------------------------- */
3204/* 3142/*
3205 * Extend the selection to the specified col/row 3143 * Extend the selection to the specified col/row
3206 */ 3144 */
3207void 3145void ecb_cold
3208rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3146rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept
3209{ 3147{
3210 row_col_t pos; 3148 row_col_t pos;
3211 enum { 3149 enum {
3212 LEFT, RIGHT 3150 LEFT, RIGHT
3213 } closeto = RIGHT; 3151 } closeto = RIGHT;
3214
3215 want_refresh = 1;
3216 3152
3217 switch (selection.op) 3153 switch (selection.op)
3218 { 3154 {
3219 case SELECTION_INIT: 3155 case SELECTION_INIT:
3220 CLEAR_SELECTION (); 3156 CLEAR_SELECTION ();
… …
3245 selection.beg.col = selection.end.col = selection.mark.col; 3181 selection.beg.col = selection.end.col = selection.mark.col;
3246 selection.beg.row = selection.end.row = selection.mark.row; 3182 selection.beg.row = selection.end.row = selection.mark.row;
3247 } 3183 }
3248 3184
3249 pos.col = col; 3185 pos.col = col;
3250 pos.row = row - view_start; 3186 pos.row = view_start + row;
3251 3187
3252 /* 3188 /*
3253 * This is mainly xterm style selection with a couple of differences, mainly 3189 * This is mainly xterm style selection with a couple of differences, mainly
3254 * in the way button3 drag extension works. 3190 * in the way button3 drag extension works.
3255 * We're either doing: button1 drag; button3 press; or button3 drag 3191 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3261 * a point/word/line which is either the start or end of the selection 3197 * a point/word/line which is either the start or end of the selection
3262 * and it was decided by whichever point/word/line was `fixed' at the 3198 * and it was decided by whichever point/word/line was `fixed' at the
3263 * time of the most recent button3 press 3199 * time of the most recent button3 press
3264 */ 3200 */
3265 if (button3 && buttonpress) 3201 if (button3 && buttonpress)
3202 {
3266 { /* button3 press */ 3203 /* button3 press */
3267 /* 3204 /*
3268 * first determine which edge of the selection we are closest to 3205 * first determine which edge of the selection we are closest to
3269 */ 3206 */
3270 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3207 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3271 || (!ROWCOL_IS_AFTER (pos, selection.end) 3208 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3289 selection.mark.row = selection.beg.row; 3226 selection.mark.row = selection.beg.row;
3290 selection.mark.col = selection.beg.col; 3227 selection.mark.col = selection.beg.col;
3291 } 3228 }
3292 } 3229 }
3293 else 3230 else
3231 {
3294 { /* button1 drag or button3 drag */ 3232 /* button1 drag or button3 drag */
3295 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3233 if (ROWCOL_IS_AFTER (selection.mark, pos))
3296 { 3234 {
3297 if (selection.mark.row == selection.end.row 3235 if (selection.mark.row == selection.end.row
3298 && selection.mark.col == selection.end.col 3236 && selection.mark.col == selection.end.col
3299 && clickchange 3237 && clickchange
… …
3316 3254
3317 if (selection.clicks == 1) 3255 if (selection.clicks == 1)
3318 { 3256 {
3319 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3257 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3320 && !ROW(selection.beg.row).is_longer () 3258 && !ROW(selection.beg.row).is_longer ()
3321#if ENABLE_FRILLS 3259#if !ENABLE_MINIMAL
3322 && !selection.rect 3260 && !selection.rect
3323#endif 3261#endif
3324 ) 3262 )
3325 selection.beg.col = ncol; 3263 selection.beg.col = ncol;
3326 3264
3327 if ( 3265 if (
3328 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3266 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3329 && !ROW(selection.end.row).is_longer () 3267 && !ROW(selection.end.row).is_longer ()
3330#if ENABLE_FRILLS 3268#if !ENABLE_MINIMAL
3331 && !selection.rect 3269 && !selection.rect
3332#endif 3270#endif
3333 ) 3271 )
3334 selection.end.col = ncol; 3272 selection.end.col = ncol;
3335 } 3273 }
3336 else if (selection.clicks == 2) 3274 else if (selection.clicks == 2)
3337 { 3275 {
3338 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3276 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3339 selection.end.col--; 3277 selection.end.col--;
3340 3278
3341 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3342 {
3343 selection_delimit_word (UP, &selection.beg, &selection.beg); 3279 selection_delimit_word (UP, &selection.beg, &selection.beg);
3344 selection_delimit_word (DN, &selection.end, &selection.end); 3280 selection_delimit_word (DN, &selection.end, &selection.end);
3345 }
3346 } 3281 }
3347 else if (selection.clicks == 3) 3282 else if (selection.clicks == 3)
3348 { 3283 {
3349#if ENABLE_FRILLS 3284#if ENABLE_FRILLS
3350 if (OPTION (Opt_tripleclickwords)) 3285 if (option (Opt_tripleclickwords))
3351 { 3286 {
3352 selection_delimit_word (UP, &selection.beg, &selection.beg); 3287 selection_delimit_word (UP, &selection.beg, &selection.beg);
3353 3288
3354 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3289 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3355 { 3290 {
3356 if (!ROW(end_row).is_longer ()) 3291 if (!ROW(end_row).is_longer ())
3357 { 3292 {
3358 selection.end.row = end_row; 3293 selection.end.row = end_row;
3359 selection.end.col = ROW(end_row).l; 3294 selection.end.col = ROW(end_row).l;
3295# if !ENABLE_MINIMAL
3360 selection_remove_trailing_spaces (); 3296 selection_remove_trailing_spaces ();
3297# endif
3361 break; 3298 break;
3362 } 3299 }
3363 } 3300 }
3364 } 3301 }
3365 else 3302 else
… …
3381 selection.end.row++; 3318 selection.end.row++;
3382 } 3319 }
3383 } 3320 }
3384 3321
3385 if (button3 && buttonpress) 3322 if (button3 && buttonpress)
3323 {
3386 { /* mark may need to be changed */ 3324 /* mark may need to be changed */
3387 if (closeto == LEFT) 3325 if (closeto == LEFT)
3388 { 3326 {
3389 selection.mark.row = selection.end.row; 3327 selection.mark.row = selection.end.row;
3390 selection.mark.col = selection.end.col - (selection.clicks == 2); 3328 selection.mark.col = selection.end.col - (selection.clicks == 2);
3391 } 3329 }
… …
3394 selection.mark.row = selection.beg.row; 3332 selection.mark.row = selection.beg.row;
3395 selection.mark.col = selection.beg.col; 3333 selection.mark.col = selection.beg.col;
3396 } 3334 }
3397 } 3335 }
3398 3336
3399#if ENABLE_FRILLS 3337#if !ENABLE_MINIMAL
3400 if (selection.rect && selection.beg.col > selection.end.col) 3338 if (selection.rect && selection.beg.col > selection.end.col)
3401 ::swap (selection.beg.col, selection.end.col); 3339 ::swap (selection.beg.col, selection.end.col);
3402#endif 3340#endif
3403}
3404 3341
3405#if ENABLE_FRILLS 3342 selection_changed ();
3406void 3343}
3344
3345#if !ENABLE_MINIMAL
3346void ecb_cold
3407rxvt_term::selection_remove_trailing_spaces () 3347rxvt_term::selection_remove_trailing_spaces () noexcept
3408{ 3348{
3409 int32_t end_col, end_row; 3349 int32_t end_col, end_row;
3410 text_t *stp; 3350 text_t *stp;
3411 3351
3412 end_col = selection.end.col; 3352 end_col = selection.end.col;
… …
3449/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3450/* 3390/*
3451 * Double click on button 3 when already selected 3391 * Double click on button 3 when already selected
3452 * EXT: button 3 double click 3392 * EXT: button 3 double click
3453 */ 3393 */
3454void 3394void ecb_cold
3455rxvt_term::selection_rotate (int x, int y) 3395rxvt_term::selection_rotate (int x, int y) noexcept
3456{ 3396{
3457 selection.clicks = selection.clicks % 3 + 1; 3397 selection.clicks = selection.clicks % 3 + 1;
3458 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3398 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3459} 3399}
3460 3400
3461/* ------------------------------------------------------------------------- */ 3401/* ------------------------------------------------------------------------- */
3462/* 3402/*
3463 * Respond to a request for our current selection 3403 * Respond to a request for our current selection
3464 * EXT: SelectionRequest 3404 * EXT: SelectionRequest
3465 */ 3405 */
3466void 3406void ecb_cold
3467rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3407rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3468{ 3408{
3409 Atom property = rq.property == None ? rq.target : rq.property;
3469 XSelectionEvent ev; 3410 XSelectionEvent ev;
3470 dDisp;
3471 3411
3472 ev.type = SelectionNotify; 3412 ev.type = SelectionNotify;
3473 ev.property = None; 3413 ev.property = None;
3474 ev.display = rq.display; 3414 ev.display = rq.display;
3475 ev.requestor = rq.requestor; 3415 ev.requestor = rq.requestor;
… …
3489 *target++ = xa[XA_COMPOUND_TEXT]; 3429 *target++ = xa[XA_COMPOUND_TEXT];
3490#if X_HAVE_UTF8_STRING 3430#if X_HAVE_UTF8_STRING
3491 *target++ = xa[XA_UTF8_STRING]; 3431 *target++ = xa[XA_UTF8_STRING];
3492#endif 3432#endif
3493 3433
3494 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3434 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3495 32, PropModeReplace, 3435 32, PropModeReplace,
3496 (unsigned char *)target_list, target - target_list); 3436 (unsigned char *)target_list, target - target_list);
3497 ev.property = rq.property; 3437 ev.property = property;
3498 } 3438 }
3499#if TODO // TODO 3439#if TODO // TODO
3500 else if (rq.target == xa[XA_MULTIPLE]) 3440 else if (rq.target == xa[XA_MULTIPLE])
3501 { 3441 {
3502 /* TODO: Handle MULTIPLE */ 3442 /* TODO: Handle MULTIPLE */
3503 } 3443 }
3504#endif 3444#endif
3505 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3445 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3506 { 3446 {
3507 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3447 XChangeProperty (dpy, rq.requestor, property, rq.target,
3508 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3448 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3509 ev.property = rq.property; 3449 ev.property = property;
3450 }
3451 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3452 {
3453 XChangeProperty (dpy, rq.requestor, property, rq.target,
3454 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3455 ev.property = property;
3510 } 3456 }
3511 else if (rq.target == XA_STRING 3457 else if (rq.target == XA_STRING
3512 || rq.target == xa[XA_TEXT] 3458 || rq.target == xa[XA_TEXT]
3513 || rq.target == xa[XA_COMPOUND_TEXT] 3459 || rq.target == xa[XA_COMPOUND_TEXT]
3514 || rq.target == xa[XA_UTF8_STRING] 3460 || rq.target == xa[XA_UTF8_STRING]
… …
3536 style = enc_string; 3482 style = enc_string;
3537 else if (target == xa[XA_TEXT]) 3483 else if (target == xa[XA_TEXT])
3538 style = enc_text; 3484 style = enc_text;
3539 else if (target == xa[XA_COMPOUND_TEXT]) 3485 else if (target == xa[XA_COMPOUND_TEXT])
3540 style = enc_compound_text; 3486 style = enc_compound_text;
3541#if ENABLE_FRILLS 3487#if !ENABLE_MINIMAL
3542 else if (target == xa[XA_UTF8_STRING]) 3488 else if (target == xa[XA_UTF8_STRING])
3543 style = enc_utf8; 3489 style = enc_utf8;
3544#endif 3490#endif
3545 else 3491 else
3546 { 3492 {
3547 target = xa[XA_COMPOUND_TEXT]; 3493 target = xa[XA_COMPOUND_TEXT];
3548 style = enc_compound_text; 3494 style = enc_compound_text;
3549 } 3495 }
3550 3496
3551 if (selection.text) 3497 if (rq.selection == XA_PRIMARY && selection.text)
3552 { 3498 {
3553 cl = selection.text; 3499 cl = selection.text;
3554 selectlen = selection.len; 3500 selectlen = selection.len;
3555 } 3501 }
3502 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3503 {
3504 cl = selection.clip_text;
3505 selectlen = selection.clip_len;
3506 }
3556 else 3507 else
3557 { 3508 {
3558 cl = L""; 3509 cl = (wchar_t *)L"";
3559 selectlen = 0; 3510 selectlen = 0;
3560 } 3511 }
3561 3512
3562#if ENABLE_FRILLS 3513#if !ENABLE_MINIMAL
3563 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3514 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3564 // so recode it manually 3515 // so recode it manually
3565 if (style == enc_utf8) 3516 if (style == enc_utf8)
3566 { 3517 {
3567 freect = 1; 3518 freect = 1;
… …
3570 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3521 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3571 ct.nitems = strlen ((char *)ct.value); 3522 ct.nitems = strlen ((char *)ct.value);
3572 } 3523 }
3573 else 3524 else
3574#endif 3525#endif
3575 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3526 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3576 freect = 1; 3527 freect = 1;
3577 else 3528 else
3578 { 3529 {
3579 /* if we failed to convert then send it raw */ 3530 /* if we failed to convert then send it raw */
3580 ct.value = (unsigned char *)cl; 3531 ct.value = (unsigned char *)cl;
3581 ct.nitems = selectlen; 3532 ct.nitems = selectlen;
3582 ct.encoding = target; 3533 ct.encoding = target;
3583 } 3534 }
3584 3535
3585 XChangeProperty (disp, rq.requestor, rq.property, 3536 XChangeProperty (dpy, rq.requestor, property,
3586 ct.encoding, 8, PropModeReplace, 3537 ct.encoding, 8, PropModeReplace,
3587 ct.value, (int)ct.nitems); 3538 ct.value, (int)ct.nitems);
3588 ev.property = rq.property; 3539 ev.property = property;
3589 3540
3590 if (freect) 3541 if (freect)
3591 XFree (ct.value); 3542 XFree (ct.value);
3592 } 3543 }
3593 3544
3594 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3545 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3595} 3546}
3596 3547
3597/* ------------------------------------------------------------------------- * 3548/* ------------------------------------------------------------------------- */
3598 * MOUSE ROUTINES *
3599 * ------------------------------------------------------------------------- */
3600
3601/*
3602 * return col/row values corresponding to x/y pixel values
3603 */
3604void
3605rxvt_term::pixel_position (int *x, int *y)
3606{
3607 *x = Pixel2Col (*x);
3608 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3609 *y = Pixel2Row (*y);
3610 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3611}
3612
3613/* ------------------------------------------------------------------------- */
3614#ifdef USE_XIM 3549#if USE_XIM
3615void 3550void ecb_cold
3616rxvt_term::im_set_position (XPoint &pos) 3551rxvt_term::im_set_position (XPoint &pos) noexcept
3617{ 3552{
3618 XWindowAttributes xwa; 3553 XWindowAttributes xwa;
3619 3554
3620 XGetWindowAttributes (display->display, vt, &xwa); 3555 XGetWindowAttributes (dpy, vt, &xwa);
3621 3556
3622 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3557 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3623 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3558 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3624} 3559}
3625#endif 3560#endif
3626 3561
3627#if ENABLE_OVERLAY 3562#if ENABLE_OVERLAY
3628void 3563void
3629rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3564rxvt_term::scr_overlay_new (int x, int y, int w, int h) noexcept
3630{ 3565{
3631 if (nrow < 1 || ncol < 1) 3566 if (nrow < 1 || ncol < 1)
3632 return; 3567 return;
3633 3568
3634 want_refresh = 1; 3569 want_refresh = 1;
… …
3643 h += 2; min_it (h, nrow); 3578 h += 2; min_it (h, nrow);
3644 3579
3645 x -= 1; clamp_it (x, 0, ncol - w); 3580 x -= 1; clamp_it (x, 0, ncol - w);
3646 y -= 1; clamp_it (y, 0, nrow - h); 3581 y -= 1; clamp_it (y, 0, nrow - h);
3647 3582
3648 ov_x = x; ov_y = y; 3583 ov.x = x; ov.y = y;
3649 ov_w = w; ov_h = h; 3584 ov.w = w; ov.h = h;
3650 3585
3651 ov_text = new text_t *[h]; 3586 ov.text = new text_t *[h];
3652 ov_rend = new rend_t *[h]; 3587 ov.rend = new rend_t *[h];
3653 3588
3654 for (y = 0; y < h; y++) 3589 for (y = 0; y < h; y++)
3655 { 3590 {
3656 text_t *tp = ov_text[y] = new text_t[w]; 3591 text_t *tp = ov.text[y] = new text_t[w];
3657 rend_t *rp = ov_rend[y] = new rend_t[w]; 3592 rend_t *rp = ov.rend[y] = new rend_t[w];
3658 3593
3659 text_t t0, t1, t2; 3594 text_t t0, t1, t2;
3660 rend_t r = OVERLAY_RSTYLE; 3595 rend_t r = OVERLAY_RSTYLE;
3661 3596
3662 if (y == 0) 3597 if (y == 0)
… …
3679 *rp = r; 3614 *rp = r;
3680 } 3615 }
3681} 3616}
3682 3617
3683void 3618void
3684rxvt_term::scr_overlay_off () 3619rxvt_term::scr_overlay_off () noexcept
3685{ 3620{
3686 if (!ov_text) 3621 if (!ov.text)
3687 return; 3622 return;
3688 3623
3689 want_refresh = 1; 3624 want_refresh = 1;
3690 3625
3691 for (int y = 0; y < ov_h; y++) 3626 for (int y = 0; y < ov.h; y++)
3692 { 3627 {
3693 delete [] ov_text[y]; 3628 delete [] ov.text[y];
3694 delete [] ov_rend[y]; 3629 delete [] ov.rend[y];
3695 } 3630 }
3696 3631
3697 delete [] ov_text; ov_text = 0; 3632 delete [] ov.text; ov.text = 0;
3698 delete [] ov_rend; ov_rend = 0; 3633 delete [] ov.rend; ov.rend = 0;
3699} 3634}
3700 3635
3701void 3636void
3702rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3637rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) noexcept
3703{ 3638{
3704 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3639 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3705 return; 3640 return;
3706 3641
3707 x++, y++; 3642 x++, y++;
3708 3643
3709 ov_text[y][x] = text; 3644 ov.text[y][x] = text;
3710 ov_rend[y][x] = rend; 3645 ov.rend[y][x] = rend;
3711} 3646}
3712 3647
3713void 3648void
3714rxvt_term::scr_overlay_set (int x, int y, const char *s) 3649rxvt_term::scr_overlay_set (int x, int y, const char *s) noexcept
3715{ 3650{
3716 while (*s) 3651 while (*s)
3717 scr_overlay_set (x++, y, *s++); 3652 scr_overlay_set (x++, y, *s++);
3718} 3653}
3719 3654
3720void 3655void
3721rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3656rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) noexcept
3722{ 3657{
3723 while (*s) 3658 while (*s)
3724 { 3659 {
3725 text_t t = *s++; 3660 text_t t = *s++;
3726 int width = wcwidth (t); 3661 int width = WCWIDTH (t);
3727 3662
3728 while (width--) 3663 while (width--)
3729 { 3664 {
3730 scr_overlay_set (x++, y, t); 3665 scr_overlay_set (x++, y, t);
3731 t = NOCHAR; 3666 t = NOCHAR;
3732 } 3667 }
3733 } 3668 }
3734} 3669}
3735 3670
3736void 3671void
3737rxvt_term::scr_swap_overlay () 3672rxvt_term::scr_swap_overlay () noexcept
3738{ 3673{
3739 if (!ov_text) 3674 if (!ov.text)
3740 return; 3675 return;
3741 3676
3677 // hide cursor if it is within the overlay area
3678 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3679 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3680 screen.flags &= ~Screen_VisibleCursor;
3681
3742 // swap screen mem with overlay 3682 // swap screen mem with overlay
3743 for (int y = ov_h; y--; ) 3683 for (int y = ov.h; y--; )
3744 { 3684 {
3745 text_t *t1 = ov_text[y]; 3685 text_t *t1 = ov.text[y];
3746 rend_t *r1 = ov_rend[y]; 3686 rend_t *r1 = ov.rend[y];
3747 3687
3748 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3688 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3749 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3689 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3750 3690
3751 for (int x = ov_w; x--; ) 3691 for (int x = ov.w; x--; )
3752 { 3692 {
3753 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3693 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3754 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3694 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3755 } 3695 }
3756 } 3696 }

Diff Legend

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