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.180 by root, Wed Dec 21 10:34:24 2005 UTC vs.
Revision 1.193 by root, Thu Dec 22 19:39:29 2005 UTC

… …
147} 147}
148 148
149/* ------------------------------------------------------------------------- * 149/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 150 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 151 * ------------------------------------------------------------------------- */
152
152void 153void
153rxvt_term::scr_reset () 154rxvt_term::scr_reset ()
154{ 155{
155 unsigned int p, q;
156 int k;
157
158#if ENABLE_OVERLAY 156#if ENABLE_OVERLAY
159 scr_overlay_off (); 157 scr_overlay_off ();
160#endif 158#endif
161 159
162 view_start = 0; 160 view_start = 0;
… …
172 return; 170 return;
173 171
174 // we need at least two lines for wrapping to work correctly 172 // we need at least two lines for wrapping to work correctly
175 if (nrow + saveLines < 2) 173 if (nrow + saveLines < 2)
176 { 174 {
175 //TODO//FIXME
177 saveLines++; 176 saveLines++;
178 prev_nrow--; 177 prev_nrow--;
179 nsaved++; 178 nsaved++;
180 } 179 }
181 180
… …
185 total_rows = nrow + saveLines; 184 total_rows = nrow + saveLines;
186 185
187 screen.tscroll = 0; 186 screen.tscroll = 0;
188 screen.bscroll = nrow - 1; 187 screen.bscroll = nrow - 1;
189 188
190 if (!save) 189 if (!row_buf)
191 { 190 {
192 /* 191 /*
193 * 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
194 * 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
195 */ 194 */
… …
197 term_start = 0; 196 term_start = 0;
198 197
199 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 198 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201 200
202 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 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));
204 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 205
207 for (p = nrow; p--; ) 206 for (int row = nrow; row--; )
208 { 207 {
209 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); 208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 210 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 } 211 }
213 212
214 memset (charsets, 'B', sizeof (charsets)); 213 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 214 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 215 screen.flags = Screen_DefaultFlags;
… …
240 { 239 {
241 /* 240 /*
242 * add or delete rows as appropriate 241 * add or delete rows as appropriate
243 */ 242 */
244 243
245 rxvt_salloc *old_ta; 244 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
246 rxvt_salloc *old_ra; 245 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
247 246
247#if 0
248 if (nrow < prev_nrow) 248 if (nrow < prev_nrow)
249 { 249 {
250 /* delete rows */
251 k = min (nsaved, prev_nrow - nrow);
252 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
253 scr_scroll_text (0, (int)prev_nrow - 1, k);
254
255 for (p = nrow; p < prev_nrow; p++) 250 for (int row = nrow; row < prev_nrow; row++)
256 { 251 {
257 lfree (ROW(p));
258 lfree (swap_save[p]); 252 lfree (swap_buf [row]);
259 lfree (drawn[p]); 253 lfree (drawn_buf[row]);
260 } 254 }
255 }
256#endif
261 257
262 /* we have fewer rows so fix up cursor position */ 258 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 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));
264 261
265 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));
266 } 275
267 else if (nrow > prev_nrow) 276 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
277 int pend = MOD (term_start - nsaved , prev_total_rows);
278 int q = total_rows; // rewrapped row
279
280 if (nsaved)
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.
284
285 row_col_t ocur = screen.cur;
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287
268 { 288 do
269 /* add rows */
270 scr_reset_realloc (); /* realloc _first_ */
271
272 int ocol = ncol;
273 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
274
275 k = min (nsaved, nrow - prev_nrow);
276
277 for (p = prev_total_rows; p < total_rows; p++)
278 save[p].clear ();
279
280 for (p = prev_total_rows; p < total_rows - k; p++)
281 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
282
283 for (p = prev_nrow; p < nrow; p++)
284 { 289 {
285 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 290 p = MOD (p - 1, prev_total_rows);
286 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
287 }
288
289 if (k > 0)
290 {
291 scr_scroll_text (0, (int)nrow - 1, -k);
292 screen.cur.row += k;
293 screen.s_cur.row += k;
294 nsaved -= k;
295 }
296
297#ifdef DEBUG_STRICT 291#ifdef DEBUG_STRICT
298 assert (screen.cur.row < nrow); 292 assert (old_buf [MOD (p, prev_total_rows)].t);
299#else /* drive with your eyes closed */
300 MIN_IT (screen.cur.row, nrow - 1);
301#endif 293#endif
302 ncol = ocol; // save b/c scr_blank_screen_mem uses this
303 }
304 294
305 /* resize columns */
306 if (ncol != prev_ncol)
307 {
308 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
309 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
310
311 for (p = total_rows; p--; )
312 lresize (save[p]);
313
314 for (p = nrow; p--; )
315 {
316 lresize (drawn[p]);
317 lresize (swap_save[p]);
318 }
319
320 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
321
322 delete old_ta;
323 delete old_ra;
324 }
325
326#if 0
327 // re-wrap lines, this is rather ugly, possibly because I am too dumb
328 // to come up with a lean and mean algorithm.
329 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
330 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
331
332 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
333 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
334 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
335
336 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
337
338 p = prev_total_rows;
339 q = total_rows;
340
341 while (p > 0 && q > 0)
342 {
343 --p;
344
345 printf ("pq %d:%d\n", p, q);
346 if (save[p].t)
347 {
348 int llen = save[p].l; 295 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l;
349 297
350 assert (llen >= 0); 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
351
352 while (p && save[p - 1].l < 0)
353 { 299 {
300 p = MOD (p - 1, prev_total_rows);
301
354 --p; 302 plines++;
355 llen += prev_ncol; 303 llen += prev_ncol;
356 } 304 }
357 305
358 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
359 int lofs = 0; 314 int lofs = 0;
315 line_t *qline;
360 316
361 q -= qlines; 317 // re-assemble the full line by destination lines
362
363 int qrow = q;
364
365 printf ("QL %d llen %d\n", qlines, llen);//D
366 for (; qlines--; qrow++) 318 for (int qrow = q; qlines--; qrow++)
367 { 319 {
320 qline = row_buf + qrow;
321 lalloc (*qline);
322 qline->set_is_longer ();
323
368 if (qrow >= 0) 324 int qcol = 0;
325
326 // fill a single destination line
327 while (lofs < llen && qcol < ncol)
369 { 328 {
370 tp [qrow] = (text_t *)ta->alloc ();
371 rp [qrow] = (rend_t *)ra->alloc ();
372 tl [qrow] = LINE_CONT1;
373
374 int qcol = 0;
375
376 for (;;)
377 {
378 int prow = lofs / prev_ncol + p; 329 int prow = lofs / prev_ncol;
379 int pcol = lofs % prev_ncol; 330 int pcol = lofs % prev_ncol;
380 331
332 prow = MOD (p + prow, prev_total_rows);
333
334 // we only adjust the cursor _row_ and put it into
335 // the topmost line of "long line" it was in, as
336 // this seems to upset applications/shells/readline
337 // least.
338 if (prow == ocur.row)
339 screen.cur.row = q - (total_rows - nrow);
340
341 line_t &pline = old_buf [prow];
342
381 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 343 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
382 344
383 printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
384
385 if (len <= 0)
386 {
387 tl [qrow] = qcol;
388
389 TODO
390 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
391 ncol - qcol, DEFAULT_RSTYLE);
392
393 break;
394 }
395
396 assert (lofs < 1000); 345 assert (len);
346 assert (pline.t);
397 347
398 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
399 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
400 350
401 lofs += len; 351 lofs += len;
402 qcol += len; 352 qcol += len;
403
404 if (qcol == ncol)
405 break;
406 }
407 } 353 }
408 else
409 lofs += ncol;
410 } 354 }
355
356 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1;
357 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
411 } 358 }
359 while (p != pend && q > 0);
360
361 term_start = total_rows - nrow;
362 nsaved = term_start - q;
363
364 // make sure all terminal lines exist
365 while (nsaved < 0)
366 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
367
368 }
369 else
412 } 370 {
371 // if no scrollback exists (yet), wing, instead of wrap
372
373 for (int row = min (nrow, prev_nrow); row--; )
374 {
375 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
376 line_t &qline = row_buf [row];
413 377
414 free (screen.text); screen.text = tp; 378 qline = pline;
415 free (screen.rend); screen.rend = rp; 379 lresize (qline);
416 free (screen.tlen); screen.tlen = tl; 380 }
417 381
418 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 382 for (int row = prev_nrow; row < nrow; row++)
383 {
384 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
385 }
386
387 term_start = 0;
388 }
389
390#ifdef DEBUG_STRICT //TODO: remove
391 for (int i = -nsaved; i < nrow; i++)
392 assert (ROW (i).t);
419#endif 393#endif
394
395 free (old_buf);
396 delete old_ta;
397 delete old_ra;
398
399 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1);
420 401
421 if (tabs) 402 if (tabs)
422 free (tabs); 403 free (tabs);
423 } 404 }
424 405
425 prev_nrow = nrow; 406 prev_nrow = nrow;
426 prev_ncol = ncol; 407 prev_ncol = ncol;
427 408
428 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 409 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
429 410
430 for (p = 0; p < ncol; p++) 411 for (int col = ncol; col--; )
431 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 412 tabs [col] = col % TABSIZE == 0;
432 413
433 tt_winch (); 414 tt_winch ();
434}
435
436void
437rxvt_term::scr_reset_realloc ()
438{
439 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
440 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
441 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
442 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
443} 415}
444 416
445/* ------------------------------------------------------------------------- */ 417/* ------------------------------------------------------------------------- */
446/* 418/*
447 * Free everything. That way malloc debugging can find leakage. 419 * Free everything. That way malloc debugging can find leakage.
… …
450rxvt_term::scr_release () 422rxvt_term::scr_release ()
451{ 423{
452 delete talloc; talloc = 0; 424 delete talloc; talloc = 0;
453 delete ralloc; ralloc = 0; 425 delete ralloc; ralloc = 0;
454 426
455 free (save); 427 free (row_buf);
456 free (swap_save); 428 free (swap_buf);
457 free (drawn); 429 free (drawn_buf);
458 free (buf); 430 free (temp_buf);
459 free (tabs); 431 free (tabs);
432
433 row_buf = 0; // signal that we freed all the arrays
460} 434}
461 435
462/* ------------------------------------------------------------------------- */ 436/* ------------------------------------------------------------------------- */
463/* 437/*
464 * Hard reset 438 * Hard reset
… …
515 set_font_style (); 489 set_font_style ();
516 break; 490 break;
517 } 491 }
518 492
519 /* boundary check in case screen size changed between SAVE and RESTORE */ 493 /* boundary check in case screen size changed between SAVE and RESTORE */
520 MIN_IT (s->cur.row, nrow - 1); 494 min_it (s->cur.row, nrow - 1);
521 MIN_IT (s->cur.col, ncol - 1); 495 min_it (s->cur.col, ncol - 1);
522#ifdef DEBUG_STRICT 496#ifdef DEBUG_STRICT
523 assert (s->cur.row >= 0); 497 assert (s->cur.row >= 0);
524 assert (s->cur.col >= 0); 498 assert (s->cur.col >= 0);
525#else /* drive with your eyes closed */
526 MAX_IT (s->cur.row, 0);
527 MAX_IT (s->cur.col, 0);
528#endif 499#endif
529} 500}
530 501
531/* ------------------------------------------------------------------------- */ 502/* ------------------------------------------------------------------------- */
532/* 503/*
… …
556#if NSCREENS 527#if NSCREENS
557 if (options & Opt_secondaryScreen) 528 if (options & Opt_secondaryScreen)
558 { 529 {
559 num_scr = 0; 530 num_scr = 0;
560 531
561 for (int i = nrow; i--; ) 532 for (int i = prev_nrow; i--; )
562 ::swap (ROW(i), swap_save[i]); 533 ::swap (ROW(i), swap_buf [i]);
563 534
564 ::swap (screen.charset, swap.charset); 535 ::swap (screen.charset, swap.charset);
565 ::swap (screen.flags, swap.flags); 536 ::swap (screen.flags, swap.flags);
566 screen.flags |= Screen_VisibleCursor; 537 screen.flags |= Screen_VisibleCursor;
567 swap.flags |= Screen_VisibleCursor; 538 swap.flags |= Screen_VisibleCursor;
… …
693 // use a simple and robust scrolling algorithm, this 664 // use a simple and robust scrolling algorithm, this
694 // part of scr_scroll_text is not time-critical. 665 // part of scr_scroll_text is not time-critical.
695 666
696 int rows = row2 - row1 + 1; 667 int rows = row2 - row1 + 1;
697 668
669 min_it (count, rows);
670
698 for (int row = 0; row < rows; row++) 671 for (int row = 0; row < rows; row++)
699 { 672 {
700 buf [row] = ROW(row1 + (row + count + rows) % rows); 673 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
701 674
702 if (!IN_RANGE_EXC (row + count, 0, rows)) 675 if (!IN_RANGE_EXC (row + count, 0, rows))
703 scr_blank_screen_mem (buf [row], rstyle); 676 scr_blank_screen_mem (temp_buf [row], rstyle);
704 } 677 }
705 678
706 for (int row = 0; row < rows; row++) 679 for (int row = 0; row < rows; row++)
707 ROW(row1 + row) = buf [row]; 680 ROW(row1 + row) = temp_buf [row];
708 } 681 }
709 682
710 return count; 683 return count;
711} 684}
712 685
… …
720 if (len <= 0) /* sanity */ 693 if (len <= 0) /* sanity */
721 return; 694 return;
722 695
723 unsigned char checksel; 696 unsigned char checksel;
724 unicode_t c; 697 unicode_t c;
725 int row, last_col; 698 int last_col;
726 const unicode_t *strend = str + len; 699 const unicode_t *strend = str + len;
727 700
728 want_refresh = 1; 701 want_refresh = 1;
729 ZERO_SCROLLBACK (); 702 ZERO_SCROLLBACK ();
730 last_col = ncol; 703 last_col = ncol;
731 704
732 if (nlines > 0) 705 if (nlines > 0)
733 { 706 {
734 nlines += screen.cur.row - screen.bscroll; 707 nlines += screen.cur.row - screen.bscroll;
735 if ((nlines > 0) 708 if (nlines > 0
736 && (screen.tscroll == 0) 709 && screen.tscroll == 0
737 && (screen.bscroll == (nrow - 1))) 710 && screen.bscroll == (nrow - 1))
738 { 711 {
739 /* _at least_ this many lines need to be scrolled */ 712 /* _at least_ this many lines need to be scrolled */
740 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 713 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
741 screen.cur.row -= nlines; 714 screen.cur.row -= nlines;
742 } 715 }
743 } 716 }
744 717
745#ifdef DEBUG_STRICT 718#ifdef DEBUG_STRICT
746 assert (screen.cur.col < last_col); 719 assert (screen.cur.col < last_col);
747 assert ((screen.cur.row < nrow) 720 assert (screen.cur.row < nrow
748 && (screen.cur.row >= - (int32_t)nsaved)); 721 && screen.cur.row >= -nsaved);
749#else /* drive with your eyes closed */
750 MIN_IT (screen.cur.col, last_col - 1);
751 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
752 MAX_IT (screen.cur.row, - (int32_t)nsaved);
753#endif 722#endif
754 row = screen.cur.row; 723 int row = screen.cur.row;
755 724
756 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 725 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
757 726
758 line_t *line = &ROW(row); 727 line_t *line = &ROW(row);
759 728
… …
763 732
764 if (c < 0x20) 733 if (c < 0x20)
765 if (c == C0_LF) 734 if (c == C0_LF)
766 { 735 {
767 if (!line->is_longer ()) /* XXX: think about this */ 736 if (!line->is_longer ()) /* XXX: think about this */
768 MAX_IT (line->l, screen.cur.col); 737 max_it (line->l, screen.cur.col);
769 738
770 screen.flags &= ~Screen_WrapNext; 739 screen.flags &= ~Screen_WrapNext;
771 740
772 if (screen.cur.row == screen.bscroll) 741 if (screen.cur.row == screen.bscroll)
773 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 742 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
778 continue; 747 continue;
779 } 748 }
780 else if (c == C0_CR) 749 else if (c == C0_CR)
781 { 750 {
782 if (!line->is_longer ()) /* XXX: think about this */ 751 if (!line->is_longer ()) /* XXX: think about this */
783 MAX_IT (line->l, screen.cur.col); 752 max_it (line->l, screen.cur.col);
784 753
785 screen.flags &= ~Screen_WrapNext; 754 screen.flags &= ~Screen_WrapNext;
786 screen.cur.col = 0; 755 screen.cur.col = 0;
787 continue; 756 continue;
788 } 757 }
… …
964#endif 933#endif
965 } 934 }
966 } 935 }
967 936
968 if (!line->is_longer ()) /* XXX: think about this */ 937 if (!line->is_longer ()) /* XXX: think about this */
969 MAX_IT (line->l, screen.cur.col); 938 max_it (line->l, screen.cur.col);
970 939
971#ifdef DEBUG_STRICT 940#ifdef DEBUG_STRICT
972 assert (screen.cur.row >= 0); 941 assert (screen.cur.row >= 0);
973#else /* drive with your eyes closed */
974 MAX_IT (screen.cur.row, 0);
975#endif 942#endif
976} 943}
977 944
978/* ------------------------------------------------------------------------- */ 945/* ------------------------------------------------------------------------- */
979/* 946/*
… …
1018 985
1019 if (count == 0) 986 if (count == 0)
1020 return; 987 return;
1021 else if (count > 0) 988 else if (count > 0)
1022 { 989 {
1023 int row = screen.cur.row;
1024
1025 line_t &l = ROW(row); 990 line_t &l = ROW(screen.cur.row);
1026 rend_t base_rend = l.r[i]; 991 rend_t base_rend = l.r[i];
1027 ht &= l.t[i] == ' '; 992 ht &= l.t[i] == ' ';
1028 993
1029 for (; ++i < ncol; ) 994 for (; ++i < ncol; )
1030 if (tabs[i]) 995 if (tabs[i])
… …
1045 if (ht && options & Opt_pastableTabs) 1010 if (ht && options & Opt_pastableTabs)
1046 { 1011 {
1047 base_rend = SET_FONT (base_rend, 0); 1012 base_rend = SET_FONT (base_rend, 0);
1048 1013
1049 if (!l.is_longer ()) /* XXX: think about this */ 1014 if (!l.is_longer ()) /* XXX: think about this */
1050 MAX_IT (l.l, x); 1015 max_it (l.l, x);
1051 1016
1052 i = screen.cur.col; 1017 i = screen.cur.col;
1053 1018
1054 l.t[i] = '\t'; 1019 l.t[i] = '\t';
1055 l.r[i] = base_rend; 1020 l.r[i] = base_rend;
… …
1105 */ 1070 */
1106#if ENABLE_FRILLS 1071#if ENABLE_FRILLS
1107void 1072void
1108rxvt_term::scr_forwardindex () 1073rxvt_term::scr_forwardindex ()
1109{ 1074{
1110 int row;
1111
1112 if (screen.cur.col < ncol - 1) 1075 if (screen.cur.col < ncol - 1)
1113 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1076 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1114 else 1077 else
1115 { 1078 {
1116 row = screen.cur.row;
1117
1118 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1079 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1119 ROW(row).l = ncol; 1080 ROW(screen.cur.row).l = ncol;
1120 1081
1121 scr_gotorc (0, 0, R_RELATIVE); 1082 scr_gotorc (0, 0, R_RELATIVE);
1122 scr_insdel_chars (1, DELETE); 1083 scr_insdel_chars (1, DELETE);
1123 scr_gotorc (0, ncol - 1, R_RELATIVE); 1084 scr_gotorc (0, ncol - 1, R_RELATIVE);
1124 } 1085 }
… …
1134{ 1095{
1135 want_refresh = 1; 1096 want_refresh = 1;
1136 ZERO_SCROLLBACK (); 1097 ZERO_SCROLLBACK ();
1137 1098
1138 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1099 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1139 MAX_IT (screen.cur.col, 0); 1100 clamp_it (screen.cur.col, 0, ncol - 1);
1140 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1141 1101
1142 screen.flags &= ~Screen_WrapNext; 1102 screen.flags &= ~Screen_WrapNext;
1143 1103
1144 if (relative & R_RELATIVE) 1104 if (relative & R_RELATIVE)
1145 { 1105 {
… …
1163 else 1123 else
1164 { 1124 {
1165 if (screen.flags & Screen_Relative) 1125 if (screen.flags & Screen_Relative)
1166 { /* relative origin mode */ 1126 { /* relative origin mode */
1167 screen.cur.row = row + screen.tscroll; 1127 screen.cur.row = row + screen.tscroll;
1168 MIN_IT (screen.cur.row, screen.bscroll); 1128 min_it (screen.cur.row, screen.bscroll);
1169 } 1129 }
1170 else 1130 else
1171 screen.cur.row = row; 1131 screen.cur.row = row;
1172 } 1132 }
1173 1133
1174 MAX_IT (screen.cur.row, 0); 1134 clamp_it (screen.cur.row, 0, nrow - 1);
1175 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1176} 1135}
1177 1136
1178/* ------------------------------------------------------------------------- */ 1137/* ------------------------------------------------------------------------- */
1179/* 1138/*
1180 * direction should be UP or DN 1139 * direction should be UP or DN
… …
1195 || (screen.cur.row == screen.tscroll && direction == DN)) 1154 || (screen.cur.row == screen.tscroll && direction == DN))
1196 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1155 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1197 else 1156 else
1198 screen.cur.row += dirn; 1157 screen.cur.row += dirn;
1199 1158
1200 MAX_IT (screen.cur.row, 0); 1159 clamp_it (screen.cur.row, 0, nrow - 1);
1201 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1202 selection_check (0); 1160 selection_check (0);
1203} 1161}
1204 1162
1205/* ------------------------------------------------------------------------- */ 1163/* ------------------------------------------------------------------------- */
1206/* 1164/*
… …
1210 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1168 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1211 */ 1169 */
1212void 1170void
1213rxvt_term::scr_erase_line (int mode) 1171rxvt_term::scr_erase_line (int mode)
1214{ 1172{
1215 unsigned int row, col, num; 1173 unsigned int col, num;
1216 1174
1217 want_refresh = 1; 1175 want_refresh = 1;
1218 ZERO_SCROLLBACK (); 1176 ZERO_SCROLLBACK ();
1219 1177
1220 selection_check (1); 1178 selection_check (1);
1221 1179
1222 row = screen.cur.row; 1180 line_t &line = ROW(screen.cur.row);
1223 1181
1224 switch (mode) 1182 switch (mode)
1225 { 1183 {
1226 case 0: /* erase to end of line */ 1184 case 0: /* erase to end of line */
1227 col = screen.cur.col; 1185 col = screen.cur.col;
1228 num = ncol - col; 1186 num = ncol - col;
1229 MIN_IT (ROW(row).l, (int16_t)col); 1187 min_it (line.l, col);
1230 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1188 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1231 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1189 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1232 CLEAR_SELECTION (); 1190 CLEAR_SELECTION ();
1233 break; 1191 break;
1234 case 1: /* erase to beginning of line */ 1192 case 1: /* erase to beginning of line */
… …
1239 CLEAR_SELECTION (); 1197 CLEAR_SELECTION ();
1240 break; 1198 break;
1241 case 2: /* erase whole line */ 1199 case 2: /* erase whole line */
1242 col = 0; 1200 col = 0;
1243 num = ncol; 1201 num = ncol;
1244 ROW(row).l = 0; 1202 line.l = 0;
1245 if (selection.beg.row <= screen.cur.row 1203 if (selection.beg.row <= screen.cur.row
1246 && selection.end.row >= screen.cur.row) 1204 && selection.end.row >= screen.cur.row)
1247 CLEAR_SELECTION (); 1205 CLEAR_SELECTION ();
1248 break; 1206 break;
1249 default: 1207 default:
1250 return; 1208 return;
1251 } 1209 }
1252 1210
1253 scr_blank_line (ROW(row), col, num, rstyle); 1211 scr_blank_line (line, col, num, rstyle);
1254} 1212}
1255 1213
1256/* ------------------------------------------------------------------------- */ 1214/* ------------------------------------------------------------------------- */
1257/* 1215/*
1258 * Erase part of whole of the screen 1216 * Erase part of whole of the screen
… …
1301 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1302 1260
1303 if (row >= nrow) /* Out Of Bounds */ 1261 if (row >= nrow) /* Out Of Bounds */
1304 return; 1262 return;
1305 1263
1306 MIN_IT (num, (nrow - row)); 1264 min_it (num, nrow - row);
1307 1265
1308 if (rstyle & (RS_RVid | RS_Uline)) 1266 if (rstyle & (RS_RVid | RS_Uline))
1309 ren = (rend_t) ~RS_None; 1267 ren = (rend_t) ~RS_None;
1310 else if (GET_BASEBG (rstyle) == Color_bg) 1268 else if (GET_BASEBG (rstyle) == Color_bg)
1311 { 1269 {
… …
1324 1282
1325 for (; num--; row++) 1283 for (; num--; row++)
1326 { 1284 {
1327 scr_blank_screen_mem (ROW (row), rstyle); 1285 scr_blank_screen_mem (ROW (row), rstyle);
1328 ROW (row).l = 0; 1286 ROW (row).l = 0;
1329 scr_blank_line (drawn[row], 0, ncol, ren); 1287 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1330 } 1288 }
1331} 1289}
1332 1290
1333#if ENABLE_FRILLS 1291#if ENABLE_FRILLS
1334void 1292void
… …
1419 return; 1377 return;
1420 1378
1421 scr_do_wrap (); 1379 scr_do_wrap ();
1422 1380
1423 selection_check (1); 1381 selection_check (1);
1424 MIN_IT (count, (ncol - screen.cur.col)); 1382 min_it (count, ncol - screen.cur.col);
1425 1383
1426 row = screen.cur.row; 1384 row = screen.cur.row;
1427 1385
1428 line_t *line = &ROW(row); 1386 line_t *line = &ROW(row);
1429 1387
… …
1437 } 1395 }
1438 1396
1439 if (!line->is_longer ()) 1397 if (!line->is_longer ())
1440 { 1398 {
1441 line->l += count; 1399 line->l += count;
1442 MIN_IT (line->l, ncol); 1400 min_it (line->l, ncol);
1443 } 1401 }
1444 1402
1445 if (selection.op && current_screen == selection.screen 1403 if (selection.op && current_screen == selection.screen
1446 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1404 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1447 { 1405 {
… …
1508 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1466 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1509 */ 1467 */
1510void 1468void
1511rxvt_term::scr_scroll_region (int top, int bot) 1469rxvt_term::scr_scroll_region (int top, int bot)
1512{ 1470{
1513 MAX_IT (top, 0); 1471 max_it (top, 0);
1514 MIN_IT (bot, (int)nrow - 1); 1472 min_it (bot, nrow - 1);
1515 1473
1516 if (top > bot) 1474 if (top > bot)
1517 return; 1475 return;
1518 1476
1519 screen.tscroll = top; 1477 screen.tscroll = top;
… …
1617 XGCValues gcvalue; 1575 XGCValues gcvalue;
1618 1576
1619 if (rvideo != mode) 1577 if (rvideo != mode)
1620 { 1578 {
1621 rvideo = mode; 1579 rvideo = mode;
1622 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1580 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1623#if XPM_BACKGROUND 1581#if XPM_BACKGROUND
1624 if (bgPixmap.pixmap == None) 1582 if (bgPixmap.pixmap == None)
1625#endif 1583#endif
1626#if TRANSPARENT 1584#if TRANSPARENT
1627 if (! (options & Opt_transparent) || am_transparent == 0) 1585 if (! (options & Opt_transparent) || am_transparent == 0)
… …
1723 bool found = false; 1681 bool found = false;
1724 1682
1725 for (int i = 0; i < nrow; i++) 1683 for (int i = 0; i < nrow; i++)
1726 { 1684 {
1727 int col = 0; 1685 int col = 0;
1728 rend_t *drp = drawn[i].r; 1686 rend_t *drp = drawn_buf[i].r;
1729 1687
1730 for (; col < ncol; col++, drp++) 1688 for (; col < ncol; col++, drp++)
1731 if ((*drp & mask) == value) 1689 if ((*drp & mask) == value)
1732 { 1690 {
1733 found = true; 1691 found = true;
… …
1751rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1709rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1752{ 1710{
1753 int i; 1711 int i;
1754 row_col_t rc[RC_COUNT]; 1712 row_col_t rc[RC_COUNT];
1755 1713
1756 if (!drawn) /* sanity check */ 1714 if (!drawn_buf) /* sanity check */
1757 return; 1715 return;
1758 1716
1759#ifndef NO_SLOW_LINK_SUPPORT 1717#ifndef NO_SLOW_LINK_SUPPORT
1760 if (refresh_type == FAST_REFRESH && !display->is_local) 1718 if (refresh_type == FAST_REFRESH && !display->is_local)
1761 { 1719 {
1762 y = 0; 1720 y = 0;
1763 eheight = height; 1721 eheight = height;
1764 } 1722 }
1765#endif
1766
1767#ifdef DEBUG_STRICT
1768 x = max (x, 0);
1769 x = min (x, (int)width);
1770 y = max (y, 0);
1771 y = min (y, (int)height);
1772#endif 1723#endif
1773 1724
1774 /* round down */ 1725 /* round down */
1775 rc[PART_BEG].col = Pixel2Col (x); 1726 rc[PART_BEG].col = Pixel2Col (x);
1776 rc[PART_BEG].row = Pixel2Row (y); 1727 rc[PART_BEG].row = Pixel2Row (y);
… …
1779 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1730 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1780 1731
1781 /* sanity checks */ 1732 /* sanity checks */
1782 for (i = PART_BEG; i < RC_COUNT; i++) 1733 for (i = PART_BEG; i < RC_COUNT; i++)
1783 { 1734 {
1784 MIN_IT (rc[i].col, ncol - 1); 1735 min_it (rc[i].col, ncol - 1);
1785 MIN_IT (rc[i].row, nrow - 1); 1736 min_it (rc[i].row, nrow - 1);
1786 } 1737 }
1787 1738
1788 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1739 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1789 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1740 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1790 1741
1791 if (refresh) 1742 if (refresh)
1792 scr_refresh (SLOW_REFRESH); 1743 scr_refresh (SLOW_REFRESH);
1793} 1744}
1794 1745
… …
2052 if (screen.cur.row + view_start != ocrow 2003 if (screen.cur.row + view_start != ocrow
2053 || screen.cur.col != oldcursor.col) 2004 || screen.cur.col != oldcursor.col)
2054 { 2005 {
2055 if (ocrow < nrow 2006 if (ocrow < nrow
2056 && oldcursor.col < ncol) 2007 && oldcursor.col < ncol)
2057 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2008 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2058 2009
2059 if (focus || !showcursor) 2010 if (focus || !showcursor)
2060 oldcursor.row = -1; 2011 oldcursor.row = -1;
2061 else 2012 else
2062 setoldcursor = 1; 2013 setoldcursor = 1;
… …
2101 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2052 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2102 { 2053 {
2103 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2054 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2104 { 2055 {
2105 line_t s = ROW(row - view_start); 2056 line_t s = ROW(row - view_start);
2106 line_t d = drawn[row]; 2057 line_t d = drawn_buf[row];
2107 line_t d2 = drawn[row + i]; 2058 line_t d2 = drawn_buf[row + i];
2108 2059
2109 for (nits = 0, col = ncol; col--; ) 2060 for (nits = 0, col = ncol; col--; )
2110 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2061 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2111 nits--; 2062 nits--;
2112 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2063 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2130 2081
2131 if (len != -1) 2082 if (len != -1)
2132 { 2083 {
2133 /* also comes here at end if needed because of >= above */ 2084 /* also comes here at end if needed because of >= above */
2134 if (wlen < len) 2085 if (wlen < len)
2135 SWAP_IT (wlen, len, int); 2086 ::swap (wlen, len);
2136 2087
2137 XCopyArea (display->display, vt, vt, 2088 XCopyArea (display->display, vt, vt,
2138 gc, 0, Row2Pixel (len + i), 2089 gc, 0, Row2Pixel (len + i),
2139 (unsigned int)TermWin_TotalWidth (), 2090 (unsigned int)TermWin_TotalWidth (),
2140 (unsigned int)Height2Pixel (wlen - len + 1), 2091 (unsigned int)Height2Pixel (wlen - len + 1),
… …
2150 */ 2101 */
2151 for (row = 0; row < nrow; row++) 2102 for (row = 0; row < nrow; row++)
2152 { 2103 {
2153 text_t *stp = ROW(row - view_start).t; 2104 text_t *stp = ROW(row - view_start).t;
2154 rend_t *srp = ROW(row - view_start).r; 2105 rend_t *srp = ROW(row - view_start).r;
2155 text_t *dtp = drawn[row].t; 2106 text_t *dtp = drawn_buf[row].t;
2156 rend_t *drp = drawn[row].r; 2107 rend_t *drp = drawn_buf[row].r;
2157 2108
2158 /* 2109 /*
2159 * E2: OK, now the real pass 2110 * E2: OK, now the real pass
2160 */ 2111 */
2161 int ypixel = (int)Row2Pixel (row); 2112 int ypixel = (int)Row2Pixel (row);
… …
2272 fore = Color_UL; 2223 fore = Color_UL;
2273#endif 2224#endif
2274 2225
2275 if (invert) 2226 if (invert)
2276 { 2227 {
2277 SWAP_IT (fore, back, int); 2228 ::swap (fore, back);
2278 2229
2279#ifndef NO_BOLD_UNDERLINE_REVERSE 2230#ifndef NO_BOLD_UNDERLINE_REVERSE
2280 if (ISSET_PIXCOLOR (Color_RV)) 2231 if (ISSET_PIXCOLOR (Color_RV))
2281 back = Color_RV; 2232 back = Color_RV;
2282 2233
… …
2374 2325
2375 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2326 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2376 col--; 2327 col--;
2377 2328
2378 while (col + cursorwidth < ncol 2329 while (col + cursorwidth < ncol
2379 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2330 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2380 cursorwidth++; 2331 cursorwidth++;
2381 2332
2382#ifndef NO_CURSORCOLOR 2333#ifndef NO_CURSORCOLOR
2383 if (ISSET_PIXCOLOR (Color_cursor)) 2334 if (ISSET_PIXCOLOR (Color_cursor))
2384 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2335 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2416 2367
2417void 2368void
2418rxvt_term::scr_remap_chars () 2369rxvt_term::scr_remap_chars ()
2419{ 2370{
2420 for (int i = total_rows; i--; ) 2371 for (int i = total_rows; i--; )
2421 scr_remap_chars (save[i]); 2372 scr_remap_chars (row_buf [i]);
2422 2373
2423 for (int i = nrow; i--; ) 2374 for (int i = nrow; i--; )
2424 { 2375 {
2425 scr_remap_chars (drawn[i]); 2376 scr_remap_chars (drawn_buf [i]);
2426 scr_remap_chars (swap_save[i]); 2377 scr_remap_chars (swap_buf [i]);
2427 } 2378 }
2428} 2379}
2429 2380
2430void 2381void
2431rxvt_term::scr_recolour () 2382rxvt_term::scr_recolour ()
… …
2528 char r1[] = "\n"; 2479 char r1[] = "\n";
2529 2480
2530 for (row = saveLines - nsaved; 2481 for (row = saveLines - nsaved;
2531 row < saveLines + nrow - 1; row++) 2482 row < saveLines + nrow - 1; row++)
2532 { 2483 {
2533 width = save[row].l >= 0 ? save[row].l 2484 width = row_buf[row].l >= 0 ? row_buf[row].l
2534 : ncol; 2485 : ncol;
2535 for (towrite = width; towrite; towrite -= wrote) 2486 for (towrite = width; towrite; towrite -= wrote)
2536 { 2487 {
2537 wrote = write (fd, & (save[row].t[width - towrite]), 2488 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2538 towrite); 2489 towrite);
2539 if (wrote < 0) 2490 if (wrote < 0)
2540 return; /* XXX: death, no report */ 2491 return; /* XXX: death, no report */
2541 } 2492 }
2542 if (save[row].l >= 0) 2493 if (row_buf[row].l >= 0)
2543 if (write (fd, r1, 1) <= 0) 2494 if (write (fd, r1, 1) <= 0)
2544 return; /* XXX: death, no report */ 2495 return; /* XXX: death, no report */
2545 } 2496 }
2546} 2497}
2547#endif 2498#endif
… …
3364 } 3315 }
3365 } 3316 }
3366 3317
3367#if ENABLE_FRILLS 3318#if ENABLE_FRILLS
3368 if (selection.rect && selection.beg.col > selection.end.col) 3319 if (selection.rect && selection.beg.col > selection.end.col)
3369 SWAP_IT (selection.beg.col, selection.end.col, int); 3320 ::swap (selection.beg.col, selection.end.col);
3370#endif 3321#endif
3371} 3322}
3372 3323
3373#if ENABLE_FRILLS 3324#if ENABLE_FRILLS
3374void 3325void
… …
3572 */ 3523 */
3573void 3524void
3574rxvt_term::pixel_position (int *x, int *y) 3525rxvt_term::pixel_position (int *x, int *y)
3575{ 3526{
3576 *x = Pixel2Col (*x); 3527 *x = Pixel2Col (*x);
3577 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3528 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3578 *y = Pixel2Row (*y); 3529 *y = Pixel2Row (*y);
3579 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3530 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3580} 3531}
3581 3532
3582/* ------------------------------------------------------------------------- */ 3533/* ------------------------------------------------------------------------- */
3583#ifdef USE_XIM 3534#ifdef USE_XIM
3584void 3535void
… …
3606 3557
3607 if (x < 0) x = ncol - w; 3558 if (x < 0) x = ncol - w;
3608 if (y < 0) y = nrow - h; 3559 if (y < 0) y = nrow - h;
3609 3560
3610 // make space for border 3561 // make space for border
3611 w += 2; MIN_IT (w, ncol); 3562 w += 2; min_it (w, ncol);
3612 h += 2; MIN_IT (h, nrow); 3563 h += 2; min_it (h, nrow);
3613 3564
3614 x -= 1; MAX_IT (x, 0); 3565 x -= 1; clamp_it (x, 0, ncol - w);
3615 y -= 1; MAX_IT (y, 0); 3566 y -= 1; clamp_it (y, 0, nrow - h);
3616
3617 MIN_IT (x, ncol - w);
3618 MIN_IT (y, nrow - h);
3619 3567
3620 ov_x = x; ov_y = y; 3568 ov_x = x; ov_y = y;
3621 ov_w = w; ov_h = h; 3569 ov_w = w; ov_h = h;
3622 3570
3623 ov_text = new text_t *[h]; 3571 ov_text = new text_t *[h];

Diff Legend

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