… | |
… | |
47 | /* ------------------------------------------------------------------------- * |
47 | /* ------------------------------------------------------------------------- * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * ------------------------------------------------------------------------- */ |
49 | * ------------------------------------------------------------------------- */ |
50 | #define ZERO_SCROLLBACK() \ |
50 | #define ZERO_SCROLLBACK() \ |
51 | if (options & Opt_scrollTtyOutput) \ |
51 | if (options & Opt_scrollTtyOutput) \ |
52 | TermWin.view_start = 0 |
52 | view_start = 0 |
53 | #define CLEAR_SELECTION() \ |
53 | #define CLEAR_SELECTION() \ |
54 | selection.beg.row = selection.beg.col \ |
54 | selection.beg.row = selection.beg.col \ |
55 | = selection.end.row = selection.end.col = 0 |
55 | = selection.end.row = selection.end.col = 0 |
56 | #define CLEAR_ALL_SELECTION() \ |
56 | #define CLEAR_ALL_SELECTION() \ |
57 | selection.beg.row = selection.beg.col \ |
57 | selection.beg.row = selection.beg.col \ |
… | |
… | |
88 | /* |
88 | /* |
89 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
89 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
90 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
90 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
91 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
91 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
92 | */ |
92 | */ |
93 | #define drawBuffer TermWin.vt |
93 | #define drawBuffer vt |
94 | |
94 | |
95 | #define CLEAR_ROWS(row, num) \ |
95 | #define CLEAR_ROWS(row, num) \ |
96 | if (TermWin.mapped) \ |
96 | if (mapped) \ |
97 | XClearArea (display->display, drawBuffer, 0, \ |
97 | XClearArea (display->display, drawBuffer, 0, \ |
98 | Row2Pixel (row), (unsigned int)TermWin.width, \ |
98 | Row2Pixel (row), (unsigned int)width, \ |
99 | (unsigned int)Height2Pixel (num), False) |
99 | (unsigned int)Height2Pixel (num), False) |
100 | |
100 | |
101 | #define CLEAR_CHARS(x, y, num) \ |
101 | #define CLEAR_CHARS(x, y, num) \ |
102 | if (TermWin.mapped) \ |
102 | if (mapped) \ |
103 | XClearArea (display->display, drawBuffer, x, y, \ |
103 | XClearArea (display->display, drawBuffer, x, y, \ |
104 | (unsigned int)Width2Pixel (num), \ |
104 | (unsigned int)Width2Pixel (num), \ |
105 | (unsigned int)Height2Pixel (1), False) |
105 | (unsigned int)Height2Pixel (1), False) |
106 | |
106 | |
107 | #define ERASE_ROWS(row, num) \ |
107 | #define ERASE_ROWS(row, num) \ |
108 | XFillRectangle (display->display, drawBuffer, TermWin.gc, \ |
108 | XFillRectangle (display->display, drawBuffer, gc, \ |
109 | 0, Row2Pixel (row), \ |
109 | 0, Row2Pixel (row), \ |
110 | (unsigned int)TermWin.width, \ |
110 | (unsigned int)width, \ |
111 | (unsigned int)Height2Pixel (num)) |
111 | (unsigned int)Height2Pixel (num)) |
112 | |
112 | |
113 | /* ------------------------------------------------------------------------- * |
113 | /* ------------------------------------------------------------------------- * |
114 | * SCREEN `COMMON' ROUTINES * |
114 | * SCREEN `COMMON' ROUTINES * |
115 | * ------------------------------------------------------------------------- */ |
115 | * ------------------------------------------------------------------------- */ |
116 | |
116 | |
117 | /* Fill part/all of a line with blanks. */ |
117 | /* Fill part/all of a line with blanks. */ |
118 | void |
118 | void |
119 | rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) |
119 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) |
120 | { |
120 | { |
|
|
121 | if (!l.t) |
|
|
122 | { |
|
|
123 | lalloc (l); |
|
|
124 | col = 0; |
|
|
125 | width = ncol; |
|
|
126 | } |
|
|
127 | |
121 | efs &= ~RS_baseattrMask; |
128 | efs &= ~RS_baseattrMask; |
122 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
129 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
123 | |
130 | |
|
|
131 | text_t *et = l.t + col; |
|
|
132 | rend_t *er = l.r + col; |
|
|
133 | |
124 | while (width--) |
134 | while (width--) |
125 | { |
135 | { |
126 | *et++ = ' '; |
136 | *et++ = ' '; |
127 | *er++ = efs; |
137 | *er++ = efs; |
128 | } |
138 | } |
129 | } |
139 | } |
130 | |
140 | |
131 | /* ------------------------------------------------------------------------- */ |
141 | /* ------------------------------------------------------------------------- */ |
132 | /* Fill a full line with blanks - make sure it is allocated first */ |
142 | /* Fill a full line with blanks - make sure it is allocated first */ |
133 | void |
143 | void |
134 | rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) |
144 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
135 | { |
145 | { |
136 | #ifdef DEBUG_STRICT |
146 | scr_blank_line (l, 0, ncol, efs); |
137 | assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); |
|
|
138 | #endif |
|
|
139 | if (tp[row] == NULL) |
|
|
140 | { |
|
|
141 | tp[row] = (text_t *)talloc->alloc (); |
|
|
142 | rp[row] = (rend_t *)ralloc->alloc (); |
|
|
143 | } |
|
|
144 | |
|
|
145 | scr_blank_line (tp[row], rp[row], TermWin.ncol, efs); |
|
|
146 | } |
147 | } |
147 | |
148 | |
148 | /* ------------------------------------------------------------------------- * |
149 | /* ------------------------------------------------------------------------- * |
149 | * SCREEN INITIALISATION * |
150 | * SCREEN INITIALISATION * |
150 | * ------------------------------------------------------------------------- */ |
151 | * ------------------------------------------------------------------------- */ |
151 | void |
152 | void |
152 | rxvt_term::scr_reset () |
153 | rxvt_term::scr_reset () |
153 | { |
154 | { |
154 | unsigned int ncol, nrow, total_rows, prev_total_rows; |
|
|
155 | unsigned int p, q; |
155 | unsigned int p, q; |
156 | int k; |
156 | int k; |
157 | rend_t setrstyle; |
|
|
158 | |
157 | |
159 | #if ENABLE_OVERLAY |
158 | #if ENABLE_OVERLAY |
160 | scr_overlay_off (); |
159 | scr_overlay_off (); |
161 | #endif |
160 | #endif |
162 | |
161 | |
163 | TermWin.view_start = 0; |
162 | view_start = 0; |
164 | num_scr = 0; |
163 | num_scr = 0; |
165 | |
164 | |
166 | if (TermWin.ncol == 0) |
165 | if (ncol == 0) |
167 | TermWin.ncol = 80; |
166 | ncol = 80; |
168 | |
167 | |
169 | if (TermWin.nrow == 0) |
168 | if (nrow == 0) |
170 | TermWin.nrow = 24; |
169 | nrow = 24; |
171 | |
|
|
172 | ncol = TermWin.ncol; |
|
|
173 | nrow = TermWin.nrow; |
|
|
174 | |
170 | |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
171 | if (ncol == prev_ncol && nrow == prev_nrow) |
176 | return; |
172 | return; |
177 | |
173 | |
178 | // we need at least two lines for wrapping to work correctly |
174 | // we need at least two lines for wrapping to work correctly |
179 | if (nrow + TermWin.saveLines < 2) |
175 | if (nrow + saveLines < 2) |
180 | { |
176 | { |
181 | TermWin.saveLines++; |
177 | saveLines++; |
182 | prev_nrow--; |
178 | prev_nrow--; |
183 | TermWin.nscrolled++; |
179 | nsaved++; |
184 | } |
180 | } |
185 | |
181 | |
186 | want_refresh = 1; |
182 | want_refresh = 1; |
187 | |
183 | |
188 | prev_total_rows = prev_nrow + TermWin.saveLines; |
184 | int prev_total_rows = prev_nrow + saveLines; |
189 | total_rows = nrow + TermWin.saveLines; |
185 | total_rows = nrow + saveLines; |
190 | |
186 | |
191 | screen.tscroll = 0; |
187 | screen.tscroll = 0; |
192 | screen.bscroll = nrow - 1; |
188 | screen.bscroll = nrow - 1; |
193 | |
189 | |
194 | if (!talloc) |
190 | if (!save) |
195 | { |
|
|
196 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
197 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
198 | } |
|
|
199 | |
|
|
200 | if (!screen.text) |
|
|
201 | { |
191 | { |
202 | /* |
192 | /* |
203 | * first time called so just malloc everything: don't rely on realloc |
193 | * first time called so just malloc everything: don't rely on realloc |
204 | * Note: this is still needed so that all the scrollback lines are NULL |
194 | * Note: this is still needed so that all the scrollback lines are NULL |
205 | */ |
195 | */ |
206 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
196 | nsaved = 0; /* no saved lines */ |
207 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
197 | term_start = 0; |
208 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
198 | |
|
|
199 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
200 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
201 | |
|
|
202 | save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
203 | buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
204 | drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); |
209 | swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
205 | swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); |
210 | |
206 | |
211 | screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); |
|
|
212 | swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); |
|
|
213 | |
|
|
214 | screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
|
|
215 | buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
|
|
216 | drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
|
|
217 | swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
|
|
218 | |
|
|
219 | for (p = 0; p < nrow; p++) |
207 | for (p = nrow; p--; ) |
220 | { |
208 | { |
221 | q = p + TermWin.saveLines; |
|
|
222 | scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); |
209 | scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); |
223 | scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); |
210 | scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); |
224 | screen.tlen[q] = swap.tlen[p] = 0; |
|
|
225 | scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); |
211 | scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); |
226 | } |
212 | } |
227 | |
213 | |
228 | memset (charsets, 'B', sizeof (charsets)); |
214 | memset (charsets, 'B', sizeof (charsets)); |
229 | TermWin.nscrolled = 0; /* no saved lines */ |
|
|
230 | rstyle = DEFAULT_RSTYLE; |
215 | rstyle = DEFAULT_RSTYLE; |
231 | screen.flags = Screen_DefaultFlags; |
216 | screen.flags = Screen_DefaultFlags; |
232 | screen.cur.row = screen.cur.col = 0; |
217 | screen.cur.row = screen.cur.col = 0; |
233 | screen.charset = 0; |
218 | screen.charset = 0; |
234 | current_screen = PRIMARY; |
219 | current_screen = PRIMARY; |
… | |
… | |
254 | else |
239 | else |
255 | { |
240 | { |
256 | /* |
241 | /* |
257 | * add or delete rows as appropriate |
242 | * add or delete rows as appropriate |
258 | */ |
243 | */ |
259 | setrstyle = DEFAULT_RSTYLE; |
244 | |
|
|
245 | rxvt_salloc *old_ta; |
|
|
246 | rxvt_salloc *old_ra; |
260 | |
247 | |
261 | if (nrow < prev_nrow) |
248 | if (nrow < prev_nrow) |
262 | { |
249 | { |
263 | /* delete rows */ |
250 | /* delete rows */ |
264 | k = min (TermWin.nscrolled, prev_nrow - nrow); |
251 | k = min (nsaved, prev_nrow - nrow); |
|
|
252 | // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO |
265 | scr_scroll_text (0, (int)prev_nrow - 1, k, 1); |
253 | scr_scroll_text (0, (int)prev_nrow - 1, k); |
266 | |
254 | |
267 | for (p = nrow; p < prev_nrow; p++) |
255 | for (p = nrow; p < prev_nrow; p++) |
268 | { |
256 | { |
269 | q = p + TermWin.saveLines; |
257 | lfree (ROW(p)); |
270 | |
|
|
271 | if (screen.text[q]) |
|
|
272 | { |
|
|
273 | #ifdef DEBUG_STRICT |
|
|
274 | assert (screen.rend[q]); |
|
|
275 | #endif |
|
|
276 | talloc->free (screen.text[q]); |
|
|
277 | ralloc->free (screen.rend[q]); |
|
|
278 | } |
|
|
279 | |
|
|
280 | if (swap.text[p]) |
258 | lfree (swap_save[p]); |
281 | { |
|
|
282 | #ifdef DEBUG_STRICT |
|
|
283 | assert (swap.rend[p]); |
|
|
284 | #endif |
|
|
285 | talloc->free (swap.text[p]); |
|
|
286 | ralloc->free (swap.rend[p]); |
|
|
287 | } |
|
|
288 | |
|
|
289 | #ifdef DEBUG_STRICT |
|
|
290 | assert (drawn_text[p] && drawn_rend[p]); |
|
|
291 | #endif |
|
|
292 | talloc->free (drawn_text[p]); |
259 | lfree (drawn[p]); |
293 | ralloc->free (drawn_rend[p]); |
|
|
294 | } |
260 | } |
295 | |
261 | |
296 | /* we have fewer rows so fix up cursor position */ |
262 | /* we have fewer rows so fix up cursor position */ |
297 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
263 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
298 | |
264 | |
… | |
… | |
301 | else if (nrow > prev_nrow) |
267 | else if (nrow > prev_nrow) |
302 | { |
268 | { |
303 | /* add rows */ |
269 | /* add rows */ |
304 | scr_reset_realloc (); /* realloc _first_ */ |
270 | scr_reset_realloc (); /* realloc _first_ */ |
305 | |
271 | |
|
|
272 | int ocol = ncol; |
306 | TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
273 | ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
307 | |
274 | |
308 | k = min (TermWin.nscrolled, nrow - prev_nrow); |
275 | k = min (nsaved, nrow - prev_nrow); |
309 | |
276 | |
310 | for (p = prev_total_rows; p < total_rows; p++) |
277 | for (p = prev_total_rows; p < total_rows; p++) |
311 | { |
278 | save[p].clear (); |
312 | screen.tlen[p] = 0; |
|
|
313 | screen.text[p] = NULL; |
|
|
314 | screen.rend[p] = NULL; |
|
|
315 | } |
|
|
316 | |
279 | |
317 | for (p = prev_total_rows; p < total_rows - k; p++) |
280 | for (p = prev_total_rows; p < total_rows - k; p++) |
318 | scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle); |
281 | scr_blank_screen_mem (save[p], DEFAULT_RSTYLE); |
319 | |
282 | |
320 | for (p = prev_nrow; p < nrow; p++) |
283 | for (p = prev_nrow; p < nrow; p++) |
321 | { |
284 | { |
322 | swap.tlen[p] = 0; |
285 | swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); |
323 | swap.text[p] = NULL; |
286 | drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); |
324 | swap.rend[p] = NULL; |
|
|
325 | drawn_text[p] = NULL; |
|
|
326 | drawn_rend[p] = NULL; |
|
|
327 | scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); |
|
|
328 | scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); |
|
|
329 | } |
287 | } |
330 | |
288 | |
331 | if (k > 0) |
289 | if (k > 0) |
332 | { |
290 | { |
333 | scr_scroll_text (0, (int)nrow - 1, -k, 1); |
291 | scr_scroll_text (0, (int)nrow - 1, -k); |
334 | screen.cur.row += k; |
292 | screen.cur.row += k; |
335 | screen.s_cur.row += k; |
293 | screen.s_cur.row += k; |
336 | TermWin.nscrolled -= k; |
294 | nsaved -= k; |
337 | } |
295 | } |
338 | |
296 | |
339 | #ifdef DEBUG_STRICT |
297 | #ifdef DEBUG_STRICT |
340 | assert (screen.cur.row < TermWin.nrow); |
298 | assert (screen.cur.row < nrow); |
341 | #else /* drive with your eyes closed */ |
299 | #else /* drive with your eyes closed */ |
342 | MIN_IT (screen.cur.row, nrow - 1); |
300 | MIN_IT (screen.cur.row, nrow - 1); |
343 | #endif |
301 | #endif |
344 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
302 | ncol = ocol; // save b/c scr_blank_screen_mem uses this |
345 | } |
303 | } |
346 | |
304 | |
347 | /* resize columns */ |
305 | /* resize columns */ |
348 | if (ncol != prev_ncol) |
306 | if (ncol != prev_ncol) |
349 | { |
307 | { |
350 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
308 | old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
351 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
309 | old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
352 | |
310 | |
353 | for (p = 0; p < total_rows; p++) |
311 | for (p = total_rows; p--; ) |
|
|
312 | lresize (save[p]); |
|
|
313 | |
|
|
314 | for (p = nrow; p--; ) |
354 | { |
315 | { |
355 | if (screen.text[p]) |
316 | lresize (drawn[p]); |
|
|
317 | lresize (swap_save[p]); |
|
|
318 | } |
|
|
319 | |
|
|
320 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
|
|
321 | |
|
|
322 | delete old_ta; |
|
|
323 | delete old_ra; |
|
|
324 | } |
|
|
325 | |
|
|
326 | #if 0 |
|
|
327 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
|
|
328 | // to come up with a lean and mean algorithm. |
|
|
329 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
330 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
331 | |
|
|
332 | text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
|
|
333 | rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
|
|
334 | tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t)); |
|
|
335 | |
|
|
336 | for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D |
|
|
337 | |
|
|
338 | p = prev_total_rows; |
|
|
339 | q = total_rows; |
|
|
340 | |
|
|
341 | while (p > 0 && q > 0) |
|
|
342 | { |
|
|
343 | --p; |
|
|
344 | |
|
|
345 | printf ("pq %d:%d\n", p, q); |
|
|
346 | if (save[p].t) |
|
|
347 | { |
|
|
348 | int llen = save[p].l; |
|
|
349 | |
|
|
350 | assert (llen >= 0); |
|
|
351 | |
|
|
352 | while (p && save[p - 1].l < 0) |
356 | { |
353 | { |
357 | screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t)); |
354 | --p; |
358 | screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t)); |
|
|
359 | |
|
|
360 | MIN_IT (screen.tlen[p], (int16_t)ncol); |
|
|
361 | |
|
|
362 | if (ncol > prev_ncol) |
355 | llen += prev_ncol; |
363 | scr_blank_line (&screen.text[p][prev_ncol], |
356 | } |
364 | &screen.rend[p][prev_ncol], |
357 | |
365 | ncol - prev_ncol, setrstyle); |
358 | int qlines = llen / ncol + 1; |
|
|
359 | int lofs = 0; |
|
|
360 | |
|
|
361 | q -= qlines; |
|
|
362 | |
|
|
363 | int qrow = q; |
|
|
364 | |
|
|
365 | printf ("QL %d llen %d\n", qlines, llen);//D |
|
|
366 | for (; qlines--; qrow++) |
|
|
367 | { |
|
|
368 | if (qrow >= 0) |
|
|
369 | { |
|
|
370 | tp [qrow] = (text_t *)ta->alloc (); |
|
|
371 | rp [qrow] = (rend_t *)ra->alloc (); |
|
|
372 | tl [qrow] = LINE_CONT1; |
|
|
373 | |
|
|
374 | int qcol = 0; |
|
|
375 | |
|
|
376 | for (;;) |
|
|
377 | { |
|
|
378 | int prow = lofs / prev_ncol + p; |
|
|
379 | int pcol = lofs % prev_ncol; |
|
|
380 | |
|
|
381 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
|
|
382 | |
|
|
383 | printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol); |
|
|
384 | |
|
|
385 | if (len <= 0) |
|
|
386 | { |
|
|
387 | tl [qrow] = qcol; |
|
|
388 | |
|
|
389 | TODO |
|
|
390 | scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol, |
|
|
391 | ncol - qcol, DEFAULT_RSTYLE); |
|
|
392 | |
|
|
393 | break; |
|
|
394 | } |
|
|
395 | |
|
|
396 | assert (lofs < 1000); |
|
|
397 | |
|
|
398 | memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); |
|
|
399 | memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); |
|
|
400 | |
|
|
401 | lofs += len; |
|
|
402 | qcol += len; |
|
|
403 | |
|
|
404 | if (qcol == ncol) |
|
|
405 | break; |
|
|
406 | } |
|
|
407 | } |
|
|
408 | else |
|
|
409 | lofs += ncol; |
366 | } |
410 | } |
367 | } |
411 | } |
368 | |
|
|
369 | for (p = 0; p < nrow; p++) |
|
|
370 | { |
|
|
371 | drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t)); |
|
|
372 | drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t)); |
|
|
373 | |
|
|
374 | if (ncol > prev_ncol) |
|
|
375 | scr_blank_line (&drawn_text[p][prev_ncol], |
|
|
376 | &drawn_rend[p][prev_ncol], |
|
|
377 | ncol - prev_ncol, setrstyle); |
|
|
378 | |
|
|
379 | if (swap.text[p]) |
|
|
380 | { |
|
|
381 | swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t)); |
|
|
382 | swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t)); |
|
|
383 | |
|
|
384 | MIN_IT (swap.tlen[p], (int16_t)ncol); |
|
|
385 | |
|
|
386 | if (ncol > prev_ncol) |
|
|
387 | scr_blank_line (&swap.text[p][prev_ncol], |
|
|
388 | &swap.rend[p][prev_ncol], |
|
|
389 | ncol - prev_ncol, setrstyle); |
|
|
390 | } |
|
|
391 | |
|
|
392 | } |
412 | } |
393 | |
413 | |
394 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
414 | free (screen.text); screen.text = tp; |
|
|
415 | free (screen.rend); screen.rend = rp; |
|
|
416 | free (screen.tlen); screen.tlen = tl; |
395 | |
417 | |
396 | delete talloc; talloc = ta; |
418 | for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D |
397 | delete ralloc; ralloc = ra; |
419 | #endif |
398 | } |
|
|
399 | |
420 | |
400 | if (tabs) |
421 | if (tabs) |
401 | free (tabs); |
422 | free (tabs); |
402 | } |
423 | } |
403 | |
424 | |
… | |
… | |
413 | } |
434 | } |
414 | |
435 | |
415 | void |
436 | void |
416 | rxvt_term::scr_reset_realloc () |
437 | rxvt_term::scr_reset_realloc () |
417 | { |
438 | { |
418 | unsigned int total_rows, nrow; |
|
|
419 | |
|
|
420 | nrow = TermWin.nrow; |
|
|
421 | total_rows = nrow + TermWin.saveLines; |
|
|
422 | /* *INDENT-OFF* */ |
|
|
423 | screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); |
|
|
424 | buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *)); |
|
|
425 | drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *)); |
|
|
426 | swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *)); |
439 | swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t)); |
427 | |
440 | drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t)); |
428 | screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t)); |
441 | buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t)); |
429 | swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t)); |
442 | save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t)); |
430 | |
|
|
431 | screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *)); |
|
|
432 | buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *)); |
|
|
433 | drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *)); |
|
|
434 | swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *)); |
|
|
435 | /* *INDENT-ON* */ |
|
|
436 | } |
443 | } |
437 | |
444 | |
438 | /* ------------------------------------------------------------------------- */ |
445 | /* ------------------------------------------------------------------------- */ |
439 | /* |
446 | /* |
440 | * Free everything. That way malloc debugging can find leakage. |
447 | * Free everything. That way malloc debugging can find leakage. |
441 | */ |
448 | */ |
442 | void |
449 | void |
443 | rxvt_term::scr_release () |
450 | rxvt_term::scr_release () |
444 | { |
451 | { |
445 | unsigned int total_rows; |
|
|
446 | int i; |
|
|
447 | |
|
|
448 | total_rows = TermWin.nrow + TermWin.saveLines; |
|
|
449 | |
|
|
450 | delete talloc; talloc = 0; |
452 | delete talloc; talloc = 0; |
451 | delete ralloc; ralloc = 0; |
453 | delete ralloc; ralloc = 0; |
452 | |
454 | |
453 | free (screen.text); |
455 | free (save); |
454 | free (screen.tlen); |
456 | free (swap_save); |
455 | free (screen.rend); |
|
|
456 | free (drawn_text); |
457 | free (drawn); |
457 | free (drawn_rend); |
|
|
458 | free (swap.text); |
|
|
459 | free (swap.tlen); |
|
|
460 | free (swap.rend); |
|
|
461 | free (buf_text); |
458 | free (buf); |
462 | free (buf_rend); |
|
|
463 | free (tabs); |
459 | free (tabs); |
464 | |
|
|
465 | /* NULL these so if anything tries to use them, we'll know about it */ |
|
|
466 | screen.text = drawn_text = swap.text = NULL; |
|
|
467 | screen.rend = drawn_rend = swap.rend = NULL; |
|
|
468 | screen.tlen = swap.tlen = NULL; |
|
|
469 | buf_text = NULL; |
|
|
470 | buf_rend = NULL; |
|
|
471 | tabs = NULL; |
|
|
472 | } |
460 | } |
473 | |
461 | |
474 | /* ------------------------------------------------------------------------- */ |
462 | /* ------------------------------------------------------------------------- */ |
475 | /* |
463 | /* |
476 | * Hard reset |
464 | * Hard reset |
… | |
… | |
527 | set_font_style (); |
515 | set_font_style (); |
528 | break; |
516 | break; |
529 | } |
517 | } |
530 | |
518 | |
531 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
519 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
532 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
520 | MIN_IT (s->cur.row, nrow - 1); |
533 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
521 | MIN_IT (s->cur.col, ncol - 1); |
534 | #ifdef DEBUG_STRICT |
522 | #ifdef DEBUG_STRICT |
535 | assert (s->cur.row >= 0); |
523 | assert (s->cur.row >= 0); |
536 | assert (s->cur.col >= 0); |
524 | assert (s->cur.col >= 0); |
537 | #else /* drive with your eyes closed */ |
525 | #else /* drive with your eyes closed */ |
538 | MAX_IT (s->cur.row, 0); |
526 | MAX_IT (s->cur.row, 0); |
… | |
… | |
547 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
535 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
548 | */ |
536 | */ |
549 | int |
537 | int |
550 | rxvt_term::scr_change_screen (int scrn) |
538 | rxvt_term::scr_change_screen (int scrn) |
551 | { |
539 | { |
552 | int i; |
|
|
553 | #if NSCREENS |
|
|
554 | int offset; |
|
|
555 | #endif |
|
|
556 | |
|
|
557 | want_refresh = 1; |
540 | want_refresh = 1; |
558 | |
|
|
559 | TermWin.view_start = 0; |
541 | view_start = 0; |
560 | |
542 | |
561 | if (current_screen == scrn) |
543 | if (current_screen == scrn) |
562 | return scrn; |
544 | return scrn; |
563 | |
545 | |
564 | selection_check (2); /* check for boundary cross */ |
546 | selection_check (2); /* check for boundary cross */ |
565 | |
547 | |
566 | i = current_screen; current_screen = scrn; scrn = i; |
548 | int i = current_screen; current_screen = scrn; scrn = i; |
567 | |
549 | |
568 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
550 | ::swap (screen.cur.row, swap.cur.row); |
569 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
551 | ::swap (screen.cur.col, swap.cur.col); |
570 | MAX_IT (screen.cur.row, 0); |
552 | |
571 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
553 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
572 | MAX_IT (screen.cur.col, 0); |
554 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
573 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
|
|
574 | |
555 | |
575 | #if NSCREENS |
556 | #if NSCREENS |
576 | if (options & Opt_secondaryScreen) |
557 | if (options & Opt_secondaryScreen) |
577 | { |
558 | { |
578 | num_scr = 0; |
559 | num_scr = 0; |
579 | offset = TermWin.saveLines; |
|
|
580 | |
560 | |
581 | for (i = prev_nrow; i--;) |
561 | for (int i = nrow; i--; ) |
582 | { |
562 | ::swap (ROW(i), swap_save[i]); |
583 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
|
|
584 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
|
|
585 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
|
|
586 | } |
|
|
587 | |
563 | |
588 | SWAP_IT (screen.charset, swap.charset, int16_t); |
564 | ::swap (screen.charset, swap.charset); |
589 | SWAP_IT (screen.flags, swap.flags, int); |
565 | ::swap (screen.flags, swap.flags); |
590 | screen.flags |= Screen_VisibleCursor; |
566 | screen.flags |= Screen_VisibleCursor; |
591 | swap.flags |= Screen_VisibleCursor; |
567 | swap.flags |= Screen_VisibleCursor; |
592 | } |
568 | } |
593 | else |
569 | else |
594 | #endif |
570 | #endif |
595 | if (options & Opt_secondaryScroll) |
571 | if (options & Opt_secondaryScroll) |
596 | scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); |
572 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
597 | |
573 | |
598 | return scrn; |
574 | return scrn; |
599 | } |
575 | } |
600 | |
576 | |
601 | // clear WrapNext indicator, solidifying position on next line |
577 | // clear WrapNext indicator, solidifying position on next line |
… | |
… | |
608 | screen.flags &= ~Screen_WrapNext; |
584 | screen.flags &= ~Screen_WrapNext; |
609 | |
585 | |
610 | screen.cur.col = 0; |
586 | screen.cur.col = 0; |
611 | |
587 | |
612 | if (screen.cur.row == screen.bscroll) |
588 | if (screen.cur.row == screen.bscroll) |
613 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
589 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
614 | else if (screen.cur.row < TermWin.nrow - 1) |
590 | else if (screen.cur.row < nrow - 1) |
615 | screen.cur.row++; |
591 | screen.cur.row++; |
616 | } |
592 | } |
617 | |
593 | |
618 | /* ------------------------------------------------------------------------- */ |
594 | /* ------------------------------------------------------------------------- */ |
619 | /* |
595 | /* |
… | |
… | |
649 | /* ------------------------------------------------------------------------- */ |
625 | /* ------------------------------------------------------------------------- */ |
650 | /* |
626 | /* |
651 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
627 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
652 | * count positive ==> scroll up |
628 | * count positive ==> scroll up |
653 | * count negative ==> scroll down |
629 | * count negative ==> scroll down |
654 | * spec == 0 for normal routines |
|
|
655 | */ |
630 | */ |
656 | int |
631 | int |
657 | rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) |
632 | rxvt_term::scr_scroll_text (int row1, int row2, int count) |
658 | { |
633 | { |
659 | int i, j; |
|
|
660 | long nscrolled; |
|
|
661 | |
|
|
662 | if (count == 0 || (row1 > row2)) |
634 | if (count == 0 || (row1 > row2)) |
663 | return 0; |
635 | return 0; |
664 | |
636 | |
665 | want_refresh = 1; |
637 | want_refresh = 1; |
|
|
638 | num_scr += count; |
666 | |
639 | |
667 | if (row1 == 0 && count > 0 |
640 | if (count > 0 |
|
|
641 | && row1 == 0 |
|
|
642 | && row2 == nrow - 1 |
668 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
643 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
669 | { |
644 | { |
670 | nscrolled = (long)TermWin.nscrolled + (long)count; |
645 | nsaved = min (nsaved + count, saveLines); |
|
|
646 | term_start = (term_start + count) % total_rows; |
671 | |
647 | |
672 | if (nscrolled > (long)TermWin.saveLines) |
|
|
673 | TermWin.nscrolled = TermWin.saveLines; |
|
|
674 | else |
|
|
675 | TermWin.nscrolled = (unsigned int)nscrolled; |
|
|
676 | |
|
|
677 | if ((options & Opt_scrollWithBuffer) |
|
|
678 | && TermWin.view_start != 0 |
|
|
679 | && TermWin.view_start != TermWin.saveLines) |
|
|
680 | scr_page (UP, count); |
|
|
681 | } |
|
|
682 | else if (!spec) |
|
|
683 | row1 += TermWin.saveLines; |
|
|
684 | |
|
|
685 | row2 += TermWin.saveLines; |
|
|
686 | |
|
|
687 | if (selection.op && current_screen == selection.screen) |
648 | if (selection.op && current_screen == selection.screen) |
688 | { |
|
|
689 | i = selection.beg.row + TermWin.saveLines; |
|
|
690 | j = selection.end.row + TermWin.saveLines; |
|
|
691 | if ((i < row1 && j > row1) |
|
|
692 | || (i < row2 && j > row2) |
|
|
693 | || (i - count < row1 && i >= row1) |
|
|
694 | || (i - count > row2 && i <= row2) |
|
|
695 | || (j - count < row1 && j >= row1) |
|
|
696 | || (j - count > row2 && j <= row2)) |
|
|
697 | { |
|
|
698 | CLEAR_ALL_SELECTION (); |
|
|
699 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
|
|
700 | } |
649 | { |
701 | else if (j >= row1 && j <= row2) |
|
|
702 | { |
|
|
703 | /* move selected region too */ |
|
|
704 | selection.beg.row -= count; |
650 | selection.beg.row -= count; |
705 | selection.end.row -= count; |
651 | selection.end.row -= count; |
706 | selection.mark.row -= count; |
652 | selection.mark.row -= count; |
707 | } |
|
|
708 | } |
|
|
709 | |
653 | |
710 | selection_check (0); /* _after_ TermWin.nscrolled update */ |
654 | selection_check (0); |
711 | |
|
|
712 | num_scr += count; |
|
|
713 | j = count; |
|
|
714 | |
|
|
715 | if (count < 0) |
|
|
716 | count = -count; |
|
|
717 | |
|
|
718 | i = row2 - row1 + 1; |
|
|
719 | MIN_IT (count, i); |
|
|
720 | |
|
|
721 | if (j > 0) |
|
|
722 | { |
|
|
723 | /* scroll up */ |
|
|
724 | |
|
|
725 | /* Copy lines that will get clobbered by the rotation */ |
|
|
726 | memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); |
|
|
727 | memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); |
|
|
728 | |
|
|
729 | /* Rotate lines */ |
|
|
730 | i = row2 - row1 - count + 1; |
|
|
731 | memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); |
|
|
732 | memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); |
|
|
733 | memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); |
|
|
734 | |
|
|
735 | j = row2 - count + 1, i = count; |
|
|
736 | } |
|
|
737 | else /* if (j < 0) */ |
|
|
738 | { |
|
|
739 | /* scroll down */ |
|
|
740 | |
|
|
741 | /* Copy lines that will get clobbered by the rotation */ |
|
|
742 | for (i = 0, j = row2; i < count; i++, j--) |
|
|
743 | { |
655 | } |
744 | buf_text[i] = screen.text[j]; |
656 | |
745 | buf_rend[i] = screen.rend[j]; |
657 | for (int i = count; i--; ) |
|
|
658 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
|
|
659 | |
|
|
660 | if ((options & Opt_scrollWithBuffer) |
|
|
661 | && view_start != 0 |
|
|
662 | && view_start != saveLines) |
|
|
663 | scr_page (UP, count); |
|
|
664 | } |
|
|
665 | else |
|
|
666 | { |
|
|
667 | if (selection.op && current_screen == selection.screen) |
746 | } |
668 | { |
|
|
669 | int i = selection.beg.row; |
|
|
670 | int j = selection.end.row; |
747 | |
671 | |
748 | /* Rotate lines */ |
672 | if ((i < row1 && j > row1) |
749 | for (j = row2, i = j - count; i >= row1; i--, j--) |
673 | || (i < row2 && j > row2) |
|
|
674 | || (i - count < row1 && i >= row1) |
|
|
675 | || (i - count > row2 && i <= row2) |
|
|
676 | || (j - count < row1 && j >= row1) |
|
|
677 | || (j - count > row2 && j <= row2)) |
|
|
678 | { |
|
|
679 | CLEAR_ALL_SELECTION (); |
|
|
680 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
|
|
681 | } |
|
|
682 | else if (j >= row1 && j <= row2) |
|
|
683 | { |
|
|
684 | /* move selected region too */ |
|
|
685 | selection.beg.row -= count; |
|
|
686 | selection.end.row -= count; |
|
|
687 | selection.mark.row -= count; |
|
|
688 | |
|
|
689 | selection_check (0); |
|
|
690 | } |
750 | { |
691 | } |
751 | screen.tlen[j] = screen.tlen[i]; |
692 | |
752 | screen.text[j] = screen.text[i]; |
693 | // use a simple and robust scrolling algorithm, this |
753 | screen.rend[j] = screen.rend[i]; |
694 | // part of scr_scroll_text is not time-critical. |
|
|
695 | |
|
|
696 | int rows = row2 - row1 + 1; |
|
|
697 | |
|
|
698 | for (int row = 0; row < rows; row++) |
754 | } |
699 | { |
|
|
700 | buf [row] = ROW(row1 + (row + count + rows) % rows); |
755 | |
701 | |
756 | j = row1, i = count; |
702 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
757 | count = -count; |
703 | scr_blank_screen_mem (buf [row], rstyle); |
758 | } |
704 | } |
759 | |
705 | |
760 | /* Resurrect lines */ |
706 | for (int row = 0; row < rows; row++) |
761 | memset (screen.tlen + j, 0, i * sizeof (int16_t)); |
707 | ROW(row1 + row) = buf [row]; |
762 | memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); |
708 | } |
763 | memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); |
|
|
764 | if (!spec) /* line length may not equal TermWin.ncol */ |
|
|
765 | for (; i--; j++) |
|
|
766 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); |
|
|
767 | |
709 | |
768 | return count; |
710 | return count; |
769 | } |
711 | } |
770 | |
712 | |
771 | /* ------------------------------------------------------------------------- */ |
713 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
778 | if (len <= 0) /* sanity */ |
720 | if (len <= 0) /* sanity */ |
779 | return; |
721 | return; |
780 | |
722 | |
781 | unsigned char checksel; |
723 | unsigned char checksel; |
782 | unicode_t c; |
724 | unicode_t c; |
783 | int i, row, last_col; |
725 | int row, last_col; |
784 | text_t *stp; |
|
|
785 | rend_t *srp; |
|
|
786 | const unicode_t *strend = str + len; |
726 | const unicode_t *strend = str + len; |
787 | |
727 | |
788 | want_refresh = 1; |
728 | want_refresh = 1; |
789 | ZERO_SCROLLBACK (); |
729 | ZERO_SCROLLBACK (); |
790 | last_col = TermWin.ncol; |
730 | last_col = ncol; |
791 | |
731 | |
792 | if (nlines > 0) |
732 | if (nlines > 0) |
793 | { |
733 | { |
794 | nlines += screen.cur.row - screen.bscroll; |
734 | nlines += screen.cur.row - screen.bscroll; |
795 | if ((nlines > 0) |
735 | if ((nlines > 0) |
796 | && (screen.tscroll == 0) |
736 | && (screen.tscroll == 0) |
797 | && (screen.bscroll == (TermWin.nrow - 1))) |
737 | && (screen.bscroll == (nrow - 1))) |
798 | { |
738 | { |
799 | /* _at least_ this many lines need to be scrolled */ |
739 | /* _at least_ this many lines need to be scrolled */ |
800 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
740 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines); |
801 | screen.cur.row -= nlines; |
741 | screen.cur.row -= nlines; |
802 | } |
742 | } |
803 | } |
743 | } |
804 | |
744 | |
805 | #ifdef DEBUG_STRICT |
745 | #ifdef DEBUG_STRICT |
806 | assert (screen.cur.col < last_col); |
746 | assert (screen.cur.col < last_col); |
807 | assert ((screen.cur.row < TermWin.nrow) |
747 | assert ((screen.cur.row < nrow) |
808 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
748 | && (screen.cur.row >= - (int32_t)nsaved)); |
809 | #else /* drive with your eyes closed */ |
749 | #else /* drive with your eyes closed */ |
810 | MIN_IT (screen.cur.col, last_col - 1); |
750 | MIN_IT (screen.cur.col, last_col - 1); |
811 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
751 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
812 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
752 | MAX_IT (screen.cur.row, - (int32_t)nsaved); |
813 | #endif |
753 | #endif |
814 | row = screen.cur.row + TermWin.saveLines; |
754 | row = screen.cur.row; |
815 | |
755 | |
816 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
756 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
817 | |
757 | |
818 | stp = screen.text[row]; |
758 | line_t *line = &ROW(row); |
819 | srp = screen.rend[row]; |
|
|
820 | |
759 | |
821 | while (str < strend) |
760 | while (str < strend) |
822 | { |
761 | { |
823 | c = *str++; |
762 | c = *str++; |
824 | |
763 | |
825 | if (c < 0x20) |
764 | if (c < 0x20) |
826 | if (c == C0_LF) |
765 | if (c == C0_LF) |
827 | { |
766 | { |
828 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
767 | if (!line->is_longer ()) /* XXX: think about this */ |
829 | MAX_IT (screen.tlen[row], screen.cur.col); |
768 | MAX_IT (line->l, screen.cur.col); |
830 | |
769 | |
831 | screen.flags &= ~Screen_WrapNext; |
770 | screen.flags &= ~Screen_WrapNext; |
832 | |
771 | |
833 | if (screen.cur.row == screen.bscroll) |
772 | if (screen.cur.row == screen.bscroll) |
834 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
773 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
835 | else if (screen.cur.row < (TermWin.nrow - 1)) |
774 | else if (screen.cur.row < (nrow - 1)) |
836 | row = (++screen.cur.row) + TermWin.saveLines; |
775 | row = ++screen.cur.row; |
837 | |
776 | |
838 | stp = screen.text[row]; /* _must_ refresh */ |
777 | line = &ROW(row); /* _must_ refresh */ |
839 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
840 | continue; |
778 | continue; |
841 | } |
779 | } |
842 | else if (c == C0_CR) |
780 | else if (c == C0_CR) |
843 | { |
781 | { |
844 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
782 | if (!line->is_longer ()) /* XXX: think about this */ |
845 | MAX_IT (screen.tlen[row], screen.cur.col); |
783 | MAX_IT (line->l, screen.cur.col); |
846 | |
784 | |
847 | screen.flags &= ~Screen_WrapNext; |
785 | screen.flags &= ~Screen_WrapNext; |
848 | screen.cur.col = 0; |
786 | screen.cur.col = 0; |
849 | continue; |
787 | continue; |
850 | } |
788 | } |
… | |
… | |
867 | CLEAR_SELECTION (); |
805 | CLEAR_SELECTION (); |
868 | } |
806 | } |
869 | |
807 | |
870 | if (screen.flags & Screen_WrapNext) |
808 | if (screen.flags & Screen_WrapNext) |
871 | { |
809 | { |
872 | screen.tlen[row] = -1; |
810 | line->set_is_longer (); |
873 | |
811 | |
874 | scr_do_wrap (); |
812 | scr_do_wrap (); |
875 | |
813 | |
876 | row = screen.cur.row + TermWin.saveLines; |
814 | row = screen.cur.row; |
877 | stp = screen.text[row]; /* _must_ refresh */ |
815 | line = &ROW(row); /* _must_ refresh */ |
878 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
879 | } |
816 | } |
880 | |
817 | |
881 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
818 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
882 | if (IN_RANGE (c, 0xd800, 0xdfff)) |
819 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
883 | c = 0xfffd; |
820 | c = 0xfffd; |
884 | |
821 | |
885 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
822 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
886 | // do wcwidth before further replacements, as wcwidth might return -1 |
823 | // do wcwidth before further replacements, as wcwidth might return -1 |
887 | // for the line drawing characters below as they might be invalid in the current |
824 | // for the line drawing characters below as they might be invalid in the current |
… | |
… | |
925 | c = 0xfffd; |
862 | c = 0xfffd; |
926 | # endif |
863 | # endif |
927 | #endif |
864 | #endif |
928 | |
865 | |
929 | // nuke the character at this position, if required |
866 | // nuke the character at this position, if required |
930 | if (stp[screen.cur.col] == NOCHAR |
867 | if (line->t[screen.cur.col] == NOCHAR |
931 | || (screen.cur.col < TermWin.ncol - 1 |
868 | || (screen.cur.col < ncol - 1 |
932 | && stp[screen.cur.col + 1] == NOCHAR)) |
869 | && line->t[screen.cur.col + 1] == NOCHAR)) |
933 | { |
870 | { |
934 | int col = screen.cur.col; |
871 | int col = screen.cur.col; |
935 | |
872 | |
936 | // find begin |
873 | // find begin |
937 | while (col > 0 && stp[col] == NOCHAR) |
874 | while (col > 0 && line->t[col] == NOCHAR) |
938 | col--; |
875 | col--; |
939 | |
876 | |
940 | rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); |
877 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
941 | |
878 | |
942 | // found begin, nuke |
879 | // found begin, nuke |
943 | do { |
880 | do { |
944 | stp[col] = ' '; |
881 | line->t[col] = ' '; |
945 | srp[col] = rend; |
882 | line->r[col] = rend; |
946 | col++; |
883 | col++; |
947 | } while (col < TermWin.ncol && stp[col] == NOCHAR); |
884 | } while (col < ncol && line->t[col] == NOCHAR); |
948 | } |
885 | } |
949 | |
886 | |
950 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
887 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
951 | |
888 | |
952 | // if the character doesn't fit into the remaining columns... |
889 | // if the character doesn't fit into the remaining columns... |
… | |
… | |
958 | --str; |
895 | --str; |
959 | } |
896 | } |
960 | |
897 | |
961 | do |
898 | do |
962 | { |
899 | { |
963 | stp[screen.cur.col] = c; |
900 | line->t[screen.cur.col] = c; |
964 | srp[screen.cur.col] = rend; |
901 | line->r[screen.cur.col] = rend; |
965 | |
902 | |
966 | if (screen.cur.col < last_col - 1) |
903 | if (screen.cur.col < last_col - 1) |
967 | screen.cur.col++; |
904 | screen.cur.col++; |
968 | else |
905 | else |
969 | { |
906 | { |
970 | screen.tlen[row] = last_col; |
907 | line->l = last_col; |
971 | if (screen.flags & Screen_Autowrap) |
908 | if (screen.flags & Screen_Autowrap) |
972 | screen.flags |= Screen_WrapNext; |
909 | screen.flags |= Screen_WrapNext; |
973 | break; |
910 | break; |
974 | } |
911 | } |
975 | |
912 | |
… | |
… | |
977 | } |
914 | } |
978 | while (--width > 0); |
915 | while (--width > 0); |
979 | |
916 | |
980 | // pad with spaces when overwriting wide character with smaller one |
917 | // pad with spaces when overwriting wide character with smaller one |
981 | if (!width) |
918 | if (!width) |
982 | for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) |
919 | for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) |
983 | { |
920 | { |
984 | stp[c] = ' '; |
921 | line->t[c] = ' '; |
985 | srp[c] = rend; |
922 | line->r[c] = rend; |
986 | } |
923 | } |
987 | } |
924 | } |
988 | else // width == 0 |
925 | else // width == 0 |
989 | { |
926 | { |
990 | #if ENABLE_COMBINING |
927 | #if ENABLE_COMBINING |
… | |
… | |
995 | text_t *tp; |
932 | text_t *tp; |
996 | rend_t *rp; |
933 | rend_t *rp; |
997 | |
934 | |
998 | if (screen.cur.col > 0) |
935 | if (screen.cur.col > 0) |
999 | { |
936 | { |
1000 | tp = stp + screen.cur.col - 1; |
937 | tp = line->t + screen.cur.col - 1; |
1001 | rp = srp + screen.cur.col - 1; |
938 | rp = line->r + screen.cur.col - 1; |
1002 | |
939 | |
1003 | while (*tp == NOCHAR && tp > stp) |
940 | while (*tp == NOCHAR && tp > line->t) |
1004 | tp--, rp--; |
941 | tp--, rp--; |
1005 | } |
942 | } |
1006 | else if (screen.cur.row > 0 |
943 | else if (screen.cur.row > 0 |
1007 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
944 | && ROW(screen.cur.row - 1).is_longer ()) |
1008 | { |
945 | { |
1009 | int line = screen.cur.row - 1 + TermWin.saveLines; |
946 | line_t *line = &ROW(screen.cur.row - 1); |
1010 | |
947 | |
1011 | tp = screen.text[line] + last_col - 1; |
948 | tp = line->t + last_col - 1; |
1012 | rp = screen.rend[line] + last_col - 1; |
949 | rp = line->r + last_col - 1; |
1013 | |
950 | |
1014 | while (*tp == NOCHAR && tp > screen.text[line]) |
951 | while (*tp == NOCHAR && tp > line->t) |
1015 | tp--, rp--; |
952 | tp--, rp--; |
1016 | } |
953 | } |
1017 | else |
954 | else |
1018 | continue; |
955 | continue; |
1019 | |
956 | |
… | |
… | |
1026 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
963 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
1027 | #endif |
964 | #endif |
1028 | } |
965 | } |
1029 | } |
966 | } |
1030 | |
967 | |
1031 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
968 | if (!line->is_longer ()) /* XXX: think about this */ |
1032 | MAX_IT (screen.tlen[row], screen.cur.col); |
969 | MAX_IT (line->l, screen.cur.col); |
1033 | |
970 | |
1034 | #ifdef DEBUG_STRICT |
971 | #ifdef DEBUG_STRICT |
1035 | assert (screen.cur.row >= 0); |
972 | assert (screen.cur.row >= 0); |
1036 | #else /* drive with your eyes closed */ |
973 | #else /* drive with your eyes closed */ |
1037 | MAX_IT (screen.cur.row, 0); |
974 | MAX_IT (screen.cur.row, 0); |
… | |
… | |
1051 | if (screen.cur.col == 0) |
988 | if (screen.cur.col == 0) |
1052 | { |
989 | { |
1053 | if (screen.cur.row > 0) |
990 | if (screen.cur.row > 0) |
1054 | { |
991 | { |
1055 | #ifdef TERMCAP_HAS_BW |
992 | #ifdef TERMCAP_HAS_BW |
1056 | screen.cur.col = TermWin.ncol - 1; |
993 | screen.cur.col = ncol - 1; |
1057 | screen.cur.row--; |
994 | screen.cur.row--; |
1058 | return; |
995 | return; |
1059 | #endif |
996 | #endif |
1060 | } |
997 | } |
1061 | } |
998 | } |
… | |
… | |
1081 | |
1018 | |
1082 | if (count == 0) |
1019 | if (count == 0) |
1083 | return; |
1020 | return; |
1084 | else if (count > 0) |
1021 | else if (count > 0) |
1085 | { |
1022 | { |
1086 | int row = TermWin.saveLines + screen.cur.row; |
1023 | int row = screen.cur.row; |
1087 | text_t *tp = screen.text[row]; |
1024 | |
1088 | rend_t *rp = screen.rend[row]; |
1025 | line_t &l = ROW(row); |
1089 | rend_t base_rend = rp[i]; |
1026 | rend_t base_rend = l.r[i]; |
1090 | ht &= tp[i] == ' '; |
1027 | ht &= l.t[i] == ' '; |
1091 | |
1028 | |
1092 | for (; ++i < TermWin.ncol; ) |
1029 | for (; ++i < ncol; ) |
1093 | if (tabs[i]) |
1030 | if (tabs[i]) |
1094 | { |
1031 | { |
1095 | x = i; |
1032 | x = i; |
1096 | if (!--count) |
1033 | if (!--count) |
1097 | break; |
1034 | break; |
1098 | } |
1035 | } |
1099 | else |
1036 | else |
1100 | ht &= tp[i] == ' ' |
1037 | ht &= l.t[i] == ' ' |
1101 | && RS_SAME (rp[i], base_rend); |
1038 | && RS_SAME (l.r[i], base_rend); |
1102 | |
1039 | |
1103 | if (count) |
1040 | if (count) |
1104 | x = TermWin.ncol - 1; |
1041 | x = ncol - 1; |
1105 | |
1042 | |
1106 | // store horizontal tab commands as characters inside the text |
1043 | // store horizontal tab commands as characters inside the text |
1107 | // buffer so they can be selected and pasted. |
1044 | // buffer so they can be selected and pasted. |
1108 | if (ht && options & Opt_pastableTabs) |
1045 | if (ht && options & Opt_pastableTabs) |
1109 | { |
1046 | { |
1110 | base_rend = SET_FONT (base_rend, 0); |
1047 | base_rend = SET_FONT (base_rend, 0); |
1111 | |
1048 | |
1112 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
1049 | if (!l.is_longer ()) /* XXX: think about this */ |
1113 | MAX_IT (screen.tlen[row], x); |
1050 | MAX_IT (l.l, x); |
1114 | |
1051 | |
1115 | i = screen.cur.col; |
1052 | i = screen.cur.col; |
1116 | |
1053 | |
1117 | tp[i] = '\t'; |
1054 | l.t[i] = '\t'; |
1118 | rp[i] = base_rend; |
1055 | l.r[i] = base_rend; |
1119 | |
1056 | |
1120 | while (++i < x) |
1057 | while (++i < x) |
1121 | { |
1058 | { |
1122 | tp[i] = NOCHAR; |
1059 | l.t[i] = NOCHAR; |
1123 | rp[i] = base_rend; |
1060 | l.r[i] = base_rend; |
1124 | } |
1061 | } |
1125 | } |
1062 | } |
1126 | } |
1063 | } |
1127 | else /* if (count < 0) */ |
1064 | else /* if (count < 0) */ |
1128 | { |
1065 | { |
… | |
… | |
1154 | rxvt_term::scr_backindex () |
1091 | rxvt_term::scr_backindex () |
1155 | { |
1092 | { |
1156 | if (screen.cur.col > 0) |
1093 | if (screen.cur.col > 0) |
1157 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1094 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1158 | else |
1095 | else |
1159 | { |
|
|
1160 | if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) |
|
|
1161 | return; /* um, yeah? */ |
|
|
1162 | |
|
|
1163 | scr_insdel_chars (1, INSERT); |
1096 | scr_insdel_chars (1, INSERT); |
1164 | } |
|
|
1165 | } |
1097 | } |
1166 | #endif |
1098 | #endif |
1167 | /* ------------------------------------------------------------------------- */ |
1099 | /* ------------------------------------------------------------------------- */ |
1168 | /* |
1100 | /* |
1169 | * Process DEC Forward Index |
1101 | * Process DEC Forward Index |
… | |
… | |
1175 | void |
1107 | void |
1176 | rxvt_term::scr_forwardindex () |
1108 | rxvt_term::scr_forwardindex () |
1177 | { |
1109 | { |
1178 | int row; |
1110 | int row; |
1179 | |
1111 | |
1180 | if (screen.cur.col < TermWin.ncol - 1) |
1112 | if (screen.cur.col < ncol - 1) |
1181 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1113 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1182 | else |
1114 | else |
1183 | { |
1115 | { |
1184 | row = screen.cur.row + TermWin.saveLines; |
1116 | row = screen.cur.row; |
1185 | |
1117 | |
1186 | if (screen.tlen[row] == 0) |
1118 | if (ROW(row).is_longer ()) //TODO//FIXME//LEN |
1187 | return; /* um, yeah? */ |
1119 | ROW(row).l = ncol; |
1188 | else if (screen.tlen[row] == -1) |
|
|
1189 | screen.tlen[row] = TermWin.ncol; |
|
|
1190 | |
1120 | |
1191 | scr_gotorc (0, 0, R_RELATIVE); |
1121 | scr_gotorc (0, 0, R_RELATIVE); |
1192 | scr_insdel_chars (1, DELETE); |
1122 | scr_insdel_chars (1, DELETE); |
1193 | scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); |
1123 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1194 | } |
1124 | } |
1195 | } |
1125 | } |
1196 | #endif |
1126 | #endif |
1197 | |
1127 | |
1198 | /* ------------------------------------------------------------------------- */ |
1128 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1205 | want_refresh = 1; |
1135 | want_refresh = 1; |
1206 | ZERO_SCROLLBACK (); |
1136 | ZERO_SCROLLBACK (); |
1207 | |
1137 | |
1208 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1138 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1209 | MAX_IT (screen.cur.col, 0); |
1139 | MAX_IT (screen.cur.col, 0); |
1210 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1140 | MIN_IT (screen.cur.col, (int32_t)ncol - 1); |
1211 | |
1141 | |
1212 | screen.flags &= ~Screen_WrapNext; |
1142 | screen.flags &= ~Screen_WrapNext; |
1213 | |
1143 | |
1214 | if (relative & R_RELATIVE) |
1144 | if (relative & R_RELATIVE) |
1215 | { |
1145 | { |
… | |
… | |
1240 | else |
1170 | else |
1241 | screen.cur.row = row; |
1171 | screen.cur.row = row; |
1242 | } |
1172 | } |
1243 | |
1173 | |
1244 | MAX_IT (screen.cur.row, 0); |
1174 | MAX_IT (screen.cur.row, 0); |
1245 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1175 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
1246 | } |
1176 | } |
1247 | |
1177 | |
1248 | /* ------------------------------------------------------------------------- */ |
1178 | /* ------------------------------------------------------------------------- */ |
1249 | /* |
1179 | /* |
1250 | * direction should be UP or DN |
1180 | * direction should be UP or DN |
… | |
… | |
1261 | |
1191 | |
1262 | screen.flags &= ~Screen_WrapNext; |
1192 | screen.flags &= ~Screen_WrapNext; |
1263 | |
1193 | |
1264 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1194 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1265 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1195 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1266 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1196 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn); |
1267 | else |
1197 | else |
1268 | screen.cur.row += dirn; |
1198 | screen.cur.row += dirn; |
1269 | |
1199 | |
1270 | MAX_IT (screen.cur.row, 0); |
1200 | MAX_IT (screen.cur.row, 0); |
1271 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1201 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
1272 | selection_check (0); |
1202 | selection_check (0); |
1273 | } |
1203 | } |
1274 | |
1204 | |
1275 | /* ------------------------------------------------------------------------- */ |
1205 | /* ------------------------------------------------------------------------- */ |
1276 | /* |
1206 | /* |
… | |
… | |
1287 | want_refresh = 1; |
1217 | want_refresh = 1; |
1288 | ZERO_SCROLLBACK (); |
1218 | ZERO_SCROLLBACK (); |
1289 | |
1219 | |
1290 | selection_check (1); |
1220 | selection_check (1); |
1291 | |
1221 | |
1292 | row = TermWin.saveLines + screen.cur.row; |
1222 | row = screen.cur.row; |
|
|
1223 | |
1293 | switch (mode) |
1224 | switch (mode) |
1294 | { |
1225 | { |
1295 | case 0: /* erase to end of line */ |
1226 | case 0: /* erase to end of line */ |
1296 | col = screen.cur.col; |
1227 | col = screen.cur.col; |
1297 | num = TermWin.ncol - col; |
1228 | num = ncol - col; |
1298 | MIN_IT (screen.tlen[row], (int16_t)col); |
1229 | MIN_IT (ROW(row).l, (int16_t)col); |
1299 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1230 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1300 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1231 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1301 | CLEAR_SELECTION (); |
1232 | CLEAR_SELECTION (); |
1302 | break; |
1233 | break; |
1303 | case 1: /* erase to beginning of line */ |
1234 | case 1: /* erase to beginning of line */ |
… | |
… | |
1307 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1238 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1308 | CLEAR_SELECTION (); |
1239 | CLEAR_SELECTION (); |
1309 | break; |
1240 | break; |
1310 | case 2: /* erase whole line */ |
1241 | case 2: /* erase whole line */ |
1311 | col = 0; |
1242 | col = 0; |
1312 | num = TermWin.ncol; |
1243 | num = ncol; |
1313 | screen.tlen[row] = 0; |
1244 | ROW(row).l = 0; |
1314 | if (selection.beg.row <= screen.cur.row |
1245 | if (selection.beg.row <= screen.cur.row |
1315 | && selection.end.row >= screen.cur.row) |
1246 | && selection.end.row >= screen.cur.row) |
1316 | CLEAR_SELECTION (); |
1247 | CLEAR_SELECTION (); |
1317 | break; |
1248 | break; |
1318 | default: |
1249 | default: |
1319 | return; |
1250 | return; |
1320 | } |
1251 | } |
1321 | |
1252 | |
1322 | if (screen.text[row]) |
1253 | scr_blank_line (ROW(row), col, num, rstyle); |
1323 | scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle); |
|
|
1324 | else |
|
|
1325 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
|
|
1326 | } |
1254 | } |
1327 | |
1255 | |
1328 | /* ------------------------------------------------------------------------- */ |
1256 | /* ------------------------------------------------------------------------- */ |
1329 | /* |
1257 | /* |
1330 | * Erase part of whole of the screen |
1258 | * Erase part of whole of the screen |
… | |
… | |
1334 | */ |
1262 | */ |
1335 | void |
1263 | void |
1336 | rxvt_term::scr_erase_screen (int mode) |
1264 | rxvt_term::scr_erase_screen (int mode) |
1337 | { |
1265 | { |
1338 | int num; |
1266 | int num; |
1339 | int32_t row, row_offset; |
1267 | int32_t row; |
1340 | rend_t ren; |
1268 | rend_t ren; |
1341 | XGCValues gcvalue; |
1269 | XGCValues gcvalue; |
1342 | |
1270 | |
1343 | want_refresh = 1; |
1271 | want_refresh = 1; |
1344 | ZERO_SCROLLBACK (); |
1272 | ZERO_SCROLLBACK (); |
1345 | |
|
|
1346 | row_offset = (int32_t)TermWin.saveLines; |
|
|
1347 | |
1273 | |
1348 | switch (mode) |
1274 | switch (mode) |
1349 | { |
1275 | { |
1350 | case 0: /* erase to end of screen */ |
1276 | case 0: /* erase to end of screen */ |
1351 | selection_check (1); |
1277 | selection_check (1); |
1352 | scr_erase_line (0); |
1278 | scr_erase_line (0); |
1353 | row = screen.cur.row + 1; /* possible OOB */ |
1279 | row = screen.cur.row + 1; /* possible OOB */ |
1354 | num = TermWin.nrow - row; |
1280 | num = nrow - row; |
1355 | break; |
1281 | break; |
1356 | case 1: /* erase to beginning of screen */ |
1282 | case 1: /* erase to beginning of screen */ |
1357 | selection_check (3); |
1283 | selection_check (3); |
1358 | scr_erase_line (1); |
1284 | scr_erase_line (1); |
1359 | row = 0; |
1285 | row = 0; |
1360 | num = screen.cur.row; |
1286 | num = screen.cur.row; |
1361 | break; |
1287 | break; |
1362 | case 2: /* erase whole screen */ |
1288 | case 2: /* erase whole screen */ |
1363 | selection_check (3); |
1289 | selection_check (3); |
1364 | row = 0; |
1290 | row = 0; |
1365 | num = TermWin.nrow; |
1291 | num = nrow; |
1366 | break; |
1292 | break; |
1367 | default: |
1293 | default: |
1368 | return; |
1294 | return; |
1369 | } |
1295 | } |
1370 | |
1296 | |
… | |
… | |
1372 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1298 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1373 | || (selection.end.row >= row |
1299 | || (selection.end.row >= row |
1374 | && selection.end.row <= row + num))) |
1300 | && selection.end.row <= row + num))) |
1375 | CLEAR_SELECTION (); |
1301 | CLEAR_SELECTION (); |
1376 | |
1302 | |
1377 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1303 | if (row >= nrow) /* Out Of Bounds */ |
1378 | return; |
1304 | return; |
1379 | |
1305 | |
1380 | MIN_IT (num, (TermWin.nrow - row)); |
1306 | MIN_IT (num, (nrow - row)); |
1381 | |
1307 | |
1382 | if (rstyle & (RS_RVid | RS_Uline)) |
1308 | if (rstyle & (RS_RVid | RS_Uline)) |
1383 | ren = (rend_t) ~RS_None; |
1309 | ren = (rend_t) ~RS_None; |
1384 | else if (GET_BASEBG (rstyle) == Color_bg) |
1310 | else if (GET_BASEBG (rstyle) == Color_bg) |
1385 | { |
1311 | { |
… | |
… | |
1388 | } |
1314 | } |
1389 | else |
1315 | else |
1390 | { |
1316 | { |
1391 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1317 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1392 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1318 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1393 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1319 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1394 | ERASE_ROWS (row, num); |
1320 | ERASE_ROWS (row, num); |
1395 | gcvalue.foreground = pix_colors[Color_fg]; |
1321 | gcvalue.foreground = pix_colors[Color_fg]; |
1396 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1322 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1397 | } |
1323 | } |
1398 | |
1324 | |
1399 | for (; num--; row++) |
1325 | for (; num--; row++) |
1400 | { |
1326 | { |
1401 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); |
1327 | scr_blank_screen_mem (ROW (row), rstyle); |
1402 | screen.tlen[row + row_offset] = 0; |
1328 | ROW (row).l = 0; |
1403 | scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); |
1329 | scr_blank_line (drawn[row], 0, ncol, ren); |
1404 | } |
1330 | } |
1405 | } |
1331 | } |
1406 | |
1332 | |
1407 | #if ENABLE_FRILLS |
1333 | #if ENABLE_FRILLS |
1408 | void |
1334 | void |
1409 | rxvt_term::scr_erase_savelines () |
1335 | rxvt_term::scr_erase_savelines () |
1410 | { |
1336 | { |
1411 | want_refresh = 1; |
1337 | want_refresh = 1; |
1412 | ZERO_SCROLLBACK (); |
1338 | ZERO_SCROLLBACK (); |
1413 | |
1339 | |
1414 | TermWin.nscrolled = 0; |
1340 | nsaved = 0; |
1415 | } |
1341 | } |
1416 | #endif |
1342 | #endif |
1417 | |
1343 | |
1418 | /* ------------------------------------------------------------------------- */ |
1344 | /* ------------------------------------------------------------------------- */ |
1419 | /* |
1345 | /* |
… | |
… | |
1421 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1347 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1422 | */ |
1348 | */ |
1423 | void |
1349 | void |
1424 | rxvt_term::scr_E () |
1350 | rxvt_term::scr_E () |
1425 | { |
1351 | { |
1426 | int i, j, k; |
|
|
1427 | rend_t *r1, fs; |
1352 | rend_t fs; |
1428 | |
1353 | |
1429 | want_refresh = 1; |
1354 | want_refresh = 1; |
1430 | ZERO_SCROLLBACK (); |
1355 | ZERO_SCROLLBACK (); |
1431 | |
1356 | |
1432 | num_scr_allow = 0; |
1357 | num_scr_allow = 0; |
1433 | selection_check (3); |
1358 | selection_check (3); |
1434 | |
1359 | |
1435 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1360 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1436 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1361 | for (int row = nrow; row--; ) |
1437 | { |
1362 | { |
1438 | screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ |
1363 | line_t &line = ROW(row); |
|
|
1364 | |
1439 | fill_text (screen.text[k], 'E', TermWin.ncol); |
1365 | fill_text (line.t, 'E', ncol); |
1440 | for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) |
1366 | rend_t *r1 = line.r; |
|
|
1367 | |
|
|
1368 | for (int j = ncol; j--; ) |
1441 | *r1++ = fs; |
1369 | *r1++ = fs; |
|
|
1370 | |
|
|
1371 | line.l = ncol; /* make the `E's selectable */ |
1442 | } |
1372 | } |
1443 | } |
1373 | } |
1444 | |
1374 | |
1445 | /* ------------------------------------------------------------------------- */ |
1375 | /* ------------------------------------------------------------------------- */ |
1446 | /* |
1376 | /* |
… | |
… | |
1467 | count = end; |
1397 | count = end; |
1468 | } |
1398 | } |
1469 | |
1399 | |
1470 | scr_do_wrap (); |
1400 | scr_do_wrap (); |
1471 | |
1401 | |
1472 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); |
1402 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count); |
1473 | } |
1403 | } |
1474 | |
1404 | |
1475 | /* ------------------------------------------------------------------------- */ |
1405 | /* ------------------------------------------------------------------------- */ |
1476 | /* |
1406 | /* |
1477 | * Insert/Delete <count> characters from the current position |
1407 | * Insert/Delete <count> characters from the current position |
… | |
… | |
1479 | void |
1409 | void |
1480 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1410 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1481 | { |
1411 | { |
1482 | int col, row; |
1412 | int col, row; |
1483 | rend_t tr; |
1413 | rend_t tr; |
1484 | text_t *stp; |
|
|
1485 | rend_t *srp; |
|
|
1486 | int16_t *slp; |
|
|
1487 | |
1414 | |
1488 | want_refresh = 1; |
1415 | want_refresh = 1; |
1489 | ZERO_SCROLLBACK (); |
1416 | ZERO_SCROLLBACK (); |
1490 | |
1417 | |
1491 | if (count <= 0) |
1418 | if (count <= 0) |
1492 | return; |
1419 | return; |
1493 | |
1420 | |
1494 | scr_do_wrap (); |
1421 | scr_do_wrap (); |
1495 | |
1422 | |
1496 | selection_check (1); |
1423 | selection_check (1); |
1497 | MIN_IT (count, (TermWin.ncol - screen.cur.col)); |
1424 | MIN_IT (count, (ncol - screen.cur.col)); |
1498 | |
1425 | |
1499 | row = screen.cur.row + TermWin.saveLines; |
|
|
1500 | |
|
|
1501 | stp = screen.text[row]; |
|
|
1502 | srp = screen.rend[row]; |
1426 | row = screen.cur.row; |
1503 | slp = &screen.tlen[row]; |
1427 | |
|
|
1428 | line_t *line = &ROW(row); |
1504 | |
1429 | |
1505 | switch (insdel) |
1430 | switch (insdel) |
1506 | { |
1431 | { |
1507 | case INSERT: |
1432 | case INSERT: |
1508 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) |
1433 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1509 | { |
1434 | { |
1510 | stp[col] = stp[col - count]; |
1435 | line->t[col] = line->t[col - count]; |
1511 | srp[col] = srp[col - count]; |
1436 | line->r[col] = line->r[col - count]; |
1512 | } |
1437 | } |
1513 | |
1438 | |
1514 | if (*slp != -1) |
1439 | if (!line->is_longer ()) |
1515 | { |
1440 | { |
1516 | *slp += count; |
1441 | line->l += count; |
1517 | MIN_IT (*slp, TermWin.ncol); |
1442 | MIN_IT (line->l, ncol); |
1518 | } |
1443 | } |
1519 | |
1444 | |
1520 | if (selection.op && current_screen == selection.screen |
1445 | if (selection.op && current_screen == selection.screen |
1521 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1446 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1522 | { |
1447 | { |
1523 | if (selection.end.row != screen.cur.row |
1448 | if (selection.end.row != screen.cur.row |
1524 | || (selection.end.col + count >= TermWin.ncol)) |
1449 | || (selection.end.col + count >= ncol)) |
1525 | CLEAR_SELECTION (); |
1450 | CLEAR_SELECTION (); |
1526 | else |
1451 | else |
1527 | { /* shift selection */ |
1452 | { /* shift selection */ |
1528 | selection.beg.col += count; |
1453 | selection.beg.col += count; |
1529 | selection.mark.col += count; /* XXX: yes? */ |
1454 | selection.mark.col += count; /* XXX: yes? */ |
1530 | selection.end.col += count; |
1455 | selection.end.col += count; |
1531 | } |
1456 | } |
1532 | } |
1457 | } |
1533 | |
1458 | |
1534 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1459 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1535 | (unsigned int)count, rstyle); |
|
|
1536 | break; |
1460 | break; |
1537 | |
1461 | |
1538 | case ERASE: |
1462 | case ERASE: |
1539 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1463 | screen.cur.col += count; /* don't worry if > ncol */ |
1540 | selection_check (1); |
1464 | selection_check (1); |
1541 | screen.cur.col -= count; |
1465 | screen.cur.col -= count; |
1542 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1466 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1543 | (unsigned int)count, rstyle); |
|
|
1544 | break; |
1467 | break; |
1545 | |
1468 | |
1546 | case DELETE: |
1469 | case DELETE: |
1547 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1470 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1548 | |
1471 | |
1549 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1472 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1550 | { |
1473 | { |
1551 | stp[col] = stp[col + count]; |
1474 | line->t[col] = line->t[col + count]; |
1552 | srp[col] = srp[col + count]; |
1475 | line->r[col] = line->r[col + count]; |
1553 | } |
1476 | } |
1554 | |
1477 | |
1555 | scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], |
1478 | scr_blank_line (*line, ncol - count, count, tr); |
1556 | (unsigned int)count, tr); |
|
|
1557 | |
1479 | |
1558 | if (*slp == -1) /* break line continuation */ |
1480 | if (line->is_longer ()) /* break line continuation */ |
1559 | *slp = TermWin.ncol; |
1481 | line->l = ncol; |
1560 | |
1482 | |
1561 | *slp -= count; |
1483 | line->l = max (line->l - count, 0); |
1562 | MAX_IT (*slp, 0); |
|
|
1563 | |
1484 | |
1564 | if (selection.op && current_screen == selection.screen |
1485 | if (selection.op && current_screen == selection.screen |
1565 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1486 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1566 | { |
1487 | { |
1567 | if (selection.end.row != screen.cur.row |
1488 | if (selection.end.row != screen.cur.row |
1568 | || (screen.cur.col >= selection.beg.col - count) |
1489 | || (screen.cur.col >= selection.beg.col - count) |
1569 | || selection.end.col >= TermWin.ncol) |
1490 | || selection.end.col >= ncol) |
1570 | CLEAR_SELECTION (); |
1491 | CLEAR_SELECTION (); |
1571 | else |
1492 | else |
1572 | { |
1493 | { |
1573 | /* shift selection */ |
1494 | /* shift selection */ |
1574 | selection.beg.col -= count; |
1495 | selection.beg.col -= count; |
… | |
… | |
1588 | */ |
1509 | */ |
1589 | void |
1510 | void |
1590 | rxvt_term::scr_scroll_region (int top, int bot) |
1511 | rxvt_term::scr_scroll_region (int top, int bot) |
1591 | { |
1512 | { |
1592 | MAX_IT (top, 0); |
1513 | MAX_IT (top, 0); |
1593 | MIN_IT (bot, (int)TermWin.nrow - 1); |
1514 | MIN_IT (bot, (int)nrow - 1); |
1594 | |
1515 | |
1595 | if (top > bot) |
1516 | if (top > bot) |
1596 | return; |
1517 | return; |
1597 | |
1518 | |
1598 | screen.tscroll = top; |
1519 | screen.tscroll = top; |
… | |
… | |
1677 | */ |
1598 | */ |
1678 | void |
1599 | void |
1679 | rxvt_term::scr_set_tab (int mode) |
1600 | rxvt_term::scr_set_tab (int mode) |
1680 | { |
1601 | { |
1681 | if (mode < 0) |
1602 | if (mode < 0) |
1682 | memset (tabs, 0, TermWin.ncol * sizeof (char)); |
1603 | memset (tabs, 0, ncol * sizeof (char)); |
1683 | else if (screen.cur.col < TermWin.ncol) |
1604 | else if (screen.cur.col < ncol) |
1684 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1605 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1685 | } |
1606 | } |
1686 | |
1607 | |
1687 | /* ------------------------------------------------------------------------- */ |
1608 | /* ------------------------------------------------------------------------- */ |
1688 | /* |
1609 | /* |
… | |
… | |
1696 | XGCValues gcvalue; |
1617 | XGCValues gcvalue; |
1697 | |
1618 | |
1698 | if (rvideo != mode) |
1619 | if (rvideo != mode) |
1699 | { |
1620 | { |
1700 | rvideo = mode; |
1621 | rvideo = mode; |
1701 | SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); |
1622 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1702 | #if XPM_BACKGROUND |
1623 | #if XPM_BACKGROUND |
1703 | if (bgPixmap.pixmap == None) |
1624 | if (bgPixmap.pixmap == None) |
1704 | #endif |
1625 | #endif |
1705 | #if TRANSPARENT |
1626 | #if TRANSPARENT |
1706 | if (! (options & Opt_transparent) || am_transparent == 0) |
1627 | if (! (options & Opt_transparent) || am_transparent == 0) |
1707 | #endif |
1628 | #endif |
1708 | XSetWindowBackground (display->display, TermWin.vt, |
1629 | XSetWindowBackground (display->display, vt, |
1709 | pix_colors[Color_bg]); |
1630 | pix_colors[Color_bg]); |
1710 | |
1631 | |
1711 | gcvalue.foreground = pix_colors[Color_fg]; |
1632 | gcvalue.foreground = pix_colors[Color_fg]; |
1712 | gcvalue.background = pix_colors[Color_bg]; |
1633 | gcvalue.background = pix_colors[Color_bg]; |
1713 | XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, |
1634 | XChangeGC (display->display, gc, GCBackground | GCForeground, |
1714 | &gcvalue); |
1635 | &gcvalue); |
1715 | scr_clear (); |
1636 | scr_clear (); |
1716 | scr_touch (true); |
1637 | scr_touch (true); |
1717 | } |
1638 | } |
1718 | } |
1639 | } |
… | |
… | |
1799 | bool |
1720 | bool |
1800 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1721 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1801 | { |
1722 | { |
1802 | bool found = false; |
1723 | bool found = false; |
1803 | |
1724 | |
1804 | for (int i = 0; i < TermWin.nrow; i++) |
1725 | for (int i = 0; i < nrow; i++) |
1805 | { |
1726 | { |
1806 | int col = 0; |
1727 | int col = 0; |
1807 | rend_t *drp = drawn_rend [i]; |
1728 | rend_t *drp = drawn[i].r; |
1808 | |
1729 | |
1809 | for (; col < TermWin.ncol; col++, drp++) |
1730 | for (; col < ncol; col++, drp++) |
1810 | if ((*drp & mask) == value) |
1731 | if ((*drp & mask) == value) |
1811 | { |
1732 | { |
1812 | found = true; |
1733 | found = true; |
1813 | *drp = ~value; |
1734 | *drp = ~value; |
1814 | } |
1735 | } |
… | |
… | |
1825 | PART_END, |
1746 | PART_END, |
1826 | RC_COUNT |
1747 | RC_COUNT |
1827 | }; |
1748 | }; |
1828 | |
1749 | |
1829 | void |
1750 | void |
1830 | rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) |
1751 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1831 | { |
1752 | { |
1832 | int i; |
1753 | int i; |
1833 | row_col_t rc[RC_COUNT]; |
1754 | row_col_t rc[RC_COUNT]; |
1834 | |
1755 | |
1835 | if (drawn_text == NULL) /* sanity check */ |
1756 | if (!drawn) /* sanity check */ |
1836 | return; |
1757 | return; |
1837 | |
1758 | |
1838 | #ifndef NO_SLOW_LINK_SUPPORT |
1759 | #ifndef NO_SLOW_LINK_SUPPORT |
1839 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1760 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1840 | { |
1761 | { |
1841 | y = 0; |
1762 | y = 0; |
1842 | height = TermWin.height; |
1763 | eheight = height; |
1843 | } |
1764 | } |
1844 | #endif |
1765 | #endif |
1845 | |
1766 | |
1846 | #ifdef DEBUG_STRICT |
1767 | #ifdef DEBUG_STRICT |
1847 | x = max (x, 0); |
1768 | x = max (x, 0); |
1848 | x = min (x, (int)TermWin.width); |
1769 | x = min (x, (int)width); |
1849 | y = max (y, 0); |
1770 | y = max (y, 0); |
1850 | y = min (y, (int)TermWin.height); |
1771 | y = min (y, (int)height); |
1851 | #endif |
1772 | #endif |
1852 | |
1773 | |
1853 | /* round down */ |
1774 | /* round down */ |
1854 | rc[PART_BEG].col = Pixel2Col (x); |
1775 | rc[PART_BEG].col = Pixel2Col (x); |
1855 | rc[PART_BEG].row = Pixel2Row (y); |
1776 | rc[PART_BEG].row = Pixel2Row (y); |
1856 | /* round up */ |
1777 | /* round up */ |
1857 | rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); |
1778 | rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1); |
1858 | rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); |
1779 | rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); |
1859 | |
1780 | |
1860 | /* sanity checks */ |
1781 | /* sanity checks */ |
1861 | for (i = PART_BEG; i < RC_COUNT; i++) |
1782 | for (i = PART_BEG; i < RC_COUNT; i++) |
1862 | { |
1783 | { |
1863 | MIN_IT (rc[i].col, TermWin.ncol - 1); |
1784 | MIN_IT (rc[i].col, ncol - 1); |
1864 | MIN_IT (rc[i].row, TermWin.nrow - 1); |
1785 | MIN_IT (rc[i].row, nrow - 1); |
1865 | } |
1786 | } |
1866 | |
1787 | |
1867 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1788 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1868 | fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1789 | fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1869 | |
1790 | |
1870 | if (refresh) |
1791 | if (refresh) |
1871 | scr_refresh (SLOW_REFRESH); |
1792 | scr_refresh (SLOW_REFRESH); |
1872 | } |
1793 | } |
1873 | |
1794 | |
… | |
… | |
1876 | * Refresh the entire screen |
1797 | * Refresh the entire screen |
1877 | */ |
1798 | */ |
1878 | void |
1799 | void |
1879 | rxvt_term::scr_touch (bool refresh) |
1800 | rxvt_term::scr_touch (bool refresh) |
1880 | { |
1801 | { |
1881 | scr_expose (0, 0, TermWin.width, TermWin.height, refresh); |
1802 | scr_expose (0, 0, width, height, refresh); |
1882 | } |
1803 | } |
1883 | |
1804 | |
1884 | /* ------------------------------------------------------------------------- */ |
1805 | /* ------------------------------------------------------------------------- */ |
1885 | /* |
1806 | /* |
1886 | * Move the display so that the line represented by scrollbar value Y is at |
1807 | * Move the display so that the line represented by scrollbar value Y is at |
… | |
… | |
1890 | rxvt_term::scr_move_to (int y, int len) |
1811 | rxvt_term::scr_move_to (int y, int len) |
1891 | { |
1812 | { |
1892 | long p = 0; |
1813 | long p = 0; |
1893 | unsigned int oldviewstart; |
1814 | unsigned int oldviewstart; |
1894 | |
1815 | |
1895 | oldviewstart = TermWin.view_start; |
1816 | oldviewstart = view_start; |
1896 | |
1817 | |
1897 | if (y < len) |
1818 | if (y < len) |
1898 | { |
1819 | { |
1899 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1820 | p = (nrow + nsaved) * (len - y) / len; |
1900 | p -= (long) (TermWin.nrow - 1); |
1821 | p -= (long) (nrow - 1); |
1901 | p = max (p, 0); |
1822 | p = max (p, 0); |
1902 | } |
1823 | } |
1903 | |
1824 | |
1904 | TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); |
1825 | view_start = (unsigned int)min (p, nsaved); |
1905 | |
1826 | |
1906 | return scr_changeview (oldviewstart); |
1827 | return scr_changeview (oldviewstart); |
1907 | } |
1828 | } |
1908 | |
1829 | |
1909 | /* ------------------------------------------------------------------------- */ |
1830 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1915 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1836 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1916 | { |
1837 | { |
1917 | int n; |
1838 | int n; |
1918 | unsigned int oldviewstart; |
1839 | unsigned int oldviewstart; |
1919 | |
1840 | |
1920 | oldviewstart = TermWin.view_start; |
1841 | oldviewstart = view_start; |
1921 | |
1842 | |
1922 | if (direction == UP) |
1843 | if (direction == UP) |
1923 | { |
1844 | { |
1924 | n = TermWin.view_start + nlines; |
1845 | n = view_start + nlines; |
1925 | TermWin.view_start = min (n, TermWin.nscrolled); |
1846 | view_start = min (n, nsaved); |
1926 | } |
1847 | } |
1927 | else |
1848 | else |
1928 | { |
1849 | { |
1929 | n = TermWin.view_start - nlines; |
1850 | n = view_start - nlines; |
1930 | TermWin.view_start = max (n, 0); |
1851 | view_start = max (n, 0); |
1931 | } |
1852 | } |
1932 | |
1853 | |
1933 | return scr_changeview (oldviewstart); |
1854 | return scr_changeview (oldviewstart); |
1934 | } |
1855 | } |
1935 | |
1856 | |
1936 | int |
1857 | int |
1937 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1858 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1938 | { |
1859 | { |
1939 | if (TermWin.view_start != oldviewstart) |
1860 | if (view_start != oldviewstart) |
1940 | { |
1861 | { |
1941 | want_refresh = 1; |
1862 | want_refresh = 1; |
1942 | num_scr -= (TermWin.view_start - oldviewstart); |
1863 | num_scr -= (view_start - oldviewstart); |
1943 | } |
1864 | } |
1944 | |
1865 | |
1945 | return (int) (TermWin.view_start - oldviewstart); |
1866 | return (int) (view_start - oldviewstart); |
1946 | } |
1867 | } |
1947 | |
1868 | |
1948 | /* ------------------------------------------------------------------------- */ |
1869 | /* ------------------------------------------------------------------------- */ |
1949 | void |
1870 | void |
1950 | rxvt_term::scr_bell () |
1871 | rxvt_term::scr_bell () |
… | |
… | |
1953 | |
1874 | |
1954 | # ifndef NO_MAPALERT |
1875 | # ifndef NO_MAPALERT |
1955 | # ifdef MAPALERT_OPTION |
1876 | # ifdef MAPALERT_OPTION |
1956 | if (options & Opt_mapAlert) |
1877 | if (options & Opt_mapAlert) |
1957 | # endif |
1878 | # endif |
1958 | XMapWindow (display->display, TermWin.parent[0]); |
1879 | XMapWindow (display->display, parent[0]); |
1959 | # endif |
1880 | # endif |
1960 | |
1881 | |
1961 | if (options & Opt_visualBell) |
1882 | if (options & Opt_visualBell) |
1962 | { |
1883 | { |
1963 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1884 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
… | |
… | |
1974 | /* ARGSUSED */ |
1895 | /* ARGSUSED */ |
1975 | void |
1896 | void |
1976 | rxvt_term::scr_printscreen (int fullhist) |
1897 | rxvt_term::scr_printscreen (int fullhist) |
1977 | { |
1898 | { |
1978 | #ifdef PRINTPIPE |
1899 | #ifdef PRINTPIPE |
1979 | int i, r1, nrows, row_offset; |
1900 | int nrows, row_start; |
1980 | FILE *fd; |
1901 | FILE *fd; |
1981 | |
1902 | |
1982 | if ((fd = popen_printer ()) == NULL) |
1903 | if ((fd = popen_printer ()) == NULL) |
1983 | return; |
1904 | return; |
1984 | |
1905 | |
1985 | nrows = TermWin.nrow; |
|
|
1986 | row_offset = TermWin.saveLines; |
|
|
1987 | |
|
|
1988 | if (!fullhist) |
1906 | if (fullhist) |
1989 | row_offset -= TermWin.view_start; |
1907 | { |
|
|
1908 | nrows = nrow + nsaved; |
|
|
1909 | row_start = -nsaved; |
|
|
1910 | } |
1990 | else |
1911 | else |
1991 | { |
1912 | { |
1992 | nrows += TermWin.nscrolled; |
1913 | nrows = nrow; |
1993 | row_offset -= TermWin.nscrolled; |
1914 | row_start = -view_start; |
1994 | } |
1915 | } |
1995 | |
1916 | |
1996 | wctomb (0, 0); |
1917 | wctomb (0, 0); |
1997 | |
1918 | |
1998 | for (r1 = 0; r1 < nrows; r1++) |
1919 | for (int r1 = 0; r1 < nrows; r1++) |
1999 | { |
1920 | { |
2000 | text_t *tp = screen.text[r1 + row_offset]; |
1921 | text_t *tp = ROW(r1).t; |
2001 | int len = screen.tlen[r1 + row_offset]; |
1922 | int len = ROW(r1).l; |
2002 | |
1923 | |
2003 | for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) |
1924 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
2004 | { |
1925 | { |
2005 | char mb[MB_LEN_MAX]; |
1926 | char mb[MB_LEN_MAX]; |
2006 | text_t t = *tp++; |
1927 | text_t t = *tp++; |
2007 | if (t == NOCHAR) |
1928 | if (t == NOCHAR) |
2008 | continue; |
1929 | continue; |
… | |
… | |
2036 | { |
1957 | { |
2037 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1958 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
2038 | showcursor; /* show the cursor */ |
1959 | showcursor; /* show the cursor */ |
2039 | int16_t col, row, /* column/row we're processing */ |
1960 | int16_t col, row, /* column/row we're processing */ |
2040 | ocrow; /* old cursor row */ |
1961 | ocrow; /* old cursor row */ |
2041 | int i, /* tmp */ |
1962 | int i; /* tmp */ |
2042 | row_offset; /* basic offset in screen structure */ |
|
|
2043 | #ifndef NO_CURSORCOLOR |
1963 | #ifndef NO_CURSORCOLOR |
2044 | rend_t cc1; /* store colours at cursor position (s) */ |
1964 | rend_t cc1; /* store colours at cursor position (s) */ |
2045 | #endif |
1965 | #endif |
2046 | rend_t *crp; // cursor rendition pointer |
1966 | rend_t *crp; // cursor rendition pointer |
2047 | |
1967 | |
2048 | want_refresh = 0; /* screen is current */ |
1968 | want_refresh = 0; /* screen is current */ |
2049 | |
1969 | |
2050 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
1970 | if (refresh_type == NO_REFRESH || !mapped) |
2051 | return; |
1971 | return; |
2052 | |
1972 | |
2053 | /* |
1973 | /* |
2054 | * A: set up vars |
1974 | * A: set up vars |
2055 | */ |
1975 | */ |
2056 | must_clear = 0; |
1976 | must_clear = 0; |
2057 | refresh_count = 0; |
1977 | refresh_count = 0; |
2058 | |
|
|
2059 | row_offset = TermWin.saveLines - TermWin.view_start; |
|
|
2060 | |
1978 | |
2061 | #if XPM_BACKGROUND |
1979 | #if XPM_BACKGROUND |
2062 | must_clear |= bgPixmap.pixmap != None; |
1980 | must_clear |= bgPixmap.pixmap != None; |
2063 | #endif |
1981 | #endif |
2064 | #if TRANSPARENT |
1982 | #if TRANSPARENT |
… | |
… | |
2087 | |
2005 | |
2088 | if (showcursor) |
2006 | if (showcursor) |
2089 | { |
2007 | { |
2090 | int col = screen.cur.col; |
2008 | int col = screen.cur.col; |
2091 | |
2009 | |
2092 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
2010 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2093 | col--; |
2011 | col--; |
2094 | |
2012 | |
2095 | crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; |
2013 | crp = &ROW(screen.cur.row).r[col]; |
2096 | |
2014 | |
2097 | if (showcursor && TermWin.focus) |
2015 | if (showcursor && focus) |
2098 | { |
2016 | { |
2099 | if (options & Opt_cursorUnderline) |
2017 | if (options & Opt_cursorUnderline) |
2100 | *crp ^= RS_Uline; |
2018 | *crp ^= RS_Uline; |
2101 | else |
2019 | else |
2102 | { |
2020 | { |
… | |
… | |
2129 | |
2047 | |
2130 | /* make sure no outline cursor is left around */ |
2048 | /* make sure no outline cursor is left around */ |
2131 | setoldcursor = 0; |
2049 | setoldcursor = 0; |
2132 | if (ocrow != -1) |
2050 | if (ocrow != -1) |
2133 | { |
2051 | { |
2134 | if (screen.cur.row + TermWin.view_start != ocrow |
2052 | if (screen.cur.row + view_start != ocrow |
2135 | || screen.cur.col != oldcursor.col) |
2053 | || screen.cur.col != oldcursor.col) |
2136 | { |
2054 | { |
2137 | if (ocrow < TermWin.nrow |
2055 | if (ocrow < nrow |
2138 | && oldcursor.col < TermWin.ncol) |
2056 | && oldcursor.col < ncol) |
2139 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
2057 | drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2140 | |
2058 | |
2141 | if (TermWin.focus || !showcursor) |
2059 | if (focus || !showcursor) |
2142 | oldcursor.row = -1; |
2060 | oldcursor.row = -1; |
2143 | else |
2061 | else |
2144 | setoldcursor = 1; |
2062 | setoldcursor = 1; |
2145 | } |
2063 | } |
2146 | } |
2064 | } |
2147 | else if (!TermWin.focus) |
2065 | else if (!focus) |
2148 | setoldcursor = 1; |
2066 | setoldcursor = 1; |
2149 | |
2067 | |
2150 | if (setoldcursor) |
2068 | if (setoldcursor) |
2151 | { |
2069 | { |
2152 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
2070 | if (screen.cur.row + view_start >= nrow) |
2153 | oldcursor.row = -1; |
2071 | oldcursor.row = -1; |
2154 | else |
2072 | else |
2155 | { |
2073 | { |
2156 | oldcursor.row = screen.cur.row + TermWin.view_start; |
2074 | oldcursor.row = screen.cur.row + view_start; |
2157 | oldcursor.col = screen.cur.col; |
2075 | oldcursor.col = screen.cur.col; |
2158 | } |
2076 | } |
2159 | } |
2077 | } |
2160 | } |
2078 | } |
2161 | |
2079 | |
2162 | #if ENABLE_OVERLAY |
2080 | #if ENABLE_OVERLAY |
2163 | scr_swap_overlay (); |
2081 | scr_swap_overlay (); |
2164 | #endif |
2082 | #endif |
2165 | |
|
|
2166 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
|
|
2167 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
|
|
2168 | |
2083 | |
2169 | #ifndef NO_SLOW_LINK_SUPPORT |
2084 | #ifndef NO_SLOW_LINK_SUPPORT |
2170 | /* |
2085 | /* |
2171 | * D: CopyArea pass - very useful for slower links |
2086 | * D: CopyArea pass - very useful for slower links |
2172 | * This has been deliberately kept simple. |
2087 | * This has been deliberately kept simple. |
2173 | */ |
2088 | */ |
2174 | i = num_scr; |
2089 | i = num_scr; |
2175 | if (!display->is_local |
2090 | if (!display->is_local |
2176 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2091 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2177 | && abs (i) < TermWin.nrow && !must_clear) |
2092 | && abs (num_scr) < nrow && !must_clear) |
2178 | { |
2093 | { |
2179 | int16_t nits; |
2094 | int16_t nits; |
2180 | int j; |
2095 | int j; |
2181 | int len, wlen; |
2096 | int len, wlen; |
2182 | |
2097 | |
2183 | j = TermWin.nrow; |
2098 | j = nrow; |
2184 | wlen = len = -1; |
2099 | wlen = len = -1; |
2185 | row = i > 0 ? 0 : j - 1; |
2100 | row = i > 0 ? 0 : j - 1; |
2186 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2101 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2187 | { |
2102 | { |
2188 | if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) |
2103 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2189 | { |
2104 | { |
2190 | text_t *stp = screen.text[row + row_offset]; |
2105 | line_t s = ROW(row - view_start); |
2191 | rend_t *srp = screen.rend[row + row_offset]; |
|
|
2192 | text_t *dtp = drawn_text[row]; |
2106 | line_t d = drawn[row]; |
2193 | text_t *dtp2 = drawn_text[row + i]; |
2107 | line_t d2 = drawn[row + i]; |
2194 | rend_t *drp = drawn_rend[row]; |
|
|
2195 | rend_t *drp2 = drawn_rend[row + i]; |
|
|
2196 | |
2108 | |
2197 | for (nits = 0, col = TermWin.ncol; col--; ) |
2109 | for (nits = 0, col = ncol; col--; ) |
2198 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2110 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2199 | nits--; |
2111 | nits--; |
2200 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
2112 | else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) |
2201 | nits++; |
2113 | nits++; |
2202 | |
2114 | |
2203 | if (nits > 8) /* XXX: arbitrary choice */ |
2115 | if (nits > 8) /* XXX: arbitrary choice */ |
2204 | { |
2116 | { |
2205 | for (col = TermWin.ncol; col--; ) |
2117 | for (col = ncol; col--; ) |
2206 | { |
2118 | { |
2207 | *dtp++ = *dtp2++; |
2119 | *d.t++ = *d2.t++; |
2208 | *drp++ = *drp2++; |
2120 | *d.r++ = *d2.r++; |
2209 | } |
2121 | } |
2210 | |
2122 | |
2211 | if (len == -1) |
2123 | if (len == -1) |
2212 | len = row; |
2124 | len = row; |
2213 | |
2125 | |
… | |
… | |
2218 | |
2130 | |
2219 | if (len != -1) |
2131 | if (len != -1) |
2220 | { |
2132 | { |
2221 | /* also comes here at end if needed because of >= above */ |
2133 | /* also comes here at end if needed because of >= above */ |
2222 | if (wlen < len) |
2134 | if (wlen < len) |
2223 | SWAP_IT (wlen, len, int); |
2135 | ::swap (wlen, len); |
2224 | |
2136 | |
2225 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2137 | XCopyArea (display->display, vt, vt, |
2226 | TermWin.gc, 0, Row2Pixel (len + i), |
2138 | gc, 0, Row2Pixel (len + i), |
2227 | (unsigned int)TermWin_TotalWidth (), |
2139 | (unsigned int)TermWin_TotalWidth (), |
2228 | (unsigned int)Height2Pixel (wlen - len + 1), |
2140 | (unsigned int)Height2Pixel (wlen - len + 1), |
2229 | 0, Row2Pixel (len)); |
2141 | 0, Row2Pixel (len)); |
2230 | len = -1; |
2142 | len = -1; |
2231 | } |
2143 | } |
… | |
… | |
2234 | #endif |
2146 | #endif |
2235 | |
2147 | |
2236 | /* |
2148 | /* |
2237 | * E: main pass across every character |
2149 | * E: main pass across every character |
2238 | */ |
2150 | */ |
2239 | for (row = 0; row < TermWin.nrow; row++) |
2151 | for (row = 0; row < nrow; row++) |
2240 | { |
2152 | { |
2241 | text_t *stp = screen.text[row + row_offset]; |
2153 | text_t *stp = ROW(row - view_start).t; |
2242 | rend_t *srp = screen.rend[row + row_offset]; |
2154 | rend_t *srp = ROW(row - view_start).r; |
2243 | text_t *dtp = drawn_text[row]; |
2155 | text_t *dtp = drawn[row].t; |
2244 | rend_t *drp = drawn_rend[row]; |
2156 | rend_t *drp = drawn[row].r; |
2245 | |
2157 | |
2246 | /* |
2158 | /* |
2247 | * E2: OK, now the real pass |
2159 | * E2: OK, now the real pass |
2248 | */ |
2160 | */ |
2249 | int ypixel = (int)Row2Pixel (row); |
2161 | int ypixel = (int)Row2Pixel (row); |
2250 | |
2162 | |
2251 | for (col = 0; col < TermWin.ncol; col++) |
2163 | for (col = 0; col < ncol; col++) |
2252 | { |
2164 | { |
2253 | /* compare new text with old - if exactly the same then continue */ |
2165 | /* compare new text with old - if exactly the same then continue */ |
2254 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2166 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2255 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
2167 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
2256 | || (stp[col] == ' ' /* space w/ no background change */ |
2168 | || (stp[col] == ' ' /* space w/ no background change */ |
… | |
… | |
2270 | dtp[col] = stp[col]; |
2182 | dtp[col] = stp[col]; |
2271 | drp[col] = rend; |
2183 | drp[col] = rend; |
2272 | |
2184 | |
2273 | int xpixel = Col2Pixel (col); |
2185 | int xpixel = Col2Pixel (col); |
2274 | |
2186 | |
2275 | for (i = 0; ++col < TermWin.ncol; ) |
2187 | for (i = 0; ++col < ncol; ) |
2276 | { |
2188 | { |
2277 | if (stp[col] == NOCHAR) |
2189 | if (stp[col] == NOCHAR) |
2278 | { |
2190 | { |
2279 | dtp[col] = stp[col]; |
2191 | dtp[col] = stp[col]; |
2280 | drp[col] = rend; |
2192 | drp[col] = rend; |
… | |
… | |
2319 | // only do special processing if any attributes are set, which is rare |
2231 | // only do special processing if any attributes are set, which is rare |
2320 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2232 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2321 | { |
2233 | { |
2322 | #if ENABLE_STYLES |
2234 | #if ENABLE_STYLES |
2323 | // force redraw after "careful" characters to avoid pixel droppings |
2235 | // force redraw after "careful" characters to avoid pixel droppings |
2324 | if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) |
2236 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
2325 | drp[col + 1] = ~srp[col + 1]; |
2237 | drp[col + 1] = ~srp[col + 1]; |
2326 | |
2238 | |
2327 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2239 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2328 | while (text > stp |
2240 | while (text > stp |
2329 | && srp[text - stp - 1] & RS_Careful |
2241 | && srp[text - stp - 1] & RS_Careful |
2330 | && RS_SAME (rend, srp[text - stp - 1])) |
2242 | && RS_SAME (rend, srp[text - stp - 1])) |
2331 | text--, count++, xpixel -= TermWin.fwidth; |
2243 | text--, count++, xpixel -= fwidth; |
2332 | #endif |
2244 | #endif |
2333 | |
2245 | |
2334 | bool invert = rend & RS_RVid; |
2246 | bool invert = rend & RS_RVid; |
2335 | |
2247 | |
2336 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2248 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
… | |
… | |
2360 | fore = Color_UL; |
2272 | fore = Color_UL; |
2361 | #endif |
2273 | #endif |
2362 | |
2274 | |
2363 | if (invert) |
2275 | if (invert) |
2364 | { |
2276 | { |
2365 | SWAP_IT (fore, back, int); |
2277 | ::swap (fore, back); |
2366 | |
2278 | |
2367 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2279 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2368 | if (ISSET_PIXCOLOR (Color_RV)) |
2280 | if (ISSET_PIXCOLOR (Color_RV)) |
2369 | back = Color_RV; |
2281 | back = Color_RV; |
2370 | |
2282 | |
… | |
… | |
2391 | } |
2303 | } |
2392 | |
2304 | |
2393 | /* |
2305 | /* |
2394 | * Actually do the drawing of the string here |
2306 | * Actually do the drawing of the string here |
2395 | */ |
2307 | */ |
2396 | rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2308 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2397 | |
2309 | |
2398 | if (back == fore) |
2310 | if (back == fore) |
2399 | font->clear_rect (*TermWin.drawable, xpixel, ypixel, |
2311 | font->clear_rect (*drawable, xpixel, ypixel, |
2400 | TermWin.fwidth * count, TermWin.fheight, |
2312 | fwidth * count, fheight, |
2401 | back); |
2313 | back); |
2402 | else if (back == Color_bg) |
2314 | else if (back == Color_bg) |
2403 | { |
2315 | { |
2404 | if (must_clear) |
2316 | if (must_clear) |
2405 | { |
2317 | { |
2406 | CLEAR_CHARS (xpixel, ypixel, count); |
2318 | CLEAR_CHARS (xpixel, ypixel, count); |
2407 | |
2319 | |
2408 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2320 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2409 | if (text[i] != ' ') |
2321 | if (text[i] != ' ') |
2410 | { |
2322 | { |
2411 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); |
2323 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2412 | break; |
2324 | break; |
2413 | } |
2325 | } |
2414 | } |
2326 | } |
2415 | else |
2327 | else |
2416 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2328 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2417 | } |
2329 | } |
2418 | else |
2330 | else |
2419 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2331 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2420 | |
2332 | |
2421 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2333 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2422 | { |
2334 | { |
2423 | #if ENABLE_FRILLS |
2335 | #if ENABLE_FRILLS |
2424 | if (ISSET_PIXCOLOR (Color_underline)) |
2336 | if (ISSET_PIXCOLOR (Color_underline)) |
2425 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); |
2337 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2426 | else |
2338 | else |
2427 | #endif |
2339 | #endif |
2428 | XSetForeground (display->display, TermWin.gc, pix_colors[fore]); |
2340 | XSetForeground (display->display, gc, pix_colors[fore]); |
2429 | |
2341 | |
2430 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2342 | XDrawLine (display->display, drawBuffer, gc, |
2431 | xpixel, ypixel + font->ascent + 1, |
2343 | xpixel, ypixel + font->ascent + 1, |
2432 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2344 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2433 | } |
2345 | } |
2434 | } /* for (col....) */ |
2346 | } /* for (col....) */ |
2435 | } /* for (row....) */ |
2347 | } /* for (row....) */ |
… | |
… | |
2441 | /* |
2353 | /* |
2442 | * G: cleanup cursor and display outline cursor if necessary |
2354 | * G: cleanup cursor and display outline cursor if necessary |
2443 | */ |
2355 | */ |
2444 | if (showcursor) |
2356 | if (showcursor) |
2445 | { |
2357 | { |
2446 | if (TermWin.focus) |
2358 | if (focus) |
2447 | { |
2359 | { |
2448 | if (options & Opt_cursorUnderline) |
2360 | if (options & Opt_cursorUnderline) |
2449 | *crp ^= RS_Uline; |
2361 | *crp ^= RS_Uline; |
2450 | else |
2362 | else |
2451 | { |
2363 | { |
… | |
… | |
2458 | else if (oldcursor.row >= 0) |
2370 | else if (oldcursor.row >= 0) |
2459 | { |
2371 | { |
2460 | int cursorwidth = 1; |
2372 | int cursorwidth = 1; |
2461 | int col = oldcursor.col; |
2373 | int col = oldcursor.col; |
2462 | |
2374 | |
2463 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
2375 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2464 | col--; |
2376 | col--; |
2465 | |
2377 | |
2466 | while (col + cursorwidth < TermWin.ncol |
2378 | while (col + cursorwidth < ncol |
2467 | && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR) |
2379 | && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2468 | cursorwidth++; |
2380 | cursorwidth++; |
2469 | |
2381 | |
2470 | #ifndef NO_CURSORCOLOR |
2382 | #ifndef NO_CURSORCOLOR |
2471 | if (ISSET_PIXCOLOR (Color_cursor)) |
2383 | if (ISSET_PIXCOLOR (Color_cursor)) |
2472 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); |
2384 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2473 | #endif |
2385 | #endif |
2474 | |
2386 | |
2475 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2387 | XDrawRectangle (display->display, drawBuffer, gc, |
2476 | Col2Pixel (col), |
2388 | Col2Pixel (col), |
2477 | Row2Pixel (oldcursor.row), |
2389 | Row2Pixel (oldcursor.row), |
2478 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2390 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2479 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2391 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2480 | } |
2392 | } |
2481 | } |
2393 | } |
2482 | |
2394 | |
2483 | /* |
2395 | /* |
2484 | * H: cleanup selection |
2396 | * H: cleanup selection |
… | |
… | |
2491 | num_scr = 0; |
2403 | num_scr = 0; |
2492 | num_scr_allow = 1; |
2404 | num_scr_allow = 1; |
2493 | } |
2405 | } |
2494 | |
2406 | |
2495 | void |
2407 | void |
2496 | rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) |
2408 | rxvt_term::scr_remap_chars (const line_t &l) |
2497 | { |
2409 | { |
2498 | if (!rp || !tp) |
2410 | if (!l.t) |
2499 | return; |
2411 | return; |
2500 | |
2412 | |
2501 | for (int i = TermWin.ncol; i; i--, rp++, tp++) |
2413 | for (int i = ncol; i--; ) |
2502 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
2414 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2503 | } |
2415 | } |
2504 | |
2416 | |
2505 | void |
2417 | void |
2506 | rxvt_term::scr_remap_chars () |
2418 | rxvt_term::scr_remap_chars () |
2507 | { |
2419 | { |
2508 | for (int i = TermWin.nrow + TermWin.saveLines; i--; ) |
2420 | for (int i = total_rows; i--; ) |
2509 | scr_remap_chars (screen.text[i], screen.rend[i]); |
2421 | scr_remap_chars (save[i]); |
2510 | |
2422 | |
2511 | for (int i = TermWin.nrow; i--; ) |
2423 | for (int i = nrow; i--; ) |
2512 | { |
2424 | { |
2513 | scr_remap_chars (drawn_text[i], drawn_rend[i]); |
2425 | scr_remap_chars (drawn[i]); |
2514 | scr_remap_chars (swap.text[i], swap.rend[i]); |
2426 | scr_remap_chars (swap_save[i]); |
2515 | } |
2427 | } |
2516 | } |
2428 | } |
2517 | |
2429 | |
2518 | void |
2430 | void |
2519 | rxvt_term::scr_recolour () |
2431 | rxvt_term::scr_recolour () |
… | |
… | |
2525 | #if XPM_BACKGROUND |
2437 | #if XPM_BACKGROUND |
2526 | && !bgPixmap.pixmap |
2438 | && !bgPixmap.pixmap |
2527 | #endif |
2439 | #endif |
2528 | ) |
2440 | ) |
2529 | { |
2441 | { |
2530 | XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); |
2442 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2531 | XClearWindow (display->display, TermWin.parent[0]); |
2443 | XClearWindow (display->display, parent[0]); |
2532 | XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); |
2444 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2533 | #if HAVE_SCROLLBARS |
2445 | #if HAVE_SCROLLBARS |
2534 | if (scrollBar.win) |
2446 | if (scrollBar.win) |
2535 | { |
2447 | { |
2536 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2448 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2537 | scrollBar.setIdle (); |
2449 | scrollBar.setIdle (); |
… | |
… | |
2547 | |
2459 | |
2548 | /* ------------------------------------------------------------------------- */ |
2460 | /* ------------------------------------------------------------------------- */ |
2549 | void |
2461 | void |
2550 | rxvt_term::scr_clear (bool really) |
2462 | rxvt_term::scr_clear (bool really) |
2551 | { |
2463 | { |
2552 | if (!TermWin.mapped) |
2464 | if (!mapped) |
2553 | return; |
2465 | return; |
2554 | |
2466 | |
2555 | num_scr_allow = 0; |
2467 | num_scr_allow = 0; |
2556 | want_refresh = 1; |
2468 | want_refresh = 1; |
2557 | |
2469 | |
2558 | #if TRANSPARENT |
|
|
2559 | if ((options & Opt_transparent) && (am_pixmap_trans == 0)) |
|
|
2560 | { |
|
|
2561 | int i; |
|
|
2562 | |
|
|
2563 | if (!(options & Opt_transparent_all)) |
|
|
2564 | i = 0; |
|
|
2565 | else |
|
|
2566 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
|
|
2567 | |
|
|
2568 | while (i--) |
|
|
2569 | if (TermWin.parent[i] != None) |
|
|
2570 | XClearWindow (display->display, TermWin.parent[i]); |
|
|
2571 | } |
|
|
2572 | #endif |
|
|
2573 | |
|
|
2574 | if (really) |
2470 | if (really) |
2575 | XClearWindow (display->display, TermWin.vt); |
2471 | XClearWindow (display->display, vt); |
2576 | } |
2472 | } |
2577 | |
2473 | |
2578 | /* ------------------------------------------------------------------------- */ |
2474 | /* ------------------------------------------------------------------------- */ |
2579 | void |
2475 | void |
2580 | rxvt_term::scr_reverse_selection () |
2476 | rxvt_term::scr_reverse_selection () |
2581 | { |
2477 | { |
|
|
2478 | if (selection.op |
2582 | if (selection.op && current_screen == selection.screen) |
2479 | && current_screen == selection.screen |
|
|
2480 | && selection.end.row >= -view_start) |
2583 | { |
2481 | { |
2584 | int end_row = TermWin.saveLines - TermWin.view_start; |
2482 | int view_end = -view_start + nrow; |
2585 | int i = selection.beg.row + TermWin.saveLines; |
2483 | int row, col; |
2586 | int col, row = selection.end.row + TermWin.saveLines; |
|
|
2587 | rend_t *srp; |
|
|
2588 | |
2484 | |
2589 | #if ENABLE_FRILLS |
2485 | #if ENABLE_FRILLS |
2590 | if (selection.rect) |
2486 | if (selection.rect) |
2591 | { |
2487 | { |
2592 | end_row += TermWin.nrow; |
2488 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
2593 | |
|
|
2594 | for (; i <= row && i <= end_row; i++) |
|
|
2595 | for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) |
2489 | for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) |
2596 | srp[col] ^= RS_RVid; |
2490 | srp[col] ^= RS_RVid; |
2597 | } |
2491 | } |
2598 | else |
2492 | else |
2599 | #endif |
2493 | #endif |
2600 | { |
2494 | { |
2601 | if (i >= end_row) |
2495 | if (selection.beg.row >= -view_start) |
|
|
2496 | { |
2602 | col = selection.beg.col; |
2497 | col = selection.beg.col; |
|
|
2498 | row = selection.beg.row; |
|
|
2499 | } |
2603 | else |
2500 | else |
2604 | { |
2501 | { |
2605 | col = 0; |
2502 | col = 0; |
2606 | i = end_row; |
2503 | row = view_start; |
2607 | } |
2504 | } |
2608 | |
2505 | |
2609 | end_row += TermWin.nrow; |
2506 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2610 | |
2507 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2611 | for (; i < row && i < end_row; i++, col = 0) |
|
|
2612 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
|
|
2613 | srp[col] ^= RS_RVid; |
2508 | srp[col] ^= RS_RVid; |
2614 | |
2509 | |
2615 | if (i == row && i < end_row) |
2510 | if (row == selection.end.row) |
2616 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2511 | for (rend_t *srp = ROW(row).r; col < selection.end.col; col++) |
2617 | srp[col] ^= RS_RVid; |
2512 | srp[col] ^= RS_RVid; |
2618 | } |
2513 | } |
2619 | } |
2514 | } |
2620 | } |
2515 | } |
2621 | |
2516 | |
… | |
… | |
2630 | { |
2525 | { |
2631 | int row, wrote; |
2526 | int row, wrote; |
2632 | unsigned int width, towrite; |
2527 | unsigned int width, towrite; |
2633 | char r1[] = "\n"; |
2528 | char r1[] = "\n"; |
2634 | |
2529 | |
2635 | for (row = TermWin.saveLines - TermWin.nscrolled; |
2530 | for (row = saveLines - nsaved; |
2636 | row < TermWin.saveLines + TermWin.nrow - 1; row++) |
2531 | row < saveLines + nrow - 1; row++) |
2637 | { |
2532 | { |
2638 | width = screen.tlen[row] >= 0 ? screen.tlen[row] |
2533 | width = save[row].l >= 0 ? save[row].l |
2639 | : TermWin.ncol; |
2534 | : ncol; |
2640 | for (towrite = width; towrite; towrite -= wrote) |
2535 | for (towrite = width; towrite; towrite -= wrote) |
2641 | { |
2536 | { |
2642 | wrote = write (fd, & (screen.text[row][width - towrite]), |
2537 | wrote = write (fd, & (save[row].t[width - towrite]), |
2643 | towrite); |
2538 | towrite); |
2644 | if (wrote < 0) |
2539 | if (wrote < 0) |
2645 | return; /* XXX: death, no report */ |
2540 | return; /* XXX: death, no report */ |
2646 | } |
2541 | } |
2647 | if (screen.tlen[row] >= 0) |
2542 | if (save[row].l >= 0) |
2648 | if (write (fd, r1, 1) <= 0) |
2543 | if (write (fd, r1, 1) <= 0) |
2649 | return; /* XXX: death, no report */ |
2544 | return; /* XXX: death, no report */ |
2650 | } |
2545 | } |
2651 | } |
2546 | } |
2652 | #endif |
2547 | #endif |
2653 | |
2548 | |
2654 | /* ------------------------------------------------------------------------- * |
2549 | /* ------------------------------------------------------------------------- * |
2655 | * CHARACTER SELECTION * |
2550 | * CHARACTER SELECTION * |
2656 | * ------------------------------------------------------------------------- */ |
2551 | * ------------------------------------------------------------------------- */ |
2657 | |
|
|
2658 | /* |
|
|
2659 | * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 |
|
|
2660 | */ |
|
|
2661 | void |
2552 | void |
2662 | rxvt_term::selection_check (int check_more) |
2553 | rxvt_term::selection_check (int check_more) |
2663 | { |
2554 | { |
2664 | row_col_t pos; |
2555 | row_col_t pos; |
2665 | |
2556 | |
2666 | if (!selection.op) |
2557 | if (!selection.op) |
2667 | return; |
2558 | return; |
2668 | |
2559 | |
2669 | pos.row = pos.col = 0; |
2560 | pos.row = pos.col = 0; |
2670 | if ((selection.beg.row < - (int32_t)TermWin.nscrolled) |
2561 | if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) |
2671 | || (selection.beg.row >= TermWin.nrow) |
2562 | || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) |
2672 | || (selection.mark.row < - (int32_t)TermWin.nscrolled) |
2563 | || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) |
2673 | || (selection.mark.row >= TermWin.nrow) |
|
|
2674 | || (selection.end.row < - (int32_t)TermWin.nscrolled) |
|
|
2675 | || (selection.end.row >= TermWin.nrow) |
|
|
2676 | || (check_more == 1 |
2564 | || (check_more == 1 |
2677 | && current_screen == selection.screen |
2565 | && current_screen == selection.screen |
2678 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2566 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2679 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2567 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2680 | || (check_more == 2 |
2568 | || (check_more == 2 |
… | |
… | |
2682 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2570 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2683 | || (check_more == 3 |
2571 | || (check_more == 3 |
2684 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2572 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2685 | || (check_more == 4 /* screen width change */ |
2573 | || (check_more == 4 /* screen width change */ |
2686 | && (selection.beg.row != selection.end.row |
2574 | && (selection.beg.row != selection.end.row |
2687 | || selection.end.col > TermWin.ncol))) |
2575 | || selection.end.col > ncol))) |
2688 | CLEAR_SELECTION (); |
2576 | CLEAR_SELECTION (); |
2689 | } |
2577 | } |
2690 | |
2578 | |
2691 | /* ------------------------------------------------------------------------- */ |
2579 | /* ------------------------------------------------------------------------- */ |
2692 | /* |
2580 | /* |
… | |
… | |
2901 | * EXT: button 2 release |
2789 | * EXT: button 2 release |
2902 | */ |
2790 | */ |
2903 | void |
2791 | void |
2904 | rxvt_term::selection_request (Time tm, int x, int y) |
2792 | rxvt_term::selection_request (Time tm, int x, int y) |
2905 | { |
2793 | { |
2906 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2794 | if (x < 0 || x >= width || y < 0 || y >= height) |
2907 | return; /* outside window */ |
2795 | return; /* outside window */ |
2908 | |
2796 | |
2909 | if (selection.text) |
2797 | if (selection.text) |
2910 | { /* internal selection */ |
2798 | { /* internal selection */ |
2911 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2799 | char *str = rxvt_wcstombs (selection.text, selection.len); |
… | |
… | |
2953 | sel = xa[XA_CLIPBOARD]; |
2841 | sel = xa[XA_CLIPBOARD]; |
2954 | |
2842 | |
2955 | if (XGetSelectionOwner (display->display, sel) != None) |
2843 | if (XGetSelectionOwner (display->display, sel) != None) |
2956 | { |
2844 | { |
2957 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2845 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2958 | TermWin.vt, selection_request_time); |
2846 | vt, selection_request_time); |
2959 | return 1; |
2847 | return 1; |
2960 | } |
2848 | } |
2961 | |
2849 | |
2962 | return 0; |
2850 | return 0; |
2963 | } |
2851 | } |
… | |
… | |
2986 | * EXT: button 1 or 3 release |
2874 | * EXT: button 1 or 3 release |
2987 | */ |
2875 | */ |
2988 | void |
2876 | void |
2989 | rxvt_term::selection_make (Time tm) |
2877 | rxvt_term::selection_make (Time tm) |
2990 | { |
2878 | { |
2991 | int i, col, end_col, row, end_row; |
2879 | int i; |
2992 | wchar_t *new_selection_text; |
2880 | wchar_t *new_selection_text; |
2993 | text_t *t; |
2881 | text_t *t; |
2994 | |
2882 | |
2995 | switch (selection.op) |
2883 | switch (selection.op) |
2996 | { |
2884 | { |
… | |
… | |
3009 | selection.op = SELECTION_DONE; |
2897 | selection.op = SELECTION_DONE; |
3010 | |
2898 | |
3011 | if (selection.clicks == 4) |
2899 | if (selection.clicks == 4) |
3012 | return; /* nothing selected, go away */ |
2900 | return; /* nothing selected, go away */ |
3013 | |
2901 | |
3014 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2902 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3015 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2903 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
3016 | |
2904 | |
3017 | col = selection.beg.col; |
|
|
3018 | row = selection.beg.row + TermWin.saveLines; |
|
|
3019 | end_row = selection.end.row + TermWin.saveLines; |
|
|
3020 | int ofs = 0; |
2905 | int ofs = 0; |
3021 | int extra = 0; |
2906 | int extra = 0; |
3022 | |
2907 | |
|
|
2908 | int col = selection.beg.col; |
|
|
2909 | int row = selection.beg.row; |
|
|
2910 | |
|
|
2911 | int end_col; |
|
|
2912 | |
3023 | for (; row <= end_row; row++, col = 0) |
2913 | for (; row <= selection.end.row; row++, col = 0) |
3024 | { |
2914 | { |
3025 | end_col = screen.tlen[row]; |
|
|
3026 | |
|
|
3027 | #if ENABLE_FRILLS |
2915 | #if ENABLE_FRILLS |
3028 | if (selection.rect) |
2916 | if (selection.rect) |
3029 | { |
2917 | { |
3030 | col = selection.beg.col; |
2918 | col = selection.beg.col; |
3031 | end_col = TermWin.ncol + 1; |
2919 | end_col = ncol + 1; |
3032 | } |
2920 | } |
|
|
2921 | else |
3033 | #endif |
2922 | #endif |
|
|
2923 | end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN |
3034 | |
2924 | |
3035 | MAX_IT (col, 0); |
2925 | col = max (col, 0); |
3036 | |
2926 | |
3037 | if (end_col == -1) |
|
|
3038 | end_col = TermWin.ncol; |
|
|
3039 | |
|
|
3040 | if (row == end_row || selection.rect) |
2927 | if (row == selection.end.row || selection.rect) |
3041 | MIN_IT (end_col, selection.end.col); |
2928 | end_col = min (end_col, selection.end.col); |
3042 | |
2929 | |
3043 | t = &screen.text[row][col]; |
2930 | t = ROW(row).t + col; |
3044 | for (; col < end_col; col++) |
2931 | for (; col < end_col; col++) |
3045 | { |
2932 | { |
3046 | if (*t == NOCHAR) |
2933 | if (*t == NOCHAR) |
3047 | t++; |
2934 | t++; |
3048 | #if ENABLE_COMBINING |
2935 | #if ENABLE_COMBINING |
… | |
… | |
3064 | #endif |
2951 | #endif |
3065 | else |
2952 | else |
3066 | new_selection_text[ofs++] = *t++; |
2953 | new_selection_text[ofs++] = *t++; |
3067 | } |
2954 | } |
3068 | |
2955 | |
3069 | if (screen.tlen[row] != -1 && row != end_row) |
2956 | if (!ROW(row).is_longer () && row != selection.end.row) |
3070 | new_selection_text[ofs++] = C0_LF; |
2957 | new_selection_text[ofs++] = C0_LF; |
3071 | } |
2958 | } |
3072 | |
2959 | |
3073 | if (end_col != selection.end.col) |
2960 | if (end_col != selection.end.col) |
3074 | new_selection_text[ofs++] = C0_LF; |
2961 | new_selection_text[ofs++] = C0_LF; |
… | |
… | |
3085 | |
2972 | |
3086 | // we usually allocate much more than necessary, so realloc it smaller again |
2973 | // we usually allocate much more than necessary, so realloc it smaller again |
3087 | selection.len = ofs; |
2974 | selection.len = ofs; |
3088 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2975 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
3089 | |
2976 | |
3090 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2977 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3091 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2978 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3092 | display->set_selection_owner (this); |
2979 | display->set_selection_owner (this); |
3093 | else |
2980 | else |
3094 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
2981 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
3095 | |
2982 | |
3096 | #if 0 |
2983 | #if 0 |
… | |
… | |
3119 | |
3006 | |
3120 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3007 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3121 | |
3008 | |
3122 | if (clicks == 2 || clicks == 3) |
3009 | if (clicks == 2 || clicks == 3) |
3123 | selection_extend_colrow (selection.mark.col, |
3010 | selection_extend_colrow (selection.mark.col, |
3124 | selection.mark.row + TermWin.view_start, |
3011 | selection.mark.row + view_start, |
3125 | 0, /* button 3 */ |
3012 | 0, /* button 3 */ |
3126 | 1, /* button press */ |
3013 | 1, /* button press */ |
3127 | 0); /* click change */ |
3014 | 0); /* click change */ |
3128 | } |
3015 | } |
3129 | |
3016 | |
… | |
… | |
3133 | */ |
3020 | */ |
3134 | void |
3021 | void |
3135 | rxvt_term::selection_start_colrow (int col, int row) |
3022 | rxvt_term::selection_start_colrow (int col, int row) |
3136 | { |
3023 | { |
3137 | want_refresh = 1; |
3024 | want_refresh = 1; |
|
|
3025 | |
|
|
3026 | selection.mark.row = row - view_start; |
3138 | selection.mark.col = col; |
3027 | selection.mark.col = col; |
3139 | selection.mark.row = row - TermWin.view_start; |
|
|
3140 | |
3028 | |
3141 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
3029 | selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); |
3142 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
3030 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3143 | MAX_IT (selection.mark.col, 0); |
|
|
3144 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
|
|
3145 | |
3031 | |
3146 | while (selection.mark.col > 0 |
3032 | while (selection.mark.col > 0 |
3147 | && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) |
3033 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3148 | --selection.mark.col; |
3034 | --selection.mark.col; |
3149 | |
3035 | |
3150 | if (selection.op) |
3036 | if (selection.op) |
3151 | { /* clear the old selection */ |
3037 | { /* clear the old selection */ |
3152 | selection.beg.row = selection.end.row = selection.mark.row; |
3038 | selection.beg.row = selection.end.row = selection.mark.row; |
… | |
… | |
3176 | text_t *stp; |
3062 | text_t *stp; |
3177 | rend_t *srp; |
3063 | rend_t *srp; |
3178 | |
3064 | |
3179 | if (dirn == UP) |
3065 | if (dirn == UP) |
3180 | { |
3066 | { |
3181 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
3067 | bound.row = - nsaved - 1; |
3182 | bound.col = 0; |
3068 | bound.col = 0; |
3183 | dirnadd = -1; |
3069 | dirnadd = -1; |
3184 | } |
3070 | } |
3185 | else |
3071 | else |
3186 | { |
3072 | { |
3187 | bound.row = TermWin.saveLines + TermWin.nrow; |
3073 | bound.row = nrow; |
3188 | bound.col = TermWin.ncol - 1; |
3074 | bound.col = ncol - 1; |
3189 | dirnadd = 1; |
3075 | dirnadd = 1; |
3190 | } |
3076 | } |
3191 | |
3077 | |
3192 | row = mark->row + TermWin.saveLines; |
3078 | row = mark->row; |
3193 | col = mark->col; |
3079 | col = max (mark->col, 0); |
3194 | MAX_IT (col, 0); |
3080 | |
3195 | /* find the edge of a word */ |
3081 | /* find the edge of a word */ |
3196 | stp = &screen.text[row][col]; |
3082 | stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp); |
3197 | w1 = DELIMIT_TEXT (*stp); |
3083 | srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp); |
3198 | |
|
|
3199 | srp = &screen.rend[row][col]; |
|
|
3200 | w2 = DELIMIT_REND (*srp); |
|
|
3201 | |
3084 | |
3202 | for (;;) |
3085 | for (;;) |
3203 | { |
3086 | { |
3204 | for (; col != bound.col; col += dirnadd) |
3087 | for (; col != bound.col; col += dirnadd) |
3205 | { |
3088 | { |
… | |
… | |
3215 | break; |
3098 | break; |
3216 | } |
3099 | } |
3217 | |
3100 | |
3218 | if ((col == bound.col) && (row != bound.row)) |
3101 | if ((col == bound.col) && (row != bound.row)) |
3219 | { |
3102 | { |
3220 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
3103 | if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ()) |
3221 | { |
3104 | { |
3222 | trow = row + dirnadd; |
3105 | trow = row + dirnadd; |
3223 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
3106 | tcol = dirn == UP ? ncol - 1 : 0; |
3224 | |
3107 | |
3225 | if (screen.text[trow] == NULL) |
3108 | if (!ROW(trow).t) |
3226 | break; |
3109 | break; |
3227 | |
3110 | |
3228 | stp = & (screen.text[trow][tcol]); |
3111 | stp = ROW(trow).t + tcol; |
3229 | srp = & (screen.rend[trow][tcol]); |
3112 | srp = ROW(trow).r + tcol; |
3230 | |
3113 | |
3231 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3114 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3232 | break; |
3115 | break; |
3233 | |
3116 | |
3234 | row = trow; |
3117 | row = trow; |
… | |
… | |
3242 | Old_Word_Selection_You_Die: |
3125 | Old_Word_Selection_You_Die: |
3243 | if (dirn == DN) |
3126 | if (dirn == DN) |
3244 | col++; /* put us on one past the end */ |
3127 | col++; /* put us on one past the end */ |
3245 | |
3128 | |
3246 | /* Poke the values back in */ |
3129 | /* Poke the values back in */ |
3247 | ret->row = row - TermWin.saveLines; |
3130 | ret->row = row; |
3248 | ret->col = col; |
3131 | ret->col = col; |
3249 | } |
3132 | } |
3250 | |
3133 | |
3251 | /* ------------------------------------------------------------------------- */ |
3134 | /* ------------------------------------------------------------------------- */ |
3252 | /* |
3135 | /* |
… | |
… | |
3257 | * flag == 2 ==> button 3 motion |
3140 | * flag == 2 ==> button 3 motion |
3258 | */ |
3141 | */ |
3259 | void |
3142 | void |
3260 | rxvt_term::selection_extend (int x, int y, int flag) |
3143 | rxvt_term::selection_extend (int x, int y, int flag) |
3261 | { |
3144 | { |
3262 | int col, row; |
3145 | int col = clamp (Pixel2Col (x), 0, ncol); |
3263 | |
3146 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3264 | col = Pixel2Col (x); |
|
|
3265 | row = Pixel2Row (y); |
|
|
3266 | MAX_IT (row, 0); |
|
|
3267 | MIN_IT (row, (int)TermWin.nrow - 1); |
|
|
3268 | MAX_IT (col, 0); |
|
|
3269 | MIN_IT (col, (int)TermWin.ncol); |
|
|
3270 | |
3147 | |
3271 | /* |
3148 | /* |
3272 | * If we're selecting characters (single click) then we must check first |
3149 | * If we're selecting characters (single click) then we must check first |
3273 | * if we are at the same place as the original mark. If we are then |
3150 | * if we are at the same place as the original mark. If we are then |
3274 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3151 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3275 | * be _past_ a character for it to be selected. |
3152 | * be _past_ a character for it to be selected. |
3276 | */ |
3153 | */ |
3277 | if (((selection.clicks % 3) == 1) && !flag |
3154 | if (((selection.clicks % 3) == 1) && !flag |
3278 | && (col == selection.mark.col |
3155 | && (col == selection.mark.col |
3279 | && (row == selection.mark.row + TermWin.view_start))) |
3156 | && (row == selection.mark.row + view_start))) |
3280 | { |
3157 | { |
3281 | /* select nothing */ |
3158 | /* select nothing */ |
3282 | selection.beg.row = selection.end.row = 0; |
3159 | selection.beg.row = selection.end.row = 0; |
3283 | selection.beg.col = selection.end.col = 0; |
3160 | selection.beg.col = selection.end.col = 0; |
3284 | selection.clicks = 4; |
3161 | selection.clicks = 4; |
… | |
… | |
3299 | * Extend the selection to the specified col/row |
3176 | * Extend the selection to the specified col/row |
3300 | */ |
3177 | */ |
3301 | void |
3178 | void |
3302 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3179 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3303 | { |
3180 | { |
3304 | int16_t ncol = TermWin.ncol; |
|
|
3305 | int end_col; |
|
|
3306 | row_col_t pos; |
3181 | row_col_t pos; |
3307 | enum { |
3182 | enum { |
3308 | LEFT, RIGHT |
3183 | LEFT, RIGHT |
3309 | } closeto = RIGHT; |
3184 | } closeto = RIGHT; |
3310 | |
3185 | |
… | |
… | |
3341 | selection.beg.col = selection.end.col = selection.mark.col; |
3216 | selection.beg.col = selection.end.col = selection.mark.col; |
3342 | selection.beg.row = selection.end.row = selection.mark.row; |
3217 | selection.beg.row = selection.end.row = selection.mark.row; |
3343 | } |
3218 | } |
3344 | |
3219 | |
3345 | pos.col = col; |
3220 | pos.col = col; |
3346 | pos.row = row; |
3221 | pos.row = row - view_start; |
3347 | |
|
|
3348 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
|
|
3349 | |
3222 | |
3350 | /* |
3223 | /* |
3351 | * This is mainly xterm style selection with a couple of differences, mainly |
3224 | * This is mainly xterm style selection with a couple of differences, mainly |
3352 | * in the way button3 drag extension works. |
3225 | * in the way button3 drag extension works. |
3353 | * We're either doing: button1 drag; button3 press; or button3 drag |
3226 | * We're either doing: button1 drag; button3 press; or button3 drag |
… | |
… | |
3412 | } |
3285 | } |
3413 | } |
3286 | } |
3414 | |
3287 | |
3415 | if (selection.clicks == 1) |
3288 | if (selection.clicks == 1) |
3416 | { |
3289 | { |
3417 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3290 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3418 | |
3291 | && !ROW(selection.beg.row).is_longer () |
3419 | if (selection.beg.col > end_col |
|
|
3420 | && end_col != -1 |
|
|
3421 | #if ENABLE_FRILLS |
3292 | #if ENABLE_FRILLS |
3422 | && !selection.rect |
3293 | && !selection.rect |
3423 | #endif |
3294 | #endif |
3424 | ) |
3295 | ) |
3425 | selection.beg.col = ncol; |
3296 | selection.beg.col = ncol; |
3426 | |
3297 | |
3427 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
|
|
3428 | |
|
|
3429 | if ( |
3298 | if ( |
3430 | selection.end.col > end_col |
3299 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3431 | && end_col != -1 |
3300 | && !ROW(selection.end.row).is_longer () |
3432 | #if ENABLE_FRILLS |
3301 | #if ENABLE_FRILLS |
3433 | && !selection.rect |
3302 | && !selection.rect |
3434 | #endif |
3303 | #endif |
3435 | ) |
3304 | ) |
3436 | selection.end.col = ncol; |
3305 | selection.end.col = ncol; |
… | |
… | |
3446 | else if (selection.clicks == 3) |
3315 | else if (selection.clicks == 3) |
3447 | { |
3316 | { |
3448 | #if ENABLE_FRILLS |
3317 | #if ENABLE_FRILLS |
3449 | if (options & Opt_tripleclickwords) |
3318 | if (options & Opt_tripleclickwords) |
3450 | { |
3319 | { |
3451 | int end_row; |
|
|
3452 | |
|
|
3453 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3320 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3454 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
|
|
3455 | |
3321 | |
3456 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3322 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3457 | { |
3323 | { |
3458 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
3324 | if (!ROW(end_row).is_longer ()) |
3459 | |
|
|
3460 | if (end_col != -1) |
|
|
3461 | { |
3325 | { |
3462 | selection.end.row = end_row; |
3326 | selection.end.row = end_row; |
3463 | selection.end.col = end_col; |
3327 | selection.end.col = ROW(end_row).l; |
3464 | selection_remove_trailing_spaces (); |
3328 | selection_remove_trailing_spaces (); |
3465 | break; |
3329 | break; |
3466 | } |
3330 | } |
3467 | } |
3331 | } |
3468 | } |
3332 | } |
… | |
… | |
3474 | |
3338 | |
3475 | selection.beg.col = 0; |
3339 | selection.beg.col = 0; |
3476 | selection.end.col = ncol; |
3340 | selection.end.col = ncol; |
3477 | |
3341 | |
3478 | // select a complete logical line |
3342 | // select a complete logical line |
3479 | while (selection.beg.row > -TermWin.saveLines |
3343 | while (selection.beg.row > -saveLines |
3480 | && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) |
3344 | && ROW(selection.beg.row - 1).is_longer ()) |
3481 | selection.beg.row--; |
3345 | selection.beg.row--; |
3482 | |
3346 | |
3483 | while (selection.end.row < TermWin.nrow |
3347 | while (selection.end.row < nrow |
3484 | && screen.tlen[selection.end.row + TermWin.saveLines] == -1) |
3348 | && ROW(selection.end.row).is_longer ()) |
3485 | selection.end.row++; |
3349 | selection.end.row++; |
3486 | } |
3350 | } |
3487 | } |
3351 | } |
3488 | |
3352 | |
3489 | if (button3 && buttonpress) |
3353 | if (button3 && buttonpress) |
… | |
… | |
3500 | } |
3364 | } |
3501 | } |
3365 | } |
3502 | |
3366 | |
3503 | #if ENABLE_FRILLS |
3367 | #if ENABLE_FRILLS |
3504 | if (selection.rect && selection.beg.col > selection.end.col) |
3368 | if (selection.rect && selection.beg.col > selection.end.col) |
3505 | SWAP_IT (selection.beg.col, selection.end.col, int); |
3369 | ::swap (selection.beg.col, selection.end.col); |
3506 | #endif |
3370 | #endif |
3507 | } |
3371 | } |
3508 | |
3372 | |
3509 | #if ENABLE_FRILLS |
3373 | #if ENABLE_FRILLS |
3510 | void |
3374 | void |
… | |
… | |
3514 | text_t *stp; |
3378 | text_t *stp; |
3515 | |
3379 | |
3516 | end_col = selection.end.col; |
3380 | end_col = selection.end.col; |
3517 | end_row = selection.end.row; |
3381 | end_row = selection.end.row; |
3518 | |
3382 | |
3519 | for ( ; end_row >= selection.beg.row; ) |
3383 | for (; end_row >= selection.beg.row; ) |
3520 | { |
3384 | { |
3521 | stp = screen.text[end_row + TermWin.saveLines]; |
3385 | stp = ROW(end_row).t; |
3522 | |
3386 | |
3523 | while (--end_col >= 0) |
3387 | while (--end_col >= 0) |
3524 | { |
3388 | { |
3525 | if (stp[end_col] != ' ' |
3389 | if (stp[end_col] != ' ' |
3526 | && stp[end_col] != '\t' |
3390 | && stp[end_col] != '\t' |
3527 | && stp[end_col] != NOCHAR) |
3391 | && stp[end_col] != NOCHAR) |
3528 | break; |
3392 | break; |
3529 | } |
3393 | } |
3530 | |
3394 | |
3531 | if (end_col >= 0 |
3395 | if (end_col >= 0 |
3532 | || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) |
3396 | || !ROW(end_row - 1).is_longer ()) |
3533 | { |
3397 | { |
3534 | selection.end.col = end_col + 1; |
3398 | selection.end.col = end_col + 1; |
3535 | selection.end.row = end_row; |
3399 | selection.end.row = end_row; |
3536 | break; |
3400 | break; |
3537 | } |
3401 | } |
3538 | |
3402 | |
3539 | end_row--; |
3403 | end_row--; |
3540 | end_col = TermWin.ncol; |
3404 | end_col = ncol; |
3541 | } |
3405 | } |
3542 | |
3406 | |
3543 | if (selection.mark.row > selection.end.row) |
3407 | if (selection.mark.row > selection.end.row) |
3544 | { |
3408 | { |
3545 | selection.mark.row = selection.end.row; |
3409 | selection.mark.row = selection.end.row; |
… | |
… | |
3708 | */ |
3572 | */ |
3709 | void |
3573 | void |
3710 | rxvt_term::pixel_position (int *x, int *y) |
3574 | rxvt_term::pixel_position (int *x, int *y) |
3711 | { |
3575 | { |
3712 | *x = Pixel2Col (*x); |
3576 | *x = Pixel2Col (*x); |
3713 | /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ |
3577 | /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ |
3714 | *y = Pixel2Row (*y); |
3578 | *y = Pixel2Row (*y); |
3715 | /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ |
3579 | /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ |
3716 | } |
3580 | } |
3717 | |
3581 | |
3718 | /* ------------------------------------------------------------------------- */ |
3582 | /* ------------------------------------------------------------------------- */ |
3719 | #ifdef USE_XIM |
3583 | #ifdef USE_XIM |
3720 | void |
3584 | void |
3721 | rxvt_term::im_set_position (XPoint &pos) |
3585 | rxvt_term::im_set_position (XPoint &pos) |
3722 | { |
3586 | { |
3723 | XWindowAttributes xwa; |
3587 | XWindowAttributes xwa; |
3724 | |
3588 | |
3725 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
3589 | XGetWindowAttributes (display->display, vt, &xwa); |
3726 | |
3590 | |
3727 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3591 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3728 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; |
3592 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3729 | } |
3593 | } |
3730 | #endif |
3594 | #endif |
3731 | |
3595 | |
3732 | #if ENABLE_OVERLAY |
3596 | #if ENABLE_OVERLAY |
3733 | void |
3597 | void |
3734 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3598 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3735 | { |
3599 | { |
3736 | if (TermWin.nrow < 3 || TermWin.ncol < 3) |
3600 | if (nrow < 3 || ncol < 3) |
3737 | return; |
3601 | return; |
3738 | |
3602 | |
3739 | want_refresh = 1; |
3603 | want_refresh = 1; |
3740 | |
3604 | |
3741 | scr_overlay_off (); |
3605 | scr_overlay_off (); |
3742 | |
3606 | |
3743 | if (x < 0) x = TermWin.ncol - w; |
3607 | if (x < 0) x = ncol - w; |
3744 | if (y < 0) y = TermWin.nrow - h; |
3608 | if (y < 0) y = nrow - h; |
3745 | |
3609 | |
3746 | // make space for border |
3610 | // make space for border |
3747 | w += 2; MIN_IT (w, TermWin.ncol); |
3611 | w += 2; MIN_IT (w, ncol); |
3748 | h += 2; MIN_IT (h, TermWin.nrow); |
3612 | h += 2; MIN_IT (h, nrow); |
3749 | |
3613 | |
3750 | x -= 1; MAX_IT (x, 0); |
3614 | x -= 1; MAX_IT (x, 0); |
3751 | y -= 1; MAX_IT (y, 0); |
3615 | y -= 1; MAX_IT (y, 0); |
3752 | |
3616 | |
3753 | MIN_IT (x, TermWin.ncol - w); |
3617 | MIN_IT (x, ncol - w); |
3754 | MIN_IT (y, TermWin.nrow - h); |
3618 | MIN_IT (y, nrow - h); |
3755 | |
3619 | |
3756 | ov_x = x; ov_y = y; |
3620 | ov_x = x; ov_y = y; |
3757 | ov_w = w; ov_h = h; |
3621 | ov_w = w; ov_h = h; |
3758 | |
3622 | |
3759 | ov_text = new text_t *[h]; |
3623 | ov_text = new text_t *[h]; |
… | |
… | |
3845 | rxvt_term::scr_swap_overlay () |
3709 | rxvt_term::scr_swap_overlay () |
3846 | { |
3710 | { |
3847 | if (!ov_text) |
3711 | if (!ov_text) |
3848 | return; |
3712 | return; |
3849 | |
3713 | |
3850 | int row_offset = ov_y + TermWin.saveLines - TermWin.view_start; |
|
|
3851 | |
|
|
3852 | // swap screen mem with overlay |
3714 | // swap screen mem with overlay |
3853 | for (int y = ov_h; y--; ) |
3715 | for (int y = ov_h; y--; ) |
3854 | { |
3716 | { |
3855 | text_t *t1 = ov_text[y]; |
3717 | text_t *t1 = ov_text[y]; |
3856 | rend_t *r1 = ov_rend[y]; |
3718 | rend_t *r1 = ov_rend[y]; |
3857 | |
3719 | |
3858 | text_t *t2 = screen.text[y + row_offset] + ov_x; |
3720 | text_t *t2 = ROW(y - view_start).t + ov_x; |
3859 | rend_t *r2 = screen.rend[y + row_offset] + ov_x; |
3721 | rend_t *r2 = ROW(y - view_start).r + ov_x; |
3860 | |
3722 | |
3861 | for (int x = ov_w; x--; ) |
3723 | for (int x = ov_w; x--; ) |
3862 | { |
3724 | { |
3863 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3725 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3864 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3726 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
… | |
… | |
3866 | } |
3728 | } |
3867 | } |
3729 | } |
3868 | |
3730 | |
3869 | #endif |
3731 | #endif |
3870 | /* ------------------------------------------------------------------------- */ |
3732 | /* ------------------------------------------------------------------------- */ |
|
|
3733 | |