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

Diff Legend

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