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