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