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.216 by root, Mon Jan 9 18:51:19 2006 UTC vs.
Revision 1.309 by root, Mon Jul 21 16:51:31 2008 UTC

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