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