… | |
… | |
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 | |
155 | void |
153 | void |
156 | rxvt_term::scr_reset () |
154 | rxvt_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 | printf ("qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D |
|
|
358 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
414 | } |
359 | } |
|
|
360 | while (p != pend && q > 0); |
|
|
361 | |
|
|
362 | term_start = total_rows - nrow; |
|
|
363 | nsaved = term_start - q; |
|
|
364 | |
|
|
365 | // make sure all terminal lines exist |
|
|
366 | while (nsaved < 0) |
|
|
367 | scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); |
|
|
368 | |
|
|
369 | } |
|
|
370 | else |
415 | } |
371 | { |
|
|
372 | // if no scrollback exists (yet), wing, instead of wrap |
|
|
373 | |
|
|
374 | for (int row = min (nrow, prev_nrow); row--; ) |
|
|
375 | { |
|
|
376 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
|
|
377 | line_t &qline = row_buf [row]; |
416 | |
378 | |
417 | free (screen.text); screen.text = tp; |
379 | qline = pline; |
418 | free (screen.rend); screen.rend = rp; |
380 | lresize (qline); |
419 | free (screen.tlen); screen.tlen = tl; |
381 | } |
420 | |
382 | |
421 | for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D |
383 | for (int row = prev_nrow; row < nrow; row++) |
|
|
384 | { |
|
|
385 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
|
|
386 | } |
|
|
387 | |
|
|
388 | term_start = 0; |
|
|
389 | } |
|
|
390 | |
|
|
391 | #ifdef DEBUG_STRICT //TODO: remove |
|
|
392 | for (int i = -nsaved; i < nrow; i++) |
|
|
393 | assert (ROW (i).t); |
422 | #endif |
394 | #endif |
|
|
395 | |
|
|
396 | free (old_buf); |
|
|
397 | delete old_ta; |
|
|
398 | delete old_ra; |
|
|
399 | |
|
|
400 | clamp_it (screen.cur.row, 0, nrow - 1); |
|
|
401 | clamp_it (screen.cur.col, 0, ncol - 1); |
423 | |
402 | |
424 | if (tabs) |
403 | if (tabs) |
425 | free (tabs); |
404 | free (tabs); |
426 | } |
405 | } |
427 | |
406 | |
428 | prev_nrow = nrow; |
407 | prev_nrow = nrow; |
429 | prev_ncol = ncol; |
408 | prev_ncol = ncol; |
430 | |
409 | |
431 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
410 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
432 | |
411 | |
433 | for (p = 0; p < ncol; p++) |
412 | for (int col = ncol; col--; ) |
434 | tabs[p] = (p % TABSIZE == 0) ? 1 : 0; |
413 | tabs [col] = col % TABSIZE == 0; |
435 | |
414 | |
436 | tt_winch (); |
415 | tt_winch (); |
437 | } |
|
|
438 | |
|
|
439 | void |
|
|
440 | rxvt_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 | } |
416 | } |
447 | |
417 | |
448 | /* ------------------------------------------------------------------------- */ |
418 | /* ------------------------------------------------------------------------- */ |
449 | /* |
419 | /* |
450 | * Free everything. That way malloc debugging can find leakage. |
420 | * Free everything. That way malloc debugging can find leakage. |
… | |
… | |
453 | rxvt_term::scr_release () |
423 | rxvt_term::scr_release () |
454 | { |
424 | { |
455 | delete talloc; talloc = 0; |
425 | delete talloc; talloc = 0; |
456 | delete ralloc; ralloc = 0; |
426 | delete ralloc; ralloc = 0; |
457 | |
427 | |
458 | free (save); |
428 | free (row_buf); |
459 | free (swap_save); |
429 | free (swap_buf); |
460 | free (drawn); |
430 | free (drawn_buf); |
461 | free (buf); |
431 | free (temp_buf); |
462 | free (tabs); |
432 | free (tabs); |
|
|
433 | |
|
|
434 | row_buf = 0; // signal that we freed all the arrays |
463 | } |
435 | } |
464 | |
436 | |
465 | /* ------------------------------------------------------------------------- */ |
437 | /* ------------------------------------------------------------------------- */ |
466 | /* |
438 | /* |
467 | * Hard reset |
439 | * Hard reset |
… | |
… | |
518 | set_font_style (); |
490 | set_font_style (); |
519 | break; |
491 | break; |
520 | } |
492 | } |
521 | |
493 | |
522 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
494 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
523 | MIN_IT (s->cur.row, nrow - 1); |
495 | min_it (s->cur.row, nrow - 1); |
524 | MIN_IT (s->cur.col, ncol - 1); |
496 | min_it (s->cur.col, ncol - 1); |
525 | #ifdef DEBUG_STRICT |
497 | #ifdef DEBUG_STRICT |
526 | assert (s->cur.row >= 0); |
498 | assert (s->cur.row >= 0); |
527 | assert (s->cur.col >= 0); |
499 | 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 |
500 | #endif |
532 | } |
501 | } |
533 | |
502 | |
534 | /* ------------------------------------------------------------------------- */ |
503 | /* ------------------------------------------------------------------------- */ |
535 | /* |
504 | /* |
… | |
… | |
546 | if (current_screen == scrn) |
515 | if (current_screen == scrn) |
547 | return scrn; |
516 | return scrn; |
548 | |
517 | |
549 | selection_check (2); /* check for boundary cross */ |
518 | selection_check (2); /* check for boundary cross */ |
550 | |
519 | |
551 | SWAP_IT (scrn, current_screen, int); |
520 | int i = current_screen; current_screen = scrn; scrn = i; |
552 | |
521 | |
553 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
522 | ::swap (screen.cur.row, swap.cur.row); |
554 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
523 | ::swap (screen.cur.col, swap.cur.col); |
555 | MAX_IT (screen.cur.row, 0); |
524 | |
556 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
525 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
557 | MAX_IT (screen.cur.col, 0); |
526 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
558 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
|
|
559 | |
527 | |
560 | #if NSCREENS |
528 | #if NSCREENS |
561 | if (options & Opt_secondaryScreen) |
529 | if (options & Opt_secondaryScreen) |
562 | { |
530 | { |
563 | num_scr = 0; |
531 | num_scr = 0; |
564 | |
532 | |
565 | for (int i = nrow; i--; ) |
533 | for (int i = prev_nrow; i--; ) |
566 | SWAP_IT (ROW(i), swap_save[i], line_t); |
534 | ::swap (ROW(i), swap_buf [i]); |
567 | |
535 | |
568 | SWAP_IT (screen.charset, swap.charset, int16_t); |
536 | ::swap (screen.charset, swap.charset); |
569 | SWAP_IT (screen.flags, swap.flags, int); |
537 | ::swap (screen.flags, swap.flags); |
570 | screen.flags |= Screen_VisibleCursor; |
538 | screen.flags |= Screen_VisibleCursor; |
571 | swap.flags |= Screen_VisibleCursor; |
539 | swap.flags |= Screen_VisibleCursor; |
572 | } |
540 | } |
573 | else |
541 | else |
574 | #endif |
542 | #endif |
… | |
… | |
639 | return 0; |
607 | return 0; |
640 | |
608 | |
641 | want_refresh = 1; |
609 | want_refresh = 1; |
642 | num_scr += count; |
610 | num_scr += count; |
643 | |
611 | |
644 | if (row1 == 0 && count > 0 |
612 | if (count > 0 |
|
|
613 | && row1 == 0 |
|
|
614 | && row2 == nrow - 1 |
645 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
615 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
646 | { |
616 | { |
647 | nsaved = min (nsaved + count, saveLines); |
617 | nsaved = min (nsaved + count, saveLines); |
648 | term_start = (term_start + count) % total_rows; |
618 | term_start = (term_start + count) % total_rows; |
649 | |
619 | |
… | |
… | |
651 | { |
621 | { |
652 | selection.beg.row -= count; |
622 | selection.beg.row -= count; |
653 | selection.end.row -= count; |
623 | selection.end.row -= count; |
654 | selection.mark.row -= count; |
624 | selection.mark.row -= count; |
655 | |
625 | |
656 | selection_check (0); |
626 | if (selection.beg.row < -nsaved |
|
|
627 | || selection.end.row < -nsaved |
|
|
628 | || selection.mark.row < -nsaved) |
|
|
629 | { |
|
|
630 | CLEAR_ALL_SELECTION (); |
|
|
631 | selection.op = SELECTION_CLEAR; |
|
|
632 | } |
657 | } |
633 | } |
658 | |
634 | |
659 | for (int i = count; i--; ) |
635 | for (int i = count; i--; ) |
|
|
636 | { |
|
|
637 | ROW(row2 - i).l = 0; |
660 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
638 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
|
|
639 | } |
661 | |
640 | |
662 | if ((options & Opt_scrollWithBuffer) |
641 | if ((options & Opt_scrollWithBuffer) |
663 | && view_start != 0 |
642 | && view_start != 0 |
664 | && view_start != saveLines) |
643 | && view_start != saveLines) |
665 | scr_page (UP, count); |
644 | scr_page (UP, count); |
666 | } |
645 | } |
667 | else |
646 | else |
668 | { |
647 | { |
669 | if (selection.op && current_screen == selection.screen) |
648 | if (selection.op && current_screen == selection.screen) |
670 | { |
649 | { |
671 | int i = selection.beg.row; |
650 | if ((selection.beg.row < row1 && selection.end.row > row1) |
672 | int j = selection.end.row; |
651 | || (selection.beg.row < row2 && selection.end.row > row2) |
673 | |
|
|
674 | if ((i < row1 && j > row1) |
|
|
675 | || (i < row2 && j > row2) |
|
|
676 | || (i - count < row1 && i >= row1) |
652 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
677 | || (i - count > row2 && i <= row2) |
653 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
678 | || (j - count < row1 && j >= row1) |
654 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
679 | || (j - count > row2 && j <= row2)) |
655 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
680 | { |
656 | { |
681 | CLEAR_ALL_SELECTION (); |
657 | CLEAR_ALL_SELECTION (); |
682 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
658 | selection.op = SELECTION_CLEAR; |
683 | } |
659 | } |
684 | else if (j >= row1 && j <= row2) |
660 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
685 | { |
661 | { |
686 | /* move selected region too */ |
662 | /* move selected region too */ |
687 | selection.beg.row -= count; |
663 | selection.beg.row -= count; |
688 | selection.end.row -= count; |
664 | selection.end.row -= count; |
689 | selection.mark.row -= count; |
665 | selection.mark.row -= count; |
… | |
… | |
695 | // use a simple and robust scrolling algorithm, this |
671 | // use a simple and robust scrolling algorithm, this |
696 | // part of scr_scroll_text is not time-critical. |
672 | // part of scr_scroll_text is not time-critical. |
697 | |
673 | |
698 | int rows = row2 - row1 + 1; |
674 | int rows = row2 - row1 + 1; |
699 | |
675 | |
|
|
676 | min_it (count, rows); |
|
|
677 | |
700 | for (int row = 0; row < rows; row++) |
678 | for (int row = 0; row < rows; row++) |
701 | { |
679 | { |
702 | buf [row] = ROW(row1 + (row + count + rows) % rows); |
680 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
703 | |
681 | |
704 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
682 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
705 | scr_blank_screen_mem (buf [row], rstyle); |
683 | scr_blank_screen_mem (temp_buf [row], rstyle); |
706 | } |
684 | } |
707 | |
685 | |
708 | for (int row = 0; row < rows; row++) |
686 | for (int row = 0; row < rows; row++) |
709 | ROW(row1 + row) = buf [row]; |
687 | ROW(row1 + row) = temp_buf [row]; |
710 | } |
688 | } |
711 | |
689 | |
712 | return count; |
690 | return count; |
713 | } |
691 | } |
714 | |
692 | |
… | |
… | |
722 | if (len <= 0) /* sanity */ |
700 | if (len <= 0) /* sanity */ |
723 | return; |
701 | return; |
724 | |
702 | |
725 | unsigned char checksel; |
703 | unsigned char checksel; |
726 | unicode_t c; |
704 | unicode_t c; |
727 | int row, last_col; |
705 | int last_col; |
728 | const unicode_t *strend = str + len; |
706 | const unicode_t *strend = str + len; |
729 | |
707 | |
730 | want_refresh = 1; |
708 | want_refresh = 1; |
731 | ZERO_SCROLLBACK (); |
709 | ZERO_SCROLLBACK (); |
732 | last_col = ncol; |
710 | last_col = ncol; |
733 | |
711 | |
734 | if (nlines > 0) |
712 | if (nlines > 0) |
735 | { |
713 | { |
736 | nlines += screen.cur.row - screen.bscroll; |
714 | nlines += screen.cur.row - screen.bscroll; |
737 | if ((nlines > 0) |
715 | if (nlines > 0 |
738 | && (screen.tscroll == 0) |
716 | && screen.tscroll == 0 |
739 | && (screen.bscroll == (nrow - 1))) |
717 | && screen.bscroll == (nrow - 1)) |
740 | { |
718 | { |
741 | /* _at least_ this many lines need to be scrolled */ |
719 | /* _at least_ this many lines need to be scrolled */ |
742 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines); |
720 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines); |
743 | screen.cur.row -= nlines; |
721 | screen.cur.row -= nlines; |
744 | } |
722 | } |
745 | } |
723 | } |
746 | |
724 | |
747 | #ifdef DEBUG_STRICT |
725 | #ifdef DEBUG_STRICT |
748 | assert (screen.cur.col < last_col); |
726 | assert (screen.cur.col < last_col); |
749 | assert ((screen.cur.row < nrow) |
727 | assert (screen.cur.row < nrow |
750 | && (screen.cur.row >= - (int32_t)nsaved)); |
728 | && screen.cur.row >= -nsaved); |
751 | #else /* drive with your eyes closed */ |
|
|
752 | MIN_IT (screen.cur.col, last_col - 1); |
|
|
753 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
|
|
754 | MAX_IT (screen.cur.row, - (int32_t)nsaved); |
|
|
755 | #endif |
729 | #endif |
756 | row = screen.cur.row; |
730 | int row = screen.cur.row; |
757 | |
731 | |
758 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
732 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
759 | |
733 | |
760 | line_t *line = &ROW(row); |
734 | line_t *line = &ROW(row); |
761 | |
735 | |
… | |
… | |
763 | { |
737 | { |
764 | c = *str++; |
738 | c = *str++; |
765 | |
739 | |
766 | if (c < 0x20) |
740 | if (c < 0x20) |
767 | if (c == C0_LF) |
741 | if (c == C0_LF) |
768 | { |
742 | { |
769 | if (!line->is_longer ()) /* XXX: think about this */ |
743 | if (!line->is_longer ()) /* XXX: think about this */ |
770 | MAX_IT (line->l, screen.cur.col); |
744 | max_it (line->l, screen.cur.col); |
771 | |
745 | |
772 | screen.flags &= ~Screen_WrapNext; |
746 | screen.flags &= ~Screen_WrapNext; |
773 | |
747 | |
774 | if (screen.cur.row == screen.bscroll) |
748 | if (screen.cur.row == screen.bscroll) |
775 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
749 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
… | |
… | |
780 | continue; |
754 | continue; |
781 | } |
755 | } |
782 | else if (c == C0_CR) |
756 | else if (c == C0_CR) |
783 | { |
757 | { |
784 | if (!line->is_longer ()) /* XXX: think about this */ |
758 | if (!line->is_longer ()) /* XXX: think about this */ |
785 | MAX_IT (line->l, screen.cur.col); |
759 | max_it (line->l, screen.cur.col); |
786 | |
760 | |
787 | screen.flags &= ~Screen_WrapNext; |
761 | screen.flags &= ~Screen_WrapNext; |
788 | screen.cur.col = 0; |
762 | screen.cur.col = 0; |
789 | continue; |
763 | continue; |
790 | } |
764 | } |
… | |
… | |
966 | #endif |
940 | #endif |
967 | } |
941 | } |
968 | } |
942 | } |
969 | |
943 | |
970 | if (!line->is_longer ()) /* XXX: think about this */ |
944 | if (!line->is_longer ()) /* XXX: think about this */ |
971 | MAX_IT (line->l, screen.cur.col); |
945 | max_it (line->l, screen.cur.col); |
972 | |
946 | |
973 | #ifdef DEBUG_STRICT |
947 | #ifdef DEBUG_STRICT |
974 | assert (screen.cur.row >= 0); |
948 | assert (screen.cur.row >= 0); |
975 | #else /* drive with your eyes closed */ |
|
|
976 | MAX_IT (screen.cur.row, 0); |
|
|
977 | #endif |
949 | #endif |
978 | } |
950 | } |
979 | |
951 | |
980 | /* ------------------------------------------------------------------------- */ |
952 | /* ------------------------------------------------------------------------- */ |
981 | /* |
953 | /* |
… | |
… | |
1020 | |
992 | |
1021 | if (count == 0) |
993 | if (count == 0) |
1022 | return; |
994 | return; |
1023 | else if (count > 0) |
995 | else if (count > 0) |
1024 | { |
996 | { |
1025 | int row = screen.cur.row; |
|
|
1026 | |
|
|
1027 | line_t &l = ROW(row); |
997 | line_t &l = ROW(screen.cur.row); |
1028 | rend_t base_rend = l.r[i]; |
998 | rend_t base_rend = l.r[i]; |
1029 | ht &= l.t[i] == ' '; |
999 | ht &= l.t[i] == ' '; |
1030 | |
1000 | |
1031 | for (; ++i < ncol; ) |
1001 | for (; ++i < ncol; ) |
1032 | if (tabs[i]) |
1002 | if (tabs[i]) |
… | |
… | |
1047 | if (ht && options & Opt_pastableTabs) |
1017 | if (ht && options & Opt_pastableTabs) |
1048 | { |
1018 | { |
1049 | base_rend = SET_FONT (base_rend, 0); |
1019 | base_rend = SET_FONT (base_rend, 0); |
1050 | |
1020 | |
1051 | if (!l.is_longer ()) /* XXX: think about this */ |
1021 | if (!l.is_longer ()) /* XXX: think about this */ |
1052 | MAX_IT (l.l, x); |
1022 | max_it (l.l, x); |
1053 | |
1023 | |
1054 | i = screen.cur.col; |
1024 | i = screen.cur.col; |
1055 | |
1025 | |
1056 | l.t[i] = '\t'; |
1026 | l.t[i] = '\t'; |
1057 | l.r[i] = base_rend; |
1027 | l.r[i] = base_rend; |
… | |
… | |
1107 | */ |
1077 | */ |
1108 | #if ENABLE_FRILLS |
1078 | #if ENABLE_FRILLS |
1109 | void |
1079 | void |
1110 | rxvt_term::scr_forwardindex () |
1080 | rxvt_term::scr_forwardindex () |
1111 | { |
1081 | { |
1112 | int row; |
|
|
1113 | |
|
|
1114 | if (screen.cur.col < ncol - 1) |
1082 | if (screen.cur.col < ncol - 1) |
1115 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1083 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1116 | else |
1084 | else |
1117 | { |
1085 | { |
1118 | row = screen.cur.row; |
|
|
1119 | |
|
|
1120 | if (ROW(row).is_longer ()) //TODO//FIXME//LEN |
1086 | if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN |
1121 | ROW(row).l = ncol; |
1087 | ROW(screen.cur.row).l = ncol; |
1122 | |
1088 | |
1123 | scr_gotorc (0, 0, R_RELATIVE); |
1089 | scr_gotorc (0, 0, R_RELATIVE); |
1124 | scr_insdel_chars (1, DELETE); |
1090 | scr_insdel_chars (1, DELETE); |
1125 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1091 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1126 | } |
1092 | } |
… | |
… | |
1136 | { |
1102 | { |
1137 | want_refresh = 1; |
1103 | want_refresh = 1; |
1138 | ZERO_SCROLLBACK (); |
1104 | ZERO_SCROLLBACK (); |
1139 | |
1105 | |
1140 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1106 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1141 | MAX_IT (screen.cur.col, 0); |
1107 | clamp_it (screen.cur.col, 0, ncol - 1); |
1142 | MIN_IT (screen.cur.col, (int32_t)ncol - 1); |
|
|
1143 | |
1108 | |
1144 | screen.flags &= ~Screen_WrapNext; |
1109 | screen.flags &= ~Screen_WrapNext; |
1145 | |
1110 | |
1146 | if (relative & R_RELATIVE) |
1111 | if (relative & R_RELATIVE) |
1147 | { |
1112 | { |
… | |
… | |
1165 | else |
1130 | else |
1166 | { |
1131 | { |
1167 | if (screen.flags & Screen_Relative) |
1132 | if (screen.flags & Screen_Relative) |
1168 | { /* relative origin mode */ |
1133 | { /* relative origin mode */ |
1169 | screen.cur.row = row + screen.tscroll; |
1134 | screen.cur.row = row + screen.tscroll; |
1170 | MIN_IT (screen.cur.row, screen.bscroll); |
1135 | min_it (screen.cur.row, screen.bscroll); |
1171 | } |
1136 | } |
1172 | else |
1137 | else |
1173 | screen.cur.row = row; |
1138 | screen.cur.row = row; |
1174 | } |
1139 | } |
1175 | |
1140 | |
1176 | MAX_IT (screen.cur.row, 0); |
1141 | clamp_it (screen.cur.row, 0, nrow - 1); |
1177 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
|
|
1178 | } |
1142 | } |
1179 | |
1143 | |
1180 | /* ------------------------------------------------------------------------- */ |
1144 | /* ------------------------------------------------------------------------- */ |
1181 | /* |
1145 | /* |
1182 | * direction should be UP or DN |
1146 | * direction should be UP or DN |
… | |
… | |
1197 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1161 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1198 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn); |
1162 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn); |
1199 | else |
1163 | else |
1200 | screen.cur.row += dirn; |
1164 | screen.cur.row += dirn; |
1201 | |
1165 | |
1202 | MAX_IT (screen.cur.row, 0); |
1166 | clamp_it (screen.cur.row, 0, nrow - 1); |
1203 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
|
|
1204 | selection_check (0); |
1167 | selection_check (0); |
1205 | } |
1168 | } |
1206 | |
1169 | |
1207 | /* ------------------------------------------------------------------------- */ |
1170 | /* ------------------------------------------------------------------------- */ |
1208 | /* |
1171 | /* |
… | |
… | |
1212 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1175 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1213 | */ |
1176 | */ |
1214 | void |
1177 | void |
1215 | rxvt_term::scr_erase_line (int mode) |
1178 | rxvt_term::scr_erase_line (int mode) |
1216 | { |
1179 | { |
1217 | unsigned int row, col, num; |
1180 | unsigned int col, num; |
1218 | |
1181 | |
1219 | want_refresh = 1; |
1182 | want_refresh = 1; |
1220 | ZERO_SCROLLBACK (); |
1183 | ZERO_SCROLLBACK (); |
1221 | |
1184 | |
1222 | selection_check (1); |
1185 | selection_check (1); |
1223 | |
1186 | |
1224 | row = screen.cur.row; |
1187 | line_t &line = ROW(screen.cur.row); |
1225 | |
1188 | |
1226 | switch (mode) |
1189 | switch (mode) |
1227 | { |
1190 | { |
1228 | case 0: /* erase to end of line */ |
1191 | case 0: /* erase to end of line */ |
1229 | col = screen.cur.col; |
1192 | col = screen.cur.col; |
1230 | num = ncol - col; |
1193 | num = ncol - col; |
1231 | MIN_IT (ROW(row).l, (int16_t)col); |
1194 | min_it (line.l, col); |
1232 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1195 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1233 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1196 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1234 | CLEAR_SELECTION (); |
1197 | CLEAR_SELECTION (); |
1235 | break; |
1198 | break; |
1236 | case 1: /* erase to beginning of line */ |
1199 | case 1: /* erase to beginning of line */ |
… | |
… | |
1241 | CLEAR_SELECTION (); |
1204 | CLEAR_SELECTION (); |
1242 | break; |
1205 | break; |
1243 | case 2: /* erase whole line */ |
1206 | case 2: /* erase whole line */ |
1244 | col = 0; |
1207 | col = 0; |
1245 | num = ncol; |
1208 | num = ncol; |
1246 | ROW(row).l = 0; |
1209 | line.l = 0; |
1247 | if (selection.beg.row <= screen.cur.row |
1210 | if (selection.beg.row <= screen.cur.row |
1248 | && selection.end.row >= screen.cur.row) |
1211 | && selection.end.row >= screen.cur.row) |
1249 | CLEAR_SELECTION (); |
1212 | CLEAR_SELECTION (); |
1250 | break; |
1213 | break; |
1251 | default: |
1214 | default: |
1252 | return; |
1215 | return; |
1253 | } |
1216 | } |
1254 | |
1217 | |
1255 | scr_blank_line (ROW(row), col, num, rstyle); |
1218 | scr_blank_line (line, col, num, rstyle); |
1256 | } |
1219 | } |
1257 | |
1220 | |
1258 | /* ------------------------------------------------------------------------- */ |
1221 | /* ------------------------------------------------------------------------- */ |
1259 | /* |
1222 | /* |
1260 | * Erase part of whole of the screen |
1223 | * Erase part of whole of the screen |
… | |
… | |
1303 | CLEAR_SELECTION (); |
1266 | CLEAR_SELECTION (); |
1304 | |
1267 | |
1305 | if (row >= nrow) /* Out Of Bounds */ |
1268 | if (row >= nrow) /* Out Of Bounds */ |
1306 | return; |
1269 | return; |
1307 | |
1270 | |
1308 | MIN_IT (num, (nrow - row)); |
1271 | min_it (num, nrow - row); |
1309 | |
1272 | |
1310 | if (rstyle & (RS_RVid | RS_Uline)) |
1273 | if (rstyle & (RS_RVid | RS_Uline)) |
1311 | ren = (rend_t) ~RS_None; |
1274 | ren = (rend_t) ~RS_None; |
1312 | else if (GET_BASEBG (rstyle) == Color_bg) |
1275 | else if (GET_BASEBG (rstyle) == Color_bg) |
1313 | { |
1276 | { |
… | |
… | |
1324 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1287 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1325 | } |
1288 | } |
1326 | |
1289 | |
1327 | for (; num--; row++) |
1290 | for (; num--; row++) |
1328 | { |
1291 | { |
|
|
1292 | ROW (row).l = 0; |
1329 | scr_blank_screen_mem (ROW (row), rstyle); |
1293 | scr_blank_screen_mem (ROW (row), rstyle); |
1330 | ROW (row).l = 0; |
|
|
1331 | scr_blank_line (drawn[row], 0, ncol, ren); |
1294 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1332 | } |
1295 | } |
1333 | } |
1296 | } |
1334 | |
1297 | |
1335 | #if ENABLE_FRILLS |
1298 | #if ENABLE_FRILLS |
1336 | void |
1299 | void |
… | |
… | |
1421 | return; |
1384 | return; |
1422 | |
1385 | |
1423 | scr_do_wrap (); |
1386 | scr_do_wrap (); |
1424 | |
1387 | |
1425 | selection_check (1); |
1388 | selection_check (1); |
1426 | MIN_IT (count, (ncol - screen.cur.col)); |
1389 | min_it (count, ncol - screen.cur.col); |
1427 | |
1390 | |
1428 | row = screen.cur.row; |
1391 | row = screen.cur.row; |
1429 | |
1392 | |
1430 | line_t *line = &ROW(row); |
1393 | line_t *line = &ROW(row); |
1431 | |
1394 | |
… | |
… | |
1439 | } |
1402 | } |
1440 | |
1403 | |
1441 | if (!line->is_longer ()) |
1404 | if (!line->is_longer ()) |
1442 | { |
1405 | { |
1443 | line->l += count; |
1406 | line->l += count; |
1444 | MIN_IT (line->l, ncol); |
1407 | min_it (line->l, ncol); |
1445 | } |
1408 | } |
1446 | |
1409 | |
1447 | if (selection.op && current_screen == selection.screen |
1410 | if (selection.op && current_screen == selection.screen |
1448 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1411 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1449 | { |
1412 | { |
… | |
… | |
1510 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1473 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1511 | */ |
1474 | */ |
1512 | void |
1475 | void |
1513 | rxvt_term::scr_scroll_region (int top, int bot) |
1476 | rxvt_term::scr_scroll_region (int top, int bot) |
1514 | { |
1477 | { |
1515 | MAX_IT (top, 0); |
1478 | max_it (top, 0); |
1516 | MIN_IT (bot, (int)nrow - 1); |
1479 | min_it (bot, nrow - 1); |
1517 | |
1480 | |
1518 | if (top > bot) |
1481 | if (top > bot) |
1519 | return; |
1482 | return; |
1520 | |
1483 | |
1521 | screen.tscroll = top; |
1484 | screen.tscroll = top; |
… | |
… | |
1619 | XGCValues gcvalue; |
1582 | XGCValues gcvalue; |
1620 | |
1583 | |
1621 | if (rvideo != mode) |
1584 | if (rvideo != mode) |
1622 | { |
1585 | { |
1623 | rvideo = mode; |
1586 | rvideo = mode; |
1624 | SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); |
1587 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1625 | #if XPM_BACKGROUND |
1588 | #if XPM_BACKGROUND |
1626 | if (bgPixmap.pixmap == None) |
1589 | if (bgPixmap.pixmap == None) |
1627 | #endif |
1590 | #endif |
1628 | #if TRANSPARENT |
1591 | #if TRANSPARENT |
1629 | if (! (options & Opt_transparent) || am_transparent == 0) |
1592 | if (! (options & Opt_transparent) || am_transparent == 0) |
… | |
… | |
1725 | bool found = false; |
1688 | bool found = false; |
1726 | |
1689 | |
1727 | for (int i = 0; i < nrow; i++) |
1690 | for (int i = 0; i < nrow; i++) |
1728 | { |
1691 | { |
1729 | int col = 0; |
1692 | int col = 0; |
1730 | rend_t *drp = drawn[i].r; |
1693 | rend_t *drp = drawn_buf[i].r; |
1731 | |
1694 | |
1732 | for (; col < ncol; col++, drp++) |
1695 | for (; col < ncol; col++, drp++) |
1733 | if ((*drp & mask) == value) |
1696 | if ((*drp & mask) == value) |
1734 | { |
1697 | { |
1735 | found = true; |
1698 | found = true; |
… | |
… | |
1753 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1716 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1754 | { |
1717 | { |
1755 | int i; |
1718 | int i; |
1756 | row_col_t rc[RC_COUNT]; |
1719 | row_col_t rc[RC_COUNT]; |
1757 | |
1720 | |
1758 | if (!drawn) /* sanity check */ |
1721 | if (!drawn_buf) /* sanity check */ |
1759 | return; |
1722 | return; |
1760 | |
1723 | |
1761 | #ifndef NO_SLOW_LINK_SUPPORT |
1724 | #ifndef NO_SLOW_LINK_SUPPORT |
1762 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1725 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1763 | { |
1726 | { |
1764 | y = 0; |
1727 | y = 0; |
1765 | eheight = height; |
1728 | eheight = height; |
1766 | } |
1729 | } |
1767 | #endif |
|
|
1768 | |
|
|
1769 | #ifdef DEBUG_STRICT |
|
|
1770 | x = max (x, 0); |
|
|
1771 | x = min (x, (int)width); |
|
|
1772 | y = max (y, 0); |
|
|
1773 | y = min (y, (int)height); |
|
|
1774 | #endif |
1730 | #endif |
1775 | |
1731 | |
1776 | /* round down */ |
1732 | /* round down */ |
1777 | rc[PART_BEG].col = Pixel2Col (x); |
1733 | rc[PART_BEG].col = Pixel2Col (x); |
1778 | rc[PART_BEG].row = Pixel2Row (y); |
1734 | rc[PART_BEG].row = Pixel2Row (y); |
… | |
… | |
1781 | rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); |
1737 | rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); |
1782 | |
1738 | |
1783 | /* sanity checks */ |
1739 | /* sanity checks */ |
1784 | for (i = PART_BEG; i < RC_COUNT; i++) |
1740 | for (i = PART_BEG; i < RC_COUNT; i++) |
1785 | { |
1741 | { |
1786 | MIN_IT (rc[i].col, ncol - 1); |
1742 | min_it (rc[i].col, ncol - 1); |
1787 | MIN_IT (rc[i].row, nrow - 1); |
1743 | min_it (rc[i].row, nrow - 1); |
1788 | } |
1744 | } |
1789 | |
1745 | |
1790 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1746 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1791 | fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1747 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1792 | |
1748 | |
1793 | if (refresh) |
1749 | if (refresh) |
1794 | scr_refresh (SLOW_REFRESH); |
1750 | scr_refresh (SLOW_REFRESH); |
1795 | } |
1751 | } |
1796 | |
1752 | |
… | |
… | |
1959 | { |
1915 | { |
1960 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1916 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1961 | showcursor; /* show the cursor */ |
1917 | showcursor; /* show the cursor */ |
1962 | int16_t col, row, /* column/row we're processing */ |
1918 | int16_t col, row, /* column/row we're processing */ |
1963 | ocrow; /* old cursor row */ |
1919 | ocrow; /* old cursor row */ |
1964 | int i, /* tmp */ |
1920 | int i; /* tmp */ |
1965 | row_offset; /* basic offset in screen structure */ |
|
|
1966 | #ifndef NO_CURSORCOLOR |
1921 | #ifndef NO_CURSORCOLOR |
1967 | rend_t cc1; /* store colours at cursor position (s) */ |
1922 | rend_t cc1; /* store colours at cursor position (s) */ |
1968 | #endif |
1923 | #endif |
1969 | rend_t *crp; // cursor rendition pointer |
1924 | rend_t *crp; // cursor rendition pointer |
1970 | |
1925 | |
… | |
… | |
1976 | /* |
1931 | /* |
1977 | * A: set up vars |
1932 | * A: set up vars |
1978 | */ |
1933 | */ |
1979 | must_clear = 0; |
1934 | must_clear = 0; |
1980 | refresh_count = 0; |
1935 | refresh_count = 0; |
1981 | |
|
|
1982 | row_offset = term_start - view_start; |
|
|
1983 | |
1936 | |
1984 | #if XPM_BACKGROUND |
1937 | #if XPM_BACKGROUND |
1985 | must_clear |= bgPixmap.pixmap != None; |
1938 | must_clear |= bgPixmap.pixmap != None; |
1986 | #endif |
1939 | #endif |
1987 | #if TRANSPARENT |
1940 | #if TRANSPARENT |
… | |
… | |
2057 | if (screen.cur.row + view_start != ocrow |
2010 | if (screen.cur.row + view_start != ocrow |
2058 | || screen.cur.col != oldcursor.col) |
2011 | || screen.cur.col != oldcursor.col) |
2059 | { |
2012 | { |
2060 | if (ocrow < nrow |
2013 | if (ocrow < nrow |
2061 | && oldcursor.col < ncol) |
2014 | && oldcursor.col < ncol) |
2062 | drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2015 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2063 | |
2016 | |
2064 | if (focus || !showcursor) |
2017 | if (focus || !showcursor) |
2065 | oldcursor.row = -1; |
2018 | oldcursor.row = -1; |
2066 | else |
2019 | else |
2067 | setoldcursor = 1; |
2020 | setoldcursor = 1; |
… | |
… | |
2105 | row = i > 0 ? 0 : j - 1; |
2058 | row = i > 0 ? 0 : j - 1; |
2106 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2059 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2107 | { |
2060 | { |
2108 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2061 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2109 | { |
2062 | { |
2110 | line_t s = save[(row + row_offset) % total_rows]; |
2063 | line_t s = ROW(row - view_start); |
2111 | line_t d = drawn[row]; |
2064 | line_t d = drawn_buf[row]; |
2112 | line_t d2 = drawn[row + i]; |
2065 | line_t d2 = drawn_buf[row + i]; |
2113 | |
2066 | |
2114 | for (nits = 0, col = ncol; col--; ) |
2067 | for (nits = 0, col = ncol; col--; ) |
2115 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2068 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2116 | nits--; |
2069 | nits--; |
2117 | else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) |
2070 | else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) |
… | |
… | |
2135 | |
2088 | |
2136 | if (len != -1) |
2089 | if (len != -1) |
2137 | { |
2090 | { |
2138 | /* also comes here at end if needed because of >= above */ |
2091 | /* also comes here at end if needed because of >= above */ |
2139 | if (wlen < len) |
2092 | if (wlen < len) |
2140 | SWAP_IT (wlen, len, int); |
2093 | ::swap (wlen, len); |
2141 | |
2094 | |
2142 | XCopyArea (display->display, vt, vt, |
2095 | XCopyArea (display->display, vt, vt, |
2143 | gc, 0, Row2Pixel (len + i), |
2096 | gc, 0, Row2Pixel (len + i), |
2144 | (unsigned int)TermWin_TotalWidth (), |
2097 | (unsigned int)TermWin_TotalWidth (), |
2145 | (unsigned int)Height2Pixel (wlen - len + 1), |
2098 | (unsigned int)Height2Pixel (wlen - len + 1), |
… | |
… | |
2153 | /* |
2106 | /* |
2154 | * E: main pass across every character |
2107 | * E: main pass across every character |
2155 | */ |
2108 | */ |
2156 | for (row = 0; row < nrow; row++) |
2109 | for (row = 0; row < nrow; row++) |
2157 | { |
2110 | { |
2158 | text_t *stp = save[(row + row_offset) % total_rows].t; |
2111 | text_t *stp = ROW(row - view_start).t; |
2159 | rend_t *srp = save[(row + row_offset) % total_rows].r; |
2112 | rend_t *srp = ROW(row - view_start).r; |
2160 | text_t *dtp = drawn[row].t; |
2113 | text_t *dtp = drawn_buf[row].t; |
2161 | rend_t *drp = drawn[row].r; |
2114 | rend_t *drp = drawn_buf[row].r; |
2162 | |
2115 | |
2163 | /* |
2116 | /* |
2164 | * E2: OK, now the real pass |
2117 | * E2: OK, now the real pass |
2165 | */ |
2118 | */ |
2166 | int ypixel = (int)Row2Pixel (row); |
2119 | int ypixel = (int)Row2Pixel (row); |
… | |
… | |
2277 | fore = Color_UL; |
2230 | fore = Color_UL; |
2278 | #endif |
2231 | #endif |
2279 | |
2232 | |
2280 | if (invert) |
2233 | if (invert) |
2281 | { |
2234 | { |
2282 | SWAP_IT (fore, back, int); |
2235 | ::swap (fore, back); |
2283 | |
2236 | |
2284 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2237 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2285 | if (ISSET_PIXCOLOR (Color_RV)) |
2238 | if (ISSET_PIXCOLOR (Color_RV)) |
2286 | back = Color_RV; |
2239 | back = Color_RV; |
2287 | |
2240 | |
… | |
… | |
2379 | |
2332 | |
2380 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2333 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2381 | col--; |
2334 | col--; |
2382 | |
2335 | |
2383 | while (col + cursorwidth < ncol |
2336 | while (col + cursorwidth < ncol |
2384 | && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2337 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2385 | cursorwidth++; |
2338 | cursorwidth++; |
2386 | |
2339 | |
2387 | #ifndef NO_CURSORCOLOR |
2340 | #ifndef NO_CURSORCOLOR |
2388 | if (ISSET_PIXCOLOR (Color_cursor)) |
2341 | if (ISSET_PIXCOLOR (Color_cursor)) |
2389 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2342 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
… | |
… | |
2421 | |
2374 | |
2422 | void |
2375 | void |
2423 | rxvt_term::scr_remap_chars () |
2376 | rxvt_term::scr_remap_chars () |
2424 | { |
2377 | { |
2425 | for (int i = total_rows; i--; ) |
2378 | for (int i = total_rows; i--; ) |
2426 | scr_remap_chars (save[i]); |
2379 | scr_remap_chars (row_buf [i]); |
2427 | |
2380 | |
2428 | for (int i = nrow; i--; ) |
2381 | for (int i = nrow; i--; ) |
2429 | { |
2382 | { |
2430 | scr_remap_chars (drawn[i]); |
2383 | scr_remap_chars (drawn_buf [i]); |
2431 | scr_remap_chars (swap_save[i]); |
2384 | scr_remap_chars (swap_buf [i]); |
2432 | } |
2385 | } |
2433 | } |
2386 | } |
2434 | |
2387 | |
2435 | void |
2388 | void |
2436 | rxvt_term::scr_recolour () |
2389 | rxvt_term::scr_recolour () |
… | |
… | |
2503 | row = selection.beg.row; |
2456 | row = selection.beg.row; |
2504 | } |
2457 | } |
2505 | else |
2458 | else |
2506 | { |
2459 | { |
2507 | col = 0; |
2460 | col = 0; |
2508 | row = view_start; |
2461 | row = -view_start; |
2509 | } |
2462 | } |
2510 | |
2463 | |
2511 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2464 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2512 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2465 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2513 | srp[col] ^= RS_RVid; |
2466 | srp[col] ^= RS_RVid; |
… | |
… | |
2533 | char r1[] = "\n"; |
2486 | char r1[] = "\n"; |
2534 | |
2487 | |
2535 | for (row = saveLines - nsaved; |
2488 | for (row = saveLines - nsaved; |
2536 | row < saveLines + nrow - 1; row++) |
2489 | row < saveLines + nrow - 1; row++) |
2537 | { |
2490 | { |
2538 | width = save[row].l >= 0 ? save[row].l |
2491 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2539 | : ncol; |
2492 | : ncol; |
2540 | for (towrite = width; towrite; towrite -= wrote) |
2493 | for (towrite = width; towrite; towrite -= wrote) |
2541 | { |
2494 | { |
2542 | wrote = write (fd, & (save[row].t[width - towrite]), |
2495 | wrote = write (fd, & (row_buf[row].t[width - towrite]), |
2543 | towrite); |
2496 | towrite); |
2544 | if (wrote < 0) |
2497 | if (wrote < 0) |
2545 | return; /* XXX: death, no report */ |
2498 | return; /* XXX: death, no report */ |
2546 | } |
2499 | } |
2547 | if (save[row].l >= 0) |
2500 | if (row_buf[row].l >= 0) |
2548 | if (write (fd, r1, 1) <= 0) |
2501 | if (write (fd, r1, 1) <= 0) |
2549 | return; /* XXX: death, no report */ |
2502 | return; /* XXX: death, no report */ |
2550 | } |
2503 | } |
2551 | } |
2504 | } |
2552 | #endif |
2505 | #endif |
… | |
… | |
3029 | want_refresh = 1; |
2982 | want_refresh = 1; |
3030 | |
2983 | |
3031 | selection.mark.row = row - view_start; |
2984 | selection.mark.row = row - view_start; |
3032 | selection.mark.col = col; |
2985 | selection.mark.col = col; |
3033 | |
2986 | |
3034 | selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); |
2987 | selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); |
3035 | selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); |
2988 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3036 | |
2989 | |
3037 | while (selection.mark.col > 0 |
2990 | while (selection.mark.col > 0 |
3038 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
2991 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3039 | --selection.mark.col; |
2992 | --selection.mark.col; |
3040 | |
2993 | |
… | |
… | |
3145 | * flag == 2 ==> button 3 motion |
3098 | * flag == 2 ==> button 3 motion |
3146 | */ |
3099 | */ |
3147 | void |
3100 | void |
3148 | rxvt_term::selection_extend (int x, int y, int flag) |
3101 | rxvt_term::selection_extend (int x, int y, int flag) |
3149 | { |
3102 | { |
3150 | int col = min (max (Pixel2Col (x), 0), nrow - 1); |
3103 | int col = clamp (Pixel2Col (x), 0, ncol); |
3151 | int row = min (max (Pixel2Row (y), 0), ncol); |
3104 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3152 | |
3105 | |
3153 | /* |
3106 | /* |
3154 | * If we're selecting characters (single click) then we must check first |
3107 | * If we're selecting characters (single click) then we must check first |
3155 | * if we are at the same place as the original mark. If we are then |
3108 | * if we are at the same place as the original mark. If we are then |
3156 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3109 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
… | |
… | |
3369 | } |
3322 | } |
3370 | } |
3323 | } |
3371 | |
3324 | |
3372 | #if ENABLE_FRILLS |
3325 | #if ENABLE_FRILLS |
3373 | if (selection.rect && selection.beg.col > selection.end.col) |
3326 | if (selection.rect && selection.beg.col > selection.end.col) |
3374 | SWAP_IT (selection.beg.col, selection.end.col, int); |
3327 | ::swap (selection.beg.col, selection.end.col); |
3375 | #endif |
3328 | #endif |
3376 | } |
3329 | } |
3377 | |
3330 | |
3378 | #if ENABLE_FRILLS |
3331 | #if ENABLE_FRILLS |
3379 | void |
3332 | void |
… | |
… | |
3577 | */ |
3530 | */ |
3578 | void |
3531 | void |
3579 | rxvt_term::pixel_position (int *x, int *y) |
3532 | rxvt_term::pixel_position (int *x, int *y) |
3580 | { |
3533 | { |
3581 | *x = Pixel2Col (*x); |
3534 | *x = Pixel2Col (*x); |
3582 | /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ |
3535 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
3583 | *y = Pixel2Row (*y); |
3536 | *y = Pixel2Row (*y); |
3584 | /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ |
3537 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
3585 | } |
3538 | } |
3586 | |
3539 | |
3587 | /* ------------------------------------------------------------------------- */ |
3540 | /* ------------------------------------------------------------------------- */ |
3588 | #ifdef USE_XIM |
3541 | #ifdef USE_XIM |
3589 | void |
3542 | void |
… | |
… | |
3611 | |
3564 | |
3612 | if (x < 0) x = ncol - w; |
3565 | if (x < 0) x = ncol - w; |
3613 | if (y < 0) y = nrow - h; |
3566 | if (y < 0) y = nrow - h; |
3614 | |
3567 | |
3615 | // make space for border |
3568 | // make space for border |
3616 | w += 2; MIN_IT (w, ncol); |
3569 | w += 2; min_it (w, ncol); |
3617 | h += 2; MIN_IT (h, nrow); |
3570 | h += 2; min_it (h, nrow); |
3618 | |
3571 | |
3619 | x -= 1; MAX_IT (x, 0); |
3572 | x -= 1; clamp_it (x, 0, ncol - w); |
3620 | y -= 1; MAX_IT (y, 0); |
3573 | y -= 1; clamp_it (y, 0, nrow - h); |
3621 | |
|
|
3622 | MIN_IT (x, ncol - w); |
|
|
3623 | MIN_IT (y, nrow - h); |
|
|
3624 | |
3574 | |
3625 | ov_x = x; ov_y = y; |
3575 | ov_x = x; ov_y = y; |
3626 | ov_w = w; ov_h = h; |
3576 | ov_w = w; ov_h = h; |
3627 | |
3577 | |
3628 | ov_text = new text_t *[h]; |
3578 | ov_text = new text_t *[h]; |