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.415 by root, Mon May 28 14:25:16 2012 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
36 34
35static inline void
37inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
38{ 37{
39 while (len--) 38 while (len--)
40 *start++ = value; 39 *start++ = value;
41} 40}
42 41
43/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 256*1024
45#define PASTE_SIZE 32768
46#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
47 44
48/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 48#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 49 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 50 view_start = 0
54#define CLEAR_SELECTION() \ 51#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 52 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 53 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 54#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 82 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) \ 83#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) 84 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 85
89/* 86/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 87 * 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 */ 88 */
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) \ 89#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 90 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 91 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 92 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 93 (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 94
114/* ------------------------------------------------------------------------- * 95/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 96 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 97 * ------------------------------------------------------------------------- */
117 98
118/* Fill part/all of a line with blanks. */ 99/* Fill part/all of a line with blanks. */
119void 100void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 102{
122 if (!l.t) 103 if (!l.valid ())
123 { 104 {
124 lalloc (l); 105 l.alloc ();
125 col = 0; 106 col = 0;
126 width = ncol; 107 width = ncol;
127 } 108 }
128 109
129 l.touch (); 110 l.touch ();
130 111
131 efs &= ~RS_baseattrMask; 112 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 113 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 114
134 text_t *et = l.t + col; 115 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 116 rend_t *er = l.r + col;
136 117
… …
148{ 129{
149 scr_blank_line (l, 0, ncol, efs); 130 scr_blank_line (l, 0, ncol, efs);
150 131
151 l.l = 0; 132 l.l = 0;
152 l.f = 0; 133 l.f = 0;
134}
135
136// nuke a single wide character at the given column
137void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
139{
140 // find begin
141 while (col > 0 && l.t[col] == NOCHAR)
142 col--;
143
144 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
153} 155}
154 156
155/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
158 160
159void 161void
162rxvt_term::scr_alloc ()
163{
164 int tsize = sizeof (text_t) * ncol;
165 int rsize = sizeof (rend_t) * ncol;
166
167 // we assume that rend_t size is a sufficient alignment
168 // factor for tetx_t and line_t values, and we only
169 // need to adjust tsize.
170 tsize = (tsize + sizeof (rend_t) - 1);
171 tsize -= tsize % sizeof (rend_t);
172
173 int all_rows = total_rows + nrow + nrow;
174
175 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
176 chunk = rxvt_malloc (chunk_size);
177
178 char *base = (char *)chunk + sizeof (line_t) * all_rows;
179
180 for (int row = 0; row < all_rows; ++row)
181 {
182 line_t &l = ((line_t *)chunk) [row];
183
184 l.t = (text_t *)base; base += tsize;
185 l.r = (rend_t *)base; base += rsize;
186 l.l = -1;
187 l.f = 0;
188 }
189
190 drawn_buf = (line_t *)chunk;
191 swap_buf = drawn_buf + nrow;
192 row_buf = swap_buf + nrow;
193}
194
195void
160rxvt_term::scr_reset () 196rxvt_term::scr_reset ()
161{ 197{
162#if ENABLE_OVERLAY 198#if ENABLE_OVERLAY
163 scr_overlay_off (); 199 scr_overlay_off ();
164#endif 200#endif
… …
174 210
175 if (ncol == prev_ncol && nrow == prev_nrow) 211 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 212 return;
177 213
178 // we need at least two lines for wrapping to work correctly 214 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 215 while (nrow + saveLines < 2)
180 { 216 {
181 //TODO//FIXME 217 //TODO//FIXME
182 saveLines++; 218 saveLines++;
183 prev_nrow--; 219 prev_nrow--;
184 top_row--; 220 top_row--;
… …
190 total_rows = nrow + saveLines; 226 total_rows = nrow + saveLines;
191 227
192 screen.tscroll = 0; 228 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 229 screen.bscroll = nrow - 1;
194 230
231 void *prev_chunk = chunk;
232 line_t *prev_drawn_buf = drawn_buf;
233 line_t *prev_swap_buf = swap_buf;
234 line_t *prev_row_buf = row_buf;
235
236 int common_col = min (prev_ncol, ncol);
237
238 scr_alloc ();
239
195 if (!row_buf) 240 if (!prev_row_buf)
196 { 241 {
197 /* 242 /*
198 * first time called so just malloc everything: don't rely on realloc 243 * first time called so just malloc everything: don't rely on realloc
199 */ 244 */
200 top_row = 0; /* no saved lines */ 245 top_row = 0;
201 term_start = 0; 246 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 247
217 memset (charsets, 'B', sizeof (charsets)); 248 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 249 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 250 screen.flags = Screen_DefaultFlags;
220 screen.cur.row = screen.cur.col = 0; 251 screen.cur.row = screen.cur.col = 0;
… …
234 selection.text = NULL; 265 selection.text = NULL;
235 selection.len = 0; 266 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 267 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 268 selection.screen = PRIMARY;
238 selection.clicks = 0; 269 selection.clicks = 0;
239 rvideo = 0; 270 selection.clip_text = NULL;
271 selection.clip_len = 0;
240 } 272 }
241 else 273 else
242 { 274 {
243 /* 275 /*
244 * add or delete rows as appropriate 276 * add or delete rows as appropriate
245 */ 277 */
246 278
247 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
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
264 for (int row = min (nrow, prev_nrow); row--; ) 279 for (int row = min (nrow, prev_nrow); row--; )
265 { 280 {
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); 281 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
274 } 282 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
275 283
276 line_t *old_buf = row_buf; 284 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 285 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
278 288 }
289
279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 290 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start + top_row , prev_total_rows); 291 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 292 int q = total_rows; // rewrapped row
282 293
283 if (top_row) 294 if (top_row)
284 { 295 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb 296 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm. 297 // to come up with a lean and mean algorithm.
298 // TODO: maybe optimise when width didn't change
287 299
288 row_col_t ocur = screen.cur; 300 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 301 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 302
291 do 303 do
292 { 304 {
293 p = MOD (p - 1, prev_total_rows); 305 p = MOD (p - 1, prev_total_rows);
294#ifdef DEBUG_STRICT
295 assert (old_buf [MOD (p, prev_total_rows)].t); 306 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
296#endif
297 int plines = 1; 307 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l; 308 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
299 309
300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 310 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301 { 311 {
302 p = MOD (p - 1, prev_total_rows); 312 p = MOD (p - 1, prev_total_rows);
303 313
304 plines++; 314 plines++;
305 llen += prev_ncol; 315 llen += prev_ncol;
… …
318 328
319 // re-assemble the full line by destination lines 329 // re-assemble the full line by destination lines
320 for (int qrow = q; qlines--; qrow++) 330 for (int qrow = q; qlines--; qrow++)
321 { 331 {
322 qline = row_buf + qrow; 332 qline = row_buf + qrow;
323 lalloc (*qline); 333 qline->alloc (); // redundant with next line
324 qline->l = ncol; 334 qline->l = ncol;
325 qline->is_longer (1); 335 qline->is_longer (1);
326 336
327 int qcol = 0; 337 int qcol = 0;
328 338
329 // see below for cursor adjustment rationale 339 // see below for cursor adjustment rationale
330 if (p == ocur.row) 340 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow); 341 screen.cur.row = q - (total_rows - nrow);
332 342
333 // fill a single destination line 343 // fill a single destination line
334 while (lofs < llen && qcol < ncol) 344 while (lofs < llen && qcol < ncol)
335 { 345 {
336 int prow = lofs / prev_ncol; 346 int prow = lofs / prev_ncol;
337 int pcol = lofs % prev_ncol; 347 int pcol = lofs % prev_ncol;
… …
343 // this seems to upset applications/shells/readline 353 // this seems to upset applications/shells/readline
344 // least. 354 // least.
345 if (prow == ocur.row) 355 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow); 356 screen.cur.row = q - (total_rows - nrow);
347 357
348 line_t &pline = old_buf [prow]; 358 line_t &pline = prev_row_buf [prow];
349 359
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 360 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 361
357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 362 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 363 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
359 364
360 lofs += len; 365 lofs += len;
… …
368 } 373 }
369 while (p != pend && q > 0); 374 while (p != pend && q > 0);
370 375
371 term_start = total_rows - nrow; 376 term_start = total_rows - nrow;
372 top_row = q - term_start; 377 top_row = q - term_start;
373 378
374 // make sure all terminal lines exist 379 // make sure all terminal lines exist
375 while (top_row > 0) 380 while (top_row > 0)
376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 381 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
377 } 382 }
378 else 383 else
379 { 384 {
380 // if no scrollback exists (yet), wing, instead of wrap 385 // if no scrollback exists (yet), wing, instead of wrap
381 386
382 for (int row = min (nrow, prev_nrow); row--; ) 387 for (int row = min (nrow, prev_nrow); row--; )
383 { 388 {
384 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 389 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
385 line_t &qline = row_buf [row]; 390 line_t &dst = row_buf [row];
386 391
387 qline = pline; 392 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
388 lresize (qline); 393
394 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
395 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
389 } 396 }
390 397
391 for (int row = prev_nrow; row < nrow; row++) 398 for (int row = prev_nrow; row < nrow; row++)
392 {
393 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 399 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
394 }
395 400
396 term_start = 0; 401 term_start = 0;
397 } 402 }
398
399 free (old_buf);
400 delete old_ta;
401 delete old_ra;
402 403
403 clamp_it (screen.cur.row, 0, nrow - 1); 404 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 405 clamp_it (screen.cur.col, 0, ncol - 1);
406 }
405 407
406 if (tabs) 408 for (int row = nrow; row--; )
409 {
410 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
411 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
412 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
413 }
414
415 free (prev_chunk);
416
407 free (tabs); 417 free (tabs);
408 } 418 tabs = (char *)rxvt_malloc (ncol);
419
420 for (int col = ncol; col--; )
421 tabs [col] = col % TABSIZE == 0;
409 422
410 CLEAR_ALL_SELECTION (); 423 CLEAR_ALL_SELECTION ();
411 424
412 prev_nrow = nrow; 425 prev_nrow = nrow;
413 prev_ncol = ncol; 426 prev_ncol = ncol;
414 427
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 (); 428 tt_winch ();
421 429
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 430 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 431}
424 432
… …
427 * Free everything. That way malloc debugging can find leakage. 435 * Free everything. That way malloc debugging can find leakage.
428 */ 436 */
429void 437void
430rxvt_term::scr_release () NOTHROW 438rxvt_term::scr_release () NOTHROW
431{ 439{
432 delete talloc; talloc = 0; 440 free (chunk);
433 delete ralloc; ralloc = 0;
434
435 free (row_buf);
436 free (swap_buf);
437 free (drawn_buf);
438 free (tabs); 441 free (tabs);
439
440 row_buf = 0; // signal that we freed all the arrays
441} 442}
442 443
443/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
444/* 445/*
445 * Hard reset 446 * Hard/Soft reset
446 */ 447 */
447void 448void
448rxvt_term::scr_poweron () NOTHROW 449rxvt_term::scr_poweron ()
449{ 450{
450 scr_release (); 451 scr_release ();
452
453 row_buf = 0;
454 tabs = 0;
451 prev_nrow = prev_ncol = 0; 455 prev_nrow = prev_ncol = 0;
456 rvideo_mode = false;
457 scr_soft_reset ();
452 scr_reset (); 458 scr_reset ();
453 459
454 scr_clear (true); 460 scr_clear (true);
455 scr_refresh (); 461 scr_refresh ();
462}
463
464void
465rxvt_term::scr_soft_reset () NOTHROW
466{
467 /* only affects modes, nothing drastic such as clearing the screen */
468#if ENABLE_OVERLAY
469 scr_overlay_off ();
470#endif
471
472 if (current_screen != PRIMARY)
473 scr_swap_screen ();
474
475 scr_scroll_region (0, MAX_ROWS - 1);
476 scr_rendition (0, ~RS_None);
477 scr_insert_mode (0);
456} 478}
457 479
458/* ------------------------------------------------------------------------- * 480/* ------------------------------------------------------------------------- *
459 * PROCESS SCREEN COMMANDS * 481 * PROCESS SCREEN COMMANDS *
460 * ------------------------------------------------------------------------- */ 482 * ------------------------------------------------------------------------- */
… …
498 } 520 }
499 521
500 /* boundary check in case screen size changed between SAVE and RESTORE */ 522 /* boundary check in case screen size changed between SAVE and RESTORE */
501 min_it (s->cur.row, nrow - 1); 523 min_it (s->cur.row, nrow - 1);
502 min_it (s->cur.col, ncol - 1); 524 min_it (s->cur.col, ncol - 1);
503#ifdef DEBUG_STRICT
504 assert (s->cur.row >= 0); 525 assert (s->cur.row >= 0);
505 assert (s->cur.col >= 0); 526 assert (s->cur.col >= 0);
506#endif 527}
528
529void
530rxvt_term::scr_swap_screen () NOTHROW
531{
532 if (!option (Opt_secondaryScreen))
533 return;
534
535 for (int i = prev_nrow; i--; )
536 ::swap (ROW(i), swap_buf [i]);
537
538 ::swap (screen.cur, swap.cur);
539
540 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
541 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
507} 542}
508 543
509/* ------------------------------------------------------------------------- */ 544/* ------------------------------------------------------------------------- */
510/* 545/*
511 * Swap between primary and secondary screens 546 * Swap between primary and secondary screens
512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 547 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 548 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514 */ 549 */
515int 550void
516rxvt_term::scr_change_screen (int scrn) NOTHROW 551rxvt_term::scr_change_screen (int scrn)
517{ 552{
553 if (scrn == current_screen)
554 return;
555
518 want_refresh = 1; 556 want_refresh = 1;
519 view_start = 0; 557 view_start = 0;
520 558
559 /* check for boundary cross */
560 row_col_t pos;
561 pos.row = pos.col = 0;
562 if (ROWCOL_IS_BEFORE (selection.beg, pos)
563 && ROWCOL_IS_AFTER (selection.end, pos))
564 CLEAR_SELECTION ();
565
521 if (current_screen == scrn) 566 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 567
534#if NSCREENS 568#if NSCREENS
535 if (OPTION (Opt_secondaryScreen)) 569 if (option (Opt_secondaryScreen))
536 { 570 {
537 num_scr = 0; 571 num_scr = 0;
538 572
539 for (int i = prev_nrow; i--; ) 573 scr_swap_screen ();
540 ::swap (ROW(i), swap_buf [i]);
541 574
542 ::swap (screen.charset, swap.charset); 575 ::swap (screen.charset, swap.charset);
543 ::swap (screen.flags, swap.flags); 576 ::swap (screen.flags, swap.flags);
544 screen.flags |= Screen_VisibleCursor; 577 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 578 swap.flags |= Screen_VisibleCursor;
546 } 579 }
547 else 580 else
548#endif 581#endif
549 if (OPTION (Opt_secondaryScroll)) 582 if (option (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 583 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552 return scrn;
553} 584}
554 585
555// clear WrapNext indicator, solidifying position on next line 586// clear WrapNext indicator, solidifying position on next line
556void 587void
557rxvt_term::scr_do_wrap () NOTHROW 588rxvt_term::scr_do_wrap () NOTHROW
… …
589/* 620/*
590 * Change the rendition style for following text 621 * Change the rendition style for following text
591 */ 622 */
592void 623void
593rxvt_term::scr_rendition (int set, int style) NOTHROW 624rxvt_term::scr_rendition (int set, int style) NOTHROW
594 { 625{
595 if (set) 626 if (set)
596 rstyle |= style; 627 rstyle |= style;
597 else if (style == ~RS_None) 628 else if (style == ~RS_None)
598 rstyle = DEFAULT_RSTYLE; 629 rstyle = DEFAULT_RSTYLE;
599 else 630 else
600 rstyle &= ~style; 631 rstyle &= ~style;
601 } 632}
602 633
603/* ------------------------------------------------------------------------- */ 634/* ------------------------------------------------------------------------- */
604/* 635/*
605 * Scroll text between <row1> and <row2> inclusive, by <count> lines 636 * Scroll text between <row1> and <row2> inclusive, by <count> lines
606 * count positive ==> scroll up 637 * count positive ==> scroll up
… …
615 want_refresh = 1; 646 want_refresh = 1;
616 num_scr += count; 647 num_scr += count;
617 648
618 if (count > 0 649 if (count > 0
619 && row1 == 0 650 && row1 == 0
620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 651 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
621 { 652 {
653 min_it (count, total_rows - (nrow - (row2 + 1)));
654
622 top_row = max (top_row - count, -saveLines); 655 top_row = max (top_row - count, -saveLines);
623
624 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows;
626 656
627 // sever bottommost line 657 // sever bottommost line
628 { 658 {
629 line_t &l = ROW(row2 - count); 659 line_t &l = ROW(row2);
630 l.is_longer (0); 660 l.is_longer (0);
631 l.touch (); 661 l.touch ();
632 } 662 }
633 663
634 // erase newly scrolled-in lines 664 // scroll everything up 'count' lines
635 for (int i = count; i--; ) 665 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 666
647 // now copy lines below the scroll region bottom to the 667 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 668 // bottom of the screen again, so they look as if they
649 // hadn't moved. 669 // hadn't moved.
650 for (int i = nrow; --i > row2; ) 670 for (int i = nrow; --i > row2; )
… …
653 line_t &l2 = ROW(i); 673 line_t &l2 = ROW(i);
654 674
655 ::swap (l1, l2); 675 ::swap (l1, l2);
656 l2.touch (); 676 l2.touch ();
657 } 677 }
678
679 // erase newly scrolled-in lines
680 for (int i = count; i--; )
658 681 {
682 line_t &l = ROW(row2 - i);
683
684 // optimise if already cleared, can be significant on slow machines
685 // could be rolled into scr_blank_screen_mem
686 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
687 {
688 scr_blank_line (l, 0, l.l, rstyle);
689 l.l = 0;
690 l.f = 0;
691 }
692 else
693 scr_blank_screen_mem (l, rstyle);
694 }
695
659 // move and/or clear selection, if any 696 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 697 if (selection.op && current_screen == selection.screen
698 && selection.beg.row <= row2)
661 { 699 {
662 selection.beg.row -= count; 700 selection.beg.row -= count;
663 selection.end.row -= count; 701 selection.end.row -= count;
664 selection.mark.row -= count; 702 selection.mark.row -= count;
665 703
666 if (selection.beg.row < top_row 704 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 } 705 }
674 706
675 // finally move the view window, if desired 707 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 708 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 709 && view_start != 0
678 && view_start != -saveLines) 710 && view_start != -saveLines)
679 scr_page (UP, count); 711 scr_page (UP, count);
680 712
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 713 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
699 { 731 {
700 /* move selected region too */ 732 /* move selected region too */
701 selection.beg.row -= count; 733 selection.beg.row -= count;
702 selection.end.row -= count; 734 selection.end.row -= count;
703 selection.mark.row -= count; 735 selection.mark.row -= count;
704 736
705 selection_check (0); 737 selection_check (0);
706 } 738 }
707 } 739 }
708 740
709 // use a simple and robust scrolling algorithm, this 741 // use a simple and robust scrolling algorithm, this
710 // part of scr_scroll_text is not time-critical. 742 // part of scr_scroll_text is not time-critical.
711 743
744 // sever line above scroll region
745 if (row1)
746 {
747 line_t &l = ROW(row1 - 1);
748 l.is_longer (0);
749 l.touch ();
750 }
751
712 int rows = row2 - row1 + 1; 752 int rows = row2 - row1 + 1;
713 753
714 min_it (count, rows); 754 min_it (count, rows);
715 755
716 line_t *temp_buf = row_buf + total_rows; 756 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
717 757
718 for (int row = 0; row < rows; row++) 758 for (int row = 0; row < rows; row++)
719 { 759 {
720 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 760 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
721 761
… …
723 scr_blank_screen_mem (temp_buf [row], rstyle); 763 scr_blank_screen_mem (temp_buf [row], rstyle);
724 } 764 }
725 765
726 for (int row = 0; row < rows; row++) 766 for (int row = 0; row < rows; row++)
727 ROW(row1 + row) = temp_buf [row]; 767 ROW(row1 + row) = temp_buf [row];
768
769 // sever bottommost line
770 {
771 line_t &l = ROW(row2);
772 l.is_longer (0);
773 l.touch ();
774 }
728 } 775 }
729 776
730 return count; 777 return count;
731} 778}
732 779
… …
738rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 785rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
739{ 786{
740 if (len <= 0) /* sanity */ 787 if (len <= 0) /* sanity */
741 return; 788 return;
742 789
743 unsigned char checksel; 790 bool checksel;
744 unicode_t c; 791 unicode_t c;
745 int ncol = this->ncol; 792 int ncol = this->ncol;
746 const wchar_t *strend = str + len; 793 const wchar_t *strend = str + len;
747 794
748 want_refresh = 1; 795 want_refresh = 1;
749 ZERO_SCROLLBACK (); 796 ZERO_SCROLLBACK ();
750 797
751 if (minlines > 0) 798 if (minlines > 0)
752 { 799 {
753 minlines += screen.cur.row - screen.bscroll; 800 minlines += screen.cur.row - screen.bscroll;
801 min_it (minlines, screen.cur.row - top_row);
754 802
755 if (minlines > 0 803 if (minlines > 0
756 && screen.tscroll == 0 804 && screen.tscroll == 0
757 && screen.bscroll == nrow - 1) 805 && screen.bscroll == nrow - 1)
758 { 806 {
… …
760 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 808 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
761 screen.cur.row -= minlines; 809 screen.cur.row -= minlines;
762 } 810 }
763 } 811 }
764 812
765#ifdef DEBUG_STRICT
766 assert (screen.cur.col < ncol); 813 assert (screen.cur.col < ncol);
767 assert (screen.cur.row < nrow 814 assert (screen.cur.row < nrow
768 && screen.cur.row >= top_row); 815 && screen.cur.row >= top_row);
769#endif
770 int row = screen.cur.row; 816 int row = screen.cur.row;
771 817
772 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 818 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
773 819
774 line_t *line = &ROW(row); 820 line_t *line = &ROW(row);
775 821
776 while (str < strend) 822 while (str < strend)
777 { 823 {
778 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 824 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
779 825
780 if (c < 0x20) 826 if (ecb_unlikely (c < 0x20))
781 if (c == C0_LF) 827 if (c == C0_LF)
782 { 828 {
783 max_it (line->l, screen.cur.col); 829 max_it (line->l, screen.cur.col);
784 830
785 screen.flags &= ~Screen_WrapNext; 831 screen.flags &= ~Screen_WrapNext;
… …
804 { 850 {
805 scr_tab (1, true); 851 scr_tab (1, true);
806 continue; 852 continue;
807 } 853 }
808 854
855 if (ecb_unlikely (
809 if (checksel /* see if we're writing within selection */ 856 checksel /* see if we're writing within selection */
810 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 857 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
811 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 858 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
859 ))
812 { 860 {
813 checksel = 0; 861 checksel = 0;
814 /* 862 /*
815 * If we wrote anywhere in the selected area, kill the selection 863 * If we wrote anywhere in the selected area, kill the selection
816 * XXX: should we kill the mark too? Possibly, but maybe that 864 * XXX: should we kill the mark too? Possibly, but maybe that
817 * should be a similar check. 865 * should be a similar check.
818 */ 866 */
819 CLEAR_SELECTION (); 867 CLEAR_SELECTION ();
820 } 868 }
821 869
822 if (screen.flags & Screen_WrapNext) 870 if (ecb_unlikely (screen.flags & Screen_WrapNext))
823 { 871 {
824 scr_do_wrap (); 872 scr_do_wrap ();
825 873
826 line->l = ncol; 874 line->l = ncol;
827 line->is_longer (1); 875 line->is_longer (1);
828 876
829 row = screen.cur.row; 877 row = screen.cur.row;
830 line = &ROW(row); /* _must_ refresh */ 878 line = &ROW(row); /* _must_ refresh */
831 } 879 }
832 880
833 // some utf-8 decoders "decode" surrogate characters: let's fix this. 881 // some utf-8 decoders "decode" surrogate characters: let's fix this.
834 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 882 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
835 c = 0xfffd; 883 c = 0xfffd;
836 884
837 // rely on wcwidth to tell us the character width, at least for non-latin1 885 // rely on wcwidth to tell us the character width, do wcwidth before
838 // do wcwidth before further replacements, as wcwidth might return -1 886 // 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 887 // drawing characters below as they might be invalid in the current
840 // locale. 888 // locale.
841 int width = c < 0x100 ? 1 : wcwidth (c); 889 int width = WCWIDTH (c);
842 890
843 if (charsets [screen.charset] == '0') // DEC SPECIAL 891 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
844 { 892 {
845 // vt100 special graphics and line drawing 893 // vt100 special graphics and line drawing
846 // 5f-7e standard vt100 894 // 5f-7e standard vt100
847 // 40-5e rxvt extension for extra curses acs chars 895 // 40-5e rxvt extension for extra curses acs chars
848 static uint16_t vt100_0[62] = { // 41 .. 7e 896 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
861 c = vt100_0[c - 0x41]; 909 c = vt100_0[c - 0x41];
862 width = 1; // vt100 line drawing characters are always single-width 910 width = 1; // vt100 line drawing characters are always single-width
863 } 911 }
864 } 912 }
865 913
866 if (screen.flags & Screen_Insert) 914 if (ecb_unlikely (screen.flags & Screen_Insert))
867 scr_insdel_chars (width, INSERT); 915 scr_insdel_chars (width, INSERT);
868 916
869 if (width != 0) 917 if (width != 0)
870 { 918 {
871#if !UNICODE_3 919#if !UNICODE_3
… …
876# else 924# else
877 c = 0xfffd; 925 c = 0xfffd;
878# endif 926# endif
879#endif 927#endif
880 928
929 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
930
931 // if the character doesn't fit into the remaining columns...
932 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
933 {
934 if (screen.flags & Screen_Autowrap)
935 {
936 // ... artificially enlargen the previous one
937 c = NOCHAR;
938 // and try the same character next loop iteration
939 --str;
940 }
941 else
942 screen.cur.col = ncol - width;
943 }
944
881 // nuke the character at this position, if required 945 // nuke the character at this position, if required
946 // due to wonderful coincidences everywhere else in this loop
947 // we never have to check for overwriting a wide char itself,
948 // only its tail.
882 if (line->t[screen.cur.col] == NOCHAR 949 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
883 || (screen.cur.col < ncol - 1 950 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 951
913 line->touch (); 952 line->touch ();
914 953
915 do 954 do
916 { 955 {
917 line->t[screen.cur.col] = c; 956 line->t[screen.cur.col] = c;
918 line->r[screen.cur.col] = rend; 957 line->r[screen.cur.col] = rend;
919 958
920 if (screen.cur.col < ncol - 1) 959 if (ecb_likely (screen.cur.col < ncol - 1))
921 screen.cur.col++; 960 screen.cur.col++;
922 else 961 else
923 { 962 {
924 line->l = ncol; 963 line->l = ncol;
925 if (screen.flags & Screen_Autowrap) 964 if (screen.flags & Screen_Autowrap)
926 screen.flags |= Screen_WrapNext; 965 screen.flags |= Screen_WrapNext;
927 break; 966
967 goto end_of_line;
928 } 968 }
929 969
930 c = NOCHAR; 970 c = NOCHAR;
931 } 971 }
932 while (--width > 0); 972 while (ecb_unlikely (--width > 0));
933 973
934 // pad with spaces when overwriting wide character with smaller one 974 // pad with spaces when overwriting wide character with smaller one
935 if (!width) 975 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
936 { 976 {
937 line->touch (); 977 line->t[c] = ' ';
978 line->r[c] = rend;
979 }
938 980
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 981end_of_line:
982 ;
983 }
984#if ENABLE_COMBINING
985 else // width == 0
986 {
987 if (c != 0xfeff) // ignore BOM
988 {
989 // handle combining characters
990 // we just tag the accent on the previous on-screen character.
991 // this is arguably not correct, but also arguably not wrong.
992 // we don't handle double-width characters nicely yet.
993 line_t *linep;
994 text_t *tp;
995 rend_t *rp;
996
997 if (screen.cur.col > 0)
940 { 998 {
941 line->t[c] = ' ';
942 line->r[c] = rend; 999 linep = line;
1000 tp = line->t + screen.cur.col - 1;
1001 rp = line->r + screen.cur.col - 1;
943 } 1002 }
1003 else if (screen.cur.row > 0
1004 && ROW(screen.cur.row - 1).is_longer ())
1005 {
1006 linep = &ROW(screen.cur.row - 1);
1007 tp = line->t + ncol - 1;
1008 rp = line->r + ncol - 1;
1009 }
1010 else
1011 continue;
1012
1013 linep->touch ();
1014
1015 while (*tp == NOCHAR && tp > linep->t)
1016 tp--, rp--;
1017
1018 // first try to find a precomposed character
1019 unicode_t n = rxvt_compose (*tp, c);
1020 if (n == NOCHAR)
1021 n = rxvt_composite.compose (*tp, c);
1022
1023 *tp = n;
1024 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
944 } 1025 }
945 } 1026 }
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 1027#endif
986 }
987 } 1028 }
988 1029
989 max_it (line->l, screen.cur.col); 1030 max_it (line->l, screen.cur.col);
990 1031
991#ifdef DEBUG_STRICT
992 assert (screen.cur.row >= 0); 1032 assert (screen.cur.row >= 0);
993#endif
994} 1033}
995 1034
996/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
997/* 1036/*
998 * Process Backspace. Move back the cursor back a position, wrap if have to 1037 * Process Backspace. Move back the cursor back a position, wrap if have to
999 * XTERM_SEQ: CTRL-H 1038 * XTERM_SEQ: CTRL-H
1000 */ 1039 */
1001void 1040void
1002rxvt_term::scr_backspace () NOTHROW 1041rxvt_term::scr_backspace () NOTHROW
1003{ 1042{
1004 want_refresh = 1;
1005
1006 if (screen.cur.col == 0) 1043 if (screen.cur.col == 0)
1007 { 1044 {
1008 if (screen.cur.row > 0) 1045 if (screen.cur.row > 0)
1009 { 1046 {
1010#ifdef TERMCAP_HAS_BW 1047#ifdef TERMCAP_HAS_BW
1011 screen.cur.col = ncol - 1; 1048 screen.cur.col = ncol - 1;
1012 screen.cur.row--; 1049 --screen.cur.row;
1013 return; 1050
1051 want_refresh = 1;
1014#endif 1052#endif
1015 } 1053 }
1016 } 1054 }
1017 else if (!(screen.flags & Screen_WrapNext)) 1055 else if (screen.flags & Screen_WrapNext)
1056 screen.flags &= ~Screen_WrapNext;
1057 else
1018 scr_gotorc (0, -1, RELATIVE); 1058 scr_gotorc (0, -1, RELATIVE);
1019
1020 screen.flags &= ~Screen_WrapNext;
1021} 1059}
1022 1060
1023/* ------------------------------------------------------------------------- */ 1061/* ------------------------------------------------------------------------- */
1024/* 1062/*
1025 * Process Horizontal Tab 1063 * Process Horizontal Tab
… …
1048 x = i; 1086 x = i;
1049 1087
1050 if (!--count) 1088 if (!--count)
1051 break; 1089 break;
1052 } 1090 }
1053 else 1091 else
1054 ht &= l.t[i] == ' ' 1092 ht &= l.t[i] == ' '
1055 && RS_SAME (l.r[i], base_rend); 1093 && RS_SAME (l.r[i], base_rend);
1056 1094
1057 if (count) 1095 if (count)
1058 x = ncol - 1; 1096 x = ncol - 1;
1059 1097
1060 // store horizontal tab commands as characters inside the text 1098 // store horizontal tab commands as characters inside the text
1061 // buffer so they can be selected and pasted. 1099 // buffer so they can be selected and pasted.
1062 if (ht && OPTION (Opt_pastableTabs)) 1100 if (ht && option (Opt_pastableTabs))
1063 { 1101 {
1064 base_rend = SET_FONT (base_rend, 0); 1102 base_rend = SET_FONT (base_rend, 0);
1065 1103
1066 l.touch (x); 1104 l.touch (x);
1067 1105
… …
1100 * Process DEC Back Index 1138 * Process DEC Back Index
1101 * XTERM_SEQ: ESC 6 1139 * XTERM_SEQ: ESC 6
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1140 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1141 * in that row right. Clear left column.
1104 */ 1142 */
1105#if ENABLE_FRILLS 1143#if !ENABLE_MINIMAL
1106void 1144void
1107rxvt_term::scr_backindex () NOTHROW 1145rxvt_term::scr_backindex () NOTHROW
1108{ 1146{
1109 if (screen.cur.col > 0) 1147 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1148 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1117 * Process DEC Forward Index 1155 * Process DEC Forward Index
1118 * XTERM_SEQ: ESC 9 1156 * XTERM_SEQ: ESC 9
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1157 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1158 * in that row left. Clear right column.
1121 */ 1159 */
1122#if ENABLE_FRILLS 1160#if !ENABLE_MINIMAL
1123void 1161void
1124rxvt_term::scr_forwardindex () NOTHROW 1162rxvt_term::scr_forwardindex () NOTHROW
1125{ 1163{
1126 if (screen.cur.col < ncol - 1) 1164 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1165 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1174 } 1212 }
1175 } 1213 }
1176 else 1214 else
1177 { 1215 {
1178 if (screen.flags & Screen_Relative) 1216 if (screen.flags & Screen_Relative)
1217 {
1179 { /* relative origin mode */ 1218 /* relative origin mode */
1180 screen.cur.row = row + screen.tscroll; 1219 screen.cur.row = row + screen.tscroll;
1181 min_it (screen.cur.row, screen.bscroll); 1220 min_it (screen.cur.row, screen.bscroll);
1182 } 1221 }
1183 else 1222 else
1184 screen.cur.row = row; 1223 screen.cur.row = row;
… …
1217/* 1256/*
1218 * Erase part or whole of a line 1257 * Erase part or whole of a line
1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1258 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1259 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1260 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1261 * extension: clear to right unless wrapped: ESC [ 3 K
1222 */ 1262 */
1223void 1263void
1224rxvt_term::scr_erase_line (int mode) NOTHROW 1264rxvt_term::scr_erase_line (int mode) NOTHROW
1225{ 1265{
1226 unsigned int col, num; 1266 unsigned int col, num;
… …
1235 line.touch (); 1275 line.touch ();
1236 line.is_longer (0); 1276 line.is_longer (0);
1237 1277
1238 switch (mode) 1278 switch (mode)
1239 { 1279 {
1280 case 3:
1281 if (screen.flags & Screen_WrapNext)
1282 return;
1283
1284 /* fall through */
1285
1240 case 0: /* erase to end of line */ 1286 case 0: /* erase to end of line */
1241 col = screen.cur.col; 1287 col = screen.cur.col;
1242 num = ncol - col; 1288 num = ncol - col;
1243 min_it (line.l, col); 1289 min_it (line.l, col);
1290
1244 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1291 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1245 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1292 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1246 CLEAR_SELECTION (); 1293 CLEAR_SELECTION ();
1247 break; 1294 break;
1295
1248 case 1: /* erase to beginning of line */ 1296 case 1: /* erase to beginning of line */
1249 col = 0; 1297 col = 0;
1250 num = screen.cur.col + 1; 1298 num = screen.cur.col + 1;
1299
1251 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1300 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1252 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1301 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1253 CLEAR_SELECTION (); 1302 CLEAR_SELECTION ();
1254 break; 1303 break;
1304
1255 case 2: /* erase whole line */ 1305 case 2: /* erase whole line */
1256 col = 0; 1306 col = 0;
1257 num = ncol; 1307 num = ncol;
1258 line.l = 0; 1308 line.l = 0;
1259 if (selection.beg.row <= screen.cur.row 1309 if (selection.beg.row <= screen.cur.row
… …
1267 scr_blank_line (line, col, num, rstyle); 1317 scr_blank_line (line, col, num, rstyle);
1268} 1318}
1269 1319
1270/* ------------------------------------------------------------------------- */ 1320/* ------------------------------------------------------------------------- */
1271/* 1321/*
1272 * Erase part of whole of the screen 1322 * Erase part or whole of the screen
1273 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1323 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1274 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1324 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1275 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1325 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1276 */ 1326 */
1277void 1327void
… …
1286 ZERO_SCROLLBACK (); 1336 ZERO_SCROLLBACK ();
1287 1337
1288 switch (mode) 1338 switch (mode)
1289 { 1339 {
1290 case 0: /* erase to end of screen */ 1340 case 0: /* erase to end of screen */
1291 selection_check (1);
1292 scr_erase_line (0); 1341 scr_erase_line (0);
1293 row = screen.cur.row + 1; /* possible OOB */ 1342 row = screen.cur.row + 1; /* possible OOB */
1294 num = nrow - row; 1343 num = nrow - row;
1295 break; 1344 break;
1296 case 1: /* erase to beginning of screen */ 1345 case 1: /* erase to beginning of screen */
1297 selection_check (3);
1298 scr_erase_line (1); 1346 scr_erase_line (1);
1299 row = 0; 1347 row = 0;
1300 num = screen.cur.row; 1348 num = screen.cur.row;
1301 break; 1349 break;
1302 case 2: /* erase whole screen */ 1350 case 2: /* erase whole screen */
1303 selection_check (3);
1304 row = 0; 1351 row = 0;
1305 num = nrow; 1352 num = nrow;
1306 break; 1353 break;
1307 default: 1354 default:
1308 return; 1355 return;
… …
1317 if (row >= nrow) /* Out Of Bounds */ 1364 if (row >= nrow) /* Out Of Bounds */
1318 return; 1365 return;
1319 1366
1320 min_it (num, nrow - row); 1367 min_it (num, nrow - row);
1321 1368
1322 if (rstyle & (RS_RVid | RS_Uline)) 1369 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1323 ren = (rend_t) ~RS_None; 1370 ren = (rend_t) ~RS_None;
1324 else if (GET_BASEBG (rstyle) == Color_bg) 1371 else if (GET_BASEBG (rstyle) == Color_bg)
1325 { 1372 {
1326 ren = DEFAULT_RSTYLE; 1373 ren = DEFAULT_RSTYLE;
1327 CLEAR_ROWS (row, num); 1374
1375 if (mapped)
1376 XClearArea (dpy, vt, 0,
1377 Row2Pixel (row - view_start), (unsigned int)vt_width,
1378 (unsigned int)Height2Pixel (num), False);
1328 } 1379 }
1329 else 1380 else
1330 { 1381 {
1331 ren = rstyle & (RS_fgMask | RS_bgMask); 1382 ren = rstyle & (RS_fgMask | RS_bgMask);
1383
1384 if (mapped)
1385 {
1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1386 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1387 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 ERASE_ROWS (row, num); 1388 XFillRectangle (dpy, vt, gc,
1389 0, Row2Pixel (row - view_start),
1390 (unsigned int)vt_width,
1391 (unsigned int)Height2Pixel (num));
1335 gcvalue.foreground = pix_colors[Color_fg]; 1392 gcvalue.foreground = pix_colors[Color_fg];
1336 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1394 }
1337 } 1395 }
1338 1396
1339 for (; num--; row++) 1397 for (; num--; row++)
1340 { 1398 {
1341 scr_blank_screen_mem (ROW(row), rstyle); 1399 scr_blank_screen_mem (ROW(row), rstyle);
1400
1401 if (row - view_start < nrow)
1342 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1402 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1343 } 1403 }
1344} 1404}
1345 1405
1346#if ENABLE_FRILLS 1406#if !ENABLE_MINIMAL
1347void 1407void
1348rxvt_term::scr_erase_savelines () NOTHROW 1408rxvt_term::scr_erase_savelines () NOTHROW
1349{ 1409{
1350 want_refresh = 1; 1410 want_refresh = 1;
1351 ZERO_SCROLLBACK (); 1411 ZERO_SCROLLBACK ();
… …
1366 1426
1367 want_refresh = 1; 1427 want_refresh = 1;
1368 ZERO_SCROLLBACK (); 1428 ZERO_SCROLLBACK ();
1369 1429
1370 num_scr_allow = 0; 1430 num_scr_allow = 0;
1371 selection_check (3); 1431
1432 row_col_t pos;
1433 pos.row = pos.col = 0;
1434 if (ROWCOL_IS_AFTER (selection.end, pos))
1435 CLEAR_SELECTION ();
1372 1436
1373 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1437 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1374 for (int row = nrow; row--; ) 1438 for (int row = nrow; row--; )
1375 { 1439 {
1376 line_t &line = ROW(row); 1440 line_t &line = ROW(row);
… …
1421 * Insert/Delete <count> characters from the current position 1485 * Insert/Delete <count> characters from the current position
1422 */ 1486 */
1423void 1487void
1424rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1488rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1425{ 1489{
1426 int col, row;
1427 rend_t tr;
1428
1429 want_refresh = 1; 1490 want_refresh = 1;
1430 ZERO_SCROLLBACK (); 1491 ZERO_SCROLLBACK ();
1431 1492
1432 if (count <= 0) 1493 if (count <= 0)
1433 return; 1494 return;
… …
1435 scr_do_wrap (); 1496 scr_do_wrap ();
1436 1497
1437 selection_check (1); 1498 selection_check (1);
1438 min_it (count, ncol - screen.cur.col); 1499 min_it (count, ncol - screen.cur.col);
1439 1500
1440 row = screen.cur.row; 1501 int row = screen.cur.row;
1441 1502
1442 line_t *line = &ROW(row); 1503 line_t *line = &ROW(row);
1443 1504
1444 line->touch (); 1505 line->touch ();
1445 line->is_longer (0); 1506 line->is_longer (0);
1446 1507
1508 // nuke wide spanning the start
1509 if (line->t[screen.cur.col] == NOCHAR)
1510 scr_kill_char (*line, screen.cur.col);
1511
1447 switch (insdel) 1512 switch (insdel)
1448 { 1513 {
1449 case INSERT: 1514 case INSERT:
1450 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1515 line->l = min (line->l + count, ncol);
1516
1517 if (line->t[screen.cur.col] == NOCHAR)
1518 scr_kill_char (*line, screen.cur.col);
1519
1520 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1451 { 1521 {
1452 line->t[col] = line->t[col - count]; 1522 line->t[col] = line->t[col - count];
1453 line->r[col] = line->r[col - count]; 1523 line->r[col] = line->r[col - count];
1454 } 1524 }
1455
1456 line->l = min (line->l + count, ncol);
1457 1525
1458 if (selection.op && current_screen == selection.screen 1526 if (selection.op && current_screen == selection.screen
1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1527 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1460 { 1528 {
1461 if (selection.end.row != screen.cur.row 1529 if (selection.end.row != screen.cur.row
1462 || (selection.end.col + count >= ncol)) 1530 || (selection.end.col + count >= ncol))
1463 CLEAR_SELECTION (); 1531 CLEAR_SELECTION ();
1464 else 1532 else
1533 {
1465 { /* shift selection */ 1534 /* shift selection */
1466 selection.beg.col += count; 1535 selection.beg.col += count;
1467 selection.mark.col += count; /* XXX: yes? */ 1536 selection.mark.col += count; /* XXX: yes? */
1468 selection.end.col += count; 1537 selection.end.col += count;
1469 } 1538 }
1470 } 1539 }
… …
1475 case ERASE: 1544 case ERASE:
1476 screen.cur.col += count; /* don't worry if > ncol */ 1545 screen.cur.col += count; /* don't worry if > ncol */
1477 selection_check (1); 1546 selection_check (1);
1478 screen.cur.col -= count; 1547 screen.cur.col -= count;
1479 1548
1480 line->l = max (line->l - count, 0); 1549 // nuke wide char after the end
1550 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1551 scr_kill_char (*line, screen.cur.col + count);
1552
1481 scr_blank_line (*line, screen.cur.col, count, rstyle); 1553 scr_blank_line (*line, screen.cur.col, count, rstyle);
1482 break; 1554 break;
1483 1555
1484 case DELETE: 1556 case DELETE:
1485 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1557 line->l = max (line->l - count, 0);
1486 1558
1559 // nuke wide char spanning the end
1560 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1561 scr_kill_char (*line, screen.cur.col + count);
1562
1487 for (col = screen.cur.col; (col + count) < ncol; col++) 1563 for (int col = screen.cur.col; (col + count) < ncol; col++)
1488 { 1564 {
1489 line->t[col] = line->t[col + count]; 1565 line->t[col] = line->t[col + count];
1490 line->r[col] = line->r[col + count]; 1566 line->r[col] = line->r[col + count];
1491 } 1567 }
1492 1568
1493 line->l = max (line->l - count, 0);
1494 scr_blank_line (*line, ncol - count, count, tr); 1569 scr_blank_line (*line, ncol - count, count, rstyle);
1495 1570
1496 if (selection.op && current_screen == selection.screen 1571 if (selection.op && current_screen == selection.screen
1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1572 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1498 { 1573 {
1499 if (selection.end.row != screen.cur.row 1574 if (selection.end.row != screen.cur.row
… …
1609 */ 1684 */
1610void 1685void
1611rxvt_term::scr_set_tab (int mode) NOTHROW 1686rxvt_term::scr_set_tab (int mode) NOTHROW
1612{ 1687{
1613 if (mode < 0) 1688 if (mode < 0)
1614 memset (tabs, 0, ncol * sizeof (char)); 1689 memset (tabs, 0, ncol);
1615 else if (screen.cur.col < ncol) 1690 else if (screen.cur.col < ncol)
1616 tabs [screen.cur.col] = !!mode; 1691 tabs [screen.cur.col] = !!mode;
1617} 1692}
1618 1693
1619/* ------------------------------------------------------------------------- */ 1694/* ------------------------------------------------------------------------- */
… …
1621 * Set reverse/normal video 1696 * Set reverse/normal video
1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1697 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1698 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1624 */ 1699 */
1625void 1700void
1626rxvt_term::scr_rvideo_mode (int mode) NOTHROW 1701rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1627{ 1702{
1628 XGCValues gcvalue; 1703 rvideo_mode = on;
1629 1704
1705#ifndef NO_BELL
1706 on ^= rvideo_bell;
1707#endif
1708
1630 if (rvideo != mode) 1709 if (rvideo_state != on)
1631 { 1710 {
1632 rvideo = mode; 1711 rvideo_state = on;
1712
1633 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1713 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1634#if XPM_BACKGROUND 1714#ifdef HAVE_BG_PIXMAP
1635 if (bgPixmap.pixmap == None) 1715 if (bg_pixmap == None)
1636#endif 1716#endif
1637#if TRANSPARENT 1717 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 1718
1719 XGCValues gcvalue;
1643 gcvalue.foreground = pix_colors[Color_fg]; 1720 gcvalue.foreground = pix_colors[Color_fg];
1644 gcvalue.background = pix_colors[Color_bg]; 1721 gcvalue.background = pix_colors[Color_bg];
1645 XChangeGC (display->display, gc, GCBackground | GCForeground, 1722 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1646 &gcvalue); 1723
1647 scr_clear (); 1724 scr_clear ();
1648 scr_touch (true); 1725 scr_touch (true);
1649 } 1726 }
1650} 1727}
1651 1728
… …
1735{ 1812{
1736 bool found = false; 1813 bool found = false;
1737 1814
1738 for (int i = 0; i < nrow; i++) 1815 for (int i = 0; i < nrow; i++)
1739 { 1816 {
1740 int col = 0;
1741 rend_t *drp = drawn_buf[i].r; 1817 rend_t *drp = drawn_buf[i].r;
1742 1818
1743 for (; col < ncol; col++, drp++) 1819 for (int col = 0; col < ncol; col++, drp++)
1744 if ((*drp & mask) == value) 1820 if ((*drp & mask) == value)
1745 { 1821 {
1746 found = true; 1822 found = true;
1747 *drp = ~value; 1823 *drp = ~value;
1748 } 1824 }
… …
1805 * Refresh the entire screen 1881 * Refresh the entire screen
1806 */ 1882 */
1807void 1883void
1808rxvt_term::scr_touch (bool refresh) NOTHROW 1884rxvt_term::scr_touch (bool refresh) NOTHROW
1809{ 1885{
1810 scr_expose (0, 0, width, height, refresh); 1886 scr_expose (0, 0, vt_width, vt_height, refresh);
1811} 1887}
1812 1888
1813/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
1814/* 1890/*
1815 * Move the display so that the line represented by scrollbar value Y is at 1891 * Move the display so that the line represented by scrollbar value Y is at
… …
1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1927 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1852 1928
1853 return true; 1929 return true;
1854} 1930}
1855 1931
1932#ifndef NO_BELL
1933void
1934rxvt_term::bell_cb (ev::timer &w, int revents)
1935{
1936 rvideo_bell = false;
1937 scr_rvideo_mode (rvideo_mode);
1938 refresh_check ();
1939}
1940#endif
1941
1856/* ------------------------------------------------------------------------- */ 1942/* ------------------------------------------------------------------------- */
1857void 1943void
1858rxvt_term::scr_bell () NOTHROW 1944rxvt_term::scr_bell () NOTHROW
1859{ 1945{
1860#ifndef NO_BELL 1946#ifndef NO_BELL
1861 1947
1862# ifndef NO_MAPALERT 1948# ifndef NO_MAPALERT
1863# ifdef MAPALERT_OPTION 1949# ifdef MAPALERT_OPTION
1864 if (OPTION (Opt_mapAlert)) 1950 if (option (Opt_mapAlert))
1865# endif 1951# endif
1866 XMapWindow (display->display, parent[0]); 1952 XMapWindow (dpy, parent);
1867# endif 1953# endif
1868 1954
1955# if ENABLE_FRILLS
1956 if (option (Opt_urgentOnBell))
1957 set_urgency (1);
1958# endif
1959
1869 if (OPTION (Opt_visualBell)) 1960 if (option (Opt_visualBell))
1870 { 1961 {
1871 scr_rvideo_mode (!rvideo); /* refresh also done */ 1962 rvideo_bell = true;
1963 scr_rvideo_mode (rvideo_mode);
1872 display->flush (); 1964 flush ();
1965
1873 rxvt_usleep (VISUAL_BELL_DURATION); 1966 bell_ev.start (VISUAL_BELL_DURATION);
1874 scr_rvideo_mode (!rvideo); /* refresh also done */
1875 } 1967 }
1876 else 1968 else
1877 XBell (display->display, 0); 1969 XBell (dpy, 0);
1878 1970 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1879#endif 1971#endif
1880} 1972}
1881 1973
1882/* ------------------------------------------------------------------------- */ 1974/* ------------------------------------------------------------------------- */
1883/* ARGSUSED */
1884void 1975void
1885rxvt_term::scr_printscreen (int fullhist) NOTHROW 1976rxvt_term::scr_printscreen (int fullhist) NOTHROW
1886{ 1977{
1887#ifdef PRINTPIPE 1978#ifdef PRINTPIPE
1888 int nrows, row_start; 1979 int nrows, row_start;
1889 FILE *fd; 1980 FILE *fd = popen_printer ();
1890 1981
1891 if ((fd = popen_printer ()) == NULL) 1982 if (!fd)
1892 return; 1983 return;
1893 1984
1894 if (fullhist) 1985 if (fullhist)
1895 { 1986 {
1896 nrows = nrow - top_row; 1987 nrows = nrow - top_row;
… …
1902 row_start = view_start; 1993 row_start = view_start;
1903 } 1994 }
1904 1995
1905 wctomb (0, 0); 1996 wctomb (0, 0);
1906 1997
1907 for (int r1 = 0; r1 < nrows; r1++) 1998 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1908 { 1999 {
1909 text_t *tp = ROW(r1).t; 2000 text_t *tp = ROW(r1).t;
1910 int len = ROW(r1).l; 2001 int len = ROW(r1).l;
1911 2002
1912 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2003 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1941 * screen.text/screen.rend contain what the screen will change to. 2032 * screen.text/screen.rend contain what the screen will change to.
1942 */ 2033 */
1943void 2034void
1944rxvt_term::scr_refresh () NOTHROW 2035rxvt_term::scr_refresh () NOTHROW
1945{ 2036{
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 */ 2037 int16_t col, row, /* column/row we're processing */
1949 ocrow; /* old cursor row */ 2038 ocrow; /* old cursor row */
1950 int i; /* tmp */ 2039 int i; /* tmp */
1951#ifndef NO_CURSORCOLOR 2040#ifndef NO_CURSORCOLOR
1952 rend_t cc1; /* store colours at cursor position (s) */ 2041 rend_t cc1; /* store colours at cursor position (s) */
1953#endif 2042#endif
1954 rend_t *crp; // cursor rendition pointer 2043 rend_t *crp; // cursor rendition pointer
2044 rend_t ccol1, /* Cursor colour */
2045 ccol2; /* Cursor colour2 */
1955 2046
1956 want_refresh = 0; /* screen is current */ 2047 want_refresh = 0; /* screen is current */
1957 2048
1958 if (refresh_type == NO_REFRESH || !mapped) 2049 if (refresh_type == NO_REFRESH || !mapped)
1959 return; 2050 return;
1960 2051
1961 /* 2052 /*
1962 * A: set up vars 2053 * A: set up vars
1963 */ 2054 */
1964 must_clear = 0;
1965 refresh_count = 0; 2055 refresh_count = 0;
1966 2056
1967#if XPM_BACKGROUND 2057 unsigned int old_screen_flags = screen.flags;
1968 must_clear |= bgPixmap.pixmap != None; 2058 bool have_bg = 0;
1969#endif 2059#ifdef HAVE_BG_PIXMAP
1970#if TRANSPARENT 2060 have_bg = bg_pixmap != None;
1971 must_clear |= OPTION (Opt_transparent) && am_transparent;
1972#endif 2061#endif
1973 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1974 2063
1975 /* 2064 /*
1976 * B: reverse any characters which are selected 2065 * B: reverse any characters which are selected
1977 */ 2066 */
1978 scr_reverse_selection (); 2067 scr_reverse_selection ();
1979 2068
2069 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2070#if ENABLE_OVERLAY
2071 scr_swap_overlay ();
2072#endif
2073
2074 bool showcursor = screen.flags & Screen_VisibleCursor;
2075
1980 /* 2076 /*
1981 * C: set the cursor character (s) 2077 * C: set the cursor character (s)
1982 */ 2078 */
1983 { 2079 {
1984 unsigned char setoldcursor; 2080 bool setoldcursor;
1985 rend_t ccol1, /* Cursor colour */
1986 ccol2; /* Cursor colour2 */
1987 2081
1988 showcursor = (screen.flags & Screen_VisibleCursor);
1989#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
1990 if (hidden_cursor) 2083 if (hidden_cursor)
1991 showcursor = 0; 2084 showcursor = 0;
1992#endif 2085#endif
1993 2086
… …
1998 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2091 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1999 col--; 2092 col--;
2000 2093
2001 crp = &ROW(screen.cur.row).r[col]; 2094 crp = &ROW(screen.cur.row).r[col];
2002 2095
2003 if (showcursor && focus) 2096#ifndef NO_CURSORCOLOR
2097 cc1 = *crp & (RS_fgMask | RS_bgMask);
2098 if (ISSET_PIXCOLOR (Color_cursor))
2099 ccol1 = Color_cursor;
2100 else
2101#endif
2102#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2103 ccol1 = fgcolor_of (rstyle);
2104#else
2105 ccol1 = Color_fg;
2106#endif
2107
2108#ifndef NO_CURSORCOLOR
2109 if (ISSET_PIXCOLOR (Color_cursor2))
2110 ccol2 = Color_cursor2;
2111 else
2112#endif
2113#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2114 ccol2 = bgcolor_of (rstyle);
2115#else
2116 ccol2 = Color_bg;
2117#endif
2118
2119 if (focus)
2004 { 2120 {
2005 if (OPTION (Opt_cursorUnderline)) 2121 if (option (Opt_cursorUnderline))
2006 *crp ^= RS_Uline; 2122 *crp ^= RS_Uline;
2007 else 2123 else
2008 { 2124 {
2009 *crp ^= RS_RVid; 2125 *crp ^= 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); 2126 *crp = SET_FGCOLOR (*crp, ccol1);
2030 *crp = SET_BGCOLOR (*crp, ccol2); 2127 *crp = SET_BGCOLOR (*crp, ccol2);
2031#endif
2032 } 2128 }
2033 } 2129 }
2034 } 2130 }
2035 2131
2036 /* make sure no outline cursor is left around */ 2132 /* make sure no outline cursor is left around */
… …
2063 oldcursor.col = screen.cur.col; 2159 oldcursor.col = screen.cur.col;
2064 } 2160 }
2065 } 2161 }
2066 } 2162 }
2067 2163
2068 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2069#if ENABLE_OVERLAY
2070 scr_swap_overlay ();
2071#endif
2072
2073#ifndef NO_SLOW_LINK_SUPPORT 2164#ifndef NO_SLOW_LINK_SUPPORT
2074 /* 2165 /*
2075 * D: CopyArea pass - very useful for slower links 2166 * D: CopyArea pass - very useful for slower links
2076 * This has been deliberately kept simple. 2167 * This has been deliberately kept simple.
2077 */ 2168 */
2078 if (!display->is_local 2169 if (!display->is_local
2079 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2170 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2080 && abs (num_scr) < nrow && !must_clear) 2171 && abs (num_scr) < nrow && !have_bg)
2081 { 2172 {
2082 int16_t nits; 2173 int16_t nits;
2174 int i = num_scr;
2083 int j; 2175 int j;
2084 int len, wlen; 2176 int len, wlen;
2085 dLocal (int, num_scr);
2086 2177
2087 j = nrow; 2178 j = nrow;
2088 wlen = len = -1; 2179 wlen = len = -1;
2089 row = i > 0 ? 0 : j - 1; 2180 row = i > 0 ? 0 : j - 1;
2181
2090 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2182 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2091 { 2183 {
2092 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2184 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2093 { 2185 {
2094 line_t s = ROW(view_start + row); 2186 line_t s = ROW(view_start + row);
… …
2115 wlen = row; 2207 wlen = row;
2116 continue; 2208 continue;
2117 } 2209 }
2118 } 2210 }
2119 2211
2120 if (len != -1) 2212 if (len >= 0)
2121 { 2213 {
2122 /* also comes here at end if needed because of >= above */ 2214 /* also comes here at end if needed because of >= above */
2123 if (wlen < len) 2215 if (wlen < len)
2124 ::swap (wlen, len); 2216 ::swap (wlen, len);
2125 2217
2218 XGCValues gcv;
2219
2220 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2126 XCopyArea (display->display, vt, vt, 2221 XCopyArea (dpy, vt, vt,
2127 gc, 0, Row2Pixel (len + i), 2222 gc, 0, Row2Pixel (len + i),
2128 (unsigned int)this->width, 2223 (unsigned int)this->width,
2129 (unsigned int)Height2Pixel (wlen - len + 1), 2224 (unsigned int)Height2Pixel (wlen - len + 1),
2130 0, Row2Pixel (len)); 2225 0, Row2Pixel (len));
2226 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2227
2131 len = -1; 2228 len = -1;
2132 } 2229 }
2133 } 2230 }
2134 } 2231 }
2135#endif 2232#endif
… …
2159 continue; 2256 continue;
2160 2257
2161 // redraw one or more characters 2258 // redraw one or more characters
2162 2259
2163 // seek to the beginning of wide characters 2260 // seek to the beginning of wide characters
2164 while (stp[col] == NOCHAR && col > 0) 2261 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2165 --col; 2262 --col;
2166 2263
2167 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2264 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2168 text_t *text = stp + col; 2265 text_t *text = stp + col;
2169 int count = 1; 2266 int count = 1;
2170 2267
2171 dtp[col] = stp[col]; 2268 dtp[col] = stp[col];
2172 drp[col] = rend; 2269 drp[col] = rend;
… …
2176 for (i = 0; ++col < ncol; ) 2273 for (i = 0; ++col < ncol; )
2177 { 2274 {
2178 if (stp[col] == NOCHAR) 2275 if (stp[col] == NOCHAR)
2179 { 2276 {
2180 dtp[col] = stp[col]; 2277 dtp[col] = stp[col];
2181 drp[col] = rend; 2278 drp[col] = srp[col];
2279
2182 count++; 2280 count++;
2183 i++; 2281 i++;
2184 2282
2185 continue; 2283 continue;
2186 } 2284 }
… …
2191 count++; 2289 count++;
2192 2290
2193 if (stp[col] != dtp[col] 2291 if (stp[col] != dtp[col]
2194 || !RS_SAME (srp[col], drp[col])) 2292 || !RS_SAME (srp[col], drp[col]))
2195 { 2293 {
2196 if (must_clear && (i++ > count / 2)) 2294 if (have_bg && (i++ > count / 2))
2197 break; 2295 break;
2198 2296
2199 dtp[col] = stp[col]; 2297 dtp[col] = stp[col];
2200 drp[col] = rend; 2298 drp[col] = rend;
2201 i = 0; 2299 i = 0;
2202 } 2300 }
2203 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2301 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2204 break; 2302 break;
2205 } 2303 }
2206 2304
2207 col--; /* went one too far. move back */ 2305 col--; /* went one too far. move back */
2208 count -= i; /* dump any matching trailing chars */ 2306 count -= i; /* dump any matching trailing chars */
2209 2307
2210 // sometimes we optimize away the trailing NOCHAR's, add them back 2308 // sometimes we optimize away the trailing NOCHAR's, add them back
2211 while (i && text[count] == NOCHAR) 2309 while (ecb_unlikely (i && text[count] == NOCHAR))
2212 count++, i--; 2310 count++, i--;
2213 2311
2214 /* 2312 /*
2215 * Determine the attributes for the string 2313 * Determine the attributes for the string
2216 */ 2314 */
2217 int fore = fgcolor_of (rend); // desired foreground 2315 int fore = fgcolor_of (rend); // desired foreground
2218 int back = bgcolor_of (rend); // desired background 2316 int back = bgcolor_of (rend); // desired background
2219 2317
2220 // only do special processing if any attributes are set, which is unlikely 2318 // 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)) 2319 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2222 { 2320 {
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; 2321 bool invert = rend & RS_RVid;
2236 2322
2237#ifndef NO_BOLD_UNDERLINE_REVERSE 2323#ifndef NO_BOLD_UNDERLINE_REVERSE
2238 if (rend & RS_Bold
2239 && fore == Color_fg) 2324 if (rend & RS_Bold && fore == Color_fg)
2240 { 2325 {
2241 if (ISSET_PIXCOLOR (Color_BD)) 2326 if (ISSET_PIXCOLOR (Color_BD))
2242 fore = Color_BD; 2327 fore = Color_BD;
2243# if !ENABLE_STYLES 2328# if !ENABLE_STYLES
2244 else 2329 else
2245 invert = !invert; 2330 invert = !invert;
2246# endif 2331# endif
2247 } 2332 }
2248 2333
2249 if (rend & RS_Italic 2334 if (rend & RS_Italic && fore == Color_fg)
2250 && fore == Color_fg)
2251 { 2335 {
2252 if (ISSET_PIXCOLOR (Color_IT)) 2336 if (ISSET_PIXCOLOR (Color_IT))
2253 fore = Color_IT; 2337 fore = Color_IT;
2254# if !ENABLE_STYLES 2338# if !ENABLE_STYLES
2255 else 2339 else
2256 invert = !invert; 2340 invert = !invert;
2257# endif 2341# endif
2258 } 2342 }
2259 2343
2260 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2344 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2261 fore = Color_UL; 2345 fore = Color_UL;
2346#endif
2347
2348#ifdef OPTION_HC
2349 if (rend & RS_Sel)
2350 {
2351 /* invert the column if no highlightColor is set or it is the
2352 * current cursor column */
2353 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2354 && ISSET_PIXCOLOR (Color_HC))
2355 {
2356 if (ISSET_PIXCOLOR (Color_HTC))
2357 fore = Color_HTC;
2358 // if invert is 0 reverse video is set so we use bg color as fg color
2359 else if (!invert)
2360 fore = back;
2361
2362 back = Color_HC;
2363 invert = 0;
2364 }
2365 }
2262#endif 2366#endif
2263 2367
2264 if (invert) 2368 if (invert)
2265 { 2369 {
2266 ::swap (fore, back); 2370 ::swap (fore, back);
2267 2371
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2372#ifndef NO_BOLD_UNDERLINE_REVERSE
2269 if (ISSET_PIXCOLOR (Color_RV))
2270 back = Color_RV;
2271
2272 if (fore == back) 2373 if (fore == back)
2273 { 2374 {
2274 fore = Color_bg; 2375 fore = Color_bg;
2275 back = Color_fg; 2376 back = Color_fg;
2276 } 2377 }
… …
2278 } 2379 }
2279 2380
2280#ifdef TEXT_BLINK 2381#ifdef TEXT_BLINK
2281 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2382 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2282 { 2383 {
2283 if (!text_blink_ev.active) 2384 if (!text_blink_ev.is_active ())
2284 { 2385 {
2285 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2386 text_blink_ev.again ();
2286 hidden_text = 0; 2387 hidden_text = 0;
2287 } 2388 }
2288 else if (hidden_text) 2389 else if (hidden_text)
2289 fore = back; 2390 fore = back;
2290 } 2391 }
2291#endif 2392#endif
2393
2394#if ENABLE_STYLES
2395 // "careful" (too wide) character handling
2396
2397 // include previous careful character(s) if possible, looks nicer (best effort...)
2398 while (text > stp
2399 && srp[text - stp - 1] & RS_Careful
2400 && RS_SAME (rend, srp[text - stp - 1]))
2401 text--, count++, xpixel -= fwidth;
2402
2403 // force redraw after "careful" characters to avoid pixel droppings
2404 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2405 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2406
2407 // force redraw before "careful" characters to avoid pixel droppings
2408 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2409 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2410#endif
2292 } 2411 }
2293 2412
2294 /* 2413 /*
2295 * Actually do the drawing of the string here 2414 * Actually do the drawing of the string here
2296 */ 2415 */
2297 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2416 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2298 2417
2299 if (back == fore) 2418 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 { 2419 {
2305 if (must_clear) 2420 // this is very ugly, maybe push it into ->draw?
2306 {
2307 CLEAR_CHARS (xpixel, ypixel, count);
2308 2421
2309 for (i = 0; i < count; i++) /* don't draw empty strings */ 2422 for (i = 0; i < count; i++) /* don't draw empty strings */
2310 if (text[i] != ' ') 2423 if (text[i] != ' ')
2311 { 2424 {
2312 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2425 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2313 break; 2426 goto did_clear;
2314 }
2315 } 2427 }
2316 else 2428
2317 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2429 CLEAR_CHARS (xpixel, ypixel, count);
2430 did_clear: ;
2318 } 2431 }
2319 else 2432 else
2320 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2433 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2321 2434
2322 if (rend & RS_Uline && font->descent > 1 && fore != back) 2435 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2323 { 2436 {
2324#if ENABLE_FRILLS 2437#if ENABLE_FRILLS
2325 if (ISSET_PIXCOLOR (Color_underline)) 2438 if (ISSET_PIXCOLOR (Color_underline))
2326 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2439 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2327 else 2440 else
2328#endif 2441#endif
2329 XSetForeground (display->display, gc, pix_colors[fore]); 2442 XSetForeground (dpy, gc, pix_colors[fore]);
2330 2443
2331 XDrawLine (display->display, drawBuffer, gc, 2444 XDrawLine (dpy, vt, gc,
2332 xpixel, ypixel + font->ascent + 1, 2445 xpixel, ypixel + font->ascent + 1,
2333 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2446 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2334 } 2447 }
2335 } /* for (col....) */ 2448 } /* for (col....) */
2336 } /* for (row....) */ 2449 } /* for (row....) */
2337 2450
2338#if ENABLE_OVERLAY
2339 scr_swap_overlay ();
2340#endif
2341 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2342
2343 /* 2451 /*
2344 * G: cleanup cursor and display outline cursor if necessary 2452 * G: cleanup cursor and display outline cursor if necessary
2345 */ 2453 */
2346 if (showcursor) 2454 if (showcursor)
2347 { 2455 {
2348 if (focus) 2456 if (focus)
2349 { 2457 {
2350 if (OPTION (Opt_cursorUnderline)) 2458 if (option (Opt_cursorUnderline))
2351 *crp ^= RS_Uline; 2459 *crp ^= RS_Uline;
2352 else 2460 else
2353 { 2461 {
2354 *crp ^= RS_RVid; 2462 *crp ^= RS_RVid;
2355#ifndef NO_CURSORCOLOR 2463#ifndef NO_CURSORCOLOR
… …
2369 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2477 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2370 cursorwidth++; 2478 cursorwidth++;
2371 2479
2372#ifndef NO_CURSORCOLOR 2480#ifndef NO_CURSORCOLOR
2373 if (ISSET_PIXCOLOR (Color_cursor)) 2481 if (ISSET_PIXCOLOR (Color_cursor))
2374 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2482 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2483 else
2375#endif 2484#endif
2485 XSetForeground (dpy, gc, pix_colors[ccol1]);
2376 2486
2377 XDrawRectangle (display->display, drawBuffer, gc, 2487 XDrawRectangle (dpy, vt, gc,
2378 Col2Pixel (col), 2488 Col2Pixel (col),
2379 Row2Pixel (oldcursor.row), 2489 Row2Pixel (oldcursor.row),
2380 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2490 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2381 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2491 (unsigned int) (Height2Pixel (1) - 1));
2382 } 2492 }
2383 } 2493 }
2384 2494
2385 /* 2495 /*
2386 * H: cleanup selection 2496 * H: cleanup selection
2387 */ 2497 */
2498#if ENABLE_OVERLAY
2499 scr_swap_overlay ();
2500#endif
2501 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2502
2388 scr_reverse_selection (); 2503 scr_reverse_selection ();
2389 2504
2505 screen.flags = old_screen_flags;
2390 num_scr = 0; 2506 num_scr = 0;
2391 num_scr_allow = 1; 2507 num_scr_allow = 1;
2392} 2508}
2393 2509
2394void 2510void
2395rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2511rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2396{ 2512{
2397 if (!l.t) 2513 if (!l.valid ())
2398 return; 2514 return;
2399 2515
2400 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2516 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2401 2517
2402 for (int i = ncol; i--; ) 2518 for (int i = ncol; i--; )
… …
2415 scr_remap_chars (swap_buf [i]); 2531 scr_remap_chars (swap_buf [i]);
2416 } 2532 }
2417} 2533}
2418 2534
2419void 2535void
2420rxvt_term::scr_recolour () NOTHROW 2536rxvt_term::scr_recolour (bool refresh) NOTHROW
2421{ 2537{
2422 if (1 2538 bool transparent = false;
2423#if TRANSPARENT 2539
2424 && !am_transparent 2540#ifdef HAVE_BG_PIXMAP
2541 if (bg_pixmap != None)
2542 {
2543# ifdef ENABLE_TRANSPARENCY
2544 if (bg_flags & BG_IS_TRANSPARENT)
2545 {
2546 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2547 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2548
2549 transparent = true;
2550 }
2551 else
2425#endif 2552# endif
2426#if XPM_BACKGROUND
2427 && !bgPixmap.pixmap
2428#endif
2429 ) 2553 {
2554 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2555 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2556 }
2430 { 2557 }
2558 else
2559#endif
2560 {
2431 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2561 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2432 XClearWindow (display->display, parent[0]);
2433 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2562 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2434#if HAVE_SCROLLBARS 2563 }
2564
2565 XClearWindow (dpy, parent);
2566
2435 if (scrollBar.win) 2567 if (scrollBar.win)
2436 { 2568 {
2569 if (transparent)
2570 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2571 else
2437 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2572 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2438 scrollBar.setIdle (); 2573 scrollBar.state = SB_STATE_IDLE;
2439 scrollbar_show (0); 2574 scrollBar.show (0);
2440 } 2575 }
2441#endif 2576
2577 if (refresh)
2442 } 2578 {
2443
2444 scr_clear (); 2579 scr_clear ();
2445 scr_touch (true); 2580 scr_touch (true);
2581 }
2446 want_refresh = 1; 2582 want_refresh = 1;
2447} 2583}
2448 2584
2449/* ------------------------------------------------------------------------- */ 2585/* ------------------------------------------------------------------------- */
2450void 2586void
… …
2455 2591
2456 num_scr_allow = 0; 2592 num_scr_allow = 0;
2457 want_refresh = 1; 2593 want_refresh = 1;
2458 2594
2459 if (really) 2595 if (really)
2460 XClearWindow (display->display, vt); 2596 XClearWindow (dpy, vt);
2461} 2597}
2462 2598
2463void 2599void
2464rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2600rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2465{ 2601{
… …
2514{ 2650{
2515 if (selection.op 2651 if (selection.op
2516 && current_screen == selection.screen 2652 && current_screen == selection.screen
2517 && selection.end.row >= view_start) 2653 && selection.end.row >= view_start)
2518 { 2654 {
2519#if ENABLE_FRILLS 2655#if !ENABLE_MINIMAL
2520 if (selection.rect) 2656 if (selection.rect)
2521 scr_xor_rect (selection.beg.row, selection.beg.col, 2657 scr_xor_rect (selection.beg.row, selection.beg.col,
2522 selection.end.row, selection.end.col, 2658 selection.end.row, selection.end.col,
2523 RS_RVid, RS_RVid | RS_Uline); 2659 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2524 else 2660 else
2525#endif 2661#endif
2526 scr_xor_span (selection.beg.row, selection.beg.col, 2662 scr_xor_span (selection.beg.row, selection.beg.col,
2527 selection.end.row, selection.end.col, 2663 selection.end.row, selection.end.col,
2528 RS_RVid); 2664 RS_Sel | RS_RVid);
2529 } 2665 }
2530} 2666}
2531 2667
2532/* ------------------------------------------------------------------------- */ 2668/* ------------------------------------------------------------------------- */
2533/* 2669/*
… …
2536 */ 2672 */
2537#if 0 2673#if 0
2538void 2674void
2539rxvt_term::scr_dump (int fd) NOTHROW 2675rxvt_term::scr_dump (int fd) NOTHROW
2540{ 2676{
2541 int row, wrote; 2677 // if this method is needed, it can be implemented by factoring the
2542 unsigned int width, towrite; 2678 // 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} 2679}
2562#endif 2680#endif
2563 2681
2564/* ------------------------------------------------------------------------- * 2682/* ------------------------------------------------------------------------- *
2565 * CHARACTER SELECTION * 2683 * CHARACTER SELECTION *
2566 * ------------------------------------------------------------------------- */ 2684 * ------------------------------------------------------------------------- */
2567void 2685void
2568rxvt_term::selection_check (int check_more) NOTHROW 2686rxvt_term::selection_check (int check_more) NOTHROW
2569{ 2687{
2570 row_col_t pos;
2571
2572 if (!selection.op) 2688 if (!selection.op)
2573 return; 2689 return;
2574 2690
2575 pos.row = pos.col = 0;
2576 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2691 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2577 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2692 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2578 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2579 || (check_more == 1 2694 || (check_more == 1
2580 && current_screen == selection.screen 2695 && current_screen == selection.screen
2581 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2696 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2582 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2697 && 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 (); 2698 CLEAR_ALL_SELECTION ();
2592} 2699}
2593 2700
2594/* ------------------------------------------------------------------------- */ 2701/* ------------------------------------------------------------------------- */
2595/* 2702/*
2596 * Paste a selection direct to the command fd 2703 * Paste a selection direct to the command fd
2597 */ 2704 */
2598void 2705void
2599rxvt_term::paste (char *data, unsigned int len) NOTHROW 2706rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2600{ 2707{
2601 /* convert normal newline chars into common keyboard Return key sequence */ 2708 /* convert normal newline chars into common keyboard Return key sequence */
2602 for (unsigned int i = 0; i < len; i++) 2709 for (unsigned int i = 0; i < len; i++)
2603 if (data[i] == C0_LF) 2710 if (data[i] == C0_LF)
2604 data[i] = C0_CR; 2711 data[i] = C0_CR;
2605 2712
2713 if (priv_modes & PrivMode_BracketPaste)
2714 tt_printf ("\x1b[200~");
2715
2606 tt_write (data, len); 2716 tt_write (data, len);
2607}
2608 2717
2609/* ------------------------------------------------------------------------- */ 2718 if (priv_modes & PrivMode_BracketPaste)
2610/* 2719 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} 2720}
2775 2721
2776void 2722void
2777rxvt_term::incr_cb (time_watcher &w) NOTHROW 2723rxvt_term::paste (char *data, unsigned int len) NOTHROW
2778{ 2724{
2779 selection_wait = Sel_none; 2725 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; 2726 return;
2792 2727
2793 selection_paste (win, prop, true); 2728 tt_paste (data, len);
2794} 2729}
2795 2730
2796/* ------------------------------------------------------------------------- */ 2731/* ------------------------------------------------------------------------- */
2797/* 2732/*
2798 * Request the current selection: 2733 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2799 * Order: > internal selection if available 2734 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2800 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2735 * 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 2736 * EXT: button 2 release
2805 */ 2737 */
2806void 2738void
2807rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2739rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2808{ 2740{
2809 if (selection.text && selnum == Sel_Primary) 2741 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 } 2742 {
2816 else 2743 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2744 selection_req->run ();
2817 { 2745 }
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} 2746}
2859 2747
2860/* ------------------------------------------------------------------------- */ 2748/* ------------------------------------------------------------------------- */
2861/* 2749/*
2862 * Clear all selected text 2750 * Clear all selected text
2863 * EXT: SelectionClear 2751 * EXT: SelectionClear
2864 */ 2752 */
2865void 2753void
2866rxvt_term::selection_clear () NOTHROW 2754rxvt_term::selection_clear (bool clipboard) NOTHROW
2867{ 2755{
2756 if (!clipboard)
2757 {
2868 want_refresh = 1; 2758 want_refresh = 1;
2869 free (selection.text); 2759 free (selection.text);
2870 selection.text = NULL; 2760 selection.text = NULL;
2871 selection.len = 0; 2761 selection.len = 0;
2872 CLEAR_SELECTION (); 2762 CLEAR_SELECTION ();
2873 2763
2874 if (display->selection_owner == this) 2764 if (display->selection_owner == this)
2875 display->selection_owner = 0; 2765 display->selection_owner = 0;
2766 }
2767 else
2768 {
2769 free (selection.clip_text);
2770 selection.clip_text = NULL;
2771 selection.clip_len = 0;
2772
2773 if (display->clipboard_owner == this)
2774 display->clipboard_owner = 0;
2775 }
2876} 2776}
2877 2777
2878/* ------------------------------------------------------------------------- */ 2778/* ------------------------------------------------------------------------- */
2879/* 2779/*
2880 * Copy a selection into the cut buffer 2780 * Copy a selection into the cut buffer
2881 * EXT: button 1 or 3 release 2781 * EXT: button 1 or 3 release
2882 */ 2782 */
2883void 2783void
2884rxvt_term::selection_make (Time tm) 2784rxvt_term::selection_make (Time tm)
2885{ 2785{
2886 int i; 2786 int size;
2887 wchar_t *new_selection_text; 2787 wchar_t *new_selection_text;
2888 text_t *t; 2788 text_t *t;
2889 2789
2890 switch (selection.op) 2790 switch (selection.op)
2891 { 2791 {
… …
2907 return; /* nothing selected, go away */ 2807 return; /* nothing selected, go away */
2908 2808
2909 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2809 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2910 return; 2810 return;
2911 2811
2912 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2812 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2913 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2813 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2914 2814
2915 int ofs = 0; 2815 int ofs = 0;
2916 int extra = 0; 2816 int extra = 0;
2917 2817
2918 int col = selection.beg.col; 2818 int col = selection.beg.col;
… …
2920 2820
2921 int end_col; 2821 int end_col;
2922 2822
2923 for (; row <= selection.end.row; row++, col = 0) 2823 for (; row <= selection.end.row; row++, col = 0)
2924 { 2824 {
2925#if ENABLE_FRILLS 2825#if !ENABLE_MINIMAL
2926 if (selection.rect) 2826 if (selection.rect)
2927 { 2827 {
2928 col = selection.beg.col; 2828 col = selection.beg.col;
2929 end_col = ncol + 1; 2829 end_col = selection.end.col;
2930 } 2830 }
2931 else 2831 else
2932#endif 2832#endif
2933 end_col = ROW(row).l; 2833 end_col = ROW(row).l;
2934 2834
2935 col = max (col, 0); 2835 col = max (col, 0);
2936 2836
2937 if (row == selection.end.row 2837 if (row == selection.end.row)
2938#if ENABLE_FRILLS
2939 || selection.rect
2940#endif
2941 )
2942 min_it (end_col, selection.end.col); 2838 min_it (end_col, selection.end.col);
2943 2839
2944 t = ROW(row).t + col; 2840 t = ROW(row).t + col;
2945 2841
2946 for (; col < end_col; col++) 2842 for (; col < end_col; col++)
… …
2954 2850
2955 extra -= (len - 1); 2851 extra -= (len - 1);
2956 2852
2957 if (extra < 0) 2853 if (extra < 0)
2958 { 2854 {
2959 extra += i; 2855 extra += size;
2960 i += i; 2856 size += size;
2961 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2857 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2962 } 2858 }
2963 2859
2964 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2860 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2965 } 2861 }
2966#endif 2862#endif
2967 else 2863 else
2968 new_selection_text[ofs++] = *t++; 2864 new_selection_text[ofs++] = *t++;
2969 } 2865 }
2970 2866
2971#if ENABLE_FRILLS 2867#if !ENABLE_MINIMAL
2972 if (selection.rect) 2868 if (selection.rect)
2973 { 2869 {
2974 while (ofs 2870 while (ofs
2975 && new_selection_text[ofs - 1] != C0_LF 2871 && new_selection_text[ofs - 1] != C0_LF
2976 && unicode::is_space (new_selection_text[ofs - 1])) 2872 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2978 2874
2979 new_selection_text[ofs++] = C0_LF; 2875 new_selection_text[ofs++] = C0_LF;
2980 } 2876 }
2981 else 2877 else
2982#endif 2878#endif
2983 if (!ROW(row).is_longer () && row != selection.end.row) 2879 if (!ROW(row).is_longer ()
2880 && (row != selection.end.row || end_col != selection.end.col)
2881 && (row != selection.beg.row || selection.beg.col < ncol))
2984 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
2985 } 2883 }
2986
2987 if (end_col != selection.end.col)
2988 new_selection_text[ofs++] = C0_LF;
2989 2884
2990 new_selection_text[ofs] = 0; 2885 new_selection_text[ofs] = 0;
2991 2886
2992 if (ofs == 0) 2887 if (ofs == 0)
2993 { 2888 {
… …
3006 2901
3007 selection_grab (tm); 2902 selection_grab (tm);
3008} 2903}
3009 2904
3010bool 2905bool
3011rxvt_term::selection_grab (Time tm) NOTHROW 2906rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3012{ 2907{
2908 Atom sel;
2909
2910 if (!clipboard)
2911 {
3013 selection_time = tm; 2912 selection_time = tm;
3014 2913 sel = XA_PRIMARY;
3015 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3016 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3017 { 2914 }
2915 else
2916 {
2917 clipboard_time = tm;
2918 sel = xa[XA_CLIPBOARD];
2919 }
2920
2921 XSetSelectionOwner (dpy, sel, vt, tm);
2922 if (XGetSelectionOwner (dpy, sel) == vt)
2923 {
3018 display->set_selection_owner (this); 2924 display->set_selection_owner (this, clipboard);
3019 return true; 2925 return true;
3020 } 2926 }
3021 else 2927 else
3022 { 2928 {
3023 selection_clear (); 2929 selection_clear (clipboard);
3024 return false; 2930 return false;
3025 } 2931 }
3026 2932
3027#if 0 2933#if 0
3028 XTextProperty ct; 2934 XTextProperty ct;
3029 2935
3030 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 2936 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3031 { 2937 {
3032 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 2938 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3033 XFree (ct.value); 2939 XFree (ct.value);
3034 } 2940 }
3035#endif 2941#endif
… …
3081 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 2987 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3082 2988
3083 while (selection.mark.col > 0 2989 while (selection.mark.col > 0
3084 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 2990 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3085 --selection.mark.col; 2991 --selection.mark.col;
3086 2992
3087 if (selection.op) 2993 if (selection.op)
2994 {
3088 { /* clear the old selection */ 2995 /* clear the old selection */
3089 selection.beg.row = selection.end.row = selection.mark.row; 2996 selection.beg.row = selection.end.row = selection.mark.row;
3090 selection.beg.col = selection.end.col = selection.mark.col; 2997 selection.beg.col = selection.end.col = selection.mark.col;
3091 } 2998 }
3092 2999
3093 selection.op = SELECTION_INIT; 3000 selection.op = SELECTION_INIT;
… …
3282 * a point/word/line which is either the start or end of the selection 3189 * 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 3190 * and it was decided by whichever point/word/line was `fixed' at the
3284 * time of the most recent button3 press 3191 * time of the most recent button3 press
3285 */ 3192 */
3286 if (button3 && buttonpress) 3193 if (button3 && buttonpress)
3194 {
3287 { /* button3 press */ 3195 /* button3 press */
3288 /* 3196 /*
3289 * first determine which edge of the selection we are closest to 3197 * first determine which edge of the selection we are closest to
3290 */ 3198 */
3291 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3199 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3292 || (!ROWCOL_IS_AFTER (pos, selection.end) 3200 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3310 selection.mark.row = selection.beg.row; 3218 selection.mark.row = selection.beg.row;
3311 selection.mark.col = selection.beg.col; 3219 selection.mark.col = selection.beg.col;
3312 } 3220 }
3313 } 3221 }
3314 else 3222 else
3223 {
3315 { /* button1 drag or button3 drag */ 3224 /* button1 drag or button3 drag */
3316 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3225 if (ROWCOL_IS_AFTER (selection.mark, pos))
3317 { 3226 {
3318 if (selection.mark.row == selection.end.row 3227 if (selection.mark.row == selection.end.row
3319 && selection.mark.col == selection.end.col 3228 && selection.mark.col == selection.end.col
3320 && clickchange 3229 && clickchange
… …
3337 3246
3338 if (selection.clicks == 1) 3247 if (selection.clicks == 1)
3339 { 3248 {
3340 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3249 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3341 && !ROW(selection.beg.row).is_longer () 3250 && !ROW(selection.beg.row).is_longer ()
3342#if ENABLE_FRILLS 3251#if !ENABLE_MINIMAL
3343 && !selection.rect 3252 && !selection.rect
3344#endif 3253#endif
3345 ) 3254 )
3346 selection.beg.col = ncol; 3255 selection.beg.col = ncol;
3347 3256
3348 if ( 3257 if (
3349 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3258 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3350 && !ROW(selection.end.row).is_longer () 3259 && !ROW(selection.end.row).is_longer ()
3351#if ENABLE_FRILLS 3260#if !ENABLE_MINIMAL
3352 && !selection.rect 3261 && !selection.rect
3353#endif 3262#endif
3354 ) 3263 )
3355 selection.end.col = ncol; 3264 selection.end.col = ncol;
3356 } 3265 }
… …
3363 selection_delimit_word (DN, &selection.end, &selection.end); 3272 selection_delimit_word (DN, &selection.end, &selection.end);
3364 } 3273 }
3365 else if (selection.clicks == 3) 3274 else if (selection.clicks == 3)
3366 { 3275 {
3367#if ENABLE_FRILLS 3276#if ENABLE_FRILLS
3368 if (OPTION (Opt_tripleclickwords)) 3277 if (option (Opt_tripleclickwords))
3369 { 3278 {
3370 selection_delimit_word (UP, &selection.beg, &selection.beg); 3279 selection_delimit_word (UP, &selection.beg, &selection.beg);
3371 3280
3372 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3281 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3373 { 3282 {
3374 if (!ROW(end_row).is_longer ()) 3283 if (!ROW(end_row).is_longer ())
3375 { 3284 {
3376 selection.end.row = end_row; 3285 selection.end.row = end_row;
3377 selection.end.col = ROW(end_row).l; 3286 selection.end.col = ROW(end_row).l;
3287# if !ENABLE_MINIMAL
3378 selection_remove_trailing_spaces (); 3288 selection_remove_trailing_spaces ();
3289# endif
3379 break; 3290 break;
3380 } 3291 }
3381 } 3292 }
3382 } 3293 }
3383 else 3294 else
… …
3399 selection.end.row++; 3310 selection.end.row++;
3400 } 3311 }
3401 } 3312 }
3402 3313
3403 if (button3 && buttonpress) 3314 if (button3 && buttonpress)
3315 {
3404 { /* mark may need to be changed */ 3316 /* mark may need to be changed */
3405 if (closeto == LEFT) 3317 if (closeto == LEFT)
3406 { 3318 {
3407 selection.mark.row = selection.end.row; 3319 selection.mark.row = selection.end.row;
3408 selection.mark.col = selection.end.col - (selection.clicks == 2); 3320 selection.mark.col = selection.end.col - (selection.clicks == 2);
3409 } 3321 }
… …
3412 selection.mark.row = selection.beg.row; 3324 selection.mark.row = selection.beg.row;
3413 selection.mark.col = selection.beg.col; 3325 selection.mark.col = selection.beg.col;
3414 } 3326 }
3415 } 3327 }
3416 3328
3417#if ENABLE_FRILLS 3329#if !ENABLE_MINIMAL
3418 if (selection.rect && selection.beg.col > selection.end.col) 3330 if (selection.rect && selection.beg.col > selection.end.col)
3419 ::swap (selection.beg.col, selection.end.col); 3331 ::swap (selection.beg.col, selection.end.col);
3420#endif 3332#endif
3421} 3333}
3422 3334
3423#if ENABLE_FRILLS 3335#if !ENABLE_MINIMAL
3424void 3336void
3425rxvt_term::selection_remove_trailing_spaces () NOTHROW 3337rxvt_term::selection_remove_trailing_spaces () NOTHROW
3426{ 3338{
3427 int32_t end_col, end_row; 3339 int32_t end_col, end_row;
3428 text_t *stp; 3340 text_t *stp;
… …
3482 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3483 */ 3395 */
3484void 3396void
3485rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3486{ 3398{
3399 Atom property = rq.property == None ? rq.target : rq.property;
3487 XSelectionEvent ev; 3400 XSelectionEvent ev;
3488 dDisp;
3489 3401
3490 ev.type = SelectionNotify; 3402 ev.type = SelectionNotify;
3491 ev.property = None; 3403 ev.property = None;
3492 ev.display = rq.display; 3404 ev.display = rq.display;
3493 ev.requestor = rq.requestor; 3405 ev.requestor = rq.requestor;
… …
3507 *target++ = xa[XA_COMPOUND_TEXT]; 3419 *target++ = xa[XA_COMPOUND_TEXT];
3508#if X_HAVE_UTF8_STRING 3420#if X_HAVE_UTF8_STRING
3509 *target++ = xa[XA_UTF8_STRING]; 3421 *target++ = xa[XA_UTF8_STRING];
3510#endif 3422#endif
3511 3423
3512 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3424 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3513 32, PropModeReplace, 3425 32, PropModeReplace,
3514 (unsigned char *)target_list, target - target_list); 3426 (unsigned char *)target_list, target - target_list);
3515 ev.property = rq.property; 3427 ev.property = property;
3516 } 3428 }
3517#if TODO // TODO 3429#if TODO // TODO
3518 else if (rq.target == xa[XA_MULTIPLE]) 3430 else if (rq.target == xa[XA_MULTIPLE])
3519 { 3431 {
3520 /* TODO: Handle MULTIPLE */ 3432 /* TODO: Handle MULTIPLE */
3521 } 3433 }
3522#endif 3434#endif
3523 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3435 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3524 { 3436 {
3525 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3437 XChangeProperty (dpy, rq.requestor, property, rq.target,
3526 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3438 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3527 ev.property = rq.property; 3439 ev.property = property;
3440 }
3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3442 {
3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3444 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3445 ev.property = property;
3528 } 3446 }
3529 else if (rq.target == XA_STRING 3447 else if (rq.target == XA_STRING
3530 || rq.target == xa[XA_TEXT] 3448 || rq.target == xa[XA_TEXT]
3531 || rq.target == xa[XA_COMPOUND_TEXT] 3449 || rq.target == xa[XA_COMPOUND_TEXT]
3532 || rq.target == xa[XA_UTF8_STRING] 3450 || rq.target == xa[XA_UTF8_STRING]
… …
3554 style = enc_string; 3472 style = enc_string;
3555 else if (target == xa[XA_TEXT]) 3473 else if (target == xa[XA_TEXT])
3556 style = enc_text; 3474 style = enc_text;
3557 else if (target == xa[XA_COMPOUND_TEXT]) 3475 else if (target == xa[XA_COMPOUND_TEXT])
3558 style = enc_compound_text; 3476 style = enc_compound_text;
3559#if ENABLE_FRILLS 3477#if !ENABLE_MINIMAL
3560 else if (target == xa[XA_UTF8_STRING]) 3478 else if (target == xa[XA_UTF8_STRING])
3561 style = enc_utf8; 3479 style = enc_utf8;
3562#endif 3480#endif
3563 else 3481 else
3564 { 3482 {
3565 target = xa[XA_COMPOUND_TEXT]; 3483 target = xa[XA_COMPOUND_TEXT];
3566 style = enc_compound_text; 3484 style = enc_compound_text;
3567 } 3485 }
3568 3486
3569 if (selection.text) 3487 if (rq.selection == XA_PRIMARY && selection.text)
3570 { 3488 {
3571 cl = selection.text; 3489 cl = selection.text;
3572 selectlen = selection.len; 3490 selectlen = selection.len;
3573 } 3491 }
3492 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3493 {
3494 cl = selection.clip_text;
3495 selectlen = selection.clip_len;
3496 }
3574 else 3497 else
3575 { 3498 {
3576 cl = L""; 3499 cl = L"";
3577 selectlen = 0; 3500 selectlen = 0;
3578 } 3501 }
3579 3502
3580#if ENABLE_FRILLS 3503#if !ENABLE_MINIMAL
3581 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3504 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3582 // so recode it manually 3505 // so recode it manually
3583 if (style == enc_utf8) 3506 if (style == enc_utf8)
3584 { 3507 {
3585 freect = 1; 3508 freect = 1;
… …
3588 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3511 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3589 ct.nitems = strlen ((char *)ct.value); 3512 ct.nitems = strlen ((char *)ct.value);
3590 } 3513 }
3591 else 3514 else
3592#endif 3515#endif
3593 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3516 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3594 freect = 1; 3517 freect = 1;
3595 else 3518 else
3596 { 3519 {
3597 /* if we failed to convert then send it raw */ 3520 /* if we failed to convert then send it raw */
3598 ct.value = (unsigned char *)cl; 3521 ct.value = (unsigned char *)cl;
3599 ct.nitems = selectlen; 3522 ct.nitems = selectlen;
3600 ct.encoding = target; 3523 ct.encoding = target;
3601 } 3524 }
3602 3525
3603 XChangeProperty (disp, rq.requestor, rq.property, 3526 XChangeProperty (dpy, rq.requestor, property,
3604 ct.encoding, 8, PropModeReplace, 3527 ct.encoding, 8, PropModeReplace,
3605 ct.value, (int)ct.nitems); 3528 ct.value, (int)ct.nitems);
3606 ev.property = rq.property; 3529 ev.property = property;
3607 3530
3608 if (freect) 3531 if (freect)
3609 XFree (ct.value); 3532 XFree (ct.value);
3610 } 3533 }
3611 3534
3612 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3535 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3613}
3614
3615/* ------------------------------------------------------------------------- *
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} 3536}
3630 3537
3631/* ------------------------------------------------------------------------- */ 3538/* ------------------------------------------------------------------------- */
3632#ifdef USE_XIM 3539#ifdef USE_XIM
3633void 3540void
3634rxvt_term::im_set_position (XPoint &pos) NOTHROW 3541rxvt_term::im_set_position (XPoint &pos) NOTHROW
3635{ 3542{
3636 XWindowAttributes xwa; 3543 XWindowAttributes xwa;
3637 3544
3638 XGetWindowAttributes (display->display, vt, &xwa); 3545 XGetWindowAttributes (dpy, vt, &xwa);
3639 3546
3640 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3547 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3641 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3548 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3642} 3549}
3643#endif 3550#endif
… …
3661 h += 2; min_it (h, nrow); 3568 h += 2; min_it (h, nrow);
3662 3569
3663 x -= 1; clamp_it (x, 0, ncol - w); 3570 x -= 1; clamp_it (x, 0, ncol - w);
3664 y -= 1; clamp_it (y, 0, nrow - h); 3571 y -= 1; clamp_it (y, 0, nrow - h);
3665 3572
3666 ov_x = x; ov_y = y; 3573 ov.x = x; ov.y = y;
3667 ov_w = w; ov_h = h; 3574 ov.w = w; ov.h = h;
3668 3575
3669 ov_text = new text_t *[h]; 3576 ov.text = new text_t *[h];
3670 ov_rend = new rend_t *[h]; 3577 ov.rend = new rend_t *[h];
3671 3578
3672 for (y = 0; y < h; y++) 3579 for (y = 0; y < h; y++)
3673 { 3580 {
3674 text_t *tp = ov_text[y] = new text_t[w]; 3581 text_t *tp = ov.text[y] = new text_t[w];
3675 rend_t *rp = ov_rend[y] = new rend_t[w]; 3582 rend_t *rp = ov.rend[y] = new rend_t[w];
3676 3583
3677 text_t t0, t1, t2; 3584 text_t t0, t1, t2;
3678 rend_t r = OVERLAY_RSTYLE; 3585 rend_t r = OVERLAY_RSTYLE;
3679 3586
3680 if (y == 0) 3587 if (y == 0)
… …
3699} 3606}
3700 3607
3701void 3608void
3702rxvt_term::scr_overlay_off () NOTHROW 3609rxvt_term::scr_overlay_off () NOTHROW
3703{ 3610{
3704 if (!ov_text) 3611 if (!ov.text)
3705 return; 3612 return;
3706 3613
3707 want_refresh = 1; 3614 want_refresh = 1;
3708 3615
3709 for (int y = 0; y < ov_h; y++) 3616 for (int y = 0; y < ov.h; y++)
3710 { 3617 {
3711 delete [] ov_text[y]; 3618 delete [] ov.text[y];
3712 delete [] ov_rend[y]; 3619 delete [] ov.rend[y];
3713 } 3620 }
3714 3621
3715 delete [] ov_text; ov_text = 0; 3622 delete [] ov.text; ov.text = 0;
3716 delete [] ov_rend; ov_rend = 0; 3623 delete [] ov.rend; ov.rend = 0;
3717} 3624}
3718 3625
3719void 3626void
3720rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3627rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3721{ 3628{
3722 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3629 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3723 return; 3630 return;
3724 3631
3725 x++, y++; 3632 x++, y++;
3726 3633
3727 ov_text[y][x] = text; 3634 ov.text[y][x] = text;
3728 ov_rend[y][x] = rend; 3635 ov.rend[y][x] = rend;
3729} 3636}
3730 3637
3731void 3638void
3732rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3639rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3733{ 3640{
… …
3739rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3646rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3740{ 3647{
3741 while (*s) 3648 while (*s)
3742 { 3649 {
3743 text_t t = *s++; 3650 text_t t = *s++;
3744 int width = wcwidth (t); 3651 int width = WCWIDTH (t);
3745 3652
3746 while (width--) 3653 while (width--)
3747 { 3654 {
3748 scr_overlay_set (x++, y, t); 3655 scr_overlay_set (x++, y, t);
3749 t = NOCHAR; 3656 t = NOCHAR;
… …
3752} 3659}
3753 3660
3754void 3661void
3755rxvt_term::scr_swap_overlay () NOTHROW 3662rxvt_term::scr_swap_overlay () NOTHROW
3756{ 3663{
3757 if (!ov_text) 3664 if (!ov.text)
3758 return; 3665 return;
3759 3666
3667 // hide cursor if it is within the overlay area
3668 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3669 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3670 screen.flags &= ~Screen_VisibleCursor;
3671
3760 // swap screen mem with overlay 3672 // swap screen mem with overlay
3761 for (int y = ov_h; y--; ) 3673 for (int y = ov.h; y--; )
3762 { 3674 {
3763 text_t *t1 = ov_text[y]; 3675 text_t *t1 = ov.text[y];
3764 rend_t *r1 = ov_rend[y]; 3676 rend_t *r1 = ov.rend[y];
3765 3677
3766 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3678 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; 3679 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3768 3680
3769 for (int x = ov_w; x--; ) 3681 for (int x = ov.w; x--; )
3770 { 3682 {
3771 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3683 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3772 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3684 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3773 } 3685 }
3774 } 3686 }

Diff Legend

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