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