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.176 by root, Tue Dec 20 20:58:31 2005 UTC vs.
Revision 1.453 by root, Sat Dec 13 12:24:33 2014 UTC

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

Diff Legend

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