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.425 by root, Fri Jun 29 22:10:18 2012 UTC

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

Diff Legend

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