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

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

Diff Legend

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