ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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