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.166 by root, Sun Jun 26 20:06:52 2005 UTC vs.
Revision 1.472 by root, Mon Aug 8 10:33:14 2022 UTC

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

Diff Legend

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