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

Diff Legend

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