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.178 by root, Tue Dec 20 22:27:49 2005 UTC vs.
Revision 1.228 by root, Sun Jan 15 06:02:41 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/*
… …
543 if (current_screen == scrn) 519 if (current_screen == scrn)
544 return scrn; 520 return scrn;
545 521
546 selection_check (2); /* check for boundary cross */ 522 selection_check (2); /* check for boundary cross */
547 523
548 SWAP_IT (scrn, current_screen, int); 524 int i = current_screen; current_screen = scrn; scrn = i;
549 525
550 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 526 ::swap (screen.cur.row, swap.cur.row);
551 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 527 ::swap (screen.cur.col, swap.cur.col);
552 MAX_IT (screen.cur.row, 0); 528
553 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
554 MAX_IT (screen.cur.col, 0); 530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
555 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
556 531
557#if NSCREENS 532#if NSCREENS
558 if (options & Opt_secondaryScreen) 533 if (OPTION (Opt_secondaryScreen))
559 { 534 {
560 num_scr = 0; 535 num_scr = 0;
561 536
562 for (int i = nrow; i--; ) 537 for (int i = prev_nrow; i--; )
563 SWAP_IT (ROW(i), swap_save[i], line_t); 538 ::swap (ROW(i), swap_buf [i]);
564 539
565 SWAP_IT (screen.charset, swap.charset, int16_t); 540 ::swap (screen.charset, swap.charset);
566 SWAP_IT (screen.flags, swap.flags, int); 541 ::swap (screen.flags, swap.flags);
567 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
568 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
569 } 544 }
570 else 545 else
571#endif 546#endif
572 if (options & Opt_secondaryScroll) 547 if (OPTION (Opt_secondaryScroll))
573 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
574 549
575 return scrn; 550 return scrn;
576} 551}
577 552
… …
597 * Change the colour for following text 572 * Change the colour for following text
598 */ 573 */
599void 574void
600rxvt_term::scr_color (unsigned int color, int fgbg) 575rxvt_term::scr_color (unsigned int color, int fgbg)
601{ 576{
602 if (color > maxTermCOLOR) 577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
603 color = fgbg; 578 color = fgbg;
604 579
605 if (fgbg == Color_fg) 580 if (fgbg == Color_fg)
606 rstyle = SET_FGCOLOR (rstyle, color); 581 rstyle = SET_FGCOLOR (rstyle, color);
607 else 582 else
… …
638 want_refresh = 1; 613 want_refresh = 1;
639 num_scr += count; 614 num_scr += count;
640 615
641 if (count > 0 616 if (count > 0
642 && row1 == 0 617 && row1 == 0
643 && row2 == nrow - 1
644 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
645 { 619 {
646 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
647 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
648 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
649 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
650 { 661 {
651 selection.beg.row -= count; 662 selection.beg.row -= count;
652 selection.end.row -= count; 663 selection.end.row -= count;
653 selection.mark.row -= count; 664 selection.mark.row -= count;
654 665
655 selection_check (0); 666 if (selection.beg.row < top_row
656 } 667 || selection.end.row < top_row
657 668 || selection.mark.row < top_row)
658 for (int i = count; i--; )
659 scr_blank_screen_mem (ROW(row2 - i), rstyle);
660
661 if ((options & Opt_scrollWithBuffer)
662 && view_start != 0
663 && view_start != saveLines)
664 scr_page (UP, count);
665 }
666 else
667 {
668 if (selection.op && current_screen == selection.screen)
669 {
670 int i = selection.beg.row;
671 int j = selection.end.row;
672
673 if ((i < row1 && j > row1)
674 || (i < row2 && j > row2)
675 || (i - count < row1 && i >= row1)
676 || (i - count > row2 && i <= row2)
677 || (j - count < row1 && j >= row1)
678 || (j - count > row2 && j <= row2))
679 { 669 {
680 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
681 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
682 } 672 }
683 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)
684 { 696 {
685 /* move selected region too */ 697 /* move selected region too */
686 selection.beg.row -= count; 698 selection.beg.row -= count;
687 selection.end.row -= count; 699 selection.end.row -= count;
688 selection.mark.row -= count; 700 selection.mark.row -= count;
… …
694 // use a simple and robust scrolling algorithm, this 706 // use a simple and robust scrolling algorithm, this
695 // part of scr_scroll_text is not time-critical. 707 // part of scr_scroll_text is not time-critical.
696 708
697 int rows = row2 - row1 + 1; 709 int rows = row2 - row1 + 1;
698 710
711 min_it (count, rows);
712
713 line_t *temp_buf = row_buf + total_rows;
714
699 for (int row = 0; row < rows; row++) 715 for (int row = 0; row < rows; row++)
700 { 716 {
701 buf [row] = ROW(row1 + (row + count + rows) % rows); 717 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
702 718
703 if (!IN_RANGE_EXC (row + count, 0, rows)) 719 if (!IN_RANGE_EXC (row + count, 0, rows))
704 scr_blank_screen_mem (buf [row], rstyle); 720 scr_blank_screen_mem (temp_buf [row], rstyle);
705 } 721 }
706 722
707 for (int row = 0; row < rows; row++) 723 for (int row = 0; row < rows; row++)
708 ROW(row1 + row) = buf [row]; 724 ROW(row1 + row) = temp_buf [row];
709 } 725 }
710 726
711 return count; 727 return count;
712} 728}
713 729
714/* ------------------------------------------------------------------------- */ 730/* ------------------------------------------------------------------------- */
715/* 731/*
716 * Add text given in <str> of length <len> to screen struct 732 * Add text given in <str> of length <len> to screen struct
717 */ 733 */
718void 734void
719rxvt_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)
720{ 736{
721 if (len <= 0) /* sanity */ 737 if (len <= 0) /* sanity */
722 return; 738 return;
723 739
724 unsigned char checksel; 740 unsigned char checksel;
725 unicode_t c; 741 unicode_t c;
726 int row, last_col; 742 int ncol = this->ncol;
727 const unicode_t *strend = str + len; 743 const wchar_t *strend = str + len;
728 744
729 want_refresh = 1; 745 want_refresh = 1;
730 ZERO_SCROLLBACK (); 746 ZERO_SCROLLBACK ();
731 last_col = ncol;
732 747
733 if (nlines > 0) 748 if (minlines > 0)
734 { 749 {
735 nlines += screen.cur.row - screen.bscroll; 750 minlines += screen.cur.row - screen.bscroll;
751
736 if ((nlines > 0) 752 if (minlines > 0
737 && (screen.tscroll == 0) 753 && screen.tscroll == 0
738 && (screen.bscroll == (nrow - 1))) 754 && screen.bscroll == nrow - 1)
739 { 755 {
740 /* _at least_ this many lines need to be scrolled */ 756 /* _at least_ this many lines need to be scrolled */
741 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 757 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
742 screen.cur.row -= nlines; 758 screen.cur.row -= minlines;
743 } 759 }
744 } 760 }
745 761
746#ifdef DEBUG_STRICT 762#ifdef DEBUG_STRICT
747 assert (screen.cur.col < last_col); 763 assert (screen.cur.col < ncol);
748 assert ((screen.cur.row < nrow) 764 assert (screen.cur.row < nrow
749 && (screen.cur.row >= - (int32_t)nsaved)); 765 && screen.cur.row >= top_row);
750#else /* drive with your eyes closed */
751 MIN_IT (screen.cur.col, last_col - 1);
752 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
753 MAX_IT (screen.cur.row, - (int32_t)nsaved);
754#endif 766#endif
755 row = screen.cur.row; 767 int row = screen.cur.row;
756 768
757 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 769 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
758 770
759 line_t *line = &ROW(row); 771 line_t *line = &ROW(row);
760 772
761 while (str < strend) 773 while (str < strend)
762 { 774 {
763 c = *str++; 775 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
764 776
765 if (c < 0x20) 777 if (c < 0x20)
766 if (c == C0_LF) 778 if (c == C0_LF)
767 { 779 {
768 if (!line->is_longer ()) /* XXX: think about this */
769 MAX_IT (line->l, screen.cur.col); 780 max_it (line->l, screen.cur.col);
770 781
771 screen.flags &= ~Screen_WrapNext; 782 screen.flags &= ~Screen_WrapNext;
772 783
773 if (screen.cur.row == screen.bscroll) 784 if (screen.cur.row == screen.bscroll)
774 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 785 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
778 line = &ROW(row); /* _must_ refresh */ 789 line = &ROW(row); /* _must_ refresh */
779 continue; 790 continue;
780 } 791 }
781 else if (c == C0_CR) 792 else if (c == C0_CR)
782 { 793 {
783 if (!line->is_longer ()) /* XXX: think about this */
784 MAX_IT (line->l, screen.cur.col); 794 max_it (line->l, screen.cur.col);
785 795
786 screen.flags &= ~Screen_WrapNext; 796 screen.flags &= ~Screen_WrapNext;
787 screen.cur.col = 0; 797 screen.cur.col = 0;
788 continue; 798 continue;
789 } 799 }
… …
806 CLEAR_SELECTION (); 816 CLEAR_SELECTION ();
807 } 817 }
808 818
809 if (screen.flags & Screen_WrapNext) 819 if (screen.flags & Screen_WrapNext)
810 { 820 {
821 max_it (line->l, ncol);
811 line->set_is_longer (); 822 line->is_longer (1);
812 823
813 scr_do_wrap (); 824 scr_do_wrap ();
814 825
815 row = screen.cur.row; 826 row = screen.cur.row;
816 line = &ROW(row); /* _must_ refresh */ 827 line = &ROW(row); /* _must_ refresh */
… …
824 // do wcwidth before further replacements, as wcwidth might return -1 835 // do wcwidth before further replacements, as wcwidth might return -1
825 // 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
826 // locale. 837 // locale.
827 int width = c < 0x100 ? 1 : wcwidth (c); 838 int width = c < 0x100 ? 1 : wcwidth (c);
828 839
829 if (charsets[screen.charset] == '0') // DEC SPECIAL 840 if (charsets [screen.charset] == '0') // DEC SPECIAL
830 { 841 {
831 // vt100 special graphics and line drawing 842 // vt100 special graphics and line drawing
832 // 5f-7e standard vt100 843 // 5f-7e standard vt100
833 // 40-5e rxvt extension for extra curses acs chars 844 // 40-5e rxvt extension for extra curses acs chars
834 static uint16_t vt100_0[62] = { // 41 .. 7e 845 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
886 } 897 }
887 898
888 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 899 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
889 900
890 // if the character doesn't fit into the remaining columns... 901 // if the character doesn't fit into the remaining columns...
891 if (screen.cur.col > last_col - width && last_col >= width) 902 if (screen.cur.col > ncol - width && ncol >= width)
892 { 903 {
893 // ...output spaces 904 // ...output spaces
894 c = ' '; 905 c = ' ';
895 // and try the same character next loop iteration 906 // and try the same character next loop iteration
896 --str; 907 --str;
897 } 908 }
898 909
910 line->touch ();
911
899 do 912 do
900 { 913 {
901 line->t[screen.cur.col] = c; 914 line->t[screen.cur.col] = c;
902 line->r[screen.cur.col] = rend; 915 line->r[screen.cur.col] = rend;
903 916
904 if (screen.cur.col < last_col - 1) 917 if (screen.cur.col < ncol - 1)
905 screen.cur.col++; 918 screen.cur.col++;
906 else 919 else
907 { 920 {
908 line->l = last_col; 921 line->l = ncol;
909 if (screen.flags & Screen_Autowrap) 922 if (screen.flags & Screen_Autowrap)
910 screen.flags |= Screen_WrapNext; 923 screen.flags |= Screen_WrapNext;
911 break; 924 break;
912 } 925 }
913 926
… …
915 } 928 }
916 while (--width > 0); 929 while (--width > 0);
917 930
918 // pad with spaces when overwriting wide character with smaller one 931 // pad with spaces when overwriting wide character with smaller one
919 if (!width) 932 if (!width)
933 {
934 line->touch ();
935
920 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++)
921 { 937 {
922 line->t[c] = ' '; 938 line->t[c] = ' ';
923 line->r[c] = rend; 939 line->r[c] = rend;
924 } 940 }
941 }
925 } 942 }
926 else // width == 0 943 else // width == 0
927 { 944 {
928#if ENABLE_COMBINING 945#if ENABLE_COMBINING
929 // handle combining characters 946 // handle combining characters
930 // we just tag the accent on the previous on-screen character. 947 // we just tag the accent on the previous on-screen character.
931 // this is arguably not correct, but also arguably not wrong. 948 // this is arguably not correct, but also arguably not wrong.
932 // we don't handle double-width characters nicely yet. 949 // we don't handle double-width characters nicely yet.
950 line_t *linep;
933 text_t *tp; 951 text_t *tp;
934 rend_t *rp; 952 rend_t *rp;
935 953
936 if (screen.cur.col > 0) 954 if (screen.cur.col > 0)
937 { 955 {
956 linep = line;
938 tp = line->t + screen.cur.col - 1; 957 tp = line->t + screen.cur.col - 1;
939 rp = line->r + screen.cur.col - 1; 958 rp = line->r + screen.cur.col - 1;
940
941 while (*tp == NOCHAR && tp > line->t)
942 tp--, rp--;
943 } 959 }
944 else if (screen.cur.row > 0 960 else if (screen.cur.row > 0
945 && ROW(screen.cur.row - 1).is_longer ()) 961 && ROW(screen.cur.row - 1).is_longer ())
946 { 962 {
947 line_t *line = &ROW(screen.cur.row - 1); 963 linep = &ROW(screen.cur.row - 1);
948
949 tp = line->t + last_col - 1; 964 tp = line->t + ncol - 1;
950 rp = line->r + last_col - 1; 965 rp = line->r + ncol - 1;
951
952 while (*tp == NOCHAR && tp > line->t)
953 tp--, rp--;
954 } 966 }
955 else 967 else
956 continue; 968 continue;
969
970 linep->touch ();
971
972 while (*tp == NOCHAR && tp > linep->t)
973 tp--, rp--;
957 974
958 // first try to find a precomposed character 975 // first try to find a precomposed character
959 unicode_t n = rxvt_compose (*tp, c); 976 unicode_t n = rxvt_compose (*tp, c);
960 if (n == NOCHAR) 977 if (n == NOCHAR)
961 n = rxvt_composite.compose (*tp, c); 978 n = rxvt_composite.compose (*tp, c);
… …
964 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 981 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
965#endif 982#endif
966 } 983 }
967 } 984 }
968 985
969 if (!line->is_longer ()) /* XXX: think about this */
970 MAX_IT (line->l, screen.cur.col); 986 max_it (line->l, screen.cur.col);
971 987
972#ifdef DEBUG_STRICT 988#ifdef DEBUG_STRICT
973 assert (screen.cur.row >= 0); 989 assert (screen.cur.row >= 0);
974#else /* drive with your eyes closed */
975 MAX_IT (screen.cur.row, 0);
976#endif 990#endif
977} 991}
978 992
979/* ------------------------------------------------------------------------- */ 993/* ------------------------------------------------------------------------- */
980/* 994/*
… …
1019 1033
1020 if (count == 0) 1034 if (count == 0)
1021 return; 1035 return;
1022 else if (count > 0) 1036 else if (count > 0)
1023 { 1037 {
1024 int row = screen.cur.row;
1025
1026 line_t &l = ROW(row); 1038 line_t &l = ROW(screen.cur.row);
1027 rend_t base_rend = l.r[i]; 1039 rend_t base_rend = l.r[i];
1028 ht &= l.t[i] == ' '; 1040 ht &= l.t[i] == ' ';
1029 1041
1030 for (; ++i < ncol; ) 1042 for (; ++i < ncol; )
1031 if (tabs[i]) 1043 if (tabs[i])
1032 { 1044 {
1033 x = i; 1045 x = i;
1046
1034 if (!--count) 1047 if (!--count)
1035 break; 1048 break;
1036 } 1049 }
1037 else 1050 else
1038 ht &= l.t[i] == ' ' 1051 ht &= l.t[i] == ' '
… …
1041 if (count) 1054 if (count)
1042 x = ncol - 1; 1055 x = ncol - 1;
1043 1056
1044 // store horizontal tab commands as characters inside the text 1057 // store horizontal tab commands as characters inside the text
1045 // buffer so they can be selected and pasted. 1058 // buffer so they can be selected and pasted.
1046 if (ht && options & Opt_pastableTabs) 1059 if (ht && OPTION (Opt_pastableTabs))
1047 { 1060 {
1048 base_rend = SET_FONT (base_rend, 0); 1061 base_rend = SET_FONT (base_rend, 0);
1049 1062
1050 if (!l.is_longer ()) /* XXX: think about this */ 1063 l.touch (x);
1051 MAX_IT (l.l, x);
1052 1064
1053 i = screen.cur.col; 1065 i = screen.cur.col;
1054 1066
1055 l.t[i] = '\t'; 1067 l.t[i] = '\t';
1056 l.r[i] = base_rend; 1068 l.r[i] = base_rend;
… …
1106 */ 1118 */
1107#if ENABLE_FRILLS 1119#if ENABLE_FRILLS
1108void 1120void
1109rxvt_term::scr_forwardindex () 1121rxvt_term::scr_forwardindex ()
1110{ 1122{
1111 int row;
1112
1113 if (screen.cur.col < ncol - 1) 1123 if (screen.cur.col < ncol - 1)
1114 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1115 else 1125 else
1116 { 1126 {
1117 row = screen.cur.row; 1127 line_t &l = ROW(screen.cur.row);
1118 1128
1119 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1129 l.touch ();
1120 ROW(row).l = ncol; 1130 l.is_longer (0);
1121 1131
1122 scr_gotorc (0, 0, R_RELATIVE); 1132 scr_gotorc (0, 0, R_RELATIVE);
1123 scr_insdel_chars (1, DELETE); 1133 scr_insdel_chars (1, DELETE);
1124 scr_gotorc (0, ncol - 1, R_RELATIVE); 1134 scr_gotorc (0, ncol - 1, R_RELATIVE);
1125 } 1135 }
… …
1135{ 1145{
1136 want_refresh = 1; 1146 want_refresh = 1;
1137 ZERO_SCROLLBACK (); 1147 ZERO_SCROLLBACK ();
1138 1148
1139 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1149 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1140 MAX_IT (screen.cur.col, 0); 1150 clamp_it (screen.cur.col, 0, ncol - 1);
1141 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1142 1151
1143 screen.flags &= ~Screen_WrapNext; 1152 screen.flags &= ~Screen_WrapNext;
1144 1153
1145 if (relative & R_RELATIVE) 1154 if (relative & R_RELATIVE)
1146 { 1155 {
… …
1164 else 1173 else
1165 { 1174 {
1166 if (screen.flags & Screen_Relative) 1175 if (screen.flags & Screen_Relative)
1167 { /* relative origin mode */ 1176 { /* relative origin mode */
1168 screen.cur.row = row + screen.tscroll; 1177 screen.cur.row = row + screen.tscroll;
1169 MIN_IT (screen.cur.row, screen.bscroll); 1178 min_it (screen.cur.row, screen.bscroll);
1170 } 1179 }
1171 else 1180 else
1172 screen.cur.row = row; 1181 screen.cur.row = row;
1173 } 1182 }
1174 1183
1175 MAX_IT (screen.cur.row, 0); 1184 clamp_it (screen.cur.row, 0, nrow - 1);
1176 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1177} 1185}
1178 1186
1179/* ------------------------------------------------------------------------- */ 1187/* ------------------------------------------------------------------------- */
1180/* 1188/*
1181 * direction should be UP or DN 1189 * direction should be UP or DN
… …
1196 || (screen.cur.row == screen.tscroll && direction == DN)) 1204 || (screen.cur.row == screen.tscroll && direction == DN))
1197 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1205 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1198 else 1206 else
1199 screen.cur.row += dirn; 1207 screen.cur.row += dirn;
1200 1208
1201 MAX_IT (screen.cur.row, 0); 1209 clamp_it (screen.cur.row, 0, nrow - 1);
1202 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1203 selection_check (0); 1210 selection_check (0);
1204} 1211}
1205 1212
1206/* ------------------------------------------------------------------------- */ 1213/* ------------------------------------------------------------------------- */
1207/* 1214/*
… …
1211 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1218 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1212 */ 1219 */
1213void 1220void
1214rxvt_term::scr_erase_line (int mode) 1221rxvt_term::scr_erase_line (int mode)
1215{ 1222{
1216 unsigned int row, col, num; 1223 unsigned int col, num;
1217 1224
1218 want_refresh = 1; 1225 want_refresh = 1;
1219 ZERO_SCROLLBACK (); 1226 ZERO_SCROLLBACK ();
1220 1227
1221 selection_check (1); 1228 selection_check (1);
1222 1229
1223 row = screen.cur.row; 1230 line_t &line = ROW(screen.cur.row);
1231
1232 line.touch ();
1233 line.is_longer (0);
1224 1234
1225 switch (mode) 1235 switch (mode)
1226 { 1236 {
1227 case 0: /* erase to end of line */ 1237 case 0: /* erase to end of line */
1228 col = screen.cur.col; 1238 col = screen.cur.col;
1229 num = ncol - col; 1239 num = ncol - col;
1230 MIN_IT (ROW(row).l, (int16_t)col); 1240 min_it (line.l, col);
1231 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1241 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1232 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1242 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1233 CLEAR_SELECTION (); 1243 CLEAR_SELECTION ();
1234 break; 1244 break;
1235 case 1: /* erase to beginning of line */ 1245 case 1: /* erase to beginning of line */
… …
1240 CLEAR_SELECTION (); 1250 CLEAR_SELECTION ();
1241 break; 1251 break;
1242 case 2: /* erase whole line */ 1252 case 2: /* erase whole line */
1243 col = 0; 1253 col = 0;
1244 num = ncol; 1254 num = ncol;
1245 ROW(row).l = 0; 1255 line.l = 0;
1246 if (selection.beg.row <= screen.cur.row 1256 if (selection.beg.row <= screen.cur.row
1247 && selection.end.row >= screen.cur.row) 1257 && selection.end.row >= screen.cur.row)
1248 CLEAR_SELECTION (); 1258 CLEAR_SELECTION ();
1249 break; 1259 break;
1250 default: 1260 default:
1251 return; 1261 return;
1252 } 1262 }
1253 1263
1254 scr_blank_line (ROW(row), col, num, rstyle); 1264 scr_blank_line (line, col, num, rstyle);
1255} 1265}
1256 1266
1257/* ------------------------------------------------------------------------- */ 1267/* ------------------------------------------------------------------------- */
1258/* 1268/*
1259 * Erase part of whole of the screen 1269 * Erase part of whole of the screen
… …
1302 CLEAR_SELECTION (); 1312 CLEAR_SELECTION ();
1303 1313
1304 if (row >= nrow) /* Out Of Bounds */ 1314 if (row >= nrow) /* Out Of Bounds */
1305 return; 1315 return;
1306 1316
1307 MIN_IT (num, (nrow - row)); 1317 min_it (num, nrow - row);
1308 1318
1309 if (rstyle & (RS_RVid | RS_Uline)) 1319 if (rstyle & (RS_RVid | RS_Uline))
1310 ren = (rend_t) ~RS_None; 1320 ren = (rend_t) ~RS_None;
1311 else if (GET_BASEBG (rstyle) == Color_bg) 1321 else if (GET_BASEBG (rstyle) == Color_bg)
1312 { 1322 {
… …
1314 CLEAR_ROWS (row, num); 1324 CLEAR_ROWS (row, num);
1315 } 1325 }
1316 else 1326 else
1317 { 1327 {
1318 ren = rstyle & (RS_fgMask | RS_bgMask); 1328 ren = rstyle & (RS_fgMask | RS_bgMask);
1319 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1320 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1330 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1321 ERASE_ROWS (row, num); 1331 ERASE_ROWS (row, num);
1322 gcvalue.foreground = pix_colors[Color_fg]; 1332 gcvalue.foreground = pix_colors[Color_fg];
1323 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1324 } 1334 }
1325 1335
1326 for (; num--; row++) 1336 for (; num--; row++)
1327 { 1337 {
1328 scr_blank_screen_mem (ROW (row), rstyle); 1338 scr_blank_screen_mem (ROW(row), rstyle);
1329 ROW (row).l = 0;
1330 scr_blank_line (drawn[row], 0, ncol, ren); 1339 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1331 } 1340 }
1332} 1341}
1333 1342
1334#if ENABLE_FRILLS 1343#if ENABLE_FRILLS
1335void 1344void
1336rxvt_term::scr_erase_savelines () 1345rxvt_term::scr_erase_savelines ()
1337{ 1346{
1338 want_refresh = 1; 1347 want_refresh = 1;
1339 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1340 1349
1341 nsaved = 0; 1350 top_row = 0;
1342} 1351}
1343#endif 1352#endif
1344 1353
1345/* ------------------------------------------------------------------------- */ 1354/* ------------------------------------------------------------------------- */
1346/* 1355/*
… …
1367 rend_t *r1 = line.r; 1376 rend_t *r1 = line.r;
1368 1377
1369 for (int j = ncol; j--; ) 1378 for (int j = ncol; j--; )
1370 *r1++ = fs; 1379 *r1++ = fs;
1371 1380
1372 line.l = ncol; /* make the `E's selectable */ 1381 line.is_longer (0);
1382 line.touch (ncol);
1373 } 1383 }
1374} 1384}
1375 1385
1376/* ------------------------------------------------------------------------- */ 1386/* ------------------------------------------------------------------------- */
1377/* 1387/*
… …
1420 return; 1430 return;
1421 1431
1422 scr_do_wrap (); 1432 scr_do_wrap ();
1423 1433
1424 selection_check (1); 1434 selection_check (1);
1425 MIN_IT (count, (ncol - screen.cur.col)); 1435 min_it (count, ncol - screen.cur.col);
1426 1436
1427 row = screen.cur.row; 1437 row = screen.cur.row;
1428 1438
1429 line_t *line = &ROW(row); 1439 line_t *line = &ROW(row);
1440
1441 line->touch ();
1442 line->is_longer (0);
1430 1443
1431 switch (insdel) 1444 switch (insdel)
1432 { 1445 {
1433 case INSERT: 1446 case INSERT:
1434 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1435 { 1448 {
1436 line->t[col] = line->t[col - count]; 1449 line->t[col] = line->t[col - count];
1437 line->r[col] = line->r[col - count]; 1450 line->r[col] = line->r[col - count];
1438 } 1451 }
1439 1452
1440 if (!line->is_longer ()) 1453 line->l = min (line->l + count, ncol);
1441 {
1442 line->l += count;
1443 MIN_IT (line->l, ncol);
1444 }
1445 1454
1446 if (selection.op && current_screen == selection.screen 1455 if (selection.op && current_screen == selection.screen
1447 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1448 { 1457 {
1449 if (selection.end.row != screen.cur.row 1458 if (selection.end.row != screen.cur.row
… …
1462 1471
1463 case ERASE: 1472 case ERASE:
1464 screen.cur.col += count; /* don't worry if > ncol */ 1473 screen.cur.col += count; /* don't worry if > ncol */
1465 selection_check (1); 1474 selection_check (1);
1466 screen.cur.col -= count; 1475 screen.cur.col -= count;
1476
1477 line->l = max (line->l - count, 0);
1467 scr_blank_line (*line, screen.cur.col, count, rstyle); 1478 scr_blank_line (*line, screen.cur.col, count, rstyle);
1468 break; 1479 break;
1469 1480
1470 case DELETE: 1481 case DELETE:
1471 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1474 { 1485 {
1475 line->t[col] = line->t[col + count]; 1486 line->t[col] = line->t[col + count];
1476 line->r[col] = line->r[col + count]; 1487 line->r[col] = line->r[col + count];
1477 } 1488 }
1478 1489
1490 line->l = max (line->l - count, 0);
1479 scr_blank_line (*line, ncol - count, count, tr); 1491 scr_blank_line (*line, ncol - count, count, tr);
1480
1481 if (line->is_longer ()) /* break line continuation */
1482 line->l = ncol;
1483
1484 line->l = max (line->l - count, 0);
1485 1492
1486 if (selection.op && current_screen == selection.screen 1493 if (selection.op && current_screen == selection.screen
1487 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1488 { 1495 {
1489 if (selection.end.row != screen.cur.row 1496 if (selection.end.row != screen.cur.row
… …
1509 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1516 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1510 */ 1517 */
1511void 1518void
1512rxvt_term::scr_scroll_region (int top, int bot) 1519rxvt_term::scr_scroll_region (int top, int bot)
1513{ 1520{
1514 MAX_IT (top, 0); 1521 max_it (top, 0);
1515 MIN_IT (bot, (int)nrow - 1); 1522 min_it (bot, nrow - 1);
1516 1523
1517 if (top > bot) 1524 if (top > bot)
1518 return; 1525 return;
1519 1526
1520 screen.tscroll = top; 1527 screen.tscroll = top;
… …
1601rxvt_term::scr_set_tab (int mode) 1608rxvt_term::scr_set_tab (int mode)
1602{ 1609{
1603 if (mode < 0) 1610 if (mode < 0)
1604 memset (tabs, 0, ncol * sizeof (char)); 1611 memset (tabs, 0, ncol * sizeof (char));
1605 else if (screen.cur.col < ncol) 1612 else if (screen.cur.col < ncol)
1606 tabs[screen.cur.col] = (mode ? 1 : 0); 1613 tabs [screen.cur.col] = !!mode;
1607} 1614}
1608 1615
1609/* ------------------------------------------------------------------------- */ 1616/* ------------------------------------------------------------------------- */
1610/* 1617/*
1611 * Set reverse/normal video 1618 * Set reverse/normal video
… …
1618 XGCValues gcvalue; 1625 XGCValues gcvalue;
1619 1626
1620 if (rvideo != mode) 1627 if (rvideo != mode)
1621 { 1628 {
1622 rvideo = mode; 1629 rvideo = mode;
1623 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1624#if XPM_BACKGROUND 1631#if XPM_BACKGROUND
1625 if (bgPixmap.pixmap == None) 1632 if (bgPixmap.pixmap == None)
1626#endif 1633#endif
1627#if TRANSPARENT 1634#if TRANSPARENT
1628 if (! (options & Opt_transparent) || am_transparent == 0) 1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1629#endif 1636#endif
1630 XSetWindowBackground (display->display, vt, 1637 XSetWindowBackground (display->display, vt,
1631 pix_colors[Color_bg]); 1638 pix_colors[Color_bg]);
1632 1639
1633 gcvalue.foreground = pix_colors[Color_fg]; 1640 gcvalue.foreground = pix_colors[Color_fg];
… …
1658 * Set font style 1665 * Set font style
1659 */ 1666 */
1660void 1667void
1661rxvt_term::set_font_style () 1668rxvt_term::set_font_style ()
1662{ 1669{
1670#if 0
1663 switch (charsets[screen.charset]) 1671 switch (charsets [screen.charset])
1664 { 1672 {
1665 case '0': /* DEC Special Character & Line Drawing Set */ 1673 case '0': /* DEC Special Character & Line Drawing Set */
1666 break; 1674 break;
1667 case 'A': /* United Kingdom (UK) */ 1675 case 'A': /* United Kingdom (UK) */
1668 break; 1676 break;
… …
1675 case 'C': /* Finnish character set */ 1683 case 'C': /* Finnish character set */
1676 break; 1684 break;
1677 case 'K': /* German character set */ 1685 case 'K': /* German character set */
1678 break; 1686 break;
1679 } 1687 }
1688#endif
1680} 1689}
1681 1690
1682/* ------------------------------------------------------------------------- */ 1691/* ------------------------------------------------------------------------- */
1683/* 1692/*
1684 * Choose a font 1693 * Choose a font
… …
1724 bool found = false; 1733 bool found = false;
1725 1734
1726 for (int i = 0; i < nrow; i++) 1735 for (int i = 0; i < nrow; i++)
1727 { 1736 {
1728 int col = 0; 1737 int col = 0;
1729 rend_t *drp = drawn[i].r; 1738 rend_t *drp = drawn_buf[i].r;
1730 1739
1731 for (; col < ncol; col++, drp++) 1740 for (; col < ncol; col++, drp++)
1732 if ((*drp & mask) == value) 1741 if ((*drp & mask) == value)
1733 { 1742 {
1734 found = true; 1743 found = true;
… …
1752rxvt_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)
1753{ 1762{
1754 int i; 1763 int i;
1755 row_col_t rc[RC_COUNT]; 1764 row_col_t rc[RC_COUNT];
1756 1765
1757 if (!drawn) /* sanity check */ 1766 if (!drawn_buf) /* sanity check */
1758 return; 1767 return;
1759 1768
1760#ifndef NO_SLOW_LINK_SUPPORT 1769#ifndef NO_SLOW_LINK_SUPPORT
1761 if (refresh_type == FAST_REFRESH && !display->is_local) 1770 if (refresh_type == FAST_REFRESH && !display->is_local)
1762 { 1771 {
1763 y = 0; 1772 y = 0;
1764 eheight = height; 1773 eheight = height;
1765 } 1774 }
1766#endif
1767
1768#ifdef DEBUG_STRICT
1769 x = max (x, 0);
1770 x = min (x, (int)width);
1771 y = max (y, 0);
1772 y = min (y, (int)height);
1773#endif 1775#endif
1774 1776
1775 /* round down */ 1777 /* round down */
1776 rc[PART_BEG].col = Pixel2Col (x); 1778 rc[PART_BEG].col = Pixel2Col (x);
1777 rc[PART_BEG].row = Pixel2Row (y); 1779 rc[PART_BEG].row = Pixel2Row (y);
… …
1780 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1782 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1781 1783
1782 /* sanity checks */ 1784 /* sanity checks */
1783 for (i = PART_BEG; i < RC_COUNT; i++) 1785 for (i = PART_BEG; i < RC_COUNT; i++)
1784 { 1786 {
1785 MIN_IT (rc[i].col, ncol - 1); 1787 min_it (rc[i].col, ncol - 1);
1786 MIN_IT (rc[i].row, nrow - 1); 1788 min_it (rc[i].row, nrow - 1);
1787 } 1789 }
1788 1790
1789 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++)
1790 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);
1791 1793
1792 if (refresh) 1794 if (refresh)
1793 scr_refresh (SLOW_REFRESH); 1795 scr_refresh (SLOW_REFRESH);
1794} 1796}
1795 1797
… …
1806/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1807/* 1809/*
1808 * 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
1809 * the top of the screen 1811 * the top of the screen
1810 */ 1812 */
1811int 1813void
1812rxvt_term::scr_move_to (int y, int len) 1814rxvt_term::scr_move_to (int y, int len)
1813{ 1815{
1814 long p = 0; 1816 int p = (top_row - nrow) * (len - y) / len + (nrow - 1);
1815 unsigned int oldviewstart;
1816 1817
1817 oldviewstart = view_start; 1818 scr_changeview (p);
1818
1819 if (y < len)
1820 {
1821 p = (nrow + nsaved) * (len - y) / len;
1822 p -= (long) (nrow - 1);
1823 p = max (p, 0);
1824 }
1825
1826 view_start = (unsigned int)min (p, nsaved);
1827
1828 return scr_changeview (oldviewstart);
1829} 1819}
1830 1820
1831/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1832/* 1822/*
1833 * Page the screen up/down nlines 1823 * Page the screen up/down nlines
1834 * direction should be UP or DN 1824 * direction should be UP or DN
1835 */ 1825 */
1836int 1826bool
1837rxvt_term::scr_page (enum page_dirn direction, int nlines) 1827rxvt_term::scr_page (enum page_dirn direction, int nlines)
1838{ 1828{
1839 int n; 1829 int new_view_start =
1840 unsigned int oldviewstart; 1830 direction == UP ? view_start - nlines
1831 : view_start + nlines;
1841 1832
1833 return scr_changeview (new_view_start);
1834}
1835
1836bool
1837rxvt_term::scr_changeview (int new_view_start)
1838{
1839 clamp_it (new_view_start, top_row, 0);
1840
1841 if (new_view_start != view_start)
1842 {
1843 num_scr += new_view_start - view_start;
1842 oldviewstart = view_start; 1844 view_start = new_view_start;
1845 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1846 want_refresh = 1;
1843 1847
1844 if (direction == UP) 1848 return true;
1845 {
1846 n = view_start + nlines;
1847 view_start = min (n, nsaved);
1848 } 1849 }
1849 else 1850 else
1850 { 1851 return false;
1851 n = view_start - nlines;
1852 view_start = max (n, 0);
1853 }
1854
1855 return scr_changeview (oldviewstart);
1856}
1857
1858int
1859rxvt_term::scr_changeview (unsigned int oldviewstart)
1860{
1861 if (view_start != oldviewstart)
1862 {
1863 want_refresh = 1;
1864 num_scr -= (view_start - oldviewstart);
1865 }
1866
1867 return (int) (view_start - oldviewstart);
1868} 1852}
1869 1853
1870/* ------------------------------------------------------------------------- */ 1854/* ------------------------------------------------------------------------- */
1871void 1855void
1872rxvt_term::scr_bell () 1856rxvt_term::scr_bell ()
1873{ 1857{
1874#ifndef NO_BELL 1858#ifndef NO_BELL
1875 1859
1876# ifndef NO_MAPALERT 1860# ifndef NO_MAPALERT
1877# ifdef MAPALERT_OPTION 1861# ifdef MAPALERT_OPTION
1878 if (options & Opt_mapAlert) 1862 if (OPTION (Opt_mapAlert))
1879# endif 1863# endif
1880 XMapWindow (display->display, parent[0]); 1864 XMapWindow (display->display, parent[0]);
1881# endif 1865# endif
1882 1866
1883 if (options & Opt_visualBell) 1867 if (OPTION (Opt_visualBell))
1884 { 1868 {
1885 scr_rvideo_mode (!rvideo); /* refresh also done */ 1869 scr_rvideo_mode (!rvideo); /* refresh also done */
1870 display->flush ();
1886 rxvt_usleep (VISUAL_BELL_DURATION); 1871 rxvt_usleep (VISUAL_BELL_DURATION);
1887 scr_rvideo_mode (!rvideo); /* refresh also done */ 1872 scr_rvideo_mode (!rvideo); /* refresh also done */
1888 } 1873 }
1889 else 1874 else
1890 XBell (display->display, 0); 1875 XBell (display->display, 0);
… …
1904 if ((fd = popen_printer ()) == NULL) 1889 if ((fd = popen_printer ()) == NULL)
1905 return; 1890 return;
1906 1891
1907 if (fullhist) 1892 if (fullhist)
1908 { 1893 {
1909 nrows = nrow + nsaved; 1894 nrows = nrow - top_row;
1910 row_start = -nsaved; 1895 row_start = top_row;
1911 } 1896 }
1912 else 1897 else
1913 { 1898 {
1914 nrows = nrow; 1899 nrows = nrow;
1915 row_start = -view_start; 1900 row_start = view_start;
1916 } 1901 }
1917 1902
1918 wctomb (0, 0); 1903 wctomb (0, 0);
1919 1904
1920 for (int r1 = 0; r1 < nrows; r1++) 1905 for (int r1 = 0; r1 < nrows; r1++)
… …
1958{ 1943{
1959 unsigned char must_clear, /* use draw_string not draw_image_string */ 1944 unsigned char must_clear, /* use draw_string not draw_image_string */
1960 showcursor; /* show the cursor */ 1945 showcursor; /* show the cursor */
1961 int16_t col, row, /* column/row we're processing */ 1946 int16_t col, row, /* column/row we're processing */
1962 ocrow; /* old cursor row */ 1947 ocrow; /* old cursor row */
1963 int i, /* tmp */ 1948 int i; /* tmp */
1964 row_offset; /* basic offset in screen structure */
1965#ifndef NO_CURSORCOLOR 1949#ifndef NO_CURSORCOLOR
1966 rend_t cc1; /* store colours at cursor position (s) */ 1950 rend_t cc1; /* store colours at cursor position (s) */
1967#endif 1951#endif
1968 rend_t *crp; // cursor rendition pointer 1952 rend_t *crp; // cursor rendition pointer
1969 1953
… …
1976 * A: set up vars 1960 * A: set up vars
1977 */ 1961 */
1978 must_clear = 0; 1962 must_clear = 0;
1979 refresh_count = 0; 1963 refresh_count = 0;
1980 1964
1981 row_offset = term_start - view_start;
1982
1983#if XPM_BACKGROUND 1965#if XPM_BACKGROUND
1984 must_clear |= bgPixmap.pixmap != None; 1966 must_clear |= bgPixmap.pixmap != None;
1985#endif 1967#endif
1986#if TRANSPARENT 1968#if TRANSPARENT
1987 must_clear |= (options & Opt_transparent) && am_transparent; 1969 must_clear |= OPTION (Opt_transparent) && am_transparent;
1988#endif 1970#endif
1989 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1971 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1990 1972
1991 /* 1973 /*
1992 * B: reverse any characters which are selected 1974 * B: reverse any characters which are selected
… …
2016 1998
2017 crp = &ROW(screen.cur.row).r[col]; 1999 crp = &ROW(screen.cur.row).r[col];
2018 2000
2019 if (showcursor && focus) 2001 if (showcursor && focus)
2020 { 2002 {
2021 if (options & Opt_cursorUnderline) 2003 if (OPTION (Opt_cursorUnderline))
2022 *crp ^= RS_Uline; 2004 *crp ^= RS_Uline;
2023 else 2005 else
2024 { 2006 {
2025 *crp ^= RS_RVid; 2007 *crp ^= RS_RVid;
2026 2008
… …
2028 cc1 = *crp & (RS_fgMask | RS_bgMask); 2010 cc1 = *crp & (RS_fgMask | RS_bgMask);
2029 if (ISSET_PIXCOLOR (Color_cursor)) 2011 if (ISSET_PIXCOLOR (Color_cursor))
2030 ccol1 = Color_cursor; 2012 ccol1 = Color_cursor;
2031 else 2013 else
2032#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2033 ccol1 = GET_FGCOLOR (rstyle); 2015 ccol1 = fgcolor_of (rstyle);
2034#else 2016#else
2035 ccol1 = Color_fg; 2017 ccol1 = Color_fg;
2036#endif 2018#endif
2037 if (ISSET_PIXCOLOR (Color_cursor2)) 2019 if (ISSET_PIXCOLOR (Color_cursor2))
2038 ccol2 = Color_cursor2; 2020 ccol2 = Color_cursor2;
2039 else 2021 else
2040#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2022#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2041 ccol2 = GET_BGCOLOR (rstyle); 2023 ccol2 = bgcolor_of (rstyle);
2042#else 2024#else
2043 ccol2 = Color_bg; 2025 ccol2 = Color_bg;
2044#endif 2026#endif
2045 *crp = SET_FGCOLOR (*crp, ccol1); 2027 *crp = SET_FGCOLOR (*crp, ccol1);
2046 *crp = SET_BGCOLOR (*crp, ccol2); 2028 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2051 2033
2052 /* make sure no outline cursor is left around */ 2034 /* make sure no outline cursor is left around */
2053 setoldcursor = 0; 2035 setoldcursor = 0;
2054 if (ocrow != -1) 2036 if (ocrow != -1)
2055 { 2037 {
2056 if (screen.cur.row + view_start != ocrow 2038 if (screen.cur.row - view_start != ocrow
2057 || screen.cur.col != oldcursor.col) 2039 || screen.cur.col != oldcursor.col)
2058 { 2040 {
2059 if (ocrow < nrow 2041 if (ocrow < nrow
2060 && oldcursor.col < ncol) 2042 && oldcursor.col < ncol)
2061 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2043 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2062 2044
2063 if (focus || !showcursor) 2045 if (focus || !showcursor)
2064 oldcursor.row = -1; 2046 oldcursor.row = -1;
2065 else 2047 else
2066 setoldcursor = 1; 2048 setoldcursor = 1;
… …
2069 else if (!focus) 2051 else if (!focus)
2070 setoldcursor = 1; 2052 setoldcursor = 1;
2071 2053
2072 if (setoldcursor) 2054 if (setoldcursor)
2073 { 2055 {
2074 if (screen.cur.row + view_start >= nrow) 2056 if (screen.cur.row - view_start >= nrow)
2075 oldcursor.row = -1; 2057 oldcursor.row = -1;
2076 else 2058 else
2077 { 2059 {
2078 oldcursor.row = screen.cur.row + view_start; 2060 oldcursor.row = screen.cur.row - view_start;
2079 oldcursor.col = screen.cur.col; 2061 oldcursor.col = screen.cur.col;
2080 } 2062 }
2081 } 2063 }
2082 } 2064 }
2083 2065
2066 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2084#if ENABLE_OVERLAY 2067#if ENABLE_OVERLAY
2085 scr_swap_overlay (); 2068 scr_swap_overlay ();
2086#endif 2069#endif
2087 2070
2088#ifndef NO_SLOW_LINK_SUPPORT 2071#ifndef NO_SLOW_LINK_SUPPORT
… …
2104 row = i > 0 ? 0 : j - 1; 2087 row = i > 0 ? 0 : j - 1;
2105 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2088 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2106 { 2089 {
2107 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2090 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2108 { 2091 {
2109 line_t s = save[(row + row_offset) % total_rows]; 2092 line_t s = ROW(view_start + row);
2110 line_t d = drawn[row]; 2093 line_t d = drawn_buf[row];
2111 line_t d2 = drawn[row + i]; 2094 line_t d2 = drawn_buf[row + i];
2112 2095
2113 for (nits = 0, col = ncol; col--; ) 2096 for (nits = 0, col = ncol; col--; )
2114 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2097 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2115 nits--; 2098 nits--;
2116 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2099 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2134 2117
2135 if (len != -1) 2118 if (len != -1)
2136 { 2119 {
2137 /* also comes here at end if needed because of >= above */ 2120 /* also comes here at end if needed because of >= above */
2138 if (wlen < len) 2121 if (wlen < len)
2139 SWAP_IT (wlen, len, int); 2122 ::swap (wlen, len);
2140 2123
2141 XCopyArea (display->display, vt, vt, 2124 XCopyArea (display->display, vt, vt,
2142 gc, 0, Row2Pixel (len + i), 2125 gc, 0, Row2Pixel (len + i),
2143 (unsigned int)TermWin_TotalWidth (), 2126 (unsigned int)this->width,
2144 (unsigned int)Height2Pixel (wlen - len + 1), 2127 (unsigned int)Height2Pixel (wlen - len + 1),
2145 0, Row2Pixel (len)); 2128 0, Row2Pixel (len));
2146 len = -1; 2129 len = -1;
2147 } 2130 }
2148 } 2131 }
… …
2152 /* 2135 /*
2153 * E: main pass across every character 2136 * E: main pass across every character
2154 */ 2137 */
2155 for (row = 0; row < nrow; row++) 2138 for (row = 0; row < nrow; row++)
2156 { 2139 {
2157 text_t *stp = save[(row + row_offset) % total_rows].t; 2140 text_t *stp = ROW(view_start + row).t;
2158 rend_t *srp = save[(row + row_offset) % total_rows].r; 2141 rend_t *srp = ROW(view_start + row).r;
2159 text_t *dtp = drawn[row].t; 2142 text_t *dtp = drawn_buf[row].t;
2160 rend_t *drp = drawn[row].r; 2143 rend_t *drp = drawn_buf[row].r;
2161 2144
2162 /* 2145 /*
2163 * E2: OK, now the real pass 2146 * E2: OK, now the real pass
2164 */ 2147 */
2165 int ypixel = (int)Row2Pixel (row); 2148 int ypixel = (int)Row2Pixel (row);
… …
2227 count++, i--; 2210 count++, i--;
2228 2211
2229 /* 2212 /*
2230 * Determine the attributes for the string 2213 * Determine the attributes for the string
2231 */ 2214 */
2232 int fore = GET_FGCOLOR (rend); // desired foreground 2215 int fore = fgcolor_of (rend); // desired foreground
2233 int back = GET_BGCOLOR (rend); // desired background 2216 int back = bgcolor_of (rend); // desired background
2234 2217
2235 // only do special processing if any attributes are set, which is rare 2218 // only do special processing if any attributes are set, which is unlikely
2236 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2219 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2237 { 2220 {
2238#if ENABLE_STYLES 2221#if ENABLE_STYLES
2239 // force redraw after "careful" characters to avoid pixel droppings 2222 // force redraw after "careful" characters to avoid pixel droppings
2240 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2223 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2276 fore = Color_UL; 2259 fore = Color_UL;
2277#endif 2260#endif
2278 2261
2279 if (invert) 2262 if (invert)
2280 { 2263 {
2281 SWAP_IT (fore, back, int); 2264 ::swap (fore, back);
2282 2265
2283#ifndef NO_BOLD_UNDERLINE_REVERSE 2266#ifndef NO_BOLD_UNDERLINE_REVERSE
2284 if (ISSET_PIXCOLOR (Color_RV)) 2267 if (ISSET_PIXCOLOR (Color_RV))
2285 back = Color_RV; 2268 back = Color_RV;
2286 2269
… …
2351 } /* for (row....) */ 2334 } /* for (row....) */
2352 2335
2353#if ENABLE_OVERLAY 2336#if ENABLE_OVERLAY
2354 scr_swap_overlay (); 2337 scr_swap_overlay ();
2355#endif 2338#endif
2339 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2356 2340
2357 /* 2341 /*
2358 * G: cleanup cursor and display outline cursor if necessary 2342 * G: cleanup cursor and display outline cursor if necessary
2359 */ 2343 */
2360 if (showcursor) 2344 if (showcursor)
2361 { 2345 {
2362 if (focus) 2346 if (focus)
2363 { 2347 {
2364 if (options & Opt_cursorUnderline) 2348 if (OPTION (Opt_cursorUnderline))
2365 *crp ^= RS_Uline; 2349 *crp ^= RS_Uline;
2366 else 2350 else
2367 { 2351 {
2368 *crp ^= RS_RVid; 2352 *crp ^= RS_RVid;
2369#ifndef NO_CURSORCOLOR 2353#ifndef NO_CURSORCOLOR
… …
2378 2362
2379 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2363 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2380 col--; 2364 col--;
2381 2365
2382 while (col + cursorwidth < ncol 2366 while (col + cursorwidth < ncol
2383 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2367 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2384 cursorwidth++; 2368 cursorwidth++;
2385 2369
2386#ifndef NO_CURSORCOLOR 2370#ifndef NO_CURSORCOLOR
2387 if (ISSET_PIXCOLOR (Color_cursor)) 2371 if (ISSET_PIXCOLOR (Color_cursor))
2388 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2372 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2399 /* 2383 /*
2400 * H: cleanup selection 2384 * H: cleanup selection
2401 */ 2385 */
2402 scr_reverse_selection (); 2386 scr_reverse_selection ();
2403 2387
2404 if (refresh_type & SMOOTH_REFRESH)
2405 XFlush (display->display);
2406
2407 num_scr = 0; 2388 num_scr = 0;
2408 num_scr_allow = 1; 2389 num_scr_allow = 1;
2409} 2390}
2410 2391
2411void 2392void
2412rxvt_term::scr_remap_chars (const line_t &l) 2393rxvt_term::scr_remap_chars (line_t &l)
2413{ 2394{
2414 if (!l.t) 2395 if (!l.t)
2415 return; 2396 return;
2416 2397
2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2399
2417 for (int i = ncol; i--; ) 2400 for (int i = ncol; i--; )
2418 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2401 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2419} 2402}
2420 2403
2421void 2404void
2422rxvt_term::scr_remap_chars () 2405rxvt_term::scr_remap_chars ()
2423{ 2406{
2424 for (int i = total_rows; i--; ) 2407 for (int i = total_rows; i--; )
2425 scr_remap_chars (save[i]); 2408 scr_remap_chars (row_buf [i]);
2426 2409
2427 for (int i = nrow; i--; ) 2410 for (int i = nrow; i--; )
2428 { 2411 {
2429 scr_remap_chars (drawn[i]); 2412 scr_remap_chars (drawn_buf [i]);
2430 scr_remap_chars (swap_save[i]); 2413 scr_remap_chars (swap_buf [i]);
2431 } 2414 }
2432} 2415}
2433 2416
2434void 2417void
2435rxvt_term::scr_recolour () 2418rxvt_term::scr_recolour ()
… …
2473 2456
2474 if (really) 2457 if (really)
2475 XClearWindow (display->display, vt); 2458 XClearWindow (display->display, vt);
2476} 2459}
2477 2460
2461void
2462rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2463{
2464 int view_end = view_start + nrow;
2465 int row, col;
2466
2467 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2468 {
2469 text_t *stp = ROW(row).t;
2470 rend_t *srp = ROW(row).r;
2471
2472 for (col = beg_col; col < end_col; col++)
2473 srp[col] ^= rstyle1;
2474
2475 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2476 srp[col] ^= rstyle2;
2477
2478 if (++col < end_col)
2479 srp[col] ^= rstyle2;
2480 }
2481}
2482
2483void
2484rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2485{
2486 int view_end = view_start + nrow;
2487 int row, col;
2488
2489 if (beg_row >= view_start)
2490 {
2491 col = beg_col;
2492 row = beg_row;
2493 }
2494 else
2495 {
2496 col = 0;
2497 row = view_start;
2498 }
2499
2500 for (; row < min (end_row, view_end); row++, col = 0)
2501 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2502 srp[col] ^= rstyle;
2503
2504 if (row == end_row)
2505 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2506 srp[col] ^= rstyle;
2507}
2508
2478/* ------------------------------------------------------------------------- */ 2509/* ------------------------------------------------------------------------- */
2479void 2510void
2480rxvt_term::scr_reverse_selection () 2511rxvt_term::scr_reverse_selection ()
2481{ 2512{
2482 if (selection.op 2513 if (selection.op
2483 && current_screen == selection.screen 2514 && current_screen == selection.screen
2484 && selection.end.row >= -view_start) 2515 && selection.end.row >= view_start)
2485 { 2516 {
2486 int view_end = -view_start + nrow;
2487 int row, col;
2488
2489#if ENABLE_FRILLS 2517#if ENABLE_FRILLS
2490 if (selection.rect) 2518 if (selection.rect)
2491 { 2519 scr_xor_rect (selection.beg.row, selection.beg.col,
2492 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2520 selection.end.row, selection.end.col,
2493 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2521 RS_RVid, RS_RVid | RS_Uline);
2494 srp[col] ^= RS_RVid;
2495 }
2496 else 2522 else
2497#endif 2523#endif
2498 { 2524 scr_xor_span (selection.beg.row, selection.beg.col,
2499 if (selection.beg.row >= -view_start) 2525 selection.end.row, selection.end.col,
2500 { 2526 RS_RVid);
2501 col = selection.beg.col;
2502 row = selection.beg.row;
2503 }
2504 else
2505 {
2506 col = 0;
2507 row = view_start;
2508 }
2509
2510 for (; row < min (selection.end.row, view_end); row++, col = 0)
2511 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2512 srp[col] ^= RS_RVid;
2513
2514 if (row == selection.end.row)
2515 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2516 srp[col] ^= RS_RVid;
2517 }
2518 } 2527 }
2519} 2528}
2520 2529
2521/* ------------------------------------------------------------------------- */ 2530/* ------------------------------------------------------------------------- */
2522/* 2531/*
… …
2532 char r1[] = "\n"; 2541 char r1[] = "\n";
2533 2542
2534 for (row = saveLines - nsaved; 2543 for (row = saveLines - nsaved;
2535 row < saveLines + nrow - 1; row++) 2544 row < saveLines + nrow - 1; row++)
2536 { 2545 {
2537 width = save[row].l >= 0 ? save[row].l 2546 width = row_buf[row].l >= 0 ? row_buf[row].l
2538 : ncol; 2547 : ncol;
2539 for (towrite = width; towrite; towrite -= wrote) 2548 for (towrite = width; towrite; towrite -= wrote)
2540 { 2549 {
2541 wrote = write (fd, & (save[row].t[width - towrite]), 2550 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2542 towrite); 2551 towrite);
2543 if (wrote < 0) 2552 if (wrote < 0)
2544 return; /* XXX: death, no report */ 2553 return; /* XXX: death, no report */
2545 } 2554 }
2546 if (save[row].l >= 0) 2555 if (row_buf[row].l >= 0)
2547 if (write (fd, r1, 1) <= 0) 2556 if (write (fd, r1, 1) <= 0)
2548 return; /* XXX: death, no report */ 2557 return; /* XXX: death, no report */
2549 } 2558 }
2550} 2559}
2551#endif 2560#endif
… …
2560 2569
2561 if (!selection.op) 2570 if (!selection.op)
2562 return; 2571 return;
2563 2572
2564 pos.row = pos.col = 0; 2573 pos.row = pos.col = 0;
2565 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2574 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2566 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2575 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2567 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2576 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2568 || (check_more == 1 2577 || (check_more == 1
2569 && current_screen == selection.screen 2578 && current_screen == selection.screen
2570 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2579 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2571 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2580 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2572 || (check_more == 2 2581 || (check_more == 2
… …
2583/* ------------------------------------------------------------------------- */ 2592/* ------------------------------------------------------------------------- */
2584/* 2593/*
2585 * Paste a selection direct to the command fd 2594 * Paste a selection direct to the command fd
2586 */ 2595 */
2587void 2596void
2588rxvt_term::paste (unsigned char *data, unsigned int len) 2597rxvt_term::paste (char *data, unsigned int len)
2589{ 2598{
2590 /* convert normal newline chars into common keyboard Return key sequence */ 2599 /* convert normal newline chars into common keyboard Return key sequence */
2591 for (unsigned int i = 0; i < len; i++) 2600 for (unsigned int i = 0; i < len; i++)
2592 if (data[i] == C0_LF) 2601 if (data[i] == C0_LF)
2593 data[i] = C0_CR; 2602 data[i] = C0_CR;
… …
2737 { 2746 {
2738 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2747 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2739 char *s = rxvt_wcstombs (w); 2748 char *s = rxvt_wcstombs (w);
2740 free (w); 2749 free (w);
2741 // TODO: strlen == only the first element will be converted. well... 2750 // TODO: strlen == only the first element will be converted. well...
2742 paste ((unsigned char *)s, strlen (s)); 2751 paste (s, strlen (s));
2743 free (s); 2752 free (s);
2744 } 2753 }
2745 else 2754 else
2746#endif 2755#endif
2747 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2748 && cl) 2757 && cl)
2749 { 2758 {
2750 for (int i = 0; i < cr; i++) 2759 for (int i = 0; i < cr; i++)
2751 paste ((unsigned char *)cl[i], strlen (cl[i])); 2760 paste (cl[i], strlen (cl[i]));
2752 2761
2753 XFreeStringList (cl); 2762 XFreeStringList (cl);
2754 } 2763 }
2755 else 2764 else
2756 paste (ct.value, ct.nitems); // paste raw 2765 paste ((char *)ct.value, ct.nitems); // paste raw
2757 2766
2758bailout: 2767bailout:
2759 XFree (ct.value); 2768 XFree (ct.value);
2760 2769
2761 if (selection_wait == Sel_normal) 2770 if (selection_wait == Sel_normal)
… …
2799 return; /* outside window */ 2808 return; /* outside window */
2800 2809
2801 if (selection.text) 2810 if (selection.text)
2802 { /* internal selection */ 2811 { /* internal selection */
2803 char *str = rxvt_wcstombs (selection.text, selection.len); 2812 char *str = rxvt_wcstombs (selection.text, selection.len);
2804 paste ((unsigned char *)str, strlen (str)); 2813 paste (str, strlen (str));
2805 free (str); 2814 free (str);
2806 return; 2815 return;
2807 } 2816 }
2808 else 2817 else
2809 { 2818 {
… …
2901 selection.op = SELECTION_DONE; 2910 selection.op = SELECTION_DONE;
2902 2911
2903 if (selection.clicks == 4) 2912 if (selection.clicks == 4)
2904 return; /* nothing selected, go away */ 2913 return; /* nothing selected, go away */
2905 2914
2915 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2916 return;
2917
2906 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2918 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2907 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2919 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2908 2920
2909 int ofs = 0; 2921 int ofs = 0;
2910 int extra = 0; 2922 int extra = 0;
… …
2922 col = selection.beg.col; 2934 col = selection.beg.col;
2923 end_col = ncol + 1; 2935 end_col = ncol + 1;
2924 } 2936 }
2925 else 2937 else
2926#endif 2938#endif
2927 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2939 end_col = ROW(row).l;
2928 2940
2929 col = max (col, 0); 2941 col = max (col, 0);
2930 2942
2931 if (row == selection.end.row || selection.rect) 2943 if (row == selection.end.row
2944#if ENABLE_FRILLS
2945 || selection.rect
2946#endif
2947 )
2932 end_col = min (end_col, selection.end.col); 2948 min_it (end_col, selection.end.col);
2933 2949
2934 t = ROW(row).t + col; 2950 t = ROW(row).t + col;
2951
2935 for (; col < end_col; col++) 2952 for (; col < end_col; col++)
2936 { 2953 {
2937 if (*t == NOCHAR) 2954 if (*t == NOCHAR)
2938 t++; 2955 t++;
2939#if ENABLE_COMBINING 2956#if ENABLE_COMBINING
… …
2955#endif 2972#endif
2956 else 2973 else
2957 new_selection_text[ofs++] = *t++; 2974 new_selection_text[ofs++] = *t++;
2958 } 2975 }
2959 2976
2977#if ENABLE_FRILLS
2978 if (selection.rect)
2979 {
2980 while (ofs
2981 && new_selection_text[ofs - 1] != C0_LF
2982 && unicode::is_space (new_selection_text[ofs - 1]))
2983 --ofs;
2984
2985 new_selection_text[ofs++] = C0_LF;
2986 }
2987 else
2988#endif
2960 if (!ROW(row).is_longer () && row != selection.end.row) 2989 if (!ROW(row).is_longer () && row != selection.end.row)
2961 new_selection_text[ofs++] = C0_LF; 2990 new_selection_text[ofs++] = C0_LF;
2962 } 2991 }
2963 2992
2964 if (end_col != selection.end.col) 2993 if (end_col != selection.end.col)
2965 new_selection_text[ofs++] = C0_LF; 2994 new_selection_text[ofs++] = C0_LF;
2966 2995
… …
2976 3005
2977 // we usually allocate much more than necessary, so realloc it smaller again 3006 // we usually allocate much more than necessary, so realloc it smaller again
2978 selection.len = ofs; 3007 selection.len = ofs;
2979 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3008 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2980 3009
3010 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3011 return;
3012
3013 selection_grab (tm);
3014}
3015
3016bool
3017rxvt_term::selection_grab (Time tm)
3018{
3019 selection_time = tm;
3020
2981 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2982 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3023 {
2983 display->set_selection_owner (this); 3024 display->set_selection_owner (this);
3025 return true;
3026 }
2984 else 3027 else
2985 rxvt_warn ("can't get primary selection, ignoring.\n"); 3028 {
3029 selection_clear ();
3030 return false;
3031 }
2986 3032
2987#if 0 3033#if 0
2988 XTextProperty ct; 3034 XTextProperty ct;
2989 3035
2990 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2991 { 3037 {
2992 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2993 XFree (ct.value); 3039 XFree (ct.value);
2994 } 3040 }
2995#endif 3041#endif
2996
2997 selection_time = tm;
2998} 3042}
2999 3043
3000/* ------------------------------------------------------------------------- */ 3044/* ------------------------------------------------------------------------- */
3001/* 3045/*
3002 * Mark or select text based upon number of clicks: 1, 2, or 3 3046 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3006rxvt_term::selection_click (int clicks, int x, int y) 3050rxvt_term::selection_click (int clicks, int x, int y)
3007{ 3051{
3008 clicks = ((clicks - 1) % 3) + 1; 3052 clicks = ((clicks - 1) % 3) + 1;
3009 selection.clicks = clicks; /* save clicks so extend will work */ 3053 selection.clicks = clicks; /* save clicks so extend will work */
3010 3054
3055 if (clicks == 2 && !selection.rect
3056 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3057 {
3058 MEvent.clicks = 1; // what a mess
3059 selection.screen = current_screen;
3060 selection.op = SELECTION_CONT;
3061 return;
3062 }
3063
3011 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3064 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3012 3065
3013 if (clicks == 2 || clicks == 3) 3066 if (clicks == 2 || clicks == 3)
3014 selection_extend_colrow (selection.mark.col, 3067 selection_extend_colrow (selection.mark.col,
3015 selection.mark.row + view_start, 3068 selection.mark.row - view_start,
3016 0, /* button 3 */ 3069 0, /* button 3 */
3017 1, /* button press */ 3070 1, /* button press */
3018 0); /* click change */ 3071 0); /* click change */
3019} 3072}
3020 3073
… …
3025void 3078void
3026rxvt_term::selection_start_colrow (int col, int row) 3079rxvt_term::selection_start_colrow (int col, int row)
3027{ 3080{
3028 want_refresh = 1; 3081 want_refresh = 1;
3029 3082
3030 selection.mark.row = row - view_start; 3083 selection.mark.row = row + view_start;
3031 selection.mark.col = col; 3084 selection.mark.col = col;
3032 3085
3033 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); 3086 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3034 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); 3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3035 3088
3036 while (selection.mark.col > 0 3089 while (selection.mark.col > 0
3037 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3038 --selection.mark.col; 3091 --selection.mark.col;
3039 3092
… …
3066 text_t *stp; 3119 text_t *stp;
3067 rend_t *srp; 3120 rend_t *srp;
3068 3121
3069 if (dirn == UP) 3122 if (dirn == UP)
3070 { 3123 {
3071 bound.row = - nsaved - 1; 3124 bound.row = top_row - 1;
3072 bound.col = 0; 3125 bound.col = 0;
3073 dirnadd = -1; 3126 dirnadd = -1;
3074 } 3127 }
3075 else 3128 else
3076 { 3129 {
… …
3124 } 3177 }
3125 } 3178 }
3126 break; 3179 break;
3127 } 3180 }
3128 3181
3129Old_Word_Selection_You_Die:
3130 if (dirn == DN) 3182 if (dirn == DN)
3131 col++; /* put us on one past the end */ 3183 col++; /* put us on one past the end */
3132 3184
3133 /* Poke the values back in */ 3185 /* Poke the values back in */
3134 ret->row = row; 3186 ret->row = row;
… …
3144 * flag == 2 ==> button 3 motion 3196 * flag == 2 ==> button 3 motion
3145 */ 3197 */
3146void 3198void
3147rxvt_term::selection_extend (int x, int y, int flag) 3199rxvt_term::selection_extend (int x, int y, int flag)
3148{ 3200{
3149 int col = min (max (Pixel2Col (x), 0), ncol); 3201 int col = clamp (Pixel2Col (x), 0, ncol);
3150 int row = min (max (Pixel2Row (y), 0), nrow - 1); 3202 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3151 3203
3152 /* 3204 /*
3153 * If we're selecting characters (single click) then we must check first 3205 * If we're selecting characters (single click) then we must check first
3154 * if we are at the same place as the original mark. If we are then 3206 * if we are at the same place as the original mark. If we are then
3155 * select nothing. Otherwise, if we're to the right of the mark, you have to 3207 * select nothing. Otherwise, if we're to the right of the mark, you have to
3156 * be _past_ a character for it to be selected. 3208 * be _past_ a character for it to be selected.
3157 */ 3209 */
3158 if (((selection.clicks % 3) == 1) && !flag 3210 if (((selection.clicks % 3) == 1) && !flag
3159 && (col == selection.mark.col 3211 && (col == selection.mark.col
3160 && (row == selection.mark.row + view_start))) 3212 && (row == selection.mark.row - view_start)))
3161 { 3213 {
3162 /* select nothing */ 3214 /* select nothing */
3163 selection.beg.row = selection.end.row = 0; 3215 selection.beg.row = selection.end.row = 0;
3164 selection.beg.col = selection.end.col = 0; 3216 selection.beg.col = selection.end.col = 0;
3165 selection.clicks = 4; 3217 selection.clicks = 4;
… …
3220 selection.beg.col = selection.end.col = selection.mark.col; 3272 selection.beg.col = selection.end.col = selection.mark.col;
3221 selection.beg.row = selection.end.row = selection.mark.row; 3273 selection.beg.row = selection.end.row = selection.mark.row;
3222 } 3274 }
3223 3275
3224 pos.col = col; 3276 pos.col = col;
3225 pos.row = row - view_start; 3277 pos.row = view_start + row;
3226 3278
3227 /* 3279 /*
3228 * This is mainly xterm style selection with a couple of differences, mainly 3280 * This is mainly xterm style selection with a couple of differences, mainly
3229 * in the way button3 drag extension works. 3281 * in the way button3 drag extension works.
3230 * We're either doing: button1 drag; button3 press; or button3 drag 3282 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3317 selection_delimit_word (DN, &selection.end, &selection.end); 3369 selection_delimit_word (DN, &selection.end, &selection.end);
3318 } 3370 }
3319 else if (selection.clicks == 3) 3371 else if (selection.clicks == 3)
3320 { 3372 {
3321#if ENABLE_FRILLS 3373#if ENABLE_FRILLS
3322 if (options & Opt_tripleclickwords) 3374 if (OPTION (Opt_tripleclickwords))
3323 { 3375 {
3324 selection_delimit_word (UP, &selection.beg, &selection.beg); 3376 selection_delimit_word (UP, &selection.beg, &selection.beg);
3325 3377
3326 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3378 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3327 { 3379 {
… …
3368 } 3420 }
3369 } 3421 }
3370 3422
3371#if ENABLE_FRILLS 3423#if ENABLE_FRILLS
3372 if (selection.rect && selection.beg.col > selection.end.col) 3424 if (selection.rect && selection.beg.col > selection.end.col)
3373 SWAP_IT (selection.beg.col, selection.end.col, int); 3425 ::swap (selection.beg.col, selection.end.col);
3374#endif 3426#endif
3375} 3427}
3376 3428
3377#if ENABLE_FRILLS 3429#if ENABLE_FRILLS
3378void 3430void
… …
3388 { 3440 {
3389 stp = ROW(end_row).t; 3441 stp = ROW(end_row).t;
3390 3442
3391 while (--end_col >= 0) 3443 while (--end_col >= 0)
3392 { 3444 {
3393 if (stp[end_col] != ' ' 3445 if (stp[end_col] != NOCHAR
3394 && stp[end_col] != '\t' 3446 && !unicode::is_space (stp[end_col]))
3395 && stp[end_col] != NOCHAR)
3396 break; 3447 break;
3397 } 3448 }
3398 3449
3399 if (end_col >= 0 3450 if (end_col >= 0
3400 || !ROW(end_row - 1).is_longer ()) 3451 || !ROW(end_row - 1).is_longer ())
… …
3576 */ 3627 */
3577void 3628void
3578rxvt_term::pixel_position (int *x, int *y) 3629rxvt_term::pixel_position (int *x, int *y)
3579{ 3630{
3580 *x = Pixel2Col (*x); 3631 *x = Pixel2Col (*x);
3581 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3632 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3582 *y = Pixel2Row (*y); 3633 *y = Pixel2Row (*y);
3583 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3634 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3584} 3635}
3585 3636
3586/* ------------------------------------------------------------------------- */ 3637/* ------------------------------------------------------------------------- */
3587#ifdef USE_XIM 3638#ifdef USE_XIM
3588void 3639void
… …
3599 3650
3600#if ENABLE_OVERLAY 3651#if ENABLE_OVERLAY
3601void 3652void
3602rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3653rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3603{ 3654{
3604 if (nrow < 3 || ncol < 3) 3655 if (nrow < 1 || ncol < 1)
3605 return; 3656 return;
3606 3657
3607 want_refresh = 1; 3658 want_refresh = 1;
3608 3659
3609 scr_overlay_off (); 3660 scr_overlay_off ();
3610 3661
3611 if (x < 0) x = ncol - w; 3662 if (x < 0) x = ncol - w;
3612 if (y < 0) y = nrow - h; 3663 if (y < 0) y = nrow - h;
3613 3664
3614 // make space for border 3665 // make space for border
3615 w += 2; MIN_IT (w, ncol); 3666 w += 2; min_it (w, ncol);
3616 h += 2; MIN_IT (h, nrow); 3667 h += 2; min_it (h, nrow);
3617 3668
3618 x -= 1; MAX_IT (x, 0); 3669 x -= 1; clamp_it (x, 0, ncol - w);
3619 y -= 1; MAX_IT (y, 0); 3670 y -= 1; clamp_it (y, 0, nrow - h);
3620
3621 MIN_IT (x, ncol - w);
3622 MIN_IT (y, nrow - h);
3623 3671
3624 ov_x = x; ov_y = y; 3672 ov_x = x; ov_y = y;
3625 ov_w = w; ov_h = h; 3673 ov_w = w; ov_h = h;
3626 3674
3627 ov_text = new text_t *[h]; 3675 ov_text = new text_t *[h];
… …
3719 for (int y = ov_h; y--; ) 3767 for (int y = ov_h; y--; )
3720 { 3768 {
3721 text_t *t1 = ov_text[y]; 3769 text_t *t1 = ov_text[y];
3722 rend_t *r1 = ov_rend[y]; 3770 rend_t *r1 = ov_rend[y];
3723 3771
3724 text_t *t2 = ROW(y - view_start).t + ov_x; 3772 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3725 rend_t *r2 = ROW(y - view_start).r + ov_x; 3773 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3726 3774
3727 for (int x = ov_w; x--; ) 3775 for (int x = ov_w; x--; )
3728 { 3776 {
3729 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3777 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3730 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3778 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