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

Diff Legend

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