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

Diff Legend

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