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.177 by root, Tue Dec 20 21:49:55 2005 UTC vs.
Revision 1.433 by sf-exg, Thu Jan 31 08:07:14 2013 UTC

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

Diff Legend

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