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

Diff Legend

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