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.188 by root, Thu Dec 22 00:07:47 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)
271 {
272 /* add rows */
273 scr_reset_realloc (); /* realloc _first_ */
274
275 int ocol = ncol;
276 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
277
278 k = min (nsaved, nrow - prev_nrow);
279
280 for (p = prev_total_rows; p < total_rows; p++)
281 save[p].clear ();
282
283 for (p = prev_total_rows; p < total_rows - k; p++)
284 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
285
286 for (p = prev_nrow; p < nrow; p++)
287 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
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
301 assert (screen.cur.row < nrow);
302#else /* drive with your eyes closed */
303 MIN_IT (screen.cur.row, nrow - 1);
304#endif
305 ncol = ocol; // save b/c scr_blank_screen_mem uses this
306 }
307
308 /* resize columns */
309 if (ncol != prev_ncol)
310 {
311 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
312 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
313
314 for (p = total_rows; p--; )
315 lresize (save[p]);
316
317 for (p = nrow; p--; )
318 {
319 lresize (drawn[p]);
320 lresize (swap_save[p]);
321 }
322
323 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
324
325 delete old_ta;
326 delete old_ra;
327 }
328
329#if 0
330 // re-wrap lines, this is rather ugly, possibly because I am too dumb 276 // re-wrap lines, this is rather ugly, possibly because I am too dumb
331 // to come up with a lean and mean algorithm. 277 // 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 278
339 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start - nsaved , prev_total_rows);
281 int q = total_rows; // rewrapped row
340 282
341 p = prev_total_rows;
342 q = total_rows;
343
344 while (p > 0 && q > 0) 283 while (p != pend && q > 0)
345 { 284 {
346 --p; 285 p = MOD (p - 1, prev_total_rows);
286#ifdef DEBUG_STRICT
287 assert (old_buf [MOD (p, prev_total_rows)].t);
288#endif
347 289
348 printf ("pq %d:%d\n", p, q); 290 int llen = old_buf [MOD (p, prev_total_rows)].l;
349 if (save[p].t) 291
292 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
350 { 293 {
351 int llen = save[p].l; 294 p = MOD (p - 1, prev_total_rows);
352 295
353 assert (llen >= 0); 296 llen += prev_ncol;
297 }
354 298
355 while (p && save[p - 1].l < 0) 299 int qlines = max (0, (llen - 1) / ncol) + 1;
300
301 // drop partial lines completely
302 if (q < qlines)
303 break;
304
305 q -= qlines;
306
307 int lofs = 0;
308 line_t *qline;
309
310 // re-assemble the full line by destination lines
311 for (int qrow = q; qlines--; qrow++)
312 {
313 qline = row_buf + qrow;
314 lalloc (*qline);
315 qline->set_is_longer ();
316
317 int qcol = 0;
318
319 // fill a single destination line
320 while (lofs < llen && qcol < ncol)
356 { 321 {
357 --p;
358 llen += prev_ncol;
359 }
360
361 int qlines = llen / ncol + 1;
362 int lofs = 0;
363
364 q -= qlines;
365
366 int qrow = q;
367
368 printf ("QL %d llen %d\n", qlines, llen);//D
369 for (; qlines--; qrow++)
370 {
371 if (qrow >= 0)
372 {
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; 322 int prow = lofs / prev_ncol;
382 int pcol = lofs % prev_ncol; 323 int pcol = lofs % prev_ncol;
383 324
325 line_t &pline = old_buf [MOD (p + prow, prev_total_rows)];
326
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 327 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385 328
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); 329 assert (len);
330 assert (pline.t);
387 331
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);
400
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 332 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 333 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403 334
404 lofs += len;
405 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 }
411 else
412 lofs += ncol; 335 lofs += len;
336 qcol += len;
413 } 337 }
414 } 338 }
415 }
416 339
417 free (screen.text); screen.text = tp; 340 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1;
418 free (screen.rend); screen.rend = rp; 341 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
419 free (screen.tlen); screen.tlen = tl; 342 }
420 343
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 344 term_start = total_rows - nrow;
422#endif 345 view_start = 0;
346 nsaved = term_start - q;
347
348 // make sure all terminal lines exist
349 while (nsaved < 0)
350 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
351
352 for (int i = -nsaved; i < nrow; i++)
353 assert (ROW (i).t);//D
354
355 free (old_buf);
356 delete old_ta;
357 delete old_ra;
358
359 min_it (screen.cur.row, nrow - 1);
360 min_it (screen.cur.col, ncol - 1);
423 361
424 if (tabs) 362 if (tabs)
425 free (tabs); 363 free (tabs);
426 } 364 }
427 365
428 prev_nrow = nrow; 366 prev_nrow = nrow;
429 prev_ncol = ncol; 367 prev_ncol = ncol;
430 368
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 369 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 370
433 for (p = 0; p < ncol; p++) 371 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 372 tabs [col] = col % TABSIZE == 0;
435 373
436 tt_winch (); 374 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} 375}
447 376
448/* ------------------------------------------------------------------------- */ 377/* ------------------------------------------------------------------------- */
449/* 378/*
450 * Free everything. That way malloc debugging can find leakage. 379 * Free everything. That way malloc debugging can find leakage.
… …
453rxvt_term::scr_release () 382rxvt_term::scr_release ()
454{ 383{
455 delete talloc; talloc = 0; 384 delete talloc; talloc = 0;
456 delete ralloc; ralloc = 0; 385 delete ralloc; ralloc = 0;
457 386
458 free (save); 387 free (row_buf);
459 free (swap_save); 388 free (swap_buf);
460 free (drawn); 389 free (drawn_buf);
461 free (buf); 390 free (temp_buf);
462 free (tabs); 391 free (tabs);
392
393 row_buf = 0; // signal that we freed all the arrays
463} 394}
464 395
465/* ------------------------------------------------------------------------- */ 396/* ------------------------------------------------------------------------- */
466/* 397/*
467 * Hard reset 398 * Hard reset
… …
518 set_font_style (); 449 set_font_style ();
519 break; 450 break;
520 } 451 }
521 452
522 /* boundary check in case screen size changed between SAVE and RESTORE */ 453 /* boundary check in case screen size changed between SAVE and RESTORE */
523 MIN_IT (s->cur.row, nrow - 1); 454 min_it (s->cur.row, nrow - 1);
524 MIN_IT (s->cur.col, ncol - 1); 455 min_it (s->cur.col, ncol - 1);
525#ifdef DEBUG_STRICT 456#ifdef DEBUG_STRICT
526 assert (s->cur.row >= 0); 457 assert (s->cur.row >= 0);
527 assert (s->cur.col >= 0); 458 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 459#endif
532} 460}
533 461
534/* ------------------------------------------------------------------------- */ 462/* ------------------------------------------------------------------------- */
535/* 463/*
… …
546 if (current_screen == scrn) 474 if (current_screen == scrn)
547 return scrn; 475 return scrn;
548 476
549 selection_check (2); /* check for boundary cross */ 477 selection_check (2); /* check for boundary cross */
550 478
551 SWAP_IT (scrn, current_screen, int); 479 int i = current_screen; current_screen = scrn; scrn = i;
552 480
553 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 481 ::swap (screen.cur.row, swap.cur.row);
554 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 482 ::swap (screen.cur.col, swap.cur.col);
555 MAX_IT (screen.cur.row, 0); 483
556 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 484 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
557 MAX_IT (screen.cur.col, 0); 485 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
558 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
559 486
560#if NSCREENS 487#if NSCREENS
561 if (options & Opt_secondaryScreen) 488 if (options & Opt_secondaryScreen)
562 { 489 {
563 num_scr = 0; 490 num_scr = 0;
564 491
565 for (int i = nrow; i--; ) 492 for (int i = prev_nrow; i--; )
566 SWAP_IT (ROW(i), swap_save[i], line_t); 493 ::swap (ROW(i), swap_buf [i]);
567 494
568 SWAP_IT (screen.charset, swap.charset, int16_t); 495 ::swap (screen.charset, swap.charset);
569 SWAP_IT (screen.flags, swap.flags, int); 496 ::swap (screen.flags, swap.flags);
570 screen.flags |= Screen_VisibleCursor; 497 screen.flags |= Screen_VisibleCursor;
571 swap.flags |= Screen_VisibleCursor; 498 swap.flags |= Screen_VisibleCursor;
572 } 499 }
573 else 500 else
574#endif 501#endif
… …
639 return 0; 566 return 0;
640 567
641 want_refresh = 1; 568 want_refresh = 1;
642 num_scr += count; 569 num_scr += count;
643 570
644 if (row1 == 0 && count > 0 571 if (count > 0
572 && row1 == 0
573 && row2 == nrow - 1
645 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 574 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
646 { 575 {
647 nsaved = min (nsaved + count, saveLines); 576 nsaved = min (nsaved + count, saveLines);
648 term_start = (term_start + count) % total_rows; 577 term_start = (term_start + count) % total_rows;
649 578
… …
695 // use a simple and robust scrolling algorithm, this 624 // use a simple and robust scrolling algorithm, this
696 // part of scr_scroll_text is not time-critical. 625 // part of scr_scroll_text is not time-critical.
697 626
698 int rows = row2 - row1 + 1; 627 int rows = row2 - row1 + 1;
699 628
629 min_it (count, rows);
630
700 for (int row = 0; row < rows; row++) 631 for (int row = 0; row < rows; row++)
701 { 632 {
702 buf [row] = ROW(row1 + (row + count + rows) % rows); 633 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
703 634
704 if (!IN_RANGE_EXC (row + count, 0, rows)) 635 if (!IN_RANGE_EXC (row + count, 0, rows))
705 scr_blank_screen_mem (buf [row], rstyle); 636 scr_blank_screen_mem (temp_buf [row], rstyle);
706 } 637 }
707 638
708 for (int row = 0; row < rows; row++) 639 for (int row = 0; row < rows; row++)
709 ROW(row1 + row) = buf [row]; 640 ROW(row1 + row) = temp_buf [row];
710 } 641 }
711 642
712 return count; 643 return count;
713} 644}
714 645
… …
732 last_col = ncol; 663 last_col = ncol;
733 664
734 if (nlines > 0) 665 if (nlines > 0)
735 { 666 {
736 nlines += screen.cur.row - screen.bscroll; 667 nlines += screen.cur.row - screen.bscroll;
737 if ((nlines > 0) 668 if (nlines > 0
738 && (screen.tscroll == 0) 669 && screen.tscroll == 0
739 && (screen.bscroll == (nrow - 1))) 670 && screen.bscroll == (nrow - 1))
740 { 671 {
741 /* _at least_ this many lines need to be scrolled */ 672 /* _at least_ this many lines need to be scrolled */
742 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 673 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
743 screen.cur.row -= nlines; 674 screen.cur.row -= nlines;
744 } 675 }
745 } 676 }
746 677
747#ifdef DEBUG_STRICT 678#ifdef DEBUG_STRICT
748 assert (screen.cur.col < last_col); 679 assert (screen.cur.col < last_col);
749 assert ((screen.cur.row < nrow) 680 assert (screen.cur.row < nrow
750 && (screen.cur.row >= - (int32_t)nsaved)); 681 && 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 682#endif
756 row = screen.cur.row; 683 row = screen.cur.row;
757 684
758 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 685 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
759 686
… …
765 692
766 if (c < 0x20) 693 if (c < 0x20)
767 if (c == C0_LF) 694 if (c == C0_LF)
768 { 695 {
769 if (!line->is_longer ()) /* XXX: think about this */ 696 if (!line->is_longer ()) /* XXX: think about this */
770 MAX_IT (line->l, screen.cur.col); 697 max_it (line->l, screen.cur.col);
771 698
772 screen.flags &= ~Screen_WrapNext; 699 screen.flags &= ~Screen_WrapNext;
773 700
774 if (screen.cur.row == screen.bscroll) 701 if (screen.cur.row == screen.bscroll)
775 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 702 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
780 continue; 707 continue;
781 } 708 }
782 else if (c == C0_CR) 709 else if (c == C0_CR)
783 { 710 {
784 if (!line->is_longer ()) /* XXX: think about this */ 711 if (!line->is_longer ()) /* XXX: think about this */
785 MAX_IT (line->l, screen.cur.col); 712 max_it (line->l, screen.cur.col);
786 713
787 screen.flags &= ~Screen_WrapNext; 714 screen.flags &= ~Screen_WrapNext;
788 screen.cur.col = 0; 715 screen.cur.col = 0;
789 continue; 716 continue;
790 } 717 }
… …
966#endif 893#endif
967 } 894 }
968 } 895 }
969 896
970 if (!line->is_longer ()) /* XXX: think about this */ 897 if (!line->is_longer ()) /* XXX: think about this */
971 MAX_IT (line->l, screen.cur.col); 898 max_it (line->l, screen.cur.col);
972 899
973#ifdef DEBUG_STRICT 900#ifdef DEBUG_STRICT
974 assert (screen.cur.row >= 0); 901 assert (screen.cur.row >= 0);
975#else /* drive with your eyes closed */
976 MAX_IT (screen.cur.row, 0);
977#endif 902#endif
978} 903}
979 904
980/* ------------------------------------------------------------------------- */ 905/* ------------------------------------------------------------------------- */
981/* 906/*
… …
1047 if (ht && options & Opt_pastableTabs) 972 if (ht && options & Opt_pastableTabs)
1048 { 973 {
1049 base_rend = SET_FONT (base_rend, 0); 974 base_rend = SET_FONT (base_rend, 0);
1050 975
1051 if (!l.is_longer ()) /* XXX: think about this */ 976 if (!l.is_longer ()) /* XXX: think about this */
1052 MAX_IT (l.l, x); 977 max_it (l.l, x);
1053 978
1054 i = screen.cur.col; 979 i = screen.cur.col;
1055 980
1056 l.t[i] = '\t'; 981 l.t[i] = '\t';
1057 l.r[i] = base_rend; 982 l.r[i] = base_rend;
… …
1136{ 1061{
1137 want_refresh = 1; 1062 want_refresh = 1;
1138 ZERO_SCROLLBACK (); 1063 ZERO_SCROLLBACK ();
1139 1064
1140 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1065 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1141 MAX_IT (screen.cur.col, 0); 1066 clamp_it (screen.cur.col, 0, ncol - 1);
1142 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1143 1067
1144 screen.flags &= ~Screen_WrapNext; 1068 screen.flags &= ~Screen_WrapNext;
1145 1069
1146 if (relative & R_RELATIVE) 1070 if (relative & R_RELATIVE)
1147 { 1071 {
… …
1165 else 1089 else
1166 { 1090 {
1167 if (screen.flags & Screen_Relative) 1091 if (screen.flags & Screen_Relative)
1168 { /* relative origin mode */ 1092 { /* relative origin mode */
1169 screen.cur.row = row + screen.tscroll; 1093 screen.cur.row = row + screen.tscroll;
1170 MIN_IT (screen.cur.row, screen.bscroll); 1094 min_it (screen.cur.row, screen.bscroll);
1171 } 1095 }
1172 else 1096 else
1173 screen.cur.row = row; 1097 screen.cur.row = row;
1174 } 1098 }
1175 1099
1176 MAX_IT (screen.cur.row, 0); 1100 clamp_it (screen.cur.row, 0, nrow - 1);
1177 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1178} 1101}
1179 1102
1180/* ------------------------------------------------------------------------- */ 1103/* ------------------------------------------------------------------------- */
1181/* 1104/*
1182 * direction should be UP or DN 1105 * direction should be UP or DN
… …
1197 || (screen.cur.row == screen.tscroll && direction == DN)) 1120 || (screen.cur.row == screen.tscroll && direction == DN))
1198 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1121 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1199 else 1122 else
1200 screen.cur.row += dirn; 1123 screen.cur.row += dirn;
1201 1124
1202 MAX_IT (screen.cur.row, 0); 1125 clamp_it (screen.cur.row, 0, nrow - 1);
1203 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1204 selection_check (0); 1126 selection_check (0);
1205} 1127}
1206 1128
1207/* ------------------------------------------------------------------------- */ 1129/* ------------------------------------------------------------------------- */
1208/* 1130/*
… …
1226 switch (mode) 1148 switch (mode)
1227 { 1149 {
1228 case 0: /* erase to end of line */ 1150 case 0: /* erase to end of line */
1229 col = screen.cur.col; 1151 col = screen.cur.col;
1230 num = ncol - col; 1152 num = ncol - col;
1231 MIN_IT (ROW(row).l, (int16_t)col); 1153 min_it (ROW(row).l, col);
1232 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1154 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1233 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1155 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1234 CLEAR_SELECTION (); 1156 CLEAR_SELECTION ();
1235 break; 1157 break;
1236 case 1: /* erase to beginning of line */ 1158 case 1: /* erase to beginning of line */
… …
1303 CLEAR_SELECTION (); 1225 CLEAR_SELECTION ();
1304 1226
1305 if (row >= nrow) /* Out Of Bounds */ 1227 if (row >= nrow) /* Out Of Bounds */
1306 return; 1228 return;
1307 1229
1308 MIN_IT (num, (nrow - row)); 1230 min_it (num, nrow - row);
1309 1231
1310 if (rstyle & (RS_RVid | RS_Uline)) 1232 if (rstyle & (RS_RVid | RS_Uline))
1311 ren = (rend_t) ~RS_None; 1233 ren = (rend_t) ~RS_None;
1312 else if (GET_BASEBG (rstyle) == Color_bg) 1234 else if (GET_BASEBG (rstyle) == Color_bg)
1313 { 1235 {
… …
1326 1248
1327 for (; num--; row++) 1249 for (; num--; row++)
1328 { 1250 {
1329 scr_blank_screen_mem (ROW (row), rstyle); 1251 scr_blank_screen_mem (ROW (row), rstyle);
1330 ROW (row).l = 0; 1252 ROW (row).l = 0;
1331 scr_blank_line (drawn[row], 0, ncol, ren); 1253 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1332 } 1254 }
1333} 1255}
1334 1256
1335#if ENABLE_FRILLS 1257#if ENABLE_FRILLS
1336void 1258void
… …
1421 return; 1343 return;
1422 1344
1423 scr_do_wrap (); 1345 scr_do_wrap ();
1424 1346
1425 selection_check (1); 1347 selection_check (1);
1426 MIN_IT (count, (ncol - screen.cur.col)); 1348 min_it (count, ncol - screen.cur.col);
1427 1349
1428 row = screen.cur.row; 1350 row = screen.cur.row;
1429 1351
1430 line_t *line = &ROW(row); 1352 line_t *line = &ROW(row);
1431 1353
… …
1439 } 1361 }
1440 1362
1441 if (!line->is_longer ()) 1363 if (!line->is_longer ())
1442 { 1364 {
1443 line->l += count; 1365 line->l += count;
1444 MIN_IT (line->l, ncol); 1366 min_it (line->l, ncol);
1445 } 1367 }
1446 1368
1447 if (selection.op && current_screen == selection.screen 1369 if (selection.op && current_screen == selection.screen
1448 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1370 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1449 { 1371 {
… …
1510 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1432 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1511 */ 1433 */
1512void 1434void
1513rxvt_term::scr_scroll_region (int top, int bot) 1435rxvt_term::scr_scroll_region (int top, int bot)
1514{ 1436{
1515 MAX_IT (top, 0); 1437 max_it (top, 0);
1516 MIN_IT (bot, (int)nrow - 1); 1438 min_it (bot, nrow - 1);
1517 1439
1518 if (top > bot) 1440 if (top > bot)
1519 return; 1441 return;
1520 1442
1521 screen.tscroll = top; 1443 screen.tscroll = top;
… …
1619 XGCValues gcvalue; 1541 XGCValues gcvalue;
1620 1542
1621 if (rvideo != mode) 1543 if (rvideo != mode)
1622 { 1544 {
1623 rvideo = mode; 1545 rvideo = mode;
1624 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1546 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1625#if XPM_BACKGROUND 1547#if XPM_BACKGROUND
1626 if (bgPixmap.pixmap == None) 1548 if (bgPixmap.pixmap == None)
1627#endif 1549#endif
1628#if TRANSPARENT 1550#if TRANSPARENT
1629 if (! (options & Opt_transparent) || am_transparent == 0) 1551 if (! (options & Opt_transparent) || am_transparent == 0)
… …
1725 bool found = false; 1647 bool found = false;
1726 1648
1727 for (int i = 0; i < nrow; i++) 1649 for (int i = 0; i < nrow; i++)
1728 { 1650 {
1729 int col = 0; 1651 int col = 0;
1730 rend_t *drp = drawn[i].r; 1652 rend_t *drp = drawn_buf[i].r;
1731 1653
1732 for (; col < ncol; col++, drp++) 1654 for (; col < ncol; col++, drp++)
1733 if ((*drp & mask) == value) 1655 if ((*drp & mask) == value)
1734 { 1656 {
1735 found = true; 1657 found = true;
… …
1753rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1675rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1754{ 1676{
1755 int i; 1677 int i;
1756 row_col_t rc[RC_COUNT]; 1678 row_col_t rc[RC_COUNT];
1757 1679
1758 if (!drawn) /* sanity check */ 1680 if (!drawn_buf) /* sanity check */
1759 return; 1681 return;
1760 1682
1761#ifndef NO_SLOW_LINK_SUPPORT 1683#ifndef NO_SLOW_LINK_SUPPORT
1762 if (refresh_type == FAST_REFRESH && !display->is_local) 1684 if (refresh_type == FAST_REFRESH && !display->is_local)
1763 { 1685 {
1764 y = 0; 1686 y = 0;
1765 eheight = height; 1687 eheight = height;
1766 } 1688 }
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 1689#endif
1775 1690
1776 /* round down */ 1691 /* round down */
1777 rc[PART_BEG].col = Pixel2Col (x); 1692 rc[PART_BEG].col = Pixel2Col (x);
1778 rc[PART_BEG].row = Pixel2Row (y); 1693 rc[PART_BEG].row = Pixel2Row (y);
… …
1781 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1696 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1782 1697
1783 /* sanity checks */ 1698 /* sanity checks */
1784 for (i = PART_BEG; i < RC_COUNT; i++) 1699 for (i = PART_BEG; i < RC_COUNT; i++)
1785 { 1700 {
1786 MIN_IT (rc[i].col, ncol - 1); 1701 min_it (rc[i].col, ncol - 1);
1787 MIN_IT (rc[i].row, nrow - 1); 1702 min_it (rc[i].row, nrow - 1);
1788 } 1703 }
1789 1704
1790 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1705 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); 1706 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1792 1707
1793 if (refresh) 1708 if (refresh)
1794 scr_refresh (SLOW_REFRESH); 1709 scr_refresh (SLOW_REFRESH);
1795} 1710}
1796 1711
… …
1959{ 1874{
1960 unsigned char must_clear, /* use draw_string not draw_image_string */ 1875 unsigned char must_clear, /* use draw_string not draw_image_string */
1961 showcursor; /* show the cursor */ 1876 showcursor; /* show the cursor */
1962 int16_t col, row, /* column/row we're processing */ 1877 int16_t col, row, /* column/row we're processing */
1963 ocrow; /* old cursor row */ 1878 ocrow; /* old cursor row */
1964 int i, /* tmp */ 1879 int i; /* tmp */
1965 row_offset; /* basic offset in screen structure */
1966#ifndef NO_CURSORCOLOR 1880#ifndef NO_CURSORCOLOR
1967 rend_t cc1; /* store colours at cursor position (s) */ 1881 rend_t cc1; /* store colours at cursor position (s) */
1968#endif 1882#endif
1969 rend_t *crp; // cursor rendition pointer 1883 rend_t *crp; // cursor rendition pointer
1970 1884
… …
1976 /* 1890 /*
1977 * A: set up vars 1891 * A: set up vars
1978 */ 1892 */
1979 must_clear = 0; 1893 must_clear = 0;
1980 refresh_count = 0; 1894 refresh_count = 0;
1981
1982 row_offset = term_start - view_start;
1983 1895
1984#if XPM_BACKGROUND 1896#if XPM_BACKGROUND
1985 must_clear |= bgPixmap.pixmap != None; 1897 must_clear |= bgPixmap.pixmap != None;
1986#endif 1898#endif
1987#if TRANSPARENT 1899#if TRANSPARENT
… …
2057 if (screen.cur.row + view_start != ocrow 1969 if (screen.cur.row + view_start != ocrow
2058 || screen.cur.col != oldcursor.col) 1970 || screen.cur.col != oldcursor.col)
2059 { 1971 {
2060 if (ocrow < nrow 1972 if (ocrow < nrow
2061 && oldcursor.col < ncol) 1973 && oldcursor.col < ncol)
2062 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 1974 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2063 1975
2064 if (focus || !showcursor) 1976 if (focus || !showcursor)
2065 oldcursor.row = -1; 1977 oldcursor.row = -1;
2066 else 1978 else
2067 setoldcursor = 1; 1979 setoldcursor = 1;
… …
2105 row = i > 0 ? 0 : j - 1; 2017 row = i > 0 ? 0 : j - 1;
2106 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2018 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2107 { 2019 {
2108 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2020 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2109 { 2021 {
2110 line_t s = save[(row + row_offset) % total_rows]; 2022 line_t s = ROW(row - view_start);
2111 line_t d = drawn[row]; 2023 line_t d = drawn_buf[row];
2112 line_t d2 = drawn[row + i]; 2024 line_t d2 = drawn_buf[row + i];
2113 2025
2114 for (nits = 0, col = ncol; col--; ) 2026 for (nits = 0, col = ncol; col--; )
2115 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2027 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2116 nits--; 2028 nits--;
2117 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2029 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2135 2047
2136 if (len != -1) 2048 if (len != -1)
2137 { 2049 {
2138 /* also comes here at end if needed because of >= above */ 2050 /* also comes here at end if needed because of >= above */
2139 if (wlen < len) 2051 if (wlen < len)
2140 SWAP_IT (wlen, len, int); 2052 ::swap (wlen, len);
2141 2053
2142 XCopyArea (display->display, vt, vt, 2054 XCopyArea (display->display, vt, vt,
2143 gc, 0, Row2Pixel (len + i), 2055 gc, 0, Row2Pixel (len + i),
2144 (unsigned int)TermWin_TotalWidth (), 2056 (unsigned int)TermWin_TotalWidth (),
2145 (unsigned int)Height2Pixel (wlen - len + 1), 2057 (unsigned int)Height2Pixel (wlen - len + 1),
… …
2153 /* 2065 /*
2154 * E: main pass across every character 2066 * E: main pass across every character
2155 */ 2067 */
2156 for (row = 0; row < nrow; row++) 2068 for (row = 0; row < nrow; row++)
2157 { 2069 {
2158 text_t *stp = save[(row + row_offset) % total_rows].t; 2070 text_t *stp = ROW(row - view_start).t;
2159 rend_t *srp = save[(row + row_offset) % total_rows].r; 2071 rend_t *srp = ROW(row - view_start).r;
2160 text_t *dtp = drawn[row].t; 2072 text_t *dtp = drawn_buf[row].t;
2161 rend_t *drp = drawn[row].r; 2073 rend_t *drp = drawn_buf[row].r;
2162 2074
2163 /* 2075 /*
2164 * E2: OK, now the real pass 2076 * E2: OK, now the real pass
2165 */ 2077 */
2166 int ypixel = (int)Row2Pixel (row); 2078 int ypixel = (int)Row2Pixel (row);
… …
2277 fore = Color_UL; 2189 fore = Color_UL;
2278#endif 2190#endif
2279 2191
2280 if (invert) 2192 if (invert)
2281 { 2193 {
2282 SWAP_IT (fore, back, int); 2194 ::swap (fore, back);
2283 2195
2284#ifndef NO_BOLD_UNDERLINE_REVERSE 2196#ifndef NO_BOLD_UNDERLINE_REVERSE
2285 if (ISSET_PIXCOLOR (Color_RV)) 2197 if (ISSET_PIXCOLOR (Color_RV))
2286 back = Color_RV; 2198 back = Color_RV;
2287 2199
… …
2379 2291
2380 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2292 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2381 col--; 2293 col--;
2382 2294
2383 while (col + cursorwidth < ncol 2295 while (col + cursorwidth < ncol
2384 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2296 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2385 cursorwidth++; 2297 cursorwidth++;
2386 2298
2387#ifndef NO_CURSORCOLOR 2299#ifndef NO_CURSORCOLOR
2388 if (ISSET_PIXCOLOR (Color_cursor)) 2300 if (ISSET_PIXCOLOR (Color_cursor))
2389 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2301 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2421 2333
2422void 2334void
2423rxvt_term::scr_remap_chars () 2335rxvt_term::scr_remap_chars ()
2424{ 2336{
2425 for (int i = total_rows; i--; ) 2337 for (int i = total_rows; i--; )
2426 scr_remap_chars (save[i]); 2338 scr_remap_chars (row_buf [i]);
2427 2339
2428 for (int i = nrow; i--; ) 2340 for (int i = nrow; i--; )
2429 { 2341 {
2430 scr_remap_chars (drawn[i]); 2342 scr_remap_chars (drawn_buf [i]);
2431 scr_remap_chars (swap_save[i]); 2343 scr_remap_chars (swap_buf [i]);
2432 } 2344 }
2433} 2345}
2434 2346
2435void 2347void
2436rxvt_term::scr_recolour () 2348rxvt_term::scr_recolour ()
… …
2533 char r1[] = "\n"; 2445 char r1[] = "\n";
2534 2446
2535 for (row = saveLines - nsaved; 2447 for (row = saveLines - nsaved;
2536 row < saveLines + nrow - 1; row++) 2448 row < saveLines + nrow - 1; row++)
2537 { 2449 {
2538 width = save[row].l >= 0 ? save[row].l 2450 width = row_buf[row].l >= 0 ? row_buf[row].l
2539 : ncol; 2451 : ncol;
2540 for (towrite = width; towrite; towrite -= wrote) 2452 for (towrite = width; towrite; towrite -= wrote)
2541 { 2453 {
2542 wrote = write (fd, & (save[row].t[width - towrite]), 2454 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2543 towrite); 2455 towrite);
2544 if (wrote < 0) 2456 if (wrote < 0)
2545 return; /* XXX: death, no report */ 2457 return; /* XXX: death, no report */
2546 } 2458 }
2547 if (save[row].l >= 0) 2459 if (row_buf[row].l >= 0)
2548 if (write (fd, r1, 1) <= 0) 2460 if (write (fd, r1, 1) <= 0)
2549 return; /* XXX: death, no report */ 2461 return; /* XXX: death, no report */
2550 } 2462 }
2551} 2463}
2552#endif 2464#endif
… …
3029 want_refresh = 1; 2941 want_refresh = 1;
3030 2942
3031 selection.mark.row = row - view_start; 2943 selection.mark.row = row - view_start;
3032 selection.mark.col = col; 2944 selection.mark.col = col;
3033 2945
3034 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); 2946 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3035 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); 2947 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3036 2948
3037 while (selection.mark.col > 0 2949 while (selection.mark.col > 0
3038 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 2950 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3039 --selection.mark.col; 2951 --selection.mark.col;
3040 2952
… …
3145 * flag == 2 ==> button 3 motion 3057 * flag == 2 ==> button 3 motion
3146 */ 3058 */
3147void 3059void
3148rxvt_term::selection_extend (int x, int y, int flag) 3060rxvt_term::selection_extend (int x, int y, int flag)
3149{ 3061{
3150 int col = min (max (Pixel2Col (x), 0), nrow - 1); 3062 int col = clamp (Pixel2Col (x), 0, ncol);
3151 int row = min (max (Pixel2Row (y), 0), ncol); 3063 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3152 3064
3153 /* 3065 /*
3154 * If we're selecting characters (single click) then we must check first 3066 * 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 3067 * 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 3068 * select nothing. Otherwise, if we're to the right of the mark, you have to
… …
3369 } 3281 }
3370 } 3282 }
3371 3283
3372#if ENABLE_FRILLS 3284#if ENABLE_FRILLS
3373 if (selection.rect && selection.beg.col > selection.end.col) 3285 if (selection.rect && selection.beg.col > selection.end.col)
3374 SWAP_IT (selection.beg.col, selection.end.col, int); 3286 ::swap (selection.beg.col, selection.end.col);
3375#endif 3287#endif
3376} 3288}
3377 3289
3378#if ENABLE_FRILLS 3290#if ENABLE_FRILLS
3379void 3291void
… …
3577 */ 3489 */
3578void 3490void
3579rxvt_term::pixel_position (int *x, int *y) 3491rxvt_term::pixel_position (int *x, int *y)
3580{ 3492{
3581 *x = Pixel2Col (*x); 3493 *x = Pixel2Col (*x);
3582 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3494 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3583 *y = Pixel2Row (*y); 3495 *y = Pixel2Row (*y);
3584 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3496 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3585} 3497}
3586 3498
3587/* ------------------------------------------------------------------------- */ 3499/* ------------------------------------------------------------------------- */
3588#ifdef USE_XIM 3500#ifdef USE_XIM
3589void 3501void
… …
3611 3523
3612 if (x < 0) x = ncol - w; 3524 if (x < 0) x = ncol - w;
3613 if (y < 0) y = nrow - h; 3525 if (y < 0) y = nrow - h;
3614 3526
3615 // make space for border 3527 // make space for border
3616 w += 2; MIN_IT (w, ncol); 3528 w += 2; min_it (w, ncol);
3617 h += 2; MIN_IT (h, nrow); 3529 h += 2; min_it (h, nrow);
3618 3530
3619 x -= 1; MAX_IT (x, 0); 3531 x -= 1; clamp_it (x, 0, ncol - w);
3620 y -= 1; MAX_IT (y, 0); 3532 y -= 1; clamp_it (y, 0, nrow - h);
3621
3622 MIN_IT (x, ncol - w);
3623 MIN_IT (y, nrow - h);
3624 3533
3625 ov_x = x; ov_y = y; 3534 ov_x = x; ov_y = y;
3626 ov_w = w; ov_h = h; 3535 ov_w = w; ov_h = h;
3627 3536
3628 ov_text = new text_t *[h]; 3537 ov_text = new text_t *[h];

Diff Legend

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