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.184 by root, Wed Dec 21 14:23:30 2005 UTC vs.
Revision 1.433 by sf-exg, Thu Jan 31 08:07:14 2013 UTC

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

Diff Legend

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