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 | TermWin.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() \ |
57 | selection.beg.row = selection.beg.col \ |
58 | selection.beg.row = selection.beg.col \ |
… | |
… | |
88 | /* |
89 | /* |
89 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
90 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
90 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
91 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
91 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
92 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
92 | */ |
93 | */ |
93 | #define drawBuffer TermWin.vt |
94 | #define drawBuffer vt |
94 | |
95 | |
95 | #define CLEAR_ROWS(row, num) \ |
96 | #define CLEAR_ROWS(row, num) \ |
96 | if (TermWin.mapped) \ |
97 | if (mapped) \ |
97 | XClearArea (display->display, drawBuffer, 0, \ |
98 | XClearArea (display->display, drawBuffer, 0, \ |
98 | Row2Pixel (row), (unsigned int)TermWin.width, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
99 | (unsigned int)Height2Pixel (num), False) |
100 | (unsigned int)Height2Pixel (num), False) |
100 | |
101 | |
101 | #define CLEAR_CHARS(x, y, num) \ |
102 | #define CLEAR_CHARS(x, y, num) \ |
102 | if (TermWin.mapped) \ |
103 | if (mapped) \ |
103 | XClearArea (display->display, drawBuffer, x, y, \ |
104 | XClearArea (display->display, drawBuffer, x, y, \ |
104 | (unsigned int)Width2Pixel (num), \ |
105 | (unsigned int)Width2Pixel (num), \ |
105 | (unsigned int)Height2Pixel (1), False) |
106 | (unsigned int)Height2Pixel (1), False) |
106 | |
107 | |
107 | #define ERASE_ROWS(row, num) \ |
108 | #define ERASE_ROWS(row, num) \ |
108 | XFillRectangle (display->display, drawBuffer, TermWin.gc, \ |
109 | XFillRectangle (display->display, drawBuffer, gc, \ |
109 | 0, Row2Pixel (row), \ |
110 | 0, Row2Pixel (row), \ |
110 | (unsigned int)TermWin.width, \ |
111 | (unsigned int)width, \ |
111 | (unsigned int)Height2Pixel (num)) |
112 | (unsigned int)Height2Pixel (num)) |
112 | |
113 | |
113 | /* ------------------------------------------------------------------------- * |
114 | /* ------------------------------------------------------------------------- * |
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 (text_t *et, rend_t *er, unsigned int width, rend_t efs) |
120 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) |
120 | { |
121 | { |
|
|
122 | if (!l.t) |
|
|
123 | { |
|
|
124 | lalloc (l); |
|
|
125 | col = 0; |
|
|
126 | width = ncol; |
|
|
127 | } |
|
|
128 | |
|
|
129 | l.touch (); |
|
|
130 | |
121 | efs &= ~RS_baseattrMask; |
131 | efs &= ~RS_baseattrMask; |
122 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
123 | |
133 | |
|
|
134 | text_t *et = l.t + col; |
|
|
135 | rend_t *er = l.r + col; |
|
|
136 | |
124 | while (width--) |
137 | while (width--) |
125 | { |
138 | { |
126 | *et++ = ' '; |
139 | *et++ = ' '; |
127 | *er++ = efs; |
140 | *er++ = efs; |
128 | } |
141 | } |
129 | } |
142 | } |
130 | |
143 | |
131 | /* ------------------------------------------------------------------------- */ |
144 | /* ------------------------------------------------------------------------- */ |
132 | /* 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 */ |
133 | void |
146 | void |
134 | rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) |
147 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
135 | { |
148 | { |
136 | #ifdef DEBUG_STRICT |
149 | scr_blank_line (l, 0, ncol, efs); |
137 | assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); |
|
|
138 | #endif |
|
|
139 | if (tp[row] == NULL) |
|
|
140 | { |
|
|
141 | tp[row] = (text_t *)talloc->alloc (); |
|
|
142 | rp[row] = (rend_t *)ralloc->alloc (); |
|
|
143 | } |
|
|
144 | |
|
|
145 | scr_blank_line (tp[row], rp[row], TermWin.ncol, efs); |
|
|
146 | } |
150 | } |
147 | |
151 | |
148 | /* ------------------------------------------------------------------------- * |
152 | /* ------------------------------------------------------------------------- * |
149 | * SCREEN INITIALISATION * |
153 | * SCREEN INITIALISATION * |
150 | * ------------------------------------------------------------------------- */ |
154 | * ------------------------------------------------------------------------- */ |
|
|
155 | |
151 | void |
156 | void |
152 | rxvt_term::scr_reset () |
157 | rxvt_term::scr_reset () |
153 | { |
158 | { |
154 | unsigned int ncol, nrow, total_rows, prev_total_rows; |
|
|
155 | unsigned int p, q; |
|
|
156 | int k; |
|
|
157 | rend_t setrstyle; |
|
|
158 | |
|
|
159 | #if ENABLE_OVERLAY |
159 | #if ENABLE_OVERLAY |
160 | scr_overlay_off (); |
160 | scr_overlay_off (); |
161 | #endif |
161 | #endif |
162 | |
162 | |
163 | TermWin.view_start = 0; |
163 | view_start = 0; |
164 | num_scr = 0; |
164 | num_scr = 0; |
165 | |
165 | |
166 | if (TermWin.ncol == 0) |
166 | if (ncol == 0) |
167 | TermWin.ncol = 80; |
167 | ncol = 80; |
168 | |
168 | |
169 | if (TermWin.nrow == 0) |
169 | if (nrow == 0) |
170 | TermWin.nrow = 24; |
170 | nrow = 24; |
171 | |
|
|
172 | ncol = TermWin.ncol; |
|
|
173 | nrow = TermWin.nrow; |
|
|
174 | |
171 | |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
172 | if (ncol == prev_ncol && nrow == prev_nrow) |
176 | return; |
173 | return; |
177 | |
174 | |
178 | // we need at least two lines for wrapping to work correctly |
175 | // we need at least two lines for wrapping to work correctly |
179 | if (nrow + TermWin.saveLines < 2) |
176 | if (nrow + saveLines < 2) |
180 | { |
177 | { |
|
|
178 | //TODO//FIXME |
181 | TermWin.saveLines++; |
179 | saveLines++; |
182 | prev_nrow--; |
180 | prev_nrow--; |
183 | TermWin.nscrolled++; |
181 | nsaved++; |
184 | } |
182 | } |
185 | |
183 | |
186 | want_refresh = 1; |
184 | want_refresh = 1; |
187 | |
185 | |
188 | prev_total_rows = prev_nrow + TermWin.saveLines; |
186 | int prev_total_rows = prev_nrow + saveLines; |
189 | total_rows = nrow + TermWin.saveLines; |
187 | total_rows = nrow + saveLines; |
190 | |
188 | |
191 | screen.tscroll = 0; |
189 | screen.tscroll = 0; |
192 | screen.bscroll = nrow - 1; |
190 | screen.bscroll = nrow - 1; |
193 | |
191 | |
194 | if (!talloc) |
192 | if (!row_buf) |
195 | { |
|
|
196 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
197 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
198 | } |
|
|
199 | |
|
|
200 | if (!screen.text) |
|
|
201 | { |
193 | { |
202 | /* |
194 | /* |
203 | * first time called so just malloc everything: don't rely on realloc |
195 | * first time called so just malloc everything: don't rely on realloc |
204 | * Note: this is still needed so that all the scrollback lines are NULL |
196 | * Note: this is still needed so that all the scrollback lines are NULL |
205 | */ |
197 | */ |
|
|
198 | nsaved = 0; /* no saved lines */ |
|
|
199 | term_start = 0; |
|
|
200 | |
|
|
201 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
202 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
203 | |
|
|
204 | row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
206 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
205 | temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
207 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
206 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
208 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
|
|
209 | swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
|
|
210 | |
|
|
211 | screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); |
|
|
212 | swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); |
207 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
213 | |
208 | |
214 | screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
209 | for (int row = nrow; row--; ) |
215 | buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
|
|
216 | drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
|
|
217 | swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
|
|
218 | |
|
|
219 | for (p = 0; p < nrow; p++) |
|
|
220 | { |
210 | { |
221 | q = p + TermWin.saveLines; |
|
|
222 | scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); |
211 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
223 | scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); |
212 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
224 | screen.tlen[q] = swap.tlen[p] = 0; |
|
|
225 | scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); |
213 | scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
226 | } |
214 | } |
227 | |
215 | |
228 | memset (charsets, 'B', sizeof (charsets)); |
216 | memset (charsets, 'B', sizeof (charsets)); |
229 | TermWin.nscrolled = 0; /* no saved lines */ |
|
|
230 | rstyle = DEFAULT_RSTYLE; |
217 | rstyle = DEFAULT_RSTYLE; |
231 | screen.flags = Screen_DefaultFlags; |
218 | screen.flags = Screen_DefaultFlags; |
232 | screen.cur.row = screen.cur.col = 0; |
219 | screen.cur.row = screen.cur.col = 0; |
233 | screen.charset = 0; |
220 | screen.charset = 0; |
234 | current_screen = PRIMARY; |
221 | current_screen = PRIMARY; |
… | |
… | |
254 | else |
241 | else |
255 | { |
242 | { |
256 | /* |
243 | /* |
257 | * add or delete rows as appropriate |
244 | * add or delete rows as appropriate |
258 | */ |
245 | */ |
259 | setrstyle = DEFAULT_RSTYLE; |
|
|
260 | |
246 | |
|
|
247 | rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
248 | rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
249 | |
|
|
250 | #if 0 |
261 | if (nrow < prev_nrow) |
251 | if (nrow < prev_nrow) |
262 | { |
252 | { |
263 | /* delete rows */ |
|
|
264 | k = min (TermWin.nscrolled, prev_nrow - nrow); |
|
|
265 | scr_scroll_text (0, (int)prev_nrow - 1, k, 1); |
|
|
266 | |
|
|
267 | for (p = nrow; p < prev_nrow; p++) |
253 | for (int row = nrow; row < prev_nrow; row++) |
268 | { |
254 | { |
269 | q = p + TermWin.saveLines; |
255 | lfree (swap_buf [row]); |
|
|
256 | lfree (drawn_buf[row]); |
|
|
257 | } |
|
|
258 | } |
|
|
259 | #endif |
270 | |
260 | |
271 | if (screen.text[q]) |
261 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
|
|
262 | temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t)); |
|
|
263 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
|
|
264 | |
|
|
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; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
278 | |
|
|
279 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
|
|
280 | int pend = MOD (term_start - nsaved , prev_total_rows); |
|
|
281 | int q = total_rows; // rewrapped row |
|
|
282 | |
|
|
283 | if (nsaved) |
|
|
284 | { |
|
|
285 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
|
|
286 | // to come up with a lean and mean algorithm. |
|
|
287 | |
|
|
288 | row_col_t ocur = screen.cur; |
|
|
289 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
|
|
290 | |
|
|
291 | do |
|
|
292 | { |
|
|
293 | p = MOD (p - 1, prev_total_rows); |
|
|
294 | #ifdef DEBUG_STRICT |
|
|
295 | assert (old_buf [MOD (p, prev_total_rows)].t); |
|
|
296 | #endif |
|
|
297 | int plines = 1; |
|
|
298 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
|
|
299 | |
|
|
300 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
272 | { |
301 | { |
273 | #ifdef DEBUG_STRICT |
302 | p = MOD (p - 1, prev_total_rows); |
274 | assert (screen.rend[q]); |
303 | |
275 | #endif |
304 | plines++; |
276 | talloc->free (screen.text[q]); |
305 | llen += prev_ncol; |
277 | ralloc->free (screen.rend[q]); |
|
|
278 | } |
306 | } |
279 | |
307 | |
280 | if (swap.text[p]) |
308 | int qlines = max (0, (llen - 1) / ncol) + 1; |
|
|
309 | |
|
|
310 | // drop partial lines completely |
|
|
311 | if (q < qlines) |
|
|
312 | break; |
|
|
313 | |
|
|
314 | q -= qlines; |
|
|
315 | |
|
|
316 | int lofs = 0; |
|
|
317 | line_t *qline; |
|
|
318 | |
|
|
319 | // re-assemble the full line by destination lines |
|
|
320 | for (int qrow = q; qlines--; qrow++) |
281 | { |
321 | { |
282 | #ifdef DEBUG_STRICT |
322 | qline = row_buf + qrow; |
|
|
323 | lalloc (*qline); |
|
|
324 | qline->l = ncol; |
|
|
325 | qline->is_longer (1); |
|
|
326 | |
|
|
327 | int qcol = 0; |
|
|
328 | |
|
|
329 | // fill a single destination line |
|
|
330 | while (lofs < llen && qcol < ncol) |
|
|
331 | { |
|
|
332 | int prow = lofs / prev_ncol; |
|
|
333 | int pcol = lofs % prev_ncol; |
|
|
334 | |
|
|
335 | prow = MOD (p + prow, prev_total_rows); |
|
|
336 | |
|
|
337 | // we only adjust the cursor _row_ and put it into |
|
|
338 | // the topmost line of "long line" it was in, as |
|
|
339 | // this seems to upset applications/shells/readline |
|
|
340 | // least. |
|
|
341 | if (prow == ocur.row) |
|
|
342 | screen.cur.row = q - (total_rows - nrow); |
|
|
343 | |
|
|
344 | line_t &pline = old_buf [prow]; |
|
|
345 | |
|
|
346 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
|
|
347 | |
283 | assert (swap.rend[p]); |
348 | assert (len); |
284 | #endif |
349 | assert (pline.t); |
285 | talloc->free (swap.text[p]); |
350 | |
286 | ralloc->free (swap.rend[p]); |
351 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
|
|
352 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
|
|
353 | |
|
|
354 | lofs += len; |
|
|
355 | qcol += len; |
|
|
356 | } |
287 | } |
357 | } |
288 | |
358 | |
289 | #ifdef DEBUG_STRICT |
359 | qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; |
290 | assert (drawn_text[p] && drawn_rend[p]); |
360 | qline->is_longer (0); |
291 | #endif |
361 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
292 | talloc->free (drawn_text[p]); |
|
|
293 | ralloc->free (drawn_rend[p]); |
|
|
294 | } |
362 | } |
|
|
363 | while (p != pend && q > 0); |
295 | |
364 | |
296 | /* we have fewer rows so fix up cursor position */ |
365 | term_start = total_rows - nrow; |
297 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
366 | nsaved = term_start - q; |
298 | |
367 | |
299 | scr_reset_realloc (); /* realloc _last_ */ |
368 | // make sure all terminal lines exist |
300 | } |
369 | while (nsaved < 0) |
301 | else if (nrow > prev_nrow) |
370 | scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); |
302 | { |
371 | } |
303 | /* add rows */ |
372 | else |
304 | scr_reset_realloc (); /* realloc _first_ */ |
373 | { |
305 | |
374 | // if no scrollback exists (yet), wing, instead of wrap |
306 | TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
375 | |
307 | |
376 | for (int row = min (nrow, prev_nrow); row--; ) |
308 | k = min (TermWin.nscrolled, nrow - prev_nrow); |
|
|
309 | |
|
|
310 | for (p = prev_total_rows; p < total_rows; p++) |
|
|
311 | { |
377 | { |
312 | screen.tlen[p] = 0; |
378 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
313 | screen.text[p] = NULL; |
379 | line_t &qline = row_buf [row]; |
314 | screen.rend[p] = NULL; |
380 | |
|
|
381 | qline = pline; |
|
|
382 | lresize (qline); |
315 | } |
383 | } |
316 | |
384 | |
317 | for (p = prev_total_rows; p < total_rows - k; p++) |
|
|
318 | scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle); |
|
|
319 | |
|
|
320 | for (p = prev_nrow; p < nrow; p++) |
385 | for (int row = prev_nrow; row < nrow; row++) |
321 | { |
386 | { |
322 | swap.tlen[p] = 0; |
387 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
323 | swap.text[p] = NULL; |
|
|
324 | swap.rend[p] = NULL; |
|
|
325 | drawn_text[p] = NULL; |
|
|
326 | drawn_rend[p] = NULL; |
|
|
327 | scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); |
|
|
328 | scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); |
|
|
329 | } |
388 | } |
330 | |
389 | |
331 | if (k > 0) |
390 | term_start = 0; |
332 | { |
|
|
333 | scr_scroll_text (0, (int)nrow - 1, -k, 1); |
|
|
334 | screen.cur.row += k; |
|
|
335 | screen.s_cur.row += k; |
|
|
336 | TermWin.nscrolled -= k; |
|
|
337 | } |
|
|
338 | |
|
|
339 | #ifdef DEBUG_STRICT |
|
|
340 | assert (screen.cur.row < TermWin.nrow); |
|
|
341 | #else /* drive with your eyes closed */ |
|
|
342 | MIN_IT (screen.cur.row, nrow - 1); |
|
|
343 | #endif |
|
|
344 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
|
|
345 | } |
|
|
346 | |
|
|
347 | /* resize columns */ |
|
|
348 | if (ncol != prev_ncol) |
|
|
349 | { |
391 | } |
350 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
351 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
352 | |
392 | |
353 | for (p = 0; p < total_rows; p++) |
393 | #ifdef DEBUG_STRICT //TODO: remove |
354 | { |
394 | for (int i = -nsaved; i < nrow; i++) |
355 | if (screen.text[p]) |
395 | assert (ROW (i).t); |
356 | { |
396 | #endif |
357 | screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t)); |
|
|
358 | screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t)); |
|
|
359 | |
397 | |
360 | MIN_IT (screen.tlen[p], (int16_t)ncol); |
398 | free (old_buf); |
|
|
399 | delete old_ta; |
|
|
400 | delete old_ra; |
361 | |
401 | |
362 | if (ncol > prev_ncol) |
402 | clamp_it (screen.cur.row, 0, nrow - 1); |
363 | scr_blank_line (&screen.text[p][prev_ncol], |
403 | clamp_it (screen.cur.col, 0, ncol - 1); |
364 | &screen.rend[p][prev_ncol], |
|
|
365 | ncol - prev_ncol, setrstyle); |
|
|
366 | } |
|
|
367 | } |
|
|
368 | |
|
|
369 | for (p = 0; p < nrow; p++) |
|
|
370 | { |
|
|
371 | drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t)); |
|
|
372 | drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t)); |
|
|
373 | |
|
|
374 | if (ncol > prev_ncol) |
|
|
375 | scr_blank_line (&drawn_text[p][prev_ncol], |
|
|
376 | &drawn_rend[p][prev_ncol], |
|
|
377 | ncol - prev_ncol, setrstyle); |
|
|
378 | |
|
|
379 | if (swap.text[p]) |
|
|
380 | { |
|
|
381 | swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t)); |
|
|
382 | swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t)); |
|
|
383 | |
|
|
384 | MIN_IT (swap.tlen[p], (int16_t)ncol); |
|
|
385 | |
|
|
386 | if (ncol > prev_ncol) |
|
|
387 | scr_blank_line (&swap.text[p][prev_ncol], |
|
|
388 | &swap.rend[p][prev_ncol], |
|
|
389 | ncol - prev_ncol, setrstyle); |
|
|
390 | } |
|
|
391 | |
|
|
392 | } |
|
|
393 | |
|
|
394 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
|
|
395 | |
|
|
396 | delete talloc; talloc = ta; |
|
|
397 | delete ralloc; ralloc = ra; |
|
|
398 | } |
|
|
399 | |
404 | |
400 | if (tabs) |
405 | if (tabs) |
401 | free (tabs); |
406 | free (tabs); |
402 | } |
407 | } |
403 | |
408 | |
404 | prev_nrow = nrow; |
409 | prev_nrow = nrow; |
405 | prev_ncol = ncol; |
410 | prev_ncol = ncol; |
406 | |
411 | |
407 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
408 | |
413 | |
409 | for (p = 0; p < ncol; p++) |
414 | for (int col = ncol; col--; ) |
410 | tabs[p] = (p % TABSIZE == 0) ? 1 : 0; |
415 | tabs [col] = col % TABSIZE == 0; |
411 | |
416 | |
412 | tt_winch (); |
417 | tt_winch (); |
413 | } |
|
|
414 | |
418 | |
415 | void |
419 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
416 | rxvt_term::scr_reset_realloc () |
|
|
417 | { |
|
|
418 | unsigned int total_rows, nrow; |
|
|
419 | |
|
|
420 | nrow = TermWin.nrow; |
|
|
421 | total_rows = nrow + TermWin.saveLines; |
|
|
422 | /* *INDENT-OFF* */ |
|
|
423 | screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); |
|
|
424 | buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *)); |
|
|
425 | drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *)); |
|
|
426 | swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *)); |
|
|
427 | |
|
|
428 | screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t)); |
|
|
429 | swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t)); |
|
|
430 | |
|
|
431 | screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *)); |
|
|
432 | buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *)); |
|
|
433 | drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *)); |
|
|
434 | swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *)); |
|
|
435 | /* *INDENT-ON* */ |
|
|
436 | } |
420 | } |
437 | |
421 | |
438 | /* ------------------------------------------------------------------------- */ |
422 | /* ------------------------------------------------------------------------- */ |
439 | /* |
423 | /* |
440 | * Free everything. That way malloc debugging can find leakage. |
424 | * Free everything. That way malloc debugging can find leakage. |
441 | */ |
425 | */ |
442 | void |
426 | void |
443 | rxvt_term::scr_release () |
427 | rxvt_term::scr_release () |
444 | { |
428 | { |
445 | unsigned int total_rows; |
|
|
446 | |
|
|
447 | total_rows = TermWin.nrow + TermWin.saveLines; |
|
|
448 | |
|
|
449 | delete talloc; talloc = 0; |
429 | delete talloc; talloc = 0; |
450 | delete ralloc; ralloc = 0; |
430 | delete ralloc; ralloc = 0; |
451 | |
431 | |
452 | free (screen.text); |
432 | free (row_buf); |
453 | free (screen.tlen); |
433 | free (swap_buf); |
454 | free (screen.rend); |
|
|
455 | free (drawn_text); |
434 | free (drawn_buf); |
456 | free (drawn_rend); |
435 | free (temp_buf); |
457 | free (swap.text); |
|
|
458 | free (swap.tlen); |
|
|
459 | free (swap.rend); |
|
|
460 | free (buf_text); |
|
|
461 | free (buf_rend); |
|
|
462 | free (tabs); |
436 | free (tabs); |
463 | |
437 | |
464 | /* NULL these so if anything tries to use them, we'll know about it */ |
438 | row_buf = 0; // signal that we freed all the arrays |
465 | screen.text = drawn_text = swap.text = NULL; |
|
|
466 | screen.rend = drawn_rend = swap.rend = NULL; |
|
|
467 | screen.tlen = swap.tlen = NULL; |
|
|
468 | buf_text = NULL; |
|
|
469 | buf_rend = NULL; |
|
|
470 | tabs = NULL; |
|
|
471 | } |
439 | } |
472 | |
440 | |
473 | /* ------------------------------------------------------------------------- */ |
441 | /* ------------------------------------------------------------------------- */ |
474 | /* |
442 | /* |
475 | * Hard reset |
443 | * Hard reset |
… | |
… | |
526 | set_font_style (); |
494 | set_font_style (); |
527 | break; |
495 | break; |
528 | } |
496 | } |
529 | |
497 | |
530 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
498 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
531 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
499 | min_it (s->cur.row, nrow - 1); |
532 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
500 | min_it (s->cur.col, ncol - 1); |
533 | #ifdef DEBUG_STRICT |
501 | #ifdef DEBUG_STRICT |
534 | assert (s->cur.row >= 0); |
502 | assert (s->cur.row >= 0); |
535 | assert (s->cur.col >= 0); |
503 | assert (s->cur.col >= 0); |
536 | #else /* drive with your eyes closed */ |
|
|
537 | MAX_IT (s->cur.row, 0); |
|
|
538 | MAX_IT (s->cur.col, 0); |
|
|
539 | #endif |
504 | #endif |
540 | } |
505 | } |
541 | |
506 | |
542 | /* ------------------------------------------------------------------------- */ |
507 | /* ------------------------------------------------------------------------- */ |
543 | /* |
508 | /* |
… | |
… | |
546 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
511 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
547 | */ |
512 | */ |
548 | int |
513 | int |
549 | rxvt_term::scr_change_screen (int scrn) |
514 | rxvt_term::scr_change_screen (int scrn) |
550 | { |
515 | { |
551 | int i; |
|
|
552 | #if NSCREENS |
|
|
553 | int offset; |
|
|
554 | #endif |
|
|
555 | |
|
|
556 | want_refresh = 1; |
516 | want_refresh = 1; |
557 | |
|
|
558 | TermWin.view_start = 0; |
517 | view_start = 0; |
559 | |
518 | |
560 | if (current_screen == scrn) |
519 | if (current_screen == scrn) |
561 | return scrn; |
520 | return scrn; |
562 | |
521 | |
563 | selection_check (2); /* check for boundary cross */ |
522 | selection_check (2); /* check for boundary cross */ |
564 | |
523 | |
565 | i = current_screen; current_screen = scrn; scrn = i; |
524 | int i = current_screen; current_screen = scrn; scrn = i; |
566 | |
525 | |
567 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
526 | ::swap (screen.cur.row, swap.cur.row); |
568 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
527 | ::swap (screen.cur.col, swap.cur.col); |
569 | MAX_IT (screen.cur.row, 0); |
528 | |
570 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
529 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
571 | MAX_IT (screen.cur.col, 0); |
530 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
572 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
|
|
573 | |
531 | |
574 | #if NSCREENS |
532 | #if NSCREENS |
575 | if (options & Opt_secondaryScreen) |
533 | if (OPTION (Opt_secondaryScreen)) |
576 | { |
534 | { |
577 | num_scr = 0; |
535 | num_scr = 0; |
578 | offset = TermWin.saveLines; |
|
|
579 | |
536 | |
580 | for (i = prev_nrow; i--;) |
537 | for (int i = prev_nrow; i--; ) |
581 | { |
538 | ::swap (ROW(i), swap_buf [i]); |
582 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
|
|
583 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
|
|
584 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
|
|
585 | } |
|
|
586 | |
539 | |
587 | SWAP_IT (screen.charset, swap.charset, int16_t); |
540 | ::swap (screen.charset, swap.charset); |
588 | SWAP_IT (screen.flags, swap.flags, int); |
541 | ::swap (screen.flags, swap.flags); |
589 | screen.flags |= Screen_VisibleCursor; |
542 | screen.flags |= Screen_VisibleCursor; |
590 | swap.flags |= Screen_VisibleCursor; |
543 | swap.flags |= Screen_VisibleCursor; |
591 | } |
544 | } |
592 | else |
545 | else |
593 | #endif |
546 | #endif |
594 | if (options & Opt_secondaryScroll) |
547 | if (OPTION (Opt_secondaryScroll)) |
595 | scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); |
548 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
596 | |
549 | |
597 | return scrn; |
550 | return scrn; |
598 | } |
551 | } |
599 | |
552 | |
600 | // clear WrapNext indicator, solidifying position on next line |
553 | // clear WrapNext indicator, solidifying position on next line |
… | |
… | |
607 | screen.flags &= ~Screen_WrapNext; |
560 | screen.flags &= ~Screen_WrapNext; |
608 | |
561 | |
609 | screen.cur.col = 0; |
562 | screen.cur.col = 0; |
610 | |
563 | |
611 | if (screen.cur.row == screen.bscroll) |
564 | if (screen.cur.row == screen.bscroll) |
612 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
565 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
613 | else if (screen.cur.row < TermWin.nrow - 1) |
566 | else if (screen.cur.row < nrow - 1) |
614 | screen.cur.row++; |
567 | screen.cur.row++; |
615 | } |
568 | } |
616 | |
569 | |
617 | /* ------------------------------------------------------------------------- */ |
570 | /* ------------------------------------------------------------------------- */ |
618 | /* |
571 | /* |
… | |
… | |
648 | /* ------------------------------------------------------------------------- */ |
601 | /* ------------------------------------------------------------------------- */ |
649 | /* |
602 | /* |
650 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
603 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
651 | * count positive ==> scroll up |
604 | * count positive ==> scroll up |
652 | * count negative ==> scroll down |
605 | * count negative ==> scroll down |
653 | * spec == 0 for normal routines |
|
|
654 | */ |
606 | */ |
655 | int |
607 | int |
656 | rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) |
608 | rxvt_term::scr_scroll_text (int row1, int row2, int count) |
657 | { |
609 | { |
658 | int i, j; |
|
|
659 | long nscrolled; |
|
|
660 | |
|
|
661 | if (count == 0 || (row1 > row2)) |
610 | if (count == 0 || (row1 > row2)) |
662 | return 0; |
611 | return 0; |
663 | |
612 | |
664 | want_refresh = 1; |
613 | want_refresh = 1; |
|
|
614 | num_scr += count; |
665 | |
615 | |
666 | if (row1 == 0 && count > 0 |
616 | if (count > 0 |
|
|
617 | && row1 == 0 |
|
|
618 | && row2 == nrow - 1 |
667 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
619 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
668 | { |
|
|
669 | nscrolled = (long)TermWin.nscrolled + (long)count; |
|
|
670 | |
|
|
671 | if (nscrolled > (long)TermWin.saveLines) |
|
|
672 | TermWin.nscrolled = TermWin.saveLines; |
|
|
673 | else |
|
|
674 | TermWin.nscrolled = (unsigned int)nscrolled; |
|
|
675 | |
|
|
676 | if ((options & Opt_scrollWithBuffer) |
|
|
677 | && TermWin.view_start != 0 |
|
|
678 | && TermWin.view_start != TermWin.saveLines) |
|
|
679 | scr_page (UP, count); |
|
|
680 | } |
620 | { |
681 | else if (!spec) |
621 | nsaved = min (nsaved + count, saveLines); |
682 | row1 += TermWin.saveLines; |
|
|
683 | |
622 | |
684 | row2 += TermWin.saveLines; |
623 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); |
|
|
624 | |
|
|
625 | term_start = (term_start + count) % total_rows; |
685 | |
626 | |
686 | if (selection.op && current_screen == selection.screen) |
627 | if (selection.op && current_screen == selection.screen) |
687 | { |
|
|
688 | i = selection.beg.row + TermWin.saveLines; |
|
|
689 | j = selection.end.row + TermWin.saveLines; |
|
|
690 | if ((i < row1 && j > row1) |
|
|
691 | || (i < row2 && j > row2) |
|
|
692 | || (i - count < row1 && i >= row1) |
|
|
693 | || (i - count > row2 && i <= row2) |
|
|
694 | || (j - count < row1 && j >= row1) |
|
|
695 | || (j - count > row2 && j <= row2)) |
|
|
696 | { |
|
|
697 | CLEAR_ALL_SELECTION (); |
|
|
698 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
|
|
699 | } |
628 | { |
700 | else if (j >= row1 && j <= row2) |
|
|
701 | { |
|
|
702 | /* move selected region too */ |
|
|
703 | selection.beg.row -= count; |
629 | selection.beg.row -= count; |
704 | selection.end.row -= count; |
630 | selection.end.row -= count; |
705 | selection.mark.row -= count; |
631 | selection.mark.row -= count; |
|
|
632 | |
|
|
633 | if (selection.beg.row < -nsaved |
|
|
634 | || selection.end.row < -nsaved |
|
|
635 | || selection.mark.row < -nsaved) |
|
|
636 | { |
|
|
637 | CLEAR_ALL_SELECTION (); |
|
|
638 | selection.op = SELECTION_CLEAR; |
706 | } |
639 | } |
707 | } |
|
|
708 | |
|
|
709 | selection_check (0); /* _after_ TermWin.nscrolled update */ |
|
|
710 | |
|
|
711 | num_scr += count; |
|
|
712 | j = count; |
|
|
713 | |
|
|
714 | if (count < 0) |
|
|
715 | count = -count; |
|
|
716 | |
|
|
717 | i = row2 - row1 + 1; |
|
|
718 | MIN_IT (count, i); |
|
|
719 | |
|
|
720 | if (j > 0) |
|
|
721 | { |
|
|
722 | /* scroll up */ |
|
|
723 | |
|
|
724 | /* Copy lines that will get clobbered by the rotation */ |
|
|
725 | memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); |
|
|
726 | memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); |
|
|
727 | |
|
|
728 | /* Rotate lines */ |
|
|
729 | i = row2 - row1 - count + 1; |
|
|
730 | memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); |
|
|
731 | memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); |
|
|
732 | memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); |
|
|
733 | |
|
|
734 | j = row2 - count + 1, i = count; |
|
|
735 | } |
|
|
736 | else /* if (j < 0) */ |
|
|
737 | { |
|
|
738 | /* scroll down */ |
|
|
739 | |
|
|
740 | /* Copy lines that will get clobbered by the rotation */ |
|
|
741 | for (i = 0, j = row2; i < count; i++, j--) |
|
|
742 | { |
640 | } |
743 | buf_text[i] = screen.text[j]; |
641 | |
744 | buf_rend[i] = screen.rend[j]; |
642 | for (int i = count; i--; ) |
745 | } |
643 | { |
746 | |
644 | ROW(row2 - i).l = 0; |
747 | /* Rotate lines */ |
645 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
748 | for (j = row2, i = j - count; i >= row1; i--, j--) |
|
|
749 | { |
646 | } |
750 | screen.tlen[j] = screen.tlen[i]; |
647 | |
751 | screen.text[j] = screen.text[i]; |
648 | if (OPTION (Opt_scrollWithBuffer) |
752 | screen.rend[j] = screen.rend[i]; |
649 | && view_start != 0 |
|
|
650 | && view_start != saveLines) |
|
|
651 | scr_page (UP, count); |
|
|
652 | } |
|
|
653 | else |
|
|
654 | { |
|
|
655 | if (selection.op && current_screen == selection.screen) |
753 | } |
656 | { |
|
|
657 | if ((selection.beg.row < row1 && selection.end.row > row1) |
|
|
658 | || (selection.beg.row < row2 && selection.end.row > row2) |
|
|
659 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
|
|
660 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
|
|
661 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
|
|
662 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
|
|
663 | { |
|
|
664 | CLEAR_ALL_SELECTION (); |
|
|
665 | selection.op = SELECTION_CLEAR; |
|
|
666 | } |
|
|
667 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
|
|
668 | { |
|
|
669 | /* move selected region too */ |
|
|
670 | selection.beg.row -= count; |
|
|
671 | selection.end.row -= count; |
|
|
672 | selection.mark.row -= count; |
|
|
673 | |
|
|
674 | selection_check (0); |
|
|
675 | } |
|
|
676 | } |
754 | |
677 | |
755 | j = row1, i = count; |
678 | // use a simple and robust scrolling algorithm, this |
756 | count = -count; |
679 | // part of scr_scroll_text is not time-critical. |
757 | } |
|
|
758 | |
680 | |
759 | /* Resurrect lines */ |
681 | int rows = row2 - row1 + 1; |
760 | memset (screen.tlen + j, 0, i * sizeof (int16_t)); |
682 | |
761 | memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); |
683 | min_it (count, rows); |
762 | memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); |
684 | |
763 | if (!spec) /* line length may not equal TermWin.ncol */ |
685 | for (int row = 0; row < rows; row++) |
764 | for (; i--; j++) |
686 | { |
765 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); |
687 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
|
|
688 | |
|
|
689 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
|
|
690 | scr_blank_screen_mem (temp_buf [row], rstyle); |
|
|
691 | } |
|
|
692 | |
|
|
693 | for (int row = 0; row < rows; row++) |
|
|
694 | ROW(row1 + row) = temp_buf [row]; |
|
|
695 | } |
766 | |
696 | |
767 | return count; |
697 | return count; |
768 | } |
698 | } |
769 | |
699 | |
770 | /* ------------------------------------------------------------------------- */ |
700 | /* ------------------------------------------------------------------------- */ |
771 | /* |
701 | /* |
772 | * Add text given in <str> of length <len> to screen struct |
702 | * Add text given in <str> of length <len> to screen struct |
773 | */ |
703 | */ |
774 | void |
704 | void |
775 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
705 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) |
776 | { |
706 | { |
777 | if (len <= 0) /* sanity */ |
707 | if (len <= 0) /* sanity */ |
778 | return; |
708 | return; |
779 | |
709 | |
780 | unsigned char checksel; |
710 | unsigned char checksel; |
781 | unicode_t c; |
711 | unicode_t c; |
782 | int row, last_col; |
712 | int ncol = this->ncol; |
783 | text_t *stp; |
|
|
784 | rend_t *srp; |
|
|
785 | const unicode_t *strend = str + len; |
713 | const wchar_t *strend = str + len; |
786 | |
714 | |
787 | want_refresh = 1; |
715 | want_refresh = 1; |
788 | ZERO_SCROLLBACK (); |
716 | ZERO_SCROLLBACK (); |
789 | last_col = TermWin.ncol; |
|
|
790 | |
717 | |
791 | if (nlines > 0) |
718 | if (minlines > 0) |
792 | { |
719 | { |
793 | nlines += screen.cur.row - screen.bscroll; |
720 | minlines += screen.cur.row - screen.bscroll; |
|
|
721 | |
794 | if ((nlines > 0) |
722 | if (minlines > 0 |
795 | && (screen.tscroll == 0) |
723 | && screen.tscroll == 0 |
796 | && (screen.bscroll == (TermWin.nrow - 1))) |
724 | && screen.bscroll == nrow - 1) |
797 | { |
725 | { |
798 | /* _at least_ this many lines need to be scrolled */ |
726 | /* _at least_ this many lines need to be scrolled */ |
799 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
727 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
800 | screen.cur.row -= nlines; |
728 | screen.cur.row -= minlines; |
801 | } |
729 | } |
802 | } |
730 | } |
803 | |
731 | |
804 | #ifdef DEBUG_STRICT |
732 | #ifdef DEBUG_STRICT |
805 | assert (screen.cur.col < last_col); |
733 | assert (screen.cur.col < ncol); |
806 | assert ((screen.cur.row < TermWin.nrow) |
734 | assert (screen.cur.row < nrow |
807 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
735 | && screen.cur.row >= -nsaved); |
808 | #else /* drive with your eyes closed */ |
|
|
809 | MIN_IT (screen.cur.col, last_col - 1); |
|
|
810 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
|
|
811 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
|
|
812 | #endif |
736 | #endif |
813 | row = screen.cur.row + TermWin.saveLines; |
737 | int row = screen.cur.row; |
814 | |
738 | |
815 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
739 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
816 | |
740 | |
817 | stp = screen.text[row]; |
741 | line_t *line = &ROW(row); |
818 | srp = screen.rend[row]; |
|
|
819 | |
742 | |
820 | while (str < strend) |
743 | while (str < strend) |
821 | { |
744 | { |
822 | c = *str++; |
745 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
823 | |
746 | |
824 | if (c < 0x20) |
747 | if (c < 0x20) |
825 | if (c == C0_LF) |
748 | if (c == C0_LF) |
826 | { |
749 | { |
827 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
750 | max_it (line->l, screen.cur.col); |
828 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
829 | |
751 | |
830 | screen.flags &= ~Screen_WrapNext; |
752 | screen.flags &= ~Screen_WrapNext; |
831 | |
753 | |
832 | if (screen.cur.row == screen.bscroll) |
754 | if (screen.cur.row == screen.bscroll) |
833 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
755 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
834 | else if (screen.cur.row < (TermWin.nrow - 1)) |
756 | else if (screen.cur.row < (nrow - 1)) |
835 | row = (++screen.cur.row) + TermWin.saveLines; |
757 | row = ++screen.cur.row; |
836 | |
758 | |
837 | stp = screen.text[row]; /* _must_ refresh */ |
759 | line = &ROW(row); /* _must_ refresh */ |
838 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
839 | continue; |
760 | continue; |
840 | } |
761 | } |
841 | else if (c == C0_CR) |
762 | else if (c == C0_CR) |
842 | { |
763 | { |
843 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
764 | max_it (line->l, screen.cur.col); |
844 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
845 | |
765 | |
846 | screen.flags &= ~Screen_WrapNext; |
766 | screen.flags &= ~Screen_WrapNext; |
847 | screen.cur.col = 0; |
767 | screen.cur.col = 0; |
848 | continue; |
768 | continue; |
849 | } |
769 | } |
… | |
… | |
866 | CLEAR_SELECTION (); |
786 | CLEAR_SELECTION (); |
867 | } |
787 | } |
868 | |
788 | |
869 | if (screen.flags & Screen_WrapNext) |
789 | if (screen.flags & Screen_WrapNext) |
870 | { |
790 | { |
871 | screen.tlen[row] = -1; |
791 | max_it (line->l, ncol); |
|
|
792 | line->is_longer (1); |
872 | |
793 | |
873 | scr_do_wrap (); |
794 | scr_do_wrap (); |
874 | |
795 | |
875 | row = screen.cur.row + TermWin.saveLines; |
796 | row = screen.cur.row; |
876 | stp = screen.text[row]; /* _must_ refresh */ |
797 | line = &ROW(row); /* _must_ refresh */ |
877 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
878 | } |
798 | } |
879 | |
799 | |
880 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
800 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
881 | if (IN_RANGE (c, 0xd800, 0xdfff)) |
801 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
882 | c = 0xfffd; |
802 | c = 0xfffd; |
883 | |
803 | |
884 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
804 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
885 | // do wcwidth before further replacements, as wcwidth might return -1 |
805 | // do wcwidth before further replacements, as wcwidth might return -1 |
886 | // for the line drawing characters below as they might be invalid in the current |
806 | // for the line drawing characters below as they might be invalid in the current |
887 | // locale. |
807 | // locale. |
888 | int width = c < 0x100 ? 1 : wcwidth (c); |
808 | int width = c < 0x100 ? 1 : wcwidth (c); |
889 | |
809 | |
890 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
810 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
891 | { |
811 | { |
892 | // vt100 special graphics and line drawing |
812 | // vt100 special graphics and line drawing |
893 | // 5f-7e standard vt100 |
813 | // 5f-7e standard vt100 |
894 | // 40-5e rxvt extension for extra curses acs chars |
814 | // 40-5e rxvt extension for extra curses acs chars |
895 | static uint16_t vt100_0[62] = { // 41 .. 7e |
815 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
924 | c = 0xfffd; |
844 | c = 0xfffd; |
925 | # endif |
845 | # endif |
926 | #endif |
846 | #endif |
927 | |
847 | |
928 | // nuke the character at this position, if required |
848 | // nuke the character at this position, if required |
929 | if (stp[screen.cur.col] == NOCHAR |
849 | if (line->t[screen.cur.col] == NOCHAR |
930 | || (screen.cur.col < TermWin.ncol - 1 |
850 | || (screen.cur.col < ncol - 1 |
931 | && stp[screen.cur.col + 1] == NOCHAR)) |
851 | && line->t[screen.cur.col + 1] == NOCHAR)) |
932 | { |
852 | { |
933 | int col = screen.cur.col; |
853 | int col = screen.cur.col; |
934 | |
854 | |
935 | // find begin |
855 | // find begin |
936 | while (col > 0 && stp[col] == NOCHAR) |
856 | while (col > 0 && line->t[col] == NOCHAR) |
937 | col--; |
857 | col--; |
938 | |
858 | |
939 | rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); |
859 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
940 | |
860 | |
941 | // found begin, nuke |
861 | // found begin, nuke |
942 | do { |
862 | do { |
943 | stp[col] = ' '; |
863 | line->t[col] = ' '; |
944 | srp[col] = rend; |
864 | line->r[col] = rend; |
945 | col++; |
865 | col++; |
946 | } while (col < TermWin.ncol && stp[col] == NOCHAR); |
866 | } while (col < ncol && line->t[col] == NOCHAR); |
947 | } |
867 | } |
948 | |
868 | |
949 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
869 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
950 | |
870 | |
951 | // if the character doesn't fit into the remaining columns... |
871 | // if the character doesn't fit into the remaining columns... |
952 | if (screen.cur.col > last_col - width && last_col >= width) |
872 | if (screen.cur.col > ncol - width && ncol >= width) |
953 | { |
873 | { |
954 | // ...output spaces |
874 | // ...output spaces |
955 | c = ' '; |
875 | c = ' '; |
956 | // and try the same character next loop iteration |
876 | // and try the same character next loop iteration |
957 | --str; |
877 | --str; |
958 | } |
878 | } |
959 | |
879 | |
|
|
880 | line->touch (); |
|
|
881 | |
960 | do |
882 | do |
961 | { |
883 | { |
962 | stp[screen.cur.col] = c; |
884 | line->t[screen.cur.col] = c; |
963 | srp[screen.cur.col] = rend; |
885 | line->r[screen.cur.col] = rend; |
964 | |
886 | |
965 | if (screen.cur.col < last_col - 1) |
887 | if (screen.cur.col < ncol - 1) |
966 | screen.cur.col++; |
888 | screen.cur.col++; |
967 | else |
889 | else |
968 | { |
890 | { |
969 | screen.tlen[row] = last_col; |
891 | line->l = ncol; |
970 | if (screen.flags & Screen_Autowrap) |
892 | if (screen.flags & Screen_Autowrap) |
971 | screen.flags |= Screen_WrapNext; |
893 | screen.flags |= Screen_WrapNext; |
972 | break; |
894 | break; |
973 | } |
895 | } |
974 | |
896 | |
… | |
… | |
976 | } |
898 | } |
977 | while (--width > 0); |
899 | while (--width > 0); |
978 | |
900 | |
979 | // pad with spaces when overwriting wide character with smaller one |
901 | // pad with spaces when overwriting wide character with smaller one |
980 | if (!width) |
902 | if (!width) |
|
|
903 | { |
|
|
904 | line->touch (); |
|
|
905 | |
981 | for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) |
906 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
982 | { |
907 | { |
983 | stp[c] = ' '; |
908 | line->t[c] = ' '; |
984 | srp[c] = rend; |
909 | line->r[c] = rend; |
985 | } |
910 | } |
|
|
911 | } |
986 | } |
912 | } |
987 | else // width == 0 |
913 | else // width == 0 |
988 | { |
914 | { |
989 | #if ENABLE_COMBINING |
915 | #if ENABLE_COMBINING |
990 | // handle combining characters |
916 | // handle combining characters |
991 | // we just tag the accent on the previous on-screen character. |
917 | // we just tag the accent on the previous on-screen character. |
992 | // this is arguably not correct, but also arguably not wrong. |
918 | // this is arguably not correct, but also arguably not wrong. |
993 | // we don't handle double-width characters nicely yet. |
919 | // we don't handle double-width characters nicely yet. |
|
|
920 | line_t *linep; |
994 | text_t *tp; |
921 | text_t *tp; |
995 | rend_t *rp; |
922 | rend_t *rp; |
996 | |
923 | |
997 | if (screen.cur.col > 0) |
924 | if (screen.cur.col > 0) |
998 | { |
925 | { |
|
|
926 | linep = line; |
999 | tp = stp + screen.cur.col - 1; |
927 | tp = line->t + screen.cur.col - 1; |
1000 | rp = srp + screen.cur.col - 1; |
928 | rp = line->r + screen.cur.col - 1; |
1001 | |
|
|
1002 | while (*tp == NOCHAR && tp > stp) |
|
|
1003 | tp--, rp--; |
|
|
1004 | } |
929 | } |
1005 | else if (screen.cur.row > 0 |
930 | else if (screen.cur.row > 0 |
1006 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
931 | && ROW(screen.cur.row - 1).is_longer ()) |
1007 | { |
932 | { |
1008 | int line = screen.cur.row - 1 + TermWin.saveLines; |
933 | linep = &ROW(screen.cur.row - 1); |
1009 | |
|
|
1010 | tp = screen.text[line] + last_col - 1; |
934 | tp = line->t + ncol - 1; |
1011 | rp = screen.rend[line] + last_col - 1; |
935 | rp = line->r + ncol - 1; |
1012 | |
|
|
1013 | while (*tp == NOCHAR && tp > screen.text[line]) |
|
|
1014 | tp--, rp--; |
|
|
1015 | } |
936 | } |
1016 | else |
937 | else |
1017 | continue; |
938 | continue; |
|
|
939 | |
|
|
940 | linep->touch (); |
|
|
941 | |
|
|
942 | while (*tp == NOCHAR && tp > linep->t) |
|
|
943 | tp--, rp--; |
1018 | |
944 | |
1019 | // first try to find a precomposed character |
945 | // first try to find a precomposed character |
1020 | unicode_t n = rxvt_compose (*tp, c); |
946 | unicode_t n = rxvt_compose (*tp, c); |
1021 | if (n == NOCHAR) |
947 | if (n == NOCHAR) |
1022 | n = rxvt_composite.compose (*tp, c); |
948 | n = rxvt_composite.compose (*tp, c); |
… | |
… | |
1025 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
951 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
1026 | #endif |
952 | #endif |
1027 | } |
953 | } |
1028 | } |
954 | } |
1029 | |
955 | |
1030 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
956 | max_it (line->l, screen.cur.col); |
1031 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
1032 | |
957 | |
1033 | #ifdef DEBUG_STRICT |
958 | #ifdef DEBUG_STRICT |
1034 | assert (screen.cur.row >= 0); |
959 | assert (screen.cur.row >= 0); |
1035 | #else /* drive with your eyes closed */ |
|
|
1036 | MAX_IT (screen.cur.row, 0); |
|
|
1037 | #endif |
960 | #endif |
1038 | } |
961 | } |
1039 | |
962 | |
1040 | /* ------------------------------------------------------------------------- */ |
963 | /* ------------------------------------------------------------------------- */ |
1041 | /* |
964 | /* |
… | |
… | |
1050 | if (screen.cur.col == 0) |
973 | if (screen.cur.col == 0) |
1051 | { |
974 | { |
1052 | if (screen.cur.row > 0) |
975 | if (screen.cur.row > 0) |
1053 | { |
976 | { |
1054 | #ifdef TERMCAP_HAS_BW |
977 | #ifdef TERMCAP_HAS_BW |
1055 | screen.cur.col = TermWin.ncol - 1; |
978 | screen.cur.col = ncol - 1; |
1056 | screen.cur.row--; |
979 | screen.cur.row--; |
1057 | return; |
980 | return; |
1058 | #endif |
981 | #endif |
1059 | } |
982 | } |
1060 | } |
983 | } |
… | |
… | |
1080 | |
1003 | |
1081 | if (count == 0) |
1004 | if (count == 0) |
1082 | return; |
1005 | return; |
1083 | else if (count > 0) |
1006 | else if (count > 0) |
1084 | { |
1007 | { |
1085 | int row = TermWin.saveLines + screen.cur.row; |
1008 | line_t &l = ROW(screen.cur.row); |
1086 | text_t *tp = screen.text[row]; |
|
|
1087 | rend_t *rp = screen.rend[row]; |
|
|
1088 | rend_t base_rend = rp[i]; |
1009 | rend_t base_rend = l.r[i]; |
1089 | ht &= tp[i] == ' '; |
1010 | ht &= l.t[i] == ' '; |
1090 | |
1011 | |
1091 | for (; ++i < TermWin.ncol; ) |
1012 | for (; ++i < ncol; ) |
1092 | if (tabs[i]) |
1013 | if (tabs[i]) |
1093 | { |
1014 | { |
1094 | x = i; |
1015 | x = i; |
|
|
1016 | |
1095 | if (!--count) |
1017 | if (!--count) |
1096 | break; |
1018 | break; |
1097 | } |
1019 | } |
1098 | else |
1020 | else |
1099 | ht &= tp[i] == ' ' |
1021 | ht &= l.t[i] == ' ' |
1100 | && RS_SAME (rp[i], base_rend); |
1022 | && RS_SAME (l.r[i], base_rend); |
1101 | |
1023 | |
1102 | if (count) |
1024 | if (count) |
1103 | x = TermWin.ncol - 1; |
1025 | x = ncol - 1; |
1104 | |
1026 | |
1105 | // store horizontal tab commands as characters inside the text |
1027 | // store horizontal tab commands as characters inside the text |
1106 | // buffer so they can be selected and pasted. |
1028 | // buffer so they can be selected and pasted. |
1107 | if (ht && options & Opt_pastableTabs) |
1029 | if (ht && OPTION (Opt_pastableTabs)) |
1108 | { |
1030 | { |
1109 | base_rend = SET_FONT (base_rend, 0); |
1031 | base_rend = SET_FONT (base_rend, 0); |
1110 | |
1032 | |
1111 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
1033 | l.touch (x); |
1112 | MAX_IT (screen.tlen[row], x); |
|
|
1113 | |
1034 | |
1114 | i = screen.cur.col; |
1035 | i = screen.cur.col; |
1115 | |
1036 | |
1116 | tp[i] = '\t'; |
1037 | l.t[i] = '\t'; |
1117 | rp[i] = base_rend; |
1038 | l.r[i] = base_rend; |
1118 | |
1039 | |
1119 | while (++i < x) |
1040 | while (++i < x) |
1120 | { |
1041 | { |
1121 | tp[i] = NOCHAR; |
1042 | l.t[i] = NOCHAR; |
1122 | rp[i] = base_rend; |
1043 | l.r[i] = base_rend; |
1123 | } |
1044 | } |
1124 | } |
1045 | } |
1125 | } |
1046 | } |
1126 | else /* if (count < 0) */ |
1047 | else /* if (count < 0) */ |
1127 | { |
1048 | { |
… | |
… | |
1153 | rxvt_term::scr_backindex () |
1074 | rxvt_term::scr_backindex () |
1154 | { |
1075 | { |
1155 | if (screen.cur.col > 0) |
1076 | if (screen.cur.col > 0) |
1156 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1077 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1157 | else |
1078 | else |
1158 | { |
|
|
1159 | if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) |
|
|
1160 | return; /* um, yeah? */ |
|
|
1161 | |
|
|
1162 | scr_insdel_chars (1, INSERT); |
1079 | scr_insdel_chars (1, INSERT); |
1163 | } |
|
|
1164 | } |
1080 | } |
1165 | #endif |
1081 | #endif |
1166 | /* ------------------------------------------------------------------------- */ |
1082 | /* ------------------------------------------------------------------------- */ |
1167 | /* |
1083 | /* |
1168 | * Process DEC Forward Index |
1084 | * Process DEC Forward Index |
… | |
… | |
1172 | */ |
1088 | */ |
1173 | #if ENABLE_FRILLS |
1089 | #if ENABLE_FRILLS |
1174 | void |
1090 | void |
1175 | rxvt_term::scr_forwardindex () |
1091 | rxvt_term::scr_forwardindex () |
1176 | { |
1092 | { |
1177 | int row; |
|
|
1178 | |
|
|
1179 | if (screen.cur.col < TermWin.ncol - 1) |
1093 | if (screen.cur.col < ncol - 1) |
1180 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1094 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1181 | else |
1095 | else |
1182 | { |
1096 | { |
1183 | row = screen.cur.row + TermWin.saveLines; |
1097 | line_t &l = ROW(screen.cur.row); |
1184 | |
1098 | |
1185 | if (screen.tlen[row] == 0) |
1099 | l.touch (); |
1186 | return; /* um, yeah? */ |
1100 | l.is_longer (0); |
1187 | else if (screen.tlen[row] == -1) |
|
|
1188 | screen.tlen[row] = TermWin.ncol; |
|
|
1189 | |
1101 | |
1190 | scr_gotorc (0, 0, R_RELATIVE); |
1102 | scr_gotorc (0, 0, R_RELATIVE); |
1191 | scr_insdel_chars (1, DELETE); |
1103 | scr_insdel_chars (1, DELETE); |
1192 | scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); |
1104 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1193 | } |
1105 | } |
1194 | } |
1106 | } |
1195 | #endif |
1107 | #endif |
1196 | |
1108 | |
1197 | /* ------------------------------------------------------------------------- */ |
1109 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1203 | { |
1115 | { |
1204 | want_refresh = 1; |
1116 | want_refresh = 1; |
1205 | ZERO_SCROLLBACK (); |
1117 | ZERO_SCROLLBACK (); |
1206 | |
1118 | |
1207 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1119 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1208 | MAX_IT (screen.cur.col, 0); |
1120 | clamp_it (screen.cur.col, 0, ncol - 1); |
1209 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
|
|
1210 | |
1121 | |
1211 | screen.flags &= ~Screen_WrapNext; |
1122 | screen.flags &= ~Screen_WrapNext; |
1212 | |
1123 | |
1213 | if (relative & R_RELATIVE) |
1124 | if (relative & R_RELATIVE) |
1214 | { |
1125 | { |
… | |
… | |
1232 | else |
1143 | else |
1233 | { |
1144 | { |
1234 | if (screen.flags & Screen_Relative) |
1145 | if (screen.flags & Screen_Relative) |
1235 | { /* relative origin mode */ |
1146 | { /* relative origin mode */ |
1236 | screen.cur.row = row + screen.tscroll; |
1147 | screen.cur.row = row + screen.tscroll; |
1237 | MIN_IT (screen.cur.row, screen.bscroll); |
1148 | min_it (screen.cur.row, screen.bscroll); |
1238 | } |
1149 | } |
1239 | else |
1150 | else |
1240 | screen.cur.row = row; |
1151 | screen.cur.row = row; |
1241 | } |
1152 | } |
1242 | |
1153 | |
1243 | MAX_IT (screen.cur.row, 0); |
1154 | clamp_it (screen.cur.row, 0, nrow - 1); |
1244 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
|
|
1245 | } |
1155 | } |
1246 | |
1156 | |
1247 | /* ------------------------------------------------------------------------- */ |
1157 | /* ------------------------------------------------------------------------- */ |
1248 | /* |
1158 | /* |
1249 | * direction should be UP or DN |
1159 | * direction should be UP or DN |
… | |
… | |
1260 | |
1170 | |
1261 | screen.flags &= ~Screen_WrapNext; |
1171 | screen.flags &= ~Screen_WrapNext; |
1262 | |
1172 | |
1263 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1173 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1264 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1174 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1265 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1175 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn); |
1266 | else |
1176 | else |
1267 | screen.cur.row += dirn; |
1177 | screen.cur.row += dirn; |
1268 | |
1178 | |
1269 | MAX_IT (screen.cur.row, 0); |
1179 | clamp_it (screen.cur.row, 0, nrow - 1); |
1270 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
|
|
1271 | selection_check (0); |
1180 | selection_check (0); |
1272 | } |
1181 | } |
1273 | |
1182 | |
1274 | /* ------------------------------------------------------------------------- */ |
1183 | /* ------------------------------------------------------------------------- */ |
1275 | /* |
1184 | /* |
… | |
… | |
1279 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1188 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1280 | */ |
1189 | */ |
1281 | void |
1190 | void |
1282 | rxvt_term::scr_erase_line (int mode) |
1191 | rxvt_term::scr_erase_line (int mode) |
1283 | { |
1192 | { |
1284 | unsigned int row, col, num; |
1193 | unsigned int col, num; |
1285 | |
1194 | |
1286 | want_refresh = 1; |
1195 | want_refresh = 1; |
1287 | ZERO_SCROLLBACK (); |
1196 | ZERO_SCROLLBACK (); |
1288 | |
1197 | |
1289 | selection_check (1); |
1198 | selection_check (1); |
1290 | |
1199 | |
1291 | row = TermWin.saveLines + screen.cur.row; |
1200 | line_t &line = ROW(screen.cur.row); |
|
|
1201 | |
|
|
1202 | line.touch (); |
|
|
1203 | line.is_longer (0); |
|
|
1204 | |
1292 | switch (mode) |
1205 | switch (mode) |
1293 | { |
1206 | { |
1294 | case 0: /* erase to end of line */ |
1207 | case 0: /* erase to end of line */ |
1295 | col = screen.cur.col; |
1208 | col = screen.cur.col; |
1296 | num = TermWin.ncol - col; |
1209 | num = ncol - col; |
1297 | MIN_IT (screen.tlen[row], (int16_t)col); |
1210 | min_it (line.l, col); |
1298 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1211 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1299 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1212 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1300 | CLEAR_SELECTION (); |
1213 | CLEAR_SELECTION (); |
1301 | break; |
1214 | break; |
1302 | case 1: /* erase to beginning of line */ |
1215 | case 1: /* erase to beginning of line */ |
… | |
… | |
1306 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1219 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1307 | CLEAR_SELECTION (); |
1220 | CLEAR_SELECTION (); |
1308 | break; |
1221 | break; |
1309 | case 2: /* erase whole line */ |
1222 | case 2: /* erase whole line */ |
1310 | col = 0; |
1223 | col = 0; |
1311 | num = TermWin.ncol; |
1224 | num = ncol; |
1312 | screen.tlen[row] = 0; |
1225 | line.l = 0; |
1313 | if (selection.beg.row <= screen.cur.row |
1226 | if (selection.beg.row <= screen.cur.row |
1314 | && selection.end.row >= screen.cur.row) |
1227 | && selection.end.row >= screen.cur.row) |
1315 | CLEAR_SELECTION (); |
1228 | CLEAR_SELECTION (); |
1316 | break; |
1229 | break; |
1317 | default: |
1230 | default: |
1318 | return; |
1231 | return; |
1319 | } |
1232 | } |
1320 | |
1233 | |
1321 | if (screen.text[row]) |
1234 | scr_blank_line (line, col, num, rstyle); |
1322 | scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle); |
|
|
1323 | else |
|
|
1324 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
|
|
1325 | } |
1235 | } |
1326 | |
1236 | |
1327 | /* ------------------------------------------------------------------------- */ |
1237 | /* ------------------------------------------------------------------------- */ |
1328 | /* |
1238 | /* |
1329 | * Erase part of whole of the screen |
1239 | * Erase part of whole of the screen |
… | |
… | |
1333 | */ |
1243 | */ |
1334 | void |
1244 | void |
1335 | rxvt_term::scr_erase_screen (int mode) |
1245 | rxvt_term::scr_erase_screen (int mode) |
1336 | { |
1246 | { |
1337 | int num; |
1247 | int num; |
1338 | int32_t row, row_offset; |
1248 | int32_t row; |
1339 | rend_t ren; |
1249 | rend_t ren; |
1340 | XGCValues gcvalue; |
1250 | XGCValues gcvalue; |
1341 | |
1251 | |
1342 | want_refresh = 1; |
1252 | want_refresh = 1; |
1343 | ZERO_SCROLLBACK (); |
1253 | ZERO_SCROLLBACK (); |
1344 | |
|
|
1345 | row_offset = (int32_t)TermWin.saveLines; |
|
|
1346 | |
1254 | |
1347 | switch (mode) |
1255 | switch (mode) |
1348 | { |
1256 | { |
1349 | case 0: /* erase to end of screen */ |
1257 | case 0: /* erase to end of screen */ |
1350 | selection_check (1); |
1258 | selection_check (1); |
1351 | scr_erase_line (0); |
1259 | scr_erase_line (0); |
1352 | row = screen.cur.row + 1; /* possible OOB */ |
1260 | row = screen.cur.row + 1; /* possible OOB */ |
1353 | num = TermWin.nrow - row; |
1261 | num = nrow - row; |
1354 | break; |
1262 | break; |
1355 | case 1: /* erase to beginning of screen */ |
1263 | case 1: /* erase to beginning of screen */ |
1356 | selection_check (3); |
1264 | selection_check (3); |
1357 | scr_erase_line (1); |
1265 | scr_erase_line (1); |
1358 | row = 0; |
1266 | row = 0; |
1359 | num = screen.cur.row; |
1267 | num = screen.cur.row; |
1360 | break; |
1268 | break; |
1361 | case 2: /* erase whole screen */ |
1269 | case 2: /* erase whole screen */ |
1362 | selection_check (3); |
1270 | selection_check (3); |
1363 | row = 0; |
1271 | row = 0; |
1364 | num = TermWin.nrow; |
1272 | num = nrow; |
1365 | break; |
1273 | break; |
1366 | default: |
1274 | default: |
1367 | return; |
1275 | return; |
1368 | } |
1276 | } |
1369 | |
1277 | |
… | |
… | |
1371 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1279 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1372 | || (selection.end.row >= row |
1280 | || (selection.end.row >= row |
1373 | && selection.end.row <= row + num))) |
1281 | && selection.end.row <= row + num))) |
1374 | CLEAR_SELECTION (); |
1282 | CLEAR_SELECTION (); |
1375 | |
1283 | |
1376 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1284 | if (row >= nrow) /* Out Of Bounds */ |
1377 | return; |
1285 | return; |
1378 | |
1286 | |
1379 | MIN_IT (num, (TermWin.nrow - row)); |
1287 | min_it (num, nrow - row); |
1380 | |
1288 | |
1381 | if (rstyle & (RS_RVid | RS_Uline)) |
1289 | if (rstyle & (RS_RVid | RS_Uline)) |
1382 | ren = (rend_t) ~RS_None; |
1290 | ren = (rend_t) ~RS_None; |
1383 | else if (GET_BASEBG (rstyle) == Color_bg) |
1291 | else if (GET_BASEBG (rstyle) == Color_bg) |
1384 | { |
1292 | { |
… | |
… | |
1386 | CLEAR_ROWS (row, num); |
1294 | CLEAR_ROWS (row, num); |
1387 | } |
1295 | } |
1388 | else |
1296 | else |
1389 | { |
1297 | { |
1390 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1298 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1391 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1299 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1392 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1300 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1393 | ERASE_ROWS (row, num); |
1301 | ERASE_ROWS (row, num); |
1394 | gcvalue.foreground = pix_colors[Color_fg]; |
1302 | gcvalue.foreground = pix_colors[Color_fg]; |
1395 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1303 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1396 | } |
1304 | } |
1397 | |
1305 | |
1398 | for (; num--; row++) |
1306 | for (; num--; row++) |
1399 | { |
1307 | { |
1400 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); |
1308 | line_t &l = ROW(row); |
1401 | screen.tlen[row + row_offset] = 0; |
1309 | l.l = 0; |
1402 | scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); |
1310 | l.is_longer (0); |
|
|
1311 | scr_blank_screen_mem (l, rstyle); |
|
|
1312 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1403 | } |
1313 | } |
1404 | } |
1314 | } |
1405 | |
1315 | |
1406 | #if ENABLE_FRILLS |
1316 | #if ENABLE_FRILLS |
1407 | void |
1317 | void |
1408 | rxvt_term::scr_erase_savelines () |
1318 | rxvt_term::scr_erase_savelines () |
1409 | { |
1319 | { |
1410 | want_refresh = 1; |
1320 | want_refresh = 1; |
1411 | ZERO_SCROLLBACK (); |
1321 | ZERO_SCROLLBACK (); |
1412 | |
1322 | |
1413 | TermWin.nscrolled = 0; |
1323 | nsaved = 0; |
1414 | } |
1324 | } |
1415 | #endif |
1325 | #endif |
1416 | |
1326 | |
1417 | /* ------------------------------------------------------------------------- */ |
1327 | /* ------------------------------------------------------------------------- */ |
1418 | /* |
1328 | /* |
… | |
… | |
1420 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1330 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1421 | */ |
1331 | */ |
1422 | void |
1332 | void |
1423 | rxvt_term::scr_E () |
1333 | rxvt_term::scr_E () |
1424 | { |
1334 | { |
1425 | int i, j, k; |
|
|
1426 | rend_t *r1, fs; |
1335 | rend_t fs; |
1427 | |
1336 | |
1428 | want_refresh = 1; |
1337 | want_refresh = 1; |
1429 | ZERO_SCROLLBACK (); |
1338 | ZERO_SCROLLBACK (); |
1430 | |
1339 | |
1431 | num_scr_allow = 0; |
1340 | num_scr_allow = 0; |
1432 | selection_check (3); |
1341 | selection_check (3); |
1433 | |
1342 | |
1434 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1343 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1435 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1344 | for (int row = nrow; row--; ) |
1436 | { |
1345 | { |
1437 | screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ |
1346 | line_t &line = ROW(row); |
|
|
1347 | |
1438 | fill_text (screen.text[k], 'E', TermWin.ncol); |
1348 | fill_text (line.t, 'E', ncol); |
1439 | for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) |
1349 | rend_t *r1 = line.r; |
|
|
1350 | |
|
|
1351 | for (int j = ncol; j--; ) |
1440 | *r1++ = fs; |
1352 | *r1++ = fs; |
|
|
1353 | |
|
|
1354 | line.is_longer (0); |
|
|
1355 | line.touch (ncol); |
1441 | } |
1356 | } |
1442 | } |
1357 | } |
1443 | |
1358 | |
1444 | /* ------------------------------------------------------------------------- */ |
1359 | /* ------------------------------------------------------------------------- */ |
1445 | /* |
1360 | /* |
… | |
… | |
1466 | count = end; |
1381 | count = end; |
1467 | } |
1382 | } |
1468 | |
1383 | |
1469 | scr_do_wrap (); |
1384 | scr_do_wrap (); |
1470 | |
1385 | |
1471 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); |
1386 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count); |
1472 | } |
1387 | } |
1473 | |
1388 | |
1474 | /* ------------------------------------------------------------------------- */ |
1389 | /* ------------------------------------------------------------------------- */ |
1475 | /* |
1390 | /* |
1476 | * Insert/Delete <count> characters from the current position |
1391 | * Insert/Delete <count> characters from the current position |
… | |
… | |
1478 | void |
1393 | void |
1479 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1394 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1480 | { |
1395 | { |
1481 | int col, row; |
1396 | int col, row; |
1482 | rend_t tr; |
1397 | rend_t tr; |
1483 | text_t *stp; |
|
|
1484 | rend_t *srp; |
|
|
1485 | int16_t *slp; |
|
|
1486 | |
1398 | |
1487 | want_refresh = 1; |
1399 | want_refresh = 1; |
1488 | ZERO_SCROLLBACK (); |
1400 | ZERO_SCROLLBACK (); |
1489 | |
1401 | |
1490 | if (count <= 0) |
1402 | if (count <= 0) |
1491 | return; |
1403 | return; |
1492 | |
1404 | |
1493 | scr_do_wrap (); |
1405 | scr_do_wrap (); |
1494 | |
1406 | |
1495 | selection_check (1); |
1407 | selection_check (1); |
1496 | MIN_IT (count, (TermWin.ncol - screen.cur.col)); |
1408 | min_it (count, ncol - screen.cur.col); |
1497 | |
1409 | |
1498 | row = screen.cur.row + TermWin.saveLines; |
|
|
1499 | |
|
|
1500 | stp = screen.text[row]; |
|
|
1501 | srp = screen.rend[row]; |
1410 | row = screen.cur.row; |
1502 | slp = &screen.tlen[row]; |
1411 | |
|
|
1412 | line_t *line = &ROW(row); |
|
|
1413 | |
|
|
1414 | line->touch (); |
|
|
1415 | line->is_longer (0); |
1503 | |
1416 | |
1504 | switch (insdel) |
1417 | switch (insdel) |
1505 | { |
1418 | { |
1506 | case INSERT: |
1419 | case INSERT: |
1507 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) |
1420 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1508 | { |
1421 | { |
1509 | stp[col] = stp[col - count]; |
1422 | line->t[col] = line->t[col - count]; |
1510 | srp[col] = srp[col - count]; |
1423 | line->r[col] = line->r[col - count]; |
1511 | } |
1424 | } |
1512 | |
1425 | |
1513 | if (*slp != -1) |
1426 | line->l = min (line->l + count, ncol); |
1514 | { |
|
|
1515 | *slp += count; |
|
|
1516 | MIN_IT (*slp, TermWin.ncol); |
|
|
1517 | } |
|
|
1518 | |
1427 | |
1519 | if (selection.op && current_screen == selection.screen |
1428 | if (selection.op && current_screen == selection.screen |
1520 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1429 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1521 | { |
1430 | { |
1522 | if (selection.end.row != screen.cur.row |
1431 | if (selection.end.row != screen.cur.row |
1523 | || (selection.end.col + count >= TermWin.ncol)) |
1432 | || (selection.end.col + count >= ncol)) |
1524 | CLEAR_SELECTION (); |
1433 | CLEAR_SELECTION (); |
1525 | else |
1434 | else |
1526 | { /* shift selection */ |
1435 | { /* shift selection */ |
1527 | selection.beg.col += count; |
1436 | selection.beg.col += count; |
1528 | selection.mark.col += count; /* XXX: yes? */ |
1437 | selection.mark.col += count; /* XXX: yes? */ |
1529 | selection.end.col += count; |
1438 | selection.end.col += count; |
1530 | } |
1439 | } |
1531 | } |
1440 | } |
1532 | |
1441 | |
1533 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1442 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1534 | (unsigned int)count, rstyle); |
|
|
1535 | break; |
1443 | break; |
1536 | |
1444 | |
1537 | case ERASE: |
1445 | case ERASE: |
1538 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1446 | screen.cur.col += count; /* don't worry if > ncol */ |
1539 | selection_check (1); |
1447 | selection_check (1); |
1540 | screen.cur.col -= count; |
1448 | screen.cur.col -= count; |
1541 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1449 | |
1542 | (unsigned int)count, rstyle); |
1450 | line->l = max (line->l - count, 0); |
|
|
1451 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1543 | break; |
1452 | break; |
1544 | |
1453 | |
1545 | case DELETE: |
1454 | case DELETE: |
1546 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1455 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1547 | |
1456 | |
1548 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1457 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1549 | { |
1458 | { |
1550 | stp[col] = stp[col + count]; |
1459 | line->t[col] = line->t[col + count]; |
1551 | srp[col] = srp[col + count]; |
1460 | line->r[col] = line->r[col + count]; |
1552 | } |
1461 | } |
1553 | |
1462 | |
1554 | scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], |
1463 | line->l = max (line->l - count, 0); |
1555 | (unsigned int)count, tr); |
1464 | scr_blank_line (*line, ncol - count, count, tr); |
1556 | |
|
|
1557 | if (*slp == -1) /* break line continuation */ |
|
|
1558 | *slp = TermWin.ncol; |
|
|
1559 | |
|
|
1560 | *slp -= count; |
|
|
1561 | MAX_IT (*slp, 0); |
|
|
1562 | |
1465 | |
1563 | if (selection.op && current_screen == selection.screen |
1466 | if (selection.op && current_screen == selection.screen |
1564 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1467 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1565 | { |
1468 | { |
1566 | if (selection.end.row != screen.cur.row |
1469 | if (selection.end.row != screen.cur.row |
1567 | || (screen.cur.col >= selection.beg.col - count) |
1470 | || (screen.cur.col >= selection.beg.col - count) |
1568 | || selection.end.col >= TermWin.ncol) |
1471 | || selection.end.col >= ncol) |
1569 | CLEAR_SELECTION (); |
1472 | CLEAR_SELECTION (); |
1570 | else |
1473 | else |
1571 | { |
1474 | { |
1572 | /* shift selection */ |
1475 | /* shift selection */ |
1573 | selection.beg.col -= count; |
1476 | selection.beg.col -= count; |
… | |
… | |
1586 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1489 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1587 | */ |
1490 | */ |
1588 | void |
1491 | void |
1589 | rxvt_term::scr_scroll_region (int top, int bot) |
1492 | rxvt_term::scr_scroll_region (int top, int bot) |
1590 | { |
1493 | { |
1591 | MAX_IT (top, 0); |
1494 | max_it (top, 0); |
1592 | MIN_IT (bot, (int)TermWin.nrow - 1); |
1495 | min_it (bot, nrow - 1); |
1593 | |
1496 | |
1594 | if (top > bot) |
1497 | if (top > bot) |
1595 | return; |
1498 | return; |
1596 | |
1499 | |
1597 | screen.tscroll = top; |
1500 | screen.tscroll = top; |
… | |
… | |
1676 | */ |
1579 | */ |
1677 | void |
1580 | void |
1678 | rxvt_term::scr_set_tab (int mode) |
1581 | rxvt_term::scr_set_tab (int mode) |
1679 | { |
1582 | { |
1680 | if (mode < 0) |
1583 | if (mode < 0) |
1681 | memset (tabs, 0, TermWin.ncol * sizeof (char)); |
1584 | memset (tabs, 0, ncol * sizeof (char)); |
1682 | else if (screen.cur.col < TermWin.ncol) |
1585 | else if (screen.cur.col < ncol) |
1683 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1586 | tabs [screen.cur.col] = !!mode; |
1684 | } |
1587 | } |
1685 | |
1588 | |
1686 | /* ------------------------------------------------------------------------- */ |
1589 | /* ------------------------------------------------------------------------- */ |
1687 | /* |
1590 | /* |
1688 | * Set reverse/normal video |
1591 | * Set reverse/normal video |
… | |
… | |
1695 | XGCValues gcvalue; |
1598 | XGCValues gcvalue; |
1696 | |
1599 | |
1697 | if (rvideo != mode) |
1600 | if (rvideo != mode) |
1698 | { |
1601 | { |
1699 | rvideo = mode; |
1602 | rvideo = mode; |
1700 | SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); |
1603 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1701 | #if XPM_BACKGROUND |
1604 | #if XPM_BACKGROUND |
1702 | if (bgPixmap.pixmap == None) |
1605 | if (bgPixmap.pixmap == None) |
1703 | #endif |
1606 | #endif |
1704 | #if TRANSPARENT |
1607 | #if TRANSPARENT |
1705 | if (! (options & Opt_transparent) || am_transparent == 0) |
1608 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
1706 | #endif |
1609 | #endif |
1707 | XSetWindowBackground (display->display, TermWin.vt, |
1610 | XSetWindowBackground (display->display, vt, |
1708 | pix_colors[Color_bg]); |
1611 | pix_colors[Color_bg]); |
1709 | |
1612 | |
1710 | gcvalue.foreground = pix_colors[Color_fg]; |
1613 | gcvalue.foreground = pix_colors[Color_fg]; |
1711 | gcvalue.background = pix_colors[Color_bg]; |
1614 | gcvalue.background = pix_colors[Color_bg]; |
1712 | XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, |
1615 | XChangeGC (display->display, gc, GCBackground | GCForeground, |
1713 | &gcvalue); |
1616 | &gcvalue); |
1714 | scr_clear (); |
1617 | scr_clear (); |
1715 | scr_touch (true); |
1618 | scr_touch (true); |
1716 | } |
1619 | } |
1717 | } |
1620 | } |
… | |
… | |
1735 | * Set font style |
1638 | * Set font style |
1736 | */ |
1639 | */ |
1737 | void |
1640 | void |
1738 | rxvt_term::set_font_style () |
1641 | rxvt_term::set_font_style () |
1739 | { |
1642 | { |
|
|
1643 | #if 0 |
1740 | switch (charsets[screen.charset]) |
1644 | switch (charsets [screen.charset]) |
1741 | { |
1645 | { |
1742 | case '0': /* DEC Special Character & Line Drawing Set */ |
1646 | case '0': /* DEC Special Character & Line Drawing Set */ |
1743 | break; |
1647 | break; |
1744 | case 'A': /* United Kingdom (UK) */ |
1648 | case 'A': /* United Kingdom (UK) */ |
1745 | break; |
1649 | break; |
… | |
… | |
1752 | case 'C': /* Finnish character set */ |
1656 | case 'C': /* Finnish character set */ |
1753 | break; |
1657 | break; |
1754 | case 'K': /* German character set */ |
1658 | case 'K': /* German character set */ |
1755 | break; |
1659 | break; |
1756 | } |
1660 | } |
|
|
1661 | #endif |
1757 | } |
1662 | } |
1758 | |
1663 | |
1759 | /* ------------------------------------------------------------------------- */ |
1664 | /* ------------------------------------------------------------------------- */ |
1760 | /* |
1665 | /* |
1761 | * Choose a font |
1666 | * Choose a font |
… | |
… | |
1798 | bool |
1703 | bool |
1799 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1704 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1800 | { |
1705 | { |
1801 | bool found = false; |
1706 | bool found = false; |
1802 | |
1707 | |
1803 | for (int i = 0; i < TermWin.nrow; i++) |
1708 | for (int i = 0; i < nrow; i++) |
1804 | { |
1709 | { |
1805 | int col = 0; |
1710 | int col = 0; |
1806 | rend_t *drp = drawn_rend [i]; |
1711 | rend_t *drp = drawn_buf[i].r; |
1807 | |
1712 | |
1808 | for (; col < TermWin.ncol; col++, drp++) |
1713 | for (; col < ncol; col++, drp++) |
1809 | if ((*drp & mask) == value) |
1714 | if ((*drp & mask) == value) |
1810 | { |
1715 | { |
1811 | found = true; |
1716 | found = true; |
1812 | *drp = ~value; |
1717 | *drp = ~value; |
1813 | } |
1718 | } |
… | |
… | |
1824 | PART_END, |
1729 | PART_END, |
1825 | RC_COUNT |
1730 | RC_COUNT |
1826 | }; |
1731 | }; |
1827 | |
1732 | |
1828 | void |
1733 | void |
1829 | rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) |
1734 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1830 | { |
1735 | { |
1831 | int i; |
1736 | int i; |
1832 | row_col_t rc[RC_COUNT]; |
1737 | row_col_t rc[RC_COUNT]; |
1833 | |
1738 | |
1834 | if (drawn_text == NULL) /* sanity check */ |
1739 | if (!drawn_buf) /* sanity check */ |
1835 | return; |
1740 | return; |
1836 | |
1741 | |
1837 | #ifndef NO_SLOW_LINK_SUPPORT |
1742 | #ifndef NO_SLOW_LINK_SUPPORT |
1838 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1743 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1839 | { |
1744 | { |
1840 | y = 0; |
1745 | y = 0; |
1841 | height = TermWin.height; |
1746 | eheight = height; |
1842 | } |
1747 | } |
1843 | #endif |
|
|
1844 | |
|
|
1845 | #ifdef DEBUG_STRICT |
|
|
1846 | x = max (x, 0); |
|
|
1847 | x = min (x, (int)TermWin.width); |
|
|
1848 | y = max (y, 0); |
|
|
1849 | y = min (y, (int)TermWin.height); |
|
|
1850 | #endif |
1748 | #endif |
1851 | |
1749 | |
1852 | /* round down */ |
1750 | /* round down */ |
1853 | rc[PART_BEG].col = Pixel2Col (x); |
1751 | rc[PART_BEG].col = Pixel2Col (x); |
1854 | rc[PART_BEG].row = Pixel2Row (y); |
1752 | rc[PART_BEG].row = Pixel2Row (y); |
1855 | /* round up */ |
1753 | /* round up */ |
1856 | rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); |
1754 | rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1); |
1857 | rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); |
1755 | rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); |
1858 | |
1756 | |
1859 | /* sanity checks */ |
1757 | /* sanity checks */ |
1860 | for (i = PART_BEG; i < RC_COUNT; i++) |
1758 | for (i = PART_BEG; i < RC_COUNT; i++) |
1861 | { |
1759 | { |
1862 | MIN_IT (rc[i].col, TermWin.ncol - 1); |
1760 | min_it (rc[i].col, ncol - 1); |
1863 | MIN_IT (rc[i].row, TermWin.nrow - 1); |
1761 | min_it (rc[i].row, nrow - 1); |
1864 | } |
1762 | } |
1865 | |
1763 | |
1866 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1764 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1867 | fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1765 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1868 | |
1766 | |
1869 | if (refresh) |
1767 | if (refresh) |
1870 | scr_refresh (SLOW_REFRESH); |
1768 | scr_refresh (SLOW_REFRESH); |
1871 | } |
1769 | } |
1872 | |
1770 | |
… | |
… | |
1875 | * Refresh the entire screen |
1773 | * Refresh the entire screen |
1876 | */ |
1774 | */ |
1877 | void |
1775 | void |
1878 | rxvt_term::scr_touch (bool refresh) |
1776 | rxvt_term::scr_touch (bool refresh) |
1879 | { |
1777 | { |
1880 | scr_expose (0, 0, TermWin.width, TermWin.height, refresh); |
1778 | scr_expose (0, 0, width, height, refresh); |
1881 | } |
1779 | } |
1882 | |
1780 | |
1883 | /* ------------------------------------------------------------------------- */ |
1781 | /* ------------------------------------------------------------------------- */ |
1884 | /* |
1782 | /* |
1885 | * Move the display so that the line represented by scrollbar value Y is at |
1783 | * Move the display so that the line represented by scrollbar value Y is at |
… | |
… | |
1889 | rxvt_term::scr_move_to (int y, int len) |
1787 | rxvt_term::scr_move_to (int y, int len) |
1890 | { |
1788 | { |
1891 | long p = 0; |
1789 | long p = 0; |
1892 | unsigned int oldviewstart; |
1790 | unsigned int oldviewstart; |
1893 | |
1791 | |
1894 | oldviewstart = TermWin.view_start; |
1792 | oldviewstart = view_start; |
1895 | |
1793 | |
1896 | if (y < len) |
1794 | if (y < len) |
1897 | { |
1795 | { |
1898 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1796 | p = (nrow + nsaved) * (len - y) / len; |
1899 | p -= (long) (TermWin.nrow - 1); |
1797 | p -= (long) (nrow - 1); |
1900 | p = max (p, 0); |
1798 | p = max (p, 0); |
1901 | } |
1799 | } |
1902 | |
1800 | |
1903 | TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); |
1801 | view_start = (unsigned int)min (p, nsaved); |
1904 | |
1802 | |
1905 | return scr_changeview (oldviewstart); |
1803 | return scr_changeview (oldviewstart); |
1906 | } |
1804 | } |
1907 | |
1805 | |
1908 | /* ------------------------------------------------------------------------- */ |
1806 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1914 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1812 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1915 | { |
1813 | { |
1916 | int n; |
1814 | int n; |
1917 | unsigned int oldviewstart; |
1815 | unsigned int oldviewstart; |
1918 | |
1816 | |
1919 | oldviewstart = TermWin.view_start; |
1817 | oldviewstart = view_start; |
1920 | |
1818 | |
1921 | if (direction == UP) |
1819 | if (direction == UP) |
1922 | { |
1820 | { |
1923 | n = TermWin.view_start + nlines; |
1821 | n = view_start + nlines; |
1924 | TermWin.view_start = min (n, TermWin.nscrolled); |
1822 | view_start = min (n, nsaved); |
1925 | } |
1823 | } |
1926 | else |
1824 | else |
1927 | { |
1825 | { |
1928 | n = TermWin.view_start - nlines; |
1826 | n = view_start - nlines; |
1929 | TermWin.view_start = max (n, 0); |
1827 | view_start = max (n, 0); |
1930 | } |
1828 | } |
1931 | |
1829 | |
1932 | return scr_changeview (oldviewstart); |
1830 | return scr_changeview (oldviewstart); |
1933 | } |
1831 | } |
1934 | |
1832 | |
1935 | int |
1833 | int |
1936 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1834 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1937 | { |
1835 | { |
1938 | if (TermWin.view_start != oldviewstart) |
1836 | if (view_start != oldviewstart) |
1939 | { |
1837 | { |
|
|
1838 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
|
|
1839 | |
1940 | want_refresh = 1; |
1840 | want_refresh = 1; |
1941 | num_scr -= (TermWin.view_start - oldviewstart); |
1841 | num_scr -= (view_start - oldviewstart); |
1942 | } |
1842 | } |
1943 | |
1843 | |
1944 | return (int) (TermWin.view_start - oldviewstart); |
1844 | return (int)view_start - (int)oldviewstart; |
1945 | } |
1845 | } |
1946 | |
1846 | |
1947 | /* ------------------------------------------------------------------------- */ |
1847 | /* ------------------------------------------------------------------------- */ |
1948 | void |
1848 | void |
1949 | rxvt_term::scr_bell () |
1849 | rxvt_term::scr_bell () |
1950 | { |
1850 | { |
1951 | #ifndef NO_BELL |
1851 | #ifndef NO_BELL |
1952 | |
1852 | |
1953 | # ifndef NO_MAPALERT |
1853 | # ifndef NO_MAPALERT |
1954 | # ifdef MAPALERT_OPTION |
1854 | # ifdef MAPALERT_OPTION |
1955 | if (options & Opt_mapAlert) |
1855 | if (OPTION (Opt_mapAlert)) |
1956 | # endif |
1856 | # endif |
1957 | XMapWindow (display->display, TermWin.parent[0]); |
1857 | XMapWindow (display->display, parent[0]); |
1958 | # endif |
1858 | # endif |
1959 | |
1859 | |
1960 | if (options & Opt_visualBell) |
1860 | if (OPTION (Opt_visualBell)) |
1961 | { |
1861 | { |
1962 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1862 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1963 | rxvt_usleep (VISUAL_BELL_DURATION); |
1863 | rxvt_usleep (VISUAL_BELL_DURATION); |
1964 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1864 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1965 | } |
1865 | } |
… | |
… | |
1973 | /* ARGSUSED */ |
1873 | /* ARGSUSED */ |
1974 | void |
1874 | void |
1975 | rxvt_term::scr_printscreen (int fullhist) |
1875 | rxvt_term::scr_printscreen (int fullhist) |
1976 | { |
1876 | { |
1977 | #ifdef PRINTPIPE |
1877 | #ifdef PRINTPIPE |
1978 | int i, r1, nrows, row_offset; |
1878 | int nrows, row_start; |
1979 | FILE *fd; |
1879 | FILE *fd; |
1980 | |
1880 | |
1981 | if ((fd = popen_printer ()) == NULL) |
1881 | if ((fd = popen_printer ()) == NULL) |
1982 | return; |
1882 | return; |
1983 | |
1883 | |
1984 | nrows = TermWin.nrow; |
|
|
1985 | row_offset = TermWin.saveLines; |
|
|
1986 | |
|
|
1987 | if (!fullhist) |
1884 | if (fullhist) |
1988 | row_offset -= TermWin.view_start; |
1885 | { |
|
|
1886 | nrows = nrow + nsaved; |
|
|
1887 | row_start = -nsaved; |
|
|
1888 | } |
1989 | else |
1889 | else |
1990 | { |
1890 | { |
1991 | nrows += TermWin.nscrolled; |
1891 | nrows = nrow; |
1992 | row_offset -= TermWin.nscrolled; |
1892 | row_start = -view_start; |
1993 | } |
1893 | } |
1994 | |
1894 | |
1995 | wctomb (0, 0); |
1895 | wctomb (0, 0); |
1996 | |
1896 | |
1997 | for (r1 = 0; r1 < nrows; r1++) |
1897 | for (int r1 = 0; r1 < nrows; r1++) |
1998 | { |
1898 | { |
1999 | text_t *tp = screen.text[r1 + row_offset]; |
1899 | text_t *tp = ROW(r1).t; |
2000 | int len = screen.tlen[r1 + row_offset]; |
1900 | int len = ROW(r1).l; |
2001 | |
1901 | |
2002 | for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) |
1902 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
2003 | { |
1903 | { |
2004 | char mb[MB_LEN_MAX]; |
1904 | char mb[MB_LEN_MAX]; |
2005 | text_t t = *tp++; |
1905 | text_t t = *tp++; |
2006 | if (t == NOCHAR) |
1906 | if (t == NOCHAR) |
2007 | continue; |
1907 | continue; |
… | |
… | |
2035 | { |
1935 | { |
2036 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1936 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
2037 | showcursor; /* show the cursor */ |
1937 | showcursor; /* show the cursor */ |
2038 | int16_t col, row, /* column/row we're processing */ |
1938 | int16_t col, row, /* column/row we're processing */ |
2039 | ocrow; /* old cursor row */ |
1939 | ocrow; /* old cursor row */ |
2040 | int i, /* tmp */ |
1940 | int i; /* tmp */ |
2041 | row_offset; /* basic offset in screen structure */ |
|
|
2042 | #ifndef NO_CURSORCOLOR |
1941 | #ifndef NO_CURSORCOLOR |
2043 | rend_t cc1; /* store colours at cursor position (s) */ |
1942 | rend_t cc1; /* store colours at cursor position (s) */ |
2044 | #endif |
1943 | #endif |
2045 | rend_t *crp; // cursor rendition pointer |
1944 | rend_t *crp; // cursor rendition pointer |
2046 | |
1945 | |
2047 | want_refresh = 0; /* screen is current */ |
1946 | want_refresh = 0; /* screen is current */ |
2048 | |
1947 | |
2049 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
1948 | if (refresh_type == NO_REFRESH || !mapped) |
2050 | return; |
1949 | return; |
2051 | |
1950 | |
2052 | /* |
1951 | /* |
2053 | * A: set up vars |
1952 | * A: set up vars |
2054 | */ |
1953 | */ |
2055 | must_clear = 0; |
1954 | must_clear = 0; |
2056 | refresh_count = 0; |
1955 | refresh_count = 0; |
2057 | |
1956 | |
2058 | row_offset = TermWin.saveLines - TermWin.view_start; |
|
|
2059 | |
|
|
2060 | #if XPM_BACKGROUND |
1957 | #if XPM_BACKGROUND |
2061 | must_clear |= bgPixmap.pixmap != None; |
1958 | must_clear |= bgPixmap.pixmap != None; |
2062 | #endif |
1959 | #endif |
2063 | #if TRANSPARENT |
1960 | #if TRANSPARENT |
2064 | must_clear |= (options & Opt_transparent) && am_transparent; |
1961 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
2065 | #endif |
1962 | #endif |
2066 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1963 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2067 | |
1964 | |
2068 | /* |
1965 | /* |
2069 | * B: reverse any characters which are selected |
1966 | * B: reverse any characters which are selected |
… | |
… | |
2086 | |
1983 | |
2087 | if (showcursor) |
1984 | if (showcursor) |
2088 | { |
1985 | { |
2089 | int col = screen.cur.col; |
1986 | int col = screen.cur.col; |
2090 | |
1987 | |
2091 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
1988 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2092 | col--; |
1989 | col--; |
2093 | |
1990 | |
2094 | crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; |
1991 | crp = &ROW(screen.cur.row).r[col]; |
2095 | |
1992 | |
2096 | if (showcursor && TermWin.focus) |
1993 | if (showcursor && focus) |
2097 | { |
1994 | { |
2098 | if (options & Opt_cursorUnderline) |
1995 | if (OPTION (Opt_cursorUnderline)) |
2099 | *crp ^= RS_Uline; |
1996 | *crp ^= RS_Uline; |
2100 | else |
1997 | else |
2101 | { |
1998 | { |
2102 | *crp ^= RS_RVid; |
1999 | *crp ^= RS_RVid; |
2103 | |
2000 | |
… | |
… | |
2105 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2002 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2106 | if (ISSET_PIXCOLOR (Color_cursor)) |
2003 | if (ISSET_PIXCOLOR (Color_cursor)) |
2107 | ccol1 = Color_cursor; |
2004 | ccol1 = Color_cursor; |
2108 | else |
2005 | else |
2109 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2006 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2110 | ccol1 = GET_FGCOLOR (rstyle); |
2007 | ccol1 = fgcolor_of (rstyle); |
2111 | #else |
2008 | #else |
2112 | ccol1 = Color_fg; |
2009 | ccol1 = Color_fg; |
2113 | #endif |
2010 | #endif |
2114 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2011 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2115 | ccol2 = Color_cursor2; |
2012 | ccol2 = Color_cursor2; |
2116 | else |
2013 | else |
2117 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2014 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2118 | ccol2 = GET_BGCOLOR (rstyle); |
2015 | ccol2 = bgcolor_of (rstyle); |
2119 | #else |
2016 | #else |
2120 | ccol2 = Color_bg; |
2017 | ccol2 = Color_bg; |
2121 | #endif |
2018 | #endif |
2122 | *crp = SET_FGCOLOR (*crp, ccol1); |
2019 | *crp = SET_FGCOLOR (*crp, ccol1); |
2123 | *crp = SET_BGCOLOR (*crp, ccol2); |
2020 | *crp = SET_BGCOLOR (*crp, ccol2); |
… | |
… | |
2128 | |
2025 | |
2129 | /* make sure no outline cursor is left around */ |
2026 | /* make sure no outline cursor is left around */ |
2130 | setoldcursor = 0; |
2027 | setoldcursor = 0; |
2131 | if (ocrow != -1) |
2028 | if (ocrow != -1) |
2132 | { |
2029 | { |
2133 | if (screen.cur.row + TermWin.view_start != ocrow |
2030 | if (screen.cur.row + view_start != ocrow |
2134 | || screen.cur.col != oldcursor.col) |
2031 | || screen.cur.col != oldcursor.col) |
2135 | { |
2032 | { |
2136 | if (ocrow < TermWin.nrow |
2033 | if (ocrow < nrow |
2137 | && oldcursor.col < TermWin.ncol) |
2034 | && oldcursor.col < ncol) |
2138 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
2035 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2139 | |
2036 | |
2140 | if (TermWin.focus || !showcursor) |
2037 | if (focus || !showcursor) |
2141 | oldcursor.row = -1; |
2038 | oldcursor.row = -1; |
2142 | else |
2039 | else |
2143 | setoldcursor = 1; |
2040 | setoldcursor = 1; |
2144 | } |
2041 | } |
2145 | } |
2042 | } |
2146 | else if (!TermWin.focus) |
2043 | else if (!focus) |
2147 | setoldcursor = 1; |
2044 | setoldcursor = 1; |
2148 | |
2045 | |
2149 | if (setoldcursor) |
2046 | if (setoldcursor) |
2150 | { |
2047 | { |
2151 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
2048 | if (screen.cur.row + view_start >= nrow) |
2152 | oldcursor.row = -1; |
2049 | oldcursor.row = -1; |
2153 | else |
2050 | else |
2154 | { |
2051 | { |
2155 | oldcursor.row = screen.cur.row + TermWin.view_start; |
2052 | oldcursor.row = screen.cur.row + view_start; |
2156 | oldcursor.col = screen.cur.col; |
2053 | oldcursor.col = screen.cur.col; |
2157 | } |
2054 | } |
2158 | } |
2055 | } |
2159 | } |
2056 | } |
2160 | |
2057 | |
|
|
2058 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2161 | #if ENABLE_OVERLAY |
2059 | #if ENABLE_OVERLAY |
2162 | scr_swap_overlay (); |
2060 | scr_swap_overlay (); |
2163 | #endif |
2061 | #endif |
2164 | |
2062 | |
2165 | #ifndef NO_SLOW_LINK_SUPPORT |
2063 | #ifndef NO_SLOW_LINK_SUPPORT |
… | |
… | |
2167 | * D: CopyArea pass - very useful for slower links |
2065 | * D: CopyArea pass - very useful for slower links |
2168 | * This has been deliberately kept simple. |
2066 | * This has been deliberately kept simple. |
2169 | */ |
2067 | */ |
2170 | i = num_scr; |
2068 | i = num_scr; |
2171 | if (!display->is_local |
2069 | if (!display->is_local |
2172 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2070 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2173 | && abs (i) < TermWin.nrow && !must_clear) |
2071 | && abs (num_scr) < nrow && !must_clear) |
2174 | { |
2072 | { |
2175 | int16_t nits; |
2073 | int16_t nits; |
2176 | int j; |
2074 | int j; |
2177 | int len, wlen; |
2075 | int len, wlen; |
2178 | |
2076 | |
2179 | j = TermWin.nrow; |
2077 | j = nrow; |
2180 | wlen = len = -1; |
2078 | wlen = len = -1; |
2181 | row = i > 0 ? 0 : j - 1; |
2079 | row = i > 0 ? 0 : j - 1; |
2182 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2080 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2183 | { |
2081 | { |
2184 | if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) |
2082 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2185 | { |
2083 | { |
2186 | text_t *stp = screen.text[row + row_offset]; |
2084 | line_t s = ROW(row - view_start); |
2187 | rend_t *srp = screen.rend[row + row_offset]; |
|
|
2188 | text_t *dtp = drawn_text[row]; |
2085 | line_t d = drawn_buf[row]; |
2189 | text_t *dtp2 = drawn_text[row + i]; |
2086 | line_t d2 = drawn_buf[row + i]; |
2190 | rend_t *drp = drawn_rend[row]; |
|
|
2191 | rend_t *drp2 = drawn_rend[row + i]; |
|
|
2192 | |
2087 | |
2193 | for (nits = 0, col = TermWin.ncol; col--; ) |
2088 | for (nits = 0, col = ncol; col--; ) |
2194 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2089 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2195 | nits--; |
2090 | nits--; |
2196 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
2091 | else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) |
2197 | nits++; |
2092 | nits++; |
2198 | |
2093 | |
2199 | if (nits > 8) /* XXX: arbitrary choice */ |
2094 | if (nits > 8) /* XXX: arbitrary choice */ |
2200 | { |
2095 | { |
2201 | for (col = TermWin.ncol; col--; ) |
2096 | for (col = ncol; col--; ) |
2202 | { |
2097 | { |
2203 | *dtp++ = *dtp2++; |
2098 | *d.t++ = *d2.t++; |
2204 | *drp++ = *drp2++; |
2099 | *d.r++ = *d2.r++; |
2205 | } |
2100 | } |
2206 | |
2101 | |
2207 | if (len == -1) |
2102 | if (len == -1) |
2208 | len = row; |
2103 | len = row; |
2209 | |
2104 | |
… | |
… | |
2214 | |
2109 | |
2215 | if (len != -1) |
2110 | if (len != -1) |
2216 | { |
2111 | { |
2217 | /* also comes here at end if needed because of >= above */ |
2112 | /* also comes here at end if needed because of >= above */ |
2218 | if (wlen < len) |
2113 | if (wlen < len) |
2219 | SWAP_IT (wlen, len, int); |
2114 | ::swap (wlen, len); |
2220 | |
2115 | |
2221 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2116 | XCopyArea (display->display, vt, vt, |
2222 | TermWin.gc, 0, Row2Pixel (len + i), |
2117 | gc, 0, Row2Pixel (len + i), |
2223 | (unsigned int)TermWin_TotalWidth (), |
2118 | (unsigned int)this->width, |
2224 | (unsigned int)Height2Pixel (wlen - len + 1), |
2119 | (unsigned int)Height2Pixel (wlen - len + 1), |
2225 | 0, Row2Pixel (len)); |
2120 | 0, Row2Pixel (len)); |
2226 | len = -1; |
2121 | len = -1; |
2227 | } |
2122 | } |
2228 | } |
2123 | } |
… | |
… | |
2230 | #endif |
2125 | #endif |
2231 | |
2126 | |
2232 | /* |
2127 | /* |
2233 | * E: main pass across every character |
2128 | * E: main pass across every character |
2234 | */ |
2129 | */ |
2235 | for (row = 0; row < TermWin.nrow; row++) |
2130 | for (row = 0; row < nrow; row++) |
2236 | { |
2131 | { |
2237 | text_t *stp = screen.text[row + row_offset]; |
2132 | text_t *stp = ROW(row - view_start).t; |
2238 | rend_t *srp = screen.rend[row + row_offset]; |
2133 | rend_t *srp = ROW(row - view_start).r; |
2239 | text_t *dtp = drawn_text[row]; |
2134 | text_t *dtp = drawn_buf[row].t; |
2240 | rend_t *drp = drawn_rend[row]; |
2135 | rend_t *drp = drawn_buf[row].r; |
2241 | |
2136 | |
2242 | /* |
2137 | /* |
2243 | * E2: OK, now the real pass |
2138 | * E2: OK, now the real pass |
2244 | */ |
2139 | */ |
2245 | int ypixel = (int)Row2Pixel (row); |
2140 | int ypixel = (int)Row2Pixel (row); |
2246 | |
2141 | |
2247 | for (col = 0; col < TermWin.ncol; col++) |
2142 | for (col = 0; col < ncol; col++) |
2248 | { |
2143 | { |
2249 | /* compare new text with old - if exactly the same then continue */ |
2144 | /* compare new text with old - if exactly the same then continue */ |
2250 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2145 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2251 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
2146 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
2252 | || (stp[col] == ' ' /* space w/ no background change */ |
2147 | || (stp[col] == ' ' /* space w/ no background change */ |
… | |
… | |
2266 | dtp[col] = stp[col]; |
2161 | dtp[col] = stp[col]; |
2267 | drp[col] = rend; |
2162 | drp[col] = rend; |
2268 | |
2163 | |
2269 | int xpixel = Col2Pixel (col); |
2164 | int xpixel = Col2Pixel (col); |
2270 | |
2165 | |
2271 | for (i = 0; ++col < TermWin.ncol; ) |
2166 | for (i = 0; ++col < ncol; ) |
2272 | { |
2167 | { |
2273 | if (stp[col] == NOCHAR) |
2168 | if (stp[col] == NOCHAR) |
2274 | { |
2169 | { |
2275 | dtp[col] = stp[col]; |
2170 | dtp[col] = stp[col]; |
2276 | drp[col] = rend; |
2171 | drp[col] = rend; |
… | |
… | |
2307 | count++, i--; |
2202 | count++, i--; |
2308 | |
2203 | |
2309 | /* |
2204 | /* |
2310 | * Determine the attributes for the string |
2205 | * Determine the attributes for the string |
2311 | */ |
2206 | */ |
2312 | int fore = GET_FGCOLOR (rend); // desired foreground |
2207 | int fore = fgcolor_of (rend); // desired foreground |
2313 | int back = GET_BGCOLOR (rend); // desired background |
2208 | int back = bgcolor_of (rend); // desired background |
2314 | |
2209 | |
2315 | // only do special processing if any attributes are set, which is rare |
2210 | // only do special processing if any attributes are set, which is unlikely |
2316 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2211 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2317 | { |
2212 | { |
2318 | #if ENABLE_STYLES |
2213 | #if ENABLE_STYLES |
2319 | // force redraw after "careful" characters to avoid pixel droppings |
2214 | // force redraw after "careful" characters to avoid pixel droppings |
2320 | if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) |
2215 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
2321 | drp[col + 1] = ~srp[col + 1]; |
2216 | drp[col + 1] = ~srp[col + 1]; |
2322 | |
2217 | |
2323 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2218 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2324 | while (text > stp |
2219 | while (text > stp |
2325 | && srp[text - stp - 1] & RS_Careful |
2220 | && srp[text - stp - 1] & RS_Careful |
2326 | && RS_SAME (rend, srp[text - stp - 1])) |
2221 | && RS_SAME (rend, srp[text - stp - 1])) |
2327 | text--, count++, xpixel -= TermWin.fwidth; |
2222 | text--, count++, xpixel -= fwidth; |
2328 | #endif |
2223 | #endif |
2329 | |
2224 | |
2330 | bool invert = rend & RS_RVid; |
2225 | bool invert = rend & RS_RVid; |
2331 | |
2226 | |
2332 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2227 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
… | |
… | |
2356 | fore = Color_UL; |
2251 | fore = Color_UL; |
2357 | #endif |
2252 | #endif |
2358 | |
2253 | |
2359 | if (invert) |
2254 | if (invert) |
2360 | { |
2255 | { |
2361 | SWAP_IT (fore, back, int); |
2256 | ::swap (fore, back); |
2362 | |
2257 | |
2363 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2258 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2364 | if (ISSET_PIXCOLOR (Color_RV)) |
2259 | if (ISSET_PIXCOLOR (Color_RV)) |
2365 | back = Color_RV; |
2260 | back = Color_RV; |
2366 | |
2261 | |
… | |
… | |
2387 | } |
2282 | } |
2388 | |
2283 | |
2389 | /* |
2284 | /* |
2390 | * Actually do the drawing of the string here |
2285 | * Actually do the drawing of the string here |
2391 | */ |
2286 | */ |
2392 | rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2287 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2393 | |
2288 | |
2394 | if (back == fore) |
2289 | if (back == fore) |
2395 | font->clear_rect (*TermWin.drawable, xpixel, ypixel, |
2290 | font->clear_rect (*drawable, xpixel, ypixel, |
2396 | TermWin.fwidth * count, TermWin.fheight, |
2291 | fwidth * count, fheight, |
2397 | back); |
2292 | back); |
2398 | else if (back == Color_bg) |
2293 | else if (back == Color_bg) |
2399 | { |
2294 | { |
2400 | if (must_clear) |
2295 | if (must_clear) |
2401 | { |
2296 | { |
2402 | CLEAR_CHARS (xpixel, ypixel, count); |
2297 | CLEAR_CHARS (xpixel, ypixel, count); |
2403 | |
2298 | |
2404 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2299 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2405 | if (text[i] != ' ') |
2300 | if (text[i] != ' ') |
2406 | { |
2301 | { |
2407 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); |
2302 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2408 | break; |
2303 | break; |
2409 | } |
2304 | } |
2410 | } |
2305 | } |
2411 | else |
2306 | else |
2412 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2307 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2413 | } |
2308 | } |
2414 | else |
2309 | else |
2415 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2310 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2416 | |
2311 | |
2417 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2312 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2418 | { |
2313 | { |
2419 | #if ENABLE_FRILLS |
2314 | #if ENABLE_FRILLS |
2420 | if (ISSET_PIXCOLOR (Color_underline)) |
2315 | if (ISSET_PIXCOLOR (Color_underline)) |
2421 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); |
2316 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2422 | else |
2317 | else |
2423 | #endif |
2318 | #endif |
2424 | XSetForeground (display->display, TermWin.gc, pix_colors[fore]); |
2319 | XSetForeground (display->display, gc, pix_colors[fore]); |
2425 | |
2320 | |
2426 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2321 | XDrawLine (display->display, drawBuffer, gc, |
2427 | xpixel, ypixel + font->ascent + 1, |
2322 | xpixel, ypixel + font->ascent + 1, |
2428 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2323 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2429 | } |
2324 | } |
2430 | } /* for (col....) */ |
2325 | } /* for (col....) */ |
2431 | } /* for (row....) */ |
2326 | } /* for (row....) */ |
2432 | |
2327 | |
2433 | #if ENABLE_OVERLAY |
2328 | #if ENABLE_OVERLAY |
2434 | scr_swap_overlay (); |
2329 | scr_swap_overlay (); |
2435 | #endif |
2330 | #endif |
|
|
2331 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
2436 | |
2332 | |
2437 | /* |
2333 | /* |
2438 | * G: cleanup cursor and display outline cursor if necessary |
2334 | * G: cleanup cursor and display outline cursor if necessary |
2439 | */ |
2335 | */ |
2440 | if (showcursor) |
2336 | if (showcursor) |
2441 | { |
2337 | { |
2442 | if (TermWin.focus) |
2338 | if (focus) |
2443 | { |
2339 | { |
2444 | if (options & Opt_cursorUnderline) |
2340 | if (OPTION (Opt_cursorUnderline)) |
2445 | *crp ^= RS_Uline; |
2341 | *crp ^= RS_Uline; |
2446 | else |
2342 | else |
2447 | { |
2343 | { |
2448 | *crp ^= RS_RVid; |
2344 | *crp ^= RS_RVid; |
2449 | #ifndef NO_CURSORCOLOR |
2345 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2454 | else if (oldcursor.row >= 0) |
2350 | else if (oldcursor.row >= 0) |
2455 | { |
2351 | { |
2456 | int cursorwidth = 1; |
2352 | int cursorwidth = 1; |
2457 | int col = oldcursor.col; |
2353 | int col = oldcursor.col; |
2458 | |
2354 | |
2459 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
2355 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2460 | col--; |
2356 | col--; |
2461 | |
2357 | |
2462 | while (col + cursorwidth < TermWin.ncol |
2358 | while (col + cursorwidth < ncol |
2463 | && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR) |
2359 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2464 | cursorwidth++; |
2360 | cursorwidth++; |
2465 | |
2361 | |
2466 | #ifndef NO_CURSORCOLOR |
2362 | #ifndef NO_CURSORCOLOR |
2467 | if (ISSET_PIXCOLOR (Color_cursor)) |
2363 | if (ISSET_PIXCOLOR (Color_cursor)) |
2468 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); |
2364 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2469 | #endif |
2365 | #endif |
2470 | |
2366 | |
2471 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2367 | XDrawRectangle (display->display, drawBuffer, gc, |
2472 | Col2Pixel (col), |
2368 | Col2Pixel (col), |
2473 | Row2Pixel (oldcursor.row), |
2369 | Row2Pixel (oldcursor.row), |
2474 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2370 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2475 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2371 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2476 | } |
2372 | } |
2477 | } |
2373 | } |
2478 | |
2374 | |
2479 | /* |
2375 | /* |
2480 | * H: cleanup selection |
2376 | * H: cleanup selection |
… | |
… | |
2487 | num_scr = 0; |
2383 | num_scr = 0; |
2488 | num_scr_allow = 1; |
2384 | num_scr_allow = 1; |
2489 | } |
2385 | } |
2490 | |
2386 | |
2491 | void |
2387 | void |
2492 | rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) |
2388 | rxvt_term::scr_remap_chars (line_t &l) |
2493 | { |
2389 | { |
2494 | if (!rp || !tp) |
2390 | if (!l.t) |
2495 | return; |
2391 | return; |
2496 | |
2392 | |
2497 | for (int i = TermWin.ncol; i; i--, rp++, tp++) |
2393 | l.touch (); // maybe a bit of an overkill, but its not performance-relevant |
|
|
2394 | |
|
|
2395 | for (int i = ncol; i--; ) |
2498 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
2396 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2499 | } |
2397 | } |
2500 | |
2398 | |
2501 | void |
2399 | void |
2502 | rxvt_term::scr_remap_chars () |
2400 | rxvt_term::scr_remap_chars () |
2503 | { |
2401 | { |
2504 | for (int i = TermWin.nrow + TermWin.saveLines; i--; ) |
2402 | for (int i = total_rows; i--; ) |
2505 | scr_remap_chars (screen.text[i], screen.rend[i]); |
2403 | scr_remap_chars (row_buf [i]); |
2506 | |
2404 | |
2507 | for (int i = TermWin.nrow; i--; ) |
2405 | for (int i = nrow; i--; ) |
2508 | { |
2406 | { |
2509 | scr_remap_chars (drawn_text[i], drawn_rend[i]); |
2407 | scr_remap_chars (drawn_buf [i]); |
2510 | scr_remap_chars (swap.text[i], swap.rend[i]); |
2408 | scr_remap_chars (swap_buf [i]); |
2511 | } |
2409 | } |
2512 | } |
2410 | } |
2513 | |
2411 | |
2514 | void |
2412 | void |
2515 | rxvt_term::scr_recolour () |
2413 | rxvt_term::scr_recolour () |
… | |
… | |
2521 | #if XPM_BACKGROUND |
2419 | #if XPM_BACKGROUND |
2522 | && !bgPixmap.pixmap |
2420 | && !bgPixmap.pixmap |
2523 | #endif |
2421 | #endif |
2524 | ) |
2422 | ) |
2525 | { |
2423 | { |
2526 | XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); |
2424 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2527 | XClearWindow (display->display, TermWin.parent[0]); |
2425 | XClearWindow (display->display, parent[0]); |
2528 | XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); |
2426 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2529 | #if HAVE_SCROLLBARS |
2427 | #if HAVE_SCROLLBARS |
2530 | if (scrollBar.win) |
2428 | if (scrollBar.win) |
2531 | { |
2429 | { |
2532 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2430 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2533 | scrollBar.setIdle (); |
2431 | scrollBar.setIdle (); |
… | |
… | |
2543 | |
2441 | |
2544 | /* ------------------------------------------------------------------------- */ |
2442 | /* ------------------------------------------------------------------------- */ |
2545 | void |
2443 | void |
2546 | rxvt_term::scr_clear (bool really) |
2444 | rxvt_term::scr_clear (bool really) |
2547 | { |
2445 | { |
2548 | if (!TermWin.mapped) |
2446 | if (!mapped) |
2549 | return; |
2447 | return; |
2550 | |
2448 | |
2551 | num_scr_allow = 0; |
2449 | num_scr_allow = 0; |
2552 | want_refresh = 1; |
2450 | want_refresh = 1; |
2553 | |
2451 | |
2554 | if (really) |
2452 | if (really) |
2555 | XClearWindow (display->display, TermWin.vt); |
2453 | XClearWindow (display->display, vt); |
2556 | } |
2454 | } |
2557 | |
2455 | |
2558 | /* ------------------------------------------------------------------------- */ |
2456 | /* ------------------------------------------------------------------------- */ |
2559 | void |
2457 | void |
2560 | rxvt_term::scr_reverse_selection () |
2458 | rxvt_term::scr_reverse_selection () |
2561 | { |
2459 | { |
|
|
2460 | if (selection.op |
2562 | if (selection.op && current_screen == selection.screen) |
2461 | && current_screen == selection.screen |
|
|
2462 | && selection.end.row >= -view_start) |
2563 | { |
2463 | { |
2564 | int end_row = TermWin.saveLines - TermWin.view_start; |
2464 | int view_end = -view_start + nrow; |
2565 | int i = selection.beg.row + TermWin.saveLines; |
2465 | int row, col; |
2566 | int col, row = selection.end.row + TermWin.saveLines; |
|
|
2567 | rend_t *srp; |
|
|
2568 | |
2466 | |
2569 | #if ENABLE_FRILLS |
2467 | #if ENABLE_FRILLS |
2570 | if (selection.rect) |
2468 | if (selection.rect) |
2571 | { |
2469 | { |
2572 | end_row += TermWin.nrow; |
2470 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
|
|
2471 | { |
|
|
2472 | text_t *stp = ROW(row).t; |
|
|
2473 | rend_t *srp = ROW(row).r; |
2573 | |
2474 | |
2574 | for (; i <= row && i <= end_row; i++) |
|
|
2575 | for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) |
2475 | for (col = selection.beg.col; col < selection.end.col; col++) |
2576 | srp[col] ^= RS_RVid; |
2476 | srp[col] ^= RS_RVid; |
|
|
2477 | |
|
|
2478 | while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2479 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2480 | |
|
|
2481 | if (++col < selection.end.col) |
|
|
2482 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2483 | } |
2577 | } |
2484 | } |
2578 | else |
2485 | else |
2579 | #endif |
2486 | #endif |
2580 | { |
2487 | { |
2581 | if (i >= end_row) |
2488 | if (selection.beg.row >= -view_start) |
|
|
2489 | { |
2582 | col = selection.beg.col; |
2490 | col = selection.beg.col; |
|
|
2491 | row = selection.beg.row; |
|
|
2492 | } |
2583 | else |
2493 | else |
2584 | { |
2494 | { |
2585 | col = 0; |
2495 | col = 0; |
2586 | i = end_row; |
2496 | row = -view_start; |
2587 | } |
2497 | } |
2588 | |
2498 | |
2589 | end_row += TermWin.nrow; |
2499 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2590 | |
2500 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2591 | for (; i < row && i < end_row; i++, col = 0) |
|
|
2592 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
|
|
2593 | srp[col] ^= RS_RVid; |
2501 | srp[col] ^= RS_RVid; |
2594 | |
2502 | |
2595 | if (i == row && i < end_row) |
2503 | if (row == selection.end.row) |
2596 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2504 | for (rend_t *srp = ROW(row).r; col < selection.end.col; col++) |
2597 | srp[col] ^= RS_RVid; |
2505 | srp[col] ^= RS_RVid; |
2598 | } |
2506 | } |
2599 | } |
2507 | } |
2600 | } |
2508 | } |
2601 | |
2509 | |
… | |
… | |
2610 | { |
2518 | { |
2611 | int row, wrote; |
2519 | int row, wrote; |
2612 | unsigned int width, towrite; |
2520 | unsigned int width, towrite; |
2613 | char r1[] = "\n"; |
2521 | char r1[] = "\n"; |
2614 | |
2522 | |
2615 | for (row = TermWin.saveLines - TermWin.nscrolled; |
2523 | for (row = saveLines - nsaved; |
2616 | row < TermWin.saveLines + TermWin.nrow - 1; row++) |
2524 | row < saveLines + nrow - 1; row++) |
2617 | { |
2525 | { |
2618 | width = screen.tlen[row] >= 0 ? screen.tlen[row] |
2526 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2619 | : TermWin.ncol; |
2527 | : ncol; |
2620 | for (towrite = width; towrite; towrite -= wrote) |
2528 | for (towrite = width; towrite; towrite -= wrote) |
2621 | { |
2529 | { |
2622 | wrote = write (fd, & (screen.text[row][width - towrite]), |
2530 | wrote = write (fd, & (row_buf[row].t[width - towrite]), |
2623 | towrite); |
2531 | towrite); |
2624 | if (wrote < 0) |
2532 | if (wrote < 0) |
2625 | return; /* XXX: death, no report */ |
2533 | return; /* XXX: death, no report */ |
2626 | } |
2534 | } |
2627 | if (screen.tlen[row] >= 0) |
2535 | if (row_buf[row].l >= 0) |
2628 | if (write (fd, r1, 1) <= 0) |
2536 | if (write (fd, r1, 1) <= 0) |
2629 | return; /* XXX: death, no report */ |
2537 | return; /* XXX: death, no report */ |
2630 | } |
2538 | } |
2631 | } |
2539 | } |
2632 | #endif |
2540 | #endif |
2633 | |
2541 | |
2634 | /* ------------------------------------------------------------------------- * |
2542 | /* ------------------------------------------------------------------------- * |
2635 | * CHARACTER SELECTION * |
2543 | * CHARACTER SELECTION * |
2636 | * ------------------------------------------------------------------------- */ |
2544 | * ------------------------------------------------------------------------- */ |
2637 | |
|
|
2638 | /* |
|
|
2639 | * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 |
|
|
2640 | */ |
|
|
2641 | void |
2545 | void |
2642 | rxvt_term::selection_check (int check_more) |
2546 | rxvt_term::selection_check (int check_more) |
2643 | { |
2547 | { |
2644 | row_col_t pos; |
2548 | row_col_t pos; |
2645 | |
2549 | |
2646 | if (!selection.op) |
2550 | if (!selection.op) |
2647 | return; |
2551 | return; |
2648 | |
2552 | |
2649 | pos.row = pos.col = 0; |
2553 | pos.row = pos.col = 0; |
2650 | if ((selection.beg.row < - (int32_t)TermWin.nscrolled) |
2554 | if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) |
2651 | || (selection.beg.row >= TermWin.nrow) |
2555 | || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) |
2652 | || (selection.mark.row < - (int32_t)TermWin.nscrolled) |
2556 | || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) |
2653 | || (selection.mark.row >= TermWin.nrow) |
|
|
2654 | || (selection.end.row < - (int32_t)TermWin.nscrolled) |
|
|
2655 | || (selection.end.row >= TermWin.nrow) |
|
|
2656 | || (check_more == 1 |
2557 | || (check_more == 1 |
2657 | && current_screen == selection.screen |
2558 | && current_screen == selection.screen |
2658 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2559 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2659 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2560 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2660 | || (check_more == 2 |
2561 | || (check_more == 2 |
… | |
… | |
2662 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2563 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2663 | || (check_more == 3 |
2564 | || (check_more == 3 |
2664 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2565 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2665 | || (check_more == 4 /* screen width change */ |
2566 | || (check_more == 4 /* screen width change */ |
2666 | && (selection.beg.row != selection.end.row |
2567 | && (selection.beg.row != selection.end.row |
2667 | || selection.end.col > TermWin.ncol))) |
2568 | || selection.end.col > ncol))) |
2668 | CLEAR_SELECTION (); |
2569 | CLEAR_SELECTION (); |
2669 | } |
2570 | } |
2670 | |
2571 | |
2671 | /* ------------------------------------------------------------------------- */ |
2572 | /* ------------------------------------------------------------------------- */ |
2672 | /* |
2573 | /* |
2673 | * Paste a selection direct to the command fd |
2574 | * Paste a selection direct to the command fd |
2674 | */ |
2575 | */ |
2675 | void |
2576 | void |
2676 | rxvt_term::paste (unsigned char *data, unsigned int len) |
2577 | rxvt_term::paste (char *data, unsigned int len) |
2677 | { |
2578 | { |
2678 | /* convert normal newline chars into common keyboard Return key sequence */ |
2579 | /* convert normal newline chars into common keyboard Return key sequence */ |
2679 | for (unsigned int i = 0; i < len; i++) |
2580 | for (unsigned int i = 0; i < len; i++) |
2680 | if (data[i] == C0_LF) |
2581 | if (data[i] == C0_LF) |
2681 | data[i] = C0_CR; |
2582 | data[i] = C0_CR; |
… | |
… | |
2825 | { |
2726 | { |
2826 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2727 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2827 | char *s = rxvt_wcstombs (w); |
2728 | char *s = rxvt_wcstombs (w); |
2828 | free (w); |
2729 | free (w); |
2829 | // TODO: strlen == only the first element will be converted. well... |
2730 | // TODO: strlen == only the first element will be converted. well... |
2830 | paste ((unsigned char *)s, strlen (s)); |
2731 | paste (s, strlen (s)); |
2831 | free (s); |
2732 | free (s); |
2832 | } |
2733 | } |
2833 | else |
2734 | else |
2834 | #endif |
2735 | #endif |
2835 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2736 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2836 | && cl) |
2737 | && cl) |
2837 | { |
2738 | { |
2838 | for (int i = 0; i < cr; i++) |
2739 | for (int i = 0; i < cr; i++) |
2839 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2740 | paste (cl[i], strlen (cl[i])); |
2840 | |
2741 | |
2841 | XFreeStringList (cl); |
2742 | XFreeStringList (cl); |
2842 | } |
2743 | } |
2843 | else |
2744 | else |
2844 | paste (ct.value, ct.nitems); // paste raw |
2745 | paste ((char *)ct.value, ct.nitems); // paste raw |
2845 | |
2746 | |
2846 | bailout: |
2747 | bailout: |
2847 | XFree (ct.value); |
2748 | XFree (ct.value); |
2848 | |
2749 | |
2849 | if (selection_wait == Sel_normal) |
2750 | if (selection_wait == Sel_normal) |
… | |
… | |
2881 | * EXT: button 2 release |
2782 | * EXT: button 2 release |
2882 | */ |
2783 | */ |
2883 | void |
2784 | void |
2884 | rxvt_term::selection_request (Time tm, int x, int y) |
2785 | rxvt_term::selection_request (Time tm, int x, int y) |
2885 | { |
2786 | { |
2886 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2787 | if (x < 0 || x >= width || y < 0 || y >= height) |
2887 | return; /* outside window */ |
2788 | return; /* outside window */ |
2888 | |
2789 | |
2889 | if (selection.text) |
2790 | if (selection.text) |
2890 | { /* internal selection */ |
2791 | { /* internal selection */ |
2891 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2792 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2892 | paste ((unsigned char *)str, strlen (str)); |
2793 | paste (str, strlen (str)); |
2893 | free (str); |
2794 | free (str); |
2894 | return; |
2795 | return; |
2895 | } |
2796 | } |
2896 | else |
2797 | else |
2897 | { |
2798 | { |
… | |
… | |
2933 | sel = xa[XA_CLIPBOARD]; |
2834 | sel = xa[XA_CLIPBOARD]; |
2934 | |
2835 | |
2935 | if (XGetSelectionOwner (display->display, sel) != None) |
2836 | if (XGetSelectionOwner (display->display, sel) != None) |
2936 | { |
2837 | { |
2937 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2838 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2938 | TermWin.vt, selection_request_time); |
2839 | vt, selection_request_time); |
2939 | return 1; |
2840 | return 1; |
2940 | } |
2841 | } |
2941 | |
2842 | |
2942 | return 0; |
2843 | return 0; |
2943 | } |
2844 | } |
… | |
… | |
2966 | * EXT: button 1 or 3 release |
2867 | * EXT: button 1 or 3 release |
2967 | */ |
2868 | */ |
2968 | void |
2869 | void |
2969 | rxvt_term::selection_make (Time tm) |
2870 | rxvt_term::selection_make (Time tm) |
2970 | { |
2871 | { |
2971 | int i, col, end_col, row, end_row; |
2872 | int i; |
2972 | wchar_t *new_selection_text; |
2873 | wchar_t *new_selection_text; |
2973 | text_t *t; |
2874 | text_t *t; |
2974 | |
2875 | |
2975 | switch (selection.op) |
2876 | switch (selection.op) |
2976 | { |
2877 | { |
… | |
… | |
2989 | selection.op = SELECTION_DONE; |
2890 | selection.op = SELECTION_DONE; |
2990 | |
2891 | |
2991 | if (selection.clicks == 4) |
2892 | if (selection.clicks == 4) |
2992 | return; /* nothing selected, go away */ |
2893 | return; /* nothing selected, go away */ |
2993 | |
2894 | |
|
|
2895 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
|
|
2896 | return; |
|
|
2897 | |
2994 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2898 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2995 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2899 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2996 | |
2900 | |
2997 | col = selection.beg.col; |
|
|
2998 | row = selection.beg.row + TermWin.saveLines; |
|
|
2999 | end_row = selection.end.row + TermWin.saveLines; |
|
|
3000 | int ofs = 0; |
2901 | int ofs = 0; |
3001 | int extra = 0; |
2902 | int extra = 0; |
3002 | |
2903 | |
|
|
2904 | int col = selection.beg.col; |
|
|
2905 | int row = selection.beg.row; |
|
|
2906 | |
|
|
2907 | int end_col; |
|
|
2908 | |
3003 | for (; row <= end_row; row++, col = 0) |
2909 | for (; row <= selection.end.row; row++, col = 0) |
3004 | { |
2910 | { |
3005 | end_col = screen.tlen[row]; |
|
|
3006 | |
|
|
3007 | #if ENABLE_FRILLS |
2911 | #if ENABLE_FRILLS |
3008 | if (selection.rect) |
2912 | if (selection.rect) |
3009 | { |
2913 | { |
3010 | col = selection.beg.col; |
2914 | col = selection.beg.col; |
3011 | end_col = TermWin.ncol + 1; |
2915 | end_col = ncol + 1; |
|
|
2916 | } |
|
|
2917 | else |
|
|
2918 | #endif |
|
|
2919 | end_col = ROW(row).l; |
|
|
2920 | |
|
|
2921 | col = max (col, 0); |
|
|
2922 | |
|
|
2923 | if (row == selection.end.row |
|
|
2924 | #if ENABLE_FRILLS |
|
|
2925 | || selection.rect |
|
|
2926 | #endif |
3012 | } |
2927 | ) |
3013 | #endif |
|
|
3014 | |
|
|
3015 | MAX_IT (col, 0); |
|
|
3016 | |
|
|
3017 | if (end_col == -1) |
|
|
3018 | end_col = TermWin.ncol; |
|
|
3019 | |
|
|
3020 | if (row == end_row || selection.rect) |
|
|
3021 | MIN_IT (end_col, selection.end.col); |
2928 | min_it (end_col, selection.end.col); |
3022 | |
2929 | |
3023 | t = &screen.text[row][col]; |
2930 | t = ROW(row).t + col; |
|
|
2931 | |
3024 | for (; col < end_col; col++) |
2932 | for (; col < end_col; col++) |
3025 | { |
2933 | { |
3026 | if (*t == NOCHAR) |
2934 | if (*t == NOCHAR) |
3027 | t++; |
2935 | t++; |
3028 | #if ENABLE_COMBINING |
2936 | #if ENABLE_COMBINING |
… | |
… | |
3044 | #endif |
2952 | #endif |
3045 | else |
2953 | else |
3046 | new_selection_text[ofs++] = *t++; |
2954 | new_selection_text[ofs++] = *t++; |
3047 | } |
2955 | } |
3048 | |
2956 | |
3049 | if (screen.tlen[row] != -1 && row != end_row) |
2957 | #if ENABLE_FRILLS |
|
|
2958 | if (selection.rect) |
|
|
2959 | { |
|
|
2960 | while (ofs |
|
|
2961 | && new_selection_text[ofs - 1] != C0_LF |
|
|
2962 | && unicode::is_space (new_selection_text[ofs - 1])) |
|
|
2963 | --ofs; |
|
|
2964 | |
3050 | new_selection_text[ofs++] = C0_LF; |
2965 | new_selection_text[ofs++] = C0_LF; |
|
|
2966 | } |
|
|
2967 | else |
|
|
2968 | #endif |
|
|
2969 | if (!ROW(row).is_longer () && row != selection.end.row) |
|
|
2970 | new_selection_text[ofs++] = C0_LF; |
3051 | } |
2971 | } |
3052 | |
2972 | |
3053 | if (end_col != selection.end.col) |
2973 | if (end_col != selection.end.col) |
3054 | new_selection_text[ofs++] = C0_LF; |
2974 | new_selection_text[ofs++] = C0_LF; |
3055 | |
2975 | |
… | |
… | |
3065 | |
2985 | |
3066 | // we usually allocate much more than necessary, so realloc it smaller again |
2986 | // we usually allocate much more than necessary, so realloc it smaller again |
3067 | selection.len = ofs; |
2987 | selection.len = ofs; |
3068 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2988 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
3069 | |
2989 | |
|
|
2990 | if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) |
|
|
2991 | return; |
|
|
2992 | |
|
|
2993 | selection_grab (tm); |
|
|
2994 | } |
|
|
2995 | |
|
|
2996 | bool |
|
|
2997 | rxvt_term::selection_grab (Time tm) |
|
|
2998 | { |
|
|
2999 | selection_time = tm; |
|
|
3000 | |
3070 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
3001 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3071 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
3002 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
|
|
3003 | { |
3072 | display->set_selection_owner (this); |
3004 | display->set_selection_owner (this); |
|
|
3005 | return true; |
|
|
3006 | } |
3073 | else |
3007 | else |
3074 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
3008 | return false; |
3075 | |
3009 | |
3076 | #if 0 |
3010 | #if 0 |
3077 | XTextProperty ct; |
3011 | XTextProperty ct; |
3078 | |
3012 | |
3079 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3013 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3080 | { |
3014 | { |
3081 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3015 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3082 | XFree (ct.value); |
3016 | XFree (ct.value); |
3083 | } |
3017 | } |
3084 | #endif |
3018 | #endif |
3085 | |
|
|
3086 | selection_time = tm; |
|
|
3087 | } |
3019 | } |
3088 | |
3020 | |
3089 | /* ------------------------------------------------------------------------- */ |
3021 | /* ------------------------------------------------------------------------- */ |
3090 | /* |
3022 | /* |
3091 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3023 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
… | |
… | |
3099 | |
3031 | |
3100 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3032 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3101 | |
3033 | |
3102 | if (clicks == 2 || clicks == 3) |
3034 | if (clicks == 2 || clicks == 3) |
3103 | selection_extend_colrow (selection.mark.col, |
3035 | selection_extend_colrow (selection.mark.col, |
3104 | selection.mark.row + TermWin.view_start, |
3036 | selection.mark.row + view_start, |
3105 | 0, /* button 3 */ |
3037 | 0, /* button 3 */ |
3106 | 1, /* button press */ |
3038 | 1, /* button press */ |
3107 | 0); /* click change */ |
3039 | 0); /* click change */ |
3108 | } |
3040 | } |
3109 | |
3041 | |
… | |
… | |
3113 | */ |
3045 | */ |
3114 | void |
3046 | void |
3115 | rxvt_term::selection_start_colrow (int col, int row) |
3047 | rxvt_term::selection_start_colrow (int col, int row) |
3116 | { |
3048 | { |
3117 | want_refresh = 1; |
3049 | want_refresh = 1; |
|
|
3050 | |
|
|
3051 | selection.mark.row = row - view_start; |
3118 | selection.mark.col = col; |
3052 | selection.mark.col = col; |
3119 | selection.mark.row = row - TermWin.view_start; |
|
|
3120 | |
3053 | |
3121 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
3054 | selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); |
3122 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
3055 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3123 | MAX_IT (selection.mark.col, 0); |
|
|
3124 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
|
|
3125 | |
3056 | |
3126 | while (selection.mark.col > 0 |
3057 | while (selection.mark.col > 0 |
3127 | && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) |
3058 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3128 | --selection.mark.col; |
3059 | --selection.mark.col; |
3129 | |
3060 | |
3130 | if (selection.op) |
3061 | if (selection.op) |
3131 | { /* clear the old selection */ |
3062 | { /* clear the old selection */ |
3132 | selection.beg.row = selection.end.row = selection.mark.row; |
3063 | selection.beg.row = selection.end.row = selection.mark.row; |
… | |
… | |
3156 | text_t *stp; |
3087 | text_t *stp; |
3157 | rend_t *srp; |
3088 | rend_t *srp; |
3158 | |
3089 | |
3159 | if (dirn == UP) |
3090 | if (dirn == UP) |
3160 | { |
3091 | { |
3161 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
3092 | bound.row = - nsaved - 1; |
3162 | bound.col = 0; |
3093 | bound.col = 0; |
3163 | dirnadd = -1; |
3094 | dirnadd = -1; |
3164 | } |
3095 | } |
3165 | else |
3096 | else |
3166 | { |
3097 | { |
3167 | bound.row = TermWin.saveLines + TermWin.nrow; |
3098 | bound.row = nrow; |
3168 | bound.col = TermWin.ncol - 1; |
3099 | bound.col = ncol - 1; |
3169 | dirnadd = 1; |
3100 | dirnadd = 1; |
3170 | } |
3101 | } |
3171 | |
3102 | |
3172 | row = mark->row + TermWin.saveLines; |
3103 | row = mark->row; |
3173 | col = mark->col; |
3104 | col = max (mark->col, 0); |
3174 | MAX_IT (col, 0); |
3105 | |
3175 | /* find the edge of a word */ |
3106 | /* find the edge of a word */ |
3176 | stp = &screen.text[row][col]; |
3107 | stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp); |
3177 | w1 = DELIMIT_TEXT (*stp); |
3108 | srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp); |
3178 | |
|
|
3179 | srp = &screen.rend[row][col]; |
|
|
3180 | w2 = DELIMIT_REND (*srp); |
|
|
3181 | |
3109 | |
3182 | for (;;) |
3110 | for (;;) |
3183 | { |
3111 | { |
3184 | for (; col != bound.col; col += dirnadd) |
3112 | for (; col != bound.col; col += dirnadd) |
3185 | { |
3113 | { |
… | |
… | |
3195 | break; |
3123 | break; |
3196 | } |
3124 | } |
3197 | |
3125 | |
3198 | if ((col == bound.col) && (row != bound.row)) |
3126 | if ((col == bound.col) && (row != bound.row)) |
3199 | { |
3127 | { |
3200 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
3128 | if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ()) |
3201 | { |
3129 | { |
3202 | trow = row + dirnadd; |
3130 | trow = row + dirnadd; |
3203 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
3131 | tcol = dirn == UP ? ncol - 1 : 0; |
3204 | |
3132 | |
3205 | if (screen.text[trow] == NULL) |
3133 | if (!ROW(trow).t) |
3206 | break; |
3134 | break; |
3207 | |
3135 | |
3208 | stp = & (screen.text[trow][tcol]); |
3136 | stp = ROW(trow).t + tcol; |
3209 | srp = & (screen.rend[trow][tcol]); |
3137 | srp = ROW(trow).r + tcol; |
3210 | |
3138 | |
3211 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3139 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3212 | break; |
3140 | break; |
3213 | |
3141 | |
3214 | row = trow; |
3142 | row = trow; |
… | |
… | |
3217 | } |
3145 | } |
3218 | } |
3146 | } |
3219 | break; |
3147 | break; |
3220 | } |
3148 | } |
3221 | |
3149 | |
3222 | Old_Word_Selection_You_Die: |
|
|
3223 | if (dirn == DN) |
3150 | if (dirn == DN) |
3224 | col++; /* put us on one past the end */ |
3151 | col++; /* put us on one past the end */ |
3225 | |
3152 | |
3226 | /* Poke the values back in */ |
3153 | /* Poke the values back in */ |
3227 | ret->row = row - TermWin.saveLines; |
3154 | ret->row = row; |
3228 | ret->col = col; |
3155 | ret->col = col; |
3229 | } |
3156 | } |
3230 | |
3157 | |
3231 | /* ------------------------------------------------------------------------- */ |
3158 | /* ------------------------------------------------------------------------- */ |
3232 | /* |
3159 | /* |
… | |
… | |
3237 | * flag == 2 ==> button 3 motion |
3164 | * flag == 2 ==> button 3 motion |
3238 | */ |
3165 | */ |
3239 | void |
3166 | void |
3240 | rxvt_term::selection_extend (int x, int y, int flag) |
3167 | rxvt_term::selection_extend (int x, int y, int flag) |
3241 | { |
3168 | { |
3242 | int col, row; |
3169 | int col = clamp (Pixel2Col (x), 0, ncol); |
3243 | |
3170 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3244 | col = Pixel2Col (x); |
|
|
3245 | row = Pixel2Row (y); |
|
|
3246 | MAX_IT (row, 0); |
|
|
3247 | MIN_IT (row, (int)TermWin.nrow - 1); |
|
|
3248 | MAX_IT (col, 0); |
|
|
3249 | MIN_IT (col, (int)TermWin.ncol); |
|
|
3250 | |
3171 | |
3251 | /* |
3172 | /* |
3252 | * If we're selecting characters (single click) then we must check first |
3173 | * If we're selecting characters (single click) then we must check first |
3253 | * if we are at the same place as the original mark. If we are then |
3174 | * if we are at the same place as the original mark. If we are then |
3254 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3175 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3255 | * be _past_ a character for it to be selected. |
3176 | * be _past_ a character for it to be selected. |
3256 | */ |
3177 | */ |
3257 | if (((selection.clicks % 3) == 1) && !flag |
3178 | if (((selection.clicks % 3) == 1) && !flag |
3258 | && (col == selection.mark.col |
3179 | && (col == selection.mark.col |
3259 | && (row == selection.mark.row + TermWin.view_start))) |
3180 | && (row == selection.mark.row + view_start))) |
3260 | { |
3181 | { |
3261 | /* select nothing */ |
3182 | /* select nothing */ |
3262 | selection.beg.row = selection.end.row = 0; |
3183 | selection.beg.row = selection.end.row = 0; |
3263 | selection.beg.col = selection.end.col = 0; |
3184 | selection.beg.col = selection.end.col = 0; |
3264 | selection.clicks = 4; |
3185 | selection.clicks = 4; |
… | |
… | |
3279 | * Extend the selection to the specified col/row |
3200 | * Extend the selection to the specified col/row |
3280 | */ |
3201 | */ |
3281 | void |
3202 | void |
3282 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3203 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3283 | { |
3204 | { |
3284 | int16_t ncol = TermWin.ncol; |
|
|
3285 | int end_col; |
|
|
3286 | row_col_t pos; |
3205 | row_col_t pos; |
3287 | enum { |
3206 | enum { |
3288 | LEFT, RIGHT |
3207 | LEFT, RIGHT |
3289 | } closeto = RIGHT; |
3208 | } closeto = RIGHT; |
3290 | |
3209 | |
… | |
… | |
3321 | selection.beg.col = selection.end.col = selection.mark.col; |
3240 | selection.beg.col = selection.end.col = selection.mark.col; |
3322 | selection.beg.row = selection.end.row = selection.mark.row; |
3241 | selection.beg.row = selection.end.row = selection.mark.row; |
3323 | } |
3242 | } |
3324 | |
3243 | |
3325 | pos.col = col; |
3244 | pos.col = col; |
3326 | pos.row = row; |
3245 | pos.row = row - view_start; |
3327 | |
|
|
3328 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
|
|
3329 | |
3246 | |
3330 | /* |
3247 | /* |
3331 | * This is mainly xterm style selection with a couple of differences, mainly |
3248 | * This is mainly xterm style selection with a couple of differences, mainly |
3332 | * in the way button3 drag extension works. |
3249 | * in the way button3 drag extension works. |
3333 | * We're either doing: button1 drag; button3 press; or button3 drag |
3250 | * We're either doing: button1 drag; button3 press; or button3 drag |
… | |
… | |
3392 | } |
3309 | } |
3393 | } |
3310 | } |
3394 | |
3311 | |
3395 | if (selection.clicks == 1) |
3312 | if (selection.clicks == 1) |
3396 | { |
3313 | { |
3397 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3314 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3398 | |
3315 | && !ROW(selection.beg.row).is_longer () |
3399 | if (selection.beg.col > end_col |
|
|
3400 | && end_col != -1 |
|
|
3401 | #if ENABLE_FRILLS |
3316 | #if ENABLE_FRILLS |
3402 | && !selection.rect |
3317 | && !selection.rect |
3403 | #endif |
3318 | #endif |
3404 | ) |
3319 | ) |
3405 | selection.beg.col = ncol; |
3320 | selection.beg.col = ncol; |
3406 | |
3321 | |
3407 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
|
|
3408 | |
|
|
3409 | if ( |
3322 | if ( |
3410 | selection.end.col > end_col |
3323 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3411 | && end_col != -1 |
3324 | && !ROW(selection.end.row).is_longer () |
3412 | #if ENABLE_FRILLS |
3325 | #if ENABLE_FRILLS |
3413 | && !selection.rect |
3326 | && !selection.rect |
3414 | #endif |
3327 | #endif |
3415 | ) |
3328 | ) |
3416 | selection.end.col = ncol; |
3329 | selection.end.col = ncol; |
… | |
… | |
3418 | else if (selection.clicks == 2) |
3331 | else if (selection.clicks == 2) |
3419 | { |
3332 | { |
3420 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3333 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3421 | selection.end.col--; |
3334 | selection.end.col--; |
3422 | |
3335 | |
|
|
3336 | if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) |
|
|
3337 | { |
3423 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3338 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3424 | selection_delimit_word (DN, &selection.end, &selection.end); |
3339 | selection_delimit_word (DN, &selection.end, &selection.end); |
|
|
3340 | } |
3425 | } |
3341 | } |
3426 | else if (selection.clicks == 3) |
3342 | else if (selection.clicks == 3) |
3427 | { |
3343 | { |
3428 | #if ENABLE_FRILLS |
3344 | #if ENABLE_FRILLS |
3429 | if (options & Opt_tripleclickwords) |
3345 | if (OPTION (Opt_tripleclickwords)) |
3430 | { |
3346 | { |
3431 | int end_row; |
|
|
3432 | |
|
|
3433 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3347 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3434 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
|
|
3435 | |
3348 | |
3436 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3349 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3437 | { |
3350 | { |
3438 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
3351 | if (!ROW(end_row).is_longer ()) |
3439 | |
|
|
3440 | if (end_col != -1) |
|
|
3441 | { |
3352 | { |
3442 | selection.end.row = end_row; |
3353 | selection.end.row = end_row; |
3443 | selection.end.col = end_col; |
3354 | selection.end.col = ROW(end_row).l; |
3444 | selection_remove_trailing_spaces (); |
3355 | selection_remove_trailing_spaces (); |
3445 | break; |
3356 | break; |
3446 | } |
3357 | } |
3447 | } |
3358 | } |
3448 | } |
3359 | } |
… | |
… | |
3454 | |
3365 | |
3455 | selection.beg.col = 0; |
3366 | selection.beg.col = 0; |
3456 | selection.end.col = ncol; |
3367 | selection.end.col = ncol; |
3457 | |
3368 | |
3458 | // select a complete logical line |
3369 | // select a complete logical line |
3459 | while (selection.beg.row > -TermWin.saveLines |
3370 | while (selection.beg.row > -saveLines |
3460 | && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) |
3371 | && ROW(selection.beg.row - 1).is_longer ()) |
3461 | selection.beg.row--; |
3372 | selection.beg.row--; |
3462 | |
3373 | |
3463 | while (selection.end.row < TermWin.nrow |
3374 | while (selection.end.row < nrow |
3464 | && screen.tlen[selection.end.row + TermWin.saveLines] == -1) |
3375 | && ROW(selection.end.row).is_longer ()) |
3465 | selection.end.row++; |
3376 | selection.end.row++; |
3466 | } |
3377 | } |
3467 | } |
3378 | } |
3468 | |
3379 | |
3469 | if (button3 && buttonpress) |
3380 | if (button3 && buttonpress) |
… | |
… | |
3480 | } |
3391 | } |
3481 | } |
3392 | } |
3482 | |
3393 | |
3483 | #if ENABLE_FRILLS |
3394 | #if ENABLE_FRILLS |
3484 | if (selection.rect && selection.beg.col > selection.end.col) |
3395 | if (selection.rect && selection.beg.col > selection.end.col) |
3485 | SWAP_IT (selection.beg.col, selection.end.col, int); |
3396 | ::swap (selection.beg.col, selection.end.col); |
3486 | #endif |
3397 | #endif |
3487 | } |
3398 | } |
3488 | |
3399 | |
3489 | #if ENABLE_FRILLS |
3400 | #if ENABLE_FRILLS |
3490 | void |
3401 | void |
… | |
… | |
3494 | text_t *stp; |
3405 | text_t *stp; |
3495 | |
3406 | |
3496 | end_col = selection.end.col; |
3407 | end_col = selection.end.col; |
3497 | end_row = selection.end.row; |
3408 | end_row = selection.end.row; |
3498 | |
3409 | |
3499 | for ( ; end_row >= selection.beg.row; ) |
3410 | for (; end_row >= selection.beg.row; ) |
3500 | { |
3411 | { |
3501 | stp = screen.text[end_row + TermWin.saveLines]; |
3412 | stp = ROW(end_row).t; |
3502 | |
3413 | |
3503 | while (--end_col >= 0) |
3414 | while (--end_col >= 0) |
3504 | { |
3415 | { |
3505 | if (stp[end_col] != ' ' |
3416 | if (stp[end_col] != NOCHAR |
3506 | && stp[end_col] != '\t' |
3417 | && !unicode::is_space (stp[end_col])) |
3507 | && stp[end_col] != NOCHAR) |
|
|
3508 | break; |
3418 | break; |
3509 | } |
3419 | } |
3510 | |
3420 | |
3511 | if (end_col >= 0 |
3421 | if (end_col >= 0 |
3512 | || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) |
3422 | || !ROW(end_row - 1).is_longer ()) |
3513 | { |
3423 | { |
3514 | selection.end.col = end_col + 1; |
3424 | selection.end.col = end_col + 1; |
3515 | selection.end.row = end_row; |
3425 | selection.end.row = end_row; |
3516 | break; |
3426 | break; |
3517 | } |
3427 | } |
3518 | |
3428 | |
3519 | end_row--; |
3429 | end_row--; |
3520 | end_col = TermWin.ncol; |
3430 | end_col = ncol; |
3521 | } |
3431 | } |
3522 | |
3432 | |
3523 | if (selection.mark.row > selection.end.row) |
3433 | if (selection.mark.row > selection.end.row) |
3524 | { |
3434 | { |
3525 | selection.mark.row = selection.end.row; |
3435 | selection.mark.row = selection.end.row; |
… | |
… | |
3688 | */ |
3598 | */ |
3689 | void |
3599 | void |
3690 | rxvt_term::pixel_position (int *x, int *y) |
3600 | rxvt_term::pixel_position (int *x, int *y) |
3691 | { |
3601 | { |
3692 | *x = Pixel2Col (*x); |
3602 | *x = Pixel2Col (*x); |
3693 | /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ |
3603 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
3694 | *y = Pixel2Row (*y); |
3604 | *y = Pixel2Row (*y); |
3695 | /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ |
3605 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
3696 | } |
3606 | } |
3697 | |
3607 | |
3698 | /* ------------------------------------------------------------------------- */ |
3608 | /* ------------------------------------------------------------------------- */ |
3699 | #ifdef USE_XIM |
3609 | #ifdef USE_XIM |
3700 | void |
3610 | void |
3701 | rxvt_term::im_set_position (XPoint &pos) |
3611 | rxvt_term::im_set_position (XPoint &pos) |
3702 | { |
3612 | { |
3703 | XWindowAttributes xwa; |
3613 | XWindowAttributes xwa; |
3704 | |
3614 | |
3705 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
3615 | XGetWindowAttributes (display->display, vt, &xwa); |
3706 | |
3616 | |
3707 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3617 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3708 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; |
3618 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3709 | } |
3619 | } |
3710 | #endif |
3620 | #endif |
3711 | |
3621 | |
3712 | #if ENABLE_OVERLAY |
3622 | #if ENABLE_OVERLAY |
3713 | void |
3623 | void |
3714 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3624 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3715 | { |
3625 | { |
3716 | if (TermWin.nrow < 3 || TermWin.ncol < 3) |
3626 | if (nrow < 1 || ncol < 1) |
3717 | return; |
3627 | return; |
3718 | |
3628 | |
3719 | want_refresh = 1; |
3629 | want_refresh = 1; |
3720 | |
3630 | |
3721 | scr_overlay_off (); |
3631 | scr_overlay_off (); |
3722 | |
3632 | |
3723 | if (x < 0) x = TermWin.ncol - w; |
3633 | if (x < 0) x = ncol - w; |
3724 | if (y < 0) y = TermWin.nrow - h; |
3634 | if (y < 0) y = nrow - h; |
3725 | |
3635 | |
3726 | // make space for border |
3636 | // make space for border |
3727 | w += 2; MIN_IT (w, TermWin.ncol); |
3637 | w += 2; min_it (w, ncol); |
3728 | h += 2; MIN_IT (h, TermWin.nrow); |
3638 | h += 2; min_it (h, nrow); |
3729 | |
3639 | |
3730 | x -= 1; MAX_IT (x, 0); |
3640 | x -= 1; clamp_it (x, 0, ncol - w); |
3731 | y -= 1; MAX_IT (y, 0); |
3641 | y -= 1; clamp_it (y, 0, nrow - h); |
3732 | |
|
|
3733 | MIN_IT (x, TermWin.ncol - w); |
|
|
3734 | MIN_IT (y, TermWin.nrow - h); |
|
|
3735 | |
3642 | |
3736 | ov_x = x; ov_y = y; |
3643 | ov_x = x; ov_y = y; |
3737 | ov_w = w; ov_h = h; |
3644 | ov_w = w; ov_h = h; |
3738 | |
3645 | |
3739 | ov_text = new text_t *[h]; |
3646 | ov_text = new text_t *[h]; |
… | |
… | |
3825 | rxvt_term::scr_swap_overlay () |
3732 | rxvt_term::scr_swap_overlay () |
3826 | { |
3733 | { |
3827 | if (!ov_text) |
3734 | if (!ov_text) |
3828 | return; |
3735 | return; |
3829 | |
3736 | |
3830 | int row_offset = ov_y + TermWin.saveLines - TermWin.view_start; |
|
|
3831 | |
|
|
3832 | // swap screen mem with overlay |
3737 | // swap screen mem with overlay |
3833 | for (int y = ov_h; y--; ) |
3738 | for (int y = ov_h; y--; ) |
3834 | { |
3739 | { |
3835 | text_t *t1 = ov_text[y]; |
3740 | text_t *t1 = ov_text[y]; |
3836 | rend_t *r1 = ov_rend[y]; |
3741 | rend_t *r1 = ov_rend[y]; |
3837 | |
3742 | |
3838 | text_t *t2 = screen.text[y + row_offset] + ov_x; |
3743 | text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; |
3839 | rend_t *r2 = screen.rend[y + row_offset] + ov_x; |
3744 | rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; |
3840 | |
3745 | |
3841 | for (int x = ov_w; x--; ) |
3746 | for (int x = ov_w; x--; ) |
3842 | { |
3747 | { |
3843 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3748 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3844 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3749 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
… | |
… | |
3846 | } |
3751 | } |
3847 | } |
3752 | } |
3848 | |
3753 | |
3849 | #endif |
3754 | #endif |
3850 | /* ------------------------------------------------------------------------- */ |
3755 | /* ------------------------------------------------------------------------- */ |
|
|
3756 | |