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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.177 by root, Tue Dec 20 21:49:55 2005 UTC vs.
Revision 1.365 by sf-exg, Thu Jan 27 17:37:19 2011 UTC

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

Diff Legend

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