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.147 by root, Sun Dec 12 15:13:37 2004 UTC vs.
Revision 1.465 by root, Thu Aug 4 18:28:44 2022 UTC

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

Diff Legend

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