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