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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.175 by root, Tue Dec 20 19:30:59 2005 UTC vs.
Revision 1.211 by root, Fri Jan 6 01:16:58 2006 UTC

… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87 88
88#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
89#define ROW(n) (save [LINENO (n)])
90
91/* 89/*
92 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
93 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
94 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
95 */ 93 */
… …
126 lalloc (l); 124 lalloc (l);
127 col = 0; 125 col = 0;
128 width = ncol; 126 width = ncol;
129 } 127 }
130 128
129 l.touch ();
130
131 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 133
134 text_t *et = l.t + col; 134 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
150} 150}
151 151
152/* ------------------------------------------------------------------------- * 152/* ------------------------------------------------------------------------- *
153 * SCREEN INITIALISATION * 153 * SCREEN INITIALISATION *
154 * ------------------------------------------------------------------------- */ 154 * ------------------------------------------------------------------------- */
155
155void 156void
156rxvt_term::scr_reset () 157rxvt_term::scr_reset ()
157{ 158{
158 unsigned int p, q;
159 int k;
160
161#if ENABLE_OVERLAY 159#if ENABLE_OVERLAY
162 scr_overlay_off (); 160 scr_overlay_off ();
163#endif 161#endif
164 162
165 view_start = 0; 163 view_start = 0;
… …
175 return; 173 return;
176 174
177 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
178 if (nrow + saveLines < 2) 176 if (nrow + saveLines < 2)
179 { 177 {
178 //TODO//FIXME
180 saveLines++; 179 saveLines++;
181 prev_nrow--; 180 prev_nrow--;
182 nsaved++; 181 nsaved++;
183 } 182 }
184 183
… …
188 total_rows = nrow + saveLines; 187 total_rows = nrow + saveLines;
189 188
190 screen.tscroll = 0; 189 screen.tscroll = 0;
191 screen.bscroll = nrow - 1; 190 screen.bscroll = nrow - 1;
192 191
193 if (!save) 192 if (!row_buf)
194 { 193 {
195 /* 194 /*
196 * first time called so just malloc everything: don't rely on realloc 195 * first time called so just malloc everything: don't rely on realloc
197 * Note: this is still needed so that all the scrollback lines are NULL 196 * Note: this is still needed so that all the scrollback lines are NULL
198 */ 197 */
… …
200 term_start = 0; 199 term_start = 0;
201 200
202 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 201 talloc = new rxvt_salloc (ncol * sizeof (text_t));
203 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
204 203
205 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 204 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
205 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
207 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 206 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 207 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209 208
210 for (p = nrow; p--; ) 209 for (int row = nrow; row--; )
211 { 210 {
212 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); 211 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 212 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 } 214 }
216 215
217 memset (charsets, 'B', sizeof (charsets)); 216 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 217 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 218 screen.flags = Screen_DefaultFlags;
… …
243 { 242 {
244 /* 243 /*
245 * add or delete rows as appropriate 244 * add or delete rows as appropriate
246 */ 245 */
247 246
248 rxvt_salloc *old_ta; 247 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
249 rxvt_salloc *old_ra; 248 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250 249
250#if 0
251 if (nrow < prev_nrow) 251 if (nrow < prev_nrow)
252 { 252 {
253 /* delete rows */
254 k = min (nsaved, prev_nrow - nrow);
255 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
257
258 for (p = nrow; p < prev_nrow; p++) 253 for (int row = nrow; row < prev_nrow; row++)
259 { 254 {
260 lfree (ROW(p));
261 lfree (swap_save[p]); 255 lfree (swap_buf [row]);
262 lfree (drawn[p]); 256 lfree (drawn_buf[row]);
263 } 257 }
258 }
259#endif
264 260
265 /* we have fewer rows so fix up cursor position */ 261 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
266 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 262 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267 264
268 scr_reset_realloc (); /* realloc _last_ */ 265 for (int row = min (nrow, prev_nrow); row--; )
266 {
267 lresize (drawn_buf[row]);
268 lresize (swap_buf [row]);
269 }
270
271 for (int row = prev_nrow; row < nrow; row++)
272 {
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 }
276
277 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
269 } 278
270 else if (nrow > prev_nrow) 279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start - nsaved , prev_total_rows);
281 int q = total_rows; // rewrapped row
282
283 if (nsaved)
284 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm.
287
288 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290
271 { 291 do
272 /* add rows */
273 scr_reset_realloc (); /* realloc _first_ */
274
275 int ocol = ncol;
276 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
277
278 k = min (nsaved, nrow - prev_nrow);
279
280 for (p = prev_total_rows; p < total_rows; p++)
281 save[p].clear ();
282
283 for (p = prev_total_rows; p < total_rows - k; p++)
284 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
285
286 for (p = prev_nrow; p < nrow; p++)
287 { 292 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 293 p = MOD (p - 1, prev_total_rows);
289 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
290 }
291
292 if (k > 0)
293 {
294 scr_scroll_text (0, (int)nrow - 1, -k, 1);
295 screen.cur.row += k;
296 screen.s_cur.row += k;
297 nsaved -= k;
298 }
299
300#ifdef DEBUG_STRICT 294#ifdef DEBUG_STRICT
301 assert (screen.cur.row < nrow); 295 assert (old_buf [MOD (p, prev_total_rows)].t);
302#else /* drive with your eyes closed */
303 MIN_IT (screen.cur.row, nrow - 1);
304#endif 296#endif
305 ncol = ocol; // save b/c scr_blank_screen_mem uses this
306 }
307
308 /* resize columns */
309 if (ncol != prev_ncol)
310 {
311 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
312 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
313
314 for (p = total_rows; p--; )
315 lresize (save[p]);
316
317 for (p = nrow; p--; )
318 {
319 lresize (drawn[p]);
320 lresize (swap_save[p]);
321 }
322
323 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
324
325 delete old_ta;
326 delete old_ra;
327 }
328
329#if 0
330 // re-wrap lines, this is rather ugly, possibly because I am too dumb
331 // to come up with a lean and mean algorithm.
332 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
333 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
334
335 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
336 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
337 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
338
339 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
340
341 p = prev_total_rows;
342 q = total_rows;
343
344 while (p > 0 && q > 0)
345 {
346 --p;
347
348 printf ("pq %d:%d\n", p, q);
349 if (save[p].t)
350 {
351 int llen = save[p].l; 297 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l;
352 299
353 assert (llen >= 0); 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
354
355 while (p && save[p - 1].l < 0)
356 { 301 {
302 p = MOD (p - 1, prev_total_rows);
303
357 --p; 304 plines++;
358 llen += prev_ncol; 305 llen += prev_ncol;
359 } 306 }
360 307
361 int qlines = llen / ncol + 1; 308 int qlines = max (0, (llen - 1) / ncol) + 1;
309
310 // drop partial lines completely
311 if (q < qlines)
312 break;
313
314 q -= qlines;
315
362 int lofs = 0; 316 int lofs = 0;
317 line_t *qline;
363 318
364 q -= qlines; 319 // re-assemble the full line by destination lines
365
366 int qrow = q;
367
368 printf ("QL %d llen %d\n", qlines, llen);//D
369 for (; qlines--; qrow++) 320 for (int qrow = q; qlines--; qrow++)
370 { 321 {
322 qline = row_buf + qrow;
323 lalloc (*qline);
324 qline->l = ncol;
325 qline->is_longer (1);
326
371 if (qrow >= 0) 327 int qcol = 0;
328
329 // fill a single destination line
330 while (lofs < llen && qcol < ncol)
372 { 331 {
373 tp [qrow] = (text_t *)ta->alloc ();
374 rp [qrow] = (rend_t *)ra->alloc ();
375 tl [qrow] = LINE_CONT1;
376
377 int qcol = 0;
378
379 for (;;)
380 {
381 int prow = lofs / prev_ncol + p; 332 int prow = lofs / prev_ncol;
382 int pcol = lofs % prev_ncol; 333 int pcol = lofs % prev_ncol;
383 334
335 prow = MOD (p + prow, prev_total_rows);
336
337 // we only adjust the cursor _row_ and put it into
338 // the topmost line of "long line" it was in, as
339 // this seems to upset applications/shells/readline
340 // least.
341 if (prow == ocur.row)
342 screen.cur.row = q - (total_rows - nrow);
343
344 line_t &pline = old_buf [prow];
345
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 346 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385 347
386 printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
387
388 if (len <= 0)
389 {
390 tl [qrow] = qcol;
391
392 TODO
393 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
394 ncol - qcol, DEFAULT_RSTYLE);
395
396 break;
397 }
398
399 assert (lofs < 1000); 348 assert (len);
349 assert (pline.t);
400 350
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 351 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 352 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403 353
404 lofs += len; 354 lofs += len;
405 qcol += len; 355 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 } 356 }
411 else
412 lofs += ncol;
413 } 357 }
358
359 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
360 qline->is_longer (0);
361 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414 } 362 }
363 while (p != pend && q > 0);
364
365 term_start = total_rows - nrow;
366 nsaved = term_start - q;
367
368 // make sure all terminal lines exist
369 while (nsaved < 0)
370 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
371 }
372 else
415 } 373 {
374 // if no scrollback exists (yet), wing, instead of wrap
375
376 for (int row = min (nrow, prev_nrow); row--; )
377 {
378 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
379 line_t &qline = row_buf [row];
416 380
417 free (screen.text); screen.text = tp; 381 qline = pline;
418 free (screen.rend); screen.rend = rp; 382 lresize (qline);
419 free (screen.tlen); screen.tlen = tl; 383 }
420 384
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 385 for (int row = prev_nrow; row < nrow; row++)
386 {
387 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
388 }
389
390 term_start = 0;
391 }
392
393#ifdef DEBUG_STRICT //TODO: remove
394 for (int i = -nsaved; i < nrow; i++)
395 assert (ROW (i).t);
422#endif 396#endif
397
398 free (old_buf);
399 delete old_ta;
400 delete old_ra;
401
402 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1);
423 404
424 if (tabs) 405 if (tabs)
425 free (tabs); 406 free (tabs);
426 } 407 }
427 408
428 prev_nrow = nrow; 409 prev_nrow = nrow;
429 prev_ncol = ncol; 410 prev_ncol = ncol;
430 411
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 413
433 for (p = 0; p < ncol; p++) 414 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 415 tabs [col] = col % TABSIZE == 0;
435 416
436 tt_winch (); 417 tt_winch ();
437}
438 418
439void 419 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
440rxvt_term::scr_reset_realloc ()
441{
442 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
443 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
444 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
445 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
446} 420}
447 421
448/* ------------------------------------------------------------------------- */ 422/* ------------------------------------------------------------------------- */
449/* 423/*
450 * Free everything. That way malloc debugging can find leakage. 424 * Free everything. That way malloc debugging can find leakage.
… …
453rxvt_term::scr_release () 427rxvt_term::scr_release ()
454{ 428{
455 delete talloc; talloc = 0; 429 delete talloc; talloc = 0;
456 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
457 431
458 free (save); 432 free (row_buf);
459 free (swap_save); 433 free (swap_buf);
460 free (drawn); 434 free (drawn_buf);
461 free (buf); 435 free (temp_buf);
462 free (tabs); 436 free (tabs);
437
438 row_buf = 0; // signal that we freed all the arrays
463} 439}
464 440
465/* ------------------------------------------------------------------------- */ 441/* ------------------------------------------------------------------------- */
466/* 442/*
467 * Hard reset 443 * Hard reset
… …
518 set_font_style (); 494 set_font_style ();
519 break; 495 break;
520 } 496 }
521 497
522 /* boundary check in case screen size changed between SAVE and RESTORE */ 498 /* boundary check in case screen size changed between SAVE and RESTORE */
523 MIN_IT (s->cur.row, nrow - 1); 499 min_it (s->cur.row, nrow - 1);
524 MIN_IT (s->cur.col, ncol - 1); 500 min_it (s->cur.col, ncol - 1);
525#ifdef DEBUG_STRICT 501#ifdef DEBUG_STRICT
526 assert (s->cur.row >= 0); 502 assert (s->cur.row >= 0);
527 assert (s->cur.col >= 0); 503 assert (s->cur.col >= 0);
528#else /* drive with your eyes closed */
529 MAX_IT (s->cur.row, 0);
530 MAX_IT (s->cur.col, 0);
531#endif 504#endif
532} 505}
533 506
534/* ------------------------------------------------------------------------- */ 507/* ------------------------------------------------------------------------- */
535/* 508/*
… …
538 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
539 */ 512 */
540int 513int
541rxvt_term::scr_change_screen (int scrn) 514rxvt_term::scr_change_screen (int scrn)
542{ 515{
543 int i;
544#if NSCREENS
545 int offset;
546#endif
547
548 want_refresh = 1; 516 want_refresh = 1;
549
550 view_start = 0; 517 view_start = 0;
551 518
552 if (current_screen == scrn) 519 if (current_screen == scrn)
553 return scrn; 520 return scrn;
554 521
555 selection_check (2); /* check for boundary cross */ 522 selection_check (2); /* check for boundary cross */
556 523
557 i = current_screen; current_screen = scrn; scrn = i; 524 int i = current_screen; current_screen = scrn; scrn = i;
558 525
559 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 526 ::swap (screen.cur.row, swap.cur.row);
560 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 527 ::swap (screen.cur.col, swap.cur.col);
561 MAX_IT (screen.cur.row, 0); 528
562 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
563 MAX_IT (screen.cur.col, 0); 530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
564 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
565 531
566#if NSCREENS 532#if NSCREENS
567 if (options & Opt_secondaryScreen) 533 if (OPTION (Opt_secondaryScreen))
568 { 534 {
569 num_scr = 0; 535 num_scr = 0;
570 offset = saveLines;
571 536
572 for (i = prev_nrow; i--;) 537 for (int i = prev_nrow; i--; )
573 SWAP_IT (ROW(i), swap_save[i], line_t); 538 ::swap (ROW(i), swap_buf [i]);
574 539
575 SWAP_IT (screen.charset, swap.charset, int16_t); 540 ::swap (screen.charset, swap.charset);
576 SWAP_IT (screen.flags, swap.flags, int); 541 ::swap (screen.flags, swap.flags);
577 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
578 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
579 } 544 }
580 else 545 else
581#endif 546#endif
582 if (options & Opt_secondaryScroll) 547 if (OPTION (Opt_secondaryScroll))
583 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
584 549
585 return scrn; 550 return scrn;
586} 551}
587 552
588// clear WrapNext indicator, solidifying position on next line 553// clear WrapNext indicator, solidifying position on next line
… …
595 screen.flags &= ~Screen_WrapNext; 560 screen.flags &= ~Screen_WrapNext;
596 561
597 screen.cur.col = 0; 562 screen.cur.col = 0;
598 563
599 if (screen.cur.row == screen.bscroll) 564 if (screen.cur.row == screen.bscroll)
600 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 565 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
601 else if (screen.cur.row < nrow - 1) 566 else if (screen.cur.row < nrow - 1)
602 screen.cur.row++; 567 screen.cur.row++;
603} 568}
604 569
605/* ------------------------------------------------------------------------- */ 570/* ------------------------------------------------------------------------- */
… …
636/* ------------------------------------------------------------------------- */ 601/* ------------------------------------------------------------------------- */
637/* 602/*
638 * Scroll text between <row1> and <row2> inclusive, by <count> lines 603 * Scroll text between <row1> and <row2> inclusive, by <count> lines
639 * count positive ==> scroll up 604 * count positive ==> scroll up
640 * count negative ==> scroll down 605 * count negative ==> scroll down
641 * spec == 0 for normal routines
642 */ 606 */
643int 607int
644rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 608rxvt_term::scr_scroll_text (int row1, int row2, int count)
645{ 609{
646 int i, j;
647
648 if (count == 0 || (row1 > row2)) 610 if (count == 0 || (row1 > row2))
649 return 0; 611 return 0;
650 612
651 want_refresh = 1; 613 want_refresh = 1;
614 num_scr += count;
652 615
653 if (row1 == 0 && count > 0 616 if (count > 0
617 && row1 == 0
618 && row2 == nrow - 1
654 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
655 { 620 {
656 nsaved = min (nsaved + count, saveLines); 621 nsaved = min (nsaved + count, saveLines);
622
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
624
657 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
658 626
659 if (selection.op && current_screen == selection.screen) 627 if (selection.op && current_screen == selection.screen)
660 { 628 {
661 selection.beg.row -= count; 629 selection.beg.row -= count;
662 selection.end.row -= count; 630 selection.end.row -= count;
663 selection.mark.row -= count; 631 selection.mark.row -= count;
632
633 if (selection.beg.row < -nsaved
634 || selection.end.row < -nsaved
635 || selection.mark.row < -nsaved)
636 {
637 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR;
639 }
664 } 640 }
665 641
666 for (int i = count; i--; ) 642 for (int i = count; i--; )
643 {
644 ROW(row2 - i).l = 0;
667 scr_blank_screen_mem (ROW(row2 - i), rstyle); 645 scr_blank_screen_mem (ROW(row2 - i), rstyle);
646 }
668 647
669 if ((options & Opt_scrollWithBuffer) 648 if (OPTION (Opt_scrollWithBuffer)
670 && view_start != 0 649 && view_start != 0
671 && view_start != saveLines) 650 && view_start != saveLines)
672 scr_page (UP, count); 651 scr_page (UP, count);
673 } 652 }
674 else 653 else
675 { 654 {
676 if (!spec)
677 row1 += saveLines;
678
679 row2 += saveLines;
680
681 if (selection.op && current_screen == selection.screen) 655 if (selection.op && current_screen == selection.screen)
682 { 656 {
683 i = selection.beg.row + saveLines; 657 if ((selection.beg.row < row1 && selection.end.row > row1)
684 j = selection.end.row + saveLines; 658 || (selection.beg.row < row2 && selection.end.row > row2)
685
686 if ((i < row1 && j > row1)
687 || (i < row2 && j > row2)
688 || (i - count < row1 && i >= row1) 659 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
689 || (i - count > row2 && i <= row2) 660 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
690 || (j - count < row1 && j >= row1) 661 || (selection.end.row - count < row1 && selection.end.row >= row1)
691 || (j - count > row2 && j <= row2)) 662 || (selection.end.row - count > row2 && selection.end.row <= row2))
692 { 663 {
693 CLEAR_ALL_SELECTION (); 664 CLEAR_ALL_SELECTION ();
694 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 665 selection.op = SELECTION_CLEAR;
695 } 666 }
696 else if (j >= row1 && j <= row2) 667 else if (selection.end.row >= row1 && selection.end.row <= row2)
697 { 668 {
698 /* move selected region too */ 669 /* move selected region too */
699 selection.beg.row -= count; 670 selection.beg.row -= count;
700 selection.end.row -= count; 671 selection.end.row -= count;
701 selection.mark.row -= count; 672 selection.mark.row -= count;
673
674 selection_check (0);
702 } 675 }
703 } 676 }
704 677
705 selection_check (0); /* _after_ nsaved update */ 678 // use a simple and robust scrolling algorithm, this
679 // part of scr_scroll_text is not time-critical.
706 680
707 num_scr += count;
708 j = count;
709
710 if (count < 0)
711 count = -count;
712
713 i = row2 - row1 + 1; 681 int rows = row2 - row1 + 1;
714 MIN_IT (count, i);
715 682
716 if (j > 0) 683 min_it (count, rows);
717 {
718 /* scroll up */
719 684
720 /* Copy lines that will get clobbered by the rotation */ 685 for (int row = 0; row < rows; row++)
721 memcpy (buf, save + row1, count * sizeof (line_t));
722
723 /* Rotate lines */
724 i = row2 - row1 - count + 1;
725 memmove (save + row1, save + row1 + count, i * sizeof (line_t));
726
727 j = row2 - count + 1, i = count;
728 } 686 {
729 else /* if (j < 0) */ 687 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
688
689 if (!IN_RANGE_EXC (row + count, 0, rows))
690 scr_blank_screen_mem (temp_buf [row], rstyle);
730 { 691 }
731 /* scroll down */
732 692
733 /* Copy lines that will get clobbered by the rotation */ 693 for (int row = 0; row < rows; row++)
734 for (i = 0, j = row2; i < count; i++, j--) 694 ROW(row1 + row) = temp_buf [row];
735 buf[i] = save[j];
736
737 /* Rotate lines */
738 for (j = row2, i = j - count; i >= row1; i--, j--)
739 save[j] = save[i];
740
741 j = row1, i = count;
742 count = -count;
743 }
744
745 /* Resurrect lines */
746 memcpy (save + j, buf, i * sizeof (line_t));
747
748 if (!spec) /* line length may not equal ncol */
749 for (; i--; j++)
750 scr_blank_screen_mem (save[j], rstyle);
751 } 695 }
752 696
753 return count; 697 return count;
754} 698}
755 699
… …
763 if (len <= 0) /* sanity */ 707 if (len <= 0) /* sanity */
764 return; 708 return;
765 709
766 unsigned char checksel; 710 unsigned char checksel;
767 unicode_t c; 711 unicode_t c;
768 int row, last_col; 712 int ncol = this->ncol;
769 const unicode_t *strend = str + len; 713 const unicode_t *strend = str + len;
770 714
771 want_refresh = 1; 715 want_refresh = 1;
772 ZERO_SCROLLBACK (); 716 ZERO_SCROLLBACK ();
773 last_col = ncol;
774 717
775 if (nlines > 0) 718 if (nlines > 0)
776 { 719 {
777 nlines += screen.cur.row - screen.bscroll; 720 nlines += screen.cur.row - screen.bscroll;
721
778 if ((nlines > 0) 722 if (nlines > 0
779 && (screen.tscroll == 0) 723 && screen.tscroll == 0
780 && (screen.bscroll == (nrow - 1))) 724 && screen.bscroll == nrow - 1)
781 { 725 {
782 /* _at least_ this many lines need to be scrolled */ 726 /* _at least_ this many lines need to be scrolled */
783 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 727 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
784 screen.cur.row -= nlines; 728 screen.cur.row -= nlines;
785 } 729 }
786 } 730 }
787 731
788#ifdef DEBUG_STRICT 732#ifdef DEBUG_STRICT
789 assert (screen.cur.col < last_col); 733 assert (screen.cur.col < ncol);
790 assert ((screen.cur.row < nrow) 734 assert (screen.cur.row < nrow
791 && (screen.cur.row >= - (int32_t)nsaved)); 735 && screen.cur.row >= -nsaved);
792#else /* drive with your eyes closed */
793 MIN_IT (screen.cur.col, last_col - 1);
794 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
795 MAX_IT (screen.cur.row, - (int32_t)nsaved);
796#endif 736#endif
797 row = screen.cur.row; 737 int row = screen.cur.row;
798 738
799 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 739 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
800 740
801 line_t *line = &ROW(row); 741 line_t *line = &ROW(row);
802 742
… …
804 { 744 {
805 c = *str++; 745 c = *str++;
806 746
807 if (c < 0x20) 747 if (c < 0x20)
808 if (c == C0_LF) 748 if (c == C0_LF)
809 { 749 {
810 if (!line->is_longer ()) /* XXX: think about this */
811 MAX_IT (line->l, screen.cur.col); 750 max_it (line->l, screen.cur.col);
812 751
813 screen.flags &= ~Screen_WrapNext; 752 screen.flags &= ~Screen_WrapNext;
814 753
815 if (screen.cur.row == screen.bscroll) 754 if (screen.cur.row == screen.bscroll)
816 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 755 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
817 else if (screen.cur.row < (nrow - 1)) 756 else if (screen.cur.row < (nrow - 1))
818 row = ++screen.cur.row; 757 row = ++screen.cur.row;
819 758
820 line = &ROW(row); /* _must_ refresh */ 759 line = &ROW(row); /* _must_ refresh */
821 continue; 760 continue;
822 } 761 }
823 else if (c == C0_CR) 762 else if (c == C0_CR)
824 { 763 {
825 if (!line->is_longer ()) /* XXX: think about this */
826 MAX_IT (line->l, screen.cur.col); 764 max_it (line->l, screen.cur.col);
827 765
828 screen.flags &= ~Screen_WrapNext; 766 screen.flags &= ~Screen_WrapNext;
829 screen.cur.col = 0; 767 screen.cur.col = 0;
830 continue; 768 continue;
831 } 769 }
… …
848 CLEAR_SELECTION (); 786 CLEAR_SELECTION ();
849 } 787 }
850 788
851 if (screen.flags & Screen_WrapNext) 789 if (screen.flags & Screen_WrapNext)
852 { 790 {
791 max_it (line->l, ncol);
853 line->set_is_longer (); 792 line->is_longer (1);
854 793
855 scr_do_wrap (); 794 scr_do_wrap ();
856 795
857 row = screen.cur.row; 796 row = screen.cur.row;
858 line = &ROW(row); /* _must_ refresh */ 797 line = &ROW(row); /* _must_ refresh */
… …
866 // do wcwidth before further replacements, as wcwidth might return -1 805 // do wcwidth before further replacements, as wcwidth might return -1
867 // for the line drawing characters below as they might be invalid in the current 806 // for the line drawing characters below as they might be invalid in the current
868 // locale. 807 // locale.
869 int width = c < 0x100 ? 1 : wcwidth (c); 808 int width = c < 0x100 ? 1 : wcwidth (c);
870 809
871 if (charsets[screen.charset] == '0') // DEC SPECIAL 810 if (charsets [screen.charset] == '0') // DEC SPECIAL
872 { 811 {
873 // vt100 special graphics and line drawing 812 // vt100 special graphics and line drawing
874 // 5f-7e standard vt100 813 // 5f-7e standard vt100
875 // 40-5e rxvt extension for extra curses acs chars 814 // 40-5e rxvt extension for extra curses acs chars
876 static uint16_t vt100_0[62] = { // 41 .. 7e 815 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
928 } 867 }
929 868
930 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 869 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
931 870
932 // if the character doesn't fit into the remaining columns... 871 // if the character doesn't fit into the remaining columns...
933 if (screen.cur.col > last_col - width && last_col >= width) 872 if (screen.cur.col > ncol - width && ncol >= width)
934 { 873 {
935 // ...output spaces 874 // ...output spaces
936 c = ' '; 875 c = ' ';
937 // and try the same character next loop iteration 876 // and try the same character next loop iteration
938 --str; 877 --str;
939 } 878 }
940 879
880 line->touch ();
881
941 do 882 do
942 { 883 {
943 line->t[screen.cur.col] = c; 884 line->t[screen.cur.col] = c;
944 line->r[screen.cur.col] = rend; 885 line->r[screen.cur.col] = rend;
945 886
946 if (screen.cur.col < last_col - 1) 887 if (screen.cur.col < ncol - 1)
947 screen.cur.col++; 888 screen.cur.col++;
948 else 889 else
949 { 890 {
950 line->l = last_col; 891 line->l = ncol;
951 if (screen.flags & Screen_Autowrap) 892 if (screen.flags & Screen_Autowrap)
952 screen.flags |= Screen_WrapNext; 893 screen.flags |= Screen_WrapNext;
953 break; 894 break;
954 } 895 }
955 896
… …
957 } 898 }
958 while (--width > 0); 899 while (--width > 0);
959 900
960 // pad with spaces when overwriting wide character with smaller one 901 // pad with spaces when overwriting wide character with smaller one
961 if (!width) 902 if (!width)
903 {
904 line->touch ();
905
962 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 906 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
963 { 907 {
964 line->t[c] = ' '; 908 line->t[c] = ' ';
965 line->r[c] = rend; 909 line->r[c] = rend;
966 } 910 }
911 }
967 } 912 }
968 else // width == 0 913 else // width == 0
969 { 914 {
970#if ENABLE_COMBINING 915#if ENABLE_COMBINING
971 // handle combining characters 916 // handle combining characters
972 // we just tag the accent on the previous on-screen character. 917 // we just tag the accent on the previous on-screen character.
973 // this is arguably not correct, but also arguably not wrong. 918 // this is arguably not correct, but also arguably not wrong.
974 // we don't handle double-width characters nicely yet. 919 // we don't handle double-width characters nicely yet.
920 line_t *linep;
975 text_t *tp; 921 text_t *tp;
976 rend_t *rp; 922 rend_t *rp;
977 923
978 if (screen.cur.col > 0) 924 if (screen.cur.col > 0)
979 { 925 {
926 linep = line;
980 tp = line->t + screen.cur.col - 1; 927 tp = line->t + screen.cur.col - 1;
981 rp = line->r + screen.cur.col - 1; 928 rp = line->r + screen.cur.col - 1;
982
983 while (*tp == NOCHAR && tp > line->t)
984 tp--, rp--;
985 } 929 }
986 else if (screen.cur.row > 0 930 else if (screen.cur.row > 0
987 && ROW(screen.cur.row - 1).is_longer ()) 931 && ROW(screen.cur.row - 1).is_longer ())
988 { 932 {
989 line_t *line = &ROW(screen.cur.row - 1); 933 linep = &ROW(screen.cur.row - 1);
990
991 tp = line->t + last_col - 1; 934 tp = line->t + ncol - 1;
992 rp = line->r + last_col - 1; 935 rp = line->r + ncol - 1;
993
994 while (*tp == NOCHAR && tp > line->t)
995 tp--, rp--;
996 } 936 }
997 else 937 else
998 continue; 938 continue;
939
940 linep->touch ();
941
942 while (*tp == NOCHAR && tp > linep->t)
943 tp--, rp--;
999 944
1000 // first try to find a precomposed character 945 // first try to find a precomposed character
1001 unicode_t n = rxvt_compose (*tp, c); 946 unicode_t n = rxvt_compose (*tp, c);
1002 if (n == NOCHAR) 947 if (n == NOCHAR)
1003 n = rxvt_composite.compose (*tp, c); 948 n = rxvt_composite.compose (*tp, c);
… …
1006 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1007#endif 952#endif
1008 } 953 }
1009 } 954 }
1010 955
1011 if (!line->is_longer ()) /* XXX: think about this */
1012 MAX_IT (line->l, screen.cur.col); 956 max_it (line->l, screen.cur.col);
1013 957
1014#ifdef DEBUG_STRICT 958#ifdef DEBUG_STRICT
1015 assert (screen.cur.row >= 0); 959 assert (screen.cur.row >= 0);
1016#else /* drive with your eyes closed */
1017 MAX_IT (screen.cur.row, 0);
1018#endif 960#endif
1019} 961}
1020 962
1021/* ------------------------------------------------------------------------- */ 963/* ------------------------------------------------------------------------- */
1022/* 964/*
… …
1061 1003
1062 if (count == 0) 1004 if (count == 0)
1063 return; 1005 return;
1064 else if (count > 0) 1006 else if (count > 0)
1065 { 1007 {
1066 int row = screen.cur.row;
1067
1068 line_t &l = ROW(row); 1008 line_t &l = ROW(screen.cur.row);
1069 rend_t base_rend = l.r[i]; 1009 rend_t base_rend = l.r[i];
1070 ht &= l.t[i] == ' '; 1010 ht &= l.t[i] == ' ';
1071 1011
1072 for (; ++i < ncol; ) 1012 for (; ++i < ncol; )
1073 if (tabs[i]) 1013 if (tabs[i])
1074 { 1014 {
1075 x = i; 1015 x = i;
1016
1076 if (!--count) 1017 if (!--count)
1077 break; 1018 break;
1078 } 1019 }
1079 else 1020 else
1080 ht &= l.t[i] == ' ' 1021 ht &= l.t[i] == ' '
… …
1083 if (count) 1024 if (count)
1084 x = ncol - 1; 1025 x = ncol - 1;
1085 1026
1086 // store horizontal tab commands as characters inside the text 1027 // store horizontal tab commands as characters inside the text
1087 // buffer so they can be selected and pasted. 1028 // buffer so they can be selected and pasted.
1088 if (ht && options & Opt_pastableTabs) 1029 if (ht && OPTION (Opt_pastableTabs))
1089 { 1030 {
1090 base_rend = SET_FONT (base_rend, 0); 1031 base_rend = SET_FONT (base_rend, 0);
1091 1032
1092 if (!l.is_longer ()) /* XXX: think about this */ 1033 l.touch (x);
1093 MAX_IT (l.l, x);
1094 1034
1095 i = screen.cur.col; 1035 i = screen.cur.col;
1096 1036
1097 l.t[i] = '\t'; 1037 l.t[i] = '\t';
1098 l.r[i] = base_rend; 1038 l.r[i] = base_rend;
… …
1148 */ 1088 */
1149#if ENABLE_FRILLS 1089#if ENABLE_FRILLS
1150void 1090void
1151rxvt_term::scr_forwardindex () 1091rxvt_term::scr_forwardindex ()
1152{ 1092{
1153 int row;
1154
1155 if (screen.cur.col < ncol - 1) 1093 if (screen.cur.col < ncol - 1)
1156 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1094 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1157 else 1095 else
1158 { 1096 {
1159 row = screen.cur.row; 1097 line_t &l = ROW(screen.cur.row);
1160 1098
1161 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1099 l.touch ();
1162 ROW(row).l = ncol; 1100 l.is_longer (0);
1163 1101
1164 scr_gotorc (0, 0, R_RELATIVE); 1102 scr_gotorc (0, 0, R_RELATIVE);
1165 scr_insdel_chars (1, DELETE); 1103 scr_insdel_chars (1, DELETE);
1166 scr_gotorc (0, ncol - 1, R_RELATIVE); 1104 scr_gotorc (0, ncol - 1, R_RELATIVE);
1167 } 1105 }
… …
1177{ 1115{
1178 want_refresh = 1; 1116 want_refresh = 1;
1179 ZERO_SCROLLBACK (); 1117 ZERO_SCROLLBACK ();
1180 1118
1181 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1119 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1182 MAX_IT (screen.cur.col, 0); 1120 clamp_it (screen.cur.col, 0, ncol - 1);
1183 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1184 1121
1185 screen.flags &= ~Screen_WrapNext; 1122 screen.flags &= ~Screen_WrapNext;
1186 1123
1187 if (relative & R_RELATIVE) 1124 if (relative & R_RELATIVE)
1188 { 1125 {
… …
1206 else 1143 else
1207 { 1144 {
1208 if (screen.flags & Screen_Relative) 1145 if (screen.flags & Screen_Relative)
1209 { /* relative origin mode */ 1146 { /* relative origin mode */
1210 screen.cur.row = row + screen.tscroll; 1147 screen.cur.row = row + screen.tscroll;
1211 MIN_IT (screen.cur.row, screen.bscroll); 1148 min_it (screen.cur.row, screen.bscroll);
1212 } 1149 }
1213 else 1150 else
1214 screen.cur.row = row; 1151 screen.cur.row = row;
1215 } 1152 }
1216 1153
1217 MAX_IT (screen.cur.row, 0); 1154 clamp_it (screen.cur.row, 0, nrow - 1);
1218 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1219} 1155}
1220 1156
1221/* ------------------------------------------------------------------------- */ 1157/* ------------------------------------------------------------------------- */
1222/* 1158/*
1223 * direction should be UP or DN 1159 * direction should be UP or DN
… …
1234 1170
1235 screen.flags &= ~Screen_WrapNext; 1171 screen.flags &= ~Screen_WrapNext;
1236 1172
1237 if ((screen.cur.row == screen.bscroll && direction == UP) 1173 if ((screen.cur.row == screen.bscroll && direction == UP)
1238 || (screen.cur.row == screen.tscroll && direction == DN)) 1174 || (screen.cur.row == screen.tscroll && direction == DN))
1239 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1175 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1240 else 1176 else
1241 screen.cur.row += dirn; 1177 screen.cur.row += dirn;
1242 1178
1243 MAX_IT (screen.cur.row, 0); 1179 clamp_it (screen.cur.row, 0, nrow - 1);
1244 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1245 selection_check (0); 1180 selection_check (0);
1246} 1181}
1247 1182
1248/* ------------------------------------------------------------------------- */ 1183/* ------------------------------------------------------------------------- */
1249/* 1184/*
… …
1253 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1254 */ 1189 */
1255void 1190void
1256rxvt_term::scr_erase_line (int mode) 1191rxvt_term::scr_erase_line (int mode)
1257{ 1192{
1258 unsigned int row, col, num; 1193 unsigned int col, num;
1259 1194
1260 want_refresh = 1; 1195 want_refresh = 1;
1261 ZERO_SCROLLBACK (); 1196 ZERO_SCROLLBACK ();
1262 1197
1263 selection_check (1); 1198 selection_check (1);
1264 1199
1265 row = screen.cur.row; 1200 line_t &line = ROW(screen.cur.row);
1201
1202 line.touch ();
1203 line.is_longer (0);
1266 1204
1267 switch (mode) 1205 switch (mode)
1268 { 1206 {
1269 case 0: /* erase to end of line */ 1207 case 0: /* erase to end of line */
1270 col = screen.cur.col; 1208 col = screen.cur.col;
1271 num = ncol - col; 1209 num = ncol - col;
1272 MIN_IT (ROW(row).l, (int16_t)col); 1210 min_it (line.l, col);
1273 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1211 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1274 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1212 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1275 CLEAR_SELECTION (); 1213 CLEAR_SELECTION ();
1276 break; 1214 break;
1277 case 1: /* erase to beginning of line */ 1215 case 1: /* erase to beginning of line */
… …
1282 CLEAR_SELECTION (); 1220 CLEAR_SELECTION ();
1283 break; 1221 break;
1284 case 2: /* erase whole line */ 1222 case 2: /* erase whole line */
1285 col = 0; 1223 col = 0;
1286 num = ncol; 1224 num = ncol;
1287 ROW(row).l = 0; 1225 line.l = 0;
1288 if (selection.beg.row <= screen.cur.row 1226 if (selection.beg.row <= screen.cur.row
1289 && selection.end.row >= screen.cur.row) 1227 && selection.end.row >= screen.cur.row)
1290 CLEAR_SELECTION (); 1228 CLEAR_SELECTION ();
1291 break; 1229 break;
1292 default: 1230 default:
1293 return; 1231 return;
1294 } 1232 }
1295 1233
1296 scr_blank_line (ROW(row), col, num, rstyle); 1234 scr_blank_line (line, col, num, rstyle);
1297} 1235}
1298 1236
1299/* ------------------------------------------------------------------------- */ 1237/* ------------------------------------------------------------------------- */
1300/* 1238/*
1301 * Erase part of whole of the screen 1239 * Erase part of whole of the screen
… …
1305 */ 1243 */
1306void 1244void
1307rxvt_term::scr_erase_screen (int mode) 1245rxvt_term::scr_erase_screen (int mode)
1308{ 1246{
1309 int num; 1247 int num;
1310 int32_t row, row_offset; 1248 int32_t row;
1311 rend_t ren; 1249 rend_t ren;
1312 XGCValues gcvalue; 1250 XGCValues gcvalue;
1313 1251
1314 want_refresh = 1; 1252 want_refresh = 1;
1315 ZERO_SCROLLBACK (); 1253 ZERO_SCROLLBACK ();
1316
1317 row_offset = (int32_t)saveLines;
1318 1254
1319 switch (mode) 1255 switch (mode)
1320 { 1256 {
1321 case 0: /* erase to end of screen */ 1257 case 0: /* erase to end of screen */
1322 selection_check (1); 1258 selection_check (1);
… …
1346 CLEAR_SELECTION (); 1282 CLEAR_SELECTION ();
1347 1283
1348 if (row >= nrow) /* Out Of Bounds */ 1284 if (row >= nrow) /* Out Of Bounds */
1349 return; 1285 return;
1350 1286
1351 MIN_IT (num, (nrow - row)); 1287 min_it (num, nrow - row);
1352 1288
1353 if (rstyle & (RS_RVid | RS_Uline)) 1289 if (rstyle & (RS_RVid | RS_Uline))
1354 ren = (rend_t) ~RS_None; 1290 ren = (rend_t) ~RS_None;
1355 else if (GET_BASEBG (rstyle) == Color_bg) 1291 else if (GET_BASEBG (rstyle) == Color_bg)
1356 { 1292 {
… …
1358 CLEAR_ROWS (row, num); 1294 CLEAR_ROWS (row, num);
1359 } 1295 }
1360 else 1296 else
1361 { 1297 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1298 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1299 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1364 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1300 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1365 ERASE_ROWS (row, num); 1301 ERASE_ROWS (row, num);
1366 gcvalue.foreground = pix_colors[Color_fg]; 1302 gcvalue.foreground = pix_colors[Color_fg];
1367 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1303 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1368 } 1304 }
1369 1305
1370 for (; num--; row++) 1306 for (; num--; row++)
1371 { 1307 {
1308 line_t &l = ROW(row);
1309 l.l = 0;
1310 l.is_longer (0);
1372 scr_blank_screen_mem (save[row + row_offset], rstyle); 1311 scr_blank_screen_mem (l, rstyle);
1373 save[row + row_offset].l = 0;
1374 scr_blank_line (drawn[row], 0, ncol, ren); 1312 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1375 } 1313 }
1376} 1314}
1377 1315
1378#if ENABLE_FRILLS 1316#if ENABLE_FRILLS
1379void 1317void
… …
1392 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1330 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1393 */ 1331 */
1394void 1332void
1395rxvt_term::scr_E () 1333rxvt_term::scr_E ()
1396{ 1334{
1397 int i, j, k;
1398 rend_t *r1, fs; 1335 rend_t fs;
1399 1336
1400 want_refresh = 1; 1337 want_refresh = 1;
1401 ZERO_SCROLLBACK (); 1338 ZERO_SCROLLBACK ();
1402 1339
1403 num_scr_allow = 0; 1340 num_scr_allow = 0;
1404 selection_check (3); 1341 selection_check (3);
1405 1342
1406 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1343 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1407 for (k = saveLines, i = nrow; i--; k++) 1344 for (int row = nrow; row--; )
1408 { 1345 {
1409 line_t &line = save[k]; 1346 line_t &line = ROW(row);
1410 1347
1411 fill_text (line.t, 'E', ncol); 1348 fill_text (line.t, 'E', ncol);
1349 rend_t *r1 = line.r;
1412 1350
1413 for (r1 = line.r, j = ncol; j--; ) 1351 for (int j = ncol; j--; )
1414 *r1++ = fs; 1352 *r1++ = fs;
1415 1353
1416 line.l = ncol; /* make the `E's selectable */ 1354 line.is_longer (0);
1355 line.touch (ncol);
1417 } 1356 }
1418} 1357}
1419 1358
1420/* ------------------------------------------------------------------------- */ 1359/* ------------------------------------------------------------------------- */
1421/* 1360/*
… …
1442 count = end; 1381 count = end;
1443 } 1382 }
1444 1383
1445 scr_do_wrap (); 1384 scr_do_wrap ();
1446 1385
1447 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1386 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1448} 1387}
1449 1388
1450/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1451/* 1390/*
1452 * Insert/Delete <count> characters from the current position 1391 * Insert/Delete <count> characters from the current position
… …
1464 return; 1403 return;
1465 1404
1466 scr_do_wrap (); 1405 scr_do_wrap ();
1467 1406
1468 selection_check (1); 1407 selection_check (1);
1469 MIN_IT (count, (ncol - screen.cur.col)); 1408 min_it (count, ncol - screen.cur.col);
1470 1409
1471 row = screen.cur.row + saveLines; 1410 row = screen.cur.row;
1472 1411
1473 line_t *line = save + row; 1412 line_t *line = &ROW(row);
1413
1414 line->touch ();
1415 line->is_longer (0);
1474 1416
1475 switch (insdel) 1417 switch (insdel)
1476 { 1418 {
1477 case INSERT: 1419 case INSERT:
1478 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1420 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1479 { 1421 {
1480 line->t[col] = line->t[col - count]; 1422 line->t[col] = line->t[col - count];
1481 line->r[col] = line->r[col - count]; 1423 line->r[col] = line->r[col - count];
1482 } 1424 }
1483 1425
1484 if (!line->is_longer ()) 1426 line->l = min (line->l + count, ncol);
1485 {
1486 line->l += count;
1487 MIN_IT (line->l, ncol);
1488 }
1489 1427
1490 if (selection.op && current_screen == selection.screen 1428 if (selection.op && current_screen == selection.screen
1491 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1429 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1492 { 1430 {
1493 if (selection.end.row != screen.cur.row 1431 if (selection.end.row != screen.cur.row
… …
1499 selection.mark.col += count; /* XXX: yes? */ 1437 selection.mark.col += count; /* XXX: yes? */
1500 selection.end.col += count; 1438 selection.end.col += count;
1501 } 1439 }
1502 } 1440 }
1503 1441
1504 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1442 scr_blank_line (*line, screen.cur.col, count, rstyle);
1505 break; 1443 break;
1506 1444
1507 case ERASE: 1445 case ERASE:
1508 screen.cur.col += count; /* don't worry if > ncol */ 1446 screen.cur.col += count; /* don't worry if > ncol */
1509 selection_check (1); 1447 selection_check (1);
1510 screen.cur.col -= count; 1448 screen.cur.col -= count;
1449
1450 line->l = max (line->l - count, 0);
1511 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1451 scr_blank_line (*line, screen.cur.col, count, rstyle);
1512 break; 1452 break;
1513 1453
1514 case DELETE: 1454 case DELETE:
1515 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1455 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1516 1456
… …
1518 { 1458 {
1519 line->t[col] = line->t[col + count]; 1459 line->t[col] = line->t[col + count];
1520 line->r[col] = line->r[col + count]; 1460 line->r[col] = line->r[col + count];
1521 } 1461 }
1522 1462
1463 line->l = max (line->l - count, 0);
1523 scr_blank_line (*line, ncol - count, count, tr); 1464 scr_blank_line (*line, ncol - count, count, tr);
1524
1525 if (line->is_longer ()) /* break line continuation */
1526 line->l = ncol;
1527
1528 line->l -= count;
1529 MAX_IT (line->l, 0);
1530 1465
1531 if (selection.op && current_screen == selection.screen 1466 if (selection.op && current_screen == selection.screen
1532 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1467 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1533 { 1468 {
1534 if (selection.end.row != screen.cur.row 1469 if (selection.end.row != screen.cur.row
… …
1554 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1489 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1555 */ 1490 */
1556void 1491void
1557rxvt_term::scr_scroll_region (int top, int bot) 1492rxvt_term::scr_scroll_region (int top, int bot)
1558{ 1493{
1559 MAX_IT (top, 0); 1494 max_it (top, 0);
1560 MIN_IT (bot, (int)nrow - 1); 1495 min_it (bot, nrow - 1);
1561 1496
1562 if (top > bot) 1497 if (top > bot)
1563 return; 1498 return;
1564 1499
1565 screen.tscroll = top; 1500 screen.tscroll = top;
… …
1646rxvt_term::scr_set_tab (int mode) 1581rxvt_term::scr_set_tab (int mode)
1647{ 1582{
1648 if (mode < 0) 1583 if (mode < 0)
1649 memset (tabs, 0, ncol * sizeof (char)); 1584 memset (tabs, 0, ncol * sizeof (char));
1650 else if (screen.cur.col < ncol) 1585 else if (screen.cur.col < ncol)
1651 tabs[screen.cur.col] = (mode ? 1 : 0); 1586 tabs [screen.cur.col] = !!mode;
1652} 1587}
1653 1588
1654/* ------------------------------------------------------------------------- */ 1589/* ------------------------------------------------------------------------- */
1655/* 1590/*
1656 * Set reverse/normal video 1591 * Set reverse/normal video
… …
1663 XGCValues gcvalue; 1598 XGCValues gcvalue;
1664 1599
1665 if (rvideo != mode) 1600 if (rvideo != mode)
1666 { 1601 {
1667 rvideo = mode; 1602 rvideo = mode;
1668 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1603 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1669#if XPM_BACKGROUND 1604#if XPM_BACKGROUND
1670 if (bgPixmap.pixmap == None) 1605 if (bgPixmap.pixmap == None)
1671#endif 1606#endif
1672#if TRANSPARENT 1607#if TRANSPARENT
1673 if (! (options & Opt_transparent) || am_transparent == 0) 1608 if (! OPTION (Opt_transparent) || am_transparent == 0)
1674#endif 1609#endif
1675 XSetWindowBackground (display->display, vt, 1610 XSetWindowBackground (display->display, vt,
1676 pix_colors[Color_bg]); 1611 pix_colors[Color_bg]);
1677 1612
1678 gcvalue.foreground = pix_colors[Color_fg]; 1613 gcvalue.foreground = pix_colors[Color_fg];
… …
1703 * Set font style 1638 * Set font style
1704 */ 1639 */
1705void 1640void
1706rxvt_term::set_font_style () 1641rxvt_term::set_font_style ()
1707{ 1642{
1643#if 0
1708 switch (charsets[screen.charset]) 1644 switch (charsets [screen.charset])
1709 { 1645 {
1710 case '0': /* DEC Special Character & Line Drawing Set */ 1646 case '0': /* DEC Special Character & Line Drawing Set */
1711 break; 1647 break;
1712 case 'A': /* United Kingdom (UK) */ 1648 case 'A': /* United Kingdom (UK) */
1713 break; 1649 break;
… …
1720 case 'C': /* Finnish character set */ 1656 case 'C': /* Finnish character set */
1721 break; 1657 break;
1722 case 'K': /* German character set */ 1658 case 'K': /* German character set */
1723 break; 1659 break;
1724 } 1660 }
1661#endif
1725} 1662}
1726 1663
1727/* ------------------------------------------------------------------------- */ 1664/* ------------------------------------------------------------------------- */
1728/* 1665/*
1729 * Choose a font 1666 * Choose a font
… …
1769 bool found = false; 1706 bool found = false;
1770 1707
1771 for (int i = 0; i < nrow; i++) 1708 for (int i = 0; i < nrow; i++)
1772 { 1709 {
1773 int col = 0; 1710 int col = 0;
1774 rend_t *drp = drawn[i].r; 1711 rend_t *drp = drawn_buf[i].r;
1775 1712
1776 for (; col < ncol; col++, drp++) 1713 for (; col < ncol; col++, drp++)
1777 if ((*drp & mask) == value) 1714 if ((*drp & mask) == value)
1778 { 1715 {
1779 found = true; 1716 found = true;
… …
1797rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1734rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1798{ 1735{
1799 int i; 1736 int i;
1800 row_col_t rc[RC_COUNT]; 1737 row_col_t rc[RC_COUNT];
1801 1738
1802 if (!drawn) /* sanity check */ 1739 if (!drawn_buf) /* sanity check */
1803 return; 1740 return;
1804 1741
1805#ifndef NO_SLOW_LINK_SUPPORT 1742#ifndef NO_SLOW_LINK_SUPPORT
1806 if (refresh_type == FAST_REFRESH && !display->is_local) 1743 if (refresh_type == FAST_REFRESH && !display->is_local)
1807 { 1744 {
1808 y = 0; 1745 y = 0;
1809 eheight = height; 1746 eheight = height;
1810 } 1747 }
1811#endif
1812
1813#ifdef DEBUG_STRICT
1814 x = max (x, 0);
1815 x = min (x, (int)width);
1816 y = max (y, 0);
1817 y = min (y, (int)height);
1818#endif 1748#endif
1819 1749
1820 /* round down */ 1750 /* round down */
1821 rc[PART_BEG].col = Pixel2Col (x); 1751 rc[PART_BEG].col = Pixel2Col (x);
1822 rc[PART_BEG].row = Pixel2Row (y); 1752 rc[PART_BEG].row = Pixel2Row (y);
… …
1825 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1755 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1826 1756
1827 /* sanity checks */ 1757 /* sanity checks */
1828 for (i = PART_BEG; i < RC_COUNT; i++) 1758 for (i = PART_BEG; i < RC_COUNT; i++)
1829 { 1759 {
1830 MIN_IT (rc[i].col, ncol - 1); 1760 min_it (rc[i].col, ncol - 1);
1831 MIN_IT (rc[i].row, nrow - 1); 1761 min_it (rc[i].row, nrow - 1);
1832 } 1762 }
1833 1763
1834 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1764 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1835 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1765 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1836 1766
1837 if (refresh) 1767 if (refresh)
1838 scr_refresh (SLOW_REFRESH); 1768 scr_refresh (SLOW_REFRESH);
1839} 1769}
1840 1770
… …
1903int 1833int
1904rxvt_term::scr_changeview (unsigned int oldviewstart) 1834rxvt_term::scr_changeview (unsigned int oldviewstart)
1905{ 1835{
1906 if (view_start != oldviewstart) 1836 if (view_start != oldviewstart)
1907 { 1837 {
1838 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1839
1908 want_refresh = 1; 1840 want_refresh = 1;
1909 num_scr -= (view_start - oldviewstart); 1841 num_scr -= (view_start - oldviewstart);
1910 } 1842 }
1911 1843
1912 return (int) (view_start - oldviewstart); 1844 return (int)view_start - (int)oldviewstart;
1913} 1845}
1914 1846
1915/* ------------------------------------------------------------------------- */ 1847/* ------------------------------------------------------------------------- */
1916void 1848void
1917rxvt_term::scr_bell () 1849rxvt_term::scr_bell ()
1918{ 1850{
1919#ifndef NO_BELL 1851#ifndef NO_BELL
1920 1852
1921# ifndef NO_MAPALERT 1853# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1854# ifdef MAPALERT_OPTION
1923 if (options & Opt_mapAlert) 1855 if (OPTION (Opt_mapAlert))
1924# endif 1856# endif
1925 XMapWindow (display->display, parent[0]); 1857 XMapWindow (display->display, parent[0]);
1926# endif 1858# endif
1927 1859
1928 if (options & Opt_visualBell) 1860 if (OPTION (Opt_visualBell))
1929 { 1861 {
1930 scr_rvideo_mode (!rvideo); /* refresh also done */ 1862 scr_rvideo_mode (!rvideo); /* refresh also done */
1931 rxvt_usleep (VISUAL_BELL_DURATION); 1863 rxvt_usleep (VISUAL_BELL_DURATION);
1932 scr_rvideo_mode (!rvideo); /* refresh also done */ 1864 scr_rvideo_mode (!rvideo); /* refresh also done */
1933 } 1865 }
… …
1941/* ARGSUSED */ 1873/* ARGSUSED */
1942void 1874void
1943rxvt_term::scr_printscreen (int fullhist) 1875rxvt_term::scr_printscreen (int fullhist)
1944{ 1876{
1945#ifdef PRINTPIPE 1877#ifdef PRINTPIPE
1946 int i, r1, nrows, row_offset; 1878 int nrows, row_start;
1947 FILE *fd; 1879 FILE *fd;
1948 1880
1949 if ((fd = popen_printer ()) == NULL) 1881 if ((fd = popen_printer ()) == NULL)
1950 return; 1882 return;
1951 1883
1952 nrows = nrow;
1953 row_offset = saveLines;
1954
1955 if (!fullhist) 1884 if (fullhist)
1956 row_offset -= view_start; 1885 {
1886 nrows = nrow + nsaved;
1887 row_start = -nsaved;
1888 }
1957 else 1889 else
1958 { 1890 {
1959 nrows += nsaved; 1891 nrows = nrow;
1960 row_offset -= nsaved; 1892 row_start = -view_start;
1961 } 1893 }
1962 1894
1963 wctomb (0, 0); 1895 wctomb (0, 0);
1964 1896
1965 for (r1 = 0; r1 < nrows; r1++) 1897 for (int r1 = 0; r1 < nrows; r1++)
1966 { 1898 {
1967 text_t *tp = save[r1 + row_offset].t; 1899 text_t *tp = ROW(r1).t;
1968 int len = save[r1 + row_offset].l; 1900 int len = ROW(r1).l;
1969 1901
1970 for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1902 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1971 { 1903 {
1972 char mb[MB_LEN_MAX]; 1904 char mb[MB_LEN_MAX];
1973 text_t t = *tp++; 1905 text_t t = *tp++;
1974 if (t == NOCHAR) 1906 if (t == NOCHAR)
1975 continue; 1907 continue;
… …
2003{ 1935{
2004 unsigned char must_clear, /* use draw_string not draw_image_string */ 1936 unsigned char must_clear, /* use draw_string not draw_image_string */
2005 showcursor; /* show the cursor */ 1937 showcursor; /* show the cursor */
2006 int16_t col, row, /* column/row we're processing */ 1938 int16_t col, row, /* column/row we're processing */
2007 ocrow; /* old cursor row */ 1939 ocrow; /* old cursor row */
2008 int i, /* tmp */ 1940 int i; /* tmp */
2009 row_offset; /* basic offset in screen structure */
2010#ifndef NO_CURSORCOLOR 1941#ifndef NO_CURSORCOLOR
2011 rend_t cc1; /* store colours at cursor position (s) */ 1942 rend_t cc1; /* store colours at cursor position (s) */
2012#endif 1943#endif
2013 rend_t *crp; // cursor rendition pointer 1944 rend_t *crp; // cursor rendition pointer
2014 1945
… …
2021 * A: set up vars 1952 * A: set up vars
2022 */ 1953 */
2023 must_clear = 0; 1954 must_clear = 0;
2024 refresh_count = 0; 1955 refresh_count = 0;
2025 1956
2026 row_offset = term_start - view_start;
2027
2028#if XPM_BACKGROUND 1957#if XPM_BACKGROUND
2029 must_clear |= bgPixmap.pixmap != None; 1958 must_clear |= bgPixmap.pixmap != None;
2030#endif 1959#endif
2031#if TRANSPARENT 1960#if TRANSPARENT
2032 must_clear |= (options & Opt_transparent) && am_transparent; 1961 must_clear |= OPTION (Opt_transparent) && am_transparent;
2033#endif 1962#endif
2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1963 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2035 1964
2036 /* 1965 /*
2037 * B: reverse any characters which are selected 1966 * B: reverse any characters which are selected
… …
2061 1990
2062 crp = &ROW(screen.cur.row).r[col]; 1991 crp = &ROW(screen.cur.row).r[col];
2063 1992
2064 if (showcursor && focus) 1993 if (showcursor && focus)
2065 { 1994 {
2066 if (options & Opt_cursorUnderline) 1995 if (OPTION (Opt_cursorUnderline))
2067 *crp ^= RS_Uline; 1996 *crp ^= RS_Uline;
2068 else 1997 else
2069 { 1998 {
2070 *crp ^= RS_RVid; 1999 *crp ^= RS_RVid;
2071 2000
… …
2073 cc1 = *crp & (RS_fgMask | RS_bgMask); 2002 cc1 = *crp & (RS_fgMask | RS_bgMask);
2074 if (ISSET_PIXCOLOR (Color_cursor)) 2003 if (ISSET_PIXCOLOR (Color_cursor))
2075 ccol1 = Color_cursor; 2004 ccol1 = Color_cursor;
2076 else 2005 else
2077#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2006#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2078 ccol1 = GET_FGCOLOR (rstyle); 2007 ccol1 = fgcolor_of (rstyle);
2079#else 2008#else
2080 ccol1 = Color_fg; 2009 ccol1 = Color_fg;
2081#endif 2010#endif
2082 if (ISSET_PIXCOLOR (Color_cursor2)) 2011 if (ISSET_PIXCOLOR (Color_cursor2))
2083 ccol2 = Color_cursor2; 2012 ccol2 = Color_cursor2;
2084 else 2013 else
2085#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2086 ccol2 = GET_BGCOLOR (rstyle); 2015 ccol2 = bgcolor_of (rstyle);
2087#else 2016#else
2088 ccol2 = Color_bg; 2017 ccol2 = Color_bg;
2089#endif 2018#endif
2090 *crp = SET_FGCOLOR (*crp, ccol1); 2019 *crp = SET_FGCOLOR (*crp, ccol1);
2091 *crp = SET_BGCOLOR (*crp, ccol2); 2020 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2101 if (screen.cur.row + view_start != ocrow 2030 if (screen.cur.row + view_start != ocrow
2102 || screen.cur.col != oldcursor.col) 2031 || screen.cur.col != oldcursor.col)
2103 { 2032 {
2104 if (ocrow < nrow 2033 if (ocrow < nrow
2105 && oldcursor.col < ncol) 2034 && oldcursor.col < ncol)
2106 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2035 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2107 2036
2108 if (focus || !showcursor) 2037 if (focus || !showcursor)
2109 oldcursor.row = -1; 2038 oldcursor.row = -1;
2110 else 2039 else
2111 setoldcursor = 1; 2040 setoldcursor = 1;
… …
2124 oldcursor.col = screen.cur.col; 2053 oldcursor.col = screen.cur.col;
2125 } 2054 }
2126 } 2055 }
2127 } 2056 }
2128 2057
2058 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2129#if ENABLE_OVERLAY 2059#if ENABLE_OVERLAY
2130 scr_swap_overlay (); 2060 scr_swap_overlay ();
2131#endif 2061#endif
2132 2062
2133#ifndef NO_SLOW_LINK_SUPPORT 2063#ifndef NO_SLOW_LINK_SUPPORT
… …
2135 * D: CopyArea pass - very useful for slower links 2065 * D: CopyArea pass - very useful for slower links
2136 * This has been deliberately kept simple. 2066 * This has been deliberately kept simple.
2137 */ 2067 */
2138 i = num_scr; 2068 i = num_scr;
2139 if (!display->is_local 2069 if (!display->is_local
2140 && refresh_type == FAST_REFRESH && num_scr_allow && i 2070 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2141 && abs (i) < nrow && !must_clear) 2071 && abs (num_scr) < nrow && !must_clear)
2142 { 2072 {
2143 int16_t nits; 2073 int16_t nits;
2144 int j; 2074 int j;
2145 int len, wlen; 2075 int len, wlen;
2146 2076
… …
2149 row = i > 0 ? 0 : j - 1; 2079 row = i > 0 ? 0 : j - 1;
2150 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2080 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2151 { 2081 {
2152 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2082 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2153 { 2083 {
2154 line_t s = save[(row + row_offset) % nlines]; 2084 line_t s = ROW(row - view_start);
2155 line_t d = drawn[row]; 2085 line_t d = drawn_buf[row];
2156 line_t d2 = drawn[row + i]; 2086 line_t d2 = drawn_buf[row + i];
2157 2087
2158 for (nits = 0, col = ncol; col--; ) 2088 for (nits = 0, col = ncol; col--; )
2159 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2089 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2160 nits--; 2090 nits--;
2161 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2091 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2179 2109
2180 if (len != -1) 2110 if (len != -1)
2181 { 2111 {
2182 /* also comes here at end if needed because of >= above */ 2112 /* also comes here at end if needed because of >= above */
2183 if (wlen < len) 2113 if (wlen < len)
2184 SWAP_IT (wlen, len, int); 2114 ::swap (wlen, len);
2185 2115
2186 XCopyArea (display->display, vt, vt, 2116 XCopyArea (display->display, vt, vt,
2187 gc, 0, Row2Pixel (len + i), 2117 gc, 0, Row2Pixel (len + i),
2188 (unsigned int)TermWin_TotalWidth (), 2118 (unsigned int)this->width,
2189 (unsigned int)Height2Pixel (wlen - len + 1), 2119 (unsigned int)Height2Pixel (wlen - len + 1),
2190 0, Row2Pixel (len)); 2120 0, Row2Pixel (len));
2191 len = -1; 2121 len = -1;
2192 } 2122 }
2193 } 2123 }
… …
2197 /* 2127 /*
2198 * E: main pass across every character 2128 * E: main pass across every character
2199 */ 2129 */
2200 for (row = 0; row < nrow; row++) 2130 for (row = 0; row < nrow; row++)
2201 { 2131 {
2202 text_t *stp = save[(row + row_offset) % total_rows].t; 2132 text_t *stp = ROW(row - view_start).t;
2203 rend_t *srp = save[(row + row_offset) % total_rows].r; 2133 rend_t *srp = ROW(row - view_start).r;
2204 text_t *dtp = drawn[row].t; 2134 text_t *dtp = drawn_buf[row].t;
2205 rend_t *drp = drawn[row].r; 2135 rend_t *drp = drawn_buf[row].r;
2206 2136
2207 /* 2137 /*
2208 * E2: OK, now the real pass 2138 * E2: OK, now the real pass
2209 */ 2139 */
2210 int ypixel = (int)Row2Pixel (row); 2140 int ypixel = (int)Row2Pixel (row);
… …
2272 count++, i--; 2202 count++, i--;
2273 2203
2274 /* 2204 /*
2275 * Determine the attributes for the string 2205 * Determine the attributes for the string
2276 */ 2206 */
2277 int fore = GET_FGCOLOR (rend); // desired foreground 2207 int fore = fgcolor_of (rend); // desired foreground
2278 int back = GET_BGCOLOR (rend); // desired background 2208 int back = bgcolor_of (rend); // desired background
2279 2209
2280 // only do special processing if any attributes are set, which is rare 2210 // only do special processing if any attributes are set, which is unlikely
2281 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2211 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2282 { 2212 {
2283#if ENABLE_STYLES 2213#if ENABLE_STYLES
2284 // force redraw after "careful" characters to avoid pixel droppings 2214 // force redraw after "careful" characters to avoid pixel droppings
2285 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2215 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2321 fore = Color_UL; 2251 fore = Color_UL;
2322#endif 2252#endif
2323 2253
2324 if (invert) 2254 if (invert)
2325 { 2255 {
2326 SWAP_IT (fore, back, int); 2256 ::swap (fore, back);
2327 2257
2328#ifndef NO_BOLD_UNDERLINE_REVERSE 2258#ifndef NO_BOLD_UNDERLINE_REVERSE
2329 if (ISSET_PIXCOLOR (Color_RV)) 2259 if (ISSET_PIXCOLOR (Color_RV))
2330 back = Color_RV; 2260 back = Color_RV;
2331 2261
… …
2396 } /* for (row....) */ 2326 } /* for (row....) */
2397 2327
2398#if ENABLE_OVERLAY 2328#if ENABLE_OVERLAY
2399 scr_swap_overlay (); 2329 scr_swap_overlay ();
2400#endif 2330#endif
2331 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2401 2332
2402 /* 2333 /*
2403 * G: cleanup cursor and display outline cursor if necessary 2334 * G: cleanup cursor and display outline cursor if necessary
2404 */ 2335 */
2405 if (showcursor) 2336 if (showcursor)
2406 { 2337 {
2407 if (focus) 2338 if (focus)
2408 { 2339 {
2409 if (options & Opt_cursorUnderline) 2340 if (OPTION (Opt_cursorUnderline))
2410 *crp ^= RS_Uline; 2341 *crp ^= RS_Uline;
2411 else 2342 else
2412 { 2343 {
2413 *crp ^= RS_RVid; 2344 *crp ^= RS_RVid;
2414#ifndef NO_CURSORCOLOR 2345#ifndef NO_CURSORCOLOR
… …
2423 2354
2424 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2355 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2425 col--; 2356 col--;
2426 2357
2427 while (col + cursorwidth < ncol 2358 while (col + cursorwidth < ncol
2428 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2359 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2429 cursorwidth++; 2360 cursorwidth++;
2430 2361
2431#ifndef NO_CURSORCOLOR 2362#ifndef NO_CURSORCOLOR
2432 if (ISSET_PIXCOLOR (Color_cursor)) 2363 if (ISSET_PIXCOLOR (Color_cursor))
2433 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2364 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2452 num_scr = 0; 2383 num_scr = 0;
2453 num_scr_allow = 1; 2384 num_scr_allow = 1;
2454} 2385}
2455 2386
2456void 2387void
2457rxvt_term::scr_remap_chars (const line_t &l) 2388rxvt_term::scr_remap_chars (line_t &l)
2458{ 2389{
2459 if (!l.t) 2390 if (!l.t)
2460 return; 2391 return;
2461 2392
2393 l.touch (); // maybe a bit of an overkill, but its not performance-relevant
2394
2462 for (int i = ncol; i--; ) 2395 for (int i = ncol; i--; )
2463 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2396 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2464} 2397}
2465 2398
2466void 2399void
2467rxvt_term::scr_remap_chars () 2400rxvt_term::scr_remap_chars ()
2468{ 2401{
2469 for (int i = total_rows; i--; ) 2402 for (int i = total_rows; i--; )
2470 scr_remap_chars (save[i]); 2403 scr_remap_chars (row_buf [i]);
2471 2404
2472 for (int i = nrow; i--; ) 2405 for (int i = nrow; i--; )
2473 { 2406 {
2474 scr_remap_chars (drawn[i]); 2407 scr_remap_chars (drawn_buf [i]);
2475 scr_remap_chars (swap_save[i]); 2408 scr_remap_chars (swap_buf [i]);
2476 } 2409 }
2477} 2410}
2478 2411
2479void 2412void
2480rxvt_term::scr_recolour () 2413rxvt_term::scr_recolour ()
… …
2533 2466
2534#if ENABLE_FRILLS 2467#if ENABLE_FRILLS
2535 if (selection.rect) 2468 if (selection.rect)
2536 { 2469 {
2537 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2470 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2471 {
2472 text_t *stp = ROW(row).t;
2473 rend_t *srp = ROW(row).r;
2474
2538 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2475 for (col = selection.beg.col; col < selection.end.col; col++)
2539 srp[col] ^= RS_RVid; 2476 srp[col] ^= RS_RVid;
2477
2478 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2479 srp[col] ^= RS_RVid | RS_Uline;
2480
2481 if (++col < selection.end.col)
2482 srp[col] ^= RS_RVid | RS_Uline;
2483 }
2540 } 2484 }
2541 else 2485 else
2542#endif 2486#endif
2543 { 2487 {
2544 if (selection.beg.row >= -view_start) 2488 if (selection.beg.row >= -view_start)
… …
2547 row = selection.beg.row; 2491 row = selection.beg.row;
2548 } 2492 }
2549 else 2493 else
2550 { 2494 {
2551 col = 0; 2495 col = 0;
2552 row = view_start; 2496 row = -view_start;
2553 } 2497 }
2554 2498
2555 for (; row < min (selection.end.row, view_end); row++, col = 0) 2499 for (; row < min (selection.end.row, view_end); row++, col = 0)
2556 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2500 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2557 srp[col] ^= RS_RVid; 2501 srp[col] ^= RS_RVid;
… …
2577 char r1[] = "\n"; 2521 char r1[] = "\n";
2578 2522
2579 for (row = saveLines - nsaved; 2523 for (row = saveLines - nsaved;
2580 row < saveLines + nrow - 1; row++) 2524 row < saveLines + nrow - 1; row++)
2581 { 2525 {
2582 width = save[row].l >= 0 ? save[row].l 2526 width = row_buf[row].l >= 0 ? row_buf[row].l
2583 : ncol; 2527 : ncol;
2584 for (towrite = width; towrite; towrite -= wrote) 2528 for (towrite = width; towrite; towrite -= wrote)
2585 { 2529 {
2586 wrote = write (fd, & (save[row].t[width - towrite]), 2530 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2587 towrite); 2531 towrite);
2588 if (wrote < 0) 2532 if (wrote < 0)
2589 return; /* XXX: death, no report */ 2533 return; /* XXX: death, no report */
2590 } 2534 }
2591 if (save[row].l >= 0) 2535 if (row_buf[row].l >= 0)
2592 if (write (fd, r1, 1) <= 0) 2536 if (write (fd, r1, 1) <= 0)
2593 return; /* XXX: death, no report */ 2537 return; /* XXX: death, no report */
2594 } 2538 }
2595} 2539}
2596#endif 2540#endif
… …
2628/* ------------------------------------------------------------------------- */ 2572/* ------------------------------------------------------------------------- */
2629/* 2573/*
2630 * Paste a selection direct to the command fd 2574 * Paste a selection direct to the command fd
2631 */ 2575 */
2632void 2576void
2633rxvt_term::paste (unsigned char *data, unsigned int len) 2577rxvt_term::paste (char *data, unsigned int len)
2634{ 2578{
2635 /* convert normal newline chars into common keyboard Return key sequence */ 2579 /* convert normal newline chars into common keyboard Return key sequence */
2636 for (unsigned int i = 0; i < len; i++) 2580 for (unsigned int i = 0; i < len; i++)
2637 if (data[i] == C0_LF) 2581 if (data[i] == C0_LF)
2638 data[i] = C0_CR; 2582 data[i] = C0_CR;
… …
2782 { 2726 {
2783 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2727 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2784 char *s = rxvt_wcstombs (w); 2728 char *s = rxvt_wcstombs (w);
2785 free (w); 2729 free (w);
2786 // TODO: strlen == only the first element will be converted. well... 2730 // TODO: strlen == only the first element will be converted. well...
2787 paste ((unsigned char *)s, strlen (s)); 2731 paste (s, strlen (s));
2788 free (s); 2732 free (s);
2789 } 2733 }
2790 else 2734 else
2791#endif 2735#endif
2792 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2736 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2793 && cl) 2737 && cl)
2794 { 2738 {
2795 for (int i = 0; i < cr; i++) 2739 for (int i = 0; i < cr; i++)
2796 paste ((unsigned char *)cl[i], strlen (cl[i])); 2740 paste (cl[i], strlen (cl[i]));
2797 2741
2798 XFreeStringList (cl); 2742 XFreeStringList (cl);
2799 } 2743 }
2800 else 2744 else
2801 paste (ct.value, ct.nitems); // paste raw 2745 paste ((char *)ct.value, ct.nitems); // paste raw
2802 2746
2803bailout: 2747bailout:
2804 XFree (ct.value); 2748 XFree (ct.value);
2805 2749
2806 if (selection_wait == Sel_normal) 2750 if (selection_wait == Sel_normal)
… …
2844 return; /* outside window */ 2788 return; /* outside window */
2845 2789
2846 if (selection.text) 2790 if (selection.text)
2847 { /* internal selection */ 2791 { /* internal selection */
2848 char *str = rxvt_wcstombs (selection.text, selection.len); 2792 char *str = rxvt_wcstombs (selection.text, selection.len);
2849 paste ((unsigned char *)str, strlen (str)); 2793 paste (str, strlen (str));
2850 free (str); 2794 free (str);
2851 return; 2795 return;
2852 } 2796 }
2853 else 2797 else
2854 { 2798 {
… …
2946 selection.op = SELECTION_DONE; 2890 selection.op = SELECTION_DONE;
2947 2891
2948 if (selection.clicks == 4) 2892 if (selection.clicks == 4)
2949 return; /* nothing selected, go away */ 2893 return; /* nothing selected, go away */
2950 2894
2895 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2896 return;
2897
2951 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2898 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2952 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2899 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2953 2900
2954 int ofs = 0; 2901 int ofs = 0;
2955 int extra = 0; 2902 int extra = 0;
… …
2967 col = selection.beg.col; 2914 col = selection.beg.col;
2968 end_col = ncol + 1; 2915 end_col = ncol + 1;
2969 } 2916 }
2970 else 2917 else
2971#endif 2918#endif
2972 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2919 end_col = ROW(row).l;
2973 2920
2974 col = max (col, 0); 2921 col = max (col, 0);
2975 2922
2976 if (row == selection.end.row || selection.rect) 2923 if (row == selection.end.row
2924#if ENABLE_FRILLS
2925 || selection.rect
2926#endif
2927 )
2977 end_col = min (end_col, selection.end.col); 2928 min_it (end_col, selection.end.col);
2978 2929
2979 t = ROW(row).t + col; 2930 t = ROW(row).t + col;
2931
2980 for (; col < end_col; col++) 2932 for (; col < end_col; col++)
2981 { 2933 {
2982 if (*t == NOCHAR) 2934 if (*t == NOCHAR)
2983 t++; 2935 t++;
2984#if ENABLE_COMBINING 2936#if ENABLE_COMBINING
… …
3000#endif 2952#endif
3001 else 2953 else
3002 new_selection_text[ofs++] = *t++; 2954 new_selection_text[ofs++] = *t++;
3003 } 2955 }
3004 2956
2957#if ENABLE_FRILLS
2958 if (selection.rect)
2959 {
2960 while (ofs
2961 && new_selection_text[ofs - 1] != C0_LF
2962 && unicode::is_space (new_selection_text[ofs - 1]))
2963 --ofs;
2964
2965 new_selection_text[ofs++] = C0_LF;
2966 }
2967 else
2968#endif
3005 if (!ROW(row).is_longer () && row != selection.end.row) 2969 if (!ROW(row).is_longer () && row != selection.end.row)
3006 new_selection_text[ofs++] = C0_LF; 2970 new_selection_text[ofs++] = C0_LF;
3007 } 2971 }
3008 2972
3009 if (end_col != selection.end.col) 2973 if (end_col != selection.end.col)
3010 new_selection_text[ofs++] = C0_LF; 2974 new_selection_text[ofs++] = C0_LF;
3011 2975
… …
3021 2985
3022 // we usually allocate much more than necessary, so realloc it smaller again 2986 // we usually allocate much more than necessary, so realloc it smaller again
3023 selection.len = ofs; 2987 selection.len = ofs;
3024 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2988 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3025 2989
2990 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2991 return;
2992
2993 selection_grab (tm);
2994}
2995
2996bool
2997rxvt_term::selection_grab (Time tm)
2998{
2999 selection_time = tm;
3000
3026 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3001 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3027 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3002 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3003 {
3028 display->set_selection_owner (this); 3004 display->set_selection_owner (this);
3005 return true;
3006 }
3029 else 3007 else
3030 rxvt_warn ("can't get primary selection, ignoring.\n"); 3008 return false;
3031 3009
3032#if 0 3010#if 0
3033 XTextProperty ct; 3011 XTextProperty ct;
3034 3012
3035 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3013 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3036 { 3014 {
3037 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3015 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3038 XFree (ct.value); 3016 XFree (ct.value);
3039 } 3017 }
3040#endif 3018#endif
3041
3042 selection_time = tm;
3043} 3019}
3044 3020
3045/* ------------------------------------------------------------------------- */ 3021/* ------------------------------------------------------------------------- */
3046/* 3022/*
3047 * Mark or select text based upon number of clicks: 1, 2, or 3 3023 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3073 want_refresh = 1; 3049 want_refresh = 1;
3074 3050
3075 selection.mark.row = row - view_start; 3051 selection.mark.row = row - view_start;
3076 selection.mark.col = col; 3052 selection.mark.col = col;
3077 3053
3078 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); 3054 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3079 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); 3055 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3080 3056
3081 while (selection.mark.col > 0 3057 while (selection.mark.col > 0
3082 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3058 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3083 --selection.mark.col; 3059 --selection.mark.col;
3084 3060
… …
3169 } 3145 }
3170 } 3146 }
3171 break; 3147 break;
3172 } 3148 }
3173 3149
3174Old_Word_Selection_You_Die:
3175 if (dirn == DN) 3150 if (dirn == DN)
3176 col++; /* put us on one past the end */ 3151 col++; /* put us on one past the end */
3177 3152
3178 /* Poke the values back in */ 3153 /* Poke the values back in */
3179 ret->row = row; 3154 ret->row = row;
… …
3189 * flag == 2 ==> button 3 motion 3164 * flag == 2 ==> button 3 motion
3190 */ 3165 */
3191void 3166void
3192rxvt_term::selection_extend (int x, int y, int flag) 3167rxvt_term::selection_extend (int x, int y, int flag)
3193{ 3168{
3194 int col = min (max (Pixel2Col (x), 0), nrow - 1); 3169 int col = clamp (Pixel2Col (x), 0, ncol);
3195 int row = min (max (Pixel2Row (y), 0), ncol); 3170 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3196 3171
3197 /* 3172 /*
3198 * If we're selecting characters (single click) then we must check first 3173 * If we're selecting characters (single click) then we must check first
3199 * if we are at the same place as the original mark. If we are then 3174 * if we are at the same place as the original mark. If we are then
3200 * select nothing. Otherwise, if we're to the right of the mark, you have to 3175 * select nothing. Otherwise, if we're to the right of the mark, you have to
… …
3356 else if (selection.clicks == 2) 3331 else if (selection.clicks == 2)
3357 { 3332 {
3358 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3333 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3359 selection.end.col--; 3334 selection.end.col--;
3360 3335
3336 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3337 {
3361 selection_delimit_word (UP, &selection.beg, &selection.beg); 3338 selection_delimit_word (UP, &selection.beg, &selection.beg);
3362 selection_delimit_word (DN, &selection.end, &selection.end); 3339 selection_delimit_word (DN, &selection.end, &selection.end);
3340 }
3363 } 3341 }
3364 else if (selection.clicks == 3) 3342 else if (selection.clicks == 3)
3365 { 3343 {
3366#if ENABLE_FRILLS 3344#if ENABLE_FRILLS
3367 if (options & Opt_tripleclickwords) 3345 if (OPTION (Opt_tripleclickwords))
3368 { 3346 {
3369 selection_delimit_word (UP, &selection.beg, &selection.beg); 3347 selection_delimit_word (UP, &selection.beg, &selection.beg);
3370 3348
3371 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3349 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3372 { 3350 {
3373 if (!ROW(end_row).is_longer ()) 3351 if (!ROW(end_row).is_longer ())
3374 { 3352 {
3375 selection.end.row = end_row; 3353 selection.end.row = end_row;
3376 selection.end.col = save[end_row + saveLines].l; 3354 selection.end.col = ROW(end_row).l;
3377 selection_remove_trailing_spaces (); 3355 selection_remove_trailing_spaces ();
3378 break; 3356 break;
3379 } 3357 }
3380 } 3358 }
3381 } 3359 }
… …
3413 } 3391 }
3414 } 3392 }
3415 3393
3416#if ENABLE_FRILLS 3394#if ENABLE_FRILLS
3417 if (selection.rect && selection.beg.col > selection.end.col) 3395 if (selection.rect && selection.beg.col > selection.end.col)
3418 SWAP_IT (selection.beg.col, selection.end.col, int); 3396 ::swap (selection.beg.col, selection.end.col);
3419#endif 3397#endif
3420} 3398}
3421 3399
3422#if ENABLE_FRILLS 3400#if ENABLE_FRILLS
3423void 3401void
… …
3433 { 3411 {
3434 stp = ROW(end_row).t; 3412 stp = ROW(end_row).t;
3435 3413
3436 while (--end_col >= 0) 3414 while (--end_col >= 0)
3437 { 3415 {
3438 if (stp[end_col] != ' ' 3416 if (stp[end_col] != NOCHAR
3439 && stp[end_col] != '\t' 3417 && !unicode::is_space (stp[end_col]))
3440 && stp[end_col] != NOCHAR)
3441 break; 3418 break;
3442 } 3419 }
3443 3420
3444 if (end_col >= 0 3421 if (end_col >= 0
3445 || !ROW(end_row - 1).is_longer ()) 3422 || !ROW(end_row - 1).is_longer ())
… …
3621 */ 3598 */
3622void 3599void
3623rxvt_term::pixel_position (int *x, int *y) 3600rxvt_term::pixel_position (int *x, int *y)
3624{ 3601{
3625 *x = Pixel2Col (*x); 3602 *x = Pixel2Col (*x);
3626 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3603 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3627 *y = Pixel2Row (*y); 3604 *y = Pixel2Row (*y);
3628 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3605 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3629} 3606}
3630 3607
3631/* ------------------------------------------------------------------------- */ 3608/* ------------------------------------------------------------------------- */
3632#ifdef USE_XIM 3609#ifdef USE_XIM
3633void 3610void
… …
3644 3621
3645#if ENABLE_OVERLAY 3622#if ENABLE_OVERLAY
3646void 3623void
3647rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3624rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3648{ 3625{
3649 if (nrow < 3 || ncol < 3) 3626 if (nrow < 1 || ncol < 1)
3650 return; 3627 return;
3651 3628
3652 want_refresh = 1; 3629 want_refresh = 1;
3653 3630
3654 scr_overlay_off (); 3631 scr_overlay_off ();
3655 3632
3656 if (x < 0) x = ncol - w; 3633 if (x < 0) x = ncol - w;
3657 if (y < 0) y = nrow - h; 3634 if (y < 0) y = nrow - h;
3658 3635
3659 // make space for border 3636 // make space for border
3660 w += 2; MIN_IT (w, ncol); 3637 w += 2; min_it (w, ncol);
3661 h += 2; MIN_IT (h, nrow); 3638 h += 2; min_it (h, nrow);
3662 3639
3663 x -= 1; MAX_IT (x, 0); 3640 x -= 1; clamp_it (x, 0, ncol - w);
3664 y -= 1; MAX_IT (y, 0); 3641 y -= 1; clamp_it (y, 0, nrow - h);
3665
3666 MIN_IT (x, ncol - w);
3667 MIN_IT (y, nrow - h);
3668 3642
3669 ov_x = x; ov_y = y; 3643 ov_x = x; ov_y = y;
3670 ov_w = w; ov_h = h; 3644 ov_w = w; ov_h = h;
3671 3645
3672 ov_text = new text_t *[h]; 3646 ov_text = new text_t *[h];
… …
3764 for (int y = ov_h; y--; ) 3738 for (int y = ov_h; y--; )
3765 { 3739 {
3766 text_t *t1 = ov_text[y]; 3740 text_t *t1 = ov_text[y];
3767 rend_t *r1 = ov_rend[y]; 3741 rend_t *r1 = ov_rend[y];
3768 3742
3769 text_t *t2 = ROW(y - view_start).t + ov_x; 3743 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3770 rend_t *r2 = ROW(y - view_start).r + ov_x; 3744 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3771 3745
3772 for (int x = ov_w; x--; ) 3746 for (int x = ov_w; x--; )
3773 { 3747 {
3774 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3748 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3775 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3749 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