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.183 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.241 by root, Thu Jan 19 17:37:01 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 * ------------------------------------------------------------------------- */
… …
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/*
… …
552 530
553 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
554 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
555 533
556#if NSCREENS 534#if NSCREENS
557 if (options & Opt_secondaryScreen) 535 if (OPTION (Opt_secondaryScreen))
558 { 536 {
559 num_scr = 0; 537 num_scr = 0;
560 538
561 for (int i = nrow; i--; ) 539 for (int i = prev_nrow; i--; )
562 ::swap (ROW(i), swap_save[i]); 540 ::swap (ROW(i), swap_buf [i]);
563 541
564 ::swap (screen.charset, swap.charset); 542 ::swap (screen.charset, swap.charset);
565 ::swap (screen.flags, swap.flags); 543 ::swap (screen.flags, swap.flags);
566 screen.flags |= Screen_VisibleCursor; 544 screen.flags |= Screen_VisibleCursor;
567 swap.flags |= Screen_VisibleCursor; 545 swap.flags |= Screen_VisibleCursor;
568 } 546 }
569 else 547 else
570#endif 548#endif
571 if (options & Opt_secondaryScroll) 549 if (OPTION (Opt_secondaryScroll))
572 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 550 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
573 551
574 return scrn; 552 return scrn;
575} 553}
576 554
… …
596 * Change the colour for following text 574 * Change the colour for following text
597 */ 575 */
598void 576void
599rxvt_term::scr_color (unsigned int color, int fgbg) 577rxvt_term::scr_color (unsigned int color, int fgbg)
600{ 578{
601 if (color > maxTermCOLOR) 579 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
602 color = fgbg; 580 color = fgbg;
603 581
604 if (fgbg == Color_fg) 582 if (fgbg == Color_fg)
605 rstyle = SET_FGCOLOR (rstyle, color); 583 rstyle = SET_FGCOLOR (rstyle, color);
606 else 584 else
… …
637 want_refresh = 1; 615 want_refresh = 1;
638 num_scr += count; 616 num_scr += count;
639 617
640 if (count > 0 618 if (count > 0
641 && row1 == 0 619 && row1 == 0
642 && row2 == nrow - 1
643 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
644 { 621 {
645 nsaved = min (nsaved + count, saveLines); 622 top_row = max (top_row - count, -saveLines);
623
624 // scroll everything up 'count' lines
646 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
647 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
648 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
649 { 661 {
650 selection.beg.row -= count; 662 selection.beg.row -= count;
651 selection.end.row -= count; 663 selection.end.row -= count;
652 selection.mark.row -= count; 664 selection.mark.row -= count;
653 665
654 selection_check (0); 666 if (selection.beg.row < top_row
655 } 667 || selection.end.row < top_row
656 668 || selection.mark.row < top_row)
657 for (int i = count; i--; )
658 scr_blank_screen_mem (ROW(row2 - i), rstyle);
659
660 if ((options & Opt_scrollWithBuffer)
661 && view_start != 0
662 && view_start != saveLines)
663 scr_page (UP, count);
664 }
665 else
666 {
667 if (selection.op && current_screen == selection.screen)
668 {
669 int i = selection.beg.row;
670 int j = selection.end.row;
671
672 if ((i < row1 && j > row1)
673 || (i < row2 && j > row2)
674 || (i - count < row1 && i >= row1)
675 || (i - count > row2 && i <= row2)
676 || (j - count < row1 && j >= row1)
677 || (j - count > row2 && j <= row2))
678 { 669 {
679 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
680 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
681 } 672 }
682 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)
683 { 699 {
684 /* move selected region too */ 700 /* move selected region too */
685 selection.beg.row -= count; 701 selection.beg.row -= count;
686 selection.end.row -= count; 702 selection.end.row -= count;
687 selection.mark.row -= count; 703 selection.mark.row -= count;
… …
693 // use a simple and robust scrolling algorithm, this 709 // use a simple and robust scrolling algorithm, this
694 // part of scr_scroll_text is not time-critical. 710 // part of scr_scroll_text is not time-critical.
695 711
696 int rows = row2 - row1 + 1; 712 int rows = row2 - row1 + 1;
697 713
714 min_it (count, rows);
715
716 line_t *temp_buf = row_buf + total_rows;
717
698 for (int row = 0; row < rows; row++) 718 for (int row = 0; row < rows; row++)
699 { 719 {
700 buf [row] = ROW(row1 + (row + count + rows) % rows); 720 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
701 721
702 if (!IN_RANGE_EXC (row + count, 0, rows)) 722 if (!IN_RANGE_EXC (row + count, 0, rows))
703 scr_blank_screen_mem (buf [row], rstyle); 723 scr_blank_screen_mem (temp_buf [row], rstyle);
704 } 724 }
705 725
706 for (int row = 0; row < rows; row++) 726 for (int row = 0; row < rows; row++)
707 ROW(row1 + row) = buf [row]; 727 ROW(row1 + row) = temp_buf [row];
708 } 728 }
709 729
710 return count; 730 return count;
711} 731}
712 732
713/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
714/* 734/*
715 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
716 */ 736 */
717void 737void
718rxvt_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)
719{ 739{
720 if (len <= 0) /* sanity */ 740 if (len <= 0) /* sanity */
721 return; 741 return;
722 742
723 unsigned char checksel; 743 unsigned char checksel;
724 unicode_t c; 744 unicode_t c;
725 int row, last_col; 745 int ncol = this->ncol;
726 const unicode_t *strend = str + len; 746 const wchar_t *strend = str + len;
727 747
728 want_refresh = 1; 748 want_refresh = 1;
729 ZERO_SCROLLBACK (); 749 ZERO_SCROLLBACK ();
730 last_col = ncol;
731 750
732 if (nlines > 0) 751 if (minlines > 0)
733 { 752 {
734 nlines += screen.cur.row - screen.bscroll; 753 minlines += screen.cur.row - screen.bscroll;
754
735 if ((nlines > 0) 755 if (minlines > 0
736 && (screen.tscroll == 0) 756 && screen.tscroll == 0
737 && (screen.bscroll == (nrow - 1))) 757 && screen.bscroll == nrow - 1)
738 { 758 {
739 /* _at least_ this many lines need to be scrolled */ 759 /* _at least_ this many lines need to be scrolled */
740 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 760 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
741 screen.cur.row -= nlines; 761 screen.cur.row -= minlines;
742 } 762 }
743 } 763 }
744 764
745#ifdef DEBUG_STRICT 765#ifdef DEBUG_STRICT
746 assert (screen.cur.col < last_col); 766 assert (screen.cur.col < ncol);
747 assert ((screen.cur.row < nrow) 767 assert (screen.cur.row < nrow
748 && (screen.cur.row >= - (int32_t)nsaved)); 768 && screen.cur.row >= top_row);
749#else /* drive with your eyes closed */
750 min_it (screen.cur.col, last_col - 1);
751 min_it (screen.cur.row, (int32_t)nrow - 1);
752 max_it (screen.cur.row, - (int32_t)nsaved);
753#endif 769#endif
754 row = screen.cur.row; 770 int row = screen.cur.row;
755 771
756 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 772 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
757 773
758 line_t *line = &ROW(row); 774 line_t *line = &ROW(row);
759 775
760 while (str < strend) 776 while (str < strend)
761 { 777 {
762 c = *str++; 778 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
763 779
764 if (c < 0x20) 780 if (c < 0x20)
765 if (c == C0_LF) 781 if (c == C0_LF)
766 { 782 {
767 if (!line->is_longer ()) /* XXX: think about this */
768 max_it (line->l, screen.cur.col); 783 max_it (line->l, screen.cur.col);
769 784
770 screen.flags &= ~Screen_WrapNext; 785 screen.flags &= ~Screen_WrapNext;
771 786
772 if (screen.cur.row == screen.bscroll) 787 if (screen.cur.row == screen.bscroll)
773 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 788 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
777 line = &ROW(row); /* _must_ refresh */ 792 line = &ROW(row); /* _must_ refresh */
778 continue; 793 continue;
779 } 794 }
780 else if (c == C0_CR) 795 else if (c == C0_CR)
781 { 796 {
782 if (!line->is_longer ()) /* XXX: think about this */
783 max_it (line->l, screen.cur.col); 797 max_it (line->l, screen.cur.col);
784 798
785 screen.flags &= ~Screen_WrapNext; 799 screen.flags &= ~Screen_WrapNext;
786 screen.cur.col = 0; 800 screen.cur.col = 0;
787 continue; 801 continue;
788 } 802 }
… …
805 CLEAR_SELECTION (); 819 CLEAR_SELECTION ();
806 } 820 }
807 821
808 if (screen.flags & Screen_WrapNext) 822 if (screen.flags & Screen_WrapNext)
809 { 823 {
810 line->set_is_longer ();
811
812 scr_do_wrap (); 824 scr_do_wrap ();
813 825
826 line->l = ncol;
827 line->is_longer (1);
828
814 row = screen.cur.row; 829 row = screen.cur.row;
815 line = &ROW(row); /* _must_ refresh */ 830 line = &ROW(row); /* _must_ refresh */
816 } 831 }
817 832
818 // some utf-8 decoders "decode" surrogate characters: let's fix this. 833 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
823 // do wcwidth before further replacements, as wcwidth might return -1 838 // do wcwidth before further replacements, as wcwidth might return -1
824 // 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
825 // locale. 840 // locale.
826 int width = c < 0x100 ? 1 : wcwidth (c); 841 int width = c < 0x100 ? 1 : wcwidth (c);
827 842
828 if (charsets[screen.charset] == '0') // DEC SPECIAL 843 if (charsets [screen.charset] == '0') // DEC SPECIAL
829 { 844 {
830 // vt100 special graphics and line drawing 845 // vt100 special graphics and line drawing
831 // 5f-7e standard vt100 846 // 5f-7e standard vt100
832 // 40-5e rxvt extension for extra curses acs chars 847 // 40-5e rxvt extension for extra curses acs chars
833 static uint16_t vt100_0[62] = { // 41 .. 7e 848 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
885 } 900 }
886 901
887 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
888 903
889 // if the character doesn't fit into the remaining columns... 904 // if the character doesn't fit into the remaining columns...
890 if (screen.cur.col > last_col - width && last_col >= width) 905 if (screen.cur.col > ncol - width && ncol >= width)
891 { 906 {
892 // ...output spaces 907 // ...output spaces
893 c = ' '; 908 c = ' ';
894 // and try the same character next loop iteration 909 // and try the same character next loop iteration
895 --str; 910 --str;
896 } 911 }
897 912
913 line->touch ();
914
898 do 915 do
899 { 916 {
900 line->t[screen.cur.col] = c; 917 line->t[screen.cur.col] = c;
901 line->r[screen.cur.col] = rend; 918 line->r[screen.cur.col] = rend;
902 919
903 if (screen.cur.col < last_col - 1) 920 if (screen.cur.col < ncol - 1)
904 screen.cur.col++; 921 screen.cur.col++;
905 else 922 else
906 { 923 {
907 line->l = last_col; 924 line->l = ncol;
908 if (screen.flags & Screen_Autowrap) 925 if (screen.flags & Screen_Autowrap)
909 screen.flags |= Screen_WrapNext; 926 screen.flags |= Screen_WrapNext;
910 break; 927 break;
911 } 928 }
912 929
… …
914 } 931 }
915 while (--width > 0); 932 while (--width > 0);
916 933
917 // pad with spaces when overwriting wide character with smaller one 934 // pad with spaces when overwriting wide character with smaller one
918 if (!width) 935 if (!width)
936 {
937 line->touch ();
938
919 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++)
920 { 940 {
921 line->t[c] = ' '; 941 line->t[c] = ' ';
922 line->r[c] = rend; 942 line->r[c] = rend;
923 } 943 }
944 }
924 } 945 }
925 else // width == 0 946 else // width == 0
926 { 947 {
927#if ENABLE_COMBINING 948#if ENABLE_COMBINING
928 // handle combining characters 949 // handle combining characters
929 // we just tag the accent on the previous on-screen character. 950 // we just tag the accent on the previous on-screen character.
930 // this is arguably not correct, but also arguably not wrong. 951 // this is arguably not correct, but also arguably not wrong.
931 // we don't handle double-width characters nicely yet. 952 // we don't handle double-width characters nicely yet.
953 line_t *linep;
932 text_t *tp; 954 text_t *tp;
933 rend_t *rp; 955 rend_t *rp;
934 956
935 if (screen.cur.col > 0) 957 if (screen.cur.col > 0)
936 { 958 {
959 linep = line;
937 tp = line->t + screen.cur.col - 1; 960 tp = line->t + screen.cur.col - 1;
938 rp = line->r + screen.cur.col - 1; 961 rp = line->r + screen.cur.col - 1;
939
940 while (*tp == NOCHAR && tp > line->t)
941 tp--, rp--;
942 } 962 }
943 else if (screen.cur.row > 0 963 else if (screen.cur.row > 0
944 && ROW(screen.cur.row - 1).is_longer ()) 964 && ROW(screen.cur.row - 1).is_longer ())
945 { 965 {
946 line_t *line = &ROW(screen.cur.row - 1); 966 linep = &ROW(screen.cur.row - 1);
947
948 tp = line->t + last_col - 1; 967 tp = line->t + ncol - 1;
949 rp = line->r + last_col - 1; 968 rp = line->r + ncol - 1;
950
951 while (*tp == NOCHAR && tp > line->t)
952 tp--, rp--;
953 } 969 }
954 else 970 else
955 continue; 971 continue;
972
973 linep->touch ();
974
975 while (*tp == NOCHAR && tp > linep->t)
976 tp--, rp--;
956 977
957 // first try to find a precomposed character 978 // first try to find a precomposed character
958 unicode_t n = rxvt_compose (*tp, c); 979 unicode_t n = rxvt_compose (*tp, c);
959 if (n == NOCHAR) 980 if (n == NOCHAR)
960 n = rxvt_composite.compose (*tp, c); 981 n = rxvt_composite.compose (*tp, c);
… …
963 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 984 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
964#endif 985#endif
965 } 986 }
966 } 987 }
967 988
968 if (!line->is_longer ()) /* XXX: think about this */
969 max_it (line->l, screen.cur.col); 989 max_it (line->l, screen.cur.col);
970 990
971#ifdef DEBUG_STRICT 991#ifdef DEBUG_STRICT
972 assert (screen.cur.row >= 0); 992 assert (screen.cur.row >= 0);
973#else /* drive with your eyes closed */
974 max_it (screen.cur.row, 0);
975#endif 993#endif
976} 994}
977 995
978/* ------------------------------------------------------------------------- */ 996/* ------------------------------------------------------------------------- */
979/* 997/*
… …
1018 1036
1019 if (count == 0) 1037 if (count == 0)
1020 return; 1038 return;
1021 else if (count > 0) 1039 else if (count > 0)
1022 { 1040 {
1023 int row = screen.cur.row;
1024
1025 line_t &l = ROW(row); 1041 line_t &l = ROW(screen.cur.row);
1026 rend_t base_rend = l.r[i]; 1042 rend_t base_rend = l.r[i];
1027 ht &= l.t[i] == ' '; 1043 ht &= l.t[i] == ' ';
1028 1044
1029 for (; ++i < ncol; ) 1045 for (; ++i < ncol; )
1030 if (tabs[i]) 1046 if (tabs[i])
1031 { 1047 {
1032 x = i; 1048 x = i;
1049
1033 if (!--count) 1050 if (!--count)
1034 break; 1051 break;
1035 } 1052 }
1036 else 1053 else
1037 ht &= l.t[i] == ' ' 1054 ht &= l.t[i] == ' '
… …
1040 if (count) 1057 if (count)
1041 x = ncol - 1; 1058 x = ncol - 1;
1042 1059
1043 // store horizontal tab commands as characters inside the text 1060 // store horizontal tab commands as characters inside the text
1044 // buffer so they can be selected and pasted. 1061 // buffer so they can be selected and pasted.
1045 if (ht && options & Opt_pastableTabs) 1062 if (ht && OPTION (Opt_pastableTabs))
1046 { 1063 {
1047 base_rend = SET_FONT (base_rend, 0); 1064 base_rend = SET_FONT (base_rend, 0);
1048 1065
1049 if (!l.is_longer ()) /* XXX: think about this */ 1066 l.touch (x);
1050 max_it (l.l, x);
1051 1067
1052 i = screen.cur.col; 1068 i = screen.cur.col;
1053 1069
1054 l.t[i] = '\t'; 1070 l.t[i] = '\t';
1055 l.r[i] = base_rend; 1071 l.r[i] = base_rend;
… …
1105 */ 1121 */
1106#if ENABLE_FRILLS 1122#if ENABLE_FRILLS
1107void 1123void
1108rxvt_term::scr_forwardindex () 1124rxvt_term::scr_forwardindex ()
1109{ 1125{
1110 int row;
1111
1112 if (screen.cur.col < ncol - 1) 1126 if (screen.cur.col < ncol - 1)
1113 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1114 else 1128 else
1115 { 1129 {
1116 row = screen.cur.row; 1130 line_t &l = ROW(screen.cur.row);
1117 1131
1118 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1132 l.touch ();
1119 ROW(row).l = ncol; 1133 l.is_longer (0);
1120 1134
1121 scr_gotorc (0, 0, R_RELATIVE); 1135 scr_gotorc (0, 0, R_RELATIVE);
1122 scr_insdel_chars (1, DELETE); 1136 scr_insdel_chars (1, DELETE);
1123 scr_gotorc (0, ncol - 1, R_RELATIVE); 1137 scr_gotorc (0, ncol - 1, R_RELATIVE);
1124 } 1138 }
… …
1134{ 1148{
1135 want_refresh = 1; 1149 want_refresh = 1;
1136 ZERO_SCROLLBACK (); 1150 ZERO_SCROLLBACK ();
1137 1151
1138 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1152 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1139 max_it (screen.cur.col, 0);
1140 min_it (screen.cur.col, (int32_t)ncol - 1); 1153 clamp_it (screen.cur.col, 0, ncol - 1);
1141 1154
1142 screen.flags &= ~Screen_WrapNext; 1155 screen.flags &= ~Screen_WrapNext;
1143 1156
1144 if (relative & R_RELATIVE) 1157 if (relative & R_RELATIVE)
1145 { 1158 {
… …
1169 } 1182 }
1170 else 1183 else
1171 screen.cur.row = row; 1184 screen.cur.row = row;
1172 } 1185 }
1173 1186
1174 max_it (screen.cur.row, 0);
1175 min_it (screen.cur.row, (int32_t)nrow - 1); 1187 clamp_it (screen.cur.row, 0, nrow - 1);
1176} 1188}
1177 1189
1178/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1179/* 1191/*
1180 * direction should be UP or DN 1192 * direction should be UP or DN
… …
1195 || (screen.cur.row == screen.tscroll && direction == DN)) 1207 || (screen.cur.row == screen.tscroll && direction == DN))
1196 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1208 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1197 else 1209 else
1198 screen.cur.row += dirn; 1210 screen.cur.row += dirn;
1199 1211
1200 max_it (screen.cur.row, 0);
1201 min_it (screen.cur.row, (int32_t)nrow - 1); 1212 clamp_it (screen.cur.row, 0, nrow - 1);
1202 selection_check (0); 1213 selection_check (0);
1203} 1214}
1204 1215
1205/* ------------------------------------------------------------------------- */ 1216/* ------------------------------------------------------------------------- */
1206/* 1217/*
… …
1210 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1211 */ 1222 */
1212void 1223void
1213rxvt_term::scr_erase_line (int mode) 1224rxvt_term::scr_erase_line (int mode)
1214{ 1225{
1215 unsigned int row, col, num; 1226 unsigned int col, num;
1216 1227
1217 want_refresh = 1; 1228 want_refresh = 1;
1218 ZERO_SCROLLBACK (); 1229 ZERO_SCROLLBACK ();
1219 1230
1220 selection_check (1); 1231 selection_check (1);
1221 1232
1222 row = screen.cur.row; 1233 line_t &line = ROW(screen.cur.row);
1234
1235 line.touch ();
1236 line.is_longer (0);
1223 1237
1224 switch (mode) 1238 switch (mode)
1225 { 1239 {
1226 case 0: /* erase to end of line */ 1240 case 0: /* erase to end of line */
1227 col = screen.cur.col; 1241 col = screen.cur.col;
1228 num = ncol - col; 1242 num = ncol - col;
1229 min_it (ROW(row).l, (int16_t)col); 1243 min_it (line.l, col);
1230 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1244 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1231 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1245 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1232 CLEAR_SELECTION (); 1246 CLEAR_SELECTION ();
1233 break; 1247 break;
1234 case 1: /* erase to beginning of line */ 1248 case 1: /* erase to beginning of line */
… …
1239 CLEAR_SELECTION (); 1253 CLEAR_SELECTION ();
1240 break; 1254 break;
1241 case 2: /* erase whole line */ 1255 case 2: /* erase whole line */
1242 col = 0; 1256 col = 0;
1243 num = ncol; 1257 num = ncol;
1244 ROW(row).l = 0; 1258 line.l = 0;
1245 if (selection.beg.row <= screen.cur.row 1259 if (selection.beg.row <= screen.cur.row
1246 && selection.end.row >= screen.cur.row) 1260 && selection.end.row >= screen.cur.row)
1247 CLEAR_SELECTION (); 1261 CLEAR_SELECTION ();
1248 break; 1262 break;
1249 default: 1263 default:
1250 return; 1264 return;
1251 } 1265 }
1252 1266
1253 scr_blank_line (ROW(row), col, num, rstyle); 1267 scr_blank_line (line, col, num, rstyle);
1254} 1268}
1255 1269
1256/* ------------------------------------------------------------------------- */ 1270/* ------------------------------------------------------------------------- */
1257/* 1271/*
1258 * Erase part of whole of the screen 1272 * Erase part of whole of the screen
… …
1301 CLEAR_SELECTION (); 1315 CLEAR_SELECTION ();
1302 1316
1303 if (row >= nrow) /* Out Of Bounds */ 1317 if (row >= nrow) /* Out Of Bounds */
1304 return; 1318 return;
1305 1319
1306 min_it (num, (nrow - row)); 1320 min_it (num, nrow - row);
1307 1321
1308 if (rstyle & (RS_RVid | RS_Uline)) 1322 if (rstyle & (RS_RVid | RS_Uline))
1309 ren = (rend_t) ~RS_None; 1323 ren = (rend_t) ~RS_None;
1310 else if (GET_BASEBG (rstyle) == Color_bg) 1324 else if (GET_BASEBG (rstyle) == Color_bg)
1311 { 1325 {
… …
1313 CLEAR_ROWS (row, num); 1327 CLEAR_ROWS (row, num);
1314 } 1328 }
1315 else 1329 else
1316 { 1330 {
1317 ren = rstyle & (RS_fgMask | RS_bgMask); 1331 ren = rstyle & (RS_fgMask | RS_bgMask);
1318 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1319 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1320 ERASE_ROWS (row, num); 1334 ERASE_ROWS (row, num);
1321 gcvalue.foreground = pix_colors[Color_fg]; 1335 gcvalue.foreground = pix_colors[Color_fg];
1322 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1336 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1323 } 1337 }
1324 1338
1325 for (; num--; row++) 1339 for (; num--; row++)
1326 { 1340 {
1327 scr_blank_screen_mem (ROW (row), rstyle); 1341 scr_blank_screen_mem (ROW(row), rstyle);
1328 ROW (row).l = 0;
1329 scr_blank_line (drawn[row], 0, ncol, ren); 1342 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1330 } 1343 }
1331} 1344}
1332 1345
1333#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1334void 1347void
1335rxvt_term::scr_erase_savelines () 1348rxvt_term::scr_erase_savelines ()
1336{ 1349{
1337 want_refresh = 1; 1350 want_refresh = 1;
1338 ZERO_SCROLLBACK (); 1351 ZERO_SCROLLBACK ();
1339 1352
1340 nsaved = 0; 1353 top_row = 0;
1341} 1354}
1342#endif 1355#endif
1343 1356
1344/* ------------------------------------------------------------------------- */ 1357/* ------------------------------------------------------------------------- */
1345/* 1358/*
… …
1366 rend_t *r1 = line.r; 1379 rend_t *r1 = line.r;
1367 1380
1368 for (int j = ncol; j--; ) 1381 for (int j = ncol; j--; )
1369 *r1++ = fs; 1382 *r1++ = fs;
1370 1383
1371 line.l = ncol; /* make the `E's selectable */ 1384 line.is_longer (0);
1385 line.touch (ncol);
1372 } 1386 }
1373} 1387}
1374 1388
1375/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1376/* 1390/*
… …
1419 return; 1433 return;
1420 1434
1421 scr_do_wrap (); 1435 scr_do_wrap ();
1422 1436
1423 selection_check (1); 1437 selection_check (1);
1424 min_it (count, (ncol - screen.cur.col)); 1438 min_it (count, ncol - screen.cur.col);
1425 1439
1426 row = screen.cur.row; 1440 row = screen.cur.row;
1427 1441
1428 line_t *line = &ROW(row); 1442 line_t *line = &ROW(row);
1443
1444 line->touch ();
1445 line->is_longer (0);
1429 1446
1430 switch (insdel) 1447 switch (insdel)
1431 { 1448 {
1432 case INSERT: 1449 case INSERT:
1433 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1450 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1434 { 1451 {
1435 line->t[col] = line->t[col - count]; 1452 line->t[col] = line->t[col - count];
1436 line->r[col] = line->r[col - count]; 1453 line->r[col] = line->r[col - count];
1437 } 1454 }
1438 1455
1439 if (!line->is_longer ()) 1456 line->l = min (line->l + count, ncol);
1440 {
1441 line->l += count;
1442 min_it (line->l, ncol);
1443 }
1444 1457
1445 if (selection.op && current_screen == selection.screen 1458 if (selection.op && current_screen == selection.screen
1446 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1447 { 1460 {
1448 if (selection.end.row != screen.cur.row 1461 if (selection.end.row != screen.cur.row
… …
1461 1474
1462 case ERASE: 1475 case ERASE:
1463 screen.cur.col += count; /* don't worry if > ncol */ 1476 screen.cur.col += count; /* don't worry if > ncol */
1464 selection_check (1); 1477 selection_check (1);
1465 screen.cur.col -= count; 1478 screen.cur.col -= count;
1479
1480 line->l = max (line->l - count, 0);
1466 scr_blank_line (*line, screen.cur.col, count, rstyle); 1481 scr_blank_line (*line, screen.cur.col, count, rstyle);
1467 break; 1482 break;
1468 1483
1469 case DELETE: 1484 case DELETE:
1470 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1485 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1473 { 1488 {
1474 line->t[col] = line->t[col + count]; 1489 line->t[col] = line->t[col + count];
1475 line->r[col] = line->r[col + count]; 1490 line->r[col] = line->r[col + count];
1476 } 1491 }
1477 1492
1493 line->l = max (line->l - count, 0);
1478 scr_blank_line (*line, ncol - count, count, tr); 1494 scr_blank_line (*line, ncol - count, count, tr);
1479
1480 if (line->is_longer ()) /* break line continuation */
1481 line->l = ncol;
1482
1483 line->l = max (line->l - count, 0);
1484 1495
1485 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1486 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1487 { 1498 {
1488 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
… …
1509 */ 1520 */
1510void 1521void
1511rxvt_term::scr_scroll_region (int top, int bot) 1522rxvt_term::scr_scroll_region (int top, int bot)
1512{ 1523{
1513 max_it (top, 0); 1524 max_it (top, 0);
1514 min_it (bot, (int)nrow - 1); 1525 min_it (bot, nrow - 1);
1515 1526
1516 if (top > bot) 1527 if (top > bot)
1517 return; 1528 return;
1518 1529
1519 screen.tscroll = top; 1530 screen.tscroll = top;
… …
1600rxvt_term::scr_set_tab (int mode) 1611rxvt_term::scr_set_tab (int mode)
1601{ 1612{
1602 if (mode < 0) 1613 if (mode < 0)
1603 memset (tabs, 0, ncol * sizeof (char)); 1614 memset (tabs, 0, ncol * sizeof (char));
1604 else if (screen.cur.col < ncol) 1615 else if (screen.cur.col < ncol)
1605 tabs[screen.cur.col] = (mode ? 1 : 0); 1616 tabs [screen.cur.col] = !!mode;
1606} 1617}
1607 1618
1608/* ------------------------------------------------------------------------- */ 1619/* ------------------------------------------------------------------------- */
1609/* 1620/*
1610 * Set reverse/normal video 1621 * Set reverse/normal video
… …
1622 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1633 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1623#if XPM_BACKGROUND 1634#if XPM_BACKGROUND
1624 if (bgPixmap.pixmap == None) 1635 if (bgPixmap.pixmap == None)
1625#endif 1636#endif
1626#if TRANSPARENT 1637#if TRANSPARENT
1627 if (! (options & Opt_transparent) || am_transparent == 0) 1638 if (! OPTION (Opt_transparent) || am_transparent == 0)
1628#endif 1639#endif
1629 XSetWindowBackground (display->display, vt, 1640 XSetWindowBackground (display->display, vt,
1630 pix_colors[Color_bg]); 1641 pix_colors[Color_bg]);
1631 1642
1632 gcvalue.foreground = pix_colors[Color_fg]; 1643 gcvalue.foreground = pix_colors[Color_fg];
… …
1657 * Set font style 1668 * Set font style
1658 */ 1669 */
1659void 1670void
1660rxvt_term::set_font_style () 1671rxvt_term::set_font_style ()
1661{ 1672{
1673#if 0
1662 switch (charsets[screen.charset]) 1674 switch (charsets [screen.charset])
1663 { 1675 {
1664 case '0': /* DEC Special Character & Line Drawing Set */ 1676 case '0': /* DEC Special Character & Line Drawing Set */
1665 break; 1677 break;
1666 case 'A': /* United Kingdom (UK) */ 1678 case 'A': /* United Kingdom (UK) */
1667 break; 1679 break;
… …
1674 case 'C': /* Finnish character set */ 1686 case 'C': /* Finnish character set */
1675 break; 1687 break;
1676 case 'K': /* German character set */ 1688 case 'K': /* German character set */
1677 break; 1689 break;
1678 } 1690 }
1691#endif
1679} 1692}
1680 1693
1681/* ------------------------------------------------------------------------- */ 1694/* ------------------------------------------------------------------------- */
1682/* 1695/*
1683 * Choose a font 1696 * Choose a font
… …
1723 bool found = false; 1736 bool found = false;
1724 1737
1725 for (int i = 0; i < nrow; i++) 1738 for (int i = 0; i < nrow; i++)
1726 { 1739 {
1727 int col = 0; 1740 int col = 0;
1728 rend_t *drp = drawn[i].r; 1741 rend_t *drp = drawn_buf[i].r;
1729 1742
1730 for (; col < ncol; col++, drp++) 1743 for (; col < ncol; col++, drp++)
1731 if ((*drp & mask) == value) 1744 if ((*drp & mask) == value)
1732 { 1745 {
1733 found = true; 1746 found = true;
… …
1751rxvt_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)
1752{ 1765{
1753 int i; 1766 int i;
1754 row_col_t rc[RC_COUNT]; 1767 row_col_t rc[RC_COUNT];
1755 1768
1756 if (!drawn) /* sanity check */ 1769 if (!drawn_buf) /* sanity check */
1757 return; 1770 return;
1758 1771
1759#ifndef NO_SLOW_LINK_SUPPORT 1772#ifndef NO_SLOW_LINK_SUPPORT
1760 if (refresh_type == FAST_REFRESH && !display->is_local) 1773 if (refresh_type == FAST_REFRESH && !display->is_local)
1761 { 1774 {
1762 y = 0; 1775 y = 0;
1763 eheight = height; 1776 eheight = height;
1764 } 1777 }
1765#endif
1766
1767#ifdef DEBUG_STRICT
1768 x = max (x, 0);
1769 x = min (x, (int)width);
1770 y = max (y, 0);
1771 y = min (y, (int)height);
1772#endif 1778#endif
1773 1779
1774 /* round down */ 1780 /* round down */
1775 rc[PART_BEG].col = Pixel2Col (x); 1781 rc[PART_BEG].col = Pixel2Col (x);
1776 rc[PART_BEG].row = Pixel2Row (y); 1782 rc[PART_BEG].row = Pixel2Row (y);
… …
1784 min_it (rc[i].col, ncol - 1); 1790 min_it (rc[i].col, ncol - 1);
1785 min_it (rc[i].row, nrow - 1); 1791 min_it (rc[i].row, nrow - 1);
1786 } 1792 }
1787 1793
1788 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++)
1789 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;
1790 1798
1791 if (refresh) 1799 if (refresh)
1792 scr_refresh (SLOW_REFRESH); 1800 scr_refresh ();
1793} 1801}
1794 1802
1795/* ------------------------------------------------------------------------- */ 1803/* ------------------------------------------------------------------------- */
1796/* 1804/*
1797 * Refresh the entire screen 1805 * Refresh the entire screen
… …
1805/* ------------------------------------------------------------------------- */ 1813/* ------------------------------------------------------------------------- */
1806/* 1814/*
1807 * 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
1808 * the top of the screen 1816 * the top of the screen
1809 */ 1817 */
1810int 1818void
1811rxvt_term::scr_move_to (int y, int len) 1819rxvt_term::scr_move_to (int y, int len)
1812{ 1820{
1813 long p = 0; 1821 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1814 unsigned int oldviewstart;
1815
1816 oldviewstart = view_start;
1817
1818 if (y < len)
1819 {
1820 p = (nrow + nsaved) * (len - y) / len;
1821 p -= (long) (nrow - 1);
1822 p = max (p, 0);
1823 }
1824
1825 view_start = (unsigned int)min (p, nsaved);
1826
1827 return scr_changeview (oldviewstart);
1828} 1822}
1829 1823
1830/* ------------------------------------------------------------------------- */ 1824/* ------------------------------------------------------------------------- */
1831/* 1825/*
1832 * Page the screen up/down nlines 1826 * Page the screen up/down nlines
1833 * direction should be UP or DN 1827 * direction should be UP or DN
1834 */ 1828 */
1835int 1829bool
1836rxvt_term::scr_page (enum page_dirn direction, int nlines) 1830rxvt_term::scr_page (enum page_dirn direction, int nlines)
1837{ 1831{
1838 int n; 1832 int new_view_start =
1839 unsigned int oldviewstart;
1840
1841 oldviewstart = view_start;
1842
1843 if (direction == UP)
1844 {
1845 n = view_start + nlines;
1846 view_start = min (n, nsaved);
1847 }
1848 else
1849 {
1850 n = view_start - nlines; 1833 direction == UP ? view_start - nlines
1851 view_start = max (n, 0); 1834 : view_start + nlines;
1852 }
1853 1835
1854 return scr_changeview (oldviewstart); 1836 return scr_changeview (new_view_start);
1855} 1837}
1856 1838
1857int 1839bool
1858rxvt_term::scr_changeview (unsigned int oldviewstart) 1840rxvt_term::scr_changeview (int new_view_start)
1859{ 1841{
1842 clamp_it (new_view_start, top_row, 0);
1843
1860 if (view_start != oldviewstart) 1844 if (new_view_start == view_start)
1861 { 1845 return false;
1846
1847 num_scr += new_view_start - view_start;
1848 view_start = new_view_start;
1862 want_refresh = 1; 1849 want_refresh = 1;
1863 num_scr -= (view_start - oldviewstart);
1864 }
1865 1850
1866 return (int) (view_start - oldviewstart); 1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1852
1853 return true;
1867} 1854}
1868 1855
1869/* ------------------------------------------------------------------------- */ 1856/* ------------------------------------------------------------------------- */
1870void 1857void
1871rxvt_term::scr_bell () 1858rxvt_term::scr_bell ()
1872{ 1859{
1873#ifndef NO_BELL 1860#ifndef NO_BELL
1874 1861
1875# ifndef NO_MAPALERT 1862# ifndef NO_MAPALERT
1876# ifdef MAPALERT_OPTION 1863# ifdef MAPALERT_OPTION
1877 if (options & Opt_mapAlert) 1864 if (OPTION (Opt_mapAlert))
1878# endif 1865# endif
1879 XMapWindow (display->display, parent[0]); 1866 XMapWindow (display->display, parent[0]);
1880# endif 1867# endif
1881 1868
1882 if (options & Opt_visualBell) 1869 if (OPTION (Opt_visualBell))
1883 { 1870 {
1884 scr_rvideo_mode (!rvideo); /* refresh also done */ 1871 scr_rvideo_mode (!rvideo); /* refresh also done */
1872 display->flush ();
1885 rxvt_usleep (VISUAL_BELL_DURATION); 1873 rxvt_usleep (VISUAL_BELL_DURATION);
1886 scr_rvideo_mode (!rvideo); /* refresh also done */ 1874 scr_rvideo_mode (!rvideo); /* refresh also done */
1887 } 1875 }
1888 else 1876 else
1889 XBell (display->display, 0); 1877 XBell (display->display, 0);
… …
1903 if ((fd = popen_printer ()) == NULL) 1891 if ((fd = popen_printer ()) == NULL)
1904 return; 1892 return;
1905 1893
1906 if (fullhist) 1894 if (fullhist)
1907 { 1895 {
1908 nrows = nrow + nsaved; 1896 nrows = nrow - top_row;
1909 row_start = -nsaved; 1897 row_start = top_row;
1910 } 1898 }
1911 else 1899 else
1912 { 1900 {
1913 nrows = nrow; 1901 nrows = nrow;
1914 row_start = -view_start; 1902 row_start = view_start;
1915 } 1903 }
1916 1904
1917 wctomb (0, 0); 1905 wctomb (0, 0);
1918 1906
1919 for (int r1 = 0; r1 < nrows; r1++) 1907 for (int r1 = 0; r1 < nrows; r1++)
… …
1951 * Refresh the screen 1939 * Refresh the screen
1952 * drawn_text/drawn_rend contain the screen information before the update. 1940 * drawn_text/drawn_rend contain the screen information before the update.
1953 * screen.text/screen.rend contain what the screen will change to. 1941 * screen.text/screen.rend contain what the screen will change to.
1954 */ 1942 */
1955void 1943void
1956rxvt_term::scr_refresh (unsigned char refresh_type) 1944rxvt_term::scr_refresh ()
1957{ 1945{
1958 unsigned char must_clear, /* use draw_string not draw_image_string */ 1946 unsigned char must_clear, /* use draw_string not draw_image_string */
1959 showcursor; /* show the cursor */ 1947 showcursor; /* show the cursor */
1960 int16_t col, row, /* column/row we're processing */ 1948 int16_t col, row, /* column/row we're processing */
1961 ocrow; /* old cursor row */ 1949 ocrow; /* old cursor row */
… …
1978 1966
1979#if XPM_BACKGROUND 1967#if XPM_BACKGROUND
1980 must_clear |= bgPixmap.pixmap != None; 1968 must_clear |= bgPixmap.pixmap != None;
1981#endif 1969#endif
1982#if TRANSPARENT 1970#if TRANSPARENT
1983 must_clear |= (options & Opt_transparent) && am_transparent; 1971 must_clear |= OPTION (Opt_transparent) && am_transparent;
1984#endif 1972#endif
1985 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1973 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1986 1974
1987 /* 1975 /*
1988 * B: reverse any characters which are selected 1976 * B: reverse any characters which are selected
… …
2012 2000
2013 crp = &ROW(screen.cur.row).r[col]; 2001 crp = &ROW(screen.cur.row).r[col];
2014 2002
2015 if (showcursor && focus) 2003 if (showcursor && focus)
2016 { 2004 {
2017 if (options & Opt_cursorUnderline) 2005 if (OPTION (Opt_cursorUnderline))
2018 *crp ^= RS_Uline; 2006 *crp ^= RS_Uline;
2019 else 2007 else
2020 { 2008 {
2021 *crp ^= RS_RVid; 2009 *crp ^= RS_RVid;
2022 2010
… …
2024 cc1 = *crp & (RS_fgMask | RS_bgMask); 2012 cc1 = *crp & (RS_fgMask | RS_bgMask);
2025 if (ISSET_PIXCOLOR (Color_cursor)) 2013 if (ISSET_PIXCOLOR (Color_cursor))
2026 ccol1 = Color_cursor; 2014 ccol1 = Color_cursor;
2027 else 2015 else
2028#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2016#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2029 ccol1 = GET_FGCOLOR (rstyle); 2017 ccol1 = fgcolor_of (rstyle);
2030#else 2018#else
2031 ccol1 = Color_fg; 2019 ccol1 = Color_fg;
2032#endif 2020#endif
2033 if (ISSET_PIXCOLOR (Color_cursor2)) 2021 if (ISSET_PIXCOLOR (Color_cursor2))
2034 ccol2 = Color_cursor2; 2022 ccol2 = Color_cursor2;
2035 else 2023 else
2036#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2024#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2037 ccol2 = GET_BGCOLOR (rstyle); 2025 ccol2 = bgcolor_of (rstyle);
2038#else 2026#else
2039 ccol2 = Color_bg; 2027 ccol2 = Color_bg;
2040#endif 2028#endif
2041 *crp = SET_FGCOLOR (*crp, ccol1); 2029 *crp = SET_FGCOLOR (*crp, ccol1);
2042 *crp = SET_BGCOLOR (*crp, ccol2); 2030 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2047 2035
2048 /* make sure no outline cursor is left around */ 2036 /* make sure no outline cursor is left around */
2049 setoldcursor = 0; 2037 setoldcursor = 0;
2050 if (ocrow != -1) 2038 if (ocrow != -1)
2051 { 2039 {
2052 if (screen.cur.row + view_start != ocrow 2040 if (screen.cur.row - view_start != ocrow
2053 || screen.cur.col != oldcursor.col) 2041 || screen.cur.col != oldcursor.col)
2054 { 2042 {
2055 if (ocrow < nrow 2043 if (ocrow < nrow
2056 && oldcursor.col < ncol) 2044 && oldcursor.col < ncol)
2057 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2045 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2058 2046
2059 if (focus || !showcursor) 2047 if (focus || !showcursor)
2060 oldcursor.row = -1; 2048 oldcursor.row = -1;
2061 else 2049 else
2062 setoldcursor = 1; 2050 setoldcursor = 1;
… …
2065 else if (!focus) 2053 else if (!focus)
2066 setoldcursor = 1; 2054 setoldcursor = 1;
2067 2055
2068 if (setoldcursor) 2056 if (setoldcursor)
2069 { 2057 {
2070 if (screen.cur.row + view_start >= nrow) 2058 if (screen.cur.row - view_start >= nrow)
2071 oldcursor.row = -1; 2059 oldcursor.row = -1;
2072 else 2060 else
2073 { 2061 {
2074 oldcursor.row = screen.cur.row + view_start; 2062 oldcursor.row = screen.cur.row - view_start;
2075 oldcursor.col = screen.cur.col; 2063 oldcursor.col = screen.cur.col;
2076 } 2064 }
2077 } 2065 }
2078 } 2066 }
2079 2067
2068 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2080#if ENABLE_OVERLAY 2069#if ENABLE_OVERLAY
2081 scr_swap_overlay (); 2070 scr_swap_overlay ();
2082#endif 2071#endif
2083 2072
2084#ifndef NO_SLOW_LINK_SUPPORT 2073#ifndef NO_SLOW_LINK_SUPPORT
2085 /* 2074 /*
2086 * D: CopyArea pass - very useful for slower links 2075 * D: CopyArea pass - very useful for slower links
2087 * This has been deliberately kept simple. 2076 * This has been deliberately kept simple.
2088 */ 2077 */
2089 i = num_scr;
2090 if (!display->is_local 2078 if (!display->is_local
2091 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2079 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2092 && abs (num_scr) < nrow && !must_clear) 2080 && abs (num_scr) < nrow && !must_clear)
2093 { 2081 {
2094 int16_t nits; 2082 int16_t nits;
2095 int j; 2083 int j;
2096 int len, wlen; 2084 int len, wlen;
2085 dLocal (int, num_scr);
2097 2086
2098 j = nrow; 2087 j = nrow;
2099 wlen = len = -1; 2088 wlen = len = -1;
2100 row = i > 0 ? 0 : j - 1; 2089 row = i > 0 ? 0 : j - 1;
2101 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2090 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2102 { 2091 {
2103 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2092 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2104 { 2093 {
2105 line_t s = ROW(row - view_start); 2094 line_t s = ROW(view_start + row);
2106 line_t d = drawn[row]; 2095 line_t d = drawn_buf[row];
2107 line_t d2 = drawn[row + i]; 2096 line_t d2 = drawn_buf[row + i];
2108 2097
2109 for (nits = 0, col = ncol; col--; ) 2098 for (nits = 0, col = ncol; col--; )
2110 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])
2111 nits--; 2100 nits--;
2112 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 if (wlen < len) 2123 if (wlen < len)
2135 ::swap (wlen, len); 2124 ::swap (wlen, len);
2136 2125
2137 XCopyArea (display->display, vt, vt, 2126 XCopyArea (display->display, vt, vt,
2138 gc, 0, Row2Pixel (len + i), 2127 gc, 0, Row2Pixel (len + i),
2139 (unsigned int)TermWin_TotalWidth (), 2128 (unsigned int)this->width,
2140 (unsigned int)Height2Pixel (wlen - len + 1), 2129 (unsigned int)Height2Pixel (wlen - len + 1),
2141 0, Row2Pixel (len)); 2130 0, Row2Pixel (len));
2142 len = -1; 2131 len = -1;
2143 } 2132 }
2144 } 2133 }
… …
2148 /* 2137 /*
2149 * E: main pass across every character 2138 * E: main pass across every character
2150 */ 2139 */
2151 for (row = 0; row < nrow; row++) 2140 for (row = 0; row < nrow; row++)
2152 { 2141 {
2153 text_t *stp = ROW(row - view_start).t; 2142 text_t *stp = ROW(view_start + row).t;
2154 rend_t *srp = ROW(row - view_start).r; 2143 rend_t *srp = ROW(view_start + row).r;
2155 text_t *dtp = drawn[row].t; 2144 text_t *dtp = drawn_buf[row].t;
2156 rend_t *drp = drawn[row].r; 2145 rend_t *drp = drawn_buf[row].r;
2157 2146
2158 /* 2147 /*
2159 * E2: OK, now the real pass 2148 * E2: OK, now the real pass
2160 */ 2149 */
2161 int ypixel = (int)Row2Pixel (row); 2150 int ypixel = (int)Row2Pixel (row);
… …
2223 count++, i--; 2212 count++, i--;
2224 2213
2225 /* 2214 /*
2226 * Determine the attributes for the string 2215 * Determine the attributes for the string
2227 */ 2216 */
2228 int fore = GET_FGCOLOR (rend); // desired foreground 2217 int fore = fgcolor_of (rend); // desired foreground
2229 int back = GET_BGCOLOR (rend); // desired background 2218 int back = bgcolor_of (rend); // desired background
2230 2219
2231 // 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
2232 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))
2233 { 2222 {
2234#if ENABLE_STYLES 2223#if ENABLE_STYLES
2235 // force redraw after "careful" characters to avoid pixel droppings 2224 // force redraw after "careful" characters to avoid pixel droppings
2236 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2225 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2347 } /* for (row....) */ 2336 } /* for (row....) */
2348 2337
2349#if ENABLE_OVERLAY 2338#if ENABLE_OVERLAY
2350 scr_swap_overlay (); 2339 scr_swap_overlay ();
2351#endif 2340#endif
2341 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2352 2342
2353 /* 2343 /*
2354 * G: cleanup cursor and display outline cursor if necessary 2344 * G: cleanup cursor and display outline cursor if necessary
2355 */ 2345 */
2356 if (showcursor) 2346 if (showcursor)
2357 { 2347 {
2358 if (focus) 2348 if (focus)
2359 { 2349 {
2360 if (options & Opt_cursorUnderline) 2350 if (OPTION (Opt_cursorUnderline))
2361 *crp ^= RS_Uline; 2351 *crp ^= RS_Uline;
2362 else 2352 else
2363 { 2353 {
2364 *crp ^= RS_RVid; 2354 *crp ^= RS_RVid;
2365#ifndef NO_CURSORCOLOR 2355#ifndef NO_CURSORCOLOR
… …
2374 2364
2375 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2365 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2376 col--; 2366 col--;
2377 2367
2378 while (col + cursorwidth < ncol 2368 while (col + cursorwidth < ncol
2379 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2369 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2380 cursorwidth++; 2370 cursorwidth++;
2381 2371
2382#ifndef NO_CURSORCOLOR 2372#ifndef NO_CURSORCOLOR
2383 if (ISSET_PIXCOLOR (Color_cursor)) 2373 if (ISSET_PIXCOLOR (Color_cursor))
2384 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2374 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2395 /* 2385 /*
2396 * H: cleanup selection 2386 * H: cleanup selection
2397 */ 2387 */
2398 scr_reverse_selection (); 2388 scr_reverse_selection ();
2399 2389
2400 if (refresh_type & SMOOTH_REFRESH)
2401 XFlush (display->display);
2402
2403 num_scr = 0; 2390 num_scr = 0;
2404 num_scr_allow = 1; 2391 num_scr_allow = 1;
2405} 2392}
2406 2393
2407void 2394void
2408rxvt_term::scr_remap_chars (const line_t &l) 2395rxvt_term::scr_remap_chars (line_t &l)
2409{ 2396{
2410 if (!l.t) 2397 if (!l.t)
2411 return; 2398 return;
2412 2399
2400 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2401
2413 for (int i = ncol; i--; ) 2402 for (int i = ncol; i--; )
2414 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]));
2415} 2404}
2416 2405
2417void 2406void
2418rxvt_term::scr_remap_chars () 2407rxvt_term::scr_remap_chars ()
2419{ 2408{
2420 for (int i = total_rows; i--; ) 2409 for (int i = total_rows; i--; )
2421 scr_remap_chars (save[i]); 2410 scr_remap_chars (row_buf [i]);
2422 2411
2423 for (int i = nrow; i--; ) 2412 for (int i = nrow; i--; )
2424 { 2413 {
2425 scr_remap_chars (drawn[i]); 2414 scr_remap_chars (drawn_buf [i]);
2426 scr_remap_chars (swap_save[i]); 2415 scr_remap_chars (swap_buf [i]);
2427 } 2416 }
2428} 2417}
2429 2418
2430void 2419void
2431rxvt_term::scr_recolour () 2420rxvt_term::scr_recolour ()
… …
2469 2458
2470 if (really) 2459 if (really)
2471 XClearWindow (display->display, vt); 2460 XClearWindow (display->display, vt);
2472} 2461}
2473 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
2474/* ------------------------------------------------------------------------- */ 2511/* ------------------------------------------------------------------------- */
2475void 2512void
2476rxvt_term::scr_reverse_selection () 2513rxvt_term::scr_reverse_selection ()
2477{ 2514{
2478 if (selection.op 2515 if (selection.op
2479 && current_screen == selection.screen 2516 && current_screen == selection.screen
2480 && selection.end.row >= -view_start) 2517 && selection.end.row >= view_start)
2481 { 2518 {
2482 int view_end = -view_start + nrow;
2483 int row, col;
2484
2485#if ENABLE_FRILLS 2519#if ENABLE_FRILLS
2486 if (selection.rect) 2520 if (selection.rect)
2487 { 2521 scr_xor_rect (selection.beg.row, selection.beg.col,
2488 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2522 selection.end.row, selection.end.col,
2489 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2523 RS_RVid, RS_RVid | RS_Uline);
2490 srp[col] ^= RS_RVid;
2491 }
2492 else 2524 else
2493#endif 2525#endif
2494 { 2526 scr_xor_span (selection.beg.row, selection.beg.col,
2495 if (selection.beg.row >= -view_start) 2527 selection.end.row, selection.end.col,
2496 { 2528 RS_RVid);
2497 col = selection.beg.col;
2498 row = selection.beg.row;
2499 }
2500 else
2501 {
2502 col = 0;
2503 row = view_start;
2504 }
2505
2506 for (; row < min (selection.end.row, view_end); row++, col = 0)
2507 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2508 srp[col] ^= RS_RVid;
2509
2510 if (row == selection.end.row)
2511 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2512 srp[col] ^= RS_RVid;
2513 }
2514 } 2529 }
2515} 2530}
2516 2531
2517/* ------------------------------------------------------------------------- */ 2532/* ------------------------------------------------------------------------- */
2518/* 2533/*
… …
2528 char r1[] = "\n"; 2543 char r1[] = "\n";
2529 2544
2530 for (row = saveLines - nsaved; 2545 for (row = saveLines - nsaved;
2531 row < saveLines + nrow - 1; row++) 2546 row < saveLines + nrow - 1; row++)
2532 { 2547 {
2533 width = save[row].l >= 0 ? save[row].l 2548 width = row_buf[row].l >= 0 ? row_buf[row].l
2534 : ncol; 2549 : ncol;
2535 for (towrite = width; towrite; towrite -= wrote) 2550 for (towrite = width; towrite; towrite -= wrote)
2536 { 2551 {
2537 wrote = write (fd, & (save[row].t[width - towrite]), 2552 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2538 towrite); 2553 towrite);
2539 if (wrote < 0) 2554 if (wrote < 0)
2540 return; /* XXX: death, no report */ 2555 return; /* XXX: death, no report */
2541 } 2556 }
2542 if (save[row].l >= 0) 2557 if (row_buf[row].l >= 0)
2543 if (write (fd, r1, 1) <= 0) 2558 if (write (fd, r1, 1) <= 0)
2544 return; /* XXX: death, no report */ 2559 return; /* XXX: death, no report */
2545 } 2560 }
2546} 2561}
2547#endif 2562#endif
… …
2556 2571
2557 if (!selection.op) 2572 if (!selection.op)
2558 return; 2573 return;
2559 2574
2560 pos.row = pos.col = 0; 2575 pos.row = pos.col = 0;
2561 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2576 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2562 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2577 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2563 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2578 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2564 || (check_more == 1 2579 || (check_more == 1
2565 && current_screen == selection.screen 2580 && current_screen == selection.screen
2566 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2581 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2567 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2582 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2568 || (check_more == 2 2583 || (check_more == 2
… …
2579/* ------------------------------------------------------------------------- */ 2594/* ------------------------------------------------------------------------- */
2580/* 2595/*
2581 * Paste a selection direct to the command fd 2596 * Paste a selection direct to the command fd
2582 */ 2597 */
2583void 2598void
2584rxvt_term::paste (unsigned char *data, unsigned int len) 2599rxvt_term::paste (char *data, unsigned int len)
2585{ 2600{
2586 /* convert normal newline chars into common keyboard Return key sequence */ 2601 /* convert normal newline chars into common keyboard Return key sequence */
2587 for (unsigned int i = 0; i < len; i++) 2602 for (unsigned int i = 0; i < len; i++)
2588 if (data[i] == C0_LF) 2603 if (data[i] == C0_LF)
2589 data[i] = C0_CR; 2604 data[i] = C0_CR;
… …
2733 { 2748 {
2734 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2749 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2735 char *s = rxvt_wcstombs (w); 2750 char *s = rxvt_wcstombs (w);
2736 free (w); 2751 free (w);
2737 // TODO: strlen == only the first element will be converted. well... 2752 // TODO: strlen == only the first element will be converted. well...
2738 paste ((unsigned char *)s, strlen (s)); 2753 paste (s, strlen (s));
2739 free (s); 2754 free (s);
2740 } 2755 }
2741 else 2756 else
2742#endif 2757#endif
2743 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2758 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2744 && cl) 2759 && cl)
2745 { 2760 {
2746 for (int i = 0; i < cr; i++) 2761 for (int i = 0; i < cr; i++)
2747 paste ((unsigned char *)cl[i], strlen (cl[i])); 2762 paste (cl[i], strlen (cl[i]));
2748 2763
2749 XFreeStringList (cl); 2764 XFreeStringList (cl);
2750 } 2765 }
2751 else 2766 else
2752 paste (ct.value, ct.nitems); // paste raw 2767 paste ((char *)ct.value, ct.nitems); // paste raw
2753 2768
2754bailout: 2769bailout:
2755 XFree (ct.value); 2770 XFree (ct.value);
2756 2771
2757 if (selection_wait == Sel_normal) 2772 if (selection_wait == Sel_normal)
… …
2787 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2802 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2788 * will auto fallback to CUT_BUFFER0 2803 * will auto fallback to CUT_BUFFER0
2789 * EXT: button 2 release 2804 * EXT: button 2 release
2790 */ 2805 */
2791void 2806void
2792rxvt_term::selection_request (Time tm, int x, int y) 2807rxvt_term::selection_request (Time tm)
2793{ 2808{
2794 if (x < 0 || x >= width || y < 0 || y >= height)
2795 return; /* outside window */
2796
2797 if (selection.text) 2809 if (selection.text)
2798 { /* internal selection */ 2810 { /* internal selection */
2799 char *str = rxvt_wcstombs (selection.text, selection.len); 2811 char *str = rxvt_wcstombs (selection.text, selection.len);
2800 paste ((unsigned char *)str, strlen (str)); 2812 paste (str, strlen (str));
2801 free (str); 2813 free (str);
2802 return; 2814 return;
2803 } 2815 }
2804 else 2816 else
2805 { 2817 {
… …
2897 selection.op = SELECTION_DONE; 2909 selection.op = SELECTION_DONE;
2898 2910
2899 if (selection.clicks == 4) 2911 if (selection.clicks == 4)
2900 return; /* nothing selected, go away */ 2912 return; /* nothing selected, go away */
2901 2913
2914 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2915 return;
2916
2902 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2917 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2903 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));
2904 2919
2905 int ofs = 0; 2920 int ofs = 0;
2906 int extra = 0; 2921 int extra = 0;
… …
2918 col = selection.beg.col; 2933 col = selection.beg.col;
2919 end_col = ncol + 1; 2934 end_col = ncol + 1;
2920 } 2935 }
2921 else 2936 else
2922#endif 2937#endif
2923 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2938 end_col = ROW(row).l;
2924 2939
2925 col = max (col, 0); 2940 col = max (col, 0);
2926 2941
2927 if (row == selection.end.row || selection.rect) 2942 if (row == selection.end.row
2943#if ENABLE_FRILLS
2944 || selection.rect
2945#endif
2946 )
2928 end_col = min (end_col, selection.end.col); 2947 min_it (end_col, selection.end.col);
2929 2948
2930 t = ROW(row).t + col; 2949 t = ROW(row).t + col;
2950
2931 for (; col < end_col; col++) 2951 for (; col < end_col; col++)
2932 { 2952 {
2933 if (*t == NOCHAR) 2953 if (*t == NOCHAR)
2934 t++; 2954 t++;
2935#if ENABLE_COMBINING 2955#if ENABLE_COMBINING
… …
2951#endif 2971#endif
2952 else 2972 else
2953 new_selection_text[ofs++] = *t++; 2973 new_selection_text[ofs++] = *t++;
2954 } 2974 }
2955 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
2956 if (!ROW(row).is_longer () && row != selection.end.row) 2988 if (!ROW(row).is_longer () && row != selection.end.row)
2957 new_selection_text[ofs++] = C0_LF; 2989 new_selection_text[ofs++] = C0_LF;
2958 } 2990 }
2959 2991
2960 if (end_col != selection.end.col) 2992 if (end_col != selection.end.col)
2961 new_selection_text[ofs++] = C0_LF; 2993 new_selection_text[ofs++] = C0_LF;
2962 2994
… …
2972 3004
2973 // 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
2974 selection.len = ofs; 3006 selection.len = ofs;
2975 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));
2976 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
2977 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3020 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2978 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3021 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3022 {
2979 display->set_selection_owner (this); 3023 display->set_selection_owner (this);
3024 return true;
3025 }
2980 else 3026 else
2981 rxvt_warn ("can't get primary selection, ignoring.\n"); 3027 {
3028 selection_clear ();
3029 return false;
3030 }
2982 3031
2983#if 0 3032#if 0
2984 XTextProperty ct; 3033 XTextProperty ct;
2985 3034
2986 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3035 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2987 { 3036 {
2988 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3037 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2989 XFree (ct.value); 3038 XFree (ct.value);
2990 } 3039 }
2991#endif 3040#endif
2992
2993 selection_time = tm;
2994} 3041}
2995 3042
2996/* ------------------------------------------------------------------------- */ 3043/* ------------------------------------------------------------------------- */
2997/* 3044/*
2998 * 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
… …
3002rxvt_term::selection_click (int clicks, int x, int y) 3049rxvt_term::selection_click (int clicks, int x, int y)
3003{ 3050{
3004 clicks = ((clicks - 1) % 3) + 1; 3051 clicks = ((clicks - 1) % 3) + 1;
3005 selection.clicks = clicks; /* save clicks so extend will work */ 3052 selection.clicks = clicks; /* save clicks so extend will work */
3006 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
3007 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3063 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3008 3064
3009 if (clicks == 2 || clicks == 3) 3065 if (clicks == 2 || clicks == 3)
3010 selection_extend_colrow (selection.mark.col, 3066 selection_extend_colrow (selection.mark.col,
3011 selection.mark.row + view_start, 3067 selection.mark.row - view_start,
3012 0, /* button 3 */ 3068 0, /* button 3 */
3013 1, /* button press */ 3069 1, /* button press */
3014 0); /* click change */ 3070 0); /* click change */
3015} 3071}
3016 3072
… …
3021void 3077void
3022rxvt_term::selection_start_colrow (int col, int row) 3078rxvt_term::selection_start_colrow (int col, int row)
3023{ 3079{
3024 want_refresh = 1; 3080 want_refresh = 1;
3025 3081
3026 selection.mark.row = row - view_start; 3082 selection.mark.row = row + view_start;
3027 selection.mark.col = col; 3083 selection.mark.col = col;
3028 3084
3029 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3085 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3030 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3086 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3031 3087
3032 while (selection.mark.col > 0 3088 while (selection.mark.col > 0
3033 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3089 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3034 --selection.mark.col; 3090 --selection.mark.col;
… …
3062 text_t *stp; 3118 text_t *stp;
3063 rend_t *srp; 3119 rend_t *srp;
3064 3120
3065 if (dirn == UP) 3121 if (dirn == UP)
3066 { 3122 {
3067 bound.row = - nsaved - 1; 3123 bound.row = top_row - 1;
3068 bound.col = 0; 3124 bound.col = 0;
3069 dirnadd = -1; 3125 dirnadd = -1;
3070 } 3126 }
3071 else 3127 else
3072 { 3128 {
… …
3120 } 3176 }
3121 } 3177 }
3122 break; 3178 break;
3123 } 3179 }
3124 3180
3125Old_Word_Selection_You_Die:
3126 if (dirn == DN) 3181 if (dirn == DN)
3127 col++; /* put us on one past the end */ 3182 col++; /* put us on one past the end */
3128 3183
3129 /* Poke the values back in */ 3184 /* Poke the values back in */
3130 ret->row = row; 3185 ret->row = row;
… …
3151 * 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
3152 * be _past_ a character for it to be selected. 3207 * be _past_ a character for it to be selected.
3153 */ 3208 */
3154 if (((selection.clicks % 3) == 1) && !flag 3209 if (((selection.clicks % 3) == 1) && !flag
3155 && (col == selection.mark.col 3210 && (col == selection.mark.col
3156 && (row == selection.mark.row + view_start))) 3211 && (row == selection.mark.row - view_start)))
3157 { 3212 {
3158 /* select nothing */ 3213 /* select nothing */
3159 selection.beg.row = selection.end.row = 0; 3214 selection.beg.row = selection.end.row = 0;
3160 selection.beg.col = selection.end.col = 0; 3215 selection.beg.col = selection.end.col = 0;
3161 selection.clicks = 4; 3216 selection.clicks = 4;
… …
3216 selection.beg.col = selection.end.col = selection.mark.col; 3271 selection.beg.col = selection.end.col = selection.mark.col;
3217 selection.beg.row = selection.end.row = selection.mark.row; 3272 selection.beg.row = selection.end.row = selection.mark.row;
3218 } 3273 }
3219 3274
3220 pos.col = col; 3275 pos.col = col;
3221 pos.row = row - view_start; 3276 pos.row = view_start + row;
3222 3277
3223 /* 3278 /*
3224 * 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
3225 * in the way button3 drag extension works. 3280 * in the way button3 drag extension works.
3226 * We're either doing: button1 drag; button3 press; or button3 drag 3281 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3313 selection_delimit_word (DN, &selection.end, &selection.end); 3368 selection_delimit_word (DN, &selection.end, &selection.end);
3314 } 3369 }
3315 else if (selection.clicks == 3) 3370 else if (selection.clicks == 3)
3316 { 3371 {
3317#if ENABLE_FRILLS 3372#if ENABLE_FRILLS
3318 if (options & Opt_tripleclickwords) 3373 if (OPTION (Opt_tripleclickwords))
3319 { 3374 {
3320 selection_delimit_word (UP, &selection.beg, &selection.beg); 3375 selection_delimit_word (UP, &selection.beg, &selection.beg);
3321 3376
3322 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++)
3323 { 3378 {
… …
3384 { 3439 {
3385 stp = ROW(end_row).t; 3440 stp = ROW(end_row).t;
3386 3441
3387 while (--end_col >= 0) 3442 while (--end_col >= 0)
3388 { 3443 {
3389 if (stp[end_col] != ' ' 3444 if (stp[end_col] != NOCHAR
3390 && stp[end_col] != '\t' 3445 && !unicode::is_space (stp[end_col]))
3391 && stp[end_col] != NOCHAR)
3392 break; 3446 break;
3393 } 3447 }
3394 3448
3395 if (end_col >= 0 3449 if (end_col >= 0
3396 || !ROW(end_row - 1).is_longer ()) 3450 || !ROW(end_row - 1).is_longer ())
… …
3595 3649
3596#if ENABLE_OVERLAY 3650#if ENABLE_OVERLAY
3597void 3651void
3598rxvt_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)
3599{ 3653{
3600 if (nrow < 3 || ncol < 3) 3654 if (nrow < 1 || ncol < 1)
3601 return; 3655 return;
3602 3656
3603 want_refresh = 1; 3657 want_refresh = 1;
3604 3658
3605 scr_overlay_off (); 3659 scr_overlay_off ();
… …
3609 3663
3610 // make space for border 3664 // make space for border
3611 w += 2; min_it (w, ncol); 3665 w += 2; min_it (w, ncol);
3612 h += 2; min_it (h, nrow); 3666 h += 2; min_it (h, nrow);
3613 3667
3614 x -= 1; max_it (x, 0); 3668 x -= 1; clamp_it (x, 0, ncol - w);
3615 y -= 1; max_it (y, 0); 3669 y -= 1; clamp_it (y, 0, nrow - h);
3616
3617 min_it (x, ncol - w);
3618 min_it (y, nrow - h);
3619 3670
3620 ov_x = x; ov_y = y; 3671 ov_x = x; ov_y = y;
3621 ov_w = w; ov_h = h; 3672 ov_w = w; ov_h = h;
3622 3673
3623 ov_text = new text_t *[h]; 3674 ov_text = new text_t *[h];
… …
3715 for (int y = ov_h; y--; ) 3766 for (int y = ov_h; y--; )
3716 { 3767 {
3717 text_t *t1 = ov_text[y]; 3768 text_t *t1 = ov_text[y];
3718 rend_t *r1 = ov_rend[y]; 3769 rend_t *r1 = ov_rend[y];
3719 3770
3720 text_t *t2 = ROW(y - view_start).t + ov_x; 3771 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3721 rend_t *r2 = ROW(y - view_start).r + ov_x; 3772 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3722 3773
3723 for (int x = ov_w; x--; ) 3774 for (int x = ov_w; x--; )
3724 { 3775 {
3725 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3776 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3726 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