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

Diff Legend

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