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.238 by root, Thu Jan 19 16:22:13 2006 UTC vs.
Revision 1.461 by root, Thu Jun 17 00:49:20 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) const 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_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
… …
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) const 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_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 top_row--; 239 top_row--;
… …
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 top_row = 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 + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
283 308
284 if (top_row) 309 if (top_row)
285 { 310 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb 311 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 312 // to come up with a lean and mean algorithm.
313 // TODO: maybe optimise when width didn't change
288 314
289 row_col_t ocur = screen.cur; 315 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 316 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 317
292 do 318 do
293 { 319 {
294 p = MOD (p - 1, prev_total_rows); 320 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 321 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 322 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 323 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
300 324
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 325 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 { 326 {
303 p = MOD (p - 1, prev_total_rows); 327 p = MOD (p - 1, prev_total_rows);
304 328
305 plines++; 329 plines++;
306 llen += prev_ncol; 330 llen += prev_ncol;
… …
319 343
320 // re-assemble the full line by destination lines 344 // re-assemble the full line by destination lines
321 for (int qrow = q; qlines--; qrow++) 345 for (int qrow = q; qlines--; qrow++)
322 { 346 {
323 qline = row_buf + qrow; 347 qline = row_buf + qrow;
324 lalloc (*qline); 348 qline->alloc (); // redundant with next line
325 qline->l = ncol; 349 qline->l = ncol;
326 qline->is_longer (1); 350 qline->is_longer (1);
327 351
328 int qcol = 0; 352 int qcol = 0;
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;
… …
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 top_row = q - term_start; 392 top_row = q - term_start;
368 393
369 // make sure all terminal lines exist 394 // make sure all terminal lines exist
370 while (top_row > 0) 395 while (top_row > 0)
371 scr_blank_screen_mem (ROW (--top_row), 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 = top_row; 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 (); 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 (!IN_RANGE_INC (color, minCOLOR, 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 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 661 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
619 { 662 {
663 min_it (count, total_rows - (nrow - (row2 + 1)));
664
620 top_row = max (top_row - count, -saveLines); 665 top_row = max (top_row - count, -saveLines);
621
622 // scroll everything up 'count' lines
623 term_start = (term_start + count) % total_rows;
624 666
625 // sever bottommost line 667 // sever bottommost line
626 { 668 {
627 line_t &l = ROW(row2 - count); 669 line_t &l = ROW(row2);
628 l.is_longer (0); 670 l.is_longer (0);
629 l.touch (); 671 l.touch ();
630 } 672 }
631 673
632 // erase newly scrolled-in lines 674 // scroll everything up 'count' lines
633 for (int i = count; i--; ) 675 term_start = (term_start + count) % total_rows;
634 {
635 // basically this is a slightly optimized scr_blank_screen_mem
636 // it is worth the effort on slower machines
637 line_t &l = ROW(nrow - 1 - i);
638
639 scr_blank_line (l, 0, l.l, rstyle);
640
641 l.l = 0;
642 l.f = 0;
643 }
644 676
645 // now copy lines below the scroll region bottom to the 677 // now copy lines below the scroll region bottom to the
646 // bottom of the screen again, so they look as if they 678 // bottom of the screen again, so they look as if they
647 // hadn't moved. 679 // hadn't moved.
648 for (int i = nrow; --i > row2; ) 680 for (int i = nrow; --i > row2; )
… …
651 line_t &l2 = ROW(i); 683 line_t &l2 = ROW(i);
652 684
653 ::swap (l1, l2); 685 ::swap (l1, l2);
654 l2.touch (); 686 l2.touch ();
655 } 687 }
688
689 // erase newly scrolled-in lines
690 for (int i = count; i--; )
656 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
657 // move and/or clear selection, if any 706 // move and/or clear selection, if any
658 if (selection.op && current_screen == selection.screen) 707 if (selection.op && current_screen == selection.screen
708 && selection.beg.row <= row2)
659 { 709 {
660 selection.beg.row -= count; 710 selection.beg.row -= count;
661 selection.end.row -= count; 711 selection.end.row -= count;
662 selection.mark.row -= count; 712 selection.mark.row -= count;
663 713
664 if (selection.beg.row < top_row 714 selection_check (0);
665 || selection.end.row < top_row
666 || selection.mark.row < top_row)
667 {
668 CLEAR_ALL_SELECTION ();
669 selection.op = SELECTION_CLEAR;
670 }
671 } 715 }
672 716
673 // finally move the view window, if desired 717 // finally move the view window, if desired
674 if (OPTION (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
675 && view_start != 0 719 && view_start != 0
676 && view_start != -saveLines) 720 && view_start != -saveLines)
677 scr_page (UP, count); 721 scr_page (count);
678 722
679 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
680 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 724 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
681 } 725 }
682 else 726 else
… …
697 { 741 {
698 /* move selected region too */ 742 /* move selected region too */
699 selection.beg.row -= count; 743 selection.beg.row -= count;
700 selection.end.row -= count; 744 selection.end.row -= count;
701 selection.mark.row -= count; 745 selection.mark.row -= count;
702 746
703 selection_check (0); 747 selection_check (0);
704 } 748 }
705 } 749 }
706 750
707 // use a simple and robust scrolling algorithm, this 751 // use a simple and robust scrolling algorithm, this
708 // part of scr_scroll_text is not time-critical. 752 // part of scr_scroll_text is not time-critical.
709 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
710 int rows = row2 - row1 + 1; 762 int rows = row2 - row1 + 1;
711 763
712 min_it (count, rows); 764 min_it (count, rows);
713 765
714 line_t *temp_buf = row_buf + total_rows; 766 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
715 767
716 for (int row = 0; row < rows; row++) 768 for (int row = 0; row < rows; row++)
717 { 769 {
718 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 770 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
719 771
… …
721 scr_blank_screen_mem (temp_buf [row], rstyle); 773 scr_blank_screen_mem (temp_buf [row], rstyle);
722 } 774 }
723 775
724 for (int row = 0; row < rows; row++) 776 for (int row = 0; row < rows; row++)
725 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 }
726 } 785 }
727 786
728 return count; 787 return count;
729} 788}
730 789
731/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
732/* 791/*
733 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
734 */ 793 */
735void 794void ecb_hot
736rxvt_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
737{ 796{
738 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
739 return; 798 return;
740 799
741 unsigned char checksel; 800 bool checksel;
742 unicode_t c; 801 unicode_t c;
743 int ncol = this->ncol; 802 int ncol = this->ncol;
744 const wchar_t *strend = str + len; 803 const wchar_t *strend = str + len;
745 804
746 want_refresh = 1; 805 want_refresh = 1;
747 ZERO_SCROLLBACK (); 806 ZERO_SCROLLBACK ();
748 807
749 if (minlines > 0) 808 if (minlines > 0)
750 { 809 {
751 minlines += screen.cur.row - screen.bscroll; 810 minlines += screen.cur.row - screen.bscroll;
811 min_it (minlines, screen.cur.row - top_row);
752 812
753 if (minlines > 0 813 if (minlines > 0
754 && screen.tscroll == 0 814 && screen.tscroll == 0
755 && screen.bscroll == nrow - 1) 815 && screen.bscroll == nrow - 1)
756 { 816 {
… …
758 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 818 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
759 screen.cur.row -= minlines; 819 screen.cur.row -= minlines;
760 } 820 }
761 } 821 }
762 822
763#ifdef DEBUG_STRICT
764 assert (screen.cur.col < ncol); 823 assert (screen.cur.col < ncol);
765 assert (screen.cur.row < nrow 824 assert (screen.cur.row < nrow
766 && screen.cur.row >= top_row); 825 && screen.cur.row >= top_row);
767#endif
768 int row = screen.cur.row; 826 int row = screen.cur.row;
769 827
770 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 828 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
771 829
772 line_t *line = &ROW(row); 830 line_t *line = &ROW(row);
773 831
774 while (str < strend) 832 while (str < strend)
775 { 833 {
776 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 834 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
777 835
778 if (c < 0x20) 836 if (ecb_unlikely (c < 0x20))
779 if (c == C0_LF) 837 if (c == C0_LF)
780 { 838 {
781 max_it (line->l, screen.cur.col); 839 max_it (line->l, screen.cur.col);
782 840
783 screen.flags &= ~Screen_WrapNext; 841 screen.flags &= ~Screen_WrapNext;
… …
802 { 860 {
803 scr_tab (1, true); 861 scr_tab (1, true);
804 continue; 862 continue;
805 } 863 }
806 864
865 if (ecb_unlikely (
807 if (checksel /* see if we're writing within selection */ 866 checksel /* see if we're writing within selection */
808 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 867 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
809 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 868 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
869 ))
810 { 870 {
811 checksel = 0; 871 checksel = 0;
812 /* 872 /*
813 * If we wrote anywhere in the selected area, kill the selection 873 * If we wrote anywhere in the selected area, kill the selection
814 * XXX: should we kill the mark too? Possibly, but maybe that 874 * XXX: should we kill the mark too? Possibly, but maybe that
815 * should be a similar check. 875 * should be a similar check.
816 */ 876 */
817 CLEAR_SELECTION (); 877 CLEAR_SELECTION ();
818 } 878 }
819 879
820 if (screen.flags & Screen_WrapNext) 880 if (ecb_unlikely (screen.flags & Screen_WrapNext))
821 { 881 {
822 scr_do_wrap (); 882 scr_do_wrap ();
823 883
824 line->l = ncol; 884 line->l = ncol;
825 line->is_longer (1); 885 line->is_longer (1);
826 886
827 row = screen.cur.row; 887 row = screen.cur.row;
828 line = &ROW(row); /* _must_ refresh */ 888 line = &ROW(row); /* _must_ refresh */
829 } 889 }
830 890
831 // some utf-8 decoders "decode" surrogate characters: let's fix this. 891 // some utf-8 decoders "decode" surrogate characters: let's fix this.
832 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 892 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
833 c = 0xfffd; 893 c = 0xfffd;
834 894
835 // 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
836 // do wcwidth before further replacements, as wcwidth might return -1 896 // further replacements, as wcwidth might return -1 for the line
837 // 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
838 // locale. 898 // locale.
839 int width = c < 0x100 ? 1 : wcwidth (c); 899 int width = WCWIDTH (c);
840 900
841 if (charsets [screen.charset] == '0') // DEC SPECIAL 901 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
842 { 902 {
843 // vt100 special graphics and line drawing 903 // vt100 special graphics and line drawing
844 // 5f-7e standard vt100 904 // 5f-7e standard vt100
845 // 40-5e rxvt extension for extra curses acs chars 905 // 40-5e rxvt extension for extra curses acs chars
846 static uint16_t vt100_0[62] = { // 41 .. 7e 906 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
859 c = vt100_0[c - 0x41]; 919 c = vt100_0[c - 0x41];
860 width = 1; // vt100 line drawing characters are always single-width 920 width = 1; // vt100 line drawing characters are always single-width
861 } 921 }
862 } 922 }
863 923
864 if (screen.flags & Screen_Insert) 924 if (ecb_unlikely (screen.flags & Screen_Insert))
865 scr_insdel_chars (width, INSERT); 925 scr_insdel_chars (width, INSERT);
866 926
867 if (width != 0) 927 if (width != 0)
868 { 928 {
869#if !UNICODE_3 929#if !UNICODE_3
… …
874# else 934# else
875 c = 0xfffd; 935 c = 0xfffd;
876# endif 936# endif
877#endif 937#endif
878 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
879 // 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.
880 if (line->t[screen.cur.col] == NOCHAR 959 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
881 || (screen.cur.col < ncol - 1 960 scr_kill_char (*line, screen.cur.col);
882 && line->t[screen.cur.col + 1] == NOCHAR))
883 {
884 int col = screen.cur.col;
885
886 // find begin
887 while (col > 0 && line->t[col] == NOCHAR)
888 col--;
889
890 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
891
892 // found begin, nuke
893 do {
894 line->t[col] = ' ';
895 line->r[col] = rend;
896 col++;
897 } while (col < ncol && line->t[col] == NOCHAR);
898 }
899
900 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
901
902 // if the character doesn't fit into the remaining columns...
903 if (screen.cur.col > ncol - width && ncol >= width)
904 {
905 // ...output spaces
906 c = ' ';
907 // and try the same character next loop iteration
908 --str;
909 }
910 961
911 line->touch (); 962 line->touch ();
912 963
913 do 964 do
914 { 965 {
915 line->t[screen.cur.col] = c; 966 line->t[screen.cur.col] = c;
916 line->r[screen.cur.col] = rend; 967 line->r[screen.cur.col] = rend;
917 968
918 if (screen.cur.col < ncol - 1) 969 if (ecb_likely (screen.cur.col < ncol - 1))
919 screen.cur.col++; 970 screen.cur.col++;
920 else 971 else
921 { 972 {
922 line->l = ncol; 973 line->l = ncol;
923 if (screen.flags & Screen_Autowrap) 974 if (screen.flags & Screen_Autowrap)
924 screen.flags |= Screen_WrapNext; 975 screen.flags |= Screen_WrapNext;
925 break; 976
977 goto end_of_line;
926 } 978 }
927 979
928 c = NOCHAR; 980 c = NOCHAR;
929 } 981 }
930 while (--width > 0); 982 while (ecb_unlikely (--width > 0));
931 983
932 // pad with spaces when overwriting wide character with smaller one 984 // pad with spaces when overwriting wide character with smaller one
933 if (!width) 985 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
934 { 986 {
935 line->touch (); 987 line->t[c] = ' ';
988 line->r[c] = rend;
989 }
936 990
937 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)
938 { 1008 {
939 line->t[c] = ' ';
940 line->r[c] = rend; 1009 linep = line;
1010 tp = line->t + screen.cur.col - 1;
1011 rp = line->r + screen.cur.col - 1;
941 } 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));
942 } 1035 }
943 } 1036 }
944 else // width == 0
945 {
946#if ENABLE_COMBINING
947 // handle combining characters
948 // we just tag the accent on the previous on-screen character.
949 // this is arguably not correct, but also arguably not wrong.
950 // we don't handle double-width characters nicely yet.
951 line_t *linep;
952 text_t *tp;
953 rend_t *rp;
954
955 if (screen.cur.col > 0)
956 {
957 linep = line;
958 tp = line->t + screen.cur.col - 1;
959 rp = line->r + screen.cur.col - 1;
960 }
961 else if (screen.cur.row > 0
962 && ROW(screen.cur.row - 1).is_longer ())
963 {
964 linep = &ROW(screen.cur.row - 1);
965 tp = line->t + ncol - 1;
966 rp = line->r + ncol - 1;
967 }
968 else
969 continue;
970
971 linep->touch ();
972
973 while (*tp == NOCHAR && tp > linep->t)
974 tp--, rp--;
975
976 // first try to find a precomposed character
977 unicode_t n = rxvt_compose (*tp, c);
978 if (n == NOCHAR)
979 n = rxvt_composite.compose (*tp, c);
980
981 *tp = n;
982 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
983#endif 1037#endif
984 }
985 } 1038 }
986 1039
987 max_it (line->l, screen.cur.col); 1040 max_it (line->l, screen.cur.col);
988 1041
989#ifdef DEBUG_STRICT
990 assert (screen.cur.row >= 0); 1042 assert (screen.cur.row >= 0);
991#endif
992} 1043}
993 1044
994/* ------------------------------------------------------------------------- */ 1045/* ------------------------------------------------------------------------- */
995/* 1046/*
996 * 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
997 * XTERM_SEQ: CTRL-H 1048 * XTERM_SEQ: CTRL-H
998 */ 1049 */
999void 1050void
1000rxvt_term::scr_backspace () 1051rxvt_term::scr_backspace () noexcept
1001{ 1052{
1002 want_refresh = 1;
1003
1004 if (screen.cur.col == 0) 1053 if (screen.cur.col == 0)
1005 { 1054 {
1006 if (screen.cur.row > 0) 1055 if (screen.cur.row > 0)
1007 { 1056 {
1008#ifdef TERMCAP_HAS_BW 1057#ifdef TERMCAP_HAS_BW
1009 screen.cur.col = ncol - 1; 1058 screen.cur.col = ncol - 1;
1010 screen.cur.row--; 1059 --screen.cur.row;
1011 return; 1060
1061 want_refresh = 1;
1012#endif 1062#endif
1013 } 1063 }
1014 } 1064 }
1015 else if (!(screen.flags & Screen_WrapNext)) 1065 else if (screen.flags & Screen_WrapNext)
1066 screen.flags &= ~Screen_WrapNext;
1067 else
1016 scr_gotorc (0, -1, RELATIVE); 1068 scr_gotorc (0, -1, RELATIVE);
1017
1018 screen.flags &= ~Screen_WrapNext;
1019} 1069}
1020 1070
1021/* ------------------------------------------------------------------------- */ 1071/* ------------------------------------------------------------------------- */
1022/* 1072/*
1023 * Process Horizontal Tab 1073 * Process Horizontal Tab
1024 * count: +ve = forward; -ve = backwards 1074 * count: +ve = forward; -ve = backwards
1025 * XTERM_SEQ: CTRL-I 1075 * XTERM_SEQ: CTRL-I
1026 */ 1076 */
1027void 1077void
1028rxvt_term::scr_tab (int count, bool ht) 1078rxvt_term::scr_tab (int count, bool ht) noexcept
1029{ 1079{
1030 int i, x; 1080 int i, x;
1031 1081
1032 want_refresh = 1; 1082 want_refresh = 1;
1033 i = x = screen.cur.col; 1083 i = x = screen.cur.col;
… …
1046 x = i; 1096 x = i;
1047 1097
1048 if (!--count) 1098 if (!--count)
1049 break; 1099 break;
1050 } 1100 }
1051 else 1101 else
1052 ht &= l.t[i] == ' ' 1102 ht &= l.t[i] == ' '
1053 && RS_SAME (l.r[i], base_rend); 1103 && RS_SAME (l.r[i], base_rend);
1054 1104
1055 if (count) 1105 if (count)
1056 x = ncol - 1; 1106 x = ncol - 1;
1057 1107
1058 // store horizontal tab commands as characters inside the text 1108 // store horizontal tab commands as characters inside the text
1059 // buffer so they can be selected and pasted. 1109 // buffer so they can be selected and pasted.
1060 if (ht && OPTION (Opt_pastableTabs)) 1110 if (ht && option (Opt_pastableTabs))
1061 { 1111 {
1062 base_rend = SET_FONT (base_rend, 0); 1112 base_rend = SET_FONT (base_rend, 0);
1063 1113
1064 l.touch (x); 1114 l.touch (x);
1065 1115
… …
1098 * Process DEC Back Index 1148 * Process DEC Back Index
1099 * XTERM_SEQ: ESC 6 1149 * XTERM_SEQ: ESC 6
1100 * 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
1101 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1102 */ 1152 */
1103#if ENABLE_FRILLS 1153#if !ENABLE_MINIMAL
1104void 1154void ecb_cold
1105rxvt_term::scr_backindex () 1155rxvt_term::scr_backindex () noexcept
1106{ 1156{
1107 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1108 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1109 else 1159 else
1110 scr_insdel_chars (1, INSERT); 1160 scr_insdel_chars (1, INSERT);
… …
1115 * Process DEC Forward Index 1165 * Process DEC Forward Index
1116 * XTERM_SEQ: ESC 9 1166 * XTERM_SEQ: ESC 9
1117 * 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
1118 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1119 */ 1169 */
1120#if ENABLE_FRILLS 1170#if !ENABLE_MINIMAL
1121void 1171void ecb_cold
1122rxvt_term::scr_forwardindex () 1172rxvt_term::scr_forwardindex () noexcept
1123{ 1173{
1124 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1125 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1126 else 1176 else
1127 { 1177 {
… …
1140/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1141/* 1191/*
1142 * Goto Row/Column 1192 * Goto Row/Column
1143 */ 1193 */
1144void 1194void
1145rxvt_term::scr_gotorc (int row, int col, int relative) 1195rxvt_term::scr_gotorc (int row, int col, int relative) noexcept
1146{ 1196{
1147 want_refresh = 1; 1197 want_refresh = 1;
1148 ZERO_SCROLLBACK (); 1198 ZERO_SCROLLBACK ();
1149 1199
1150 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1200 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1172 } 1222 }
1173 } 1223 }
1174 else 1224 else
1175 { 1225 {
1176 if (screen.flags & Screen_Relative) 1226 if (screen.flags & Screen_Relative)
1227 {
1177 { /* relative origin mode */ 1228 /* relative origin mode */
1178 screen.cur.row = row + screen.tscroll; 1229 screen.cur.row = row + screen.tscroll;
1179 min_it (screen.cur.row, screen.bscroll); 1230 min_it (screen.cur.row, screen.bscroll);
1180 } 1231 }
1181 else 1232 else
1182 screen.cur.row = row; 1233 screen.cur.row = row;
… …
1188/* ------------------------------------------------------------------------- */ 1239/* ------------------------------------------------------------------------- */
1189/* 1240/*
1190 * direction should be UP or DN 1241 * direction should be UP or DN
1191 */ 1242 */
1192void 1243void
1193rxvt_term::scr_index (enum page_dirn direction) 1244rxvt_term::scr_index (enum page_dirn direction) noexcept
1194{ 1245{
1195 int dirn;
1196
1197 want_refresh = 1; 1246 want_refresh = 1;
1198 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1199 1248
1200 dirn = ((direction == UP) ? 1 : -1);
1201
1202 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1203 1250
1204 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1205 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1206 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1207 else 1254 else
1208 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1209 1256
1210 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1211 selection_check (0); 1258 selection_check (0);
1212} 1259}
1213 1260
… …
1215/* 1262/*
1216 * Erase part or whole of a line 1263 * Erase part or whole of a line
1217 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1264 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1218 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1265 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1219 * 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
1220 */ 1268 */
1221void 1269void
1222rxvt_term::scr_erase_line (int mode) 1270rxvt_term::scr_erase_line (int mode) noexcept
1223{ 1271{
1224 unsigned int col, num; 1272 unsigned int col, num;
1225 1273
1226 want_refresh = 1; 1274 want_refresh = 1;
1227 ZERO_SCROLLBACK (); 1275 ZERO_SCROLLBACK ();
… …
1233 line.touch (); 1281 line.touch ();
1234 line.is_longer (0); 1282 line.is_longer (0);
1235 1283
1236 switch (mode) 1284 switch (mode)
1237 { 1285 {
1286 case 3:
1287 if (screen.flags & Screen_WrapNext)
1288 return;
1289
1290 /* fall through */
1291
1238 case 0: /* erase to end of line */ 1292 case 0: /* erase to end of line */
1239 col = screen.cur.col; 1293 col = screen.cur.col;
1240 num = ncol - col; 1294 num = ncol - col;
1241 min_it (line.l, col); 1295 min_it (line.l, col);
1296
1242 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1297 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1243 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1298 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1244 CLEAR_SELECTION (); 1299 CLEAR_SELECTION ();
1245 break; 1300 break;
1301
1246 case 1: /* erase to beginning of line */ 1302 case 1: /* erase to beginning of line */
1247 col = 0; 1303 col = 0;
1248 num = screen.cur.col + 1; 1304 num = screen.cur.col + 1;
1305
1249 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1306 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1250 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1307 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1251 CLEAR_SELECTION (); 1308 CLEAR_SELECTION ();
1252 break; 1309 break;
1310
1253 case 2: /* erase whole line */ 1311 case 2: /* erase whole line */
1254 col = 0; 1312 col = 0;
1255 num = ncol; 1313 num = ncol;
1256 line.l = 0; 1314 line.l = 0;
1257 if (selection.beg.row <= screen.cur.row 1315 if (selection.beg.row <= screen.cur.row
… …
1265 scr_blank_line (line, col, num, rstyle); 1323 scr_blank_line (line, col, num, rstyle);
1266} 1324}
1267 1325
1268/* ------------------------------------------------------------------------- */ 1326/* ------------------------------------------------------------------------- */
1269/* 1327/*
1270 * Erase part of whole of the screen 1328 * Erase part or whole of the screen
1271 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1272 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1273 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1274 */ 1332 */
1275void 1333void
1276rxvt_term::scr_erase_screen (int mode) 1334rxvt_term::scr_erase_screen (int mode) noexcept
1277{ 1335{
1278 int num; 1336 int num;
1279 int32_t row; 1337 int32_t row;
1280 rend_t ren; 1338 rend_t ren;
1281 XGCValues gcvalue; 1339 XGCValues gcvalue;
… …
1284 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1285 1343
1286 switch (mode) 1344 switch (mode)
1287 { 1345 {
1288 case 0: /* erase to end of screen */ 1346 case 0: /* erase to end of screen */
1289 selection_check (1);
1290 scr_erase_line (0); 1347 scr_erase_line (0);
1291 row = screen.cur.row + 1; /* possible OOB */ 1348 row = screen.cur.row + 1; /* possible OOB */
1292 num = nrow - row; 1349 num = nrow - row;
1293 break; 1350 break;
1294 case 1: /* erase to beginning of screen */ 1351 case 1: /* erase to beginning of screen */
1295 selection_check (3);
1296 scr_erase_line (1); 1352 scr_erase_line (1);
1297 row = 0; 1353 row = 0;
1298 num = screen.cur.row; 1354 num = screen.cur.row;
1299 break; 1355 break;
1300 case 2: /* erase whole screen */ 1356 case 2: /* erase whole screen */
1301 selection_check (3);
1302 row = 0; 1357 row = 0;
1303 num = nrow; 1358 num = nrow;
1304 break; 1359 break;
1305 default: 1360 default:
1306 return; 1361 return;
… …
1315 if (row >= nrow) /* Out Of Bounds */ 1370 if (row >= nrow) /* Out Of Bounds */
1316 return; 1371 return;
1317 1372
1318 min_it (num, nrow - row); 1373 min_it (num, nrow - row);
1319 1374
1320 if (rstyle & (RS_RVid | RS_Uline)) 1375 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1321 ren = (rend_t) ~RS_None; 1376 ren = (rend_t) ~RS_None;
1322 else if (GET_BASEBG (rstyle) == Color_bg) 1377 else if (GET_BASEBG (rstyle) == Color_bg)
1323 { 1378 {
1324 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1325 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);
1326 } 1385 }
1327 else 1386 else
1328 { 1387 {
1329 ren = rstyle & (RS_fgMask | RS_bgMask); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
1389
1390 if (mapped)
1391 {
1330 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1392 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1331 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1332 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));
1333 gcvalue.foreground = pix_colors[Color_fg]; 1398 gcvalue.foreground = pix_colors[Color_fg];
1334 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1400 }
1335 } 1401 }
1336 1402
1337 for (; num--; row++) 1403 for (; num--; row++)
1338 { 1404 {
1339 scr_blank_screen_mem (ROW(row), rstyle); 1405 scr_blank_screen_mem (ROW(row), rstyle);
1406
1407 if (row - view_start < nrow)
1340 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1408 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1341 } 1409 }
1342} 1410}
1343 1411
1344#if ENABLE_FRILLS 1412#if !ENABLE_MINIMAL
1345void 1413void
1346rxvt_term::scr_erase_savelines () 1414rxvt_term::scr_erase_savelines () noexcept
1347{ 1415{
1348 want_refresh = 1; 1416 want_refresh = 1;
1349 ZERO_SCROLLBACK (); 1417 ZERO_SCROLLBACK ();
1350 1418
1351 top_row = 0; 1419 top_row = 0;
… …
1355/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1356/* 1424/*
1357 * Fill the screen with `E's 1425 * Fill the screen with `E's
1358 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1359 */ 1427 */
1360void 1428void ecb_cold
1361rxvt_term::scr_E () 1429rxvt_term::scr_E () noexcept
1362{ 1430{
1363 rend_t fs; 1431 rend_t fs;
1364 1432
1365 want_refresh = 1; 1433 want_refresh = 1;
1366 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
1367 1435
1368 num_scr_allow = 0; 1436 num_scr_allow = 0;
1369 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 ();
1370 1442
1371 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1443 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1372 for (int row = nrow; row--; ) 1444 for (int row = nrow; row--; )
1373 { 1445 {
1374 line_t &line = ROW(row); 1446 line_t &line = ROW(row);
… …
1387/* ------------------------------------------------------------------------- */ 1459/* ------------------------------------------------------------------------- */
1388/* 1460/*
1389 * Insert/Delete <count> lines 1461 * Insert/Delete <count> lines
1390 */ 1462 */
1391void 1463void
1392rxvt_term::scr_insdel_lines (int count, int insdel) 1464rxvt_term::scr_insdel_lines (int count, int insdel) noexcept
1393{ 1465{
1394 int end; 1466 int end;
1395 1467
1396 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1397 1469
… …
1417/* ------------------------------------------------------------------------- */ 1489/* ------------------------------------------------------------------------- */
1418/* 1490/*
1419 * Insert/Delete <count> characters from the current position 1491 * Insert/Delete <count> characters from the current position
1420 */ 1492 */
1421void 1493void
1422rxvt_term::scr_insdel_chars (int count, int insdel) 1494rxvt_term::scr_insdel_chars (int count, int insdel) noexcept
1423{ 1495{
1424 int col, row;
1425 rend_t tr;
1426
1427 want_refresh = 1; 1496 want_refresh = 1;
1428 ZERO_SCROLLBACK (); 1497 ZERO_SCROLLBACK ();
1429 1498
1430 if (count <= 0) 1499 if (count <= 0)
1431 return; 1500 return;
… …
1433 scr_do_wrap (); 1502 scr_do_wrap ();
1434 1503
1435 selection_check (1); 1504 selection_check (1);
1436 min_it (count, ncol - screen.cur.col); 1505 min_it (count, ncol - screen.cur.col);
1437 1506
1438 row = screen.cur.row; 1507 int row = screen.cur.row;
1439 1508
1440 line_t *line = &ROW(row); 1509 line_t *line = &ROW(row);
1441 1510
1442 line->touch (); 1511 line->touch ();
1443 line->is_longer (0); 1512 line->is_longer (0);
1444 1513
1514 // nuke wide spanning the start
1515 if (line->t[screen.cur.col] == NOCHAR)
1516 scr_kill_char (*line, screen.cur.col);
1517
1445 switch (insdel) 1518 switch (insdel)
1446 { 1519 {
1447 case INSERT: 1520 case INSERT:
1448 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--)
1449 { 1527 {
1450 line->t[col] = line->t[col - count]; 1528 line->t[col] = line->t[col - count];
1451 line->r[col] = line->r[col - count]; 1529 line->r[col] = line->r[col - count];
1452 } 1530 }
1453
1454 line->l = min (line->l + count, ncol);
1455 1531
1456 if (selection.op && current_screen == selection.screen 1532 if (selection.op && current_screen == selection.screen
1457 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1533 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1458 { 1534 {
1459 if (selection.end.row != screen.cur.row 1535 if (selection.end.row != screen.cur.row
1460 || (selection.end.col + count >= ncol)) 1536 || (selection.end.col + count >= ncol))
1461 CLEAR_SELECTION (); 1537 CLEAR_SELECTION ();
1462 else 1538 else
1539 {
1463 { /* shift selection */ 1540 /* shift selection */
1464 selection.beg.col += count; 1541 selection.beg.col += count;
1465 selection.mark.col += count; /* XXX: yes? */ 1542 selection.mark.col += count; /* XXX: yes? */
1466 selection.end.col += count; 1543 selection.end.col += count;
1467 } 1544 }
1468 } 1545 }
… …
1473 case ERASE: 1550 case ERASE:
1474 screen.cur.col += count; /* don't worry if > ncol */ 1551 screen.cur.col += count; /* don't worry if > ncol */
1475 selection_check (1); 1552 selection_check (1);
1476 screen.cur.col -= count; 1553 screen.cur.col -= count;
1477 1554
1478 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
1479 scr_blank_line (*line, screen.cur.col, count, rstyle); 1559 scr_blank_line (*line, screen.cur.col, count, rstyle);
1480 break; 1560 break;
1481 1561
1482 case DELETE: 1562 case DELETE:
1483 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1563 line->l = max (line->l - count, 0);
1484 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
1485 for (col = screen.cur.col; (col + count) < ncol; col++) 1569 for (int col = screen.cur.col; (col + count) < ncol; col++)
1486 { 1570 {
1487 line->t[col] = line->t[col + count]; 1571 line->t[col] = line->t[col + count];
1488 line->r[col] = line->r[col + count]; 1572 line->r[col] = line->r[col + count];
1489 } 1573 }
1490 1574
1491 line->l = max (line->l - count, 0);
1492 scr_blank_line (*line, ncol - count, count, tr); 1575 scr_blank_line (*line, ncol - count, count, rstyle);
1493 1576
1494 if (selection.op && current_screen == selection.screen 1577 if (selection.op && current_screen == selection.screen
1495 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1578 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1496 { 1579 {
1497 if (selection.end.row != screen.cur.row 1580 if (selection.end.row != screen.cur.row
… …
1514/* ------------------------------------------------------------------------- */ 1597/* ------------------------------------------------------------------------- */
1515/* 1598/*
1516 * Set the scrolling region 1599 * Set the scrolling region
1517 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1518 */ 1601 */
1519void 1602void ecb_cold
1520rxvt_term::scr_scroll_region (int top, int bot) 1603rxvt_term::scr_scroll_region (int top, int bot) noexcept
1521{ 1604{
1522 max_it (top, 0); 1605 max_it (top, 0);
1523 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1524 1607
1525 if (top > bot) 1608 if (top > bot)
… …
1534/* 1617/*
1535 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1536 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1537 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1538 */ 1621 */
1539void 1622void ecb_cold
1540rxvt_term::scr_cursor_visible (int mode) 1623rxvt_term::scr_cursor_visible (int mode) noexcept
1541{ 1624{
1542 want_refresh = 1; 1625 want_refresh = 1;
1543 1626
1544 if (mode) 1627 if (mode)
1545 screen.flags |= Screen_VisibleCursor; 1628 screen.flags |= Screen_VisibleCursor;
… …
1551/* 1634/*
1552 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1553 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1554 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1555 */ 1638 */
1556void 1639void ecb_cold
1557rxvt_term::scr_autowrap (int mode) 1640rxvt_term::scr_autowrap (int mode) noexcept
1558{ 1641{
1559 if (mode) 1642 if (mode)
1560 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1561 else 1644 else
1562 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1645 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1570 * 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
1571 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1572 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1573 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1574 */ 1657 */
1575void 1658void ecb_cold
1576rxvt_term::scr_relative_origin (int mode) 1659rxvt_term::scr_relative_origin (int mode) noexcept
1577{ 1660{
1578 if (mode) 1661 if (mode)
1579 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1580 else 1663 else
1581 screen.flags &= ~Screen_Relative; 1664 screen.flags &= ~Screen_Relative;
… …
1587/* 1670/*
1588 * Set insert/replace mode 1671 * Set insert/replace mode
1589 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1590 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1591 */ 1674 */
1592void 1675void ecb_cold
1593rxvt_term::scr_insert_mode (int mode) 1676rxvt_term::scr_insert_mode (int mode) noexcept
1594{ 1677{
1595 if (mode) 1678 if (mode)
1596 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1597 else 1680 else
1598 screen.flags &= ~Screen_Insert; 1681 screen.flags &= ~Screen_Insert;
… …
1603 * Set/Unset tabs 1686 * Set/Unset tabs
1604 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1605 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1606 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1607 */ 1690 */
1608void 1691void ecb_cold
1609rxvt_term::scr_set_tab (int mode) 1692rxvt_term::scr_set_tab (int mode) noexcept
1610{ 1693{
1611 if (mode < 0) 1694 if (mode < 0)
1612 memset (tabs, 0, ncol * sizeof (char)); 1695 memset (tabs, 0, ncol);
1613 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
1614 tabs [screen.cur.col] = !!mode; 1697 tabs [screen.cur.col] = !!mode;
1615} 1698}
1616 1699
1617/* ------------------------------------------------------------------------- */ 1700/* ------------------------------------------------------------------------- */
… …
1619 * Set reverse/normal video 1702 * Set reverse/normal video
1620 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1703 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1621 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1704 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1622 */ 1705 */
1623void 1706void
1624rxvt_term::scr_rvideo_mode (int mode) 1707rxvt_term::scr_rvideo_mode (bool on) noexcept
1625{ 1708{
1626 XGCValues gcvalue; 1709 rvideo_mode = on;
1627 1710
1711#ifndef NO_BELL
1712 on ^= rvideo_bell;
1713#endif
1714
1628 if (rvideo != mode) 1715 if (rvideo_state != on)
1629 { 1716 {
1630 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
1631 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1727 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1632#if XPM_BACKGROUND 1728#ifdef HAVE_IMG
1633 if (bgPixmap.pixmap == None) 1729 if (bg_img == 0)
1634#endif 1730#endif
1635#if TRANSPARENT 1731 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1636 if (! OPTION (Opt_transparent) || am_transparent == 0)
1637#endif
1638 XSetWindowBackground (display->display, vt,
1639 pix_colors[Color_bg]);
1640 1732
1733 XGCValues gcvalue;
1641 gcvalue.foreground = pix_colors[Color_fg]; 1734 gcvalue.foreground = pix_colors[Color_fg];
1642 gcvalue.background = pix_colors[Color_bg]; 1735 gcvalue.background = pix_colors[Color_bg];
1643 XChangeGC (display->display, gc, GCBackground | GCForeground, 1736 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1644 &gcvalue); 1737
1645 scr_clear (); 1738 scr_clear ();
1646 scr_touch (true); 1739 scr_touch (true);
1647 } 1740 }
1648} 1741}
1649 1742
1650/* ------------------------------------------------------------------------- */ 1743/* ------------------------------------------------------------------------- */
1651/* 1744/*
1652 * Report current cursor position 1745 * Report current cursor position
1653 * XTERM_SEQ: Report position: ESC [ 6 n 1746 * XTERM_SEQ: Report position: ESC [ 6 n
1654 */ 1747 */
1655void 1748void ecb_cold
1656rxvt_term::scr_report_position () 1749rxvt_term::scr_report_position () noexcept
1657{ 1750{
1658 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);
1659} 1752}
1660 1753
1661/* ------------------------------------------------------------------------- * 1754/* ------------------------------------------------------------------------- *
… …
1663 * ------------------------------------------------------------------------- */ 1756 * ------------------------------------------------------------------------- */
1664 1757
1665/* 1758/*
1666 * Set font style 1759 * Set font style
1667 */ 1760 */
1668void 1761void ecb_cold
1669rxvt_term::set_font_style () 1762rxvt_term::set_font_style () noexcept
1670{ 1763{
1671#if 0 1764#if 0
1672 switch (charsets [screen.charset]) 1765 switch (charsets [screen.charset])
1673 { 1766 {
1674 case '0': /* DEC Special Character & Line Drawing Set */ 1767 case '0': /* DEC Special Character & Line Drawing Set */
… …
1695 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1788 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1696 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1789 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1697 * XTERM_SEQ: Invoke G2 character set: ESC N 1790 * XTERM_SEQ: Invoke G2 character set: ESC N
1698 * XTERM_SEQ: Invoke G3 character set: ESC O 1791 * XTERM_SEQ: Invoke G3 character set: ESC O
1699 */ 1792 */
1700void 1793void ecb_cold
1701rxvt_term::scr_charset_choose (int set) 1794rxvt_term::scr_charset_choose (int set) noexcept
1702{ 1795{
1703 screen.charset = set; 1796 screen.charset = set;
1704 set_font_style (); 1797 set_font_style ();
1705} 1798}
1706 1799
… …
1712 * XTERM_SEQ: Set G2 character set: ESC * <C> 1805 * XTERM_SEQ: Set G2 character set: ESC * <C>
1713 * XTERM_SEQ: Set G3 character set: ESC + <C> 1806 * XTERM_SEQ: Set G3 character set: ESC + <C>
1714 * See set_font_style for possible values for <C> 1807 * See set_font_style for possible values for <C>
1715 */ 1808 */
1716void 1809void
1717rxvt_term::scr_charset_set (int set, unsigned int ch) 1810rxvt_term::scr_charset_set (int set, unsigned int ch) noexcept
1718{ 1811{
1719 charsets[set] = (unsigned char)ch; 1812 charsets[set] = (unsigned char)ch;
1720 set_font_style (); 1813 set_font_style ();
1721} 1814}
1722 1815
… …
1726 * ------------------------------------------------------------------------- */ 1819 * ------------------------------------------------------------------------- */
1727 1820
1728/* 1821/*
1729 * refresh matching text. 1822 * refresh matching text.
1730 */ 1823 */
1731bool 1824bool ecb_cold
1732rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1825rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) noexcept
1733{ 1826{
1734 bool found = false; 1827 bool found = false;
1735 1828
1736 for (int i = 0; i < nrow; i++) 1829 for (int i = 0; i < nrow; i++)
1737 { 1830 {
1738 int col = 0;
1739 rend_t *drp = drawn_buf[i].r; 1831 rend_t *drp = drawn_buf[i].r;
1740 1832
1741 for (; col < ncol; col++, drp++) 1833 for (int col = 0; col < ncol; col++, drp++)
1742 if ((*drp & mask) == value) 1834 if ((*drp & mask) == value)
1743 { 1835 {
1744 found = true; 1836 found = true;
1745 *drp = ~value; 1837 *drp = ~value;
1746 } 1838 }
… …
1756 PART_BEG = 0, 1848 PART_BEG = 0,
1757 PART_END, 1849 PART_END,
1758 RC_COUNT 1850 RC_COUNT
1759}; 1851};
1760 1852
1761void 1853void ecb_hot
1762rxvt_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
1763{ 1855{
1764 int i; 1856 int i;
1765 row_col_t rc[RC_COUNT]; 1857 row_col_t rc[RC_COUNT];
1766 1858
1767 if (!drawn_buf) /* sanity check */ 1859 if (!drawn_buf) /* sanity check */
… …
1801/* ------------------------------------------------------------------------- */ 1893/* ------------------------------------------------------------------------- */
1802/* 1894/*
1803 * Refresh the entire screen 1895 * Refresh the entire screen
1804 */ 1896 */
1805void 1897void
1806rxvt_term::scr_touch (bool refresh) 1898rxvt_term::scr_touch (bool refresh) noexcept
1807{ 1899{
1808 scr_expose (0, 0, width, height, refresh); 1900 scr_expose (0, 0, vt_width, vt_height, refresh);
1809} 1901}
1810 1902
1811/* ------------------------------------------------------------------------- */ 1903/* ------------------------------------------------------------------------- */
1812/* 1904/*
1813 * 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
1814 * the top of the screen 1906 * the top of the screen
1815 */ 1907 */
1816void 1908void
1817rxvt_term::scr_move_to (int y, int len) 1909rxvt_term::scr_move_to (int y, int len) noexcept
1818{ 1910{
1819 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1911 // lerp (y, 0, len, top_row, nrow - 1)
1912 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1820} 1913}
1821 1914
1822/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1823/* 1916/*
1824 * Page the screen up/down nlines 1917 * Page the screen up/down nlines
1825 * direction should be UP or DN 1918 * direction should be UP or DN
1826 */ 1919 */
1827bool 1920bool
1828rxvt_term::scr_page (enum page_dirn direction, int nlines) 1921rxvt_term::scr_page (int nlines) noexcept
1829{ 1922{
1830 int new_view_start =
1831 direction == UP ? view_start - nlines
1832 : view_start + nlines;
1833
1834 return scr_changeview (new_view_start); 1923 return scr_changeview (view_start - nlines);
1835} 1924}
1836 1925
1837bool 1926bool
1838rxvt_term::scr_changeview (int new_view_start) 1927rxvt_term::scr_changeview (int new_view_start) noexcept
1839{ 1928{
1840 clamp_it (new_view_start, top_row, 0); 1929 clamp_it (new_view_start, top_row, 0);
1841 1930
1842 if (new_view_start == view_start) 1931 if (new_view_start == view_start)
1843 return false; 1932 return false;
… …
1849 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));
1850 1939
1851 return true; 1940 return true;
1852} 1941}
1853 1942
1854/* ------------------------------------------------------------------------- */ 1943#ifndef NO_BELL
1855void 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
1856rxvt_term::scr_bell () 1955rxvt_term::scr_bell () noexcept
1857{ 1956{
1858#ifndef NO_BELL 1957#ifndef NO_BELL
1859 1958
1860# ifndef NO_MAPALERT 1959# ifndef NO_MAPALERT
1861# ifdef MAPALERT_OPTION 1960# ifdef MAPALERT_OPTION
1862 if (OPTION (Opt_mapAlert)) 1961 if (option (Opt_mapAlert))
1863# endif 1962# endif
1864 XMapWindow (display->display, parent[0]); 1963 XMapWindow (dpy, parent);
1865# endif 1964# endif
1866 1965
1966# if ENABLE_FRILLS
1967 if (option (Opt_urgentOnBell))
1968 set_urgency (1);
1969# endif
1970
1867 if (OPTION (Opt_visualBell)) 1971 if (option (Opt_visualBell))
1868 { 1972 {
1869 scr_rvideo_mode (!rvideo); /* refresh also done */ 1973 rvideo_bell = true;
1974 scr_rvideo_mode (rvideo_mode);
1870 display->flush (); 1975 flush ();
1976
1871 rxvt_usleep (VISUAL_BELL_DURATION); 1977 bell_ev.start (VISUAL_BELL_DURATION);
1872 scr_rvideo_mode (!rvideo); /* refresh also done */
1873 } 1978 }
1874 else 1979 else
1875 XBell (display->display, 0); 1980 XBell (dpy, 0);
1876 1981 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1877#endif 1982#endif
1878} 1983}
1879 1984
1880/* ------------------------------------------------------------------------- */ 1985/* ------------------------------------------------------------------------- */
1881/* ARGSUSED */ 1986void ecb_cold
1882void
1883rxvt_term::scr_printscreen (int fullhist) 1987rxvt_term::scr_printscreen (int fullhist) noexcept
1884{ 1988{
1885#ifdef PRINTPIPE 1989#ifdef PRINTPIPE
1886 int nrows, row_start; 1990 int nrows, row_start;
1887 FILE *fd; 1991 FILE *fd = popen_printer ();
1888 1992
1889 if ((fd = popen_printer ()) == NULL) 1993 if (!fd)
1890 return; 1994 return;
1891 1995
1892 if (fullhist) 1996 if (fullhist)
1893 { 1997 {
1894 nrows = nrow - top_row; 1998 nrows = nrow - top_row;
… …
1900 row_start = view_start; 2004 row_start = view_start;
1901 } 2005 }
1902 2006
1903 wctomb (0, 0); 2007 wctomb (0, 0);
1904 2008
1905 for (int r1 = 0; r1 < nrows; r1++) 2009 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1906 { 2010 {
1907 text_t *tp = ROW(r1).t; 2011 text_t *tp = ROW(r1).t;
1908 int len = ROW(r1).l; 2012 int len = ROW(r1).l;
1909 2013
1910 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
… …
1936/* 2040/*
1937 * Refresh the screen 2041 * Refresh the screen
1938 * drawn_text/drawn_rend contain the screen information before the update. 2042 * drawn_text/drawn_rend contain the screen information before the update.
1939 * screen.text/screen.rend contain what the screen will change to. 2043 * screen.text/screen.rend contain what the screen will change to.
1940 */ 2044 */
1941void 2045void ecb_hot
1942rxvt_term::scr_refresh () 2046rxvt_term::scr_refresh () noexcept
1943{ 2047{
1944 unsigned char must_clear, /* use draw_string not draw_image_string */
1945 showcursor; /* show the cursor */
1946 int16_t col, row, /* column/row we're processing */ 2048 int16_t col, row, /* column/row we're processing */
1947 ocrow; /* old cursor row */ 2049 ocrow; /* old cursor row */
1948 int i; /* tmp */ 2050 int i; /* tmp */
1949#ifndef NO_CURSORCOLOR 2051 rend_t ccol1, /* Cursor colour */
1950 rend_t cc1; /* store colours at cursor position (s) */ 2052 ccol2; /* Cursor colour2 */
1951#endif 2053 rend_t cur_rend;
1952 rend_t *crp; // cursor rendition pointer 2054 int cur_col;
2055 int cursorwidth;
1953 2056
1954 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
1955 2058
1956 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
1957 return; 2060 return;
1958 2061
1959 /* 2062 /*
1960 * A: set up vars 2063 * A: set up vars
1961 */ 2064 */
1962 must_clear = 0;
1963 refresh_count = 0; 2065 refresh_count = 0;
1964 2066
1965#if XPM_BACKGROUND 2067 unsigned int old_screen_flags = screen.flags;
1966 must_clear |= bgPixmap.pixmap != None; 2068 bool have_bg = 0;
1967#endif 2069#ifdef HAVE_IMG
1968#if TRANSPARENT 2070 have_bg = bg_img != 0;
1969 must_clear |= OPTION (Opt_transparent) && am_transparent;
1970#endif 2071#endif
1971 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1972 2073
1973 /* 2074 /*
1974 * B: reverse any characters which are selected 2075 * B: reverse any characters which are selected
1975 */ 2076 */
1976 scr_reverse_selection (); 2077 scr_reverse_selection ();
1977 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
1978 /* 2086 /*
1979 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
1980 */ 2088 */
1981 { 2089 {
1982 unsigned char setoldcursor;
1983 rend_t ccol1, /* Cursor colour */
1984 ccol2; /* Cursor colour2 */
1985
1986 showcursor = (screen.flags & Screen_VisibleCursor);
1987#ifdef CURSOR_BLINK 2090#ifdef CURSOR_BLINK
1988 if (hidden_cursor) 2091 if (hidden_cursor)
1989 showcursor = 0; 2092 showcursor = 0;
1990#endif 2093#endif
1991 2094
… …
1994 int col = screen.cur.col; 2097 int col = screen.cur.col;
1995 2098
1996 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2099 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1997 col--; 2100 col--;
1998 2101
2102 cursorwidth = 1;
2103 while (col + cursorwidth < ncol
2104 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2105 cursorwidth++;
2106
1999 crp = &ROW(screen.cur.row).r[col]; 2107 cur_rend = ROW(screen.cur.row).r[col];
2108 cur_col = col;
2000 2109
2001 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)
2002 { 2133 {
2003 if (OPTION (Opt_cursorUnderline)) 2134 rend_t rend = cur_rend;
2004 *crp ^= RS_Uline; 2135
2005 else
2006 {
2007 *crp ^= RS_RVid; 2136 rend ^= RS_RVid;
2008
2009#ifndef NO_CURSORCOLOR
2010 cc1 = *crp & (RS_fgMask | RS_bgMask);
2011 if (ISSET_PIXCOLOR (Color_cursor))
2012 ccol1 = Color_cursor;
2013 else
2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2015 ccol1 = fgcolor_of (rstyle);
2016#else
2017 ccol1 = Color_fg;
2018#endif
2019 if (ISSET_PIXCOLOR (Color_cursor2))
2020 ccol2 = Color_cursor2;
2021 else
2022#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2023 ccol2 = bgcolor_of (rstyle);
2024#else
2025 ccol2 = Color_bg;
2026#endif
2027 *crp = SET_FGCOLOR (*crp, ccol1); 2137 rend = SET_FGCOLOR (rend, ccol1);
2028 *crp = SET_BGCOLOR (*crp, ccol2); 2138 rend = SET_BGCOLOR (rend, ccol2);
2029#endif 2139
2030 } 2140 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2031 } 2141 }
2032 } 2142 }
2033 2143
2034 /* make sure no outline cursor is left around */ 2144 /* make sure no outline cursor is left around */
2035 setoldcursor = 0; 2145 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2036 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)
2037 { 2153 {
2038 if (screen.cur.row - view_start != ocrow 2154 oldcursor.row = screen.cur.row - view_start;
2039 || screen.cur.col != oldcursor.col) 2155 oldcursor.col = screen.cur.col;
2040 {
2041 if (ocrow < nrow
2042 && oldcursor.col < ncol)
2043 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2044
2045 if (focus || !showcursor)
2046 oldcursor.row = -1;
2047 else
2048 setoldcursor = 1;
2049 }
2050 } 2156 }
2051 else if (!focus) 2157 else
2052 setoldcursor = 1;
2053
2054 if (setoldcursor)
2055 {
2056 if (screen.cur.row - view_start >= nrow)
2057 oldcursor.row = -1; 2158 oldcursor.row = -1;
2058 else
2059 {
2060 oldcursor.row = screen.cur.row - view_start;
2061 oldcursor.col = screen.cur.col;
2062 }
2063 }
2064 } 2159 }
2065
2066 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2067#if ENABLE_OVERLAY
2068 scr_swap_overlay ();
2069#endif
2070 2160
2071#ifndef NO_SLOW_LINK_SUPPORT 2161#ifndef NO_SLOW_LINK_SUPPORT
2072 /* 2162 /*
2073 * D: CopyArea pass - very useful for slower links 2163 * D: CopyArea pass - very useful for slower links
2074 * This has been deliberately kept simple. 2164 * This has been deliberately kept simple.
2075 */ 2165 */
2076 if (!display->is_local 2166 if (!display->is_local
2077 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2167 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2078 && abs (num_scr) < nrow && !must_clear) 2168 && abs (num_scr) < nrow && !have_bg)
2079 { 2169 {
2080 int16_t nits; 2170 int16_t nits;
2171 int i = num_scr;
2081 int j; 2172 int j;
2082 int len, wlen; 2173 int len, wlen;
2083 dLocal (int, num_scr);
2084 2174
2085 j = nrow; 2175 j = nrow;
2086 wlen = len = -1; 2176 wlen = len = -1;
2087 row = i > 0 ? 0 : j - 1; 2177 row = i > 0 ? 0 : j - 1;
2178
2088 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2179 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2089 { 2180 {
2090 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2181 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2091 { 2182 {
2092 line_t s = ROW(view_start + row); 2183 line_t s = ROW(view_start + row);
… …
2113 wlen = row; 2204 wlen = row;
2114 continue; 2205 continue;
2115 } 2206 }
2116 } 2207 }
2117 2208
2118 if (len != -1) 2209 if (len >= 0)
2119 { 2210 {
2120 /* also comes here at end if needed because of >= above */ 2211 /* also comes here at end if needed because of >= above */
2121 if (wlen < len) 2212 if (wlen < len)
2122 ::swap (wlen, len); 2213 ::swap (wlen, len);
2123 2214
2215 XGCValues gcv;
2216
2217 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2124 XCopyArea (display->display, vt, vt, 2218 XCopyArea (dpy, vt, vt,
2125 gc, 0, Row2Pixel (len + i), 2219 gc, 0, Row2Pixel (len + i),
2126 (unsigned int)this->width, 2220 (unsigned int)this->width,
2127 (unsigned int)Height2Pixel (wlen - len + 1), 2221 (unsigned int)Height2Pixel (wlen - len + 1),
2128 0, Row2Pixel (len)); 2222 0, Row2Pixel (len));
2223 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2224
2129 len = -1; 2225 len = -1;
2130 } 2226 }
2131 } 2227 }
2132 } 2228 }
2133#endif 2229#endif
… …
2148 int ypixel = (int)Row2Pixel (row); 2244 int ypixel = (int)Row2Pixel (row);
2149 2245
2150 for (col = 0; col < ncol; col++) 2246 for (col = 0; col < ncol; col++)
2151 { 2247 {
2152 /* compare new text with old - if exactly the same then continue */ 2248 /* compare new text with old - if exactly the same then continue */
2153 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2249 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2154 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2155 || (stp[col] == ' ' /* space w/ no background change */
2156 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2157 continue; 2250 continue;
2158 2251
2159 // redraw one or more characters 2252 // redraw one or more characters
2160 2253
2161 // seek to the beginning of wide characters 2254 // seek to the beginning of wide characters
2162 while (stp[col] == NOCHAR && col > 0) 2255 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2163 --col; 2256 --col;
2164 2257
2165 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2258 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2166 text_t *text = stp + col; 2259 text_t *text = stp + col;
2167 int count = 1; 2260 int count = 1;
2168 2261
2169 dtp[col] = stp[col]; 2262 dtp[col] = stp[col];
2170 drp[col] = rend; 2263 drp[col] = rend;
… …
2174 for (i = 0; ++col < ncol; ) 2267 for (i = 0; ++col < ncol; )
2175 { 2268 {
2176 if (stp[col] == NOCHAR) 2269 if (stp[col] == NOCHAR)
2177 { 2270 {
2178 dtp[col] = stp[col]; 2271 dtp[col] = stp[col];
2179 drp[col] = rend; 2272 drp[col] = srp[col];
2273
2180 count++; 2274 count++;
2181 i++; 2275 i++;
2182 2276
2183 continue; 2277 continue;
2184 } 2278 }
… …
2189 count++; 2283 count++;
2190 2284
2191 if (stp[col] != dtp[col] 2285 if (stp[col] != dtp[col]
2192 || !RS_SAME (srp[col], drp[col])) 2286 || !RS_SAME (srp[col], drp[col]))
2193 { 2287 {
2194 if (must_clear && (i++ > count / 2)) 2288 if (have_bg && (i++ > count / 2))
2195 break; 2289 break;
2196 2290
2197 dtp[col] = stp[col]; 2291 dtp[col] = stp[col];
2198 drp[col] = rend; 2292 drp[col] = rend;
2199 i = 0; 2293 i = 0;
2200 } 2294 }
2201 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2295 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2202 break; 2296 break;
2203 } 2297 }
2204 2298
2205 col--; /* went one too far. move back */ 2299 col--; /* went one too far. move back */
2206 count -= i; /* dump any matching trailing chars */ 2300 count -= i; /* dump any matching trailing chars */
2207 2301
2208 // sometimes we optimize away the trailing NOCHAR's, add them back 2302 // sometimes we optimize away the trailing NOCHAR's, add them back
2209 while (i && text[count] == NOCHAR) 2303 while (ecb_unlikely (i && text[count] == NOCHAR))
2210 count++, i--; 2304 count++, i--;
2211 2305
2212 /* 2306 /*
2213 * Determine the attributes for the string 2307 * Determine the attributes for the string
2214 */ 2308 */
2215 int fore = fgcolor_of (rend); // desired foreground 2309 int fore = fgcolor_of (rend); // desired foreground
2216 int back = bgcolor_of (rend); // desired background 2310 int back = bgcolor_of (rend); // desired background
2217 2311
2218 // 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
2219 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)))
2220 { 2314 {
2221#if ENABLE_STYLES
2222 // force redraw after "careful" characters to avoid pixel droppings
2223 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2224 drp[col + 1] = ~srp[col + 1];
2225
2226 // include previous careful character(s) if possible, looks nicer (best effort...)
2227 while (text > stp
2228 && srp[text - stp - 1] & RS_Careful
2229 && RS_SAME (rend, srp[text - stp - 1]))
2230 text--, count++, xpixel -= fwidth;
2231#endif
2232
2233 bool invert = rend & RS_RVid; 2315 bool invert = rend & RS_RVid;
2234 2316
2235#ifndef NO_BOLD_UNDERLINE_REVERSE 2317#ifndef NO_BOLD_UNDERLINE_REVERSE
2236 if (rend & RS_Bold
2237 && fore == Color_fg) 2318 if (rend & RS_Bold && fore == Color_fg)
2238 { 2319 {
2239 if (ISSET_PIXCOLOR (Color_BD)) 2320 if (ISSET_PIXCOLOR (Color_BD))
2240 fore = Color_BD; 2321 fore = Color_BD;
2241# if !ENABLE_STYLES 2322# if !ENABLE_STYLES
2242 else 2323 else
2243 invert = !invert; 2324 invert = !invert;
2244# endif 2325# endif
2245 } 2326 }
2246 2327
2247 if (rend & RS_Italic 2328 if (rend & RS_Italic && fore == Color_fg)
2248 && fore == Color_fg)
2249 { 2329 {
2250 if (ISSET_PIXCOLOR (Color_IT)) 2330 if (ISSET_PIXCOLOR (Color_IT))
2251 fore = Color_IT; 2331 fore = Color_IT;
2252# if !ENABLE_STYLES 2332# if !ENABLE_STYLES
2253 else 2333 else
2254 invert = !invert; 2334 invert = !invert;
2255# endif 2335# endif
2256 } 2336 }
2257 2337
2258 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2338 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2259 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 }
2260#endif 2360#endif
2261 2361
2262 if (invert) 2362 if (invert)
2263 { 2363 {
2264 ::swap (fore, back); 2364 ::swap (fore, back);
2265 2365
2266#ifndef NO_BOLD_UNDERLINE_REVERSE 2366#ifndef NO_BOLD_UNDERLINE_REVERSE
2267 if (ISSET_PIXCOLOR (Color_RV))
2268 back = Color_RV;
2269
2270 if (fore == back) 2367 if (fore == back)
2271 { 2368 {
2272 fore = Color_bg; 2369 fore = Color_bg;
2273 back = Color_fg; 2370 back = Color_fg;
2274 } 2371 }
… …
2276 } 2373 }
2277 2374
2278#ifdef TEXT_BLINK 2375#ifdef TEXT_BLINK
2279 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2376 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2280 { 2377 {
2281 if (!text_blink_ev.active) 2378 if (!text_blink_ev.is_active ())
2282 { 2379 {
2283 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2380 text_blink_ev.again ();
2284 hidden_text = 0; 2381 hidden_text = 0;
2285 } 2382 }
2286 else if (hidden_text) 2383 else if (hidden_text)
2287 fore = back; 2384 fore = back;
2288 } 2385 }
2289#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
2290 } 2405 }
2291 2406
2292 /* 2407 /*
2293 * Actually do the drawing of the string here 2408 * Actually do the drawing of the string here
2294 */ 2409 */
2295 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2410 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2296 2411
2297 if (back == fore) 2412 if (ecb_likely (have_bg && back == Color_bg))
2298 font->clear_rect (*drawable, xpixel, ypixel,
2299 fwidth * count, fheight,
2300 back);
2301 else if (back == Color_bg)
2302 { 2413 {
2303 if (must_clear) 2414 // this is very ugly, maybe push it into ->draw?
2304 {
2305 CLEAR_CHARS (xpixel, ypixel, count);
2306 2415
2307 for (i = 0; i < count; i++) /* don't draw empty strings */ 2416 for (i = 0; i < count; i++) /* don't draw empty strings */
2308 if (text[i] != ' ') 2417 if (text[i] != ' ')
2309 { 2418 {
2310 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2419 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2311 break; 2420 goto did_clear;
2312 }
2313 } 2421 }
2314 else 2422
2315 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2423 CLEAR_CHARS (xpixel, ypixel, count);
2424 did_clear: ;
2316 } 2425 }
2317 else 2426 else
2318 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2427 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2319 2428
2320 if (rend & RS_Uline && font->descent > 1 && fore != back) 2429 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2321 { 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
2322#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2323 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2324 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2325 else 2438 else
2326#endif 2439#endif
2327 XSetForeground (display->display, gc, pix_colors[fore]); 2440 XSetForeground (dpy, gc, pix_colors[fore]);
2328 2441
2329 XDrawLine (display->display, drawBuffer, gc, 2442 XDrawLine (dpy, vt, gc,
2330 xpixel, ypixel + font->ascent + 1, 2443 xpixel, ypixel + font->ascent + 1,
2331 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2444 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2332 } 2445 }
2333 } /* for (col....) */ 2446 } /* for (col....) */
2334 } /* for (row....) */ 2447 } /* for (row....) */
2335 2448
2336#if ENABLE_OVERLAY
2337 scr_swap_overlay ();
2338#endif
2339 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2340
2341 /* 2449 /*
2342 * G: cleanup cursor and display outline cursor if necessary 2450 * G: cleanup cursor and display outline cursor if necessary
2343 */ 2451 */
2344 if (showcursor) 2452 if (showcursor)
2345 { 2453 {
2346 if (focus) 2454 if (focus)
2347 { 2455 {
2348 if (OPTION (Opt_cursorUnderline)) 2456 if (cursor_type == 0)
2349 *crp ^= RS_Uline; 2457 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2350 else 2458 else if (oldcursor.row >= 0)
2351 { 2459 {
2352 *crp ^= RS_RVid; 2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2353#ifndef NO_CURSORCOLOR 2461 if (cursor_type == 1)
2354 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2462 XFillRectangle (dpy, vt, gc,
2355#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));
2356 } 2473 }
2357 } 2474 }
2358 else if (oldcursor.row >= 0) 2475 else if (oldcursor.row >= 0)
2359 { 2476 {
2360 int cursorwidth = 1;
2361 int col = oldcursor.col;
2362
2363 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2364 col--;
2365
2366 while (col + cursorwidth < ncol
2367 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2368 cursorwidth++;
2369
2370#ifndef NO_CURSORCOLOR
2371 if (ISSET_PIXCOLOR (Color_cursor))
2372 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2477 XSetForeground (dpy, gc, pix_colors[ccol1]);
2373#endif
2374 2478
2375 XDrawRectangle (display->display, drawBuffer, gc, 2479 XDrawRectangle (dpy, vt, gc,
2376 Col2Pixel (col), 2480 Col2Pixel (cur_col),
2377 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2378 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2379 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2380 } 2484 }
2381 } 2485 }
2382 2486
2383 /* 2487 /*
2384 * H: cleanup selection 2488 * H: cleanup selection
2385 */ 2489 */
2490#if ENABLE_OVERLAY
2491 scr_swap_overlay ();
2492#endif
2493 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2494
2386 scr_reverse_selection (); 2495 scr_reverse_selection ();
2387 2496
2497 screen.flags = old_screen_flags;
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
2461void 2591void
2462rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2592rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept
2463{ 2593{
2464 int view_end = view_start + nrow; 2594 int view_end = view_start + nrow;
2465 int row, col; 2595 int row, col;
2466 2596
2467 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2597 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2479 srp[col] ^= rstyle2; 2609 srp[col] ^= rstyle2;
2480 } 2610 }
2481} 2611}
2482 2612
2483void 2613void
2484rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2614rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept
2485{ 2615{
2486 int view_end = view_start + nrow; 2616 int view_end = view_start + nrow;
2487 int row, col; 2617 int row, col;
2488 2618
2489 if (beg_row >= view_start) 2619 if (beg_row >= view_start)
… …
2505 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2635 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2506 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2507} 2637}
2508 2638
2509/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2510void 2640void ecb_hot
2511rxvt_term::scr_reverse_selection () 2641rxvt_term::scr_reverse_selection () noexcept
2512{ 2642{
2513 if (selection.op 2643 if (selection.op
2514 && current_screen == selection.screen 2644 && current_screen == selection.screen
2515 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
2516 { 2646 {
2517#if ENABLE_FRILLS 2647#if !ENABLE_MINIMAL
2518 if (selection.rect) 2648 if (selection.rect)
2519 scr_xor_rect (selection.beg.row, selection.beg.col, 2649 scr_xor_rect (selection.beg.row, selection.beg.col,
2520 selection.end.row, selection.end.col, 2650 selection.end.row, selection.end.col,
2521 RS_RVid, RS_RVid | RS_Uline); 2651 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2522 else 2652 else
2523#endif 2653#endif
2524 scr_xor_span (selection.beg.row, selection.beg.col, 2654 scr_xor_span (selection.beg.row, selection.beg.col,
2525 selection.end.row, selection.end.col, 2655 selection.end.row, selection.end.col,
2526 RS_RVid); 2656 RS_Sel | RS_RVid);
2527 } 2657 }
2528} 2658}
2529 2659
2530/* ------------------------------------------------------------------------- */ 2660/* ------------------------------------------------------------------------- */
2531/* 2661/*
2532 * Dump the whole scrollback and screen to the passed filedescriptor. The 2662 * Dump the whole scrollback and screen to the passed filedescriptor. The
2533 * invoking routine must close the fd. 2663 * invoking routine must close the fd.
2534 */ 2664 */
2535#if 0 2665#if 0
2536void 2666void
2537rxvt_term::scr_dump (int fd) 2667rxvt_term::scr_dump (int fd) noexcept
2538{ 2668{
2539 int row, wrote; 2669 // if this method is needed, it can be implemented by factoring the
2540 unsigned int width, towrite; 2670 // relevant code in scr_printscreen
2541 char r1[] = "\n";
2542
2543 for (row = saveLines - nsaved;
2544 row < saveLines + nrow - 1; row++)
2545 {
2546 width = row_buf[row].l >= 0 ? row_buf[row].l
2547 : ncol;
2548 for (towrite = width; towrite; towrite -= wrote)
2549 {
2550 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2551 towrite);
2552 if (wrote < 0)
2553 return; /* XXX: death, no report */
2554 }
2555 if (row_buf[row].l >= 0)
2556 if (write (fd, r1, 1) <= 0)
2557 return; /* XXX: death, no report */
2558 }
2559} 2671}
2560#endif 2672#endif
2561 2673
2562/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2563 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
2564 * ------------------------------------------------------------------------- */ 2676 * ------------------------------------------------------------------------- */
2565void 2677void
2566rxvt_term::selection_check (int check_more) 2678rxvt_term::selection_check (int check_more) noexcept
2567{ 2679{
2568 row_col_t pos;
2569
2570 if (!selection.op) 2680 if (!selection.op)
2571 return; 2681 return;
2572 2682
2573 pos.row = pos.col = 0;
2574 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2575 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2684 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2576 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2685 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2577 || (check_more == 1 2686 || (check_more == 1
2578 && current_screen == selection.screen 2687 && current_screen == selection.screen
2579 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2580 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2581 || (check_more == 2
2582 && ROWCOL_IS_BEFORE (selection.beg, pos)
2583 && ROWCOL_IS_AFTER (selection.end, pos))
2584 || (check_more == 3
2585 && ROWCOL_IS_AFTER (selection.end, pos))
2586 || (check_more == 4 /* screen width change */
2587 && (selection.beg.row != selection.end.row
2588 || selection.end.col > ncol)))
2589 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;
2590} 2705}
2591 2706
2592/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2593/* 2708/*
2594 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2595 */ 2710 */
2596void 2711void
2597rxvt_term::paste (char *data, unsigned int len) 2712rxvt_term::tt_paste (char *data, unsigned int len) noexcept
2598{ 2713{
2599 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2600 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2601 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2602 data[i] = C0_CR; 2717 data[i] = C0_CR;
2603 2718
2719 if (priv_modes & PrivMode_BracketPaste)
2720 tt_printf ("\x1b[200~");
2721
2604 tt_write (data, len); 2722 tt_write (data, len);
2605}
2606 2723
2607/* ------------------------------------------------------------------------- */ 2724 if (priv_modes & PrivMode_BracketPaste)
2608/* 2725 tt_printf ("\x1b[201~");
2609 * Respond to a notification that a primary selection has been sent
2610 * EXT: SelectionNotify
2611 */
2612void
2613rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2614{
2615 if (prop == None) /* check for failed XConvertSelection */
2616 {
2617 if ((selection_type & Sel_CompoundText))
2618 {
2619 int selnum = selection_type & Sel_whereMask;
2620
2621 selection_type = 0;
2622 if (selnum != Sel_direct)
2623 selection_request_other (XA_STRING, selnum);
2624 }
2625
2626 if ((selection_type & Sel_UTF8String))
2627 {
2628 int selnum = selection_type & Sel_whereMask;
2629
2630 selection_type = Sel_CompoundText;
2631 if (selnum != Sel_direct)
2632 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2633 else
2634 selection_type = 0;
2635 }
2636
2637 return;
2638 }
2639
2640 unsigned long bytes_after;
2641 XTextProperty ct;
2642
2643 if (XGetWindowProperty (display->display, win, prop,
2644 0, PROP_SIZE / 4,
2645 delete_prop, AnyPropertyType,
2646 &ct.encoding, &ct.format,
2647 &ct.nitems, &bytes_after,
2648 &ct.value) != Success)
2649 {
2650 ct.value = 0;
2651 goto bailout;
2652 }
2653
2654 if (ct.encoding == None)
2655 goto bailout;
2656
2657 if (bytes_after)
2658 {
2659 // fetch and append remaining data
2660 XTextProperty ct2;
2661
2662 if (XGetWindowProperty (display->display, win, prop,
2663 ct.nitems / 4, (bytes_after + 3) / 4,
2664 delete_prop, AnyPropertyType,
2665 &ct2.encoding, &ct2.format,
2666 &ct2.nitems, &bytes_after,
2667 &ct2.value) != Success)
2668 goto bailout;
2669
2670 // realloc should be compatible to XFree, here, and elsewhere, too
2671 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2672 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2673 ct.nitems += ct2.nitems;
2674
2675 XFree (ct2.value);
2676 }
2677
2678 if (ct.value == 0)
2679 goto bailout;
2680
2681 if (ct.encoding == xa[XA_INCR])
2682 {
2683 // INCR selection, start handshake
2684 if (!delete_prop)
2685 XDeleteProperty (display->display, win, prop);
2686
2687 selection_wait = Sel_incr;
2688 incr_buf_fill = 0;
2689 incr_ev.start (NOW + 10);
2690
2691 goto bailout;
2692 }
2693
2694 if (ct.nitems == 0)
2695 {
2696 if (selection_wait == Sel_incr)
2697 {
2698 XFree (ct.value);
2699
2700 // finally complete, now paste the whole thing
2701 selection_wait = Sel_normal;
2702 ct.value = (unsigned char *)incr_buf;
2703 ct.nitems = incr_buf_fill;
2704 incr_buf = 0;
2705 incr_buf_size = 0;
2706 incr_ev.stop ();
2707 }
2708 else
2709 {
2710 if (selection_wait == Sel_normal
2711 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2712 {
2713 /*
2714 * pass through again trying CUT_BUFFER0 if we've come from
2715 * XConvertSelection () but nothing was presented
2716 */
2717 selection_paste (display->root, XA_CUT_BUFFER0, False);
2718 }
2719
2720 goto bailout;
2721 }
2722 }
2723 else if (selection_wait == Sel_incr)
2724 {
2725 incr_ev.start (NOW + 10);
2726
2727 while (incr_buf_fill + ct.nitems > incr_buf_size)
2728 {
2729 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2730 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2731 }
2732
2733 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2734 incr_buf_fill += ct.nitems;
2735
2736 goto bailout;
2737 }
2738
2739 char **cl;
2740 int cr;
2741
2742#if ENABLE_FRILLS
2743 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2744 // so recode it manually
2745 if (ct.encoding == xa[XA_UTF8_STRING])
2746 {
2747 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2748 char *s = rxvt_wcstombs (w);
2749 free (w);
2750 // TODO: strlen == only the first element will be converted. well...
2751 paste (s, strlen (s));
2752 free (s);
2753 }
2754 else
2755#endif
2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2757 && cl)
2758 {
2759 for (int i = 0; i < cr; i++)
2760 paste (cl[i], strlen (cl[i]));
2761
2762 XFreeStringList (cl);
2763 }
2764 else
2765 paste ((char *)ct.value, ct.nitems); // paste raw
2766
2767bailout:
2768 XFree (ct.value);
2769
2770 if (selection_wait == Sel_normal)
2771 selection_wait = Sel_none;
2772} 2726}
2773 2727
2774void 2728void
2775rxvt_term::incr_cb (time_watcher &w) 2729rxvt_term::paste (char *data, unsigned int len) noexcept
2776{ 2730{
2777 selection_wait = Sel_none; 2731 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2778
2779 incr_buf_size = 0;
2780 free (incr_buf);
2781
2782 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2783}
2784
2785void
2786rxvt_term::selection_property (Window win, Atom prop)
2787{
2788 if (prop == None || selection_wait != Sel_incr)
2789 return; 2732 return;
2790 2733
2791 selection_paste (win, prop, true); 2734 tt_paste (data, len);
2792} 2735}
2793 2736
2794/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2795/* 2738/*
2796 * Request the current selection: 2739 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2797 * Order: > internal selection if available 2740 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2798 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2741 * as fallback
2799 * > CUT_BUFFER0
2800 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2801 * will auto fallback to CUT_BUFFER0
2802 * EXT: button 2 release 2742 * EXT: button 2 release
2803 */ 2743 */
2804void 2744void
2805rxvt_term::selection_request (Time tm) 2745rxvt_term::selection_request (Time tm, int selnum) noexcept
2806{ 2746{
2807 if (selection.text) 2747 if (!selection_req)
2808 { /* internal selection */
2809 char *str = rxvt_wcstombs (selection.text, selection.len);
2810 paste (str, strlen (str));
2811 free (str);
2812 return;
2813 } 2748 {
2814 else 2749 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2750 selection_req->run ();
2815 { 2751 }
2816 int i;
2817
2818 selection_request_time = tm;
2819 selection_wait = Sel_normal;
2820
2821 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2822 {
2823#if X_HAVE_UTF8_STRING
2824 selection_type = Sel_UTF8String;
2825 if (selection_request_other (xa[XA_UTF8_STRING], i))
2826 return;
2827#else
2828 selection_type = Sel_CompoundText;
2829 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2830 return;
2831#endif
2832 }
2833 }
2834
2835 selection_wait = Sel_none; /* don't loop in selection_paste () */
2836 selection_paste (display->root, XA_CUT_BUFFER0, false);
2837}
2838
2839int
2840rxvt_term::selection_request_other (Atom target, int selnum)
2841{
2842 Atom sel;
2843
2844 selection_type |= selnum;
2845
2846 if (selnum == Sel_Primary)
2847 sel = XA_PRIMARY;
2848 else if (selnum == Sel_Secondary)
2849 sel = XA_SECONDARY;
2850 else
2851 sel = xa[XA_CLIPBOARD];
2852
2853 if (XGetSelectionOwner (display->display, sel) != None)
2854 {
2855 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2856 vt, selection_request_time);
2857 return 1;
2858 }
2859
2860 return 0;
2861} 2752}
2862 2753
2863/* ------------------------------------------------------------------------- */ 2754/* ------------------------------------------------------------------------- */
2864/* 2755/*
2865 * Clear all selected text 2756 * Clear all selected text
2866 * EXT: SelectionClear 2757 * EXT: SelectionClear
2867 */ 2758 */
2868void 2759void
2869rxvt_term::selection_clear () 2760rxvt_term::selection_clear (bool clipboard) noexcept
2870{ 2761{
2762 if (!clipboard)
2763 {
2871 want_refresh = 1; 2764 want_refresh = 1;
2872 free (selection.text); 2765 free (selection.text);
2873 selection.text = NULL; 2766 selection.text = NULL;
2874 selection.len = 0; 2767 selection.len = 0;
2875 CLEAR_SELECTION (); 2768 CLEAR_SELECTION ();
2876 2769
2877 if (display->selection_owner == this) 2770 if (display->selection_owner == this)
2878 display->selection_owner = 0; 2771 display->selection_owner = 0;
2772 }
2773 else
2774 {
2775 free (selection.clip_text);
2776 selection.clip_text = NULL;
2777 selection.clip_len = 0;
2778
2779 if (display->clipboard_owner == this)
2780 display->clipboard_owner = 0;
2781 }
2879} 2782}
2880 2783
2881/* ------------------------------------------------------------------------- */ 2784/* ------------------------------------------------------------------------- */
2882/* 2785/*
2883 * Copy a selection into the cut buffer 2786 * Copy a selection into the cut buffer
2884 * EXT: button 1 or 3 release 2787 * EXT: button 1 or 3 release
2885 */ 2788 */
2886void 2789void
2887rxvt_term::selection_make (Time tm) 2790rxvt_term::selection_make (Time tm)
2888{ 2791{
2889 int i; 2792 int size;
2890 wchar_t *new_selection_text; 2793 wchar_t *new_selection_text;
2891 text_t *t; 2794 text_t *t;
2892 2795
2893 switch (selection.op) 2796 switch (selection.op)
2894 { 2797 {
… …
2910 return; /* nothing selected, go away */ 2813 return; /* nothing selected, go away */
2911 2814
2912 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2815 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2913 return; 2816 return;
2914 2817
2915 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2818 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2916 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2819 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2917 2820
2918 int ofs = 0; 2821 int ofs = 0;
2919 int extra = 0; 2822 int extra = 0;
2920 2823
2921 int col = selection.beg.col; 2824 int col = selection.beg.col;
… …
2923 2826
2924 int end_col; 2827 int end_col;
2925 2828
2926 for (; row <= selection.end.row; row++, col = 0) 2829 for (; row <= selection.end.row; row++, col = 0)
2927 { 2830 {
2928#if ENABLE_FRILLS 2831#if !ENABLE_MINIMAL
2929 if (selection.rect) 2832 if (selection.rect)
2930 { 2833 {
2931 col = selection.beg.col; 2834 col = selection.beg.col;
2932 end_col = ncol + 1; 2835 end_col = selection.end.col;
2933 } 2836 }
2934 else 2837 else
2935#endif 2838#endif
2936 end_col = ROW(row).l; 2839 end_col = ROW(row).l;
2937 2840
2938 col = max (col, 0); 2841 col = max (col, 0);
2939 2842
2940 if (row == selection.end.row 2843 if (row == selection.end.row)
2941#if ENABLE_FRILLS
2942 || selection.rect
2943#endif
2944 )
2945 min_it (end_col, selection.end.col); 2844 min_it (end_col, selection.end.col);
2946 2845
2947 t = ROW(row).t + col; 2846 t = ROW(row).t + col;
2948 2847
2949 for (; col < end_col; col++) 2848 for (; col < end_col; col++)
… …
2951 if (*t == NOCHAR) 2850 if (*t == NOCHAR)
2952 t++; 2851 t++;
2953#if ENABLE_COMBINING 2852#if ENABLE_COMBINING
2954 else if (IS_COMPOSE (*t)) 2853 else if (IS_COMPOSE (*t))
2955 { 2854 {
2956 int len = rxvt_composite.expand (*t, 0); 2855 int len = rxvt_composite.expand (*t);
2957 2856
2958 extra -= (len - 1); 2857 extra -= (len - 1);
2959 2858
2960 if (extra < 0) 2859 if (extra < 0)
2961 { 2860 {
2962 extra += i; 2861 extra += size;
2963 i += i; 2862 size += size;
2964 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2863 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2965 } 2864 }
2966 2865
2967 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2866 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2968 } 2867 }
2969#endif 2868#endif
2970 else 2869 else
2971 new_selection_text[ofs++] = *t++; 2870 new_selection_text[ofs++] = *t++;
2972 } 2871 }
2973 2872
2974#if ENABLE_FRILLS 2873#if !ENABLE_MINIMAL
2975 if (selection.rect) 2874 if (selection.rect)
2976 { 2875 {
2977 while (ofs 2876 while (ofs
2978 && new_selection_text[ofs - 1] != C0_LF 2877 && new_selection_text[ofs - 1] != C0_LF
2979 && unicode::is_space (new_selection_text[ofs - 1])) 2878 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2981 2880
2982 new_selection_text[ofs++] = C0_LF; 2881 new_selection_text[ofs++] = C0_LF;
2983 } 2882 }
2984 else 2883 else
2985#endif 2884#endif
2986 if (!ROW(row).is_longer () && row != selection.end.row) 2885 if (!ROW(row).is_longer ()
2886 && (row != selection.end.row || end_col != selection.end.col)
2887 && (row != selection.beg.row || selection.beg.col < ncol))
2987 new_selection_text[ofs++] = C0_LF; 2888 new_selection_text[ofs++] = C0_LF;
2988 } 2889 }
2989
2990 if (end_col != selection.end.col)
2991 new_selection_text[ofs++] = C0_LF;
2992 2890
2993 new_selection_text[ofs] = 0; 2891 new_selection_text[ofs] = 0;
2994 2892
2995 if (ofs == 0) 2893 if (ofs == 0)
2996 { 2894 {
… …
3009 2907
3010 selection_grab (tm); 2908 selection_grab (tm);
3011} 2909}
3012 2910
3013bool 2911bool
3014rxvt_term::selection_grab (Time tm) 2912rxvt_term::selection_grab (Time tm, bool clipboard) noexcept
3015{ 2913{
2914 Atom sel;
2915
2916 if (!clipboard)
2917 {
3016 selection_time = tm; 2918 selection_time = tm;
3017 2919 sel = XA_PRIMARY;
3018 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3019 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3020 { 2920 }
2921 else
2922 {
2923 clipboard_time = tm;
2924 sel = xa[XA_CLIPBOARD];
2925 }
2926
2927 XSetSelectionOwner (dpy, sel, vt, tm);
2928 if (XGetSelectionOwner (dpy, sel) == vt)
2929 {
3021 display->set_selection_owner (this); 2930 display->set_selection_owner (this, clipboard);
3022 return true; 2931 return true;
3023 } 2932 }
3024 else 2933 else
3025 { 2934 {
3026 selection_clear (); 2935 selection_clear (clipboard);
3027 return false; 2936 return false;
3028 } 2937 }
3029 2938
3030#if 0 2939#if 0
3031 XTextProperty ct; 2940 XTextProperty ct;
3032 2941
3033 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 2942 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3034 { 2943 {
3035 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 2944 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3036 XFree (ct.value); 2945 XFree (ct.value);
3037 } 2946 }
3038#endif 2947#endif
… …
3041/* ------------------------------------------------------------------------- */ 2950/* ------------------------------------------------------------------------- */
3042/* 2951/*
3043 * Mark or select text based upon number of clicks: 1, 2, or 3 2952 * Mark or select text based upon number of clicks: 1, 2, or 3
3044 * EXT: button 1 press 2953 * EXT: button 1 press
3045 */ 2954 */
3046void 2955void ecb_cold
3047rxvt_term::selection_click (int clicks, int x, int y) 2956rxvt_term::selection_click (int clicks, int x, int y) noexcept
3048{ 2957{
3049 clicks = ((clicks - 1) % 3) + 1; 2958 clicks = ((clicks - 1) % 3) + 1;
3050 selection.clicks = clicks; /* save clicks so extend will work */ 2959 selection.clicks = clicks; /* save clicks so extend will work */
3051 2960
3052 if (clicks == 2 && !selection.rect 2961 if (clicks == 2 && !selection.rect
… …
3070 2979
3071/* ------------------------------------------------------------------------- */ 2980/* ------------------------------------------------------------------------- */
3072/* 2981/*
3073 * Mark a selection at the specified col/row 2982 * Mark a selection at the specified col/row
3074 */ 2983 */
3075void 2984void ecb_cold
3076rxvt_term::selection_start_colrow (int col, int row) 2985rxvt_term::selection_start_colrow (int col, int row) noexcept
3077{ 2986{
3078 want_refresh = 1; 2987 want_refresh = 1;
3079 2988
3080 selection.mark.row = row + view_start; 2989 selection.mark.row = row + view_start;
3081 selection.mark.col = col; 2990 selection.mark.col = col;
… …
3084 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 2993 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3085 2994
3086 while (selection.mark.col > 0 2995 while (selection.mark.col > 0
3087 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 2996 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3088 --selection.mark.col; 2997 --selection.mark.col;
3089 2998
3090 if (selection.op) 2999 if (selection.op)
3000 {
3091 { /* clear the old selection */ 3001 /* clear the old selection */
3092 selection.beg.row = selection.end.row = selection.mark.row; 3002 selection.beg.row = selection.end.row = selection.mark.row;
3093 selection.beg.col = selection.end.col = selection.mark.col; 3003 selection.beg.col = selection.end.col = selection.mark.col;
3094 } 3004 }
3095 3005
3096 selection.op = SELECTION_INIT; 3006 selection.op = SELECTION_INIT;
… …
3102 * Word select: select text for 2 clicks 3012 * Word select: select text for 2 clicks
3103 * We now only find out the boundary in one direction 3013 * We now only find out the boundary in one direction
3104 */ 3014 */
3105 3015
3106/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3016/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3107#define DELIMIT_TEXT(x) \ 3017#define DELIMIT_TEXT(x) \
3108 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3018 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3109#define DELIMIT_REND(x) 1 3019#define DELIMIT_REND(x) 1
3110 3020
3111void 3021void ecb_cold
3112rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3022rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept
3113{ 3023{
3114 int col, row, dirnadd, tcol, trow, w1, w2; 3024 int col, row, dirnadd, tcol, trow, w1, w2;
3115 row_col_t bound; 3025 row_col_t bound;
3116 text_t *stp; 3026 text_t *stp;
3117 rend_t *srp; 3027 rend_t *srp;
… …
3190 * EXT: button 3 press; button 1 or 3 drag 3100 * EXT: button 3 press; button 1 or 3 drag
3191 * flag == 0 ==> button 1 3101 * flag == 0 ==> button 1
3192 * flag == 1 ==> button 3 press 3102 * flag == 1 ==> button 3 press
3193 * flag == 2 ==> button 3 motion 3103 * flag == 2 ==> button 3 motion
3194 */ 3104 */
3195void 3105void ecb_cold
3196rxvt_term::selection_extend (int x, int y, int flag) 3106rxvt_term::selection_extend (int x, int y, int flag) noexcept
3197{ 3107{
3198 int col = clamp (Pixel2Col (x), 0, ncol); 3108 int col = clamp (Pixel2Col (x), 0, ncol);
3199 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3109 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3200 3110
3201 /* 3111 /*
… …
3226 3136
3227/* ------------------------------------------------------------------------- */ 3137/* ------------------------------------------------------------------------- */
3228/* 3138/*
3229 * Extend the selection to the specified col/row 3139 * Extend the selection to the specified col/row
3230 */ 3140 */
3231void 3141void ecb_cold
3232rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3142rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept
3233{ 3143{
3234 row_col_t pos; 3144 row_col_t pos;
3235 enum { 3145 enum {
3236 LEFT, RIGHT 3146 LEFT, RIGHT
3237 } closeto = RIGHT; 3147 } closeto = RIGHT;
3238
3239 want_refresh = 1;
3240 3148
3241 switch (selection.op) 3149 switch (selection.op)
3242 { 3150 {
3243 case SELECTION_INIT: 3151 case SELECTION_INIT:
3244 CLEAR_SELECTION (); 3152 CLEAR_SELECTION ();
… …
3285 * a point/word/line which is either the start or end of the selection 3193 * a point/word/line which is either the start or end of the selection
3286 * and it was decided by whichever point/word/line was `fixed' at the 3194 * and it was decided by whichever point/word/line was `fixed' at the
3287 * time of the most recent button3 press 3195 * time of the most recent button3 press
3288 */ 3196 */
3289 if (button3 && buttonpress) 3197 if (button3 && buttonpress)
3198 {
3290 { /* button3 press */ 3199 /* button3 press */
3291 /* 3200 /*
3292 * first determine which edge of the selection we are closest to 3201 * first determine which edge of the selection we are closest to
3293 */ 3202 */
3294 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3203 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3295 || (!ROWCOL_IS_AFTER (pos, selection.end) 3204 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3313 selection.mark.row = selection.beg.row; 3222 selection.mark.row = selection.beg.row;
3314 selection.mark.col = selection.beg.col; 3223 selection.mark.col = selection.beg.col;
3315 } 3224 }
3316 } 3225 }
3317 else 3226 else
3227 {
3318 { /* button1 drag or button3 drag */ 3228 /* button1 drag or button3 drag */
3319 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3229 if (ROWCOL_IS_AFTER (selection.mark, pos))
3320 { 3230 {
3321 if (selection.mark.row == selection.end.row 3231 if (selection.mark.row == selection.end.row
3322 && selection.mark.col == selection.end.col 3232 && selection.mark.col == selection.end.col
3323 && clickchange 3233 && clickchange
… …
3340 3250
3341 if (selection.clicks == 1) 3251 if (selection.clicks == 1)
3342 { 3252 {
3343 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3253 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3344 && !ROW(selection.beg.row).is_longer () 3254 && !ROW(selection.beg.row).is_longer ()
3345#if ENABLE_FRILLS 3255#if !ENABLE_MINIMAL
3346 && !selection.rect 3256 && !selection.rect
3347#endif 3257#endif
3348 ) 3258 )
3349 selection.beg.col = ncol; 3259 selection.beg.col = ncol;
3350 3260
3351 if ( 3261 if (
3352 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3262 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3353 && !ROW(selection.end.row).is_longer () 3263 && !ROW(selection.end.row).is_longer ()
3354#if ENABLE_FRILLS 3264#if !ENABLE_MINIMAL
3355 && !selection.rect 3265 && !selection.rect
3356#endif 3266#endif
3357 ) 3267 )
3358 selection.end.col = ncol; 3268 selection.end.col = ncol;
3359 } 3269 }
… …
3366 selection_delimit_word (DN, &selection.end, &selection.end); 3276 selection_delimit_word (DN, &selection.end, &selection.end);
3367 } 3277 }
3368 else if (selection.clicks == 3) 3278 else if (selection.clicks == 3)
3369 { 3279 {
3370#if ENABLE_FRILLS 3280#if ENABLE_FRILLS
3371 if (OPTION (Opt_tripleclickwords)) 3281 if (option (Opt_tripleclickwords))
3372 { 3282 {
3373 selection_delimit_word (UP, &selection.beg, &selection.beg); 3283 selection_delimit_word (UP, &selection.beg, &selection.beg);
3374 3284
3375 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3285 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3376 { 3286 {
3377 if (!ROW(end_row).is_longer ()) 3287 if (!ROW(end_row).is_longer ())
3378 { 3288 {
3379 selection.end.row = end_row; 3289 selection.end.row = end_row;
3380 selection.end.col = ROW(end_row).l; 3290 selection.end.col = ROW(end_row).l;
3291# if !ENABLE_MINIMAL
3381 selection_remove_trailing_spaces (); 3292 selection_remove_trailing_spaces ();
3293# endif
3382 break; 3294 break;
3383 } 3295 }
3384 } 3296 }
3385 } 3297 }
3386 else 3298 else
… …
3402 selection.end.row++; 3314 selection.end.row++;
3403 } 3315 }
3404 } 3316 }
3405 3317
3406 if (button3 && buttonpress) 3318 if (button3 && buttonpress)
3319 {
3407 { /* mark may need to be changed */ 3320 /* mark may need to be changed */
3408 if (closeto == LEFT) 3321 if (closeto == LEFT)
3409 { 3322 {
3410 selection.mark.row = selection.end.row; 3323 selection.mark.row = selection.end.row;
3411 selection.mark.col = selection.end.col - (selection.clicks == 2); 3324 selection.mark.col = selection.end.col - (selection.clicks == 2);
3412 } 3325 }
… …
3415 selection.mark.row = selection.beg.row; 3328 selection.mark.row = selection.beg.row;
3416 selection.mark.col = selection.beg.col; 3329 selection.mark.col = selection.beg.col;
3417 } 3330 }
3418 } 3331 }
3419 3332
3420#if ENABLE_FRILLS 3333#if !ENABLE_MINIMAL
3421 if (selection.rect && selection.beg.col > selection.end.col) 3334 if (selection.rect && selection.beg.col > selection.end.col)
3422 ::swap (selection.beg.col, selection.end.col); 3335 ::swap (selection.beg.col, selection.end.col);
3423#endif 3336#endif
3424}
3425 3337
3426#if ENABLE_FRILLS 3338 selection_changed ();
3427void 3339}
3340
3341#if !ENABLE_MINIMAL
3342void ecb_cold
3428rxvt_term::selection_remove_trailing_spaces () 3343rxvt_term::selection_remove_trailing_spaces () noexcept
3429{ 3344{
3430 int32_t end_col, end_row; 3345 int32_t end_col, end_row;
3431 text_t *stp; 3346 text_t *stp;
3432 3347
3433 end_col = selection.end.col; 3348 end_col = selection.end.col;
… …
3470/* ------------------------------------------------------------------------- */ 3385/* ------------------------------------------------------------------------- */
3471/* 3386/*
3472 * Double click on button 3 when already selected 3387 * Double click on button 3 when already selected
3473 * EXT: button 3 double click 3388 * EXT: button 3 double click
3474 */ 3389 */
3475void 3390void ecb_cold
3476rxvt_term::selection_rotate (int x, int y) 3391rxvt_term::selection_rotate (int x, int y) noexcept
3477{ 3392{
3478 selection.clicks = selection.clicks % 3 + 1; 3393 selection.clicks = selection.clicks % 3 + 1;
3479 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3394 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3480} 3395}
3481 3396
3482/* ------------------------------------------------------------------------- */ 3397/* ------------------------------------------------------------------------- */
3483/* 3398/*
3484 * Respond to a request for our current selection 3399 * Respond to a request for our current selection
3485 * EXT: SelectionRequest 3400 * EXT: SelectionRequest
3486 */ 3401 */
3487void 3402void ecb_cold
3488rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3403rxvt_term::selection_send (const XSelectionRequestEvent &rq) noexcept
3489{ 3404{
3405 Atom property = rq.property == None ? rq.target : rq.property;
3490 XSelectionEvent ev; 3406 XSelectionEvent ev;
3491 dDisp;
3492 3407
3493 ev.type = SelectionNotify; 3408 ev.type = SelectionNotify;
3494 ev.property = None; 3409 ev.property = None;
3495 ev.display = rq.display; 3410 ev.display = rq.display;
3496 ev.requestor = rq.requestor; 3411 ev.requestor = rq.requestor;
… …
3510 *target++ = xa[XA_COMPOUND_TEXT]; 3425 *target++ = xa[XA_COMPOUND_TEXT];
3511#if X_HAVE_UTF8_STRING 3426#if X_HAVE_UTF8_STRING
3512 *target++ = xa[XA_UTF8_STRING]; 3427 *target++ = xa[XA_UTF8_STRING];
3513#endif 3428#endif
3514 3429
3515 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3430 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3516 32, PropModeReplace, 3431 32, PropModeReplace,
3517 (unsigned char *)target_list, target - target_list); 3432 (unsigned char *)target_list, target - target_list);
3518 ev.property = rq.property; 3433 ev.property = property;
3519 } 3434 }
3520#if TODO // TODO 3435#if TODO // TODO
3521 else if (rq.target == xa[XA_MULTIPLE]) 3436 else if (rq.target == xa[XA_MULTIPLE])
3522 { 3437 {
3523 /* TODO: Handle MULTIPLE */ 3438 /* TODO: Handle MULTIPLE */
3524 } 3439 }
3525#endif 3440#endif
3526 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3527 { 3442 {
3528 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3529 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3444 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3530 ev.property = rq.property; 3445 ev.property = property;
3446 }
3447 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3448 {
3449 XChangeProperty (dpy, rq.requestor, property, rq.target,
3450 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3451 ev.property = property;
3531 } 3452 }
3532 else if (rq.target == XA_STRING 3453 else if (rq.target == XA_STRING
3533 || rq.target == xa[XA_TEXT] 3454 || rq.target == xa[XA_TEXT]
3534 || rq.target == xa[XA_COMPOUND_TEXT] 3455 || rq.target == xa[XA_COMPOUND_TEXT]
3535 || rq.target == xa[XA_UTF8_STRING] 3456 || rq.target == xa[XA_UTF8_STRING]
… …
3557 style = enc_string; 3478 style = enc_string;
3558 else if (target == xa[XA_TEXT]) 3479 else if (target == xa[XA_TEXT])
3559 style = enc_text; 3480 style = enc_text;
3560 else if (target == xa[XA_COMPOUND_TEXT]) 3481 else if (target == xa[XA_COMPOUND_TEXT])
3561 style = enc_compound_text; 3482 style = enc_compound_text;
3562#if ENABLE_FRILLS 3483#if !ENABLE_MINIMAL
3563 else if (target == xa[XA_UTF8_STRING]) 3484 else if (target == xa[XA_UTF8_STRING])
3564 style = enc_utf8; 3485 style = enc_utf8;
3565#endif 3486#endif
3566 else 3487 else
3567 { 3488 {
3568 target = xa[XA_COMPOUND_TEXT]; 3489 target = xa[XA_COMPOUND_TEXT];
3569 style = enc_compound_text; 3490 style = enc_compound_text;
3570 } 3491 }
3571 3492
3572 if (selection.text) 3493 if (rq.selection == XA_PRIMARY && selection.text)
3573 { 3494 {
3574 cl = selection.text; 3495 cl = selection.text;
3575 selectlen = selection.len; 3496 selectlen = selection.len;
3576 } 3497 }
3498 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3499 {
3500 cl = selection.clip_text;
3501 selectlen = selection.clip_len;
3502 }
3577 else 3503 else
3578 { 3504 {
3579 cl = L""; 3505 cl = (wchar_t *)L"";
3580 selectlen = 0; 3506 selectlen = 0;
3581 } 3507 }
3582 3508
3583#if ENABLE_FRILLS 3509#if !ENABLE_MINIMAL
3584 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3510 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3585 // so recode it manually 3511 // so recode it manually
3586 if (style == enc_utf8) 3512 if (style == enc_utf8)
3587 { 3513 {
3588 freect = 1; 3514 freect = 1;
… …
3591 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3517 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3592 ct.nitems = strlen ((char *)ct.value); 3518 ct.nitems = strlen ((char *)ct.value);
3593 } 3519 }
3594 else 3520 else
3595#endif 3521#endif
3596 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3522 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3597 freect = 1; 3523 freect = 1;
3598 else 3524 else
3599 { 3525 {
3600 /* if we failed to convert then send it raw */ 3526 /* if we failed to convert then send it raw */
3601 ct.value = (unsigned char *)cl; 3527 ct.value = (unsigned char *)cl;
3602 ct.nitems = selectlen; 3528 ct.nitems = selectlen;
3603 ct.encoding = target; 3529 ct.encoding = target;
3604 } 3530 }
3605 3531
3606 XChangeProperty (disp, rq.requestor, rq.property, 3532 XChangeProperty (dpy, rq.requestor, property,
3607 ct.encoding, 8, PropModeReplace, 3533 ct.encoding, 8, PropModeReplace,
3608 ct.value, (int)ct.nitems); 3534 ct.value, (int)ct.nitems);
3609 ev.property = rq.property; 3535 ev.property = property;
3610 3536
3611 if (freect) 3537 if (freect)
3612 XFree (ct.value); 3538 XFree (ct.value);
3613 } 3539 }
3614 3540
3615 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3541 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3616} 3542}
3617 3543
3618/* ------------------------------------------------------------------------- * 3544/* ------------------------------------------------------------------------- */
3619 * MOUSE ROUTINES *
3620 * ------------------------------------------------------------------------- */
3621
3622/*
3623 * return col/row values corresponding to x/y pixel values
3624 */
3625void
3626rxvt_term::pixel_position (int *x, int *y)
3627{
3628 *x = Pixel2Col (*x);
3629 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3630 *y = Pixel2Row (*y);
3631 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3632}
3633
3634/* ------------------------------------------------------------------------- */
3635#ifdef USE_XIM 3545#if USE_XIM
3636void 3546void ecb_cold
3637rxvt_term::im_set_position (XPoint &pos) 3547rxvt_term::im_set_position (XPoint &pos) noexcept
3638{ 3548{
3639 XWindowAttributes xwa; 3549 XWindowAttributes xwa;
3640 3550
3641 XGetWindowAttributes (display->display, vt, &xwa); 3551 XGetWindowAttributes (dpy, vt, &xwa);
3642 3552
3643 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3553 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3644 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3554 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3645} 3555}
3646#endif 3556#endif
3647 3557
3648#if ENABLE_OVERLAY 3558#if ENABLE_OVERLAY
3649void 3559void
3650rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3560rxvt_term::scr_overlay_new (int x, int y, int w, int h) noexcept
3651{ 3561{
3652 if (nrow < 1 || ncol < 1) 3562 if (nrow < 1 || ncol < 1)
3653 return; 3563 return;
3654 3564
3655 want_refresh = 1; 3565 want_refresh = 1;
… …
3664 h += 2; min_it (h, nrow); 3574 h += 2; min_it (h, nrow);
3665 3575
3666 x -= 1; clamp_it (x, 0, ncol - w); 3576 x -= 1; clamp_it (x, 0, ncol - w);
3667 y -= 1; clamp_it (y, 0, nrow - h); 3577 y -= 1; clamp_it (y, 0, nrow - h);
3668 3578
3669 ov_x = x; ov_y = y; 3579 ov.x = x; ov.y = y;
3670 ov_w = w; ov_h = h; 3580 ov.w = w; ov.h = h;
3671 3581
3672 ov_text = new text_t *[h]; 3582 ov.text = new text_t *[h];
3673 ov_rend = new rend_t *[h]; 3583 ov.rend = new rend_t *[h];
3674 3584
3675 for (y = 0; y < h; y++) 3585 for (y = 0; y < h; y++)
3676 { 3586 {
3677 text_t *tp = ov_text[y] = new text_t[w]; 3587 text_t *tp = ov.text[y] = new text_t[w];
3678 rend_t *rp = ov_rend[y] = new rend_t[w]; 3588 rend_t *rp = ov.rend[y] = new rend_t[w];
3679 3589
3680 text_t t0, t1, t2; 3590 text_t t0, t1, t2;
3681 rend_t r = OVERLAY_RSTYLE; 3591 rend_t r = OVERLAY_RSTYLE;
3682 3592
3683 if (y == 0) 3593 if (y == 0)
… …
3700 *rp = r; 3610 *rp = r;
3701 } 3611 }
3702} 3612}
3703 3613
3704void 3614void
3705rxvt_term::scr_overlay_off () 3615rxvt_term::scr_overlay_off () noexcept
3706{ 3616{
3707 if (!ov_text) 3617 if (!ov.text)
3708 return; 3618 return;
3709 3619
3710 want_refresh = 1; 3620 want_refresh = 1;
3711 3621
3712 for (int y = 0; y < ov_h; y++) 3622 for (int y = 0; y < ov.h; y++)
3713 { 3623 {
3714 delete [] ov_text[y]; 3624 delete [] ov.text[y];
3715 delete [] ov_rend[y]; 3625 delete [] ov.rend[y];
3716 } 3626 }
3717 3627
3718 delete [] ov_text; ov_text = 0; 3628 delete [] ov.text; ov.text = 0;
3719 delete [] ov_rend; ov_rend = 0; 3629 delete [] ov.rend; ov.rend = 0;
3720} 3630}
3721 3631
3722void 3632void
3723rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3633rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) noexcept
3724{ 3634{
3725 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3635 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3726 return; 3636 return;
3727 3637
3728 x++, y++; 3638 x++, y++;
3729 3639
3730 ov_text[y][x] = text; 3640 ov.text[y][x] = text;
3731 ov_rend[y][x] = rend; 3641 ov.rend[y][x] = rend;
3732} 3642}
3733 3643
3734void 3644void
3735rxvt_term::scr_overlay_set (int x, int y, const char *s) 3645rxvt_term::scr_overlay_set (int x, int y, const char *s) noexcept
3736{ 3646{
3737 while (*s) 3647 while (*s)
3738 scr_overlay_set (x++, y, *s++); 3648 scr_overlay_set (x++, y, *s++);
3739} 3649}
3740 3650
3741void 3651void
3742rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3652rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) noexcept
3743{ 3653{
3744 while (*s) 3654 while (*s)
3745 { 3655 {
3746 text_t t = *s++; 3656 text_t t = *s++;
3747 int width = wcwidth (t); 3657 int width = WCWIDTH (t);
3748 3658
3749 while (width--) 3659 while (width--)
3750 { 3660 {
3751 scr_overlay_set (x++, y, t); 3661 scr_overlay_set (x++, y, t);
3752 t = NOCHAR; 3662 t = NOCHAR;
3753 } 3663 }
3754 } 3664 }
3755} 3665}
3756 3666
3757void 3667void
3758rxvt_term::scr_swap_overlay () 3668rxvt_term::scr_swap_overlay () noexcept
3759{ 3669{
3760 if (!ov_text) 3670 if (!ov.text)
3761 return; 3671 return;
3762 3672
3673 // hide cursor if it is within the overlay area
3674 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3675 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3676 screen.flags &= ~Screen_VisibleCursor;
3677
3763 // swap screen mem with overlay 3678 // swap screen mem with overlay
3764 for (int y = ov_h; y--; ) 3679 for (int y = ov.h; y--; )
3765 { 3680 {
3766 text_t *t1 = ov_text[y]; 3681 text_t *t1 = ov.text[y];
3767 rend_t *r1 = ov_rend[y]; 3682 rend_t *r1 = ov.rend[y];
3768 3683
3769 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3684 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3770 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3685 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3771 3686
3772 for (int x = ov_w; x--; ) 3687 for (int x = ov.w; x--; )
3773 { 3688 {
3774 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3689 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3775 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3690 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3776 } 3691 }
3777 } 3692 }

Diff Legend

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