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.179 by root, Tue Dec 20 22:47:14 2005 UTC vs.
Revision 1.207 by root, Wed Jan 4 04:42:45 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() \
… …
147} 148}
148 149
149/* ------------------------------------------------------------------------- * 150/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 151 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 152 * ------------------------------------------------------------------------- */
153
152void 154void
153rxvt_term::scr_reset () 155rxvt_term::scr_reset ()
154{ 156{
155 unsigned int p, q;
156 int k;
157
158#if ENABLE_OVERLAY 157#if ENABLE_OVERLAY
159 scr_overlay_off (); 158 scr_overlay_off ();
160#endif 159#endif
161 160
162 view_start = 0; 161 view_start = 0;
… …
172 return; 171 return;
173 172
174 // we need at least two lines for wrapping to work correctly 173 // we need at least two lines for wrapping to work correctly
175 if (nrow + saveLines < 2) 174 if (nrow + saveLines < 2)
176 { 175 {
176 //TODO//FIXME
177 saveLines++; 177 saveLines++;
178 prev_nrow--; 178 prev_nrow--;
179 nsaved++; 179 nsaved++;
180 } 180 }
181 181
… …
185 total_rows = nrow + saveLines; 185 total_rows = nrow + saveLines;
186 186
187 screen.tscroll = 0; 187 screen.tscroll = 0;
188 screen.bscroll = nrow - 1; 188 screen.bscroll = nrow - 1;
189 189
190 if (!save) 190 if (!row_buf)
191 { 191 {
192 /* 192 /*
193 * first time called so just malloc everything: don't rely on realloc 193 * 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 194 * Note: this is still needed so that all the scrollback lines are NULL
195 */ 195 */
… …
197 term_start = 0; 197 term_start = 0;
198 198
199 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 199 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201 201
202 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 202 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
204 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 206
207 for (p = nrow; p--; ) 207 for (int row = nrow; row--; )
208 { 208 {
209 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); 209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 211 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 } 212 }
213 213
214 memset (charsets, 'B', sizeof (charsets)); 214 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 215 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 216 screen.flags = Screen_DefaultFlags;
… …
240 { 240 {
241 /* 241 /*
242 * add or delete rows as appropriate 242 * add or delete rows as appropriate
243 */ 243 */
244 244
245 rxvt_salloc *old_ta; 245 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
246 rxvt_salloc *old_ra; 246 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
247 247
248#if 0
248 if (nrow < prev_nrow) 249 if (nrow < prev_nrow)
249 { 250 {
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++) 251 for (int row = nrow; row < prev_nrow; row++)
256 { 252 {
257 lfree (ROW(p));
258 lfree (swap_save[p]); 253 lfree (swap_buf [row]);
259 lfree (drawn[p]); 254 lfree (drawn_buf[row]);
260 } 255 }
256 }
257#endif
261 258
262 /* we have fewer rows so fix up cursor position */ 259 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 260 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264 262
265 scr_reset_realloc (); /* realloc _last_ */ 263 for (int row = min (nrow, prev_nrow); row--; )
264 {
265 lresize (drawn_buf[row]);
266 lresize (swap_buf [row]);
267 }
268
269 for (int row = prev_nrow; row < nrow; row++)
270 {
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 }
274
275 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
266 } 276
267 else if (nrow > prev_nrow) 277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start - nsaved , prev_total_rows);
279 int q = total_rows; // rewrapped row
280
281 if (nsaved)
282 {
283 // re-wrap lines, this is rather ugly, possibly because I am too dumb
284 // to come up with a lean and mean algorithm.
285
286 row_col_t ocur = screen.cur;
287 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
288
268 { 289 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 { 290 {
285 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 291 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 292#ifdef DEBUG_STRICT
298 assert (screen.cur.row < nrow); 293 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 294#endif
302 ncol = ocol; // save b/c scr_blank_screen_mem uses this
303 }
304 295
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; 296 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l;
349 298
350 assert (llen >= 0); 299 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
351
352 while (p && save[p - 1].l < 0)
353 { 300 {
301 p = MOD (p - 1, prev_total_rows);
302
354 --p; 303 plines++;
355 llen += prev_ncol; 304 llen += prev_ncol;
356 } 305 }
357 306
358 int qlines = llen / ncol + 1; 307 int qlines = max (0, (llen - 1) / ncol) + 1;
308
309 // drop partial lines completely
310 if (q < qlines)
311 break;
312
313 q -= qlines;
314
359 int lofs = 0; 315 int lofs = 0;
316 line_t *qline;
360 317
361 q -= qlines; 318 // 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++) 319 for (int qrow = q; qlines--; qrow++)
367 { 320 {
321 qline = row_buf + qrow;
322 lalloc (*qline);
323 qline->set_is_longer ();
324
368 if (qrow >= 0) 325 int qcol = 0;
326
327 // fill a single destination line
328 while (lofs < llen && qcol < ncol)
369 { 329 {
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; 330 int prow = lofs / prev_ncol;
379 int pcol = lofs % prev_ncol; 331 int pcol = lofs % prev_ncol;
380 332
333 prow = MOD (p + prow, prev_total_rows);
334
335 // we only adjust the cursor _row_ and put it into
336 // the topmost line of "long line" it was in, as
337 // this seems to upset applications/shells/readline
338 // least.
339 if (prow == ocur.row)
340 screen.cur.row = q - (total_rows - nrow);
341
342 line_t &pline = old_buf [prow];
343
381 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 344 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
382 345
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); 346 assert (len);
347 assert (pline.t);
397 348
398 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
399 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
400 351
401 lofs += len; 352 lofs += len;
402 qcol += len; 353 qcol += len;
403
404 if (qcol == ncol)
405 break;
406 }
407 } 354 }
408 else
409 lofs += ncol;
410 } 355 }
356
357 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
358#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY
359 if (qline->l < 0)
360 {
361 fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
362 qline->l = 0;
363 }
364#endif
365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
411 } 366 }
367 while (p != pend && q > 0);
368
369 term_start = total_rows - nrow;
370 nsaved = term_start - q;
371
372 // make sure all terminal lines exist
373 while (nsaved < 0)
374 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
375
376 }
377 else
412 } 378 {
379 // if no scrollback exists (yet), wing, instead of wrap
380
381 for (int row = min (nrow, prev_nrow); row--; )
382 {
383 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
384 line_t &qline = row_buf [row];
413 385
414 free (screen.text); screen.text = tp; 386 qline = pline;
415 free (screen.rend); screen.rend = rp; 387 lresize (qline);
416 free (screen.tlen); screen.tlen = tl; 388 }
417 389
418 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 390 for (int row = prev_nrow; row < nrow; row++)
391 {
392 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
393 }
394
395 term_start = 0;
396 }
397
398#ifdef DEBUG_STRICT //TODO: remove
399 for (int i = -nsaved; i < nrow; i++)
400 assert (ROW (i).t);
419#endif 401#endif
402
403 free (old_buf);
404 delete old_ta;
405 delete old_ra;
406
407 clamp_it (screen.cur.row, 0, nrow - 1);
408 clamp_it (screen.cur.col, 0, ncol - 1);
420 409
421 if (tabs) 410 if (tabs)
422 free (tabs); 411 free (tabs);
423 } 412 }
424 413
425 prev_nrow = nrow; 414 prev_nrow = nrow;
426 prev_ncol = ncol; 415 prev_ncol = ncol;
427 416
428 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 417 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
429 418
430 for (p = 0; p < ncol; p++) 419 for (int col = ncol; col--; )
431 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 420 tabs [col] = col % TABSIZE == 0;
432 421
433 tt_winch (); 422 tt_winch ();
434}
435 423
436void 424 PERL_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} 425}
444 426
445/* ------------------------------------------------------------------------- */ 427/* ------------------------------------------------------------------------- */
446/* 428/*
447 * Free everything. That way malloc debugging can find leakage. 429 * Free everything. That way malloc debugging can find leakage.
… …
450rxvt_term::scr_release () 432rxvt_term::scr_release ()
451{ 433{
452 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
453 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
454 436
455 free (save); 437 free (row_buf);
456 free (swap_save); 438 free (swap_buf);
457 free (drawn); 439 free (drawn_buf);
458 free (buf); 440 free (temp_buf);
459 free (tabs); 441 free (tabs);
442
443 row_buf = 0; // signal that we freed all the arrays
460} 444}
461 445
462/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
463/* 447/*
464 * Hard reset 448 * Hard reset
… …
515 set_font_style (); 499 set_font_style ();
516 break; 500 break;
517 } 501 }
518 502
519 /* boundary check in case screen size changed between SAVE and RESTORE */ 503 /* boundary check in case screen size changed between SAVE and RESTORE */
520 MIN_IT (s->cur.row, nrow - 1); 504 min_it (s->cur.row, nrow - 1);
521 MIN_IT (s->cur.col, ncol - 1); 505 min_it (s->cur.col, ncol - 1);
522#ifdef DEBUG_STRICT 506#ifdef DEBUG_STRICT
523 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
524 assert (s->cur.col >= 0); 508 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 509#endif
529} 510}
530 511
531/* ------------------------------------------------------------------------- */ 512/* ------------------------------------------------------------------------- */
532/* 513/*
… …
543 if (current_screen == scrn) 524 if (current_screen == scrn)
544 return scrn; 525 return scrn;
545 526
546 selection_check (2); /* check for boundary cross */ 527 selection_check (2); /* check for boundary cross */
547 528
548 SWAP_IT (scrn, current_screen, int); 529 int i = current_screen; current_screen = scrn; scrn = i;
549 530
550 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 531 ::swap (screen.cur.row, swap.cur.row);
551 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 532 ::swap (screen.cur.col, swap.cur.col);
552 MAX_IT (screen.cur.row, 0); 533
553 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 534 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
554 MAX_IT (screen.cur.col, 0); 535 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
555 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
556 536
557#if NSCREENS 537#if NSCREENS
558 if (options & Opt_secondaryScreen) 538 if (OPTION (Opt_secondaryScreen))
559 { 539 {
560 num_scr = 0; 540 num_scr = 0;
561 541
562 for (int i = nrow; i--; ) 542 for (int i = prev_nrow; i--; )
563 SWAP_IT (ROW(i), swap_save[i], line_t); 543 ::swap (ROW(i), swap_buf [i]);
564 544
565 SWAP_IT (screen.charset, swap.charset, int16_t); 545 ::swap (screen.charset, swap.charset);
566 SWAP_IT (screen.flags, swap.flags, int); 546 ::swap (screen.flags, swap.flags);
567 screen.flags |= Screen_VisibleCursor; 547 screen.flags |= Screen_VisibleCursor;
568 swap.flags |= Screen_VisibleCursor; 548 swap.flags |= Screen_VisibleCursor;
569 } 549 }
570 else 550 else
571#endif 551#endif
572 if (options & Opt_secondaryScroll) 552 if (OPTION (Opt_secondaryScroll))
573 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 553 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
574 554
575 return scrn; 555 return scrn;
576} 556}
577 557
… …
639 num_scr += count; 619 num_scr += count;
640 620
641 if (count > 0 621 if (count > 0
642 && row1 == 0 622 && row1 == 0
643 && row2 == nrow - 1 623 && row2 == nrow - 1
644 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 624 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
645 { 625 {
646 nsaved = min (nsaved + count, saveLines); 626 nsaved = min (nsaved + count, saveLines);
627
628 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
629
647 term_start = (term_start + count) % total_rows; 630 term_start = (term_start + count) % total_rows;
648 631
649 if (selection.op && current_screen == selection.screen) 632 if (selection.op && current_screen == selection.screen)
650 { 633 {
651 selection.beg.row -= count; 634 selection.beg.row -= count;
652 selection.end.row -= count; 635 selection.end.row -= count;
653 selection.mark.row -= count; 636 selection.mark.row -= count;
654 637
655 selection_check (0); 638 if (selection.beg.row < -nsaved
639 || selection.end.row < -nsaved
640 || selection.mark.row < -nsaved)
641 {
642 CLEAR_ALL_SELECTION ();
643 selection.op = SELECTION_CLEAR;
644 }
656 } 645 }
657 646
658 for (int i = count; i--; ) 647 for (int i = count; i--; )
648 {
649 ROW(row2 - i).l = 0;
659 scr_blank_screen_mem (ROW(row2 - i), rstyle); 650 scr_blank_screen_mem (ROW(row2 - i), rstyle);
651 }
660 652
661 if ((options & Opt_scrollWithBuffer) 653 if (OPTION (Opt_scrollWithBuffer)
662 && view_start != 0 654 && view_start != 0
663 && view_start != saveLines) 655 && view_start != saveLines)
664 scr_page (UP, count); 656 scr_page (UP, count);
665 } 657 }
666 else 658 else
667 { 659 {
668 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
669 { 661 {
670 int i = selection.beg.row; 662 if ((selection.beg.row < row1 && selection.end.row > row1)
671 int j = selection.end.row; 663 || (selection.beg.row < row2 && selection.end.row > row2)
672
673 if ((i < row1 && j > row1)
674 || (i < row2 && j > row2)
675 || (i - count < row1 && i >= row1) 664 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
676 || (i - count > row2 && i <= row2) 665 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
677 || (j - count < row1 && j >= row1) 666 || (selection.end.row - count < row1 && selection.end.row >= row1)
678 || (j - count > row2 && j <= row2)) 667 || (selection.end.row - count > row2 && selection.end.row <= row2))
679 { 668 {
680 CLEAR_ALL_SELECTION (); 669 CLEAR_ALL_SELECTION ();
681 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 670 selection.op = SELECTION_CLEAR;
682 } 671 }
683 else if (j >= row1 && j <= row2) 672 else if (selection.end.row >= row1 && selection.end.row <= row2)
684 { 673 {
685 /* move selected region too */ 674 /* move selected region too */
686 selection.beg.row -= count; 675 selection.beg.row -= count;
687 selection.end.row -= count; 676 selection.end.row -= count;
688 selection.mark.row -= count; 677 selection.mark.row -= count;
… …
694 // use a simple and robust scrolling algorithm, this 683 // use a simple and robust scrolling algorithm, this
695 // part of scr_scroll_text is not time-critical. 684 // part of scr_scroll_text is not time-critical.
696 685
697 int rows = row2 - row1 + 1; 686 int rows = row2 - row1 + 1;
698 687
688 min_it (count, rows);
689
699 for (int row = 0; row < rows; row++) 690 for (int row = 0; row < rows; row++)
700 { 691 {
701 buf [row] = ROW(row1 + (row + count + rows) % rows); 692 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
702 693
703 if (!IN_RANGE_EXC (row + count, 0, rows)) 694 if (!IN_RANGE_EXC (row + count, 0, rows))
704 scr_blank_screen_mem (buf [row], rstyle); 695 scr_blank_screen_mem (temp_buf [row], rstyle);
705 } 696 }
706 697
707 for (int row = 0; row < rows; row++) 698 for (int row = 0; row < rows; row++)
708 ROW(row1 + row) = buf [row]; 699 ROW(row1 + row) = temp_buf [row];
709 } 700 }
710 701
711 return count; 702 return count;
712} 703}
713 704
… …
721 if (len <= 0) /* sanity */ 712 if (len <= 0) /* sanity */
722 return; 713 return;
723 714
724 unsigned char checksel; 715 unsigned char checksel;
725 unicode_t c; 716 unicode_t c;
726 int row, last_col; 717 int last_col;
727 const unicode_t *strend = str + len; 718 const unicode_t *strend = str + len;
728 719
729 want_refresh = 1; 720 want_refresh = 1;
730 ZERO_SCROLLBACK (); 721 ZERO_SCROLLBACK ();
731 last_col = ncol; 722 last_col = ncol;
732 723
733 if (nlines > 0) 724 if (nlines > 0)
734 { 725 {
735 nlines += screen.cur.row - screen.bscroll; 726 nlines += screen.cur.row - screen.bscroll;
736 if ((nlines > 0) 727 if (nlines > 0
737 && (screen.tscroll == 0) 728 && screen.tscroll == 0
738 && (screen.bscroll == (nrow - 1))) 729 && screen.bscroll == (nrow - 1))
739 { 730 {
740 /* _at least_ this many lines need to be scrolled */ 731 /* _at least_ this many lines need to be scrolled */
741 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 732 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
742 screen.cur.row -= nlines; 733 screen.cur.row -= nlines;
743 } 734 }
744 } 735 }
745 736
746#ifdef DEBUG_STRICT 737#ifdef DEBUG_STRICT
747 assert (screen.cur.col < last_col); 738 assert (screen.cur.col < last_col);
748 assert ((screen.cur.row < nrow) 739 assert (screen.cur.row < nrow
749 && (screen.cur.row >= - (int32_t)nsaved)); 740 && screen.cur.row >= -nsaved);
750#else /* drive with your eyes closed */
751 MIN_IT (screen.cur.col, last_col - 1);
752 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
753 MAX_IT (screen.cur.row, - (int32_t)nsaved);
754#endif 741#endif
755 row = screen.cur.row; 742 int row = screen.cur.row;
756 743
757 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 744 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
758 745
759 line_t *line = &ROW(row); 746 line_t *line = &ROW(row);
760 747
… …
762 { 749 {
763 c = *str++; 750 c = *str++;
764 751
765 if (c < 0x20) 752 if (c < 0x20)
766 if (c == C0_LF) 753 if (c == C0_LF)
767 { 754 {
768 if (!line->is_longer ()) /* XXX: think about this */ 755 if (!line->is_longer ()) /* XXX: think about this */
769 MAX_IT (line->l, screen.cur.col); 756 max_it (line->l, screen.cur.col);
770 757
771 screen.flags &= ~Screen_WrapNext; 758 screen.flags &= ~Screen_WrapNext;
772 759
773 if (screen.cur.row == screen.bscroll) 760 if (screen.cur.row == screen.bscroll)
774 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 761 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
779 continue; 766 continue;
780 } 767 }
781 else if (c == C0_CR) 768 else if (c == C0_CR)
782 { 769 {
783 if (!line->is_longer ()) /* XXX: think about this */ 770 if (!line->is_longer ()) /* XXX: think about this */
784 MAX_IT (line->l, screen.cur.col); 771 max_it (line->l, screen.cur.col);
785 772
786 screen.flags &= ~Screen_WrapNext; 773 screen.flags &= ~Screen_WrapNext;
787 screen.cur.col = 0; 774 screen.cur.col = 0;
788 continue; 775 continue;
789 } 776 }
… …
965#endif 952#endif
966 } 953 }
967 } 954 }
968 955
969 if (!line->is_longer ()) /* XXX: think about this */ 956 if (!line->is_longer ()) /* XXX: think about this */
970 MAX_IT (line->l, screen.cur.col); 957 max_it (line->l, screen.cur.col);
971 958
972#ifdef DEBUG_STRICT 959#ifdef DEBUG_STRICT
973 assert (screen.cur.row >= 0); 960 assert (screen.cur.row >= 0);
974#else /* drive with your eyes closed */
975 MAX_IT (screen.cur.row, 0);
976#endif 961#endif
977} 962}
978 963
979/* ------------------------------------------------------------------------- */ 964/* ------------------------------------------------------------------------- */
980/* 965/*
… …
1019 1004
1020 if (count == 0) 1005 if (count == 0)
1021 return; 1006 return;
1022 else if (count > 0) 1007 else if (count > 0)
1023 { 1008 {
1024 int row = screen.cur.row;
1025
1026 line_t &l = ROW(row); 1009 line_t &l = ROW(screen.cur.row);
1027 rend_t base_rend = l.r[i]; 1010 rend_t base_rend = l.r[i];
1028 ht &= l.t[i] == ' '; 1011 ht &= l.t[i] == ' ';
1029 1012
1030 for (; ++i < ncol; ) 1013 for (; ++i < ncol; )
1031 if (tabs[i]) 1014 if (tabs[i])
… …
1041 if (count) 1024 if (count)
1042 x = ncol - 1; 1025 x = ncol - 1;
1043 1026
1044 // store horizontal tab commands as characters inside the text 1027 // store horizontal tab commands as characters inside the text
1045 // buffer so they can be selected and pasted. 1028 // buffer so they can be selected and pasted.
1046 if (ht && options & Opt_pastableTabs) 1029 if (ht && OPTION (Opt_pastableTabs))
1047 { 1030 {
1048 base_rend = SET_FONT (base_rend, 0); 1031 base_rend = SET_FONT (base_rend, 0);
1049 1032
1050 if (!l.is_longer ()) /* XXX: think about this */ 1033 if (!l.is_longer ()) /* XXX: think about this */
1051 MAX_IT (l.l, x); 1034 max_it (l.l, x);
1052 1035
1053 i = screen.cur.col; 1036 i = screen.cur.col;
1054 1037
1055 l.t[i] = '\t'; 1038 l.t[i] = '\t';
1056 l.r[i] = base_rend; 1039 l.r[i] = base_rend;
… …
1106 */ 1089 */
1107#if ENABLE_FRILLS 1090#if ENABLE_FRILLS
1108void 1091void
1109rxvt_term::scr_forwardindex () 1092rxvt_term::scr_forwardindex ()
1110{ 1093{
1111 int row;
1112
1113 if (screen.cur.col < ncol - 1) 1094 if (screen.cur.col < ncol - 1)
1114 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1115 else 1096 else
1116 { 1097 {
1117 row = screen.cur.row;
1118
1119 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1098 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1120 ROW(row).l = ncol; 1099 ROW(screen.cur.row).l = ncol;
1121 1100
1122 scr_gotorc (0, 0, R_RELATIVE); 1101 scr_gotorc (0, 0, R_RELATIVE);
1123 scr_insdel_chars (1, DELETE); 1102 scr_insdel_chars (1, DELETE);
1124 scr_gotorc (0, ncol - 1, R_RELATIVE); 1103 scr_gotorc (0, ncol - 1, R_RELATIVE);
1125 } 1104 }
… …
1135{ 1114{
1136 want_refresh = 1; 1115 want_refresh = 1;
1137 ZERO_SCROLLBACK (); 1116 ZERO_SCROLLBACK ();
1138 1117
1139 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1118 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1140 MAX_IT (screen.cur.col, 0); 1119 clamp_it (screen.cur.col, 0, ncol - 1);
1141 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1142 1120
1143 screen.flags &= ~Screen_WrapNext; 1121 screen.flags &= ~Screen_WrapNext;
1144 1122
1145 if (relative & R_RELATIVE) 1123 if (relative & R_RELATIVE)
1146 { 1124 {
… …
1164 else 1142 else
1165 { 1143 {
1166 if (screen.flags & Screen_Relative) 1144 if (screen.flags & Screen_Relative)
1167 { /* relative origin mode */ 1145 { /* relative origin mode */
1168 screen.cur.row = row + screen.tscroll; 1146 screen.cur.row = row + screen.tscroll;
1169 MIN_IT (screen.cur.row, screen.bscroll); 1147 min_it (screen.cur.row, screen.bscroll);
1170 } 1148 }
1171 else 1149 else
1172 screen.cur.row = row; 1150 screen.cur.row = row;
1173 } 1151 }
1174 1152
1175 MAX_IT (screen.cur.row, 0); 1153 clamp_it (screen.cur.row, 0, nrow - 1);
1176 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1177} 1154}
1178 1155
1179/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
1180/* 1157/*
1181 * direction should be UP or DN 1158 * direction should be UP or DN
… …
1196 || (screen.cur.row == screen.tscroll && direction == DN)) 1173 || (screen.cur.row == screen.tscroll && direction == DN))
1197 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1174 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1198 else 1175 else
1199 screen.cur.row += dirn; 1176 screen.cur.row += dirn;
1200 1177
1201 MAX_IT (screen.cur.row, 0); 1178 clamp_it (screen.cur.row, 0, nrow - 1);
1202 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1203 selection_check (0); 1179 selection_check (0);
1204} 1180}
1205 1181
1206/* ------------------------------------------------------------------------- */ 1182/* ------------------------------------------------------------------------- */
1207/* 1183/*
… …
1211 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1187 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1212 */ 1188 */
1213void 1189void
1214rxvt_term::scr_erase_line (int mode) 1190rxvt_term::scr_erase_line (int mode)
1215{ 1191{
1216 unsigned int row, col, num; 1192 unsigned int col, num;
1217 1193
1218 want_refresh = 1; 1194 want_refresh = 1;
1219 ZERO_SCROLLBACK (); 1195 ZERO_SCROLLBACK ();
1220 1196
1221 selection_check (1); 1197 selection_check (1);
1222 1198
1223 row = screen.cur.row; 1199 line_t &line = ROW(screen.cur.row);
1224 1200
1225 switch (mode) 1201 switch (mode)
1226 { 1202 {
1227 case 0: /* erase to end of line */ 1203 case 0: /* erase to end of line */
1228 col = screen.cur.col; 1204 col = screen.cur.col;
1229 num = ncol - col; 1205 num = ncol - col;
1230 MIN_IT (ROW(row).l, (int16_t)col); 1206 min_it (line.l, col);
1231 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1207 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1232 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1208 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1233 CLEAR_SELECTION (); 1209 CLEAR_SELECTION ();
1234 break; 1210 break;
1235 case 1: /* erase to beginning of line */ 1211 case 1: /* erase to beginning of line */
… …
1240 CLEAR_SELECTION (); 1216 CLEAR_SELECTION ();
1241 break; 1217 break;
1242 case 2: /* erase whole line */ 1218 case 2: /* erase whole line */
1243 col = 0; 1219 col = 0;
1244 num = ncol; 1220 num = ncol;
1245 ROW(row).l = 0; 1221 line.l = 0;
1246 if (selection.beg.row <= screen.cur.row 1222 if (selection.beg.row <= screen.cur.row
1247 && selection.end.row >= screen.cur.row) 1223 && selection.end.row >= screen.cur.row)
1248 CLEAR_SELECTION (); 1224 CLEAR_SELECTION ();
1249 break; 1225 break;
1250 default: 1226 default:
1251 return; 1227 return;
1252 } 1228 }
1253 1229
1254 scr_blank_line (ROW(row), col, num, rstyle); 1230 scr_blank_line (line, col, num, rstyle);
1255} 1231}
1256 1232
1257/* ------------------------------------------------------------------------- */ 1233/* ------------------------------------------------------------------------- */
1258/* 1234/*
1259 * Erase part of whole of the screen 1235 * Erase part of whole of the screen
… …
1302 CLEAR_SELECTION (); 1278 CLEAR_SELECTION ();
1303 1279
1304 if (row >= nrow) /* Out Of Bounds */ 1280 if (row >= nrow) /* Out Of Bounds */
1305 return; 1281 return;
1306 1282
1307 MIN_IT (num, (nrow - row)); 1283 min_it (num, nrow - row);
1308 1284
1309 if (rstyle & (RS_RVid | RS_Uline)) 1285 if (rstyle & (RS_RVid | RS_Uline))
1310 ren = (rend_t) ~RS_None; 1286 ren = (rend_t) ~RS_None;
1311 else if (GET_BASEBG (rstyle) == Color_bg) 1287 else if (GET_BASEBG (rstyle) == Color_bg)
1312 { 1288 {
… …
1314 CLEAR_ROWS (row, num); 1290 CLEAR_ROWS (row, num);
1315 } 1291 }
1316 else 1292 else
1317 { 1293 {
1318 ren = rstyle & (RS_fgMask | RS_bgMask); 1294 ren = rstyle & (RS_fgMask | RS_bgMask);
1319 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1295 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1320 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1296 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1321 ERASE_ROWS (row, num); 1297 ERASE_ROWS (row, num);
1322 gcvalue.foreground = pix_colors[Color_fg]; 1298 gcvalue.foreground = pix_colors[Color_fg];
1323 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1299 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1324 } 1300 }
1325 1301
1326 for (; num--; row++) 1302 for (; num--; row++)
1327 { 1303 {
1304 ROW (row).l = 0;
1328 scr_blank_screen_mem (ROW (row), rstyle); 1305 scr_blank_screen_mem (ROW (row), rstyle);
1329 ROW (row).l = 0;
1330 scr_blank_line (drawn[row], 0, ncol, ren); 1306 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1331 } 1307 }
1332} 1308}
1333 1309
1334#if ENABLE_FRILLS 1310#if ENABLE_FRILLS
1335void 1311void
… …
1420 return; 1396 return;
1421 1397
1422 scr_do_wrap (); 1398 scr_do_wrap ();
1423 1399
1424 selection_check (1); 1400 selection_check (1);
1425 MIN_IT (count, (ncol - screen.cur.col)); 1401 min_it (count, ncol - screen.cur.col);
1426 1402
1427 row = screen.cur.row; 1403 row = screen.cur.row;
1428 1404
1429 line_t *line = &ROW(row); 1405 line_t *line = &ROW(row);
1430 1406
… …
1438 } 1414 }
1439 1415
1440 if (!line->is_longer ()) 1416 if (!line->is_longer ())
1441 { 1417 {
1442 line->l += count; 1418 line->l += count;
1443 MIN_IT (line->l, ncol); 1419 min_it (line->l, ncol);
1444 } 1420 }
1445 1421
1446 if (selection.op && current_screen == selection.screen 1422 if (selection.op && current_screen == selection.screen
1447 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1423 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1448 { 1424 {
… …
1509 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1485 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1510 */ 1486 */
1511void 1487void
1512rxvt_term::scr_scroll_region (int top, int bot) 1488rxvt_term::scr_scroll_region (int top, int bot)
1513{ 1489{
1514 MAX_IT (top, 0); 1490 max_it (top, 0);
1515 MIN_IT (bot, (int)nrow - 1); 1491 min_it (bot, nrow - 1);
1516 1492
1517 if (top > bot) 1493 if (top > bot)
1518 return; 1494 return;
1519 1495
1520 screen.tscroll = top; 1496 screen.tscroll = top;
… …
1618 XGCValues gcvalue; 1594 XGCValues gcvalue;
1619 1595
1620 if (rvideo != mode) 1596 if (rvideo != mode)
1621 { 1597 {
1622 rvideo = mode; 1598 rvideo = mode;
1623 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1599 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1624#if XPM_BACKGROUND 1600#if XPM_BACKGROUND
1625 if (bgPixmap.pixmap == None) 1601 if (bgPixmap.pixmap == None)
1626#endif 1602#endif
1627#if TRANSPARENT 1603#if TRANSPARENT
1628 if (! (options & Opt_transparent) || am_transparent == 0) 1604 if (! OPTION (Opt_transparent) || am_transparent == 0)
1629#endif 1605#endif
1630 XSetWindowBackground (display->display, vt, 1606 XSetWindowBackground (display->display, vt,
1631 pix_colors[Color_bg]); 1607 pix_colors[Color_bg]);
1632 1608
1633 gcvalue.foreground = pix_colors[Color_fg]; 1609 gcvalue.foreground = pix_colors[Color_fg];
… …
1724 bool found = false; 1700 bool found = false;
1725 1701
1726 for (int i = 0; i < nrow; i++) 1702 for (int i = 0; i < nrow; i++)
1727 { 1703 {
1728 int col = 0; 1704 int col = 0;
1729 rend_t *drp = drawn[i].r; 1705 rend_t *drp = drawn_buf[i].r;
1730 1706
1731 for (; col < ncol; col++, drp++) 1707 for (; col < ncol; col++, drp++)
1732 if ((*drp & mask) == value) 1708 if ((*drp & mask) == value)
1733 { 1709 {
1734 found = true; 1710 found = true;
… …
1752rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1728rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1753{ 1729{
1754 int i; 1730 int i;
1755 row_col_t rc[RC_COUNT]; 1731 row_col_t rc[RC_COUNT];
1756 1732
1757 if (!drawn) /* sanity check */ 1733 if (!drawn_buf) /* sanity check */
1758 return; 1734 return;
1759 1735
1760#ifndef NO_SLOW_LINK_SUPPORT 1736#ifndef NO_SLOW_LINK_SUPPORT
1761 if (refresh_type == FAST_REFRESH && !display->is_local) 1737 if (refresh_type == FAST_REFRESH && !display->is_local)
1762 { 1738 {
1763 y = 0; 1739 y = 0;
1764 eheight = height; 1740 eheight = height;
1765 } 1741 }
1766#endif
1767
1768#ifdef DEBUG_STRICT
1769 x = max (x, 0);
1770 x = min (x, (int)width);
1771 y = max (y, 0);
1772 y = min (y, (int)height);
1773#endif 1742#endif
1774 1743
1775 /* round down */ 1744 /* round down */
1776 rc[PART_BEG].col = Pixel2Col (x); 1745 rc[PART_BEG].col = Pixel2Col (x);
1777 rc[PART_BEG].row = Pixel2Row (y); 1746 rc[PART_BEG].row = Pixel2Row (y);
… …
1780 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1749 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1781 1750
1782 /* sanity checks */ 1751 /* sanity checks */
1783 for (i = PART_BEG; i < RC_COUNT; i++) 1752 for (i = PART_BEG; i < RC_COUNT; i++)
1784 { 1753 {
1785 MIN_IT (rc[i].col, ncol - 1); 1754 min_it (rc[i].col, ncol - 1);
1786 MIN_IT (rc[i].row, nrow - 1); 1755 min_it (rc[i].row, nrow - 1);
1787 } 1756 }
1788 1757
1789 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1758 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); 1759 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1791 1760
1792 if (refresh) 1761 if (refresh)
1793 scr_refresh (SLOW_REFRESH); 1762 scr_refresh (SLOW_REFRESH);
1794} 1763}
1795 1764
… …
1856} 1825}
1857 1826
1858int 1827int
1859rxvt_term::scr_changeview (unsigned int oldviewstart) 1828rxvt_term::scr_changeview (unsigned int oldviewstart)
1860{ 1829{
1830 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831
1861 if (view_start != oldviewstart) 1832 if (view_start != oldviewstart)
1862 { 1833 {
1863 want_refresh = 1; 1834 want_refresh = 1;
1864 num_scr -= (view_start - oldviewstart); 1835 num_scr -= (view_start - oldviewstart);
1865 } 1836 }
… …
1873{ 1844{
1874#ifndef NO_BELL 1845#ifndef NO_BELL
1875 1846
1876# ifndef NO_MAPALERT 1847# ifndef NO_MAPALERT
1877# ifdef MAPALERT_OPTION 1848# ifdef MAPALERT_OPTION
1878 if (options & Opt_mapAlert) 1849 if (OPTION (Opt_mapAlert))
1879# endif 1850# endif
1880 XMapWindow (display->display, parent[0]); 1851 XMapWindow (display->display, parent[0]);
1881# endif 1852# endif
1882 1853
1883 if (options & Opt_visualBell) 1854 if (OPTION (Opt_visualBell))
1884 { 1855 {
1885 scr_rvideo_mode (!rvideo); /* refresh also done */ 1856 scr_rvideo_mode (!rvideo); /* refresh also done */
1886 rxvt_usleep (VISUAL_BELL_DURATION); 1857 rxvt_usleep (VISUAL_BELL_DURATION);
1887 scr_rvideo_mode (!rvideo); /* refresh also done */ 1858 scr_rvideo_mode (!rvideo); /* refresh also done */
1888 } 1859 }
… …
1979 1950
1980#if XPM_BACKGROUND 1951#if XPM_BACKGROUND
1981 must_clear |= bgPixmap.pixmap != None; 1952 must_clear |= bgPixmap.pixmap != None;
1982#endif 1953#endif
1983#if TRANSPARENT 1954#if TRANSPARENT
1984 must_clear |= (options & Opt_transparent) && am_transparent; 1955 must_clear |= OPTION (Opt_transparent) && am_transparent;
1985#endif 1956#endif
1986 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1957 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1987 1958
1988 /* 1959 /*
1989 * B: reverse any characters which are selected 1960 * B: reverse any characters which are selected
… …
2013 1984
2014 crp = &ROW(screen.cur.row).r[col]; 1985 crp = &ROW(screen.cur.row).r[col];
2015 1986
2016 if (showcursor && focus) 1987 if (showcursor && focus)
2017 { 1988 {
2018 if (options & Opt_cursorUnderline) 1989 if (OPTION (Opt_cursorUnderline))
2019 *crp ^= RS_Uline; 1990 *crp ^= RS_Uline;
2020 else 1991 else
2021 { 1992 {
2022 *crp ^= RS_RVid; 1993 *crp ^= RS_RVid;
2023 1994
… …
2025 cc1 = *crp & (RS_fgMask | RS_bgMask); 1996 cc1 = *crp & (RS_fgMask | RS_bgMask);
2026 if (ISSET_PIXCOLOR (Color_cursor)) 1997 if (ISSET_PIXCOLOR (Color_cursor))
2027 ccol1 = Color_cursor; 1998 ccol1 = Color_cursor;
2028 else 1999 else
2029#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2000#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2030 ccol1 = GET_FGCOLOR (rstyle); 2001 ccol1 = fgcolor_of (rstyle);
2031#else 2002#else
2032 ccol1 = Color_fg; 2003 ccol1 = Color_fg;
2033#endif 2004#endif
2034 if (ISSET_PIXCOLOR (Color_cursor2)) 2005 if (ISSET_PIXCOLOR (Color_cursor2))
2035 ccol2 = Color_cursor2; 2006 ccol2 = Color_cursor2;
2036 else 2007 else
2037#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2008#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2038 ccol2 = GET_BGCOLOR (rstyle); 2009 ccol2 = bgcolor_of (rstyle);
2039#else 2010#else
2040 ccol2 = Color_bg; 2011 ccol2 = Color_bg;
2041#endif 2012#endif
2042 *crp = SET_FGCOLOR (*crp, ccol1); 2013 *crp = SET_FGCOLOR (*crp, ccol1);
2043 *crp = SET_BGCOLOR (*crp, ccol2); 2014 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2053 if (screen.cur.row + view_start != ocrow 2024 if (screen.cur.row + view_start != ocrow
2054 || screen.cur.col != oldcursor.col) 2025 || screen.cur.col != oldcursor.col)
2055 { 2026 {
2056 if (ocrow < nrow 2027 if (ocrow < nrow
2057 && oldcursor.col < ncol) 2028 && oldcursor.col < ncol)
2058 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2029 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2059 2030
2060 if (focus || !showcursor) 2031 if (focus || !showcursor)
2061 oldcursor.row = -1; 2032 oldcursor.row = -1;
2062 else 2033 else
2063 setoldcursor = 1; 2034 setoldcursor = 1;
… …
2076 oldcursor.col = screen.cur.col; 2047 oldcursor.col = screen.cur.col;
2077 } 2048 }
2078 } 2049 }
2079 } 2050 }
2080 2051
2052 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2081#if ENABLE_OVERLAY 2053#if ENABLE_OVERLAY
2082 scr_swap_overlay (); 2054 scr_swap_overlay ();
2083#endif 2055#endif
2084 2056
2085#ifndef NO_SLOW_LINK_SUPPORT 2057#ifndef NO_SLOW_LINK_SUPPORT
… …
2102 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2074 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2103 { 2075 {
2104 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2076 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2105 { 2077 {
2106 line_t s = ROW(row - view_start); 2078 line_t s = ROW(row - view_start);
2107 line_t d = drawn[row]; 2079 line_t d = drawn_buf[row];
2108 line_t d2 = drawn[row + i]; 2080 line_t d2 = drawn_buf[row + i];
2109 2081
2110 for (nits = 0, col = ncol; col--; ) 2082 for (nits = 0, col = ncol; col--; )
2111 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2083 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2112 nits--; 2084 nits--;
2113 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2085 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2131 2103
2132 if (len != -1) 2104 if (len != -1)
2133 { 2105 {
2134 /* also comes here at end if needed because of >= above */ 2106 /* also comes here at end if needed because of >= above */
2135 if (wlen < len) 2107 if (wlen < len)
2136 SWAP_IT (wlen, len, int); 2108 ::swap (wlen, len);
2137 2109
2138 XCopyArea (display->display, vt, vt, 2110 XCopyArea (display->display, vt, vt,
2139 gc, 0, Row2Pixel (len + i), 2111 gc, 0, Row2Pixel (len + i),
2140 (unsigned int)TermWin_TotalWidth (), 2112 (unsigned int)this->width,
2141 (unsigned int)Height2Pixel (wlen - len + 1), 2113 (unsigned int)Height2Pixel (wlen - len + 1),
2142 0, Row2Pixel (len)); 2114 0, Row2Pixel (len));
2143 len = -1; 2115 len = -1;
2144 } 2116 }
2145 } 2117 }
… …
2151 */ 2123 */
2152 for (row = 0; row < nrow; row++) 2124 for (row = 0; row < nrow; row++)
2153 { 2125 {
2154 text_t *stp = ROW(row - view_start).t; 2126 text_t *stp = ROW(row - view_start).t;
2155 rend_t *srp = ROW(row - view_start).r; 2127 rend_t *srp = ROW(row - view_start).r;
2156 text_t *dtp = drawn[row].t; 2128 text_t *dtp = drawn_buf[row].t;
2157 rend_t *drp = drawn[row].r; 2129 rend_t *drp = drawn_buf[row].r;
2158 2130
2159 /* 2131 /*
2160 * E2: OK, now the real pass 2132 * E2: OK, now the real pass
2161 */ 2133 */
2162 int ypixel = (int)Row2Pixel (row); 2134 int ypixel = (int)Row2Pixel (row);
… …
2224 count++, i--; 2196 count++, i--;
2225 2197
2226 /* 2198 /*
2227 * Determine the attributes for the string 2199 * Determine the attributes for the string
2228 */ 2200 */
2229 int fore = GET_FGCOLOR (rend); // desired foreground 2201 int fore = fgcolor_of (rend); // desired foreground
2230 int back = GET_BGCOLOR (rend); // desired background 2202 int back = bgcolor_of (rend); // desired background
2231 2203
2232 // only do special processing if any attributes are set, which is rare 2204 // 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)) 2205 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2234 { 2206 {
2235#if ENABLE_STYLES 2207#if ENABLE_STYLES
2236 // force redraw after "careful" characters to avoid pixel droppings 2208 // force redraw after "careful" characters to avoid pixel droppings
2237 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2209 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2273 fore = Color_UL; 2245 fore = Color_UL;
2274#endif 2246#endif
2275 2247
2276 if (invert) 2248 if (invert)
2277 { 2249 {
2278 SWAP_IT (fore, back, int); 2250 ::swap (fore, back);
2279 2251
2280#ifndef NO_BOLD_UNDERLINE_REVERSE 2252#ifndef NO_BOLD_UNDERLINE_REVERSE
2281 if (ISSET_PIXCOLOR (Color_RV)) 2253 if (ISSET_PIXCOLOR (Color_RV))
2282 back = Color_RV; 2254 back = Color_RV;
2283 2255
… …
2348 } /* for (row....) */ 2320 } /* for (row....) */
2349 2321
2350#if ENABLE_OVERLAY 2322#if ENABLE_OVERLAY
2351 scr_swap_overlay (); 2323 scr_swap_overlay ();
2352#endif 2324#endif
2325 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2353 2326
2354 /* 2327 /*
2355 * G: cleanup cursor and display outline cursor if necessary 2328 * G: cleanup cursor and display outline cursor if necessary
2356 */ 2329 */
2357 if (showcursor) 2330 if (showcursor)
2358 { 2331 {
2359 if (focus) 2332 if (focus)
2360 { 2333 {
2361 if (options & Opt_cursorUnderline) 2334 if (OPTION (Opt_cursorUnderline))
2362 *crp ^= RS_Uline; 2335 *crp ^= RS_Uline;
2363 else 2336 else
2364 { 2337 {
2365 *crp ^= RS_RVid; 2338 *crp ^= RS_RVid;
2366#ifndef NO_CURSORCOLOR 2339#ifndef NO_CURSORCOLOR
… …
2375 2348
2376 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2349 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2377 col--; 2350 col--;
2378 2351
2379 while (col + cursorwidth < ncol 2352 while (col + cursorwidth < ncol
2380 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2353 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2381 cursorwidth++; 2354 cursorwidth++;
2382 2355
2383#ifndef NO_CURSORCOLOR 2356#ifndef NO_CURSORCOLOR
2384 if (ISSET_PIXCOLOR (Color_cursor)) 2357 if (ISSET_PIXCOLOR (Color_cursor))
2385 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2358 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2417 2390
2418void 2391void
2419rxvt_term::scr_remap_chars () 2392rxvt_term::scr_remap_chars ()
2420{ 2393{
2421 for (int i = total_rows; i--; ) 2394 for (int i = total_rows; i--; )
2422 scr_remap_chars (save[i]); 2395 scr_remap_chars (row_buf [i]);
2423 2396
2424 for (int i = nrow; i--; ) 2397 for (int i = nrow; i--; )
2425 { 2398 {
2426 scr_remap_chars (drawn[i]); 2399 scr_remap_chars (drawn_buf [i]);
2427 scr_remap_chars (swap_save[i]); 2400 scr_remap_chars (swap_buf [i]);
2428 } 2401 }
2429} 2402}
2430 2403
2431void 2404void
2432rxvt_term::scr_recolour () 2405rxvt_term::scr_recolour ()
… …
2485 2458
2486#if ENABLE_FRILLS 2459#if ENABLE_FRILLS
2487 if (selection.rect) 2460 if (selection.rect)
2488 { 2461 {
2489 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2462 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2463 {
2464 text_t *stp = ROW(row).t;
2465 rend_t *srp = ROW(row).r;
2466
2490 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2467 for (col = selection.beg.col; col < selection.end.col; col++)
2491 srp[col] ^= RS_RVid; 2468 srp[col] ^= RS_RVid;
2469
2470 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2471 srp[col] ^= RS_RVid | RS_Uline;
2472
2473 if (++col < selection.end.col)
2474 srp[col] ^= RS_RVid | RS_Uline;
2475 }
2492 } 2476 }
2493 else 2477 else
2494#endif 2478#endif
2495 { 2479 {
2496 if (selection.beg.row >= -view_start) 2480 if (selection.beg.row >= -view_start)
… …
2499 row = selection.beg.row; 2483 row = selection.beg.row;
2500 } 2484 }
2501 else 2485 else
2502 { 2486 {
2503 col = 0; 2487 col = 0;
2504 row = view_start; 2488 row = -view_start;
2505 } 2489 }
2506 2490
2507 for (; row < min (selection.end.row, view_end); row++, col = 0) 2491 for (; row < min (selection.end.row, view_end); row++, col = 0)
2508 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2492 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2509 srp[col] ^= RS_RVid; 2493 srp[col] ^= RS_RVid;
… …
2529 char r1[] = "\n"; 2513 char r1[] = "\n";
2530 2514
2531 for (row = saveLines - nsaved; 2515 for (row = saveLines - nsaved;
2532 row < saveLines + nrow - 1; row++) 2516 row < saveLines + nrow - 1; row++)
2533 { 2517 {
2534 width = save[row].l >= 0 ? save[row].l 2518 width = row_buf[row].l >= 0 ? row_buf[row].l
2535 : ncol; 2519 : ncol;
2536 for (towrite = width; towrite; towrite -= wrote) 2520 for (towrite = width; towrite; towrite -= wrote)
2537 { 2521 {
2538 wrote = write (fd, & (save[row].t[width - towrite]), 2522 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2539 towrite); 2523 towrite);
2540 if (wrote < 0) 2524 if (wrote < 0)
2541 return; /* XXX: death, no report */ 2525 return; /* XXX: death, no report */
2542 } 2526 }
2543 if (save[row].l >= 0) 2527 if (row_buf[row].l >= 0)
2544 if (write (fd, r1, 1) <= 0) 2528 if (write (fd, r1, 1) <= 0)
2545 return; /* XXX: death, no report */ 2529 return; /* XXX: death, no report */
2546 } 2530 }
2547} 2531}
2548#endif 2532#endif
… …
2580/* ------------------------------------------------------------------------- */ 2564/* ------------------------------------------------------------------------- */
2581/* 2565/*
2582 * Paste a selection direct to the command fd 2566 * Paste a selection direct to the command fd
2583 */ 2567 */
2584void 2568void
2585rxvt_term::paste (unsigned char *data, unsigned int len) 2569rxvt_term::paste (char *data, unsigned int len)
2586{ 2570{
2587 /* convert normal newline chars into common keyboard Return key sequence */ 2571 /* convert normal newline chars into common keyboard Return key sequence */
2588 for (unsigned int i = 0; i < len; i++) 2572 for (unsigned int i = 0; i < len; i++)
2589 if (data[i] == C0_LF) 2573 if (data[i] == C0_LF)
2590 data[i] = C0_CR; 2574 data[i] = C0_CR;
… …
2734 { 2718 {
2735 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2719 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2736 char *s = rxvt_wcstombs (w); 2720 char *s = rxvt_wcstombs (w);
2737 free (w); 2721 free (w);
2738 // TODO: strlen == only the first element will be converted. well... 2722 // TODO: strlen == only the first element will be converted. well...
2739 paste ((unsigned char *)s, strlen (s)); 2723 paste (s, strlen (s));
2740 free (s); 2724 free (s);
2741 } 2725 }
2742 else 2726 else
2743#endif 2727#endif
2744 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2728 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2745 && cl) 2729 && cl)
2746 { 2730 {
2747 for (int i = 0; i < cr; i++) 2731 for (int i = 0; i < cr; i++)
2748 paste ((unsigned char *)cl[i], strlen (cl[i])); 2732 paste (cl[i], strlen (cl[i]));
2749 2733
2750 XFreeStringList (cl); 2734 XFreeStringList (cl);
2751 } 2735 }
2752 else 2736 else
2753 paste (ct.value, ct.nitems); // paste raw 2737 paste ((char *)ct.value, ct.nitems); // paste raw
2754 2738
2755bailout: 2739bailout:
2756 XFree (ct.value); 2740 XFree (ct.value);
2757 2741
2758 if (selection_wait == Sel_normal) 2742 if (selection_wait == Sel_normal)
… …
2796 return; /* outside window */ 2780 return; /* outside window */
2797 2781
2798 if (selection.text) 2782 if (selection.text)
2799 { /* internal selection */ 2783 { /* internal selection */
2800 char *str = rxvt_wcstombs (selection.text, selection.len); 2784 char *str = rxvt_wcstombs (selection.text, selection.len);
2801 paste ((unsigned char *)str, strlen (str)); 2785 paste (str, strlen (str));
2802 free (str); 2786 free (str);
2803 return; 2787 return;
2804 } 2788 }
2805 else 2789 else
2806 { 2790 {
… …
2898 selection.op = SELECTION_DONE; 2882 selection.op = SELECTION_DONE;
2899 2883
2900 if (selection.clicks == 4) 2884 if (selection.clicks == 4)
2901 return; /* nothing selected, go away */ 2885 return; /* nothing selected, go away */
2902 2886
2887 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2888 return;
2889
2903 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2890 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2904 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2891 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2905 2892
2906 int ofs = 0; 2893 int ofs = 0;
2907 int extra = 0; 2894 int extra = 0;
… …
2923#endif 2910#endif
2924 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2911 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2925 2912
2926 col = max (col, 0); 2913 col = max (col, 0);
2927 2914
2928 if (row == selection.end.row || selection.rect) 2915 if (row == selection.end.row
2916#if ENABLE_FRILLS
2917 || selection.rect
2918#endif
2919 )
2929 end_col = min (end_col, selection.end.col); 2920 min_it (end_col, selection.end.col);
2930 2921
2931 t = ROW(row).t + col; 2922 t = ROW(row).t + col;
2932 for (; col < end_col; col++) 2923 for (; col < end_col; col++)
2933 { 2924 {
2934 if (*t == NOCHAR) 2925 if (*t == NOCHAR)
… …
2952#endif 2943#endif
2953 else 2944 else
2954 new_selection_text[ofs++] = *t++; 2945 new_selection_text[ofs++] = *t++;
2955 } 2946 }
2956 2947
2948#if ENABLE_FRILLS
2949 if (selection.rect)
2950 {
2951 while (ofs
2952 && new_selection_text[ofs - 1] != C0_LF
2953 && unicode::is_space (new_selection_text[ofs - 1]))
2954 --ofs;
2955
2956 new_selection_text[ofs++] = C0_LF;
2957 }
2958 else
2959#endif
2957 if (!ROW(row).is_longer () && row != selection.end.row) 2960 if (!ROW(row).is_longer () && row != selection.end.row)
2958 new_selection_text[ofs++] = C0_LF; 2961 new_selection_text[ofs++] = C0_LF;
2959 } 2962 }
2960 2963
2961 if (end_col != selection.end.col) 2964 if (end_col != selection.end.col)
2962 new_selection_text[ofs++] = C0_LF; 2965 new_selection_text[ofs++] = C0_LF;
2963 2966
… …
2973 2976
2974 // we usually allocate much more than necessary, so realloc it smaller again 2977 // we usually allocate much more than necessary, so realloc it smaller again
2975 selection.len = ofs; 2978 selection.len = ofs;
2976 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2979 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2977 2980
2981 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2982 return;
2983
2984 selection_grab (tm);
2985}
2986
2987bool
2988rxvt_term::selection_grab (Time tm)
2989{
2990 selection_time = tm;
2991
2978 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 2992 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2979 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 2993 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2994 {
2980 display->set_selection_owner (this); 2995 display->set_selection_owner (this);
2996 return true;
2997 }
2981 else 2998 else
2982 rxvt_warn ("can't get primary selection, ignoring.\n"); 2999 return false;
2983 3000
2984#if 0 3001#if 0
2985 XTextProperty ct; 3002 XTextProperty ct;
2986 3003
2987 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3004 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2988 { 3005 {
2989 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3006 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2990 XFree (ct.value); 3007 XFree (ct.value);
2991 } 3008 }
2992#endif 3009#endif
2993
2994 selection_time = tm;
2995} 3010}
2996 3011
2997/* ------------------------------------------------------------------------- */ 3012/* ------------------------------------------------------------------------- */
2998/* 3013/*
2999 * Mark or select text based upon number of clicks: 1, 2, or 3 3014 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3025 want_refresh = 1; 3040 want_refresh = 1;
3026 3041
3027 selection.mark.row = row - view_start; 3042 selection.mark.row = row - view_start;
3028 selection.mark.col = col; 3043 selection.mark.col = col;
3029 3044
3030 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); 3045 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3031 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); 3046 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3032 3047
3033 while (selection.mark.col > 0 3048 while (selection.mark.col > 0
3034 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3049 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3035 --selection.mark.col; 3050 --selection.mark.col;
3036 3051
… …
3141 * flag == 2 ==> button 3 motion 3156 * flag == 2 ==> button 3 motion
3142 */ 3157 */
3143void 3158void
3144rxvt_term::selection_extend (int x, int y, int flag) 3159rxvt_term::selection_extend (int x, int y, int flag)
3145{ 3160{
3146 int col = min (max (Pixel2Col (x), 0), ncol); 3161 int col = clamp (Pixel2Col (x), 0, ncol);
3147 int row = min (max (Pixel2Row (y), 0), nrow - 1); 3162 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3148 3163
3149 /* 3164 /*
3150 * If we're selecting characters (single click) then we must check first 3165 * If we're selecting characters (single click) then we must check first
3151 * if we are at the same place as the original mark. If we are then 3166 * if we are at the same place as the original mark. If we are then
3152 * select nothing. Otherwise, if we're to the right of the mark, you have to 3167 * select nothing. Otherwise, if we're to the right of the mark, you have to
… …
3308 else if (selection.clicks == 2) 3323 else if (selection.clicks == 2)
3309 { 3324 {
3310 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3325 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3311 selection.end.col--; 3326 selection.end.col--;
3312 3327
3328 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3329 {
3313 selection_delimit_word (UP, &selection.beg, &selection.beg); 3330 selection_delimit_word (UP, &selection.beg, &selection.beg);
3314 selection_delimit_word (DN, &selection.end, &selection.end); 3331 selection_delimit_word (DN, &selection.end, &selection.end);
3332 }
3315 } 3333 }
3316 else if (selection.clicks == 3) 3334 else if (selection.clicks == 3)
3317 { 3335 {
3318#if ENABLE_FRILLS 3336#if ENABLE_FRILLS
3319 if (options & Opt_tripleclickwords) 3337 if (OPTION (Opt_tripleclickwords))
3320 { 3338 {
3321 selection_delimit_word (UP, &selection.beg, &selection.beg); 3339 selection_delimit_word (UP, &selection.beg, &selection.beg);
3322 3340
3323 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3341 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3324 { 3342 {
… …
3365 } 3383 }
3366 } 3384 }
3367 3385
3368#if ENABLE_FRILLS 3386#if ENABLE_FRILLS
3369 if (selection.rect && selection.beg.col > selection.end.col) 3387 if (selection.rect && selection.beg.col > selection.end.col)
3370 SWAP_IT (selection.beg.col, selection.end.col, int); 3388 ::swap (selection.beg.col, selection.end.col);
3371#endif 3389#endif
3372} 3390}
3373 3391
3374#if ENABLE_FRILLS 3392#if ENABLE_FRILLS
3375void 3393void
… …
3385 { 3403 {
3386 stp = ROW(end_row).t; 3404 stp = ROW(end_row).t;
3387 3405
3388 while (--end_col >= 0) 3406 while (--end_col >= 0)
3389 { 3407 {
3390 if (stp[end_col] != ' ' 3408 if (stp[end_col] != NOCHAR
3391 && stp[end_col] != '\t' 3409 && !unicode::is_space (stp[end_col]))
3392 && stp[end_col] != NOCHAR)
3393 break; 3410 break;
3394 } 3411 }
3395 3412
3396 if (end_col >= 0 3413 if (end_col >= 0
3397 || !ROW(end_row - 1).is_longer ()) 3414 || !ROW(end_row - 1).is_longer ())
… …
3573 */ 3590 */
3574void 3591void
3575rxvt_term::pixel_position (int *x, int *y) 3592rxvt_term::pixel_position (int *x, int *y)
3576{ 3593{
3577 *x = Pixel2Col (*x); 3594 *x = Pixel2Col (*x);
3578 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3595 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3579 *y = Pixel2Row (*y); 3596 *y = Pixel2Row (*y);
3580 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3597 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3581} 3598}
3582 3599
3583/* ------------------------------------------------------------------------- */ 3600/* ------------------------------------------------------------------------- */
3584#ifdef USE_XIM 3601#ifdef USE_XIM
3585void 3602void
… …
3596 3613
3597#if ENABLE_OVERLAY 3614#if ENABLE_OVERLAY
3598void 3615void
3599rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3616rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3600{ 3617{
3601 if (nrow < 3 || ncol < 3) 3618 if (nrow < 1 || ncol < 1)
3602 return; 3619 return;
3603 3620
3604 want_refresh = 1; 3621 want_refresh = 1;
3605 3622
3606 scr_overlay_off (); 3623 scr_overlay_off ();
3607 3624
3608 if (x < 0) x = ncol - w; 3625 if (x < 0) x = ncol - w;
3609 if (y < 0) y = nrow - h; 3626 if (y < 0) y = nrow - h;
3610 3627
3611 // make space for border 3628 // make space for border
3612 w += 2; MIN_IT (w, ncol); 3629 w += 2; min_it (w, ncol);
3613 h += 2; MIN_IT (h, nrow); 3630 h += 2; min_it (h, nrow);
3614 3631
3615 x -= 1; MAX_IT (x, 0); 3632 x -= 1; clamp_it (x, 0, ncol - w);
3616 y -= 1; MAX_IT (y, 0); 3633 y -= 1; clamp_it (y, 0, nrow - h);
3617
3618 MIN_IT (x, ncol - w);
3619 MIN_IT (y, nrow - h);
3620 3634
3621 ov_x = x; ov_y = y; 3635 ov_x = x; ov_y = y;
3622 ov_w = w; ov_h = h; 3636 ov_w = w; ov_h = h;
3623 3637
3624 ov_text = new text_t *[h]; 3638 ov_text = new text_t *[h];
… …
3716 for (int y = ov_h; y--; ) 3730 for (int y = ov_h; y--; )
3717 { 3731 {
3718 text_t *t1 = ov_text[y]; 3732 text_t *t1 = ov_text[y];
3719 rend_t *r1 = ov_rend[y]; 3733 rend_t *r1 = ov_rend[y];
3720 3734
3721 text_t *t2 = ROW(y - view_start).t + ov_x; 3735 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3722 rend_t *r2 = ROW(y - view_start).r + ov_x; 3736 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3723 3737
3724 for (int x = ov_w; x--; ) 3738 for (int x = ov_w; x--; )
3725 { 3739 {
3726 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3740 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3727 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3741 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