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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.173 by root, Mon Dec 19 02:16:24 2005 UTC vs.
Revision 1.215 by root, Sun Jan 8 06:35:23 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 199 * Note: this is still needed so that all the scrollback lines are NULL
191 */ 200 */
192 nscrolled = 0; /* no saved lines */ 201 nsaved = 0; /* no saved lines */
193 term_start = 0; 202 term_start = 0;
194 nsaved = 0;
195 203
196 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 204 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 205 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 206
199 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
200 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 207 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
208 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
201 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
202 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
203 211
204 screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *));
205
206 scr_update_term ();
207
208 for (p = nrow; p--; ) 212 for (int row = nrow; row--; )
209 { 213 {
210 scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE); 214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 216 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213 } 217 }
214 218
215 memset (charsets, 'B', sizeof (charsets)); 219 memset (charsets, 'B', sizeof (charsets));
216 rstyle = DEFAULT_RSTYLE; 220 rstyle = DEFAULT_RSTYLE;
217 screen.flags = Screen_DefaultFlags; 221 screen.flags = Screen_DefaultFlags;
… …
241 { 245 {
242 /* 246 /*
243 * add or delete rows as appropriate 247 * add or delete rows as appropriate
244 */ 248 */
245 249
246 rxvt_salloc *old_ta; 250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247 rxvt_salloc *old_ra; 251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248 252
253#if 0
249 if (nrow < prev_nrow) 254 if (nrow < prev_nrow)
250 { 255 {
251 /* delete rows */
252 k = min (nscrolled, prev_nrow - nrow);
253 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
254 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
255
256 for (p = nrow; p < prev_nrow; p++) 256 for (int row = nrow; row < prev_nrow; row++)
257 { 257 {
258 lfree (save[p + saveLines]);
259 lfree (swap_save[p]); 258 lfree (swap_buf [row]);
260 lfree (drawn[p]); 259 lfree (drawn_buf[row]);
261 } 260 }
261 }
262#endif
262 263
263 /* we have fewer rows so fix up cursor position */ 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
264 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 265 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
266 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
265 267
266 scr_reset_realloc (); /* realloc _last_ */ 268 for (int row = min (nrow, prev_nrow); row--; )
269 {
270 lresize (drawn_buf[row]);
271 lresize (swap_buf [row]);
272 }
273
274 for (int row = prev_nrow; row < nrow; row++)
275 {
276 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
277 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
278 }
279
280 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
267 } 281
268 else if (nrow > prev_nrow) 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start - nsaved , prev_total_rows);
284 int q = total_rows; // rewrapped row
285
286 if (nsaved)
287 {
288 // re-wrap lines, this is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm.
290
291 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293
269 { 294 do
270 /* add rows */
271 scr_reset_realloc (); /* realloc _first_ */
272
273 int ocol = ncol;
274 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
275
276 k = min (nscrolled, nrow - prev_nrow);
277
278 for (p = prev_total_rows; p < total_rows; p++)
279 save[p].clear ();
280
281 for (p = prev_total_rows; p < total_rows - k; p++)
282 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
283
284 scr_update_term ();
285
286 for (p = prev_nrow; p < nrow; p++)
287 { 295 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 296 p = MOD (p - 1, prev_total_rows);
289 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
290 }
291
292 if (k > 0)
293 {
294 scr_scroll_text (0, (int)nrow - 1, -k, 1);
295 screen.cur.row += k;
296 screen.s_cur.row += k;
297 nscrolled -= k;
298 }
299
300#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
301 assert (screen.cur.row < nrow); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
302#else /* drive with your eyes closed */
303 MIN_IT (screen.cur.row, nrow - 1);
304#endif 299#endif
305 ncol = ocol; // save b/c scr_blank_screen_mem uses this
306 }
307
308 /* resize columns */
309 if (ncol != prev_ncol)
310 {
311 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
312 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
313
314 for (p = total_rows; p--; )
315 lresize (save[p]);
316
317 for (p = nrow; p--; )
318 {
319 lresize (drawn[p]);
320 lresize (swap_save[p]);
321 }
322
323 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
324
325 delete old_ta;
326 delete old_ra;
327 }
328
329#if 0
330 // re-wrap lines, this is rather ugly, possibly because I am too dumb
331 // to come up with a lean and mean algorithm.
332 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
333 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
334
335 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
336 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
337 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
338
339 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
340
341 p = prev_total_rows;
342 q = total_rows;
343
344 while (p > 0 && q > 0)
345 {
346 --p;
347
348 printf ("pq %d:%d\n", p, q);
349 if (save[p].t)
350 {
351 int llen = save[p].l; 300 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l;
352 302
353 assert (llen >= 0); 303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
354
355 while (p && save[p - 1].l < 0)
356 { 304 {
305 p = MOD (p - 1, prev_total_rows);
306
357 --p; 307 plines++;
358 llen += prev_ncol; 308 llen += prev_ncol;
359 } 309 }
360 310
361 int qlines = llen / ncol + 1; 311 int qlines = max (0, (llen - 1) / ncol) + 1;
312
313 // drop partial lines completely
314 if (q < qlines)
315 break;
316
317 q -= qlines;
318
362 int lofs = 0; 319 int lofs = 0;
320 line_t *qline;
363 321
364 q -= qlines; 322 // re-assemble the full line by destination lines
365
366 int qrow = q;
367
368 printf ("QL %d llen %d\n", qlines, llen);//D
369 for (; qlines--; qrow++) 323 for (int qrow = q; qlines--; qrow++)
370 { 324 {
325 qline = row_buf + qrow;
326 lalloc (*qline);
327 qline->l = ncol;
328 qline->is_longer (1);
329
371 if (qrow >= 0) 330 int qcol = 0;
331
332 // fill a single destination line
333 while (lofs < llen && qcol < ncol)
372 { 334 {
373 tp [qrow] = (text_t *)ta->alloc ();
374 rp [qrow] = (rend_t *)ra->alloc ();
375 tl [qrow] = -1;
376
377 int qcol = 0;
378
379 for (;;)
380 {
381 int prow = lofs / prev_ncol + p; 335 int prow = lofs / prev_ncol;
382 int pcol = lofs % prev_ncol; 336 int pcol = lofs % prev_ncol;
383 337
338 prow = MOD (p + prow, prev_total_rows);
339
340 // we only adjust the cursor _row_ and put it into
341 // the topmost line of "long line" it was in, as
342 // this seems to upset applications/shells/readline
343 // least.
344 if (prow == ocur.row)
345 screen.cur.row = q - (total_rows - nrow);
346
347 line_t &pline = old_buf [prow];
348
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 349 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385 350
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); 351 assert (len);
352 assert (pline.t);
400 353
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403 356
404 lofs += len; 357 lofs += len;
405 qcol += len; 358 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 } 359 }
411 else
412 lofs += ncol;
413 } 360 }
361
362 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
363 qline->is_longer (0);
364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414 } 365 }
366 while (p != pend && q > 0);
367
368 term_start = total_rows - nrow;
369 nsaved = term_start - q;
370
371 // make sure all terminal lines exist
372 while (nsaved < 0)
373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
374 }
375 else
415 } 376 {
377 // if no scrollback exists (yet), wing, instead of wrap
378
379 for (int row = min (nrow, prev_nrow); row--; )
380 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row];
416 383
417 free (screen.text); screen.text = tp; 384 qline = pline;
418 free (screen.rend); screen.rend = rp; 385 lresize (qline);
419 free (screen.tlen); screen.tlen = tl; 386 }
420 387
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 388 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392
393 term_start = 0;
394 }
395
396#ifdef DEBUG_STRICT //TODO: remove
397 for (int i = -nsaved; i < nrow; i++)
398 assert (ROW (i).t);
422#endif 399#endif
400
401 free (old_buf);
402 delete old_ta;
403 delete old_ra;
404
405 clamp_it (screen.cur.row, 0, nrow - 1);
406 clamp_it (screen.cur.col, 0, ncol - 1);
423 407
424 if (tabs) 408 if (tabs)
425 free (tabs); 409 free (tabs);
426 } 410 }
427 411
428 prev_nrow = nrow; 412 prev_nrow = nrow;
429 prev_ncol = ncol; 413 prev_ncol = ncol;
430 414
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 416
433 for (p = 0; p < ncol; p++) 417 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 418 tabs [col] = col % TABSIZE == 0;
435 419
436 tt_winch (); 420 tt_winch ();
437}
438 421
439void 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
440rxvt_term::scr_reset_realloc ()
441{
442 unsigned int total_rows = nrow + saveLines;
443
444 screen.line = (line_t **)rxvt_realloc (screen.line, nrow * sizeof (line_t *));
445 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
446 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
447 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
448 buf = (line_t *) rxvt_realloc (buf , total_rows * sizeof (line_t));
449} 423}
450 424
451/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
452/* 426/*
453 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
454 */ 428 */
455void 429void
456rxvt_term::scr_release () 430rxvt_term::scr_release ()
457{ 431{
458 unsigned int total_rows;
459
460 total_rows = nrow + saveLines;
461
462 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
463 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
464 434
465 free (screen.line); 435 free (row_buf);
466 free (save);
467 free (swap_save); 436 free (swap_buf);
468 free (drawn); 437 free (drawn_buf);
469 free (buf); 438 free (temp_buf);
470 free (tabs); 439 free (tabs);
440
441 row_buf = 0; // signal that we freed all the arrays
471} 442}
472 443
473/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
474/* 445/*
475 * Hard reset 446 * Hard reset
… …
526 set_font_style (); 497 set_font_style ();
527 break; 498 break;
528 } 499 }
529 500
530 /* boundary check in case screen size changed between SAVE and RESTORE */ 501 /* boundary check in case screen size changed between SAVE and RESTORE */
531 MIN_IT (s->cur.row, nrow - 1); 502 min_it (s->cur.row, nrow - 1);
532 MIN_IT (s->cur.col, ncol - 1); 503 min_it (s->cur.col, ncol - 1);
533#ifdef DEBUG_STRICT 504#ifdef DEBUG_STRICT
534 assert (s->cur.row >= 0); 505 assert (s->cur.row >= 0);
535 assert (s->cur.col >= 0); 506 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 507#endif
540} 508}
541 509
542/* ------------------------------------------------------------------------- */ 510/* ------------------------------------------------------------------------- */
543/* 511/*
… …
546 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 514 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
547 */ 515 */
548int 516int
549rxvt_term::scr_change_screen (int scrn) 517rxvt_term::scr_change_screen (int scrn)
550{ 518{
551 int i;
552#if NSCREENS
553 int offset;
554#endif
555
556 want_refresh = 1; 519 want_refresh = 1;
557
558 view_start = 0; 520 view_start = 0;
559 521
560 if (current_screen == scrn) 522 if (current_screen == scrn)
561 return scrn; 523 return scrn;
562 524
563 selection_check (2); /* check for boundary cross */ 525 selection_check (2); /* check for boundary cross */
564 526
565 i = current_screen; current_screen = scrn; scrn = i; 527 int i = current_screen; current_screen = scrn; scrn = i;
566 528
567 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 529 ::swap (screen.cur.row, swap.cur.row);
568 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 530 ::swap (screen.cur.col, swap.cur.col);
569 MAX_IT (screen.cur.row, 0); 531
570 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 532 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
571 MAX_IT (screen.cur.col, 0); 533 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
572 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
573 534
574#if NSCREENS 535#if NSCREENS
575 if (options & Opt_secondaryScreen) 536 if (OPTION (Opt_secondaryScreen))
576 { 537 {
577 num_scr = 0; 538 num_scr = 0;
578 offset = saveLines;
579 539
580 for (i = prev_nrow; i--;) 540 for (int i = prev_nrow; i--; )
581 SWAP_IT (*(screen.line[i]), swap_save[i], line_t); 541 ::swap (ROW(i), swap_buf [i]);
582 542
583 SWAP_IT (screen.charset, swap.charset, int16_t); 543 ::swap (screen.charset, swap.charset);
584 SWAP_IT (screen.flags, swap.flags, int); 544 ::swap (screen.flags, swap.flags);
585 screen.flags |= Screen_VisibleCursor; 545 screen.flags |= Screen_VisibleCursor;
586 swap.flags |= Screen_VisibleCursor; 546 swap.flags |= Screen_VisibleCursor;
587 } 547 }
588 else 548 else
589#endif 549#endif
590 if (options & Opt_secondaryScroll) 550 if (OPTION (Opt_secondaryScroll))
591 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 551 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
592 552
593 return scrn; 553 return scrn;
594} 554}
595 555
596// clear WrapNext indicator, solidifying position on next line 556// clear WrapNext indicator, solidifying position on next line
… …
603 screen.flags &= ~Screen_WrapNext; 563 screen.flags &= ~Screen_WrapNext;
604 564
605 screen.cur.col = 0; 565 screen.cur.col = 0;
606 566
607 if (screen.cur.row == screen.bscroll) 567 if (screen.cur.row == screen.bscroll)
608 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 568 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
609 else if (screen.cur.row < nrow - 1) 569 else if (screen.cur.row < nrow - 1)
610 screen.cur.row++; 570 screen.cur.row++;
611} 571}
612 572
613/* ------------------------------------------------------------------------- */ 573/* ------------------------------------------------------------------------- */
… …
639 rstyle = DEFAULT_RSTYLE; 599 rstyle = DEFAULT_RSTYLE;
640 else 600 else
641 rstyle &= ~style; 601 rstyle &= ~style;
642 } 602 }
643 603
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/* ------------------------------------------------------------------------- */ 604/* ------------------------------------------------------------------------- */
653/* 605/*
654 * Scroll text between <row1> and <row2> inclusive, by <count> lines 606 * Scroll text between <row1> and <row2> inclusive, by <count> lines
655 * count positive ==> scroll up 607 * count positive ==> scroll up
656 * count negative ==> scroll down 608 * count negative ==> scroll down
657 * spec == 0 for normal routines
658 */ 609 */
659int 610int
660rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 611rxvt_term::scr_scroll_text (int row1, int row2, int count)
661{ 612{
662 int i, j;
663
664 if (count == 0 || (row1 > row2)) 613 if (count == 0 || (row1 > row2))
665 return 0; 614 return 0;
666 615
667 want_refresh = 1; 616 want_refresh = 1;
617 num_scr += count;
668 618
669 if (row1 == 0 && count > 0 619 if (count > 0
620 && row1 == 0
621 && row2 == nrow - 1
670 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 622 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
671 { 623 {
672 nscrolled += count; 624 nsaved = min (nsaved + count, saveLines);
673 625
674 if (nscrolled > saveLines) 626 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
675 nscrolled = saveLines; 627
628 term_start = (term_start + count) % total_rows;
676 629
630 if (selection.op && current_screen == selection.screen)
631 {
632 selection.beg.row -= count;
633 selection.end.row -= count;
634 selection.mark.row -= count;
635
636 if (selection.beg.row < -nsaved
637 || selection.end.row < -nsaved
638 || selection.mark.row < -nsaved)
639 {
640 CLEAR_ALL_SELECTION ();
641 selection.op = SELECTION_CLEAR;
642 }
643 }
644
645 for (int i = count; i--; )
646 scr_blank_screen_mem (ROW(row2 - i), rstyle);
647
677 if ((options & Opt_scrollWithBuffer) 648 if (OPTION (Opt_scrollWithBuffer)
678 && view_start != 0 649 && view_start != 0
679 && view_start != saveLines) 650 && view_start != saveLines)
680 scr_page (UP, count); 651 scr_page (UP, count);
681 } 652 }
682 else if (!spec) 653 else
683 row1 += saveLines; 654 {
684
685 row2 += saveLines;
686
687 if (selection.op && current_screen == selection.screen) 655 if (selection.op && current_screen == selection.screen)
688 { 656 {
689 i = selection.beg.row + saveLines; 657 if ((selection.beg.row < row1 && selection.end.row > row1)
690 j = selection.end.row + saveLines; 658 || (selection.beg.row < row2 && selection.end.row > row2)
691 659 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
692 if ((i < row1 && j > row1) 660 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
693 || (i < row2 && j > row2) 661 || (selection.end.row - count < row1 && selection.end.row >= row1)
694 || (i - count < row1 && i >= row1) 662 || (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 { 663 {
699 CLEAR_ALL_SELECTION (); 664 CLEAR_ALL_SELECTION ();
700 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 665 selection.op = SELECTION_CLEAR;
701 } 666 }
702 else if (j >= row1 && j <= row2) 667 else if (selection.end.row >= row1 && selection.end.row <= row2)
703 { 668 {
704 /* move selected region too */ 669 /* move selected region too */
705 selection.beg.row -= count; 670 selection.beg.row -= count;
706 selection.end.row -= count; 671 selection.end.row -= count;
707 selection.mark.row -= count; 672 selection.mark.row -= count;
673
674 selection_check (0);
675 }
676 }
677
678 // use a simple and robust scrolling algorithm, this
679 // part of scr_scroll_text is not time-critical.
680
681 int rows = row2 - row1 + 1;
682
683 min_it (count, rows);
684
685 for (int row = 0; row < rows; row++)
708 } 686 {
709 } 687 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
710 688
711 selection_check (0); /* _after_ nscrolled update */ 689 if (!IN_RANGE_EXC (row + count, 0, rows))
690 scr_blank_screen_mem (temp_buf [row], rstyle);
691 }
712 692
713 num_scr += count; 693 for (int row = 0; row < rows; row++)
714 j = count; 694 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 { 695 }
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 696
760 return count; 697 return count;
761} 698}
762 699
763/* ------------------------------------------------------------------------- */ 700/* ------------------------------------------------------------------------- */
764/* 701/*
765 * Add text given in <str> of length <len> to screen struct 702 * Add text given in <str> of length <len> to screen struct
766 */ 703 */
767void 704void
768rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 705rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
769{ 706{
770 if (len <= 0) /* sanity */ 707 if (len <= 0) /* sanity */
771 return; 708 return;
772 709
773 unsigned char checksel; 710 unsigned char checksel;
774 unicode_t c; 711 unicode_t c;
775 int row, last_col; 712 int ncol = this->ncol;
776 const unicode_t *strend = str + len; 713 const wchar_t *strend = str + len;
777 714
778 want_refresh = 1; 715 want_refresh = 1;
779 ZERO_SCROLLBACK (); 716 ZERO_SCROLLBACK ();
780 last_col = ncol;
781 717
782 if (nlines > 0) 718 if (minlines > 0)
783 { 719 {
784 nlines += screen.cur.row - screen.bscroll; 720 minlines += screen.cur.row - screen.bscroll;
721
785 if ((nlines > 0) 722 if (minlines > 0
786 && (screen.tscroll == 0) 723 && screen.tscroll == 0
787 && (screen.bscroll == (nrow - 1))) 724 && screen.bscroll == nrow - 1)
788 { 725 {
789 /* _at least_ this many lines need to be scrolled */ 726 /* _at least_ this many lines need to be scrolled */
790 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 727 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
791 screen.cur.row -= nlines; 728 screen.cur.row -= minlines;
792 } 729 }
793 } 730 }
794 731
795#ifdef DEBUG_STRICT 732#ifdef DEBUG_STRICT
796 assert (screen.cur.col < last_col); 733 assert (screen.cur.col < ncol);
797 assert ((screen.cur.row < nrow) 734 assert (screen.cur.row < nrow
798 && (screen.cur.row >= - (int32_t)nscrolled)); 735 && 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 736#endif
804 row = screen.cur.row + saveLines; 737 int row = screen.cur.row;
805 738
806 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 739 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 740
808 line_t *line = save + row; 741 line_t *line = &ROW(row);
809 742
810 while (str < strend) 743 while (str < strend)
811 { 744 {
812 c = *str++; 745 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
813 746
814 if (c < 0x20) 747 if (c < 0x20)
815 if (c == C0_LF) 748 if (c == C0_LF)
816 { 749 {
817 if (line->l != -1) /* XXX: think about this */
818 MAX_IT (line->l, screen.cur.col); 750 max_it (line->l, screen.cur.col);
819 751
820 screen.flags &= ~Screen_WrapNext; 752 screen.flags &= ~Screen_WrapNext;
821 753
822 if (screen.cur.row == screen.bscroll) 754 if (screen.cur.row == screen.bscroll)
823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 755 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
824 else if (screen.cur.row < (nrow - 1)) 756 else if (screen.cur.row < (nrow - 1))
825 row = (++screen.cur.row) + saveLines; 757 row = ++screen.cur.row;
826 758
827 line = save + row; /* _must_ refresh */ 759 line = &ROW(row); /* _must_ refresh */
828 continue; 760 continue;
829 } 761 }
830 else if (c == C0_CR) 762 else if (c == C0_CR)
831 { 763 {
832 if (line->l != -1) /* XXX: think about this */
833 MAX_IT (line->l, screen.cur.col); 764 max_it (line->l, screen.cur.col);
834 765
835 screen.flags &= ~Screen_WrapNext; 766 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 767 screen.cur.col = 0;
837 continue; 768 continue;
838 } 769 }
… …
855 CLEAR_SELECTION (); 786 CLEAR_SELECTION ();
856 } 787 }
857 788
858 if (screen.flags & Screen_WrapNext) 789 if (screen.flags & Screen_WrapNext)
859 { 790 {
860 line->l = -1; 791 max_it (line->l, ncol);
792 line->is_longer (1);
861 793
862 scr_do_wrap (); 794 scr_do_wrap ();
863 795
864 row = screen.cur.row + saveLines; 796 row = screen.cur.row;
865 line = save + row; /* _must_ refresh */ 797 line = &ROW(row); /* _must_ refresh */
866 } 798 }
867 799
868 // some utf-8 decoders "decode" surrogate characters: let's fix this. 800 // some utf-8 decoders "decode" surrogate characters: let's fix this.
869 if (IN_RANGE (c, 0xd800, 0xdfff)) 801 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
870 c = 0xfffd; 802 c = 0xfffd;
871 803
872 // rely on wcwidth to tell us the character width, at least for non-latin1 804 // 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 805 // 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 806 // for the line drawing characters below as they might be invalid in the current
875 // locale. 807 // locale.
876 int width = c < 0x100 ? 1 : wcwidth (c); 808 int width = c < 0x100 ? 1 : wcwidth (c);
877 809
878 if (charsets[screen.charset] == '0') // DEC SPECIAL 810 if (charsets [screen.charset] == '0') // DEC SPECIAL
879 { 811 {
880 // vt100 special graphics and line drawing 812 // vt100 special graphics and line drawing
881 // 5f-7e standard vt100 813 // 5f-7e standard vt100
882 // 40-5e rxvt extension for extra curses acs chars 814 // 40-5e rxvt extension for extra curses acs chars
883 static uint16_t vt100_0[62] = { // 41 .. 7e 815 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
935 } 867 }
936 868
937 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 869 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
938 870
939 // if the character doesn't fit into the remaining columns... 871 // if the character doesn't fit into the remaining columns...
940 if (screen.cur.col > last_col - width && last_col >= width) 872 if (screen.cur.col > ncol - width && ncol >= width)
941 { 873 {
942 // ...output spaces 874 // ...output spaces
943 c = ' '; 875 c = ' ';
944 // and try the same character next loop iteration 876 // and try the same character next loop iteration
945 --str; 877 --str;
946 } 878 }
947 879
880 line->touch ();
881
948 do 882 do
949 { 883 {
950 line->t[screen.cur.col] = c; 884 line->t[screen.cur.col] = c;
951 line->r[screen.cur.col] = rend; 885 line->r[screen.cur.col] = rend;
952 886
953 if (screen.cur.col < last_col - 1) 887 if (screen.cur.col < ncol - 1)
954 screen.cur.col++; 888 screen.cur.col++;
955 else 889 else
956 { 890 {
957 line->l = last_col; 891 line->l = ncol;
958 if (screen.flags & Screen_Autowrap) 892 if (screen.flags & Screen_Autowrap)
959 screen.flags |= Screen_WrapNext; 893 screen.flags |= Screen_WrapNext;
960 break; 894 break;
961 } 895 }
962 896
… …
964 } 898 }
965 while (--width > 0); 899 while (--width > 0);
966 900
967 // pad with spaces when overwriting wide character with smaller one 901 // pad with spaces when overwriting wide character with smaller one
968 if (!width) 902 if (!width)
903 {
904 line->touch ();
905
969 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 906 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
970 { 907 {
971 line->t[c] = ' '; 908 line->t[c] = ' ';
972 line->r[c] = rend; 909 line->r[c] = rend;
973 } 910 }
911 }
974 } 912 }
975 else // width == 0 913 else // width == 0
976 { 914 {
977#if ENABLE_COMBINING 915#if ENABLE_COMBINING
978 // handle combining characters 916 // handle combining characters
979 // we just tag the accent on the previous on-screen character. 917 // we just tag the accent on the previous on-screen character.
980 // this is arguably not correct, but also arguably not wrong. 918 // this is arguably not correct, but also arguably not wrong.
981 // we don't handle double-width characters nicely yet. 919 // we don't handle double-width characters nicely yet.
920 line_t *linep;
982 text_t *tp; 921 text_t *tp;
983 rend_t *rp; 922 rend_t *rp;
984 923
985 if (screen.cur.col > 0) 924 if (screen.cur.col > 0)
986 { 925 {
926 linep = line;
987 tp = line->t + screen.cur.col - 1; 927 tp = line->t + screen.cur.col - 1;
988 rp = line->r + screen.cur.col - 1; 928 rp = line->r + screen.cur.col - 1;
989
990 while (*tp == NOCHAR && tp > line->t)
991 tp--, rp--;
992 } 929 }
993 else if (screen.cur.row > 0 930 else if (screen.cur.row > 0
994 && save [screen.cur.row - 1 + saveLines].is_cont ()) 931 && ROW(screen.cur.row - 1).is_longer ())
995 { 932 {
996 line_t *line = save + (screen.cur.row - 1 + saveLines); 933 linep = &ROW(screen.cur.row - 1);
997
998 tp = line->t + last_col - 1; 934 tp = line->t + ncol - 1;
999 rp = line->r + last_col - 1; 935 rp = line->r + ncol - 1;
1000
1001 while (*tp == NOCHAR && tp > line->t)
1002 tp--, rp--;
1003 } 936 }
1004 else 937 else
1005 continue; 938 continue;
939
940 linep->touch ();
941
942 while (*tp == NOCHAR && tp > linep->t)
943 tp--, rp--;
1006 944
1007 // first try to find a precomposed character 945 // first try to find a precomposed character
1008 unicode_t n = rxvt_compose (*tp, c); 946 unicode_t n = rxvt_compose (*tp, c);
1009 if (n == NOCHAR) 947 if (n == NOCHAR)
1010 n = rxvt_composite.compose (*tp, c); 948 n = rxvt_composite.compose (*tp, c);
… …
1013 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1014#endif 952#endif
1015 } 953 }
1016 } 954 }
1017 955
1018 if (line->l != -1) /* XXX: think about this */
1019 MAX_IT (line->l, screen.cur.col); 956 max_it (line->l, screen.cur.col);
1020 957
1021#ifdef DEBUG_STRICT 958#ifdef DEBUG_STRICT
1022 assert (screen.cur.row >= 0); 959 assert (screen.cur.row >= 0);
1023#else /* drive with your eyes closed */
1024 MAX_IT (screen.cur.row, 0);
1025#endif 960#endif
1026} 961}
1027 962
1028/* ------------------------------------------------------------------------- */ 963/* ------------------------------------------------------------------------- */
1029/* 964/*
… …
1068 1003
1069 if (count == 0) 1004 if (count == 0)
1070 return; 1005 return;
1071 else if (count > 0) 1006 else if (count > 0)
1072 { 1007 {
1073 int row = saveLines + screen.cur.row; 1008 line_t &l = ROW(screen.cur.row);
1074
1075 line_t &l = save[row];
1076 rend_t base_rend = l.r[i]; 1009 rend_t base_rend = l.r[i];
1077 ht &= l.t[i] == ' '; 1010 ht &= l.t[i] == ' ';
1078 1011
1079 for (; ++i < ncol; ) 1012 for (; ++i < ncol; )
1080 if (tabs[i]) 1013 if (tabs[i])
1081 { 1014 {
1082 x = i; 1015 x = i;
1016
1083 if (!--count) 1017 if (!--count)
1084 break; 1018 break;
1085 } 1019 }
1086 else 1020 else
1087 ht &= l.t[i] == ' ' 1021 ht &= l.t[i] == ' '
… …
1090 if (count) 1024 if (count)
1091 x = ncol - 1; 1025 x = ncol - 1;
1092 1026
1093 // store horizontal tab commands as characters inside the text 1027 // store horizontal tab commands as characters inside the text
1094 // buffer so they can be selected and pasted. 1028 // buffer so they can be selected and pasted.
1095 if (ht && options & Opt_pastableTabs) 1029 if (ht && OPTION (Opt_pastableTabs))
1096 { 1030 {
1097 base_rend = SET_FONT (base_rend, 0); 1031 base_rend = SET_FONT (base_rend, 0);
1098 1032
1099 if (l.l != -1) /* XXX: think about this */ 1033 l.touch (x);
1100 MAX_IT (l.l, x);
1101 1034
1102 i = screen.cur.col; 1035 i = screen.cur.col;
1103 1036
1104 l.t[i] = '\t'; 1037 l.t[i] = '\t';
1105 l.r[i] = base_rend; 1038 l.r[i] = base_rend;
… …
1141rxvt_term::scr_backindex () 1074rxvt_term::scr_backindex ()
1142{ 1075{
1143 if (screen.cur.col > 0) 1076 if (screen.cur.col > 0)
1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1077 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145 else 1078 else
1146 {
1147 if (save[screen.cur.row + saveLines].l == 0)
1148 return; /* um, yeah? */
1149
1150 scr_insdel_chars (1, INSERT); 1079 scr_insdel_chars (1, INSERT);
1151 }
1152} 1080}
1153#endif 1081#endif
1154/* ------------------------------------------------------------------------- */ 1082/* ------------------------------------------------------------------------- */
1155/* 1083/*
1156 * Process DEC Forward Index 1084 * Process DEC Forward Index
… …
1160 */ 1088 */
1161#if ENABLE_FRILLS 1089#if ENABLE_FRILLS
1162void 1090void
1163rxvt_term::scr_forwardindex () 1091rxvt_term::scr_forwardindex ()
1164{ 1092{
1165 int row;
1166
1167 if (screen.cur.col < ncol - 1) 1093 if (screen.cur.col < ncol - 1)
1168 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1094 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1169 else 1095 else
1170 { 1096 {
1171 row = screen.cur.row + saveLines; 1097 line_t &l = ROW(screen.cur.row);
1172 1098
1173 if (save[row].l == 0) 1099 l.touch ();
1174 return; /* um, yeah? */ 1100 l.is_longer (0);
1175 else if (save[row].is_cont ())
1176 save[row].l = ncol;
1177 1101
1178 scr_gotorc (0, 0, R_RELATIVE); 1102 scr_gotorc (0, 0, R_RELATIVE);
1179 scr_insdel_chars (1, DELETE); 1103 scr_insdel_chars (1, DELETE);
1180 scr_gotorc (0, ncol - 1, R_RELATIVE); 1104 scr_gotorc (0, ncol - 1, R_RELATIVE);
1181 } 1105 }
… …
1191{ 1115{
1192 want_refresh = 1; 1116 want_refresh = 1;
1193 ZERO_SCROLLBACK (); 1117 ZERO_SCROLLBACK ();
1194 1118
1195 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1119 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1196 MAX_IT (screen.cur.col, 0); 1120 clamp_it (screen.cur.col, 0, ncol - 1);
1197 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1198 1121
1199 screen.flags &= ~Screen_WrapNext; 1122 screen.flags &= ~Screen_WrapNext;
1200 1123
1201 if (relative & R_RELATIVE) 1124 if (relative & R_RELATIVE)
1202 { 1125 {
… …
1220 else 1143 else
1221 { 1144 {
1222 if (screen.flags & Screen_Relative) 1145 if (screen.flags & Screen_Relative)
1223 { /* relative origin mode */ 1146 { /* relative origin mode */
1224 screen.cur.row = row + screen.tscroll; 1147 screen.cur.row = row + screen.tscroll;
1225 MIN_IT (screen.cur.row, screen.bscroll); 1148 min_it (screen.cur.row, screen.bscroll);
1226 } 1149 }
1227 else 1150 else
1228 screen.cur.row = row; 1151 screen.cur.row = row;
1229 } 1152 }
1230 1153
1231 MAX_IT (screen.cur.row, 0); 1154 clamp_it (screen.cur.row, 0, nrow - 1);
1232 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1233} 1155}
1234 1156
1235/* ------------------------------------------------------------------------- */ 1157/* ------------------------------------------------------------------------- */
1236/* 1158/*
1237 * direction should be UP or DN 1159 * direction should be UP or DN
… …
1248 1170
1249 screen.flags &= ~Screen_WrapNext; 1171 screen.flags &= ~Screen_WrapNext;
1250 1172
1251 if ((screen.cur.row == screen.bscroll && direction == UP) 1173 if ((screen.cur.row == screen.bscroll && direction == UP)
1252 || (screen.cur.row == screen.tscroll && direction == DN)) 1174 || (screen.cur.row == screen.tscroll && direction == DN))
1253 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1175 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1254 else 1176 else
1255 screen.cur.row += dirn; 1177 screen.cur.row += dirn;
1256 1178
1257 MAX_IT (screen.cur.row, 0); 1179 clamp_it (screen.cur.row, 0, nrow - 1);
1258 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1259 selection_check (0); 1180 selection_check (0);
1260} 1181}
1261 1182
1262/* ------------------------------------------------------------------------- */ 1183/* ------------------------------------------------------------------------- */
1263/* 1184/*
… …
1267 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1268 */ 1189 */
1269void 1190void
1270rxvt_term::scr_erase_line (int mode) 1191rxvt_term::scr_erase_line (int mode)
1271{ 1192{
1272 unsigned int row, col, num; 1193 unsigned int col, num;
1273 1194
1274 want_refresh = 1; 1195 want_refresh = 1;
1275 ZERO_SCROLLBACK (); 1196 ZERO_SCROLLBACK ();
1276 1197
1277 selection_check (1); 1198 selection_check (1);
1278 1199
1279 row = saveLines + screen.cur.row; 1200 line_t &line = ROW(screen.cur.row);
1201
1202 line.touch ();
1203 line.is_longer (0);
1280 1204
1281 switch (mode) 1205 switch (mode)
1282 { 1206 {
1283 case 0: /* erase to end of line */ 1207 case 0: /* erase to end of line */
1284 col = screen.cur.col; 1208 col = screen.cur.col;
1285 num = ncol - col; 1209 num = ncol - col;
1286 MIN_IT (save[row].l, (int16_t)col); 1210 min_it (line.l, col);
1287 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1211 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1288 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1212 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1289 CLEAR_SELECTION (); 1213 CLEAR_SELECTION ();
1290 break; 1214 break;
1291 case 1: /* erase to beginning of line */ 1215 case 1: /* erase to beginning of line */
… …
1296 CLEAR_SELECTION (); 1220 CLEAR_SELECTION ();
1297 break; 1221 break;
1298 case 2: /* erase whole line */ 1222 case 2: /* erase whole line */
1299 col = 0; 1223 col = 0;
1300 num = ncol; 1224 num = ncol;
1301 save[row].l = 0; 1225 line.l = 0;
1302 if (selection.beg.row <= screen.cur.row 1226 if (selection.beg.row <= screen.cur.row
1303 && selection.end.row >= screen.cur.row) 1227 && selection.end.row >= screen.cur.row)
1304 CLEAR_SELECTION (); 1228 CLEAR_SELECTION ();
1305 break; 1229 break;
1306 default: 1230 default:
1307 return; 1231 return;
1308 } 1232 }
1309 1233
1310 if (save[row].t)
1311 scr_blank_line (save[row], col, num, rstyle); 1234 scr_blank_line (line, col, num, rstyle);
1312 else
1313 scr_blank_screen_mem (save[row], rstyle);
1314} 1235}
1315 1236
1316/* ------------------------------------------------------------------------- */ 1237/* ------------------------------------------------------------------------- */
1317/* 1238/*
1318 * Erase part of whole of the screen 1239 * Erase part of whole of the screen
… …
1322 */ 1243 */
1323void 1244void
1324rxvt_term::scr_erase_screen (int mode) 1245rxvt_term::scr_erase_screen (int mode)
1325{ 1246{
1326 int num; 1247 int num;
1327 int32_t row, row_offset; 1248 int32_t row;
1328 rend_t ren; 1249 rend_t ren;
1329 XGCValues gcvalue; 1250 XGCValues gcvalue;
1330 1251
1331 want_refresh = 1; 1252 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1253 ZERO_SCROLLBACK ();
1333
1334 row_offset = (int32_t)saveLines;
1335 1254
1336 switch (mode) 1255 switch (mode)
1337 { 1256 {
1338 case 0: /* erase to end of screen */ 1257 case 0: /* erase to end of screen */
1339 selection_check (1); 1258 selection_check (1);
… …
1363 CLEAR_SELECTION (); 1282 CLEAR_SELECTION ();
1364 1283
1365 if (row >= nrow) /* Out Of Bounds */ 1284 if (row >= nrow) /* Out Of Bounds */
1366 return; 1285 return;
1367 1286
1368 MIN_IT (num, (nrow - row)); 1287 min_it (num, nrow - row);
1369 1288
1370 if (rstyle & (RS_RVid | RS_Uline)) 1289 if (rstyle & (RS_RVid | RS_Uline))
1371 ren = (rend_t) ~RS_None; 1290 ren = (rend_t) ~RS_None;
1372 else if (GET_BASEBG (rstyle) == Color_bg) 1291 else if (GET_BASEBG (rstyle) == Color_bg)
1373 { 1292 {
… …
1375 CLEAR_ROWS (row, num); 1294 CLEAR_ROWS (row, num);
1376 } 1295 }
1377 else 1296 else
1378 { 1297 {
1379 ren = rstyle & (RS_fgMask | RS_bgMask); 1298 ren = rstyle & (RS_fgMask | RS_bgMask);
1380 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1299 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1381 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1300 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1382 ERASE_ROWS (row, num); 1301 ERASE_ROWS (row, num);
1383 gcvalue.foreground = pix_colors[Color_fg]; 1302 gcvalue.foreground = pix_colors[Color_fg];
1384 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1303 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1385 } 1304 }
1386 1305
1387 for (; num--; row++) 1306 for (; num--; row++)
1388 { 1307 {
1389 scr_blank_screen_mem (save[row + row_offset], rstyle); 1308 scr_blank_screen_mem (ROW(row), rstyle);
1390 save[row + row_offset].l = 0;
1391 scr_blank_line (drawn[row], 0, ncol, ren); 1309 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1392 } 1310 }
1393} 1311}
1394 1312
1395#if ENABLE_FRILLS 1313#if ENABLE_FRILLS
1396void 1314void
1397rxvt_term::scr_erase_savelines () 1315rxvt_term::scr_erase_savelines ()
1398{ 1316{
1399 want_refresh = 1; 1317 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1318 ZERO_SCROLLBACK ();
1401 1319
1402 nscrolled = 0; 1320 nsaved = 0;
1403} 1321}
1404#endif 1322#endif
1405 1323
1406/* ------------------------------------------------------------------------- */ 1324/* ------------------------------------------------------------------------- */
1407/* 1325/*
… …
1409 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1327 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1410 */ 1328 */
1411void 1329void
1412rxvt_term::scr_E () 1330rxvt_term::scr_E ()
1413{ 1331{
1414 int i, j, k;
1415 rend_t *r1, fs; 1332 rend_t fs;
1416 1333
1417 want_refresh = 1; 1334 want_refresh = 1;
1418 ZERO_SCROLLBACK (); 1335 ZERO_SCROLLBACK ();
1419 1336
1420 num_scr_allow = 0; 1337 num_scr_allow = 0;
1421 selection_check (3); 1338 selection_check (3);
1422 1339
1423 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1340 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1424 for (k = saveLines, i = nrow; i--; k++) 1341 for (int row = nrow; row--; )
1425 { 1342 {
1426 save[k].l = ncol; /* make the `E's selectable */ 1343 line_t &line = ROW(row);
1344
1427 fill_text (save[k].t, 'E', ncol); 1345 fill_text (line.t, 'E', ncol);
1428 for (r1 = save[k].r, j = ncol; j--; ) 1346 rend_t *r1 = line.r;
1347
1348 for (int j = ncol; j--; )
1429 *r1++ = fs; 1349 *r1++ = fs;
1350
1351 line.is_longer (0);
1352 line.touch (ncol);
1430 } 1353 }
1431} 1354}
1432 1355
1433/* ------------------------------------------------------------------------- */ 1356/* ------------------------------------------------------------------------- */
1434/* 1357/*
… …
1455 count = end; 1378 count = end;
1456 } 1379 }
1457 1380
1458 scr_do_wrap (); 1381 scr_do_wrap ();
1459 1382
1460 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1383 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1461} 1384}
1462 1385
1463/* ------------------------------------------------------------------------- */ 1386/* ------------------------------------------------------------------------- */
1464/* 1387/*
1465 * Insert/Delete <count> characters from the current position 1388 * Insert/Delete <count> characters from the current position
… …
1477 return; 1400 return;
1478 1401
1479 scr_do_wrap (); 1402 scr_do_wrap ();
1480 1403
1481 selection_check (1); 1404 selection_check (1);
1482 MIN_IT (count, (ncol - screen.cur.col)); 1405 min_it (count, ncol - screen.cur.col);
1483 1406
1484 row = screen.cur.row + saveLines; 1407 row = screen.cur.row;
1485 1408
1486 line_t *line = save + row; 1409 line_t *line = &ROW(row);
1410
1411 line->touch ();
1412 line->is_longer (0);
1487 1413
1488 switch (insdel) 1414 switch (insdel)
1489 { 1415 {
1490 case INSERT: 1416 case INSERT:
1491 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1417 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1492 { 1418 {
1493 line->t[col] = line->t[col - count]; 1419 line->t[col] = line->t[col - count];
1494 line->r[col] = line->r[col - count]; 1420 line->r[col] = line->r[col - count];
1495 } 1421 }
1496 1422
1497 if (line->l != -1) 1423 line->l = min (line->l + count, ncol);
1498 {
1499 line->l += count;
1500 MIN_IT (line->l, ncol);
1501 }
1502 1424
1503 if (selection.op && current_screen == selection.screen 1425 if (selection.op && current_screen == selection.screen
1504 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1426 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1505 { 1427 {
1506 if (selection.end.row != screen.cur.row 1428 if (selection.end.row != screen.cur.row
… …
1512 selection.mark.col += count; /* XXX: yes? */ 1434 selection.mark.col += count; /* XXX: yes? */
1513 selection.end.col += count; 1435 selection.end.col += count;
1514 } 1436 }
1515 } 1437 }
1516 1438
1517 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1439 scr_blank_line (*line, screen.cur.col, count, rstyle);
1518 break; 1440 break;
1519 1441
1520 case ERASE: 1442 case ERASE:
1521 screen.cur.col += count; /* don't worry if > ncol */ 1443 screen.cur.col += count; /* don't worry if > ncol */
1522 selection_check (1); 1444 selection_check (1);
1523 screen.cur.col -= count; 1445 screen.cur.col -= count;
1446
1447 line->l = max (line->l - count, 0);
1524 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1448 scr_blank_line (*line, screen.cur.col, count, rstyle);
1525 break; 1449 break;
1526 1450
1527 case DELETE: 1451 case DELETE:
1528 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1452 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1529 1453
… …
1531 { 1455 {
1532 line->t[col] = line->t[col + count]; 1456 line->t[col] = line->t[col + count];
1533 line->r[col] = line->r[col + count]; 1457 line->r[col] = line->r[col + count];
1534 } 1458 }
1535 1459
1460 line->l = max (line->l - count, 0);
1536 scr_blank_line (*line, ncol - count, count, tr); 1461 scr_blank_line (*line, ncol - count, count, tr);
1537
1538 if (line->is_cont ()) /* break line continuation */
1539 line->l = ncol;
1540
1541 line->l -= count;
1542 MAX_IT (line->l, 0);
1543 1462
1544 if (selection.op && current_screen == selection.screen 1463 if (selection.op && current_screen == selection.screen
1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1464 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1546 { 1465 {
1547 if (selection.end.row != screen.cur.row 1466 if (selection.end.row != screen.cur.row
… …
1567 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1486 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1568 */ 1487 */
1569void 1488void
1570rxvt_term::scr_scroll_region (int top, int bot) 1489rxvt_term::scr_scroll_region (int top, int bot)
1571{ 1490{
1572 MAX_IT (top, 0); 1491 max_it (top, 0);
1573 MIN_IT (bot, (int)nrow - 1); 1492 min_it (bot, nrow - 1);
1574 1493
1575 if (top > bot) 1494 if (top > bot)
1576 return; 1495 return;
1577 1496
1578 screen.tscroll = top; 1497 screen.tscroll = top;
… …
1659rxvt_term::scr_set_tab (int mode) 1578rxvt_term::scr_set_tab (int mode)
1660{ 1579{
1661 if (mode < 0) 1580 if (mode < 0)
1662 memset (tabs, 0, ncol * sizeof (char)); 1581 memset (tabs, 0, ncol * sizeof (char));
1663 else if (screen.cur.col < ncol) 1582 else if (screen.cur.col < ncol)
1664 tabs[screen.cur.col] = (mode ? 1 : 0); 1583 tabs [screen.cur.col] = !!mode;
1665} 1584}
1666 1585
1667/* ------------------------------------------------------------------------- */ 1586/* ------------------------------------------------------------------------- */
1668/* 1587/*
1669 * Set reverse/normal video 1588 * Set reverse/normal video
… …
1676 XGCValues gcvalue; 1595 XGCValues gcvalue;
1677 1596
1678 if (rvideo != mode) 1597 if (rvideo != mode)
1679 { 1598 {
1680 rvideo = mode; 1599 rvideo = mode;
1681 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1600 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#if XPM_BACKGROUND 1601#if XPM_BACKGROUND
1683 if (bgPixmap.pixmap == None) 1602 if (bgPixmap.pixmap == None)
1684#endif 1603#endif
1685#if TRANSPARENT 1604#if TRANSPARENT
1686 if (! (options & Opt_transparent) || am_transparent == 0) 1605 if (! OPTION (Opt_transparent) || am_transparent == 0)
1687#endif 1606#endif
1688 XSetWindowBackground (display->display, vt, 1607 XSetWindowBackground (display->display, vt,
1689 pix_colors[Color_bg]); 1608 pix_colors[Color_bg]);
1690 1609
1691 gcvalue.foreground = pix_colors[Color_fg]; 1610 gcvalue.foreground = pix_colors[Color_fg];
… …
1716 * Set font style 1635 * Set font style
1717 */ 1636 */
1718void 1637void
1719rxvt_term::set_font_style () 1638rxvt_term::set_font_style ()
1720{ 1639{
1640#if 0
1721 switch (charsets[screen.charset]) 1641 switch (charsets [screen.charset])
1722 { 1642 {
1723 case '0': /* DEC Special Character & Line Drawing Set */ 1643 case '0': /* DEC Special Character & Line Drawing Set */
1724 break; 1644 break;
1725 case 'A': /* United Kingdom (UK) */ 1645 case 'A': /* United Kingdom (UK) */
1726 break; 1646 break;
… …
1733 case 'C': /* Finnish character set */ 1653 case 'C': /* Finnish character set */
1734 break; 1654 break;
1735 case 'K': /* German character set */ 1655 case 'K': /* German character set */
1736 break; 1656 break;
1737 } 1657 }
1658#endif
1738} 1659}
1739 1660
1740/* ------------------------------------------------------------------------- */ 1661/* ------------------------------------------------------------------------- */
1741/* 1662/*
1742 * Choose a font 1663 * Choose a font
… …
1782 bool found = false; 1703 bool found = false;
1783 1704
1784 for (int i = 0; i < nrow; i++) 1705 for (int i = 0; i < nrow; i++)
1785 { 1706 {
1786 int col = 0; 1707 int col = 0;
1787 rend_t *drp = drawn[i].r; 1708 rend_t *drp = drawn_buf[i].r;
1788 1709
1789 for (; col < ncol; col++, drp++) 1710 for (; col < ncol; col++, drp++)
1790 if ((*drp & mask) == value) 1711 if ((*drp & mask) == value)
1791 { 1712 {
1792 found = true; 1713 found = true;
… …
1810rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1731rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1811{ 1732{
1812 int i; 1733 int i;
1813 row_col_t rc[RC_COUNT]; 1734 row_col_t rc[RC_COUNT];
1814 1735
1815 if (!drawn) /* sanity check */ 1736 if (!drawn_buf) /* sanity check */
1816 return; 1737 return;
1817 1738
1818#ifndef NO_SLOW_LINK_SUPPORT 1739#ifndef NO_SLOW_LINK_SUPPORT
1819 if (refresh_type == FAST_REFRESH && !display->is_local) 1740 if (refresh_type == FAST_REFRESH && !display->is_local)
1820 { 1741 {
1821 y = 0; 1742 y = 0;
1822 eheight = height; 1743 eheight = height;
1823 } 1744 }
1824#endif
1825
1826#ifdef DEBUG_STRICT
1827 x = max (x, 0);
1828 x = min (x, (int)width);
1829 y = max (y, 0);
1830 y = min (y, (int)height);
1831#endif 1745#endif
1832 1746
1833 /* round down */ 1747 /* round down */
1834 rc[PART_BEG].col = Pixel2Col (x); 1748 rc[PART_BEG].col = Pixel2Col (x);
1835 rc[PART_BEG].row = Pixel2Row (y); 1749 rc[PART_BEG].row = Pixel2Row (y);
… …
1838 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1752 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1839 1753
1840 /* sanity checks */ 1754 /* sanity checks */
1841 for (i = PART_BEG; i < RC_COUNT; i++) 1755 for (i = PART_BEG; i < RC_COUNT; i++)
1842 { 1756 {
1843 MIN_IT (rc[i].col, ncol - 1); 1757 min_it (rc[i].col, ncol - 1);
1844 MIN_IT (rc[i].row, nrow - 1); 1758 min_it (rc[i].row, nrow - 1);
1845 } 1759 }
1846 1760
1847 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1761 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1848 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1762 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1849 1763
1850 if (refresh) 1764 if (refresh)
1851 scr_refresh (SLOW_REFRESH); 1765 scr_refresh (SLOW_REFRESH);
1852} 1766}
1853 1767
… …
1874 1788
1875 oldviewstart = view_start; 1789 oldviewstart = view_start;
1876 1790
1877 if (y < len) 1791 if (y < len)
1878 { 1792 {
1879 p = (nrow + nscrolled) * (len - y) / len; 1793 p = (nrow + nsaved) * (len - y) / len;
1880 p -= (long) (nrow - 1); 1794 p -= (long) (nrow - 1);
1881 p = max (p, 0); 1795 p = max (p, 0);
1882 } 1796 }
1883 1797
1884 view_start = (unsigned int)min (p, nscrolled); 1798 view_start = (unsigned int)min (p, nsaved);
1885 1799
1886 return scr_changeview (oldviewstart); 1800 return scr_changeview (oldviewstart);
1887} 1801}
1888 1802
1889/* ------------------------------------------------------------------------- */ 1803/* ------------------------------------------------------------------------- */
… …
1900 oldviewstart = view_start; 1814 oldviewstart = view_start;
1901 1815
1902 if (direction == UP) 1816 if (direction == UP)
1903 { 1817 {
1904 n = view_start + nlines; 1818 n = view_start + nlines;
1905 view_start = min (n, nscrolled); 1819 view_start = min (n, nsaved);
1906 } 1820 }
1907 else 1821 else
1908 { 1822 {
1909 n = view_start - nlines; 1823 n = view_start - nlines;
1910 view_start = max (n, 0); 1824 view_start = max (n, 0);
… …
1916int 1830int
1917rxvt_term::scr_changeview (unsigned int oldviewstart) 1831rxvt_term::scr_changeview (unsigned int oldviewstart)
1918{ 1832{
1919 if (view_start != oldviewstart) 1833 if (view_start != oldviewstart)
1920 { 1834 {
1835 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1836
1921 want_refresh = 1; 1837 want_refresh = 1;
1922 num_scr -= (view_start - oldviewstart); 1838 num_scr -= (view_start - oldviewstart);
1923 } 1839 }
1924 1840
1925 return (int) (view_start - oldviewstart); 1841 return (int)view_start - (int)oldviewstart;
1926} 1842}
1927 1843
1928/* ------------------------------------------------------------------------- */ 1844/* ------------------------------------------------------------------------- */
1929void 1845void
1930rxvt_term::scr_bell () 1846rxvt_term::scr_bell ()
1931{ 1847{
1932#ifndef NO_BELL 1848#ifndef NO_BELL
1933 1849
1934# ifndef NO_MAPALERT 1850# ifndef NO_MAPALERT
1935# ifdef MAPALERT_OPTION 1851# ifdef MAPALERT_OPTION
1936 if (options & Opt_mapAlert) 1852 if (OPTION (Opt_mapAlert))
1937# endif 1853# endif
1938 XMapWindow (display->display, parent[0]); 1854 XMapWindow (display->display, parent[0]);
1939# endif 1855# endif
1940 1856
1941 if (options & Opt_visualBell) 1857 if (OPTION (Opt_visualBell))
1942 { 1858 {
1943 scr_rvideo_mode (!rvideo); /* refresh also done */ 1859 scr_rvideo_mode (!rvideo); /* refresh also done */
1944 rxvt_usleep (VISUAL_BELL_DURATION); 1860 rxvt_usleep (VISUAL_BELL_DURATION);
1945 scr_rvideo_mode (!rvideo); /* refresh also done */ 1861 scr_rvideo_mode (!rvideo); /* refresh also done */
1946 } 1862 }
… …
1954/* ARGSUSED */ 1870/* ARGSUSED */
1955void 1871void
1956rxvt_term::scr_printscreen (int fullhist) 1872rxvt_term::scr_printscreen (int fullhist)
1957{ 1873{
1958#ifdef PRINTPIPE 1874#ifdef PRINTPIPE
1959 int i, r1, nrows, row_offset; 1875 int nrows, row_start;
1960 FILE *fd; 1876 FILE *fd;
1961 1877
1962 if ((fd = popen_printer ()) == NULL) 1878 if ((fd = popen_printer ()) == NULL)
1963 return; 1879 return;
1964 1880
1965 nrows = nrow;
1966 row_offset = saveLines;
1967
1968 if (!fullhist) 1881 if (fullhist)
1969 row_offset -= view_start; 1882 {
1883 nrows = nrow + nsaved;
1884 row_start = -nsaved;
1885 }
1970 else 1886 else
1971 { 1887 {
1972 nrows += nscrolled; 1888 nrows = nrow;
1973 row_offset -= nscrolled; 1889 row_start = -view_start;
1974 } 1890 }
1975 1891
1976 wctomb (0, 0); 1892 wctomb (0, 0);
1977 1893
1978 for (r1 = 0; r1 < nrows; r1++) 1894 for (int r1 = 0; r1 < nrows; r1++)
1979 { 1895 {
1980 text_t *tp = save[r1 + row_offset].t; 1896 text_t *tp = ROW(r1).t;
1981 int len = save[r1 + row_offset].l; 1897 int len = ROW(r1).l;
1982 1898
1983 for (i = len >= 0 ? len : ncol - 1; i--; ) 1899 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1984 { 1900 {
1985 char mb[MB_LEN_MAX]; 1901 char mb[MB_LEN_MAX];
1986 text_t t = *tp++; 1902 text_t t = *tp++;
1987 if (t == NOCHAR) 1903 if (t == NOCHAR)
1988 continue; 1904 continue;
… …
2016{ 1932{
2017 unsigned char must_clear, /* use draw_string not draw_image_string */ 1933 unsigned char must_clear, /* use draw_string not draw_image_string */
2018 showcursor; /* show the cursor */ 1934 showcursor; /* show the cursor */
2019 int16_t col, row, /* column/row we're processing */ 1935 int16_t col, row, /* column/row we're processing */
2020 ocrow; /* old cursor row */ 1936 ocrow; /* old cursor row */
2021 int i, /* tmp */ 1937 int i; /* tmp */
2022 row_offset; /* basic offset in screen structure */
2023#ifndef NO_CURSORCOLOR 1938#ifndef NO_CURSORCOLOR
2024 rend_t cc1; /* store colours at cursor position (s) */ 1939 rend_t cc1; /* store colours at cursor position (s) */
2025#endif 1940#endif
2026 rend_t *crp; // cursor rendition pointer 1941 rend_t *crp; // cursor rendition pointer
2027 1942
… …
2034 * A: set up vars 1949 * A: set up vars
2035 */ 1950 */
2036 must_clear = 0; 1951 must_clear = 0;
2037 refresh_count = 0; 1952 refresh_count = 0;
2038 1953
2039 row_offset = saveLines - view_start;
2040
2041#if XPM_BACKGROUND 1954#if XPM_BACKGROUND
2042 must_clear |= bgPixmap.pixmap != None; 1955 must_clear |= bgPixmap.pixmap != None;
2043#endif 1956#endif
2044#if TRANSPARENT 1957#if TRANSPARENT
2045 must_clear |= (options & Opt_transparent) && am_transparent; 1958 must_clear |= OPTION (Opt_transparent) && am_transparent;
2046#endif 1959#endif
2047 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1960 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2048 1961
2049 /* 1962 /*
2050 * B: reverse any characters which are selected 1963 * B: reverse any characters which are selected
… …
2067 1980
2068 if (showcursor) 1981 if (showcursor)
2069 { 1982 {
2070 int col = screen.cur.col; 1983 int col = screen.cur.col;
2071 1984
2072 while (col && screen.line[screen.cur.row]->t[col] == NOCHAR) 1985 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2073 col--; 1986 col--;
2074 1987
2075 crp = &screen.line[screen.cur.row]->r[col]; 1988 crp = &ROW(screen.cur.row).r[col];
2076 1989
2077 if (showcursor && focus) 1990 if (showcursor && focus)
2078 { 1991 {
2079 if (options & Opt_cursorUnderline) 1992 if (OPTION (Opt_cursorUnderline))
2080 *crp ^= RS_Uline; 1993 *crp ^= RS_Uline;
2081 else 1994 else
2082 { 1995 {
2083 *crp ^= RS_RVid; 1996 *crp ^= RS_RVid;
2084 1997
… …
2086 cc1 = *crp & (RS_fgMask | RS_bgMask); 1999 cc1 = *crp & (RS_fgMask | RS_bgMask);
2087 if (ISSET_PIXCOLOR (Color_cursor)) 2000 if (ISSET_PIXCOLOR (Color_cursor))
2088 ccol1 = Color_cursor; 2001 ccol1 = Color_cursor;
2089 else 2002 else
2090#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2003#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2091 ccol1 = GET_FGCOLOR (rstyle); 2004 ccol1 = fgcolor_of (rstyle);
2092#else 2005#else
2093 ccol1 = Color_fg; 2006 ccol1 = Color_fg;
2094#endif 2007#endif
2095 if (ISSET_PIXCOLOR (Color_cursor2)) 2008 if (ISSET_PIXCOLOR (Color_cursor2))
2096 ccol2 = Color_cursor2; 2009 ccol2 = Color_cursor2;
2097 else 2010 else
2098#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2011#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2099 ccol2 = GET_BGCOLOR (rstyle); 2012 ccol2 = bgcolor_of (rstyle);
2100#else 2013#else
2101 ccol2 = Color_bg; 2014 ccol2 = Color_bg;
2102#endif 2015#endif
2103 *crp = SET_FGCOLOR (*crp, ccol1); 2016 *crp = SET_FGCOLOR (*crp, ccol1);
2104 *crp = SET_BGCOLOR (*crp, ccol2); 2017 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2114 if (screen.cur.row + view_start != ocrow 2027 if (screen.cur.row + view_start != ocrow
2115 || screen.cur.col != oldcursor.col) 2028 || screen.cur.col != oldcursor.col)
2116 { 2029 {
2117 if (ocrow < nrow 2030 if (ocrow < nrow
2118 && oldcursor.col < ncol) 2031 && oldcursor.col < ncol)
2119 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2032 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2120 2033
2121 if (focus || !showcursor) 2034 if (focus || !showcursor)
2122 oldcursor.row = -1; 2035 oldcursor.row = -1;
2123 else 2036 else
2124 setoldcursor = 1; 2037 setoldcursor = 1;
… …
2137 oldcursor.col = screen.cur.col; 2050 oldcursor.col = screen.cur.col;
2138 } 2051 }
2139 } 2052 }
2140 } 2053 }
2141 2054
2055 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2142#if ENABLE_OVERLAY 2056#if ENABLE_OVERLAY
2143 scr_swap_overlay (); 2057 scr_swap_overlay ();
2144#endif 2058#endif
2145 2059
2146#ifndef NO_SLOW_LINK_SUPPORT 2060#ifndef NO_SLOW_LINK_SUPPORT
… …
2148 * D: CopyArea pass - very useful for slower links 2062 * D: CopyArea pass - very useful for slower links
2149 * This has been deliberately kept simple. 2063 * This has been deliberately kept simple.
2150 */ 2064 */
2151 i = num_scr; 2065 i = num_scr;
2152 if (!display->is_local 2066 if (!display->is_local
2153 && refresh_type == FAST_REFRESH && num_scr_allow && i 2067 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2154 && abs (i) < nrow && !must_clear) 2068 && abs (num_scr) < nrow && !must_clear)
2155 { 2069 {
2156 int16_t nits; 2070 int16_t nits;
2157 int j; 2071 int j;
2158 int len, wlen; 2072 int len, wlen;
2159 2073
… …
2162 row = i > 0 ? 0 : j - 1; 2076 row = i > 0 ? 0 : j - 1;
2163 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2077 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2164 { 2078 {
2165 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2079 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2166 { 2080 {
2167 line_t s = save[row + row_offset]; 2081 line_t s = ROW(row - view_start);
2168 line_t d = drawn[row]; 2082 line_t d = drawn_buf[row];
2169 line_t d2 = drawn[row + i]; 2083 line_t d2 = drawn_buf[row + i];
2170 2084
2171 for (nits = 0, col = ncol; col--; ) 2085 for (nits = 0, col = ncol; col--; )
2172 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2086 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2173 nits--; 2087 nits--;
2174 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2088 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2192 2106
2193 if (len != -1) 2107 if (len != -1)
2194 { 2108 {
2195 /* also comes here at end if needed because of >= above */ 2109 /* also comes here at end if needed because of >= above */
2196 if (wlen < len) 2110 if (wlen < len)
2197 SWAP_IT (wlen, len, int); 2111 ::swap (wlen, len);
2198 2112
2199 XCopyArea (display->display, vt, vt, 2113 XCopyArea (display->display, vt, vt,
2200 gc, 0, Row2Pixel (len + i), 2114 gc, 0, Row2Pixel (len + i),
2201 (unsigned int)TermWin_TotalWidth (), 2115 (unsigned int)this->width,
2202 (unsigned int)Height2Pixel (wlen - len + 1), 2116 (unsigned int)Height2Pixel (wlen - len + 1),
2203 0, Row2Pixel (len)); 2117 0, Row2Pixel (len));
2204 len = -1; 2118 len = -1;
2205 } 2119 }
2206 } 2120 }
… …
2210 /* 2124 /*
2211 * E: main pass across every character 2125 * E: main pass across every character
2212 */ 2126 */
2213 for (row = 0; row < nrow; row++) 2127 for (row = 0; row < nrow; row++)
2214 { 2128 {
2215 text_t *stp = save[row + row_offset].t; 2129 text_t *stp = ROW(row - view_start).t;
2216 rend_t *srp = save[row + row_offset].r; 2130 rend_t *srp = ROW(row - view_start).r;
2217 text_t *dtp = drawn[row].t; 2131 text_t *dtp = drawn_buf[row].t;
2218 rend_t *drp = drawn[row].r; 2132 rend_t *drp = drawn_buf[row].r;
2219 2133
2220 /* 2134 /*
2221 * E2: OK, now the real pass 2135 * E2: OK, now the real pass
2222 */ 2136 */
2223 int ypixel = (int)Row2Pixel (row); 2137 int ypixel = (int)Row2Pixel (row);
… …
2285 count++, i--; 2199 count++, i--;
2286 2200
2287 /* 2201 /*
2288 * Determine the attributes for the string 2202 * Determine the attributes for the string
2289 */ 2203 */
2290 int fore = GET_FGCOLOR (rend); // desired foreground 2204 int fore = fgcolor_of (rend); // desired foreground
2291 int back = GET_BGCOLOR (rend); // desired background 2205 int back = bgcolor_of (rend); // desired background
2292 2206
2293 // only do special processing if any attributes are set, which is rare 2207 // only do special processing if any attributes are set, which is unlikely
2294 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2208 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2295 { 2209 {
2296#if ENABLE_STYLES 2210#if ENABLE_STYLES
2297 // force redraw after "careful" characters to avoid pixel droppings 2211 // force redraw after "careful" characters to avoid pixel droppings
2298 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2212 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2334 fore = Color_UL; 2248 fore = Color_UL;
2335#endif 2249#endif
2336 2250
2337 if (invert) 2251 if (invert)
2338 { 2252 {
2339 SWAP_IT (fore, back, int); 2253 ::swap (fore, back);
2340 2254
2341#ifndef NO_BOLD_UNDERLINE_REVERSE 2255#ifndef NO_BOLD_UNDERLINE_REVERSE
2342 if (ISSET_PIXCOLOR (Color_RV)) 2256 if (ISSET_PIXCOLOR (Color_RV))
2343 back = Color_RV; 2257 back = Color_RV;
2344 2258
… …
2409 } /* for (row....) */ 2323 } /* for (row....) */
2410 2324
2411#if ENABLE_OVERLAY 2325#if ENABLE_OVERLAY
2412 scr_swap_overlay (); 2326 scr_swap_overlay ();
2413#endif 2327#endif
2328 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2414 2329
2415 /* 2330 /*
2416 * G: cleanup cursor and display outline cursor if necessary 2331 * G: cleanup cursor and display outline cursor if necessary
2417 */ 2332 */
2418 if (showcursor) 2333 if (showcursor)
2419 { 2334 {
2420 if (focus) 2335 if (focus)
2421 { 2336 {
2422 if (options & Opt_cursorUnderline) 2337 if (OPTION (Opt_cursorUnderline))
2423 *crp ^= RS_Uline; 2338 *crp ^= RS_Uline;
2424 else 2339 else
2425 { 2340 {
2426 *crp ^= RS_RVid; 2341 *crp ^= RS_RVid;
2427#ifndef NO_CURSORCOLOR 2342#ifndef NO_CURSORCOLOR
… …
2432 else if (oldcursor.row >= 0) 2347 else if (oldcursor.row >= 0)
2433 { 2348 {
2434 int cursorwidth = 1; 2349 int cursorwidth = 1;
2435 int col = oldcursor.col; 2350 int col = oldcursor.col;
2436 2351
2437 while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR) 2352 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2438 col--; 2353 col--;
2439 2354
2440 while (col + cursorwidth < ncol 2355 while (col + cursorwidth < ncol
2441 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2356 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2442 cursorwidth++; 2357 cursorwidth++;
2443 2358
2444#ifndef NO_CURSORCOLOR 2359#ifndef NO_CURSORCOLOR
2445 if (ISSET_PIXCOLOR (Color_cursor)) 2360 if (ISSET_PIXCOLOR (Color_cursor))
2446 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2361 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2465 num_scr = 0; 2380 num_scr = 0;
2466 num_scr_allow = 1; 2381 num_scr_allow = 1;
2467} 2382}
2468 2383
2469void 2384void
2470rxvt_term::scr_remap_chars (const line_t &l) 2385rxvt_term::scr_remap_chars (line_t &l)
2471{ 2386{
2472 if (!l.t) 2387 if (!l.t)
2473 return; 2388 return;
2474 2389
2390 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2391
2475 for (int i = ncol; i--; ) 2392 for (int i = ncol; i--; )
2476 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2393 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2477} 2394}
2478 2395
2479void 2396void
2480rxvt_term::scr_remap_chars () 2397rxvt_term::scr_remap_chars ()
2481{ 2398{
2482 for (int i = nrow + saveLines; i--; ) 2399 for (int i = total_rows; i--; )
2483 scr_remap_chars (save[i]); 2400 scr_remap_chars (row_buf [i]);
2484 2401
2485 for (int i = nrow; i--; ) 2402 for (int i = nrow; i--; )
2486 { 2403 {
2487 scr_remap_chars (drawn[i]); 2404 scr_remap_chars (drawn_buf [i]);
2488 scr_remap_chars (swap_save[i]); 2405 scr_remap_chars (swap_buf [i]);
2489 } 2406 }
2490} 2407}
2491 2408
2492void 2409void
2493rxvt_term::scr_recolour () 2410rxvt_term::scr_recolour ()
… …
2535 2452
2536/* ------------------------------------------------------------------------- */ 2453/* ------------------------------------------------------------------------- */
2537void 2454void
2538rxvt_term::scr_reverse_selection () 2455rxvt_term::scr_reverse_selection ()
2539{ 2456{
2457 if (selection.op
2540 if (selection.op && current_screen == selection.screen) 2458 && current_screen == selection.screen
2459 && selection.end.row >= -view_start)
2541 { 2460 {
2542 int end_row = saveLines - view_start; 2461 int view_end = -view_start + nrow;
2543 int i = selection.beg.row + saveLines; 2462 int row, col;
2544 int col, row = selection.end.row + saveLines;
2545 rend_t *srp;
2546 2463
2547#if ENABLE_FRILLS 2464#if ENABLE_FRILLS
2548 if (selection.rect) 2465 if (selection.rect)
2549 { 2466 {
2550 end_row += nrow; 2467 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2468 {
2469 text_t *stp = ROW(row).t;
2470 rend_t *srp = ROW(row).r;
2551 2471
2552 for (; i <= row && i <= end_row; i++)
2553 for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++) 2472 for (col = selection.beg.col; col < selection.end.col; col++)
2554 srp[col] ^= RS_RVid; 2473 srp[col] ^= RS_RVid;
2474
2475 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2476 srp[col] ^= RS_RVid | RS_Uline;
2477
2478 if (++col < selection.end.col)
2479 srp[col] ^= RS_RVid | RS_Uline;
2480 }
2555 } 2481 }
2556 else 2482 else
2557#endif 2483#endif
2558 { 2484 {
2559 if (i >= end_row) 2485 if (selection.beg.row >= -view_start)
2486 {
2560 col = selection.beg.col; 2487 col = selection.beg.col;
2488 row = selection.beg.row;
2489 }
2561 else 2490 else
2562 { 2491 {
2563 col = 0; 2492 col = 0;
2564 i = end_row; 2493 row = -view_start;
2565 } 2494 }
2566 2495
2567 end_row += nrow; 2496 for (; row < min (selection.end.row, view_end); row++, col = 0)
2568
2569 for (; i < row && i < end_row; i++, col = 0)
2570 for (srp = save[i].r; col < ncol; col++) 2497 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2571 srp[col] ^= RS_RVid; 2498 srp[col] ^= RS_RVid;
2572 2499
2573 if (i == row && i < end_row) 2500 if (row == selection.end.row)
2574 for (srp = save[i].r; col < selection.end.col; col++) 2501 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2575 srp[col] ^= RS_RVid; 2502 srp[col] ^= RS_RVid;
2576 } 2503 }
2577 } 2504 }
2578} 2505}
2579 2506
… …
2588{ 2515{
2589 int row, wrote; 2516 int row, wrote;
2590 unsigned int width, towrite; 2517 unsigned int width, towrite;
2591 char r1[] = "\n"; 2518 char r1[] = "\n";
2592 2519
2593 for (row = saveLines - nscrolled; 2520 for (row = saveLines - nsaved;
2594 row < saveLines + nrow - 1; row++) 2521 row < saveLines + nrow - 1; row++)
2595 { 2522 {
2596 width = save[row].l >= 0 ? save[row].l 2523 width = row_buf[row].l >= 0 ? row_buf[row].l
2597 : ncol; 2524 : ncol;
2598 for (towrite = width; towrite; towrite -= wrote) 2525 for (towrite = width; towrite; towrite -= wrote)
2599 { 2526 {
2600 wrote = write (fd, & (save[row].t[width - towrite]), 2527 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2601 towrite); 2528 towrite);
2602 if (wrote < 0) 2529 if (wrote < 0)
2603 return; /* XXX: death, no report */ 2530 return; /* XXX: death, no report */
2604 } 2531 }
2605 if (save[row].l >= 0) 2532 if (row_buf[row].l >= 0)
2606 if (write (fd, r1, 1) <= 0) 2533 if (write (fd, r1, 1) <= 0)
2607 return; /* XXX: death, no report */ 2534 return; /* XXX: death, no report */
2608 } 2535 }
2609} 2536}
2610#endif 2537#endif
2611 2538
2612/* ------------------------------------------------------------------------- * 2539/* ------------------------------------------------------------------------- *
2613 * CHARACTER SELECTION * 2540 * CHARACTER SELECTION *
2614 * ------------------------------------------------------------------------- */ 2541 * ------------------------------------------------------------------------- */
2615
2616/*
2617 * -nscrolled <= (selection row) <= nrow - 1
2618 */
2619void 2542void
2620rxvt_term::selection_check (int check_more) 2543rxvt_term::selection_check (int check_more)
2621{ 2544{
2622 row_col_t pos; 2545 row_col_t pos;
2623 2546
2624 if (!selection.op) 2547 if (!selection.op)
2625 return; 2548 return;
2626 2549
2627 pos.row = pos.col = 0; 2550 pos.row = pos.col = 0;
2628 if ((selection.beg.row < - (int32_t)nscrolled) 2551 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2629 || (selection.beg.row >= nrow) 2552 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2630 || (selection.mark.row < - (int32_t)nscrolled) 2553 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2631 || (selection.mark.row >= nrow)
2632 || (selection.end.row < - (int32_t)nscrolled)
2633 || (selection.end.row >= nrow)
2634 || (check_more == 1 2554 || (check_more == 1
2635 && current_screen == selection.screen 2555 && current_screen == selection.screen
2636 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2556 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2637 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2557 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2638 || (check_more == 2 2558 || (check_more == 2
… …
2649/* ------------------------------------------------------------------------- */ 2569/* ------------------------------------------------------------------------- */
2650/* 2570/*
2651 * Paste a selection direct to the command fd 2571 * Paste a selection direct to the command fd
2652 */ 2572 */
2653void 2573void
2654rxvt_term::paste (unsigned char *data, unsigned int len) 2574rxvt_term::paste (char *data, unsigned int len)
2655{ 2575{
2656 /* convert normal newline chars into common keyboard Return key sequence */ 2576 /* convert normal newline chars into common keyboard Return key sequence */
2657 for (unsigned int i = 0; i < len; i++) 2577 for (unsigned int i = 0; i < len; i++)
2658 if (data[i] == C0_LF) 2578 if (data[i] == C0_LF)
2659 data[i] = C0_CR; 2579 data[i] = C0_CR;
… …
2803 { 2723 {
2804 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2724 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2805 char *s = rxvt_wcstombs (w); 2725 char *s = rxvt_wcstombs (w);
2806 free (w); 2726 free (w);
2807 // TODO: strlen == only the first element will be converted. well... 2727 // TODO: strlen == only the first element will be converted. well...
2808 paste ((unsigned char *)s, strlen (s)); 2728 paste (s, strlen (s));
2809 free (s); 2729 free (s);
2810 } 2730 }
2811 else 2731 else
2812#endif 2732#endif
2813 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2733 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2814 && cl) 2734 && cl)
2815 { 2735 {
2816 for (int i = 0; i < cr; i++) 2736 for (int i = 0; i < cr; i++)
2817 paste ((unsigned char *)cl[i], strlen (cl[i])); 2737 paste (cl[i], strlen (cl[i]));
2818 2738
2819 XFreeStringList (cl); 2739 XFreeStringList (cl);
2820 } 2740 }
2821 else 2741 else
2822 paste (ct.value, ct.nitems); // paste raw 2742 paste ((char *)ct.value, ct.nitems); // paste raw
2823 2743
2824bailout: 2744bailout:
2825 XFree (ct.value); 2745 XFree (ct.value);
2826 2746
2827 if (selection_wait == Sel_normal) 2747 if (selection_wait == Sel_normal)
… …
2865 return; /* outside window */ 2785 return; /* outside window */
2866 2786
2867 if (selection.text) 2787 if (selection.text)
2868 { /* internal selection */ 2788 { /* internal selection */
2869 char *str = rxvt_wcstombs (selection.text, selection.len); 2789 char *str = rxvt_wcstombs (selection.text, selection.len);
2870 paste ((unsigned char *)str, strlen (str)); 2790 paste (str, strlen (str));
2871 free (str); 2791 free (str);
2872 return; 2792 return;
2873 } 2793 }
2874 else 2794 else
2875 { 2795 {
… …
2944 * EXT: button 1 or 3 release 2864 * EXT: button 1 or 3 release
2945 */ 2865 */
2946void 2866void
2947rxvt_term::selection_make (Time tm) 2867rxvt_term::selection_make (Time tm)
2948{ 2868{
2949 int i, col, end_col, row, end_row; 2869 int i;
2950 wchar_t *new_selection_text; 2870 wchar_t *new_selection_text;
2951 text_t *t; 2871 text_t *t;
2952 2872
2953 switch (selection.op) 2873 switch (selection.op)
2954 { 2874 {
… …
2967 selection.op = SELECTION_DONE; 2887 selection.op = SELECTION_DONE;
2968 2888
2969 if (selection.clicks == 4) 2889 if (selection.clicks == 4)
2970 return; /* nothing selected, go away */ 2890 return; /* nothing selected, go away */
2971 2891
2892 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2893 return;
2894
2972 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2895 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2973 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2896 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2974 2897
2975 col = selection.beg.col;
2976 row = selection.beg.row + saveLines;
2977 end_row = selection.end.row + saveLines;
2978 int ofs = 0; 2898 int ofs = 0;
2979 int extra = 0; 2899 int extra = 0;
2980 2900
2901 int col = selection.beg.col;
2902 int row = selection.beg.row;
2903
2904 int end_col;
2905
2981 for (; row <= end_row; row++, col = 0) 2906 for (; row <= selection.end.row; row++, col = 0)
2982 { 2907 {
2983#if ENABLE_FRILLS 2908#if ENABLE_FRILLS
2984 if (selection.rect) 2909 if (selection.rect)
2985 { 2910 {
2986 col = selection.beg.col; 2911 col = selection.beg.col;
2987 end_col = ncol + 1; 2912 end_col = ncol + 1;
2988 } 2913 }
2989 else 2914 else
2990#endif 2915#endif
2991 end_col = save[row].is_cont () ? ncol : save[row].l; //TODO//FIXME 2916 end_col = ROW(row).l;
2992 2917
2993 MAX_IT (col, 0); 2918 col = max (col, 0);
2994 2919
2995 if (row == end_row || selection.rect) 2920 if (row == selection.end.row
2921#if ENABLE_FRILLS
2922 || selection.rect
2923#endif
2924 )
2996 MIN_IT (end_col, selection.end.col); 2925 min_it (end_col, selection.end.col);
2997 2926
2998 t = &save[row].t[col]; 2927 t = ROW(row).t + col;
2928
2999 for (; col < end_col; col++) 2929 for (; col < end_col; col++)
3000 { 2930 {
3001 if (*t == NOCHAR) 2931 if (*t == NOCHAR)
3002 t++; 2932 t++;
3003#if ENABLE_COMBINING 2933#if ENABLE_COMBINING
… …
3019#endif 2949#endif
3020 else 2950 else
3021 new_selection_text[ofs++] = *t++; 2951 new_selection_text[ofs++] = *t++;
3022 } 2952 }
3023 2953
3024 if (save[row].l != -1 && row != end_row) 2954#if ENABLE_FRILLS
2955 if (selection.rect)
2956 {
2957 while (ofs
2958 && new_selection_text[ofs - 1] != C0_LF
2959 && unicode::is_space (new_selection_text[ofs - 1]))
2960 --ofs;
2961
3025 new_selection_text[ofs++] = C0_LF; 2962 new_selection_text[ofs++] = C0_LF;
2963 }
2964 else
2965#endif
2966 if (!ROW(row).is_longer () && row != selection.end.row)
2967 new_selection_text[ofs++] = C0_LF;
3026 } 2968 }
3027 2969
3028 if (end_col != selection.end.col) 2970 if (end_col != selection.end.col)
3029 new_selection_text[ofs++] = C0_LF; 2971 new_selection_text[ofs++] = C0_LF;
3030 2972
… …
3040 2982
3041 // we usually allocate much more than necessary, so realloc it smaller again 2983 // we usually allocate much more than necessary, so realloc it smaller again
3042 selection.len = ofs; 2984 selection.len = ofs;
3043 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2985 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3044 2986
2987 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2988 return;
2989
2990 selection_grab (tm);
2991}
2992
2993bool
2994rxvt_term::selection_grab (Time tm)
2995{
2996 selection_time = tm;
2997
3045 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 2998 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3046 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 2999 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3000 {
3047 display->set_selection_owner (this); 3001 display->set_selection_owner (this);
3002 return true;
3003 }
3048 else 3004 else
3049 rxvt_warn ("can't get primary selection, ignoring.\n"); 3005 return false;
3050 3006
3051#if 0 3007#if 0
3052 XTextProperty ct; 3008 XTextProperty ct;
3053 3009
3054 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3010 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3055 { 3011 {
3056 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3012 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3057 XFree (ct.value); 3013 XFree (ct.value);
3058 } 3014 }
3059#endif 3015#endif
3060
3061 selection_time = tm;
3062} 3016}
3063 3017
3064/* ------------------------------------------------------------------------- */ 3018/* ------------------------------------------------------------------------- */
3065/* 3019/*
3066 * Mark or select text based upon number of clicks: 1, 2, or 3 3020 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3088 */ 3042 */
3089void 3043void
3090rxvt_term::selection_start_colrow (int col, int row) 3044rxvt_term::selection_start_colrow (int col, int row)
3091{ 3045{
3092 want_refresh = 1; 3046 want_refresh = 1;
3047
3048 selection.mark.row = row - view_start;
3093 selection.mark.col = col; 3049 selection.mark.col = col;
3094 selection.mark.row = row - view_start;
3095 3050
3096 MAX_IT (selection.mark.row, - (int32_t)nscrolled); 3051 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3097 MIN_IT (selection.mark.row, (int32_t)nrow - 1); 3052 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3098 MAX_IT (selection.mark.col, 0);
3099 MIN_IT (selection.mark.col, (int32_t)ncol - 1);
3100 3053
3101 while (selection.mark.col > 0 3054 while (selection.mark.col > 0
3102 && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR) 3055 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3103 --selection.mark.col; 3056 --selection.mark.col;
3104 3057
3105 if (selection.op) 3058 if (selection.op)
3106 { /* clear the old selection */ 3059 { /* clear the old selection */
3107 selection.beg.row = selection.end.row = selection.mark.row; 3060 selection.beg.row = selection.end.row = selection.mark.row;
… …
3131 text_t *stp; 3084 text_t *stp;
3132 rend_t *srp; 3085 rend_t *srp;
3133 3086
3134 if (dirn == UP) 3087 if (dirn == UP)
3135 { 3088 {
3136 bound.row = saveLines - nscrolled - 1; 3089 bound.row = - nsaved - 1;
3137 bound.col = 0; 3090 bound.col = 0;
3138 dirnadd = -1; 3091 dirnadd = -1;
3139 } 3092 }
3140 else 3093 else
3141 { 3094 {
3142 bound.row = saveLines + nrow; 3095 bound.row = nrow;
3143 bound.col = ncol - 1; 3096 bound.col = ncol - 1;
3144 dirnadd = 1; 3097 dirnadd = 1;
3145 } 3098 }
3146 3099
3147 row = mark->row + saveLines; 3100 row = mark->row;
3148 col = mark->col; 3101 col = max (mark->col, 0);
3149 MAX_IT (col, 0); 3102
3150 /* find the edge of a word */ 3103 /* find the edge of a word */
3151 stp = &save[row].t[col]; 3104 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3152 w1 = DELIMIT_TEXT (*stp); 3105 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3153
3154 srp = &save[row].r[col];
3155 w2 = DELIMIT_REND (*srp);
3156 3106
3157 for (;;) 3107 for (;;)
3158 { 3108 {
3159 for (; col != bound.col; col += dirnadd) 3109 for (; col != bound.col; col += dirnadd)
3160 { 3110 {
… …
3170 break; 3120 break;
3171 } 3121 }
3172 3122
3173 if ((col == bound.col) && (row != bound.row)) 3123 if ((col == bound.col) && (row != bound.row))
3174 { 3124 {
3175 if (save[ (row - (dirn == UP ? 1 : 0))].is_cont ()) 3125 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3176 { 3126 {
3177 trow = row + dirnadd; 3127 trow = row + dirnadd;
3178 tcol = dirn == UP ? ncol - 1 : 0; 3128 tcol = dirn == UP ? ncol - 1 : 0;
3179 3129
3180 if (save[trow].t == NULL) 3130 if (!ROW(trow).t)
3181 break; 3131 break;
3182 3132
3183 stp = & (save[trow].t[tcol]); 3133 stp = ROW(trow).t + tcol;
3184 srp = & (save[trow].r[tcol]); 3134 srp = ROW(trow).r + tcol;
3185 3135
3186 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3136 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3187 break; 3137 break;
3188 3138
3189 row = trow; 3139 row = trow;
… …
3192 } 3142 }
3193 } 3143 }
3194 break; 3144 break;
3195 } 3145 }
3196 3146
3197Old_Word_Selection_You_Die:
3198 if (dirn == DN) 3147 if (dirn == DN)
3199 col++; /* put us on one past the end */ 3148 col++; /* put us on one past the end */
3200 3149
3201 /* Poke the values back in */ 3150 /* Poke the values back in */
3202 ret->row = row - saveLines; 3151 ret->row = row;
3203 ret->col = col; 3152 ret->col = col;
3204} 3153}
3205 3154
3206/* ------------------------------------------------------------------------- */ 3155/* ------------------------------------------------------------------------- */
3207/* 3156/*
… …
3212 * flag == 2 ==> button 3 motion 3161 * flag == 2 ==> button 3 motion
3213 */ 3162 */
3214void 3163void
3215rxvt_term::selection_extend (int x, int y, int flag) 3164rxvt_term::selection_extend (int x, int y, int flag)
3216{ 3165{
3217 int col, row; 3166 int col = clamp (Pixel2Col (x), 0, ncol);
3218 3167 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3219 col = Pixel2Col (x);
3220 row = Pixel2Row (y);
3221 MAX_IT (row, 0);
3222 MIN_IT (row, (int)nrow - 1);
3223 MAX_IT (col, 0);
3224 MIN_IT (col, (int)ncol);
3225 3168
3226 /* 3169 /*
3227 * If we're selecting characters (single click) then we must check first 3170 * If we're selecting characters (single click) then we must check first
3228 * if we are at the same place as the original mark. If we are then 3171 * if we are at the same place as the original mark. If we are then
3229 * select nothing. Otherwise, if we're to the right of the mark, you have to 3172 * select nothing. Otherwise, if we're to the right of the mark, you have to
… …
3254 * Extend the selection to the specified col/row 3197 * Extend the selection to the specified col/row
3255 */ 3198 */
3256void 3199void
3257rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3200rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3258{ 3201{
3259 int end_col;
3260 row_col_t pos; 3202 row_col_t pos;
3261 enum { 3203 enum {
3262 LEFT, RIGHT 3204 LEFT, RIGHT
3263 } closeto = RIGHT; 3205 } closeto = RIGHT;
3264 3206
… …
3295 selection.beg.col = selection.end.col = selection.mark.col; 3237 selection.beg.col = selection.end.col = selection.mark.col;
3296 selection.beg.row = selection.end.row = selection.mark.row; 3238 selection.beg.row = selection.end.row = selection.mark.row;
3297 } 3239 }
3298 3240
3299 pos.col = col; 3241 pos.col = col;
3300 pos.row = row; 3242 pos.row = row - view_start;
3301
3302 pos.row -= view_start; /* adjust for scroll */
3303 3243
3304 /* 3244 /*
3305 * This is mainly xterm style selection with a couple of differences, mainly 3245 * This is mainly xterm style selection with a couple of differences, mainly
3306 * in the way button3 drag extension works. 3246 * in the way button3 drag extension works.
3307 * We're either doing: button1 drag; button3 press; or button3 drag 3247 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3366 } 3306 }
3367 } 3307 }
3368 3308
3369 if (selection.clicks == 1) 3309 if (selection.clicks == 1)
3370 { 3310 {
3371 end_col = save[selection.beg.row + saveLines].l; 3311 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3372 3312 && !ROW(selection.beg.row).is_longer ()
3373 if (selection.beg.col > end_col
3374 && end_col != -1
3375#if ENABLE_FRILLS 3313#if ENABLE_FRILLS
3376 && !selection.rect 3314 && !selection.rect
3377#endif 3315#endif
3378 ) 3316 )
3379 selection.beg.col = ncol; 3317 selection.beg.col = ncol;
3380 3318
3381 end_col = save[selection.end.row + saveLines].l;
3382
3383 if ( 3319 if (
3384 selection.end.col > end_col 3320 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3385 && end_col != -1 3321 && !ROW(selection.end.row).is_longer ()
3386#if ENABLE_FRILLS 3322#if ENABLE_FRILLS
3387 && !selection.rect 3323 && !selection.rect
3388#endif 3324#endif
3389 ) 3325 )
3390 selection.end.col = ncol; 3326 selection.end.col = ncol;
… …
3392 else if (selection.clicks == 2) 3328 else if (selection.clicks == 2)
3393 { 3329 {
3394 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3330 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3395 selection.end.col--; 3331 selection.end.col--;
3396 3332
3333 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3334 {
3397 selection_delimit_word (UP, &selection.beg, &selection.beg); 3335 selection_delimit_word (UP, &selection.beg, &selection.beg);
3398 selection_delimit_word (DN, &selection.end, &selection.end); 3336 selection_delimit_word (DN, &selection.end, &selection.end);
3337 }
3399 } 3338 }
3400 else if (selection.clicks == 3) 3339 else if (selection.clicks == 3)
3401 { 3340 {
3402#if ENABLE_FRILLS 3341#if ENABLE_FRILLS
3403 if (options & Opt_tripleclickwords) 3342 if (OPTION (Opt_tripleclickwords))
3404 { 3343 {
3405 int end_row;
3406
3407 selection_delimit_word (UP, &selection.beg, &selection.beg); 3344 selection_delimit_word (UP, &selection.beg, &selection.beg);
3408 end_row = save[selection.mark.row + saveLines].l;
3409 3345
3410 for (end_row = selection.mark.row; end_row < nrow; end_row++) 3346 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3411 { 3347 {
3412 end_col = save[end_row + saveLines].l; 3348 if (!ROW(end_row).is_longer ())
3413
3414 if (end_col != -1)
3415 { 3349 {
3416 selection.end.row = end_row; 3350 selection.end.row = end_row;
3417 selection.end.col = end_col; 3351 selection.end.col = ROW(end_row).l;
3418 selection_remove_trailing_spaces (); 3352 selection_remove_trailing_spaces ();
3419 break; 3353 break;
3420 } 3354 }
3421 } 3355 }
3422 } 3356 }
… …
3429 selection.beg.col = 0; 3363 selection.beg.col = 0;
3430 selection.end.col = ncol; 3364 selection.end.col = ncol;
3431 3365
3432 // select a complete logical line 3366 // select a complete logical line
3433 while (selection.beg.row > -saveLines 3367 while (selection.beg.row > -saveLines
3434 && save[selection.beg.row - 1 + saveLines].is_cont ()) 3368 && ROW(selection.beg.row - 1).is_longer ())
3435 selection.beg.row--; 3369 selection.beg.row--;
3436 3370
3437 while (selection.end.row < nrow 3371 while (selection.end.row < nrow
3438 && save[selection.end.row + saveLines].is_cont ()) 3372 && ROW(selection.end.row).is_longer ())
3439 selection.end.row++; 3373 selection.end.row++;
3440 } 3374 }
3441 } 3375 }
3442 3376
3443 if (button3 && buttonpress) 3377 if (button3 && buttonpress)
… …
3454 } 3388 }
3455 } 3389 }
3456 3390
3457#if ENABLE_FRILLS 3391#if ENABLE_FRILLS
3458 if (selection.rect && selection.beg.col > selection.end.col) 3392 if (selection.rect && selection.beg.col > selection.end.col)
3459 SWAP_IT (selection.beg.col, selection.end.col, int); 3393 ::swap (selection.beg.col, selection.end.col);
3460#endif 3394#endif
3461} 3395}
3462 3396
3463#if ENABLE_FRILLS 3397#if ENABLE_FRILLS
3464void 3398void
… …
3468 text_t *stp; 3402 text_t *stp;
3469 3403
3470 end_col = selection.end.col; 3404 end_col = selection.end.col;
3471 end_row = selection.end.row; 3405 end_row = selection.end.row;
3472 3406
3473 for ( ; end_row >= selection.beg.row; ) 3407 for (; end_row >= selection.beg.row; )
3474 { 3408 {
3475 stp = save[end_row + saveLines].t; 3409 stp = ROW(end_row).t;
3476 3410
3477 while (--end_col >= 0) 3411 while (--end_col >= 0)
3478 { 3412 {
3479 if (stp[end_col] != ' ' 3413 if (stp[end_col] != NOCHAR
3480 && stp[end_col] != '\t' 3414 && !unicode::is_space (stp[end_col]))
3481 && stp[end_col] != NOCHAR)
3482 break; 3415 break;
3483 } 3416 }
3484 3417
3485 if (end_col >= 0 3418 if (end_col >= 0
3486 || save[end_row - 1 + saveLines].l != -1) 3419 || !ROW(end_row - 1).is_longer ())
3487 { 3420 {
3488 selection.end.col = end_col + 1; 3421 selection.end.col = end_col + 1;
3489 selection.end.row = end_row; 3422 selection.end.row = end_row;
3490 break; 3423 break;
3491 } 3424 }
… …
3662 */ 3595 */
3663void 3596void
3664rxvt_term::pixel_position (int *x, int *y) 3597rxvt_term::pixel_position (int *x, int *y)
3665{ 3598{
3666 *x = Pixel2Col (*x); 3599 *x = Pixel2Col (*x);
3667 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3600 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3668 *y = Pixel2Row (*y); 3601 *y = Pixel2Row (*y);
3669 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3602 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3670} 3603}
3671 3604
3672/* ------------------------------------------------------------------------- */ 3605/* ------------------------------------------------------------------------- */
3673#ifdef USE_XIM 3606#ifdef USE_XIM
3674void 3607void
… …
3685 3618
3686#if ENABLE_OVERLAY 3619#if ENABLE_OVERLAY
3687void 3620void
3688rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3621rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3689{ 3622{
3690 if (nrow < 3 || ncol < 3) 3623 if (nrow < 1 || ncol < 1)
3691 return; 3624 return;
3692 3625
3693 want_refresh = 1; 3626 want_refresh = 1;
3694 3627
3695 scr_overlay_off (); 3628 scr_overlay_off ();
3696 3629
3697 if (x < 0) x = ncol - w; 3630 if (x < 0) x = ncol - w;
3698 if (y < 0) y = nrow - h; 3631 if (y < 0) y = nrow - h;
3699 3632
3700 // make space for border 3633 // make space for border
3701 w += 2; MIN_IT (w, ncol); 3634 w += 2; min_it (w, ncol);
3702 h += 2; MIN_IT (h, nrow); 3635 h += 2; min_it (h, nrow);
3703 3636
3704 x -= 1; MAX_IT (x, 0); 3637 x -= 1; clamp_it (x, 0, ncol - w);
3705 y -= 1; MAX_IT (y, 0); 3638 y -= 1; clamp_it (y, 0, nrow - h);
3706
3707 MIN_IT (x, ncol - w);
3708 MIN_IT (y, nrow - h);
3709 3639
3710 ov_x = x; ov_y = y; 3640 ov_x = x; ov_y = y;
3711 ov_w = w; ov_h = h; 3641 ov_w = w; ov_h = h;
3712 3642
3713 ov_text = new text_t *[h]; 3643 ov_text = new text_t *[h];
… …
3799rxvt_term::scr_swap_overlay () 3729rxvt_term::scr_swap_overlay ()
3800{ 3730{
3801 if (!ov_text) 3731 if (!ov_text)
3802 return; 3732 return;
3803 3733
3804 int row_offset = ov_y + saveLines - view_start;
3805
3806 // swap screen mem with overlay 3734 // swap screen mem with overlay
3807 for (int y = ov_h; y--; ) 3735 for (int y = ov_h; y--; )
3808 { 3736 {
3809 text_t *t1 = ov_text[y]; 3737 text_t *t1 = ov_text[y];
3810 rend_t *r1 = ov_rend[y]; 3738 rend_t *r1 = ov_rend[y];
3811 3739
3812 text_t *t2 = save[y + row_offset].t + ov_x; 3740 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3813 rend_t *r2 = save[y + row_offset].r + ov_x; 3741 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3814 3742
3815 for (int x = ov_w; x--; ) 3743 for (int x = ov_w; x--; )
3816 { 3744 {
3817 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3745 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3818 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3746 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3820 } 3748 }
3821} 3749}
3822 3750
3823#endif 3751#endif
3824/* ------------------------------------------------------------------------- */ 3752/* ------------------------------------------------------------------------- */
3753

Diff Legend

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