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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.173 by root, Mon Dec 19 02:16:24 2005 UTC vs.
Revision 1.231 by root, Sun Jan 15 16:48:18 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
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] = -1;
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->l != -1) /* 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->l != -1) /* 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 {
860 line->l = -1; 821 max_it (line->l, ncol);
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_cont ()) 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->l != -1) /* 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.l != -1) /* 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 == 0)
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 == 0) 1129 l.touch ();
1174 return; /* um, yeah? */ 1130 l.is_longer (0);
1175 else if (save[row].is_cont ())
1176 save[row].l = ncol;
1177 1131
1178 scr_gotorc (0, 0, R_RELATIVE); 1132 scr_gotorc (0, 0, R_RELATIVE);
1179 scr_insdel_chars (1, DELETE); 1133 scr_insdel_chars (1, DELETE);
1180 scr_gotorc (0, ncol - 1, R_RELATIVE); 1134 scr_gotorc (0, ncol - 1, R_RELATIVE);
1181 } 1135 }
… …
1191{ 1145{
1192 want_refresh = 1; 1146 want_refresh = 1;
1193 ZERO_SCROLLBACK (); 1147 ZERO_SCROLLBACK ();
1194 1148
1195 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1149 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1196 MAX_IT (screen.cur.col, 0); 1150 clamp_it (screen.cur.col, 0, ncol - 1);
1197 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1198 1151
1199 screen.flags &= ~Screen_WrapNext; 1152 screen.flags &= ~Screen_WrapNext;
1200 1153
1201 if (relative & R_RELATIVE) 1154 if (relative & R_RELATIVE)
1202 { 1155 {
… …
1220 else 1173 else
1221 { 1174 {
1222 if (screen.flags & Screen_Relative) 1175 if (screen.flags & Screen_Relative)
1223 { /* relative origin mode */ 1176 { /* relative origin mode */
1224 screen.cur.row = row + screen.tscroll; 1177 screen.cur.row = row + screen.tscroll;
1225 MIN_IT (screen.cur.row, screen.bscroll); 1178 min_it (screen.cur.row, screen.bscroll);
1226 } 1179 }
1227 else 1180 else
1228 screen.cur.row = row; 1181 screen.cur.row = row;
1229 } 1182 }
1230 1183
1231 MAX_IT (screen.cur.row, 0); 1184 clamp_it (screen.cur.row, 0, nrow - 1);
1232 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1233} 1185}
1234 1186
1235/* ------------------------------------------------------------------------- */ 1187/* ------------------------------------------------------------------------- */
1236/* 1188/*
1237 * direction should be UP or DN 1189 * direction should be UP or DN
… …
1248 1200
1249 screen.flags &= ~Screen_WrapNext; 1201 screen.flags &= ~Screen_WrapNext;
1250 1202
1251 if ((screen.cur.row == screen.bscroll && direction == UP) 1203 if ((screen.cur.row == screen.bscroll && direction == UP)
1252 || (screen.cur.row == screen.tscroll && direction == DN)) 1204 || (screen.cur.row == screen.tscroll && direction == DN))
1253 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1205 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1254 else 1206 else
1255 screen.cur.row += dirn; 1207 screen.cur.row += dirn;
1256 1208
1257 MAX_IT (screen.cur.row, 0); 1209 clamp_it (screen.cur.row, 0, nrow - 1);
1258 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1259 selection_check (0); 1210 selection_check (0);
1260} 1211}
1261 1212
1262/* ------------------------------------------------------------------------- */ 1213/* ------------------------------------------------------------------------- */
1263/* 1214/*
… …
1267 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1218 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1268 */ 1219 */
1269void 1220void
1270rxvt_term::scr_erase_line (int mode) 1221rxvt_term::scr_erase_line (int mode)
1271{ 1222{
1272 unsigned int row, col, num; 1223 unsigned int col, num;
1273 1224
1274 want_refresh = 1; 1225 want_refresh = 1;
1275 ZERO_SCROLLBACK (); 1226 ZERO_SCROLLBACK ();
1276 1227
1277 selection_check (1); 1228 selection_check (1);
1278 1229
1279 row = saveLines + screen.cur.row; 1230 line_t &line = ROW(screen.cur.row);
1231
1232 line.touch ();
1233 line.is_longer (0);
1280 1234
1281 switch (mode) 1235 switch (mode)
1282 { 1236 {
1283 case 0: /* erase to end of line */ 1237 case 0: /* erase to end of line */
1284 col = screen.cur.col; 1238 col = screen.cur.col;
1285 num = ncol - col; 1239 num = ncol - col;
1286 MIN_IT (save[row].l, (int16_t)col); 1240 min_it (line.l, col);
1287 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1241 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1288 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1242 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1289 CLEAR_SELECTION (); 1243 CLEAR_SELECTION ();
1290 break; 1244 break;
1291 case 1: /* erase to beginning of line */ 1245 case 1: /* erase to beginning of line */
… …
1296 CLEAR_SELECTION (); 1250 CLEAR_SELECTION ();
1297 break; 1251 break;
1298 case 2: /* erase whole line */ 1252 case 2: /* erase whole line */
1299 col = 0; 1253 col = 0;
1300 num = ncol; 1254 num = ncol;
1301 save[row].l = 0; 1255 line.l = 0;
1302 if (selection.beg.row <= screen.cur.row 1256 if (selection.beg.row <= screen.cur.row
1303 && selection.end.row >= screen.cur.row) 1257 && selection.end.row >= screen.cur.row)
1304 CLEAR_SELECTION (); 1258 CLEAR_SELECTION ();
1305 break; 1259 break;
1306 default: 1260 default:
1307 return; 1261 return;
1308 } 1262 }
1309 1263
1310 if (save[row].t)
1311 scr_blank_line (save[row], col, num, rstyle); 1264 scr_blank_line (line, col, num, rstyle);
1312 else
1313 scr_blank_screen_mem (save[row], rstyle);
1314} 1265}
1315 1266
1316/* ------------------------------------------------------------------------- */ 1267/* ------------------------------------------------------------------------- */
1317/* 1268/*
1318 * Erase part of whole of the screen 1269 * Erase part of whole of the screen
… …
1322 */ 1273 */
1323void 1274void
1324rxvt_term::scr_erase_screen (int mode) 1275rxvt_term::scr_erase_screen (int mode)
1325{ 1276{
1326 int num; 1277 int num;
1327 int32_t row, row_offset; 1278 int32_t row;
1328 rend_t ren; 1279 rend_t ren;
1329 XGCValues gcvalue; 1280 XGCValues gcvalue;
1330 1281
1331 want_refresh = 1; 1282 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1283 ZERO_SCROLLBACK ();
1333
1334 row_offset = (int32_t)saveLines;
1335 1284
1336 switch (mode) 1285 switch (mode)
1337 { 1286 {
1338 case 0: /* erase to end of screen */ 1287 case 0: /* erase to end of screen */
1339 selection_check (1); 1288 selection_check (1);
… …
1363 CLEAR_SELECTION (); 1312 CLEAR_SELECTION ();
1364 1313
1365 if (row >= nrow) /* Out Of Bounds */ 1314 if (row >= nrow) /* Out Of Bounds */
1366 return; 1315 return;
1367 1316
1368 MIN_IT (num, (nrow - row)); 1317 min_it (num, nrow - row);
1369 1318
1370 if (rstyle & (RS_RVid | RS_Uline)) 1319 if (rstyle & (RS_RVid | RS_Uline))
1371 ren = (rend_t) ~RS_None; 1320 ren = (rend_t) ~RS_None;
1372 else if (GET_BASEBG (rstyle) == Color_bg) 1321 else if (GET_BASEBG (rstyle) == Color_bg)
1373 { 1322 {
… …
1375 CLEAR_ROWS (row, num); 1324 CLEAR_ROWS (row, num);
1376 } 1325 }
1377 else 1326 else
1378 { 1327 {
1379 ren = rstyle & (RS_fgMask | RS_bgMask); 1328 ren = rstyle & (RS_fgMask | RS_bgMask);
1380 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1381 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1330 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1382 ERASE_ROWS (row, num); 1331 ERASE_ROWS (row, num);
1383 gcvalue.foreground = pix_colors[Color_fg]; 1332 gcvalue.foreground = pix_colors[Color_fg];
1384 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1385 } 1334 }
1386 1335
1387 for (; num--; row++) 1336 for (; num--; row++)
1388 { 1337 {
1389 scr_blank_screen_mem (save[row + row_offset], rstyle); 1338 scr_blank_screen_mem (ROW(row), rstyle);
1390 save[row + row_offset].l = 0;
1391 scr_blank_line (drawn[row], 0, ncol, ren); 1339 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1392 } 1340 }
1393} 1341}
1394 1342
1395#if ENABLE_FRILLS 1343#if ENABLE_FRILLS
1396void 1344void
1397rxvt_term::scr_erase_savelines () 1345rxvt_term::scr_erase_savelines ()
1398{ 1346{
1399 want_refresh = 1; 1347 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1401 1349
1402 nscrolled = 0; 1350 top_row = 0;
1403} 1351}
1404#endif 1352#endif
1405 1353
1406/* ------------------------------------------------------------------------- */ 1354/* ------------------------------------------------------------------------- */
1407/* 1355/*
… …
1409 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1357 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1410 */ 1358 */
1411void 1359void
1412rxvt_term::scr_E () 1360rxvt_term::scr_E ()
1413{ 1361{
1414 int i, j, k;
1415 rend_t *r1, fs; 1362 rend_t fs;
1416 1363
1417 want_refresh = 1; 1364 want_refresh = 1;
1418 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
1419 1366
1420 num_scr_allow = 0; 1367 num_scr_allow = 0;
1421 selection_check (3); 1368 selection_check (3);
1422 1369
1423 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1370 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1424 for (k = saveLines, i = nrow; i--; k++) 1371 for (int row = nrow; row--; )
1425 { 1372 {
1426 save[k].l = ncol; /* make the `E's selectable */ 1373 line_t &line = ROW(row);
1374
1427 fill_text (save[k].t, 'E', ncol); 1375 fill_text (line.t, 'E', ncol);
1428 for (r1 = save[k].r, j = ncol; j--; ) 1376 rend_t *r1 = line.r;
1377
1378 for (int j = ncol; j--; )
1429 *r1++ = fs; 1379 *r1++ = fs;
1380
1381 line.is_longer (0);
1382 line.touch (ncol);
1430 } 1383 }
1431} 1384}
1432 1385
1433/* ------------------------------------------------------------------------- */ 1386/* ------------------------------------------------------------------------- */
1434/* 1387/*
… …
1455 count = end; 1408 count = end;
1456 } 1409 }
1457 1410
1458 scr_do_wrap (); 1411 scr_do_wrap ();
1459 1412
1460 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1413 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1461} 1414}
1462 1415
1463/* ------------------------------------------------------------------------- */ 1416/* ------------------------------------------------------------------------- */
1464/* 1417/*
1465 * Insert/Delete <count> characters from the current position 1418 * Insert/Delete <count> characters from the current position
… …
1477 return; 1430 return;
1478 1431
1479 scr_do_wrap (); 1432 scr_do_wrap ();
1480 1433
1481 selection_check (1); 1434 selection_check (1);
1482 MIN_IT (count, (ncol - screen.cur.col)); 1435 min_it (count, ncol - screen.cur.col);
1483 1436
1484 row = screen.cur.row + saveLines; 1437 row = screen.cur.row;
1485 1438
1486 line_t *line = save + row; 1439 line_t *line = &ROW(row);
1440
1441 line->touch ();
1442 line->is_longer (0);
1487 1443
1488 switch (insdel) 1444 switch (insdel)
1489 { 1445 {
1490 case INSERT: 1446 case INSERT:
1491 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1492 { 1448 {
1493 line->t[col] = line->t[col - count]; 1449 line->t[col] = line->t[col - count];
1494 line->r[col] = line->r[col - count]; 1450 line->r[col] = line->r[col - count];
1495 } 1451 }
1496 1452
1497 if (line->l != -1) 1453 line->l = min (line->l + count, ncol);
1498 {
1499 line->l += count;
1500 MIN_IT (line->l, ncol);
1501 }
1502 1454
1503 if (selection.op && current_screen == selection.screen 1455 if (selection.op && current_screen == selection.screen
1504 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1505 { 1457 {
1506 if (selection.end.row != screen.cur.row 1458 if (selection.end.row != screen.cur.row
… …
1512 selection.mark.col += count; /* XXX: yes? */ 1464 selection.mark.col += count; /* XXX: yes? */
1513 selection.end.col += count; 1465 selection.end.col += count;
1514 } 1466 }
1515 } 1467 }
1516 1468
1517 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1469 scr_blank_line (*line, screen.cur.col, count, rstyle);
1518 break; 1470 break;
1519 1471
1520 case ERASE: 1472 case ERASE:
1521 screen.cur.col += count; /* don't worry if > ncol */ 1473 screen.cur.col += count; /* don't worry if > ncol */
1522 selection_check (1); 1474 selection_check (1);
1523 screen.cur.col -= count; 1475 screen.cur.col -= count;
1476
1477 line->l = max (line->l - count, 0);
1524 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1478 scr_blank_line (*line, screen.cur.col, count, rstyle);
1525 break; 1479 break;
1526 1480
1527 case DELETE: 1481 case DELETE:
1528 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1529 1483
… …
1531 { 1485 {
1532 line->t[col] = line->t[col + count]; 1486 line->t[col] = line->t[col + count];
1533 line->r[col] = line->r[col + count]; 1487 line->r[col] = line->r[col + count];
1534 } 1488 }
1535 1489
1490 line->l = max (line->l - count, 0);
1536 scr_blank_line (*line, ncol - count, count, tr); 1491 scr_blank_line (*line, ncol - count, count, tr);
1537
1538 if (line->is_cont ()) /* break line continuation */
1539 line->l = ncol;
1540
1541 line->l -= count;
1542 MAX_IT (line->l, 0);
1543 1492
1544 if (selection.op && current_screen == selection.screen 1493 if (selection.op && current_screen == selection.screen
1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1546 { 1495 {
1547 if (selection.end.row != screen.cur.row 1496 if (selection.end.row != screen.cur.row
… …
1567 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1516 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1568 */ 1517 */
1569void 1518void
1570rxvt_term::scr_scroll_region (int top, int bot) 1519rxvt_term::scr_scroll_region (int top, int bot)
1571{ 1520{
1572 MAX_IT (top, 0); 1521 max_it (top, 0);
1573 MIN_IT (bot, (int)nrow - 1); 1522 min_it (bot, nrow - 1);
1574 1523
1575 if (top > bot) 1524 if (top > bot)
1576 return; 1525 return;
1577 1526
1578 screen.tscroll = top; 1527 screen.tscroll = top;
… …
1659rxvt_term::scr_set_tab (int mode) 1608rxvt_term::scr_set_tab (int mode)
1660{ 1609{
1661 if (mode < 0) 1610 if (mode < 0)
1662 memset (tabs, 0, ncol * sizeof (char)); 1611 memset (tabs, 0, ncol * sizeof (char));
1663 else if (screen.cur.col < ncol) 1612 else if (screen.cur.col < ncol)
1664 tabs[screen.cur.col] = (mode ? 1 : 0); 1613 tabs [screen.cur.col] = !!mode;
1665} 1614}
1666 1615
1667/* ------------------------------------------------------------------------- */ 1616/* ------------------------------------------------------------------------- */
1668/* 1617/*
1669 * Set reverse/normal video 1618 * Set reverse/normal video
… …
1676 XGCValues gcvalue; 1625 XGCValues gcvalue;
1677 1626
1678 if (rvideo != mode) 1627 if (rvideo != mode)
1679 { 1628 {
1680 rvideo = mode; 1629 rvideo = mode;
1681 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#if XPM_BACKGROUND 1631#if XPM_BACKGROUND
1683 if (bgPixmap.pixmap == None) 1632 if (bgPixmap.pixmap == None)
1684#endif 1633#endif
1685#if TRANSPARENT 1634#if TRANSPARENT
1686 if (! (options & Opt_transparent) || am_transparent == 0) 1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1687#endif 1636#endif
1688 XSetWindowBackground (display->display, vt, 1637 XSetWindowBackground (display->display, vt,
1689 pix_colors[Color_bg]); 1638 pix_colors[Color_bg]);
1690 1639
1691 gcvalue.foreground = pix_colors[Color_fg]; 1640 gcvalue.foreground = pix_colors[Color_fg];
… …
1716 * Set font style 1665 * Set font style
1717 */ 1666 */
1718void 1667void
1719rxvt_term::set_font_style () 1668rxvt_term::set_font_style ()
1720{ 1669{
1670#if 0
1721 switch (charsets[screen.charset]) 1671 switch (charsets [screen.charset])
1722 { 1672 {
1723 case '0': /* DEC Special Character & Line Drawing Set */ 1673 case '0': /* DEC Special Character & Line Drawing Set */
1724 break; 1674 break;
1725 case 'A': /* United Kingdom (UK) */ 1675 case 'A': /* United Kingdom (UK) */
1726 break; 1676 break;
… …
1733 case 'C': /* Finnish character set */ 1683 case 'C': /* Finnish character set */
1734 break; 1684 break;
1735 case 'K': /* German character set */ 1685 case 'K': /* German character set */
1736 break; 1686 break;
1737 } 1687 }
1688#endif
1738} 1689}
1739 1690
1740/* ------------------------------------------------------------------------- */ 1691/* ------------------------------------------------------------------------- */
1741/* 1692/*
1742 * Choose a font 1693 * Choose a font
… …
1782 bool found = false; 1733 bool found = false;
1783 1734
1784 for (int i = 0; i < nrow; i++) 1735 for (int i = 0; i < nrow; i++)
1785 { 1736 {
1786 int col = 0; 1737 int col = 0;
1787 rend_t *drp = drawn[i].r; 1738 rend_t *drp = drawn_buf[i].r;
1788 1739
1789 for (; col < ncol; col++, drp++) 1740 for (; col < ncol; col++, drp++)
1790 if ((*drp & mask) == value) 1741 if ((*drp & mask) == value)
1791 { 1742 {
1792 found = true; 1743 found = true;
… …
1810rxvt_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)
1811{ 1762{
1812 int i; 1763 int i;
1813 row_col_t rc[RC_COUNT]; 1764 row_col_t rc[RC_COUNT];
1814 1765
1815 if (!drawn) /* sanity check */ 1766 if (!drawn_buf) /* sanity check */
1816 return; 1767 return;
1817 1768
1818#ifndef NO_SLOW_LINK_SUPPORT 1769#ifndef NO_SLOW_LINK_SUPPORT
1819 if (refresh_type == FAST_REFRESH && !display->is_local) 1770 if (refresh_type == FAST_REFRESH && !display->is_local)
1820 { 1771 {
1821 y = 0; 1772 y = 0;
1822 eheight = height; 1773 eheight = height;
1823 } 1774 }
1824#endif
1825
1826#ifdef DEBUG_STRICT
1827 x = max (x, 0);
1828 x = min (x, (int)width);
1829 y = max (y, 0);
1830 y = min (y, (int)height);
1831#endif 1775#endif
1832 1776
1833 /* round down */ 1777 /* round down */
1834 rc[PART_BEG].col = Pixel2Col (x); 1778 rc[PART_BEG].col = Pixel2Col (x);
1835 rc[PART_BEG].row = Pixel2Row (y); 1779 rc[PART_BEG].row = Pixel2Row (y);
… …
1838 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1782 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1839 1783
1840 /* sanity checks */ 1784 /* sanity checks */
1841 for (i = PART_BEG; i < RC_COUNT; i++) 1785 for (i = PART_BEG; i < RC_COUNT; i++)
1842 { 1786 {
1843 MIN_IT (rc[i].col, ncol - 1); 1787 min_it (rc[i].col, ncol - 1);
1844 MIN_IT (rc[i].row, nrow - 1); 1788 min_it (rc[i].row, nrow - 1);
1845 } 1789 }
1846 1790
1847 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++)
1848 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);
1849 1793
1850 if (refresh) 1794 if (refresh)
1851 scr_refresh (SLOW_REFRESH); 1795 scr_refresh (SLOW_REFRESH);
1852} 1796}
1853 1797
… …
1864/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1865/* 1809/*
1866 * 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
1867 * the top of the screen 1811 * the top of the screen
1868 */ 1812 */
1869int 1813void
1870rxvt_term::scr_move_to (int y, int len) 1814rxvt_term::scr_move_to (int y, int len)
1871{ 1815{
1872 long p = 0; 1816 int p = (top_row - nrow) * (len - y) / len + (nrow - 1);
1873 unsigned int oldviewstart;
1874 1817
1875 oldviewstart = view_start; 1818 scr_changeview (p);
1876
1877 if (y < len)
1878 {
1879 p = (nrow + nscrolled) * (len - y) / len;
1880 p -= (long) (nrow - 1);
1881 p = max (p, 0);
1882 }
1883
1884 view_start = (unsigned int)min (p, nscrolled);
1885
1886 return scr_changeview (oldviewstart);
1887} 1819}
1888 1820
1889/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1890/* 1822/*
1891 * Page the screen up/down nlines 1823 * Page the screen up/down nlines
1892 * direction should be UP or DN 1824 * direction should be UP or DN
1893 */ 1825 */
1894int 1826bool
1895rxvt_term::scr_page (enum page_dirn direction, int nlines) 1827rxvt_term::scr_page (enum page_dirn direction, int nlines)
1896{ 1828{
1897 int n; 1829 int new_view_start =
1898 unsigned int oldviewstart;
1899
1900 oldviewstart = view_start;
1901
1902 if (direction == UP)
1903 {
1904 n = view_start + nlines;
1905 view_start = min (n, nscrolled);
1906 }
1907 else
1908 {
1909 n = view_start - nlines; 1830 direction == UP ? view_start - nlines
1910 view_start = max (n, 0); 1831 : view_start + nlines;
1911 }
1912 1832
1913 return scr_changeview (oldviewstart); 1833 return scr_changeview (new_view_start);
1914} 1834}
1915 1835
1916int 1836bool
1917rxvt_term::scr_changeview (unsigned int oldviewstart) 1837rxvt_term::scr_changeview (int new_view_start)
1918{ 1838{
1839 clamp_it (new_view_start, top_row, 0);
1840
1919 if (view_start != oldviewstart) 1841 if (new_view_start == view_start)
1920 { 1842 return false;
1843
1844 num_scr += new_view_start - view_start;
1845 view_start = new_view_start;
1846 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1921 want_refresh = 1; 1847 want_refresh = 1;
1922 num_scr -= (view_start - oldviewstart);
1923 }
1924 1848
1925 return (int) (view_start - oldviewstart); 1849 return true;
1926} 1850}
1927 1851
1928/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1929void 1853void
1930rxvt_term::scr_bell () 1854rxvt_term::scr_bell ()
1931{ 1855{
1932#ifndef NO_BELL 1856#ifndef NO_BELL
1933 1857
1934# ifndef NO_MAPALERT 1858# ifndef NO_MAPALERT
1935# ifdef MAPALERT_OPTION 1859# ifdef MAPALERT_OPTION
1936 if (options & Opt_mapAlert) 1860 if (OPTION (Opt_mapAlert))
1937# endif 1861# endif
1938 XMapWindow (display->display, parent[0]); 1862 XMapWindow (display->display, parent[0]);
1939# endif 1863# endif
1940 1864
1941 if (options & Opt_visualBell) 1865 if (OPTION (Opt_visualBell))
1942 { 1866 {
1943 scr_rvideo_mode (!rvideo); /* refresh also done */ 1867 scr_rvideo_mode (!rvideo); /* refresh also done */
1868 display->flush ();
1944 rxvt_usleep (VISUAL_BELL_DURATION); 1869 rxvt_usleep (VISUAL_BELL_DURATION);
1945 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1946 } 1871 }
1947 else 1872 else
1948 XBell (display->display, 0); 1873 XBell (display->display, 0);
… …
1954/* ARGSUSED */ 1879/* ARGSUSED */
1955void 1880void
1956rxvt_term::scr_printscreen (int fullhist) 1881rxvt_term::scr_printscreen (int fullhist)
1957{ 1882{
1958#ifdef PRINTPIPE 1883#ifdef PRINTPIPE
1959 int i, r1, nrows, row_offset; 1884 int nrows, row_start;
1960 FILE *fd; 1885 FILE *fd;
1961 1886
1962 if ((fd = popen_printer ()) == NULL) 1887 if ((fd = popen_printer ()) == NULL)
1963 return; 1888 return;
1964 1889
1965 nrows = nrow;
1966 row_offset = saveLines;
1967
1968 if (!fullhist) 1890 if (fullhist)
1969 row_offset -= view_start; 1891 {
1892 nrows = nrow - top_row;
1893 row_start = top_row;
1894 }
1970 else 1895 else
1971 { 1896 {
1972 nrows += nscrolled; 1897 nrows = nrow;
1973 row_offset -= nscrolled; 1898 row_start = view_start;
1974 } 1899 }
1975 1900
1976 wctomb (0, 0); 1901 wctomb (0, 0);
1977 1902
1978 for (r1 = 0; r1 < nrows; r1++) 1903 for (int r1 = 0; r1 < nrows; r1++)
1979 { 1904 {
1980 text_t *tp = save[r1 + row_offset].t; 1905 text_t *tp = ROW(r1).t;
1981 int len = save[r1 + row_offset].l; 1906 int len = ROW(r1).l;
1982 1907
1983 for (i = len >= 0 ? len : ncol - 1; i--; ) 1908 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1984 { 1909 {
1985 char mb[MB_LEN_MAX]; 1910 char mb[MB_LEN_MAX];
1986 text_t t = *tp++; 1911 text_t t = *tp++;
1987 if (t == NOCHAR) 1912 if (t == NOCHAR)
1988 continue; 1913 continue;
… …
2016{ 1941{
2017 unsigned char must_clear, /* use draw_string not draw_image_string */ 1942 unsigned char must_clear, /* use draw_string not draw_image_string */
2018 showcursor; /* show the cursor */ 1943 showcursor; /* show the cursor */
2019 int16_t col, row, /* column/row we're processing */ 1944 int16_t col, row, /* column/row we're processing */
2020 ocrow; /* old cursor row */ 1945 ocrow; /* old cursor row */
2021 int i, /* tmp */ 1946 int i; /* tmp */
2022 row_offset; /* basic offset in screen structure */
2023#ifndef NO_CURSORCOLOR 1947#ifndef NO_CURSORCOLOR
2024 rend_t cc1; /* store colours at cursor position (s) */ 1948 rend_t cc1; /* store colours at cursor position (s) */
2025#endif 1949#endif
2026 rend_t *crp; // cursor rendition pointer 1950 rend_t *crp; // cursor rendition pointer
2027 1951
… …
2034 * A: set up vars 1958 * A: set up vars
2035 */ 1959 */
2036 must_clear = 0; 1960 must_clear = 0;
2037 refresh_count = 0; 1961 refresh_count = 0;
2038 1962
2039 row_offset = saveLines - view_start;
2040
2041#if XPM_BACKGROUND 1963#if XPM_BACKGROUND
2042 must_clear |= bgPixmap.pixmap != None; 1964 must_clear |= bgPixmap.pixmap != None;
2043#endif 1965#endif
2044#if TRANSPARENT 1966#if TRANSPARENT
2045 must_clear |= (options & Opt_transparent) && am_transparent; 1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
2046#endif 1968#endif
2047 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2048 1970
2049 /* 1971 /*
2050 * B: reverse any characters which are selected 1972 * B: reverse any characters which are selected
… …
2067 1989
2068 if (showcursor) 1990 if (showcursor)
2069 { 1991 {
2070 int col = screen.cur.col; 1992 int col = screen.cur.col;
2071 1993
2072 while (col && screen.line[screen.cur.row]->t[col] == NOCHAR) 1994 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2073 col--; 1995 col--;
2074 1996
2075 crp = &screen.line[screen.cur.row]->r[col]; 1997 crp = &ROW(screen.cur.row).r[col];
2076 1998
2077 if (showcursor && focus) 1999 if (showcursor && focus)
2078 { 2000 {
2079 if (options & Opt_cursorUnderline) 2001 if (OPTION (Opt_cursorUnderline))
2080 *crp ^= RS_Uline; 2002 *crp ^= RS_Uline;
2081 else 2003 else
2082 { 2004 {
2083 *crp ^= RS_RVid; 2005 *crp ^= RS_RVid;
2084 2006
… …
2086 cc1 = *crp & (RS_fgMask | RS_bgMask); 2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
2087 if (ISSET_PIXCOLOR (Color_cursor)) 2009 if (ISSET_PIXCOLOR (Color_cursor))
2088 ccol1 = Color_cursor; 2010 ccol1 = Color_cursor;
2089 else 2011 else
2090#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2091 ccol1 = GET_FGCOLOR (rstyle); 2013 ccol1 = fgcolor_of (rstyle);
2092#else 2014#else
2093 ccol1 = Color_fg; 2015 ccol1 = Color_fg;
2094#endif 2016#endif
2095 if (ISSET_PIXCOLOR (Color_cursor2)) 2017 if (ISSET_PIXCOLOR (Color_cursor2))
2096 ccol2 = Color_cursor2; 2018 ccol2 = Color_cursor2;
2097 else 2019 else
2098#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2099 ccol2 = GET_BGCOLOR (rstyle); 2021 ccol2 = bgcolor_of (rstyle);
2100#else 2022#else
2101 ccol2 = Color_bg; 2023 ccol2 = Color_bg;
2102#endif 2024#endif
2103 *crp = SET_FGCOLOR (*crp, ccol1); 2025 *crp = SET_FGCOLOR (*crp, ccol1);
2104 *crp = SET_BGCOLOR (*crp, ccol2); 2026 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2109 2031
2110 /* make sure no outline cursor is left around */ 2032 /* make sure no outline cursor is left around */
2111 setoldcursor = 0; 2033 setoldcursor = 0;
2112 if (ocrow != -1) 2034 if (ocrow != -1)
2113 { 2035 {
2114 if (screen.cur.row + view_start != ocrow 2036 if (screen.cur.row - view_start != ocrow
2115 || screen.cur.col != oldcursor.col) 2037 || screen.cur.col != oldcursor.col)
2116 { 2038 {
2117 if (ocrow < nrow 2039 if (ocrow < nrow
2118 && oldcursor.col < ncol) 2040 && oldcursor.col < ncol)
2119 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2120 2042
2121 if (focus || !showcursor) 2043 if (focus || !showcursor)
2122 oldcursor.row = -1; 2044 oldcursor.row = -1;
2123 else 2045 else
2124 setoldcursor = 1; 2046 setoldcursor = 1;
… …
2127 else if (!focus) 2049 else if (!focus)
2128 setoldcursor = 1; 2050 setoldcursor = 1;
2129 2051
2130 if (setoldcursor) 2052 if (setoldcursor)
2131 { 2053 {
2132 if (screen.cur.row + view_start >= nrow) 2054 if (screen.cur.row - view_start >= nrow)
2133 oldcursor.row = -1; 2055 oldcursor.row = -1;
2134 else 2056 else
2135 { 2057 {
2136 oldcursor.row = screen.cur.row + view_start; 2058 oldcursor.row = screen.cur.row - view_start;
2137 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
2138 } 2060 }
2139 } 2061 }
2140 } 2062 }
2141 2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2142#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2143 scr_swap_overlay (); 2066 scr_swap_overlay ();
2144#endif 2067#endif
2145 2068
2146#ifndef NO_SLOW_LINK_SUPPORT 2069#ifndef NO_SLOW_LINK_SUPPORT
… …
2148 * D: CopyArea pass - very useful for slower links 2071 * D: CopyArea pass - very useful for slower links
2149 * This has been deliberately kept simple. 2072 * This has been deliberately kept simple.
2150 */ 2073 */
2151 i = num_scr; 2074 i = num_scr;
2152 if (!display->is_local 2075 if (!display->is_local
2153 && refresh_type == FAST_REFRESH && num_scr_allow && i 2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2154 && abs (i) < nrow && !must_clear) 2077 && abs (num_scr) < nrow && !must_clear)
2155 { 2078 {
2156 int16_t nits; 2079 int16_t nits;
2157 int j; 2080 int j;
2158 int len, wlen; 2081 int len, wlen;
2159 2082
… …
2162 row = i > 0 ? 0 : j - 1; 2085 row = i > 0 ? 0 : j - 1;
2163 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2164 { 2087 {
2165 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2166 { 2089 {
2167 line_t s = save[row + row_offset]; 2090 line_t s = ROW(view_start + row);
2168 line_t d = drawn[row]; 2091 line_t d = drawn_buf[row];
2169 line_t d2 = drawn[row + i]; 2092 line_t d2 = drawn_buf[row + i];
2170 2093
2171 for (nits = 0, col = ncol; col--; ) 2094 for (nits = 0, col = ncol; col--; )
2172 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2173 nits--; 2096 nits--;
2174 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2097 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2192 2115
2193 if (len != -1) 2116 if (len != -1)
2194 { 2117 {
2195 /* also comes here at end if needed because of >= above */ 2118 /* also comes here at end if needed because of >= above */
2196 if (wlen < len) 2119 if (wlen < len)
2197 SWAP_IT (wlen, len, int); 2120 ::swap (wlen, len);
2198 2121
2199 XCopyArea (display->display, vt, vt, 2122 XCopyArea (display->display, vt, vt,
2200 gc, 0, Row2Pixel (len + i), 2123 gc, 0, Row2Pixel (len + i),
2201 (unsigned int)TermWin_TotalWidth (), 2124 (unsigned int)this->width,
2202 (unsigned int)Height2Pixel (wlen - len + 1), 2125 (unsigned int)Height2Pixel (wlen - len + 1),
2203 0, Row2Pixel (len)); 2126 0, Row2Pixel (len));
2204 len = -1; 2127 len = -1;
2205 } 2128 }
2206 } 2129 }
… …
2210 /* 2133 /*
2211 * E: main pass across every character 2134 * E: main pass across every character
2212 */ 2135 */
2213 for (row = 0; row < nrow; row++) 2136 for (row = 0; row < nrow; row++)
2214 { 2137 {
2215 text_t *stp = save[row + row_offset].t; 2138 text_t *stp = ROW(view_start + row).t;
2216 rend_t *srp = save[row + row_offset].r; 2139 rend_t *srp = ROW(view_start + row).r;
2217 text_t *dtp = drawn[row].t; 2140 text_t *dtp = drawn_buf[row].t;
2218 rend_t *drp = drawn[row].r; 2141 rend_t *drp = drawn_buf[row].r;
2219 2142
2220 /* 2143 /*
2221 * E2: OK, now the real pass 2144 * E2: OK, now the real pass
2222 */ 2145 */
2223 int ypixel = (int)Row2Pixel (row); 2146 int ypixel = (int)Row2Pixel (row);
… …
2285 count++, i--; 2208 count++, i--;
2286 2209
2287 /* 2210 /*
2288 * Determine the attributes for the string 2211 * Determine the attributes for the string
2289 */ 2212 */
2290 int fore = GET_FGCOLOR (rend); // desired foreground 2213 int fore = fgcolor_of (rend); // desired foreground
2291 int back = GET_BGCOLOR (rend); // desired background 2214 int back = bgcolor_of (rend); // desired background
2292 2215
2293 // only do special processing if any attributes are set, which is rare 2216 // only do special processing if any attributes are set, which is unlikely
2294 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2217 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2295 { 2218 {
2296#if ENABLE_STYLES 2219#if ENABLE_STYLES
2297 // force redraw after "careful" characters to avoid pixel droppings 2220 // force redraw after "careful" characters to avoid pixel droppings
2298 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2221 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2334 fore = Color_UL; 2257 fore = Color_UL;
2335#endif 2258#endif
2336 2259
2337 if (invert) 2260 if (invert)
2338 { 2261 {
2339 SWAP_IT (fore, back, int); 2262 ::swap (fore, back);
2340 2263
2341#ifndef NO_BOLD_UNDERLINE_REVERSE 2264#ifndef NO_BOLD_UNDERLINE_REVERSE
2342 if (ISSET_PIXCOLOR (Color_RV)) 2265 if (ISSET_PIXCOLOR (Color_RV))
2343 back = Color_RV; 2266 back = Color_RV;
2344 2267
… …
2409 } /* for (row....) */ 2332 } /* for (row....) */
2410 2333
2411#if ENABLE_OVERLAY 2334#if ENABLE_OVERLAY
2412 scr_swap_overlay (); 2335 scr_swap_overlay ();
2413#endif 2336#endif
2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2414 2338
2415 /* 2339 /*
2416 * G: cleanup cursor and display outline cursor if necessary 2340 * G: cleanup cursor and display outline cursor if necessary
2417 */ 2341 */
2418 if (showcursor) 2342 if (showcursor)
2419 { 2343 {
2420 if (focus) 2344 if (focus)
2421 { 2345 {
2422 if (options & Opt_cursorUnderline) 2346 if (OPTION (Opt_cursorUnderline))
2423 *crp ^= RS_Uline; 2347 *crp ^= RS_Uline;
2424 else 2348 else
2425 { 2349 {
2426 *crp ^= RS_RVid; 2350 *crp ^= RS_RVid;
2427#ifndef NO_CURSORCOLOR 2351#ifndef NO_CURSORCOLOR
… …
2432 else if (oldcursor.row >= 0) 2356 else if (oldcursor.row >= 0)
2433 { 2357 {
2434 int cursorwidth = 1; 2358 int cursorwidth = 1;
2435 int col = oldcursor.col; 2359 int col = oldcursor.col;
2436 2360
2437 while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR) 2361 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2438 col--; 2362 col--;
2439 2363
2440 while (col + cursorwidth < ncol 2364 while (col + cursorwidth < ncol
2441 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2365 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2442 cursorwidth++; 2366 cursorwidth++;
2443 2367
2444#ifndef NO_CURSORCOLOR 2368#ifndef NO_CURSORCOLOR
2445 if (ISSET_PIXCOLOR (Color_cursor)) 2369 if (ISSET_PIXCOLOR (Color_cursor))
2446 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2370 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2457 /* 2381 /*
2458 * H: cleanup selection 2382 * H: cleanup selection
2459 */ 2383 */
2460 scr_reverse_selection (); 2384 scr_reverse_selection ();
2461 2385
2462 if (refresh_type & SMOOTH_REFRESH)
2463 XFlush (display->display);
2464
2465 num_scr = 0; 2386 num_scr = 0;
2466 num_scr_allow = 1; 2387 num_scr_allow = 1;
2467} 2388}
2468 2389
2469void 2390void
2470rxvt_term::scr_remap_chars (const line_t &l) 2391rxvt_term::scr_remap_chars (line_t &l)
2471{ 2392{
2472 if (!l.t) 2393 if (!l.t)
2473 return; 2394 return;
2474 2395
2396 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2397
2475 for (int i = ncol; i--; ) 2398 for (int i = ncol; i--; )
2476 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2399 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2477} 2400}
2478 2401
2479void 2402void
2480rxvt_term::scr_remap_chars () 2403rxvt_term::scr_remap_chars ()
2481{ 2404{
2482 for (int i = nrow + saveLines; i--; ) 2405 for (int i = total_rows; i--; )
2483 scr_remap_chars (save[i]); 2406 scr_remap_chars (row_buf [i]);
2484 2407
2485 for (int i = nrow; i--; ) 2408 for (int i = nrow; i--; )
2486 { 2409 {
2487 scr_remap_chars (drawn[i]); 2410 scr_remap_chars (drawn_buf [i]);
2488 scr_remap_chars (swap_save[i]); 2411 scr_remap_chars (swap_buf [i]);
2489 } 2412 }
2490} 2413}
2491 2414
2492void 2415void
2493rxvt_term::scr_recolour () 2416rxvt_term::scr_recolour ()
… …
2531 2454
2532 if (really) 2455 if (really)
2533 XClearWindow (display->display, vt); 2456 XClearWindow (display->display, vt);
2534} 2457}
2535 2458
2459void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2461{
2462 int view_end = view_start + nrow;
2463 int row, col;
2464
2465 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2466 {
2467 text_t *stp = ROW(row).t;
2468 rend_t *srp = ROW(row).r;
2469
2470 for (col = beg_col; col < end_col; col++)
2471 srp[col] ^= rstyle1;
2472
2473 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2474 srp[col] ^= rstyle2;
2475
2476 if (++col < end_col)
2477 srp[col] ^= rstyle2;
2478 }
2479}
2480
2481void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2483{
2484 int view_end = view_start + nrow;
2485 int row, col;
2486
2487 if (beg_row >= view_start)
2488 {
2489 col = beg_col;
2490 row = beg_row;
2491 }
2492 else
2493 {
2494 col = 0;
2495 row = view_start;
2496 }
2497
2498 for (; row < min (end_row, view_end); row++, col = 0)
2499 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500 srp[col] ^= rstyle;
2501
2502 if (row == end_row)
2503 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2504 srp[col] ^= rstyle;
2505}
2506
2536/* ------------------------------------------------------------------------- */ 2507/* ------------------------------------------------------------------------- */
2537void 2508void
2538rxvt_term::scr_reverse_selection () 2509rxvt_term::scr_reverse_selection ()
2539{ 2510{
2511 if (selection.op
2540 if (selection.op && current_screen == selection.screen) 2512 && current_screen == selection.screen
2513 && selection.end.row >= view_start)
2541 { 2514 {
2542 int end_row = saveLines - view_start;
2543 int i = selection.beg.row + saveLines;
2544 int col, row = selection.end.row + saveLines;
2545 rend_t *srp;
2546
2547#if ENABLE_FRILLS 2515#if ENABLE_FRILLS
2548 if (selection.rect) 2516 if (selection.rect)
2549 { 2517 scr_xor_rect (selection.beg.row, selection.beg.col,
2550 end_row += nrow; 2518 selection.end.row, selection.end.col,
2551 2519 RS_RVid, RS_RVid | RS_Uline);
2552 for (; i <= row && i <= end_row; i++)
2553 for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++)
2554 srp[col] ^= RS_RVid;
2555 }
2556 else 2520 else
2557#endif 2521#endif
2558 { 2522 scr_xor_span (selection.beg.row, selection.beg.col,
2559 if (i >= end_row) 2523 selection.end.row, selection.end.col,
2560 col = selection.beg.col; 2524 RS_RVid);
2561 else
2562 {
2563 col = 0;
2564 i = end_row;
2565 }
2566
2567 end_row += nrow;
2568
2569 for (; i < row && i < end_row; i++, col = 0)
2570 for (srp = save[i].r; col < ncol; col++)
2571 srp[col] ^= RS_RVid;
2572
2573 if (i == row && i < end_row)
2574 for (srp = save[i].r; col < selection.end.col; col++)
2575 srp[col] ^= RS_RVid;
2576 }
2577 } 2525 }
2578} 2526}
2579 2527
2580/* ------------------------------------------------------------------------- */ 2528/* ------------------------------------------------------------------------- */
2581/* 2529/*
… …
2588{ 2536{
2589 int row, wrote; 2537 int row, wrote;
2590 unsigned int width, towrite; 2538 unsigned int width, towrite;
2591 char r1[] = "\n"; 2539 char r1[] = "\n";
2592 2540
2593 for (row = saveLines - nscrolled; 2541 for (row = saveLines - nsaved;
2594 row < saveLines + nrow - 1; row++) 2542 row < saveLines + nrow - 1; row++)
2595 { 2543 {
2596 width = save[row].l >= 0 ? save[row].l 2544 width = row_buf[row].l >= 0 ? row_buf[row].l
2597 : ncol; 2545 : ncol;
2598 for (towrite = width; towrite; towrite -= wrote) 2546 for (towrite = width; towrite; towrite -= wrote)
2599 { 2547 {
2600 wrote = write (fd, & (save[row].t[width - towrite]), 2548 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2601 towrite); 2549 towrite);
2602 if (wrote < 0) 2550 if (wrote < 0)
2603 return; /* XXX: death, no report */ 2551 return; /* XXX: death, no report */
2604 } 2552 }
2605 if (save[row].l >= 0) 2553 if (row_buf[row].l >= 0)
2606 if (write (fd, r1, 1) <= 0) 2554 if (write (fd, r1, 1) <= 0)
2607 return; /* XXX: death, no report */ 2555 return; /* XXX: death, no report */
2608 } 2556 }
2609} 2557}
2610#endif 2558#endif
2611 2559
2612/* ------------------------------------------------------------------------- * 2560/* ------------------------------------------------------------------------- *
2613 * CHARACTER SELECTION * 2561 * CHARACTER SELECTION *
2614 * ------------------------------------------------------------------------- */ 2562 * ------------------------------------------------------------------------- */
2615
2616/*
2617 * -nscrolled <= (selection row) <= nrow - 1
2618 */
2619void 2563void
2620rxvt_term::selection_check (int check_more) 2564rxvt_term::selection_check (int check_more)
2621{ 2565{
2622 row_col_t pos; 2566 row_col_t pos;
2623 2567
2624 if (!selection.op) 2568 if (!selection.op)
2625 return; 2569 return;
2626 2570
2627 pos.row = pos.col = 0; 2571 pos.row = pos.col = 0;
2628 if ((selection.beg.row < - (int32_t)nscrolled) 2572 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2629 || (selection.beg.row >= nrow) 2573 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2630 || (selection.mark.row < - (int32_t)nscrolled) 2574 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2631 || (selection.mark.row >= nrow)
2632 || (selection.end.row < - (int32_t)nscrolled)
2633 || (selection.end.row >= nrow)
2634 || (check_more == 1 2575 || (check_more == 1
2635 && current_screen == selection.screen 2576 && current_screen == selection.screen
2636 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2577 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2637 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2578 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2638 || (check_more == 2 2579 || (check_more == 2
… …
2649/* ------------------------------------------------------------------------- */ 2590/* ------------------------------------------------------------------------- */
2650/* 2591/*
2651 * Paste a selection direct to the command fd 2592 * Paste a selection direct to the command fd
2652 */ 2593 */
2653void 2594void
2654rxvt_term::paste (unsigned char *data, unsigned int len) 2595rxvt_term::paste (char *data, unsigned int len)
2655{ 2596{
2656 /* convert normal newline chars into common keyboard Return key sequence */ 2597 /* convert normal newline chars into common keyboard Return key sequence */
2657 for (unsigned int i = 0; i < len; i++) 2598 for (unsigned int i = 0; i < len; i++)
2658 if (data[i] == C0_LF) 2599 if (data[i] == C0_LF)
2659 data[i] = C0_CR; 2600 data[i] = C0_CR;
… …
2803 { 2744 {
2804 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2745 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2805 char *s = rxvt_wcstombs (w); 2746 char *s = rxvt_wcstombs (w);
2806 free (w); 2747 free (w);
2807 // TODO: strlen == only the first element will be converted. well... 2748 // TODO: strlen == only the first element will be converted. well...
2808 paste ((unsigned char *)s, strlen (s)); 2749 paste (s, strlen (s));
2809 free (s); 2750 free (s);
2810 } 2751 }
2811 else 2752 else
2812#endif 2753#endif
2813 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2754 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2814 && cl) 2755 && cl)
2815 { 2756 {
2816 for (int i = 0; i < cr; i++) 2757 for (int i = 0; i < cr; i++)
2817 paste ((unsigned char *)cl[i], strlen (cl[i])); 2758 paste (cl[i], strlen (cl[i]));
2818 2759
2819 XFreeStringList (cl); 2760 XFreeStringList (cl);
2820 } 2761 }
2821 else 2762 else
2822 paste (ct.value, ct.nitems); // paste raw 2763 paste ((char *)ct.value, ct.nitems); // paste raw
2823 2764
2824bailout: 2765bailout:
2825 XFree (ct.value); 2766 XFree (ct.value);
2826 2767
2827 if (selection_wait == Sel_normal) 2768 if (selection_wait == Sel_normal)
… …
2865 return; /* outside window */ 2806 return; /* outside window */
2866 2807
2867 if (selection.text) 2808 if (selection.text)
2868 { /* internal selection */ 2809 { /* internal selection */
2869 char *str = rxvt_wcstombs (selection.text, selection.len); 2810 char *str = rxvt_wcstombs (selection.text, selection.len);
2870 paste ((unsigned char *)str, strlen (str)); 2811 paste (str, strlen (str));
2871 free (str); 2812 free (str);
2872 return; 2813 return;
2873 } 2814 }
2874 else 2815 else
2875 { 2816 {
… …
2944 * EXT: button 1 or 3 release 2885 * EXT: button 1 or 3 release
2945 */ 2886 */
2946void 2887void
2947rxvt_term::selection_make (Time tm) 2888rxvt_term::selection_make (Time tm)
2948{ 2889{
2949 int i, col, end_col, row, end_row; 2890 int i;
2950 wchar_t *new_selection_text; 2891 wchar_t *new_selection_text;
2951 text_t *t; 2892 text_t *t;
2952 2893
2953 switch (selection.op) 2894 switch (selection.op)
2954 { 2895 {
… …
2967 selection.op = SELECTION_DONE; 2908 selection.op = SELECTION_DONE;
2968 2909
2969 if (selection.clicks == 4) 2910 if (selection.clicks == 4)
2970 return; /* nothing selected, go away */ 2911 return; /* nothing selected, go away */
2971 2912
2913 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2914 return;
2915
2972 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2916 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2973 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2917 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2974 2918
2975 col = selection.beg.col;
2976 row = selection.beg.row + saveLines;
2977 end_row = selection.end.row + saveLines;
2978 int ofs = 0; 2919 int ofs = 0;
2979 int extra = 0; 2920 int extra = 0;
2980 2921
2922 int col = selection.beg.col;
2923 int row = selection.beg.row;
2924
2925 int end_col;
2926
2981 for (; row <= end_row; row++, col = 0) 2927 for (; row <= selection.end.row; row++, col = 0)
2982 { 2928 {
2983#if ENABLE_FRILLS 2929#if ENABLE_FRILLS
2984 if (selection.rect) 2930 if (selection.rect)
2985 { 2931 {
2986 col = selection.beg.col; 2932 col = selection.beg.col;
2987 end_col = ncol + 1; 2933 end_col = ncol + 1;
2988 } 2934 }
2989 else 2935 else
2990#endif 2936#endif
2991 end_col = save[row].is_cont () ? ncol : save[row].l; //TODO//FIXME 2937 end_col = ROW(row).l;
2992 2938
2993 MAX_IT (col, 0); 2939 col = max (col, 0);
2994 2940
2995 if (row == end_row || selection.rect) 2941 if (row == selection.end.row
2942#if ENABLE_FRILLS
2943 || selection.rect
2944#endif
2945 )
2996 MIN_IT (end_col, selection.end.col); 2946 min_it (end_col, selection.end.col);
2997 2947
2998 t = &save[row].t[col]; 2948 t = ROW(row).t + col;
2949
2999 for (; col < end_col; col++) 2950 for (; col < end_col; col++)
3000 { 2951 {
3001 if (*t == NOCHAR) 2952 if (*t == NOCHAR)
3002 t++; 2953 t++;
3003#if ENABLE_COMBINING 2954#if ENABLE_COMBINING
… …
3019#endif 2970#endif
3020 else 2971 else
3021 new_selection_text[ofs++] = *t++; 2972 new_selection_text[ofs++] = *t++;
3022 } 2973 }
3023 2974
3024 if (save[row].l != -1 && row != end_row) 2975#if ENABLE_FRILLS
2976 if (selection.rect)
2977 {
2978 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1]))
2981 --ofs;
2982
3025 new_selection_text[ofs++] = C0_LF; 2983 new_selection_text[ofs++] = C0_LF;
2984 }
2985 else
2986#endif
2987 if (!ROW(row).is_longer () && row != selection.end.row)
2988 new_selection_text[ofs++] = C0_LF;
3026 } 2989 }
3027 2990
3028 if (end_col != selection.end.col) 2991 if (end_col != selection.end.col)
3029 new_selection_text[ofs++] = C0_LF; 2992 new_selection_text[ofs++] = C0_LF;
3030 2993
… …
3040 3003
3041 // we usually allocate much more than necessary, so realloc it smaller again 3004 // we usually allocate much more than necessary, so realloc it smaller again
3042 selection.len = ofs; 3005 selection.len = ofs;
3043 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3006 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3044 3007
3008 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3009 return;
3010
3011 selection_grab (tm);
3012}
3013
3014bool
3015rxvt_term::selection_grab (Time tm)
3016{
3017 selection_time = tm;
3018
3045 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3046 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3021 {
3047 display->set_selection_owner (this); 3022 display->set_selection_owner (this);
3023 return true;
3024 }
3048 else 3025 else
3049 rxvt_warn ("can't get primary selection, ignoring.\n"); 3026 {
3027 selection_clear ();
3028 return false;
3029 }
3050 3030
3051#if 0 3031#if 0
3052 XTextProperty ct; 3032 XTextProperty ct;
3053 3033
3054 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3055 { 3035 {
3056 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3036 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3057 XFree (ct.value); 3037 XFree (ct.value);
3058 } 3038 }
3059#endif 3039#endif
3060
3061 selection_time = tm;
3062} 3040}
3063 3041
3064/* ------------------------------------------------------------------------- */ 3042/* ------------------------------------------------------------------------- */
3065/* 3043/*
3066 * Mark or select text based upon number of clicks: 1, 2, or 3 3044 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3070rxvt_term::selection_click (int clicks, int x, int y) 3048rxvt_term::selection_click (int clicks, int x, int y)
3071{ 3049{
3072 clicks = ((clicks - 1) % 3) + 1; 3050 clicks = ((clicks - 1) % 3) + 1;
3073 selection.clicks = clicks; /* save clicks so extend will work */ 3051 selection.clicks = clicks; /* save clicks so extend will work */
3074 3052
3053 if (clicks == 2 && !selection.rect
3054 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3055 {
3056 MEvent.clicks = 1; // what a mess
3057 selection.screen = current_screen;
3058 selection.op = SELECTION_CONT;
3059 return;
3060 }
3061
3075 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3062 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3076 3063
3077 if (clicks == 2 || clicks == 3) 3064 if (clicks == 2 || clicks == 3)
3078 selection_extend_colrow (selection.mark.col, 3065 selection_extend_colrow (selection.mark.col,
3079 selection.mark.row + view_start, 3066 selection.mark.row - view_start,
3080 0, /* button 3 */ 3067 0, /* button 3 */
3081 1, /* button press */ 3068 1, /* button press */
3082 0); /* click change */ 3069 0); /* click change */
3083} 3070}
3084 3071
… …
3088 */ 3075 */
3089void 3076void
3090rxvt_term::selection_start_colrow (int col, int row) 3077rxvt_term::selection_start_colrow (int col, int row)
3091{ 3078{
3092 want_refresh = 1; 3079 want_refresh = 1;
3080
3081 selection.mark.row = row + view_start;
3093 selection.mark.col = col; 3082 selection.mark.col = col;
3094 selection.mark.row = row - view_start;
3095 3083
3096 MAX_IT (selection.mark.row, - (int32_t)nscrolled); 3084 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3097 MIN_IT (selection.mark.row, (int32_t)nrow - 1); 3085 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3098 MAX_IT (selection.mark.col, 0);
3099 MIN_IT (selection.mark.col, (int32_t)ncol - 1);
3100 3086
3101 while (selection.mark.col > 0 3087 while (selection.mark.col > 0
3102 && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR) 3088 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3103 --selection.mark.col; 3089 --selection.mark.col;
3104 3090
3105 if (selection.op) 3091 if (selection.op)
3106 { /* clear the old selection */ 3092 { /* clear the old selection */
3107 selection.beg.row = selection.end.row = selection.mark.row; 3093 selection.beg.row = selection.end.row = selection.mark.row;
… …
3131 text_t *stp; 3117 text_t *stp;
3132 rend_t *srp; 3118 rend_t *srp;
3133 3119
3134 if (dirn == UP) 3120 if (dirn == UP)
3135 { 3121 {
3136 bound.row = saveLines - nscrolled - 1; 3122 bound.row = top_row - 1;
3137 bound.col = 0; 3123 bound.col = 0;
3138 dirnadd = -1; 3124 dirnadd = -1;
3139 } 3125 }
3140 else 3126 else
3141 { 3127 {
3142 bound.row = saveLines + nrow; 3128 bound.row = nrow;
3143 bound.col = ncol - 1; 3129 bound.col = ncol - 1;
3144 dirnadd = 1; 3130 dirnadd = 1;
3145 } 3131 }
3146 3132
3147 row = mark->row + saveLines; 3133 row = mark->row;
3148 col = mark->col; 3134 col = max (mark->col, 0);
3149 MAX_IT (col, 0); 3135
3150 /* find the edge of a word */ 3136 /* find the edge of a word */
3151 stp = &save[row].t[col]; 3137 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3152 w1 = DELIMIT_TEXT (*stp); 3138 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3153
3154 srp = &save[row].r[col];
3155 w2 = DELIMIT_REND (*srp);
3156 3139
3157 for (;;) 3140 for (;;)
3158 { 3141 {
3159 for (; col != bound.col; col += dirnadd) 3142 for (; col != bound.col; col += dirnadd)
3160 { 3143 {
… …
3170 break; 3153 break;
3171 } 3154 }
3172 3155
3173 if ((col == bound.col) && (row != bound.row)) 3156 if ((col == bound.col) && (row != bound.row))
3174 { 3157 {
3175 if (save[ (row - (dirn == UP ? 1 : 0))].is_cont ()) 3158 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3176 { 3159 {
3177 trow = row + dirnadd; 3160 trow = row + dirnadd;
3178 tcol = dirn == UP ? ncol - 1 : 0; 3161 tcol = dirn == UP ? ncol - 1 : 0;
3179 3162
3180 if (save[trow].t == NULL) 3163 if (!ROW(trow).t)
3181 break; 3164 break;
3182 3165
3183 stp = & (save[trow].t[tcol]); 3166 stp = ROW(trow).t + tcol;
3184 srp = & (save[trow].r[tcol]); 3167 srp = ROW(trow).r + tcol;
3185 3168
3186 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3169 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3187 break; 3170 break;
3188 3171
3189 row = trow; 3172 row = trow;
… …
3192 } 3175 }
3193 } 3176 }
3194 break; 3177 break;
3195 } 3178 }
3196 3179
3197Old_Word_Selection_You_Die:
3198 if (dirn == DN) 3180 if (dirn == DN)
3199 col++; /* put us on one past the end */ 3181 col++; /* put us on one past the end */
3200 3182
3201 /* Poke the values back in */ 3183 /* Poke the values back in */
3202 ret->row = row - saveLines; 3184 ret->row = row;
3203 ret->col = col; 3185 ret->col = col;
3204} 3186}
3205 3187
3206/* ------------------------------------------------------------------------- */ 3188/* ------------------------------------------------------------------------- */
3207/* 3189/*
… …
3212 * flag == 2 ==> button 3 motion 3194 * flag == 2 ==> button 3 motion
3213 */ 3195 */
3214void 3196void
3215rxvt_term::selection_extend (int x, int y, int flag) 3197rxvt_term::selection_extend (int x, int y, int flag)
3216{ 3198{
3217 int col, row; 3199 int col = clamp (Pixel2Col (x), 0, ncol);
3218 3200 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3219 col = Pixel2Col (x);
3220 row = Pixel2Row (y);
3221 MAX_IT (row, 0);
3222 MIN_IT (row, (int)nrow - 1);
3223 MAX_IT (col, 0);
3224 MIN_IT (col, (int)ncol);
3225 3201
3226 /* 3202 /*
3227 * If we're selecting characters (single click) then we must check first 3203 * If we're selecting characters (single click) then we must check first
3228 * if we are at the same place as the original mark. If we are then 3204 * if we are at the same place as the original mark. If we are then
3229 * select nothing. Otherwise, if we're to the right of the mark, you have to 3205 * select nothing. Otherwise, if we're to the right of the mark, you have to
3230 * be _past_ a character for it to be selected. 3206 * be _past_ a character for it to be selected.
3231 */ 3207 */
3232 if (((selection.clicks % 3) == 1) && !flag 3208 if (((selection.clicks % 3) == 1) && !flag
3233 && (col == selection.mark.col 3209 && (col == selection.mark.col
3234 && (row == selection.mark.row + view_start))) 3210 && (row == selection.mark.row - view_start)))
3235 { 3211 {
3236 /* select nothing */ 3212 /* select nothing */
3237 selection.beg.row = selection.end.row = 0; 3213 selection.beg.row = selection.end.row = 0;
3238 selection.beg.col = selection.end.col = 0; 3214 selection.beg.col = selection.end.col = 0;
3239 selection.clicks = 4; 3215 selection.clicks = 4;
… …
3254 * Extend the selection to the specified col/row 3230 * Extend the selection to the specified col/row
3255 */ 3231 */
3256void 3232void
3257rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3233rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3258{ 3234{
3259 int end_col;
3260 row_col_t pos; 3235 row_col_t pos;
3261 enum { 3236 enum {
3262 LEFT, RIGHT 3237 LEFT, RIGHT
3263 } closeto = RIGHT; 3238 } closeto = RIGHT;
3264 3239
… …
3295 selection.beg.col = selection.end.col = selection.mark.col; 3270 selection.beg.col = selection.end.col = selection.mark.col;
3296 selection.beg.row = selection.end.row = selection.mark.row; 3271 selection.beg.row = selection.end.row = selection.mark.row;
3297 } 3272 }
3298 3273
3299 pos.col = col; 3274 pos.col = col;
3300 pos.row = row; 3275 pos.row = view_start + row;
3301
3302 pos.row -= view_start; /* adjust for scroll */
3303 3276
3304 /* 3277 /*
3305 * This is mainly xterm style selection with a couple of differences, mainly 3278 * This is mainly xterm style selection with a couple of differences, mainly
3306 * in the way button3 drag extension works. 3279 * in the way button3 drag extension works.
3307 * We're either doing: button1 drag; button3 press; or button3 drag 3280 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3366 } 3339 }
3367 } 3340 }
3368 3341
3369 if (selection.clicks == 1) 3342 if (selection.clicks == 1)
3370 { 3343 {
3371 end_col = save[selection.beg.row + saveLines].l; 3344 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3372 3345 && !ROW(selection.beg.row).is_longer ()
3373 if (selection.beg.col > end_col
3374 && end_col != -1
3375#if ENABLE_FRILLS 3346#if ENABLE_FRILLS
3376 && !selection.rect 3347 && !selection.rect
3377#endif 3348#endif
3378 ) 3349 )
3379 selection.beg.col = ncol; 3350 selection.beg.col = ncol;
3380 3351
3381 end_col = save[selection.end.row + saveLines].l;
3382
3383 if ( 3352 if (
3384 selection.end.col > end_col 3353 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3385 && end_col != -1 3354 && !ROW(selection.end.row).is_longer ()
3386#if ENABLE_FRILLS 3355#if ENABLE_FRILLS
3387 && !selection.rect 3356 && !selection.rect
3388#endif 3357#endif
3389 ) 3358 )
3390 selection.end.col = ncol; 3359 selection.end.col = ncol;
… …
3398 selection_delimit_word (DN, &selection.end, &selection.end); 3367 selection_delimit_word (DN, &selection.end, &selection.end);
3399 } 3368 }
3400 else if (selection.clicks == 3) 3369 else if (selection.clicks == 3)
3401 { 3370 {
3402#if ENABLE_FRILLS 3371#if ENABLE_FRILLS
3403 if (options & Opt_tripleclickwords) 3372 if (OPTION (Opt_tripleclickwords))
3404 { 3373 {
3405 int end_row;
3406
3407 selection_delimit_word (UP, &selection.beg, &selection.beg); 3374 selection_delimit_word (UP, &selection.beg, &selection.beg);
3408 end_row = save[selection.mark.row + saveLines].l;
3409 3375
3410 for (end_row = selection.mark.row; end_row < nrow; end_row++) 3376 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3411 { 3377 {
3412 end_col = save[end_row + saveLines].l; 3378 if (!ROW(end_row).is_longer ())
3413
3414 if (end_col != -1)
3415 { 3379 {
3416 selection.end.row = end_row; 3380 selection.end.row = end_row;
3417 selection.end.col = end_col; 3381 selection.end.col = ROW(end_row).l;
3418 selection_remove_trailing_spaces (); 3382 selection_remove_trailing_spaces ();
3419 break; 3383 break;
3420 } 3384 }
3421 } 3385 }
3422 } 3386 }
… …
3429 selection.beg.col = 0; 3393 selection.beg.col = 0;
3430 selection.end.col = ncol; 3394 selection.end.col = ncol;
3431 3395
3432 // select a complete logical line 3396 // select a complete logical line
3433 while (selection.beg.row > -saveLines 3397 while (selection.beg.row > -saveLines
3434 && save[selection.beg.row - 1 + saveLines].is_cont ()) 3398 && ROW(selection.beg.row - 1).is_longer ())
3435 selection.beg.row--; 3399 selection.beg.row--;
3436 3400
3437 while (selection.end.row < nrow 3401 while (selection.end.row < nrow
3438 && save[selection.end.row + saveLines].is_cont ()) 3402 && ROW(selection.end.row).is_longer ())
3439 selection.end.row++; 3403 selection.end.row++;
3440 } 3404 }
3441 } 3405 }
3442 3406
3443 if (button3 && buttonpress) 3407 if (button3 && buttonpress)
… …
3454 } 3418 }
3455 } 3419 }
3456 3420
3457#if ENABLE_FRILLS 3421#if ENABLE_FRILLS
3458 if (selection.rect && selection.beg.col > selection.end.col) 3422 if (selection.rect && selection.beg.col > selection.end.col)
3459 SWAP_IT (selection.beg.col, selection.end.col, int); 3423 ::swap (selection.beg.col, selection.end.col);
3460#endif 3424#endif
3461} 3425}
3462 3426
3463#if ENABLE_FRILLS 3427#if ENABLE_FRILLS
3464void 3428void
… …
3468 text_t *stp; 3432 text_t *stp;
3469 3433
3470 end_col = selection.end.col; 3434 end_col = selection.end.col;
3471 end_row = selection.end.row; 3435 end_row = selection.end.row;
3472 3436
3473 for ( ; end_row >= selection.beg.row; ) 3437 for (; end_row >= selection.beg.row; )
3474 { 3438 {
3475 stp = save[end_row + saveLines].t; 3439 stp = ROW(end_row).t;
3476 3440
3477 while (--end_col >= 0) 3441 while (--end_col >= 0)
3478 { 3442 {
3479 if (stp[end_col] != ' ' 3443 if (stp[end_col] != NOCHAR
3480 && stp[end_col] != '\t' 3444 && !unicode::is_space (stp[end_col]))
3481 && stp[end_col] != NOCHAR)
3482 break; 3445 break;
3483 } 3446 }
3484 3447
3485 if (end_col >= 0 3448 if (end_col >= 0
3486 || save[end_row - 1 + saveLines].l != -1) 3449 || !ROW(end_row - 1).is_longer ())
3487 { 3450 {
3488 selection.end.col = end_col + 1; 3451 selection.end.col = end_col + 1;
3489 selection.end.row = end_row; 3452 selection.end.row = end_row;
3490 break; 3453 break;
3491 } 3454 }
… …
3662 */ 3625 */
3663void 3626void
3664rxvt_term::pixel_position (int *x, int *y) 3627rxvt_term::pixel_position (int *x, int *y)
3665{ 3628{
3666 *x = Pixel2Col (*x); 3629 *x = Pixel2Col (*x);
3667 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3630 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3668 *y = Pixel2Row (*y); 3631 *y = Pixel2Row (*y);
3669 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3632 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3670} 3633}
3671 3634
3672/* ------------------------------------------------------------------------- */ 3635/* ------------------------------------------------------------------------- */
3673#ifdef USE_XIM 3636#ifdef USE_XIM
3674void 3637void
… …
3685 3648
3686#if ENABLE_OVERLAY 3649#if ENABLE_OVERLAY
3687void 3650void
3688rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3651rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3689{ 3652{
3690 if (nrow < 3 || ncol < 3) 3653 if (nrow < 1 || ncol < 1)
3691 return; 3654 return;
3692 3655
3693 want_refresh = 1; 3656 want_refresh = 1;
3694 3657
3695 scr_overlay_off (); 3658 scr_overlay_off ();
3696 3659
3697 if (x < 0) x = ncol - w; 3660 if (x < 0) x = ncol - w;
3698 if (y < 0) y = nrow - h; 3661 if (y < 0) y = nrow - h;
3699 3662
3700 // make space for border 3663 // make space for border
3701 w += 2; MIN_IT (w, ncol); 3664 w += 2; min_it (w, ncol);
3702 h += 2; MIN_IT (h, nrow); 3665 h += 2; min_it (h, nrow);
3703 3666
3704 x -= 1; MAX_IT (x, 0); 3667 x -= 1; clamp_it (x, 0, ncol - w);
3705 y -= 1; MAX_IT (y, 0); 3668 y -= 1; clamp_it (y, 0, nrow - h);
3706
3707 MIN_IT (x, ncol - w);
3708 MIN_IT (y, nrow - h);
3709 3669
3710 ov_x = x; ov_y = y; 3670 ov_x = x; ov_y = y;
3711 ov_w = w; ov_h = h; 3671 ov_w = w; ov_h = h;
3712 3672
3713 ov_text = new text_t *[h]; 3673 ov_text = new text_t *[h];
… …
3799rxvt_term::scr_swap_overlay () 3759rxvt_term::scr_swap_overlay ()
3800{ 3760{
3801 if (!ov_text) 3761 if (!ov_text)
3802 return; 3762 return;
3803 3763
3804 int row_offset = ov_y + saveLines - view_start;
3805
3806 // swap screen mem with overlay 3764 // swap screen mem with overlay
3807 for (int y = ov_h; y--; ) 3765 for (int y = ov_h; y--; )
3808 { 3766 {
3809 text_t *t1 = ov_text[y]; 3767 text_t *t1 = ov_text[y];
3810 rend_t *r1 = ov_rend[y]; 3768 rend_t *r1 = ov_rend[y];
3811 3769
3812 text_t *t2 = save[y + row_offset].t + ov_x; 3770 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3813 rend_t *r2 = save[y + row_offset].r + ov_x; 3771 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3814 3772
3815 for (int x = ov_w; x--; ) 3773 for (int x = ov_w; x--; )
3816 { 3774 {
3817 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3775 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3818 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3776 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3820 } 3778 }
3821} 3779}
3822 3780
3823#endif 3781#endif
3824/* ------------------------------------------------------------------------- */ 3782/* ------------------------------------------------------------------------- */
3783

Diff Legend

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