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.221 by root, Wed Jan 11 02:13:56 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() \
… …
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)
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;
… …
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)
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;
… …
168 return; 176 return;
169 177
170 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
171 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
172 { 180 {
181 //TODO//FIXME
173 saveLines++; 182 saveLines++;
174 prev_nrow--; 183 prev_nrow--;
175 nscrolled++; 184 nsaved++;
176 } 185 }
177 186
178 want_refresh = 1; 187 want_refresh = 1;
179 188
180 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
181 int total_rows = nrow + saveLines; 190 total_rows = nrow + saveLines;
182 191
183 screen.tscroll = 0; 192 screen.tscroll = 0;
184 screen.bscroll = nrow - 1; 193 screen.bscroll = nrow - 1;
185 194
186 if (!save) 195 if (!row_buf)
187 { 196 {
188 /* 197 /*
189 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
190 * Note: this is still needed so that all the scrollback lines are NULL
191 */ 199 */
192 nscrolled = 0; /* no saved lines */ 200 nsaved = 0; /* no saved lines */
193 term_start = 0; 201 term_start = 0;
194 nsaved = 0;
195 202
196 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 205
199 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
200 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
201 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
202 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
203 209
204 screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *));
205
206 scr_update_term ();
207
208 for (p = nrow; p--; ) 210 for (int row = nrow; row--; )
209 { 211 {
210 scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213 } 215 }
214 216
215 memset (charsets, 'B', sizeof (charsets)); 217 memset (charsets, 'B', sizeof (charsets));
216 rstyle = DEFAULT_RSTYLE; 218 rstyle = DEFAULT_RSTYLE;
217 screen.flags = Screen_DefaultFlags; 219 screen.flags = Screen_DefaultFlags;
… …
241 { 243 {
242 /* 244 /*
243 * add or delete rows as appropriate 245 * add or delete rows as appropriate
244 */ 246 */
245 247
246 rxvt_salloc *old_ta; 248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247 rxvt_salloc *old_ra; 249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248 250
251#if 0
249 if (nrow < prev_nrow) 252 if (nrow < prev_nrow)
250 { 253 {
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++) 254 for (int row = nrow; row < prev_nrow; row++)
257 { 255 {
258 lfree (save[p + saveLines]);
259 lfree (swap_save[p]); 256 lfree (swap_buf [row]);
260 lfree (drawn[p]); 257 lfree (drawn_buf[row]);
261 } 258 }
259 }
260#endif
262 261
263 /* we have fewer rows so fix up cursor position */ 262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
264 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
265 264
266 scr_reset_realloc (); /* realloc _last_ */ 265 for (int row = min (nrow, prev_nrow); row--; )
266 {
267 lresize (drawn_buf[row]);
268 lresize (swap_buf [row]);
269 }
270
271 for (int row = prev_nrow; row < nrow; row++)
272 {
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 }
276
277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
267 } 279
268 else if (nrow > prev_nrow) 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start - nsaved , prev_total_rows);
282 int q = total_rows; // rewrapped row
283
284 if (nsaved)
285 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm.
288
289 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291
269 { 292 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 { 293 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 294 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 295#ifdef DEBUG_STRICT
301 assert (screen.cur.row < nrow); 296 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 297#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; 298 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l;
352 300
353 assert (llen >= 0); 301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
354
355 while (p && save[p - 1].l < 0)
356 { 302 {
303 p = MOD (p - 1, prev_total_rows);
304
357 --p; 305 plines++;
358 llen += prev_ncol; 306 llen += prev_ncol;
359 } 307 }
360 308
361 int qlines = llen / ncol + 1; 309 int qlines = max (0, (llen - 1) / ncol) + 1;
310
311 // drop partial lines completely
312 if (q < qlines)
313 break;
314
315 q -= qlines;
316
362 int lofs = 0; 317 int lofs = 0;
318 line_t *qline;
363 319
364 q -= qlines; 320 // 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++) 321 for (int qrow = q; qlines--; qrow++)
370 { 322 {
323 qline = row_buf + qrow;
324 lalloc (*qline);
325 qline->l = ncol;
326 qline->is_longer (1);
327
371 if (qrow >= 0) 328 int qcol = 0;
329
330 // fill a single destination line
331 while (lofs < llen && qcol < ncol)
372 { 332 {
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; 333 int prow = lofs / prev_ncol;
382 int pcol = lofs % prev_ncol; 334 int pcol = lofs % prev_ncol;
383 335
336 prow = MOD (p + prow, prev_total_rows);
337
338 // we only adjust the cursor _row_ and put it into
339 // the topmost line of "long line" it was in, as
340 // this seems to upset applications/shells/readline
341 // least.
342 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow);
344
345 line_t &pline = old_buf [prow];
346
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385 348
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); 349 assert (len);
350 assert (pline.t);
400 351
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403 354
404 lofs += len; 355 lofs += len;
405 qcol += len; 356 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 } 357 }
411 else
412 lofs += ncol;
413 } 358 }
359
360 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
361 qline->is_longer (0);
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414 } 363 }
364 while (p != pend && q > 0);
365
366 term_start = total_rows - nrow;
367 nsaved = term_start - q;
368
369 // make sure all terminal lines exist
370 while (nsaved < 0)
371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
372 }
373 else
415 } 374 {
375 // if no scrollback exists (yet), wing, instead of wrap
376
377 for (int row = min (nrow, prev_nrow); row--; )
378 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row];
416 381
417 free (screen.text); screen.text = tp; 382 qline = pline;
418 free (screen.rend); screen.rend = rp; 383 lresize (qline);
419 free (screen.tlen); screen.tlen = tl; 384 }
420 385
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 386 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390
391 term_start = 0;
392 }
393
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = -nsaved; i < nrow; i++)
396 assert (ROW (i).t);
422#endif 397#endif
398
399 free (old_buf);
400 delete old_ta;
401 delete old_ra;
402
403 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1);
423 405
424 if (tabs) 406 if (tabs)
425 free (tabs); 407 free (tabs);
426 } 408 }
427 409
428 prev_nrow = nrow; 410 prev_nrow = nrow;
429 prev_ncol = ncol; 411 prev_ncol = ncol;
430 412
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 413 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 414
433 for (p = 0; p < ncol; p++) 415 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 416 tabs [col] = col % TABSIZE == 0;
435 417
436 tt_winch (); 418 tt_winch ();
437}
438 419
439void 420 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} 421}
450 422
451/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
452/* 424/*
453 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
454 */ 426 */
455void 427void
456rxvt_term::scr_release () 428rxvt_term::scr_release ()
457{ 429{
458 unsigned int total_rows;
459
460 total_rows = nrow + saveLines;
461
462 delete talloc; talloc = 0; 430 delete talloc; talloc = 0;
463 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
464 432
465 free (screen.line); 433 free (row_buf);
466 free (save);
467 free (swap_save); 434 free (swap_buf);
468 free (drawn); 435 free (drawn_buf);
469 free (buf);
470 free (tabs); 436 free (tabs);
437
438 row_buf = 0; // signal that we freed all the arrays
471} 439}
472 440
473/* ------------------------------------------------------------------------- */ 441/* ------------------------------------------------------------------------- */
474/* 442/*
475 * Hard reset 443 * Hard reset
… …
526 set_font_style (); 494 set_font_style ();
527 break; 495 break;
528 } 496 }
529 497
530 /* boundary check in case screen size changed between SAVE and RESTORE */ 498 /* boundary check in case screen size changed between SAVE and RESTORE */
531 MIN_IT (s->cur.row, nrow - 1); 499 min_it (s->cur.row, nrow - 1);
532 MIN_IT (s->cur.col, ncol - 1); 500 min_it (s->cur.col, ncol - 1);
533#ifdef DEBUG_STRICT 501#ifdef DEBUG_STRICT
534 assert (s->cur.row >= 0); 502 assert (s->cur.row >= 0);
535 assert (s->cur.col >= 0); 503 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 504#endif
540} 505}
541 506
542/* ------------------------------------------------------------------------- */ 507/* ------------------------------------------------------------------------- */
543/* 508/*
… …
546 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
547 */ 512 */
548int 513int
549rxvt_term::scr_change_screen (int scrn) 514rxvt_term::scr_change_screen (int scrn)
550{ 515{
551 int i;
552#if NSCREENS
553 int offset;
554#endif
555
556 want_refresh = 1; 516 want_refresh = 1;
557
558 view_start = 0; 517 view_start = 0;
559 518
560 if (current_screen == scrn) 519 if (current_screen == scrn)
561 return scrn; 520 return scrn;
562 521
563 selection_check (2); /* check for boundary cross */ 522 selection_check (2); /* check for boundary cross */
564 523
565 i = current_screen; current_screen = scrn; scrn = i; 524 int i = current_screen; current_screen = scrn; scrn = i;
566 525
567 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 526 ::swap (screen.cur.row, swap.cur.row);
568 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 527 ::swap (screen.cur.col, swap.cur.col);
569 MAX_IT (screen.cur.row, 0); 528
570 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
571 MAX_IT (screen.cur.col, 0); 530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
572 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
573 531
574#if NSCREENS 532#if NSCREENS
575 if (options & Opt_secondaryScreen) 533 if (OPTION (Opt_secondaryScreen))
576 { 534 {
577 num_scr = 0; 535 num_scr = 0;
578 offset = saveLines;
579 536
580 for (i = prev_nrow; i--;) 537 for (int i = prev_nrow; i--; )
581 SWAP_IT (*(screen.line[i]), swap_save[i], line_t); 538 ::swap (ROW(i), swap_buf [i]);
582 539
583 SWAP_IT (screen.charset, swap.charset, int16_t); 540 ::swap (screen.charset, swap.charset);
584 SWAP_IT (screen.flags, swap.flags, int); 541 ::swap (screen.flags, swap.flags);
585 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
586 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
587 } 544 }
588 else 545 else
589#endif 546#endif
590 if (options & Opt_secondaryScroll) 547 if (OPTION (Opt_secondaryScroll))
591 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
592 549
593 return scrn; 550 return scrn;
594} 551}
595 552
596// clear WrapNext indicator, solidifying position on next line 553// clear WrapNext indicator, solidifying position on next line
… …
603 screen.flags &= ~Screen_WrapNext; 560 screen.flags &= ~Screen_WrapNext;
604 561
605 screen.cur.col = 0; 562 screen.cur.col = 0;
606 563
607 if (screen.cur.row == screen.bscroll) 564 if (screen.cur.row == screen.bscroll)
608 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 565 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
609 else if (screen.cur.row < nrow - 1) 566 else if (screen.cur.row < nrow - 1)
610 screen.cur.row++; 567 screen.cur.row++;
611} 568}
612 569
613/* ------------------------------------------------------------------------- */ 570/* ------------------------------------------------------------------------- */
… …
639 rstyle = DEFAULT_RSTYLE; 596 rstyle = DEFAULT_RSTYLE;
640 else 597 else
641 rstyle &= ~style; 598 rstyle &= ~style;
642 } 599 }
643 600
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/* ------------------------------------------------------------------------- */ 601/* ------------------------------------------------------------------------- */
653/* 602/*
654 * Scroll text between <row1> and <row2> inclusive, by <count> lines 603 * Scroll text between <row1> and <row2> inclusive, by <count> lines
655 * count positive ==> scroll up 604 * count positive ==> scroll up
656 * count negative ==> scroll down 605 * count negative ==> scroll down
657 * spec == 0 for normal routines
658 */ 606 */
659int 607int
660rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 608rxvt_term::scr_scroll_text (int row1, int row2, int count)
661{ 609{
662 int i, j;
663
664 if (count == 0 || (row1 > row2)) 610 if (count == 0 || (row1 > row2))
665 return 0; 611 return 0;
666 612
667 want_refresh = 1; 613 want_refresh = 1;
614 num_scr += count;
668 615
669 if (row1 == 0 && count > 0 616 if (count > 0
617 && row1 == 0
618 && row2 == nrow - 1
670 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
671 { 620 {
672 nscrolled += count; 621 nsaved = min (nsaved + count, saveLines);
673 622
674 if (nscrolled > saveLines) 623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
675 nscrolled = saveLines; 624
625 term_start = (term_start + count) % total_rows;
676 626
627 if (selection.op && current_screen == selection.screen)
628 {
629 selection.beg.row -= count;
630 selection.end.row -= count;
631 selection.mark.row -= count;
632
633 if (selection.beg.row < -nsaved
634 || selection.end.row < -nsaved
635 || selection.mark.row < -nsaved)
636 {
637 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR;
639 }
640 }
641
642 for (int i = count; i--; )
643 {
644 // basically thi is a slightly optimized scr_blank_screen_mem
645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
652 }
653
677 if ((options & Opt_scrollWithBuffer) 654 if (OPTION (Opt_scrollWithBuffer)
678 && view_start != 0 655 && view_start != 0
679 && view_start != saveLines) 656 && view_start != saveLines)
680 scr_page (UP, count); 657 scr_page (UP, count);
681 } 658 }
682 else if (!spec) 659 else
683 row1 += saveLines; 660 {
684
685 row2 += saveLines;
686
687 if (selection.op && current_screen == selection.screen) 661 if (selection.op && current_screen == selection.screen)
688 { 662 {
689 i = selection.beg.row + saveLines; 663 if ((selection.beg.row < row1 && selection.end.row > row1)
690 j = selection.end.row + saveLines; 664 || (selection.beg.row < row2 && selection.end.row > row2)
691 665 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
692 if ((i < row1 && j > row1) 666 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
693 || (i < row2 && j > row2) 667 || (selection.end.row - count < row1 && selection.end.row >= row1)
694 || (i - count < row1 && i >= row1) 668 || (selection.end.row - count > row2 && selection.end.row <= row2))
695 || (i - count > row2 && i <= row2)
696 || (j - count < row1 && j >= row1)
697 || (j - count > row2 && j <= row2))
698 { 669 {
699 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
700 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
701 } 672 }
702 else if (j >= row1 && j <= row2) 673 else if (selection.end.row >= row1 && selection.end.row <= row2)
703 { 674 {
704 /* move selected region too */ 675 /* move selected region too */
705 selection.beg.row -= count; 676 selection.beg.row -= count;
706 selection.end.row -= count; 677 selection.end.row -= count;
707 selection.mark.row -= count; 678 selection.mark.row -= count;
679
680 selection_check (0);
681 }
682 }
683
684 // use a simple and robust scrolling algorithm, this
685 // part of scr_scroll_text is not time-critical.
686
687 int rows = row2 - row1 + 1;
688
689 min_it (count, rows);
690
691 line_t *temp_buf = row_buf + total_rows;
692
693 for (int row = 0; row < rows; row++)
708 } 694 {
709 } 695 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
710 696
711 selection_check (0); /* _after_ nscrolled update */ 697 if (!IN_RANGE_EXC (row + count, 0, rows))
698 scr_blank_screen_mem (temp_buf [row], rstyle);
699 }
712 700
713 num_scr += count; 701 for (int row = 0; row < rows; row++)
714 j = count; 702 ROW(row1 + row) = temp_buf [row];
715
716 if (count < 0)
717 count = -count;
718
719 i = row2 - row1 + 1;
720 MIN_IT (count, i);
721
722 if (j > 0)
723 { 703 }
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 704
760 return count; 705 return count;
761} 706}
762 707
763/* ------------------------------------------------------------------------- */ 708/* ------------------------------------------------------------------------- */
764/* 709/*
765 * Add text given in <str> of length <len> to screen struct 710 * Add text given in <str> of length <len> to screen struct
766 */ 711 */
767void 712void
768rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 713rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
769{ 714{
770 if (len <= 0) /* sanity */ 715 if (len <= 0) /* sanity */
771 return; 716 return;
772 717
773 unsigned char checksel; 718 unsigned char checksel;
774 unicode_t c; 719 unicode_t c;
775 int row, last_col; 720 int ncol = this->ncol;
776 const unicode_t *strend = str + len; 721 const wchar_t *strend = str + len;
777 722
778 want_refresh = 1; 723 want_refresh = 1;
779 ZERO_SCROLLBACK (); 724 ZERO_SCROLLBACK ();
780 last_col = ncol;
781 725
782 if (nlines > 0) 726 if (minlines > 0)
783 { 727 {
784 nlines += screen.cur.row - screen.bscroll; 728 minlines += screen.cur.row - screen.bscroll;
729
785 if ((nlines > 0) 730 if (minlines > 0
786 && (screen.tscroll == 0) 731 && screen.tscroll == 0
787 && (screen.bscroll == (nrow - 1))) 732 && screen.bscroll == nrow - 1)
788 { 733 {
789 /* _at least_ this many lines need to be scrolled */ 734 /* _at least_ this many lines need to be scrolled */
790 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 735 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
791 screen.cur.row -= nlines; 736 screen.cur.row -= minlines;
792 } 737 }
793 } 738 }
794 739
795#ifdef DEBUG_STRICT 740#ifdef DEBUG_STRICT
796 assert (screen.cur.col < last_col); 741 assert (screen.cur.col < ncol);
797 assert ((screen.cur.row < nrow) 742 assert (screen.cur.row < nrow
798 && (screen.cur.row >= - (int32_t)nscrolled)); 743 && screen.cur.row >= -nsaved);
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 744#endif
804 row = screen.cur.row + saveLines; 745 int row = screen.cur.row;
805 746
806 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 747 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 748
808 line_t *line = save + row; 749 line_t *line = &ROW(row);
809 750
810 while (str < strend) 751 while (str < strend)
811 { 752 {
812 c = *str++; 753 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
813 754
814 if (c < 0x20) 755 if (c < 0x20)
815 if (c == C0_LF) 756 if (c == C0_LF)
816 { 757 {
817 if (!line->is_longer ()) /* XXX: think about this */
818 MAX_IT (line->l, screen.cur.col); 758 max_it (line->l, screen.cur.col);
819 759
820 screen.flags &= ~Screen_WrapNext; 760 screen.flags &= ~Screen_WrapNext;
821 761
822 if (screen.cur.row == screen.bscroll) 762 if (screen.cur.row == screen.bscroll)
823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 763 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
824 else if (screen.cur.row < (nrow - 1)) 764 else if (screen.cur.row < (nrow - 1))
825 row = (++screen.cur.row) + saveLines; 765 row = ++screen.cur.row;
826 766
827 line = save + row; /* _must_ refresh */ 767 line = &ROW(row); /* _must_ refresh */
828 continue; 768 continue;
829 } 769 }
830 else if (c == C0_CR) 770 else if (c == C0_CR)
831 { 771 {
832 if (!line->is_longer ()) /* XXX: think about this */
833 MAX_IT (line->l, screen.cur.col); 772 max_it (line->l, screen.cur.col);
834 773
835 screen.flags &= ~Screen_WrapNext; 774 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 775 screen.cur.col = 0;
837 continue; 776 continue;
838 } 777 }
… …
855 CLEAR_SELECTION (); 794 CLEAR_SELECTION ();
856 } 795 }
857 796
858 if (screen.flags & Screen_WrapNext) 797 if (screen.flags & Screen_WrapNext)
859 { 798 {
799 max_it (line->l, ncol);
860 line->set_is_longer (); 800 line->is_longer (1);
861 801
862 scr_do_wrap (); 802 scr_do_wrap ();
863 803
864 row = screen.cur.row + saveLines; 804 row = screen.cur.row;
865 line = save + row; /* _must_ refresh */ 805 line = &ROW(row); /* _must_ refresh */
866 } 806 }
867 807
868 // some utf-8 decoders "decode" surrogate characters: let's fix this. 808 // some utf-8 decoders "decode" surrogate characters: let's fix this.
869 if (IN_RANGE (c, 0xd800, 0xdfff)) 809 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
870 c = 0xfffd; 810 c = 0xfffd;
871 811
872 // rely on wcwidth to tell us the character width, at least for non-latin1 812 // rely on wcwidth to tell us the character width, at least for non-latin1
873 // do wcwidth before further replacements, as wcwidth might return -1 813 // do wcwidth before further replacements, as wcwidth might return -1
874 // for the line drawing characters below as they might be invalid in the current 814 // for the line drawing characters below as they might be invalid in the current
875 // locale. 815 // locale.
876 int width = c < 0x100 ? 1 : wcwidth (c); 816 int width = c < 0x100 ? 1 : wcwidth (c);
877 817
878 if (charsets[screen.charset] == '0') // DEC SPECIAL 818 if (charsets [screen.charset] == '0') // DEC SPECIAL
879 { 819 {
880 // vt100 special graphics and line drawing 820 // vt100 special graphics and line drawing
881 // 5f-7e standard vt100 821 // 5f-7e standard vt100
882 // 40-5e rxvt extension for extra curses acs chars 822 // 40-5e rxvt extension for extra curses acs chars
883 static uint16_t vt100_0[62] = { // 41 .. 7e 823 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
935 } 875 }
936 876
937 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 877 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
938 878
939 // if the character doesn't fit into the remaining columns... 879 // if the character doesn't fit into the remaining columns...
940 if (screen.cur.col > last_col - width && last_col >= width) 880 if (screen.cur.col > ncol - width && ncol >= width)
941 { 881 {
942 // ...output spaces 882 // ...output spaces
943 c = ' '; 883 c = ' ';
944 // and try the same character next loop iteration 884 // and try the same character next loop iteration
945 --str; 885 --str;
946 } 886 }
947 887
888 line->touch ();
889
948 do 890 do
949 { 891 {
950 line->t[screen.cur.col] = c; 892 line->t[screen.cur.col] = c;
951 line->r[screen.cur.col] = rend; 893 line->r[screen.cur.col] = rend;
952 894
953 if (screen.cur.col < last_col - 1) 895 if (screen.cur.col < ncol - 1)
954 screen.cur.col++; 896 screen.cur.col++;
955 else 897 else
956 { 898 {
957 line->l = last_col; 899 line->l = ncol;
958 if (screen.flags & Screen_Autowrap) 900 if (screen.flags & Screen_Autowrap)
959 screen.flags |= Screen_WrapNext; 901 screen.flags |= Screen_WrapNext;
960 break; 902 break;
961 } 903 }
962 904
… …
964 } 906 }
965 while (--width > 0); 907 while (--width > 0);
966 908
967 // pad with spaces when overwriting wide character with smaller one 909 // pad with spaces when overwriting wide character with smaller one
968 if (!width) 910 if (!width)
911 {
912 line->touch ();
913
969 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 914 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
970 { 915 {
971 line->t[c] = ' '; 916 line->t[c] = ' ';
972 line->r[c] = rend; 917 line->r[c] = rend;
973 } 918 }
919 }
974 } 920 }
975 else // width == 0 921 else // width == 0
976 { 922 {
977#if ENABLE_COMBINING 923#if ENABLE_COMBINING
978 // handle combining characters 924 // handle combining characters
979 // we just tag the accent on the previous on-screen character. 925 // we just tag the accent on the previous on-screen character.
980 // this is arguably not correct, but also arguably not wrong. 926 // this is arguably not correct, but also arguably not wrong.
981 // we don't handle double-width characters nicely yet. 927 // we don't handle double-width characters nicely yet.
928 line_t *linep;
982 text_t *tp; 929 text_t *tp;
983 rend_t *rp; 930 rend_t *rp;
984 931
985 if (screen.cur.col > 0) 932 if (screen.cur.col > 0)
986 { 933 {
934 linep = line;
987 tp = line->t + screen.cur.col - 1; 935 tp = line->t + screen.cur.col - 1;
988 rp = line->r + screen.cur.col - 1; 936 rp = line->r + screen.cur.col - 1;
989
990 while (*tp == NOCHAR && tp > line->t)
991 tp--, rp--;
992 } 937 }
993 else if (screen.cur.row > 0 938 else if (screen.cur.row > 0
994 && save [screen.cur.row - 1 + saveLines].is_longer ()) 939 && ROW(screen.cur.row - 1).is_longer ())
995 { 940 {
996 line_t *line = save + (screen.cur.row - 1 + saveLines); 941 linep = &ROW(screen.cur.row - 1);
997
998 tp = line->t + last_col - 1; 942 tp = line->t + ncol - 1;
999 rp = line->r + last_col - 1; 943 rp = line->r + ncol - 1;
1000
1001 while (*tp == NOCHAR && tp > line->t)
1002 tp--, rp--;
1003 } 944 }
1004 else 945 else
1005 continue; 946 continue;
947
948 linep->touch ();
949
950 while (*tp == NOCHAR && tp > linep->t)
951 tp--, rp--;
1006 952
1007 // first try to find a precomposed character 953 // first try to find a precomposed character
1008 unicode_t n = rxvt_compose (*tp, c); 954 unicode_t n = rxvt_compose (*tp, c);
1009 if (n == NOCHAR) 955 if (n == NOCHAR)
1010 n = rxvt_composite.compose (*tp, c); 956 n = rxvt_composite.compose (*tp, c);
… …
1013 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 959 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1014#endif 960#endif
1015 } 961 }
1016 } 962 }
1017 963
1018 if (!line->is_longer ()) /* XXX: think about this */
1019 MAX_IT (line->l, screen.cur.col); 964 max_it (line->l, screen.cur.col);
1020 965
1021#ifdef DEBUG_STRICT 966#ifdef DEBUG_STRICT
1022 assert (screen.cur.row >= 0); 967 assert (screen.cur.row >= 0);
1023#else /* drive with your eyes closed */
1024 MAX_IT (screen.cur.row, 0);
1025#endif 968#endif
1026} 969}
1027 970
1028/* ------------------------------------------------------------------------- */ 971/* ------------------------------------------------------------------------- */
1029/* 972/*
… …
1068 1011
1069 if (count == 0) 1012 if (count == 0)
1070 return; 1013 return;
1071 else if (count > 0) 1014 else if (count > 0)
1072 { 1015 {
1073 int row = saveLines + screen.cur.row; 1016 line_t &l = ROW(screen.cur.row);
1074
1075 line_t &l = save[row];
1076 rend_t base_rend = l.r[i]; 1017 rend_t base_rend = l.r[i];
1077 ht &= l.t[i] == ' '; 1018 ht &= l.t[i] == ' ';
1078 1019
1079 for (; ++i < ncol; ) 1020 for (; ++i < ncol; )
1080 if (tabs[i]) 1021 if (tabs[i])
1081 { 1022 {
1082 x = i; 1023 x = i;
1024
1083 if (!--count) 1025 if (!--count)
1084 break; 1026 break;
1085 } 1027 }
1086 else 1028 else
1087 ht &= l.t[i] == ' ' 1029 ht &= l.t[i] == ' '
… …
1090 if (count) 1032 if (count)
1091 x = ncol - 1; 1033 x = ncol - 1;
1092 1034
1093 // store horizontal tab commands as characters inside the text 1035 // store horizontal tab commands as characters inside the text
1094 // buffer so they can be selected and pasted. 1036 // buffer so they can be selected and pasted.
1095 if (ht && options & Opt_pastableTabs) 1037 if (ht && OPTION (Opt_pastableTabs))
1096 { 1038 {
1097 base_rend = SET_FONT (base_rend, 0); 1039 base_rend = SET_FONT (base_rend, 0);
1098 1040
1099 if (!l.is_longer ()) /* XXX: think about this */ 1041 l.touch (x);
1100 MAX_IT (l.l, x);
1101 1042
1102 i = screen.cur.col; 1043 i = screen.cur.col;
1103 1044
1104 l.t[i] = '\t'; 1045 l.t[i] = '\t';
1105 l.r[i] = base_rend; 1046 l.r[i] = base_rend;
… …
1141rxvt_term::scr_backindex () 1082rxvt_term::scr_backindex ()
1142{ 1083{
1143 if (screen.cur.col > 0) 1084 if (screen.cur.col > 0)
1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1085 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145 else 1086 else
1146 {
1147 if (!save[screen.cur.row + saveLines].l)
1148 return; /* um, yeah? */
1149
1150 scr_insdel_chars (1, INSERT); 1087 scr_insdel_chars (1, INSERT);
1151 }
1152} 1088}
1153#endif 1089#endif
1154/* ------------------------------------------------------------------------- */ 1090/* ------------------------------------------------------------------------- */
1155/* 1091/*
1156 * Process DEC Forward Index 1092 * Process DEC Forward Index
… …
1160 */ 1096 */
1161#if ENABLE_FRILLS 1097#if ENABLE_FRILLS
1162void 1098void
1163rxvt_term::scr_forwardindex () 1099rxvt_term::scr_forwardindex ()
1164{ 1100{
1165 int row;
1166
1167 if (screen.cur.col < ncol - 1) 1101 if (screen.cur.col < ncol - 1)
1168 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1102 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1169 else 1103 else
1170 { 1104 {
1171 row = screen.cur.row + saveLines; 1105 line_t &l = ROW(screen.cur.row);
1172 1106
1173 if (!save[row].l) 1107 l.touch ();
1174 return; /* um, yeah? */ 1108 l.is_longer (0);
1175
1176 if (save[row].is_longer ()) //TODO//FIXME//LEN
1177 save[row].l = ncol;
1178 1109
1179 scr_gotorc (0, 0, R_RELATIVE); 1110 scr_gotorc (0, 0, R_RELATIVE);
1180 scr_insdel_chars (1, DELETE); 1111 scr_insdel_chars (1, DELETE);
1181 scr_gotorc (0, ncol - 1, R_RELATIVE); 1112 scr_gotorc (0, ncol - 1, R_RELATIVE);
1182 } 1113 }
… …
1192{ 1123{
1193 want_refresh = 1; 1124 want_refresh = 1;
1194 ZERO_SCROLLBACK (); 1125 ZERO_SCROLLBACK ();
1195 1126
1196 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1127 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1197 MAX_IT (screen.cur.col, 0); 1128 clamp_it (screen.cur.col, 0, ncol - 1);
1198 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1199 1129
1200 screen.flags &= ~Screen_WrapNext; 1130 screen.flags &= ~Screen_WrapNext;
1201 1131
1202 if (relative & R_RELATIVE) 1132 if (relative & R_RELATIVE)
1203 { 1133 {
… …
1221 else 1151 else
1222 { 1152 {
1223 if (screen.flags & Screen_Relative) 1153 if (screen.flags & Screen_Relative)
1224 { /* relative origin mode */ 1154 { /* relative origin mode */
1225 screen.cur.row = row + screen.tscroll; 1155 screen.cur.row = row + screen.tscroll;
1226 MIN_IT (screen.cur.row, screen.bscroll); 1156 min_it (screen.cur.row, screen.bscroll);
1227 } 1157 }
1228 else 1158 else
1229 screen.cur.row = row; 1159 screen.cur.row = row;
1230 } 1160 }
1231 1161
1232 MAX_IT (screen.cur.row, 0); 1162 clamp_it (screen.cur.row, 0, nrow - 1);
1233 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1234} 1163}
1235 1164
1236/* ------------------------------------------------------------------------- */ 1165/* ------------------------------------------------------------------------- */
1237/* 1166/*
1238 * direction should be UP or DN 1167 * direction should be UP or DN
… …
1249 1178
1250 screen.flags &= ~Screen_WrapNext; 1179 screen.flags &= ~Screen_WrapNext;
1251 1180
1252 if ((screen.cur.row == screen.bscroll && direction == UP) 1181 if ((screen.cur.row == screen.bscroll && direction == UP)
1253 || (screen.cur.row == screen.tscroll && direction == DN)) 1182 || (screen.cur.row == screen.tscroll && direction == DN))
1254 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1183 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1255 else 1184 else
1256 screen.cur.row += dirn; 1185 screen.cur.row += dirn;
1257 1186
1258 MAX_IT (screen.cur.row, 0); 1187 clamp_it (screen.cur.row, 0, nrow - 1);
1259 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1260 selection_check (0); 1188 selection_check (0);
1261} 1189}
1262 1190
1263/* ------------------------------------------------------------------------- */ 1191/* ------------------------------------------------------------------------- */
1264/* 1192/*
… …
1268 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1196 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1269 */ 1197 */
1270void 1198void
1271rxvt_term::scr_erase_line (int mode) 1199rxvt_term::scr_erase_line (int mode)
1272{ 1200{
1273 unsigned int row, col, num; 1201 unsigned int col, num;
1274 1202
1275 want_refresh = 1; 1203 want_refresh = 1;
1276 ZERO_SCROLLBACK (); 1204 ZERO_SCROLLBACK ();
1277 1205
1278 selection_check (1); 1206 selection_check (1);
1279 1207
1280 row = saveLines + screen.cur.row; 1208 line_t &line = ROW(screen.cur.row);
1209
1210 line.touch ();
1211 line.is_longer (0);
1281 1212
1282 switch (mode) 1213 switch (mode)
1283 { 1214 {
1284 case 0: /* erase to end of line */ 1215 case 0: /* erase to end of line */
1285 col = screen.cur.col; 1216 col = screen.cur.col;
1286 num = ncol - col; 1217 num = ncol - col;
1287 MIN_IT (save[row].l, (int16_t)col); 1218 min_it (line.l, col);
1288 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1219 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1289 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1220 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1290 CLEAR_SELECTION (); 1221 CLEAR_SELECTION ();
1291 break; 1222 break;
1292 case 1: /* erase to beginning of line */ 1223 case 1: /* erase to beginning of line */
… …
1297 CLEAR_SELECTION (); 1228 CLEAR_SELECTION ();
1298 break; 1229 break;
1299 case 2: /* erase whole line */ 1230 case 2: /* erase whole line */
1300 col = 0; 1231 col = 0;
1301 num = ncol; 1232 num = ncol;
1302 save[row].l = 0; 1233 line.l = 0;
1303 if (selection.beg.row <= screen.cur.row 1234 if (selection.beg.row <= screen.cur.row
1304 && selection.end.row >= screen.cur.row) 1235 && selection.end.row >= screen.cur.row)
1305 CLEAR_SELECTION (); 1236 CLEAR_SELECTION ();
1306 break; 1237 break;
1307 default: 1238 default:
1308 return; 1239 return;
1309 } 1240 }
1310 1241
1311 if (save[row].t)
1312 scr_blank_line (save[row], col, num, rstyle); 1242 scr_blank_line (line, col, num, rstyle);
1313 else
1314 scr_blank_screen_mem (save[row], rstyle);
1315} 1243}
1316 1244
1317/* ------------------------------------------------------------------------- */ 1245/* ------------------------------------------------------------------------- */
1318/* 1246/*
1319 * Erase part of whole of the screen 1247 * Erase part of whole of the screen
… …
1323 */ 1251 */
1324void 1252void
1325rxvt_term::scr_erase_screen (int mode) 1253rxvt_term::scr_erase_screen (int mode)
1326{ 1254{
1327 int num; 1255 int num;
1328 int32_t row, row_offset; 1256 int32_t row;
1329 rend_t ren; 1257 rend_t ren;
1330 XGCValues gcvalue; 1258 XGCValues gcvalue;
1331 1259
1332 want_refresh = 1; 1260 want_refresh = 1;
1333 ZERO_SCROLLBACK (); 1261 ZERO_SCROLLBACK ();
1334
1335 row_offset = (int32_t)saveLines;
1336 1262
1337 switch (mode) 1263 switch (mode)
1338 { 1264 {
1339 case 0: /* erase to end of screen */ 1265 case 0: /* erase to end of screen */
1340 selection_check (1); 1266 selection_check (1);
… …
1364 CLEAR_SELECTION (); 1290 CLEAR_SELECTION ();
1365 1291
1366 if (row >= nrow) /* Out Of Bounds */ 1292 if (row >= nrow) /* Out Of Bounds */
1367 return; 1293 return;
1368 1294
1369 MIN_IT (num, (nrow - row)); 1295 min_it (num, nrow - row);
1370 1296
1371 if (rstyle & (RS_RVid | RS_Uline)) 1297 if (rstyle & (RS_RVid | RS_Uline))
1372 ren = (rend_t) ~RS_None; 1298 ren = (rend_t) ~RS_None;
1373 else if (GET_BASEBG (rstyle) == Color_bg) 1299 else if (GET_BASEBG (rstyle) == Color_bg)
1374 { 1300 {
… …
1376 CLEAR_ROWS (row, num); 1302 CLEAR_ROWS (row, num);
1377 } 1303 }
1378 else 1304 else
1379 { 1305 {
1380 ren = rstyle & (RS_fgMask | RS_bgMask); 1306 ren = rstyle & (RS_fgMask | RS_bgMask);
1381 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1307 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1382 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1308 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1383 ERASE_ROWS (row, num); 1309 ERASE_ROWS (row, num);
1384 gcvalue.foreground = pix_colors[Color_fg]; 1310 gcvalue.foreground = pix_colors[Color_fg];
1385 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1311 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1386 } 1312 }
1387 1313
1388 for (; num--; row++) 1314 for (; num--; row++)
1389 { 1315 {
1390 scr_blank_screen_mem (save[row + row_offset], rstyle); 1316 scr_blank_screen_mem (ROW(row), rstyle);
1391 save[row + row_offset].l = 0;
1392 scr_blank_line (drawn[row], 0, ncol, ren); 1317 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1393 } 1318 }
1394} 1319}
1395 1320
1396#if ENABLE_FRILLS 1321#if ENABLE_FRILLS
1397void 1322void
1398rxvt_term::scr_erase_savelines () 1323rxvt_term::scr_erase_savelines ()
1399{ 1324{
1400 want_refresh = 1; 1325 want_refresh = 1;
1401 ZERO_SCROLLBACK (); 1326 ZERO_SCROLLBACK ();
1402 1327
1403 nscrolled = 0; 1328 nsaved = 0;
1404} 1329}
1405#endif 1330#endif
1406 1331
1407/* ------------------------------------------------------------------------- */ 1332/* ------------------------------------------------------------------------- */
1408/* 1333/*
… …
1410 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1335 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1411 */ 1336 */
1412void 1337void
1413rxvt_term::scr_E () 1338rxvt_term::scr_E ()
1414{ 1339{
1415 int i, j, k;
1416 rend_t *r1, fs; 1340 rend_t fs;
1417 1341
1418 want_refresh = 1; 1342 want_refresh = 1;
1419 ZERO_SCROLLBACK (); 1343 ZERO_SCROLLBACK ();
1420 1344
1421 num_scr_allow = 0; 1345 num_scr_allow = 0;
1422 selection_check (3); 1346 selection_check (3);
1423 1347
1424 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1348 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1425 for (k = saveLines, i = nrow; i--; k++) 1349 for (int row = nrow; row--; )
1426 { 1350 {
1427 line_t &line = save[k]; 1351 line_t &line = ROW(row);
1428 1352
1429 fill_text (line.t, 'E', ncol); 1353 fill_text (line.t, 'E', ncol);
1354 rend_t *r1 = line.r;
1430 1355
1431 for (r1 = line.r, j = ncol; j--; ) 1356 for (int j = ncol; j--; )
1432 *r1++ = fs; 1357 *r1++ = fs;
1433 1358
1434 line.l = ncol; /* make the `E's selectable */ 1359 line.is_longer (0);
1360 line.touch (ncol);
1435 } 1361 }
1436} 1362}
1437 1363
1438/* ------------------------------------------------------------------------- */ 1364/* ------------------------------------------------------------------------- */
1439/* 1365/*
… …
1460 count = end; 1386 count = end;
1461 } 1387 }
1462 1388
1463 scr_do_wrap (); 1389 scr_do_wrap ();
1464 1390
1465 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1391 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1466} 1392}
1467 1393
1468/* ------------------------------------------------------------------------- */ 1394/* ------------------------------------------------------------------------- */
1469/* 1395/*
1470 * Insert/Delete <count> characters from the current position 1396 * Insert/Delete <count> characters from the current position
… …
1482 return; 1408 return;
1483 1409
1484 scr_do_wrap (); 1410 scr_do_wrap ();
1485 1411
1486 selection_check (1); 1412 selection_check (1);
1487 MIN_IT (count, (ncol - screen.cur.col)); 1413 min_it (count, ncol - screen.cur.col);
1488 1414
1489 row = screen.cur.row + saveLines; 1415 row = screen.cur.row;
1490 1416
1491 line_t *line = save + row; 1417 line_t *line = &ROW(row);
1418
1419 line->touch ();
1420 line->is_longer (0);
1492 1421
1493 switch (insdel) 1422 switch (insdel)
1494 { 1423 {
1495 case INSERT: 1424 case INSERT:
1496 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1425 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1497 { 1426 {
1498 line->t[col] = line->t[col - count]; 1427 line->t[col] = line->t[col - count];
1499 line->r[col] = line->r[col - count]; 1428 line->r[col] = line->r[col - count];
1500 } 1429 }
1501 1430
1502 if (!line->is_longer ()) 1431 line->l = min (line->l + count, ncol);
1503 {
1504 line->l += count;
1505 MIN_IT (line->l, ncol);
1506 }
1507 1432
1508 if (selection.op && current_screen == selection.screen 1433 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1434 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1435 {
1511 if (selection.end.row != screen.cur.row 1436 if (selection.end.row != screen.cur.row
… …
1517 selection.mark.col += count; /* XXX: yes? */ 1442 selection.mark.col += count; /* XXX: yes? */
1518 selection.end.col += count; 1443 selection.end.col += count;
1519 } 1444 }
1520 } 1445 }
1521 1446
1522 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1447 scr_blank_line (*line, screen.cur.col, count, rstyle);
1523 break; 1448 break;
1524 1449
1525 case ERASE: 1450 case ERASE:
1526 screen.cur.col += count; /* don't worry if > ncol */ 1451 screen.cur.col += count; /* don't worry if > ncol */
1527 selection_check (1); 1452 selection_check (1);
1528 screen.cur.col -= count; 1453 screen.cur.col -= count;
1454
1455 line->l = max (line->l - count, 0);
1529 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1456 scr_blank_line (*line, screen.cur.col, count, rstyle);
1530 break; 1457 break;
1531 1458
1532 case DELETE: 1459 case DELETE:
1533 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1460 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1534 1461
… …
1536 { 1463 {
1537 line->t[col] = line->t[col + count]; 1464 line->t[col] = line->t[col + count];
1538 line->r[col] = line->r[col + count]; 1465 line->r[col] = line->r[col + count];
1539 } 1466 }
1540 1467
1468 line->l = max (line->l - count, 0);
1541 scr_blank_line (*line, ncol - count, count, tr); 1469 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 1470
1549 if (selection.op && current_screen == selection.screen 1471 if (selection.op && current_screen == selection.screen
1550 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1551 { 1473 {
1552 if (selection.end.row != screen.cur.row 1474 if (selection.end.row != screen.cur.row
… …
1572 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1494 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1573 */ 1495 */
1574void 1496void
1575rxvt_term::scr_scroll_region (int top, int bot) 1497rxvt_term::scr_scroll_region (int top, int bot)
1576{ 1498{
1577 MAX_IT (top, 0); 1499 max_it (top, 0);
1578 MIN_IT (bot, (int)nrow - 1); 1500 min_it (bot, nrow - 1);
1579 1501
1580 if (top > bot) 1502 if (top > bot)
1581 return; 1503 return;
1582 1504
1583 screen.tscroll = top; 1505 screen.tscroll = top;
… …
1664rxvt_term::scr_set_tab (int mode) 1586rxvt_term::scr_set_tab (int mode)
1665{ 1587{
1666 if (mode < 0) 1588 if (mode < 0)
1667 memset (tabs, 0, ncol * sizeof (char)); 1589 memset (tabs, 0, ncol * sizeof (char));
1668 else if (screen.cur.col < ncol) 1590 else if (screen.cur.col < ncol)
1669 tabs[screen.cur.col] = (mode ? 1 : 0); 1591 tabs [screen.cur.col] = !!mode;
1670} 1592}
1671 1593
1672/* ------------------------------------------------------------------------- */ 1594/* ------------------------------------------------------------------------- */
1673/* 1595/*
1674 * Set reverse/normal video 1596 * Set reverse/normal video
… …
1681 XGCValues gcvalue; 1603 XGCValues gcvalue;
1682 1604
1683 if (rvideo != mode) 1605 if (rvideo != mode)
1684 { 1606 {
1685 rvideo = mode; 1607 rvideo = mode;
1686 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1608 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#if XPM_BACKGROUND 1609#if XPM_BACKGROUND
1688 if (bgPixmap.pixmap == None) 1610 if (bgPixmap.pixmap == None)
1689#endif 1611#endif
1690#if TRANSPARENT 1612#if TRANSPARENT
1691 if (! (options & Opt_transparent) || am_transparent == 0) 1613 if (! OPTION (Opt_transparent) || am_transparent == 0)
1692#endif 1614#endif
1693 XSetWindowBackground (display->display, vt, 1615 XSetWindowBackground (display->display, vt,
1694 pix_colors[Color_bg]); 1616 pix_colors[Color_bg]);
1695 1617
1696 gcvalue.foreground = pix_colors[Color_fg]; 1618 gcvalue.foreground = pix_colors[Color_fg];
… …
1721 * Set font style 1643 * Set font style
1722 */ 1644 */
1723void 1645void
1724rxvt_term::set_font_style () 1646rxvt_term::set_font_style ()
1725{ 1647{
1648#if 0
1726 switch (charsets[screen.charset]) 1649 switch (charsets [screen.charset])
1727 { 1650 {
1728 case '0': /* DEC Special Character & Line Drawing Set */ 1651 case '0': /* DEC Special Character & Line Drawing Set */
1729 break; 1652 break;
1730 case 'A': /* United Kingdom (UK) */ 1653 case 'A': /* United Kingdom (UK) */
1731 break; 1654 break;
… …
1738 case 'C': /* Finnish character set */ 1661 case 'C': /* Finnish character set */
1739 break; 1662 break;
1740 case 'K': /* German character set */ 1663 case 'K': /* German character set */
1741 break; 1664 break;
1742 } 1665 }
1666#endif
1743} 1667}
1744 1668
1745/* ------------------------------------------------------------------------- */ 1669/* ------------------------------------------------------------------------- */
1746/* 1670/*
1747 * Choose a font 1671 * Choose a font
… …
1787 bool found = false; 1711 bool found = false;
1788 1712
1789 for (int i = 0; i < nrow; i++) 1713 for (int i = 0; i < nrow; i++)
1790 { 1714 {
1791 int col = 0; 1715 int col = 0;
1792 rend_t *drp = drawn[i].r; 1716 rend_t *drp = drawn_buf[i].r;
1793 1717
1794 for (; col < ncol; col++, drp++) 1718 for (; col < ncol; col++, drp++)
1795 if ((*drp & mask) == value) 1719 if ((*drp & mask) == value)
1796 { 1720 {
1797 found = true; 1721 found = true;
… …
1815rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1739rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1816{ 1740{
1817 int i; 1741 int i;
1818 row_col_t rc[RC_COUNT]; 1742 row_col_t rc[RC_COUNT];
1819 1743
1820 if (!drawn) /* sanity check */ 1744 if (!drawn_buf) /* sanity check */
1821 return; 1745 return;
1822 1746
1823#ifndef NO_SLOW_LINK_SUPPORT 1747#ifndef NO_SLOW_LINK_SUPPORT
1824 if (refresh_type == FAST_REFRESH && !display->is_local) 1748 if (refresh_type == FAST_REFRESH && !display->is_local)
1825 { 1749 {
1826 y = 0; 1750 y = 0;
1827 eheight = height; 1751 eheight = height;
1828 } 1752 }
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 1753#endif
1837 1754
1838 /* round down */ 1755 /* round down */
1839 rc[PART_BEG].col = Pixel2Col (x); 1756 rc[PART_BEG].col = Pixel2Col (x);
1840 rc[PART_BEG].row = Pixel2Row (y); 1757 rc[PART_BEG].row = Pixel2Row (y);
… …
1843 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1760 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1844 1761
1845 /* sanity checks */ 1762 /* sanity checks */
1846 for (i = PART_BEG; i < RC_COUNT; i++) 1763 for (i = PART_BEG; i < RC_COUNT; i++)
1847 { 1764 {
1848 MIN_IT (rc[i].col, ncol - 1); 1765 min_it (rc[i].col, ncol - 1);
1849 MIN_IT (rc[i].row, nrow - 1); 1766 min_it (rc[i].row, nrow - 1);
1850 } 1767 }
1851 1768
1852 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1769 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); 1770 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1854 1771
1855 if (refresh) 1772 if (refresh)
1856 scr_refresh (SLOW_REFRESH); 1773 scr_refresh (SLOW_REFRESH);
1857} 1774}
1858 1775
… …
1879 1796
1880 oldviewstart = view_start; 1797 oldviewstart = view_start;
1881 1798
1882 if (y < len) 1799 if (y < len)
1883 { 1800 {
1884 p = (nrow + nscrolled) * (len - y) / len; 1801 p = (nrow + nsaved) * (len - y) / len;
1885 p -= (long) (nrow - 1); 1802 p -= (long) (nrow - 1);
1886 p = max (p, 0); 1803 p = max (p, 0);
1887 } 1804 }
1888 1805
1889 view_start = (unsigned int)min (p, nscrolled); 1806 view_start = (unsigned int)min (p, nsaved);
1890 1807
1891 return scr_changeview (oldviewstart); 1808 return scr_changeview (oldviewstart);
1892} 1809}
1893 1810
1894/* ------------------------------------------------------------------------- */ 1811/* ------------------------------------------------------------------------- */
… …
1905 oldviewstart = view_start; 1822 oldviewstart = view_start;
1906 1823
1907 if (direction == UP) 1824 if (direction == UP)
1908 { 1825 {
1909 n = view_start + nlines; 1826 n = view_start + nlines;
1910 view_start = min (n, nscrolled); 1827 view_start = min (n, nsaved);
1911 } 1828 }
1912 else 1829 else
1913 { 1830 {
1914 n = view_start - nlines; 1831 n = view_start - nlines;
1915 view_start = max (n, 0); 1832 view_start = max (n, 0);
… …
1921int 1838int
1922rxvt_term::scr_changeview (unsigned int oldviewstart) 1839rxvt_term::scr_changeview (unsigned int oldviewstart)
1923{ 1840{
1924 if (view_start != oldviewstart) 1841 if (view_start != oldviewstart)
1925 { 1842 {
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844
1926 want_refresh = 1; 1845 want_refresh = 1;
1927 num_scr -= (view_start - oldviewstart); 1846 num_scr -= (view_start - oldviewstart);
1928 } 1847 }
1929 1848
1930 return (int) (view_start - oldviewstart); 1849 return (int)view_start - (int)oldviewstart;
1931} 1850}
1932 1851
1933/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1934void 1853void
1935rxvt_term::scr_bell () 1854rxvt_term::scr_bell ()
1936{ 1855{
1937#ifndef NO_BELL 1856#ifndef NO_BELL
1938 1857
1939# ifndef NO_MAPALERT 1858# ifndef NO_MAPALERT
1940# ifdef MAPALERT_OPTION 1859# ifdef MAPALERT_OPTION
1941 if (options & Opt_mapAlert) 1860 if (OPTION (Opt_mapAlert))
1942# endif 1861# endif
1943 XMapWindow (display->display, parent[0]); 1862 XMapWindow (display->display, parent[0]);
1944# endif 1863# endif
1945 1864
1946 if (options & Opt_visualBell) 1865 if (OPTION (Opt_visualBell))
1947 { 1866 {
1948 scr_rvideo_mode (!rvideo); /* refresh also done */ 1867 scr_rvideo_mode (!rvideo); /* refresh also done */
1868 display->flush ();
1949 rxvt_usleep (VISUAL_BELL_DURATION); 1869 rxvt_usleep (VISUAL_BELL_DURATION);
1950 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1951 } 1871 }
1952 else 1872 else
1953 XBell (display->display, 0); 1873 XBell (display->display, 0);
… …
1959/* ARGSUSED */ 1879/* ARGSUSED */
1960void 1880void
1961rxvt_term::scr_printscreen (int fullhist) 1881rxvt_term::scr_printscreen (int fullhist)
1962{ 1882{
1963#ifdef PRINTPIPE 1883#ifdef PRINTPIPE
1964 int i, r1, nrows, row_offset; 1884 int nrows, row_start;
1965 FILE *fd; 1885 FILE *fd;
1966 1886
1967 if ((fd = popen_printer ()) == NULL) 1887 if ((fd = popen_printer ()) == NULL)
1968 return; 1888 return;
1969 1889
1970 nrows = nrow;
1971 row_offset = saveLines;
1972
1973 if (!fullhist) 1890 if (fullhist)
1974 row_offset -= view_start; 1891 {
1892 nrows = nrow + nsaved;
1893 row_start = -nsaved;
1894 }
1975 else 1895 else
1976 { 1896 {
1977 nrows += nscrolled; 1897 nrows = nrow;
1978 row_offset -= nscrolled; 1898 row_start = -view_start;
1979 } 1899 }
1980 1900
1981 wctomb (0, 0); 1901 wctomb (0, 0);
1982 1902
1983 for (r1 = 0; r1 < nrows; r1++) 1903 for (int r1 = 0; r1 < nrows; r1++)
1984 { 1904 {
1985 text_t *tp = save[r1 + row_offset].t; 1905 text_t *tp = ROW(r1).t;
1986 int len = save[r1 + row_offset].l; 1906 int len = ROW(r1).l;
1987 1907
1988 for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1908 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1989 { 1909 {
1990 char mb[MB_LEN_MAX]; 1910 char mb[MB_LEN_MAX];
1991 text_t t = *tp++; 1911 text_t t = *tp++;
1992 if (t == NOCHAR) 1912 if (t == NOCHAR)
1993 continue; 1913 continue;
… …
2021{ 1941{
2022 unsigned char must_clear, /* use draw_string not draw_image_string */ 1942 unsigned char must_clear, /* use draw_string not draw_image_string */
2023 showcursor; /* show the cursor */ 1943 showcursor; /* show the cursor */
2024 int16_t col, row, /* column/row we're processing */ 1944 int16_t col, row, /* column/row we're processing */
2025 ocrow; /* old cursor row */ 1945 ocrow; /* old cursor row */
2026 int i, /* tmp */ 1946 int i; /* tmp */
2027 row_offset; /* basic offset in screen structure */
2028#ifndef NO_CURSORCOLOR 1947#ifndef NO_CURSORCOLOR
2029 rend_t cc1; /* store colours at cursor position (s) */ 1948 rend_t cc1; /* store colours at cursor position (s) */
2030#endif 1949#endif
2031 rend_t *crp; // cursor rendition pointer 1950 rend_t *crp; // cursor rendition pointer
2032 1951
… …
2039 * A: set up vars 1958 * A: set up vars
2040 */ 1959 */
2041 must_clear = 0; 1960 must_clear = 0;
2042 refresh_count = 0; 1961 refresh_count = 0;
2043 1962
2044 row_offset = saveLines - view_start;
2045
2046#if XPM_BACKGROUND 1963#if XPM_BACKGROUND
2047 must_clear |= bgPixmap.pixmap != None; 1964 must_clear |= bgPixmap.pixmap != None;
2048#endif 1965#endif
2049#if TRANSPARENT 1966#if TRANSPARENT
2050 must_clear |= (options & Opt_transparent) && am_transparent; 1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
2051#endif 1968#endif
2052 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2053 1970
2054 /* 1971 /*
2055 * B: reverse any characters which are selected 1972 * B: reverse any characters which are selected
… …
2072 1989
2073 if (showcursor) 1990 if (showcursor)
2074 { 1991 {
2075 int col = screen.cur.col; 1992 int col = screen.cur.col;
2076 1993
2077 while (col && screen.line[screen.cur.row]->t[col] == NOCHAR) 1994 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2078 col--; 1995 col--;
2079 1996
2080 crp = &screen.line[screen.cur.row]->r[col]; 1997 crp = &ROW(screen.cur.row).r[col];
2081 1998
2082 if (showcursor && focus) 1999 if (showcursor && focus)
2083 { 2000 {
2084 if (options & Opt_cursorUnderline) 2001 if (OPTION (Opt_cursorUnderline))
2085 *crp ^= RS_Uline; 2002 *crp ^= RS_Uline;
2086 else 2003 else
2087 { 2004 {
2088 *crp ^= RS_RVid; 2005 *crp ^= RS_RVid;
2089 2006
… …
2091 cc1 = *crp & (RS_fgMask | RS_bgMask); 2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
2092 if (ISSET_PIXCOLOR (Color_cursor)) 2009 if (ISSET_PIXCOLOR (Color_cursor))
2093 ccol1 = Color_cursor; 2010 ccol1 = Color_cursor;
2094 else 2011 else
2095#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2096 ccol1 = GET_FGCOLOR (rstyle); 2013 ccol1 = fgcolor_of (rstyle);
2097#else 2014#else
2098 ccol1 = Color_fg; 2015 ccol1 = Color_fg;
2099#endif 2016#endif
2100 if (ISSET_PIXCOLOR (Color_cursor2)) 2017 if (ISSET_PIXCOLOR (Color_cursor2))
2101 ccol2 = Color_cursor2; 2018 ccol2 = Color_cursor2;
2102 else 2019 else
2103#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2104 ccol2 = GET_BGCOLOR (rstyle); 2021 ccol2 = bgcolor_of (rstyle);
2105#else 2022#else
2106 ccol2 = Color_bg; 2023 ccol2 = Color_bg;
2107#endif 2024#endif
2108 *crp = SET_FGCOLOR (*crp, ccol1); 2025 *crp = SET_FGCOLOR (*crp, ccol1);
2109 *crp = SET_BGCOLOR (*crp, ccol2); 2026 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2119 if (screen.cur.row + view_start != ocrow 2036 if (screen.cur.row + view_start != ocrow
2120 || screen.cur.col != oldcursor.col) 2037 || screen.cur.col != oldcursor.col)
2121 { 2038 {
2122 if (ocrow < nrow 2039 if (ocrow < nrow
2123 && oldcursor.col < ncol) 2040 && oldcursor.col < ncol)
2124 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2125 2042
2126 if (focus || !showcursor) 2043 if (focus || !showcursor)
2127 oldcursor.row = -1; 2044 oldcursor.row = -1;
2128 else 2045 else
2129 setoldcursor = 1; 2046 setoldcursor = 1;
… …
2142 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
2143 } 2060 }
2144 } 2061 }
2145 } 2062 }
2146 2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2147#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2148 scr_swap_overlay (); 2066 scr_swap_overlay ();
2149#endif 2067#endif
2150 2068
2151#ifndef NO_SLOW_LINK_SUPPORT 2069#ifndef NO_SLOW_LINK_SUPPORT
… …
2153 * D: CopyArea pass - very useful for slower links 2071 * D: CopyArea pass - very useful for slower links
2154 * This has been deliberately kept simple. 2072 * This has been deliberately kept simple.
2155 */ 2073 */
2156 i = num_scr; 2074 i = num_scr;
2157 if (!display->is_local 2075 if (!display->is_local
2158 && refresh_type == FAST_REFRESH && num_scr_allow && i 2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2159 && abs (i) < nrow && !must_clear) 2077 && abs (num_scr) < nrow && !must_clear)
2160 { 2078 {
2161 int16_t nits; 2079 int16_t nits;
2162 int j; 2080 int j;
2163 int len, wlen; 2081 int len, wlen;
2164 2082
… …
2167 row = i > 0 ? 0 : j - 1; 2085 row = i > 0 ? 0 : j - 1;
2168 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2169 { 2087 {
2170 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2171 { 2089 {
2172 line_t s = save[row + row_offset]; 2090 line_t s = ROW(row - view_start);
2173 line_t d = drawn[row]; 2091 line_t d = drawn_buf[row];
2174 line_t d2 = drawn[row + i]; 2092 line_t d2 = drawn_buf[row + i];
2175 2093
2176 for (nits = 0, col = ncol; col--; ) 2094 for (nits = 0, col = ncol; col--; )
2177 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2178 nits--; 2096 nits--;
2179 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2097 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2197 2115
2198 if (len != -1) 2116 if (len != -1)
2199 { 2117 {
2200 /* also comes here at end if needed because of >= above */ 2118 /* also comes here at end if needed because of >= above */
2201 if (wlen < len) 2119 if (wlen < len)
2202 SWAP_IT (wlen, len, int); 2120 ::swap (wlen, len);
2203 2121
2204 XCopyArea (display->display, vt, vt, 2122 XCopyArea (display->display, vt, vt,
2205 gc, 0, Row2Pixel (len + i), 2123 gc, 0, Row2Pixel (len + i),
2206 (unsigned int)TermWin_TotalWidth (), 2124 (unsigned int)this->width,
2207 (unsigned int)Height2Pixel (wlen - len + 1), 2125 (unsigned int)Height2Pixel (wlen - len + 1),
2208 0, Row2Pixel (len)); 2126 0, Row2Pixel (len));
2209 len = -1; 2127 len = -1;
2210 } 2128 }
2211 } 2129 }
… …
2215 /* 2133 /*
2216 * E: main pass across every character 2134 * E: main pass across every character
2217 */ 2135 */
2218 for (row = 0; row < nrow; row++) 2136 for (row = 0; row < nrow; row++)
2219 { 2137 {
2220 text_t *stp = save[row + row_offset].t; 2138 text_t *stp = ROW(row - view_start).t;
2221 rend_t *srp = save[row + row_offset].r; 2139 rend_t *srp = ROW(row - view_start).r;
2222 text_t *dtp = drawn[row].t; 2140 text_t *dtp = drawn_buf[row].t;
2223 rend_t *drp = drawn[row].r; 2141 rend_t *drp = drawn_buf[row].r;
2224 2142
2225 /* 2143 /*
2226 * E2: OK, now the real pass 2144 * E2: OK, now the real pass
2227 */ 2145 */
2228 int ypixel = (int)Row2Pixel (row); 2146 int ypixel = (int)Row2Pixel (row);
… …
2290 count++, i--; 2208 count++, i--;
2291 2209
2292 /* 2210 /*
2293 * Determine the attributes for the string 2211 * Determine the attributes for the string
2294 */ 2212 */
2295 int fore = GET_FGCOLOR (rend); // desired foreground 2213 int fore = fgcolor_of (rend); // desired foreground
2296 int back = GET_BGCOLOR (rend); // desired background 2214 int back = bgcolor_of (rend); // desired background
2297 2215
2298 // only do special processing if any attributes are set, which is rare 2216 // 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)) 2217 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2300 { 2218 {
2301#if ENABLE_STYLES 2219#if ENABLE_STYLES
2302 // force redraw after "careful" characters to avoid pixel droppings 2220 // force redraw after "careful" characters to avoid pixel droppings
2303 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2221 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2339 fore = Color_UL; 2257 fore = Color_UL;
2340#endif 2258#endif
2341 2259
2342 if (invert) 2260 if (invert)
2343 { 2261 {
2344 SWAP_IT (fore, back, int); 2262 ::swap (fore, back);
2345 2263
2346#ifndef NO_BOLD_UNDERLINE_REVERSE 2264#ifndef NO_BOLD_UNDERLINE_REVERSE
2347 if (ISSET_PIXCOLOR (Color_RV)) 2265 if (ISSET_PIXCOLOR (Color_RV))
2348 back = Color_RV; 2266 back = Color_RV;
2349 2267
… …
2414 } /* for (row....) */ 2332 } /* for (row....) */
2415 2333
2416#if ENABLE_OVERLAY 2334#if ENABLE_OVERLAY
2417 scr_swap_overlay (); 2335 scr_swap_overlay ();
2418#endif 2336#endif
2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2419 2338
2420 /* 2339 /*
2421 * G: cleanup cursor and display outline cursor if necessary 2340 * G: cleanup cursor and display outline cursor if necessary
2422 */ 2341 */
2423 if (showcursor) 2342 if (showcursor)
2424 { 2343 {
2425 if (focus) 2344 if (focus)
2426 { 2345 {
2427 if (options & Opt_cursorUnderline) 2346 if (OPTION (Opt_cursorUnderline))
2428 *crp ^= RS_Uline; 2347 *crp ^= RS_Uline;
2429 else 2348 else
2430 { 2349 {
2431 *crp ^= RS_RVid; 2350 *crp ^= RS_RVid;
2432#ifndef NO_CURSORCOLOR 2351#ifndef NO_CURSORCOLOR
… …
2437 else if (oldcursor.row >= 0) 2356 else if (oldcursor.row >= 0)
2438 { 2357 {
2439 int cursorwidth = 1; 2358 int cursorwidth = 1;
2440 int col = oldcursor.col; 2359 int col = oldcursor.col;
2441 2360
2442 while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR) 2361 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2443 col--; 2362 col--;
2444 2363
2445 while (col + cursorwidth < ncol 2364 while (col + cursorwidth < ncol
2446 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2365 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2447 cursorwidth++; 2366 cursorwidth++;
2448 2367
2449#ifndef NO_CURSORCOLOR 2368#ifndef NO_CURSORCOLOR
2450 if (ISSET_PIXCOLOR (Color_cursor)) 2369 if (ISSET_PIXCOLOR (Color_cursor))
2451 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2370 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2462 /* 2381 /*
2463 * H: cleanup selection 2382 * H: cleanup selection
2464 */ 2383 */
2465 scr_reverse_selection (); 2384 scr_reverse_selection ();
2466 2385
2467 if (refresh_type & SMOOTH_REFRESH)
2468 XFlush (display->display);
2469
2470 num_scr = 0; 2386 num_scr = 0;
2471 num_scr_allow = 1; 2387 num_scr_allow = 1;
2472} 2388}
2473 2389
2474void 2390void
2475rxvt_term::scr_remap_chars (const line_t &l) 2391rxvt_term::scr_remap_chars (line_t &l)
2476{ 2392{
2477 if (!l.t) 2393 if (!l.t)
2478 return; 2394 return;
2479 2395
2396 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2397
2480 for (int i = ncol; i--; ) 2398 for (int i = ncol; i--; )
2481 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2399 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2482} 2400}
2483 2401
2484void 2402void
2485rxvt_term::scr_remap_chars () 2403rxvt_term::scr_remap_chars ()
2486{ 2404{
2487 for (int i = nrow + saveLines; i--; ) 2405 for (int i = total_rows; i--; )
2488 scr_remap_chars (save[i]); 2406 scr_remap_chars (row_buf [i]);
2489 2407
2490 for (int i = nrow; i--; ) 2408 for (int i = nrow; i--; )
2491 { 2409 {
2492 scr_remap_chars (drawn[i]); 2410 scr_remap_chars (drawn_buf [i]);
2493 scr_remap_chars (swap_save[i]); 2411 scr_remap_chars (swap_buf [i]);
2494 } 2412 }
2495} 2413}
2496 2414
2497void 2415void
2498rxvt_term::scr_recolour () 2416rxvt_term::scr_recolour ()
… …
2536 2454
2537 if (really) 2455 if (really)
2538 XClearWindow (display->display, vt); 2456 XClearWindow (display->display, vt);
2539} 2457}
2540 2458
2459void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2461{
2462 int view_end = -view_start + nrow;
2463 int row, col;
2464
2465 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++)
2466 {
2467 text_t *stp = ROW(row).t;
2468 rend_t *srp = ROW(row).r;
2469
2470 for (col = beg_col; col < end_col; col++)
2471 srp[col] ^= rstyle1;
2472
2473 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2474 srp[col] ^= rstyle2;
2475
2476 if (++col < end_col)
2477 srp[col] ^= rstyle2;
2478 }
2479}
2480
2481void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2483{
2484 int view_end = -view_start + nrow;
2485 int row, col;
2486
2487 if (beg_row >= -view_start)
2488 {
2489 col = beg_col;
2490 row = beg_row;
2491 }
2492 else
2493 {
2494 col = 0;
2495 row = -view_start;
2496 }
2497
2498 for (; row < min (end_row, view_end); row++, col = 0)
2499 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500 srp[col] ^= rstyle;
2501
2502 if (row == end_row)
2503 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2504 srp[col] ^= rstyle;
2505}
2506
2541/* ------------------------------------------------------------------------- */ 2507/* ------------------------------------------------------------------------- */
2542void 2508void
2543rxvt_term::scr_reverse_selection () 2509rxvt_term::scr_reverse_selection ()
2544{ 2510{
2511 if (selection.op
2545 if (selection.op && current_screen == selection.screen) 2512 && current_screen == selection.screen
2513 && selection.end.row >= -view_start)
2546 { 2514 {
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 2515#if ENABLE_FRILLS
2553 if (selection.rect) 2516 if (selection.rect)
2554 { 2517 scr_xor_rect (selection.beg.row, selection.beg.col,
2555 end_row += nrow; 2518 selection.end.row, selection.end.col,
2556 2519 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 2520 else
2562#endif 2521#endif
2563 { 2522 scr_xor_span (selection.beg.row, selection.beg.col,
2564 if (i >= end_row) 2523 selection.end.row, selection.end.col,
2565 col = selection.beg.col; 2524 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 } 2525 }
2583} 2526}
2584 2527
2585/* ------------------------------------------------------------------------- */ 2528/* ------------------------------------------------------------------------- */
2586/* 2529/*
… …
2593{ 2536{
2594 int row, wrote; 2537 int row, wrote;
2595 unsigned int width, towrite; 2538 unsigned int width, towrite;
2596 char r1[] = "\n"; 2539 char r1[] = "\n";
2597 2540
2598 for (row = saveLines - nscrolled; 2541 for (row = saveLines - nsaved;
2599 row < saveLines + nrow - 1; row++) 2542 row < saveLines + nrow - 1; row++)
2600 { 2543 {
2601 width = save[row].l >= 0 ? save[row].l 2544 width = row_buf[row].l >= 0 ? row_buf[row].l
2602 : ncol; 2545 : ncol;
2603 for (towrite = width; towrite; towrite -= wrote) 2546 for (towrite = width; towrite; towrite -= wrote)
2604 { 2547 {
2605 wrote = write (fd, & (save[row].t[width - towrite]), 2548 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2606 towrite); 2549 towrite);
2607 if (wrote < 0) 2550 if (wrote < 0)
2608 return; /* XXX: death, no report */ 2551 return; /* XXX: death, no report */
2609 } 2552 }
2610 if (save[row].l >= 0) 2553 if (row_buf[row].l >= 0)
2611 if (write (fd, r1, 1) <= 0) 2554 if (write (fd, r1, 1) <= 0)
2612 return; /* XXX: death, no report */ 2555 return; /* XXX: death, no report */
2613 } 2556 }
2614} 2557}
2615#endif 2558#endif
2616 2559
2617/* ------------------------------------------------------------------------- * 2560/* ------------------------------------------------------------------------- *
2618 * CHARACTER SELECTION * 2561 * CHARACTER SELECTION *
2619 * ------------------------------------------------------------------------- */ 2562 * ------------------------------------------------------------------------- */
2620
2621/*
2622 * -nscrolled <= (selection row) <= nrow - 1
2623 */
2624void 2563void
2625rxvt_term::selection_check (int check_more) 2564rxvt_term::selection_check (int check_more)
2626{ 2565{
2627 row_col_t pos; 2566 row_col_t pos;
2628 2567
2629 if (!selection.op) 2568 if (!selection.op)
2630 return; 2569 return;
2631 2570
2632 pos.row = pos.col = 0; 2571 pos.row = pos.col = 0;
2633 if ((selection.beg.row < - (int32_t)nscrolled) 2572 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2634 || (selection.beg.row >= nrow) 2573 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2635 || (selection.mark.row < - (int32_t)nscrolled) 2574 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2636 || (selection.mark.row >= nrow)
2637 || (selection.end.row < - (int32_t)nscrolled)
2638 || (selection.end.row >= nrow)
2639 || (check_more == 1 2575 || (check_more == 1
2640 && current_screen == selection.screen 2576 && current_screen == selection.screen
2641 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2577 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2642 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2578 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2643 || (check_more == 2 2579 || (check_more == 2
… …
2654/* ------------------------------------------------------------------------- */ 2590/* ------------------------------------------------------------------------- */
2655/* 2591/*
2656 * Paste a selection direct to the command fd 2592 * Paste a selection direct to the command fd
2657 */ 2593 */
2658void 2594void
2659rxvt_term::paste (unsigned char *data, unsigned int len) 2595rxvt_term::paste (char *data, unsigned int len)
2660{ 2596{
2661 /* convert normal newline chars into common keyboard Return key sequence */ 2597 /* convert normal newline chars into common keyboard Return key sequence */
2662 for (unsigned int i = 0; i < len; i++) 2598 for (unsigned int i = 0; i < len; i++)
2663 if (data[i] == C0_LF) 2599 if (data[i] == C0_LF)
2664 data[i] = C0_CR; 2600 data[i] = C0_CR;
… …
2808 { 2744 {
2809 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2745 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2810 char *s = rxvt_wcstombs (w); 2746 char *s = rxvt_wcstombs (w);
2811 free (w); 2747 free (w);
2812 // TODO: strlen == only the first element will be converted. well... 2748 // TODO: strlen == only the first element will be converted. well...
2813 paste ((unsigned char *)s, strlen (s)); 2749 paste (s, strlen (s));
2814 free (s); 2750 free (s);
2815 } 2751 }
2816 else 2752 else
2817#endif 2753#endif
2818 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2754 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2819 && cl) 2755 && cl)
2820 { 2756 {
2821 for (int i = 0; i < cr; i++) 2757 for (int i = 0; i < cr; i++)
2822 paste ((unsigned char *)cl[i], strlen (cl[i])); 2758 paste (cl[i], strlen (cl[i]));
2823 2759
2824 XFreeStringList (cl); 2760 XFreeStringList (cl);
2825 } 2761 }
2826 else 2762 else
2827 paste (ct.value, ct.nitems); // paste raw 2763 paste ((char *)ct.value, ct.nitems); // paste raw
2828 2764
2829bailout: 2765bailout:
2830 XFree (ct.value); 2766 XFree (ct.value);
2831 2767
2832 if (selection_wait == Sel_normal) 2768 if (selection_wait == Sel_normal)
… …
2870 return; /* outside window */ 2806 return; /* outside window */
2871 2807
2872 if (selection.text) 2808 if (selection.text)
2873 { /* internal selection */ 2809 { /* internal selection */
2874 char *str = rxvt_wcstombs (selection.text, selection.len); 2810 char *str = rxvt_wcstombs (selection.text, selection.len);
2875 paste ((unsigned char *)str, strlen (str)); 2811 paste (str, strlen (str));
2876 free (str); 2812 free (str);
2877 return; 2813 return;
2878 } 2814 }
2879 else 2815 else
2880 { 2816 {
… …
2949 * EXT: button 1 or 3 release 2885 * EXT: button 1 or 3 release
2950 */ 2886 */
2951void 2887void
2952rxvt_term::selection_make (Time tm) 2888rxvt_term::selection_make (Time tm)
2953{ 2889{
2954 int i, col, end_col, row, end_row; 2890 int i;
2955 wchar_t *new_selection_text; 2891 wchar_t *new_selection_text;
2956 text_t *t; 2892 text_t *t;
2957 2893
2958 switch (selection.op) 2894 switch (selection.op)
2959 { 2895 {
… …
2972 selection.op = SELECTION_DONE; 2908 selection.op = SELECTION_DONE;
2973 2909
2974 if (selection.clicks == 4) 2910 if (selection.clicks == 4)
2975 return; /* nothing selected, go away */ 2911 return; /* nothing selected, go away */
2976 2912
2913 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2914 return;
2915
2977 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2916 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2978 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2917 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2979 2918
2980 col = selection.beg.col;
2981 row = selection.beg.row + saveLines;
2982 end_row = selection.end.row + saveLines;
2983 int ofs = 0; 2919 int ofs = 0;
2984 int extra = 0; 2920 int extra = 0;
2985 2921
2922 int col = selection.beg.col;
2923 int row = selection.beg.row;
2924
2925 int end_col;
2926
2986 for (; row <= end_row; row++, col = 0) 2927 for (; row <= selection.end.row; row++, col = 0)
2987 { 2928 {
2988#if ENABLE_FRILLS 2929#if ENABLE_FRILLS
2989 if (selection.rect) 2930 if (selection.rect)
2990 { 2931 {
2991 col = selection.beg.col; 2932 col = selection.beg.col;
2992 end_col = ncol + 1; 2933 end_col = ncol + 1;
2993 } 2934 }
2994 else 2935 else
2995#endif 2936#endif
2996 end_col = save[row].is_longer () ? ncol : save[row].l; //TODO//FIXME//LEN 2937 end_col = ROW(row).l;
2997 2938
2998 MAX_IT (col, 0); 2939 col = max (col, 0);
2999 2940
3000 if (row == end_row || selection.rect) 2941 if (row == selection.end.row
2942#if ENABLE_FRILLS
2943 || selection.rect
2944#endif
2945 )
3001 MIN_IT (end_col, selection.end.col); 2946 min_it (end_col, selection.end.col);
3002 2947
3003 t = save[row].t + col; 2948 t = ROW(row).t + col;
2949
3004 for (; col < end_col; col++) 2950 for (; col < end_col; col++)
3005 { 2951 {
3006 if (*t == NOCHAR) 2952 if (*t == NOCHAR)
3007 t++; 2953 t++;
3008#if ENABLE_COMBINING 2954#if ENABLE_COMBINING
… …
3024#endif 2970#endif
3025 else 2971 else
3026 new_selection_text[ofs++] = *t++; 2972 new_selection_text[ofs++] = *t++;
3027 } 2973 }
3028 2974
3029 if (!save[row].is_longer () && row != end_row) 2975#if ENABLE_FRILLS
2976 if (selection.rect)
2977 {
2978 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1]))
2981 --ofs;
2982
3030 new_selection_text[ofs++] = C0_LF; 2983 new_selection_text[ofs++] = C0_LF;
2984 }
2985 else
2986#endif
2987 if (!ROW(row).is_longer () && row != selection.end.row)
2988 new_selection_text[ofs++] = C0_LF;
3031 } 2989 }
3032 2990
3033 if (end_col != selection.end.col) 2991 if (end_col != selection.end.col)
3034 new_selection_text[ofs++] = C0_LF; 2992 new_selection_text[ofs++] = C0_LF;
3035 2993
… …
3045 3003
3046 // we usually allocate much more than necessary, so realloc it smaller again 3004 // we usually allocate much more than necessary, so realloc it smaller again
3047 selection.len = ofs; 3005 selection.len = ofs;
3048 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3006 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3049 3007
3008 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3009 return;
3010
3011 selection_grab (tm);
3012}
3013
3014bool
3015rxvt_term::selection_grab (Time tm)
3016{
3017 selection_time = tm;
3018
3050 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3051 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3021 {
3052 display->set_selection_owner (this); 3022 display->set_selection_owner (this);
3023 return true;
3024 }
3053 else 3025 else
3054 rxvt_warn ("can't get primary selection, ignoring.\n"); 3026 return false;
3055 3027
3056#if 0 3028#if 0
3057 XTextProperty ct; 3029 XTextProperty ct;
3058 3030
3059 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3031 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3060 { 3032 {
3061 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3033 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3062 XFree (ct.value); 3034 XFree (ct.value);
3063 } 3035 }
3064#endif 3036#endif
3065
3066 selection_time = tm;
3067} 3037}
3068 3038
3069/* ------------------------------------------------------------------------- */ 3039/* ------------------------------------------------------------------------- */
3070/* 3040/*
3071 * Mark or select text based upon number of clicks: 1, 2, or 3 3041 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3093 */ 3063 */
3094void 3064void
3095rxvt_term::selection_start_colrow (int col, int row) 3065rxvt_term::selection_start_colrow (int col, int row)
3096{ 3066{
3097 want_refresh = 1; 3067 want_refresh = 1;
3068
3069 selection.mark.row = row - view_start;
3098 selection.mark.col = col; 3070 selection.mark.col = col;
3099 selection.mark.row = row - view_start;
3100 3071
3101 MAX_IT (selection.mark.row, - (int32_t)nscrolled); 3072 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3102 MIN_IT (selection.mark.row, (int32_t)nrow - 1); 3073 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 3074
3106 while (selection.mark.col > 0 3075 while (selection.mark.col > 0
3107 && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR) 3076 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3108 --selection.mark.col; 3077 --selection.mark.col;
3109 3078
3110 if (selection.op) 3079 if (selection.op)
3111 { /* clear the old selection */ 3080 { /* clear the old selection */
3112 selection.beg.row = selection.end.row = selection.mark.row; 3081 selection.beg.row = selection.end.row = selection.mark.row;
… …
3136 text_t *stp; 3105 text_t *stp;
3137 rend_t *srp; 3106 rend_t *srp;
3138 3107
3139 if (dirn == UP) 3108 if (dirn == UP)
3140 { 3109 {
3141 bound.row = saveLines - nscrolled - 1; 3110 bound.row = - nsaved - 1;
3142 bound.col = 0; 3111 bound.col = 0;
3143 dirnadd = -1; 3112 dirnadd = -1;
3144 } 3113 }
3145 else 3114 else
3146 { 3115 {
3147 bound.row = saveLines + nrow; 3116 bound.row = nrow;
3148 bound.col = ncol - 1; 3117 bound.col = ncol - 1;
3149 dirnadd = 1; 3118 dirnadd = 1;
3150 } 3119 }
3151 3120
3152 row = mark->row + saveLines; 3121 row = mark->row;
3153 col = mark->col; 3122 col = max (mark->col, 0);
3154 MAX_IT (col, 0); 3123
3155 /* find the edge of a word */ 3124 /* find the edge of a word */
3156 stp = save[row].t + col; w1 = DELIMIT_TEXT (*stp); 3125 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3157 srp = save[row].r + col; w2 = DELIMIT_REND (*srp); 3126 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3158 3127
3159 for (;;) 3128 for (;;)
3160 { 3129 {
3161 for (; col != bound.col; col += dirnadd) 3130 for (; col != bound.col; col += dirnadd)
3162 { 3131 {
… …
3172 break; 3141 break;
3173 } 3142 }
3174 3143
3175 if ((col == bound.col) && (row != bound.row)) 3144 if ((col == bound.col) && (row != bound.row))
3176 { 3145 {
3177 if (save[ (row - (dirn == UP ? 1 : 0))].is_longer ()) 3146 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3178 { 3147 {
3179 trow = row + dirnadd; 3148 trow = row + dirnadd;
3180 tcol = dirn == UP ? ncol - 1 : 0; 3149 tcol = dirn == UP ? ncol - 1 : 0;
3181 3150
3182 if (!save[trow].t) 3151 if (!ROW(trow).t)
3183 break; 3152 break;
3184 3153
3185 stp = save[trow].t + tcol; 3154 stp = ROW(trow).t + tcol;
3186 srp = save[trow].r + tcol; 3155 srp = ROW(trow).r + tcol;
3187 3156
3188 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3157 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3189 break; 3158 break;
3190 3159
3191 row = trow; 3160 row = trow;
… …
3194 } 3163 }
3195 } 3164 }
3196 break; 3165 break;
3197 } 3166 }
3198 3167
3199Old_Word_Selection_You_Die:
3200 if (dirn == DN) 3168 if (dirn == DN)
3201 col++; /* put us on one past the end */ 3169 col++; /* put us on one past the end */
3202 3170
3203 /* Poke the values back in */ 3171 /* Poke the values back in */
3204 ret->row = row - saveLines; 3172 ret->row = row;
3205 ret->col = col; 3173 ret->col = col;
3206} 3174}
3207 3175
3208/* ------------------------------------------------------------------------- */ 3176/* ------------------------------------------------------------------------- */
3209/* 3177/*
… …
3214 * flag == 2 ==> button 3 motion 3182 * flag == 2 ==> button 3 motion
3215 */ 3183 */
3216void 3184void
3217rxvt_term::selection_extend (int x, int y, int flag) 3185rxvt_term::selection_extend (int x, int y, int flag)
3218{ 3186{
3219 int col, row; 3187 int col = clamp (Pixel2Col (x), 0, ncol);
3220 3188 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 3189
3228 /* 3190 /*
3229 * If we're selecting characters (single click) then we must check first 3191 * 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 3192 * 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 3193 * select nothing. Otherwise, if we're to the right of the mark, you have to
… …
3296 selection.beg.col = selection.end.col = selection.mark.col; 3258 selection.beg.col = selection.end.col = selection.mark.col;
3297 selection.beg.row = selection.end.row = selection.mark.row; 3259 selection.beg.row = selection.end.row = selection.mark.row;
3298 } 3260 }
3299 3261
3300 pos.col = col; 3262 pos.col = col;
3301 pos.row = row; 3263 pos.row = row - view_start;
3302
3303 pos.row -= view_start; /* adjust for scroll */
3304 3264
3305 /* 3265 /*
3306 * This is mainly xterm style selection with a couple of differences, mainly 3266 * This is mainly xterm style selection with a couple of differences, mainly
3307 * in the way button3 drag extension works. 3267 * in the way button3 drag extension works.
3308 * We're either doing: button1 drag; button3 press; or button3 drag 3268 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3367 } 3327 }
3368 } 3328 }
3369 3329
3370 if (selection.clicks == 1) 3330 if (selection.clicks == 1)
3371 { 3331 {
3372 if (selection.beg.col > save[selection.beg.row + saveLines].l //TODO//FIXME//LEN 3332 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3373 && !save[selection.beg.row + saveLines].is_longer () 3333 && !ROW(selection.beg.row).is_longer ()
3374#if ENABLE_FRILLS 3334#if ENABLE_FRILLS
3375 && !selection.rect 3335 && !selection.rect
3376#endif 3336#endif
3377 ) 3337 )
3378 selection.beg.col = ncol; 3338 selection.beg.col = ncol;
3379 3339
3380 if ( 3340 if (
3381 selection.end.col > save[selection.end.row + saveLines].l //TODO//FIXME//LEN 3341 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3382 && !save[selection.end.row + saveLines].is_longer () 3342 && !ROW(selection.end.row).is_longer ()
3383#if ENABLE_FRILLS 3343#if ENABLE_FRILLS
3384 && !selection.rect 3344 && !selection.rect
3385#endif 3345#endif
3386 ) 3346 )
3387 selection.end.col = ncol; 3347 selection.end.col = ncol;
… …
3389 else if (selection.clicks == 2) 3349 else if (selection.clicks == 2)
3390 { 3350 {
3391 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3351 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3392 selection.end.col--; 3352 selection.end.col--;
3393 3353
3354 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3355 {
3394 selection_delimit_word (UP, &selection.beg, &selection.beg); 3356 selection_delimit_word (UP, &selection.beg, &selection.beg);
3395 selection_delimit_word (DN, &selection.end, &selection.end); 3357 selection_delimit_word (DN, &selection.end, &selection.end);
3358 }
3396 } 3359 }
3397 else if (selection.clicks == 3) 3360 else if (selection.clicks == 3)
3398 { 3361 {
3399#if ENABLE_FRILLS 3362#if ENABLE_FRILLS
3400 if (options & Opt_tripleclickwords) 3363 if (OPTION (Opt_tripleclickwords))
3401 { 3364 {
3402 selection_delimit_word (UP, &selection.beg, &selection.beg); 3365 selection_delimit_word (UP, &selection.beg, &selection.beg);
3403 3366
3404 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3367 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3405 { 3368 {
3406 if (!save[end_row + saveLines].is_longer ()) 3369 if (!ROW(end_row).is_longer ())
3407 { 3370 {
3408 selection.end.row = end_row; 3371 selection.end.row = end_row;
3409 selection.end.col = save[end_row + saveLines].l; 3372 selection.end.col = ROW(end_row).l;
3410 selection_remove_trailing_spaces (); 3373 selection_remove_trailing_spaces ();
3411 break; 3374 break;
3412 } 3375 }
3413 } 3376 }
3414 } 3377 }
… …
3421 selection.beg.col = 0; 3384 selection.beg.col = 0;
3422 selection.end.col = ncol; 3385 selection.end.col = ncol;
3423 3386
3424 // select a complete logical line 3387 // select a complete logical line
3425 while (selection.beg.row > -saveLines 3388 while (selection.beg.row > -saveLines
3426 && save[selection.beg.row - 1 + saveLines].is_longer ()) 3389 && ROW(selection.beg.row - 1).is_longer ())
3427 selection.beg.row--; 3390 selection.beg.row--;
3428 3391
3429 while (selection.end.row < nrow 3392 while (selection.end.row < nrow
3430 && save[selection.end.row + saveLines].is_longer ()) 3393 && ROW(selection.end.row).is_longer ())
3431 selection.end.row++; 3394 selection.end.row++;
3432 } 3395 }
3433 } 3396 }
3434 3397
3435 if (button3 && buttonpress) 3398 if (button3 && buttonpress)
… …
3446 } 3409 }
3447 } 3410 }
3448 3411
3449#if ENABLE_FRILLS 3412#if ENABLE_FRILLS
3450 if (selection.rect && selection.beg.col > selection.end.col) 3413 if (selection.rect && selection.beg.col > selection.end.col)
3451 SWAP_IT (selection.beg.col, selection.end.col, int); 3414 ::swap (selection.beg.col, selection.end.col);
3452#endif 3415#endif
3453} 3416}
3454 3417
3455#if ENABLE_FRILLS 3418#if ENABLE_FRILLS
3456void 3419void
… …
3460 text_t *stp; 3423 text_t *stp;
3461 3424
3462 end_col = selection.end.col; 3425 end_col = selection.end.col;
3463 end_row = selection.end.row; 3426 end_row = selection.end.row;
3464 3427
3465 for ( ; end_row >= selection.beg.row; ) 3428 for (; end_row >= selection.beg.row; )
3466 { 3429 {
3467 stp = save[end_row + saveLines].t; 3430 stp = ROW(end_row).t;
3468 3431
3469 while (--end_col >= 0) 3432 while (--end_col >= 0)
3470 { 3433 {
3471 if (stp[end_col] != ' ' 3434 if (stp[end_col] != NOCHAR
3472 && stp[end_col] != '\t' 3435 && !unicode::is_space (stp[end_col]))
3473 && stp[end_col] != NOCHAR)
3474 break; 3436 break;
3475 } 3437 }
3476 3438
3477 if (end_col >= 0 3439 if (end_col >= 0
3478 || !save[end_row - 1 + saveLines].is_longer ()) 3440 || !ROW(end_row - 1).is_longer ())
3479 { 3441 {
3480 selection.end.col = end_col + 1; 3442 selection.end.col = end_col + 1;
3481 selection.end.row = end_row; 3443 selection.end.row = end_row;
3482 break; 3444 break;
3483 } 3445 }
… …
3654 */ 3616 */
3655void 3617void
3656rxvt_term::pixel_position (int *x, int *y) 3618rxvt_term::pixel_position (int *x, int *y)
3657{ 3619{
3658 *x = Pixel2Col (*x); 3620 *x = Pixel2Col (*x);
3659 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3621 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3660 *y = Pixel2Row (*y); 3622 *y = Pixel2Row (*y);
3661 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3623 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3662} 3624}
3663 3625
3664/* ------------------------------------------------------------------------- */ 3626/* ------------------------------------------------------------------------- */
3665#ifdef USE_XIM 3627#ifdef USE_XIM
3666void 3628void
… …
3677 3639
3678#if ENABLE_OVERLAY 3640#if ENABLE_OVERLAY
3679void 3641void
3680rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3642rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3681{ 3643{
3682 if (nrow < 3 || ncol < 3) 3644 if (nrow < 1 || ncol < 1)
3683 return; 3645 return;
3684 3646
3685 want_refresh = 1; 3647 want_refresh = 1;
3686 3648
3687 scr_overlay_off (); 3649 scr_overlay_off ();
3688 3650
3689 if (x < 0) x = ncol - w; 3651 if (x < 0) x = ncol - w;
3690 if (y < 0) y = nrow - h; 3652 if (y < 0) y = nrow - h;
3691 3653
3692 // make space for border 3654 // make space for border
3693 w += 2; MIN_IT (w, ncol); 3655 w += 2; min_it (w, ncol);
3694 h += 2; MIN_IT (h, nrow); 3656 h += 2; min_it (h, nrow);
3695 3657
3696 x -= 1; MAX_IT (x, 0); 3658 x -= 1; clamp_it (x, 0, ncol - w);
3697 y -= 1; MAX_IT (y, 0); 3659 y -= 1; clamp_it (y, 0, nrow - h);
3698
3699 MIN_IT (x, ncol - w);
3700 MIN_IT (y, nrow - h);
3701 3660
3702 ov_x = x; ov_y = y; 3661 ov_x = x; ov_y = y;
3703 ov_w = w; ov_h = h; 3662 ov_w = w; ov_h = h;
3704 3663
3705 ov_text = new text_t *[h]; 3664 ov_text = new text_t *[h];
… …
3791rxvt_term::scr_swap_overlay () 3750rxvt_term::scr_swap_overlay ()
3792{ 3751{
3793 if (!ov_text) 3752 if (!ov_text)
3794 return; 3753 return;
3795 3754
3796 int row_offset = ov_y + saveLines - view_start;
3797
3798 // swap screen mem with overlay 3755 // swap screen mem with overlay
3799 for (int y = ov_h; y--; ) 3756 for (int y = ov_h; y--; )
3800 { 3757 {
3801 text_t *t1 = ov_text[y]; 3758 text_t *t1 = ov_text[y];
3802 rend_t *r1 = ov_rend[y]; 3759 rend_t *r1 = ov_rend[y];
3803 3760
3804 text_t *t2 = save[y + row_offset].t + ov_x; 3761 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3805 rend_t *r2 = save[y + row_offset].r + ov_x; 3762 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3806 3763
3807 for (int x = ov_w; x--; ) 3764 for (int x = ov_w; x--; )
3808 { 3765 {
3809 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3766 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3810 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3767 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3812 } 3769 }
3813} 3770}
3814 3771
3815#endif 3772#endif
3816/* ------------------------------------------------------------------------- */ 3773/* ------------------------------------------------------------------------- */
3774

Diff Legend

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