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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.174 by root, Mon Dec 19 02:40:14 2005 UTC vs.
Revision 1.242 by root, Thu Jan 19 19:51:08 2006 UTC

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

Diff Legend

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