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