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.168 by root, Thu Aug 11 13:23:06 2005 UTC vs.
Revision 1.463 by root, Sat Jul 3 04:04:13 2021 UTC

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

Diff Legend

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