… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | |
29 | |
30 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
30 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
31 | |
31 | |
32 | #include <inttypes.h> |
32 | #include <inttypes.h> |
33 | #include <wchar.h> |
|
|
34 | |
33 | |
35 | #include "salloc.C" // HACK, should be a seperate compile! |
34 | #include "salloc.C" // HACK, should be a seperate compile! |
36 | |
35 | |
37 | inline void fill_text (text_t *start, text_t value, int len) |
36 | inline void fill_text (text_t *start, text_t value, int len) |
38 | { |
37 | { |
39 | while (len--) |
38 | while (len--) |
40 | *start++ = value; |
39 | *start++ = value; |
41 | } |
40 | } |
42 | |
41 | |
43 | /* ------------------------------------------------------------------------- */ |
42 | /* ------------------------------------------------------------------------- */ |
44 | #define PROP_SIZE 16384 |
43 | #define PROP_SIZE 256*1024 |
|
|
44 | #define PASTE_SIZE 32768 |
45 | #define TABSIZE 8 /* default tab size */ |
45 | #define TABSIZE 8 /* default tab size */ |
46 | |
46 | |
47 | /* ------------------------------------------------------------------------- * |
47 | /* ------------------------------------------------------------------------- * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * ------------------------------------------------------------------------- */ |
49 | * ------------------------------------------------------------------------- */ |
50 | #define ZERO_SCROLLBACK() \ |
50 | #define ZERO_SCROLLBACK() \ |
51 | if (options & Opt_scrollTtyOutput) \ |
51 | if (options & Opt_scrollTtyOutput) \ |
52 | TermWin.view_start = 0 |
52 | view_start = 0 |
53 | #define CLEAR_SELECTION() \ |
53 | #define CLEAR_SELECTION() \ |
54 | selection.beg.row = selection.beg.col \ |
54 | selection.beg.row = selection.beg.col \ |
55 | = selection.end.row = selection.end.col = 0 |
55 | = selection.end.row = selection.end.col = 0 |
56 | #define CLEAR_ALL_SELECTION() \ |
56 | #define CLEAR_ALL_SELECTION() \ |
57 | selection.beg.row = selection.beg.col \ |
57 | selection.beg.row = selection.beg.col \ |
… | |
… | |
88 | /* |
88 | /* |
89 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
89 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
90 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
90 | * 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 |
91 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
92 | */ |
92 | */ |
93 | #define drawBuffer TermWin.vt |
93 | #define drawBuffer vt |
94 | |
94 | |
95 | #define CLEAR_ROWS(row, num) \ |
95 | #define CLEAR_ROWS(row, num) \ |
96 | if (TermWin.mapped) \ |
96 | if (mapped) \ |
97 | XClearArea (display->display, drawBuffer, 0, \ |
97 | XClearArea (display->display, drawBuffer, 0, \ |
98 | Row2Pixel (row), (unsigned int)TermWin.width, \ |
98 | Row2Pixel (row), (unsigned int)width, \ |
99 | (unsigned int)Height2Pixel (num), False) |
99 | (unsigned int)Height2Pixel (num), False) |
100 | |
100 | |
101 | #define CLEAR_CHARS(x, y, num) \ |
101 | #define CLEAR_CHARS(x, y, num) \ |
102 | if (TermWin.mapped) \ |
102 | if (mapped) \ |
103 | XClearArea (display->display, drawBuffer, x, y, \ |
103 | XClearArea (display->display, drawBuffer, x, y, \ |
104 | (unsigned int)Width2Pixel (num), \ |
104 | (unsigned int)Width2Pixel (num), \ |
105 | (unsigned int)Height2Pixel (1), False) |
105 | (unsigned int)Height2Pixel (1), False) |
106 | |
106 | |
107 | #define ERASE_ROWS(row, num) \ |
107 | #define ERASE_ROWS(row, num) \ |
108 | XFillRectangle (display->display, drawBuffer, TermWin.gc, \ |
108 | XFillRectangle (display->display, drawBuffer, gc, \ |
109 | 0, Row2Pixel (row), \ |
109 | 0, Row2Pixel (row), \ |
110 | (unsigned int)TermWin.width, \ |
110 | (unsigned int)width, \ |
111 | (unsigned int)Height2Pixel (num)) |
111 | (unsigned int)Height2Pixel (num)) |
112 | |
112 | |
113 | /* ------------------------------------------------------------------------- * |
113 | /* ------------------------------------------------------------------------- * |
114 | * SCREEN `COMMON' ROUTINES * |
114 | * SCREEN `COMMON' ROUTINES * |
115 | * ------------------------------------------------------------------------- */ |
115 | * ------------------------------------------------------------------------- */ |
116 | |
116 | |
117 | /* Fill part/all of a line with blanks. */ |
117 | /* Fill part/all of a line with blanks. */ |
118 | void |
118 | void |
119 | rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) |
119 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) |
120 | { |
120 | { |
|
|
121 | if (!l.t) |
|
|
122 | { |
|
|
123 | lalloc (l); |
|
|
124 | col = 0; |
|
|
125 | width = ncol; |
|
|
126 | } |
|
|
127 | |
121 | efs &= ~RS_baseattrMask; |
128 | efs &= ~RS_baseattrMask; |
122 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
129 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
123 | |
130 | |
|
|
131 | text_t *et = l.t + col; |
|
|
132 | rend_t *er = l.r + col; |
|
|
133 | |
124 | while (width--) |
134 | while (width--) |
125 | { |
135 | { |
126 | *et++ = ' '; |
136 | *et++ = ' '; |
127 | *er++ = efs; |
137 | *er++ = efs; |
128 | } |
138 | } |
129 | } |
139 | } |
130 | |
140 | |
131 | /* ------------------------------------------------------------------------- */ |
141 | /* ------------------------------------------------------------------------- */ |
132 | /* Fill a full line with blanks - make sure it is allocated first */ |
142 | /* Fill a full line with blanks - make sure it is allocated first */ |
133 | void |
143 | void |
134 | rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) |
144 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
135 | { |
145 | { |
136 | #ifdef DEBUG_STRICT |
146 | 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 | } |
147 | } |
147 | |
148 | |
148 | /* ------------------------------------------------------------------------- * |
149 | /* ------------------------------------------------------------------------- * |
149 | * SCREEN INITIALISATION * |
150 | * SCREEN INITIALISATION * |
150 | * ------------------------------------------------------------------------- */ |
151 | * ------------------------------------------------------------------------- */ |
151 | void |
152 | void |
152 | rxvt_term::scr_reset () |
153 | rxvt_term::scr_reset () |
153 | { |
154 | { |
154 | unsigned int ncol, nrow, total_rows, prev_total_rows; |
|
|
155 | unsigned int p, q; |
155 | unsigned int p, q; |
156 | int k; |
156 | int k; |
157 | rend_t setrstyle; |
|
|
158 | |
157 | |
159 | #if ENABLE_OVERLAY |
158 | #if ENABLE_OVERLAY |
160 | scr_overlay_off (); |
159 | scr_overlay_off (); |
161 | #endif |
160 | #endif |
162 | |
161 | |
163 | TermWin.view_start = 0; |
162 | view_start = 0; |
164 | num_scr = 0; |
163 | num_scr = 0; |
165 | |
164 | |
166 | if (TermWin.ncol == 0) |
165 | if (ncol == 0) |
167 | TermWin.ncol = 80; |
166 | ncol = 80; |
168 | |
167 | |
169 | if (TermWin.nrow == 0) |
168 | if (nrow == 0) |
170 | TermWin.nrow = 24; |
169 | nrow = 24; |
171 | |
|
|
172 | ncol = TermWin.ncol; |
|
|
173 | nrow = TermWin.nrow; |
|
|
174 | |
170 | |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
171 | if (ncol == prev_ncol && nrow == prev_nrow) |
176 | return; |
172 | return; |
177 | |
173 | |
178 | // we need at least two lines for wrapping to work correctly |
174 | // we need at least two lines for wrapping to work correctly |
179 | if (nrow + TermWin.saveLines < 2) |
175 | if (nrow + saveLines < 2) |
180 | { |
176 | { |
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 (!save) |
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 | */ |
206 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
196 | nsaved = 0; /* no saved lines */ |
207 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
197 | term_start = 0; |
208 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
198 | |
|
|
199 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
200 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
201 | |
|
|
202 | save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
203 | buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
204 | drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); |
209 | swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
205 | swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); |
210 | |
206 | |
211 | screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); |
|
|
212 | swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); |
|
|
213 | |
|
|
214 | screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
|
|
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++) |
207 | for (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(p), DEFAULT_RSTYLE); |
223 | scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); |
210 | scr_blank_screen_mem (swap_save[p], 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[p], 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; |
244 | |
|
|
245 | rxvt_salloc *old_ta; |
|
|
246 | rxvt_salloc *old_ra; |
260 | |
247 | |
261 | if (nrow < prev_nrow) |
248 | if (nrow < prev_nrow) |
262 | { |
249 | { |
263 | /* delete rows */ |
250 | /* delete rows */ |
264 | k = min (TermWin.nscrolled, prev_nrow - nrow); |
251 | k = min (nsaved, prev_nrow - nrow); |
|
|
252 | // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO |
265 | scr_scroll_text (0, (int)prev_nrow - 1, k, 1); |
253 | scr_scroll_text (0, (int)prev_nrow - 1, k); |
266 | |
254 | |
267 | for (p = nrow; p < prev_nrow; p++) |
255 | for (p = nrow; p < prev_nrow; p++) |
268 | { |
256 | { |
269 | q = p + TermWin.saveLines; |
257 | lfree (ROW(p)); |
270 | |
|
|
271 | if (screen.text[q]) |
|
|
272 | { |
|
|
273 | #ifdef DEBUG_STRICT |
|
|
274 | assert (screen.rend[q]); |
|
|
275 | #endif |
|
|
276 | talloc->free (screen.text[q]); |
|
|
277 | ralloc->free (screen.rend[q]); |
|
|
278 | } |
|
|
279 | |
|
|
280 | if (swap.text[p]) |
258 | lfree (swap_save[p]); |
281 | { |
|
|
282 | #ifdef DEBUG_STRICT |
|
|
283 | assert (swap.rend[p]); |
|
|
284 | #endif |
|
|
285 | talloc->free (swap.text[p]); |
|
|
286 | ralloc->free (swap.rend[p]); |
|
|
287 | } |
|
|
288 | |
|
|
289 | #ifdef DEBUG_STRICT |
|
|
290 | assert (drawn_text[p] && drawn_rend[p]); |
|
|
291 | #endif |
|
|
292 | talloc->free (drawn_text[p]); |
259 | lfree (drawn[p]); |
293 | ralloc->free (drawn_rend[p]); |
|
|
294 | } |
260 | } |
295 | |
261 | |
296 | /* we have fewer rows so fix up cursor position */ |
262 | /* we have fewer rows so fix up cursor position */ |
297 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
263 | min_it (screen.cur.row, (int32_t)nrow - 1); |
298 | MIN_IT (swap.cur.row, (int32_t)nrow - 1); |
|
|
299 | |
264 | |
300 | scr_reset_realloc (); /* realloc _last_ */ |
265 | scr_reset_realloc (); /* realloc _last_ */ |
301 | } |
266 | } |
302 | else if (nrow > prev_nrow) |
267 | else if (nrow > prev_nrow) |
303 | { |
268 | { |
304 | /* add rows */ |
269 | /* add rows */ |
305 | scr_reset_realloc (); /* realloc _first_ */ |
270 | scr_reset_realloc (); /* realloc _first_ */ |
306 | |
271 | |
|
|
272 | int ocol = ncol; |
307 | TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
273 | ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
308 | |
274 | |
309 | k = min (TermWin.nscrolled, nrow - prev_nrow); |
275 | k = min (nsaved, nrow - prev_nrow); |
310 | |
276 | |
311 | for (p = prev_total_rows; p < total_rows; p++) |
277 | for (p = prev_total_rows; p < total_rows; p++) |
312 | { |
278 | save[p].clear (); |
313 | screen.tlen[p] = 0; |
|
|
314 | screen.text[p] = NULL; |
|
|
315 | screen.rend[p] = NULL; |
|
|
316 | } |
|
|
317 | |
279 | |
318 | for (p = prev_total_rows; p < total_rows - k; p++) |
280 | for (p = prev_total_rows; p < total_rows - k; p++) |
319 | scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle); |
281 | scr_blank_screen_mem (save[p], DEFAULT_RSTYLE); |
320 | |
282 | |
321 | for (p = prev_nrow; p < nrow; p++) |
283 | for (p = prev_nrow; p < nrow; p++) |
322 | { |
284 | { |
323 | swap.tlen[p] = 0; |
285 | swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); |
324 | swap.text[p] = NULL; |
286 | drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); |
325 | swap.rend[p] = NULL; |
|
|
326 | drawn_text[p] = NULL; |
|
|
327 | drawn_rend[p] = NULL; |
|
|
328 | scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); |
|
|
329 | scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); |
|
|
330 | } |
287 | } |
331 | |
288 | |
332 | if (k > 0) |
289 | if (k > 0) |
333 | { |
290 | { |
334 | scr_scroll_text (0, (int)nrow - 1, -k, 1); |
291 | scr_scroll_text (0, (int)nrow - 1, -k); |
335 | screen.cur.row += k; |
292 | screen.cur.row += k; |
336 | screen.s_cur.row += k; |
293 | screen.s_cur.row += k; |
337 | TermWin.nscrolled -= k; |
294 | nsaved -= k; |
338 | } |
295 | } |
|
|
296 | |
339 | #ifdef DEBUG_STRICT |
297 | #ifdef DEBUG_STRICT |
340 | assert (screen.cur.row < TermWin.nrow); |
298 | assert (screen.cur.row < nrow); |
341 | assert (swap.cur.row < TermWin.nrow); |
|
|
342 | #else /* drive with your eyes closed */ |
299 | #else /* drive with your eyes closed */ |
343 | |
|
|
344 | MIN_IT (screen.cur.row, nrow - 1); |
300 | min_it (screen.cur.row, nrow - 1); |
345 | MIN_IT (swap.cur.row, nrow - 1); |
|
|
346 | #endif |
301 | #endif |
347 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
302 | ncol = ocol; // save b/c scr_blank_screen_mem uses this |
348 | } |
303 | } |
349 | |
304 | |
350 | /* resize columns */ |
305 | /* resize columns */ |
351 | if (ncol != prev_ncol) |
306 | if (ncol != prev_ncol) |
352 | { |
307 | { |
353 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
308 | old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
354 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
309 | old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
355 | |
310 | |
356 | for (p = 0; p < total_rows; p++) |
311 | for (p = total_rows; p--; ) |
|
|
312 | lresize (save[p]); |
|
|
313 | |
|
|
314 | for (p = nrow; p--; ) |
357 | { |
315 | { |
358 | if (screen.text[p]) |
316 | lresize (drawn[p]); |
|
|
317 | lresize (swap_save[p]); |
|
|
318 | } |
|
|
319 | |
|
|
320 | min_it (screen.cur.col, (int16_t)ncol - 1); |
|
|
321 | |
|
|
322 | delete old_ta; |
|
|
323 | delete old_ra; |
|
|
324 | } |
|
|
325 | |
|
|
326 | #if 0 |
|
|
327 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
|
|
328 | // to come up with a lean and mean algorithm. |
|
|
329 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
330 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
331 | |
|
|
332 | text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
|
|
333 | rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
|
|
334 | tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t)); |
|
|
335 | |
|
|
336 | for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D |
|
|
337 | |
|
|
338 | p = prev_total_rows; |
|
|
339 | q = total_rows; |
|
|
340 | |
|
|
341 | while (p > 0 && q > 0) |
|
|
342 | { |
|
|
343 | --p; |
|
|
344 | |
|
|
345 | printf ("pq %d:%d\n", p, q); |
|
|
346 | if (save[p].t) |
|
|
347 | { |
|
|
348 | int llen = save[p].l; |
|
|
349 | |
|
|
350 | assert (llen >= 0); |
|
|
351 | |
|
|
352 | while (p && save[p - 1].l < 0) |
359 | { |
353 | { |
360 | screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t)); |
354 | --p; |
361 | screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t)); |
|
|
362 | |
|
|
363 | MIN_IT (screen.tlen[p], (int16_t)ncol); |
|
|
364 | |
|
|
365 | if (ncol > prev_ncol) |
355 | llen += prev_ncol; |
366 | scr_blank_line (&screen.text[p][prev_ncol], |
356 | } |
367 | &screen.rend[p][prev_ncol], |
357 | |
368 | ncol - prev_ncol, setrstyle); |
358 | int qlines = llen / ncol + 1; |
|
|
359 | int lofs = 0; |
|
|
360 | |
|
|
361 | q -= qlines; |
|
|
362 | |
|
|
363 | int qrow = q; |
|
|
364 | |
|
|
365 | printf ("QL %d llen %d\n", qlines, llen);//D |
|
|
366 | for (; qlines--; qrow++) |
|
|
367 | { |
|
|
368 | if (qrow >= 0) |
|
|
369 | { |
|
|
370 | tp [qrow] = (text_t *)ta->alloc (); |
|
|
371 | rp [qrow] = (rend_t *)ra->alloc (); |
|
|
372 | tl [qrow] = LINE_CONT1; |
|
|
373 | |
|
|
374 | int qcol = 0; |
|
|
375 | |
|
|
376 | for (;;) |
|
|
377 | { |
|
|
378 | int prow = lofs / prev_ncol + p; |
|
|
379 | int pcol = lofs % prev_ncol; |
|
|
380 | |
|
|
381 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
|
|
382 | |
|
|
383 | printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol); |
|
|
384 | |
|
|
385 | if (len <= 0) |
|
|
386 | { |
|
|
387 | tl [qrow] = qcol; |
|
|
388 | |
|
|
389 | TODO |
|
|
390 | scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol, |
|
|
391 | ncol - qcol, DEFAULT_RSTYLE); |
|
|
392 | |
|
|
393 | break; |
|
|
394 | } |
|
|
395 | |
|
|
396 | assert (lofs < 1000); |
|
|
397 | |
|
|
398 | memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); |
|
|
399 | memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); |
|
|
400 | |
|
|
401 | lofs += len; |
|
|
402 | qcol += len; |
|
|
403 | |
|
|
404 | if (qcol == ncol) |
|
|
405 | break; |
|
|
406 | } |
|
|
407 | } |
|
|
408 | else |
|
|
409 | lofs += ncol; |
369 | } |
410 | } |
370 | } |
411 | } |
371 | |
|
|
372 | for (p = 0; p < nrow; p++) |
|
|
373 | { |
|
|
374 | drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t)); |
|
|
375 | drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t)); |
|
|
376 | |
|
|
377 | if (ncol > prev_ncol) |
|
|
378 | scr_blank_line (&drawn_text[p][prev_ncol], |
|
|
379 | &drawn_rend[p][prev_ncol], |
|
|
380 | ncol - prev_ncol, setrstyle); |
|
|
381 | |
|
|
382 | if (swap.text[p]) |
|
|
383 | { |
|
|
384 | swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t)); |
|
|
385 | swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t)); |
|
|
386 | |
|
|
387 | MIN_IT (swap.tlen[p], (int16_t)ncol); |
|
|
388 | |
|
|
389 | if (ncol > prev_ncol) |
|
|
390 | scr_blank_line (&swap.text[p][prev_ncol], |
|
|
391 | &swap.rend[p][prev_ncol], |
|
|
392 | ncol - prev_ncol, setrstyle); |
|
|
393 | } |
|
|
394 | |
|
|
395 | } |
412 | } |
396 | |
413 | |
397 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
414 | free (screen.text); screen.text = tp; |
398 | MIN_IT (swap.cur.col, (int16_t)ncol - 1); |
415 | free (screen.rend); screen.rend = rp; |
|
|
416 | free (screen.tlen); screen.tlen = tl; |
399 | |
417 | |
400 | delete talloc; talloc = ta; |
418 | for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D |
401 | delete ralloc; ralloc = ra; |
419 | #endif |
402 | } |
|
|
403 | |
420 | |
404 | if (tabs) |
421 | if (tabs) |
405 | free (tabs); |
422 | free (tabs); |
406 | } |
423 | } |
407 | |
424 | |
… | |
… | |
417 | } |
434 | } |
418 | |
435 | |
419 | void |
436 | void |
420 | rxvt_term::scr_reset_realloc () |
437 | rxvt_term::scr_reset_realloc () |
421 | { |
438 | { |
422 | unsigned int total_rows, nrow; |
|
|
423 | |
|
|
424 | nrow = TermWin.nrow; |
|
|
425 | total_rows = nrow + TermWin.saveLines; |
|
|
426 | /* *INDENT-OFF* */ |
|
|
427 | screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); |
|
|
428 | buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *)); |
|
|
429 | drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *)); |
|
|
430 | swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *)); |
439 | swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t)); |
431 | |
440 | drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t)); |
432 | screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t)); |
441 | buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t)); |
433 | swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t)); |
442 | save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t)); |
434 | |
|
|
435 | screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *)); |
|
|
436 | buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *)); |
|
|
437 | drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *)); |
|
|
438 | swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *)); |
|
|
439 | /* *INDENT-ON* */ |
|
|
440 | } |
443 | } |
441 | |
444 | |
442 | /* ------------------------------------------------------------------------- */ |
445 | /* ------------------------------------------------------------------------- */ |
443 | /* |
446 | /* |
444 | * Free everything. That way malloc debugging can find leakage. |
447 | * Free everything. That way malloc debugging can find leakage. |
445 | */ |
448 | */ |
446 | void |
449 | void |
447 | rxvt_term::scr_release () |
450 | rxvt_term::scr_release () |
448 | { |
451 | { |
449 | unsigned int total_rows; |
|
|
450 | int i; |
|
|
451 | |
|
|
452 | total_rows = TermWin.nrow + TermWin.saveLines; |
|
|
453 | |
|
|
454 | delete talloc; talloc = 0; |
452 | delete talloc; talloc = 0; |
455 | delete ralloc; ralloc = 0; |
453 | delete ralloc; ralloc = 0; |
456 | |
454 | |
457 | free (screen.text); |
455 | free (save); |
458 | free (screen.tlen); |
456 | free (swap_save); |
459 | free (screen.rend); |
|
|
460 | free (drawn_text); |
457 | free (drawn); |
461 | free (drawn_rend); |
|
|
462 | free (swap.text); |
|
|
463 | free (swap.tlen); |
|
|
464 | free (swap.rend); |
|
|
465 | free (buf_text); |
458 | free (buf); |
466 | free (buf_rend); |
|
|
467 | free (tabs); |
459 | free (tabs); |
468 | |
|
|
469 | /* NULL these so if anything tries to use them, we'll know about it */ |
|
|
470 | screen.text = drawn_text = swap.text = NULL; |
|
|
471 | screen.rend = drawn_rend = swap.rend = NULL; |
|
|
472 | screen.tlen = swap.tlen = NULL; |
|
|
473 | buf_text = NULL; |
|
|
474 | buf_rend = NULL; |
|
|
475 | tabs = NULL; |
|
|
476 | } |
460 | } |
477 | |
461 | |
478 | /* ------------------------------------------------------------------------- */ |
462 | /* ------------------------------------------------------------------------- */ |
479 | /* |
463 | /* |
480 | * Hard reset |
464 | * Hard reset |
… | |
… | |
531 | set_font_style (); |
515 | set_font_style (); |
532 | break; |
516 | break; |
533 | } |
517 | } |
534 | |
518 | |
535 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
519 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
536 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
520 | min_it (s->cur.row, nrow - 1); |
537 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
521 | min_it (s->cur.col, ncol - 1); |
538 | #ifdef DEBUG_STRICT |
522 | #ifdef DEBUG_STRICT |
539 | assert (s->cur.row >= 0); |
523 | assert (s->cur.row >= 0); |
540 | assert (s->cur.col >= 0); |
524 | assert (s->cur.col >= 0); |
541 | #else /* drive with your eyes closed */ |
525 | #else /* drive with your eyes closed */ |
542 | MAX_IT (s->cur.row, 0); |
526 | max_it (s->cur.row, 0); |
543 | MAX_IT (s->cur.col, 0); |
527 | max_it (s->cur.col, 0); |
544 | #endif |
528 | #endif |
545 | } |
529 | } |
546 | |
530 | |
547 | /* ------------------------------------------------------------------------- */ |
531 | /* ------------------------------------------------------------------------- */ |
548 | /* |
532 | /* |
… | |
… | |
551 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
535 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
552 | */ |
536 | */ |
553 | int |
537 | int |
554 | rxvt_term::scr_change_screen (int scrn) |
538 | rxvt_term::scr_change_screen (int scrn) |
555 | { |
539 | { |
556 | int i; |
|
|
557 | #if NSCREENS |
|
|
558 | int offset; |
|
|
559 | #endif |
|
|
560 | |
|
|
561 | want_refresh = 1; |
540 | want_refresh = 1; |
562 | |
|
|
563 | TermWin.view_start = 0; |
541 | view_start = 0; |
564 | |
542 | |
565 | if (current_screen == scrn) |
543 | if (current_screen == scrn) |
566 | return scrn; |
544 | return scrn; |
567 | |
545 | |
568 | selection_check (2); /* check for boundary cross */ |
546 | selection_check (2); /* check for boundary cross */ |
569 | |
547 | |
570 | SWAP_IT (current_screen, scrn, int); |
548 | int i = current_screen; current_screen = scrn; scrn = i; |
|
|
549 | |
|
|
550 | ::swap (screen.cur.row, swap.cur.row); |
|
|
551 | ::swap (screen.cur.col, swap.cur.col); |
|
|
552 | |
|
|
553 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
554 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
555 | |
571 | #if NSCREENS |
556 | #if NSCREENS |
572 | if (options & Opt_secondaryScreen) |
557 | if (options & Opt_secondaryScreen) |
573 | { |
558 | { |
574 | num_scr = 0; |
559 | num_scr = 0; |
575 | offset = TermWin.saveLines; |
560 | |
576 | for (i = prev_nrow; i--;) |
561 | for (int i = nrow; i--; ) |
577 | { |
562 | ::swap (ROW(i), swap_save[i]); |
578 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
563 | |
579 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
|
|
580 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
|
|
581 | } |
|
|
582 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
|
|
583 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
|
|
584 | # ifdef DEBUG_STRICT |
|
|
585 | assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); |
|
|
586 | assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); |
|
|
587 | # else /* drive with your eyes closed */ |
|
|
588 | MAX_IT (screen.cur.row, 0); |
|
|
589 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
|
|
590 | MAX_IT (screen.cur.col, 0); |
|
|
591 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
|
|
592 | # endif |
|
|
593 | SWAP_IT (screen.charset, swap.charset, int16_t); |
564 | ::swap (screen.charset, swap.charset); |
594 | SWAP_IT (screen.flags, swap.flags, int); |
565 | ::swap (screen.flags, swap.flags); |
595 | screen.flags |= Screen_VisibleCursor; |
566 | screen.flags |= Screen_VisibleCursor; |
596 | swap.flags |= Screen_VisibleCursor; |
567 | swap.flags |= Screen_VisibleCursor; |
597 | } |
568 | } |
598 | else |
569 | else |
599 | #endif |
570 | #endif |
600 | if (options & Opt_secondaryScroll) |
571 | if (options & Opt_secondaryScroll) |
601 | //if (current_screen == PRIMARY) |
|
|
602 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
572 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
|
|
573 | |
603 | return scrn; |
574 | return scrn; |
604 | } |
575 | } |
605 | |
576 | |
606 | // clear WrapNext indicator, solidifying position on next line |
577 | // clear WrapNext indicator, solidifying position on next line |
607 | void |
578 | void |
… | |
… | |
613 | screen.flags &= ~Screen_WrapNext; |
584 | screen.flags &= ~Screen_WrapNext; |
614 | |
585 | |
615 | screen.cur.col = 0; |
586 | screen.cur.col = 0; |
616 | |
587 | |
617 | if (screen.cur.row == screen.bscroll) |
588 | if (screen.cur.row == screen.bscroll) |
618 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
589 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
619 | else if (screen.cur.row < TermWin.nrow - 1) |
590 | else if (screen.cur.row < nrow - 1) |
620 | screen.cur.row++; |
591 | screen.cur.row++; |
621 | } |
592 | } |
622 | |
593 | |
623 | /* ------------------------------------------------------------------------- */ |
594 | /* ------------------------------------------------------------------------- */ |
624 | /* |
595 | /* |
… | |
… | |
654 | /* ------------------------------------------------------------------------- */ |
625 | /* ------------------------------------------------------------------------- */ |
655 | /* |
626 | /* |
656 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
627 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
657 | * count positive ==> scroll up |
628 | * count positive ==> scroll up |
658 | * count negative ==> scroll down |
629 | * count negative ==> scroll down |
659 | * spec == 0 for normal routines |
|
|
660 | */ |
630 | */ |
661 | int |
631 | int |
662 | rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) |
632 | rxvt_term::scr_scroll_text (int row1, int row2, int count) |
663 | { |
633 | { |
664 | int i, j; |
|
|
665 | long nscrolled; |
|
|
666 | |
|
|
667 | if (count == 0 || (row1 > row2)) |
634 | if (count == 0 || (row1 > row2)) |
668 | return 0; |
635 | return 0; |
669 | |
636 | |
670 | want_refresh = 1; |
637 | want_refresh = 1; |
|
|
638 | num_scr += count; |
671 | |
639 | |
672 | if (row1 == 0 && count > 0 |
640 | if (count > 0 |
|
|
641 | && row1 == 0 |
|
|
642 | && row2 == nrow - 1 |
673 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
643 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
674 | { |
644 | { |
675 | nscrolled = (long)TermWin.nscrolled + (long)count; |
645 | nsaved = min (nsaved + count, saveLines); |
|
|
646 | term_start = (term_start + count) % total_rows; |
676 | |
647 | |
677 | if (nscrolled > (long)TermWin.saveLines) |
648 | if (selection.op && current_screen == selection.screen) |
678 | TermWin.nscrolled = TermWin.saveLines; |
649 | { |
|
|
650 | selection.beg.row -= count; |
|
|
651 | selection.end.row -= count; |
|
|
652 | selection.mark.row -= count; |
|
|
653 | |
|
|
654 | selection_check (0); |
|
|
655 | } |
|
|
656 | |
|
|
657 | for (int i = count; i--; ) |
|
|
658 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
679 | else |
659 | |
680 | TermWin.nscrolled = (unsigned int)nscrolled; |
|
|
681 | |
|
|
682 | if ((options & Opt_scrollWithBuffer) |
660 | if ((options & Opt_scrollWithBuffer) |
683 | && TermWin.view_start != 0 |
661 | && view_start != 0 |
684 | && TermWin.view_start != TermWin.saveLines) |
662 | && view_start != saveLines) |
685 | scr_page (UP, count); |
663 | scr_page (UP, count); |
686 | } |
664 | } |
687 | else if (!spec) |
665 | else |
688 | row1 += TermWin.saveLines; |
666 | { |
689 | |
|
|
690 | row2 += TermWin.saveLines; |
|
|
691 | |
|
|
692 | if (selection.op && current_screen == selection.screen) |
667 | if (selection.op && current_screen == selection.screen) |
693 | { |
668 | { |
694 | i = selection.beg.row + TermWin.saveLines; |
669 | int i = selection.beg.row; |
695 | j = selection.end.row + TermWin.saveLines; |
670 | int j = selection.end.row; |
|
|
671 | |
696 | if ((i < row1 && j > row1) |
672 | if ((i < row1 && j > row1) |
697 | || (i < row2 && j > row2) |
673 | || (i < row2 && j > row2) |
698 | || (i - count < row1 && i >= row1) |
674 | || (i - count < row1 && i >= row1) |
699 | || (i - count > row2 && i <= row2) |
675 | || (i - count > row2 && i <= row2) |
700 | || (j - count < row1 && j >= row1) |
676 | || (j - count < row1 && j >= row1) |
701 | || (j - count > row2 && j <= row2)) |
677 | || (j - count > row2 && j <= row2)) |
702 | { |
678 | { |
703 | CLEAR_ALL_SELECTION (); |
679 | CLEAR_ALL_SELECTION (); |
704 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
680 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
705 | } |
681 | } |
706 | else if (j >= row1 && j <= row2) |
682 | else if (j >= row1 && j <= row2) |
707 | { |
683 | { |
708 | /* move selected region too */ |
684 | /* move selected region too */ |
709 | selection.beg.row -= count; |
685 | selection.beg.row -= count; |
710 | selection.end.row -= count; |
686 | selection.end.row -= count; |
711 | selection.mark.row -= count; |
687 | selection.mark.row -= count; |
|
|
688 | |
|
|
689 | selection_check (0); |
712 | } |
690 | } |
713 | } |
|
|
714 | |
|
|
715 | selection_check (0); /* _after_ TermWin.nscrolled update */ |
|
|
716 | |
|
|
717 | num_scr += count; |
|
|
718 | j = count; |
|
|
719 | |
|
|
720 | if (count < 0) |
|
|
721 | count = -count; |
|
|
722 | |
|
|
723 | i = row2 - row1 + 1; |
|
|
724 | MIN_IT (count, i); |
|
|
725 | |
|
|
726 | if (j > 0) |
|
|
727 | { |
|
|
728 | /* A: scroll up */ |
|
|
729 | |
|
|
730 | /* A1: Copy lines that will get clobbered by the rotation */ |
|
|
731 | memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); |
|
|
732 | memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); |
|
|
733 | |
|
|
734 | /* A2: Rotate lines */ |
|
|
735 | i = row2 - row1 - count + 1; |
|
|
736 | memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); |
|
|
737 | memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); |
|
|
738 | memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); |
|
|
739 | |
|
|
740 | j = row2 - count + 1, i = count; |
|
|
741 | } |
|
|
742 | else /* if (j < 0) */ |
|
|
743 | { |
|
|
744 | /* B: scroll down */ |
|
|
745 | |
|
|
746 | /* B1: Copy lines that will get clobbered by the rotation */ |
|
|
747 | for (i = 0, j = row2; i < count; i++, j--) |
|
|
748 | { |
691 | } |
749 | buf_text[i] = screen.text[j]; |
692 | |
750 | buf_rend[i] = screen.rend[j]; |
693 | // use a simple and robust scrolling algorithm, this |
|
|
694 | // part of scr_scroll_text is not time-critical. |
|
|
695 | |
|
|
696 | int rows = row2 - row1 + 1; |
|
|
697 | |
|
|
698 | for (int row = 0; row < rows; row++) |
751 | } |
699 | { |
|
|
700 | buf [row] = ROW(row1 + (row + count + rows) % rows); |
752 | |
701 | |
753 | /* B2: Rotate lines */ |
702 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
754 | for (j = row2, i = j - count; i >= row1; i--, j--) |
703 | scr_blank_screen_mem (buf [row], rstyle); |
755 | { |
704 | } |
756 | screen.tlen[j] = screen.tlen[i]; |
|
|
757 | screen.text[j] = screen.text[i]; |
|
|
758 | screen.rend[j] = screen.rend[i]; |
|
|
759 | } |
|
|
760 | |
705 | |
761 | j = row1, i = count; |
706 | for (int row = 0; row < rows; row++) |
762 | count = -count; |
707 | ROW(row1 + row) = buf [row]; |
763 | } |
708 | } |
764 | |
|
|
765 | /* C: Resurrect lines */ |
|
|
766 | memset (screen.tlen + j, 0, i * sizeof (int16_t)); |
|
|
767 | memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); |
|
|
768 | memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); |
|
|
769 | if (!spec) /* line length may not equal TermWin.ncol */ |
|
|
770 | for (; i--; j++) |
|
|
771 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); |
|
|
772 | |
709 | |
773 | return count; |
710 | return count; |
774 | } |
711 | } |
775 | |
712 | |
776 | /* ------------------------------------------------------------------------- */ |
713 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
778 | * Add text given in <str> of length <len> to screen struct |
715 | * Add text given in <str> of length <len> to screen struct |
779 | */ |
716 | */ |
780 | void |
717 | void |
781 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
718 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
782 | { |
719 | { |
|
|
720 | if (len <= 0) /* sanity */ |
|
|
721 | return; |
|
|
722 | |
783 | unsigned char checksel; |
723 | unsigned char checksel; |
784 | unicode_t c; |
724 | unicode_t c; |
785 | int i, row, last_col; |
725 | int row, last_col; |
786 | text_t *stp; |
726 | const unicode_t *strend = str + len; |
787 | rend_t *srp; |
|
|
788 | |
|
|
789 | if (len <= 0) /* sanity */ |
|
|
790 | return; |
|
|
791 | |
727 | |
792 | want_refresh = 1; |
728 | want_refresh = 1; |
793 | ZERO_SCROLLBACK (); |
729 | ZERO_SCROLLBACK (); |
794 | last_col = TermWin.ncol; |
730 | last_col = ncol; |
795 | |
731 | |
796 | if (nlines > 0) |
732 | if (nlines > 0) |
797 | { |
733 | { |
798 | nlines += screen.cur.row - screen.bscroll; |
734 | nlines += screen.cur.row - screen.bscroll; |
799 | if ((nlines > 0) |
735 | if ((nlines > 0) |
800 | && (screen.tscroll == 0) |
736 | && (screen.tscroll == 0) |
801 | && (screen.bscroll == (TermWin.nrow - 1))) |
737 | && (screen.bscroll == (nrow - 1))) |
802 | { |
738 | { |
803 | /* _at least_ this many lines need to be scrolled */ |
739 | /* _at least_ this many lines need to be scrolled */ |
804 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
740 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines); |
805 | screen.cur.row -= nlines; |
741 | screen.cur.row -= nlines; |
806 | } |
742 | } |
807 | } |
743 | } |
808 | |
744 | |
809 | #ifdef DEBUG_STRICT |
745 | #ifdef DEBUG_STRICT |
810 | assert (screen.cur.col < last_col); |
746 | assert (screen.cur.col < last_col); |
811 | assert ((screen.cur.row < TermWin.nrow) |
747 | assert ((screen.cur.row < nrow) |
812 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
748 | && (screen.cur.row >= - (int32_t)nsaved)); |
813 | #else /* drive with your eyes closed */ |
749 | #else /* drive with your eyes closed */ |
814 | MIN_IT (screen.cur.col, last_col - 1); |
750 | min_it (screen.cur.col, last_col - 1); |
815 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
751 | min_it (screen.cur.row, (int32_t)nrow - 1); |
816 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
752 | max_it (screen.cur.row, - (int32_t)nsaved); |
817 | #endif |
753 | #endif |
818 | row = screen.cur.row + TermWin.saveLines; |
754 | row = screen.cur.row; |
819 | |
755 | |
820 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
756 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
821 | |
757 | |
822 | stp = screen.text[row]; |
758 | line_t *line = &ROW(row); |
823 | srp = screen.rend[row]; |
|
|
824 | |
759 | |
825 | while (len--) |
760 | while (str < strend) |
826 | { |
761 | { |
827 | c = *str++; |
762 | c = *str++; |
828 | |
763 | |
829 | if (c < 0x20) |
764 | if (c < 0x20) |
830 | switch (c) |
765 | if (c == C0_LF) |
|
|
766 | { |
|
|
767 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
768 | max_it (line->l, screen.cur.col); |
|
|
769 | |
|
|
770 | screen.flags &= ~Screen_WrapNext; |
|
|
771 | |
|
|
772 | if (screen.cur.row == screen.bscroll) |
|
|
773 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
|
|
774 | else if (screen.cur.row < (nrow - 1)) |
|
|
775 | row = ++screen.cur.row; |
|
|
776 | |
|
|
777 | line = &ROW(row); /* _must_ refresh */ |
|
|
778 | continue; |
|
|
779 | } |
|
|
780 | else if (c == C0_CR) |
831 | { |
781 | { |
832 | case C0_HT: |
782 | if (!line->is_longer ()) /* XXX: think about this */ |
833 | scr_tab (1, true); |
783 | max_it (line->l, screen.cur.col); |
834 | continue; |
|
|
835 | |
784 | |
836 | case C0_LF: |
|
|
837 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
838 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
839 | |
|
|
840 | screen.flags &= ~Screen_WrapNext; |
785 | screen.flags &= ~Screen_WrapNext; |
841 | |
|
|
842 | if (screen.cur.row == screen.bscroll) |
|
|
843 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
844 | else if (screen.cur.row < (TermWin.nrow - 1)) |
|
|
845 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
846 | |
|
|
847 | stp = screen.text[row]; /* _must_ refresh */ |
|
|
848 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
849 | continue; |
|
|
850 | |
|
|
851 | case C0_CR: |
|
|
852 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
853 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
854 | |
|
|
855 | screen.flags &= ~Screen_WrapNext; |
|
|
856 | screen.cur.col = 0; |
786 | screen.cur.col = 0; |
857 | continue; |
787 | continue; |
|
|
788 | } |
|
|
789 | else if (c == C0_HT) |
|
|
790 | { |
|
|
791 | scr_tab (1, true); |
|
|
792 | continue; |
858 | } |
793 | } |
859 | |
794 | |
860 | if (checksel /* see if we're writing within selection */ |
795 | if (checksel /* see if we're writing within selection */ |
861 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
796 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
862 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
797 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
… | |
… | |
870 | CLEAR_SELECTION (); |
805 | CLEAR_SELECTION (); |
871 | } |
806 | } |
872 | |
807 | |
873 | if (screen.flags & Screen_WrapNext) |
808 | if (screen.flags & Screen_WrapNext) |
874 | { |
809 | { |
875 | screen.tlen[row] = -1; |
810 | line->set_is_longer (); |
876 | |
811 | |
877 | scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; |
812 | scr_do_wrap (); |
878 | |
|
|
879 | stp = screen.text[row]; /* _must_ refresh */ |
|
|
880 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
881 | } |
813 | |
|
|
814 | row = screen.cur.row; |
|
|
815 | line = &ROW(row); /* _must_ refresh */ |
|
|
816 | } |
882 | |
817 | |
883 | if (screen.flags & Screen_Insert) |
818 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
884 | scr_insdel_chars (1, INSERT); |
819 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
|
|
820 | c = 0xfffd; |
885 | |
821 | |
886 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
822 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
887 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
823 | // do wcwidth before further replacements, as wcwidth might return -1 |
888 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
824 | // for the line drawing characters below as they might be invalid in the current |
|
|
825 | // locale. |
889 | int width = c < 0x100 ? 1 : wcwidth (c); |
826 | int width = c < 0x100 ? 1 : wcwidth (c); |
890 | |
827 | |
891 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
828 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
892 | { |
829 | { |
893 | // vt100 special graphics and line drawing |
830 | // vt100 special graphics and line drawing |
894 | // 5f-7e standard vt100 |
831 | // 5f-7e standard vt100 |
895 | // 40-5e rxvt extension for extra curses acs chars |
832 | // 40-5e rxvt extension for extra curses acs chars |
896 | static uint16_t vt100_0[63] = { // 5f .. 7e |
833 | static uint16_t vt100_0[62] = { // 41 .. 7e |
897 | 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! |
834 | 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman! |
898 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f |
835 | 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f |
899 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 |
836 | 0, 0, 0, 0, 0, 0, 0, 0, // 50-57 |
900 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f |
837 | 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f |
901 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
838 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
902 | 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f |
839 | 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f |
903 | 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 |
840 | 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 |
904 | 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e |
841 | 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e |
905 | }; |
842 | }; |
906 | |
843 | |
907 | if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) |
844 | if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41]) |
908 | { |
845 | { |
909 | c = vt100_0[c - 0x40]; |
846 | c = vt100_0[c - 0x41]; |
910 | width = 1; |
847 | width = 1; // vt100 line drawing characters are always single-width |
911 | } |
848 | } |
912 | } |
849 | } |
913 | |
850 | |
|
|
851 | if (screen.flags & Screen_Insert) |
|
|
852 | scr_insdel_chars (width, INSERT); |
|
|
853 | |
914 | if (width != 0) |
854 | if (width != 0) |
915 | { |
855 | { |
916 | // some utf-8 decoders decode surrogate characters. |
|
|
917 | if (0xd800 <= c && c <= 0xdfff) |
|
|
918 | c = 0xfffd; |
|
|
919 | |
|
|
920 | #if !UNICODE_3 |
856 | #if !UNICODE_3 |
921 | // trim characters we can't store directly :( |
857 | // trim characters we can't store directly :( |
922 | if (c >= 0x10000) |
858 | if (c >= 0x10000) |
923 | # if ENABLE_COMBINING |
859 | # if ENABLE_COMBINING |
924 | c = rxvt_composite.compose (c); // map to lower 16 bits |
860 | c = rxvt_composite.compose (c); // map to lower 16 bits |
… | |
… | |
926 | c = 0xfffd; |
862 | c = 0xfffd; |
927 | # endif |
863 | # endif |
928 | #endif |
864 | #endif |
929 | |
865 | |
930 | // nuke the character at this position, if required |
866 | // nuke the character at this position, if required |
931 | if (stp[screen.cur.col] == NOCHAR |
867 | if (line->t[screen.cur.col] == NOCHAR |
932 | || (screen.cur.col < TermWin.ncol - 1 |
868 | || (screen.cur.col < ncol - 1 |
933 | && stp[screen.cur.col + 1] == NOCHAR)) |
869 | && line->t[screen.cur.col + 1] == NOCHAR)) |
934 | { |
870 | { |
935 | int col = screen.cur.col; |
871 | int col = screen.cur.col; |
936 | |
872 | |
937 | // find begin |
873 | // find begin |
938 | while (col > 0 && stp[col] == NOCHAR) |
874 | while (col > 0 && line->t[col] == NOCHAR) |
939 | col--; |
875 | col--; |
940 | |
876 | |
941 | rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); |
877 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
942 | |
878 | |
943 | // found begin, nuke |
879 | // found begin, nuke |
944 | do { |
880 | do { |
945 | stp[col] = ' '; |
881 | line->t[col] = ' '; |
946 | srp[col] = rend; |
882 | line->r[col] = rend; |
947 | col++; |
883 | col++; |
948 | } while (col < TermWin.ncol && stp[col] == NOCHAR); |
884 | } while (col < ncol && line->t[col] == NOCHAR); |
949 | } |
885 | } |
950 | |
886 | |
951 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
887 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
888 | |
|
|
889 | // if the character doesn't fit into the remaining columns... |
|
|
890 | if (screen.cur.col > last_col - width && last_col >= width) |
|
|
891 | { |
|
|
892 | // ...output spaces |
|
|
893 | c = ' '; |
|
|
894 | // and try the same character next loop iteration |
|
|
895 | --str; |
|
|
896 | } |
952 | |
897 | |
953 | do |
898 | do |
954 | { |
899 | { |
955 | stp[screen.cur.col] = c; |
900 | line->t[screen.cur.col] = c; |
956 | srp[screen.cur.col] = rend; |
901 | line->r[screen.cur.col] = rend; |
957 | |
902 | |
958 | if (screen.cur.col < last_col - 1) |
903 | if (screen.cur.col < last_col - 1) |
959 | screen.cur.col++; |
904 | screen.cur.col++; |
960 | else |
905 | else |
961 | { |
906 | { |
962 | screen.tlen[row] = last_col; |
907 | line->l = last_col; |
963 | if (screen.flags & Screen_Autowrap) |
908 | if (screen.flags & Screen_Autowrap) |
964 | screen.flags |= Screen_WrapNext; |
909 | screen.flags |= Screen_WrapNext; |
965 | break; |
910 | break; |
966 | } |
911 | } |
967 | |
912 | |
968 | c = NOCHAR; |
913 | c = NOCHAR; |
969 | } |
914 | } |
970 | while (--width > 0); |
915 | while (--width > 0); |
971 | |
916 | |
972 | // pad with spaces when overwriting wide character with smaller one |
917 | // pad with spaces when overwriting wide character with smaller one |
|
|
918 | if (!width) |
973 | for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) |
919 | for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) |
974 | { |
920 | { |
975 | stp[c] = ' '; |
921 | line->t[c] = ' '; |
976 | srp[c] = rend; |
922 | line->r[c] = rend; |
977 | } |
923 | } |
978 | } |
924 | } |
979 | else if (width == 0) |
925 | else // width == 0 |
980 | { |
926 | { |
981 | #if ENABLE_COMBINING |
927 | #if ENABLE_COMBINING |
982 | // handle combining characters |
928 | // handle combining characters |
983 | // we just tag the accent on the previous on-screen character. |
929 | // we just tag the accent on the previous on-screen character. |
984 | // this is arguably not correct, but also arguably not wrong. |
930 | // this is arguably not correct, but also arguably not wrong. |
985 | // we don't handle double-width characters nicely yet. |
931 | // we don't handle double-width characters nicely yet. |
986 | |
|
|
987 | text_t *tp; |
932 | text_t *tp; |
988 | rend_t *rp; |
933 | rend_t *rp; |
989 | |
934 | |
990 | if (screen.cur.col > 0) |
935 | if (screen.cur.col > 0) |
991 | { |
936 | { |
992 | tp = stp + screen.cur.col - 1; |
937 | tp = line->t + screen.cur.col - 1; |
993 | rp = srp + screen.cur.col - 1; |
938 | rp = line->r + screen.cur.col - 1; |
994 | |
939 | |
995 | while (*tp == NOCHAR && tp > stp) |
940 | while (*tp == NOCHAR && tp > line->t) |
996 | tp--, rp--; |
941 | tp--, rp--; |
997 | } |
942 | } |
998 | else if (screen.cur.row > 0 |
943 | else if (screen.cur.row > 0 |
999 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
944 | && ROW(screen.cur.row - 1).is_longer ()) |
1000 | { |
945 | { |
1001 | int line = screen.cur.row - 1 + TermWin.saveLines; |
946 | line_t *line = &ROW(screen.cur.row - 1); |
1002 | |
947 | |
1003 | tp = screen.text[line] + last_col - 1; |
948 | tp = line->t + last_col - 1; |
1004 | rp = screen.rend[line] + last_col - 1; |
949 | rp = line->r + last_col - 1; |
1005 | |
950 | |
1006 | while (*tp == NOCHAR && tp > screen.text[line]) |
951 | while (*tp == NOCHAR && tp > line->t) |
1007 | tp--, rp--; |
952 | tp--, rp--; |
1008 | } |
953 | } |
1009 | else |
954 | else |
1010 | continue; |
955 | continue; |
1011 | |
956 | |
… | |
… | |
1018 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
963 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
1019 | #endif |
964 | #endif |
1020 | } |
965 | } |
1021 | } |
966 | } |
1022 | |
967 | |
1023 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
968 | if (!line->is_longer ()) /* XXX: think about this */ |
1024 | MAX_IT (screen.tlen[row], screen.cur.col); |
969 | max_it (line->l, screen.cur.col); |
1025 | |
970 | |
1026 | #ifdef DEBUG_STRICT |
971 | #ifdef DEBUG_STRICT |
1027 | assert (screen.cur.row >= 0); |
972 | assert (screen.cur.row >= 0); |
1028 | #else /* drive with your eyes closed */ |
973 | #else /* drive with your eyes closed */ |
1029 | MAX_IT (screen.cur.row, 0); |
974 | max_it (screen.cur.row, 0); |
1030 | #endif |
975 | #endif |
1031 | } |
976 | } |
1032 | |
977 | |
1033 | /* ------------------------------------------------------------------------- */ |
978 | /* ------------------------------------------------------------------------- */ |
1034 | /* |
979 | /* |
… | |
… | |
1043 | if (screen.cur.col == 0) |
988 | if (screen.cur.col == 0) |
1044 | { |
989 | { |
1045 | if (screen.cur.row > 0) |
990 | if (screen.cur.row > 0) |
1046 | { |
991 | { |
1047 | #ifdef TERMCAP_HAS_BW |
992 | #ifdef TERMCAP_HAS_BW |
1048 | screen.cur.col = TermWin.ncol - 1; |
993 | screen.cur.col = ncol - 1; |
1049 | screen.cur.row--; |
994 | screen.cur.row--; |
1050 | return; |
995 | return; |
1051 | #endif |
996 | #endif |
1052 | } |
997 | } |
1053 | } |
998 | } |
… | |
… | |
1073 | |
1018 | |
1074 | if (count == 0) |
1019 | if (count == 0) |
1075 | return; |
1020 | return; |
1076 | else if (count > 0) |
1021 | else if (count > 0) |
1077 | { |
1022 | { |
1078 | int row = TermWin.saveLines + screen.cur.row; |
1023 | int row = screen.cur.row; |
1079 | text_t *tp = screen.text[row]; |
1024 | |
1080 | rend_t *rp = screen.rend[row]; |
1025 | line_t &l = ROW(row); |
1081 | rend_t base_rend = rp[i]; |
1026 | rend_t base_rend = l.r[i]; |
1082 | ht &= tp[i] == ' '; |
1027 | ht &= l.t[i] == ' '; |
1083 | |
1028 | |
1084 | for (; ++i < TermWin.ncol; ) |
1029 | for (; ++i < ncol; ) |
1085 | if (tabs[i]) |
1030 | if (tabs[i]) |
1086 | { |
1031 | { |
1087 | x = i; |
1032 | x = i; |
1088 | if (!--count) |
1033 | if (!--count) |
1089 | break; |
1034 | break; |
1090 | } |
1035 | } |
1091 | else |
1036 | else |
1092 | ht &= tp[i] == ' ' |
1037 | ht &= l.t[i] == ' ' |
1093 | && RS_SAME (rp[i], base_rend); |
1038 | && RS_SAME (l.r[i], base_rend); |
1094 | |
1039 | |
1095 | if (count) |
1040 | if (count) |
1096 | x = TermWin.ncol - 1; |
1041 | x = ncol - 1; |
1097 | |
1042 | |
1098 | // store horizontal tab commands as characters inside the text |
1043 | // store horizontal tab commands as characters inside the text |
1099 | // buffer so they can be selected and pasted. |
1044 | // buffer so they can be selected and pasted. |
1100 | if (ht) |
1045 | if (ht && options & Opt_pastableTabs) |
1101 | { |
1046 | { |
1102 | base_rend = SET_FONT (base_rend, 0); |
1047 | base_rend = SET_FONT (base_rend, 0); |
1103 | |
1048 | |
1104 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
1049 | if (!l.is_longer ()) /* XXX: think about this */ |
1105 | MAX_IT (screen.tlen[row], x); |
1050 | max_it (l.l, x); |
1106 | |
1051 | |
1107 | i = screen.cur.col; |
1052 | i = screen.cur.col; |
1108 | |
1053 | |
1109 | tp[i] = '\t'; |
1054 | l.t[i] = '\t'; |
1110 | rp[i] = base_rend; |
1055 | l.r[i] = base_rend; |
1111 | |
1056 | |
1112 | while (++i < x) |
1057 | while (++i < x) |
1113 | { |
1058 | { |
1114 | tp[i] = NOCHAR; |
1059 | l.t[i] = NOCHAR; |
1115 | rp[i] = base_rend; |
1060 | l.r[i] = base_rend; |
1116 | } |
1061 | } |
1117 | } |
1062 | } |
1118 | } |
1063 | } |
1119 | else /* if (count < 0) */ |
1064 | else /* if (count < 0) */ |
1120 | { |
1065 | { |
… | |
… | |
1146 | rxvt_term::scr_backindex () |
1091 | rxvt_term::scr_backindex () |
1147 | { |
1092 | { |
1148 | if (screen.cur.col > 0) |
1093 | if (screen.cur.col > 0) |
1149 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1094 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1150 | else |
1095 | else |
1151 | { |
|
|
1152 | if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) |
|
|
1153 | return; /* um, yeah? */ |
|
|
1154 | |
|
|
1155 | scr_insdel_chars (1, INSERT); |
1096 | scr_insdel_chars (1, INSERT); |
1156 | } |
|
|
1157 | } |
1097 | } |
1158 | #endif |
1098 | #endif |
1159 | /* ------------------------------------------------------------------------- */ |
1099 | /* ------------------------------------------------------------------------- */ |
1160 | /* |
1100 | /* |
1161 | * Process DEC Forward Index |
1101 | * Process DEC Forward Index |
… | |
… | |
1165 | */ |
1105 | */ |
1166 | #if ENABLE_FRILLS |
1106 | #if ENABLE_FRILLS |
1167 | void |
1107 | void |
1168 | rxvt_term::scr_forwardindex () |
1108 | rxvt_term::scr_forwardindex () |
1169 | { |
1109 | { |
1170 | int row; |
1110 | int row; |
1171 | |
1111 | |
1172 | if (screen.cur.col < TermWin.ncol - 1) |
1112 | if (screen.cur.col < ncol - 1) |
1173 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1113 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1174 | else |
1114 | else |
1175 | { |
1115 | { |
1176 | row = screen.cur.row + TermWin.saveLines; |
1116 | row = screen.cur.row; |
1177 | |
1117 | |
1178 | if (screen.tlen[row] == 0) |
1118 | if (ROW(row).is_longer ()) //TODO//FIXME//LEN |
1179 | return; /* um, yeah? */ |
1119 | ROW(row).l = ncol; |
1180 | else if (screen.tlen[row] == -1) |
|
|
1181 | screen.tlen[row] = TermWin.ncol; |
|
|
1182 | |
1120 | |
1183 | scr_gotorc (0, 0, R_RELATIVE); |
1121 | scr_gotorc (0, 0, R_RELATIVE); |
1184 | scr_insdel_chars (1, DELETE); |
1122 | scr_insdel_chars (1, DELETE); |
1185 | scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); |
1123 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1186 | } |
1124 | } |
1187 | } |
1125 | } |
1188 | #endif |
1126 | #endif |
1189 | |
1127 | |
1190 | /* ------------------------------------------------------------------------- */ |
1128 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1196 | { |
1134 | { |
1197 | want_refresh = 1; |
1135 | want_refresh = 1; |
1198 | ZERO_SCROLLBACK (); |
1136 | ZERO_SCROLLBACK (); |
1199 | |
1137 | |
1200 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1138 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1201 | MAX_IT (screen.cur.col, 0); |
1139 | max_it (screen.cur.col, 0); |
1202 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1140 | min_it (screen.cur.col, (int32_t)ncol - 1); |
1203 | |
1141 | |
1204 | screen.flags &= ~Screen_WrapNext; |
1142 | screen.flags &= ~Screen_WrapNext; |
1205 | |
1143 | |
1206 | if (relative & R_RELATIVE) |
1144 | if (relative & R_RELATIVE) |
1207 | { |
1145 | { |
… | |
… | |
1225 | else |
1163 | else |
1226 | { |
1164 | { |
1227 | if (screen.flags & Screen_Relative) |
1165 | if (screen.flags & Screen_Relative) |
1228 | { /* relative origin mode */ |
1166 | { /* relative origin mode */ |
1229 | screen.cur.row = row + screen.tscroll; |
1167 | screen.cur.row = row + screen.tscroll; |
1230 | MIN_IT (screen.cur.row, screen.bscroll); |
1168 | min_it (screen.cur.row, screen.bscroll); |
1231 | } |
1169 | } |
1232 | else |
1170 | else |
1233 | screen.cur.row = row; |
1171 | screen.cur.row = row; |
1234 | } |
1172 | } |
1235 | |
1173 | |
1236 | MAX_IT (screen.cur.row, 0); |
1174 | max_it (screen.cur.row, 0); |
1237 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1175 | min_it (screen.cur.row, (int32_t)nrow - 1); |
1238 | } |
1176 | } |
1239 | |
1177 | |
1240 | /* ------------------------------------------------------------------------- */ |
1178 | /* ------------------------------------------------------------------------- */ |
1241 | /* |
1179 | /* |
1242 | * direction should be UP or DN |
1180 | * direction should be UP or DN |
… | |
… | |
1253 | |
1191 | |
1254 | screen.flags &= ~Screen_WrapNext; |
1192 | screen.flags &= ~Screen_WrapNext; |
1255 | |
1193 | |
1256 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1194 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1257 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1195 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1258 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1196 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn); |
1259 | else |
1197 | else |
1260 | screen.cur.row += dirn; |
1198 | screen.cur.row += dirn; |
1261 | |
1199 | |
1262 | MAX_IT (screen.cur.row, 0); |
1200 | max_it (screen.cur.row, 0); |
1263 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1201 | min_it (screen.cur.row, (int32_t)nrow - 1); |
1264 | selection_check (0); |
1202 | selection_check (0); |
1265 | } |
1203 | } |
1266 | |
1204 | |
1267 | /* ------------------------------------------------------------------------- */ |
1205 | /* ------------------------------------------------------------------------- */ |
1268 | /* |
1206 | /* |
… | |
… | |
1279 | want_refresh = 1; |
1217 | want_refresh = 1; |
1280 | ZERO_SCROLLBACK (); |
1218 | ZERO_SCROLLBACK (); |
1281 | |
1219 | |
1282 | selection_check (1); |
1220 | selection_check (1); |
1283 | |
1221 | |
1284 | row = TermWin.saveLines + screen.cur.row; |
1222 | row = screen.cur.row; |
|
|
1223 | |
1285 | switch (mode) |
1224 | switch (mode) |
1286 | { |
1225 | { |
1287 | case 0: /* erase to end of line */ |
1226 | case 0: /* erase to end of line */ |
1288 | col = screen.cur.col; |
1227 | col = screen.cur.col; |
1289 | num = TermWin.ncol - col; |
1228 | num = ncol - col; |
1290 | MIN_IT (screen.tlen[row], (int16_t)col); |
1229 | min_it (ROW(row).l, (int16_t)col); |
1291 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1230 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1292 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1231 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1293 | CLEAR_SELECTION (); |
1232 | CLEAR_SELECTION (); |
1294 | break; |
1233 | break; |
1295 | case 1: /* erase to beginning of line */ |
1234 | case 1: /* erase to beginning of line */ |
… | |
… | |
1299 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1238 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1300 | CLEAR_SELECTION (); |
1239 | CLEAR_SELECTION (); |
1301 | break; |
1240 | break; |
1302 | case 2: /* erase whole line */ |
1241 | case 2: /* erase whole line */ |
1303 | col = 0; |
1242 | col = 0; |
1304 | num = TermWin.ncol; |
1243 | num = ncol; |
1305 | screen.tlen[row] = 0; |
1244 | ROW(row).l = 0; |
1306 | if (selection.beg.row <= screen.cur.row |
1245 | if (selection.beg.row <= screen.cur.row |
1307 | && selection.end.row >= screen.cur.row) |
1246 | && selection.end.row >= screen.cur.row) |
1308 | CLEAR_SELECTION (); |
1247 | CLEAR_SELECTION (); |
1309 | break; |
1248 | break; |
1310 | default: |
1249 | default: |
1311 | return; |
1250 | return; |
1312 | } |
1251 | } |
1313 | |
1252 | |
1314 | if (screen.text[row]) |
1253 | scr_blank_line (ROW(row), col, num, rstyle); |
1315 | scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle); |
|
|
1316 | else |
|
|
1317 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
|
|
1318 | } |
1254 | } |
1319 | |
1255 | |
1320 | /* ------------------------------------------------------------------------- */ |
1256 | /* ------------------------------------------------------------------------- */ |
1321 | /* |
1257 | /* |
1322 | * Erase part of whole of the screen |
1258 | * Erase part of whole of the screen |
… | |
… | |
1326 | */ |
1262 | */ |
1327 | void |
1263 | void |
1328 | rxvt_term::scr_erase_screen (int mode) |
1264 | rxvt_term::scr_erase_screen (int mode) |
1329 | { |
1265 | { |
1330 | int num; |
1266 | int num; |
1331 | int32_t row, row_offset; |
1267 | int32_t row; |
1332 | rend_t ren; |
1268 | rend_t ren; |
1333 | XGCValues gcvalue; |
1269 | XGCValues gcvalue; |
1334 | |
1270 | |
1335 | want_refresh = 1; |
1271 | want_refresh = 1; |
1336 | ZERO_SCROLLBACK (); |
1272 | ZERO_SCROLLBACK (); |
1337 | |
|
|
1338 | row_offset = (int32_t)TermWin.saveLines; |
|
|
1339 | |
1273 | |
1340 | switch (mode) |
1274 | switch (mode) |
1341 | { |
1275 | { |
1342 | case 0: /* erase to end of screen */ |
1276 | case 0: /* erase to end of screen */ |
1343 | selection_check (1); |
1277 | selection_check (1); |
1344 | scr_erase_line (0); |
1278 | scr_erase_line (0); |
1345 | row = screen.cur.row + 1; /* possible OOB */ |
1279 | row = screen.cur.row + 1; /* possible OOB */ |
1346 | num = TermWin.nrow - row; |
1280 | num = nrow - row; |
1347 | break; |
1281 | break; |
1348 | case 1: /* erase to beginning of screen */ |
1282 | case 1: /* erase to beginning of screen */ |
1349 | selection_check (3); |
1283 | selection_check (3); |
1350 | scr_erase_line (1); |
1284 | scr_erase_line (1); |
1351 | row = 0; |
1285 | row = 0; |
1352 | num = screen.cur.row; |
1286 | num = screen.cur.row; |
1353 | break; |
1287 | break; |
1354 | case 2: /* erase whole screen */ |
1288 | case 2: /* erase whole screen */ |
1355 | selection_check (3); |
1289 | selection_check (3); |
1356 | row = 0; |
1290 | row = 0; |
1357 | num = TermWin.nrow; |
1291 | num = nrow; |
1358 | break; |
1292 | break; |
1359 | default: |
1293 | default: |
1360 | return; |
1294 | return; |
1361 | } |
1295 | } |
1362 | |
1296 | |
… | |
… | |
1364 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1298 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1365 | || (selection.end.row >= row |
1299 | || (selection.end.row >= row |
1366 | && selection.end.row <= row + num))) |
1300 | && selection.end.row <= row + num))) |
1367 | CLEAR_SELECTION (); |
1301 | CLEAR_SELECTION (); |
1368 | |
1302 | |
1369 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1303 | if (row >= nrow) /* Out Of Bounds */ |
1370 | return; |
1304 | return; |
1371 | |
1305 | |
1372 | MIN_IT (num, (TermWin.nrow - row)); |
1306 | min_it (num, (nrow - row)); |
1373 | |
1307 | |
1374 | if (rstyle & (RS_RVid | RS_Uline)) |
1308 | if (rstyle & (RS_RVid | RS_Uline)) |
1375 | ren = (rend_t) ~RS_None; |
1309 | ren = (rend_t) ~RS_None; |
1376 | else if (GET_BASEBG (rstyle) == Color_bg) |
1310 | else if (GET_BASEBG (rstyle) == Color_bg) |
1377 | { |
1311 | { |
1378 | ren = DEFAULT_RSTYLE; |
1312 | ren = DEFAULT_RSTYLE; |
1379 | CLEAR_ROWS (row, num); |
1313 | CLEAR_ROWS (row, num); |
1380 | } |
1314 | } |
1381 | else |
1315 | else |
1382 | { |
1316 | { |
1383 | ren = (rstyle & (RS_fgMask | RS_bgMask)); |
1317 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1384 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1318 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1385 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1319 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1386 | ERASE_ROWS (row, num); |
1320 | ERASE_ROWS (row, num); |
1387 | gcvalue.foreground = pix_colors[Color_fg]; |
1321 | gcvalue.foreground = pix_colors[Color_fg]; |
1388 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1322 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1389 | } |
1323 | } |
1390 | |
1324 | |
1391 | for (; num--; row++) |
1325 | for (; num--; row++) |
1392 | { |
1326 | { |
1393 | scr_blank_screen_mem (screen.text, screen.rend, |
1327 | scr_blank_screen_mem (ROW (row), rstyle); |
1394 | (unsigned int) (row + row_offset), rstyle); |
1328 | ROW (row).l = 0; |
1395 | screen.tlen[row + row_offset] = 0; |
1329 | scr_blank_line (drawn[row], 0, ncol, ren); |
1396 | scr_blank_line (drawn_text[row], drawn_rend[row], |
|
|
1397 | (unsigned int)TermWin.ncol, ren); |
|
|
1398 | } |
1330 | } |
1399 | } |
1331 | } |
|
|
1332 | |
|
|
1333 | #if ENABLE_FRILLS |
|
|
1334 | void |
|
|
1335 | rxvt_term::scr_erase_savelines () |
|
|
1336 | { |
|
|
1337 | want_refresh = 1; |
|
|
1338 | ZERO_SCROLLBACK (); |
|
|
1339 | |
|
|
1340 | nsaved = 0; |
|
|
1341 | } |
|
|
1342 | #endif |
1400 | |
1343 | |
1401 | /* ------------------------------------------------------------------------- */ |
1344 | /* ------------------------------------------------------------------------- */ |
1402 | /* |
1345 | /* |
1403 | * Fill the screen with `E's |
1346 | * Fill the screen with `E's |
1404 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1347 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1405 | */ |
1348 | */ |
1406 | void |
1349 | void |
1407 | rxvt_term::scr_E () |
1350 | rxvt_term::scr_E () |
1408 | { |
1351 | { |
1409 | int i, j, k; |
1352 | rend_t fs; |
1410 | rend_t *r1, fs; |
|
|
1411 | |
1353 | |
1412 | want_refresh = 1; |
1354 | want_refresh = 1; |
1413 | ZERO_SCROLLBACK (); |
1355 | ZERO_SCROLLBACK (); |
1414 | |
1356 | |
1415 | num_scr_allow = 0; |
1357 | num_scr_allow = 0; |
1416 | selection_check (3); |
1358 | selection_check (3); |
1417 | |
1359 | |
1418 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1360 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1419 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1361 | for (int row = nrow; row--; ) |
1420 | { |
1362 | { |
1421 | screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ |
1363 | line_t &line = ROW(row); |
|
|
1364 | |
1422 | fill_text (screen.text[k], 'E', TermWin.ncol); |
1365 | fill_text (line.t, 'E', ncol); |
1423 | for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) |
1366 | rend_t *r1 = line.r; |
|
|
1367 | |
|
|
1368 | for (int j = ncol; j--; ) |
1424 | *r1++ = fs; |
1369 | *r1++ = fs; |
|
|
1370 | |
|
|
1371 | line.l = ncol; /* make the `E's selectable */ |
1425 | } |
1372 | } |
1426 | } |
1373 | } |
1427 | |
1374 | |
1428 | /* ------------------------------------------------------------------------- */ |
1375 | /* ------------------------------------------------------------------------- */ |
1429 | /* |
1376 | /* |
… | |
… | |
1450 | count = end; |
1397 | count = end; |
1451 | } |
1398 | } |
1452 | |
1399 | |
1453 | scr_do_wrap (); |
1400 | scr_do_wrap (); |
1454 | |
1401 | |
1455 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); |
1402 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count); |
1456 | } |
1403 | } |
1457 | |
1404 | |
1458 | /* ------------------------------------------------------------------------- */ |
1405 | /* ------------------------------------------------------------------------- */ |
1459 | /* |
1406 | /* |
1460 | * Insert/Delete <count> characters from the current position |
1407 | * Insert/Delete <count> characters from the current position |
… | |
… | |
1462 | void |
1409 | void |
1463 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1410 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1464 | { |
1411 | { |
1465 | int col, row; |
1412 | int col, row; |
1466 | rend_t tr; |
1413 | rend_t tr; |
1467 | text_t *stp; |
|
|
1468 | rend_t *srp; |
|
|
1469 | int16_t *slp; |
|
|
1470 | |
1414 | |
1471 | want_refresh = 1; |
1415 | want_refresh = 1; |
1472 | ZERO_SCROLLBACK (); |
1416 | ZERO_SCROLLBACK (); |
1473 | |
1417 | |
1474 | if (count <= 0) |
1418 | if (count <= 0) |
1475 | return; |
1419 | return; |
1476 | |
1420 | |
1477 | scr_do_wrap (); |
1421 | scr_do_wrap (); |
1478 | |
1422 | |
1479 | selection_check (1); |
1423 | selection_check (1); |
1480 | MIN_IT (count, (TermWin.ncol - screen.cur.col)); |
1424 | min_it (count, (ncol - screen.cur.col)); |
1481 | |
1425 | |
1482 | row = screen.cur.row + TermWin.saveLines; |
|
|
1483 | |
|
|
1484 | stp = screen.text[row]; |
|
|
1485 | srp = screen.rend[row]; |
1426 | row = screen.cur.row; |
1486 | slp = &screen.tlen[row]; |
1427 | |
|
|
1428 | line_t *line = &ROW(row); |
1487 | |
1429 | |
1488 | switch (insdel) |
1430 | switch (insdel) |
1489 | { |
1431 | { |
1490 | case INSERT: |
1432 | case INSERT: |
1491 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) |
1433 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1492 | { |
1434 | { |
1493 | stp[col] = stp[col - count]; |
1435 | line->t[col] = line->t[col - count]; |
1494 | srp[col] = srp[col - count]; |
1436 | line->r[col] = line->r[col - count]; |
1495 | } |
1437 | } |
1496 | |
1438 | |
1497 | if (*slp != -1) |
1439 | if (!line->is_longer ()) |
1498 | { |
1440 | { |
1499 | *slp += count; |
1441 | line->l += count; |
1500 | MIN_IT (*slp, TermWin.ncol); |
1442 | min_it (line->l, ncol); |
1501 | } |
1443 | } |
1502 | |
1444 | |
1503 | if (selection.op && current_screen == selection.screen |
1445 | if (selection.op && current_screen == selection.screen |
1504 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1446 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1505 | { |
1447 | { |
1506 | if (selection.end.row != screen.cur.row |
1448 | if (selection.end.row != screen.cur.row |
1507 | || (selection.end.col + count >= TermWin.ncol)) |
1449 | || (selection.end.col + count >= ncol)) |
1508 | CLEAR_SELECTION (); |
1450 | CLEAR_SELECTION (); |
1509 | else |
1451 | else |
1510 | { /* shift selection */ |
1452 | { /* shift selection */ |
1511 | selection.beg.col += count; |
1453 | selection.beg.col += count; |
1512 | selection.mark.col += count; /* XXX: yes? */ |
1454 | selection.mark.col += count; /* XXX: yes? */ |
1513 | selection.end.col += count; |
1455 | selection.end.col += count; |
1514 | } |
1456 | } |
1515 | } |
1457 | } |
1516 | |
1458 | |
1517 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1459 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1518 | (unsigned int)count, rstyle); |
|
|
1519 | break; |
1460 | break; |
1520 | |
1461 | |
1521 | case ERASE: |
1462 | case ERASE: |
1522 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1463 | screen.cur.col += count; /* don't worry if > ncol */ |
1523 | selection_check (1); |
1464 | selection_check (1); |
1524 | screen.cur.col -= count; |
1465 | screen.cur.col -= count; |
1525 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1466 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1526 | (unsigned int)count, rstyle); |
|
|
1527 | break; |
1467 | break; |
1528 | |
1468 | |
1529 | case DELETE: |
1469 | case DELETE: |
1530 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1470 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1531 | |
1471 | |
1532 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1472 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1533 | { |
1473 | { |
1534 | stp[col] = stp[col + count]; |
1474 | line->t[col] = line->t[col + count]; |
1535 | srp[col] = srp[col + count]; |
1475 | line->r[col] = line->r[col + count]; |
1536 | } |
1476 | } |
1537 | |
1477 | |
1538 | scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], |
1478 | scr_blank_line (*line, ncol - count, count, tr); |
1539 | (unsigned int)count, tr); |
|
|
1540 | |
1479 | |
1541 | if (*slp == -1) /* break line continuation */ |
1480 | if (line->is_longer ()) /* break line continuation */ |
1542 | *slp = TermWin.ncol; |
1481 | line->l = ncol; |
1543 | |
1482 | |
1544 | *slp -= count; |
1483 | max_it (line->l - count, 0); |
1545 | MAX_IT (*slp, 0); |
|
|
1546 | |
1484 | |
1547 | if (selection.op && current_screen == selection.screen |
1485 | if (selection.op && current_screen == selection.screen |
1548 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1486 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1549 | { |
1487 | { |
1550 | if (selection.end.row != screen.cur.row |
1488 | if (selection.end.row != screen.cur.row |
1551 | || (screen.cur.col >= selection.beg.col - count) |
1489 | || (screen.cur.col >= selection.beg.col - count) |
1552 | || selection.end.col >= TermWin.ncol) |
1490 | || selection.end.col >= ncol) |
1553 | CLEAR_SELECTION (); |
1491 | CLEAR_SELECTION (); |
1554 | else |
1492 | else |
1555 | { |
1493 | { |
1556 | /* shift selection */ |
1494 | /* shift selection */ |
1557 | selection.beg.col -= count; |
1495 | selection.beg.col -= count; |
… | |
… | |
1570 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1508 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1571 | */ |
1509 | */ |
1572 | void |
1510 | void |
1573 | rxvt_term::scr_scroll_region (int top, int bot) |
1511 | rxvt_term::scr_scroll_region (int top, int bot) |
1574 | { |
1512 | { |
1575 | MAX_IT (top, 0); |
1513 | max_it (top, 0); |
1576 | MIN_IT (bot, (int)TermWin.nrow - 1); |
1514 | min_it (bot, (int)nrow - 1); |
1577 | |
1515 | |
1578 | if (top > bot) |
1516 | if (top > bot) |
1579 | return; |
1517 | return; |
1580 | |
1518 | |
1581 | screen.tscroll = top; |
1519 | screen.tscroll = top; |
… | |
… | |
1660 | */ |
1598 | */ |
1661 | void |
1599 | void |
1662 | rxvt_term::scr_set_tab (int mode) |
1600 | rxvt_term::scr_set_tab (int mode) |
1663 | { |
1601 | { |
1664 | if (mode < 0) |
1602 | if (mode < 0) |
1665 | memset (tabs, 0, TermWin.ncol * sizeof (char)); |
1603 | memset (tabs, 0, ncol * sizeof (char)); |
1666 | else if (screen.cur.col < TermWin.ncol) |
1604 | else if (screen.cur.col < ncol) |
1667 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1605 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1668 | } |
1606 | } |
1669 | |
1607 | |
1670 | /* ------------------------------------------------------------------------- */ |
1608 | /* ------------------------------------------------------------------------- */ |
1671 | /* |
1609 | /* |
… | |
… | |
1679 | XGCValues gcvalue; |
1617 | XGCValues gcvalue; |
1680 | |
1618 | |
1681 | if (rvideo != mode) |
1619 | if (rvideo != mode) |
1682 | { |
1620 | { |
1683 | rvideo = mode; |
1621 | rvideo = mode; |
1684 | SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); |
1622 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1685 | #if XPM_BACKGROUND |
1623 | #if XPM_BACKGROUND |
1686 | if (bgPixmap.pixmap == None) |
1624 | if (bgPixmap.pixmap == None) |
1687 | #endif |
1625 | #endif |
1688 | #if TRANSPARENT |
1626 | #if TRANSPARENT |
1689 | if (! (options & Opt_transparent) || am_transparent == 0) |
1627 | if (! (options & Opt_transparent) || am_transparent == 0) |
1690 | #endif |
1628 | #endif |
1691 | XSetWindowBackground (display->display, TermWin.vt, |
1629 | XSetWindowBackground (display->display, vt, |
1692 | pix_colors[Color_bg]); |
1630 | pix_colors[Color_bg]); |
1693 | |
1631 | |
1694 | gcvalue.foreground = pix_colors[Color_fg]; |
1632 | gcvalue.foreground = pix_colors[Color_fg]; |
1695 | gcvalue.background = pix_colors[Color_bg]; |
1633 | gcvalue.background = pix_colors[Color_bg]; |
1696 | XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, |
1634 | XChangeGC (display->display, gc, GCBackground | GCForeground, |
1697 | &gcvalue); |
1635 | &gcvalue); |
1698 | scr_clear (); |
1636 | scr_clear (); |
1699 | scr_touch (true); |
1637 | scr_touch (true); |
1700 | } |
1638 | } |
1701 | } |
1639 | } |
… | |
… | |
1782 | bool |
1720 | bool |
1783 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1721 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1784 | { |
1722 | { |
1785 | bool found = false; |
1723 | bool found = false; |
1786 | |
1724 | |
1787 | for (int i = 0; i < TermWin.nrow; i++) |
1725 | for (int i = 0; i < nrow; i++) |
1788 | { |
1726 | { |
1789 | int col = 0; |
1727 | int col = 0; |
1790 | rend_t *drp = drawn_rend [i]; |
1728 | rend_t *drp = drawn[i].r; |
1791 | |
1729 | |
1792 | for (; col < TermWin.ncol; col++, drp++) |
1730 | for (; col < ncol; col++, drp++) |
1793 | if ((*drp & mask) == value) |
1731 | if ((*drp & mask) == value) |
1794 | { |
1732 | { |
1795 | found = true; |
1733 | found = true; |
1796 | *drp = ~value; |
1734 | *drp = ~value; |
1797 | } |
1735 | } |
… | |
… | |
1808 | PART_END, |
1746 | PART_END, |
1809 | RC_COUNT |
1747 | RC_COUNT |
1810 | }; |
1748 | }; |
1811 | |
1749 | |
1812 | void |
1750 | void |
1813 | rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) |
1751 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1814 | { |
1752 | { |
1815 | int i; |
1753 | int i; |
1816 | row_col_t rc[RC_COUNT]; |
1754 | row_col_t rc[RC_COUNT]; |
1817 | |
1755 | |
1818 | if (drawn_text == NULL) /* sanity check */ |
1756 | if (!drawn) /* sanity check */ |
1819 | return; |
1757 | return; |
1820 | |
1758 | |
1821 | #ifndef NO_SLOW_LINK_SUPPORT |
1759 | #ifndef NO_SLOW_LINK_SUPPORT |
1822 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1760 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1823 | { |
1761 | { |
1824 | y = 0; |
1762 | y = 0; |
1825 | height = TermWin.height; |
1763 | eheight = height; |
1826 | } |
1764 | } |
1827 | #endif |
1765 | #endif |
1828 | |
1766 | |
1829 | #ifdef DEBUG_STRICT |
1767 | #ifdef DEBUG_STRICT |
1830 | x = max (x, 0); |
1768 | #if 0 |
1831 | x = min (x, (int)TermWin.width); |
1769 | // that's not debugging //TODO //FIXME |
1832 | y = max (y, 0); |
1770 | clamp_it (x, 0, width); |
1833 | y = min (y, (int)TermWin.height); |
1771 | clamp_it (y, 0, height); |
|
|
1772 | #endif |
1834 | #endif |
1773 | #endif |
1835 | |
1774 | |
1836 | /* round down */ |
1775 | /* round down */ |
1837 | rc[PART_BEG].col = Pixel2Col (x); |
1776 | rc[PART_BEG].col = Pixel2Col (x); |
1838 | rc[PART_BEG].row = Pixel2Row (y); |
1777 | rc[PART_BEG].row = Pixel2Row (y); |
1839 | /* round up */ |
1778 | /* round up */ |
1840 | rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); |
1779 | rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1); |
1841 | rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); |
1780 | rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); |
1842 | |
1781 | |
1843 | /* sanity checks */ |
1782 | /* sanity checks */ |
1844 | for (i = PART_BEG; i < RC_COUNT; i++) |
1783 | for (i = PART_BEG; i < RC_COUNT; i++) |
1845 | { |
1784 | { |
1846 | MIN_IT (rc[i].col, TermWin.ncol - 1); |
1785 | min_it (rc[i].col, ncol - 1); |
1847 | MIN_IT (rc[i].row, TermWin.nrow - 1); |
1786 | min_it (rc[i].row, nrow - 1); |
1848 | } |
1787 | } |
1849 | |
1788 | |
1850 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1789 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1851 | fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1790 | fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1852 | |
1791 | |
1853 | if (refresh) |
1792 | if (refresh) |
1854 | scr_refresh (SLOW_REFRESH); |
1793 | scr_refresh (SLOW_REFRESH); |
1855 | } |
1794 | } |
1856 | |
1795 | |
… | |
… | |
1859 | * Refresh the entire screen |
1798 | * Refresh the entire screen |
1860 | */ |
1799 | */ |
1861 | void |
1800 | void |
1862 | rxvt_term::scr_touch (bool refresh) |
1801 | rxvt_term::scr_touch (bool refresh) |
1863 | { |
1802 | { |
1864 | scr_expose (0, 0, TermWin.width, TermWin.height, refresh); |
1803 | scr_expose (0, 0, width, height, refresh); |
1865 | } |
1804 | } |
1866 | |
1805 | |
1867 | /* ------------------------------------------------------------------------- */ |
1806 | /* ------------------------------------------------------------------------- */ |
1868 | /* |
1807 | /* |
1869 | * Move the display so that the line represented by scrollbar value Y is at |
1808 | * Move the display so that the line represented by scrollbar value Y is at |
… | |
… | |
1873 | rxvt_term::scr_move_to (int y, int len) |
1812 | rxvt_term::scr_move_to (int y, int len) |
1874 | { |
1813 | { |
1875 | long p = 0; |
1814 | long p = 0; |
1876 | unsigned int oldviewstart; |
1815 | unsigned int oldviewstart; |
1877 | |
1816 | |
1878 | oldviewstart = TermWin.view_start; |
1817 | oldviewstart = view_start; |
1879 | |
1818 | |
1880 | if (y < len) |
1819 | if (y < len) |
1881 | { |
1820 | { |
1882 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1821 | p = (nrow + nsaved) * (len - y) / len; |
1883 | p -= (long) (TermWin.nrow - 1); |
1822 | p -= (long) (nrow - 1); |
1884 | p = max (p, 0); |
1823 | p = max (p, 0); |
1885 | } |
1824 | } |
1886 | |
1825 | |
1887 | TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); |
1826 | view_start = (unsigned int)min (p, nsaved); |
1888 | |
1827 | |
1889 | return scr_changeview (oldviewstart); |
1828 | return scr_changeview (oldviewstart); |
1890 | } |
1829 | } |
1891 | |
1830 | |
1892 | /* ------------------------------------------------------------------------- */ |
1831 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1898 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1837 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1899 | { |
1838 | { |
1900 | int n; |
1839 | int n; |
1901 | unsigned int oldviewstart; |
1840 | unsigned int oldviewstart; |
1902 | |
1841 | |
1903 | #ifdef DEBUG_STRICT |
|
|
1904 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
|
|
1905 | #endif |
|
|
1906 | oldviewstart = TermWin.view_start; |
1842 | oldviewstart = view_start; |
|
|
1843 | |
1907 | if (direction == UP) |
1844 | if (direction == UP) |
1908 | { |
1845 | { |
1909 | n = TermWin.view_start + nlines; |
1846 | n = view_start + nlines; |
1910 | TermWin.view_start = min (n, TermWin.nscrolled); |
1847 | view_start = min (n, nsaved); |
1911 | } |
1848 | } |
1912 | else |
1849 | else |
1913 | { |
1850 | { |
1914 | n = TermWin.view_start - nlines; |
1851 | n = view_start - nlines; |
1915 | TermWin.view_start = max (n, 0); |
1852 | view_start = max (n, 0); |
1916 | } |
1853 | } |
|
|
1854 | |
1917 | return scr_changeview (oldviewstart); |
1855 | return scr_changeview (oldviewstart); |
1918 | } |
1856 | } |
1919 | |
1857 | |
1920 | int |
1858 | int |
1921 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1859 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1922 | { |
1860 | { |
1923 | if (TermWin.view_start != oldviewstart) |
1861 | if (view_start != oldviewstart) |
1924 | { |
1862 | { |
1925 | want_refresh = 1; |
1863 | want_refresh = 1; |
1926 | num_scr -= (TermWin.view_start - oldviewstart); |
1864 | num_scr -= (view_start - oldviewstart); |
1927 | } |
1865 | } |
1928 | |
1866 | |
1929 | return (int) (TermWin.view_start - oldviewstart); |
1867 | return (int) (view_start - oldviewstart); |
1930 | } |
1868 | } |
1931 | |
1869 | |
1932 | /* ------------------------------------------------------------------------- */ |
1870 | /* ------------------------------------------------------------------------- */ |
1933 | void |
1871 | void |
1934 | rxvt_term::scr_bell () |
1872 | rxvt_term::scr_bell () |
1935 | { |
1873 | { |
1936 | #ifndef NO_BELL |
1874 | #ifndef NO_BELL |
|
|
1875 | |
1937 | # ifndef NO_MAPALERT |
1876 | # ifndef NO_MAPALERT |
1938 | # ifdef MAPALERT_OPTION |
1877 | # ifdef MAPALERT_OPTION |
1939 | if (options & Opt_mapAlert) |
1878 | if (options & Opt_mapAlert) |
1940 | # endif |
1879 | # endif |
1941 | XMapWindow (display->display, TermWin.parent[0]); |
1880 | XMapWindow (display->display, parent[0]); |
1942 | # endif |
1881 | # endif |
|
|
1882 | |
1943 | if (options & Opt_visualBell) |
1883 | if (options & Opt_visualBell) |
1944 | { |
1884 | { |
1945 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1885 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
|
|
1886 | rxvt_usleep (VISUAL_BELL_DURATION); |
1946 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1887 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1947 | } |
1888 | } |
1948 | else |
1889 | else |
1949 | XBell (display->display, 0); |
1890 | XBell (display->display, 0); |
|
|
1891 | |
1950 | #endif |
1892 | #endif |
1951 | } |
1893 | } |
1952 | |
1894 | |
1953 | /* ------------------------------------------------------------------------- */ |
1895 | /* ------------------------------------------------------------------------- */ |
1954 | /* ARGSUSED */ |
1896 | /* ARGSUSED */ |
1955 | void |
1897 | void |
1956 | rxvt_term::scr_printscreen (int fullhist) |
1898 | rxvt_term::scr_printscreen (int fullhist) |
1957 | { |
1899 | { |
1958 | #ifdef PRINTPIPE |
1900 | #ifdef PRINTPIPE |
1959 | int i, r1, nrows, row_offset; |
1901 | int nrows, row_start; |
1960 | FILE *fd; |
1902 | FILE *fd; |
1961 | |
1903 | |
1962 | if ((fd = popen_printer ()) == NULL) |
1904 | if ((fd = popen_printer ()) == NULL) |
1963 | return; |
1905 | return; |
1964 | |
1906 | |
1965 | nrows = TermWin.nrow; |
|
|
1966 | row_offset = TermWin.saveLines; |
|
|
1967 | |
|
|
1968 | if (!fullhist) |
1907 | if (fullhist) |
1969 | row_offset -= TermWin.view_start; |
1908 | { |
|
|
1909 | nrows = nrow + nsaved; |
|
|
1910 | row_start = -nsaved; |
|
|
1911 | } |
1970 | else |
1912 | else |
1971 | { |
1913 | { |
1972 | nrows += TermWin.nscrolled; |
1914 | nrows = nrow; |
1973 | row_offset -= TermWin.nscrolled; |
1915 | row_start = -view_start; |
1974 | } |
1916 | } |
1975 | |
1917 | |
1976 | wctomb (0, 0); |
1918 | wctomb (0, 0); |
1977 | |
1919 | |
1978 | for (r1 = 0; r1 < nrows; r1++) |
1920 | for (int r1 = 0; r1 < nrows; r1++) |
1979 | { |
1921 | { |
1980 | text_t *tp = screen.text[r1 + row_offset]; |
1922 | text_t *tp = ROW(r1).t; |
1981 | int len = screen.tlen[r1 + row_offset]; |
1923 | int len = ROW(r1).l; |
1982 | |
1924 | |
1983 | for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) |
1925 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1984 | { |
1926 | { |
1985 | char mb[MB_LEN_MAX]; |
1927 | char mb[MB_LEN_MAX]; |
1986 | text_t t = *tp++; |
1928 | text_t t = *tp++; |
1987 | if (t == NOCHAR) |
1929 | if (t == NOCHAR) |
1988 | continue; |
1930 | continue; |
… | |
… | |
2009 | /* |
1951 | /* |
2010 | * Refresh the screen |
1952 | * Refresh the screen |
2011 | * drawn_text/drawn_rend contain the screen information before the update. |
1953 | * drawn_text/drawn_rend contain the screen information before the update. |
2012 | * screen.text/screen.rend contain what the screen will change to. |
1954 | * screen.text/screen.rend contain what the screen will change to. |
2013 | */ |
1955 | */ |
2014 | |
|
|
2015 | #define FONT_WIDTH(X, Y) \ |
|
|
2016 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].width |
|
|
2017 | #define FONT_RBEAR(X, Y) \ |
|
|
2018 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing |
|
|
2019 | #define FONT_LBEAR(X, Y) \ |
|
|
2020 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing |
|
|
2021 | #define IS_FONT_CHAR(X, Y) \ |
|
|
2022 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
|
|
2023 | |
|
|
2024 | void |
1956 | void |
2025 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1957 | rxvt_term::scr_refresh (unsigned char refresh_type) |
2026 | { |
1958 | { |
2027 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1959 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
2028 | showcursor; /* show the cursor */ |
1960 | showcursor; /* show the cursor */ |
2029 | int16_t col, row, /* column/row we're processing */ |
1961 | int16_t col, row, /* column/row we're processing */ |
2030 | ocrow; /* old cursor row */ |
1962 | ocrow; /* old cursor row */ |
2031 | int i, /* tmp */ |
1963 | int i; /* tmp */ |
2032 | row_offset; /* basic offset in screen structure */ |
|
|
2033 | #ifndef NO_CURSORCOLOR |
1964 | #ifndef NO_CURSORCOLOR |
2034 | rend_t cc1; /* store colours at cursor position (s) */ |
1965 | rend_t cc1; /* store colours at cursor position (s) */ |
2035 | #endif |
1966 | #endif |
2036 | rend_t *crp; // cursor rendition pointer |
1967 | rend_t *crp; // cursor rendition pointer |
2037 | |
1968 | |
2038 | want_refresh = 0; /* screen is current */ |
1969 | want_refresh = 0; /* screen is current */ |
2039 | |
1970 | |
2040 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
1971 | if (refresh_type == NO_REFRESH || !mapped) |
2041 | return; |
1972 | return; |
2042 | |
1973 | |
2043 | /* |
1974 | /* |
2044 | * A: set up vars |
1975 | * A: set up vars |
2045 | */ |
1976 | */ |
2046 | must_clear = 0; |
1977 | must_clear = 0; |
2047 | refresh_count = 0; |
1978 | refresh_count = 0; |
2048 | |
1979 | |
2049 | row_offset = TermWin.saveLines - TermWin.view_start; |
|
|
2050 | |
|
|
2051 | #if XPM_BACKGROUND |
1980 | #if XPM_BACKGROUND |
2052 | must_clear |= (bgPixmap.pixmap != None); |
1981 | must_clear |= bgPixmap.pixmap != None; |
2053 | #endif |
1982 | #endif |
2054 | #if TRANSPARENT |
1983 | #if TRANSPARENT |
2055 | must_clear |= ((options & Opt_transparent) && am_transparent); |
1984 | must_clear |= (options & Opt_transparent) && am_transparent; |
2056 | #endif |
1985 | #endif |
2057 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1986 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2058 | |
1987 | |
2059 | /* |
1988 | /* |
2060 | * B: reverse any characters which are selected |
1989 | * B: reverse any characters which are selected |
… | |
… | |
2077 | |
2006 | |
2078 | if (showcursor) |
2007 | if (showcursor) |
2079 | { |
2008 | { |
2080 | int col = screen.cur.col; |
2009 | int col = screen.cur.col; |
2081 | |
2010 | |
2082 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
2011 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2083 | col--; |
2012 | col--; |
2084 | |
2013 | |
2085 | crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; |
2014 | crp = &ROW(screen.cur.row).r[col]; |
2086 | |
2015 | |
2087 | if (showcursor && TermWin.focus) |
2016 | if (showcursor && focus) |
2088 | { |
2017 | { |
|
|
2018 | if (options & Opt_cursorUnderline) |
|
|
2019 | *crp ^= RS_Uline; |
|
|
2020 | else |
|
|
2021 | { |
2089 | *crp ^= RS_RVid; |
2022 | *crp ^= RS_RVid; |
|
|
2023 | |
2090 | #ifndef NO_CURSORCOLOR |
2024 | #ifndef NO_CURSORCOLOR |
2091 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2025 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2092 | if (ISSET_PIXCOLOR (Color_cursor)) |
2026 | if (ISSET_PIXCOLOR (Color_cursor)) |
2093 | ccol1 = Color_cursor; |
2027 | ccol1 = Color_cursor; |
2094 | else |
2028 | else |
2095 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2029 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2096 | ccol1 = GET_FGCOLOR (rstyle); |
2030 | ccol1 = GET_FGCOLOR (rstyle); |
2097 | #else |
2031 | #else |
2098 | ccol1 = Color_fg; |
2032 | ccol1 = Color_fg; |
2099 | #endif |
2033 | #endif |
2100 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2034 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2101 | ccol2 = Color_cursor2; |
2035 | ccol2 = Color_cursor2; |
2102 | else |
2036 | else |
2103 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2037 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2104 | ccol2 = GET_BGCOLOR (rstyle); |
2038 | ccol2 = GET_BGCOLOR (rstyle); |
2105 | #else |
2039 | #else |
2106 | ccol2 = Color_bg; |
2040 | ccol2 = Color_bg; |
2107 | #endif |
2041 | #endif |
2108 | *crp = SET_FGCOLOR (*crp, ccol1); |
2042 | *crp = SET_FGCOLOR (*crp, ccol1); |
2109 | *crp = SET_BGCOLOR (*crp, ccol2); |
2043 | *crp = SET_BGCOLOR (*crp, ccol2); |
2110 | #endif |
2044 | #endif |
|
|
2045 | } |
2111 | } |
2046 | } |
2112 | } |
2047 | } |
2113 | |
2048 | |
2114 | /* make sure no outline cursor is left around */ |
2049 | /* make sure no outline cursor is left around */ |
2115 | setoldcursor = 0; |
2050 | setoldcursor = 0; |
2116 | if (ocrow != -1) |
2051 | if (ocrow != -1) |
2117 | { |
2052 | { |
2118 | if (screen.cur.row + TermWin.view_start != ocrow |
2053 | if (screen.cur.row + view_start != ocrow |
2119 | || screen.cur.col != oldcursor.col) |
2054 | || screen.cur.col != oldcursor.col) |
2120 | { |
2055 | { |
2121 | if (ocrow < TermWin.nrow |
2056 | if (ocrow < nrow |
2122 | && oldcursor.col < TermWin.ncol) |
2057 | && oldcursor.col < ncol) |
2123 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
2058 | drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2124 | |
2059 | |
2125 | if (TermWin.focus || !showcursor) |
2060 | if (focus || !showcursor) |
2126 | oldcursor.row = -1; |
2061 | oldcursor.row = -1; |
2127 | else |
2062 | else |
2128 | setoldcursor = 1; |
2063 | setoldcursor = 1; |
2129 | } |
2064 | } |
2130 | } |
2065 | } |
2131 | else if (!TermWin.focus) |
2066 | else if (!focus) |
2132 | setoldcursor = 1; |
2067 | setoldcursor = 1; |
2133 | |
2068 | |
2134 | if (setoldcursor) |
2069 | if (setoldcursor) |
2135 | { |
2070 | { |
2136 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
2071 | if (screen.cur.row + view_start >= nrow) |
2137 | oldcursor.row = -1; |
2072 | oldcursor.row = -1; |
2138 | else |
2073 | else |
2139 | { |
2074 | { |
2140 | oldcursor.row = screen.cur.row + TermWin.view_start; |
2075 | oldcursor.row = screen.cur.row + view_start; |
2141 | oldcursor.col = screen.cur.col; |
2076 | oldcursor.col = screen.cur.col; |
2142 | } |
2077 | } |
2143 | } |
2078 | } |
2144 | } |
2079 | } |
2145 | |
2080 | |
2146 | #if ENABLE_OVERLAY |
2081 | #if ENABLE_OVERLAY |
2147 | scr_swap_overlay (); |
2082 | scr_swap_overlay (); |
2148 | #endif |
2083 | #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 | |
2084 | |
2153 | #ifndef NO_SLOW_LINK_SUPPORT |
2085 | #ifndef NO_SLOW_LINK_SUPPORT |
2154 | /* |
2086 | /* |
2155 | * D: CopyArea pass - very useful for slower links |
2087 | * D: CopyArea pass - very useful for slower links |
2156 | * This has been deliberately kept simple. |
2088 | * This has been deliberately kept simple. |
2157 | */ |
2089 | */ |
2158 | i = num_scr; |
2090 | i = num_scr; |
2159 | if (!display->is_local |
2091 | if (!display->is_local |
2160 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2092 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2161 | && abs (i) < TermWin.nrow && !must_clear) |
2093 | && abs (num_scr) < nrow && !must_clear) |
2162 | { |
2094 | { |
2163 | int16_t nits; |
2095 | int16_t nits; |
2164 | int j; |
2096 | int j; |
2165 | int len, wlen; |
2097 | int len, wlen; |
2166 | |
2098 | |
2167 | j = TermWin.nrow; |
2099 | j = nrow; |
2168 | wlen = len = -1; |
2100 | wlen = len = -1; |
2169 | row = i > 0 ? 0 : j - 1; |
2101 | row = i > 0 ? 0 : j - 1; |
2170 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2102 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2171 | { |
2103 | { |
2172 | if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) |
2104 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2173 | { |
2105 | { |
2174 | text_t *stp = screen.text[row + row_offset]; |
2106 | line_t s = ROW(row - view_start); |
2175 | rend_t *srp = screen.rend[row + row_offset]; |
|
|
2176 | text_t *dtp = drawn_text[row]; |
2107 | line_t d = drawn[row]; |
2177 | text_t *dtp2 = drawn_text[row + i]; |
2108 | line_t d2 = drawn[row + i]; |
2178 | rend_t *drp = drawn_rend[row]; |
|
|
2179 | rend_t *drp2 = drawn_rend[row + i]; |
|
|
2180 | |
2109 | |
2181 | for (nits = 0, col = TermWin.ncol; col--; ) |
2110 | for (nits = 0, col = ncol; col--; ) |
2182 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2111 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2183 | nits--; |
2112 | nits--; |
2184 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
2113 | else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) |
2185 | nits++; |
2114 | nits++; |
2186 | |
2115 | |
2187 | if (nits > 8) /* XXX: arbitrary choice */ |
2116 | if (nits > 8) /* XXX: arbitrary choice */ |
2188 | { |
2117 | { |
2189 | for (col = TermWin.ncol; col--; ) |
2118 | for (col = ncol; col--; ) |
2190 | { |
2119 | { |
2191 | *dtp++ = *dtp2++; |
2120 | *d.t++ = *d2.t++; |
2192 | *drp++ = *drp2++; |
2121 | *d.r++ = *d2.r++; |
2193 | } |
2122 | } |
2194 | |
2123 | |
2195 | if (len == -1) |
2124 | if (len == -1) |
2196 | len = row; |
2125 | len = row; |
2197 | |
2126 | |
… | |
… | |
2202 | |
2131 | |
2203 | if (len != -1) |
2132 | if (len != -1) |
2204 | { |
2133 | { |
2205 | /* also comes here at end if needed because of >= above */ |
2134 | /* also comes here at end if needed because of >= above */ |
2206 | if (wlen < len) |
2135 | if (wlen < len) |
2207 | SWAP_IT (wlen, len, int); |
2136 | ::swap (wlen, len); |
2208 | |
2137 | |
2209 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2138 | XCopyArea (display->display, vt, vt, |
2210 | TermWin.gc, 0, Row2Pixel (len + i), |
2139 | gc, 0, Row2Pixel (len + i), |
2211 | (unsigned int)TermWin_TotalWidth (), |
2140 | (unsigned int)TermWin_TotalWidth (), |
2212 | (unsigned int)Height2Pixel (wlen - len + 1), |
2141 | (unsigned int)Height2Pixel (wlen - len + 1), |
2213 | 0, Row2Pixel (len)); |
2142 | 0, Row2Pixel (len)); |
2214 | len = -1; |
2143 | len = -1; |
2215 | } |
2144 | } |
… | |
… | |
2218 | #endif |
2147 | #endif |
2219 | |
2148 | |
2220 | /* |
2149 | /* |
2221 | * E: main pass across every character |
2150 | * E: main pass across every character |
2222 | */ |
2151 | */ |
2223 | for (row = 0; row < TermWin.nrow; row++) |
2152 | for (row = 0; row < nrow; row++) |
2224 | { |
2153 | { |
2225 | text_t *stp = screen.text[row + row_offset]; |
2154 | text_t *stp = ROW(row - view_start).t; |
2226 | rend_t *srp = screen.rend[row + row_offset]; |
2155 | rend_t *srp = ROW(row - view_start).r; |
2227 | text_t *dtp = drawn_text[row]; |
2156 | text_t *dtp = drawn[row].t; |
2228 | rend_t *drp = drawn_rend[row]; |
2157 | rend_t *drp = drawn[row].r; |
2229 | |
2158 | |
2230 | /* |
2159 | /* |
2231 | * E2: OK, now the real pass |
2160 | * E2: OK, now the real pass |
2232 | */ |
2161 | */ |
2233 | int ypixel = (int)Row2Pixel (row); |
2162 | int ypixel = (int)Row2Pixel (row); |
2234 | |
2163 | |
2235 | for (col = 0; col < TermWin.ncol; col++) |
2164 | for (col = 0; col < ncol; col++) |
2236 | { |
2165 | { |
2237 | /* compare new text with old - if exactly the same then continue */ |
2166 | /* compare new text with old - if exactly the same then continue */ |
2238 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2167 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2239 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
2168 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
2240 | || (stp[col] == ' ' /* space w/ no background change */ |
2169 | || (stp[col] == ' ' /* space w/ no background change */ |
2241 | && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) |
2170 | && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) |
2242 | continue; |
2171 | continue; |
2243 | |
2172 | |
2244 | // redraw one or more characters |
2173 | // redraw one or more characters |
2245 | |
2174 | |
2246 | // seek to the beginning if wide characters |
2175 | // seek to the beginning of wide characters |
2247 | while (stp[col] == NOCHAR && col > 0) |
2176 | while (stp[col] == NOCHAR && col > 0) |
2248 | --col; |
2177 | --col; |
2249 | |
2178 | |
2250 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2179 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2251 | text_t *text = stp + col; |
2180 | text_t *text = stp + col; |
… | |
… | |
2254 | dtp[col] = stp[col]; |
2183 | dtp[col] = stp[col]; |
2255 | drp[col] = rend; |
2184 | drp[col] = rend; |
2256 | |
2185 | |
2257 | int xpixel = Col2Pixel (col); |
2186 | int xpixel = Col2Pixel (col); |
2258 | |
2187 | |
2259 | for (i = 0; ++col < TermWin.ncol; ) |
2188 | for (i = 0; ++col < ncol; ) |
2260 | { |
2189 | { |
2261 | if (stp[col] == NOCHAR) |
2190 | if (stp[col] == NOCHAR) |
2262 | { |
2191 | { |
2263 | dtp[col] = stp[col]; |
2192 | dtp[col] = stp[col]; |
2264 | drp[col] = rend; |
2193 | drp[col] = rend; |
… | |
… | |
2292 | |
2221 | |
2293 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2222 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2294 | while (i && text[count] == NOCHAR) |
2223 | while (i && text[count] == NOCHAR) |
2295 | count++, i--; |
2224 | count++, i--; |
2296 | |
2225 | |
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 | /* |
2226 | /* |
2310 | * Determine the attributes for the string |
2227 | * Determine the attributes for the string |
2311 | */ |
2228 | */ |
2312 | int fore = GET_FGCOLOR (rend); // desired foreground |
2229 | int fore = GET_FGCOLOR (rend); // desired foreground |
2313 | int back = GET_BGCOLOR (rend); // desired background |
2230 | int back = GET_BGCOLOR (rend); // desired background |
2314 | |
2231 | |
2315 | // only do special processing if ana attributes are set, which is rare |
2232 | // only do special processing if any attributes are set, which is rare |
2316 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) |
2233 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2317 | { |
2234 | { |
|
|
2235 | #if ENABLE_STYLES |
|
|
2236 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2237 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2238 | drp[col + 1] = ~srp[col + 1]; |
|
|
2239 | |
|
|
2240 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2241 | while (text > stp |
|
|
2242 | && srp[text - stp - 1] & RS_Careful |
|
|
2243 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2244 | text--, count++, xpixel -= fwidth; |
|
|
2245 | #endif |
|
|
2246 | |
2318 | bool invert = rend & RS_RVid; |
2247 | bool invert = rend & RS_RVid; |
2319 | |
2248 | |
2320 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2249 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2321 | if (rend & RS_Bold |
2250 | if (rend & RS_Bold |
2322 | && fore == Color_fg) |
2251 | && fore == Color_fg) |
… | |
… | |
2344 | fore = Color_UL; |
2273 | fore = Color_UL; |
2345 | #endif |
2274 | #endif |
2346 | |
2275 | |
2347 | if (invert) |
2276 | if (invert) |
2348 | { |
2277 | { |
2349 | SWAP_IT (fore, back, int); |
2278 | ::swap (fore, back); |
2350 | |
2279 | |
2351 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2280 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2352 | if (ISSET_PIXCOLOR (Color_RV)) |
2281 | if (ISSET_PIXCOLOR (Color_RV)) |
2353 | back = Color_RV; |
2282 | back = Color_RV; |
|
|
2283 | |
|
|
2284 | if (fore == back) |
|
|
2285 | { |
|
|
2286 | fore = Color_bg; |
|
|
2287 | back = Color_fg; |
|
|
2288 | } |
2354 | #endif |
2289 | #endif |
2355 | } |
2290 | } |
2356 | |
2291 | |
2357 | #ifdef TEXT_BLINK |
2292 | #ifdef TEXT_BLINK |
2358 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2293 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
… | |
… | |
2369 | } |
2304 | } |
2370 | |
2305 | |
2371 | /* |
2306 | /* |
2372 | * Actually do the drawing of the string here |
2307 | * Actually do the drawing of the string here |
2373 | */ |
2308 | */ |
2374 | rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2309 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2375 | |
2310 | |
2376 | if (back == fore) |
2311 | if (back == fore) |
2377 | font->clear_rect (*TermWin.drawable, xpixel, ypixel, |
2312 | font->clear_rect (*drawable, xpixel, ypixel, |
2378 | TermWin.fwidth * count, TermWin.fheight, |
2313 | fwidth * count, fheight, |
2379 | back); |
2314 | back); |
2380 | else if (back == Color_bg) |
2315 | else if (back == Color_bg) |
2381 | { |
2316 | { |
2382 | if (must_clear) |
2317 | if (must_clear) |
2383 | { |
2318 | { |
2384 | CLEAR_CHARS (xpixel, ypixel, count); |
2319 | CLEAR_CHARS (xpixel, ypixel, count); |
2385 | |
2320 | |
2386 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2321 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2387 | if (text[i] != ' ') |
2322 | if (text[i] != ' ') |
2388 | { |
2323 | { |
2389 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); |
2324 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2390 | break; |
2325 | break; |
2391 | } |
2326 | } |
2392 | } |
2327 | } |
2393 | else |
2328 | else |
2394 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2329 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2395 | } |
2330 | } |
2396 | else |
2331 | else |
2397 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2332 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2398 | |
2333 | |
2399 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2334 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
|
|
2335 | { |
|
|
2336 | #if ENABLE_FRILLS |
|
|
2337 | if (ISSET_PIXCOLOR (Color_underline)) |
|
|
2338 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
|
|
2339 | else |
|
|
2340 | #endif |
|
|
2341 | XSetForeground (display->display, gc, pix_colors[fore]); |
|
|
2342 | |
2400 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2343 | XDrawLine (display->display, drawBuffer, gc, |
2401 | xpixel, ypixel + font->ascent + 1, |
2344 | xpixel, ypixel + font->ascent + 1, |
2402 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2345 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
|
|
2346 | } |
2403 | } /* for (col....) */ |
2347 | } /* for (col....) */ |
2404 | } /* for (row....) */ |
2348 | } /* for (row....) */ |
2405 | |
2349 | |
2406 | #if ENABLE_OVERLAY |
2350 | #if ENABLE_OVERLAY |
2407 | scr_swap_overlay (); |
2351 | scr_swap_overlay (); |
… | |
… | |
2410 | /* |
2354 | /* |
2411 | * G: cleanup cursor and display outline cursor if necessary |
2355 | * G: cleanup cursor and display outline cursor if necessary |
2412 | */ |
2356 | */ |
2413 | if (showcursor) |
2357 | if (showcursor) |
2414 | { |
2358 | { |
2415 | if (TermWin.focus) |
2359 | if (focus) |
|
|
2360 | { |
|
|
2361 | if (options & Opt_cursorUnderline) |
|
|
2362 | *crp ^= RS_Uline; |
|
|
2363 | else |
2416 | { |
2364 | { |
2417 | *crp ^= RS_RVid; |
2365 | *crp ^= RS_RVid; |
2418 | #ifndef NO_CURSORCOLOR |
2366 | #ifndef NO_CURSORCOLOR |
2419 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2367 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2420 | #endif |
2368 | #endif |
|
|
2369 | } |
2421 | } |
2370 | } |
2422 | else if (oldcursor.row >= 0) |
2371 | else if (oldcursor.row >= 0) |
2423 | { |
2372 | { |
|
|
2373 | int cursorwidth = 1; |
|
|
2374 | int col = oldcursor.col; |
|
|
2375 | |
|
|
2376 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
|
|
2377 | col--; |
|
|
2378 | |
|
|
2379 | while (col + cursorwidth < ncol |
|
|
2380 | && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
|
|
2381 | cursorwidth++; |
|
|
2382 | |
2424 | #ifndef NO_CURSORCOLOR |
2383 | #ifndef NO_CURSORCOLOR |
2425 | if (ISSET_PIXCOLOR (Color_cursor)) |
2384 | if (ISSET_PIXCOLOR (Color_cursor)) |
2426 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); |
2385 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2427 | #endif |
2386 | #endif |
2428 | int cursorwidth = 1; |
|
|
2429 | while (oldcursor.col + cursorwidth < TermWin.ncol |
|
|
2430 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
|
|
2431 | cursorwidth++; |
|
|
2432 | |
2387 | |
2433 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2388 | XDrawRectangle (display->display, drawBuffer, gc, |
2434 | Col2Pixel (oldcursor.col), |
2389 | Col2Pixel (col), |
2435 | Row2Pixel (oldcursor.row), |
2390 | Row2Pixel (oldcursor.row), |
2436 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2391 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2437 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2392 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2438 | } |
2393 | } |
2439 | } |
2394 | } |
2440 | |
2395 | |
2441 | /* |
2396 | /* |
2442 | * H: cleanup selection |
2397 | * H: cleanup selection |
… | |
… | |
2449 | num_scr = 0; |
2404 | num_scr = 0; |
2450 | num_scr_allow = 1; |
2405 | num_scr_allow = 1; |
2451 | } |
2406 | } |
2452 | |
2407 | |
2453 | void |
2408 | void |
2454 | rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) |
2409 | rxvt_term::scr_remap_chars (const line_t &l) |
2455 | { |
2410 | { |
2456 | if (!rp || !tp) |
2411 | if (!l.t) |
2457 | return; |
2412 | return; |
2458 | |
2413 | |
2459 | for (int i = TermWin.ncol; i; i--, rp++, tp++) |
2414 | for (int i = ncol; i--; ) |
2460 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
2415 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2461 | } |
2416 | } |
2462 | |
2417 | |
2463 | void |
2418 | void |
2464 | rxvt_term::scr_remap_chars () |
2419 | rxvt_term::scr_remap_chars () |
2465 | { |
2420 | { |
2466 | for (int i = TermWin.nrow + TermWin.saveLines; i--; ) |
2421 | for (int i = total_rows; i--; ) |
2467 | scr_remap_chars (screen.text[i], screen.rend[i]); |
2422 | scr_remap_chars (save[i]); |
2468 | |
2423 | |
2469 | for (int i = TermWin.nrow; i--; ) |
2424 | for (int i = nrow; i--; ) |
2470 | { |
2425 | { |
2471 | scr_remap_chars (drawn_text[i], drawn_rend[i]); |
2426 | scr_remap_chars (drawn[i]); |
2472 | scr_remap_chars (swap.text[i], swap.rend[i]); |
2427 | scr_remap_chars (swap_save[i]); |
2473 | } |
2428 | } |
2474 | } |
2429 | } |
2475 | |
2430 | |
2476 | void |
2431 | void |
2477 | rxvt_term::scr_recolour () |
2432 | rxvt_term::scr_recolour () |
… | |
… | |
2483 | #if XPM_BACKGROUND |
2438 | #if XPM_BACKGROUND |
2484 | && !bgPixmap.pixmap |
2439 | && !bgPixmap.pixmap |
2485 | #endif |
2440 | #endif |
2486 | ) |
2441 | ) |
2487 | { |
2442 | { |
2488 | XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); |
2443 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2489 | XClearWindow (display->display, TermWin.parent[0]); |
2444 | XClearWindow (display->display, parent[0]); |
2490 | XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); |
2445 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2491 | #if HAVE_SCROLLBARS |
2446 | #if HAVE_SCROLLBARS |
2492 | if (scrollBar.win) |
2447 | if (scrollBar.win) |
2493 | { |
2448 | { |
2494 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2449 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2495 | scrollBar.setIdle (); |
2450 | scrollBar.setIdle (); |
… | |
… | |
2505 | |
2460 | |
2506 | /* ------------------------------------------------------------------------- */ |
2461 | /* ------------------------------------------------------------------------- */ |
2507 | void |
2462 | void |
2508 | rxvt_term::scr_clear (bool really) |
2463 | rxvt_term::scr_clear (bool really) |
2509 | { |
2464 | { |
2510 | if (!TermWin.mapped) |
2465 | if (!mapped) |
2511 | return; |
2466 | return; |
2512 | |
2467 | |
2513 | num_scr_allow = 0; |
2468 | num_scr_allow = 0; |
2514 | want_refresh = 1; |
2469 | want_refresh = 1; |
2515 | |
2470 | |
2516 | #if TRANSPARENT |
|
|
2517 | if ((options & Opt_transparent) && (am_pixmap_trans == 0)) |
|
|
2518 | { |
|
|
2519 | int i; |
|
|
2520 | |
|
|
2521 | if (!(options & Opt_transparent_all)) |
|
|
2522 | i = 0; |
|
|
2523 | else |
|
|
2524 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
|
|
2525 | |
|
|
2526 | while (i--) |
|
|
2527 | if (TermWin.parent[i] != None) |
|
|
2528 | XClearWindow (display->display, TermWin.parent[i]); |
|
|
2529 | } |
|
|
2530 | #endif |
|
|
2531 | |
|
|
2532 | if (really) |
2471 | if (really) |
2533 | XClearWindow (display->display, TermWin.vt); |
2472 | XClearWindow (display->display, vt); |
2534 | } |
2473 | } |
2535 | |
2474 | |
2536 | /* ------------------------------------------------------------------------- */ |
2475 | /* ------------------------------------------------------------------------- */ |
2537 | void |
2476 | void |
2538 | rxvt_term::scr_reverse_selection () |
2477 | rxvt_term::scr_reverse_selection () |
2539 | { |
2478 | { |
|
|
2479 | if (selection.op |
2540 | if (selection.op && current_screen == selection.screen) |
2480 | && current_screen == selection.screen |
|
|
2481 | && selection.end.row >= -view_start) |
2541 | { |
2482 | { |
2542 | int end_row = TermWin.saveLines - TermWin.view_start; |
2483 | int view_end = -view_start + nrow; |
2543 | int i = selection.beg.row + TermWin.saveLines; |
2484 | int row, col; |
2544 | int col, row = selection.end.row + TermWin.saveLines; |
|
|
2545 | rend_t *srp; |
|
|
2546 | |
2485 | |
2547 | #if ENABLE_FRILLS |
2486 | #if ENABLE_FRILLS |
2548 | if (selection.rect) |
2487 | if (selection.rect) |
2549 | { |
2488 | { |
2550 | end_row += TermWin.nrow; |
2489 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
2551 | |
|
|
2552 | for (; i <= row && i <= end_row; i++) |
|
|
2553 | for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) |
2490 | for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) |
2554 | srp[col] ^= RS_RVid; |
2491 | srp[col] ^= RS_RVid; |
2555 | } |
2492 | } |
2556 | else |
2493 | else |
2557 | #endif |
2494 | #endif |
2558 | { |
2495 | { |
2559 | if (i >= end_row) |
2496 | if (selection.beg.row >= -view_start) |
|
|
2497 | { |
2560 | col = selection.beg.col; |
2498 | col = selection.beg.col; |
|
|
2499 | row = selection.beg.row; |
|
|
2500 | } |
2561 | else |
2501 | else |
2562 | { |
2502 | { |
2563 | col = 0; |
2503 | col = 0; |
2564 | i = end_row; |
2504 | row = view_start; |
2565 | } |
2505 | } |
2566 | |
2506 | |
2567 | end_row += TermWin.nrow; |
2507 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2568 | |
2508 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2569 | for (; i < row && i < end_row; i++, col = 0) |
|
|
2570 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
|
|
2571 | srp[col] ^= RS_RVid; |
2509 | srp[col] ^= RS_RVid; |
2572 | |
2510 | |
2573 | if (i == row && i < end_row) |
2511 | if (row == selection.end.row) |
2574 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2512 | for (rend_t *srp = ROW(row).r; col < selection.end.col; col++) |
2575 | srp[col] ^= RS_RVid; |
2513 | srp[col] ^= RS_RVid; |
2576 | } |
2514 | } |
2577 | } |
2515 | } |
2578 | } |
2516 | } |
2579 | |
2517 | |
… | |
… | |
2588 | { |
2526 | { |
2589 | int row, wrote; |
2527 | int row, wrote; |
2590 | unsigned int width, towrite; |
2528 | unsigned int width, towrite; |
2591 | char r1[] = "\n"; |
2529 | char r1[] = "\n"; |
2592 | |
2530 | |
2593 | for (row = TermWin.saveLines - TermWin.nscrolled; |
2531 | for (row = saveLines - nsaved; |
2594 | row < TermWin.saveLines + TermWin.nrow - 1; row++) |
2532 | row < saveLines + nrow - 1; row++) |
2595 | { |
2533 | { |
2596 | width = screen.tlen[row] >= 0 ? screen.tlen[row] |
2534 | width = save[row].l >= 0 ? save[row].l |
2597 | : TermWin.ncol; |
2535 | : ncol; |
2598 | for (towrite = width; towrite; towrite -= wrote) |
2536 | for (towrite = width; towrite; towrite -= wrote) |
2599 | { |
2537 | { |
2600 | wrote = write (fd, & (screen.text[row][width - towrite]), |
2538 | wrote = write (fd, & (save[row].t[width - towrite]), |
2601 | towrite); |
2539 | towrite); |
2602 | if (wrote < 0) |
2540 | if (wrote < 0) |
2603 | return; /* XXX: death, no report */ |
2541 | return; /* XXX: death, no report */ |
2604 | } |
2542 | } |
2605 | if (screen.tlen[row] >= 0) |
2543 | if (save[row].l >= 0) |
2606 | if (write (fd, r1, 1) <= 0) |
2544 | if (write (fd, r1, 1) <= 0) |
2607 | return; /* XXX: death, no report */ |
2545 | return; /* XXX: death, no report */ |
2608 | } |
2546 | } |
2609 | } |
2547 | } |
2610 | #endif |
2548 | #endif |
2611 | |
2549 | |
2612 | /* ------------------------------------------------------------------------- * |
2550 | /* ------------------------------------------------------------------------- * |
2613 | * CHARACTER SELECTION * |
2551 | * CHARACTER SELECTION * |
2614 | * ------------------------------------------------------------------------- */ |
2552 | * ------------------------------------------------------------------------- */ |
2615 | |
|
|
2616 | /* |
|
|
2617 | * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 |
|
|
2618 | */ |
|
|
2619 | void |
2553 | void |
2620 | rxvt_term::selection_check (int check_more) |
2554 | rxvt_term::selection_check (int check_more) |
2621 | { |
2555 | { |
2622 | row_col_t pos; |
2556 | row_col_t pos; |
2623 | |
2557 | |
2624 | if (!selection.op) |
2558 | if (!selection.op) |
2625 | return; |
2559 | return; |
2626 | |
2560 | |
2627 | pos.row = pos.col = 0; |
2561 | pos.row = pos.col = 0; |
2628 | if ((selection.beg.row < - (int32_t)TermWin.nscrolled) |
2562 | if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) |
2629 | || (selection.beg.row >= TermWin.nrow) |
2563 | || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) |
2630 | || (selection.mark.row < - (int32_t)TermWin.nscrolled) |
2564 | || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) |
2631 | || (selection.mark.row >= TermWin.nrow) |
|
|
2632 | || (selection.end.row < - (int32_t)TermWin.nscrolled) |
|
|
2633 | || (selection.end.row >= TermWin.nrow) |
|
|
2634 | || (check_more == 1 |
2565 | || (check_more == 1 |
2635 | && current_screen == selection.screen |
2566 | && current_screen == selection.screen |
2636 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2567 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2637 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2568 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2638 | || (check_more == 2 |
2569 | || (check_more == 2 |
… | |
… | |
2640 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2571 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2641 | || (check_more == 3 |
2572 | || (check_more == 3 |
2642 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2573 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2643 | || (check_more == 4 /* screen width change */ |
2574 | || (check_more == 4 /* screen width change */ |
2644 | && (selection.beg.row != selection.end.row |
2575 | && (selection.beg.row != selection.end.row |
2645 | || selection.end.col > TermWin.ncol))) |
2576 | || selection.end.col > ncol))) |
2646 | CLEAR_SELECTION (); |
2577 | CLEAR_SELECTION (); |
2647 | } |
2578 | } |
2648 | |
2579 | |
2649 | /* ------------------------------------------------------------------------- */ |
2580 | /* ------------------------------------------------------------------------- */ |
2650 | /* |
2581 | /* |
2651 | * Paste a selection direct to the command fd |
2582 | * Paste a selection direct to the command fd |
2652 | */ |
2583 | */ |
2653 | void |
2584 | void |
2654 | rxvt_term::paste (const unsigned char *data, unsigned int len) |
2585 | rxvt_term::paste (unsigned char *data, unsigned int len) |
2655 | { |
2586 | { |
2656 | unsigned int i, j, n; |
|
|
2657 | unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); |
|
|
2658 | |
|
|
2659 | /* convert normal newline chars into common keyboard Return key sequence */ |
2587 | /* convert normal newline chars into common keyboard Return key sequence */ |
2660 | for (i = 0; i < len; i += PROP_SIZE) |
2588 | for (unsigned int i = 0; i < len; i++) |
2661 | { |
|
|
2662 | n = min (len - i, PROP_SIZE); |
|
|
2663 | memcpy (ds, data + i, n); |
|
|
2664 | |
|
|
2665 | for (j = 0; j < n; j++) |
|
|
2666 | if (ds[j] == C0_LF) |
2589 | if (data[i] == C0_LF) |
2667 | ds[j] = C0_CR; |
2590 | data[i] = C0_CR; |
2668 | |
2591 | |
2669 | tt_write (ds, (int)n); |
2592 | tt_write (data, len); |
2670 | } |
|
|
2671 | |
|
|
2672 | free (ds); |
|
|
2673 | } |
2593 | } |
2674 | |
2594 | |
2675 | /* ------------------------------------------------------------------------- */ |
2595 | /* ------------------------------------------------------------------------- */ |
2676 | /* |
2596 | /* |
2677 | * Respond to a notification that a primary selection has been sent |
2597 | * Respond to a notification that a primary selection has been sent |
2678 | * EXT: SelectionNotify |
2598 | * EXT: SelectionNotify |
2679 | */ |
2599 | */ |
2680 | int |
2600 | void |
2681 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2601 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2682 | { |
2602 | { |
2683 | long nread = 0; |
|
|
2684 | unsigned long bytes_after; |
|
|
2685 | XTextProperty ct; |
|
|
2686 | |
|
|
2687 | if (prop == None) /* check for failed XConvertSelection */ |
2603 | if (prop == None) /* check for failed XConvertSelection */ |
2688 | { |
2604 | { |
2689 | if ((selection_type & Sel_CompoundText)) |
2605 | if ((selection_type & Sel_CompoundText)) |
2690 | { |
2606 | { |
2691 | int selnum = selection_type & Sel_whereMask; |
2607 | int selnum = selection_type & Sel_whereMask; |
… | |
… | |
2704 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2620 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2705 | else |
2621 | else |
2706 | selection_type = 0; |
2622 | selection_type = 0; |
2707 | } |
2623 | } |
2708 | |
2624 | |
2709 | return 0; |
2625 | return; |
2710 | } |
|
|
2711 | |
|
|
2712 | for (;;) |
|
|
2713 | { |
2626 | } |
|
|
2627 | |
|
|
2628 | unsigned long bytes_after; |
|
|
2629 | XTextProperty ct; |
|
|
2630 | |
|
|
2631 | if (XGetWindowProperty (display->display, win, prop, |
|
|
2632 | 0, PROP_SIZE / 4, |
|
|
2633 | delete_prop, AnyPropertyType, |
|
|
2634 | &ct.encoding, &ct.format, |
|
|
2635 | &ct.nitems, &bytes_after, |
|
|
2636 | &ct.value) != Success) |
|
|
2637 | { |
|
|
2638 | ct.value = 0; |
|
|
2639 | goto bailout; |
|
|
2640 | } |
|
|
2641 | |
|
|
2642 | if (ct.encoding == None) |
|
|
2643 | goto bailout; |
|
|
2644 | |
|
|
2645 | if (bytes_after) |
|
|
2646 | { |
|
|
2647 | // fetch and append remaining data |
|
|
2648 | XTextProperty ct2; |
|
|
2649 | |
2714 | if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), |
2650 | if (XGetWindowProperty (display->display, win, prop, |
2715 | (long) (PROP_SIZE / 4), delete_prop, |
2651 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2652 | delete_prop, AnyPropertyType, |
2716 | AnyPropertyType, &ct.encoding, &ct.format, |
2653 | &ct2.encoding, &ct2.format, |
2717 | &ct.nitems, &bytes_after, |
2654 | &ct2.nitems, &bytes_after, |
2718 | &ct.value) != Success) |
2655 | &ct2.value) != Success) |
2719 | break; |
2656 | goto bailout; |
2720 | |
2657 | |
2721 | if (ct.encoding == 0) |
2658 | // realloc should be compatible to XFree, here, and elsewhere, too |
2722 | break; |
2659 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2660 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2661 | ct.nitems += ct2.nitems; |
2723 | |
2662 | |
|
|
2663 | XFree (ct2.value); |
|
|
2664 | } |
|
|
2665 | |
|
|
2666 | if (ct.value == 0) |
|
|
2667 | goto bailout; |
|
|
2668 | |
2724 | if (ct.encoding == xa[XA_INCR]) |
2669 | if (ct.encoding == xa[XA_INCR]) |
2725 | { |
2670 | { |
2726 | // INCR selection, start handshake |
2671 | // INCR selection, start handshake |
|
|
2672 | if (!delete_prop) |
2727 | XDeleteProperty (display->display, win, prop); |
2673 | XDeleteProperty (display->display, win, prop); |
|
|
2674 | |
2728 | selection_wait = Sel_incr; |
2675 | selection_wait = Sel_incr; |
|
|
2676 | incr_buf_fill = 0; |
2729 | incr_ev.start (NOW + 10); |
2677 | incr_ev.start (NOW + 10); |
2730 | break; |
|
|
2731 | } |
|
|
2732 | |
2678 | |
2733 | if (ct.value == NULL) |
2679 | goto bailout; |
2734 | continue; |
2680 | } |
2735 | |
2681 | |
2736 | if (ct.nitems == 0) |
2682 | if (ct.nitems == 0) |
|
|
2683 | { |
|
|
2684 | if (selection_wait == Sel_incr) |
|
|
2685 | { |
|
|
2686 | XFree (ct.value); |
|
|
2687 | |
|
|
2688 | // finally complete, now paste the whole thing |
|
|
2689 | selection_wait = Sel_normal; |
|
|
2690 | ct.value = (unsigned char *)incr_buf; |
|
|
2691 | ct.nitems = incr_buf_fill; |
|
|
2692 | incr_buf = 0; |
|
|
2693 | incr_buf_size = 0; |
|
|
2694 | incr_ev.stop (); |
2737 | { |
2695 | } |
|
|
2696 | else |
|
|
2697 | { |
2738 | if (selection_wait == Sel_normal && nread == 0 |
2698 | if (selection_wait == Sel_normal |
2739 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2699 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2740 | { |
2700 | { |
2741 | /* |
2701 | /* |
2742 | * pass through again trying CUT_BUFFER0 if we've come from |
2702 | * pass through again trying CUT_BUFFER0 if we've come from |
2743 | * XConvertSelection () but nothing was presented |
2703 | * XConvertSelection () but nothing was presented |
2744 | */ |
2704 | */ |
2745 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2705 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2746 | } |
2706 | } |
2747 | |
2707 | |
2748 | nread = -1; /* discount any previous stuff */ |
2708 | goto bailout; |
2749 | break; |
2709 | } |
|
|
2710 | } |
|
|
2711 | else if (selection_wait == Sel_incr) |
|
|
2712 | { |
|
|
2713 | incr_ev.start (NOW + 10); |
|
|
2714 | |
|
|
2715 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2750 | } |
2716 | { |
|
|
2717 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2718 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2719 | } |
2751 | |
2720 | |
|
|
2721 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2752 | nread += ct.nitems; |
2722 | incr_buf_fill += ct.nitems; |
2753 | |
2723 | |
|
|
2724 | goto bailout; |
|
|
2725 | } |
|
|
2726 | |
2754 | char **cl; |
2727 | char **cl; |
2755 | int cr; |
2728 | int cr; |
|
|
2729 | |
|
|
2730 | #if ENABLE_FRILLS |
|
|
2731 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2732 | // so recode it manually |
|
|
2733 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2734 | { |
|
|
2735 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2736 | char *s = rxvt_wcstombs (w); |
|
|
2737 | free (w); |
|
|
2738 | // TODO: strlen == only the first element will be converted. well... |
|
|
2739 | paste ((unsigned char *)s, strlen (s)); |
|
|
2740 | free (s); |
|
|
2741 | } |
|
|
2742 | else |
|
|
2743 | #endif |
2756 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) |
2744 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2757 | { |
2745 | && cl) |
|
|
2746 | { |
2758 | for (int i = 0; i < cr; i++) |
2747 | for (int i = 0; i < cr; i++) |
2759 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2748 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2760 | |
2749 | |
2761 | XFreeStringList (cl); |
2750 | XFreeStringList (cl); |
2762 | } |
2751 | } |
2763 | else |
2752 | else |
2764 | paste (ct.value, ct.nitems); |
2753 | paste (ct.value, ct.nitems); // paste raw |
2765 | |
2754 | |
2766 | if (bytes_after == 0) |
2755 | bailout: |
2767 | break; |
|
|
2768 | |
|
|
2769 | XFree (ct.value); |
|
|
2770 | } |
|
|
2771 | |
|
|
2772 | if (ct.value) |
|
|
2773 | XFree (ct.value); |
2756 | XFree (ct.value); |
2774 | |
2757 | |
2775 | if (selection_wait == Sel_normal) |
2758 | if (selection_wait == Sel_normal) |
2776 | selection_wait = Sel_none; |
2759 | selection_wait = Sel_none; |
2777 | |
|
|
2778 | return (int)nread; |
|
|
2779 | } |
2760 | } |
2780 | |
2761 | |
2781 | void |
2762 | void |
2782 | rxvt_term::incr_cb (time_watcher &w) |
2763 | rxvt_term::incr_cb (time_watcher &w) |
2783 | { |
2764 | { |
2784 | selection_wait = Sel_none; |
2765 | selection_wait = Sel_none; |
2785 | |
2766 | |
|
|
2767 | incr_buf_size = 0; |
|
|
2768 | free (incr_buf); |
|
|
2769 | |
2786 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2770 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2787 | } |
2771 | } |
2788 | |
2772 | |
2789 | /* |
|
|
2790 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
|
|
2791 | */ |
|
|
2792 | void |
2773 | void |
2793 | rxvt_term::selection_property (Window win, Atom prop) |
2774 | rxvt_term::selection_property (Window win, Atom prop) |
2794 | { |
2775 | { |
2795 | if (prop == None || selection_wait != Sel_incr) |
2776 | if (prop == None || selection_wait != Sel_incr) |
2796 | return; |
2777 | return; |
2797 | |
2778 | |
2798 | if (selection_paste (win, prop, 1) > 0) |
2779 | selection_paste (win, prop, true); |
2799 | incr_ev.start (NOW + 10); |
|
|
2800 | else |
|
|
2801 | { |
|
|
2802 | selection_wait = Sel_none; |
|
|
2803 | incr_ev.stop (); |
|
|
2804 | } |
|
|
2805 | } |
2780 | } |
2806 | |
2781 | |
2807 | /* ------------------------------------------------------------------------- */ |
2782 | /* ------------------------------------------------------------------------- */ |
2808 | /* |
2783 | /* |
2809 | * Request the current selection: |
2784 | * Request the current selection: |
… | |
… | |
2815 | * EXT: button 2 release |
2790 | * EXT: button 2 release |
2816 | */ |
2791 | */ |
2817 | void |
2792 | void |
2818 | rxvt_term::selection_request (Time tm, int x, int y) |
2793 | rxvt_term::selection_request (Time tm, int x, int y) |
2819 | { |
2794 | { |
2820 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2795 | if (x < 0 || x >= width || y < 0 || y >= height) |
2821 | return; /* outside window */ |
2796 | return; /* outside window */ |
2822 | |
2797 | |
2823 | if (selection.text) |
2798 | if (selection.text) |
2824 | { /* internal selection */ |
2799 | { /* internal selection */ |
2825 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2800 | char *str = rxvt_wcstombs (selection.text, selection.len); |
… | |
… | |
2843 | #else |
2818 | #else |
2844 | selection_type = Sel_CompoundText; |
2819 | selection_type = Sel_CompoundText; |
2845 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2820 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2846 | return; |
2821 | return; |
2847 | #endif |
2822 | #endif |
2848 | |
|
|
2849 | } |
2823 | } |
2850 | } |
2824 | } |
2851 | |
2825 | |
2852 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2826 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2853 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2827 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2854 | } |
2828 | } |
2855 | |
2829 | |
2856 | int |
2830 | int |
2857 | rxvt_term::selection_request_other (Atom target, int selnum) |
2831 | rxvt_term::selection_request_other (Atom target, int selnum) |
2858 | { |
2832 | { |
2859 | Atom sel; |
2833 | Atom sel; |
2860 | #ifdef DEBUG_SELECT |
|
|
2861 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
|
|
2862 | #endif |
|
|
2863 | |
2834 | |
2864 | selection_type |= selnum; |
2835 | selection_type |= selnum; |
2865 | |
2836 | |
2866 | if (selnum == Sel_Primary) |
2837 | if (selnum == Sel_Primary) |
2867 | sel = XA_PRIMARY; |
2838 | sel = XA_PRIMARY; |
… | |
… | |
2871 | sel = xa[XA_CLIPBOARD]; |
2842 | sel = xa[XA_CLIPBOARD]; |
2872 | |
2843 | |
2873 | if (XGetSelectionOwner (display->display, sel) != None) |
2844 | if (XGetSelectionOwner (display->display, sel) != None) |
2874 | { |
2845 | { |
2875 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2846 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2876 | TermWin.vt, selection_request_time); |
2847 | vt, selection_request_time); |
2877 | return 1; |
2848 | return 1; |
2878 | } |
2849 | } |
2879 | |
2850 | |
2880 | return 0; |
2851 | return 0; |
2881 | } |
2852 | } |
… | |
… | |
2904 | * EXT: button 1 or 3 release |
2875 | * EXT: button 1 or 3 release |
2905 | */ |
2876 | */ |
2906 | void |
2877 | void |
2907 | rxvt_term::selection_make (Time tm) |
2878 | rxvt_term::selection_make (Time tm) |
2908 | { |
2879 | { |
2909 | int i, col, end_col, row, end_row; |
2880 | int i; |
2910 | wchar_t *new_selection_text; |
2881 | wchar_t *new_selection_text; |
2911 | text_t *t; |
2882 | text_t *t; |
2912 | |
2883 | |
2913 | switch (selection.op) |
2884 | switch (selection.op) |
2914 | { |
2885 | { |
… | |
… | |
2927 | selection.op = SELECTION_DONE; |
2898 | selection.op = SELECTION_DONE; |
2928 | |
2899 | |
2929 | if (selection.clicks == 4) |
2900 | if (selection.clicks == 4) |
2930 | return; /* nothing selected, go away */ |
2901 | return; /* nothing selected, go away */ |
2931 | |
2902 | |
2932 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2903 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2933 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2904 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2934 | |
2905 | |
2935 | col = selection.beg.col; |
|
|
2936 | row = selection.beg.row + TermWin.saveLines; |
|
|
2937 | end_row = selection.end.row + TermWin.saveLines; |
|
|
2938 | int ofs = 0; |
2906 | int ofs = 0; |
2939 | int extra = 0; |
2907 | int extra = 0; |
2940 | |
2908 | |
|
|
2909 | int col = selection.beg.col; |
|
|
2910 | int row = selection.beg.row; |
|
|
2911 | |
|
|
2912 | int end_col; |
|
|
2913 | |
2941 | for (; row <= end_row; row++, col = 0) |
2914 | for (; row <= selection.end.row; row++, col = 0) |
2942 | { |
2915 | { |
2943 | end_col = screen.tlen[row]; |
|
|
2944 | |
|
|
2945 | #if ENABLE_FRILLS |
2916 | #if ENABLE_FRILLS |
2946 | if (selection.rect) |
2917 | if (selection.rect) |
2947 | { |
2918 | { |
2948 | col = selection.beg.col; |
2919 | col = selection.beg.col; |
2949 | end_col = TermWin.ncol + 1; |
2920 | end_col = ncol + 1; |
2950 | } |
2921 | } |
|
|
2922 | else |
2951 | #endif |
2923 | #endif |
|
|
2924 | end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN |
2952 | |
2925 | |
2953 | MAX_IT (col, 0); |
2926 | col = max (col, 0); |
2954 | |
2927 | |
2955 | if (end_col == -1) |
|
|
2956 | end_col = TermWin.ncol; |
|
|
2957 | |
|
|
2958 | if (row == end_row || selection.rect) |
2928 | if (row == selection.end.row || selection.rect) |
2959 | MIN_IT (end_col, selection.end.col); |
2929 | end_col = min (end_col, selection.end.col); |
2960 | |
2930 | |
2961 | t = &screen.text[row][col]; |
2931 | t = ROW(row).t + col; |
2962 | for (; col < end_col; col++) |
2932 | for (; col < end_col; col++) |
2963 | { |
2933 | { |
2964 | if (*t == NOCHAR) |
2934 | if (*t == NOCHAR) |
2965 | t++; |
2935 | t++; |
2966 | #if ENABLE_COMBINING |
2936 | #if ENABLE_COMBINING |
… | |
… | |
2982 | #endif |
2952 | #endif |
2983 | else |
2953 | else |
2984 | new_selection_text[ofs++] = *t++; |
2954 | new_selection_text[ofs++] = *t++; |
2985 | } |
2955 | } |
2986 | |
2956 | |
2987 | if (screen.tlen[row] != -1 && row != end_row) |
2957 | if (!ROW(row).is_longer () && row != selection.end.row) |
2988 | new_selection_text[ofs++] = C0_LF; |
2958 | new_selection_text[ofs++] = C0_LF; |
2989 | } |
2959 | } |
2990 | |
2960 | |
2991 | if (end_col != selection.end.col) |
2961 | if (end_col != selection.end.col) |
2992 | new_selection_text[ofs++] = C0_LF; |
2962 | new_selection_text[ofs++] = C0_LF; |
… | |
… | |
3003 | |
2973 | |
3004 | // we usually allocate much more than necessary, so realloc it smaller again |
2974 | // we usually allocate much more than necessary, so realloc it smaller again |
3005 | selection.len = ofs; |
2975 | selection.len = ofs; |
3006 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2976 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
3007 | |
2977 | |
3008 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2978 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3009 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2979 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3010 | display->set_selection_owner (this); |
2980 | display->set_selection_owner (this); |
3011 | else |
2981 | else |
3012 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
2982 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
3013 | |
2983 | |
3014 | #if 0 |
2984 | #if 0 |
3015 | XTextProperty ct; |
2985 | XTextProperty ct; |
3016 | |
2986 | |
3017 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2987 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3018 | { |
2988 | { |
3019 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
2989 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3020 | PropModeReplace, ct.value, ct.nitems); |
|
|
3021 | XFree (ct.value); |
2990 | XFree (ct.value); |
3022 | } |
2991 | } |
3023 | #endif |
2992 | #endif |
3024 | |
2993 | |
3025 | selection_time = tm; |
2994 | selection_time = tm; |
… | |
… | |
3038 | |
3007 | |
3039 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3008 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3040 | |
3009 | |
3041 | if (clicks == 2 || clicks == 3) |
3010 | if (clicks == 2 || clicks == 3) |
3042 | selection_extend_colrow (selection.mark.col, |
3011 | selection_extend_colrow (selection.mark.col, |
3043 | selection.mark.row + TermWin.view_start, |
3012 | selection.mark.row + view_start, |
3044 | 0, /* button 3 */ |
3013 | 0, /* button 3 */ |
3045 | 1, /* button press */ |
3014 | 1, /* button press */ |
3046 | 0); /* click change */ |
3015 | 0); /* click change */ |
3047 | } |
3016 | } |
3048 | |
3017 | |
… | |
… | |
3052 | */ |
3021 | */ |
3053 | void |
3022 | void |
3054 | rxvt_term::selection_start_colrow (int col, int row) |
3023 | rxvt_term::selection_start_colrow (int col, int row) |
3055 | { |
3024 | { |
3056 | want_refresh = 1; |
3025 | want_refresh = 1; |
|
|
3026 | |
|
|
3027 | selection.mark.row = row - view_start; |
3057 | selection.mark.col = col; |
3028 | selection.mark.col = col; |
3058 | selection.mark.row = row - TermWin.view_start; |
|
|
3059 | |
3029 | |
3060 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
3030 | selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); |
3061 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
3031 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3062 | MAX_IT (selection.mark.col, 0); |
|
|
3063 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
|
|
3064 | |
3032 | |
3065 | while (selection.mark.col > 0 |
3033 | while (selection.mark.col > 0 |
3066 | && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) |
3034 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3067 | --selection.mark.col; |
3035 | --selection.mark.col; |
3068 | |
3036 | |
3069 | if (selection.op) |
3037 | if (selection.op) |
3070 | { /* clear the old selection */ |
3038 | { /* clear the old selection */ |
3071 | selection.beg.row = selection.end.row = selection.mark.row; |
3039 | selection.beg.row = selection.end.row = selection.mark.row; |
… | |
… | |
3095 | text_t *stp; |
3063 | text_t *stp; |
3096 | rend_t *srp; |
3064 | rend_t *srp; |
3097 | |
3065 | |
3098 | if (dirn == UP) |
3066 | if (dirn == UP) |
3099 | { |
3067 | { |
3100 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
3068 | bound.row = - nsaved - 1; |
3101 | bound.col = 0; |
3069 | bound.col = 0; |
3102 | dirnadd = -1; |
3070 | dirnadd = -1; |
3103 | } |
3071 | } |
3104 | else |
3072 | else |
3105 | { |
3073 | { |
3106 | bound.row = TermWin.saveLines + TermWin.nrow; |
3074 | bound.row = nrow; |
3107 | bound.col = TermWin.ncol - 1; |
3075 | bound.col = ncol - 1; |
3108 | dirnadd = 1; |
3076 | dirnadd = 1; |
3109 | } |
3077 | } |
3110 | |
3078 | |
3111 | row = mark->row + TermWin.saveLines; |
3079 | row = mark->row; |
3112 | col = mark->col; |
3080 | col = max (mark->col, 0); |
3113 | MAX_IT (col, 0); |
3081 | |
3114 | /* find the edge of a word */ |
3082 | /* find the edge of a word */ |
3115 | stp = &screen.text[row][col]; |
3083 | stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp); |
3116 | w1 = DELIMIT_TEXT (*stp); |
3084 | srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp); |
3117 | |
|
|
3118 | srp = &screen.rend[row][col]; |
|
|
3119 | w2 = DELIMIT_REND (*srp); |
|
|
3120 | |
3085 | |
3121 | for (;;) |
3086 | for (;;) |
3122 | { |
3087 | { |
3123 | for (; col != bound.col; col += dirnadd) |
3088 | for (; col != bound.col; col += dirnadd) |
3124 | { |
3089 | { |
… | |
… | |
3134 | break; |
3099 | break; |
3135 | } |
3100 | } |
3136 | |
3101 | |
3137 | if ((col == bound.col) && (row != bound.row)) |
3102 | if ((col == bound.col) && (row != bound.row)) |
3138 | { |
3103 | { |
3139 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
3104 | if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ()) |
3140 | { |
3105 | { |
3141 | trow = row + dirnadd; |
3106 | trow = row + dirnadd; |
3142 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
3107 | tcol = dirn == UP ? ncol - 1 : 0; |
3143 | |
3108 | |
3144 | if (screen.text[trow] == NULL) |
3109 | if (!ROW(trow).t) |
3145 | break; |
3110 | break; |
3146 | |
3111 | |
3147 | stp = & (screen.text[trow][tcol]); |
3112 | stp = ROW(trow).t + tcol; |
3148 | srp = & (screen.rend[trow][tcol]); |
3113 | srp = ROW(trow).r + tcol; |
3149 | |
3114 | |
3150 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3115 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3151 | break; |
3116 | break; |
3152 | |
3117 | |
3153 | row = trow; |
3118 | row = trow; |
… | |
… | |
3161 | Old_Word_Selection_You_Die: |
3126 | Old_Word_Selection_You_Die: |
3162 | if (dirn == DN) |
3127 | if (dirn == DN) |
3163 | col++; /* put us on one past the end */ |
3128 | col++; /* put us on one past the end */ |
3164 | |
3129 | |
3165 | /* Poke the values back in */ |
3130 | /* Poke the values back in */ |
3166 | ret->row = row - TermWin.saveLines; |
3131 | ret->row = row; |
3167 | ret->col = col; |
3132 | ret->col = col; |
3168 | } |
3133 | } |
3169 | |
3134 | |
3170 | /* ------------------------------------------------------------------------- */ |
3135 | /* ------------------------------------------------------------------------- */ |
3171 | /* |
3136 | /* |
… | |
… | |
3176 | * flag == 2 ==> button 3 motion |
3141 | * flag == 2 ==> button 3 motion |
3177 | */ |
3142 | */ |
3178 | void |
3143 | void |
3179 | rxvt_term::selection_extend (int x, int y, int flag) |
3144 | rxvt_term::selection_extend (int x, int y, int flag) |
3180 | { |
3145 | { |
3181 | int col, row; |
3146 | int col = clamp (Pixel2Col (x), 0, ncol); |
3182 | |
3147 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3183 | col = Pixel2Col (x); |
|
|
3184 | row = Pixel2Row (y); |
|
|
3185 | MAX_IT (row, 0); |
|
|
3186 | MIN_IT (row, (int)TermWin.nrow - 1); |
|
|
3187 | MAX_IT (col, 0); |
|
|
3188 | MIN_IT (col, (int)TermWin.ncol); |
|
|
3189 | |
3148 | |
3190 | /* |
3149 | /* |
3191 | * If we're selecting characters (single click) then we must check first |
3150 | * If we're selecting characters (single click) then we must check first |
3192 | * if we are at the same place as the original mark. If we are then |
3151 | * if we are at the same place as the original mark. If we are then |
3193 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3152 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3194 | * be _past_ a character for it to be selected. |
3153 | * be _past_ a character for it to be selected. |
3195 | */ |
3154 | */ |
3196 | if (((selection.clicks % 3) == 1) && !flag |
3155 | if (((selection.clicks % 3) == 1) && !flag |
3197 | && (col == selection.mark.col |
3156 | && (col == selection.mark.col |
3198 | && (row == selection.mark.row + TermWin.view_start))) |
3157 | && (row == selection.mark.row + view_start))) |
3199 | { |
3158 | { |
3200 | /* select nothing */ |
3159 | /* select nothing */ |
3201 | selection.beg.row = selection.end.row = 0; |
3160 | selection.beg.row = selection.end.row = 0; |
3202 | selection.beg.col = selection.end.col = 0; |
3161 | selection.beg.col = selection.end.col = 0; |
3203 | selection.clicks = 4; |
3162 | selection.clicks = 4; |
… | |
… | |
3218 | * Extend the selection to the specified col/row |
3177 | * Extend the selection to the specified col/row |
3219 | */ |
3178 | */ |
3220 | void |
3179 | void |
3221 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3180 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3222 | { |
3181 | { |
3223 | int16_t ncol = TermWin.ncol; |
|
|
3224 | int end_col; |
|
|
3225 | row_col_t pos; |
3182 | row_col_t pos; |
3226 | enum { |
3183 | enum { |
3227 | LEFT, RIGHT |
3184 | LEFT, RIGHT |
3228 | } closeto = RIGHT; |
3185 | } closeto = RIGHT; |
3229 | |
3186 | |
… | |
… | |
3260 | selection.beg.col = selection.end.col = selection.mark.col; |
3217 | selection.beg.col = selection.end.col = selection.mark.col; |
3261 | selection.beg.row = selection.end.row = selection.mark.row; |
3218 | selection.beg.row = selection.end.row = selection.mark.row; |
3262 | } |
3219 | } |
3263 | |
3220 | |
3264 | pos.col = col; |
3221 | pos.col = col; |
3265 | pos.row = row; |
3222 | pos.row = row - view_start; |
3266 | |
|
|
3267 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
|
|
3268 | |
3223 | |
3269 | /* |
3224 | /* |
3270 | * This is mainly xterm style selection with a couple of differences, mainly |
3225 | * This is mainly xterm style selection with a couple of differences, mainly |
3271 | * in the way button3 drag extension works. |
3226 | * in the way button3 drag extension works. |
3272 | * We're either doing: button1 drag; button3 press; or button3 drag |
3227 | * We're either doing: button1 drag; button3 press; or button3 drag |
… | |
… | |
3331 | } |
3286 | } |
3332 | } |
3287 | } |
3333 | |
3288 | |
3334 | if (selection.clicks == 1) |
3289 | if (selection.clicks == 1) |
3335 | { |
3290 | { |
3336 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3291 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3337 | |
3292 | && !ROW(selection.beg.row).is_longer () |
3338 | if (selection.beg.col > end_col |
|
|
3339 | && end_col != -1 |
|
|
3340 | #if ENABLE_FRILLS |
3293 | #if ENABLE_FRILLS |
3341 | && !selection.rect |
3294 | && !selection.rect |
3342 | #endif |
3295 | #endif |
3343 | ) |
3296 | ) |
3344 | selection.beg.col = ncol; |
3297 | selection.beg.col = ncol; |
3345 | |
3298 | |
3346 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
|
|
3347 | |
|
|
3348 | if ( |
3299 | if ( |
3349 | selection.end.col > end_col |
3300 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3350 | && end_col != -1 |
3301 | && !ROW(selection.end.row).is_longer () |
3351 | #if ENABLE_FRILLS |
3302 | #if ENABLE_FRILLS |
3352 | && !selection.rect |
3303 | && !selection.rect |
3353 | #endif |
3304 | #endif |
3354 | ) |
3305 | ) |
3355 | selection.end.col = ncol; |
3306 | selection.end.col = ncol; |
… | |
… | |
3363 | selection_delimit_word (DN, &selection.end, &selection.end); |
3314 | selection_delimit_word (DN, &selection.end, &selection.end); |
3364 | } |
3315 | } |
3365 | else if (selection.clicks == 3) |
3316 | else if (selection.clicks == 3) |
3366 | { |
3317 | { |
3367 | #if ENABLE_FRILLS |
3318 | #if ENABLE_FRILLS |
3368 | if ((options & Opt_tripleclickwords)) |
3319 | if (options & Opt_tripleclickwords) |
3369 | { |
3320 | { |
3370 | int end_row; |
3321 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3371 | |
3322 | |
3372 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
|
|
3373 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
|
|
3374 | |
|
|
3375 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3323 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3376 | { |
3324 | { |
3377 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
3325 | if (!ROW(end_row).is_longer ()) |
3378 | |
|
|
3379 | if (end_col != -1) |
|
|
3380 | { |
3326 | { |
3381 | selection.end.row = end_row; |
3327 | selection.end.row = end_row; |
3382 | selection.end.col = end_col; |
3328 | selection.end.col = ROW(end_row).l; |
3383 | selection_remove_trailing_spaces (); |
3329 | selection_remove_trailing_spaces (); |
3384 | break; |
3330 | break; |
3385 | } |
3331 | } |
3386 | } |
3332 | } |
3387 | } |
3333 | } |
… | |
… | |
3391 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3337 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3392 | selection.mark.col++; |
3338 | selection.mark.col++; |
3393 | |
3339 | |
3394 | selection.beg.col = 0; |
3340 | selection.beg.col = 0; |
3395 | selection.end.col = ncol; |
3341 | selection.end.col = ncol; |
|
|
3342 | |
|
|
3343 | // select a complete logical line |
|
|
3344 | while (selection.beg.row > -saveLines |
|
|
3345 | && ROW(selection.beg.row - 1).is_longer ()) |
|
|
3346 | selection.beg.row--; |
|
|
3347 | |
|
|
3348 | while (selection.end.row < nrow |
|
|
3349 | && ROW(selection.end.row).is_longer ()) |
|
|
3350 | selection.end.row++; |
3396 | } |
3351 | } |
3397 | } |
3352 | } |
3398 | |
3353 | |
3399 | if (button3 && buttonpress) |
3354 | if (button3 && buttonpress) |
3400 | { /* mark may need to be changed */ |
3355 | { /* mark may need to be changed */ |
… | |
… | |
3410 | } |
3365 | } |
3411 | } |
3366 | } |
3412 | |
3367 | |
3413 | #if ENABLE_FRILLS |
3368 | #if ENABLE_FRILLS |
3414 | if (selection.rect && selection.beg.col > selection.end.col) |
3369 | if (selection.rect && selection.beg.col > selection.end.col) |
3415 | SWAP_IT (selection.beg.col, selection.end.col, int); |
3370 | ::swap (selection.beg.col, selection.end.col); |
3416 | #endif |
3371 | #endif |
3417 | } |
3372 | } |
3418 | |
3373 | |
3419 | #if ENABLE_FRILLS |
3374 | #if ENABLE_FRILLS |
3420 | void |
3375 | void |
… | |
… | |
3424 | text_t *stp; |
3379 | text_t *stp; |
3425 | |
3380 | |
3426 | end_col = selection.end.col; |
3381 | end_col = selection.end.col; |
3427 | end_row = selection.end.row; |
3382 | end_row = selection.end.row; |
3428 | |
3383 | |
3429 | for ( ; end_row >= selection.beg.row; ) |
3384 | for (; end_row >= selection.beg.row; ) |
3430 | { |
3385 | { |
3431 | stp = screen.text[end_row + TermWin.saveLines]; |
3386 | stp = ROW(end_row).t; |
3432 | |
3387 | |
3433 | while (--end_col >= 0) |
3388 | while (--end_col >= 0) |
3434 | { |
3389 | { |
3435 | if (stp[end_col] != ' ' |
3390 | if (stp[end_col] != ' ' |
3436 | && stp[end_col] != '\t' |
3391 | && stp[end_col] != '\t' |
3437 | && stp[end_col] != NOCHAR) |
3392 | && stp[end_col] != NOCHAR) |
3438 | break; |
3393 | break; |
3439 | } |
3394 | } |
3440 | |
3395 | |
3441 | if (end_col >= 0 |
3396 | if (end_col >= 0 |
3442 | || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) |
3397 | || !ROW(end_row - 1).is_longer ()) |
3443 | { |
3398 | { |
3444 | selection.end.col = end_col + 1; |
3399 | selection.end.col = end_col + 1; |
3445 | selection.end.row = end_row; |
3400 | selection.end.row = end_row; |
3446 | break; |
3401 | break; |
3447 | } |
3402 | } |
3448 | |
3403 | |
3449 | end_row--; |
3404 | end_row--; |
3450 | end_col = TermWin.ncol; |
3405 | end_col = ncol; |
3451 | } |
3406 | } |
3452 | |
3407 | |
3453 | if (selection.mark.row > selection.end.row) |
3408 | if (selection.mark.row > selection.end.row) |
3454 | { |
3409 | { |
3455 | selection.mark.row = selection.end.row; |
3410 | selection.mark.row = selection.end.row; |
… | |
… | |
3473 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3428 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3474 | } |
3429 | } |
3475 | |
3430 | |
3476 | /* ------------------------------------------------------------------------- */ |
3431 | /* ------------------------------------------------------------------------- */ |
3477 | /* |
3432 | /* |
3478 | * On some systems, the Atom typedef is 64 bits wide. We need to have a type |
|
|
3479 | * that is exactly 32 bits wide, because a format of 64 is not allowed by |
|
|
3480 | * the X11 protocol. |
|
|
3481 | */ |
|
|
3482 | typedef CARD32 Atom32; |
|
|
3483 | |
|
|
3484 | /* ------------------------------------------------------------------------- */ |
|
|
3485 | /* |
|
|
3486 | * Respond to a request for our current selection |
3433 | * Respond to a request for our current selection |
3487 | * EXT: SelectionRequest |
3434 | * EXT: SelectionRequest |
3488 | */ |
3435 | */ |
3489 | void |
3436 | void |
3490 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3437 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3491 | { |
3438 | { |
3492 | XSelectionEvent ev; |
3439 | XSelectionEvent ev; |
3493 | XTextProperty ct; |
3440 | dDisp; |
3494 | XICCEncodingStyle style; |
|
|
3495 | Atom target; |
|
|
3496 | |
3441 | |
3497 | ev.type = SelectionNotify; |
3442 | ev.type = SelectionNotify; |
3498 | ev.property = None; |
3443 | ev.property = None; |
3499 | ev.display = rq.display; |
3444 | ev.display = rq.display; |
3500 | ev.requestor = rq.requestor; |
3445 | ev.requestor = rq.requestor; |
… | |
… | |
3502 | ev.target = rq.target; |
3447 | ev.target = rq.target; |
3503 | ev.time = rq.time; |
3448 | ev.time = rq.time; |
3504 | |
3449 | |
3505 | if (rq.target == xa[XA_TARGETS]) |
3450 | if (rq.target == xa[XA_TARGETS]) |
3506 | { |
3451 | { |
3507 | Atom32 target_list[6]; |
3452 | Atom target_list[6]; |
3508 | Atom32 *target = target_list; |
3453 | Atom *target = target_list; |
3509 | |
3454 | |
3510 | *target++ = (Atom32) xa[XA_TARGETS]; |
3455 | *target++ = xa[XA_TARGETS]; |
3511 | *target++ = (Atom32) xa[XA_TIMESTAMP]; |
3456 | *target++ = xa[XA_TIMESTAMP]; |
3512 | *target++ = (Atom32) XA_STRING; |
3457 | *target++ = XA_STRING; |
3513 | *target++ = (Atom32) xa[XA_TEXT]; |
3458 | *target++ = xa[XA_TEXT]; |
3514 | *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; |
3459 | *target++ = xa[XA_COMPOUND_TEXT]; |
3515 | #if X_HAVE_UTF8_STRING |
3460 | #if X_HAVE_UTF8_STRING |
3516 | *target++ = (Atom32) xa[XA_UTF8_STRING]; |
3461 | *target++ = xa[XA_UTF8_STRING]; |
3517 | #endif |
3462 | #endif |
3518 | |
3463 | |
3519 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3464 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3520 | (8 * sizeof (target_list[0])), PropModeReplace, |
3465 | 32, PropModeReplace, |
3521 | (unsigned char *)target_list, |
3466 | (unsigned char *)target_list, target - target_list); |
3522 | target - target_list); |
|
|
3523 | ev.property = rq.property; |
3467 | ev.property = rq.property; |
3524 | } |
3468 | } |
3525 | #if TODO // TODO |
3469 | #if TODO // TODO |
3526 | else if (rq.target == xa[XA_MULTIPLE]) |
3470 | else if (rq.target == xa[XA_MULTIPLE]) |
3527 | { |
3471 | { |
3528 | /* TODO: Handle MULTIPLE */ |
3472 | /* TODO: Handle MULTIPLE */ |
3529 | } |
3473 | } |
3530 | #endif |
3474 | #endif |
3531 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3475 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3532 | { |
3476 | { |
3533 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3477 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3534 | (8 * sizeof (Time)), PropModeReplace, |
|
|
3535 | (unsigned char *)&selection_time, 1); |
3478 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3536 | ev.property = rq.property; |
3479 | ev.property = rq.property; |
3537 | } |
3480 | } |
3538 | else if (rq.target == XA_STRING |
3481 | else if (rq.target == XA_STRING |
3539 | || rq.target == xa[XA_TEXT] |
3482 | || rq.target == xa[XA_TEXT] |
3540 | || rq.target == xa[XA_COMPOUND_TEXT] |
3483 | || rq.target == xa[XA_COMPOUND_TEXT] |
3541 | || rq.target == xa[XA_UTF8_STRING] |
3484 | || rq.target == xa[XA_UTF8_STRING] |
3542 | ) |
3485 | ) |
3543 | { |
3486 | { |
|
|
3487 | XTextProperty ct; |
|
|
3488 | Atom target = rq.target; |
3544 | short freect = 0; |
3489 | short freect = 0; |
3545 | int selectlen; |
3490 | int selectlen; |
3546 | wchar_t *cl; |
3491 | wchar_t *cl; |
3547 | |
3492 | enum { |
3548 | target = rq.target; |
3493 | enc_string = XStringStyle, |
|
|
3494 | enc_text = XStdICCTextStyle, |
|
|
3495 | enc_compound_text = XCompoundTextStyle, |
|
|
3496 | #ifdef X_HAVE_UTF8_STRING |
|
|
3497 | enc_utf8 = XUTF8StringStyle, |
|
|
3498 | #else |
|
|
3499 | enc_utf8 = -1, |
|
|
3500 | #endif |
|
|
3501 | } style; |
3549 | |
3502 | |
3550 | if (target == XA_STRING) |
3503 | if (target == XA_STRING) |
3551 | // we actually don't do XA_STRING, but who cares, as i18n clients |
3504 | // we actually don't do XA_STRING, but who cares, as i18n clients |
3552 | // will ask for another format anyways. |
3505 | // will ask for another format anyways. |
3553 | style = XStringStyle; |
3506 | style = enc_string; |
3554 | else if (target == xa[XA_TEXT]) |
3507 | else if (target == xa[XA_TEXT]) |
3555 | style = XStdICCTextStyle; |
3508 | style = enc_text; |
3556 | else if (target == xa[XA_COMPOUND_TEXT]) |
3509 | else if (target == xa[XA_COMPOUND_TEXT]) |
3557 | style = XCompoundTextStyle; |
3510 | style = enc_compound_text; |
3558 | #if X_HAVE_UTF8_STRING |
3511 | #if ENABLE_FRILLS |
3559 | else if (target == xa[XA_UTF8_STRING]) |
3512 | else if (target == xa[XA_UTF8_STRING]) |
3560 | style = XUTF8StringStyle; |
3513 | style = enc_utf8; |
3561 | #endif |
3514 | #endif |
3562 | else |
3515 | else |
3563 | { |
3516 | { |
3564 | target = xa[XA_COMPOUND_TEXT]; |
3517 | target = xa[XA_COMPOUND_TEXT]; |
3565 | style = XCompoundTextStyle; |
3518 | style = enc_compound_text; |
3566 | } |
3519 | } |
3567 | |
3520 | |
3568 | if (selection.text) |
3521 | if (selection.text) |
3569 | { |
3522 | { |
3570 | cl = selection.text; |
3523 | cl = selection.text; |
… | |
… | |
3574 | { |
3527 | { |
3575 | cl = L""; |
3528 | cl = L""; |
3576 | selectlen = 0; |
3529 | selectlen = 0; |
3577 | } |
3530 | } |
3578 | |
3531 | |
3579 | // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it |
3532 | #if ENABLE_FRILLS |
3580 | // manually for XUTF8StringStyle. |
3533 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
3534 | // so recode it manually |
|
|
3535 | if (style == enc_utf8) |
|
|
3536 | { |
|
|
3537 | freect = 1; |
|
|
3538 | ct.encoding = target; |
|
|
3539 | ct.format = 8; |
|
|
3540 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
|
|
3541 | ct.nitems = strlen ((char *)ct.value); |
|
|
3542 | } |
|
|
3543 | else |
|
|
3544 | #endif |
3581 | if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) |
3545 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3582 | freect = 1; |
3546 | freect = 1; |
3583 | else |
3547 | else |
3584 | { |
3548 | { |
3585 | /* if we failed to convert then send it raw */ |
3549 | /* if we failed to convert then send it raw */ |
3586 | ct.value = (unsigned char *)cl; |
3550 | ct.value = (unsigned char *)cl; |
3587 | ct.nitems = selectlen; |
3551 | ct.nitems = selectlen; |
|
|
3552 | ct.encoding = target; |
3588 | } |
3553 | } |
3589 | |
3554 | |
3590 | XChangeProperty (display->display, rq.requestor, rq.property, |
3555 | XChangeProperty (disp, rq.requestor, rq.property, |
3591 | target, 8, PropModeReplace, |
3556 | ct.encoding, 8, PropModeReplace, |
3592 | ct.value, (int)ct.nitems); |
3557 | ct.value, (int)ct.nitems); |
3593 | ev.property = rq.property; |
3558 | ev.property = rq.property; |
3594 | |
3559 | |
3595 | if (freect) |
3560 | if (freect) |
3596 | XFree (ct.value); |
3561 | XFree (ct.value); |
3597 | } |
3562 | } |
3598 | |
3563 | |
3599 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3564 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3600 | } |
3565 | } |
3601 | |
3566 | |
3602 | /* ------------------------------------------------------------------------- * |
3567 | /* ------------------------------------------------------------------------- * |
3603 | * MOUSE ROUTINES * |
3568 | * MOUSE ROUTINES * |
3604 | * ------------------------------------------------------------------------- */ |
3569 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3608 | */ |
3573 | */ |
3609 | void |
3574 | void |
3610 | rxvt_term::pixel_position (int *x, int *y) |
3575 | rxvt_term::pixel_position (int *x, int *y) |
3611 | { |
3576 | { |
3612 | *x = Pixel2Col (*x); |
3577 | *x = Pixel2Col (*x); |
3613 | /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ |
3578 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
3614 | *y = Pixel2Row (*y); |
3579 | *y = Pixel2Row (*y); |
3615 | /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ |
3580 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
3616 | } |
3581 | } |
3617 | |
3582 | |
3618 | /* ------------------------------------------------------------------------- */ |
3583 | /* ------------------------------------------------------------------------- */ |
3619 | #ifdef USE_XIM |
3584 | #ifdef USE_XIM |
3620 | void |
3585 | void |
3621 | rxvt_term::im_set_position (XPoint &pos) |
3586 | rxvt_term::im_set_position (XPoint &pos) |
3622 | { |
3587 | { |
3623 | XWindowAttributes xwa; |
3588 | XWindowAttributes xwa; |
3624 | |
3589 | |
3625 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
3590 | XGetWindowAttributes (display->display, vt, &xwa); |
3626 | |
3591 | |
3627 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3592 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3628 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; |
3593 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3629 | } |
3594 | } |
3630 | #endif |
3595 | #endif |
3631 | |
3596 | |
3632 | #if ENABLE_OVERLAY |
3597 | #if ENABLE_OVERLAY |
3633 | void |
3598 | void |
3634 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3599 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3635 | { |
3600 | { |
3636 | if (TermWin.nrow < 3 || TermWin.ncol < 3) |
3601 | if (nrow < 3 || ncol < 3) |
3637 | return; |
3602 | return; |
3638 | |
3603 | |
3639 | want_refresh = 1; |
3604 | want_refresh = 1; |
3640 | |
3605 | |
3641 | scr_overlay_off (); |
3606 | scr_overlay_off (); |
3642 | |
3607 | |
3643 | if (x < 0) x = TermWin.ncol - w; |
3608 | if (x < 0) x = ncol - w; |
3644 | if (y < 0) y = TermWin.nrow - h; |
3609 | if (y < 0) y = nrow - h; |
3645 | |
3610 | |
3646 | // make space for border |
3611 | // make space for border |
3647 | w += 2; MIN_IT (w, TermWin.ncol); |
3612 | w += 2; min_it (w, ncol); |
3648 | h += 2; MIN_IT (h, TermWin.nrow); |
3613 | h += 2; min_it (h, nrow); |
3649 | |
3614 | |
3650 | x -= 1; MAX_IT (x, 0); |
3615 | x -= 1; max_it (x, 0); |
3651 | y -= 1; MAX_IT (y, 0); |
3616 | y -= 1; max_it (y, 0); |
3652 | |
3617 | |
3653 | MIN_IT (x, TermWin.ncol - w); |
3618 | min_it (x, ncol - w); |
3654 | MIN_IT (y, TermWin.nrow - h); |
3619 | min_it (y, nrow - h); |
3655 | |
3620 | |
3656 | ov_x = x; ov_y = y; |
3621 | ov_x = x; ov_y = y; |
3657 | ov_w = w; ov_h = h; |
3622 | ov_w = w; ov_h = h; |
3658 | |
3623 | |
3659 | ov_text = new text_t *[h]; |
3624 | ov_text = new text_t *[h]; |
… | |
… | |
3724 | while (*s) |
3689 | while (*s) |
3725 | scr_overlay_set (x++, y, *s++); |
3690 | scr_overlay_set (x++, y, *s++); |
3726 | } |
3691 | } |
3727 | |
3692 | |
3728 | void |
3693 | void |
|
|
3694 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) |
|
|
3695 | { |
|
|
3696 | while (*s) |
|
|
3697 | { |
|
|
3698 | text_t t = *s++; |
|
|
3699 | int width = wcwidth (t); |
|
|
3700 | |
|
|
3701 | while (width--) |
|
|
3702 | { |
|
|
3703 | scr_overlay_set (x++, y, t); |
|
|
3704 | t = NOCHAR; |
|
|
3705 | } |
|
|
3706 | } |
|
|
3707 | } |
|
|
3708 | |
|
|
3709 | void |
3729 | rxvt_term::scr_swap_overlay () |
3710 | rxvt_term::scr_swap_overlay () |
3730 | { |
3711 | { |
3731 | if (!ov_text) |
3712 | if (!ov_text) |
3732 | return; |
3713 | return; |
3733 | |
3714 | |
3734 | int row_offset = ov_y + TermWin.saveLines - TermWin.view_start; |
|
|
3735 | |
|
|
3736 | // swap screen mem with overlay |
3715 | // swap screen mem with overlay |
3737 | for (int y = ov_h; y--; ) |
3716 | for (int y = ov_h; y--; ) |
3738 | { |
3717 | { |
3739 | text_t *t1 = ov_text[y]; |
3718 | text_t *t1 = ov_text[y]; |
3740 | rend_t *r1 = ov_rend[y]; |
3719 | rend_t *r1 = ov_rend[y]; |
3741 | |
3720 | |
3742 | text_t *t2 = screen.text[y + row_offset] + ov_x; |
3721 | text_t *t2 = ROW(y - view_start).t + ov_x; |
3743 | rend_t *r2 = screen.rend[y + row_offset] + ov_x; |
3722 | rend_t *r2 = ROW(y - view_start).r + ov_x; |
3744 | |
3723 | |
3745 | for (int x = ov_w; x--; ) |
3724 | for (int x = ov_w; x--; ) |
3746 | { |
3725 | { |
3747 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3726 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3748 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3727 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
… | |
… | |
3750 | } |
3729 | } |
3751 | } |
3730 | } |
3752 | |
3731 | |
3753 | #endif |
3732 | #endif |
3754 | /* ------------------------------------------------------------------------- */ |
3733 | /* ------------------------------------------------------------------------- */ |
|
|
3734 | |