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

Diff Legend

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