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

Diff Legend

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