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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.178 by root, Tue Dec 20 22:27:49 2005 UTC vs.
Revision 1.362 by sf-exg, Sat Jan 8 10:15:36 2011 UTC

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

Diff Legend

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