… | |
… | |
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 | { |
… | |
… | |
48 | /* ------------------------------------------------------------------------- * |
47 | /* ------------------------------------------------------------------------- * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
50 | * ------------------------------------------------------------------------- */ |
49 | * ------------------------------------------------------------------------- */ |
51 | #define ZERO_SCROLLBACK() \ |
50 | #define ZERO_SCROLLBACK() \ |
52 | if (options & Opt_scrollTtyOutput) \ |
51 | if (options & Opt_scrollTtyOutput) \ |
53 | TermWin.view_start = 0 |
52 | view_start = 0 |
54 | #define CLEAR_SELECTION() \ |
53 | #define CLEAR_SELECTION() \ |
55 | selection.beg.row = selection.beg.col \ |
54 | selection.beg.row = selection.beg.col \ |
56 | = selection.end.row = selection.end.col = 0 |
55 | = selection.end.row = selection.end.col = 0 |
57 | #define CLEAR_ALL_SELECTION() \ |
56 | #define CLEAR_ALL_SELECTION() \ |
58 | selection.beg.row = selection.beg.col \ |
57 | selection.beg.row = selection.beg.col \ |
… | |
… | |
84 | #define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ |
83 | #define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ |
85 | 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) |
86 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
85 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
87 | 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) |
88 | |
87 | |
|
|
88 | #define LINENO(n) (((n) + term_start + total_rows) % total_rows) |
|
|
89 | #define ROW(n) (save [LINENO (n)]) |
|
|
90 | |
89 | /* |
91 | /* |
90 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
92 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
91 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
93 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
92 | * 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 |
93 | */ |
95 | */ |
94 | #define drawBuffer TermWin.vt |
96 | #define drawBuffer vt |
95 | |
97 | |
96 | #define CLEAR_ROWS(row, num) \ |
98 | #define CLEAR_ROWS(row, num) \ |
97 | if (TermWin.mapped) \ |
99 | if (mapped) \ |
98 | XClearArea (display->display, drawBuffer, 0, \ |
100 | XClearArea (display->display, drawBuffer, 0, \ |
99 | Row2Pixel (row), (unsigned int)TermWin.width, \ |
101 | Row2Pixel (row), (unsigned int)width, \ |
100 | (unsigned int)Height2Pixel (num), False) |
102 | (unsigned int)Height2Pixel (num), False) |
101 | |
103 | |
102 | #define CLEAR_CHARS(x, y, num) \ |
104 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (TermWin.mapped) \ |
105 | if (mapped) \ |
104 | XClearArea (display->display, drawBuffer, x, y, \ |
106 | XClearArea (display->display, drawBuffer, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
107 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
108 | (unsigned int)Height2Pixel (1), False) |
107 | |
109 | |
108 | #define ERASE_ROWS(row, num) \ |
110 | #define ERASE_ROWS(row, num) \ |
109 | XFillRectangle (display->display, drawBuffer, TermWin.gc, \ |
111 | XFillRectangle (display->display, drawBuffer, gc, \ |
110 | 0, Row2Pixel (row), \ |
112 | 0, Row2Pixel (row), \ |
111 | (unsigned int)TermWin.width, \ |
113 | (unsigned int)width, \ |
112 | (unsigned int)Height2Pixel (num)) |
114 | (unsigned int)Height2Pixel (num)) |
113 | |
115 | |
114 | /* ------------------------------------------------------------------------- * |
116 | /* ------------------------------------------------------------------------- * |
115 | * SCREEN `COMMON' ROUTINES * |
117 | * SCREEN `COMMON' ROUTINES * |
116 | * ------------------------------------------------------------------------- */ |
118 | * ------------------------------------------------------------------------- */ |
117 | |
119 | |
118 | /* Fill part/all of a line with blanks. */ |
120 | /* Fill part/all of a line with blanks. */ |
119 | void |
121 | void |
120 | 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) |
121 | { |
123 | { |
|
|
124 | if (!l.t) |
|
|
125 | { |
|
|
126 | lalloc (l); |
|
|
127 | col = 0; |
|
|
128 | width = ncol; |
|
|
129 | } |
|
|
130 | |
122 | efs &= ~RS_baseattrMask; |
131 | efs &= ~RS_baseattrMask; |
123 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
124 | |
133 | |
|
|
134 | text_t *et = l.t + col; |
|
|
135 | rend_t *er = l.r + col; |
|
|
136 | |
125 | while (width--) |
137 | while (width--) |
126 | { |
138 | { |
127 | *et++ = ' '; |
139 | *et++ = ' '; |
128 | *er++ = efs; |
140 | *er++ = efs; |
129 | } |
141 | } |
130 | } |
142 | } |
131 | |
143 | |
132 | /* ------------------------------------------------------------------------- */ |
144 | /* ------------------------------------------------------------------------- */ |
133 | /* 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 */ |
134 | void |
146 | void |
135 | 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) |
136 | { |
148 | { |
137 | #ifdef DEBUG_STRICT |
149 | scr_blank_line (l, 0, ncol, efs); |
138 | assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); |
|
|
139 | #endif |
|
|
140 | if (tp[row] == NULL) |
|
|
141 | { |
|
|
142 | tp[row] = (text_t *)talloc->alloc (); |
|
|
143 | rp[row] = (rend_t *)ralloc->alloc (); |
|
|
144 | } |
|
|
145 | |
|
|
146 | scr_blank_line (tp[row], rp[row], TermWin.ncol, efs); |
|
|
147 | } |
150 | } |
148 | |
151 | |
149 | /* ------------------------------------------------------------------------- * |
152 | /* ------------------------------------------------------------------------- * |
150 | * SCREEN INITIALISATION * |
153 | * SCREEN INITIALISATION * |
151 | * ------------------------------------------------------------------------- */ |
154 | * ------------------------------------------------------------------------- */ |
152 | void |
155 | void |
153 | rxvt_term::scr_reset () |
156 | rxvt_term::scr_reset () |
154 | { |
157 | { |
155 | unsigned int ncol, nrow, total_rows, prev_total_rows; |
|
|
156 | unsigned int p, q; |
158 | unsigned int p, q; |
157 | int k; |
159 | int k; |
158 | rend_t setrstyle; |
|
|
159 | |
160 | |
160 | #if ENABLE_OVERLAY |
161 | #if ENABLE_OVERLAY |
161 | scr_overlay_off (); |
162 | scr_overlay_off (); |
162 | #endif |
163 | #endif |
163 | |
164 | |
164 | TermWin.view_start = 0; |
165 | view_start = 0; |
165 | num_scr = 0; |
166 | num_scr = 0; |
166 | |
167 | |
167 | if (TermWin.ncol == 0) |
168 | if (ncol == 0) |
168 | TermWin.ncol = 80; |
169 | ncol = 80; |
169 | |
170 | |
170 | if (TermWin.nrow == 0) |
171 | if (nrow == 0) |
171 | TermWin.nrow = 24; |
172 | nrow = 24; |
172 | |
|
|
173 | ncol = TermWin.ncol; |
|
|
174 | nrow = TermWin.nrow; |
|
|
175 | |
173 | |
176 | if (ncol == prev_ncol && nrow == prev_nrow) |
174 | if (ncol == prev_ncol && nrow == prev_nrow) |
177 | return; |
175 | return; |
178 | |
176 | |
179 | // we need at least two lines for wrapping to work correctly |
177 | // we need at least two lines for wrapping to work correctly |
180 | if (nrow + TermWin.saveLines < 2) |
178 | if (nrow + saveLines < 2) |
181 | { |
179 | { |
182 | TermWin.saveLines++; |
180 | saveLines++; |
183 | prev_nrow--; |
181 | prev_nrow--; |
184 | TermWin.nscrolled++; |
182 | nsaved++; |
185 | } |
183 | } |
186 | |
184 | |
187 | want_refresh = 1; |
185 | want_refresh = 1; |
188 | |
186 | |
189 | prev_total_rows = prev_nrow + TermWin.saveLines; |
187 | int prev_total_rows = prev_nrow + saveLines; |
190 | total_rows = nrow + TermWin.saveLines; |
188 | total_rows = nrow + saveLines; |
191 | |
189 | |
192 | screen.tscroll = 0; |
190 | screen.tscroll = 0; |
193 | screen.bscroll = nrow - 1; |
191 | screen.bscroll = nrow - 1; |
194 | |
192 | |
195 | if (!talloc) |
193 | if (!save) |
196 | { |
|
|
197 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
198 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
199 | } |
|
|
200 | |
|
|
201 | if (!screen.text) |
|
|
202 | { |
194 | { |
203 | /* |
195 | /* |
204 | * 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 |
205 | * 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 |
206 | */ |
198 | */ |
207 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
199 | nsaved = 0; /* no saved lines */ |
208 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
200 | term_start = 0; |
209 | 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)); |
210 | swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
208 | swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); |
211 | |
209 | |
212 | screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); |
|
|
213 | swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); |
|
|
214 | |
|
|
215 | screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
|
|
216 | buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
|
|
217 | drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
|
|
218 | swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
|
|
219 | |
|
|
220 | for (p = 0; p < nrow; p++) |
210 | for (p = nrow; p--; ) |
221 | { |
211 | { |
222 | q = p + TermWin.saveLines; |
|
|
223 | scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); |
212 | scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); |
224 | scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); |
213 | scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); |
225 | screen.tlen[q] = swap.tlen[p] = 0; |
|
|
226 | scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); |
214 | scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); |
227 | } |
215 | } |
228 | |
216 | |
229 | memset (charsets, 'B', sizeof (charsets)); |
217 | memset (charsets, 'B', sizeof (charsets)); |
230 | TermWin.nscrolled = 0; /* no saved lines */ |
|
|
231 | rstyle = DEFAULT_RSTYLE; |
218 | rstyle = DEFAULT_RSTYLE; |
232 | screen.flags = Screen_DefaultFlags; |
219 | screen.flags = Screen_DefaultFlags; |
233 | screen.cur.row = screen.cur.col = 0; |
220 | screen.cur.row = screen.cur.col = 0; |
234 | screen.charset = 0; |
221 | screen.charset = 0; |
235 | current_screen = PRIMARY; |
222 | current_screen = PRIMARY; |
… | |
… | |
255 | else |
242 | else |
256 | { |
243 | { |
257 | /* |
244 | /* |
258 | * add or delete rows as appropriate |
245 | * add or delete rows as appropriate |
259 | */ |
246 | */ |
260 | setrstyle = DEFAULT_RSTYLE; |
247 | |
|
|
248 | rxvt_salloc *old_ta; |
|
|
249 | rxvt_salloc *old_ra; |
261 | |
250 | |
262 | if (nrow < prev_nrow) |
251 | if (nrow < prev_nrow) |
263 | { |
252 | { |
264 | /* delete rows */ |
253 | /* delete rows */ |
265 | 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 |
266 | scr_scroll_text (0, (int)prev_nrow - 1, k, 1); |
256 | scr_scroll_text (0, (int)prev_nrow - 1, k, 1); |
267 | |
257 | |
268 | for (p = nrow; p < prev_nrow; p++) |
258 | for (p = nrow; p < prev_nrow; p++) |
269 | { |
259 | { |
270 | q = p + TermWin.saveLines; |
260 | lfree (ROW(p)); |
271 | |
|
|
272 | if (screen.text[q]) |
|
|
273 | { |
|
|
274 | #ifdef DEBUG_STRICT |
|
|
275 | assert (screen.rend[q]); |
|
|
276 | #endif |
|
|
277 | talloc->free (screen.text[q]); |
|
|
278 | ralloc->free (screen.rend[q]); |
|
|
279 | } |
|
|
280 | |
|
|
281 | if (swap.text[p]) |
261 | lfree (swap_save[p]); |
282 | { |
|
|
283 | #ifdef DEBUG_STRICT |
|
|
284 | assert (swap.rend[p]); |
|
|
285 | #endif |
|
|
286 | talloc->free (swap.text[p]); |
|
|
287 | ralloc->free (swap.rend[p]); |
|
|
288 | } |
|
|
289 | |
|
|
290 | #ifdef DEBUG_STRICT |
|
|
291 | assert (drawn_text[p] && drawn_rend[p]); |
|
|
292 | #endif |
|
|
293 | talloc->free (drawn_text[p]); |
262 | lfree (drawn[p]); |
294 | ralloc->free (drawn_rend[p]); |
|
|
295 | } |
263 | } |
296 | |
264 | |
297 | /* we have fewer rows so fix up cursor position */ |
265 | /* we have fewer rows so fix up cursor position */ |
298 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
266 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
299 | |
267 | |
… | |
… | |
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, 1); |
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 | } |
339 | |
299 | |
340 | #ifdef DEBUG_STRICT |
300 | #ifdef DEBUG_STRICT |
341 | assert (screen.cur.row < TermWin.nrow); |
301 | assert (screen.cur.row < nrow); |
342 | #else /* drive with your eyes closed */ |
302 | #else /* drive with your eyes closed */ |
343 | MIN_IT (screen.cur.row, nrow - 1); |
303 | MIN_IT (screen.cur.row, nrow - 1); |
344 | #endif |
304 | #endif |
345 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
305 | ncol = ocol; // save b/c scr_blank_screen_mem uses this |
346 | } |
306 | } |
347 | |
307 | |
348 | /* resize columns */ |
308 | /* resize columns */ |
349 | if (ncol != prev_ncol) |
309 | if (ncol != prev_ncol) |
350 | { |
310 | { |
351 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
311 | old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
352 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
312 | old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
353 | |
313 | |
354 | for (p = 0; p < total_rows; p++) |
314 | for (p = total_rows; p--; ) |
|
|
315 | lresize (save[p]); |
|
|
316 | |
|
|
317 | for (p = nrow; p--; ) |
355 | { |
318 | { |
356 | 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) |
357 | { |
356 | { |
358 | screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t)); |
357 | --p; |
359 | screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t)); |
|
|
360 | |
|
|
361 | MIN_IT (screen.tlen[p], (int16_t)ncol); |
|
|
362 | |
|
|
363 | if (ncol > prev_ncol) |
358 | llen += prev_ncol; |
364 | scr_blank_line (&screen.text[p][prev_ncol], |
359 | } |
365 | &screen.rend[p][prev_ncol], |
360 | |
366 | 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; |
367 | } |
413 | } |
368 | } |
414 | } |
369 | |
|
|
370 | for (p = 0; p < nrow; p++) |
|
|
371 | { |
|
|
372 | drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t)); |
|
|
373 | drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t)); |
|
|
374 | |
|
|
375 | if (ncol > prev_ncol) |
|
|
376 | scr_blank_line (&drawn_text[p][prev_ncol], |
|
|
377 | &drawn_rend[p][prev_ncol], |
|
|
378 | ncol - prev_ncol, setrstyle); |
|
|
379 | |
|
|
380 | if (swap.text[p]) |
|
|
381 | { |
|
|
382 | swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t)); |
|
|
383 | swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t)); |
|
|
384 | |
|
|
385 | MIN_IT (swap.tlen[p], (int16_t)ncol); |
|
|
386 | |
|
|
387 | if (ncol > prev_ncol) |
|
|
388 | scr_blank_line (&swap.text[p][prev_ncol], |
|
|
389 | &swap.rend[p][prev_ncol], |
|
|
390 | ncol - prev_ncol, setrstyle); |
|
|
391 | } |
|
|
392 | |
|
|
393 | } |
415 | } |
394 | |
416 | |
395 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
417 | free (screen.text); screen.text = tp; |
|
|
418 | free (screen.rend); screen.rend = rp; |
|
|
419 | free (screen.tlen); screen.tlen = tl; |
396 | |
420 | |
397 | delete talloc; talloc = ta; |
421 | for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D |
398 | delete ralloc; ralloc = ra; |
422 | #endif |
399 | } |
|
|
400 | |
423 | |
401 | if (tabs) |
424 | if (tabs) |
402 | free (tabs); |
425 | free (tabs); |
403 | } |
426 | } |
404 | |
427 | |
… | |
… | |
414 | } |
437 | } |
415 | |
438 | |
416 | void |
439 | void |
417 | rxvt_term::scr_reset_realloc () |
440 | rxvt_term::scr_reset_realloc () |
418 | { |
441 | { |
419 | unsigned int total_rows, nrow; |
|
|
420 | |
|
|
421 | nrow = TermWin.nrow; |
|
|
422 | total_rows = nrow + TermWin.saveLines; |
|
|
423 | /* *INDENT-OFF* */ |
|
|
424 | screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); |
|
|
425 | buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *)); |
|
|
426 | drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *)); |
|
|
427 | 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)); |
428 | |
443 | drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t)); |
429 | screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t)); |
444 | buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t)); |
430 | 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)); |
431 | |
|
|
432 | screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *)); |
|
|
433 | buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *)); |
|
|
434 | drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *)); |
|
|
435 | swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *)); |
|
|
436 | /* *INDENT-ON* */ |
|
|
437 | } |
446 | } |
438 | |
447 | |
439 | /* ------------------------------------------------------------------------- */ |
448 | /* ------------------------------------------------------------------------- */ |
440 | /* |
449 | /* |
441 | * Free everything. That way malloc debugging can find leakage. |
450 | * Free everything. That way malloc debugging can find leakage. |
442 | */ |
451 | */ |
443 | void |
452 | void |
444 | rxvt_term::scr_release () |
453 | rxvt_term::scr_release () |
445 | { |
454 | { |
446 | unsigned int total_rows; |
|
|
447 | int i; |
|
|
448 | |
|
|
449 | total_rows = TermWin.nrow + TermWin.saveLines; |
|
|
450 | |
|
|
451 | delete talloc; talloc = 0; |
455 | delete talloc; talloc = 0; |
452 | delete ralloc; ralloc = 0; |
456 | delete ralloc; ralloc = 0; |
453 | |
457 | |
454 | free (screen.text); |
458 | free (save); |
455 | free (screen.tlen); |
459 | free (swap_save); |
456 | free (screen.rend); |
|
|
457 | free (drawn_text); |
460 | free (drawn); |
458 | free (drawn_rend); |
|
|
459 | free (swap.text); |
|
|
460 | free (swap.tlen); |
|
|
461 | free (swap.rend); |
|
|
462 | free (buf_text); |
461 | free (buf); |
463 | free (buf_rend); |
|
|
464 | free (tabs); |
462 | free (tabs); |
465 | |
|
|
466 | /* NULL these so if anything tries to use them, we'll know about it */ |
|
|
467 | screen.text = drawn_text = swap.text = NULL; |
|
|
468 | screen.rend = drawn_rend = swap.rend = NULL; |
|
|
469 | screen.tlen = swap.tlen = NULL; |
|
|
470 | buf_text = NULL; |
|
|
471 | buf_rend = NULL; |
|
|
472 | tabs = NULL; |
|
|
473 | } |
463 | } |
474 | |
464 | |
475 | /* ------------------------------------------------------------------------- */ |
465 | /* ------------------------------------------------------------------------- */ |
476 | /* |
466 | /* |
477 | * Hard reset |
467 | * Hard reset |
… | |
… | |
528 | set_font_style (); |
518 | set_font_style (); |
529 | break; |
519 | break; |
530 | } |
520 | } |
531 | |
521 | |
532 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
522 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
533 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
523 | MIN_IT (s->cur.row, nrow - 1); |
534 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
524 | MIN_IT (s->cur.col, ncol - 1); |
535 | #ifdef DEBUG_STRICT |
525 | #ifdef DEBUG_STRICT |
536 | assert (s->cur.row >= 0); |
526 | assert (s->cur.row >= 0); |
537 | assert (s->cur.col >= 0); |
527 | assert (s->cur.col >= 0); |
538 | #else /* drive with your eyes closed */ |
528 | #else /* drive with your eyes closed */ |
539 | MAX_IT (s->cur.row, 0); |
529 | MAX_IT (s->cur.row, 0); |
… | |
… | |
555 | int offset; |
545 | int offset; |
556 | #endif |
546 | #endif |
557 | |
547 | |
558 | want_refresh = 1; |
548 | want_refresh = 1; |
559 | |
549 | |
560 | TermWin.view_start = 0; |
550 | view_start = 0; |
561 | |
551 | |
562 | if (current_screen == scrn) |
552 | if (current_screen == scrn) |
563 | return scrn; |
553 | return scrn; |
564 | |
554 | |
565 | selection_check (2); /* check for boundary cross */ |
555 | selection_check (2); /* check for boundary cross */ |
… | |
… | |
575 | |
565 | |
576 | #if NSCREENS |
566 | #if NSCREENS |
577 | if (options & Opt_secondaryScreen) |
567 | if (options & Opt_secondaryScreen) |
578 | { |
568 | { |
579 | num_scr = 0; |
569 | num_scr = 0; |
580 | offset = TermWin.saveLines; |
570 | offset = saveLines; |
581 | |
571 | |
582 | for (i = prev_nrow; i--;) |
572 | for (i = prev_nrow; i--;) |
583 | { |
573 | SWAP_IT (ROW(i), swap_save[i], line_t); |
584 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
|
|
585 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
|
|
586 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
|
|
587 | } |
|
|
588 | |
574 | |
589 | SWAP_IT (screen.charset, swap.charset, int16_t); |
575 | SWAP_IT (screen.charset, swap.charset, int16_t); |
590 | SWAP_IT (screen.flags, swap.flags, int); |
576 | SWAP_IT (screen.flags, swap.flags, int); |
591 | screen.flags |= Screen_VisibleCursor; |
577 | screen.flags |= Screen_VisibleCursor; |
592 | swap.flags |= Screen_VisibleCursor; |
578 | swap.flags |= Screen_VisibleCursor; |
… | |
… | |
610 | |
596 | |
611 | screen.cur.col = 0; |
597 | screen.cur.col = 0; |
612 | |
598 | |
613 | if (screen.cur.row == screen.bscroll) |
599 | if (screen.cur.row == screen.bscroll) |
614 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
600 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
615 | else if (screen.cur.row < TermWin.nrow - 1) |
601 | else if (screen.cur.row < nrow - 1) |
616 | screen.cur.row++; |
602 | screen.cur.row++; |
617 | } |
603 | } |
618 | |
604 | |
619 | /* ------------------------------------------------------------------------- */ |
605 | /* ------------------------------------------------------------------------- */ |
620 | /* |
606 | /* |
… | |
… | |
656 | */ |
642 | */ |
657 | int |
643 | int |
658 | rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) |
644 | rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) |
659 | { |
645 | { |
660 | int i, j; |
646 | int i, j; |
661 | long nscrolled; |
|
|
662 | |
647 | |
663 | if (count == 0 || (row1 > row2)) |
648 | if (count == 0 || (row1 > row2)) |
664 | return 0; |
649 | return 0; |
665 | |
650 | |
666 | want_refresh = 1; |
651 | want_refresh = 1; |
667 | |
652 | |
668 | if (row1 == 0 && count > 0 |
653 | if (row1 == 0 && count > 0 |
669 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
654 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
670 | { |
655 | { |
671 | nscrolled = (long)TermWin.nscrolled + (long)count; |
656 | nsaved = min (nsaved + count, saveLines); |
|
|
657 | term_start = (term_start + count) % total_rows; |
672 | |
658 | |
673 | if (nscrolled > (long)TermWin.saveLines) |
659 | if (selection.op && current_screen == selection.screen) |
674 | TermWin.nscrolled = TermWin.saveLines; |
660 | { |
|
|
661 | selection.beg.row -= count; |
|
|
662 | selection.end.row -= count; |
|
|
663 | selection.mark.row -= count; |
|
|
664 | } |
|
|
665 | |
|
|
666 | for (int i = count; i--; ) |
|
|
667 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
675 | else |
668 | |
676 | TermWin.nscrolled = (unsigned int)nscrolled; |
|
|
677 | |
|
|
678 | if ((options & Opt_scrollWithBuffer) |
669 | if ((options & Opt_scrollWithBuffer) |
679 | && TermWin.view_start != 0 |
670 | && view_start != 0 |
680 | && TermWin.view_start != TermWin.saveLines) |
671 | && view_start != saveLines) |
681 | scr_page (UP, count); |
672 | scr_page (UP, count); |
682 | } |
673 | } |
|
|
674 | else |
|
|
675 | { |
683 | else if (!spec) |
676 | if (!spec) |
684 | row1 += TermWin.saveLines; |
677 | row1 += saveLines; |
685 | |
678 | |
686 | row2 += TermWin.saveLines; |
679 | row2 += saveLines; |
687 | |
680 | |
688 | if (selection.op && current_screen == selection.screen) |
681 | if (selection.op && current_screen == selection.screen) |
689 | { |
682 | { |
690 | i = selection.beg.row + TermWin.saveLines; |
683 | i = selection.beg.row + saveLines; |
691 | j = selection.end.row + TermWin.saveLines; |
684 | j = selection.end.row + saveLines; |
|
|
685 | |
692 | if ((i < row1 && j > row1) |
686 | if ((i < row1 && j > row1) |
693 | || (i < row2 && j > row2) |
687 | || (i < row2 && j > row2) |
694 | || (i - count < row1 && i >= row1) |
688 | || (i - count < row1 && i >= row1) |
695 | || (i - count > row2 && i <= row2) |
689 | || (i - count > row2 && i <= row2) |
696 | || (j - count < row1 && j >= row1) |
690 | || (j - count < row1 && j >= row1) |
697 | || (j - count > row2 && j <= row2)) |
691 | || (j - count > row2 && j <= row2)) |
698 | { |
692 | { |
699 | CLEAR_ALL_SELECTION (); |
693 | CLEAR_ALL_SELECTION (); |
700 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
694 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
701 | } |
695 | } |
702 | else if (j >= row1 && j <= row2) |
696 | else if (j >= row1 && j <= row2) |
703 | { |
697 | { |
704 | /* move selected region too */ |
698 | /* move selected region too */ |
705 | selection.beg.row -= count; |
699 | selection.beg.row -= count; |
706 | selection.end.row -= count; |
700 | selection.end.row -= count; |
707 | selection.mark.row -= count; |
701 | selection.mark.row -= count; |
708 | } |
702 | } |
709 | } |
703 | } |
710 | |
704 | |
711 | selection_check (0); /* _after_ TermWin.nscrolled update */ |
705 | selection_check (0); /* _after_ nsaved update */ |
712 | |
706 | |
713 | num_scr += count; |
707 | num_scr += count; |
714 | j = count; |
708 | j = count; |
715 | |
709 | |
716 | if (count < 0) |
710 | if (count < 0) |
717 | count = -count; |
711 | count = -count; |
718 | |
712 | |
719 | i = row2 - row1 + 1; |
713 | i = row2 - row1 + 1; |
720 | MIN_IT (count, i); |
714 | MIN_IT (count, i); |
721 | |
715 | |
722 | if (j > 0) |
716 | if (j > 0) |
723 | { |
717 | { |
724 | /* A: scroll up */ |
718 | /* scroll up */ |
725 | |
719 | |
726 | /* A1: Copy lines that will get clobbered by the rotation */ |
720 | /* Copy lines that will get clobbered by the rotation */ |
727 | memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); |
721 | memcpy (buf, save + row1, count * sizeof (line_t)); |
728 | memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); |
|
|
729 | |
722 | |
730 | /* A2: Rotate lines */ |
723 | /* Rotate lines */ |
731 | i = row2 - row1 - count + 1; |
724 | i = row2 - row1 - count + 1; |
732 | memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); |
725 | memmove (save + row1, save + row1 + count, i * sizeof (line_t)); |
733 | memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); |
|
|
734 | memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); |
|
|
735 | |
726 | |
736 | j = row2 - count + 1, i = count; |
727 | j = row2 - count + 1, i = count; |
737 | } |
728 | } |
738 | else /* if (j < 0) */ |
729 | else /* if (j < 0) */ |
739 | { |
730 | { |
740 | /* B: scroll down */ |
731 | /* scroll down */ |
741 | |
732 | |
742 | /* B1: Copy lines that will get clobbered by the rotation */ |
733 | /* Copy lines that will get clobbered by the rotation */ |
743 | for (i = 0, j = row2; i < count; i++, j--) |
734 | for (i = 0, j = row2; i < count; i++, j--) |
744 | { |
735 | buf[i] = save[j]; |
745 | buf_text[i] = screen.text[j]; |
|
|
746 | buf_rend[i] = screen.rend[j]; |
|
|
747 | } |
|
|
748 | |
736 | |
749 | /* B2: Rotate lines */ |
737 | /* Rotate lines */ |
750 | for (j = row2, i = j - count; i >= row1; i--, j--) |
738 | for (j = row2, i = j - count; i >= row1; i--, j--) |
751 | { |
739 | save[j] = save[i]; |
752 | screen.tlen[j] = screen.tlen[i]; |
|
|
753 | screen.text[j] = screen.text[i]; |
|
|
754 | screen.rend[j] = screen.rend[i]; |
|
|
755 | } |
|
|
756 | |
740 | |
757 | j = row1, i = count; |
741 | j = row1, i = count; |
758 | count = -count; |
742 | count = -count; |
759 | } |
743 | } |
760 | |
744 | |
761 | /* C: Resurrect lines */ |
745 | /* Resurrect lines */ |
762 | memset (screen.tlen + j, 0, i * sizeof (int16_t)); |
746 | memcpy (save + j, buf, i * sizeof (line_t)); |
763 | memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); |
747 | |
764 | memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); |
|
|
765 | if (!spec) /* line length may not equal TermWin.ncol */ |
748 | if (!spec) /* line length may not equal ncol */ |
766 | for (; i--; j++) |
749 | for (; i--; j++) |
767 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); |
750 | scr_blank_screen_mem (save[j], rstyle); |
|
|
751 | } |
768 | |
752 | |
769 | return count; |
753 | return count; |
770 | } |
754 | } |
771 | |
755 | |
772 | /* ------------------------------------------------------------------------- */ |
756 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
774 | * Add text given in <str> of length <len> to screen struct |
758 | * Add text given in <str> of length <len> to screen struct |
775 | */ |
759 | */ |
776 | void |
760 | void |
777 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
761 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
778 | { |
762 | { |
|
|
763 | if (len <= 0) /* sanity */ |
|
|
764 | return; |
|
|
765 | |
779 | unsigned char checksel; |
766 | unsigned char checksel; |
780 | unicode_t c; |
767 | unicode_t c; |
781 | int i, row, last_col; |
768 | int row, last_col; |
782 | text_t *stp; |
769 | const unicode_t *strend = str + len; |
783 | rend_t *srp; |
|
|
784 | |
|
|
785 | if (len <= 0) /* sanity */ |
|
|
786 | return; |
|
|
787 | |
770 | |
788 | want_refresh = 1; |
771 | want_refresh = 1; |
789 | ZERO_SCROLLBACK (); |
772 | ZERO_SCROLLBACK (); |
790 | last_col = TermWin.ncol; |
773 | last_col = ncol; |
791 | |
774 | |
792 | if (nlines > 0) |
775 | if (nlines > 0) |
793 | { |
776 | { |
794 | nlines += screen.cur.row - screen.bscroll; |
777 | nlines += screen.cur.row - screen.bscroll; |
795 | if ((nlines > 0) |
778 | if ((nlines > 0) |
796 | && (screen.tscroll == 0) |
779 | && (screen.tscroll == 0) |
797 | && (screen.bscroll == (TermWin.nrow - 1))) |
780 | && (screen.bscroll == (nrow - 1))) |
798 | { |
781 | { |
799 | /* _at least_ this many lines need to be scrolled */ |
782 | /* _at least_ this many lines need to be scrolled */ |
800 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
783 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
801 | screen.cur.row -= nlines; |
784 | screen.cur.row -= nlines; |
802 | } |
785 | } |
803 | } |
786 | } |
804 | |
787 | |
805 | #ifdef DEBUG_STRICT |
788 | #ifdef DEBUG_STRICT |
806 | assert (screen.cur.col < last_col); |
789 | assert (screen.cur.col < last_col); |
807 | assert ((screen.cur.row < TermWin.nrow) |
790 | assert ((screen.cur.row < nrow) |
808 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
791 | && (screen.cur.row >= - (int32_t)nsaved)); |
809 | #else /* drive with your eyes closed */ |
792 | #else /* drive with your eyes closed */ |
810 | MIN_IT (screen.cur.col, last_col - 1); |
793 | MIN_IT (screen.cur.col, last_col - 1); |
811 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
794 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
812 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
795 | MAX_IT (screen.cur.row, - (int32_t)nsaved); |
813 | #endif |
796 | #endif |
814 | row = screen.cur.row + TermWin.saveLines; |
797 | row = screen.cur.row; |
815 | |
798 | |
816 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
799 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
817 | |
800 | |
818 | stp = screen.text[row]; |
801 | line_t *line = &ROW(row); |
819 | srp = screen.rend[row]; |
|
|
820 | |
802 | |
821 | while (len--) |
803 | while (str < strend) |
822 | { |
804 | { |
823 | c = *str++; |
805 | c = *str++; |
824 | |
806 | |
825 | if (c < 0x20) |
807 | if (c < 0x20) |
826 | switch (c) |
808 | if (c == C0_LF) |
|
|
809 | { |
|
|
810 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
811 | MAX_IT (line->l, screen.cur.col); |
|
|
812 | |
|
|
813 | screen.flags &= ~Screen_WrapNext; |
|
|
814 | |
|
|
815 | if (screen.cur.row == screen.bscroll) |
|
|
816 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
817 | else if (screen.cur.row < (nrow - 1)) |
|
|
818 | row = ++screen.cur.row; |
|
|
819 | |
|
|
820 | line = &ROW(row); /* _must_ refresh */ |
|
|
821 | continue; |
|
|
822 | } |
|
|
823 | else if (c == C0_CR) |
827 | { |
824 | { |
828 | case C0_HT: |
825 | if (!line->is_longer ()) /* XXX: think about this */ |
829 | scr_tab (1, true); |
|
|
830 | continue; |
|
|
831 | |
|
|
832 | case C0_LF: |
|
|
833 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
834 | MAX_IT (screen.tlen[row], screen.cur.col); |
826 | MAX_IT (line->l, screen.cur.col); |
835 | |
827 | |
836 | screen.flags &= ~Screen_WrapNext; |
828 | screen.flags &= ~Screen_WrapNext; |
837 | |
|
|
838 | if (screen.cur.row == screen.bscroll) |
|
|
839 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
840 | else if (screen.cur.row < (TermWin.nrow - 1)) |
|
|
841 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
842 | |
|
|
843 | stp = screen.text[row]; /* _must_ refresh */ |
|
|
844 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
845 | continue; |
|
|
846 | |
|
|
847 | case C0_CR: |
|
|
848 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
849 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
850 | |
|
|
851 | screen.flags &= ~Screen_WrapNext; |
|
|
852 | screen.cur.col = 0; |
829 | screen.cur.col = 0; |
853 | continue; |
830 | continue; |
|
|
831 | } |
|
|
832 | else if (c == C0_HT) |
|
|
833 | { |
|
|
834 | scr_tab (1, true); |
|
|
835 | continue; |
854 | } |
836 | } |
855 | |
837 | |
856 | if (checksel /* see if we're writing within selection */ |
838 | if (checksel /* see if we're writing within selection */ |
857 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
839 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
858 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
840 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
… | |
… | |
866 | CLEAR_SELECTION (); |
848 | CLEAR_SELECTION (); |
867 | } |
849 | } |
868 | |
850 | |
869 | if (screen.flags & Screen_WrapNext) |
851 | if (screen.flags & Screen_WrapNext) |
870 | { |
852 | { |
871 | screen.tlen[row] = -1; |
853 | line->set_is_longer (); |
872 | |
854 | |
873 | scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; |
855 | scr_do_wrap (); |
874 | |
|
|
875 | stp = screen.text[row]; /* _must_ refresh */ |
|
|
876 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
877 | } |
856 | |
|
|
857 | row = screen.cur.row; |
|
|
858 | line = &ROW(row); /* _must_ refresh */ |
|
|
859 | } |
|
|
860 | |
|
|
861 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
|
|
862 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
|
|
863 | c = 0xfffd; |
878 | |
864 | |
879 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
865 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
880 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
866 | // do wcwidth before further replacements, as wcwidth might return -1 |
881 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
867 | // for the line drawing characters below as they might be invalid in the current |
|
|
868 | // locale. |
882 | int width = c < 0x100 ? 1 : wcwidth (c); |
869 | int width = c < 0x100 ? 1 : wcwidth (c); |
883 | |
870 | |
884 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
871 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
885 | { |
872 | { |
886 | // vt100 special graphics and line drawing |
873 | // vt100 special graphics and line drawing |
887 | // 5f-7e standard vt100 |
874 | // 5f-7e standard vt100 |
888 | // 40-5e rxvt extension for extra curses acs chars |
875 | // 40-5e rxvt extension for extra curses acs chars |
889 | static uint16_t vt100_0[63] = { // 40 .. 7e |
876 | static uint16_t vt100_0[62] = { // 41 .. 7e |
890 | 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! |
877 | 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman! |
891 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f |
878 | 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f |
892 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 |
879 | 0, 0, 0, 0, 0, 0, 0, 0, // 50-57 |
893 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f |
880 | 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f |
894 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
881 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
895 | 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f |
882 | 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f |
896 | 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 |
883 | 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 |
897 | 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e |
884 | 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e |
898 | }; |
885 | }; |
899 | |
886 | |
900 | if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) |
887 | if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41]) |
901 | { |
888 | { |
902 | c = vt100_0[c - 0x40]; |
889 | c = vt100_0[c - 0x41]; |
903 | width = 1; |
890 | width = 1; // vt100 line drawing characters are always single-width |
904 | } |
891 | } |
905 | } |
892 | } |
906 | |
893 | |
907 | if (screen.flags & Screen_Insert) |
894 | if (screen.flags & Screen_Insert) |
908 | scr_insdel_chars (width, INSERT); |
895 | scr_insdel_chars (width, INSERT); |
909 | |
896 | |
910 | if (width != 0) |
897 | if (width != 0) |
911 | { |
898 | { |
912 | // some utf-8 decoders decode surrogate characters. |
|
|
913 | if (0xd800 <= c && c <= 0xdfff) |
|
|
914 | c = 0xfffd; |
|
|
915 | |
|
|
916 | #if !UNICODE_3 |
899 | #if !UNICODE_3 |
917 | // trim characters we can't store directly :( |
900 | // trim characters we can't store directly :( |
918 | if (c >= 0x10000) |
901 | if (c >= 0x10000) |
919 | # if ENABLE_COMBINING |
902 | # if ENABLE_COMBINING |
920 | c = rxvt_composite.compose (c); // map to lower 16 bits |
903 | c = rxvt_composite.compose (c); // map to lower 16 bits |
… | |
… | |
922 | c = 0xfffd; |
905 | c = 0xfffd; |
923 | # endif |
906 | # endif |
924 | #endif |
907 | #endif |
925 | |
908 | |
926 | // nuke the character at this position, if required |
909 | // nuke the character at this position, if required |
927 | if (stp[screen.cur.col] == NOCHAR |
910 | if (line->t[screen.cur.col] == NOCHAR |
928 | || (screen.cur.col < TermWin.ncol - 1 |
911 | || (screen.cur.col < ncol - 1 |
929 | && stp[screen.cur.col + 1] == NOCHAR)) |
912 | && line->t[screen.cur.col + 1] == NOCHAR)) |
930 | { |
913 | { |
931 | int col = screen.cur.col; |
914 | int col = screen.cur.col; |
932 | |
915 | |
933 | // find begin |
916 | // find begin |
934 | while (col > 0 && stp[col] == NOCHAR) |
917 | while (col > 0 && line->t[col] == NOCHAR) |
935 | col--; |
918 | col--; |
936 | |
919 | |
937 | rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); |
920 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
938 | |
921 | |
939 | // found begin, nuke |
922 | // found begin, nuke |
940 | do { |
923 | do { |
941 | stp[col] = ' '; |
924 | line->t[col] = ' '; |
942 | srp[col] = rend; |
925 | line->r[col] = rend; |
943 | col++; |
926 | col++; |
944 | } while (col < TermWin.ncol && stp[col] == NOCHAR); |
927 | } while (col < ncol && line->t[col] == NOCHAR); |
945 | } |
928 | } |
946 | |
929 | |
947 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
930 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
931 | |
|
|
932 | // if the character doesn't fit into the remaining columns... |
|
|
933 | if (screen.cur.col > last_col - width && last_col >= width) |
|
|
934 | { |
|
|
935 | // ...output spaces |
|
|
936 | c = ' '; |
|
|
937 | // and try the same character next loop iteration |
|
|
938 | --str; |
|
|
939 | } |
948 | |
940 | |
949 | do |
941 | do |
950 | { |
942 | { |
951 | stp[screen.cur.col] = c; |
943 | line->t[screen.cur.col] = c; |
952 | srp[screen.cur.col] = rend; |
944 | line->r[screen.cur.col] = rend; |
953 | |
945 | |
954 | if (screen.cur.col < last_col - 1) |
946 | if (screen.cur.col < last_col - 1) |
955 | screen.cur.col++; |
947 | screen.cur.col++; |
956 | else |
948 | else |
957 | { |
949 | { |
958 | screen.tlen[row] = last_col; |
950 | line->l = last_col; |
959 | if (screen.flags & Screen_Autowrap) |
951 | if (screen.flags & Screen_Autowrap) |
960 | screen.flags |= Screen_WrapNext; |
952 | screen.flags |= Screen_WrapNext; |
961 | break; |
953 | break; |
962 | } |
954 | } |
963 | |
955 | |
… | |
… | |
965 | } |
957 | } |
966 | while (--width > 0); |
958 | while (--width > 0); |
967 | |
959 | |
968 | // pad with spaces when overwriting wide character with smaller one |
960 | // pad with spaces when overwriting wide character with smaller one |
969 | if (!width) |
961 | if (!width) |
970 | for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) |
962 | for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) |
971 | { |
963 | { |
972 | stp[c] = ' '; |
964 | line->t[c] = ' '; |
973 | srp[c] = rend; |
965 | line->r[c] = rend; |
974 | } |
966 | } |
975 | } |
967 | } |
976 | else if (width == 0) |
968 | else // width == 0 |
977 | { |
969 | { |
978 | #if ENABLE_COMBINING |
970 | #if ENABLE_COMBINING |
979 | // handle combining characters |
971 | // handle combining characters |
980 | // we just tag the accent on the previous on-screen character. |
972 | // we just tag the accent on the previous on-screen character. |
981 | // this is arguably not correct, but also arguably not wrong. |
973 | // this is arguably not correct, but also arguably not wrong. |
982 | // we don't handle double-width characters nicely yet. |
974 | // we don't handle double-width characters nicely yet. |
983 | |
|
|
984 | text_t *tp; |
975 | text_t *tp; |
985 | rend_t *rp; |
976 | rend_t *rp; |
986 | |
977 | |
987 | if (screen.cur.col > 0) |
978 | if (screen.cur.col > 0) |
988 | { |
979 | { |
989 | tp = stp + screen.cur.col - 1; |
980 | tp = line->t + screen.cur.col - 1; |
990 | rp = srp + screen.cur.col - 1; |
981 | rp = line->r + screen.cur.col - 1; |
991 | |
982 | |
992 | while (*tp == NOCHAR && tp > stp) |
983 | while (*tp == NOCHAR && tp > line->t) |
993 | tp--, rp--; |
984 | tp--, rp--; |
994 | } |
985 | } |
995 | else if (screen.cur.row > 0 |
986 | else if (screen.cur.row > 0 |
996 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
987 | && ROW(screen.cur.row - 1).is_longer ()) |
997 | { |
988 | { |
998 | int line = screen.cur.row - 1 + TermWin.saveLines; |
989 | line_t *line = &ROW(screen.cur.row - 1); |
999 | |
990 | |
1000 | tp = screen.text[line] + last_col - 1; |
991 | tp = line->t + last_col - 1; |
1001 | rp = screen.rend[line] + last_col - 1; |
992 | rp = line->r + last_col - 1; |
1002 | |
993 | |
1003 | while (*tp == NOCHAR && tp > screen.text[line]) |
994 | while (*tp == NOCHAR && tp > line->t) |
1004 | tp--, rp--; |
995 | tp--, rp--; |
1005 | } |
996 | } |
1006 | else |
997 | else |
1007 | continue; |
998 | continue; |
1008 | |
999 | |
… | |
… | |
1015 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
1006 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
1016 | #endif |
1007 | #endif |
1017 | } |
1008 | } |
1018 | } |
1009 | } |
1019 | |
1010 | |
1020 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
1011 | if (!line->is_longer ()) /* XXX: think about this */ |
1021 | MAX_IT (screen.tlen[row], screen.cur.col); |
1012 | MAX_IT (line->l, screen.cur.col); |
1022 | |
1013 | |
1023 | #ifdef DEBUG_STRICT |
1014 | #ifdef DEBUG_STRICT |
1024 | assert (screen.cur.row >= 0); |
1015 | assert (screen.cur.row >= 0); |
1025 | #else /* drive with your eyes closed */ |
1016 | #else /* drive with your eyes closed */ |
1026 | MAX_IT (screen.cur.row, 0); |
1017 | MAX_IT (screen.cur.row, 0); |
… | |
… | |
1040 | if (screen.cur.col == 0) |
1031 | if (screen.cur.col == 0) |
1041 | { |
1032 | { |
1042 | if (screen.cur.row > 0) |
1033 | if (screen.cur.row > 0) |
1043 | { |
1034 | { |
1044 | #ifdef TERMCAP_HAS_BW |
1035 | #ifdef TERMCAP_HAS_BW |
1045 | screen.cur.col = TermWin.ncol - 1; |
1036 | screen.cur.col = ncol - 1; |
1046 | screen.cur.row--; |
1037 | screen.cur.row--; |
1047 | return; |
1038 | return; |
1048 | #endif |
1039 | #endif |
1049 | } |
1040 | } |
1050 | } |
1041 | } |
… | |
… | |
1070 | |
1061 | |
1071 | if (count == 0) |
1062 | if (count == 0) |
1072 | return; |
1063 | return; |
1073 | else if (count > 0) |
1064 | else if (count > 0) |
1074 | { |
1065 | { |
1075 | int row = TermWin.saveLines + screen.cur.row; |
1066 | int row = screen.cur.row; |
1076 | text_t *tp = screen.text[row]; |
1067 | |
1077 | rend_t *rp = screen.rend[row]; |
1068 | line_t &l = ROW(row); |
1078 | rend_t base_rend = rp[i]; |
1069 | rend_t base_rend = l.r[i]; |
1079 | ht &= tp[i] == ' '; |
1070 | ht &= l.t[i] == ' '; |
1080 | |
1071 | |
1081 | for (; ++i < TermWin.ncol; ) |
1072 | for (; ++i < ncol; ) |
1082 | if (tabs[i]) |
1073 | if (tabs[i]) |
1083 | { |
1074 | { |
1084 | x = i; |
1075 | x = i; |
1085 | if (!--count) |
1076 | if (!--count) |
1086 | break; |
1077 | break; |
1087 | } |
1078 | } |
1088 | else |
1079 | else |
1089 | ht &= tp[i] == ' ' |
1080 | ht &= l.t[i] == ' ' |
1090 | && RS_SAME (rp[i], base_rend); |
1081 | && RS_SAME (l.r[i], base_rend); |
1091 | |
1082 | |
1092 | if (count) |
1083 | if (count) |
1093 | x = TermWin.ncol - 1; |
1084 | x = ncol - 1; |
1094 | |
1085 | |
1095 | // store horizontal tab commands as characters inside the text |
1086 | // store horizontal tab commands as characters inside the text |
1096 | // buffer so they can be selected and pasted. |
1087 | // buffer so they can be selected and pasted. |
1097 | if (ht && options & Opt_pastableTabs) |
1088 | if (ht && options & Opt_pastableTabs) |
1098 | { |
1089 | { |
1099 | base_rend = SET_FONT (base_rend, 0); |
1090 | base_rend = SET_FONT (base_rend, 0); |
1100 | |
1091 | |
1101 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
1092 | if (!l.is_longer ()) /* XXX: think about this */ |
1102 | MAX_IT (screen.tlen[row], x); |
1093 | MAX_IT (l.l, x); |
1103 | |
1094 | |
1104 | i = screen.cur.col; |
1095 | i = screen.cur.col; |
1105 | |
1096 | |
1106 | tp[i] = '\t'; |
1097 | l.t[i] = '\t'; |
1107 | rp[i] = base_rend; |
1098 | l.r[i] = base_rend; |
1108 | |
1099 | |
1109 | while (++i < x) |
1100 | while (++i < x) |
1110 | { |
1101 | { |
1111 | tp[i] = NOCHAR; |
1102 | l.t[i] = NOCHAR; |
1112 | rp[i] = base_rend; |
1103 | l.r[i] = base_rend; |
1113 | } |
1104 | } |
1114 | } |
1105 | } |
1115 | } |
1106 | } |
1116 | else /* if (count < 0) */ |
1107 | else /* if (count < 0) */ |
1117 | { |
1108 | { |
… | |
… | |
1143 | rxvt_term::scr_backindex () |
1134 | rxvt_term::scr_backindex () |
1144 | { |
1135 | { |
1145 | if (screen.cur.col > 0) |
1136 | if (screen.cur.col > 0) |
1146 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1137 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1147 | else |
1138 | else |
1148 | { |
|
|
1149 | if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) |
|
|
1150 | return; /* um, yeah? */ |
|
|
1151 | |
|
|
1152 | scr_insdel_chars (1, INSERT); |
1139 | scr_insdel_chars (1, INSERT); |
1153 | } |
|
|
1154 | } |
1140 | } |
1155 | #endif |
1141 | #endif |
1156 | /* ------------------------------------------------------------------------- */ |
1142 | /* ------------------------------------------------------------------------- */ |
1157 | /* |
1143 | /* |
1158 | * Process DEC Forward Index |
1144 | * Process DEC Forward Index |
… | |
… | |
1162 | */ |
1148 | */ |
1163 | #if ENABLE_FRILLS |
1149 | #if ENABLE_FRILLS |
1164 | void |
1150 | void |
1165 | rxvt_term::scr_forwardindex () |
1151 | rxvt_term::scr_forwardindex () |
1166 | { |
1152 | { |
1167 | int row; |
1153 | int row; |
1168 | |
1154 | |
1169 | if (screen.cur.col < TermWin.ncol - 1) |
1155 | if (screen.cur.col < ncol - 1) |
1170 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1156 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1171 | else |
1157 | else |
1172 | { |
1158 | { |
1173 | row = screen.cur.row + TermWin.saveLines; |
1159 | row = screen.cur.row; |
1174 | |
1160 | |
1175 | if (screen.tlen[row] == 0) |
1161 | if (ROW(row).is_longer ()) //TODO//FIXME//LEN |
1176 | return; /* um, yeah? */ |
1162 | ROW(row).l = ncol; |
1177 | else if (screen.tlen[row] == -1) |
|
|
1178 | screen.tlen[row] = TermWin.ncol; |
|
|
1179 | |
1163 | |
1180 | scr_gotorc (0, 0, R_RELATIVE); |
1164 | scr_gotorc (0, 0, R_RELATIVE); |
1181 | scr_insdel_chars (1, DELETE); |
1165 | scr_insdel_chars (1, DELETE); |
1182 | scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); |
1166 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1183 | } |
1167 | } |
1184 | } |
1168 | } |
1185 | #endif |
1169 | #endif |
1186 | |
1170 | |
1187 | /* ------------------------------------------------------------------------- */ |
1171 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1194 | want_refresh = 1; |
1178 | want_refresh = 1; |
1195 | ZERO_SCROLLBACK (); |
1179 | ZERO_SCROLLBACK (); |
1196 | |
1180 | |
1197 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1181 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1198 | MAX_IT (screen.cur.col, 0); |
1182 | MAX_IT (screen.cur.col, 0); |
1199 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1183 | MIN_IT (screen.cur.col, (int32_t)ncol - 1); |
1200 | |
1184 | |
1201 | screen.flags &= ~Screen_WrapNext; |
1185 | screen.flags &= ~Screen_WrapNext; |
1202 | |
1186 | |
1203 | if (relative & R_RELATIVE) |
1187 | if (relative & R_RELATIVE) |
1204 | { |
1188 | { |
… | |
… | |
1229 | else |
1213 | else |
1230 | screen.cur.row = row; |
1214 | screen.cur.row = row; |
1231 | } |
1215 | } |
1232 | |
1216 | |
1233 | MAX_IT (screen.cur.row, 0); |
1217 | MAX_IT (screen.cur.row, 0); |
1234 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1218 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
1235 | } |
1219 | } |
1236 | |
1220 | |
1237 | /* ------------------------------------------------------------------------- */ |
1221 | /* ------------------------------------------------------------------------- */ |
1238 | /* |
1222 | /* |
1239 | * direction should be UP or DN |
1223 | * direction should be UP or DN |
… | |
… | |
1255 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1239 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1256 | else |
1240 | else |
1257 | screen.cur.row += dirn; |
1241 | screen.cur.row += dirn; |
1258 | |
1242 | |
1259 | MAX_IT (screen.cur.row, 0); |
1243 | MAX_IT (screen.cur.row, 0); |
1260 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1244 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
1261 | selection_check (0); |
1245 | selection_check (0); |
1262 | } |
1246 | } |
1263 | |
1247 | |
1264 | /* ------------------------------------------------------------------------- */ |
1248 | /* ------------------------------------------------------------------------- */ |
1265 | /* |
1249 | /* |
… | |
… | |
1276 | want_refresh = 1; |
1260 | want_refresh = 1; |
1277 | ZERO_SCROLLBACK (); |
1261 | ZERO_SCROLLBACK (); |
1278 | |
1262 | |
1279 | selection_check (1); |
1263 | selection_check (1); |
1280 | |
1264 | |
1281 | row = TermWin.saveLines + screen.cur.row; |
1265 | row = screen.cur.row; |
|
|
1266 | |
1282 | switch (mode) |
1267 | switch (mode) |
1283 | { |
1268 | { |
1284 | case 0: /* erase to end of line */ |
1269 | case 0: /* erase to end of line */ |
1285 | col = screen.cur.col; |
1270 | col = screen.cur.col; |
1286 | num = TermWin.ncol - col; |
1271 | num = ncol - col; |
1287 | MIN_IT (screen.tlen[row], (int16_t)col); |
1272 | MIN_IT (ROW(row).l, (int16_t)col); |
1288 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1273 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1289 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1274 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1290 | CLEAR_SELECTION (); |
1275 | CLEAR_SELECTION (); |
1291 | break; |
1276 | break; |
1292 | case 1: /* erase to beginning of line */ |
1277 | case 1: /* erase to beginning of line */ |
… | |
… | |
1296 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1281 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1297 | CLEAR_SELECTION (); |
1282 | CLEAR_SELECTION (); |
1298 | break; |
1283 | break; |
1299 | case 2: /* erase whole line */ |
1284 | case 2: /* erase whole line */ |
1300 | col = 0; |
1285 | col = 0; |
1301 | num = TermWin.ncol; |
1286 | num = ncol; |
1302 | screen.tlen[row] = 0; |
1287 | ROW(row).l = 0; |
1303 | if (selection.beg.row <= screen.cur.row |
1288 | if (selection.beg.row <= screen.cur.row |
1304 | && selection.end.row >= screen.cur.row) |
1289 | && selection.end.row >= screen.cur.row) |
1305 | CLEAR_SELECTION (); |
1290 | CLEAR_SELECTION (); |
1306 | break; |
1291 | break; |
1307 | default: |
1292 | default: |
1308 | return; |
1293 | return; |
1309 | } |
1294 | } |
1310 | |
1295 | |
1311 | if (screen.text[row]) |
1296 | scr_blank_line (ROW(row), col, num, rstyle); |
1312 | scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle); |
|
|
1313 | else |
|
|
1314 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
|
|
1315 | } |
1297 | } |
1316 | |
1298 | |
1317 | /* ------------------------------------------------------------------------- */ |
1299 | /* ------------------------------------------------------------------------- */ |
1318 | /* |
1300 | /* |
1319 | * Erase part of whole of the screen |
1301 | * Erase part of whole of the screen |
… | |
… | |
1330 | XGCValues gcvalue; |
1312 | XGCValues gcvalue; |
1331 | |
1313 | |
1332 | want_refresh = 1; |
1314 | want_refresh = 1; |
1333 | ZERO_SCROLLBACK (); |
1315 | ZERO_SCROLLBACK (); |
1334 | |
1316 | |
1335 | row_offset = (int32_t)TermWin.saveLines; |
1317 | row_offset = (int32_t)saveLines; |
1336 | |
1318 | |
1337 | switch (mode) |
1319 | switch (mode) |
1338 | { |
1320 | { |
1339 | case 0: /* erase to end of screen */ |
1321 | case 0: /* erase to end of screen */ |
1340 | selection_check (1); |
1322 | selection_check (1); |
1341 | scr_erase_line (0); |
1323 | scr_erase_line (0); |
1342 | row = screen.cur.row + 1; /* possible OOB */ |
1324 | row = screen.cur.row + 1; /* possible OOB */ |
1343 | num = TermWin.nrow - row; |
1325 | num = nrow - row; |
1344 | break; |
1326 | break; |
1345 | case 1: /* erase to beginning of screen */ |
1327 | case 1: /* erase to beginning of screen */ |
1346 | selection_check (3); |
1328 | selection_check (3); |
1347 | scr_erase_line (1); |
1329 | scr_erase_line (1); |
1348 | row = 0; |
1330 | row = 0; |
1349 | num = screen.cur.row; |
1331 | num = screen.cur.row; |
1350 | break; |
1332 | break; |
1351 | case 2: /* erase whole screen */ |
1333 | case 2: /* erase whole screen */ |
1352 | selection_check (3); |
1334 | selection_check (3); |
1353 | row = 0; |
1335 | row = 0; |
1354 | num = TermWin.nrow; |
1336 | num = nrow; |
1355 | break; |
1337 | break; |
1356 | default: |
1338 | default: |
1357 | return; |
1339 | return; |
1358 | } |
1340 | } |
1359 | |
1341 | |
… | |
… | |
1361 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1343 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1362 | || (selection.end.row >= row |
1344 | || (selection.end.row >= row |
1363 | && selection.end.row <= row + num))) |
1345 | && selection.end.row <= row + num))) |
1364 | CLEAR_SELECTION (); |
1346 | CLEAR_SELECTION (); |
1365 | |
1347 | |
1366 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1348 | if (row >= nrow) /* Out Of Bounds */ |
1367 | return; |
1349 | return; |
1368 | |
1350 | |
1369 | MIN_IT (num, (TermWin.nrow - row)); |
1351 | MIN_IT (num, (nrow - row)); |
1370 | |
1352 | |
1371 | if (rstyle & (RS_RVid | RS_Uline)) |
1353 | if (rstyle & (RS_RVid | RS_Uline)) |
1372 | ren = (rend_t) ~RS_None; |
1354 | ren = (rend_t) ~RS_None; |
1373 | else if (GET_BASEBG (rstyle) == Color_bg) |
1355 | else if (GET_BASEBG (rstyle) == Color_bg) |
1374 | { |
1356 | { |
… | |
… | |
1377 | } |
1359 | } |
1378 | else |
1360 | else |
1379 | { |
1361 | { |
1380 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1362 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1381 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1363 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1382 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1364 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1383 | ERASE_ROWS (row, num); |
1365 | ERASE_ROWS (row, num); |
1384 | gcvalue.foreground = pix_colors[Color_fg]; |
1366 | gcvalue.foreground = pix_colors[Color_fg]; |
1385 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1367 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1386 | } |
1368 | } |
1387 | |
1369 | |
1388 | for (; num--; row++) |
1370 | for (; num--; row++) |
1389 | { |
1371 | { |
1390 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); |
1372 | scr_blank_screen_mem (save[row + row_offset], rstyle); |
1391 | screen.tlen[row + row_offset] = 0; |
1373 | save[row + row_offset].l = 0; |
1392 | scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); |
1374 | scr_blank_line (drawn[row], 0, ncol, ren); |
1393 | } |
1375 | } |
1394 | } |
1376 | } |
|
|
1377 | |
|
|
1378 | #if ENABLE_FRILLS |
|
|
1379 | void |
|
|
1380 | rxvt_term::scr_erase_savelines () |
|
|
1381 | { |
|
|
1382 | want_refresh = 1; |
|
|
1383 | ZERO_SCROLLBACK (); |
|
|
1384 | |
|
|
1385 | nsaved = 0; |
|
|
1386 | } |
|
|
1387 | #endif |
1395 | |
1388 | |
1396 | /* ------------------------------------------------------------------------- */ |
1389 | /* ------------------------------------------------------------------------- */ |
1397 | /* |
1390 | /* |
1398 | * Fill the screen with `E's |
1391 | * Fill the screen with `E's |
1399 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1392 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1400 | */ |
1393 | */ |
1401 | void |
1394 | void |
1402 | rxvt_term::scr_E () |
1395 | rxvt_term::scr_E () |
1403 | { |
1396 | { |
1404 | int i, j, k; |
1397 | int i, j, k; |
1405 | rend_t *r1, fs; |
1398 | rend_t *r1, fs; |
1406 | |
1399 | |
1407 | want_refresh = 1; |
1400 | want_refresh = 1; |
1408 | ZERO_SCROLLBACK (); |
1401 | ZERO_SCROLLBACK (); |
1409 | |
1402 | |
1410 | num_scr_allow = 0; |
1403 | num_scr_allow = 0; |
1411 | selection_check (3); |
1404 | selection_check (3); |
1412 | |
1405 | |
1413 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1406 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1414 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1407 | for (k = saveLines, i = nrow; i--; k++) |
1415 | { |
1408 | { |
1416 | screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ |
1409 | line_t &line = save[k]; |
|
|
1410 | |
1417 | fill_text (screen.text[k], 'E', TermWin.ncol); |
1411 | fill_text (line.t, 'E', ncol); |
|
|
1412 | |
1418 | for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) |
1413 | for (r1 = line.r, j = ncol; j--; ) |
1419 | *r1++ = fs; |
1414 | *r1++ = fs; |
|
|
1415 | |
|
|
1416 | line.l = ncol; /* make the `E's selectable */ |
1420 | } |
1417 | } |
1421 | } |
1418 | } |
1422 | |
1419 | |
1423 | /* ------------------------------------------------------------------------- */ |
1420 | /* ------------------------------------------------------------------------- */ |
1424 | /* |
1421 | /* |
… | |
… | |
1457 | void |
1454 | void |
1458 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1455 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1459 | { |
1456 | { |
1460 | int col, row; |
1457 | int col, row; |
1461 | rend_t tr; |
1458 | rend_t tr; |
1462 | text_t *stp; |
|
|
1463 | rend_t *srp; |
|
|
1464 | int16_t *slp; |
|
|
1465 | |
1459 | |
1466 | want_refresh = 1; |
1460 | want_refresh = 1; |
1467 | ZERO_SCROLLBACK (); |
1461 | ZERO_SCROLLBACK (); |
1468 | |
1462 | |
1469 | if (count <= 0) |
1463 | if (count <= 0) |
1470 | return; |
1464 | return; |
1471 | |
1465 | |
1472 | scr_do_wrap (); |
1466 | scr_do_wrap (); |
1473 | |
1467 | |
1474 | selection_check (1); |
1468 | selection_check (1); |
1475 | MIN_IT (count, (TermWin.ncol - screen.cur.col)); |
1469 | MIN_IT (count, (ncol - screen.cur.col)); |
1476 | |
1470 | |
1477 | row = screen.cur.row + TermWin.saveLines; |
1471 | row = screen.cur.row + saveLines; |
1478 | |
1472 | |
1479 | stp = screen.text[row]; |
1473 | line_t *line = save + row; |
1480 | srp = screen.rend[row]; |
|
|
1481 | slp = &screen.tlen[row]; |
|
|
1482 | |
1474 | |
1483 | switch (insdel) |
1475 | switch (insdel) |
1484 | { |
1476 | { |
1485 | case INSERT: |
1477 | case INSERT: |
1486 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) |
1478 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1487 | { |
1479 | { |
1488 | stp[col] = stp[col - count]; |
1480 | line->t[col] = line->t[col - count]; |
1489 | srp[col] = srp[col - count]; |
1481 | line->r[col] = line->r[col - count]; |
1490 | } |
1482 | } |
1491 | |
1483 | |
1492 | if (*slp != -1) |
1484 | if (!line->is_longer ()) |
1493 | { |
1485 | { |
1494 | *slp += count; |
1486 | line->l += count; |
1495 | MIN_IT (*slp, TermWin.ncol); |
1487 | MIN_IT (line->l, ncol); |
1496 | } |
1488 | } |
1497 | |
1489 | |
1498 | if (selection.op && current_screen == selection.screen |
1490 | if (selection.op && current_screen == selection.screen |
1499 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1491 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1500 | { |
1492 | { |
1501 | if (selection.end.row != screen.cur.row |
1493 | if (selection.end.row != screen.cur.row |
1502 | || (selection.end.col + count >= TermWin.ncol)) |
1494 | || (selection.end.col + count >= ncol)) |
1503 | CLEAR_SELECTION (); |
1495 | CLEAR_SELECTION (); |
1504 | else |
1496 | else |
1505 | { /* shift selection */ |
1497 | { /* shift selection */ |
1506 | selection.beg.col += count; |
1498 | selection.beg.col += count; |
1507 | selection.mark.col += count; /* XXX: yes? */ |
1499 | selection.mark.col += count; /* XXX: yes? */ |
1508 | selection.end.col += count; |
1500 | selection.end.col += count; |
1509 | } |
1501 | } |
1510 | } |
1502 | } |
1511 | |
1503 | |
1512 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1504 | scr_blank_line (save[row], screen.cur.col, count, rstyle); |
1513 | (unsigned int)count, rstyle); |
|
|
1514 | break; |
1505 | break; |
1515 | |
1506 | |
1516 | case ERASE: |
1507 | case ERASE: |
1517 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1508 | screen.cur.col += count; /* don't worry if > ncol */ |
1518 | selection_check (1); |
1509 | selection_check (1); |
1519 | screen.cur.col -= count; |
1510 | screen.cur.col -= count; |
1520 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1511 | scr_blank_line (save[row], screen.cur.col, count, rstyle); |
1521 | (unsigned int)count, rstyle); |
|
|
1522 | break; |
1512 | break; |
1523 | |
1513 | |
1524 | case DELETE: |
1514 | case DELETE: |
1525 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1515 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1526 | |
1516 | |
1527 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1517 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1528 | { |
1518 | { |
1529 | stp[col] = stp[col + count]; |
1519 | line->t[col] = line->t[col + count]; |
1530 | srp[col] = srp[col + count]; |
1520 | line->r[col] = line->r[col + count]; |
1531 | } |
1521 | } |
1532 | |
1522 | |
1533 | scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], |
1523 | scr_blank_line (*line, ncol - count, count, tr); |
1534 | (unsigned int)count, tr); |
|
|
1535 | |
1524 | |
1536 | if (*slp == -1) /* break line continuation */ |
1525 | if (line->is_longer ()) /* break line continuation */ |
1537 | *slp = TermWin.ncol; |
1526 | line->l = ncol; |
1538 | |
1527 | |
1539 | *slp -= count; |
1528 | line->l -= count; |
1540 | MAX_IT (*slp, 0); |
1529 | MAX_IT (line->l, 0); |
1541 | |
1530 | |
1542 | if (selection.op && current_screen == selection.screen |
1531 | if (selection.op && current_screen == selection.screen |
1543 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1532 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1544 | { |
1533 | { |
1545 | if (selection.end.row != screen.cur.row |
1534 | if (selection.end.row != screen.cur.row |
1546 | || (screen.cur.col >= selection.beg.col - count) |
1535 | || (screen.cur.col >= selection.beg.col - count) |
1547 | || selection.end.col >= TermWin.ncol) |
1536 | || selection.end.col >= ncol) |
1548 | CLEAR_SELECTION (); |
1537 | CLEAR_SELECTION (); |
1549 | else |
1538 | else |
1550 | { |
1539 | { |
1551 | /* shift selection */ |
1540 | /* shift selection */ |
1552 | selection.beg.col -= count; |
1541 | selection.beg.col -= count; |
… | |
… | |
1566 | */ |
1555 | */ |
1567 | void |
1556 | void |
1568 | rxvt_term::scr_scroll_region (int top, int bot) |
1557 | rxvt_term::scr_scroll_region (int top, int bot) |
1569 | { |
1558 | { |
1570 | MAX_IT (top, 0); |
1559 | MAX_IT (top, 0); |
1571 | MIN_IT (bot, (int)TermWin.nrow - 1); |
1560 | MIN_IT (bot, (int)nrow - 1); |
1572 | |
1561 | |
1573 | if (top > bot) |
1562 | if (top > bot) |
1574 | return; |
1563 | return; |
1575 | |
1564 | |
1576 | screen.tscroll = top; |
1565 | screen.tscroll = top; |
… | |
… | |
1655 | */ |
1644 | */ |
1656 | void |
1645 | void |
1657 | rxvt_term::scr_set_tab (int mode) |
1646 | rxvt_term::scr_set_tab (int mode) |
1658 | { |
1647 | { |
1659 | if (mode < 0) |
1648 | if (mode < 0) |
1660 | memset (tabs, 0, TermWin.ncol * sizeof (char)); |
1649 | memset (tabs, 0, ncol * sizeof (char)); |
1661 | else if (screen.cur.col < TermWin.ncol) |
1650 | else if (screen.cur.col < ncol) |
1662 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1651 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1663 | } |
1652 | } |
1664 | |
1653 | |
1665 | /* ------------------------------------------------------------------------- */ |
1654 | /* ------------------------------------------------------------------------- */ |
1666 | /* |
1655 | /* |
… | |
… | |
1681 | if (bgPixmap.pixmap == None) |
1670 | if (bgPixmap.pixmap == None) |
1682 | #endif |
1671 | #endif |
1683 | #if TRANSPARENT |
1672 | #if TRANSPARENT |
1684 | if (! (options & Opt_transparent) || am_transparent == 0) |
1673 | if (! (options & Opt_transparent) || am_transparent == 0) |
1685 | #endif |
1674 | #endif |
1686 | XSetWindowBackground (display->display, TermWin.vt, |
1675 | XSetWindowBackground (display->display, vt, |
1687 | pix_colors[Color_bg]); |
1676 | pix_colors[Color_bg]); |
1688 | |
1677 | |
1689 | gcvalue.foreground = pix_colors[Color_fg]; |
1678 | gcvalue.foreground = pix_colors[Color_fg]; |
1690 | gcvalue.background = pix_colors[Color_bg]; |
1679 | gcvalue.background = pix_colors[Color_bg]; |
1691 | XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, |
1680 | XChangeGC (display->display, gc, GCBackground | GCForeground, |
1692 | &gcvalue); |
1681 | &gcvalue); |
1693 | scr_clear (); |
1682 | scr_clear (); |
1694 | scr_touch (true); |
1683 | scr_touch (true); |
1695 | } |
1684 | } |
1696 | } |
1685 | } |
… | |
… | |
1777 | bool |
1766 | bool |
1778 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1767 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1779 | { |
1768 | { |
1780 | bool found = false; |
1769 | bool found = false; |
1781 | |
1770 | |
1782 | for (int i = 0; i < TermWin.nrow; i++) |
1771 | for (int i = 0; i < nrow; i++) |
1783 | { |
1772 | { |
1784 | int col = 0; |
1773 | int col = 0; |
1785 | rend_t *drp = drawn_rend [i]; |
1774 | rend_t *drp = drawn[i].r; |
1786 | |
1775 | |
1787 | for (; col < TermWin.ncol; col++, drp++) |
1776 | for (; col < ncol; col++, drp++) |
1788 | if ((*drp & mask) == value) |
1777 | if ((*drp & mask) == value) |
1789 | { |
1778 | { |
1790 | found = true; |
1779 | found = true; |
1791 | *drp = ~value; |
1780 | *drp = ~value; |
1792 | } |
1781 | } |
… | |
… | |
1803 | PART_END, |
1792 | PART_END, |
1804 | RC_COUNT |
1793 | RC_COUNT |
1805 | }; |
1794 | }; |
1806 | |
1795 | |
1807 | void |
1796 | void |
1808 | rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) |
1797 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1809 | { |
1798 | { |
1810 | int i; |
1799 | int i; |
1811 | row_col_t rc[RC_COUNT]; |
1800 | row_col_t rc[RC_COUNT]; |
1812 | |
1801 | |
1813 | if (drawn_text == NULL) /* sanity check */ |
1802 | if (!drawn) /* sanity check */ |
1814 | return; |
1803 | return; |
1815 | |
1804 | |
1816 | #ifndef NO_SLOW_LINK_SUPPORT |
1805 | #ifndef NO_SLOW_LINK_SUPPORT |
1817 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1806 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1818 | { |
1807 | { |
1819 | y = 0; |
1808 | y = 0; |
1820 | height = TermWin.height; |
1809 | eheight = height; |
1821 | } |
1810 | } |
1822 | #endif |
1811 | #endif |
1823 | |
1812 | |
1824 | #ifdef DEBUG_STRICT |
1813 | #ifdef DEBUG_STRICT |
1825 | x = max (x, 0); |
1814 | x = max (x, 0); |
1826 | x = min (x, (int)TermWin.width); |
1815 | x = min (x, (int)width); |
1827 | y = max (y, 0); |
1816 | y = max (y, 0); |
1828 | y = min (y, (int)TermWin.height); |
1817 | y = min (y, (int)height); |
1829 | #endif |
1818 | #endif |
1830 | |
1819 | |
1831 | /* round down */ |
1820 | /* round down */ |
1832 | rc[PART_BEG].col = Pixel2Col (x); |
1821 | rc[PART_BEG].col = Pixel2Col (x); |
1833 | rc[PART_BEG].row = Pixel2Row (y); |
1822 | rc[PART_BEG].row = Pixel2Row (y); |
1834 | /* round up */ |
1823 | /* round up */ |
1835 | rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); |
1824 | rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1); |
1836 | rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); |
1825 | rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); |
1837 | |
1826 | |
1838 | /* sanity checks */ |
1827 | /* sanity checks */ |
1839 | for (i = PART_BEG; i < RC_COUNT; i++) |
1828 | for (i = PART_BEG; i < RC_COUNT; i++) |
1840 | { |
1829 | { |
1841 | MIN_IT (rc[i].col, TermWin.ncol - 1); |
1830 | MIN_IT (rc[i].col, ncol - 1); |
1842 | MIN_IT (rc[i].row, TermWin.nrow - 1); |
1831 | MIN_IT (rc[i].row, nrow - 1); |
1843 | } |
1832 | } |
1844 | |
1833 | |
1845 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1834 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1846 | fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1835 | fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1847 | |
1836 | |
1848 | if (refresh) |
1837 | if (refresh) |
1849 | scr_refresh (SLOW_REFRESH); |
1838 | scr_refresh (SLOW_REFRESH); |
1850 | } |
1839 | } |
1851 | |
1840 | |
… | |
… | |
1854 | * Refresh the entire screen |
1843 | * Refresh the entire screen |
1855 | */ |
1844 | */ |
1856 | void |
1845 | void |
1857 | rxvt_term::scr_touch (bool refresh) |
1846 | rxvt_term::scr_touch (bool refresh) |
1858 | { |
1847 | { |
1859 | scr_expose (0, 0, TermWin.width, TermWin.height, refresh); |
1848 | scr_expose (0, 0, width, height, refresh); |
1860 | } |
1849 | } |
1861 | |
1850 | |
1862 | /* ------------------------------------------------------------------------- */ |
1851 | /* ------------------------------------------------------------------------- */ |
1863 | /* |
1852 | /* |
1864 | * Move the display so that the line represented by scrollbar value Y is at |
1853 | * Move the display so that the line represented by scrollbar value Y is at |
… | |
… | |
1868 | rxvt_term::scr_move_to (int y, int len) |
1857 | rxvt_term::scr_move_to (int y, int len) |
1869 | { |
1858 | { |
1870 | long p = 0; |
1859 | long p = 0; |
1871 | unsigned int oldviewstart; |
1860 | unsigned int oldviewstart; |
1872 | |
1861 | |
1873 | oldviewstart = TermWin.view_start; |
1862 | oldviewstart = view_start; |
1874 | |
1863 | |
1875 | if (y < len) |
1864 | if (y < len) |
1876 | { |
1865 | { |
1877 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1866 | p = (nrow + nsaved) * (len - y) / len; |
1878 | p -= (long) (TermWin.nrow - 1); |
1867 | p -= (long) (nrow - 1); |
1879 | p = max (p, 0); |
1868 | p = max (p, 0); |
1880 | } |
1869 | } |
1881 | |
1870 | |
1882 | TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); |
1871 | view_start = (unsigned int)min (p, nsaved); |
1883 | |
1872 | |
1884 | return scr_changeview (oldviewstart); |
1873 | return scr_changeview (oldviewstart); |
1885 | } |
1874 | } |
1886 | |
1875 | |
1887 | /* ------------------------------------------------------------------------- */ |
1876 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1893 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1882 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1894 | { |
1883 | { |
1895 | int n; |
1884 | int n; |
1896 | unsigned int oldviewstart; |
1885 | unsigned int oldviewstart; |
1897 | |
1886 | |
1898 | #ifdef DEBUG_STRICT |
|
|
1899 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
|
|
1900 | #endif |
|
|
1901 | oldviewstart = TermWin.view_start; |
1887 | oldviewstart = view_start; |
|
|
1888 | |
1902 | if (direction == UP) |
1889 | if (direction == UP) |
1903 | { |
1890 | { |
1904 | n = TermWin.view_start + nlines; |
1891 | n = view_start + nlines; |
1905 | TermWin.view_start = min (n, TermWin.nscrolled); |
1892 | view_start = min (n, nsaved); |
1906 | } |
1893 | } |
1907 | else |
1894 | else |
1908 | { |
1895 | { |
1909 | n = TermWin.view_start - nlines; |
1896 | n = view_start - nlines; |
1910 | TermWin.view_start = max (n, 0); |
1897 | view_start = max (n, 0); |
1911 | } |
1898 | } |
|
|
1899 | |
1912 | return scr_changeview (oldviewstart); |
1900 | return scr_changeview (oldviewstart); |
1913 | } |
1901 | } |
1914 | |
1902 | |
1915 | int |
1903 | int |
1916 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1904 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1917 | { |
1905 | { |
1918 | if (TermWin.view_start != oldviewstart) |
1906 | if (view_start != oldviewstart) |
1919 | { |
1907 | { |
1920 | want_refresh = 1; |
1908 | want_refresh = 1; |
1921 | num_scr -= (TermWin.view_start - oldviewstart); |
1909 | num_scr -= (view_start - oldviewstart); |
1922 | } |
1910 | } |
1923 | |
1911 | |
1924 | return (int) (TermWin.view_start - oldviewstart); |
1912 | return (int) (view_start - oldviewstart); |
1925 | } |
1913 | } |
1926 | |
1914 | |
1927 | /* ------------------------------------------------------------------------- */ |
1915 | /* ------------------------------------------------------------------------- */ |
1928 | void |
1916 | void |
1929 | rxvt_term::scr_bell () |
1917 | rxvt_term::scr_bell () |
1930 | { |
1918 | { |
1931 | #ifndef NO_BELL |
1919 | #ifndef NO_BELL |
|
|
1920 | |
1932 | # ifndef NO_MAPALERT |
1921 | # ifndef NO_MAPALERT |
1933 | # ifdef MAPALERT_OPTION |
1922 | # ifdef MAPALERT_OPTION |
1934 | if (options & Opt_mapAlert) |
1923 | if (options & Opt_mapAlert) |
1935 | # endif |
1924 | # endif |
1936 | XMapWindow (display->display, TermWin.parent[0]); |
1925 | XMapWindow (display->display, parent[0]); |
1937 | # endif |
1926 | # endif |
|
|
1927 | |
1938 | if (options & Opt_visualBell) |
1928 | if (options & Opt_visualBell) |
1939 | { |
1929 | { |
1940 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1930 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
|
|
1931 | rxvt_usleep (VISUAL_BELL_DURATION); |
1941 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1932 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1942 | } |
1933 | } |
1943 | else |
1934 | else |
1944 | XBell (display->display, 0); |
1935 | XBell (display->display, 0); |
|
|
1936 | |
1945 | #endif |
1937 | #endif |
1946 | } |
1938 | } |
1947 | |
1939 | |
1948 | /* ------------------------------------------------------------------------- */ |
1940 | /* ------------------------------------------------------------------------- */ |
1949 | /* ARGSUSED */ |
1941 | /* ARGSUSED */ |
… | |
… | |
1955 | FILE *fd; |
1947 | FILE *fd; |
1956 | |
1948 | |
1957 | if ((fd = popen_printer ()) == NULL) |
1949 | if ((fd = popen_printer ()) == NULL) |
1958 | return; |
1950 | return; |
1959 | |
1951 | |
1960 | nrows = TermWin.nrow; |
1952 | nrows = nrow; |
1961 | row_offset = TermWin.saveLines; |
1953 | row_offset = saveLines; |
1962 | |
1954 | |
1963 | if (!fullhist) |
1955 | if (!fullhist) |
1964 | row_offset -= TermWin.view_start; |
1956 | row_offset -= view_start; |
1965 | else |
1957 | else |
1966 | { |
1958 | { |
1967 | nrows += TermWin.nscrolled; |
1959 | nrows += nsaved; |
1968 | row_offset -= TermWin.nscrolled; |
1960 | row_offset -= nsaved; |
1969 | } |
1961 | } |
1970 | |
1962 | |
1971 | wctomb (0, 0); |
1963 | wctomb (0, 0); |
1972 | |
1964 | |
1973 | for (r1 = 0; r1 < nrows; r1++) |
1965 | for (r1 = 0; r1 < nrows; r1++) |
1974 | { |
1966 | { |
1975 | text_t *tp = screen.text[r1 + row_offset]; |
1967 | text_t *tp = save[r1 + row_offset].t; |
1976 | int len = screen.tlen[r1 + row_offset]; |
1968 | int len = save[r1 + row_offset].l; |
1977 | |
1969 | |
1978 | for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) |
1970 | for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1979 | { |
1971 | { |
1980 | char mb[MB_LEN_MAX]; |
1972 | char mb[MB_LEN_MAX]; |
1981 | text_t t = *tp++; |
1973 | text_t t = *tp++; |
1982 | if (t == NOCHAR) |
1974 | if (t == NOCHAR) |
1983 | continue; |
1975 | continue; |
… | |
… | |
2004 | /* |
1996 | /* |
2005 | * Refresh the screen |
1997 | * Refresh the screen |
2006 | * drawn_text/drawn_rend contain the screen information before the update. |
1998 | * drawn_text/drawn_rend contain the screen information before the update. |
2007 | * screen.text/screen.rend contain what the screen will change to. |
1999 | * screen.text/screen.rend contain what the screen will change to. |
2008 | */ |
2000 | */ |
2009 | |
|
|
2010 | #define FONT_WIDTH(X, Y) \ |
|
|
2011 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].width |
|
|
2012 | #define FONT_RBEAR(X, Y) \ |
|
|
2013 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing |
|
|
2014 | #define FONT_LBEAR(X, Y) \ |
|
|
2015 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing |
|
|
2016 | #define IS_FONT_CHAR(X, Y) \ |
|
|
2017 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
|
|
2018 | |
|
|
2019 | void |
2001 | void |
2020 | rxvt_term::scr_refresh (unsigned char refresh_type) |
2002 | rxvt_term::scr_refresh (unsigned char refresh_type) |
2021 | { |
2003 | { |
2022 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
2004 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
2023 | showcursor; /* show the cursor */ |
2005 | showcursor; /* show the cursor */ |
… | |
… | |
2030 | #endif |
2012 | #endif |
2031 | rend_t *crp; // cursor rendition pointer |
2013 | rend_t *crp; // cursor rendition pointer |
2032 | |
2014 | |
2033 | want_refresh = 0; /* screen is current */ |
2015 | want_refresh = 0; /* screen is current */ |
2034 | |
2016 | |
2035 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
2017 | if (refresh_type == NO_REFRESH || !mapped) |
2036 | return; |
2018 | return; |
2037 | |
2019 | |
2038 | /* |
2020 | /* |
2039 | * A: set up vars |
2021 | * A: set up vars |
2040 | */ |
2022 | */ |
2041 | must_clear = 0; |
2023 | must_clear = 0; |
2042 | refresh_count = 0; |
2024 | refresh_count = 0; |
2043 | |
2025 | |
2044 | row_offset = TermWin.saveLines - TermWin.view_start; |
2026 | row_offset = term_start - view_start; |
2045 | |
2027 | |
2046 | #if XPM_BACKGROUND |
2028 | #if XPM_BACKGROUND |
2047 | must_clear |= (bgPixmap.pixmap != None); |
2029 | must_clear |= bgPixmap.pixmap != None; |
2048 | #endif |
2030 | #endif |
2049 | #if TRANSPARENT |
2031 | #if TRANSPARENT |
2050 | must_clear |= ((options & Opt_transparent) && am_transparent); |
2032 | must_clear |= (options & Opt_transparent) && am_transparent; |
2051 | #endif |
2033 | #endif |
2052 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2034 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2053 | |
2035 | |
2054 | /* |
2036 | /* |
2055 | * B: reverse any characters which are selected |
2037 | * B: reverse any characters which are selected |
… | |
… | |
2072 | |
2054 | |
2073 | if (showcursor) |
2055 | if (showcursor) |
2074 | { |
2056 | { |
2075 | int col = screen.cur.col; |
2057 | int col = screen.cur.col; |
2076 | |
2058 | |
2077 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
2059 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2078 | col--; |
2060 | col--; |
2079 | |
2061 | |
2080 | crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; |
2062 | crp = &ROW(screen.cur.row).r[col]; |
2081 | |
2063 | |
2082 | if (showcursor && TermWin.focus) |
2064 | if (showcursor && focus) |
2083 | { |
2065 | { |
|
|
2066 | if (options & Opt_cursorUnderline) |
|
|
2067 | *crp ^= RS_Uline; |
|
|
2068 | else |
|
|
2069 | { |
2084 | *crp ^= RS_RVid; |
2070 | *crp ^= RS_RVid; |
|
|
2071 | |
2085 | #ifndef NO_CURSORCOLOR |
2072 | #ifndef NO_CURSORCOLOR |
2086 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2073 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2087 | if (ISSET_PIXCOLOR (Color_cursor)) |
2074 | if (ISSET_PIXCOLOR (Color_cursor)) |
2088 | ccol1 = Color_cursor; |
2075 | ccol1 = Color_cursor; |
2089 | else |
2076 | else |
2090 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2077 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2091 | ccol1 = GET_FGCOLOR (rstyle); |
2078 | ccol1 = GET_FGCOLOR (rstyle); |
2092 | #else |
2079 | #else |
2093 | ccol1 = Color_fg; |
2080 | ccol1 = Color_fg; |
2094 | #endif |
2081 | #endif |
2095 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2082 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2096 | ccol2 = Color_cursor2; |
2083 | ccol2 = Color_cursor2; |
2097 | else |
2084 | else |
2098 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2085 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2099 | ccol2 = GET_BGCOLOR (rstyle); |
2086 | ccol2 = GET_BGCOLOR (rstyle); |
2100 | #else |
2087 | #else |
2101 | ccol2 = Color_bg; |
2088 | ccol2 = Color_bg; |
2102 | #endif |
2089 | #endif |
2103 | *crp = SET_FGCOLOR (*crp, ccol1); |
2090 | *crp = SET_FGCOLOR (*crp, ccol1); |
2104 | *crp = SET_BGCOLOR (*crp, ccol2); |
2091 | *crp = SET_BGCOLOR (*crp, ccol2); |
2105 | #endif |
2092 | #endif |
|
|
2093 | } |
2106 | } |
2094 | } |
2107 | } |
2095 | } |
2108 | |
2096 | |
2109 | /* make sure no outline cursor is left around */ |
2097 | /* make sure no outline cursor is left around */ |
2110 | setoldcursor = 0; |
2098 | setoldcursor = 0; |
2111 | if (ocrow != -1) |
2099 | if (ocrow != -1) |
2112 | { |
2100 | { |
2113 | if (screen.cur.row + TermWin.view_start != ocrow |
2101 | if (screen.cur.row + view_start != ocrow |
2114 | || screen.cur.col != oldcursor.col) |
2102 | || screen.cur.col != oldcursor.col) |
2115 | { |
2103 | { |
2116 | if (ocrow < TermWin.nrow |
2104 | if (ocrow < nrow |
2117 | && oldcursor.col < TermWin.ncol) |
2105 | && oldcursor.col < ncol) |
2118 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
2106 | drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2119 | |
2107 | |
2120 | if (TermWin.focus || !showcursor) |
2108 | if (focus || !showcursor) |
2121 | oldcursor.row = -1; |
2109 | oldcursor.row = -1; |
2122 | else |
2110 | else |
2123 | setoldcursor = 1; |
2111 | setoldcursor = 1; |
2124 | } |
2112 | } |
2125 | } |
2113 | } |
2126 | else if (!TermWin.focus) |
2114 | else if (!focus) |
2127 | setoldcursor = 1; |
2115 | setoldcursor = 1; |
2128 | |
2116 | |
2129 | if (setoldcursor) |
2117 | if (setoldcursor) |
2130 | { |
2118 | { |
2131 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
2119 | if (screen.cur.row + view_start >= nrow) |
2132 | oldcursor.row = -1; |
2120 | oldcursor.row = -1; |
2133 | else |
2121 | else |
2134 | { |
2122 | { |
2135 | oldcursor.row = screen.cur.row + TermWin.view_start; |
2123 | oldcursor.row = screen.cur.row + view_start; |
2136 | oldcursor.col = screen.cur.col; |
2124 | oldcursor.col = screen.cur.col; |
2137 | } |
2125 | } |
2138 | } |
2126 | } |
2139 | } |
2127 | } |
2140 | |
2128 | |
2141 | #if ENABLE_OVERLAY |
2129 | #if ENABLE_OVERLAY |
2142 | scr_swap_overlay (); |
2130 | scr_swap_overlay (); |
2143 | #endif |
2131 | #endif |
2144 | |
|
|
2145 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
|
|
2146 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
|
|
2147 | |
2132 | |
2148 | #ifndef NO_SLOW_LINK_SUPPORT |
2133 | #ifndef NO_SLOW_LINK_SUPPORT |
2149 | /* |
2134 | /* |
2150 | * D: CopyArea pass - very useful for slower links |
2135 | * D: CopyArea pass - very useful for slower links |
2151 | * This has been deliberately kept simple. |
2136 | * This has been deliberately kept simple. |
2152 | */ |
2137 | */ |
2153 | i = num_scr; |
2138 | i = num_scr; |
2154 | if (!display->is_local |
2139 | if (!display->is_local |
2155 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2140 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2156 | && abs (i) < TermWin.nrow && !must_clear) |
2141 | && abs (i) < nrow && !must_clear) |
2157 | { |
2142 | { |
2158 | int16_t nits; |
2143 | int16_t nits; |
2159 | int j; |
2144 | int j; |
2160 | int len, wlen; |
2145 | int len, wlen; |
2161 | |
2146 | |
2162 | j = TermWin.nrow; |
2147 | j = nrow; |
2163 | wlen = len = -1; |
2148 | wlen = len = -1; |
2164 | row = i > 0 ? 0 : j - 1; |
2149 | row = i > 0 ? 0 : j - 1; |
2165 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2150 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2166 | { |
2151 | { |
2167 | if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) |
2152 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2168 | { |
2153 | { |
2169 | text_t *stp = screen.text[row + row_offset]; |
2154 | line_t s = save[(row + row_offset) % nlines]; |
2170 | rend_t *srp = screen.rend[row + row_offset]; |
|
|
2171 | text_t *dtp = drawn_text[row]; |
2155 | line_t d = drawn[row]; |
2172 | text_t *dtp2 = drawn_text[row + i]; |
2156 | line_t d2 = drawn[row + i]; |
2173 | rend_t *drp = drawn_rend[row]; |
|
|
2174 | rend_t *drp2 = drawn_rend[row + i]; |
|
|
2175 | |
2157 | |
2176 | for (nits = 0, col = TermWin.ncol; col--; ) |
2158 | for (nits = 0, col = ncol; col--; ) |
2177 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2159 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2178 | nits--; |
2160 | nits--; |
2179 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
2161 | else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) |
2180 | nits++; |
2162 | nits++; |
2181 | |
2163 | |
2182 | if (nits > 8) /* XXX: arbitrary choice */ |
2164 | if (nits > 8) /* XXX: arbitrary choice */ |
2183 | { |
2165 | { |
2184 | for (col = TermWin.ncol; col--; ) |
2166 | for (col = ncol; col--; ) |
2185 | { |
2167 | { |
2186 | *dtp++ = *dtp2++; |
2168 | *d.t++ = *d2.t++; |
2187 | *drp++ = *drp2++; |
2169 | *d.r++ = *d2.r++; |
2188 | } |
2170 | } |
2189 | |
2171 | |
2190 | if (len == -1) |
2172 | if (len == -1) |
2191 | len = row; |
2173 | len = row; |
2192 | |
2174 | |
… | |
… | |
2199 | { |
2181 | { |
2200 | /* also comes here at end if needed because of >= above */ |
2182 | /* also comes here at end if needed because of >= above */ |
2201 | if (wlen < len) |
2183 | if (wlen < len) |
2202 | SWAP_IT (wlen, len, int); |
2184 | SWAP_IT (wlen, len, int); |
2203 | |
2185 | |
2204 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2186 | XCopyArea (display->display, vt, vt, |
2205 | TermWin.gc, 0, Row2Pixel (len + i), |
2187 | gc, 0, Row2Pixel (len + i), |
2206 | (unsigned int)TermWin_TotalWidth (), |
2188 | (unsigned int)TermWin_TotalWidth (), |
2207 | (unsigned int)Height2Pixel (wlen - len + 1), |
2189 | (unsigned int)Height2Pixel (wlen - len + 1), |
2208 | 0, Row2Pixel (len)); |
2190 | 0, Row2Pixel (len)); |
2209 | len = -1; |
2191 | len = -1; |
2210 | } |
2192 | } |
… | |
… | |
2213 | #endif |
2195 | #endif |
2214 | |
2196 | |
2215 | /* |
2197 | /* |
2216 | * E: main pass across every character |
2198 | * E: main pass across every character |
2217 | */ |
2199 | */ |
2218 | for (row = 0; row < TermWin.nrow; row++) |
2200 | for (row = 0; row < nrow; row++) |
2219 | { |
2201 | { |
2220 | text_t *stp = screen.text[row + row_offset]; |
2202 | text_t *stp = save[(row + row_offset) % total_rows].t; |
2221 | rend_t *srp = screen.rend[row + row_offset]; |
2203 | rend_t *srp = save[(row + row_offset) % total_rows].r; |
2222 | text_t *dtp = drawn_text[row]; |
2204 | text_t *dtp = drawn[row].t; |
2223 | rend_t *drp = drawn_rend[row]; |
2205 | rend_t *drp = drawn[row].r; |
2224 | |
2206 | |
2225 | /* |
2207 | /* |
2226 | * E2: OK, now the real pass |
2208 | * E2: OK, now the real pass |
2227 | */ |
2209 | */ |
2228 | int ypixel = (int)Row2Pixel (row); |
2210 | int ypixel = (int)Row2Pixel (row); |
2229 | |
2211 | |
2230 | for (col = 0; col < TermWin.ncol; col++) |
2212 | for (col = 0; col < ncol; col++) |
2231 | { |
2213 | { |
2232 | /* compare new text with old - if exactly the same then continue */ |
2214 | /* compare new text with old - if exactly the same then continue */ |
2233 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2215 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2234 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
2216 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
2235 | || (stp[col] == ' ' /* space w/ no background change */ |
2217 | || (stp[col] == ' ' /* space w/ no background change */ |
… | |
… | |
2249 | dtp[col] = stp[col]; |
2231 | dtp[col] = stp[col]; |
2250 | drp[col] = rend; |
2232 | drp[col] = rend; |
2251 | |
2233 | |
2252 | int xpixel = Col2Pixel (col); |
2234 | int xpixel = Col2Pixel (col); |
2253 | |
2235 | |
2254 | for (i = 0; ++col < TermWin.ncol; ) |
2236 | for (i = 0; ++col < ncol; ) |
2255 | { |
2237 | { |
2256 | if (stp[col] == NOCHAR) |
2238 | if (stp[col] == NOCHAR) |
2257 | { |
2239 | { |
2258 | dtp[col] = stp[col]; |
2240 | dtp[col] = stp[col]; |
2259 | drp[col] = rend; |
2241 | drp[col] = rend; |
… | |
… | |
2287 | |
2269 | |
2288 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2270 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2289 | while (i && text[count] == NOCHAR) |
2271 | while (i && text[count] == NOCHAR) |
2290 | count++, i--; |
2272 | count++, i--; |
2291 | |
2273 | |
2292 | #if ENABLE_STYLES |
|
|
2293 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2294 | if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) |
|
|
2295 | drp[col + 1] = ~srp[col + 1]; |
|
|
2296 | |
|
|
2297 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2298 | while (text > stp |
|
|
2299 | && srp[text - stp - 1] & RS_Careful |
|
|
2300 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2301 | text--, count++, xpixel -= TermWin.fwidth; |
|
|
2302 | #endif |
|
|
2303 | |
|
|
2304 | /* |
2274 | /* |
2305 | * Determine the attributes for the string |
2275 | * Determine the attributes for the string |
2306 | */ |
2276 | */ |
2307 | int fore = GET_FGCOLOR (rend); // desired foreground |
2277 | int fore = GET_FGCOLOR (rend); // desired foreground |
2308 | int back = GET_BGCOLOR (rend); // desired background |
2278 | int back = GET_BGCOLOR (rend); // desired background |
2309 | |
2279 | |
2310 | // only do special processing if ana attributes are set, which is rare |
2280 | // only do special processing if any attributes are set, which is rare |
2311 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) |
2281 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2312 | { |
2282 | { |
|
|
2283 | #if ENABLE_STYLES |
|
|
2284 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2285 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2286 | drp[col + 1] = ~srp[col + 1]; |
|
|
2287 | |
|
|
2288 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2289 | while (text > stp |
|
|
2290 | && srp[text - stp - 1] & RS_Careful |
|
|
2291 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2292 | text--, count++, xpixel -= fwidth; |
|
|
2293 | #endif |
|
|
2294 | |
2313 | bool invert = rend & RS_RVid; |
2295 | bool invert = rend & RS_RVid; |
2314 | |
2296 | |
2315 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2297 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2316 | if (rend & RS_Bold |
2298 | if (rend & RS_Bold |
2317 | && fore == Color_fg) |
2299 | && fore == Color_fg) |
… | |
… | |
2344 | SWAP_IT (fore, back, int); |
2326 | SWAP_IT (fore, back, int); |
2345 | |
2327 | |
2346 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2328 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2347 | if (ISSET_PIXCOLOR (Color_RV)) |
2329 | if (ISSET_PIXCOLOR (Color_RV)) |
2348 | back = Color_RV; |
2330 | back = Color_RV; |
|
|
2331 | |
|
|
2332 | if (fore == back) |
|
|
2333 | { |
|
|
2334 | fore = Color_bg; |
|
|
2335 | back = Color_fg; |
|
|
2336 | } |
2349 | #endif |
2337 | #endif |
2350 | } |
2338 | } |
2351 | |
2339 | |
2352 | #ifdef TEXT_BLINK |
2340 | #ifdef TEXT_BLINK |
2353 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2341 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
… | |
… | |
2364 | } |
2352 | } |
2365 | |
2353 | |
2366 | /* |
2354 | /* |
2367 | * Actually do the drawing of the string here |
2355 | * Actually do the drawing of the string here |
2368 | */ |
2356 | */ |
2369 | rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2357 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2370 | |
2358 | |
2371 | if (back == fore) |
2359 | if (back == fore) |
2372 | font->clear_rect (*TermWin.drawable, xpixel, ypixel, |
2360 | font->clear_rect (*drawable, xpixel, ypixel, |
2373 | TermWin.fwidth * count, TermWin.fheight, |
2361 | fwidth * count, fheight, |
2374 | back); |
2362 | back); |
2375 | else if (back == Color_bg) |
2363 | else if (back == Color_bg) |
2376 | { |
2364 | { |
2377 | if (must_clear) |
2365 | if (must_clear) |
2378 | { |
2366 | { |
2379 | CLEAR_CHARS (xpixel, ypixel, count); |
2367 | CLEAR_CHARS (xpixel, ypixel, count); |
2380 | |
2368 | |
2381 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2369 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2382 | if (text[i] != ' ') |
2370 | if (text[i] != ' ') |
2383 | { |
2371 | { |
2384 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); |
2372 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2385 | break; |
2373 | break; |
2386 | } |
2374 | } |
2387 | } |
2375 | } |
2388 | else |
2376 | else |
2389 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2377 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2390 | } |
2378 | } |
2391 | else |
2379 | else |
2392 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2380 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2393 | |
2381 | |
2394 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2382 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2395 | { |
2383 | { |
2396 | #if ENABLE_FRILLS |
2384 | #if ENABLE_FRILLS |
2397 | if (ISSET_PIXCOLOR (Color_underline)) |
2385 | if (ISSET_PIXCOLOR (Color_underline)) |
2398 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); |
2386 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2399 | else |
2387 | else |
2400 | #endif |
2388 | #endif |
2401 | XSetForeground (display->display, TermWin.gc, pix_colors[fore]); |
2389 | XSetForeground (display->display, gc, pix_colors[fore]); |
2402 | |
2390 | |
2403 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2391 | XDrawLine (display->display, drawBuffer, gc, |
2404 | xpixel, ypixel + font->ascent + 1, |
2392 | xpixel, ypixel + font->ascent + 1, |
2405 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2393 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2406 | } |
2394 | } |
2407 | } /* for (col....) */ |
2395 | } /* for (col....) */ |
2408 | } /* for (row....) */ |
2396 | } /* for (row....) */ |
… | |
… | |
2414 | /* |
2402 | /* |
2415 | * G: cleanup cursor and display outline cursor if necessary |
2403 | * G: cleanup cursor and display outline cursor if necessary |
2416 | */ |
2404 | */ |
2417 | if (showcursor) |
2405 | if (showcursor) |
2418 | { |
2406 | { |
2419 | if (TermWin.focus) |
2407 | if (focus) |
|
|
2408 | { |
|
|
2409 | if (options & Opt_cursorUnderline) |
|
|
2410 | *crp ^= RS_Uline; |
|
|
2411 | else |
2420 | { |
2412 | { |
2421 | *crp ^= RS_RVid; |
2413 | *crp ^= RS_RVid; |
2422 | #ifndef NO_CURSORCOLOR |
2414 | #ifndef NO_CURSORCOLOR |
2423 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2415 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2424 | #endif |
2416 | #endif |
|
|
2417 | } |
2425 | } |
2418 | } |
2426 | else if (oldcursor.row >= 0) |
2419 | else if (oldcursor.row >= 0) |
2427 | { |
2420 | { |
|
|
2421 | int cursorwidth = 1; |
|
|
2422 | int col = oldcursor.col; |
|
|
2423 | |
|
|
2424 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
|
|
2425 | col--; |
|
|
2426 | |
|
|
2427 | while (col + cursorwidth < ncol |
|
|
2428 | && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
|
|
2429 | cursorwidth++; |
|
|
2430 | |
2428 | #ifndef NO_CURSORCOLOR |
2431 | #ifndef NO_CURSORCOLOR |
2429 | if (ISSET_PIXCOLOR (Color_cursor)) |
2432 | if (ISSET_PIXCOLOR (Color_cursor)) |
2430 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); |
2433 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2431 | #endif |
2434 | #endif |
2432 | int cursorwidth = 1; |
|
|
2433 | while (oldcursor.col + cursorwidth < TermWin.ncol |
|
|
2434 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
|
|
2435 | cursorwidth++; |
|
|
2436 | |
2435 | |
2437 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2436 | XDrawRectangle (display->display, drawBuffer, gc, |
2438 | Col2Pixel (oldcursor.col), |
2437 | Col2Pixel (col), |
2439 | Row2Pixel (oldcursor.row), |
2438 | Row2Pixel (oldcursor.row), |
2440 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2439 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2441 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2440 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2442 | } |
2441 | } |
2443 | } |
2442 | } |
2444 | |
2443 | |
2445 | /* |
2444 | /* |
2446 | * H: cleanup selection |
2445 | * H: cleanup selection |
… | |
… | |
2453 | num_scr = 0; |
2452 | num_scr = 0; |
2454 | num_scr_allow = 1; |
2453 | num_scr_allow = 1; |
2455 | } |
2454 | } |
2456 | |
2455 | |
2457 | void |
2456 | void |
2458 | rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) |
2457 | rxvt_term::scr_remap_chars (const line_t &l) |
2459 | { |
2458 | { |
2460 | if (!rp || !tp) |
2459 | if (!l.t) |
2461 | return; |
2460 | return; |
2462 | |
2461 | |
2463 | for (int i = TermWin.ncol; i; i--, rp++, tp++) |
2462 | for (int i = ncol; i--; ) |
2464 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
2463 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2465 | } |
2464 | } |
2466 | |
2465 | |
2467 | void |
2466 | void |
2468 | rxvt_term::scr_remap_chars () |
2467 | rxvt_term::scr_remap_chars () |
2469 | { |
2468 | { |
2470 | for (int i = TermWin.nrow + TermWin.saveLines; i--; ) |
2469 | for (int i = total_rows; i--; ) |
2471 | scr_remap_chars (screen.text[i], screen.rend[i]); |
2470 | scr_remap_chars (save[i]); |
2472 | |
2471 | |
2473 | for (int i = TermWin.nrow; i--; ) |
2472 | for (int i = nrow; i--; ) |
2474 | { |
2473 | { |
2475 | scr_remap_chars (drawn_text[i], drawn_rend[i]); |
2474 | scr_remap_chars (drawn[i]); |
2476 | scr_remap_chars (swap.text[i], swap.rend[i]); |
2475 | scr_remap_chars (swap_save[i]); |
2477 | } |
2476 | } |
2478 | } |
2477 | } |
2479 | |
2478 | |
2480 | void |
2479 | void |
2481 | rxvt_term::scr_recolour () |
2480 | rxvt_term::scr_recolour () |
… | |
… | |
2487 | #if XPM_BACKGROUND |
2486 | #if XPM_BACKGROUND |
2488 | && !bgPixmap.pixmap |
2487 | && !bgPixmap.pixmap |
2489 | #endif |
2488 | #endif |
2490 | ) |
2489 | ) |
2491 | { |
2490 | { |
2492 | XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); |
2491 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2493 | XClearWindow (display->display, TermWin.parent[0]); |
2492 | XClearWindow (display->display, parent[0]); |
2494 | XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); |
2493 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2495 | #if HAVE_SCROLLBARS |
2494 | #if HAVE_SCROLLBARS |
2496 | if (scrollBar.win) |
2495 | if (scrollBar.win) |
2497 | { |
2496 | { |
2498 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2497 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2499 | scrollBar.setIdle (); |
2498 | scrollBar.setIdle (); |
… | |
… | |
2509 | |
2508 | |
2510 | /* ------------------------------------------------------------------------- */ |
2509 | /* ------------------------------------------------------------------------- */ |
2511 | void |
2510 | void |
2512 | rxvt_term::scr_clear (bool really) |
2511 | rxvt_term::scr_clear (bool really) |
2513 | { |
2512 | { |
2514 | if (!TermWin.mapped) |
2513 | if (!mapped) |
2515 | return; |
2514 | return; |
2516 | |
2515 | |
2517 | num_scr_allow = 0; |
2516 | num_scr_allow = 0; |
2518 | want_refresh = 1; |
2517 | want_refresh = 1; |
2519 | |
2518 | |
2520 | #if TRANSPARENT |
|
|
2521 | if ((options & Opt_transparent) && (am_pixmap_trans == 0)) |
|
|
2522 | { |
|
|
2523 | int i; |
|
|
2524 | |
|
|
2525 | if (!(options & Opt_transparent_all)) |
|
|
2526 | i = 0; |
|
|
2527 | else |
|
|
2528 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
|
|
2529 | |
|
|
2530 | while (i--) |
|
|
2531 | if (TermWin.parent[i] != None) |
|
|
2532 | XClearWindow (display->display, TermWin.parent[i]); |
|
|
2533 | } |
|
|
2534 | #endif |
|
|
2535 | |
|
|
2536 | if (really) |
2519 | if (really) |
2537 | XClearWindow (display->display, TermWin.vt); |
2520 | XClearWindow (display->display, vt); |
2538 | } |
2521 | } |
2539 | |
2522 | |
2540 | /* ------------------------------------------------------------------------- */ |
2523 | /* ------------------------------------------------------------------------- */ |
2541 | void |
2524 | void |
2542 | rxvt_term::scr_reverse_selection () |
2525 | rxvt_term::scr_reverse_selection () |
2543 | { |
2526 | { |
|
|
2527 | if (selection.op |
2544 | if (selection.op && current_screen == selection.screen) |
2528 | && current_screen == selection.screen |
|
|
2529 | && selection.end.row >= -view_start) |
2545 | { |
2530 | { |
2546 | int end_row = TermWin.saveLines - TermWin.view_start; |
2531 | int view_end = -view_start + nrow; |
2547 | int i = selection.beg.row + TermWin.saveLines; |
2532 | int row, col; |
2548 | int col, row = selection.end.row + TermWin.saveLines; |
|
|
2549 | rend_t *srp; |
|
|
2550 | |
2533 | |
2551 | #if ENABLE_FRILLS |
2534 | #if ENABLE_FRILLS |
2552 | if (selection.rect) |
2535 | if (selection.rect) |
2553 | { |
2536 | { |
2554 | end_row += TermWin.nrow; |
2537 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
2555 | |
|
|
2556 | for (; i <= row && i <= end_row; i++) |
|
|
2557 | for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) |
2538 | for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) |
2558 | srp[col] ^= RS_RVid; |
2539 | srp[col] ^= RS_RVid; |
2559 | } |
2540 | } |
2560 | else |
2541 | else |
2561 | #endif |
2542 | #endif |
2562 | { |
2543 | { |
2563 | if (i >= end_row) |
2544 | if (selection.beg.row >= -view_start) |
|
|
2545 | { |
2564 | col = selection.beg.col; |
2546 | col = selection.beg.col; |
|
|
2547 | row = selection.beg.row; |
|
|
2548 | } |
2565 | else |
2549 | else |
2566 | { |
2550 | { |
2567 | col = 0; |
2551 | col = 0; |
2568 | i = end_row; |
2552 | row = view_start; |
2569 | } |
2553 | } |
2570 | |
2554 | |
2571 | end_row += TermWin.nrow; |
2555 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2572 | |
2556 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2573 | for (; i < row && i < end_row; i++, col = 0) |
|
|
2574 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
|
|
2575 | srp[col] ^= RS_RVid; |
2557 | srp[col] ^= RS_RVid; |
2576 | |
2558 | |
2577 | if (i == row && i < end_row) |
2559 | if (row == selection.end.row) |
2578 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2560 | for (rend_t *srp = ROW(row).r; col < selection.end.col; col++) |
2579 | srp[col] ^= RS_RVid; |
2561 | srp[col] ^= RS_RVid; |
2580 | } |
2562 | } |
2581 | } |
2563 | } |
2582 | } |
2564 | } |
2583 | |
2565 | |
… | |
… | |
2592 | { |
2574 | { |
2593 | int row, wrote; |
2575 | int row, wrote; |
2594 | unsigned int width, towrite; |
2576 | unsigned int width, towrite; |
2595 | char r1[] = "\n"; |
2577 | char r1[] = "\n"; |
2596 | |
2578 | |
2597 | for (row = TermWin.saveLines - TermWin.nscrolled; |
2579 | for (row = saveLines - nsaved; |
2598 | row < TermWin.saveLines + TermWin.nrow - 1; row++) |
2580 | row < saveLines + nrow - 1; row++) |
2599 | { |
2581 | { |
2600 | width = screen.tlen[row] >= 0 ? screen.tlen[row] |
2582 | width = save[row].l >= 0 ? save[row].l |
2601 | : TermWin.ncol; |
2583 | : ncol; |
2602 | for (towrite = width; towrite; towrite -= wrote) |
2584 | for (towrite = width; towrite; towrite -= wrote) |
2603 | { |
2585 | { |
2604 | wrote = write (fd, & (screen.text[row][width - towrite]), |
2586 | wrote = write (fd, & (save[row].t[width - towrite]), |
2605 | towrite); |
2587 | towrite); |
2606 | if (wrote < 0) |
2588 | if (wrote < 0) |
2607 | return; /* XXX: death, no report */ |
2589 | return; /* XXX: death, no report */ |
2608 | } |
2590 | } |
2609 | if (screen.tlen[row] >= 0) |
2591 | if (save[row].l >= 0) |
2610 | if (write (fd, r1, 1) <= 0) |
2592 | if (write (fd, r1, 1) <= 0) |
2611 | return; /* XXX: death, no report */ |
2593 | return; /* XXX: death, no report */ |
2612 | } |
2594 | } |
2613 | } |
2595 | } |
2614 | #endif |
2596 | #endif |
2615 | |
2597 | |
2616 | /* ------------------------------------------------------------------------- * |
2598 | /* ------------------------------------------------------------------------- * |
2617 | * CHARACTER SELECTION * |
2599 | * CHARACTER SELECTION * |
2618 | * ------------------------------------------------------------------------- */ |
2600 | * ------------------------------------------------------------------------- */ |
2619 | |
|
|
2620 | /* |
|
|
2621 | * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 |
|
|
2622 | */ |
|
|
2623 | void |
2601 | void |
2624 | rxvt_term::selection_check (int check_more) |
2602 | rxvt_term::selection_check (int check_more) |
2625 | { |
2603 | { |
2626 | row_col_t pos; |
2604 | row_col_t pos; |
2627 | |
2605 | |
2628 | if (!selection.op) |
2606 | if (!selection.op) |
2629 | return; |
2607 | return; |
2630 | |
2608 | |
2631 | pos.row = pos.col = 0; |
2609 | pos.row = pos.col = 0; |
2632 | if ((selection.beg.row < - (int32_t)TermWin.nscrolled) |
2610 | if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) |
2633 | || (selection.beg.row >= TermWin.nrow) |
2611 | || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) |
2634 | || (selection.mark.row < - (int32_t)TermWin.nscrolled) |
2612 | || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) |
2635 | || (selection.mark.row >= TermWin.nrow) |
|
|
2636 | || (selection.end.row < - (int32_t)TermWin.nscrolled) |
|
|
2637 | || (selection.end.row >= TermWin.nrow) |
|
|
2638 | || (check_more == 1 |
2613 | || (check_more == 1 |
2639 | && current_screen == selection.screen |
2614 | && current_screen == selection.screen |
2640 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2615 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2641 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2616 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2642 | || (check_more == 2 |
2617 | || (check_more == 2 |
… | |
… | |
2644 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2619 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2645 | || (check_more == 3 |
2620 | || (check_more == 3 |
2646 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2621 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2647 | || (check_more == 4 /* screen width change */ |
2622 | || (check_more == 4 /* screen width change */ |
2648 | && (selection.beg.row != selection.end.row |
2623 | && (selection.beg.row != selection.end.row |
2649 | || selection.end.col > TermWin.ncol))) |
2624 | || selection.end.col > ncol))) |
2650 | CLEAR_SELECTION (); |
2625 | CLEAR_SELECTION (); |
2651 | } |
2626 | } |
2652 | |
2627 | |
2653 | /* ------------------------------------------------------------------------- */ |
2628 | /* ------------------------------------------------------------------------- */ |
2654 | /* |
2629 | /* |
… | |
… | |
2863 | * EXT: button 2 release |
2838 | * EXT: button 2 release |
2864 | */ |
2839 | */ |
2865 | void |
2840 | void |
2866 | rxvt_term::selection_request (Time tm, int x, int y) |
2841 | rxvt_term::selection_request (Time tm, int x, int y) |
2867 | { |
2842 | { |
2868 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2843 | if (x < 0 || x >= width || y < 0 || y >= height) |
2869 | return; /* outside window */ |
2844 | return; /* outside window */ |
2870 | |
2845 | |
2871 | if (selection.text) |
2846 | if (selection.text) |
2872 | { /* internal selection */ |
2847 | { /* internal selection */ |
2873 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2848 | char *str = rxvt_wcstombs (selection.text, selection.len); |
… | |
… | |
2902 | |
2877 | |
2903 | int |
2878 | int |
2904 | rxvt_term::selection_request_other (Atom target, int selnum) |
2879 | rxvt_term::selection_request_other (Atom target, int selnum) |
2905 | { |
2880 | { |
2906 | Atom sel; |
2881 | Atom sel; |
2907 | #ifdef DEBUG_SELECT |
|
|
2908 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
|
|
2909 | #endif |
|
|
2910 | |
2882 | |
2911 | selection_type |= selnum; |
2883 | selection_type |= selnum; |
2912 | |
2884 | |
2913 | if (selnum == Sel_Primary) |
2885 | if (selnum == Sel_Primary) |
2914 | sel = XA_PRIMARY; |
2886 | sel = XA_PRIMARY; |
… | |
… | |
2918 | sel = xa[XA_CLIPBOARD]; |
2890 | sel = xa[XA_CLIPBOARD]; |
2919 | |
2891 | |
2920 | if (XGetSelectionOwner (display->display, sel) != None) |
2892 | if (XGetSelectionOwner (display->display, sel) != None) |
2921 | { |
2893 | { |
2922 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2894 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2923 | TermWin.vt, selection_request_time); |
2895 | vt, selection_request_time); |
2924 | return 1; |
2896 | return 1; |
2925 | } |
2897 | } |
2926 | |
2898 | |
2927 | return 0; |
2899 | return 0; |
2928 | } |
2900 | } |
… | |
… | |
2951 | * EXT: button 1 or 3 release |
2923 | * EXT: button 1 or 3 release |
2952 | */ |
2924 | */ |
2953 | void |
2925 | void |
2954 | rxvt_term::selection_make (Time tm) |
2926 | rxvt_term::selection_make (Time tm) |
2955 | { |
2927 | { |
2956 | int i, col, end_col, row, end_row; |
2928 | int i; |
2957 | wchar_t *new_selection_text; |
2929 | wchar_t *new_selection_text; |
2958 | text_t *t; |
2930 | text_t *t; |
2959 | |
2931 | |
2960 | switch (selection.op) |
2932 | switch (selection.op) |
2961 | { |
2933 | { |
… | |
… | |
2974 | selection.op = SELECTION_DONE; |
2946 | selection.op = SELECTION_DONE; |
2975 | |
2947 | |
2976 | if (selection.clicks == 4) |
2948 | if (selection.clicks == 4) |
2977 | return; /* nothing selected, go away */ |
2949 | return; /* nothing selected, go away */ |
2978 | |
2950 | |
2979 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2951 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2980 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2952 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2981 | |
2953 | |
2982 | col = selection.beg.col; |
|
|
2983 | row = selection.beg.row + TermWin.saveLines; |
|
|
2984 | end_row = selection.end.row + TermWin.saveLines; |
|
|
2985 | int ofs = 0; |
2954 | int ofs = 0; |
2986 | int extra = 0; |
2955 | int extra = 0; |
2987 | |
2956 | |
|
|
2957 | int col = selection.beg.col; |
|
|
2958 | int row = selection.beg.row; |
|
|
2959 | |
|
|
2960 | int end_col; |
|
|
2961 | |
2988 | for (; row <= end_row; row++, col = 0) |
2962 | for (; row <= selection.end.row; row++, col = 0) |
2989 | { |
2963 | { |
2990 | end_col = screen.tlen[row]; |
|
|
2991 | |
|
|
2992 | #if ENABLE_FRILLS |
2964 | #if ENABLE_FRILLS |
2993 | if (selection.rect) |
2965 | if (selection.rect) |
2994 | { |
2966 | { |
2995 | col = selection.beg.col; |
2967 | col = selection.beg.col; |
2996 | end_col = TermWin.ncol + 1; |
2968 | end_col = ncol + 1; |
2997 | } |
2969 | } |
|
|
2970 | else |
2998 | #endif |
2971 | #endif |
|
|
2972 | end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN |
2999 | |
2973 | |
3000 | MAX_IT (col, 0); |
2974 | col = max (col, 0); |
3001 | |
2975 | |
3002 | if (end_col == -1) |
|
|
3003 | end_col = TermWin.ncol; |
|
|
3004 | |
|
|
3005 | if (row == end_row || selection.rect) |
2976 | if (row == selection.end.row || selection.rect) |
3006 | MIN_IT (end_col, selection.end.col); |
2977 | end_col = min (end_col, selection.end.col); |
3007 | |
2978 | |
3008 | t = &screen.text[row][col]; |
2979 | t = ROW(row).t + col; |
3009 | for (; col < end_col; col++) |
2980 | for (; col < end_col; col++) |
3010 | { |
2981 | { |
3011 | if (*t == NOCHAR) |
2982 | if (*t == NOCHAR) |
3012 | t++; |
2983 | t++; |
3013 | #if ENABLE_COMBINING |
2984 | #if ENABLE_COMBINING |
… | |
… | |
3029 | #endif |
3000 | #endif |
3030 | else |
3001 | else |
3031 | new_selection_text[ofs++] = *t++; |
3002 | new_selection_text[ofs++] = *t++; |
3032 | } |
3003 | } |
3033 | |
3004 | |
3034 | if (screen.tlen[row] != -1 && row != end_row) |
3005 | if (!ROW(row).is_longer () && row != selection.end.row) |
3035 | new_selection_text[ofs++] = C0_LF; |
3006 | new_selection_text[ofs++] = C0_LF; |
3036 | } |
3007 | } |
3037 | |
3008 | |
3038 | if (end_col != selection.end.col) |
3009 | if (end_col != selection.end.col) |
3039 | new_selection_text[ofs++] = C0_LF; |
3010 | new_selection_text[ofs++] = C0_LF; |
… | |
… | |
3050 | |
3021 | |
3051 | // we usually allocate much more than necessary, so realloc it smaller again |
3022 | // we usually allocate much more than necessary, so realloc it smaller again |
3052 | selection.len = ofs; |
3023 | selection.len = ofs; |
3053 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
3024 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
3054 | |
3025 | |
3055 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
3026 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3056 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
3027 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3057 | display->set_selection_owner (this); |
3028 | display->set_selection_owner (this); |
3058 | else |
3029 | else |
3059 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
3030 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
3060 | |
3031 | |
3061 | #if 0 |
3032 | #if 0 |
… | |
… | |
3084 | |
3055 | |
3085 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3056 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3086 | |
3057 | |
3087 | if (clicks == 2 || clicks == 3) |
3058 | if (clicks == 2 || clicks == 3) |
3088 | selection_extend_colrow (selection.mark.col, |
3059 | selection_extend_colrow (selection.mark.col, |
3089 | selection.mark.row + TermWin.view_start, |
3060 | selection.mark.row + view_start, |
3090 | 0, /* button 3 */ |
3061 | 0, /* button 3 */ |
3091 | 1, /* button press */ |
3062 | 1, /* button press */ |
3092 | 0); /* click change */ |
3063 | 0); /* click change */ |
3093 | } |
3064 | } |
3094 | |
3065 | |
… | |
… | |
3098 | */ |
3069 | */ |
3099 | void |
3070 | void |
3100 | rxvt_term::selection_start_colrow (int col, int row) |
3071 | rxvt_term::selection_start_colrow (int col, int row) |
3101 | { |
3072 | { |
3102 | want_refresh = 1; |
3073 | want_refresh = 1; |
|
|
3074 | |
|
|
3075 | selection.mark.row = row - view_start; |
3103 | selection.mark.col = col; |
3076 | selection.mark.col = col; |
3104 | selection.mark.row = row - TermWin.view_start; |
|
|
3105 | |
3077 | |
3106 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
3078 | selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); |
3107 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
3079 | selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); |
3108 | MAX_IT (selection.mark.col, 0); |
|
|
3109 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
|
|
3110 | |
3080 | |
3111 | while (selection.mark.col > 0 |
3081 | while (selection.mark.col > 0 |
3112 | && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) |
3082 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3113 | --selection.mark.col; |
3083 | --selection.mark.col; |
3114 | |
3084 | |
3115 | if (selection.op) |
3085 | if (selection.op) |
3116 | { /* clear the old selection */ |
3086 | { /* clear the old selection */ |
3117 | selection.beg.row = selection.end.row = selection.mark.row; |
3087 | selection.beg.row = selection.end.row = selection.mark.row; |
… | |
… | |
3141 | text_t *stp; |
3111 | text_t *stp; |
3142 | rend_t *srp; |
3112 | rend_t *srp; |
3143 | |
3113 | |
3144 | if (dirn == UP) |
3114 | if (dirn == UP) |
3145 | { |
3115 | { |
3146 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
3116 | bound.row = - nsaved - 1; |
3147 | bound.col = 0; |
3117 | bound.col = 0; |
3148 | dirnadd = -1; |
3118 | dirnadd = -1; |
3149 | } |
3119 | } |
3150 | else |
3120 | else |
3151 | { |
3121 | { |
3152 | bound.row = TermWin.saveLines + TermWin.nrow; |
3122 | bound.row = nrow; |
3153 | bound.col = TermWin.ncol - 1; |
3123 | bound.col = ncol - 1; |
3154 | dirnadd = 1; |
3124 | dirnadd = 1; |
3155 | } |
3125 | } |
3156 | |
3126 | |
3157 | row = mark->row + TermWin.saveLines; |
3127 | row = mark->row; |
3158 | col = mark->col; |
3128 | col = max (mark->col, 0); |
3159 | MAX_IT (col, 0); |
3129 | |
3160 | /* find the edge of a word */ |
3130 | /* find the edge of a word */ |
3161 | stp = &screen.text[row][col]; |
3131 | stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp); |
3162 | w1 = DELIMIT_TEXT (*stp); |
3132 | srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp); |
3163 | |
|
|
3164 | srp = &screen.rend[row][col]; |
|
|
3165 | w2 = DELIMIT_REND (*srp); |
|
|
3166 | |
3133 | |
3167 | for (;;) |
3134 | for (;;) |
3168 | { |
3135 | { |
3169 | for (; col != bound.col; col += dirnadd) |
3136 | for (; col != bound.col; col += dirnadd) |
3170 | { |
3137 | { |
… | |
… | |
3180 | break; |
3147 | break; |
3181 | } |
3148 | } |
3182 | |
3149 | |
3183 | if ((col == bound.col) && (row != bound.row)) |
3150 | if ((col == bound.col) && (row != bound.row)) |
3184 | { |
3151 | { |
3185 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
3152 | if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ()) |
3186 | { |
3153 | { |
3187 | trow = row + dirnadd; |
3154 | trow = row + dirnadd; |
3188 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
3155 | tcol = dirn == UP ? ncol - 1 : 0; |
3189 | |
3156 | |
3190 | if (screen.text[trow] == NULL) |
3157 | if (!ROW(trow).t) |
3191 | break; |
3158 | break; |
3192 | |
3159 | |
3193 | stp = & (screen.text[trow][tcol]); |
3160 | stp = ROW(trow).t + tcol; |
3194 | srp = & (screen.rend[trow][tcol]); |
3161 | srp = ROW(trow).r + tcol; |
3195 | |
3162 | |
3196 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3163 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3197 | break; |
3164 | break; |
3198 | |
3165 | |
3199 | row = trow; |
3166 | row = trow; |
… | |
… | |
3207 | Old_Word_Selection_You_Die: |
3174 | Old_Word_Selection_You_Die: |
3208 | if (dirn == DN) |
3175 | if (dirn == DN) |
3209 | col++; /* put us on one past the end */ |
3176 | col++; /* put us on one past the end */ |
3210 | |
3177 | |
3211 | /* Poke the values back in */ |
3178 | /* Poke the values back in */ |
3212 | ret->row = row - TermWin.saveLines; |
3179 | ret->row = row; |
3213 | ret->col = col; |
3180 | ret->col = col; |
3214 | } |
3181 | } |
3215 | |
3182 | |
3216 | /* ------------------------------------------------------------------------- */ |
3183 | /* ------------------------------------------------------------------------- */ |
3217 | /* |
3184 | /* |
… | |
… | |
3222 | * flag == 2 ==> button 3 motion |
3189 | * flag == 2 ==> button 3 motion |
3223 | */ |
3190 | */ |
3224 | void |
3191 | void |
3225 | rxvt_term::selection_extend (int x, int y, int flag) |
3192 | rxvt_term::selection_extend (int x, int y, int flag) |
3226 | { |
3193 | { |
3227 | int col, row; |
3194 | int col = min (max (Pixel2Col (x), 0), nrow - 1); |
3228 | |
3195 | int row = min (max (Pixel2Row (y), 0), ncol); |
3229 | col = Pixel2Col (x); |
|
|
3230 | row = Pixel2Row (y); |
|
|
3231 | MAX_IT (row, 0); |
|
|
3232 | MIN_IT (row, (int)TermWin.nrow - 1); |
|
|
3233 | MAX_IT (col, 0); |
|
|
3234 | MIN_IT (col, (int)TermWin.ncol); |
|
|
3235 | |
3196 | |
3236 | /* |
3197 | /* |
3237 | * If we're selecting characters (single click) then we must check first |
3198 | * If we're selecting characters (single click) then we must check first |
3238 | * if we are at the same place as the original mark. If we are then |
3199 | * if we are at the same place as the original mark. If we are then |
3239 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3200 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3240 | * be _past_ a character for it to be selected. |
3201 | * be _past_ a character for it to be selected. |
3241 | */ |
3202 | */ |
3242 | if (((selection.clicks % 3) == 1) && !flag |
3203 | if (((selection.clicks % 3) == 1) && !flag |
3243 | && (col == selection.mark.col |
3204 | && (col == selection.mark.col |
3244 | && (row == selection.mark.row + TermWin.view_start))) |
3205 | && (row == selection.mark.row + view_start))) |
3245 | { |
3206 | { |
3246 | /* select nothing */ |
3207 | /* select nothing */ |
3247 | selection.beg.row = selection.end.row = 0; |
3208 | selection.beg.row = selection.end.row = 0; |
3248 | selection.beg.col = selection.end.col = 0; |
3209 | selection.beg.col = selection.end.col = 0; |
3249 | selection.clicks = 4; |
3210 | selection.clicks = 4; |
… | |
… | |
3264 | * Extend the selection to the specified col/row |
3225 | * Extend the selection to the specified col/row |
3265 | */ |
3226 | */ |
3266 | void |
3227 | void |
3267 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3228 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3268 | { |
3229 | { |
3269 | int16_t ncol = TermWin.ncol; |
|
|
3270 | int end_col; |
|
|
3271 | row_col_t pos; |
3230 | row_col_t pos; |
3272 | enum { |
3231 | enum { |
3273 | LEFT, RIGHT |
3232 | LEFT, RIGHT |
3274 | } closeto = RIGHT; |
3233 | } closeto = RIGHT; |
3275 | |
3234 | |
… | |
… | |
3306 | selection.beg.col = selection.end.col = selection.mark.col; |
3265 | selection.beg.col = selection.end.col = selection.mark.col; |
3307 | selection.beg.row = selection.end.row = selection.mark.row; |
3266 | selection.beg.row = selection.end.row = selection.mark.row; |
3308 | } |
3267 | } |
3309 | |
3268 | |
3310 | pos.col = col; |
3269 | pos.col = col; |
3311 | pos.row = row; |
3270 | pos.row = row - view_start; |
3312 | |
|
|
3313 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
|
|
3314 | |
3271 | |
3315 | /* |
3272 | /* |
3316 | * This is mainly xterm style selection with a couple of differences, mainly |
3273 | * This is mainly xterm style selection with a couple of differences, mainly |
3317 | * in the way button3 drag extension works. |
3274 | * in the way button3 drag extension works. |
3318 | * We're either doing: button1 drag; button3 press; or button3 drag |
3275 | * We're either doing: button1 drag; button3 press; or button3 drag |
… | |
… | |
3377 | } |
3334 | } |
3378 | } |
3335 | } |
3379 | |
3336 | |
3380 | if (selection.clicks == 1) |
3337 | if (selection.clicks == 1) |
3381 | { |
3338 | { |
3382 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3339 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3383 | |
3340 | && !ROW(selection.beg.row).is_longer () |
3384 | if (selection.beg.col > end_col |
|
|
3385 | && end_col != -1 |
|
|
3386 | #if ENABLE_FRILLS |
3341 | #if ENABLE_FRILLS |
3387 | && !selection.rect |
3342 | && !selection.rect |
3388 | #endif |
3343 | #endif |
3389 | ) |
3344 | ) |
3390 | selection.beg.col = ncol; |
3345 | selection.beg.col = ncol; |
3391 | |
3346 | |
3392 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
|
|
3393 | |
|
|
3394 | if ( |
3347 | if ( |
3395 | selection.end.col > end_col |
3348 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3396 | && end_col != -1 |
3349 | && !ROW(selection.end.row).is_longer () |
3397 | #if ENABLE_FRILLS |
3350 | #if ENABLE_FRILLS |
3398 | && !selection.rect |
3351 | && !selection.rect |
3399 | #endif |
3352 | #endif |
3400 | ) |
3353 | ) |
3401 | selection.end.col = ncol; |
3354 | selection.end.col = ncol; |
… | |
… | |
3411 | else if (selection.clicks == 3) |
3364 | else if (selection.clicks == 3) |
3412 | { |
3365 | { |
3413 | #if ENABLE_FRILLS |
3366 | #if ENABLE_FRILLS |
3414 | if (options & Opt_tripleclickwords) |
3367 | if (options & Opt_tripleclickwords) |
3415 | { |
3368 | { |
3416 | int end_row; |
|
|
3417 | |
|
|
3418 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3369 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3419 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
|
|
3420 | |
3370 | |
3421 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3371 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3422 | { |
3372 | { |
3423 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
3373 | if (!ROW(end_row).is_longer ()) |
3424 | |
|
|
3425 | if (end_col != -1) |
|
|
3426 | { |
3374 | { |
3427 | selection.end.row = end_row; |
3375 | selection.end.row = end_row; |
3428 | selection.end.col = end_col; |
3376 | selection.end.col = save[end_row + saveLines].l; |
3429 | selection_remove_trailing_spaces (); |
3377 | selection_remove_trailing_spaces (); |
3430 | break; |
3378 | break; |
3431 | } |
3379 | } |
3432 | } |
3380 | } |
3433 | } |
3381 | } |
… | |
… | |
3439 | |
3387 | |
3440 | selection.beg.col = 0; |
3388 | selection.beg.col = 0; |
3441 | selection.end.col = ncol; |
3389 | selection.end.col = ncol; |
3442 | |
3390 | |
3443 | // select a complete logical line |
3391 | // select a complete logical line |
3444 | while (selection.beg.row > -TermWin.saveLines |
3392 | while (selection.beg.row > -saveLines |
3445 | && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) |
3393 | && ROW(selection.beg.row - 1).is_longer ()) |
3446 | selection.beg.row--; |
3394 | selection.beg.row--; |
3447 | |
3395 | |
3448 | while (selection.end.row < TermWin.nrow |
3396 | while (selection.end.row < nrow |
3449 | && screen.tlen[selection.end.row + TermWin.saveLines] == -1) |
3397 | && ROW(selection.end.row).is_longer ()) |
3450 | selection.end.row++; |
3398 | selection.end.row++; |
3451 | } |
3399 | } |
3452 | } |
3400 | } |
3453 | |
3401 | |
3454 | if (button3 && buttonpress) |
3402 | if (button3 && buttonpress) |
… | |
… | |
3479 | text_t *stp; |
3427 | text_t *stp; |
3480 | |
3428 | |
3481 | end_col = selection.end.col; |
3429 | end_col = selection.end.col; |
3482 | end_row = selection.end.row; |
3430 | end_row = selection.end.row; |
3483 | |
3431 | |
3484 | for ( ; end_row >= selection.beg.row; ) |
3432 | for (; end_row >= selection.beg.row; ) |
3485 | { |
3433 | { |
3486 | stp = screen.text[end_row + TermWin.saveLines]; |
3434 | stp = ROW(end_row).t; |
3487 | |
3435 | |
3488 | while (--end_col >= 0) |
3436 | while (--end_col >= 0) |
3489 | { |
3437 | { |
3490 | if (stp[end_col] != ' ' |
3438 | if (stp[end_col] != ' ' |
3491 | && stp[end_col] != '\t' |
3439 | && stp[end_col] != '\t' |
3492 | && stp[end_col] != NOCHAR) |
3440 | && stp[end_col] != NOCHAR) |
3493 | break; |
3441 | break; |
3494 | } |
3442 | } |
3495 | |
3443 | |
3496 | if (end_col >= 0 |
3444 | if (end_col >= 0 |
3497 | || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) |
3445 | || !ROW(end_row - 1).is_longer ()) |
3498 | { |
3446 | { |
3499 | selection.end.col = end_col + 1; |
3447 | selection.end.col = end_col + 1; |
3500 | selection.end.row = end_row; |
3448 | selection.end.row = end_row; |
3501 | break; |
3449 | break; |
3502 | } |
3450 | } |
3503 | |
3451 | |
3504 | end_row--; |
3452 | end_row--; |
3505 | end_col = TermWin.ncol; |
3453 | end_col = ncol; |
3506 | } |
3454 | } |
3507 | |
3455 | |
3508 | if (selection.mark.row > selection.end.row) |
3456 | if (selection.mark.row > selection.end.row) |
3509 | { |
3457 | { |
3510 | selection.mark.row = selection.end.row; |
3458 | selection.mark.row = selection.end.row; |
… | |
… | |
3535 | */ |
3483 | */ |
3536 | void |
3484 | void |
3537 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3485 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3538 | { |
3486 | { |
3539 | XSelectionEvent ev; |
3487 | XSelectionEvent ev; |
|
|
3488 | dDisp; |
3540 | |
3489 | |
3541 | ev.type = SelectionNotify; |
3490 | ev.type = SelectionNotify; |
3542 | ev.property = None; |
3491 | ev.property = None; |
3543 | ev.display = rq.display; |
3492 | ev.display = rq.display; |
3544 | ev.requestor = rq.requestor; |
3493 | ev.requestor = rq.requestor; |
… | |
… | |
3558 | *target++ = xa[XA_COMPOUND_TEXT]; |
3507 | *target++ = xa[XA_COMPOUND_TEXT]; |
3559 | #if X_HAVE_UTF8_STRING |
3508 | #if X_HAVE_UTF8_STRING |
3560 | *target++ = xa[XA_UTF8_STRING]; |
3509 | *target++ = xa[XA_UTF8_STRING]; |
3561 | #endif |
3510 | #endif |
3562 | |
3511 | |
3563 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3512 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3564 | 32, PropModeReplace, |
3513 | 32, PropModeReplace, |
3565 | (unsigned char *)target_list, target - target_list); |
3514 | (unsigned char *)target_list, target - target_list); |
3566 | ev.property = rq.property; |
3515 | ev.property = rq.property; |
3567 | } |
3516 | } |
3568 | #if TODO // TODO |
3517 | #if TODO // TODO |
… | |
… | |
3571 | /* TODO: Handle MULTIPLE */ |
3520 | /* TODO: Handle MULTIPLE */ |
3572 | } |
3521 | } |
3573 | #endif |
3522 | #endif |
3574 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3523 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3575 | { |
3524 | { |
3576 | XChangeProperty (display->display, rq.requestor, rq.property, rq.target, |
3525 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3577 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3526 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3578 | ev.property = rq.property; |
3527 | ev.property = rq.property; |
3579 | } |
3528 | } |
3580 | else if (rq.target == XA_STRING |
3529 | else if (rq.target == XA_STRING |
3581 | || rq.target == xa[XA_TEXT] |
3530 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3639 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3588 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3640 | ct.nitems = strlen ((char *)ct.value); |
3589 | ct.nitems = strlen ((char *)ct.value); |
3641 | } |
3590 | } |
3642 | else |
3591 | else |
3643 | #endif |
3592 | #endif |
3644 | if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3593 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3645 | freect = 1; |
3594 | freect = 1; |
3646 | else |
3595 | else |
3647 | { |
3596 | { |
3648 | /* if we failed to convert then send it raw */ |
3597 | /* if we failed to convert then send it raw */ |
3649 | ct.value = (unsigned char *)cl; |
3598 | ct.value = (unsigned char *)cl; |
3650 | ct.nitems = selectlen; |
3599 | ct.nitems = selectlen; |
3651 | ct.encoding = target; |
3600 | ct.encoding = target; |
3652 | } |
3601 | } |
3653 | |
3602 | |
3654 | XChangeProperty (display->display, rq.requestor, rq.property, |
3603 | XChangeProperty (disp, rq.requestor, rq.property, |
3655 | ct.encoding, 8, PropModeReplace, |
3604 | ct.encoding, 8, PropModeReplace, |
3656 | ct.value, (int)ct.nitems); |
3605 | ct.value, (int)ct.nitems); |
3657 | ev.property = rq.property; |
3606 | ev.property = rq.property; |
3658 | |
3607 | |
3659 | if (freect) |
3608 | if (freect) |
3660 | XFree (ct.value); |
3609 | XFree (ct.value); |
3661 | } |
3610 | } |
3662 | |
3611 | |
3663 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3612 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3664 | } |
3613 | } |
3665 | |
3614 | |
3666 | /* ------------------------------------------------------------------------- * |
3615 | /* ------------------------------------------------------------------------- * |
3667 | * MOUSE ROUTINES * |
3616 | * MOUSE ROUTINES * |
3668 | * ------------------------------------------------------------------------- */ |
3617 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3672 | */ |
3621 | */ |
3673 | void |
3622 | void |
3674 | rxvt_term::pixel_position (int *x, int *y) |
3623 | rxvt_term::pixel_position (int *x, int *y) |
3675 | { |
3624 | { |
3676 | *x = Pixel2Col (*x); |
3625 | *x = Pixel2Col (*x); |
3677 | /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ |
3626 | /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ |
3678 | *y = Pixel2Row (*y); |
3627 | *y = Pixel2Row (*y); |
3679 | /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ |
3628 | /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ |
3680 | } |
3629 | } |
3681 | |
3630 | |
3682 | /* ------------------------------------------------------------------------- */ |
3631 | /* ------------------------------------------------------------------------- */ |
3683 | #ifdef USE_XIM |
3632 | #ifdef USE_XIM |
3684 | void |
3633 | void |
3685 | rxvt_term::im_set_position (XPoint &pos) |
3634 | rxvt_term::im_set_position (XPoint &pos) |
3686 | { |
3635 | { |
3687 | XWindowAttributes xwa; |
3636 | XWindowAttributes xwa; |
3688 | |
3637 | |
3689 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
3638 | XGetWindowAttributes (display->display, vt, &xwa); |
3690 | |
3639 | |
3691 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3640 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3692 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; |
3641 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3693 | } |
3642 | } |
3694 | #endif |
3643 | #endif |
3695 | |
3644 | |
3696 | #if ENABLE_OVERLAY |
3645 | #if ENABLE_OVERLAY |
3697 | void |
3646 | void |
3698 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3647 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3699 | { |
3648 | { |
3700 | if (TermWin.nrow < 3 || TermWin.ncol < 3) |
3649 | if (nrow < 3 || ncol < 3) |
3701 | return; |
3650 | return; |
3702 | |
3651 | |
3703 | want_refresh = 1; |
3652 | want_refresh = 1; |
3704 | |
3653 | |
3705 | scr_overlay_off (); |
3654 | scr_overlay_off (); |
3706 | |
3655 | |
3707 | if (x < 0) x = TermWin.ncol - w; |
3656 | if (x < 0) x = ncol - w; |
3708 | if (y < 0) y = TermWin.nrow - h; |
3657 | if (y < 0) y = nrow - h; |
3709 | |
3658 | |
3710 | // make space for border |
3659 | // make space for border |
3711 | w += 2; MIN_IT (w, TermWin.ncol); |
3660 | w += 2; MIN_IT (w, ncol); |
3712 | h += 2; MIN_IT (h, TermWin.nrow); |
3661 | h += 2; MIN_IT (h, nrow); |
3713 | |
3662 | |
3714 | x -= 1; MAX_IT (x, 0); |
3663 | x -= 1; MAX_IT (x, 0); |
3715 | y -= 1; MAX_IT (y, 0); |
3664 | y -= 1; MAX_IT (y, 0); |
3716 | |
3665 | |
3717 | MIN_IT (x, TermWin.ncol - w); |
3666 | MIN_IT (x, ncol - w); |
3718 | MIN_IT (y, TermWin.nrow - h); |
3667 | MIN_IT (y, nrow - h); |
3719 | |
3668 | |
3720 | ov_x = x; ov_y = y; |
3669 | ov_x = x; ov_y = y; |
3721 | ov_w = w; ov_h = h; |
3670 | ov_w = w; ov_h = h; |
3722 | |
3671 | |
3723 | ov_text = new text_t *[h]; |
3672 | ov_text = new text_t *[h]; |
… | |
… | |
3788 | while (*s) |
3737 | while (*s) |
3789 | scr_overlay_set (x++, y, *s++); |
3738 | scr_overlay_set (x++, y, *s++); |
3790 | } |
3739 | } |
3791 | |
3740 | |
3792 | void |
3741 | void |
|
|
3742 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) |
|
|
3743 | { |
|
|
3744 | while (*s) |
|
|
3745 | { |
|
|
3746 | text_t t = *s++; |
|
|
3747 | int width = wcwidth (t); |
|
|
3748 | |
|
|
3749 | while (width--) |
|
|
3750 | { |
|
|
3751 | scr_overlay_set (x++, y, t); |
|
|
3752 | t = NOCHAR; |
|
|
3753 | } |
|
|
3754 | } |
|
|
3755 | } |
|
|
3756 | |
|
|
3757 | void |
3793 | rxvt_term::scr_swap_overlay () |
3758 | rxvt_term::scr_swap_overlay () |
3794 | { |
3759 | { |
3795 | if (!ov_text) |
3760 | if (!ov_text) |
3796 | return; |
3761 | return; |
3797 | |
3762 | |
3798 | int row_offset = ov_y + TermWin.saveLines - TermWin.view_start; |
|
|
3799 | |
|
|
3800 | // swap screen mem with overlay |
3763 | // swap screen mem with overlay |
3801 | for (int y = ov_h; y--; ) |
3764 | for (int y = ov_h; y--; ) |
3802 | { |
3765 | { |
3803 | text_t *t1 = ov_text[y]; |
3766 | text_t *t1 = ov_text[y]; |
3804 | rend_t *r1 = ov_rend[y]; |
3767 | rend_t *r1 = ov_rend[y]; |
3805 | |
3768 | |
3806 | text_t *t2 = screen.text[y + row_offset] + ov_x; |
3769 | text_t *t2 = ROW(y - view_start).t + ov_x; |
3807 | rend_t *r2 = screen.rend[y + row_offset] + ov_x; |
3770 | rend_t *r2 = ROW(y - view_start).r + ov_x; |
3808 | |
3771 | |
3809 | for (int x = ov_w; x--; ) |
3772 | for (int x = ov_w; x--; ) |
3810 | { |
3773 | { |
3811 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3774 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3812 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3775 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
… | |
… | |
3814 | } |
3777 | } |
3815 | } |
3778 | } |
3816 | |
3779 | |
3817 | #endif |
3780 | #endif |
3818 | /* ------------------------------------------------------------------------- */ |
3781 | /* ------------------------------------------------------------------------- */ |
|
|
3782 | |