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