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

Diff Legend

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