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.235 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.464 by root, Thu Aug 4 18:11:59 2022 UTC

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

Diff Legend

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