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.172 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.470 by root, Mon Aug 8 10:09:49 2022 UTC

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

Diff Legend

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