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.180 by root, Wed Dec 21 10:34:24 2005 UTC vs.
Revision 1.231 by root, Sun Jan 15 16:48:18 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() \
… …
123 lalloc (l); 124 lalloc (l);
124 col = 0; 125 col = 0;
125 width = ncol; 126 width = ncol;
126 } 127 }
127 128
129 l.touch ();
130
128 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130 133
131 text_t *et = l.t + col; 134 text_t *et = l.t + col;
132 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
142/* 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 */
143void 146void
144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
145{ 148{
146 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
158
152void 159void
153rxvt_term::scr_reset () 160rxvt_term::scr_reset ()
154{ 161{
155 unsigned int p, q;
156 int k;
157
158#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
159 scr_overlay_off (); 163 scr_overlay_off ();
160#endif 164#endif
161 165
162 view_start = 0; 166 view_start = 0;
… …
172 return; 176 return;
173 177
174 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
175 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
176 { 180 {
181 //TODO//FIXME
177 saveLines++; 182 saveLines++;
178 prev_nrow--; 183 prev_nrow--;
179 nsaved++; 184 top_row--;
180 } 185 }
181 186
182 want_refresh = 1; 187 want_refresh = 1;
183 188
184 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
185 total_rows = nrow + saveLines; 190 total_rows = nrow + saveLines;
186 191
187 screen.tscroll = 0; 192 screen.tscroll = 0;
188 screen.bscroll = nrow - 1; 193 screen.bscroll = nrow - 1;
189 194
190 if (!save) 195 if (!row_buf)
191 { 196 {
192 /* 197 /*
193 * 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
194 * Note: this is still needed so that all the scrollback lines are NULL
195 */ 199 */
196 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
197 term_start = 0; 201 term_start = 0;
198 202
199 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201 205
202 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
204 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 209
207 for (p = nrow; p--; ) 210 for (int row = nrow; row--; )
208 { 211 {
209 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 } 215 }
213 216
214 memset (charsets, 'B', sizeof (charsets)); 217 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 218 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 219 screen.flags = Screen_DefaultFlags;
… …
240 { 243 {
241 /* 244 /*
242 * add or delete rows as appropriate 245 * add or delete rows as appropriate
243 */ 246 */
244 247
245 rxvt_salloc *old_ta; 248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
246 rxvt_salloc *old_ra; 249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
247 250
251#if 0
248 if (nrow < prev_nrow) 252 if (nrow < prev_nrow)
249 { 253 {
250 /* delete rows */
251 k = min (nsaved, prev_nrow - nrow);
252 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
253 scr_scroll_text (0, (int)prev_nrow - 1, k);
254
255 for (p = nrow; p < prev_nrow; p++) 254 for (int row = nrow; row < prev_nrow; row++)
256 { 255 {
257 lfree (ROW(p));
258 lfree (swap_save[p]); 256 lfree (swap_buf [row]);
259 lfree (drawn[p]); 257 lfree (drawn_buf[row]);
260 } 258 }
259 }
260#endif
261 261
262 /* we have fewer rows so fix up cursor position */ 262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264 264
265 scr_reset_realloc (); /* realloc _last_ */ 265 for (int row = min (nrow, prev_nrow); row--; )
266 {
267 lresize (drawn_buf[row]);
268 lresize (swap_buf [row]);
269 }
270
271 for (int row = prev_nrow; row < nrow; row++)
272 {
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 }
276
277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
266 } 279
267 else if (nrow > prev_nrow) 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row
283
284 if (top_row)
285 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm.
288
289 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291
268 { 292 do
269 /* add rows */
270 scr_reset_realloc (); /* realloc _first_ */
271
272 int ocol = ncol;
273 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
274
275 k = min (nsaved, nrow - prev_nrow);
276
277 for (p = prev_total_rows; p < total_rows; p++)
278 save[p].clear ();
279
280 for (p = prev_total_rows; p < total_rows - k; p++)
281 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
282
283 for (p = prev_nrow; p < nrow; p++)
284 { 293 {
285 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 294 p = MOD (p - 1, prev_total_rows);
286 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
287 }
288
289 if (k > 0)
290 {
291 scr_scroll_text (0, (int)nrow - 1, -k);
292 screen.cur.row += k;
293 screen.s_cur.row += k;
294 nsaved -= k;
295 }
296
297#ifdef DEBUG_STRICT 295#ifdef DEBUG_STRICT
298 assert (screen.cur.row < nrow); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
299#else /* drive with your eyes closed */
300 MIN_IT (screen.cur.row, nrow - 1);
301#endif 297#endif
302 ncol = ocol; // save b/c scr_blank_screen_mem uses this
303 }
304
305 /* resize columns */
306 if (ncol != prev_ncol)
307 {
308 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
309 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
310
311 for (p = total_rows; p--; )
312 lresize (save[p]);
313
314 for (p = nrow; p--; )
315 {
316 lresize (drawn[p]);
317 lresize (swap_save[p]);
318 }
319
320 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
321
322 delete old_ta;
323 delete old_ra;
324 }
325
326#if 0
327 // re-wrap lines, this is rather ugly, possibly because I am too dumb
328 // to come up with a lean and mean algorithm.
329 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
330 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
331
332 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
333 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
334 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
335
336 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
337
338 p = prev_total_rows;
339 q = total_rows;
340
341 while (p > 0 && q > 0)
342 {
343 --p;
344
345 printf ("pq %d:%d\n", p, q);
346 if (save[p].t)
347 {
348 int llen = save[p].l; 298 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l;
349 300
350 assert (llen >= 0); 301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
351
352 while (p && save[p - 1].l < 0)
353 { 302 {
303 p = MOD (p - 1, prev_total_rows);
304
354 --p; 305 plines++;
355 llen += prev_ncol; 306 llen += prev_ncol;
356 } 307 }
357 308
358 int qlines = llen / ncol + 1; 309 int qlines = max (0, (llen - 1) / ncol) + 1;
310
311 // drop partial lines completely
312 if (q < qlines)
313 break;
314
315 q -= qlines;
316
359 int lofs = 0; 317 int lofs = 0;
318 line_t *qline;
360 319
361 q -= qlines; 320 // re-assemble the full line by destination lines
362
363 int qrow = q;
364
365 printf ("QL %d llen %d\n", qlines, llen);//D
366 for (; qlines--; qrow++) 321 for (int qrow = q; qlines--; qrow++)
367 { 322 {
323 qline = row_buf + qrow;
324 lalloc (*qline);
325 qline->l = ncol;
326 qline->is_longer (1);
327
368 if (qrow >= 0) 328 int qcol = 0;
329
330 // fill a single destination line
331 while (lofs < llen && qcol < ncol)
369 { 332 {
370 tp [qrow] = (text_t *)ta->alloc ();
371 rp [qrow] = (rend_t *)ra->alloc ();
372 tl [qrow] = LINE_CONT1;
373
374 int qcol = 0;
375
376 for (;;)
377 {
378 int prow = lofs / prev_ncol + p; 333 int prow = lofs / prev_ncol;
379 int pcol = lofs % prev_ncol; 334 int pcol = lofs % prev_ncol;
380 335
336 prow = MOD (p + prow, prev_total_rows);
337
338 // we only adjust the cursor _row_ and put it into
339 // the topmost line of "long line" it was in, as
340 // this seems to upset applications/shells/readline
341 // least.
342 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow);
344
345 line_t &pline = old_buf [prow];
346
381 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
382 348
383 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);
384
385 if (len <= 0)
386 {
387 tl [qrow] = qcol;
388
389 TODO
390 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
391 ncol - qcol, DEFAULT_RSTYLE);
392
393 break;
394 }
395
396 assert (lofs < 1000); 349 assert (len);
350 assert (pline.t);
397 351
398 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
399 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
400 354
401 lofs += len; 355 lofs += len;
402 qcol += len; 356 qcol += len;
403
404 if (qcol == ncol)
405 break;
406 }
407 } 357 }
408 else
409 lofs += ncol;
410 } 358 }
359
360 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
361 qline->is_longer (0);
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
411 } 363 }
364 while (p != pend && q > 0);
365
366 term_start = total_rows - nrow;
367 top_row = q - term_start;
368
369 // make sure all terminal lines exist
370 while (top_row > 0)
371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 }
373 else
412 } 374 {
375 // if no scrollback exists (yet), wing, instead of wrap
376
377 for (int row = min (nrow, prev_nrow); row--; )
378 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row];
413 381
414 free (screen.text); screen.text = tp; 382 qline = pline;
415 free (screen.rend); screen.rend = rp; 383 lresize (qline);
416 free (screen.tlen); screen.tlen = tl; 384 }
417 385
418 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 386 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390
391 term_start = 0;
392 }
393
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = top_row; i < nrow; i++)
396 assert (ROW (i).t);
419#endif 397#endif
398
399 free (old_buf);
400 delete old_ta;
401 delete old_ra;
402
403 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1);
420 405
421 if (tabs) 406 if (tabs)
422 free (tabs); 407 free (tabs);
423 } 408 }
424 409
425 prev_nrow = nrow; 410 prev_nrow = nrow;
426 prev_ncol = ncol; 411 prev_ncol = ncol;
427 412
428 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 413 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
429 414
430 for (p = 0; p < ncol; p++) 415 for (int col = ncol; col--; )
431 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 416 tabs [col] = col % TABSIZE == 0;
432 417
433 tt_winch (); 418 tt_winch ();
434}
435 419
436void 420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
437rxvt_term::scr_reset_realloc ()
438{
439 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
440 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
441 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
442 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
443} 421}
444 422
445/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
446/* 424/*
447 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
… …
450rxvt_term::scr_release () 428rxvt_term::scr_release ()
451{ 429{
452 delete talloc; talloc = 0; 430 delete talloc; talloc = 0;
453 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
454 432
455 free (save); 433 free (row_buf);
456 free (swap_save); 434 free (swap_buf);
457 free (drawn); 435 free (drawn_buf);
458 free (buf);
459 free (tabs); 436 free (tabs);
437
438 row_buf = 0; // signal that we freed all the arrays
460} 439}
461 440
462/* ------------------------------------------------------------------------- */ 441/* ------------------------------------------------------------------------- */
463/* 442/*
464 * Hard reset 443 * Hard reset
… …
515 set_font_style (); 494 set_font_style ();
516 break; 495 break;
517 } 496 }
518 497
519 /* boundary check in case screen size changed between SAVE and RESTORE */ 498 /* boundary check in case screen size changed between SAVE and RESTORE */
520 MIN_IT (s->cur.row, nrow - 1); 499 min_it (s->cur.row, nrow - 1);
521 MIN_IT (s->cur.col, ncol - 1); 500 min_it (s->cur.col, ncol - 1);
522#ifdef DEBUG_STRICT 501#ifdef DEBUG_STRICT
523 assert (s->cur.row >= 0); 502 assert (s->cur.row >= 0);
524 assert (s->cur.col >= 0); 503 assert (s->cur.col >= 0);
525#else /* drive with your eyes closed */
526 MAX_IT (s->cur.row, 0);
527 MAX_IT (s->cur.col, 0);
528#endif 504#endif
529} 505}
530 506
531/* ------------------------------------------------------------------------- */ 507/* ------------------------------------------------------------------------- */
532/* 508/*
… …
552 528
553 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
554 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
555 531
556#if NSCREENS 532#if NSCREENS
557 if (options & Opt_secondaryScreen) 533 if (OPTION (Opt_secondaryScreen))
558 { 534 {
559 num_scr = 0; 535 num_scr = 0;
560 536
561 for (int i = nrow; i--; ) 537 for (int i = prev_nrow; i--; )
562 ::swap (ROW(i), swap_save[i]); 538 ::swap (ROW(i), swap_buf [i]);
563 539
564 ::swap (screen.charset, swap.charset); 540 ::swap (screen.charset, swap.charset);
565 ::swap (screen.flags, swap.flags); 541 ::swap (screen.flags, swap.flags);
566 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
567 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
568 } 544 }
569 else 545 else
570#endif 546#endif
571 if (options & Opt_secondaryScroll) 547 if (OPTION (Opt_secondaryScroll))
572 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
573 549
574 return scrn; 550 return scrn;
575} 551}
576 552
… …
596 * Change the colour for following text 572 * Change the colour for following text
597 */ 573 */
598void 574void
599rxvt_term::scr_color (unsigned int color, int fgbg) 575rxvt_term::scr_color (unsigned int color, int fgbg)
600{ 576{
601 if (color > maxTermCOLOR) 577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
602 color = fgbg; 578 color = fgbg;
603 579
604 if (fgbg == Color_fg) 580 if (fgbg == Color_fg)
605 rstyle = SET_FGCOLOR (rstyle, color); 581 rstyle = SET_FGCOLOR (rstyle, color);
606 else 582 else
… …
637 want_refresh = 1; 613 want_refresh = 1;
638 num_scr += count; 614 num_scr += count;
639 615
640 if (count > 0 616 if (count > 0
641 && row1 == 0 617 && row1 == 0
642 && row2 == nrow - 1
643 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
644 { 619 {
645 nsaved = min (nsaved + count, saveLines); 620 top_row = max (top_row - count, -saveLines);
621
622 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
623
624 // scroll everything up 'count' lines
646 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
647 626
627 {
628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count);
630 l.touch ();
631 l.is_longer (0);
632 }
633
634 // erase newly scorlled-in lines
635 for (int i = count; i; --i )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
658
659 // move and/or clear selection, if any
648 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
649 { 661 {
650 selection.beg.row -= count; 662 selection.beg.row -= count;
651 selection.end.row -= count; 663 selection.end.row -= count;
652 selection.mark.row -= count; 664 selection.mark.row -= count;
653 665
654 selection_check (0); 666 if (selection.beg.row < top_row
655 } 667 || selection.end.row < top_row
656 668 || selection.mark.row < top_row)
657 for (int i = count; i--; )
658 scr_blank_screen_mem (ROW(row2 - i), rstyle);
659
660 if ((options & Opt_scrollWithBuffer)
661 && view_start != 0
662 && view_start != saveLines)
663 scr_page (UP, count);
664 }
665 else
666 {
667 if (selection.op && current_screen == selection.screen)
668 {
669 int i = selection.beg.row;
670 int j = selection.end.row;
671
672 if ((i < row1 && j > row1)
673 || (i < row2 && j > row2)
674 || (i - count < row1 && i >= row1)
675 || (i - count > row2 && i <= row2)
676 || (j - count < row1 && j >= row1)
677 || (j - count > row2 && j <= row2))
678 { 669 {
679 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
680 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
681 } 672 }
682 else if (j >= row1 && j <= row2) 673 }
674
675 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer)
677 && view_start != 0
678 && view_start != -saveLines)
679 scr_page (UP, count);
680 }
681 else
682 {
683 if (selection.op && current_screen == selection.screen)
684 {
685 if ((selection.beg.row < row1 && selection.end.row > row1)
686 || (selection.beg.row < row2 && selection.end.row > row2)
687 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
688 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
689 || (selection.end.row - count < row1 && selection.end.row >= row1)
690 || (selection.end.row - count > row2 && selection.end.row <= row2))
691 {
692 CLEAR_ALL_SELECTION ();
693 selection.op = SELECTION_CLEAR;
694 }
695 else if (selection.end.row >= row1 && selection.end.row <= row2)
683 { 696 {
684 /* move selected region too */ 697 /* move selected region too */
685 selection.beg.row -= count; 698 selection.beg.row -= count;
686 selection.end.row -= count; 699 selection.end.row -= count;
687 selection.mark.row -= count; 700 selection.mark.row -= count;
… …
693 // use a simple and robust scrolling algorithm, this 706 // use a simple and robust scrolling algorithm, this
694 // part of scr_scroll_text is not time-critical. 707 // part of scr_scroll_text is not time-critical.
695 708
696 int rows = row2 - row1 + 1; 709 int rows = row2 - row1 + 1;
697 710
711 min_it (count, rows);
712
713 line_t *temp_buf = row_buf + total_rows;
714
698 for (int row = 0; row < rows; row++) 715 for (int row = 0; row < rows; row++)
699 { 716 {
700 buf [row] = ROW(row1 + (row + count + rows) % rows); 717 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
701 718
702 if (!IN_RANGE_EXC (row + count, 0, rows)) 719 if (!IN_RANGE_EXC (row + count, 0, rows))
703 scr_blank_screen_mem (buf [row], rstyle); 720 scr_blank_screen_mem (temp_buf [row], rstyle);
704 } 721 }
705 722
706 for (int row = 0; row < rows; row++) 723 for (int row = 0; row < rows; row++)
707 ROW(row1 + row) = buf [row]; 724 ROW(row1 + row) = temp_buf [row];
708 } 725 }
709 726
710 return count; 727 return count;
711} 728}
712 729
713/* ------------------------------------------------------------------------- */ 730/* ------------------------------------------------------------------------- */
714/* 731/*
715 * Add text given in <str> of length <len> to screen struct 732 * Add text given in <str> of length <len> to screen struct
716 */ 733 */
717void 734void
718rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 735rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
719{ 736{
720 if (len <= 0) /* sanity */ 737 if (len <= 0) /* sanity */
721 return; 738 return;
722 739
723 unsigned char checksel; 740 unsigned char checksel;
724 unicode_t c; 741 unicode_t c;
725 int row, last_col; 742 int ncol = this->ncol;
726 const unicode_t *strend = str + len; 743 const wchar_t *strend = str + len;
727 744
728 want_refresh = 1; 745 want_refresh = 1;
729 ZERO_SCROLLBACK (); 746 ZERO_SCROLLBACK ();
730 last_col = ncol;
731 747
732 if (nlines > 0) 748 if (minlines > 0)
733 { 749 {
734 nlines += screen.cur.row - screen.bscroll; 750 minlines += screen.cur.row - screen.bscroll;
751
735 if ((nlines > 0) 752 if (minlines > 0
736 && (screen.tscroll == 0) 753 && screen.tscroll == 0
737 && (screen.bscroll == (nrow - 1))) 754 && screen.bscroll == nrow - 1)
738 { 755 {
739 /* _at least_ this many lines need to be scrolled */ 756 /* _at least_ this many lines need to be scrolled */
740 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 757 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
741 screen.cur.row -= nlines; 758 screen.cur.row -= minlines;
742 } 759 }
743 } 760 }
744 761
745#ifdef DEBUG_STRICT 762#ifdef DEBUG_STRICT
746 assert (screen.cur.col < last_col); 763 assert (screen.cur.col < ncol);
747 assert ((screen.cur.row < nrow) 764 assert (screen.cur.row < nrow
748 && (screen.cur.row >= - (int32_t)nsaved)); 765 && screen.cur.row >= top_row);
749#else /* drive with your eyes closed */
750 MIN_IT (screen.cur.col, last_col - 1);
751 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
752 MAX_IT (screen.cur.row, - (int32_t)nsaved);
753#endif 766#endif
754 row = screen.cur.row; 767 int row = screen.cur.row;
755 768
756 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 769 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
757 770
758 line_t *line = &ROW(row); 771 line_t *line = &ROW(row);
759 772
760 while (str < strend) 773 while (str < strend)
761 { 774 {
762 c = *str++; 775 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
763 776
764 if (c < 0x20) 777 if (c < 0x20)
765 if (c == C0_LF) 778 if (c == C0_LF)
766 { 779 {
767 if (!line->is_longer ()) /* XXX: think about this */
768 MAX_IT (line->l, screen.cur.col); 780 max_it (line->l, screen.cur.col);
769 781
770 screen.flags &= ~Screen_WrapNext; 782 screen.flags &= ~Screen_WrapNext;
771 783
772 if (screen.cur.row == screen.bscroll) 784 if (screen.cur.row == screen.bscroll)
773 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 785 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
777 line = &ROW(row); /* _must_ refresh */ 789 line = &ROW(row); /* _must_ refresh */
778 continue; 790 continue;
779 } 791 }
780 else if (c == C0_CR) 792 else if (c == C0_CR)
781 { 793 {
782 if (!line->is_longer ()) /* XXX: think about this */
783 MAX_IT (line->l, screen.cur.col); 794 max_it (line->l, screen.cur.col);
784 795
785 screen.flags &= ~Screen_WrapNext; 796 screen.flags &= ~Screen_WrapNext;
786 screen.cur.col = 0; 797 screen.cur.col = 0;
787 continue; 798 continue;
788 } 799 }
… …
805 CLEAR_SELECTION (); 816 CLEAR_SELECTION ();
806 } 817 }
807 818
808 if (screen.flags & Screen_WrapNext) 819 if (screen.flags & Screen_WrapNext)
809 { 820 {
821 max_it (line->l, ncol);
810 line->set_is_longer (); 822 line->is_longer (1);
811 823
812 scr_do_wrap (); 824 scr_do_wrap ();
813 825
814 row = screen.cur.row; 826 row = screen.cur.row;
815 line = &ROW(row); /* _must_ refresh */ 827 line = &ROW(row); /* _must_ refresh */
… …
823 // do wcwidth before further replacements, as wcwidth might return -1 835 // do wcwidth before further replacements, as wcwidth might return -1
824 // for the line drawing characters below as they might be invalid in the current 836 // for the line drawing characters below as they might be invalid in the current
825 // locale. 837 // locale.
826 int width = c < 0x100 ? 1 : wcwidth (c); 838 int width = c < 0x100 ? 1 : wcwidth (c);
827 839
828 if (charsets[screen.charset] == '0') // DEC SPECIAL 840 if (charsets [screen.charset] == '0') // DEC SPECIAL
829 { 841 {
830 // vt100 special graphics and line drawing 842 // vt100 special graphics and line drawing
831 // 5f-7e standard vt100 843 // 5f-7e standard vt100
832 // 40-5e rxvt extension for extra curses acs chars 844 // 40-5e rxvt extension for extra curses acs chars
833 static uint16_t vt100_0[62] = { // 41 .. 7e 845 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
885 } 897 }
886 898
887 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 899 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
888 900
889 // if the character doesn't fit into the remaining columns... 901 // if the character doesn't fit into the remaining columns...
890 if (screen.cur.col > last_col - width && last_col >= width) 902 if (screen.cur.col > ncol - width && ncol >= width)
891 { 903 {
892 // ...output spaces 904 // ...output spaces
893 c = ' '; 905 c = ' ';
894 // and try the same character next loop iteration 906 // and try the same character next loop iteration
895 --str; 907 --str;
896 } 908 }
897 909
910 line->touch ();
911
898 do 912 do
899 { 913 {
900 line->t[screen.cur.col] = c; 914 line->t[screen.cur.col] = c;
901 line->r[screen.cur.col] = rend; 915 line->r[screen.cur.col] = rend;
902 916
903 if (screen.cur.col < last_col - 1) 917 if (screen.cur.col < ncol - 1)
904 screen.cur.col++; 918 screen.cur.col++;
905 else 919 else
906 { 920 {
907 line->l = last_col; 921 line->l = ncol;
908 if (screen.flags & Screen_Autowrap) 922 if (screen.flags & Screen_Autowrap)
909 screen.flags |= Screen_WrapNext; 923 screen.flags |= Screen_WrapNext;
910 break; 924 break;
911 } 925 }
912 926
… …
914 } 928 }
915 while (--width > 0); 929 while (--width > 0);
916 930
917 // pad with spaces when overwriting wide character with smaller one 931 // pad with spaces when overwriting wide character with smaller one
918 if (!width) 932 if (!width)
933 {
934 line->touch ();
935
919 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 936 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
920 { 937 {
921 line->t[c] = ' '; 938 line->t[c] = ' ';
922 line->r[c] = rend; 939 line->r[c] = rend;
923 } 940 }
941 }
924 } 942 }
925 else // width == 0 943 else // width == 0
926 { 944 {
927#if ENABLE_COMBINING 945#if ENABLE_COMBINING
928 // handle combining characters 946 // handle combining characters
929 // we just tag the accent on the previous on-screen character. 947 // we just tag the accent on the previous on-screen character.
930 // this is arguably not correct, but also arguably not wrong. 948 // this is arguably not correct, but also arguably not wrong.
931 // we don't handle double-width characters nicely yet. 949 // we don't handle double-width characters nicely yet.
950 line_t *linep;
932 text_t *tp; 951 text_t *tp;
933 rend_t *rp; 952 rend_t *rp;
934 953
935 if (screen.cur.col > 0) 954 if (screen.cur.col > 0)
936 { 955 {
956 linep = line;
937 tp = line->t + screen.cur.col - 1; 957 tp = line->t + screen.cur.col - 1;
938 rp = line->r + screen.cur.col - 1; 958 rp = line->r + screen.cur.col - 1;
939
940 while (*tp == NOCHAR && tp > line->t)
941 tp--, rp--;
942 } 959 }
943 else if (screen.cur.row > 0 960 else if (screen.cur.row > 0
944 && ROW(screen.cur.row - 1).is_longer ()) 961 && ROW(screen.cur.row - 1).is_longer ())
945 { 962 {
946 line_t *line = &ROW(screen.cur.row - 1); 963 linep = &ROW(screen.cur.row - 1);
947
948 tp = line->t + last_col - 1; 964 tp = line->t + ncol - 1;
949 rp = line->r + last_col - 1; 965 rp = line->r + ncol - 1;
950
951 while (*tp == NOCHAR && tp > line->t)
952 tp--, rp--;
953 } 966 }
954 else 967 else
955 continue; 968 continue;
969
970 linep->touch ();
971
972 while (*tp == NOCHAR && tp > linep->t)
973 tp--, rp--;
956 974
957 // first try to find a precomposed character 975 // first try to find a precomposed character
958 unicode_t n = rxvt_compose (*tp, c); 976 unicode_t n = rxvt_compose (*tp, c);
959 if (n == NOCHAR) 977 if (n == NOCHAR)
960 n = rxvt_composite.compose (*tp, c); 978 n = rxvt_composite.compose (*tp, c);
… …
963 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 981 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
964#endif 982#endif
965 } 983 }
966 } 984 }
967 985
968 if (!line->is_longer ()) /* XXX: think about this */
969 MAX_IT (line->l, screen.cur.col); 986 max_it (line->l, screen.cur.col);
970 987
971#ifdef DEBUG_STRICT 988#ifdef DEBUG_STRICT
972 assert (screen.cur.row >= 0); 989 assert (screen.cur.row >= 0);
973#else /* drive with your eyes closed */
974 MAX_IT (screen.cur.row, 0);
975#endif 990#endif
976} 991}
977 992
978/* ------------------------------------------------------------------------- */ 993/* ------------------------------------------------------------------------- */
979/* 994/*
… …
1018 1033
1019 if (count == 0) 1034 if (count == 0)
1020 return; 1035 return;
1021 else if (count > 0) 1036 else if (count > 0)
1022 { 1037 {
1023 int row = screen.cur.row;
1024
1025 line_t &l = ROW(row); 1038 line_t &l = ROW(screen.cur.row);
1026 rend_t base_rend = l.r[i]; 1039 rend_t base_rend = l.r[i];
1027 ht &= l.t[i] == ' '; 1040 ht &= l.t[i] == ' ';
1028 1041
1029 for (; ++i < ncol; ) 1042 for (; ++i < ncol; )
1030 if (tabs[i]) 1043 if (tabs[i])
1031 { 1044 {
1032 x = i; 1045 x = i;
1046
1033 if (!--count) 1047 if (!--count)
1034 break; 1048 break;
1035 } 1049 }
1036 else 1050 else
1037 ht &= l.t[i] == ' ' 1051 ht &= l.t[i] == ' '
… …
1040 if (count) 1054 if (count)
1041 x = ncol - 1; 1055 x = ncol - 1;
1042 1056
1043 // store horizontal tab commands as characters inside the text 1057 // store horizontal tab commands as characters inside the text
1044 // buffer so they can be selected and pasted. 1058 // buffer so they can be selected and pasted.
1045 if (ht && options & Opt_pastableTabs) 1059 if (ht && OPTION (Opt_pastableTabs))
1046 { 1060 {
1047 base_rend = SET_FONT (base_rend, 0); 1061 base_rend = SET_FONT (base_rend, 0);
1048 1062
1049 if (!l.is_longer ()) /* XXX: think about this */ 1063 l.touch (x);
1050 MAX_IT (l.l, x);
1051 1064
1052 i = screen.cur.col; 1065 i = screen.cur.col;
1053 1066
1054 l.t[i] = '\t'; 1067 l.t[i] = '\t';
1055 l.r[i] = base_rend; 1068 l.r[i] = base_rend;
… …
1105 */ 1118 */
1106#if ENABLE_FRILLS 1119#if ENABLE_FRILLS
1107void 1120void
1108rxvt_term::scr_forwardindex () 1121rxvt_term::scr_forwardindex ()
1109{ 1122{
1110 int row;
1111
1112 if (screen.cur.col < ncol - 1) 1123 if (screen.cur.col < ncol - 1)
1113 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1114 else 1125 else
1115 { 1126 {
1116 row = screen.cur.row; 1127 line_t &l = ROW(screen.cur.row);
1117 1128
1118 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1129 l.touch ();
1119 ROW(row).l = ncol; 1130 l.is_longer (0);
1120 1131
1121 scr_gotorc (0, 0, R_RELATIVE); 1132 scr_gotorc (0, 0, R_RELATIVE);
1122 scr_insdel_chars (1, DELETE); 1133 scr_insdel_chars (1, DELETE);
1123 scr_gotorc (0, ncol - 1, R_RELATIVE); 1134 scr_gotorc (0, ncol - 1, R_RELATIVE);
1124 } 1135 }
… …
1134{ 1145{
1135 want_refresh = 1; 1146 want_refresh = 1;
1136 ZERO_SCROLLBACK (); 1147 ZERO_SCROLLBACK ();
1137 1148
1138 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1149 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1139 MAX_IT (screen.cur.col, 0); 1150 clamp_it (screen.cur.col, 0, ncol - 1);
1140 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1141 1151
1142 screen.flags &= ~Screen_WrapNext; 1152 screen.flags &= ~Screen_WrapNext;
1143 1153
1144 if (relative & R_RELATIVE) 1154 if (relative & R_RELATIVE)
1145 { 1155 {
… …
1163 else 1173 else
1164 { 1174 {
1165 if (screen.flags & Screen_Relative) 1175 if (screen.flags & Screen_Relative)
1166 { /* relative origin mode */ 1176 { /* relative origin mode */
1167 screen.cur.row = row + screen.tscroll; 1177 screen.cur.row = row + screen.tscroll;
1168 MIN_IT (screen.cur.row, screen.bscroll); 1178 min_it (screen.cur.row, screen.bscroll);
1169 } 1179 }
1170 else 1180 else
1171 screen.cur.row = row; 1181 screen.cur.row = row;
1172 } 1182 }
1173 1183
1174 MAX_IT (screen.cur.row, 0); 1184 clamp_it (screen.cur.row, 0, nrow - 1);
1175 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1176} 1185}
1177 1186
1178/* ------------------------------------------------------------------------- */ 1187/* ------------------------------------------------------------------------- */
1179/* 1188/*
1180 * direction should be UP or DN 1189 * direction should be UP or DN
… …
1195 || (screen.cur.row == screen.tscroll && direction == DN)) 1204 || (screen.cur.row == screen.tscroll && direction == DN))
1196 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1205 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1197 else 1206 else
1198 screen.cur.row += dirn; 1207 screen.cur.row += dirn;
1199 1208
1200 MAX_IT (screen.cur.row, 0); 1209 clamp_it (screen.cur.row, 0, nrow - 1);
1201 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1202 selection_check (0); 1210 selection_check (0);
1203} 1211}
1204 1212
1205/* ------------------------------------------------------------------------- */ 1213/* ------------------------------------------------------------------------- */
1206/* 1214/*
… …
1210 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1218 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1211 */ 1219 */
1212void 1220void
1213rxvt_term::scr_erase_line (int mode) 1221rxvt_term::scr_erase_line (int mode)
1214{ 1222{
1215 unsigned int row, col, num; 1223 unsigned int col, num;
1216 1224
1217 want_refresh = 1; 1225 want_refresh = 1;
1218 ZERO_SCROLLBACK (); 1226 ZERO_SCROLLBACK ();
1219 1227
1220 selection_check (1); 1228 selection_check (1);
1221 1229
1222 row = screen.cur.row; 1230 line_t &line = ROW(screen.cur.row);
1231
1232 line.touch ();
1233 line.is_longer (0);
1223 1234
1224 switch (mode) 1235 switch (mode)
1225 { 1236 {
1226 case 0: /* erase to end of line */ 1237 case 0: /* erase to end of line */
1227 col = screen.cur.col; 1238 col = screen.cur.col;
1228 num = ncol - col; 1239 num = ncol - col;
1229 MIN_IT (ROW(row).l, (int16_t)col); 1240 min_it (line.l, col);
1230 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1241 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1231 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1242 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1232 CLEAR_SELECTION (); 1243 CLEAR_SELECTION ();
1233 break; 1244 break;
1234 case 1: /* erase to beginning of line */ 1245 case 1: /* erase to beginning of line */
… …
1239 CLEAR_SELECTION (); 1250 CLEAR_SELECTION ();
1240 break; 1251 break;
1241 case 2: /* erase whole line */ 1252 case 2: /* erase whole line */
1242 col = 0; 1253 col = 0;
1243 num = ncol; 1254 num = ncol;
1244 ROW(row).l = 0; 1255 line.l = 0;
1245 if (selection.beg.row <= screen.cur.row 1256 if (selection.beg.row <= screen.cur.row
1246 && selection.end.row >= screen.cur.row) 1257 && selection.end.row >= screen.cur.row)
1247 CLEAR_SELECTION (); 1258 CLEAR_SELECTION ();
1248 break; 1259 break;
1249 default: 1260 default:
1250 return; 1261 return;
1251 } 1262 }
1252 1263
1253 scr_blank_line (ROW(row), col, num, rstyle); 1264 scr_blank_line (line, col, num, rstyle);
1254} 1265}
1255 1266
1256/* ------------------------------------------------------------------------- */ 1267/* ------------------------------------------------------------------------- */
1257/* 1268/*
1258 * Erase part of whole of the screen 1269 * Erase part of whole of the screen
… …
1301 CLEAR_SELECTION (); 1312 CLEAR_SELECTION ();
1302 1313
1303 if (row >= nrow) /* Out Of Bounds */ 1314 if (row >= nrow) /* Out Of Bounds */
1304 return; 1315 return;
1305 1316
1306 MIN_IT (num, (nrow - row)); 1317 min_it (num, nrow - row);
1307 1318
1308 if (rstyle & (RS_RVid | RS_Uline)) 1319 if (rstyle & (RS_RVid | RS_Uline))
1309 ren = (rend_t) ~RS_None; 1320 ren = (rend_t) ~RS_None;
1310 else if (GET_BASEBG (rstyle) == Color_bg) 1321 else if (GET_BASEBG (rstyle) == Color_bg)
1311 { 1322 {
… …
1313 CLEAR_ROWS (row, num); 1324 CLEAR_ROWS (row, num);
1314 } 1325 }
1315 else 1326 else
1316 { 1327 {
1317 ren = rstyle & (RS_fgMask | RS_bgMask); 1328 ren = rstyle & (RS_fgMask | RS_bgMask);
1318 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1319 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1330 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1320 ERASE_ROWS (row, num); 1331 ERASE_ROWS (row, num);
1321 gcvalue.foreground = pix_colors[Color_fg]; 1332 gcvalue.foreground = pix_colors[Color_fg];
1322 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1323 } 1334 }
1324 1335
1325 for (; num--; row++) 1336 for (; num--; row++)
1326 { 1337 {
1327 scr_blank_screen_mem (ROW (row), rstyle); 1338 scr_blank_screen_mem (ROW(row), rstyle);
1328 ROW (row).l = 0;
1329 scr_blank_line (drawn[row], 0, ncol, ren); 1339 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1330 } 1340 }
1331} 1341}
1332 1342
1333#if ENABLE_FRILLS 1343#if ENABLE_FRILLS
1334void 1344void
1335rxvt_term::scr_erase_savelines () 1345rxvt_term::scr_erase_savelines ()
1336{ 1346{
1337 want_refresh = 1; 1347 want_refresh = 1;
1338 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1339 1349
1340 nsaved = 0; 1350 top_row = 0;
1341} 1351}
1342#endif 1352#endif
1343 1353
1344/* ------------------------------------------------------------------------- */ 1354/* ------------------------------------------------------------------------- */
1345/* 1355/*
… …
1366 rend_t *r1 = line.r; 1376 rend_t *r1 = line.r;
1367 1377
1368 for (int j = ncol; j--; ) 1378 for (int j = ncol; j--; )
1369 *r1++ = fs; 1379 *r1++ = fs;
1370 1380
1371 line.l = ncol; /* make the `E's selectable */ 1381 line.is_longer (0);
1382 line.touch (ncol);
1372 } 1383 }
1373} 1384}
1374 1385
1375/* ------------------------------------------------------------------------- */ 1386/* ------------------------------------------------------------------------- */
1376/* 1387/*
… …
1419 return; 1430 return;
1420 1431
1421 scr_do_wrap (); 1432 scr_do_wrap ();
1422 1433
1423 selection_check (1); 1434 selection_check (1);
1424 MIN_IT (count, (ncol - screen.cur.col)); 1435 min_it (count, ncol - screen.cur.col);
1425 1436
1426 row = screen.cur.row; 1437 row = screen.cur.row;
1427 1438
1428 line_t *line = &ROW(row); 1439 line_t *line = &ROW(row);
1440
1441 line->touch ();
1442 line->is_longer (0);
1429 1443
1430 switch (insdel) 1444 switch (insdel)
1431 { 1445 {
1432 case INSERT: 1446 case INSERT:
1433 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1434 { 1448 {
1435 line->t[col] = line->t[col - count]; 1449 line->t[col] = line->t[col - count];
1436 line->r[col] = line->r[col - count]; 1450 line->r[col] = line->r[col - count];
1437 } 1451 }
1438 1452
1439 if (!line->is_longer ()) 1453 line->l = min (line->l + count, ncol);
1440 {
1441 line->l += count;
1442 MIN_IT (line->l, ncol);
1443 }
1444 1454
1445 if (selection.op && current_screen == selection.screen 1455 if (selection.op && current_screen == selection.screen
1446 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1447 { 1457 {
1448 if (selection.end.row != screen.cur.row 1458 if (selection.end.row != screen.cur.row
… …
1461 1471
1462 case ERASE: 1472 case ERASE:
1463 screen.cur.col += count; /* don't worry if > ncol */ 1473 screen.cur.col += count; /* don't worry if > ncol */
1464 selection_check (1); 1474 selection_check (1);
1465 screen.cur.col -= count; 1475 screen.cur.col -= count;
1476
1477 line->l = max (line->l - count, 0);
1466 scr_blank_line (*line, screen.cur.col, count, rstyle); 1478 scr_blank_line (*line, screen.cur.col, count, rstyle);
1467 break; 1479 break;
1468 1480
1469 case DELETE: 1481 case DELETE:
1470 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1473 { 1485 {
1474 line->t[col] = line->t[col + count]; 1486 line->t[col] = line->t[col + count];
1475 line->r[col] = line->r[col + count]; 1487 line->r[col] = line->r[col + count];
1476 } 1488 }
1477 1489
1490 line->l = max (line->l - count, 0);
1478 scr_blank_line (*line, ncol - count, count, tr); 1491 scr_blank_line (*line, ncol - count, count, tr);
1479
1480 if (line->is_longer ()) /* break line continuation */
1481 line->l = ncol;
1482
1483 line->l = max (line->l - count, 0);
1484 1492
1485 if (selection.op && current_screen == selection.screen 1493 if (selection.op && current_screen == selection.screen
1486 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1487 { 1495 {
1488 if (selection.end.row != screen.cur.row 1496 if (selection.end.row != screen.cur.row
… …
1508 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1516 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1509 */ 1517 */
1510void 1518void
1511rxvt_term::scr_scroll_region (int top, int bot) 1519rxvt_term::scr_scroll_region (int top, int bot)
1512{ 1520{
1513 MAX_IT (top, 0); 1521 max_it (top, 0);
1514 MIN_IT (bot, (int)nrow - 1); 1522 min_it (bot, nrow - 1);
1515 1523
1516 if (top > bot) 1524 if (top > bot)
1517 return; 1525 return;
1518 1526
1519 screen.tscroll = top; 1527 screen.tscroll = top;
… …
1600rxvt_term::scr_set_tab (int mode) 1608rxvt_term::scr_set_tab (int mode)
1601{ 1609{
1602 if (mode < 0) 1610 if (mode < 0)
1603 memset (tabs, 0, ncol * sizeof (char)); 1611 memset (tabs, 0, ncol * sizeof (char));
1604 else if (screen.cur.col < ncol) 1612 else if (screen.cur.col < ncol)
1605 tabs[screen.cur.col] = (mode ? 1 : 0); 1613 tabs [screen.cur.col] = !!mode;
1606} 1614}
1607 1615
1608/* ------------------------------------------------------------------------- */ 1616/* ------------------------------------------------------------------------- */
1609/* 1617/*
1610 * Set reverse/normal video 1618 * Set reverse/normal video
… …
1617 XGCValues gcvalue; 1625 XGCValues gcvalue;
1618 1626
1619 if (rvideo != mode) 1627 if (rvideo != mode)
1620 { 1628 {
1621 rvideo = mode; 1629 rvideo = mode;
1622 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1623#if XPM_BACKGROUND 1631#if XPM_BACKGROUND
1624 if (bgPixmap.pixmap == None) 1632 if (bgPixmap.pixmap == None)
1625#endif 1633#endif
1626#if TRANSPARENT 1634#if TRANSPARENT
1627 if (! (options & Opt_transparent) || am_transparent == 0) 1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1628#endif 1636#endif
1629 XSetWindowBackground (display->display, vt, 1637 XSetWindowBackground (display->display, vt,
1630 pix_colors[Color_bg]); 1638 pix_colors[Color_bg]);
1631 1639
1632 gcvalue.foreground = pix_colors[Color_fg]; 1640 gcvalue.foreground = pix_colors[Color_fg];
… …
1657 * Set font style 1665 * Set font style
1658 */ 1666 */
1659void 1667void
1660rxvt_term::set_font_style () 1668rxvt_term::set_font_style ()
1661{ 1669{
1670#if 0
1662 switch (charsets[screen.charset]) 1671 switch (charsets [screen.charset])
1663 { 1672 {
1664 case '0': /* DEC Special Character & Line Drawing Set */ 1673 case '0': /* DEC Special Character & Line Drawing Set */
1665 break; 1674 break;
1666 case 'A': /* United Kingdom (UK) */ 1675 case 'A': /* United Kingdom (UK) */
1667 break; 1676 break;
… …
1674 case 'C': /* Finnish character set */ 1683 case 'C': /* Finnish character set */
1675 break; 1684 break;
1676 case 'K': /* German character set */ 1685 case 'K': /* German character set */
1677 break; 1686 break;
1678 } 1687 }
1688#endif
1679} 1689}
1680 1690
1681/* ------------------------------------------------------------------------- */ 1691/* ------------------------------------------------------------------------- */
1682/* 1692/*
1683 * Choose a font 1693 * Choose a font
… …
1723 bool found = false; 1733 bool found = false;
1724 1734
1725 for (int i = 0; i < nrow; i++) 1735 for (int i = 0; i < nrow; i++)
1726 { 1736 {
1727 int col = 0; 1737 int col = 0;
1728 rend_t *drp = drawn[i].r; 1738 rend_t *drp = drawn_buf[i].r;
1729 1739
1730 for (; col < ncol; col++, drp++) 1740 for (; col < ncol; col++, drp++)
1731 if ((*drp & mask) == value) 1741 if ((*drp & mask) == value)
1732 { 1742 {
1733 found = true; 1743 found = true;
… …
1751rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1761rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1752{ 1762{
1753 int i; 1763 int i;
1754 row_col_t rc[RC_COUNT]; 1764 row_col_t rc[RC_COUNT];
1755 1765
1756 if (!drawn) /* sanity check */ 1766 if (!drawn_buf) /* sanity check */
1757 return; 1767 return;
1758 1768
1759#ifndef NO_SLOW_LINK_SUPPORT 1769#ifndef NO_SLOW_LINK_SUPPORT
1760 if (refresh_type == FAST_REFRESH && !display->is_local) 1770 if (refresh_type == FAST_REFRESH && !display->is_local)
1761 { 1771 {
1762 y = 0; 1772 y = 0;
1763 eheight = height; 1773 eheight = height;
1764 } 1774 }
1765#endif
1766
1767#ifdef DEBUG_STRICT
1768 x = max (x, 0);
1769 x = min (x, (int)width);
1770 y = max (y, 0);
1771 y = min (y, (int)height);
1772#endif 1775#endif
1773 1776
1774 /* round down */ 1777 /* round down */
1775 rc[PART_BEG].col = Pixel2Col (x); 1778 rc[PART_BEG].col = Pixel2Col (x);
1776 rc[PART_BEG].row = Pixel2Row (y); 1779 rc[PART_BEG].row = Pixel2Row (y);
… …
1779 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1782 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1780 1783
1781 /* sanity checks */ 1784 /* sanity checks */
1782 for (i = PART_BEG; i < RC_COUNT; i++) 1785 for (i = PART_BEG; i < RC_COUNT; i++)
1783 { 1786 {
1784 MIN_IT (rc[i].col, ncol - 1); 1787 min_it (rc[i].col, ncol - 1);
1785 MIN_IT (rc[i].row, nrow - 1); 1788 min_it (rc[i].row, nrow - 1);
1786 } 1789 }
1787 1790
1788 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1791 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1789 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1792 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1790 1793
1791 if (refresh) 1794 if (refresh)
1792 scr_refresh (SLOW_REFRESH); 1795 scr_refresh (SLOW_REFRESH);
1793} 1796}
1794 1797
… …
1805/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1806/* 1809/*
1807 * Move the display so that the line represented by scrollbar value Y is at 1810 * Move the display so that the line represented by scrollbar value Y is at
1808 * the top of the screen 1811 * the top of the screen
1809 */ 1812 */
1810int 1813void
1811rxvt_term::scr_move_to (int y, int len) 1814rxvt_term::scr_move_to (int y, int len)
1812{ 1815{
1813 long p = 0; 1816 int p = (top_row - nrow) * (len - y) / len + (nrow - 1);
1814 unsigned int oldviewstart;
1815 1817
1816 oldviewstart = view_start; 1818 scr_changeview (p);
1817
1818 if (y < len)
1819 {
1820 p = (nrow + nsaved) * (len - y) / len;
1821 p -= (long) (nrow - 1);
1822 p = max (p, 0);
1823 }
1824
1825 view_start = (unsigned int)min (p, nsaved);
1826
1827 return scr_changeview (oldviewstart);
1828} 1819}
1829 1820
1830/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1831/* 1822/*
1832 * Page the screen up/down nlines 1823 * Page the screen up/down nlines
1833 * direction should be UP or DN 1824 * direction should be UP or DN
1834 */ 1825 */
1835int 1826bool
1836rxvt_term::scr_page (enum page_dirn direction, int nlines) 1827rxvt_term::scr_page (enum page_dirn direction, int nlines)
1837{ 1828{
1838 int n; 1829 int new_view_start =
1839 unsigned int oldviewstart;
1840
1841 oldviewstart = view_start;
1842
1843 if (direction == UP)
1844 {
1845 n = view_start + nlines;
1846 view_start = min (n, nsaved);
1847 }
1848 else
1849 {
1850 n = view_start - nlines; 1830 direction == UP ? view_start - nlines
1851 view_start = max (n, 0); 1831 : view_start + nlines;
1852 }
1853 1832
1854 return scr_changeview (oldviewstart); 1833 return scr_changeview (new_view_start);
1855} 1834}
1856 1835
1857int 1836bool
1858rxvt_term::scr_changeview (unsigned int oldviewstart) 1837rxvt_term::scr_changeview (int new_view_start)
1859{ 1838{
1839 clamp_it (new_view_start, top_row, 0);
1840
1860 if (view_start != oldviewstart) 1841 if (new_view_start == view_start)
1861 { 1842 return false;
1843
1844 num_scr += new_view_start - view_start;
1845 view_start = new_view_start;
1846 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1862 want_refresh = 1; 1847 want_refresh = 1;
1863 num_scr -= (view_start - oldviewstart);
1864 }
1865 1848
1866 return (int) (view_start - oldviewstart); 1849 return true;
1867} 1850}
1868 1851
1869/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1870void 1853void
1871rxvt_term::scr_bell () 1854rxvt_term::scr_bell ()
1872{ 1855{
1873#ifndef NO_BELL 1856#ifndef NO_BELL
1874 1857
1875# ifndef NO_MAPALERT 1858# ifndef NO_MAPALERT
1876# ifdef MAPALERT_OPTION 1859# ifdef MAPALERT_OPTION
1877 if (options & Opt_mapAlert) 1860 if (OPTION (Opt_mapAlert))
1878# endif 1861# endif
1879 XMapWindow (display->display, parent[0]); 1862 XMapWindow (display->display, parent[0]);
1880# endif 1863# endif
1881 1864
1882 if (options & Opt_visualBell) 1865 if (OPTION (Opt_visualBell))
1883 { 1866 {
1884 scr_rvideo_mode (!rvideo); /* refresh also done */ 1867 scr_rvideo_mode (!rvideo); /* refresh also done */
1868 display->flush ();
1885 rxvt_usleep (VISUAL_BELL_DURATION); 1869 rxvt_usleep (VISUAL_BELL_DURATION);
1886 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1887 } 1871 }
1888 else 1872 else
1889 XBell (display->display, 0); 1873 XBell (display->display, 0);
… …
1903 if ((fd = popen_printer ()) == NULL) 1887 if ((fd = popen_printer ()) == NULL)
1904 return; 1888 return;
1905 1889
1906 if (fullhist) 1890 if (fullhist)
1907 { 1891 {
1908 nrows = nrow + nsaved; 1892 nrows = nrow - top_row;
1909 row_start = -nsaved; 1893 row_start = top_row;
1910 } 1894 }
1911 else 1895 else
1912 { 1896 {
1913 nrows = nrow; 1897 nrows = nrow;
1914 row_start = -view_start; 1898 row_start = view_start;
1915 } 1899 }
1916 1900
1917 wctomb (0, 0); 1901 wctomb (0, 0);
1918 1902
1919 for (int r1 = 0; r1 < nrows; r1++) 1903 for (int r1 = 0; r1 < nrows; r1++)
… …
1978 1962
1979#if XPM_BACKGROUND 1963#if XPM_BACKGROUND
1980 must_clear |= bgPixmap.pixmap != None; 1964 must_clear |= bgPixmap.pixmap != None;
1981#endif 1965#endif
1982#if TRANSPARENT 1966#if TRANSPARENT
1983 must_clear |= (options & Opt_transparent) && am_transparent; 1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
1984#endif 1968#endif
1985 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1986 1970
1987 /* 1971 /*
1988 * B: reverse any characters which are selected 1972 * B: reverse any characters which are selected
… …
2012 1996
2013 crp = &ROW(screen.cur.row).r[col]; 1997 crp = &ROW(screen.cur.row).r[col];
2014 1998
2015 if (showcursor && focus) 1999 if (showcursor && focus)
2016 { 2000 {
2017 if (options & Opt_cursorUnderline) 2001 if (OPTION (Opt_cursorUnderline))
2018 *crp ^= RS_Uline; 2002 *crp ^= RS_Uline;
2019 else 2003 else
2020 { 2004 {
2021 *crp ^= RS_RVid; 2005 *crp ^= RS_RVid;
2022 2006
… …
2024 cc1 = *crp & (RS_fgMask | RS_bgMask); 2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
2025 if (ISSET_PIXCOLOR (Color_cursor)) 2009 if (ISSET_PIXCOLOR (Color_cursor))
2026 ccol1 = Color_cursor; 2010 ccol1 = Color_cursor;
2027 else 2011 else
2028#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2029 ccol1 = GET_FGCOLOR (rstyle); 2013 ccol1 = fgcolor_of (rstyle);
2030#else 2014#else
2031 ccol1 = Color_fg; 2015 ccol1 = Color_fg;
2032#endif 2016#endif
2033 if (ISSET_PIXCOLOR (Color_cursor2)) 2017 if (ISSET_PIXCOLOR (Color_cursor2))
2034 ccol2 = Color_cursor2; 2018 ccol2 = Color_cursor2;
2035 else 2019 else
2036#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2037 ccol2 = GET_BGCOLOR (rstyle); 2021 ccol2 = bgcolor_of (rstyle);
2038#else 2022#else
2039 ccol2 = Color_bg; 2023 ccol2 = Color_bg;
2040#endif 2024#endif
2041 *crp = SET_FGCOLOR (*crp, ccol1); 2025 *crp = SET_FGCOLOR (*crp, ccol1);
2042 *crp = SET_BGCOLOR (*crp, ccol2); 2026 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2047 2031
2048 /* make sure no outline cursor is left around */ 2032 /* make sure no outline cursor is left around */
2049 setoldcursor = 0; 2033 setoldcursor = 0;
2050 if (ocrow != -1) 2034 if (ocrow != -1)
2051 { 2035 {
2052 if (screen.cur.row + view_start != ocrow 2036 if (screen.cur.row - view_start != ocrow
2053 || screen.cur.col != oldcursor.col) 2037 || screen.cur.col != oldcursor.col)
2054 { 2038 {
2055 if (ocrow < nrow 2039 if (ocrow < nrow
2056 && oldcursor.col < ncol) 2040 && oldcursor.col < ncol)
2057 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2058 2042
2059 if (focus || !showcursor) 2043 if (focus || !showcursor)
2060 oldcursor.row = -1; 2044 oldcursor.row = -1;
2061 else 2045 else
2062 setoldcursor = 1; 2046 setoldcursor = 1;
… …
2065 else if (!focus) 2049 else if (!focus)
2066 setoldcursor = 1; 2050 setoldcursor = 1;
2067 2051
2068 if (setoldcursor) 2052 if (setoldcursor)
2069 { 2053 {
2070 if (screen.cur.row + view_start >= nrow) 2054 if (screen.cur.row - view_start >= nrow)
2071 oldcursor.row = -1; 2055 oldcursor.row = -1;
2072 else 2056 else
2073 { 2057 {
2074 oldcursor.row = screen.cur.row + view_start; 2058 oldcursor.row = screen.cur.row - view_start;
2075 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
2076 } 2060 }
2077 } 2061 }
2078 } 2062 }
2079 2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2080#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2081 scr_swap_overlay (); 2066 scr_swap_overlay ();
2082#endif 2067#endif
2083 2068
2084#ifndef NO_SLOW_LINK_SUPPORT 2069#ifndef NO_SLOW_LINK_SUPPORT
… …
2100 row = i > 0 ? 0 : j - 1; 2085 row = i > 0 ? 0 : j - 1;
2101 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2102 { 2087 {
2103 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2104 { 2089 {
2105 line_t s = ROW(row - view_start); 2090 line_t s = ROW(view_start + row);
2106 line_t d = drawn[row]; 2091 line_t d = drawn_buf[row];
2107 line_t d2 = drawn[row + i]; 2092 line_t d2 = drawn_buf[row + i];
2108 2093
2109 for (nits = 0, col = ncol; col--; ) 2094 for (nits = 0, col = ncol; col--; )
2110 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2111 nits--; 2096 nits--;
2112 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2097 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2130 2115
2131 if (len != -1) 2116 if (len != -1)
2132 { 2117 {
2133 /* also comes here at end if needed because of >= above */ 2118 /* also comes here at end if needed because of >= above */
2134 if (wlen < len) 2119 if (wlen < len)
2135 SWAP_IT (wlen, len, int); 2120 ::swap (wlen, len);
2136 2121
2137 XCopyArea (display->display, vt, vt, 2122 XCopyArea (display->display, vt, vt,
2138 gc, 0, Row2Pixel (len + i), 2123 gc, 0, Row2Pixel (len + i),
2139 (unsigned int)TermWin_TotalWidth (), 2124 (unsigned int)this->width,
2140 (unsigned int)Height2Pixel (wlen - len + 1), 2125 (unsigned int)Height2Pixel (wlen - len + 1),
2141 0, Row2Pixel (len)); 2126 0, Row2Pixel (len));
2142 len = -1; 2127 len = -1;
2143 } 2128 }
2144 } 2129 }
… …
2148 /* 2133 /*
2149 * E: main pass across every character 2134 * E: main pass across every character
2150 */ 2135 */
2151 for (row = 0; row < nrow; row++) 2136 for (row = 0; row < nrow; row++)
2152 { 2137 {
2153 text_t *stp = ROW(row - view_start).t; 2138 text_t *stp = ROW(view_start + row).t;
2154 rend_t *srp = ROW(row - view_start).r; 2139 rend_t *srp = ROW(view_start + row).r;
2155 text_t *dtp = drawn[row].t; 2140 text_t *dtp = drawn_buf[row].t;
2156 rend_t *drp = drawn[row].r; 2141 rend_t *drp = drawn_buf[row].r;
2157 2142
2158 /* 2143 /*
2159 * E2: OK, now the real pass 2144 * E2: OK, now the real pass
2160 */ 2145 */
2161 int ypixel = (int)Row2Pixel (row); 2146 int ypixel = (int)Row2Pixel (row);
… …
2223 count++, i--; 2208 count++, i--;
2224 2209
2225 /* 2210 /*
2226 * Determine the attributes for the string 2211 * Determine the attributes for the string
2227 */ 2212 */
2228 int fore = GET_FGCOLOR (rend); // desired foreground 2213 int fore = fgcolor_of (rend); // desired foreground
2229 int back = GET_BGCOLOR (rend); // desired background 2214 int back = bgcolor_of (rend); // desired background
2230 2215
2231 // only do special processing if any attributes are set, which is rare 2216 // only do special processing if any attributes are set, which is unlikely
2232 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2217 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2233 { 2218 {
2234#if ENABLE_STYLES 2219#if ENABLE_STYLES
2235 // force redraw after "careful" characters to avoid pixel droppings 2220 // force redraw after "careful" characters to avoid pixel droppings
2236 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2221 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2272 fore = Color_UL; 2257 fore = Color_UL;
2273#endif 2258#endif
2274 2259
2275 if (invert) 2260 if (invert)
2276 { 2261 {
2277 SWAP_IT (fore, back, int); 2262 ::swap (fore, back);
2278 2263
2279#ifndef NO_BOLD_UNDERLINE_REVERSE 2264#ifndef NO_BOLD_UNDERLINE_REVERSE
2280 if (ISSET_PIXCOLOR (Color_RV)) 2265 if (ISSET_PIXCOLOR (Color_RV))
2281 back = Color_RV; 2266 back = Color_RV;
2282 2267
… …
2347 } /* for (row....) */ 2332 } /* for (row....) */
2348 2333
2349#if ENABLE_OVERLAY 2334#if ENABLE_OVERLAY
2350 scr_swap_overlay (); 2335 scr_swap_overlay ();
2351#endif 2336#endif
2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2352 2338
2353 /* 2339 /*
2354 * G: cleanup cursor and display outline cursor if necessary 2340 * G: cleanup cursor and display outline cursor if necessary
2355 */ 2341 */
2356 if (showcursor) 2342 if (showcursor)
2357 { 2343 {
2358 if (focus) 2344 if (focus)
2359 { 2345 {
2360 if (options & Opt_cursorUnderline) 2346 if (OPTION (Opt_cursorUnderline))
2361 *crp ^= RS_Uline; 2347 *crp ^= RS_Uline;
2362 else 2348 else
2363 { 2349 {
2364 *crp ^= RS_RVid; 2350 *crp ^= RS_RVid;
2365#ifndef NO_CURSORCOLOR 2351#ifndef NO_CURSORCOLOR
… …
2374 2360
2375 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2361 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2376 col--; 2362 col--;
2377 2363
2378 while (col + cursorwidth < ncol 2364 while (col + cursorwidth < ncol
2379 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2365 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2380 cursorwidth++; 2366 cursorwidth++;
2381 2367
2382#ifndef NO_CURSORCOLOR 2368#ifndef NO_CURSORCOLOR
2383 if (ISSET_PIXCOLOR (Color_cursor)) 2369 if (ISSET_PIXCOLOR (Color_cursor))
2384 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2370 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2395 /* 2381 /*
2396 * H: cleanup selection 2382 * H: cleanup selection
2397 */ 2383 */
2398 scr_reverse_selection (); 2384 scr_reverse_selection ();
2399 2385
2400 if (refresh_type & SMOOTH_REFRESH)
2401 XFlush (display->display);
2402
2403 num_scr = 0; 2386 num_scr = 0;
2404 num_scr_allow = 1; 2387 num_scr_allow = 1;
2405} 2388}
2406 2389
2407void 2390void
2408rxvt_term::scr_remap_chars (const line_t &l) 2391rxvt_term::scr_remap_chars (line_t &l)
2409{ 2392{
2410 if (!l.t) 2393 if (!l.t)
2411 return; 2394 return;
2412 2395
2396 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2397
2413 for (int i = ncol; i--; ) 2398 for (int i = ncol; i--; )
2414 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2399 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2415} 2400}
2416 2401
2417void 2402void
2418rxvt_term::scr_remap_chars () 2403rxvt_term::scr_remap_chars ()
2419{ 2404{
2420 for (int i = total_rows; i--; ) 2405 for (int i = total_rows; i--; )
2421 scr_remap_chars (save[i]); 2406 scr_remap_chars (row_buf [i]);
2422 2407
2423 for (int i = nrow; i--; ) 2408 for (int i = nrow; i--; )
2424 { 2409 {
2425 scr_remap_chars (drawn[i]); 2410 scr_remap_chars (drawn_buf [i]);
2426 scr_remap_chars (swap_save[i]); 2411 scr_remap_chars (swap_buf [i]);
2427 } 2412 }
2428} 2413}
2429 2414
2430void 2415void
2431rxvt_term::scr_recolour () 2416rxvt_term::scr_recolour ()
… …
2469 2454
2470 if (really) 2455 if (really)
2471 XClearWindow (display->display, vt); 2456 XClearWindow (display->display, vt);
2472} 2457}
2473 2458
2459void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2461{
2462 int view_end = view_start + nrow;
2463 int row, col;
2464
2465 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2466 {
2467 text_t *stp = ROW(row).t;
2468 rend_t *srp = ROW(row).r;
2469
2470 for (col = beg_col; col < end_col; col++)
2471 srp[col] ^= rstyle1;
2472
2473 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2474 srp[col] ^= rstyle2;
2475
2476 if (++col < end_col)
2477 srp[col] ^= rstyle2;
2478 }
2479}
2480
2481void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2483{
2484 int view_end = view_start + nrow;
2485 int row, col;
2486
2487 if (beg_row >= view_start)
2488 {
2489 col = beg_col;
2490 row = beg_row;
2491 }
2492 else
2493 {
2494 col = 0;
2495 row = view_start;
2496 }
2497
2498 for (; row < min (end_row, view_end); row++, col = 0)
2499 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500 srp[col] ^= rstyle;
2501
2502 if (row == end_row)
2503 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2504 srp[col] ^= rstyle;
2505}
2506
2474/* ------------------------------------------------------------------------- */ 2507/* ------------------------------------------------------------------------- */
2475void 2508void
2476rxvt_term::scr_reverse_selection () 2509rxvt_term::scr_reverse_selection ()
2477{ 2510{
2478 if (selection.op 2511 if (selection.op
2479 && current_screen == selection.screen 2512 && current_screen == selection.screen
2480 && selection.end.row >= -view_start) 2513 && selection.end.row >= view_start)
2481 { 2514 {
2482 int view_end = -view_start + nrow;
2483 int row, col;
2484
2485#if ENABLE_FRILLS 2515#if ENABLE_FRILLS
2486 if (selection.rect) 2516 if (selection.rect)
2487 { 2517 scr_xor_rect (selection.beg.row, selection.beg.col,
2488 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2518 selection.end.row, selection.end.col,
2489 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2519 RS_RVid, RS_RVid | RS_Uline);
2490 srp[col] ^= RS_RVid;
2491 }
2492 else 2520 else
2493#endif 2521#endif
2494 { 2522 scr_xor_span (selection.beg.row, selection.beg.col,
2495 if (selection.beg.row >= -view_start) 2523 selection.end.row, selection.end.col,
2496 { 2524 RS_RVid);
2497 col = selection.beg.col;
2498 row = selection.beg.row;
2499 }
2500 else
2501 {
2502 col = 0;
2503 row = view_start;
2504 }
2505
2506 for (; row < min (selection.end.row, view_end); row++, col = 0)
2507 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2508 srp[col] ^= RS_RVid;
2509
2510 if (row == selection.end.row)
2511 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2512 srp[col] ^= RS_RVid;
2513 }
2514 } 2525 }
2515} 2526}
2516 2527
2517/* ------------------------------------------------------------------------- */ 2528/* ------------------------------------------------------------------------- */
2518/* 2529/*
… …
2528 char r1[] = "\n"; 2539 char r1[] = "\n";
2529 2540
2530 for (row = saveLines - nsaved; 2541 for (row = saveLines - nsaved;
2531 row < saveLines + nrow - 1; row++) 2542 row < saveLines + nrow - 1; row++)
2532 { 2543 {
2533 width = save[row].l >= 0 ? save[row].l 2544 width = row_buf[row].l >= 0 ? row_buf[row].l
2534 : ncol; 2545 : ncol;
2535 for (towrite = width; towrite; towrite -= wrote) 2546 for (towrite = width; towrite; towrite -= wrote)
2536 { 2547 {
2537 wrote = write (fd, & (save[row].t[width - towrite]), 2548 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2538 towrite); 2549 towrite);
2539 if (wrote < 0) 2550 if (wrote < 0)
2540 return; /* XXX: death, no report */ 2551 return; /* XXX: death, no report */
2541 } 2552 }
2542 if (save[row].l >= 0) 2553 if (row_buf[row].l >= 0)
2543 if (write (fd, r1, 1) <= 0) 2554 if (write (fd, r1, 1) <= 0)
2544 return; /* XXX: death, no report */ 2555 return; /* XXX: death, no report */
2545 } 2556 }
2546} 2557}
2547#endif 2558#endif
… …
2556 2567
2557 if (!selection.op) 2568 if (!selection.op)
2558 return; 2569 return;
2559 2570
2560 pos.row = pos.col = 0; 2571 pos.row = pos.col = 0;
2561 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2572 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2562 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2573 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2563 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2574 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2564 || (check_more == 1 2575 || (check_more == 1
2565 && current_screen == selection.screen 2576 && current_screen == selection.screen
2566 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2577 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2567 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2578 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2568 || (check_more == 2 2579 || (check_more == 2
… …
2579/* ------------------------------------------------------------------------- */ 2590/* ------------------------------------------------------------------------- */
2580/* 2591/*
2581 * Paste a selection direct to the command fd 2592 * Paste a selection direct to the command fd
2582 */ 2593 */
2583void 2594void
2584rxvt_term::paste (unsigned char *data, unsigned int len) 2595rxvt_term::paste (char *data, unsigned int len)
2585{ 2596{
2586 /* convert normal newline chars into common keyboard Return key sequence */ 2597 /* convert normal newline chars into common keyboard Return key sequence */
2587 for (unsigned int i = 0; i < len; i++) 2598 for (unsigned int i = 0; i < len; i++)
2588 if (data[i] == C0_LF) 2599 if (data[i] == C0_LF)
2589 data[i] = C0_CR; 2600 data[i] = C0_CR;
… …
2733 { 2744 {
2734 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2745 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2735 char *s = rxvt_wcstombs (w); 2746 char *s = rxvt_wcstombs (w);
2736 free (w); 2747 free (w);
2737 // TODO: strlen == only the first element will be converted. well... 2748 // TODO: strlen == only the first element will be converted. well...
2738 paste ((unsigned char *)s, strlen (s)); 2749 paste (s, strlen (s));
2739 free (s); 2750 free (s);
2740 } 2751 }
2741 else 2752 else
2742#endif 2753#endif
2743 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2754 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2744 && cl) 2755 && cl)
2745 { 2756 {
2746 for (int i = 0; i < cr; i++) 2757 for (int i = 0; i < cr; i++)
2747 paste ((unsigned char *)cl[i], strlen (cl[i])); 2758 paste (cl[i], strlen (cl[i]));
2748 2759
2749 XFreeStringList (cl); 2760 XFreeStringList (cl);
2750 } 2761 }
2751 else 2762 else
2752 paste (ct.value, ct.nitems); // paste raw 2763 paste ((char *)ct.value, ct.nitems); // paste raw
2753 2764
2754bailout: 2765bailout:
2755 XFree (ct.value); 2766 XFree (ct.value);
2756 2767
2757 if (selection_wait == Sel_normal) 2768 if (selection_wait == Sel_normal)
… …
2795 return; /* outside window */ 2806 return; /* outside window */
2796 2807
2797 if (selection.text) 2808 if (selection.text)
2798 { /* internal selection */ 2809 { /* internal selection */
2799 char *str = rxvt_wcstombs (selection.text, selection.len); 2810 char *str = rxvt_wcstombs (selection.text, selection.len);
2800 paste ((unsigned char *)str, strlen (str)); 2811 paste (str, strlen (str));
2801 free (str); 2812 free (str);
2802 return; 2813 return;
2803 } 2814 }
2804 else 2815 else
2805 { 2816 {
… …
2897 selection.op = SELECTION_DONE; 2908 selection.op = SELECTION_DONE;
2898 2909
2899 if (selection.clicks == 4) 2910 if (selection.clicks == 4)
2900 return; /* nothing selected, go away */ 2911 return; /* nothing selected, go away */
2901 2912
2913 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2914 return;
2915
2902 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2916 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2903 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2917 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2904 2918
2905 int ofs = 0; 2919 int ofs = 0;
2906 int extra = 0; 2920 int extra = 0;
… …
2918 col = selection.beg.col; 2932 col = selection.beg.col;
2919 end_col = ncol + 1; 2933 end_col = ncol + 1;
2920 } 2934 }
2921 else 2935 else
2922#endif 2936#endif
2923 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2937 end_col = ROW(row).l;
2924 2938
2925 col = max (col, 0); 2939 col = max (col, 0);
2926 2940
2927 if (row == selection.end.row || selection.rect) 2941 if (row == selection.end.row
2942#if ENABLE_FRILLS
2943 || selection.rect
2944#endif
2945 )
2928 end_col = min (end_col, selection.end.col); 2946 min_it (end_col, selection.end.col);
2929 2947
2930 t = ROW(row).t + col; 2948 t = ROW(row).t + col;
2949
2931 for (; col < end_col; col++) 2950 for (; col < end_col; col++)
2932 { 2951 {
2933 if (*t == NOCHAR) 2952 if (*t == NOCHAR)
2934 t++; 2953 t++;
2935#if ENABLE_COMBINING 2954#if ENABLE_COMBINING
… …
2951#endif 2970#endif
2952 else 2971 else
2953 new_selection_text[ofs++] = *t++; 2972 new_selection_text[ofs++] = *t++;
2954 } 2973 }
2955 2974
2975#if ENABLE_FRILLS
2976 if (selection.rect)
2977 {
2978 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1]))
2981 --ofs;
2982
2983 new_selection_text[ofs++] = C0_LF;
2984 }
2985 else
2986#endif
2956 if (!ROW(row).is_longer () && row != selection.end.row) 2987 if (!ROW(row).is_longer () && row != selection.end.row)
2957 new_selection_text[ofs++] = C0_LF; 2988 new_selection_text[ofs++] = C0_LF;
2958 } 2989 }
2959 2990
2960 if (end_col != selection.end.col) 2991 if (end_col != selection.end.col)
2961 new_selection_text[ofs++] = C0_LF; 2992 new_selection_text[ofs++] = C0_LF;
2962 2993
… …
2972 3003
2973 // we usually allocate much more than necessary, so realloc it smaller again 3004 // we usually allocate much more than necessary, so realloc it smaller again
2974 selection.len = ofs; 3005 selection.len = ofs;
2975 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3006 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2976 3007
3008 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3009 return;
3010
3011 selection_grab (tm);
3012}
3013
3014bool
3015rxvt_term::selection_grab (Time tm)
3016{
3017 selection_time = tm;
3018
2977 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2978 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3021 {
2979 display->set_selection_owner (this); 3022 display->set_selection_owner (this);
3023 return true;
3024 }
2980 else 3025 else
2981 rxvt_warn ("can't get primary selection, ignoring.\n"); 3026 {
3027 selection_clear ();
3028 return false;
3029 }
2982 3030
2983#if 0 3031#if 0
2984 XTextProperty ct; 3032 XTextProperty ct;
2985 3033
2986 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2987 { 3035 {
2988 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3036 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2989 XFree (ct.value); 3037 XFree (ct.value);
2990 } 3038 }
2991#endif 3039#endif
2992
2993 selection_time = tm;
2994} 3040}
2995 3041
2996/* ------------------------------------------------------------------------- */ 3042/* ------------------------------------------------------------------------- */
2997/* 3043/*
2998 * Mark or select text based upon number of clicks: 1, 2, or 3 3044 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3002rxvt_term::selection_click (int clicks, int x, int y) 3048rxvt_term::selection_click (int clicks, int x, int y)
3003{ 3049{
3004 clicks = ((clicks - 1) % 3) + 1; 3050 clicks = ((clicks - 1) % 3) + 1;
3005 selection.clicks = clicks; /* save clicks so extend will work */ 3051 selection.clicks = clicks; /* save clicks so extend will work */
3006 3052
3053 if (clicks == 2 && !selection.rect
3054 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3055 {
3056 MEvent.clicks = 1; // what a mess
3057 selection.screen = current_screen;
3058 selection.op = SELECTION_CONT;
3059 return;
3060 }
3061
3007 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3062 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3008 3063
3009 if (clicks == 2 || clicks == 3) 3064 if (clicks == 2 || clicks == 3)
3010 selection_extend_colrow (selection.mark.col, 3065 selection_extend_colrow (selection.mark.col,
3011 selection.mark.row + view_start, 3066 selection.mark.row - view_start,
3012 0, /* button 3 */ 3067 0, /* button 3 */
3013 1, /* button press */ 3068 1, /* button press */
3014 0); /* click change */ 3069 0); /* click change */
3015} 3070}
3016 3071
… …
3021void 3076void
3022rxvt_term::selection_start_colrow (int col, int row) 3077rxvt_term::selection_start_colrow (int col, int row)
3023{ 3078{
3024 want_refresh = 1; 3079 want_refresh = 1;
3025 3080
3026 selection.mark.row = row - view_start; 3081 selection.mark.row = row + view_start;
3027 selection.mark.col = col; 3082 selection.mark.col = col;
3028 3083
3029 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3084 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3030 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3085 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3031 3086
3032 while (selection.mark.col > 0 3087 while (selection.mark.col > 0
3033 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3088 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3034 --selection.mark.col; 3089 --selection.mark.col;
… …
3062 text_t *stp; 3117 text_t *stp;
3063 rend_t *srp; 3118 rend_t *srp;
3064 3119
3065 if (dirn == UP) 3120 if (dirn == UP)
3066 { 3121 {
3067 bound.row = - nsaved - 1; 3122 bound.row = top_row - 1;
3068 bound.col = 0; 3123 bound.col = 0;
3069 dirnadd = -1; 3124 dirnadd = -1;
3070 } 3125 }
3071 else 3126 else
3072 { 3127 {
… …
3120 } 3175 }
3121 } 3176 }
3122 break; 3177 break;
3123 } 3178 }
3124 3179
3125Old_Word_Selection_You_Die:
3126 if (dirn == DN) 3180 if (dirn == DN)
3127 col++; /* put us on one past the end */ 3181 col++; /* put us on one past the end */
3128 3182
3129 /* Poke the values back in */ 3183 /* Poke the values back in */
3130 ret->row = row; 3184 ret->row = row;
… …
3151 * select nothing. Otherwise, if we're to the right of the mark, you have to 3205 * select nothing. Otherwise, if we're to the right of the mark, you have to
3152 * be _past_ a character for it to be selected. 3206 * be _past_ a character for it to be selected.
3153 */ 3207 */
3154 if (((selection.clicks % 3) == 1) && !flag 3208 if (((selection.clicks % 3) == 1) && !flag
3155 && (col == selection.mark.col 3209 && (col == selection.mark.col
3156 && (row == selection.mark.row + view_start))) 3210 && (row == selection.mark.row - view_start)))
3157 { 3211 {
3158 /* select nothing */ 3212 /* select nothing */
3159 selection.beg.row = selection.end.row = 0; 3213 selection.beg.row = selection.end.row = 0;
3160 selection.beg.col = selection.end.col = 0; 3214 selection.beg.col = selection.end.col = 0;
3161 selection.clicks = 4; 3215 selection.clicks = 4;
… …
3216 selection.beg.col = selection.end.col = selection.mark.col; 3270 selection.beg.col = selection.end.col = selection.mark.col;
3217 selection.beg.row = selection.end.row = selection.mark.row; 3271 selection.beg.row = selection.end.row = selection.mark.row;
3218 } 3272 }
3219 3273
3220 pos.col = col; 3274 pos.col = col;
3221 pos.row = row - view_start; 3275 pos.row = view_start + row;
3222 3276
3223 /* 3277 /*
3224 * This is mainly xterm style selection with a couple of differences, mainly 3278 * This is mainly xterm style selection with a couple of differences, mainly
3225 * in the way button3 drag extension works. 3279 * in the way button3 drag extension works.
3226 * We're either doing: button1 drag; button3 press; or button3 drag 3280 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3313 selection_delimit_word (DN, &selection.end, &selection.end); 3367 selection_delimit_word (DN, &selection.end, &selection.end);
3314 } 3368 }
3315 else if (selection.clicks == 3) 3369 else if (selection.clicks == 3)
3316 { 3370 {
3317#if ENABLE_FRILLS 3371#if ENABLE_FRILLS
3318 if (options & Opt_tripleclickwords) 3372 if (OPTION (Opt_tripleclickwords))
3319 { 3373 {
3320 selection_delimit_word (UP, &selection.beg, &selection.beg); 3374 selection_delimit_word (UP, &selection.beg, &selection.beg);
3321 3375
3322 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3376 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3323 { 3377 {
… …
3364 } 3418 }
3365 } 3419 }
3366 3420
3367#if ENABLE_FRILLS 3421#if ENABLE_FRILLS
3368 if (selection.rect && selection.beg.col > selection.end.col) 3422 if (selection.rect && selection.beg.col > selection.end.col)
3369 SWAP_IT (selection.beg.col, selection.end.col, int); 3423 ::swap (selection.beg.col, selection.end.col);
3370#endif 3424#endif
3371} 3425}
3372 3426
3373#if ENABLE_FRILLS 3427#if ENABLE_FRILLS
3374void 3428void
… …
3384 { 3438 {
3385 stp = ROW(end_row).t; 3439 stp = ROW(end_row).t;
3386 3440
3387 while (--end_col >= 0) 3441 while (--end_col >= 0)
3388 { 3442 {
3389 if (stp[end_col] != ' ' 3443 if (stp[end_col] != NOCHAR
3390 && stp[end_col] != '\t' 3444 && !unicode::is_space (stp[end_col]))
3391 && stp[end_col] != NOCHAR)
3392 break; 3445 break;
3393 } 3446 }
3394 3447
3395 if (end_col >= 0 3448 if (end_col >= 0
3396 || !ROW(end_row - 1).is_longer ()) 3449 || !ROW(end_row - 1).is_longer ())
… …
3572 */ 3625 */
3573void 3626void
3574rxvt_term::pixel_position (int *x, int *y) 3627rxvt_term::pixel_position (int *x, int *y)
3575{ 3628{
3576 *x = Pixel2Col (*x); 3629 *x = Pixel2Col (*x);
3577 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3630 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3578 *y = Pixel2Row (*y); 3631 *y = Pixel2Row (*y);
3579 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3632 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3580} 3633}
3581 3634
3582/* ------------------------------------------------------------------------- */ 3635/* ------------------------------------------------------------------------- */
3583#ifdef USE_XIM 3636#ifdef USE_XIM
3584void 3637void
… …
3595 3648
3596#if ENABLE_OVERLAY 3649#if ENABLE_OVERLAY
3597void 3650void
3598rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3651rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3599{ 3652{
3600 if (nrow < 3 || ncol < 3) 3653 if (nrow < 1 || ncol < 1)
3601 return; 3654 return;
3602 3655
3603 want_refresh = 1; 3656 want_refresh = 1;
3604 3657
3605 scr_overlay_off (); 3658 scr_overlay_off ();
3606 3659
3607 if (x < 0) x = ncol - w; 3660 if (x < 0) x = ncol - w;
3608 if (y < 0) y = nrow - h; 3661 if (y < 0) y = nrow - h;
3609 3662
3610 // make space for border 3663 // make space for border
3611 w += 2; MIN_IT (w, ncol); 3664 w += 2; min_it (w, ncol);
3612 h += 2; MIN_IT (h, nrow); 3665 h += 2; min_it (h, nrow);
3613 3666
3614 x -= 1; MAX_IT (x, 0); 3667 x -= 1; clamp_it (x, 0, ncol - w);
3615 y -= 1; MAX_IT (y, 0); 3668 y -= 1; clamp_it (y, 0, nrow - h);
3616
3617 MIN_IT (x, ncol - w);
3618 MIN_IT (y, nrow - h);
3619 3669
3620 ov_x = x; ov_y = y; 3670 ov_x = x; ov_y = y;
3621 ov_w = w; ov_h = h; 3671 ov_w = w; ov_h = h;
3622 3672
3623 ov_text = new text_t *[h]; 3673 ov_text = new text_t *[h];
… …
3715 for (int y = ov_h; y--; ) 3765 for (int y = ov_h; y--; )
3716 { 3766 {
3717 text_t *t1 = ov_text[y]; 3767 text_t *t1 = ov_text[y];
3718 rend_t *r1 = ov_rend[y]; 3768 rend_t *r1 = ov_rend[y];
3719 3769
3720 text_t *t2 = ROW(y - view_start).t + ov_x; 3770 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3721 rend_t *r2 = ROW(y - view_start).r + ov_x; 3771 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3722 3772
3723 for (int x = ov_w; x--; ) 3773 for (int x = ov_w; x--; )
3724 { 3774 {
3725 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3775 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3726 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3776 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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