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.297 by root, Wed Jan 9 01:14:29 2008 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-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
1024 want_refresh = 1;
981#endif 1025#endif
982 } 1026 }
983 } 1027 }
984 else if (!(screen.flags & Screen_WrapNext)) 1028 else
985 scr_gotorc (0, -1, RELATIVE); 1029 scr_gotorc (0, -1, RELATIVE);
986
987 screen.flags &= ~Screen_WrapNext;
988} 1030}
989 1031
990/* ------------------------------------------------------------------------- */ 1032/* ------------------------------------------------------------------------- */
991/* 1033/*
992 * Process Horizontal Tab 1034 * Process Horizontal Tab
993 * count: +ve = forward; -ve = backwards 1035 * count: +ve = forward; -ve = backwards
994 * XTERM_SEQ: CTRL-I 1036 * XTERM_SEQ: CTRL-I
995 */ 1037 */
996void 1038void
997rxvt_term::scr_tab (int count, bool ht) 1039rxvt_term::scr_tab (int count, bool ht) NOTHROW
998{ 1040{
999 int i, x; 1041 int i, x;
1000 1042
1001 want_refresh = 1; 1043 want_refresh = 1;
1002 i = x = screen.cur.col; 1044 i = x = screen.cur.col;
… …
1015 x = i; 1057 x = i;
1016 1058
1017 if (!--count) 1059 if (!--count)
1018 break; 1060 break;
1019 } 1061 }
1020 else 1062 else
1021 ht &= l.t[i] == ' ' 1063 ht &= l.t[i] == ' '
1022 && RS_SAME (l.r[i], base_rend); 1064 && RS_SAME (l.r[i], base_rend);
1023 1065
1024 if (count) 1066 if (count)
1025 x = ncol - 1; 1067 x = ncol - 1;
1026 1068
1027 // store horizontal tab commands as characters inside the text 1069 // store horizontal tab commands as characters inside the text
1028 // buffer so they can be selected and pasted. 1070 // buffer so they can be selected and pasted.
1029 if (ht && OPTION (Opt_pastableTabs)) 1071 if (ht && option (Opt_pastableTabs))
1030 { 1072 {
1031 base_rend = SET_FONT (base_rend, 0); 1073 base_rend = SET_FONT (base_rend, 0);
1032 1074
1033 l.touch (x); 1075 l.touch (x);
1034 1076
… …
1067 * Process DEC Back Index 1109 * Process DEC Back Index
1068 * XTERM_SEQ: ESC 6 1110 * XTERM_SEQ: ESC 6
1069 * Move cursor left in row. If we're at the left boundary, shift everything 1111 * Move cursor left in row. If we're at the left boundary, shift everything
1070 * in that row right. Clear left column. 1112 * in that row right. Clear left column.
1071 */ 1113 */
1072#if ENABLE_FRILLS 1114#if !ENABLE_MINIMAL
1073void 1115void
1074rxvt_term::scr_backindex () 1116rxvt_term::scr_backindex () NOTHROW
1075{ 1117{
1076 if (screen.cur.col > 0) 1118 if (screen.cur.col > 0)
1077 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1119 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1078 else 1120 else
1079 scr_insdel_chars (1, INSERT); 1121 scr_insdel_chars (1, INSERT);
… …
1084 * Process DEC Forward Index 1126 * Process DEC Forward Index
1085 * XTERM_SEQ: ESC 9 1127 * XTERM_SEQ: ESC 9
1086 * Move cursor right in row. If we're at the right boundary, shift everything 1128 * Move cursor right in row. If we're at the right boundary, shift everything
1087 * in that row left. Clear right column. 1129 * in that row left. Clear right column.
1088 */ 1130 */
1089#if ENABLE_FRILLS 1131#if !ENABLE_MINIMAL
1090void 1132void
1091rxvt_term::scr_forwardindex () 1133rxvt_term::scr_forwardindex () NOTHROW
1092{ 1134{
1093 if (screen.cur.col < ncol - 1) 1135 if (screen.cur.col < ncol - 1)
1094 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1136 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1095 else 1137 else
1096 { 1138 {
… …
1109/* ------------------------------------------------------------------------- */ 1151/* ------------------------------------------------------------------------- */
1110/* 1152/*
1111 * Goto Row/Column 1153 * Goto Row/Column
1112 */ 1154 */
1113void 1155void
1114rxvt_term::scr_gotorc (int row, int col, int relative) 1156rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1115{ 1157{
1116 want_refresh = 1; 1158 want_refresh = 1;
1117 ZERO_SCROLLBACK (); 1159 ZERO_SCROLLBACK ();
1118 1160
1119 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1161 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1141 } 1183 }
1142 } 1184 }
1143 else 1185 else
1144 { 1186 {
1145 if (screen.flags & Screen_Relative) 1187 if (screen.flags & Screen_Relative)
1188 {
1146 { /* relative origin mode */ 1189 /* relative origin mode */
1147 screen.cur.row = row + screen.tscroll; 1190 screen.cur.row = row + screen.tscroll;
1148 min_it (screen.cur.row, screen.bscroll); 1191 min_it (screen.cur.row, screen.bscroll);
1149 } 1192 }
1150 else 1193 else
1151 screen.cur.row = row; 1194 screen.cur.row = row;
… …
1157/* ------------------------------------------------------------------------- */ 1200/* ------------------------------------------------------------------------- */
1158/* 1201/*
1159 * direction should be UP or DN 1202 * direction should be UP or DN
1160 */ 1203 */
1161void 1204void
1162rxvt_term::scr_index (enum page_dirn direction) 1205rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1163{ 1206{
1164 int dirn; 1207 int dirn;
1165 1208
1166 want_refresh = 1; 1209 want_refresh = 1;
1167 ZERO_SCROLLBACK (); 1210 ZERO_SCROLLBACK ();
… …
1186 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1187 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1189 */ 1232 */
1190void 1233void
1191rxvt_term::scr_erase_line (int mode) 1234rxvt_term::scr_erase_line (int mode) NOTHROW
1192{ 1235{
1193 unsigned int col, num; 1236 unsigned int col, num;
1194 1237
1195 want_refresh = 1; 1238 want_refresh = 1;
1196 ZERO_SCROLLBACK (); 1239 ZERO_SCROLLBACK ();
… …
1240 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1283 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1241 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1284 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1242 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1285 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1243 */ 1286 */
1244void 1287void
1245rxvt_term::scr_erase_screen (int mode) 1288rxvt_term::scr_erase_screen (int mode) NOTHROW
1246{ 1289{
1247 int num; 1290 int num;
1248 int32_t row; 1291 int32_t row;
1249 rend_t ren; 1292 rend_t ren;
1250 XGCValues gcvalue; 1293 XGCValues gcvalue;
… …
1295 } 1338 }
1296 else 1339 else
1297 { 1340 {
1298 ren = rstyle & (RS_fgMask | RS_bgMask); 1341 ren = rstyle & (RS_fgMask | RS_bgMask);
1299 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1300 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1343 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1301 ERASE_ROWS (row, num); 1344 ERASE_ROWS (row, num);
1302 gcvalue.foreground = pix_colors[Color_fg]; 1345 gcvalue.foreground = pix_colors[Color_fg];
1303 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1346 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1304 } 1347 }
1305 1348
1306 for (; num--; row++) 1349 for (; num--; row++)
1307 { 1350 {
1308 scr_blank_screen_mem (ROW(row), rstyle); 1351 scr_blank_screen_mem (ROW(row), rstyle);
1309 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1352 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1310 } 1353 }
1311} 1354}
1312 1355
1313#if ENABLE_FRILLS 1356#if !ENABLE_MINIMAL
1314void 1357void
1315rxvt_term::scr_erase_savelines () 1358rxvt_term::scr_erase_savelines () NOTHROW
1316{ 1359{
1317 want_refresh = 1; 1360 want_refresh = 1;
1318 ZERO_SCROLLBACK (); 1361 ZERO_SCROLLBACK ();
1319 1362
1320 nsaved = 0; 1363 top_row = 0;
1321} 1364}
1322#endif 1365#endif
1323 1366
1324/* ------------------------------------------------------------------------- */ 1367/* ------------------------------------------------------------------------- */
1325/* 1368/*
1326 * Fill the screen with `E's 1369 * Fill the screen with `E's
1327 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1370 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1328 */ 1371 */
1329void 1372void
1330rxvt_term::scr_E () 1373rxvt_term::scr_E () NOTHROW
1331{ 1374{
1332 rend_t fs; 1375 rend_t fs;
1333 1376
1334 want_refresh = 1; 1377 want_refresh = 1;
1335 ZERO_SCROLLBACK (); 1378 ZERO_SCROLLBACK ();
… …
1356/* ------------------------------------------------------------------------- */ 1399/* ------------------------------------------------------------------------- */
1357/* 1400/*
1358 * Insert/Delete <count> lines 1401 * Insert/Delete <count> lines
1359 */ 1402 */
1360void 1403void
1361rxvt_term::scr_insdel_lines (int count, int insdel) 1404rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1362{ 1405{
1363 int end; 1406 int end;
1364 1407
1365 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
1366 1409
… …
1386/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1387/* 1430/*
1388 * Insert/Delete <count> characters from the current position 1431 * Insert/Delete <count> characters from the current position
1389 */ 1432 */
1390void 1433void
1391rxvt_term::scr_insdel_chars (int count, int insdel) 1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1392{ 1435{
1393 int col, row; 1436 int col, row;
1394 rend_t tr; 1437 rend_t tr;
1395 1438
1396 want_refresh = 1; 1439 want_refresh = 1;
… …
1427 { 1470 {
1428 if (selection.end.row != screen.cur.row 1471 if (selection.end.row != screen.cur.row
1429 || (selection.end.col + count >= ncol)) 1472 || (selection.end.col + count >= ncol))
1430 CLEAR_SELECTION (); 1473 CLEAR_SELECTION ();
1431 else 1474 else
1475 {
1432 { /* shift selection */ 1476 /* shift selection */
1433 selection.beg.col += count; 1477 selection.beg.col += count;
1434 selection.mark.col += count; /* XXX: yes? */ 1478 selection.mark.col += count; /* XXX: yes? */
1435 selection.end.col += count; 1479 selection.end.col += count;
1436 } 1480 }
1437 } 1481 }
… …
1484/* 1528/*
1485 * Set the scrolling region 1529 * Set the scrolling region
1486 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1530 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1487 */ 1531 */
1488void 1532void
1489rxvt_term::scr_scroll_region (int top, int bot) 1533rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1490{ 1534{
1491 max_it (top, 0); 1535 max_it (top, 0);
1492 min_it (bot, nrow - 1); 1536 min_it (bot, nrow - 1);
1493 1537
1494 if (top > bot) 1538 if (top > bot)
… …
1504 * Make the cursor visible/invisible 1548 * Make the cursor visible/invisible
1505 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1549 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1506 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1550 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1507 */ 1551 */
1508void 1552void
1509rxvt_term::scr_cursor_visible (int mode) 1553rxvt_term::scr_cursor_visible (int mode) NOTHROW
1510{ 1554{
1511 want_refresh = 1; 1555 want_refresh = 1;
1512 1556
1513 if (mode) 1557 if (mode)
1514 screen.flags |= Screen_VisibleCursor; 1558 screen.flags |= Screen_VisibleCursor;
… …
1521 * Set/unset automatic wrapping 1565 * Set/unset automatic wrapping
1522 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1566 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1523 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1567 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1524 */ 1568 */
1525void 1569void
1526rxvt_term::scr_autowrap (int mode) 1570rxvt_term::scr_autowrap (int mode) NOTHROW
1527{ 1571{
1528 if (mode) 1572 if (mode)
1529 screen.flags |= Screen_Autowrap; 1573 screen.flags |= Screen_Autowrap;
1530 else 1574 else
1531 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1575 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1540 * and the cursor cannot be moved outside. 1584 * and the cursor cannot be moved outside.
1541 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1585 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1542 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1586 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1543 */ 1587 */
1544void 1588void
1545rxvt_term::scr_relative_origin (int mode) 1589rxvt_term::scr_relative_origin (int mode) NOTHROW
1546{ 1590{
1547 if (mode) 1591 if (mode)
1548 screen.flags |= Screen_Relative; 1592 screen.flags |= Screen_Relative;
1549 else 1593 else
1550 screen.flags &= ~Screen_Relative; 1594 screen.flags &= ~Screen_Relative;
… …
1557 * Set insert/replace mode 1601 * Set insert/replace mode
1558 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1602 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1559 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1603 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1560 */ 1604 */
1561void 1605void
1562rxvt_term::scr_insert_mode (int mode) 1606rxvt_term::scr_insert_mode (int mode) NOTHROW
1563{ 1607{
1564 if (mode) 1608 if (mode)
1565 screen.flags |= Screen_Insert; 1609 screen.flags |= Screen_Insert;
1566 else 1610 else
1567 screen.flags &= ~Screen_Insert; 1611 screen.flags &= ~Screen_Insert;
… …
1573 * XTERM_SEQ: Set tab at current column : ESC H 1617 * XTERM_SEQ: Set tab at current column : ESC H
1574 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1618 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1575 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1619 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1576 */ 1620 */
1577void 1621void
1578rxvt_term::scr_set_tab (int mode) 1622rxvt_term::scr_set_tab (int mode) NOTHROW
1579{ 1623{
1580 if (mode < 0) 1624 if (mode < 0)
1581 memset (tabs, 0, ncol * sizeof (char)); 1625 memset (tabs, 0, ncol);
1582 else if (screen.cur.col < ncol) 1626 else if (screen.cur.col < ncol)
1583 tabs [screen.cur.col] = !!mode; 1627 tabs [screen.cur.col] = !!mode;
1584} 1628}
1585 1629
1586/* ------------------------------------------------------------------------- */ 1630/* ------------------------------------------------------------------------- */
… …
1588 * Set reverse/normal video 1632 * Set reverse/normal video
1589 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1633 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1590 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1634 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1591 */ 1635 */
1592void 1636void
1593rxvt_term::scr_rvideo_mode (int mode) 1637rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1594{ 1638{
1595 XGCValues gcvalue; 1639 rvideo_mode = on;
1596 1640
1641#ifndef NO_BELL
1642 on ^= rvideo_bell;
1643#endif
1644
1597 if (rvideo != mode) 1645 if (rvideo_state != on)
1598 { 1646 {
1599 rvideo = mode; 1647 rvideo_state = on;
1648
1600 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1649 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1601#if XPM_BACKGROUND 1650#ifdef HAVE_BG_PIXMAP
1602 if (bgPixmap.pixmap == None) 1651 if (bgPixmap.pixmap == None)
1603#endif 1652#endif
1604#if TRANSPARENT 1653 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 1654
1655 XGCValues gcvalue;
1610 gcvalue.foreground = pix_colors[Color_fg]; 1656 gcvalue.foreground = pix_colors[Color_fg];
1611 gcvalue.background = pix_colors[Color_bg]; 1657 gcvalue.background = pix_colors[Color_bg];
1612 XChangeGC (display->display, gc, GCBackground | GCForeground, 1658 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1613 &gcvalue); 1659
1614 scr_clear (); 1660 scr_clear ();
1615 scr_touch (true); 1661 scr_touch (true);
1616 } 1662 }
1617} 1663}
1618 1664
… …
1620/* 1666/*
1621 * Report current cursor position 1667 * Report current cursor position
1622 * XTERM_SEQ: Report position: ESC [ 6 n 1668 * XTERM_SEQ: Report position: ESC [ 6 n
1623 */ 1669 */
1624void 1670void
1625rxvt_term::scr_report_position () 1671rxvt_term::scr_report_position () NOTHROW
1626{ 1672{
1627 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1673 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1628} 1674}
1629 1675
1630/* ------------------------------------------------------------------------- * 1676/* ------------------------------------------------------------------------- *
… …
1633 1679
1634/* 1680/*
1635 * Set font style 1681 * Set font style
1636 */ 1682 */
1637void 1683void
1638rxvt_term::set_font_style () 1684rxvt_term::set_font_style () NOTHROW
1639{ 1685{
1640#if 0 1686#if 0
1641 switch (charsets [screen.charset]) 1687 switch (charsets [screen.charset])
1642 { 1688 {
1643 case '0': /* DEC Special Character & Line Drawing Set */ 1689 case '0': /* DEC Special Character & Line Drawing Set */
… …
1665 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1711 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1666 * XTERM_SEQ: Invoke G2 character set: ESC N 1712 * XTERM_SEQ: Invoke G2 character set: ESC N
1667 * XTERM_SEQ: Invoke G3 character set: ESC O 1713 * XTERM_SEQ: Invoke G3 character set: ESC O
1668 */ 1714 */
1669void 1715void
1670rxvt_term::scr_charset_choose (int set) 1716rxvt_term::scr_charset_choose (int set) NOTHROW
1671{ 1717{
1672 screen.charset = set; 1718 screen.charset = set;
1673 set_font_style (); 1719 set_font_style ();
1674} 1720}
1675 1721
… …
1681 * XTERM_SEQ: Set G2 character set: ESC * <C> 1727 * XTERM_SEQ: Set G2 character set: ESC * <C>
1682 * XTERM_SEQ: Set G3 character set: ESC + <C> 1728 * XTERM_SEQ: Set G3 character set: ESC + <C>
1683 * See set_font_style for possible values for <C> 1729 * See set_font_style for possible values for <C>
1684 */ 1730 */
1685void 1731void
1686rxvt_term::scr_charset_set (int set, unsigned int ch) 1732rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1687{ 1733{
1688 charsets[set] = (unsigned char)ch; 1734 charsets[set] = (unsigned char)ch;
1689 set_font_style (); 1735 set_font_style ();
1690} 1736}
1691 1737
… …
1696 1742
1697/* 1743/*
1698 * refresh matching text. 1744 * refresh matching text.
1699 */ 1745 */
1700bool 1746bool
1701rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1747rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1702{ 1748{
1703 bool found = false; 1749 bool found = false;
1704 1750
1705 for (int i = 0; i < nrow; i++) 1751 for (int i = 0; i < nrow; i++)
1706 { 1752 {
1707 int col = 0;
1708 rend_t *drp = drawn_buf[i].r; 1753 rend_t *drp = drawn_buf[i].r;
1709 1754
1710 for (; col < ncol; col++, drp++) 1755 for (int col = 0; col < ncol; col++, drp++)
1711 if ((*drp & mask) == value) 1756 if ((*drp & mask) == value)
1712 { 1757 {
1713 found = true; 1758 found = true;
1714 *drp = ~value; 1759 *drp = ~value;
1715 } 1760 }
… …
1726 PART_END, 1771 PART_END,
1727 RC_COUNT 1772 RC_COUNT
1728}; 1773};
1729 1774
1730void 1775void
1731rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1776rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1732{ 1777{
1733 int i; 1778 int i;
1734 row_col_t rc[RC_COUNT]; 1779 row_col_t rc[RC_COUNT];
1735 1780
1736 if (!drawn_buf) /* sanity check */ 1781 if (!drawn_buf) /* sanity check */
… …
1755 for (i = PART_BEG; i < RC_COUNT; i++) 1800 for (i = PART_BEG; i < RC_COUNT; i++)
1756 { 1801 {
1757 min_it (rc[i].col, ncol - 1); 1802 min_it (rc[i].col, ncol - 1);
1758 min_it (rc[i].row, nrow - 1); 1803 min_it (rc[i].row, nrow - 1);
1759 } 1804 }
1760 1805// 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++) 1806 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); 1807 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1763 1808
1809 num_scr_allow = 0;
1810
1764 if (refresh) 1811 if (refresh)
1765 scr_refresh (SLOW_REFRESH); 1812 scr_refresh ();
1766} 1813}
1767 1814
1768/* ------------------------------------------------------------------------- */ 1815/* ------------------------------------------------------------------------- */
1769/* 1816/*
1770 * Refresh the entire screen 1817 * Refresh the entire screen
1771 */ 1818 */
1772void 1819void
1773rxvt_term::scr_touch (bool refresh) 1820rxvt_term::scr_touch (bool refresh) NOTHROW
1774{ 1821{
1775 scr_expose (0, 0, width, height, refresh); 1822 scr_expose (0, 0, width, height, refresh);
1776} 1823}
1777 1824
1778/* ------------------------------------------------------------------------- */ 1825/* ------------------------------------------------------------------------- */
1779/* 1826/*
1780 * Move the display so that the line represented by scrollbar value Y is at 1827 * Move the display so that the line represented by scrollbar value Y is at
1781 * the top of the screen 1828 * the top of the screen
1782 */ 1829 */
1783int 1830void
1784rxvt_term::scr_move_to (int y, int len) 1831rxvt_term::scr_move_to (int y, int len) NOTHROW
1785{ 1832{
1786 long p = 0; 1833 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} 1834}
1802 1835
1803/* ------------------------------------------------------------------------- */ 1836/* ------------------------------------------------------------------------- */
1804/* 1837/*
1805 * Page the screen up/down nlines 1838 * Page the screen up/down nlines
1806 * direction should be UP or DN 1839 * direction should be UP or DN
1807 */ 1840 */
1808int 1841bool
1809rxvt_term::scr_page (enum page_dirn direction, int nlines) 1842rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1810{ 1843{
1811 int n; 1844 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; 1845 direction == UP ? view_start - nlines
1824 view_start = max (n, 0); 1846 : view_start + nlines;
1825 }
1826 1847
1827 return scr_changeview (oldviewstart); 1848 return scr_changeview (new_view_start);
1828} 1849}
1829 1850
1830int 1851bool
1831rxvt_term::scr_changeview (unsigned int oldviewstart) 1852rxvt_term::scr_changeview (int new_view_start) NOTHROW
1832{ 1853{
1854 clamp_it (new_view_start, top_row, 0);
1855
1833 if (view_start != oldviewstart) 1856 if (new_view_start == view_start)
1834 { 1857 return false;
1858
1859 num_scr += new_view_start - view_start;
1860 view_start = new_view_start;
1861 want_refresh = 1;
1862
1835 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1863 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1836 1864
1837 want_refresh = 1; 1865 return true;
1838 num_scr -= (view_start - oldviewstart);
1839 }
1840
1841 return (int)view_start - (int)oldviewstart;
1842} 1866}
1843 1867
1844/* ------------------------------------------------------------------------- */ 1868#ifndef NO_BELL
1845void 1869void
1870rxvt_term::bell_cb (ev::timer &w, int revents)
1871{
1872 rvideo_bell = false;
1873 scr_rvideo_mode (rvideo_mode);
1874 refresh_check ();
1875}
1876#endif
1877
1878/* ------------------------------------------------------------------------- */
1879void
1846rxvt_term::scr_bell () 1880rxvt_term::scr_bell () NOTHROW
1847{ 1881{
1848#ifndef NO_BELL 1882#ifndef NO_BELL
1849 1883
1850# ifndef NO_MAPALERT 1884# ifndef NO_MAPALERT
1851# ifdef MAPALERT_OPTION 1885# ifdef MAPALERT_OPTION
1852 if (OPTION (Opt_mapAlert)) 1886 if (option (Opt_mapAlert))
1853# endif 1887# endif
1854 XMapWindow (display->display, parent[0]); 1888 XMapWindow (dpy, parent[0]);
1855# endif 1889# endif
1856 1890
1857 if (OPTION (Opt_visualBell)) 1891# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell))
1893 {
1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1895 {
1896 h->flags |= XUrgencyHint;
1897 XSetWMHints (dpy, parent[0], h);
1898 }
1858 { 1899 }
1859 scr_rvideo_mode (!rvideo); /* refresh also done */ 1900# endif
1901
1902 if (option (Opt_visualBell))
1903 {
1904 rvideo_bell = true;
1905 scr_rvideo_mode (rvideo_mode);
1906 flush ();
1907
1860 rxvt_usleep (VISUAL_BELL_DURATION); 1908 bell_ev.start (VISUAL_BELL_DURATION);
1861 scr_rvideo_mode (!rvideo); /* refresh also done */
1862 } 1909 }
1863 else 1910 else
1864 XBell (display->display, 0); 1911 XBell (dpy, 0);
1865
1866#endif 1912#endif
1867} 1913}
1868 1914
1869/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1870/* ARGSUSED */ 1916/* ARGSUSED */
1871void 1917void
1872rxvt_term::scr_printscreen (int fullhist) 1918rxvt_term::scr_printscreen (int fullhist) NOTHROW
1873{ 1919{
1874#ifdef PRINTPIPE 1920#ifdef PRINTPIPE
1875 int nrows, row_start; 1921 int nrows, row_start;
1876 FILE *fd; 1922 FILE *fd;
1877 1923
1878 if ((fd = popen_printer ()) == NULL) 1924 if ((fd = popen_printer ()) == NULL)
1879 return; 1925 return;
1880 1926
1881 if (fullhist) 1927 if (fullhist)
1882 { 1928 {
1883 nrows = nrow + nsaved; 1929 nrows = nrow - top_row;
1884 row_start = -nsaved; 1930 row_start = top_row;
1885 } 1931 }
1886 else 1932 else
1887 { 1933 {
1888 nrows = nrow; 1934 nrows = nrow;
1889 row_start = -view_start; 1935 row_start = view_start;
1890 } 1936 }
1891 1937
1892 wctomb (0, 0); 1938 wctomb (0, 0);
1893 1939
1894 for (int r1 = 0; r1 < nrows; r1++) 1940 for (int r1 = 0; r1 < nrows; r1++)
… …
1926 * Refresh the screen 1972 * Refresh the screen
1927 * drawn_text/drawn_rend contain the screen information before the update. 1973 * drawn_text/drawn_rend contain the screen information before the update.
1928 * screen.text/screen.rend contain what the screen will change to. 1974 * screen.text/screen.rend contain what the screen will change to.
1929 */ 1975 */
1930void 1976void
1931rxvt_term::scr_refresh (unsigned char refresh_type) 1977rxvt_term::scr_refresh () NOTHROW
1932{ 1978{
1933 unsigned char must_clear, /* use draw_string not draw_image_string */ 1979 unsigned char have_bg,
1934 showcursor; /* show the cursor */ 1980 showcursor; /* show the cursor */
1935 int16_t col, row, /* column/row we're processing */ 1981 int16_t col, row, /* column/row we're processing */
1936 ocrow; /* old cursor row */ 1982 ocrow; /* old cursor row */
1937 int i; /* tmp */ 1983 int i; /* tmp */
1938#ifndef NO_CURSORCOLOR 1984#ifndef NO_CURSORCOLOR
1939 rend_t cc1; /* store colours at cursor position (s) */ 1985 rend_t cc1; /* store colours at cursor position (s) */
1940#endif 1986#endif
1941 rend_t *crp; // cursor rendition pointer 1987 rend_t *crp; // cursor rendition pointer
1988 rend_t ccol1, /* Cursor colour */
1989 ccol2; /* Cursor colour2 */
1942 1990
1943 want_refresh = 0; /* screen is current */ 1991 want_refresh = 0; /* screen is current */
1944 1992
1945 if (refresh_type == NO_REFRESH || !mapped) 1993 if (refresh_type == NO_REFRESH || !mapped)
1946 return; 1994 return;
1947 1995
1948 /* 1996 /*
1949 * A: set up vars 1997 * A: set up vars
1950 */ 1998 */
1951 must_clear = 0; 1999 have_bg = 0;
1952 refresh_count = 0; 2000 refresh_count = 0;
1953 2001
1954#if XPM_BACKGROUND 2002#ifdef HAVE_BG_PIXMAP
1955 must_clear |= bgPixmap.pixmap != None; 2003 have_bg |= bgPixmap.pixmap != None;
1956#endif
1957#if TRANSPARENT
1958 must_clear |= OPTION (Opt_transparent) && am_transparent;
1959#endif 2004#endif
1960 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1961 2006
1962 /* 2007 /*
1963 * B: reverse any characters which are selected 2008 * B: reverse any characters which are selected
… …
1967 /* 2012 /*
1968 * C: set the cursor character (s) 2013 * C: set the cursor character (s)
1969 */ 2014 */
1970 { 2015 {
1971 unsigned char setoldcursor; 2016 unsigned char setoldcursor;
1972 rend_t ccol1, /* Cursor colour */
1973 ccol2; /* Cursor colour2 */
1974 2017
1975 showcursor = (screen.flags & Screen_VisibleCursor); 2018 showcursor = (screen.flags & Screen_VisibleCursor);
1976#ifdef CURSOR_BLINK 2019#ifdef CURSOR_BLINK
1977 if (hidden_cursor) 2020 if (hidden_cursor)
1978 showcursor = 0; 2021 showcursor = 0;
… …
1985 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2028 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1986 col--; 2029 col--;
1987 2030
1988 crp = &ROW(screen.cur.row).r[col]; 2031 crp = &ROW(screen.cur.row).r[col];
1989 2032
2033#ifndef NO_CURSORCOLOR
2034 cc1 = *crp & (RS_fgMask | RS_bgMask);
2035 if (ISSET_PIXCOLOR (Color_cursor))
2036 ccol1 = Color_cursor;
2037 else
2038#endif
2039#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2040 ccol1 = fgcolor_of (rstyle);
2041#else
2042 ccol1 = Color_fg;
2043#endif
2044
2045#ifndef NO_CURSORCOLOR
2046 if (ISSET_PIXCOLOR (Color_cursor2))
2047 ccol2 = Color_cursor2;
2048 else
2049#endif
2050#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2051 ccol2 = bgcolor_of (rstyle);
2052#else
2053 ccol2 = Color_bg;
2054#endif
2055
1990 if (showcursor && focus) 2056 if (showcursor && focus)
1991 { 2057 {
1992 if (OPTION (Opt_cursorUnderline)) 2058 if (option (Opt_cursorUnderline))
1993 *crp ^= RS_Uline; 2059 *crp ^= RS_Uline;
1994 else 2060 else
1995 { 2061 {
1996 *crp ^= RS_RVid; 2062 *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); 2063 *crp = SET_FGCOLOR (*crp, ccol1);
2017 *crp = SET_BGCOLOR (*crp, ccol2); 2064 *crp = SET_BGCOLOR (*crp, ccol2);
2018#endif
2019 } 2065 }
2020 } 2066 }
2021 } 2067 }
2022 2068
2023 /* make sure no outline cursor is left around */ 2069 /* make sure no outline cursor is left around */
2024 setoldcursor = 0; 2070 setoldcursor = 0;
2025 if (ocrow != -1) 2071 if (ocrow != -1)
2026 { 2072 {
2027 if (screen.cur.row + view_start != ocrow 2073 if (screen.cur.row - view_start != ocrow
2028 || screen.cur.col != oldcursor.col) 2074 || screen.cur.col != oldcursor.col)
2029 { 2075 {
2030 if (ocrow < nrow 2076 if (ocrow < nrow
2031 && oldcursor.col < ncol) 2077 && oldcursor.col < ncol)
2032 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2078 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2040 else if (!focus) 2086 else if (!focus)
2041 setoldcursor = 1; 2087 setoldcursor = 1;
2042 2088
2043 if (setoldcursor) 2089 if (setoldcursor)
2044 { 2090 {
2045 if (screen.cur.row + view_start >= nrow) 2091 if (screen.cur.row - view_start >= nrow)
2046 oldcursor.row = -1; 2092 oldcursor.row = -1;
2047 else 2093 else
2048 { 2094 {
2049 oldcursor.row = screen.cur.row + view_start; 2095 oldcursor.row = screen.cur.row - view_start;
2050 oldcursor.col = screen.cur.col; 2096 oldcursor.col = screen.cur.col;
2051 } 2097 }
2052 } 2098 }
2053 } 2099 }
2054 2100
… …
2060#ifndef NO_SLOW_LINK_SUPPORT 2106#ifndef NO_SLOW_LINK_SUPPORT
2061 /* 2107 /*
2062 * D: CopyArea pass - very useful for slower links 2108 * D: CopyArea pass - very useful for slower links
2063 * This has been deliberately kept simple. 2109 * This has been deliberately kept simple.
2064 */ 2110 */
2065 i = num_scr;
2066 if (!display->is_local 2111 if (!display->is_local
2067 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2112 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2068 && abs (num_scr) < nrow && !must_clear) 2113 && abs (num_scr) < nrow && !have_bg)
2069 { 2114 {
2070 int16_t nits; 2115 int16_t nits;
2116 int i = num_scr;
2071 int j; 2117 int j;
2072 int len, wlen; 2118 int len, wlen;
2119 dLocal (int, num_scr);
2073 2120
2074 j = nrow; 2121 j = nrow;
2075 wlen = len = -1; 2122 wlen = len = -1;
2076 row = i > 0 ? 0 : j - 1; 2123 row = i > 0 ? 0 : j - 1;
2124
2077 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2125 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2078 { 2126 {
2079 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2127 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2080 { 2128 {
2081 line_t s = ROW(row - view_start); 2129 line_t s = ROW(view_start + row);
2082 line_t d = drawn_buf[row]; 2130 line_t d = drawn_buf[row];
2083 line_t d2 = drawn_buf[row + i]; 2131 line_t d2 = drawn_buf[row + i];
2084 2132
2085 for (nits = 0, col = ncol; col--; ) 2133 for (nits = 0, col = ncol; col--; )
2086 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2134 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2102 wlen = row; 2150 wlen = row;
2103 continue; 2151 continue;
2104 } 2152 }
2105 } 2153 }
2106 2154
2107 if (len != -1) 2155 if (len >= 0)
2108 { 2156 {
2109 /* also comes here at end if needed because of >= above */ 2157 /* also comes here at end if needed because of >= above */
2110 if (wlen < len) 2158 if (wlen < len)
2111 ::swap (wlen, len); 2159 ::swap (wlen, len);
2112 2160
2161 XGCValues gcv;
2162
2163 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2113 XCopyArea (display->display, vt, vt, 2164 XCopyArea (dpy, vt, vt,
2114 gc, 0, Row2Pixel (len + i), 2165 gc, 0, Row2Pixel (len + i),
2115 (unsigned int)this->width, 2166 (unsigned int)this->width,
2116 (unsigned int)Height2Pixel (wlen - len + 1), 2167 (unsigned int)Height2Pixel (wlen - len + 1),
2117 0, Row2Pixel (len)); 2168 0, Row2Pixel (len));
2169 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2170
2118 len = -1; 2171 len = -1;
2119 } 2172 }
2120 } 2173 }
2121 } 2174 }
2122#endif 2175#endif
… …
2124 /* 2177 /*
2125 * E: main pass across every character 2178 * E: main pass across every character
2126 */ 2179 */
2127 for (row = 0; row < nrow; row++) 2180 for (row = 0; row < nrow; row++)
2128 { 2181 {
2129 text_t *stp = ROW(row - view_start).t; 2182 text_t *stp = ROW(view_start + row).t;
2130 rend_t *srp = ROW(row - view_start).r; 2183 rend_t *srp = ROW(view_start + row).r;
2131 text_t *dtp = drawn_buf[row].t; 2184 text_t *dtp = drawn_buf[row].t;
2132 rend_t *drp = drawn_buf[row].r; 2185 rend_t *drp = drawn_buf[row].r;
2133 2186
2134 /* 2187 /*
2135 * E2: OK, now the real pass 2188 * E2: OK, now the real pass
… …
2178 count++; 2231 count++;
2179 2232
2180 if (stp[col] != dtp[col] 2233 if (stp[col] != dtp[col]
2181 || !RS_SAME (srp[col], drp[col])) 2234 || !RS_SAME (srp[col], drp[col]))
2182 { 2235 {
2183 if (must_clear && (i++ > count / 2)) 2236 if (have_bg && (i++ > count / 2))
2184 break; 2237 break;
2185 2238
2186 dtp[col] = stp[col]; 2239 dtp[col] = stp[col];
2187 drp[col] = rend; 2240 drp[col] = rend;
2188 i = 0; 2241 i = 0;
2189 } 2242 }
2190 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2243 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2191 break; 2244 break;
2192 } 2245 }
2193 2246
2194 col--; /* went one too far. move back */ 2247 col--; /* went one too far. move back */
2195 count -= i; /* dump any matching trailing chars */ 2248 count -= i; /* dump any matching trailing chars */
… …
2205 int back = bgcolor_of (rend); // desired background 2258 int back = bgcolor_of (rend); // desired background
2206 2259
2207 // only do special processing if any attributes are set, which is unlikely 2260 // 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)) 2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2209 { 2262 {
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; 2263 bool invert = rend & RS_RVid;
2223 2264
2224#ifndef NO_BOLD_UNDERLINE_REVERSE 2265#ifndef NO_BOLD_UNDERLINE_REVERSE
2225 if (rend & RS_Bold
2226 && fore == Color_fg) 2266 if (rend & RS_Bold && fore == Color_fg)
2227 { 2267 {
2228 if (ISSET_PIXCOLOR (Color_BD)) 2268 if (ISSET_PIXCOLOR (Color_BD))
2229 fore = Color_BD; 2269 fore = Color_BD;
2230# if !ENABLE_STYLES 2270# if !ENABLE_STYLES
2231 else 2271 else
2232 invert = !invert; 2272 invert = !invert;
2233# endif 2273# endif
2234 } 2274 }
2235 2275
2236 if (rend & RS_Italic 2276 if (rend & RS_Italic && fore == Color_fg)
2237 && fore == Color_fg)
2238 { 2277 {
2239 if (ISSET_PIXCOLOR (Color_IT)) 2278 if (ISSET_PIXCOLOR (Color_IT))
2240 fore = Color_IT; 2279 fore = Color_IT;
2241# if !ENABLE_STYLES 2280# if !ENABLE_STYLES
2242 else 2281 else
2243 invert = !invert; 2282 invert = !invert;
2244# endif 2283# endif
2245 } 2284 }
2246 2285
2247 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2286 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2248 fore = Color_UL; 2287 fore = Color_UL;
2249#endif 2288#endif
2250 2289
2251 if (invert) 2290 if (invert)
2252 { 2291 {
2292#ifdef OPTION_HC
2293 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2294 || !ISSET_PIXCOLOR (Color_HC))
2295#endif
2296 /* invert the column if no highlightColor is set or it is the
2297 * current cursor column */
2253 ::swap (fore, back); 2298 ::swap (fore, back);
2299#ifdef OPTION_HC
2300 else if (ISSET_PIXCOLOR (Color_HC))
2301 back = Color_HC;
2302#endif
2254 2303
2255#ifndef NO_BOLD_UNDERLINE_REVERSE 2304#ifndef NO_BOLD_UNDERLINE_REVERSE
2305# ifndef OPTION_HC
2256 if (ISSET_PIXCOLOR (Color_RV)) 2306 if (ISSET_PIXCOLOR (Color_RV))
2257 back = Color_RV; 2307 back = Color_RV;
2258 2308# endif
2259 if (fore == back) 2309 if (fore == back)
2260 { 2310 {
2261 fore = Color_bg; 2311 fore = Color_bg;
2262 back = Color_fg; 2312 back = Color_fg;
2263 } 2313 }
… …
2265 } 2315 }
2266 2316
2267#ifdef TEXT_BLINK 2317#ifdef TEXT_BLINK
2268 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2318 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2269 { 2319 {
2270 if (!text_blink_ev.active) 2320 if (!text_blink_ev.is_active ())
2271 { 2321 {
2272 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2322 text_blink_ev.again ();
2273 hidden_text = 0; 2323 hidden_text = 0;
2274 } 2324 }
2275 else if (hidden_text) 2325 else if (hidden_text)
2276 fore = back; 2326 fore = back;
2277 } 2327 }
2278#endif 2328#endif
2329
2330#if ENABLE_STYLES
2331 // "careful" (too wide) character handling
2332
2333 // include previous careful character(s) if possible, looks nicer (best effort...)
2334 while (text > stp
2335 && srp[text - stp - 1] & RS_Careful
2336 && RS_SAME (rend, srp[text - stp - 1]))
2337 text--, count++, xpixel -= fwidth;
2338
2339 // force redraw after "careful" characters to avoid pixel droppings
2340 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2341 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2342
2343 // force redraw before "careful" characters to avoid pixel droppings
2344 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2345 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2346#endif
2279 } 2347 }
2280 2348
2281 /* 2349 /*
2282 * Actually do the drawing of the string here 2350 * Actually do the drawing of the string here
2283 */ 2351 */
2284 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2285 2353
2286 if (back == fore)
2287 font->clear_rect (*drawable, xpixel, ypixel,
2288 fwidth * count, fheight,
2289 back);
2290 else if (back == Color_bg) 2354 if (have_bg && back == Color_bg)
2291 { 2355 {
2292 if (must_clear) 2356 // this is very ugly, maybe push it into ->draw?
2293 {
2294 CLEAR_CHARS (xpixel, ypixel, count);
2295 2357
2296 for (i = 0; i < count; i++) /* don't draw empty strings */ 2358 for (i = 0; i < count; i++) /* don't draw empty strings */
2297 if (text[i] != ' ') 2359 if (text[i] != ' ')
2298 { 2360 {
2299 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2361 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2300 break; 2362 goto did_clear;
2301 }
2302 } 2363 }
2303 else 2364
2304 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2365 CLEAR_CHARS (xpixel, ypixel, count);
2366 did_clear: ;
2305 } 2367 }
2306 else 2368 else
2307 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2369 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2308 2370
2309 if (rend & RS_Uline && font->descent > 1 && fore != back) 2371 if (rend & RS_Uline && font->descent > 1 && fore != back)
2310 { 2372 {
2311#if ENABLE_FRILLS 2373#if ENABLE_FRILLS
2312 if (ISSET_PIXCOLOR (Color_underline)) 2374 if (ISSET_PIXCOLOR (Color_underline))
2313 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2375 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2314 else 2376 else
2315#endif 2377#endif
2316 XSetForeground (display->display, gc, pix_colors[fore]); 2378 XSetForeground (dpy, gc, pix_colors[fore]);
2317 2379
2318 XDrawLine (display->display, drawBuffer, gc, 2380 XDrawLine (dpy, drawBuffer, gc,
2319 xpixel, ypixel + font->ascent + 1, 2381 xpixel, ypixel + font->ascent + 1,
2320 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2382 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2321 } 2383 }
2322 } /* for (col....) */ 2384 } /* for (col....) */
2323 } /* for (row....) */ 2385 } /* for (row....) */
… …
2332 */ 2394 */
2333 if (showcursor) 2395 if (showcursor)
2334 { 2396 {
2335 if (focus) 2397 if (focus)
2336 { 2398 {
2337 if (OPTION (Opt_cursorUnderline)) 2399 if (option (Opt_cursorUnderline))
2338 *crp ^= RS_Uline; 2400 *crp ^= RS_Uline;
2339 else 2401 else
2340 { 2402 {
2341 *crp ^= RS_RVid; 2403 *crp ^= RS_RVid;
2342#ifndef NO_CURSORCOLOR 2404#ifndef NO_CURSORCOLOR
… …
2356 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2418 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2357 cursorwidth++; 2419 cursorwidth++;
2358 2420
2359#ifndef NO_CURSORCOLOR 2421#ifndef NO_CURSORCOLOR
2360 if (ISSET_PIXCOLOR (Color_cursor)) 2422 if (ISSET_PIXCOLOR (Color_cursor))
2361 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2423 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2424 else
2362#endif 2425#endif
2426 XSetForeground (dpy, gc, pix_colors[ccol1]);
2363 2427
2364 XDrawRectangle (display->display, drawBuffer, gc, 2428 XDrawRectangle (dpy, drawBuffer, gc,
2365 Col2Pixel (col), 2429 Col2Pixel (col),
2366 Row2Pixel (oldcursor.row), 2430 Row2Pixel (oldcursor.row),
2367 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2431 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2368 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2432 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2369 } 2433 }
… …
2372 /* 2436 /*
2373 * H: cleanup selection 2437 * H: cleanup selection
2374 */ 2438 */
2375 scr_reverse_selection (); 2439 scr_reverse_selection ();
2376 2440
2377 if (refresh_type & SMOOTH_REFRESH)
2378 XFlush (display->display);
2379
2380 num_scr = 0; 2441 num_scr = 0;
2381 num_scr_allow = 1; 2442 num_scr_allow = 1;
2382} 2443}
2383 2444
2384void 2445void
2385rxvt_term::scr_remap_chars (line_t &l) 2446rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2386{ 2447{
2387 if (!l.t) 2448 if (!l.t)
2388 return; 2449 return;
2389 2450
2390 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2451 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2392 for (int i = ncol; i--; ) 2453 for (int i = ncol; i--; )
2393 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2454 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2394} 2455}
2395 2456
2396void 2457void
2397rxvt_term::scr_remap_chars () 2458rxvt_term::scr_remap_chars () NOTHROW
2398{ 2459{
2399 for (int i = total_rows; i--; ) 2460 for (int i = total_rows; i--; )
2400 scr_remap_chars (row_buf [i]); 2461 scr_remap_chars (row_buf [i]);
2401 2462
2402 for (int i = nrow; i--; ) 2463 for (int i = nrow; i--; )
… …
2405 scr_remap_chars (swap_buf [i]); 2466 scr_remap_chars (swap_buf [i]);
2406 } 2467 }
2407} 2468}
2408 2469
2409void 2470void
2410rxvt_term::scr_recolour () 2471rxvt_term::scr_recolour () NOTHROW
2411{ 2472{
2412 if (1 2473#ifdef HAVE_BG_PIXMAP
2413#if TRANSPARENT 2474 bgPixmap.apply ();
2414 && !am_transparent 2475#else
2415#endif 2476
2416#if XPM_BACKGROUND
2417 && !bgPixmap.pixmap
2418#endif
2419 )
2420 {
2421 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2477 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2422 XClearWindow (display->display, parent[0]); 2478 XClearWindow (dpy, parent[0]);
2423 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2479 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2480
2424#if HAVE_SCROLLBARS 2481# if HAVE_SCROLLBARS
2425 if (scrollBar.win) 2482 if (scrollBar.win)
2426 { 2483 {
2427 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2428 scrollBar.setIdle (); 2485 scrollBar.setIdle ();
2429 scrollbar_show (0); 2486 scrollbar_show (0);
2430 } 2487 }
2431#endif 2488# endif
2432 }
2433 2489
2434 scr_clear (); 2490 scr_clear ();
2435 scr_touch (true); 2491 scr_touch (true);
2436 want_refresh = 1; 2492 want_refresh = 1;
2437}
2438 2493
2494#endif
2495}
2496
2439/* ------------------------------------------------------------------------- */ 2497/* ------------------------------------------------------------------------- */
2440void 2498void
2441rxvt_term::scr_clear (bool really) 2499rxvt_term::scr_clear (bool really) NOTHROW
2442{ 2500{
2443 if (!mapped) 2501 if (!mapped)
2444 return; 2502 return;
2445 2503
2446 num_scr_allow = 0; 2504 num_scr_allow = 0;
2447 want_refresh = 1; 2505 want_refresh = 1;
2448 2506
2449 if (really) 2507 if (really)
2450 XClearWindow (display->display, vt); 2508 XClearWindow (dpy, vt);
2451} 2509}
2452 2510
2453/* ------------------------------------------------------------------------- */
2454void 2511void
2512rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2513{
2514 int view_end = view_start + nrow;
2515 int row, col;
2516
2517 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2518 {
2519 text_t *stp = ROW(row).t;
2520 rend_t *srp = ROW(row).r;
2521
2522 for (col = beg_col; col < end_col; col++)
2523 srp[col] ^= rstyle1;
2524
2525 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2526 srp[col] ^= rstyle2;
2527
2528 if (++col < end_col)
2529 srp[col] ^= rstyle2;
2530 }
2531}
2532
2533void
2534rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2535{
2536 int view_end = view_start + nrow;
2537 int row, col;
2538
2539 if (beg_row >= view_start)
2540 {
2541 col = beg_col;
2542 row = beg_row;
2543 }
2544 else
2545 {
2546 col = 0;
2547 row = view_start;
2548 }
2549
2550 for (; row < min (end_row, view_end); row++, col = 0)
2551 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2552 srp[col] ^= rstyle;
2553
2554 if (row == end_row)
2555 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2556 srp[col] ^= rstyle;
2557}
2558
2559/* ------------------------------------------------------------------------- */
2560void
2455rxvt_term::scr_reverse_selection () 2561rxvt_term::scr_reverse_selection () NOTHROW
2456{ 2562{
2457 if (selection.op 2563 if (selection.op
2458 && current_screen == selection.screen 2564 && current_screen == selection.screen
2459 && selection.end.row >= -view_start) 2565 && selection.end.row >= view_start)
2460 { 2566 {
2461 int view_end = -view_start + nrow; 2567#if !ENABLE_MINIMAL
2462 int row, col;
2463
2464#if ENABLE_FRILLS
2465 if (selection.rect) 2568 if (selection.rect)
2466 { 2569 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++) 2570 selection.end.row, selection.end.col,
2468 { 2571 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 2572 else
2483#endif 2573#endif
2484 { 2574 scr_xor_span (selection.beg.row, selection.beg.col,
2485 if (selection.beg.row >= -view_start) 2575 selection.end.row, selection.end.col,
2486 { 2576 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 } 2577 }
2505} 2578}
2506 2579
2507/* ------------------------------------------------------------------------- */ 2580/* ------------------------------------------------------------------------- */
2508/* 2581/*
2509 * Dump the whole scrollback and screen to the passed filedescriptor. The 2582 * Dump the whole scrollback and screen to the passed filedescriptor. The
2510 * invoking routine must close the fd. 2583 * invoking routine must close the fd.
2511 */ 2584 */
2512#if 0 2585#if 0
2513void 2586void
2514rxvt_term::scr_dump (int fd) 2587rxvt_term::scr_dump (int fd) NOTHROW
2515{ 2588{
2516 int row, wrote; 2589 int row, wrote;
2517 unsigned int width, towrite; 2590 unsigned int width, towrite;
2518 char r1[] = "\n"; 2591 char r1[] = "\n";
2519 2592
… …
2538 2611
2539/* ------------------------------------------------------------------------- * 2612/* ------------------------------------------------------------------------- *
2540 * CHARACTER SELECTION * 2613 * CHARACTER SELECTION *
2541 * ------------------------------------------------------------------------- */ 2614 * ------------------------------------------------------------------------- */
2542void 2615void
2543rxvt_term::selection_check (int check_more) 2616rxvt_term::selection_check (int check_more) NOTHROW
2544{ 2617{
2545 row_col_t pos; 2618 row_col_t pos;
2546 2619
2547 if (!selection.op) 2620 if (!selection.op)
2548 return; 2621 return;
2549 2622
2550 pos.row = pos.col = 0; 2623 pos.row = pos.col = 0;
2551 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2624 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2552 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2625 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2553 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2626 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2554 || (check_more == 1 2627 || (check_more == 1
2555 && current_screen == selection.screen 2628 && current_screen == selection.screen
2556 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2629 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2557 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2630 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2558 || (check_more == 2 2631 || (check_more == 2
… …
2569/* ------------------------------------------------------------------------- */ 2642/* ------------------------------------------------------------------------- */
2570/* 2643/*
2571 * Paste a selection direct to the command fd 2644 * Paste a selection direct to the command fd
2572 */ 2645 */
2573void 2646void
2574rxvt_term::paste (char *data, unsigned int len) 2647rxvt_term::paste (char *data, unsigned int len) NOTHROW
2575{ 2648{
2576 /* convert normal newline chars into common keyboard Return key sequence */ 2649 /* convert normal newline chars into common keyboard Return key sequence */
2577 for (unsigned int i = 0; i < len; i++) 2650 for (unsigned int i = 0; i < len; i++)
2578 if (data[i] == C0_LF) 2651 if (data[i] == C0_LF)
2579 data[i] = C0_CR; 2652 data[i] = C0_CR;
… …
2585/* 2658/*
2586 * Respond to a notification that a primary selection has been sent 2659 * Respond to a notification that a primary selection has been sent
2587 * EXT: SelectionNotify 2660 * EXT: SelectionNotify
2588 */ 2661 */
2589void 2662void
2590rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2663rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2591{ 2664{
2592 if (prop == None) /* check for failed XConvertSelection */ 2665 if (prop == None) /* check for failed XConvertSelection */
2593 { 2666 {
2594 if ((selection_type & Sel_CompoundText)) 2667 if ((selection_type & Sel_CompoundText))
2595 { 2668 {
… …
2615 } 2688 }
2616 2689
2617 unsigned long bytes_after; 2690 unsigned long bytes_after;
2618 XTextProperty ct; 2691 XTextProperty ct;
2619 2692
2620 if (XGetWindowProperty (display->display, win, prop, 2693 if (XGetWindowProperty (dpy, win, prop,
2621 0, PROP_SIZE / 4, 2694 0, PROP_SIZE / 4,
2622 delete_prop, AnyPropertyType, 2695 delete_prop, AnyPropertyType,
2623 &ct.encoding, &ct.format, 2696 &ct.encoding, &ct.format,
2624 &ct.nitems, &bytes_after, 2697 &ct.nitems, &bytes_after,
2625 &ct.value) != Success) 2698 &ct.value) != Success)
… …
2634 if (bytes_after) 2707 if (bytes_after)
2635 { 2708 {
2636 // fetch and append remaining data 2709 // fetch and append remaining data
2637 XTextProperty ct2; 2710 XTextProperty ct2;
2638 2711
2639 if (XGetWindowProperty (display->display, win, prop, 2712 if (XGetWindowProperty (dpy, win, prop,
2640 ct.nitems / 4, (bytes_after + 3) / 4, 2713 ct.nitems / 4, (bytes_after + 3) / 4,
2641 delete_prop, AnyPropertyType, 2714 delete_prop, AnyPropertyType,
2642 &ct2.encoding, &ct2.format, 2715 &ct2.encoding, &ct2.format,
2643 &ct2.nitems, &bytes_after, 2716 &ct2.nitems, &bytes_after,
2644 &ct2.value) != Success) 2717 &ct2.value) != Success)
… …
2657 2730
2658 if (ct.encoding == xa[XA_INCR]) 2731 if (ct.encoding == xa[XA_INCR])
2659 { 2732 {
2660 // INCR selection, start handshake 2733 // INCR selection, start handshake
2661 if (!delete_prop) 2734 if (!delete_prop)
2662 XDeleteProperty (display->display, win, prop); 2735 XDeleteProperty (dpy, win, prop);
2663 2736
2664 selection_wait = Sel_incr; 2737 selection_wait = Sel_incr;
2665 incr_buf_fill = 0; 2738 incr_buf_fill = 0;
2666 incr_ev.start (NOW + 10); 2739 incr_ev.start (10);
2667 2740
2668 goto bailout; 2741 goto bailout;
2669 } 2742 }
2670 2743
2671 if (ct.nitems == 0) 2744 if (ct.nitems == 0)
… …
2680 ct.nitems = incr_buf_fill; 2753 ct.nitems = incr_buf_fill;
2681 incr_buf = 0; 2754 incr_buf = 0;
2682 incr_buf_size = 0; 2755 incr_buf_size = 0;
2683 incr_ev.stop (); 2756 incr_ev.stop ();
2684 } 2757 }
2685 else 2758 else
2686 { 2759 {
2687 if (selection_wait == Sel_normal 2760 if (selection_wait == Sel_normal
2688 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2761 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2689 { 2762 {
2690 /* 2763 /*
… …
2697 goto bailout; 2770 goto bailout;
2698 } 2771 }
2699 } 2772 }
2700 else if (selection_wait == Sel_incr) 2773 else if (selection_wait == Sel_incr)
2701 { 2774 {
2702 incr_ev.start (NOW + 10); 2775 incr_ev.start (10);
2703 2776
2704 while (incr_buf_fill + ct.nitems > incr_buf_size) 2777 while (incr_buf_fill + ct.nitems > incr_buf_size)
2705 { 2778 {
2706 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2779 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2707 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2780 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2714 } 2787 }
2715 2788
2716 char **cl; 2789 char **cl;
2717 int cr; 2790 int cr;
2718 2791
2719#if ENABLE_FRILLS 2792#if !ENABLE_MINIMAL
2720 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2793 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2721 // so recode it manually 2794 // so recode it manually
2722 if (ct.encoding == xa[XA_UTF8_STRING]) 2795 if (ct.encoding == xa[XA_UTF8_STRING])
2723 { 2796 {
2724 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2797 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2728 paste (s, strlen (s)); 2801 paste (s, strlen (s));
2729 free (s); 2802 free (s);
2730 } 2803 }
2731 else 2804 else
2732#endif 2805#endif
2733 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2806 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2734 && cl) 2807 && cl)
2735 { 2808 {
2736 for (int i = 0; i < cr; i++) 2809 for (int i = 0; i < cr; i++)
2737 paste (cl[i], strlen (cl[i])); 2810 paste (cl[i], strlen (cl[i]));
2738 2811
… …
2747 if (selection_wait == Sel_normal) 2820 if (selection_wait == Sel_normal)
2748 selection_wait = Sel_none; 2821 selection_wait = Sel_none;
2749} 2822}
2750 2823
2751void 2824void
2752rxvt_term::incr_cb (time_watcher &w) 2825rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2753{ 2826{
2754 selection_wait = Sel_none; 2827 selection_wait = Sel_none;
2755 2828
2756 incr_buf_size = 0; 2829 incr_buf_size = 0;
2757 free (incr_buf); 2830 free (incr_buf);
2758 2831
2759 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2832 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2760} 2833}
2761 2834
2762void 2835void
2763rxvt_term::selection_property (Window win, Atom prop) 2836rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2764{ 2837{
2765 if (prop == None || selection_wait != Sel_incr) 2838 if (prop == None || selection_wait != Sel_incr)
2766 return; 2839 return;
2767 2840
2768 selection_paste (win, prop, true); 2841 selection_paste (win, prop, true);
2769} 2842}
2770 2843
2771/* ------------------------------------------------------------------------- */ 2844/* ------------------------------------------------------------------------- */
2772/* 2845/*
2773 * Request the current selection: 2846 * Request the current selection:
2774 * Order: > internal selection if available 2847 * Order: > internal selection if available
2775 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2848 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2776 * > CUT_BUFFER0 2849 * > CUT_BUFFER0
2777 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2850 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2778 * will auto fallback to CUT_BUFFER0 2851 * will auto fallback to CUT_BUFFER0
2779 * EXT: button 2 release 2852 * EXT: button 2 release
2780 */ 2853 */
2781void 2854void
2782rxvt_term::selection_request (Time tm, int x, int y) 2855rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2783{ 2856{
2784 if (x < 0 || x >= width || y < 0 || y >= height) 2857 if (selection.text && selnum == Sel_Primary)
2785 return; /* outside window */ 2858 {
2786
2787 if (selection.text)
2788 { /* internal selection */ 2859 /* internal selection */
2789 char *str = rxvt_wcstombs (selection.text, selection.len); 2860 char *str = rxvt_wcstombs (selection.text, selection.len);
2790 paste (str, strlen (str)); 2861 paste (str, strlen (str));
2791 free (str); 2862 free (str);
2792 return; 2863 return;
2793 } 2864 }
2794 else 2865 else
2795 { 2866 {
2796 int i;
2797
2798 selection_request_time = tm; 2867 selection_request_time = tm;
2799 selection_wait = Sel_normal; 2868 selection_wait = Sel_normal;
2800 2869
2801 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2802 {
2803#if X_HAVE_UTF8_STRING 2870#if X_HAVE_UTF8_STRING
2804 selection_type = Sel_UTF8String; 2871 selection_type = Sel_UTF8String;
2805 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2872 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2806 return; 2873 return;
2807#else 2874#else
2808 selection_type = Sel_CompoundText; 2875 selection_type = Sel_CompoundText;
2809 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2876 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2810 return; 2877 return;
2811#endif 2878#endif
2812 }
2813 } 2879 }
2814 2880
2815 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2881 selection_wait = Sel_none; /* don't loop in selection_paste () */
2816 selection_paste (display->root, XA_CUT_BUFFER0, false); 2882 selection_paste (display->root, XA_CUT_BUFFER0, false);
2817} 2883}
2818 2884
2819int 2885int
2820rxvt_term::selection_request_other (Atom target, int selnum) 2886rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2821{ 2887{
2822 Atom sel; 2888 Atom sel;
2823 2889
2824 selection_type |= selnum; 2890 selection_type |= selnum;
2825 2891
… …
2828 else if (selnum == Sel_Secondary) 2894 else if (selnum == Sel_Secondary)
2829 sel = XA_SECONDARY; 2895 sel = XA_SECONDARY;
2830 else 2896 else
2831 sel = xa[XA_CLIPBOARD]; 2897 sel = xa[XA_CLIPBOARD];
2832 2898
2833 if (XGetSelectionOwner (display->display, sel) != None) 2899 if (XGetSelectionOwner (dpy, sel) != None)
2834 { 2900 {
2835 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2901 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2836 vt, selection_request_time); 2902 vt, selection_request_time);
2837 return 1; 2903 return 1;
2838 } 2904 }
2839 2905
2840 return 0; 2906 return 0;
… …
2844/* 2910/*
2845 * Clear all selected text 2911 * Clear all selected text
2846 * EXT: SelectionClear 2912 * EXT: SelectionClear
2847 */ 2913 */
2848void 2914void
2849rxvt_term::selection_clear () 2915rxvt_term::selection_clear () NOTHROW
2850{ 2916{
2851 want_refresh = 1; 2917 want_refresh = 1;
2852 free (selection.text); 2918 free (selection.text);
2853 selection.text = NULL; 2919 selection.text = NULL;
2854 selection.len = 0; 2920 selection.len = 0;
… …
2903 2969
2904 int end_col; 2970 int end_col;
2905 2971
2906 for (; row <= selection.end.row; row++, col = 0) 2972 for (; row <= selection.end.row; row++, col = 0)
2907 { 2973 {
2908#if ENABLE_FRILLS 2974#if !ENABLE_MINIMAL
2909 if (selection.rect) 2975 if (selection.rect)
2910 { 2976 {
2911 col = selection.beg.col; 2977 col = selection.beg.col;
2912 end_col = ncol + 1; 2978 end_col = ncol + 1;
2913 } 2979 }
… …
2916 end_col = ROW(row).l; 2982 end_col = ROW(row).l;
2917 2983
2918 col = max (col, 0); 2984 col = max (col, 0);
2919 2985
2920 if (row == selection.end.row 2986 if (row == selection.end.row
2921#if ENABLE_FRILLS 2987#if !ENABLE_MINIMAL
2922 || selection.rect 2988 || selection.rect
2923#endif 2989#endif
2924 ) 2990 )
2925 min_it (end_col, selection.end.col); 2991 min_it (end_col, selection.end.col);
2926 2992
… …
2949#endif 3015#endif
2950 else 3016 else
2951 new_selection_text[ofs++] = *t++; 3017 new_selection_text[ofs++] = *t++;
2952 } 3018 }
2953 3019
2954#if ENABLE_FRILLS 3020#if !ENABLE_MINIMAL
2955 if (selection.rect) 3021 if (selection.rect)
2956 { 3022 {
2957 while (ofs 3023 while (ofs
2958 && new_selection_text[ofs - 1] != C0_LF 3024 && new_selection_text[ofs - 1] != C0_LF
2959 && unicode::is_space (new_selection_text[ofs - 1])) 3025 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2989 3055
2990 selection_grab (tm); 3056 selection_grab (tm);
2991} 3057}
2992 3058
2993bool 3059bool
2994rxvt_term::selection_grab (Time tm) 3060rxvt_term::selection_grab (Time tm) NOTHROW
2995{ 3061{
2996 selection_time = tm; 3062 selection_time = tm;
2997 3063
2998 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3064 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
2999 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3065 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3000 { 3066 {
3001 display->set_selection_owner (this); 3067 display->set_selection_owner (this);
3002 return true; 3068 return true;
3003 } 3069 }
3004 else 3070 else
3071 {
3072 selection_clear ();
3005 return false; 3073 return false;
3074 }
3006 3075
3007#if 0 3076#if 0
3008 XTextProperty ct; 3077 XTextProperty ct;
3009 3078
3010 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3079 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3011 { 3080 {
3012 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3081 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3013 XFree (ct.value); 3082 XFree (ct.value);
3014 } 3083 }
3015#endif 3084#endif
… …
3019/* 3088/*
3020 * Mark or select text based upon number of clicks: 1, 2, or 3 3089 * Mark or select text based upon number of clicks: 1, 2, or 3
3021 * EXT: button 1 press 3090 * EXT: button 1 press
3022 */ 3091 */
3023void 3092void
3024rxvt_term::selection_click (int clicks, int x, int y) 3093rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3025{ 3094{
3026 clicks = ((clicks - 1) % 3) + 1; 3095 clicks = ((clicks - 1) % 3) + 1;
3027 selection.clicks = clicks; /* save clicks so extend will work */ 3096 selection.clicks = clicks; /* save clicks so extend will work */
3028 3097
3098 if (clicks == 2 && !selection.rect
3099 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3100 {
3101 MEvent.clicks = 1; // what a mess
3102 selection.screen = current_screen;
3103 selection.op = SELECTION_CONT;
3104 return;
3105 }
3106
3029 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3107 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3030 3108
3031 if (clicks == 2 || clicks == 3) 3109 if (clicks == 2 || clicks == 3)
3032 selection_extend_colrow (selection.mark.col, 3110 selection_extend_colrow (selection.mark.col,
3033 selection.mark.row + view_start, 3111 selection.mark.row - view_start,
3034 0, /* button 3 */ 3112 0, /* button 3 */
3035 1, /* button press */ 3113 1, /* button press */
3036 0); /* click change */ 3114 0); /* click change */
3037} 3115}
3038 3116
3039/* ------------------------------------------------------------------------- */ 3117/* ------------------------------------------------------------------------- */
3040/* 3118/*
3041 * Mark a selection at the specified col/row 3119 * Mark a selection at the specified col/row
3042 */ 3120 */
3043void 3121void
3044rxvt_term::selection_start_colrow (int col, int row) 3122rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3045{ 3123{
3046 want_refresh = 1; 3124 want_refresh = 1;
3047 3125
3048 selection.mark.row = row - view_start; 3126 selection.mark.row = row + view_start;
3049 selection.mark.col = col; 3127 selection.mark.col = col;
3050 3128
3051 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3129 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3052 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3130 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3053 3131
3054 while (selection.mark.col > 0 3132 while (selection.mark.col > 0
3055 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3133 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3056 --selection.mark.col; 3134 --selection.mark.col;
3057 3135
3058 if (selection.op) 3136 if (selection.op)
3137 {
3059 { /* clear the old selection */ 3138 /* clear the old selection */
3060 selection.beg.row = selection.end.row = selection.mark.row; 3139 selection.beg.row = selection.end.row = selection.mark.row;
3061 selection.beg.col = selection.end.col = selection.mark.col; 3140 selection.beg.col = selection.end.col = selection.mark.col;
3062 } 3141 }
3063 3142
3064 selection.op = SELECTION_INIT; 3143 selection.op = SELECTION_INIT;
… …
3075#define DELIMIT_TEXT(x) \ 3154#define DELIMIT_TEXT(x) \
3076 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3155 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3077#define DELIMIT_REND(x) 1 3156#define DELIMIT_REND(x) 1
3078 3157
3079void 3158void
3080rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3159rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3081{ 3160{
3082 int col, row, dirnadd, tcol, trow, w1, w2; 3161 int col, row, dirnadd, tcol, trow, w1, w2;
3083 row_col_t bound; 3162 row_col_t bound;
3084 text_t *stp; 3163 text_t *stp;
3085 rend_t *srp; 3164 rend_t *srp;
3086 3165
3087 if (dirn == UP) 3166 if (dirn == UP)
3088 { 3167 {
3089 bound.row = - nsaved - 1; 3168 bound.row = top_row - 1;
3090 bound.col = 0; 3169 bound.col = 0;
3091 dirnadd = -1; 3170 dirnadd = -1;
3092 } 3171 }
3093 else 3172 else
3094 { 3173 {
… …
3159 * flag == 0 ==> button 1 3238 * flag == 0 ==> button 1
3160 * flag == 1 ==> button 3 press 3239 * flag == 1 ==> button 3 press
3161 * flag == 2 ==> button 3 motion 3240 * flag == 2 ==> button 3 motion
3162 */ 3241 */
3163void 3242void
3164rxvt_term::selection_extend (int x, int y, int flag) 3243rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3165{ 3244{
3166 int col = clamp (Pixel2Col (x), 0, ncol); 3245 int col = clamp (Pixel2Col (x), 0, ncol);
3167 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3246 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3168 3247
3169 /* 3248 /*
… …
3172 * select nothing. Otherwise, if we're to the right of the mark, you have to 3251 * 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. 3252 * be _past_ a character for it to be selected.
3174 */ 3253 */
3175 if (((selection.clicks % 3) == 1) && !flag 3254 if (((selection.clicks % 3) == 1) && !flag
3176 && (col == selection.mark.col 3255 && (col == selection.mark.col
3177 && (row == selection.mark.row + view_start))) 3256 && (row == selection.mark.row - view_start)))
3178 { 3257 {
3179 /* select nothing */ 3258 /* select nothing */
3180 selection.beg.row = selection.end.row = 0; 3259 selection.beg.row = selection.end.row = 0;
3181 selection.beg.col = selection.end.col = 0; 3260 selection.beg.col = selection.end.col = 0;
3182 selection.clicks = 4; 3261 selection.clicks = 4;
… …
3195/* ------------------------------------------------------------------------- */ 3274/* ------------------------------------------------------------------------- */
3196/* 3275/*
3197 * Extend the selection to the specified col/row 3276 * Extend the selection to the specified col/row
3198 */ 3277 */
3199void 3278void
3200rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3279rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3201{ 3280{
3202 row_col_t pos; 3281 row_col_t pos;
3203 enum { 3282 enum {
3204 LEFT, RIGHT 3283 LEFT, RIGHT
3205 } closeto = RIGHT; 3284 } closeto = RIGHT;
… …
3237 selection.beg.col = selection.end.col = selection.mark.col; 3316 selection.beg.col = selection.end.col = selection.mark.col;
3238 selection.beg.row = selection.end.row = selection.mark.row; 3317 selection.beg.row = selection.end.row = selection.mark.row;
3239 } 3318 }
3240 3319
3241 pos.col = col; 3320 pos.col = col;
3242 pos.row = row - view_start; 3321 pos.row = view_start + row;
3243 3322
3244 /* 3323 /*
3245 * This is mainly xterm style selection with a couple of differences, mainly 3324 * This is mainly xterm style selection with a couple of differences, mainly
3246 * in the way button3 drag extension works. 3325 * in the way button3 drag extension works.
3247 * We're either doing: button1 drag; button3 press; or button3 drag 3326 * 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 3332 * 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 3333 * and it was decided by whichever point/word/line was `fixed' at the
3255 * time of the most recent button3 press 3334 * time of the most recent button3 press
3256 */ 3335 */
3257 if (button3 && buttonpress) 3336 if (button3 && buttonpress)
3337 {
3258 { /* button3 press */ 3338 /* button3 press */
3259 /* 3339 /*
3260 * first determine which edge of the selection we are closest to 3340 * first determine which edge of the selection we are closest to
3261 */ 3341 */
3262 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3342 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3263 || (!ROWCOL_IS_AFTER (pos, selection.end) 3343 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3281 selection.mark.row = selection.beg.row; 3361 selection.mark.row = selection.beg.row;
3282 selection.mark.col = selection.beg.col; 3362 selection.mark.col = selection.beg.col;
3283 } 3363 }
3284 } 3364 }
3285 else 3365 else
3366 {
3286 { /* button1 drag or button3 drag */ 3367 /* button1 drag or button3 drag */
3287 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3368 if (ROWCOL_IS_AFTER (selection.mark, pos))
3288 { 3369 {
3289 if (selection.mark.row == selection.end.row 3370 if (selection.mark.row == selection.end.row
3290 && selection.mark.col == selection.end.col 3371 && selection.mark.col == selection.end.col
3291 && clickchange 3372 && clickchange
… …
3308 3389
3309 if (selection.clicks == 1) 3390 if (selection.clicks == 1)
3310 { 3391 {
3311 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3392 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3312 && !ROW(selection.beg.row).is_longer () 3393 && !ROW(selection.beg.row).is_longer ()
3313#if ENABLE_FRILLS 3394#if !ENABLE_MINIMAL
3314 && !selection.rect 3395 && !selection.rect
3315#endif 3396#endif
3316 ) 3397 )
3317 selection.beg.col = ncol; 3398 selection.beg.col = ncol;
3318 3399
3319 if ( 3400 if (
3320 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3401 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3321 && !ROW(selection.end.row).is_longer () 3402 && !ROW(selection.end.row).is_longer ()
3322#if ENABLE_FRILLS 3403#if !ENABLE_MINIMAL
3323 && !selection.rect 3404 && !selection.rect
3324#endif 3405#endif
3325 ) 3406 )
3326 selection.end.col = ncol; 3407 selection.end.col = ncol;
3327 } 3408 }
3328 else if (selection.clicks == 2) 3409 else if (selection.clicks == 2)
3329 { 3410 {
3330 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3411 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3331 selection.end.col--; 3412 selection.end.col--;
3332 3413
3333 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3334 {
3335 selection_delimit_word (UP, &selection.beg, &selection.beg); 3414 selection_delimit_word (UP, &selection.beg, &selection.beg);
3336 selection_delimit_word (DN, &selection.end, &selection.end); 3415 selection_delimit_word (DN, &selection.end, &selection.end);
3337 }
3338 } 3416 }
3339 else if (selection.clicks == 3) 3417 else if (selection.clicks == 3)
3340 { 3418 {
3341#if ENABLE_FRILLS 3419#if ENABLE_FRILLS
3342 if (OPTION (Opt_tripleclickwords)) 3420 if (option (Opt_tripleclickwords))
3343 { 3421 {
3344 selection_delimit_word (UP, &selection.beg, &selection.beg); 3422 selection_delimit_word (UP, &selection.beg, &selection.beg);
3345 3423
3346 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3424 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3347 { 3425 {
3348 if (!ROW(end_row).is_longer ()) 3426 if (!ROW(end_row).is_longer ())
3349 { 3427 {
3350 selection.end.row = end_row; 3428 selection.end.row = end_row;
3351 selection.end.col = ROW(end_row).l; 3429 selection.end.col = ROW(end_row).l;
3430# if !ENABLE_MINIMAL
3352 selection_remove_trailing_spaces (); 3431 selection_remove_trailing_spaces ();
3432# endif
3353 break; 3433 break;
3354 } 3434 }
3355 } 3435 }
3356 } 3436 }
3357 else 3437 else
… …
3373 selection.end.row++; 3453 selection.end.row++;
3374 } 3454 }
3375 } 3455 }
3376 3456
3377 if (button3 && buttonpress) 3457 if (button3 && buttonpress)
3458 {
3378 { /* mark may need to be changed */ 3459 /* mark may need to be changed */
3379 if (closeto == LEFT) 3460 if (closeto == LEFT)
3380 { 3461 {
3381 selection.mark.row = selection.end.row; 3462 selection.mark.row = selection.end.row;
3382 selection.mark.col = selection.end.col - (selection.clicks == 2); 3463 selection.mark.col = selection.end.col - (selection.clicks == 2);
3383 } 3464 }
… …
3386 selection.mark.row = selection.beg.row; 3467 selection.mark.row = selection.beg.row;
3387 selection.mark.col = selection.beg.col; 3468 selection.mark.col = selection.beg.col;
3388 } 3469 }
3389 } 3470 }
3390 3471
3391#if ENABLE_FRILLS 3472#if !ENABLE_MINIMAL
3392 if (selection.rect && selection.beg.col > selection.end.col) 3473 if (selection.rect && selection.beg.col > selection.end.col)
3393 ::swap (selection.beg.col, selection.end.col); 3474 ::swap (selection.beg.col, selection.end.col);
3394#endif 3475#endif
3395} 3476}
3396 3477
3397#if ENABLE_FRILLS 3478#if !ENABLE_MINIMAL
3398void 3479void
3399rxvt_term::selection_remove_trailing_spaces () 3480rxvt_term::selection_remove_trailing_spaces () NOTHROW
3400{ 3481{
3401 int32_t end_col, end_row; 3482 int32_t end_col, end_row;
3402 text_t *stp; 3483 text_t *stp;
3403 3484
3404 end_col = selection.end.col; 3485 end_col = selection.end.col;
… …
3442/* 3523/*
3443 * Double click on button 3 when already selected 3524 * Double click on button 3 when already selected
3444 * EXT: button 3 double click 3525 * EXT: button 3 double click
3445 */ 3526 */
3446void 3527void
3447rxvt_term::selection_rotate (int x, int y) 3528rxvt_term::selection_rotate (int x, int y) NOTHROW
3448{ 3529{
3449 selection.clicks = selection.clicks % 3 + 1; 3530 selection.clicks = selection.clicks % 3 + 1;
3450 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3531 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3451} 3532}
3452 3533
… …
3454/* 3535/*
3455 * Respond to a request for our current selection 3536 * Respond to a request for our current selection
3456 * EXT: SelectionRequest 3537 * EXT: SelectionRequest
3457 */ 3538 */
3458void 3539void
3459rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3540rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3460{ 3541{
3461 XSelectionEvent ev; 3542 XSelectionEvent ev;
3462 dDisp;
3463 3543
3464 ev.type = SelectionNotify; 3544 ev.type = SelectionNotify;
3465 ev.property = None; 3545 ev.property = None;
3466 ev.display = rq.display; 3546 ev.display = rq.display;
3467 ev.requestor = rq.requestor; 3547 ev.requestor = rq.requestor;
… …
3481 *target++ = xa[XA_COMPOUND_TEXT]; 3561 *target++ = xa[XA_COMPOUND_TEXT];
3482#if X_HAVE_UTF8_STRING 3562#if X_HAVE_UTF8_STRING
3483 *target++ = xa[XA_UTF8_STRING]; 3563 *target++ = xa[XA_UTF8_STRING];
3484#endif 3564#endif
3485 3565
3486 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3566 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3487 32, PropModeReplace, 3567 32, PropModeReplace,
3488 (unsigned char *)target_list, target - target_list); 3568 (unsigned char *)target_list, target - target_list);
3489 ev.property = rq.property; 3569 ev.property = rq.property;
3490 } 3570 }
3491#if TODO // TODO 3571#if TODO // TODO
… …
3494 /* TODO: Handle MULTIPLE */ 3574 /* TODO: Handle MULTIPLE */
3495 } 3575 }
3496#endif 3576#endif
3497 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3577 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3498 { 3578 {
3499 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3579 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3500 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3580 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3501 ev.property = rq.property; 3581 ev.property = rq.property;
3502 } 3582 }
3503 else if (rq.target == XA_STRING 3583 else if (rq.target == XA_STRING
3504 || rq.target == xa[XA_TEXT] 3584 || rq.target == xa[XA_TEXT]
… …
3528 style = enc_string; 3608 style = enc_string;
3529 else if (target == xa[XA_TEXT]) 3609 else if (target == xa[XA_TEXT])
3530 style = enc_text; 3610 style = enc_text;
3531 else if (target == xa[XA_COMPOUND_TEXT]) 3611 else if (target == xa[XA_COMPOUND_TEXT])
3532 style = enc_compound_text; 3612 style = enc_compound_text;
3533#if ENABLE_FRILLS 3613#if !ENABLE_MINIMAL
3534 else if (target == xa[XA_UTF8_STRING]) 3614 else if (target == xa[XA_UTF8_STRING])
3535 style = enc_utf8; 3615 style = enc_utf8;
3536#endif 3616#endif
3537 else 3617 else
3538 { 3618 {
… …
3549 { 3629 {
3550 cl = L""; 3630 cl = L"";
3551 selectlen = 0; 3631 selectlen = 0;
3552 } 3632 }
3553 3633
3554#if ENABLE_FRILLS 3634#if !ENABLE_MINIMAL
3555 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3635 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3556 // so recode it manually 3636 // so recode it manually
3557 if (style == enc_utf8) 3637 if (style == enc_utf8)
3558 { 3638 {
3559 freect = 1; 3639 freect = 1;
… …
3562 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3642 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3563 ct.nitems = strlen ((char *)ct.value); 3643 ct.nitems = strlen ((char *)ct.value);
3564 } 3644 }
3565 else 3645 else
3566#endif 3646#endif
3567 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3647 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3568 freect = 1; 3648 freect = 1;
3569 else 3649 else
3570 { 3650 {
3571 /* if we failed to convert then send it raw */ 3651 /* if we failed to convert then send it raw */
3572 ct.value = (unsigned char *)cl; 3652 ct.value = (unsigned char *)cl;
3573 ct.nitems = selectlen; 3653 ct.nitems = selectlen;
3574 ct.encoding = target; 3654 ct.encoding = target;
3575 } 3655 }
3576 3656
3577 XChangeProperty (disp, rq.requestor, rq.property, 3657 XChangeProperty (dpy, rq.requestor, rq.property,
3578 ct.encoding, 8, PropModeReplace, 3658 ct.encoding, 8, PropModeReplace,
3579 ct.value, (int)ct.nitems); 3659 ct.value, (int)ct.nitems);
3580 ev.property = rq.property; 3660 ev.property = rq.property;
3581 3661
3582 if (freect) 3662 if (freect)
3583 XFree (ct.value); 3663 XFree (ct.value);
3584 } 3664 }
3585 3665
3586 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3666 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} 3667}
3604 3668
3605/* ------------------------------------------------------------------------- */ 3669/* ------------------------------------------------------------------------- */
3606#ifdef USE_XIM 3670#ifdef USE_XIM
3607void 3671void
3608rxvt_term::im_set_position (XPoint &pos) 3672rxvt_term::im_set_position (XPoint &pos) NOTHROW
3609{ 3673{
3610 XWindowAttributes xwa; 3674 XWindowAttributes xwa;
3611 3675
3612 XGetWindowAttributes (display->display, vt, &xwa); 3676 XGetWindowAttributes (dpy, vt, &xwa);
3613 3677
3614 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3678 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3615 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3679 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3616} 3680}
3617#endif 3681#endif
3618 3682
3619#if ENABLE_OVERLAY 3683#if ENABLE_OVERLAY
3620void 3684void
3621rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3685rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3622{ 3686{
3623 if (nrow < 1 || ncol < 1) 3687 if (nrow < 1 || ncol < 1)
3624 return; 3688 return;
3625 3689
3626 want_refresh = 1; 3690 want_refresh = 1;
… …
3671 *rp = r; 3735 *rp = r;
3672 } 3736 }
3673} 3737}
3674 3738
3675void 3739void
3676rxvt_term::scr_overlay_off () 3740rxvt_term::scr_overlay_off () NOTHROW
3677{ 3741{
3678 if (!ov_text) 3742 if (!ov_text)
3679 return; 3743 return;
3680 3744
3681 want_refresh = 1; 3745 want_refresh = 1;
… …
3689 delete [] ov_text; ov_text = 0; 3753 delete [] ov_text; ov_text = 0;
3690 delete [] ov_rend; ov_rend = 0; 3754 delete [] ov_rend; ov_rend = 0;
3691} 3755}
3692 3756
3693void 3757void
3694rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3758rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3695{ 3759{
3696 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3760 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3697 return; 3761 return;
3698 3762
3699 x++, y++; 3763 x++, y++;
… …
3701 ov_text[y][x] = text; 3765 ov_text[y][x] = text;
3702 ov_rend[y][x] = rend; 3766 ov_rend[y][x] = rend;
3703} 3767}
3704 3768
3705void 3769void
3706rxvt_term::scr_overlay_set (int x, int y, const char *s) 3770rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3707{ 3771{
3708 while (*s) 3772 while (*s)
3709 scr_overlay_set (x++, y, *s++); 3773 scr_overlay_set (x++, y, *s++);
3710} 3774}
3711 3775
3712void 3776void
3713rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3777rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3714{ 3778{
3715 while (*s) 3779 while (*s)
3716 { 3780 {
3717 text_t t = *s++; 3781 text_t t = *s++;
3718 int width = wcwidth (t); 3782 int width = WCWIDTH (t);
3719 3783
3720 while (width--) 3784 while (width--)
3721 { 3785 {
3722 scr_overlay_set (x++, y, t); 3786 scr_overlay_set (x++, y, t);
3723 t = NOCHAR; 3787 t = NOCHAR;
3724 } 3788 }
3725 } 3789 }
3726} 3790}
3727 3791
3728void 3792void
3729rxvt_term::scr_swap_overlay () 3793rxvt_term::scr_swap_overlay () NOTHROW
3730{ 3794{
3731 if (!ov_text) 3795 if (!ov_text)
3732 return; 3796 return;
3733 3797
3734 // swap screen mem with overlay 3798 // swap screen mem with overlay
3735 for (int y = ov_h; y--; ) 3799 for (int y = ov_h; y--; )
3736 { 3800 {
3737 text_t *t1 = ov_text[y]; 3801 text_t *t1 = ov_text[y];
3738 rend_t *r1 = ov_rend[y]; 3802 rend_t *r1 = ov_rend[y];
3739 3803
3740 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3804 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; 3805 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3742 3806
3743 for (int x = ov_w; x--; ) 3807 for (int x = ov_w; x--; )
3744 { 3808 {
3745 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3809 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3746 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3810 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