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