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