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.177 by root, Tue Dec 20 21:49:55 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() \
… …
83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87 88
88#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
89#define ROW(n) (save [LINENO (n)])
90
91/* 89/*
92 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
93 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
94 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
95 */ 93 */
… …
117 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
118 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
119 117
120/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
121void 119void
122rxvt_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
123{ 121{
124 if (!l.t) 122 if (!l.t)
125 { 123 {
126 lalloc (l); 124 lalloc (l);
127 col = 0; 125 col = 0;
128 width = ncol; 126 width = ncol;
129 } 127 }
130 128
129 l.touch ();
130
131 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 133
134 text_t *et = l.t + col; 134 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
142} 142}
143 143
144/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
145/* 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 */
146void 146void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const
148{ 148{
149 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
150} 153}
151 154
152/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
153 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
154 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
158
155void 159void
156rxvt_term::scr_reset () 160rxvt_term::scr_reset ()
157{ 161{
158 unsigned int p, q;
159 int k;
160
161#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
162 scr_overlay_off (); 163 scr_overlay_off ();
163#endif 164#endif
164 165
165 view_start = 0; 166 view_start = 0;
… …
175 return; 176 return;
176 177
177 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
178 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
179 { 180 {
181 //TODO//FIXME
180 saveLines++; 182 saveLines++;
181 prev_nrow--; 183 prev_nrow--;
182 nsaved++; 184 top_row--;
183 } 185 }
184 186
185 want_refresh = 1; 187 want_refresh = 1;
186 188
187 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
188 total_rows = nrow + saveLines; 190 total_rows = nrow + saveLines;
189 191
190 screen.tscroll = 0; 192 screen.tscroll = 0;
191 screen.bscroll = nrow - 1; 193 screen.bscroll = nrow - 1;
192 194
193 if (!save) 195 if (!row_buf)
194 { 196 {
195 /* 197 /*
196 * 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
197 * Note: this is still needed so that all the scrollback lines are NULL
198 */ 199 */
199 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
200 term_start = 0; 201 term_start = 0;
201 202
202 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
203 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
204 205
205 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
207 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209 209
210 for (p = nrow; p--; ) 210 for (int row = nrow; row--; )
211 { 211 {
212 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 } 215 }
216 216
217 memset (charsets, 'B', sizeof (charsets)); 217 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 218 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 219 screen.flags = Screen_DefaultFlags;
… …
239 CLEAR_ALL_SELECTION (); 239 CLEAR_ALL_SELECTION ();
240 rvideo = 0; 240 rvideo = 0;
241 } 241 }
242 else 242 else
243 { 243 {
244 CLEAR_ALL_SELECTION ();
245
244 /* 246 /*
245 * add or delete rows as appropriate 247 * add or delete rows as appropriate
246 */ 248 */
247 249
248 rxvt_salloc *old_ta; 250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
249 rxvt_salloc *old_ra; 251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250 252
253#if 0
251 if (nrow < prev_nrow) 254 if (nrow < prev_nrow)
252 { 255 {
253 /* delete rows */
254 k = min (nsaved, prev_nrow - nrow);
255 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
256 scr_scroll_text (0, (int)prev_nrow - 1, k);
257
258 for (p = nrow; p < prev_nrow; p++) 256 for (int row = nrow; row < prev_nrow; row++)
259 { 257 {
260 lfree (ROW(p));
261 lfree (swap_save[p]); 258 lfree (swap_buf [row]);
262 lfree (drawn[p]); 259 lfree (drawn_buf[row]);
263 } 260 }
261 }
262#endif
264 263
265 /* we have fewer rows so fix up cursor position */ 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
266 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267 266
268 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));
269 } 281
270 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
271 { 294 do
272 /* add rows */
273 scr_reset_realloc (); /* realloc _first_ */
274
275 int ocol = ncol;
276 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
277
278 k = min (nsaved, nrow - prev_nrow);
279
280 for (p = prev_total_rows; p < total_rows; p++)
281 save[p].clear ();
282
283 for (p = prev_total_rows; p < total_rows - k; p++)
284 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
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);
295 screen.cur.row += k;
296 screen.s_cur.row += k;
297 nsaved -= 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 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
443 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
444 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
445 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
446} 422}
447 423
448/* ------------------------------------------------------------------------- */ 424/* ------------------------------------------------------------------------- */
449/* 425/*
450 * Free everything. That way malloc debugging can find leakage. 426 * Free everything. That way malloc debugging can find leakage.
… …
453rxvt_term::scr_release () 429rxvt_term::scr_release ()
454{ 430{
455 delete talloc; talloc = 0; 431 delete talloc; talloc = 0;
456 delete ralloc; ralloc = 0; 432 delete ralloc; ralloc = 0;
457 433
458 free (save); 434 free (row_buf);
459 free (swap_save); 435 free (swap_buf);
460 free (drawn); 436 free (drawn_buf);
461 free (buf);
462 free (tabs); 437 free (tabs);
438
439 row_buf = 0; // signal that we freed all the arrays
463} 440}
464 441
465/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
466/* 443/*
467 * Hard reset 444 * Hard reset
… …
472 scr_release (); 449 scr_release ();
473 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
474 scr_reset (); 451 scr_reset ();
475 452
476 scr_clear (true); 453 scr_clear (true);
477 scr_refresh (SLOW_REFRESH); 454 scr_refresh ();
478} 455}
479 456
480/* ------------------------------------------------------------------------- * 457/* ------------------------------------------------------------------------- *
481 * PROCESS SCREEN COMMANDS * 458 * PROCESS SCREEN COMMANDS *
482 * ------------------------------------------------------------------------- */ 459 * ------------------------------------------------------------------------- */
… …
518 set_font_style (); 495 set_font_style ();
519 break; 496 break;
520 } 497 }
521 498
522 /* boundary check in case screen size changed between SAVE and RESTORE */ 499 /* boundary check in case screen size changed between SAVE and RESTORE */
523 MIN_IT (s->cur.row, nrow - 1); 500 min_it (s->cur.row, nrow - 1);
524 MIN_IT (s->cur.col, ncol - 1); 501 min_it (s->cur.col, ncol - 1);
525#ifdef DEBUG_STRICT 502#ifdef DEBUG_STRICT
526 assert (s->cur.row >= 0); 503 assert (s->cur.row >= 0);
527 assert (s->cur.col >= 0); 504 assert (s->cur.col >= 0);
528#else /* drive with your eyes closed */
529 MAX_IT (s->cur.row, 0);
530 MAX_IT (s->cur.col, 0);
531#endif 505#endif
532} 506}
533 507
534/* ------------------------------------------------------------------------- */ 508/* ------------------------------------------------------------------------- */
535/* 509/*
… …
546 if (current_screen == scrn) 520 if (current_screen == scrn)
547 return scrn; 521 return scrn;
548 522
549 selection_check (2); /* check for boundary cross */ 523 selection_check (2); /* check for boundary cross */
550 524
551 SWAP_IT (scrn, current_screen, int); 525 int i = current_screen; current_screen = scrn; scrn = i;
552 526
553 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 527 ::swap (screen.cur.row, swap.cur.row);
554 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 528 ::swap (screen.cur.col, swap.cur.col);
555 MAX_IT (screen.cur.row, 0); 529
556 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 530 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
557 MAX_IT (screen.cur.col, 0); 531 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
558 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
559 532
560#if NSCREENS 533#if NSCREENS
561 if (options & Opt_secondaryScreen) 534 if (OPTION (Opt_secondaryScreen))
562 { 535 {
563 num_scr = 0; 536 num_scr = 0;
564 537
565 for (int i = nrow; i--; ) 538 for (int i = prev_nrow; i--; )
566 SWAP_IT (ROW(i), swap_save[i], line_t); 539 ::swap (ROW(i), swap_buf [i]);
567 540
568 SWAP_IT (screen.charset, swap.charset, int16_t); 541 ::swap (screen.charset, swap.charset);
569 SWAP_IT (screen.flags, swap.flags, int); 542 ::swap (screen.flags, swap.flags);
570 screen.flags |= Screen_VisibleCursor; 543 screen.flags |= Screen_VisibleCursor;
571 swap.flags |= Screen_VisibleCursor; 544 swap.flags |= Screen_VisibleCursor;
572 } 545 }
573 else 546 else
574#endif 547#endif
575 if (options & Opt_secondaryScroll) 548 if (OPTION (Opt_secondaryScroll))
576 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 549 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
577 550
578 return scrn; 551 return scrn;
579} 552}
580 553
… …
600 * Change the colour for following text 573 * Change the colour for following text
601 */ 574 */
602void 575void
603rxvt_term::scr_color (unsigned int color, int fgbg) 576rxvt_term::scr_color (unsigned int color, int fgbg)
604{ 577{
605 if (color > maxTermCOLOR) 578 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
606 color = fgbg; 579 color = fgbg;
607 580
608 if (fgbg == Color_fg) 581 if (fgbg == Color_fg)
609 rstyle = SET_FGCOLOR (rstyle, color); 582 rstyle = SET_FGCOLOR (rstyle, color);
610 else 583 else
… …
641 want_refresh = 1; 614 want_refresh = 1;
642 num_scr += count; 615 num_scr += count;
643 616
644 if (count > 0 617 if (count > 0
645 && row1 == 0 618 && row1 == 0
646 && row2 == nrow - 1
647 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
648 { 620 {
649 nsaved = min (nsaved + count, saveLines); 621 top_row = max (top_row - count, -saveLines);
622
623 // scroll everything up 'count' lines
650 term_start = (term_start + count) % total_rows; 624 term_start = (term_start + count) % total_rows;
651 625
626 // sever bottommost line
627 {
628 line_t &l = ROW(row2 - count);
629 l.is_longer (0);
630 l.touch ();
631 }
632
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);
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
652 if (selection.op && current_screen == selection.screen) 659 if (selection.op && current_screen == selection.screen)
653 { 660 {
654 selection.beg.row -= count; 661 selection.beg.row -= count;
655 selection.end.row -= count; 662 selection.end.row -= count;
656 selection.mark.row -= count; 663 selection.mark.row -= count;
657 664
658 selection_check (0); 665 if (selection.beg.row < top_row
659 } 666 || selection.end.row < top_row
660 667 || selection.mark.row < top_row)
661 for (int i = count; i--; )
662 scr_blank_screen_mem (ROW(row2 - i), rstyle);
663
664 if ((options & Opt_scrollWithBuffer)
665 && view_start != 0
666 && view_start != saveLines)
667 scr_page (UP, count);
668 }
669 else
670 {
671 if (selection.op && current_screen == selection.screen)
672 {
673 int i = selection.beg.row;
674 int j = selection.end.row;
675
676 if ((i < row1 && j > row1)
677 || (i < row2 && j > row2)
678 || (i - count < row1 && i >= row1)
679 || (i - count > row2 && i <= row2)
680 || (j - count < row1 && j >= row1)
681 || (j - count > row2 && j <= row2))
682 { 668 {
683 CLEAR_ALL_SELECTION (); 669 CLEAR_ALL_SELECTION ();
684 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 670 selection.op = SELECTION_CLEAR;
685 } 671 }
686 else if (j >= row1 && j <= row2) 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)
686 {
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)
687 { 698 {
688 /* move selected region too */ 699 /* move selected region too */
689 selection.beg.row -= count; 700 selection.beg.row -= count;
690 selection.end.row -= count; 701 selection.end.row -= count;
691 selection.mark.row -= count; 702 selection.mark.row -= count;
… …
697 // use a simple and robust scrolling algorithm, this 708 // use a simple and robust scrolling algorithm, this
698 // part of scr_scroll_text is not time-critical. 709 // part of scr_scroll_text is not time-critical.
699 710
700 int rows = row2 - row1 + 1; 711 int rows = row2 - row1 + 1;
701 712
713 min_it (count, rows);
714
715 line_t *temp_buf = row_buf + total_rows;
716
702 for (int row = 0; row < rows; row++) 717 for (int row = 0; row < rows; row++)
703 { 718 {
704 buf [row] = ROW(row1 + (row + count + rows) % rows); 719 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
705 720
706 if (!IN_RANGE_EXC (row + count, 0, rows)) 721 if (!IN_RANGE_EXC (row + count, 0, rows))
707 scr_blank_screen_mem (buf [row], rstyle); 722 scr_blank_screen_mem (temp_buf [row], rstyle);
708 } 723 }
709 724
710 for (int row = 0; row < rows; row++) 725 for (int row = 0; row < rows; row++)
711 ROW(row1 + row) = buf [row]; 726 ROW(row1 + row) = temp_buf [row];
712 } 727 }
713 728
714 return count; 729 return count;
715} 730}
716 731
717/* ------------------------------------------------------------------------- */ 732/* ------------------------------------------------------------------------- */
718/* 733/*
719 * Add text given in <str> of length <len> to screen struct 734 * Add text given in <str> of length <len> to screen struct
720 */ 735 */
721void 736void
722rxvt_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)
723{ 738{
724 if (len <= 0) /* sanity */ 739 if (len <= 0) /* sanity */
725 return; 740 return;
726 741
727 unsigned char checksel; 742 unsigned char checksel;
728 unicode_t c; 743 unicode_t c;
729 int row, last_col; 744 int ncol = this->ncol;
730 const unicode_t *strend = str + len; 745 const wchar_t *strend = str + len;
731 746
732 want_refresh = 1; 747 want_refresh = 1;
733 ZERO_SCROLLBACK (); 748 ZERO_SCROLLBACK ();
734 last_col = ncol;
735 749
736 if (nlines > 0) 750 if (minlines > 0)
737 { 751 {
738 nlines += screen.cur.row - screen.bscroll; 752 minlines += screen.cur.row - screen.bscroll;
753
739 if ((nlines > 0) 754 if (minlines > 0
740 && (screen.tscroll == 0) 755 && screen.tscroll == 0
741 && (screen.bscroll == (nrow - 1))) 756 && screen.bscroll == nrow - 1)
742 { 757 {
743 /* _at least_ this many lines need to be scrolled */ 758 /* _at least_ this many lines need to be scrolled */
744 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 759 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
745 screen.cur.row -= nlines; 760 screen.cur.row -= minlines;
746 } 761 }
747 } 762 }
748 763
749#ifdef DEBUG_STRICT 764#ifdef DEBUG_STRICT
750 assert (screen.cur.col < last_col); 765 assert (screen.cur.col < ncol);
751 assert ((screen.cur.row < nrow) 766 assert (screen.cur.row < nrow
752 && (screen.cur.row >= - (int32_t)nsaved)); 767 && screen.cur.row >= top_row);
753#else /* drive with your eyes closed */
754 MIN_IT (screen.cur.col, last_col - 1);
755 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
756 MAX_IT (screen.cur.row, - (int32_t)nsaved);
757#endif 768#endif
758 row = screen.cur.row; 769 int row = screen.cur.row;
759 770
760 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 771 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
761 772
762 line_t *line = &ROW(row); 773 line_t *line = &ROW(row);
763 774
764 while (str < strend) 775 while (str < strend)
765 { 776 {
766 c = *str++; 777 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
767 778
768 if (c < 0x20) 779 if (c < 0x20)
769 if (c == C0_LF) 780 if (c == C0_LF)
770 { 781 {
771 if (!line->is_longer ()) /* XXX: think about this */
772 MAX_IT (line->l, screen.cur.col); 782 max_it (line->l, screen.cur.col);
773 783
774 screen.flags &= ~Screen_WrapNext; 784 screen.flags &= ~Screen_WrapNext;
775 785
776 if (screen.cur.row == screen.bscroll) 786 if (screen.cur.row == screen.bscroll)
777 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 787 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
781 line = &ROW(row); /* _must_ refresh */ 791 line = &ROW(row); /* _must_ refresh */
782 continue; 792 continue;
783 } 793 }
784 else if (c == C0_CR) 794 else if (c == C0_CR)
785 { 795 {
786 if (!line->is_longer ()) /* XXX: think about this */
787 MAX_IT (line->l, screen.cur.col); 796 max_it (line->l, screen.cur.col);
788 797
789 screen.flags &= ~Screen_WrapNext; 798 screen.flags &= ~Screen_WrapNext;
790 screen.cur.col = 0; 799 screen.cur.col = 0;
791 continue; 800 continue;
792 } 801 }
… …
809 CLEAR_SELECTION (); 818 CLEAR_SELECTION ();
810 } 819 }
811 820
812 if (screen.flags & Screen_WrapNext) 821 if (screen.flags & Screen_WrapNext)
813 { 822 {
814 line->set_is_longer ();
815
816 scr_do_wrap (); 823 scr_do_wrap ();
817 824
825 line->l = ncol;
826 line->is_longer (1);
827
818 row = screen.cur.row; 828 row = screen.cur.row;
819 line = &ROW(row); /* _must_ refresh */ 829 line = &ROW(row); /* _must_ refresh */
820 } 830 }
821 831
822 // some utf-8 decoders "decode" surrogate characters: let's fix this. 832 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
827 // do wcwidth before further replacements, as wcwidth might return -1 837 // do wcwidth before further replacements, as wcwidth might return -1
828 // 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
829 // locale. 839 // locale.
830 int width = c < 0x100 ? 1 : wcwidth (c); 840 int width = c < 0x100 ? 1 : wcwidth (c);
831 841
832 if (charsets[screen.charset] == '0') // DEC SPECIAL 842 if (charsets [screen.charset] == '0') // DEC SPECIAL
833 { 843 {
834 // vt100 special graphics and line drawing 844 // vt100 special graphics and line drawing
835 // 5f-7e standard vt100 845 // 5f-7e standard vt100
836 // 40-5e rxvt extension for extra curses acs chars 846 // 40-5e rxvt extension for extra curses acs chars
837 static uint16_t vt100_0[62] = { // 41 .. 7e 847 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
889 } 899 }
890 900
891 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 901 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
892 902
893 // if the character doesn't fit into the remaining columns... 903 // if the character doesn't fit into the remaining columns...
894 if (screen.cur.col > last_col - width && last_col >= width) 904 if (screen.cur.col > ncol - width && ncol >= width)
895 { 905 {
896 // ...output spaces 906 // ...output spaces
897 c = ' '; 907 c = ' ';
898 // and try the same character next loop iteration 908 // and try the same character next loop iteration
899 --str; 909 --str;
900 } 910 }
901 911
912 line->touch ();
913
902 do 914 do
903 { 915 {
904 line->t[screen.cur.col] = c; 916 line->t[screen.cur.col] = c;
905 line->r[screen.cur.col] = rend; 917 line->r[screen.cur.col] = rend;
906 918
907 if (screen.cur.col < last_col - 1) 919 if (screen.cur.col < ncol - 1)
908 screen.cur.col++; 920 screen.cur.col++;
909 else 921 else
910 { 922 {
911 line->l = last_col; 923 line->l = ncol;
912 if (screen.flags & Screen_Autowrap) 924 if (screen.flags & Screen_Autowrap)
913 screen.flags |= Screen_WrapNext; 925 screen.flags |= Screen_WrapNext;
914 break; 926 break;
915 } 927 }
916 928
… …
918 } 930 }
919 while (--width > 0); 931 while (--width > 0);
920 932
921 // pad with spaces when overwriting wide character with smaller one 933 // pad with spaces when overwriting wide character with smaller one
922 if (!width) 934 if (!width)
935 {
936 line->touch ();
937
923 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++)
924 { 939 {
925 line->t[c] = ' '; 940 line->t[c] = ' ';
926 line->r[c] = rend; 941 line->r[c] = rend;
927 } 942 }
943 }
928 } 944 }
929 else // width == 0 945 else // width == 0
930 { 946 {
931#if ENABLE_COMBINING 947#if ENABLE_COMBINING
932 // handle combining characters 948 // handle combining characters
933 // we just tag the accent on the previous on-screen character. 949 // we just tag the accent on the previous on-screen character.
934 // this is arguably not correct, but also arguably not wrong. 950 // this is arguably not correct, but also arguably not wrong.
935 // we don't handle double-width characters nicely yet. 951 // we don't handle double-width characters nicely yet.
952 line_t *linep;
936 text_t *tp; 953 text_t *tp;
937 rend_t *rp; 954 rend_t *rp;
938 955
939 if (screen.cur.col > 0) 956 if (screen.cur.col > 0)
940 { 957 {
958 linep = line;
941 tp = line->t + screen.cur.col - 1; 959 tp = line->t + screen.cur.col - 1;
942 rp = line->r + screen.cur.col - 1; 960 rp = line->r + screen.cur.col - 1;
943
944 while (*tp == NOCHAR && tp > line->t)
945 tp--, rp--;
946 } 961 }
947 else if (screen.cur.row > 0 962 else if (screen.cur.row > 0
948 && ROW(screen.cur.row - 1).is_longer ()) 963 && ROW(screen.cur.row - 1).is_longer ())
949 { 964 {
950 line_t *line = &ROW(screen.cur.row - 1); 965 linep = &ROW(screen.cur.row - 1);
951
952 tp = line->t + last_col - 1; 966 tp = line->t + ncol - 1;
953 rp = line->r + last_col - 1; 967 rp = line->r + ncol - 1;
954
955 while (*tp == NOCHAR && tp > line->t)
956 tp--, rp--;
957 } 968 }
958 else 969 else
959 continue; 970 continue;
971
972 linep->touch ();
973
974 while (*tp == NOCHAR && tp > linep->t)
975 tp--, rp--;
960 976
961 // first try to find a precomposed character 977 // first try to find a precomposed character
962 unicode_t n = rxvt_compose (*tp, c); 978 unicode_t n = rxvt_compose (*tp, c);
963 if (n == NOCHAR) 979 if (n == NOCHAR)
964 n = rxvt_composite.compose (*tp, c); 980 n = rxvt_composite.compose (*tp, c);
… …
967 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 983 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
968#endif 984#endif
969 } 985 }
970 } 986 }
971 987
972 if (!line->is_longer ()) /* XXX: think about this */
973 MAX_IT (line->l, screen.cur.col); 988 max_it (line->l, screen.cur.col);
974 989
975#ifdef DEBUG_STRICT 990#ifdef DEBUG_STRICT
976 assert (screen.cur.row >= 0); 991 assert (screen.cur.row >= 0);
977#else /* drive with your eyes closed */
978 MAX_IT (screen.cur.row, 0);
979#endif 992#endif
980} 993}
981 994
982/* ------------------------------------------------------------------------- */ 995/* ------------------------------------------------------------------------- */
983/* 996/*
… …
1022 1035
1023 if (count == 0) 1036 if (count == 0)
1024 return; 1037 return;
1025 else if (count > 0) 1038 else if (count > 0)
1026 { 1039 {
1027 int row = screen.cur.row;
1028
1029 line_t &l = ROW(row); 1040 line_t &l = ROW(screen.cur.row);
1030 rend_t base_rend = l.r[i]; 1041 rend_t base_rend = l.r[i];
1031 ht &= l.t[i] == ' '; 1042 ht &= l.t[i] == ' ';
1032 1043
1033 for (; ++i < ncol; ) 1044 for (; ++i < ncol; )
1034 if (tabs[i]) 1045 if (tabs[i])
1035 { 1046 {
1036 x = i; 1047 x = i;
1048
1037 if (!--count) 1049 if (!--count)
1038 break; 1050 break;
1039 } 1051 }
1040 else 1052 else
1041 ht &= l.t[i] == ' ' 1053 ht &= l.t[i] == ' '
… …
1044 if (count) 1056 if (count)
1045 x = ncol - 1; 1057 x = ncol - 1;
1046 1058
1047 // store horizontal tab commands as characters inside the text 1059 // store horizontal tab commands as characters inside the text
1048 // buffer so they can be selected and pasted. 1060 // buffer so they can be selected and pasted.
1049 if (ht && options & Opt_pastableTabs) 1061 if (ht && OPTION (Opt_pastableTabs))
1050 { 1062 {
1051 base_rend = SET_FONT (base_rend, 0); 1063 base_rend = SET_FONT (base_rend, 0);
1052 1064
1053 if (!l.is_longer ()) /* XXX: think about this */ 1065 l.touch (x);
1054 MAX_IT (l.l, x);
1055 1066
1056 i = screen.cur.col; 1067 i = screen.cur.col;
1057 1068
1058 l.t[i] = '\t'; 1069 l.t[i] = '\t';
1059 l.r[i] = base_rend; 1070 l.r[i] = base_rend;
… …
1109 */ 1120 */
1110#if ENABLE_FRILLS 1121#if ENABLE_FRILLS
1111void 1122void
1112rxvt_term::scr_forwardindex () 1123rxvt_term::scr_forwardindex ()
1113{ 1124{
1114 int row;
1115
1116 if (screen.cur.col < ncol - 1) 1125 if (screen.cur.col < ncol - 1)
1117 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1126 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1118 else 1127 else
1119 { 1128 {
1120 row = screen.cur.row; 1129 line_t &l = ROW(screen.cur.row);
1121 1130
1122 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1131 l.touch ();
1123 ROW(row).l = ncol; 1132 l.is_longer (0);
1124 1133
1125 scr_gotorc (0, 0, R_RELATIVE); 1134 scr_gotorc (0, 0, R_RELATIVE);
1126 scr_insdel_chars (1, DELETE); 1135 scr_insdel_chars (1, DELETE);
1127 scr_gotorc (0, ncol - 1, R_RELATIVE); 1136 scr_gotorc (0, ncol - 1, R_RELATIVE);
1128 } 1137 }
… …
1138{ 1147{
1139 want_refresh = 1; 1148 want_refresh = 1;
1140 ZERO_SCROLLBACK (); 1149 ZERO_SCROLLBACK ();
1141 1150
1142 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1151 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1143 MAX_IT (screen.cur.col, 0); 1152 clamp_it (screen.cur.col, 0, ncol - 1);
1144 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1145 1153
1146 screen.flags &= ~Screen_WrapNext; 1154 screen.flags &= ~Screen_WrapNext;
1147 1155
1148 if (relative & R_RELATIVE) 1156 if (relative & R_RELATIVE)
1149 { 1157 {
… …
1167 else 1175 else
1168 { 1176 {
1169 if (screen.flags & Screen_Relative) 1177 if (screen.flags & Screen_Relative)
1170 { /* relative origin mode */ 1178 { /* relative origin mode */
1171 screen.cur.row = row + screen.tscroll; 1179 screen.cur.row = row + screen.tscroll;
1172 MIN_IT (screen.cur.row, screen.bscroll); 1180 min_it (screen.cur.row, screen.bscroll);
1173 } 1181 }
1174 else 1182 else
1175 screen.cur.row = row; 1183 screen.cur.row = row;
1176 } 1184 }
1177 1185
1178 MAX_IT (screen.cur.row, 0); 1186 clamp_it (screen.cur.row, 0, nrow - 1);
1179 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1180} 1187}
1181 1188
1182/* ------------------------------------------------------------------------- */ 1189/* ------------------------------------------------------------------------- */
1183/* 1190/*
1184 * direction should be UP or DN 1191 * direction should be UP or DN
… …
1199 || (screen.cur.row == screen.tscroll && direction == DN)) 1206 || (screen.cur.row == screen.tscroll && direction == DN))
1200 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1207 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1201 else 1208 else
1202 screen.cur.row += dirn; 1209 screen.cur.row += dirn;
1203 1210
1204 MAX_IT (screen.cur.row, 0); 1211 clamp_it (screen.cur.row, 0, nrow - 1);
1205 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1206 selection_check (0); 1212 selection_check (0);
1207} 1213}
1208 1214
1209/* ------------------------------------------------------------------------- */ 1215/* ------------------------------------------------------------------------- */
1210/* 1216/*
… …
1214 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1220 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1215 */ 1221 */
1216void 1222void
1217rxvt_term::scr_erase_line (int mode) 1223rxvt_term::scr_erase_line (int mode)
1218{ 1224{
1219 unsigned int row, col, num; 1225 unsigned int col, num;
1220 1226
1221 want_refresh = 1; 1227 want_refresh = 1;
1222 ZERO_SCROLLBACK (); 1228 ZERO_SCROLLBACK ();
1223 1229
1224 selection_check (1); 1230 selection_check (1);
1225 1231
1226 row = screen.cur.row; 1232 line_t &line = ROW(screen.cur.row);
1233
1234 line.touch ();
1235 line.is_longer (0);
1227 1236
1228 switch (mode) 1237 switch (mode)
1229 { 1238 {
1230 case 0: /* erase to end of line */ 1239 case 0: /* erase to end of line */
1231 col = screen.cur.col; 1240 col = screen.cur.col;
1232 num = ncol - col; 1241 num = ncol - col;
1233 MIN_IT (ROW(row).l, (int16_t)col); 1242 min_it (line.l, col);
1234 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1243 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1235 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1244 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1236 CLEAR_SELECTION (); 1245 CLEAR_SELECTION ();
1237 break; 1246 break;
1238 case 1: /* erase to beginning of line */ 1247 case 1: /* erase to beginning of line */
… …
1243 CLEAR_SELECTION (); 1252 CLEAR_SELECTION ();
1244 break; 1253 break;
1245 case 2: /* erase whole line */ 1254 case 2: /* erase whole line */
1246 col = 0; 1255 col = 0;
1247 num = ncol; 1256 num = ncol;
1248 ROW(row).l = 0; 1257 line.l = 0;
1249 if (selection.beg.row <= screen.cur.row 1258 if (selection.beg.row <= screen.cur.row
1250 && selection.end.row >= screen.cur.row) 1259 && selection.end.row >= screen.cur.row)
1251 CLEAR_SELECTION (); 1260 CLEAR_SELECTION ();
1252 break; 1261 break;
1253 default: 1262 default:
1254 return; 1263 return;
1255 } 1264 }
1256 1265
1257 scr_blank_line (ROW(row), col, num, rstyle); 1266 scr_blank_line (line, col, num, rstyle);
1258} 1267}
1259 1268
1260/* ------------------------------------------------------------------------- */ 1269/* ------------------------------------------------------------------------- */
1261/* 1270/*
1262 * Erase part of whole of the screen 1271 * Erase part of whole of the screen
… …
1305 CLEAR_SELECTION (); 1314 CLEAR_SELECTION ();
1306 1315
1307 if (row >= nrow) /* Out Of Bounds */ 1316 if (row >= nrow) /* Out Of Bounds */
1308 return; 1317 return;
1309 1318
1310 MIN_IT (num, (nrow - row)); 1319 min_it (num, nrow - row);
1311 1320
1312 if (rstyle & (RS_RVid | RS_Uline)) 1321 if (rstyle & (RS_RVid | RS_Uline))
1313 ren = (rend_t) ~RS_None; 1322 ren = (rend_t) ~RS_None;
1314 else if (GET_BASEBG (rstyle) == Color_bg) 1323 else if (GET_BASEBG (rstyle) == Color_bg)
1315 { 1324 {
… …
1317 CLEAR_ROWS (row, num); 1326 CLEAR_ROWS (row, num);
1318 } 1327 }
1319 else 1328 else
1320 { 1329 {
1321 ren = rstyle & (RS_fgMask | RS_bgMask); 1330 ren = rstyle & (RS_fgMask | RS_bgMask);
1322 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1331 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1323 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1332 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1324 ERASE_ROWS (row, num); 1333 ERASE_ROWS (row, num);
1325 gcvalue.foreground = pix_colors[Color_fg]; 1334 gcvalue.foreground = pix_colors[Color_fg];
1326 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1335 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1327 } 1336 }
1328 1337
1329 for (; num--; row++) 1338 for (; num--; row++)
1330 { 1339 {
1331 scr_blank_screen_mem (ROW (row), rstyle); 1340 scr_blank_screen_mem (ROW(row), rstyle);
1332 ROW (row).l = 0;
1333 scr_blank_line (drawn[row], 0, ncol, ren); 1341 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1334 } 1342 }
1335} 1343}
1336 1344
1337#if ENABLE_FRILLS 1345#if ENABLE_FRILLS
1338void 1346void
1339rxvt_term::scr_erase_savelines () 1347rxvt_term::scr_erase_savelines ()
1340{ 1348{
1341 want_refresh = 1; 1349 want_refresh = 1;
1342 ZERO_SCROLLBACK (); 1350 ZERO_SCROLLBACK ();
1343 1351
1344 nsaved = 0; 1352 top_row = 0;
1345} 1353}
1346#endif 1354#endif
1347 1355
1348/* ------------------------------------------------------------------------- */ 1356/* ------------------------------------------------------------------------- */
1349/* 1357/*
… …
1370 rend_t *r1 = line.r; 1378 rend_t *r1 = line.r;
1371 1379
1372 for (int j = ncol; j--; ) 1380 for (int j = ncol; j--; )
1373 *r1++ = fs; 1381 *r1++ = fs;
1374 1382
1375 line.l = ncol; /* make the `E's selectable */ 1383 line.is_longer (0);
1384 line.touch (ncol);
1376 } 1385 }
1377} 1386}
1378 1387
1379/* ------------------------------------------------------------------------- */ 1388/* ------------------------------------------------------------------------- */
1380/* 1389/*
… …
1423 return; 1432 return;
1424 1433
1425 scr_do_wrap (); 1434 scr_do_wrap ();
1426 1435
1427 selection_check (1); 1436 selection_check (1);
1428 MIN_IT (count, (ncol - screen.cur.col)); 1437 min_it (count, ncol - screen.cur.col);
1429 1438
1430 row = screen.cur.row; 1439 row = screen.cur.row;
1431 1440
1432 line_t *line = &ROW(row); 1441 line_t *line = &ROW(row);
1442
1443 line->touch ();
1444 line->is_longer (0);
1433 1445
1434 switch (insdel) 1446 switch (insdel)
1435 { 1447 {
1436 case INSERT: 1448 case INSERT:
1437 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1449 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1438 { 1450 {
1439 line->t[col] = line->t[col - count]; 1451 line->t[col] = line->t[col - count];
1440 line->r[col] = line->r[col - count]; 1452 line->r[col] = line->r[col - count];
1441 } 1453 }
1442 1454
1443 if (!line->is_longer ()) 1455 line->l = min (line->l + count, ncol);
1444 {
1445 line->l += count;
1446 MIN_IT (line->l, ncol);
1447 }
1448 1456
1449 if (selection.op && current_screen == selection.screen 1457 if (selection.op && current_screen == selection.screen
1450 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1458 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1451 { 1459 {
1452 if (selection.end.row != screen.cur.row 1460 if (selection.end.row != screen.cur.row
… …
1465 1473
1466 case ERASE: 1474 case ERASE:
1467 screen.cur.col += count; /* don't worry if > ncol */ 1475 screen.cur.col += count; /* don't worry if > ncol */
1468 selection_check (1); 1476 selection_check (1);
1469 screen.cur.col -= count; 1477 screen.cur.col -= count;
1478
1479 line->l = max (line->l - count, 0);
1470 scr_blank_line (*line, screen.cur.col, count, rstyle); 1480 scr_blank_line (*line, screen.cur.col, count, rstyle);
1471 break; 1481 break;
1472 1482
1473 case DELETE: 1483 case DELETE:
1474 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1484 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1477 { 1487 {
1478 line->t[col] = line->t[col + count]; 1488 line->t[col] = line->t[col + count];
1479 line->r[col] = line->r[col + count]; 1489 line->r[col] = line->r[col + count];
1480 } 1490 }
1481 1491
1492 line->l = max (line->l - count, 0);
1482 scr_blank_line (*line, ncol - count, count, tr); 1493 scr_blank_line (*line, ncol - count, count, tr);
1483
1484 if (line->is_longer ()) /* break line continuation */
1485 line->l = ncol;
1486
1487 line->l = max (line->l - count, 0);
1488 1494
1489 if (selection.op && current_screen == selection.screen 1495 if (selection.op && current_screen == selection.screen
1490 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1496 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1491 { 1497 {
1492 if (selection.end.row != screen.cur.row 1498 if (selection.end.row != screen.cur.row
… …
1512 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1518 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1513 */ 1519 */
1514void 1520void
1515rxvt_term::scr_scroll_region (int top, int bot) 1521rxvt_term::scr_scroll_region (int top, int bot)
1516{ 1522{
1517 MAX_IT (top, 0); 1523 max_it (top, 0);
1518 MIN_IT (bot, (int)nrow - 1); 1524 min_it (bot, nrow - 1);
1519 1525
1520 if (top > bot) 1526 if (top > bot)
1521 return; 1527 return;
1522 1528
1523 screen.tscroll = top; 1529 screen.tscroll = top;
… …
1604rxvt_term::scr_set_tab (int mode) 1610rxvt_term::scr_set_tab (int mode)
1605{ 1611{
1606 if (mode < 0) 1612 if (mode < 0)
1607 memset (tabs, 0, ncol * sizeof (char)); 1613 memset (tabs, 0, ncol * sizeof (char));
1608 else if (screen.cur.col < ncol) 1614 else if (screen.cur.col < ncol)
1609 tabs[screen.cur.col] = (mode ? 1 : 0); 1615 tabs [screen.cur.col] = !!mode;
1610} 1616}
1611 1617
1612/* ------------------------------------------------------------------------- */ 1618/* ------------------------------------------------------------------------- */
1613/* 1619/*
1614 * Set reverse/normal video 1620 * Set reverse/normal video
… …
1621 XGCValues gcvalue; 1627 XGCValues gcvalue;
1622 1628
1623 if (rvideo != mode) 1629 if (rvideo != mode)
1624 { 1630 {
1625 rvideo = mode; 1631 rvideo = mode;
1626 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1632 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1627#if XPM_BACKGROUND 1633#if XPM_BACKGROUND
1628 if (bgPixmap.pixmap == None) 1634 if (bgPixmap.pixmap == None)
1629#endif 1635#endif
1630#if TRANSPARENT 1636#if TRANSPARENT
1631 if (! (options & Opt_transparent) || am_transparent == 0) 1637 if (! OPTION (Opt_transparent) || am_transparent == 0)
1632#endif 1638#endif
1633 XSetWindowBackground (display->display, vt, 1639 XSetWindowBackground (display->display, vt,
1634 pix_colors[Color_bg]); 1640 pix_colors[Color_bg]);
1635 1641
1636 gcvalue.foreground = pix_colors[Color_fg]; 1642 gcvalue.foreground = pix_colors[Color_fg];
… …
1661 * Set font style 1667 * Set font style
1662 */ 1668 */
1663void 1669void
1664rxvt_term::set_font_style () 1670rxvt_term::set_font_style ()
1665{ 1671{
1672#if 0
1666 switch (charsets[screen.charset]) 1673 switch (charsets [screen.charset])
1667 { 1674 {
1668 case '0': /* DEC Special Character & Line Drawing Set */ 1675 case '0': /* DEC Special Character & Line Drawing Set */
1669 break; 1676 break;
1670 case 'A': /* United Kingdom (UK) */ 1677 case 'A': /* United Kingdom (UK) */
1671 break; 1678 break;
… …
1678 case 'C': /* Finnish character set */ 1685 case 'C': /* Finnish character set */
1679 break; 1686 break;
1680 case 'K': /* German character set */ 1687 case 'K': /* German character set */
1681 break; 1688 break;
1682 } 1689 }
1690#endif
1683} 1691}
1684 1692
1685/* ------------------------------------------------------------------------- */ 1693/* ------------------------------------------------------------------------- */
1686/* 1694/*
1687 * Choose a font 1695 * Choose a font
… …
1727 bool found = false; 1735 bool found = false;
1728 1736
1729 for (int i = 0; i < nrow; i++) 1737 for (int i = 0; i < nrow; i++)
1730 { 1738 {
1731 int col = 0; 1739 int col = 0;
1732 rend_t *drp = drawn[i].r; 1740 rend_t *drp = drawn_buf[i].r;
1733 1741
1734 for (; col < ncol; col++, drp++) 1742 for (; col < ncol; col++, drp++)
1735 if ((*drp & mask) == value) 1743 if ((*drp & mask) == value)
1736 { 1744 {
1737 found = true; 1745 found = true;
… …
1755rxvt_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)
1756{ 1764{
1757 int i; 1765 int i;
1758 row_col_t rc[RC_COUNT]; 1766 row_col_t rc[RC_COUNT];
1759 1767
1760 if (!drawn) /* sanity check */ 1768 if (!drawn_buf) /* sanity check */
1761 return; 1769 return;
1762 1770
1763#ifndef NO_SLOW_LINK_SUPPORT 1771#ifndef NO_SLOW_LINK_SUPPORT
1764 if (refresh_type == FAST_REFRESH && !display->is_local) 1772 if (refresh_type == FAST_REFRESH && !display->is_local)
1765 { 1773 {
1766 y = 0; 1774 y = 0;
1767 eheight = height; 1775 eheight = height;
1768 } 1776 }
1769#endif
1770
1771#ifdef DEBUG_STRICT
1772 x = max (x, 0);
1773 x = min (x, (int)width);
1774 y = max (y, 0);
1775 y = min (y, (int)height);
1776#endif 1777#endif
1777 1778
1778 /* round down */ 1779 /* round down */
1779 rc[PART_BEG].col = Pixel2Col (x); 1780 rc[PART_BEG].col = Pixel2Col (x);
1780 rc[PART_BEG].row = Pixel2Row (y); 1781 rc[PART_BEG].row = Pixel2Row (y);
… …
1783 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1784 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1784 1785
1785 /* sanity checks */ 1786 /* sanity checks */
1786 for (i = PART_BEG; i < RC_COUNT; i++) 1787 for (i = PART_BEG; i < RC_COUNT; i++)
1787 { 1788 {
1788 MIN_IT (rc[i].col, ncol - 1); 1789 min_it (rc[i].col, ncol - 1);
1789 MIN_IT (rc[i].row, nrow - 1); 1790 min_it (rc[i].row, nrow - 1);
1790 } 1791 }
1791 1792
1792 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++)
1793 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;
1794 1797
1795 if (refresh) 1798 if (refresh)
1796 scr_refresh (SLOW_REFRESH); 1799 scr_refresh ();
1797} 1800}
1798 1801
1799/* ------------------------------------------------------------------------- */ 1802/* ------------------------------------------------------------------------- */
1800/* 1803/*
1801 * Refresh the entire screen 1804 * Refresh the entire screen
… …
1809/* ------------------------------------------------------------------------- */ 1812/* ------------------------------------------------------------------------- */
1810/* 1813/*
1811 * 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
1812 * the top of the screen 1815 * the top of the screen
1813 */ 1816 */
1814int 1817void
1815rxvt_term::scr_move_to (int y, int len) 1818rxvt_term::scr_move_to (int y, int len)
1816{ 1819{
1817 long p = 0; 1820 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1818 unsigned int oldviewstart;
1819
1820 oldviewstart = view_start;
1821
1822 if (y < len)
1823 {
1824 p = (nrow + nsaved) * (len - y) / len;
1825 p -= (long) (nrow - 1);
1826 p = max (p, 0);
1827 }
1828
1829 view_start = (unsigned int)min (p, nsaved);
1830
1831 return scr_changeview (oldviewstart);
1832} 1821}
1833 1822
1834/* ------------------------------------------------------------------------- */ 1823/* ------------------------------------------------------------------------- */
1835/* 1824/*
1836 * Page the screen up/down nlines 1825 * Page the screen up/down nlines
1837 * direction should be UP or DN 1826 * direction should be UP or DN
1838 */ 1827 */
1839int 1828bool
1840rxvt_term::scr_page (enum page_dirn direction, int nlines) 1829rxvt_term::scr_page (enum page_dirn direction, int nlines)
1841{ 1830{
1842 int n; 1831 int new_view_start =
1843 unsigned int oldviewstart;
1844
1845 oldviewstart = view_start;
1846
1847 if (direction == UP)
1848 {
1849 n = view_start + nlines;
1850 view_start = min (n, nsaved);
1851 }
1852 else
1853 {
1854 n = view_start - nlines; 1832 direction == UP ? view_start - nlines
1855 view_start = max (n, 0); 1833 : view_start + nlines;
1856 }
1857 1834
1858 return scr_changeview (oldviewstart); 1835 return scr_changeview (new_view_start);
1859} 1836}
1860 1837
1861int 1838bool
1862rxvt_term::scr_changeview (unsigned int oldviewstart) 1839rxvt_term::scr_changeview (int new_view_start)
1863{ 1840{
1841 clamp_it (new_view_start, top_row, 0);
1842
1864 if (view_start != oldviewstart) 1843 if (new_view_start == view_start)
1865 { 1844 return false;
1845
1846 num_scr += new_view_start - view_start;
1847 view_start = new_view_start;
1866 want_refresh = 1; 1848 want_refresh = 1;
1867 num_scr -= (view_start - oldviewstart);
1868 }
1869 1849
1870 return (int) (view_start - oldviewstart); 1850 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1851
1852 return true;
1871} 1853}
1872 1854
1873/* ------------------------------------------------------------------------- */ 1855/* ------------------------------------------------------------------------- */
1874void 1856void
1875rxvt_term::scr_bell () 1857rxvt_term::scr_bell ()
1876{ 1858{
1877#ifndef NO_BELL 1859#ifndef NO_BELL
1878 1860
1879# ifndef NO_MAPALERT 1861# ifndef NO_MAPALERT
1880# ifdef MAPALERT_OPTION 1862# ifdef MAPALERT_OPTION
1881 if (options & Opt_mapAlert) 1863 if (OPTION (Opt_mapAlert))
1882# endif 1864# endif
1883 XMapWindow (display->display, parent[0]); 1865 XMapWindow (display->display, parent[0]);
1884# endif 1866# endif
1885 1867
1886 if (options & Opt_visualBell) 1868 if (OPTION (Opt_visualBell))
1887 { 1869 {
1888 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1871 display->flush ();
1889 rxvt_usleep (VISUAL_BELL_DURATION); 1872 rxvt_usleep (VISUAL_BELL_DURATION);
1890 scr_rvideo_mode (!rvideo); /* refresh also done */ 1873 scr_rvideo_mode (!rvideo); /* refresh also done */
1891 } 1874 }
1892 else 1875 else
1893 XBell (display->display, 0); 1876 XBell (display->display, 0);
… …
1907 if ((fd = popen_printer ()) == NULL) 1890 if ((fd = popen_printer ()) == NULL)
1908 return; 1891 return;
1909 1892
1910 if (fullhist) 1893 if (fullhist)
1911 { 1894 {
1912 nrows = nrow + nsaved; 1895 nrows = nrow - top_row;
1913 row_start = -nsaved; 1896 row_start = top_row;
1914 } 1897 }
1915 else 1898 else
1916 { 1899 {
1917 nrows = nrow; 1900 nrows = nrow;
1918 row_start = -view_start; 1901 row_start = view_start;
1919 } 1902 }
1920 1903
1921 wctomb (0, 0); 1904 wctomb (0, 0);
1922 1905
1923 for (int r1 = 0; r1 < nrows; r1++) 1906 for (int r1 = 0; r1 < nrows; r1++)
… …
1955 * Refresh the screen 1938 * Refresh the screen
1956 * drawn_text/drawn_rend contain the screen information before the update. 1939 * drawn_text/drawn_rend contain the screen information before the update.
1957 * screen.text/screen.rend contain what the screen will change to. 1940 * screen.text/screen.rend contain what the screen will change to.
1958 */ 1941 */
1959void 1942void
1960rxvt_term::scr_refresh (unsigned char refresh_type) 1943rxvt_term::scr_refresh ()
1961{ 1944{
1962 unsigned char must_clear, /* use draw_string not draw_image_string */ 1945 unsigned char must_clear, /* use draw_string not draw_image_string */
1963 showcursor; /* show the cursor */ 1946 showcursor; /* show the cursor */
1964 int16_t col, row, /* column/row we're processing */ 1947 int16_t col, row, /* column/row we're processing */
1965 ocrow; /* old cursor row */ 1948 ocrow; /* old cursor row */
1966 int i, /* tmp */ 1949 int i; /* tmp */
1967 row_offset; /* basic offset in screen structure */
1968#ifndef NO_CURSORCOLOR 1950#ifndef NO_CURSORCOLOR
1969 rend_t cc1; /* store colours at cursor position (s) */ 1951 rend_t cc1; /* store colours at cursor position (s) */
1970#endif 1952#endif
1971 rend_t *crp; // cursor rendition pointer 1953 rend_t *crp; // cursor rendition pointer
1972 1954
… …
1979 * A: set up vars 1961 * A: set up vars
1980 */ 1962 */
1981 must_clear = 0; 1963 must_clear = 0;
1982 refresh_count = 0; 1964 refresh_count = 0;
1983 1965
1984 row_offset = term_start - view_start;
1985
1986#if XPM_BACKGROUND 1966#if XPM_BACKGROUND
1987 must_clear |= bgPixmap.pixmap != None; 1967 must_clear |= bgPixmap.pixmap != None;
1988#endif 1968#endif
1989#if TRANSPARENT 1969#if TRANSPARENT
1990 must_clear |= (options & Opt_transparent) && am_transparent; 1970 must_clear |= OPTION (Opt_transparent) && am_transparent;
1991#endif 1971#endif
1992 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1972 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1993 1973
1994 /* 1974 /*
1995 * B: reverse any characters which are selected 1975 * B: reverse any characters which are selected
… …
2019 1999
2020 crp = &ROW(screen.cur.row).r[col]; 2000 crp = &ROW(screen.cur.row).r[col];
2021 2001
2022 if (showcursor && focus) 2002 if (showcursor && focus)
2023 { 2003 {
2024 if (options & Opt_cursorUnderline) 2004 if (OPTION (Opt_cursorUnderline))
2025 *crp ^= RS_Uline; 2005 *crp ^= RS_Uline;
2026 else 2006 else
2027 { 2007 {
2028 *crp ^= RS_RVid; 2008 *crp ^= RS_RVid;
2029 2009
… …
2031 cc1 = *crp & (RS_fgMask | RS_bgMask); 2011 cc1 = *crp & (RS_fgMask | RS_bgMask);
2032 if (ISSET_PIXCOLOR (Color_cursor)) 2012 if (ISSET_PIXCOLOR (Color_cursor))
2033 ccol1 = Color_cursor; 2013 ccol1 = Color_cursor;
2034 else 2014 else
2035#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2015#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2036 ccol1 = GET_FGCOLOR (rstyle); 2016 ccol1 = fgcolor_of (rstyle);
2037#else 2017#else
2038 ccol1 = Color_fg; 2018 ccol1 = Color_fg;
2039#endif 2019#endif
2040 if (ISSET_PIXCOLOR (Color_cursor2)) 2020 if (ISSET_PIXCOLOR (Color_cursor2))
2041 ccol2 = Color_cursor2; 2021 ccol2 = Color_cursor2;
2042 else 2022 else
2043#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2023#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2044 ccol2 = GET_BGCOLOR (rstyle); 2024 ccol2 = bgcolor_of (rstyle);
2045#else 2025#else
2046 ccol2 = Color_bg; 2026 ccol2 = Color_bg;
2047#endif 2027#endif
2048 *crp = SET_FGCOLOR (*crp, ccol1); 2028 *crp = SET_FGCOLOR (*crp, ccol1);
2049 *crp = SET_BGCOLOR (*crp, ccol2); 2029 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2054 2034
2055 /* make sure no outline cursor is left around */ 2035 /* make sure no outline cursor is left around */
2056 setoldcursor = 0; 2036 setoldcursor = 0;
2057 if (ocrow != -1) 2037 if (ocrow != -1)
2058 { 2038 {
2059 if (screen.cur.row + view_start != ocrow 2039 if (screen.cur.row - view_start != ocrow
2060 || screen.cur.col != oldcursor.col) 2040 || screen.cur.col != oldcursor.col)
2061 { 2041 {
2062 if (ocrow < nrow 2042 if (ocrow < nrow
2063 && oldcursor.col < ncol) 2043 && oldcursor.col < ncol)
2064 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2044 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2065 2045
2066 if (focus || !showcursor) 2046 if (focus || !showcursor)
2067 oldcursor.row = -1; 2047 oldcursor.row = -1;
2068 else 2048 else
2069 setoldcursor = 1; 2049 setoldcursor = 1;
… …
2072 else if (!focus) 2052 else if (!focus)
2073 setoldcursor = 1; 2053 setoldcursor = 1;
2074 2054
2075 if (setoldcursor) 2055 if (setoldcursor)
2076 { 2056 {
2077 if (screen.cur.row + view_start >= nrow) 2057 if (screen.cur.row - view_start >= nrow)
2078 oldcursor.row = -1; 2058 oldcursor.row = -1;
2079 else 2059 else
2080 { 2060 {
2081 oldcursor.row = screen.cur.row + view_start; 2061 oldcursor.row = screen.cur.row - view_start;
2082 oldcursor.col = screen.cur.col; 2062 oldcursor.col = screen.cur.col;
2083 } 2063 }
2084 } 2064 }
2085 } 2065 }
2086 2066
2067 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2087#if ENABLE_OVERLAY 2068#if ENABLE_OVERLAY
2088 scr_swap_overlay (); 2069 scr_swap_overlay ();
2089#endif 2070#endif
2090 2071
2091#ifndef NO_SLOW_LINK_SUPPORT 2072#ifndef NO_SLOW_LINK_SUPPORT
2092 /* 2073 /*
2093 * D: CopyArea pass - very useful for slower links 2074 * D: CopyArea pass - very useful for slower links
2094 * This has been deliberately kept simple. 2075 * This has been deliberately kept simple.
2095 */ 2076 */
2096 i = num_scr;
2097 if (!display->is_local 2077 if (!display->is_local
2098 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2078 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2099 && abs (num_scr) < nrow && !must_clear) 2079 && abs (num_scr) < nrow && !must_clear)
2100 { 2080 {
2101 int16_t nits; 2081 int16_t nits;
2102 int j; 2082 int j;
2103 int len, wlen; 2083 int len, wlen;
2084 dLocal (int, num_scr);
2104 2085
2105 j = nrow; 2086 j = nrow;
2106 wlen = len = -1; 2087 wlen = len = -1;
2107 row = i > 0 ? 0 : j - 1; 2088 row = i > 0 ? 0 : j - 1;
2108 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2089 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2109 { 2090 {
2110 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2091 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2111 { 2092 {
2112 line_t s = save[(row + row_offset) % total_rows]; 2093 line_t s = ROW(view_start + row);
2113 line_t d = drawn[row]; 2094 line_t d = drawn_buf[row];
2114 line_t d2 = drawn[row + i]; 2095 line_t d2 = drawn_buf[row + i];
2115 2096
2116 for (nits = 0, col = ncol; col--; ) 2097 for (nits = 0, col = ncol; col--; )
2117 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])
2118 nits--; 2099 nits--;
2119 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])
… …
2137 2118
2138 if (len != -1) 2119 if (len != -1)
2139 { 2120 {
2140 /* also comes here at end if needed because of >= above */ 2121 /* also comes here at end if needed because of >= above */
2141 if (wlen < len) 2122 if (wlen < len)
2142 SWAP_IT (wlen, len, int); 2123 ::swap (wlen, len);
2143 2124
2144 XCopyArea (display->display, vt, vt, 2125 XCopyArea (display->display, vt, vt,
2145 gc, 0, Row2Pixel (len + i), 2126 gc, 0, Row2Pixel (len + i),
2146 (unsigned int)TermWin_TotalWidth (), 2127 (unsigned int)this->width,
2147 (unsigned int)Height2Pixel (wlen - len + 1), 2128 (unsigned int)Height2Pixel (wlen - len + 1),
2148 0, Row2Pixel (len)); 2129 0, Row2Pixel (len));
2149 len = -1; 2130 len = -1;
2150 } 2131 }
2151 } 2132 }
… …
2155 /* 2136 /*
2156 * E: main pass across every character 2137 * E: main pass across every character
2157 */ 2138 */
2158 for (row = 0; row < nrow; row++) 2139 for (row = 0; row < nrow; row++)
2159 { 2140 {
2160 text_t *stp = save[(row + row_offset) % total_rows].t; 2141 text_t *stp = ROW(view_start + row).t;
2161 rend_t *srp = save[(row + row_offset) % total_rows].r; 2142 rend_t *srp = ROW(view_start + row).r;
2162 text_t *dtp = drawn[row].t; 2143 text_t *dtp = drawn_buf[row].t;
2163 rend_t *drp = drawn[row].r; 2144 rend_t *drp = drawn_buf[row].r;
2164 2145
2165 /* 2146 /*
2166 * E2: OK, now the real pass 2147 * E2: OK, now the real pass
2167 */ 2148 */
2168 int ypixel = (int)Row2Pixel (row); 2149 int ypixel = (int)Row2Pixel (row);
… …
2230 count++, i--; 2211 count++, i--;
2231 2212
2232 /* 2213 /*
2233 * Determine the attributes for the string 2214 * Determine the attributes for the string
2234 */ 2215 */
2235 int fore = GET_FGCOLOR (rend); // desired foreground 2216 int fore = fgcolor_of (rend); // desired foreground
2236 int back = GET_BGCOLOR (rend); // desired background 2217 int back = bgcolor_of (rend); // desired background
2237 2218
2238 // 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
2239 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))
2240 { 2221 {
2241#if ENABLE_STYLES 2222#if ENABLE_STYLES
2242 // force redraw after "careful" characters to avoid pixel droppings 2223 // force redraw after "careful" characters to avoid pixel droppings
2243 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2224 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2279 fore = Color_UL; 2260 fore = Color_UL;
2280#endif 2261#endif
2281 2262
2282 if (invert) 2263 if (invert)
2283 { 2264 {
2284 SWAP_IT (fore, back, int); 2265 ::swap (fore, back);
2285 2266
2286#ifndef NO_BOLD_UNDERLINE_REVERSE 2267#ifndef NO_BOLD_UNDERLINE_REVERSE
2287 if (ISSET_PIXCOLOR (Color_RV)) 2268 if (ISSET_PIXCOLOR (Color_RV))
2288 back = Color_RV; 2269 back = Color_RV;
2289 2270
… …
2354 } /* for (row....) */ 2335 } /* for (row....) */
2355 2336
2356#if ENABLE_OVERLAY 2337#if ENABLE_OVERLAY
2357 scr_swap_overlay (); 2338 scr_swap_overlay ();
2358#endif 2339#endif
2340 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2359 2341
2360 /* 2342 /*
2361 * G: cleanup cursor and display outline cursor if necessary 2343 * G: cleanup cursor and display outline cursor if necessary
2362 */ 2344 */
2363 if (showcursor) 2345 if (showcursor)
2364 { 2346 {
2365 if (focus) 2347 if (focus)
2366 { 2348 {
2367 if (options & Opt_cursorUnderline) 2349 if (OPTION (Opt_cursorUnderline))
2368 *crp ^= RS_Uline; 2350 *crp ^= RS_Uline;
2369 else 2351 else
2370 { 2352 {
2371 *crp ^= RS_RVid; 2353 *crp ^= RS_RVid;
2372#ifndef NO_CURSORCOLOR 2354#ifndef NO_CURSORCOLOR
… …
2381 2363
2382 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2364 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2383 col--; 2365 col--;
2384 2366
2385 while (col + cursorwidth < ncol 2367 while (col + cursorwidth < ncol
2386 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2368 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2387 cursorwidth++; 2369 cursorwidth++;
2388 2370
2389#ifndef NO_CURSORCOLOR 2371#ifndef NO_CURSORCOLOR
2390 if (ISSET_PIXCOLOR (Color_cursor)) 2372 if (ISSET_PIXCOLOR (Color_cursor))
2391 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2373 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2402 /* 2384 /*
2403 * H: cleanup selection 2385 * H: cleanup selection
2404 */ 2386 */
2405 scr_reverse_selection (); 2387 scr_reverse_selection ();
2406 2388
2407 if (refresh_type & SMOOTH_REFRESH)
2408 XFlush (display->display);
2409
2410 num_scr = 0; 2389 num_scr = 0;
2411 num_scr_allow = 1; 2390 num_scr_allow = 1;
2412} 2391}
2413 2392
2414void 2393void
2415rxvt_term::scr_remap_chars (const line_t &l) 2394rxvt_term::scr_remap_chars (line_t &l)
2416{ 2395{
2417 if (!l.t) 2396 if (!l.t)
2418 return; 2397 return;
2419 2398
2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2400
2420 for (int i = ncol; i--; ) 2401 for (int i = ncol; i--; )
2421 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]));
2422} 2403}
2423 2404
2424void 2405void
2425rxvt_term::scr_remap_chars () 2406rxvt_term::scr_remap_chars ()
2426{ 2407{
2427 for (int i = total_rows; i--; ) 2408 for (int i = total_rows; i--; )
2428 scr_remap_chars (save[i]); 2409 scr_remap_chars (row_buf [i]);
2429 2410
2430 for (int i = nrow; i--; ) 2411 for (int i = nrow; i--; )
2431 { 2412 {
2432 scr_remap_chars (drawn[i]); 2413 scr_remap_chars (drawn_buf [i]);
2433 scr_remap_chars (swap_save[i]); 2414 scr_remap_chars (swap_buf [i]);
2434 } 2415 }
2435} 2416}
2436 2417
2437void 2418void
2438rxvt_term::scr_recolour () 2419rxvt_term::scr_recolour ()
… …
2476 2457
2477 if (really) 2458 if (really)
2478 XClearWindow (display->display, vt); 2459 XClearWindow (display->display, vt);
2479} 2460}
2480 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
2481/* ------------------------------------------------------------------------- */ 2510/* ------------------------------------------------------------------------- */
2482void 2511void
2483rxvt_term::scr_reverse_selection () 2512rxvt_term::scr_reverse_selection ()
2484{ 2513{
2485 if (selection.op 2514 if (selection.op
2486 && current_screen == selection.screen 2515 && current_screen == selection.screen
2487 && selection.end.row >= -view_start) 2516 && selection.end.row >= view_start)
2488 { 2517 {
2489 int view_end = -view_start + nrow;
2490 int row, col;
2491
2492#if ENABLE_FRILLS 2518#if ENABLE_FRILLS
2493 if (selection.rect) 2519 if (selection.rect)
2494 { 2520 scr_xor_rect (selection.beg.row, selection.beg.col,
2495 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2521 selection.end.row, selection.end.col,
2496 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2522 RS_RVid, RS_RVid | RS_Uline);
2497 srp[col] ^= RS_RVid;
2498 }
2499 else 2523 else
2500#endif 2524#endif
2501 { 2525 scr_xor_span (selection.beg.row, selection.beg.col,
2502 if (selection.beg.row >= -view_start) 2526 selection.end.row, selection.end.col,
2503 { 2527 RS_RVid);
2504 col = selection.beg.col;
2505 row = selection.beg.row;
2506 }
2507 else
2508 {
2509 col = 0;
2510 row = view_start;
2511 }
2512
2513 for (; row < min (selection.end.row, view_end); row++, col = 0)
2514 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2515 srp[col] ^= RS_RVid;
2516
2517 if (row == selection.end.row)
2518 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2519 srp[col] ^= RS_RVid;
2520 }
2521 } 2528 }
2522} 2529}
2523 2530
2524/* ------------------------------------------------------------------------- */ 2531/* ------------------------------------------------------------------------- */
2525/* 2532/*
… …
2535 char r1[] = "\n"; 2542 char r1[] = "\n";
2536 2543
2537 for (row = saveLines - nsaved; 2544 for (row = saveLines - nsaved;
2538 row < saveLines + nrow - 1; row++) 2545 row < saveLines + nrow - 1; row++)
2539 { 2546 {
2540 width = save[row].l >= 0 ? save[row].l 2547 width = row_buf[row].l >= 0 ? row_buf[row].l
2541 : ncol; 2548 : ncol;
2542 for (towrite = width; towrite; towrite -= wrote) 2549 for (towrite = width; towrite; towrite -= wrote)
2543 { 2550 {
2544 wrote = write (fd, & (save[row].t[width - towrite]), 2551 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2545 towrite); 2552 towrite);
2546 if (wrote < 0) 2553 if (wrote < 0)
2547 return; /* XXX: death, no report */ 2554 return; /* XXX: death, no report */
2548 } 2555 }
2549 if (save[row].l >= 0) 2556 if (row_buf[row].l >= 0)
2550 if (write (fd, r1, 1) <= 0) 2557 if (write (fd, r1, 1) <= 0)
2551 return; /* XXX: death, no report */ 2558 return; /* XXX: death, no report */
2552 } 2559 }
2553} 2560}
2554#endif 2561#endif
… …
2563 2570
2564 if (!selection.op) 2571 if (!selection.op)
2565 return; 2572 return;
2566 2573
2567 pos.row = pos.col = 0; 2574 pos.row = pos.col = 0;
2568 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2575 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2569 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2576 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2570 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2577 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2571 || (check_more == 1 2578 || (check_more == 1
2572 && current_screen == selection.screen 2579 && current_screen == selection.screen
2573 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2580 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2574 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2581 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2575 || (check_more == 2 2582 || (check_more == 2
… …
2586/* ------------------------------------------------------------------------- */ 2593/* ------------------------------------------------------------------------- */
2587/* 2594/*
2588 * Paste a selection direct to the command fd 2595 * Paste a selection direct to the command fd
2589 */ 2596 */
2590void 2597void
2591rxvt_term::paste (unsigned char *data, unsigned int len) 2598rxvt_term::paste (char *data, unsigned int len)
2592{ 2599{
2593 /* convert normal newline chars into common keyboard Return key sequence */ 2600 /* convert normal newline chars into common keyboard Return key sequence */
2594 for (unsigned int i = 0; i < len; i++) 2601 for (unsigned int i = 0; i < len; i++)
2595 if (data[i] == C0_LF) 2602 if (data[i] == C0_LF)
2596 data[i] = C0_CR; 2603 data[i] = C0_CR;
… …
2740 { 2747 {
2741 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2748 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2742 char *s = rxvt_wcstombs (w); 2749 char *s = rxvt_wcstombs (w);
2743 free (w); 2750 free (w);
2744 // TODO: strlen == only the first element will be converted. well... 2751 // TODO: strlen == only the first element will be converted. well...
2745 paste ((unsigned char *)s, strlen (s)); 2752 paste (s, strlen (s));
2746 free (s); 2753 free (s);
2747 } 2754 }
2748 else 2755 else
2749#endif 2756#endif
2750 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2757 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2751 && cl) 2758 && cl)
2752 { 2759 {
2753 for (int i = 0; i < cr; i++) 2760 for (int i = 0; i < cr; i++)
2754 paste ((unsigned char *)cl[i], strlen (cl[i])); 2761 paste (cl[i], strlen (cl[i]));
2755 2762
2756 XFreeStringList (cl); 2763 XFreeStringList (cl);
2757 } 2764 }
2758 else 2765 else
2759 paste (ct.value, ct.nitems); // paste raw 2766 paste ((char *)ct.value, ct.nitems); // paste raw
2760 2767
2761bailout: 2768bailout:
2762 XFree (ct.value); 2769 XFree (ct.value);
2763 2770
2764 if (selection_wait == Sel_normal) 2771 if (selection_wait == Sel_normal)
… …
2794 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2801 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2795 * will auto fallback to CUT_BUFFER0 2802 * will auto fallback to CUT_BUFFER0
2796 * EXT: button 2 release 2803 * EXT: button 2 release
2797 */ 2804 */
2798void 2805void
2799rxvt_term::selection_request (Time tm, int x, int y) 2806rxvt_term::selection_request (Time tm)
2800{ 2807{
2801 if (x < 0 || x >= width || y < 0 || y >= height)
2802 return; /* outside window */
2803
2804 if (selection.text) 2808 if (selection.text)
2805 { /* internal selection */ 2809 { /* internal selection */
2806 char *str = rxvt_wcstombs (selection.text, selection.len); 2810 char *str = rxvt_wcstombs (selection.text, selection.len);
2807 paste ((unsigned char *)str, strlen (str)); 2811 paste (str, strlen (str));
2808 free (str); 2812 free (str);
2809 return; 2813 return;
2810 } 2814 }
2811 else 2815 else
2812 { 2816 {
… …
2904 selection.op = SELECTION_DONE; 2908 selection.op = SELECTION_DONE;
2905 2909
2906 if (selection.clicks == 4) 2910 if (selection.clicks == 4)
2907 return; /* nothing selected, go away */ 2911 return; /* nothing selected, go away */
2908 2912
2913 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2914 return;
2915
2909 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2916 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2910 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));
2911 2918
2912 int ofs = 0; 2919 int ofs = 0;
2913 int extra = 0; 2920 int extra = 0;
… …
2925 col = selection.beg.col; 2932 col = selection.beg.col;
2926 end_col = ncol + 1; 2933 end_col = ncol + 1;
2927 } 2934 }
2928 else 2935 else
2929#endif 2936#endif
2930 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2937 end_col = ROW(row).l;
2931 2938
2932 col = max (col, 0); 2939 col = max (col, 0);
2933 2940
2934 if (row == selection.end.row || selection.rect) 2941 if (row == selection.end.row
2942#if ENABLE_FRILLS
2943 || selection.rect
2944#endif
2945 )
2935 end_col = min (end_col, selection.end.col); 2946 min_it (end_col, selection.end.col);
2936 2947
2937 t = ROW(row).t + col; 2948 t = ROW(row).t + col;
2949
2938 for (; col < end_col; col++) 2950 for (; col < end_col; col++)
2939 { 2951 {
2940 if (*t == NOCHAR) 2952 if (*t == NOCHAR)
2941 t++; 2953 t++;
2942#if ENABLE_COMBINING 2954#if ENABLE_COMBINING
… …
2958#endif 2970#endif
2959 else 2971 else
2960 new_selection_text[ofs++] = *t++; 2972 new_selection_text[ofs++] = *t++;
2961 } 2973 }
2962 2974
2975#if ENABLE_FRILLS
2976 if (selection.rect)
2977 {
2978 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1]))
2981 --ofs;
2982
2983 new_selection_text[ofs++] = C0_LF;
2984 }
2985 else
2986#endif
2963 if (!ROW(row).is_longer () && row != selection.end.row) 2987 if (!ROW(row).is_longer () && row != selection.end.row)
2964 new_selection_text[ofs++] = C0_LF; 2988 new_selection_text[ofs++] = C0_LF;
2965 } 2989 }
2966 2990
2967 if (end_col != selection.end.col) 2991 if (end_col != selection.end.col)
2968 new_selection_text[ofs++] = C0_LF; 2992 new_selection_text[ofs++] = C0_LF;
2969 2993
… …
2979 3003
2980 // 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
2981 selection.len = ofs; 3005 selection.len = ofs;
2982 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));
2983 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
2984 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2985 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3021 {
2986 display->set_selection_owner (this); 3022 display->set_selection_owner (this);
3023 return true;
3024 }
2987 else 3025 else
2988 rxvt_warn ("can't get primary selection, ignoring.\n"); 3026 {
3027 selection_clear ();
3028 return false;
3029 }
2989 3030
2990#if 0 3031#if 0
2991 XTextProperty ct; 3032 XTextProperty ct;
2992 3033
2993 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2994 { 3035 {
2995 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3036 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2996 XFree (ct.value); 3037 XFree (ct.value);
2997 } 3038 }
2998#endif 3039#endif
2999
3000 selection_time = tm;
3001} 3040}
3002 3041
3003/* ------------------------------------------------------------------------- */ 3042/* ------------------------------------------------------------------------- */
3004/* 3043/*
3005 * 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
… …
3009rxvt_term::selection_click (int clicks, int x, int y) 3048rxvt_term::selection_click (int clicks, int x, int y)
3010{ 3049{
3011 clicks = ((clicks - 1) % 3) + 1; 3050 clicks = ((clicks - 1) % 3) + 1;
3012 selection.clicks = clicks; /* save clicks so extend will work */ 3051 selection.clicks = clicks; /* save clicks so extend will work */
3013 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
3014 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3062 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3015 3063
3016 if (clicks == 2 || clicks == 3) 3064 if (clicks == 2 || clicks == 3)
3017 selection_extend_colrow (selection.mark.col, 3065 selection_extend_colrow (selection.mark.col,
3018 selection.mark.row + view_start, 3066 selection.mark.row - view_start,
3019 0, /* button 3 */ 3067 0, /* button 3 */
3020 1, /* button press */ 3068 1, /* button press */
3021 0); /* click change */ 3069 0); /* click change */
3022} 3070}
3023 3071
… …
3028void 3076void
3029rxvt_term::selection_start_colrow (int col, int row) 3077rxvt_term::selection_start_colrow (int col, int row)
3030{ 3078{
3031 want_refresh = 1; 3079 want_refresh = 1;
3032 3080
3033 selection.mark.row = row - view_start; 3081 selection.mark.row = row + view_start;
3034 selection.mark.col = col; 3082 selection.mark.col = col;
3035 3083
3036 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); 3084 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3037 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); 3085 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3038 3086
3039 while (selection.mark.col > 0 3087 while (selection.mark.col > 0
3040 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3088 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3041 --selection.mark.col; 3089 --selection.mark.col;
3042 3090
… …
3069 text_t *stp; 3117 text_t *stp;
3070 rend_t *srp; 3118 rend_t *srp;
3071 3119
3072 if (dirn == UP) 3120 if (dirn == UP)
3073 { 3121 {
3074 bound.row = - nsaved - 1; 3122 bound.row = top_row - 1;
3075 bound.col = 0; 3123 bound.col = 0;
3076 dirnadd = -1; 3124 dirnadd = -1;
3077 } 3125 }
3078 else 3126 else
3079 { 3127 {
… …
3127 } 3175 }
3128 } 3176 }
3129 break; 3177 break;
3130 } 3178 }
3131 3179
3132Old_Word_Selection_You_Die:
3133 if (dirn == DN) 3180 if (dirn == DN)
3134 col++; /* put us on one past the end */ 3181 col++; /* put us on one past the end */
3135 3182
3136 /* Poke the values back in */ 3183 /* Poke the values back in */
3137 ret->row = row; 3184 ret->row = row;
… …
3147 * flag == 2 ==> button 3 motion 3194 * flag == 2 ==> button 3 motion
3148 */ 3195 */
3149void 3196void
3150rxvt_term::selection_extend (int x, int y, int flag) 3197rxvt_term::selection_extend (int x, int y, int flag)
3151{ 3198{
3152 int col = min (max (Pixel2Col (x), 0), nrow - 1); 3199 int col = clamp (Pixel2Col (x), 0, ncol);
3153 int row = min (max (Pixel2Row (y), 0), ncol); 3200 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3154 3201
3155 /* 3202 /*
3156 * 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
3157 * 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
3158 * 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
3159 * be _past_ a character for it to be selected. 3206 * be _past_ a character for it to be selected.
3160 */ 3207 */
3161 if (((selection.clicks % 3) == 1) && !flag 3208 if (((selection.clicks % 3) == 1) && !flag
3162 && (col == selection.mark.col 3209 && (col == selection.mark.col
3163 && (row == selection.mark.row + view_start))) 3210 && (row == selection.mark.row - view_start)))
3164 { 3211 {
3165 /* select nothing */ 3212 /* select nothing */
3166 selection.beg.row = selection.end.row = 0; 3213 selection.beg.row = selection.end.row = 0;
3167 selection.beg.col = selection.end.col = 0; 3214 selection.beg.col = selection.end.col = 0;
3168 selection.clicks = 4; 3215 selection.clicks = 4;
… …
3223 selection.beg.col = selection.end.col = selection.mark.col; 3270 selection.beg.col = selection.end.col = selection.mark.col;
3224 selection.beg.row = selection.end.row = selection.mark.row; 3271 selection.beg.row = selection.end.row = selection.mark.row;
3225 } 3272 }
3226 3273
3227 pos.col = col; 3274 pos.col = col;
3228 pos.row = row - view_start; 3275 pos.row = view_start + row;
3229 3276
3230 /* 3277 /*
3231 * 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
3232 * in the way button3 drag extension works. 3279 * in the way button3 drag extension works.
3233 * We're either doing: button1 drag; button3 press; or button3 drag 3280 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3320 selection_delimit_word (DN, &selection.end, &selection.end); 3367 selection_delimit_word (DN, &selection.end, &selection.end);
3321 } 3368 }
3322 else if (selection.clicks == 3) 3369 else if (selection.clicks == 3)
3323 { 3370 {
3324#if ENABLE_FRILLS 3371#if ENABLE_FRILLS
3325 if (options & Opt_tripleclickwords) 3372 if (OPTION (Opt_tripleclickwords))
3326 { 3373 {
3327 selection_delimit_word (UP, &selection.beg, &selection.beg); 3374 selection_delimit_word (UP, &selection.beg, &selection.beg);
3328 3375
3329 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++)
3330 { 3377 {
… …
3371 } 3418 }
3372 } 3419 }
3373 3420
3374#if ENABLE_FRILLS 3421#if ENABLE_FRILLS
3375 if (selection.rect && selection.beg.col > selection.end.col) 3422 if (selection.rect && selection.beg.col > selection.end.col)
3376 SWAP_IT (selection.beg.col, selection.end.col, int); 3423 ::swap (selection.beg.col, selection.end.col);
3377#endif 3424#endif
3378} 3425}
3379 3426
3380#if ENABLE_FRILLS 3427#if ENABLE_FRILLS
3381void 3428void
… …
3391 { 3438 {
3392 stp = ROW(end_row).t; 3439 stp = ROW(end_row).t;
3393 3440
3394 while (--end_col >= 0) 3441 while (--end_col >= 0)
3395 { 3442 {
3396 if (stp[end_col] != ' ' 3443 if (stp[end_col] != NOCHAR
3397 && stp[end_col] != '\t' 3444 && !unicode::is_space (stp[end_col]))
3398 && stp[end_col] != NOCHAR)
3399 break; 3445 break;
3400 } 3446 }
3401 3447
3402 if (end_col >= 0 3448 if (end_col >= 0
3403 || !ROW(end_row - 1).is_longer ()) 3449 || !ROW(end_row - 1).is_longer ())
… …
3579 */ 3625 */
3580void 3626void
3581rxvt_term::pixel_position (int *x, int *y) 3627rxvt_term::pixel_position (int *x, int *y)
3582{ 3628{
3583 *x = Pixel2Col (*x); 3629 *x = Pixel2Col (*x);
3584 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3630 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3585 *y = Pixel2Row (*y); 3631 *y = Pixel2Row (*y);
3586 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3632 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3587} 3633}
3588 3634
3589/* ------------------------------------------------------------------------- */ 3635/* ------------------------------------------------------------------------- */
3590#ifdef USE_XIM 3636#ifdef USE_XIM
3591void 3637void
… …
3602 3648
3603#if ENABLE_OVERLAY 3649#if ENABLE_OVERLAY
3604void 3650void
3605rxvt_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)
3606{ 3652{
3607 if (nrow < 3 || ncol < 3) 3653 if (nrow < 1 || ncol < 1)
3608 return; 3654 return;
3609 3655
3610 want_refresh = 1; 3656 want_refresh = 1;
3611 3657
3612 scr_overlay_off (); 3658 scr_overlay_off ();
3613 3659
3614 if (x < 0) x = ncol - w; 3660 if (x < 0) x = ncol - w;
3615 if (y < 0) y = nrow - h; 3661 if (y < 0) y = nrow - h;
3616 3662
3617 // make space for border 3663 // make space for border
3618 w += 2; MIN_IT (w, ncol); 3664 w += 2; min_it (w, ncol);
3619 h += 2; MIN_IT (h, nrow); 3665 h += 2; min_it (h, nrow);
3620 3666
3621 x -= 1; MAX_IT (x, 0); 3667 x -= 1; clamp_it (x, 0, ncol - w);
3622 y -= 1; MAX_IT (y, 0); 3668 y -= 1; clamp_it (y, 0, nrow - h);
3623
3624 MIN_IT (x, ncol - w);
3625 MIN_IT (y, nrow - h);
3626 3669
3627 ov_x = x; ov_y = y; 3670 ov_x = x; ov_y = y;
3628 ov_w = w; ov_h = h; 3671 ov_w = w; ov_h = h;
3629 3672
3630 ov_text = new text_t *[h]; 3673 ov_text = new text_t *[h];
… …
3722 for (int y = ov_h; y--; ) 3765 for (int y = ov_h; y--; )
3723 { 3766 {
3724 text_t *t1 = ov_text[y]; 3767 text_t *t1 = ov_text[y];
3725 rend_t *r1 = ov_rend[y]; 3768 rend_t *r1 = ov_rend[y];
3726 3769
3727 text_t *t2 = ROW(y - view_start).t + ov_x; 3770 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3728 rend_t *r2 = ROW(y - view_start).r + ov_x; 3771 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3729 3772
3730 for (int x = ov_w; x--; ) 3773 for (int x = ov_w; x--; )
3731 { 3774 {
3732 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3775 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3733 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3776 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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