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.243 by ayin, Thu Jan 19 23:15:21 2006 UTC vs.
Revision 1.439 by sf-exg, Mon Mar 25 16:24:18 2013 UTC

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

Diff Legend

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