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

Diff Legend

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