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.182 by root, Wed Dec 21 10:35:47 2005 UTC vs.
Revision 1.431 by root, Sun Jan 13 20:19:24 2013 UTC

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

Diff Legend

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