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.190 by root, Thu Dec 22 15:52:57 2005 UTC vs.
Revision 1.413 by root, Wed Jan 18 12:39:14 2012 UTC

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

Diff Legend

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