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.173 by root, Mon Dec 19 02:16:24 2005 UTC vs.
Revision 1.323 by root, Tue Nov 4 23:53:29 2008 UTC

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

Diff Legend

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