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.223 by root, Wed Jan 11 18:54:30 2006 UTC vs.
Revision 1.437 by sf-exg, Mon Mar 25 12:28:04 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 (UP, 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 (enum page_dirn direction, int nlines) NOTHROW
1818{ 1916{
1819 int n; 1917 int new_view_start =
1820 unsigned int oldviewstart;
1821
1822 oldviewstart = view_start;
1823
1824 if (direction == UP)
1825 {
1826 n = view_start + nlines;
1827 view_start = min (n, nsaved);
1828 }
1829 else
1830 {
1831 n = view_start - nlines; 1918 direction == UP ? view_start - nlines
1832 view_start = max (n, 0); 1919 : view_start + nlines;
1833 }
1834 1920
1835 return scr_changeview (oldviewstart); 1921 return scr_changeview (new_view_start);
1836} 1922}
1837 1923
1838int 1924bool
1839rxvt_term::scr_changeview (unsigned int oldviewstart) 1925rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840{ 1926{
1927 clamp_it (new_view_start, top_row, 0);
1928
1841 if (view_start != oldviewstart) 1929 if (new_view_start == view_start)
1842 { 1930 return false;
1931
1932 num_scr += new_view_start - view_start;
1933 view_start = new_view_start;
1934 want_refresh = 1;
1935
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1936 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844 1937
1845 want_refresh = 1; 1938 return true;
1846 num_scr -= (view_start - oldviewstart);
1847 }
1848
1849 return (int)view_start - (int)oldviewstart;
1850} 1939}
1851 1940
1852/* ------------------------------------------------------------------------- */ 1941#ifndef NO_BELL
1853void 1942void
1943rxvt_term::bell_cb (ev::timer &w, int revents)
1944{
1945 rvideo_bell = false;
1946 scr_rvideo_mode (rvideo_mode);
1947 refresh_check ();
1948}
1949#endif
1950
1951/* ------------------------------------------------------------------------- */
1952void
1854rxvt_term::scr_bell () 1953rxvt_term::scr_bell () NOTHROW
1855{ 1954{
1856#ifndef NO_BELL 1955#ifndef NO_BELL
1857 1956
1858# ifndef NO_MAPALERT 1957# ifndef NO_MAPALERT
1859# ifdef MAPALERT_OPTION 1958# ifdef MAPALERT_OPTION
1860 if (OPTION (Opt_mapAlert)) 1959 if (option (Opt_mapAlert))
1861# endif 1960# endif
1862 XMapWindow (display->display, parent[0]); 1961 XMapWindow (dpy, parent);
1863# endif 1962# endif
1864 1963
1964# if ENABLE_FRILLS
1965 if (option (Opt_urgentOnBell))
1966 set_urgency (1);
1967# endif
1968
1865 if (OPTION (Opt_visualBell)) 1969 if (option (Opt_visualBell))
1866 { 1970 {
1867 scr_rvideo_mode (!rvideo); /* refresh also done */ 1971 rvideo_bell = true;
1972 scr_rvideo_mode (rvideo_mode);
1868 display->flush (); 1973 flush ();
1974
1869 rxvt_usleep (VISUAL_BELL_DURATION); 1975 bell_ev.start (VISUAL_BELL_DURATION);
1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1871 } 1976 }
1872 else 1977 else
1873 XBell (display->display, 0); 1978 XBell (dpy, 0);
1874 1979 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1875#endif 1980#endif
1876} 1981}
1877 1982
1878/* ------------------------------------------------------------------------- */ 1983/* ------------------------------------------------------------------------- */
1879/* ARGSUSED */ 1984void ecb_cold
1880void
1881rxvt_term::scr_printscreen (int fullhist) 1985rxvt_term::scr_printscreen (int fullhist) NOTHROW
1882{ 1986{
1883#ifdef PRINTPIPE 1987#ifdef PRINTPIPE
1884 int nrows, row_start; 1988 int nrows, row_start;
1885 FILE *fd; 1989 FILE *fd = popen_printer ();
1886 1990
1887 if ((fd = popen_printer ()) == NULL) 1991 if (!fd)
1888 return; 1992 return;
1889 1993
1890 if (fullhist) 1994 if (fullhist)
1891 { 1995 {
1892 nrows = nrow + nsaved; 1996 nrows = nrow - top_row;
1893 row_start = -nsaved; 1997 row_start = top_row;
1894 } 1998 }
1895 else 1999 else
1896 { 2000 {
1897 nrows = nrow; 2001 nrows = nrow;
1898 row_start = -view_start; 2002 row_start = view_start;
1899 } 2003 }
1900 2004
1901 wctomb (0, 0); 2005 wctomb (0, 0);
1902 2006
1903 for (int r1 = 0; r1 < nrows; r1++) 2007 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1904 { 2008 {
1905 text_t *tp = ROW(r1).t; 2009 text_t *tp = ROW(r1).t;
1906 int len = ROW(r1).l; 2010 int len = ROW(r1).l;
1907 2011
1908 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2012 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1934/* 2038/*
1935 * Refresh the screen 2039 * Refresh the screen
1936 * drawn_text/drawn_rend contain the screen information before the update. 2040 * drawn_text/drawn_rend contain the screen information before the update.
1937 * screen.text/screen.rend contain what the screen will change to. 2041 * screen.text/screen.rend contain what the screen will change to.
1938 */ 2042 */
1939void 2043void ecb_hot
1940rxvt_term::scr_refresh (unsigned char refresh_type) 2044rxvt_term::scr_refresh () NOTHROW
1941{ 2045{
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 */ 2046 int16_t col, row, /* column/row we're processing */
1945 ocrow; /* old cursor row */ 2047 ocrow; /* old cursor row */
1946 int i; /* tmp */ 2048 int i; /* tmp */
1947#ifndef NO_CURSORCOLOR 2049 rend_t ccol1, /* Cursor colour */
1948 rend_t cc1; /* store colours at cursor position (s) */ 2050 ccol2; /* Cursor colour2 */
1949#endif 2051 rend_t cur_rend;
1950 rend_t *crp; // cursor rendition pointer 2052 int cur_col;
1951 2053
1952 want_refresh = 0; /* screen is current */ 2054 want_refresh = 0; /* screen is current */
1953 2055
1954 if (refresh_type == NO_REFRESH || !mapped) 2056 if (refresh_type == NO_REFRESH || !mapped)
1955 return; 2057 return;
1956 2058
1957 /* 2059 /*
1958 * A: set up vars 2060 * A: set up vars
1959 */ 2061 */
1960 must_clear = 0;
1961 refresh_count = 0; 2062 refresh_count = 0;
1962 2063
1963#if XPM_BACKGROUND 2064 unsigned int old_screen_flags = screen.flags;
1964 must_clear |= bgPixmap.pixmap != None; 2065 bool have_bg = 0;
1965#endif 2066#ifdef HAVE_IMG
1966#if TRANSPARENT 2067 have_bg = bg_img != 0;
1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
1968#endif 2068#endif
1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2069 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1970 2070
1971 /* 2071 /*
1972 * B: reverse any characters which are selected 2072 * B: reverse any characters which are selected
1973 */ 2073 */
1974 scr_reverse_selection (); 2074 scr_reverse_selection ();
1975 2075
2076 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2077#if ENABLE_OVERLAY
2078 scr_swap_overlay ();
2079#endif
2080
2081 bool showcursor = screen.flags & Screen_VisibleCursor;
2082
1976 /* 2083 /*
1977 * C: set the cursor character (s) 2084 * C: set the cursor character (s)
1978 */ 2085 */
1979 { 2086 {
1980 unsigned char setoldcursor; 2087 bool setoldcursor;
1981 rend_t ccol1, /* Cursor colour */
1982 ccol2; /* Cursor colour2 */
1983 2088
1984 showcursor = (screen.flags & Screen_VisibleCursor);
1985#ifdef CURSOR_BLINK 2089#ifdef CURSOR_BLINK
1986 if (hidden_cursor) 2090 if (hidden_cursor)
1987 showcursor = 0; 2091 showcursor = 0;
1988#endif 2092#endif
1989 2093
… …
1992 int col = screen.cur.col; 2096 int col = screen.cur.col;
1993 2097
1994 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2098 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1995 col--; 2099 col--;
1996 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; 2144 setoldcursor = 0;
2034 if (ocrow != -1) 2145 if (ocrow != -1)
2035 { 2146 {
2036 if (screen.cur.row + view_start != ocrow 2147 if (screen.cur.row - view_start != ocrow
2037 || screen.cur.col != oldcursor.col) 2148 || screen.cur.col != oldcursor.col)
2038 { 2149 {
2039 if (ocrow < nrow 2150 if (ocrow < nrow
2040 && oldcursor.col < ncol) 2151 && oldcursor.col < ncol)
2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2152 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2049 else if (!focus) 2160 else if (!focus)
2050 setoldcursor = 1; 2161 setoldcursor = 1;
2051 2162
2052 if (setoldcursor) 2163 if (setoldcursor)
2053 { 2164 {
2054 if (screen.cur.row + view_start >= nrow) 2165 if (screen.cur.row - view_start >= nrow)
2055 oldcursor.row = -1; 2166 oldcursor.row = -1;
2056 else 2167 else
2057 { 2168 {
2058 oldcursor.row = screen.cur.row + view_start; 2169 oldcursor.row = screen.cur.row - view_start;
2059 oldcursor.col = screen.cur.col; 2170 oldcursor.col = screen.cur.col;
2060 } 2171 }
2061 } 2172 }
2062 } 2173 }
2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2065#if ENABLE_OVERLAY
2066 scr_swap_overlay ();
2067#endif
2068 2174
2069#ifndef NO_SLOW_LINK_SUPPORT 2175#ifndef NO_SLOW_LINK_SUPPORT
2070 /* 2176 /*
2071 * D: CopyArea pass - very useful for slower links 2177 * D: CopyArea pass - very useful for slower links
2072 * This has been deliberately kept simple. 2178 * This has been deliberately kept simple.
2073 */ 2179 */
2074 i = num_scr;
2075 if (!display->is_local 2180 if (!display->is_local
2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2181 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2077 && abs (num_scr) < nrow && !must_clear) 2182 && abs (num_scr) < nrow && !have_bg)
2078 { 2183 {
2079 int16_t nits; 2184 int16_t nits;
2185 int i = num_scr;
2080 int j; 2186 int j;
2081 int len, wlen; 2187 int len, wlen;
2082 2188
2083 j = nrow; 2189 j = nrow;
2084 wlen = len = -1; 2190 wlen = len = -1;
2085 row = i > 0 ? 0 : j - 1; 2191 row = i > 0 ? 0 : j - 1;
2192
2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2193 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2087 { 2194 {
2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2195 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2089 { 2196 {
2090 line_t s = ROW(row - view_start); 2197 line_t s = ROW(view_start + row);
2091 line_t d = drawn_buf[row]; 2198 line_t d = drawn_buf[row];
2092 line_t d2 = drawn_buf[row + i]; 2199 line_t d2 = drawn_buf[row + i];
2093 2200
2094 for (nits = 0, col = ncol; col--; ) 2201 for (nits = 0, col = ncol; col--; )
2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2202 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2111 wlen = row; 2218 wlen = row;
2112 continue; 2219 continue;
2113 } 2220 }
2114 } 2221 }
2115 2222
2116 if (len != -1) 2223 if (len >= 0)
2117 { 2224 {
2118 /* also comes here at end if needed because of >= above */ 2225 /* also comes here at end if needed because of >= above */
2119 if (wlen < len) 2226 if (wlen < len)
2120 ::swap (wlen, len); 2227 ::swap (wlen, len);
2121 2228
2229 XGCValues gcv;
2230
2231 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2122 XCopyArea (display->display, vt, vt, 2232 XCopyArea (dpy, vt, vt,
2123 gc, 0, Row2Pixel (len + i), 2233 gc, 0, Row2Pixel (len + i),
2124 (unsigned int)this->width, 2234 (unsigned int)this->width,
2125 (unsigned int)Height2Pixel (wlen - len + 1), 2235 (unsigned int)Height2Pixel (wlen - len + 1),
2126 0, Row2Pixel (len)); 2236 0, Row2Pixel (len));
2237 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2238
2127 len = -1; 2239 len = -1;
2128 } 2240 }
2129 } 2241 }
2130 } 2242 }
2131#endif 2243#endif
… …
2133 /* 2245 /*
2134 * E: main pass across every character 2246 * E: main pass across every character
2135 */ 2247 */
2136 for (row = 0; row < nrow; row++) 2248 for (row = 0; row < nrow; row++)
2137 { 2249 {
2138 text_t *stp = ROW(row - view_start).t; 2250 text_t *stp = ROW(view_start + row).t;
2139 rend_t *srp = ROW(row - view_start).r; 2251 rend_t *srp = ROW(view_start + row).r;
2140 text_t *dtp = drawn_buf[row].t; 2252 text_t *dtp = drawn_buf[row].t;
2141 rend_t *drp = drawn_buf[row].r; 2253 rend_t *drp = drawn_buf[row].r;
2142 2254
2143 /* 2255 /*
2144 * E2: OK, now the real pass 2256 * E2: OK, now the real pass
… …
2155 continue; 2267 continue;
2156 2268
2157 // redraw one or more characters 2269 // redraw one or more characters
2158 2270
2159 // seek to the beginning of wide characters 2271 // seek to the beginning of wide characters
2160 while (stp[col] == NOCHAR && col > 0) 2272 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2161 --col; 2273 --col;
2162 2274
2163 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2275 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2164 text_t *text = stp + col; 2276 text_t *text = stp + col;
2165 int count = 1; 2277 int count = 1;
2166 2278
2167 dtp[col] = stp[col]; 2279 dtp[col] = stp[col];
2168 drp[col] = rend; 2280 drp[col] = rend;
… …
2172 for (i = 0; ++col < ncol; ) 2284 for (i = 0; ++col < ncol; )
2173 { 2285 {
2174 if (stp[col] == NOCHAR) 2286 if (stp[col] == NOCHAR)
2175 { 2287 {
2176 dtp[col] = stp[col]; 2288 dtp[col] = stp[col];
2177 drp[col] = rend; 2289 drp[col] = srp[col];
2290
2178 count++; 2291 count++;
2179 i++; 2292 i++;
2180 2293
2181 continue; 2294 continue;
2182 } 2295 }
… …
2187 count++; 2300 count++;
2188 2301
2189 if (stp[col] != dtp[col] 2302 if (stp[col] != dtp[col]
2190 || !RS_SAME (srp[col], drp[col])) 2303 || !RS_SAME (srp[col], drp[col]))
2191 { 2304 {
2192 if (must_clear && (i++ > count / 2)) 2305 if (have_bg && (i++ > count / 2))
2193 break; 2306 break;
2194 2307
2195 dtp[col] = stp[col]; 2308 dtp[col] = stp[col];
2196 drp[col] = rend; 2309 drp[col] = rend;
2197 i = 0; 2310 i = 0;
2198 } 2311 }
2199 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2312 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2200 break; 2313 break;
2201 } 2314 }
2202 2315
2203 col--; /* went one too far. move back */ 2316 col--; /* went one too far. move back */
2204 count -= i; /* dump any matching trailing chars */ 2317 count -= i; /* dump any matching trailing chars */
2205 2318
2206 // sometimes we optimize away the trailing NOCHAR's, add them back 2319 // sometimes we optimize away the trailing NOCHAR's, add them back
2207 while (i && text[count] == NOCHAR) 2320 while (ecb_unlikely (i && text[count] == NOCHAR))
2208 count++, i--; 2321 count++, i--;
2209 2322
2210 /* 2323 /*
2211 * Determine the attributes for the string 2324 * Determine the attributes for the string
2212 */ 2325 */
2213 int fore = fgcolor_of (rend); // desired foreground 2326 int fore = fgcolor_of (rend); // desired foreground
2214 int back = bgcolor_of (rend); // desired background 2327 int back = bgcolor_of (rend); // desired background
2215 2328
2216 // only do special processing if any attributes are set, which is unlikely 2329 // 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)) 2330 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2218 { 2331 {
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; 2332 bool invert = rend & RS_RVid;
2232 2333
2233#ifndef NO_BOLD_UNDERLINE_REVERSE 2334#ifndef NO_BOLD_UNDERLINE_REVERSE
2234 if (rend & RS_Bold
2235 && fore == Color_fg) 2335 if (rend & RS_Bold && fore == Color_fg)
2236 { 2336 {
2237 if (ISSET_PIXCOLOR (Color_BD)) 2337 if (ISSET_PIXCOLOR (Color_BD))
2238 fore = Color_BD; 2338 fore = Color_BD;
2239# if !ENABLE_STYLES 2339# if !ENABLE_STYLES
2240 else 2340 else
2241 invert = !invert; 2341 invert = !invert;
2242# endif 2342# endif
2243 } 2343 }
2244 2344
2245 if (rend & RS_Italic 2345 if (rend & RS_Italic && fore == Color_fg)
2246 && fore == Color_fg)
2247 { 2346 {
2248 if (ISSET_PIXCOLOR (Color_IT)) 2347 if (ISSET_PIXCOLOR (Color_IT))
2249 fore = Color_IT; 2348 fore = Color_IT;
2250# if !ENABLE_STYLES 2349# if !ENABLE_STYLES
2251 else 2350 else
2252 invert = !invert; 2351 invert = !invert;
2253# endif 2352# endif
2254 } 2353 }
2255 2354
2256 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2355 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2257 fore = Color_UL; 2356 fore = Color_UL;
2357#endif
2358
2359#ifdef OPTION_HC
2360 if (rend & RS_Sel)
2361 {
2362 /* invert the column if no highlightColor is set or it is the
2363 * current cursor column */
2364 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2365 && ISSET_PIXCOLOR (Color_HC))
2366 {
2367 if (ISSET_PIXCOLOR (Color_HTC))
2368 fore = Color_HTC;
2369 // if invert is 0 reverse video is set so we use bg color as fg color
2370 else if (!invert)
2371 fore = back;
2372
2373 back = Color_HC;
2374 invert = 0;
2375 }
2376 }
2258#endif 2377#endif
2259 2378
2260 if (invert) 2379 if (invert)
2261 { 2380 {
2262 ::swap (fore, back); 2381 ::swap (fore, back);
2263 2382
2264#ifndef NO_BOLD_UNDERLINE_REVERSE 2383#ifndef NO_BOLD_UNDERLINE_REVERSE
2265 if (ISSET_PIXCOLOR (Color_RV))
2266 back = Color_RV;
2267
2268 if (fore == back) 2384 if (fore == back)
2269 { 2385 {
2270 fore = Color_bg; 2386 fore = Color_bg;
2271 back = Color_fg; 2387 back = Color_fg;
2272 } 2388 }
… …
2274 } 2390 }
2275 2391
2276#ifdef TEXT_BLINK 2392#ifdef TEXT_BLINK
2277 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2393 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2278 { 2394 {
2279 if (!text_blink_ev.active) 2395 if (!text_blink_ev.is_active ())
2280 { 2396 {
2281 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2397 text_blink_ev.again ();
2282 hidden_text = 0; 2398 hidden_text = 0;
2283 } 2399 }
2284 else if (hidden_text) 2400 else if (hidden_text)
2285 fore = back; 2401 fore = back;
2286 } 2402 }
2287#endif 2403#endif
2404
2405#if ENABLE_STYLES
2406 // "careful" (too wide) character handling
2407
2408 // include previous careful character(s) if possible, looks nicer (best effort...)
2409 while (text > stp
2410 && srp[text - stp - 1] & RS_Careful
2411 && RS_SAME (rend, srp[text - stp - 1]))
2412 text--, count++, xpixel -= fwidth;
2413
2414 // force redraw after "careful" characters to avoid pixel droppings
2415 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2416 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2417
2418 // force redraw before "careful" characters to avoid pixel droppings
2419 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2420 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2421#endif
2288 } 2422 }
2289 2423
2290 /* 2424 /*
2291 * Actually do the drawing of the string here 2425 * Actually do the drawing of the string here
2292 */ 2426 */
2293 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2427 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2294 2428
2295 if (back == fore) 2429 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 { 2430 {
2301 if (must_clear) 2431 // this is very ugly, maybe push it into ->draw?
2302 {
2303 CLEAR_CHARS (xpixel, ypixel, count);
2304 2432
2305 for (i = 0; i < count; i++) /* don't draw empty strings */ 2433 for (i = 0; i < count; i++) /* don't draw empty strings */
2306 if (text[i] != ' ') 2434 if (text[i] != ' ')
2307 { 2435 {
2308 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2436 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2309 break; 2437 goto did_clear;
2310 }
2311 } 2438 }
2312 else 2439
2313 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2440 CLEAR_CHARS (xpixel, ypixel, count);
2441 did_clear: ;
2314 } 2442 }
2315 else 2443 else
2316 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2444 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2317 2445
2318 if (rend & RS_Uline && font->descent > 1 && fore != back) 2446 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2319 { 2447 {
2320#if ENABLE_FRILLS 2448#if ENABLE_FRILLS
2321 if (ISSET_PIXCOLOR (Color_underline)) 2449 if (ISSET_PIXCOLOR (Color_underline))
2322 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2450 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2323 else 2451 else
2324#endif 2452#endif
2325 XSetForeground (display->display, gc, pix_colors[fore]); 2453 XSetForeground (dpy, gc, pix_colors[fore]);
2326 2454
2327 XDrawLine (display->display, drawBuffer, gc, 2455 XDrawLine (dpy, vt, gc,
2328 xpixel, ypixel + font->ascent + 1, 2456 xpixel, ypixel + font->ascent + 1,
2329 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2457 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2330 } 2458 }
2331 } /* for (col....) */ 2459 } /* for (col....) */
2332 } /* for (row....) */ 2460 } /* for (row....) */
2333 2461
2334#if ENABLE_OVERLAY
2335 scr_swap_overlay ();
2336#endif
2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2338
2339 /* 2462 /*
2340 * G: cleanup cursor and display outline cursor if necessary 2463 * G: cleanup cursor and display outline cursor if necessary
2341 */ 2464 */
2342 if (showcursor) 2465 if (showcursor)
2343 { 2466 {
2344 if (focus) 2467 if (focus)
2345 { 2468 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) 2469 else if (oldcursor.row >= 0)
2357 { 2470 {
2358 int cursorwidth = 1; 2471 int cursorwidth = 1;
2359 int col = oldcursor.col; 2472 int col = oldcursor.col;
2360 2473
… …
2363 2476
2364 while (col + cursorwidth < ncol 2477 while (col + cursorwidth < ncol
2365 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2478 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2366 cursorwidth++; 2479 cursorwidth++;
2367 2480
2368#ifndef NO_CURSORCOLOR
2369 if (ISSET_PIXCOLOR (Color_cursor))
2370 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2481 XSetForeground (dpy, gc, pix_colors[ccol1]);
2371#endif
2372 2482
2373 XDrawRectangle (display->display, drawBuffer, gc, 2483 XDrawRectangle (dpy, vt, gc,
2374 Col2Pixel (col), 2484 Col2Pixel (col),
2375 Row2Pixel (oldcursor.row), 2485 Row2Pixel (oldcursor.row),
2376 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2486 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2377 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2487 (unsigned int) (Height2Pixel (1) - 1));
2378 } 2488 }
2379 } 2489 }
2380 2490
2381 /* 2491 /*
2382 * H: cleanup selection 2492 * H: cleanup selection
2383 */ 2493 */
2494#if ENABLE_OVERLAY
2495 scr_swap_overlay ();
2496#endif
2497 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2498
2384 scr_reverse_selection (); 2499 scr_reverse_selection ();
2385 2500
2501 screen.flags = old_screen_flags;
2386 num_scr = 0; 2502 num_scr = 0;
2387 num_scr_allow = 1; 2503 num_scr_allow = 1;
2388} 2504}
2389 2505
2390void 2506void ecb_cold
2391rxvt_term::scr_remap_chars (line_t &l) 2507rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2392{ 2508{
2393 if (!l.t) 2509 if (!l.valid ())
2394 return; 2510 return;
2395 2511
2396 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2512 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2397 2513
2398 for (int i = ncol; i--; ) 2514 for (int i = ncol; i--; )
2399 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2515 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2400} 2516}
2401 2517
2402void 2518void ecb_cold
2403rxvt_term::scr_remap_chars () 2519rxvt_term::scr_remap_chars () NOTHROW
2404{ 2520{
2405 for (int i = total_rows; i--; ) 2521 for (int i = total_rows; i--; )
2406 scr_remap_chars (row_buf [i]); 2522 scr_remap_chars (row_buf [i]);
2407 2523
2408 for (int i = nrow; i--; ) 2524 for (int i = nrow; i--; )
… …
2410 scr_remap_chars (drawn_buf [i]); 2526 scr_remap_chars (drawn_buf [i]);
2411 scr_remap_chars (swap_buf [i]); 2527 scr_remap_chars (swap_buf [i]);
2412 } 2528 }
2413} 2529}
2414 2530
2415void 2531void ecb_cold
2416rxvt_term::scr_recolour () 2532rxvt_term::scr_recolour (bool refresh) NOTHROW
2417{ 2533{
2418 if (1 2534 bool transparent = false;
2419#if TRANSPARENT 2535
2420 && !am_transparent 2536#ifdef HAVE_IMG
2537 if (bg_img != 0)
2538 {
2539# if ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT)
2541 {
2542 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2544
2545 transparent = true;
2546 }
2547 else
2421#endif 2548# endif
2422#if XPM_BACKGROUND
2423 && !bgPixmap.pixmap
2424#endif
2425 ) 2549 {
2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2551 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2552 }
2426 { 2553 }
2554 else
2555#endif
2556 {
2427 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2557 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2428 XClearWindow (display->display, parent[0]);
2429 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2558 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2430#if HAVE_SCROLLBARS 2559 }
2560
2561 XClearWindow (dpy, parent);
2562
2431 if (scrollBar.win) 2563 if (scrollBar.win)
2432 { 2564 {
2565 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else
2433 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2434 scrollBar.setIdle (); 2569 scrollBar.state = SB_STATE_IDLE;
2435 scrollbar_show (0); 2570 scrollBar.show (0);
2436 } 2571 }
2437#endif 2572
2573 if (refresh)
2438 } 2574 {
2439
2440 scr_clear (); 2575 scr_clear ();
2441 scr_touch (true); 2576 scr_touch (true);
2577 }
2442 want_refresh = 1; 2578 want_refresh = 1;
2443} 2579}
2444 2580
2445/* ------------------------------------------------------------------------- */ 2581/* ------------------------------------------------------------------------- */
2446void 2582void
2447rxvt_term::scr_clear (bool really) 2583rxvt_term::scr_clear (bool really) NOTHROW
2448{ 2584{
2449 if (!mapped) 2585 if (!mapped)
2450 return; 2586 return;
2451 2587
2452 num_scr_allow = 0; 2588 num_scr_allow = 0;
2453 want_refresh = 1; 2589 want_refresh = 1;
2454 2590
2455 if (really) 2591 if (really)
2456 XClearWindow (display->display, vt); 2592 XClearWindow (dpy, vt);
2457} 2593}
2458 2594
2459void 2595void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2596rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2461{ 2597{
2462 int view_end = -view_start + nrow; 2598 int view_end = view_start + nrow;
2463 int row, col; 2599 int row, col;
2464 2600
2465 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++) 2601 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2466 { 2602 {
2467 text_t *stp = ROW(row).t; 2603 text_t *stp = ROW(row).t;
2468 rend_t *srp = ROW(row).r; 2604 rend_t *srp = ROW(row).r;
2469 2605
2470 for (col = beg_col; col < end_col; col++) 2606 for (col = beg_col; col < end_col; col++)
… …
2477 srp[col] ^= rstyle2; 2613 srp[col] ^= rstyle2;
2478 } 2614 }
2479} 2615}
2480 2616
2481void 2617void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2618rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2483{ 2619{
2484 int view_end = -view_start + nrow; 2620 int view_end = view_start + nrow;
2485 int row, col; 2621 int row, col;
2486 2622
2487 if (beg_row >= -view_start) 2623 if (beg_row >= view_start)
2488 { 2624 {
2489 col = beg_col; 2625 col = beg_col;
2490 row = beg_row; 2626 row = beg_row;
2491 } 2627 }
2492 else 2628 else
2493 { 2629 {
2494 col = 0; 2630 col = 0;
2495 row = -view_start; 2631 row = view_start;
2496 } 2632 }
2497 2633
2498 for (; row < min (end_row, view_end); row++, col = 0) 2634 for (; row < min (end_row, view_end); row++, col = 0)
2499 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2635 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
… …
2503 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2639 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2504 srp[col] ^= rstyle; 2640 srp[col] ^= rstyle;
2505} 2641}
2506 2642
2507/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2508void 2644void ecb_hot
2509rxvt_term::scr_reverse_selection () 2645rxvt_term::scr_reverse_selection () NOTHROW
2510{ 2646{
2511 if (selection.op 2647 if (selection.op
2512 && current_screen == selection.screen 2648 && current_screen == selection.screen
2513 && selection.end.row >= -view_start) 2649 && selection.end.row >= view_start)
2514 { 2650 {
2515#if ENABLE_FRILLS 2651#if !ENABLE_MINIMAL
2516 if (selection.rect) 2652 if (selection.rect)
2517 scr_xor_rect (selection.beg.row, selection.beg.col, 2653 scr_xor_rect (selection.beg.row, selection.beg.col,
2518 selection.end.row, selection.end.col, 2654 selection.end.row, selection.end.col,
2519 RS_RVid, RS_RVid | RS_Uline); 2655 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2520 else 2656 else
2521#endif 2657#endif
2522 scr_xor_span (selection.beg.row, selection.beg.col, 2658 scr_xor_span (selection.beg.row, selection.beg.col,
2523 selection.end.row, selection.end.col, 2659 selection.end.row, selection.end.col,
2524 RS_RVid); 2660 RS_Sel | RS_RVid);
2525 } 2661 }
2526} 2662}
2527 2663
2528/* ------------------------------------------------------------------------- */ 2664/* ------------------------------------------------------------------------- */
2529/* 2665/*
2530 * Dump the whole scrollback and screen to the passed filedescriptor. The 2666 * Dump the whole scrollback and screen to the passed filedescriptor. The
2531 * invoking routine must close the fd. 2667 * invoking routine must close the fd.
2532 */ 2668 */
2533#if 0 2669#if 0
2534void 2670void
2535rxvt_term::scr_dump (int fd) 2671rxvt_term::scr_dump (int fd) NOTHROW
2536{ 2672{
2537 int row, wrote; 2673 // if this method is needed, it can be implemented by factoring the
2538 unsigned int width, towrite; 2674 // 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} 2675}
2558#endif 2676#endif
2559 2677
2560/* ------------------------------------------------------------------------- * 2678/* ------------------------------------------------------------------------- *
2561 * CHARACTER SELECTION * 2679 * CHARACTER SELECTION *
2562 * ------------------------------------------------------------------------- */ 2680 * ------------------------------------------------------------------------- */
2563void 2681void
2564rxvt_term::selection_check (int check_more) 2682rxvt_term::selection_check (int check_more) NOTHROW
2565{ 2683{
2566 row_col_t pos;
2567
2568 if (!selection.op) 2684 if (!selection.op)
2569 return; 2685 return;
2570 2686
2571 pos.row = pos.col = 0;
2572 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2573 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2574 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2575 || (check_more == 1 2690 || (check_more == 1
2576 && current_screen == selection.screen 2691 && current_screen == selection.screen
2577 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2578 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2693 && 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 (); 2694 CLEAR_ALL_SELECTION ();
2695}
2696
2697void
2698rxvt_term::selection_changed () NOTHROW
2699{
2700 line_t &r1 = ROW (selection.beg.row);
2701 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2702 --selection.beg.col;
2703
2704 line_t &r2 = ROW (selection.end.row);
2705 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2706 ++selection.end.col;
2707
2708 want_refresh = 1;
2588} 2709}
2589 2710
2590/* ------------------------------------------------------------------------- */ 2711/* ------------------------------------------------------------------------- */
2591/* 2712/*
2592 * Paste a selection direct to the command fd 2713 * Paste a selection direct to the command fd
2593 */ 2714 */
2594void 2715void
2595rxvt_term::paste (char *data, unsigned int len) 2716rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2596{ 2717{
2597 /* convert normal newline chars into common keyboard Return key sequence */ 2718 /* convert normal newline chars into common keyboard Return key sequence */
2598 for (unsigned int i = 0; i < len; i++) 2719 for (unsigned int i = 0; i < len; i++)
2599 if (data[i] == C0_LF) 2720 if (data[i] == C0_LF)
2600 data[i] = C0_CR; 2721 data[i] = C0_CR;
2601 2722
2723 if (priv_modes & PrivMode_BracketPaste)
2724 tt_printf ("\x1b[200~");
2725
2602 tt_write (data, len); 2726 tt_write (data, len);
2603}
2604 2727
2605/* ------------------------------------------------------------------------- */ 2728 if (priv_modes & PrivMode_BracketPaste)
2606/* 2729 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} 2730}
2771 2731
2772void 2732void
2773rxvt_term::incr_cb (time_watcher &w) 2733rxvt_term::paste (char *data, unsigned int len) NOTHROW
2774{ 2734{
2775 selection_wait = Sel_none; 2735 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; 2736 return;
2788 2737
2789 selection_paste (win, prop, true); 2738 tt_paste (data, len);
2790} 2739}
2791 2740
2792/* ------------------------------------------------------------------------- */ 2741/* ------------------------------------------------------------------------- */
2793/* 2742/*
2794 * Request the current selection: 2743 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2795 * Order: > internal selection if available 2744 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2796 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2745 * 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 2746 * EXT: button 2 release
2801 */ 2747 */
2802void 2748void
2803rxvt_term::selection_request (Time tm, int x, int y) 2749rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2804{ 2750{
2805 if (x < 0 || x >= width || y < 0 || y >= height)
2806 return; /* outside window */
2807
2808 if (selection.text) 2751 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 } 2752 {
2815 else 2753 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2754 selection_req->run ();
2816 { 2755 }
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} 2756}
2863 2757
2864/* ------------------------------------------------------------------------- */ 2758/* ------------------------------------------------------------------------- */
2865/* 2759/*
2866 * Clear all selected text 2760 * Clear all selected text
2867 * EXT: SelectionClear 2761 * EXT: SelectionClear
2868 */ 2762 */
2869void 2763void
2870rxvt_term::selection_clear () 2764rxvt_term::selection_clear (bool clipboard) NOTHROW
2871{ 2765{
2766 if (!clipboard)
2767 {
2872 want_refresh = 1; 2768 want_refresh = 1;
2873 free (selection.text); 2769 free (selection.text);
2874 selection.text = NULL; 2770 selection.text = NULL;
2875 selection.len = 0; 2771 selection.len = 0;
2876 CLEAR_SELECTION (); 2772 CLEAR_SELECTION ();
2877 2773
2878 if (display->selection_owner == this) 2774 if (display->selection_owner == this)
2879 display->selection_owner = 0; 2775 display->selection_owner = 0;
2776 }
2777 else
2778 {
2779 free (selection.clip_text);
2780 selection.clip_text = NULL;
2781 selection.clip_len = 0;
2782
2783 if (display->clipboard_owner == this)
2784 display->clipboard_owner = 0;
2785 }
2880} 2786}
2881 2787
2882/* ------------------------------------------------------------------------- */ 2788/* ------------------------------------------------------------------------- */
2883/* 2789/*
2884 * Copy a selection into the cut buffer 2790 * Copy a selection into the cut buffer
2885 * EXT: button 1 or 3 release 2791 * EXT: button 1 or 3 release
2886 */ 2792 */
2887void 2793void
2888rxvt_term::selection_make (Time tm) 2794rxvt_term::selection_make (Time tm)
2889{ 2795{
2890 int i; 2796 int size;
2891 wchar_t *new_selection_text; 2797 wchar_t *new_selection_text;
2892 text_t *t; 2798 text_t *t;
2893 2799
2894 switch (selection.op) 2800 switch (selection.op)
2895 { 2801 {
… …
2911 return; /* nothing selected, go away */ 2817 return; /* nothing selected, go away */
2912 2818
2913 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2819 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2914 return; 2820 return;
2915 2821
2916 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2822 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2917 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2823 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2918 2824
2919 int ofs = 0; 2825 int ofs = 0;
2920 int extra = 0; 2826 int extra = 0;
2921 2827
2922 int col = selection.beg.col; 2828 int col = selection.beg.col;
… …
2924 2830
2925 int end_col; 2831 int end_col;
2926 2832
2927 for (; row <= selection.end.row; row++, col = 0) 2833 for (; row <= selection.end.row; row++, col = 0)
2928 { 2834 {
2929#if ENABLE_FRILLS 2835#if !ENABLE_MINIMAL
2930 if (selection.rect) 2836 if (selection.rect)
2931 { 2837 {
2932 col = selection.beg.col; 2838 col = selection.beg.col;
2933 end_col = ncol + 1; 2839 end_col = selection.end.col;
2934 } 2840 }
2935 else 2841 else
2936#endif 2842#endif
2937 end_col = ROW(row).l; 2843 end_col = ROW(row).l;
2938 2844
2939 col = max (col, 0); 2845 col = max (col, 0);
2940 2846
2941 if (row == selection.end.row 2847 if (row == selection.end.row)
2942#if ENABLE_FRILLS
2943 || selection.rect
2944#endif
2945 )
2946 min_it (end_col, selection.end.col); 2848 min_it (end_col, selection.end.col);
2947 2849
2948 t = ROW(row).t + col; 2850 t = ROW(row).t + col;
2949 2851
2950 for (; col < end_col; col++) 2852 for (; col < end_col; col++)
… …
2958 2860
2959 extra -= (len - 1); 2861 extra -= (len - 1);
2960 2862
2961 if (extra < 0) 2863 if (extra < 0)
2962 { 2864 {
2963 extra += i; 2865 extra += size;
2964 i += i; 2866 size += size;
2965 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2867 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2966 } 2868 }
2967 2869
2968 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2870 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2969 } 2871 }
2970#endif 2872#endif
2971 else 2873 else
2972 new_selection_text[ofs++] = *t++; 2874 new_selection_text[ofs++] = *t++;
2973 } 2875 }
2974 2876
2975#if ENABLE_FRILLS 2877#if !ENABLE_MINIMAL
2976 if (selection.rect) 2878 if (selection.rect)
2977 { 2879 {
2978 while (ofs 2880 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF 2881 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1])) 2882 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2982 2884
2983 new_selection_text[ofs++] = C0_LF; 2885 new_selection_text[ofs++] = C0_LF;
2984 } 2886 }
2985 else 2887 else
2986#endif 2888#endif
2987 if (!ROW(row).is_longer () && row != selection.end.row) 2889 if (!ROW(row).is_longer ()
2890 && (row != selection.end.row || end_col != selection.end.col)
2891 && (row != selection.beg.row || selection.beg.col < ncol))
2988 new_selection_text[ofs++] = C0_LF; 2892 new_selection_text[ofs++] = C0_LF;
2989 } 2893 }
2990
2991 if (end_col != selection.end.col)
2992 new_selection_text[ofs++] = C0_LF;
2993 2894
2994 new_selection_text[ofs] = 0; 2895 new_selection_text[ofs] = 0;
2995 2896
2996 if (ofs == 0) 2897 if (ofs == 0)
2997 { 2898 {
… …
3010 2911
3011 selection_grab (tm); 2912 selection_grab (tm);
3012} 2913}
3013 2914
3014bool 2915bool
3015rxvt_term::selection_grab (Time tm) 2916rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3016{ 2917{
2918 Atom sel;
2919
2920 if (!clipboard)
2921 {
3017 selection_time = tm; 2922 selection_time = tm;
3018 2923 sel = XA_PRIMARY;
3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3021 { 2924 }
2925 else
2926 {
2927 clipboard_time = tm;
2928 sel = xa[XA_CLIPBOARD];
2929 }
2930
2931 XSetSelectionOwner (dpy, sel, vt, tm);
2932 if (XGetSelectionOwner (dpy, sel) == vt)
2933 {
3022 display->set_selection_owner (this); 2934 display->set_selection_owner (this, clipboard);
3023 return true; 2935 return true;
3024 } 2936 }
3025 else 2937 else
2938 {
2939 selection_clear (clipboard);
3026 return false; 2940 return false;
2941 }
3027 2942
3028#if 0 2943#if 0
3029 XTextProperty ct; 2944 XTextProperty ct;
3030 2945
3031 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 2946 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3032 { 2947 {
3033 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 2948 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3034 XFree (ct.value); 2949 XFree (ct.value);
3035 } 2950 }
3036#endif 2951#endif
… …
3039/* ------------------------------------------------------------------------- */ 2954/* ------------------------------------------------------------------------- */
3040/* 2955/*
3041 * Mark or select text based upon number of clicks: 1, 2, or 3 2956 * Mark or select text based upon number of clicks: 1, 2, or 3
3042 * EXT: button 1 press 2957 * EXT: button 1 press
3043 */ 2958 */
3044void 2959void ecb_cold
3045rxvt_term::selection_click (int clicks, int x, int y) 2960rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3046{ 2961{
3047 clicks = ((clicks - 1) % 3) + 1; 2962 clicks = ((clicks - 1) % 3) + 1;
3048 selection.clicks = clicks; /* save clicks so extend will work */ 2963 selection.clicks = clicks; /* save clicks so extend will work */
3049 2964
2965 if (clicks == 2 && !selection.rect
2966 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
2967 {
2968 MEvent.clicks = 1; // what a mess
2969 selection.screen = current_screen;
2970 selection.op = SELECTION_CONT;
2971 return;
2972 }
2973
3050 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 2974 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3051 2975
3052 if (clicks == 2 || clicks == 3) 2976 if (clicks == 2 || clicks == 3)
3053 selection_extend_colrow (selection.mark.col, 2977 selection_extend_colrow (selection.mark.col,
3054 selection.mark.row + view_start, 2978 selection.mark.row - view_start,
3055 0, /* button 3 */ 2979 0, /* button 3 */
3056 1, /* button press */ 2980 1, /* button press */
3057 0); /* click change */ 2981 0); /* click change */
3058} 2982}
3059 2983
3060/* ------------------------------------------------------------------------- */ 2984/* ------------------------------------------------------------------------- */
3061/* 2985/*
3062 * Mark a selection at the specified col/row 2986 * Mark a selection at the specified col/row
3063 */ 2987 */
3064void 2988void ecb_cold
3065rxvt_term::selection_start_colrow (int col, int row) 2989rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3066{ 2990{
3067 want_refresh = 1; 2991 want_refresh = 1;
3068 2992
3069 selection.mark.row = row - view_start; 2993 selection.mark.row = row + view_start;
3070 selection.mark.col = col; 2994 selection.mark.col = col;
3071 2995
3072 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 2996 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3073 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 2997 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3074 2998
3075 while (selection.mark.col > 0 2999 while (selection.mark.col > 0
3076 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3000 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3077 --selection.mark.col; 3001 --selection.mark.col;
3078 3002
3079 if (selection.op) 3003 if (selection.op)
3004 {
3080 { /* clear the old selection */ 3005 /* clear the old selection */
3081 selection.beg.row = selection.end.row = selection.mark.row; 3006 selection.beg.row = selection.end.row = selection.mark.row;
3082 selection.beg.col = selection.end.col = selection.mark.col; 3007 selection.beg.col = selection.end.col = selection.mark.col;
3083 } 3008 }
3084 3009
3085 selection.op = SELECTION_INIT; 3010 selection.op = SELECTION_INIT;
… …
3091 * Word select: select text for 2 clicks 3016 * Word select: select text for 2 clicks
3092 * We now only find out the boundary in one direction 3017 * We now only find out the boundary in one direction
3093 */ 3018 */
3094 3019
3095/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3020/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3096#define DELIMIT_TEXT(x) \ 3021#define DELIMIT_TEXT(x) \
3097 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3022 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3098#define DELIMIT_REND(x) 1 3023#define DELIMIT_REND(x) 1
3099 3024
3100void 3025void ecb_cold
3101rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3026rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3102{ 3027{
3103 int col, row, dirnadd, tcol, trow, w1, w2; 3028 int col, row, dirnadd, tcol, trow, w1, w2;
3104 row_col_t bound; 3029 row_col_t bound;
3105 text_t *stp; 3030 text_t *stp;
3106 rend_t *srp; 3031 rend_t *srp;
3107 3032
3108 if (dirn == UP) 3033 if (dirn == UP)
3109 { 3034 {
3110 bound.row = - nsaved - 1; 3035 bound.row = top_row - 1;
3111 bound.col = 0; 3036 bound.col = 0;
3112 dirnadd = -1; 3037 dirnadd = -1;
3113 } 3038 }
3114 else 3039 else
3115 { 3040 {
… …
3179 * EXT: button 3 press; button 1 or 3 drag 3104 * EXT: button 3 press; button 1 or 3 drag
3180 * flag == 0 ==> button 1 3105 * flag == 0 ==> button 1
3181 * flag == 1 ==> button 3 press 3106 * flag == 1 ==> button 3 press
3182 * flag == 2 ==> button 3 motion 3107 * flag == 2 ==> button 3 motion
3183 */ 3108 */
3184void 3109void ecb_cold
3185rxvt_term::selection_extend (int x, int y, int flag) 3110rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3186{ 3111{
3187 int col = clamp (Pixel2Col (x), 0, ncol); 3112 int col = clamp (Pixel2Col (x), 0, ncol);
3188 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3113 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3189 3114
3190 /* 3115 /*
… …
3193 * select nothing. Otherwise, if we're to the right of the mark, you have to 3118 * select nothing. Otherwise, if we're to the right of the mark, you have to
3194 * be _past_ a character for it to be selected. 3119 * be _past_ a character for it to be selected.
3195 */ 3120 */
3196 if (((selection.clicks % 3) == 1) && !flag 3121 if (((selection.clicks % 3) == 1) && !flag
3197 && (col == selection.mark.col 3122 && (col == selection.mark.col
3198 && (row == selection.mark.row + view_start))) 3123 && (row == selection.mark.row - view_start)))
3199 { 3124 {
3200 /* select nothing */ 3125 /* select nothing */
3201 selection.beg.row = selection.end.row = 0; 3126 selection.beg.row = selection.end.row = 0;
3202 selection.beg.col = selection.end.col = 0; 3127 selection.beg.col = selection.end.col = 0;
3203 selection.clicks = 4; 3128 selection.clicks = 4;
… …
3215 3140
3216/* ------------------------------------------------------------------------- */ 3141/* ------------------------------------------------------------------------- */
3217/* 3142/*
3218 * Extend the selection to the specified col/row 3143 * Extend the selection to the specified col/row
3219 */ 3144 */
3220void 3145void ecb_cold
3221rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3146rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3222{ 3147{
3223 row_col_t pos; 3148 row_col_t pos;
3224 enum { 3149 enum {
3225 LEFT, RIGHT 3150 LEFT, RIGHT
3226 } closeto = RIGHT; 3151 } closeto = RIGHT;
3227
3228 want_refresh = 1;
3229 3152
3230 switch (selection.op) 3153 switch (selection.op)
3231 { 3154 {
3232 case SELECTION_INIT: 3155 case SELECTION_INIT:
3233 CLEAR_SELECTION (); 3156 CLEAR_SELECTION ();
… …
3258 selection.beg.col = selection.end.col = selection.mark.col; 3181 selection.beg.col = selection.end.col = selection.mark.col;
3259 selection.beg.row = selection.end.row = selection.mark.row; 3182 selection.beg.row = selection.end.row = selection.mark.row;
3260 } 3183 }
3261 3184
3262 pos.col = col; 3185 pos.col = col;
3263 pos.row = row - view_start; 3186 pos.row = view_start + row;
3264 3187
3265 /* 3188 /*
3266 * This is mainly xterm style selection with a couple of differences, mainly 3189 * This is mainly xterm style selection with a couple of differences, mainly
3267 * in the way button3 drag extension works. 3190 * in the way button3 drag extension works.
3268 * We're either doing: button1 drag; button3 press; or button3 drag 3191 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3274 * a point/word/line which is either the start or end of the selection 3197 * a point/word/line which is either the start or end of the selection
3275 * and it was decided by whichever point/word/line was `fixed' at the 3198 * and it was decided by whichever point/word/line was `fixed' at the
3276 * time of the most recent button3 press 3199 * time of the most recent button3 press
3277 */ 3200 */
3278 if (button3 && buttonpress) 3201 if (button3 && buttonpress)
3202 {
3279 { /* button3 press */ 3203 /* button3 press */
3280 /* 3204 /*
3281 * first determine which edge of the selection we are closest to 3205 * first determine which edge of the selection we are closest to
3282 */ 3206 */
3283 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3207 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3284 || (!ROWCOL_IS_AFTER (pos, selection.end) 3208 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3302 selection.mark.row = selection.beg.row; 3226 selection.mark.row = selection.beg.row;
3303 selection.mark.col = selection.beg.col; 3227 selection.mark.col = selection.beg.col;
3304 } 3228 }
3305 } 3229 }
3306 else 3230 else
3231 {
3307 { /* button1 drag or button3 drag */ 3232 /* button1 drag or button3 drag */
3308 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3233 if (ROWCOL_IS_AFTER (selection.mark, pos))
3309 { 3234 {
3310 if (selection.mark.row == selection.end.row 3235 if (selection.mark.row == selection.end.row
3311 && selection.mark.col == selection.end.col 3236 && selection.mark.col == selection.end.col
3312 && clickchange 3237 && clickchange
… …
3329 3254
3330 if (selection.clicks == 1) 3255 if (selection.clicks == 1)
3331 { 3256 {
3332 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3257 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3333 && !ROW(selection.beg.row).is_longer () 3258 && !ROW(selection.beg.row).is_longer ()
3334#if ENABLE_FRILLS 3259#if !ENABLE_MINIMAL
3335 && !selection.rect 3260 && !selection.rect
3336#endif 3261#endif
3337 ) 3262 )
3338 selection.beg.col = ncol; 3263 selection.beg.col = ncol;
3339 3264
3340 if ( 3265 if (
3341 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3266 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3342 && !ROW(selection.end.row).is_longer () 3267 && !ROW(selection.end.row).is_longer ()
3343#if ENABLE_FRILLS 3268#if !ENABLE_MINIMAL
3344 && !selection.rect 3269 && !selection.rect
3345#endif 3270#endif
3346 ) 3271 )
3347 selection.end.col = ncol; 3272 selection.end.col = ncol;
3348 } 3273 }
3349 else if (selection.clicks == 2) 3274 else if (selection.clicks == 2)
3350 { 3275 {
3351 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3276 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3352 selection.end.col--; 3277 selection.end.col--;
3353 3278
3354 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3355 {
3356 selection_delimit_word (UP, &selection.beg, &selection.beg); 3279 selection_delimit_word (UP, &selection.beg, &selection.beg);
3357 selection_delimit_word (DN, &selection.end, &selection.end); 3280 selection_delimit_word (DN, &selection.end, &selection.end);
3358 }
3359 } 3281 }
3360 else if (selection.clicks == 3) 3282 else if (selection.clicks == 3)
3361 { 3283 {
3362#if ENABLE_FRILLS 3284#if ENABLE_FRILLS
3363 if (OPTION (Opt_tripleclickwords)) 3285 if (option (Opt_tripleclickwords))
3364 { 3286 {
3365 selection_delimit_word (UP, &selection.beg, &selection.beg); 3287 selection_delimit_word (UP, &selection.beg, &selection.beg);
3366 3288
3367 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3289 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3368 { 3290 {
3369 if (!ROW(end_row).is_longer ()) 3291 if (!ROW(end_row).is_longer ())
3370 { 3292 {
3371 selection.end.row = end_row; 3293 selection.end.row = end_row;
3372 selection.end.col = ROW(end_row).l; 3294 selection.end.col = ROW(end_row).l;
3295# if !ENABLE_MINIMAL
3373 selection_remove_trailing_spaces (); 3296 selection_remove_trailing_spaces ();
3297# endif
3374 break; 3298 break;
3375 } 3299 }
3376 } 3300 }
3377 } 3301 }
3378 else 3302 else
… …
3394 selection.end.row++; 3318 selection.end.row++;
3395 } 3319 }
3396 } 3320 }
3397 3321
3398 if (button3 && buttonpress) 3322 if (button3 && buttonpress)
3323 {
3399 { /* mark may need to be changed */ 3324 /* mark may need to be changed */
3400 if (closeto == LEFT) 3325 if (closeto == LEFT)
3401 { 3326 {
3402 selection.mark.row = selection.end.row; 3327 selection.mark.row = selection.end.row;
3403 selection.mark.col = selection.end.col - (selection.clicks == 2); 3328 selection.mark.col = selection.end.col - (selection.clicks == 2);
3404 } 3329 }
… …
3407 selection.mark.row = selection.beg.row; 3332 selection.mark.row = selection.beg.row;
3408 selection.mark.col = selection.beg.col; 3333 selection.mark.col = selection.beg.col;
3409 } 3334 }
3410 } 3335 }
3411 3336
3412#if ENABLE_FRILLS 3337#if !ENABLE_MINIMAL
3413 if (selection.rect && selection.beg.col > selection.end.col) 3338 if (selection.rect && selection.beg.col > selection.end.col)
3414 ::swap (selection.beg.col, selection.end.col); 3339 ::swap (selection.beg.col, selection.end.col);
3415#endif 3340#endif
3416}
3417 3341
3418#if ENABLE_FRILLS 3342 selection_changed ();
3419void 3343}
3344
3345#if !ENABLE_MINIMAL
3346void ecb_cold
3420rxvt_term::selection_remove_trailing_spaces () 3347rxvt_term::selection_remove_trailing_spaces () NOTHROW
3421{ 3348{
3422 int32_t end_col, end_row; 3349 int32_t end_col, end_row;
3423 text_t *stp; 3350 text_t *stp;
3424 3351
3425 end_col = selection.end.col; 3352 end_col = selection.end.col;
… …
3462/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3463/* 3390/*
3464 * Double click on button 3 when already selected 3391 * Double click on button 3 when already selected
3465 * EXT: button 3 double click 3392 * EXT: button 3 double click
3466 */ 3393 */
3467void 3394void ecb_cold
3468rxvt_term::selection_rotate (int x, int y) 3395rxvt_term::selection_rotate (int x, int y) NOTHROW
3469{ 3396{
3470 selection.clicks = selection.clicks % 3 + 1; 3397 selection.clicks = selection.clicks % 3 + 1;
3471 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3398 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3472} 3399}
3473 3400
3474/* ------------------------------------------------------------------------- */ 3401/* ------------------------------------------------------------------------- */
3475/* 3402/*
3476 * Respond to a request for our current selection 3403 * Respond to a request for our current selection
3477 * EXT: SelectionRequest 3404 * EXT: SelectionRequest
3478 */ 3405 */
3479void 3406void ecb_cold
3480rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3407rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3481{ 3408{
3409 Atom property = rq.property == None ? rq.target : rq.property;
3482 XSelectionEvent ev; 3410 XSelectionEvent ev;
3483 dDisp;
3484 3411
3485 ev.type = SelectionNotify; 3412 ev.type = SelectionNotify;
3486 ev.property = None; 3413 ev.property = None;
3487 ev.display = rq.display; 3414 ev.display = rq.display;
3488 ev.requestor = rq.requestor; 3415 ev.requestor = rq.requestor;
… …
3502 *target++ = xa[XA_COMPOUND_TEXT]; 3429 *target++ = xa[XA_COMPOUND_TEXT];
3503#if X_HAVE_UTF8_STRING 3430#if X_HAVE_UTF8_STRING
3504 *target++ = xa[XA_UTF8_STRING]; 3431 *target++ = xa[XA_UTF8_STRING];
3505#endif 3432#endif
3506 3433
3507 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3434 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3508 32, PropModeReplace, 3435 32, PropModeReplace,
3509 (unsigned char *)target_list, target - target_list); 3436 (unsigned char *)target_list, target - target_list);
3510 ev.property = rq.property; 3437 ev.property = property;
3511 } 3438 }
3512#if TODO // TODO 3439#if TODO // TODO
3513 else if (rq.target == xa[XA_MULTIPLE]) 3440 else if (rq.target == xa[XA_MULTIPLE])
3514 { 3441 {
3515 /* TODO: Handle MULTIPLE */ 3442 /* TODO: Handle MULTIPLE */
3516 } 3443 }
3517#endif 3444#endif
3518 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3445 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3519 { 3446 {
3520 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3447 XChangeProperty (dpy, rq.requestor, property, rq.target,
3521 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3448 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3522 ev.property = rq.property; 3449 ev.property = property;
3450 }
3451 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3452 {
3453 XChangeProperty (dpy, rq.requestor, property, rq.target,
3454 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3455 ev.property = property;
3523 } 3456 }
3524 else if (rq.target == XA_STRING 3457 else if (rq.target == XA_STRING
3525 || rq.target == xa[XA_TEXT] 3458 || rq.target == xa[XA_TEXT]
3526 || rq.target == xa[XA_COMPOUND_TEXT] 3459 || rq.target == xa[XA_COMPOUND_TEXT]
3527 || rq.target == xa[XA_UTF8_STRING] 3460 || rq.target == xa[XA_UTF8_STRING]
… …
3549 style = enc_string; 3482 style = enc_string;
3550 else if (target == xa[XA_TEXT]) 3483 else if (target == xa[XA_TEXT])
3551 style = enc_text; 3484 style = enc_text;
3552 else if (target == xa[XA_COMPOUND_TEXT]) 3485 else if (target == xa[XA_COMPOUND_TEXT])
3553 style = enc_compound_text; 3486 style = enc_compound_text;
3554#if ENABLE_FRILLS 3487#if !ENABLE_MINIMAL
3555 else if (target == xa[XA_UTF8_STRING]) 3488 else if (target == xa[XA_UTF8_STRING])
3556 style = enc_utf8; 3489 style = enc_utf8;
3557#endif 3490#endif
3558 else 3491 else
3559 { 3492 {
3560 target = xa[XA_COMPOUND_TEXT]; 3493 target = xa[XA_COMPOUND_TEXT];
3561 style = enc_compound_text; 3494 style = enc_compound_text;
3562 } 3495 }
3563 3496
3564 if (selection.text) 3497 if (rq.selection == XA_PRIMARY && selection.text)
3565 { 3498 {
3566 cl = selection.text; 3499 cl = selection.text;
3567 selectlen = selection.len; 3500 selectlen = selection.len;
3568 } 3501 }
3502 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3503 {
3504 cl = selection.clip_text;
3505 selectlen = selection.clip_len;
3506 }
3569 else 3507 else
3570 { 3508 {
3571 cl = L""; 3509 cl = L"";
3572 selectlen = 0; 3510 selectlen = 0;
3573 } 3511 }
3574 3512
3575#if ENABLE_FRILLS 3513#if !ENABLE_MINIMAL
3576 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3514 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3577 // so recode it manually 3515 // so recode it manually
3578 if (style == enc_utf8) 3516 if (style == enc_utf8)
3579 { 3517 {
3580 freect = 1; 3518 freect = 1;
… …
3583 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3521 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3584 ct.nitems = strlen ((char *)ct.value); 3522 ct.nitems = strlen ((char *)ct.value);
3585 } 3523 }
3586 else 3524 else
3587#endif 3525#endif
3588 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3526 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3589 freect = 1; 3527 freect = 1;
3590 else 3528 else
3591 { 3529 {
3592 /* if we failed to convert then send it raw */ 3530 /* if we failed to convert then send it raw */
3593 ct.value = (unsigned char *)cl; 3531 ct.value = (unsigned char *)cl;
3594 ct.nitems = selectlen; 3532 ct.nitems = selectlen;
3595 ct.encoding = target; 3533 ct.encoding = target;
3596 } 3534 }
3597 3535
3598 XChangeProperty (disp, rq.requestor, rq.property, 3536 XChangeProperty (dpy, rq.requestor, property,
3599 ct.encoding, 8, PropModeReplace, 3537 ct.encoding, 8, PropModeReplace,
3600 ct.value, (int)ct.nitems); 3538 ct.value, (int)ct.nitems);
3601 ev.property = rq.property; 3539 ev.property = property;
3602 3540
3603 if (freect) 3541 if (freect)
3604 XFree (ct.value); 3542 XFree (ct.value);
3605 } 3543 }
3606 3544
3607 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3545 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3608} 3546}
3609 3547
3610/* ------------------------------------------------------------------------- * 3548/* ------------------------------------------------------------------------- */
3611 * MOUSE ROUTINES *
3612 * ------------------------------------------------------------------------- */
3613
3614/*
3615 * return col/row values corresponding to x/y pixel values
3616 */
3617void
3618rxvt_term::pixel_position (int *x, int *y)
3619{
3620 *x = Pixel2Col (*x);
3621 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3622 *y = Pixel2Row (*y);
3623 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3624}
3625
3626/* ------------------------------------------------------------------------- */
3627#ifdef USE_XIM 3549#if USE_XIM
3628void 3550void ecb_cold
3629rxvt_term::im_set_position (XPoint &pos) 3551rxvt_term::im_set_position (XPoint &pos) NOTHROW
3630{ 3552{
3631 XWindowAttributes xwa; 3553 XWindowAttributes xwa;
3632 3554
3633 XGetWindowAttributes (display->display, vt, &xwa); 3555 XGetWindowAttributes (dpy, vt, &xwa);
3634 3556
3635 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3557 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3636 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3558 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3637} 3559}
3638#endif 3560#endif
3639 3561
3640#if ENABLE_OVERLAY 3562#if ENABLE_OVERLAY
3641void 3563void
3642rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3564rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3643{ 3565{
3644 if (nrow < 1 || ncol < 1) 3566 if (nrow < 1 || ncol < 1)
3645 return; 3567 return;
3646 3568
3647 want_refresh = 1; 3569 want_refresh = 1;
… …
3656 h += 2; min_it (h, nrow); 3578 h += 2; min_it (h, nrow);
3657 3579
3658 x -= 1; clamp_it (x, 0, ncol - w); 3580 x -= 1; clamp_it (x, 0, ncol - w);
3659 y -= 1; clamp_it (y, 0, nrow - h); 3581 y -= 1; clamp_it (y, 0, nrow - h);
3660 3582
3661 ov_x = x; ov_y = y; 3583 ov.x = x; ov.y = y;
3662 ov_w = w; ov_h = h; 3584 ov.w = w; ov.h = h;
3663 3585
3664 ov_text = new text_t *[h]; 3586 ov.text = new text_t *[h];
3665 ov_rend = new rend_t *[h]; 3587 ov.rend = new rend_t *[h];
3666 3588
3667 for (y = 0; y < h; y++) 3589 for (y = 0; y < h; y++)
3668 { 3590 {
3669 text_t *tp = ov_text[y] = new text_t[w]; 3591 text_t *tp = ov.text[y] = new text_t[w];
3670 rend_t *rp = ov_rend[y] = new rend_t[w]; 3592 rend_t *rp = ov.rend[y] = new rend_t[w];
3671 3593
3672 text_t t0, t1, t2; 3594 text_t t0, t1, t2;
3673 rend_t r = OVERLAY_RSTYLE; 3595 rend_t r = OVERLAY_RSTYLE;
3674 3596
3675 if (y == 0) 3597 if (y == 0)
… …
3692 *rp = r; 3614 *rp = r;
3693 } 3615 }
3694} 3616}
3695 3617
3696void 3618void
3697rxvt_term::scr_overlay_off () 3619rxvt_term::scr_overlay_off () NOTHROW
3698{ 3620{
3699 if (!ov_text) 3621 if (!ov.text)
3700 return; 3622 return;
3701 3623
3702 want_refresh = 1; 3624 want_refresh = 1;
3703 3625
3704 for (int y = 0; y < ov_h; y++) 3626 for (int y = 0; y < ov.h; y++)
3705 { 3627 {
3706 delete [] ov_text[y]; 3628 delete [] ov.text[y];
3707 delete [] ov_rend[y]; 3629 delete [] ov.rend[y];
3708 } 3630 }
3709 3631
3710 delete [] ov_text; ov_text = 0; 3632 delete [] ov.text; ov.text = 0;
3711 delete [] ov_rend; ov_rend = 0; 3633 delete [] ov.rend; ov.rend = 0;
3712} 3634}
3713 3635
3714void 3636void
3715rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3637rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3716{ 3638{
3717 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3639 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3718 return; 3640 return;
3719 3641
3720 x++, y++; 3642 x++, y++;
3721 3643
3722 ov_text[y][x] = text; 3644 ov.text[y][x] = text;
3723 ov_rend[y][x] = rend; 3645 ov.rend[y][x] = rend;
3724} 3646}
3725 3647
3726void 3648void
3727rxvt_term::scr_overlay_set (int x, int y, const char *s) 3649rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3728{ 3650{
3729 while (*s) 3651 while (*s)
3730 scr_overlay_set (x++, y, *s++); 3652 scr_overlay_set (x++, y, *s++);
3731} 3653}
3732 3654
3733void 3655void
3734rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3656rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3735{ 3657{
3736 while (*s) 3658 while (*s)
3737 { 3659 {
3738 text_t t = *s++; 3660 text_t t = *s++;
3739 int width = wcwidth (t); 3661 int width = WCWIDTH (t);
3740 3662
3741 while (width--) 3663 while (width--)
3742 { 3664 {
3743 scr_overlay_set (x++, y, t); 3665 scr_overlay_set (x++, y, t);
3744 t = NOCHAR; 3666 t = NOCHAR;
3745 } 3667 }
3746 } 3668 }
3747} 3669}
3748 3670
3749void 3671void
3750rxvt_term::scr_swap_overlay () 3672rxvt_term::scr_swap_overlay () NOTHROW
3751{ 3673{
3752 if (!ov_text) 3674 if (!ov.text)
3753 return; 3675 return;
3754 3676
3677 // hide cursor if it is within the overlay area
3678 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3679 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3680 screen.flags &= ~Screen_VisibleCursor;
3681
3755 // swap screen mem with overlay 3682 // swap screen mem with overlay
3756 for (int y = ov_h; y--; ) 3683 for (int y = ov.h; y--; )
3757 { 3684 {
3758 text_t *t1 = ov_text[y]; 3685 text_t *t1 = ov.text[y];
3759 rend_t *r1 = ov_rend[y]; 3686 rend_t *r1 = ov.rend[y];
3760 3687
3761 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3688 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3762 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3689 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3763 3690
3764 for (int x = ov_w; x--; ) 3691 for (int x = ov.w; x--; )
3765 { 3692 {
3766 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3693 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3767 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3694 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3768 } 3695 }
3769 } 3696 }

Diff Legend

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