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