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