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.193 by root, Thu Dec 22 19:39:29 2005 UTC vs.
Revision 1.260 by root, Sat Feb 18 15:24:39 2006 UTC

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