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

Diff Legend

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