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

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

Diff Legend

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