1 | /*--------------------------------*-C-*--------------------------------------* |
1 | /*--------------------------------*-C-*--------------------------------------* |
2 | * File: screen.C |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
… | |
… | |
24 | * This file handles _all_ screen updates and selections |
24 | * This file handles _all_ screen updates and selections |
25 | */ |
25 | */ |
26 | |
26 | |
27 | #include "../config.h" /* NECESSARY */ |
27 | #include "../config.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
|
|
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | |
30 | |
30 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
31 | |
32 | |
32 | #include <inttypes.h> |
33 | #include <inttypes.h> |
33 | |
34 | |
… | |
… | |
46 | |
47 | |
47 | /* ------------------------------------------------------------------------- * |
48 | /* ------------------------------------------------------------------------- * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * ------------------------------------------------------------------------- */ |
50 | * ------------------------------------------------------------------------- */ |
50 | #define ZERO_SCROLLBACK() \ |
51 | #define ZERO_SCROLLBACK() \ |
51 | if (options & Opt_scrollTtyOutput) \ |
52 | if (OPTION (Opt_scrollTtyOutput)) \ |
52 | view_start = 0 |
53 | view_start = 0 |
53 | #define CLEAR_SELECTION() \ |
54 | #define CLEAR_SELECTION() \ |
54 | selection.beg.row = selection.beg.col \ |
55 | selection.beg.row = selection.beg.col \ |
55 | = selection.end.row = selection.end.col = 0 |
56 | = selection.end.row = selection.end.col = 0 |
56 | #define CLEAR_ALL_SELECTION() \ |
57 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
116 | |
117 | |
117 | /* Fill part/all of a line with blanks. */ |
118 | /* Fill part/all of a line with blanks. */ |
118 | void |
119 | void |
119 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) |
120 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) |
120 | { |
121 | { |
|
|
122 | if (!l.t) |
|
|
123 | { |
|
|
124 | lalloc (l); |
|
|
125 | col = 0; |
|
|
126 | width = ncol; |
|
|
127 | } |
|
|
128 | |
|
|
129 | l.touch (); |
|
|
130 | |
121 | efs &= ~RS_baseattrMask; |
131 | efs &= ~RS_baseattrMask; |
122 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
123 | |
133 | |
124 | text_t *et = l.t + col; |
134 | text_t *et = l.t + col; |
125 | rend_t *er = l.r + col; |
135 | rend_t *er = l.r + col; |
… | |
… | |
134 | /* ------------------------------------------------------------------------- */ |
144 | /* ------------------------------------------------------------------------- */ |
135 | /* Fill a full line with blanks - make sure it is allocated first */ |
145 | /* Fill a full line with blanks - make sure it is allocated first */ |
136 | void |
146 | void |
137 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
147 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
138 | { |
148 | { |
139 | if (!l.t) |
|
|
140 | lalloc (l); |
|
|
141 | |
|
|
142 | scr_blank_line (l, 0, ncol, efs); |
149 | scr_blank_line (l, 0, ncol, efs); |
|
|
150 | |
|
|
151 | l.l = 0; |
|
|
152 | l.f = 0; |
143 | } |
153 | } |
144 | |
154 | |
145 | /* ------------------------------------------------------------------------- * |
155 | /* ------------------------------------------------------------------------- * |
146 | * SCREEN INITIALISATION * |
156 | * SCREEN INITIALISATION * |
147 | * ------------------------------------------------------------------------- */ |
157 | * ------------------------------------------------------------------------- */ |
|
|
158 | |
148 | void |
159 | void |
149 | rxvt_term::scr_reset () |
160 | rxvt_term::scr_reset () |
150 | { |
161 | { |
151 | unsigned int p, q; |
|
|
152 | int k; |
|
|
153 | |
|
|
154 | #if ENABLE_OVERLAY |
162 | #if ENABLE_OVERLAY |
155 | scr_overlay_off (); |
163 | scr_overlay_off (); |
156 | #endif |
164 | #endif |
157 | |
165 | |
158 | view_start = 0; |
166 | view_start = 0; |
… | |
… | |
168 | return; |
176 | return; |
169 | |
177 | |
170 | // we need at least two lines for wrapping to work correctly |
178 | // we need at least two lines for wrapping to work correctly |
171 | if (nrow + saveLines < 2) |
179 | if (nrow + saveLines < 2) |
172 | { |
180 | { |
|
|
181 | //TODO//FIXME |
173 | saveLines++; |
182 | saveLines++; |
174 | prev_nrow--; |
183 | prev_nrow--; |
175 | nscrolled++; |
184 | nsaved++; |
176 | } |
185 | } |
177 | |
186 | |
178 | want_refresh = 1; |
187 | want_refresh = 1; |
179 | |
188 | |
180 | int prev_total_rows = prev_nrow + saveLines; |
189 | int prev_total_rows = prev_nrow + saveLines; |
181 | int total_rows = nrow + saveLines; |
190 | total_rows = nrow + saveLines; |
182 | |
191 | |
183 | screen.tscroll = 0; |
192 | screen.tscroll = 0; |
184 | screen.bscroll = nrow - 1; |
193 | screen.bscroll = nrow - 1; |
185 | |
194 | |
186 | if (!save) |
195 | if (!row_buf) |
187 | { |
196 | { |
188 | /* |
197 | /* |
189 | * first time called so just malloc everything: don't rely on realloc |
198 | * 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 |
|
|
191 | */ |
199 | */ |
192 | nscrolled = 0; /* no saved lines */ |
200 | nsaved = 0; /* no saved lines */ |
193 | term_start = 0; |
201 | term_start = 0; |
194 | nsaved = 0; |
|
|
195 | |
202 | |
196 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
197 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
198 | |
205 | |
199 | save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
200 | buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
206 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
201 | drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); |
207 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
202 | swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); |
208 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
203 | |
209 | |
204 | screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *)); |
|
|
205 | |
|
|
206 | scr_update_term (); |
|
|
207 | |
|
|
208 | for (p = nrow; p--; ) |
210 | for (int row = nrow; row--; ) |
209 | { |
211 | { |
210 | scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE); |
212 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
211 | scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); |
213 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
212 | scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); |
214 | scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
213 | } |
215 | } |
214 | |
216 | |
215 | memset (charsets, 'B', sizeof (charsets)); |
217 | memset (charsets, 'B', sizeof (charsets)); |
216 | rstyle = DEFAULT_RSTYLE; |
218 | rstyle = DEFAULT_RSTYLE; |
217 | screen.flags = Screen_DefaultFlags; |
219 | screen.flags = Screen_DefaultFlags; |
… | |
… | |
241 | { |
243 | { |
242 | /* |
244 | /* |
243 | * add or delete rows as appropriate |
245 | * add or delete rows as appropriate |
244 | */ |
246 | */ |
245 | |
247 | |
246 | rxvt_salloc *old_ta; |
248 | rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
247 | rxvt_salloc *old_ra; |
249 | rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
248 | |
250 | |
|
|
251 | #if 0 |
249 | if (nrow < prev_nrow) |
252 | if (nrow < prev_nrow) |
250 | { |
253 | { |
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++) |
254 | for (int row = nrow; row < prev_nrow; row++) |
257 | { |
255 | { |
258 | lfree (save[p + saveLines]); |
|
|
259 | lfree (swap_save[p]); |
256 | lfree (swap_buf [row]); |
260 | lfree (drawn[p]); |
257 | lfree (drawn_buf[row]); |
261 | } |
258 | } |
|
|
259 | } |
|
|
260 | #endif |
262 | |
261 | |
263 | /* we have fewer rows so fix up cursor position */ |
262 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
264 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
263 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
265 | |
264 | |
266 | scr_reset_realloc (); /* realloc _last_ */ |
265 | for (int row = min (nrow, prev_nrow); row--; ) |
|
|
266 | { |
|
|
267 | lresize (drawn_buf[row]); |
|
|
268 | lresize (swap_buf [row]); |
|
|
269 | } |
|
|
270 | |
|
|
271 | for (int row = prev_nrow; row < nrow; row++) |
|
|
272 | { |
|
|
273 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
274 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
|
|
275 | } |
|
|
276 | |
|
|
277 | line_t *old_buf = row_buf; |
|
|
278 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
267 | } |
279 | |
268 | else if (nrow > prev_nrow) |
280 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
|
|
281 | int pend = MOD (term_start - nsaved , prev_total_rows); |
|
|
282 | int q = total_rows; // rewrapped row |
|
|
283 | |
|
|
284 | if (nsaved) |
|
|
285 | { |
|
|
286 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
|
|
287 | // to come up with a lean and mean algorithm. |
|
|
288 | |
|
|
289 | row_col_t ocur = screen.cur; |
|
|
290 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
|
|
291 | |
269 | { |
292 | 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 | { |
293 | { |
288 | swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); |
294 | 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 |
295 | #ifdef DEBUG_STRICT |
301 | assert (screen.cur.row < nrow); |
296 | 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 |
297 | #endif |
305 | ncol = ocol; // save b/c scr_blank_screen_mem uses this |
|
|
306 | } |
|
|
307 | |
|
|
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; |
298 | int plines = 1; |
|
|
299 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
352 | |
300 | |
353 | assert (llen >= 0); |
301 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
354 | |
|
|
355 | while (p && save[p - 1].l < 0) |
|
|
356 | { |
302 | { |
|
|
303 | p = MOD (p - 1, prev_total_rows); |
|
|
304 | |
357 | --p; |
305 | plines++; |
358 | llen += prev_ncol; |
306 | llen += prev_ncol; |
359 | } |
307 | } |
360 | |
308 | |
361 | int qlines = llen / ncol + 1; |
309 | int qlines = max (0, (llen - 1) / ncol) + 1; |
|
|
310 | |
|
|
311 | // drop partial lines completely |
|
|
312 | if (q < qlines) |
|
|
313 | break; |
|
|
314 | |
|
|
315 | q -= qlines; |
|
|
316 | |
362 | int lofs = 0; |
317 | int lofs = 0; |
|
|
318 | line_t *qline; |
363 | |
319 | |
364 | q -= qlines; |
320 | // 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++) |
321 | for (int qrow = q; qlines--; qrow++) |
370 | { |
322 | { |
|
|
323 | qline = row_buf + qrow; |
|
|
324 | lalloc (*qline); |
|
|
325 | qline->l = ncol; |
|
|
326 | qline->is_longer (1); |
|
|
327 | |
371 | if (qrow >= 0) |
328 | int qcol = 0; |
|
|
329 | |
|
|
330 | // fill a single destination line |
|
|
331 | while (lofs < llen && qcol < ncol) |
372 | { |
332 | { |
373 | tp [qrow] = (text_t *)ta->alloc (); |
|
|
374 | rp [qrow] = (rend_t *)ra->alloc (); |
|
|
375 | tl [qrow] = -1; |
|
|
376 | |
|
|
377 | int qcol = 0; |
|
|
378 | |
|
|
379 | for (;;) |
|
|
380 | { |
|
|
381 | int prow = lofs / prev_ncol + p; |
333 | int prow = lofs / prev_ncol; |
382 | int pcol = lofs % prev_ncol; |
334 | int pcol = lofs % prev_ncol; |
383 | |
335 | |
|
|
336 | prow = MOD (p + prow, prev_total_rows); |
|
|
337 | |
|
|
338 | // we only adjust the cursor _row_ and put it into |
|
|
339 | // the topmost line of "long line" it was in, as |
|
|
340 | // this seems to upset applications/shells/readline |
|
|
341 | // least. |
|
|
342 | if (prow == ocur.row) |
|
|
343 | screen.cur.row = q - (total_rows - nrow); |
|
|
344 | |
|
|
345 | line_t &pline = old_buf [prow]; |
|
|
346 | |
384 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
347 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
385 | |
348 | |
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); |
349 | assert (len); |
|
|
350 | assert (pline.t); |
400 | |
351 | |
401 | memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); |
352 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
402 | memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); |
353 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
403 | |
354 | |
404 | lofs += len; |
355 | lofs += len; |
405 | qcol += len; |
356 | qcol += len; |
406 | |
|
|
407 | if (qcol == ncol) |
|
|
408 | break; |
|
|
409 | } |
|
|
410 | } |
357 | } |
411 | else |
|
|
412 | lofs += ncol; |
|
|
413 | } |
358 | } |
|
|
359 | |
|
|
360 | qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; |
|
|
361 | qline->is_longer (0); |
|
|
362 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
414 | } |
363 | } |
|
|
364 | while (p != pend && q > 0); |
|
|
365 | |
|
|
366 | term_start = total_rows - nrow; |
|
|
367 | nsaved = term_start - q; |
|
|
368 | |
|
|
369 | // make sure all terminal lines exist |
|
|
370 | while (nsaved < 0) |
|
|
371 | scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); |
|
|
372 | } |
|
|
373 | else |
415 | } |
374 | { |
|
|
375 | // if no scrollback exists (yet), wing, instead of wrap |
|
|
376 | |
|
|
377 | for (int row = min (nrow, prev_nrow); row--; ) |
|
|
378 | { |
|
|
379 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
|
|
380 | line_t &qline = row_buf [row]; |
416 | |
381 | |
417 | free (screen.text); screen.text = tp; |
382 | qline = pline; |
418 | free (screen.rend); screen.rend = rp; |
383 | lresize (qline); |
419 | free (screen.tlen); screen.tlen = tl; |
384 | } |
420 | |
385 | |
421 | for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D |
386 | for (int row = prev_nrow; row < nrow; row++) |
|
|
387 | { |
|
|
388 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
|
|
389 | } |
|
|
390 | |
|
|
391 | term_start = 0; |
|
|
392 | } |
|
|
393 | |
|
|
394 | #ifdef DEBUG_STRICT //TODO: remove |
|
|
395 | for (int i = -nsaved; i < nrow; i++) |
|
|
396 | assert (ROW (i).t); |
422 | #endif |
397 | #endif |
|
|
398 | |
|
|
399 | free (old_buf); |
|
|
400 | delete old_ta; |
|
|
401 | delete old_ra; |
|
|
402 | |
|
|
403 | clamp_it (screen.cur.row, 0, nrow - 1); |
|
|
404 | clamp_it (screen.cur.col, 0, ncol - 1); |
423 | |
405 | |
424 | if (tabs) |
406 | if (tabs) |
425 | free (tabs); |
407 | free (tabs); |
426 | } |
408 | } |
427 | |
409 | |
428 | prev_nrow = nrow; |
410 | prev_nrow = nrow; |
429 | prev_ncol = ncol; |
411 | prev_ncol = ncol; |
430 | |
412 | |
431 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
413 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
432 | |
414 | |
433 | for (p = 0; p < ncol; p++) |
415 | for (int col = ncol; col--; ) |
434 | tabs[p] = (p % TABSIZE == 0) ? 1 : 0; |
416 | tabs [col] = col % TABSIZE == 0; |
435 | |
417 | |
436 | tt_winch (); |
418 | tt_winch (); |
437 | } |
|
|
438 | |
419 | |
439 | void |
420 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
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 | } |
421 | } |
450 | |
422 | |
451 | /* ------------------------------------------------------------------------- */ |
423 | /* ------------------------------------------------------------------------- */ |
452 | /* |
424 | /* |
453 | * Free everything. That way malloc debugging can find leakage. |
425 | * Free everything. That way malloc debugging can find leakage. |
454 | */ |
426 | */ |
455 | void |
427 | void |
456 | rxvt_term::scr_release () |
428 | rxvt_term::scr_release () |
457 | { |
429 | { |
458 | unsigned int total_rows; |
|
|
459 | |
|
|
460 | total_rows = nrow + saveLines; |
|
|
461 | |
|
|
462 | delete talloc; talloc = 0; |
430 | delete talloc; talloc = 0; |
463 | delete ralloc; ralloc = 0; |
431 | delete ralloc; ralloc = 0; |
464 | |
432 | |
465 | free (screen.line); |
433 | free (row_buf); |
466 | free (save); |
|
|
467 | free (swap_save); |
434 | free (swap_buf); |
468 | free (drawn); |
435 | free (drawn_buf); |
469 | free (buf); |
|
|
470 | free (tabs); |
436 | free (tabs); |
|
|
437 | |
|
|
438 | row_buf = 0; // signal that we freed all the arrays |
471 | } |
439 | } |
472 | |
440 | |
473 | /* ------------------------------------------------------------------------- */ |
441 | /* ------------------------------------------------------------------------- */ |
474 | /* |
442 | /* |
475 | * Hard reset |
443 | * Hard reset |
… | |
… | |
526 | set_font_style (); |
494 | set_font_style (); |
527 | break; |
495 | break; |
528 | } |
496 | } |
529 | |
497 | |
530 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
498 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
531 | MIN_IT (s->cur.row, nrow - 1); |
499 | min_it (s->cur.row, nrow - 1); |
532 | MIN_IT (s->cur.col, ncol - 1); |
500 | min_it (s->cur.col, ncol - 1); |
533 | #ifdef DEBUG_STRICT |
501 | #ifdef DEBUG_STRICT |
534 | assert (s->cur.row >= 0); |
502 | assert (s->cur.row >= 0); |
535 | assert (s->cur.col >= 0); |
503 | 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 |
504 | #endif |
540 | } |
505 | } |
541 | |
506 | |
542 | /* ------------------------------------------------------------------------- */ |
507 | /* ------------------------------------------------------------------------- */ |
543 | /* |
508 | /* |
… | |
… | |
546 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
511 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
547 | */ |
512 | */ |
548 | int |
513 | int |
549 | rxvt_term::scr_change_screen (int scrn) |
514 | rxvt_term::scr_change_screen (int scrn) |
550 | { |
515 | { |
551 | int i; |
|
|
552 | #if NSCREENS |
|
|
553 | int offset; |
|
|
554 | #endif |
|
|
555 | |
|
|
556 | want_refresh = 1; |
516 | want_refresh = 1; |
557 | |
|
|
558 | view_start = 0; |
517 | view_start = 0; |
559 | |
518 | |
560 | if (current_screen == scrn) |
519 | if (current_screen == scrn) |
561 | return scrn; |
520 | return scrn; |
562 | |
521 | |
563 | selection_check (2); /* check for boundary cross */ |
522 | selection_check (2); /* check for boundary cross */ |
564 | |
523 | |
565 | i = current_screen; current_screen = scrn; scrn = i; |
524 | int i = current_screen; current_screen = scrn; scrn = i; |
566 | |
525 | |
567 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
526 | ::swap (screen.cur.row, swap.cur.row); |
568 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
527 | ::swap (screen.cur.col, swap.cur.col); |
569 | MAX_IT (screen.cur.row, 0); |
528 | |
570 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
529 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
571 | MAX_IT (screen.cur.col, 0); |
530 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
572 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
|
|
573 | |
531 | |
574 | #if NSCREENS |
532 | #if NSCREENS |
575 | if (options & Opt_secondaryScreen) |
533 | if (OPTION (Opt_secondaryScreen)) |
576 | { |
534 | { |
577 | num_scr = 0; |
535 | num_scr = 0; |
578 | offset = saveLines; |
|
|
579 | |
536 | |
580 | for (i = prev_nrow; i--;) |
537 | for (int i = prev_nrow; i--; ) |
581 | SWAP_IT (*(screen.line[i]), swap_save[i], line_t); |
538 | ::swap (ROW(i), swap_buf [i]); |
582 | |
539 | |
583 | SWAP_IT (screen.charset, swap.charset, int16_t); |
540 | ::swap (screen.charset, swap.charset); |
584 | SWAP_IT (screen.flags, swap.flags, int); |
541 | ::swap (screen.flags, swap.flags); |
585 | screen.flags |= Screen_VisibleCursor; |
542 | screen.flags |= Screen_VisibleCursor; |
586 | swap.flags |= Screen_VisibleCursor; |
543 | swap.flags |= Screen_VisibleCursor; |
587 | } |
544 | } |
588 | else |
545 | else |
589 | #endif |
546 | #endif |
590 | if (options & Opt_secondaryScroll) |
547 | if (OPTION (Opt_secondaryScroll)) |
591 | scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); |
548 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
592 | |
549 | |
593 | return scrn; |
550 | return scrn; |
594 | } |
551 | } |
595 | |
552 | |
596 | // clear WrapNext indicator, solidifying position on next line |
553 | // clear WrapNext indicator, solidifying position on next line |
… | |
… | |
603 | screen.flags &= ~Screen_WrapNext; |
560 | screen.flags &= ~Screen_WrapNext; |
604 | |
561 | |
605 | screen.cur.col = 0; |
562 | screen.cur.col = 0; |
606 | |
563 | |
607 | if (screen.cur.row == screen.bscroll) |
564 | if (screen.cur.row == screen.bscroll) |
608 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
565 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
609 | else if (screen.cur.row < nrow - 1) |
566 | else if (screen.cur.row < nrow - 1) |
610 | screen.cur.row++; |
567 | screen.cur.row++; |
611 | } |
568 | } |
612 | |
569 | |
613 | /* ------------------------------------------------------------------------- */ |
570 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
639 | rstyle = DEFAULT_RSTYLE; |
596 | rstyle = DEFAULT_RSTYLE; |
640 | else |
597 | else |
641 | rstyle &= ~style; |
598 | rstyle &= ~style; |
642 | } |
599 | } |
643 | |
600 | |
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 | /* ------------------------------------------------------------------------- */ |
601 | /* ------------------------------------------------------------------------- */ |
653 | /* |
602 | /* |
654 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
603 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
655 | * count positive ==> scroll up |
604 | * count positive ==> scroll up |
656 | * count negative ==> scroll down |
605 | * count negative ==> scroll down |
657 | * spec == 0 for normal routines |
|
|
658 | */ |
606 | */ |
659 | int |
607 | int |
660 | rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) |
608 | rxvt_term::scr_scroll_text (int row1, int row2, int count) |
661 | { |
609 | { |
662 | int i, j; |
|
|
663 | |
|
|
664 | if (count == 0 || (row1 > row2)) |
610 | if (count == 0 || (row1 > row2)) |
665 | return 0; |
611 | return 0; |
666 | |
612 | |
667 | want_refresh = 1; |
613 | want_refresh = 1; |
|
|
614 | num_scr += count; |
668 | |
615 | |
669 | if (row1 == 0 && count > 0 |
616 | if (count > 0 |
|
|
617 | && row1 == 0 |
|
|
618 | && row2 == nrow - 1 |
670 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
619 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
671 | { |
620 | { |
672 | nscrolled += count; |
621 | nsaved = min (nsaved + count, saveLines); |
673 | |
622 | |
674 | if (nscrolled > saveLines) |
623 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); |
675 | nscrolled = saveLines; |
624 | |
|
|
625 | term_start = (term_start + count) % total_rows; |
676 | |
626 | |
|
|
627 | if (selection.op && current_screen == selection.screen) |
|
|
628 | { |
|
|
629 | selection.beg.row -= count; |
|
|
630 | selection.end.row -= count; |
|
|
631 | selection.mark.row -= count; |
|
|
632 | |
|
|
633 | if (selection.beg.row < -nsaved |
|
|
634 | || selection.end.row < -nsaved |
|
|
635 | || selection.mark.row < -nsaved) |
|
|
636 | { |
|
|
637 | CLEAR_ALL_SELECTION (); |
|
|
638 | selection.op = SELECTION_CLEAR; |
|
|
639 | } |
|
|
640 | } |
|
|
641 | |
|
|
642 | for (int i = count; i--; ) |
|
|
643 | { |
|
|
644 | // basically thi is a slightly optimized scr_blank_screen_mem |
|
|
645 | // it is worth the effort on slower machines |
|
|
646 | line_t &l = ROW(row2 - i); |
|
|
647 | |
|
|
648 | scr_blank_line (l, 0, l.l, rstyle); |
|
|
649 | |
|
|
650 | l.l = 0; |
|
|
651 | l.f = 0; |
|
|
652 | } |
|
|
653 | |
677 | if ((options & Opt_scrollWithBuffer) |
654 | if (OPTION (Opt_scrollWithBuffer) |
678 | && view_start != 0 |
655 | && view_start != 0 |
679 | && view_start != saveLines) |
656 | && view_start != saveLines) |
680 | scr_page (UP, count); |
657 | scr_page (UP, count); |
681 | } |
658 | } |
682 | else if (!spec) |
659 | else |
683 | row1 += saveLines; |
660 | { |
684 | |
|
|
685 | row2 += saveLines; |
|
|
686 | |
|
|
687 | if (selection.op && current_screen == selection.screen) |
661 | if (selection.op && current_screen == selection.screen) |
688 | { |
662 | { |
689 | i = selection.beg.row + saveLines; |
663 | if ((selection.beg.row < row1 && selection.end.row > row1) |
690 | j = selection.end.row + saveLines; |
664 | || (selection.beg.row < row2 && selection.end.row > row2) |
691 | |
665 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
692 | if ((i < row1 && j > row1) |
666 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
693 | || (i < row2 && j > row2) |
667 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
694 | || (i - count < row1 && i >= row1) |
668 | || (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 | { |
669 | { |
699 | CLEAR_ALL_SELECTION (); |
670 | CLEAR_ALL_SELECTION (); |
700 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
671 | selection.op = SELECTION_CLEAR; |
701 | } |
672 | } |
702 | else if (j >= row1 && j <= row2) |
673 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
703 | { |
674 | { |
704 | /* move selected region too */ |
675 | /* move selected region too */ |
705 | selection.beg.row -= count; |
676 | selection.beg.row -= count; |
706 | selection.end.row -= count; |
677 | selection.end.row -= count; |
707 | selection.mark.row -= count; |
678 | selection.mark.row -= count; |
|
|
679 | |
|
|
680 | selection_check (0); |
|
|
681 | } |
|
|
682 | } |
|
|
683 | |
|
|
684 | // use a simple and robust scrolling algorithm, this |
|
|
685 | // part of scr_scroll_text is not time-critical. |
|
|
686 | |
|
|
687 | int rows = row2 - row1 + 1; |
|
|
688 | |
|
|
689 | min_it (count, rows); |
|
|
690 | |
|
|
691 | line_t *temp_buf = row_buf + total_rows; |
|
|
692 | |
|
|
693 | for (int row = 0; row < rows; row++) |
708 | } |
694 | { |
709 | } |
695 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
710 | |
696 | |
711 | selection_check (0); /* _after_ nscrolled update */ |
697 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
|
|
698 | scr_blank_screen_mem (temp_buf [row], rstyle); |
|
|
699 | } |
712 | |
700 | |
713 | num_scr += count; |
701 | for (int row = 0; row < rows; row++) |
714 | j = count; |
702 | 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 | { |
703 | } |
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 | |
704 | |
760 | return count; |
705 | return count; |
761 | } |
706 | } |
762 | |
707 | |
763 | /* ------------------------------------------------------------------------- */ |
708 | /* ------------------------------------------------------------------------- */ |
764 | /* |
709 | /* |
765 | * Add text given in <str> of length <len> to screen struct |
710 | * Add text given in <str> of length <len> to screen struct |
766 | */ |
711 | */ |
767 | void |
712 | void |
768 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
713 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) |
769 | { |
714 | { |
770 | if (len <= 0) /* sanity */ |
715 | if (len <= 0) /* sanity */ |
771 | return; |
716 | return; |
772 | |
717 | |
773 | unsigned char checksel; |
718 | unsigned char checksel; |
774 | unicode_t c; |
719 | unicode_t c; |
775 | int row, last_col; |
720 | int ncol = this->ncol; |
776 | const unicode_t *strend = str + len; |
721 | const wchar_t *strend = str + len; |
777 | |
722 | |
778 | want_refresh = 1; |
723 | want_refresh = 1; |
779 | ZERO_SCROLLBACK (); |
724 | ZERO_SCROLLBACK (); |
780 | last_col = ncol; |
|
|
781 | |
725 | |
782 | if (nlines > 0) |
726 | if (minlines > 0) |
783 | { |
727 | { |
784 | nlines += screen.cur.row - screen.bscroll; |
728 | minlines += screen.cur.row - screen.bscroll; |
|
|
729 | |
785 | if ((nlines > 0) |
730 | if (minlines > 0 |
786 | && (screen.tscroll == 0) |
731 | && screen.tscroll == 0 |
787 | && (screen.bscroll == (nrow - 1))) |
732 | && screen.bscroll == nrow - 1) |
788 | { |
733 | { |
789 | /* _at least_ this many lines need to be scrolled */ |
734 | /* _at least_ this many lines need to be scrolled */ |
790 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
735 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
791 | screen.cur.row -= nlines; |
736 | screen.cur.row -= minlines; |
792 | } |
737 | } |
793 | } |
738 | } |
794 | |
739 | |
795 | #ifdef DEBUG_STRICT |
740 | #ifdef DEBUG_STRICT |
796 | assert (screen.cur.col < last_col); |
741 | assert (screen.cur.col < ncol); |
797 | assert ((screen.cur.row < nrow) |
742 | assert (screen.cur.row < nrow |
798 | && (screen.cur.row >= - (int32_t)nscrolled)); |
743 | && 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 |
744 | #endif |
804 | row = screen.cur.row + saveLines; |
745 | int row = screen.cur.row; |
805 | |
746 | |
806 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
747 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
807 | |
748 | |
808 | line_t *line = save + row; |
749 | line_t *line = &ROW(row); |
809 | |
750 | |
810 | while (str < strend) |
751 | while (str < strend) |
811 | { |
752 | { |
812 | c = *str++; |
753 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
813 | |
754 | |
814 | if (c < 0x20) |
755 | if (c < 0x20) |
815 | if (c == C0_LF) |
756 | if (c == C0_LF) |
816 | { |
757 | { |
817 | if (line->l != -1) /* XXX: think about this */ |
|
|
818 | MAX_IT (line->l, screen.cur.col); |
758 | max_it (line->l, screen.cur.col); |
819 | |
759 | |
820 | screen.flags &= ~Screen_WrapNext; |
760 | screen.flags &= ~Screen_WrapNext; |
821 | |
761 | |
822 | if (screen.cur.row == screen.bscroll) |
762 | if (screen.cur.row == screen.bscroll) |
823 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
763 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
824 | else if (screen.cur.row < (nrow - 1)) |
764 | else if (screen.cur.row < (nrow - 1)) |
825 | row = (++screen.cur.row) + saveLines; |
765 | row = ++screen.cur.row; |
826 | |
766 | |
827 | line = save + row; /* _must_ refresh */ |
767 | line = &ROW(row); /* _must_ refresh */ |
828 | continue; |
768 | continue; |
829 | } |
769 | } |
830 | else if (c == C0_CR) |
770 | else if (c == C0_CR) |
831 | { |
771 | { |
832 | if (line->l != -1) /* XXX: think about this */ |
|
|
833 | MAX_IT (line->l, screen.cur.col); |
772 | max_it (line->l, screen.cur.col); |
834 | |
773 | |
835 | screen.flags &= ~Screen_WrapNext; |
774 | screen.flags &= ~Screen_WrapNext; |
836 | screen.cur.col = 0; |
775 | screen.cur.col = 0; |
837 | continue; |
776 | continue; |
838 | } |
777 | } |
… | |
… | |
855 | CLEAR_SELECTION (); |
794 | CLEAR_SELECTION (); |
856 | } |
795 | } |
857 | |
796 | |
858 | if (screen.flags & Screen_WrapNext) |
797 | if (screen.flags & Screen_WrapNext) |
859 | { |
798 | { |
860 | line->l = -1; |
799 | max_it (line->l, ncol); |
|
|
800 | line->is_longer (1); |
861 | |
801 | |
862 | scr_do_wrap (); |
802 | scr_do_wrap (); |
863 | |
803 | |
864 | row = screen.cur.row + saveLines; |
804 | row = screen.cur.row; |
865 | line = save + row; /* _must_ refresh */ |
805 | line = &ROW(row); /* _must_ refresh */ |
866 | } |
806 | } |
867 | |
807 | |
868 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
808 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
869 | if (IN_RANGE (c, 0xd800, 0xdfff)) |
809 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
870 | c = 0xfffd; |
810 | c = 0xfffd; |
871 | |
811 | |
872 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
812 | // 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 |
813 | // 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 |
814 | // for the line drawing characters below as they might be invalid in the current |
875 | // locale. |
815 | // locale. |
876 | int width = c < 0x100 ? 1 : wcwidth (c); |
816 | int width = c < 0x100 ? 1 : wcwidth (c); |
877 | |
817 | |
878 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
818 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
879 | { |
819 | { |
880 | // vt100 special graphics and line drawing |
820 | // vt100 special graphics and line drawing |
881 | // 5f-7e standard vt100 |
821 | // 5f-7e standard vt100 |
882 | // 40-5e rxvt extension for extra curses acs chars |
822 | // 40-5e rxvt extension for extra curses acs chars |
883 | static uint16_t vt100_0[62] = { // 41 .. 7e |
823 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
935 | } |
875 | } |
936 | |
876 | |
937 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
877 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
938 | |
878 | |
939 | // if the character doesn't fit into the remaining columns... |
879 | // if the character doesn't fit into the remaining columns... |
940 | if (screen.cur.col > last_col - width && last_col >= width) |
880 | if (screen.cur.col > ncol - width && ncol >= width) |
941 | { |
881 | { |
942 | // ...output spaces |
882 | // ...output spaces |
943 | c = ' '; |
883 | c = ' '; |
944 | // and try the same character next loop iteration |
884 | // and try the same character next loop iteration |
945 | --str; |
885 | --str; |
946 | } |
886 | } |
947 | |
887 | |
|
|
888 | line->touch (); |
|
|
889 | |
948 | do |
890 | do |
949 | { |
891 | { |
950 | line->t[screen.cur.col] = c; |
892 | line->t[screen.cur.col] = c; |
951 | line->r[screen.cur.col] = rend; |
893 | line->r[screen.cur.col] = rend; |
952 | |
894 | |
953 | if (screen.cur.col < last_col - 1) |
895 | if (screen.cur.col < ncol - 1) |
954 | screen.cur.col++; |
896 | screen.cur.col++; |
955 | else |
897 | else |
956 | { |
898 | { |
957 | line->l = last_col; |
899 | line->l = ncol; |
958 | if (screen.flags & Screen_Autowrap) |
900 | if (screen.flags & Screen_Autowrap) |
959 | screen.flags |= Screen_WrapNext; |
901 | screen.flags |= Screen_WrapNext; |
960 | break; |
902 | break; |
961 | } |
903 | } |
962 | |
904 | |
… | |
… | |
964 | } |
906 | } |
965 | while (--width > 0); |
907 | while (--width > 0); |
966 | |
908 | |
967 | // pad with spaces when overwriting wide character with smaller one |
909 | // pad with spaces when overwriting wide character with smaller one |
968 | if (!width) |
910 | if (!width) |
|
|
911 | { |
|
|
912 | line->touch (); |
|
|
913 | |
969 | for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) |
914 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
970 | { |
915 | { |
971 | line->t[c] = ' '; |
916 | line->t[c] = ' '; |
972 | line->r[c] = rend; |
917 | line->r[c] = rend; |
973 | } |
918 | } |
|
|
919 | } |
974 | } |
920 | } |
975 | else // width == 0 |
921 | else // width == 0 |
976 | { |
922 | { |
977 | #if ENABLE_COMBINING |
923 | #if ENABLE_COMBINING |
978 | // handle combining characters |
924 | // handle combining characters |
979 | // we just tag the accent on the previous on-screen character. |
925 | // we just tag the accent on the previous on-screen character. |
980 | // this is arguably not correct, but also arguably not wrong. |
926 | // this is arguably not correct, but also arguably not wrong. |
981 | // we don't handle double-width characters nicely yet. |
927 | // we don't handle double-width characters nicely yet. |
|
|
928 | line_t *linep; |
982 | text_t *tp; |
929 | text_t *tp; |
983 | rend_t *rp; |
930 | rend_t *rp; |
984 | |
931 | |
985 | if (screen.cur.col > 0) |
932 | if (screen.cur.col > 0) |
986 | { |
933 | { |
|
|
934 | linep = line; |
987 | tp = line->t + screen.cur.col - 1; |
935 | tp = line->t + screen.cur.col - 1; |
988 | rp = line->r + screen.cur.col - 1; |
936 | rp = line->r + screen.cur.col - 1; |
989 | |
|
|
990 | while (*tp == NOCHAR && tp > line->t) |
|
|
991 | tp--, rp--; |
|
|
992 | } |
937 | } |
993 | else if (screen.cur.row > 0 |
938 | else if (screen.cur.row > 0 |
994 | && save [screen.cur.row - 1 + saveLines].is_cont ()) |
939 | && ROW(screen.cur.row - 1).is_longer ()) |
995 | { |
940 | { |
996 | line_t *line = save + (screen.cur.row - 1 + saveLines); |
941 | linep = &ROW(screen.cur.row - 1); |
997 | |
|
|
998 | tp = line->t + last_col - 1; |
942 | tp = line->t + ncol - 1; |
999 | rp = line->r + last_col - 1; |
943 | rp = line->r + ncol - 1; |
1000 | |
|
|
1001 | while (*tp == NOCHAR && tp > line->t) |
|
|
1002 | tp--, rp--; |
|
|
1003 | } |
944 | } |
1004 | else |
945 | else |
1005 | continue; |
946 | continue; |
|
|
947 | |
|
|
948 | linep->touch (); |
|
|
949 | |
|
|
950 | while (*tp == NOCHAR && tp > linep->t) |
|
|
951 | tp--, rp--; |
1006 | |
952 | |
1007 | // first try to find a precomposed character |
953 | // first try to find a precomposed character |
1008 | unicode_t n = rxvt_compose (*tp, c); |
954 | unicode_t n = rxvt_compose (*tp, c); |
1009 | if (n == NOCHAR) |
955 | if (n == NOCHAR) |
1010 | n = rxvt_composite.compose (*tp, c); |
956 | n = rxvt_composite.compose (*tp, c); |
… | |
… | |
1013 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
959 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
1014 | #endif |
960 | #endif |
1015 | } |
961 | } |
1016 | } |
962 | } |
1017 | |
963 | |
1018 | if (line->l != -1) /* XXX: think about this */ |
|
|
1019 | MAX_IT (line->l, screen.cur.col); |
964 | max_it (line->l, screen.cur.col); |
1020 | |
965 | |
1021 | #ifdef DEBUG_STRICT |
966 | #ifdef DEBUG_STRICT |
1022 | assert (screen.cur.row >= 0); |
967 | assert (screen.cur.row >= 0); |
1023 | #else /* drive with your eyes closed */ |
|
|
1024 | MAX_IT (screen.cur.row, 0); |
|
|
1025 | #endif |
968 | #endif |
1026 | } |
969 | } |
1027 | |
970 | |
1028 | /* ------------------------------------------------------------------------- */ |
971 | /* ------------------------------------------------------------------------- */ |
1029 | /* |
972 | /* |
… | |
… | |
1068 | |
1011 | |
1069 | if (count == 0) |
1012 | if (count == 0) |
1070 | return; |
1013 | return; |
1071 | else if (count > 0) |
1014 | else if (count > 0) |
1072 | { |
1015 | { |
1073 | int row = saveLines + screen.cur.row; |
1016 | line_t &l = ROW(screen.cur.row); |
1074 | |
|
|
1075 | line_t &l = save[row]; |
|
|
1076 | rend_t base_rend = l.r[i]; |
1017 | rend_t base_rend = l.r[i]; |
1077 | ht &= l.t[i] == ' '; |
1018 | ht &= l.t[i] == ' '; |
1078 | |
1019 | |
1079 | for (; ++i < ncol; ) |
1020 | for (; ++i < ncol; ) |
1080 | if (tabs[i]) |
1021 | if (tabs[i]) |
1081 | { |
1022 | { |
1082 | x = i; |
1023 | x = i; |
|
|
1024 | |
1083 | if (!--count) |
1025 | if (!--count) |
1084 | break; |
1026 | break; |
1085 | } |
1027 | } |
1086 | else |
1028 | else |
1087 | ht &= l.t[i] == ' ' |
1029 | ht &= l.t[i] == ' ' |
… | |
… | |
1090 | if (count) |
1032 | if (count) |
1091 | x = ncol - 1; |
1033 | x = ncol - 1; |
1092 | |
1034 | |
1093 | // store horizontal tab commands as characters inside the text |
1035 | // store horizontal tab commands as characters inside the text |
1094 | // buffer so they can be selected and pasted. |
1036 | // buffer so they can be selected and pasted. |
1095 | if (ht && options & Opt_pastableTabs) |
1037 | if (ht && OPTION (Opt_pastableTabs)) |
1096 | { |
1038 | { |
1097 | base_rend = SET_FONT (base_rend, 0); |
1039 | base_rend = SET_FONT (base_rend, 0); |
1098 | |
1040 | |
1099 | if (l.l != -1) /* XXX: think about this */ |
1041 | l.touch (x); |
1100 | MAX_IT (l.l, x); |
|
|
1101 | |
1042 | |
1102 | i = screen.cur.col; |
1043 | i = screen.cur.col; |
1103 | |
1044 | |
1104 | l.t[i] = '\t'; |
1045 | l.t[i] = '\t'; |
1105 | l.r[i] = base_rend; |
1046 | l.r[i] = base_rend; |
… | |
… | |
1141 | rxvt_term::scr_backindex () |
1082 | rxvt_term::scr_backindex () |
1142 | { |
1083 | { |
1143 | if (screen.cur.col > 0) |
1084 | if (screen.cur.col > 0) |
1144 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1085 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1145 | else |
1086 | else |
1146 | { |
|
|
1147 | if (save[screen.cur.row + saveLines].l == 0) |
|
|
1148 | return; /* um, yeah? */ |
|
|
1149 | |
|
|
1150 | scr_insdel_chars (1, INSERT); |
1087 | scr_insdel_chars (1, INSERT); |
1151 | } |
|
|
1152 | } |
1088 | } |
1153 | #endif |
1089 | #endif |
1154 | /* ------------------------------------------------------------------------- */ |
1090 | /* ------------------------------------------------------------------------- */ |
1155 | /* |
1091 | /* |
1156 | * Process DEC Forward Index |
1092 | * Process DEC Forward Index |
… | |
… | |
1160 | */ |
1096 | */ |
1161 | #if ENABLE_FRILLS |
1097 | #if ENABLE_FRILLS |
1162 | void |
1098 | void |
1163 | rxvt_term::scr_forwardindex () |
1099 | rxvt_term::scr_forwardindex () |
1164 | { |
1100 | { |
1165 | int row; |
|
|
1166 | |
|
|
1167 | if (screen.cur.col < ncol - 1) |
1101 | if (screen.cur.col < ncol - 1) |
1168 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1102 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1169 | else |
1103 | else |
1170 | { |
1104 | { |
1171 | row = screen.cur.row + saveLines; |
1105 | line_t &l = ROW(screen.cur.row); |
1172 | |
1106 | |
1173 | if (save[row].l == 0) |
1107 | l.touch (); |
1174 | return; /* um, yeah? */ |
1108 | l.is_longer (0); |
1175 | else if (save[row].is_cont ()) |
|
|
1176 | save[row].l = ncol; |
|
|
1177 | |
1109 | |
1178 | scr_gotorc (0, 0, R_RELATIVE); |
1110 | scr_gotorc (0, 0, R_RELATIVE); |
1179 | scr_insdel_chars (1, DELETE); |
1111 | scr_insdel_chars (1, DELETE); |
1180 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1112 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1181 | } |
1113 | } |
… | |
… | |
1191 | { |
1123 | { |
1192 | want_refresh = 1; |
1124 | want_refresh = 1; |
1193 | ZERO_SCROLLBACK (); |
1125 | ZERO_SCROLLBACK (); |
1194 | |
1126 | |
1195 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1127 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1196 | MAX_IT (screen.cur.col, 0); |
1128 | clamp_it (screen.cur.col, 0, ncol - 1); |
1197 | MIN_IT (screen.cur.col, (int32_t)ncol - 1); |
|
|
1198 | |
1129 | |
1199 | screen.flags &= ~Screen_WrapNext; |
1130 | screen.flags &= ~Screen_WrapNext; |
1200 | |
1131 | |
1201 | if (relative & R_RELATIVE) |
1132 | if (relative & R_RELATIVE) |
1202 | { |
1133 | { |
… | |
… | |
1220 | else |
1151 | else |
1221 | { |
1152 | { |
1222 | if (screen.flags & Screen_Relative) |
1153 | if (screen.flags & Screen_Relative) |
1223 | { /* relative origin mode */ |
1154 | { /* relative origin mode */ |
1224 | screen.cur.row = row + screen.tscroll; |
1155 | screen.cur.row = row + screen.tscroll; |
1225 | MIN_IT (screen.cur.row, screen.bscroll); |
1156 | min_it (screen.cur.row, screen.bscroll); |
1226 | } |
1157 | } |
1227 | else |
1158 | else |
1228 | screen.cur.row = row; |
1159 | screen.cur.row = row; |
1229 | } |
1160 | } |
1230 | |
1161 | |
1231 | MAX_IT (screen.cur.row, 0); |
1162 | clamp_it (screen.cur.row, 0, nrow - 1); |
1232 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
|
|
1233 | } |
1163 | } |
1234 | |
1164 | |
1235 | /* ------------------------------------------------------------------------- */ |
1165 | /* ------------------------------------------------------------------------- */ |
1236 | /* |
1166 | /* |
1237 | * direction should be UP or DN |
1167 | * direction should be UP or DN |
… | |
… | |
1248 | |
1178 | |
1249 | screen.flags &= ~Screen_WrapNext; |
1179 | screen.flags &= ~Screen_WrapNext; |
1250 | |
1180 | |
1251 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1181 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1252 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1182 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1253 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1183 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn); |
1254 | else |
1184 | else |
1255 | screen.cur.row += dirn; |
1185 | screen.cur.row += dirn; |
1256 | |
1186 | |
1257 | MAX_IT (screen.cur.row, 0); |
1187 | clamp_it (screen.cur.row, 0, nrow - 1); |
1258 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
|
|
1259 | selection_check (0); |
1188 | selection_check (0); |
1260 | } |
1189 | } |
1261 | |
1190 | |
1262 | /* ------------------------------------------------------------------------- */ |
1191 | /* ------------------------------------------------------------------------- */ |
1263 | /* |
1192 | /* |
… | |
… | |
1267 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1196 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1268 | */ |
1197 | */ |
1269 | void |
1198 | void |
1270 | rxvt_term::scr_erase_line (int mode) |
1199 | rxvt_term::scr_erase_line (int mode) |
1271 | { |
1200 | { |
1272 | unsigned int row, col, num; |
1201 | unsigned int col, num; |
1273 | |
1202 | |
1274 | want_refresh = 1; |
1203 | want_refresh = 1; |
1275 | ZERO_SCROLLBACK (); |
1204 | ZERO_SCROLLBACK (); |
1276 | |
1205 | |
1277 | selection_check (1); |
1206 | selection_check (1); |
1278 | |
1207 | |
1279 | row = saveLines + screen.cur.row; |
1208 | line_t &line = ROW(screen.cur.row); |
|
|
1209 | |
|
|
1210 | line.touch (); |
|
|
1211 | line.is_longer (0); |
1280 | |
1212 | |
1281 | switch (mode) |
1213 | switch (mode) |
1282 | { |
1214 | { |
1283 | case 0: /* erase to end of line */ |
1215 | case 0: /* erase to end of line */ |
1284 | col = screen.cur.col; |
1216 | col = screen.cur.col; |
1285 | num = ncol - col; |
1217 | num = ncol - col; |
1286 | MIN_IT (save[row].l, (int16_t)col); |
1218 | min_it (line.l, col); |
1287 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1219 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1288 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1220 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1289 | CLEAR_SELECTION (); |
1221 | CLEAR_SELECTION (); |
1290 | break; |
1222 | break; |
1291 | case 1: /* erase to beginning of line */ |
1223 | case 1: /* erase to beginning of line */ |
… | |
… | |
1296 | CLEAR_SELECTION (); |
1228 | CLEAR_SELECTION (); |
1297 | break; |
1229 | break; |
1298 | case 2: /* erase whole line */ |
1230 | case 2: /* erase whole line */ |
1299 | col = 0; |
1231 | col = 0; |
1300 | num = ncol; |
1232 | num = ncol; |
1301 | save[row].l = 0; |
1233 | line.l = 0; |
1302 | if (selection.beg.row <= screen.cur.row |
1234 | if (selection.beg.row <= screen.cur.row |
1303 | && selection.end.row >= screen.cur.row) |
1235 | && selection.end.row >= screen.cur.row) |
1304 | CLEAR_SELECTION (); |
1236 | CLEAR_SELECTION (); |
1305 | break; |
1237 | break; |
1306 | default: |
1238 | default: |
1307 | return; |
1239 | return; |
1308 | } |
1240 | } |
1309 | |
1241 | |
1310 | if (save[row].t) |
|
|
1311 | scr_blank_line (save[row], col, num, rstyle); |
1242 | scr_blank_line (line, col, num, rstyle); |
1312 | else |
|
|
1313 | scr_blank_screen_mem (save[row], rstyle); |
|
|
1314 | } |
1243 | } |
1315 | |
1244 | |
1316 | /* ------------------------------------------------------------------------- */ |
1245 | /* ------------------------------------------------------------------------- */ |
1317 | /* |
1246 | /* |
1318 | * Erase part of whole of the screen |
1247 | * Erase part of whole of the screen |
… | |
… | |
1322 | */ |
1251 | */ |
1323 | void |
1252 | void |
1324 | rxvt_term::scr_erase_screen (int mode) |
1253 | rxvt_term::scr_erase_screen (int mode) |
1325 | { |
1254 | { |
1326 | int num; |
1255 | int num; |
1327 | int32_t row, row_offset; |
1256 | int32_t row; |
1328 | rend_t ren; |
1257 | rend_t ren; |
1329 | XGCValues gcvalue; |
1258 | XGCValues gcvalue; |
1330 | |
1259 | |
1331 | want_refresh = 1; |
1260 | want_refresh = 1; |
1332 | ZERO_SCROLLBACK (); |
1261 | ZERO_SCROLLBACK (); |
1333 | |
|
|
1334 | row_offset = (int32_t)saveLines; |
|
|
1335 | |
1262 | |
1336 | switch (mode) |
1263 | switch (mode) |
1337 | { |
1264 | { |
1338 | case 0: /* erase to end of screen */ |
1265 | case 0: /* erase to end of screen */ |
1339 | selection_check (1); |
1266 | selection_check (1); |
… | |
… | |
1363 | CLEAR_SELECTION (); |
1290 | CLEAR_SELECTION (); |
1364 | |
1291 | |
1365 | if (row >= nrow) /* Out Of Bounds */ |
1292 | if (row >= nrow) /* Out Of Bounds */ |
1366 | return; |
1293 | return; |
1367 | |
1294 | |
1368 | MIN_IT (num, (nrow - row)); |
1295 | min_it (num, nrow - row); |
1369 | |
1296 | |
1370 | if (rstyle & (RS_RVid | RS_Uline)) |
1297 | if (rstyle & (RS_RVid | RS_Uline)) |
1371 | ren = (rend_t) ~RS_None; |
1298 | ren = (rend_t) ~RS_None; |
1372 | else if (GET_BASEBG (rstyle) == Color_bg) |
1299 | else if (GET_BASEBG (rstyle) == Color_bg) |
1373 | { |
1300 | { |
… | |
… | |
1375 | CLEAR_ROWS (row, num); |
1302 | CLEAR_ROWS (row, num); |
1376 | } |
1303 | } |
1377 | else |
1304 | else |
1378 | { |
1305 | { |
1379 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1306 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1380 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1307 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1381 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1308 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1382 | ERASE_ROWS (row, num); |
1309 | ERASE_ROWS (row, num); |
1383 | gcvalue.foreground = pix_colors[Color_fg]; |
1310 | gcvalue.foreground = pix_colors[Color_fg]; |
1384 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1311 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1385 | } |
1312 | } |
1386 | |
1313 | |
1387 | for (; num--; row++) |
1314 | for (; num--; row++) |
1388 | { |
1315 | { |
1389 | scr_blank_screen_mem (save[row + row_offset], rstyle); |
1316 | scr_blank_screen_mem (ROW(row), rstyle); |
1390 | save[row + row_offset].l = 0; |
|
|
1391 | scr_blank_line (drawn[row], 0, ncol, ren); |
1317 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1392 | } |
1318 | } |
1393 | } |
1319 | } |
1394 | |
1320 | |
1395 | #if ENABLE_FRILLS |
1321 | #if ENABLE_FRILLS |
1396 | void |
1322 | void |
1397 | rxvt_term::scr_erase_savelines () |
1323 | rxvt_term::scr_erase_savelines () |
1398 | { |
1324 | { |
1399 | want_refresh = 1; |
1325 | want_refresh = 1; |
1400 | ZERO_SCROLLBACK (); |
1326 | ZERO_SCROLLBACK (); |
1401 | |
1327 | |
1402 | nscrolled = 0; |
1328 | nsaved = 0; |
1403 | } |
1329 | } |
1404 | #endif |
1330 | #endif |
1405 | |
1331 | |
1406 | /* ------------------------------------------------------------------------- */ |
1332 | /* ------------------------------------------------------------------------- */ |
1407 | /* |
1333 | /* |
… | |
… | |
1409 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1335 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1410 | */ |
1336 | */ |
1411 | void |
1337 | void |
1412 | rxvt_term::scr_E () |
1338 | rxvt_term::scr_E () |
1413 | { |
1339 | { |
1414 | int i, j, k; |
|
|
1415 | rend_t *r1, fs; |
1340 | rend_t fs; |
1416 | |
1341 | |
1417 | want_refresh = 1; |
1342 | want_refresh = 1; |
1418 | ZERO_SCROLLBACK (); |
1343 | ZERO_SCROLLBACK (); |
1419 | |
1344 | |
1420 | num_scr_allow = 0; |
1345 | num_scr_allow = 0; |
1421 | selection_check (3); |
1346 | selection_check (3); |
1422 | |
1347 | |
1423 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1348 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1424 | for (k = saveLines, i = nrow; i--; k++) |
1349 | for (int row = nrow; row--; ) |
1425 | { |
1350 | { |
1426 | save[k].l = ncol; /* make the `E's selectable */ |
1351 | line_t &line = ROW(row); |
|
|
1352 | |
1427 | fill_text (save[k].t, 'E', ncol); |
1353 | fill_text (line.t, 'E', ncol); |
1428 | for (r1 = save[k].r, j = ncol; j--; ) |
1354 | rend_t *r1 = line.r; |
|
|
1355 | |
|
|
1356 | for (int j = ncol; j--; ) |
1429 | *r1++ = fs; |
1357 | *r1++ = fs; |
|
|
1358 | |
|
|
1359 | line.is_longer (0); |
|
|
1360 | line.touch (ncol); |
1430 | } |
1361 | } |
1431 | } |
1362 | } |
1432 | |
1363 | |
1433 | /* ------------------------------------------------------------------------- */ |
1364 | /* ------------------------------------------------------------------------- */ |
1434 | /* |
1365 | /* |
… | |
… | |
1455 | count = end; |
1386 | count = end; |
1456 | } |
1387 | } |
1457 | |
1388 | |
1458 | scr_do_wrap (); |
1389 | scr_do_wrap (); |
1459 | |
1390 | |
1460 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); |
1391 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count); |
1461 | } |
1392 | } |
1462 | |
1393 | |
1463 | /* ------------------------------------------------------------------------- */ |
1394 | /* ------------------------------------------------------------------------- */ |
1464 | /* |
1395 | /* |
1465 | * Insert/Delete <count> characters from the current position |
1396 | * Insert/Delete <count> characters from the current position |
… | |
… | |
1477 | return; |
1408 | return; |
1478 | |
1409 | |
1479 | scr_do_wrap (); |
1410 | scr_do_wrap (); |
1480 | |
1411 | |
1481 | selection_check (1); |
1412 | selection_check (1); |
1482 | MIN_IT (count, (ncol - screen.cur.col)); |
1413 | min_it (count, ncol - screen.cur.col); |
1483 | |
1414 | |
1484 | row = screen.cur.row + saveLines; |
1415 | row = screen.cur.row; |
1485 | |
1416 | |
1486 | line_t *line = save + row; |
1417 | line_t *line = &ROW(row); |
|
|
1418 | |
|
|
1419 | line->touch (); |
|
|
1420 | line->is_longer (0); |
1487 | |
1421 | |
1488 | switch (insdel) |
1422 | switch (insdel) |
1489 | { |
1423 | { |
1490 | case INSERT: |
1424 | case INSERT: |
1491 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1425 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1492 | { |
1426 | { |
1493 | line->t[col] = line->t[col - count]; |
1427 | line->t[col] = line->t[col - count]; |
1494 | line->r[col] = line->r[col - count]; |
1428 | line->r[col] = line->r[col - count]; |
1495 | } |
1429 | } |
1496 | |
1430 | |
1497 | if (line->l != -1) |
1431 | line->l = min (line->l + count, ncol); |
1498 | { |
|
|
1499 | line->l += count; |
|
|
1500 | MIN_IT (line->l, ncol); |
|
|
1501 | } |
|
|
1502 | |
1432 | |
1503 | if (selection.op && current_screen == selection.screen |
1433 | if (selection.op && current_screen == selection.screen |
1504 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1434 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1505 | { |
1435 | { |
1506 | if (selection.end.row != screen.cur.row |
1436 | if (selection.end.row != screen.cur.row |
… | |
… | |
1512 | selection.mark.col += count; /* XXX: yes? */ |
1442 | selection.mark.col += count; /* XXX: yes? */ |
1513 | selection.end.col += count; |
1443 | selection.end.col += count; |
1514 | } |
1444 | } |
1515 | } |
1445 | } |
1516 | |
1446 | |
1517 | scr_blank_line (save[row], screen.cur.col, count, rstyle); |
1447 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1518 | break; |
1448 | break; |
1519 | |
1449 | |
1520 | case ERASE: |
1450 | case ERASE: |
1521 | screen.cur.col += count; /* don't worry if > ncol */ |
1451 | screen.cur.col += count; /* don't worry if > ncol */ |
1522 | selection_check (1); |
1452 | selection_check (1); |
1523 | screen.cur.col -= count; |
1453 | screen.cur.col -= count; |
|
|
1454 | |
|
|
1455 | line->l = max (line->l - count, 0); |
1524 | scr_blank_line (save[row], screen.cur.col, count, rstyle); |
1456 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1525 | break; |
1457 | break; |
1526 | |
1458 | |
1527 | case DELETE: |
1459 | case DELETE: |
1528 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1460 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1529 | |
1461 | |
… | |
… | |
1531 | { |
1463 | { |
1532 | line->t[col] = line->t[col + count]; |
1464 | line->t[col] = line->t[col + count]; |
1533 | line->r[col] = line->r[col + count]; |
1465 | line->r[col] = line->r[col + count]; |
1534 | } |
1466 | } |
1535 | |
1467 | |
|
|
1468 | line->l = max (line->l - count, 0); |
1536 | scr_blank_line (*line, ncol - count, count, tr); |
1469 | scr_blank_line (*line, ncol - count, count, tr); |
1537 | |
|
|
1538 | if (line->is_cont ()) /* break line continuation */ |
|
|
1539 | line->l = ncol; |
|
|
1540 | |
|
|
1541 | line->l -= count; |
|
|
1542 | MAX_IT (line->l, 0); |
|
|
1543 | |
1470 | |
1544 | if (selection.op && current_screen == selection.screen |
1471 | if (selection.op && current_screen == selection.screen |
1545 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1472 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1546 | { |
1473 | { |
1547 | if (selection.end.row != screen.cur.row |
1474 | if (selection.end.row != screen.cur.row |
… | |
… | |
1567 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1494 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1568 | */ |
1495 | */ |
1569 | void |
1496 | void |
1570 | rxvt_term::scr_scroll_region (int top, int bot) |
1497 | rxvt_term::scr_scroll_region (int top, int bot) |
1571 | { |
1498 | { |
1572 | MAX_IT (top, 0); |
1499 | max_it (top, 0); |
1573 | MIN_IT (bot, (int)nrow - 1); |
1500 | min_it (bot, nrow - 1); |
1574 | |
1501 | |
1575 | if (top > bot) |
1502 | if (top > bot) |
1576 | return; |
1503 | return; |
1577 | |
1504 | |
1578 | screen.tscroll = top; |
1505 | screen.tscroll = top; |
… | |
… | |
1659 | rxvt_term::scr_set_tab (int mode) |
1586 | rxvt_term::scr_set_tab (int mode) |
1660 | { |
1587 | { |
1661 | if (mode < 0) |
1588 | if (mode < 0) |
1662 | memset (tabs, 0, ncol * sizeof (char)); |
1589 | memset (tabs, 0, ncol * sizeof (char)); |
1663 | else if (screen.cur.col < ncol) |
1590 | else if (screen.cur.col < ncol) |
1664 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1591 | tabs [screen.cur.col] = !!mode; |
1665 | } |
1592 | } |
1666 | |
1593 | |
1667 | /* ------------------------------------------------------------------------- */ |
1594 | /* ------------------------------------------------------------------------- */ |
1668 | /* |
1595 | /* |
1669 | * Set reverse/normal video |
1596 | * Set reverse/normal video |
… | |
… | |
1676 | XGCValues gcvalue; |
1603 | XGCValues gcvalue; |
1677 | |
1604 | |
1678 | if (rvideo != mode) |
1605 | if (rvideo != mode) |
1679 | { |
1606 | { |
1680 | rvideo = mode; |
1607 | rvideo = mode; |
1681 | SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); |
1608 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1682 | #if XPM_BACKGROUND |
1609 | #if XPM_BACKGROUND |
1683 | if (bgPixmap.pixmap == None) |
1610 | if (bgPixmap.pixmap == None) |
1684 | #endif |
1611 | #endif |
1685 | #if TRANSPARENT |
1612 | #if TRANSPARENT |
1686 | if (! (options & Opt_transparent) || am_transparent == 0) |
1613 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
1687 | #endif |
1614 | #endif |
1688 | XSetWindowBackground (display->display, vt, |
1615 | XSetWindowBackground (display->display, vt, |
1689 | pix_colors[Color_bg]); |
1616 | pix_colors[Color_bg]); |
1690 | |
1617 | |
1691 | gcvalue.foreground = pix_colors[Color_fg]; |
1618 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1716 | * Set font style |
1643 | * Set font style |
1717 | */ |
1644 | */ |
1718 | void |
1645 | void |
1719 | rxvt_term::set_font_style () |
1646 | rxvt_term::set_font_style () |
1720 | { |
1647 | { |
|
|
1648 | #if 0 |
1721 | switch (charsets[screen.charset]) |
1649 | switch (charsets [screen.charset]) |
1722 | { |
1650 | { |
1723 | case '0': /* DEC Special Character & Line Drawing Set */ |
1651 | case '0': /* DEC Special Character & Line Drawing Set */ |
1724 | break; |
1652 | break; |
1725 | case 'A': /* United Kingdom (UK) */ |
1653 | case 'A': /* United Kingdom (UK) */ |
1726 | break; |
1654 | break; |
… | |
… | |
1733 | case 'C': /* Finnish character set */ |
1661 | case 'C': /* Finnish character set */ |
1734 | break; |
1662 | break; |
1735 | case 'K': /* German character set */ |
1663 | case 'K': /* German character set */ |
1736 | break; |
1664 | break; |
1737 | } |
1665 | } |
|
|
1666 | #endif |
1738 | } |
1667 | } |
1739 | |
1668 | |
1740 | /* ------------------------------------------------------------------------- */ |
1669 | /* ------------------------------------------------------------------------- */ |
1741 | /* |
1670 | /* |
1742 | * Choose a font |
1671 | * Choose a font |
… | |
… | |
1782 | bool found = false; |
1711 | bool found = false; |
1783 | |
1712 | |
1784 | for (int i = 0; i < nrow; i++) |
1713 | for (int i = 0; i < nrow; i++) |
1785 | { |
1714 | { |
1786 | int col = 0; |
1715 | int col = 0; |
1787 | rend_t *drp = drawn[i].r; |
1716 | rend_t *drp = drawn_buf[i].r; |
1788 | |
1717 | |
1789 | for (; col < ncol; col++, drp++) |
1718 | for (; col < ncol; col++, drp++) |
1790 | if ((*drp & mask) == value) |
1719 | if ((*drp & mask) == value) |
1791 | { |
1720 | { |
1792 | found = true; |
1721 | found = true; |
… | |
… | |
1810 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1739 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1811 | { |
1740 | { |
1812 | int i; |
1741 | int i; |
1813 | row_col_t rc[RC_COUNT]; |
1742 | row_col_t rc[RC_COUNT]; |
1814 | |
1743 | |
1815 | if (!drawn) /* sanity check */ |
1744 | if (!drawn_buf) /* sanity check */ |
1816 | return; |
1745 | return; |
1817 | |
1746 | |
1818 | #ifndef NO_SLOW_LINK_SUPPORT |
1747 | #ifndef NO_SLOW_LINK_SUPPORT |
1819 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1748 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1820 | { |
1749 | { |
1821 | y = 0; |
1750 | y = 0; |
1822 | eheight = height; |
1751 | eheight = height; |
1823 | } |
1752 | } |
1824 | #endif |
|
|
1825 | |
|
|
1826 | #ifdef DEBUG_STRICT |
|
|
1827 | x = max (x, 0); |
|
|
1828 | x = min (x, (int)width); |
|
|
1829 | y = max (y, 0); |
|
|
1830 | y = min (y, (int)height); |
|
|
1831 | #endif |
1753 | #endif |
1832 | |
1754 | |
1833 | /* round down */ |
1755 | /* round down */ |
1834 | rc[PART_BEG].col = Pixel2Col (x); |
1756 | rc[PART_BEG].col = Pixel2Col (x); |
1835 | rc[PART_BEG].row = Pixel2Row (y); |
1757 | rc[PART_BEG].row = Pixel2Row (y); |
… | |
… | |
1838 | rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); |
1760 | rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); |
1839 | |
1761 | |
1840 | /* sanity checks */ |
1762 | /* sanity checks */ |
1841 | for (i = PART_BEG; i < RC_COUNT; i++) |
1763 | for (i = PART_BEG; i < RC_COUNT; i++) |
1842 | { |
1764 | { |
1843 | MIN_IT (rc[i].col, ncol - 1); |
1765 | min_it (rc[i].col, ncol - 1); |
1844 | MIN_IT (rc[i].row, nrow - 1); |
1766 | min_it (rc[i].row, nrow - 1); |
1845 | } |
1767 | } |
1846 | |
1768 | |
1847 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1769 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1848 | fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1770 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1849 | |
1771 | |
1850 | if (refresh) |
1772 | if (refresh) |
1851 | scr_refresh (SLOW_REFRESH); |
1773 | scr_refresh (SLOW_REFRESH); |
1852 | } |
1774 | } |
1853 | |
1775 | |
… | |
… | |
1874 | |
1796 | |
1875 | oldviewstart = view_start; |
1797 | oldviewstart = view_start; |
1876 | |
1798 | |
1877 | if (y < len) |
1799 | if (y < len) |
1878 | { |
1800 | { |
1879 | p = (nrow + nscrolled) * (len - y) / len; |
1801 | p = (nrow + nsaved) * (len - y) / len; |
1880 | p -= (long) (nrow - 1); |
1802 | p -= (long) (nrow - 1); |
1881 | p = max (p, 0); |
1803 | p = max (p, 0); |
1882 | } |
1804 | } |
1883 | |
1805 | |
1884 | view_start = (unsigned int)min (p, nscrolled); |
1806 | view_start = (unsigned int)min (p, nsaved); |
1885 | |
1807 | |
1886 | return scr_changeview (oldviewstart); |
1808 | return scr_changeview (oldviewstart); |
1887 | } |
1809 | } |
1888 | |
1810 | |
1889 | /* ------------------------------------------------------------------------- */ |
1811 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1900 | oldviewstart = view_start; |
1822 | oldviewstart = view_start; |
1901 | |
1823 | |
1902 | if (direction == UP) |
1824 | if (direction == UP) |
1903 | { |
1825 | { |
1904 | n = view_start + nlines; |
1826 | n = view_start + nlines; |
1905 | view_start = min (n, nscrolled); |
1827 | view_start = min (n, nsaved); |
1906 | } |
1828 | } |
1907 | else |
1829 | else |
1908 | { |
1830 | { |
1909 | n = view_start - nlines; |
1831 | n = view_start - nlines; |
1910 | view_start = max (n, 0); |
1832 | view_start = max (n, 0); |
… | |
… | |
1916 | int |
1838 | int |
1917 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1839 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1918 | { |
1840 | { |
1919 | if (view_start != oldviewstart) |
1841 | if (view_start != oldviewstart) |
1920 | { |
1842 | { |
|
|
1843 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
|
|
1844 | |
1921 | want_refresh = 1; |
1845 | want_refresh = 1; |
1922 | num_scr -= (view_start - oldviewstart); |
1846 | num_scr -= (view_start - oldviewstart); |
1923 | } |
1847 | } |
1924 | |
1848 | |
1925 | return (int) (view_start - oldviewstart); |
1849 | return (int)view_start - (int)oldviewstart; |
1926 | } |
1850 | } |
1927 | |
1851 | |
1928 | /* ------------------------------------------------------------------------- */ |
1852 | /* ------------------------------------------------------------------------- */ |
1929 | void |
1853 | void |
1930 | rxvt_term::scr_bell () |
1854 | rxvt_term::scr_bell () |
1931 | { |
1855 | { |
1932 | #ifndef NO_BELL |
1856 | #ifndef NO_BELL |
1933 | |
1857 | |
1934 | # ifndef NO_MAPALERT |
1858 | # ifndef NO_MAPALERT |
1935 | # ifdef MAPALERT_OPTION |
1859 | # ifdef MAPALERT_OPTION |
1936 | if (options & Opt_mapAlert) |
1860 | if (OPTION (Opt_mapAlert)) |
1937 | # endif |
1861 | # endif |
1938 | XMapWindow (display->display, parent[0]); |
1862 | XMapWindow (display->display, parent[0]); |
1939 | # endif |
1863 | # endif |
1940 | |
1864 | |
1941 | if (options & Opt_visualBell) |
1865 | if (OPTION (Opt_visualBell)) |
1942 | { |
1866 | { |
1943 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1867 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1944 | rxvt_usleep (VISUAL_BELL_DURATION); |
1868 | rxvt_usleep (VISUAL_BELL_DURATION); |
1945 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1869 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1946 | } |
1870 | } |
… | |
… | |
1954 | /* ARGSUSED */ |
1878 | /* ARGSUSED */ |
1955 | void |
1879 | void |
1956 | rxvt_term::scr_printscreen (int fullhist) |
1880 | rxvt_term::scr_printscreen (int fullhist) |
1957 | { |
1881 | { |
1958 | #ifdef PRINTPIPE |
1882 | #ifdef PRINTPIPE |
1959 | int i, r1, nrows, row_offset; |
1883 | int nrows, row_start; |
1960 | FILE *fd; |
1884 | FILE *fd; |
1961 | |
1885 | |
1962 | if ((fd = popen_printer ()) == NULL) |
1886 | if ((fd = popen_printer ()) == NULL) |
1963 | return; |
1887 | return; |
1964 | |
1888 | |
1965 | nrows = nrow; |
|
|
1966 | row_offset = saveLines; |
|
|
1967 | |
|
|
1968 | if (!fullhist) |
1889 | if (fullhist) |
1969 | row_offset -= view_start; |
1890 | { |
|
|
1891 | nrows = nrow + nsaved; |
|
|
1892 | row_start = -nsaved; |
|
|
1893 | } |
1970 | else |
1894 | else |
1971 | { |
1895 | { |
1972 | nrows += nscrolled; |
1896 | nrows = nrow; |
1973 | row_offset -= nscrolled; |
1897 | row_start = -view_start; |
1974 | } |
1898 | } |
1975 | |
1899 | |
1976 | wctomb (0, 0); |
1900 | wctomb (0, 0); |
1977 | |
1901 | |
1978 | for (r1 = 0; r1 < nrows; r1++) |
1902 | for (int r1 = 0; r1 < nrows; r1++) |
1979 | { |
1903 | { |
1980 | text_t *tp = save[r1 + row_offset].t; |
1904 | text_t *tp = ROW(r1).t; |
1981 | int len = save[r1 + row_offset].l; |
1905 | int len = ROW(r1).l; |
1982 | |
1906 | |
1983 | for (i = len >= 0 ? len : ncol - 1; i--; ) |
1907 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1984 | { |
1908 | { |
1985 | char mb[MB_LEN_MAX]; |
1909 | char mb[MB_LEN_MAX]; |
1986 | text_t t = *tp++; |
1910 | text_t t = *tp++; |
1987 | if (t == NOCHAR) |
1911 | if (t == NOCHAR) |
1988 | continue; |
1912 | continue; |
… | |
… | |
2016 | { |
1940 | { |
2017 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1941 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
2018 | showcursor; /* show the cursor */ |
1942 | showcursor; /* show the cursor */ |
2019 | int16_t col, row, /* column/row we're processing */ |
1943 | int16_t col, row, /* column/row we're processing */ |
2020 | ocrow; /* old cursor row */ |
1944 | ocrow; /* old cursor row */ |
2021 | int i, /* tmp */ |
1945 | int i; /* tmp */ |
2022 | row_offset; /* basic offset in screen structure */ |
|
|
2023 | #ifndef NO_CURSORCOLOR |
1946 | #ifndef NO_CURSORCOLOR |
2024 | rend_t cc1; /* store colours at cursor position (s) */ |
1947 | rend_t cc1; /* store colours at cursor position (s) */ |
2025 | #endif |
1948 | #endif |
2026 | rend_t *crp; // cursor rendition pointer |
1949 | rend_t *crp; // cursor rendition pointer |
2027 | |
1950 | |
… | |
… | |
2034 | * A: set up vars |
1957 | * A: set up vars |
2035 | */ |
1958 | */ |
2036 | must_clear = 0; |
1959 | must_clear = 0; |
2037 | refresh_count = 0; |
1960 | refresh_count = 0; |
2038 | |
1961 | |
2039 | row_offset = saveLines - view_start; |
|
|
2040 | |
|
|
2041 | #if XPM_BACKGROUND |
1962 | #if XPM_BACKGROUND |
2042 | must_clear |= bgPixmap.pixmap != None; |
1963 | must_clear |= bgPixmap.pixmap != None; |
2043 | #endif |
1964 | #endif |
2044 | #if TRANSPARENT |
1965 | #if TRANSPARENT |
2045 | must_clear |= (options & Opt_transparent) && am_transparent; |
1966 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
2046 | #endif |
1967 | #endif |
2047 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1968 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2048 | |
1969 | |
2049 | /* |
1970 | /* |
2050 | * B: reverse any characters which are selected |
1971 | * B: reverse any characters which are selected |
… | |
… | |
2067 | |
1988 | |
2068 | if (showcursor) |
1989 | if (showcursor) |
2069 | { |
1990 | { |
2070 | int col = screen.cur.col; |
1991 | int col = screen.cur.col; |
2071 | |
1992 | |
2072 | while (col && screen.line[screen.cur.row]->t[col] == NOCHAR) |
1993 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2073 | col--; |
1994 | col--; |
2074 | |
1995 | |
2075 | crp = &screen.line[screen.cur.row]->r[col]; |
1996 | crp = &ROW(screen.cur.row).r[col]; |
2076 | |
1997 | |
2077 | if (showcursor && focus) |
1998 | if (showcursor && focus) |
2078 | { |
1999 | { |
2079 | if (options & Opt_cursorUnderline) |
2000 | if (OPTION (Opt_cursorUnderline)) |
2080 | *crp ^= RS_Uline; |
2001 | *crp ^= RS_Uline; |
2081 | else |
2002 | else |
2082 | { |
2003 | { |
2083 | *crp ^= RS_RVid; |
2004 | *crp ^= RS_RVid; |
2084 | |
2005 | |
… | |
… | |
2086 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2007 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2087 | if (ISSET_PIXCOLOR (Color_cursor)) |
2008 | if (ISSET_PIXCOLOR (Color_cursor)) |
2088 | ccol1 = Color_cursor; |
2009 | ccol1 = Color_cursor; |
2089 | else |
2010 | else |
2090 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2011 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2091 | ccol1 = GET_FGCOLOR (rstyle); |
2012 | ccol1 = fgcolor_of (rstyle); |
2092 | #else |
2013 | #else |
2093 | ccol1 = Color_fg; |
2014 | ccol1 = Color_fg; |
2094 | #endif |
2015 | #endif |
2095 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2016 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2096 | ccol2 = Color_cursor2; |
2017 | ccol2 = Color_cursor2; |
2097 | else |
2018 | else |
2098 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2019 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2099 | ccol2 = GET_BGCOLOR (rstyle); |
2020 | ccol2 = bgcolor_of (rstyle); |
2100 | #else |
2021 | #else |
2101 | ccol2 = Color_bg; |
2022 | ccol2 = Color_bg; |
2102 | #endif |
2023 | #endif |
2103 | *crp = SET_FGCOLOR (*crp, ccol1); |
2024 | *crp = SET_FGCOLOR (*crp, ccol1); |
2104 | *crp = SET_BGCOLOR (*crp, ccol2); |
2025 | *crp = SET_BGCOLOR (*crp, ccol2); |
… | |
… | |
2114 | if (screen.cur.row + view_start != ocrow |
2035 | if (screen.cur.row + view_start != ocrow |
2115 | || screen.cur.col != oldcursor.col) |
2036 | || screen.cur.col != oldcursor.col) |
2116 | { |
2037 | { |
2117 | if (ocrow < nrow |
2038 | if (ocrow < nrow |
2118 | && oldcursor.col < ncol) |
2039 | && oldcursor.col < ncol) |
2119 | drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2040 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2120 | |
2041 | |
2121 | if (focus || !showcursor) |
2042 | if (focus || !showcursor) |
2122 | oldcursor.row = -1; |
2043 | oldcursor.row = -1; |
2123 | else |
2044 | else |
2124 | setoldcursor = 1; |
2045 | setoldcursor = 1; |
… | |
… | |
2137 | oldcursor.col = screen.cur.col; |
2058 | oldcursor.col = screen.cur.col; |
2138 | } |
2059 | } |
2139 | } |
2060 | } |
2140 | } |
2061 | } |
2141 | |
2062 | |
|
|
2063 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2142 | #if ENABLE_OVERLAY |
2064 | #if ENABLE_OVERLAY |
2143 | scr_swap_overlay (); |
2065 | scr_swap_overlay (); |
2144 | #endif |
2066 | #endif |
2145 | |
2067 | |
2146 | #ifndef NO_SLOW_LINK_SUPPORT |
2068 | #ifndef NO_SLOW_LINK_SUPPORT |
… | |
… | |
2148 | * D: CopyArea pass - very useful for slower links |
2070 | * D: CopyArea pass - very useful for slower links |
2149 | * This has been deliberately kept simple. |
2071 | * This has been deliberately kept simple. |
2150 | */ |
2072 | */ |
2151 | i = num_scr; |
2073 | i = num_scr; |
2152 | if (!display->is_local |
2074 | if (!display->is_local |
2153 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2075 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2154 | && abs (i) < nrow && !must_clear) |
2076 | && abs (num_scr) < nrow && !must_clear) |
2155 | { |
2077 | { |
2156 | int16_t nits; |
2078 | int16_t nits; |
2157 | int j; |
2079 | int j; |
2158 | int len, wlen; |
2080 | int len, wlen; |
2159 | |
2081 | |
… | |
… | |
2162 | row = i > 0 ? 0 : j - 1; |
2084 | row = i > 0 ? 0 : j - 1; |
2163 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2085 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2164 | { |
2086 | { |
2165 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2087 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2166 | { |
2088 | { |
2167 | line_t s = save[row + row_offset]; |
2089 | line_t s = ROW(row - view_start); |
2168 | line_t d = drawn[row]; |
2090 | line_t d = drawn_buf[row]; |
2169 | line_t d2 = drawn[row + i]; |
2091 | line_t d2 = drawn_buf[row + i]; |
2170 | |
2092 | |
2171 | for (nits = 0, col = ncol; col--; ) |
2093 | for (nits = 0, col = ncol; col--; ) |
2172 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2094 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2173 | nits--; |
2095 | nits--; |
2174 | else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) |
2096 | else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) |
… | |
… | |
2192 | |
2114 | |
2193 | if (len != -1) |
2115 | if (len != -1) |
2194 | { |
2116 | { |
2195 | /* also comes here at end if needed because of >= above */ |
2117 | /* also comes here at end if needed because of >= above */ |
2196 | if (wlen < len) |
2118 | if (wlen < len) |
2197 | SWAP_IT (wlen, len, int); |
2119 | ::swap (wlen, len); |
2198 | |
2120 | |
2199 | XCopyArea (display->display, vt, vt, |
2121 | XCopyArea (display->display, vt, vt, |
2200 | gc, 0, Row2Pixel (len + i), |
2122 | gc, 0, Row2Pixel (len + i), |
2201 | (unsigned int)TermWin_TotalWidth (), |
2123 | (unsigned int)this->width, |
2202 | (unsigned int)Height2Pixel (wlen - len + 1), |
2124 | (unsigned int)Height2Pixel (wlen - len + 1), |
2203 | 0, Row2Pixel (len)); |
2125 | 0, Row2Pixel (len)); |
2204 | len = -1; |
2126 | len = -1; |
2205 | } |
2127 | } |
2206 | } |
2128 | } |
… | |
… | |
2210 | /* |
2132 | /* |
2211 | * E: main pass across every character |
2133 | * E: main pass across every character |
2212 | */ |
2134 | */ |
2213 | for (row = 0; row < nrow; row++) |
2135 | for (row = 0; row < nrow; row++) |
2214 | { |
2136 | { |
2215 | text_t *stp = save[row + row_offset].t; |
2137 | text_t *stp = ROW(row - view_start).t; |
2216 | rend_t *srp = save[row + row_offset].r; |
2138 | rend_t *srp = ROW(row - view_start).r; |
2217 | text_t *dtp = drawn[row].t; |
2139 | text_t *dtp = drawn_buf[row].t; |
2218 | rend_t *drp = drawn[row].r; |
2140 | rend_t *drp = drawn_buf[row].r; |
2219 | |
2141 | |
2220 | /* |
2142 | /* |
2221 | * E2: OK, now the real pass |
2143 | * E2: OK, now the real pass |
2222 | */ |
2144 | */ |
2223 | int ypixel = (int)Row2Pixel (row); |
2145 | int ypixel = (int)Row2Pixel (row); |
… | |
… | |
2285 | count++, i--; |
2207 | count++, i--; |
2286 | |
2208 | |
2287 | /* |
2209 | /* |
2288 | * Determine the attributes for the string |
2210 | * Determine the attributes for the string |
2289 | */ |
2211 | */ |
2290 | int fore = GET_FGCOLOR (rend); // desired foreground |
2212 | int fore = fgcolor_of (rend); // desired foreground |
2291 | int back = GET_BGCOLOR (rend); // desired background |
2213 | int back = bgcolor_of (rend); // desired background |
2292 | |
2214 | |
2293 | // only do special processing if any attributes are set, which is rare |
2215 | // only do special processing if any attributes are set, which is unlikely |
2294 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2216 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2295 | { |
2217 | { |
2296 | #if ENABLE_STYLES |
2218 | #if ENABLE_STYLES |
2297 | // force redraw after "careful" characters to avoid pixel droppings |
2219 | // force redraw after "careful" characters to avoid pixel droppings |
2298 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
2220 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
… | |
… | |
2334 | fore = Color_UL; |
2256 | fore = Color_UL; |
2335 | #endif |
2257 | #endif |
2336 | |
2258 | |
2337 | if (invert) |
2259 | if (invert) |
2338 | { |
2260 | { |
2339 | SWAP_IT (fore, back, int); |
2261 | ::swap (fore, back); |
2340 | |
2262 | |
2341 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2263 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2342 | if (ISSET_PIXCOLOR (Color_RV)) |
2264 | if (ISSET_PIXCOLOR (Color_RV)) |
2343 | back = Color_RV; |
2265 | back = Color_RV; |
2344 | |
2266 | |
… | |
… | |
2409 | } /* for (row....) */ |
2331 | } /* for (row....) */ |
2410 | |
2332 | |
2411 | #if ENABLE_OVERLAY |
2333 | #if ENABLE_OVERLAY |
2412 | scr_swap_overlay (); |
2334 | scr_swap_overlay (); |
2413 | #endif |
2335 | #endif |
|
|
2336 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
2414 | |
2337 | |
2415 | /* |
2338 | /* |
2416 | * G: cleanup cursor and display outline cursor if necessary |
2339 | * G: cleanup cursor and display outline cursor if necessary |
2417 | */ |
2340 | */ |
2418 | if (showcursor) |
2341 | if (showcursor) |
2419 | { |
2342 | { |
2420 | if (focus) |
2343 | if (focus) |
2421 | { |
2344 | { |
2422 | if (options & Opt_cursorUnderline) |
2345 | if (OPTION (Opt_cursorUnderline)) |
2423 | *crp ^= RS_Uline; |
2346 | *crp ^= RS_Uline; |
2424 | else |
2347 | else |
2425 | { |
2348 | { |
2426 | *crp ^= RS_RVid; |
2349 | *crp ^= RS_RVid; |
2427 | #ifndef NO_CURSORCOLOR |
2350 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2432 | else if (oldcursor.row >= 0) |
2355 | else if (oldcursor.row >= 0) |
2433 | { |
2356 | { |
2434 | int cursorwidth = 1; |
2357 | int cursorwidth = 1; |
2435 | int col = oldcursor.col; |
2358 | int col = oldcursor.col; |
2436 | |
2359 | |
2437 | while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR) |
2360 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2438 | col--; |
2361 | col--; |
2439 | |
2362 | |
2440 | while (col + cursorwidth < ncol |
2363 | while (col + cursorwidth < ncol |
2441 | && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2364 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2442 | cursorwidth++; |
2365 | cursorwidth++; |
2443 | |
2366 | |
2444 | #ifndef NO_CURSORCOLOR |
2367 | #ifndef NO_CURSORCOLOR |
2445 | if (ISSET_PIXCOLOR (Color_cursor)) |
2368 | if (ISSET_PIXCOLOR (Color_cursor)) |
2446 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2369 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
… | |
… | |
2465 | num_scr = 0; |
2388 | num_scr = 0; |
2466 | num_scr_allow = 1; |
2389 | num_scr_allow = 1; |
2467 | } |
2390 | } |
2468 | |
2391 | |
2469 | void |
2392 | void |
2470 | rxvt_term::scr_remap_chars (const line_t &l) |
2393 | rxvt_term::scr_remap_chars (line_t &l) |
2471 | { |
2394 | { |
2472 | if (!l.t) |
2395 | if (!l.t) |
2473 | return; |
2396 | return; |
2474 | |
2397 | |
|
|
2398 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
|
|
2399 | |
2475 | for (int i = ncol; i--; ) |
2400 | for (int i = ncol; i--; ) |
2476 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2401 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2477 | } |
2402 | } |
2478 | |
2403 | |
2479 | void |
2404 | void |
2480 | rxvt_term::scr_remap_chars () |
2405 | rxvt_term::scr_remap_chars () |
2481 | { |
2406 | { |
2482 | for (int i = nrow + saveLines; i--; ) |
2407 | for (int i = total_rows; i--; ) |
2483 | scr_remap_chars (save[i]); |
2408 | scr_remap_chars (row_buf [i]); |
2484 | |
2409 | |
2485 | for (int i = nrow; i--; ) |
2410 | for (int i = nrow; i--; ) |
2486 | { |
2411 | { |
2487 | scr_remap_chars (drawn[i]); |
2412 | scr_remap_chars (drawn_buf [i]); |
2488 | scr_remap_chars (swap_save[i]); |
2413 | scr_remap_chars (swap_buf [i]); |
2489 | } |
2414 | } |
2490 | } |
2415 | } |
2491 | |
2416 | |
2492 | void |
2417 | void |
2493 | rxvt_term::scr_recolour () |
2418 | rxvt_term::scr_recolour () |
… | |
… | |
2535 | |
2460 | |
2536 | /* ------------------------------------------------------------------------- */ |
2461 | /* ------------------------------------------------------------------------- */ |
2537 | void |
2462 | void |
2538 | rxvt_term::scr_reverse_selection () |
2463 | rxvt_term::scr_reverse_selection () |
2539 | { |
2464 | { |
|
|
2465 | if (selection.op |
2540 | if (selection.op && current_screen == selection.screen) |
2466 | && current_screen == selection.screen |
|
|
2467 | && selection.end.row >= -view_start) |
2541 | { |
2468 | { |
2542 | int end_row = saveLines - view_start; |
2469 | int view_end = -view_start + nrow; |
2543 | int i = selection.beg.row + saveLines; |
2470 | int row, col; |
2544 | int col, row = selection.end.row + saveLines; |
|
|
2545 | rend_t *srp; |
|
|
2546 | |
2471 | |
2547 | #if ENABLE_FRILLS |
2472 | #if ENABLE_FRILLS |
2548 | if (selection.rect) |
2473 | if (selection.rect) |
2549 | { |
2474 | { |
2550 | end_row += nrow; |
2475 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
|
|
2476 | { |
|
|
2477 | text_t *stp = ROW(row).t; |
|
|
2478 | rend_t *srp = ROW(row).r; |
2551 | |
2479 | |
2552 | for (; i <= row && i <= end_row; i++) |
|
|
2553 | for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++) |
2480 | for (col = selection.beg.col; col < selection.end.col; col++) |
2554 | srp[col] ^= RS_RVid; |
2481 | srp[col] ^= RS_RVid; |
|
|
2482 | |
|
|
2483 | while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2484 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2485 | |
|
|
2486 | if (++col < selection.end.col) |
|
|
2487 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2488 | } |
2555 | } |
2489 | } |
2556 | else |
2490 | else |
2557 | #endif |
2491 | #endif |
2558 | { |
2492 | { |
2559 | if (i >= end_row) |
2493 | if (selection.beg.row >= -view_start) |
|
|
2494 | { |
2560 | col = selection.beg.col; |
2495 | col = selection.beg.col; |
|
|
2496 | row = selection.beg.row; |
|
|
2497 | } |
2561 | else |
2498 | else |
2562 | { |
2499 | { |
2563 | col = 0; |
2500 | col = 0; |
2564 | i = end_row; |
2501 | row = -view_start; |
2565 | } |
2502 | } |
2566 | |
2503 | |
2567 | end_row += nrow; |
2504 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2568 | |
|
|
2569 | for (; i < row && i < end_row; i++, col = 0) |
|
|
2570 | for (srp = save[i].r; col < ncol; col++) |
2505 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2571 | srp[col] ^= RS_RVid; |
2506 | srp[col] ^= RS_RVid; |
2572 | |
2507 | |
2573 | if (i == row && i < end_row) |
2508 | if (row == selection.end.row) |
2574 | for (srp = save[i].r; col < selection.end.col; col++) |
2509 | for (rend_t *srp = ROW(row).r; col < selection.end.col; col++) |
2575 | srp[col] ^= RS_RVid; |
2510 | srp[col] ^= RS_RVid; |
2576 | } |
2511 | } |
2577 | } |
2512 | } |
2578 | } |
2513 | } |
2579 | |
2514 | |
… | |
… | |
2588 | { |
2523 | { |
2589 | int row, wrote; |
2524 | int row, wrote; |
2590 | unsigned int width, towrite; |
2525 | unsigned int width, towrite; |
2591 | char r1[] = "\n"; |
2526 | char r1[] = "\n"; |
2592 | |
2527 | |
2593 | for (row = saveLines - nscrolled; |
2528 | for (row = saveLines - nsaved; |
2594 | row < saveLines + nrow - 1; row++) |
2529 | row < saveLines + nrow - 1; row++) |
2595 | { |
2530 | { |
2596 | width = save[row].l >= 0 ? save[row].l |
2531 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2597 | : ncol; |
2532 | : ncol; |
2598 | for (towrite = width; towrite; towrite -= wrote) |
2533 | for (towrite = width; towrite; towrite -= wrote) |
2599 | { |
2534 | { |
2600 | wrote = write (fd, & (save[row].t[width - towrite]), |
2535 | wrote = write (fd, & (row_buf[row].t[width - towrite]), |
2601 | towrite); |
2536 | towrite); |
2602 | if (wrote < 0) |
2537 | if (wrote < 0) |
2603 | return; /* XXX: death, no report */ |
2538 | return; /* XXX: death, no report */ |
2604 | } |
2539 | } |
2605 | if (save[row].l >= 0) |
2540 | if (row_buf[row].l >= 0) |
2606 | if (write (fd, r1, 1) <= 0) |
2541 | if (write (fd, r1, 1) <= 0) |
2607 | return; /* XXX: death, no report */ |
2542 | return; /* XXX: death, no report */ |
2608 | } |
2543 | } |
2609 | } |
2544 | } |
2610 | #endif |
2545 | #endif |
2611 | |
2546 | |
2612 | /* ------------------------------------------------------------------------- * |
2547 | /* ------------------------------------------------------------------------- * |
2613 | * CHARACTER SELECTION * |
2548 | * CHARACTER SELECTION * |
2614 | * ------------------------------------------------------------------------- */ |
2549 | * ------------------------------------------------------------------------- */ |
2615 | |
|
|
2616 | /* |
|
|
2617 | * -nscrolled <= (selection row) <= nrow - 1 |
|
|
2618 | */ |
|
|
2619 | void |
2550 | void |
2620 | rxvt_term::selection_check (int check_more) |
2551 | rxvt_term::selection_check (int check_more) |
2621 | { |
2552 | { |
2622 | row_col_t pos; |
2553 | row_col_t pos; |
2623 | |
2554 | |
2624 | if (!selection.op) |
2555 | if (!selection.op) |
2625 | return; |
2556 | return; |
2626 | |
2557 | |
2627 | pos.row = pos.col = 0; |
2558 | pos.row = pos.col = 0; |
2628 | if ((selection.beg.row < - (int32_t)nscrolled) |
2559 | if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) |
2629 | || (selection.beg.row >= nrow) |
2560 | || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) |
2630 | || (selection.mark.row < - (int32_t)nscrolled) |
2561 | || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) |
2631 | || (selection.mark.row >= nrow) |
|
|
2632 | || (selection.end.row < - (int32_t)nscrolled) |
|
|
2633 | || (selection.end.row >= nrow) |
|
|
2634 | || (check_more == 1 |
2562 | || (check_more == 1 |
2635 | && current_screen == selection.screen |
2563 | && current_screen == selection.screen |
2636 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2564 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2637 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2565 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2638 | || (check_more == 2 |
2566 | || (check_more == 2 |
… | |
… | |
2649 | /* ------------------------------------------------------------------------- */ |
2577 | /* ------------------------------------------------------------------------- */ |
2650 | /* |
2578 | /* |
2651 | * Paste a selection direct to the command fd |
2579 | * Paste a selection direct to the command fd |
2652 | */ |
2580 | */ |
2653 | void |
2581 | void |
2654 | rxvt_term::paste (unsigned char *data, unsigned int len) |
2582 | rxvt_term::paste (char *data, unsigned int len) |
2655 | { |
2583 | { |
2656 | /* convert normal newline chars into common keyboard Return key sequence */ |
2584 | /* convert normal newline chars into common keyboard Return key sequence */ |
2657 | for (unsigned int i = 0; i < len; i++) |
2585 | for (unsigned int i = 0; i < len; i++) |
2658 | if (data[i] == C0_LF) |
2586 | if (data[i] == C0_LF) |
2659 | data[i] = C0_CR; |
2587 | data[i] = C0_CR; |
… | |
… | |
2803 | { |
2731 | { |
2804 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2732 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2805 | char *s = rxvt_wcstombs (w); |
2733 | char *s = rxvt_wcstombs (w); |
2806 | free (w); |
2734 | free (w); |
2807 | // TODO: strlen == only the first element will be converted. well... |
2735 | // TODO: strlen == only the first element will be converted. well... |
2808 | paste ((unsigned char *)s, strlen (s)); |
2736 | paste (s, strlen (s)); |
2809 | free (s); |
2737 | free (s); |
2810 | } |
2738 | } |
2811 | else |
2739 | else |
2812 | #endif |
2740 | #endif |
2813 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2741 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2814 | && cl) |
2742 | && cl) |
2815 | { |
2743 | { |
2816 | for (int i = 0; i < cr; i++) |
2744 | for (int i = 0; i < cr; i++) |
2817 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2745 | paste (cl[i], strlen (cl[i])); |
2818 | |
2746 | |
2819 | XFreeStringList (cl); |
2747 | XFreeStringList (cl); |
2820 | } |
2748 | } |
2821 | else |
2749 | else |
2822 | paste (ct.value, ct.nitems); // paste raw |
2750 | paste ((char *)ct.value, ct.nitems); // paste raw |
2823 | |
2751 | |
2824 | bailout: |
2752 | bailout: |
2825 | XFree (ct.value); |
2753 | XFree (ct.value); |
2826 | |
2754 | |
2827 | if (selection_wait == Sel_normal) |
2755 | if (selection_wait == Sel_normal) |
… | |
… | |
2865 | return; /* outside window */ |
2793 | return; /* outside window */ |
2866 | |
2794 | |
2867 | if (selection.text) |
2795 | if (selection.text) |
2868 | { /* internal selection */ |
2796 | { /* internal selection */ |
2869 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2797 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2870 | paste ((unsigned char *)str, strlen (str)); |
2798 | paste (str, strlen (str)); |
2871 | free (str); |
2799 | free (str); |
2872 | return; |
2800 | return; |
2873 | } |
2801 | } |
2874 | else |
2802 | else |
2875 | { |
2803 | { |
… | |
… | |
2944 | * EXT: button 1 or 3 release |
2872 | * EXT: button 1 or 3 release |
2945 | */ |
2873 | */ |
2946 | void |
2874 | void |
2947 | rxvt_term::selection_make (Time tm) |
2875 | rxvt_term::selection_make (Time tm) |
2948 | { |
2876 | { |
2949 | int i, col, end_col, row, end_row; |
2877 | int i; |
2950 | wchar_t *new_selection_text; |
2878 | wchar_t *new_selection_text; |
2951 | text_t *t; |
2879 | text_t *t; |
2952 | |
2880 | |
2953 | switch (selection.op) |
2881 | switch (selection.op) |
2954 | { |
2882 | { |
… | |
… | |
2967 | selection.op = SELECTION_DONE; |
2895 | selection.op = SELECTION_DONE; |
2968 | |
2896 | |
2969 | if (selection.clicks == 4) |
2897 | if (selection.clicks == 4) |
2970 | return; /* nothing selected, go away */ |
2898 | return; /* nothing selected, go away */ |
2971 | |
2899 | |
|
|
2900 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
|
|
2901 | return; |
|
|
2902 | |
2972 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2903 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2973 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2904 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2974 | |
2905 | |
2975 | col = selection.beg.col; |
|
|
2976 | row = selection.beg.row + saveLines; |
|
|
2977 | end_row = selection.end.row + saveLines; |
|
|
2978 | int ofs = 0; |
2906 | int ofs = 0; |
2979 | int extra = 0; |
2907 | int extra = 0; |
2980 | |
2908 | |
|
|
2909 | int col = selection.beg.col; |
|
|
2910 | int row = selection.beg.row; |
|
|
2911 | |
|
|
2912 | int end_col; |
|
|
2913 | |
2981 | for (; row <= end_row; row++, col = 0) |
2914 | for (; row <= selection.end.row; row++, col = 0) |
2982 | { |
2915 | { |
2983 | #if ENABLE_FRILLS |
2916 | #if ENABLE_FRILLS |
2984 | if (selection.rect) |
2917 | if (selection.rect) |
2985 | { |
2918 | { |
2986 | col = selection.beg.col; |
2919 | col = selection.beg.col; |
2987 | end_col = ncol + 1; |
2920 | end_col = ncol + 1; |
2988 | } |
2921 | } |
2989 | else |
2922 | else |
2990 | #endif |
2923 | #endif |
2991 | end_col = save[row].is_cont () ? ncol : save[row].l; //TODO//FIXME |
2924 | end_col = ROW(row).l; |
2992 | |
2925 | |
2993 | MAX_IT (col, 0); |
2926 | col = max (col, 0); |
2994 | |
2927 | |
2995 | if (row == end_row || selection.rect) |
2928 | if (row == selection.end.row |
|
|
2929 | #if ENABLE_FRILLS |
|
|
2930 | || selection.rect |
|
|
2931 | #endif |
|
|
2932 | ) |
2996 | MIN_IT (end_col, selection.end.col); |
2933 | min_it (end_col, selection.end.col); |
2997 | |
2934 | |
2998 | t = &save[row].t[col]; |
2935 | t = ROW(row).t + col; |
|
|
2936 | |
2999 | for (; col < end_col; col++) |
2937 | for (; col < end_col; col++) |
3000 | { |
2938 | { |
3001 | if (*t == NOCHAR) |
2939 | if (*t == NOCHAR) |
3002 | t++; |
2940 | t++; |
3003 | #if ENABLE_COMBINING |
2941 | #if ENABLE_COMBINING |
… | |
… | |
3019 | #endif |
2957 | #endif |
3020 | else |
2958 | else |
3021 | new_selection_text[ofs++] = *t++; |
2959 | new_selection_text[ofs++] = *t++; |
3022 | } |
2960 | } |
3023 | |
2961 | |
3024 | if (save[row].l != -1 && row != end_row) |
2962 | #if ENABLE_FRILLS |
|
|
2963 | if (selection.rect) |
|
|
2964 | { |
|
|
2965 | while (ofs |
|
|
2966 | && new_selection_text[ofs - 1] != C0_LF |
|
|
2967 | && unicode::is_space (new_selection_text[ofs - 1])) |
|
|
2968 | --ofs; |
|
|
2969 | |
3025 | new_selection_text[ofs++] = C0_LF; |
2970 | new_selection_text[ofs++] = C0_LF; |
|
|
2971 | } |
|
|
2972 | else |
|
|
2973 | #endif |
|
|
2974 | if (!ROW(row).is_longer () && row != selection.end.row) |
|
|
2975 | new_selection_text[ofs++] = C0_LF; |
3026 | } |
2976 | } |
3027 | |
2977 | |
3028 | if (end_col != selection.end.col) |
2978 | if (end_col != selection.end.col) |
3029 | new_selection_text[ofs++] = C0_LF; |
2979 | new_selection_text[ofs++] = C0_LF; |
3030 | |
2980 | |
… | |
… | |
3040 | |
2990 | |
3041 | // we usually allocate much more than necessary, so realloc it smaller again |
2991 | // we usually allocate much more than necessary, so realloc it smaller again |
3042 | selection.len = ofs; |
2992 | selection.len = ofs; |
3043 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2993 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
3044 | |
2994 | |
|
|
2995 | if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) |
|
|
2996 | return; |
|
|
2997 | |
|
|
2998 | selection_grab (tm); |
|
|
2999 | } |
|
|
3000 | |
|
|
3001 | bool |
|
|
3002 | rxvt_term::selection_grab (Time tm) |
|
|
3003 | { |
|
|
3004 | selection_time = tm; |
|
|
3005 | |
3045 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3006 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3046 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3007 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
|
|
3008 | { |
3047 | display->set_selection_owner (this); |
3009 | display->set_selection_owner (this); |
|
|
3010 | return true; |
|
|
3011 | } |
3048 | else |
3012 | else |
3049 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
3013 | return false; |
3050 | |
3014 | |
3051 | #if 0 |
3015 | #if 0 |
3052 | XTextProperty ct; |
3016 | XTextProperty ct; |
3053 | |
3017 | |
3054 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3018 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3055 | { |
3019 | { |
3056 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3020 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3057 | XFree (ct.value); |
3021 | XFree (ct.value); |
3058 | } |
3022 | } |
3059 | #endif |
3023 | #endif |
3060 | |
|
|
3061 | selection_time = tm; |
|
|
3062 | } |
3024 | } |
3063 | |
3025 | |
3064 | /* ------------------------------------------------------------------------- */ |
3026 | /* ------------------------------------------------------------------------- */ |
3065 | /* |
3027 | /* |
3066 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3028 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
… | |
… | |
3088 | */ |
3050 | */ |
3089 | void |
3051 | void |
3090 | rxvt_term::selection_start_colrow (int col, int row) |
3052 | rxvt_term::selection_start_colrow (int col, int row) |
3091 | { |
3053 | { |
3092 | want_refresh = 1; |
3054 | want_refresh = 1; |
|
|
3055 | |
|
|
3056 | selection.mark.row = row - view_start; |
3093 | selection.mark.col = col; |
3057 | selection.mark.col = col; |
3094 | selection.mark.row = row - view_start; |
|
|
3095 | |
3058 | |
3096 | MAX_IT (selection.mark.row, - (int32_t)nscrolled); |
3059 | selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); |
3097 | MIN_IT (selection.mark.row, (int32_t)nrow - 1); |
3060 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3098 | MAX_IT (selection.mark.col, 0); |
|
|
3099 | MIN_IT (selection.mark.col, (int32_t)ncol - 1); |
|
|
3100 | |
3061 | |
3101 | while (selection.mark.col > 0 |
3062 | while (selection.mark.col > 0 |
3102 | && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR) |
3063 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3103 | --selection.mark.col; |
3064 | --selection.mark.col; |
3104 | |
3065 | |
3105 | if (selection.op) |
3066 | if (selection.op) |
3106 | { /* clear the old selection */ |
3067 | { /* clear the old selection */ |
3107 | selection.beg.row = selection.end.row = selection.mark.row; |
3068 | selection.beg.row = selection.end.row = selection.mark.row; |
… | |
… | |
3131 | text_t *stp; |
3092 | text_t *stp; |
3132 | rend_t *srp; |
3093 | rend_t *srp; |
3133 | |
3094 | |
3134 | if (dirn == UP) |
3095 | if (dirn == UP) |
3135 | { |
3096 | { |
3136 | bound.row = saveLines - nscrolled - 1; |
3097 | bound.row = - nsaved - 1; |
3137 | bound.col = 0; |
3098 | bound.col = 0; |
3138 | dirnadd = -1; |
3099 | dirnadd = -1; |
3139 | } |
3100 | } |
3140 | else |
3101 | else |
3141 | { |
3102 | { |
3142 | bound.row = saveLines + nrow; |
3103 | bound.row = nrow; |
3143 | bound.col = ncol - 1; |
3104 | bound.col = ncol - 1; |
3144 | dirnadd = 1; |
3105 | dirnadd = 1; |
3145 | } |
3106 | } |
3146 | |
3107 | |
3147 | row = mark->row + saveLines; |
3108 | row = mark->row; |
3148 | col = mark->col; |
3109 | col = max (mark->col, 0); |
3149 | MAX_IT (col, 0); |
3110 | |
3150 | /* find the edge of a word */ |
3111 | /* find the edge of a word */ |
3151 | stp = &save[row].t[col]; |
3112 | stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp); |
3152 | w1 = DELIMIT_TEXT (*stp); |
3113 | srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp); |
3153 | |
|
|
3154 | srp = &save[row].r[col]; |
|
|
3155 | w2 = DELIMIT_REND (*srp); |
|
|
3156 | |
3114 | |
3157 | for (;;) |
3115 | for (;;) |
3158 | { |
3116 | { |
3159 | for (; col != bound.col; col += dirnadd) |
3117 | for (; col != bound.col; col += dirnadd) |
3160 | { |
3118 | { |
… | |
… | |
3170 | break; |
3128 | break; |
3171 | } |
3129 | } |
3172 | |
3130 | |
3173 | if ((col == bound.col) && (row != bound.row)) |
3131 | if ((col == bound.col) && (row != bound.row)) |
3174 | { |
3132 | { |
3175 | if (save[ (row - (dirn == UP ? 1 : 0))].is_cont ()) |
3133 | if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ()) |
3176 | { |
3134 | { |
3177 | trow = row + dirnadd; |
3135 | trow = row + dirnadd; |
3178 | tcol = dirn == UP ? ncol - 1 : 0; |
3136 | tcol = dirn == UP ? ncol - 1 : 0; |
3179 | |
3137 | |
3180 | if (save[trow].t == NULL) |
3138 | if (!ROW(trow).t) |
3181 | break; |
3139 | break; |
3182 | |
3140 | |
3183 | stp = & (save[trow].t[tcol]); |
3141 | stp = ROW(trow).t + tcol; |
3184 | srp = & (save[trow].r[tcol]); |
3142 | srp = ROW(trow).r + tcol; |
3185 | |
3143 | |
3186 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3144 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3187 | break; |
3145 | break; |
3188 | |
3146 | |
3189 | row = trow; |
3147 | row = trow; |
… | |
… | |
3192 | } |
3150 | } |
3193 | } |
3151 | } |
3194 | break; |
3152 | break; |
3195 | } |
3153 | } |
3196 | |
3154 | |
3197 | Old_Word_Selection_You_Die: |
|
|
3198 | if (dirn == DN) |
3155 | if (dirn == DN) |
3199 | col++; /* put us on one past the end */ |
3156 | col++; /* put us on one past the end */ |
3200 | |
3157 | |
3201 | /* Poke the values back in */ |
3158 | /* Poke the values back in */ |
3202 | ret->row = row - saveLines; |
3159 | ret->row = row; |
3203 | ret->col = col; |
3160 | ret->col = col; |
3204 | } |
3161 | } |
3205 | |
3162 | |
3206 | /* ------------------------------------------------------------------------- */ |
3163 | /* ------------------------------------------------------------------------- */ |
3207 | /* |
3164 | /* |
… | |
… | |
3212 | * flag == 2 ==> button 3 motion |
3169 | * flag == 2 ==> button 3 motion |
3213 | */ |
3170 | */ |
3214 | void |
3171 | void |
3215 | rxvt_term::selection_extend (int x, int y, int flag) |
3172 | rxvt_term::selection_extend (int x, int y, int flag) |
3216 | { |
3173 | { |
3217 | int col, row; |
3174 | int col = clamp (Pixel2Col (x), 0, ncol); |
3218 | |
3175 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3219 | col = Pixel2Col (x); |
|
|
3220 | row = Pixel2Row (y); |
|
|
3221 | MAX_IT (row, 0); |
|
|
3222 | MIN_IT (row, (int)nrow - 1); |
|
|
3223 | MAX_IT (col, 0); |
|
|
3224 | MIN_IT (col, (int)ncol); |
|
|
3225 | |
3176 | |
3226 | /* |
3177 | /* |
3227 | * If we're selecting characters (single click) then we must check first |
3178 | * If we're selecting characters (single click) then we must check first |
3228 | * if we are at the same place as the original mark. If we are then |
3179 | * if we are at the same place as the original mark. If we are then |
3229 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3180 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
… | |
… | |
3254 | * Extend the selection to the specified col/row |
3205 | * Extend the selection to the specified col/row |
3255 | */ |
3206 | */ |
3256 | void |
3207 | void |
3257 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3208 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3258 | { |
3209 | { |
3259 | int end_col; |
|
|
3260 | row_col_t pos; |
3210 | row_col_t pos; |
3261 | enum { |
3211 | enum { |
3262 | LEFT, RIGHT |
3212 | LEFT, RIGHT |
3263 | } closeto = RIGHT; |
3213 | } closeto = RIGHT; |
3264 | |
3214 | |
… | |
… | |
3295 | selection.beg.col = selection.end.col = selection.mark.col; |
3245 | selection.beg.col = selection.end.col = selection.mark.col; |
3296 | selection.beg.row = selection.end.row = selection.mark.row; |
3246 | selection.beg.row = selection.end.row = selection.mark.row; |
3297 | } |
3247 | } |
3298 | |
3248 | |
3299 | pos.col = col; |
3249 | pos.col = col; |
3300 | pos.row = row; |
3250 | pos.row = row - view_start; |
3301 | |
|
|
3302 | pos.row -= view_start; /* adjust for scroll */ |
|
|
3303 | |
3251 | |
3304 | /* |
3252 | /* |
3305 | * This is mainly xterm style selection with a couple of differences, mainly |
3253 | * This is mainly xterm style selection with a couple of differences, mainly |
3306 | * in the way button3 drag extension works. |
3254 | * in the way button3 drag extension works. |
3307 | * We're either doing: button1 drag; button3 press; or button3 drag |
3255 | * We're either doing: button1 drag; button3 press; or button3 drag |
… | |
… | |
3366 | } |
3314 | } |
3367 | } |
3315 | } |
3368 | |
3316 | |
3369 | if (selection.clicks == 1) |
3317 | if (selection.clicks == 1) |
3370 | { |
3318 | { |
3371 | end_col = save[selection.beg.row + saveLines].l; |
3319 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3372 | |
3320 | && !ROW(selection.beg.row).is_longer () |
3373 | if (selection.beg.col > end_col |
|
|
3374 | && end_col != -1 |
|
|
3375 | #if ENABLE_FRILLS |
3321 | #if ENABLE_FRILLS |
3376 | && !selection.rect |
3322 | && !selection.rect |
3377 | #endif |
3323 | #endif |
3378 | ) |
3324 | ) |
3379 | selection.beg.col = ncol; |
3325 | selection.beg.col = ncol; |
3380 | |
3326 | |
3381 | end_col = save[selection.end.row + saveLines].l; |
|
|
3382 | |
|
|
3383 | if ( |
3327 | if ( |
3384 | selection.end.col > end_col |
3328 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3385 | && end_col != -1 |
3329 | && !ROW(selection.end.row).is_longer () |
3386 | #if ENABLE_FRILLS |
3330 | #if ENABLE_FRILLS |
3387 | && !selection.rect |
3331 | && !selection.rect |
3388 | #endif |
3332 | #endif |
3389 | ) |
3333 | ) |
3390 | selection.end.col = ncol; |
3334 | selection.end.col = ncol; |
… | |
… | |
3392 | else if (selection.clicks == 2) |
3336 | else if (selection.clicks == 2) |
3393 | { |
3337 | { |
3394 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3338 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3395 | selection.end.col--; |
3339 | selection.end.col--; |
3396 | |
3340 | |
|
|
3341 | if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) |
|
|
3342 | { |
3397 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3343 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3398 | selection_delimit_word (DN, &selection.end, &selection.end); |
3344 | selection_delimit_word (DN, &selection.end, &selection.end); |
|
|
3345 | } |
3399 | } |
3346 | } |
3400 | else if (selection.clicks == 3) |
3347 | else if (selection.clicks == 3) |
3401 | { |
3348 | { |
3402 | #if ENABLE_FRILLS |
3349 | #if ENABLE_FRILLS |
3403 | if (options & Opt_tripleclickwords) |
3350 | if (OPTION (Opt_tripleclickwords)) |
3404 | { |
3351 | { |
3405 | int end_row; |
|
|
3406 | |
|
|
3407 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3352 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3408 | end_row = save[selection.mark.row + saveLines].l; |
|
|
3409 | |
3353 | |
3410 | for (end_row = selection.mark.row; end_row < nrow; end_row++) |
3354 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3411 | { |
3355 | { |
3412 | end_col = save[end_row + saveLines].l; |
3356 | if (!ROW(end_row).is_longer ()) |
3413 | |
|
|
3414 | if (end_col != -1) |
|
|
3415 | { |
3357 | { |
3416 | selection.end.row = end_row; |
3358 | selection.end.row = end_row; |
3417 | selection.end.col = end_col; |
3359 | selection.end.col = ROW(end_row).l; |
3418 | selection_remove_trailing_spaces (); |
3360 | selection_remove_trailing_spaces (); |
3419 | break; |
3361 | break; |
3420 | } |
3362 | } |
3421 | } |
3363 | } |
3422 | } |
3364 | } |
… | |
… | |
3429 | selection.beg.col = 0; |
3371 | selection.beg.col = 0; |
3430 | selection.end.col = ncol; |
3372 | selection.end.col = ncol; |
3431 | |
3373 | |
3432 | // select a complete logical line |
3374 | // select a complete logical line |
3433 | while (selection.beg.row > -saveLines |
3375 | while (selection.beg.row > -saveLines |
3434 | && save[selection.beg.row - 1 + saveLines].is_cont ()) |
3376 | && ROW(selection.beg.row - 1).is_longer ()) |
3435 | selection.beg.row--; |
3377 | selection.beg.row--; |
3436 | |
3378 | |
3437 | while (selection.end.row < nrow |
3379 | while (selection.end.row < nrow |
3438 | && save[selection.end.row + saveLines].is_cont ()) |
3380 | && ROW(selection.end.row).is_longer ()) |
3439 | selection.end.row++; |
3381 | selection.end.row++; |
3440 | } |
3382 | } |
3441 | } |
3383 | } |
3442 | |
3384 | |
3443 | if (button3 && buttonpress) |
3385 | if (button3 && buttonpress) |
… | |
… | |
3454 | } |
3396 | } |
3455 | } |
3397 | } |
3456 | |
3398 | |
3457 | #if ENABLE_FRILLS |
3399 | #if ENABLE_FRILLS |
3458 | if (selection.rect && selection.beg.col > selection.end.col) |
3400 | if (selection.rect && selection.beg.col > selection.end.col) |
3459 | SWAP_IT (selection.beg.col, selection.end.col, int); |
3401 | ::swap (selection.beg.col, selection.end.col); |
3460 | #endif |
3402 | #endif |
3461 | } |
3403 | } |
3462 | |
3404 | |
3463 | #if ENABLE_FRILLS |
3405 | #if ENABLE_FRILLS |
3464 | void |
3406 | void |
… | |
… | |
3468 | text_t *stp; |
3410 | text_t *stp; |
3469 | |
3411 | |
3470 | end_col = selection.end.col; |
3412 | end_col = selection.end.col; |
3471 | end_row = selection.end.row; |
3413 | end_row = selection.end.row; |
3472 | |
3414 | |
3473 | for ( ; end_row >= selection.beg.row; ) |
3415 | for (; end_row >= selection.beg.row; ) |
3474 | { |
3416 | { |
3475 | stp = save[end_row + saveLines].t; |
3417 | stp = ROW(end_row).t; |
3476 | |
3418 | |
3477 | while (--end_col >= 0) |
3419 | while (--end_col >= 0) |
3478 | { |
3420 | { |
3479 | if (stp[end_col] != ' ' |
3421 | if (stp[end_col] != NOCHAR |
3480 | && stp[end_col] != '\t' |
3422 | && !unicode::is_space (stp[end_col])) |
3481 | && stp[end_col] != NOCHAR) |
|
|
3482 | break; |
3423 | break; |
3483 | } |
3424 | } |
3484 | |
3425 | |
3485 | if (end_col >= 0 |
3426 | if (end_col >= 0 |
3486 | || save[end_row - 1 + saveLines].l != -1) |
3427 | || !ROW(end_row - 1).is_longer ()) |
3487 | { |
3428 | { |
3488 | selection.end.col = end_col + 1; |
3429 | selection.end.col = end_col + 1; |
3489 | selection.end.row = end_row; |
3430 | selection.end.row = end_row; |
3490 | break; |
3431 | break; |
3491 | } |
3432 | } |
… | |
… | |
3662 | */ |
3603 | */ |
3663 | void |
3604 | void |
3664 | rxvt_term::pixel_position (int *x, int *y) |
3605 | rxvt_term::pixel_position (int *x, int *y) |
3665 | { |
3606 | { |
3666 | *x = Pixel2Col (*x); |
3607 | *x = Pixel2Col (*x); |
3667 | /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ |
3608 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
3668 | *y = Pixel2Row (*y); |
3609 | *y = Pixel2Row (*y); |
3669 | /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ |
3610 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
3670 | } |
3611 | } |
3671 | |
3612 | |
3672 | /* ------------------------------------------------------------------------- */ |
3613 | /* ------------------------------------------------------------------------- */ |
3673 | #ifdef USE_XIM |
3614 | #ifdef USE_XIM |
3674 | void |
3615 | void |
… | |
… | |
3685 | |
3626 | |
3686 | #if ENABLE_OVERLAY |
3627 | #if ENABLE_OVERLAY |
3687 | void |
3628 | void |
3688 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3629 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3689 | { |
3630 | { |
3690 | if (nrow < 3 || ncol < 3) |
3631 | if (nrow < 1 || ncol < 1) |
3691 | return; |
3632 | return; |
3692 | |
3633 | |
3693 | want_refresh = 1; |
3634 | want_refresh = 1; |
3694 | |
3635 | |
3695 | scr_overlay_off (); |
3636 | scr_overlay_off (); |
3696 | |
3637 | |
3697 | if (x < 0) x = ncol - w; |
3638 | if (x < 0) x = ncol - w; |
3698 | if (y < 0) y = nrow - h; |
3639 | if (y < 0) y = nrow - h; |
3699 | |
3640 | |
3700 | // make space for border |
3641 | // make space for border |
3701 | w += 2; MIN_IT (w, ncol); |
3642 | w += 2; min_it (w, ncol); |
3702 | h += 2; MIN_IT (h, nrow); |
3643 | h += 2; min_it (h, nrow); |
3703 | |
3644 | |
3704 | x -= 1; MAX_IT (x, 0); |
3645 | x -= 1; clamp_it (x, 0, ncol - w); |
3705 | y -= 1; MAX_IT (y, 0); |
3646 | y -= 1; clamp_it (y, 0, nrow - h); |
3706 | |
|
|
3707 | MIN_IT (x, ncol - w); |
|
|
3708 | MIN_IT (y, nrow - h); |
|
|
3709 | |
3647 | |
3710 | ov_x = x; ov_y = y; |
3648 | ov_x = x; ov_y = y; |
3711 | ov_w = w; ov_h = h; |
3649 | ov_w = w; ov_h = h; |
3712 | |
3650 | |
3713 | ov_text = new text_t *[h]; |
3651 | ov_text = new text_t *[h]; |
… | |
… | |
3799 | rxvt_term::scr_swap_overlay () |
3737 | rxvt_term::scr_swap_overlay () |
3800 | { |
3738 | { |
3801 | if (!ov_text) |
3739 | if (!ov_text) |
3802 | return; |
3740 | return; |
3803 | |
3741 | |
3804 | int row_offset = ov_y + saveLines - view_start; |
|
|
3805 | |
|
|
3806 | // swap screen mem with overlay |
3742 | // swap screen mem with overlay |
3807 | for (int y = ov_h; y--; ) |
3743 | for (int y = ov_h; y--; ) |
3808 | { |
3744 | { |
3809 | text_t *t1 = ov_text[y]; |
3745 | text_t *t1 = ov_text[y]; |
3810 | rend_t *r1 = ov_rend[y]; |
3746 | rend_t *r1 = ov_rend[y]; |
3811 | |
3747 | |
3812 | text_t *t2 = save[y + row_offset].t + ov_x; |
3748 | text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; |
3813 | rend_t *r2 = save[y + row_offset].r + ov_x; |
3749 | rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; |
3814 | |
3750 | |
3815 | for (int x = ov_w; x--; ) |
3751 | for (int x = ov_w; x--; ) |
3816 | { |
3752 | { |
3817 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3753 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3818 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3754 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
… | |
… | |
3820 | } |
3756 | } |
3821 | } |
3757 | } |
3822 | |
3758 | |
3823 | #endif |
3759 | #endif |
3824 | /* ------------------------------------------------------------------------- */ |
3760 | /* ------------------------------------------------------------------------- */ |
|
|
3761 | |