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

Diff Legend

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