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.215 by root, Sun Jan 8 06:35:23 2006 UTC vs.
Revision 1.296 by root, Wed Jan 9 01:05:24 2008 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
93 */ 91 */
94#define drawBuffer vt 92#define drawBuffer vt
95 93
96#define CLEAR_ROWS(row, num) \ 94#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 95 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 96 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 97 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 98 (unsigned int)Height2Pixel (num), False)
101 99
102#define CLEAR_CHARS(x, y, num) \ 100#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 101 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 102 XClearArea (dpy, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 103 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 104 (unsigned int)Height2Pixel (1), False)
107 105
108#define ERASE_ROWS(row, num) \ 106#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 107 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 108 0, Row2Pixel (row), \
111 (unsigned int)width, \ 109 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 110 (unsigned int)Height2Pixel (num))
113 111
114/* ------------------------------------------------------------------------- * 112/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 113 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 114 * ------------------------------------------------------------------------- */
117 115
118/* Fill part/all of a line with blanks. */ 116/* Fill part/all of a line with blanks. */
119void 117void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 118rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 119{
122 if (!l.t) 120 if (!l.t)
123 { 121 {
124 lalloc (l); 122 lalloc (l);
125 col = 0; 123 col = 0;
126 width = ncol; 124 width = ncol;
127 } 125 }
128 126
129 l.touch (); 127 l.touch ();
130 128
131 efs &= ~RS_baseattrMask; 129 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 131
134 text_t *et = l.t + col; 132 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 133 rend_t *er = l.r + col;
136 134
… …
142} 140}
143 141
144/* ------------------------------------------------------------------------- */ 142/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 143/* Fill a full line with blanks - make sure it is allocated first */
146void 144void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 145rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 146{
149 scr_blank_line (l, 0, ncol, efs); 147 scr_blank_line (l, 0, ncol, efs);
150 148
151 l.l = 0; 149 l.l = 0;
152 l.f = 0; 150 l.f = 0;
… …
161{ 159{
162#if ENABLE_OVERLAY 160#if ENABLE_OVERLAY
163 scr_overlay_off (); 161 scr_overlay_off ();
164#endif 162#endif
165 163
164 rvideo_mode = false;
166 view_start = 0; 165 view_start = 0;
167 num_scr = 0; 166 num_scr = 0;
168 167
169 if (ncol == 0) 168 if (ncol == 0)
170 ncol = 80; 169 ncol = 80;
… …
173 nrow = 24; 172 nrow = 24;
174 173
175 if (ncol == prev_ncol && nrow == prev_nrow) 174 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 175 return;
177 176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179
178 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
180 { 182 {
181 //TODO//FIXME 183 //TODO//FIXME
182 saveLines++; 184 saveLines++;
183 prev_nrow--; 185 prev_nrow--;
184 nsaved++; 186 top_row--;
185 } 187 }
186 188
187 want_refresh = 1; 189 want_refresh = 1;
188 190
189 int prev_total_rows = prev_nrow + saveLines; 191 int prev_total_rows = prev_nrow + saveLines;
… …
194 196
195 if (!row_buf) 197 if (!row_buf)
196 { 198 {
197 /* 199 /*
198 * first time called so just malloc everything: don't rely on realloc 200 * first time called so just malloc everything: don't rely on realloc
199 * Note: this is still needed so that all the scrollback lines are NULL
200 */ 201 */
201 nsaved = 0; /* no saved lines */ 202 top_row = 0;
202 term_start = 0; 203 term_start = 0;
203 204
204 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
205 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
206 207
207 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
208 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211 211
212 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
213 { 213 {
214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
236 selection.text = NULL; 236 selection.text = NULL;
237 selection.len = 0; 237 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
240 selection.clicks = 0; 240 selection.clicks = 0;
241 CLEAR_ALL_SELECTION ();
242 rvideo = 0;
243 } 241 }
244 else 242 else
245 { 243 {
246 /* 244 /*
247 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
260 } 258 }
261 } 259 }
262#endif 260#endif
263 261
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
266 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267 264
268 for (int row = min (nrow, prev_nrow); row--; ) 265 for (int row = min (nrow, prev_nrow); row--; )
269 { 266 {
270 lresize (drawn_buf[row]); 267 lresize (drawn_buf[row]);
… …
275 { 272 {
276 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
277 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
278 } 275 }
279 276
277 line_t *old_buf = row_buf;
280 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 279
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start - nsaved , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
285 283
286 if (nsaved) 284 if (top_row)
287 { 285 {
288 // re-wrap lines, this is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
290 288
291 row_col_t ocur = screen.cur; 289 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 290 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 291
… …
327 qline->l = ncol; 325 qline->l = ncol;
328 qline->is_longer (1); 326 qline->is_longer (1);
329 327
330 int qcol = 0; 328 int qcol = 0;
331 329
330 // see below for cursor adjustment rationale
331 if (p == ocur.row)
332 screen.cur.row = q - (total_rows - nrow);
333
332 // fill a single destination line 334 // fill a single destination line
333 while (lofs < llen && qcol < ncol) 335 while (lofs < llen && qcol < ncol)
334 { 336 {
335 int prow = lofs / prev_ncol; 337 int prow = lofs / prev_ncol;
336 int pcol = lofs % prev_ncol; 338 int pcol = lofs % prev_ncol;
… …
346 348
347 line_t &pline = old_buf [prow]; 349 line_t &pline = old_buf [prow];
348 350
349 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 351 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
350 352
351 assert (len);
352 assert (pline.t);
353
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 353 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 354 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
356 355
357 lofs += len; 356 lofs += len;
358 qcol += len; 357 qcol += len;
… …
364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 363 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
365 } 364 }
366 while (p != pend && q > 0); 365 while (p != pend && q > 0);
367 366
368 term_start = total_rows - nrow; 367 term_start = total_rows - nrow;
369 nsaved = term_start - q; 368 top_row = q - term_start;
370 369
371 // make sure all terminal lines exist 370 // make sure all terminal lines exist
372 while (nsaved < 0) 371 while (top_row > 0)
373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
374 } 373 }
375 else 374 else
376 { 375 {
377 // if no scrollback exists (yet), wing, instead of wrap 376 // if no scrollback exists (yet), wing, instead of wrap
378 377
379 for (int row = min (nrow, prev_nrow); row--; ) 378 for (int row = min (nrow, prev_nrow); row--; )
380 { 379 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 381 line_t &qline = row_buf [row];
383 382
… …
391 } 390 }
392 391
393 term_start = 0; 392 term_start = 0;
394 } 393 }
395 394
396#ifdef DEBUG_STRICT //TODO: remove
397 for (int i = -nsaved; i < nrow; i++)
398 assert (ROW (i).t);
399#endif
400
401 free (old_buf); 395 free (old_buf);
402 delete old_ta; 396 delete old_ta;
403 delete old_ra; 397 delete old_ra;
404 398
405 clamp_it (screen.cur.row, 0, nrow - 1); 399 clamp_it (screen.cur.row, 0, nrow - 1);
406 clamp_it (screen.cur.col, 0, ncol - 1); 400 clamp_it (screen.cur.col, 0, ncol - 1);
407 401
408 if (tabs)
409 free (tabs); 402 free (tabs);
410 } 403 }
404
405 CLEAR_ALL_SELECTION ();
411 406
412 prev_nrow = nrow; 407 prev_nrow = nrow;
413 prev_ncol = ncol; 408 prev_ncol = ncol;
414 409
415 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 410 tabs = (char *)rxvt_malloc (ncol);
416 411
417 for (int col = ncol; col--; ) 412 for (int col = ncol; --col; )
418 tabs [col] = col % TABSIZE == 0; 413 tabs [col] = col % TABSIZE == 0;
419 414
415 if (current_screen != PRIMARY)
416 scr_swap_screen ();
417
420 tt_winch (); 418 tt_winch ();
421 419
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 421}
424 422
425/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
426/* 424/*
427 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
428 */ 426 */
429void 427void
430rxvt_term::scr_release () 428rxvt_term::scr_release () NOTHROW
431{ 429{
430 if (row_buf)
431 {
432 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
434 434
435 free (row_buf); 435 free (row_buf);
436 free (swap_buf); 436 free (swap_buf);
437 free (drawn_buf); 437 free (drawn_buf);
438 free (temp_buf);
439 free (tabs); 438 free (tabs);
440 439
441 row_buf = 0; // signal that we freed all the arrays 440 row_buf = 0; // signal that we freed all the arrays
441 }
442} 442}
443 443
444/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
445/* 445/*
446 * Hard reset 446 * Hard reset
… …
451 scr_release (); 451 scr_release ();
452 prev_nrow = prev_ncol = 0; 452 prev_nrow = prev_ncol = 0;
453 scr_reset (); 453 scr_reset ();
454 454
455 scr_clear (true); 455 scr_clear (true);
456 scr_refresh (SLOW_REFRESH); 456 scr_refresh ();
457} 457}
458 458
459/* ------------------------------------------------------------------------- * 459/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 460 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 461 * ------------------------------------------------------------------------- */
… …
463 * Save and Restore cursor 463 * Save and Restore cursor
464 * XTERM_SEQ: Save cursor : ESC 7 464 * XTERM_SEQ: Save cursor : ESC 7
465 * XTERM_SEQ: Restore cursor: ESC 8 465 * XTERM_SEQ: Restore cursor: ESC 8
466 */ 466 */
467void 467void
468rxvt_term::scr_cursor (int mode) 468rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
469{ 469{
470 screen_t *s; 470 screen_t *s;
471 471
472#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 472#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
473 if (current_screen == SECONDARY) 473 if (current_screen == SECONDARY)
… …
505 assert (s->cur.row >= 0); 505 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 506 assert (s->cur.col >= 0);
507#endif 507#endif
508} 508}
509 509
510void
511rxvt_term::scr_swap_screen ()
512{
513 if (!option (Opt_secondaryScreen))
514 return;
515
516 for (int i = prev_nrow; i--; )
517 ::swap (ROW(i), swap_buf [i]);
518
519 ::swap (screen.cur, swap.cur);
520
521 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
522 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
523}
524
510/* ------------------------------------------------------------------------- */ 525/* ------------------------------------------------------------------------- */
511/* 526/*
512 * Swap between primary and secondary screens 527 * Swap between primary and secondary screens
513 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 528 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
514 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 529 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
515 */ 530 */
516int 531void
517rxvt_term::scr_change_screen (int scrn) 532rxvt_term::scr_change_screen (int scrn)
518{ 533{
534 if (scrn == current_screen)
535 return;
536
519 want_refresh = 1; 537 want_refresh = 1;
520 view_start = 0; 538 view_start = 0;
521 539
522 if (current_screen == scrn)
523 return scrn;
524
525 selection_check (2); /* check for boundary cross */ 540 selection_check (2); /* check for boundary cross */
526 541
527 int i = current_screen; current_screen = scrn; scrn = i; 542 int i = current_screen; current_screen = scrn; scrn = i;
528 543
529 ::swap (screen.cur.row, swap.cur.row);
530 ::swap (screen.cur.col, swap.cur.col);
531
532 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
533 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
534
535#if NSCREENS 544#if NSCREENS
536 if (OPTION (Opt_secondaryScreen)) 545 if (option (Opt_secondaryScreen))
537 { 546 {
538 num_scr = 0; 547 num_scr = 0;
539 548
540 for (int i = prev_nrow; i--; ) 549 scr_swap_screen ();
541 ::swap (ROW(i), swap_buf [i]);
542 550
543 ::swap (screen.charset, swap.charset); 551 ::swap (screen.charset, swap.charset);
544 ::swap (screen.flags, swap.flags); 552 ::swap (screen.flags, swap.flags);
545 screen.flags |= Screen_VisibleCursor; 553 screen.flags |= Screen_VisibleCursor;
546 swap.flags |= Screen_VisibleCursor; 554 swap.flags |= Screen_VisibleCursor;
547 } 555 }
548 else 556 else
549#endif 557#endif
550 if (OPTION (Opt_secondaryScroll)) 558 if (option (Opt_secondaryScroll))
551 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 559 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
552
553 return scrn;
554} 560}
555 561
556// clear WrapNext indicator, solidifying position on next line 562// clear WrapNext indicator, solidifying position on next line
557void 563void
558rxvt_term::scr_do_wrap () 564rxvt_term::scr_do_wrap () NOTHROW
559{ 565{
560 if (!(screen.flags & Screen_WrapNext)) 566 if (!(screen.flags & Screen_WrapNext))
561 return; 567 return;
562 568
563 screen.flags &= ~Screen_WrapNext; 569 screen.flags &= ~Screen_WrapNext;
… …
573/* ------------------------------------------------------------------------- */ 579/* ------------------------------------------------------------------------- */
574/* 580/*
575 * Change the colour for following text 581 * Change the colour for following text
576 */ 582 */
577void 583void
578rxvt_term::scr_color (unsigned int color, int fgbg) 584rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
579{ 585{
580 if (color > maxTermCOLOR) 586 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
581 color = fgbg; 587 color = fgbg;
582 588
583 if (fgbg == Color_fg) 589 if (fgbg == Color_fg)
584 rstyle = SET_FGCOLOR (rstyle, color); 590 rstyle = SET_FGCOLOR (rstyle, color);
585 else 591 else
… …
589/* ------------------------------------------------------------------------- */ 595/* ------------------------------------------------------------------------- */
590/* 596/*
591 * Change the rendition style for following text 597 * Change the rendition style for following text
592 */ 598 */
593void 599void
594rxvt_term::scr_rendition (int set, int style) 600rxvt_term::scr_rendition (int set, int style) NOTHROW
595 { 601{
596 if (set) 602 if (set)
597 rstyle |= style; 603 rstyle |= style;
598 else if (style == ~RS_None) 604 else if (style == ~RS_None)
599 rstyle = DEFAULT_RSTYLE; 605 rstyle = DEFAULT_RSTYLE;
600 else 606 else
601 rstyle &= ~style; 607 rstyle &= ~style;
602 } 608}
603 609
604/* ------------------------------------------------------------------------- */ 610/* ------------------------------------------------------------------------- */
605/* 611/*
606 * Scroll text between <row1> and <row2> inclusive, by <count> lines 612 * Scroll text between <row1> and <row2> inclusive, by <count> lines
607 * count positive ==> scroll up 613 * count positive ==> scroll up
608 * count negative ==> scroll down 614 * count negative ==> scroll down
609 */ 615 */
610int 616int
611rxvt_term::scr_scroll_text (int row1, int row2, int count) 617rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
612{ 618{
613 if (count == 0 || (row1 > row2)) 619 if (count == 0 || (row1 > row2))
614 return 0; 620 return 0;
615 621
616 want_refresh = 1; 622 want_refresh = 1;
617 num_scr += count; 623 num_scr += count;
618 624
619 if (count > 0 625 if (count > 0
620 && row1 == 0 626 && row1 == 0
621 && row2 == nrow - 1
622 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 627 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
623 { 628 {
624 nsaved = min (nsaved + count, saveLines); 629 top_row = max (top_row - count, -saveLines);
625 630
626 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 631 // scroll everything up 'count' lines
627
628 term_start = (term_start + count) % total_rows; 632 term_start = (term_start + count) % total_rows;
629 633
634 // sever bottommost line
635 {
636 line_t &l = ROW(row2 - count);
637 l.is_longer (0);
638 l.touch ();
639 }
640
641 // erase newly scrolled-in lines
642 for (int i = count; i--; )
643 {
644 line_t &l = ROW(nrow - 1 - i);
645
646 // optimize if already cleared, can be significant on slow machines
647 // could be rolled into scr_blank_screen_mem
648 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
649 {
650 scr_blank_line (l, 0, l.l, rstyle);
651 l.l = 0;
652 l.f = 0;
653 }
654 else
655 scr_blank_screen_mem (l, rstyle);
656 }
657
658 // now copy lines below the scroll region bottom to the
659 // bottom of the screen again, so they look as if they
660 // hadn't moved.
661 for (int i = nrow; --i > row2; )
662 {
663 line_t &l1 = ROW(i - count);
664 line_t &l2 = ROW(i);
665
666 ::swap (l1, l2);
667 l2.touch ();
668 }
669
670 // move and/or clear selection, if any
630 if (selection.op && current_screen == selection.screen) 671 if (selection.op && current_screen == selection.screen)
631 { 672 {
632 selection.beg.row -= count; 673 selection.beg.row -= count;
633 selection.end.row -= count; 674 selection.end.row -= count;
634 selection.mark.row -= count; 675 selection.mark.row -= count;
635 676
636 if (selection.beg.row < -nsaved 677 if (selection.beg.row < top_row
637 || selection.end.row < -nsaved 678 || selection.end.row < top_row
638 || selection.mark.row < -nsaved) 679 || selection.mark.row < top_row)
639 { 680 {
640 CLEAR_ALL_SELECTION (); 681 CLEAR_ALL_SELECTION ();
641 selection.op = SELECTION_CLEAR; 682 selection.op = SELECTION_CLEAR;
642 } 683 }
643 } 684 }
644 685
645 for (int i = count; i--; ) 686 // finally move the view window, if desired
646 scr_blank_screen_mem (ROW(row2 - i), rstyle);
647
648 if (OPTION (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
649 && view_start != 0 688 && view_start != 0
650 && view_start != saveLines) 689 && view_start != -saveLines)
651 scr_page (UP, count); 690 scr_page (UP, count);
691
692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
693 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
652 } 694 }
653 else 695 else
654 { 696 {
655 if (selection.op && current_screen == selection.screen) 697 if (selection.op && current_screen == selection.screen)
656 { 698 {
… …
668 { 710 {
669 /* move selected region too */ 711 /* move selected region too */
670 selection.beg.row -= count; 712 selection.beg.row -= count;
671 selection.end.row -= count; 713 selection.end.row -= count;
672 selection.mark.row -= count; 714 selection.mark.row -= count;
673 715
674 selection_check (0); 716 selection_check (0);
675 } 717 }
676 } 718 }
677 719
678 // use a simple and robust scrolling algorithm, this 720 // use a simple and robust scrolling algorithm, this
… …
680 722
681 int rows = row2 - row1 + 1; 723 int rows = row2 - row1 + 1;
682 724
683 min_it (count, rows); 725 min_it (count, rows);
684 726
727 line_t *temp_buf = row_buf + total_rows;
728
685 for (int row = 0; row < rows; row++) 729 for (int row = 0; row < rows; row++)
686 { 730 {
687 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 731 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
688 732
689 if (!IN_RANGE_EXC (row + count, 0, rows)) 733 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
700/* ------------------------------------------------------------------------- */ 744/* ------------------------------------------------------------------------- */
701/* 745/*
702 * Add text given in <str> of length <len> to screen struct 746 * Add text given in <str> of length <len> to screen struct
703 */ 747 */
704void 748void
705rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 749rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
706{ 750{
707 if (len <= 0) /* sanity */ 751 if (len <= 0) /* sanity */
708 return; 752 return;
709 753
710 unsigned char checksel; 754 unsigned char checksel;
… …
716 ZERO_SCROLLBACK (); 760 ZERO_SCROLLBACK ();
717 761
718 if (minlines > 0) 762 if (minlines > 0)
719 { 763 {
720 minlines += screen.cur.row - screen.bscroll; 764 minlines += screen.cur.row - screen.bscroll;
765 min_it (minlines, screen.cur.row - top_row);
721 766
722 if (minlines > 0 767 if (minlines > 0
723 && screen.tscroll == 0 768 && screen.tscroll == 0
724 && screen.bscroll == nrow - 1) 769 && screen.bscroll == nrow - 1)
725 { 770 {
… …
730 } 775 }
731 776
732#ifdef DEBUG_STRICT 777#ifdef DEBUG_STRICT
733 assert (screen.cur.col < ncol); 778 assert (screen.cur.col < ncol);
734 assert (screen.cur.row < nrow 779 assert (screen.cur.row < nrow
735 && screen.cur.row >= -nsaved); 780 && screen.cur.row >= top_row);
736#endif 781#endif
737 int row = screen.cur.row; 782 int row = screen.cur.row;
738 783
739 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 784 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
740 785
… …
786 CLEAR_SELECTION (); 831 CLEAR_SELECTION ();
787 } 832 }
788 833
789 if (screen.flags & Screen_WrapNext) 834 if (screen.flags & Screen_WrapNext)
790 { 835 {
836 scr_do_wrap ();
837
791 max_it (line->l, ncol); 838 line->l = ncol;
792 line->is_longer (1); 839 line->is_longer (1);
793 840
794 scr_do_wrap ();
795
796 row = screen.cur.row; 841 row = screen.cur.row;
797 line = &ROW(row); /* _must_ refresh */ 842 line = &ROW(row); /* _must_ refresh */
798 } 843 }
799 844
800 // some utf-8 decoders "decode" surrogate characters: let's fix this. 845 // some utf-8 decoders "decode" surrogate characters: let's fix this.
801 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 846 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
802 c = 0xfffd; 847 c = 0xfffd;
803 848
804 // rely on wcwidth to tell us the character width, at least for non-latin1 849 // rely on wcwidth to tell us the character width, do wcwidth before
805 // do wcwidth before further replacements, as wcwidth might return -1 850 // further replacements, as wcwidth might return -1 for the line
806 // for the line drawing characters below as they might be invalid in the current 851 // drawing characters below as they might be invalid in the current
807 // locale. 852 // locale.
808 int width = c < 0x100 ? 1 : wcwidth (c); 853 int width = WCWIDTH (c);
809 854
810 if (charsets [screen.charset] == '0') // DEC SPECIAL 855 if (charsets [screen.charset] == '0') // DEC SPECIAL
811 { 856 {
812 // vt100 special graphics and line drawing 857 // vt100 special graphics and line drawing
813 // 5f-7e standard vt100 858 // 5f-7e standard vt100
… …
964/* 1009/*
965 * Process Backspace. Move back the cursor back a position, wrap if have to 1010 * Process Backspace. Move back the cursor back a position, wrap if have to
966 * XTERM_SEQ: CTRL-H 1011 * XTERM_SEQ: CTRL-H
967 */ 1012 */
968void 1013void
969rxvt_term::scr_backspace () 1014rxvt_term::scr_backspace () NOTHROW
970{ 1015{
971 want_refresh = 1;
972
973 if (screen.cur.col == 0) 1016 if (screen.cur.col == 0)
974 { 1017 {
975 if (screen.cur.row > 0) 1018 if (screen.cur.row > 0)
976 { 1019 {
977#ifdef TERMCAP_HAS_BW 1020#ifdef TERMCAP_HAS_BW
978 screen.cur.col = ncol - 1; 1021 screen.cur.col = ncol - 1;
979 screen.cur.row--; 1022 screen.cur.row--;
980 return; 1023 want_refresh = 1;
981#endif 1024#endif
982 } 1025 }
983 } 1026 }
984 else if (!(screen.flags & Screen_WrapNext)) 1027 else
985 scr_gotorc (0, -1, RELATIVE); 1028 scr_gotorc (0, -1, RELATIVE);
986
987 screen.flags &= ~Screen_WrapNext;
988} 1029}
989 1030
990/* ------------------------------------------------------------------------- */ 1031/* ------------------------------------------------------------------------- */
991/* 1032/*
992 * Process Horizontal Tab 1033 * Process Horizontal Tab
993 * count: +ve = forward; -ve = backwards 1034 * count: +ve = forward; -ve = backwards
994 * XTERM_SEQ: CTRL-I 1035 * XTERM_SEQ: CTRL-I
995 */ 1036 */
996void 1037void
997rxvt_term::scr_tab (int count, bool ht) 1038rxvt_term::scr_tab (int count, bool ht) NOTHROW
998{ 1039{
999 int i, x; 1040 int i, x;
1000 1041
1001 want_refresh = 1; 1042 want_refresh = 1;
1002 i = x = screen.cur.col; 1043 i = x = screen.cur.col;
… …
1015 x = i; 1056 x = i;
1016 1057
1017 if (!--count) 1058 if (!--count)
1018 break; 1059 break;
1019 } 1060 }
1020 else 1061 else
1021 ht &= l.t[i] == ' ' 1062 ht &= l.t[i] == ' '
1022 && RS_SAME (l.r[i], base_rend); 1063 && RS_SAME (l.r[i], base_rend);
1023 1064
1024 if (count) 1065 if (count)
1025 x = ncol - 1; 1066 x = ncol - 1;
1026 1067
1027 // store horizontal tab commands as characters inside the text 1068 // store horizontal tab commands as characters inside the text
1028 // buffer so they can be selected and pasted. 1069 // buffer so they can be selected and pasted.
1029 if (ht && OPTION (Opt_pastableTabs)) 1070 if (ht && option (Opt_pastableTabs))
1030 { 1071 {
1031 base_rend = SET_FONT (base_rend, 0); 1072 base_rend = SET_FONT (base_rend, 0);
1032 1073
1033 l.touch (x); 1074 l.touch (x);
1034 1075
… …
1067 * Process DEC Back Index 1108 * Process DEC Back Index
1068 * XTERM_SEQ: ESC 6 1109 * XTERM_SEQ: ESC 6
1069 * Move cursor left in row. If we're at the left boundary, shift everything 1110 * Move cursor left in row. If we're at the left boundary, shift everything
1070 * in that row right. Clear left column. 1111 * in that row right. Clear left column.
1071 */ 1112 */
1072#if ENABLE_FRILLS 1113#if !ENABLE_MINIMAL
1073void 1114void
1074rxvt_term::scr_backindex () 1115rxvt_term::scr_backindex () NOTHROW
1075{ 1116{
1076 if (screen.cur.col > 0) 1117 if (screen.cur.col > 0)
1077 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1118 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1078 else 1119 else
1079 scr_insdel_chars (1, INSERT); 1120 scr_insdel_chars (1, INSERT);
… …
1084 * Process DEC Forward Index 1125 * Process DEC Forward Index
1085 * XTERM_SEQ: ESC 9 1126 * XTERM_SEQ: ESC 9
1086 * Move cursor right in row. If we're at the right boundary, shift everything 1127 * Move cursor right in row. If we're at the right boundary, shift everything
1087 * in that row left. Clear right column. 1128 * in that row left. Clear right column.
1088 */ 1129 */
1089#if ENABLE_FRILLS 1130#if !ENABLE_MINIMAL
1090void 1131void
1091rxvt_term::scr_forwardindex () 1132rxvt_term::scr_forwardindex () NOTHROW
1092{ 1133{
1093 if (screen.cur.col < ncol - 1) 1134 if (screen.cur.col < ncol - 1)
1094 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1135 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1095 else 1136 else
1096 { 1137 {
… …
1109/* ------------------------------------------------------------------------- */ 1150/* ------------------------------------------------------------------------- */
1110/* 1151/*
1111 * Goto Row/Column 1152 * Goto Row/Column
1112 */ 1153 */
1113void 1154void
1114rxvt_term::scr_gotorc (int row, int col, int relative) 1155rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1115{ 1156{
1116 want_refresh = 1; 1157 want_refresh = 1;
1117 ZERO_SCROLLBACK (); 1158 ZERO_SCROLLBACK ();
1118 1159
1119 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1160 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1141 } 1182 }
1142 } 1183 }
1143 else 1184 else
1144 { 1185 {
1145 if (screen.flags & Screen_Relative) 1186 if (screen.flags & Screen_Relative)
1187 {
1146 { /* relative origin mode */ 1188 /* relative origin mode */
1147 screen.cur.row = row + screen.tscroll; 1189 screen.cur.row = row + screen.tscroll;
1148 min_it (screen.cur.row, screen.bscroll); 1190 min_it (screen.cur.row, screen.bscroll);
1149 } 1191 }
1150 else 1192 else
1151 screen.cur.row = row; 1193 screen.cur.row = row;
… …
1157/* ------------------------------------------------------------------------- */ 1199/* ------------------------------------------------------------------------- */
1158/* 1200/*
1159 * direction should be UP or DN 1201 * direction should be UP or DN
1160 */ 1202 */
1161void 1203void
1162rxvt_term::scr_index (enum page_dirn direction) 1204rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1163{ 1205{
1164 int dirn; 1206 int dirn;
1165 1207
1166 want_refresh = 1; 1208 want_refresh = 1;
1167 ZERO_SCROLLBACK (); 1209 ZERO_SCROLLBACK ();
… …
1186 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1228 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1187 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1229 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1230 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1189 */ 1231 */
1190void 1232void
1191rxvt_term::scr_erase_line (int mode) 1233rxvt_term::scr_erase_line (int mode) NOTHROW
1192{ 1234{
1193 unsigned int col, num; 1235 unsigned int col, num;
1194 1236
1195 want_refresh = 1; 1237 want_refresh = 1;
1196 ZERO_SCROLLBACK (); 1238 ZERO_SCROLLBACK ();
… …
1240 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1282 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1241 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1283 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1242 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1284 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1243 */ 1285 */
1244void 1286void
1245rxvt_term::scr_erase_screen (int mode) 1287rxvt_term::scr_erase_screen (int mode) NOTHROW
1246{ 1288{
1247 int num; 1289 int num;
1248 int32_t row; 1290 int32_t row;
1249 rend_t ren; 1291 rend_t ren;
1250 XGCValues gcvalue; 1292 XGCValues gcvalue;
… …
1295 } 1337 }
1296 else 1338 else
1297 { 1339 {
1298 ren = rstyle & (RS_fgMask | RS_bgMask); 1340 ren = rstyle & (RS_fgMask | RS_bgMask);
1299 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1341 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1300 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1342 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1301 ERASE_ROWS (row, num); 1343 ERASE_ROWS (row, num);
1302 gcvalue.foreground = pix_colors[Color_fg]; 1344 gcvalue.foreground = pix_colors[Color_fg];
1303 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1345 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1304 } 1346 }
1305 1347
1306 for (; num--; row++) 1348 for (; num--; row++)
1307 { 1349 {
1308 scr_blank_screen_mem (ROW(row), rstyle); 1350 scr_blank_screen_mem (ROW(row), rstyle);
1309 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1351 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1310 } 1352 }
1311} 1353}
1312 1354
1313#if ENABLE_FRILLS 1355#if !ENABLE_MINIMAL
1314void 1356void
1315rxvt_term::scr_erase_savelines () 1357rxvt_term::scr_erase_savelines () NOTHROW
1316{ 1358{
1317 want_refresh = 1; 1359 want_refresh = 1;
1318 ZERO_SCROLLBACK (); 1360 ZERO_SCROLLBACK ();
1319 1361
1320 nsaved = 0; 1362 top_row = 0;
1321} 1363}
1322#endif 1364#endif
1323 1365
1324/* ------------------------------------------------------------------------- */ 1366/* ------------------------------------------------------------------------- */
1325/* 1367/*
1326 * Fill the screen with `E's 1368 * Fill the screen with `E's
1327 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1369 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1328 */ 1370 */
1329void 1371void
1330rxvt_term::scr_E () 1372rxvt_term::scr_E () NOTHROW
1331{ 1373{
1332 rend_t fs; 1374 rend_t fs;
1333 1375
1334 want_refresh = 1; 1376 want_refresh = 1;
1335 ZERO_SCROLLBACK (); 1377 ZERO_SCROLLBACK ();
… …
1356/* ------------------------------------------------------------------------- */ 1398/* ------------------------------------------------------------------------- */
1357/* 1399/*
1358 * Insert/Delete <count> lines 1400 * Insert/Delete <count> lines
1359 */ 1401 */
1360void 1402void
1361rxvt_term::scr_insdel_lines (int count, int insdel) 1403rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1362{ 1404{
1363 int end; 1405 int end;
1364 1406
1365 ZERO_SCROLLBACK (); 1407 ZERO_SCROLLBACK ();
1366 1408
… …
1386/* ------------------------------------------------------------------------- */ 1428/* ------------------------------------------------------------------------- */
1387/* 1429/*
1388 * Insert/Delete <count> characters from the current position 1430 * Insert/Delete <count> characters from the current position
1389 */ 1431 */
1390void 1432void
1391rxvt_term::scr_insdel_chars (int count, int insdel) 1433rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1392{ 1434{
1393 int col, row; 1435 int col, row;
1394 rend_t tr; 1436 rend_t tr;
1395 1437
1396 want_refresh = 1; 1438 want_refresh = 1;
… …
1427 { 1469 {
1428 if (selection.end.row != screen.cur.row 1470 if (selection.end.row != screen.cur.row
1429 || (selection.end.col + count >= ncol)) 1471 || (selection.end.col + count >= ncol))
1430 CLEAR_SELECTION (); 1472 CLEAR_SELECTION ();
1431 else 1473 else
1474 {
1432 { /* shift selection */ 1475 /* shift selection */
1433 selection.beg.col += count; 1476 selection.beg.col += count;
1434 selection.mark.col += count; /* XXX: yes? */ 1477 selection.mark.col += count; /* XXX: yes? */
1435 selection.end.col += count; 1478 selection.end.col += count;
1436 } 1479 }
1437 } 1480 }
… …
1484/* 1527/*
1485 * Set the scrolling region 1528 * Set the scrolling region
1486 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1529 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1487 */ 1530 */
1488void 1531void
1489rxvt_term::scr_scroll_region (int top, int bot) 1532rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1490{ 1533{
1491 max_it (top, 0); 1534 max_it (top, 0);
1492 min_it (bot, nrow - 1); 1535 min_it (bot, nrow - 1);
1493 1536
1494 if (top > bot) 1537 if (top > bot)
… …
1504 * Make the cursor visible/invisible 1547 * Make the cursor visible/invisible
1505 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1548 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1506 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1549 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1507 */ 1550 */
1508void 1551void
1509rxvt_term::scr_cursor_visible (int mode) 1552rxvt_term::scr_cursor_visible (int mode) NOTHROW
1510{ 1553{
1511 want_refresh = 1; 1554 want_refresh = 1;
1512 1555
1513 if (mode) 1556 if (mode)
1514 screen.flags |= Screen_VisibleCursor; 1557 screen.flags |= Screen_VisibleCursor;
… …
1521 * Set/unset automatic wrapping 1564 * Set/unset automatic wrapping
1522 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1565 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1523 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1566 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1524 */ 1567 */
1525void 1568void
1526rxvt_term::scr_autowrap (int mode) 1569rxvt_term::scr_autowrap (int mode) NOTHROW
1527{ 1570{
1528 if (mode) 1571 if (mode)
1529 screen.flags |= Screen_Autowrap; 1572 screen.flags |= Screen_Autowrap;
1530 else 1573 else
1531 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1574 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1540 * and the cursor cannot be moved outside. 1583 * and the cursor cannot be moved outside.
1541 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1584 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1542 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1585 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1543 */ 1586 */
1544void 1587void
1545rxvt_term::scr_relative_origin (int mode) 1588rxvt_term::scr_relative_origin (int mode) NOTHROW
1546{ 1589{
1547 if (mode) 1590 if (mode)
1548 screen.flags |= Screen_Relative; 1591 screen.flags |= Screen_Relative;
1549 else 1592 else
1550 screen.flags &= ~Screen_Relative; 1593 screen.flags &= ~Screen_Relative;
… …
1557 * Set insert/replace mode 1600 * Set insert/replace mode
1558 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1601 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1559 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1602 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1560 */ 1603 */
1561void 1604void
1562rxvt_term::scr_insert_mode (int mode) 1605rxvt_term::scr_insert_mode (int mode) NOTHROW
1563{ 1606{
1564 if (mode) 1607 if (mode)
1565 screen.flags |= Screen_Insert; 1608 screen.flags |= Screen_Insert;
1566 else 1609 else
1567 screen.flags &= ~Screen_Insert; 1610 screen.flags &= ~Screen_Insert;
… …
1573 * XTERM_SEQ: Set tab at current column : ESC H 1616 * XTERM_SEQ: Set tab at current column : ESC H
1574 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1617 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1575 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1618 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1576 */ 1619 */
1577void 1620void
1578rxvt_term::scr_set_tab (int mode) 1621rxvt_term::scr_set_tab (int mode) NOTHROW
1579{ 1622{
1580 if (mode < 0) 1623 if (mode < 0)
1581 memset (tabs, 0, ncol * sizeof (char)); 1624 memset (tabs, 0, ncol);
1582 else if (screen.cur.col < ncol) 1625 else if (screen.cur.col < ncol)
1583 tabs [screen.cur.col] = !!mode; 1626 tabs [screen.cur.col] = !!mode;
1584} 1627}
1585 1628
1586/* ------------------------------------------------------------------------- */ 1629/* ------------------------------------------------------------------------- */
… …
1588 * Set reverse/normal video 1631 * Set reverse/normal video
1589 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1632 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1590 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1633 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1591 */ 1634 */
1592void 1635void
1593rxvt_term::scr_rvideo_mode (int mode) 1636rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1594{ 1637{
1595 XGCValues gcvalue; 1638 rvideo_mode = on;
1596 1639
1640#ifndef NO_BELL
1641 on ^= rvideo_bell;
1642#endif
1643
1597 if (rvideo != mode) 1644 if (rvideo_state != on)
1598 { 1645 {
1599 rvideo = mode; 1646 rvideo_state = on;
1647
1600 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1601#if XPM_BACKGROUND 1649#ifdef HAVE_BG_PIXMAP
1602 if (bgPixmap.pixmap == None) 1650 if (bgPixmap.pixmap == None)
1603#endif 1651#endif
1604#if TRANSPARENT 1652 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1605 if (! OPTION (Opt_transparent) || am_transparent == 0)
1606#endif
1607 XSetWindowBackground (display->display, vt,
1608 pix_colors[Color_bg]);
1609 1653
1654 XGCValues gcvalue;
1610 gcvalue.foreground = pix_colors[Color_fg]; 1655 gcvalue.foreground = pix_colors[Color_fg];
1611 gcvalue.background = pix_colors[Color_bg]; 1656 gcvalue.background = pix_colors[Color_bg];
1612 XChangeGC (display->display, gc, GCBackground | GCForeground, 1657 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1613 &gcvalue); 1658
1614 scr_clear (); 1659 scr_clear ();
1615 scr_touch (true); 1660 scr_touch (true);
1616 } 1661 }
1617} 1662}
1618 1663
… …
1620/* 1665/*
1621 * Report current cursor position 1666 * Report current cursor position
1622 * XTERM_SEQ: Report position: ESC [ 6 n 1667 * XTERM_SEQ: Report position: ESC [ 6 n
1623 */ 1668 */
1624void 1669void
1625rxvt_term::scr_report_position () 1670rxvt_term::scr_report_position () NOTHROW
1626{ 1671{
1627 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1672 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1628} 1673}
1629 1674
1630/* ------------------------------------------------------------------------- * 1675/* ------------------------------------------------------------------------- *
… …
1633 1678
1634/* 1679/*
1635 * Set font style 1680 * Set font style
1636 */ 1681 */
1637void 1682void
1638rxvt_term::set_font_style () 1683rxvt_term::set_font_style () NOTHROW
1639{ 1684{
1640#if 0 1685#if 0
1641 switch (charsets [screen.charset]) 1686 switch (charsets [screen.charset])
1642 { 1687 {
1643 case '0': /* DEC Special Character & Line Drawing Set */ 1688 case '0': /* DEC Special Character & Line Drawing Set */
… …
1665 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1710 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1666 * XTERM_SEQ: Invoke G2 character set: ESC N 1711 * XTERM_SEQ: Invoke G2 character set: ESC N
1667 * XTERM_SEQ: Invoke G3 character set: ESC O 1712 * XTERM_SEQ: Invoke G3 character set: ESC O
1668 */ 1713 */
1669void 1714void
1670rxvt_term::scr_charset_choose (int set) 1715rxvt_term::scr_charset_choose (int set) NOTHROW
1671{ 1716{
1672 screen.charset = set; 1717 screen.charset = set;
1673 set_font_style (); 1718 set_font_style ();
1674} 1719}
1675 1720
… …
1681 * XTERM_SEQ: Set G2 character set: ESC * <C> 1726 * XTERM_SEQ: Set G2 character set: ESC * <C>
1682 * XTERM_SEQ: Set G3 character set: ESC + <C> 1727 * XTERM_SEQ: Set G3 character set: ESC + <C>
1683 * See set_font_style for possible values for <C> 1728 * See set_font_style for possible values for <C>
1684 */ 1729 */
1685void 1730void
1686rxvt_term::scr_charset_set (int set, unsigned int ch) 1731rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1687{ 1732{
1688 charsets[set] = (unsigned char)ch; 1733 charsets[set] = (unsigned char)ch;
1689 set_font_style (); 1734 set_font_style ();
1690} 1735}
1691 1736
… …
1696 1741
1697/* 1742/*
1698 * refresh matching text. 1743 * refresh matching text.
1699 */ 1744 */
1700bool 1745bool
1701rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1746rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1702{ 1747{
1703 bool found = false; 1748 bool found = false;
1704 1749
1705 for (int i = 0; i < nrow; i++) 1750 for (int i = 0; i < nrow; i++)
1706 { 1751 {
1707 int col = 0;
1708 rend_t *drp = drawn_buf[i].r; 1752 rend_t *drp = drawn_buf[i].r;
1709 1753
1710 for (; col < ncol; col++, drp++) 1754 for (int col = 0; col < ncol; col++, drp++)
1711 if ((*drp & mask) == value) 1755 if ((*drp & mask) == value)
1712 { 1756 {
1713 found = true; 1757 found = true;
1714 *drp = ~value; 1758 *drp = ~value;
1715 } 1759 }
… …
1726 PART_END, 1770 PART_END,
1727 RC_COUNT 1771 RC_COUNT
1728}; 1772};
1729 1773
1730void 1774void
1731rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1775rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1732{ 1776{
1733 int i; 1777 int i;
1734 row_col_t rc[RC_COUNT]; 1778 row_col_t rc[RC_COUNT];
1735 1779
1736 if (!drawn_buf) /* sanity check */ 1780 if (!drawn_buf) /* sanity check */
… …
1755 for (i = PART_BEG; i < RC_COUNT; i++) 1799 for (i = PART_BEG; i < RC_COUNT; i++)
1756 { 1800 {
1757 min_it (rc[i].col, ncol - 1); 1801 min_it (rc[i].col, ncol - 1);
1758 min_it (rc[i].row, nrow - 1); 1802 min_it (rc[i].row, nrow - 1);
1759 } 1803 }
1760 1804// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1761 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1805 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1762 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1806 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1763 1807
1808 num_scr_allow = 0;
1809
1764 if (refresh) 1810 if (refresh)
1765 scr_refresh (SLOW_REFRESH); 1811 scr_refresh ();
1766} 1812}
1767 1813
1768/* ------------------------------------------------------------------------- */ 1814/* ------------------------------------------------------------------------- */
1769/* 1815/*
1770 * Refresh the entire screen 1816 * Refresh the entire screen
1771 */ 1817 */
1772void 1818void
1773rxvt_term::scr_touch (bool refresh) 1819rxvt_term::scr_touch (bool refresh) NOTHROW
1774{ 1820{
1775 scr_expose (0, 0, width, height, refresh); 1821 scr_expose (0, 0, width, height, refresh);
1776} 1822}
1777 1823
1778/* ------------------------------------------------------------------------- */ 1824/* ------------------------------------------------------------------------- */
1779/* 1825/*
1780 * Move the display so that the line represented by scrollbar value Y is at 1826 * Move the display so that the line represented by scrollbar value Y is at
1781 * the top of the screen 1827 * the top of the screen
1782 */ 1828 */
1783int 1829void
1784rxvt_term::scr_move_to (int y, int len) 1830rxvt_term::scr_move_to (int y, int len) NOTHROW
1785{ 1831{
1786 long p = 0; 1832 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1787 unsigned int oldviewstart;
1788
1789 oldviewstart = view_start;
1790
1791 if (y < len)
1792 {
1793 p = (nrow + nsaved) * (len - y) / len;
1794 p -= (long) (nrow - 1);
1795 p = max (p, 0);
1796 }
1797
1798 view_start = (unsigned int)min (p, nsaved);
1799
1800 return scr_changeview (oldviewstart);
1801} 1833}
1802 1834
1803/* ------------------------------------------------------------------------- */ 1835/* ------------------------------------------------------------------------- */
1804/* 1836/*
1805 * Page the screen up/down nlines 1837 * Page the screen up/down nlines
1806 * direction should be UP or DN 1838 * direction should be UP or DN
1807 */ 1839 */
1808int 1840bool
1809rxvt_term::scr_page (enum page_dirn direction, int nlines) 1841rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1810{ 1842{
1811 int n; 1843 int new_view_start =
1812 unsigned int oldviewstart;
1813
1814 oldviewstart = view_start;
1815
1816 if (direction == UP)
1817 {
1818 n = view_start + nlines;
1819 view_start = min (n, nsaved);
1820 }
1821 else
1822 {
1823 n = view_start - nlines; 1844 direction == UP ? view_start - nlines
1824 view_start = max (n, 0); 1845 : view_start + nlines;
1825 }
1826 1846
1827 return scr_changeview (oldviewstart); 1847 return scr_changeview (new_view_start);
1828} 1848}
1829 1849
1830int 1850bool
1831rxvt_term::scr_changeview (unsigned int oldviewstart) 1851rxvt_term::scr_changeview (int new_view_start) NOTHROW
1832{ 1852{
1853 clamp_it (new_view_start, top_row, 0);
1854
1833 if (view_start != oldviewstart) 1855 if (new_view_start == view_start)
1834 { 1856 return false;
1857
1858 num_scr += new_view_start - view_start;
1859 view_start = new_view_start;
1860 want_refresh = 1;
1861
1835 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1862 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1836 1863
1837 want_refresh = 1; 1864 return true;
1838 num_scr -= (view_start - oldviewstart);
1839 }
1840
1841 return (int)view_start - (int)oldviewstart;
1842} 1865}
1843 1866
1844/* ------------------------------------------------------------------------- */ 1867#ifndef NO_BELL
1845void 1868void
1869rxvt_term::bell_cb (ev::timer &w, int revents)
1870{
1871 rvideo_bell = false;
1872 scr_rvideo_mode (rvideo_mode);
1873 refresh_check ();
1874}
1875#endif
1876
1877/* ------------------------------------------------------------------------- */
1878void
1846rxvt_term::scr_bell () 1879rxvt_term::scr_bell () NOTHROW
1847{ 1880{
1848#ifndef NO_BELL 1881#ifndef NO_BELL
1849 1882
1850# ifndef NO_MAPALERT 1883# ifndef NO_MAPALERT
1851# ifdef MAPALERT_OPTION 1884# ifdef MAPALERT_OPTION
1852 if (OPTION (Opt_mapAlert)) 1885 if (option (Opt_mapAlert))
1853# endif 1886# endif
1854 XMapWindow (display->display, parent[0]); 1887 XMapWindow (dpy, parent[0]);
1855# endif 1888# endif
1856 1889
1857 if (OPTION (Opt_visualBell)) 1890# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell))
1892 {
1893 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1894 {
1895 h->flags |= XUrgencyHint;
1896 XSetWMHints (dpy, parent[0], h);
1897 }
1858 { 1898 }
1859 scr_rvideo_mode (!rvideo); /* refresh also done */ 1899# endif
1900
1901 if (option (Opt_visualBell))
1902 {
1903 rvideo_bell = true;
1904 scr_rvideo_mode (rvideo_mode);
1905 flush ();
1906
1860 rxvt_usleep (VISUAL_BELL_DURATION); 1907 bell_ev.start (VISUAL_BELL_DURATION);
1861 scr_rvideo_mode (!rvideo); /* refresh also done */
1862 } 1908 }
1863 else 1909 else
1864 XBell (display->display, 0); 1910 XBell (dpy, 0);
1865
1866#endif 1911#endif
1867} 1912}
1868 1913
1869/* ------------------------------------------------------------------------- */ 1914/* ------------------------------------------------------------------------- */
1870/* ARGSUSED */ 1915/* ARGSUSED */
1871void 1916void
1872rxvt_term::scr_printscreen (int fullhist) 1917rxvt_term::scr_printscreen (int fullhist) NOTHROW
1873{ 1918{
1874#ifdef PRINTPIPE 1919#ifdef PRINTPIPE
1875 int nrows, row_start; 1920 int nrows, row_start;
1876 FILE *fd; 1921 FILE *fd;
1877 1922
1878 if ((fd = popen_printer ()) == NULL) 1923 if ((fd = popen_printer ()) == NULL)
1879 return; 1924 return;
1880 1925
1881 if (fullhist) 1926 if (fullhist)
1882 { 1927 {
1883 nrows = nrow + nsaved; 1928 nrows = nrow - top_row;
1884 row_start = -nsaved; 1929 row_start = top_row;
1885 } 1930 }
1886 else 1931 else
1887 { 1932 {
1888 nrows = nrow; 1933 nrows = nrow;
1889 row_start = -view_start; 1934 row_start = view_start;
1890 } 1935 }
1891 1936
1892 wctomb (0, 0); 1937 wctomb (0, 0);
1893 1938
1894 for (int r1 = 0; r1 < nrows; r1++) 1939 for (int r1 = 0; r1 < nrows; r1++)
… …
1926 * Refresh the screen 1971 * Refresh the screen
1927 * drawn_text/drawn_rend contain the screen information before the update. 1972 * drawn_text/drawn_rend contain the screen information before the update.
1928 * screen.text/screen.rend contain what the screen will change to. 1973 * screen.text/screen.rend contain what the screen will change to.
1929 */ 1974 */
1930void 1975void
1931rxvt_term::scr_refresh (unsigned char refresh_type) 1976rxvt_term::scr_refresh () NOTHROW
1932{ 1977{
1933 unsigned char must_clear, /* use draw_string not draw_image_string */ 1978 unsigned char have_bg,
1934 showcursor; /* show the cursor */ 1979 showcursor; /* show the cursor */
1935 int16_t col, row, /* column/row we're processing */ 1980 int16_t col, row, /* column/row we're processing */
1936 ocrow; /* old cursor row */ 1981 ocrow; /* old cursor row */
1937 int i; /* tmp */ 1982 int i; /* tmp */
1938#ifndef NO_CURSORCOLOR 1983#ifndef NO_CURSORCOLOR
1939 rend_t cc1; /* store colours at cursor position (s) */ 1984 rend_t cc1; /* store colours at cursor position (s) */
1940#endif 1985#endif
1941 rend_t *crp; // cursor rendition pointer 1986 rend_t *crp; // cursor rendition pointer
1987 rend_t ccol1, /* Cursor colour */
1988 ccol2; /* Cursor colour2 */
1942 1989
1943 want_refresh = 0; /* screen is current */ 1990 want_refresh = 0; /* screen is current */
1944 1991
1945 if (refresh_type == NO_REFRESH || !mapped) 1992 if (refresh_type == NO_REFRESH || !mapped)
1946 return; 1993 return;
1947 1994
1948 /* 1995 /*
1949 * A: set up vars 1996 * A: set up vars
1950 */ 1997 */
1951 must_clear = 0; 1998 have_bg = 0;
1952 refresh_count = 0; 1999 refresh_count = 0;
1953 2000
1954#if XPM_BACKGROUND 2001#ifdef HAVE_BG_PIXMAP
1955 must_clear |= bgPixmap.pixmap != None; 2002 have_bg |= bgPixmap.pixmap != None;
1956#endif
1957#if TRANSPARENT
1958 must_clear |= OPTION (Opt_transparent) && am_transparent;
1959#endif 2003#endif
1960 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2004 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1961 2005
1962 /* 2006 /*
1963 * B: reverse any characters which are selected 2007 * B: reverse any characters which are selected
… …
1967 /* 2011 /*
1968 * C: set the cursor character (s) 2012 * C: set the cursor character (s)
1969 */ 2013 */
1970 { 2014 {
1971 unsigned char setoldcursor; 2015 unsigned char setoldcursor;
1972 rend_t ccol1, /* Cursor colour */
1973 ccol2; /* Cursor colour2 */
1974 2016
1975 showcursor = (screen.flags & Screen_VisibleCursor); 2017 showcursor = (screen.flags & Screen_VisibleCursor);
1976#ifdef CURSOR_BLINK 2018#ifdef CURSOR_BLINK
1977 if (hidden_cursor) 2019 if (hidden_cursor)
1978 showcursor = 0; 2020 showcursor = 0;
… …
1985 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2027 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1986 col--; 2028 col--;
1987 2029
1988 crp = &ROW(screen.cur.row).r[col]; 2030 crp = &ROW(screen.cur.row).r[col];
1989 2031
2032#ifndef NO_CURSORCOLOR
2033 cc1 = *crp & (RS_fgMask | RS_bgMask);
2034 if (ISSET_PIXCOLOR (Color_cursor))
2035 ccol1 = Color_cursor;
2036 else
2037#endif
2038#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2039 ccol1 = fgcolor_of (rstyle);
2040#else
2041 ccol1 = Color_fg;
2042#endif
2043
2044#ifndef NO_CURSORCOLOR
2045 if (ISSET_PIXCOLOR (Color_cursor2))
2046 ccol2 = Color_cursor2;
2047 else
2048#endif
2049#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2050 ccol2 = bgcolor_of (rstyle);
2051#else
2052 ccol2 = Color_bg;
2053#endif
2054
1990 if (showcursor && focus) 2055 if (showcursor && focus)
1991 { 2056 {
1992 if (OPTION (Opt_cursorUnderline)) 2057 if (option (Opt_cursorUnderline))
1993 *crp ^= RS_Uline; 2058 *crp ^= RS_Uline;
1994 else 2059 else
1995 { 2060 {
1996 *crp ^= RS_RVid; 2061 *crp ^= RS_RVid;
1997
1998#ifndef NO_CURSORCOLOR
1999 cc1 = *crp & (RS_fgMask | RS_bgMask);
2000 if (ISSET_PIXCOLOR (Color_cursor))
2001 ccol1 = Color_cursor;
2002 else
2003#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2004 ccol1 = fgcolor_of (rstyle);
2005#else
2006 ccol1 = Color_fg;
2007#endif
2008 if (ISSET_PIXCOLOR (Color_cursor2))
2009 ccol2 = Color_cursor2;
2010 else
2011#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2012 ccol2 = bgcolor_of (rstyle);
2013#else
2014 ccol2 = Color_bg;
2015#endif
2016 *crp = SET_FGCOLOR (*crp, ccol1); 2062 *crp = SET_FGCOLOR (*crp, ccol1);
2017 *crp = SET_BGCOLOR (*crp, ccol2); 2063 *crp = SET_BGCOLOR (*crp, ccol2);
2018#endif
2019 } 2064 }
2020 } 2065 }
2021 } 2066 }
2022 2067
2023 /* make sure no outline cursor is left around */ 2068 /* make sure no outline cursor is left around */
2024 setoldcursor = 0; 2069 setoldcursor = 0;
2025 if (ocrow != -1) 2070 if (ocrow != -1)
2026 { 2071 {
2027 if (screen.cur.row + view_start != ocrow 2072 if (screen.cur.row - view_start != ocrow
2028 || screen.cur.col != oldcursor.col) 2073 || screen.cur.col != oldcursor.col)
2029 { 2074 {
2030 if (ocrow < nrow 2075 if (ocrow < nrow
2031 && oldcursor.col < ncol) 2076 && oldcursor.col < ncol)
2032 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2077 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2040 else if (!focus) 2085 else if (!focus)
2041 setoldcursor = 1; 2086 setoldcursor = 1;
2042 2087
2043 if (setoldcursor) 2088 if (setoldcursor)
2044 { 2089 {
2045 if (screen.cur.row + view_start >= nrow) 2090 if (screen.cur.row - view_start >= nrow)
2046 oldcursor.row = -1; 2091 oldcursor.row = -1;
2047 else 2092 else
2048 { 2093 {
2049 oldcursor.row = screen.cur.row + view_start; 2094 oldcursor.row = screen.cur.row - view_start;
2050 oldcursor.col = screen.cur.col; 2095 oldcursor.col = screen.cur.col;
2051 } 2096 }
2052 } 2097 }
2053 } 2098 }
2054 2099
… …
2060#ifndef NO_SLOW_LINK_SUPPORT 2105#ifndef NO_SLOW_LINK_SUPPORT
2061 /* 2106 /*
2062 * D: CopyArea pass - very useful for slower links 2107 * D: CopyArea pass - very useful for slower links
2063 * This has been deliberately kept simple. 2108 * This has been deliberately kept simple.
2064 */ 2109 */
2065 i = num_scr;
2066 if (!display->is_local 2110 if (!display->is_local
2067 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2111 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2068 && abs (num_scr) < nrow && !must_clear) 2112 && abs (num_scr) < nrow && !have_bg)
2069 { 2113 {
2070 int16_t nits; 2114 int16_t nits;
2115 int i = num_scr;
2071 int j; 2116 int j;
2072 int len, wlen; 2117 int len, wlen;
2118 dLocal (int, num_scr);
2073 2119
2074 j = nrow; 2120 j = nrow;
2075 wlen = len = -1; 2121 wlen = len = -1;
2076 row = i > 0 ? 0 : j - 1; 2122 row = i > 0 ? 0 : j - 1;
2123
2077 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2124 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2078 { 2125 {
2079 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2126 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2080 { 2127 {
2081 line_t s = ROW(row - view_start); 2128 line_t s = ROW(view_start + row);
2082 line_t d = drawn_buf[row]; 2129 line_t d = drawn_buf[row];
2083 line_t d2 = drawn_buf[row + i]; 2130 line_t d2 = drawn_buf[row + i];
2084 2131
2085 for (nits = 0, col = ncol; col--; ) 2132 for (nits = 0, col = ncol; col--; )
2086 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2133 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2102 wlen = row; 2149 wlen = row;
2103 continue; 2150 continue;
2104 } 2151 }
2105 } 2152 }
2106 2153
2107 if (len != -1) 2154 if (len >= 0)
2108 { 2155 {
2109 /* also comes here at end if needed because of >= above */ 2156 /* also comes here at end if needed because of >= above */
2110 if (wlen < len) 2157 if (wlen < len)
2111 ::swap (wlen, len); 2158 ::swap (wlen, len);
2112 2159
2160 XGCValues gcv;
2161
2162 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2113 XCopyArea (display->display, vt, vt, 2163 XCopyArea (dpy, vt, vt,
2114 gc, 0, Row2Pixel (len + i), 2164 gc, 0, Row2Pixel (len + i),
2115 (unsigned int)this->width, 2165 (unsigned int)this->width,
2116 (unsigned int)Height2Pixel (wlen - len + 1), 2166 (unsigned int)Height2Pixel (wlen - len + 1),
2117 0, Row2Pixel (len)); 2167 0, Row2Pixel (len));
2168 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2169
2118 len = -1; 2170 len = -1;
2119 } 2171 }
2120 } 2172 }
2121 } 2173 }
2122#endif 2174#endif
… …
2124 /* 2176 /*
2125 * E: main pass across every character 2177 * E: main pass across every character
2126 */ 2178 */
2127 for (row = 0; row < nrow; row++) 2179 for (row = 0; row < nrow; row++)
2128 { 2180 {
2129 text_t *stp = ROW(row - view_start).t; 2181 text_t *stp = ROW(view_start + row).t;
2130 rend_t *srp = ROW(row - view_start).r; 2182 rend_t *srp = ROW(view_start + row).r;
2131 text_t *dtp = drawn_buf[row].t; 2183 text_t *dtp = drawn_buf[row].t;
2132 rend_t *drp = drawn_buf[row].r; 2184 rend_t *drp = drawn_buf[row].r;
2133 2185
2134 /* 2186 /*
2135 * E2: OK, now the real pass 2187 * E2: OK, now the real pass
… …
2178 count++; 2230 count++;
2179 2231
2180 if (stp[col] != dtp[col] 2232 if (stp[col] != dtp[col]
2181 || !RS_SAME (srp[col], drp[col])) 2233 || !RS_SAME (srp[col], drp[col]))
2182 { 2234 {
2183 if (must_clear && (i++ > count / 2)) 2235 if (have_bg && (i++ > count / 2))
2184 break; 2236 break;
2185 2237
2186 dtp[col] = stp[col]; 2238 dtp[col] = stp[col];
2187 drp[col] = rend; 2239 drp[col] = rend;
2188 i = 0; 2240 i = 0;
2189 } 2241 }
2190 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2242 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2191 break; 2243 break;
2192 } 2244 }
2193 2245
2194 col--; /* went one too far. move back */ 2246 col--; /* went one too far. move back */
2195 count -= i; /* dump any matching trailing chars */ 2247 count -= i; /* dump any matching trailing chars */
… …
2205 int back = bgcolor_of (rend); // desired background 2257 int back = bgcolor_of (rend); // desired background
2206 2258
2207 // only do special processing if any attributes are set, which is unlikely 2259 // only do special processing if any attributes are set, which is unlikely
2208 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2260 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2209 { 2261 {
2210#if ENABLE_STYLES
2211 // force redraw after "careful" characters to avoid pixel droppings
2212 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2213 drp[col + 1] = ~srp[col + 1];
2214
2215 // include previous careful character(s) if possible, looks nicer (best effort...)
2216 while (text > stp
2217 && srp[text - stp - 1] & RS_Careful
2218 && RS_SAME (rend, srp[text - stp - 1]))
2219 text--, count++, xpixel -= fwidth;
2220#endif
2221
2222 bool invert = rend & RS_RVid; 2262 bool invert = rend & RS_RVid;
2223 2263
2224#ifndef NO_BOLD_UNDERLINE_REVERSE 2264#ifndef NO_BOLD_UNDERLINE_REVERSE
2225 if (rend & RS_Bold
2226 && fore == Color_fg) 2265 if (rend & RS_Bold && fore == Color_fg)
2227 { 2266 {
2228 if (ISSET_PIXCOLOR (Color_BD)) 2267 if (ISSET_PIXCOLOR (Color_BD))
2229 fore = Color_BD; 2268 fore = Color_BD;
2230# if !ENABLE_STYLES 2269# if !ENABLE_STYLES
2231 else 2270 else
2232 invert = !invert; 2271 invert = !invert;
2233# endif 2272# endif
2234 } 2273 }
2235 2274
2236 if (rend & RS_Italic 2275 if (rend & RS_Italic && fore == Color_fg)
2237 && fore == Color_fg)
2238 { 2276 {
2239 if (ISSET_PIXCOLOR (Color_IT)) 2277 if (ISSET_PIXCOLOR (Color_IT))
2240 fore = Color_IT; 2278 fore = Color_IT;
2241# if !ENABLE_STYLES 2279# if !ENABLE_STYLES
2242 else 2280 else
2243 invert = !invert; 2281 invert = !invert;
2244# endif 2282# endif
2245 } 2283 }
2246 2284
2247 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2285 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2248 fore = Color_UL; 2286 fore = Color_UL;
2249#endif 2287#endif
2250 2288
2251 if (invert) 2289 if (invert)
2252 { 2290 {
2291#ifdef OPTION_HC
2292 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2293 || !ISSET_PIXCOLOR (Color_HC))
2294#endif
2295 /* invert the column if no highlightColor is set or it is the
2296 * current cursor column */
2253 ::swap (fore, back); 2297 ::swap (fore, back);
2298#ifdef OPTION_HC
2299 else if (ISSET_PIXCOLOR (Color_HC))
2300 back = Color_HC;
2301#endif
2254 2302
2255#ifndef NO_BOLD_UNDERLINE_REVERSE 2303#ifndef NO_BOLD_UNDERLINE_REVERSE
2304# ifndef OPTION_HC
2256 if (ISSET_PIXCOLOR (Color_RV)) 2305 if (ISSET_PIXCOLOR (Color_RV))
2257 back = Color_RV; 2306 back = Color_RV;
2258 2307# endif
2259 if (fore == back) 2308 if (fore == back)
2260 { 2309 {
2261 fore = Color_bg; 2310 fore = Color_bg;
2262 back = Color_fg; 2311 back = Color_fg;
2263 } 2312 }
… …
2265 } 2314 }
2266 2315
2267#ifdef TEXT_BLINK 2316#ifdef TEXT_BLINK
2268 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2317 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2269 { 2318 {
2270 if (!text_blink_ev.active) 2319 if (!text_blink_ev.is_active ())
2271 { 2320 {
2272 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2321 text_blink_ev.again ();
2273 hidden_text = 0; 2322 hidden_text = 0;
2274 } 2323 }
2275 else if (hidden_text) 2324 else if (hidden_text)
2276 fore = back; 2325 fore = back;
2277 } 2326 }
2278#endif 2327#endif
2328
2329#if ENABLE_STYLES
2330 // "careful" (too wide) character handling
2331
2332 // include previous careful character(s) if possible, looks nicer (best effort...)
2333 while (text > stp
2334 && srp[text - stp - 1] & RS_Careful
2335 && RS_SAME (rend, srp[text - stp - 1]))
2336 text--, count++, xpixel -= fwidth;
2337
2338 // force redraw after "careful" characters to avoid pixel droppings
2339 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2340 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2341
2342 // force redraw before "careful" characters to avoid pixel droppings
2343 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2344 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2345#endif
2279 } 2346 }
2280 2347
2281 /* 2348 /*
2282 * Actually do the drawing of the string here 2349 * Actually do the drawing of the string here
2283 */ 2350 */
2284 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2351 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2285 2352
2286 if (back == fore)
2287 font->clear_rect (*drawable, xpixel, ypixel,
2288 fwidth * count, fheight,
2289 back);
2290 else if (back == Color_bg) 2353 if (have_bg && back == Color_bg)
2291 { 2354 {
2292 if (must_clear) 2355 // this is very ugly, maybe push it into ->draw?
2293 {
2294 CLEAR_CHARS (xpixel, ypixel, count);
2295 2356
2296 for (i = 0; i < count; i++) /* don't draw empty strings */ 2357 for (i = 0; i < count; i++) /* don't draw empty strings */
2297 if (text[i] != ' ') 2358 if (text[i] != ' ')
2298 { 2359 {
2299 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2360 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2300 break; 2361 goto did_clear;
2301 }
2302 } 2362 }
2303 else 2363
2304 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2364 CLEAR_CHARS (xpixel, ypixel, count);
2365 did_clear: ;
2305 } 2366 }
2306 else 2367 else
2307 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2368 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2308 2369
2309 if (rend & RS_Uline && font->descent > 1 && fore != back) 2370 if (rend & RS_Uline && font->descent > 1 && fore != back)
2310 { 2371 {
2311#if ENABLE_FRILLS 2372#if ENABLE_FRILLS
2312 if (ISSET_PIXCOLOR (Color_underline)) 2373 if (ISSET_PIXCOLOR (Color_underline))
2313 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2374 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2314 else 2375 else
2315#endif 2376#endif
2316 XSetForeground (display->display, gc, pix_colors[fore]); 2377 XSetForeground (dpy, gc, pix_colors[fore]);
2317 2378
2318 XDrawLine (display->display, drawBuffer, gc, 2379 XDrawLine (dpy, drawBuffer, gc,
2319 xpixel, ypixel + font->ascent + 1, 2380 xpixel, ypixel + font->ascent + 1,
2320 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2381 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2321 } 2382 }
2322 } /* for (col....) */ 2383 } /* for (col....) */
2323 } /* for (row....) */ 2384 } /* for (row....) */
… …
2332 */ 2393 */
2333 if (showcursor) 2394 if (showcursor)
2334 { 2395 {
2335 if (focus) 2396 if (focus)
2336 { 2397 {
2337 if (OPTION (Opt_cursorUnderline)) 2398 if (option (Opt_cursorUnderline))
2338 *crp ^= RS_Uline; 2399 *crp ^= RS_Uline;
2339 else 2400 else
2340 { 2401 {
2341 *crp ^= RS_RVid; 2402 *crp ^= RS_RVid;
2342#ifndef NO_CURSORCOLOR 2403#ifndef NO_CURSORCOLOR
… …
2356 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2417 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2357 cursorwidth++; 2418 cursorwidth++;
2358 2419
2359#ifndef NO_CURSORCOLOR 2420#ifndef NO_CURSORCOLOR
2360 if (ISSET_PIXCOLOR (Color_cursor)) 2421 if (ISSET_PIXCOLOR (Color_cursor))
2361 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2422 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2423 else
2362#endif 2424#endif
2425 XSetForeground (dpy, gc, pix_colors[ccol1]);
2363 2426
2364 XDrawRectangle (display->display, drawBuffer, gc, 2427 XDrawRectangle (dpy, drawBuffer, gc,
2365 Col2Pixel (col), 2428 Col2Pixel (col),
2366 Row2Pixel (oldcursor.row), 2429 Row2Pixel (oldcursor.row),
2367 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2430 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2368 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2431 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2369 } 2432 }
… …
2372 /* 2435 /*
2373 * H: cleanup selection 2436 * H: cleanup selection
2374 */ 2437 */
2375 scr_reverse_selection (); 2438 scr_reverse_selection ();
2376 2439
2377 if (refresh_type & SMOOTH_REFRESH)
2378 XFlush (display->display);
2379
2380 num_scr = 0; 2440 num_scr = 0;
2381 num_scr_allow = 1; 2441 num_scr_allow = 1;
2382} 2442}
2383 2443
2384void 2444void
2385rxvt_term::scr_remap_chars (line_t &l) 2445rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2386{ 2446{
2387 if (!l.t) 2447 if (!l.t)
2388 return; 2448 return;
2389 2449
2390 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2450 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2392 for (int i = ncol; i--; ) 2452 for (int i = ncol; i--; )
2393 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2453 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2394} 2454}
2395 2455
2396void 2456void
2397rxvt_term::scr_remap_chars () 2457rxvt_term::scr_remap_chars () NOTHROW
2398{ 2458{
2399 for (int i = total_rows; i--; ) 2459 for (int i = total_rows; i--; )
2400 scr_remap_chars (row_buf [i]); 2460 scr_remap_chars (row_buf [i]);
2401 2461
2402 for (int i = nrow; i--; ) 2462 for (int i = nrow; i--; )
… …
2405 scr_remap_chars (swap_buf [i]); 2465 scr_remap_chars (swap_buf [i]);
2406 } 2466 }
2407} 2467}
2408 2468
2409void 2469void
2410rxvt_term::scr_recolour () 2470rxvt_term::scr_recolour () NOTHROW
2411{ 2471{
2412 if (1 2472#ifdef HAVE_BG_PIXMAP
2413#if TRANSPARENT 2473 bgPixmap.apply ();
2414 && !am_transparent 2474#else
2415#endif 2475
2416#if XPM_BACKGROUND
2417 && !bgPixmap.pixmap
2418#endif
2419 )
2420 {
2421 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2476 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2422 XClearWindow (display->display, parent[0]); 2477 XClearWindow (dpy, parent[0]);
2423 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2478 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2479
2424#if HAVE_SCROLLBARS 2480# if HAVE_SCROLLBARS
2425 if (scrollBar.win) 2481 if (scrollBar.win)
2426 { 2482 {
2427 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2483 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2428 scrollBar.setIdle (); 2484 scrollBar.setIdle ();
2429 scrollbar_show (0); 2485 scrollbar_show (0);
2430 } 2486 }
2431#endif 2487# endif
2432 }
2433 2488
2434 scr_clear (); 2489 scr_clear ();
2435 scr_touch (true); 2490 scr_touch (true);
2436 want_refresh = 1; 2491 want_refresh = 1;
2437}
2438 2492
2493#endif
2494}
2495
2439/* ------------------------------------------------------------------------- */ 2496/* ------------------------------------------------------------------------- */
2440void 2497void
2441rxvt_term::scr_clear (bool really) 2498rxvt_term::scr_clear (bool really) NOTHROW
2442{ 2499{
2443 if (!mapped) 2500 if (!mapped)
2444 return; 2501 return;
2445 2502
2446 num_scr_allow = 0; 2503 num_scr_allow = 0;
2447 want_refresh = 1; 2504 want_refresh = 1;
2448 2505
2449 if (really) 2506 if (really)
2450 XClearWindow (display->display, vt); 2507 XClearWindow (dpy, vt);
2451} 2508}
2452 2509
2453/* ------------------------------------------------------------------------- */
2454void 2510void
2511rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2512{
2513 int view_end = view_start + nrow;
2514 int row, col;
2515
2516 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2517 {
2518 text_t *stp = ROW(row).t;
2519 rend_t *srp = ROW(row).r;
2520
2521 for (col = beg_col; col < end_col; col++)
2522 srp[col] ^= rstyle1;
2523
2524 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2525 srp[col] ^= rstyle2;
2526
2527 if (++col < end_col)
2528 srp[col] ^= rstyle2;
2529 }
2530}
2531
2532void
2533rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2534{
2535 int view_end = view_start + nrow;
2536 int row, col;
2537
2538 if (beg_row >= view_start)
2539 {
2540 col = beg_col;
2541 row = beg_row;
2542 }
2543 else
2544 {
2545 col = 0;
2546 row = view_start;
2547 }
2548
2549 for (; row < min (end_row, view_end); row++, col = 0)
2550 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2551 srp[col] ^= rstyle;
2552
2553 if (row == end_row)
2554 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2555 srp[col] ^= rstyle;
2556}
2557
2558/* ------------------------------------------------------------------------- */
2559void
2455rxvt_term::scr_reverse_selection () 2560rxvt_term::scr_reverse_selection () NOTHROW
2456{ 2561{
2457 if (selection.op 2562 if (selection.op
2458 && current_screen == selection.screen 2563 && current_screen == selection.screen
2459 && selection.end.row >= -view_start) 2564 && selection.end.row >= view_start)
2460 { 2565 {
2461 int view_end = -view_start + nrow; 2566#if !ENABLE_MINIMAL
2462 int row, col;
2463
2464#if ENABLE_FRILLS
2465 if (selection.rect) 2567 if (selection.rect)
2466 { 2568 scr_xor_rect (selection.beg.row, selection.beg.col,
2467 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2569 selection.end.row, selection.end.col,
2468 { 2570 RS_RVid, RS_RVid | RS_Uline);
2469 text_t *stp = ROW(row).t;
2470 rend_t *srp = ROW(row).r;
2471
2472 for (col = selection.beg.col; col < selection.end.col; col++)
2473 srp[col] ^= RS_RVid;
2474
2475 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2476 srp[col] ^= RS_RVid | RS_Uline;
2477
2478 if (++col < selection.end.col)
2479 srp[col] ^= RS_RVid | RS_Uline;
2480 }
2481 }
2482 else 2571 else
2483#endif 2572#endif
2484 { 2573 scr_xor_span (selection.beg.row, selection.beg.col,
2485 if (selection.beg.row >= -view_start) 2574 selection.end.row, selection.end.col,
2486 { 2575 RS_RVid);
2487 col = selection.beg.col;
2488 row = selection.beg.row;
2489 }
2490 else
2491 {
2492 col = 0;
2493 row = -view_start;
2494 }
2495
2496 for (; row < min (selection.end.row, view_end); row++, col = 0)
2497 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2498 srp[col] ^= RS_RVid;
2499
2500 if (row == selection.end.row)
2501 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2502 srp[col] ^= RS_RVid;
2503 }
2504 } 2576 }
2505} 2577}
2506 2578
2507/* ------------------------------------------------------------------------- */ 2579/* ------------------------------------------------------------------------- */
2508/* 2580/*
2509 * Dump the whole scrollback and screen to the passed filedescriptor. The 2581 * Dump the whole scrollback and screen to the passed filedescriptor. The
2510 * invoking routine must close the fd. 2582 * invoking routine must close the fd.
2511 */ 2583 */
2512#if 0 2584#if 0
2513void 2585void
2514rxvt_term::scr_dump (int fd) 2586rxvt_term::scr_dump (int fd) NOTHROW
2515{ 2587{
2516 int row, wrote; 2588 int row, wrote;
2517 unsigned int width, towrite; 2589 unsigned int width, towrite;
2518 char r1[] = "\n"; 2590 char r1[] = "\n";
2519 2591
… …
2538 2610
2539/* ------------------------------------------------------------------------- * 2611/* ------------------------------------------------------------------------- *
2540 * CHARACTER SELECTION * 2612 * CHARACTER SELECTION *
2541 * ------------------------------------------------------------------------- */ 2613 * ------------------------------------------------------------------------- */
2542void 2614void
2543rxvt_term::selection_check (int check_more) 2615rxvt_term::selection_check (int check_more) NOTHROW
2544{ 2616{
2545 row_col_t pos; 2617 row_col_t pos;
2546 2618
2547 if (!selection.op) 2619 if (!selection.op)
2548 return; 2620 return;
2549 2621
2550 pos.row = pos.col = 0; 2622 pos.row = pos.col = 0;
2551 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2623 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2552 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2624 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2553 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2625 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2554 || (check_more == 1 2626 || (check_more == 1
2555 && current_screen == selection.screen 2627 && current_screen == selection.screen
2556 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2628 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2557 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2629 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2558 || (check_more == 2 2630 || (check_more == 2
… …
2569/* ------------------------------------------------------------------------- */ 2641/* ------------------------------------------------------------------------- */
2570/* 2642/*
2571 * Paste a selection direct to the command fd 2643 * Paste a selection direct to the command fd
2572 */ 2644 */
2573void 2645void
2574rxvt_term::paste (char *data, unsigned int len) 2646rxvt_term::paste (char *data, unsigned int len) NOTHROW
2575{ 2647{
2576 /* convert normal newline chars into common keyboard Return key sequence */ 2648 /* convert normal newline chars into common keyboard Return key sequence */
2577 for (unsigned int i = 0; i < len; i++) 2649 for (unsigned int i = 0; i < len; i++)
2578 if (data[i] == C0_LF) 2650 if (data[i] == C0_LF)
2579 data[i] = C0_CR; 2651 data[i] = C0_CR;
… …
2585/* 2657/*
2586 * Respond to a notification that a primary selection has been sent 2658 * Respond to a notification that a primary selection has been sent
2587 * EXT: SelectionNotify 2659 * EXT: SelectionNotify
2588 */ 2660 */
2589void 2661void
2590rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2662rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2591{ 2663{
2592 if (prop == None) /* check for failed XConvertSelection */ 2664 if (prop == None) /* check for failed XConvertSelection */
2593 { 2665 {
2594 if ((selection_type & Sel_CompoundText)) 2666 if ((selection_type & Sel_CompoundText))
2595 { 2667 {
… …
2615 } 2687 }
2616 2688
2617 unsigned long bytes_after; 2689 unsigned long bytes_after;
2618 XTextProperty ct; 2690 XTextProperty ct;
2619 2691
2620 if (XGetWindowProperty (display->display, win, prop, 2692 if (XGetWindowProperty (dpy, win, prop,
2621 0, PROP_SIZE / 4, 2693 0, PROP_SIZE / 4,
2622 delete_prop, AnyPropertyType, 2694 delete_prop, AnyPropertyType,
2623 &ct.encoding, &ct.format, 2695 &ct.encoding, &ct.format,
2624 &ct.nitems, &bytes_after, 2696 &ct.nitems, &bytes_after,
2625 &ct.value) != Success) 2697 &ct.value) != Success)
… …
2634 if (bytes_after) 2706 if (bytes_after)
2635 { 2707 {
2636 // fetch and append remaining data 2708 // fetch and append remaining data
2637 XTextProperty ct2; 2709 XTextProperty ct2;
2638 2710
2639 if (XGetWindowProperty (display->display, win, prop, 2711 if (XGetWindowProperty (dpy, win, prop,
2640 ct.nitems / 4, (bytes_after + 3) / 4, 2712 ct.nitems / 4, (bytes_after + 3) / 4,
2641 delete_prop, AnyPropertyType, 2713 delete_prop, AnyPropertyType,
2642 &ct2.encoding, &ct2.format, 2714 &ct2.encoding, &ct2.format,
2643 &ct2.nitems, &bytes_after, 2715 &ct2.nitems, &bytes_after,
2644 &ct2.value) != Success) 2716 &ct2.value) != Success)
… …
2657 2729
2658 if (ct.encoding == xa[XA_INCR]) 2730 if (ct.encoding == xa[XA_INCR])
2659 { 2731 {
2660 // INCR selection, start handshake 2732 // INCR selection, start handshake
2661 if (!delete_prop) 2733 if (!delete_prop)
2662 XDeleteProperty (display->display, win, prop); 2734 XDeleteProperty (dpy, win, prop);
2663 2735
2664 selection_wait = Sel_incr; 2736 selection_wait = Sel_incr;
2665 incr_buf_fill = 0; 2737 incr_buf_fill = 0;
2666 incr_ev.start (NOW + 10); 2738 incr_ev.start (10);
2667 2739
2668 goto bailout; 2740 goto bailout;
2669 } 2741 }
2670 2742
2671 if (ct.nitems == 0) 2743 if (ct.nitems == 0)
… …
2680 ct.nitems = incr_buf_fill; 2752 ct.nitems = incr_buf_fill;
2681 incr_buf = 0; 2753 incr_buf = 0;
2682 incr_buf_size = 0; 2754 incr_buf_size = 0;
2683 incr_ev.stop (); 2755 incr_ev.stop ();
2684 } 2756 }
2685 else 2757 else
2686 { 2758 {
2687 if (selection_wait == Sel_normal 2759 if (selection_wait == Sel_normal
2688 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2760 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2689 { 2761 {
2690 /* 2762 /*
… …
2697 goto bailout; 2769 goto bailout;
2698 } 2770 }
2699 } 2771 }
2700 else if (selection_wait == Sel_incr) 2772 else if (selection_wait == Sel_incr)
2701 { 2773 {
2702 incr_ev.start (NOW + 10); 2774 incr_ev.start (10);
2703 2775
2704 while (incr_buf_fill + ct.nitems > incr_buf_size) 2776 while (incr_buf_fill + ct.nitems > incr_buf_size)
2705 { 2777 {
2706 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2778 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2707 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2779 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2714 } 2786 }
2715 2787
2716 char **cl; 2788 char **cl;
2717 int cr; 2789 int cr;
2718 2790
2719#if ENABLE_FRILLS 2791#if !ENABLE_MINIMAL
2720 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2792 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2721 // so recode it manually 2793 // so recode it manually
2722 if (ct.encoding == xa[XA_UTF8_STRING]) 2794 if (ct.encoding == xa[XA_UTF8_STRING])
2723 { 2795 {
2724 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2796 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2728 paste (s, strlen (s)); 2800 paste (s, strlen (s));
2729 free (s); 2801 free (s);
2730 } 2802 }
2731 else 2803 else
2732#endif 2804#endif
2733 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2805 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2734 && cl) 2806 && cl)
2735 { 2807 {
2736 for (int i = 0; i < cr; i++) 2808 for (int i = 0; i < cr; i++)
2737 paste (cl[i], strlen (cl[i])); 2809 paste (cl[i], strlen (cl[i]));
2738 2810
… …
2747 if (selection_wait == Sel_normal) 2819 if (selection_wait == Sel_normal)
2748 selection_wait = Sel_none; 2820 selection_wait = Sel_none;
2749} 2821}
2750 2822
2751void 2823void
2752rxvt_term::incr_cb (time_watcher &w) 2824rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2753{ 2825{
2754 selection_wait = Sel_none; 2826 selection_wait = Sel_none;
2755 2827
2756 incr_buf_size = 0; 2828 incr_buf_size = 0;
2757 free (incr_buf); 2829 free (incr_buf);
2758 2830
2759 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2831 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2760} 2832}
2761 2833
2762void 2834void
2763rxvt_term::selection_property (Window win, Atom prop) 2835rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2764{ 2836{
2765 if (prop == None || selection_wait != Sel_incr) 2837 if (prop == None || selection_wait != Sel_incr)
2766 return; 2838 return;
2767 2839
2768 selection_paste (win, prop, true); 2840 selection_paste (win, prop, true);
2769} 2841}
2770 2842
2771/* ------------------------------------------------------------------------- */ 2843/* ------------------------------------------------------------------------- */
2772/* 2844/*
2773 * Request the current selection: 2845 * Request the current selection:
2774 * Order: > internal selection if available 2846 * Order: > internal selection if available
2775 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2847 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2776 * > CUT_BUFFER0 2848 * > CUT_BUFFER0
2777 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2778 * will auto fallback to CUT_BUFFER0 2850 * will auto fallback to CUT_BUFFER0
2779 * EXT: button 2 release 2851 * EXT: button 2 release
2780 */ 2852 */
2781void 2853void
2782rxvt_term::selection_request (Time tm, int x, int y) 2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2783{ 2855{
2784 if (x < 0 || x >= width || y < 0 || y >= height) 2856 if (selection.text && selnum == Sel_Primary)
2785 return; /* outside window */ 2857 {
2786
2787 if (selection.text)
2788 { /* internal selection */ 2858 /* internal selection */
2789 char *str = rxvt_wcstombs (selection.text, selection.len); 2859 char *str = rxvt_wcstombs (selection.text, selection.len);
2790 paste (str, strlen (str)); 2860 paste (str, strlen (str));
2791 free (str); 2861 free (str);
2792 return; 2862 return;
2793 } 2863 }
2794 else 2864 else
2795 { 2865 {
2796 int i;
2797
2798 selection_request_time = tm; 2866 selection_request_time = tm;
2799 selection_wait = Sel_normal; 2867 selection_wait = Sel_normal;
2800 2868
2801 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2802 {
2803#if X_HAVE_UTF8_STRING 2869#if X_HAVE_UTF8_STRING
2804 selection_type = Sel_UTF8String; 2870 selection_type = Sel_UTF8String;
2805 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2871 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2806 return; 2872 return;
2807#else 2873#else
2808 selection_type = Sel_CompoundText; 2874 selection_type = Sel_CompoundText;
2809 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2875 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2810 return; 2876 return;
2811#endif 2877#endif
2812 }
2813 } 2878 }
2814 2879
2815 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2880 selection_wait = Sel_none; /* don't loop in selection_paste () */
2816 selection_paste (display->root, XA_CUT_BUFFER0, false); 2881 selection_paste (display->root, XA_CUT_BUFFER0, false);
2817} 2882}
2818 2883
2819int 2884int
2820rxvt_term::selection_request_other (Atom target, int selnum) 2885rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2821{ 2886{
2822 Atom sel; 2887 Atom sel;
2823 2888
2824 selection_type |= selnum; 2889 selection_type |= selnum;
2825 2890
… …
2828 else if (selnum == Sel_Secondary) 2893 else if (selnum == Sel_Secondary)
2829 sel = XA_SECONDARY; 2894 sel = XA_SECONDARY;
2830 else 2895 else
2831 sel = xa[XA_CLIPBOARD]; 2896 sel = xa[XA_CLIPBOARD];
2832 2897
2833 if (XGetSelectionOwner (display->display, sel) != None) 2898 if (XGetSelectionOwner (dpy, sel) != None)
2834 { 2899 {
2835 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2900 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2836 vt, selection_request_time); 2901 vt, selection_request_time);
2837 return 1; 2902 return 1;
2838 } 2903 }
2839 2904
2840 return 0; 2905 return 0;
… …
2844/* 2909/*
2845 * Clear all selected text 2910 * Clear all selected text
2846 * EXT: SelectionClear 2911 * EXT: SelectionClear
2847 */ 2912 */
2848void 2913void
2849rxvt_term::selection_clear () 2914rxvt_term::selection_clear () NOTHROW
2850{ 2915{
2851 want_refresh = 1; 2916 want_refresh = 1;
2852 free (selection.text); 2917 free (selection.text);
2853 selection.text = NULL; 2918 selection.text = NULL;
2854 selection.len = 0; 2919 selection.len = 0;
… …
2903 2968
2904 int end_col; 2969 int end_col;
2905 2970
2906 for (; row <= selection.end.row; row++, col = 0) 2971 for (; row <= selection.end.row; row++, col = 0)
2907 { 2972 {
2908#if ENABLE_FRILLS 2973#if !ENABLE_MINIMAL
2909 if (selection.rect) 2974 if (selection.rect)
2910 { 2975 {
2911 col = selection.beg.col; 2976 col = selection.beg.col;
2912 end_col = ncol + 1; 2977 end_col = ncol + 1;
2913 } 2978 }
… …
2916 end_col = ROW(row).l; 2981 end_col = ROW(row).l;
2917 2982
2918 col = max (col, 0); 2983 col = max (col, 0);
2919 2984
2920 if (row == selection.end.row 2985 if (row == selection.end.row
2921#if ENABLE_FRILLS 2986#if !ENABLE_MINIMAL
2922 || selection.rect 2987 || selection.rect
2923#endif 2988#endif
2924 ) 2989 )
2925 min_it (end_col, selection.end.col); 2990 min_it (end_col, selection.end.col);
2926 2991
… …
2949#endif 3014#endif
2950 else 3015 else
2951 new_selection_text[ofs++] = *t++; 3016 new_selection_text[ofs++] = *t++;
2952 } 3017 }
2953 3018
2954#if ENABLE_FRILLS 3019#if !ENABLE_MINIMAL
2955 if (selection.rect) 3020 if (selection.rect)
2956 { 3021 {
2957 while (ofs 3022 while (ofs
2958 && new_selection_text[ofs - 1] != C0_LF 3023 && new_selection_text[ofs - 1] != C0_LF
2959 && unicode::is_space (new_selection_text[ofs - 1])) 3024 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2989 3054
2990 selection_grab (tm); 3055 selection_grab (tm);
2991} 3056}
2992 3057
2993bool 3058bool
2994rxvt_term::selection_grab (Time tm) 3059rxvt_term::selection_grab (Time tm) NOTHROW
2995{ 3060{
2996 selection_time = tm; 3061 selection_time = tm;
2997 3062
2998 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3063 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
2999 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3064 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3000 { 3065 {
3001 display->set_selection_owner (this); 3066 display->set_selection_owner (this);
3002 return true; 3067 return true;
3003 } 3068 }
3004 else 3069 else
3070 {
3071 selection_clear ();
3005 return false; 3072 return false;
3073 }
3006 3074
3007#if 0 3075#if 0
3008 XTextProperty ct; 3076 XTextProperty ct;
3009 3077
3010 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3078 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3011 { 3079 {
3012 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3080 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3013 XFree (ct.value); 3081 XFree (ct.value);
3014 } 3082 }
3015#endif 3083#endif
… …
3019/* 3087/*
3020 * Mark or select text based upon number of clicks: 1, 2, or 3 3088 * Mark or select text based upon number of clicks: 1, 2, or 3
3021 * EXT: button 1 press 3089 * EXT: button 1 press
3022 */ 3090 */
3023void 3091void
3024rxvt_term::selection_click (int clicks, int x, int y) 3092rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3025{ 3093{
3026 clicks = ((clicks - 1) % 3) + 1; 3094 clicks = ((clicks - 1) % 3) + 1;
3027 selection.clicks = clicks; /* save clicks so extend will work */ 3095 selection.clicks = clicks; /* save clicks so extend will work */
3028 3096
3097 if (clicks == 2 && !selection.rect
3098 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3099 {
3100 MEvent.clicks = 1; // what a mess
3101 selection.screen = current_screen;
3102 selection.op = SELECTION_CONT;
3103 return;
3104 }
3105
3029 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3106 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3030 3107
3031 if (clicks == 2 || clicks == 3) 3108 if (clicks == 2 || clicks == 3)
3032 selection_extend_colrow (selection.mark.col, 3109 selection_extend_colrow (selection.mark.col,
3033 selection.mark.row + view_start, 3110 selection.mark.row - view_start,
3034 0, /* button 3 */ 3111 0, /* button 3 */
3035 1, /* button press */ 3112 1, /* button press */
3036 0); /* click change */ 3113 0); /* click change */
3037} 3114}
3038 3115
3039/* ------------------------------------------------------------------------- */ 3116/* ------------------------------------------------------------------------- */
3040/* 3117/*
3041 * Mark a selection at the specified col/row 3118 * Mark a selection at the specified col/row
3042 */ 3119 */
3043void 3120void
3044rxvt_term::selection_start_colrow (int col, int row) 3121rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3045{ 3122{
3046 want_refresh = 1; 3123 want_refresh = 1;
3047 3124
3048 selection.mark.row = row - view_start; 3125 selection.mark.row = row + view_start;
3049 selection.mark.col = col; 3126 selection.mark.col = col;
3050 3127
3051 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3128 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3052 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3129 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3053 3130
3054 while (selection.mark.col > 0 3131 while (selection.mark.col > 0
3055 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3132 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3056 --selection.mark.col; 3133 --selection.mark.col;
3057 3134
3058 if (selection.op) 3135 if (selection.op)
3136 {
3059 { /* clear the old selection */ 3137 /* clear the old selection */
3060 selection.beg.row = selection.end.row = selection.mark.row; 3138 selection.beg.row = selection.end.row = selection.mark.row;
3061 selection.beg.col = selection.end.col = selection.mark.col; 3139 selection.beg.col = selection.end.col = selection.mark.col;
3062 } 3140 }
3063 3141
3064 selection.op = SELECTION_INIT; 3142 selection.op = SELECTION_INIT;
… …
3075#define DELIMIT_TEXT(x) \ 3153#define DELIMIT_TEXT(x) \
3076 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3154 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3077#define DELIMIT_REND(x) 1 3155#define DELIMIT_REND(x) 1
3078 3156
3079void 3157void
3080rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3158rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3081{ 3159{
3082 int col, row, dirnadd, tcol, trow, w1, w2; 3160 int col, row, dirnadd, tcol, trow, w1, w2;
3083 row_col_t bound; 3161 row_col_t bound;
3084 text_t *stp; 3162 text_t *stp;
3085 rend_t *srp; 3163 rend_t *srp;
3086 3164
3087 if (dirn == UP) 3165 if (dirn == UP)
3088 { 3166 {
3089 bound.row = - nsaved - 1; 3167 bound.row = top_row - 1;
3090 bound.col = 0; 3168 bound.col = 0;
3091 dirnadd = -1; 3169 dirnadd = -1;
3092 } 3170 }
3093 else 3171 else
3094 { 3172 {
… …
3159 * flag == 0 ==> button 1 3237 * flag == 0 ==> button 1
3160 * flag == 1 ==> button 3 press 3238 * flag == 1 ==> button 3 press
3161 * flag == 2 ==> button 3 motion 3239 * flag == 2 ==> button 3 motion
3162 */ 3240 */
3163void 3241void
3164rxvt_term::selection_extend (int x, int y, int flag) 3242rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3165{ 3243{
3166 int col = clamp (Pixel2Col (x), 0, ncol); 3244 int col = clamp (Pixel2Col (x), 0, ncol);
3167 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3245 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3168 3246
3169 /* 3247 /*
… …
3172 * select nothing. Otherwise, if we're to the right of the mark, you have to 3250 * select nothing. Otherwise, if we're to the right of the mark, you have to
3173 * be _past_ a character for it to be selected. 3251 * be _past_ a character for it to be selected.
3174 */ 3252 */
3175 if (((selection.clicks % 3) == 1) && !flag 3253 if (((selection.clicks % 3) == 1) && !flag
3176 && (col == selection.mark.col 3254 && (col == selection.mark.col
3177 && (row == selection.mark.row + view_start))) 3255 && (row == selection.mark.row - view_start)))
3178 { 3256 {
3179 /* select nothing */ 3257 /* select nothing */
3180 selection.beg.row = selection.end.row = 0; 3258 selection.beg.row = selection.end.row = 0;
3181 selection.beg.col = selection.end.col = 0; 3259 selection.beg.col = selection.end.col = 0;
3182 selection.clicks = 4; 3260 selection.clicks = 4;
… …
3195/* ------------------------------------------------------------------------- */ 3273/* ------------------------------------------------------------------------- */
3196/* 3274/*
3197 * Extend the selection to the specified col/row 3275 * Extend the selection to the specified col/row
3198 */ 3276 */
3199void 3277void
3200rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3278rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3201{ 3279{
3202 row_col_t pos; 3280 row_col_t pos;
3203 enum { 3281 enum {
3204 LEFT, RIGHT 3282 LEFT, RIGHT
3205 } closeto = RIGHT; 3283 } closeto = RIGHT;
… …
3237 selection.beg.col = selection.end.col = selection.mark.col; 3315 selection.beg.col = selection.end.col = selection.mark.col;
3238 selection.beg.row = selection.end.row = selection.mark.row; 3316 selection.beg.row = selection.end.row = selection.mark.row;
3239 } 3317 }
3240 3318
3241 pos.col = col; 3319 pos.col = col;
3242 pos.row = row - view_start; 3320 pos.row = view_start + row;
3243 3321
3244 /* 3322 /*
3245 * This is mainly xterm style selection with a couple of differences, mainly 3323 * This is mainly xterm style selection with a couple of differences, mainly
3246 * in the way button3 drag extension works. 3324 * in the way button3 drag extension works.
3247 * We're either doing: button1 drag; button3 press; or button3 drag 3325 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3253 * a point/word/line which is either the start or end of the selection 3331 * a point/word/line which is either the start or end of the selection
3254 * and it was decided by whichever point/word/line was `fixed' at the 3332 * and it was decided by whichever point/word/line was `fixed' at the
3255 * time of the most recent button3 press 3333 * time of the most recent button3 press
3256 */ 3334 */
3257 if (button3 && buttonpress) 3335 if (button3 && buttonpress)
3336 {
3258 { /* button3 press */ 3337 /* button3 press */
3259 /* 3338 /*
3260 * first determine which edge of the selection we are closest to 3339 * first determine which edge of the selection we are closest to
3261 */ 3340 */
3262 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3341 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3263 || (!ROWCOL_IS_AFTER (pos, selection.end) 3342 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3281 selection.mark.row = selection.beg.row; 3360 selection.mark.row = selection.beg.row;
3282 selection.mark.col = selection.beg.col; 3361 selection.mark.col = selection.beg.col;
3283 } 3362 }
3284 } 3363 }
3285 else 3364 else
3365 {
3286 { /* button1 drag or button3 drag */ 3366 /* button1 drag or button3 drag */
3287 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3367 if (ROWCOL_IS_AFTER (selection.mark, pos))
3288 { 3368 {
3289 if (selection.mark.row == selection.end.row 3369 if (selection.mark.row == selection.end.row
3290 && selection.mark.col == selection.end.col 3370 && selection.mark.col == selection.end.col
3291 && clickchange 3371 && clickchange
… …
3308 3388
3309 if (selection.clicks == 1) 3389 if (selection.clicks == 1)
3310 { 3390 {
3311 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3391 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3312 && !ROW(selection.beg.row).is_longer () 3392 && !ROW(selection.beg.row).is_longer ()
3313#if ENABLE_FRILLS 3393#if !ENABLE_MINIMAL
3314 && !selection.rect 3394 && !selection.rect
3315#endif 3395#endif
3316 ) 3396 )
3317 selection.beg.col = ncol; 3397 selection.beg.col = ncol;
3318 3398
3319 if ( 3399 if (
3320 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3400 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3321 && !ROW(selection.end.row).is_longer () 3401 && !ROW(selection.end.row).is_longer ()
3322#if ENABLE_FRILLS 3402#if !ENABLE_MINIMAL
3323 && !selection.rect 3403 && !selection.rect
3324#endif 3404#endif
3325 ) 3405 )
3326 selection.end.col = ncol; 3406 selection.end.col = ncol;
3327 } 3407 }
3328 else if (selection.clicks == 2) 3408 else if (selection.clicks == 2)
3329 { 3409 {
3330 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3410 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3331 selection.end.col--; 3411 selection.end.col--;
3332 3412
3333 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3334 {
3335 selection_delimit_word (UP, &selection.beg, &selection.beg); 3413 selection_delimit_word (UP, &selection.beg, &selection.beg);
3336 selection_delimit_word (DN, &selection.end, &selection.end); 3414 selection_delimit_word (DN, &selection.end, &selection.end);
3337 }
3338 } 3415 }
3339 else if (selection.clicks == 3) 3416 else if (selection.clicks == 3)
3340 { 3417 {
3341#if ENABLE_FRILLS 3418#if ENABLE_FRILLS
3342 if (OPTION (Opt_tripleclickwords)) 3419 if (option (Opt_tripleclickwords))
3343 { 3420 {
3344 selection_delimit_word (UP, &selection.beg, &selection.beg); 3421 selection_delimit_word (UP, &selection.beg, &selection.beg);
3345 3422
3346 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3423 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3347 { 3424 {
3348 if (!ROW(end_row).is_longer ()) 3425 if (!ROW(end_row).is_longer ())
3349 { 3426 {
3350 selection.end.row = end_row; 3427 selection.end.row = end_row;
3351 selection.end.col = ROW(end_row).l; 3428 selection.end.col = ROW(end_row).l;
3429# if !ENABLE_MINIMAL
3352 selection_remove_trailing_spaces (); 3430 selection_remove_trailing_spaces ();
3431# endif
3353 break; 3432 break;
3354 } 3433 }
3355 } 3434 }
3356 } 3435 }
3357 else 3436 else
… …
3373 selection.end.row++; 3452 selection.end.row++;
3374 } 3453 }
3375 } 3454 }
3376 3455
3377 if (button3 && buttonpress) 3456 if (button3 && buttonpress)
3457 {
3378 { /* mark may need to be changed */ 3458 /* mark may need to be changed */
3379 if (closeto == LEFT) 3459 if (closeto == LEFT)
3380 { 3460 {
3381 selection.mark.row = selection.end.row; 3461 selection.mark.row = selection.end.row;
3382 selection.mark.col = selection.end.col - (selection.clicks == 2); 3462 selection.mark.col = selection.end.col - (selection.clicks == 2);
3383 } 3463 }
… …
3386 selection.mark.row = selection.beg.row; 3466 selection.mark.row = selection.beg.row;
3387 selection.mark.col = selection.beg.col; 3467 selection.mark.col = selection.beg.col;
3388 } 3468 }
3389 } 3469 }
3390 3470
3391#if ENABLE_FRILLS 3471#if !ENABLE_MINIMAL
3392 if (selection.rect && selection.beg.col > selection.end.col) 3472 if (selection.rect && selection.beg.col > selection.end.col)
3393 ::swap (selection.beg.col, selection.end.col); 3473 ::swap (selection.beg.col, selection.end.col);
3394#endif 3474#endif
3395} 3475}
3396 3476
3397#if ENABLE_FRILLS 3477#if !ENABLE_MINIMAL
3398void 3478void
3399rxvt_term::selection_remove_trailing_spaces () 3479rxvt_term::selection_remove_trailing_spaces () NOTHROW
3400{ 3480{
3401 int32_t end_col, end_row; 3481 int32_t end_col, end_row;
3402 text_t *stp; 3482 text_t *stp;
3403 3483
3404 end_col = selection.end.col; 3484 end_col = selection.end.col;
… …
3442/* 3522/*
3443 * Double click on button 3 when already selected 3523 * Double click on button 3 when already selected
3444 * EXT: button 3 double click 3524 * EXT: button 3 double click
3445 */ 3525 */
3446void 3526void
3447rxvt_term::selection_rotate (int x, int y) 3527rxvt_term::selection_rotate (int x, int y) NOTHROW
3448{ 3528{
3449 selection.clicks = selection.clicks % 3 + 1; 3529 selection.clicks = selection.clicks % 3 + 1;
3450 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3530 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3451} 3531}
3452 3532
… …
3454/* 3534/*
3455 * Respond to a request for our current selection 3535 * Respond to a request for our current selection
3456 * EXT: SelectionRequest 3536 * EXT: SelectionRequest
3457 */ 3537 */
3458void 3538void
3459rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3539rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3460{ 3540{
3461 XSelectionEvent ev; 3541 XSelectionEvent ev;
3462 dDisp;
3463 3542
3464 ev.type = SelectionNotify; 3543 ev.type = SelectionNotify;
3465 ev.property = None; 3544 ev.property = None;
3466 ev.display = rq.display; 3545 ev.display = rq.display;
3467 ev.requestor = rq.requestor; 3546 ev.requestor = rq.requestor;
… …
3481 *target++ = xa[XA_COMPOUND_TEXT]; 3560 *target++ = xa[XA_COMPOUND_TEXT];
3482#if X_HAVE_UTF8_STRING 3561#if X_HAVE_UTF8_STRING
3483 *target++ = xa[XA_UTF8_STRING]; 3562 *target++ = xa[XA_UTF8_STRING];
3484#endif 3563#endif
3485 3564
3486 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3565 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3487 32, PropModeReplace, 3566 32, PropModeReplace,
3488 (unsigned char *)target_list, target - target_list); 3567 (unsigned char *)target_list, target - target_list);
3489 ev.property = rq.property; 3568 ev.property = rq.property;
3490 } 3569 }
3491#if TODO // TODO 3570#if TODO // TODO
… …
3494 /* TODO: Handle MULTIPLE */ 3573 /* TODO: Handle MULTIPLE */
3495 } 3574 }
3496#endif 3575#endif
3497 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3576 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3498 { 3577 {
3499 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3578 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3500 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3579 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3501 ev.property = rq.property; 3580 ev.property = rq.property;
3502 } 3581 }
3503 else if (rq.target == XA_STRING 3582 else if (rq.target == XA_STRING
3504 || rq.target == xa[XA_TEXT] 3583 || rq.target == xa[XA_TEXT]
… …
3528 style = enc_string; 3607 style = enc_string;
3529 else if (target == xa[XA_TEXT]) 3608 else if (target == xa[XA_TEXT])
3530 style = enc_text; 3609 style = enc_text;
3531 else if (target == xa[XA_COMPOUND_TEXT]) 3610 else if (target == xa[XA_COMPOUND_TEXT])
3532 style = enc_compound_text; 3611 style = enc_compound_text;
3533#if ENABLE_FRILLS 3612#if !ENABLE_MINIMAL
3534 else if (target == xa[XA_UTF8_STRING]) 3613 else if (target == xa[XA_UTF8_STRING])
3535 style = enc_utf8; 3614 style = enc_utf8;
3536#endif 3615#endif
3537 else 3616 else
3538 { 3617 {
… …
3549 { 3628 {
3550 cl = L""; 3629 cl = L"";
3551 selectlen = 0; 3630 selectlen = 0;
3552 } 3631 }
3553 3632
3554#if ENABLE_FRILLS 3633#if !ENABLE_MINIMAL
3555 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3634 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3556 // so recode it manually 3635 // so recode it manually
3557 if (style == enc_utf8) 3636 if (style == enc_utf8)
3558 { 3637 {
3559 freect = 1; 3638 freect = 1;
… …
3562 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3641 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3563 ct.nitems = strlen ((char *)ct.value); 3642 ct.nitems = strlen ((char *)ct.value);
3564 } 3643 }
3565 else 3644 else
3566#endif 3645#endif
3567 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3646 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3568 freect = 1; 3647 freect = 1;
3569 else 3648 else
3570 { 3649 {
3571 /* if we failed to convert then send it raw */ 3650 /* if we failed to convert then send it raw */
3572 ct.value = (unsigned char *)cl; 3651 ct.value = (unsigned char *)cl;
3573 ct.nitems = selectlen; 3652 ct.nitems = selectlen;
3574 ct.encoding = target; 3653 ct.encoding = target;
3575 } 3654 }
3576 3655
3577 XChangeProperty (disp, rq.requestor, rq.property, 3656 XChangeProperty (dpy, rq.requestor, rq.property,
3578 ct.encoding, 8, PropModeReplace, 3657 ct.encoding, 8, PropModeReplace,
3579 ct.value, (int)ct.nitems); 3658 ct.value, (int)ct.nitems);
3580 ev.property = rq.property; 3659 ev.property = rq.property;
3581 3660
3582 if (freect) 3661 if (freect)
3583 XFree (ct.value); 3662 XFree (ct.value);
3584 } 3663 }
3585 3664
3586 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3665 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3587}
3588
3589/* ------------------------------------------------------------------------- *
3590 * MOUSE ROUTINES *
3591 * ------------------------------------------------------------------------- */
3592
3593/*
3594 * return col/row values corresponding to x/y pixel values
3595 */
3596void
3597rxvt_term::pixel_position (int *x, int *y)
3598{
3599 *x = Pixel2Col (*x);
3600 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3601 *y = Pixel2Row (*y);
3602 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3603} 3666}
3604 3667
3605/* ------------------------------------------------------------------------- */ 3668/* ------------------------------------------------------------------------- */
3606#ifdef USE_XIM 3669#ifdef USE_XIM
3607void 3670void
3608rxvt_term::im_set_position (XPoint &pos) 3671rxvt_term::im_set_position (XPoint &pos) NOTHROW
3609{ 3672{
3610 XWindowAttributes xwa; 3673 XWindowAttributes xwa;
3611 3674
3612 XGetWindowAttributes (display->display, vt, &xwa); 3675 XGetWindowAttributes (dpy, vt, &xwa);
3613 3676
3614 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3677 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3615 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3678 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3616} 3679}
3617#endif 3680#endif
3618 3681
3619#if ENABLE_OVERLAY 3682#if ENABLE_OVERLAY
3620void 3683void
3621rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3684rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3622{ 3685{
3623 if (nrow < 1 || ncol < 1) 3686 if (nrow < 1 || ncol < 1)
3624 return; 3687 return;
3625 3688
3626 want_refresh = 1; 3689 want_refresh = 1;
… …
3671 *rp = r; 3734 *rp = r;
3672 } 3735 }
3673} 3736}
3674 3737
3675void 3738void
3676rxvt_term::scr_overlay_off () 3739rxvt_term::scr_overlay_off () NOTHROW
3677{ 3740{
3678 if (!ov_text) 3741 if (!ov_text)
3679 return; 3742 return;
3680 3743
3681 want_refresh = 1; 3744 want_refresh = 1;
… …
3689 delete [] ov_text; ov_text = 0; 3752 delete [] ov_text; ov_text = 0;
3690 delete [] ov_rend; ov_rend = 0; 3753 delete [] ov_rend; ov_rend = 0;
3691} 3754}
3692 3755
3693void 3756void
3694rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3757rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3695{ 3758{
3696 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3759 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3697 return; 3760 return;
3698 3761
3699 x++, y++; 3762 x++, y++;
… …
3701 ov_text[y][x] = text; 3764 ov_text[y][x] = text;
3702 ov_rend[y][x] = rend; 3765 ov_rend[y][x] = rend;
3703} 3766}
3704 3767
3705void 3768void
3706rxvt_term::scr_overlay_set (int x, int y, const char *s) 3769rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3707{ 3770{
3708 while (*s) 3771 while (*s)
3709 scr_overlay_set (x++, y, *s++); 3772 scr_overlay_set (x++, y, *s++);
3710} 3773}
3711 3774
3712void 3775void
3713rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3776rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3714{ 3777{
3715 while (*s) 3778 while (*s)
3716 { 3779 {
3717 text_t t = *s++; 3780 text_t t = *s++;
3718 int width = wcwidth (t); 3781 int width = WCWIDTH (t);
3719 3782
3720 while (width--) 3783 while (width--)
3721 { 3784 {
3722 scr_overlay_set (x++, y, t); 3785 scr_overlay_set (x++, y, t);
3723 t = NOCHAR; 3786 t = NOCHAR;
3724 } 3787 }
3725 } 3788 }
3726} 3789}
3727 3790
3728void 3791void
3729rxvt_term::scr_swap_overlay () 3792rxvt_term::scr_swap_overlay () NOTHROW
3730{ 3793{
3731 if (!ov_text) 3794 if (!ov_text)
3732 return; 3795 return;
3733 3796
3734 // swap screen mem with overlay 3797 // swap screen mem with overlay
3735 for (int y = ov_h; y--; ) 3798 for (int y = ov_h; y--; )
3736 { 3799 {
3737 text_t *t1 = ov_text[y]; 3800 text_t *t1 = ov_text[y];
3738 rend_t *r1 = ov_rend[y]; 3801 rend_t *r1 = ov_rend[y];
3739 3802
3740 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3803 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3741 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3804 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3742 3805
3743 for (int x = ov_w; x--; ) 3806 for (int x = ov_w; x--; )
3744 { 3807 {
3745 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3808 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3746 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3809 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