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