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

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

Diff Legend

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