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

Diff Legend

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