… | |
… | |
116 | |
116 | |
117 | /* Fill part/all of a line with blanks. */ |
117 | /* Fill part/all of a line with blanks. */ |
118 | void |
118 | void |
119 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) |
119 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) |
120 | { |
120 | { |
|
|
121 | if (!l.t) |
|
|
122 | { |
|
|
123 | lalloc (l); |
|
|
124 | col = 0; |
|
|
125 | width = ncol; |
|
|
126 | } |
|
|
127 | |
121 | efs &= ~RS_baseattrMask; |
128 | efs &= ~RS_baseattrMask; |
122 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
129 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
123 | |
130 | |
124 | text_t *et = l.t + col; |
131 | text_t *et = l.t + col; |
125 | rend_t *er = l.r + col; |
132 | rend_t *er = l.r + col; |
… | |
… | |
134 | /* ------------------------------------------------------------------------- */ |
141 | /* ------------------------------------------------------------------------- */ |
135 | /* Fill a full line with blanks - make sure it is allocated first */ |
142 | /* Fill a full line with blanks - make sure it is allocated first */ |
136 | void |
143 | void |
137 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
144 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
138 | { |
145 | { |
139 | if (!l.t) |
|
|
140 | lalloc (l); |
|
|
141 | |
|
|
142 | scr_blank_line (l, 0, ncol, efs); |
146 | scr_blank_line (l, 0, ncol, efs); |
143 | } |
147 | } |
144 | |
148 | |
145 | /* ------------------------------------------------------------------------- * |
149 | /* ------------------------------------------------------------------------- * |
146 | * SCREEN INITIALISATION * |
150 | * SCREEN INITIALISATION * |
147 | * ------------------------------------------------------------------------- */ |
151 | * ------------------------------------------------------------------------- */ |
|
|
152 | |
148 | void |
153 | void |
149 | rxvt_term::scr_reset () |
154 | rxvt_term::scr_reset () |
150 | { |
155 | { |
151 | unsigned int p, q; |
|
|
152 | int k; |
|
|
153 | |
|
|
154 | #if ENABLE_OVERLAY |
156 | #if ENABLE_OVERLAY |
155 | scr_overlay_off (); |
157 | scr_overlay_off (); |
156 | #endif |
158 | #endif |
157 | |
159 | |
158 | view_start = 0; |
160 | view_start = 0; |
… | |
… | |
168 | return; |
170 | return; |
169 | |
171 | |
170 | // we need at least two lines for wrapping to work correctly |
172 | // we need at least two lines for wrapping to work correctly |
171 | if (nrow + saveLines < 2) |
173 | if (nrow + saveLines < 2) |
172 | { |
174 | { |
|
|
175 | //TODO//FIXME |
173 | saveLines++; |
176 | saveLines++; |
174 | prev_nrow--; |
177 | prev_nrow--; |
175 | nscrolled++; |
178 | nsaved++; |
176 | } |
179 | } |
177 | |
180 | |
178 | want_refresh = 1; |
181 | want_refresh = 1; |
179 | |
182 | |
180 | int prev_total_rows = prev_nrow + saveLines; |
183 | int prev_total_rows = prev_nrow + saveLines; |
181 | int total_rows = nrow + saveLines; |
184 | total_rows = nrow + saveLines; |
182 | |
185 | |
183 | screen.tscroll = 0; |
186 | screen.tscroll = 0; |
184 | screen.bscroll = nrow - 1; |
187 | screen.bscroll = nrow - 1; |
185 | |
188 | |
186 | if (!save) |
189 | if (!row_buf) |
187 | { |
190 | { |
188 | /* |
191 | /* |
189 | * 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 |
190 | * 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 |
191 | */ |
194 | */ |
192 | nscrolled = 0; /* no saved lines */ |
195 | nsaved = 0; /* no saved lines */ |
193 | term_start = 0; |
196 | term_start = 0; |
194 | nsaved = 0; |
|
|
195 | |
197 | |
196 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
198 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
197 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
199 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
198 | |
200 | |
199 | save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
200 | 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)); |
201 | drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); |
203 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
202 | swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); |
204 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
203 | |
205 | |
204 | screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *)); |
|
|
205 | |
|
|
206 | scr_update_term (); |
|
|
207 | |
|
|
208 | for (p = nrow; p--; ) |
206 | for (int row = nrow; row--; ) |
209 | { |
207 | { |
210 | scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE); |
208 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
211 | scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); |
209 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
212 | scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); |
210 | scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
213 | } |
211 | } |
214 | |
212 | |
215 | memset (charsets, 'B', sizeof (charsets)); |
213 | memset (charsets, 'B', sizeof (charsets)); |
216 | rstyle = DEFAULT_RSTYLE; |
214 | rstyle = DEFAULT_RSTYLE; |
217 | screen.flags = Screen_DefaultFlags; |
215 | screen.flags = Screen_DefaultFlags; |
… | |
… | |
241 | { |
239 | { |
242 | /* |
240 | /* |
243 | * add or delete rows as appropriate |
241 | * add or delete rows as appropriate |
244 | */ |
242 | */ |
245 | |
243 | |
246 | rxvt_salloc *old_ta; |
244 | rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
247 | rxvt_salloc *old_ra; |
245 | rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
248 | |
246 | |
|
|
247 | #if 0 |
249 | if (nrow < prev_nrow) |
248 | if (nrow < prev_nrow) |
250 | { |
249 | { |
251 | /* delete rows */ |
|
|
252 | k = min (nscrolled, prev_nrow - nrow); |
|
|
253 | // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO |
|
|
254 | scr_scroll_text (0, (int)prev_nrow - 1, k, 1); |
|
|
255 | |
|
|
256 | for (p = nrow; p < prev_nrow; p++) |
250 | for (int row = nrow; row < prev_nrow; row++) |
257 | { |
251 | { |
258 | lfree (save[p + saveLines]); |
|
|
259 | lfree (swap_save[p]); |
252 | lfree (swap_buf [row]); |
260 | lfree (drawn[p]); |
253 | lfree (drawn_buf[row]); |
261 | } |
254 | } |
|
|
255 | } |
|
|
256 | #endif |
262 | |
257 | |
263 | /* we have fewer rows so fix up cursor position */ |
258 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
264 | 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)); |
265 | |
261 | |
266 | 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)); |
267 | } |
275 | |
268 | else if (nrow > prev_nrow) |
276 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
269 | { |
277 | int pend = MOD (term_start - nsaved , prev_total_rows); |
270 | /* add rows */ |
278 | int q = total_rows; // rewrapped row |
271 | scr_reset_realloc (); /* realloc _first_ */ |
|
|
272 | |
279 | |
273 | int ocol = ncol; |
280 | if (nsaved) |
274 | ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
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. |
275 | |
284 | |
276 | k = min (nscrolled, nrow - prev_nrow); |
285 | row_col_t ocur = screen.cur; |
|
|
286 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
277 | |
287 | |
278 | for (p = prev_total_rows; p < total_rows; p++) |
288 | while (p != pend && q > 0) |
279 | save[p].clear (); |
|
|
280 | |
|
|
281 | for (p = prev_total_rows; p < total_rows - k; p++) |
|
|
282 | scr_blank_screen_mem (save[p], DEFAULT_RSTYLE); |
|
|
283 | |
|
|
284 | scr_update_term (); |
|
|
285 | |
|
|
286 | for (p = prev_nrow; p < nrow; p++) |
|
|
287 | { |
289 | { |
288 | swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); |
290 | p = MOD (p - 1, prev_total_rows); |
289 | drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); |
|
|
290 | } |
|
|
291 | |
|
|
292 | if (k > 0) |
|
|
293 | { |
|
|
294 | scr_scroll_text (0, (int)nrow - 1, -k, 1); |
|
|
295 | screen.cur.row += k; |
|
|
296 | screen.s_cur.row += k; |
|
|
297 | nscrolled -= 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] = -1; |
|
|
376 | |
|
|
377 | int qcol = 0; |
|
|
378 | |
|
|
379 | for (;;) |
|
|
380 | { |
|
|
381 | int prow = lofs / prev_ncol + p; |
329 | int prow = lofs / prev_ncol; |
382 | int pcol = lofs % prev_ncol; |
330 | int pcol = lofs % prev_ncol; |
383 | |
331 | |
|
|
332 | prow = MOD (p + prow, prev_total_rows); |
|
|
333 | |
|
|
334 | // we only adjust the cursor _row_ and put it into |
|
|
335 | // the topmost line of "long line" it was in, as |
|
|
336 | // this seems to upset applications/shells/readline |
|
|
337 | // least. |
|
|
338 | if (prow == ocur.row) |
|
|
339 | screen.cur.row = q - (total_rows - nrow); |
|
|
340 | |
|
|
341 | line_t &pline = old_buf [prow]; |
|
|
342 | |
384 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
343 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
385 | |
344 | |
386 | printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol); |
|
|
387 | |
|
|
388 | if (len <= 0) |
|
|
389 | { |
|
|
390 | tl [qrow] = qcol; |
|
|
391 | |
|
|
392 | TODO |
|
|
393 | scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol, |
|
|
394 | ncol - qcol, DEFAULT_RSTYLE); |
|
|
395 | |
|
|
396 | break; |
|
|
397 | } |
|
|
398 | |
|
|
399 | assert (lofs < 1000); |
345 | assert (len); |
|
|
346 | assert (pline.t); |
400 | |
347 | |
401 | memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); |
348 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
402 | memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); |
349 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
403 | |
350 | |
404 | lofs += len; |
351 | lofs += len; |
405 | qcol += len; |
352 | qcol += len; |
406 | |
|
|
407 | if (qcol == ncol) |
|
|
408 | break; |
|
|
409 | } |
|
|
410 | } |
353 | } |
411 | else |
|
|
412 | lofs += ncol; |
|
|
413 | } |
354 | } |
|
|
355 | |
|
|
356 | qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; |
|
|
357 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
414 | } |
358 | } |
|
|
359 | |
|
|
360 | term_start = total_rows - nrow; |
|
|
361 | view_start = 0; |
|
|
362 | nsaved = term_start - q; |
|
|
363 | |
|
|
364 | // make sure all terminal lines exist |
|
|
365 | while (nsaved < 0) |
|
|
366 | scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); |
|
|
367 | |
|
|
368 | } |
|
|
369 | else |
415 | } |
370 | { |
|
|
371 | // if no scrollback exists (yet), wing, instead of wrap |
|
|
372 | |
|
|
373 | for (int row = min (nrow, prev_nrow); row--; ) |
|
|
374 | { |
|
|
375 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
|
|
376 | line_t &qline = row_buf [row]; |
416 | |
377 | |
417 | free (screen.text); screen.text = tp; |
378 | qline = pline; |
418 | free (screen.rend); screen.rend = rp; |
379 | lresize (qline); |
419 | free (screen.tlen); screen.tlen = tl; |
380 | } |
420 | |
381 | |
421 | for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D |
382 | for (int row = prev_nrow; row < nrow; row++) |
|
|
383 | { |
|
|
384 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
|
|
385 | } |
|
|
386 | |
|
|
387 | term_start = 0; |
|
|
388 | view_start = 0; |
|
|
389 | } |
|
|
390 | |
|
|
391 | #ifdef DEBUG_STRICT |
|
|
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 | } |
416 | } |
438 | |
417 | |
439 | void |
|
|
440 | rxvt_term::scr_reset_realloc () |
|
|
441 | { |
|
|
442 | unsigned int total_rows = nrow + saveLines; |
|
|
443 | |
|
|
444 | screen.line = (line_t **)rxvt_realloc (screen.line, nrow * sizeof (line_t *)); |
|
|
445 | swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t)); |
|
|
446 | drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t)); |
|
|
447 | save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t)); |
|
|
448 | buf = (line_t *) rxvt_realloc (buf , total_rows * sizeof (line_t)); |
|
|
449 | } |
|
|
450 | |
|
|
451 | /* ------------------------------------------------------------------------- */ |
418 | /* ------------------------------------------------------------------------- */ |
452 | /* |
419 | /* |
453 | * Free everything. That way malloc debugging can find leakage. |
420 | * Free everything. That way malloc debugging can find leakage. |
454 | */ |
421 | */ |
455 | void |
422 | void |
456 | rxvt_term::scr_release () |
423 | rxvt_term::scr_release () |
457 | { |
424 | { |
458 | unsigned int total_rows; |
|
|
459 | |
|
|
460 | total_rows = nrow + saveLines; |
|
|
461 | |
|
|
462 | delete talloc; talloc = 0; |
425 | delete talloc; talloc = 0; |
463 | delete ralloc; ralloc = 0; |
426 | delete ralloc; ralloc = 0; |
464 | |
427 | |
465 | free (screen.line); |
428 | free (row_buf); |
466 | free (save); |
|
|
467 | free (swap_save); |
429 | free (swap_buf); |
468 | free (drawn); |
430 | free (drawn_buf); |
469 | free (buf); |
431 | free (temp_buf); |
470 | free (tabs); |
432 | free (tabs); |
|
|
433 | |
|
|
434 | row_buf = 0; // signal that we freed all the arrays |
471 | } |
435 | } |
472 | |
436 | |
473 | /* ------------------------------------------------------------------------- */ |
437 | /* ------------------------------------------------------------------------- */ |
474 | /* |
438 | /* |
475 | * Hard reset |
439 | * Hard reset |
… | |
… | |
526 | set_font_style (); |
490 | set_font_style (); |
527 | break; |
491 | break; |
528 | } |
492 | } |
529 | |
493 | |
530 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
494 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
531 | MIN_IT (s->cur.row, nrow - 1); |
495 | min_it (s->cur.row, nrow - 1); |
532 | MIN_IT (s->cur.col, ncol - 1); |
496 | min_it (s->cur.col, ncol - 1); |
533 | #ifdef DEBUG_STRICT |
497 | #ifdef DEBUG_STRICT |
534 | assert (s->cur.row >= 0); |
498 | assert (s->cur.row >= 0); |
535 | assert (s->cur.col >= 0); |
499 | assert (s->cur.col >= 0); |
536 | #else /* drive with your eyes closed */ |
|
|
537 | MAX_IT (s->cur.row, 0); |
|
|
538 | MAX_IT (s->cur.col, 0); |
|
|
539 | #endif |
500 | #endif |
540 | } |
501 | } |
541 | |
502 | |
542 | /* ------------------------------------------------------------------------- */ |
503 | /* ------------------------------------------------------------------------- */ |
543 | /* |
504 | /* |
… | |
… | |
546 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
507 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
547 | */ |
508 | */ |
548 | int |
509 | int |
549 | rxvt_term::scr_change_screen (int scrn) |
510 | rxvt_term::scr_change_screen (int scrn) |
550 | { |
511 | { |
551 | int i; |
|
|
552 | #if NSCREENS |
|
|
553 | int offset; |
|
|
554 | #endif |
|
|
555 | |
|
|
556 | want_refresh = 1; |
512 | want_refresh = 1; |
557 | |
|
|
558 | view_start = 0; |
513 | view_start = 0; |
559 | |
514 | |
560 | if (current_screen == scrn) |
515 | if (current_screen == scrn) |
561 | return scrn; |
516 | return scrn; |
562 | |
517 | |
563 | selection_check (2); /* check for boundary cross */ |
518 | selection_check (2); /* check for boundary cross */ |
564 | |
519 | |
565 | i = current_screen; current_screen = scrn; scrn = i; |
520 | int i = current_screen; current_screen = scrn; scrn = i; |
566 | |
521 | |
567 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
522 | ::swap (screen.cur.row, swap.cur.row); |
568 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
523 | ::swap (screen.cur.col, swap.cur.col); |
569 | MAX_IT (screen.cur.row, 0); |
524 | |
570 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
525 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
571 | MAX_IT (screen.cur.col, 0); |
526 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
572 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
|
|
573 | |
527 | |
574 | #if NSCREENS |
528 | #if NSCREENS |
575 | if (options & Opt_secondaryScreen) |
529 | if (options & Opt_secondaryScreen) |
576 | { |
530 | { |
577 | num_scr = 0; |
531 | num_scr = 0; |
578 | offset = saveLines; |
|
|
579 | |
532 | |
580 | for (i = prev_nrow; i--;) |
533 | for (int i = prev_nrow; i--; ) |
581 | SWAP_IT (*(screen.line[i]), swap_save[i], line_t); |
534 | ::swap (ROW(i), swap_buf [i]); |
582 | |
535 | |
583 | SWAP_IT (screen.charset, swap.charset, int16_t); |
536 | ::swap (screen.charset, swap.charset); |
584 | SWAP_IT (screen.flags, swap.flags, int); |
537 | ::swap (screen.flags, swap.flags); |
585 | screen.flags |= Screen_VisibleCursor; |
538 | screen.flags |= Screen_VisibleCursor; |
586 | swap.flags |= Screen_VisibleCursor; |
539 | swap.flags |= Screen_VisibleCursor; |
587 | } |
540 | } |
588 | else |
541 | else |
589 | #endif |
542 | #endif |
590 | if (options & Opt_secondaryScroll) |
543 | if (options & Opt_secondaryScroll) |
591 | scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); |
544 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
592 | |
545 | |
593 | return scrn; |
546 | return scrn; |
594 | } |
547 | } |
595 | |
548 | |
596 | // clear WrapNext indicator, solidifying position on next line |
549 | // clear WrapNext indicator, solidifying position on next line |
… | |
… | |
603 | screen.flags &= ~Screen_WrapNext; |
556 | screen.flags &= ~Screen_WrapNext; |
604 | |
557 | |
605 | screen.cur.col = 0; |
558 | screen.cur.col = 0; |
606 | |
559 | |
607 | if (screen.cur.row == screen.bscroll) |
560 | if (screen.cur.row == screen.bscroll) |
608 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
561 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
609 | else if (screen.cur.row < nrow - 1) |
562 | else if (screen.cur.row < nrow - 1) |
610 | screen.cur.row++; |
563 | screen.cur.row++; |
611 | } |
564 | } |
612 | |
565 | |
613 | /* ------------------------------------------------------------------------- */ |
566 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
639 | rstyle = DEFAULT_RSTYLE; |
592 | rstyle = DEFAULT_RSTYLE; |
640 | else |
593 | else |
641 | rstyle &= ~style; |
594 | rstyle &= ~style; |
642 | } |
595 | } |
643 | |
596 | |
644 | // set screen.line pointers to the actual lines in the save buffer |
|
|
645 | void |
|
|
646 | rxvt_term::scr_update_term () |
|
|
647 | { |
|
|
648 | for (int i = nrow; i--; ) |
|
|
649 | screen.line[i] = save + saveLines + i; |
|
|
650 | } |
|
|
651 | |
|
|
652 | /* ------------------------------------------------------------------------- */ |
597 | /* ------------------------------------------------------------------------- */ |
653 | /* |
598 | /* |
654 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
599 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
655 | * count positive ==> scroll up |
600 | * count positive ==> scroll up |
656 | * count negative ==> scroll down |
601 | * count negative ==> scroll down |
657 | * spec == 0 for normal routines |
|
|
658 | */ |
602 | */ |
659 | int |
603 | int |
660 | rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) |
604 | rxvt_term::scr_scroll_text (int row1, int row2, int count) |
661 | { |
605 | { |
662 | int i, j; |
|
|
663 | |
|
|
664 | if (count == 0 || (row1 > row2)) |
606 | if (count == 0 || (row1 > row2)) |
665 | return 0; |
607 | return 0; |
666 | |
608 | |
667 | want_refresh = 1; |
609 | want_refresh = 1; |
|
|
610 | num_scr += count; |
668 | |
611 | |
669 | if (row1 == 0 && count > 0 |
612 | if (count > 0 |
|
|
613 | && row1 == 0 |
|
|
614 | && row2 == nrow - 1 |
670 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
615 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
671 | { |
616 | { |
672 | nscrolled += count; |
617 | nsaved = min (nsaved + count, saveLines); |
|
|
618 | term_start = (term_start + count) % total_rows; |
673 | |
619 | |
674 | if (nscrolled > saveLines) |
620 | if (selection.op && current_screen == selection.screen) |
675 | nscrolled = saveLines; |
621 | { |
|
|
622 | selection.beg.row -= count; |
|
|
623 | selection.end.row -= count; |
|
|
624 | selection.mark.row -= count; |
676 | |
625 | |
|
|
626 | selection_check (0); |
|
|
627 | } |
|
|
628 | |
|
|
629 | for (int i = count; i--; ) |
|
|
630 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
|
|
631 | |
677 | if ((options & Opt_scrollWithBuffer) |
632 | if ((options & Opt_scrollWithBuffer) |
678 | && view_start != 0 |
633 | && view_start != 0 |
679 | && view_start != saveLines) |
634 | && view_start != saveLines) |
680 | scr_page (UP, count); |
635 | scr_page (UP, count); |
681 | } |
636 | } |
682 | else if (!spec) |
637 | else |
683 | row1 += saveLines; |
638 | { |
684 | |
|
|
685 | row2 += saveLines; |
|
|
686 | |
|
|
687 | if (selection.op && current_screen == selection.screen) |
639 | if (selection.op && current_screen == selection.screen) |
688 | { |
640 | { |
689 | i = selection.beg.row + saveLines; |
641 | int i = selection.beg.row; |
690 | j = selection.end.row + saveLines; |
642 | int j = selection.end.row; |
691 | |
643 | |
692 | if ((i < row1 && j > row1) |
644 | if ((i < row1 && j > row1) |
693 | || (i < row2 && j > row2) |
645 | || (i < row2 && j > row2) |
694 | || (i - count < row1 && i >= row1) |
646 | || (i - count < row1 && i >= row1) |
695 | || (i - count > row2 && i <= row2) |
647 | || (i - count > row2 && i <= row2) |
696 | || (j - count < row1 && j >= row1) |
648 | || (j - count < row1 && j >= row1) |
697 | || (j - count > row2 && j <= row2)) |
649 | || (j - count > row2 && j <= row2)) |
698 | { |
650 | { |
699 | CLEAR_ALL_SELECTION (); |
651 | CLEAR_ALL_SELECTION (); |
700 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
652 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
701 | } |
653 | } |
702 | else if (j >= row1 && j <= row2) |
654 | else if (j >= row1 && j <= row2) |
703 | { |
655 | { |
704 | /* move selected region too */ |
656 | /* move selected region too */ |
705 | selection.beg.row -= count; |
657 | selection.beg.row -= count; |
706 | selection.end.row -= count; |
658 | selection.end.row -= count; |
707 | selection.mark.row -= count; |
659 | selection.mark.row -= count; |
|
|
660 | |
|
|
661 | selection_check (0); |
|
|
662 | } |
|
|
663 | } |
|
|
664 | |
|
|
665 | // use a simple and robust scrolling algorithm, this |
|
|
666 | // part of scr_scroll_text is not time-critical. |
|
|
667 | |
|
|
668 | int rows = row2 - row1 + 1; |
|
|
669 | |
|
|
670 | min_it (count, rows); |
|
|
671 | |
|
|
672 | for (int row = 0; row < rows; row++) |
708 | } |
673 | { |
709 | } |
674 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
710 | |
675 | |
711 | selection_check (0); /* _after_ nscrolled update */ |
676 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
|
|
677 | scr_blank_screen_mem (temp_buf [row], rstyle); |
|
|
678 | } |
712 | |
679 | |
713 | num_scr += count; |
680 | for (int row = 0; row < rows; row++) |
714 | j = count; |
681 | ROW(row1 + row) = temp_buf [row]; |
715 | |
|
|
716 | if (count < 0) |
|
|
717 | count = -count; |
|
|
718 | |
|
|
719 | i = row2 - row1 + 1; |
|
|
720 | MIN_IT (count, i); |
|
|
721 | |
|
|
722 | if (j > 0) |
|
|
723 | { |
682 | } |
724 | /* scroll up */ |
|
|
725 | |
|
|
726 | /* Copy lines that will get clobbered by the rotation */ |
|
|
727 | memcpy (buf, save + row1, count * sizeof (line_t)); |
|
|
728 | |
|
|
729 | /* Rotate lines */ |
|
|
730 | i = row2 - row1 - count + 1; |
|
|
731 | memmove (save + row1, save + row1 + count, i * sizeof (line_t)); |
|
|
732 | |
|
|
733 | j = row2 - count + 1, i = count; |
|
|
734 | } |
|
|
735 | else /* if (j < 0) */ |
|
|
736 | { |
|
|
737 | /* scroll down */ |
|
|
738 | |
|
|
739 | /* Copy lines that will get clobbered by the rotation */ |
|
|
740 | for (i = 0, j = row2; i < count; i++, j--) |
|
|
741 | buf[i] = save[j]; |
|
|
742 | |
|
|
743 | /* Rotate lines */ |
|
|
744 | for (j = row2, i = j - count; i >= row1; i--, j--) |
|
|
745 | save[j] = save[i]; |
|
|
746 | |
|
|
747 | j = row1, i = count; |
|
|
748 | count = -count; |
|
|
749 | } |
|
|
750 | |
|
|
751 | /* Resurrect lines */ |
|
|
752 | memcpy (save + j, buf, i * sizeof (line_t)); |
|
|
753 | |
|
|
754 | scr_update_term (); |
|
|
755 | |
|
|
756 | if (!spec) /* line length may not equal ncol */ |
|
|
757 | for (; i--; j++) |
|
|
758 | scr_blank_screen_mem (save[j], rstyle); |
|
|
759 | |
683 | |
760 | return count; |
684 | return count; |
761 | } |
685 | } |
762 | |
686 | |
763 | /* ------------------------------------------------------------------------- */ |
687 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
780 | last_col = ncol; |
704 | last_col = ncol; |
781 | |
705 | |
782 | if (nlines > 0) |
706 | if (nlines > 0) |
783 | { |
707 | { |
784 | nlines += screen.cur.row - screen.bscroll; |
708 | nlines += screen.cur.row - screen.bscroll; |
785 | if ((nlines > 0) |
709 | if (nlines > 0 |
786 | && (screen.tscroll == 0) |
710 | && screen.tscroll == 0 |
787 | && (screen.bscroll == (nrow - 1))) |
711 | && screen.bscroll == (nrow - 1)) |
788 | { |
712 | { |
789 | /* _at least_ this many lines need to be scrolled */ |
713 | /* _at least_ this many lines need to be scrolled */ |
790 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
714 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines); |
791 | screen.cur.row -= nlines; |
715 | screen.cur.row -= nlines; |
792 | } |
716 | } |
793 | } |
717 | } |
794 | |
718 | |
795 | #ifdef DEBUG_STRICT |
719 | #ifdef DEBUG_STRICT |
796 | assert (screen.cur.col < last_col); |
720 | assert (screen.cur.col < last_col); |
797 | assert ((screen.cur.row < nrow) |
721 | assert (screen.cur.row < nrow |
798 | && (screen.cur.row >= - (int32_t)nscrolled)); |
722 | && screen.cur.row >= -nsaved); |
799 | #else /* drive with your eyes closed */ |
|
|
800 | MIN_IT (screen.cur.col, last_col - 1); |
|
|
801 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
|
|
802 | MAX_IT (screen.cur.row, - (int32_t)nscrolled); |
|
|
803 | #endif |
723 | #endif |
804 | row = screen.cur.row + saveLines; |
724 | row = screen.cur.row; |
805 | |
725 | |
806 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
726 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
807 | |
727 | |
808 | line_t *line = save + row; |
728 | line_t *line = &ROW(row); |
809 | |
729 | |
810 | while (str < strend) |
730 | while (str < strend) |
811 | { |
731 | { |
812 | c = *str++; |
732 | c = *str++; |
813 | |
733 | |
814 | if (c < 0x20) |
734 | if (c < 0x20) |
815 | if (c == C0_LF) |
735 | if (c == C0_LF) |
816 | { |
736 | { |
817 | if (line->l != -1) /* XXX: think about this */ |
737 | if (!line->is_longer ()) /* XXX: think about this */ |
818 | MAX_IT (line->l, screen.cur.col); |
738 | max_it (line->l, screen.cur.col); |
819 | |
739 | |
820 | screen.flags &= ~Screen_WrapNext; |
740 | screen.flags &= ~Screen_WrapNext; |
821 | |
741 | |
822 | if (screen.cur.row == screen.bscroll) |
742 | if (screen.cur.row == screen.bscroll) |
823 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
743 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
824 | else if (screen.cur.row < (nrow - 1)) |
744 | else if (screen.cur.row < (nrow - 1)) |
825 | row = (++screen.cur.row) + saveLines; |
745 | row = ++screen.cur.row; |
826 | |
746 | |
827 | line = save + row; /* _must_ refresh */ |
747 | line = &ROW(row); /* _must_ refresh */ |
828 | continue; |
748 | continue; |
829 | } |
749 | } |
830 | else if (c == C0_CR) |
750 | else if (c == C0_CR) |
831 | { |
751 | { |
832 | if (line->l != -1) /* XXX: think about this */ |
752 | if (!line->is_longer ()) /* XXX: think about this */ |
833 | MAX_IT (line->l, screen.cur.col); |
753 | max_it (line->l, screen.cur.col); |
834 | |
754 | |
835 | screen.flags &= ~Screen_WrapNext; |
755 | screen.flags &= ~Screen_WrapNext; |
836 | screen.cur.col = 0; |
756 | screen.cur.col = 0; |
837 | continue; |
757 | continue; |
838 | } |
758 | } |
… | |
… | |
855 | CLEAR_SELECTION (); |
775 | CLEAR_SELECTION (); |
856 | } |
776 | } |
857 | |
777 | |
858 | if (screen.flags & Screen_WrapNext) |
778 | if (screen.flags & Screen_WrapNext) |
859 | { |
779 | { |
860 | line->l = -1; |
780 | line->set_is_longer (); |
861 | |
781 | |
862 | scr_do_wrap (); |
782 | scr_do_wrap (); |
863 | |
783 | |
864 | row = screen.cur.row + saveLines; |
784 | row = screen.cur.row; |
865 | line = save + row; /* _must_ refresh */ |
785 | line = &ROW(row); /* _must_ refresh */ |
866 | } |
786 | } |
867 | |
787 | |
868 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
788 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
869 | if (IN_RANGE (c, 0xd800, 0xdfff)) |
789 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
870 | c = 0xfffd; |
790 | c = 0xfffd; |
871 | |
791 | |
872 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
792 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
873 | // do wcwidth before further replacements, as wcwidth might return -1 |
793 | // do wcwidth before further replacements, as wcwidth might return -1 |
874 | // for the line drawing characters below as they might be invalid in the current |
794 | // for the line drawing characters below as they might be invalid in the current |
… | |
… | |
989 | |
909 | |
990 | while (*tp == NOCHAR && tp > line->t) |
910 | while (*tp == NOCHAR && tp > line->t) |
991 | tp--, rp--; |
911 | tp--, rp--; |
992 | } |
912 | } |
993 | else if (screen.cur.row > 0 |
913 | else if (screen.cur.row > 0 |
994 | && save [screen.cur.row - 1 + saveLines].is_cont ()) |
914 | && ROW(screen.cur.row - 1).is_longer ()) |
995 | { |
915 | { |
996 | line_t *line = save + (screen.cur.row - 1 + saveLines); |
916 | line_t *line = &ROW(screen.cur.row - 1); |
997 | |
917 | |
998 | tp = line->t + last_col - 1; |
918 | tp = line->t + last_col - 1; |
999 | rp = line->r + last_col - 1; |
919 | rp = line->r + last_col - 1; |
1000 | |
920 | |
1001 | while (*tp == NOCHAR && tp > line->t) |
921 | while (*tp == NOCHAR && tp > line->t) |
… | |
… | |
1013 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
933 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
1014 | #endif |
934 | #endif |
1015 | } |
935 | } |
1016 | } |
936 | } |
1017 | |
937 | |
1018 | if (line->l != -1) /* XXX: think about this */ |
938 | if (!line->is_longer ()) /* XXX: think about this */ |
1019 | MAX_IT (line->l, screen.cur.col); |
939 | max_it (line->l, screen.cur.col); |
1020 | |
940 | |
1021 | #ifdef DEBUG_STRICT |
941 | #ifdef DEBUG_STRICT |
1022 | assert (screen.cur.row >= 0); |
942 | assert (screen.cur.row >= 0); |
1023 | #else /* drive with your eyes closed */ |
|
|
1024 | MAX_IT (screen.cur.row, 0); |
|
|
1025 | #endif |
943 | #endif |
1026 | } |
944 | } |
1027 | |
945 | |
1028 | /* ------------------------------------------------------------------------- */ |
946 | /* ------------------------------------------------------------------------- */ |
1029 | /* |
947 | /* |
… | |
… | |
1068 | |
986 | |
1069 | if (count == 0) |
987 | if (count == 0) |
1070 | return; |
988 | return; |
1071 | else if (count > 0) |
989 | else if (count > 0) |
1072 | { |
990 | { |
1073 | int row = saveLines + screen.cur.row; |
991 | int row = screen.cur.row; |
1074 | |
992 | |
1075 | line_t &l = save[row]; |
993 | line_t &l = ROW(row); |
1076 | rend_t base_rend = l.r[i]; |
994 | rend_t base_rend = l.r[i]; |
1077 | ht &= l.t[i] == ' '; |
995 | ht &= l.t[i] == ' '; |
1078 | |
996 | |
1079 | for (; ++i < ncol; ) |
997 | for (; ++i < ncol; ) |
1080 | if (tabs[i]) |
998 | if (tabs[i]) |
… | |
… | |
1094 | // buffer so they can be selected and pasted. |
1012 | // buffer so they can be selected and pasted. |
1095 | if (ht && options & Opt_pastableTabs) |
1013 | if (ht && options & Opt_pastableTabs) |
1096 | { |
1014 | { |
1097 | base_rend = SET_FONT (base_rend, 0); |
1015 | base_rend = SET_FONT (base_rend, 0); |
1098 | |
1016 | |
1099 | if (l.l != -1) /* XXX: think about this */ |
1017 | if (!l.is_longer ()) /* XXX: think about this */ |
1100 | MAX_IT (l.l, x); |
1018 | max_it (l.l, x); |
1101 | |
1019 | |
1102 | i = screen.cur.col; |
1020 | i = screen.cur.col; |
1103 | |
1021 | |
1104 | l.t[i] = '\t'; |
1022 | l.t[i] = '\t'; |
1105 | l.r[i] = base_rend; |
1023 | l.r[i] = base_rend; |
… | |
… | |
1141 | rxvt_term::scr_backindex () |
1059 | rxvt_term::scr_backindex () |
1142 | { |
1060 | { |
1143 | if (screen.cur.col > 0) |
1061 | if (screen.cur.col > 0) |
1144 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1062 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1145 | else |
1063 | else |
1146 | { |
|
|
1147 | if (save[screen.cur.row + saveLines].l == 0) |
|
|
1148 | return; /* um, yeah? */ |
|
|
1149 | |
|
|
1150 | scr_insdel_chars (1, INSERT); |
1064 | scr_insdel_chars (1, INSERT); |
1151 | } |
|
|
1152 | } |
1065 | } |
1153 | #endif |
1066 | #endif |
1154 | /* ------------------------------------------------------------------------- */ |
1067 | /* ------------------------------------------------------------------------- */ |
1155 | /* |
1068 | /* |
1156 | * Process DEC Forward Index |
1069 | * Process DEC Forward Index |
… | |
… | |
1166 | |
1079 | |
1167 | if (screen.cur.col < ncol - 1) |
1080 | if (screen.cur.col < ncol - 1) |
1168 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1081 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1169 | else |
1082 | else |
1170 | { |
1083 | { |
1171 | row = screen.cur.row + saveLines; |
1084 | row = screen.cur.row; |
1172 | |
1085 | |
1173 | if (save[row].l == 0) |
1086 | if (ROW(row).is_longer ()) //TODO//FIXME//LEN |
1174 | return; /* um, yeah? */ |
|
|
1175 | else if (save[row].is_cont ()) |
|
|
1176 | save[row].l = ncol; |
1087 | ROW(row).l = ncol; |
1177 | |
1088 | |
1178 | scr_gotorc (0, 0, R_RELATIVE); |
1089 | scr_gotorc (0, 0, R_RELATIVE); |
1179 | scr_insdel_chars (1, DELETE); |
1090 | scr_insdel_chars (1, DELETE); |
1180 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1091 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1181 | } |
1092 | } |
… | |
… | |
1191 | { |
1102 | { |
1192 | want_refresh = 1; |
1103 | want_refresh = 1; |
1193 | ZERO_SCROLLBACK (); |
1104 | ZERO_SCROLLBACK (); |
1194 | |
1105 | |
1195 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1106 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1196 | MAX_IT (screen.cur.col, 0); |
1107 | clamp_it (screen.cur.col, 0, ncol - 1); |
1197 | MIN_IT (screen.cur.col, (int32_t)ncol - 1); |
|
|
1198 | |
1108 | |
1199 | screen.flags &= ~Screen_WrapNext; |
1109 | screen.flags &= ~Screen_WrapNext; |
1200 | |
1110 | |
1201 | if (relative & R_RELATIVE) |
1111 | if (relative & R_RELATIVE) |
1202 | { |
1112 | { |
… | |
… | |
1220 | else |
1130 | else |
1221 | { |
1131 | { |
1222 | if (screen.flags & Screen_Relative) |
1132 | if (screen.flags & Screen_Relative) |
1223 | { /* relative origin mode */ |
1133 | { /* relative origin mode */ |
1224 | screen.cur.row = row + screen.tscroll; |
1134 | screen.cur.row = row + screen.tscroll; |
1225 | MIN_IT (screen.cur.row, screen.bscroll); |
1135 | min_it (screen.cur.row, screen.bscroll); |
1226 | } |
1136 | } |
1227 | else |
1137 | else |
1228 | screen.cur.row = row; |
1138 | screen.cur.row = row; |
1229 | } |
1139 | } |
1230 | |
1140 | |
1231 | MAX_IT (screen.cur.row, 0); |
1141 | clamp_it (screen.cur.row, 0, nrow - 1); |
1232 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
|
|
1233 | } |
1142 | } |
1234 | |
1143 | |
1235 | /* ------------------------------------------------------------------------- */ |
1144 | /* ------------------------------------------------------------------------- */ |
1236 | /* |
1145 | /* |
1237 | * direction should be UP or DN |
1146 | * direction should be UP or DN |
… | |
… | |
1248 | |
1157 | |
1249 | screen.flags &= ~Screen_WrapNext; |
1158 | screen.flags &= ~Screen_WrapNext; |
1250 | |
1159 | |
1251 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1160 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1252 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1161 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1253 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1162 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn); |
1254 | else |
1163 | else |
1255 | screen.cur.row += dirn; |
1164 | screen.cur.row += dirn; |
1256 | |
1165 | |
1257 | MAX_IT (screen.cur.row, 0); |
1166 | clamp_it (screen.cur.row, 0, nrow - 1); |
1258 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
|
|
1259 | selection_check (0); |
1167 | selection_check (0); |
1260 | } |
1168 | } |
1261 | |
1169 | |
1262 | /* ------------------------------------------------------------------------- */ |
1170 | /* ------------------------------------------------------------------------- */ |
1263 | /* |
1171 | /* |
… | |
… | |
1274 | want_refresh = 1; |
1182 | want_refresh = 1; |
1275 | ZERO_SCROLLBACK (); |
1183 | ZERO_SCROLLBACK (); |
1276 | |
1184 | |
1277 | selection_check (1); |
1185 | selection_check (1); |
1278 | |
1186 | |
1279 | row = saveLines + screen.cur.row; |
1187 | row = screen.cur.row; |
1280 | |
1188 | |
1281 | switch (mode) |
1189 | switch (mode) |
1282 | { |
1190 | { |
1283 | case 0: /* erase to end of line */ |
1191 | case 0: /* erase to end of line */ |
1284 | col = screen.cur.col; |
1192 | col = screen.cur.col; |
1285 | num = ncol - col; |
1193 | num = ncol - col; |
1286 | MIN_IT (save[row].l, (int16_t)col); |
1194 | min_it (ROW(row).l, col); |
1287 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1195 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1288 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1196 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1289 | CLEAR_SELECTION (); |
1197 | CLEAR_SELECTION (); |
1290 | break; |
1198 | break; |
1291 | case 1: /* erase to beginning of line */ |
1199 | case 1: /* erase to beginning of line */ |
… | |
… | |
1296 | CLEAR_SELECTION (); |
1204 | CLEAR_SELECTION (); |
1297 | break; |
1205 | break; |
1298 | case 2: /* erase whole line */ |
1206 | case 2: /* erase whole line */ |
1299 | col = 0; |
1207 | col = 0; |
1300 | num = ncol; |
1208 | num = ncol; |
1301 | save[row].l = 0; |
1209 | ROW(row).l = 0; |
1302 | if (selection.beg.row <= screen.cur.row |
1210 | if (selection.beg.row <= screen.cur.row |
1303 | && selection.end.row >= screen.cur.row) |
1211 | && selection.end.row >= screen.cur.row) |
1304 | CLEAR_SELECTION (); |
1212 | CLEAR_SELECTION (); |
1305 | break; |
1213 | break; |
1306 | default: |
1214 | default: |
1307 | return; |
1215 | return; |
1308 | } |
1216 | } |
1309 | |
1217 | |
1310 | if (save[row].t) |
|
|
1311 | scr_blank_line (save[row], col, num, rstyle); |
1218 | scr_blank_line (ROW(row), col, num, rstyle); |
1312 | else |
|
|
1313 | scr_blank_screen_mem (save[row], rstyle); |
|
|
1314 | } |
1219 | } |
1315 | |
1220 | |
1316 | /* ------------------------------------------------------------------------- */ |
1221 | /* ------------------------------------------------------------------------- */ |
1317 | /* |
1222 | /* |
1318 | * Erase part of whole of the screen |
1223 | * Erase part of whole of the screen |
… | |
… | |
1322 | */ |
1227 | */ |
1323 | void |
1228 | void |
1324 | rxvt_term::scr_erase_screen (int mode) |
1229 | rxvt_term::scr_erase_screen (int mode) |
1325 | { |
1230 | { |
1326 | int num; |
1231 | int num; |
1327 | int32_t row, row_offset; |
1232 | int32_t row; |
1328 | rend_t ren; |
1233 | rend_t ren; |
1329 | XGCValues gcvalue; |
1234 | XGCValues gcvalue; |
1330 | |
1235 | |
1331 | want_refresh = 1; |
1236 | want_refresh = 1; |
1332 | ZERO_SCROLLBACK (); |
1237 | ZERO_SCROLLBACK (); |
1333 | |
|
|
1334 | row_offset = (int32_t)saveLines; |
|
|
1335 | |
1238 | |
1336 | switch (mode) |
1239 | switch (mode) |
1337 | { |
1240 | { |
1338 | case 0: /* erase to end of screen */ |
1241 | case 0: /* erase to end of screen */ |
1339 | selection_check (1); |
1242 | selection_check (1); |
… | |
… | |
1363 | CLEAR_SELECTION (); |
1266 | CLEAR_SELECTION (); |
1364 | |
1267 | |
1365 | if (row >= nrow) /* Out Of Bounds */ |
1268 | if (row >= nrow) /* Out Of Bounds */ |
1366 | return; |
1269 | return; |
1367 | |
1270 | |
1368 | MIN_IT (num, (nrow - row)); |
1271 | min_it (num, nrow - row); |
1369 | |
1272 | |
1370 | if (rstyle & (RS_RVid | RS_Uline)) |
1273 | if (rstyle & (RS_RVid | RS_Uline)) |
1371 | ren = (rend_t) ~RS_None; |
1274 | ren = (rend_t) ~RS_None; |
1372 | else if (GET_BASEBG (rstyle) == Color_bg) |
1275 | else if (GET_BASEBG (rstyle) == Color_bg) |
1373 | { |
1276 | { |
… | |
… | |
1384 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1287 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1385 | } |
1288 | } |
1386 | |
1289 | |
1387 | for (; num--; row++) |
1290 | for (; num--; row++) |
1388 | { |
1291 | { |
1389 | scr_blank_screen_mem (save[row + row_offset], rstyle); |
1292 | scr_blank_screen_mem (ROW (row), rstyle); |
1390 | save[row + row_offset].l = 0; |
1293 | ROW (row).l = 0; |
1391 | scr_blank_line (drawn[row], 0, ncol, ren); |
1294 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1392 | } |
1295 | } |
1393 | } |
1296 | } |
1394 | |
1297 | |
1395 | #if ENABLE_FRILLS |
1298 | #if ENABLE_FRILLS |
1396 | void |
1299 | void |
1397 | rxvt_term::scr_erase_savelines () |
1300 | rxvt_term::scr_erase_savelines () |
1398 | { |
1301 | { |
1399 | want_refresh = 1; |
1302 | want_refresh = 1; |
1400 | ZERO_SCROLLBACK (); |
1303 | ZERO_SCROLLBACK (); |
1401 | |
1304 | |
1402 | nscrolled = 0; |
1305 | nsaved = 0; |
1403 | } |
1306 | } |
1404 | #endif |
1307 | #endif |
1405 | |
1308 | |
1406 | /* ------------------------------------------------------------------------- */ |
1309 | /* ------------------------------------------------------------------------- */ |
1407 | /* |
1310 | /* |
… | |
… | |
1409 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1312 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1410 | */ |
1313 | */ |
1411 | void |
1314 | void |
1412 | rxvt_term::scr_E () |
1315 | rxvt_term::scr_E () |
1413 | { |
1316 | { |
1414 | int i, j, k; |
|
|
1415 | rend_t *r1, fs; |
1317 | rend_t fs; |
1416 | |
1318 | |
1417 | want_refresh = 1; |
1319 | want_refresh = 1; |
1418 | ZERO_SCROLLBACK (); |
1320 | ZERO_SCROLLBACK (); |
1419 | |
1321 | |
1420 | num_scr_allow = 0; |
1322 | num_scr_allow = 0; |
1421 | selection_check (3); |
1323 | selection_check (3); |
1422 | |
1324 | |
1423 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1325 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1424 | for (k = saveLines, i = nrow; i--; k++) |
1326 | for (int row = nrow; row--; ) |
1425 | { |
1327 | { |
1426 | save[k].l = ncol; /* make the `E's selectable */ |
1328 | line_t &line = ROW(row); |
|
|
1329 | |
1427 | fill_text (save[k].t, 'E', ncol); |
1330 | fill_text (line.t, 'E', ncol); |
1428 | for (r1 = save[k].r, j = ncol; j--; ) |
1331 | rend_t *r1 = line.r; |
|
|
1332 | |
|
|
1333 | for (int j = ncol; j--; ) |
1429 | *r1++ = fs; |
1334 | *r1++ = fs; |
|
|
1335 | |
|
|
1336 | line.l = ncol; /* make the `E's selectable */ |
1430 | } |
1337 | } |
1431 | } |
1338 | } |
1432 | |
1339 | |
1433 | /* ------------------------------------------------------------------------- */ |
1340 | /* ------------------------------------------------------------------------- */ |
1434 | /* |
1341 | /* |
… | |
… | |
1455 | count = end; |
1362 | count = end; |
1456 | } |
1363 | } |
1457 | |
1364 | |
1458 | scr_do_wrap (); |
1365 | scr_do_wrap (); |
1459 | |
1366 | |
1460 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); |
1367 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count); |
1461 | } |
1368 | } |
1462 | |
1369 | |
1463 | /* ------------------------------------------------------------------------- */ |
1370 | /* ------------------------------------------------------------------------- */ |
1464 | /* |
1371 | /* |
1465 | * Insert/Delete <count> characters from the current position |
1372 | * Insert/Delete <count> characters from the current position |
… | |
… | |
1477 | return; |
1384 | return; |
1478 | |
1385 | |
1479 | scr_do_wrap (); |
1386 | scr_do_wrap (); |
1480 | |
1387 | |
1481 | selection_check (1); |
1388 | selection_check (1); |
1482 | MIN_IT (count, (ncol - screen.cur.col)); |
1389 | min_it (count, ncol - screen.cur.col); |
1483 | |
1390 | |
1484 | row = screen.cur.row + saveLines; |
1391 | row = screen.cur.row; |
1485 | |
1392 | |
1486 | line_t *line = save + row; |
1393 | line_t *line = &ROW(row); |
1487 | |
1394 | |
1488 | switch (insdel) |
1395 | switch (insdel) |
1489 | { |
1396 | { |
1490 | case INSERT: |
1397 | case INSERT: |
1491 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1398 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1492 | { |
1399 | { |
1493 | line->t[col] = line->t[col - count]; |
1400 | line->t[col] = line->t[col - count]; |
1494 | line->r[col] = line->r[col - count]; |
1401 | line->r[col] = line->r[col - count]; |
1495 | } |
1402 | } |
1496 | |
1403 | |
1497 | if (line->l != -1) |
1404 | if (!line->is_longer ()) |
1498 | { |
1405 | { |
1499 | line->l += count; |
1406 | line->l += count; |
1500 | MIN_IT (line->l, ncol); |
1407 | min_it (line->l, ncol); |
1501 | } |
1408 | } |
1502 | |
1409 | |
1503 | if (selection.op && current_screen == selection.screen |
1410 | if (selection.op && current_screen == selection.screen |
1504 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1411 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1505 | { |
1412 | { |
… | |
… | |
1512 | selection.mark.col += count; /* XXX: yes? */ |
1419 | selection.mark.col += count; /* XXX: yes? */ |
1513 | selection.end.col += count; |
1420 | selection.end.col += count; |
1514 | } |
1421 | } |
1515 | } |
1422 | } |
1516 | |
1423 | |
1517 | scr_blank_line (save[row], screen.cur.col, count, rstyle); |
1424 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1518 | break; |
1425 | break; |
1519 | |
1426 | |
1520 | case ERASE: |
1427 | case ERASE: |
1521 | screen.cur.col += count; /* don't worry if > ncol */ |
1428 | screen.cur.col += count; /* don't worry if > ncol */ |
1522 | selection_check (1); |
1429 | selection_check (1); |
1523 | screen.cur.col -= count; |
1430 | screen.cur.col -= count; |
1524 | scr_blank_line (save[row], screen.cur.col, count, rstyle); |
1431 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1525 | break; |
1432 | break; |
1526 | |
1433 | |
1527 | case DELETE: |
1434 | case DELETE: |
1528 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1435 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1529 | |
1436 | |
… | |
… | |
1533 | line->r[col] = line->r[col + count]; |
1440 | line->r[col] = line->r[col + count]; |
1534 | } |
1441 | } |
1535 | |
1442 | |
1536 | scr_blank_line (*line, ncol - count, count, tr); |
1443 | scr_blank_line (*line, ncol - count, count, tr); |
1537 | |
1444 | |
1538 | if (line->is_cont ()) /* break line continuation */ |
1445 | if (line->is_longer ()) /* break line continuation */ |
1539 | line->l = ncol; |
1446 | line->l = ncol; |
1540 | |
1447 | |
1541 | line->l -= count; |
1448 | line->l = max (line->l - count, 0); |
1542 | MAX_IT (line->l, 0); |
|
|
1543 | |
1449 | |
1544 | if (selection.op && current_screen == selection.screen |
1450 | if (selection.op && current_screen == selection.screen |
1545 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1451 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1546 | { |
1452 | { |
1547 | if (selection.end.row != screen.cur.row |
1453 | if (selection.end.row != screen.cur.row |
… | |
… | |
1567 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1473 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1568 | */ |
1474 | */ |
1569 | void |
1475 | void |
1570 | rxvt_term::scr_scroll_region (int top, int bot) |
1476 | rxvt_term::scr_scroll_region (int top, int bot) |
1571 | { |
1477 | { |
1572 | MAX_IT (top, 0); |
1478 | max_it (top, 0); |
1573 | MIN_IT (bot, (int)nrow - 1); |
1479 | min_it (bot, nrow - 1); |
1574 | |
1480 | |
1575 | if (top > bot) |
1481 | if (top > bot) |
1576 | return; |
1482 | return; |
1577 | |
1483 | |
1578 | screen.tscroll = top; |
1484 | screen.tscroll = top; |
… | |
… | |
1676 | XGCValues gcvalue; |
1582 | XGCValues gcvalue; |
1677 | |
1583 | |
1678 | if (rvideo != mode) |
1584 | if (rvideo != mode) |
1679 | { |
1585 | { |
1680 | rvideo = mode; |
1586 | rvideo = mode; |
1681 | SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); |
1587 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1682 | #if XPM_BACKGROUND |
1588 | #if XPM_BACKGROUND |
1683 | if (bgPixmap.pixmap == None) |
1589 | if (bgPixmap.pixmap == None) |
1684 | #endif |
1590 | #endif |
1685 | #if TRANSPARENT |
1591 | #if TRANSPARENT |
1686 | if (! (options & Opt_transparent) || am_transparent == 0) |
1592 | if (! (options & Opt_transparent) || am_transparent == 0) |
… | |
… | |
1782 | bool found = false; |
1688 | bool found = false; |
1783 | |
1689 | |
1784 | for (int i = 0; i < nrow; i++) |
1690 | for (int i = 0; i < nrow; i++) |
1785 | { |
1691 | { |
1786 | int col = 0; |
1692 | int col = 0; |
1787 | rend_t *drp = drawn[i].r; |
1693 | rend_t *drp = drawn_buf[i].r; |
1788 | |
1694 | |
1789 | for (; col < ncol; col++, drp++) |
1695 | for (; col < ncol; col++, drp++) |
1790 | if ((*drp & mask) == value) |
1696 | if ((*drp & mask) == value) |
1791 | { |
1697 | { |
1792 | found = true; |
1698 | found = true; |
… | |
… | |
1810 | 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) |
1811 | { |
1717 | { |
1812 | int i; |
1718 | int i; |
1813 | row_col_t rc[RC_COUNT]; |
1719 | row_col_t rc[RC_COUNT]; |
1814 | |
1720 | |
1815 | if (!drawn) /* sanity check */ |
1721 | if (!drawn_buf) /* sanity check */ |
1816 | return; |
1722 | return; |
1817 | |
1723 | |
1818 | #ifndef NO_SLOW_LINK_SUPPORT |
1724 | #ifndef NO_SLOW_LINK_SUPPORT |
1819 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1725 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1820 | { |
1726 | { |
1821 | y = 0; |
1727 | y = 0; |
1822 | eheight = height; |
1728 | eheight = height; |
1823 | } |
1729 | } |
1824 | #endif |
|
|
1825 | |
|
|
1826 | #ifdef DEBUG_STRICT |
|
|
1827 | x = max (x, 0); |
|
|
1828 | x = min (x, (int)width); |
|
|
1829 | y = max (y, 0); |
|
|
1830 | y = min (y, (int)height); |
|
|
1831 | #endif |
1730 | #endif |
1832 | |
1731 | |
1833 | /* round down */ |
1732 | /* round down */ |
1834 | rc[PART_BEG].col = Pixel2Col (x); |
1733 | rc[PART_BEG].col = Pixel2Col (x); |
1835 | rc[PART_BEG].row = Pixel2Row (y); |
1734 | rc[PART_BEG].row = Pixel2Row (y); |
… | |
… | |
1838 | rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); |
1737 | rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); |
1839 | |
1738 | |
1840 | /* sanity checks */ |
1739 | /* sanity checks */ |
1841 | for (i = PART_BEG; i < RC_COUNT; i++) |
1740 | for (i = PART_BEG; i < RC_COUNT; i++) |
1842 | { |
1741 | { |
1843 | MIN_IT (rc[i].col, ncol - 1); |
1742 | min_it (rc[i].col, ncol - 1); |
1844 | MIN_IT (rc[i].row, nrow - 1); |
1743 | min_it (rc[i].row, nrow - 1); |
1845 | } |
1744 | } |
1846 | |
1745 | |
1847 | 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++) |
1848 | 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); |
1849 | |
1748 | |
1850 | if (refresh) |
1749 | if (refresh) |
1851 | scr_refresh (SLOW_REFRESH); |
1750 | scr_refresh (SLOW_REFRESH); |
1852 | } |
1751 | } |
1853 | |
1752 | |
… | |
… | |
1874 | |
1773 | |
1875 | oldviewstart = view_start; |
1774 | oldviewstart = view_start; |
1876 | |
1775 | |
1877 | if (y < len) |
1776 | if (y < len) |
1878 | { |
1777 | { |
1879 | p = (nrow + nscrolled) * (len - y) / len; |
1778 | p = (nrow + nsaved) * (len - y) / len; |
1880 | p -= (long) (nrow - 1); |
1779 | p -= (long) (nrow - 1); |
1881 | p = max (p, 0); |
1780 | p = max (p, 0); |
1882 | } |
1781 | } |
1883 | |
1782 | |
1884 | view_start = (unsigned int)min (p, nscrolled); |
1783 | view_start = (unsigned int)min (p, nsaved); |
1885 | |
1784 | |
1886 | return scr_changeview (oldviewstart); |
1785 | return scr_changeview (oldviewstart); |
1887 | } |
1786 | } |
1888 | |
1787 | |
1889 | /* ------------------------------------------------------------------------- */ |
1788 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1900 | oldviewstart = view_start; |
1799 | oldviewstart = view_start; |
1901 | |
1800 | |
1902 | if (direction == UP) |
1801 | if (direction == UP) |
1903 | { |
1802 | { |
1904 | n = view_start + nlines; |
1803 | n = view_start + nlines; |
1905 | view_start = min (n, nscrolled); |
1804 | view_start = min (n, nsaved); |
1906 | } |
1805 | } |
1907 | else |
1806 | else |
1908 | { |
1807 | { |
1909 | n = view_start - nlines; |
1808 | n = view_start - nlines; |
1910 | view_start = max (n, 0); |
1809 | view_start = max (n, 0); |
… | |
… | |
1954 | /* ARGSUSED */ |
1853 | /* ARGSUSED */ |
1955 | void |
1854 | void |
1956 | rxvt_term::scr_printscreen (int fullhist) |
1855 | rxvt_term::scr_printscreen (int fullhist) |
1957 | { |
1856 | { |
1958 | #ifdef PRINTPIPE |
1857 | #ifdef PRINTPIPE |
1959 | int i, r1, nrows, row_offset; |
1858 | int nrows, row_start; |
1960 | FILE *fd; |
1859 | FILE *fd; |
1961 | |
1860 | |
1962 | if ((fd = popen_printer ()) == NULL) |
1861 | if ((fd = popen_printer ()) == NULL) |
1963 | return; |
1862 | return; |
1964 | |
1863 | |
1965 | nrows = nrow; |
|
|
1966 | row_offset = saveLines; |
|
|
1967 | |
|
|
1968 | if (!fullhist) |
1864 | if (fullhist) |
1969 | row_offset -= view_start; |
1865 | { |
|
|
1866 | nrows = nrow + nsaved; |
|
|
1867 | row_start = -nsaved; |
|
|
1868 | } |
1970 | else |
1869 | else |
1971 | { |
1870 | { |
1972 | nrows += nscrolled; |
1871 | nrows = nrow; |
1973 | row_offset -= nscrolled; |
1872 | row_start = -view_start; |
1974 | } |
1873 | } |
1975 | |
1874 | |
1976 | wctomb (0, 0); |
1875 | wctomb (0, 0); |
1977 | |
1876 | |
1978 | for (r1 = 0; r1 < nrows; r1++) |
1877 | for (int r1 = 0; r1 < nrows; r1++) |
1979 | { |
1878 | { |
1980 | text_t *tp = save[r1 + row_offset].t; |
1879 | text_t *tp = ROW(r1).t; |
1981 | int len = save[r1 + row_offset].l; |
1880 | int len = ROW(r1).l; |
1982 | |
1881 | |
1983 | for (i = len >= 0 ? len : ncol - 1; i--; ) |
1882 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1984 | { |
1883 | { |
1985 | char mb[MB_LEN_MAX]; |
1884 | char mb[MB_LEN_MAX]; |
1986 | text_t t = *tp++; |
1885 | text_t t = *tp++; |
1987 | if (t == NOCHAR) |
1886 | if (t == NOCHAR) |
1988 | continue; |
1887 | continue; |
… | |
… | |
2016 | { |
1915 | { |
2017 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1916 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
2018 | showcursor; /* show the cursor */ |
1917 | showcursor; /* show the cursor */ |
2019 | int16_t col, row, /* column/row we're processing */ |
1918 | int16_t col, row, /* column/row we're processing */ |
2020 | ocrow; /* old cursor row */ |
1919 | ocrow; /* old cursor row */ |
2021 | int i, /* tmp */ |
1920 | int i; /* tmp */ |
2022 | row_offset; /* basic offset in screen structure */ |
|
|
2023 | #ifndef NO_CURSORCOLOR |
1921 | #ifndef NO_CURSORCOLOR |
2024 | rend_t cc1; /* store colours at cursor position (s) */ |
1922 | rend_t cc1; /* store colours at cursor position (s) */ |
2025 | #endif |
1923 | #endif |
2026 | rend_t *crp; // cursor rendition pointer |
1924 | rend_t *crp; // cursor rendition pointer |
2027 | |
1925 | |
… | |
… | |
2033 | /* |
1931 | /* |
2034 | * A: set up vars |
1932 | * A: set up vars |
2035 | */ |
1933 | */ |
2036 | must_clear = 0; |
1934 | must_clear = 0; |
2037 | refresh_count = 0; |
1935 | refresh_count = 0; |
2038 | |
|
|
2039 | row_offset = saveLines - view_start; |
|
|
2040 | |
1936 | |
2041 | #if XPM_BACKGROUND |
1937 | #if XPM_BACKGROUND |
2042 | must_clear |= bgPixmap.pixmap != None; |
1938 | must_clear |= bgPixmap.pixmap != None; |
2043 | #endif |
1939 | #endif |
2044 | #if TRANSPARENT |
1940 | #if TRANSPARENT |
… | |
… | |
2067 | |
1963 | |
2068 | if (showcursor) |
1964 | if (showcursor) |
2069 | { |
1965 | { |
2070 | int col = screen.cur.col; |
1966 | int col = screen.cur.col; |
2071 | |
1967 | |
2072 | while (col && screen.line[screen.cur.row]->t[col] == NOCHAR) |
1968 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2073 | col--; |
1969 | col--; |
2074 | |
1970 | |
2075 | crp = &screen.line[screen.cur.row]->r[col]; |
1971 | crp = &ROW(screen.cur.row).r[col]; |
2076 | |
1972 | |
2077 | if (showcursor && focus) |
1973 | if (showcursor && focus) |
2078 | { |
1974 | { |
2079 | if (options & Opt_cursorUnderline) |
1975 | if (options & Opt_cursorUnderline) |
2080 | *crp ^= RS_Uline; |
1976 | *crp ^= RS_Uline; |
… | |
… | |
2114 | if (screen.cur.row + view_start != ocrow |
2010 | if (screen.cur.row + view_start != ocrow |
2115 | || screen.cur.col != oldcursor.col) |
2011 | || screen.cur.col != oldcursor.col) |
2116 | { |
2012 | { |
2117 | if (ocrow < nrow |
2013 | if (ocrow < nrow |
2118 | && oldcursor.col < ncol) |
2014 | && oldcursor.col < ncol) |
2119 | drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2015 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2120 | |
2016 | |
2121 | if (focus || !showcursor) |
2017 | if (focus || !showcursor) |
2122 | oldcursor.row = -1; |
2018 | oldcursor.row = -1; |
2123 | else |
2019 | else |
2124 | setoldcursor = 1; |
2020 | setoldcursor = 1; |
… | |
… | |
2148 | * D: CopyArea pass - very useful for slower links |
2044 | * D: CopyArea pass - very useful for slower links |
2149 | * This has been deliberately kept simple. |
2045 | * This has been deliberately kept simple. |
2150 | */ |
2046 | */ |
2151 | i = num_scr; |
2047 | i = num_scr; |
2152 | if (!display->is_local |
2048 | if (!display->is_local |
2153 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2049 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2154 | && abs (i) < nrow && !must_clear) |
2050 | && abs (num_scr) < nrow && !must_clear) |
2155 | { |
2051 | { |
2156 | int16_t nits; |
2052 | int16_t nits; |
2157 | int j; |
2053 | int j; |
2158 | int len, wlen; |
2054 | int len, wlen; |
2159 | |
2055 | |
… | |
… | |
2162 | row = i > 0 ? 0 : j - 1; |
2058 | row = i > 0 ? 0 : j - 1; |
2163 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2059 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2164 | { |
2060 | { |
2165 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2061 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2166 | { |
2062 | { |
2167 | line_t s = save[row + row_offset]; |
2063 | line_t s = ROW(row - view_start); |
2168 | line_t d = drawn[row]; |
2064 | line_t d = drawn_buf[row]; |
2169 | line_t d2 = drawn[row + i]; |
2065 | line_t d2 = drawn_buf[row + i]; |
2170 | |
2066 | |
2171 | for (nits = 0, col = ncol; col--; ) |
2067 | for (nits = 0, col = ncol; col--; ) |
2172 | 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]) |
2173 | nits--; |
2069 | nits--; |
2174 | 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]) |
… | |
… | |
2192 | |
2088 | |
2193 | if (len != -1) |
2089 | if (len != -1) |
2194 | { |
2090 | { |
2195 | /* also comes here at end if needed because of >= above */ |
2091 | /* also comes here at end if needed because of >= above */ |
2196 | if (wlen < len) |
2092 | if (wlen < len) |
2197 | SWAP_IT (wlen, len, int); |
2093 | ::swap (wlen, len); |
2198 | |
2094 | |
2199 | XCopyArea (display->display, vt, vt, |
2095 | XCopyArea (display->display, vt, vt, |
2200 | gc, 0, Row2Pixel (len + i), |
2096 | gc, 0, Row2Pixel (len + i), |
2201 | (unsigned int)TermWin_TotalWidth (), |
2097 | (unsigned int)TermWin_TotalWidth (), |
2202 | (unsigned int)Height2Pixel (wlen - len + 1), |
2098 | (unsigned int)Height2Pixel (wlen - len + 1), |
… | |
… | |
2210 | /* |
2106 | /* |
2211 | * E: main pass across every character |
2107 | * E: main pass across every character |
2212 | */ |
2108 | */ |
2213 | for (row = 0; row < nrow; row++) |
2109 | for (row = 0; row < nrow; row++) |
2214 | { |
2110 | { |
2215 | text_t *stp = save[row + row_offset].t; |
2111 | text_t *stp = ROW(row - view_start).t; |
2216 | rend_t *srp = save[row + row_offset].r; |
2112 | rend_t *srp = ROW(row - view_start).r; |
2217 | text_t *dtp = drawn[row].t; |
2113 | text_t *dtp = drawn_buf[row].t; |
2218 | rend_t *drp = drawn[row].r; |
2114 | rend_t *drp = drawn_buf[row].r; |
2219 | |
2115 | |
2220 | /* |
2116 | /* |
2221 | * E2: OK, now the real pass |
2117 | * E2: OK, now the real pass |
2222 | */ |
2118 | */ |
2223 | int ypixel = (int)Row2Pixel (row); |
2119 | int ypixel = (int)Row2Pixel (row); |
… | |
… | |
2334 | fore = Color_UL; |
2230 | fore = Color_UL; |
2335 | #endif |
2231 | #endif |
2336 | |
2232 | |
2337 | if (invert) |
2233 | if (invert) |
2338 | { |
2234 | { |
2339 | SWAP_IT (fore, back, int); |
2235 | ::swap (fore, back); |
2340 | |
2236 | |
2341 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2237 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2342 | if (ISSET_PIXCOLOR (Color_RV)) |
2238 | if (ISSET_PIXCOLOR (Color_RV)) |
2343 | back = Color_RV; |
2239 | back = Color_RV; |
2344 | |
2240 | |
… | |
… | |
2432 | else if (oldcursor.row >= 0) |
2328 | else if (oldcursor.row >= 0) |
2433 | { |
2329 | { |
2434 | int cursorwidth = 1; |
2330 | int cursorwidth = 1; |
2435 | int col = oldcursor.col; |
2331 | int col = oldcursor.col; |
2436 | |
2332 | |
2437 | while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR) |
2333 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2438 | col--; |
2334 | col--; |
2439 | |
2335 | |
2440 | while (col + cursorwidth < ncol |
2336 | while (col + cursorwidth < ncol |
2441 | && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2337 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2442 | cursorwidth++; |
2338 | cursorwidth++; |
2443 | |
2339 | |
2444 | #ifndef NO_CURSORCOLOR |
2340 | #ifndef NO_CURSORCOLOR |
2445 | if (ISSET_PIXCOLOR (Color_cursor)) |
2341 | if (ISSET_PIXCOLOR (Color_cursor)) |
2446 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2342 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
… | |
… | |
2477 | } |
2373 | } |
2478 | |
2374 | |
2479 | void |
2375 | void |
2480 | rxvt_term::scr_remap_chars () |
2376 | rxvt_term::scr_remap_chars () |
2481 | { |
2377 | { |
2482 | for (int i = nrow + saveLines; i--; ) |
2378 | for (int i = total_rows; i--; ) |
2483 | scr_remap_chars (save[i]); |
2379 | scr_remap_chars (row_buf [i]); |
2484 | |
2380 | |
2485 | for (int i = nrow; i--; ) |
2381 | for (int i = nrow; i--; ) |
2486 | { |
2382 | { |
2487 | scr_remap_chars (drawn[i]); |
2383 | scr_remap_chars (drawn_buf [i]); |
2488 | scr_remap_chars (swap_save[i]); |
2384 | scr_remap_chars (swap_buf [i]); |
2489 | } |
2385 | } |
2490 | } |
2386 | } |
2491 | |
2387 | |
2492 | void |
2388 | void |
2493 | rxvt_term::scr_recolour () |
2389 | rxvt_term::scr_recolour () |
… | |
… | |
2535 | |
2431 | |
2536 | /* ------------------------------------------------------------------------- */ |
2432 | /* ------------------------------------------------------------------------- */ |
2537 | void |
2433 | void |
2538 | rxvt_term::scr_reverse_selection () |
2434 | rxvt_term::scr_reverse_selection () |
2539 | { |
2435 | { |
|
|
2436 | if (selection.op |
2540 | if (selection.op && current_screen == selection.screen) |
2437 | && current_screen == selection.screen |
|
|
2438 | && selection.end.row >= -view_start) |
2541 | { |
2439 | { |
2542 | int end_row = saveLines - view_start; |
2440 | int view_end = -view_start + nrow; |
2543 | int i = selection.beg.row + saveLines; |
2441 | int row, col; |
2544 | int col, row = selection.end.row + saveLines; |
|
|
2545 | rend_t *srp; |
|
|
2546 | |
2442 | |
2547 | #if ENABLE_FRILLS |
2443 | #if ENABLE_FRILLS |
2548 | if (selection.rect) |
2444 | if (selection.rect) |
2549 | { |
2445 | { |
2550 | end_row += nrow; |
2446 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
2551 | |
|
|
2552 | for (; i <= row && i <= end_row; i++) |
|
|
2553 | for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++) |
2447 | for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) |
2554 | srp[col] ^= RS_RVid; |
2448 | srp[col] ^= RS_RVid; |
2555 | } |
2449 | } |
2556 | else |
2450 | else |
2557 | #endif |
2451 | #endif |
2558 | { |
2452 | { |
2559 | if (i >= end_row) |
2453 | if (selection.beg.row >= -view_start) |
|
|
2454 | { |
2560 | col = selection.beg.col; |
2455 | col = selection.beg.col; |
|
|
2456 | row = selection.beg.row; |
|
|
2457 | } |
2561 | else |
2458 | else |
2562 | { |
2459 | { |
2563 | col = 0; |
2460 | col = 0; |
2564 | i = end_row; |
2461 | row = view_start; |
2565 | } |
2462 | } |
2566 | |
2463 | |
2567 | end_row += nrow; |
2464 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2568 | |
|
|
2569 | for (; i < row && i < end_row; i++, col = 0) |
|
|
2570 | for (srp = save[i].r; col < ncol; col++) |
2465 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2571 | srp[col] ^= RS_RVid; |
2466 | srp[col] ^= RS_RVid; |
2572 | |
2467 | |
2573 | if (i == row && i < end_row) |
2468 | if (row == selection.end.row) |
2574 | for (srp = save[i].r; col < selection.end.col; col++) |
2469 | for (rend_t *srp = ROW(row).r; col < selection.end.col; col++) |
2575 | srp[col] ^= RS_RVid; |
2470 | srp[col] ^= RS_RVid; |
2576 | } |
2471 | } |
2577 | } |
2472 | } |
2578 | } |
2473 | } |
2579 | |
2474 | |
… | |
… | |
2588 | { |
2483 | { |
2589 | int row, wrote; |
2484 | int row, wrote; |
2590 | unsigned int width, towrite; |
2485 | unsigned int width, towrite; |
2591 | char r1[] = "\n"; |
2486 | char r1[] = "\n"; |
2592 | |
2487 | |
2593 | for (row = saveLines - nscrolled; |
2488 | for (row = saveLines - nsaved; |
2594 | row < saveLines + nrow - 1; row++) |
2489 | row < saveLines + nrow - 1; row++) |
2595 | { |
2490 | { |
2596 | width = save[row].l >= 0 ? save[row].l |
2491 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2597 | : ncol; |
2492 | : ncol; |
2598 | for (towrite = width; towrite; towrite -= wrote) |
2493 | for (towrite = width; towrite; towrite -= wrote) |
2599 | { |
2494 | { |
2600 | wrote = write (fd, & (save[row].t[width - towrite]), |
2495 | wrote = write (fd, & (row_buf[row].t[width - towrite]), |
2601 | towrite); |
2496 | towrite); |
2602 | if (wrote < 0) |
2497 | if (wrote < 0) |
2603 | return; /* XXX: death, no report */ |
2498 | return; /* XXX: death, no report */ |
2604 | } |
2499 | } |
2605 | if (save[row].l >= 0) |
2500 | if (row_buf[row].l >= 0) |
2606 | if (write (fd, r1, 1) <= 0) |
2501 | if (write (fd, r1, 1) <= 0) |
2607 | return; /* XXX: death, no report */ |
2502 | return; /* XXX: death, no report */ |
2608 | } |
2503 | } |
2609 | } |
2504 | } |
2610 | #endif |
2505 | #endif |
2611 | |
2506 | |
2612 | /* ------------------------------------------------------------------------- * |
2507 | /* ------------------------------------------------------------------------- * |
2613 | * CHARACTER SELECTION * |
2508 | * CHARACTER SELECTION * |
2614 | * ------------------------------------------------------------------------- */ |
2509 | * ------------------------------------------------------------------------- */ |
2615 | |
|
|
2616 | /* |
|
|
2617 | * -nscrolled <= (selection row) <= nrow - 1 |
|
|
2618 | */ |
|
|
2619 | void |
2510 | void |
2620 | rxvt_term::selection_check (int check_more) |
2511 | rxvt_term::selection_check (int check_more) |
2621 | { |
2512 | { |
2622 | row_col_t pos; |
2513 | row_col_t pos; |
2623 | |
2514 | |
2624 | if (!selection.op) |
2515 | if (!selection.op) |
2625 | return; |
2516 | return; |
2626 | |
2517 | |
2627 | pos.row = pos.col = 0; |
2518 | pos.row = pos.col = 0; |
2628 | if ((selection.beg.row < - (int32_t)nscrolled) |
2519 | if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) |
2629 | || (selection.beg.row >= nrow) |
2520 | || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) |
2630 | || (selection.mark.row < - (int32_t)nscrolled) |
2521 | || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) |
2631 | || (selection.mark.row >= nrow) |
|
|
2632 | || (selection.end.row < - (int32_t)nscrolled) |
|
|
2633 | || (selection.end.row >= nrow) |
|
|
2634 | || (check_more == 1 |
2522 | || (check_more == 1 |
2635 | && current_screen == selection.screen |
2523 | && current_screen == selection.screen |
2636 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2524 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2637 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2525 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2638 | || (check_more == 2 |
2526 | || (check_more == 2 |
… | |
… | |
2944 | * EXT: button 1 or 3 release |
2832 | * EXT: button 1 or 3 release |
2945 | */ |
2833 | */ |
2946 | void |
2834 | void |
2947 | rxvt_term::selection_make (Time tm) |
2835 | rxvt_term::selection_make (Time tm) |
2948 | { |
2836 | { |
2949 | int i, col, end_col, row, end_row; |
2837 | int i; |
2950 | wchar_t *new_selection_text; |
2838 | wchar_t *new_selection_text; |
2951 | text_t *t; |
2839 | text_t *t; |
2952 | |
2840 | |
2953 | switch (selection.op) |
2841 | switch (selection.op) |
2954 | { |
2842 | { |
… | |
… | |
2970 | return; /* nothing selected, go away */ |
2858 | return; /* nothing selected, go away */ |
2971 | |
2859 | |
2972 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2860 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2973 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2861 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2974 | |
2862 | |
2975 | col = selection.beg.col; |
|
|
2976 | row = selection.beg.row + saveLines; |
|
|
2977 | end_row = selection.end.row + saveLines; |
|
|
2978 | int ofs = 0; |
2863 | int ofs = 0; |
2979 | int extra = 0; |
2864 | int extra = 0; |
2980 | |
2865 | |
|
|
2866 | int col = selection.beg.col; |
|
|
2867 | int row = selection.beg.row; |
|
|
2868 | |
|
|
2869 | int end_col; |
|
|
2870 | |
2981 | for (; row <= end_row; row++, col = 0) |
2871 | for (; row <= selection.end.row; row++, col = 0) |
2982 | { |
2872 | { |
2983 | #if ENABLE_FRILLS |
2873 | #if ENABLE_FRILLS |
2984 | if (selection.rect) |
2874 | if (selection.rect) |
2985 | { |
2875 | { |
2986 | col = selection.beg.col; |
2876 | col = selection.beg.col; |
2987 | end_col = ncol + 1; |
2877 | end_col = ncol + 1; |
2988 | } |
2878 | } |
2989 | else |
2879 | else |
2990 | #endif |
2880 | #endif |
2991 | end_col = save[row].is_cont () ? ncol : save[row].l; //TODO//FIXME |
2881 | end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN |
2992 | |
2882 | |
2993 | MAX_IT (col, 0); |
2883 | col = max (col, 0); |
2994 | |
2884 | |
2995 | if (row == end_row || selection.rect) |
2885 | if (row == selection.end.row || selection.rect) |
2996 | MIN_IT (end_col, selection.end.col); |
2886 | end_col = min (end_col, selection.end.col); |
2997 | |
2887 | |
2998 | t = &save[row].t[col]; |
2888 | t = ROW(row).t + col; |
2999 | for (; col < end_col; col++) |
2889 | for (; col < end_col; col++) |
3000 | { |
2890 | { |
3001 | if (*t == NOCHAR) |
2891 | if (*t == NOCHAR) |
3002 | t++; |
2892 | t++; |
3003 | #if ENABLE_COMBINING |
2893 | #if ENABLE_COMBINING |
… | |
… | |
3019 | #endif |
2909 | #endif |
3020 | else |
2910 | else |
3021 | new_selection_text[ofs++] = *t++; |
2911 | new_selection_text[ofs++] = *t++; |
3022 | } |
2912 | } |
3023 | |
2913 | |
3024 | if (save[row].l != -1 && row != end_row) |
2914 | if (!ROW(row).is_longer () && row != selection.end.row) |
3025 | new_selection_text[ofs++] = C0_LF; |
2915 | new_selection_text[ofs++] = C0_LF; |
3026 | } |
2916 | } |
3027 | |
2917 | |
3028 | if (end_col != selection.end.col) |
2918 | if (end_col != selection.end.col) |
3029 | new_selection_text[ofs++] = C0_LF; |
2919 | new_selection_text[ofs++] = C0_LF; |
… | |
… | |
3088 | */ |
2978 | */ |
3089 | void |
2979 | void |
3090 | rxvt_term::selection_start_colrow (int col, int row) |
2980 | rxvt_term::selection_start_colrow (int col, int row) |
3091 | { |
2981 | { |
3092 | want_refresh = 1; |
2982 | want_refresh = 1; |
|
|
2983 | |
|
|
2984 | selection.mark.row = row - view_start; |
3093 | selection.mark.col = col; |
2985 | selection.mark.col = col; |
3094 | selection.mark.row = row - view_start; |
|
|
3095 | |
2986 | |
3096 | MAX_IT (selection.mark.row, - (int32_t)nscrolled); |
2987 | selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); |
3097 | MIN_IT (selection.mark.row, (int32_t)nrow - 1); |
2988 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3098 | MAX_IT (selection.mark.col, 0); |
|
|
3099 | MIN_IT (selection.mark.col, (int32_t)ncol - 1); |
|
|
3100 | |
2989 | |
3101 | while (selection.mark.col > 0 |
2990 | while (selection.mark.col > 0 |
3102 | && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR) |
2991 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3103 | --selection.mark.col; |
2992 | --selection.mark.col; |
3104 | |
2993 | |
3105 | if (selection.op) |
2994 | if (selection.op) |
3106 | { /* clear the old selection */ |
2995 | { /* clear the old selection */ |
3107 | selection.beg.row = selection.end.row = selection.mark.row; |
2996 | selection.beg.row = selection.end.row = selection.mark.row; |
… | |
… | |
3131 | text_t *stp; |
3020 | text_t *stp; |
3132 | rend_t *srp; |
3021 | rend_t *srp; |
3133 | |
3022 | |
3134 | if (dirn == UP) |
3023 | if (dirn == UP) |
3135 | { |
3024 | { |
3136 | bound.row = saveLines - nscrolled - 1; |
3025 | bound.row = - nsaved - 1; |
3137 | bound.col = 0; |
3026 | bound.col = 0; |
3138 | dirnadd = -1; |
3027 | dirnadd = -1; |
3139 | } |
3028 | } |
3140 | else |
3029 | else |
3141 | { |
3030 | { |
3142 | bound.row = saveLines + nrow; |
3031 | bound.row = nrow; |
3143 | bound.col = ncol - 1; |
3032 | bound.col = ncol - 1; |
3144 | dirnadd = 1; |
3033 | dirnadd = 1; |
3145 | } |
3034 | } |
3146 | |
3035 | |
3147 | row = mark->row + saveLines; |
3036 | row = mark->row; |
3148 | col = mark->col; |
3037 | col = max (mark->col, 0); |
3149 | MAX_IT (col, 0); |
3038 | |
3150 | /* find the edge of a word */ |
3039 | /* find the edge of a word */ |
3151 | stp = &save[row].t[col]; |
3040 | stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp); |
3152 | w1 = DELIMIT_TEXT (*stp); |
3041 | srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp); |
3153 | |
|
|
3154 | srp = &save[row].r[col]; |
|
|
3155 | w2 = DELIMIT_REND (*srp); |
|
|
3156 | |
3042 | |
3157 | for (;;) |
3043 | for (;;) |
3158 | { |
3044 | { |
3159 | for (; col != bound.col; col += dirnadd) |
3045 | for (; col != bound.col; col += dirnadd) |
3160 | { |
3046 | { |
… | |
… | |
3170 | break; |
3056 | break; |
3171 | } |
3057 | } |
3172 | |
3058 | |
3173 | if ((col == bound.col) && (row != bound.row)) |
3059 | if ((col == bound.col) && (row != bound.row)) |
3174 | { |
3060 | { |
3175 | if (save[ (row - (dirn == UP ? 1 : 0))].is_cont ()) |
3061 | if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ()) |
3176 | { |
3062 | { |
3177 | trow = row + dirnadd; |
3063 | trow = row + dirnadd; |
3178 | tcol = dirn == UP ? ncol - 1 : 0; |
3064 | tcol = dirn == UP ? ncol - 1 : 0; |
3179 | |
3065 | |
3180 | if (save[trow].t == NULL) |
3066 | if (!ROW(trow).t) |
3181 | break; |
3067 | break; |
3182 | |
3068 | |
3183 | stp = & (save[trow].t[tcol]); |
3069 | stp = ROW(trow).t + tcol; |
3184 | srp = & (save[trow].r[tcol]); |
3070 | srp = ROW(trow).r + tcol; |
3185 | |
3071 | |
3186 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3072 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3187 | break; |
3073 | break; |
3188 | |
3074 | |
3189 | row = trow; |
3075 | row = trow; |
… | |
… | |
3197 | Old_Word_Selection_You_Die: |
3083 | Old_Word_Selection_You_Die: |
3198 | if (dirn == DN) |
3084 | if (dirn == DN) |
3199 | col++; /* put us on one past the end */ |
3085 | col++; /* put us on one past the end */ |
3200 | |
3086 | |
3201 | /* Poke the values back in */ |
3087 | /* Poke the values back in */ |
3202 | ret->row = row - saveLines; |
3088 | ret->row = row; |
3203 | ret->col = col; |
3089 | ret->col = col; |
3204 | } |
3090 | } |
3205 | |
3091 | |
3206 | /* ------------------------------------------------------------------------- */ |
3092 | /* ------------------------------------------------------------------------- */ |
3207 | /* |
3093 | /* |
… | |
… | |
3212 | * flag == 2 ==> button 3 motion |
3098 | * flag == 2 ==> button 3 motion |
3213 | */ |
3099 | */ |
3214 | void |
3100 | void |
3215 | rxvt_term::selection_extend (int x, int y, int flag) |
3101 | rxvt_term::selection_extend (int x, int y, int flag) |
3216 | { |
3102 | { |
3217 | int col, row; |
3103 | int col = clamp (Pixel2Col (x), 0, ncol); |
3218 | |
3104 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3219 | col = Pixel2Col (x); |
|
|
3220 | row = Pixel2Row (y); |
|
|
3221 | MAX_IT (row, 0); |
|
|
3222 | MIN_IT (row, (int)nrow - 1); |
|
|
3223 | MAX_IT (col, 0); |
|
|
3224 | MIN_IT (col, (int)ncol); |
|
|
3225 | |
3105 | |
3226 | /* |
3106 | /* |
3227 | * 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 |
3228 | * 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 |
3229 | * 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 |
… | |
… | |
3254 | * Extend the selection to the specified col/row |
3134 | * Extend the selection to the specified col/row |
3255 | */ |
3135 | */ |
3256 | void |
3136 | void |
3257 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3137 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3258 | { |
3138 | { |
3259 | int end_col; |
|
|
3260 | row_col_t pos; |
3139 | row_col_t pos; |
3261 | enum { |
3140 | enum { |
3262 | LEFT, RIGHT |
3141 | LEFT, RIGHT |
3263 | } closeto = RIGHT; |
3142 | } closeto = RIGHT; |
3264 | |
3143 | |
… | |
… | |
3295 | selection.beg.col = selection.end.col = selection.mark.col; |
3174 | selection.beg.col = selection.end.col = selection.mark.col; |
3296 | selection.beg.row = selection.end.row = selection.mark.row; |
3175 | selection.beg.row = selection.end.row = selection.mark.row; |
3297 | } |
3176 | } |
3298 | |
3177 | |
3299 | pos.col = col; |
3178 | pos.col = col; |
3300 | pos.row = row; |
3179 | pos.row = row - view_start; |
3301 | |
|
|
3302 | pos.row -= view_start; /* adjust for scroll */ |
|
|
3303 | |
3180 | |
3304 | /* |
3181 | /* |
3305 | * This is mainly xterm style selection with a couple of differences, mainly |
3182 | * This is mainly xterm style selection with a couple of differences, mainly |
3306 | * in the way button3 drag extension works. |
3183 | * in the way button3 drag extension works. |
3307 | * We're either doing: button1 drag; button3 press; or button3 drag |
3184 | * We're either doing: button1 drag; button3 press; or button3 drag |
… | |
… | |
3366 | } |
3243 | } |
3367 | } |
3244 | } |
3368 | |
3245 | |
3369 | if (selection.clicks == 1) |
3246 | if (selection.clicks == 1) |
3370 | { |
3247 | { |
3371 | end_col = save[selection.beg.row + saveLines].l; |
3248 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3372 | |
3249 | && !ROW(selection.beg.row).is_longer () |
3373 | if (selection.beg.col > end_col |
|
|
3374 | && end_col != -1 |
|
|
3375 | #if ENABLE_FRILLS |
3250 | #if ENABLE_FRILLS |
3376 | && !selection.rect |
3251 | && !selection.rect |
3377 | #endif |
3252 | #endif |
3378 | ) |
3253 | ) |
3379 | selection.beg.col = ncol; |
3254 | selection.beg.col = ncol; |
3380 | |
3255 | |
3381 | end_col = save[selection.end.row + saveLines].l; |
|
|
3382 | |
|
|
3383 | if ( |
3256 | if ( |
3384 | selection.end.col > end_col |
3257 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3385 | && end_col != -1 |
3258 | && !ROW(selection.end.row).is_longer () |
3386 | #if ENABLE_FRILLS |
3259 | #if ENABLE_FRILLS |
3387 | && !selection.rect |
3260 | && !selection.rect |
3388 | #endif |
3261 | #endif |
3389 | ) |
3262 | ) |
3390 | selection.end.col = ncol; |
3263 | selection.end.col = ncol; |
… | |
… | |
3400 | else if (selection.clicks == 3) |
3273 | else if (selection.clicks == 3) |
3401 | { |
3274 | { |
3402 | #if ENABLE_FRILLS |
3275 | #if ENABLE_FRILLS |
3403 | if (options & Opt_tripleclickwords) |
3276 | if (options & Opt_tripleclickwords) |
3404 | { |
3277 | { |
3405 | int end_row; |
|
|
3406 | |
|
|
3407 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3278 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3408 | end_row = save[selection.mark.row + saveLines].l; |
|
|
3409 | |
3279 | |
3410 | for (end_row = selection.mark.row; end_row < nrow; end_row++) |
3280 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3411 | { |
3281 | { |
3412 | end_col = save[end_row + saveLines].l; |
3282 | if (!ROW(end_row).is_longer ()) |
3413 | |
|
|
3414 | if (end_col != -1) |
|
|
3415 | { |
3283 | { |
3416 | selection.end.row = end_row; |
3284 | selection.end.row = end_row; |
3417 | selection.end.col = end_col; |
3285 | selection.end.col = ROW(end_row).l; |
3418 | selection_remove_trailing_spaces (); |
3286 | selection_remove_trailing_spaces (); |
3419 | break; |
3287 | break; |
3420 | } |
3288 | } |
3421 | } |
3289 | } |
3422 | } |
3290 | } |
… | |
… | |
3429 | selection.beg.col = 0; |
3297 | selection.beg.col = 0; |
3430 | selection.end.col = ncol; |
3298 | selection.end.col = ncol; |
3431 | |
3299 | |
3432 | // select a complete logical line |
3300 | // select a complete logical line |
3433 | while (selection.beg.row > -saveLines |
3301 | while (selection.beg.row > -saveLines |
3434 | && save[selection.beg.row - 1 + saveLines].is_cont ()) |
3302 | && ROW(selection.beg.row - 1).is_longer ()) |
3435 | selection.beg.row--; |
3303 | selection.beg.row--; |
3436 | |
3304 | |
3437 | while (selection.end.row < nrow |
3305 | while (selection.end.row < nrow |
3438 | && save[selection.end.row + saveLines].is_cont ()) |
3306 | && ROW(selection.end.row).is_longer ()) |
3439 | selection.end.row++; |
3307 | selection.end.row++; |
3440 | } |
3308 | } |
3441 | } |
3309 | } |
3442 | |
3310 | |
3443 | if (button3 && buttonpress) |
3311 | if (button3 && buttonpress) |
… | |
… | |
3454 | } |
3322 | } |
3455 | } |
3323 | } |
3456 | |
3324 | |
3457 | #if ENABLE_FRILLS |
3325 | #if ENABLE_FRILLS |
3458 | if (selection.rect && selection.beg.col > selection.end.col) |
3326 | if (selection.rect && selection.beg.col > selection.end.col) |
3459 | SWAP_IT (selection.beg.col, selection.end.col, int); |
3327 | ::swap (selection.beg.col, selection.end.col); |
3460 | #endif |
3328 | #endif |
3461 | } |
3329 | } |
3462 | |
3330 | |
3463 | #if ENABLE_FRILLS |
3331 | #if ENABLE_FRILLS |
3464 | void |
3332 | void |
… | |
… | |
3468 | text_t *stp; |
3336 | text_t *stp; |
3469 | |
3337 | |
3470 | end_col = selection.end.col; |
3338 | end_col = selection.end.col; |
3471 | end_row = selection.end.row; |
3339 | end_row = selection.end.row; |
3472 | |
3340 | |
3473 | for ( ; end_row >= selection.beg.row; ) |
3341 | for (; end_row >= selection.beg.row; ) |
3474 | { |
3342 | { |
3475 | stp = save[end_row + saveLines].t; |
3343 | stp = ROW(end_row).t; |
3476 | |
3344 | |
3477 | while (--end_col >= 0) |
3345 | while (--end_col >= 0) |
3478 | { |
3346 | { |
3479 | if (stp[end_col] != ' ' |
3347 | if (stp[end_col] != ' ' |
3480 | && stp[end_col] != '\t' |
3348 | && stp[end_col] != '\t' |
3481 | && stp[end_col] != NOCHAR) |
3349 | && stp[end_col] != NOCHAR) |
3482 | break; |
3350 | break; |
3483 | } |
3351 | } |
3484 | |
3352 | |
3485 | if (end_col >= 0 |
3353 | if (end_col >= 0 |
3486 | || save[end_row - 1 + saveLines].l != -1) |
3354 | || !ROW(end_row - 1).is_longer ()) |
3487 | { |
3355 | { |
3488 | selection.end.col = end_col + 1; |
3356 | selection.end.col = end_col + 1; |
3489 | selection.end.row = end_row; |
3357 | selection.end.row = end_row; |
3490 | break; |
3358 | break; |
3491 | } |
3359 | } |
… | |
… | |
3662 | */ |
3530 | */ |
3663 | void |
3531 | void |
3664 | rxvt_term::pixel_position (int *x, int *y) |
3532 | rxvt_term::pixel_position (int *x, int *y) |
3665 | { |
3533 | { |
3666 | *x = Pixel2Col (*x); |
3534 | *x = Pixel2Col (*x); |
3667 | /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ |
3535 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
3668 | *y = Pixel2Row (*y); |
3536 | *y = Pixel2Row (*y); |
3669 | /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ |
3537 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
3670 | } |
3538 | } |
3671 | |
3539 | |
3672 | /* ------------------------------------------------------------------------- */ |
3540 | /* ------------------------------------------------------------------------- */ |
3673 | #ifdef USE_XIM |
3541 | #ifdef USE_XIM |
3674 | void |
3542 | void |
… | |
… | |
3696 | |
3564 | |
3697 | if (x < 0) x = ncol - w; |
3565 | if (x < 0) x = ncol - w; |
3698 | if (y < 0) y = nrow - h; |
3566 | if (y < 0) y = nrow - h; |
3699 | |
3567 | |
3700 | // make space for border |
3568 | // make space for border |
3701 | w += 2; MIN_IT (w, ncol); |
3569 | w += 2; min_it (w, ncol); |
3702 | h += 2; MIN_IT (h, nrow); |
3570 | h += 2; min_it (h, nrow); |
3703 | |
3571 | |
3704 | x -= 1; MAX_IT (x, 0); |
3572 | x -= 1; clamp_it (x, 0, ncol - w); |
3705 | y -= 1; MAX_IT (y, 0); |
3573 | y -= 1; clamp_it (y, 0, nrow - h); |
3706 | |
|
|
3707 | MIN_IT (x, ncol - w); |
|
|
3708 | MIN_IT (y, nrow - h); |
|
|
3709 | |
3574 | |
3710 | ov_x = x; ov_y = y; |
3575 | ov_x = x; ov_y = y; |
3711 | ov_w = w; ov_h = h; |
3576 | ov_w = w; ov_h = h; |
3712 | |
3577 | |
3713 | ov_text = new text_t *[h]; |
3578 | ov_text = new text_t *[h]; |
… | |
… | |
3799 | rxvt_term::scr_swap_overlay () |
3664 | rxvt_term::scr_swap_overlay () |
3800 | { |
3665 | { |
3801 | if (!ov_text) |
3666 | if (!ov_text) |
3802 | return; |
3667 | return; |
3803 | |
3668 | |
3804 | int row_offset = ov_y + saveLines - view_start; |
|
|
3805 | |
|
|
3806 | // swap screen mem with overlay |
3669 | // swap screen mem with overlay |
3807 | for (int y = ov_h; y--; ) |
3670 | for (int y = ov_h; y--; ) |
3808 | { |
3671 | { |
3809 | text_t *t1 = ov_text[y]; |
3672 | text_t *t1 = ov_text[y]; |
3810 | rend_t *r1 = ov_rend[y]; |
3673 | rend_t *r1 = ov_rend[y]; |
3811 | |
3674 | |
3812 | text_t *t2 = save[y + row_offset].t + ov_x; |
3675 | text_t *t2 = ROW(y - view_start).t + ov_x; |
3813 | rend_t *r2 = save[y + row_offset].r + ov_x; |
3676 | rend_t *r2 = ROW(y - view_start).r + ov_x; |
3814 | |
3677 | |
3815 | for (int x = ov_w; x--; ) |
3678 | for (int x = ov_w; x--; ) |
3816 | { |
3679 | { |
3817 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3680 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3818 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3681 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
… | |
… | |
3820 | } |
3683 | } |
3821 | } |
3684 | } |
3822 | |
3685 | |
3823 | #endif |
3686 | #endif |
3824 | /* ------------------------------------------------------------------------- */ |
3687 | /* ------------------------------------------------------------------------- */ |
|
|
3688 | |