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.172 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.255 by root, Mon Jan 30 04:27:17 2006 UTC

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

Diff Legend

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