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

Diff Legend

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