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