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.178 by root, Tue Dec 20 22:27:49 2005 UTC vs.
Revision 1.415 by root, Mon May 28 14:25:16 2012 UTC

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

Diff Legend

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