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