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.175 by root, Tue Dec 20 19:30:59 2005 UTC vs.
Revision 1.463 by root, Sat Jul 3 04:04:13 2021 UTC

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

Diff Legend

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