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() \ |
… | |
… | |
114 | * SCREEN `COMMON' ROUTINES * |
115 | * SCREEN `COMMON' ROUTINES * |
115 | * ------------------------------------------------------------------------- */ |
116 | * ------------------------------------------------------------------------- */ |
116 | |
117 | |
117 | /* Fill part/all of a line with blanks. */ |
118 | /* Fill part/all of a line with blanks. */ |
118 | void |
119 | void |
119 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) |
120 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const |
120 | { |
121 | { |
121 | if (!l.t) |
122 | if (!l.t) |
122 | { |
123 | { |
123 | lalloc (l); |
124 | lalloc (l); |
124 | col = 0; |
125 | col = 0; |
125 | width = ncol; |
126 | width = ncol; |
126 | } |
127 | } |
127 | |
128 | |
|
|
129 | l.touch (); |
|
|
130 | |
128 | efs &= ~RS_baseattrMask; |
131 | efs &= ~RS_baseattrMask; |
129 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
130 | |
133 | |
131 | text_t *et = l.t + col; |
134 | text_t *et = l.t + col; |
132 | rend_t *er = l.r + col; |
135 | rend_t *er = l.r + col; |
… | |
… | |
139 | } |
142 | } |
140 | |
143 | |
141 | /* ------------------------------------------------------------------------- */ |
144 | /* ------------------------------------------------------------------------- */ |
142 | /* 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 */ |
143 | void |
146 | void |
144 | 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) const |
145 | { |
148 | { |
146 | scr_blank_line (l, 0, ncol, efs); |
149 | scr_blank_line (l, 0, ncol, efs); |
|
|
150 | |
|
|
151 | l.l = 0; |
|
|
152 | l.f = 0; |
147 | } |
153 | } |
148 | |
154 | |
149 | /* ------------------------------------------------------------------------- * |
155 | /* ------------------------------------------------------------------------- * |
150 | * SCREEN INITIALISATION * |
156 | * SCREEN INITIALISATION * |
151 | * ------------------------------------------------------------------------- */ |
157 | * ------------------------------------------------------------------------- */ |
|
|
158 | |
152 | void |
159 | void |
153 | rxvt_term::scr_reset () |
160 | rxvt_term::scr_reset () |
154 | { |
161 | { |
155 | unsigned int p, q; |
|
|
156 | int k; |
|
|
157 | |
|
|
158 | #if ENABLE_OVERLAY |
162 | #if ENABLE_OVERLAY |
159 | scr_overlay_off (); |
163 | scr_overlay_off (); |
160 | #endif |
164 | #endif |
161 | |
165 | |
162 | view_start = 0; |
166 | view_start = 0; |
… | |
… | |
172 | return; |
176 | return; |
173 | |
177 | |
174 | // we need at least two lines for wrapping to work correctly |
178 | // we need at least two lines for wrapping to work correctly |
175 | if (nrow + saveLines < 2) |
179 | if (nrow + saveLines < 2) |
176 | { |
180 | { |
|
|
181 | //TODO//FIXME |
177 | saveLines++; |
182 | saveLines++; |
178 | prev_nrow--; |
183 | prev_nrow--; |
179 | nsaved++; |
184 | top_row--; |
180 | } |
185 | } |
181 | |
186 | |
182 | want_refresh = 1; |
187 | want_refresh = 1; |
183 | |
188 | |
184 | int prev_total_rows = prev_nrow + saveLines; |
189 | int prev_total_rows = prev_nrow + saveLines; |
185 | total_rows = nrow + saveLines; |
190 | total_rows = nrow + saveLines; |
186 | |
191 | |
187 | screen.tscroll = 0; |
192 | screen.tscroll = 0; |
188 | screen.bscroll = nrow - 1; |
193 | screen.bscroll = nrow - 1; |
189 | |
194 | |
190 | if (!save) |
195 | if (!row_buf) |
191 | { |
196 | { |
192 | /* |
197 | /* |
193 | * 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 |
194 | * Note: this is still needed so that all the scrollback lines are NULL |
|
|
195 | */ |
199 | */ |
196 | nsaved = 0; /* no saved lines */ |
200 | top_row = 0; /* no saved lines */ |
197 | term_start = 0; |
201 | term_start = 0; |
198 | |
202 | |
199 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
200 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
201 | |
205 | |
202 | save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
203 | buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
206 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
204 | drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); |
207 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
205 | swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); |
208 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
206 | |
209 | |
207 | for (p = nrow; p--; ) |
210 | for (int row = nrow; row--; ) |
208 | { |
211 | { |
209 | scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); |
212 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
210 | scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); |
213 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
211 | scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); |
214 | scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
212 | } |
215 | } |
213 | |
216 | |
214 | memset (charsets, 'B', sizeof (charsets)); |
217 | memset (charsets, 'B', sizeof (charsets)); |
215 | rstyle = DEFAULT_RSTYLE; |
218 | rstyle = DEFAULT_RSTYLE; |
216 | screen.flags = Screen_DefaultFlags; |
219 | screen.flags = Screen_DefaultFlags; |
… | |
… | |
240 | { |
243 | { |
241 | /* |
244 | /* |
242 | * add or delete rows as appropriate |
245 | * add or delete rows as appropriate |
243 | */ |
246 | */ |
244 | |
247 | |
245 | rxvt_salloc *old_ta; |
248 | rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
246 | rxvt_salloc *old_ra; |
249 | rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
247 | |
250 | |
|
|
251 | #if 0 |
248 | if (nrow < prev_nrow) |
252 | if (nrow < prev_nrow) |
249 | { |
253 | { |
250 | /* delete rows */ |
|
|
251 | k = min (nsaved, prev_nrow - nrow); |
|
|
252 | // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO |
|
|
253 | scr_scroll_text (0, (int)prev_nrow - 1, k); |
|
|
254 | |
|
|
255 | for (p = nrow; p < prev_nrow; p++) |
254 | for (int row = nrow; row < prev_nrow; row++) |
256 | { |
255 | { |
257 | lfree (ROW(p)); |
|
|
258 | lfree (swap_save[p]); |
256 | lfree (swap_buf [row]); |
259 | lfree (drawn[p]); |
257 | lfree (drawn_buf[row]); |
260 | } |
258 | } |
|
|
259 | } |
|
|
260 | #endif |
261 | |
261 | |
262 | /* we have fewer rows so fix up cursor position */ |
262 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
263 | min_it (screen.cur.row, (int32_t)nrow - 1); |
263 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
264 | |
264 | |
265 | scr_reset_realloc (); /* realloc _last_ */ |
265 | for (int row = min (nrow, prev_nrow); row--; ) |
|
|
266 | { |
|
|
267 | lresize (drawn_buf[row]); |
|
|
268 | lresize (swap_buf [row]); |
|
|
269 | } |
|
|
270 | |
|
|
271 | for (int row = prev_nrow; row < nrow; row++) |
|
|
272 | { |
|
|
273 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
274 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
|
|
275 | } |
|
|
276 | |
|
|
277 | line_t *old_buf = row_buf; |
|
|
278 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
266 | } |
279 | |
267 | else if (nrow > prev_nrow) |
280 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
|
|
281 | int pend = MOD (term_start + top_row , prev_total_rows); |
|
|
282 | int q = total_rows; // rewrapped row |
|
|
283 | |
|
|
284 | if (top_row) |
|
|
285 | { |
|
|
286 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
|
|
287 | // to come up with a lean and mean algorithm. |
|
|
288 | |
|
|
289 | row_col_t ocur = screen.cur; |
|
|
290 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
|
|
291 | |
268 | { |
292 | do |
269 | /* add rows */ |
|
|
270 | scr_reset_realloc (); /* realloc _first_ */ |
|
|
271 | |
|
|
272 | int ocol = ncol; |
|
|
273 | ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
|
|
274 | |
|
|
275 | k = min (nsaved, nrow - prev_nrow); |
|
|
276 | |
|
|
277 | for (p = prev_total_rows; p < total_rows; p++) |
|
|
278 | save[p].clear (); |
|
|
279 | |
|
|
280 | for (p = prev_total_rows; p < total_rows - k; p++) |
|
|
281 | scr_blank_screen_mem (save[p], DEFAULT_RSTYLE); |
|
|
282 | |
|
|
283 | for (p = prev_nrow; p < nrow; p++) |
|
|
284 | { |
293 | { |
285 | swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); |
294 | p = MOD (p - 1, prev_total_rows); |
286 | drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); |
|
|
287 | } |
|
|
288 | |
|
|
289 | if (k > 0) |
|
|
290 | { |
|
|
291 | scr_scroll_text (0, (int)nrow - 1, -k); |
|
|
292 | screen.cur.row += k; |
|
|
293 | screen.s_cur.row += k; |
|
|
294 | nsaved -= k; |
|
|
295 | } |
|
|
296 | |
|
|
297 | #ifdef DEBUG_STRICT |
295 | #ifdef DEBUG_STRICT |
298 | assert (screen.cur.row < nrow); |
296 | assert (old_buf [MOD (p, prev_total_rows)].t); |
299 | #else /* drive with your eyes closed */ |
|
|
300 | min_it (screen.cur.row, nrow - 1); |
|
|
301 | #endif |
297 | #endif |
302 | ncol = ocol; // save b/c scr_blank_screen_mem uses this |
|
|
303 | } |
|
|
304 | |
|
|
305 | /* resize columns */ |
|
|
306 | if (ncol != prev_ncol) |
|
|
307 | { |
|
|
308 | old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
309 | old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
310 | |
|
|
311 | for (p = total_rows; p--; ) |
|
|
312 | lresize (save[p]); |
|
|
313 | |
|
|
314 | for (p = nrow; p--; ) |
|
|
315 | { |
|
|
316 | lresize (drawn[p]); |
|
|
317 | lresize (swap_save[p]); |
|
|
318 | } |
|
|
319 | |
|
|
320 | min_it (screen.cur.col, (int16_t)ncol - 1); |
|
|
321 | |
|
|
322 | delete old_ta; |
|
|
323 | delete old_ra; |
|
|
324 | } |
|
|
325 | |
|
|
326 | #if 0 |
|
|
327 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
|
|
328 | // to come up with a lean and mean algorithm. |
|
|
329 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
330 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
331 | |
|
|
332 | text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
|
|
333 | rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
|
|
334 | tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t)); |
|
|
335 | |
|
|
336 | for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D |
|
|
337 | |
|
|
338 | p = prev_total_rows; |
|
|
339 | q = total_rows; |
|
|
340 | |
|
|
341 | while (p > 0 && q > 0) |
|
|
342 | { |
|
|
343 | --p; |
|
|
344 | |
|
|
345 | printf ("pq %d:%d\n", p, q); |
|
|
346 | if (save[p].t) |
|
|
347 | { |
|
|
348 | int llen = save[p].l; |
298 | int plines = 1; |
|
|
299 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
349 | |
300 | |
350 | assert (llen >= 0); |
301 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
351 | |
|
|
352 | while (p && save[p - 1].l < 0) |
|
|
353 | { |
302 | { |
|
|
303 | p = MOD (p - 1, prev_total_rows); |
|
|
304 | |
354 | --p; |
305 | plines++; |
355 | llen += prev_ncol; |
306 | llen += prev_ncol; |
356 | } |
307 | } |
357 | |
308 | |
358 | int qlines = llen / ncol + 1; |
309 | int qlines = max (0, (llen - 1) / ncol) + 1; |
|
|
310 | |
|
|
311 | // drop partial lines completely |
|
|
312 | if (q < qlines) |
|
|
313 | break; |
|
|
314 | |
|
|
315 | q -= qlines; |
|
|
316 | |
359 | int lofs = 0; |
317 | int lofs = 0; |
|
|
318 | line_t *qline; |
360 | |
319 | |
361 | q -= qlines; |
320 | // re-assemble the full line by destination lines |
362 | |
|
|
363 | int qrow = q; |
|
|
364 | |
|
|
365 | printf ("QL %d llen %d\n", qlines, llen);//D |
|
|
366 | for (; qlines--; qrow++) |
321 | for (int qrow = q; qlines--; qrow++) |
367 | { |
322 | { |
|
|
323 | qline = row_buf + qrow; |
|
|
324 | lalloc (*qline); |
|
|
325 | qline->l = ncol; |
|
|
326 | qline->is_longer (1); |
|
|
327 | |
368 | if (qrow >= 0) |
328 | int qcol = 0; |
|
|
329 | |
|
|
330 | // fill a single destination line |
|
|
331 | while (lofs < llen && qcol < ncol) |
369 | { |
332 | { |
370 | tp [qrow] = (text_t *)ta->alloc (); |
|
|
371 | rp [qrow] = (rend_t *)ra->alloc (); |
|
|
372 | tl [qrow] = LINE_CONT1; |
|
|
373 | |
|
|
374 | int qcol = 0; |
|
|
375 | |
|
|
376 | for (;;) |
|
|
377 | { |
|
|
378 | int prow = lofs / prev_ncol + p; |
333 | int prow = lofs / prev_ncol; |
379 | int pcol = lofs % prev_ncol; |
334 | int pcol = lofs % prev_ncol; |
380 | |
335 | |
|
|
336 | prow = MOD (p + prow, prev_total_rows); |
|
|
337 | |
|
|
338 | // we only adjust the cursor _row_ and put it into |
|
|
339 | // the topmost line of "long line" it was in, as |
|
|
340 | // this seems to upset applications/shells/readline |
|
|
341 | // least. |
|
|
342 | if (prow == ocur.row) |
|
|
343 | screen.cur.row = q - (total_rows - nrow); |
|
|
344 | |
|
|
345 | line_t &pline = old_buf [prow]; |
|
|
346 | |
381 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
347 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
382 | |
348 | |
383 | 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); |
|
|
384 | |
|
|
385 | if (len <= 0) |
|
|
386 | { |
|
|
387 | tl [qrow] = qcol; |
|
|
388 | |
|
|
389 | TODO |
|
|
390 | scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol, |
|
|
391 | ncol - qcol, DEFAULT_RSTYLE); |
|
|
392 | |
|
|
393 | break; |
|
|
394 | } |
|
|
395 | |
|
|
396 | assert (lofs < 1000); |
349 | assert (len); |
|
|
350 | assert (pline.t); |
397 | |
351 | |
398 | memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); |
352 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
399 | memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); |
353 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
400 | |
354 | |
401 | lofs += len; |
355 | lofs += len; |
402 | qcol += len; |
356 | qcol += len; |
403 | |
|
|
404 | if (qcol == ncol) |
|
|
405 | break; |
|
|
406 | } |
|
|
407 | } |
357 | } |
408 | else |
|
|
409 | lofs += ncol; |
|
|
410 | } |
358 | } |
|
|
359 | |
|
|
360 | qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; |
|
|
361 | qline->is_longer (0); |
|
|
362 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
411 | } |
363 | } |
|
|
364 | while (p != pend && q > 0); |
|
|
365 | |
|
|
366 | term_start = total_rows - nrow; |
|
|
367 | top_row = q - term_start; |
|
|
368 | |
|
|
369 | // make sure all terminal lines exist |
|
|
370 | while (top_row > 0) |
|
|
371 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
|
|
372 | } |
|
|
373 | else |
412 | } |
374 | { |
|
|
375 | // if no scrollback exists (yet), wing, instead of wrap |
|
|
376 | |
|
|
377 | for (int row = min (nrow, prev_nrow); row--; ) |
|
|
378 | { |
|
|
379 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
|
|
380 | line_t &qline = row_buf [row]; |
413 | |
381 | |
414 | free (screen.text); screen.text = tp; |
382 | qline = pline; |
415 | free (screen.rend); screen.rend = rp; |
383 | lresize (qline); |
416 | free (screen.tlen); screen.tlen = tl; |
384 | } |
417 | |
385 | |
418 | for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D |
386 | for (int row = prev_nrow; row < nrow; row++) |
|
|
387 | { |
|
|
388 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
|
|
389 | } |
|
|
390 | |
|
|
391 | term_start = 0; |
|
|
392 | } |
|
|
393 | |
|
|
394 | #ifdef DEBUG_STRICT //TODO: remove |
|
|
395 | for (int i = top_row; i < nrow; i++) |
|
|
396 | assert (ROW (i).t); |
419 | #endif |
397 | #endif |
|
|
398 | |
|
|
399 | free (old_buf); |
|
|
400 | delete old_ta; |
|
|
401 | delete old_ra; |
|
|
402 | |
|
|
403 | clamp_it (screen.cur.row, 0, nrow - 1); |
|
|
404 | clamp_it (screen.cur.col, 0, ncol - 1); |
420 | |
405 | |
421 | if (tabs) |
406 | if (tabs) |
422 | free (tabs); |
407 | free (tabs); |
423 | } |
408 | } |
424 | |
409 | |
425 | prev_nrow = nrow; |
410 | prev_nrow = nrow; |
426 | prev_ncol = ncol; |
411 | prev_ncol = ncol; |
427 | |
412 | |
428 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
413 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
429 | |
414 | |
430 | for (p = 0; p < ncol; p++) |
415 | for (int col = ncol; col--; ) |
431 | tabs[p] = (p % TABSIZE == 0) ? 1 : 0; |
416 | tabs [col] = col % TABSIZE == 0; |
432 | |
417 | |
433 | tt_winch (); |
418 | tt_winch (); |
434 | } |
|
|
435 | |
419 | |
436 | void |
420 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
437 | rxvt_term::scr_reset_realloc () |
|
|
438 | { |
|
|
439 | swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t)); |
|
|
440 | drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t)); |
|
|
441 | buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t)); |
|
|
442 | save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t)); |
|
|
443 | } |
421 | } |
444 | |
422 | |
445 | /* ------------------------------------------------------------------------- */ |
423 | /* ------------------------------------------------------------------------- */ |
446 | /* |
424 | /* |
447 | * Free everything. That way malloc debugging can find leakage. |
425 | * Free everything. That way malloc debugging can find leakage. |
… | |
… | |
450 | rxvt_term::scr_release () |
428 | rxvt_term::scr_release () |
451 | { |
429 | { |
452 | delete talloc; talloc = 0; |
430 | delete talloc; talloc = 0; |
453 | delete ralloc; ralloc = 0; |
431 | delete ralloc; ralloc = 0; |
454 | |
432 | |
455 | free (save); |
433 | free (row_buf); |
456 | free (swap_save); |
434 | free (swap_buf); |
457 | free (drawn); |
435 | free (drawn_buf); |
458 | free (buf); |
|
|
459 | free (tabs); |
436 | free (tabs); |
|
|
437 | |
|
|
438 | row_buf = 0; // signal that we freed all the arrays |
460 | } |
439 | } |
461 | |
440 | |
462 | /* ------------------------------------------------------------------------- */ |
441 | /* ------------------------------------------------------------------------- */ |
463 | /* |
442 | /* |
464 | * Hard reset |
443 | * Hard reset |
… | |
… | |
469 | scr_release (); |
448 | scr_release (); |
470 | prev_nrow = prev_ncol = 0; |
449 | prev_nrow = prev_ncol = 0; |
471 | scr_reset (); |
450 | scr_reset (); |
472 | |
451 | |
473 | scr_clear (true); |
452 | scr_clear (true); |
474 | scr_refresh (SLOW_REFRESH); |
453 | scr_refresh (); |
475 | } |
454 | } |
476 | |
455 | |
477 | /* ------------------------------------------------------------------------- * |
456 | /* ------------------------------------------------------------------------- * |
478 | * PROCESS SCREEN COMMANDS * |
457 | * PROCESS SCREEN COMMANDS * |
479 | * ------------------------------------------------------------------------- */ |
458 | * ------------------------------------------------------------------------- */ |
… | |
… | |
520 | min_it (s->cur.row, nrow - 1); |
499 | min_it (s->cur.row, nrow - 1); |
521 | min_it (s->cur.col, ncol - 1); |
500 | min_it (s->cur.col, ncol - 1); |
522 | #ifdef DEBUG_STRICT |
501 | #ifdef DEBUG_STRICT |
523 | assert (s->cur.row >= 0); |
502 | assert (s->cur.row >= 0); |
524 | assert (s->cur.col >= 0); |
503 | assert (s->cur.col >= 0); |
525 | #else /* drive with your eyes closed */ |
|
|
526 | max_it (s->cur.row, 0); |
|
|
527 | max_it (s->cur.col, 0); |
|
|
528 | #endif |
504 | #endif |
529 | } |
505 | } |
530 | |
506 | |
531 | /* ------------------------------------------------------------------------- */ |
507 | /* ------------------------------------------------------------------------- */ |
532 | /* |
508 | /* |
… | |
… | |
552 | |
528 | |
553 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
529 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
554 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
530 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
555 | |
531 | |
556 | #if NSCREENS |
532 | #if NSCREENS |
557 | if (options & Opt_secondaryScreen) |
533 | if (OPTION (Opt_secondaryScreen)) |
558 | { |
534 | { |
559 | num_scr = 0; |
535 | num_scr = 0; |
560 | |
536 | |
561 | for (int i = nrow; i--; ) |
537 | for (int i = prev_nrow; i--; ) |
562 | ::swap (ROW(i), swap_save[i]); |
538 | ::swap (ROW(i), swap_buf [i]); |
563 | |
539 | |
564 | ::swap (screen.charset, swap.charset); |
540 | ::swap (screen.charset, swap.charset); |
565 | ::swap (screen.flags, swap.flags); |
541 | ::swap (screen.flags, swap.flags); |
566 | screen.flags |= Screen_VisibleCursor; |
542 | screen.flags |= Screen_VisibleCursor; |
567 | swap.flags |= Screen_VisibleCursor; |
543 | swap.flags |= Screen_VisibleCursor; |
568 | } |
544 | } |
569 | else |
545 | else |
570 | #endif |
546 | #endif |
571 | if (options & Opt_secondaryScroll) |
547 | if (OPTION (Opt_secondaryScroll)) |
572 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
548 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
573 | |
549 | |
574 | return scrn; |
550 | return scrn; |
575 | } |
551 | } |
576 | |
552 | |
… | |
… | |
596 | * Change the colour for following text |
572 | * Change the colour for following text |
597 | */ |
573 | */ |
598 | void |
574 | void |
599 | rxvt_term::scr_color (unsigned int color, int fgbg) |
575 | rxvt_term::scr_color (unsigned int color, int fgbg) |
600 | { |
576 | { |
601 | if (color > maxTermCOLOR) |
577 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
602 | color = fgbg; |
578 | color = fgbg; |
603 | |
579 | |
604 | if (fgbg == Color_fg) |
580 | if (fgbg == Color_fg) |
605 | rstyle = SET_FGCOLOR (rstyle, color); |
581 | rstyle = SET_FGCOLOR (rstyle, color); |
606 | else |
582 | else |
… | |
… | |
637 | want_refresh = 1; |
613 | want_refresh = 1; |
638 | num_scr += count; |
614 | num_scr += count; |
639 | |
615 | |
640 | if (count > 0 |
616 | if (count > 0 |
641 | && row1 == 0 |
617 | && row1 == 0 |
642 | && row2 == nrow - 1 |
|
|
643 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
618 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
644 | { |
619 | { |
645 | nsaved = min (nsaved + count, saveLines); |
620 | top_row = max (top_row - count, -saveLines); |
|
|
621 | |
|
|
622 | // scroll everything up 'count' lines |
646 | term_start = (term_start + count) % total_rows; |
623 | term_start = (term_start + count) % total_rows; |
647 | |
624 | |
|
|
625 | { |
|
|
626 | // severe bottommost scrolled line |
|
|
627 | line_t &l = ROW(row2 - count); |
|
|
628 | l.touch (); |
|
|
629 | l.is_longer (0); |
|
|
630 | } |
|
|
631 | |
|
|
632 | // erase newly scorlled-in lines |
|
|
633 | for (int i = count; i; --i ) |
|
|
634 | { |
|
|
635 | // basically this is a slightly optimized scr_blank_screen_mem |
|
|
636 | // it is worth the effort on slower machines |
|
|
637 | line_t &l = ROW(nrow - i); |
|
|
638 | |
|
|
639 | scr_blank_line (l, 0, l.l, rstyle); |
|
|
640 | |
|
|
641 | l.l = 0; |
|
|
642 | l.f = 0; |
|
|
643 | } |
|
|
644 | |
|
|
645 | // now copy lines below the scroll region bottom to the |
|
|
646 | // bottom of the screen again, so they look as if they |
|
|
647 | // hadn't moved. |
|
|
648 | for (int i = nrow; --i > row2; ) |
|
|
649 | { |
|
|
650 | line_t &l1 = ROW(i - count); |
|
|
651 | line_t &l2 = ROW(i); |
|
|
652 | |
|
|
653 | ::swap (l1, l2); |
|
|
654 | l2.touch (); |
|
|
655 | } |
|
|
656 | |
|
|
657 | // move and/or clear selection, if any |
648 | if (selection.op && current_screen == selection.screen) |
658 | if (selection.op && current_screen == selection.screen) |
649 | { |
659 | { |
650 | selection.beg.row -= count; |
660 | selection.beg.row -= count; |
651 | selection.end.row -= count; |
661 | selection.end.row -= count; |
652 | selection.mark.row -= count; |
662 | selection.mark.row -= count; |
653 | |
663 | |
654 | selection_check (0); |
664 | if (selection.beg.row < top_row |
655 | } |
665 | || selection.end.row < top_row |
656 | |
666 | || selection.mark.row < top_row) |
657 | for (int i = count; i--; ) |
|
|
658 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
|
|
659 | |
|
|
660 | if ((options & Opt_scrollWithBuffer) |
|
|
661 | && view_start != 0 |
|
|
662 | && view_start != saveLines) |
|
|
663 | scr_page (UP, count); |
|
|
664 | } |
|
|
665 | else |
|
|
666 | { |
|
|
667 | if (selection.op && current_screen == selection.screen) |
|
|
668 | { |
|
|
669 | int i = selection.beg.row; |
|
|
670 | int j = selection.end.row; |
|
|
671 | |
|
|
672 | if ((i < row1 && j > row1) |
|
|
673 | || (i < row2 && j > row2) |
|
|
674 | || (i - count < row1 && i >= row1) |
|
|
675 | || (i - count > row2 && i <= row2) |
|
|
676 | || (j - count < row1 && j >= row1) |
|
|
677 | || (j - count > row2 && j <= row2)) |
|
|
678 | { |
667 | { |
679 | CLEAR_ALL_SELECTION (); |
668 | CLEAR_ALL_SELECTION (); |
680 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
669 | selection.op = SELECTION_CLEAR; |
681 | } |
670 | } |
682 | else if (j >= row1 && j <= row2) |
671 | } |
|
|
672 | |
|
|
673 | // finally move the view window, if desired |
|
|
674 | if (OPTION (Opt_scrollWithBuffer) |
|
|
675 | && view_start != 0 |
|
|
676 | && view_start != -saveLines) |
|
|
677 | scr_page (UP, count); |
|
|
678 | |
|
|
679 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
|
|
680 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
|
|
681 | } |
|
|
682 | else |
|
|
683 | { |
|
|
684 | if (selection.op && current_screen == selection.screen) |
|
|
685 | { |
|
|
686 | if ((selection.beg.row < row1 && selection.end.row > row1) |
|
|
687 | || (selection.beg.row < row2 && selection.end.row > row2) |
|
|
688 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
|
|
689 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
|
|
690 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
|
|
691 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
|
|
692 | { |
|
|
693 | CLEAR_ALL_SELECTION (); |
|
|
694 | selection.op = SELECTION_CLEAR; |
|
|
695 | } |
|
|
696 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
683 | { |
697 | { |
684 | /* move selected region too */ |
698 | /* move selected region too */ |
685 | selection.beg.row -= count; |
699 | selection.beg.row -= count; |
686 | selection.end.row -= count; |
700 | selection.end.row -= count; |
687 | selection.mark.row -= count; |
701 | selection.mark.row -= count; |
… | |
… | |
693 | // use a simple and robust scrolling algorithm, this |
707 | // use a simple and robust scrolling algorithm, this |
694 | // part of scr_scroll_text is not time-critical. |
708 | // part of scr_scroll_text is not time-critical. |
695 | |
709 | |
696 | int rows = row2 - row1 + 1; |
710 | int rows = row2 - row1 + 1; |
697 | |
711 | |
|
|
712 | min_it (count, rows); |
|
|
713 | |
|
|
714 | line_t *temp_buf = row_buf + total_rows; |
|
|
715 | |
698 | for (int row = 0; row < rows; row++) |
716 | for (int row = 0; row < rows; row++) |
699 | { |
717 | { |
700 | buf [row] = ROW(row1 + (row + count + rows) % rows); |
718 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
701 | |
719 | |
702 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
720 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
703 | scr_blank_screen_mem (buf [row], rstyle); |
721 | scr_blank_screen_mem (temp_buf [row], rstyle); |
704 | } |
722 | } |
705 | |
723 | |
706 | for (int row = 0; row < rows; row++) |
724 | for (int row = 0; row < rows; row++) |
707 | ROW(row1 + row) = buf [row]; |
725 | ROW(row1 + row) = temp_buf [row]; |
708 | } |
726 | } |
709 | |
727 | |
710 | return count; |
728 | return count; |
711 | } |
729 | } |
712 | |
730 | |
713 | /* ------------------------------------------------------------------------- */ |
731 | /* ------------------------------------------------------------------------- */ |
714 | /* |
732 | /* |
715 | * Add text given in <str> of length <len> to screen struct |
733 | * Add text given in <str> of length <len> to screen struct |
716 | */ |
734 | */ |
717 | void |
735 | void |
718 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
736 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) |
719 | { |
737 | { |
720 | if (len <= 0) /* sanity */ |
738 | if (len <= 0) /* sanity */ |
721 | return; |
739 | return; |
722 | |
740 | |
723 | unsigned char checksel; |
741 | unsigned char checksel; |
724 | unicode_t c; |
742 | unicode_t c; |
725 | int row, last_col; |
743 | int ncol = this->ncol; |
726 | const unicode_t *strend = str + len; |
744 | const wchar_t *strend = str + len; |
727 | |
745 | |
728 | want_refresh = 1; |
746 | want_refresh = 1; |
729 | ZERO_SCROLLBACK (); |
747 | ZERO_SCROLLBACK (); |
730 | last_col = ncol; |
|
|
731 | |
748 | |
732 | if (nlines > 0) |
749 | if (minlines > 0) |
733 | { |
750 | { |
734 | nlines += screen.cur.row - screen.bscroll; |
751 | minlines += screen.cur.row - screen.bscroll; |
|
|
752 | |
735 | if ((nlines > 0) |
753 | if (minlines > 0 |
736 | && (screen.tscroll == 0) |
754 | && screen.tscroll == 0 |
737 | && (screen.bscroll == (nrow - 1))) |
755 | && screen.bscroll == nrow - 1) |
738 | { |
756 | { |
739 | /* _at least_ this many lines need to be scrolled */ |
757 | /* _at least_ this many lines need to be scrolled */ |
740 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines); |
758 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
741 | screen.cur.row -= nlines; |
759 | screen.cur.row -= minlines; |
742 | } |
760 | } |
743 | } |
761 | } |
744 | |
762 | |
745 | #ifdef DEBUG_STRICT |
763 | #ifdef DEBUG_STRICT |
746 | assert (screen.cur.col < last_col); |
764 | assert (screen.cur.col < ncol); |
747 | assert ((screen.cur.row < nrow) |
765 | assert (screen.cur.row < nrow |
748 | && (screen.cur.row >= - (int32_t)nsaved)); |
766 | && screen.cur.row >= top_row); |
749 | #else /* drive with your eyes closed */ |
|
|
750 | min_it (screen.cur.col, last_col - 1); |
|
|
751 | min_it (screen.cur.row, (int32_t)nrow - 1); |
|
|
752 | max_it (screen.cur.row, - (int32_t)nsaved); |
|
|
753 | #endif |
767 | #endif |
754 | row = screen.cur.row; |
768 | int row = screen.cur.row; |
755 | |
769 | |
756 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
770 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
757 | |
771 | |
758 | line_t *line = &ROW(row); |
772 | line_t *line = &ROW(row); |
759 | |
773 | |
760 | while (str < strend) |
774 | while (str < strend) |
761 | { |
775 | { |
762 | c = *str++; |
776 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
763 | |
777 | |
764 | if (c < 0x20) |
778 | if (c < 0x20) |
765 | if (c == C0_LF) |
779 | if (c == C0_LF) |
766 | { |
780 | { |
767 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
768 | max_it (line->l, screen.cur.col); |
781 | max_it (line->l, screen.cur.col); |
769 | |
782 | |
770 | screen.flags &= ~Screen_WrapNext; |
783 | screen.flags &= ~Screen_WrapNext; |
771 | |
784 | |
772 | if (screen.cur.row == screen.bscroll) |
785 | if (screen.cur.row == screen.bscroll) |
773 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
786 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
… | |
… | |
777 | line = &ROW(row); /* _must_ refresh */ |
790 | line = &ROW(row); /* _must_ refresh */ |
778 | continue; |
791 | continue; |
779 | } |
792 | } |
780 | else if (c == C0_CR) |
793 | else if (c == C0_CR) |
781 | { |
794 | { |
782 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
783 | max_it (line->l, screen.cur.col); |
795 | max_it (line->l, screen.cur.col); |
784 | |
796 | |
785 | screen.flags &= ~Screen_WrapNext; |
797 | screen.flags &= ~Screen_WrapNext; |
786 | screen.cur.col = 0; |
798 | screen.cur.col = 0; |
787 | continue; |
799 | continue; |
788 | } |
800 | } |
… | |
… | |
805 | CLEAR_SELECTION (); |
817 | CLEAR_SELECTION (); |
806 | } |
818 | } |
807 | |
819 | |
808 | if (screen.flags & Screen_WrapNext) |
820 | if (screen.flags & Screen_WrapNext) |
809 | { |
821 | { |
|
|
822 | max_it (line->l, ncol); |
810 | line->set_is_longer (); |
823 | line->is_longer (1); |
811 | |
824 | |
812 | scr_do_wrap (); |
825 | scr_do_wrap (); |
813 | |
826 | |
814 | row = screen.cur.row; |
827 | row = screen.cur.row; |
815 | line = &ROW(row); /* _must_ refresh */ |
828 | line = &ROW(row); /* _must_ refresh */ |
… | |
… | |
823 | // do wcwidth before further replacements, as wcwidth might return -1 |
836 | // do wcwidth before further replacements, as wcwidth might return -1 |
824 | // for the line drawing characters below as they might be invalid in the current |
837 | // for the line drawing characters below as they might be invalid in the current |
825 | // locale. |
838 | // locale. |
826 | int width = c < 0x100 ? 1 : wcwidth (c); |
839 | int width = c < 0x100 ? 1 : wcwidth (c); |
827 | |
840 | |
828 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
841 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
829 | { |
842 | { |
830 | // vt100 special graphics and line drawing |
843 | // vt100 special graphics and line drawing |
831 | // 5f-7e standard vt100 |
844 | // 5f-7e standard vt100 |
832 | // 40-5e rxvt extension for extra curses acs chars |
845 | // 40-5e rxvt extension for extra curses acs chars |
833 | static uint16_t vt100_0[62] = { // 41 .. 7e |
846 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
885 | } |
898 | } |
886 | |
899 | |
887 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
900 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
888 | |
901 | |
889 | // if the character doesn't fit into the remaining columns... |
902 | // if the character doesn't fit into the remaining columns... |
890 | if (screen.cur.col > last_col - width && last_col >= width) |
903 | if (screen.cur.col > ncol - width && ncol >= width) |
891 | { |
904 | { |
892 | // ...output spaces |
905 | // ...output spaces |
893 | c = ' '; |
906 | c = ' '; |
894 | // and try the same character next loop iteration |
907 | // and try the same character next loop iteration |
895 | --str; |
908 | --str; |
896 | } |
909 | } |
897 | |
910 | |
|
|
911 | line->touch (); |
|
|
912 | |
898 | do |
913 | do |
899 | { |
914 | { |
900 | line->t[screen.cur.col] = c; |
915 | line->t[screen.cur.col] = c; |
901 | line->r[screen.cur.col] = rend; |
916 | line->r[screen.cur.col] = rend; |
902 | |
917 | |
903 | if (screen.cur.col < last_col - 1) |
918 | if (screen.cur.col < ncol - 1) |
904 | screen.cur.col++; |
919 | screen.cur.col++; |
905 | else |
920 | else |
906 | { |
921 | { |
907 | line->l = last_col; |
922 | line->l = ncol; |
908 | if (screen.flags & Screen_Autowrap) |
923 | if (screen.flags & Screen_Autowrap) |
909 | screen.flags |= Screen_WrapNext; |
924 | screen.flags |= Screen_WrapNext; |
910 | break; |
925 | break; |
911 | } |
926 | } |
912 | |
927 | |
… | |
… | |
914 | } |
929 | } |
915 | while (--width > 0); |
930 | while (--width > 0); |
916 | |
931 | |
917 | // pad with spaces when overwriting wide character with smaller one |
932 | // pad with spaces when overwriting wide character with smaller one |
918 | if (!width) |
933 | if (!width) |
|
|
934 | { |
|
|
935 | line->touch (); |
|
|
936 | |
919 | for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) |
937 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
920 | { |
938 | { |
921 | line->t[c] = ' '; |
939 | line->t[c] = ' '; |
922 | line->r[c] = rend; |
940 | line->r[c] = rend; |
923 | } |
941 | } |
|
|
942 | } |
924 | } |
943 | } |
925 | else // width == 0 |
944 | else // width == 0 |
926 | { |
945 | { |
927 | #if ENABLE_COMBINING |
946 | #if ENABLE_COMBINING |
928 | // handle combining characters |
947 | // handle combining characters |
929 | // we just tag the accent on the previous on-screen character. |
948 | // we just tag the accent on the previous on-screen character. |
930 | // this is arguably not correct, but also arguably not wrong. |
949 | // this is arguably not correct, but also arguably not wrong. |
931 | // we don't handle double-width characters nicely yet. |
950 | // we don't handle double-width characters nicely yet. |
|
|
951 | line_t *linep; |
932 | text_t *tp; |
952 | text_t *tp; |
933 | rend_t *rp; |
953 | rend_t *rp; |
934 | |
954 | |
935 | if (screen.cur.col > 0) |
955 | if (screen.cur.col > 0) |
936 | { |
956 | { |
|
|
957 | linep = line; |
937 | tp = line->t + screen.cur.col - 1; |
958 | tp = line->t + screen.cur.col - 1; |
938 | rp = line->r + screen.cur.col - 1; |
959 | rp = line->r + screen.cur.col - 1; |
939 | |
|
|
940 | while (*tp == NOCHAR && tp > line->t) |
|
|
941 | tp--, rp--; |
|
|
942 | } |
960 | } |
943 | else if (screen.cur.row > 0 |
961 | else if (screen.cur.row > 0 |
944 | && ROW(screen.cur.row - 1).is_longer ()) |
962 | && ROW(screen.cur.row - 1).is_longer ()) |
945 | { |
963 | { |
946 | line_t *line = &ROW(screen.cur.row - 1); |
964 | linep = &ROW(screen.cur.row - 1); |
947 | |
|
|
948 | tp = line->t + last_col - 1; |
965 | tp = line->t + ncol - 1; |
949 | rp = line->r + last_col - 1; |
966 | rp = line->r + ncol - 1; |
950 | |
|
|
951 | while (*tp == NOCHAR && tp > line->t) |
|
|
952 | tp--, rp--; |
|
|
953 | } |
967 | } |
954 | else |
968 | else |
955 | continue; |
969 | continue; |
|
|
970 | |
|
|
971 | linep->touch (); |
|
|
972 | |
|
|
973 | while (*tp == NOCHAR && tp > linep->t) |
|
|
974 | tp--, rp--; |
956 | |
975 | |
957 | // first try to find a precomposed character |
976 | // first try to find a precomposed character |
958 | unicode_t n = rxvt_compose (*tp, c); |
977 | unicode_t n = rxvt_compose (*tp, c); |
959 | if (n == NOCHAR) |
978 | if (n == NOCHAR) |
960 | n = rxvt_composite.compose (*tp, c); |
979 | n = rxvt_composite.compose (*tp, c); |
… | |
… | |
963 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
982 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
964 | #endif |
983 | #endif |
965 | } |
984 | } |
966 | } |
985 | } |
967 | |
986 | |
968 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
969 | max_it (line->l, screen.cur.col); |
987 | max_it (line->l, screen.cur.col); |
970 | |
988 | |
971 | #ifdef DEBUG_STRICT |
989 | #ifdef DEBUG_STRICT |
972 | assert (screen.cur.row >= 0); |
990 | assert (screen.cur.row >= 0); |
973 | #else /* drive with your eyes closed */ |
|
|
974 | max_it (screen.cur.row, 0); |
|
|
975 | #endif |
991 | #endif |
976 | } |
992 | } |
977 | |
993 | |
978 | /* ------------------------------------------------------------------------- */ |
994 | /* ------------------------------------------------------------------------- */ |
979 | /* |
995 | /* |
… | |
… | |
1018 | |
1034 | |
1019 | if (count == 0) |
1035 | if (count == 0) |
1020 | return; |
1036 | return; |
1021 | else if (count > 0) |
1037 | else if (count > 0) |
1022 | { |
1038 | { |
1023 | int row = screen.cur.row; |
|
|
1024 | |
|
|
1025 | line_t &l = ROW(row); |
1039 | line_t &l = ROW(screen.cur.row); |
1026 | rend_t base_rend = l.r[i]; |
1040 | rend_t base_rend = l.r[i]; |
1027 | ht &= l.t[i] == ' '; |
1041 | ht &= l.t[i] == ' '; |
1028 | |
1042 | |
1029 | for (; ++i < ncol; ) |
1043 | for (; ++i < ncol; ) |
1030 | if (tabs[i]) |
1044 | if (tabs[i]) |
1031 | { |
1045 | { |
1032 | x = i; |
1046 | x = i; |
|
|
1047 | |
1033 | if (!--count) |
1048 | if (!--count) |
1034 | break; |
1049 | break; |
1035 | } |
1050 | } |
1036 | else |
1051 | else |
1037 | ht &= l.t[i] == ' ' |
1052 | ht &= l.t[i] == ' ' |
… | |
… | |
1040 | if (count) |
1055 | if (count) |
1041 | x = ncol - 1; |
1056 | x = ncol - 1; |
1042 | |
1057 | |
1043 | // store horizontal tab commands as characters inside the text |
1058 | // store horizontal tab commands as characters inside the text |
1044 | // buffer so they can be selected and pasted. |
1059 | // buffer so they can be selected and pasted. |
1045 | if (ht && options & Opt_pastableTabs) |
1060 | if (ht && OPTION (Opt_pastableTabs)) |
1046 | { |
1061 | { |
1047 | base_rend = SET_FONT (base_rend, 0); |
1062 | base_rend = SET_FONT (base_rend, 0); |
1048 | |
1063 | |
1049 | if (!l.is_longer ()) /* XXX: think about this */ |
1064 | l.touch (x); |
1050 | max_it (l.l, x); |
|
|
1051 | |
1065 | |
1052 | i = screen.cur.col; |
1066 | i = screen.cur.col; |
1053 | |
1067 | |
1054 | l.t[i] = '\t'; |
1068 | l.t[i] = '\t'; |
1055 | l.r[i] = base_rend; |
1069 | l.r[i] = base_rend; |
… | |
… | |
1105 | */ |
1119 | */ |
1106 | #if ENABLE_FRILLS |
1120 | #if ENABLE_FRILLS |
1107 | void |
1121 | void |
1108 | rxvt_term::scr_forwardindex () |
1122 | rxvt_term::scr_forwardindex () |
1109 | { |
1123 | { |
1110 | int row; |
|
|
1111 | |
|
|
1112 | if (screen.cur.col < ncol - 1) |
1124 | if (screen.cur.col < ncol - 1) |
1113 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1125 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1114 | else |
1126 | else |
1115 | { |
1127 | { |
1116 | row = screen.cur.row; |
1128 | line_t &l = ROW(screen.cur.row); |
1117 | |
1129 | |
1118 | if (ROW(row).is_longer ()) //TODO//FIXME//LEN |
1130 | l.touch (); |
1119 | ROW(row).l = ncol; |
1131 | l.is_longer (0); |
1120 | |
1132 | |
1121 | scr_gotorc (0, 0, R_RELATIVE); |
1133 | scr_gotorc (0, 0, R_RELATIVE); |
1122 | scr_insdel_chars (1, DELETE); |
1134 | scr_insdel_chars (1, DELETE); |
1123 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1135 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1124 | } |
1136 | } |
… | |
… | |
1134 | { |
1146 | { |
1135 | want_refresh = 1; |
1147 | want_refresh = 1; |
1136 | ZERO_SCROLLBACK (); |
1148 | ZERO_SCROLLBACK (); |
1137 | |
1149 | |
1138 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1150 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1139 | max_it (screen.cur.col, 0); |
|
|
1140 | min_it (screen.cur.col, (int32_t)ncol - 1); |
1151 | clamp_it (screen.cur.col, 0, ncol - 1); |
1141 | |
1152 | |
1142 | screen.flags &= ~Screen_WrapNext; |
1153 | screen.flags &= ~Screen_WrapNext; |
1143 | |
1154 | |
1144 | if (relative & R_RELATIVE) |
1155 | if (relative & R_RELATIVE) |
1145 | { |
1156 | { |
… | |
… | |
1169 | } |
1180 | } |
1170 | else |
1181 | else |
1171 | screen.cur.row = row; |
1182 | screen.cur.row = row; |
1172 | } |
1183 | } |
1173 | |
1184 | |
1174 | max_it (screen.cur.row, 0); |
|
|
1175 | min_it (screen.cur.row, (int32_t)nrow - 1); |
1185 | clamp_it (screen.cur.row, 0, nrow - 1); |
1176 | } |
1186 | } |
1177 | |
1187 | |
1178 | /* ------------------------------------------------------------------------- */ |
1188 | /* ------------------------------------------------------------------------- */ |
1179 | /* |
1189 | /* |
1180 | * direction should be UP or DN |
1190 | * direction should be UP or DN |
… | |
… | |
1195 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1205 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1196 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn); |
1206 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn); |
1197 | else |
1207 | else |
1198 | screen.cur.row += dirn; |
1208 | screen.cur.row += dirn; |
1199 | |
1209 | |
1200 | max_it (screen.cur.row, 0); |
|
|
1201 | min_it (screen.cur.row, (int32_t)nrow - 1); |
1210 | clamp_it (screen.cur.row, 0, nrow - 1); |
1202 | selection_check (0); |
1211 | selection_check (0); |
1203 | } |
1212 | } |
1204 | |
1213 | |
1205 | /* ------------------------------------------------------------------------- */ |
1214 | /* ------------------------------------------------------------------------- */ |
1206 | /* |
1215 | /* |
… | |
… | |
1210 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1219 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1211 | */ |
1220 | */ |
1212 | void |
1221 | void |
1213 | rxvt_term::scr_erase_line (int mode) |
1222 | rxvt_term::scr_erase_line (int mode) |
1214 | { |
1223 | { |
1215 | unsigned int row, col, num; |
1224 | unsigned int col, num; |
1216 | |
1225 | |
1217 | want_refresh = 1; |
1226 | want_refresh = 1; |
1218 | ZERO_SCROLLBACK (); |
1227 | ZERO_SCROLLBACK (); |
1219 | |
1228 | |
1220 | selection_check (1); |
1229 | selection_check (1); |
1221 | |
1230 | |
1222 | row = screen.cur.row; |
1231 | line_t &line = ROW(screen.cur.row); |
|
|
1232 | |
|
|
1233 | line.touch (); |
|
|
1234 | line.is_longer (0); |
1223 | |
1235 | |
1224 | switch (mode) |
1236 | switch (mode) |
1225 | { |
1237 | { |
1226 | case 0: /* erase to end of line */ |
1238 | case 0: /* erase to end of line */ |
1227 | col = screen.cur.col; |
1239 | col = screen.cur.col; |
1228 | num = ncol - col; |
1240 | num = ncol - col; |
1229 | min_it (ROW(row).l, (int16_t)col); |
1241 | min_it (line.l, col); |
1230 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1242 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1231 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1243 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1232 | CLEAR_SELECTION (); |
1244 | CLEAR_SELECTION (); |
1233 | break; |
1245 | break; |
1234 | case 1: /* erase to beginning of line */ |
1246 | case 1: /* erase to beginning of line */ |
… | |
… | |
1239 | CLEAR_SELECTION (); |
1251 | CLEAR_SELECTION (); |
1240 | break; |
1252 | break; |
1241 | case 2: /* erase whole line */ |
1253 | case 2: /* erase whole line */ |
1242 | col = 0; |
1254 | col = 0; |
1243 | num = ncol; |
1255 | num = ncol; |
1244 | ROW(row).l = 0; |
1256 | line.l = 0; |
1245 | if (selection.beg.row <= screen.cur.row |
1257 | if (selection.beg.row <= screen.cur.row |
1246 | && selection.end.row >= screen.cur.row) |
1258 | && selection.end.row >= screen.cur.row) |
1247 | CLEAR_SELECTION (); |
1259 | CLEAR_SELECTION (); |
1248 | break; |
1260 | break; |
1249 | default: |
1261 | default: |
1250 | return; |
1262 | return; |
1251 | } |
1263 | } |
1252 | |
1264 | |
1253 | scr_blank_line (ROW(row), col, num, rstyle); |
1265 | scr_blank_line (line, col, num, rstyle); |
1254 | } |
1266 | } |
1255 | |
1267 | |
1256 | /* ------------------------------------------------------------------------- */ |
1268 | /* ------------------------------------------------------------------------- */ |
1257 | /* |
1269 | /* |
1258 | * Erase part of whole of the screen |
1270 | * Erase part of whole of the screen |
… | |
… | |
1301 | CLEAR_SELECTION (); |
1313 | CLEAR_SELECTION (); |
1302 | |
1314 | |
1303 | if (row >= nrow) /* Out Of Bounds */ |
1315 | if (row >= nrow) /* Out Of Bounds */ |
1304 | return; |
1316 | return; |
1305 | |
1317 | |
1306 | min_it (num, (nrow - row)); |
1318 | min_it (num, nrow - row); |
1307 | |
1319 | |
1308 | if (rstyle & (RS_RVid | RS_Uline)) |
1320 | if (rstyle & (RS_RVid | RS_Uline)) |
1309 | ren = (rend_t) ~RS_None; |
1321 | ren = (rend_t) ~RS_None; |
1310 | else if (GET_BASEBG (rstyle) == Color_bg) |
1322 | else if (GET_BASEBG (rstyle) == Color_bg) |
1311 | { |
1323 | { |
… | |
… | |
1313 | CLEAR_ROWS (row, num); |
1325 | CLEAR_ROWS (row, num); |
1314 | } |
1326 | } |
1315 | else |
1327 | else |
1316 | { |
1328 | { |
1317 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1329 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1318 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1330 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1319 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1331 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1320 | ERASE_ROWS (row, num); |
1332 | ERASE_ROWS (row, num); |
1321 | gcvalue.foreground = pix_colors[Color_fg]; |
1333 | gcvalue.foreground = pix_colors[Color_fg]; |
1322 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1334 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1323 | } |
1335 | } |
1324 | |
1336 | |
1325 | for (; num--; row++) |
1337 | for (; num--; row++) |
1326 | { |
1338 | { |
1327 | scr_blank_screen_mem (ROW (row), rstyle); |
1339 | scr_blank_screen_mem (ROW(row), rstyle); |
1328 | ROW (row).l = 0; |
|
|
1329 | scr_blank_line (drawn[row], 0, ncol, ren); |
1340 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1330 | } |
1341 | } |
1331 | } |
1342 | } |
1332 | |
1343 | |
1333 | #if ENABLE_FRILLS |
1344 | #if ENABLE_FRILLS |
1334 | void |
1345 | void |
1335 | rxvt_term::scr_erase_savelines () |
1346 | rxvt_term::scr_erase_savelines () |
1336 | { |
1347 | { |
1337 | want_refresh = 1; |
1348 | want_refresh = 1; |
1338 | ZERO_SCROLLBACK (); |
1349 | ZERO_SCROLLBACK (); |
1339 | |
1350 | |
1340 | nsaved = 0; |
1351 | top_row = 0; |
1341 | } |
1352 | } |
1342 | #endif |
1353 | #endif |
1343 | |
1354 | |
1344 | /* ------------------------------------------------------------------------- */ |
1355 | /* ------------------------------------------------------------------------- */ |
1345 | /* |
1356 | /* |
… | |
… | |
1366 | rend_t *r1 = line.r; |
1377 | rend_t *r1 = line.r; |
1367 | |
1378 | |
1368 | for (int j = ncol; j--; ) |
1379 | for (int j = ncol; j--; ) |
1369 | *r1++ = fs; |
1380 | *r1++ = fs; |
1370 | |
1381 | |
1371 | line.l = ncol; /* make the `E's selectable */ |
1382 | line.is_longer (0); |
|
|
1383 | line.touch (ncol); |
1372 | } |
1384 | } |
1373 | } |
1385 | } |
1374 | |
1386 | |
1375 | /* ------------------------------------------------------------------------- */ |
1387 | /* ------------------------------------------------------------------------- */ |
1376 | /* |
1388 | /* |
… | |
… | |
1419 | return; |
1431 | return; |
1420 | |
1432 | |
1421 | scr_do_wrap (); |
1433 | scr_do_wrap (); |
1422 | |
1434 | |
1423 | selection_check (1); |
1435 | selection_check (1); |
1424 | min_it (count, (ncol - screen.cur.col)); |
1436 | min_it (count, ncol - screen.cur.col); |
1425 | |
1437 | |
1426 | row = screen.cur.row; |
1438 | row = screen.cur.row; |
1427 | |
1439 | |
1428 | line_t *line = &ROW(row); |
1440 | line_t *line = &ROW(row); |
|
|
1441 | |
|
|
1442 | line->touch (); |
|
|
1443 | line->is_longer (0); |
1429 | |
1444 | |
1430 | switch (insdel) |
1445 | switch (insdel) |
1431 | { |
1446 | { |
1432 | case INSERT: |
1447 | case INSERT: |
1433 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1448 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1434 | { |
1449 | { |
1435 | line->t[col] = line->t[col - count]; |
1450 | line->t[col] = line->t[col - count]; |
1436 | line->r[col] = line->r[col - count]; |
1451 | line->r[col] = line->r[col - count]; |
1437 | } |
1452 | } |
1438 | |
1453 | |
1439 | if (!line->is_longer ()) |
1454 | line->l = min (line->l + count, ncol); |
1440 | { |
|
|
1441 | line->l += count; |
|
|
1442 | min_it (line->l, ncol); |
|
|
1443 | } |
|
|
1444 | |
1455 | |
1445 | if (selection.op && current_screen == selection.screen |
1456 | if (selection.op && current_screen == selection.screen |
1446 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1457 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1447 | { |
1458 | { |
1448 | if (selection.end.row != screen.cur.row |
1459 | if (selection.end.row != screen.cur.row |
… | |
… | |
1461 | |
1472 | |
1462 | case ERASE: |
1473 | case ERASE: |
1463 | screen.cur.col += count; /* don't worry if > ncol */ |
1474 | screen.cur.col += count; /* don't worry if > ncol */ |
1464 | selection_check (1); |
1475 | selection_check (1); |
1465 | screen.cur.col -= count; |
1476 | screen.cur.col -= count; |
|
|
1477 | |
|
|
1478 | line->l = max (line->l - count, 0); |
1466 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1479 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1467 | break; |
1480 | break; |
1468 | |
1481 | |
1469 | case DELETE: |
1482 | case DELETE: |
1470 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1483 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
… | |
… | |
1473 | { |
1486 | { |
1474 | line->t[col] = line->t[col + count]; |
1487 | line->t[col] = line->t[col + count]; |
1475 | line->r[col] = line->r[col + count]; |
1488 | line->r[col] = line->r[col + count]; |
1476 | } |
1489 | } |
1477 | |
1490 | |
|
|
1491 | line->l = max (line->l - count, 0); |
1478 | scr_blank_line (*line, ncol - count, count, tr); |
1492 | scr_blank_line (*line, ncol - count, count, tr); |
1479 | |
|
|
1480 | if (line->is_longer ()) /* break line continuation */ |
|
|
1481 | line->l = ncol; |
|
|
1482 | |
|
|
1483 | max_it (line->l - count, 0); |
|
|
1484 | |
1493 | |
1485 | if (selection.op && current_screen == selection.screen |
1494 | if (selection.op && current_screen == selection.screen |
1486 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1495 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1487 | { |
1496 | { |
1488 | if (selection.end.row != screen.cur.row |
1497 | if (selection.end.row != screen.cur.row |
… | |
… | |
1509 | */ |
1518 | */ |
1510 | void |
1519 | void |
1511 | rxvt_term::scr_scroll_region (int top, int bot) |
1520 | rxvt_term::scr_scroll_region (int top, int bot) |
1512 | { |
1521 | { |
1513 | max_it (top, 0); |
1522 | max_it (top, 0); |
1514 | min_it (bot, (int)nrow - 1); |
1523 | min_it (bot, nrow - 1); |
1515 | |
1524 | |
1516 | if (top > bot) |
1525 | if (top > bot) |
1517 | return; |
1526 | return; |
1518 | |
1527 | |
1519 | screen.tscroll = top; |
1528 | screen.tscroll = top; |
… | |
… | |
1600 | rxvt_term::scr_set_tab (int mode) |
1609 | rxvt_term::scr_set_tab (int mode) |
1601 | { |
1610 | { |
1602 | if (mode < 0) |
1611 | if (mode < 0) |
1603 | memset (tabs, 0, ncol * sizeof (char)); |
1612 | memset (tabs, 0, ncol * sizeof (char)); |
1604 | else if (screen.cur.col < ncol) |
1613 | else if (screen.cur.col < ncol) |
1605 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1614 | tabs [screen.cur.col] = !!mode; |
1606 | } |
1615 | } |
1607 | |
1616 | |
1608 | /* ------------------------------------------------------------------------- */ |
1617 | /* ------------------------------------------------------------------------- */ |
1609 | /* |
1618 | /* |
1610 | * Set reverse/normal video |
1619 | * Set reverse/normal video |
… | |
… | |
1622 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1631 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1623 | #if XPM_BACKGROUND |
1632 | #if XPM_BACKGROUND |
1624 | if (bgPixmap.pixmap == None) |
1633 | if (bgPixmap.pixmap == None) |
1625 | #endif |
1634 | #endif |
1626 | #if TRANSPARENT |
1635 | #if TRANSPARENT |
1627 | if (! (options & Opt_transparent) || am_transparent == 0) |
1636 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
1628 | #endif |
1637 | #endif |
1629 | XSetWindowBackground (display->display, vt, |
1638 | XSetWindowBackground (display->display, vt, |
1630 | pix_colors[Color_bg]); |
1639 | pix_colors[Color_bg]); |
1631 | |
1640 | |
1632 | gcvalue.foreground = pix_colors[Color_fg]; |
1641 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1657 | * Set font style |
1666 | * Set font style |
1658 | */ |
1667 | */ |
1659 | void |
1668 | void |
1660 | rxvt_term::set_font_style () |
1669 | rxvt_term::set_font_style () |
1661 | { |
1670 | { |
|
|
1671 | #if 0 |
1662 | switch (charsets[screen.charset]) |
1672 | switch (charsets [screen.charset]) |
1663 | { |
1673 | { |
1664 | case '0': /* DEC Special Character & Line Drawing Set */ |
1674 | case '0': /* DEC Special Character & Line Drawing Set */ |
1665 | break; |
1675 | break; |
1666 | case 'A': /* United Kingdom (UK) */ |
1676 | case 'A': /* United Kingdom (UK) */ |
1667 | break; |
1677 | break; |
… | |
… | |
1674 | case 'C': /* Finnish character set */ |
1684 | case 'C': /* Finnish character set */ |
1675 | break; |
1685 | break; |
1676 | case 'K': /* German character set */ |
1686 | case 'K': /* German character set */ |
1677 | break; |
1687 | break; |
1678 | } |
1688 | } |
|
|
1689 | #endif |
1679 | } |
1690 | } |
1680 | |
1691 | |
1681 | /* ------------------------------------------------------------------------- */ |
1692 | /* ------------------------------------------------------------------------- */ |
1682 | /* |
1693 | /* |
1683 | * Choose a font |
1694 | * Choose a font |
… | |
… | |
1723 | bool found = false; |
1734 | bool found = false; |
1724 | |
1735 | |
1725 | for (int i = 0; i < nrow; i++) |
1736 | for (int i = 0; i < nrow; i++) |
1726 | { |
1737 | { |
1727 | int col = 0; |
1738 | int col = 0; |
1728 | rend_t *drp = drawn[i].r; |
1739 | rend_t *drp = drawn_buf[i].r; |
1729 | |
1740 | |
1730 | for (; col < ncol; col++, drp++) |
1741 | for (; col < ncol; col++, drp++) |
1731 | if ((*drp & mask) == value) |
1742 | if ((*drp & mask) == value) |
1732 | { |
1743 | { |
1733 | found = true; |
1744 | found = true; |
… | |
… | |
1751 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1762 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1752 | { |
1763 | { |
1753 | int i; |
1764 | int i; |
1754 | row_col_t rc[RC_COUNT]; |
1765 | row_col_t rc[RC_COUNT]; |
1755 | |
1766 | |
1756 | if (!drawn) /* sanity check */ |
1767 | if (!drawn_buf) /* sanity check */ |
1757 | return; |
1768 | return; |
1758 | |
1769 | |
1759 | #ifndef NO_SLOW_LINK_SUPPORT |
1770 | #ifndef NO_SLOW_LINK_SUPPORT |
1760 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1771 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1761 | { |
1772 | { |
1762 | y = 0; |
1773 | y = 0; |
1763 | eheight = height; |
1774 | eheight = height; |
1764 | } |
1775 | } |
1765 | #endif |
|
|
1766 | |
|
|
1767 | #ifdef DEBUG_STRICT |
|
|
1768 | #if 0 |
|
|
1769 | // that's not debugging //TODO //FIXME |
|
|
1770 | clamp_it (x, 0, width); |
|
|
1771 | clamp_it (y, 0, height); |
|
|
1772 | #endif |
|
|
1773 | #endif |
1776 | #endif |
1774 | |
1777 | |
1775 | /* round down */ |
1778 | /* round down */ |
1776 | rc[PART_BEG].col = Pixel2Col (x); |
1779 | rc[PART_BEG].col = Pixel2Col (x); |
1777 | rc[PART_BEG].row = Pixel2Row (y); |
1780 | rc[PART_BEG].row = Pixel2Row (y); |
… | |
… | |
1785 | min_it (rc[i].col, ncol - 1); |
1788 | min_it (rc[i].col, ncol - 1); |
1786 | min_it (rc[i].row, nrow - 1); |
1789 | min_it (rc[i].row, nrow - 1); |
1787 | } |
1790 | } |
1788 | |
1791 | |
1789 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1792 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1790 | fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1793 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
|
|
1794 | |
|
|
1795 | num_scr_allow = 0; |
1791 | |
1796 | |
1792 | if (refresh) |
1797 | if (refresh) |
1793 | scr_refresh (SLOW_REFRESH); |
1798 | scr_refresh (); |
1794 | } |
1799 | } |
1795 | |
1800 | |
1796 | /* ------------------------------------------------------------------------- */ |
1801 | /* ------------------------------------------------------------------------- */ |
1797 | /* |
1802 | /* |
1798 | * Refresh the entire screen |
1803 | * Refresh the entire screen |
… | |
… | |
1806 | /* ------------------------------------------------------------------------- */ |
1811 | /* ------------------------------------------------------------------------- */ |
1807 | /* |
1812 | /* |
1808 | * Move the display so that the line represented by scrollbar value Y is at |
1813 | * Move the display so that the line represented by scrollbar value Y is at |
1809 | * the top of the screen |
1814 | * the top of the screen |
1810 | */ |
1815 | */ |
1811 | int |
1816 | void |
1812 | rxvt_term::scr_move_to (int y, int len) |
1817 | rxvt_term::scr_move_to (int y, int len) |
1813 | { |
1818 | { |
1814 | long p = 0; |
1819 | scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); |
1815 | unsigned int oldviewstart; |
|
|
1816 | |
|
|
1817 | oldviewstart = view_start; |
|
|
1818 | |
|
|
1819 | if (y < len) |
|
|
1820 | { |
|
|
1821 | p = (nrow + nsaved) * (len - y) / len; |
|
|
1822 | p -= (long) (nrow - 1); |
|
|
1823 | p = max (p, 0); |
|
|
1824 | } |
|
|
1825 | |
|
|
1826 | view_start = (unsigned int)min (p, nsaved); |
|
|
1827 | |
|
|
1828 | return scr_changeview (oldviewstart); |
|
|
1829 | } |
1820 | } |
1830 | |
1821 | |
1831 | /* ------------------------------------------------------------------------- */ |
1822 | /* ------------------------------------------------------------------------- */ |
1832 | /* |
1823 | /* |
1833 | * Page the screen up/down nlines |
1824 | * Page the screen up/down nlines |
1834 | * direction should be UP or DN |
1825 | * direction should be UP or DN |
1835 | */ |
1826 | */ |
1836 | int |
1827 | bool |
1837 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1828 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1838 | { |
1829 | { |
1839 | int n; |
1830 | int new_view_start = |
1840 | unsigned int oldviewstart; |
|
|
1841 | |
|
|
1842 | oldviewstart = view_start; |
|
|
1843 | |
|
|
1844 | if (direction == UP) |
|
|
1845 | { |
|
|
1846 | n = view_start + nlines; |
|
|
1847 | view_start = min (n, nsaved); |
|
|
1848 | } |
|
|
1849 | else |
|
|
1850 | { |
|
|
1851 | n = view_start - nlines; |
1831 | direction == UP ? view_start - nlines |
1852 | view_start = max (n, 0); |
1832 | : view_start + nlines; |
1853 | } |
|
|
1854 | |
1833 | |
1855 | return scr_changeview (oldviewstart); |
1834 | return scr_changeview (new_view_start); |
1856 | } |
1835 | } |
1857 | |
1836 | |
1858 | int |
1837 | bool |
1859 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1838 | rxvt_term::scr_changeview (int new_view_start) |
1860 | { |
1839 | { |
|
|
1840 | clamp_it (new_view_start, top_row, 0); |
|
|
1841 | |
1861 | if (view_start != oldviewstart) |
1842 | if (new_view_start == view_start) |
1862 | { |
1843 | return false; |
|
|
1844 | |
|
|
1845 | num_scr += new_view_start - view_start; |
|
|
1846 | view_start = new_view_start; |
1863 | want_refresh = 1; |
1847 | want_refresh = 1; |
1864 | num_scr -= (view_start - oldviewstart); |
|
|
1865 | } |
|
|
1866 | |
1848 | |
1867 | return (int) (view_start - oldviewstart); |
1849 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
|
|
1850 | |
|
|
1851 | return true; |
1868 | } |
1852 | } |
1869 | |
1853 | |
1870 | /* ------------------------------------------------------------------------- */ |
1854 | /* ------------------------------------------------------------------------- */ |
1871 | void |
1855 | void |
1872 | rxvt_term::scr_bell () |
1856 | rxvt_term::scr_bell () |
1873 | { |
1857 | { |
1874 | #ifndef NO_BELL |
1858 | #ifndef NO_BELL |
1875 | |
1859 | |
1876 | # ifndef NO_MAPALERT |
1860 | # ifndef NO_MAPALERT |
1877 | # ifdef MAPALERT_OPTION |
1861 | # ifdef MAPALERT_OPTION |
1878 | if (options & Opt_mapAlert) |
1862 | if (OPTION (Opt_mapAlert)) |
1879 | # endif |
1863 | # endif |
1880 | XMapWindow (display->display, parent[0]); |
1864 | XMapWindow (display->display, parent[0]); |
1881 | # endif |
1865 | # endif |
1882 | |
1866 | |
1883 | if (options & Opt_visualBell) |
1867 | if (OPTION (Opt_visualBell)) |
1884 | { |
1868 | { |
1885 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1869 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
|
|
1870 | display->flush (); |
1886 | rxvt_usleep (VISUAL_BELL_DURATION); |
1871 | rxvt_usleep (VISUAL_BELL_DURATION); |
1887 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1872 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1888 | } |
1873 | } |
1889 | else |
1874 | else |
1890 | XBell (display->display, 0); |
1875 | XBell (display->display, 0); |
… | |
… | |
1904 | if ((fd = popen_printer ()) == NULL) |
1889 | if ((fd = popen_printer ()) == NULL) |
1905 | return; |
1890 | return; |
1906 | |
1891 | |
1907 | if (fullhist) |
1892 | if (fullhist) |
1908 | { |
1893 | { |
1909 | nrows = nrow + nsaved; |
1894 | nrows = nrow - top_row; |
1910 | row_start = -nsaved; |
1895 | row_start = top_row; |
1911 | } |
1896 | } |
1912 | else |
1897 | else |
1913 | { |
1898 | { |
1914 | nrows = nrow; |
1899 | nrows = nrow; |
1915 | row_start = -view_start; |
1900 | row_start = view_start; |
1916 | } |
1901 | } |
1917 | |
1902 | |
1918 | wctomb (0, 0); |
1903 | wctomb (0, 0); |
1919 | |
1904 | |
1920 | for (int r1 = 0; r1 < nrows; r1++) |
1905 | for (int r1 = 0; r1 < nrows; r1++) |
… | |
… | |
1952 | * Refresh the screen |
1937 | * Refresh the screen |
1953 | * drawn_text/drawn_rend contain the screen information before the update. |
1938 | * drawn_text/drawn_rend contain the screen information before the update. |
1954 | * screen.text/screen.rend contain what the screen will change to. |
1939 | * screen.text/screen.rend contain what the screen will change to. |
1955 | */ |
1940 | */ |
1956 | void |
1941 | void |
1957 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1942 | rxvt_term::scr_refresh () |
1958 | { |
1943 | { |
1959 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1944 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1960 | showcursor; /* show the cursor */ |
1945 | showcursor; /* show the cursor */ |
1961 | int16_t col, row, /* column/row we're processing */ |
1946 | int16_t col, row, /* column/row we're processing */ |
1962 | ocrow; /* old cursor row */ |
1947 | ocrow; /* old cursor row */ |
… | |
… | |
1979 | |
1964 | |
1980 | #if XPM_BACKGROUND |
1965 | #if XPM_BACKGROUND |
1981 | must_clear |= bgPixmap.pixmap != None; |
1966 | must_clear |= bgPixmap.pixmap != None; |
1982 | #endif |
1967 | #endif |
1983 | #if TRANSPARENT |
1968 | #if TRANSPARENT |
1984 | must_clear |= (options & Opt_transparent) && am_transparent; |
1969 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
1985 | #endif |
1970 | #endif |
1986 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1971 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1987 | |
1972 | |
1988 | /* |
1973 | /* |
1989 | * B: reverse any characters which are selected |
1974 | * B: reverse any characters which are selected |
… | |
… | |
2013 | |
1998 | |
2014 | crp = &ROW(screen.cur.row).r[col]; |
1999 | crp = &ROW(screen.cur.row).r[col]; |
2015 | |
2000 | |
2016 | if (showcursor && focus) |
2001 | if (showcursor && focus) |
2017 | { |
2002 | { |
2018 | if (options & Opt_cursorUnderline) |
2003 | if (OPTION (Opt_cursorUnderline)) |
2019 | *crp ^= RS_Uline; |
2004 | *crp ^= RS_Uline; |
2020 | else |
2005 | else |
2021 | { |
2006 | { |
2022 | *crp ^= RS_RVid; |
2007 | *crp ^= RS_RVid; |
2023 | |
2008 | |
… | |
… | |
2025 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2010 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2026 | if (ISSET_PIXCOLOR (Color_cursor)) |
2011 | if (ISSET_PIXCOLOR (Color_cursor)) |
2027 | ccol1 = Color_cursor; |
2012 | ccol1 = Color_cursor; |
2028 | else |
2013 | else |
2029 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2014 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2030 | ccol1 = GET_FGCOLOR (rstyle); |
2015 | ccol1 = fgcolor_of (rstyle); |
2031 | #else |
2016 | #else |
2032 | ccol1 = Color_fg; |
2017 | ccol1 = Color_fg; |
2033 | #endif |
2018 | #endif |
2034 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2019 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2035 | ccol2 = Color_cursor2; |
2020 | ccol2 = Color_cursor2; |
2036 | else |
2021 | else |
2037 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2022 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2038 | ccol2 = GET_BGCOLOR (rstyle); |
2023 | ccol2 = bgcolor_of (rstyle); |
2039 | #else |
2024 | #else |
2040 | ccol2 = Color_bg; |
2025 | ccol2 = Color_bg; |
2041 | #endif |
2026 | #endif |
2042 | *crp = SET_FGCOLOR (*crp, ccol1); |
2027 | *crp = SET_FGCOLOR (*crp, ccol1); |
2043 | *crp = SET_BGCOLOR (*crp, ccol2); |
2028 | *crp = SET_BGCOLOR (*crp, ccol2); |
… | |
… | |
2048 | |
2033 | |
2049 | /* make sure no outline cursor is left around */ |
2034 | /* make sure no outline cursor is left around */ |
2050 | setoldcursor = 0; |
2035 | setoldcursor = 0; |
2051 | if (ocrow != -1) |
2036 | if (ocrow != -1) |
2052 | { |
2037 | { |
2053 | if (screen.cur.row + view_start != ocrow |
2038 | if (screen.cur.row - view_start != ocrow |
2054 | || screen.cur.col != oldcursor.col) |
2039 | || screen.cur.col != oldcursor.col) |
2055 | { |
2040 | { |
2056 | if (ocrow < nrow |
2041 | if (ocrow < nrow |
2057 | && oldcursor.col < ncol) |
2042 | && oldcursor.col < ncol) |
2058 | drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2043 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2059 | |
2044 | |
2060 | if (focus || !showcursor) |
2045 | if (focus || !showcursor) |
2061 | oldcursor.row = -1; |
2046 | oldcursor.row = -1; |
2062 | else |
2047 | else |
2063 | setoldcursor = 1; |
2048 | setoldcursor = 1; |
… | |
… | |
2066 | else if (!focus) |
2051 | else if (!focus) |
2067 | setoldcursor = 1; |
2052 | setoldcursor = 1; |
2068 | |
2053 | |
2069 | if (setoldcursor) |
2054 | if (setoldcursor) |
2070 | { |
2055 | { |
2071 | if (screen.cur.row + view_start >= nrow) |
2056 | if (screen.cur.row - view_start >= nrow) |
2072 | oldcursor.row = -1; |
2057 | oldcursor.row = -1; |
2073 | else |
2058 | else |
2074 | { |
2059 | { |
2075 | oldcursor.row = screen.cur.row + view_start; |
2060 | oldcursor.row = screen.cur.row - view_start; |
2076 | oldcursor.col = screen.cur.col; |
2061 | oldcursor.col = screen.cur.col; |
2077 | } |
2062 | } |
2078 | } |
2063 | } |
2079 | } |
2064 | } |
2080 | |
2065 | |
|
|
2066 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2081 | #if ENABLE_OVERLAY |
2067 | #if ENABLE_OVERLAY |
2082 | scr_swap_overlay (); |
2068 | scr_swap_overlay (); |
2083 | #endif |
2069 | #endif |
2084 | |
2070 | |
2085 | #ifndef NO_SLOW_LINK_SUPPORT |
2071 | #ifndef NO_SLOW_LINK_SUPPORT |
2086 | /* |
2072 | /* |
2087 | * D: CopyArea pass - very useful for slower links |
2073 | * D: CopyArea pass - very useful for slower links |
2088 | * This has been deliberately kept simple. |
2074 | * This has been deliberately kept simple. |
2089 | */ |
2075 | */ |
2090 | i = num_scr; |
|
|
2091 | if (!display->is_local |
2076 | if (!display->is_local |
2092 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2077 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2093 | && abs (num_scr) < nrow && !must_clear) |
2078 | && abs (num_scr) < nrow && !must_clear) |
2094 | { |
2079 | { |
2095 | int16_t nits; |
2080 | int16_t nits; |
2096 | int j; |
2081 | int j; |
2097 | int len, wlen; |
2082 | int len, wlen; |
|
|
2083 | dLocal (int, num_scr); |
2098 | |
2084 | |
2099 | j = nrow; |
2085 | j = nrow; |
2100 | wlen = len = -1; |
2086 | wlen = len = -1; |
2101 | row = i > 0 ? 0 : j - 1; |
2087 | row = i > 0 ? 0 : j - 1; |
2102 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2088 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2103 | { |
2089 | { |
2104 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2090 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2105 | { |
2091 | { |
2106 | line_t s = ROW(row - view_start); |
2092 | line_t s = ROW(view_start + row); |
2107 | line_t d = drawn[row]; |
2093 | line_t d = drawn_buf[row]; |
2108 | line_t d2 = drawn[row + i]; |
2094 | line_t d2 = drawn_buf[row + i]; |
2109 | |
2095 | |
2110 | for (nits = 0, col = ncol; col--; ) |
2096 | for (nits = 0, col = ncol; col--; ) |
2111 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2097 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2112 | nits--; |
2098 | nits--; |
2113 | else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) |
2099 | else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) |
… | |
… | |
2135 | if (wlen < len) |
2121 | if (wlen < len) |
2136 | ::swap (wlen, len); |
2122 | ::swap (wlen, len); |
2137 | |
2123 | |
2138 | XCopyArea (display->display, vt, vt, |
2124 | XCopyArea (display->display, vt, vt, |
2139 | gc, 0, Row2Pixel (len + i), |
2125 | gc, 0, Row2Pixel (len + i), |
2140 | (unsigned int)TermWin_TotalWidth (), |
2126 | (unsigned int)this->width, |
2141 | (unsigned int)Height2Pixel (wlen - len + 1), |
2127 | (unsigned int)Height2Pixel (wlen - len + 1), |
2142 | 0, Row2Pixel (len)); |
2128 | 0, Row2Pixel (len)); |
2143 | len = -1; |
2129 | len = -1; |
2144 | } |
2130 | } |
2145 | } |
2131 | } |
… | |
… | |
2149 | /* |
2135 | /* |
2150 | * E: main pass across every character |
2136 | * E: main pass across every character |
2151 | */ |
2137 | */ |
2152 | for (row = 0; row < nrow; row++) |
2138 | for (row = 0; row < nrow; row++) |
2153 | { |
2139 | { |
2154 | text_t *stp = ROW(row - view_start).t; |
2140 | text_t *stp = ROW(view_start + row).t; |
2155 | rend_t *srp = ROW(row - view_start).r; |
2141 | rend_t *srp = ROW(view_start + row).r; |
2156 | text_t *dtp = drawn[row].t; |
2142 | text_t *dtp = drawn_buf[row].t; |
2157 | rend_t *drp = drawn[row].r; |
2143 | rend_t *drp = drawn_buf[row].r; |
2158 | |
2144 | |
2159 | /* |
2145 | /* |
2160 | * E2: OK, now the real pass |
2146 | * E2: OK, now the real pass |
2161 | */ |
2147 | */ |
2162 | int ypixel = (int)Row2Pixel (row); |
2148 | int ypixel = (int)Row2Pixel (row); |
… | |
… | |
2224 | count++, i--; |
2210 | count++, i--; |
2225 | |
2211 | |
2226 | /* |
2212 | /* |
2227 | * Determine the attributes for the string |
2213 | * Determine the attributes for the string |
2228 | */ |
2214 | */ |
2229 | int fore = GET_FGCOLOR (rend); // desired foreground |
2215 | int fore = fgcolor_of (rend); // desired foreground |
2230 | int back = GET_BGCOLOR (rend); // desired background |
2216 | int back = bgcolor_of (rend); // desired background |
2231 | |
2217 | |
2232 | // only do special processing if any attributes are set, which is rare |
2218 | // only do special processing if any attributes are set, which is unlikely |
2233 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2219 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2234 | { |
2220 | { |
2235 | #if ENABLE_STYLES |
2221 | #if ENABLE_STYLES |
2236 | // force redraw after "careful" characters to avoid pixel droppings |
2222 | // force redraw after "careful" characters to avoid pixel droppings |
2237 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
2223 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
… | |
… | |
2348 | } /* for (row....) */ |
2334 | } /* for (row....) */ |
2349 | |
2335 | |
2350 | #if ENABLE_OVERLAY |
2336 | #if ENABLE_OVERLAY |
2351 | scr_swap_overlay (); |
2337 | scr_swap_overlay (); |
2352 | #endif |
2338 | #endif |
|
|
2339 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
2353 | |
2340 | |
2354 | /* |
2341 | /* |
2355 | * G: cleanup cursor and display outline cursor if necessary |
2342 | * G: cleanup cursor and display outline cursor if necessary |
2356 | */ |
2343 | */ |
2357 | if (showcursor) |
2344 | if (showcursor) |
2358 | { |
2345 | { |
2359 | if (focus) |
2346 | if (focus) |
2360 | { |
2347 | { |
2361 | if (options & Opt_cursorUnderline) |
2348 | if (OPTION (Opt_cursorUnderline)) |
2362 | *crp ^= RS_Uline; |
2349 | *crp ^= RS_Uline; |
2363 | else |
2350 | else |
2364 | { |
2351 | { |
2365 | *crp ^= RS_RVid; |
2352 | *crp ^= RS_RVid; |
2366 | #ifndef NO_CURSORCOLOR |
2353 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2375 | |
2362 | |
2376 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2363 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2377 | col--; |
2364 | col--; |
2378 | |
2365 | |
2379 | while (col + cursorwidth < ncol |
2366 | while (col + cursorwidth < ncol |
2380 | && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2367 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2381 | cursorwidth++; |
2368 | cursorwidth++; |
2382 | |
2369 | |
2383 | #ifndef NO_CURSORCOLOR |
2370 | #ifndef NO_CURSORCOLOR |
2384 | if (ISSET_PIXCOLOR (Color_cursor)) |
2371 | if (ISSET_PIXCOLOR (Color_cursor)) |
2385 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2372 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
… | |
… | |
2396 | /* |
2383 | /* |
2397 | * H: cleanup selection |
2384 | * H: cleanup selection |
2398 | */ |
2385 | */ |
2399 | scr_reverse_selection (); |
2386 | scr_reverse_selection (); |
2400 | |
2387 | |
2401 | if (refresh_type & SMOOTH_REFRESH) |
|
|
2402 | XFlush (display->display); |
|
|
2403 | |
|
|
2404 | num_scr = 0; |
2388 | num_scr = 0; |
2405 | num_scr_allow = 1; |
2389 | num_scr_allow = 1; |
2406 | } |
2390 | } |
2407 | |
2391 | |
2408 | void |
2392 | void |
2409 | rxvt_term::scr_remap_chars (const line_t &l) |
2393 | rxvt_term::scr_remap_chars (line_t &l) |
2410 | { |
2394 | { |
2411 | if (!l.t) |
2395 | if (!l.t) |
2412 | return; |
2396 | return; |
2413 | |
2397 | |
|
|
2398 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
|
|
2399 | |
2414 | for (int i = ncol; i--; ) |
2400 | for (int i = ncol; i--; ) |
2415 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2401 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2416 | } |
2402 | } |
2417 | |
2403 | |
2418 | void |
2404 | void |
2419 | rxvt_term::scr_remap_chars () |
2405 | rxvt_term::scr_remap_chars () |
2420 | { |
2406 | { |
2421 | for (int i = total_rows; i--; ) |
2407 | for (int i = total_rows; i--; ) |
2422 | scr_remap_chars (save[i]); |
2408 | scr_remap_chars (row_buf [i]); |
2423 | |
2409 | |
2424 | for (int i = nrow; i--; ) |
2410 | for (int i = nrow; i--; ) |
2425 | { |
2411 | { |
2426 | scr_remap_chars (drawn[i]); |
2412 | scr_remap_chars (drawn_buf [i]); |
2427 | scr_remap_chars (swap_save[i]); |
2413 | scr_remap_chars (swap_buf [i]); |
2428 | } |
2414 | } |
2429 | } |
2415 | } |
2430 | |
2416 | |
2431 | void |
2417 | void |
2432 | rxvt_term::scr_recolour () |
2418 | rxvt_term::scr_recolour () |
… | |
… | |
2470 | |
2456 | |
2471 | if (really) |
2457 | if (really) |
2472 | XClearWindow (display->display, vt); |
2458 | XClearWindow (display->display, vt); |
2473 | } |
2459 | } |
2474 | |
2460 | |
|
|
2461 | void |
|
|
2462 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) |
|
|
2463 | { |
|
|
2464 | int view_end = view_start + nrow; |
|
|
2465 | int row, col; |
|
|
2466 | |
|
|
2467 | for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) |
|
|
2468 | { |
|
|
2469 | text_t *stp = ROW(row).t; |
|
|
2470 | rend_t *srp = ROW(row).r; |
|
|
2471 | |
|
|
2472 | for (col = beg_col; col < end_col; col++) |
|
|
2473 | srp[col] ^= rstyle1; |
|
|
2474 | |
|
|
2475 | while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2476 | srp[col] ^= rstyle2; |
|
|
2477 | |
|
|
2478 | if (++col < end_col) |
|
|
2479 | srp[col] ^= rstyle2; |
|
|
2480 | } |
|
|
2481 | } |
|
|
2482 | |
|
|
2483 | void |
|
|
2484 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) |
|
|
2485 | { |
|
|
2486 | int view_end = view_start + nrow; |
|
|
2487 | int row, col; |
|
|
2488 | |
|
|
2489 | if (beg_row >= view_start) |
|
|
2490 | { |
|
|
2491 | col = beg_col; |
|
|
2492 | row = beg_row; |
|
|
2493 | } |
|
|
2494 | else |
|
|
2495 | { |
|
|
2496 | col = 0; |
|
|
2497 | row = view_start; |
|
|
2498 | } |
|
|
2499 | |
|
|
2500 | for (; row < min (end_row, view_end); row++, col = 0) |
|
|
2501 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
|
|
2502 | srp[col] ^= rstyle; |
|
|
2503 | |
|
|
2504 | if (row == end_row) |
|
|
2505 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
|
|
2506 | srp[col] ^= rstyle; |
|
|
2507 | } |
|
|
2508 | |
2475 | /* ------------------------------------------------------------------------- */ |
2509 | /* ------------------------------------------------------------------------- */ |
2476 | void |
2510 | void |
2477 | rxvt_term::scr_reverse_selection () |
2511 | rxvt_term::scr_reverse_selection () |
2478 | { |
2512 | { |
2479 | if (selection.op |
2513 | if (selection.op |
2480 | && current_screen == selection.screen |
2514 | && current_screen == selection.screen |
2481 | && selection.end.row >= -view_start) |
2515 | && selection.end.row >= view_start) |
2482 | { |
2516 | { |
2483 | int view_end = -view_start + nrow; |
|
|
2484 | int row, col; |
|
|
2485 | |
|
|
2486 | #if ENABLE_FRILLS |
2517 | #if ENABLE_FRILLS |
2487 | if (selection.rect) |
2518 | if (selection.rect) |
2488 | { |
2519 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2489 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
2520 | selection.end.row, selection.end.col, |
2490 | for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) |
2521 | RS_RVid, RS_RVid | RS_Uline); |
2491 | srp[col] ^= RS_RVid; |
|
|
2492 | } |
|
|
2493 | else |
2522 | else |
2494 | #endif |
2523 | #endif |
2495 | { |
2524 | scr_xor_span (selection.beg.row, selection.beg.col, |
2496 | if (selection.beg.row >= -view_start) |
2525 | selection.end.row, selection.end.col, |
2497 | { |
2526 | RS_RVid); |
2498 | col = selection.beg.col; |
|
|
2499 | row = selection.beg.row; |
|
|
2500 | } |
|
|
2501 | else |
|
|
2502 | { |
|
|
2503 | col = 0; |
|
|
2504 | row = view_start; |
|
|
2505 | } |
|
|
2506 | |
|
|
2507 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
|
|
2508 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
|
|
2509 | srp[col] ^= RS_RVid; |
|
|
2510 | |
|
|
2511 | if (row == selection.end.row) |
|
|
2512 | for (rend_t *srp = ROW(row).r; col < selection.end.col; col++) |
|
|
2513 | srp[col] ^= RS_RVid; |
|
|
2514 | } |
|
|
2515 | } |
2527 | } |
2516 | } |
2528 | } |
2517 | |
2529 | |
2518 | /* ------------------------------------------------------------------------- */ |
2530 | /* ------------------------------------------------------------------------- */ |
2519 | /* |
2531 | /* |
… | |
… | |
2529 | char r1[] = "\n"; |
2541 | char r1[] = "\n"; |
2530 | |
2542 | |
2531 | for (row = saveLines - nsaved; |
2543 | for (row = saveLines - nsaved; |
2532 | row < saveLines + nrow - 1; row++) |
2544 | row < saveLines + nrow - 1; row++) |
2533 | { |
2545 | { |
2534 | width = save[row].l >= 0 ? save[row].l |
2546 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2535 | : ncol; |
2547 | : ncol; |
2536 | for (towrite = width; towrite; towrite -= wrote) |
2548 | for (towrite = width; towrite; towrite -= wrote) |
2537 | { |
2549 | { |
2538 | wrote = write (fd, & (save[row].t[width - towrite]), |
2550 | wrote = write (fd, & (row_buf[row].t[width - towrite]), |
2539 | towrite); |
2551 | towrite); |
2540 | if (wrote < 0) |
2552 | if (wrote < 0) |
2541 | return; /* XXX: death, no report */ |
2553 | return; /* XXX: death, no report */ |
2542 | } |
2554 | } |
2543 | if (save[row].l >= 0) |
2555 | if (row_buf[row].l >= 0) |
2544 | if (write (fd, r1, 1) <= 0) |
2556 | if (write (fd, r1, 1) <= 0) |
2545 | return; /* XXX: death, no report */ |
2557 | return; /* XXX: death, no report */ |
2546 | } |
2558 | } |
2547 | } |
2559 | } |
2548 | #endif |
2560 | #endif |
… | |
… | |
2557 | |
2569 | |
2558 | if (!selection.op) |
2570 | if (!selection.op) |
2559 | return; |
2571 | return; |
2560 | |
2572 | |
2561 | pos.row = pos.col = 0; |
2573 | pos.row = pos.col = 0; |
2562 | if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) |
2574 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2563 | || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) |
2575 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2564 | || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) |
2576 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2565 | || (check_more == 1 |
2577 | || (check_more == 1 |
2566 | && current_screen == selection.screen |
2578 | && current_screen == selection.screen |
2567 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2579 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2568 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2580 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2569 | || (check_more == 2 |
2581 | || (check_more == 2 |
… | |
… | |
2580 | /* ------------------------------------------------------------------------- */ |
2592 | /* ------------------------------------------------------------------------- */ |
2581 | /* |
2593 | /* |
2582 | * Paste a selection direct to the command fd |
2594 | * Paste a selection direct to the command fd |
2583 | */ |
2595 | */ |
2584 | void |
2596 | void |
2585 | rxvt_term::paste (unsigned char *data, unsigned int len) |
2597 | rxvt_term::paste (char *data, unsigned int len) |
2586 | { |
2598 | { |
2587 | /* convert normal newline chars into common keyboard Return key sequence */ |
2599 | /* convert normal newline chars into common keyboard Return key sequence */ |
2588 | for (unsigned int i = 0; i < len; i++) |
2600 | for (unsigned int i = 0; i < len; i++) |
2589 | if (data[i] == C0_LF) |
2601 | if (data[i] == C0_LF) |
2590 | data[i] = C0_CR; |
2602 | data[i] = C0_CR; |
… | |
… | |
2734 | { |
2746 | { |
2735 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2747 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2736 | char *s = rxvt_wcstombs (w); |
2748 | char *s = rxvt_wcstombs (w); |
2737 | free (w); |
2749 | free (w); |
2738 | // TODO: strlen == only the first element will be converted. well... |
2750 | // TODO: strlen == only the first element will be converted. well... |
2739 | paste ((unsigned char *)s, strlen (s)); |
2751 | paste (s, strlen (s)); |
2740 | free (s); |
2752 | free (s); |
2741 | } |
2753 | } |
2742 | else |
2754 | else |
2743 | #endif |
2755 | #endif |
2744 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2756 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2745 | && cl) |
2757 | && cl) |
2746 | { |
2758 | { |
2747 | for (int i = 0; i < cr; i++) |
2759 | for (int i = 0; i < cr; i++) |
2748 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2760 | paste (cl[i], strlen (cl[i])); |
2749 | |
2761 | |
2750 | XFreeStringList (cl); |
2762 | XFreeStringList (cl); |
2751 | } |
2763 | } |
2752 | else |
2764 | else |
2753 | paste (ct.value, ct.nitems); // paste raw |
2765 | paste ((char *)ct.value, ct.nitems); // paste raw |
2754 | |
2766 | |
2755 | bailout: |
2767 | bailout: |
2756 | XFree (ct.value); |
2768 | XFree (ct.value); |
2757 | |
2769 | |
2758 | if (selection_wait == Sel_normal) |
2770 | if (selection_wait == Sel_normal) |
… | |
… | |
2796 | return; /* outside window */ |
2808 | return; /* outside window */ |
2797 | |
2809 | |
2798 | if (selection.text) |
2810 | if (selection.text) |
2799 | { /* internal selection */ |
2811 | { /* internal selection */ |
2800 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2812 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2801 | paste ((unsigned char *)str, strlen (str)); |
2813 | paste (str, strlen (str)); |
2802 | free (str); |
2814 | free (str); |
2803 | return; |
2815 | return; |
2804 | } |
2816 | } |
2805 | else |
2817 | else |
2806 | { |
2818 | { |
… | |
… | |
2898 | selection.op = SELECTION_DONE; |
2910 | selection.op = SELECTION_DONE; |
2899 | |
2911 | |
2900 | if (selection.clicks == 4) |
2912 | if (selection.clicks == 4) |
2901 | return; /* nothing selected, go away */ |
2913 | return; /* nothing selected, go away */ |
2902 | |
2914 | |
|
|
2915 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
|
|
2916 | return; |
|
|
2917 | |
2903 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2918 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2904 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2919 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2905 | |
2920 | |
2906 | int ofs = 0; |
2921 | int ofs = 0; |
2907 | int extra = 0; |
2922 | int extra = 0; |
… | |
… | |
2919 | col = selection.beg.col; |
2934 | col = selection.beg.col; |
2920 | end_col = ncol + 1; |
2935 | end_col = ncol + 1; |
2921 | } |
2936 | } |
2922 | else |
2937 | else |
2923 | #endif |
2938 | #endif |
2924 | end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN |
2939 | end_col = ROW(row).l; |
2925 | |
2940 | |
2926 | col = max (col, 0); |
2941 | col = max (col, 0); |
2927 | |
2942 | |
2928 | if (row == selection.end.row || selection.rect) |
2943 | if (row == selection.end.row |
|
|
2944 | #if ENABLE_FRILLS |
|
|
2945 | || selection.rect |
|
|
2946 | #endif |
|
|
2947 | ) |
2929 | end_col = min (end_col, selection.end.col); |
2948 | min_it (end_col, selection.end.col); |
2930 | |
2949 | |
2931 | t = ROW(row).t + col; |
2950 | t = ROW(row).t + col; |
|
|
2951 | |
2932 | for (; col < end_col; col++) |
2952 | for (; col < end_col; col++) |
2933 | { |
2953 | { |
2934 | if (*t == NOCHAR) |
2954 | if (*t == NOCHAR) |
2935 | t++; |
2955 | t++; |
2936 | #if ENABLE_COMBINING |
2956 | #if ENABLE_COMBINING |
… | |
… | |
2952 | #endif |
2972 | #endif |
2953 | else |
2973 | else |
2954 | new_selection_text[ofs++] = *t++; |
2974 | new_selection_text[ofs++] = *t++; |
2955 | } |
2975 | } |
2956 | |
2976 | |
|
|
2977 | #if ENABLE_FRILLS |
|
|
2978 | if (selection.rect) |
|
|
2979 | { |
|
|
2980 | while (ofs |
|
|
2981 | && new_selection_text[ofs - 1] != C0_LF |
|
|
2982 | && unicode::is_space (new_selection_text[ofs - 1])) |
|
|
2983 | --ofs; |
|
|
2984 | |
|
|
2985 | new_selection_text[ofs++] = C0_LF; |
|
|
2986 | } |
|
|
2987 | else |
|
|
2988 | #endif |
2957 | if (!ROW(row).is_longer () && row != selection.end.row) |
2989 | if (!ROW(row).is_longer () && row != selection.end.row) |
2958 | new_selection_text[ofs++] = C0_LF; |
2990 | new_selection_text[ofs++] = C0_LF; |
2959 | } |
2991 | } |
2960 | |
2992 | |
2961 | if (end_col != selection.end.col) |
2993 | if (end_col != selection.end.col) |
2962 | new_selection_text[ofs++] = C0_LF; |
2994 | new_selection_text[ofs++] = C0_LF; |
2963 | |
2995 | |
… | |
… | |
2973 | |
3005 | |
2974 | // we usually allocate much more than necessary, so realloc it smaller again |
3006 | // we usually allocate much more than necessary, so realloc it smaller again |
2975 | selection.len = ofs; |
3007 | selection.len = ofs; |
2976 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
3008 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2977 | |
3009 | |
|
|
3010 | if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) |
|
|
3011 | return; |
|
|
3012 | |
|
|
3013 | selection_grab (tm); |
|
|
3014 | } |
|
|
3015 | |
|
|
3016 | bool |
|
|
3017 | rxvt_term::selection_grab (Time tm) |
|
|
3018 | { |
|
|
3019 | selection_time = tm; |
|
|
3020 | |
2978 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3021 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
2979 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3022 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
|
|
3023 | { |
2980 | display->set_selection_owner (this); |
3024 | display->set_selection_owner (this); |
|
|
3025 | return true; |
|
|
3026 | } |
2981 | else |
3027 | else |
2982 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
3028 | { |
|
|
3029 | selection_clear (); |
|
|
3030 | return false; |
|
|
3031 | } |
2983 | |
3032 | |
2984 | #if 0 |
3033 | #if 0 |
2985 | XTextProperty ct; |
3034 | XTextProperty ct; |
2986 | |
3035 | |
2987 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3036 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2988 | { |
3037 | { |
2989 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3038 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
2990 | XFree (ct.value); |
3039 | XFree (ct.value); |
2991 | } |
3040 | } |
2992 | #endif |
3041 | #endif |
2993 | |
|
|
2994 | selection_time = tm; |
|
|
2995 | } |
3042 | } |
2996 | |
3043 | |
2997 | /* ------------------------------------------------------------------------- */ |
3044 | /* ------------------------------------------------------------------------- */ |
2998 | /* |
3045 | /* |
2999 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3046 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
… | |
… | |
3003 | rxvt_term::selection_click (int clicks, int x, int y) |
3050 | rxvt_term::selection_click (int clicks, int x, int y) |
3004 | { |
3051 | { |
3005 | clicks = ((clicks - 1) % 3) + 1; |
3052 | clicks = ((clicks - 1) % 3) + 1; |
3006 | selection.clicks = clicks; /* save clicks so extend will work */ |
3053 | selection.clicks = clicks; /* save clicks so extend will work */ |
3007 | |
3054 | |
|
|
3055 | if (clicks == 2 && !selection.rect |
|
|
3056 | && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) |
|
|
3057 | { |
|
|
3058 | MEvent.clicks = 1; // what a mess |
|
|
3059 | selection.screen = current_screen; |
|
|
3060 | selection.op = SELECTION_CONT; |
|
|
3061 | return; |
|
|
3062 | } |
|
|
3063 | |
3008 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3064 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3009 | |
3065 | |
3010 | if (clicks == 2 || clicks == 3) |
3066 | if (clicks == 2 || clicks == 3) |
3011 | selection_extend_colrow (selection.mark.col, |
3067 | selection_extend_colrow (selection.mark.col, |
3012 | selection.mark.row + view_start, |
3068 | selection.mark.row - view_start, |
3013 | 0, /* button 3 */ |
3069 | 0, /* button 3 */ |
3014 | 1, /* button press */ |
3070 | 1, /* button press */ |
3015 | 0); /* click change */ |
3071 | 0); /* click change */ |
3016 | } |
3072 | } |
3017 | |
3073 | |
… | |
… | |
3022 | void |
3078 | void |
3023 | rxvt_term::selection_start_colrow (int col, int row) |
3079 | rxvt_term::selection_start_colrow (int col, int row) |
3024 | { |
3080 | { |
3025 | want_refresh = 1; |
3081 | want_refresh = 1; |
3026 | |
3082 | |
3027 | selection.mark.row = row - view_start; |
3083 | selection.mark.row = row + view_start; |
3028 | selection.mark.col = col; |
3084 | selection.mark.col = col; |
3029 | |
3085 | |
3030 | selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); |
3086 | selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1); |
3031 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3087 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3032 | |
3088 | |
3033 | while (selection.mark.col > 0 |
3089 | while (selection.mark.col > 0 |
3034 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3090 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3035 | --selection.mark.col; |
3091 | --selection.mark.col; |
… | |
… | |
3063 | text_t *stp; |
3119 | text_t *stp; |
3064 | rend_t *srp; |
3120 | rend_t *srp; |
3065 | |
3121 | |
3066 | if (dirn == UP) |
3122 | if (dirn == UP) |
3067 | { |
3123 | { |
3068 | bound.row = - nsaved - 1; |
3124 | bound.row = top_row - 1; |
3069 | bound.col = 0; |
3125 | bound.col = 0; |
3070 | dirnadd = -1; |
3126 | dirnadd = -1; |
3071 | } |
3127 | } |
3072 | else |
3128 | else |
3073 | { |
3129 | { |
… | |
… | |
3121 | } |
3177 | } |
3122 | } |
3178 | } |
3123 | break; |
3179 | break; |
3124 | } |
3180 | } |
3125 | |
3181 | |
3126 | Old_Word_Selection_You_Die: |
|
|
3127 | if (dirn == DN) |
3182 | if (dirn == DN) |
3128 | col++; /* put us on one past the end */ |
3183 | col++; /* put us on one past the end */ |
3129 | |
3184 | |
3130 | /* Poke the values back in */ |
3185 | /* Poke the values back in */ |
3131 | ret->row = row; |
3186 | ret->row = row; |
… | |
… | |
3152 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3207 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3153 | * be _past_ a character for it to be selected. |
3208 | * be _past_ a character for it to be selected. |
3154 | */ |
3209 | */ |
3155 | if (((selection.clicks % 3) == 1) && !flag |
3210 | if (((selection.clicks % 3) == 1) && !flag |
3156 | && (col == selection.mark.col |
3211 | && (col == selection.mark.col |
3157 | && (row == selection.mark.row + view_start))) |
3212 | && (row == selection.mark.row - view_start))) |
3158 | { |
3213 | { |
3159 | /* select nothing */ |
3214 | /* select nothing */ |
3160 | selection.beg.row = selection.end.row = 0; |
3215 | selection.beg.row = selection.end.row = 0; |
3161 | selection.beg.col = selection.end.col = 0; |
3216 | selection.beg.col = selection.end.col = 0; |
3162 | selection.clicks = 4; |
3217 | selection.clicks = 4; |
… | |
… | |
3217 | selection.beg.col = selection.end.col = selection.mark.col; |
3272 | selection.beg.col = selection.end.col = selection.mark.col; |
3218 | selection.beg.row = selection.end.row = selection.mark.row; |
3273 | selection.beg.row = selection.end.row = selection.mark.row; |
3219 | } |
3274 | } |
3220 | |
3275 | |
3221 | pos.col = col; |
3276 | pos.col = col; |
3222 | pos.row = row - view_start; |
3277 | pos.row = view_start + row; |
3223 | |
3278 | |
3224 | /* |
3279 | /* |
3225 | * This is mainly xterm style selection with a couple of differences, mainly |
3280 | * This is mainly xterm style selection with a couple of differences, mainly |
3226 | * in the way button3 drag extension works. |
3281 | * in the way button3 drag extension works. |
3227 | * We're either doing: button1 drag; button3 press; or button3 drag |
3282 | * We're either doing: button1 drag; button3 press; or button3 drag |
… | |
… | |
3314 | selection_delimit_word (DN, &selection.end, &selection.end); |
3369 | selection_delimit_word (DN, &selection.end, &selection.end); |
3315 | } |
3370 | } |
3316 | else if (selection.clicks == 3) |
3371 | else if (selection.clicks == 3) |
3317 | { |
3372 | { |
3318 | #if ENABLE_FRILLS |
3373 | #if ENABLE_FRILLS |
3319 | if (options & Opt_tripleclickwords) |
3374 | if (OPTION (Opt_tripleclickwords)) |
3320 | { |
3375 | { |
3321 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3376 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3322 | |
3377 | |
3323 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3378 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3324 | { |
3379 | { |
… | |
… | |
3385 | { |
3440 | { |
3386 | stp = ROW(end_row).t; |
3441 | stp = ROW(end_row).t; |
3387 | |
3442 | |
3388 | while (--end_col >= 0) |
3443 | while (--end_col >= 0) |
3389 | { |
3444 | { |
3390 | if (stp[end_col] != ' ' |
3445 | if (stp[end_col] != NOCHAR |
3391 | && stp[end_col] != '\t' |
3446 | && !unicode::is_space (stp[end_col])) |
3392 | && stp[end_col] != NOCHAR) |
|
|
3393 | break; |
3447 | break; |
3394 | } |
3448 | } |
3395 | |
3449 | |
3396 | if (end_col >= 0 |
3450 | if (end_col >= 0 |
3397 | || !ROW(end_row - 1).is_longer ()) |
3451 | || !ROW(end_row - 1).is_longer ()) |
… | |
… | |
3596 | |
3650 | |
3597 | #if ENABLE_OVERLAY |
3651 | #if ENABLE_OVERLAY |
3598 | void |
3652 | void |
3599 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3653 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3600 | { |
3654 | { |
3601 | if (nrow < 3 || ncol < 3) |
3655 | if (nrow < 1 || ncol < 1) |
3602 | return; |
3656 | return; |
3603 | |
3657 | |
3604 | want_refresh = 1; |
3658 | want_refresh = 1; |
3605 | |
3659 | |
3606 | scr_overlay_off (); |
3660 | scr_overlay_off (); |
… | |
… | |
3610 | |
3664 | |
3611 | // make space for border |
3665 | // make space for border |
3612 | w += 2; min_it (w, ncol); |
3666 | w += 2; min_it (w, ncol); |
3613 | h += 2; min_it (h, nrow); |
3667 | h += 2; min_it (h, nrow); |
3614 | |
3668 | |
3615 | x -= 1; max_it (x, 0); |
3669 | x -= 1; clamp_it (x, 0, ncol - w); |
3616 | y -= 1; max_it (y, 0); |
3670 | y -= 1; clamp_it (y, 0, nrow - h); |
3617 | |
|
|
3618 | min_it (x, ncol - w); |
|
|
3619 | min_it (y, nrow - h); |
|
|
3620 | |
3671 | |
3621 | ov_x = x; ov_y = y; |
3672 | ov_x = x; ov_y = y; |
3622 | ov_w = w; ov_h = h; |
3673 | ov_w = w; ov_h = h; |
3623 | |
3674 | |
3624 | ov_text = new text_t *[h]; |
3675 | ov_text = new text_t *[h]; |
… | |
… | |
3716 | for (int y = ov_h; y--; ) |
3767 | for (int y = ov_h; y--; ) |
3717 | { |
3768 | { |
3718 | text_t *t1 = ov_text[y]; |
3769 | text_t *t1 = ov_text[y]; |
3719 | rend_t *r1 = ov_rend[y]; |
3770 | rend_t *r1 = ov_rend[y]; |
3720 | |
3771 | |
3721 | text_t *t2 = ROW(y - view_start).t + ov_x; |
3772 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3722 | rend_t *r2 = ROW(y - view_start).r + ov_x; |
3773 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3723 | |
3774 | |
3724 | for (int x = ov_w; x--; ) |
3775 | for (int x = ov_w; x--; ) |
3725 | { |
3776 | { |
3726 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3777 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3727 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3778 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |