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.185 by root, Wed Dec 21 14:25:41 2005 UTC vs.
Revision 1.240 by root, Thu Jan 19 17:21:20 2006 UTC

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

Diff Legend

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