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.220 by root, Mon Jan 9 23:18:49 2006 UTC vs.
Revision 1.311 by root, Wed Oct 15 14:48:22 2008 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines