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.174 by root, Mon Dec 19 02:40:14 2005 UTC vs.
Revision 1.253 by root, Fri Jan 27 18:36:43 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{
122 if (!l.t)
123 {
124 lalloc (l);
125 col = 0;
126 width = ncol;
127 }
128
129 l.touch ();
130
121 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
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;
… …
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] = LINE_CONT1;
376
377 int qcol = 0;
378
379 for (;;)
380 {
381 int prow = lofs / prev_ncol + p; 339 int prow = lofs / prev_ncol;
382 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
383 341
342 prow = MOD (p + prow, prev_total_rows);
343
344 // we only adjust the cursor _row_ and put it into
345 // the topmost line of "long line" it was in, as
346 // this seems to upset applications/shells/readline
347 // least.
348 if (prow == ocur.row)
349 screen.cur.row = q - (total_rows - nrow);
350
351 line_t &pline = old_buf [prow];
352
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385 354
386 printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
387
388 if (len <= 0)
389 {
390 tl [qrow] = qcol;
391
392 TODO
393 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
394 ncol - qcol, DEFAULT_RSTYLE);
395
396 break;
397 }
398
399 assert (lofs < 1000);
400
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403 357
404 lofs += len; 358 lofs += len;
405 qcol += len; 359 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 } 360 }
411 else
412 lofs += ncol;
413 } 361 }
362
363 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
364 qline->is_longer (0);
365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414 } 366 }
367 while (p != pend && q > 0);
368
369 term_start = total_rows - nrow;
370 top_row = q - term_start;
371
372 // make sure all terminal lines exist
373 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 }
376 else
415 } 377 {
378 // if no scrollback exists (yet), wing, instead of wrap
379
380 for (int row = min (nrow, prev_nrow); row--; )
381 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row];
416 384
417 free (screen.text); screen.text = tp; 385 qline = pline;
418 free (screen.rend); screen.rend = rp; 386 lresize (qline);
419 free (screen.tlen); screen.tlen = tl; 387 }
420 388
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 389 for (int row = prev_nrow; row < nrow; row++)
422#endif 390 {
391 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
392 }
423 393
424 if (tabs) 394 term_start = 0;
395 }
396
397 free (old_buf);
398 delete old_ta;
399 delete old_ra;
400
401 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1);
403
425 free (tabs); 404 free (tabs);
426 } 405 }
406
407 CLEAR_ALL_SELECTION ();
427 408
428 prev_nrow = nrow; 409 prev_nrow = nrow;
429 prev_ncol = ncol; 410 prev_ncol = ncol;
430 411
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 413
433 for (p = 0; p < ncol; p++) 414 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 415 tabs [col] = col % TABSIZE == 0;
416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
435 419
436 tt_winch (); 420 tt_winch ();
437}
438 421
439void 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
440rxvt_term::scr_reset_realloc ()
441{
442 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 scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle);
686 646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
658
659 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 660 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 } 661 {
702 else if (j >= row1 && j <= row2)
703 {
704 /* move selected region too */
705 selection.beg.row -= count; 662 selection.beg.row -= count;
706 selection.end.row -= count; 663 selection.end.row -= count;
707 selection.mark.row -= count; 664 selection.mark.row -= count;
665
666 if (selection.beg.row < top_row
667 || selection.end.row < top_row
668 || selection.mark.row < top_row)
669 {
670 CLEAR_ALL_SELECTION ();
671 selection.op = SELECTION_CLEAR;
672 }
673 }
674
675 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer)
677 && view_start != 0
678 && view_start != -saveLines)
679 scr_page (UP, count);
680
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
682 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
683 }
684 else
685 {
686 if (selection.op && current_screen == selection.screen)
708 } 687 {
709 } 688 if ((selection.beg.row < row1 && selection.end.row > row1)
689 || (selection.beg.row < row2 && selection.end.row > row2)
690 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
691 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
692 || (selection.end.row - count < row1 && selection.end.row >= row1)
693 || (selection.end.row - count > row2 && selection.end.row <= row2))
694 {
695 CLEAR_ALL_SELECTION ();
696 selection.op = SELECTION_CLEAR;
697 }
698 else if (selection.end.row >= row1 && selection.end.row <= row2)
699 {
700 /* move selected region too */
701 selection.beg.row -= count;
702 selection.end.row -= count;
703 selection.mark.row -= count;
704
705 selection_check (0);
706 }
707 }
710 708
711 selection_check (0); /* _after_ nscrolled update */ 709 // use a simple and robust scrolling algorithm, this
710 // part of scr_scroll_text is not time-critical.
712 711
713 num_scr += count;
714 j = count;
715
716 if (count < 0)
717 count = -count;
718
719 i = row2 - row1 + 1; 712 int rows = row2 - row1 + 1;
720 MIN_IT (count, i);
721 713
722 if (j > 0) 714 min_it (count, rows);
715
716 line_t *temp_buf = row_buf + total_rows;
717
718 for (int row = 0; row < rows; row++)
719 {
720 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
721
722 if (!IN_RANGE_EXC (row + count, 0, rows))
723 scr_blank_screen_mem (temp_buf [row], rstyle);
724 }
725
726 for (int row = 0; row < rows; row++)
727 ROW(row1 + row) = temp_buf [row];
723 { 728 }
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 729
760 return count; 730 return count;
761} 731}
762 732
763/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
764/* 734/*
765 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
766 */ 736 */
767void 737void
768rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 738rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
769{ 739{
770 if (len <= 0) /* sanity */ 740 if (len <= 0) /* sanity */
771 return; 741 return;
772 742
773 unsigned char checksel; 743 unsigned char checksel;
774 unicode_t c; 744 unicode_t c;
775 int row, last_col; 745 int ncol = this->ncol;
776 const unicode_t *strend = str + len; 746 const wchar_t *strend = str + len;
777 747
778 want_refresh = 1; 748 want_refresh = 1;
779 ZERO_SCROLLBACK (); 749 ZERO_SCROLLBACK ();
780 last_col = ncol;
781 750
782 if (nlines > 0) 751 if (minlines > 0)
783 { 752 {
784 nlines += screen.cur.row - screen.bscroll; 753 minlines += screen.cur.row - screen.bscroll;
754 min_it (minlines, screen.cur.row - top_row);
755
785 if ((nlines > 0) 756 if (minlines > 0
786 && (screen.tscroll == 0) 757 && screen.tscroll == 0
787 && (screen.bscroll == (nrow - 1))) 758 && screen.bscroll == nrow - 1)
788 { 759 {
789 /* _at least_ this many lines need to be scrolled */ 760 /* _at least_ this many lines need to be scrolled */
790 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 761 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
791 screen.cur.row -= nlines; 762 screen.cur.row -= minlines;
792 } 763 }
793 } 764 }
794 765
795#ifdef DEBUG_STRICT 766#ifdef DEBUG_STRICT
796 assert (screen.cur.col < last_col); 767 assert (screen.cur.col < ncol);
797 assert ((screen.cur.row < nrow) 768 assert (screen.cur.row < nrow
798 && (screen.cur.row >= - (int32_t)nscrolled)); 769 && 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 770#endif
804 row = screen.cur.row + saveLines; 771 int row = screen.cur.row;
805 772
806 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 773 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 774
808 line_t *line = save + row; 775 line_t *line = &ROW(row);
809 776
810 while (str < strend) 777 while (str < strend)
811 { 778 {
812 c = *str++; 779 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
813 780
814 if (c < 0x20) 781 if (c < 0x20)
815 if (c == C0_LF) 782 if (c == C0_LF)
816 { 783 {
817 if (!line->is_longer ()) /* XXX: think about this */
818 MAX_IT (line->l, screen.cur.col); 784 max_it (line->l, screen.cur.col);
819 785
820 screen.flags &= ~Screen_WrapNext; 786 screen.flags &= ~Screen_WrapNext;
821 787
822 if (screen.cur.row == screen.bscroll) 788 if (screen.cur.row == screen.bscroll)
823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 789 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
824 else if (screen.cur.row < (nrow - 1)) 790 else if (screen.cur.row < (nrow - 1))
825 row = (++screen.cur.row) + saveLines; 791 row = ++screen.cur.row;
826 792
827 line = save + row; /* _must_ refresh */ 793 line = &ROW(row); /* _must_ refresh */
828 continue; 794 continue;
829 } 795 }
830 else if (c == C0_CR) 796 else if (c == C0_CR)
831 { 797 {
832 if (!line->is_longer ()) /* XXX: think about this */
833 MAX_IT (line->l, screen.cur.col); 798 max_it (line->l, screen.cur.col);
834 799
835 screen.flags &= ~Screen_WrapNext; 800 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 801 screen.cur.col = 0;
837 continue; 802 continue;
838 } 803 }
… …
855 CLEAR_SELECTION (); 820 CLEAR_SELECTION ();
856 } 821 }
857 822
858 if (screen.flags & Screen_WrapNext) 823 if (screen.flags & Screen_WrapNext)
859 { 824 {
860 line->set_is_longer ();
861
862 scr_do_wrap (); 825 scr_do_wrap ();
863 826
827 line->l = ncol;
828 line->is_longer (1);
829
864 row = screen.cur.row + saveLines; 830 row = screen.cur.row;
865 line = save + row; /* _must_ refresh */ 831 line = &ROW(row); /* _must_ refresh */
866 } 832 }
867 833
868 // some utf-8 decoders "decode" surrogate characters: let's fix this. 834 // some utf-8 decoders "decode" surrogate characters: let's fix this.
869 if (IN_RANGE (c, 0xd800, 0xdfff)) 835 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
870 c = 0xfffd; 836 c = 0xfffd;
871 837
872 // rely on wcwidth to tell us the character width, at least for non-latin1 838 // rely on wcwidth to tell us the character width, do wcwidth before
873 // do wcwidth before further replacements, as wcwidth might return -1 839 // 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 840 // drawing characters below as they might be invalid in the current
875 // locale. 841 // locale.
876 int width = c < 0x100 ? 1 : wcwidth (c); 842 int width = WCWIDTH (c);
877 843
878 if (charsets[screen.charset] == '0') // DEC SPECIAL 844 if (charsets [screen.charset] == '0') // DEC SPECIAL
879 { 845 {
880 // vt100 special graphics and line drawing 846 // vt100 special graphics and line drawing
881 // 5f-7e standard vt100 847 // 5f-7e standard vt100
882 // 40-5e rxvt extension for extra curses acs chars 848 // 40-5e rxvt extension for extra curses acs chars
883 static uint16_t vt100_0[62] = { // 41 .. 7e 849 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
935 } 901 }
936 902
937 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
938 904
939 // if the character doesn't fit into the remaining columns... 905 // if the character doesn't fit into the remaining columns...
940 if (screen.cur.col > last_col - width && last_col >= width) 906 if (screen.cur.col > ncol - width && ncol >= width)
941 { 907 {
942 // ...output spaces 908 // ...output spaces
943 c = ' '; 909 c = ' ';
944 // and try the same character next loop iteration 910 // and try the same character next loop iteration
945 --str; 911 --str;
946 } 912 }
947 913
914 line->touch ();
915
948 do 916 do
949 { 917 {
950 line->t[screen.cur.col] = c; 918 line->t[screen.cur.col] = c;
951 line->r[screen.cur.col] = rend; 919 line->r[screen.cur.col] = rend;
952 920
953 if (screen.cur.col < last_col - 1) 921 if (screen.cur.col < ncol - 1)
954 screen.cur.col++; 922 screen.cur.col++;
955 else 923 else
956 { 924 {
957 line->l = last_col; 925 line->l = ncol;
958 if (screen.flags & Screen_Autowrap) 926 if (screen.flags & Screen_Autowrap)
959 screen.flags |= Screen_WrapNext; 927 screen.flags |= Screen_WrapNext;
960 break; 928 break;
961 } 929 }
962 930
… …
964 } 932 }
965 while (--width > 0); 933 while (--width > 0);
966 934
967 // pad with spaces when overwriting wide character with smaller one 935 // pad with spaces when overwriting wide character with smaller one
968 if (!width) 936 if (!width)
937 {
938 line->touch ();
939
969 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 940 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
970 { 941 {
971 line->t[c] = ' '; 942 line->t[c] = ' ';
972 line->r[c] = rend; 943 line->r[c] = rend;
973 } 944 }
945 }
974 } 946 }
975 else // width == 0 947 else // width == 0
976 { 948 {
977#if ENABLE_COMBINING 949#if ENABLE_COMBINING
978 // handle combining characters 950 // handle combining characters
979 // we just tag the accent on the previous on-screen character. 951 // we just tag the accent on the previous on-screen character.
980 // this is arguably not correct, but also arguably not wrong. 952 // this is arguably not correct, but also arguably not wrong.
981 // we don't handle double-width characters nicely yet. 953 // we don't handle double-width characters nicely yet.
954 line_t *linep;
982 text_t *tp; 955 text_t *tp;
983 rend_t *rp; 956 rend_t *rp;
984 957
985 if (screen.cur.col > 0) 958 if (screen.cur.col > 0)
986 { 959 {
960 linep = line;
987 tp = line->t + screen.cur.col - 1; 961 tp = line->t + screen.cur.col - 1;
988 rp = line->r + screen.cur.col - 1; 962 rp = line->r + screen.cur.col - 1;
989
990 while (*tp == NOCHAR && tp > line->t)
991 tp--, rp--;
992 } 963 }
993 else if (screen.cur.row > 0 964 else if (screen.cur.row > 0
994 && save [screen.cur.row - 1 + saveLines].is_longer ()) 965 && ROW(screen.cur.row - 1).is_longer ())
995 { 966 {
996 line_t *line = save + (screen.cur.row - 1 + saveLines); 967 linep = &ROW(screen.cur.row - 1);
997
998 tp = line->t + last_col - 1; 968 tp = line->t + ncol - 1;
999 rp = line->r + last_col - 1; 969 rp = line->r + ncol - 1;
1000
1001 while (*tp == NOCHAR && tp > line->t)
1002 tp--, rp--;
1003 } 970 }
1004 else 971 else
1005 continue; 972 continue;
973
974 linep->touch ();
975
976 while (*tp == NOCHAR && tp > linep->t)
977 tp--, rp--;
1006 978
1007 // first try to find a precomposed character 979 // first try to find a precomposed character
1008 unicode_t n = rxvt_compose (*tp, c); 980 unicode_t n = rxvt_compose (*tp, c);
1009 if (n == NOCHAR) 981 if (n == NOCHAR)
1010 n = rxvt_composite.compose (*tp, c); 982 n = rxvt_composite.compose (*tp, c);
… …
1013 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 985 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1014#endif 986#endif
1015 } 987 }
1016 } 988 }
1017 989
1018 if (!line->is_longer ()) /* XXX: think about this */
1019 MAX_IT (line->l, screen.cur.col); 990 max_it (line->l, screen.cur.col);
1020 991
1021#ifdef DEBUG_STRICT 992#ifdef DEBUG_STRICT
1022 assert (screen.cur.row >= 0); 993 assert (screen.cur.row >= 0);
1023#else /* drive with your eyes closed */
1024 MAX_IT (screen.cur.row, 0);
1025#endif 994#endif
1026} 995}
1027 996
1028/* ------------------------------------------------------------------------- */ 997/* ------------------------------------------------------------------------- */
1029/* 998/*
1030 * Process Backspace. Move back the cursor back a position, wrap if have to 999 * Process Backspace. Move back the cursor back a position, wrap if have to
1031 * XTERM_SEQ: CTRL-H 1000 * XTERM_SEQ: CTRL-H
1032 */ 1001 */
1033void 1002void
1034rxvt_term::scr_backspace () 1003rxvt_term::scr_backspace () NOTHROW
1035{ 1004{
1036 want_refresh = 1; 1005 want_refresh = 1;
1037 1006
1038 if (screen.cur.col == 0) 1007 if (screen.cur.col == 0)
1039 { 1008 {
… …
1057 * Process Horizontal Tab 1026 * Process Horizontal Tab
1058 * count: +ve = forward; -ve = backwards 1027 * count: +ve = forward; -ve = backwards
1059 * XTERM_SEQ: CTRL-I 1028 * XTERM_SEQ: CTRL-I
1060 */ 1029 */
1061void 1030void
1062rxvt_term::scr_tab (int count, bool ht) 1031rxvt_term::scr_tab (int count, bool ht) NOTHROW
1063{ 1032{
1064 int i, x; 1033 int i, x;
1065 1034
1066 want_refresh = 1; 1035 want_refresh = 1;
1067 i = x = screen.cur.col; 1036 i = x = screen.cur.col;
1068 1037
1069 if (count == 0) 1038 if (count == 0)
1070 return; 1039 return;
1071 else if (count > 0) 1040 else if (count > 0)
1072 { 1041 {
1073 int row = saveLines + screen.cur.row; 1042 line_t &l = ROW(screen.cur.row);
1074
1075 line_t &l = save[row];
1076 rend_t base_rend = l.r[i]; 1043 rend_t base_rend = l.r[i];
1077 ht &= l.t[i] == ' '; 1044 ht &= l.t[i] == ' ';
1078 1045
1079 for (; ++i < ncol; ) 1046 for (; ++i < ncol; )
1080 if (tabs[i]) 1047 if (tabs[i])
1081 { 1048 {
1082 x = i; 1049 x = i;
1050
1083 if (!--count) 1051 if (!--count)
1084 break; 1052 break;
1085 } 1053 }
1086 else 1054 else
1087 ht &= l.t[i] == ' ' 1055 ht &= l.t[i] == ' '
… …
1090 if (count) 1058 if (count)
1091 x = ncol - 1; 1059 x = ncol - 1;
1092 1060
1093 // store horizontal tab commands as characters inside the text 1061 // store horizontal tab commands as characters inside the text
1094 // buffer so they can be selected and pasted. 1062 // buffer so they can be selected and pasted.
1095 if (ht && options & Opt_pastableTabs) 1063 if (ht && OPTION (Opt_pastableTabs))
1096 { 1064 {
1097 base_rend = SET_FONT (base_rend, 0); 1065 base_rend = SET_FONT (base_rend, 0);
1098 1066
1099 if (!l.is_longer ()) /* XXX: think about this */ 1067 l.touch (x);
1100 MAX_IT (l.l, x);
1101 1068
1102 i = screen.cur.col; 1069 i = screen.cur.col;
1103 1070
1104 l.t[i] = '\t'; 1071 l.t[i] = '\t';
1105 l.r[i] = base_rend; 1072 l.r[i] = base_rend;
… …
1136 * Move cursor left in row. If we're at the left boundary, shift everything 1103 * Move cursor left in row. If we're at the left boundary, shift everything
1137 * in that row right. Clear left column. 1104 * in that row right. Clear left column.
1138 */ 1105 */
1139#if ENABLE_FRILLS 1106#if ENABLE_FRILLS
1140void 1107void
1141rxvt_term::scr_backindex () 1108rxvt_term::scr_backindex () NOTHROW
1142{ 1109{
1143 if (screen.cur.col > 0) 1110 if (screen.cur.col > 0)
1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1111 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145 else 1112 else
1146 {
1147 if (!save[screen.cur.row + saveLines].l)
1148 return; /* um, yeah? */
1149
1150 scr_insdel_chars (1, INSERT); 1113 scr_insdel_chars (1, INSERT);
1151 }
1152} 1114}
1153#endif 1115#endif
1154/* ------------------------------------------------------------------------- */ 1116/* ------------------------------------------------------------------------- */
1155/* 1117/*
1156 * Process DEC Forward Index 1118 * Process DEC Forward Index
… …
1158 * Move cursor right in row. If we're at the right boundary, shift everything 1120 * Move cursor right in row. If we're at the right boundary, shift everything
1159 * in that row left. Clear right column. 1121 * in that row left. Clear right column.
1160 */ 1122 */
1161#if ENABLE_FRILLS 1123#if ENABLE_FRILLS
1162void 1124void
1163rxvt_term::scr_forwardindex () 1125rxvt_term::scr_forwardindex () NOTHROW
1164{ 1126{
1165 int row;
1166
1167 if (screen.cur.col < ncol - 1) 1127 if (screen.cur.col < ncol - 1)
1168 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1128 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1169 else 1129 else
1170 { 1130 {
1171 row = screen.cur.row + saveLines; 1131 line_t &l = ROW(screen.cur.row);
1172 1132
1173 if (!save[row].l) 1133 l.touch ();
1174 return; /* um, yeah? */ 1134 l.is_longer (0);
1175
1176 if (save[row].is_longer ()) //TODO//FIXME//LEN
1177 save[row].l = ncol;
1178 1135
1179 scr_gotorc (0, 0, R_RELATIVE); 1136 scr_gotorc (0, 0, R_RELATIVE);
1180 scr_insdel_chars (1, DELETE); 1137 scr_insdel_chars (1, DELETE);
1181 scr_gotorc (0, ncol - 1, R_RELATIVE); 1138 scr_gotorc (0, ncol - 1, R_RELATIVE);
1182 } 1139 }
… …
1186/* ------------------------------------------------------------------------- */ 1143/* ------------------------------------------------------------------------- */
1187/* 1144/*
1188 * Goto Row/Column 1145 * Goto Row/Column
1189 */ 1146 */
1190void 1147void
1191rxvt_term::scr_gotorc (int row, int col, int relative) 1148rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1192{ 1149{
1193 want_refresh = 1; 1150 want_refresh = 1;
1194 ZERO_SCROLLBACK (); 1151 ZERO_SCROLLBACK ();
1195 1152
1196 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1153 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1197 MAX_IT (screen.cur.col, 0); 1154 clamp_it (screen.cur.col, 0, ncol - 1);
1198 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1199 1155
1200 screen.flags &= ~Screen_WrapNext; 1156 screen.flags &= ~Screen_WrapNext;
1201 1157
1202 if (relative & R_RELATIVE) 1158 if (relative & R_RELATIVE)
1203 { 1159 {
… …
1221 else 1177 else
1222 { 1178 {
1223 if (screen.flags & Screen_Relative) 1179 if (screen.flags & Screen_Relative)
1224 { /* relative origin mode */ 1180 { /* relative origin mode */
1225 screen.cur.row = row + screen.tscroll; 1181 screen.cur.row = row + screen.tscroll;
1226 MIN_IT (screen.cur.row, screen.bscroll); 1182 min_it (screen.cur.row, screen.bscroll);
1227 } 1183 }
1228 else 1184 else
1229 screen.cur.row = row; 1185 screen.cur.row = row;
1230 } 1186 }
1231 1187
1232 MAX_IT (screen.cur.row, 0); 1188 clamp_it (screen.cur.row, 0, nrow - 1);
1233 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1234} 1189}
1235 1190
1236/* ------------------------------------------------------------------------- */ 1191/* ------------------------------------------------------------------------- */
1237/* 1192/*
1238 * direction should be UP or DN 1193 * direction should be UP or DN
1239 */ 1194 */
1240void 1195void
1241rxvt_term::scr_index (enum page_dirn direction) 1196rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1242{ 1197{
1243 int dirn; 1198 int dirn;
1244 1199
1245 want_refresh = 1; 1200 want_refresh = 1;
1246 ZERO_SCROLLBACK (); 1201 ZERO_SCROLLBACK ();
… …
1249 1204
1250 screen.flags &= ~Screen_WrapNext; 1205 screen.flags &= ~Screen_WrapNext;
1251 1206
1252 if ((screen.cur.row == screen.bscroll && direction == UP) 1207 if ((screen.cur.row == screen.bscroll && direction == UP)
1253 || (screen.cur.row == screen.tscroll && direction == DN)) 1208 || (screen.cur.row == screen.tscroll && direction == DN))
1254 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1209 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1255 else 1210 else
1256 screen.cur.row += dirn; 1211 screen.cur.row += dirn;
1257 1212
1258 MAX_IT (screen.cur.row, 0); 1213 clamp_it (screen.cur.row, 0, nrow - 1);
1259 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1260 selection_check (0); 1214 selection_check (0);
1261} 1215}
1262 1216
1263/* ------------------------------------------------------------------------- */ 1217/* ------------------------------------------------------------------------- */
1264/* 1218/*
… …
1266 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1220 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1267 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1221 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1268 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1222 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1269 */ 1223 */
1270void 1224void
1271rxvt_term::scr_erase_line (int mode) 1225rxvt_term::scr_erase_line (int mode) NOTHROW
1272{ 1226{
1273 unsigned int row, col, num; 1227 unsigned int col, num;
1274 1228
1275 want_refresh = 1; 1229 want_refresh = 1;
1276 ZERO_SCROLLBACK (); 1230 ZERO_SCROLLBACK ();
1277 1231
1278 selection_check (1); 1232 selection_check (1);
1279 1233
1280 row = saveLines + screen.cur.row; 1234 line_t &line = ROW(screen.cur.row);
1235
1236 line.touch ();
1237 line.is_longer (0);
1281 1238
1282 switch (mode) 1239 switch (mode)
1283 { 1240 {
1284 case 0: /* erase to end of line */ 1241 case 0: /* erase to end of line */
1285 col = screen.cur.col; 1242 col = screen.cur.col;
1286 num = ncol - col; 1243 num = ncol - col;
1287 MIN_IT (save[row].l, (int16_t)col); 1244 min_it (line.l, col);
1288 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1245 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1289 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1246 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1290 CLEAR_SELECTION (); 1247 CLEAR_SELECTION ();
1291 break; 1248 break;
1292 case 1: /* erase to beginning of line */ 1249 case 1: /* erase to beginning of line */
… …
1297 CLEAR_SELECTION (); 1254 CLEAR_SELECTION ();
1298 break; 1255 break;
1299 case 2: /* erase whole line */ 1256 case 2: /* erase whole line */
1300 col = 0; 1257 col = 0;
1301 num = ncol; 1258 num = ncol;
1302 save[row].l = 0; 1259 line.l = 0;
1303 if (selection.beg.row <= screen.cur.row 1260 if (selection.beg.row <= screen.cur.row
1304 && selection.end.row >= screen.cur.row) 1261 && selection.end.row >= screen.cur.row)
1305 CLEAR_SELECTION (); 1262 CLEAR_SELECTION ();
1306 break; 1263 break;
1307 default: 1264 default:
1308 return; 1265 return;
1309 } 1266 }
1310 1267
1311 if (save[row].t)
1312 scr_blank_line (save[row], col, num, rstyle); 1268 scr_blank_line (line, col, num, rstyle);
1313 else
1314 scr_blank_screen_mem (save[row], rstyle);
1315} 1269}
1316 1270
1317/* ------------------------------------------------------------------------- */ 1271/* ------------------------------------------------------------------------- */
1318/* 1272/*
1319 * Erase part of whole of the screen 1273 * Erase part of whole of the screen
1320 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1274 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1321 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1275 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1322 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1276 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1323 */ 1277 */
1324void 1278void
1325rxvt_term::scr_erase_screen (int mode) 1279rxvt_term::scr_erase_screen (int mode) NOTHROW
1326{ 1280{
1327 int num; 1281 int num;
1328 int32_t row, row_offset; 1282 int32_t row;
1329 rend_t ren; 1283 rend_t ren;
1330 XGCValues gcvalue; 1284 XGCValues gcvalue;
1331 1285
1332 want_refresh = 1; 1286 want_refresh = 1;
1333 ZERO_SCROLLBACK (); 1287 ZERO_SCROLLBACK ();
1334
1335 row_offset = (int32_t)saveLines;
1336 1288
1337 switch (mode) 1289 switch (mode)
1338 { 1290 {
1339 case 0: /* erase to end of screen */ 1291 case 0: /* erase to end of screen */
1340 selection_check (1); 1292 selection_check (1);
… …
1364 CLEAR_SELECTION (); 1316 CLEAR_SELECTION ();
1365 1317
1366 if (row >= nrow) /* Out Of Bounds */ 1318 if (row >= nrow) /* Out Of Bounds */
1367 return; 1319 return;
1368 1320
1369 MIN_IT (num, (nrow - row)); 1321 min_it (num, nrow - row);
1370 1322
1371 if (rstyle & (RS_RVid | RS_Uline)) 1323 if (rstyle & (RS_RVid | RS_Uline))
1372 ren = (rend_t) ~RS_None; 1324 ren = (rend_t) ~RS_None;
1373 else if (GET_BASEBG (rstyle) == Color_bg) 1325 else if (GET_BASEBG (rstyle) == Color_bg)
1374 { 1326 {
… …
1376 CLEAR_ROWS (row, num); 1328 CLEAR_ROWS (row, num);
1377 } 1329 }
1378 else 1330 else
1379 { 1331 {
1380 ren = rstyle & (RS_fgMask | RS_bgMask); 1332 ren = rstyle & (RS_fgMask | RS_bgMask);
1381 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1333 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1382 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1334 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1383 ERASE_ROWS (row, num); 1335 ERASE_ROWS (row, num);
1384 gcvalue.foreground = pix_colors[Color_fg]; 1336 gcvalue.foreground = pix_colors[Color_fg];
1385 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1337 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1386 } 1338 }
1387 1339
1388 for (; num--; row++) 1340 for (; num--; row++)
1389 { 1341 {
1390 scr_blank_screen_mem (save[row + row_offset], rstyle); 1342 scr_blank_screen_mem (ROW(row), rstyle);
1391 save[row + row_offset].l = 0;
1392 scr_blank_line (drawn[row], 0, ncol, ren); 1343 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1393 } 1344 }
1394} 1345}
1395 1346
1396#if ENABLE_FRILLS 1347#if ENABLE_FRILLS
1397void 1348void
1398rxvt_term::scr_erase_savelines () 1349rxvt_term::scr_erase_savelines () NOTHROW
1399{ 1350{
1400 want_refresh = 1; 1351 want_refresh = 1;
1401 ZERO_SCROLLBACK (); 1352 ZERO_SCROLLBACK ();
1402 1353
1403 nscrolled = 0; 1354 top_row = 0;
1404} 1355}
1405#endif 1356#endif
1406 1357
1407/* ------------------------------------------------------------------------- */ 1358/* ------------------------------------------------------------------------- */
1408/* 1359/*
1409 * Fill the screen with `E's 1360 * Fill the screen with `E's
1410 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1361 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1411 */ 1362 */
1412void 1363void
1413rxvt_term::scr_E () 1364rxvt_term::scr_E () NOTHROW
1414{ 1365{
1415 int i, j, k;
1416 rend_t *r1, fs; 1366 rend_t fs;
1417 1367
1418 want_refresh = 1; 1368 want_refresh = 1;
1419 ZERO_SCROLLBACK (); 1369 ZERO_SCROLLBACK ();
1420 1370
1421 num_scr_allow = 0; 1371 num_scr_allow = 0;
1422 selection_check (3); 1372 selection_check (3);
1423 1373
1424 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1374 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1425 for (k = saveLines, i = nrow; i--; k++) 1375 for (int row = nrow; row--; )
1426 { 1376 {
1427 line_t &line = save[k]; 1377 line_t &line = ROW(row);
1428 1378
1429 fill_text (line.t, 'E', ncol); 1379 fill_text (line.t, 'E', ncol);
1380 rend_t *r1 = line.r;
1430 1381
1431 for (r1 = line.r, j = ncol; j--; ) 1382 for (int j = ncol; j--; )
1432 *r1++ = fs; 1383 *r1++ = fs;
1433 1384
1434 line.l = ncol; /* make the `E's selectable */ 1385 line.is_longer (0);
1386 line.touch (ncol);
1435 } 1387 }
1436} 1388}
1437 1389
1438/* ------------------------------------------------------------------------- */ 1390/* ------------------------------------------------------------------------- */
1439/* 1391/*
1440 * Insert/Delete <count> lines 1392 * Insert/Delete <count> lines
1441 */ 1393 */
1442void 1394void
1443rxvt_term::scr_insdel_lines (int count, int insdel) 1395rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1444{ 1396{
1445 int end; 1397 int end;
1446 1398
1447 ZERO_SCROLLBACK (); 1399 ZERO_SCROLLBACK ();
1448 1400
… …
1460 count = end; 1412 count = end;
1461 } 1413 }
1462 1414
1463 scr_do_wrap (); 1415 scr_do_wrap ();
1464 1416
1465 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1417 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1466} 1418}
1467 1419
1468/* ------------------------------------------------------------------------- */ 1420/* ------------------------------------------------------------------------- */
1469/* 1421/*
1470 * Insert/Delete <count> characters from the current position 1422 * Insert/Delete <count> characters from the current position
1471 */ 1423 */
1472void 1424void
1473rxvt_term::scr_insdel_chars (int count, int insdel) 1425rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1474{ 1426{
1475 int col, row; 1427 int col, row;
1476 rend_t tr; 1428 rend_t tr;
1477 1429
1478 want_refresh = 1; 1430 want_refresh = 1;
… …
1482 return; 1434 return;
1483 1435
1484 scr_do_wrap (); 1436 scr_do_wrap ();
1485 1437
1486 selection_check (1); 1438 selection_check (1);
1487 MIN_IT (count, (ncol - screen.cur.col)); 1439 min_it (count, ncol - screen.cur.col);
1488 1440
1489 row = screen.cur.row + saveLines; 1441 row = screen.cur.row;
1490 1442
1491 line_t *line = save + row; 1443 line_t *line = &ROW(row);
1444
1445 line->touch ();
1446 line->is_longer (0);
1492 1447
1493 switch (insdel) 1448 switch (insdel)
1494 { 1449 {
1495 case INSERT: 1450 case INSERT:
1496 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1451 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1497 { 1452 {
1498 line->t[col] = line->t[col - count]; 1453 line->t[col] = line->t[col - count];
1499 line->r[col] = line->r[col - count]; 1454 line->r[col] = line->r[col - count];
1500 } 1455 }
1501 1456
1502 if (!line->is_longer ()) 1457 line->l = min (line->l + count, ncol);
1503 {
1504 line->l += count;
1505 MIN_IT (line->l, ncol);
1506 }
1507 1458
1508 if (selection.op && current_screen == selection.screen 1459 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1460 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1461 {
1511 if (selection.end.row != screen.cur.row 1462 if (selection.end.row != screen.cur.row
… …
1517 selection.mark.col += count; /* XXX: yes? */ 1468 selection.mark.col += count; /* XXX: yes? */
1518 selection.end.col += count; 1469 selection.end.col += count;
1519 } 1470 }
1520 } 1471 }
1521 1472
1522 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1473 scr_blank_line (*line, screen.cur.col, count, rstyle);
1523 break; 1474 break;
1524 1475
1525 case ERASE: 1476 case ERASE:
1526 screen.cur.col += count; /* don't worry if > ncol */ 1477 screen.cur.col += count; /* don't worry if > ncol */
1527 selection_check (1); 1478 selection_check (1);
1528 screen.cur.col -= count; 1479 screen.cur.col -= count;
1480
1481 line->l = max (line->l - count, 0);
1529 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1482 scr_blank_line (*line, screen.cur.col, count, rstyle);
1530 break; 1483 break;
1531 1484
1532 case DELETE: 1485 case DELETE:
1533 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1486 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1534 1487
… …
1536 { 1489 {
1537 line->t[col] = line->t[col + count]; 1490 line->t[col] = line->t[col + count];
1538 line->r[col] = line->r[col + count]; 1491 line->r[col] = line->r[col + count];
1539 } 1492 }
1540 1493
1494 line->l = max (line->l - count, 0);
1541 scr_blank_line (*line, ncol - count, count, tr); 1495 scr_blank_line (*line, ncol - count, count, tr);
1542
1543 if (line->is_longer ()) /* break line continuation */
1544 line->l = ncol;
1545
1546 line->l -= count;
1547 MAX_IT (line->l, 0);
1548 1496
1549 if (selection.op && current_screen == selection.screen 1497 if (selection.op && current_screen == selection.screen
1550 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1498 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1551 { 1499 {
1552 if (selection.end.row != screen.cur.row 1500 if (selection.end.row != screen.cur.row
… …
1570/* 1518/*
1571 * Set the scrolling region 1519 * Set the scrolling region
1572 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1520 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1573 */ 1521 */
1574void 1522void
1575rxvt_term::scr_scroll_region (int top, int bot) 1523rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1576{ 1524{
1577 MAX_IT (top, 0); 1525 max_it (top, 0);
1578 MIN_IT (bot, (int)nrow - 1); 1526 min_it (bot, nrow - 1);
1579 1527
1580 if (top > bot) 1528 if (top > bot)
1581 return; 1529 return;
1582 1530
1583 screen.tscroll = top; 1531 screen.tscroll = top;
… …
1590 * Make the cursor visible/invisible 1538 * Make the cursor visible/invisible
1591 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1539 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1592 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1540 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1593 */ 1541 */
1594void 1542void
1595rxvt_term::scr_cursor_visible (int mode) 1543rxvt_term::scr_cursor_visible (int mode) NOTHROW
1596{ 1544{
1597 want_refresh = 1; 1545 want_refresh = 1;
1598 1546
1599 if (mode) 1547 if (mode)
1600 screen.flags |= Screen_VisibleCursor; 1548 screen.flags |= Screen_VisibleCursor;
… …
1607 * Set/unset automatic wrapping 1555 * Set/unset automatic wrapping
1608 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1556 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1609 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1557 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1610 */ 1558 */
1611void 1559void
1612rxvt_term::scr_autowrap (int mode) 1560rxvt_term::scr_autowrap (int mode) NOTHROW
1613{ 1561{
1614 if (mode) 1562 if (mode)
1615 screen.flags |= Screen_Autowrap; 1563 screen.flags |= Screen_Autowrap;
1616 else 1564 else
1617 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1565 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1626 * and the cursor cannot be moved outside. 1574 * and the cursor cannot be moved outside.
1627 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1575 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1628 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1576 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1629 */ 1577 */
1630void 1578void
1631rxvt_term::scr_relative_origin (int mode) 1579rxvt_term::scr_relative_origin (int mode) NOTHROW
1632{ 1580{
1633 if (mode) 1581 if (mode)
1634 screen.flags |= Screen_Relative; 1582 screen.flags |= Screen_Relative;
1635 else 1583 else
1636 screen.flags &= ~Screen_Relative; 1584 screen.flags &= ~Screen_Relative;
… …
1643 * Set insert/replace mode 1591 * Set insert/replace mode
1644 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1592 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1645 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1593 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1646 */ 1594 */
1647void 1595void
1648rxvt_term::scr_insert_mode (int mode) 1596rxvt_term::scr_insert_mode (int mode) NOTHROW
1649{ 1597{
1650 if (mode) 1598 if (mode)
1651 screen.flags |= Screen_Insert; 1599 screen.flags |= Screen_Insert;
1652 else 1600 else
1653 screen.flags &= ~Screen_Insert; 1601 screen.flags &= ~Screen_Insert;
… …
1659 * XTERM_SEQ: Set tab at current column : ESC H 1607 * XTERM_SEQ: Set tab at current column : ESC H
1660 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1608 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1661 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1609 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1662 */ 1610 */
1663void 1611void
1664rxvt_term::scr_set_tab (int mode) 1612rxvt_term::scr_set_tab (int mode) NOTHROW
1665{ 1613{
1666 if (mode < 0) 1614 if (mode < 0)
1667 memset (tabs, 0, ncol * sizeof (char)); 1615 memset (tabs, 0, ncol * sizeof (char));
1668 else if (screen.cur.col < ncol) 1616 else if (screen.cur.col < ncol)
1669 tabs[screen.cur.col] = (mode ? 1 : 0); 1617 tabs [screen.cur.col] = !!mode;
1670} 1618}
1671 1619
1672/* ------------------------------------------------------------------------- */ 1620/* ------------------------------------------------------------------------- */
1673/* 1621/*
1674 * Set reverse/normal video 1622 * Set reverse/normal video
1675 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1623 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1676 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1624 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1677 */ 1625 */
1678void 1626void
1679rxvt_term::scr_rvideo_mode (int mode) 1627rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1680{ 1628{
1681 XGCValues gcvalue; 1629 rvideo_mode = on;
1682 1630
1631#ifndef NO_BELL
1632 on ^= rvideo_bell;
1633#endif
1634
1683 if (rvideo != mode) 1635 if (rvideo_state != on)
1684 { 1636 {
1685 rvideo = mode; 1637 rvideo_state = on;
1638
1686 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1639 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#if XPM_BACKGROUND 1640#if XPM_BACKGROUND
1688 if (bgPixmap.pixmap == None) 1641 if (bgPixmap.pixmap == None)
1689#endif 1642#endif
1690#if TRANSPARENT 1643#if TRANSPARENT
1691 if (! (options & Opt_transparent) || am_transparent == 0) 1644 if (!OPTION (Opt_transparent) || am_transparent == 0)
1692#endif 1645#endif
1693 XSetWindowBackground (display->display, vt, 1646 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
1694 pix_colors[Color_bg]);
1695 1647
1648 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1649 gcvalue.foreground = pix_colors[Color_fg];
1697 gcvalue.background = pix_colors[Color_bg]; 1650 gcvalue.background = pix_colors[Color_bg];
1698 XChangeGC (display->display, gc, GCBackground | GCForeground, 1651 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);
1699 &gcvalue); 1652
1700 scr_clear (); 1653 scr_clear ();
1701 scr_touch (true); 1654 scr_touch (true);
1702 } 1655 }
1703} 1656}
1704 1657
… …
1706/* 1659/*
1707 * Report current cursor position 1660 * Report current cursor position
1708 * XTERM_SEQ: Report position: ESC [ 6 n 1661 * XTERM_SEQ: Report position: ESC [ 6 n
1709 */ 1662 */
1710void 1663void
1711rxvt_term::scr_report_position () 1664rxvt_term::scr_report_position () NOTHROW
1712{ 1665{
1713 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1666 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1714} 1667}
1715 1668
1716/* ------------------------------------------------------------------------- * 1669/* ------------------------------------------------------------------------- *
… …
1719 1672
1720/* 1673/*
1721 * Set font style 1674 * Set font style
1722 */ 1675 */
1723void 1676void
1724rxvt_term::set_font_style () 1677rxvt_term::set_font_style () NOTHROW
1725{ 1678{
1679#if 0
1726 switch (charsets[screen.charset]) 1680 switch (charsets [screen.charset])
1727 { 1681 {
1728 case '0': /* DEC Special Character & Line Drawing Set */ 1682 case '0': /* DEC Special Character & Line Drawing Set */
1729 break; 1683 break;
1730 case 'A': /* United Kingdom (UK) */ 1684 case 'A': /* United Kingdom (UK) */
1731 break; 1685 break;
… …
1738 case 'C': /* Finnish character set */ 1692 case 'C': /* Finnish character set */
1739 break; 1693 break;
1740 case 'K': /* German character set */ 1694 case 'K': /* German character set */
1741 break; 1695 break;
1742 } 1696 }
1697#endif
1743} 1698}
1744 1699
1745/* ------------------------------------------------------------------------- */ 1700/* ------------------------------------------------------------------------- */
1746/* 1701/*
1747 * Choose a font 1702 * Choose a font
… …
1749 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1704 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1750 * XTERM_SEQ: Invoke G2 character set: ESC N 1705 * XTERM_SEQ: Invoke G2 character set: ESC N
1751 * XTERM_SEQ: Invoke G3 character set: ESC O 1706 * XTERM_SEQ: Invoke G3 character set: ESC O
1752 */ 1707 */
1753void 1708void
1754rxvt_term::scr_charset_choose (int set) 1709rxvt_term::scr_charset_choose (int set) NOTHROW
1755{ 1710{
1756 screen.charset = set; 1711 screen.charset = set;
1757 set_font_style (); 1712 set_font_style ();
1758} 1713}
1759 1714
… …
1765 * XTERM_SEQ: Set G2 character set: ESC * <C> 1720 * XTERM_SEQ: Set G2 character set: ESC * <C>
1766 * XTERM_SEQ: Set G3 character set: ESC + <C> 1721 * XTERM_SEQ: Set G3 character set: ESC + <C>
1767 * See set_font_style for possible values for <C> 1722 * See set_font_style for possible values for <C>
1768 */ 1723 */
1769void 1724void
1770rxvt_term::scr_charset_set (int set, unsigned int ch) 1725rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1771{ 1726{
1772 charsets[set] = (unsigned char)ch; 1727 charsets[set] = (unsigned char)ch;
1773 set_font_style (); 1728 set_font_style ();
1774} 1729}
1775 1730
… …
1780 1735
1781/* 1736/*
1782 * refresh matching text. 1737 * refresh matching text.
1783 */ 1738 */
1784bool 1739bool
1785rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1740rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1786{ 1741{
1787 bool found = false; 1742 bool found = false;
1788 1743
1789 for (int i = 0; i < nrow; i++) 1744 for (int i = 0; i < nrow; i++)
1790 { 1745 {
1791 int col = 0; 1746 int col = 0;
1792 rend_t *drp = drawn[i].r; 1747 rend_t *drp = drawn_buf[i].r;
1793 1748
1794 for (; col < ncol; col++, drp++) 1749 for (; col < ncol; col++, drp++)
1795 if ((*drp & mask) == value) 1750 if ((*drp & mask) == value)
1796 { 1751 {
1797 found = true; 1752 found = true;
… …
1810 PART_END, 1765 PART_END,
1811 RC_COUNT 1766 RC_COUNT
1812}; 1767};
1813 1768
1814void 1769void
1815rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1770rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1816{ 1771{
1817 int i; 1772 int i;
1818 row_col_t rc[RC_COUNT]; 1773 row_col_t rc[RC_COUNT];
1819 1774
1820 if (!drawn) /* sanity check */ 1775 if (!drawn_buf) /* sanity check */
1821 return; 1776 return;
1822 1777
1823#ifndef NO_SLOW_LINK_SUPPORT 1778#ifndef NO_SLOW_LINK_SUPPORT
1824 if (refresh_type == FAST_REFRESH && !display->is_local) 1779 if (refresh_type == FAST_REFRESH && !display->is_local)
1825 { 1780 {
1826 y = 0; 1781 y = 0;
1827 eheight = height; 1782 eheight = height;
1828 } 1783 }
1829#endif
1830
1831#ifdef DEBUG_STRICT
1832 x = max (x, 0);
1833 x = min (x, (int)width);
1834 y = max (y, 0);
1835 y = min (y, (int)height);
1836#endif 1784#endif
1837 1785
1838 /* round down */ 1786 /* round down */
1839 rc[PART_BEG].col = Pixel2Col (x); 1787 rc[PART_BEG].col = Pixel2Col (x);
1840 rc[PART_BEG].row = Pixel2Row (y); 1788 rc[PART_BEG].row = Pixel2Row (y);
… …
1843 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1791 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1844 1792
1845 /* sanity checks */ 1793 /* sanity checks */
1846 for (i = PART_BEG; i < RC_COUNT; i++) 1794 for (i = PART_BEG; i < RC_COUNT; i++)
1847 { 1795 {
1848 MIN_IT (rc[i].col, ncol - 1); 1796 min_it (rc[i].col, ncol - 1);
1849 MIN_IT (rc[i].row, nrow - 1); 1797 min_it (rc[i].row, nrow - 1);
1850 } 1798 }
1851 1799
1852 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1800 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1853 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1801 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1802
1803 num_scr_allow = 0;
1854 1804
1855 if (refresh) 1805 if (refresh)
1856 scr_refresh (SLOW_REFRESH); 1806 scr_refresh ();
1857} 1807}
1858 1808
1859/* ------------------------------------------------------------------------- */ 1809/* ------------------------------------------------------------------------- */
1860/* 1810/*
1861 * Refresh the entire screen 1811 * Refresh the entire screen
1862 */ 1812 */
1863void 1813void
1864rxvt_term::scr_touch (bool refresh) 1814rxvt_term::scr_touch (bool refresh) NOTHROW
1865{ 1815{
1866 scr_expose (0, 0, width, height, refresh); 1816 scr_expose (0, 0, width, height, refresh);
1867} 1817}
1868 1818
1869/* ------------------------------------------------------------------------- */ 1819/* ------------------------------------------------------------------------- */
1870/* 1820/*
1871 * Move the display so that the line represented by scrollbar value Y is at 1821 * Move the display so that the line represented by scrollbar value Y is at
1872 * the top of the screen 1822 * the top of the screen
1873 */ 1823 */
1874int 1824void
1875rxvt_term::scr_move_to (int y, int len) 1825rxvt_term::scr_move_to (int y, int len) NOTHROW
1876{ 1826{
1877 long p = 0; 1827 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1878 unsigned int oldviewstart;
1879
1880 oldviewstart = view_start;
1881
1882 if (y < len)
1883 {
1884 p = (nrow + nscrolled) * (len - y) / len;
1885 p -= (long) (nrow - 1);
1886 p = max (p, 0);
1887 }
1888
1889 view_start = (unsigned int)min (p, nscrolled);
1890
1891 return scr_changeview (oldviewstart);
1892} 1828}
1893 1829
1894/* ------------------------------------------------------------------------- */ 1830/* ------------------------------------------------------------------------- */
1895/* 1831/*
1896 * Page the screen up/down nlines 1832 * Page the screen up/down nlines
1897 * direction should be UP or DN 1833 * direction should be UP or DN
1898 */ 1834 */
1899int 1835bool
1900rxvt_term::scr_page (enum page_dirn direction, int nlines) 1836rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1901{ 1837{
1902 int n; 1838 int new_view_start =
1903 unsigned int oldviewstart;
1904
1905 oldviewstart = view_start;
1906
1907 if (direction == UP)
1908 {
1909 n = view_start + nlines;
1910 view_start = min (n, nscrolled);
1911 }
1912 else
1913 {
1914 n = view_start - nlines; 1839 direction == UP ? view_start - nlines
1915 view_start = max (n, 0); 1840 : view_start + nlines;
1916 }
1917 1841
1918 return scr_changeview (oldviewstart); 1842 return scr_changeview (new_view_start);
1919} 1843}
1920 1844
1921int 1845bool
1922rxvt_term::scr_changeview (unsigned int oldviewstart) 1846rxvt_term::scr_changeview (int new_view_start) NOTHROW
1923{ 1847{
1848 clamp_it (new_view_start, top_row, 0);
1849
1924 if (view_start != oldviewstart) 1850 if (new_view_start == view_start)
1925 { 1851 return false;
1852
1853 num_scr += new_view_start - view_start;
1854 view_start = new_view_start;
1926 want_refresh = 1; 1855 want_refresh = 1;
1927 num_scr -= (view_start - oldviewstart);
1928 }
1929 1856
1930 return (int) (view_start - oldviewstart); 1857 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1931}
1932 1858
1933/* ------------------------------------------------------------------------- */ 1859 return true;
1860}
1861
1862#ifndef NO_BELL
1934void 1863void
1864rxvt_term::bell_cb (time_watcher &w)
1865{
1866 rvideo_bell = false;
1867 scr_rvideo_mode (rvideo_mode);
1868}
1869#endif
1870
1871/* ------------------------------------------------------------------------- */
1872void
1935rxvt_term::scr_bell () 1873rxvt_term::scr_bell () NOTHROW
1936{ 1874{
1937#ifndef NO_BELL 1875#ifndef NO_BELL
1938 1876
1939# ifndef NO_MAPALERT 1877# ifndef NO_MAPALERT
1940# ifdef MAPALERT_OPTION 1878# ifdef MAPALERT_OPTION
1941 if (options & Opt_mapAlert) 1879 if (OPTION (Opt_mapAlert))
1942# endif 1880# endif
1943 XMapWindow (display->display, parent[0]); 1881 XMapWindow (xdisp, parent[0]);
1944# endif 1882# endif
1945 1883
1946 if (options & Opt_visualBell) 1884 if (OPTION (Opt_visualBell))
1947 { 1885 {
1948 scr_rvideo_mode (!rvideo); /* refresh also done */ 1886 rvideo_bell = true;
1949 rxvt_usleep (VISUAL_BELL_DURATION); 1887 scr_rvideo_mode (rvideo_mode);
1950 scr_rvideo_mode (!rvideo); /* refresh also done */ 1888 display->flush ();
1889
1890 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1951 } 1891 }
1952 else 1892 else
1953 XBell (display->display, 0); 1893 XBell (xdisp, 0);
1954 1894
1955#endif 1895#endif
1956} 1896}
1957 1897
1958/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
1959/* ARGSUSED */ 1899/* ARGSUSED */
1960void 1900void
1961rxvt_term::scr_printscreen (int fullhist) 1901rxvt_term::scr_printscreen (int fullhist) NOTHROW
1962{ 1902{
1963#ifdef PRINTPIPE 1903#ifdef PRINTPIPE
1964 int i, r1, nrows, row_offset; 1904 int nrows, row_start;
1965 FILE *fd; 1905 FILE *fd;
1966 1906
1967 if ((fd = popen_printer ()) == NULL) 1907 if ((fd = popen_printer ()) == NULL)
1968 return; 1908 return;
1969 1909
1970 nrows = nrow;
1971 row_offset = saveLines;
1972
1973 if (!fullhist) 1910 if (fullhist)
1974 row_offset -= view_start; 1911 {
1912 nrows = nrow - top_row;
1913 row_start = top_row;
1914 }
1975 else 1915 else
1976 { 1916 {
1977 nrows += nscrolled; 1917 nrows = nrow;
1978 row_offset -= nscrolled; 1918 row_start = view_start;
1979 } 1919 }
1980 1920
1981 wctomb (0, 0); 1921 wctomb (0, 0);
1982 1922
1983 for (r1 = 0; r1 < nrows; r1++) 1923 for (int r1 = 0; r1 < nrows; r1++)
1984 { 1924 {
1985 text_t *tp = save[r1 + row_offset].t; 1925 text_t *tp = ROW(r1).t;
1986 int len = save[r1 + row_offset].l; 1926 int len = ROW(r1).l;
1987 1927
1988 for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1928 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1989 { 1929 {
1990 char mb[MB_LEN_MAX]; 1930 char mb[MB_LEN_MAX];
1991 text_t t = *tp++; 1931 text_t t = *tp++;
1992 if (t == NOCHAR) 1932 if (t == NOCHAR)
1993 continue; 1933 continue;
… …
2015 * Refresh the screen 1955 * Refresh the screen
2016 * drawn_text/drawn_rend contain the screen information before the update. 1956 * drawn_text/drawn_rend contain the screen information before the update.
2017 * screen.text/screen.rend contain what the screen will change to. 1957 * screen.text/screen.rend contain what the screen will change to.
2018 */ 1958 */
2019void 1959void
2020rxvt_term::scr_refresh (unsigned char refresh_type) 1960rxvt_term::scr_refresh () NOTHROW
2021{ 1961{
2022 unsigned char must_clear, /* use draw_string not draw_image_string */ 1962 unsigned char must_clear, /* use draw_string not draw_image_string */
2023 showcursor; /* show the cursor */ 1963 showcursor; /* show the cursor */
2024 int16_t col, row, /* column/row we're processing */ 1964 int16_t col, row, /* column/row we're processing */
2025 ocrow; /* old cursor row */ 1965 ocrow; /* old cursor row */
2026 int i, /* tmp */ 1966 int i; /* tmp */
2027 row_offset; /* basic offset in screen structure */
2028#ifndef NO_CURSORCOLOR 1967#ifndef NO_CURSORCOLOR
2029 rend_t cc1; /* store colours at cursor position (s) */ 1968 rend_t cc1; /* store colours at cursor position (s) */
2030#endif 1969#endif
2031 rend_t *crp; // cursor rendition pointer 1970 rend_t *crp; // cursor rendition pointer
2032 1971
… …
2039 * A: set up vars 1978 * A: set up vars
2040 */ 1979 */
2041 must_clear = 0; 1980 must_clear = 0;
2042 refresh_count = 0; 1981 refresh_count = 0;
2043 1982
2044 row_offset = saveLines - view_start;
2045
2046#if XPM_BACKGROUND 1983#if XPM_BACKGROUND
2047 must_clear |= bgPixmap.pixmap != None; 1984 must_clear |= bgPixmap.pixmap != None;
2048#endif 1985#endif
2049#if TRANSPARENT 1986#if TRANSPARENT
2050 must_clear |= (options & Opt_transparent) && am_transparent; 1987 must_clear |= OPTION (Opt_transparent) && am_transparent;
2051#endif 1988#endif
2052 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1989 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2053 1990
2054 /* 1991 /*
2055 * B: reverse any characters which are selected 1992 * B: reverse any characters which are selected
… …
2072 2009
2073 if (showcursor) 2010 if (showcursor)
2074 { 2011 {
2075 int col = screen.cur.col; 2012 int col = screen.cur.col;
2076 2013
2077 while (col && screen.line[screen.cur.row]->t[col] == NOCHAR) 2014 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2078 col--; 2015 col--;
2079 2016
2080 crp = &screen.line[screen.cur.row]->r[col]; 2017 crp = &ROW(screen.cur.row).r[col];
2081 2018
2082 if (showcursor && focus) 2019 if (showcursor && focus)
2083 { 2020 {
2084 if (options & Opt_cursorUnderline) 2021 if (OPTION (Opt_cursorUnderline))
2085 *crp ^= RS_Uline; 2022 *crp ^= RS_Uline;
2086 else 2023 else
2087 { 2024 {
2088 *crp ^= RS_RVid; 2025 *crp ^= RS_RVid;
2089 2026
… …
2091 cc1 = *crp & (RS_fgMask | RS_bgMask); 2028 cc1 = *crp & (RS_fgMask | RS_bgMask);
2092 if (ISSET_PIXCOLOR (Color_cursor)) 2029 if (ISSET_PIXCOLOR (Color_cursor))
2093 ccol1 = Color_cursor; 2030 ccol1 = Color_cursor;
2094 else 2031 else
2095#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2032#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2096 ccol1 = GET_FGCOLOR (rstyle); 2033 ccol1 = fgcolor_of (rstyle);
2097#else 2034#else
2098 ccol1 = Color_fg; 2035 ccol1 = Color_fg;
2099#endif 2036#endif
2100 if (ISSET_PIXCOLOR (Color_cursor2)) 2037 if (ISSET_PIXCOLOR (Color_cursor2))
2101 ccol2 = Color_cursor2; 2038 ccol2 = Color_cursor2;
2102 else 2039 else
2103#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2040#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2104 ccol2 = GET_BGCOLOR (rstyle); 2041 ccol2 = bgcolor_of (rstyle);
2105#else 2042#else
2106 ccol2 = Color_bg; 2043 ccol2 = Color_bg;
2107#endif 2044#endif
2108 *crp = SET_FGCOLOR (*crp, ccol1); 2045 *crp = SET_FGCOLOR (*crp, ccol1);
2109 *crp = SET_BGCOLOR (*crp, ccol2); 2046 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2114 2051
2115 /* make sure no outline cursor is left around */ 2052 /* make sure no outline cursor is left around */
2116 setoldcursor = 0; 2053 setoldcursor = 0;
2117 if (ocrow != -1) 2054 if (ocrow != -1)
2118 { 2055 {
2119 if (screen.cur.row + view_start != ocrow 2056 if (screen.cur.row - view_start != ocrow
2120 || screen.cur.col != oldcursor.col) 2057 || screen.cur.col != oldcursor.col)
2121 { 2058 {
2122 if (ocrow < nrow 2059 if (ocrow < nrow
2123 && oldcursor.col < ncol) 2060 && oldcursor.col < ncol)
2124 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2061 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2125 2062
2126 if (focus || !showcursor) 2063 if (focus || !showcursor)
2127 oldcursor.row = -1; 2064 oldcursor.row = -1;
2128 else 2065 else
2129 setoldcursor = 1; 2066 setoldcursor = 1;
… …
2132 else if (!focus) 2069 else if (!focus)
2133 setoldcursor = 1; 2070 setoldcursor = 1;
2134 2071
2135 if (setoldcursor) 2072 if (setoldcursor)
2136 { 2073 {
2137 if (screen.cur.row + view_start >= nrow) 2074 if (screen.cur.row - view_start >= nrow)
2138 oldcursor.row = -1; 2075 oldcursor.row = -1;
2139 else 2076 else
2140 { 2077 {
2141 oldcursor.row = screen.cur.row + view_start; 2078 oldcursor.row = screen.cur.row - view_start;
2142 oldcursor.col = screen.cur.col; 2079 oldcursor.col = screen.cur.col;
2143 } 2080 }
2144 } 2081 }
2145 } 2082 }
2146 2083
2084 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2147#if ENABLE_OVERLAY 2085#if ENABLE_OVERLAY
2148 scr_swap_overlay (); 2086 scr_swap_overlay ();
2149#endif 2087#endif
2150 2088
2151#ifndef NO_SLOW_LINK_SUPPORT 2089#ifndef NO_SLOW_LINK_SUPPORT
2152 /* 2090 /*
2153 * D: CopyArea pass - very useful for slower links 2091 * D: CopyArea pass - very useful for slower links
2154 * This has been deliberately kept simple. 2092 * This has been deliberately kept simple.
2155 */ 2093 */
2156 i = num_scr;
2157 if (!display->is_local 2094 if (!display->is_local
2158 && refresh_type == FAST_REFRESH && num_scr_allow && i 2095 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2159 && abs (i) < nrow && !must_clear) 2096 && abs (num_scr) < nrow && !must_clear)
2160 { 2097 {
2161 int16_t nits; 2098 int16_t nits;
2162 int j; 2099 int j;
2163 int len, wlen; 2100 int len, wlen;
2101 dLocal (int, num_scr);
2164 2102
2165 j = nrow; 2103 j = nrow;
2166 wlen = len = -1; 2104 wlen = len = -1;
2167 row = i > 0 ? 0 : j - 1; 2105 row = i > 0 ? 0 : j - 1;
2168 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2106 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2169 { 2107 {
2170 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2108 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2171 { 2109 {
2172 line_t s = save[row + row_offset]; 2110 line_t s = ROW(view_start + row);
2173 line_t d = drawn[row]; 2111 line_t d = drawn_buf[row];
2174 line_t d2 = drawn[row + i]; 2112 line_t d2 = drawn_buf[row + i];
2175 2113
2176 for (nits = 0, col = ncol; col--; ) 2114 for (nits = 0, col = ncol; col--; )
2177 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2115 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2178 nits--; 2116 nits--;
2179 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2117 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2197 2135
2198 if (len != -1) 2136 if (len != -1)
2199 { 2137 {
2200 /* also comes here at end if needed because of >= above */ 2138 /* also comes here at end if needed because of >= above */
2201 if (wlen < len) 2139 if (wlen < len)
2202 SWAP_IT (wlen, len, int); 2140 ::swap (wlen, len);
2203 2141
2204 XCopyArea (display->display, vt, vt, 2142 XCopyArea (xdisp, vt, vt,
2205 gc, 0, Row2Pixel (len + i), 2143 gc, 0, Row2Pixel (len + i),
2206 (unsigned int)TermWin_TotalWidth (), 2144 (unsigned int)this->width,
2207 (unsigned int)Height2Pixel (wlen - len + 1), 2145 (unsigned int)Height2Pixel (wlen - len + 1),
2208 0, Row2Pixel (len)); 2146 0, Row2Pixel (len));
2209 len = -1; 2147 len = -1;
2210 } 2148 }
2211 } 2149 }
… …
2215 /* 2153 /*
2216 * E: main pass across every character 2154 * E: main pass across every character
2217 */ 2155 */
2218 for (row = 0; row < nrow; row++) 2156 for (row = 0; row < nrow; row++)
2219 { 2157 {
2220 text_t *stp = save[row + row_offset].t; 2158 text_t *stp = ROW(view_start + row).t;
2221 rend_t *srp = save[row + row_offset].r; 2159 rend_t *srp = ROW(view_start + row).r;
2222 text_t *dtp = drawn[row].t; 2160 text_t *dtp = drawn_buf[row].t;
2223 rend_t *drp = drawn[row].r; 2161 rend_t *drp = drawn_buf[row].r;
2224 2162
2225 /* 2163 /*
2226 * E2: OK, now the real pass 2164 * E2: OK, now the real pass
2227 */ 2165 */
2228 int ypixel = (int)Row2Pixel (row); 2166 int ypixel = (int)Row2Pixel (row);
… …
2290 count++, i--; 2228 count++, i--;
2291 2229
2292 /* 2230 /*
2293 * Determine the attributes for the string 2231 * Determine the attributes for the string
2294 */ 2232 */
2295 int fore = GET_FGCOLOR (rend); // desired foreground 2233 int fore = fgcolor_of (rend); // desired foreground
2296 int back = GET_BGCOLOR (rend); // desired background 2234 int back = bgcolor_of (rend); // desired background
2297 2235
2298 // only do special processing if any attributes are set, which is rare 2236 // only do special processing if any attributes are set, which is unlikely
2299 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2237 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2300 { 2238 {
2301#if ENABLE_STYLES 2239#if ENABLE_STYLES
2302 // force redraw after "careful" characters to avoid pixel droppings 2240 // "careful" (too wide) character handling
2303 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2304 drp[col + 1] = ~srp[col + 1];
2305 2241
2306 // include previous careful character(s) if possible, looks nicer (best effort...) 2242 // include previous careful character(s) if possible, looks nicer (best effort...)
2307 while (text > stp 2243 while (text > stp
2308 && srp[text - stp - 1] & RS_Careful 2244 && srp[text - stp - 1] & RS_Careful
2309 && RS_SAME (rend, srp[text - stp - 1])) 2245 && RS_SAME (rend, srp[text - stp - 1]))
2310 text--, count++, xpixel -= fwidth; 2246 text--, count++, xpixel -= fwidth;
2247
2248 // force redraw after "careful" characters to avoid pixel droppings
2249 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2250 drp[col + i + 1] = ~srp[col + i + 1];
2251
2252 // force redraw before "careful" characters to avoid pixel droppings
2253 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2254 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2311#endif 2255#endif
2312 2256
2313 bool invert = rend & RS_RVid; 2257 bool invert = rend & RS_RVid;
2314 2258
2315#ifndef NO_BOLD_UNDERLINE_REVERSE 2259#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2339 fore = Color_UL; 2283 fore = Color_UL;
2340#endif 2284#endif
2341 2285
2342 if (invert) 2286 if (invert)
2343 { 2287 {
2344 SWAP_IT (fore, back, int); 2288 ::swap (fore, back);
2345 2289
2346#ifndef NO_BOLD_UNDERLINE_REVERSE 2290#ifndef NO_BOLD_UNDERLINE_REVERSE
2347 if (ISSET_PIXCOLOR (Color_RV)) 2291 if (ISSET_PIXCOLOR (Color_RV))
2348 back = Color_RV; 2292 back = Color_RV;
2349 2293
… …
2399 2343
2400 if (rend & RS_Uline && font->descent > 1 && fore != back) 2344 if (rend & RS_Uline && font->descent > 1 && fore != back)
2401 { 2345 {
2402#if ENABLE_FRILLS 2346#if ENABLE_FRILLS
2403 if (ISSET_PIXCOLOR (Color_underline)) 2347 if (ISSET_PIXCOLOR (Color_underline))
2404 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2348 XSetForeground (xdisp, gc, pix_colors[Color_underline]);
2405 else 2349 else
2406#endif 2350#endif
2407 XSetForeground (display->display, gc, pix_colors[fore]); 2351 XSetForeground (xdisp, gc, pix_colors[fore]);
2408 2352
2409 XDrawLine (display->display, drawBuffer, gc, 2353 XDrawLine (xdisp, drawBuffer, gc,
2410 xpixel, ypixel + font->ascent + 1, 2354 xpixel, ypixel + font->ascent + 1,
2411 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2355 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2412 } 2356 }
2413 } /* for (col....) */ 2357 } /* for (col....) */
2414 } /* for (row....) */ 2358 } /* for (row....) */
2415 2359
2416#if ENABLE_OVERLAY 2360#if ENABLE_OVERLAY
2417 scr_swap_overlay (); 2361 scr_swap_overlay ();
2418#endif 2362#endif
2363 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2419 2364
2420 /* 2365 /*
2421 * G: cleanup cursor and display outline cursor if necessary 2366 * G: cleanup cursor and display outline cursor if necessary
2422 */ 2367 */
2423 if (showcursor) 2368 if (showcursor)
2424 { 2369 {
2425 if (focus) 2370 if (focus)
2426 { 2371 {
2427 if (options & Opt_cursorUnderline) 2372 if (OPTION (Opt_cursorUnderline))
2428 *crp ^= RS_Uline; 2373 *crp ^= RS_Uline;
2429 else 2374 else
2430 { 2375 {
2431 *crp ^= RS_RVid; 2376 *crp ^= RS_RVid;
2432#ifndef NO_CURSORCOLOR 2377#ifndef NO_CURSORCOLOR
… …
2437 else if (oldcursor.row >= 0) 2382 else if (oldcursor.row >= 0)
2438 { 2383 {
2439 int cursorwidth = 1; 2384 int cursorwidth = 1;
2440 int col = oldcursor.col; 2385 int col = oldcursor.col;
2441 2386
2442 while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR) 2387 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2443 col--; 2388 col--;
2444 2389
2445 while (col + cursorwidth < ncol 2390 while (col + cursorwidth < ncol
2446 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2391 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2447 cursorwidth++; 2392 cursorwidth++;
2448 2393
2449#ifndef NO_CURSORCOLOR 2394#ifndef NO_CURSORCOLOR
2450 if (ISSET_PIXCOLOR (Color_cursor)) 2395 if (ISSET_PIXCOLOR (Color_cursor))
2451 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2396 XSetForeground (xdisp, gc, pix_colors[Color_cursor]);
2452#endif 2397#endif
2453 2398
2454 XDrawRectangle (display->display, drawBuffer, gc, 2399 XDrawRectangle (xdisp, drawBuffer, gc,
2455 Col2Pixel (col), 2400 Col2Pixel (col),
2456 Row2Pixel (oldcursor.row), 2401 Row2Pixel (oldcursor.row),
2457 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2402 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2458 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2403 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2459 } 2404 }
… …
2462 /* 2407 /*
2463 * H: cleanup selection 2408 * H: cleanup selection
2464 */ 2409 */
2465 scr_reverse_selection (); 2410 scr_reverse_selection ();
2466 2411
2467 if (refresh_type & SMOOTH_REFRESH)
2468 XFlush (display->display);
2469
2470 num_scr = 0; 2412 num_scr = 0;
2471 num_scr_allow = 1; 2413 num_scr_allow = 1;
2472} 2414}
2473 2415
2474void 2416void
2475rxvt_term::scr_remap_chars (const line_t &l) 2417rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2476{ 2418{
2477 if (!l.t) 2419 if (!l.t)
2478 return; 2420 return;
2479 2421
2422 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2423
2480 for (int i = ncol; i--; ) 2424 for (int i = ncol; i--; )
2481 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2425 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2482} 2426}
2483 2427
2484void 2428void
2485rxvt_term::scr_remap_chars () 2429rxvt_term::scr_remap_chars () NOTHROW
2486{ 2430{
2487 for (int i = nrow + saveLines; i--; ) 2431 for (int i = total_rows; i--; )
2488 scr_remap_chars (save[i]); 2432 scr_remap_chars (row_buf [i]);
2489 2433
2490 for (int i = nrow; i--; ) 2434 for (int i = nrow; i--; )
2491 { 2435 {
2492 scr_remap_chars (drawn[i]); 2436 scr_remap_chars (drawn_buf [i]);
2493 scr_remap_chars (swap_save[i]); 2437 scr_remap_chars (swap_buf [i]);
2494 } 2438 }
2495} 2439}
2496 2440
2497void 2441void
2498rxvt_term::scr_recolour () 2442rxvt_term::scr_recolour () NOTHROW
2499{ 2443{
2500 if (1 2444 if (1
2501#if TRANSPARENT 2445#if TRANSPARENT
2502 && !am_transparent 2446 && !am_transparent
2503#endif 2447#endif
2504#if XPM_BACKGROUND 2448#if XPM_BACKGROUND
2505 && !bgPixmap.pixmap 2449 && !bgPixmap.pixmap
2506#endif 2450#endif
2507 ) 2451 )
2508 { 2452 {
2509 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2453 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]);
2510 XClearWindow (display->display, parent[0]); 2454 XClearWindow (xdisp, parent[0]);
2511 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2455 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
2512#if HAVE_SCROLLBARS 2456#if HAVE_SCROLLBARS
2513 if (scrollBar.win) 2457 if (scrollBar.win)
2514 { 2458 {
2515 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2459 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);
2516 scrollBar.setIdle (); 2460 scrollBar.setIdle ();
2517 scrollbar_show (0); 2461 scrollbar_show (0);
2518 } 2462 }
2519#endif 2463#endif
2520 } 2464 }
… …
2524 want_refresh = 1; 2468 want_refresh = 1;
2525} 2469}
2526 2470
2527/* ------------------------------------------------------------------------- */ 2471/* ------------------------------------------------------------------------- */
2528void 2472void
2529rxvt_term::scr_clear (bool really) 2473rxvt_term::scr_clear (bool really) NOTHROW
2530{ 2474{
2531 if (!mapped) 2475 if (!mapped)
2532 return; 2476 return;
2533 2477
2534 num_scr_allow = 0; 2478 num_scr_allow = 0;
2535 want_refresh = 1; 2479 want_refresh = 1;
2536 2480
2537 if (really) 2481 if (really)
2538 XClearWindow (display->display, vt); 2482 XClearWindow (xdisp, vt);
2539} 2483}
2540 2484
2541/* ------------------------------------------------------------------------- */
2542void 2485void
2486rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2487{
2488 int view_end = view_start + nrow;
2489 int row, col;
2490
2491 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2492 {
2493 text_t *stp = ROW(row).t;
2494 rend_t *srp = ROW(row).r;
2495
2496 for (col = beg_col; col < end_col; col++)
2497 srp[col] ^= rstyle1;
2498
2499 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2500 srp[col] ^= rstyle2;
2501
2502 if (++col < end_col)
2503 srp[col] ^= rstyle2;
2504 }
2505}
2506
2507void
2508rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2509{
2510 int view_end = view_start + nrow;
2511 int row, col;
2512
2513 if (beg_row >= view_start)
2514 {
2515 col = beg_col;
2516 row = beg_row;
2517 }
2518 else
2519 {
2520 col = 0;
2521 row = view_start;
2522 }
2523
2524 for (; row < min (end_row, view_end); row++, col = 0)
2525 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2526 srp[col] ^= rstyle;
2527
2528 if (row == end_row)
2529 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2530 srp[col] ^= rstyle;
2531}
2532
2533/* ------------------------------------------------------------------------- */
2534void
2543rxvt_term::scr_reverse_selection () 2535rxvt_term::scr_reverse_selection () NOTHROW
2544{ 2536{
2537 if (selection.op
2545 if (selection.op && current_screen == selection.screen) 2538 && current_screen == selection.screen
2539 && selection.end.row >= view_start)
2546 { 2540 {
2547 int end_row = saveLines - view_start;
2548 int i = selection.beg.row + saveLines;
2549 int col, row = selection.end.row + saveLines;
2550 rend_t *srp;
2551
2552#if ENABLE_FRILLS 2541#if ENABLE_FRILLS
2553 if (selection.rect) 2542 if (selection.rect)
2554 { 2543 scr_xor_rect (selection.beg.row, selection.beg.col,
2555 end_row += nrow; 2544 selection.end.row, selection.end.col,
2556 2545 RS_RVid, RS_RVid | RS_Uline);
2557 for (; i <= row && i <= end_row; i++)
2558 for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++)
2559 srp[col] ^= RS_RVid;
2560 }
2561 else 2546 else
2562#endif 2547#endif
2563 { 2548 scr_xor_span (selection.beg.row, selection.beg.col,
2564 if (i >= end_row) 2549 selection.end.row, selection.end.col,
2565 col = selection.beg.col; 2550 RS_RVid);
2566 else
2567 {
2568 col = 0;
2569 i = end_row;
2570 }
2571
2572 end_row += nrow;
2573
2574 for (; i < row && i < end_row; i++, col = 0)
2575 for (srp = save[i].r; col < ncol; col++)
2576 srp[col] ^= RS_RVid;
2577
2578 if (i == row && i < end_row)
2579 for (srp = save[i].r; col < selection.end.col; col++)
2580 srp[col] ^= RS_RVid;
2581 }
2582 } 2551 }
2583} 2552}
2584 2553
2585/* ------------------------------------------------------------------------- */ 2554/* ------------------------------------------------------------------------- */
2586/* 2555/*
2587 * Dump the whole scrollback and screen to the passed filedescriptor. The 2556 * Dump the whole scrollback and screen to the passed filedescriptor. The
2588 * invoking routine must close the fd. 2557 * invoking routine must close the fd.
2589 */ 2558 */
2590#if 0 2559#if 0
2591void 2560void
2592rxvt_term::scr_dump (int fd) 2561rxvt_term::scr_dump (int fd) NOTHROW
2593{ 2562{
2594 int row, wrote; 2563 int row, wrote;
2595 unsigned int width, towrite; 2564 unsigned int width, towrite;
2596 char r1[] = "\n"; 2565 char r1[] = "\n";
2597 2566
2598 for (row = saveLines - nscrolled; 2567 for (row = saveLines - nsaved;
2599 row < saveLines + nrow - 1; row++) 2568 row < saveLines + nrow - 1; row++)
2600 { 2569 {
2601 width = save[row].l >= 0 ? save[row].l 2570 width = row_buf[row].l >= 0 ? row_buf[row].l
2602 : ncol; 2571 : ncol;
2603 for (towrite = width; towrite; towrite -= wrote) 2572 for (towrite = width; towrite; towrite -= wrote)
2604 { 2573 {
2605 wrote = write (fd, & (save[row].t[width - towrite]), 2574 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2606 towrite); 2575 towrite);
2607 if (wrote < 0) 2576 if (wrote < 0)
2608 return; /* XXX: death, no report */ 2577 return; /* XXX: death, no report */
2609 } 2578 }
2610 if (save[row].l >= 0) 2579 if (row_buf[row].l >= 0)
2611 if (write (fd, r1, 1) <= 0) 2580 if (write (fd, r1, 1) <= 0)
2612 return; /* XXX: death, no report */ 2581 return; /* XXX: death, no report */
2613 } 2582 }
2614} 2583}
2615#endif 2584#endif
2616 2585
2617/* ------------------------------------------------------------------------- * 2586/* ------------------------------------------------------------------------- *
2618 * CHARACTER SELECTION * 2587 * CHARACTER SELECTION *
2619 * ------------------------------------------------------------------------- */ 2588 * ------------------------------------------------------------------------- */
2620
2621/*
2622 * -nscrolled <= (selection row) <= nrow - 1
2623 */
2624void 2589void
2625rxvt_term::selection_check (int check_more) 2590rxvt_term::selection_check (int check_more) NOTHROW
2626{ 2591{
2627 row_col_t pos; 2592 row_col_t pos;
2628 2593
2629 if (!selection.op) 2594 if (!selection.op)
2630 return; 2595 return;
2631 2596
2632 pos.row = pos.col = 0; 2597 pos.row = pos.col = 0;
2633 if ((selection.beg.row < - (int32_t)nscrolled) 2598 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2634 || (selection.beg.row >= nrow) 2599 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2635 || (selection.mark.row < - (int32_t)nscrolled) 2600 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2636 || (selection.mark.row >= nrow)
2637 || (selection.end.row < - (int32_t)nscrolled)
2638 || (selection.end.row >= nrow)
2639 || (check_more == 1 2601 || (check_more == 1
2640 && current_screen == selection.screen 2602 && current_screen == selection.screen
2641 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2603 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2642 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2604 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2643 || (check_more == 2 2605 || (check_more == 2
… …
2654/* ------------------------------------------------------------------------- */ 2616/* ------------------------------------------------------------------------- */
2655/* 2617/*
2656 * Paste a selection direct to the command fd 2618 * Paste a selection direct to the command fd
2657 */ 2619 */
2658void 2620void
2659rxvt_term::paste (unsigned char *data, unsigned int len) 2621rxvt_term::paste (char *data, unsigned int len) NOTHROW
2660{ 2622{
2661 /* convert normal newline chars into common keyboard Return key sequence */ 2623 /* convert normal newline chars into common keyboard Return key sequence */
2662 for (unsigned int i = 0; i < len; i++) 2624 for (unsigned int i = 0; i < len; i++)
2663 if (data[i] == C0_LF) 2625 if (data[i] == C0_LF)
2664 data[i] = C0_CR; 2626 data[i] = C0_CR;
… …
2670/* 2632/*
2671 * Respond to a notification that a primary selection has been sent 2633 * Respond to a notification that a primary selection has been sent
2672 * EXT: SelectionNotify 2634 * EXT: SelectionNotify
2673 */ 2635 */
2674void 2636void
2675rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2637rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2676{ 2638{
2677 if (prop == None) /* check for failed XConvertSelection */ 2639 if (prop == None) /* check for failed XConvertSelection */
2678 { 2640 {
2679 if ((selection_type & Sel_CompoundText)) 2641 if ((selection_type & Sel_CompoundText))
2680 { 2642 {
… …
2700 } 2662 }
2701 2663
2702 unsigned long bytes_after; 2664 unsigned long bytes_after;
2703 XTextProperty ct; 2665 XTextProperty ct;
2704 2666
2705 if (XGetWindowProperty (display->display, win, prop, 2667 if (XGetWindowProperty (xdisp, win, prop,
2706 0, PROP_SIZE / 4, 2668 0, PROP_SIZE / 4,
2707 delete_prop, AnyPropertyType, 2669 delete_prop, AnyPropertyType,
2708 &ct.encoding, &ct.format, 2670 &ct.encoding, &ct.format,
2709 &ct.nitems, &bytes_after, 2671 &ct.nitems, &bytes_after,
2710 &ct.value) != Success) 2672 &ct.value) != Success)
… …
2719 if (bytes_after) 2681 if (bytes_after)
2720 { 2682 {
2721 // fetch and append remaining data 2683 // fetch and append remaining data
2722 XTextProperty ct2; 2684 XTextProperty ct2;
2723 2685
2724 if (XGetWindowProperty (display->display, win, prop, 2686 if (XGetWindowProperty (xdisp, win, prop,
2725 ct.nitems / 4, (bytes_after + 3) / 4, 2687 ct.nitems / 4, (bytes_after + 3) / 4,
2726 delete_prop, AnyPropertyType, 2688 delete_prop, AnyPropertyType,
2727 &ct2.encoding, &ct2.format, 2689 &ct2.encoding, &ct2.format,
2728 &ct2.nitems, &bytes_after, 2690 &ct2.nitems, &bytes_after,
2729 &ct2.value) != Success) 2691 &ct2.value) != Success)
… …
2742 2704
2743 if (ct.encoding == xa[XA_INCR]) 2705 if (ct.encoding == xa[XA_INCR])
2744 { 2706 {
2745 // INCR selection, start handshake 2707 // INCR selection, start handshake
2746 if (!delete_prop) 2708 if (!delete_prop)
2747 XDeleteProperty (display->display, win, prop); 2709 XDeleteProperty (xdisp, win, prop);
2748 2710
2749 selection_wait = Sel_incr; 2711 selection_wait = Sel_incr;
2750 incr_buf_fill = 0; 2712 incr_buf_fill = 0;
2751 incr_ev.start (NOW + 10); 2713 incr_ev.start (NOW + 10);
2752 2714
… …
2808 { 2770 {
2809 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2771 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2810 char *s = rxvt_wcstombs (w); 2772 char *s = rxvt_wcstombs (w);
2811 free (w); 2773 free (w);
2812 // TODO: strlen == only the first element will be converted. well... 2774 // TODO: strlen == only the first element will be converted. well...
2813 paste ((unsigned char *)s, strlen (s)); 2775 paste (s, strlen (s));
2814 free (s); 2776 free (s);
2815 } 2777 }
2816 else 2778 else
2817#endif 2779#endif
2818 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2780 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
2819 && cl) 2781 && cl)
2820 { 2782 {
2821 for (int i = 0; i < cr; i++) 2783 for (int i = 0; i < cr; i++)
2822 paste ((unsigned char *)cl[i], strlen (cl[i])); 2784 paste (cl[i], strlen (cl[i]));
2823 2785
2824 XFreeStringList (cl); 2786 XFreeStringList (cl);
2825 } 2787 }
2826 else 2788 else
2827 paste (ct.value, ct.nitems); // paste raw 2789 paste ((char *)ct.value, ct.nitems); // paste raw
2828 2790
2829bailout: 2791bailout:
2830 XFree (ct.value); 2792 XFree (ct.value);
2831 2793
2832 if (selection_wait == Sel_normal) 2794 if (selection_wait == Sel_normal)
2833 selection_wait = Sel_none; 2795 selection_wait = Sel_none;
2834} 2796}
2835 2797
2836void 2798void
2837rxvt_term::incr_cb (time_watcher &w) 2799rxvt_term::incr_cb (time_watcher &w) NOTHROW
2838{ 2800{
2839 selection_wait = Sel_none; 2801 selection_wait = Sel_none;
2840 2802
2841 incr_buf_size = 0; 2803 incr_buf_size = 0;
2842 free (incr_buf); 2804 free (incr_buf);
2843 2805
2844 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2806 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2845} 2807}
2846 2808
2847void 2809void
2848rxvt_term::selection_property (Window win, Atom prop) 2810rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2849{ 2811{
2850 if (prop == None || selection_wait != Sel_incr) 2812 if (prop == None || selection_wait != Sel_incr)
2851 return; 2813 return;
2852 2814
2853 selection_paste (win, prop, true); 2815 selection_paste (win, prop, true);
… …
2862 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2824 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2863 * will auto fallback to CUT_BUFFER0 2825 * will auto fallback to CUT_BUFFER0
2864 * EXT: button 2 release 2826 * EXT: button 2 release
2865 */ 2827 */
2866void 2828void
2867rxvt_term::selection_request (Time tm, int x, int y) 2829rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2868{ 2830{
2869 if (x < 0 || x >= width || y < 0 || y >= height) 2831 if (selection.text && selnum == Sel_Primary)
2870 return; /* outside window */
2871
2872 if (selection.text)
2873 { /* internal selection */ 2832 { /* internal selection */
2874 char *str = rxvt_wcstombs (selection.text, selection.len); 2833 char *str = rxvt_wcstombs (selection.text, selection.len);
2875 paste ((unsigned char *)str, strlen (str)); 2834 paste (str, strlen (str));
2876 free (str); 2835 free (str);
2877 return; 2836 return;
2878 } 2837 }
2879 else 2838 else
2880 { 2839 {
2881 int i;
2882
2883 selection_request_time = tm; 2840 selection_request_time = tm;
2884 selection_wait = Sel_normal; 2841 selection_wait = Sel_normal;
2885 2842
2886 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2887 {
2888#if X_HAVE_UTF8_STRING 2843#if X_HAVE_UTF8_STRING
2889 selection_type = Sel_UTF8String; 2844 selection_type = Sel_UTF8String;
2890 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2845 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2891 return; 2846 return;
2892#else 2847#else
2893 selection_type = Sel_CompoundText; 2848 selection_type = Sel_CompoundText;
2894 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2849 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2895 return; 2850 return;
2896#endif 2851#endif
2897 }
2898 } 2852 }
2899 2853
2900 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2854 selection_wait = Sel_none; /* don't loop in selection_paste () */
2901 selection_paste (display->root, XA_CUT_BUFFER0, false); 2855 selection_paste (display->root, XA_CUT_BUFFER0, false);
2902} 2856}
2903 2857
2904int 2858int
2905rxvt_term::selection_request_other (Atom target, int selnum) 2859rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2906{ 2860{
2907 Atom sel; 2861 Atom sel;
2908 2862
2909 selection_type |= selnum; 2863 selection_type |= selnum;
2910 2864
… …
2913 else if (selnum == Sel_Secondary) 2867 else if (selnum == Sel_Secondary)
2914 sel = XA_SECONDARY; 2868 sel = XA_SECONDARY;
2915 else 2869 else
2916 sel = xa[XA_CLIPBOARD]; 2870 sel = xa[XA_CLIPBOARD];
2917 2871
2918 if (XGetSelectionOwner (display->display, sel) != None) 2872 if (XGetSelectionOwner (xdisp, sel) != None)
2919 { 2873 {
2920 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2874 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
2921 vt, selection_request_time); 2875 vt, selection_request_time);
2922 return 1; 2876 return 1;
2923 } 2877 }
2924 2878
2925 return 0; 2879 return 0;
… …
2929/* 2883/*
2930 * Clear all selected text 2884 * Clear all selected text
2931 * EXT: SelectionClear 2885 * EXT: SelectionClear
2932 */ 2886 */
2933void 2887void
2934rxvt_term::selection_clear () 2888rxvt_term::selection_clear () NOTHROW
2935{ 2889{
2936 want_refresh = 1; 2890 want_refresh = 1;
2937 free (selection.text); 2891 free (selection.text);
2938 selection.text = NULL; 2892 selection.text = NULL;
2939 selection.len = 0; 2893 selection.len = 0;
… …
2949 * EXT: button 1 or 3 release 2903 * EXT: button 1 or 3 release
2950 */ 2904 */
2951void 2905void
2952rxvt_term::selection_make (Time tm) 2906rxvt_term::selection_make (Time tm)
2953{ 2907{
2954 int i, col, end_col, row, end_row; 2908 int i;
2955 wchar_t *new_selection_text; 2909 wchar_t *new_selection_text;
2956 text_t *t; 2910 text_t *t;
2957 2911
2958 switch (selection.op) 2912 switch (selection.op)
2959 { 2913 {
… …
2972 selection.op = SELECTION_DONE; 2926 selection.op = SELECTION_DONE;
2973 2927
2974 if (selection.clicks == 4) 2928 if (selection.clicks == 4)
2975 return; /* nothing selected, go away */ 2929 return; /* nothing selected, go away */
2976 2930
2931 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2932 return;
2933
2977 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2934 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2978 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2935 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2979 2936
2980 col = selection.beg.col;
2981 row = selection.beg.row + saveLines;
2982 end_row = selection.end.row + saveLines;
2983 int ofs = 0; 2937 int ofs = 0;
2984 int extra = 0; 2938 int extra = 0;
2985 2939
2940 int col = selection.beg.col;
2941 int row = selection.beg.row;
2942
2943 int end_col;
2944
2986 for (; row <= end_row; row++, col = 0) 2945 for (; row <= selection.end.row; row++, col = 0)
2987 { 2946 {
2988#if ENABLE_FRILLS 2947#if ENABLE_FRILLS
2989 if (selection.rect) 2948 if (selection.rect)
2990 { 2949 {
2991 col = selection.beg.col; 2950 col = selection.beg.col;
2992 end_col = ncol + 1; 2951 end_col = ncol + 1;
2993 } 2952 }
2994 else 2953 else
2995#endif 2954#endif
2996 end_col = save[row].is_longer () ? ncol : save[row].l; //TODO//FIXME//LEN 2955 end_col = ROW(row).l;
2997 2956
2998 MAX_IT (col, 0); 2957 col = max (col, 0);
2999 2958
3000 if (row == end_row || selection.rect) 2959 if (row == selection.end.row
2960#if ENABLE_FRILLS
2961 || selection.rect
2962#endif
2963 )
3001 MIN_IT (end_col, selection.end.col); 2964 min_it (end_col, selection.end.col);
3002 2965
3003 t = save[row].t + col; 2966 t = ROW(row).t + col;
2967
3004 for (; col < end_col; col++) 2968 for (; col < end_col; col++)
3005 { 2969 {
3006 if (*t == NOCHAR) 2970 if (*t == NOCHAR)
3007 t++; 2971 t++;
3008#if ENABLE_COMBINING 2972#if ENABLE_COMBINING
… …
3024#endif 2988#endif
3025 else 2989 else
3026 new_selection_text[ofs++] = *t++; 2990 new_selection_text[ofs++] = *t++;
3027 } 2991 }
3028 2992
3029 if (!save[row].is_longer () && row != end_row) 2993#if ENABLE_FRILLS
2994 if (selection.rect)
2995 {
2996 while (ofs
2997 && new_selection_text[ofs - 1] != C0_LF
2998 && unicode::is_space (new_selection_text[ofs - 1]))
2999 --ofs;
3000
3030 new_selection_text[ofs++] = C0_LF; 3001 new_selection_text[ofs++] = C0_LF;
3002 }
3003 else
3004#endif
3005 if (!ROW(row).is_longer () && row != selection.end.row)
3006 new_selection_text[ofs++] = C0_LF;
3031 } 3007 }
3032 3008
3033 if (end_col != selection.end.col) 3009 if (end_col != selection.end.col)
3034 new_selection_text[ofs++] = C0_LF; 3010 new_selection_text[ofs++] = C0_LF;
3035 3011
… …
3045 3021
3046 // we usually allocate much more than necessary, so realloc it smaller again 3022 // we usually allocate much more than necessary, so realloc it smaller again
3047 selection.len = ofs; 3023 selection.len = ofs;
3048 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3024 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3049 3025
3026 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3027 return;
3028
3029 selection_grab (tm);
3030}
3031
3032bool
3033rxvt_term::selection_grab (Time tm) NOTHROW
3034{
3035 selection_time = tm;
3036
3050 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3037 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
3051 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3038 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3039 {
3052 display->set_selection_owner (this); 3040 display->set_selection_owner (this);
3041 return true;
3042 }
3053 else 3043 else
3054 rxvt_warn ("can't get primary selection, ignoring.\n"); 3044 {
3045 selection_clear ();
3046 return false;
3047 }
3055 3048
3056#if 0 3049#if 0
3057 XTextProperty ct; 3050 XTextProperty ct;
3058 3051
3059 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3052 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)
3060 { 3053 {
3061 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3054 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3062 XFree (ct.value); 3055 XFree (ct.value);
3063 } 3056 }
3064#endif 3057#endif
3065
3066 selection_time = tm;
3067} 3058}
3068 3059
3069/* ------------------------------------------------------------------------- */ 3060/* ------------------------------------------------------------------------- */
3070/* 3061/*
3071 * Mark or select text based upon number of clicks: 1, 2, or 3 3062 * Mark or select text based upon number of clicks: 1, 2, or 3
3072 * EXT: button 1 press 3063 * EXT: button 1 press
3073 */ 3064 */
3074void 3065void
3075rxvt_term::selection_click (int clicks, int x, int y) 3066rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3076{ 3067{
3077 clicks = ((clicks - 1) % 3) + 1; 3068 clicks = ((clicks - 1) % 3) + 1;
3078 selection.clicks = clicks; /* save clicks so extend will work */ 3069 selection.clicks = clicks; /* save clicks so extend will work */
3079 3070
3071 if (clicks == 2 && !selection.rect
3072 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3073 {
3074 MEvent.clicks = 1; // what a mess
3075 selection.screen = current_screen;
3076 selection.op = SELECTION_CONT;
3077 return;
3078 }
3079
3080 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3080 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3081 3081
3082 if (clicks == 2 || clicks == 3) 3082 if (clicks == 2 || clicks == 3)
3083 selection_extend_colrow (selection.mark.col, 3083 selection_extend_colrow (selection.mark.col,
3084 selection.mark.row + view_start, 3084 selection.mark.row - view_start,
3085 0, /* button 3 */ 3085 0, /* button 3 */
3086 1, /* button press */ 3086 1, /* button press */
3087 0); /* click change */ 3087 0); /* click change */
3088} 3088}
3089 3089
3090/* ------------------------------------------------------------------------- */ 3090/* ------------------------------------------------------------------------- */
3091/* 3091/*
3092 * Mark a selection at the specified col/row 3092 * Mark a selection at the specified col/row
3093 */ 3093 */
3094void 3094void
3095rxvt_term::selection_start_colrow (int col, int row) 3095rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3096{ 3096{
3097 want_refresh = 1; 3097 want_refresh = 1;
3098
3099 selection.mark.row = row + view_start;
3098 selection.mark.col = col; 3100 selection.mark.col = col;
3099 selection.mark.row = row - view_start;
3100 3101
3101 MAX_IT (selection.mark.row, - (int32_t)nscrolled); 3102 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3102 MIN_IT (selection.mark.row, (int32_t)nrow - 1); 3103 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3103 MAX_IT (selection.mark.col, 0);
3104 MIN_IT (selection.mark.col, (int32_t)ncol - 1);
3105 3104
3106 while (selection.mark.col > 0 3105 while (selection.mark.col > 0
3107 && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR) 3106 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3108 --selection.mark.col; 3107 --selection.mark.col;
3109 3108
3110 if (selection.op) 3109 if (selection.op)
3111 { /* clear the old selection */ 3110 { /* clear the old selection */
3112 selection.beg.row = selection.end.row = selection.mark.row; 3111 selection.beg.row = selection.end.row = selection.mark.row;
… …
3127#define DELIMIT_TEXT(x) \ 3126#define DELIMIT_TEXT(x) \
3128 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3127 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3129#define DELIMIT_REND(x) 1 3128#define DELIMIT_REND(x) 1
3130 3129
3131void 3130void
3132rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3131rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3133{ 3132{
3134 int col, row, dirnadd, tcol, trow, w1, w2; 3133 int col, row, dirnadd, tcol, trow, w1, w2;
3135 row_col_t bound; 3134 row_col_t bound;
3136 text_t *stp; 3135 text_t *stp;
3137 rend_t *srp; 3136 rend_t *srp;
3138 3137
3139 if (dirn == UP) 3138 if (dirn == UP)
3140 { 3139 {
3141 bound.row = saveLines - nscrolled - 1; 3140 bound.row = top_row - 1;
3142 bound.col = 0; 3141 bound.col = 0;
3143 dirnadd = -1; 3142 dirnadd = -1;
3144 } 3143 }
3145 else 3144 else
3146 { 3145 {
3147 bound.row = saveLines + nrow; 3146 bound.row = nrow;
3148 bound.col = ncol - 1; 3147 bound.col = ncol - 1;
3149 dirnadd = 1; 3148 dirnadd = 1;
3150 } 3149 }
3151 3150
3152 row = mark->row + saveLines; 3151 row = mark->row;
3153 col = mark->col; 3152 col = max (mark->col, 0);
3154 MAX_IT (col, 0); 3153
3155 /* find the edge of a word */ 3154 /* find the edge of a word */
3156 stp = save[row].t + col; w1 = DELIMIT_TEXT (*stp); 3155 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3157 srp = save[row].r + col; w2 = DELIMIT_REND (*srp); 3156 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3158 3157
3159 for (;;) 3158 for (;;)
3160 { 3159 {
3161 for (; col != bound.col; col += dirnadd) 3160 for (; col != bound.col; col += dirnadd)
3162 { 3161 {
… …
3172 break; 3171 break;
3173 } 3172 }
3174 3173
3175 if ((col == bound.col) && (row != bound.row)) 3174 if ((col == bound.col) && (row != bound.row))
3176 { 3175 {
3177 if (save[ (row - (dirn == UP ? 1 : 0))].is_longer ()) 3176 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3178 { 3177 {
3179 trow = row + dirnadd; 3178 trow = row + dirnadd;
3180 tcol = dirn == UP ? ncol - 1 : 0; 3179 tcol = dirn == UP ? ncol - 1 : 0;
3181 3180
3182 if (!save[trow].t) 3181 if (!ROW(trow).t)
3183 break; 3182 break;
3184 3183
3185 stp = save[trow].t + tcol; 3184 stp = ROW(trow).t + tcol;
3186 srp = save[trow].r + tcol; 3185 srp = ROW(trow).r + tcol;
3187 3186
3188 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3187 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3189 break; 3188 break;
3190 3189
3191 row = trow; 3190 row = trow;
… …
3194 } 3193 }
3195 } 3194 }
3196 break; 3195 break;
3197 } 3196 }
3198 3197
3199Old_Word_Selection_You_Die:
3200 if (dirn == DN) 3198 if (dirn == DN)
3201 col++; /* put us on one past the end */ 3199 col++; /* put us on one past the end */
3202 3200
3203 /* Poke the values back in */ 3201 /* Poke the values back in */
3204 ret->row = row - saveLines; 3202 ret->row = row;
3205 ret->col = col; 3203 ret->col = col;
3206} 3204}
3207 3205
3208/* ------------------------------------------------------------------------- */ 3206/* ------------------------------------------------------------------------- */
3209/* 3207/*
… …
3212 * flag == 0 ==> button 1 3210 * flag == 0 ==> button 1
3213 * flag == 1 ==> button 3 press 3211 * flag == 1 ==> button 3 press
3214 * flag == 2 ==> button 3 motion 3212 * flag == 2 ==> button 3 motion
3215 */ 3213 */
3216void 3214void
3217rxvt_term::selection_extend (int x, int y, int flag) 3215rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3218{ 3216{
3219 int col, row; 3217 int col = clamp (Pixel2Col (x), 0, ncol);
3220 3218 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3221 col = Pixel2Col (x);
3222 row = Pixel2Row (y);
3223 MAX_IT (row, 0);
3224 MIN_IT (row, (int)nrow - 1);
3225 MAX_IT (col, 0);
3226 MIN_IT (col, (int)ncol);
3227 3219
3228 /* 3220 /*
3229 * If we're selecting characters (single click) then we must check first 3221 * If we're selecting characters (single click) then we must check first
3230 * if we are at the same place as the original mark. If we are then 3222 * if we are at the same place as the original mark. If we are then
3231 * select nothing. Otherwise, if we're to the right of the mark, you have to 3223 * select nothing. Otherwise, if we're to the right of the mark, you have to
3232 * be _past_ a character for it to be selected. 3224 * be _past_ a character for it to be selected.
3233 */ 3225 */
3234 if (((selection.clicks % 3) == 1) && !flag 3226 if (((selection.clicks % 3) == 1) && !flag
3235 && (col == selection.mark.col 3227 && (col == selection.mark.col
3236 && (row == selection.mark.row + view_start))) 3228 && (row == selection.mark.row - view_start)))
3237 { 3229 {
3238 /* select nothing */ 3230 /* select nothing */
3239 selection.beg.row = selection.end.row = 0; 3231 selection.beg.row = selection.end.row = 0;
3240 selection.beg.col = selection.end.col = 0; 3232 selection.beg.col = selection.end.col = 0;
3241 selection.clicks = 4; 3233 selection.clicks = 4;
… …
3254/* ------------------------------------------------------------------------- */ 3246/* ------------------------------------------------------------------------- */
3255/* 3247/*
3256 * Extend the selection to the specified col/row 3248 * Extend the selection to the specified col/row
3257 */ 3249 */
3258void 3250void
3259rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3251rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3260{ 3252{
3261 row_col_t pos; 3253 row_col_t pos;
3262 enum { 3254 enum {
3263 LEFT, RIGHT 3255 LEFT, RIGHT
3264 } closeto = RIGHT; 3256 } closeto = RIGHT;
… …
3296 selection.beg.col = selection.end.col = selection.mark.col; 3288 selection.beg.col = selection.end.col = selection.mark.col;
3297 selection.beg.row = selection.end.row = selection.mark.row; 3289 selection.beg.row = selection.end.row = selection.mark.row;
3298 } 3290 }
3299 3291
3300 pos.col = col; 3292 pos.col = col;
3301 pos.row = row; 3293 pos.row = view_start + row;
3302
3303 pos.row -= view_start; /* adjust for scroll */
3304 3294
3305 /* 3295 /*
3306 * This is mainly xterm style selection with a couple of differences, mainly 3296 * This is mainly xterm style selection with a couple of differences, mainly
3307 * in the way button3 drag extension works. 3297 * in the way button3 drag extension works.
3308 * We're either doing: button1 drag; button3 press; or button3 drag 3298 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3367 } 3357 }
3368 } 3358 }
3369 3359
3370 if (selection.clicks == 1) 3360 if (selection.clicks == 1)
3371 { 3361 {
3372 if (selection.beg.col > save[selection.beg.row + saveLines].l //TODO//FIXME//LEN 3362 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3373 && !save[selection.beg.row + saveLines].is_longer () 3363 && !ROW(selection.beg.row).is_longer ()
3374#if ENABLE_FRILLS 3364#if ENABLE_FRILLS
3375 && !selection.rect 3365 && !selection.rect
3376#endif 3366#endif
3377 ) 3367 )
3378 selection.beg.col = ncol; 3368 selection.beg.col = ncol;
3379 3369
3380 if ( 3370 if (
3381 selection.end.col > save[selection.end.row + saveLines].l //TODO//FIXME//LEN 3371 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3382 && !save[selection.end.row + saveLines].is_longer () 3372 && !ROW(selection.end.row).is_longer ()
3383#if ENABLE_FRILLS 3373#if ENABLE_FRILLS
3384 && !selection.rect 3374 && !selection.rect
3385#endif 3375#endif
3386 ) 3376 )
3387 selection.end.col = ncol; 3377 selection.end.col = ncol;
… …
3395 selection_delimit_word (DN, &selection.end, &selection.end); 3385 selection_delimit_word (DN, &selection.end, &selection.end);
3396 } 3386 }
3397 else if (selection.clicks == 3) 3387 else if (selection.clicks == 3)
3398 { 3388 {
3399#if ENABLE_FRILLS 3389#if ENABLE_FRILLS
3400 if (options & Opt_tripleclickwords) 3390 if (OPTION (Opt_tripleclickwords))
3401 { 3391 {
3402 selection_delimit_word (UP, &selection.beg, &selection.beg); 3392 selection_delimit_word (UP, &selection.beg, &selection.beg);
3403 3393
3404 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3394 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3405 { 3395 {
3406 if (!save[end_row + saveLines].is_longer ()) 3396 if (!ROW(end_row).is_longer ())
3407 { 3397 {
3408 selection.end.row = end_row; 3398 selection.end.row = end_row;
3409 selection.end.col = save[end_row + saveLines].l; 3399 selection.end.col = ROW(end_row).l;
3410 selection_remove_trailing_spaces (); 3400 selection_remove_trailing_spaces ();
3411 break; 3401 break;
3412 } 3402 }
3413 } 3403 }
3414 } 3404 }
… …
3421 selection.beg.col = 0; 3411 selection.beg.col = 0;
3422 selection.end.col = ncol; 3412 selection.end.col = ncol;
3423 3413
3424 // select a complete logical line 3414 // select a complete logical line
3425 while (selection.beg.row > -saveLines 3415 while (selection.beg.row > -saveLines
3426 && save[selection.beg.row - 1 + saveLines].is_longer ()) 3416 && ROW(selection.beg.row - 1).is_longer ())
3427 selection.beg.row--; 3417 selection.beg.row--;
3428 3418
3429 while (selection.end.row < nrow 3419 while (selection.end.row < nrow
3430 && save[selection.end.row + saveLines].is_longer ()) 3420 && ROW(selection.end.row).is_longer ())
3431 selection.end.row++; 3421 selection.end.row++;
3432 } 3422 }
3433 } 3423 }
3434 3424
3435 if (button3 && buttonpress) 3425 if (button3 && buttonpress)
… …
3446 } 3436 }
3447 } 3437 }
3448 3438
3449#if ENABLE_FRILLS 3439#if ENABLE_FRILLS
3450 if (selection.rect && selection.beg.col > selection.end.col) 3440 if (selection.rect && selection.beg.col > selection.end.col)
3451 SWAP_IT (selection.beg.col, selection.end.col, int); 3441 ::swap (selection.beg.col, selection.end.col);
3452#endif 3442#endif
3453} 3443}
3454 3444
3455#if ENABLE_FRILLS 3445#if ENABLE_FRILLS
3456void 3446void
3457rxvt_term::selection_remove_trailing_spaces () 3447rxvt_term::selection_remove_trailing_spaces () NOTHROW
3458{ 3448{
3459 int32_t end_col, end_row; 3449 int32_t end_col, end_row;
3460 text_t *stp; 3450 text_t *stp;
3461 3451
3462 end_col = selection.end.col; 3452 end_col = selection.end.col;
3463 end_row = selection.end.row; 3453 end_row = selection.end.row;
3464 3454
3465 for ( ; end_row >= selection.beg.row; ) 3455 for (; end_row >= selection.beg.row; )
3466 { 3456 {
3467 stp = save[end_row + saveLines].t; 3457 stp = ROW(end_row).t;
3468 3458
3469 while (--end_col >= 0) 3459 while (--end_col >= 0)
3470 { 3460 {
3471 if (stp[end_col] != ' ' 3461 if (stp[end_col] != NOCHAR
3472 && stp[end_col] != '\t' 3462 && !unicode::is_space (stp[end_col]))
3473 && stp[end_col] != NOCHAR)
3474 break; 3463 break;
3475 } 3464 }
3476 3465
3477 if (end_col >= 0 3466 if (end_col >= 0
3478 || !save[end_row - 1 + saveLines].is_longer ()) 3467 || !ROW(end_row - 1).is_longer ())
3479 { 3468 {
3480 selection.end.col = end_col + 1; 3469 selection.end.col = end_col + 1;
3481 selection.end.row = end_row; 3470 selection.end.row = end_row;
3482 break; 3471 break;
3483 } 3472 }
… …
3501/* 3490/*
3502 * Double click on button 3 when already selected 3491 * Double click on button 3 when already selected
3503 * EXT: button 3 double click 3492 * EXT: button 3 double click
3504 */ 3493 */
3505void 3494void
3506rxvt_term::selection_rotate (int x, int y) 3495rxvt_term::selection_rotate (int x, int y) NOTHROW
3507{ 3496{
3508 selection.clicks = selection.clicks % 3 + 1; 3497 selection.clicks = selection.clicks % 3 + 1;
3509 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3498 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3510} 3499}
3511 3500
… …
3513/* 3502/*
3514 * Respond to a request for our current selection 3503 * Respond to a request for our current selection
3515 * EXT: SelectionRequest 3504 * EXT: SelectionRequest
3516 */ 3505 */
3517void 3506void
3518rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3507rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3519{ 3508{
3520 XSelectionEvent ev; 3509 XSelectionEvent ev;
3521 dDisp;
3522 3510
3523 ev.type = SelectionNotify; 3511 ev.type = SelectionNotify;
3524 ev.property = None; 3512 ev.property = None;
3525 ev.display = rq.display; 3513 ev.display = rq.display;
3526 ev.requestor = rq.requestor; 3514 ev.requestor = rq.requestor;
… …
3540 *target++ = xa[XA_COMPOUND_TEXT]; 3528 *target++ = xa[XA_COMPOUND_TEXT];
3541#if X_HAVE_UTF8_STRING 3529#if X_HAVE_UTF8_STRING
3542 *target++ = xa[XA_UTF8_STRING]; 3530 *target++ = xa[XA_UTF8_STRING];
3543#endif 3531#endif
3544 3532
3545 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3533 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,
3546 32, PropModeReplace, 3534 32, PropModeReplace,
3547 (unsigned char *)target_list, target - target_list); 3535 (unsigned char *)target_list, target - target_list);
3548 ev.property = rq.property; 3536 ev.property = rq.property;
3549 } 3537 }
3550#if TODO // TODO 3538#if TODO // TODO
… …
3553 /* TODO: Handle MULTIPLE */ 3541 /* TODO: Handle MULTIPLE */
3554 } 3542 }
3555#endif 3543#endif
3556 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3544 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3557 { 3545 {
3558 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3546 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target,
3559 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3547 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3560 ev.property = rq.property; 3548 ev.property = rq.property;
3561 } 3549 }
3562 else if (rq.target == XA_STRING 3550 else if (rq.target == XA_STRING
3563 || rq.target == xa[XA_TEXT] 3551 || rq.target == xa[XA_TEXT]
… …
3621 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3609 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3622 ct.nitems = strlen ((char *)ct.value); 3610 ct.nitems = strlen ((char *)ct.value);
3623 } 3611 }
3624 else 3612 else
3625#endif 3613#endif
3626 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3614 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3627 freect = 1; 3615 freect = 1;
3628 else 3616 else
3629 { 3617 {
3630 /* if we failed to convert then send it raw */ 3618 /* if we failed to convert then send it raw */
3631 ct.value = (unsigned char *)cl; 3619 ct.value = (unsigned char *)cl;
3632 ct.nitems = selectlen; 3620 ct.nitems = selectlen;
3633 ct.encoding = target; 3621 ct.encoding = target;
3634 } 3622 }
3635 3623
3636 XChangeProperty (disp, rq.requestor, rq.property, 3624 XChangeProperty (xdisp, rq.requestor, rq.property,
3637 ct.encoding, 8, PropModeReplace, 3625 ct.encoding, 8, PropModeReplace,
3638 ct.value, (int)ct.nitems); 3626 ct.value, (int)ct.nitems);
3639 ev.property = rq.property; 3627 ev.property = rq.property;
3640 3628
3641 if (freect) 3629 if (freect)
3642 XFree (ct.value); 3630 XFree (ct.value);
3643 } 3631 }
3644 3632
3645 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3633 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);
3646} 3634}
3647 3635
3648/* ------------------------------------------------------------------------- * 3636/* ------------------------------------------------------------------------- *
3649 * MOUSE ROUTINES * 3637 * MOUSE ROUTINES *
3650 * ------------------------------------------------------------------------- */ 3638 * ------------------------------------------------------------------------- */
3651 3639
3652/* 3640/*
3653 * return col/row values corresponding to x/y pixel values 3641 * return col/row values corresponding to x/y pixel values
3654 */ 3642 */
3655void 3643void
3656rxvt_term::pixel_position (int *x, int *y) 3644rxvt_term::pixel_position (int *x, int *y) NOTHROW
3657{ 3645{
3658 *x = Pixel2Col (*x); 3646 *x = Pixel2Col (*x);
3659 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3647 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3660 *y = Pixel2Row (*y); 3648 *y = Pixel2Row (*y);
3661 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3649 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3662} 3650}
3663 3651
3664/* ------------------------------------------------------------------------- */ 3652/* ------------------------------------------------------------------------- */
3665#ifdef USE_XIM 3653#ifdef USE_XIM
3666void 3654void
3667rxvt_term::im_set_position (XPoint &pos) 3655rxvt_term::im_set_position (XPoint &pos) NOTHROW
3668{ 3656{
3669 XWindowAttributes xwa; 3657 XWindowAttributes xwa;
3670 3658
3671 XGetWindowAttributes (display->display, vt, &xwa); 3659 XGetWindowAttributes (xdisp, vt, &xwa);
3672 3660
3673 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3661 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3674 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3662 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3675} 3663}
3676#endif 3664#endif
3677 3665
3678#if ENABLE_OVERLAY 3666#if ENABLE_OVERLAY
3679void 3667void
3680rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3668rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3681{ 3669{
3682 if (nrow < 3 || ncol < 3) 3670 if (nrow < 1 || ncol < 1)
3683 return; 3671 return;
3684 3672
3685 want_refresh = 1; 3673 want_refresh = 1;
3686 3674
3687 scr_overlay_off (); 3675 scr_overlay_off ();
3688 3676
3689 if (x < 0) x = ncol - w; 3677 if (x < 0) x = ncol - w;
3690 if (y < 0) y = nrow - h; 3678 if (y < 0) y = nrow - h;
3691 3679
3692 // make space for border 3680 // make space for border
3693 w += 2; MIN_IT (w, ncol); 3681 w += 2; min_it (w, ncol);
3694 h += 2; MIN_IT (h, nrow); 3682 h += 2; min_it (h, nrow);
3695 3683
3696 x -= 1; MAX_IT (x, 0); 3684 x -= 1; clamp_it (x, 0, ncol - w);
3697 y -= 1; MAX_IT (y, 0); 3685 y -= 1; clamp_it (y, 0, nrow - h);
3698
3699 MIN_IT (x, ncol - w);
3700 MIN_IT (y, nrow - h);
3701 3686
3702 ov_x = x; ov_y = y; 3687 ov_x = x; ov_y = y;
3703 ov_w = w; ov_h = h; 3688 ov_w = w; ov_h = h;
3704 3689
3705 ov_text = new text_t *[h]; 3690 ov_text = new text_t *[h];
… …
3733 *rp = r; 3718 *rp = r;
3734 } 3719 }
3735} 3720}
3736 3721
3737void 3722void
3738rxvt_term::scr_overlay_off () 3723rxvt_term::scr_overlay_off () NOTHROW
3739{ 3724{
3740 if (!ov_text) 3725 if (!ov_text)
3741 return; 3726 return;
3742 3727
3743 want_refresh = 1; 3728 want_refresh = 1;
… …
3751 delete [] ov_text; ov_text = 0; 3736 delete [] ov_text; ov_text = 0;
3752 delete [] ov_rend; ov_rend = 0; 3737 delete [] ov_rend; ov_rend = 0;
3753} 3738}
3754 3739
3755void 3740void
3756rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3741rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3757{ 3742{
3758 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3743 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3759 return; 3744 return;
3760 3745
3761 x++, y++; 3746 x++, y++;
… …
3763 ov_text[y][x] = text; 3748 ov_text[y][x] = text;
3764 ov_rend[y][x] = rend; 3749 ov_rend[y][x] = rend;
3765} 3750}
3766 3751
3767void 3752void
3768rxvt_term::scr_overlay_set (int x, int y, const char *s) 3753rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3769{ 3754{
3770 while (*s) 3755 while (*s)
3771 scr_overlay_set (x++, y, *s++); 3756 scr_overlay_set (x++, y, *s++);
3772} 3757}
3773 3758
3774void 3759void
3775rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3760rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3776{ 3761{
3777 while (*s) 3762 while (*s)
3778 { 3763 {
3779 text_t t = *s++; 3764 text_t t = *s++;
3780 int width = wcwidth (t); 3765 int width = WCWIDTH (t);
3781 3766
3782 while (width--) 3767 while (width--)
3783 { 3768 {
3784 scr_overlay_set (x++, y, t); 3769 scr_overlay_set (x++, y, t);
3785 t = NOCHAR; 3770 t = NOCHAR;
3786 } 3771 }
3787 } 3772 }
3788} 3773}
3789 3774
3790void 3775void
3791rxvt_term::scr_swap_overlay () 3776rxvt_term::scr_swap_overlay () NOTHROW
3792{ 3777{
3793 if (!ov_text) 3778 if (!ov_text)
3794 return; 3779 return;
3795 3780
3796 int row_offset = ov_y + saveLines - view_start;
3797
3798 // swap screen mem with overlay 3781 // swap screen mem with overlay
3799 for (int y = ov_h; y--; ) 3782 for (int y = ov_h; y--; )
3800 { 3783 {
3801 text_t *t1 = ov_text[y]; 3784 text_t *t1 = ov_text[y];
3802 rend_t *r1 = ov_rend[y]; 3785 rend_t *r1 = ov_rend[y];
3803 3786
3804 text_t *t2 = save[y + row_offset].t + ov_x; 3787 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3805 rend_t *r2 = save[y + row_offset].r + ov_x; 3788 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3806 3789
3807 for (int x = ov_w; x--; ) 3790 for (int x = ov_w; x--; )
3808 { 3791 {
3809 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3792 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3810 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3793 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3812 } 3795 }
3813} 3796}
3814 3797
3815#endif 3798#endif
3816/* ------------------------------------------------------------------------- */ 3799/* ------------------------------------------------------------------------- */
3800

Diff Legend

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