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.415 by root, Mon May 28 14:25:16 2012 UTC

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

Diff Legend

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