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