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.192 by root, Thu Dec 22 19:25:58 2005 UTC vs.
Revision 1.323 by root, Tue Nov 4 23:53:29 2008 UTC

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