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