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.169 by root, Tue Oct 25 19:04:46 2005 UTC vs.
Revision 1.464 by root, Thu Aug 4 18:11:59 2022 UTC

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

Diff Legend

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