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