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.176 by root, Tue Dec 20 20:58:31 2005 UTC vs.
Revision 1.190 by root, Thu Dec 22 15:52:57 2005 UTC

… …
83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 83#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) 84 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) \ 85#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) 86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87 87
88#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
89#define ROW(n) (save [LINENO (n)])
90
91/* 88/*
92 * CLEAR_ROWS : clear <num> rows starting from row <row> 89 * CLEAR_ROWS : clear <num> rows starting from row <row>
93 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 90 * 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 91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
95 */ 92 */
… …
150} 147}
151 148
152/* ------------------------------------------------------------------------- * 149/* ------------------------------------------------------------------------- *
153 * SCREEN INITIALISATION * 150 * SCREEN INITIALISATION *
154 * ------------------------------------------------------------------------- */ 151 * ------------------------------------------------------------------------- */
152
155void 153void
156rxvt_term::scr_reset () 154rxvt_term::scr_reset ()
157{ 155{
158 unsigned int p, q;
159 int k;
160
161#if ENABLE_OVERLAY 156#if ENABLE_OVERLAY
162 scr_overlay_off (); 157 scr_overlay_off ();
163#endif 158#endif
164 159
165 view_start = 0; 160 view_start = 0;
… …
175 return; 170 return;
176 171
177 // we need at least two lines for wrapping to work correctly 172 // we need at least two lines for wrapping to work correctly
178 if (nrow + saveLines < 2) 173 if (nrow + saveLines < 2)
179 { 174 {
175 //TODO//FIXME
180 saveLines++; 176 saveLines++;
181 prev_nrow--; 177 prev_nrow--;
182 nsaved++; 178 nsaved++;
183 } 179 }
184 180
… …
188 total_rows = nrow + saveLines; 184 total_rows = nrow + saveLines;
189 185
190 screen.tscroll = 0; 186 screen.tscroll = 0;
191 screen.bscroll = nrow - 1; 187 screen.bscroll = nrow - 1;
192 188
193 if (!save) 189 if (!row_buf)
194 { 190 {
195 /* 191 /*
196 * first time called so just malloc everything: don't rely on realloc 192 * 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 193 * Note: this is still needed so that all the scrollback lines are NULL
198 */ 194 */
… …
200 term_start = 0; 196 term_start = 0;
201 197
202 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 198 talloc = new rxvt_salloc (ncol * sizeof (text_t));
203 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
204 200
205 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
202 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
207 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209 205
210 for (p = nrow; p--; ) 206 for (int row = nrow; row--; )
211 { 207 {
212 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); 208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 210 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 } 211 }
216 212
217 memset (charsets, 'B', sizeof (charsets)); 213 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 214 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 215 screen.flags = Screen_DefaultFlags;
… …
243 { 239 {
244 /* 240 /*
245 * add or delete rows as appropriate 241 * add or delete rows as appropriate
246 */ 242 */
247 243
248 rxvt_salloc *old_ta; 244 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
249 rxvt_salloc *old_ra; 245 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250 246
247#if 0
251 if (nrow < prev_nrow) 248 if (nrow < prev_nrow)
252 { 249 {
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);
257
258 for (p = nrow; p < prev_nrow; p++) 250 for (int row = nrow; row < prev_nrow; row++)
259 { 251 {
260 lfree (ROW(p));
261 lfree (swap_save[p]); 252 lfree (swap_buf [row]);
262 lfree (drawn[p]); 253 lfree (drawn_buf[row]);
263 } 254 }
255 }
256#endif
264 257
265 /* we have fewer rows so fix up cursor position */ 258 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
266 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 259 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267 261
268 scr_reset_realloc (); /* realloc _last_ */ 262 for (int row = min (nrow, prev_nrow); row--; )
263 {
264 lresize (drawn_buf[row]);
265 lresize (swap_buf [row]);
266 }
267
268 for (int row = prev_nrow; row < nrow; row++)
269 {
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 }
273
274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
269 } 275
270 else if (nrow > prev_nrow) 276 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
271 { 277 int pend = MOD (term_start - nsaved , prev_total_rows);
272 /* add rows */ 278 int q = total_rows; // rewrapped row
273 scr_reset_realloc (); /* realloc _first_ */
274 279
275 int ocol = ncol; 280 if (nsaved)
276 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 281 {
282 // re-wrap lines, this is rather ugly, possibly because I am too dumb
283 // to come up with a lean and mean algorithm.
277 284
278 k = min (nsaved, nrow - prev_nrow); 285 row_col_t ocur = screen.cur;
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
279 287
280 for (p = prev_total_rows; p < total_rows; p++) 288 while (p != pend && q > 0)
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 { 289 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 290 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);
295 screen.cur.row += k;
296 screen.s_cur.row += k;
297 nsaved -= k;
298 }
299
300#ifdef DEBUG_STRICT 291#ifdef DEBUG_STRICT
301 assert (screen.cur.row < nrow); 292 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 293#endif
305 ncol = ocol; // save b/c scr_blank_screen_mem uses this
306 }
307 294
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; 295 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l;
352 297
353 assert (llen >= 0); 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
354
355 while (p && save[p - 1].l < 0)
356 { 299 {
300 p = MOD (p - 1, prev_total_rows);
301
357 --p; 302 plines++;
358 llen += prev_ncol; 303 llen += prev_ncol;
359 } 304 }
360 305
361 int qlines = llen / ncol + 1; 306 int qlines = max (0, (llen - 1) / ncol) + 1;
307
308 // drop partial lines completely
309 if (q < qlines)
310 break;
311
312 q -= qlines;
313
362 int lofs = 0; 314 int lofs = 0;
315 line_t *qline;
363 316
364 q -= qlines; 317 // 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++) 318 for (int qrow = q; qlines--; qrow++)
370 { 319 {
320 qline = row_buf + qrow;
321 lalloc (*qline);
322 qline->set_is_longer ();
323
371 if (qrow >= 0) 324 int qcol = 0;
325
326 // fill a single destination line
327 while (lofs < llen && qcol < ncol)
372 { 328 {
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; 329 int prow = lofs / prev_ncol;
382 int pcol = lofs % prev_ncol; 330 int pcol = lofs % prev_ncol;
383 331
332 prow = MOD (p + prow, prev_total_rows);
333
334 // we only adjust the cursor _row_, as this seems to upset
335 // applications/shells/readline least.
336 if (prow == ocur.row)
337 screen.cur.row = qrow - (total_rows - nrow);
338
339 line_t &pline = old_buf [prow];
340
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 341 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385 342
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); 343 assert (len);
344 assert (pline.t);
400 345
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 346 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 347 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403 348
404 lofs += len; 349 lofs += len;
405 qcol += len; 350 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 } 351 }
411 else
412 lofs += ncol;
413 } 352 }
353
354 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1;
355 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414 } 356 }
357
358 term_start = total_rows - nrow;
359 view_start = 0;
360 nsaved = term_start - q;
361
362 // make sure all terminal lines exist
363 while (nsaved < 0)
364 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
365
366 }
367 else
415 } 368 {
369 // if no scrollback exists (yet), wing, instead of wrap
370
371 for (int row = min (nrow, prev_nrow); row--; )
372 {
373 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
374 line_t &qline = row_buf [row];
416 375
417 free (screen.text); screen.text = tp; 376 qline = pline;
418 free (screen.rend); screen.rend = rp; 377 lresize (qline);
419 free (screen.tlen); screen.tlen = tl; 378 }
420 379
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 380 for (int row = prev_nrow; row < nrow; row++)
381 {
382 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
383 }
384
385 term_start = 0;
386 view_start = 0;
387 }
388
389#ifdef DEBUG_STRICT
390 for (int i = -nsaved; i < nrow; i++)
391 assert (ROW (i).t);
422#endif 392#endif
393
394 free (old_buf);
395 delete old_ta;
396 delete old_ra;
397
398 clamp_it (screen.cur.row, 0, nrow - 1);
399 clamp_it (screen.cur.col, 0, ncol - 1);
423 400
424 if (tabs) 401 if (tabs)
425 free (tabs); 402 free (tabs);
426 } 403 }
427 404
428 prev_nrow = nrow; 405 prev_nrow = nrow;
429 prev_ncol = ncol; 406 prev_ncol = ncol;
430 407
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 408 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 409
433 for (p = 0; p < ncol; p++) 410 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 411 tabs [col] = col % TABSIZE == 0;
435 412
436 tt_winch (); 413 tt_winch ();
437}
438
439void
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} 414}
447 415
448/* ------------------------------------------------------------------------- */ 416/* ------------------------------------------------------------------------- */
449/* 417/*
450 * Free everything. That way malloc debugging can find leakage. 418 * Free everything. That way malloc debugging can find leakage.
… …
453rxvt_term::scr_release () 421rxvt_term::scr_release ()
454{ 422{
455 delete talloc; talloc = 0; 423 delete talloc; talloc = 0;
456 delete ralloc; ralloc = 0; 424 delete ralloc; ralloc = 0;
457 425
458 free (save); 426 free (row_buf);
459 free (swap_save); 427 free (swap_buf);
460 free (drawn); 428 free (drawn_buf);
461 free (buf); 429 free (temp_buf);
462 free (tabs); 430 free (tabs);
431
432 row_buf = 0; // signal that we freed all the arrays
463} 433}
464 434
465/* ------------------------------------------------------------------------- */ 435/* ------------------------------------------------------------------------- */
466/* 436/*
467 * Hard reset 437 * Hard reset
… …
518 set_font_style (); 488 set_font_style ();
519 break; 489 break;
520 } 490 }
521 491
522 /* boundary check in case screen size changed between SAVE and RESTORE */ 492 /* boundary check in case screen size changed between SAVE and RESTORE */
523 MIN_IT (s->cur.row, nrow - 1); 493 min_it (s->cur.row, nrow - 1);
524 MIN_IT (s->cur.col, ncol - 1); 494 min_it (s->cur.col, ncol - 1);
525#ifdef DEBUG_STRICT 495#ifdef DEBUG_STRICT
526 assert (s->cur.row >= 0); 496 assert (s->cur.row >= 0);
527 assert (s->cur.col >= 0); 497 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 498#endif
532} 499}
533 500
534/* ------------------------------------------------------------------------- */ 501/* ------------------------------------------------------------------------- */
535/* 502/*
… …
546 if (current_screen == scrn) 513 if (current_screen == scrn)
547 return scrn; 514 return scrn;
548 515
549 selection_check (2); /* check for boundary cross */ 516 selection_check (2); /* check for boundary cross */
550 517
551 SWAP_IT (scrn, current_screen, int); 518 int i = current_screen; current_screen = scrn; scrn = i;
552 519
553 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 520 ::swap (screen.cur.row, swap.cur.row);
554 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 521 ::swap (screen.cur.col, swap.cur.col);
555 MAX_IT (screen.cur.row, 0); 522
556 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
557 MAX_IT (screen.cur.col, 0); 524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
558 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
559 525
560#if NSCREENS 526#if NSCREENS
561 if (options & Opt_secondaryScreen) 527 if (options & Opt_secondaryScreen)
562 { 528 {
563 num_scr = 0; 529 num_scr = 0;
564 530
565 for (int i = nrow; i--; ) 531 for (int i = prev_nrow; i--; )
566 SWAP_IT (ROW(i), swap_save[i], line_t); 532 ::swap (ROW(i), swap_buf [i]);
567 533
568 SWAP_IT (screen.charset, swap.charset, int16_t); 534 ::swap (screen.charset, swap.charset);
569 SWAP_IT (screen.flags, swap.flags, int); 535 ::swap (screen.flags, swap.flags);
570 screen.flags |= Screen_VisibleCursor; 536 screen.flags |= Screen_VisibleCursor;
571 swap.flags |= Screen_VisibleCursor; 537 swap.flags |= Screen_VisibleCursor;
572 } 538 }
573 else 539 else
574#endif 540#endif
… …
639 return 0; 605 return 0;
640 606
641 want_refresh = 1; 607 want_refresh = 1;
642 num_scr += count; 608 num_scr += count;
643 609
644 if (row1 == 0 && count > 0 610 if (count > 0
611 && row1 == 0
612 && row2 == nrow - 1
645 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 613 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
646 { 614 {
647 nsaved = min (nsaved + count, saveLines); 615 nsaved = min (nsaved + count, saveLines);
648 term_start = (term_start + count) % total_rows; 616 term_start = (term_start + count) % total_rows;
649 617
… …
695 // use a simple and robust scrolling algorithm, this 663 // use a simple and robust scrolling algorithm, this
696 // part of scr_scroll_text is not time-critical. 664 // part of scr_scroll_text is not time-critical.
697 665
698 int rows = row2 - row1 + 1; 666 int rows = row2 - row1 + 1;
699 667
668 min_it (count, rows);
669
700 for (int row = 0; row < rows; row++) 670 for (int row = 0; row < rows; row++)
701 { 671 {
702 buf [row] = ROW(row1 + (row + count + rows) % rows); 672 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
703 673
704 if (!IN_RANGE_EXC (row + count, 0, rows)) 674 if (!IN_RANGE_EXC (row + count, 0, rows))
705 scr_blank_screen_mem (buf [row], rstyle); 675 scr_blank_screen_mem (temp_buf [row], rstyle);
706 } 676 }
707 677
708 for (int row = 0; row < rows; row++) 678 for (int row = 0; row < rows; row++)
709 ROW(row1 + row) = buf [row]; 679 ROW(row1 + row) = temp_buf [row];
710 } 680 }
711 681
712 return count; 682 return count;
713} 683}
714 684
… …
732 last_col = ncol; 702 last_col = ncol;
733 703
734 if (nlines > 0) 704 if (nlines > 0)
735 { 705 {
736 nlines += screen.cur.row - screen.bscroll; 706 nlines += screen.cur.row - screen.bscroll;
737 if ((nlines > 0) 707 if (nlines > 0
738 && (screen.tscroll == 0) 708 && screen.tscroll == 0
739 && (screen.bscroll == (nrow - 1))) 709 && screen.bscroll == (nrow - 1))
740 { 710 {
741 /* _at least_ this many lines need to be scrolled */ 711 /* _at least_ this many lines need to be scrolled */
742 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 712 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
743 screen.cur.row -= nlines; 713 screen.cur.row -= nlines;
744 } 714 }
745 } 715 }
746 716
747#ifdef DEBUG_STRICT 717#ifdef DEBUG_STRICT
748 assert (screen.cur.col < last_col); 718 assert (screen.cur.col < last_col);
749 assert ((screen.cur.row < nrow) 719 assert (screen.cur.row < nrow
750 && (screen.cur.row >= - (int32_t)nsaved)); 720 && screen.cur.row >= -nsaved);
751#else /* drive with your eyes closed */
752 MIN_IT (screen.cur.col, last_col - 1);
753 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
754 MAX_IT (screen.cur.row, - (int32_t)nsaved);
755#endif 721#endif
756 row = screen.cur.row; 722 row = screen.cur.row;
757 723
758 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 724 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
759 725
… …
765 731
766 if (c < 0x20) 732 if (c < 0x20)
767 if (c == C0_LF) 733 if (c == C0_LF)
768 { 734 {
769 if (!line->is_longer ()) /* XXX: think about this */ 735 if (!line->is_longer ()) /* XXX: think about this */
770 MAX_IT (line->l, screen.cur.col); 736 max_it (line->l, screen.cur.col);
771 737
772 screen.flags &= ~Screen_WrapNext; 738 screen.flags &= ~Screen_WrapNext;
773 739
774 if (screen.cur.row == screen.bscroll) 740 if (screen.cur.row == screen.bscroll)
775 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 741 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
780 continue; 746 continue;
781 } 747 }
782 else if (c == C0_CR) 748 else if (c == C0_CR)
783 { 749 {
784 if (!line->is_longer ()) /* XXX: think about this */ 750 if (!line->is_longer ()) /* XXX: think about this */
785 MAX_IT (line->l, screen.cur.col); 751 max_it (line->l, screen.cur.col);
786 752
787 screen.flags &= ~Screen_WrapNext; 753 screen.flags &= ~Screen_WrapNext;
788 screen.cur.col = 0; 754 screen.cur.col = 0;
789 continue; 755 continue;
790 } 756 }
… …
966#endif 932#endif
967 } 933 }
968 } 934 }
969 935
970 if (!line->is_longer ()) /* XXX: think about this */ 936 if (!line->is_longer ()) /* XXX: think about this */
971 MAX_IT (line->l, screen.cur.col); 937 max_it (line->l, screen.cur.col);
972 938
973#ifdef DEBUG_STRICT 939#ifdef DEBUG_STRICT
974 assert (screen.cur.row >= 0); 940 assert (screen.cur.row >= 0);
975#else /* drive with your eyes closed */
976 MAX_IT (screen.cur.row, 0);
977#endif 941#endif
978} 942}
979 943
980/* ------------------------------------------------------------------------- */ 944/* ------------------------------------------------------------------------- */
981/* 945/*
… …
1047 if (ht && options & Opt_pastableTabs) 1011 if (ht && options & Opt_pastableTabs)
1048 { 1012 {
1049 base_rend = SET_FONT (base_rend, 0); 1013 base_rend = SET_FONT (base_rend, 0);
1050 1014
1051 if (!l.is_longer ()) /* XXX: think about this */ 1015 if (!l.is_longer ()) /* XXX: think about this */
1052 MAX_IT (l.l, x); 1016 max_it (l.l, x);
1053 1017
1054 i = screen.cur.col; 1018 i = screen.cur.col;
1055 1019
1056 l.t[i] = '\t'; 1020 l.t[i] = '\t';
1057 l.r[i] = base_rend; 1021 l.r[i] = base_rend;
… …
1136{ 1100{
1137 want_refresh = 1; 1101 want_refresh = 1;
1138 ZERO_SCROLLBACK (); 1102 ZERO_SCROLLBACK ();
1139 1103
1140 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1104 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1141 MAX_IT (screen.cur.col, 0); 1105 clamp_it (screen.cur.col, 0, ncol - 1);
1142 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1143 1106
1144 screen.flags &= ~Screen_WrapNext; 1107 screen.flags &= ~Screen_WrapNext;
1145 1108
1146 if (relative & R_RELATIVE) 1109 if (relative & R_RELATIVE)
1147 { 1110 {
… …
1165 else 1128 else
1166 { 1129 {
1167 if (screen.flags & Screen_Relative) 1130 if (screen.flags & Screen_Relative)
1168 { /* relative origin mode */ 1131 { /* relative origin mode */
1169 screen.cur.row = row + screen.tscroll; 1132 screen.cur.row = row + screen.tscroll;
1170 MIN_IT (screen.cur.row, screen.bscroll); 1133 min_it (screen.cur.row, screen.bscroll);
1171 } 1134 }
1172 else 1135 else
1173 screen.cur.row = row; 1136 screen.cur.row = row;
1174 } 1137 }
1175 1138
1176 MAX_IT (screen.cur.row, 0); 1139 clamp_it (screen.cur.row, 0, nrow - 1);
1177 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1178} 1140}
1179 1141
1180/* ------------------------------------------------------------------------- */ 1142/* ------------------------------------------------------------------------- */
1181/* 1143/*
1182 * direction should be UP or DN 1144 * direction should be UP or DN
… …
1197 || (screen.cur.row == screen.tscroll && direction == DN)) 1159 || (screen.cur.row == screen.tscroll && direction == DN))
1198 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1160 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1199 else 1161 else
1200 screen.cur.row += dirn; 1162 screen.cur.row += dirn;
1201 1163
1202 MAX_IT (screen.cur.row, 0); 1164 clamp_it (screen.cur.row, 0, nrow - 1);
1203 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1204 selection_check (0); 1165 selection_check (0);
1205} 1166}
1206 1167
1207/* ------------------------------------------------------------------------- */ 1168/* ------------------------------------------------------------------------- */
1208/* 1169/*
… …
1226 switch (mode) 1187 switch (mode)
1227 { 1188 {
1228 case 0: /* erase to end of line */ 1189 case 0: /* erase to end of line */
1229 col = screen.cur.col; 1190 col = screen.cur.col;
1230 num = ncol - col; 1191 num = ncol - col;
1231 MIN_IT (ROW(row).l, (int16_t)col); 1192 min_it (ROW(row).l, col);
1232 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1193 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1233 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1194 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1234 CLEAR_SELECTION (); 1195 CLEAR_SELECTION ();
1235 break; 1196 break;
1236 case 1: /* erase to beginning of line */ 1197 case 1: /* erase to beginning of line */
… …
1303 CLEAR_SELECTION (); 1264 CLEAR_SELECTION ();
1304 1265
1305 if (row >= nrow) /* Out Of Bounds */ 1266 if (row >= nrow) /* Out Of Bounds */
1306 return; 1267 return;
1307 1268
1308 MIN_IT (num, (nrow - row)); 1269 min_it (num, nrow - row);
1309 1270
1310 if (rstyle & (RS_RVid | RS_Uline)) 1271 if (rstyle & (RS_RVid | RS_Uline))
1311 ren = (rend_t) ~RS_None; 1272 ren = (rend_t) ~RS_None;
1312 else if (GET_BASEBG (rstyle) == Color_bg) 1273 else if (GET_BASEBG (rstyle) == Color_bg)
1313 { 1274 {
… …
1326 1287
1327 for (; num--; row++) 1288 for (; num--; row++)
1328 { 1289 {
1329 scr_blank_screen_mem (ROW (row), rstyle); 1290 scr_blank_screen_mem (ROW (row), rstyle);
1330 ROW (row).l = 0; 1291 ROW (row).l = 0;
1331 scr_blank_line (drawn[row], 0, ncol, ren); 1292 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1332 } 1293 }
1333} 1294}
1334 1295
1335#if ENABLE_FRILLS 1296#if ENABLE_FRILLS
1336void 1297void
… …
1421 return; 1382 return;
1422 1383
1423 scr_do_wrap (); 1384 scr_do_wrap ();
1424 1385
1425 selection_check (1); 1386 selection_check (1);
1426 MIN_IT (count, (ncol - screen.cur.col)); 1387 min_it (count, ncol - screen.cur.col);
1427 1388
1428 row = screen.cur.row; 1389 row = screen.cur.row;
1429 1390
1430 line_t *line = &ROW(row); 1391 line_t *line = &ROW(row);
1431 1392
… …
1439 } 1400 }
1440 1401
1441 if (!line->is_longer ()) 1402 if (!line->is_longer ())
1442 { 1403 {
1443 line->l += count; 1404 line->l += count;
1444 MIN_IT (line->l, ncol); 1405 min_it (line->l, ncol);
1445 } 1406 }
1446 1407
1447 if (selection.op && current_screen == selection.screen 1408 if (selection.op && current_screen == selection.screen
1448 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1409 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1449 { 1410 {
… …
1510 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1471 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1511 */ 1472 */
1512void 1473void
1513rxvt_term::scr_scroll_region (int top, int bot) 1474rxvt_term::scr_scroll_region (int top, int bot)
1514{ 1475{
1515 MAX_IT (top, 0); 1476 max_it (top, 0);
1516 MIN_IT (bot, (int)nrow - 1); 1477 min_it (bot, nrow - 1);
1517 1478
1518 if (top > bot) 1479 if (top > bot)
1519 return; 1480 return;
1520 1481
1521 screen.tscroll = top; 1482 screen.tscroll = top;
… …
1619 XGCValues gcvalue; 1580 XGCValues gcvalue;
1620 1581
1621 if (rvideo != mode) 1582 if (rvideo != mode)
1622 { 1583 {
1623 rvideo = mode; 1584 rvideo = mode;
1624 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1585 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1625#if XPM_BACKGROUND 1586#if XPM_BACKGROUND
1626 if (bgPixmap.pixmap == None) 1587 if (bgPixmap.pixmap == None)
1627#endif 1588#endif
1628#if TRANSPARENT 1589#if TRANSPARENT
1629 if (! (options & Opt_transparent) || am_transparent == 0) 1590 if (! (options & Opt_transparent) || am_transparent == 0)
… …
1725 bool found = false; 1686 bool found = false;
1726 1687
1727 for (int i = 0; i < nrow; i++) 1688 for (int i = 0; i < nrow; i++)
1728 { 1689 {
1729 int col = 0; 1690 int col = 0;
1730 rend_t *drp = drawn[i].r; 1691 rend_t *drp = drawn_buf[i].r;
1731 1692
1732 for (; col < ncol; col++, drp++) 1693 for (; col < ncol; col++, drp++)
1733 if ((*drp & mask) == value) 1694 if ((*drp & mask) == value)
1734 { 1695 {
1735 found = true; 1696 found = true;
… …
1753rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1714rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1754{ 1715{
1755 int i; 1716 int i;
1756 row_col_t rc[RC_COUNT]; 1717 row_col_t rc[RC_COUNT];
1757 1718
1758 if (!drawn) /* sanity check */ 1719 if (!drawn_buf) /* sanity check */
1759 return; 1720 return;
1760 1721
1761#ifndef NO_SLOW_LINK_SUPPORT 1722#ifndef NO_SLOW_LINK_SUPPORT
1762 if (refresh_type == FAST_REFRESH && !display->is_local) 1723 if (refresh_type == FAST_REFRESH && !display->is_local)
1763 { 1724 {
1764 y = 0; 1725 y = 0;
1765 eheight = height; 1726 eheight = height;
1766 } 1727 }
1767#endif
1768
1769#ifdef DEBUG_STRICT
1770 x = max (x, 0);
1771 x = min (x, (int)width);
1772 y = max (y, 0);
1773 y = min (y, (int)height);
1774#endif 1728#endif
1775 1729
1776 /* round down */ 1730 /* round down */
1777 rc[PART_BEG].col = Pixel2Col (x); 1731 rc[PART_BEG].col = Pixel2Col (x);
1778 rc[PART_BEG].row = Pixel2Row (y); 1732 rc[PART_BEG].row = Pixel2Row (y);
… …
1781 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1735 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1782 1736
1783 /* sanity checks */ 1737 /* sanity checks */
1784 for (i = PART_BEG; i < RC_COUNT; i++) 1738 for (i = PART_BEG; i < RC_COUNT; i++)
1785 { 1739 {
1786 MIN_IT (rc[i].col, ncol - 1); 1740 min_it (rc[i].col, ncol - 1);
1787 MIN_IT (rc[i].row, nrow - 1); 1741 min_it (rc[i].row, nrow - 1);
1788 } 1742 }
1789 1743
1790 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1744 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1791 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1745 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1792 1746
1793 if (refresh) 1747 if (refresh)
1794 scr_refresh (SLOW_REFRESH); 1748 scr_refresh (SLOW_REFRESH);
1795} 1749}
1796 1750
… …
1959{ 1913{
1960 unsigned char must_clear, /* use draw_string not draw_image_string */ 1914 unsigned char must_clear, /* use draw_string not draw_image_string */
1961 showcursor; /* show the cursor */ 1915 showcursor; /* show the cursor */
1962 int16_t col, row, /* column/row we're processing */ 1916 int16_t col, row, /* column/row we're processing */
1963 ocrow; /* old cursor row */ 1917 ocrow; /* old cursor row */
1964 int i, /* tmp */ 1918 int i; /* tmp */
1965 row_offset; /* basic offset in screen structure */
1966#ifndef NO_CURSORCOLOR 1919#ifndef NO_CURSORCOLOR
1967 rend_t cc1; /* store colours at cursor position (s) */ 1920 rend_t cc1; /* store colours at cursor position (s) */
1968#endif 1921#endif
1969 rend_t *crp; // cursor rendition pointer 1922 rend_t *crp; // cursor rendition pointer
1970 1923
… …
1976 /* 1929 /*
1977 * A: set up vars 1930 * A: set up vars
1978 */ 1931 */
1979 must_clear = 0; 1932 must_clear = 0;
1980 refresh_count = 0; 1933 refresh_count = 0;
1981
1982 row_offset = term_start - view_start;
1983 1934
1984#if XPM_BACKGROUND 1935#if XPM_BACKGROUND
1985 must_clear |= bgPixmap.pixmap != None; 1936 must_clear |= bgPixmap.pixmap != None;
1986#endif 1937#endif
1987#if TRANSPARENT 1938#if TRANSPARENT
… …
2057 if (screen.cur.row + view_start != ocrow 2008 if (screen.cur.row + view_start != ocrow
2058 || screen.cur.col != oldcursor.col) 2009 || screen.cur.col != oldcursor.col)
2059 { 2010 {
2060 if (ocrow < nrow 2011 if (ocrow < nrow
2061 && oldcursor.col < ncol) 2012 && oldcursor.col < ncol)
2062 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2013 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2063 2014
2064 if (focus || !showcursor) 2015 if (focus || !showcursor)
2065 oldcursor.row = -1; 2016 oldcursor.row = -1;
2066 else 2017 else
2067 setoldcursor = 1; 2018 setoldcursor = 1;
… …
2105 row = i > 0 ? 0 : j - 1; 2056 row = i > 0 ? 0 : j - 1;
2106 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2057 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2107 { 2058 {
2108 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2059 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2109 { 2060 {
2110 line_t s = save[(row + row_offset) % total_rows]; 2061 line_t s = ROW(row - view_start);
2111 line_t d = drawn[row]; 2062 line_t d = drawn_buf[row];
2112 line_t d2 = drawn[row + i]; 2063 line_t d2 = drawn_buf[row + i];
2113 2064
2114 for (nits = 0, col = ncol; col--; ) 2065 for (nits = 0, col = ncol; col--; )
2115 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2066 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2116 nits--; 2067 nits--;
2117 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2068 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2135 2086
2136 if (len != -1) 2087 if (len != -1)
2137 { 2088 {
2138 /* also comes here at end if needed because of >= above */ 2089 /* also comes here at end if needed because of >= above */
2139 if (wlen < len) 2090 if (wlen < len)
2140 SWAP_IT (wlen, len, int); 2091 ::swap (wlen, len);
2141 2092
2142 XCopyArea (display->display, vt, vt, 2093 XCopyArea (display->display, vt, vt,
2143 gc, 0, Row2Pixel (len + i), 2094 gc, 0, Row2Pixel (len + i),
2144 (unsigned int)TermWin_TotalWidth (), 2095 (unsigned int)TermWin_TotalWidth (),
2145 (unsigned int)Height2Pixel (wlen - len + 1), 2096 (unsigned int)Height2Pixel (wlen - len + 1),
… …
2153 /* 2104 /*
2154 * E: main pass across every character 2105 * E: main pass across every character
2155 */ 2106 */
2156 for (row = 0; row < nrow; row++) 2107 for (row = 0; row < nrow; row++)
2157 { 2108 {
2158 text_t *stp = save[(row + row_offset) % total_rows].t; 2109 text_t *stp = ROW(row - view_start).t;
2159 rend_t *srp = save[(row + row_offset) % total_rows].r; 2110 rend_t *srp = ROW(row - view_start).r;
2160 text_t *dtp = drawn[row].t; 2111 text_t *dtp = drawn_buf[row].t;
2161 rend_t *drp = drawn[row].r; 2112 rend_t *drp = drawn_buf[row].r;
2162 2113
2163 /* 2114 /*
2164 * E2: OK, now the real pass 2115 * E2: OK, now the real pass
2165 */ 2116 */
2166 int ypixel = (int)Row2Pixel (row); 2117 int ypixel = (int)Row2Pixel (row);
… …
2277 fore = Color_UL; 2228 fore = Color_UL;
2278#endif 2229#endif
2279 2230
2280 if (invert) 2231 if (invert)
2281 { 2232 {
2282 SWAP_IT (fore, back, int); 2233 ::swap (fore, back);
2283 2234
2284#ifndef NO_BOLD_UNDERLINE_REVERSE 2235#ifndef NO_BOLD_UNDERLINE_REVERSE
2285 if (ISSET_PIXCOLOR (Color_RV)) 2236 if (ISSET_PIXCOLOR (Color_RV))
2286 back = Color_RV; 2237 back = Color_RV;
2287 2238
… …
2379 2330
2380 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2331 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2381 col--; 2332 col--;
2382 2333
2383 while (col + cursorwidth < ncol 2334 while (col + cursorwidth < ncol
2384 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2335 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2385 cursorwidth++; 2336 cursorwidth++;
2386 2337
2387#ifndef NO_CURSORCOLOR 2338#ifndef NO_CURSORCOLOR
2388 if (ISSET_PIXCOLOR (Color_cursor)) 2339 if (ISSET_PIXCOLOR (Color_cursor))
2389 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2340 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2421 2372
2422void 2373void
2423rxvt_term::scr_remap_chars () 2374rxvt_term::scr_remap_chars ()
2424{ 2375{
2425 for (int i = total_rows; i--; ) 2376 for (int i = total_rows; i--; )
2426 scr_remap_chars (save[i]); 2377 scr_remap_chars (row_buf [i]);
2427 2378
2428 for (int i = nrow; i--; ) 2379 for (int i = nrow; i--; )
2429 { 2380 {
2430 scr_remap_chars (drawn[i]); 2381 scr_remap_chars (drawn_buf [i]);
2431 scr_remap_chars (swap_save[i]); 2382 scr_remap_chars (swap_buf [i]);
2432 } 2383 }
2433} 2384}
2434 2385
2435void 2386void
2436rxvt_term::scr_recolour () 2387rxvt_term::scr_recolour ()
… …
2533 char r1[] = "\n"; 2484 char r1[] = "\n";
2534 2485
2535 for (row = saveLines - nsaved; 2486 for (row = saveLines - nsaved;
2536 row < saveLines + nrow - 1; row++) 2487 row < saveLines + nrow - 1; row++)
2537 { 2488 {
2538 width = save[row].l >= 0 ? save[row].l 2489 width = row_buf[row].l >= 0 ? row_buf[row].l
2539 : ncol; 2490 : ncol;
2540 for (towrite = width; towrite; towrite -= wrote) 2491 for (towrite = width; towrite; towrite -= wrote)
2541 { 2492 {
2542 wrote = write (fd, & (save[row].t[width - towrite]), 2493 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2543 towrite); 2494 towrite);
2544 if (wrote < 0) 2495 if (wrote < 0)
2545 return; /* XXX: death, no report */ 2496 return; /* XXX: death, no report */
2546 } 2497 }
2547 if (save[row].l >= 0) 2498 if (row_buf[row].l >= 0)
2548 if (write (fd, r1, 1) <= 0) 2499 if (write (fd, r1, 1) <= 0)
2549 return; /* XXX: death, no report */ 2500 return; /* XXX: death, no report */
2550 } 2501 }
2551} 2502}
2552#endif 2503#endif
… …
3029 want_refresh = 1; 2980 want_refresh = 1;
3030 2981
3031 selection.mark.row = row - view_start; 2982 selection.mark.row = row - view_start;
3032 selection.mark.col = col; 2983 selection.mark.col = col;
3033 2984
3034 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); 2985 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3035 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); 2986 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3036 2987
3037 while (selection.mark.col > 0 2988 while (selection.mark.col > 0
3038 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 2989 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3039 --selection.mark.col; 2990 --selection.mark.col;
3040 2991
… …
3145 * flag == 2 ==> button 3 motion 3096 * flag == 2 ==> button 3 motion
3146 */ 3097 */
3147void 3098void
3148rxvt_term::selection_extend (int x, int y, int flag) 3099rxvt_term::selection_extend (int x, int y, int flag)
3149{ 3100{
3150 int col = min (max (Pixel2Col (x), 0), nrow - 1); 3101 int col = clamp (Pixel2Col (x), 0, ncol);
3151 int row = min (max (Pixel2Row (y), 0), ncol); 3102 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3152 3103
3153 /* 3104 /*
3154 * If we're selecting characters (single click) then we must check first 3105 * If we're selecting characters (single click) then we must check first
3155 * if we are at the same place as the original mark. If we are then 3106 * if we are at the same place as the original mark. If we are then
3156 * select nothing. Otherwise, if we're to the right of the mark, you have to 3107 * select nothing. Otherwise, if we're to the right of the mark, you have to
… …
3369 } 3320 }
3370 } 3321 }
3371 3322
3372#if ENABLE_FRILLS 3323#if ENABLE_FRILLS
3373 if (selection.rect && selection.beg.col > selection.end.col) 3324 if (selection.rect && selection.beg.col > selection.end.col)
3374 SWAP_IT (selection.beg.col, selection.end.col, int); 3325 ::swap (selection.beg.col, selection.end.col);
3375#endif 3326#endif
3376} 3327}
3377 3328
3378#if ENABLE_FRILLS 3329#if ENABLE_FRILLS
3379void 3330void
… …
3577 */ 3528 */
3578void 3529void
3579rxvt_term::pixel_position (int *x, int *y) 3530rxvt_term::pixel_position (int *x, int *y)
3580{ 3531{
3581 *x = Pixel2Col (*x); 3532 *x = Pixel2Col (*x);
3582 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3533 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3583 *y = Pixel2Row (*y); 3534 *y = Pixel2Row (*y);
3584 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3535 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3585} 3536}
3586 3537
3587/* ------------------------------------------------------------------------- */ 3538/* ------------------------------------------------------------------------- */
3588#ifdef USE_XIM 3539#ifdef USE_XIM
3589void 3540void
… …
3611 3562
3612 if (x < 0) x = ncol - w; 3563 if (x < 0) x = ncol - w;
3613 if (y < 0) y = nrow - h; 3564 if (y < 0) y = nrow - h;
3614 3565
3615 // make space for border 3566 // make space for border
3616 w += 2; MIN_IT (w, ncol); 3567 w += 2; min_it (w, ncol);
3617 h += 2; MIN_IT (h, nrow); 3568 h += 2; min_it (h, nrow);
3618 3569
3619 x -= 1; MAX_IT (x, 0); 3570 x -= 1; clamp_it (x, 0, ncol - w);
3620 y -= 1; MAX_IT (y, 0); 3571 y -= 1; clamp_it (y, 0, nrow - h);
3621
3622 MIN_IT (x, ncol - w);
3623 MIN_IT (y, nrow - h);
3624 3572
3625 ov_x = x; ov_y = y; 3573 ov_x = x; ov_y = y;
3626 ov_w = w; ov_h = h; 3574 ov_w = w; ov_h = h;
3627 3575
3628 ov_text = new text_t *[h]; 3576 ov_text = new text_t *[h];

Diff Legend

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