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