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

Diff Legend

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