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.192 by root, Thu Dec 22 19:25:58 2005 UTC

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

Diff Legend

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