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

Diff Legend

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