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.175 by root, Tue Dec 20 19:30:59 2005 UTC vs.
Revision 1.197 by root, Tue Dec 27 00:52:38 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, 1);
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, 1);
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 ? MOD (llen - 1, ncol) + 1 : 0;
357#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY
358 if (qline->l < 0)
359 {
360 fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
361 qline->l = 0;
362 }
363#endif
364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414 } 365 }
366 while (p != pend && q > 0);
367
368 term_start = total_rows - nrow;
369 nsaved = term_start - q;
370
371 // make sure all terminal lines exist
372 while (nsaved < 0)
373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
374
375 }
376 else
415 } 377 {
378 // if no scrollback exists (yet), wing, instead of wrap
379
380 for (int row = min (nrow, prev_nrow); row--; )
381 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row];
416 384
417 free (screen.text); screen.text = tp; 385 qline = pline;
418 free (screen.rend); screen.rend = rp; 386 lresize (qline);
419 free (screen.tlen); screen.tlen = tl; 387 }
420 388
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 389 for (int row = prev_nrow; row < nrow; row++)
390 {
391 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
392 }
393
394 term_start = 0;
395 }
396
397#ifdef DEBUG_STRICT //TODO: remove
398 for (int i = -nsaved; i < nrow; i++)
399 assert (ROW (i).t);
422#endif 400#endif
401
402 free (old_buf);
403 delete old_ta;
404 delete old_ra;
405
406 clamp_it (screen.cur.row, 0, nrow - 1);
407 clamp_it (screen.cur.col, 0, ncol - 1);
423 408
424 if (tabs) 409 if (tabs)
425 free (tabs); 410 free (tabs);
426 } 411 }
427 412
428 prev_nrow = nrow; 413 prev_nrow = nrow;
429 prev_ncol = ncol; 414 prev_ncol = ncol;
430 415
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 416 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 417
433 for (p = 0; p < ncol; p++) 418 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 419 tabs [col] = col % TABSIZE == 0;
435 420
436 tt_winch (); 421 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} 422}
447 423
448/* ------------------------------------------------------------------------- */ 424/* ------------------------------------------------------------------------- */
449/* 425/*
450 * Free everything. That way malloc debugging can find leakage. 426 * Free everything. That way malloc debugging can find leakage.
… …
453rxvt_term::scr_release () 429rxvt_term::scr_release ()
454{ 430{
455 delete talloc; talloc = 0; 431 delete talloc; talloc = 0;
456 delete ralloc; ralloc = 0; 432 delete ralloc; ralloc = 0;
457 433
458 free (save); 434 free (row_buf);
459 free (swap_save); 435 free (swap_buf);
460 free (drawn); 436 free (drawn_buf);
461 free (buf); 437 free (temp_buf);
462 free (tabs); 438 free (tabs);
439
440 row_buf = 0; // signal that we freed all the arrays
463} 441}
464 442
465/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
466/* 444/*
467 * Hard reset 445 * Hard reset
… …
518 set_font_style (); 496 set_font_style ();
519 break; 497 break;
520 } 498 }
521 499
522 /* boundary check in case screen size changed between SAVE and RESTORE */ 500 /* boundary check in case screen size changed between SAVE and RESTORE */
523 MIN_IT (s->cur.row, nrow - 1); 501 min_it (s->cur.row, nrow - 1);
524 MIN_IT (s->cur.col, ncol - 1); 502 min_it (s->cur.col, ncol - 1);
525#ifdef DEBUG_STRICT 503#ifdef DEBUG_STRICT
526 assert (s->cur.row >= 0); 504 assert (s->cur.row >= 0);
527 assert (s->cur.col >= 0); 505 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 506#endif
532} 507}
533 508
534/* ------------------------------------------------------------------------- */ 509/* ------------------------------------------------------------------------- */
535/* 510/*
… …
538 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
539 */ 514 */
540int 515int
541rxvt_term::scr_change_screen (int scrn) 516rxvt_term::scr_change_screen (int scrn)
542{ 517{
543 int i;
544#if NSCREENS
545 int offset;
546#endif
547
548 want_refresh = 1; 518 want_refresh = 1;
549
550 view_start = 0; 519 view_start = 0;
551 520
552 if (current_screen == scrn) 521 if (current_screen == scrn)
553 return scrn; 522 return scrn;
554 523
555 selection_check (2); /* check for boundary cross */ 524 selection_check (2); /* check for boundary cross */
556 525
557 i = current_screen; current_screen = scrn; scrn = i; 526 int i = current_screen; current_screen = scrn; scrn = i;
558 527
559 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 528 ::swap (screen.cur.row, swap.cur.row);
560 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 529 ::swap (screen.cur.col, swap.cur.col);
561 MAX_IT (screen.cur.row, 0); 530
562 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
563 MAX_IT (screen.cur.col, 0); 532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
564 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
565 533
566#if NSCREENS 534#if NSCREENS
567 if (options & Opt_secondaryScreen) 535 if (options & Opt_secondaryScreen)
568 { 536 {
569 num_scr = 0; 537 num_scr = 0;
570 offset = saveLines;
571 538
572 for (i = prev_nrow; i--;) 539 for (int i = prev_nrow; i--; )
573 SWAP_IT (ROW(i), swap_save[i], line_t); 540 ::swap (ROW(i), swap_buf [i]);
574 541
575 SWAP_IT (screen.charset, swap.charset, int16_t); 542 ::swap (screen.charset, swap.charset);
576 SWAP_IT (screen.flags, swap.flags, int); 543 ::swap (screen.flags, swap.flags);
577 screen.flags |= Screen_VisibleCursor; 544 screen.flags |= Screen_VisibleCursor;
578 swap.flags |= Screen_VisibleCursor; 545 swap.flags |= Screen_VisibleCursor;
579 } 546 }
580 else 547 else
581#endif 548#endif
582 if (options & Opt_secondaryScroll) 549 if (options & Opt_secondaryScroll)
583 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 550 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
584 551
585 return scrn; 552 return scrn;
586} 553}
587 554
588// clear WrapNext indicator, solidifying position on next line 555// clear WrapNext indicator, solidifying position on next line
… …
595 screen.flags &= ~Screen_WrapNext; 562 screen.flags &= ~Screen_WrapNext;
596 563
597 screen.cur.col = 0; 564 screen.cur.col = 0;
598 565
599 if (screen.cur.row == screen.bscroll) 566 if (screen.cur.row == screen.bscroll)
600 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 567 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
601 else if (screen.cur.row < nrow - 1) 568 else if (screen.cur.row < nrow - 1)
602 screen.cur.row++; 569 screen.cur.row++;
603} 570}
604 571
605/* ------------------------------------------------------------------------- */ 572/* ------------------------------------------------------------------------- */
… …
636/* ------------------------------------------------------------------------- */ 603/* ------------------------------------------------------------------------- */
637/* 604/*
638 * Scroll text between <row1> and <row2> inclusive, by <count> lines 605 * Scroll text between <row1> and <row2> inclusive, by <count> lines
639 * count positive ==> scroll up 606 * count positive ==> scroll up
640 * count negative ==> scroll down 607 * count negative ==> scroll down
641 * spec == 0 for normal routines
642 */ 608 */
643int 609int
644rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 610rxvt_term::scr_scroll_text (int row1, int row2, int count)
645{ 611{
646 int i, j;
647
648 if (count == 0 || (row1 > row2)) 612 if (count == 0 || (row1 > row2))
649 return 0; 613 return 0;
650 614
651 want_refresh = 1; 615 want_refresh = 1;
616 num_scr += count;
652 617
653 if (row1 == 0 && count > 0 618 if (count > 0
619 && row1 == 0
620 && row2 == nrow - 1
654 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 621 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
655 { 622 {
656 nsaved = min (nsaved + count, saveLines); 623 nsaved = min (nsaved + count, saveLines);
657 term_start = (term_start + count) % total_rows; 624 term_start = (term_start + count) % total_rows;
658 625
659 if (selection.op && current_screen == selection.screen) 626 if (selection.op && current_screen == selection.screen)
660 { 627 {
661 selection.beg.row -= count; 628 selection.beg.row -= count;
662 selection.end.row -= count; 629 selection.end.row -= count;
663 selection.mark.row -= count; 630 selection.mark.row -= count;
631
632 if (selection.beg.row < -nsaved
633 || selection.end.row < -nsaved
634 || selection.mark.row < -nsaved)
635 {
636 CLEAR_ALL_SELECTION ();
637 selection.op = SELECTION_CLEAR;
638 }
664 } 639 }
665 640
666 for (int i = count; i--; ) 641 for (int i = count; i--; )
642 {
643 ROW(row2 - i).l = 0;
667 scr_blank_screen_mem (ROW(row2 - i), rstyle); 644 scr_blank_screen_mem (ROW(row2 - i), rstyle);
645 }
668 646
669 if ((options & Opt_scrollWithBuffer) 647 if ((options & Opt_scrollWithBuffer)
670 && view_start != 0 648 && view_start != 0
671 && view_start != saveLines) 649 && view_start != saveLines)
672 scr_page (UP, count); 650 scr_page (UP, count);
673 } 651 }
674 else 652 else
675 { 653 {
676 if (!spec)
677 row1 += saveLines;
678
679 row2 += saveLines;
680
681 if (selection.op && current_screen == selection.screen) 654 if (selection.op && current_screen == selection.screen)
682 { 655 {
683 i = selection.beg.row + saveLines; 656 if ((selection.beg.row < row1 && selection.end.row > row1)
684 j = selection.end.row + saveLines; 657 || (selection.beg.row < row2 && selection.end.row > row2)
685
686 if ((i < row1 && j > row1)
687 || (i < row2 && j > row2)
688 || (i - count < row1 && i >= row1) 658 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
689 || (i - count > row2 && i <= row2) 659 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
690 || (j - count < row1 && j >= row1) 660 || (selection.end.row - count < row1 && selection.end.row >= row1)
691 || (j - count > row2 && j <= row2)) 661 || (selection.end.row - count > row2 && selection.end.row <= row2))
692 { 662 {
693 CLEAR_ALL_SELECTION (); 663 CLEAR_ALL_SELECTION ();
694 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 664 selection.op = SELECTION_CLEAR;
695 } 665 }
696 else if (j >= row1 && j <= row2) 666 else if (selection.end.row >= row1 && selection.end.row <= row2)
697 { 667 {
698 /* move selected region too */ 668 /* move selected region too */
699 selection.beg.row -= count; 669 selection.beg.row -= count;
700 selection.end.row -= count; 670 selection.end.row -= count;
701 selection.mark.row -= count; 671 selection.mark.row -= count;
672
673 selection_check (0);
702 } 674 }
703 } 675 }
704 676
705 selection_check (0); /* _after_ nsaved update */ 677 // use a simple and robust scrolling algorithm, this
678 // part of scr_scroll_text is not time-critical.
706 679
707 num_scr += count;
708 j = count;
709
710 if (count < 0)
711 count = -count;
712
713 i = row2 - row1 + 1; 680 int rows = row2 - row1 + 1;
714 MIN_IT (count, i);
715 681
716 if (j > 0) 682 min_it (count, rows);
717 {
718 /* scroll up */
719 683
720 /* Copy lines that will get clobbered by the rotation */ 684 for (int row = 0; row < rows; row++)
721 memcpy (buf, save + row1, count * sizeof (line_t));
722
723 /* Rotate lines */
724 i = row2 - row1 - count + 1;
725 memmove (save + row1, save + row1 + count, i * sizeof (line_t));
726
727 j = row2 - count + 1, i = count;
728 } 685 {
729 else /* if (j < 0) */ 686 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
687
688 if (!IN_RANGE_EXC (row + count, 0, rows))
689 scr_blank_screen_mem (temp_buf [row], rstyle);
730 { 690 }
731 /* scroll down */
732 691
733 /* Copy lines that will get clobbered by the rotation */ 692 for (int row = 0; row < rows; row++)
734 for (i = 0, j = row2; i < count; i++, j--) 693 ROW(row1 + row) = temp_buf [row];
735 buf[i] = save[j];
736
737 /* Rotate lines */
738 for (j = row2, i = j - count; i >= row1; i--, j--)
739 save[j] = save[i];
740
741 j = row1, i = count;
742 count = -count;
743 }
744
745 /* Resurrect lines */
746 memcpy (save + j, buf, i * sizeof (line_t));
747
748 if (!spec) /* line length may not equal ncol */
749 for (; i--; j++)
750 scr_blank_screen_mem (save[j], rstyle);
751 } 694 }
752 695
753 return count; 696 return count;
754} 697}
755 698
… …
763 if (len <= 0) /* sanity */ 706 if (len <= 0) /* sanity */
764 return; 707 return;
765 708
766 unsigned char checksel; 709 unsigned char checksel;
767 unicode_t c; 710 unicode_t c;
768 int row, last_col; 711 int last_col;
769 const unicode_t *strend = str + len; 712 const unicode_t *strend = str + len;
770 713
771 want_refresh = 1; 714 want_refresh = 1;
772 ZERO_SCROLLBACK (); 715 ZERO_SCROLLBACK ();
773 last_col = ncol; 716 last_col = ncol;
774 717
775 if (nlines > 0) 718 if (nlines > 0)
776 { 719 {
777 nlines += screen.cur.row - screen.bscroll; 720 nlines += screen.cur.row - screen.bscroll;
778 if ((nlines > 0) 721 if (nlines > 0
779 && (screen.tscroll == 0) 722 && screen.tscroll == 0
780 && (screen.bscroll == (nrow - 1))) 723 && screen.bscroll == (nrow - 1))
781 { 724 {
782 /* _at least_ this many lines need to be scrolled */ 725 /* _at least_ this many lines need to be scrolled */
783 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 726 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
784 screen.cur.row -= nlines; 727 screen.cur.row -= nlines;
785 } 728 }
786 } 729 }
787 730
788#ifdef DEBUG_STRICT 731#ifdef DEBUG_STRICT
789 assert (screen.cur.col < last_col); 732 assert (screen.cur.col < last_col);
790 assert ((screen.cur.row < nrow) 733 assert (screen.cur.row < nrow
791 && (screen.cur.row >= - (int32_t)nsaved)); 734 && screen.cur.row >= -nsaved);
792#else /* drive with your eyes closed */
793 MIN_IT (screen.cur.col, last_col - 1);
794 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
795 MAX_IT (screen.cur.row, - (int32_t)nsaved);
796#endif 735#endif
797 row = screen.cur.row; 736 int row = screen.cur.row;
798 737
799 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 738 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
800 739
801 line_t *line = &ROW(row); 740 line_t *line = &ROW(row);
802 741
… …
804 { 743 {
805 c = *str++; 744 c = *str++;
806 745
807 if (c < 0x20) 746 if (c < 0x20)
808 if (c == C0_LF) 747 if (c == C0_LF)
809 { 748 {
810 if (!line->is_longer ()) /* XXX: think about this */ 749 if (!line->is_longer ()) /* XXX: think about this */
811 MAX_IT (line->l, screen.cur.col); 750 max_it (line->l, screen.cur.col);
812 751
813 screen.flags &= ~Screen_WrapNext; 752 screen.flags &= ~Screen_WrapNext;
814 753
815 if (screen.cur.row == screen.bscroll) 754 if (screen.cur.row == screen.bscroll)
816 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 755 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
817 else if (screen.cur.row < (nrow - 1)) 756 else if (screen.cur.row < (nrow - 1))
818 row = ++screen.cur.row; 757 row = ++screen.cur.row;
819 758
820 line = &ROW(row); /* _must_ refresh */ 759 line = &ROW(row); /* _must_ refresh */
821 continue; 760 continue;
822 } 761 }
823 else if (c == C0_CR) 762 else if (c == C0_CR)
824 { 763 {
825 if (!line->is_longer ()) /* XXX: think about this */ 764 if (!line->is_longer ()) /* XXX: think about this */
826 MAX_IT (line->l, screen.cur.col); 765 max_it (line->l, screen.cur.col);
827 766
828 screen.flags &= ~Screen_WrapNext; 767 screen.flags &= ~Screen_WrapNext;
829 screen.cur.col = 0; 768 screen.cur.col = 0;
830 continue; 769 continue;
831 } 770 }
… …
1007#endif 946#endif
1008 } 947 }
1009 } 948 }
1010 949
1011 if (!line->is_longer ()) /* XXX: think about this */ 950 if (!line->is_longer ()) /* XXX: think about this */
1012 MAX_IT (line->l, screen.cur.col); 951 max_it (line->l, screen.cur.col);
1013 952
1014#ifdef DEBUG_STRICT 953#ifdef DEBUG_STRICT
1015 assert (screen.cur.row >= 0); 954 assert (screen.cur.row >= 0);
1016#else /* drive with your eyes closed */
1017 MAX_IT (screen.cur.row, 0);
1018#endif 955#endif
1019} 956}
1020 957
1021/* ------------------------------------------------------------------------- */ 958/* ------------------------------------------------------------------------- */
1022/* 959/*
… …
1061 998
1062 if (count == 0) 999 if (count == 0)
1063 return; 1000 return;
1064 else if (count > 0) 1001 else if (count > 0)
1065 { 1002 {
1066 int row = screen.cur.row;
1067
1068 line_t &l = ROW(row); 1003 line_t &l = ROW(screen.cur.row);
1069 rend_t base_rend = l.r[i]; 1004 rend_t base_rend = l.r[i];
1070 ht &= l.t[i] == ' '; 1005 ht &= l.t[i] == ' ';
1071 1006
1072 for (; ++i < ncol; ) 1007 for (; ++i < ncol; )
1073 if (tabs[i]) 1008 if (tabs[i])
… …
1088 if (ht && options & Opt_pastableTabs) 1023 if (ht && options & Opt_pastableTabs)
1089 { 1024 {
1090 base_rend = SET_FONT (base_rend, 0); 1025 base_rend = SET_FONT (base_rend, 0);
1091 1026
1092 if (!l.is_longer ()) /* XXX: think about this */ 1027 if (!l.is_longer ()) /* XXX: think about this */
1093 MAX_IT (l.l, x); 1028 max_it (l.l, x);
1094 1029
1095 i = screen.cur.col; 1030 i = screen.cur.col;
1096 1031
1097 l.t[i] = '\t'; 1032 l.t[i] = '\t';
1098 l.r[i] = base_rend; 1033 l.r[i] = base_rend;
… …
1148 */ 1083 */
1149#if ENABLE_FRILLS 1084#if ENABLE_FRILLS
1150void 1085void
1151rxvt_term::scr_forwardindex () 1086rxvt_term::scr_forwardindex ()
1152{ 1087{
1153 int row;
1154
1155 if (screen.cur.col < ncol - 1) 1088 if (screen.cur.col < ncol - 1)
1156 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1089 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1157 else 1090 else
1158 { 1091 {
1159 row = screen.cur.row;
1160
1161 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1092 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1162 ROW(row).l = ncol; 1093 ROW(screen.cur.row).l = ncol;
1163 1094
1164 scr_gotorc (0, 0, R_RELATIVE); 1095 scr_gotorc (0, 0, R_RELATIVE);
1165 scr_insdel_chars (1, DELETE); 1096 scr_insdel_chars (1, DELETE);
1166 scr_gotorc (0, ncol - 1, R_RELATIVE); 1097 scr_gotorc (0, ncol - 1, R_RELATIVE);
1167 } 1098 }
… …
1177{ 1108{
1178 want_refresh = 1; 1109 want_refresh = 1;
1179 ZERO_SCROLLBACK (); 1110 ZERO_SCROLLBACK ();
1180 1111
1181 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1112 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1182 MAX_IT (screen.cur.col, 0); 1113 clamp_it (screen.cur.col, 0, ncol - 1);
1183 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1184 1114
1185 screen.flags &= ~Screen_WrapNext; 1115 screen.flags &= ~Screen_WrapNext;
1186 1116
1187 if (relative & R_RELATIVE) 1117 if (relative & R_RELATIVE)
1188 { 1118 {
… …
1206 else 1136 else
1207 { 1137 {
1208 if (screen.flags & Screen_Relative) 1138 if (screen.flags & Screen_Relative)
1209 { /* relative origin mode */ 1139 { /* relative origin mode */
1210 screen.cur.row = row + screen.tscroll; 1140 screen.cur.row = row + screen.tscroll;
1211 MIN_IT (screen.cur.row, screen.bscroll); 1141 min_it (screen.cur.row, screen.bscroll);
1212 } 1142 }
1213 else 1143 else
1214 screen.cur.row = row; 1144 screen.cur.row = row;
1215 } 1145 }
1216 1146
1217 MAX_IT (screen.cur.row, 0); 1147 clamp_it (screen.cur.row, 0, nrow - 1);
1218 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1219} 1148}
1220 1149
1221/* ------------------------------------------------------------------------- */ 1150/* ------------------------------------------------------------------------- */
1222/* 1151/*
1223 * direction should be UP or DN 1152 * direction should be UP or DN
… …
1234 1163
1235 screen.flags &= ~Screen_WrapNext; 1164 screen.flags &= ~Screen_WrapNext;
1236 1165
1237 if ((screen.cur.row == screen.bscroll && direction == UP) 1166 if ((screen.cur.row == screen.bscroll && direction == UP)
1238 || (screen.cur.row == screen.tscroll && direction == DN)) 1167 || (screen.cur.row == screen.tscroll && direction == DN))
1239 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1168 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1240 else 1169 else
1241 screen.cur.row += dirn; 1170 screen.cur.row += dirn;
1242 1171
1243 MAX_IT (screen.cur.row, 0); 1172 clamp_it (screen.cur.row, 0, nrow - 1);
1244 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1245 selection_check (0); 1173 selection_check (0);
1246} 1174}
1247 1175
1248/* ------------------------------------------------------------------------- */ 1176/* ------------------------------------------------------------------------- */
1249/* 1177/*
… …
1253 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1181 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1254 */ 1182 */
1255void 1183void
1256rxvt_term::scr_erase_line (int mode) 1184rxvt_term::scr_erase_line (int mode)
1257{ 1185{
1258 unsigned int row, col, num; 1186 unsigned int col, num;
1259 1187
1260 want_refresh = 1; 1188 want_refresh = 1;
1261 ZERO_SCROLLBACK (); 1189 ZERO_SCROLLBACK ();
1262 1190
1263 selection_check (1); 1191 selection_check (1);
1264 1192
1265 row = screen.cur.row; 1193 line_t &line = ROW(screen.cur.row);
1266 1194
1267 switch (mode) 1195 switch (mode)
1268 { 1196 {
1269 case 0: /* erase to end of line */ 1197 case 0: /* erase to end of line */
1270 col = screen.cur.col; 1198 col = screen.cur.col;
1271 num = ncol - col; 1199 num = ncol - col;
1272 MIN_IT (ROW(row).l, (int16_t)col); 1200 min_it (line.l, col);
1273 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1201 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1274 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1202 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1275 CLEAR_SELECTION (); 1203 CLEAR_SELECTION ();
1276 break; 1204 break;
1277 case 1: /* erase to beginning of line */ 1205 case 1: /* erase to beginning of line */
… …
1282 CLEAR_SELECTION (); 1210 CLEAR_SELECTION ();
1283 break; 1211 break;
1284 case 2: /* erase whole line */ 1212 case 2: /* erase whole line */
1285 col = 0; 1213 col = 0;
1286 num = ncol; 1214 num = ncol;
1287 ROW(row).l = 0; 1215 line.l = 0;
1288 if (selection.beg.row <= screen.cur.row 1216 if (selection.beg.row <= screen.cur.row
1289 && selection.end.row >= screen.cur.row) 1217 && selection.end.row >= screen.cur.row)
1290 CLEAR_SELECTION (); 1218 CLEAR_SELECTION ();
1291 break; 1219 break;
1292 default: 1220 default:
1293 return; 1221 return;
1294 } 1222 }
1295 1223
1296 scr_blank_line (ROW(row), col, num, rstyle); 1224 scr_blank_line (line, col, num, rstyle);
1297} 1225}
1298 1226
1299/* ------------------------------------------------------------------------- */ 1227/* ------------------------------------------------------------------------- */
1300/* 1228/*
1301 * Erase part of whole of the screen 1229 * Erase part of whole of the screen
… …
1305 */ 1233 */
1306void 1234void
1307rxvt_term::scr_erase_screen (int mode) 1235rxvt_term::scr_erase_screen (int mode)
1308{ 1236{
1309 int num; 1237 int num;
1310 int32_t row, row_offset; 1238 int32_t row;
1311 rend_t ren; 1239 rend_t ren;
1312 XGCValues gcvalue; 1240 XGCValues gcvalue;
1313 1241
1314 want_refresh = 1; 1242 want_refresh = 1;
1315 ZERO_SCROLLBACK (); 1243 ZERO_SCROLLBACK ();
1316
1317 row_offset = (int32_t)saveLines;
1318 1244
1319 switch (mode) 1245 switch (mode)
1320 { 1246 {
1321 case 0: /* erase to end of screen */ 1247 case 0: /* erase to end of screen */
1322 selection_check (1); 1248 selection_check (1);
… …
1346 CLEAR_SELECTION (); 1272 CLEAR_SELECTION ();
1347 1273
1348 if (row >= nrow) /* Out Of Bounds */ 1274 if (row >= nrow) /* Out Of Bounds */
1349 return; 1275 return;
1350 1276
1351 MIN_IT (num, (nrow - row)); 1277 min_it (num, nrow - row);
1352 1278
1353 if (rstyle & (RS_RVid | RS_Uline)) 1279 if (rstyle & (RS_RVid | RS_Uline))
1354 ren = (rend_t) ~RS_None; 1280 ren = (rend_t) ~RS_None;
1355 else if (GET_BASEBG (rstyle) == Color_bg) 1281 else if (GET_BASEBG (rstyle) == Color_bg)
1356 { 1282 {
… …
1367 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1293 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1368 } 1294 }
1369 1295
1370 for (; num--; row++) 1296 for (; num--; row++)
1371 { 1297 {
1298 ROW (row).l = 0;
1372 scr_blank_screen_mem (save[row + row_offset], rstyle); 1299 scr_blank_screen_mem (ROW (row), rstyle);
1373 save[row + row_offset].l = 0;
1374 scr_blank_line (drawn[row], 0, ncol, ren); 1300 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1375 } 1301 }
1376} 1302}
1377 1303
1378#if ENABLE_FRILLS 1304#if ENABLE_FRILLS
1379void 1305void
… …
1392 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1318 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1393 */ 1319 */
1394void 1320void
1395rxvt_term::scr_E () 1321rxvt_term::scr_E ()
1396{ 1322{
1397 int i, j, k;
1398 rend_t *r1, fs; 1323 rend_t fs;
1399 1324
1400 want_refresh = 1; 1325 want_refresh = 1;
1401 ZERO_SCROLLBACK (); 1326 ZERO_SCROLLBACK ();
1402 1327
1403 num_scr_allow = 0; 1328 num_scr_allow = 0;
1404 selection_check (3); 1329 selection_check (3);
1405 1330
1406 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1331 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1407 for (k = saveLines, i = nrow; i--; k++) 1332 for (int row = nrow; row--; )
1408 { 1333 {
1409 line_t &line = save[k]; 1334 line_t &line = ROW(row);
1410 1335
1411 fill_text (line.t, 'E', ncol); 1336 fill_text (line.t, 'E', ncol);
1337 rend_t *r1 = line.r;
1412 1338
1413 for (r1 = line.r, j = ncol; j--; ) 1339 for (int j = ncol; j--; )
1414 *r1++ = fs; 1340 *r1++ = fs;
1415 1341
1416 line.l = ncol; /* make the `E's selectable */ 1342 line.l = ncol; /* make the `E's selectable */
1417 } 1343 }
1418} 1344}
… …
1442 count = end; 1368 count = end;
1443 } 1369 }
1444 1370
1445 scr_do_wrap (); 1371 scr_do_wrap ();
1446 1372
1447 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1373 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1448} 1374}
1449 1375
1450/* ------------------------------------------------------------------------- */ 1376/* ------------------------------------------------------------------------- */
1451/* 1377/*
1452 * Insert/Delete <count> characters from the current position 1378 * Insert/Delete <count> characters from the current position
… …
1464 return; 1390 return;
1465 1391
1466 scr_do_wrap (); 1392 scr_do_wrap ();
1467 1393
1468 selection_check (1); 1394 selection_check (1);
1469 MIN_IT (count, (ncol - screen.cur.col)); 1395 min_it (count, ncol - screen.cur.col);
1470 1396
1471 row = screen.cur.row + saveLines; 1397 row = screen.cur.row;
1472 1398
1473 line_t *line = save + row; 1399 line_t *line = &ROW(row);
1474 1400
1475 switch (insdel) 1401 switch (insdel)
1476 { 1402 {
1477 case INSERT: 1403 case INSERT:
1478 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1404 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
… …
1482 } 1408 }
1483 1409
1484 if (!line->is_longer ()) 1410 if (!line->is_longer ())
1485 { 1411 {
1486 line->l += count; 1412 line->l += count;
1487 MIN_IT (line->l, ncol); 1413 min_it (line->l, ncol);
1488 } 1414 }
1489 1415
1490 if (selection.op && current_screen == selection.screen 1416 if (selection.op && current_screen == selection.screen
1491 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1417 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1492 { 1418 {
… …
1499 selection.mark.col += count; /* XXX: yes? */ 1425 selection.mark.col += count; /* XXX: yes? */
1500 selection.end.col += count; 1426 selection.end.col += count;
1501 } 1427 }
1502 } 1428 }
1503 1429
1504 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1430 scr_blank_line (*line, screen.cur.col, count, rstyle);
1505 break; 1431 break;
1506 1432
1507 case ERASE: 1433 case ERASE:
1508 screen.cur.col += count; /* don't worry if > ncol */ 1434 screen.cur.col += count; /* don't worry if > ncol */
1509 selection_check (1); 1435 selection_check (1);
1510 screen.cur.col -= count; 1436 screen.cur.col -= count;
1511 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1437 scr_blank_line (*line, screen.cur.col, count, rstyle);
1512 break; 1438 break;
1513 1439
1514 case DELETE: 1440 case DELETE:
1515 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1441 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1516 1442
… …
1523 scr_blank_line (*line, ncol - count, count, tr); 1449 scr_blank_line (*line, ncol - count, count, tr);
1524 1450
1525 if (line->is_longer ()) /* break line continuation */ 1451 if (line->is_longer ()) /* break line continuation */
1526 line->l = ncol; 1452 line->l = ncol;
1527 1453
1528 line->l -= count; 1454 line->l = max (line->l - count, 0);
1529 MAX_IT (line->l, 0);
1530 1455
1531 if (selection.op && current_screen == selection.screen 1456 if (selection.op && current_screen == selection.screen
1532 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1457 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1533 { 1458 {
1534 if (selection.end.row != screen.cur.row 1459 if (selection.end.row != screen.cur.row
… …
1554 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1479 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1555 */ 1480 */
1556void 1481void
1557rxvt_term::scr_scroll_region (int top, int bot) 1482rxvt_term::scr_scroll_region (int top, int bot)
1558{ 1483{
1559 MAX_IT (top, 0); 1484 max_it (top, 0);
1560 MIN_IT (bot, (int)nrow - 1); 1485 min_it (bot, nrow - 1);
1561 1486
1562 if (top > bot) 1487 if (top > bot)
1563 return; 1488 return;
1564 1489
1565 screen.tscroll = top; 1490 screen.tscroll = top;
… …
1663 XGCValues gcvalue; 1588 XGCValues gcvalue;
1664 1589
1665 if (rvideo != mode) 1590 if (rvideo != mode)
1666 { 1591 {
1667 rvideo = mode; 1592 rvideo = mode;
1668 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1593 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1669#if XPM_BACKGROUND 1594#if XPM_BACKGROUND
1670 if (bgPixmap.pixmap == None) 1595 if (bgPixmap.pixmap == None)
1671#endif 1596#endif
1672#if TRANSPARENT 1597#if TRANSPARENT
1673 if (! (options & Opt_transparent) || am_transparent == 0) 1598 if (! (options & Opt_transparent) || am_transparent == 0)
… …
1769 bool found = false; 1694 bool found = false;
1770 1695
1771 for (int i = 0; i < nrow; i++) 1696 for (int i = 0; i < nrow; i++)
1772 { 1697 {
1773 int col = 0; 1698 int col = 0;
1774 rend_t *drp = drawn[i].r; 1699 rend_t *drp = drawn_buf[i].r;
1775 1700
1776 for (; col < ncol; col++, drp++) 1701 for (; col < ncol; col++, drp++)
1777 if ((*drp & mask) == value) 1702 if ((*drp & mask) == value)
1778 { 1703 {
1779 found = true; 1704 found = true;
… …
1797rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1722rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1798{ 1723{
1799 int i; 1724 int i;
1800 row_col_t rc[RC_COUNT]; 1725 row_col_t rc[RC_COUNT];
1801 1726
1802 if (!drawn) /* sanity check */ 1727 if (!drawn_buf) /* sanity check */
1803 return; 1728 return;
1804 1729
1805#ifndef NO_SLOW_LINK_SUPPORT 1730#ifndef NO_SLOW_LINK_SUPPORT
1806 if (refresh_type == FAST_REFRESH && !display->is_local) 1731 if (refresh_type == FAST_REFRESH && !display->is_local)
1807 { 1732 {
1808 y = 0; 1733 y = 0;
1809 eheight = height; 1734 eheight = height;
1810 } 1735 }
1811#endif
1812
1813#ifdef DEBUG_STRICT
1814 x = max (x, 0);
1815 x = min (x, (int)width);
1816 y = max (y, 0);
1817 y = min (y, (int)height);
1818#endif 1736#endif
1819 1737
1820 /* round down */ 1738 /* round down */
1821 rc[PART_BEG].col = Pixel2Col (x); 1739 rc[PART_BEG].col = Pixel2Col (x);
1822 rc[PART_BEG].row = Pixel2Row (y); 1740 rc[PART_BEG].row = Pixel2Row (y);
… …
1825 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1743 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1826 1744
1827 /* sanity checks */ 1745 /* sanity checks */
1828 for (i = PART_BEG; i < RC_COUNT; i++) 1746 for (i = PART_BEG; i < RC_COUNT; i++)
1829 { 1747 {
1830 MIN_IT (rc[i].col, ncol - 1); 1748 min_it (rc[i].col, ncol - 1);
1831 MIN_IT (rc[i].row, nrow - 1); 1749 min_it (rc[i].row, nrow - 1);
1832 } 1750 }
1833 1751
1834 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1752 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1835 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1753 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1836 1754
1837 if (refresh) 1755 if (refresh)
1838 scr_refresh (SLOW_REFRESH); 1756 scr_refresh (SLOW_REFRESH);
1839} 1757}
1840 1758
… …
1941/* ARGSUSED */ 1859/* ARGSUSED */
1942void 1860void
1943rxvt_term::scr_printscreen (int fullhist) 1861rxvt_term::scr_printscreen (int fullhist)
1944{ 1862{
1945#ifdef PRINTPIPE 1863#ifdef PRINTPIPE
1946 int i, r1, nrows, row_offset; 1864 int nrows, row_start;
1947 FILE *fd; 1865 FILE *fd;
1948 1866
1949 if ((fd = popen_printer ()) == NULL) 1867 if ((fd = popen_printer ()) == NULL)
1950 return; 1868 return;
1951 1869
1952 nrows = nrow;
1953 row_offset = saveLines;
1954
1955 if (!fullhist) 1870 if (fullhist)
1956 row_offset -= view_start; 1871 {
1872 nrows = nrow + nsaved;
1873 row_start = -nsaved;
1874 }
1957 else 1875 else
1958 { 1876 {
1959 nrows += nsaved; 1877 nrows = nrow;
1960 row_offset -= nsaved; 1878 row_start = -view_start;
1961 } 1879 }
1962 1880
1963 wctomb (0, 0); 1881 wctomb (0, 0);
1964 1882
1965 for (r1 = 0; r1 < nrows; r1++) 1883 for (int r1 = 0; r1 < nrows; r1++)
1966 { 1884 {
1967 text_t *tp = save[r1 + row_offset].t; 1885 text_t *tp = ROW(r1).t;
1968 int len = save[r1 + row_offset].l; 1886 int len = ROW(r1).l;
1969 1887
1970 for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1888 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1971 { 1889 {
1972 char mb[MB_LEN_MAX]; 1890 char mb[MB_LEN_MAX];
1973 text_t t = *tp++; 1891 text_t t = *tp++;
1974 if (t == NOCHAR) 1892 if (t == NOCHAR)
1975 continue; 1893 continue;
… …
2003{ 1921{
2004 unsigned char must_clear, /* use draw_string not draw_image_string */ 1922 unsigned char must_clear, /* use draw_string not draw_image_string */
2005 showcursor; /* show the cursor */ 1923 showcursor; /* show the cursor */
2006 int16_t col, row, /* column/row we're processing */ 1924 int16_t col, row, /* column/row we're processing */
2007 ocrow; /* old cursor row */ 1925 ocrow; /* old cursor row */
2008 int i, /* tmp */ 1926 int i; /* tmp */
2009 row_offset; /* basic offset in screen structure */
2010#ifndef NO_CURSORCOLOR 1927#ifndef NO_CURSORCOLOR
2011 rend_t cc1; /* store colours at cursor position (s) */ 1928 rend_t cc1; /* store colours at cursor position (s) */
2012#endif 1929#endif
2013 rend_t *crp; // cursor rendition pointer 1930 rend_t *crp; // cursor rendition pointer
2014 1931
… …
2020 /* 1937 /*
2021 * A: set up vars 1938 * A: set up vars
2022 */ 1939 */
2023 must_clear = 0; 1940 must_clear = 0;
2024 refresh_count = 0; 1941 refresh_count = 0;
2025
2026 row_offset = term_start - view_start;
2027 1942
2028#if XPM_BACKGROUND 1943#if XPM_BACKGROUND
2029 must_clear |= bgPixmap.pixmap != None; 1944 must_clear |= bgPixmap.pixmap != None;
2030#endif 1945#endif
2031#if TRANSPARENT 1946#if TRANSPARENT
… …
2101 if (screen.cur.row + view_start != ocrow 2016 if (screen.cur.row + view_start != ocrow
2102 || screen.cur.col != oldcursor.col) 2017 || screen.cur.col != oldcursor.col)
2103 { 2018 {
2104 if (ocrow < nrow 2019 if (ocrow < nrow
2105 && oldcursor.col < ncol) 2020 && oldcursor.col < ncol)
2106 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2021 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2107 2022
2108 if (focus || !showcursor) 2023 if (focus || !showcursor)
2109 oldcursor.row = -1; 2024 oldcursor.row = -1;
2110 else 2025 else
2111 setoldcursor = 1; 2026 setoldcursor = 1;
… …
2135 * D: CopyArea pass - very useful for slower links 2050 * D: CopyArea pass - very useful for slower links
2136 * This has been deliberately kept simple. 2051 * This has been deliberately kept simple.
2137 */ 2052 */
2138 i = num_scr; 2053 i = num_scr;
2139 if (!display->is_local 2054 if (!display->is_local
2140 && refresh_type == FAST_REFRESH && num_scr_allow && i 2055 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2141 && abs (i) < nrow && !must_clear) 2056 && abs (num_scr) < nrow && !must_clear)
2142 { 2057 {
2143 int16_t nits; 2058 int16_t nits;
2144 int j; 2059 int j;
2145 int len, wlen; 2060 int len, wlen;
2146 2061
… …
2149 row = i > 0 ? 0 : j - 1; 2064 row = i > 0 ? 0 : j - 1;
2150 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2065 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2151 { 2066 {
2152 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2067 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2153 { 2068 {
2154 line_t s = save[(row + row_offset) % nlines]; 2069 line_t s = ROW(row - view_start);
2155 line_t d = drawn[row]; 2070 line_t d = drawn_buf[row];
2156 line_t d2 = drawn[row + i]; 2071 line_t d2 = drawn_buf[row + i];
2157 2072
2158 for (nits = 0, col = ncol; col--; ) 2073 for (nits = 0, col = ncol; col--; )
2159 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2074 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2160 nits--; 2075 nits--;
2161 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2076 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2179 2094
2180 if (len != -1) 2095 if (len != -1)
2181 { 2096 {
2182 /* also comes here at end if needed because of >= above */ 2097 /* also comes here at end if needed because of >= above */
2183 if (wlen < len) 2098 if (wlen < len)
2184 SWAP_IT (wlen, len, int); 2099 ::swap (wlen, len);
2185 2100
2186 XCopyArea (display->display, vt, vt, 2101 XCopyArea (display->display, vt, vt,
2187 gc, 0, Row2Pixel (len + i), 2102 gc, 0, Row2Pixel (len + i),
2188 (unsigned int)TermWin_TotalWidth (), 2103 (unsigned int)TermWin_TotalWidth (),
2189 (unsigned int)Height2Pixel (wlen - len + 1), 2104 (unsigned int)Height2Pixel (wlen - len + 1),
… …
2197 /* 2112 /*
2198 * E: main pass across every character 2113 * E: main pass across every character
2199 */ 2114 */
2200 for (row = 0; row < nrow; row++) 2115 for (row = 0; row < nrow; row++)
2201 { 2116 {
2202 text_t *stp = save[(row + row_offset) % total_rows].t; 2117 text_t *stp = ROW(row - view_start).t;
2203 rend_t *srp = save[(row + row_offset) % total_rows].r; 2118 rend_t *srp = ROW(row - view_start).r;
2204 text_t *dtp = drawn[row].t; 2119 text_t *dtp = drawn_buf[row].t;
2205 rend_t *drp = drawn[row].r; 2120 rend_t *drp = drawn_buf[row].r;
2206 2121
2207 /* 2122 /*
2208 * E2: OK, now the real pass 2123 * E2: OK, now the real pass
2209 */ 2124 */
2210 int ypixel = (int)Row2Pixel (row); 2125 int ypixel = (int)Row2Pixel (row);
… …
2275 * Determine the attributes for the string 2190 * Determine the attributes for the string
2276 */ 2191 */
2277 int fore = GET_FGCOLOR (rend); // desired foreground 2192 int fore = GET_FGCOLOR (rend); // desired foreground
2278 int back = GET_BGCOLOR (rend); // desired background 2193 int back = GET_BGCOLOR (rend); // desired background
2279 2194
2280 // only do special processing if any attributes are set, which is rare 2195 // only do special processing if any attributes are set, which is unlikely
2281 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2196 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2282 { 2197 {
2283#if ENABLE_STYLES 2198#if ENABLE_STYLES
2284 // force redraw after "careful" characters to avoid pixel droppings 2199 // force redraw after "careful" characters to avoid pixel droppings
2285 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2200 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2321 fore = Color_UL; 2236 fore = Color_UL;
2322#endif 2237#endif
2323 2238
2324 if (invert) 2239 if (invert)
2325 { 2240 {
2326 SWAP_IT (fore, back, int); 2241 ::swap (fore, back);
2327 2242
2328#ifndef NO_BOLD_UNDERLINE_REVERSE 2243#ifndef NO_BOLD_UNDERLINE_REVERSE
2329 if (ISSET_PIXCOLOR (Color_RV)) 2244 if (ISSET_PIXCOLOR (Color_RV))
2330 back = Color_RV; 2245 back = Color_RV;
2331 2246
… …
2423 2338
2424 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2339 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2425 col--; 2340 col--;
2426 2341
2427 while (col + cursorwidth < ncol 2342 while (col + cursorwidth < ncol
2428 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2343 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2429 cursorwidth++; 2344 cursorwidth++;
2430 2345
2431#ifndef NO_CURSORCOLOR 2346#ifndef NO_CURSORCOLOR
2432 if (ISSET_PIXCOLOR (Color_cursor)) 2347 if (ISSET_PIXCOLOR (Color_cursor))
2433 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2348 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2465 2380
2466void 2381void
2467rxvt_term::scr_remap_chars () 2382rxvt_term::scr_remap_chars ()
2468{ 2383{
2469 for (int i = total_rows; i--; ) 2384 for (int i = total_rows; i--; )
2470 scr_remap_chars (save[i]); 2385 scr_remap_chars (row_buf [i]);
2471 2386
2472 for (int i = nrow; i--; ) 2387 for (int i = nrow; i--; )
2473 { 2388 {
2474 scr_remap_chars (drawn[i]); 2389 scr_remap_chars (drawn_buf [i]);
2475 scr_remap_chars (swap_save[i]); 2390 scr_remap_chars (swap_buf [i]);
2476 } 2391 }
2477} 2392}
2478 2393
2479void 2394void
2480rxvt_term::scr_recolour () 2395rxvt_term::scr_recolour ()
… …
2547 row = selection.beg.row; 2462 row = selection.beg.row;
2548 } 2463 }
2549 else 2464 else
2550 { 2465 {
2551 col = 0; 2466 col = 0;
2552 row = view_start; 2467 row = -view_start;
2553 } 2468 }
2554 2469
2555 for (; row < min (selection.end.row, view_end); row++, col = 0) 2470 for (; row < min (selection.end.row, view_end); row++, col = 0)
2556 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2471 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2557 srp[col] ^= RS_RVid; 2472 srp[col] ^= RS_RVid;
… …
2577 char r1[] = "\n"; 2492 char r1[] = "\n";
2578 2493
2579 for (row = saveLines - nsaved; 2494 for (row = saveLines - nsaved;
2580 row < saveLines + nrow - 1; row++) 2495 row < saveLines + nrow - 1; row++)
2581 { 2496 {
2582 width = save[row].l >= 0 ? save[row].l 2497 width = row_buf[row].l >= 0 ? row_buf[row].l
2583 : ncol; 2498 : ncol;
2584 for (towrite = width; towrite; towrite -= wrote) 2499 for (towrite = width; towrite; towrite -= wrote)
2585 { 2500 {
2586 wrote = write (fd, & (save[row].t[width - towrite]), 2501 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2587 towrite); 2502 towrite);
2588 if (wrote < 0) 2503 if (wrote < 0)
2589 return; /* XXX: death, no report */ 2504 return; /* XXX: death, no report */
2590 } 2505 }
2591 if (save[row].l >= 0) 2506 if (row_buf[row].l >= 0)
2592 if (write (fd, r1, 1) <= 0) 2507 if (write (fd, r1, 1) <= 0)
2593 return; /* XXX: death, no report */ 2508 return; /* XXX: death, no report */
2594 } 2509 }
2595} 2510}
2596#endif 2511#endif
… …
3073 want_refresh = 1; 2988 want_refresh = 1;
3074 2989
3075 selection.mark.row = row - view_start; 2990 selection.mark.row = row - view_start;
3076 selection.mark.col = col; 2991 selection.mark.col = col;
3077 2992
3078 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); 2993 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3079 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); 2994 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3080 2995
3081 while (selection.mark.col > 0 2996 while (selection.mark.col > 0
3082 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 2997 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3083 --selection.mark.col; 2998 --selection.mark.col;
3084 2999
… …
3189 * flag == 2 ==> button 3 motion 3104 * flag == 2 ==> button 3 motion
3190 */ 3105 */
3191void 3106void
3192rxvt_term::selection_extend (int x, int y, int flag) 3107rxvt_term::selection_extend (int x, int y, int flag)
3193{ 3108{
3194 int col = min (max (Pixel2Col (x), 0), nrow - 1); 3109 int col = clamp (Pixel2Col (x), 0, ncol);
3195 int row = min (max (Pixel2Row (y), 0), ncol); 3110 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3196 3111
3197 /* 3112 /*
3198 * If we're selecting characters (single click) then we must check first 3113 * If we're selecting characters (single click) then we must check first
3199 * if we are at the same place as the original mark. If we are then 3114 * if we are at the same place as the original mark. If we are then
3200 * select nothing. Otherwise, if we're to the right of the mark, you have to 3115 * select nothing. Otherwise, if we're to the right of the mark, you have to
… …
3371 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3286 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3372 { 3287 {
3373 if (!ROW(end_row).is_longer ()) 3288 if (!ROW(end_row).is_longer ())
3374 { 3289 {
3375 selection.end.row = end_row; 3290 selection.end.row = end_row;
3376 selection.end.col = save[end_row + saveLines].l; 3291 selection.end.col = ROW(end_row).l;
3377 selection_remove_trailing_spaces (); 3292 selection_remove_trailing_spaces ();
3378 break; 3293 break;
3379 } 3294 }
3380 } 3295 }
3381 } 3296 }
… …
3413 } 3328 }
3414 } 3329 }
3415 3330
3416#if ENABLE_FRILLS 3331#if ENABLE_FRILLS
3417 if (selection.rect && selection.beg.col > selection.end.col) 3332 if (selection.rect && selection.beg.col > selection.end.col)
3418 SWAP_IT (selection.beg.col, selection.end.col, int); 3333 ::swap (selection.beg.col, selection.end.col);
3419#endif 3334#endif
3420} 3335}
3421 3336
3422#if ENABLE_FRILLS 3337#if ENABLE_FRILLS
3423void 3338void
… …
3621 */ 3536 */
3622void 3537void
3623rxvt_term::pixel_position (int *x, int *y) 3538rxvt_term::pixel_position (int *x, int *y)
3624{ 3539{
3625 *x = Pixel2Col (*x); 3540 *x = Pixel2Col (*x);
3626 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3541 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3627 *y = Pixel2Row (*y); 3542 *y = Pixel2Row (*y);
3628 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3543 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3629} 3544}
3630 3545
3631/* ------------------------------------------------------------------------- */ 3546/* ------------------------------------------------------------------------- */
3632#ifdef USE_XIM 3547#ifdef USE_XIM
3633void 3548void
… …
3655 3570
3656 if (x < 0) x = ncol - w; 3571 if (x < 0) x = ncol - w;
3657 if (y < 0) y = nrow - h; 3572 if (y < 0) y = nrow - h;
3658 3573
3659 // make space for border 3574 // make space for border
3660 w += 2; MIN_IT (w, ncol); 3575 w += 2; min_it (w, ncol);
3661 h += 2; MIN_IT (h, nrow); 3576 h += 2; min_it (h, nrow);
3662 3577
3663 x -= 1; MAX_IT (x, 0); 3578 x -= 1; clamp_it (x, 0, ncol - w);
3664 y -= 1; MAX_IT (y, 0); 3579 y -= 1; clamp_it (y, 0, nrow - h);
3665
3666 MIN_IT (x, ncol - w);
3667 MIN_IT (y, nrow - h);
3668 3580
3669 ov_x = x; ov_y = y; 3581 ov_x = x; ov_y = y;
3670 ov_w = w; ov_h = h; 3582 ov_w = w; ov_h = h;
3671 3583
3672 ov_text = new text_t *[h]; 3584 ov_text = new text_t *[h];

Diff Legend

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