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.268 by root, Tue May 1 21:30:01 2007 UTC vs.
Revision 1.456 by sf-exg, Tue Oct 13 08:10:43 2015 UTC

1/*---------------------------------------------------------------------------* 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 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * 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 10 * 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 11 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
26 27
27#include "../config.h" /* NECESSARY */ 28#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 30#include "rxvtperl.h" /* NECESSARY */
30 31
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 32#include <inttypes.h>
34 33
35#include "salloc.C" // HACK, should be a seperate compile! 34static inline void
36
37inline void fill_text (text_t *start, text_t value, int len) 35fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
43/* ------------------------------------------------------------------------- */ 41/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 256*1024
45#define PASTE_SIZE 32768
46#define TABSIZE 8 /* default tab size */ 42#define TABSIZE 8 /* default tab size */
47 43
48/* ------------------------------------------------------------------------- * 44/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 45 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 46 * ------------------------------------------------------------------------- */
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 81 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) \ 82#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) 83 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 84
89/* 85/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 86 * 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 */ 87 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 88#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 89 if (mapped) \
104 XClearArea (dpy, drawBuffer, x, y, \ 90 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 91 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 92 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 93
114/* ------------------------------------------------------------------------- * 94/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 95 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 96 * ------------------------------------------------------------------------- */
117 97
118/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
119void 99void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 100rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 101{
122 if (!l.t) 102 if (!l.valid ())
123 { 103 {
124 lalloc (l); 104 l.alloc ();
125 col = 0; 105 col = 0;
126 width = ncol; 106 width = ncol;
127 } 107 }
128 108
129 l.touch (); 109 l.touch ();
… …
148{ 128{
149 scr_blank_line (l, 0, ncol, efs); 129 scr_blank_line (l, 0, ncol, efs);
150 130
151 l.l = 0; 131 l.l = 0;
152 l.f = 0; 132 l.f = 0;
133}
134
135// nuke a single wide character at the given column
136void
137rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
138{
139 // find begin
140 while (col > 0 && l.t[col] == NOCHAR)
141 col--;
142
143 rend_t rend = l.r[col] & ~RS_baseattrMask;
144 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
145
146 l.touch ();
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
154}
155
156// set the rendition of a single wide character beginning at the given column
157void
158rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
159{
160 do {
161 l.r[col] = rend;
162 col++;
163 } while (col < ncol && l.t[col] == NOCHAR);
153} 164}
154 165
155/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
158 169
159void 170void
171rxvt_term::scr_alloc () NOTHROW
172{
173 int tsize = sizeof (text_t) * ncol;
174 int rsize = sizeof (rend_t) * ncol;
175
176 // we assume that rend_t size is a sufficient alignment
177 // factor for text_t and line_t values, and we only
178 // need to adjust tsize.
179 tsize = (tsize + sizeof (rend_t) - 1);
180 tsize -= tsize % sizeof (rend_t);
181
182 int all_rows = total_rows + nrow + nrow;
183
184 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
185 chunk = chunk_alloc (chunk_size, 0);
186
187 char *base = (char *)chunk + sizeof (line_t) * all_rows;
188
189 for (int row = 0; row < all_rows; ++row)
190 {
191 line_t &l = ((line_t *)chunk) [row];
192
193 l.t = (text_t *)base; base += tsize;
194 l.r = (rend_t *)base; base += rsize;
195 l.l = -1;
196 l.f = 0;
197 }
198
199 drawn_buf = (line_t *)chunk;
200 swap_buf = drawn_buf + nrow;
201 row_buf = swap_buf + nrow;
202}
203
204void
205rxvt_term::copy_line (line_t &dst, line_t &src)
206{
207 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
208 dst.l = min (src.l, ncol);
209 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
210 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
211 dst.f = src.f;
212}
213
214void ecb_cold
160rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
161{ 216{
162#if ENABLE_OVERLAY 217#if ENABLE_OVERLAY
163 scr_overlay_off (); 218 scr_overlay_off ();
164#endif 219#endif
… …
172 if (nrow == 0) 227 if (nrow == 0)
173 nrow = 24; 228 nrow = 24;
174 229
175 if (ncol == prev_ncol && nrow == prev_nrow) 230 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 231 return;
177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180 232
181 // we need at least two lines for wrapping to work correctly 233 // we need at least two lines for wrapping to work correctly
182 while (nrow + saveLines < 2) 234 while (nrow + saveLines < 2)
183 { 235 {
184 //TODO//FIXME 236 //TODO//FIXME
… …
193 total_rows = nrow + saveLines; 245 total_rows = nrow + saveLines;
194 246
195 screen.tscroll = 0; 247 screen.tscroll = 0;
196 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
197 249
250 void *prev_chunk = chunk;
251 size_t prev_chunk_size = chunk_size;
252 line_t *prev_drawn_buf = drawn_buf;
253 line_t *prev_swap_buf = swap_buf;
254 line_t *prev_row_buf = row_buf;
255
256 scr_alloc ();
257
198 if (!row_buf) 258 if (!prev_row_buf)
199 { 259 {
200 /*
201 * first time called so just malloc everything: don't rely on realloc
202 */
203 top_row = 0; 260 top_row = 0;
204 term_start = 0; 261 term_start = 0;
205
206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
208
209 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
212
213 for (int row = nrow; row--; )
214 {
215 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
216 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
217 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
218 }
219 262
220 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
221 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
222 screen.flags = Screen_DefaultFlags; 265 screen.flags = Screen_DefaultFlags;
223 screen.cur.row = screen.cur.col = 0; 266 screen.cur.row = screen.cur.col = 0;
… …
237 selection.text = NULL; 280 selection.text = NULL;
238 selection.len = 0; 281 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 282 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 283 selection.screen = PRIMARY;
241 selection.clicks = 0; 284 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false; 285 selection.clip_text = NULL;
286 selection.clip_len = 0;
243 } 287 }
244 else 288 else
245 { 289 {
246 /* 290 /*
247 * add or delete rows as appropriate 291 * add or delete rows as appropriate
248 */ 292 */
249 293
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 294 int common_col = min (prev_ncol, ncol);
251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253#if 0
254 if (nrow < prev_nrow)
255 {
256 for (int row = nrow; row < prev_nrow; row++)
257 {
258 lfree (swap_buf [row]);
259 lfree (drawn_buf[row]);
260 }
261 }
262#endif
263
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266 295
267 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
268 { 297 {
269 lresize (drawn_buf[row]);
270 lresize (swap_buf [row]);
271 }
272
273 for (int row = prev_nrow; row < nrow; row++)
274 {
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
277 } 299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
278 301
279 line_t *old_buf = row_buf; 302 copy_line (swap_buf [row], prev_swap_buf [row]);
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 303 }
304
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 305 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
285 308
286 if (top_row) 309 if (top_row)
287 { 310 {
288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 311 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 312 // to come up with a lean and mean algorithm.
313 // TODO: maybe optimise when width didn't change
290 314
291 row_col_t ocur = screen.cur; 315 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 316 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 317
294 do 318 do
295 { 319 {
296 p = MOD (p - 1, prev_total_rows); 320 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t); 321 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1; 322 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l; 323 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
302 324
303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 325 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
304 { 326 {
305 p = MOD (p - 1, prev_total_rows); 327 p = MOD (p - 1, prev_total_rows);
306 328
307 plines++; 329 plines++;
308 llen += prev_ncol; 330 llen += prev_ncol;
… …
321 343
322 // re-assemble the full line by destination lines 344 // re-assemble the full line by destination lines
323 for (int qrow = q; qlines--; qrow++) 345 for (int qrow = q; qlines--; qrow++)
324 { 346 {
325 qline = row_buf + qrow; 347 qline = row_buf + qrow;
326 lalloc (*qline); 348 qline->alloc (); // redundant with next line
327 qline->l = ncol; 349 qline->l = ncol;
328 qline->is_longer (1); 350 qline->is_longer (1);
329 351
330 int qcol = 0; 352 int qcol = 0;
331 353
332 // see below for cursor adjustment rationale 354 // see below for cursor adjustment rationale
333 if (p == ocur.row) 355 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 356 screen.cur.row = q - (total_rows - nrow);
335 357
336 // fill a single destination line 358 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 359 while (lofs < llen && qcol < ncol)
338 { 360 {
339 int prow = lofs / prev_ncol; 361 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 362 int pcol = lofs % prev_ncol;
… …
346 // this seems to upset applications/shells/readline 368 // this seems to upset applications/shells/readline
347 // least. 369 // least.
348 if (prow == ocur.row) 370 if (prow == ocur.row)
349 screen.cur.row = q - (total_rows - nrow); 371 screen.cur.row = q - (total_rows - nrow);
350 372
351 line_t &pline = old_buf [prow]; 373 line_t &pline = prev_row_buf [prow];
352 374
353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 375 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
354 376
355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 377 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 378 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
366 } 388 }
367 while (p != pend && q > 0); 389 while (p != pend && q > 0);
368 390
369 term_start = total_rows - nrow; 391 term_start = total_rows - nrow;
370 top_row = q - term_start; 392 top_row = q - term_start;
371 393
372 // make sure all terminal lines exist 394 // make sure all terminal lines exist
373 while (top_row > 0) 395 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 396 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 397 }
376 else 398 else
377 { 399 {
378 // if no scrollback exists (yet), wing, instead of wrap 400 // if no scrollback exists (yet), wing, instead of wrap
379 401
380 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
381 { 403 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 404 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 405 line_t &dst = row_buf [row];
384 406
385 qline = pline; 407 copy_line (dst, src);
386 lresize (qline);
387 } 408 }
388 409
389 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
390 {
391 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
392 }
393 412
394 term_start = 0; 413 term_start = 0;
395 } 414 }
396
397 free (old_buf);
398 delete old_ta;
399 delete old_ra;
400 415
401 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
418 }
403 419
420 for (int row = nrow; row--; )
421 {
422 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
423 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
424 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
425 }
426
427 chunk_free (prev_chunk, prev_chunk_size);
428
404 free (tabs); 429 free (tabs);
405 } 430 tabs = (char *)rxvt_malloc (ncol);
431
432 for (int col = ncol; col--; )
433 tabs [col] = col % TABSIZE == 0;
406 434
407 CLEAR_ALL_SELECTION (); 435 CLEAR_ALL_SELECTION ();
408 436
409 prev_nrow = nrow; 437 prev_nrow = nrow;
410 prev_ncol = ncol; 438 prev_ncol = ncol;
411 439
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 440 tt_winch ();
413 441
414 for (int col = ncol; --col; ) 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
415 tabs [col] = col % TABSIZE == 0; 443}
444
445void ecb_cold
446rxvt_term::scr_release () NOTHROW
447{
448 chunk_free (chunk, chunk_size);
449 chunk = 0;
450 row_buf = 0;
451
452 free (tabs);
453 tabs = 0;
454}
455
456/* ------------------------------------------------------------------------- */
457/*
458 * Hard/Soft reset
459 */
460void ecb_cold
461rxvt_term::scr_poweron ()
462{
463 scr_release ();
464
465 prev_nrow = prev_ncol = 0;
466 rvideo_mode = false;
467 scr_soft_reset ();
468 scr_reset ();
469
470 scr_clear (true);
471 scr_refresh ();
472}
473
474void ecb_cold
475rxvt_term::scr_soft_reset () NOTHROW
476{
477 /* only affects modes, nothing drastic such as clearing the screen */
478#if ENABLE_OVERLAY
479 scr_overlay_off ();
480#endif
416 481
417 if (current_screen != PRIMARY) 482 if (current_screen != PRIMARY)
418 scr_swap_screen (); 483 scr_swap_screen ();
419 484
420 tt_winch (); 485 scr_scroll_region (0, MAX_ROWS - 1);
421 486 scr_rendition (0, ~RS_None);
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 487 scr_insert_mode (0);
423}
424
425/* ------------------------------------------------------------------------- */
426/*
427 * Free everything. That way malloc debugging can find leakage.
428 */
429void
430rxvt_term::scr_release () NOTHROW
431{
432 if (row_buf)
433 {
434 delete talloc; talloc = 0;
435 delete ralloc; ralloc = 0;
436
437 free (row_buf);
438 free (swap_buf);
439 free (drawn_buf);
440 free (tabs);
441
442 row_buf = 0; // signal that we freed all the arrays
443 }
444}
445
446/* ------------------------------------------------------------------------- */
447/*
448 * Hard reset
449 */
450void
451rxvt_term::scr_poweron ()
452{
453 scr_release ();
454 prev_nrow = prev_ncol = 0;
455 scr_reset ();
456
457 scr_clear (true);
458 scr_refresh ();
459} 488}
460 489
461/* ------------------------------------------------------------------------- * 490/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 491 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 492 * ------------------------------------------------------------------------- */
… …
501 } 530 }
502 531
503 /* boundary check in case screen size changed between SAVE and RESTORE */ 532 /* boundary check in case screen size changed between SAVE and RESTORE */
504 min_it (s->cur.row, nrow - 1); 533 min_it (s->cur.row, nrow - 1);
505 min_it (s->cur.col, ncol - 1); 534 min_it (s->cur.col, ncol - 1);
506#ifdef DEBUG_STRICT
507 assert (s->cur.row >= 0); 535 assert (s->cur.row >= 0);
508 assert (s->cur.col >= 0); 536 assert (s->cur.col >= 0);
509#endif
510} 537}
511 538
512void 539void
513rxvt_term::scr_swap_screen () 540rxvt_term::scr_swap_screen () NOTHROW
514{ 541{
515 if (!option (Opt_secondaryScreen)) 542 if (!option (Opt_secondaryScreen))
516 return; 543 return;
517 544
518 for (int i = prev_nrow; i--; ) 545 for (int i = prev_nrow; i--; )
… …
537 return; 564 return;
538 565
539 want_refresh = 1; 566 want_refresh = 1;
540 view_start = 0; 567 view_start = 0;
541 568
542 selection_check (2); /* check for boundary cross */ 569 /* check for boundary cross */
570 row_col_t pos;
571 pos.row = pos.col = 0;
572 if (ROWCOL_IS_BEFORE (selection.beg, pos)
573 && ROWCOL_IS_AFTER (selection.end, pos))
574 CLEAR_SELECTION ();
543 575
544 int i = current_screen; current_screen = scrn; scrn = i; 576 current_screen = scrn;
545 577
546#if NSCREENS 578#if NSCREENS
547 if (option (Opt_secondaryScreen)) 579 if (option (Opt_secondaryScreen))
548 { 580 {
549 num_scr = 0; 581 num_scr = 0;
… …
598/* 630/*
599 * Change the rendition style for following text 631 * Change the rendition style for following text
600 */ 632 */
601void 633void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 634rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 635{
604 if (set) 636 if (set)
605 rstyle |= style; 637 rstyle |= style;
606 else if (style == ~RS_None) 638 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 639 rstyle = DEFAULT_RSTYLE;
608 else 640 else
609 rstyle &= ~style; 641 rstyle &= ~style;
610 } 642}
611 643
612/* ------------------------------------------------------------------------- */ 644/* ------------------------------------------------------------------------- */
613/* 645/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 647 * count positive ==> scroll up
616 * count negative ==> scroll down 648 * count negative ==> scroll down
617 */ 649 */
618int 650int ecb_hot
619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
620{ 652{
621 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
622 return 0; 654 return 0;
623 655
… …
626 658
627 if (count > 0 659 if (count > 0
628 && row1 == 0 660 && row1 == 0
629 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 661 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 662 {
663 min_it (count, total_rows - (nrow - (row2 + 1)));
664
631 top_row = max (top_row - count, -saveLines); 665 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows;
635 666
636 // sever bottommost line 667 // sever bottommost line
637 { 668 {
638 line_t &l = ROW(row2 - count); 669 line_t &l = ROW(row2);
639 l.is_longer (0); 670 l.is_longer (0);
640 l.touch (); 671 l.touch ();
641 } 672 }
642 673
674 // scroll everything up 'count' lines
675 term_start = (term_start + count) % total_rows;
676
677 // now copy lines below the scroll region bottom to the
678 // bottom of the screen again, so they look as if they
679 // hadn't moved.
680 for (int i = nrow; --i > row2; )
681 {
682 line_t &l1 = ROW(i - count);
683 line_t &l2 = ROW(i);
684
685 ::swap (l1, l2);
686 l2.touch ();
687 }
688
643 // erase newly scrolled-in lines 689 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 690 for (int i = count; i--; )
645 { 691 {
646 line_t &l = ROW(nrow - 1 - i); 692 line_t &l = ROW(row2 - i);
647 693
648 // optimize if already cleared, can be significant on slow machines 694 // optimise if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem 695 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 696 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 { 697 {
652 scr_blank_line (l, 0, l.l, rstyle); 698 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0; 699 l.l = 0;
… …
655 } 701 }
656 else 702 else
657 scr_blank_screen_mem (l, rstyle); 703 scr_blank_screen_mem (l, rstyle);
658 } 704 }
659 705
660 // now copy lines below the scroll region bottom to the
661 // bottom of the screen again, so they look as if they
662 // hadn't moved.
663 for (int i = nrow; --i > row2; )
664 {
665 line_t &l1 = ROW(i - count);
666 line_t &l2 = ROW(i);
667
668 ::swap (l1, l2);
669 l2.touch ();
670 }
671
672 // move and/or clear selection, if any 706 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 707 if (selection.op && current_screen == selection.screen
708 && selection.beg.row <= row2)
674 { 709 {
675 selection.beg.row -= count; 710 selection.beg.row -= count;
676 selection.end.row -= count; 711 selection.end.row -= count;
677 selection.mark.row -= count; 712 selection.mark.row -= count;
678 713
679 if (selection.beg.row < top_row 714 selection_check (0);
680 || selection.end.row < top_row
681 || selection.mark.row < top_row)
682 {
683 CLEAR_ALL_SELECTION ();
684 selection.op = SELECTION_CLEAR;
685 }
686 } 715 }
687 716
688 // finally move the view window, if desired 717 // finally move the view window, if desired
689 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 719 && view_start != 0
691 && view_start != -saveLines) 720 && view_start != -saveLines)
692 scr_page (UP, count); 721 scr_page (count);
693 722
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
695 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 724 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
696 } 725 }
697 else 726 else
… …
712 { 741 {
713 /* move selected region too */ 742 /* move selected region too */
714 selection.beg.row -= count; 743 selection.beg.row -= count;
715 selection.end.row -= count; 744 selection.end.row -= count;
716 selection.mark.row -= count; 745 selection.mark.row -= count;
717 746
718 selection_check (0); 747 selection_check (0);
719 } 748 }
720 } 749 }
721 750
722 // use a simple and robust scrolling algorithm, this 751 // use a simple and robust scrolling algorithm, this
723 // part of scr_scroll_text is not time-critical. 752 // part of scr_scroll_text is not time-critical.
724 753
754 // sever line above scroll region
755 if (row1)
756 {
757 line_t &l = ROW(row1 - 1);
758 l.is_longer (0);
759 l.touch ();
760 }
761
725 int rows = row2 - row1 + 1; 762 int rows = row2 - row1 + 1;
726 763
727 min_it (count, rows); 764 min_it (count, rows);
728 765
729 line_t *temp_buf = row_buf + total_rows; 766 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
730 767
731 for (int row = 0; row < rows; row++) 768 for (int row = 0; row < rows; row++)
732 { 769 {
733 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 770 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
734 771
… …
736 scr_blank_screen_mem (temp_buf [row], rstyle); 773 scr_blank_screen_mem (temp_buf [row], rstyle);
737 } 774 }
738 775
739 for (int row = 0; row < rows; row++) 776 for (int row = 0; row < rows; row++)
740 ROW(row1 + row) = temp_buf [row]; 777 ROW(row1 + row) = temp_buf [row];
778
779 // sever bottommost line
780 {
781 line_t &l = ROW(row2);
782 l.is_longer (0);
783 l.touch ();
784 }
741 } 785 }
742 786
743 return count; 787 return count;
744} 788}
745 789
746/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
747/* 791/*
748 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
749 */ 793 */
750void 794void ecb_hot
751rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 795rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
752{ 796{
753 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
754 return; 798 return;
755 799
756 unsigned char checksel; 800 bool checksel;
757 unicode_t c; 801 unicode_t c;
758 int ncol = this->ncol; 802 int ncol = this->ncol;
759 const wchar_t *strend = str + len; 803 const wchar_t *strend = str + len;
760 804
761 want_refresh = 1; 805 want_refresh = 1;
… …
774 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 818 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
775 screen.cur.row -= minlines; 819 screen.cur.row -= minlines;
776 } 820 }
777 } 821 }
778 822
779#ifdef DEBUG_STRICT
780 assert (screen.cur.col < ncol); 823 assert (screen.cur.col < ncol);
781 assert (screen.cur.row < nrow 824 assert (screen.cur.row < nrow
782 && screen.cur.row >= top_row); 825 && screen.cur.row >= top_row);
783#endif
784 int row = screen.cur.row; 826 int row = screen.cur.row;
785 827
786 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 828 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
787 829
788 line_t *line = &ROW(row); 830 line_t *line = &ROW(row);
789 831
790 while (str < strend) 832 while (str < strend)
791 { 833 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 834 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 835
794 if (c < 0x20) 836 if (ecb_unlikely (c < 0x20))
795 if (c == C0_LF) 837 if (c == C0_LF)
796 { 838 {
797 max_it (line->l, screen.cur.col); 839 max_it (line->l, screen.cur.col);
798 840
799 screen.flags &= ~Screen_WrapNext; 841 screen.flags &= ~Screen_WrapNext;
… …
818 { 860 {
819 scr_tab (1, true); 861 scr_tab (1, true);
820 continue; 862 continue;
821 } 863 }
822 864
865 if (ecb_unlikely (
823 if (checksel /* see if we're writing within selection */ 866 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 867 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 868 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
869 ))
826 { 870 {
827 checksel = 0; 871 checksel = 0;
828 /* 872 /*
829 * If we wrote anywhere in the selected area, kill the selection 873 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 874 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 875 * should be a similar check.
832 */ 876 */
833 CLEAR_SELECTION (); 877 CLEAR_SELECTION ();
834 } 878 }
835 879
836 if (screen.flags & Screen_WrapNext) 880 if (ecb_unlikely (screen.flags & Screen_WrapNext))
837 { 881 {
838 scr_do_wrap (); 882 scr_do_wrap ();
839 883
840 line->l = ncol; 884 line->l = ncol;
841 line->is_longer (1); 885 line->is_longer (1);
842 886
843 row = screen.cur.row; 887 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 888 line = &ROW(row); /* _must_ refresh */
845 } 889 }
846 890
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 891 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 892 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 893 c = 0xfffd;
850 894
851 // rely on wcwidth to tell us the character width, do wcwidth before 895 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 896 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 897 // drawing characters below as they might be invalid in the current
854 // locale. 898 // locale.
855 int width = WCWIDTH (c); 899 int width = WCWIDTH (c);
856 900
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 901 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 902 {
859 // vt100 special graphics and line drawing 903 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 904 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 905 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 906 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 919 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 920 width = 1; // vt100 line drawing characters are always single-width
877 } 921 }
878 } 922 }
879 923
880 if (screen.flags & Screen_Insert) 924 if (ecb_unlikely (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 925 scr_insdel_chars (width, INSERT);
882 926
883 if (width != 0) 927 if (width != 0)
884 { 928 {
885#if !UNICODE_3 929#if !UNICODE_3
… …
890# else 934# else
891 c = 0xfffd; 935 c = 0xfffd;
892# endif 936# endif
893#endif 937#endif
894 938
939 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
940
941 // if the character doesn't fit into the remaining columns...
942 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
943 {
944 if (screen.flags & Screen_Autowrap)
945 {
946 // ... artificially enlargen the previous one
947 c = NOCHAR;
948 // and try the same character next loop iteration
949 --str;
950 }
951 else
952 screen.cur.col = ncol - width;
953 }
954
895 // nuke the character at this position, if required 955 // nuke the character at this position, if required
956 // due to wonderful coincidences everywhere else in this loop
957 // we never have to check for overwriting a wide char itself,
958 // only its tail.
896 if (line->t[screen.cur.col] == NOCHAR 959 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
897 || (screen.cur.col < ncol - 1 960 scr_kill_char (*line, screen.cur.col);
898 && line->t[screen.cur.col + 1] == NOCHAR))
899 {
900 int col = screen.cur.col;
901
902 // find begin
903 while (col > 0 && line->t[col] == NOCHAR)
904 col--;
905
906 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
907
908 // found begin, nuke
909 do {
910 line->t[col] = ' ';
911 line->r[col] = rend;
912 col++;
913 } while (col < ncol && line->t[col] == NOCHAR);
914 }
915
916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917
918 // if the character doesn't fit into the remaining columns...
919 if (screen.cur.col > ncol - width && ncol >= width)
920 {
921 // ...output spaces
922 c = ' ';
923 // and try the same character next loop iteration
924 --str;
925 }
926 961
927 line->touch (); 962 line->touch ();
928 963
929 do 964 do
930 { 965 {
931 line->t[screen.cur.col] = c; 966 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 967 line->r[screen.cur.col] = rend;
933 968
934 if (screen.cur.col < ncol - 1) 969 if (ecb_likely (screen.cur.col < ncol - 1))
935 screen.cur.col++; 970 screen.cur.col++;
936 else 971 else
937 { 972 {
938 line->l = ncol; 973 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 974 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 975 screen.flags |= Screen_WrapNext;
941 break; 976
977 goto end_of_line;
942 } 978 }
943 979
944 c = NOCHAR; 980 c = NOCHAR;
945 } 981 }
946 while (--width > 0); 982 while (ecb_unlikely (--width > 0));
947 983
948 // pad with spaces when overwriting wide character with smaller one 984 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 985 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 986 {
951 line->touch (); 987 line->t[c] = ' ';
988 line->r[c] = rend;
989 }
952 990
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 991end_of_line:
992 ;
993 }
994#if ENABLE_COMBINING
995 else // width == 0
996 {
997 if (c != 0xfeff) // ignore BOM
998 {
999 // handle combining characters
1000 // we just tag the accent on the previous on-screen character.
1001 // this is arguably not correct, but also arguably not wrong.
1002 // we don't handle double-width characters nicely yet.
1003 line_t *linep;
1004 text_t *tp;
1005 rend_t *rp;
1006
1007 if (screen.cur.col > 0)
954 { 1008 {
955 line->t[c] = ' ';
956 line->r[c] = rend; 1009 linep = line;
1010 tp = line->t + screen.cur.col - 1;
1011 rp = line->r + screen.cur.col - 1;
957 } 1012 }
1013 else if (screen.cur.row > 0
1014 && ROW(screen.cur.row - 1).is_longer ())
1015 {
1016 linep = &ROW(screen.cur.row - 1);
1017 tp = linep->t + ncol - 1;
1018 rp = linep->r + ncol - 1;
1019 }
1020 else
1021 continue;
1022
1023 linep->touch ();
1024
1025 while (*tp == NOCHAR && tp > linep->t)
1026 tp--, rp--;
1027
1028 // first try to find a precomposed character
1029 unicode_t n = rxvt_compose (*tp, c);
1030 if (n == NOCHAR)
1031 n = rxvt_composite.compose (*tp, c);
1032
1033 *tp = n;
1034 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
958 } 1035 }
959 } 1036 }
960 else // width == 0
961 {
962#if ENABLE_COMBINING
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 {
973 linep = line;
974 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1;
976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
999#endif 1037#endif
1000 }
1001 } 1038 }
1002 1039
1003 max_it (line->l, screen.cur.col); 1040 max_it (line->l, screen.cur.col);
1004 1041
1005#ifdef DEBUG_STRICT
1006 assert (screen.cur.row >= 0); 1042 assert (screen.cur.row >= 0);
1007#endif
1008} 1043}
1009 1044
1010/* ------------------------------------------------------------------------- */ 1045/* ------------------------------------------------------------------------- */
1011/* 1046/*
1012 * Process Backspace. Move back the cursor back a position, wrap if have to 1047 * Process Backspace. Move back the cursor back a position, wrap if have to
1013 * XTERM_SEQ: CTRL-H 1048 * XTERM_SEQ: CTRL-H
1014 */ 1049 */
1015void 1050void
1016rxvt_term::scr_backspace () NOTHROW 1051rxvt_term::scr_backspace () NOTHROW
1017{ 1052{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1053 if (screen.cur.col == 0)
1021 { 1054 {
1022 if (screen.cur.row > 0) 1055 if (screen.cur.row > 0)
1023 { 1056 {
1024#ifdef TERMCAP_HAS_BW 1057#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1058 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1059 --screen.cur.row;
1027 return; 1060
1061 want_refresh = 1;
1028#endif 1062#endif
1029 } 1063 }
1030 } 1064 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1065 else if (screen.flags & Screen_WrapNext)
1066 screen.flags &= ~Screen_WrapNext;
1067 else
1032 scr_gotorc (0, -1, RELATIVE); 1068 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1069}
1036 1070
1037/* ------------------------------------------------------------------------- */ 1071/* ------------------------------------------------------------------------- */
1038/* 1072/*
1039 * Process Horizontal Tab 1073 * Process Horizontal Tab
… …
1062 x = i; 1096 x = i;
1063 1097
1064 if (!--count) 1098 if (!--count)
1065 break; 1099 break;
1066 } 1100 }
1067 else 1101 else
1068 ht &= l.t[i] == ' ' 1102 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1103 && RS_SAME (l.r[i], base_rend);
1070 1104
1071 if (count) 1105 if (count)
1072 x = ncol - 1; 1106 x = ncol - 1;
… …
1115 * XTERM_SEQ: ESC 6 1149 * XTERM_SEQ: ESC 6
1116 * Move cursor left in row. If we're at the left boundary, shift everything 1150 * Move cursor left in row. If we're at the left boundary, shift everything
1117 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1118 */ 1152 */
1119#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1120void 1154void ecb_cold
1121rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () NOTHROW
1122{ 1156{
1123 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1125 else 1159 else
… …
1132 * XTERM_SEQ: ESC 9 1166 * XTERM_SEQ: ESC 9
1133 * Move cursor right in row. If we're at the right boundary, shift everything 1167 * Move cursor right in row. If we're at the right boundary, shift everything
1134 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1135 */ 1169 */
1136#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1137void 1171void ecb_cold
1138rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () NOTHROW
1139{ 1173{
1140 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1142 else 1176 else
… …
1188 } 1222 }
1189 } 1223 }
1190 else 1224 else
1191 { 1225 {
1192 if (screen.flags & Screen_Relative) 1226 if (screen.flags & Screen_Relative)
1227 {
1193 { /* relative origin mode */ 1228 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1229 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1230 min_it (screen.cur.row, screen.bscroll);
1196 } 1231 }
1197 else 1232 else
1198 screen.cur.row = row; 1233 screen.cur.row = row;
… …
1206 * direction should be UP or DN 1241 * direction should be UP or DN
1207 */ 1242 */
1208void 1243void
1209rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1210{ 1245{
1211 int dirn;
1212
1213 want_refresh = 1; 1246 want_refresh = 1;
1214 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1215 1248
1216 dirn = ((direction == UP) ? 1 : -1);
1217
1218 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1219 1250
1220 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1221 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1222 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1223 else 1254 else
1224 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1225 1256
1226 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1227 selection_check (0); 1258 selection_check (0);
1228} 1259}
1229 1260
… …
1231/* 1262/*
1232 * Erase part or whole of a line 1263 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1264 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1265 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1266 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1267 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1268 */
1237void 1269void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1270rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1271{
1240 unsigned int col, num; 1272 unsigned int col, num;
… …
1249 line.touch (); 1281 line.touch ();
1250 line.is_longer (0); 1282 line.is_longer (0);
1251 1283
1252 switch (mode) 1284 switch (mode)
1253 { 1285 {
1286 case 3:
1287 if (screen.flags & Screen_WrapNext)
1288 return;
1289
1290 /* fall through */
1291
1254 case 0: /* erase to end of line */ 1292 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1293 col = screen.cur.col;
1256 num = ncol - col; 1294 num = ncol - col;
1257 min_it (line.l, col); 1295 min_it (line.l, col);
1296
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1297 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1298 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1299 CLEAR_SELECTION ();
1261 break; 1300 break;
1301
1262 case 1: /* erase to beginning of line */ 1302 case 1: /* erase to beginning of line */
1263 col = 0; 1303 col = 0;
1264 num = screen.cur.col + 1; 1304 num = screen.cur.col + 1;
1305
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1306 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1307 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1308 CLEAR_SELECTION ();
1268 break; 1309 break;
1310
1269 case 2: /* erase whole line */ 1311 case 2: /* erase whole line */
1270 col = 0; 1312 col = 0;
1271 num = ncol; 1313 num = ncol;
1272 line.l = 0; 1314 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1315 if (selection.beg.row <= screen.cur.row
… …
1281 scr_blank_line (line, col, num, rstyle); 1323 scr_blank_line (line, col, num, rstyle);
1282} 1324}
1283 1325
1284/* ------------------------------------------------------------------------- */ 1326/* ------------------------------------------------------------------------- */
1285/* 1327/*
1286 * Erase part of whole of the screen 1328 * Erase part or whole of the screen
1287 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1288 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1289 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1290 */ 1332 */
1291void 1333void
… …
1300 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1301 1343
1302 switch (mode) 1344 switch (mode)
1303 { 1345 {
1304 case 0: /* erase to end of screen */ 1346 case 0: /* erase to end of screen */
1305 selection_check (1);
1306 scr_erase_line (0); 1347 scr_erase_line (0);
1307 row = screen.cur.row + 1; /* possible OOB */ 1348 row = screen.cur.row + 1; /* possible OOB */
1308 num = nrow - row; 1349 num = nrow - row;
1309 break; 1350 break;
1310 case 1: /* erase to beginning of screen */ 1351 case 1: /* erase to beginning of screen */
1311 selection_check (3);
1312 scr_erase_line (1); 1352 scr_erase_line (1);
1313 row = 0; 1353 row = 0;
1314 num = screen.cur.row; 1354 num = screen.cur.row;
1315 break; 1355 break;
1316 case 2: /* erase whole screen */ 1356 case 2: /* erase whole screen */
1317 selection_check (3);
1318 row = 0; 1357 row = 0;
1319 num = nrow; 1358 num = nrow;
1320 break; 1359 break;
1321 default: 1360 default:
1322 return; 1361 return;
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1370 if (row >= nrow) /* Out Of Bounds */
1332 return; 1371 return;
1333 1372
1334 min_it (num, nrow - row); 1373 min_it (num, nrow - row);
1335 1374
1336 if (rstyle & (RS_RVid | RS_Uline)) 1375 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1376 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1377 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1378 {
1340 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1380
1381 if (mapped)
1382 XClearArea (dpy, vt, 0,
1383 Row2Pixel (row - view_start), (unsigned int)vt_width,
1384 (unsigned int)Height2Pixel (num), False);
1342 } 1385 }
1343 else 1386 else
1344 { 1387 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
1389
1390 if (mapped)
1391 {
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1392 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1394 XFillRectangle (dpy, vt, gc,
1395 0, Row2Pixel (row - view_start),
1396 (unsigned int)vt_width,
1397 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1398 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1400 }
1351 } 1401 }
1352 1402
1353 for (; num--; row++) 1403 for (; num--; row++)
1354 { 1404 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1405 scr_blank_screen_mem (ROW(row), rstyle);
1406
1407 if (row - view_start < nrow)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1408 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1357 } 1409 }
1358} 1410}
1359 1411
1360#if !ENABLE_MINIMAL 1412#if !ENABLE_MINIMAL
1361void 1413void
… …
1371/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1372/* 1424/*
1373 * Fill the screen with `E's 1425 * Fill the screen with `E's
1374 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1375 */ 1427 */
1376void 1428void ecb_cold
1377rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () NOTHROW
1378{ 1430{
1379 rend_t fs; 1431 rend_t fs;
1380 1432
1381 want_refresh = 1; 1433 want_refresh = 1;
1382 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
1383 1435
1384 num_scr_allow = 0; 1436 num_scr_allow = 0;
1385 selection_check (3); 1437
1438 row_col_t pos;
1439 pos.row = pos.col = 0;
1440 if (ROWCOL_IS_AFTER (selection.end, pos))
1441 CLEAR_SELECTION ();
1386 1442
1387 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1443 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1388 for (int row = nrow; row--; ) 1444 for (int row = nrow; row--; )
1389 { 1445 {
1390 line_t &line = ROW(row); 1446 line_t &line = ROW(row);
… …
1435 * Insert/Delete <count> characters from the current position 1491 * Insert/Delete <count> characters from the current position
1436 */ 1492 */
1437void 1493void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1494rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1495{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1496 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1497 ZERO_SCROLLBACK ();
1445 1498
1446 if (count <= 0) 1499 if (count <= 0)
1447 return; 1500 return;
… …
1449 scr_do_wrap (); 1502 scr_do_wrap ();
1450 1503
1451 selection_check (1); 1504 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1505 min_it (count, ncol - screen.cur.col);
1453 1506
1454 row = screen.cur.row; 1507 int row = screen.cur.row;
1455 1508
1456 line_t *line = &ROW(row); 1509 line_t *line = &ROW(row);
1457 1510
1458 line->touch (); 1511 line->touch ();
1459 line->is_longer (0); 1512 line->is_longer (0);
1460 1513
1514 // nuke wide spanning the start
1515 if (line->t[screen.cur.col] == NOCHAR)
1516 scr_kill_char (*line, screen.cur.col);
1517
1461 switch (insdel) 1518 switch (insdel)
1462 { 1519 {
1463 case INSERT: 1520 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1521 line->l = min (line->l + count, ncol);
1522
1523 if (line->t[screen.cur.col] == NOCHAR)
1524 scr_kill_char (*line, screen.cur.col);
1525
1526 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1527 {
1466 line->t[col] = line->t[col - count]; 1528 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1529 line->r[col] = line->r[col - count];
1468 } 1530 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1531
1472 if (selection.op && current_screen == selection.screen 1532 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1533 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1534 {
1475 if (selection.end.row != screen.cur.row 1535 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1536 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1537 CLEAR_SELECTION ();
1478 else 1538 else
1539 {
1479 { /* shift selection */ 1540 /* shift selection */
1480 selection.beg.col += count; 1541 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1542 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1543 selection.end.col += count;
1483 } 1544 }
1484 } 1545 }
… …
1489 case ERASE: 1550 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1551 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1552 selection_check (1);
1492 screen.cur.col -= count; 1553 screen.cur.col -= count;
1493 1554
1494 line->l = max (line->l - count, 0); 1555 // nuke wide char after the end
1556 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1557 scr_kill_char (*line, screen.cur.col + count);
1558
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1559 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1560 break;
1497 1561
1498 case DELETE: 1562 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1563 line->l = max (line->l - count, 0);
1500 1564
1565 // nuke wide char spanning the end
1566 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1567 scr_kill_char (*line, screen.cur.col + count);
1568
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1569 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1570 {
1503 line->t[col] = line->t[col + count]; 1571 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1572 line->r[col] = line->r[col + count];
1505 } 1573 }
1506 1574
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1575 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1576
1510 if (selection.op && current_screen == selection.screen 1577 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1578 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1579 {
1513 if (selection.end.row != screen.cur.row 1580 if (selection.end.row != screen.cur.row
… …
1530/* ------------------------------------------------------------------------- */ 1597/* ------------------------------------------------------------------------- */
1531/* 1598/*
1532 * Set the scrolling region 1599 * Set the scrolling region
1533 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1534 */ 1601 */
1535void 1602void ecb_cold
1536rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1603rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1537{ 1604{
1538 max_it (top, 0); 1605 max_it (top, 0);
1539 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1540 1607
… …
1550/* 1617/*
1551 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1552 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1553 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1554 */ 1621 */
1555void 1622void ecb_cold
1556rxvt_term::scr_cursor_visible (int mode) NOTHROW 1623rxvt_term::scr_cursor_visible (int mode) NOTHROW
1557{ 1624{
1558 want_refresh = 1; 1625 want_refresh = 1;
1559 1626
1560 if (mode) 1627 if (mode)
… …
1567/* 1634/*
1568 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1569 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1570 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1571 */ 1638 */
1572void 1639void ecb_cold
1573rxvt_term::scr_autowrap (int mode) NOTHROW 1640rxvt_term::scr_autowrap (int mode) NOTHROW
1574{ 1641{
1575 if (mode) 1642 if (mode)
1576 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1577 else 1644 else
… …
1586 * Relative mode: line numbers are relative to top margin of scrolling region 1653 * Relative mode: line numbers are relative to top margin of scrolling region
1587 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1588 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1589 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1590 */ 1657 */
1591void 1658void ecb_cold
1592rxvt_term::scr_relative_origin (int mode) NOTHROW 1659rxvt_term::scr_relative_origin (int mode) NOTHROW
1593{ 1660{
1594 if (mode) 1661 if (mode)
1595 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1596 else 1663 else
… …
1603/* 1670/*
1604 * Set insert/replace mode 1671 * Set insert/replace mode
1605 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1606 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1607 */ 1674 */
1608void 1675void ecb_cold
1609rxvt_term::scr_insert_mode (int mode) NOTHROW 1676rxvt_term::scr_insert_mode (int mode) NOTHROW
1610{ 1677{
1611 if (mode) 1678 if (mode)
1612 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1613 else 1680 else
… …
1619 * Set/Unset tabs 1686 * Set/Unset tabs
1620 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1621 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1622 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1623 */ 1690 */
1624void 1691void ecb_cold
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1692rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1693{
1627 if (mode < 0) 1694 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1695 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1697 tabs [screen.cur.col] = !!mode;
1631} 1698}
1632 1699
1633/* ------------------------------------------------------------------------- */ 1700/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1715 if (rvideo_state != on)
1649 { 1716 {
1650 rvideo_state = on; 1717 rvideo_state = on;
1651 1718
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1719 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1720#ifdef HAVE_IMG
1654 if (bgPixmap.pixmap == None) 1721 if (bg_img == 0)
1655#endif
1656#if TRANSPARENT
1657 if (!option (Opt_transparent) || am_transparent == 0)
1658#endif 1722#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1723 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1724
1661 XGCValues gcvalue; 1725 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1726 gcvalue.foreground = pix_colors[Color_fg];
… …
1671/* ------------------------------------------------------------------------- */ 1735/* ------------------------------------------------------------------------- */
1672/* 1736/*
1673 * Report current cursor position 1737 * Report current cursor position
1674 * XTERM_SEQ: Report position: ESC [ 6 n 1738 * XTERM_SEQ: Report position: ESC [ 6 n
1675 */ 1739 */
1676void 1740void ecb_cold
1677rxvt_term::scr_report_position () NOTHROW 1741rxvt_term::scr_report_position () NOTHROW
1678{ 1742{
1679 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1743 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1680} 1744}
1681 1745
… …
1684 * ------------------------------------------------------------------------- */ 1748 * ------------------------------------------------------------------------- */
1685 1749
1686/* 1750/*
1687 * Set font style 1751 * Set font style
1688 */ 1752 */
1689void 1753void ecb_cold
1690rxvt_term::set_font_style () NOTHROW 1754rxvt_term::set_font_style () NOTHROW
1691{ 1755{
1692#if 0 1756#if 0
1693 switch (charsets [screen.charset]) 1757 switch (charsets [screen.charset])
1694 { 1758 {
… …
1716 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1780 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1717 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1781 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1718 * XTERM_SEQ: Invoke G2 character set: ESC N 1782 * XTERM_SEQ: Invoke G2 character set: ESC N
1719 * XTERM_SEQ: Invoke G3 character set: ESC O 1783 * XTERM_SEQ: Invoke G3 character set: ESC O
1720 */ 1784 */
1721void 1785void ecb_cold
1722rxvt_term::scr_charset_choose (int set) NOTHROW 1786rxvt_term::scr_charset_choose (int set) NOTHROW
1723{ 1787{
1724 screen.charset = set; 1788 screen.charset = set;
1725 set_font_style (); 1789 set_font_style ();
1726} 1790}
… …
1747 * ------------------------------------------------------------------------- */ 1811 * ------------------------------------------------------------------------- */
1748 1812
1749/* 1813/*
1750 * refresh matching text. 1814 * refresh matching text.
1751 */ 1815 */
1752bool 1816bool ecb_cold
1753rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1817rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1754{ 1818{
1755 bool found = false; 1819 bool found = false;
1756 1820
1757 for (int i = 0; i < nrow; i++) 1821 for (int i = 0; i < nrow; i++)
… …
1776 PART_BEG = 0, 1840 PART_BEG = 0,
1777 PART_END, 1841 PART_END,
1778 RC_COUNT 1842 RC_COUNT
1779}; 1843};
1780 1844
1781void 1845void ecb_hot
1782rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1846rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1783{ 1847{
1784 int i; 1848 int i;
1785 row_col_t rc[RC_COUNT]; 1849 row_col_t rc[RC_COUNT];
1786 1850
… …
1823 * Refresh the entire screen 1887 * Refresh the entire screen
1824 */ 1888 */
1825void 1889void
1826rxvt_term::scr_touch (bool refresh) NOTHROW 1890rxvt_term::scr_touch (bool refresh) NOTHROW
1827{ 1891{
1828 scr_expose (0, 0, width, height, refresh); 1892 scr_expose (0, 0, vt_width, vt_height, refresh);
1829} 1893}
1830 1894
1831/* ------------------------------------------------------------------------- */ 1895/* ------------------------------------------------------------------------- */
1832/* 1896/*
1833 * Move the display so that the line represented by scrollbar value Y is at 1897 * Move the display so that the line represented by scrollbar value Y is at
1834 * the top of the screen 1898 * the top of the screen
1835 */ 1899 */
1836void 1900void
1837rxvt_term::scr_move_to (int y, int len) NOTHROW 1901rxvt_term::scr_move_to (int y, int len) NOTHROW
1838{ 1902{
1839 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1903 // lerp (y, 0, len, top_row, nrow - 1)
1904 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1840} 1905}
1841 1906
1842/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1843/* 1908/*
1844 * Page the screen up/down nlines 1909 * Page the screen up/down nlines
1845 * direction should be UP or DN 1910 * direction should be UP or DN
1846 */ 1911 */
1847bool 1912bool
1848rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1913rxvt_term::scr_page (int nlines) NOTHROW
1849{ 1914{
1850 int new_view_start =
1851 direction == UP ? view_start - nlines
1852 : view_start + nlines;
1853
1854 return scr_changeview (new_view_start); 1915 return scr_changeview (view_start - nlines);
1855} 1916}
1856 1917
1857bool 1918bool
1858rxvt_term::scr_changeview (int new_view_start) NOTHROW 1919rxvt_term::scr_changeview (int new_view_start) NOTHROW
1859{ 1920{
… …
1871 return true; 1932 return true;
1872} 1933}
1873 1934
1874#ifndef NO_BELL 1935#ifndef NO_BELL
1875void 1936void
1876rxvt_term::bell_cb (time_watcher &w) 1937rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1938{
1878 rvideo_bell = false; 1939 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1940 scr_rvideo_mode (rvideo_mode);
1941 refresh_check ();
1880} 1942}
1881#endif 1943#endif
1882 1944
1883/* ------------------------------------------------------------------------- */ 1945/* ------------------------------------------------------------------------- */
1884void 1946void
… …
1888 1950
1889# ifndef NO_MAPALERT 1951# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1952# ifdef MAPALERT_OPTION
1891 if (option (Opt_mapAlert)) 1953 if (option (Opt_mapAlert))
1892# endif 1954# endif
1893 XMapWindow (dpy, parent[0]); 1955 XMapWindow (dpy, parent);
1956# endif
1957
1958# if ENABLE_FRILLS
1959 if (option (Opt_urgentOnBell))
1960 set_urgency (1);
1894# endif 1961# endif
1895 1962
1896 if (option (Opt_visualBell)) 1963 if (option (Opt_visualBell))
1897 { 1964 {
1898 rvideo_bell = true; 1965 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1966 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1967 flush ();
1901 1968
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1969 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1970 }
1904 else 1971 else
1905 XBell (dpy, 0); 1972 XBell (dpy, 0);
1906 1973 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1907#endif 1974#endif
1908} 1975}
1909 1976
1910/* ------------------------------------------------------------------------- */ 1977/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1978void ecb_cold
1912void
1913rxvt_term::scr_printscreen (int fullhist) NOTHROW 1979rxvt_term::scr_printscreen (int fullhist) NOTHROW
1914{ 1980{
1915#ifdef PRINTPIPE 1981#ifdef PRINTPIPE
1916 int nrows, row_start; 1982 int nrows, row_start;
1917 FILE *fd; 1983 FILE *fd = popen_printer ();
1918 1984
1919 if ((fd = popen_printer ()) == NULL) 1985 if (!fd)
1920 return; 1986 return;
1921 1987
1922 if (fullhist) 1988 if (fullhist)
1923 { 1989 {
1924 nrows = nrow - top_row; 1990 nrows = nrow - top_row;
… …
1930 row_start = view_start; 1996 row_start = view_start;
1931 } 1997 }
1932 1998
1933 wctomb (0, 0); 1999 wctomb (0, 0);
1934 2000
1935 for (int r1 = 0; r1 < nrows; r1++) 2001 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1936 { 2002 {
1937 text_t *tp = ROW(r1).t; 2003 text_t *tp = ROW(r1).t;
1938 int len = ROW(r1).l; 2004 int len = ROW(r1).l;
1939 2005
1940 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2006 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1966/* 2032/*
1967 * Refresh the screen 2033 * Refresh the screen
1968 * drawn_text/drawn_rend contain the screen information before the update. 2034 * drawn_text/drawn_rend contain the screen information before the update.
1969 * screen.text/screen.rend contain what the screen will change to. 2035 * screen.text/screen.rend contain what the screen will change to.
1970 */ 2036 */
1971void 2037void ecb_hot
1972rxvt_term::scr_refresh () NOTHROW 2038rxvt_term::scr_refresh () NOTHROW
1973{ 2039{
1974 unsigned char have_bg,
1975 showcursor; /* show the cursor */
1976 int16_t col, row, /* column/row we're processing */ 2040 int16_t col, row, /* column/row we're processing */
1977 ocrow; /* old cursor row */ 2041 ocrow; /* old cursor row */
1978 int i; /* tmp */ 2042 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */
1981#endif
1982 rend_t *crp; // cursor rendition pointer
1983 rend_t ccol1, /* Cursor colour */ 2043 rend_t ccol1, /* Cursor colour */
1984 ccol2; /* Cursor colour2 */ 2044 ccol2; /* Cursor colour2 */
2045 rend_t cur_rend;
2046 int cur_col;
2047 int cursorwidth;
1985 2048
1986 want_refresh = 0; /* screen is current */ 2049 want_refresh = 0; /* screen is current */
1987 2050
1988 if (refresh_type == NO_REFRESH || !mapped) 2051 if (refresh_type == NO_REFRESH || !mapped)
1989 return; 2052 return;
1990 2053
1991 /* 2054 /*
1992 * A: set up vars 2055 * A: set up vars
1993 */ 2056 */
1994 have_bg = 0;
1995 refresh_count = 0; 2057 refresh_count = 0;
1996 2058
1997#if XPM_BACKGROUND 2059 unsigned int old_screen_flags = screen.flags;
1998 have_bg |= bgPixmap.pixmap != None; 2060 bool have_bg = 0;
1999#endif 2061#ifdef HAVE_IMG
2000#if TRANSPARENT 2062 have_bg = bg_img != 0;
2001 have_bg |= option (Opt_transparent) && am_transparent;
2002#endif 2063#endif
2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2004 2065
2005 /* 2066 /*
2006 * B: reverse any characters which are selected 2067 * B: reverse any characters which are selected
2007 */ 2068 */
2008 scr_reverse_selection (); 2069 scr_reverse_selection ();
2009 2070
2071 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2072#if ENABLE_OVERLAY
2073 scr_swap_overlay ();
2074#endif
2075
2076 bool showcursor = screen.flags & Screen_VisibleCursor;
2077
2010 /* 2078 /*
2011 * C: set the cursor character (s) 2079 * C: set the cursor character (s)
2012 */ 2080 */
2013 { 2081 {
2014 unsigned char setoldcursor;
2015
2016 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2083 if (hidden_cursor)
2019 showcursor = 0; 2084 showcursor = 0;
2020#endif 2085#endif
2021 2086
… …
2024 int col = screen.cur.col; 2089 int col = screen.cur.col;
2025 2090
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2091 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2092 col--;
2028 2093
2094 cursorwidth = 1;
2095 while (col + cursorwidth < ncol
2096 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2097 cursorwidth++;
2098
2029 crp = &ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col;
2030 2101
2031#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
2032 cc1 = *crp & (RS_fgMask | RS_bgMask);
2033 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2034 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2035 else 2105 else
2036#endif 2106#endif
2037#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2049 ccol2 = bgcolor_of (rstyle); 2119 ccol2 = bgcolor_of (rstyle);
2050#else 2120#else
2051 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2052#endif 2122#endif
2053 2123
2054 if (showcursor && focus) 2124 if (focus && cursor_type == 0)
2055 { 2125 {
2056 if (option (Opt_cursorUnderline)) 2126 rend_t rend = cur_rend;
2057 *crp ^= RS_Uline; 2127
2058 else
2059 {
2060 *crp ^= RS_RVid; 2128 rend ^= RS_RVid;
2061 *crp = SET_FGCOLOR (*crp, ccol1); 2129 rend = SET_FGCOLOR (rend, ccol1);
2062 *crp = SET_BGCOLOR (*crp, ccol2); 2130 rend = SET_BGCOLOR (rend, ccol2);
2063 } 2131
2132 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2064 } 2133 }
2065 } 2134 }
2066 2135
2067 /* make sure no outline cursor is left around */ 2136 /* make sure no outline cursor is left around */
2068 setoldcursor = 0; 2137 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2069 if (ocrow != -1) 2138 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2139
2140 // save the current cursor coordinates if the cursor is visible
2141 // and either the window is unfocused or the cursor style is
2142 // underline or vertical bar, so as to clear the outline cursor in
2143 // the next refresh if the cursor moves or becomes invisible
2144 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2070 { 2145 {
2071 if (screen.cur.row - view_start != ocrow 2146 oldcursor.row = screen.cur.row - view_start;
2072 || screen.cur.col != oldcursor.col) 2147 oldcursor.col = screen.cur.col;
2073 {
2074 if (ocrow < nrow
2075 && oldcursor.col < ncol)
2076 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2077
2078 if (focus || !showcursor)
2079 oldcursor.row = -1;
2080 else
2081 setoldcursor = 1;
2082 }
2083 } 2148 }
2084 else if (!focus) 2149 else
2085 setoldcursor = 1;
2086
2087 if (setoldcursor)
2088 {
2089 if (screen.cur.row - view_start >= nrow)
2090 oldcursor.row = -1; 2150 oldcursor.row = -1;
2091 else
2092 {
2093 oldcursor.row = screen.cur.row - view_start;
2094 oldcursor.col = screen.cur.col;
2095 }
2096 }
2097 } 2151 }
2098
2099 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2100#if ENABLE_OVERLAY
2101 scr_swap_overlay ();
2102#endif
2103 2152
2104#ifndef NO_SLOW_LINK_SUPPORT 2153#ifndef NO_SLOW_LINK_SUPPORT
2105 /* 2154 /*
2106 * D: CopyArea pass - very useful for slower links 2155 * D: CopyArea pass - very useful for slower links
2107 * This has been deliberately kept simple. 2156 * This has been deliberately kept simple.
… …
2112 { 2161 {
2113 int16_t nits; 2162 int16_t nits;
2114 int i = num_scr; 2163 int i = num_scr;
2115 int j; 2164 int j;
2116 int len, wlen; 2165 int len, wlen;
2117 dLocal (int, num_scr);
2118 2166
2119 j = nrow; 2167 j = nrow;
2120 wlen = len = -1; 2168 wlen = len = -1;
2121 row = i > 0 ? 0 : j - 1; 2169 row = i > 0 ? 0 : j - 1;
2122 2170
… …
2188 int ypixel = (int)Row2Pixel (row); 2236 int ypixel = (int)Row2Pixel (row);
2189 2237
2190 for (col = 0; col < ncol; col++) 2238 for (col = 0; col < ncol; col++)
2191 { 2239 {
2192 /* compare new text with old - if exactly the same then continue */ 2240 /* compare new text with old - if exactly the same then continue */
2193 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2241 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2194 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2195 || (stp[col] == ' ' /* space w/ no background change */
2196 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2197 continue; 2242 continue;
2198 2243
2199 // redraw one or more characters 2244 // redraw one or more characters
2200 2245
2201 // seek to the beginning of wide characters 2246 // seek to the beginning of wide characters
2202 while (stp[col] == NOCHAR && col > 0) 2247 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2203 --col; 2248 --col;
2204 2249
2205 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2250 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2206 text_t *text = stp + col; 2251 text_t *text = stp + col;
2207 int count = 1; 2252 int count = 1;
2208 2253
2209 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2210 drp[col] = rend; 2255 drp[col] = rend;
… …
2214 for (i = 0; ++col < ncol; ) 2259 for (i = 0; ++col < ncol; )
2215 { 2260 {
2216 if (stp[col] == NOCHAR) 2261 if (stp[col] == NOCHAR)
2217 { 2262 {
2218 dtp[col] = stp[col]; 2263 dtp[col] = stp[col];
2219 drp[col] = rend; 2264 drp[col] = srp[col];
2265
2220 count++; 2266 count++;
2221 i++; 2267 i++;
2222 2268
2223 continue; 2269 continue;
2224 } 2270 }
… …
2244 2290
2245 col--; /* went one too far. move back */ 2291 col--; /* went one too far. move back */
2246 count -= i; /* dump any matching trailing chars */ 2292 count -= i; /* dump any matching trailing chars */
2247 2293
2248 // sometimes we optimize away the trailing NOCHAR's, add them back 2294 // sometimes we optimize away the trailing NOCHAR's, add them back
2249 while (i && text[count] == NOCHAR) 2295 while (ecb_unlikely (i && text[count] == NOCHAR))
2250 count++, i--; 2296 count++, i--;
2251 2297
2252 /* 2298 /*
2253 * Determine the attributes for the string 2299 * Determine the attributes for the string
2254 */ 2300 */
2255 int fore = fgcolor_of (rend); // desired foreground 2301 int fore = fgcolor_of (rend); // desired foreground
2256 int back = bgcolor_of (rend); // desired background 2302 int back = bgcolor_of (rend); // desired background
2257 2303
2258 // only do special processing if any attributes are set, which is unlikely 2304 // only do special processing if any attributes are set, which is unlikely
2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2305 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2260 { 2306 {
2261 bool invert = rend & RS_RVid; 2307 bool invert = rend & RS_RVid;
2262 2308
2263#ifndef NO_BOLD_UNDERLINE_REVERSE 2309#ifndef NO_BOLD_UNDERLINE_REVERSE
2264 if (rend & RS_Bold
2265 && fore == Color_fg) 2310 if (rend & RS_Bold && fore == Color_fg)
2266 { 2311 {
2267 if (ISSET_PIXCOLOR (Color_BD)) 2312 if (ISSET_PIXCOLOR (Color_BD))
2268 fore = Color_BD; 2313 fore = Color_BD;
2269# if !ENABLE_STYLES 2314# if !ENABLE_STYLES
2270 else 2315 else
2271 invert = !invert; 2316 invert = !invert;
2272# endif 2317# endif
2273 } 2318 }
2274 2319
2275 if (rend & RS_Italic 2320 if (rend & RS_Italic && fore == Color_fg)
2276 && fore == Color_fg)
2277 { 2321 {
2278 if (ISSET_PIXCOLOR (Color_IT)) 2322 if (ISSET_PIXCOLOR (Color_IT))
2279 fore = Color_IT; 2323 fore = Color_IT;
2280# if !ENABLE_STYLES 2324# if !ENABLE_STYLES
2281 else 2325 else
… …
2285 2329
2286 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2330 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2287 fore = Color_UL; 2331 fore = Color_UL;
2288#endif 2332#endif
2289 2333
2334#ifdef OPTION_HC
2335 if (rend & RS_Sel)
2336 {
2337 /* invert the column if no highlightColor is set or it is the
2338 * current cursor column */
2339 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2340 && ISSET_PIXCOLOR (Color_HC))
2341 {
2342 if (ISSET_PIXCOLOR (Color_HTC))
2343 fore = Color_HTC;
2344 // if invert is 0 reverse video is set so we use bg color as fg color
2345 else if (!invert)
2346 fore = back;
2347
2348 back = Color_HC;
2349 invert = 0;
2350 }
2351 }
2352#endif
2353
2290 if (invert) 2354 if (invert)
2291 { 2355 {
2292#ifdef OPTION_HC
2293 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2294 || !ISSET_PIXCOLOR (Color_HC))
2295#endif
2296 /* invert the column if no highlightColor is set or it is the
2297 * current cursor column */
2298 ::swap (fore, back); 2356 ::swap (fore, back);
2299#ifdef OPTION_HC
2300 else if (ISSET_PIXCOLOR (Color_HC))
2301 back = Color_HC;
2302#endif
2303 2357
2304#ifndef NO_BOLD_UNDERLINE_REVERSE 2358#ifndef NO_BOLD_UNDERLINE_REVERSE
2305# ifndef OPTION_HC
2306 if (ISSET_PIXCOLOR (Color_RV))
2307 back = Color_RV;
2308# endif
2309 if (fore == back) 2359 if (fore == back)
2310 { 2360 {
2311 fore = Color_bg; 2361 fore = Color_bg;
2312 back = Color_fg; 2362 back = Color_fg;
2313 } 2363 }
… …
2315 } 2365 }
2316 2366
2317#ifdef TEXT_BLINK 2367#ifdef TEXT_BLINK
2318 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2368 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2319 { 2369 {
2320 if (!text_blink_ev.active) 2370 if (!text_blink_ev.is_active ())
2321 { 2371 {
2322 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2372 text_blink_ev.again ();
2323 hidden_text = 0; 2373 hidden_text = 0;
2324 } 2374 }
2325 else if (hidden_text) 2375 else if (hidden_text)
2326 fore = back; 2376 fore = back;
2327 } 2377 }
… …
2349 /* 2399 /*
2350 * Actually do the drawing of the string here 2400 * Actually do the drawing of the string here
2351 */ 2401 */
2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2402 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2353 2403
2354 if (have_bg && back == Color_bg) 2404 if (ecb_likely (have_bg && back == Color_bg))
2355 { 2405 {
2356 // this is very ugly, maybe push it into ->draw? 2406 // this is very ugly, maybe push it into ->draw?
2357 2407
2358 for (i = 0; i < count; i++) /* don't draw empty strings */ 2408 for (i = 0; i < count; i++) /* don't draw empty strings */
2359 if (text[i] != ' ') 2409 if (text[i] != ' ')
… …
2366 did_clear: ; 2416 did_clear: ;
2367 } 2417 }
2368 else 2418 else
2369 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2419 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2370 2420
2371 if (rend & RS_Uline && font->descent > 1 && fore != back) 2421 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2372 { 2422 {
2423 if (showcursor && focus && row == screen.cur.row
2424 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2425 XSetForeground (dpy, gc, pix_colors[ccol1]);
2426 else
2373#if ENABLE_FRILLS 2427#if ENABLE_FRILLS
2374 if (ISSET_PIXCOLOR (Color_underline)) 2428 if (ISSET_PIXCOLOR (Color_underline))
2375 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2429 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2376 else 2430 else
2377#endif 2431#endif
2378 XSetForeground (dpy, gc, pix_colors[fore]); 2432 XSetForeground (dpy, gc, pix_colors[fore]);
2379 2433
2380 XDrawLine (dpy, drawBuffer, gc, 2434 XDrawLine (dpy, vt, gc,
2381 xpixel, ypixel + font->ascent + 1, 2435 xpixel, ypixel + font->ascent + 1,
2382 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2436 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2383 } 2437 }
2384 } /* for (col....) */ 2438 } /* for (col....) */
2385 } /* for (row....) */ 2439 } /* for (row....) */
2386 2440
2387#if ENABLE_OVERLAY
2388 scr_swap_overlay ();
2389#endif
2390 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2391
2392 /* 2441 /*
2393 * G: cleanup cursor and display outline cursor if necessary 2442 * G: cleanup cursor and display outline cursor if necessary
2394 */ 2443 */
2395 if (showcursor) 2444 if (showcursor)
2396 { 2445 {
2397 if (focus) 2446 if (focus)
2398 { 2447 {
2399 if (option (Opt_cursorUnderline)) 2448 if (cursor_type == 0)
2400 *crp ^= RS_Uline; 2449 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2401 else 2450 else if (oldcursor.row >= 0)
2402 { 2451 {
2403 *crp ^= RS_RVid; 2452 XSetForeground (dpy, gc, pix_colors[ccol1]);
2404#ifndef NO_CURSORCOLOR 2453 if (cursor_type == 1)
2405 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2454 XFillRectangle (dpy, vt, gc,
2406#endif 2455 Col2Pixel (cur_col),
2456 Row2Pixel (oldcursor.row + 1) - 2,
2457 Width2Pixel (1),
2458 2);
2459 else
2460 XFillRectangle (dpy, vt, gc,
2461 Col2Pixel (cur_col),
2462 Row2Pixel (oldcursor.row),
2463 2,
2464 Height2Pixel (1));
2407 } 2465 }
2408 } 2466 }
2409 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2410 { 2468 {
2411 int cursorwidth = 1;
2412 int col = oldcursor.col;
2413
2414 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2415 col--;
2416
2417 while (col + cursorwidth < ncol
2418 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2419 cursorwidth++;
2420
2421#ifndef NO_CURSORCOLOR
2422 if (ISSET_PIXCOLOR (Color_cursor))
2423 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2424 else
2425#endif
2426 XSetForeground (dpy, gc, pix_colors[ccol1]); 2469 XSetForeground (dpy, gc, pix_colors[ccol1]);
2427 2470
2428 XDrawRectangle (dpy, drawBuffer, gc, 2471 XDrawRectangle (dpy, vt, gc,
2429 Col2Pixel (col), 2472 Col2Pixel (cur_col),
2430 Row2Pixel (oldcursor.row), 2473 Row2Pixel (oldcursor.row),
2431 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2474 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2432 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2475 (unsigned int) (Height2Pixel (1) - 1));
2433 } 2476 }
2434 } 2477 }
2435 2478
2436 /* 2479 /*
2437 * H: cleanup selection 2480 * H: cleanup selection
2438 */ 2481 */
2482#if ENABLE_OVERLAY
2483 scr_swap_overlay ();
2484#endif
2485 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2486
2439 scr_reverse_selection (); 2487 scr_reverse_selection ();
2440 2488
2489 screen.flags = old_screen_flags;
2441 num_scr = 0; 2490 num_scr = 0;
2442 num_scr_allow = 1; 2491 num_scr_allow = 1;
2443} 2492}
2444 2493
2445void 2494void ecb_cold
2446rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2495rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2447{ 2496{
2448 if (!l.t) 2497 if (!l.valid ())
2449 return; 2498 return;
2450 2499
2451 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2500 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2452 2501
2453 for (int i = ncol; i--; ) 2502 for (int i = ncol; i--; )
2454 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2503 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2455} 2504}
2456 2505
2457void 2506void ecb_cold
2458rxvt_term::scr_remap_chars () NOTHROW 2507rxvt_term::scr_remap_chars () NOTHROW
2459{ 2508{
2460 for (int i = total_rows; i--; ) 2509 for (int i = total_rows; i--; )
2461 scr_remap_chars (row_buf [i]); 2510 scr_remap_chars (row_buf [i]);
2462 2511
… …
2465 scr_remap_chars (drawn_buf [i]); 2514 scr_remap_chars (drawn_buf [i]);
2466 scr_remap_chars (swap_buf [i]); 2515 scr_remap_chars (swap_buf [i]);
2467 } 2516 }
2468} 2517}
2469 2518
2470void 2519void ecb_cold
2471rxvt_term::scr_recolour () NOTHROW 2520rxvt_term::scr_recolor (bool refresh) NOTHROW
2472{ 2521{
2473 if (1 2522 bool transparent = false;
2474#if TRANSPARENT 2523
2475 && !am_transparent 2524#ifdef HAVE_IMG
2525 if (bg_img != 0)
2526 {
2527# if ENABLE_TRANSPARENCY
2528 if (bg_flags & BG_IS_TRANSPARENT)
2529 {
2530 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2531 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2532
2533 transparent = true;
2534 }
2535 else
2476#endif 2536# endif
2477#if XPM_BACKGROUND
2478 && !bgPixmap.pixmap
2479#endif
2480 ) 2537 {
2538 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2539 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2540 }
2481 { 2541 }
2542 else
2543#endif
2544 {
2482 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2545 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2483 XClearWindow (dpy, parent[0]);
2484 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2546 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2485#if HAVE_SCROLLBARS 2547 }
2486 if (scrollBar.win) 2548
2487 { 2549 XClearWindow (dpy, parent);
2550
2551 if (scrollBar.state && scrollBar.win)
2552 {
2553 if (transparent)
2554 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2555 else
2488 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2489 scrollBar.setIdle (); 2557 scrollBar.state = SB_STATE_IDLE;
2490 scrollbar_show (0); 2558 scrollBar.show (0);
2491 } 2559 }
2492#endif 2560
2561 if (refresh)
2493 } 2562 {
2494
2495 scr_clear (); 2563 scr_clear ();
2496 scr_touch (true); 2564 scr_touch (true);
2565 }
2497 want_refresh = 1; 2566 want_refresh = 1;
2498} 2567}
2499 2568
2500/* ------------------------------------------------------------------------- */ 2569/* ------------------------------------------------------------------------- */
2501void 2570void
… …
2558 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2627 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2559 srp[col] ^= rstyle; 2628 srp[col] ^= rstyle;
2560} 2629}
2561 2630
2562/* ------------------------------------------------------------------------- */ 2631/* ------------------------------------------------------------------------- */
2563void 2632void ecb_hot
2564rxvt_term::scr_reverse_selection () NOTHROW 2633rxvt_term::scr_reverse_selection () NOTHROW
2565{ 2634{
2566 if (selection.op 2635 if (selection.op
2567 && current_screen == selection.screen 2636 && current_screen == selection.screen
2568 && selection.end.row >= view_start) 2637 && selection.end.row >= view_start)
2569 { 2638 {
2570#if !ENABLE_MINIMAL 2639#if !ENABLE_MINIMAL
2571 if (selection.rect) 2640 if (selection.rect)
2572 scr_xor_rect (selection.beg.row, selection.beg.col, 2641 scr_xor_rect (selection.beg.row, selection.beg.col,
2573 selection.end.row, selection.end.col, 2642 selection.end.row, selection.end.col,
2574 RS_RVid, RS_RVid | RS_Uline); 2643 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2575 else 2644 else
2576#endif 2645#endif
2577 scr_xor_span (selection.beg.row, selection.beg.col, 2646 scr_xor_span (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2647 selection.end.row, selection.end.col,
2579 RS_RVid); 2648 RS_Sel | RS_RVid);
2580 } 2649 }
2581} 2650}
2582 2651
2583/* ------------------------------------------------------------------------- */ 2652/* ------------------------------------------------------------------------- */
2584/* 2653/*
… …
2587 */ 2656 */
2588#if 0 2657#if 0
2589void 2658void
2590rxvt_term::scr_dump (int fd) NOTHROW 2659rxvt_term::scr_dump (int fd) NOTHROW
2591{ 2660{
2592 int row, wrote; 2661 // if this method is needed, it can be implemented by factoring the
2593 unsigned int width, towrite; 2662 // relevant code in scr_printscreen
2594 char r1[] = "\n";
2595
2596 for (row = saveLines - nsaved;
2597 row < saveLines + nrow - 1; row++)
2598 {
2599 width = row_buf[row].l >= 0 ? row_buf[row].l
2600 : ncol;
2601 for (towrite = width; towrite; towrite -= wrote)
2602 {
2603 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2604 towrite);
2605 if (wrote < 0)
2606 return; /* XXX: death, no report */
2607 }
2608 if (row_buf[row].l >= 0)
2609 if (write (fd, r1, 1) <= 0)
2610 return; /* XXX: death, no report */
2611 }
2612} 2663}
2613#endif 2664#endif
2614 2665
2615/* ------------------------------------------------------------------------- * 2666/* ------------------------------------------------------------------------- *
2616 * CHARACTER SELECTION * 2667 * CHARACTER SELECTION *
2617 * ------------------------------------------------------------------------- */ 2668 * ------------------------------------------------------------------------- */
2618void 2669void
2619rxvt_term::selection_check (int check_more) NOTHROW 2670rxvt_term::selection_check (int check_more) NOTHROW
2620{ 2671{
2621 row_col_t pos;
2622
2623 if (!selection.op) 2672 if (!selection.op)
2624 return; 2673 return;
2625 2674
2626 pos.row = pos.col = 0;
2627 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2675 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2628 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2676 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2629 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2677 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2630 || (check_more == 1 2678 || (check_more == 1
2631 && current_screen == selection.screen 2679 && current_screen == selection.screen
2632 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2680 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2633 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2681 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2634 || (check_more == 2
2635 && ROWCOL_IS_BEFORE (selection.beg, pos)
2636 && ROWCOL_IS_AFTER (selection.end, pos))
2637 || (check_more == 3
2638 && ROWCOL_IS_AFTER (selection.end, pos))
2639 || (check_more == 4 /* screen width change */
2640 && (selection.beg.row != selection.end.row
2641 || selection.end.col > ncol)))
2642 CLEAR_SELECTION (); 2682 CLEAR_ALL_SELECTION ();
2683}
2684
2685void
2686rxvt_term::selection_changed () NOTHROW
2687{
2688 line_t &r1 = ROW (selection.beg.row);
2689 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2690 ++selection.beg.col;
2691
2692 line_t &r2 = ROW (selection.end.row);
2693 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2694 ++selection.end.col;
2695
2696 want_refresh = 1;
2643} 2697}
2644 2698
2645/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2646/* 2700/*
2647 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
2648 */ 2702 */
2649void 2703void
2650rxvt_term::paste (char *data, unsigned int len) NOTHROW 2704rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2651{ 2705{
2652 /* convert normal newline chars into common keyboard Return key sequence */ 2706 /* convert normal newline chars into common keyboard Return key sequence */
2653 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2654 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2655 data[i] = C0_CR; 2709 data[i] = C0_CR;
2656 2710
2711 if (priv_modes & PrivMode_BracketPaste)
2712 tt_printf ("\x1b[200~");
2713
2657 tt_write (data, len); 2714 tt_write (data, len);
2658}
2659 2715
2660/* ------------------------------------------------------------------------- */ 2716 if (priv_modes & PrivMode_BracketPaste)
2661/* 2717 tt_printf ("\x1b[201~");
2662 * Respond to a notification that a primary selection has been sent
2663 * EXT: SelectionNotify
2664 */
2665void
2666rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2667{
2668 if (prop == None) /* check for failed XConvertSelection */
2669 {
2670 if ((selection_type & Sel_CompoundText))
2671 {
2672 int selnum = selection_type & Sel_whereMask;
2673
2674 selection_type = 0;
2675 if (selnum != Sel_direct)
2676 selection_request_other (XA_STRING, selnum);
2677 }
2678
2679 if ((selection_type & Sel_UTF8String))
2680 {
2681 int selnum = selection_type & Sel_whereMask;
2682
2683 selection_type = Sel_CompoundText;
2684 if (selnum != Sel_direct)
2685 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2686 else
2687 selection_type = 0;
2688 }
2689
2690 return;
2691 }
2692
2693 unsigned long bytes_after;
2694 XTextProperty ct;
2695
2696 if (XGetWindowProperty (dpy, win, prop,
2697 0, PROP_SIZE / 4,
2698 delete_prop, AnyPropertyType,
2699 &ct.encoding, &ct.format,
2700 &ct.nitems, &bytes_after,
2701 &ct.value) != Success)
2702 {
2703 ct.value = 0;
2704 goto bailout;
2705 }
2706
2707 if (ct.encoding == None)
2708 goto bailout;
2709
2710 if (bytes_after)
2711 {
2712 // fetch and append remaining data
2713 XTextProperty ct2;
2714
2715 if (XGetWindowProperty (dpy, win, prop,
2716 ct.nitems / 4, (bytes_after + 3) / 4,
2717 delete_prop, AnyPropertyType,
2718 &ct2.encoding, &ct2.format,
2719 &ct2.nitems, &bytes_after,
2720 &ct2.value) != Success)
2721 goto bailout;
2722
2723 // realloc should be compatible to XFree, here, and elsewhere, too
2724 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2725 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2726 ct.nitems += ct2.nitems;
2727
2728 XFree (ct2.value);
2729 }
2730
2731 if (ct.value == 0)
2732 goto bailout;
2733
2734 if (ct.encoding == xa[XA_INCR])
2735 {
2736 // INCR selection, start handshake
2737 if (!delete_prop)
2738 XDeleteProperty (dpy, win, prop);
2739
2740 selection_wait = Sel_incr;
2741 incr_buf_fill = 0;
2742 incr_ev.start (NOW + 10);
2743
2744 goto bailout;
2745 }
2746
2747 if (ct.nitems == 0)
2748 {
2749 if (selection_wait == Sel_incr)
2750 {
2751 XFree (ct.value);
2752
2753 // finally complete, now paste the whole thing
2754 selection_wait = Sel_normal;
2755 ct.value = (unsigned char *)incr_buf;
2756 ct.nitems = incr_buf_fill;
2757 incr_buf = 0;
2758 incr_buf_size = 0;
2759 incr_ev.stop ();
2760 }
2761 else
2762 {
2763 if (selection_wait == Sel_normal
2764 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2765 {
2766 /*
2767 * pass through again trying CUT_BUFFER0 if we've come from
2768 * XConvertSelection () but nothing was presented
2769 */
2770 selection_paste (display->root, XA_CUT_BUFFER0, False);
2771 }
2772
2773 goto bailout;
2774 }
2775 }
2776 else if (selection_wait == Sel_incr)
2777 {
2778 incr_ev.start (NOW + 10);
2779
2780 while (incr_buf_fill + ct.nitems > incr_buf_size)
2781 {
2782 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2783 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2784 }
2785
2786 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2787 incr_buf_fill += ct.nitems;
2788
2789 goto bailout;
2790 }
2791
2792 char **cl;
2793 int cr;
2794
2795#if !ENABLE_MINIMAL
2796 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2797 // so recode it manually
2798 if (ct.encoding == xa[XA_UTF8_STRING])
2799 {
2800 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2801 char *s = rxvt_wcstombs (w);
2802 free (w);
2803 // TODO: strlen == only the first element will be converted. well...
2804 paste (s, strlen (s));
2805 free (s);
2806 }
2807 else
2808#endif
2809 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2810 && cl)
2811 {
2812 for (int i = 0; i < cr; i++)
2813 paste (cl[i], strlen (cl[i]));
2814
2815 XFreeStringList (cl);
2816 }
2817 else
2818 paste ((char *)ct.value, ct.nitems); // paste raw
2819
2820bailout:
2821 XFree (ct.value);
2822
2823 if (selection_wait == Sel_normal)
2824 selection_wait = Sel_none;
2825} 2718}
2826 2719
2827void 2720void
2828rxvt_term::incr_cb (time_watcher &w) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2829{ 2722{
2830 selection_wait = Sel_none; 2723 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2831
2832 incr_buf_size = 0;
2833 free (incr_buf);
2834
2835 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2836}
2837
2838void
2839rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2840{
2841 if (prop == None || selection_wait != Sel_incr)
2842 return; 2724 return;
2843 2725
2844 selection_paste (win, prop, true); 2726 tt_paste (data, len);
2845} 2727}
2846 2728
2847/* ------------------------------------------------------------------------- */ 2729/* ------------------------------------------------------------------------- */
2848/* 2730/*
2849 * Request the current selection: 2731 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2850 * Order: > internal selection if available 2732 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2851 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2733 * as fallback
2852 * > CUT_BUFFER0
2853 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2854 * will auto fallback to CUT_BUFFER0
2855 * EXT: button 2 release 2734 * EXT: button 2 release
2856 */ 2735 */
2857void 2736void
2858rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2737rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2859{ 2738{
2860 if (selection.text && selnum == Sel_Primary) 2739 if (!selection_req)
2861 { /* internal selection */
2862 char *str = rxvt_wcstombs (selection.text, selection.len);
2863 paste (str, strlen (str));
2864 free (str);
2865 return;
2866 } 2740 {
2867 else 2741 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2742 selection_req->run ();
2868 { 2743 }
2869 selection_request_time = tm;
2870 selection_wait = Sel_normal;
2871
2872#if X_HAVE_UTF8_STRING
2873 selection_type = Sel_UTF8String;
2874 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2875 return;
2876#else
2877 selection_type = Sel_CompoundText;
2878 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2879 return;
2880#endif
2881 }
2882
2883 selection_wait = Sel_none; /* don't loop in selection_paste () */
2884 selection_paste (display->root, XA_CUT_BUFFER0, false);
2885}
2886
2887int
2888rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2889{
2890 Atom sel;
2891
2892 selection_type |= selnum;
2893
2894 if (selnum == Sel_Primary)
2895 sel = XA_PRIMARY;
2896 else if (selnum == Sel_Secondary)
2897 sel = XA_SECONDARY;
2898 else
2899 sel = xa[XA_CLIPBOARD];
2900
2901 if (XGetSelectionOwner (dpy, sel) != None)
2902 {
2903 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2904 vt, selection_request_time);
2905 return 1;
2906 }
2907
2908 return 0;
2909} 2744}
2910 2745
2911/* ------------------------------------------------------------------------- */ 2746/* ------------------------------------------------------------------------- */
2912/* 2747/*
2913 * Clear all selected text 2748 * Clear all selected text
2914 * EXT: SelectionClear 2749 * EXT: SelectionClear
2915 */ 2750 */
2916void 2751void
2917rxvt_term::selection_clear () NOTHROW 2752rxvt_term::selection_clear (bool clipboard) NOTHROW
2918{ 2753{
2754 if (!clipboard)
2755 {
2919 want_refresh = 1; 2756 want_refresh = 1;
2920 free (selection.text); 2757 free (selection.text);
2921 selection.text = NULL; 2758 selection.text = NULL;
2922 selection.len = 0; 2759 selection.len = 0;
2923 CLEAR_SELECTION (); 2760 CLEAR_SELECTION ();
2924 2761
2925 if (display->selection_owner == this) 2762 if (display->selection_owner == this)
2926 display->selection_owner = 0; 2763 display->selection_owner = 0;
2764 }
2765 else
2766 {
2767 free (selection.clip_text);
2768 selection.clip_text = NULL;
2769 selection.clip_len = 0;
2770
2771 if (display->clipboard_owner == this)
2772 display->clipboard_owner = 0;
2773 }
2927} 2774}
2928 2775
2929/* ------------------------------------------------------------------------- */ 2776/* ------------------------------------------------------------------------- */
2930/* 2777/*
2931 * Copy a selection into the cut buffer 2778 * Copy a selection into the cut buffer
2932 * EXT: button 1 or 3 release 2779 * EXT: button 1 or 3 release
2933 */ 2780 */
2934void 2781void
2935rxvt_term::selection_make (Time tm) 2782rxvt_term::selection_make (Time tm)
2936{ 2783{
2937 int i; 2784 int size;
2938 wchar_t *new_selection_text; 2785 wchar_t *new_selection_text;
2939 text_t *t; 2786 text_t *t;
2940 2787
2941 switch (selection.op) 2788 switch (selection.op)
2942 { 2789 {
… …
2958 return; /* nothing selected, go away */ 2805 return; /* nothing selected, go away */
2959 2806
2960 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2807 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2961 return; 2808 return;
2962 2809
2963 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2810 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2964 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2811 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2965 2812
2966 int ofs = 0; 2813 int ofs = 0;
2967 int extra = 0; 2814 int extra = 0;
2968 2815
2969 int col = selection.beg.col; 2816 int col = selection.beg.col;
… …
2975 { 2822 {
2976#if !ENABLE_MINIMAL 2823#if !ENABLE_MINIMAL
2977 if (selection.rect) 2824 if (selection.rect)
2978 { 2825 {
2979 col = selection.beg.col; 2826 col = selection.beg.col;
2980 end_col = ncol + 1; 2827 end_col = selection.end.col;
2981 } 2828 }
2982 else 2829 else
2983#endif 2830#endif
2984 end_col = ROW(row).l; 2831 end_col = ROW(row).l;
2985 2832
2986 col = max (col, 0); 2833 col = max (col, 0);
2987 2834
2988 if (row == selection.end.row 2835 if (row == selection.end.row)
2989#if !ENABLE_MINIMAL
2990 || selection.rect
2991#endif
2992 )
2993 min_it (end_col, selection.end.col); 2836 min_it (end_col, selection.end.col);
2994 2837
2995 t = ROW(row).t + col; 2838 t = ROW(row).t + col;
2996 2839
2997 for (; col < end_col; col++) 2840 for (; col < end_col; col++)
… …
3005 2848
3006 extra -= (len - 1); 2849 extra -= (len - 1);
3007 2850
3008 if (extra < 0) 2851 if (extra < 0)
3009 { 2852 {
3010 extra += i; 2853 extra += size;
3011 i += i; 2854 size += size;
3012 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2855 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3013 } 2856 }
3014 2857
3015 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2858 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3016 } 2859 }
3017#endif 2860#endif
… …
3029 2872
3030 new_selection_text[ofs++] = C0_LF; 2873 new_selection_text[ofs++] = C0_LF;
3031 } 2874 }
3032 else 2875 else
3033#endif 2876#endif
3034 if (!ROW(row).is_longer () && row != selection.end.row) 2877 if (!ROW(row).is_longer ()
2878 && (row != selection.end.row || end_col != selection.end.col)
2879 && (row != selection.beg.row || selection.beg.col < ncol))
3035 new_selection_text[ofs++] = C0_LF; 2880 new_selection_text[ofs++] = C0_LF;
3036 } 2881 }
3037
3038 if (end_col != selection.end.col)
3039 new_selection_text[ofs++] = C0_LF;
3040 2882
3041 new_selection_text[ofs] = 0; 2883 new_selection_text[ofs] = 0;
3042 2884
3043 if (ofs == 0) 2885 if (ofs == 0)
3044 { 2886 {
… …
3057 2899
3058 selection_grab (tm); 2900 selection_grab (tm);
3059} 2901}
3060 2902
3061bool 2903bool
3062rxvt_term::selection_grab (Time tm) NOTHROW 2904rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3063{ 2905{
2906 Atom sel;
2907
2908 if (!clipboard)
2909 {
3064 selection_time = tm; 2910 selection_time = tm;
2911 sel = XA_PRIMARY;
2912 }
2913 else
2914 {
2915 clipboard_time = tm;
2916 sel = xa[XA_CLIPBOARD];
2917 }
3065 2918
3066 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2919 XSetSelectionOwner (dpy, sel, vt, tm);
3067 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2920 if (XGetSelectionOwner (dpy, sel) == vt)
3068 { 2921 {
3069 display->set_selection_owner (this); 2922 display->set_selection_owner (this, clipboard);
3070 return true; 2923 return true;
3071 } 2924 }
3072 else 2925 else
3073 { 2926 {
3074 selection_clear (); 2927 selection_clear (clipboard);
3075 return false; 2928 return false;
3076 } 2929 }
3077 2930
3078#if 0 2931#if 0
3079 XTextProperty ct; 2932 XTextProperty ct;
… …
3089/* ------------------------------------------------------------------------- */ 2942/* ------------------------------------------------------------------------- */
3090/* 2943/*
3091 * Mark or select text based upon number of clicks: 1, 2, or 3 2944 * Mark or select text based upon number of clicks: 1, 2, or 3
3092 * EXT: button 1 press 2945 * EXT: button 1 press
3093 */ 2946 */
3094void 2947void ecb_cold
3095rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3096{ 2949{
3097 clicks = ((clicks - 1) % 3) + 1; 2950 clicks = ((clicks - 1) % 3) + 1;
3098 selection.clicks = clicks; /* save clicks so extend will work */ 2951 selection.clicks = clicks; /* save clicks so extend will work */
3099 2952
… …
3118 2971
3119/* ------------------------------------------------------------------------- */ 2972/* ------------------------------------------------------------------------- */
3120/* 2973/*
3121 * Mark a selection at the specified col/row 2974 * Mark a selection at the specified col/row
3122 */ 2975 */
3123void 2976void ecb_cold
3124rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3125{ 2978{
3126 want_refresh = 1; 2979 want_refresh = 1;
3127 2980
3128 selection.mark.row = row + view_start; 2981 selection.mark.row = row + view_start;
… …
3132 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 2985 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3133 2986
3134 while (selection.mark.col > 0 2987 while (selection.mark.col > 0
3135 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 2988 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3136 --selection.mark.col; 2989 --selection.mark.col;
3137 2990
3138 if (selection.op) 2991 if (selection.op)
2992 {
3139 { /* clear the old selection */ 2993 /* clear the old selection */
3140 selection.beg.row = selection.end.row = selection.mark.row; 2994 selection.beg.row = selection.end.row = selection.mark.row;
3141 selection.beg.col = selection.end.col = selection.mark.col; 2995 selection.beg.col = selection.end.col = selection.mark.col;
3142 } 2996 }
3143 2997
3144 selection.op = SELECTION_INIT; 2998 selection.op = SELECTION_INIT;
… …
3150 * Word select: select text for 2 clicks 3004 * Word select: select text for 2 clicks
3151 * We now only find out the boundary in one direction 3005 * We now only find out the boundary in one direction
3152 */ 3006 */
3153 3007
3154/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3008/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3155#define DELIMIT_TEXT(x) \ 3009#define DELIMIT_TEXT(x) \
3156 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3010 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3157#define DELIMIT_REND(x) 1 3011#define DELIMIT_REND(x) 1
3158 3012
3159void 3013void ecb_cold
3160rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3014rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3161{ 3015{
3162 int col, row, dirnadd, tcol, trow, w1, w2; 3016 int col, row, dirnadd, tcol, trow, w1, w2;
3163 row_col_t bound; 3017 row_col_t bound;
3164 text_t *stp; 3018 text_t *stp;
… …
3238 * EXT: button 3 press; button 1 or 3 drag 3092 * EXT: button 3 press; button 1 or 3 drag
3239 * flag == 0 ==> button 1 3093 * flag == 0 ==> button 1
3240 * flag == 1 ==> button 3 press 3094 * flag == 1 ==> button 3 press
3241 * flag == 2 ==> button 3 motion 3095 * flag == 2 ==> button 3 motion
3242 */ 3096 */
3243void 3097void ecb_cold
3244rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3245{ 3099{
3246 int col = clamp (Pixel2Col (x), 0, ncol); 3100 int col = clamp (Pixel2Col (x), 0, ncol);
3247 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3101 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3248 3102
… …
3274 3128
3275/* ------------------------------------------------------------------------- */ 3129/* ------------------------------------------------------------------------- */
3276/* 3130/*
3277 * Extend the selection to the specified col/row 3131 * Extend the selection to the specified col/row
3278 */ 3132 */
3279void 3133void ecb_cold
3280rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3134rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3281{ 3135{
3282 row_col_t pos; 3136 row_col_t pos;
3283 enum { 3137 enum {
3284 LEFT, RIGHT 3138 LEFT, RIGHT
3285 } closeto = RIGHT; 3139 } closeto = RIGHT;
3286
3287 want_refresh = 1;
3288 3140
3289 switch (selection.op) 3141 switch (selection.op)
3290 { 3142 {
3291 case SELECTION_INIT: 3143 case SELECTION_INIT:
3292 CLEAR_SELECTION (); 3144 CLEAR_SELECTION ();
… …
3333 * a point/word/line which is either the start or end of the selection 3185 * a point/word/line which is either the start or end of the selection
3334 * and it was decided by whichever point/word/line was `fixed' at the 3186 * and it was decided by whichever point/word/line was `fixed' at the
3335 * time of the most recent button3 press 3187 * time of the most recent button3 press
3336 */ 3188 */
3337 if (button3 && buttonpress) 3189 if (button3 && buttonpress)
3190 {
3338 { /* button3 press */ 3191 /* button3 press */
3339 /* 3192 /*
3340 * first determine which edge of the selection we are closest to 3193 * first determine which edge of the selection we are closest to
3341 */ 3194 */
3342 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3195 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3343 || (!ROWCOL_IS_AFTER (pos, selection.end) 3196 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3361 selection.mark.row = selection.beg.row; 3214 selection.mark.row = selection.beg.row;
3362 selection.mark.col = selection.beg.col; 3215 selection.mark.col = selection.beg.col;
3363 } 3216 }
3364 } 3217 }
3365 else 3218 else
3219 {
3366 { /* button1 drag or button3 drag */ 3220 /* button1 drag or button3 drag */
3367 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3221 if (ROWCOL_IS_AFTER (selection.mark, pos))
3368 { 3222 {
3369 if (selection.mark.row == selection.end.row 3223 if (selection.mark.row == selection.end.row
3370 && selection.mark.col == selection.end.col 3224 && selection.mark.col == selection.end.col
3371 && clickchange 3225 && clickchange
… …
3452 selection.end.row++; 3306 selection.end.row++;
3453 } 3307 }
3454 } 3308 }
3455 3309
3456 if (button3 && buttonpress) 3310 if (button3 && buttonpress)
3311 {
3457 { /* mark may need to be changed */ 3312 /* mark may need to be changed */
3458 if (closeto == LEFT) 3313 if (closeto == LEFT)
3459 { 3314 {
3460 selection.mark.row = selection.end.row; 3315 selection.mark.row = selection.end.row;
3461 selection.mark.col = selection.end.col - (selection.clicks == 2); 3316 selection.mark.col = selection.end.col - (selection.clicks == 2);
3462 } 3317 }
… …
3469 3324
3470#if !ENABLE_MINIMAL 3325#if !ENABLE_MINIMAL
3471 if (selection.rect && selection.beg.col > selection.end.col) 3326 if (selection.rect && selection.beg.col > selection.end.col)
3472 ::swap (selection.beg.col, selection.end.col); 3327 ::swap (selection.beg.col, selection.end.col);
3473#endif 3328#endif
3329
3330 selection_changed ();
3474} 3331}
3475 3332
3476#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3477void 3334void ecb_cold
3478rxvt_term::selection_remove_trailing_spaces () NOTHROW 3335rxvt_term::selection_remove_trailing_spaces () NOTHROW
3479{ 3336{
3480 int32_t end_col, end_row; 3337 int32_t end_col, end_row;
3481 text_t *stp; 3338 text_t *stp;
3482 3339
… …
3520/* ------------------------------------------------------------------------- */ 3377/* ------------------------------------------------------------------------- */
3521/* 3378/*
3522 * Double click on button 3 when already selected 3379 * Double click on button 3 when already selected
3523 * EXT: button 3 double click 3380 * EXT: button 3 double click
3524 */ 3381 */
3525void 3382void ecb_cold
3526rxvt_term::selection_rotate (int x, int y) NOTHROW 3383rxvt_term::selection_rotate (int x, int y) NOTHROW
3527{ 3384{
3528 selection.clicks = selection.clicks % 3 + 1; 3385 selection.clicks = selection.clicks % 3 + 1;
3529 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3530} 3387}
… …
3532/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3533/* 3390/*
3534 * Respond to a request for our current selection 3391 * Respond to a request for our current selection
3535 * EXT: SelectionRequest 3392 * EXT: SelectionRequest
3536 */ 3393 */
3537void 3394void ecb_cold
3538rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3539{ 3396{
3397 Atom property = rq.property == None ? rq.target : rq.property;
3540 XSelectionEvent ev; 3398 XSelectionEvent ev;
3541 3399
3542 ev.type = SelectionNotify; 3400 ev.type = SelectionNotify;
3543 ev.property = None; 3401 ev.property = None;
3544 ev.display = rq.display; 3402 ev.display = rq.display;
… …
3559 *target++ = xa[XA_COMPOUND_TEXT]; 3417 *target++ = xa[XA_COMPOUND_TEXT];
3560#if X_HAVE_UTF8_STRING 3418#if X_HAVE_UTF8_STRING
3561 *target++ = xa[XA_UTF8_STRING]; 3419 *target++ = xa[XA_UTF8_STRING];
3562#endif 3420#endif
3563 3421
3564 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3422 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3565 32, PropModeReplace, 3423 32, PropModeReplace,
3566 (unsigned char *)target_list, target - target_list); 3424 (unsigned char *)target_list, target - target_list);
3567 ev.property = rq.property; 3425 ev.property = property;
3568 } 3426 }
3569#if TODO // TODO 3427#if TODO // TODO
3570 else if (rq.target == xa[XA_MULTIPLE]) 3428 else if (rq.target == xa[XA_MULTIPLE])
3571 { 3429 {
3572 /* TODO: Handle MULTIPLE */ 3430 /* TODO: Handle MULTIPLE */
3573 } 3431 }
3574#endif 3432#endif
3575 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3433 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3576 { 3434 {
3577 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3435 XChangeProperty (dpy, rq.requestor, property, rq.target,
3578 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3436 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3579 ev.property = rq.property; 3437 ev.property = property;
3438 }
3439 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3440 {
3441 XChangeProperty (dpy, rq.requestor, property, rq.target,
3442 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3443 ev.property = property;
3580 } 3444 }
3581 else if (rq.target == XA_STRING 3445 else if (rq.target == XA_STRING
3582 || rq.target == xa[XA_TEXT] 3446 || rq.target == xa[XA_TEXT]
3583 || rq.target == xa[XA_COMPOUND_TEXT] 3447 || rq.target == xa[XA_COMPOUND_TEXT]
3584 || rq.target == xa[XA_UTF8_STRING] 3448 || rq.target == xa[XA_UTF8_STRING]
… …
3616 { 3480 {
3617 target = xa[XA_COMPOUND_TEXT]; 3481 target = xa[XA_COMPOUND_TEXT];
3618 style = enc_compound_text; 3482 style = enc_compound_text;
3619 } 3483 }
3620 3484
3621 if (selection.text) 3485 if (rq.selection == XA_PRIMARY && selection.text)
3622 { 3486 {
3623 cl = selection.text; 3487 cl = selection.text;
3624 selectlen = selection.len; 3488 selectlen = selection.len;
3489 }
3490 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3491 {
3492 cl = selection.clip_text;
3493 selectlen = selection.clip_len;
3625 } 3494 }
3626 else 3495 else
3627 { 3496 {
3628 cl = L""; 3497 cl = L"";
3629 selectlen = 0; 3498 selectlen = 0;
… …
3650 ct.value = (unsigned char *)cl; 3519 ct.value = (unsigned char *)cl;
3651 ct.nitems = selectlen; 3520 ct.nitems = selectlen;
3652 ct.encoding = target; 3521 ct.encoding = target;
3653 } 3522 }
3654 3523
3655 XChangeProperty (dpy, rq.requestor, rq.property, 3524 XChangeProperty (dpy, rq.requestor, property,
3656 ct.encoding, 8, PropModeReplace, 3525 ct.encoding, 8, PropModeReplace,
3657 ct.value, (int)ct.nitems); 3526 ct.value, (int)ct.nitems);
3658 ev.property = rq.property; 3527 ev.property = property;
3659 3528
3660 if (freect) 3529 if (freect)
3661 XFree (ct.value); 3530 XFree (ct.value);
3662 } 3531 }
3663 3532
3664 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3665} 3534}
3666 3535
3667/* ------------------------------------------------------------------------- * 3536/* ------------------------------------------------------------------------- */
3668 * MOUSE ROUTINES *
3669 * ------------------------------------------------------------------------- */
3670
3671/*
3672 * return col/row values corresponding to x/y pixel values
3673 */
3674void
3675rxvt_term::pixel_position (int *x, int *y) NOTHROW
3676{
3677 *x = Pixel2Col (*x);
3678 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3679 *y = Pixel2Row (*y);
3680 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3681}
3682
3683/* ------------------------------------------------------------------------- */
3684#ifdef USE_XIM 3537#if USE_XIM
3685void 3538void ecb_cold
3686rxvt_term::im_set_position (XPoint &pos) NOTHROW 3539rxvt_term::im_set_position (XPoint &pos) NOTHROW
3687{ 3540{
3688 XWindowAttributes xwa; 3541 XWindowAttributes xwa;
3689 3542
3690 XGetWindowAttributes (dpy, vt, &xwa); 3543 XGetWindowAttributes (dpy, vt, &xwa);
… …
3713 h += 2; min_it (h, nrow); 3566 h += 2; min_it (h, nrow);
3714 3567
3715 x -= 1; clamp_it (x, 0, ncol - w); 3568 x -= 1; clamp_it (x, 0, ncol - w);
3716 y -= 1; clamp_it (y, 0, nrow - h); 3569 y -= 1; clamp_it (y, 0, nrow - h);
3717 3570
3718 ov_x = x; ov_y = y; 3571 ov.x = x; ov.y = y;
3719 ov_w = w; ov_h = h; 3572 ov.w = w; ov.h = h;
3720 3573
3721 ov_text = new text_t *[h]; 3574 ov.text = new text_t *[h];
3722 ov_rend = new rend_t *[h]; 3575 ov.rend = new rend_t *[h];
3723 3576
3724 for (y = 0; y < h; y++) 3577 for (y = 0; y < h; y++)
3725 { 3578 {
3726 text_t *tp = ov_text[y] = new text_t[w]; 3579 text_t *tp = ov.text[y] = new text_t[w];
3727 rend_t *rp = ov_rend[y] = new rend_t[w]; 3580 rend_t *rp = ov.rend[y] = new rend_t[w];
3728 3581
3729 text_t t0, t1, t2; 3582 text_t t0, t1, t2;
3730 rend_t r = OVERLAY_RSTYLE; 3583 rend_t r = OVERLAY_RSTYLE;
3731 3584
3732 if (y == 0) 3585 if (y == 0)
… …
3751} 3604}
3752 3605
3753void 3606void
3754rxvt_term::scr_overlay_off () NOTHROW 3607rxvt_term::scr_overlay_off () NOTHROW
3755{ 3608{
3756 if (!ov_text) 3609 if (!ov.text)
3757 return; 3610 return;
3758 3611
3759 want_refresh = 1; 3612 want_refresh = 1;
3760 3613
3761 for (int y = 0; y < ov_h; y++) 3614 for (int y = 0; y < ov.h; y++)
3762 { 3615 {
3763 delete [] ov_text[y]; 3616 delete [] ov.text[y];
3764 delete [] ov_rend[y]; 3617 delete [] ov.rend[y];
3765 } 3618 }
3766 3619
3767 delete [] ov_text; ov_text = 0; 3620 delete [] ov.text; ov.text = 0;
3768 delete [] ov_rend; ov_rend = 0; 3621 delete [] ov.rend; ov.rend = 0;
3769} 3622}
3770 3623
3771void 3624void
3772rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3625rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3773{ 3626{
3774 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3627 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3775 return; 3628 return;
3776 3629
3777 x++, y++; 3630 x++, y++;
3778 3631
3779 ov_text[y][x] = text; 3632 ov.text[y][x] = text;
3780 ov_rend[y][x] = rend; 3633 ov.rend[y][x] = rend;
3781} 3634}
3782 3635
3783void 3636void
3784rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3637rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3785{ 3638{
… …
3804} 3657}
3805 3658
3806void 3659void
3807rxvt_term::scr_swap_overlay () NOTHROW 3660rxvt_term::scr_swap_overlay () NOTHROW
3808{ 3661{
3809 if (!ov_text) 3662 if (!ov.text)
3810 return; 3663 return;
3811 3664
3665 // hide cursor if it is within the overlay area
3666 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3667 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3668 screen.flags &= ~Screen_VisibleCursor;
3669
3812 // swap screen mem with overlay 3670 // swap screen mem with overlay
3813 for (int y = ov_h; y--; ) 3671 for (int y = ov.h; y--; )
3814 { 3672 {
3815 text_t *t1 = ov_text[y]; 3673 text_t *t1 = ov.text[y];
3816 rend_t *r1 = ov_rend[y]; 3674 rend_t *r1 = ov.rend[y];
3817 3675
3818 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3676 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3819 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3677 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3820 3678
3821 for (int x = ov_w; x--; ) 3679 for (int x = ov.w; x--; )
3822 { 3680 {
3823 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3681 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3824 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3682 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3825 } 3683 }
3826 } 3684 }

Diff Legend

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