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.233 by root, Mon Jan 16 06:37:52 2006 UTC vs.
Revision 1.307 by root, Fri Jun 27 00:44:32 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) const 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) const 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 top_row--; 170 top_row--;
… …
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 top_row = 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 + top_row , 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 (top_row) 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;
… …
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 top_row = q - term_start; 352 top_row = q - term_start;
368 353
369 // make sure all terminal lines exist 354 // make sure all terminal lines exist
370 while (top_row > 0) 355 while (top_row > 0)
371 scr_blank_screen_mem (ROW (--top_row), 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 = top_row; 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 (!IN_RANGE_INC (color, minCOLOR, 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)
… …
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 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 611 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
619 { 612 {
620 top_row = max (top_row - count, -saveLines); 613 top_row = max (top_row - count, -saveLines);
621 614
622 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
623
624 // scroll everything up 'count' lines 615 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 616 term_start = (term_start + count) % total_rows;
626 617
618 // sever bottommost line
627 { 619 {
628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count); 620 line_t &l = ROW(row2 - count);
621 l.is_longer (0);
630 l.touch (); 622 l.touch ();
631 l.is_longer (0);
632 } 623 }
633 624
634 // erase newly scorlled-in lines 625 // erase newly scrolled-in lines
635 for (int i = count; i; --i ) 626 for (int i = count; i--; )
636 { 627 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i); 628 line_t &l = ROW(nrow - 1 - i);
640 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 {
641 scr_blank_line (l, 0, l.l, rstyle); 634 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0; 635 l.l = 0;
644 l.f = 0; 636 l.f = 0;
637 }
638 else
639 scr_blank_screen_mem (l, rstyle);
645 } 640 }
646 641
647 // now copy lines below the scroll region bottom to the 642 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 643 // bottom of the screen again, so they look as if they
649 // hadn't moved. 644 // hadn't moved.
… …
653 line_t &l2 = ROW(i); 648 line_t &l2 = ROW(i);
654 649
655 ::swap (l1, l2); 650 ::swap (l1, l2);
656 l2.touch (); 651 l2.touch ();
657 } 652 }
658 653
659 // move and/or clear selection, if any 654 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 655 if (selection.op && current_screen == selection.screen)
661 { 656 {
662 selection.beg.row -= count; 657 selection.beg.row -= count;
663 selection.end.row -= count; 658 selection.end.row -= count;
… …
671 selection.op = SELECTION_CLEAR; 666 selection.op = SELECTION_CLEAR;
672 } 667 }
673 } 668 }
674 669
675 // finally move the view window, if desired 670 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 671 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 672 && view_start != 0
678 && view_start != -saveLines) 673 && view_start != -saveLines)
679 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));
680 } 678 }
681 else 679 else
682 { 680 {
683 if (selection.op && current_screen == selection.screen) 681 if (selection.op && current_screen == selection.screen)
684 { 682 {
… …
696 { 694 {
697 /* move selected region too */ 695 /* move selected region too */
698 selection.beg.row -= count; 696 selection.beg.row -= count;
699 selection.end.row -= count; 697 selection.end.row -= count;
700 selection.mark.row -= count; 698 selection.mark.row -= count;
701 699
702 selection_check (0); 700 selection_check (0);
703 } 701 }
704 } 702 }
705 703
706 // use a simple and robust scrolling algorithm, this 704 // use a simple and robust scrolling algorithm, this
… …
730/* ------------------------------------------------------------------------- */ 728/* ------------------------------------------------------------------------- */
731/* 729/*
732 * Add text given in <str> of length <len> to screen struct 730 * Add text given in <str> of length <len> to screen struct
733 */ 731 */
734void 732void
735rxvt_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
736{ 734{
737 if (len <= 0) /* sanity */ 735 if (len <= 0) /* sanity */
738 return; 736 return;
739 737
740 unsigned char checksel; 738 unsigned char checksel;
… …
746 ZERO_SCROLLBACK (); 744 ZERO_SCROLLBACK ();
747 745
748 if (minlines > 0) 746 if (minlines > 0)
749 { 747 {
750 minlines += screen.cur.row - screen.bscroll; 748 minlines += screen.cur.row - screen.bscroll;
749 min_it (minlines, screen.cur.row - top_row);
751 750
752 if (minlines > 0 751 if (minlines > 0
753 && screen.tscroll == 0 752 && screen.tscroll == 0
754 && screen.bscroll == nrow - 1) 753 && screen.bscroll == nrow - 1)
755 { 754 {
… …
816 CLEAR_SELECTION (); 815 CLEAR_SELECTION ();
817 } 816 }
818 817
819 if (screen.flags & Screen_WrapNext) 818 if (screen.flags & Screen_WrapNext)
820 { 819 {
820 scr_do_wrap ();
821
821 max_it (line->l, ncol); 822 line->l = ncol;
822 line->is_longer (1); 823 line->is_longer (1);
823 824
824 scr_do_wrap ();
825
826 row = screen.cur.row; 825 row = screen.cur.row;
827 line = &ROW(row); /* _must_ refresh */ 826 line = &ROW(row); /* _must_ refresh */
828 } 827 }
829 828
830 // some utf-8 decoders "decode" surrogate characters: let's fix this. 829 // some utf-8 decoders "decode" surrogate characters: let's fix this.
831 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 830 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
832 c = 0xfffd; 831 c = 0xfffd;
833 832
834 // rely on wcwidth to tell us the character width, at least for non-latin1 833 // rely on wcwidth to tell us the character width, do wcwidth before
835 // do wcwidth before further replacements, as wcwidth might return -1 834 // further replacements, as wcwidth might return -1 for the line
836 // for the line drawing characters below as they might be invalid in the current 835 // drawing characters below as they might be invalid in the current
837 // locale. 836 // locale.
838 int width = c < 0x100 ? 1 : wcwidth (c); 837 int width = WCWIDTH (c);
839 838
840 if (charsets [screen.charset] == '0') // DEC SPECIAL 839 if (charsets [screen.charset] == '0') // DEC SPECIAL
841 { 840 {
842 // vt100 special graphics and line drawing 841 // vt100 special graphics and line drawing
843 // 5f-7e standard vt100 842 // 5f-7e standard vt100
… …
994/* 993/*
995 * Process Backspace. Move back the cursor back a position, wrap if have to 994 * Process Backspace. Move back the cursor back a position, wrap if have to
996 * XTERM_SEQ: CTRL-H 995 * XTERM_SEQ: CTRL-H
997 */ 996 */
998void 997void
999rxvt_term::scr_backspace () 998rxvt_term::scr_backspace () NOTHROW
1000{ 999{
1001 want_refresh = 1;
1002
1003 if (screen.cur.col == 0) 1000 if (screen.cur.col == 0)
1004 { 1001 {
1005 if (screen.cur.row > 0) 1002 if (screen.cur.row > 0)
1006 { 1003 {
1007#ifdef TERMCAP_HAS_BW 1004#ifdef TERMCAP_HAS_BW
1008 screen.cur.col = ncol - 1; 1005 screen.cur.col = ncol - 1;
1009 screen.cur.row--; 1006 --screen.cur.row;
1010 return; 1007
1008 want_refresh = 1;
1011#endif 1009#endif
1012 } 1010 }
1013 } 1011 }
1014 else if (!(screen.flags & Screen_WrapNext)) 1012 else
1015 scr_gotorc (0, -1, RELATIVE); 1013 scr_gotorc (0, -1, RELATIVE);
1016
1017 screen.flags &= ~Screen_WrapNext;
1018} 1014}
1019 1015
1020/* ------------------------------------------------------------------------- */ 1016/* ------------------------------------------------------------------------- */
1021/* 1017/*
1022 * Process Horizontal Tab 1018 * Process Horizontal Tab
1023 * count: +ve = forward; -ve = backwards 1019 * count: +ve = forward; -ve = backwards
1024 * XTERM_SEQ: CTRL-I 1020 * XTERM_SEQ: CTRL-I
1025 */ 1021 */
1026void 1022void
1027rxvt_term::scr_tab (int count, bool ht) 1023rxvt_term::scr_tab (int count, bool ht) NOTHROW
1028{ 1024{
1029 int i, x; 1025 int i, x;
1030 1026
1031 want_refresh = 1; 1027 want_refresh = 1;
1032 i = x = screen.cur.col; 1028 i = x = screen.cur.col;
… …
1045 x = i; 1041 x = i;
1046 1042
1047 if (!--count) 1043 if (!--count)
1048 break; 1044 break;
1049 } 1045 }
1050 else 1046 else
1051 ht &= l.t[i] == ' ' 1047 ht &= l.t[i] == ' '
1052 && RS_SAME (l.r[i], base_rend); 1048 && RS_SAME (l.r[i], base_rend);
1053 1049
1054 if (count) 1050 if (count)
1055 x = ncol - 1; 1051 x = ncol - 1;
1056 1052
1057 // store horizontal tab commands as characters inside the text 1053 // store horizontal tab commands as characters inside the text
1058 // buffer so they can be selected and pasted. 1054 // buffer so they can be selected and pasted.
1059 if (ht && OPTION (Opt_pastableTabs)) 1055 if (ht && option (Opt_pastableTabs))
1060 { 1056 {
1061 base_rend = SET_FONT (base_rend, 0); 1057 base_rend = SET_FONT (base_rend, 0);
1062 1058
1063 l.touch (x); 1059 l.touch (x);
1064 1060
… …
1097 * Process DEC Back Index 1093 * Process DEC Back Index
1098 * XTERM_SEQ: ESC 6 1094 * XTERM_SEQ: ESC 6
1099 * Move cursor left in row. If we're at the left boundary, shift everything 1095 * Move cursor left in row. If we're at the left boundary, shift everything
1100 * in that row right. Clear left column. 1096 * in that row right. Clear left column.
1101 */ 1097 */
1102#if ENABLE_FRILLS 1098#if !ENABLE_MINIMAL
1103void 1099void
1104rxvt_term::scr_backindex () 1100rxvt_term::scr_backindex () NOTHROW
1105{ 1101{
1106 if (screen.cur.col > 0) 1102 if (screen.cur.col > 0)
1107 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1103 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1108 else 1104 else
1109 scr_insdel_chars (1, INSERT); 1105 scr_insdel_chars (1, INSERT);
… …
1114 * Process DEC Forward Index 1110 * Process DEC Forward Index
1115 * XTERM_SEQ: ESC 9 1111 * XTERM_SEQ: ESC 9
1116 * Move cursor right in row. If we're at the right boundary, shift everything 1112 * Move cursor right in row. If we're at the right boundary, shift everything
1117 * in that row left. Clear right column. 1113 * in that row left. Clear right column.
1118 */ 1114 */
1119#if ENABLE_FRILLS 1115#if !ENABLE_MINIMAL
1120void 1116void
1121rxvt_term::scr_forwardindex () 1117rxvt_term::scr_forwardindex () NOTHROW
1122{ 1118{
1123 if (screen.cur.col < ncol - 1) 1119 if (screen.cur.col < ncol - 1)
1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1120 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1125 else 1121 else
1126 { 1122 {
… …
1139/* ------------------------------------------------------------------------- */ 1135/* ------------------------------------------------------------------------- */
1140/* 1136/*
1141 * Goto Row/Column 1137 * Goto Row/Column
1142 */ 1138 */
1143void 1139void
1144rxvt_term::scr_gotorc (int row, int col, int relative) 1140rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1145{ 1141{
1146 want_refresh = 1; 1142 want_refresh = 1;
1147 ZERO_SCROLLBACK (); 1143 ZERO_SCROLLBACK ();
1148 1144
1149 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1145 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1171 } 1167 }
1172 } 1168 }
1173 else 1169 else
1174 { 1170 {
1175 if (screen.flags & Screen_Relative) 1171 if (screen.flags & Screen_Relative)
1172 {
1176 { /* relative origin mode */ 1173 /* relative origin mode */
1177 screen.cur.row = row + screen.tscroll; 1174 screen.cur.row = row + screen.tscroll;
1178 min_it (screen.cur.row, screen.bscroll); 1175 min_it (screen.cur.row, screen.bscroll);
1179 } 1176 }
1180 else 1177 else
1181 screen.cur.row = row; 1178 screen.cur.row = row;
… …
1187/* ------------------------------------------------------------------------- */ 1184/* ------------------------------------------------------------------------- */
1188/* 1185/*
1189 * direction should be UP or DN 1186 * direction should be UP or DN
1190 */ 1187 */
1191void 1188void
1192rxvt_term::scr_index (enum page_dirn direction) 1189rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1193{ 1190{
1194 int dirn; 1191 int dirn;
1195 1192
1196 want_refresh = 1; 1193 want_refresh = 1;
1197 ZERO_SCROLLBACK (); 1194 ZERO_SCROLLBACK ();
… …
1214/* 1211/*
1215 * Erase part or whole of a line 1212 * Erase part or whole of a line
1216 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1213 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1217 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1214 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1218 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1215 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1216 * extension: clear to right unless wrapped: ESC [ 3 K
1219 */ 1217 */
1220void 1218void
1221rxvt_term::scr_erase_line (int mode) 1219rxvt_term::scr_erase_line (int mode) NOTHROW
1222{ 1220{
1223 unsigned int col, num; 1221 unsigned int col, num;
1224 1222
1225 want_refresh = 1; 1223 want_refresh = 1;
1226 ZERO_SCROLLBACK (); 1224 ZERO_SCROLLBACK ();
… …
1232 line.touch (); 1230 line.touch ();
1233 line.is_longer (0); 1231 line.is_longer (0);
1234 1232
1235 switch (mode) 1233 switch (mode)
1236 { 1234 {
1235 case 3:
1236 if (screen.flags & Screen_WrapNext)
1237 return;
1238
1239 /* fall through */
1240
1237 case 0: /* erase to end of line */ 1241 case 0: /* erase to end of line */
1238 col = screen.cur.col; 1242 col = screen.cur.col;
1239 num = ncol - col; 1243 num = ncol - col;
1240 min_it (line.l, col); 1244 min_it (line.l, col);
1245
1241 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1246 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1242 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1247 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1243 CLEAR_SELECTION (); 1248 CLEAR_SELECTION ();
1244 break; 1249 break;
1250
1245 case 1: /* erase to beginning of line */ 1251 case 1: /* erase to beginning of line */
1246 col = 0; 1252 col = 0;
1247 num = screen.cur.col + 1; 1253 num = screen.cur.col + 1;
1254
1248 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1255 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1249 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1256 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1250 CLEAR_SELECTION (); 1257 CLEAR_SELECTION ();
1251 break; 1258 break;
1259
1252 case 2: /* erase whole line */ 1260 case 2: /* erase whole line */
1253 col = 0; 1261 col = 0;
1254 num = ncol; 1262 num = ncol;
1255 line.l = 0; 1263 line.l = 0;
1256 if (selection.beg.row <= screen.cur.row 1264 if (selection.beg.row <= screen.cur.row
… …
1270 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1278 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1271 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1279 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1272 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1280 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1273 */ 1281 */
1274void 1282void
1275rxvt_term::scr_erase_screen (int mode) 1283rxvt_term::scr_erase_screen (int mode) NOTHROW
1276{ 1284{
1277 int num; 1285 int num;
1278 int32_t row; 1286 int32_t row;
1279 rend_t ren; 1287 rend_t ren;
1280 XGCValues gcvalue; 1288 XGCValues gcvalue;
… …
1314 if (row >= nrow) /* Out Of Bounds */ 1322 if (row >= nrow) /* Out Of Bounds */
1315 return; 1323 return;
1316 1324
1317 min_it (num, nrow - row); 1325 min_it (num, nrow - row);
1318 1326
1327 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1319 if (rstyle & (RS_RVid | RS_Uline)) 1328 if (rstyle & (RS_RVid | RS_Uline))
1320 ren = (rend_t) ~RS_None; 1329 ren = (rend_t) ~RS_None;
1321 else if (GET_BASEBG (rstyle) == Color_bg) 1330 else if (GET_BASEBG (rstyle) == Color_bg)
1322 { 1331 {
1323 ren = DEFAULT_RSTYLE; 1332 ren = DEFAULT_RSTYLE;
1324 CLEAR_ROWS (row, num); 1333
1334 if (mapped)
1335 XClearArea (dpy, vt, 0,
1336 Row2Pixel (row), (unsigned int)width,
1337 (unsigned int)Height2Pixel (num), False);
1325 } 1338 }
1326 else 1339 else
1327 { 1340 {
1328 ren = rstyle & (RS_fgMask | RS_bgMask); 1341 ren = rstyle & (RS_fgMask | RS_bgMask);
1342
1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1343 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1330 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1344 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1331 ERASE_ROWS (row, num); 1345 XFillRectangle (dpy, vt, gc,
1346 0, Row2Pixel (row),
1347 (unsigned int)width,
1348 (unsigned int)Height2Pixel (num));
1332 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1350 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 } 1351 }
1335 1352
1336 for (; num--; row++) 1353 for (; num--; row++)
1337 { 1354 {
1338 scr_blank_screen_mem (ROW(row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
1339 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1340 } 1357 }
1341} 1358}
1342 1359
1343#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
1344void 1361void
1345rxvt_term::scr_erase_savelines () 1362rxvt_term::scr_erase_savelines () NOTHROW
1346{ 1363{
1347 want_refresh = 1; 1364 want_refresh = 1;
1348 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
1349 1366
1350 top_row = 0; 1367 top_row = 0;
… …
1355/* 1372/*
1356 * Fill the screen with `E's 1373 * Fill the screen with `E's
1357 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1374 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1358 */ 1375 */
1359void 1376void
1360rxvt_term::scr_E () 1377rxvt_term::scr_E () NOTHROW
1361{ 1378{
1362 rend_t fs; 1379 rend_t fs;
1363 1380
1364 want_refresh = 1; 1381 want_refresh = 1;
1365 ZERO_SCROLLBACK (); 1382 ZERO_SCROLLBACK ();
… …
1386/* ------------------------------------------------------------------------- */ 1403/* ------------------------------------------------------------------------- */
1387/* 1404/*
1388 * Insert/Delete <count> lines 1405 * Insert/Delete <count> lines
1389 */ 1406 */
1390void 1407void
1391rxvt_term::scr_insdel_lines (int count, int insdel) 1408rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1392{ 1409{
1393 int end; 1410 int end;
1394 1411
1395 ZERO_SCROLLBACK (); 1412 ZERO_SCROLLBACK ();
1396 1413
… …
1416/* ------------------------------------------------------------------------- */ 1433/* ------------------------------------------------------------------------- */
1417/* 1434/*
1418 * Insert/Delete <count> characters from the current position 1435 * Insert/Delete <count> characters from the current position
1419 */ 1436 */
1420void 1437void
1421rxvt_term::scr_insdel_chars (int count, int insdel) 1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1422{ 1439{
1423 int col, row; 1440 int col, row;
1424 rend_t tr; 1441 rend_t tr;
1425 1442
1426 want_refresh = 1; 1443 want_refresh = 1;
… …
1457 { 1474 {
1458 if (selection.end.row != screen.cur.row 1475 if (selection.end.row != screen.cur.row
1459 || (selection.end.col + count >= ncol)) 1476 || (selection.end.col + count >= ncol))
1460 CLEAR_SELECTION (); 1477 CLEAR_SELECTION ();
1461 else 1478 else
1479 {
1462 { /* shift selection */ 1480 /* shift selection */
1463 selection.beg.col += count; 1481 selection.beg.col += count;
1464 selection.mark.col += count; /* XXX: yes? */ 1482 selection.mark.col += count; /* XXX: yes? */
1465 selection.end.col += count; 1483 selection.end.col += count;
1466 } 1484 }
1467 } 1485 }
… …
1514/* 1532/*
1515 * Set the scrolling region 1533 * Set the scrolling region
1516 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1534 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1517 */ 1535 */
1518void 1536void
1519rxvt_term::scr_scroll_region (int top, int bot) 1537rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1520{ 1538{
1521 max_it (top, 0); 1539 max_it (top, 0);
1522 min_it (bot, nrow - 1); 1540 min_it (bot, nrow - 1);
1523 1541
1524 if (top > bot) 1542 if (top > bot)
… …
1534 * Make the cursor visible/invisible 1552 * Make the cursor visible/invisible
1535 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1553 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1536 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1554 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1537 */ 1555 */
1538void 1556void
1539rxvt_term::scr_cursor_visible (int mode) 1557rxvt_term::scr_cursor_visible (int mode) NOTHROW
1540{ 1558{
1541 want_refresh = 1; 1559 want_refresh = 1;
1542 1560
1543 if (mode) 1561 if (mode)
1544 screen.flags |= Screen_VisibleCursor; 1562 screen.flags |= Screen_VisibleCursor;
… …
1551 * Set/unset automatic wrapping 1569 * Set/unset automatic wrapping
1552 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1570 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1553 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1571 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1554 */ 1572 */
1555void 1573void
1556rxvt_term::scr_autowrap (int mode) 1574rxvt_term::scr_autowrap (int mode) NOTHROW
1557{ 1575{
1558 if (mode) 1576 if (mode)
1559 screen.flags |= Screen_Autowrap; 1577 screen.flags |= Screen_Autowrap;
1560 else 1578 else
1561 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1579 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1570 * and the cursor cannot be moved outside. 1588 * and the cursor cannot be moved outside.
1571 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1589 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1572 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1590 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1573 */ 1591 */
1574void 1592void
1575rxvt_term::scr_relative_origin (int mode) 1593rxvt_term::scr_relative_origin (int mode) NOTHROW
1576{ 1594{
1577 if (mode) 1595 if (mode)
1578 screen.flags |= Screen_Relative; 1596 screen.flags |= Screen_Relative;
1579 else 1597 else
1580 screen.flags &= ~Screen_Relative; 1598 screen.flags &= ~Screen_Relative;
… …
1587 * Set insert/replace mode 1605 * Set insert/replace mode
1588 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1606 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1589 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1607 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1590 */ 1608 */
1591void 1609void
1592rxvt_term::scr_insert_mode (int mode) 1610rxvt_term::scr_insert_mode (int mode) NOTHROW
1593{ 1611{
1594 if (mode) 1612 if (mode)
1595 screen.flags |= Screen_Insert; 1613 screen.flags |= Screen_Insert;
1596 else 1614 else
1597 screen.flags &= ~Screen_Insert; 1615 screen.flags &= ~Screen_Insert;
… …
1603 * XTERM_SEQ: Set tab at current column : ESC H 1621 * XTERM_SEQ: Set tab at current column : ESC H
1604 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1622 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1605 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1623 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1606 */ 1624 */
1607void 1625void
1608rxvt_term::scr_set_tab (int mode) 1626rxvt_term::scr_set_tab (int mode) NOTHROW
1609{ 1627{
1610 if (mode < 0) 1628 if (mode < 0)
1611 memset (tabs, 0, ncol * sizeof (char)); 1629 memset (tabs, 0, ncol);
1612 else if (screen.cur.col < ncol) 1630 else if (screen.cur.col < ncol)
1613 tabs [screen.cur.col] = !!mode; 1631 tabs [screen.cur.col] = !!mode;
1614} 1632}
1615 1633
1616/* ------------------------------------------------------------------------- */ 1634/* ------------------------------------------------------------------------- */
… …
1618 * Set reverse/normal video 1636 * Set reverse/normal video
1619 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1637 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1620 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1638 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1621 */ 1639 */
1622void 1640void
1623rxvt_term::scr_rvideo_mode (int mode) 1641rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1624{ 1642{
1625 XGCValues gcvalue; 1643 rvideo_mode = on;
1626 1644
1645#ifndef NO_BELL
1646 on ^= rvideo_bell;
1647#endif
1648
1627 if (rvideo != mode) 1649 if (rvideo_state != on)
1628 { 1650 {
1629 rvideo = mode; 1651 rvideo_state = on;
1652
1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1653 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1631#if XPM_BACKGROUND 1654#ifdef HAVE_BG_PIXMAP
1632 if (bgPixmap.pixmap == None) 1655 if (bgPixmap.pixmap == None)
1633#endif 1656#endif
1634#if TRANSPARENT 1657 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1636#endif
1637 XSetWindowBackground (display->display, vt,
1638 pix_colors[Color_bg]);
1639 1658
1659 XGCValues gcvalue;
1640 gcvalue.foreground = pix_colors[Color_fg]; 1660 gcvalue.foreground = pix_colors[Color_fg];
1641 gcvalue.background = pix_colors[Color_bg]; 1661 gcvalue.background = pix_colors[Color_bg];
1642 XChangeGC (display->display, gc, GCBackground | GCForeground, 1662 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1643 &gcvalue); 1663
1644 scr_clear (); 1664 scr_clear ();
1645 scr_touch (true); 1665 scr_touch (true);
1646 } 1666 }
1647} 1667}
1648 1668
… …
1650/* 1670/*
1651 * Report current cursor position 1671 * Report current cursor position
1652 * XTERM_SEQ: Report position: ESC [ 6 n 1672 * XTERM_SEQ: Report position: ESC [ 6 n
1653 */ 1673 */
1654void 1674void
1655rxvt_term::scr_report_position () 1675rxvt_term::scr_report_position () NOTHROW
1656{ 1676{
1657 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1677 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1658} 1678}
1659 1679
1660/* ------------------------------------------------------------------------- * 1680/* ------------------------------------------------------------------------- *
… …
1663 1683
1664/* 1684/*
1665 * Set font style 1685 * Set font style
1666 */ 1686 */
1667void 1687void
1668rxvt_term::set_font_style () 1688rxvt_term::set_font_style () NOTHROW
1669{ 1689{
1670#if 0 1690#if 0
1671 switch (charsets [screen.charset]) 1691 switch (charsets [screen.charset])
1672 { 1692 {
1673 case '0': /* DEC Special Character & Line Drawing Set */ 1693 case '0': /* DEC Special Character & Line Drawing Set */
… …
1695 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1715 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1696 * XTERM_SEQ: Invoke G2 character set: ESC N 1716 * XTERM_SEQ: Invoke G2 character set: ESC N
1697 * XTERM_SEQ: Invoke G3 character set: ESC O 1717 * XTERM_SEQ: Invoke G3 character set: ESC O
1698 */ 1718 */
1699void 1719void
1700rxvt_term::scr_charset_choose (int set) 1720rxvt_term::scr_charset_choose (int set) NOTHROW
1701{ 1721{
1702 screen.charset = set; 1722 screen.charset = set;
1703 set_font_style (); 1723 set_font_style ();
1704} 1724}
1705 1725
… …
1711 * XTERM_SEQ: Set G2 character set: ESC * <C> 1731 * XTERM_SEQ: Set G2 character set: ESC * <C>
1712 * XTERM_SEQ: Set G3 character set: ESC + <C> 1732 * XTERM_SEQ: Set G3 character set: ESC + <C>
1713 * See set_font_style for possible values for <C> 1733 * See set_font_style for possible values for <C>
1714 */ 1734 */
1715void 1735void
1716rxvt_term::scr_charset_set (int set, unsigned int ch) 1736rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1717{ 1737{
1718 charsets[set] = (unsigned char)ch; 1738 charsets[set] = (unsigned char)ch;
1719 set_font_style (); 1739 set_font_style ();
1720} 1740}
1721 1741
… …
1726 1746
1727/* 1747/*
1728 * refresh matching text. 1748 * refresh matching text.
1729 */ 1749 */
1730bool 1750bool
1731rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1751rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1732{ 1752{
1733 bool found = false; 1753 bool found = false;
1734 1754
1735 for (int i = 0; i < nrow; i++) 1755 for (int i = 0; i < nrow; i++)
1736 { 1756 {
1737 int col = 0;
1738 rend_t *drp = drawn_buf[i].r; 1757 rend_t *drp = drawn_buf[i].r;
1739 1758
1740 for (; col < ncol; col++, drp++) 1759 for (int col = 0; col < ncol; col++, drp++)
1741 if ((*drp & mask) == value) 1760 if ((*drp & mask) == value)
1742 { 1761 {
1743 found = true; 1762 found = true;
1744 *drp = ~value; 1763 *drp = ~value;
1745 } 1764 }
… …
1756 PART_END, 1775 PART_END,
1757 RC_COUNT 1776 RC_COUNT
1758}; 1777};
1759 1778
1760void 1779void
1761rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1780rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1762{ 1781{
1763 int i; 1782 int i;
1764 row_col_t rc[RC_COUNT]; 1783 row_col_t rc[RC_COUNT];
1765 1784
1766 if (!drawn_buf) /* sanity check */ 1785 if (!drawn_buf) /* sanity check */
… …
1785 for (i = PART_BEG; i < RC_COUNT; i++) 1804 for (i = PART_BEG; i < RC_COUNT; i++)
1786 { 1805 {
1787 min_it (rc[i].col, ncol - 1); 1806 min_it (rc[i].col, ncol - 1);
1788 min_it (rc[i].row, nrow - 1); 1807 min_it (rc[i].row, nrow - 1);
1789 } 1808 }
1790 1809// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1791 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1810 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1792 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1811 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1793 1812
1813 num_scr_allow = 0;
1814
1794 if (refresh) 1815 if (refresh)
1795 scr_refresh (SLOW_REFRESH); 1816 scr_refresh ();
1796} 1817}
1797 1818
1798/* ------------------------------------------------------------------------- */ 1819/* ------------------------------------------------------------------------- */
1799/* 1820/*
1800 * Refresh the entire screen 1821 * Refresh the entire screen
1801 */ 1822 */
1802void 1823void
1803rxvt_term::scr_touch (bool refresh) 1824rxvt_term::scr_touch (bool refresh) NOTHROW
1804{ 1825{
1805 scr_expose (0, 0, width, height, refresh); 1826 scr_expose (0, 0, width, height, refresh);
1806} 1827}
1807 1828
1808/* ------------------------------------------------------------------------- */ 1829/* ------------------------------------------------------------------------- */
1809/* 1830/*
1810 * Move the display so that the line represented by scrollbar value Y is at 1831 * Move the display so that the line represented by scrollbar value Y is at
1811 * the top of the screen 1832 * the top of the screen
1812 */ 1833 */
1813void 1834void
1814rxvt_term::scr_move_to (int y, int len) 1835rxvt_term::scr_move_to (int y, int len) NOTHROW
1815{ 1836{
1816 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1837 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1817} 1838}
1818 1839
1819/* ------------------------------------------------------------------------- */ 1840/* ------------------------------------------------------------------------- */
1820/* 1841/*
1821 * Page the screen up/down nlines 1842 * Page the screen up/down nlines
1822 * direction should be UP or DN 1843 * direction should be UP or DN
1823 */ 1844 */
1824bool 1845bool
1825rxvt_term::scr_page (enum page_dirn direction, int nlines) 1846rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1826{ 1847{
1827 int new_view_start = 1848 int new_view_start =
1828 direction == UP ? view_start - nlines 1849 direction == UP ? view_start - nlines
1829 : view_start + nlines; 1850 : view_start + nlines;
1830 1851
1831 return scr_changeview (new_view_start); 1852 return scr_changeview (new_view_start);
1832} 1853}
1833 1854
1834bool 1855bool
1835rxvt_term::scr_changeview (int new_view_start) 1856rxvt_term::scr_changeview (int new_view_start) NOTHROW
1836{ 1857{
1837 clamp_it (new_view_start, top_row, 0); 1858 clamp_it (new_view_start, top_row, 0);
1838 1859
1839 if (new_view_start == view_start) 1860 if (new_view_start == view_start)
1840 return false; 1861 return false;
1841 1862
1842 num_scr += new_view_start - view_start; 1863 num_scr += new_view_start - view_start;
1843 view_start = new_view_start; 1864 view_start = new_view_start;
1865 want_refresh = 1;
1866
1844 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1867 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1845 want_refresh = 1;
1846 1868
1847 return true; 1869 return true;
1848} 1870}
1849 1871
1850/* ------------------------------------------------------------------------- */ 1872#ifndef NO_BELL
1851void 1873void
1874rxvt_term::bell_cb (ev::timer &w, int revents)
1875{
1876 rvideo_bell = false;
1877 scr_rvideo_mode (rvideo_mode);
1878 refresh_check ();
1879}
1880#endif
1881
1882/* ------------------------------------------------------------------------- */
1883void
1852rxvt_term::scr_bell () 1884rxvt_term::scr_bell () NOTHROW
1853{ 1885{
1854#ifndef NO_BELL 1886#ifndef NO_BELL
1855 1887
1856# ifndef NO_MAPALERT 1888# ifndef NO_MAPALERT
1857# ifdef MAPALERT_OPTION 1889# ifdef MAPALERT_OPTION
1858 if (OPTION (Opt_mapAlert)) 1890 if (option (Opt_mapAlert))
1859# endif 1891# endif
1860 XMapWindow (display->display, parent[0]); 1892 XMapWindow (dpy, parent[0]);
1861# endif 1893# endif
1862 1894
1863 if (OPTION (Opt_visualBell)) 1895# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell))
1897 {
1898 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1899 {
1900 h->flags |= XUrgencyHint;
1901 XSetWMHints (dpy, parent[0], h);
1902 }
1864 { 1903 }
1865 scr_rvideo_mode (!rvideo); /* refresh also done */ 1904# endif
1905
1906 if (option (Opt_visualBell))
1907 {
1908 rvideo_bell = true;
1909 scr_rvideo_mode (rvideo_mode);
1866 display->flush (); 1910 flush ();
1911
1867 rxvt_usleep (VISUAL_BELL_DURATION); 1912 bell_ev.start (VISUAL_BELL_DURATION);
1868 scr_rvideo_mode (!rvideo); /* refresh also done */
1869 } 1913 }
1870 else 1914 else
1871 XBell (display->display, 0); 1915 XBell (dpy, 0);
1872
1873#endif 1916#endif
1874} 1917}
1875 1918
1876/* ------------------------------------------------------------------------- */ 1919/* ------------------------------------------------------------------------- */
1877/* ARGSUSED */ 1920/* ARGSUSED */
1878void 1921void
1879rxvt_term::scr_printscreen (int fullhist) 1922rxvt_term::scr_printscreen (int fullhist) NOTHROW
1880{ 1923{
1881#ifdef PRINTPIPE 1924#ifdef PRINTPIPE
1882 int nrows, row_start; 1925 int nrows, row_start;
1883 FILE *fd; 1926 FILE *fd;
1884 1927
… …
1933 * Refresh the screen 1976 * Refresh the screen
1934 * drawn_text/drawn_rend contain the screen information before the update. 1977 * drawn_text/drawn_rend contain the screen information before the update.
1935 * screen.text/screen.rend contain what the screen will change to. 1978 * screen.text/screen.rend contain what the screen will change to.
1936 */ 1979 */
1937void 1980void
1938rxvt_term::scr_refresh (unsigned char refresh_type) 1981rxvt_term::scr_refresh () NOTHROW
1939{ 1982{
1940 unsigned char must_clear, /* use draw_string not draw_image_string */ 1983 unsigned char have_bg,
1941 showcursor; /* show the cursor */ 1984 showcursor; /* show the cursor */
1942 int16_t col, row, /* column/row we're processing */ 1985 int16_t col, row, /* column/row we're processing */
1943 ocrow; /* old cursor row */ 1986 ocrow; /* old cursor row */
1944 int i; /* tmp */ 1987 int i; /* tmp */
1945#ifndef NO_CURSORCOLOR 1988#ifndef NO_CURSORCOLOR
1946 rend_t cc1; /* store colours at cursor position (s) */ 1989 rend_t cc1; /* store colours at cursor position (s) */
1947#endif 1990#endif
1948 rend_t *crp; // cursor rendition pointer 1991 rend_t *crp; // cursor rendition pointer
1992 rend_t ccol1, /* Cursor colour */
1993 ccol2; /* Cursor colour2 */
1949 1994
1950 want_refresh = 0; /* screen is current */ 1995 want_refresh = 0; /* screen is current */
1951 1996
1952 if (refresh_type == NO_REFRESH || !mapped) 1997 if (refresh_type == NO_REFRESH || !mapped)
1953 return; 1998 return;
1954 1999
1955 /* 2000 /*
1956 * A: set up vars 2001 * A: set up vars
1957 */ 2002 */
1958 must_clear = 0;
1959 refresh_count = 0; 2003 refresh_count = 0;
1960 2004
1961#if XPM_BACKGROUND 2005 have_bg = 0;
2006#ifdef HAVE_BG_PIXMAP
1962 must_clear |= bgPixmap.pixmap != None; 2007 have_bg = bgPixmap.pixmap != None;
1963#endif
1964#if TRANSPARENT
1965 must_clear |= OPTION (Opt_transparent) && am_transparent;
1966#endif 2008#endif
1967 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1968 2010
1969 /* 2011 /*
1970 * B: reverse any characters which are selected 2012 * B: reverse any characters which are selected
… …
1974 /* 2016 /*
1975 * C: set the cursor character (s) 2017 * C: set the cursor character (s)
1976 */ 2018 */
1977 { 2019 {
1978 unsigned char setoldcursor; 2020 unsigned char setoldcursor;
1979 rend_t ccol1, /* Cursor colour */
1980 ccol2; /* Cursor colour2 */
1981 2021
1982 showcursor = (screen.flags & Screen_VisibleCursor); 2022 showcursor = (screen.flags & Screen_VisibleCursor);
1983#ifdef CURSOR_BLINK 2023#ifdef CURSOR_BLINK
1984 if (hidden_cursor) 2024 if (hidden_cursor)
1985 showcursor = 0; 2025 showcursor = 0;
… …
1992 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2032 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1993 col--; 2033 col--;
1994 2034
1995 crp = &ROW(screen.cur.row).r[col]; 2035 crp = &ROW(screen.cur.row).r[col];
1996 2036
2037#ifndef NO_CURSORCOLOR
2038 cc1 = *crp & (RS_fgMask | RS_bgMask);
2039 if (ISSET_PIXCOLOR (Color_cursor))
2040 ccol1 = Color_cursor;
2041 else
2042#endif
2043#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2044 ccol1 = fgcolor_of (rstyle);
2045#else
2046 ccol1 = Color_fg;
2047#endif
2048
2049#ifndef NO_CURSORCOLOR
2050 if (ISSET_PIXCOLOR (Color_cursor2))
2051 ccol2 = Color_cursor2;
2052 else
2053#endif
2054#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2055 ccol2 = bgcolor_of (rstyle);
2056#else
2057 ccol2 = Color_bg;
2058#endif
2059
1997 if (showcursor && focus) 2060 if (showcursor && focus)
1998 { 2061 {
1999 if (OPTION (Opt_cursorUnderline)) 2062 if (option (Opt_cursorUnderline))
2000 *crp ^= RS_Uline; 2063 *crp ^= RS_Uline;
2001 else 2064 else
2002 { 2065 {
2003 *crp ^= RS_RVid; 2066 *crp ^= RS_RVid;
2004
2005#ifndef NO_CURSORCOLOR
2006 cc1 = *crp & (RS_fgMask | RS_bgMask);
2007 if (ISSET_PIXCOLOR (Color_cursor))
2008 ccol1 = Color_cursor;
2009 else
2010#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2011 ccol1 = fgcolor_of (rstyle);
2012#else
2013 ccol1 = Color_fg;
2014#endif
2015 if (ISSET_PIXCOLOR (Color_cursor2))
2016 ccol2 = Color_cursor2;
2017 else
2018#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2019 ccol2 = bgcolor_of (rstyle);
2020#else
2021 ccol2 = Color_bg;
2022#endif
2023 *crp = SET_FGCOLOR (*crp, ccol1); 2067 *crp = SET_FGCOLOR (*crp, ccol1);
2024 *crp = SET_BGCOLOR (*crp, ccol2); 2068 *crp = SET_BGCOLOR (*crp, ccol2);
2025#endif
2026 } 2069 }
2027 } 2070 }
2028 } 2071 }
2029 2072
2030 /* make sure no outline cursor is left around */ 2073 /* make sure no outline cursor is left around */
… …
2067#ifndef NO_SLOW_LINK_SUPPORT 2110#ifndef NO_SLOW_LINK_SUPPORT
2068 /* 2111 /*
2069 * D: CopyArea pass - very useful for slower links 2112 * D: CopyArea pass - very useful for slower links
2070 * This has been deliberately kept simple. 2113 * This has been deliberately kept simple.
2071 */ 2114 */
2072 i = num_scr;
2073 if (!display->is_local 2115 if (!display->is_local
2074 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2116 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2075 && abs (num_scr) < nrow && !must_clear) 2117 && abs (num_scr) < nrow && !have_bg)
2076 { 2118 {
2077 int16_t nits; 2119 int16_t nits;
2120 int i = num_scr;
2078 int j; 2121 int j;
2079 int len, wlen; 2122 int len, wlen;
2123 dLocal (int, num_scr);
2080 2124
2081 j = nrow; 2125 j = nrow;
2082 wlen = len = -1; 2126 wlen = len = -1;
2083 row = i > 0 ? 0 : j - 1; 2127 row = i > 0 ? 0 : j - 1;
2128
2084 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2129 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2085 { 2130 {
2086 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2131 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2087 { 2132 {
2088 line_t s = ROW(view_start + row); 2133 line_t s = ROW(view_start + row);
… …
2109 wlen = row; 2154 wlen = row;
2110 continue; 2155 continue;
2111 } 2156 }
2112 } 2157 }
2113 2158
2114 if (len != -1) 2159 if (len >= 0)
2115 { 2160 {
2116 /* also comes here at end if needed because of >= above */ 2161 /* also comes here at end if needed because of >= above */
2117 if (wlen < len) 2162 if (wlen < len)
2118 ::swap (wlen, len); 2163 ::swap (wlen, len);
2119 2164
2165 XGCValues gcv;
2166
2167 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2120 XCopyArea (display->display, vt, vt, 2168 XCopyArea (dpy, vt, vt,
2121 gc, 0, Row2Pixel (len + i), 2169 gc, 0, Row2Pixel (len + i),
2122 (unsigned int)this->width, 2170 (unsigned int)this->width,
2123 (unsigned int)Height2Pixel (wlen - len + 1), 2171 (unsigned int)Height2Pixel (wlen - len + 1),
2124 0, Row2Pixel (len)); 2172 0, Row2Pixel (len));
2173 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2174
2125 len = -1; 2175 len = -1;
2126 } 2176 }
2127 } 2177 }
2128 } 2178 }
2129#endif 2179#endif
… …
2185 count++; 2235 count++;
2186 2236
2187 if (stp[col] != dtp[col] 2237 if (stp[col] != dtp[col]
2188 || !RS_SAME (srp[col], drp[col])) 2238 || !RS_SAME (srp[col], drp[col]))
2189 { 2239 {
2190 if (must_clear && (i++ > count / 2)) 2240 if (have_bg && (i++ > count / 2))
2191 break; 2241 break;
2192 2242
2193 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2194 drp[col] = rend; 2244 drp[col] = rend;
2195 i = 0; 2245 i = 0;
2196 } 2246 }
2197 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2247 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2198 break; 2248 break;
2199 } 2249 }
2200 2250
2201 col--; /* went one too far. move back */ 2251 col--; /* went one too far. move back */
2202 count -= i; /* dump any matching trailing chars */ 2252 count -= i; /* dump any matching trailing chars */
… …
2212 int back = bgcolor_of (rend); // desired background 2262 int back = bgcolor_of (rend); // desired background
2213 2263
2214 // only do special processing if any attributes are set, which is unlikely 2264 // only do special processing if any attributes are set, which is unlikely
2215 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2265 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2216 { 2266 {
2217#if ENABLE_STYLES
2218 // force redraw after "careful" characters to avoid pixel droppings
2219 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2220 drp[col + 1] = ~srp[col + 1];
2221
2222 // include previous careful character(s) if possible, looks nicer (best effort...)
2223 while (text > stp
2224 && srp[text - stp - 1] & RS_Careful
2225 && RS_SAME (rend, srp[text - stp - 1]))
2226 text--, count++, xpixel -= fwidth;
2227#endif
2228
2229 bool invert = rend & RS_RVid; 2267 bool invert = rend & RS_RVid;
2230 2268
2231#ifndef NO_BOLD_UNDERLINE_REVERSE 2269#ifndef NO_BOLD_UNDERLINE_REVERSE
2232 if (rend & RS_Bold
2233 && fore == Color_fg) 2270 if (rend & RS_Bold && fore == Color_fg)
2234 { 2271 {
2235 if (ISSET_PIXCOLOR (Color_BD)) 2272 if (ISSET_PIXCOLOR (Color_BD))
2236 fore = Color_BD; 2273 fore = Color_BD;
2237# if !ENABLE_STYLES 2274# if !ENABLE_STYLES
2238 else 2275 else
2239 invert = !invert; 2276 invert = !invert;
2240# endif 2277# endif
2241 } 2278 }
2242 2279
2243 if (rend & RS_Italic 2280 if (rend & RS_Italic && fore == Color_fg)
2244 && fore == Color_fg)
2245 { 2281 {
2246 if (ISSET_PIXCOLOR (Color_IT)) 2282 if (ISSET_PIXCOLOR (Color_IT))
2247 fore = Color_IT; 2283 fore = Color_IT;
2248# if !ENABLE_STYLES 2284# if !ENABLE_STYLES
2249 else 2285 else
2250 invert = !invert; 2286 invert = !invert;
2251# endif 2287# endif
2252 } 2288 }
2253 2289
2254 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2255 fore = Color_UL; 2291 fore = Color_UL;
2256#endif 2292#endif
2257 2293
2258 if (invert) 2294 if (invert)
2259 { 2295 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2260 ::swap (fore, back); 2302 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2261 2307
2262#ifndef NO_BOLD_UNDERLINE_REVERSE 2308#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2263 if (ISSET_PIXCOLOR (Color_RV)) 2310 if (ISSET_PIXCOLOR (Color_RV))
2264 back = Color_RV; 2311 back = Color_RV;
2265 2312# endif
2266 if (fore == back) 2313 if (fore == back)
2267 { 2314 {
2268 fore = Color_bg; 2315 fore = Color_bg;
2269 back = Color_fg; 2316 back = Color_fg;
2270 } 2317 }
… …
2272 } 2319 }
2273 2320
2274#ifdef TEXT_BLINK 2321#ifdef TEXT_BLINK
2275 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2276 { 2323 {
2277 if (!text_blink_ev.active) 2324 if (!text_blink_ev.is_active ())
2278 { 2325 {
2279 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2326 text_blink_ev.again ();
2280 hidden_text = 0; 2327 hidden_text = 0;
2281 } 2328 }
2282 else if (hidden_text) 2329 else if (hidden_text)
2283 fore = back; 2330 fore = back;
2284 } 2331 }
2285#endif 2332#endif
2333
2334#if ENABLE_STYLES
2335 // "careful" (too wide) character handling
2336
2337 // include previous careful character(s) if possible, looks nicer (best effort...)
2338 while (text > stp
2339 && srp[text - stp - 1] & RS_Careful
2340 && RS_SAME (rend, srp[text - stp - 1]))
2341 text--, count++, xpixel -= fwidth;
2342
2343 // force redraw after "careful" characters to avoid pixel droppings
2344 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2345 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2346
2347 // force redraw before "careful" characters to avoid pixel droppings
2348 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2349 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2350#endif
2286 } 2351 }
2287 2352
2288 /* 2353 /*
2289 * Actually do the drawing of the string here 2354 * Actually do the drawing of the string here
2290 */ 2355 */
2291 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2292 2357
2293 if (back == fore)
2294 font->clear_rect (*drawable, xpixel, ypixel,
2295 fwidth * count, fheight,
2296 back);
2297 else if (back == Color_bg) 2358 if (have_bg && back == Color_bg)
2298 { 2359 {
2299 if (must_clear) 2360 // this is very ugly, maybe push it into ->draw?
2300 {
2301 CLEAR_CHARS (xpixel, ypixel, count);
2302 2361
2303 for (i = 0; i < count; i++) /* don't draw empty strings */ 2362 for (i = 0; i < count; i++) /* don't draw empty strings */
2304 if (text[i] != ' ') 2363 if (text[i] != ' ')
2305 { 2364 {
2306 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2365 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2307 break; 2366 goto did_clear;
2308 }
2309 } 2367 }
2310 else 2368
2311 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2369 CLEAR_CHARS (xpixel, ypixel, count);
2370 did_clear: ;
2312 } 2371 }
2313 else 2372 else
2314 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2315 2374
2316 if (rend & RS_Uline && font->descent > 1 && fore != back) 2375 if (rend & RS_Uline && font->descent > 1 && fore != back)
2317 { 2376 {
2318#if ENABLE_FRILLS 2377#if ENABLE_FRILLS
2319 if (ISSET_PIXCOLOR (Color_underline)) 2378 if (ISSET_PIXCOLOR (Color_underline))
2320 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2379 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2321 else 2380 else
2322#endif 2381#endif
2323 XSetForeground (display->display, gc, pix_colors[fore]); 2382 XSetForeground (dpy, gc, pix_colors[fore]);
2324 2383
2325 XDrawLine (display->display, drawBuffer, gc, 2384 XDrawLine (dpy, vt, gc,
2326 xpixel, ypixel + font->ascent + 1, 2385 xpixel, ypixel + font->ascent + 1,
2327 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2328 } 2387 }
2329 } /* for (col....) */ 2388 } /* for (col....) */
2330 } /* for (row....) */ 2389 } /* for (row....) */
… …
2339 */ 2398 */
2340 if (showcursor) 2399 if (showcursor)
2341 { 2400 {
2342 if (focus) 2401 if (focus)
2343 { 2402 {
2344 if (OPTION (Opt_cursorUnderline)) 2403 if (option (Opt_cursorUnderline))
2345 *crp ^= RS_Uline; 2404 *crp ^= RS_Uline;
2346 else 2405 else
2347 { 2406 {
2348 *crp ^= RS_RVid; 2407 *crp ^= RS_RVid;
2349#ifndef NO_CURSORCOLOR 2408#ifndef NO_CURSORCOLOR
… …
2363 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2422 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2364 cursorwidth++; 2423 cursorwidth++;
2365 2424
2366#ifndef NO_CURSORCOLOR 2425#ifndef NO_CURSORCOLOR
2367 if (ISSET_PIXCOLOR (Color_cursor)) 2426 if (ISSET_PIXCOLOR (Color_cursor))
2368 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else
2369#endif 2429#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]);
2370 2431
2371 XDrawRectangle (display->display, drawBuffer, gc, 2432 XDrawRectangle (dpy, vt, gc,
2372 Col2Pixel (col), 2433 Col2Pixel (col),
2373 Row2Pixel (oldcursor.row), 2434 Row2Pixel (oldcursor.row),
2374 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2435 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2375 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2376 } 2437 }
… …
2384 num_scr = 0; 2445 num_scr = 0;
2385 num_scr_allow = 1; 2446 num_scr_allow = 1;
2386} 2447}
2387 2448
2388void 2449void
2389rxvt_term::scr_remap_chars (line_t &l) 2450rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2390{ 2451{
2391 if (!l.t) 2452 if (!l.t)
2392 return; 2453 return;
2393 2454
2394 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2455 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2396 for (int i = ncol; i--; ) 2457 for (int i = ncol; i--; )
2397 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2458 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2398} 2459}
2399 2460
2400void 2461void
2401rxvt_term::scr_remap_chars () 2462rxvt_term::scr_remap_chars () NOTHROW
2402{ 2463{
2403 for (int i = total_rows; i--; ) 2464 for (int i = total_rows; i--; )
2404 scr_remap_chars (row_buf [i]); 2465 scr_remap_chars (row_buf [i]);
2405 2466
2406 for (int i = nrow; i--; ) 2467 for (int i = nrow; i--; )
… …
2409 scr_remap_chars (swap_buf [i]); 2470 scr_remap_chars (swap_buf [i]);
2410 } 2471 }
2411} 2472}
2412 2473
2413void 2474void
2414rxvt_term::scr_recolour () 2475rxvt_term::scr_recolour () NOTHROW
2415{ 2476{
2416 if (1 2477#ifdef HAVE_BG_PIXMAP
2417#if TRANSPARENT 2478 bgPixmap.apply ();
2418 && !am_transparent 2479#else
2419#endif 2480
2420#if XPM_BACKGROUND
2421 && !bgPixmap.pixmap
2422#endif
2423 )
2424 {
2425 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2481 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2426 XClearWindow (display->display, parent[0]); 2482 XClearWindow (dpy, parent[0]);
2427 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2483 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2428#if HAVE_SCROLLBARS 2484
2429 if (scrollBar.win) 2485 if (scrollBar.win)
2430 { 2486 {
2431 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2432 scrollBar.setIdle (); 2488 scrollBar.state = STATE_IDLE;
2433 scrollbar_show (0); 2489 scrollBar.show (0);
2434 }
2435#endif
2436 } 2490 }
2437 2491
2492#endif
2493
2494 /* bgPixmap.apply () does not do the following : */
2438 scr_clear (); 2495 scr_clear ();
2439 scr_touch (true); 2496 scr_touch (true);
2440 want_refresh = 1; 2497 want_refresh = 1;
2441} 2498}
2442 2499
2443/* ------------------------------------------------------------------------- */ 2500/* ------------------------------------------------------------------------- */
2444void 2501void
2445rxvt_term::scr_clear (bool really) 2502rxvt_term::scr_clear (bool really) NOTHROW
2446{ 2503{
2447 if (!mapped) 2504 if (!mapped)
2448 return; 2505 return;
2449 2506
2450 num_scr_allow = 0; 2507 num_scr_allow = 0;
2451 want_refresh = 1; 2508 want_refresh = 1;
2452 2509
2453 if (really) 2510 if (really)
2454 XClearWindow (display->display, vt); 2511 XClearWindow (dpy, vt);
2455} 2512}
2456 2513
2457void 2514void
2458rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2515rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2459{ 2516{
2460 int view_end = view_start + nrow; 2517 int view_end = view_start + nrow;
2461 int row, col; 2518 int row, col;
2462 2519
2463 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2520 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2475 srp[col] ^= rstyle2; 2532 srp[col] ^= rstyle2;
2476 } 2533 }
2477} 2534}
2478 2535
2479void 2536void
2480rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2537rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2481{ 2538{
2482 int view_end = view_start + nrow; 2539 int view_end = view_start + nrow;
2483 int row, col; 2540 int row, col;
2484 2541
2485 if (beg_row >= view_start) 2542 if (beg_row >= view_start)
… …
2502 srp[col] ^= rstyle; 2559 srp[col] ^= rstyle;
2503} 2560}
2504 2561
2505/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2506void 2563void
2507rxvt_term::scr_reverse_selection () 2564rxvt_term::scr_reverse_selection () NOTHROW
2508{ 2565{
2509 if (selection.op 2566 if (selection.op
2510 && current_screen == selection.screen 2567 && current_screen == selection.screen
2511 && selection.end.row >= view_start) 2568 && selection.end.row >= view_start)
2512 { 2569 {
2513#if ENABLE_FRILLS 2570#if !ENABLE_MINIMAL
2514 if (selection.rect) 2571 if (selection.rect)
2515 scr_xor_rect (selection.beg.row, selection.beg.col, 2572 scr_xor_rect (selection.beg.row, selection.beg.col,
2516 selection.end.row, selection.end.col, 2573 selection.end.row, selection.end.col,
2517 RS_RVid, RS_RVid | RS_Uline); 2574 RS_RVid, RS_RVid | RS_Uline);
2518 else 2575 else
… …
2528 * Dump the whole scrollback and screen to the passed filedescriptor. The 2585 * Dump the whole scrollback and screen to the passed filedescriptor. The
2529 * invoking routine must close the fd. 2586 * invoking routine must close the fd.
2530 */ 2587 */
2531#if 0 2588#if 0
2532void 2589void
2533rxvt_term::scr_dump (int fd) 2590rxvt_term::scr_dump (int fd) NOTHROW
2534{ 2591{
2535 int row, wrote; 2592 int row, wrote;
2536 unsigned int width, towrite; 2593 unsigned int width, towrite;
2537 char r1[] = "\n"; 2594 char r1[] = "\n";
2538 2595
2539 for (row = saveLines - nsaved; 2596 for (row = saveLines + top_row;
2540 row < saveLines + nrow - 1; row++) 2597 row < saveLines + nrow - 1; row++)
2541 { 2598 {
2542 width = row_buf[row].l >= 0 ? row_buf[row].l 2599 width = row_buf[row].l >= 0 ? row_buf[row].l
2543 : ncol; 2600 : ncol;
2544 for (towrite = width; towrite; towrite -= wrote) 2601 for (towrite = width; towrite; towrite -= wrote)
… …
2557 2614
2558/* ------------------------------------------------------------------------- * 2615/* ------------------------------------------------------------------------- *
2559 * CHARACTER SELECTION * 2616 * CHARACTER SELECTION *
2560 * ------------------------------------------------------------------------- */ 2617 * ------------------------------------------------------------------------- */
2561void 2618void
2562rxvt_term::selection_check (int check_more) 2619rxvt_term::selection_check (int check_more) NOTHROW
2563{ 2620{
2564 row_col_t pos; 2621 row_col_t pos;
2565 2622
2566 if (!selection.op) 2623 if (!selection.op)
2567 return; 2624 return;
… …
2588/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2589/* 2646/*
2590 * Paste a selection direct to the command fd 2647 * Paste a selection direct to the command fd
2591 */ 2648 */
2592void 2649void
2593rxvt_term::paste (char *data, unsigned int len) 2650rxvt_term::paste (char *data, unsigned int len) NOTHROW
2594{ 2651{
2595 /* convert normal newline chars into common keyboard Return key sequence */ 2652 /* convert normal newline chars into common keyboard Return key sequence */
2596 for (unsigned int i = 0; i < len; i++) 2653 for (unsigned int i = 0; i < len; i++)
2597 if (data[i] == C0_LF) 2654 if (data[i] == C0_LF)
2598 data[i] = C0_CR; 2655 data[i] = C0_CR;
2599 2656
2657 if (priv_modes & PrivMode_BracketPaste)
2658 tt_printf ("\e[200~");
2659
2600 tt_write (data, len); 2660 tt_write (data, len);
2661
2662 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[201~");
2601} 2664}
2602 2665
2603/* ------------------------------------------------------------------------- */ 2666/* ------------------------------------------------------------------------- */
2604/* 2667/*
2605 * Respond to a notification that a primary selection has been sent 2668 * Respond to a notification that a primary selection has been sent
2606 * EXT: SelectionNotify 2669 * EXT: SelectionNotify
2607 */ 2670 */
2608void 2671void
2609rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2672rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2610{ 2673{
2611 if (prop == None) /* check for failed XConvertSelection */ 2674 if (prop == None) /* check for failed XConvertSelection */
2612 { 2675 {
2613 if ((selection_type & Sel_CompoundText)) 2676 if ((selection_type & Sel_CompoundText))
2614 { 2677 {
… …
2634 } 2697 }
2635 2698
2636 unsigned long bytes_after; 2699 unsigned long bytes_after;
2637 XTextProperty ct; 2700 XTextProperty ct;
2638 2701
2639 if (XGetWindowProperty (display->display, win, prop, 2702 if (XGetWindowProperty (dpy, win, prop,
2640 0, PROP_SIZE / 4, 2703 0, PROP_SIZE / 4,
2641 delete_prop, AnyPropertyType, 2704 delete_prop, AnyPropertyType,
2642 &ct.encoding, &ct.format, 2705 &ct.encoding, &ct.format,
2643 &ct.nitems, &bytes_after, 2706 &ct.nitems, &bytes_after,
2644 &ct.value) != Success) 2707 &ct.value) != Success)
… …
2653 if (bytes_after) 2716 if (bytes_after)
2654 { 2717 {
2655 // fetch and append remaining data 2718 // fetch and append remaining data
2656 XTextProperty ct2; 2719 XTextProperty ct2;
2657 2720
2658 if (XGetWindowProperty (display->display, win, prop, 2721 if (XGetWindowProperty (dpy, win, prop,
2659 ct.nitems / 4, (bytes_after + 3) / 4, 2722 ct.nitems / 4, (bytes_after + 3) / 4,
2660 delete_prop, AnyPropertyType, 2723 delete_prop, AnyPropertyType,
2661 &ct2.encoding, &ct2.format, 2724 &ct2.encoding, &ct2.format,
2662 &ct2.nitems, &bytes_after, 2725 &ct2.nitems, &bytes_after,
2663 &ct2.value) != Success) 2726 &ct2.value) != Success)
… …
2676 2739
2677 if (ct.encoding == xa[XA_INCR]) 2740 if (ct.encoding == xa[XA_INCR])
2678 { 2741 {
2679 // INCR selection, start handshake 2742 // INCR selection, start handshake
2680 if (!delete_prop) 2743 if (!delete_prop)
2681 XDeleteProperty (display->display, win, prop); 2744 XDeleteProperty (dpy, win, prop);
2682 2745
2683 selection_wait = Sel_incr; 2746 selection_wait = Sel_incr;
2684 incr_buf_fill = 0; 2747 incr_buf_fill = 0;
2685 incr_ev.start (NOW + 10); 2748 incr_ev.start (10);
2686 2749
2687 goto bailout; 2750 goto bailout;
2688 } 2751 }
2689 2752
2690 if (ct.nitems == 0) 2753 if (ct.nitems == 0)
… …
2699 ct.nitems = incr_buf_fill; 2762 ct.nitems = incr_buf_fill;
2700 incr_buf = 0; 2763 incr_buf = 0;
2701 incr_buf_size = 0; 2764 incr_buf_size = 0;
2702 incr_ev.stop (); 2765 incr_ev.stop ();
2703 } 2766 }
2704 else 2767 else
2705 { 2768 {
2706 if (selection_wait == Sel_normal 2769 if (selection_wait == Sel_normal
2707 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2770 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2708 { 2771 {
2709 /* 2772 /*
… …
2716 goto bailout; 2779 goto bailout;
2717 } 2780 }
2718 } 2781 }
2719 else if (selection_wait == Sel_incr) 2782 else if (selection_wait == Sel_incr)
2720 { 2783 {
2721 incr_ev.start (NOW + 10); 2784 incr_ev.start (10);
2722 2785
2723 while (incr_buf_fill + ct.nitems > incr_buf_size) 2786 while (incr_buf_fill + ct.nitems > incr_buf_size)
2724 { 2787 {
2725 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2788 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2726 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2789 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2733 } 2796 }
2734 2797
2735 char **cl; 2798 char **cl;
2736 int cr; 2799 int cr;
2737 2800
2738#if ENABLE_FRILLS 2801#if !ENABLE_MINIMAL
2739 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2802 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2740 // so recode it manually 2803 // so recode it manually
2741 if (ct.encoding == xa[XA_UTF8_STRING]) 2804 if (ct.encoding == xa[XA_UTF8_STRING])
2742 { 2805 {
2743 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2806 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2747 paste (s, strlen (s)); 2810 paste (s, strlen (s));
2748 free (s); 2811 free (s);
2749 } 2812 }
2750 else 2813 else
2751#endif 2814#endif
2752 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2815 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2753 && cl) 2816 && cl)
2754 { 2817 {
2755 for (int i = 0; i < cr; i++) 2818 for (int i = 0; i < cr; i++)
2756 paste (cl[i], strlen (cl[i])); 2819 paste (cl[i], strlen (cl[i]));
2757 2820
… …
2766 if (selection_wait == Sel_normal) 2829 if (selection_wait == Sel_normal)
2767 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2768} 2831}
2769 2832
2770void 2833void
2771rxvt_term::incr_cb (time_watcher &w) 2834rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2772{ 2835{
2773 selection_wait = Sel_none; 2836 selection_wait = Sel_none;
2774 2837
2775 incr_buf_size = 0; 2838 incr_buf_size = 0;
2776 free (incr_buf); 2839 free (incr_buf);
2777 2840
2778 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2841 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2779} 2842}
2780 2843
2781void 2844void
2782rxvt_term::selection_property (Window win, Atom prop) 2845rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2783{ 2846{
2784 if (prop == None || selection_wait != Sel_incr) 2847 if (prop == None || selection_wait != Sel_incr)
2785 return; 2848 return;
2786 2849
2787 selection_paste (win, prop, true); 2850 selection_paste (win, prop, true);
2788} 2851}
2789 2852
2790/* ------------------------------------------------------------------------- */ 2853/* ------------------------------------------------------------------------- */
2791/* 2854/*
2792 * Request the current selection: 2855 * Request the current selection:
2793 * Order: > internal selection if available 2856 * Order: > internal selection if available
2794 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2857 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2795 * > CUT_BUFFER0 2858 * > CUT_BUFFER0
2796 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2859 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2797 * will auto fallback to CUT_BUFFER0 2860 * will auto fallback to CUT_BUFFER0
2798 * EXT: button 2 release 2861 * EXT: button 2 release
2799 */ 2862 */
2800void 2863void
2801rxvt_term::selection_request (Time tm, int x, int y) 2864rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2802{ 2865{
2803 if (x < 0 || x >= width || y < 0 || y >= height) 2866 if (selection.text && selnum == Sel_Primary)
2804 return; /* outside window */ 2867 {
2805
2806 if (selection.text)
2807 { /* internal selection */ 2868 /* internal selection */
2808 char *str = rxvt_wcstombs (selection.text, selection.len); 2869 char *str = rxvt_wcstombs (selection.text, selection.len);
2809 paste (str, strlen (str)); 2870 paste (str, strlen (str));
2810 free (str); 2871 free (str);
2811 return; 2872 return;
2812 } 2873 }
2813 else 2874 else
2814 { 2875 {
2815 int i;
2816
2817 selection_request_time = tm; 2876 selection_request_time = tm;
2818 selection_wait = Sel_normal; 2877 selection_wait = Sel_normal;
2819 2878
2820 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2821 {
2822#if X_HAVE_UTF8_STRING 2879#if X_HAVE_UTF8_STRING
2823 selection_type = Sel_UTF8String; 2880 selection_type = Sel_UTF8String;
2824 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2881 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2825 return; 2882 return;
2826#else 2883#else
2827 selection_type = Sel_CompoundText; 2884 selection_type = Sel_CompoundText;
2828 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2885 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2829 return; 2886 return;
2830#endif 2887#endif
2831 }
2832 } 2888 }
2833 2889
2834 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2890 selection_wait = Sel_none; /* don't loop in selection_paste () */
2835 selection_paste (display->root, XA_CUT_BUFFER0, false); 2891 selection_paste (display->root, XA_CUT_BUFFER0, false);
2836} 2892}
2837 2893
2838int 2894int
2839rxvt_term::selection_request_other (Atom target, int selnum) 2895rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2840{ 2896{
2841 Atom sel; 2897 Atom sel;
2842 2898
2843 selection_type |= selnum; 2899 selection_type |= selnum;
2844 2900
… …
2847 else if (selnum == Sel_Secondary) 2903 else if (selnum == Sel_Secondary)
2848 sel = XA_SECONDARY; 2904 sel = XA_SECONDARY;
2849 else 2905 else
2850 sel = xa[XA_CLIPBOARD]; 2906 sel = xa[XA_CLIPBOARD];
2851 2907
2852 if (XGetSelectionOwner (display->display, sel) != None) 2908 if (XGetSelectionOwner (dpy, sel) != None)
2853 { 2909 {
2854 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2910 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2855 vt, selection_request_time); 2911 vt, selection_request_time);
2856 return 1; 2912 return 1;
2857 } 2913 }
2858 2914
2859 return 0; 2915 return 0;
… …
2863/* 2919/*
2864 * Clear all selected text 2920 * Clear all selected text
2865 * EXT: SelectionClear 2921 * EXT: SelectionClear
2866 */ 2922 */
2867void 2923void
2868rxvt_term::selection_clear () 2924rxvt_term::selection_clear () NOTHROW
2869{ 2925{
2870 want_refresh = 1; 2926 want_refresh = 1;
2871 free (selection.text); 2927 free (selection.text);
2872 selection.text = NULL; 2928 selection.text = NULL;
2873 selection.len = 0; 2929 selection.len = 0;
… …
2922 2978
2923 int end_col; 2979 int end_col;
2924 2980
2925 for (; row <= selection.end.row; row++, col = 0) 2981 for (; row <= selection.end.row; row++, col = 0)
2926 { 2982 {
2927#if ENABLE_FRILLS 2983#if !ENABLE_MINIMAL
2928 if (selection.rect) 2984 if (selection.rect)
2929 { 2985 {
2930 col = selection.beg.col; 2986 col = selection.beg.col;
2931 end_col = ncol + 1; 2987 end_col = ncol + 1;
2932 } 2988 }
… …
2935 end_col = ROW(row).l; 2991 end_col = ROW(row).l;
2936 2992
2937 col = max (col, 0); 2993 col = max (col, 0);
2938 2994
2939 if (row == selection.end.row 2995 if (row == selection.end.row
2940#if ENABLE_FRILLS 2996#if !ENABLE_MINIMAL
2941 || selection.rect 2997 || selection.rect
2942#endif 2998#endif
2943 ) 2999 )
2944 min_it (end_col, selection.end.col); 3000 min_it (end_col, selection.end.col);
2945 3001
… …
2968#endif 3024#endif
2969 else 3025 else
2970 new_selection_text[ofs++] = *t++; 3026 new_selection_text[ofs++] = *t++;
2971 } 3027 }
2972 3028
2973#if ENABLE_FRILLS 3029#if !ENABLE_MINIMAL
2974 if (selection.rect) 3030 if (selection.rect)
2975 { 3031 {
2976 while (ofs 3032 while (ofs
2977 && new_selection_text[ofs - 1] != C0_LF 3033 && new_selection_text[ofs - 1] != C0_LF
2978 && unicode::is_space (new_selection_text[ofs - 1])) 3034 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3008 3064
3009 selection_grab (tm); 3065 selection_grab (tm);
3010} 3066}
3011 3067
3012bool 3068bool
3013rxvt_term::selection_grab (Time tm) 3069rxvt_term::selection_grab (Time tm) NOTHROW
3014{ 3070{
3015 selection_time = tm; 3071 selection_time = tm;
3016 3072
3017 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3073 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3018 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3074 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3019 { 3075 {
3020 display->set_selection_owner (this); 3076 display->set_selection_owner (this);
3021 return true; 3077 return true;
3022 } 3078 }
3023 else 3079 else
… …
3027 } 3083 }
3028 3084
3029#if 0 3085#if 0
3030 XTextProperty ct; 3086 XTextProperty ct;
3031 3087
3032 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3088 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3033 { 3089 {
3034 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3090 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3035 XFree (ct.value); 3091 XFree (ct.value);
3036 } 3092 }
3037#endif 3093#endif
… …
3041/* 3097/*
3042 * Mark or select text based upon number of clicks: 1, 2, or 3 3098 * Mark or select text based upon number of clicks: 1, 2, or 3
3043 * EXT: button 1 press 3099 * EXT: button 1 press
3044 */ 3100 */
3045void 3101void
3046rxvt_term::selection_click (int clicks, int x, int y) 3102rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3047{ 3103{
3048 clicks = ((clicks - 1) % 3) + 1; 3104 clicks = ((clicks - 1) % 3) + 1;
3049 selection.clicks = clicks; /* save clicks so extend will work */ 3105 selection.clicks = clicks; /* save clicks so extend will work */
3050 3106
3051 if (clicks == 2 && !selection.rect 3107 if (clicks == 2 && !selection.rect
… …
3070/* ------------------------------------------------------------------------- */ 3126/* ------------------------------------------------------------------------- */
3071/* 3127/*
3072 * Mark a selection at the specified col/row 3128 * Mark a selection at the specified col/row
3073 */ 3129 */
3074void 3130void
3075rxvt_term::selection_start_colrow (int col, int row) 3131rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3076{ 3132{
3077 want_refresh = 1; 3133 want_refresh = 1;
3078 3134
3079 selection.mark.row = row + view_start; 3135 selection.mark.row = row + view_start;
3080 selection.mark.col = col; 3136 selection.mark.col = col;
… …
3083 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3139 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3084 3140
3085 while (selection.mark.col > 0 3141 while (selection.mark.col > 0
3086 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3142 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3087 --selection.mark.col; 3143 --selection.mark.col;
3088 3144
3089 if (selection.op) 3145 if (selection.op)
3146 {
3090 { /* clear the old selection */ 3147 /* clear the old selection */
3091 selection.beg.row = selection.end.row = selection.mark.row; 3148 selection.beg.row = selection.end.row = selection.mark.row;
3092 selection.beg.col = selection.end.col = selection.mark.col; 3149 selection.beg.col = selection.end.col = selection.mark.col;
3093 } 3150 }
3094 3151
3095 selection.op = SELECTION_INIT; 3152 selection.op = SELECTION_INIT;
… …
3106#define DELIMIT_TEXT(x) \ 3163#define DELIMIT_TEXT(x) \
3107 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3164 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3108#define DELIMIT_REND(x) 1 3165#define DELIMIT_REND(x) 1
3109 3166
3110void 3167void
3111rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3168rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3112{ 3169{
3113 int col, row, dirnadd, tcol, trow, w1, w2; 3170 int col, row, dirnadd, tcol, trow, w1, w2;
3114 row_col_t bound; 3171 row_col_t bound;
3115 text_t *stp; 3172 text_t *stp;
3116 rend_t *srp; 3173 rend_t *srp;
… …
3190 * flag == 0 ==> button 1 3247 * flag == 0 ==> button 1
3191 * flag == 1 ==> button 3 press 3248 * flag == 1 ==> button 3 press
3192 * flag == 2 ==> button 3 motion 3249 * flag == 2 ==> button 3 motion
3193 */ 3250 */
3194void 3251void
3195rxvt_term::selection_extend (int x, int y, int flag) 3252rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3196{ 3253{
3197 int col = clamp (Pixel2Col (x), 0, ncol); 3254 int col = clamp (Pixel2Col (x), 0, ncol);
3198 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3255 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3199 3256
3200 /* 3257 /*
… …
3226/* ------------------------------------------------------------------------- */ 3283/* ------------------------------------------------------------------------- */
3227/* 3284/*
3228 * Extend the selection to the specified col/row 3285 * Extend the selection to the specified col/row
3229 */ 3286 */
3230void 3287void
3231rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3288rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3232{ 3289{
3233 row_col_t pos; 3290 row_col_t pos;
3234 enum { 3291 enum {
3235 LEFT, RIGHT 3292 LEFT, RIGHT
3236 } closeto = RIGHT; 3293 } closeto = RIGHT;
… …
3284 * a point/word/line which is either the start or end of the selection 3341 * a point/word/line which is either the start or end of the selection
3285 * and it was decided by whichever point/word/line was `fixed' at the 3342 * and it was decided by whichever point/word/line was `fixed' at the
3286 * time of the most recent button3 press 3343 * time of the most recent button3 press
3287 */ 3344 */
3288 if (button3 && buttonpress) 3345 if (button3 && buttonpress)
3346 {
3289 { /* button3 press */ 3347 /* button3 press */
3290 /* 3348 /*
3291 * first determine which edge of the selection we are closest to 3349 * first determine which edge of the selection we are closest to
3292 */ 3350 */
3293 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3351 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3294 || (!ROWCOL_IS_AFTER (pos, selection.end) 3352 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3312 selection.mark.row = selection.beg.row; 3370 selection.mark.row = selection.beg.row;
3313 selection.mark.col = selection.beg.col; 3371 selection.mark.col = selection.beg.col;
3314 } 3372 }
3315 } 3373 }
3316 else 3374 else
3375 {
3317 { /* button1 drag or button3 drag */ 3376 /* button1 drag or button3 drag */
3318 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3377 if (ROWCOL_IS_AFTER (selection.mark, pos))
3319 { 3378 {
3320 if (selection.mark.row == selection.end.row 3379 if (selection.mark.row == selection.end.row
3321 && selection.mark.col == selection.end.col 3380 && selection.mark.col == selection.end.col
3322 && clickchange 3381 && clickchange
… …
3339 3398
3340 if (selection.clicks == 1) 3399 if (selection.clicks == 1)
3341 { 3400 {
3342 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3401 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3343 && !ROW(selection.beg.row).is_longer () 3402 && !ROW(selection.beg.row).is_longer ()
3344#if ENABLE_FRILLS 3403#if !ENABLE_MINIMAL
3345 && !selection.rect 3404 && !selection.rect
3346#endif 3405#endif
3347 ) 3406 )
3348 selection.beg.col = ncol; 3407 selection.beg.col = ncol;
3349 3408
3350 if ( 3409 if (
3351 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3410 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3352 && !ROW(selection.end.row).is_longer () 3411 && !ROW(selection.end.row).is_longer ()
3353#if ENABLE_FRILLS 3412#if !ENABLE_MINIMAL
3354 && !selection.rect 3413 && !selection.rect
3355#endif 3414#endif
3356 ) 3415 )
3357 selection.end.col = ncol; 3416 selection.end.col = ncol;
3358 } 3417 }
… …
3365 selection_delimit_word (DN, &selection.end, &selection.end); 3424 selection_delimit_word (DN, &selection.end, &selection.end);
3366 } 3425 }
3367 else if (selection.clicks == 3) 3426 else if (selection.clicks == 3)
3368 { 3427 {
3369#if ENABLE_FRILLS 3428#if ENABLE_FRILLS
3370 if (OPTION (Opt_tripleclickwords)) 3429 if (option (Opt_tripleclickwords))
3371 { 3430 {
3372 selection_delimit_word (UP, &selection.beg, &selection.beg); 3431 selection_delimit_word (UP, &selection.beg, &selection.beg);
3373 3432
3374 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3433 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3375 { 3434 {
3376 if (!ROW(end_row).is_longer ()) 3435 if (!ROW(end_row).is_longer ())
3377 { 3436 {
3378 selection.end.row = end_row; 3437 selection.end.row = end_row;
3379 selection.end.col = ROW(end_row).l; 3438 selection.end.col = ROW(end_row).l;
3439# if !ENABLE_MINIMAL
3380 selection_remove_trailing_spaces (); 3440 selection_remove_trailing_spaces ();
3441# endif
3381 break; 3442 break;
3382 } 3443 }
3383 } 3444 }
3384 } 3445 }
3385 else 3446 else
… …
3401 selection.end.row++; 3462 selection.end.row++;
3402 } 3463 }
3403 } 3464 }
3404 3465
3405 if (button3 && buttonpress) 3466 if (button3 && buttonpress)
3467 {
3406 { /* mark may need to be changed */ 3468 /* mark may need to be changed */
3407 if (closeto == LEFT) 3469 if (closeto == LEFT)
3408 { 3470 {
3409 selection.mark.row = selection.end.row; 3471 selection.mark.row = selection.end.row;
3410 selection.mark.col = selection.end.col - (selection.clicks == 2); 3472 selection.mark.col = selection.end.col - (selection.clicks == 2);
3411 } 3473 }
… …
3414 selection.mark.row = selection.beg.row; 3476 selection.mark.row = selection.beg.row;
3415 selection.mark.col = selection.beg.col; 3477 selection.mark.col = selection.beg.col;
3416 } 3478 }
3417 } 3479 }
3418 3480
3419#if ENABLE_FRILLS 3481#if !ENABLE_MINIMAL
3420 if (selection.rect && selection.beg.col > selection.end.col) 3482 if (selection.rect && selection.beg.col > selection.end.col)
3421 ::swap (selection.beg.col, selection.end.col); 3483 ::swap (selection.beg.col, selection.end.col);
3422#endif 3484#endif
3423} 3485}
3424 3486
3425#if ENABLE_FRILLS 3487#if !ENABLE_MINIMAL
3426void 3488void
3427rxvt_term::selection_remove_trailing_spaces () 3489rxvt_term::selection_remove_trailing_spaces () NOTHROW
3428{ 3490{
3429 int32_t end_col, end_row; 3491 int32_t end_col, end_row;
3430 text_t *stp; 3492 text_t *stp;
3431 3493
3432 end_col = selection.end.col; 3494 end_col = selection.end.col;
… …
3470/* 3532/*
3471 * Double click on button 3 when already selected 3533 * Double click on button 3 when already selected
3472 * EXT: button 3 double click 3534 * EXT: button 3 double click
3473 */ 3535 */
3474void 3536void
3475rxvt_term::selection_rotate (int x, int y) 3537rxvt_term::selection_rotate (int x, int y) NOTHROW
3476{ 3538{
3477 selection.clicks = selection.clicks % 3 + 1; 3539 selection.clicks = selection.clicks % 3 + 1;
3478 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3540 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3479} 3541}
3480 3542
… …
3482/* 3544/*
3483 * Respond to a request for our current selection 3545 * Respond to a request for our current selection
3484 * EXT: SelectionRequest 3546 * EXT: SelectionRequest
3485 */ 3547 */
3486void 3548void
3487rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3549rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3488{ 3550{
3489 XSelectionEvent ev; 3551 XSelectionEvent ev;
3490 dDisp;
3491 3552
3492 ev.type = SelectionNotify; 3553 ev.type = SelectionNotify;
3493 ev.property = None; 3554 ev.property = None;
3494 ev.display = rq.display; 3555 ev.display = rq.display;
3495 ev.requestor = rq.requestor; 3556 ev.requestor = rq.requestor;
… …
3509 *target++ = xa[XA_COMPOUND_TEXT]; 3570 *target++ = xa[XA_COMPOUND_TEXT];
3510#if X_HAVE_UTF8_STRING 3571#if X_HAVE_UTF8_STRING
3511 *target++ = xa[XA_UTF8_STRING]; 3572 *target++ = xa[XA_UTF8_STRING];
3512#endif 3573#endif
3513 3574
3514 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3575 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3515 32, PropModeReplace, 3576 32, PropModeReplace,
3516 (unsigned char *)target_list, target - target_list); 3577 (unsigned char *)target_list, target - target_list);
3517 ev.property = rq.property; 3578 ev.property = rq.property;
3518 } 3579 }
3519#if TODO // TODO 3580#if TODO // TODO
… …
3522 /* TODO: Handle MULTIPLE */ 3583 /* TODO: Handle MULTIPLE */
3523 } 3584 }
3524#endif 3585#endif
3525 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3586 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3526 { 3587 {
3527 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3588 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3528 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3589 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3529 ev.property = rq.property; 3590 ev.property = rq.property;
3530 } 3591 }
3531 else if (rq.target == XA_STRING 3592 else if (rq.target == XA_STRING
3532 || rq.target == xa[XA_TEXT] 3593 || rq.target == xa[XA_TEXT]
… …
3556 style = enc_string; 3617 style = enc_string;
3557 else if (target == xa[XA_TEXT]) 3618 else if (target == xa[XA_TEXT])
3558 style = enc_text; 3619 style = enc_text;
3559 else if (target == xa[XA_COMPOUND_TEXT]) 3620 else if (target == xa[XA_COMPOUND_TEXT])
3560 style = enc_compound_text; 3621 style = enc_compound_text;
3561#if ENABLE_FRILLS 3622#if !ENABLE_MINIMAL
3562 else if (target == xa[XA_UTF8_STRING]) 3623 else if (target == xa[XA_UTF8_STRING])
3563 style = enc_utf8; 3624 style = enc_utf8;
3564#endif 3625#endif
3565 else 3626 else
3566 { 3627 {
… …
3577 { 3638 {
3578 cl = L""; 3639 cl = L"";
3579 selectlen = 0; 3640 selectlen = 0;
3580 } 3641 }
3581 3642
3582#if ENABLE_FRILLS 3643#if !ENABLE_MINIMAL
3583 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3644 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3584 // so recode it manually 3645 // so recode it manually
3585 if (style == enc_utf8) 3646 if (style == enc_utf8)
3586 { 3647 {
3587 freect = 1; 3648 freect = 1;
… …
3590 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3651 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3591 ct.nitems = strlen ((char *)ct.value); 3652 ct.nitems = strlen ((char *)ct.value);
3592 } 3653 }
3593 else 3654 else
3594#endif 3655#endif
3595 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3656 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3596 freect = 1; 3657 freect = 1;
3597 else 3658 else
3598 { 3659 {
3599 /* if we failed to convert then send it raw */ 3660 /* if we failed to convert then send it raw */
3600 ct.value = (unsigned char *)cl; 3661 ct.value = (unsigned char *)cl;
3601 ct.nitems = selectlen; 3662 ct.nitems = selectlen;
3602 ct.encoding = target; 3663 ct.encoding = target;
3603 } 3664 }
3604 3665
3605 XChangeProperty (disp, rq.requestor, rq.property, 3666 XChangeProperty (dpy, rq.requestor, rq.property,
3606 ct.encoding, 8, PropModeReplace, 3667 ct.encoding, 8, PropModeReplace,
3607 ct.value, (int)ct.nitems); 3668 ct.value, (int)ct.nitems);
3608 ev.property = rq.property; 3669 ev.property = rq.property;
3609 3670
3610 if (freect) 3671 if (freect)
3611 XFree (ct.value); 3672 XFree (ct.value);
3612 } 3673 }
3613 3674
3614 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3675 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3615}
3616
3617/* ------------------------------------------------------------------------- *
3618 * MOUSE ROUTINES *
3619 * ------------------------------------------------------------------------- */
3620
3621/*
3622 * return col/row values corresponding to x/y pixel values
3623 */
3624void
3625rxvt_term::pixel_position (int *x, int *y)
3626{
3627 *x = Pixel2Col (*x);
3628 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3629 *y = Pixel2Row (*y);
3630 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3631} 3676}
3632 3677
3633/* ------------------------------------------------------------------------- */ 3678/* ------------------------------------------------------------------------- */
3634#ifdef USE_XIM 3679#ifdef USE_XIM
3635void 3680void
3636rxvt_term::im_set_position (XPoint &pos) 3681rxvt_term::im_set_position (XPoint &pos) NOTHROW
3637{ 3682{
3638 XWindowAttributes xwa; 3683 XWindowAttributes xwa;
3639 3684
3640 XGetWindowAttributes (display->display, vt, &xwa); 3685 XGetWindowAttributes (dpy, vt, &xwa);
3641 3686
3642 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3687 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3643 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3688 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3644} 3689}
3645#endif 3690#endif
3646 3691
3647#if ENABLE_OVERLAY 3692#if ENABLE_OVERLAY
3648void 3693void
3649rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3694rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3650{ 3695{
3651 if (nrow < 1 || ncol < 1) 3696 if (nrow < 1 || ncol < 1)
3652 return; 3697 return;
3653 3698
3654 want_refresh = 1; 3699 want_refresh = 1;
… …
3699 *rp = r; 3744 *rp = r;
3700 } 3745 }
3701} 3746}
3702 3747
3703void 3748void
3704rxvt_term::scr_overlay_off () 3749rxvt_term::scr_overlay_off () NOTHROW
3705{ 3750{
3706 if (!ov_text) 3751 if (!ov_text)
3707 return; 3752 return;
3708 3753
3709 want_refresh = 1; 3754 want_refresh = 1;
… …
3717 delete [] ov_text; ov_text = 0; 3762 delete [] ov_text; ov_text = 0;
3718 delete [] ov_rend; ov_rend = 0; 3763 delete [] ov_rend; ov_rend = 0;
3719} 3764}
3720 3765
3721void 3766void
3722rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3767rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3723{ 3768{
3724 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3769 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3725 return; 3770 return;
3726 3771
3727 x++, y++; 3772 x++, y++;
… …
3729 ov_text[y][x] = text; 3774 ov_text[y][x] = text;
3730 ov_rend[y][x] = rend; 3775 ov_rend[y][x] = rend;
3731} 3776}
3732 3777
3733void 3778void
3734rxvt_term::scr_overlay_set (int x, int y, const char *s) 3779rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3735{ 3780{
3736 while (*s) 3781 while (*s)
3737 scr_overlay_set (x++, y, *s++); 3782 scr_overlay_set (x++, y, *s++);
3738} 3783}
3739 3784
3740void 3785void
3741rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3786rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3742{ 3787{
3743 while (*s) 3788 while (*s)
3744 { 3789 {
3745 text_t t = *s++; 3790 text_t t = *s++;
3746 int width = wcwidth (t); 3791 int width = WCWIDTH (t);
3747 3792
3748 while (width--) 3793 while (width--)
3749 { 3794 {
3750 scr_overlay_set (x++, y, t); 3795 scr_overlay_set (x++, y, t);
3751 t = NOCHAR; 3796 t = NOCHAR;
3752 } 3797 }
3753 } 3798 }
3754} 3799}
3755 3800
3756void 3801void
3757rxvt_term::scr_swap_overlay () 3802rxvt_term::scr_swap_overlay () NOTHROW
3758{ 3803{
3759 if (!ov_text) 3804 if (!ov_text)
3760 return; 3805 return;
3761 3806
3762 // swap screen mem with overlay 3807 // swap screen mem with overlay

Diff Legend

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