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

Diff Legend

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