… | |
… | |
46 | |
46 | |
47 | /* ------------------------------------------------------------------------- * |
47 | /* ------------------------------------------------------------------------- * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * ------------------------------------------------------------------------- */ |
49 | * ------------------------------------------------------------------------- */ |
50 | #define ZERO_SCROLLBACK() \ |
50 | #define ZERO_SCROLLBACK() \ |
51 | if (options & Opt_scrollTtyOutput) \ |
51 | if (OPTION (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 ? MOD (llen - 1, ncol) + 1 : 0; |
290 | assert (drawn_text[p] && drawn_rend[p]); |
357 | #ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY |
|
|
358 | if (qline->l < 0) |
|
|
359 | { |
|
|
360 | fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D |
|
|
361 | qline->l = 0; |
|
|
362 | } |
291 | #endif |
363 | #endif |
292 | talloc->free (drawn_text[p]); |
364 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
293 | ralloc->free (drawn_rend[p]); |
|
|
294 | } |
365 | } |
|
|
366 | while (p != pend && q > 0); |
295 | |
367 | |
296 | /* we have fewer rows so fix up cursor position */ |
368 | term_start = total_rows - nrow; |
297 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
369 | nsaved = term_start - q; |
|
|
370 | |
|
|
371 | // make sure all terminal lines exist |
|
|
372 | while (nsaved < 0) |
|
|
373 | scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); |
298 | |
374 | |
299 | scr_reset_realloc (); /* realloc _last_ */ |
|
|
300 | } |
|
|
301 | else if (nrow > prev_nrow) |
|
|
302 | { |
375 | } |
303 | /* add rows */ |
376 | else |
304 | scr_reset_realloc (); /* realloc _first_ */ |
377 | { |
305 | |
378 | // if no scrollback exists (yet), wing, instead of wrap |
306 | TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
379 | |
307 | |
380 | 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 | { |
381 | { |
312 | screen.tlen[p] = 0; |
382 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
313 | screen.text[p] = NULL; |
383 | line_t &qline = row_buf [row]; |
314 | screen.rend[p] = NULL; |
384 | |
|
|
385 | qline = pline; |
|
|
386 | lresize (qline); |
315 | } |
387 | } |
316 | |
388 | |
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++) |
389 | for (int row = prev_nrow; row < nrow; row++) |
321 | { |
390 | { |
322 | swap.tlen[p] = 0; |
391 | 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 | } |
392 | } |
330 | |
393 | |
331 | if (k > 0) |
394 | 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 | { |
395 | } |
350 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
351 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
352 | |
396 | |
353 | for (p = 0; p < total_rows; p++) |
397 | #ifdef DEBUG_STRICT //TODO: remove |
354 | { |
398 | for (int i = -nsaved; i < nrow; i++) |
355 | if (screen.text[p]) |
399 | assert (ROW (i).t); |
356 | { |
400 | #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 | |
401 | |
360 | MIN_IT (screen.tlen[p], (int16_t)ncol); |
402 | free (old_buf); |
|
|
403 | delete old_ta; |
|
|
404 | delete old_ra; |
361 | |
405 | |
362 | if (ncol > prev_ncol) |
406 | clamp_it (screen.cur.row, 0, nrow - 1); |
363 | scr_blank_line (&screen.text[p][prev_ncol], |
407 | 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 | |
408 | |
400 | if (tabs) |
409 | if (tabs) |
401 | free (tabs); |
410 | free (tabs); |
402 | } |
411 | } |
403 | |
412 | |
404 | prev_nrow = nrow; |
413 | prev_nrow = nrow; |
405 | prev_ncol = ncol; |
414 | prev_ncol = ncol; |
406 | |
415 | |
407 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
416 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
408 | |
417 | |
409 | for (p = 0; p < ncol; p++) |
418 | for (int col = ncol; col--; ) |
410 | tabs[p] = (p % TABSIZE == 0) ? 1 : 0; |
419 | tabs [col] = col % TABSIZE == 0; |
411 | |
420 | |
412 | tt_winch (); |
421 | tt_winch (); |
413 | } |
422 | } |
414 | |
423 | |
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 | /* ------------------------------------------------------------------------- */ |
424 | /* ------------------------------------------------------------------------- */ |
439 | /* |
425 | /* |
440 | * Free everything. That way malloc debugging can find leakage. |
426 | * Free everything. That way malloc debugging can find leakage. |
441 | */ |
427 | */ |
442 | void |
428 | void |
443 | rxvt_term::scr_release () |
429 | rxvt_term::scr_release () |
444 | { |
430 | { |
445 | unsigned int total_rows; |
|
|
446 | int i; |
|
|
447 | |
|
|
448 | total_rows = TermWin.nrow + TermWin.saveLines; |
|
|
449 | |
|
|
450 | delete talloc; talloc = 0; |
431 | delete talloc; talloc = 0; |
451 | delete ralloc; ralloc = 0; |
432 | delete ralloc; ralloc = 0; |
452 | |
433 | |
453 | free (screen.text); |
434 | free (row_buf); |
454 | free (screen.tlen); |
435 | free (swap_buf); |
455 | free (screen.rend); |
|
|
456 | free (drawn_text); |
436 | free (drawn_buf); |
457 | free (drawn_rend); |
437 | 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); |
438 | free (tabs); |
464 | |
439 | |
465 | /* NULL these so if anything tries to use them, we'll know about it */ |
440 | 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 | } |
441 | } |
473 | |
442 | |
474 | /* ------------------------------------------------------------------------- */ |
443 | /* ------------------------------------------------------------------------- */ |
475 | /* |
444 | /* |
476 | * Hard reset |
445 | * Hard reset |
… | |
… | |
527 | set_font_style (); |
496 | set_font_style (); |
528 | break; |
497 | break; |
529 | } |
498 | } |
530 | |
499 | |
531 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
500 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
532 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
501 | min_it (s->cur.row, nrow - 1); |
533 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
502 | min_it (s->cur.col, ncol - 1); |
534 | #ifdef DEBUG_STRICT |
503 | #ifdef DEBUG_STRICT |
535 | assert (s->cur.row >= 0); |
504 | assert (s->cur.row >= 0); |
536 | assert (s->cur.col >= 0); |
505 | 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 |
506 | #endif |
541 | } |
507 | } |
542 | |
508 | |
543 | /* ------------------------------------------------------------------------- */ |
509 | /* ------------------------------------------------------------------------- */ |
544 | /* |
510 | /* |
… | |
… | |
547 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
513 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
548 | */ |
514 | */ |
549 | int |
515 | int |
550 | rxvt_term::scr_change_screen (int scrn) |
516 | rxvt_term::scr_change_screen (int scrn) |
551 | { |
517 | { |
552 | int i; |
|
|
553 | #if NSCREENS |
|
|
554 | int offset; |
|
|
555 | #endif |
|
|
556 | |
|
|
557 | want_refresh = 1; |
518 | want_refresh = 1; |
558 | |
|
|
559 | TermWin.view_start = 0; |
519 | view_start = 0; |
560 | |
520 | |
561 | if (current_screen == scrn) |
521 | if (current_screen == scrn) |
562 | return scrn; |
522 | return scrn; |
563 | |
523 | |
564 | selection_check (2); /* check for boundary cross */ |
524 | selection_check (2); /* check for boundary cross */ |
565 | |
525 | |
566 | i = current_screen; current_screen = scrn; scrn = i; |
526 | int i = current_screen; current_screen = scrn; scrn = i; |
567 | |
527 | |
568 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
528 | ::swap (screen.cur.row, swap.cur.row); |
569 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
529 | ::swap (screen.cur.col, swap.cur.col); |
570 | MAX_IT (screen.cur.row, 0); |
530 | |
571 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
531 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
572 | MAX_IT (screen.cur.col, 0); |
532 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
573 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
|
|
574 | |
533 | |
575 | #if NSCREENS |
534 | #if NSCREENS |
576 | if (options & Opt_secondaryScreen) |
535 | if (OPTION (Opt_secondaryScreen)) |
577 | { |
536 | { |
578 | num_scr = 0; |
537 | num_scr = 0; |
579 | offset = TermWin.saveLines; |
|
|
580 | |
538 | |
581 | for (i = prev_nrow; i--;) |
539 | for (int i = prev_nrow; i--; ) |
582 | { |
540 | ::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 | |
541 | |
588 | SWAP_IT (screen.charset, swap.charset, int16_t); |
542 | ::swap (screen.charset, swap.charset); |
589 | SWAP_IT (screen.flags, swap.flags, int); |
543 | ::swap (screen.flags, swap.flags); |
590 | screen.flags |= Screen_VisibleCursor; |
544 | screen.flags |= Screen_VisibleCursor; |
591 | swap.flags |= Screen_VisibleCursor; |
545 | swap.flags |= Screen_VisibleCursor; |
592 | } |
546 | } |
593 | else |
547 | else |
594 | #endif |
548 | #endif |
595 | if (options & Opt_secondaryScroll) |
549 | if (OPTION (Opt_secondaryScroll)) |
596 | scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); |
550 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
597 | |
551 | |
598 | return scrn; |
552 | return scrn; |
599 | } |
553 | } |
600 | |
554 | |
601 | // clear WrapNext indicator, solidifying position on next line |
555 | // clear WrapNext indicator, solidifying position on next line |
… | |
… | |
608 | screen.flags &= ~Screen_WrapNext; |
562 | screen.flags &= ~Screen_WrapNext; |
609 | |
563 | |
610 | screen.cur.col = 0; |
564 | screen.cur.col = 0; |
611 | |
565 | |
612 | if (screen.cur.row == screen.bscroll) |
566 | if (screen.cur.row == screen.bscroll) |
613 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
567 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
614 | else if (screen.cur.row < TermWin.nrow - 1) |
568 | else if (screen.cur.row < nrow - 1) |
615 | screen.cur.row++; |
569 | screen.cur.row++; |
616 | } |
570 | } |
617 | |
571 | |
618 | /* ------------------------------------------------------------------------- */ |
572 | /* ------------------------------------------------------------------------- */ |
619 | /* |
573 | /* |
… | |
… | |
649 | /* ------------------------------------------------------------------------- */ |
603 | /* ------------------------------------------------------------------------- */ |
650 | /* |
604 | /* |
651 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
605 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
652 | * count positive ==> scroll up |
606 | * count positive ==> scroll up |
653 | * count negative ==> scroll down |
607 | * count negative ==> scroll down |
654 | * spec == 0 for normal routines |
|
|
655 | */ |
608 | */ |
656 | int |
609 | int |
657 | rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) |
610 | rxvt_term::scr_scroll_text (int row1, int row2, int count) |
658 | { |
611 | { |
659 | int i, j; |
|
|
660 | long nscrolled; |
|
|
661 | |
|
|
662 | if (count == 0 || (row1 > row2)) |
612 | if (count == 0 || (row1 > row2)) |
663 | return 0; |
613 | return 0; |
664 | |
614 | |
665 | want_refresh = 1; |
615 | want_refresh = 1; |
|
|
616 | num_scr += count; |
666 | |
617 | |
667 | if (row1 == 0 && count > 0 |
618 | if (count > 0 |
|
|
619 | && row1 == 0 |
|
|
620 | && row2 == nrow - 1 |
668 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
621 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
669 | { |
|
|
670 | nscrolled = (long)TermWin.nscrolled + (long)count; |
|
|
671 | |
|
|
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 | } |
622 | { |
682 | else if (!spec) |
623 | nsaved = min (nsaved + count, saveLines); |
683 | row1 += TermWin.saveLines; |
624 | term_start = (term_start + count) % total_rows; |
684 | |
625 | |
685 | row2 += TermWin.saveLines; |
|
|
686 | |
|
|
687 | if (selection.op && current_screen == selection.screen) |
626 | 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 | } |
627 | { |
701 | else if (j >= row1 && j <= row2) |
|
|
702 | { |
|
|
703 | /* move selected region too */ |
|
|
704 | selection.beg.row -= count; |
628 | selection.beg.row -= count; |
705 | selection.end.row -= count; |
629 | selection.end.row -= count; |
706 | selection.mark.row -= count; |
630 | selection.mark.row -= count; |
|
|
631 | |
|
|
632 | if (selection.beg.row < -nsaved |
|
|
633 | || selection.end.row < -nsaved |
|
|
634 | || selection.mark.row < -nsaved) |
|
|
635 | { |
|
|
636 | CLEAR_ALL_SELECTION (); |
|
|
637 | selection.op = SELECTION_CLEAR; |
707 | } |
638 | } |
708 | } |
|
|
709 | |
|
|
710 | selection_check (0); /* _after_ TermWin.nscrolled update */ |
|
|
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 | { |
639 | } |
744 | buf_text[i] = screen.text[j]; |
640 | |
745 | buf_rend[i] = screen.rend[j]; |
641 | for (int i = count; i--; ) |
746 | } |
642 | { |
747 | |
643 | ROW(row2 - i).l = 0; |
748 | /* Rotate lines */ |
644 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
749 | for (j = row2, i = j - count; i >= row1; i--, j--) |
|
|
750 | { |
645 | } |
751 | screen.tlen[j] = screen.tlen[i]; |
646 | |
752 | screen.text[j] = screen.text[i]; |
647 | if (OPTION (Opt_scrollWithBuffer) |
753 | screen.rend[j] = screen.rend[i]; |
648 | && view_start != 0 |
|
|
649 | && view_start != saveLines) |
|
|
650 | scr_page (UP, count); |
|
|
651 | } |
|
|
652 | else |
|
|
653 | { |
|
|
654 | if (selection.op && current_screen == selection.screen) |
754 | } |
655 | { |
|
|
656 | if ((selection.beg.row < row1 && selection.end.row > row1) |
|
|
657 | || (selection.beg.row < row2 && selection.end.row > row2) |
|
|
658 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
|
|
659 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
|
|
660 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
|
|
661 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
|
|
662 | { |
|
|
663 | CLEAR_ALL_SELECTION (); |
|
|
664 | selection.op = SELECTION_CLEAR; |
|
|
665 | } |
|
|
666 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
|
|
667 | { |
|
|
668 | /* move selected region too */ |
|
|
669 | selection.beg.row -= count; |
|
|
670 | selection.end.row -= count; |
|
|
671 | selection.mark.row -= count; |
|
|
672 | |
|
|
673 | selection_check (0); |
|
|
674 | } |
|
|
675 | } |
755 | |
676 | |
756 | j = row1, i = count; |
677 | // use a simple and robust scrolling algorithm, this |
757 | count = -count; |
678 | // part of scr_scroll_text is not time-critical. |
758 | } |
|
|
759 | |
679 | |
760 | /* Resurrect lines */ |
680 | int rows = row2 - row1 + 1; |
761 | memset (screen.tlen + j, 0, i * sizeof (int16_t)); |
681 | |
762 | memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); |
682 | min_it (count, rows); |
763 | memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); |
683 | |
764 | if (!spec) /* line length may not equal TermWin.ncol */ |
684 | for (int row = 0; row < rows; row++) |
765 | for (; i--; j++) |
685 | { |
766 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); |
686 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
|
|
687 | |
|
|
688 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
|
|
689 | scr_blank_screen_mem (temp_buf [row], rstyle); |
|
|
690 | } |
|
|
691 | |
|
|
692 | for (int row = 0; row < rows; row++) |
|
|
693 | ROW(row1 + row) = temp_buf [row]; |
|
|
694 | } |
767 | |
695 | |
768 | return count; |
696 | return count; |
769 | } |
697 | } |
770 | |
698 | |
771 | /* ------------------------------------------------------------------------- */ |
699 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
773 | * Add text given in <str> of length <len> to screen struct |
701 | * Add text given in <str> of length <len> to screen struct |
774 | */ |
702 | */ |
775 | void |
703 | void |
776 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
704 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
777 | { |
705 | { |
|
|
706 | if (len <= 0) /* sanity */ |
|
|
707 | return; |
|
|
708 | |
778 | unsigned char checksel; |
709 | unsigned char checksel; |
779 | unicode_t c; |
710 | unicode_t c; |
780 | int i, row, last_col; |
711 | int last_col; |
781 | text_t *stp; |
712 | const unicode_t *strend = str + len; |
782 | rend_t *srp; |
|
|
783 | |
|
|
784 | if (len <= 0) /* sanity */ |
|
|
785 | return; |
|
|
786 | |
713 | |
787 | want_refresh = 1; |
714 | want_refresh = 1; |
788 | ZERO_SCROLLBACK (); |
715 | ZERO_SCROLLBACK (); |
789 | last_col = TermWin.ncol; |
716 | last_col = ncol; |
790 | |
717 | |
791 | if (nlines > 0) |
718 | if (nlines > 0) |
792 | { |
719 | { |
793 | nlines += screen.cur.row - screen.bscroll; |
720 | nlines += screen.cur.row - screen.bscroll; |
794 | if ((nlines > 0) |
721 | if (nlines > 0 |
795 | && (screen.tscroll == 0) |
722 | && screen.tscroll == 0 |
796 | && (screen.bscroll == (TermWin.nrow - 1))) |
723 | && screen.bscroll == (nrow - 1)) |
797 | { |
724 | { |
798 | /* _at least_ this many lines need to be scrolled */ |
725 | /* _at least_ this many lines need to be scrolled */ |
799 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
726 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines); |
800 | screen.cur.row -= nlines; |
727 | screen.cur.row -= nlines; |
801 | } |
728 | } |
802 | } |
729 | } |
803 | |
730 | |
804 | #ifdef DEBUG_STRICT |
731 | #ifdef DEBUG_STRICT |
805 | assert (screen.cur.col < last_col); |
732 | assert (screen.cur.col < last_col); |
806 | assert ((screen.cur.row < TermWin.nrow) |
733 | assert (screen.cur.row < nrow |
807 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
734 | && screen.cur.row >= -nsaved); |
808 | #else /* drive with your eyes closed */ |
|
|
809 | MIN_IT (screen.cur.col, last_col - 1); |
|
|
810 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
|
|
811 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
|
|
812 | #endif |
735 | #endif |
813 | row = screen.cur.row + TermWin.saveLines; |
736 | int row = screen.cur.row; |
814 | |
737 | |
815 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
738 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
816 | |
739 | |
817 | stp = screen.text[row]; |
740 | line_t *line = &ROW(row); |
818 | srp = screen.rend[row]; |
|
|
819 | |
741 | |
820 | while (len--) |
742 | while (str < strend) |
821 | { |
743 | { |
822 | c = *str++; |
744 | c = *str++; |
823 | |
745 | |
824 | if (c < 0x20) |
746 | if (c < 0x20) |
825 | switch (c) |
747 | if (c == C0_LF) |
826 | { |
748 | { |
827 | case C0_HT: |
749 | if (!line->is_longer ()) /* XXX: think about this */ |
828 | scr_tab (1, true); |
750 | max_it (line->l, screen.cur.col); |
829 | continue; |
|
|
830 | |
751 | |
831 | case C0_LF: |
|
|
832 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
833 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
834 | |
|
|
835 | screen.flags &= ~Screen_WrapNext; |
752 | screen.flags &= ~Screen_WrapNext; |
836 | |
753 | |
837 | if (screen.cur.row == screen.bscroll) |
754 | if (screen.cur.row == screen.bscroll) |
838 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
755 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
839 | else if (screen.cur.row < (TermWin.nrow - 1)) |
756 | else if (screen.cur.row < (nrow - 1)) |
840 | row = (++screen.cur.row) + TermWin.saveLines; |
757 | row = ++screen.cur.row; |
841 | |
758 | |
842 | stp = screen.text[row]; /* _must_ refresh */ |
759 | line = &ROW(row); /* _must_ refresh */ |
843 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
844 | continue; |
760 | continue; |
|
|
761 | } |
|
|
762 | else if (c == C0_CR) |
|
|
763 | { |
|
|
764 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
765 | max_it (line->l, screen.cur.col); |
845 | |
766 | |
846 | case C0_CR: |
|
|
847 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
848 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
849 | |
|
|
850 | screen.flags &= ~Screen_WrapNext; |
767 | screen.flags &= ~Screen_WrapNext; |
851 | screen.cur.col = 0; |
768 | screen.cur.col = 0; |
852 | continue; |
769 | continue; |
|
|
770 | } |
|
|
771 | else if (c == C0_HT) |
|
|
772 | { |
|
|
773 | scr_tab (1, true); |
|
|
774 | continue; |
853 | } |
775 | } |
854 | |
776 | |
855 | if (checksel /* see if we're writing within selection */ |
777 | if (checksel /* see if we're writing within selection */ |
856 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
778 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
857 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
779 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
… | |
… | |
865 | CLEAR_SELECTION (); |
787 | CLEAR_SELECTION (); |
866 | } |
788 | } |
867 | |
789 | |
868 | if (screen.flags & Screen_WrapNext) |
790 | if (screen.flags & Screen_WrapNext) |
869 | { |
791 | { |
870 | screen.tlen[row] = -1; |
792 | line->set_is_longer (); |
871 | |
793 | |
872 | scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; |
794 | scr_do_wrap (); |
873 | |
|
|
874 | stp = screen.text[row]; /* _must_ refresh */ |
|
|
875 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
876 | } |
795 | |
|
|
796 | row = screen.cur.row; |
|
|
797 | line = &ROW(row); /* _must_ refresh */ |
|
|
798 | } |
|
|
799 | |
|
|
800 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
|
|
801 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
|
|
802 | c = 0xfffd; |
877 | |
803 | |
878 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
804 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
879 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
805 | // do wcwidth before further replacements, as wcwidth might return -1 |
880 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
806 | // for the line drawing characters below as they might be invalid in the current |
|
|
807 | // locale. |
881 | int width = c < 0x100 ? 1 : wcwidth (c); |
808 | int width = c < 0x100 ? 1 : wcwidth (c); |
882 | |
809 | |
883 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
810 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
884 | { |
811 | { |
885 | // vt100 special graphics and line drawing |
812 | // vt100 special graphics and line drawing |
886 | // 5f-7e standard vt100 |
813 | // 5f-7e standard vt100 |
887 | // 40-5e rxvt extension for extra curses acs chars |
814 | // 40-5e rxvt extension for extra curses acs chars |
888 | static uint16_t vt100_0[63] = { // 40 .. 7e |
815 | static uint16_t vt100_0[62] = { // 41 .. 7e |
889 | 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! |
816 | 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman! |
890 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f |
817 | 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f |
891 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 |
818 | 0, 0, 0, 0, 0, 0, 0, 0, // 50-57 |
892 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f |
819 | 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f |
893 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
820 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
894 | 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f |
821 | 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f |
895 | 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 |
822 | 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 |
896 | 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e |
823 | 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e |
897 | }; |
824 | }; |
898 | |
825 | |
899 | if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) |
826 | if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41]) |
900 | { |
827 | { |
901 | c = vt100_0[c - 0x40]; |
828 | c = vt100_0[c - 0x41]; |
902 | width = 1; |
829 | width = 1; // vt100 line drawing characters are always single-width |
903 | } |
830 | } |
904 | } |
831 | } |
905 | |
832 | |
906 | if (screen.flags & Screen_Insert) |
833 | if (screen.flags & Screen_Insert) |
907 | scr_insdel_chars (width, INSERT); |
834 | scr_insdel_chars (width, INSERT); |
908 | |
835 | |
909 | if (width != 0) |
836 | if (width != 0) |
910 | { |
837 | { |
911 | // some utf-8 decoders decode surrogate characters. |
|
|
912 | if (0xd800 <= c && c <= 0xdfff) |
|
|
913 | c = 0xfffd; |
|
|
914 | |
|
|
915 | #if !UNICODE_3 |
838 | #if !UNICODE_3 |
916 | // trim characters we can't store directly :( |
839 | // trim characters we can't store directly :( |
917 | if (c >= 0x10000) |
840 | if (c >= 0x10000) |
918 | # if ENABLE_COMBINING |
841 | # if ENABLE_COMBINING |
919 | c = rxvt_composite.compose (c); // map to lower 16 bits |
842 | c = rxvt_composite.compose (c); // map to lower 16 bits |
… | |
… | |
921 | c = 0xfffd; |
844 | c = 0xfffd; |
922 | # endif |
845 | # endif |
923 | #endif |
846 | #endif |
924 | |
847 | |
925 | // nuke the character at this position, if required |
848 | // nuke the character at this position, if required |
926 | if (stp[screen.cur.col] == NOCHAR |
849 | if (line->t[screen.cur.col] == NOCHAR |
927 | || (screen.cur.col < TermWin.ncol - 1 |
850 | || (screen.cur.col < ncol - 1 |
928 | && stp[screen.cur.col + 1] == NOCHAR)) |
851 | && line->t[screen.cur.col + 1] == NOCHAR)) |
929 | { |
852 | { |
930 | int col = screen.cur.col; |
853 | int col = screen.cur.col; |
931 | |
854 | |
932 | // find begin |
855 | // find begin |
933 | while (col > 0 && stp[col] == NOCHAR) |
856 | while (col > 0 && line->t[col] == NOCHAR) |
934 | col--; |
857 | col--; |
935 | |
858 | |
936 | rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); |
859 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
937 | |
860 | |
938 | // found begin, nuke |
861 | // found begin, nuke |
939 | do { |
862 | do { |
940 | stp[col] = ' '; |
863 | line->t[col] = ' '; |
941 | srp[col] = rend; |
864 | line->r[col] = rend; |
942 | col++; |
865 | col++; |
943 | } while (col < TermWin.ncol && stp[col] == NOCHAR); |
866 | } while (col < ncol && line->t[col] == NOCHAR); |
944 | } |
867 | } |
945 | |
868 | |
946 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
869 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
870 | |
|
|
871 | // if the character doesn't fit into the remaining columns... |
|
|
872 | if (screen.cur.col > last_col - width && last_col >= width) |
|
|
873 | { |
|
|
874 | // ...output spaces |
|
|
875 | c = ' '; |
|
|
876 | // and try the same character next loop iteration |
|
|
877 | --str; |
|
|
878 | } |
947 | |
879 | |
948 | do |
880 | do |
949 | { |
881 | { |
950 | stp[screen.cur.col] = c; |
882 | line->t[screen.cur.col] = c; |
951 | srp[screen.cur.col] = rend; |
883 | line->r[screen.cur.col] = rend; |
952 | |
884 | |
953 | if (screen.cur.col < last_col - 1) |
885 | if (screen.cur.col < last_col - 1) |
954 | screen.cur.col++; |
886 | screen.cur.col++; |
955 | else |
887 | else |
956 | { |
888 | { |
957 | screen.tlen[row] = last_col; |
889 | line->l = last_col; |
958 | if (screen.flags & Screen_Autowrap) |
890 | if (screen.flags & Screen_Autowrap) |
959 | screen.flags |= Screen_WrapNext; |
891 | screen.flags |= Screen_WrapNext; |
960 | break; |
892 | break; |
961 | } |
893 | } |
962 | |
894 | |
… | |
… | |
964 | } |
896 | } |
965 | while (--width > 0); |
897 | while (--width > 0); |
966 | |
898 | |
967 | // pad with spaces when overwriting wide character with smaller one |
899 | // pad with spaces when overwriting wide character with smaller one |
968 | if (!width) |
900 | if (!width) |
969 | for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) |
901 | for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) |
970 | { |
902 | { |
971 | stp[c] = ' '; |
903 | line->t[c] = ' '; |
972 | srp[c] = rend; |
904 | line->r[c] = rend; |
973 | } |
905 | } |
974 | } |
906 | } |
975 | else if (width == 0) |
907 | else // width == 0 |
976 | { |
908 | { |
977 | #if ENABLE_COMBINING |
909 | #if ENABLE_COMBINING |
978 | // handle combining characters |
910 | // handle combining characters |
979 | // we just tag the accent on the previous on-screen character. |
911 | // we just tag the accent on the previous on-screen character. |
980 | // this is arguably not correct, but also arguably not wrong. |
912 | // this is arguably not correct, but also arguably not wrong. |
981 | // we don't handle double-width characters nicely yet. |
913 | // we don't handle double-width characters nicely yet. |
982 | |
|
|
983 | text_t *tp; |
914 | text_t *tp; |
984 | rend_t *rp; |
915 | rend_t *rp; |
985 | |
916 | |
986 | if (screen.cur.col > 0) |
917 | if (screen.cur.col > 0) |
987 | { |
918 | { |
988 | tp = stp + screen.cur.col - 1; |
919 | tp = line->t + screen.cur.col - 1; |
989 | rp = srp + screen.cur.col - 1; |
920 | rp = line->r + screen.cur.col - 1; |
990 | |
921 | |
991 | while (*tp == NOCHAR && tp > stp) |
922 | while (*tp == NOCHAR && tp > line->t) |
992 | tp--, rp--; |
923 | tp--, rp--; |
993 | } |
924 | } |
994 | else if (screen.cur.row > 0 |
925 | else if (screen.cur.row > 0 |
995 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
926 | && ROW(screen.cur.row - 1).is_longer ()) |
996 | { |
927 | { |
997 | int line = screen.cur.row - 1 + TermWin.saveLines; |
928 | line_t *line = &ROW(screen.cur.row - 1); |
998 | |
929 | |
999 | tp = screen.text[line] + last_col - 1; |
930 | tp = line->t + last_col - 1; |
1000 | rp = screen.rend[line] + last_col - 1; |
931 | rp = line->r + last_col - 1; |
1001 | |
932 | |
1002 | while (*tp == NOCHAR && tp > screen.text[line]) |
933 | while (*tp == NOCHAR && tp > line->t) |
1003 | tp--, rp--; |
934 | tp--, rp--; |
1004 | } |
935 | } |
1005 | else |
936 | else |
1006 | continue; |
937 | continue; |
1007 | |
938 | |
… | |
… | |
1014 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
945 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
1015 | #endif |
946 | #endif |
1016 | } |
947 | } |
1017 | } |
948 | } |
1018 | |
949 | |
1019 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
950 | if (!line->is_longer ()) /* XXX: think about this */ |
1020 | MAX_IT (screen.tlen[row], screen.cur.col); |
951 | max_it (line->l, screen.cur.col); |
1021 | |
952 | |
1022 | #ifdef DEBUG_STRICT |
953 | #ifdef DEBUG_STRICT |
1023 | assert (screen.cur.row >= 0); |
954 | assert (screen.cur.row >= 0); |
1024 | #else /* drive with your eyes closed */ |
|
|
1025 | MAX_IT (screen.cur.row, 0); |
|
|
1026 | #endif |
955 | #endif |
1027 | } |
956 | } |
1028 | |
957 | |
1029 | /* ------------------------------------------------------------------------- */ |
958 | /* ------------------------------------------------------------------------- */ |
1030 | /* |
959 | /* |
… | |
… | |
1039 | if (screen.cur.col == 0) |
968 | if (screen.cur.col == 0) |
1040 | { |
969 | { |
1041 | if (screen.cur.row > 0) |
970 | if (screen.cur.row > 0) |
1042 | { |
971 | { |
1043 | #ifdef TERMCAP_HAS_BW |
972 | #ifdef TERMCAP_HAS_BW |
1044 | screen.cur.col = TermWin.ncol - 1; |
973 | screen.cur.col = ncol - 1; |
1045 | screen.cur.row--; |
974 | screen.cur.row--; |
1046 | return; |
975 | return; |
1047 | #endif |
976 | #endif |
1048 | } |
977 | } |
1049 | } |
978 | } |
… | |
… | |
1069 | |
998 | |
1070 | if (count == 0) |
999 | if (count == 0) |
1071 | return; |
1000 | return; |
1072 | else if (count > 0) |
1001 | else if (count > 0) |
1073 | { |
1002 | { |
1074 | int row = TermWin.saveLines + screen.cur.row; |
1003 | line_t &l = ROW(screen.cur.row); |
1075 | text_t *tp = screen.text[row]; |
|
|
1076 | rend_t *rp = screen.rend[row]; |
|
|
1077 | rend_t base_rend = rp[i]; |
1004 | rend_t base_rend = l.r[i]; |
1078 | ht &= tp[i] == ' '; |
1005 | ht &= l.t[i] == ' '; |
1079 | |
1006 | |
1080 | for (; ++i < TermWin.ncol; ) |
1007 | for (; ++i < ncol; ) |
1081 | if (tabs[i]) |
1008 | if (tabs[i]) |
1082 | { |
1009 | { |
1083 | x = i; |
1010 | x = i; |
1084 | if (!--count) |
1011 | if (!--count) |
1085 | break; |
1012 | break; |
1086 | } |
1013 | } |
1087 | else |
1014 | else |
1088 | ht &= tp[i] == ' ' |
1015 | ht &= l.t[i] == ' ' |
1089 | && RS_SAME (rp[i], base_rend); |
1016 | && RS_SAME (l.r[i], base_rend); |
1090 | |
1017 | |
1091 | if (count) |
1018 | if (count) |
1092 | x = TermWin.ncol - 1; |
1019 | x = ncol - 1; |
1093 | |
1020 | |
1094 | // store horizontal tab commands as characters inside the text |
1021 | // store horizontal tab commands as characters inside the text |
1095 | // buffer so they can be selected and pasted. |
1022 | // buffer so they can be selected and pasted. |
1096 | if (ht && options & Opt_pastableTabs) |
1023 | if (ht && OPTION (Opt_pastableTabs)) |
1097 | { |
1024 | { |
1098 | base_rend = SET_FONT (base_rend, 0); |
1025 | base_rend = SET_FONT (base_rend, 0); |
1099 | |
1026 | |
1100 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
1027 | if (!l.is_longer ()) /* XXX: think about this */ |
1101 | MAX_IT (screen.tlen[row], x); |
1028 | max_it (l.l, x); |
1102 | |
1029 | |
1103 | i = screen.cur.col; |
1030 | i = screen.cur.col; |
1104 | |
1031 | |
1105 | tp[i] = '\t'; |
1032 | l.t[i] = '\t'; |
1106 | rp[i] = base_rend; |
1033 | l.r[i] = base_rend; |
1107 | |
1034 | |
1108 | while (++i < x) |
1035 | while (++i < x) |
1109 | { |
1036 | { |
1110 | tp[i] = NOCHAR; |
1037 | l.t[i] = NOCHAR; |
1111 | rp[i] = base_rend; |
1038 | l.r[i] = base_rend; |
1112 | } |
1039 | } |
1113 | } |
1040 | } |
1114 | } |
1041 | } |
1115 | else /* if (count < 0) */ |
1042 | else /* if (count < 0) */ |
1116 | { |
1043 | { |
… | |
… | |
1142 | rxvt_term::scr_backindex () |
1069 | rxvt_term::scr_backindex () |
1143 | { |
1070 | { |
1144 | if (screen.cur.col > 0) |
1071 | if (screen.cur.col > 0) |
1145 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1072 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1146 | else |
1073 | else |
1147 | { |
|
|
1148 | if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) |
|
|
1149 | return; /* um, yeah? */ |
|
|
1150 | |
|
|
1151 | scr_insdel_chars (1, INSERT); |
1074 | scr_insdel_chars (1, INSERT); |
1152 | } |
|
|
1153 | } |
1075 | } |
1154 | #endif |
1076 | #endif |
1155 | /* ------------------------------------------------------------------------- */ |
1077 | /* ------------------------------------------------------------------------- */ |
1156 | /* |
1078 | /* |
1157 | * Process DEC Forward Index |
1079 | * Process DEC Forward Index |
… | |
… | |
1161 | */ |
1083 | */ |
1162 | #if ENABLE_FRILLS |
1084 | #if ENABLE_FRILLS |
1163 | void |
1085 | void |
1164 | rxvt_term::scr_forwardindex () |
1086 | rxvt_term::scr_forwardindex () |
1165 | { |
1087 | { |
1166 | int row; |
|
|
1167 | |
|
|
1168 | if (screen.cur.col < TermWin.ncol - 1) |
1088 | if (screen.cur.col < ncol - 1) |
1169 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1089 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1170 | else |
1090 | else |
1171 | { |
1091 | { |
1172 | row = screen.cur.row + TermWin.saveLines; |
1092 | if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN |
1173 | |
1093 | ROW(screen.cur.row).l = ncol; |
1174 | if (screen.tlen[row] == 0) |
|
|
1175 | return; /* um, yeah? */ |
|
|
1176 | else if (screen.tlen[row] == -1) |
|
|
1177 | screen.tlen[row] = TermWin.ncol; |
|
|
1178 | |
1094 | |
1179 | scr_gotorc (0, 0, R_RELATIVE); |
1095 | scr_gotorc (0, 0, R_RELATIVE); |
1180 | scr_insdel_chars (1, DELETE); |
1096 | scr_insdel_chars (1, DELETE); |
1181 | scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); |
1097 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1182 | } |
1098 | } |
1183 | } |
1099 | } |
1184 | #endif |
1100 | #endif |
1185 | |
1101 | |
1186 | /* ------------------------------------------------------------------------- */ |
1102 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1192 | { |
1108 | { |
1193 | want_refresh = 1; |
1109 | want_refresh = 1; |
1194 | ZERO_SCROLLBACK (); |
1110 | ZERO_SCROLLBACK (); |
1195 | |
1111 | |
1196 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1112 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1197 | MAX_IT (screen.cur.col, 0); |
1113 | clamp_it (screen.cur.col, 0, ncol - 1); |
1198 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
|
|
1199 | |
1114 | |
1200 | screen.flags &= ~Screen_WrapNext; |
1115 | screen.flags &= ~Screen_WrapNext; |
1201 | |
1116 | |
1202 | if (relative & R_RELATIVE) |
1117 | if (relative & R_RELATIVE) |
1203 | { |
1118 | { |
… | |
… | |
1221 | else |
1136 | else |
1222 | { |
1137 | { |
1223 | if (screen.flags & Screen_Relative) |
1138 | if (screen.flags & Screen_Relative) |
1224 | { /* relative origin mode */ |
1139 | { /* relative origin mode */ |
1225 | screen.cur.row = row + screen.tscroll; |
1140 | screen.cur.row = row + screen.tscroll; |
1226 | MIN_IT (screen.cur.row, screen.bscroll); |
1141 | min_it (screen.cur.row, screen.bscroll); |
1227 | } |
1142 | } |
1228 | else |
1143 | else |
1229 | screen.cur.row = row; |
1144 | screen.cur.row = row; |
1230 | } |
1145 | } |
1231 | |
1146 | |
1232 | MAX_IT (screen.cur.row, 0); |
1147 | clamp_it (screen.cur.row, 0, nrow - 1); |
1233 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
|
|
1234 | } |
1148 | } |
1235 | |
1149 | |
1236 | /* ------------------------------------------------------------------------- */ |
1150 | /* ------------------------------------------------------------------------- */ |
1237 | /* |
1151 | /* |
1238 | * direction should be UP or DN |
1152 | * direction should be UP or DN |
… | |
… | |
1249 | |
1163 | |
1250 | screen.flags &= ~Screen_WrapNext; |
1164 | screen.flags &= ~Screen_WrapNext; |
1251 | |
1165 | |
1252 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1166 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1253 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1167 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1254 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1168 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn); |
1255 | else |
1169 | else |
1256 | screen.cur.row += dirn; |
1170 | screen.cur.row += dirn; |
1257 | |
1171 | |
1258 | MAX_IT (screen.cur.row, 0); |
1172 | clamp_it (screen.cur.row, 0, nrow - 1); |
1259 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
|
|
1260 | selection_check (0); |
1173 | selection_check (0); |
1261 | } |
1174 | } |
1262 | |
1175 | |
1263 | /* ------------------------------------------------------------------------- */ |
1176 | /* ------------------------------------------------------------------------- */ |
1264 | /* |
1177 | /* |
… | |
… | |
1268 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1181 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1269 | */ |
1182 | */ |
1270 | void |
1183 | void |
1271 | rxvt_term::scr_erase_line (int mode) |
1184 | rxvt_term::scr_erase_line (int mode) |
1272 | { |
1185 | { |
1273 | unsigned int row, col, num; |
1186 | unsigned int col, num; |
1274 | |
1187 | |
1275 | want_refresh = 1; |
1188 | want_refresh = 1; |
1276 | ZERO_SCROLLBACK (); |
1189 | ZERO_SCROLLBACK (); |
1277 | |
1190 | |
1278 | selection_check (1); |
1191 | selection_check (1); |
1279 | |
1192 | |
1280 | row = TermWin.saveLines + screen.cur.row; |
1193 | line_t &line = ROW(screen.cur.row); |
|
|
1194 | |
1281 | switch (mode) |
1195 | switch (mode) |
1282 | { |
1196 | { |
1283 | case 0: /* erase to end of line */ |
1197 | case 0: /* erase to end of line */ |
1284 | col = screen.cur.col; |
1198 | col = screen.cur.col; |
1285 | num = TermWin.ncol - col; |
1199 | num = ncol - col; |
1286 | MIN_IT (screen.tlen[row], (int16_t)col); |
1200 | min_it (line.l, col); |
1287 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1201 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1288 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1202 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1289 | CLEAR_SELECTION (); |
1203 | CLEAR_SELECTION (); |
1290 | break; |
1204 | break; |
1291 | case 1: /* erase to beginning of line */ |
1205 | case 1: /* erase to beginning of line */ |
… | |
… | |
1295 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1209 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1296 | CLEAR_SELECTION (); |
1210 | CLEAR_SELECTION (); |
1297 | break; |
1211 | break; |
1298 | case 2: /* erase whole line */ |
1212 | case 2: /* erase whole line */ |
1299 | col = 0; |
1213 | col = 0; |
1300 | num = TermWin.ncol; |
1214 | num = ncol; |
1301 | screen.tlen[row] = 0; |
1215 | line.l = 0; |
1302 | if (selection.beg.row <= screen.cur.row |
1216 | if (selection.beg.row <= screen.cur.row |
1303 | && selection.end.row >= screen.cur.row) |
1217 | && selection.end.row >= screen.cur.row) |
1304 | CLEAR_SELECTION (); |
1218 | CLEAR_SELECTION (); |
1305 | break; |
1219 | break; |
1306 | default: |
1220 | default: |
1307 | return; |
1221 | return; |
1308 | } |
1222 | } |
1309 | |
1223 | |
1310 | if (screen.text[row]) |
1224 | scr_blank_line (line, col, num, rstyle); |
1311 | scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle); |
|
|
1312 | else |
|
|
1313 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
|
|
1314 | } |
1225 | } |
1315 | |
1226 | |
1316 | /* ------------------------------------------------------------------------- */ |
1227 | /* ------------------------------------------------------------------------- */ |
1317 | /* |
1228 | /* |
1318 | * Erase part of whole of the screen |
1229 | * Erase part of whole of the screen |
… | |
… | |
1322 | */ |
1233 | */ |
1323 | void |
1234 | void |
1324 | rxvt_term::scr_erase_screen (int mode) |
1235 | rxvt_term::scr_erase_screen (int mode) |
1325 | { |
1236 | { |
1326 | int num; |
1237 | int num; |
1327 | int32_t row, row_offset; |
1238 | int32_t row; |
1328 | rend_t ren; |
1239 | rend_t ren; |
1329 | XGCValues gcvalue; |
1240 | XGCValues gcvalue; |
1330 | |
1241 | |
1331 | want_refresh = 1; |
1242 | want_refresh = 1; |
1332 | ZERO_SCROLLBACK (); |
1243 | ZERO_SCROLLBACK (); |
1333 | |
|
|
1334 | row_offset = (int32_t)TermWin.saveLines; |
|
|
1335 | |
1244 | |
1336 | switch (mode) |
1245 | switch (mode) |
1337 | { |
1246 | { |
1338 | case 0: /* erase to end of screen */ |
1247 | case 0: /* erase to end of screen */ |
1339 | selection_check (1); |
1248 | selection_check (1); |
1340 | scr_erase_line (0); |
1249 | scr_erase_line (0); |
1341 | row = screen.cur.row + 1; /* possible OOB */ |
1250 | row = screen.cur.row + 1; /* possible OOB */ |
1342 | num = TermWin.nrow - row; |
1251 | num = nrow - row; |
1343 | break; |
1252 | break; |
1344 | case 1: /* erase to beginning of screen */ |
1253 | case 1: /* erase to beginning of screen */ |
1345 | selection_check (3); |
1254 | selection_check (3); |
1346 | scr_erase_line (1); |
1255 | scr_erase_line (1); |
1347 | row = 0; |
1256 | row = 0; |
1348 | num = screen.cur.row; |
1257 | num = screen.cur.row; |
1349 | break; |
1258 | break; |
1350 | case 2: /* erase whole screen */ |
1259 | case 2: /* erase whole screen */ |
1351 | selection_check (3); |
1260 | selection_check (3); |
1352 | row = 0; |
1261 | row = 0; |
1353 | num = TermWin.nrow; |
1262 | num = nrow; |
1354 | break; |
1263 | break; |
1355 | default: |
1264 | default: |
1356 | return; |
1265 | return; |
1357 | } |
1266 | } |
1358 | |
1267 | |
… | |
… | |
1360 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1269 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1361 | || (selection.end.row >= row |
1270 | || (selection.end.row >= row |
1362 | && selection.end.row <= row + num))) |
1271 | && selection.end.row <= row + num))) |
1363 | CLEAR_SELECTION (); |
1272 | CLEAR_SELECTION (); |
1364 | |
1273 | |
1365 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1274 | if (row >= nrow) /* Out Of Bounds */ |
1366 | return; |
1275 | return; |
1367 | |
1276 | |
1368 | MIN_IT (num, (TermWin.nrow - row)); |
1277 | min_it (num, nrow - row); |
1369 | |
1278 | |
1370 | if (rstyle & (RS_RVid | RS_Uline)) |
1279 | if (rstyle & (RS_RVid | RS_Uline)) |
1371 | ren = (rend_t) ~RS_None; |
1280 | ren = (rend_t) ~RS_None; |
1372 | else if (GET_BASEBG (rstyle) == Color_bg) |
1281 | else if (GET_BASEBG (rstyle) == Color_bg) |
1373 | { |
1282 | { |
… | |
… | |
1375 | CLEAR_ROWS (row, num); |
1284 | CLEAR_ROWS (row, num); |
1376 | } |
1285 | } |
1377 | else |
1286 | else |
1378 | { |
1287 | { |
1379 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1288 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1380 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1289 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1381 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1290 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1382 | ERASE_ROWS (row, num); |
1291 | ERASE_ROWS (row, num); |
1383 | gcvalue.foreground = pix_colors[Color_fg]; |
1292 | gcvalue.foreground = pix_colors[Color_fg]; |
1384 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1293 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1385 | } |
1294 | } |
1386 | |
1295 | |
1387 | for (; num--; row++) |
1296 | for (; num--; row++) |
1388 | { |
1297 | { |
1389 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); |
1298 | ROW (row).l = 0; |
1390 | screen.tlen[row + row_offset] = 0; |
1299 | scr_blank_screen_mem (ROW (row), rstyle); |
1391 | scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); |
1300 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1392 | } |
1301 | } |
1393 | } |
1302 | } |
1394 | |
1303 | |
1395 | #if ENABLE_FRILLS |
1304 | #if ENABLE_FRILLS |
1396 | void |
1305 | void |
1397 | rxvt_term::scr_erase_savelines () |
1306 | rxvt_term::scr_erase_savelines () |
1398 | { |
1307 | { |
1399 | want_refresh = 1; |
1308 | want_refresh = 1; |
1400 | ZERO_SCROLLBACK (); |
1309 | ZERO_SCROLLBACK (); |
1401 | |
1310 | |
1402 | TermWin.nscrolled = 0; |
1311 | nsaved = 0; |
1403 | } |
1312 | } |
1404 | #endif |
1313 | #endif |
1405 | |
1314 | |
1406 | /* ------------------------------------------------------------------------- */ |
1315 | /* ------------------------------------------------------------------------- */ |
1407 | /* |
1316 | /* |
… | |
… | |
1409 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1318 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1410 | */ |
1319 | */ |
1411 | void |
1320 | void |
1412 | rxvt_term::scr_E () |
1321 | rxvt_term::scr_E () |
1413 | { |
1322 | { |
1414 | int i, j, k; |
|
|
1415 | rend_t *r1, fs; |
1323 | rend_t fs; |
1416 | |
1324 | |
1417 | want_refresh = 1; |
1325 | want_refresh = 1; |
1418 | ZERO_SCROLLBACK (); |
1326 | ZERO_SCROLLBACK (); |
1419 | |
1327 | |
1420 | num_scr_allow = 0; |
1328 | num_scr_allow = 0; |
1421 | selection_check (3); |
1329 | selection_check (3); |
1422 | |
1330 | |
1423 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1331 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1424 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1332 | for (int row = nrow; row--; ) |
1425 | { |
1333 | { |
1426 | screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ |
1334 | line_t &line = ROW(row); |
|
|
1335 | |
1427 | fill_text (screen.text[k], 'E', TermWin.ncol); |
1336 | fill_text (line.t, 'E', ncol); |
1428 | for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) |
1337 | rend_t *r1 = line.r; |
|
|
1338 | |
|
|
1339 | for (int j = ncol; j--; ) |
1429 | *r1++ = fs; |
1340 | *r1++ = fs; |
|
|
1341 | |
|
|
1342 | line.l = ncol; /* make the `E's selectable */ |
1430 | } |
1343 | } |
1431 | } |
1344 | } |
1432 | |
1345 | |
1433 | /* ------------------------------------------------------------------------- */ |
1346 | /* ------------------------------------------------------------------------- */ |
1434 | /* |
1347 | /* |
… | |
… | |
1455 | count = end; |
1368 | count = end; |
1456 | } |
1369 | } |
1457 | |
1370 | |
1458 | scr_do_wrap (); |
1371 | scr_do_wrap (); |
1459 | |
1372 | |
1460 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); |
1373 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count); |
1461 | } |
1374 | } |
1462 | |
1375 | |
1463 | /* ------------------------------------------------------------------------- */ |
1376 | /* ------------------------------------------------------------------------- */ |
1464 | /* |
1377 | /* |
1465 | * Insert/Delete <count> characters from the current position |
1378 | * Insert/Delete <count> characters from the current position |
… | |
… | |
1467 | void |
1380 | void |
1468 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1381 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1469 | { |
1382 | { |
1470 | int col, row; |
1383 | int col, row; |
1471 | rend_t tr; |
1384 | rend_t tr; |
1472 | text_t *stp; |
|
|
1473 | rend_t *srp; |
|
|
1474 | int16_t *slp; |
|
|
1475 | |
1385 | |
1476 | want_refresh = 1; |
1386 | want_refresh = 1; |
1477 | ZERO_SCROLLBACK (); |
1387 | ZERO_SCROLLBACK (); |
1478 | |
1388 | |
1479 | if (count <= 0) |
1389 | if (count <= 0) |
1480 | return; |
1390 | return; |
1481 | |
1391 | |
1482 | scr_do_wrap (); |
1392 | scr_do_wrap (); |
1483 | |
1393 | |
1484 | selection_check (1); |
1394 | selection_check (1); |
1485 | MIN_IT (count, (TermWin.ncol - screen.cur.col)); |
1395 | min_it (count, ncol - screen.cur.col); |
1486 | |
1396 | |
1487 | row = screen.cur.row + TermWin.saveLines; |
|
|
1488 | |
|
|
1489 | stp = screen.text[row]; |
|
|
1490 | srp = screen.rend[row]; |
1397 | row = screen.cur.row; |
1491 | slp = &screen.tlen[row]; |
1398 | |
|
|
1399 | line_t *line = &ROW(row); |
1492 | |
1400 | |
1493 | switch (insdel) |
1401 | switch (insdel) |
1494 | { |
1402 | { |
1495 | case INSERT: |
1403 | case INSERT: |
1496 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) |
1404 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1497 | { |
1405 | { |
1498 | stp[col] = stp[col - count]; |
1406 | line->t[col] = line->t[col - count]; |
1499 | srp[col] = srp[col - count]; |
1407 | line->r[col] = line->r[col - count]; |
1500 | } |
1408 | } |
1501 | |
1409 | |
1502 | if (*slp != -1) |
1410 | if (!line->is_longer ()) |
1503 | { |
1411 | { |
1504 | *slp += count; |
1412 | line->l += count; |
1505 | MIN_IT (*slp, TermWin.ncol); |
1413 | min_it (line->l, ncol); |
1506 | } |
1414 | } |
1507 | |
1415 | |
1508 | if (selection.op && current_screen == selection.screen |
1416 | if (selection.op && current_screen == selection.screen |
1509 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1417 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1510 | { |
1418 | { |
1511 | if (selection.end.row != screen.cur.row |
1419 | if (selection.end.row != screen.cur.row |
1512 | || (selection.end.col + count >= TermWin.ncol)) |
1420 | || (selection.end.col + count >= ncol)) |
1513 | CLEAR_SELECTION (); |
1421 | CLEAR_SELECTION (); |
1514 | else |
1422 | else |
1515 | { /* shift selection */ |
1423 | { /* shift selection */ |
1516 | selection.beg.col += count; |
1424 | selection.beg.col += count; |
1517 | selection.mark.col += count; /* XXX: yes? */ |
1425 | selection.mark.col += count; /* XXX: yes? */ |
1518 | selection.end.col += count; |
1426 | selection.end.col += count; |
1519 | } |
1427 | } |
1520 | } |
1428 | } |
1521 | |
1429 | |
1522 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1430 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1523 | (unsigned int)count, rstyle); |
|
|
1524 | break; |
1431 | break; |
1525 | |
1432 | |
1526 | case ERASE: |
1433 | case ERASE: |
1527 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1434 | screen.cur.col += count; /* don't worry if > ncol */ |
1528 | selection_check (1); |
1435 | selection_check (1); |
1529 | screen.cur.col -= count; |
1436 | screen.cur.col -= count; |
1530 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1437 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1531 | (unsigned int)count, rstyle); |
|
|
1532 | break; |
1438 | break; |
1533 | |
1439 | |
1534 | case DELETE: |
1440 | case DELETE: |
1535 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1441 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1536 | |
1442 | |
1537 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1443 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1538 | { |
1444 | { |
1539 | stp[col] = stp[col + count]; |
1445 | line->t[col] = line->t[col + count]; |
1540 | srp[col] = srp[col + count]; |
1446 | line->r[col] = line->r[col + count]; |
1541 | } |
1447 | } |
1542 | |
1448 | |
1543 | scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], |
1449 | scr_blank_line (*line, ncol - count, count, tr); |
1544 | (unsigned int)count, tr); |
|
|
1545 | |
1450 | |
1546 | if (*slp == -1) /* break line continuation */ |
1451 | if (line->is_longer ()) /* break line continuation */ |
1547 | *slp = TermWin.ncol; |
1452 | line->l = ncol; |
1548 | |
1453 | |
1549 | *slp -= count; |
1454 | line->l = max (line->l - count, 0); |
1550 | MAX_IT (*slp, 0); |
|
|
1551 | |
1455 | |
1552 | if (selection.op && current_screen == selection.screen |
1456 | if (selection.op && current_screen == selection.screen |
1553 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1457 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1554 | { |
1458 | { |
1555 | if (selection.end.row != screen.cur.row |
1459 | if (selection.end.row != screen.cur.row |
1556 | || (screen.cur.col >= selection.beg.col - count) |
1460 | || (screen.cur.col >= selection.beg.col - count) |
1557 | || selection.end.col >= TermWin.ncol) |
1461 | || selection.end.col >= ncol) |
1558 | CLEAR_SELECTION (); |
1462 | CLEAR_SELECTION (); |
1559 | else |
1463 | else |
1560 | { |
1464 | { |
1561 | /* shift selection */ |
1465 | /* shift selection */ |
1562 | selection.beg.col -= count; |
1466 | selection.beg.col -= count; |
… | |
… | |
1575 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1479 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1576 | */ |
1480 | */ |
1577 | void |
1481 | void |
1578 | rxvt_term::scr_scroll_region (int top, int bot) |
1482 | rxvt_term::scr_scroll_region (int top, int bot) |
1579 | { |
1483 | { |
1580 | MAX_IT (top, 0); |
1484 | max_it (top, 0); |
1581 | MIN_IT (bot, (int)TermWin.nrow - 1); |
1485 | min_it (bot, nrow - 1); |
1582 | |
1486 | |
1583 | if (top > bot) |
1487 | if (top > bot) |
1584 | return; |
1488 | return; |
1585 | |
1489 | |
1586 | screen.tscroll = top; |
1490 | screen.tscroll = top; |
… | |
… | |
1665 | */ |
1569 | */ |
1666 | void |
1570 | void |
1667 | rxvt_term::scr_set_tab (int mode) |
1571 | rxvt_term::scr_set_tab (int mode) |
1668 | { |
1572 | { |
1669 | if (mode < 0) |
1573 | if (mode < 0) |
1670 | memset (tabs, 0, TermWin.ncol * sizeof (char)); |
1574 | memset (tabs, 0, ncol * sizeof (char)); |
1671 | else if (screen.cur.col < TermWin.ncol) |
1575 | else if (screen.cur.col < ncol) |
1672 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1576 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1673 | } |
1577 | } |
1674 | |
1578 | |
1675 | /* ------------------------------------------------------------------------- */ |
1579 | /* ------------------------------------------------------------------------- */ |
1676 | /* |
1580 | /* |
… | |
… | |
1684 | XGCValues gcvalue; |
1588 | XGCValues gcvalue; |
1685 | |
1589 | |
1686 | if (rvideo != mode) |
1590 | if (rvideo != mode) |
1687 | { |
1591 | { |
1688 | rvideo = mode; |
1592 | rvideo = mode; |
1689 | SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); |
1593 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1690 | #if XPM_BACKGROUND |
1594 | #if XPM_BACKGROUND |
1691 | if (bgPixmap.pixmap == None) |
1595 | if (bgPixmap.pixmap == None) |
1692 | #endif |
1596 | #endif |
1693 | #if TRANSPARENT |
1597 | #if TRANSPARENT |
1694 | if (! (options & Opt_transparent) || am_transparent == 0) |
1598 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
1695 | #endif |
1599 | #endif |
1696 | XSetWindowBackground (display->display, TermWin.vt, |
1600 | XSetWindowBackground (display->display, vt, |
1697 | pix_colors[Color_bg]); |
1601 | pix_colors[Color_bg]); |
1698 | |
1602 | |
1699 | gcvalue.foreground = pix_colors[Color_fg]; |
1603 | gcvalue.foreground = pix_colors[Color_fg]; |
1700 | gcvalue.background = pix_colors[Color_bg]; |
1604 | gcvalue.background = pix_colors[Color_bg]; |
1701 | XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, |
1605 | XChangeGC (display->display, gc, GCBackground | GCForeground, |
1702 | &gcvalue); |
1606 | &gcvalue); |
1703 | scr_clear (); |
1607 | scr_clear (); |
1704 | scr_touch (true); |
1608 | scr_touch (true); |
1705 | } |
1609 | } |
1706 | } |
1610 | } |
… | |
… | |
1787 | bool |
1691 | bool |
1788 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1692 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1789 | { |
1693 | { |
1790 | bool found = false; |
1694 | bool found = false; |
1791 | |
1695 | |
1792 | for (int i = 0; i < TermWin.nrow; i++) |
1696 | for (int i = 0; i < nrow; i++) |
1793 | { |
1697 | { |
1794 | int col = 0; |
1698 | int col = 0; |
1795 | rend_t *drp = drawn_rend [i]; |
1699 | rend_t *drp = drawn_buf[i].r; |
1796 | |
1700 | |
1797 | for (; col < TermWin.ncol; col++, drp++) |
1701 | for (; col < ncol; col++, drp++) |
1798 | if ((*drp & mask) == value) |
1702 | if ((*drp & mask) == value) |
1799 | { |
1703 | { |
1800 | found = true; |
1704 | found = true; |
1801 | *drp = ~value; |
1705 | *drp = ~value; |
1802 | } |
1706 | } |
… | |
… | |
1813 | PART_END, |
1717 | PART_END, |
1814 | RC_COUNT |
1718 | RC_COUNT |
1815 | }; |
1719 | }; |
1816 | |
1720 | |
1817 | void |
1721 | void |
1818 | rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) |
1722 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1819 | { |
1723 | { |
1820 | int i; |
1724 | int i; |
1821 | row_col_t rc[RC_COUNT]; |
1725 | row_col_t rc[RC_COUNT]; |
1822 | |
1726 | |
1823 | if (drawn_text == NULL) /* sanity check */ |
1727 | if (!drawn_buf) /* sanity check */ |
1824 | return; |
1728 | return; |
1825 | |
1729 | |
1826 | #ifndef NO_SLOW_LINK_SUPPORT |
1730 | #ifndef NO_SLOW_LINK_SUPPORT |
1827 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1731 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1828 | { |
1732 | { |
1829 | y = 0; |
1733 | y = 0; |
1830 | height = TermWin.height; |
1734 | eheight = height; |
1831 | } |
1735 | } |
1832 | #endif |
|
|
1833 | |
|
|
1834 | #ifdef DEBUG_STRICT |
|
|
1835 | x = max (x, 0); |
|
|
1836 | x = min (x, (int)TermWin.width); |
|
|
1837 | y = max (y, 0); |
|
|
1838 | y = min (y, (int)TermWin.height); |
|
|
1839 | #endif |
1736 | #endif |
1840 | |
1737 | |
1841 | /* round down */ |
1738 | /* round down */ |
1842 | rc[PART_BEG].col = Pixel2Col (x); |
1739 | rc[PART_BEG].col = Pixel2Col (x); |
1843 | rc[PART_BEG].row = Pixel2Row (y); |
1740 | rc[PART_BEG].row = Pixel2Row (y); |
1844 | /* round up */ |
1741 | /* round up */ |
1845 | rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); |
1742 | rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1); |
1846 | rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); |
1743 | rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); |
1847 | |
1744 | |
1848 | /* sanity checks */ |
1745 | /* sanity checks */ |
1849 | for (i = PART_BEG; i < RC_COUNT; i++) |
1746 | for (i = PART_BEG; i < RC_COUNT; i++) |
1850 | { |
1747 | { |
1851 | MIN_IT (rc[i].col, TermWin.ncol - 1); |
1748 | min_it (rc[i].col, ncol - 1); |
1852 | MIN_IT (rc[i].row, TermWin.nrow - 1); |
1749 | min_it (rc[i].row, nrow - 1); |
1853 | } |
1750 | } |
1854 | |
1751 | |
1855 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1752 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1856 | fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1753 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1857 | |
1754 | |
1858 | if (refresh) |
1755 | if (refresh) |
1859 | scr_refresh (SLOW_REFRESH); |
1756 | scr_refresh (SLOW_REFRESH); |
1860 | } |
1757 | } |
1861 | |
1758 | |
… | |
… | |
1864 | * Refresh the entire screen |
1761 | * Refresh the entire screen |
1865 | */ |
1762 | */ |
1866 | void |
1763 | void |
1867 | rxvt_term::scr_touch (bool refresh) |
1764 | rxvt_term::scr_touch (bool refresh) |
1868 | { |
1765 | { |
1869 | scr_expose (0, 0, TermWin.width, TermWin.height, refresh); |
1766 | scr_expose (0, 0, width, height, refresh); |
1870 | } |
1767 | } |
1871 | |
1768 | |
1872 | /* ------------------------------------------------------------------------- */ |
1769 | /* ------------------------------------------------------------------------- */ |
1873 | /* |
1770 | /* |
1874 | * Move the display so that the line represented by scrollbar value Y is at |
1771 | * Move the display so that the line represented by scrollbar value Y is at |
… | |
… | |
1878 | rxvt_term::scr_move_to (int y, int len) |
1775 | rxvt_term::scr_move_to (int y, int len) |
1879 | { |
1776 | { |
1880 | long p = 0; |
1777 | long p = 0; |
1881 | unsigned int oldviewstart; |
1778 | unsigned int oldviewstart; |
1882 | |
1779 | |
1883 | oldviewstart = TermWin.view_start; |
1780 | oldviewstart = view_start; |
1884 | |
1781 | |
1885 | if (y < len) |
1782 | if (y < len) |
1886 | { |
1783 | { |
1887 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1784 | p = (nrow + nsaved) * (len - y) / len; |
1888 | p -= (long) (TermWin.nrow - 1); |
1785 | p -= (long) (nrow - 1); |
1889 | p = max (p, 0); |
1786 | p = max (p, 0); |
1890 | } |
1787 | } |
1891 | |
1788 | |
1892 | TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); |
1789 | view_start = (unsigned int)min (p, nsaved); |
1893 | |
1790 | |
1894 | return scr_changeview (oldviewstart); |
1791 | return scr_changeview (oldviewstart); |
1895 | } |
1792 | } |
1896 | |
1793 | |
1897 | /* ------------------------------------------------------------------------- */ |
1794 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1903 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1800 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1904 | { |
1801 | { |
1905 | int n; |
1802 | int n; |
1906 | unsigned int oldviewstart; |
1803 | unsigned int oldviewstart; |
1907 | |
1804 | |
1908 | oldviewstart = TermWin.view_start; |
1805 | oldviewstart = view_start; |
1909 | |
1806 | |
1910 | if (direction == UP) |
1807 | if (direction == UP) |
1911 | { |
1808 | { |
1912 | n = TermWin.view_start + nlines; |
1809 | n = view_start + nlines; |
1913 | TermWin.view_start = min (n, TermWin.nscrolled); |
1810 | view_start = min (n, nsaved); |
1914 | } |
1811 | } |
1915 | else |
1812 | else |
1916 | { |
1813 | { |
1917 | n = TermWin.view_start - nlines; |
1814 | n = view_start - nlines; |
1918 | TermWin.view_start = max (n, 0); |
1815 | view_start = max (n, 0); |
1919 | } |
1816 | } |
1920 | |
1817 | |
1921 | return scr_changeview (oldviewstart); |
1818 | return scr_changeview (oldviewstart); |
1922 | } |
1819 | } |
1923 | |
1820 | |
1924 | int |
1821 | int |
1925 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1822 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1926 | { |
1823 | { |
1927 | if (TermWin.view_start != oldviewstart) |
1824 | if (view_start != oldviewstart) |
1928 | { |
1825 | { |
1929 | want_refresh = 1; |
1826 | want_refresh = 1; |
1930 | num_scr -= (TermWin.view_start - oldviewstart); |
1827 | num_scr -= (view_start - oldviewstart); |
1931 | } |
1828 | } |
1932 | |
1829 | |
1933 | return (int) (TermWin.view_start - oldviewstart); |
1830 | return (int) (view_start - oldviewstart); |
1934 | } |
1831 | } |
1935 | |
1832 | |
1936 | /* ------------------------------------------------------------------------- */ |
1833 | /* ------------------------------------------------------------------------- */ |
1937 | void |
1834 | void |
1938 | rxvt_term::scr_bell () |
1835 | rxvt_term::scr_bell () |
1939 | { |
1836 | { |
1940 | #ifndef NO_BELL |
1837 | #ifndef NO_BELL |
|
|
1838 | |
1941 | # ifndef NO_MAPALERT |
1839 | # ifndef NO_MAPALERT |
1942 | # ifdef MAPALERT_OPTION |
1840 | # ifdef MAPALERT_OPTION |
1943 | if (options & Opt_mapAlert) |
1841 | if (OPTION (Opt_mapAlert)) |
1944 | # endif |
1842 | # endif |
1945 | XMapWindow (display->display, TermWin.parent[0]); |
1843 | XMapWindow (display->display, parent[0]); |
1946 | # endif |
1844 | # endif |
1947 | if (options & Opt_visualBell) |
1845 | |
|
|
1846 | if (OPTION (Opt_visualBell)) |
1948 | { |
1847 | { |
1949 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1848 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
|
|
1849 | rxvt_usleep (VISUAL_BELL_DURATION); |
1950 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1850 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1951 | } |
1851 | } |
1952 | else |
1852 | else |
1953 | XBell (display->display, 0); |
1853 | XBell (display->display, 0); |
|
|
1854 | |
1954 | #endif |
1855 | #endif |
1955 | } |
1856 | } |
1956 | |
1857 | |
1957 | /* ------------------------------------------------------------------------- */ |
1858 | /* ------------------------------------------------------------------------- */ |
1958 | /* ARGSUSED */ |
1859 | /* ARGSUSED */ |
1959 | void |
1860 | void |
1960 | rxvt_term::scr_printscreen (int fullhist) |
1861 | rxvt_term::scr_printscreen (int fullhist) |
1961 | { |
1862 | { |
1962 | #ifdef PRINTPIPE |
1863 | #ifdef PRINTPIPE |
1963 | int i, r1, nrows, row_offset; |
1864 | int nrows, row_start; |
1964 | FILE *fd; |
1865 | FILE *fd; |
1965 | |
1866 | |
1966 | if ((fd = popen_printer ()) == NULL) |
1867 | if ((fd = popen_printer ()) == NULL) |
1967 | return; |
1868 | return; |
1968 | |
1869 | |
1969 | nrows = TermWin.nrow; |
|
|
1970 | row_offset = TermWin.saveLines; |
|
|
1971 | |
|
|
1972 | if (!fullhist) |
1870 | if (fullhist) |
1973 | row_offset -= TermWin.view_start; |
1871 | { |
|
|
1872 | nrows = nrow + nsaved; |
|
|
1873 | row_start = -nsaved; |
|
|
1874 | } |
1974 | else |
1875 | else |
1975 | { |
1876 | { |
1976 | nrows += TermWin.nscrolled; |
1877 | nrows = nrow; |
1977 | row_offset -= TermWin.nscrolled; |
1878 | row_start = -view_start; |
1978 | } |
1879 | } |
1979 | |
1880 | |
1980 | wctomb (0, 0); |
1881 | wctomb (0, 0); |
1981 | |
1882 | |
1982 | for (r1 = 0; r1 < nrows; r1++) |
1883 | for (int r1 = 0; r1 < nrows; r1++) |
1983 | { |
1884 | { |
1984 | text_t *tp = screen.text[r1 + row_offset]; |
1885 | text_t *tp = ROW(r1).t; |
1985 | int len = screen.tlen[r1 + row_offset]; |
1886 | int len = ROW(r1).l; |
1986 | |
1887 | |
1987 | for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) |
1888 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1988 | { |
1889 | { |
1989 | char mb[MB_LEN_MAX]; |
1890 | char mb[MB_LEN_MAX]; |
1990 | text_t t = *tp++; |
1891 | text_t t = *tp++; |
1991 | if (t == NOCHAR) |
1892 | if (t == NOCHAR) |
1992 | continue; |
1893 | continue; |
… | |
… | |
2013 | /* |
1914 | /* |
2014 | * Refresh the screen |
1915 | * Refresh the screen |
2015 | * drawn_text/drawn_rend contain the screen information before the update. |
1916 | * drawn_text/drawn_rend contain the screen information before the update. |
2016 | * screen.text/screen.rend contain what the screen will change to. |
1917 | * screen.text/screen.rend contain what the screen will change to. |
2017 | */ |
1918 | */ |
2018 | |
|
|
2019 | #define FONT_WIDTH(X, Y) \ |
|
|
2020 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].width |
|
|
2021 | #define FONT_RBEAR(X, Y) \ |
|
|
2022 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing |
|
|
2023 | #define FONT_LBEAR(X, Y) \ |
|
|
2024 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing |
|
|
2025 | #define IS_FONT_CHAR(X, Y) \ |
|
|
2026 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
|
|
2027 | |
|
|
2028 | void |
1919 | void |
2029 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1920 | rxvt_term::scr_refresh (unsigned char refresh_type) |
2030 | { |
1921 | { |
2031 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1922 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
2032 | showcursor; /* show the cursor */ |
1923 | showcursor; /* show the cursor */ |
2033 | int16_t col, row, /* column/row we're processing */ |
1924 | int16_t col, row, /* column/row we're processing */ |
2034 | ocrow; /* old cursor row */ |
1925 | ocrow; /* old cursor row */ |
2035 | int i, /* tmp */ |
1926 | int i; /* tmp */ |
2036 | row_offset; /* basic offset in screen structure */ |
|
|
2037 | #ifndef NO_CURSORCOLOR |
1927 | #ifndef NO_CURSORCOLOR |
2038 | rend_t cc1; /* store colours at cursor position (s) */ |
1928 | rend_t cc1; /* store colours at cursor position (s) */ |
2039 | #endif |
1929 | #endif |
2040 | rend_t *crp; // cursor rendition pointer |
1930 | rend_t *crp; // cursor rendition pointer |
2041 | |
1931 | |
2042 | want_refresh = 0; /* screen is current */ |
1932 | want_refresh = 0; /* screen is current */ |
2043 | |
1933 | |
2044 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
1934 | if (refresh_type == NO_REFRESH || !mapped) |
2045 | return; |
1935 | return; |
2046 | |
1936 | |
2047 | /* |
1937 | /* |
2048 | * A: set up vars |
1938 | * A: set up vars |
2049 | */ |
1939 | */ |
2050 | must_clear = 0; |
1940 | must_clear = 0; |
2051 | refresh_count = 0; |
1941 | refresh_count = 0; |
2052 | |
1942 | |
2053 | row_offset = TermWin.saveLines - TermWin.view_start; |
|
|
2054 | |
|
|
2055 | #if XPM_BACKGROUND |
1943 | #if XPM_BACKGROUND |
2056 | must_clear |= (bgPixmap.pixmap != None); |
1944 | must_clear |= bgPixmap.pixmap != None; |
2057 | #endif |
1945 | #endif |
2058 | #if TRANSPARENT |
1946 | #if TRANSPARENT |
2059 | must_clear |= ((options & Opt_transparent) && am_transparent); |
1947 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
2060 | #endif |
1948 | #endif |
2061 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1949 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2062 | |
1950 | |
2063 | /* |
1951 | /* |
2064 | * B: reverse any characters which are selected |
1952 | * B: reverse any characters which are selected |
… | |
… | |
2081 | |
1969 | |
2082 | if (showcursor) |
1970 | if (showcursor) |
2083 | { |
1971 | { |
2084 | int col = screen.cur.col; |
1972 | int col = screen.cur.col; |
2085 | |
1973 | |
2086 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
1974 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2087 | col--; |
1975 | col--; |
2088 | |
1976 | |
2089 | crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; |
1977 | crp = &ROW(screen.cur.row).r[col]; |
2090 | |
1978 | |
2091 | if (showcursor && TermWin.focus) |
1979 | if (showcursor && focus) |
2092 | { |
1980 | { |
|
|
1981 | if (OPTION (Opt_cursorUnderline)) |
|
|
1982 | *crp ^= RS_Uline; |
|
|
1983 | else |
|
|
1984 | { |
2093 | *crp ^= RS_RVid; |
1985 | *crp ^= RS_RVid; |
|
|
1986 | |
2094 | #ifndef NO_CURSORCOLOR |
1987 | #ifndef NO_CURSORCOLOR |
2095 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
1988 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2096 | if (ISSET_PIXCOLOR (Color_cursor)) |
1989 | if (ISSET_PIXCOLOR (Color_cursor)) |
2097 | ccol1 = Color_cursor; |
1990 | ccol1 = Color_cursor; |
2098 | else |
1991 | else |
2099 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1992 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2100 | ccol1 = GET_FGCOLOR (rstyle); |
1993 | ccol1 = fgcolor_of (rstyle); |
2101 | #else |
1994 | #else |
2102 | ccol1 = Color_fg; |
1995 | ccol1 = Color_fg; |
2103 | #endif |
1996 | #endif |
2104 | if (ISSET_PIXCOLOR (Color_cursor2)) |
1997 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2105 | ccol2 = Color_cursor2; |
1998 | ccol2 = Color_cursor2; |
2106 | else |
1999 | else |
2107 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2000 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2108 | ccol2 = GET_BGCOLOR (rstyle); |
2001 | ccol2 = bgcolor_of (rstyle); |
2109 | #else |
2002 | #else |
2110 | ccol2 = Color_bg; |
2003 | ccol2 = Color_bg; |
2111 | #endif |
2004 | #endif |
2112 | *crp = SET_FGCOLOR (*crp, ccol1); |
2005 | *crp = SET_FGCOLOR (*crp, ccol1); |
2113 | *crp = SET_BGCOLOR (*crp, ccol2); |
2006 | *crp = SET_BGCOLOR (*crp, ccol2); |
2114 | #endif |
2007 | #endif |
|
|
2008 | } |
2115 | } |
2009 | } |
2116 | } |
2010 | } |
2117 | |
2011 | |
2118 | /* make sure no outline cursor is left around */ |
2012 | /* make sure no outline cursor is left around */ |
2119 | setoldcursor = 0; |
2013 | setoldcursor = 0; |
2120 | if (ocrow != -1) |
2014 | if (ocrow != -1) |
2121 | { |
2015 | { |
2122 | if (screen.cur.row + TermWin.view_start != ocrow |
2016 | if (screen.cur.row + view_start != ocrow |
2123 | || screen.cur.col != oldcursor.col) |
2017 | || screen.cur.col != oldcursor.col) |
2124 | { |
2018 | { |
2125 | if (ocrow < TermWin.nrow |
2019 | if (ocrow < nrow |
2126 | && oldcursor.col < TermWin.ncol) |
2020 | && oldcursor.col < ncol) |
2127 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
2021 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2128 | |
2022 | |
2129 | if (TermWin.focus || !showcursor) |
2023 | if (focus || !showcursor) |
2130 | oldcursor.row = -1; |
2024 | oldcursor.row = -1; |
2131 | else |
2025 | else |
2132 | setoldcursor = 1; |
2026 | setoldcursor = 1; |
2133 | } |
2027 | } |
2134 | } |
2028 | } |
2135 | else if (!TermWin.focus) |
2029 | else if (!focus) |
2136 | setoldcursor = 1; |
2030 | setoldcursor = 1; |
2137 | |
2031 | |
2138 | if (setoldcursor) |
2032 | if (setoldcursor) |
2139 | { |
2033 | { |
2140 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
2034 | if (screen.cur.row + view_start >= nrow) |
2141 | oldcursor.row = -1; |
2035 | oldcursor.row = -1; |
2142 | else |
2036 | else |
2143 | { |
2037 | { |
2144 | oldcursor.row = screen.cur.row + TermWin.view_start; |
2038 | oldcursor.row = screen.cur.row + view_start; |
2145 | oldcursor.col = screen.cur.col; |
2039 | oldcursor.col = screen.cur.col; |
2146 | } |
2040 | } |
2147 | } |
2041 | } |
2148 | } |
2042 | } |
2149 | |
2043 | |
2150 | #if ENABLE_OVERLAY |
2044 | #if ENABLE_OVERLAY |
2151 | scr_swap_overlay (); |
2045 | scr_swap_overlay (); |
2152 | #endif |
2046 | #endif |
2153 | |
|
|
2154 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
|
|
2155 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
|
|
2156 | |
2047 | |
2157 | #ifndef NO_SLOW_LINK_SUPPORT |
2048 | #ifndef NO_SLOW_LINK_SUPPORT |
2158 | /* |
2049 | /* |
2159 | * D: CopyArea pass - very useful for slower links |
2050 | * D: CopyArea pass - very useful for slower links |
2160 | * This has been deliberately kept simple. |
2051 | * This has been deliberately kept simple. |
2161 | */ |
2052 | */ |
2162 | i = num_scr; |
2053 | i = num_scr; |
2163 | if (!display->is_local |
2054 | if (!display->is_local |
2164 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2055 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2165 | && abs (i) < TermWin.nrow && !must_clear) |
2056 | && abs (num_scr) < nrow && !must_clear) |
2166 | { |
2057 | { |
2167 | int16_t nits; |
2058 | int16_t nits; |
2168 | int j; |
2059 | int j; |
2169 | int len, wlen; |
2060 | int len, wlen; |
2170 | |
2061 | |
2171 | j = TermWin.nrow; |
2062 | j = nrow; |
2172 | wlen = len = -1; |
2063 | wlen = len = -1; |
2173 | row = i > 0 ? 0 : j - 1; |
2064 | row = i > 0 ? 0 : j - 1; |
2174 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2065 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2175 | { |
2066 | { |
2176 | if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) |
2067 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2177 | { |
2068 | { |
2178 | text_t *stp = screen.text[row + row_offset]; |
2069 | line_t s = ROW(row - view_start); |
2179 | rend_t *srp = screen.rend[row + row_offset]; |
|
|
2180 | text_t *dtp = drawn_text[row]; |
2070 | line_t d = drawn_buf[row]; |
2181 | text_t *dtp2 = drawn_text[row + i]; |
2071 | line_t d2 = drawn_buf[row + i]; |
2182 | rend_t *drp = drawn_rend[row]; |
|
|
2183 | rend_t *drp2 = drawn_rend[row + i]; |
|
|
2184 | |
2072 | |
2185 | for (nits = 0, col = TermWin.ncol; col--; ) |
2073 | for (nits = 0, col = ncol; col--; ) |
2186 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2074 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2187 | nits--; |
2075 | nits--; |
2188 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
2076 | else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) |
2189 | nits++; |
2077 | nits++; |
2190 | |
2078 | |
2191 | if (nits > 8) /* XXX: arbitrary choice */ |
2079 | if (nits > 8) /* XXX: arbitrary choice */ |
2192 | { |
2080 | { |
2193 | for (col = TermWin.ncol; col--; ) |
2081 | for (col = ncol; col--; ) |
2194 | { |
2082 | { |
2195 | *dtp++ = *dtp2++; |
2083 | *d.t++ = *d2.t++; |
2196 | *drp++ = *drp2++; |
2084 | *d.r++ = *d2.r++; |
2197 | } |
2085 | } |
2198 | |
2086 | |
2199 | if (len == -1) |
2087 | if (len == -1) |
2200 | len = row; |
2088 | len = row; |
2201 | |
2089 | |
… | |
… | |
2206 | |
2094 | |
2207 | if (len != -1) |
2095 | if (len != -1) |
2208 | { |
2096 | { |
2209 | /* also comes here at end if needed because of >= above */ |
2097 | /* also comes here at end if needed because of >= above */ |
2210 | if (wlen < len) |
2098 | if (wlen < len) |
2211 | SWAP_IT (wlen, len, int); |
2099 | ::swap (wlen, len); |
2212 | |
2100 | |
2213 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2101 | XCopyArea (display->display, vt, vt, |
2214 | TermWin.gc, 0, Row2Pixel (len + i), |
2102 | gc, 0, Row2Pixel (len + i), |
2215 | (unsigned int)TermWin_TotalWidth (), |
2103 | (unsigned int)TermWin_TotalWidth (), |
2216 | (unsigned int)Height2Pixel (wlen - len + 1), |
2104 | (unsigned int)Height2Pixel (wlen - len + 1), |
2217 | 0, Row2Pixel (len)); |
2105 | 0, Row2Pixel (len)); |
2218 | len = -1; |
2106 | len = -1; |
2219 | } |
2107 | } |
… | |
… | |
2222 | #endif |
2110 | #endif |
2223 | |
2111 | |
2224 | /* |
2112 | /* |
2225 | * E: main pass across every character |
2113 | * E: main pass across every character |
2226 | */ |
2114 | */ |
2227 | for (row = 0; row < TermWin.nrow; row++) |
2115 | for (row = 0; row < nrow; row++) |
2228 | { |
2116 | { |
2229 | text_t *stp = screen.text[row + row_offset]; |
2117 | text_t *stp = ROW(row - view_start).t; |
2230 | rend_t *srp = screen.rend[row + row_offset]; |
2118 | rend_t *srp = ROW(row - view_start).r; |
2231 | text_t *dtp = drawn_text[row]; |
2119 | text_t *dtp = drawn_buf[row].t; |
2232 | rend_t *drp = drawn_rend[row]; |
2120 | rend_t *drp = drawn_buf[row].r; |
2233 | |
2121 | |
2234 | /* |
2122 | /* |
2235 | * E2: OK, now the real pass |
2123 | * E2: OK, now the real pass |
2236 | */ |
2124 | */ |
2237 | int ypixel = (int)Row2Pixel (row); |
2125 | int ypixel = (int)Row2Pixel (row); |
2238 | |
2126 | |
2239 | for (col = 0; col < TermWin.ncol; col++) |
2127 | for (col = 0; col < ncol; col++) |
2240 | { |
2128 | { |
2241 | /* compare new text with old - if exactly the same then continue */ |
2129 | /* compare new text with old - if exactly the same then continue */ |
2242 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2130 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2243 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
2131 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
2244 | || (stp[col] == ' ' /* space w/ no background change */ |
2132 | || (stp[col] == ' ' /* space w/ no background change */ |
… | |
… | |
2258 | dtp[col] = stp[col]; |
2146 | dtp[col] = stp[col]; |
2259 | drp[col] = rend; |
2147 | drp[col] = rend; |
2260 | |
2148 | |
2261 | int xpixel = Col2Pixel (col); |
2149 | int xpixel = Col2Pixel (col); |
2262 | |
2150 | |
2263 | for (i = 0; ++col < TermWin.ncol; ) |
2151 | for (i = 0; ++col < ncol; ) |
2264 | { |
2152 | { |
2265 | if (stp[col] == NOCHAR) |
2153 | if (stp[col] == NOCHAR) |
2266 | { |
2154 | { |
2267 | dtp[col] = stp[col]; |
2155 | dtp[col] = stp[col]; |
2268 | drp[col] = rend; |
2156 | drp[col] = rend; |
… | |
… | |
2296 | |
2184 | |
2297 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2185 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2298 | while (i && text[count] == NOCHAR) |
2186 | while (i && text[count] == NOCHAR) |
2299 | count++, i--; |
2187 | count++, i--; |
2300 | |
2188 | |
2301 | #if ENABLE_STYLES |
|
|
2302 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2303 | if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) |
|
|
2304 | drp[col + 1] = ~srp[col + 1]; |
|
|
2305 | |
|
|
2306 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2307 | while (text > stp |
|
|
2308 | && srp[text - stp - 1] & RS_Careful |
|
|
2309 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2310 | text--, count++, xpixel -= TermWin.fwidth; |
|
|
2311 | #endif |
|
|
2312 | |
|
|
2313 | /* |
2189 | /* |
2314 | * Determine the attributes for the string |
2190 | * Determine the attributes for the string |
2315 | */ |
2191 | */ |
2316 | int fore = GET_FGCOLOR (rend); // desired foreground |
2192 | int fore = fgcolor_of (rend); // desired foreground |
2317 | int back = GET_BGCOLOR (rend); // desired background |
2193 | int back = bgcolor_of (rend); // desired background |
2318 | |
2194 | |
2319 | // only do special processing if ana attributes are set, which is rare |
2195 | // only do special processing if any attributes are set, which is unlikely |
2320 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) |
2196 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2321 | { |
2197 | { |
|
|
2198 | #if ENABLE_STYLES |
|
|
2199 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2200 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2201 | drp[col + 1] = ~srp[col + 1]; |
|
|
2202 | |
|
|
2203 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2204 | while (text > stp |
|
|
2205 | && srp[text - stp - 1] & RS_Careful |
|
|
2206 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2207 | text--, count++, xpixel -= fwidth; |
|
|
2208 | #endif |
|
|
2209 | |
2322 | bool invert = rend & RS_RVid; |
2210 | bool invert = rend & RS_RVid; |
2323 | |
2211 | |
2324 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2212 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2325 | if (rend & RS_Bold |
2213 | if (rend & RS_Bold |
2326 | && fore == Color_fg) |
2214 | && fore == Color_fg) |
… | |
… | |
2348 | fore = Color_UL; |
2236 | fore = Color_UL; |
2349 | #endif |
2237 | #endif |
2350 | |
2238 | |
2351 | if (invert) |
2239 | if (invert) |
2352 | { |
2240 | { |
2353 | SWAP_IT (fore, back, int); |
2241 | ::swap (fore, back); |
2354 | |
2242 | |
2355 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2243 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2356 | if (ISSET_PIXCOLOR (Color_RV)) |
2244 | if (ISSET_PIXCOLOR (Color_RV)) |
2357 | back = Color_RV; |
2245 | back = Color_RV; |
|
|
2246 | |
|
|
2247 | if (fore == back) |
|
|
2248 | { |
|
|
2249 | fore = Color_bg; |
|
|
2250 | back = Color_fg; |
|
|
2251 | } |
2358 | #endif |
2252 | #endif |
2359 | } |
2253 | } |
2360 | |
2254 | |
2361 | #ifdef TEXT_BLINK |
2255 | #ifdef TEXT_BLINK |
2362 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2256 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
… | |
… | |
2373 | } |
2267 | } |
2374 | |
2268 | |
2375 | /* |
2269 | /* |
2376 | * Actually do the drawing of the string here |
2270 | * Actually do the drawing of the string here |
2377 | */ |
2271 | */ |
2378 | rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2272 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2379 | |
2273 | |
2380 | if (back == fore) |
2274 | if (back == fore) |
2381 | font->clear_rect (*TermWin.drawable, xpixel, ypixel, |
2275 | font->clear_rect (*drawable, xpixel, ypixel, |
2382 | TermWin.fwidth * count, TermWin.fheight, |
2276 | fwidth * count, fheight, |
2383 | back); |
2277 | back); |
2384 | else if (back == Color_bg) |
2278 | else if (back == Color_bg) |
2385 | { |
2279 | { |
2386 | if (must_clear) |
2280 | if (must_clear) |
2387 | { |
2281 | { |
2388 | CLEAR_CHARS (xpixel, ypixel, count); |
2282 | CLEAR_CHARS (xpixel, ypixel, count); |
2389 | |
2283 | |
2390 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2284 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2391 | if (text[i] != ' ') |
2285 | if (text[i] != ' ') |
2392 | { |
2286 | { |
2393 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); |
2287 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2394 | break; |
2288 | break; |
2395 | } |
2289 | } |
2396 | } |
2290 | } |
2397 | else |
2291 | else |
2398 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2292 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2399 | } |
2293 | } |
2400 | else |
2294 | else |
2401 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2295 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2402 | |
2296 | |
2403 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2297 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2404 | { |
2298 | { |
2405 | #if ENABLE_FRILLS |
2299 | #if ENABLE_FRILLS |
2406 | if (ISSET_PIXCOLOR (Color_underline)) |
2300 | if (ISSET_PIXCOLOR (Color_underline)) |
2407 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); |
2301 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2408 | else |
2302 | else |
2409 | #endif |
2303 | #endif |
2410 | XSetForeground (display->display, TermWin.gc, pix_colors[fore]); |
2304 | XSetForeground (display->display, gc, pix_colors[fore]); |
2411 | |
2305 | |
2412 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2306 | XDrawLine (display->display, drawBuffer, gc, |
2413 | xpixel, ypixel + font->ascent + 1, |
2307 | xpixel, ypixel + font->ascent + 1, |
2414 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2308 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2415 | } |
2309 | } |
2416 | } /* for (col....) */ |
2310 | } /* for (col....) */ |
2417 | } /* for (row....) */ |
2311 | } /* for (row....) */ |
… | |
… | |
2423 | /* |
2317 | /* |
2424 | * G: cleanup cursor and display outline cursor if necessary |
2318 | * G: cleanup cursor and display outline cursor if necessary |
2425 | */ |
2319 | */ |
2426 | if (showcursor) |
2320 | if (showcursor) |
2427 | { |
2321 | { |
2428 | if (TermWin.focus) |
2322 | if (focus) |
|
|
2323 | { |
|
|
2324 | if (OPTION (Opt_cursorUnderline)) |
|
|
2325 | *crp ^= RS_Uline; |
|
|
2326 | else |
2429 | { |
2327 | { |
2430 | *crp ^= RS_RVid; |
2328 | *crp ^= RS_RVid; |
2431 | #ifndef NO_CURSORCOLOR |
2329 | #ifndef NO_CURSORCOLOR |
2432 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2330 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2433 | #endif |
2331 | #endif |
|
|
2332 | } |
2434 | } |
2333 | } |
2435 | else if (oldcursor.row >= 0) |
2334 | else if (oldcursor.row >= 0) |
2436 | { |
2335 | { |
|
|
2336 | int cursorwidth = 1; |
|
|
2337 | int col = oldcursor.col; |
|
|
2338 | |
|
|
2339 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
|
|
2340 | col--; |
|
|
2341 | |
|
|
2342 | while (col + cursorwidth < ncol |
|
|
2343 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
|
|
2344 | cursorwidth++; |
|
|
2345 | |
2437 | #ifndef NO_CURSORCOLOR |
2346 | #ifndef NO_CURSORCOLOR |
2438 | if (ISSET_PIXCOLOR (Color_cursor)) |
2347 | if (ISSET_PIXCOLOR (Color_cursor)) |
2439 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); |
2348 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2440 | #endif |
2349 | #endif |
2441 | int cursorwidth = 1; |
|
|
2442 | while (oldcursor.col + cursorwidth < TermWin.ncol |
|
|
2443 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
|
|
2444 | cursorwidth++; |
|
|
2445 | |
2350 | |
2446 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2351 | XDrawRectangle (display->display, drawBuffer, gc, |
2447 | Col2Pixel (oldcursor.col), |
2352 | Col2Pixel (col), |
2448 | Row2Pixel (oldcursor.row), |
2353 | Row2Pixel (oldcursor.row), |
2449 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2354 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2450 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2355 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2451 | } |
2356 | } |
2452 | } |
2357 | } |
2453 | |
2358 | |
2454 | /* |
2359 | /* |
2455 | * H: cleanup selection |
2360 | * H: cleanup selection |
… | |
… | |
2462 | num_scr = 0; |
2367 | num_scr = 0; |
2463 | num_scr_allow = 1; |
2368 | num_scr_allow = 1; |
2464 | } |
2369 | } |
2465 | |
2370 | |
2466 | void |
2371 | void |
2467 | rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) |
2372 | rxvt_term::scr_remap_chars (const line_t &l) |
2468 | { |
2373 | { |
2469 | if (!rp || !tp) |
2374 | if (!l.t) |
2470 | return; |
2375 | return; |
2471 | |
2376 | |
2472 | for (int i = TermWin.ncol; i; i--, rp++, tp++) |
2377 | for (int i = ncol; i--; ) |
2473 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
2378 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2474 | } |
2379 | } |
2475 | |
2380 | |
2476 | void |
2381 | void |
2477 | rxvt_term::scr_remap_chars () |
2382 | rxvt_term::scr_remap_chars () |
2478 | { |
2383 | { |
2479 | for (int i = TermWin.nrow + TermWin.saveLines; i--; ) |
2384 | for (int i = total_rows; i--; ) |
2480 | scr_remap_chars (screen.text[i], screen.rend[i]); |
2385 | scr_remap_chars (row_buf [i]); |
2481 | |
2386 | |
2482 | for (int i = TermWin.nrow; i--; ) |
2387 | for (int i = nrow; i--; ) |
2483 | { |
2388 | { |
2484 | scr_remap_chars (drawn_text[i], drawn_rend[i]); |
2389 | scr_remap_chars (drawn_buf [i]); |
2485 | scr_remap_chars (swap.text[i], swap.rend[i]); |
2390 | scr_remap_chars (swap_buf [i]); |
2486 | } |
2391 | } |
2487 | } |
2392 | } |
2488 | |
2393 | |
2489 | void |
2394 | void |
2490 | rxvt_term::scr_recolour () |
2395 | rxvt_term::scr_recolour () |
… | |
… | |
2496 | #if XPM_BACKGROUND |
2401 | #if XPM_BACKGROUND |
2497 | && !bgPixmap.pixmap |
2402 | && !bgPixmap.pixmap |
2498 | #endif |
2403 | #endif |
2499 | ) |
2404 | ) |
2500 | { |
2405 | { |
2501 | XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); |
2406 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2502 | XClearWindow (display->display, TermWin.parent[0]); |
2407 | XClearWindow (display->display, parent[0]); |
2503 | XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); |
2408 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2504 | #if HAVE_SCROLLBARS |
2409 | #if HAVE_SCROLLBARS |
2505 | if (scrollBar.win) |
2410 | if (scrollBar.win) |
2506 | { |
2411 | { |
2507 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2412 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2508 | scrollBar.setIdle (); |
2413 | scrollBar.setIdle (); |
… | |
… | |
2518 | |
2423 | |
2519 | /* ------------------------------------------------------------------------- */ |
2424 | /* ------------------------------------------------------------------------- */ |
2520 | void |
2425 | void |
2521 | rxvt_term::scr_clear (bool really) |
2426 | rxvt_term::scr_clear (bool really) |
2522 | { |
2427 | { |
2523 | if (!TermWin.mapped) |
2428 | if (!mapped) |
2524 | return; |
2429 | return; |
2525 | |
2430 | |
2526 | num_scr_allow = 0; |
2431 | num_scr_allow = 0; |
2527 | want_refresh = 1; |
2432 | want_refresh = 1; |
2528 | |
2433 | |
2529 | #if TRANSPARENT |
|
|
2530 | if ((options & Opt_transparent) && (am_pixmap_trans == 0)) |
|
|
2531 | { |
|
|
2532 | int i; |
|
|
2533 | |
|
|
2534 | if (!(options & Opt_transparent_all)) |
|
|
2535 | i = 0; |
|
|
2536 | else |
|
|
2537 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
|
|
2538 | |
|
|
2539 | while (i--) |
|
|
2540 | if (TermWin.parent[i] != None) |
|
|
2541 | XClearWindow (display->display, TermWin.parent[i]); |
|
|
2542 | } |
|
|
2543 | #endif |
|
|
2544 | |
|
|
2545 | if (really) |
2434 | if (really) |
2546 | XClearWindow (display->display, TermWin.vt); |
2435 | XClearWindow (display->display, vt); |
2547 | } |
2436 | } |
2548 | |
2437 | |
2549 | /* ------------------------------------------------------------------------- */ |
2438 | /* ------------------------------------------------------------------------- */ |
2550 | void |
2439 | void |
2551 | rxvt_term::scr_reverse_selection () |
2440 | rxvt_term::scr_reverse_selection () |
2552 | { |
2441 | { |
|
|
2442 | if (selection.op |
2553 | if (selection.op && current_screen == selection.screen) |
2443 | && current_screen == selection.screen |
|
|
2444 | && selection.end.row >= -view_start) |
2554 | { |
2445 | { |
2555 | int end_row = TermWin.saveLines - TermWin.view_start; |
2446 | int view_end = -view_start + nrow; |
2556 | int i = selection.beg.row + TermWin.saveLines; |
2447 | int row, col; |
2557 | int col, row = selection.end.row + TermWin.saveLines; |
|
|
2558 | rend_t *srp; |
|
|
2559 | |
2448 | |
2560 | #if ENABLE_FRILLS |
2449 | #if ENABLE_FRILLS |
2561 | if (selection.rect) |
2450 | if (selection.rect) |
2562 | { |
2451 | { |
2563 | end_row += TermWin.nrow; |
2452 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
|
|
2453 | { |
|
|
2454 | text_t *stp = ROW(row).t; |
|
|
2455 | rend_t *srp = ROW(row).r; |
2564 | |
2456 | |
2565 | for (; i <= row && i <= end_row; i++) |
|
|
2566 | for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) |
2457 | for (col = selection.beg.col; col < selection.end.col; col++) |
2567 | srp[col] ^= RS_RVid; |
2458 | srp[col] ^= RS_RVid; |
|
|
2459 | |
|
|
2460 | while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2461 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2462 | |
|
|
2463 | if (++col < selection.end.col) |
|
|
2464 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2465 | } |
2568 | } |
2466 | } |
2569 | else |
2467 | else |
2570 | #endif |
2468 | #endif |
2571 | { |
2469 | { |
2572 | if (i >= end_row) |
2470 | if (selection.beg.row >= -view_start) |
|
|
2471 | { |
2573 | col = selection.beg.col; |
2472 | col = selection.beg.col; |
|
|
2473 | row = selection.beg.row; |
|
|
2474 | } |
2574 | else |
2475 | else |
2575 | { |
2476 | { |
2576 | col = 0; |
2477 | col = 0; |
2577 | i = end_row; |
2478 | row = -view_start; |
2578 | } |
2479 | } |
2579 | |
2480 | |
2580 | end_row += TermWin.nrow; |
2481 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2581 | |
2482 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2582 | for (; i < row && i < end_row; i++, col = 0) |
|
|
2583 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
|
|
2584 | srp[col] ^= RS_RVid; |
2483 | srp[col] ^= RS_RVid; |
2585 | |
2484 | |
2586 | if (i == row && i < end_row) |
2485 | if (row == selection.end.row) |
2587 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2486 | for (rend_t *srp = ROW(row).r; col < selection.end.col; col++) |
2588 | srp[col] ^= RS_RVid; |
2487 | srp[col] ^= RS_RVid; |
2589 | } |
2488 | } |
2590 | } |
2489 | } |
2591 | } |
2490 | } |
2592 | |
2491 | |
… | |
… | |
2601 | { |
2500 | { |
2602 | int row, wrote; |
2501 | int row, wrote; |
2603 | unsigned int width, towrite; |
2502 | unsigned int width, towrite; |
2604 | char r1[] = "\n"; |
2503 | char r1[] = "\n"; |
2605 | |
2504 | |
2606 | for (row = TermWin.saveLines - TermWin.nscrolled; |
2505 | for (row = saveLines - nsaved; |
2607 | row < TermWin.saveLines + TermWin.nrow - 1; row++) |
2506 | row < saveLines + nrow - 1; row++) |
2608 | { |
2507 | { |
2609 | width = screen.tlen[row] >= 0 ? screen.tlen[row] |
2508 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2610 | : TermWin.ncol; |
2509 | : ncol; |
2611 | for (towrite = width; towrite; towrite -= wrote) |
2510 | for (towrite = width; towrite; towrite -= wrote) |
2612 | { |
2511 | { |
2613 | wrote = write (fd, & (screen.text[row][width - towrite]), |
2512 | wrote = write (fd, & (row_buf[row].t[width - towrite]), |
2614 | towrite); |
2513 | towrite); |
2615 | if (wrote < 0) |
2514 | if (wrote < 0) |
2616 | return; /* XXX: death, no report */ |
2515 | return; /* XXX: death, no report */ |
2617 | } |
2516 | } |
2618 | if (screen.tlen[row] >= 0) |
2517 | if (row_buf[row].l >= 0) |
2619 | if (write (fd, r1, 1) <= 0) |
2518 | if (write (fd, r1, 1) <= 0) |
2620 | return; /* XXX: death, no report */ |
2519 | return; /* XXX: death, no report */ |
2621 | } |
2520 | } |
2622 | } |
2521 | } |
2623 | #endif |
2522 | #endif |
2624 | |
2523 | |
2625 | /* ------------------------------------------------------------------------- * |
2524 | /* ------------------------------------------------------------------------- * |
2626 | * CHARACTER SELECTION * |
2525 | * CHARACTER SELECTION * |
2627 | * ------------------------------------------------------------------------- */ |
2526 | * ------------------------------------------------------------------------- */ |
2628 | |
|
|
2629 | /* |
|
|
2630 | * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 |
|
|
2631 | */ |
|
|
2632 | void |
2527 | void |
2633 | rxvt_term::selection_check (int check_more) |
2528 | rxvt_term::selection_check (int check_more) |
2634 | { |
2529 | { |
2635 | row_col_t pos; |
2530 | row_col_t pos; |
2636 | |
2531 | |
2637 | if (!selection.op) |
2532 | if (!selection.op) |
2638 | return; |
2533 | return; |
2639 | |
2534 | |
2640 | pos.row = pos.col = 0; |
2535 | pos.row = pos.col = 0; |
2641 | if ((selection.beg.row < - (int32_t)TermWin.nscrolled) |
2536 | if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) |
2642 | || (selection.beg.row >= TermWin.nrow) |
2537 | || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) |
2643 | || (selection.mark.row < - (int32_t)TermWin.nscrolled) |
2538 | || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) |
2644 | || (selection.mark.row >= TermWin.nrow) |
|
|
2645 | || (selection.end.row < - (int32_t)TermWin.nscrolled) |
|
|
2646 | || (selection.end.row >= TermWin.nrow) |
|
|
2647 | || (check_more == 1 |
2539 | || (check_more == 1 |
2648 | && current_screen == selection.screen |
2540 | && current_screen == selection.screen |
2649 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2541 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2650 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2542 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2651 | || (check_more == 2 |
2543 | || (check_more == 2 |
… | |
… | |
2653 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2545 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2654 | || (check_more == 3 |
2546 | || (check_more == 3 |
2655 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2547 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2656 | || (check_more == 4 /* screen width change */ |
2548 | || (check_more == 4 /* screen width change */ |
2657 | && (selection.beg.row != selection.end.row |
2549 | && (selection.beg.row != selection.end.row |
2658 | || selection.end.col > TermWin.ncol))) |
2550 | || selection.end.col > ncol))) |
2659 | CLEAR_SELECTION (); |
2551 | CLEAR_SELECTION (); |
2660 | } |
2552 | } |
2661 | |
2553 | |
2662 | /* ------------------------------------------------------------------------- */ |
2554 | /* ------------------------------------------------------------------------- */ |
2663 | /* |
2555 | /* |
… | |
… | |
2872 | * EXT: button 2 release |
2764 | * EXT: button 2 release |
2873 | */ |
2765 | */ |
2874 | void |
2766 | void |
2875 | rxvt_term::selection_request (Time tm, int x, int y) |
2767 | rxvt_term::selection_request (Time tm, int x, int y) |
2876 | { |
2768 | { |
2877 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2769 | if (x < 0 || x >= width || y < 0 || y >= height) |
2878 | return; /* outside window */ |
2770 | return; /* outside window */ |
2879 | |
2771 | |
2880 | if (selection.text) |
2772 | if (selection.text) |
2881 | { /* internal selection */ |
2773 | { /* internal selection */ |
2882 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2774 | char *str = rxvt_wcstombs (selection.text, selection.len); |
… | |
… | |
2924 | sel = xa[XA_CLIPBOARD]; |
2816 | sel = xa[XA_CLIPBOARD]; |
2925 | |
2817 | |
2926 | if (XGetSelectionOwner (display->display, sel) != None) |
2818 | if (XGetSelectionOwner (display->display, sel) != None) |
2927 | { |
2819 | { |
2928 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2820 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2929 | TermWin.vt, selection_request_time); |
2821 | vt, selection_request_time); |
2930 | return 1; |
2822 | return 1; |
2931 | } |
2823 | } |
2932 | |
2824 | |
2933 | return 0; |
2825 | return 0; |
2934 | } |
2826 | } |
… | |
… | |
2957 | * EXT: button 1 or 3 release |
2849 | * EXT: button 1 or 3 release |
2958 | */ |
2850 | */ |
2959 | void |
2851 | void |
2960 | rxvt_term::selection_make (Time tm) |
2852 | rxvt_term::selection_make (Time tm) |
2961 | { |
2853 | { |
2962 | int i, col, end_col, row, end_row; |
2854 | int i; |
2963 | wchar_t *new_selection_text; |
2855 | wchar_t *new_selection_text; |
2964 | text_t *t; |
2856 | text_t *t; |
2965 | |
2857 | |
2966 | switch (selection.op) |
2858 | switch (selection.op) |
2967 | { |
2859 | { |
… | |
… | |
2980 | selection.op = SELECTION_DONE; |
2872 | selection.op = SELECTION_DONE; |
2981 | |
2873 | |
2982 | if (selection.clicks == 4) |
2874 | if (selection.clicks == 4) |
2983 | return; /* nothing selected, go away */ |
2875 | return; /* nothing selected, go away */ |
2984 | |
2876 | |
2985 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2877 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2986 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2878 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2987 | |
2879 | |
2988 | col = selection.beg.col; |
|
|
2989 | row = selection.beg.row + TermWin.saveLines; |
|
|
2990 | end_row = selection.end.row + TermWin.saveLines; |
|
|
2991 | int ofs = 0; |
2880 | int ofs = 0; |
2992 | int extra = 0; |
2881 | int extra = 0; |
2993 | |
2882 | |
|
|
2883 | int col = selection.beg.col; |
|
|
2884 | int row = selection.beg.row; |
|
|
2885 | |
|
|
2886 | int end_col; |
|
|
2887 | |
2994 | for (; row <= end_row; row++, col = 0) |
2888 | for (; row <= selection.end.row; row++, col = 0) |
2995 | { |
2889 | { |
2996 | end_col = screen.tlen[row]; |
|
|
2997 | |
|
|
2998 | #if ENABLE_FRILLS |
2890 | #if ENABLE_FRILLS |
2999 | if (selection.rect) |
2891 | if (selection.rect) |
3000 | { |
2892 | { |
3001 | col = selection.beg.col; |
2893 | col = selection.beg.col; |
3002 | end_col = TermWin.ncol + 1; |
2894 | end_col = ncol + 1; |
|
|
2895 | } |
|
|
2896 | else |
|
|
2897 | #endif |
|
|
2898 | end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN |
|
|
2899 | |
|
|
2900 | col = max (col, 0); |
|
|
2901 | |
|
|
2902 | if (row == selection.end.row |
|
|
2903 | #if ENABLE_FRILLS |
|
|
2904 | || selection.rect |
|
|
2905 | #endif |
3003 | } |
2906 | ) |
3004 | #endif |
|
|
3005 | |
|
|
3006 | MAX_IT (col, 0); |
|
|
3007 | |
|
|
3008 | if (end_col == -1) |
|
|
3009 | end_col = TermWin.ncol; |
|
|
3010 | |
|
|
3011 | if (row == end_row || selection.rect) |
|
|
3012 | MIN_IT (end_col, selection.end.col); |
2907 | min_it (end_col, selection.end.col); |
3013 | |
2908 | |
3014 | t = &screen.text[row][col]; |
2909 | t = ROW(row).t + col; |
3015 | for (; col < end_col; col++) |
2910 | for (; col < end_col; col++) |
3016 | { |
2911 | { |
3017 | if (*t == NOCHAR) |
2912 | if (*t == NOCHAR) |
3018 | t++; |
2913 | t++; |
3019 | #if ENABLE_COMBINING |
2914 | #if ENABLE_COMBINING |
… | |
… | |
3035 | #endif |
2930 | #endif |
3036 | else |
2931 | else |
3037 | new_selection_text[ofs++] = *t++; |
2932 | new_selection_text[ofs++] = *t++; |
3038 | } |
2933 | } |
3039 | |
2934 | |
3040 | if (screen.tlen[row] != -1 && row != end_row) |
2935 | #if ENABLE_FRILLS |
|
|
2936 | if (selection.rect) |
|
|
2937 | { |
|
|
2938 | while (ofs |
|
|
2939 | && new_selection_text[ofs - 1] != C0_LF |
|
|
2940 | && unicode::is_space (new_selection_text[ofs - 1])) |
|
|
2941 | --ofs; |
|
|
2942 | |
3041 | new_selection_text[ofs++] = C0_LF; |
2943 | new_selection_text[ofs++] = C0_LF; |
|
|
2944 | } |
|
|
2945 | else |
|
|
2946 | #endif |
|
|
2947 | if (!ROW(row).is_longer () && row != selection.end.row) |
|
|
2948 | new_selection_text[ofs++] = C0_LF; |
3042 | } |
2949 | } |
3043 | |
2950 | |
3044 | if (end_col != selection.end.col) |
2951 | if (end_col != selection.end.col) |
3045 | new_selection_text[ofs++] = C0_LF; |
2952 | new_selection_text[ofs++] = C0_LF; |
3046 | |
2953 | |
… | |
… | |
3056 | |
2963 | |
3057 | // we usually allocate much more than necessary, so realloc it smaller again |
2964 | // we usually allocate much more than necessary, so realloc it smaller again |
3058 | selection.len = ofs; |
2965 | selection.len = ofs; |
3059 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2966 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
3060 | |
2967 | |
3061 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2968 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3062 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2969 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3063 | display->set_selection_owner (this); |
2970 | display->set_selection_owner (this); |
3064 | else |
2971 | else |
3065 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
2972 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
3066 | |
2973 | |
3067 | #if 0 |
2974 | #if 0 |
… | |
… | |
3090 | |
2997 | |
3091 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
2998 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3092 | |
2999 | |
3093 | if (clicks == 2 || clicks == 3) |
3000 | if (clicks == 2 || clicks == 3) |
3094 | selection_extend_colrow (selection.mark.col, |
3001 | selection_extend_colrow (selection.mark.col, |
3095 | selection.mark.row + TermWin.view_start, |
3002 | selection.mark.row + view_start, |
3096 | 0, /* button 3 */ |
3003 | 0, /* button 3 */ |
3097 | 1, /* button press */ |
3004 | 1, /* button press */ |
3098 | 0); /* click change */ |
3005 | 0); /* click change */ |
3099 | } |
3006 | } |
3100 | |
3007 | |
… | |
… | |
3104 | */ |
3011 | */ |
3105 | void |
3012 | void |
3106 | rxvt_term::selection_start_colrow (int col, int row) |
3013 | rxvt_term::selection_start_colrow (int col, int row) |
3107 | { |
3014 | { |
3108 | want_refresh = 1; |
3015 | want_refresh = 1; |
|
|
3016 | |
|
|
3017 | selection.mark.row = row - view_start; |
3109 | selection.mark.col = col; |
3018 | selection.mark.col = col; |
3110 | selection.mark.row = row - TermWin.view_start; |
|
|
3111 | |
3019 | |
3112 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
3020 | selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); |
3113 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
3021 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3114 | MAX_IT (selection.mark.col, 0); |
|
|
3115 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
|
|
3116 | |
3022 | |
3117 | while (selection.mark.col > 0 |
3023 | while (selection.mark.col > 0 |
3118 | && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) |
3024 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3119 | --selection.mark.col; |
3025 | --selection.mark.col; |
3120 | |
3026 | |
3121 | if (selection.op) |
3027 | if (selection.op) |
3122 | { /* clear the old selection */ |
3028 | { /* clear the old selection */ |
3123 | selection.beg.row = selection.end.row = selection.mark.row; |
3029 | selection.beg.row = selection.end.row = selection.mark.row; |
… | |
… | |
3147 | text_t *stp; |
3053 | text_t *stp; |
3148 | rend_t *srp; |
3054 | rend_t *srp; |
3149 | |
3055 | |
3150 | if (dirn == UP) |
3056 | if (dirn == UP) |
3151 | { |
3057 | { |
3152 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
3058 | bound.row = - nsaved - 1; |
3153 | bound.col = 0; |
3059 | bound.col = 0; |
3154 | dirnadd = -1; |
3060 | dirnadd = -1; |
3155 | } |
3061 | } |
3156 | else |
3062 | else |
3157 | { |
3063 | { |
3158 | bound.row = TermWin.saveLines + TermWin.nrow; |
3064 | bound.row = nrow; |
3159 | bound.col = TermWin.ncol - 1; |
3065 | bound.col = ncol - 1; |
3160 | dirnadd = 1; |
3066 | dirnadd = 1; |
3161 | } |
3067 | } |
3162 | |
3068 | |
3163 | row = mark->row + TermWin.saveLines; |
3069 | row = mark->row; |
3164 | col = mark->col; |
3070 | col = max (mark->col, 0); |
3165 | MAX_IT (col, 0); |
3071 | |
3166 | /* find the edge of a word */ |
3072 | /* find the edge of a word */ |
3167 | stp = &screen.text[row][col]; |
3073 | stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp); |
3168 | w1 = DELIMIT_TEXT (*stp); |
3074 | srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp); |
3169 | |
|
|
3170 | srp = &screen.rend[row][col]; |
|
|
3171 | w2 = DELIMIT_REND (*srp); |
|
|
3172 | |
3075 | |
3173 | for (;;) |
3076 | for (;;) |
3174 | { |
3077 | { |
3175 | for (; col != bound.col; col += dirnadd) |
3078 | for (; col != bound.col; col += dirnadd) |
3176 | { |
3079 | { |
… | |
… | |
3186 | break; |
3089 | break; |
3187 | } |
3090 | } |
3188 | |
3091 | |
3189 | if ((col == bound.col) && (row != bound.row)) |
3092 | if ((col == bound.col) && (row != bound.row)) |
3190 | { |
3093 | { |
3191 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
3094 | if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ()) |
3192 | { |
3095 | { |
3193 | trow = row + dirnadd; |
3096 | trow = row + dirnadd; |
3194 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
3097 | tcol = dirn == UP ? ncol - 1 : 0; |
3195 | |
3098 | |
3196 | if (screen.text[trow] == NULL) |
3099 | if (!ROW(trow).t) |
3197 | break; |
3100 | break; |
3198 | |
3101 | |
3199 | stp = & (screen.text[trow][tcol]); |
3102 | stp = ROW(trow).t + tcol; |
3200 | srp = & (screen.rend[trow][tcol]); |
3103 | srp = ROW(trow).r + tcol; |
3201 | |
3104 | |
3202 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3105 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3203 | break; |
3106 | break; |
3204 | |
3107 | |
3205 | row = trow; |
3108 | row = trow; |
… | |
… | |
3213 | Old_Word_Selection_You_Die: |
3116 | Old_Word_Selection_You_Die: |
3214 | if (dirn == DN) |
3117 | if (dirn == DN) |
3215 | col++; /* put us on one past the end */ |
3118 | col++; /* put us on one past the end */ |
3216 | |
3119 | |
3217 | /* Poke the values back in */ |
3120 | /* Poke the values back in */ |
3218 | ret->row = row - TermWin.saveLines; |
3121 | ret->row = row; |
3219 | ret->col = col; |
3122 | ret->col = col; |
3220 | } |
3123 | } |
3221 | |
3124 | |
3222 | /* ------------------------------------------------------------------------- */ |
3125 | /* ------------------------------------------------------------------------- */ |
3223 | /* |
3126 | /* |
… | |
… | |
3228 | * flag == 2 ==> button 3 motion |
3131 | * flag == 2 ==> button 3 motion |
3229 | */ |
3132 | */ |
3230 | void |
3133 | void |
3231 | rxvt_term::selection_extend (int x, int y, int flag) |
3134 | rxvt_term::selection_extend (int x, int y, int flag) |
3232 | { |
3135 | { |
3233 | int col, row; |
3136 | int col = clamp (Pixel2Col (x), 0, ncol); |
3234 | |
3137 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3235 | col = Pixel2Col (x); |
|
|
3236 | row = Pixel2Row (y); |
|
|
3237 | MAX_IT (row, 0); |
|
|
3238 | MIN_IT (row, (int)TermWin.nrow - 1); |
|
|
3239 | MAX_IT (col, 0); |
|
|
3240 | MIN_IT (col, (int)TermWin.ncol); |
|
|
3241 | |
3138 | |
3242 | /* |
3139 | /* |
3243 | * If we're selecting characters (single click) then we must check first |
3140 | * If we're selecting characters (single click) then we must check first |
3244 | * if we are at the same place as the original mark. If we are then |
3141 | * if we are at the same place as the original mark. If we are then |
3245 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3142 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3246 | * be _past_ a character for it to be selected. |
3143 | * be _past_ a character for it to be selected. |
3247 | */ |
3144 | */ |
3248 | if (((selection.clicks % 3) == 1) && !flag |
3145 | if (((selection.clicks % 3) == 1) && !flag |
3249 | && (col == selection.mark.col |
3146 | && (col == selection.mark.col |
3250 | && (row == selection.mark.row + TermWin.view_start))) |
3147 | && (row == selection.mark.row + view_start))) |
3251 | { |
3148 | { |
3252 | /* select nothing */ |
3149 | /* select nothing */ |
3253 | selection.beg.row = selection.end.row = 0; |
3150 | selection.beg.row = selection.end.row = 0; |
3254 | selection.beg.col = selection.end.col = 0; |
3151 | selection.beg.col = selection.end.col = 0; |
3255 | selection.clicks = 4; |
3152 | selection.clicks = 4; |
… | |
… | |
3270 | * Extend the selection to the specified col/row |
3167 | * Extend the selection to the specified col/row |
3271 | */ |
3168 | */ |
3272 | void |
3169 | void |
3273 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3170 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3274 | { |
3171 | { |
3275 | int16_t ncol = TermWin.ncol; |
|
|
3276 | int end_col; |
|
|
3277 | row_col_t pos; |
3172 | row_col_t pos; |
3278 | enum { |
3173 | enum { |
3279 | LEFT, RIGHT |
3174 | LEFT, RIGHT |
3280 | } closeto = RIGHT; |
3175 | } closeto = RIGHT; |
3281 | |
3176 | |
… | |
… | |
3312 | selection.beg.col = selection.end.col = selection.mark.col; |
3207 | selection.beg.col = selection.end.col = selection.mark.col; |
3313 | selection.beg.row = selection.end.row = selection.mark.row; |
3208 | selection.beg.row = selection.end.row = selection.mark.row; |
3314 | } |
3209 | } |
3315 | |
3210 | |
3316 | pos.col = col; |
3211 | pos.col = col; |
3317 | pos.row = row; |
3212 | pos.row = row - view_start; |
3318 | |
|
|
3319 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
|
|
3320 | |
3213 | |
3321 | /* |
3214 | /* |
3322 | * This is mainly xterm style selection with a couple of differences, mainly |
3215 | * This is mainly xterm style selection with a couple of differences, mainly |
3323 | * in the way button3 drag extension works. |
3216 | * in the way button3 drag extension works. |
3324 | * We're either doing: button1 drag; button3 press; or button3 drag |
3217 | * We're either doing: button1 drag; button3 press; or button3 drag |
… | |
… | |
3383 | } |
3276 | } |
3384 | } |
3277 | } |
3385 | |
3278 | |
3386 | if (selection.clicks == 1) |
3279 | if (selection.clicks == 1) |
3387 | { |
3280 | { |
3388 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3281 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3389 | |
3282 | && !ROW(selection.beg.row).is_longer () |
3390 | if (selection.beg.col > end_col |
|
|
3391 | && end_col != -1 |
|
|
3392 | #if ENABLE_FRILLS |
3283 | #if ENABLE_FRILLS |
3393 | && !selection.rect |
3284 | && !selection.rect |
3394 | #endif |
3285 | #endif |
3395 | ) |
3286 | ) |
3396 | selection.beg.col = ncol; |
3287 | selection.beg.col = ncol; |
3397 | |
3288 | |
3398 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
|
|
3399 | |
|
|
3400 | if ( |
3289 | if ( |
3401 | selection.end.col > end_col |
3290 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3402 | && end_col != -1 |
3291 | && !ROW(selection.end.row).is_longer () |
3403 | #if ENABLE_FRILLS |
3292 | #if ENABLE_FRILLS |
3404 | && !selection.rect |
3293 | && !selection.rect |
3405 | #endif |
3294 | #endif |
3406 | ) |
3295 | ) |
3407 | selection.end.col = ncol; |
3296 | selection.end.col = ncol; |
… | |
… | |
3415 | selection_delimit_word (DN, &selection.end, &selection.end); |
3304 | selection_delimit_word (DN, &selection.end, &selection.end); |
3416 | } |
3305 | } |
3417 | else if (selection.clicks == 3) |
3306 | else if (selection.clicks == 3) |
3418 | { |
3307 | { |
3419 | #if ENABLE_FRILLS |
3308 | #if ENABLE_FRILLS |
3420 | if (options & Opt_tripleclickwords) |
3309 | if (OPTION (Opt_tripleclickwords)) |
3421 | { |
3310 | { |
3422 | int end_row; |
|
|
3423 | |
|
|
3424 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3311 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3425 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
|
|
3426 | |
3312 | |
3427 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3313 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3428 | { |
3314 | { |
3429 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
3315 | if (!ROW(end_row).is_longer ()) |
3430 | |
|
|
3431 | if (end_col != -1) |
|
|
3432 | { |
3316 | { |
3433 | selection.end.row = end_row; |
3317 | selection.end.row = end_row; |
3434 | selection.end.col = end_col; |
3318 | selection.end.col = ROW(end_row).l; |
3435 | selection_remove_trailing_spaces (); |
3319 | selection_remove_trailing_spaces (); |
3436 | break; |
3320 | break; |
3437 | } |
3321 | } |
3438 | } |
3322 | } |
3439 | } |
3323 | } |
… | |
… | |
3445 | |
3329 | |
3446 | selection.beg.col = 0; |
3330 | selection.beg.col = 0; |
3447 | selection.end.col = ncol; |
3331 | selection.end.col = ncol; |
3448 | |
3332 | |
3449 | // select a complete logical line |
3333 | // select a complete logical line |
3450 | while (selection.beg.row > -TermWin.saveLines |
3334 | while (selection.beg.row > -saveLines |
3451 | && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) |
3335 | && ROW(selection.beg.row - 1).is_longer ()) |
3452 | selection.beg.row--; |
3336 | selection.beg.row--; |
3453 | |
3337 | |
3454 | while (selection.end.row < TermWin.nrow |
3338 | while (selection.end.row < nrow |
3455 | && screen.tlen[selection.end.row + TermWin.saveLines] == -1) |
3339 | && ROW(selection.end.row).is_longer ()) |
3456 | selection.end.row++; |
3340 | selection.end.row++; |
3457 | } |
3341 | } |
3458 | } |
3342 | } |
3459 | |
3343 | |
3460 | if (button3 && buttonpress) |
3344 | if (button3 && buttonpress) |
… | |
… | |
3471 | } |
3355 | } |
3472 | } |
3356 | } |
3473 | |
3357 | |
3474 | #if ENABLE_FRILLS |
3358 | #if ENABLE_FRILLS |
3475 | if (selection.rect && selection.beg.col > selection.end.col) |
3359 | if (selection.rect && selection.beg.col > selection.end.col) |
3476 | SWAP_IT (selection.beg.col, selection.end.col, int); |
3360 | ::swap (selection.beg.col, selection.end.col); |
3477 | #endif |
3361 | #endif |
3478 | } |
3362 | } |
3479 | |
3363 | |
3480 | #if ENABLE_FRILLS |
3364 | #if ENABLE_FRILLS |
3481 | void |
3365 | void |
… | |
… | |
3485 | text_t *stp; |
3369 | text_t *stp; |
3486 | |
3370 | |
3487 | end_col = selection.end.col; |
3371 | end_col = selection.end.col; |
3488 | end_row = selection.end.row; |
3372 | end_row = selection.end.row; |
3489 | |
3373 | |
3490 | for ( ; end_row >= selection.beg.row; ) |
3374 | for (; end_row >= selection.beg.row; ) |
3491 | { |
3375 | { |
3492 | stp = screen.text[end_row + TermWin.saveLines]; |
3376 | stp = ROW(end_row).t; |
3493 | |
3377 | |
3494 | while (--end_col >= 0) |
3378 | while (--end_col >= 0) |
3495 | { |
3379 | { |
3496 | if (stp[end_col] != ' ' |
3380 | if (stp[end_col] != NOCHAR |
3497 | && stp[end_col] != '\t' |
3381 | && !unicode::is_space (stp[end_col])) |
3498 | && stp[end_col] != NOCHAR) |
|
|
3499 | break; |
3382 | break; |
3500 | } |
3383 | } |
3501 | |
3384 | |
3502 | if (end_col >= 0 |
3385 | if (end_col >= 0 |
3503 | || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) |
3386 | || !ROW(end_row - 1).is_longer ()) |
3504 | { |
3387 | { |
3505 | selection.end.col = end_col + 1; |
3388 | selection.end.col = end_col + 1; |
3506 | selection.end.row = end_row; |
3389 | selection.end.row = end_row; |
3507 | break; |
3390 | break; |
3508 | } |
3391 | } |
3509 | |
3392 | |
3510 | end_row--; |
3393 | end_row--; |
3511 | end_col = TermWin.ncol; |
3394 | end_col = ncol; |
3512 | } |
3395 | } |
3513 | |
3396 | |
3514 | if (selection.mark.row > selection.end.row) |
3397 | if (selection.mark.row > selection.end.row) |
3515 | { |
3398 | { |
3516 | selection.mark.row = selection.end.row; |
3399 | selection.mark.row = selection.end.row; |
… | |
… | |
3679 | */ |
3562 | */ |
3680 | void |
3563 | void |
3681 | rxvt_term::pixel_position (int *x, int *y) |
3564 | rxvt_term::pixel_position (int *x, int *y) |
3682 | { |
3565 | { |
3683 | *x = Pixel2Col (*x); |
3566 | *x = Pixel2Col (*x); |
3684 | /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ |
3567 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
3685 | *y = Pixel2Row (*y); |
3568 | *y = Pixel2Row (*y); |
3686 | /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ |
3569 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
3687 | } |
3570 | } |
3688 | |
3571 | |
3689 | /* ------------------------------------------------------------------------- */ |
3572 | /* ------------------------------------------------------------------------- */ |
3690 | #ifdef USE_XIM |
3573 | #ifdef USE_XIM |
3691 | void |
3574 | void |
3692 | rxvt_term::im_set_position (XPoint &pos) |
3575 | rxvt_term::im_set_position (XPoint &pos) |
3693 | { |
3576 | { |
3694 | XWindowAttributes xwa; |
3577 | XWindowAttributes xwa; |
3695 | |
3578 | |
3696 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
3579 | XGetWindowAttributes (display->display, vt, &xwa); |
3697 | |
3580 | |
3698 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3581 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3699 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; |
3582 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3700 | } |
3583 | } |
3701 | #endif |
3584 | #endif |
3702 | |
3585 | |
3703 | #if ENABLE_OVERLAY |
3586 | #if ENABLE_OVERLAY |
3704 | void |
3587 | void |
3705 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3588 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3706 | { |
3589 | { |
3707 | if (TermWin.nrow < 3 || TermWin.ncol < 3) |
3590 | if (nrow < 3 || ncol < 3) |
3708 | return; |
3591 | return; |
3709 | |
3592 | |
3710 | want_refresh = 1; |
3593 | want_refresh = 1; |
3711 | |
3594 | |
3712 | scr_overlay_off (); |
3595 | scr_overlay_off (); |
3713 | |
3596 | |
3714 | if (x < 0) x = TermWin.ncol - w; |
3597 | if (x < 0) x = ncol - w; |
3715 | if (y < 0) y = TermWin.nrow - h; |
3598 | if (y < 0) y = nrow - h; |
3716 | |
3599 | |
3717 | // make space for border |
3600 | // make space for border |
3718 | w += 2; MIN_IT (w, TermWin.ncol); |
3601 | w += 2; min_it (w, ncol); |
3719 | h += 2; MIN_IT (h, TermWin.nrow); |
3602 | h += 2; min_it (h, nrow); |
3720 | |
3603 | |
3721 | x -= 1; MAX_IT (x, 0); |
3604 | x -= 1; clamp_it (x, 0, ncol - w); |
3722 | y -= 1; MAX_IT (y, 0); |
3605 | y -= 1; clamp_it (y, 0, nrow - h); |
3723 | |
|
|
3724 | MIN_IT (x, TermWin.ncol - w); |
|
|
3725 | MIN_IT (y, TermWin.nrow - h); |
|
|
3726 | |
3606 | |
3727 | ov_x = x; ov_y = y; |
3607 | ov_x = x; ov_y = y; |
3728 | ov_w = w; ov_h = h; |
3608 | ov_w = w; ov_h = h; |
3729 | |
3609 | |
3730 | ov_text = new text_t *[h]; |
3610 | ov_text = new text_t *[h]; |
… | |
… | |
3795 | while (*s) |
3675 | while (*s) |
3796 | scr_overlay_set (x++, y, *s++); |
3676 | scr_overlay_set (x++, y, *s++); |
3797 | } |
3677 | } |
3798 | |
3678 | |
3799 | void |
3679 | void |
|
|
3680 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) |
|
|
3681 | { |
|
|
3682 | while (*s) |
|
|
3683 | { |
|
|
3684 | text_t t = *s++; |
|
|
3685 | int width = wcwidth (t); |
|
|
3686 | |
|
|
3687 | while (width--) |
|
|
3688 | { |
|
|
3689 | scr_overlay_set (x++, y, t); |
|
|
3690 | t = NOCHAR; |
|
|
3691 | } |
|
|
3692 | } |
|
|
3693 | } |
|
|
3694 | |
|
|
3695 | void |
3800 | rxvt_term::scr_swap_overlay () |
3696 | rxvt_term::scr_swap_overlay () |
3801 | { |
3697 | { |
3802 | if (!ov_text) |
3698 | if (!ov_text) |
3803 | return; |
3699 | return; |
3804 | |
3700 | |
3805 | int row_offset = ov_y + TermWin.saveLines - TermWin.view_start; |
|
|
3806 | |
|
|
3807 | // swap screen mem with overlay |
3701 | // swap screen mem with overlay |
3808 | for (int y = ov_h; y--; ) |
3702 | for (int y = ov_h; y--; ) |
3809 | { |
3703 | { |
3810 | text_t *t1 = ov_text[y]; |
3704 | text_t *t1 = ov_text[y]; |
3811 | rend_t *r1 = ov_rend[y]; |
3705 | rend_t *r1 = ov_rend[y]; |
3812 | |
3706 | |
3813 | text_t *t2 = screen.text[y + row_offset] + ov_x; |
3707 | text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; |
3814 | rend_t *r2 = screen.rend[y + row_offset] + ov_x; |
3708 | rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; |
3815 | |
3709 | |
3816 | for (int x = ov_w; x--; ) |
3710 | for (int x = ov_w; x--; ) |
3817 | { |
3711 | { |
3818 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3712 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3819 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3713 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
… | |
… | |
3821 | } |
3715 | } |
3822 | } |
3716 | } |
3823 | |
3717 | |
3824 | #endif |
3718 | #endif |
3825 | /* ------------------------------------------------------------------------- */ |
3719 | /* ------------------------------------------------------------------------- */ |
|
|
3720 | |