ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.177 by root, Tue Dec 20 21:49:55 2005 UTC vs.
Revision 1.437 by sf-exg, Mon Mar 25 12:28:04 2013 UTC

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

Diff Legend

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