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

Diff Legend

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