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

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

Diff Legend

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