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.177 by root, Tue Dec 20 21:49:55 2005 UTC vs.
Revision 1.186 by root, Wed Dec 21 19:50:17 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 printf ("resize %d:%d => %d:%d\n", prev_nrow, prev_ncol, nrow, ncol);//D
249 rxvt_salloc *old_ra;
250 245
246 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248
249#if 0
251 if (nrow < prev_nrow) 250 if (nrow < prev_nrow)
252 { 251 {
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++) 252 for (int row = nrow; row < prev_nrow; row++)
259 { 253 {
260 lfree (ROW(p));
261 lfree (swap_save[p]); 254 lfree (swap_buf [row]);
262 lfree (drawn[p]); 255 lfree (drawn_buf[row]);
263 } 256 }
257 }
258#endif
264 259
265 /* we have fewer rows so fix up cursor position */ 260 drawn_buf = (line_t *) rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
266 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 261 temp_buf = (line_t *) rxvt_realloc (temp_buf , nrow * sizeof (line_t));
262 swap_buf = (line_t *) rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267 263
268 scr_reset_realloc (); /* realloc _last_ */ 264 for (int row = min (nrow, prev_nrow); row--; )
265 {
266 lresize (drawn_buf[row]);
267 lresize (swap_buf [row]);
268 }
269
270 for (int row = prev_nrow; row < nrow; row++)
271 {
272 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 }
275
276 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
269 } 277
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 278 // re-wrap lines, this is rather ugly, possibly because I am too dumb
331 // to come up with a lean and mean algorithm. 279 // 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 280
339 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 281 int p = MOD (term_start + nrow , prev_total_rows); // previous row
282 int pend = MOD (term_start - nsaved, prev_total_rows);
283 int q = total_rows; // rewrapped row
340 284
341 p = prev_total_rows;
342 q = total_rows;
343
344 while (p > 0 && q > 0) 285 while (p != pend && q > 0)
345 { 286 {
346 --p; 287 p = MOD (p - 1, prev_total_rows);
347 288
348 printf ("pq %d:%d\n", p, q); 289 assert (old_buf [MOD (p, prev_total_rows)].t);
349 if (save[p].t) 290 assert (!old_buf [MOD (p, prev_total_rows)].is_longer ());
291
292 int llen = old_buf [MOD (p, prev_total_rows)].l;
293
294 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
350 { 295 {
351 int llen = save[p].l; 296 p = MOD (p - 1, prev_total_rows);
352 297
353 assert (llen >= 0); 298 llen += prev_ncol;
299 }
354 300
355 while (p && save[p - 1].l < 0) 301 int qlines = llen / ncol + 1;
302 int lofs = 0;
303
304 q -= qlines;
305
306 int qrow = q;
307
308 for (; qlines--; qrow++)
309 {
310 if (qrow >= 0)
356 { 311 {
312 line_t &qline = row_buf [qrow];
313
314 lalloc (qline);
315 qline.set_is_longer ();
316
317 int qcol = 0;
318
319 for (;;)
357 --p; 320 {
358 llen += prev_ncol; 321 int prow = lofs / prev_ncol + p;
322 int pcol = lofs % prev_ncol;
323
324 line_t &pline = old_buf [p];
325
326 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
327
328 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
330 if (len <= 0)
331 {
332 qline.l = qcol;
333 scr_blank_line (qline, qcol, ncol - qcol, DEFAULT_RSTYLE);
334 break;
335 }
336
337 assert (lofs < 1000);
338
339 memcpy (qline.t + qcol, pline.t + pcol, len * sizeof (text_t));
340 memcpy (qline.r + qcol, pline.r + pcol, len * sizeof (rend_t));
341
342 lofs += len;
343 qcol += len;
344
345 if (qcol == ncol)
346 break;
347 }
359 } 348 }
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;
382 int pcol = lofs % prev_ncol;
383
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385
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);
400
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t));
403
404 lofs += len;
405 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 }
411 else 349 else
412 lofs += ncol; 350 lofs += ncol;
413 }
414 } 351 }
415 } 352 }
416 353
417 free (screen.text); screen.text = tp; 354 free (old_buf);
418 free (screen.rend); screen.rend = rp; 355 delete old_ta;
419 free (screen.tlen); screen.tlen = tl; 356 delete old_ra;
420 357
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 358 min_it (screen.cur.row, nrow - 1);
422#endif 359 min_it (screen.cur.col, ncol - 1);
423 360
424 if (tabs) 361 if (tabs)
425 free (tabs); 362 free (tabs);
426 } 363 }
427 364
428 prev_nrow = nrow; 365 prev_nrow = nrow;
429 prev_ncol = ncol; 366 prev_ncol = ncol;
430 367
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 368 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 369
433 for (p = 0; p < ncol; p++) 370 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 371 tabs [col] = col % TABSIZE == 0;
435 372
436 tt_winch (); 373 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} 374}
447 375
448/* ------------------------------------------------------------------------- */ 376/* ------------------------------------------------------------------------- */
449/* 377/*
450 * Free everything. That way malloc debugging can find leakage. 378 * Free everything. That way malloc debugging can find leakage.
… …
453rxvt_term::scr_release () 381rxvt_term::scr_release ()
454{ 382{
455 delete talloc; talloc = 0; 383 delete talloc; talloc = 0;
456 delete ralloc; ralloc = 0; 384 delete ralloc; ralloc = 0;
457 385
458 free (save); 386 free (row_buf);
459 free (swap_save); 387 free (swap_buf);
460 free (drawn); 388 free (drawn_buf);
461 free (buf); 389 free (temp_buf);
462 free (tabs); 390 free (tabs);
463} 391}
464 392
465/* ------------------------------------------------------------------------- */ 393/* ------------------------------------------------------------------------- */
466/* 394/*
… …
518 set_font_style (); 446 set_font_style ();
519 break; 447 break;
520 } 448 }
521 449
522 /* boundary check in case screen size changed between SAVE and RESTORE */ 450 /* boundary check in case screen size changed between SAVE and RESTORE */
523 MIN_IT (s->cur.row, nrow - 1); 451 min_it (s->cur.row, nrow - 1);
524 MIN_IT (s->cur.col, ncol - 1); 452 min_it (s->cur.col, ncol - 1);
525#ifdef DEBUG_STRICT 453#ifdef DEBUG_STRICT
526 assert (s->cur.row >= 0); 454 assert (s->cur.row >= 0);
527 assert (s->cur.col >= 0); 455 assert (s->cur.col >= 0);
528#else /* drive with your eyes closed */ 456#else /* drive with your eyes closed */
529 MAX_IT (s->cur.row, 0); 457 max_it (s->cur.row, 0);
530 MAX_IT (s->cur.col, 0); 458 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 = 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
… …
697 // use a simple and robust scrolling algorithm, this 624 // use a simple and robust scrolling algorithm, this
698 // part of scr_scroll_text is not time-critical. 625 // part of scr_scroll_text is not time-critical.
699 626
700 int rows = row2 - row1 + 1; 627 int rows = row2 - row1 + 1;
701 628
629 min_it (count, rows);
630
702 for (int row = 0; row < rows; row++) 631 for (int row = 0; row < rows; row++)
703 { 632 {
704 buf [row] = ROW(row1 + (row + count + rows) % rows); 633 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
705 634
706 if (!IN_RANGE_EXC (row + count, 0, rows)) 635 if (!IN_RANGE_EXC (row + count, 0, rows))
707 scr_blank_screen_mem (buf [row], rstyle); 636 scr_blank_screen_mem (temp_buf [row], rstyle);
708 } 637 }
709 638
710 for (int row = 0; row < rows; row++) 639 for (int row = 0; row < rows; row++)
711 ROW(row1 + row) = buf [row]; 640 ROW(row1 + row) = temp_buf [row];
712 } 641 }
713 642
714 return count; 643 return count;
715} 644}
716 645
… …
734 last_col = ncol; 663 last_col = ncol;
735 664
736 if (nlines > 0) 665 if (nlines > 0)
737 { 666 {
738 nlines += screen.cur.row - screen.bscroll; 667 nlines += screen.cur.row - screen.bscroll;
739 if ((nlines > 0) 668 if (nlines > 0
740 && (screen.tscroll == 0) 669 && screen.tscroll == 0
741 && (screen.bscroll == (nrow - 1))) 670 && screen.bscroll == (nrow - 1))
742 { 671 {
743 /* _at least_ this many lines need to be scrolled */ 672 /* _at least_ this many lines need to be scrolled */
744 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 673 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
745 screen.cur.row -= nlines; 674 screen.cur.row -= nlines;
746 } 675 }
747 } 676 }
748 677
749#ifdef DEBUG_STRICT 678#ifdef DEBUG_STRICT
750 assert (screen.cur.col < last_col); 679 assert (screen.cur.col < last_col);
751 assert ((screen.cur.row < nrow) 680 assert (screen.cur.row < nrow
752 && (screen.cur.row >= - (int32_t)nsaved)); 681 && screen.cur.row >= -nsaved);
753#else /* drive with your eyes closed */ 682#else /* drive with your eyes closed */
754 MIN_IT (screen.cur.col, last_col - 1); 683 min_it (screen.cur.col, last_col - 1);
755 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 684 clamp_it (screen.cur.row, -nsaved, nrow - 1);
756 MAX_IT (screen.cur.row, - (int32_t)nsaved);
757#endif 685#endif
758 row = screen.cur.row; 686 row = screen.cur.row;
759 687
760 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 688 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
761 689
… …
767 695
768 if (c < 0x20) 696 if (c < 0x20)
769 if (c == C0_LF) 697 if (c == C0_LF)
770 { 698 {
771 if (!line->is_longer ()) /* XXX: think about this */ 699 if (!line->is_longer ()) /* XXX: think about this */
772 MAX_IT (line->l, screen.cur.col); 700 max_it (line->l, screen.cur.col);
773 701
774 screen.flags &= ~Screen_WrapNext; 702 screen.flags &= ~Screen_WrapNext;
775 703
776 if (screen.cur.row == screen.bscroll) 704 if (screen.cur.row == screen.bscroll)
777 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 705 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
782 continue; 710 continue;
783 } 711 }
784 else if (c == C0_CR) 712 else if (c == C0_CR)
785 { 713 {
786 if (!line->is_longer ()) /* XXX: think about this */ 714 if (!line->is_longer ()) /* XXX: think about this */
787 MAX_IT (line->l, screen.cur.col); 715 max_it (line->l, screen.cur.col);
788 716
789 screen.flags &= ~Screen_WrapNext; 717 screen.flags &= ~Screen_WrapNext;
790 screen.cur.col = 0; 718 screen.cur.col = 0;
791 continue; 719 continue;
792 } 720 }
… …
968#endif 896#endif
969 } 897 }
970 } 898 }
971 899
972 if (!line->is_longer ()) /* XXX: think about this */ 900 if (!line->is_longer ()) /* XXX: think about this */
973 MAX_IT (line->l, screen.cur.col); 901 max_it (line->l, screen.cur.col);
974 902
975#ifdef DEBUG_STRICT 903#ifdef DEBUG_STRICT
976 assert (screen.cur.row >= 0); 904 assert (screen.cur.row >= 0);
977#else /* drive with your eyes closed */ 905#else /* drive with your eyes closed */
978 MAX_IT (screen.cur.row, 0); 906 max_it (screen.cur.row, 0);
979#endif 907#endif
980} 908}
981 909
982/* ------------------------------------------------------------------------- */ 910/* ------------------------------------------------------------------------- */
983/* 911/*
… …
1049 if (ht && options & Opt_pastableTabs) 977 if (ht && options & Opt_pastableTabs)
1050 { 978 {
1051 base_rend = SET_FONT (base_rend, 0); 979 base_rend = SET_FONT (base_rend, 0);
1052 980
1053 if (!l.is_longer ()) /* XXX: think about this */ 981 if (!l.is_longer ()) /* XXX: think about this */
1054 MAX_IT (l.l, x); 982 max_it (l.l, x);
1055 983
1056 i = screen.cur.col; 984 i = screen.cur.col;
1057 985
1058 l.t[i] = '\t'; 986 l.t[i] = '\t';
1059 l.r[i] = base_rend; 987 l.r[i] = base_rend;
… …
1138{ 1066{
1139 want_refresh = 1; 1067 want_refresh = 1;
1140 ZERO_SCROLLBACK (); 1068 ZERO_SCROLLBACK ();
1141 1069
1142 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1070 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1143 MAX_IT (screen.cur.col, 0); 1071 clamp_it (screen.cur.col, 0, ncol - 1);
1144 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1145 1072
1146 screen.flags &= ~Screen_WrapNext; 1073 screen.flags &= ~Screen_WrapNext;
1147 1074
1148 if (relative & R_RELATIVE) 1075 if (relative & R_RELATIVE)
1149 { 1076 {
… …
1167 else 1094 else
1168 { 1095 {
1169 if (screen.flags & Screen_Relative) 1096 if (screen.flags & Screen_Relative)
1170 { /* relative origin mode */ 1097 { /* relative origin mode */
1171 screen.cur.row = row + screen.tscroll; 1098 screen.cur.row = row + screen.tscroll;
1172 MIN_IT (screen.cur.row, screen.bscroll); 1099 min_it (screen.cur.row, screen.bscroll);
1173 } 1100 }
1174 else 1101 else
1175 screen.cur.row = row; 1102 screen.cur.row = row;
1176 } 1103 }
1177 1104
1178 MAX_IT (screen.cur.row, 0); 1105 clamp_it (screen.cur.row, 0, nrow - 1);
1179 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1180} 1106}
1181 1107
1182/* ------------------------------------------------------------------------- */ 1108/* ------------------------------------------------------------------------- */
1183/* 1109/*
1184 * direction should be UP or DN 1110 * direction should be UP or DN
… …
1199 || (screen.cur.row == screen.tscroll && direction == DN)) 1125 || (screen.cur.row == screen.tscroll && direction == DN))
1200 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1126 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1201 else 1127 else
1202 screen.cur.row += dirn; 1128 screen.cur.row += dirn;
1203 1129
1204 MAX_IT (screen.cur.row, 0); 1130 clamp_it (screen.cur.row, 0, nrow - 1);
1205 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1206 selection_check (0); 1131 selection_check (0);
1207} 1132}
1208 1133
1209/* ------------------------------------------------------------------------- */ 1134/* ------------------------------------------------------------------------- */
1210/* 1135/*
… …
1228 switch (mode) 1153 switch (mode)
1229 { 1154 {
1230 case 0: /* erase to end of line */ 1155 case 0: /* erase to end of line */
1231 col = screen.cur.col; 1156 col = screen.cur.col;
1232 num = ncol - col; 1157 num = ncol - col;
1233 MIN_IT (ROW(row).l, (int16_t)col); 1158 min_it (ROW(row).l, col);
1234 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1159 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1235 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1160 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1236 CLEAR_SELECTION (); 1161 CLEAR_SELECTION ();
1237 break; 1162 break;
1238 case 1: /* erase to beginning of line */ 1163 case 1: /* erase to beginning of line */
… …
1305 CLEAR_SELECTION (); 1230 CLEAR_SELECTION ();
1306 1231
1307 if (row >= nrow) /* Out Of Bounds */ 1232 if (row >= nrow) /* Out Of Bounds */
1308 return; 1233 return;
1309 1234
1310 MIN_IT (num, (nrow - row)); 1235 min_it (num, nrow - row);
1311 1236
1312 if (rstyle & (RS_RVid | RS_Uline)) 1237 if (rstyle & (RS_RVid | RS_Uline))
1313 ren = (rend_t) ~RS_None; 1238 ren = (rend_t) ~RS_None;
1314 else if (GET_BASEBG (rstyle) == Color_bg) 1239 else if (GET_BASEBG (rstyle) == Color_bg)
1315 { 1240 {
… …
1328 1253
1329 for (; num--; row++) 1254 for (; num--; row++)
1330 { 1255 {
1331 scr_blank_screen_mem (ROW (row), rstyle); 1256 scr_blank_screen_mem (ROW (row), rstyle);
1332 ROW (row).l = 0; 1257 ROW (row).l = 0;
1333 scr_blank_line (drawn[row], 0, ncol, ren); 1258 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1334 } 1259 }
1335} 1260}
1336 1261
1337#if ENABLE_FRILLS 1262#if ENABLE_FRILLS
1338void 1263void
… …
1423 return; 1348 return;
1424 1349
1425 scr_do_wrap (); 1350 scr_do_wrap ();
1426 1351
1427 selection_check (1); 1352 selection_check (1);
1428 MIN_IT (count, (ncol - screen.cur.col)); 1353 min_it (count, ncol - screen.cur.col);
1429 1354
1430 row = screen.cur.row; 1355 row = screen.cur.row;
1431 1356
1432 line_t *line = &ROW(row); 1357 line_t *line = &ROW(row);
1433 1358
… …
1441 } 1366 }
1442 1367
1443 if (!line->is_longer ()) 1368 if (!line->is_longer ())
1444 { 1369 {
1445 line->l += count; 1370 line->l += count;
1446 MIN_IT (line->l, ncol); 1371 min_it (line->l, ncol);
1447 } 1372 }
1448 1373
1449 if (selection.op && current_screen == selection.screen 1374 if (selection.op && current_screen == selection.screen
1450 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1375 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1451 { 1376 {
… …
1512 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1437 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1513 */ 1438 */
1514void 1439void
1515rxvt_term::scr_scroll_region (int top, int bot) 1440rxvt_term::scr_scroll_region (int top, int bot)
1516{ 1441{
1517 MAX_IT (top, 0); 1442 max_it (top, 0);
1518 MIN_IT (bot, (int)nrow - 1); 1443 min_it (bot, nrow - 1);
1519 1444
1520 if (top > bot) 1445 if (top > bot)
1521 return; 1446 return;
1522 1447
1523 screen.tscroll = top; 1448 screen.tscroll = top;
… …
1621 XGCValues gcvalue; 1546 XGCValues gcvalue;
1622 1547
1623 if (rvideo != mode) 1548 if (rvideo != mode)
1624 { 1549 {
1625 rvideo = mode; 1550 rvideo = mode;
1626 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1551 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1627#if XPM_BACKGROUND 1552#if XPM_BACKGROUND
1628 if (bgPixmap.pixmap == None) 1553 if (bgPixmap.pixmap == None)
1629#endif 1554#endif
1630#if TRANSPARENT 1555#if TRANSPARENT
1631 if (! (options & Opt_transparent) || am_transparent == 0) 1556 if (! (options & Opt_transparent) || am_transparent == 0)
… …
1727 bool found = false; 1652 bool found = false;
1728 1653
1729 for (int i = 0; i < nrow; i++) 1654 for (int i = 0; i < nrow; i++)
1730 { 1655 {
1731 int col = 0; 1656 int col = 0;
1732 rend_t *drp = drawn[i].r; 1657 rend_t *drp = drawn_buf[i].r;
1733 1658
1734 for (; col < ncol; col++, drp++) 1659 for (; col < ncol; col++, drp++)
1735 if ((*drp & mask) == value) 1660 if ((*drp & mask) == value)
1736 { 1661 {
1737 found = true; 1662 found = true;
… …
1755rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1680rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1756{ 1681{
1757 int i; 1682 int i;
1758 row_col_t rc[RC_COUNT]; 1683 row_col_t rc[RC_COUNT];
1759 1684
1760 if (!drawn) /* sanity check */ 1685 if (!drawn_buf) /* sanity check */
1761 return; 1686 return;
1762 1687
1763#ifndef NO_SLOW_LINK_SUPPORT 1688#ifndef NO_SLOW_LINK_SUPPORT
1764 if (refresh_type == FAST_REFRESH && !display->is_local) 1689 if (refresh_type == FAST_REFRESH && !display->is_local)
1765 { 1690 {
… …
1767 eheight = height; 1692 eheight = height;
1768 } 1693 }
1769#endif 1694#endif
1770 1695
1771#ifdef DEBUG_STRICT 1696#ifdef DEBUG_STRICT
1772 x = max (x, 0); 1697#if 0
1773 x = min (x, (int)width); 1698 // that's not debugging //TODO //FIXME
1774 y = max (y, 0); 1699 clamp_it (x, 0, width);
1775 y = min (y, (int)height); 1700 clamp_it (y, 0, height);
1701#endif
1776#endif 1702#endif
1777 1703
1778 /* round down */ 1704 /* round down */
1779 rc[PART_BEG].col = Pixel2Col (x); 1705 rc[PART_BEG].col = Pixel2Col (x);
1780 rc[PART_BEG].row = Pixel2Row (y); 1706 rc[PART_BEG].row = Pixel2Row (y);
… …
1783 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1709 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1784 1710
1785 /* sanity checks */ 1711 /* sanity checks */
1786 for (i = PART_BEG; i < RC_COUNT; i++) 1712 for (i = PART_BEG; i < RC_COUNT; i++)
1787 { 1713 {
1788 MIN_IT (rc[i].col, ncol - 1); 1714 min_it (rc[i].col, ncol - 1);
1789 MIN_IT (rc[i].row, nrow - 1); 1715 min_it (rc[i].row, nrow - 1);
1790 } 1716 }
1791 1717
1792 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1718 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1793 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1719 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1794 1720
1795 if (refresh) 1721 if (refresh)
1796 scr_refresh (SLOW_REFRESH); 1722 scr_refresh (SLOW_REFRESH);
1797} 1723}
1798 1724
… …
1961{ 1887{
1962 unsigned char must_clear, /* use draw_string not draw_image_string */ 1888 unsigned char must_clear, /* use draw_string not draw_image_string */
1963 showcursor; /* show the cursor */ 1889 showcursor; /* show the cursor */
1964 int16_t col, row, /* column/row we're processing */ 1890 int16_t col, row, /* column/row we're processing */
1965 ocrow; /* old cursor row */ 1891 ocrow; /* old cursor row */
1966 int i, /* tmp */ 1892 int i; /* tmp */
1967 row_offset; /* basic offset in screen structure */
1968#ifndef NO_CURSORCOLOR 1893#ifndef NO_CURSORCOLOR
1969 rend_t cc1; /* store colours at cursor position (s) */ 1894 rend_t cc1; /* store colours at cursor position (s) */
1970#endif 1895#endif
1971 rend_t *crp; // cursor rendition pointer 1896 rend_t *crp; // cursor rendition pointer
1972 1897
… …
1978 /* 1903 /*
1979 * A: set up vars 1904 * A: set up vars
1980 */ 1905 */
1981 must_clear = 0; 1906 must_clear = 0;
1982 refresh_count = 0; 1907 refresh_count = 0;
1983
1984 row_offset = term_start - view_start;
1985 1908
1986#if XPM_BACKGROUND 1909#if XPM_BACKGROUND
1987 must_clear |= bgPixmap.pixmap != None; 1910 must_clear |= bgPixmap.pixmap != None;
1988#endif 1911#endif
1989#if TRANSPARENT 1912#if TRANSPARENT
… …
2059 if (screen.cur.row + view_start != ocrow 1982 if (screen.cur.row + view_start != ocrow
2060 || screen.cur.col != oldcursor.col) 1983 || screen.cur.col != oldcursor.col)
2061 { 1984 {
2062 if (ocrow < nrow 1985 if (ocrow < nrow
2063 && oldcursor.col < ncol) 1986 && oldcursor.col < ncol)
2064 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 1987 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2065 1988
2066 if (focus || !showcursor) 1989 if (focus || !showcursor)
2067 oldcursor.row = -1; 1990 oldcursor.row = -1;
2068 else 1991 else
2069 setoldcursor = 1; 1992 setoldcursor = 1;
… …
2107 row = i > 0 ? 0 : j - 1; 2030 row = i > 0 ? 0 : j - 1;
2108 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2031 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2109 { 2032 {
2110 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2033 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2111 { 2034 {
2112 line_t s = save[(row + row_offset) % total_rows]; 2035 line_t s = ROW(row - view_start);
2113 line_t d = drawn[row]; 2036 line_t d = drawn_buf[row];
2114 line_t d2 = drawn[row + i]; 2037 line_t d2 = drawn_buf[row + i];
2115 2038
2116 for (nits = 0, col = ncol; col--; ) 2039 for (nits = 0, col = ncol; col--; )
2117 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2040 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2118 nits--; 2041 nits--;
2119 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2042 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2137 2060
2138 if (len != -1) 2061 if (len != -1)
2139 { 2062 {
2140 /* also comes here at end if needed because of >= above */ 2063 /* also comes here at end if needed because of >= above */
2141 if (wlen < len) 2064 if (wlen < len)
2142 SWAP_IT (wlen, len, int); 2065 ::swap (wlen, len);
2143 2066
2144 XCopyArea (display->display, vt, vt, 2067 XCopyArea (display->display, vt, vt,
2145 gc, 0, Row2Pixel (len + i), 2068 gc, 0, Row2Pixel (len + i),
2146 (unsigned int)TermWin_TotalWidth (), 2069 (unsigned int)TermWin_TotalWidth (),
2147 (unsigned int)Height2Pixel (wlen - len + 1), 2070 (unsigned int)Height2Pixel (wlen - len + 1),
… …
2155 /* 2078 /*
2156 * E: main pass across every character 2079 * E: main pass across every character
2157 */ 2080 */
2158 for (row = 0; row < nrow; row++) 2081 for (row = 0; row < nrow; row++)
2159 { 2082 {
2160 text_t *stp = save[(row + row_offset) % total_rows].t; 2083 text_t *stp = ROW(row - view_start).t;
2161 rend_t *srp = save[(row + row_offset) % total_rows].r; 2084 rend_t *srp = ROW(row - view_start).r;
2162 text_t *dtp = drawn[row].t; 2085 text_t *dtp = drawn_buf[row].t;
2163 rend_t *drp = drawn[row].r; 2086 rend_t *drp = drawn_buf[row].r;
2164 2087
2165 /* 2088 /*
2166 * E2: OK, now the real pass 2089 * E2: OK, now the real pass
2167 */ 2090 */
2168 int ypixel = (int)Row2Pixel (row); 2091 int ypixel = (int)Row2Pixel (row);
… …
2279 fore = Color_UL; 2202 fore = Color_UL;
2280#endif 2203#endif
2281 2204
2282 if (invert) 2205 if (invert)
2283 { 2206 {
2284 SWAP_IT (fore, back, int); 2207 ::swap (fore, back);
2285 2208
2286#ifndef NO_BOLD_UNDERLINE_REVERSE 2209#ifndef NO_BOLD_UNDERLINE_REVERSE
2287 if (ISSET_PIXCOLOR (Color_RV)) 2210 if (ISSET_PIXCOLOR (Color_RV))
2288 back = Color_RV; 2211 back = Color_RV;
2289 2212
… …
2381 2304
2382 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2305 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2383 col--; 2306 col--;
2384 2307
2385 while (col + cursorwidth < ncol 2308 while (col + cursorwidth < ncol
2386 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2309 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2387 cursorwidth++; 2310 cursorwidth++;
2388 2311
2389#ifndef NO_CURSORCOLOR 2312#ifndef NO_CURSORCOLOR
2390 if (ISSET_PIXCOLOR (Color_cursor)) 2313 if (ISSET_PIXCOLOR (Color_cursor))
2391 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2314 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2423 2346
2424void 2347void
2425rxvt_term::scr_remap_chars () 2348rxvt_term::scr_remap_chars ()
2426{ 2349{
2427 for (int i = total_rows; i--; ) 2350 for (int i = total_rows; i--; )
2428 scr_remap_chars (save[i]); 2351 scr_remap_chars (row_buf [i]);
2429 2352
2430 for (int i = nrow; i--; ) 2353 for (int i = nrow; i--; )
2431 { 2354 {
2432 scr_remap_chars (drawn[i]); 2355 scr_remap_chars (drawn_buf [i]);
2433 scr_remap_chars (swap_save[i]); 2356 scr_remap_chars (swap_buf [i]);
2434 } 2357 }
2435} 2358}
2436 2359
2437void 2360void
2438rxvt_term::scr_recolour () 2361rxvt_term::scr_recolour ()
… …
2535 char r1[] = "\n"; 2458 char r1[] = "\n";
2536 2459
2537 for (row = saveLines - nsaved; 2460 for (row = saveLines - nsaved;
2538 row < saveLines + nrow - 1; row++) 2461 row < saveLines + nrow - 1; row++)
2539 { 2462 {
2540 width = save[row].l >= 0 ? save[row].l 2463 width = row_buf[row].l >= 0 ? row_buf[row].l
2541 : ncol; 2464 : ncol;
2542 for (towrite = width; towrite; towrite -= wrote) 2465 for (towrite = width; towrite; towrite -= wrote)
2543 { 2466 {
2544 wrote = write (fd, & (save[row].t[width - towrite]), 2467 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2545 towrite); 2468 towrite);
2546 if (wrote < 0) 2469 if (wrote < 0)
2547 return; /* XXX: death, no report */ 2470 return; /* XXX: death, no report */
2548 } 2471 }
2549 if (save[row].l >= 0) 2472 if (row_buf[row].l >= 0)
2550 if (write (fd, r1, 1) <= 0) 2473 if (write (fd, r1, 1) <= 0)
2551 return; /* XXX: death, no report */ 2474 return; /* XXX: death, no report */
2552 } 2475 }
2553} 2476}
2554#endif 2477#endif
… …
3031 want_refresh = 1; 2954 want_refresh = 1;
3032 2955
3033 selection.mark.row = row - view_start; 2956 selection.mark.row = row - view_start;
3034 selection.mark.col = col; 2957 selection.mark.col = col;
3035 2958
3036 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); 2959 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3037 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); 2960 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3038 2961
3039 while (selection.mark.col > 0 2962 while (selection.mark.col > 0
3040 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 2963 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3041 --selection.mark.col; 2964 --selection.mark.col;
3042 2965
… …
3147 * flag == 2 ==> button 3 motion 3070 * flag == 2 ==> button 3 motion
3148 */ 3071 */
3149void 3072void
3150rxvt_term::selection_extend (int x, int y, int flag) 3073rxvt_term::selection_extend (int x, int y, int flag)
3151{ 3074{
3152 int col = min (max (Pixel2Col (x), 0), nrow - 1); 3075 int col = clamp (Pixel2Col (x), 0, ncol);
3153 int row = min (max (Pixel2Row (y), 0), ncol); 3076 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3154 3077
3155 /* 3078 /*
3156 * If we're selecting characters (single click) then we must check first 3079 * If we're selecting characters (single click) then we must check first
3157 * if we are at the same place as the original mark. If we are then 3080 * if we are at the same place as the original mark. If we are then
3158 * select nothing. Otherwise, if we're to the right of the mark, you have to 3081 * select nothing. Otherwise, if we're to the right of the mark, you have to
… …
3371 } 3294 }
3372 } 3295 }
3373 3296
3374#if ENABLE_FRILLS 3297#if ENABLE_FRILLS
3375 if (selection.rect && selection.beg.col > selection.end.col) 3298 if (selection.rect && selection.beg.col > selection.end.col)
3376 SWAP_IT (selection.beg.col, selection.end.col, int); 3299 ::swap (selection.beg.col, selection.end.col);
3377#endif 3300#endif
3378} 3301}
3379 3302
3380#if ENABLE_FRILLS 3303#if ENABLE_FRILLS
3381void 3304void
… …
3579 */ 3502 */
3580void 3503void
3581rxvt_term::pixel_position (int *x, int *y) 3504rxvt_term::pixel_position (int *x, int *y)
3582{ 3505{
3583 *x = Pixel2Col (*x); 3506 *x = Pixel2Col (*x);
3584 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3507 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3585 *y = Pixel2Row (*y); 3508 *y = Pixel2Row (*y);
3586 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3509 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3587} 3510}
3588 3511
3589/* ------------------------------------------------------------------------- */ 3512/* ------------------------------------------------------------------------- */
3590#ifdef USE_XIM 3513#ifdef USE_XIM
3591void 3514void
… …
3613 3536
3614 if (x < 0) x = ncol - w; 3537 if (x < 0) x = ncol - w;
3615 if (y < 0) y = nrow - h; 3538 if (y < 0) y = nrow - h;
3616 3539
3617 // make space for border 3540 // make space for border
3618 w += 2; MIN_IT (w, ncol); 3541 w += 2; min_it (w, ncol);
3619 h += 2; MIN_IT (h, nrow); 3542 h += 2; min_it (h, nrow);
3620 3543
3621 x -= 1; MAX_IT (x, 0); 3544 x -= 1; clamp_it (x, 0, ncol - w);
3622 y -= 1; MAX_IT (y, 0); 3545 y -= 1; clamp_it (y, 0, nrow - h);
3623
3624 MIN_IT (x, ncol - w);
3625 MIN_IT (y, nrow - h);
3626 3546
3627 ov_x = x; ov_y = y; 3547 ov_x = x; ov_y = y;
3628 ov_w = w; ov_h = h; 3548 ov_w = w; ov_h = h;
3629 3549
3630 ov_text = new text_t *[h]; 3550 ov_text = new text_t *[h];

Diff Legend

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