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

Diff Legend

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