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