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

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

Diff Legend

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