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.175 by root, Tue Dec 20 19:30:59 2005 UTC vs.
Revision 1.243 by ayin, Thu Jan 19 23:15:21 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;
… …
234 selection.text = NULL; 234 selection.text = NULL;
235 selection.len = 0; 235 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
238 selection.clicks = 0; 238 selection.clicks = 0;
239 CLEAR_ALL_SELECTION ();
240 rvideo = 0; 239 rvideo = 0;
241 } 240 }
242 else 241 else
243 { 242 {
244 /* 243 /*
245 * add or delete rows as appropriate 244 * add or delete rows as appropriate
246 */ 245 */
247 246
248 rxvt_salloc *old_ta; 247 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
249 rxvt_salloc *old_ra; 248 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250 249
250#if 0
251 if (nrow < prev_nrow) 251 if (nrow < prev_nrow)
252 { 252 {
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, 1);
257
258 for (p = nrow; p < prev_nrow; p++) 253 for (int row = nrow; row < prev_nrow; row++)
259 { 254 {
260 lfree (ROW(p));
261 lfree (swap_save[p]); 255 lfree (swap_buf [row]);
262 lfree (drawn[p]); 256 lfree (drawn_buf[row]);
263 } 257 }
258 }
259#endif
264 260
265 /* we have fewer rows so fix up cursor position */ 261 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
266 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 262 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267 263
268 scr_reset_realloc (); /* realloc _last_ */ 264 for (int row = min (nrow, prev_nrow); row--; )
265 {
266 lresize (drawn_buf[row]);
267 lresize (swap_buf [row]);
268 }
269
270 for (int row = prev_nrow; row < nrow; row++)
271 {
272 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 }
275
276 line_t *old_buf = row_buf;
277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
269 } 278
270 else if (nrow > prev_nrow) 279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row
282
283 if (top_row)
284 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm.
287
288 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290
271 { 291 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 { 292 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 293 p = MOD (p - 1, prev_total_rows);
289 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
290 }
291
292 if (k > 0)
293 {
294 scr_scroll_text (0, (int)nrow - 1, -k, 1);
295 screen.cur.row += k;
296 screen.s_cur.row += k;
297 nsaved -= k;
298 }
299
300#ifdef DEBUG_STRICT 294#ifdef DEBUG_STRICT
301 assert (screen.cur.row < nrow); 295 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 296#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; 297 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l;
352 299
353 assert (llen >= 0); 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
354
355 while (p && save[p - 1].l < 0)
356 { 301 {
302 p = MOD (p - 1, prev_total_rows);
303
357 --p; 304 plines++;
358 llen += prev_ncol; 305 llen += prev_ncol;
359 } 306 }
360 307
361 int qlines = llen / ncol + 1; 308 int qlines = max (0, (llen - 1) / ncol) + 1;
309
310 // drop partial lines completely
311 if (q < qlines)
312 break;
313
314 q -= qlines;
315
362 int lofs = 0; 316 int lofs = 0;
317 line_t *qline;
363 318
364 q -= qlines; 319 // 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++) 320 for (int qrow = q; qlines--; qrow++)
370 { 321 {
322 qline = row_buf + qrow;
323 lalloc (*qline);
324 qline->l = ncol;
325 qline->is_longer (1);
326
327 int qcol = 0;
328
329 // see below for cursor adjustment rationale
371 if (qrow >= 0) 330 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow);
332
333 // fill a single destination line
334 while (lofs < llen && qcol < ncol)
372 { 335 {
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; 336 int prow = lofs / prev_ncol;
382 int pcol = lofs % prev_ncol; 337 int pcol = lofs % prev_ncol;
383 338
339 prow = MOD (p + prow, prev_total_rows);
340
341 // we only adjust the cursor _row_ and put it into
342 // the topmost line of "long line" it was in, as
343 // this seems to upset applications/shells/readline
344 // least.
345 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow);
347
348 line_t &pline = old_buf [prow];
349
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385 351
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); 352#if DEBUG_STRICT
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); 353 assert (len);
354 assert (pline.t);
355#endif
400 356
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403 359
404 lofs += len; 360 lofs += len;
405 qcol += len; 361 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 } 362 }
411 else
412 lofs += ncol;
413 } 363 }
364
365 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
366 qline->is_longer (0);
367 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414 } 368 }
369 while (p != pend && q > 0);
370
371 term_start = total_rows - nrow;
372 top_row = q - term_start;
373
374 // make sure all terminal lines exist
375 while (top_row > 0)
376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
377 }
378 else
415 } 379 {
380 // if no scrollback exists (yet), wing, instead of wrap
381
382 for (int row = min (nrow, prev_nrow); row--; )
383 {
384 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
385 line_t &qline = row_buf [row];
416 386
417 free (screen.text); screen.text = tp; 387 qline = pline;
418 free (screen.rend); screen.rend = rp; 388 lresize (qline);
419 free (screen.tlen); screen.tlen = tl; 389 }
420 390
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 391 for (int row = prev_nrow; row < nrow; row++)
422#endif 392 {
393 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
394 }
395
396 term_start = 0;
397 }
398
399 free (old_buf);
400 delete old_ta;
401 delete old_ra;
402
403 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1);
423 405
424 if (tabs) 406 if (tabs)
425 free (tabs); 407 free (tabs);
426 } 408 }
427 409
410 CLEAR_ALL_SELECTION ();
411
428 prev_nrow = nrow; 412 prev_nrow = nrow;
429 prev_ncol = ncol; 413 prev_ncol = ncol;
430 414
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 416
433 for (p = 0; p < ncol; p++) 417 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 418 tabs [col] = col % TABSIZE == 0;
435 419
436 tt_winch (); 420 tt_winch ();
437}
438 421
439void 422 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} 423}
447 424
448/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
449/* 426/*
450 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
… …
453rxvt_term::scr_release () 430rxvt_term::scr_release ()
454{ 431{
455 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
456 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
457 434
458 free (save); 435 free (row_buf);
459 free (swap_save); 436 free (swap_buf);
460 free (drawn); 437 free (drawn_buf);
461 free (buf);
462 free (tabs); 438 free (tabs);
439
440 row_buf = 0; // signal that we freed all the arrays
463} 441}
464 442
465/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
466/* 444/*
467 * Hard reset 445 * Hard reset
… …
472 scr_release (); 450 scr_release ();
473 prev_nrow = prev_ncol = 0; 451 prev_nrow = prev_ncol = 0;
474 scr_reset (); 452 scr_reset ();
475 453
476 scr_clear (true); 454 scr_clear (true);
477 scr_refresh (SLOW_REFRESH); 455 scr_refresh ();
478} 456}
479 457
480/* ------------------------------------------------------------------------- * 458/* ------------------------------------------------------------------------- *
481 * PROCESS SCREEN COMMANDS * 459 * PROCESS SCREEN COMMANDS *
482 * ------------------------------------------------------------------------- */ 460 * ------------------------------------------------------------------------- */
… …
484 * Save and Restore cursor 462 * Save and Restore cursor
485 * XTERM_SEQ: Save cursor : ESC 7 463 * XTERM_SEQ: Save cursor : ESC 7
486 * XTERM_SEQ: Restore cursor: ESC 8 464 * XTERM_SEQ: Restore cursor: ESC 8
487 */ 465 */
488void 466void
489rxvt_term::scr_cursor (int mode) 467rxvt_term::scr_cursor (cursor_mode mode)
490{ 468{
491 screen_t *s; 469 screen_t *s;
492 470
493#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 471#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
494 if (current_screen == SECONDARY) 472 if (current_screen == SECONDARY)
… …
518 set_font_style (); 496 set_font_style ();
519 break; 497 break;
520 } 498 }
521 499
522 /* boundary check in case screen size changed between SAVE and RESTORE */ 500 /* boundary check in case screen size changed between SAVE and RESTORE */
523 MIN_IT (s->cur.row, nrow - 1); 501 min_it (s->cur.row, nrow - 1);
524 MIN_IT (s->cur.col, ncol - 1); 502 min_it (s->cur.col, ncol - 1);
525#ifdef DEBUG_STRICT 503#ifdef DEBUG_STRICT
526 assert (s->cur.row >= 0); 504 assert (s->cur.row >= 0);
527 assert (s->cur.col >= 0); 505 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 506#endif
532} 507}
533 508
534/* ------------------------------------------------------------------------- */ 509/* ------------------------------------------------------------------------- */
535/* 510/*
… …
538 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
539 */ 514 */
540int 515int
541rxvt_term::scr_change_screen (int scrn) 516rxvt_term::scr_change_screen (int scrn)
542{ 517{
543 int i;
544#if NSCREENS
545 int offset;
546#endif
547
548 want_refresh = 1; 518 want_refresh = 1;
549
550 view_start = 0; 519 view_start = 0;
551 520
552 if (current_screen == scrn) 521 if (current_screen == scrn)
553 return scrn; 522 return scrn;
554 523
555 selection_check (2); /* check for boundary cross */ 524 selection_check (2); /* check for boundary cross */
556 525
557 i = current_screen; current_screen = scrn; scrn = i; 526 int i = current_screen; current_screen = scrn; scrn = i;
558 527
559 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 528 ::swap (screen.cur.row, swap.cur.row);
560 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 529 ::swap (screen.cur.col, swap.cur.col);
561 MAX_IT (screen.cur.row, 0); 530
562 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
563 MAX_IT (screen.cur.col, 0); 532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
564 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
565 533
566#if NSCREENS 534#if NSCREENS
567 if (options & Opt_secondaryScreen) 535 if (OPTION (Opt_secondaryScreen))
568 { 536 {
569 num_scr = 0; 537 num_scr = 0;
570 offset = saveLines;
571 538
572 for (i = prev_nrow; i--;) 539 for (int i = prev_nrow; i--; )
573 SWAP_IT (ROW(i), swap_save[i], line_t); 540 ::swap (ROW(i), swap_buf [i]);
574 541
575 SWAP_IT (screen.charset, swap.charset, int16_t); 542 ::swap (screen.charset, swap.charset);
576 SWAP_IT (screen.flags, swap.flags, int); 543 ::swap (screen.flags, swap.flags);
577 screen.flags |= Screen_VisibleCursor; 544 screen.flags |= Screen_VisibleCursor;
578 swap.flags |= Screen_VisibleCursor; 545 swap.flags |= Screen_VisibleCursor;
579 } 546 }
580 else 547 else
581#endif 548#endif
582 if (options & Opt_secondaryScroll) 549 if (OPTION (Opt_secondaryScroll))
583 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 550 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
584 551
585 return scrn; 552 return scrn;
586} 553}
587 554
588// clear WrapNext indicator, solidifying position on next line 555// clear WrapNext indicator, solidifying position on next line
… …
595 screen.flags &= ~Screen_WrapNext; 562 screen.flags &= ~Screen_WrapNext;
596 563
597 screen.cur.col = 0; 564 screen.cur.col = 0;
598 565
599 if (screen.cur.row == screen.bscroll) 566 if (screen.cur.row == screen.bscroll)
600 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 567 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
601 else if (screen.cur.row < nrow - 1) 568 else if (screen.cur.row < nrow - 1)
602 screen.cur.row++; 569 screen.cur.row++;
603} 570}
604 571
605/* ------------------------------------------------------------------------- */ 572/* ------------------------------------------------------------------------- */
… …
607 * Change the colour for following text 574 * Change the colour for following text
608 */ 575 */
609void 576void
610rxvt_term::scr_color (unsigned int color, int fgbg) 577rxvt_term::scr_color (unsigned int color, int fgbg)
611{ 578{
612 if (color > maxTermCOLOR) 579 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
613 color = fgbg; 580 color = fgbg;
614 581
615 if (fgbg == Color_fg) 582 if (fgbg == Color_fg)
616 rstyle = SET_FGCOLOR (rstyle, color); 583 rstyle = SET_FGCOLOR (rstyle, color);
617 else 584 else
… …
636/* ------------------------------------------------------------------------- */ 603/* ------------------------------------------------------------------------- */
637/* 604/*
638 * Scroll text between <row1> and <row2> inclusive, by <count> lines 605 * Scroll text between <row1> and <row2> inclusive, by <count> lines
639 * count positive ==> scroll up 606 * count positive ==> scroll up
640 * count negative ==> scroll down 607 * count negative ==> scroll down
641 * spec == 0 for normal routines
642 */ 608 */
643int 609int
644rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 610rxvt_term::scr_scroll_text (int row1, int row2, int count)
645{ 611{
646 int i, j;
647
648 if (count == 0 || (row1 > row2)) 612 if (count == 0 || (row1 > row2))
649 return 0; 613 return 0;
650 614
651 want_refresh = 1; 615 want_refresh = 1;
616 num_scr += count;
652 617
653 if (row1 == 0 && count > 0 618 if (count > 0
619 && row1 == 0
654 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
655 { 621 {
656 nsaved = min (nsaved + count, saveLines); 622 top_row = max (top_row - count, -saveLines);
623
624 // scroll everything up 'count' lines
657 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
658 626
627 // sever bottommost line
628 {
629 line_t &l = ROW(row2 - count);
630 l.is_longer (0);
631 l.touch ();
632 }
633
634 // erase newly scrolled-in lines
635 for (int i = count; i--; )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - 1 - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
658
659 // move and/or clear selection, if any
659 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
660 { 661 {
661 selection.beg.row -= count; 662 selection.beg.row -= count;
662 selection.end.row -= count; 663 selection.end.row -= count;
663 selection.mark.row -= count; 664 selection.mark.row -= count;
664 }
665 665
666 for (int i = count; i--; ) 666 if (selection.beg.row < top_row
667 scr_blank_screen_mem (ROW(row2 - i), rstyle); 667 || selection.end.row < top_row
668 668 || selection.mark.row < top_row)
669 if ((options & Opt_scrollWithBuffer)
670 && view_start != 0
671 && view_start != saveLines)
672 scr_page (UP, count);
673 }
674 else
675 {
676 if (!spec)
677 row1 += saveLines;
678
679 row2 += saveLines;
680
681 if (selection.op && current_screen == selection.screen)
682 {
683 i = selection.beg.row + saveLines;
684 j = selection.end.row + saveLines;
685
686 if ((i < row1 && j > row1)
687 || (i < row2 && j > row2)
688 || (i - count < row1 && i >= row1)
689 || (i - count > row2 && i <= row2)
690 || (j - count < row1 && j >= row1)
691 || (j - count > row2 && j <= row2))
692 { 669 {
693 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
694 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
695 } 672 }
696 else if (j >= row1 && j <= row2) 673 }
674
675 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer)
677 && view_start != 0
678 && view_start != -saveLines)
679 scr_page (UP, count);
680
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
682 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
683 }
684 else
685 {
686 if (selection.op && current_screen == selection.screen)
687 {
688 if ((selection.beg.row < row1 && selection.end.row > row1)
689 || (selection.beg.row < row2 && selection.end.row > row2)
690 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
691 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
692 || (selection.end.row - count < row1 && selection.end.row >= row1)
693 || (selection.end.row - count > row2 && selection.end.row <= row2))
694 {
695 CLEAR_ALL_SELECTION ();
696 selection.op = SELECTION_CLEAR;
697 }
698 else if (selection.end.row >= row1 && selection.end.row <= row2)
697 { 699 {
698 /* move selected region too */ 700 /* move selected region too */
699 selection.beg.row -= count; 701 selection.beg.row -= count;
700 selection.end.row -= count; 702 selection.end.row -= count;
701 selection.mark.row -= count; 703 selection.mark.row -= count;
704
705 selection_check (0);
702 } 706 }
703 } 707 }
704 708
705 selection_check (0); /* _after_ nsaved update */ 709 // use a simple and robust scrolling algorithm, this
710 // part of scr_scroll_text is not time-critical.
706 711
707 num_scr += count;
708 j = count;
709
710 if (count < 0)
711 count = -count;
712
713 i = row2 - row1 + 1; 712 int rows = row2 - row1 + 1;
714 MIN_IT (count, i);
715 713
716 if (j > 0) 714 min_it (count, rows);
717 {
718 /* scroll up */
719 715
720 /* Copy lines that will get clobbered by the rotation */ 716 line_t *temp_buf = row_buf + total_rows;
721 memcpy (buf, save + row1, count * sizeof (line_t));
722 717
723 /* Rotate lines */ 718 for (int row = 0; row < rows; row++)
724 i = row2 - row1 - count + 1;
725 memmove (save + row1, save + row1 + count, i * sizeof (line_t));
726
727 j = row2 - count + 1, i = count;
728 } 719 {
729 else /* if (j < 0) */ 720 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
721
722 if (!IN_RANGE_EXC (row + count, 0, rows))
723 scr_blank_screen_mem (temp_buf [row], rstyle);
730 { 724 }
731 /* scroll down */
732 725
733 /* Copy lines that will get clobbered by the rotation */ 726 for (int row = 0; row < rows; row++)
734 for (i = 0, j = row2; i < count; i++, j--) 727 ROW(row1 + row) = temp_buf [row];
735 buf[i] = save[j];
736
737 /* Rotate lines */
738 for (j = row2, i = j - count; i >= row1; i--, j--)
739 save[j] = save[i];
740
741 j = row1, i = count;
742 count = -count;
743 }
744
745 /* Resurrect lines */
746 memcpy (save + j, buf, i * sizeof (line_t));
747
748 if (!spec) /* line length may not equal ncol */
749 for (; i--; j++)
750 scr_blank_screen_mem (save[j], rstyle);
751 } 728 }
752 729
753 return count; 730 return count;
754} 731}
755 732
756/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
757/* 734/*
758 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
759 */ 736 */
760void 737void
761rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 738rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
762{ 739{
763 if (len <= 0) /* sanity */ 740 if (len <= 0) /* sanity */
764 return; 741 return;
765 742
766 unsigned char checksel; 743 unsigned char checksel;
767 unicode_t c; 744 unicode_t c;
768 int row, last_col; 745 int ncol = this->ncol;
769 const unicode_t *strend = str + len; 746 const wchar_t *strend = str + len;
770 747
771 want_refresh = 1; 748 want_refresh = 1;
772 ZERO_SCROLLBACK (); 749 ZERO_SCROLLBACK ();
773 last_col = ncol;
774 750
775 if (nlines > 0) 751 if (minlines > 0)
776 { 752 {
777 nlines += screen.cur.row - screen.bscroll; 753 minlines += screen.cur.row - screen.bscroll;
754
778 if ((nlines > 0) 755 if (minlines > 0
779 && (screen.tscroll == 0) 756 && screen.tscroll == 0
780 && (screen.bscroll == (nrow - 1))) 757 && screen.bscroll == nrow - 1)
781 { 758 {
782 /* _at least_ this many lines need to be scrolled */ 759 /* _at least_ this many lines need to be scrolled */
783 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 760 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= nlines; 761 screen.cur.row -= minlines;
785 } 762 }
786 } 763 }
787 764
788#ifdef DEBUG_STRICT 765#ifdef DEBUG_STRICT
789 assert (screen.cur.col < last_col); 766 assert (screen.cur.col < ncol);
790 assert ((screen.cur.row < nrow) 767 assert (screen.cur.row < nrow
791 && (screen.cur.row >= - (int32_t)nsaved)); 768 && screen.cur.row >= top_row);
792#else /* drive with your eyes closed */
793 MIN_IT (screen.cur.col, last_col - 1);
794 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
795 MAX_IT (screen.cur.row, - (int32_t)nsaved);
796#endif 769#endif
797 row = screen.cur.row; 770 int row = screen.cur.row;
798 771
799 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 772 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
800 773
801 line_t *line = &ROW(row); 774 line_t *line = &ROW(row);
802 775
803 while (str < strend) 776 while (str < strend)
804 { 777 {
805 c = *str++; 778 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
806 779
807 if (c < 0x20) 780 if (c < 0x20)
808 if (c == C0_LF) 781 if (c == C0_LF)
809 { 782 {
810 if (!line->is_longer ()) /* XXX: think about this */
811 MAX_IT (line->l, screen.cur.col); 783 max_it (line->l, screen.cur.col);
812 784
813 screen.flags &= ~Screen_WrapNext; 785 screen.flags &= ~Screen_WrapNext;
814 786
815 if (screen.cur.row == screen.bscroll) 787 if (screen.cur.row == screen.bscroll)
816 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 788 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
817 else if (screen.cur.row < (nrow - 1)) 789 else if (screen.cur.row < (nrow - 1))
818 row = ++screen.cur.row; 790 row = ++screen.cur.row;
819 791
820 line = &ROW(row); /* _must_ refresh */ 792 line = &ROW(row); /* _must_ refresh */
821 continue; 793 continue;
822 } 794 }
823 else if (c == C0_CR) 795 else if (c == C0_CR)
824 { 796 {
825 if (!line->is_longer ()) /* XXX: think about this */
826 MAX_IT (line->l, screen.cur.col); 797 max_it (line->l, screen.cur.col);
827 798
828 screen.flags &= ~Screen_WrapNext; 799 screen.flags &= ~Screen_WrapNext;
829 screen.cur.col = 0; 800 screen.cur.col = 0;
830 continue; 801 continue;
831 } 802 }
… …
848 CLEAR_SELECTION (); 819 CLEAR_SELECTION ();
849 } 820 }
850 821
851 if (screen.flags & Screen_WrapNext) 822 if (screen.flags & Screen_WrapNext)
852 { 823 {
853 line->set_is_longer ();
854
855 scr_do_wrap (); 824 scr_do_wrap ();
856 825
826 line->l = ncol;
827 line->is_longer (1);
828
857 row = screen.cur.row; 829 row = screen.cur.row;
858 line = &ROW(row); /* _must_ refresh */ 830 line = &ROW(row); /* _must_ refresh */
859 } 831 }
860 832
861 // some utf-8 decoders "decode" surrogate characters: let's fix this. 833 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
866 // do wcwidth before further replacements, as wcwidth might return -1 838 // do wcwidth before further replacements, as wcwidth might return -1
867 // for the line drawing characters below as they might be invalid in the current 839 // for the line drawing characters below as they might be invalid in the current
868 // locale. 840 // locale.
869 int width = c < 0x100 ? 1 : wcwidth (c); 841 int width = c < 0x100 ? 1 : wcwidth (c);
870 842
871 if (charsets[screen.charset] == '0') // DEC SPECIAL 843 if (charsets [screen.charset] == '0') // DEC SPECIAL
872 { 844 {
873 // vt100 special graphics and line drawing 845 // vt100 special graphics and line drawing
874 // 5f-7e standard vt100 846 // 5f-7e standard vt100
875 // 40-5e rxvt extension for extra curses acs chars 847 // 40-5e rxvt extension for extra curses acs chars
876 static uint16_t vt100_0[62] = { // 41 .. 7e 848 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
928 } 900 }
929 901
930 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
931 903
932 // if the character doesn't fit into the remaining columns... 904 // if the character doesn't fit into the remaining columns...
933 if (screen.cur.col > last_col - width && last_col >= width) 905 if (screen.cur.col > ncol - width && ncol >= width)
934 { 906 {
935 // ...output spaces 907 // ...output spaces
936 c = ' '; 908 c = ' ';
937 // and try the same character next loop iteration 909 // and try the same character next loop iteration
938 --str; 910 --str;
939 } 911 }
940 912
913 line->touch ();
914
941 do 915 do
942 { 916 {
943 line->t[screen.cur.col] = c; 917 line->t[screen.cur.col] = c;
944 line->r[screen.cur.col] = rend; 918 line->r[screen.cur.col] = rend;
945 919
946 if (screen.cur.col < last_col - 1) 920 if (screen.cur.col < ncol - 1)
947 screen.cur.col++; 921 screen.cur.col++;
948 else 922 else
949 { 923 {
950 line->l = last_col; 924 line->l = ncol;
951 if (screen.flags & Screen_Autowrap) 925 if (screen.flags & Screen_Autowrap)
952 screen.flags |= Screen_WrapNext; 926 screen.flags |= Screen_WrapNext;
953 break; 927 break;
954 } 928 }
955 929
… …
957 } 931 }
958 while (--width > 0); 932 while (--width > 0);
959 933
960 // pad with spaces when overwriting wide character with smaller one 934 // pad with spaces when overwriting wide character with smaller one
961 if (!width) 935 if (!width)
936 {
937 line->touch ();
938
962 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
963 { 940 {
964 line->t[c] = ' '; 941 line->t[c] = ' ';
965 line->r[c] = rend; 942 line->r[c] = rend;
966 } 943 }
944 }
967 } 945 }
968 else // width == 0 946 else // width == 0
969 { 947 {
970#if ENABLE_COMBINING 948#if ENABLE_COMBINING
971 // handle combining characters 949 // handle combining characters
972 // we just tag the accent on the previous on-screen character. 950 // we just tag the accent on the previous on-screen character.
973 // this is arguably not correct, but also arguably not wrong. 951 // this is arguably not correct, but also arguably not wrong.
974 // we don't handle double-width characters nicely yet. 952 // we don't handle double-width characters nicely yet.
953 line_t *linep;
975 text_t *tp; 954 text_t *tp;
976 rend_t *rp; 955 rend_t *rp;
977 956
978 if (screen.cur.col > 0) 957 if (screen.cur.col > 0)
979 { 958 {
959 linep = line;
980 tp = line->t + screen.cur.col - 1; 960 tp = line->t + screen.cur.col - 1;
981 rp = line->r + screen.cur.col - 1; 961 rp = line->r + screen.cur.col - 1;
982
983 while (*tp == NOCHAR && tp > line->t)
984 tp--, rp--;
985 } 962 }
986 else if (screen.cur.row > 0 963 else if (screen.cur.row > 0
987 && ROW(screen.cur.row - 1).is_longer ()) 964 && ROW(screen.cur.row - 1).is_longer ())
988 { 965 {
989 line_t *line = &ROW(screen.cur.row - 1); 966 linep = &ROW(screen.cur.row - 1);
990
991 tp = line->t + last_col - 1; 967 tp = line->t + ncol - 1;
992 rp = line->r + last_col - 1; 968 rp = line->r + ncol - 1;
993
994 while (*tp == NOCHAR && tp > line->t)
995 tp--, rp--;
996 } 969 }
997 else 970 else
998 continue; 971 continue;
972
973 linep->touch ();
974
975 while (*tp == NOCHAR && tp > linep->t)
976 tp--, rp--;
999 977
1000 // first try to find a precomposed character 978 // first try to find a precomposed character
1001 unicode_t n = rxvt_compose (*tp, c); 979 unicode_t n = rxvt_compose (*tp, c);
1002 if (n == NOCHAR) 980 if (n == NOCHAR)
1003 n = rxvt_composite.compose (*tp, c); 981 n = rxvt_composite.compose (*tp, c);
… …
1006 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 984 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1007#endif 985#endif
1008 } 986 }
1009 } 987 }
1010 988
1011 if (!line->is_longer ()) /* XXX: think about this */
1012 MAX_IT (line->l, screen.cur.col); 989 max_it (line->l, screen.cur.col);
1013 990
1014#ifdef DEBUG_STRICT 991#ifdef DEBUG_STRICT
1015 assert (screen.cur.row >= 0); 992 assert (screen.cur.row >= 0);
1016#else /* drive with your eyes closed */
1017 MAX_IT (screen.cur.row, 0);
1018#endif 993#endif
1019} 994}
1020 995
1021/* ------------------------------------------------------------------------- */ 996/* ------------------------------------------------------------------------- */
1022/* 997/*
… …
1061 1036
1062 if (count == 0) 1037 if (count == 0)
1063 return; 1038 return;
1064 else if (count > 0) 1039 else if (count > 0)
1065 { 1040 {
1066 int row = screen.cur.row;
1067
1068 line_t &l = ROW(row); 1041 line_t &l = ROW(screen.cur.row);
1069 rend_t base_rend = l.r[i]; 1042 rend_t base_rend = l.r[i];
1070 ht &= l.t[i] == ' '; 1043 ht &= l.t[i] == ' ';
1071 1044
1072 for (; ++i < ncol; ) 1045 for (; ++i < ncol; )
1073 if (tabs[i]) 1046 if (tabs[i])
1074 { 1047 {
1075 x = i; 1048 x = i;
1049
1076 if (!--count) 1050 if (!--count)
1077 break; 1051 break;
1078 } 1052 }
1079 else 1053 else
1080 ht &= l.t[i] == ' ' 1054 ht &= l.t[i] == ' '
… …
1083 if (count) 1057 if (count)
1084 x = ncol - 1; 1058 x = ncol - 1;
1085 1059
1086 // store horizontal tab commands as characters inside the text 1060 // store horizontal tab commands as characters inside the text
1087 // buffer so they can be selected and pasted. 1061 // buffer so they can be selected and pasted.
1088 if (ht && options & Opt_pastableTabs) 1062 if (ht && OPTION (Opt_pastableTabs))
1089 { 1063 {
1090 base_rend = SET_FONT (base_rend, 0); 1064 base_rend = SET_FONT (base_rend, 0);
1091 1065
1092 if (!l.is_longer ()) /* XXX: think about this */ 1066 l.touch (x);
1093 MAX_IT (l.l, x);
1094 1067
1095 i = screen.cur.col; 1068 i = screen.cur.col;
1096 1069
1097 l.t[i] = '\t'; 1070 l.t[i] = '\t';
1098 l.r[i] = base_rend; 1071 l.r[i] = base_rend;
… …
1148 */ 1121 */
1149#if ENABLE_FRILLS 1122#if ENABLE_FRILLS
1150void 1123void
1151rxvt_term::scr_forwardindex () 1124rxvt_term::scr_forwardindex ()
1152{ 1125{
1153 int row;
1154
1155 if (screen.cur.col < ncol - 1) 1126 if (screen.cur.col < ncol - 1)
1156 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1157 else 1128 else
1158 { 1129 {
1159 row = screen.cur.row; 1130 line_t &l = ROW(screen.cur.row);
1160 1131
1161 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1132 l.touch ();
1162 ROW(row).l = ncol; 1133 l.is_longer (0);
1163 1134
1164 scr_gotorc (0, 0, R_RELATIVE); 1135 scr_gotorc (0, 0, R_RELATIVE);
1165 scr_insdel_chars (1, DELETE); 1136 scr_insdel_chars (1, DELETE);
1166 scr_gotorc (0, ncol - 1, R_RELATIVE); 1137 scr_gotorc (0, ncol - 1, R_RELATIVE);
1167 } 1138 }
… …
1177{ 1148{
1178 want_refresh = 1; 1149 want_refresh = 1;
1179 ZERO_SCROLLBACK (); 1150 ZERO_SCROLLBACK ();
1180 1151
1181 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1152 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1182 MAX_IT (screen.cur.col, 0); 1153 clamp_it (screen.cur.col, 0, ncol - 1);
1183 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1184 1154
1185 screen.flags &= ~Screen_WrapNext; 1155 screen.flags &= ~Screen_WrapNext;
1186 1156
1187 if (relative & R_RELATIVE) 1157 if (relative & R_RELATIVE)
1188 { 1158 {
… …
1206 else 1176 else
1207 { 1177 {
1208 if (screen.flags & Screen_Relative) 1178 if (screen.flags & Screen_Relative)
1209 { /* relative origin mode */ 1179 { /* relative origin mode */
1210 screen.cur.row = row + screen.tscroll; 1180 screen.cur.row = row + screen.tscroll;
1211 MIN_IT (screen.cur.row, screen.bscroll); 1181 min_it (screen.cur.row, screen.bscroll);
1212 } 1182 }
1213 else 1183 else
1214 screen.cur.row = row; 1184 screen.cur.row = row;
1215 } 1185 }
1216 1186
1217 MAX_IT (screen.cur.row, 0); 1187 clamp_it (screen.cur.row, 0, nrow - 1);
1218 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1219} 1188}
1220 1189
1221/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1222/* 1191/*
1223 * direction should be UP or DN 1192 * direction should be UP or DN
… …
1234 1203
1235 screen.flags &= ~Screen_WrapNext; 1204 screen.flags &= ~Screen_WrapNext;
1236 1205
1237 if ((screen.cur.row == screen.bscroll && direction == UP) 1206 if ((screen.cur.row == screen.bscroll && direction == UP)
1238 || (screen.cur.row == screen.tscroll && direction == DN)) 1207 || (screen.cur.row == screen.tscroll && direction == DN))
1239 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1208 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1240 else 1209 else
1241 screen.cur.row += dirn; 1210 screen.cur.row += dirn;
1242 1211
1243 MAX_IT (screen.cur.row, 0); 1212 clamp_it (screen.cur.row, 0, nrow - 1);
1244 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1245 selection_check (0); 1213 selection_check (0);
1246} 1214}
1247 1215
1248/* ------------------------------------------------------------------------- */ 1216/* ------------------------------------------------------------------------- */
1249/* 1217/*
… …
1253 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1254 */ 1222 */
1255void 1223void
1256rxvt_term::scr_erase_line (int mode) 1224rxvt_term::scr_erase_line (int mode)
1257{ 1225{
1258 unsigned int row, col, num; 1226 unsigned int col, num;
1259 1227
1260 want_refresh = 1; 1228 want_refresh = 1;
1261 ZERO_SCROLLBACK (); 1229 ZERO_SCROLLBACK ();
1262 1230
1263 selection_check (1); 1231 selection_check (1);
1264 1232
1265 row = screen.cur.row; 1233 line_t &line = ROW(screen.cur.row);
1234
1235 line.touch ();
1236 line.is_longer (0);
1266 1237
1267 switch (mode) 1238 switch (mode)
1268 { 1239 {
1269 case 0: /* erase to end of line */ 1240 case 0: /* erase to end of line */
1270 col = screen.cur.col; 1241 col = screen.cur.col;
1271 num = ncol - col; 1242 num = ncol - col;
1272 MIN_IT (ROW(row).l, (int16_t)col); 1243 min_it (line.l, col);
1273 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1244 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1274 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1245 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1275 CLEAR_SELECTION (); 1246 CLEAR_SELECTION ();
1276 break; 1247 break;
1277 case 1: /* erase to beginning of line */ 1248 case 1: /* erase to beginning of line */
… …
1282 CLEAR_SELECTION (); 1253 CLEAR_SELECTION ();
1283 break; 1254 break;
1284 case 2: /* erase whole line */ 1255 case 2: /* erase whole line */
1285 col = 0; 1256 col = 0;
1286 num = ncol; 1257 num = ncol;
1287 ROW(row).l = 0; 1258 line.l = 0;
1288 if (selection.beg.row <= screen.cur.row 1259 if (selection.beg.row <= screen.cur.row
1289 && selection.end.row >= screen.cur.row) 1260 && selection.end.row >= screen.cur.row)
1290 CLEAR_SELECTION (); 1261 CLEAR_SELECTION ();
1291 break; 1262 break;
1292 default: 1263 default:
1293 return; 1264 return;
1294 } 1265 }
1295 1266
1296 scr_blank_line (ROW(row), col, num, rstyle); 1267 scr_blank_line (line, col, num, rstyle);
1297} 1268}
1298 1269
1299/* ------------------------------------------------------------------------- */ 1270/* ------------------------------------------------------------------------- */
1300/* 1271/*
1301 * Erase part of whole of the screen 1272 * Erase part of whole of the screen
… …
1305 */ 1276 */
1306void 1277void
1307rxvt_term::scr_erase_screen (int mode) 1278rxvt_term::scr_erase_screen (int mode)
1308{ 1279{
1309 int num; 1280 int num;
1310 int32_t row, row_offset; 1281 int32_t row;
1311 rend_t ren; 1282 rend_t ren;
1312 XGCValues gcvalue; 1283 XGCValues gcvalue;
1313 1284
1314 want_refresh = 1; 1285 want_refresh = 1;
1315 ZERO_SCROLLBACK (); 1286 ZERO_SCROLLBACK ();
1316
1317 row_offset = (int32_t)saveLines;
1318 1287
1319 switch (mode) 1288 switch (mode)
1320 { 1289 {
1321 case 0: /* erase to end of screen */ 1290 case 0: /* erase to end of screen */
1322 selection_check (1); 1291 selection_check (1);
… …
1346 CLEAR_SELECTION (); 1315 CLEAR_SELECTION ();
1347 1316
1348 if (row >= nrow) /* Out Of Bounds */ 1317 if (row >= nrow) /* Out Of Bounds */
1349 return; 1318 return;
1350 1319
1351 MIN_IT (num, (nrow - row)); 1320 min_it (num, nrow - row);
1352 1321
1353 if (rstyle & (RS_RVid | RS_Uline)) 1322 if (rstyle & (RS_RVid | RS_Uline))
1354 ren = (rend_t) ~RS_None; 1323 ren = (rend_t) ~RS_None;
1355 else if (GET_BASEBG (rstyle) == Color_bg) 1324 else if (GET_BASEBG (rstyle) == Color_bg)
1356 { 1325 {
… …
1358 CLEAR_ROWS (row, num); 1327 CLEAR_ROWS (row, num);
1359 } 1328 }
1360 else 1329 else
1361 { 1330 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1331 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1364 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1365 ERASE_ROWS (row, num); 1334 ERASE_ROWS (row, num);
1366 gcvalue.foreground = pix_colors[Color_fg]; 1335 gcvalue.foreground = pix_colors[Color_fg];
1367 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1336 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1368 } 1337 }
1369 1338
1370 for (; num--; row++) 1339 for (; num--; row++)
1371 { 1340 {
1372 scr_blank_screen_mem (save[row + row_offset], rstyle); 1341 scr_blank_screen_mem (ROW(row), rstyle);
1373 save[row + row_offset].l = 0;
1374 scr_blank_line (drawn[row], 0, ncol, ren); 1342 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1375 } 1343 }
1376} 1344}
1377 1345
1378#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1379void 1347void
1380rxvt_term::scr_erase_savelines () 1348rxvt_term::scr_erase_savelines ()
1381{ 1349{
1382 want_refresh = 1; 1350 want_refresh = 1;
1383 ZERO_SCROLLBACK (); 1351 ZERO_SCROLLBACK ();
1384 1352
1385 nsaved = 0; 1353 top_row = 0;
1386} 1354}
1387#endif 1355#endif
1388 1356
1389/* ------------------------------------------------------------------------- */ 1357/* ------------------------------------------------------------------------- */
1390/* 1358/*
… …
1392 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1360 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1393 */ 1361 */
1394void 1362void
1395rxvt_term::scr_E () 1363rxvt_term::scr_E ()
1396{ 1364{
1397 int i, j, k;
1398 rend_t *r1, fs; 1365 rend_t fs;
1399 1366
1400 want_refresh = 1; 1367 want_refresh = 1;
1401 ZERO_SCROLLBACK (); 1368 ZERO_SCROLLBACK ();
1402 1369
1403 num_scr_allow = 0; 1370 num_scr_allow = 0;
1404 selection_check (3); 1371 selection_check (3);
1405 1372
1406 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1373 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1407 for (k = saveLines, i = nrow; i--; k++) 1374 for (int row = nrow; row--; )
1408 { 1375 {
1409 line_t &line = save[k]; 1376 line_t &line = ROW(row);
1410 1377
1411 fill_text (line.t, 'E', ncol); 1378 fill_text (line.t, 'E', ncol);
1379 rend_t *r1 = line.r;
1412 1380
1413 for (r1 = line.r, j = ncol; j--; ) 1381 for (int j = ncol; j--; )
1414 *r1++ = fs; 1382 *r1++ = fs;
1415 1383
1416 line.l = ncol; /* make the `E's selectable */ 1384 line.is_longer (0);
1385 line.touch (ncol);
1417 } 1386 }
1418} 1387}
1419 1388
1420/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1421/* 1390/*
… …
1442 count = end; 1411 count = end;
1443 } 1412 }
1444 1413
1445 scr_do_wrap (); 1414 scr_do_wrap ();
1446 1415
1447 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1416 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1448} 1417}
1449 1418
1450/* ------------------------------------------------------------------------- */ 1419/* ------------------------------------------------------------------------- */
1451/* 1420/*
1452 * Insert/Delete <count> characters from the current position 1421 * Insert/Delete <count> characters from the current position
… …
1464 return; 1433 return;
1465 1434
1466 scr_do_wrap (); 1435 scr_do_wrap ();
1467 1436
1468 selection_check (1); 1437 selection_check (1);
1469 MIN_IT (count, (ncol - screen.cur.col)); 1438 min_it (count, ncol - screen.cur.col);
1470 1439
1471 row = screen.cur.row + saveLines; 1440 row = screen.cur.row;
1472 1441
1473 line_t *line = save + row; 1442 line_t *line = &ROW(row);
1443
1444 line->touch ();
1445 line->is_longer (0);
1474 1446
1475 switch (insdel) 1447 switch (insdel)
1476 { 1448 {
1477 case INSERT: 1449 case INSERT:
1478 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1450 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1479 { 1451 {
1480 line->t[col] = line->t[col - count]; 1452 line->t[col] = line->t[col - count];
1481 line->r[col] = line->r[col - count]; 1453 line->r[col] = line->r[col - count];
1482 } 1454 }
1483 1455
1484 if (!line->is_longer ()) 1456 line->l = min (line->l + count, ncol);
1485 {
1486 line->l += count;
1487 MIN_IT (line->l, ncol);
1488 }
1489 1457
1490 if (selection.op && current_screen == selection.screen 1458 if (selection.op && current_screen == selection.screen
1491 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1492 { 1460 {
1493 if (selection.end.row != screen.cur.row 1461 if (selection.end.row != screen.cur.row
… …
1499 selection.mark.col += count; /* XXX: yes? */ 1467 selection.mark.col += count; /* XXX: yes? */
1500 selection.end.col += count; 1468 selection.end.col += count;
1501 } 1469 }
1502 } 1470 }
1503 1471
1504 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1472 scr_blank_line (*line, screen.cur.col, count, rstyle);
1505 break; 1473 break;
1506 1474
1507 case ERASE: 1475 case ERASE:
1508 screen.cur.col += count; /* don't worry if > ncol */ 1476 screen.cur.col += count; /* don't worry if > ncol */
1509 selection_check (1); 1477 selection_check (1);
1510 screen.cur.col -= count; 1478 screen.cur.col -= count;
1479
1480 line->l = max (line->l - count, 0);
1511 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1481 scr_blank_line (*line, screen.cur.col, count, rstyle);
1512 break; 1482 break;
1513 1483
1514 case DELETE: 1484 case DELETE:
1515 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1485 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1516 1486
… …
1518 { 1488 {
1519 line->t[col] = line->t[col + count]; 1489 line->t[col] = line->t[col + count];
1520 line->r[col] = line->r[col + count]; 1490 line->r[col] = line->r[col + count];
1521 } 1491 }
1522 1492
1493 line->l = max (line->l - count, 0);
1523 scr_blank_line (*line, ncol - count, count, tr); 1494 scr_blank_line (*line, ncol - count, count, tr);
1524
1525 if (line->is_longer ()) /* break line continuation */
1526 line->l = ncol;
1527
1528 line->l -= count;
1529 MAX_IT (line->l, 0);
1530 1495
1531 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1532 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1533 { 1498 {
1534 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
… …
1554 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1519 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1555 */ 1520 */
1556void 1521void
1557rxvt_term::scr_scroll_region (int top, int bot) 1522rxvt_term::scr_scroll_region (int top, int bot)
1558{ 1523{
1559 MAX_IT (top, 0); 1524 max_it (top, 0);
1560 MIN_IT (bot, (int)nrow - 1); 1525 min_it (bot, nrow - 1);
1561 1526
1562 if (top > bot) 1527 if (top > bot)
1563 return; 1528 return;
1564 1529
1565 screen.tscroll = top; 1530 screen.tscroll = top;
… …
1646rxvt_term::scr_set_tab (int mode) 1611rxvt_term::scr_set_tab (int mode)
1647{ 1612{
1648 if (mode < 0) 1613 if (mode < 0)
1649 memset (tabs, 0, ncol * sizeof (char)); 1614 memset (tabs, 0, ncol * sizeof (char));
1650 else if (screen.cur.col < ncol) 1615 else if (screen.cur.col < ncol)
1651 tabs[screen.cur.col] = (mode ? 1 : 0); 1616 tabs [screen.cur.col] = !!mode;
1652} 1617}
1653 1618
1654/* ------------------------------------------------------------------------- */ 1619/* ------------------------------------------------------------------------- */
1655/* 1620/*
1656 * Set reverse/normal video 1621 * Set reverse/normal video
… …
1663 XGCValues gcvalue; 1628 XGCValues gcvalue;
1664 1629
1665 if (rvideo != mode) 1630 if (rvideo != mode)
1666 { 1631 {
1667 rvideo = mode; 1632 rvideo = mode;
1668 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1633 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1669#if XPM_BACKGROUND 1634#if XPM_BACKGROUND
1670 if (bgPixmap.pixmap == None) 1635 if (bgPixmap.pixmap == None)
1671#endif 1636#endif
1672#if TRANSPARENT 1637#if TRANSPARENT
1673 if (! (options & Opt_transparent) || am_transparent == 0) 1638 if (! OPTION (Opt_transparent) || am_transparent == 0)
1674#endif 1639#endif
1675 XSetWindowBackground (display->display, vt, 1640 XSetWindowBackground (display->display, vt,
1676 pix_colors[Color_bg]); 1641 pix_colors[Color_bg]);
1677 1642
1678 gcvalue.foreground = pix_colors[Color_fg]; 1643 gcvalue.foreground = pix_colors[Color_fg];
… …
1703 * Set font style 1668 * Set font style
1704 */ 1669 */
1705void 1670void
1706rxvt_term::set_font_style () 1671rxvt_term::set_font_style ()
1707{ 1672{
1673#if 0
1708 switch (charsets[screen.charset]) 1674 switch (charsets [screen.charset])
1709 { 1675 {
1710 case '0': /* DEC Special Character & Line Drawing Set */ 1676 case '0': /* DEC Special Character & Line Drawing Set */
1711 break; 1677 break;
1712 case 'A': /* United Kingdom (UK) */ 1678 case 'A': /* United Kingdom (UK) */
1713 break; 1679 break;
… …
1720 case 'C': /* Finnish character set */ 1686 case 'C': /* Finnish character set */
1721 break; 1687 break;
1722 case 'K': /* German character set */ 1688 case 'K': /* German character set */
1723 break; 1689 break;
1724 } 1690 }
1691#endif
1725} 1692}
1726 1693
1727/* ------------------------------------------------------------------------- */ 1694/* ------------------------------------------------------------------------- */
1728/* 1695/*
1729 * Choose a font 1696 * Choose a font
… …
1769 bool found = false; 1736 bool found = false;
1770 1737
1771 for (int i = 0; i < nrow; i++) 1738 for (int i = 0; i < nrow; i++)
1772 { 1739 {
1773 int col = 0; 1740 int col = 0;
1774 rend_t *drp = drawn[i].r; 1741 rend_t *drp = drawn_buf[i].r;
1775 1742
1776 for (; col < ncol; col++, drp++) 1743 for (; col < ncol; col++, drp++)
1777 if ((*drp & mask) == value) 1744 if ((*drp & mask) == value)
1778 { 1745 {
1779 found = true; 1746 found = true;
… …
1797rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1764rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1798{ 1765{
1799 int i; 1766 int i;
1800 row_col_t rc[RC_COUNT]; 1767 row_col_t rc[RC_COUNT];
1801 1768
1802 if (!drawn) /* sanity check */ 1769 if (!drawn_buf) /* sanity check */
1803 return; 1770 return;
1804 1771
1805#ifndef NO_SLOW_LINK_SUPPORT 1772#ifndef NO_SLOW_LINK_SUPPORT
1806 if (refresh_type == FAST_REFRESH && !display->is_local) 1773 if (refresh_type == FAST_REFRESH && !display->is_local)
1807 { 1774 {
1808 y = 0; 1775 y = 0;
1809 eheight = height; 1776 eheight = height;
1810 } 1777 }
1811#endif
1812
1813#ifdef DEBUG_STRICT
1814 x = max (x, 0);
1815 x = min (x, (int)width);
1816 y = max (y, 0);
1817 y = min (y, (int)height);
1818#endif 1778#endif
1819 1779
1820 /* round down */ 1780 /* round down */
1821 rc[PART_BEG].col = Pixel2Col (x); 1781 rc[PART_BEG].col = Pixel2Col (x);
1822 rc[PART_BEG].row = Pixel2Row (y); 1782 rc[PART_BEG].row = Pixel2Row (y);
… …
1825 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1785 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1826 1786
1827 /* sanity checks */ 1787 /* sanity checks */
1828 for (i = PART_BEG; i < RC_COUNT; i++) 1788 for (i = PART_BEG; i < RC_COUNT; i++)
1829 { 1789 {
1830 MIN_IT (rc[i].col, ncol - 1); 1790 min_it (rc[i].col, ncol - 1);
1831 MIN_IT (rc[i].row, nrow - 1); 1791 min_it (rc[i].row, nrow - 1);
1832 } 1792 }
1833 1793
1834 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1794 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1835 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1795 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1796
1797 num_scr_allow = 0;
1836 1798
1837 if (refresh) 1799 if (refresh)
1838 scr_refresh (SLOW_REFRESH); 1800 scr_refresh ();
1839} 1801}
1840 1802
1841/* ------------------------------------------------------------------------- */ 1803/* ------------------------------------------------------------------------- */
1842/* 1804/*
1843 * Refresh the entire screen 1805 * Refresh the entire screen
… …
1851/* ------------------------------------------------------------------------- */ 1813/* ------------------------------------------------------------------------- */
1852/* 1814/*
1853 * Move the display so that the line represented by scrollbar value Y is at 1815 * Move the display so that the line represented by scrollbar value Y is at
1854 * the top of the screen 1816 * the top of the screen
1855 */ 1817 */
1856int 1818void
1857rxvt_term::scr_move_to (int y, int len) 1819rxvt_term::scr_move_to (int y, int len)
1858{ 1820{
1859 long p = 0; 1821 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1860 unsigned int oldviewstart;
1861
1862 oldviewstart = view_start;
1863
1864 if (y < len)
1865 {
1866 p = (nrow + nsaved) * (len - y) / len;
1867 p -= (long) (nrow - 1);
1868 p = max (p, 0);
1869 }
1870
1871 view_start = (unsigned int)min (p, nsaved);
1872
1873 return scr_changeview (oldviewstart);
1874} 1822}
1875 1823
1876/* ------------------------------------------------------------------------- */ 1824/* ------------------------------------------------------------------------- */
1877/* 1825/*
1878 * Page the screen up/down nlines 1826 * Page the screen up/down nlines
1879 * direction should be UP or DN 1827 * direction should be UP or DN
1880 */ 1828 */
1881int 1829bool
1882rxvt_term::scr_page (enum page_dirn direction, int nlines) 1830rxvt_term::scr_page (enum page_dirn direction, int nlines)
1883{ 1831{
1884 int n; 1832 int new_view_start =
1885 unsigned int oldviewstart;
1886
1887 oldviewstart = view_start;
1888
1889 if (direction == UP)
1890 {
1891 n = view_start + nlines;
1892 view_start = min (n, nsaved);
1893 }
1894 else
1895 {
1896 n = view_start - nlines; 1833 direction == UP ? view_start - nlines
1897 view_start = max (n, 0); 1834 : view_start + nlines;
1898 }
1899 1835
1900 return scr_changeview (oldviewstart); 1836 return scr_changeview (new_view_start);
1901} 1837}
1902 1838
1903int 1839bool
1904rxvt_term::scr_changeview (unsigned int oldviewstart) 1840rxvt_term::scr_changeview (int new_view_start)
1905{ 1841{
1842 clamp_it (new_view_start, top_row, 0);
1843
1906 if (view_start != oldviewstart) 1844 if (new_view_start == view_start)
1907 { 1845 return false;
1846
1847 num_scr += new_view_start - view_start;
1848 view_start = new_view_start;
1908 want_refresh = 1; 1849 want_refresh = 1;
1909 num_scr -= (view_start - oldviewstart);
1910 }
1911 1850
1912 return (int) (view_start - oldviewstart); 1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1852
1853 return true;
1913} 1854}
1914 1855
1915/* ------------------------------------------------------------------------- */ 1856/* ------------------------------------------------------------------------- */
1916void 1857void
1917rxvt_term::scr_bell () 1858rxvt_term::scr_bell ()
1918{ 1859{
1919#ifndef NO_BELL 1860#ifndef NO_BELL
1920 1861
1921# ifndef NO_MAPALERT 1862# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1863# ifdef MAPALERT_OPTION
1923 if (options & Opt_mapAlert) 1864 if (OPTION (Opt_mapAlert))
1924# endif 1865# endif
1925 XMapWindow (display->display, parent[0]); 1866 XMapWindow (display->display, parent[0]);
1926# endif 1867# endif
1927 1868
1928 if (options & Opt_visualBell) 1869 if (OPTION (Opt_visualBell))
1929 { 1870 {
1930 scr_rvideo_mode (!rvideo); /* refresh also done */ 1871 scr_rvideo_mode (!rvideo); /* refresh also done */
1872 display->flush ();
1931 rxvt_usleep (VISUAL_BELL_DURATION); 1873 rxvt_usleep (VISUAL_BELL_DURATION);
1932 scr_rvideo_mode (!rvideo); /* refresh also done */ 1874 scr_rvideo_mode (!rvideo); /* refresh also done */
1933 } 1875 }
1934 else 1876 else
1935 XBell (display->display, 0); 1877 XBell (display->display, 0);
… …
1941/* ARGSUSED */ 1883/* ARGSUSED */
1942void 1884void
1943rxvt_term::scr_printscreen (int fullhist) 1885rxvt_term::scr_printscreen (int fullhist)
1944{ 1886{
1945#ifdef PRINTPIPE 1887#ifdef PRINTPIPE
1946 int i, r1, nrows, row_offset; 1888 int nrows, row_start;
1947 FILE *fd; 1889 FILE *fd;
1948 1890
1949 if ((fd = popen_printer ()) == NULL) 1891 if ((fd = popen_printer ()) == NULL)
1950 return; 1892 return;
1951 1893
1952 nrows = nrow;
1953 row_offset = saveLines;
1954
1955 if (!fullhist) 1894 if (fullhist)
1956 row_offset -= view_start; 1895 {
1896 nrows = nrow - top_row;
1897 row_start = top_row;
1898 }
1957 else 1899 else
1958 { 1900 {
1959 nrows += nsaved; 1901 nrows = nrow;
1960 row_offset -= nsaved; 1902 row_start = view_start;
1961 } 1903 }
1962 1904
1963 wctomb (0, 0); 1905 wctomb (0, 0);
1964 1906
1965 for (r1 = 0; r1 < nrows; r1++) 1907 for (int r1 = 0; r1 < nrows; r1++)
1966 { 1908 {
1967 text_t *tp = save[r1 + row_offset].t; 1909 text_t *tp = ROW(r1).t;
1968 int len = save[r1 + row_offset].l; 1910 int len = ROW(r1).l;
1969 1911
1970 for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1912 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1971 { 1913 {
1972 char mb[MB_LEN_MAX]; 1914 char mb[MB_LEN_MAX];
1973 text_t t = *tp++; 1915 text_t t = *tp++;
1974 if (t == NOCHAR) 1916 if (t == NOCHAR)
1975 continue; 1917 continue;
… …
1997 * Refresh the screen 1939 * Refresh the screen
1998 * drawn_text/drawn_rend contain the screen information before the update. 1940 * drawn_text/drawn_rend contain the screen information before the update.
1999 * screen.text/screen.rend contain what the screen will change to. 1941 * screen.text/screen.rend contain what the screen will change to.
2000 */ 1942 */
2001void 1943void
2002rxvt_term::scr_refresh (unsigned char refresh_type) 1944rxvt_term::scr_refresh ()
2003{ 1945{
2004 unsigned char must_clear, /* use draw_string not draw_image_string */ 1946 unsigned char must_clear, /* use draw_string not draw_image_string */
2005 showcursor; /* show the cursor */ 1947 showcursor; /* show the cursor */
2006 int16_t col, row, /* column/row we're processing */ 1948 int16_t col, row, /* column/row we're processing */
2007 ocrow; /* old cursor row */ 1949 ocrow; /* old cursor row */
2008 int i, /* tmp */ 1950 int i; /* tmp */
2009 row_offset; /* basic offset in screen structure */
2010#ifndef NO_CURSORCOLOR 1951#ifndef NO_CURSORCOLOR
2011 rend_t cc1; /* store colours at cursor position (s) */ 1952 rend_t cc1; /* store colours at cursor position (s) */
2012#endif 1953#endif
2013 rend_t *crp; // cursor rendition pointer 1954 rend_t *crp; // cursor rendition pointer
2014 1955
… …
2021 * A: set up vars 1962 * A: set up vars
2022 */ 1963 */
2023 must_clear = 0; 1964 must_clear = 0;
2024 refresh_count = 0; 1965 refresh_count = 0;
2025 1966
2026 row_offset = term_start - view_start;
2027
2028#if XPM_BACKGROUND 1967#if XPM_BACKGROUND
2029 must_clear |= bgPixmap.pixmap != None; 1968 must_clear |= bgPixmap.pixmap != None;
2030#endif 1969#endif
2031#if TRANSPARENT 1970#if TRANSPARENT
2032 must_clear |= (options & Opt_transparent) && am_transparent; 1971 must_clear |= OPTION (Opt_transparent) && am_transparent;
2033#endif 1972#endif
2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1973 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2035 1974
2036 /* 1975 /*
2037 * B: reverse any characters which are selected 1976 * B: reverse any characters which are selected
… …
2061 2000
2062 crp = &ROW(screen.cur.row).r[col]; 2001 crp = &ROW(screen.cur.row).r[col];
2063 2002
2064 if (showcursor && focus) 2003 if (showcursor && focus)
2065 { 2004 {
2066 if (options & Opt_cursorUnderline) 2005 if (OPTION (Opt_cursorUnderline))
2067 *crp ^= RS_Uline; 2006 *crp ^= RS_Uline;
2068 else 2007 else
2069 { 2008 {
2070 *crp ^= RS_RVid; 2009 *crp ^= RS_RVid;
2071 2010
… …
2073 cc1 = *crp & (RS_fgMask | RS_bgMask); 2012 cc1 = *crp & (RS_fgMask | RS_bgMask);
2074 if (ISSET_PIXCOLOR (Color_cursor)) 2013 if (ISSET_PIXCOLOR (Color_cursor))
2075 ccol1 = Color_cursor; 2014 ccol1 = Color_cursor;
2076 else 2015 else
2077#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2016#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2078 ccol1 = GET_FGCOLOR (rstyle); 2017 ccol1 = fgcolor_of (rstyle);
2079#else 2018#else
2080 ccol1 = Color_fg; 2019 ccol1 = Color_fg;
2081#endif 2020#endif
2082 if (ISSET_PIXCOLOR (Color_cursor2)) 2021 if (ISSET_PIXCOLOR (Color_cursor2))
2083 ccol2 = Color_cursor2; 2022 ccol2 = Color_cursor2;
2084 else 2023 else
2085#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2024#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2086 ccol2 = GET_BGCOLOR (rstyle); 2025 ccol2 = bgcolor_of (rstyle);
2087#else 2026#else
2088 ccol2 = Color_bg; 2027 ccol2 = Color_bg;
2089#endif 2028#endif
2090 *crp = SET_FGCOLOR (*crp, ccol1); 2029 *crp = SET_FGCOLOR (*crp, ccol1);
2091 *crp = SET_BGCOLOR (*crp, ccol2); 2030 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2096 2035
2097 /* make sure no outline cursor is left around */ 2036 /* make sure no outline cursor is left around */
2098 setoldcursor = 0; 2037 setoldcursor = 0;
2099 if (ocrow != -1) 2038 if (ocrow != -1)
2100 { 2039 {
2101 if (screen.cur.row + view_start != ocrow 2040 if (screen.cur.row - view_start != ocrow
2102 || screen.cur.col != oldcursor.col) 2041 || screen.cur.col != oldcursor.col)
2103 { 2042 {
2104 if (ocrow < nrow 2043 if (ocrow < nrow
2105 && oldcursor.col < ncol) 2044 && oldcursor.col < ncol)
2106 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2045 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2107 2046
2108 if (focus || !showcursor) 2047 if (focus || !showcursor)
2109 oldcursor.row = -1; 2048 oldcursor.row = -1;
2110 else 2049 else
2111 setoldcursor = 1; 2050 setoldcursor = 1;
… …
2114 else if (!focus) 2053 else if (!focus)
2115 setoldcursor = 1; 2054 setoldcursor = 1;
2116 2055
2117 if (setoldcursor) 2056 if (setoldcursor)
2118 { 2057 {
2119 if (screen.cur.row + view_start >= nrow) 2058 if (screen.cur.row - view_start >= nrow)
2120 oldcursor.row = -1; 2059 oldcursor.row = -1;
2121 else 2060 else
2122 { 2061 {
2123 oldcursor.row = screen.cur.row + view_start; 2062 oldcursor.row = screen.cur.row - view_start;
2124 oldcursor.col = screen.cur.col; 2063 oldcursor.col = screen.cur.col;
2125 } 2064 }
2126 } 2065 }
2127 } 2066 }
2128 2067
2068 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2129#if ENABLE_OVERLAY 2069#if ENABLE_OVERLAY
2130 scr_swap_overlay (); 2070 scr_swap_overlay ();
2131#endif 2071#endif
2132 2072
2133#ifndef NO_SLOW_LINK_SUPPORT 2073#ifndef NO_SLOW_LINK_SUPPORT
2134 /* 2074 /*
2135 * D: CopyArea pass - very useful for slower links 2075 * D: CopyArea pass - very useful for slower links
2136 * This has been deliberately kept simple. 2076 * This has been deliberately kept simple.
2137 */ 2077 */
2138 i = num_scr;
2139 if (!display->is_local 2078 if (!display->is_local
2140 && refresh_type == FAST_REFRESH && num_scr_allow && i 2079 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2141 && abs (i) < nrow && !must_clear) 2080 && abs (num_scr) < nrow && !must_clear)
2142 { 2081 {
2143 int16_t nits; 2082 int16_t nits;
2144 int j; 2083 int j;
2145 int len, wlen; 2084 int len, wlen;
2085 dLocal (int, num_scr);
2146 2086
2147 j = nrow; 2087 j = nrow;
2148 wlen = len = -1; 2088 wlen = len = -1;
2149 row = i > 0 ? 0 : j - 1; 2089 row = i > 0 ? 0 : j - 1;
2150 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2090 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2151 { 2091 {
2152 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2092 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2153 { 2093 {
2154 line_t s = save[(row + row_offset) % nlines]; 2094 line_t s = ROW(view_start + row);
2155 line_t d = drawn[row]; 2095 line_t d = drawn_buf[row];
2156 line_t d2 = drawn[row + i]; 2096 line_t d2 = drawn_buf[row + i];
2157 2097
2158 for (nits = 0, col = ncol; col--; ) 2098 for (nits = 0, col = ncol; col--; )
2159 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2099 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2160 nits--; 2100 nits--;
2161 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2101 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2179 2119
2180 if (len != -1) 2120 if (len != -1)
2181 { 2121 {
2182 /* also comes here at end if needed because of >= above */ 2122 /* also comes here at end if needed because of >= above */
2183 if (wlen < len) 2123 if (wlen < len)
2184 SWAP_IT (wlen, len, int); 2124 ::swap (wlen, len);
2185 2125
2186 XCopyArea (display->display, vt, vt, 2126 XCopyArea (display->display, vt, vt,
2187 gc, 0, Row2Pixel (len + i), 2127 gc, 0, Row2Pixel (len + i),
2188 (unsigned int)TermWin_TotalWidth (), 2128 (unsigned int)this->width,
2189 (unsigned int)Height2Pixel (wlen - len + 1), 2129 (unsigned int)Height2Pixel (wlen - len + 1),
2190 0, Row2Pixel (len)); 2130 0, Row2Pixel (len));
2191 len = -1; 2131 len = -1;
2192 } 2132 }
2193 } 2133 }
… …
2197 /* 2137 /*
2198 * E: main pass across every character 2138 * E: main pass across every character
2199 */ 2139 */
2200 for (row = 0; row < nrow; row++) 2140 for (row = 0; row < nrow; row++)
2201 { 2141 {
2202 text_t *stp = save[(row + row_offset) % total_rows].t; 2142 text_t *stp = ROW(view_start + row).t;
2203 rend_t *srp = save[(row + row_offset) % total_rows].r; 2143 rend_t *srp = ROW(view_start + row).r;
2204 text_t *dtp = drawn[row].t; 2144 text_t *dtp = drawn_buf[row].t;
2205 rend_t *drp = drawn[row].r; 2145 rend_t *drp = drawn_buf[row].r;
2206 2146
2207 /* 2147 /*
2208 * E2: OK, now the real pass 2148 * E2: OK, now the real pass
2209 */ 2149 */
2210 int ypixel = (int)Row2Pixel (row); 2150 int ypixel = (int)Row2Pixel (row);
… …
2272 count++, i--; 2212 count++, i--;
2273 2213
2274 /* 2214 /*
2275 * Determine the attributes for the string 2215 * Determine the attributes for the string
2276 */ 2216 */
2277 int fore = GET_FGCOLOR (rend); // desired foreground 2217 int fore = fgcolor_of (rend); // desired foreground
2278 int back = GET_BGCOLOR (rend); // desired background 2218 int back = bgcolor_of (rend); // desired background
2279 2219
2280 // only do special processing if any attributes are set, which is rare 2220 // only do special processing if any attributes are set, which is unlikely
2281 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2221 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2282 { 2222 {
2283#if ENABLE_STYLES 2223#if ENABLE_STYLES
2284 // force redraw after "careful" characters to avoid pixel droppings 2224 // force redraw after "careful" characters to avoid pixel droppings
2285 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2225 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2321 fore = Color_UL; 2261 fore = Color_UL;
2322#endif 2262#endif
2323 2263
2324 if (invert) 2264 if (invert)
2325 { 2265 {
2326 SWAP_IT (fore, back, int); 2266 ::swap (fore, back);
2327 2267
2328#ifndef NO_BOLD_UNDERLINE_REVERSE 2268#ifndef NO_BOLD_UNDERLINE_REVERSE
2329 if (ISSET_PIXCOLOR (Color_RV)) 2269 if (ISSET_PIXCOLOR (Color_RV))
2330 back = Color_RV; 2270 back = Color_RV;
2331 2271
… …
2396 } /* for (row....) */ 2336 } /* for (row....) */
2397 2337
2398#if ENABLE_OVERLAY 2338#if ENABLE_OVERLAY
2399 scr_swap_overlay (); 2339 scr_swap_overlay ();
2400#endif 2340#endif
2341 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2401 2342
2402 /* 2343 /*
2403 * G: cleanup cursor and display outline cursor if necessary 2344 * G: cleanup cursor and display outline cursor if necessary
2404 */ 2345 */
2405 if (showcursor) 2346 if (showcursor)
2406 { 2347 {
2407 if (focus) 2348 if (focus)
2408 { 2349 {
2409 if (options & Opt_cursorUnderline) 2350 if (OPTION (Opt_cursorUnderline))
2410 *crp ^= RS_Uline; 2351 *crp ^= RS_Uline;
2411 else 2352 else
2412 { 2353 {
2413 *crp ^= RS_RVid; 2354 *crp ^= RS_RVid;
2414#ifndef NO_CURSORCOLOR 2355#ifndef NO_CURSORCOLOR
… …
2423 2364
2424 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2365 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2425 col--; 2366 col--;
2426 2367
2427 while (col + cursorwidth < ncol 2368 while (col + cursorwidth < ncol
2428 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2369 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2429 cursorwidth++; 2370 cursorwidth++;
2430 2371
2431#ifndef NO_CURSORCOLOR 2372#ifndef NO_CURSORCOLOR
2432 if (ISSET_PIXCOLOR (Color_cursor)) 2373 if (ISSET_PIXCOLOR (Color_cursor))
2433 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2374 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2444 /* 2385 /*
2445 * H: cleanup selection 2386 * H: cleanup selection
2446 */ 2387 */
2447 scr_reverse_selection (); 2388 scr_reverse_selection ();
2448 2389
2449 if (refresh_type & SMOOTH_REFRESH)
2450 XFlush (display->display);
2451
2452 num_scr = 0; 2390 num_scr = 0;
2453 num_scr_allow = 1; 2391 num_scr_allow = 1;
2454} 2392}
2455 2393
2456void 2394void
2457rxvt_term::scr_remap_chars (const line_t &l) 2395rxvt_term::scr_remap_chars (line_t &l)
2458{ 2396{
2459 if (!l.t) 2397 if (!l.t)
2460 return; 2398 return;
2461 2399
2400 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2401
2462 for (int i = ncol; i--; ) 2402 for (int i = ncol; i--; )
2463 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2403 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2464} 2404}
2465 2405
2466void 2406void
2467rxvt_term::scr_remap_chars () 2407rxvt_term::scr_remap_chars ()
2468{ 2408{
2469 for (int i = total_rows; i--; ) 2409 for (int i = total_rows; i--; )
2470 scr_remap_chars (save[i]); 2410 scr_remap_chars (row_buf [i]);
2471 2411
2472 for (int i = nrow; i--; ) 2412 for (int i = nrow; i--; )
2473 { 2413 {
2474 scr_remap_chars (drawn[i]); 2414 scr_remap_chars (drawn_buf [i]);
2475 scr_remap_chars (swap_save[i]); 2415 scr_remap_chars (swap_buf [i]);
2476 } 2416 }
2477} 2417}
2478 2418
2479void 2419void
2480rxvt_term::scr_recolour () 2420rxvt_term::scr_recolour ()
… …
2518 2458
2519 if (really) 2459 if (really)
2520 XClearWindow (display->display, vt); 2460 XClearWindow (display->display, vt);
2521} 2461}
2522 2462
2463void
2464rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2465{
2466 int view_end = view_start + nrow;
2467 int row, col;
2468
2469 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2470 {
2471 text_t *stp = ROW(row).t;
2472 rend_t *srp = ROW(row).r;
2473
2474 for (col = beg_col; col < end_col; col++)
2475 srp[col] ^= rstyle1;
2476
2477 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2478 srp[col] ^= rstyle2;
2479
2480 if (++col < end_col)
2481 srp[col] ^= rstyle2;
2482 }
2483}
2484
2485void
2486rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2487{
2488 int view_end = view_start + nrow;
2489 int row, col;
2490
2491 if (beg_row >= view_start)
2492 {
2493 col = beg_col;
2494 row = beg_row;
2495 }
2496 else
2497 {
2498 col = 0;
2499 row = view_start;
2500 }
2501
2502 for (; row < min (end_row, view_end); row++, col = 0)
2503 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2504 srp[col] ^= rstyle;
2505
2506 if (row == end_row)
2507 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2508 srp[col] ^= rstyle;
2509}
2510
2523/* ------------------------------------------------------------------------- */ 2511/* ------------------------------------------------------------------------- */
2524void 2512void
2525rxvt_term::scr_reverse_selection () 2513rxvt_term::scr_reverse_selection ()
2526{ 2514{
2527 if (selection.op 2515 if (selection.op
2528 && current_screen == selection.screen 2516 && current_screen == selection.screen
2529 && selection.end.row >= -view_start) 2517 && selection.end.row >= view_start)
2530 { 2518 {
2531 int view_end = -view_start + nrow;
2532 int row, col;
2533
2534#if ENABLE_FRILLS 2519#if ENABLE_FRILLS
2535 if (selection.rect) 2520 if (selection.rect)
2536 { 2521 scr_xor_rect (selection.beg.row, selection.beg.col,
2537 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2522 selection.end.row, selection.end.col,
2538 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2523 RS_RVid, RS_RVid | RS_Uline);
2539 srp[col] ^= RS_RVid;
2540 }
2541 else 2524 else
2542#endif 2525#endif
2543 { 2526 scr_xor_span (selection.beg.row, selection.beg.col,
2544 if (selection.beg.row >= -view_start) 2527 selection.end.row, selection.end.col,
2545 { 2528 RS_RVid);
2546 col = selection.beg.col;
2547 row = selection.beg.row;
2548 }
2549 else
2550 {
2551 col = 0;
2552 row = view_start;
2553 }
2554
2555 for (; row < min (selection.end.row, view_end); row++, col = 0)
2556 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2557 srp[col] ^= RS_RVid;
2558
2559 if (row == selection.end.row)
2560 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2561 srp[col] ^= RS_RVid;
2562 }
2563 } 2529 }
2564} 2530}
2565 2531
2566/* ------------------------------------------------------------------------- */ 2532/* ------------------------------------------------------------------------- */
2567/* 2533/*
… …
2577 char r1[] = "\n"; 2543 char r1[] = "\n";
2578 2544
2579 for (row = saveLines - nsaved; 2545 for (row = saveLines - nsaved;
2580 row < saveLines + nrow - 1; row++) 2546 row < saveLines + nrow - 1; row++)
2581 { 2547 {
2582 width = save[row].l >= 0 ? save[row].l 2548 width = row_buf[row].l >= 0 ? row_buf[row].l
2583 : ncol; 2549 : ncol;
2584 for (towrite = width; towrite; towrite -= wrote) 2550 for (towrite = width; towrite; towrite -= wrote)
2585 { 2551 {
2586 wrote = write (fd, & (save[row].t[width - towrite]), 2552 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2587 towrite); 2553 towrite);
2588 if (wrote < 0) 2554 if (wrote < 0)
2589 return; /* XXX: death, no report */ 2555 return; /* XXX: death, no report */
2590 } 2556 }
2591 if (save[row].l >= 0) 2557 if (row_buf[row].l >= 0)
2592 if (write (fd, r1, 1) <= 0) 2558 if (write (fd, r1, 1) <= 0)
2593 return; /* XXX: death, no report */ 2559 return; /* XXX: death, no report */
2594 } 2560 }
2595} 2561}
2596#endif 2562#endif
… …
2605 2571
2606 if (!selection.op) 2572 if (!selection.op)
2607 return; 2573 return;
2608 2574
2609 pos.row = pos.col = 0; 2575 pos.row = pos.col = 0;
2610 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2576 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2611 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2577 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2612 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2578 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2613 || (check_more == 1 2579 || (check_more == 1
2614 && current_screen == selection.screen 2580 && current_screen == selection.screen
2615 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2581 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2616 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2582 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2617 || (check_more == 2 2583 || (check_more == 2
… …
2628/* ------------------------------------------------------------------------- */ 2594/* ------------------------------------------------------------------------- */
2629/* 2595/*
2630 * Paste a selection direct to the command fd 2596 * Paste a selection direct to the command fd
2631 */ 2597 */
2632void 2598void
2633rxvt_term::paste (unsigned char *data, unsigned int len) 2599rxvt_term::paste (char *data, unsigned int len)
2634{ 2600{
2635 /* convert normal newline chars into common keyboard Return key sequence */ 2601 /* convert normal newline chars into common keyboard Return key sequence */
2636 for (unsigned int i = 0; i < len; i++) 2602 for (unsigned int i = 0; i < len; i++)
2637 if (data[i] == C0_LF) 2603 if (data[i] == C0_LF)
2638 data[i] = C0_CR; 2604 data[i] = C0_CR;
… …
2782 { 2748 {
2783 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2749 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2784 char *s = rxvt_wcstombs (w); 2750 char *s = rxvt_wcstombs (w);
2785 free (w); 2751 free (w);
2786 // TODO: strlen == only the first element will be converted. well... 2752 // TODO: strlen == only the first element will be converted. well...
2787 paste ((unsigned char *)s, strlen (s)); 2753 paste (s, strlen (s));
2788 free (s); 2754 free (s);
2789 } 2755 }
2790 else 2756 else
2791#endif 2757#endif
2792 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2758 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2793 && cl) 2759 && cl)
2794 { 2760 {
2795 for (int i = 0; i < cr; i++) 2761 for (int i = 0; i < cr; i++)
2796 paste ((unsigned char *)cl[i], strlen (cl[i])); 2762 paste (cl[i], strlen (cl[i]));
2797 2763
2798 XFreeStringList (cl); 2764 XFreeStringList (cl);
2799 } 2765 }
2800 else 2766 else
2801 paste (ct.value, ct.nitems); // paste raw 2767 paste ((char *)ct.value, ct.nitems); // paste raw
2802 2768
2803bailout: 2769bailout:
2804 XFree (ct.value); 2770 XFree (ct.value);
2805 2771
2806 if (selection_wait == Sel_normal) 2772 if (selection_wait == Sel_normal)
… …
2836 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2802 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2837 * will auto fallback to CUT_BUFFER0 2803 * will auto fallback to CUT_BUFFER0
2838 * EXT: button 2 release 2804 * EXT: button 2 release
2839 */ 2805 */
2840void 2806void
2841rxvt_term::selection_request (Time tm, int x, int y) 2807rxvt_term::selection_request (Time tm, int selnum)
2842{ 2808{
2843 if (x < 0 || x >= width || y < 0 || y >= height) 2809/* After making a selection with selection_make this function will always
2844 return; /* outside window */ 2810 * return the internal selection, which is not correct IMO, now much more since
2845 2811 * I added the selnum parameter.
2812 */
2813#if 0
2846 if (selection.text) 2814 if (selection.text)
2847 { /* internal selection */ 2815 { /* internal selection */
2848 char *str = rxvt_wcstombs (selection.text, selection.len); 2816 char *str = rxvt_wcstombs (selection.text, selection.len);
2849 paste ((unsigned char *)str, strlen (str)); 2817 paste (str, strlen (str));
2850 free (str); 2818 free (str);
2851 return; 2819 return;
2852 } 2820 }
2853 else 2821 else
2822#endif
2854 { 2823 {
2855 int i;
2856
2857 selection_request_time = tm; 2824 selection_request_time = tm;
2858 selection_wait = Sel_normal; 2825 selection_wait = Sel_normal;
2859 2826
2860 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2861 {
2862#if X_HAVE_UTF8_STRING 2827#if X_HAVE_UTF8_STRING
2863 selection_type = Sel_UTF8String; 2828 selection_type = Sel_UTF8String;
2864 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2829 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2865 return; 2830 return;
2866#else 2831#else
2867 selection_type = Sel_CompoundText; 2832 selection_type = Sel_CompoundText;
2868 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2833 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2869 return; 2834 return;
2870#endif 2835#endif
2871 }
2872 } 2836 }
2873 2837
2874 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2838 selection_wait = Sel_none; /* don't loop in selection_paste () */
2875 selection_paste (display->root, XA_CUT_BUFFER0, false); 2839 selection_paste (display->root, XA_CUT_BUFFER0, false);
2876} 2840}
… …
2946 selection.op = SELECTION_DONE; 2910 selection.op = SELECTION_DONE;
2947 2911
2948 if (selection.clicks == 4) 2912 if (selection.clicks == 4)
2949 return; /* nothing selected, go away */ 2913 return; /* nothing selected, go away */
2950 2914
2915 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2916 return;
2917
2951 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2918 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2952 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2919 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2953 2920
2954 int ofs = 0; 2921 int ofs = 0;
2955 int extra = 0; 2922 int extra = 0;
… …
2967 col = selection.beg.col; 2934 col = selection.beg.col;
2968 end_col = ncol + 1; 2935 end_col = ncol + 1;
2969 } 2936 }
2970 else 2937 else
2971#endif 2938#endif
2972 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2939 end_col = ROW(row).l;
2973 2940
2974 col = max (col, 0); 2941 col = max (col, 0);
2975 2942
2976 if (row == selection.end.row || selection.rect) 2943 if (row == selection.end.row
2944#if ENABLE_FRILLS
2945 || selection.rect
2946#endif
2947 )
2977 end_col = min (end_col, selection.end.col); 2948 min_it (end_col, selection.end.col);
2978 2949
2979 t = ROW(row).t + col; 2950 t = ROW(row).t + col;
2951
2980 for (; col < end_col; col++) 2952 for (; col < end_col; col++)
2981 { 2953 {
2982 if (*t == NOCHAR) 2954 if (*t == NOCHAR)
2983 t++; 2955 t++;
2984#if ENABLE_COMBINING 2956#if ENABLE_COMBINING
… …
3000#endif 2972#endif
3001 else 2973 else
3002 new_selection_text[ofs++] = *t++; 2974 new_selection_text[ofs++] = *t++;
3003 } 2975 }
3004 2976
2977#if ENABLE_FRILLS
2978 if (selection.rect)
2979 {
2980 while (ofs
2981 && new_selection_text[ofs - 1] != C0_LF
2982 && unicode::is_space (new_selection_text[ofs - 1]))
2983 --ofs;
2984
2985 new_selection_text[ofs++] = C0_LF;
2986 }
2987 else
2988#endif
3005 if (!ROW(row).is_longer () && row != selection.end.row) 2989 if (!ROW(row).is_longer () && row != selection.end.row)
3006 new_selection_text[ofs++] = C0_LF; 2990 new_selection_text[ofs++] = C0_LF;
3007 } 2991 }
3008 2992
3009 if (end_col != selection.end.col) 2993 if (end_col != selection.end.col)
3010 new_selection_text[ofs++] = C0_LF; 2994 new_selection_text[ofs++] = C0_LF;
3011 2995
… …
3021 3005
3022 // we usually allocate much more than necessary, so realloc it smaller again 3006 // we usually allocate much more than necessary, so realloc it smaller again
3023 selection.len = ofs; 3007 selection.len = ofs;
3024 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3008 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3025 3009
3010 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3011 return;
3012
3013 selection_grab (tm);
3014}
3015
3016bool
3017rxvt_term::selection_grab (Time tm)
3018{
3019 selection_time = tm;
3020
3026 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3027 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3023 {
3028 display->set_selection_owner (this); 3024 display->set_selection_owner (this);
3025 return true;
3026 }
3029 else 3027 else
3030 rxvt_warn ("can't get primary selection, ignoring.\n"); 3028 {
3029 selection_clear ();
3030 return false;
3031 }
3031 3032
3032#if 0 3033#if 0
3033 XTextProperty ct; 3034 XTextProperty ct;
3034 3035
3035 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3036 { 3037 {
3037 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3038 XFree (ct.value); 3039 XFree (ct.value);
3039 } 3040 }
3040#endif 3041#endif
3041
3042 selection_time = tm;
3043} 3042}
3044 3043
3045/* ------------------------------------------------------------------------- */ 3044/* ------------------------------------------------------------------------- */
3046/* 3045/*
3047 * Mark or select text based upon number of clicks: 1, 2, or 3 3046 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3051rxvt_term::selection_click (int clicks, int x, int y) 3050rxvt_term::selection_click (int clicks, int x, int y)
3052{ 3051{
3053 clicks = ((clicks - 1) % 3) + 1; 3052 clicks = ((clicks - 1) % 3) + 1;
3054 selection.clicks = clicks; /* save clicks so extend will work */ 3053 selection.clicks = clicks; /* save clicks so extend will work */
3055 3054
3055 if (clicks == 2 && !selection.rect
3056 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3057 {
3058 MEvent.clicks = 1; // what a mess
3059 selection.screen = current_screen;
3060 selection.op = SELECTION_CONT;
3061 return;
3062 }
3063
3056 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3064 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3057 3065
3058 if (clicks == 2 || clicks == 3) 3066 if (clicks == 2 || clicks == 3)
3059 selection_extend_colrow (selection.mark.col, 3067 selection_extend_colrow (selection.mark.col,
3060 selection.mark.row + view_start, 3068 selection.mark.row - view_start,
3061 0, /* button 3 */ 3069 0, /* button 3 */
3062 1, /* button press */ 3070 1, /* button press */
3063 0); /* click change */ 3071 0); /* click change */
3064} 3072}
3065 3073
… …
3070void 3078void
3071rxvt_term::selection_start_colrow (int col, int row) 3079rxvt_term::selection_start_colrow (int col, int row)
3072{ 3080{
3073 want_refresh = 1; 3081 want_refresh = 1;
3074 3082
3075 selection.mark.row = row - view_start; 3083 selection.mark.row = row + view_start;
3076 selection.mark.col = col; 3084 selection.mark.col = col;
3077 3085
3078 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); 3086 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3079 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); 3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3080 3088
3081 while (selection.mark.col > 0 3089 while (selection.mark.col > 0
3082 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3083 --selection.mark.col; 3091 --selection.mark.col;
3084 3092
… …
3111 text_t *stp; 3119 text_t *stp;
3112 rend_t *srp; 3120 rend_t *srp;
3113 3121
3114 if (dirn == UP) 3122 if (dirn == UP)
3115 { 3123 {
3116 bound.row = - nsaved - 1; 3124 bound.row = top_row - 1;
3117 bound.col = 0; 3125 bound.col = 0;
3118 dirnadd = -1; 3126 dirnadd = -1;
3119 } 3127 }
3120 else 3128 else
3121 { 3129 {
… …
3169 } 3177 }
3170 } 3178 }
3171 break; 3179 break;
3172 } 3180 }
3173 3181
3174Old_Word_Selection_You_Die:
3175 if (dirn == DN) 3182 if (dirn == DN)
3176 col++; /* put us on one past the end */ 3183 col++; /* put us on one past the end */
3177 3184
3178 /* Poke the values back in */ 3185 /* Poke the values back in */
3179 ret->row = row; 3186 ret->row = row;
… …
3189 * flag == 2 ==> button 3 motion 3196 * flag == 2 ==> button 3 motion
3190 */ 3197 */
3191void 3198void
3192rxvt_term::selection_extend (int x, int y, int flag) 3199rxvt_term::selection_extend (int x, int y, int flag)
3193{ 3200{
3194 int col = min (max (Pixel2Col (x), 0), nrow - 1); 3201 int col = clamp (Pixel2Col (x), 0, ncol);
3195 int row = min (max (Pixel2Row (y), 0), ncol); 3202 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3196 3203
3197 /* 3204 /*
3198 * If we're selecting characters (single click) then we must check first 3205 * If we're selecting characters (single click) then we must check first
3199 * if we are at the same place as the original mark. If we are then 3206 * if we are at the same place as the original mark. If we are then
3200 * select nothing. Otherwise, if we're to the right of the mark, you have to 3207 * select nothing. Otherwise, if we're to the right of the mark, you have to
3201 * be _past_ a character for it to be selected. 3208 * be _past_ a character for it to be selected.
3202 */ 3209 */
3203 if (((selection.clicks % 3) == 1) && !flag 3210 if (((selection.clicks % 3) == 1) && !flag
3204 && (col == selection.mark.col 3211 && (col == selection.mark.col
3205 && (row == selection.mark.row + view_start))) 3212 && (row == selection.mark.row - view_start)))
3206 { 3213 {
3207 /* select nothing */ 3214 /* select nothing */
3208 selection.beg.row = selection.end.row = 0; 3215 selection.beg.row = selection.end.row = 0;
3209 selection.beg.col = selection.end.col = 0; 3216 selection.beg.col = selection.end.col = 0;
3210 selection.clicks = 4; 3217 selection.clicks = 4;
… …
3265 selection.beg.col = selection.end.col = selection.mark.col; 3272 selection.beg.col = selection.end.col = selection.mark.col;
3266 selection.beg.row = selection.end.row = selection.mark.row; 3273 selection.beg.row = selection.end.row = selection.mark.row;
3267 } 3274 }
3268 3275
3269 pos.col = col; 3276 pos.col = col;
3270 pos.row = row - view_start; 3277 pos.row = view_start + row;
3271 3278
3272 /* 3279 /*
3273 * This is mainly xterm style selection with a couple of differences, mainly 3280 * This is mainly xterm style selection with a couple of differences, mainly
3274 * in the way button3 drag extension works. 3281 * in the way button3 drag extension works.
3275 * We're either doing: button1 drag; button3 press; or button3 drag 3282 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3362 selection_delimit_word (DN, &selection.end, &selection.end); 3369 selection_delimit_word (DN, &selection.end, &selection.end);
3363 } 3370 }
3364 else if (selection.clicks == 3) 3371 else if (selection.clicks == 3)
3365 { 3372 {
3366#if ENABLE_FRILLS 3373#if ENABLE_FRILLS
3367 if (options & Opt_tripleclickwords) 3374 if (OPTION (Opt_tripleclickwords))
3368 { 3375 {
3369 selection_delimit_word (UP, &selection.beg, &selection.beg); 3376 selection_delimit_word (UP, &selection.beg, &selection.beg);
3370 3377
3371 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3378 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3372 { 3379 {
3373 if (!ROW(end_row).is_longer ()) 3380 if (!ROW(end_row).is_longer ())
3374 { 3381 {
3375 selection.end.row = end_row; 3382 selection.end.row = end_row;
3376 selection.end.col = save[end_row + saveLines].l; 3383 selection.end.col = ROW(end_row).l;
3377 selection_remove_trailing_spaces (); 3384 selection_remove_trailing_spaces ();
3378 break; 3385 break;
3379 } 3386 }
3380 } 3387 }
3381 } 3388 }
… …
3413 } 3420 }
3414 } 3421 }
3415 3422
3416#if ENABLE_FRILLS 3423#if ENABLE_FRILLS
3417 if (selection.rect && selection.beg.col > selection.end.col) 3424 if (selection.rect && selection.beg.col > selection.end.col)
3418 SWAP_IT (selection.beg.col, selection.end.col, int); 3425 ::swap (selection.beg.col, selection.end.col);
3419#endif 3426#endif
3420} 3427}
3421 3428
3422#if ENABLE_FRILLS 3429#if ENABLE_FRILLS
3423void 3430void
… …
3433 { 3440 {
3434 stp = ROW(end_row).t; 3441 stp = ROW(end_row).t;
3435 3442
3436 while (--end_col >= 0) 3443 while (--end_col >= 0)
3437 { 3444 {
3438 if (stp[end_col] != ' ' 3445 if (stp[end_col] != NOCHAR
3439 && stp[end_col] != '\t' 3446 && !unicode::is_space (stp[end_col]))
3440 && stp[end_col] != NOCHAR)
3441 break; 3447 break;
3442 } 3448 }
3443 3449
3444 if (end_col >= 0 3450 if (end_col >= 0
3445 || !ROW(end_row - 1).is_longer ()) 3451 || !ROW(end_row - 1).is_longer ())
… …
3621 */ 3627 */
3622void 3628void
3623rxvt_term::pixel_position (int *x, int *y) 3629rxvt_term::pixel_position (int *x, int *y)
3624{ 3630{
3625 *x = Pixel2Col (*x); 3631 *x = Pixel2Col (*x);
3626 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3632 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3627 *y = Pixel2Row (*y); 3633 *y = Pixel2Row (*y);
3628 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3634 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3629} 3635}
3630 3636
3631/* ------------------------------------------------------------------------- */ 3637/* ------------------------------------------------------------------------- */
3632#ifdef USE_XIM 3638#ifdef USE_XIM
3633void 3639void
… …
3644 3650
3645#if ENABLE_OVERLAY 3651#if ENABLE_OVERLAY
3646void 3652void
3647rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3653rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3648{ 3654{
3649 if (nrow < 3 || ncol < 3) 3655 if (nrow < 1 || ncol < 1)
3650 return; 3656 return;
3651 3657
3652 want_refresh = 1; 3658 want_refresh = 1;
3653 3659
3654 scr_overlay_off (); 3660 scr_overlay_off ();
3655 3661
3656 if (x < 0) x = ncol - w; 3662 if (x < 0) x = ncol - w;
3657 if (y < 0) y = nrow - h; 3663 if (y < 0) y = nrow - h;
3658 3664
3659 // make space for border 3665 // make space for border
3660 w += 2; MIN_IT (w, ncol); 3666 w += 2; min_it (w, ncol);
3661 h += 2; MIN_IT (h, nrow); 3667 h += 2; min_it (h, nrow);
3662 3668
3663 x -= 1; MAX_IT (x, 0); 3669 x -= 1; clamp_it (x, 0, ncol - w);
3664 y -= 1; MAX_IT (y, 0); 3670 y -= 1; clamp_it (y, 0, nrow - h);
3665
3666 MIN_IT (x, ncol - w);
3667 MIN_IT (y, nrow - h);
3668 3671
3669 ov_x = x; ov_y = y; 3672 ov_x = x; ov_y = y;
3670 ov_w = w; ov_h = h; 3673 ov_w = w; ov_h = h;
3671 3674
3672 ov_text = new text_t *[h]; 3675 ov_text = new text_t *[h];
… …
3764 for (int y = ov_h; y--; ) 3767 for (int y = ov_h; y--; )
3765 { 3768 {
3766 text_t *t1 = ov_text[y]; 3769 text_t *t1 = ov_text[y];
3767 rend_t *r1 = ov_rend[y]; 3770 rend_t *r1 = ov_rend[y];
3768 3771
3769 text_t *t2 = ROW(y - view_start).t + ov_x; 3772 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3770 rend_t *r2 = ROW(y - view_start).r + ov_x; 3773 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3771 3774
3772 for (int x = ov_w; x--; ) 3775 for (int x = ov_w; x--; )
3773 { 3776 {
3774 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3777 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3775 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3778 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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