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

Diff Legend

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