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