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