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() \ |
… | |
… | |
83 | #define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ |
84 | #define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ |
84 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
85 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
85 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
86 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
86 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
87 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
87 | |
88 | |
88 | #define LINENO(n) (((n) + term_start + total_rows) % total_rows) |
|
|
89 | #define ROW(n) (save [LINENO (n)]) |
|
|
90 | |
|
|
91 | /* |
89 | /* |
92 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
90 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
93 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
91 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
94 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
92 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
95 | */ |
93 | */ |
… | |
… | |
126 | lalloc (l); |
124 | lalloc (l); |
127 | col = 0; |
125 | col = 0; |
128 | width = ncol; |
126 | width = ncol; |
129 | } |
127 | } |
130 | |
128 | |
|
|
129 | l.touch (); |
|
|
130 | |
131 | efs &= ~RS_baseattrMask; |
131 | efs &= ~RS_baseattrMask; |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
133 | |
133 | |
134 | text_t *et = l.t + col; |
134 | text_t *et = l.t + col; |
135 | rend_t *er = l.r + col; |
135 | rend_t *er = l.r + col; |
… | |
… | |
145 | /* 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 */ |
146 | void |
146 | void |
147 | 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) |
148 | { |
148 | { |
149 | scr_blank_line (l, 0, ncol, efs); |
149 | scr_blank_line (l, 0, ncol, efs); |
|
|
150 | |
|
|
151 | l.l = 0; |
|
|
152 | l.f = 0; |
150 | } |
153 | } |
151 | |
154 | |
152 | /* ------------------------------------------------------------------------- * |
155 | /* ------------------------------------------------------------------------- * |
153 | * SCREEN INITIALISATION * |
156 | * SCREEN INITIALISATION * |
154 | * ------------------------------------------------------------------------- */ |
157 | * ------------------------------------------------------------------------- */ |
|
|
158 | |
155 | void |
159 | void |
156 | rxvt_term::scr_reset () |
160 | rxvt_term::scr_reset () |
157 | { |
161 | { |
158 | unsigned int p, q; |
|
|
159 | int k; |
|
|
160 | |
|
|
161 | #if ENABLE_OVERLAY |
162 | #if ENABLE_OVERLAY |
162 | scr_overlay_off (); |
163 | scr_overlay_off (); |
163 | #endif |
164 | #endif |
164 | |
165 | |
165 | view_start = 0; |
166 | view_start = 0; |
… | |
… | |
175 | return; |
176 | return; |
176 | |
177 | |
177 | // we need at least two lines for wrapping to work correctly |
178 | // we need at least two lines for wrapping to work correctly |
178 | if (nrow + saveLines < 2) |
179 | if (nrow + saveLines < 2) |
179 | { |
180 | { |
|
|
181 | //TODO//FIXME |
180 | saveLines++; |
182 | saveLines++; |
181 | prev_nrow--; |
183 | prev_nrow--; |
182 | nsaved++; |
184 | nsaved++; |
183 | } |
185 | } |
184 | |
186 | |
… | |
… | |
188 | total_rows = nrow + saveLines; |
190 | total_rows = nrow + saveLines; |
189 | |
191 | |
190 | screen.tscroll = 0; |
192 | screen.tscroll = 0; |
191 | screen.bscroll = nrow - 1; |
193 | screen.bscroll = nrow - 1; |
192 | |
194 | |
193 | if (!save) |
195 | if (!row_buf) |
194 | { |
196 | { |
195 | /* |
197 | /* |
196 | * 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 |
197 | * Note: this is still needed so that all the scrollback lines are NULL |
199 | * Note: this is still needed so that all the scrollback lines are NULL |
198 | */ |
200 | */ |
… | |
… | |
200 | term_start = 0; |
202 | term_start = 0; |
201 | |
203 | |
202 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
204 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
203 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
205 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
204 | |
206 | |
205 | save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
206 | buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
207 | row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
208 | temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
207 | drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); |
209 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
208 | swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); |
210 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
209 | |
211 | |
210 | for (p = nrow; p--; ) |
212 | for (int row = nrow; row--; ) |
211 | { |
213 | { |
212 | scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); |
214 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
213 | scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); |
215 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
214 | scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); |
216 | scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
215 | } |
217 | } |
216 | |
218 | |
217 | memset (charsets, 'B', sizeof (charsets)); |
219 | memset (charsets, 'B', sizeof (charsets)); |
218 | rstyle = DEFAULT_RSTYLE; |
220 | rstyle = DEFAULT_RSTYLE; |
219 | screen.flags = Screen_DefaultFlags; |
221 | screen.flags = Screen_DefaultFlags; |
… | |
… | |
243 | { |
245 | { |
244 | /* |
246 | /* |
245 | * add or delete rows as appropriate |
247 | * add or delete rows as appropriate |
246 | */ |
248 | */ |
247 | |
249 | |
248 | rxvt_salloc *old_ta; |
250 | rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
249 | rxvt_salloc *old_ra; |
251 | rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
250 | |
252 | |
|
|
253 | #if 0 |
251 | if (nrow < prev_nrow) |
254 | if (nrow < prev_nrow) |
252 | { |
255 | { |
253 | /* delete rows */ |
|
|
254 | k = min (nsaved, prev_nrow - nrow); |
|
|
255 | // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO |
|
|
256 | scr_scroll_text (0, (int)prev_nrow - 1, k); |
|
|
257 | |
|
|
258 | for (p = nrow; p < prev_nrow; p++) |
256 | for (int row = nrow; row < prev_nrow; row++) |
259 | { |
257 | { |
260 | lfree (ROW(p)); |
|
|
261 | lfree (swap_save[p]); |
258 | lfree (swap_buf [row]); |
262 | lfree (drawn[p]); |
259 | lfree (drawn_buf[row]); |
263 | } |
260 | } |
|
|
261 | } |
|
|
262 | #endif |
264 | |
263 | |
265 | /* we have fewer rows so fix up cursor position */ |
264 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
266 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
265 | temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t)); |
|
|
266 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
267 | |
267 | |
268 | scr_reset_realloc (); /* realloc _last_ */ |
268 | for (int row = min (nrow, prev_nrow); row--; ) |
|
|
269 | { |
|
|
270 | lresize (drawn_buf[row]); |
|
|
271 | lresize (swap_buf [row]); |
|
|
272 | } |
|
|
273 | |
|
|
274 | for (int row = prev_nrow; row < nrow; row++) |
|
|
275 | { |
|
|
276 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
277 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
|
|
278 | } |
|
|
279 | |
|
|
280 | line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
269 | } |
281 | |
270 | else if (nrow > prev_nrow) |
282 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
|
|
283 | int pend = MOD (term_start - nsaved , prev_total_rows); |
|
|
284 | int q = total_rows; // rewrapped row |
|
|
285 | |
|
|
286 | if (nsaved) |
|
|
287 | { |
|
|
288 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
|
|
289 | // to come up with a lean and mean algorithm. |
|
|
290 | |
|
|
291 | row_col_t ocur = screen.cur; |
|
|
292 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
|
|
293 | |
271 | { |
294 | do |
272 | /* add rows */ |
|
|
273 | scr_reset_realloc (); /* realloc _first_ */ |
|
|
274 | |
|
|
275 | int ocol = ncol; |
|
|
276 | ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
|
|
277 | |
|
|
278 | k = min (nsaved, nrow - prev_nrow); |
|
|
279 | |
|
|
280 | for (p = prev_total_rows; p < total_rows; p++) |
|
|
281 | save[p].clear (); |
|
|
282 | |
|
|
283 | for (p = prev_total_rows; p < total_rows - k; p++) |
|
|
284 | scr_blank_screen_mem (save[p], DEFAULT_RSTYLE); |
|
|
285 | |
|
|
286 | for (p = prev_nrow; p < nrow; p++) |
|
|
287 | { |
295 | { |
288 | swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); |
296 | 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); |
|
|
295 | screen.cur.row += k; |
|
|
296 | screen.s_cur.row += k; |
|
|
297 | nsaved -= k; |
|
|
298 | } |
|
|
299 | |
|
|
300 | #ifdef DEBUG_STRICT |
297 | #ifdef DEBUG_STRICT |
301 | assert (screen.cur.row < nrow); |
298 | 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 |
299 | #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; |
300 | int plines = 1; |
|
|
301 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
352 | |
302 | |
353 | assert (llen >= 0); |
303 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
354 | |
|
|
355 | while (p && save[p - 1].l < 0) |
|
|
356 | { |
304 | { |
|
|
305 | p = MOD (p - 1, prev_total_rows); |
|
|
306 | |
357 | --p; |
307 | plines++; |
358 | llen += prev_ncol; |
308 | llen += prev_ncol; |
359 | } |
309 | } |
360 | |
310 | |
361 | int qlines = llen / ncol + 1; |
311 | int qlines = max (0, (llen - 1) / ncol) + 1; |
|
|
312 | |
|
|
313 | // drop partial lines completely |
|
|
314 | if (q < qlines) |
|
|
315 | break; |
|
|
316 | |
|
|
317 | q -= qlines; |
|
|
318 | |
362 | int lofs = 0; |
319 | int lofs = 0; |
|
|
320 | line_t *qline; |
363 | |
321 | |
364 | q -= qlines; |
322 | // 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++) |
323 | for (int qrow = q; qlines--; qrow++) |
370 | { |
324 | { |
|
|
325 | qline = row_buf + qrow; |
|
|
326 | lalloc (*qline); |
|
|
327 | qline->l = ncol; |
|
|
328 | qline->is_longer (1); |
|
|
329 | |
371 | if (qrow >= 0) |
330 | int qcol = 0; |
|
|
331 | |
|
|
332 | // fill a single destination line |
|
|
333 | while (lofs < llen && qcol < ncol) |
372 | { |
334 | { |
373 | tp [qrow] = (text_t *)ta->alloc (); |
|
|
374 | rp [qrow] = (rend_t *)ra->alloc (); |
|
|
375 | tl [qrow] = LINE_CONT1; |
|
|
376 | |
|
|
377 | int qcol = 0; |
|
|
378 | |
|
|
379 | for (;;) |
|
|
380 | { |
|
|
381 | int prow = lofs / prev_ncol + p; |
335 | int prow = lofs / prev_ncol; |
382 | int pcol = lofs % prev_ncol; |
336 | int pcol = lofs % prev_ncol; |
383 | |
337 | |
|
|
338 | prow = MOD (p + prow, prev_total_rows); |
|
|
339 | |
|
|
340 | // we only adjust the cursor _row_ and put it into |
|
|
341 | // the topmost line of "long line" it was in, as |
|
|
342 | // this seems to upset applications/shells/readline |
|
|
343 | // least. |
|
|
344 | if (prow == ocur.row) |
|
|
345 | screen.cur.row = q - (total_rows - nrow); |
|
|
346 | |
|
|
347 | line_t &pline = old_buf [prow]; |
|
|
348 | |
384 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
349 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
385 | |
350 | |
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); |
351 | assert (len); |
|
|
352 | assert (pline.t); |
400 | |
353 | |
401 | memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); |
354 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
402 | memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); |
355 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
403 | |
356 | |
404 | lofs += len; |
357 | lofs += len; |
405 | qcol += len; |
358 | qcol += len; |
406 | |
|
|
407 | if (qcol == ncol) |
|
|
408 | break; |
|
|
409 | } |
|
|
410 | } |
359 | } |
411 | else |
|
|
412 | lofs += ncol; |
|
|
413 | } |
360 | } |
|
|
361 | |
|
|
362 | qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; |
|
|
363 | qline->is_longer (0); |
|
|
364 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
414 | } |
365 | } |
|
|
366 | while (p != pend && q > 0); |
|
|
367 | |
|
|
368 | term_start = total_rows - nrow; |
|
|
369 | nsaved = term_start - q; |
|
|
370 | |
|
|
371 | // make sure all terminal lines exist |
|
|
372 | while (nsaved < 0) |
|
|
373 | scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); |
|
|
374 | } |
|
|
375 | else |
415 | } |
376 | { |
|
|
377 | // if no scrollback exists (yet), wing, instead of wrap |
|
|
378 | |
|
|
379 | for (int row = min (nrow, prev_nrow); row--; ) |
|
|
380 | { |
|
|
381 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
|
|
382 | line_t &qline = row_buf [row]; |
416 | |
383 | |
417 | free (screen.text); screen.text = tp; |
384 | qline = pline; |
418 | free (screen.rend); screen.rend = rp; |
385 | lresize (qline); |
419 | free (screen.tlen); screen.tlen = tl; |
386 | } |
420 | |
387 | |
421 | for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D |
388 | for (int row = prev_nrow; row < nrow; row++) |
|
|
389 | { |
|
|
390 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
|
|
391 | } |
|
|
392 | |
|
|
393 | term_start = 0; |
|
|
394 | } |
|
|
395 | |
|
|
396 | #ifdef DEBUG_STRICT //TODO: remove |
|
|
397 | for (int i = -nsaved; i < nrow; i++) |
|
|
398 | assert (ROW (i).t); |
422 | #endif |
399 | #endif |
|
|
400 | |
|
|
401 | free (old_buf); |
|
|
402 | delete old_ta; |
|
|
403 | delete old_ra; |
|
|
404 | |
|
|
405 | clamp_it (screen.cur.row, 0, nrow - 1); |
|
|
406 | clamp_it (screen.cur.col, 0, ncol - 1); |
423 | |
407 | |
424 | if (tabs) |
408 | if (tabs) |
425 | free (tabs); |
409 | free (tabs); |
426 | } |
410 | } |
427 | |
411 | |
428 | prev_nrow = nrow; |
412 | prev_nrow = nrow; |
429 | prev_ncol = ncol; |
413 | prev_ncol = ncol; |
430 | |
414 | |
431 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
415 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
432 | |
416 | |
433 | for (p = 0; p < ncol; p++) |
417 | for (int col = ncol; col--; ) |
434 | tabs[p] = (p % TABSIZE == 0) ? 1 : 0; |
418 | tabs [col] = col % TABSIZE == 0; |
435 | |
419 | |
436 | tt_winch (); |
420 | tt_winch (); |
437 | } |
|
|
438 | |
421 | |
439 | void |
422 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
440 | rxvt_term::scr_reset_realloc () |
|
|
441 | { |
|
|
442 | swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t)); |
|
|
443 | drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t)); |
|
|
444 | buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t)); |
|
|
445 | save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t)); |
|
|
446 | } |
423 | } |
447 | |
424 | |
448 | /* ------------------------------------------------------------------------- */ |
425 | /* ------------------------------------------------------------------------- */ |
449 | /* |
426 | /* |
450 | * Free everything. That way malloc debugging can find leakage. |
427 | * Free everything. That way malloc debugging can find leakage. |
… | |
… | |
453 | rxvt_term::scr_release () |
430 | rxvt_term::scr_release () |
454 | { |
431 | { |
455 | delete talloc; talloc = 0; |
432 | delete talloc; talloc = 0; |
456 | delete ralloc; ralloc = 0; |
433 | delete ralloc; ralloc = 0; |
457 | |
434 | |
458 | free (save); |
435 | free (row_buf); |
459 | free (swap_save); |
436 | free (swap_buf); |
460 | free (drawn); |
437 | free (drawn_buf); |
461 | free (buf); |
438 | free (temp_buf); |
462 | free (tabs); |
439 | free (tabs); |
|
|
440 | |
|
|
441 | row_buf = 0; // signal that we freed all the arrays |
463 | } |
442 | } |
464 | |
443 | |
465 | /* ------------------------------------------------------------------------- */ |
444 | /* ------------------------------------------------------------------------- */ |
466 | /* |
445 | /* |
467 | * Hard reset |
446 | * Hard reset |
… | |
… | |
518 | set_font_style (); |
497 | set_font_style (); |
519 | break; |
498 | break; |
520 | } |
499 | } |
521 | |
500 | |
522 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
501 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
523 | MIN_IT (s->cur.row, nrow - 1); |
502 | min_it (s->cur.row, nrow - 1); |
524 | MIN_IT (s->cur.col, ncol - 1); |
503 | min_it (s->cur.col, ncol - 1); |
525 | #ifdef DEBUG_STRICT |
504 | #ifdef DEBUG_STRICT |
526 | assert (s->cur.row >= 0); |
505 | assert (s->cur.row >= 0); |
527 | assert (s->cur.col >= 0); |
506 | assert (s->cur.col >= 0); |
528 | #else /* drive with your eyes closed */ |
|
|
529 | MAX_IT (s->cur.row, 0); |
|
|
530 | MAX_IT (s->cur.col, 0); |
|
|
531 | #endif |
507 | #endif |
532 | } |
508 | } |
533 | |
509 | |
534 | /* ------------------------------------------------------------------------- */ |
510 | /* ------------------------------------------------------------------------- */ |
535 | /* |
511 | /* |
… | |
… | |
546 | if (current_screen == scrn) |
522 | if (current_screen == scrn) |
547 | return scrn; |
523 | return scrn; |
548 | |
524 | |
549 | selection_check (2); /* check for boundary cross */ |
525 | selection_check (2); /* check for boundary cross */ |
550 | |
526 | |
551 | SWAP_IT (scrn, current_screen, int); |
527 | int i = current_screen; current_screen = scrn; scrn = i; |
552 | |
528 | |
553 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
529 | ::swap (screen.cur.row, swap.cur.row); |
554 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
530 | ::swap (screen.cur.col, swap.cur.col); |
555 | MAX_IT (screen.cur.row, 0); |
531 | |
556 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
532 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
557 | MAX_IT (screen.cur.col, 0); |
533 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
558 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
|
|
559 | |
534 | |
560 | #if NSCREENS |
535 | #if NSCREENS |
561 | if (options & Opt_secondaryScreen) |
536 | if (OPTION (Opt_secondaryScreen)) |
562 | { |
537 | { |
563 | num_scr = 0; |
538 | num_scr = 0; |
564 | |
539 | |
565 | for (int i = nrow; i--; ) |
540 | for (int i = prev_nrow; i--; ) |
566 | SWAP_IT (ROW(i), swap_save[i], line_t); |
541 | ::swap (ROW(i), swap_buf [i]); |
567 | |
542 | |
568 | SWAP_IT (screen.charset, swap.charset, int16_t); |
543 | ::swap (screen.charset, swap.charset); |
569 | SWAP_IT (screen.flags, swap.flags, int); |
544 | ::swap (screen.flags, swap.flags); |
570 | screen.flags |= Screen_VisibleCursor; |
545 | screen.flags |= Screen_VisibleCursor; |
571 | swap.flags |= Screen_VisibleCursor; |
546 | swap.flags |= Screen_VisibleCursor; |
572 | } |
547 | } |
573 | else |
548 | else |
574 | #endif |
549 | #endif |
575 | if (options & Opt_secondaryScroll) |
550 | if (OPTION (Opt_secondaryScroll)) |
576 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
551 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
577 | |
552 | |
578 | return scrn; |
553 | return scrn; |
579 | } |
554 | } |
580 | |
555 | |
… | |
… | |
639 | return 0; |
614 | return 0; |
640 | |
615 | |
641 | want_refresh = 1; |
616 | want_refresh = 1; |
642 | num_scr += count; |
617 | num_scr += count; |
643 | |
618 | |
644 | if (row1 == 0 && count > 0 |
619 | if (count > 0 |
|
|
620 | && row1 == 0 |
|
|
621 | && row2 == nrow - 1 |
645 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
622 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
646 | { |
623 | { |
647 | nsaved = min (nsaved + count, saveLines); |
624 | nsaved = min (nsaved + count, saveLines); |
|
|
625 | |
|
|
626 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); |
|
|
627 | |
648 | term_start = (term_start + count) % total_rows; |
628 | term_start = (term_start + count) % total_rows; |
649 | |
629 | |
650 | if (selection.op && current_screen == selection.screen) |
630 | if (selection.op && current_screen == selection.screen) |
651 | { |
631 | { |
652 | selection.beg.row -= count; |
632 | selection.beg.row -= count; |
653 | selection.end.row -= count; |
633 | selection.end.row -= count; |
654 | selection.mark.row -= count; |
634 | selection.mark.row -= count; |
655 | |
635 | |
656 | selection_check (0); |
636 | if (selection.beg.row < -nsaved |
|
|
637 | || selection.end.row < -nsaved |
|
|
638 | || selection.mark.row < -nsaved) |
|
|
639 | { |
|
|
640 | CLEAR_ALL_SELECTION (); |
|
|
641 | selection.op = SELECTION_CLEAR; |
|
|
642 | } |
657 | } |
643 | } |
658 | |
644 | |
659 | for (int i = count; i--; ) |
645 | for (int i = count; i--; ) |
660 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
646 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
661 | |
647 | |
662 | if ((options & Opt_scrollWithBuffer) |
648 | if (OPTION (Opt_scrollWithBuffer) |
663 | && view_start != 0 |
649 | && view_start != 0 |
664 | && view_start != saveLines) |
650 | && view_start != saveLines) |
665 | scr_page (UP, count); |
651 | scr_page (UP, count); |
666 | } |
652 | } |
667 | else |
653 | else |
668 | { |
654 | { |
669 | if (selection.op && current_screen == selection.screen) |
655 | if (selection.op && current_screen == selection.screen) |
670 | { |
656 | { |
671 | int i = selection.beg.row; |
657 | if ((selection.beg.row < row1 && selection.end.row > row1) |
672 | int j = selection.end.row; |
658 | || (selection.beg.row < row2 && selection.end.row > row2) |
673 | |
|
|
674 | if ((i < row1 && j > row1) |
|
|
675 | || (i < row2 && j > row2) |
|
|
676 | || (i - count < row1 && i >= row1) |
659 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
677 | || (i - count > row2 && i <= row2) |
660 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
678 | || (j - count < row1 && j >= row1) |
661 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
679 | || (j - count > row2 && j <= row2)) |
662 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
680 | { |
663 | { |
681 | CLEAR_ALL_SELECTION (); |
664 | CLEAR_ALL_SELECTION (); |
682 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
665 | selection.op = SELECTION_CLEAR; |
683 | } |
666 | } |
684 | else if (j >= row1 && j <= row2) |
667 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
685 | { |
668 | { |
686 | /* move selected region too */ |
669 | /* move selected region too */ |
687 | selection.beg.row -= count; |
670 | selection.beg.row -= count; |
688 | selection.end.row -= count; |
671 | selection.end.row -= count; |
689 | selection.mark.row -= count; |
672 | selection.mark.row -= count; |
… | |
… | |
695 | // use a simple and robust scrolling algorithm, this |
678 | // use a simple and robust scrolling algorithm, this |
696 | // part of scr_scroll_text is not time-critical. |
679 | // part of scr_scroll_text is not time-critical. |
697 | |
680 | |
698 | int rows = row2 - row1 + 1; |
681 | int rows = row2 - row1 + 1; |
699 | |
682 | |
|
|
683 | min_it (count, rows); |
|
|
684 | |
700 | for (int row = 0; row < rows; row++) |
685 | for (int row = 0; row < rows; row++) |
701 | { |
686 | { |
702 | buf [row] = ROW(row1 + (row + count + rows) % rows); |
687 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
703 | |
688 | |
704 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
689 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
705 | scr_blank_screen_mem (buf [row], rstyle); |
690 | scr_blank_screen_mem (temp_buf [row], rstyle); |
706 | } |
691 | } |
707 | |
692 | |
708 | for (int row = 0; row < rows; row++) |
693 | for (int row = 0; row < rows; row++) |
709 | ROW(row1 + row) = buf [row]; |
694 | ROW(row1 + row) = temp_buf [row]; |
710 | } |
695 | } |
711 | |
696 | |
712 | return count; |
697 | return count; |
713 | } |
698 | } |
714 | |
699 | |
715 | /* ------------------------------------------------------------------------- */ |
700 | /* ------------------------------------------------------------------------- */ |
716 | /* |
701 | /* |
717 | * Add text given in <str> of length <len> to screen struct |
702 | * Add text given in <str> of length <len> to screen struct |
718 | */ |
703 | */ |
719 | void |
704 | void |
720 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
705 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) |
721 | { |
706 | { |
722 | if (len <= 0) /* sanity */ |
707 | if (len <= 0) /* sanity */ |
723 | return; |
708 | return; |
724 | |
709 | |
725 | unsigned char checksel; |
710 | unsigned char checksel; |
726 | unicode_t c; |
711 | unicode_t c; |
727 | int row, last_col; |
712 | int ncol = this->ncol; |
728 | const unicode_t *strend = str + len; |
713 | const wchar_t *strend = str + len; |
729 | |
714 | |
730 | want_refresh = 1; |
715 | want_refresh = 1; |
731 | ZERO_SCROLLBACK (); |
716 | ZERO_SCROLLBACK (); |
732 | last_col = ncol; |
|
|
733 | |
717 | |
734 | if (nlines > 0) |
718 | if (minlines > 0) |
735 | { |
719 | { |
736 | nlines += screen.cur.row - screen.bscroll; |
720 | minlines += screen.cur.row - screen.bscroll; |
|
|
721 | |
737 | if ((nlines > 0) |
722 | if (minlines > 0 |
738 | && (screen.tscroll == 0) |
723 | && screen.tscroll == 0 |
739 | && (screen.bscroll == (nrow - 1))) |
724 | && screen.bscroll == nrow - 1) |
740 | { |
725 | { |
741 | /* _at least_ this many lines need to be scrolled */ |
726 | /* _at least_ this many lines need to be scrolled */ |
742 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines); |
727 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
743 | screen.cur.row -= nlines; |
728 | screen.cur.row -= minlines; |
744 | } |
729 | } |
745 | } |
730 | } |
746 | |
731 | |
747 | #ifdef DEBUG_STRICT |
732 | #ifdef DEBUG_STRICT |
748 | assert (screen.cur.col < last_col); |
733 | assert (screen.cur.col < ncol); |
749 | assert ((screen.cur.row < nrow) |
734 | assert (screen.cur.row < nrow |
750 | && (screen.cur.row >= - (int32_t)nsaved)); |
735 | && screen.cur.row >= -nsaved); |
751 | #else /* drive with your eyes closed */ |
|
|
752 | MIN_IT (screen.cur.col, last_col - 1); |
|
|
753 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
|
|
754 | MAX_IT (screen.cur.row, - (int32_t)nsaved); |
|
|
755 | #endif |
736 | #endif |
756 | row = screen.cur.row; |
737 | int row = screen.cur.row; |
757 | |
738 | |
758 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
739 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
759 | |
740 | |
760 | line_t *line = &ROW(row); |
741 | line_t *line = &ROW(row); |
761 | |
742 | |
762 | while (str < strend) |
743 | while (str < strend) |
763 | { |
744 | { |
764 | c = *str++; |
745 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
765 | |
746 | |
766 | if (c < 0x20) |
747 | if (c < 0x20) |
767 | if (c == C0_LF) |
748 | if (c == C0_LF) |
768 | { |
749 | { |
769 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
770 | MAX_IT (line->l, screen.cur.col); |
750 | max_it (line->l, screen.cur.col); |
771 | |
751 | |
772 | screen.flags &= ~Screen_WrapNext; |
752 | screen.flags &= ~Screen_WrapNext; |
773 | |
753 | |
774 | if (screen.cur.row == screen.bscroll) |
754 | if (screen.cur.row == screen.bscroll) |
775 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
755 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
… | |
… | |
779 | line = &ROW(row); /* _must_ refresh */ |
759 | line = &ROW(row); /* _must_ refresh */ |
780 | continue; |
760 | continue; |
781 | } |
761 | } |
782 | else if (c == C0_CR) |
762 | else if (c == C0_CR) |
783 | { |
763 | { |
784 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
785 | MAX_IT (line->l, screen.cur.col); |
764 | max_it (line->l, screen.cur.col); |
786 | |
765 | |
787 | screen.flags &= ~Screen_WrapNext; |
766 | screen.flags &= ~Screen_WrapNext; |
788 | screen.cur.col = 0; |
767 | screen.cur.col = 0; |
789 | continue; |
768 | continue; |
790 | } |
769 | } |
… | |
… | |
807 | CLEAR_SELECTION (); |
786 | CLEAR_SELECTION (); |
808 | } |
787 | } |
809 | |
788 | |
810 | if (screen.flags & Screen_WrapNext) |
789 | if (screen.flags & Screen_WrapNext) |
811 | { |
790 | { |
|
|
791 | max_it (line->l, ncol); |
812 | line->set_is_longer (); |
792 | line->is_longer (1); |
813 | |
793 | |
814 | scr_do_wrap (); |
794 | scr_do_wrap (); |
815 | |
795 | |
816 | row = screen.cur.row; |
796 | row = screen.cur.row; |
817 | line = &ROW(row); /* _must_ refresh */ |
797 | line = &ROW(row); /* _must_ refresh */ |
… | |
… | |
825 | // do wcwidth before further replacements, as wcwidth might return -1 |
805 | // do wcwidth before further replacements, as wcwidth might return -1 |
826 | // for the line drawing characters below as they might be invalid in the current |
806 | // for the line drawing characters below as they might be invalid in the current |
827 | // locale. |
807 | // locale. |
828 | int width = c < 0x100 ? 1 : wcwidth (c); |
808 | int width = c < 0x100 ? 1 : wcwidth (c); |
829 | |
809 | |
830 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
810 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
831 | { |
811 | { |
832 | // vt100 special graphics and line drawing |
812 | // vt100 special graphics and line drawing |
833 | // 5f-7e standard vt100 |
813 | // 5f-7e standard vt100 |
834 | // 40-5e rxvt extension for extra curses acs chars |
814 | // 40-5e rxvt extension for extra curses acs chars |
835 | static uint16_t vt100_0[62] = { // 41 .. 7e |
815 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
887 | } |
867 | } |
888 | |
868 | |
889 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
869 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
890 | |
870 | |
891 | // if the character doesn't fit into the remaining columns... |
871 | // if the character doesn't fit into the remaining columns... |
892 | if (screen.cur.col > last_col - width && last_col >= width) |
872 | if (screen.cur.col > ncol - width && ncol >= width) |
893 | { |
873 | { |
894 | // ...output spaces |
874 | // ...output spaces |
895 | c = ' '; |
875 | c = ' '; |
896 | // and try the same character next loop iteration |
876 | // and try the same character next loop iteration |
897 | --str; |
877 | --str; |
898 | } |
878 | } |
899 | |
879 | |
|
|
880 | line->touch (); |
|
|
881 | |
900 | do |
882 | do |
901 | { |
883 | { |
902 | line->t[screen.cur.col] = c; |
884 | line->t[screen.cur.col] = c; |
903 | line->r[screen.cur.col] = rend; |
885 | line->r[screen.cur.col] = rend; |
904 | |
886 | |
905 | if (screen.cur.col < last_col - 1) |
887 | if (screen.cur.col < ncol - 1) |
906 | screen.cur.col++; |
888 | screen.cur.col++; |
907 | else |
889 | else |
908 | { |
890 | { |
909 | line->l = last_col; |
891 | line->l = ncol; |
910 | if (screen.flags & Screen_Autowrap) |
892 | if (screen.flags & Screen_Autowrap) |
911 | screen.flags |= Screen_WrapNext; |
893 | screen.flags |= Screen_WrapNext; |
912 | break; |
894 | break; |
913 | } |
895 | } |
914 | |
896 | |
… | |
… | |
916 | } |
898 | } |
917 | while (--width > 0); |
899 | while (--width > 0); |
918 | |
900 | |
919 | // pad with spaces when overwriting wide character with smaller one |
901 | // pad with spaces when overwriting wide character with smaller one |
920 | if (!width) |
902 | if (!width) |
|
|
903 | { |
|
|
904 | line->touch (); |
|
|
905 | |
921 | for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) |
906 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
922 | { |
907 | { |
923 | line->t[c] = ' '; |
908 | line->t[c] = ' '; |
924 | line->r[c] = rend; |
909 | line->r[c] = rend; |
925 | } |
910 | } |
|
|
911 | } |
926 | } |
912 | } |
927 | else // width == 0 |
913 | else // width == 0 |
928 | { |
914 | { |
929 | #if ENABLE_COMBINING |
915 | #if ENABLE_COMBINING |
930 | // handle combining characters |
916 | // handle combining characters |
931 | // we just tag the accent on the previous on-screen character. |
917 | // we just tag the accent on the previous on-screen character. |
932 | // this is arguably not correct, but also arguably not wrong. |
918 | // this is arguably not correct, but also arguably not wrong. |
933 | // we don't handle double-width characters nicely yet. |
919 | // we don't handle double-width characters nicely yet. |
|
|
920 | line_t *linep; |
934 | text_t *tp; |
921 | text_t *tp; |
935 | rend_t *rp; |
922 | rend_t *rp; |
936 | |
923 | |
937 | if (screen.cur.col > 0) |
924 | if (screen.cur.col > 0) |
938 | { |
925 | { |
|
|
926 | linep = line; |
939 | tp = line->t + screen.cur.col - 1; |
927 | tp = line->t + screen.cur.col - 1; |
940 | rp = line->r + screen.cur.col - 1; |
928 | rp = line->r + screen.cur.col - 1; |
941 | |
|
|
942 | while (*tp == NOCHAR && tp > line->t) |
|
|
943 | tp--, rp--; |
|
|
944 | } |
929 | } |
945 | else if (screen.cur.row > 0 |
930 | else if (screen.cur.row > 0 |
946 | && ROW(screen.cur.row - 1).is_longer ()) |
931 | && ROW(screen.cur.row - 1).is_longer ()) |
947 | { |
932 | { |
948 | line_t *line = &ROW(screen.cur.row - 1); |
933 | linep = &ROW(screen.cur.row - 1); |
949 | |
|
|
950 | tp = line->t + last_col - 1; |
934 | tp = line->t + ncol - 1; |
951 | rp = line->r + last_col - 1; |
935 | rp = line->r + ncol - 1; |
952 | |
|
|
953 | while (*tp == NOCHAR && tp > line->t) |
|
|
954 | tp--, rp--; |
|
|
955 | } |
936 | } |
956 | else |
937 | else |
957 | continue; |
938 | continue; |
|
|
939 | |
|
|
940 | linep->touch (); |
|
|
941 | |
|
|
942 | while (*tp == NOCHAR && tp > linep->t) |
|
|
943 | tp--, rp--; |
958 | |
944 | |
959 | // first try to find a precomposed character |
945 | // first try to find a precomposed character |
960 | unicode_t n = rxvt_compose (*tp, c); |
946 | unicode_t n = rxvt_compose (*tp, c); |
961 | if (n == NOCHAR) |
947 | if (n == NOCHAR) |
962 | n = rxvt_composite.compose (*tp, c); |
948 | n = rxvt_composite.compose (*tp, c); |
… | |
… | |
965 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
951 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
966 | #endif |
952 | #endif |
967 | } |
953 | } |
968 | } |
954 | } |
969 | |
955 | |
970 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
971 | MAX_IT (line->l, screen.cur.col); |
956 | max_it (line->l, screen.cur.col); |
972 | |
957 | |
973 | #ifdef DEBUG_STRICT |
958 | #ifdef DEBUG_STRICT |
974 | assert (screen.cur.row >= 0); |
959 | assert (screen.cur.row >= 0); |
975 | #else /* drive with your eyes closed */ |
|
|
976 | MAX_IT (screen.cur.row, 0); |
|
|
977 | #endif |
960 | #endif |
978 | } |
961 | } |
979 | |
962 | |
980 | /* ------------------------------------------------------------------------- */ |
963 | /* ------------------------------------------------------------------------- */ |
981 | /* |
964 | /* |
… | |
… | |
1020 | |
1003 | |
1021 | if (count == 0) |
1004 | if (count == 0) |
1022 | return; |
1005 | return; |
1023 | else if (count > 0) |
1006 | else if (count > 0) |
1024 | { |
1007 | { |
1025 | int row = screen.cur.row; |
|
|
1026 | |
|
|
1027 | line_t &l = ROW(row); |
1008 | line_t &l = ROW(screen.cur.row); |
1028 | rend_t base_rend = l.r[i]; |
1009 | rend_t base_rend = l.r[i]; |
1029 | ht &= l.t[i] == ' '; |
1010 | ht &= l.t[i] == ' '; |
1030 | |
1011 | |
1031 | for (; ++i < ncol; ) |
1012 | for (; ++i < ncol; ) |
1032 | if (tabs[i]) |
1013 | if (tabs[i]) |
1033 | { |
1014 | { |
1034 | x = i; |
1015 | x = i; |
|
|
1016 | |
1035 | if (!--count) |
1017 | if (!--count) |
1036 | break; |
1018 | break; |
1037 | } |
1019 | } |
1038 | else |
1020 | else |
1039 | ht &= l.t[i] == ' ' |
1021 | ht &= l.t[i] == ' ' |
… | |
… | |
1042 | if (count) |
1024 | if (count) |
1043 | x = ncol - 1; |
1025 | x = ncol - 1; |
1044 | |
1026 | |
1045 | // store horizontal tab commands as characters inside the text |
1027 | // store horizontal tab commands as characters inside the text |
1046 | // buffer so they can be selected and pasted. |
1028 | // buffer so they can be selected and pasted. |
1047 | if (ht && options & Opt_pastableTabs) |
1029 | if (ht && OPTION (Opt_pastableTabs)) |
1048 | { |
1030 | { |
1049 | base_rend = SET_FONT (base_rend, 0); |
1031 | base_rend = SET_FONT (base_rend, 0); |
1050 | |
1032 | |
1051 | if (!l.is_longer ()) /* XXX: think about this */ |
1033 | l.touch (x); |
1052 | MAX_IT (l.l, x); |
|
|
1053 | |
1034 | |
1054 | i = screen.cur.col; |
1035 | i = screen.cur.col; |
1055 | |
1036 | |
1056 | l.t[i] = '\t'; |
1037 | l.t[i] = '\t'; |
1057 | l.r[i] = base_rend; |
1038 | l.r[i] = base_rend; |
… | |
… | |
1107 | */ |
1088 | */ |
1108 | #if ENABLE_FRILLS |
1089 | #if ENABLE_FRILLS |
1109 | void |
1090 | void |
1110 | rxvt_term::scr_forwardindex () |
1091 | rxvt_term::scr_forwardindex () |
1111 | { |
1092 | { |
1112 | int row; |
|
|
1113 | |
|
|
1114 | if (screen.cur.col < ncol - 1) |
1093 | if (screen.cur.col < ncol - 1) |
1115 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1094 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1116 | else |
1095 | else |
1117 | { |
1096 | { |
1118 | row = screen.cur.row; |
1097 | line_t &l = ROW(screen.cur.row); |
1119 | |
1098 | |
1120 | if (ROW(row).is_longer ()) //TODO//FIXME//LEN |
1099 | l.touch (); |
1121 | ROW(row).l = ncol; |
1100 | l.is_longer (0); |
1122 | |
1101 | |
1123 | scr_gotorc (0, 0, R_RELATIVE); |
1102 | scr_gotorc (0, 0, R_RELATIVE); |
1124 | scr_insdel_chars (1, DELETE); |
1103 | scr_insdel_chars (1, DELETE); |
1125 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1104 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1126 | } |
1105 | } |
… | |
… | |
1136 | { |
1115 | { |
1137 | want_refresh = 1; |
1116 | want_refresh = 1; |
1138 | ZERO_SCROLLBACK (); |
1117 | ZERO_SCROLLBACK (); |
1139 | |
1118 | |
1140 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1119 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1141 | MAX_IT (screen.cur.col, 0); |
1120 | clamp_it (screen.cur.col, 0, ncol - 1); |
1142 | MIN_IT (screen.cur.col, (int32_t)ncol - 1); |
|
|
1143 | |
1121 | |
1144 | screen.flags &= ~Screen_WrapNext; |
1122 | screen.flags &= ~Screen_WrapNext; |
1145 | |
1123 | |
1146 | if (relative & R_RELATIVE) |
1124 | if (relative & R_RELATIVE) |
1147 | { |
1125 | { |
… | |
… | |
1165 | else |
1143 | else |
1166 | { |
1144 | { |
1167 | if (screen.flags & Screen_Relative) |
1145 | if (screen.flags & Screen_Relative) |
1168 | { /* relative origin mode */ |
1146 | { /* relative origin mode */ |
1169 | screen.cur.row = row + screen.tscroll; |
1147 | screen.cur.row = row + screen.tscroll; |
1170 | MIN_IT (screen.cur.row, screen.bscroll); |
1148 | min_it (screen.cur.row, screen.bscroll); |
1171 | } |
1149 | } |
1172 | else |
1150 | else |
1173 | screen.cur.row = row; |
1151 | screen.cur.row = row; |
1174 | } |
1152 | } |
1175 | |
1153 | |
1176 | MAX_IT (screen.cur.row, 0); |
1154 | clamp_it (screen.cur.row, 0, nrow - 1); |
1177 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
|
|
1178 | } |
1155 | } |
1179 | |
1156 | |
1180 | /* ------------------------------------------------------------------------- */ |
1157 | /* ------------------------------------------------------------------------- */ |
1181 | /* |
1158 | /* |
1182 | * direction should be UP or DN |
1159 | * direction should be UP or DN |
… | |
… | |
1197 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1174 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1198 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn); |
1175 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn); |
1199 | else |
1176 | else |
1200 | screen.cur.row += dirn; |
1177 | screen.cur.row += dirn; |
1201 | |
1178 | |
1202 | MAX_IT (screen.cur.row, 0); |
1179 | clamp_it (screen.cur.row, 0, nrow - 1); |
1203 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
|
|
1204 | selection_check (0); |
1180 | selection_check (0); |
1205 | } |
1181 | } |
1206 | |
1182 | |
1207 | /* ------------------------------------------------------------------------- */ |
1183 | /* ------------------------------------------------------------------------- */ |
1208 | /* |
1184 | /* |
… | |
… | |
1212 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1188 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1213 | */ |
1189 | */ |
1214 | void |
1190 | void |
1215 | rxvt_term::scr_erase_line (int mode) |
1191 | rxvt_term::scr_erase_line (int mode) |
1216 | { |
1192 | { |
1217 | unsigned int row, col, num; |
1193 | unsigned int col, num; |
1218 | |
1194 | |
1219 | want_refresh = 1; |
1195 | want_refresh = 1; |
1220 | ZERO_SCROLLBACK (); |
1196 | ZERO_SCROLLBACK (); |
1221 | |
1197 | |
1222 | selection_check (1); |
1198 | selection_check (1); |
1223 | |
1199 | |
1224 | row = screen.cur.row; |
1200 | line_t &line = ROW(screen.cur.row); |
|
|
1201 | |
|
|
1202 | line.touch (); |
|
|
1203 | line.is_longer (0); |
1225 | |
1204 | |
1226 | switch (mode) |
1205 | switch (mode) |
1227 | { |
1206 | { |
1228 | case 0: /* erase to end of line */ |
1207 | case 0: /* erase to end of line */ |
1229 | col = screen.cur.col; |
1208 | col = screen.cur.col; |
1230 | num = ncol - col; |
1209 | num = ncol - col; |
1231 | MIN_IT (ROW(row).l, (int16_t)col); |
1210 | min_it (line.l, col); |
1232 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1211 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1233 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1212 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1234 | CLEAR_SELECTION (); |
1213 | CLEAR_SELECTION (); |
1235 | break; |
1214 | break; |
1236 | case 1: /* erase to beginning of line */ |
1215 | case 1: /* erase to beginning of line */ |
… | |
… | |
1241 | CLEAR_SELECTION (); |
1220 | CLEAR_SELECTION (); |
1242 | break; |
1221 | break; |
1243 | case 2: /* erase whole line */ |
1222 | case 2: /* erase whole line */ |
1244 | col = 0; |
1223 | col = 0; |
1245 | num = ncol; |
1224 | num = ncol; |
1246 | ROW(row).l = 0; |
1225 | line.l = 0; |
1247 | if (selection.beg.row <= screen.cur.row |
1226 | if (selection.beg.row <= screen.cur.row |
1248 | && selection.end.row >= screen.cur.row) |
1227 | && selection.end.row >= screen.cur.row) |
1249 | CLEAR_SELECTION (); |
1228 | CLEAR_SELECTION (); |
1250 | break; |
1229 | break; |
1251 | default: |
1230 | default: |
1252 | return; |
1231 | return; |
1253 | } |
1232 | } |
1254 | |
1233 | |
1255 | scr_blank_line (ROW(row), col, num, rstyle); |
1234 | scr_blank_line (line, col, num, rstyle); |
1256 | } |
1235 | } |
1257 | |
1236 | |
1258 | /* ------------------------------------------------------------------------- */ |
1237 | /* ------------------------------------------------------------------------- */ |
1259 | /* |
1238 | /* |
1260 | * Erase part of whole of the screen |
1239 | * Erase part of whole of the screen |
… | |
… | |
1303 | CLEAR_SELECTION (); |
1282 | CLEAR_SELECTION (); |
1304 | |
1283 | |
1305 | if (row >= nrow) /* Out Of Bounds */ |
1284 | if (row >= nrow) /* Out Of Bounds */ |
1306 | return; |
1285 | return; |
1307 | |
1286 | |
1308 | MIN_IT (num, (nrow - row)); |
1287 | min_it (num, nrow - row); |
1309 | |
1288 | |
1310 | if (rstyle & (RS_RVid | RS_Uline)) |
1289 | if (rstyle & (RS_RVid | RS_Uline)) |
1311 | ren = (rend_t) ~RS_None; |
1290 | ren = (rend_t) ~RS_None; |
1312 | else if (GET_BASEBG (rstyle) == Color_bg) |
1291 | else if (GET_BASEBG (rstyle) == Color_bg) |
1313 | { |
1292 | { |
… | |
… | |
1315 | CLEAR_ROWS (row, num); |
1294 | CLEAR_ROWS (row, num); |
1316 | } |
1295 | } |
1317 | else |
1296 | else |
1318 | { |
1297 | { |
1319 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1298 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1320 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1299 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1321 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1300 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1322 | ERASE_ROWS (row, num); |
1301 | ERASE_ROWS (row, num); |
1323 | gcvalue.foreground = pix_colors[Color_fg]; |
1302 | gcvalue.foreground = pix_colors[Color_fg]; |
1324 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1303 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1325 | } |
1304 | } |
1326 | |
1305 | |
1327 | for (; num--; row++) |
1306 | for (; num--; row++) |
1328 | { |
1307 | { |
1329 | scr_blank_screen_mem (ROW (row), rstyle); |
1308 | scr_blank_screen_mem (ROW(row), rstyle); |
1330 | ROW (row).l = 0; |
|
|
1331 | scr_blank_line (drawn[row], 0, ncol, ren); |
1309 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1332 | } |
1310 | } |
1333 | } |
1311 | } |
1334 | |
1312 | |
1335 | #if ENABLE_FRILLS |
1313 | #if ENABLE_FRILLS |
1336 | void |
1314 | void |
… | |
… | |
1368 | rend_t *r1 = line.r; |
1346 | rend_t *r1 = line.r; |
1369 | |
1347 | |
1370 | for (int j = ncol; j--; ) |
1348 | for (int j = ncol; j--; ) |
1371 | *r1++ = fs; |
1349 | *r1++ = fs; |
1372 | |
1350 | |
1373 | line.l = ncol; /* make the `E's selectable */ |
1351 | line.is_longer (0); |
|
|
1352 | line.touch (ncol); |
1374 | } |
1353 | } |
1375 | } |
1354 | } |
1376 | |
1355 | |
1377 | /* ------------------------------------------------------------------------- */ |
1356 | /* ------------------------------------------------------------------------- */ |
1378 | /* |
1357 | /* |
… | |
… | |
1421 | return; |
1400 | return; |
1422 | |
1401 | |
1423 | scr_do_wrap (); |
1402 | scr_do_wrap (); |
1424 | |
1403 | |
1425 | selection_check (1); |
1404 | selection_check (1); |
1426 | MIN_IT (count, (ncol - screen.cur.col)); |
1405 | min_it (count, ncol - screen.cur.col); |
1427 | |
1406 | |
1428 | row = screen.cur.row; |
1407 | row = screen.cur.row; |
1429 | |
1408 | |
1430 | line_t *line = &ROW(row); |
1409 | line_t *line = &ROW(row); |
|
|
1410 | |
|
|
1411 | line->touch (); |
|
|
1412 | line->is_longer (0); |
1431 | |
1413 | |
1432 | switch (insdel) |
1414 | switch (insdel) |
1433 | { |
1415 | { |
1434 | case INSERT: |
1416 | case INSERT: |
1435 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1417 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1436 | { |
1418 | { |
1437 | line->t[col] = line->t[col - count]; |
1419 | line->t[col] = line->t[col - count]; |
1438 | line->r[col] = line->r[col - count]; |
1420 | line->r[col] = line->r[col - count]; |
1439 | } |
1421 | } |
1440 | |
1422 | |
1441 | if (!line->is_longer ()) |
1423 | line->l = min (line->l + count, ncol); |
1442 | { |
|
|
1443 | line->l += count; |
|
|
1444 | MIN_IT (line->l, ncol); |
|
|
1445 | } |
|
|
1446 | |
1424 | |
1447 | if (selection.op && current_screen == selection.screen |
1425 | if (selection.op && current_screen == selection.screen |
1448 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1426 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1449 | { |
1427 | { |
1450 | if (selection.end.row != screen.cur.row |
1428 | if (selection.end.row != screen.cur.row |
… | |
… | |
1463 | |
1441 | |
1464 | case ERASE: |
1442 | case ERASE: |
1465 | screen.cur.col += count; /* don't worry if > ncol */ |
1443 | screen.cur.col += count; /* don't worry if > ncol */ |
1466 | selection_check (1); |
1444 | selection_check (1); |
1467 | screen.cur.col -= count; |
1445 | screen.cur.col -= count; |
|
|
1446 | |
|
|
1447 | line->l = max (line->l - count, 0); |
1468 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1448 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1469 | break; |
1449 | break; |
1470 | |
1450 | |
1471 | case DELETE: |
1451 | case DELETE: |
1472 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1452 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
… | |
… | |
1475 | { |
1455 | { |
1476 | line->t[col] = line->t[col + count]; |
1456 | line->t[col] = line->t[col + count]; |
1477 | line->r[col] = line->r[col + count]; |
1457 | line->r[col] = line->r[col + count]; |
1478 | } |
1458 | } |
1479 | |
1459 | |
|
|
1460 | line->l = max (line->l - count, 0); |
1480 | scr_blank_line (*line, ncol - count, count, tr); |
1461 | scr_blank_line (*line, ncol - count, count, tr); |
1481 | |
|
|
1482 | if (line->is_longer ()) /* break line continuation */ |
|
|
1483 | line->l = ncol; |
|
|
1484 | |
|
|
1485 | line->l = max (line->l - count, 0); |
|
|
1486 | |
1462 | |
1487 | if (selection.op && current_screen == selection.screen |
1463 | if (selection.op && current_screen == selection.screen |
1488 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1464 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1489 | { |
1465 | { |
1490 | if (selection.end.row != screen.cur.row |
1466 | if (selection.end.row != screen.cur.row |
… | |
… | |
1510 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1486 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1511 | */ |
1487 | */ |
1512 | void |
1488 | void |
1513 | rxvt_term::scr_scroll_region (int top, int bot) |
1489 | rxvt_term::scr_scroll_region (int top, int bot) |
1514 | { |
1490 | { |
1515 | MAX_IT (top, 0); |
1491 | max_it (top, 0); |
1516 | MIN_IT (bot, (int)nrow - 1); |
1492 | min_it (bot, nrow - 1); |
1517 | |
1493 | |
1518 | if (top > bot) |
1494 | if (top > bot) |
1519 | return; |
1495 | return; |
1520 | |
1496 | |
1521 | screen.tscroll = top; |
1497 | screen.tscroll = top; |
… | |
… | |
1602 | rxvt_term::scr_set_tab (int mode) |
1578 | rxvt_term::scr_set_tab (int mode) |
1603 | { |
1579 | { |
1604 | if (mode < 0) |
1580 | if (mode < 0) |
1605 | memset (tabs, 0, ncol * sizeof (char)); |
1581 | memset (tabs, 0, ncol * sizeof (char)); |
1606 | else if (screen.cur.col < ncol) |
1582 | else if (screen.cur.col < ncol) |
1607 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1583 | tabs [screen.cur.col] = !!mode; |
1608 | } |
1584 | } |
1609 | |
1585 | |
1610 | /* ------------------------------------------------------------------------- */ |
1586 | /* ------------------------------------------------------------------------- */ |
1611 | /* |
1587 | /* |
1612 | * Set reverse/normal video |
1588 | * Set reverse/normal video |
… | |
… | |
1619 | XGCValues gcvalue; |
1595 | XGCValues gcvalue; |
1620 | |
1596 | |
1621 | if (rvideo != mode) |
1597 | if (rvideo != mode) |
1622 | { |
1598 | { |
1623 | rvideo = mode; |
1599 | rvideo = mode; |
1624 | SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); |
1600 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1625 | #if XPM_BACKGROUND |
1601 | #if XPM_BACKGROUND |
1626 | if (bgPixmap.pixmap == None) |
1602 | if (bgPixmap.pixmap == None) |
1627 | #endif |
1603 | #endif |
1628 | #if TRANSPARENT |
1604 | #if TRANSPARENT |
1629 | if (! (options & Opt_transparent) || am_transparent == 0) |
1605 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
1630 | #endif |
1606 | #endif |
1631 | XSetWindowBackground (display->display, vt, |
1607 | XSetWindowBackground (display->display, vt, |
1632 | pix_colors[Color_bg]); |
1608 | pix_colors[Color_bg]); |
1633 | |
1609 | |
1634 | gcvalue.foreground = pix_colors[Color_fg]; |
1610 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1659 | * Set font style |
1635 | * Set font style |
1660 | */ |
1636 | */ |
1661 | void |
1637 | void |
1662 | rxvt_term::set_font_style () |
1638 | rxvt_term::set_font_style () |
1663 | { |
1639 | { |
|
|
1640 | #if 0 |
1664 | switch (charsets[screen.charset]) |
1641 | switch (charsets [screen.charset]) |
1665 | { |
1642 | { |
1666 | case '0': /* DEC Special Character & Line Drawing Set */ |
1643 | case '0': /* DEC Special Character & Line Drawing Set */ |
1667 | break; |
1644 | break; |
1668 | case 'A': /* United Kingdom (UK) */ |
1645 | case 'A': /* United Kingdom (UK) */ |
1669 | break; |
1646 | break; |
… | |
… | |
1676 | case 'C': /* Finnish character set */ |
1653 | case 'C': /* Finnish character set */ |
1677 | break; |
1654 | break; |
1678 | case 'K': /* German character set */ |
1655 | case 'K': /* German character set */ |
1679 | break; |
1656 | break; |
1680 | } |
1657 | } |
|
|
1658 | #endif |
1681 | } |
1659 | } |
1682 | |
1660 | |
1683 | /* ------------------------------------------------------------------------- */ |
1661 | /* ------------------------------------------------------------------------- */ |
1684 | /* |
1662 | /* |
1685 | * Choose a font |
1663 | * Choose a font |
… | |
… | |
1725 | bool found = false; |
1703 | bool found = false; |
1726 | |
1704 | |
1727 | for (int i = 0; i < nrow; i++) |
1705 | for (int i = 0; i < nrow; i++) |
1728 | { |
1706 | { |
1729 | int col = 0; |
1707 | int col = 0; |
1730 | rend_t *drp = drawn[i].r; |
1708 | rend_t *drp = drawn_buf[i].r; |
1731 | |
1709 | |
1732 | for (; col < ncol; col++, drp++) |
1710 | for (; col < ncol; col++, drp++) |
1733 | if ((*drp & mask) == value) |
1711 | if ((*drp & mask) == value) |
1734 | { |
1712 | { |
1735 | found = true; |
1713 | found = true; |
… | |
… | |
1753 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1731 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1754 | { |
1732 | { |
1755 | int i; |
1733 | int i; |
1756 | row_col_t rc[RC_COUNT]; |
1734 | row_col_t rc[RC_COUNT]; |
1757 | |
1735 | |
1758 | if (!drawn) /* sanity check */ |
1736 | if (!drawn_buf) /* sanity check */ |
1759 | return; |
1737 | return; |
1760 | |
1738 | |
1761 | #ifndef NO_SLOW_LINK_SUPPORT |
1739 | #ifndef NO_SLOW_LINK_SUPPORT |
1762 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1740 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1763 | { |
1741 | { |
1764 | y = 0; |
1742 | y = 0; |
1765 | eheight = height; |
1743 | eheight = height; |
1766 | } |
1744 | } |
1767 | #endif |
|
|
1768 | |
|
|
1769 | #ifdef DEBUG_STRICT |
|
|
1770 | x = max (x, 0); |
|
|
1771 | x = min (x, (int)width); |
|
|
1772 | y = max (y, 0); |
|
|
1773 | y = min (y, (int)height); |
|
|
1774 | #endif |
1745 | #endif |
1775 | |
1746 | |
1776 | /* round down */ |
1747 | /* round down */ |
1777 | rc[PART_BEG].col = Pixel2Col (x); |
1748 | rc[PART_BEG].col = Pixel2Col (x); |
1778 | rc[PART_BEG].row = Pixel2Row (y); |
1749 | rc[PART_BEG].row = Pixel2Row (y); |
… | |
… | |
1781 | rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); |
1752 | rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); |
1782 | |
1753 | |
1783 | /* sanity checks */ |
1754 | /* sanity checks */ |
1784 | for (i = PART_BEG; i < RC_COUNT; i++) |
1755 | for (i = PART_BEG; i < RC_COUNT; i++) |
1785 | { |
1756 | { |
1786 | MIN_IT (rc[i].col, ncol - 1); |
1757 | min_it (rc[i].col, ncol - 1); |
1787 | MIN_IT (rc[i].row, nrow - 1); |
1758 | min_it (rc[i].row, nrow - 1); |
1788 | } |
1759 | } |
1789 | |
1760 | |
1790 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1761 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1791 | fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1762 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1792 | |
1763 | |
1793 | if (refresh) |
1764 | if (refresh) |
1794 | scr_refresh (SLOW_REFRESH); |
1765 | scr_refresh (SLOW_REFRESH); |
1795 | } |
1766 | } |
1796 | |
1767 | |
… | |
… | |
1859 | int |
1830 | int |
1860 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1831 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1861 | { |
1832 | { |
1862 | if (view_start != oldviewstart) |
1833 | if (view_start != oldviewstart) |
1863 | { |
1834 | { |
|
|
1835 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
|
|
1836 | |
1864 | want_refresh = 1; |
1837 | want_refresh = 1; |
1865 | num_scr -= (view_start - oldviewstart); |
1838 | num_scr -= (view_start - oldviewstart); |
1866 | } |
1839 | } |
1867 | |
1840 | |
1868 | return (int) (view_start - oldviewstart); |
1841 | return (int)view_start - (int)oldviewstart; |
1869 | } |
1842 | } |
1870 | |
1843 | |
1871 | /* ------------------------------------------------------------------------- */ |
1844 | /* ------------------------------------------------------------------------- */ |
1872 | void |
1845 | void |
1873 | rxvt_term::scr_bell () |
1846 | rxvt_term::scr_bell () |
1874 | { |
1847 | { |
1875 | #ifndef NO_BELL |
1848 | #ifndef NO_BELL |
1876 | |
1849 | |
1877 | # ifndef NO_MAPALERT |
1850 | # ifndef NO_MAPALERT |
1878 | # ifdef MAPALERT_OPTION |
1851 | # ifdef MAPALERT_OPTION |
1879 | if (options & Opt_mapAlert) |
1852 | if (OPTION (Opt_mapAlert)) |
1880 | # endif |
1853 | # endif |
1881 | XMapWindow (display->display, parent[0]); |
1854 | XMapWindow (display->display, parent[0]); |
1882 | # endif |
1855 | # endif |
1883 | |
1856 | |
1884 | if (options & Opt_visualBell) |
1857 | if (OPTION (Opt_visualBell)) |
1885 | { |
1858 | { |
1886 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1859 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1887 | rxvt_usleep (VISUAL_BELL_DURATION); |
1860 | rxvt_usleep (VISUAL_BELL_DURATION); |
1888 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1861 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1889 | } |
1862 | } |
… | |
… | |
1959 | { |
1932 | { |
1960 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1933 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1961 | showcursor; /* show the cursor */ |
1934 | showcursor; /* show the cursor */ |
1962 | int16_t col, row, /* column/row we're processing */ |
1935 | int16_t col, row, /* column/row we're processing */ |
1963 | ocrow; /* old cursor row */ |
1936 | ocrow; /* old cursor row */ |
1964 | int i, /* tmp */ |
1937 | int i; /* tmp */ |
1965 | row_offset; /* basic offset in screen structure */ |
|
|
1966 | #ifndef NO_CURSORCOLOR |
1938 | #ifndef NO_CURSORCOLOR |
1967 | rend_t cc1; /* store colours at cursor position (s) */ |
1939 | rend_t cc1; /* store colours at cursor position (s) */ |
1968 | #endif |
1940 | #endif |
1969 | rend_t *crp; // cursor rendition pointer |
1941 | rend_t *crp; // cursor rendition pointer |
1970 | |
1942 | |
… | |
… | |
1977 | * A: set up vars |
1949 | * A: set up vars |
1978 | */ |
1950 | */ |
1979 | must_clear = 0; |
1951 | must_clear = 0; |
1980 | refresh_count = 0; |
1952 | refresh_count = 0; |
1981 | |
1953 | |
1982 | row_offset = term_start - view_start; |
|
|
1983 | |
|
|
1984 | #if XPM_BACKGROUND |
1954 | #if XPM_BACKGROUND |
1985 | must_clear |= bgPixmap.pixmap != None; |
1955 | must_clear |= bgPixmap.pixmap != None; |
1986 | #endif |
1956 | #endif |
1987 | #if TRANSPARENT |
1957 | #if TRANSPARENT |
1988 | must_clear |= (options & Opt_transparent) && am_transparent; |
1958 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
1989 | #endif |
1959 | #endif |
1990 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1960 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1991 | |
1961 | |
1992 | /* |
1962 | /* |
1993 | * B: reverse any characters which are selected |
1963 | * B: reverse any characters which are selected |
… | |
… | |
2017 | |
1987 | |
2018 | crp = &ROW(screen.cur.row).r[col]; |
1988 | crp = &ROW(screen.cur.row).r[col]; |
2019 | |
1989 | |
2020 | if (showcursor && focus) |
1990 | if (showcursor && focus) |
2021 | { |
1991 | { |
2022 | if (options & Opt_cursorUnderline) |
1992 | if (OPTION (Opt_cursorUnderline)) |
2023 | *crp ^= RS_Uline; |
1993 | *crp ^= RS_Uline; |
2024 | else |
1994 | else |
2025 | { |
1995 | { |
2026 | *crp ^= RS_RVid; |
1996 | *crp ^= RS_RVid; |
2027 | |
1997 | |
… | |
… | |
2029 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
1999 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2030 | if (ISSET_PIXCOLOR (Color_cursor)) |
2000 | if (ISSET_PIXCOLOR (Color_cursor)) |
2031 | ccol1 = Color_cursor; |
2001 | ccol1 = Color_cursor; |
2032 | else |
2002 | else |
2033 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2003 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2034 | ccol1 = GET_FGCOLOR (rstyle); |
2004 | ccol1 = fgcolor_of (rstyle); |
2035 | #else |
2005 | #else |
2036 | ccol1 = Color_fg; |
2006 | ccol1 = Color_fg; |
2037 | #endif |
2007 | #endif |
2038 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2008 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2039 | ccol2 = Color_cursor2; |
2009 | ccol2 = Color_cursor2; |
2040 | else |
2010 | else |
2041 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2011 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2042 | ccol2 = GET_BGCOLOR (rstyle); |
2012 | ccol2 = bgcolor_of (rstyle); |
2043 | #else |
2013 | #else |
2044 | ccol2 = Color_bg; |
2014 | ccol2 = Color_bg; |
2045 | #endif |
2015 | #endif |
2046 | *crp = SET_FGCOLOR (*crp, ccol1); |
2016 | *crp = SET_FGCOLOR (*crp, ccol1); |
2047 | *crp = SET_BGCOLOR (*crp, ccol2); |
2017 | *crp = SET_BGCOLOR (*crp, ccol2); |
… | |
… | |
2057 | if (screen.cur.row + view_start != ocrow |
2027 | if (screen.cur.row + view_start != ocrow |
2058 | || screen.cur.col != oldcursor.col) |
2028 | || screen.cur.col != oldcursor.col) |
2059 | { |
2029 | { |
2060 | if (ocrow < nrow |
2030 | if (ocrow < nrow |
2061 | && oldcursor.col < ncol) |
2031 | && oldcursor.col < ncol) |
2062 | drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2032 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2063 | |
2033 | |
2064 | if (focus || !showcursor) |
2034 | if (focus || !showcursor) |
2065 | oldcursor.row = -1; |
2035 | oldcursor.row = -1; |
2066 | else |
2036 | else |
2067 | setoldcursor = 1; |
2037 | setoldcursor = 1; |
… | |
… | |
2080 | oldcursor.col = screen.cur.col; |
2050 | oldcursor.col = screen.cur.col; |
2081 | } |
2051 | } |
2082 | } |
2052 | } |
2083 | } |
2053 | } |
2084 | |
2054 | |
|
|
2055 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2085 | #if ENABLE_OVERLAY |
2056 | #if ENABLE_OVERLAY |
2086 | scr_swap_overlay (); |
2057 | scr_swap_overlay (); |
2087 | #endif |
2058 | #endif |
2088 | |
2059 | |
2089 | #ifndef NO_SLOW_LINK_SUPPORT |
2060 | #ifndef NO_SLOW_LINK_SUPPORT |
… | |
… | |
2105 | row = i > 0 ? 0 : j - 1; |
2076 | row = i > 0 ? 0 : j - 1; |
2106 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2077 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2107 | { |
2078 | { |
2108 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2079 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2109 | { |
2080 | { |
2110 | line_t s = save[(row + row_offset) % total_rows]; |
2081 | line_t s = ROW(row - view_start); |
2111 | line_t d = drawn[row]; |
2082 | line_t d = drawn_buf[row]; |
2112 | line_t d2 = drawn[row + i]; |
2083 | line_t d2 = drawn_buf[row + i]; |
2113 | |
2084 | |
2114 | for (nits = 0, col = ncol; col--; ) |
2085 | for (nits = 0, col = ncol; col--; ) |
2115 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2086 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2116 | nits--; |
2087 | nits--; |
2117 | else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) |
2088 | else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) |
… | |
… | |
2135 | |
2106 | |
2136 | if (len != -1) |
2107 | if (len != -1) |
2137 | { |
2108 | { |
2138 | /* also comes here at end if needed because of >= above */ |
2109 | /* also comes here at end if needed because of >= above */ |
2139 | if (wlen < len) |
2110 | if (wlen < len) |
2140 | SWAP_IT (wlen, len, int); |
2111 | ::swap (wlen, len); |
2141 | |
2112 | |
2142 | XCopyArea (display->display, vt, vt, |
2113 | XCopyArea (display->display, vt, vt, |
2143 | gc, 0, Row2Pixel (len + i), |
2114 | gc, 0, Row2Pixel (len + i), |
2144 | (unsigned int)TermWin_TotalWidth (), |
2115 | (unsigned int)this->width, |
2145 | (unsigned int)Height2Pixel (wlen - len + 1), |
2116 | (unsigned int)Height2Pixel (wlen - len + 1), |
2146 | 0, Row2Pixel (len)); |
2117 | 0, Row2Pixel (len)); |
2147 | len = -1; |
2118 | len = -1; |
2148 | } |
2119 | } |
2149 | } |
2120 | } |
… | |
… | |
2153 | /* |
2124 | /* |
2154 | * E: main pass across every character |
2125 | * E: main pass across every character |
2155 | */ |
2126 | */ |
2156 | for (row = 0; row < nrow; row++) |
2127 | for (row = 0; row < nrow; row++) |
2157 | { |
2128 | { |
2158 | text_t *stp = save[(row + row_offset) % total_rows].t; |
2129 | text_t *stp = ROW(row - view_start).t; |
2159 | rend_t *srp = save[(row + row_offset) % total_rows].r; |
2130 | rend_t *srp = ROW(row - view_start).r; |
2160 | text_t *dtp = drawn[row].t; |
2131 | text_t *dtp = drawn_buf[row].t; |
2161 | rend_t *drp = drawn[row].r; |
2132 | rend_t *drp = drawn_buf[row].r; |
2162 | |
2133 | |
2163 | /* |
2134 | /* |
2164 | * E2: OK, now the real pass |
2135 | * E2: OK, now the real pass |
2165 | */ |
2136 | */ |
2166 | int ypixel = (int)Row2Pixel (row); |
2137 | int ypixel = (int)Row2Pixel (row); |
… | |
… | |
2228 | count++, i--; |
2199 | count++, i--; |
2229 | |
2200 | |
2230 | /* |
2201 | /* |
2231 | * Determine the attributes for the string |
2202 | * Determine the attributes for the string |
2232 | */ |
2203 | */ |
2233 | int fore = GET_FGCOLOR (rend); // desired foreground |
2204 | int fore = fgcolor_of (rend); // desired foreground |
2234 | int back = GET_BGCOLOR (rend); // desired background |
2205 | int back = bgcolor_of (rend); // desired background |
2235 | |
2206 | |
2236 | // only do special processing if any attributes are set, which is rare |
2207 | // only do special processing if any attributes are set, which is unlikely |
2237 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2208 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2238 | { |
2209 | { |
2239 | #if ENABLE_STYLES |
2210 | #if ENABLE_STYLES |
2240 | // force redraw after "careful" characters to avoid pixel droppings |
2211 | // force redraw after "careful" characters to avoid pixel droppings |
2241 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
2212 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
… | |
… | |
2277 | fore = Color_UL; |
2248 | fore = Color_UL; |
2278 | #endif |
2249 | #endif |
2279 | |
2250 | |
2280 | if (invert) |
2251 | if (invert) |
2281 | { |
2252 | { |
2282 | SWAP_IT (fore, back, int); |
2253 | ::swap (fore, back); |
2283 | |
2254 | |
2284 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2255 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2285 | if (ISSET_PIXCOLOR (Color_RV)) |
2256 | if (ISSET_PIXCOLOR (Color_RV)) |
2286 | back = Color_RV; |
2257 | back = Color_RV; |
2287 | |
2258 | |
… | |
… | |
2352 | } /* for (row....) */ |
2323 | } /* for (row....) */ |
2353 | |
2324 | |
2354 | #if ENABLE_OVERLAY |
2325 | #if ENABLE_OVERLAY |
2355 | scr_swap_overlay (); |
2326 | scr_swap_overlay (); |
2356 | #endif |
2327 | #endif |
|
|
2328 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
2357 | |
2329 | |
2358 | /* |
2330 | /* |
2359 | * G: cleanup cursor and display outline cursor if necessary |
2331 | * G: cleanup cursor and display outline cursor if necessary |
2360 | */ |
2332 | */ |
2361 | if (showcursor) |
2333 | if (showcursor) |
2362 | { |
2334 | { |
2363 | if (focus) |
2335 | if (focus) |
2364 | { |
2336 | { |
2365 | if (options & Opt_cursorUnderline) |
2337 | if (OPTION (Opt_cursorUnderline)) |
2366 | *crp ^= RS_Uline; |
2338 | *crp ^= RS_Uline; |
2367 | else |
2339 | else |
2368 | { |
2340 | { |
2369 | *crp ^= RS_RVid; |
2341 | *crp ^= RS_RVid; |
2370 | #ifndef NO_CURSORCOLOR |
2342 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2379 | |
2351 | |
2380 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2352 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2381 | col--; |
2353 | col--; |
2382 | |
2354 | |
2383 | while (col + cursorwidth < ncol |
2355 | while (col + cursorwidth < ncol |
2384 | && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2356 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2385 | cursorwidth++; |
2357 | cursorwidth++; |
2386 | |
2358 | |
2387 | #ifndef NO_CURSORCOLOR |
2359 | #ifndef NO_CURSORCOLOR |
2388 | if (ISSET_PIXCOLOR (Color_cursor)) |
2360 | if (ISSET_PIXCOLOR (Color_cursor)) |
2389 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2361 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
… | |
… | |
2408 | num_scr = 0; |
2380 | num_scr = 0; |
2409 | num_scr_allow = 1; |
2381 | num_scr_allow = 1; |
2410 | } |
2382 | } |
2411 | |
2383 | |
2412 | void |
2384 | void |
2413 | rxvt_term::scr_remap_chars (const line_t &l) |
2385 | rxvt_term::scr_remap_chars (line_t &l) |
2414 | { |
2386 | { |
2415 | if (!l.t) |
2387 | if (!l.t) |
2416 | return; |
2388 | return; |
2417 | |
2389 | |
|
|
2390 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
|
|
2391 | |
2418 | for (int i = ncol; i--; ) |
2392 | for (int i = ncol; i--; ) |
2419 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2393 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2420 | } |
2394 | } |
2421 | |
2395 | |
2422 | void |
2396 | void |
2423 | rxvt_term::scr_remap_chars () |
2397 | rxvt_term::scr_remap_chars () |
2424 | { |
2398 | { |
2425 | for (int i = total_rows; i--; ) |
2399 | for (int i = total_rows; i--; ) |
2426 | scr_remap_chars (save[i]); |
2400 | scr_remap_chars (row_buf [i]); |
2427 | |
2401 | |
2428 | for (int i = nrow; i--; ) |
2402 | for (int i = nrow; i--; ) |
2429 | { |
2403 | { |
2430 | scr_remap_chars (drawn[i]); |
2404 | scr_remap_chars (drawn_buf [i]); |
2431 | scr_remap_chars (swap_save[i]); |
2405 | scr_remap_chars (swap_buf [i]); |
2432 | } |
2406 | } |
2433 | } |
2407 | } |
2434 | |
2408 | |
2435 | void |
2409 | void |
2436 | rxvt_term::scr_recolour () |
2410 | rxvt_term::scr_recolour () |
… | |
… | |
2489 | |
2463 | |
2490 | #if ENABLE_FRILLS |
2464 | #if ENABLE_FRILLS |
2491 | if (selection.rect) |
2465 | if (selection.rect) |
2492 | { |
2466 | { |
2493 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
2467 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
|
|
2468 | { |
|
|
2469 | text_t *stp = ROW(row).t; |
|
|
2470 | rend_t *srp = ROW(row).r; |
|
|
2471 | |
2494 | for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) |
2472 | for (col = selection.beg.col; col < selection.end.col; col++) |
2495 | srp[col] ^= RS_RVid; |
2473 | srp[col] ^= RS_RVid; |
|
|
2474 | |
|
|
2475 | while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2476 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2477 | |
|
|
2478 | if (++col < selection.end.col) |
|
|
2479 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2480 | } |
2496 | } |
2481 | } |
2497 | else |
2482 | else |
2498 | #endif |
2483 | #endif |
2499 | { |
2484 | { |
2500 | if (selection.beg.row >= -view_start) |
2485 | if (selection.beg.row >= -view_start) |
… | |
… | |
2503 | row = selection.beg.row; |
2488 | row = selection.beg.row; |
2504 | } |
2489 | } |
2505 | else |
2490 | else |
2506 | { |
2491 | { |
2507 | col = 0; |
2492 | col = 0; |
2508 | row = view_start; |
2493 | row = -view_start; |
2509 | } |
2494 | } |
2510 | |
2495 | |
2511 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2496 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2512 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2497 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2513 | srp[col] ^= RS_RVid; |
2498 | srp[col] ^= RS_RVid; |
… | |
… | |
2533 | char r1[] = "\n"; |
2518 | char r1[] = "\n"; |
2534 | |
2519 | |
2535 | for (row = saveLines - nsaved; |
2520 | for (row = saveLines - nsaved; |
2536 | row < saveLines + nrow - 1; row++) |
2521 | row < saveLines + nrow - 1; row++) |
2537 | { |
2522 | { |
2538 | width = save[row].l >= 0 ? save[row].l |
2523 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2539 | : ncol; |
2524 | : ncol; |
2540 | for (towrite = width; towrite; towrite -= wrote) |
2525 | for (towrite = width; towrite; towrite -= wrote) |
2541 | { |
2526 | { |
2542 | wrote = write (fd, & (save[row].t[width - towrite]), |
2527 | wrote = write (fd, & (row_buf[row].t[width - towrite]), |
2543 | towrite); |
2528 | towrite); |
2544 | if (wrote < 0) |
2529 | if (wrote < 0) |
2545 | return; /* XXX: death, no report */ |
2530 | return; /* XXX: death, no report */ |
2546 | } |
2531 | } |
2547 | if (save[row].l >= 0) |
2532 | if (row_buf[row].l >= 0) |
2548 | if (write (fd, r1, 1) <= 0) |
2533 | if (write (fd, r1, 1) <= 0) |
2549 | return; /* XXX: death, no report */ |
2534 | return; /* XXX: death, no report */ |
2550 | } |
2535 | } |
2551 | } |
2536 | } |
2552 | #endif |
2537 | #endif |
… | |
… | |
2584 | /* ------------------------------------------------------------------------- */ |
2569 | /* ------------------------------------------------------------------------- */ |
2585 | /* |
2570 | /* |
2586 | * Paste a selection direct to the command fd |
2571 | * Paste a selection direct to the command fd |
2587 | */ |
2572 | */ |
2588 | void |
2573 | void |
2589 | rxvt_term::paste (unsigned char *data, unsigned int len) |
2574 | rxvt_term::paste (char *data, unsigned int len) |
2590 | { |
2575 | { |
2591 | /* convert normal newline chars into common keyboard Return key sequence */ |
2576 | /* convert normal newline chars into common keyboard Return key sequence */ |
2592 | for (unsigned int i = 0; i < len; i++) |
2577 | for (unsigned int i = 0; i < len; i++) |
2593 | if (data[i] == C0_LF) |
2578 | if (data[i] == C0_LF) |
2594 | data[i] = C0_CR; |
2579 | data[i] = C0_CR; |
… | |
… | |
2738 | { |
2723 | { |
2739 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2724 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2740 | char *s = rxvt_wcstombs (w); |
2725 | char *s = rxvt_wcstombs (w); |
2741 | free (w); |
2726 | free (w); |
2742 | // TODO: strlen == only the first element will be converted. well... |
2727 | // TODO: strlen == only the first element will be converted. well... |
2743 | paste ((unsigned char *)s, strlen (s)); |
2728 | paste (s, strlen (s)); |
2744 | free (s); |
2729 | free (s); |
2745 | } |
2730 | } |
2746 | else |
2731 | else |
2747 | #endif |
2732 | #endif |
2748 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2733 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2749 | && cl) |
2734 | && cl) |
2750 | { |
2735 | { |
2751 | for (int i = 0; i < cr; i++) |
2736 | for (int i = 0; i < cr; i++) |
2752 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2737 | paste (cl[i], strlen (cl[i])); |
2753 | |
2738 | |
2754 | XFreeStringList (cl); |
2739 | XFreeStringList (cl); |
2755 | } |
2740 | } |
2756 | else |
2741 | else |
2757 | paste (ct.value, ct.nitems); // paste raw |
2742 | paste ((char *)ct.value, ct.nitems); // paste raw |
2758 | |
2743 | |
2759 | bailout: |
2744 | bailout: |
2760 | XFree (ct.value); |
2745 | XFree (ct.value); |
2761 | |
2746 | |
2762 | if (selection_wait == Sel_normal) |
2747 | if (selection_wait == Sel_normal) |
… | |
… | |
2800 | return; /* outside window */ |
2785 | return; /* outside window */ |
2801 | |
2786 | |
2802 | if (selection.text) |
2787 | if (selection.text) |
2803 | { /* internal selection */ |
2788 | { /* internal selection */ |
2804 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2789 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2805 | paste ((unsigned char *)str, strlen (str)); |
2790 | paste (str, strlen (str)); |
2806 | free (str); |
2791 | free (str); |
2807 | return; |
2792 | return; |
2808 | } |
2793 | } |
2809 | else |
2794 | else |
2810 | { |
2795 | { |
… | |
… | |
2902 | selection.op = SELECTION_DONE; |
2887 | selection.op = SELECTION_DONE; |
2903 | |
2888 | |
2904 | if (selection.clicks == 4) |
2889 | if (selection.clicks == 4) |
2905 | return; /* nothing selected, go away */ |
2890 | return; /* nothing selected, go away */ |
2906 | |
2891 | |
|
|
2892 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
|
|
2893 | return; |
|
|
2894 | |
2907 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2895 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2908 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2896 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2909 | |
2897 | |
2910 | int ofs = 0; |
2898 | int ofs = 0; |
2911 | int extra = 0; |
2899 | int extra = 0; |
… | |
… | |
2923 | col = selection.beg.col; |
2911 | col = selection.beg.col; |
2924 | end_col = ncol + 1; |
2912 | end_col = ncol + 1; |
2925 | } |
2913 | } |
2926 | else |
2914 | else |
2927 | #endif |
2915 | #endif |
2928 | end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN |
2916 | end_col = ROW(row).l; |
2929 | |
2917 | |
2930 | col = max (col, 0); |
2918 | col = max (col, 0); |
2931 | |
2919 | |
2932 | if (row == selection.end.row || selection.rect) |
2920 | if (row == selection.end.row |
|
|
2921 | #if ENABLE_FRILLS |
|
|
2922 | || selection.rect |
|
|
2923 | #endif |
|
|
2924 | ) |
2933 | end_col = min (end_col, selection.end.col); |
2925 | min_it (end_col, selection.end.col); |
2934 | |
2926 | |
2935 | t = ROW(row).t + col; |
2927 | t = ROW(row).t + col; |
|
|
2928 | |
2936 | for (; col < end_col; col++) |
2929 | for (; col < end_col; col++) |
2937 | { |
2930 | { |
2938 | if (*t == NOCHAR) |
2931 | if (*t == NOCHAR) |
2939 | t++; |
2932 | t++; |
2940 | #if ENABLE_COMBINING |
2933 | #if ENABLE_COMBINING |
… | |
… | |
2956 | #endif |
2949 | #endif |
2957 | else |
2950 | else |
2958 | new_selection_text[ofs++] = *t++; |
2951 | new_selection_text[ofs++] = *t++; |
2959 | } |
2952 | } |
2960 | |
2953 | |
|
|
2954 | #if ENABLE_FRILLS |
|
|
2955 | if (selection.rect) |
|
|
2956 | { |
|
|
2957 | while (ofs |
|
|
2958 | && new_selection_text[ofs - 1] != C0_LF |
|
|
2959 | && unicode::is_space (new_selection_text[ofs - 1])) |
|
|
2960 | --ofs; |
|
|
2961 | |
|
|
2962 | new_selection_text[ofs++] = C0_LF; |
|
|
2963 | } |
|
|
2964 | else |
|
|
2965 | #endif |
2961 | if (!ROW(row).is_longer () && row != selection.end.row) |
2966 | if (!ROW(row).is_longer () && row != selection.end.row) |
2962 | new_selection_text[ofs++] = C0_LF; |
2967 | new_selection_text[ofs++] = C0_LF; |
2963 | } |
2968 | } |
2964 | |
2969 | |
2965 | if (end_col != selection.end.col) |
2970 | if (end_col != selection.end.col) |
2966 | new_selection_text[ofs++] = C0_LF; |
2971 | new_selection_text[ofs++] = C0_LF; |
2967 | |
2972 | |
… | |
… | |
2977 | |
2982 | |
2978 | // we usually allocate much more than necessary, so realloc it smaller again |
2983 | // we usually allocate much more than necessary, so realloc it smaller again |
2979 | selection.len = ofs; |
2984 | selection.len = ofs; |
2980 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2985 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2981 | |
2986 | |
|
|
2987 | if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) |
|
|
2988 | return; |
|
|
2989 | |
|
|
2990 | selection_grab (tm); |
|
|
2991 | } |
|
|
2992 | |
|
|
2993 | bool |
|
|
2994 | rxvt_term::selection_grab (Time tm) |
|
|
2995 | { |
|
|
2996 | selection_time = tm; |
|
|
2997 | |
2982 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
2998 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
2983 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
2999 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
|
|
3000 | { |
2984 | display->set_selection_owner (this); |
3001 | display->set_selection_owner (this); |
|
|
3002 | return true; |
|
|
3003 | } |
2985 | else |
3004 | else |
2986 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
3005 | return false; |
2987 | |
3006 | |
2988 | #if 0 |
3007 | #if 0 |
2989 | XTextProperty ct; |
3008 | XTextProperty ct; |
2990 | |
3009 | |
2991 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3010 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2992 | { |
3011 | { |
2993 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3012 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
2994 | XFree (ct.value); |
3013 | XFree (ct.value); |
2995 | } |
3014 | } |
2996 | #endif |
3015 | #endif |
2997 | |
|
|
2998 | selection_time = tm; |
|
|
2999 | } |
3016 | } |
3000 | |
3017 | |
3001 | /* ------------------------------------------------------------------------- */ |
3018 | /* ------------------------------------------------------------------------- */ |
3002 | /* |
3019 | /* |
3003 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3020 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
… | |
… | |
3029 | want_refresh = 1; |
3046 | want_refresh = 1; |
3030 | |
3047 | |
3031 | selection.mark.row = row - view_start; |
3048 | selection.mark.row = row - view_start; |
3032 | selection.mark.col = col; |
3049 | selection.mark.col = col; |
3033 | |
3050 | |
3034 | selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); |
3051 | selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); |
3035 | selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); |
3052 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3036 | |
3053 | |
3037 | while (selection.mark.col > 0 |
3054 | while (selection.mark.col > 0 |
3038 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3055 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3039 | --selection.mark.col; |
3056 | --selection.mark.col; |
3040 | |
3057 | |
… | |
… | |
3125 | } |
3142 | } |
3126 | } |
3143 | } |
3127 | break; |
3144 | break; |
3128 | } |
3145 | } |
3129 | |
3146 | |
3130 | Old_Word_Selection_You_Die: |
|
|
3131 | if (dirn == DN) |
3147 | if (dirn == DN) |
3132 | col++; /* put us on one past the end */ |
3148 | col++; /* put us on one past the end */ |
3133 | |
3149 | |
3134 | /* Poke the values back in */ |
3150 | /* Poke the values back in */ |
3135 | ret->row = row; |
3151 | ret->row = row; |
… | |
… | |
3145 | * flag == 2 ==> button 3 motion |
3161 | * flag == 2 ==> button 3 motion |
3146 | */ |
3162 | */ |
3147 | void |
3163 | void |
3148 | rxvt_term::selection_extend (int x, int y, int flag) |
3164 | rxvt_term::selection_extend (int x, int y, int flag) |
3149 | { |
3165 | { |
3150 | int col = min (max (Pixel2Col (x), 0), nrow - 1); |
3166 | int col = clamp (Pixel2Col (x), 0, ncol); |
3151 | int row = min (max (Pixel2Row (y), 0), ncol); |
3167 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3152 | |
3168 | |
3153 | /* |
3169 | /* |
3154 | * If we're selecting characters (single click) then we must check first |
3170 | * If we're selecting characters (single click) then we must check first |
3155 | * if we are at the same place as the original mark. If we are then |
3171 | * if we are at the same place as the original mark. If we are then |
3156 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3172 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
… | |
… | |
3312 | else if (selection.clicks == 2) |
3328 | else if (selection.clicks == 2) |
3313 | { |
3329 | { |
3314 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3330 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3315 | selection.end.col--; |
3331 | selection.end.col--; |
3316 | |
3332 | |
|
|
3333 | if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) |
|
|
3334 | { |
3317 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3335 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3318 | selection_delimit_word (DN, &selection.end, &selection.end); |
3336 | selection_delimit_word (DN, &selection.end, &selection.end); |
|
|
3337 | } |
3319 | } |
3338 | } |
3320 | else if (selection.clicks == 3) |
3339 | else if (selection.clicks == 3) |
3321 | { |
3340 | { |
3322 | #if ENABLE_FRILLS |
3341 | #if ENABLE_FRILLS |
3323 | if (options & Opt_tripleclickwords) |
3342 | if (OPTION (Opt_tripleclickwords)) |
3324 | { |
3343 | { |
3325 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3344 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3326 | |
3345 | |
3327 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3346 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3328 | { |
3347 | { |
… | |
… | |
3369 | } |
3388 | } |
3370 | } |
3389 | } |
3371 | |
3390 | |
3372 | #if ENABLE_FRILLS |
3391 | #if ENABLE_FRILLS |
3373 | if (selection.rect && selection.beg.col > selection.end.col) |
3392 | if (selection.rect && selection.beg.col > selection.end.col) |
3374 | SWAP_IT (selection.beg.col, selection.end.col, int); |
3393 | ::swap (selection.beg.col, selection.end.col); |
3375 | #endif |
3394 | #endif |
3376 | } |
3395 | } |
3377 | |
3396 | |
3378 | #if ENABLE_FRILLS |
3397 | #if ENABLE_FRILLS |
3379 | void |
3398 | void |
… | |
… | |
3389 | { |
3408 | { |
3390 | stp = ROW(end_row).t; |
3409 | stp = ROW(end_row).t; |
3391 | |
3410 | |
3392 | while (--end_col >= 0) |
3411 | while (--end_col >= 0) |
3393 | { |
3412 | { |
3394 | if (stp[end_col] != ' ' |
3413 | if (stp[end_col] != NOCHAR |
3395 | && stp[end_col] != '\t' |
3414 | && !unicode::is_space (stp[end_col])) |
3396 | && stp[end_col] != NOCHAR) |
|
|
3397 | break; |
3415 | break; |
3398 | } |
3416 | } |
3399 | |
3417 | |
3400 | if (end_col >= 0 |
3418 | if (end_col >= 0 |
3401 | || !ROW(end_row - 1).is_longer ()) |
3419 | || !ROW(end_row - 1).is_longer ()) |
… | |
… | |
3577 | */ |
3595 | */ |
3578 | void |
3596 | void |
3579 | rxvt_term::pixel_position (int *x, int *y) |
3597 | rxvt_term::pixel_position (int *x, int *y) |
3580 | { |
3598 | { |
3581 | *x = Pixel2Col (*x); |
3599 | *x = Pixel2Col (*x); |
3582 | /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ |
3600 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
3583 | *y = Pixel2Row (*y); |
3601 | *y = Pixel2Row (*y); |
3584 | /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ |
3602 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
3585 | } |
3603 | } |
3586 | |
3604 | |
3587 | /* ------------------------------------------------------------------------- */ |
3605 | /* ------------------------------------------------------------------------- */ |
3588 | #ifdef USE_XIM |
3606 | #ifdef USE_XIM |
3589 | void |
3607 | void |
… | |
… | |
3600 | |
3618 | |
3601 | #if ENABLE_OVERLAY |
3619 | #if ENABLE_OVERLAY |
3602 | void |
3620 | void |
3603 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3621 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3604 | { |
3622 | { |
3605 | if (nrow < 3 || ncol < 3) |
3623 | if (nrow < 1 || ncol < 1) |
3606 | return; |
3624 | return; |
3607 | |
3625 | |
3608 | want_refresh = 1; |
3626 | want_refresh = 1; |
3609 | |
3627 | |
3610 | scr_overlay_off (); |
3628 | scr_overlay_off (); |
3611 | |
3629 | |
3612 | if (x < 0) x = ncol - w; |
3630 | if (x < 0) x = ncol - w; |
3613 | if (y < 0) y = nrow - h; |
3631 | if (y < 0) y = nrow - h; |
3614 | |
3632 | |
3615 | // make space for border |
3633 | // make space for border |
3616 | w += 2; MIN_IT (w, ncol); |
3634 | w += 2; min_it (w, ncol); |
3617 | h += 2; MIN_IT (h, nrow); |
3635 | h += 2; min_it (h, nrow); |
3618 | |
3636 | |
3619 | x -= 1; MAX_IT (x, 0); |
3637 | x -= 1; clamp_it (x, 0, ncol - w); |
3620 | y -= 1; MAX_IT (y, 0); |
3638 | y -= 1; clamp_it (y, 0, nrow - h); |
3621 | |
|
|
3622 | MIN_IT (x, ncol - w); |
|
|
3623 | MIN_IT (y, nrow - h); |
|
|
3624 | |
3639 | |
3625 | ov_x = x; ov_y = y; |
3640 | ov_x = x; ov_y = y; |
3626 | ov_w = w; ov_h = h; |
3641 | ov_w = w; ov_h = h; |
3627 | |
3642 | |
3628 | ov_text = new text_t *[h]; |
3643 | ov_text = new text_t *[h]; |
… | |
… | |
3720 | for (int y = ov_h; y--; ) |
3735 | for (int y = ov_h; y--; ) |
3721 | { |
3736 | { |
3722 | text_t *t1 = ov_text[y]; |
3737 | text_t *t1 = ov_text[y]; |
3723 | rend_t *r1 = ov_rend[y]; |
3738 | rend_t *r1 = ov_rend[y]; |
3724 | |
3739 | |
3725 | text_t *t2 = ROW(y - view_start).t + ov_x; |
3740 | text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; |
3726 | rend_t *r2 = ROW(y - view_start).r + ov_x; |
3741 | rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; |
3727 | |
3742 | |
3728 | for (int x = ov_w; x--; ) |
3743 | for (int x = ov_w; x--; ) |
3729 | { |
3744 | { |
3730 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3745 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3731 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3746 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |