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 | * |
… | |
… | |
25 | */ |
25 | */ |
26 | |
26 | |
27 | #include "../config.h" /* NECESSARY */ |
27 | #include "../config.h" /* NECESSARY */ |
28 | #define INTERN_SCREEN |
28 | #define INTERN_SCREEN |
29 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvt.h" /* NECESSARY */ |
30 | #include "screen.intpro" /* PROTOS for internal routines */ |
|
|
31 | |
30 | |
32 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
33 | |
32 | |
34 | #include <stdint.h> |
33 | #include <inttypes.h> |
35 | #include <wchar.h> |
34 | #include <wchar.h> |
36 | |
35 | |
37 | #include "salloc.C" // HACK, should be a seperate compile! |
36 | #include "salloc.C" // HACK, should be a seperate compile! |
38 | |
37 | |
39 | inline void fill_text (text_t *start, text_t value, int len) |
38 | inline void fill_text (text_t *start, text_t value, int len) |
… | |
… | |
48 | |
47 | |
49 | /* ------------------------------------------------------------------------- * |
48 | /* ------------------------------------------------------------------------- * |
50 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
51 | * ------------------------------------------------------------------------- */ |
50 | * ------------------------------------------------------------------------- */ |
52 | #define ZERO_SCROLLBACK() \ |
51 | #define ZERO_SCROLLBACK() \ |
53 | if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ |
52 | if (options & Opt_scrollTtyOutput) \ |
54 | TermWin.view_start = 0 |
53 | TermWin.view_start = 0 |
55 | #define CLEAR_SELECTION() \ |
54 | #define CLEAR_SELECTION() \ |
56 | selection.beg.row = selection.beg.col \ |
55 | selection.beg.row = selection.beg.col \ |
57 | = selection.end.row = selection.end.col = 0 |
56 | = selection.end.row = selection.end.col = 0 |
58 | #define CLEAR_ALL_SELECTION() \ |
57 | #define CLEAR_ALL_SELECTION() \ |
59 | selection.beg.row = selection.beg.col \ |
58 | selection.beg.row = selection.beg.col \ |
60 | = selection.mark.row = selection.mark.col \ |
59 | = selection.mark.row = selection.mark.col \ |
61 | = selection.end.row = selection.end.col = 0 |
60 | = selection.end.row = selection.end.col = 0 |
62 | |
61 | |
63 | #define ROW_AND_COL_IS_AFTER(A, B, C, D) \ |
62 | #define ROW_AND_COL_IS_AFTER(A, B, C, D) \ |
64 | (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) |
63 | (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) |
65 | #define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ |
64 | #define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ |
66 | (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) |
65 | (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) |
67 | #define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ |
66 | #define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ |
68 | (((A) == (C)) && ((B) > (D))) |
67 | (((A) == (C)) && ((B) > (D))) |
69 | #define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ |
68 | #define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ |
70 | (((A) == (C)) && ((B) >= (D))) |
69 | (((A) == (C)) && ((B) >= (D))) |
71 | #define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ |
70 | #define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ |
72 | (((A) == (C)) && ((B) < (D))) |
71 | (((A) == (C)) && ((B) < (D))) |
73 | #define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ |
72 | #define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ |
74 | (((A) == (C)) && ((B) <= (D))) |
73 | (((A) == (C)) && ((B) <= (D))) |
75 | |
74 | |
76 | /* these must be row_col_t */ |
75 | /* these must be row_col_t */ |
77 | #define ROWCOL_IS_AFTER(X, Y) \ |
76 | #define ROWCOL_IS_AFTER(X, Y) \ |
78 | ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
77 | ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
79 | #define ROWCOL_IS_BEFORE(X, Y) \ |
78 | #define ROWCOL_IS_BEFORE(X, Y) \ |
80 | ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
79 | ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
81 | #define ROWCOL_IN_ROW_AFTER(X, Y) \ |
80 | #define ROWCOL_IN_ROW_AFTER(X, Y) \ |
82 | ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
81 | ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
83 | #define ROWCOL_IN_ROW_BEFORE(X, Y) \ |
82 | #define ROWCOL_IN_ROW_BEFORE(X, Y) \ |
84 | ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
83 | ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
85 | #define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ |
84 | #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) |
85 | 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) \ |
86 | #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) |
87 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
89 | |
88 | |
90 | /* |
89 | /* |
91 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
90 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
92 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
91 | * 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 |
92 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
94 | */ |
93 | */ |
95 | #define drawBuffer TermWin.vt |
94 | #define drawBuffer TermWin.vt |
96 | |
95 | |
97 | #define CLEAR_ROWS(row, num) \ |
96 | #define CLEAR_ROWS(row, num) \ |
98 | if (TermWin.mapped) \ |
97 | if (TermWin.mapped) \ |
99 | XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ |
98 | XClearArea (display->display, drawBuffer, 0, \ |
100 | Row2Pixel (row), (unsigned int)TermWin.width, \ |
99 | Row2Pixel (row), (unsigned int)TermWin.width, \ |
101 | (unsigned int)Height2Pixel (num), False) |
100 | (unsigned int)Height2Pixel (num), False) |
102 | |
101 | |
103 | #define CLEAR_CHARS(x, y, num) \ |
102 | #define CLEAR_CHARS(x, y, num) \ |
104 | if (TermWin.mapped) \ |
103 | if (TermWin.mapped) \ |
105 | XClearArea (display->display, drawBuffer, x, y, \ |
104 | XClearArea (display->display, drawBuffer, x, y, \ |
106 | (unsigned int)Width2Pixel (num), \ |
105 | (unsigned int)Width2Pixel (num), \ |
107 | (unsigned int)Height2Pixel (1), False) |
106 | (unsigned int)Height2Pixel (1), False) |
108 | |
107 | |
109 | #define ERASE_ROWS(row, num) \ |
108 | #define ERASE_ROWS(row, num) \ |
110 | XFillRectangle (display->display, drawBuffer, TermWin.gc, \ |
109 | XFillRectangle (display->display, drawBuffer, TermWin.gc, \ |
111 | TermWin.int_bwidth, Row2Pixel (row), \ |
110 | 0, Row2Pixel (row), \ |
112 | (unsigned int)TermWin.width, \ |
111 | (unsigned int)TermWin.width, \ |
113 | (unsigned int)Height2Pixel (num)) |
112 | (unsigned int)Height2Pixel (num)) |
114 | |
113 | |
115 | /* ------------------------------------------------------------------------- * |
114 | /* ------------------------------------------------------------------------- * |
116 | * SCREEN `COMMON' ROUTINES * |
115 | * SCREEN `COMMON' ROUTINES * |
117 | * ------------------------------------------------------------------------- */ |
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, TermWin.ascii_map [' ' - 0x20]); |
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 | |
… | |
… | |
438 | { |
448 | { |
439 | uint16_t total_rows; |
449 | uint16_t 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 | |
|
|
444 | #ifdef DEBUG_STRICT |
|
|
445 | for (i = 0; i < total_rows; i++) |
|
|
446 | { |
|
|
447 | if (screen.text[i]) |
|
|
448 | /* then so is screen.rend[i] */ |
|
|
449 | assert (screen.rend[i]); |
|
|
450 | } |
|
|
451 | #endif |
|
|
452 | |
453 | |
453 | delete talloc; talloc = 0; |
454 | delete talloc; talloc = 0; |
454 | delete ralloc; ralloc = 0; |
455 | delete ralloc; ralloc = 0; |
455 | |
456 | |
456 | free (screen.text); |
457 | free (screen.text); |
… | |
… | |
479 | * Hard reset |
480 | * Hard reset |
480 | */ |
481 | */ |
481 | void |
482 | void |
482 | rxvt_term::scr_poweron () |
483 | rxvt_term::scr_poweron () |
483 | { |
484 | { |
484 | D_SCREEN ((stderr, "rxvt_scr_poweron ()")); |
|
|
485 | |
|
|
486 | scr_release (); |
485 | scr_release (); |
487 | prev_nrow = prev_ncol = 0; |
486 | prev_nrow = prev_ncol = 0; |
488 | scr_reset (); |
487 | scr_reset (); |
489 | |
488 | |
490 | scr_clear (); |
489 | scr_clear (true); |
491 | scr_refresh (SLOW_REFRESH); |
490 | scr_refresh (SLOW_REFRESH); |
492 | } |
491 | } |
493 | |
492 | |
494 | /* ------------------------------------------------------------------------- * |
493 | /* ------------------------------------------------------------------------- * |
495 | * PROCESS SCREEN COMMANDS * |
494 | * PROCESS SCREEN COMMANDS * |
… | |
… | |
500 | * XTERM_SEQ: Restore cursor: ESC 8 |
499 | * XTERM_SEQ: Restore cursor: ESC 8 |
501 | */ |
500 | */ |
502 | void |
501 | void |
503 | rxvt_term::scr_cursor (int mode) |
502 | rxvt_term::scr_cursor (int mode) |
504 | { |
503 | { |
505 | screen_t *s; |
504 | screen_t *s; |
506 | |
|
|
507 | D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); |
|
|
508 | |
505 | |
509 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
506 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
510 | if (current_screen == SECONDARY) |
507 | if (current_screen == SECONDARY) |
511 | s = & (swap); |
508 | s = &swap; |
512 | else |
509 | else |
513 | #endif |
510 | #endif |
514 | s = & (screen); |
511 | s = &screen; |
|
|
512 | |
515 | switch (mode) |
513 | switch (mode) |
516 | { |
514 | { |
517 | case SAVE: |
515 | case SAVE: |
518 | s->s_cur.row = s->cur.row; |
516 | s->s_cur.row = s->cur.row; |
519 | s->s_cur.col = s->cur.col; |
517 | s->s_cur.col = s->cur.col; |
520 | s->s_rstyle = rstyle; |
518 | s->s_rstyle = rstyle; |
521 | s->s_charset = s->charset; |
519 | s->s_charset = s->charset; |
522 | s->s_charset_char = charsets[s->charset]; |
520 | s->s_charset_char = charsets[s->charset]; |
523 | break; |
521 | break; |
|
|
522 | |
524 | case RESTORE: |
523 | case RESTORE: |
525 | want_refresh = 1; |
524 | want_refresh = 1; |
526 | s->cur.row = s->s_cur.row; |
525 | s->cur.row = s->s_cur.row; |
527 | s->cur.col = s->s_cur.col; |
526 | s->cur.col = s->s_cur.col; |
528 | s->flags &= ~Screen_WrapNext; |
527 | s->flags &= ~Screen_WrapNext; |
… | |
… | |
530 | s->charset = s->s_charset; |
529 | s->charset = s->s_charset; |
531 | charsets[s->charset] = s->s_charset_char; |
530 | charsets[s->charset] = s->s_charset_char; |
532 | set_font_style (); |
531 | set_font_style (); |
533 | break; |
532 | break; |
534 | } |
533 | } |
|
|
534 | |
535 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
535 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
536 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
536 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
537 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
537 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
538 | #ifdef DEBUG_STRICT |
538 | #ifdef DEBUG_STRICT |
539 | assert (s->cur.row >= 0); |
539 | assert (s->cur.row >= 0); |
… | |
… | |
551 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
551 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
552 | */ |
552 | */ |
553 | int |
553 | int |
554 | rxvt_term::scr_change_screen (int scrn) |
554 | rxvt_term::scr_change_screen (int scrn) |
555 | { |
555 | { |
556 | int i; |
556 | int i; |
557 | #if NSCREENS |
557 | #if NSCREENS |
558 | int offset; |
558 | int offset; |
559 | #endif |
559 | #endif |
560 | |
560 | |
561 | want_refresh = 1; |
561 | want_refresh = 1; |
562 | |
562 | |
563 | D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); |
|
|
564 | |
|
|
565 | TermWin.view_start = 0; |
563 | TermWin.view_start = 0; |
566 | |
564 | |
567 | if (current_screen == scrn) |
565 | if (current_screen == scrn) |
568 | return current_screen; |
566 | return scrn; |
569 | |
567 | |
570 | selection_check (2); /* check for boundary cross */ |
568 | selection_check (2); /* check for boundary cross */ |
571 | |
569 | |
572 | SWAP_IT (current_screen, scrn, int); |
570 | SWAP_IT (current_screen, scrn, int); |
573 | #if NSCREENS |
571 | #if NSCREENS |
|
|
572 | if (options & Opt_secondaryScreen) |
|
|
573 | { |
574 | num_scr = 0; |
574 | num_scr = 0; |
575 | offset = TermWin.saveLines; |
575 | offset = TermWin.saveLines; |
576 | for (i = prev_nrow; i--;) |
576 | for (i = prev_nrow; i--;) |
577 | { |
577 | { |
578 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
578 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
579 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
579 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
580 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
580 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
581 | } |
581 | } |
582 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
582 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
583 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
583 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
584 | # ifdef DEBUG_STRICT |
584 | # ifdef DEBUG_STRICT |
585 | assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); |
585 | assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); |
586 | assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); |
586 | assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); |
587 | # else /* drive with your eyes closed */ |
587 | # else /* drive with your eyes closed */ |
588 | MAX_IT (screen.cur.row, 0); |
588 | MAX_IT (screen.cur.row, 0); |
589 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
589 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
590 | MAX_IT (screen.cur.col, 0); |
590 | MAX_IT (screen.cur.col, 0); |
591 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
591 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
592 | # endif |
592 | # endif |
593 | SWAP_IT (screen.charset, swap.charset, int16_t); |
593 | SWAP_IT (screen.charset, swap.charset, int16_t); |
594 | SWAP_IT (screen.flags, swap.flags, int); |
594 | SWAP_IT (screen.flags, swap.flags, int); |
595 | screen.flags |= Screen_VisibleCursor; |
595 | screen.flags |= Screen_VisibleCursor; |
596 | swap.flags |= Screen_VisibleCursor; |
596 | swap.flags |= Screen_VisibleCursor; |
597 | #else |
597 | } |
598 | # ifdef SCROLL_ON_NO_SECONDARY |
598 | else |
|
|
599 | #endif |
|
|
600 | if (options & Opt_secondaryScroll) |
599 | if (current_screen == PRIMARY) |
601 | //if (current_screen == PRIMARY) |
600 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
602 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
601 | # endif |
|
|
602 | #endif |
|
|
603 | return scrn; |
603 | return scrn; |
|
|
604 | } |
|
|
605 | |
|
|
606 | // clear WrapNext indicator, solidifying position on next line |
|
|
607 | void |
|
|
608 | rxvt_term::scr_do_wrap () |
|
|
609 | { |
|
|
610 | if (!(screen.flags & Screen_WrapNext)) |
|
|
611 | return; |
|
|
612 | |
|
|
613 | screen.flags &= ~Screen_WrapNext; |
|
|
614 | |
|
|
615 | screen.cur.col = 0; |
|
|
616 | |
|
|
617 | if (screen.cur.row == screen.bscroll) |
|
|
618 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
619 | else if (screen.cur.row < TermWin.nrow - 1) |
|
|
620 | screen.cur.row++; |
604 | } |
621 | } |
605 | |
622 | |
606 | /* ------------------------------------------------------------------------- */ |
623 | /* ------------------------------------------------------------------------- */ |
607 | /* |
624 | /* |
608 | * Change the colour for following text |
625 | * Change the colour for following text |
… | |
… | |
647 | |
664 | |
648 | if (count == 0 || (row1 > row2)) |
665 | if (count == 0 || (row1 > row2)) |
649 | return 0; |
666 | return 0; |
650 | |
667 | |
651 | want_refresh = 1; |
668 | want_refresh = 1; |
652 | D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); |
|
|
653 | |
669 | |
654 | if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) |
670 | if (row1 == 0 && count > 0 |
|
|
671 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
655 | { |
672 | { |
656 | nscrolled = (long)TermWin.nscrolled + (long)count; |
673 | nscrolled = (long)TermWin.nscrolled + (long)count; |
657 | |
674 | |
658 | if (nscrolled > (long)TermWin.saveLines) |
675 | if (nscrolled > (long)TermWin.saveLines) |
659 | TermWin.nscrolled = TermWin.saveLines; |
676 | TermWin.nscrolled = TermWin.saveLines; |
660 | else |
677 | else |
661 | TermWin.nscrolled = (uint16_t)nscrolled; |
678 | TermWin.nscrolled = (uint16_t)nscrolled; |
662 | |
679 | |
663 | if ((Options & Opt_scrollWithBuffer) |
680 | if ((options & Opt_scrollWithBuffer) |
664 | && TermWin.view_start != 0 |
681 | && TermWin.view_start != 0 |
665 | && TermWin.view_start != TermWin.saveLines) |
682 | && TermWin.view_start != TermWin.saveLines) |
666 | scr_page (UP, count); |
683 | scr_page (UP, count); |
667 | } |
684 | } |
668 | else if (!spec) |
685 | else if (!spec) |
… | |
… | |
707 | if (j > 0) |
724 | if (j > 0) |
708 | { |
725 | { |
709 | /* A: scroll up */ |
726 | /* A: scroll up */ |
710 | |
727 | |
711 | /* A1: Copy lines that will get clobbered by the rotation */ |
728 | /* A1: Copy lines that will get clobbered by the rotation */ |
|
|
729 | memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); |
|
|
730 | memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); |
|
|
731 | |
|
|
732 | /* A2: Rotate lines */ |
|
|
733 | i = row2 - row1 - count + 1; |
|
|
734 | memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); |
|
|
735 | memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); |
|
|
736 | memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); |
|
|
737 | |
|
|
738 | j = row2 - count + 1, i = count; |
|
|
739 | } |
|
|
740 | else /* if (j < 0) */ |
|
|
741 | { |
|
|
742 | /* B: scroll down */ |
|
|
743 | |
|
|
744 | /* B1: Copy lines that will get clobbered by the rotation */ |
712 | for (i = 0, j = row1; i < count; i++, j++) |
745 | for (i = 0, j = row2; i < count; i++, j--) |
713 | { |
746 | { |
714 | buf_text[i] = screen.text[j]; |
747 | buf_text[i] = screen.text[j]; |
715 | buf_rend[i] = screen.rend[j]; |
748 | buf_rend[i] = screen.rend[j]; |
716 | } |
749 | } |
|
|
750 | |
717 | /* A2: Rotate lines */ |
751 | /* B2: Rotate lines */ |
718 | for (j = row1, i = j + count; i <= row2; i++, j++) |
752 | for (j = row2, i = j - count; i >= row1; i--, j--) |
719 | { |
753 | { |
720 | screen.tlen[j] = screen.tlen[i]; |
754 | screen.tlen[j] = screen.tlen[i]; |
721 | screen.text[j] = screen.text[i]; |
755 | screen.text[j] = screen.text[i]; |
722 | screen.rend[j] = screen.rend[i]; |
756 | screen.rend[j] = screen.rend[i]; |
723 | } |
757 | } |
724 | j = row2 - count + 1, i = count; |
|
|
725 | } |
|
|
726 | else /* if (j < 0) */ |
|
|
727 | { |
|
|
728 | /* B: scroll down */ |
|
|
729 | |
758 | |
730 | /* B1: Copy lines that will get clobbered by the rotation */ |
|
|
731 | for (i = 0, j = row2; i < count; i++, j--) |
|
|
732 | { |
|
|
733 | buf_text[i] = screen.text[j]; |
|
|
734 | buf_rend[i] = screen.rend[j]; |
|
|
735 | } |
|
|
736 | /* B2: Rotate lines */ |
|
|
737 | for (j = row2, i = j - count; i >= row1; i--, j--) |
|
|
738 | { |
|
|
739 | screen.tlen[j] = screen.tlen[i]; |
|
|
740 | screen.text[j] = screen.text[i]; |
|
|
741 | screen.rend[j] = screen.rend[i]; |
|
|
742 | } |
|
|
743 | j = row1, i = count; |
759 | j = row1, i = count; |
744 | count = -count; |
760 | count = -count; |
745 | } |
761 | } |
746 | |
762 | |
747 | /* C: Resurrect lines */ |
763 | /* C: Resurrect lines */ |
|
|
764 | memset (screen.tlen + j, 0, i * sizeof (int16_t)); |
|
|
765 | memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); |
|
|
766 | memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); |
|
|
767 | if (!spec) /* line length may not equal TermWin.ncol */ |
748 | for (; i--; j++) |
768 | for (; i--; j++) |
749 | { |
|
|
750 | screen.tlen[j] = 0; |
|
|
751 | screen.text[j] = buf_text[i]; |
|
|
752 | screen.rend[j] = buf_rend[i]; |
|
|
753 | |
|
|
754 | if (!spec) /* line length may not equal TermWin.ncol */ |
|
|
755 | scr_blank_screen_mem (screen.text, screen.rend, |
769 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); |
756 | (unsigned int)j, rstyle); |
|
|
757 | } |
|
|
758 | |
770 | |
759 | return count; |
771 | return count; |
760 | } |
772 | } |
761 | |
773 | |
762 | /* ------------------------------------------------------------------------- */ |
774 | /* ------------------------------------------------------------------------- */ |
763 | /* |
775 | /* |
764 | * Add text given in <str> of length <len> to screen struct |
776 | * Add text given in <str> of length <len> to screen struct |
765 | */ |
777 | */ |
766 | void |
778 | void |
767 | rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) |
779 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
768 | { |
780 | { |
769 | unsigned char checksel, clearsel; |
781 | unsigned char checksel; |
770 | uint32_t c; |
782 | unicode_t c; |
771 | int i, row, last_col; |
783 | int i, row, last_col; |
772 | text_t *stp; |
784 | text_t *stp; |
773 | rend_t *srp; |
785 | rend_t *srp; |
774 | |
786 | |
775 | if (len <= 0) /* sanity */ |
787 | if (len <= 0) /* sanity */ |
776 | return; |
788 | return; |
777 | |
789 | |
778 | want_refresh = 1; |
790 | want_refresh = 1; |
|
|
791 | ZERO_SCROLLBACK (); |
779 | last_col = TermWin.ncol; |
792 | last_col = TermWin.ncol; |
780 | |
793 | |
781 | D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); |
|
|
782 | ZERO_SCROLLBACK (); |
|
|
783 | if (nlines > 0) |
794 | if (nlines > 0) |
784 | { |
795 | { |
785 | nlines += (screen.cur.row - screen.bscroll); |
796 | nlines += screen.cur.row - screen.bscroll; |
786 | if ((nlines > 0) |
797 | if ((nlines > 0) |
787 | && (screen.tscroll == 0) |
798 | && (screen.tscroll == 0) |
788 | && (screen.bscroll == (TermWin.nrow - 1))) |
799 | && (screen.bscroll == (TermWin.nrow - 1))) |
789 | { |
800 | { |
790 | /* _at least_ this many lines need to be scrolled */ |
801 | /* _at least_ this many lines need to be scrolled */ |
791 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
802 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
792 | screen.cur.row -= nlines; |
803 | screen.cur.row -= nlines; |
793 | } |
804 | } |
794 | } |
805 | } |
|
|
806 | |
795 | #ifdef DEBUG_STRICT |
807 | #ifdef DEBUG_STRICT |
796 | assert (screen.cur.col < last_col); |
808 | assert (screen.cur.col < last_col); |
797 | assert ((screen.cur.row < TermWin.nrow) |
809 | assert ((screen.cur.row < TermWin.nrow) |
798 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
810 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
799 | #else /* drive with your eyes closed */ |
811 | #else /* drive with your eyes closed */ |
800 | MIN_IT (screen.cur.col, last_col - 1); |
812 | MIN_IT (screen.cur.col, last_col - 1); |
801 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
813 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
802 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
814 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
803 | #endif |
815 | #endif |
804 | row = screen.cur.row + TermWin.saveLines; |
816 | row = screen.cur.row + TermWin.saveLines; |
805 | |
817 | |
806 | checksel = (selection.op |
818 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
807 | && current_screen == selection.screen) ? 1 : 0; |
|
|
808 | clearsel = 0; |
|
|
809 | |
819 | |
810 | stp = screen.text[row]; |
820 | stp = screen.text[row]; |
811 | srp = screen.rend[row]; |
821 | srp = screen.rend[row]; |
812 | |
822 | |
813 | for (i = 0; i < len;) |
823 | while (len--) |
814 | { |
824 | { |
815 | c = str[i++]; |
825 | c = *str++; |
|
|
826 | |
|
|
827 | if (c < 0x20) |
816 | switch (c) |
828 | switch (c) |
817 | { |
829 | { |
818 | case '\t': |
830 | case C0_HT: |
819 | scr_tab (1); |
831 | scr_tab (1); |
820 | continue; |
832 | continue; |
821 | case '\n': |
833 | |
|
|
834 | case C0_LF: |
822 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
835 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
823 | MAX_IT (screen.tlen[row], screen.cur.col); |
836 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
837 | |
824 | screen.flags &= ~Screen_WrapNext; |
838 | screen.flags &= ~Screen_WrapNext; |
|
|
839 | |
825 | if (screen.cur.row == screen.bscroll) |
840 | if (screen.cur.row == screen.bscroll) |
826 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
841 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
827 | else if (screen.cur.row < (TermWin.nrow - 1)) |
842 | else if (screen.cur.row < (TermWin.nrow - 1)) |
828 | row = (++screen.cur.row) + TermWin.saveLines; |
843 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
844 | |
829 | stp = screen.text[row]; /* _must_ refresh */ |
845 | stp = screen.text[row]; /* _must_ refresh */ |
830 | srp = screen.rend[row]; /* _must_ refresh */ |
846 | srp = screen.rend[row]; /* _must_ refresh */ |
831 | continue; |
847 | continue; |
832 | case '\r': |
848 | |
|
|
849 | case C0_CR: |
833 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
850 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
834 | MAX_IT (screen.tlen[row], screen.cur.col); |
851 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
852 | |
835 | screen.flags &= ~Screen_WrapNext; |
853 | screen.flags &= ~Screen_WrapNext; |
836 | screen.cur.col = 0; |
854 | screen.cur.col = 0; |
837 | continue; |
855 | continue; |
838 | default: |
|
|
839 | if (c == 127) |
|
|
840 | continue; /* yummmm..... */ |
|
|
841 | break; |
|
|
842 | } |
856 | } |
843 | |
857 | |
844 | if (checksel /* see if we're writing within selection */ |
858 | if (checksel /* see if we're writing within selection */ |
845 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
859 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
846 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
860 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
847 | { |
861 | { |
848 | checksel = 0; |
862 | checksel = 0; |
849 | clearsel = 1; |
863 | /* |
|
|
864 | * If we wrote anywhere in the selected area, kill the selection |
|
|
865 | * XXX: should we kill the mark too? Possibly, but maybe that |
|
|
866 | * should be a similar check. |
|
|
867 | */ |
|
|
868 | CLEAR_SELECTION (); |
850 | } |
869 | } |
851 | |
870 | |
852 | if (screen.flags & Screen_WrapNext) |
871 | if (screen.flags & Screen_WrapNext) |
853 | { |
872 | { |
854 | screen.tlen[row] = -1; |
873 | screen.tlen[row] = -1; |
855 | if (screen.cur.row == screen.bscroll) |
874 | |
856 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
857 | else if (screen.cur.row < (TermWin.nrow - 1)) |
|
|
858 | row = (++screen.cur.row) + TermWin.saveLines; |
875 | scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; |
859 | |
876 | |
860 | stp = screen.text[row]; /* _must_ refresh */ |
877 | stp = screen.text[row]; /* _must_ refresh */ |
861 | srp = screen.rend[row]; /* _must_ refresh */ |
878 | srp = screen.rend[row]; /* _must_ refresh */ |
862 | screen.cur.col = 0; |
|
|
863 | screen.flags &= ~Screen_WrapNext; |
|
|
864 | } |
879 | } |
865 | |
880 | |
866 | if (screen.flags & Screen_Insert) |
881 | if (screen.flags & Screen_Insert) |
867 | scr_insdel_chars (1, INSERT); |
882 | scr_insdel_chars (1, INSERT); |
868 | |
883 | |
869 | if (IS_COMPOSE (c)) |
|
|
870 | c = REPLACEMENT_CHAR; |
|
|
871 | |
|
|
872 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
884 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
873 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
885 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
874 | // characters have width -1 (DOH!) on gnu/linux sometimes. |
886 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
875 | int width = c < 256 ? 1 : wcwidth (c); |
887 | int width = c < 0x100 ? 1 : wcwidth (c); |
876 | |
888 | |
877 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
889 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
878 | switch (c) |
|
|
879 | { |
890 | { |
880 | // vt100 special graphics and line drawing |
891 | // vt100 special graphics and line drawing |
881 | case '`': c = 0x25c6; break; case '_': c = 0x0020; break; |
892 | static uint16_t vt100_0[32] = { // 5f .. 7e |
882 | case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; |
893 | 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, |
883 | case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; |
894 | 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, |
884 | case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; |
895 | 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, |
885 | case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; |
896 | 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, |
886 | case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; |
|
|
887 | case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; |
|
|
888 | case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break; |
|
|
889 | case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; |
|
|
890 | case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; |
|
|
891 | case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; |
|
|
892 | } |
897 | }; |
|
|
898 | |
|
|
899 | if (c >= 0x5f && c <= 0x7e) |
|
|
900 | { |
|
|
901 | c = vt100_0[c - 0x5f]; |
|
|
902 | width = 1; |
|
|
903 | } |
893 | |
904 | } |
894 | |
905 | |
895 | if (width > 0) |
906 | if (width != 0) |
896 | { |
907 | { |
897 | #if !UNICODE_3 |
908 | #if !UNICODE_3 |
898 | // trim characters we can't store directly :( |
909 | // trim characters we can't store directly :( |
899 | if (c >= 0x10000) |
910 | if (c >= 0x10000) |
|
|
911 | # if ENABLE_COMBINING |
900 | c = rxvt_composite.compose (c); // map to lower 16 bits |
912 | c = rxvt_composite.compose (c); // map to lower 16 bits |
|
|
913 | # else |
|
|
914 | c = 0xfffd; |
901 | #endif |
915 | # endif |
902 | rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); |
916 | #endif |
|
|
917 | bool bold = (options & Opt_realBold) && ((rstyle & RS_Bold) != 0); |
|
|
918 | rend_t rend = SET_FONT (rstyle, |
|
|
919 | c > 0x7f || bold || c < 0x20 |
|
|
920 | ? TermWin.fontset->find_font (c, bold) |
|
|
921 | : TermWin.ascii_map [c - 0x20]); |
903 | |
922 | |
904 | do |
923 | do |
905 | { |
924 | { |
906 | stp[screen.cur.col] = c; |
925 | stp[screen.cur.col] = c; |
907 | srp[screen.cur.col] = rend; |
926 | srp[screen.cur.col] = rend; |
… | |
… | |
927 | srp[c] = rend; |
946 | srp[c] = rend; |
928 | } |
947 | } |
929 | } |
948 | } |
930 | else if (width == 0) |
949 | else if (width == 0) |
931 | { |
950 | { |
932 | #if ENCODING_COMPOSE |
951 | #if ENABLE_COMBINING |
933 | // handle combining characters |
952 | // handle combining characters |
934 | // we just tag the accent on the previous on-screen character. |
953 | // we just tag the accent on the previous on-screen character. |
935 | // this is arguably not correct, but also arguably not wrong. |
954 | // this is arguably not correct, but also arguably not wrong. |
936 | // we don't handle double-width characters nicely yet. |
955 | // we don't handle double-width characters nicely yet. |
937 | |
956 | |
… | |
… | |
955 | // handle double-width-chars by making them look extremely ugly |
974 | // handle double-width-chars by making them look extremely ugly |
956 | if (*tp == NOCHAR) |
975 | if (*tp == NOCHAR) |
957 | *tp = ' '; // hack //D //TODO //--tp, --rp; |
976 | *tp = ' '; // hack //D //TODO //--tp, --rp; |
958 | |
977 | |
959 | // first try to find a precomposed character |
978 | // first try to find a precomposed character |
960 | uint32_t n = rxvt_compose (*tp, c); |
979 | unicode_t n = rxvt_compose (*tp, c); |
961 | if (n == NOCHAR) |
980 | if (n == NOCHAR) |
962 | n = rxvt_composite.compose (*tp, c); |
981 | n = rxvt_composite.compose (*tp, c); |
963 | |
982 | |
964 | *tp = n; |
983 | *tp = n; |
965 | *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); |
984 | *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); |
… | |
… | |
967 | } |
986 | } |
968 | } |
987 | } |
969 | |
988 | |
970 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
989 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
971 | MAX_IT (screen.tlen[row], screen.cur.col); |
990 | MAX_IT (screen.tlen[row], screen.cur.col); |
972 | |
|
|
973 | /* |
|
|
974 | * If we wrote anywhere in the selected area, kill the selection |
|
|
975 | * XXX: should we kill the mark too? Possibly, but maybe that |
|
|
976 | * should be a similar check. |
|
|
977 | */ |
|
|
978 | if (clearsel) |
|
|
979 | CLEAR_SELECTION (); |
|
|
980 | |
991 | |
981 | #ifdef DEBUG_STRICT |
992 | #ifdef DEBUG_STRICT |
982 | assert (screen.cur.row >= 0); |
993 | assert (screen.cur.row >= 0); |
983 | #else /* drive with your eyes closed */ |
994 | #else /* drive with your eyes closed */ |
984 | MAX_IT (screen.cur.row, 0); |
995 | MAX_IT (screen.cur.row, 0); |
… | |
… | |
992 | */ |
1003 | */ |
993 | void |
1004 | void |
994 | rxvt_term::scr_backspace () |
1005 | rxvt_term::scr_backspace () |
995 | { |
1006 | { |
996 | want_refresh = 1; |
1007 | want_refresh = 1; |
|
|
1008 | |
997 | if (screen.cur.col == 0) |
1009 | if (screen.cur.col == 0) |
998 | { |
1010 | { |
999 | if (screen.cur.row > 0) |
1011 | if (screen.cur.row > 0) |
1000 | { |
1012 | { |
1001 | #ifdef TERMCAP_HAS_BW |
1013 | #ifdef TERMCAP_HAS_BW |
1002 | screen.cur.col = TermWin.ncol - 1; |
1014 | screen.cur.col = TermWin.ncol - 1; |
1003 | screen.cur.row--; |
1015 | screen.cur.row--; |
1004 | return; |
1016 | return; |
1005 | #endif |
1017 | #endif |
1006 | |
|
|
1007 | } |
1018 | } |
1008 | } |
1019 | } |
1009 | else if ((screen.flags & Screen_WrapNext) == 0) |
1020 | else if (!(screen.flags & Screen_WrapNext)) |
1010 | scr_gotorc (0, -1, RELATIVE); |
1021 | scr_gotorc (0, -1, RELATIVE); |
|
|
1022 | |
1011 | screen.flags &= ~Screen_WrapNext; |
1023 | screen.flags &= ~Screen_WrapNext; |
1012 | } |
1024 | } |
1013 | |
1025 | |
1014 | /* ------------------------------------------------------------------------- */ |
1026 | /* ------------------------------------------------------------------------- */ |
1015 | /* |
1027 | /* |
… | |
… | |
1018 | * XTERM_SEQ: CTRL-I |
1030 | * XTERM_SEQ: CTRL-I |
1019 | */ |
1031 | */ |
1020 | void |
1032 | void |
1021 | rxvt_term::scr_tab (int count) |
1033 | rxvt_term::scr_tab (int count) |
1022 | { |
1034 | { |
1023 | int i, x; |
1035 | int i, x; |
1024 | |
1036 | |
1025 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
|
|
1026 | want_refresh = 1; |
1037 | want_refresh = 1; |
1027 | i = x = screen.cur.col; |
1038 | i = x = screen.cur.col; |
|
|
1039 | |
1028 | if (count == 0) |
1040 | if (count == 0) |
1029 | return; |
1041 | return; |
1030 | else if (count > 0) |
1042 | else if (count > 0) |
1031 | { |
1043 | { |
1032 | for (; ++i < TermWin.ncol; ) |
1044 | for (; ++i < TermWin.ncol; ) |
… | |
… | |
1034 | { |
1046 | { |
1035 | x = i; |
1047 | x = i; |
1036 | if (!--count) |
1048 | if (!--count) |
1037 | break; |
1049 | break; |
1038 | } |
1050 | } |
|
|
1051 | |
1039 | if (count) |
1052 | if (count) |
1040 | x = TermWin.ncol - 1; |
1053 | x = TermWin.ncol - 1; |
1041 | } |
1054 | } |
1042 | else /* if (count < 0) */ |
1055 | else /* if (count < 0) */ |
1043 | { |
1056 | { |
… | |
… | |
1046 | { |
1059 | { |
1047 | x = i; |
1060 | x = i; |
1048 | if (!++count) |
1061 | if (!++count) |
1049 | break; |
1062 | break; |
1050 | } |
1063 | } |
|
|
1064 | |
1051 | if (count) |
1065 | if (count) |
1052 | x = 0; |
1066 | x = 0; |
1053 | } |
1067 | } |
|
|
1068 | |
1054 | if (x != screen.cur.col) |
1069 | if (x != screen.cur.col) |
1055 | scr_gotorc (0, x, R_RELATIVE); |
1070 | scr_gotorc (0, x, R_RELATIVE); |
1056 | } |
1071 | } |
1057 | |
1072 | |
1058 | /* ------------------------------------------------------------------------- */ |
1073 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1060 | * Process DEC Back Index |
1075 | * Process DEC Back Index |
1061 | * XTERM_SEQ: ESC 6 |
1076 | * XTERM_SEQ: ESC 6 |
1062 | * Move cursor left in row. If we're at the left boundary, shift everything |
1077 | * Move cursor left in row. If we're at the left boundary, shift everything |
1063 | * in that row right. Clear left column. |
1078 | * in that row right. Clear left column. |
1064 | */ |
1079 | */ |
1065 | #ifndef NO_FRILLS |
1080 | #if ENABLE_FRILLS |
1066 | void |
1081 | void |
1067 | rxvt_term::scr_backindex () |
1082 | rxvt_term::scr_backindex () |
1068 | { |
1083 | { |
1069 | if (screen.cur.col > 0) |
1084 | if (screen.cur.col > 0) |
1070 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1085 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1071 | else |
1086 | else |
1072 | { |
1087 | { |
1073 | if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) |
1088 | if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) |
1074 | return; /* um, yeah? */ |
1089 | return; /* um, yeah? */ |
|
|
1090 | |
1075 | scr_insdel_chars (1, INSERT); |
1091 | scr_insdel_chars (1, INSERT); |
1076 | } |
1092 | } |
1077 | } |
1093 | } |
1078 | #endif |
1094 | #endif |
1079 | /* ------------------------------------------------------------------------- */ |
1095 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1081 | * Process DEC Forward Index |
1097 | * Process DEC Forward Index |
1082 | * XTERM_SEQ: ESC 9 |
1098 | * XTERM_SEQ: ESC 9 |
1083 | * Move cursor right in row. If we're at the right boundary, shift everything |
1099 | * Move cursor right in row. If we're at the right boundary, shift everything |
1084 | * in that row left. Clear right column. |
1100 | * in that row left. Clear right column. |
1085 | */ |
1101 | */ |
1086 | #ifndef NO_FRILLS |
1102 | #if ENABLE_FRILLS |
1087 | void |
1103 | void |
1088 | rxvt_term::scr_forwardindex () |
1104 | rxvt_term::scr_forwardindex () |
1089 | { |
1105 | { |
1090 | int row; |
1106 | int row; |
1091 | |
1107 | |
1092 | if (screen.cur.col < TermWin.ncol - 1) |
1108 | if (screen.cur.col < TermWin.ncol - 1) |
1093 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1109 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1094 | else |
1110 | else |
1095 | { |
1111 | { |
1096 | row = screen.cur.row + TermWin.saveLines; |
1112 | row = screen.cur.row + TermWin.saveLines; |
|
|
1113 | |
1097 | if (screen.tlen[row] == 0) |
1114 | if (screen.tlen[row] == 0) |
1098 | return; /* um, yeah? */ |
1115 | return; /* um, yeah? */ |
1099 | else if (screen.tlen[row] == -1) |
1116 | else if (screen.tlen[row] == -1) |
1100 | screen.tlen[row] = TermWin.ncol; |
1117 | screen.tlen[row] = TermWin.ncol; |
|
|
1118 | |
1101 | scr_gotorc (0, 0, R_RELATIVE); |
1119 | scr_gotorc (0, 0, R_RELATIVE); |
1102 | scr_insdel_chars (1, DELETE); |
1120 | scr_insdel_chars (1, DELETE); |
1103 | scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); |
1121 | scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); |
1104 | } |
1122 | } |
1105 | } |
1123 | } |
… | |
… | |
1113 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1131 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1114 | { |
1132 | { |
1115 | want_refresh = 1; |
1133 | want_refresh = 1; |
1116 | ZERO_SCROLLBACK (); |
1134 | ZERO_SCROLLBACK (); |
1117 | |
1135 | |
1118 | 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)); |
|
|
1119 | |
|
|
1120 | screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) |
1136 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1121 | : col); |
|
|
1122 | MAX_IT (screen.cur.col, 0); |
1137 | MAX_IT (screen.cur.col, 0); |
1123 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1138 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1124 | |
1139 | |
1125 | screen.flags &= ~Screen_WrapNext; |
1140 | screen.flags &= ~Screen_WrapNext; |
|
|
1141 | |
1126 | if (relative & R_RELATIVE) |
1142 | if (relative & R_RELATIVE) |
1127 | { |
1143 | { |
1128 | if (row > 0) |
1144 | if (row > 0) |
1129 | { |
1145 | { |
1130 | if (screen.cur.row <= screen.bscroll |
1146 | if (screen.cur.row <= screen.bscroll |
… | |
… | |
1150 | MIN_IT (screen.cur.row, screen.bscroll); |
1166 | MIN_IT (screen.cur.row, screen.bscroll); |
1151 | } |
1167 | } |
1152 | else |
1168 | else |
1153 | screen.cur.row = row; |
1169 | screen.cur.row = row; |
1154 | } |
1170 | } |
|
|
1171 | |
1155 | MAX_IT (screen.cur.row, 0); |
1172 | MAX_IT (screen.cur.row, 0); |
1156 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1173 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1157 | |
|
|
1158 | while (screen.cur.col > 0 |
|
|
1159 | && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR) |
|
|
1160 | screen.cur.col--; |
|
|
1161 | } |
1174 | } |
1162 | |
1175 | |
1163 | /* ------------------------------------------------------------------------- */ |
1176 | /* ------------------------------------------------------------------------- */ |
1164 | /* |
1177 | /* |
1165 | * direction should be UP or DN |
1178 | * direction should be UP or DN |
1166 | */ |
1179 | */ |
1167 | void |
1180 | void |
1168 | rxvt_term::scr_index (enum page_dirn direction) |
1181 | rxvt_term::scr_index (enum page_dirn direction) |
1169 | { |
1182 | { |
1170 | int dirn; |
1183 | int dirn; |
1171 | |
1184 | |
1172 | want_refresh = 1; |
1185 | want_refresh = 1; |
|
|
1186 | ZERO_SCROLLBACK (); |
|
|
1187 | |
1173 | dirn = ((direction == UP) ? 1 : -1); |
1188 | dirn = ((direction == UP) ? 1 : -1); |
1174 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
|
|
1175 | |
|
|
1176 | ZERO_SCROLLBACK (); |
|
|
1177 | |
1189 | |
1178 | screen.flags &= ~Screen_WrapNext; |
1190 | screen.flags &= ~Screen_WrapNext; |
|
|
1191 | |
1179 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1192 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1180 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1193 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1181 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1194 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1182 | else |
1195 | else |
1183 | screen.cur.row += dirn; |
1196 | screen.cur.row += dirn; |
|
|
1197 | |
1184 | MAX_IT (screen.cur.row, 0); |
1198 | MAX_IT (screen.cur.row, 0); |
1185 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1199 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1186 | selection_check (0); |
1200 | selection_check (0); |
1187 | } |
1201 | } |
1188 | |
1202 | |
… | |
… | |
1197 | rxvt_term::scr_erase_line (int mode) |
1211 | rxvt_term::scr_erase_line (int mode) |
1198 | { |
1212 | { |
1199 | unsigned int row, col, num; |
1213 | unsigned int row, col, num; |
1200 | |
1214 | |
1201 | want_refresh = 1; |
1215 | want_refresh = 1; |
1202 | D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row)); |
|
|
1203 | ZERO_SCROLLBACK (); |
1216 | ZERO_SCROLLBACK (); |
1204 | |
1217 | |
1205 | selection_check (1); |
1218 | selection_check (1); |
1206 | |
|
|
1207 | screen.flags &= ~Screen_WrapNext; |
|
|
1208 | |
1219 | |
1209 | row = TermWin.saveLines + screen.cur.row; |
1220 | row = TermWin.saveLines + screen.cur.row; |
1210 | switch (mode) |
1221 | switch (mode) |
1211 | { |
1222 | { |
1212 | case 0: /* erase to end of line */ |
1223 | case 0: /* erase to end of line */ |
… | |
… | |
1235 | default: |
1246 | default: |
1236 | return; |
1247 | return; |
1237 | } |
1248 | } |
1238 | |
1249 | |
1239 | if (screen.text[row]) |
1250 | if (screen.text[row]) |
1240 | scr_blank_line (& (screen.text[row][col]), |
1251 | scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle); |
1241 | & (screen.rend[row][col]), num, rstyle); |
|
|
1242 | else |
1252 | else |
1243 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
1253 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
1244 | } |
1254 | } |
1245 | |
1255 | |
1246 | /* ------------------------------------------------------------------------- */ |
1256 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1251 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1261 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1252 | */ |
1262 | */ |
1253 | void |
1263 | void |
1254 | rxvt_term::scr_erase_screen (int mode) |
1264 | rxvt_term::scr_erase_screen (int mode) |
1255 | { |
1265 | { |
1256 | int num; |
1266 | int num; |
1257 | int32_t row, row_offset; |
1267 | int32_t row, row_offset; |
1258 | rend_t ren; |
1268 | rend_t ren; |
1259 | XGCValues gcvalue; |
1269 | XGCValues gcvalue; |
1260 | |
1270 | |
1261 | want_refresh = 1; |
1271 | want_refresh = 1; |
1262 | D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); |
|
|
1263 | ZERO_SCROLLBACK (); |
1272 | ZERO_SCROLLBACK (); |
|
|
1273 | |
1264 | row_offset = (int32_t)TermWin.saveLines; |
1274 | row_offset = (int32_t)TermWin.saveLines; |
1265 | |
1275 | |
1266 | switch (mode) |
1276 | switch (mode) |
1267 | { |
1277 | { |
1268 | case 0: /* erase to end of screen */ |
1278 | case 0: /* erase to end of screen */ |
… | |
… | |
1283 | num = TermWin.nrow; |
1293 | num = TermWin.nrow; |
1284 | break; |
1294 | break; |
1285 | default: |
1295 | default: |
1286 | return; |
1296 | return; |
1287 | } |
1297 | } |
1288 | refresh_type |= REFRESH_BOUNDS; |
1298 | |
1289 | if (selection.op && current_screen == selection.screen |
1299 | if (selection.op && current_screen == selection.screen |
1290 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1300 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1291 | || (selection.end.row >= row |
1301 | || (selection.end.row >= row |
1292 | && selection.end.row <= row + num))) |
1302 | && selection.end.row <= row + num))) |
1293 | CLEAR_SELECTION (); |
1303 | CLEAR_SELECTION (); |
|
|
1304 | |
1294 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1305 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1295 | return; |
1306 | return; |
|
|
1307 | |
1296 | MIN_IT (num, (TermWin.nrow - row)); |
1308 | MIN_IT (num, (TermWin.nrow - row)); |
|
|
1309 | |
1297 | if (rstyle & (RS_RVid | RS_Uline)) |
1310 | if (rstyle & (RS_RVid | RS_Uline)) |
1298 | ren = (rend_t) ~RS_None; |
1311 | ren = (rend_t) ~RS_None; |
1299 | else if (GET_BASEBG (rstyle) == Color_bg) |
1312 | else if (GET_BASEBG (rstyle) == Color_bg) |
1300 | { |
1313 | { |
1301 | ren = DEFAULT_RSTYLE; |
1314 | ren = DEFAULT_RSTYLE; |
1302 | CLEAR_ROWS (row, num); |
1315 | CLEAR_ROWS (row, num); |
1303 | } |
1316 | } |
1304 | else |
1317 | else |
1305 | { |
1318 | { |
1306 | ren = (rstyle & (RS_fgMask | RS_bgMask)); |
1319 | ren = (rstyle & (RS_fgMask | RS_bgMask)); |
1307 | gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; |
1320 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1308 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1321 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1309 | ERASE_ROWS (row, num); |
1322 | ERASE_ROWS (row, num); |
1310 | gcvalue.foreground = PixColors[Color_fg]; |
1323 | gcvalue.foreground = pix_colors[Color_fg]; |
1311 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1324 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1312 | } |
1325 | } |
|
|
1326 | |
1313 | for (; num--; row++) |
1327 | for (; num--; row++) |
1314 | { |
1328 | { |
1315 | scr_blank_screen_mem (screen.text, screen.rend, |
1329 | scr_blank_screen_mem (screen.text, screen.rend, |
1316 | (unsigned int) (row + row_offset), rstyle); |
1330 | (unsigned int) (row + row_offset), rstyle); |
1317 | screen.tlen[row + row_offset] = 0; |
1331 | screen.tlen[row + row_offset] = 0; |
… | |
… | |
1330 | { |
1344 | { |
1331 | int i, j, k; |
1345 | int i, j, k; |
1332 | rend_t *r1, fs; |
1346 | rend_t *r1, fs; |
1333 | |
1347 | |
1334 | want_refresh = 1; |
1348 | want_refresh = 1; |
|
|
1349 | ZERO_SCROLLBACK (); |
|
|
1350 | |
1335 | num_scr_allow = 0; |
1351 | num_scr_allow = 0; |
1336 | ZERO_SCROLLBACK (); |
|
|
1337 | selection_check (3); |
1352 | selection_check (3); |
1338 | |
1353 | |
1339 | fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); |
1354 | fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); |
1340 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1355 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1341 | { |
1356 | { |
… | |
… | |
1351 | * Insert/Delete <count> lines |
1366 | * Insert/Delete <count> lines |
1352 | */ |
1367 | */ |
1353 | void |
1368 | void |
1354 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1369 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1355 | { |
1370 | { |
1356 | int end; |
1371 | int end; |
1357 | |
1372 | |
1358 | ZERO_SCROLLBACK (); |
1373 | ZERO_SCROLLBACK (); |
1359 | |
1374 | |
1360 | selection_check (1); |
1375 | selection_check (1); |
1361 | |
1376 | |
… | |
… | |
1368 | if (insdel == DELETE) |
1383 | if (insdel == DELETE) |
1369 | return; |
1384 | return; |
1370 | else if (insdel == INSERT) |
1385 | else if (insdel == INSERT) |
1371 | count = end; |
1386 | count = end; |
1372 | } |
1387 | } |
1373 | screen.flags &= ~Screen_WrapNext; |
1388 | |
|
|
1389 | scr_do_wrap (); |
1374 | |
1390 | |
1375 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); |
1391 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); |
1376 | } |
1392 | } |
1377 | |
1393 | |
1378 | /* ------------------------------------------------------------------------- */ |
1394 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1380 | * Insert/Delete <count> characters from the current position |
1396 | * Insert/Delete <count> characters from the current position |
1381 | */ |
1397 | */ |
1382 | void |
1398 | void |
1383 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1399 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1384 | { |
1400 | { |
1385 | int col, row; |
1401 | int col, row; |
1386 | rend_t tr; |
1402 | rend_t tr; |
1387 | text_t *stp; |
1403 | text_t *stp; |
1388 | rend_t *srp; |
1404 | rend_t *srp; |
1389 | int16_t *slp; |
1405 | int16_t *slp; |
1390 | |
1406 | |
1391 | want_refresh = 1; |
1407 | want_refresh = 1; |
1392 | ZERO_SCROLLBACK (); |
1408 | ZERO_SCROLLBACK (); |
1393 | |
1409 | |
1394 | if (count <= 0) |
1410 | if (count <= 0) |
1395 | return; |
1411 | return; |
1396 | |
1412 | |
|
|
1413 | scr_do_wrap (); |
|
|
1414 | |
1397 | selection_check (1); |
1415 | selection_check (1); |
1398 | MIN_IT (count, (TermWin.ncol - screen.cur.col)); |
1416 | MIN_IT (count, (TermWin.ncol - screen.cur.col)); |
1399 | |
1417 | |
1400 | row = screen.cur.row + TermWin.saveLines; |
1418 | row = screen.cur.row + TermWin.saveLines; |
1401 | screen.flags &= ~Screen_WrapNext; |
|
|
1402 | |
1419 | |
1403 | stp = screen.text[row]; |
1420 | stp = screen.text[row]; |
1404 | srp = screen.rend[row]; |
1421 | srp = screen.rend[row]; |
1405 | slp = & (screen.tlen[row]); |
1422 | slp = &screen.tlen[row]; |
|
|
1423 | |
1406 | switch (insdel) |
1424 | switch (insdel) |
1407 | { |
1425 | { |
1408 | case INSERT: |
1426 | case INSERT: |
1409 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1427 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1410 | col--) |
1428 | col--) |
1411 | { |
1429 | { |
1412 | stp[col] = stp[col - count]; |
1430 | stp[col] = stp[col - count]; |
1413 | srp[col] = srp[col - count]; |
1431 | srp[col] = srp[col - count]; |
1414 | } |
1432 | } |
|
|
1433 | |
1415 | if (*slp != -1) |
1434 | if (*slp != -1) |
1416 | { |
1435 | { |
1417 | *slp += count; |
1436 | *slp += count; |
1418 | MIN_IT (*slp, TermWin.ncol); |
1437 | MIN_IT (*slp, TermWin.ncol); |
1419 | } |
1438 | } |
|
|
1439 | |
1420 | if (selection.op && current_screen == selection.screen |
1440 | if (selection.op && current_screen == selection.screen |
1421 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1441 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1422 | { |
1442 | { |
1423 | if (selection.end.row != screen.cur.row |
1443 | if (selection.end.row != screen.cur.row |
1424 | || (selection.end.col + count >= TermWin.ncol)) |
1444 | || (selection.end.col + count >= TermWin.ncol)) |
… | |
… | |
1428 | selection.beg.col += count; |
1448 | selection.beg.col += count; |
1429 | selection.mark.col += count; /* XXX: yes? */ |
1449 | selection.mark.col += count; /* XXX: yes? */ |
1430 | selection.end.col += count; |
1450 | selection.end.col += count; |
1431 | } |
1451 | } |
1432 | } |
1452 | } |
|
|
1453 | |
1433 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1454 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1434 | (unsigned int)count, rstyle); |
1455 | (unsigned int)count, rstyle); |
1435 | break; |
1456 | break; |
|
|
1457 | |
1436 | case ERASE: |
1458 | case ERASE: |
1437 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1459 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1438 | selection_check (1); |
1460 | selection_check (1); |
1439 | screen.cur.col -= count; |
1461 | screen.cur.col -= count; |
1440 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1462 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1441 | (unsigned int)count, rstyle); |
1463 | (unsigned int)count, rstyle); |
1442 | break; |
1464 | break; |
|
|
1465 | |
1443 | case DELETE: |
1466 | case DELETE: |
1444 | tr = srp[TermWin.ncol - 1] |
|
|
1445 | & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1467 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
|
|
1468 | |
1446 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1469 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1447 | { |
1470 | { |
1448 | stp[col] = stp[col + count]; |
1471 | stp[col] = stp[col + count]; |
1449 | srp[col] = srp[col + count]; |
1472 | srp[col] = srp[col + count]; |
1450 | } |
1473 | } |
|
|
1474 | |
1451 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1475 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1452 | & (srp[TermWin.ncol - count]), |
1476 | & (srp[TermWin.ncol - count]), |
1453 | (unsigned int)count, tr); |
1477 | (unsigned int)count, tr); |
|
|
1478 | |
1454 | if (*slp == -1) /* break line continuation */ |
1479 | if (*slp == -1) /* break line continuation */ |
1455 | *slp = TermWin.ncol; |
1480 | *slp = TermWin.ncol; |
|
|
1481 | |
1456 | *slp -= count; |
1482 | *slp -= count; |
1457 | MAX_IT (*slp, 0); |
1483 | MAX_IT (*slp, 0); |
|
|
1484 | |
1458 | if (selection.op && current_screen == selection.screen |
1485 | if (selection.op && current_screen == selection.screen |
1459 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1486 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1460 | { |
1487 | { |
1461 | if (selection.end.row != screen.cur.row |
1488 | if (selection.end.row != screen.cur.row |
1462 | || (screen.cur.col >= selection.beg.col - count) |
1489 | || (screen.cur.col >= selection.beg.col - count) |
… | |
… | |
1468 | selection.beg.col -= count; |
1495 | selection.beg.col -= count; |
1469 | selection.mark.col -= count; /* XXX: yes? */ |
1496 | selection.mark.col -= count; /* XXX: yes? */ |
1470 | selection.end.col -= count; |
1497 | selection.end.col -= count; |
1471 | } |
1498 | } |
1472 | } |
1499 | } |
|
|
1500 | |
1473 | break; |
1501 | break; |
1474 | } |
1502 | } |
1475 | } |
1503 | } |
1476 | |
1504 | |
1477 | /* ------------------------------------------------------------------------- */ |
1505 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1482 | void |
1510 | void |
1483 | rxvt_term::scr_scroll_region (int top, int bot) |
1511 | rxvt_term::scr_scroll_region (int top, int bot) |
1484 | { |
1512 | { |
1485 | MAX_IT (top, 0); |
1513 | MAX_IT (top, 0); |
1486 | MIN_IT (bot, (int)TermWin.nrow - 1); |
1514 | MIN_IT (bot, (int)TermWin.nrow - 1); |
|
|
1515 | |
1487 | if (top > bot) |
1516 | if (top > bot) |
1488 | return; |
1517 | return; |
|
|
1518 | |
1489 | screen.tscroll = top; |
1519 | screen.tscroll = top; |
1490 | screen.bscroll = bot; |
1520 | screen.bscroll = bot; |
1491 | scr_gotorc (0, 0, 0); |
1521 | scr_gotorc (0, 0, 0); |
1492 | } |
1522 | } |
1493 | |
1523 | |
… | |
… | |
1499 | */ |
1529 | */ |
1500 | void |
1530 | void |
1501 | rxvt_term::scr_cursor_visible (int mode) |
1531 | rxvt_term::scr_cursor_visible (int mode) |
1502 | { |
1532 | { |
1503 | want_refresh = 1; |
1533 | want_refresh = 1; |
|
|
1534 | |
1504 | if (mode) |
1535 | if (mode) |
1505 | screen.flags |= Screen_VisibleCursor; |
1536 | screen.flags |= Screen_VisibleCursor; |
1506 | else |
1537 | else |
1507 | screen.flags &= ~Screen_VisibleCursor; |
1538 | screen.flags &= ~Screen_VisibleCursor; |
1508 | } |
1539 | } |
… | |
… | |
1517 | rxvt_term::scr_autowrap (int mode) |
1548 | rxvt_term::scr_autowrap (int mode) |
1518 | { |
1549 | { |
1519 | if (mode) |
1550 | if (mode) |
1520 | screen.flags |= Screen_Autowrap; |
1551 | screen.flags |= Screen_Autowrap; |
1521 | else |
1552 | else |
1522 | screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); |
1553 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
1523 | } |
1554 | } |
1524 | |
1555 | |
1525 | /* ------------------------------------------------------------------------- */ |
1556 | /* ------------------------------------------------------------------------- */ |
1526 | /* |
1557 | /* |
1527 | * Set/unset margin origin mode |
1558 | * Set/unset margin origin mode |
… | |
… | |
1566 | */ |
1597 | */ |
1567 | void |
1598 | void |
1568 | rxvt_term::scr_set_tab (int mode) |
1599 | rxvt_term::scr_set_tab (int mode) |
1569 | { |
1600 | { |
1570 | if (mode < 0) |
1601 | if (mode < 0) |
1571 | MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); |
1602 | memset (tabs, 0, TermWin.ncol * sizeof (char)); |
1572 | else if (screen.cur.col < TermWin.ncol) |
1603 | else if (screen.cur.col < TermWin.ncol) |
1573 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1604 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1574 | } |
1605 | } |
1575 | |
1606 | |
1576 | /* ------------------------------------------------------------------------- */ |
1607 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1580 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1611 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1581 | */ |
1612 | */ |
1582 | void |
1613 | void |
1583 | rxvt_term::scr_rvideo_mode (int mode) |
1614 | rxvt_term::scr_rvideo_mode (int mode) |
1584 | { |
1615 | { |
1585 | XGCValues gcvalue; |
1616 | XGCValues gcvalue; |
1586 | |
1617 | |
1587 | if (rvideo != mode) |
1618 | if (rvideo != mode) |
1588 | { |
1619 | { |
1589 | rvideo = mode; |
1620 | rvideo = mode; |
1590 | SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); |
1621 | SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); |
1591 | #if defined(XPM_BACKGROUND) |
1622 | #if defined(XPM_BACKGROUND) |
1592 | if (bgPixmap.pixmap == None) |
1623 | if (bgPixmap.pixmap == None) |
1593 | #endif |
1624 | #endif |
1594 | #if defined(TRANSPARENT) |
1625 | #if defined(TRANSPARENT) |
1595 | if (! (Options & Opt_transparent) || am_transparent == 0) |
1626 | if (! (options & Opt_transparent) || am_transparent == 0) |
1596 | #endif |
1627 | #endif |
1597 | XSetWindowBackground (display->display, TermWin.vt, |
1628 | XSetWindowBackground (display->display, TermWin.vt, |
1598 | PixColors[Color_bg]); |
1629 | pix_colors[Color_bg]); |
1599 | |
1630 | |
1600 | gcvalue.foreground = PixColors[Color_fg]; |
1631 | gcvalue.foreground = pix_colors[Color_fg]; |
1601 | gcvalue.background = PixColors[Color_bg]; |
1632 | gcvalue.background = pix_colors[Color_bg]; |
1602 | XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, |
1633 | XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, |
1603 | &gcvalue); |
1634 | &gcvalue); |
1604 | scr_clear (); |
1635 | scr_clear (); |
1605 | scr_touch (true); |
1636 | scr_touch (true); |
1606 | } |
1637 | } |
… | |
… | |
1722 | row_col_t rc[RC_COUNT]; |
1753 | row_col_t rc[RC_COUNT]; |
1723 | |
1754 | |
1724 | if (drawn_text == NULL) /* sanity check */ |
1755 | if (drawn_text == NULL) /* sanity check */ |
1725 | return; |
1756 | return; |
1726 | |
1757 | |
|
|
1758 | #ifndef NO_SLOW_LINK_SUPPORT |
|
|
1759 | if (refresh_type == FAST_REFRESH && !display->is_local) |
|
|
1760 | { |
|
|
1761 | y = 0; |
|
|
1762 | height = TermWin.height; |
|
|
1763 | } |
|
|
1764 | #endif |
|
|
1765 | |
1727 | #ifdef DEBUG_STRICT |
1766 | #ifdef DEBUG_STRICT |
1728 | x = max (x, (int)TermWin.int_bwidth); |
1767 | x = max (x, 0); |
1729 | x = min (x, (int)TermWin.width); |
1768 | x = min (x, (int)TermWin.width); |
1730 | y = max (y, (int)TermWin.int_bwidth); |
1769 | y = max (y, 0); |
1731 | y = min (y, (int)TermWin.height); |
1770 | y = min (y, (int)TermWin.height); |
1732 | #endif |
1771 | #endif |
1733 | |
1772 | |
1734 | /* round down */ |
1773 | /* round down */ |
1735 | rc[PART_BEG].col = Pixel2Col (x); |
1774 | rc[PART_BEG].col = Pixel2Col (x); |
… | |
… | |
1743 | { |
1782 | { |
1744 | MIN_IT (rc[i].col, TermWin.ncol - 1); |
1783 | MIN_IT (rc[i].col, TermWin.ncol - 1); |
1745 | MIN_IT (rc[i].row, TermWin.nrow - 1); |
1784 | MIN_IT (rc[i].row, TermWin.nrow - 1); |
1746 | } |
1785 | } |
1747 | |
1786 | |
1748 | 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)); |
|
|
1749 | |
|
|
1750 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1787 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1751 | fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, |
1788 | fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1752 | (rc[PART_END].col - rc[PART_BEG].col + 1)); |
|
|
1753 | |
1789 | |
1754 | if (refresh) |
1790 | if (refresh) |
1755 | scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); |
1791 | scr_refresh (SLOW_REFRESH); |
1756 | } |
1792 | } |
1757 | |
1793 | |
1758 | /* ------------------------------------------------------------------------- */ |
1794 | /* ------------------------------------------------------------------------- */ |
1759 | /* |
1795 | /* |
1760 | * Refresh the entire screen |
1796 | * Refresh the entire screen |
… | |
… | |
1775 | { |
1811 | { |
1776 | long p = 0; |
1812 | long p = 0; |
1777 | uint16_t oldviewstart; |
1813 | uint16_t oldviewstart; |
1778 | |
1814 | |
1779 | oldviewstart = TermWin.view_start; |
1815 | oldviewstart = TermWin.view_start; |
|
|
1816 | |
1780 | if (y < len) |
1817 | if (y < len) |
1781 | { |
1818 | { |
1782 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1819 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1783 | p -= (long) (TermWin.nrow - 1); |
1820 | p -= (long) (TermWin.nrow - 1); |
1784 | p = max (p, 0); |
1821 | p = max (p, 0); |
1785 | } |
1822 | } |
|
|
1823 | |
1786 | TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); |
1824 | TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); |
1787 | D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start)); |
|
|
1788 | |
1825 | |
1789 | return scr_changeview (oldviewstart); |
1826 | return scr_changeview (oldviewstart); |
1790 | } |
1827 | } |
1791 | |
1828 | |
1792 | /* ------------------------------------------------------------------------- */ |
1829 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1795 | * direction should be UP or DN |
1832 | * direction should be UP or DN |
1796 | */ |
1833 | */ |
1797 | int |
1834 | int |
1798 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1835 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1799 | { |
1836 | { |
1800 | int n; |
1837 | int n; |
1801 | uint16_t oldviewstart; |
1838 | uint16_t oldviewstart; |
1802 | |
1839 | |
1803 | D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); |
|
|
1804 | #ifdef DEBUG_STRICT |
1840 | #ifdef DEBUG_STRICT |
1805 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
1841 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
1806 | #endif |
1842 | #endif |
1807 | oldviewstart = TermWin.view_start; |
1843 | oldviewstart = TermWin.view_start; |
1808 | if (direction == UP) |
1844 | if (direction == UP) |
… | |
… | |
1824 | if (TermWin.view_start != oldviewstart) |
1860 | if (TermWin.view_start != oldviewstart) |
1825 | { |
1861 | { |
1826 | want_refresh = 1; |
1862 | want_refresh = 1; |
1827 | num_scr -= (TermWin.view_start - oldviewstart); |
1863 | num_scr -= (TermWin.view_start - oldviewstart); |
1828 | } |
1864 | } |
|
|
1865 | |
1829 | return (int) (TermWin.view_start - oldviewstart); |
1866 | return (int) (TermWin.view_start - oldviewstart); |
1830 | } |
1867 | } |
1831 | |
1868 | |
1832 | /* ------------------------------------------------------------------------- */ |
1869 | /* ------------------------------------------------------------------------- */ |
1833 | void |
1870 | void |
1834 | rxvt_term::scr_bell () |
1871 | rxvt_term::scr_bell () |
1835 | { |
1872 | { |
1836 | #ifndef NO_BELL |
1873 | #ifndef NO_BELL |
1837 | # ifndef NO_MAPALERT |
1874 | # ifndef NO_MAPALERT |
1838 | # ifdef MAPALERT_OPTION |
1875 | # ifdef MAPALERT_OPTION |
1839 | if (Options & Opt_mapAlert) |
1876 | if (options & Opt_mapAlert) |
1840 | # endif |
1877 | # endif |
1841 | XMapWindow (display->display, TermWin.parent[0]); |
1878 | XMapWindow (display->display, TermWin.parent[0]); |
1842 | # endif |
1879 | # endif |
1843 | if (Options & Opt_visualBell) |
1880 | if (options & Opt_visualBell) |
1844 | { |
1881 | { |
1845 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1882 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1846 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1883 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1847 | } |
1884 | } |
1848 | else |
1885 | else |
… | |
… | |
1854 | /* ARGSUSED */ |
1891 | /* ARGSUSED */ |
1855 | void |
1892 | void |
1856 | rxvt_term::scr_printscreen (int fullhist) |
1893 | rxvt_term::scr_printscreen (int fullhist) |
1857 | { |
1894 | { |
1858 | #ifdef PRINTPIPE |
1895 | #ifdef PRINTPIPE |
1859 | int i, r1, nrows, row_offset; |
1896 | int i, r1, nrows, row_offset; |
1860 | text_t *t; |
1897 | FILE *fd; |
1861 | FILE *fd; |
|
|
1862 | |
1898 | |
1863 | if ((fd = popen_printer ()) == NULL) |
1899 | if ((fd = popen_printer ()) == NULL) |
1864 | return; |
1900 | return; |
|
|
1901 | |
1865 | nrows = TermWin.nrow; |
1902 | nrows = TermWin.nrow; |
1866 | row_offset = TermWin.saveLines; |
1903 | row_offset = TermWin.saveLines; |
|
|
1904 | |
1867 | if (!fullhist) |
1905 | if (!fullhist) |
1868 | row_offset -= TermWin.view_start; |
1906 | row_offset -= TermWin.view_start; |
1869 | else |
1907 | else |
1870 | { |
1908 | { |
1871 | nrows += TermWin.nscrolled; |
1909 | nrows += TermWin.nscrolled; |
1872 | row_offset -= TermWin.nscrolled; |
1910 | row_offset -= TermWin.nscrolled; |
1873 | } |
1911 | } |
1874 | |
1912 | |
|
|
1913 | wctomb (0, 0); |
|
|
1914 | |
1875 | for (r1 = 0; r1 < nrows; r1++) |
1915 | for (r1 = 0; r1 < nrows; r1++) |
1876 | { |
1916 | { |
1877 | t = screen.text[r1 + row_offset]; |
1917 | text_t *tp = screen.text[r1 + row_offset]; |
1878 | for (i = TermWin.ncol - 1; i >= 0; i--) |
1918 | int len = screen.tlen[r1 + row_offset]; |
1879 | if (!isspace (t[i])) |
1919 | |
1880 | break; |
1920 | for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) |
1881 | fprintf (fd, "%.*s\n", (i + 1), t); |
1921 | { |
|
|
1922 | char mb[MB_LEN_MAX]; |
|
|
1923 | text_t t = *tp++; |
|
|
1924 | if (t == NOCHAR) |
|
|
1925 | continue; |
|
|
1926 | |
|
|
1927 | len = wctomb (mb, t); |
|
|
1928 | |
|
|
1929 | if (len <= 0) |
|
|
1930 | { |
|
|
1931 | mb[0] = ' '; |
|
|
1932 | len = 1; |
|
|
1933 | } |
|
|
1934 | |
|
|
1935 | fwrite (mb, 1, len, fd); |
|
|
1936 | } |
|
|
1937 | |
|
|
1938 | fputc ('\n', fd); |
1882 | } |
1939 | } |
|
|
1940 | |
1883 | pclose_printer (fd); |
1941 | pclose_printer (fd); |
1884 | #endif |
1942 | #endif |
1885 | } |
1943 | } |
1886 | |
1944 | |
1887 | /* ------------------------------------------------------------------------- */ |
1945 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1901 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
1959 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
1902 | |
1960 | |
1903 | void |
1961 | void |
1904 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1962 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1905 | { |
1963 | { |
1906 | unsigned char clearfirst, /* first character writes before cell */ |
|
|
1907 | clearlast, /* last character writes beyond cell */ |
|
|
1908 | must_clear, /* use draw_string not draw_image_string */ |
1964 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1909 | rvid, /* reverse video this position */ |
1965 | rvid, /* reverse video this position */ |
1910 | showcursor; /* show the cursor */ |
1966 | showcursor; /* show the cursor */ |
1911 | int16_t col, row, /* column/row we're processing */ |
1967 | int16_t col, row, /* column/row we're processing */ |
1912 | ocrow; /* old cursor row */ |
1968 | ocrow; /* old cursor row */ |
1913 | int i, /* tmp */ |
1969 | int i, /* tmp */ |
1914 | row_offset; /* basic offset in screen structure */ |
1970 | row_offset; /* basic offset in screen structure */ |
1915 | #ifndef NO_CURSORCOLOR |
1971 | #ifndef NO_CURSORCOLOR |
1916 | rend_t cc1; /* store colours at cursor position (s) */ |
1972 | rend_t cc1; /* store colours at cursor position (s) */ |
1917 | #endif |
1973 | #endif |
1918 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
1974 | rend_t *crp; // cursor rendition pointer |
1919 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
|
|
1920 | |
1975 | |
1921 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
1976 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
1922 | return; |
1977 | return; |
1923 | |
1978 | |
1924 | /* |
1979 | /* |
1925 | * A: set up vars |
1980 | * A: set up vars |
1926 | */ |
1981 | */ |
1927 | clearfirst = clearlast = must_clear = 0; |
1982 | must_clear = 0; |
1928 | |
|
|
1929 | refresh_count = 0; |
1983 | refresh_count = 0; |
1930 | |
1984 | |
1931 | row_offset = TermWin.saveLines - TermWin.view_start; |
1985 | row_offset = TermWin.saveLines - TermWin.view_start; |
1932 | |
|
|
1933 | if ((refresh_type & REFRESH_BOUNDS)) |
|
|
1934 | { |
|
|
1935 | clearfirst = clearlast = 1; |
|
|
1936 | refresh_type &= ~REFRESH_BOUNDS; |
|
|
1937 | } |
|
|
1938 | |
1986 | |
1939 | #ifdef XPM_BACKGROUND |
1987 | #ifdef XPM_BACKGROUND |
1940 | must_clear |= (bgPixmap.pixmap != None); |
1988 | must_clear |= (bgPixmap.pixmap != None); |
1941 | #endif |
1989 | #endif |
1942 | #ifdef TRANSPARENT |
1990 | #ifdef TRANSPARENT |
1943 | must_clear |= ((Options & Opt_transparent) && am_transparent); |
1991 | must_clear |= ((options & Opt_transparent) && am_transparent); |
1944 | #endif |
1992 | #endif |
1945 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1993 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1946 | |
1994 | |
1947 | /* |
1995 | /* |
1948 | * B: reverse any characters which are selected |
1996 | * B: reverse any characters which are selected |
1949 | */ |
1997 | */ |
1950 | scr_reverse_selection (); |
1998 | scr_reverse_selection (); |
|
|
1999 | #if ENABLE_OVERLAY |
|
|
2000 | scr_swap_overlay (); |
|
|
2001 | #endif |
1951 | |
2002 | |
1952 | /* |
2003 | /* |
1953 | * C: set the cursor character (s) |
2004 | * C: set the cursor character (s) |
1954 | */ |
2005 | */ |
1955 | { |
2006 | { |
1956 | unsigned char setoldcursor; |
2007 | unsigned char setoldcursor; |
1957 | rend_t ccol1, /* Cursor colour */ |
2008 | rend_t ccol1, /* Cursor colour */ |
1958 | ccol2; /* Cursor colour2 */ |
2009 | ccol2; /* Cursor colour2 */ |
1959 | |
2010 | |
1960 | showcursor = (screen.flags & Screen_VisibleCursor); |
2011 | showcursor = (screen.flags & Screen_VisibleCursor); |
1961 | #ifdef CURSOR_BLINK |
2012 | #ifdef CURSOR_BLINK |
1962 | if (hidden_cursor) |
2013 | if (hidden_cursor) |
1963 | showcursor = 0; |
2014 | showcursor = 0; |
1964 | #endif |
2015 | #endif |
1965 | |
2016 | |
1966 | if (showcursor) |
2017 | if (showcursor) |
1967 | { |
2018 | { |
|
|
2019 | int col = screen.cur.col; |
|
|
2020 | |
|
|
2021 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
|
|
2022 | col--; |
|
|
2023 | |
1968 | srp = & (screen.rend[screen.cur.row + TermWin.saveLines] |
2024 | crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; |
1969 | [screen.cur.col]); |
|
|
1970 | |
2025 | |
1971 | if (showcursor && TermWin.focus) |
2026 | if (showcursor && TermWin.focus) |
1972 | { |
2027 | { |
1973 | *srp ^= RS_RVid; |
2028 | *crp ^= RS_RVid; |
1974 | #ifndef NO_CURSORCOLOR |
2029 | #ifndef NO_CURSORCOLOR |
1975 | cc1 = *srp & (RS_fgMask | RS_bgMask); |
2030 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
1976 | if (ISSET_PIXCOLOR (Color_cursor)) |
2031 | if (ISSET_PIXCOLOR (Color_cursor)) |
1977 | ccol1 = Color_cursor; |
2032 | ccol1 = Color_cursor; |
1978 | else |
2033 | else |
1979 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2034 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1980 | ccol1 = GET_FGCOLOR (rstyle); |
2035 | ccol1 = GET_FGCOLOR (rstyle); |
… | |
… | |
1987 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2042 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1988 | ccol2 = GET_BGCOLOR (rstyle); |
2043 | ccol2 = GET_BGCOLOR (rstyle); |
1989 | #else |
2044 | #else |
1990 | ccol2 = Color_bg; |
2045 | ccol2 = Color_bg; |
1991 | #endif |
2046 | #endif |
1992 | *srp = SET_FGCOLOR (*srp, ccol1); |
2047 | *crp = SET_FGCOLOR (*crp, ccol1); |
1993 | *srp = SET_BGCOLOR (*srp, ccol2); |
2048 | *crp = SET_BGCOLOR (*crp, ccol2); |
1994 | #endif |
2049 | #endif |
1995 | } |
2050 | } |
1996 | } |
2051 | } |
1997 | |
2052 | |
1998 | /* make sure no outline cursor is left around */ |
2053 | /* make sure no outline cursor is left around */ |
… | |
… | |
2002 | if (screen.cur.row + TermWin.view_start != ocrow |
2057 | if (screen.cur.row + TermWin.view_start != ocrow |
2003 | || screen.cur.col != oldcursor.col) |
2058 | || screen.cur.col != oldcursor.col) |
2004 | { |
2059 | { |
2005 | if (ocrow < TermWin.nrow |
2060 | if (ocrow < TermWin.nrow |
2006 | && oldcursor.col < TermWin.ncol) |
2061 | && oldcursor.col < TermWin.ncol) |
2007 | { |
|
|
2008 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
2062 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
2009 | } |
2063 | |
2010 | if (TermWin.focus || !showcursor) |
2064 | if (TermWin.focus || !showcursor) |
2011 | oldcursor.row = -1; |
2065 | oldcursor.row = -1; |
2012 | else |
2066 | else |
2013 | setoldcursor = 1; |
2067 | setoldcursor = 1; |
2014 | } |
2068 | } |
2015 | } |
2069 | } |
2016 | else if (!TermWin.focus) |
2070 | else if (!TermWin.focus) |
2017 | setoldcursor = 1; |
2071 | setoldcursor = 1; |
|
|
2072 | |
2018 | if (setoldcursor) |
2073 | if (setoldcursor) |
2019 | { |
2074 | { |
2020 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
2075 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
2021 | oldcursor.row = -1; |
2076 | oldcursor.row = -1; |
2022 | else |
2077 | else |
… | |
… | |
2025 | oldcursor.col = screen.cur.col; |
2080 | oldcursor.col = screen.cur.col; |
2026 | } |
2081 | } |
2027 | } |
2082 | } |
2028 | } |
2083 | } |
2029 | |
2084 | |
|
|
2085 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
|
|
2086 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
2030 | #ifndef NO_SLOW_LINK_SUPPORT |
2087 | #ifndef NO_SLOW_LINK_SUPPORT |
2031 | /* |
2088 | /* |
2032 | * D: CopyArea pass - very useful for slower links |
2089 | * D: CopyArea pass - very useful for slower links |
2033 | * This has been deliberately kept simple. |
2090 | * This has been deliberately kept simple. |
2034 | */ |
2091 | */ |
2035 | i = num_scr; |
2092 | i = num_scr; |
|
|
2093 | if (!display->is_local |
2036 | if (refresh_type == FAST_REFRESH && num_scr_allow && i |
2094 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2037 | && abs (i) < TermWin.nrow && !must_clear) |
2095 | && abs (i) < TermWin.nrow && !must_clear) |
2038 | { |
2096 | { |
2039 | int16_t nits; |
2097 | int16_t nits; |
2040 | int j; |
2098 | int j; |
2041 | rend_t *drp2; |
|
|
2042 | text_t *dtp2; |
|
|
2043 | int len, wlen; |
2099 | int len, wlen; |
2044 | |
2100 | |
2045 | j = TermWin.nrow; |
2101 | j = TermWin.nrow; |
2046 | wlen = len = -1; |
2102 | wlen = len = -1; |
2047 | row = i > 0 ? 0 : j - 1; |
2103 | row = i > 0 ? 0 : j - 1; |
2048 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2104 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2049 | { |
2105 | { |
2050 | if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) |
2106 | if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) |
2051 | { |
2107 | { |
2052 | stp = screen.text[row + row_offset]; |
2108 | text_t *stp = screen.text[row + row_offset]; |
2053 | srp = screen.rend[row + row_offset]; |
2109 | rend_t *srp = screen.rend[row + row_offset]; |
2054 | dtp = drawn_text[row]; |
2110 | text_t *dtp = drawn_text[row]; |
2055 | dtp2 = drawn_text[row + i]; |
2111 | text_t *dtp2 = drawn_text[row + i]; |
2056 | drp = drawn_rend[row]; |
2112 | rend_t *drp = drawn_rend[row]; |
2057 | drp2 = drawn_rend[row + i]; |
2113 | rend_t *drp2 = drawn_rend[row + i]; |
2058 | |
2114 | |
2059 | for (nits = 0, col = TermWin.ncol; col--; ) |
2115 | for (nits = 0, col = TermWin.ncol; col--; ) |
2060 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2116 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2061 | nits--; |
2117 | nits--; |
2062 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
2118 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
… | |
… | |
2082 | { |
2138 | { |
2083 | /* also comes here at end if needed because of >= above */ |
2139 | /* also comes here at end if needed because of >= above */ |
2084 | if (wlen < len) |
2140 | if (wlen < len) |
2085 | SWAP_IT (wlen, len, int); |
2141 | SWAP_IT (wlen, len, int); |
2086 | |
2142 | |
2087 | D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); |
|
|
2088 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2143 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2089 | TermWin.gc, 0, Row2Pixel (len + i), |
2144 | TermWin.gc, 0, Row2Pixel (len + i), |
2090 | (unsigned int)TermWin_TotalWidth (), |
2145 | (unsigned int)TermWin_TotalWidth (), |
2091 | (unsigned int)Height2Pixel (wlen - len + 1), |
2146 | (unsigned int)Height2Pixel (wlen - len + 1), |
2092 | 0, Row2Pixel (len)); |
2147 | 0, Row2Pixel (len)); |
… | |
… | |
2099 | /* |
2154 | /* |
2100 | * E: main pass across every character |
2155 | * E: main pass across every character |
2101 | */ |
2156 | */ |
2102 | for (row = 0; row < TermWin.nrow; row++) |
2157 | for (row = 0; row < TermWin.nrow; row++) |
2103 | { |
2158 | { |
2104 | stp = screen.text[row + row_offset]; |
2159 | text_t *stp = screen.text[row + row_offset]; |
2105 | srp = screen.rend[row + row_offset]; |
2160 | rend_t *srp = screen.rend[row + row_offset]; |
2106 | dtp = drawn_text[row]; |
2161 | text_t *dtp = drawn_text[row]; |
2107 | drp = drawn_rend[row]; |
2162 | rend_t *drp = drawn_rend[row]; |
2108 | |
2163 | |
2109 | /* |
2164 | /* |
2110 | * E2: OK, now the real pass |
2165 | * E2: OK, now the real pass |
2111 | */ |
2166 | */ |
2112 | int ypixel = (int)Row2Pixel (row); |
2167 | int ypixel = (int)Row2Pixel (row); |
… | |
… | |
2142 | if (stp[col] == NOCHAR) |
2197 | if (stp[col] == NOCHAR) |
2143 | { |
2198 | { |
2144 | dtp[col] = stp[col]; |
2199 | dtp[col] = stp[col]; |
2145 | drp[col] = rend; |
2200 | drp[col] = rend; |
2146 | count++; |
2201 | count++; |
2147 | |
|
|
2148 | if (i) // only possible skip if char unchanged |
|
|
2149 | i++; |
2202 | i++; |
2150 | |
2203 | |
2151 | continue; |
2204 | continue; |
2152 | } |
2205 | } |
2153 | |
2206 | |
2154 | if (rend != srp[col]) |
2207 | if (rend != srp[col]) |
… | |
… | |
2157 | count++; |
2210 | count++; |
2158 | |
2211 | |
2159 | if (stp[col] != dtp[col] |
2212 | if (stp[col] != dtp[col] |
2160 | || srp[col] != drp[col]) |
2213 | || srp[col] != drp[col]) |
2161 | { |
2214 | { |
2162 | if (must_clear && (i++ > (count / 2))) |
2215 | if (must_clear && (i++ > count / 2)) |
2163 | break; |
2216 | break; |
2164 | |
2217 | |
2165 | dtp[col] = stp[col]; |
2218 | dtp[col] = stp[col]; |
2166 | drp[col] = rend; |
2219 | drp[col] = rend; |
2167 | i = 0; |
2220 | i = 0; |
2168 | } |
2221 | } |
2169 | else if (must_clear || (stp[col] != ' ' && ++i >= 32)) |
2222 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2170 | break; |
2223 | break; |
2171 | } |
2224 | } |
2172 | |
2225 | |
2173 | col--; /* went one too far. move back */ |
2226 | col--; /* went one too far. move back */ |
2174 | count -= i; /* dump any matching trailing chars */ |
2227 | count -= i; /* dump any matching trailing chars */ |
|
|
2228 | |
|
|
2229 | // sometimes we optimize away the trailing NOCHAR's, add them back |
|
|
2230 | while (i && text[count] == NOCHAR) |
|
|
2231 | count++, i--; |
2175 | |
2232 | |
2176 | /* |
2233 | /* |
2177 | * Determine the attributes for the string |
2234 | * Determine the attributes for the string |
2178 | */ |
2235 | */ |
2179 | int fid = GET_FONT (rend); |
2236 | int fid = GET_FONT (rend); |
… | |
… | |
2183 | rend = GET_ATTR (rend); |
2240 | rend = GET_ATTR (rend); |
2184 | |
2241 | |
2185 | rvid = !!(rend & RS_RVid); |
2242 | rvid = !!(rend & RS_RVid); |
2186 | |
2243 | |
2187 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2244 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2188 | if (rend & RS_Bold && fore == Color_fg) |
2245 | if (rend & RS_Bold && fore == Color_fg && !(options & Opt_realBold)) |
2189 | { |
2246 | { |
2190 | if (ISSET_PIXCOLOR (Color_BD)) |
2247 | if (ISSET_PIXCOLOR (Color_BD)) |
2191 | fore = Color_BD; |
2248 | fore = Color_BD; |
2192 | else |
2249 | else |
2193 | rvid = !rvid; |
2250 | rvid = !rvid; |
2194 | } |
2251 | } |
2195 | |
2252 | |
2196 | if (rend & RS_Uline) |
2253 | if (rend & RS_Uline) |
2197 | { |
|
|
2198 | if (ISSET_PIXCOLOR (Color_UL)) |
2254 | if (ISSET_PIXCOLOR (Color_UL)) |
2199 | fore = Color_UL; |
2255 | fore = Color_UL; |
2200 | } |
|
|
2201 | #endif |
2256 | #endif |
2202 | |
2257 | |
2203 | if (rvid) |
2258 | if (rvid) |
2204 | { |
2259 | { |
2205 | SWAP_IT (fore, back, int); |
2260 | SWAP_IT (fore, back, int); |
… | |
… | |
2213 | back = Color_RV; |
2268 | back = Color_RV; |
2214 | #endif |
2269 | #endif |
2215 | } |
2270 | } |
2216 | |
2271 | |
2217 | #ifdef TEXT_BLINK |
2272 | #ifdef TEXT_BLINK |
2218 | if (rend & RS_Blink && back == Color_bg) |
2273 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2219 | { |
2274 | { |
2220 | if (!text_blink_ev.active) |
2275 | if (!text_blink_ev.active) |
2221 | { |
2276 | { |
2222 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2277 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2223 | hidden_text = 0; |
2278 | hidden_text = 0; |
… | |
… | |
2253 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2308 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2254 | } |
2309 | } |
2255 | else |
2310 | else |
2256 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2311 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2257 | |
2312 | |
2258 | if ((rend & RS_Uline) && (font->descent > 1)) |
2313 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2259 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2314 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2260 | xpixel, ypixel + font->ascent + 1, |
2315 | xpixel, ypixel + font->ascent + 1, |
2261 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2316 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2262 | } /* for (col....) */ |
2317 | } /* for (col....) */ |
2263 | } /* for (row....) */ |
2318 | } /* for (row....) */ |
… | |
… | |
2267 | */ |
2322 | */ |
2268 | if (showcursor) |
2323 | if (showcursor) |
2269 | { |
2324 | { |
2270 | if (TermWin.focus) |
2325 | if (TermWin.focus) |
2271 | { |
2326 | { |
2272 | srp = & (screen.rend[screen.cur.row + TermWin.saveLines] |
|
|
2273 | [screen.cur.col]); |
|
|
2274 | *srp ^= RS_RVid; |
2327 | *crp ^= RS_RVid; |
2275 | #ifndef NO_CURSORCOLOR |
2328 | #ifndef NO_CURSORCOLOR |
2276 | *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2329 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2277 | #endif |
2330 | #endif |
2278 | } |
2331 | } |
2279 | else if (oldcursor.row >= 0) |
2332 | else if (oldcursor.row >= 0) |
2280 | { |
2333 | { |
2281 | #ifndef NO_CURSORCOLOR |
2334 | #ifndef NO_CURSORCOLOR |
2282 | if (ISSET_PIXCOLOR (Color_cursor)) |
2335 | if (ISSET_PIXCOLOR (Color_cursor)) |
2283 | XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); |
2336 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); |
2284 | #endif |
2337 | #endif |
2285 | int cursorwidth = 1; |
2338 | int cursorwidth = 1; |
2286 | while (oldcursor.col + cursorwidth < TermWin.ncol |
2339 | while (oldcursor.col + cursorwidth < TermWin.ncol |
2287 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
2340 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
2288 | cursorwidth++; |
2341 | cursorwidth++; |
… | |
… | |
2296 | } |
2349 | } |
2297 | |
2350 | |
2298 | /* |
2351 | /* |
2299 | * H: cleanup selection |
2352 | * H: cleanup selection |
2300 | */ |
2353 | */ |
|
|
2354 | #if ENABLE_OVERLAY |
|
|
2355 | scr_swap_overlay (); |
|
|
2356 | #endif |
2301 | scr_reverse_selection (); |
2357 | scr_reverse_selection (); |
2302 | |
2358 | |
2303 | /* |
|
|
2304 | * I: other general cleanup |
|
|
2305 | */ |
|
|
2306 | if (clearfirst && TermWin.int_bwidth) |
|
|
2307 | /* |
|
|
2308 | * clear the whole screen height, note that width == 0 is treated |
|
|
2309 | * specially by XClearArea |
|
|
2310 | */ |
|
|
2311 | XClearArea (display->display, TermWin.vt, 0, 0, |
|
|
2312 | (unsigned int)TermWin.int_bwidth, |
|
|
2313 | (unsigned int)TermWin_TotalHeight (), False); |
|
|
2314 | |
|
|
2315 | if (clearlast && TermWin.int_bwidth) |
|
|
2316 | /* |
|
|
2317 | * clear the whole screen height, note that width == 0 is treated |
|
|
2318 | * specially by XClearArea |
|
|
2319 | */ |
|
|
2320 | XClearArea (display->display, TermWin.vt, |
|
|
2321 | TermWin.width + TermWin.int_bwidth, 0, |
|
|
2322 | (unsigned int)TermWin.int_bwidth, |
|
|
2323 | (unsigned int)TermWin_TotalHeight (), False); |
|
|
2324 | |
|
|
2325 | if (refresh_type & SMOOTH_REFRESH) |
2359 | if (refresh_type & SMOOTH_REFRESH) |
2326 | XSync (display->display, False); |
2360 | XFlush (display->display); |
2327 | |
2361 | |
2328 | num_scr = 0; |
2362 | num_scr = 0; |
2329 | num_scr_allow = 1; |
2363 | num_scr_allow = 1; |
2330 | want_refresh = 0; /* screen is current */ |
2364 | want_refresh = 0; /* screen is current */ |
2331 | } |
2365 | } |
… | |
… | |
2362 | |
2396 | |
2363 | num_scr_allow = 0; |
2397 | num_scr_allow = 0; |
2364 | want_refresh = 1; |
2398 | want_refresh = 1; |
2365 | |
2399 | |
2366 | #ifdef TRANSPARENT |
2400 | #ifdef TRANSPARENT |
2367 | if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) |
2401 | if ((options & Opt_transparent) && (am_pixmap_trans == 0)) |
2368 | { |
2402 | { |
2369 | int i; |
2403 | int i; |
2370 | |
2404 | |
2371 | if (! (Options & Opt_transparent_all)) |
2405 | if (! (options & Opt_transparent_all)) |
2372 | i = 0; |
2406 | i = 0; |
2373 | else |
2407 | else |
2374 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
2408 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
2375 | |
2409 | |
2376 | while (i--) |
2410 | while (i--) |
… | |
… | |
2453 | * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 |
2487 | * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 |
2454 | */ |
2488 | */ |
2455 | void |
2489 | void |
2456 | rxvt_term::selection_check (int check_more) |
2490 | rxvt_term::selection_check (int check_more) |
2457 | { |
2491 | { |
2458 | row_col_t pos; |
2492 | row_col_t pos; |
2459 | |
2493 | |
2460 | if (!selection.op) |
2494 | if (!selection.op) |
2461 | return; |
2495 | return; |
2462 | |
2496 | |
2463 | pos.row = pos.col = 0; |
2497 | pos.row = pos.col = 0; |
… | |
… | |
2490 | rxvt_term::paste (const unsigned char *data, unsigned int len) |
2524 | rxvt_term::paste (const unsigned char *data, unsigned int len) |
2491 | { |
2525 | { |
2492 | unsigned int i, j, n; |
2526 | unsigned int i, j, n; |
2493 | unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); |
2527 | unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); |
2494 | |
2528 | |
2495 | #if 0 |
|
|
2496 | /* a paste should act like the user is typing, so check scrollTtyKeypress */ |
|
|
2497 | ZERO_SCROLLBACK (r); |
|
|
2498 | #endif |
|
|
2499 | |
|
|
2500 | /* convert normal newline chars into common keyboard Return key sequence */ |
2529 | /* convert normal newline chars into common keyboard Return key sequence */ |
2501 | for (i = 0; i < len; i += PROP_SIZE) |
2530 | for (i = 0; i < len; i += PROP_SIZE) |
2502 | { |
2531 | { |
2503 | n = min (len - i, PROP_SIZE); |
2532 | n = min (len - i, PROP_SIZE); |
2504 | MEMCPY (ds, data + i, n); |
2533 | memcpy (ds, data + i, n); |
2505 | |
2534 | |
2506 | for (j = 0; j < n; j++) |
2535 | for (j = 0; j < n; j++) |
2507 | if (ds[j] == '\n') |
2536 | if (ds[j] == C0_LF) |
2508 | ds[j] = '\r'; |
2537 | ds[j] = C0_CR; |
2509 | |
2538 | |
2510 | tt_write (ds, (int)n); |
2539 | tt_write (ds, (int)n); |
2511 | } |
2540 | } |
2512 | |
2541 | |
2513 | free (ds); |
2542 | free (ds); |
… | |
… | |
2522 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2551 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2523 | { |
2552 | { |
2524 | long nread = 0; |
2553 | long nread = 0; |
2525 | unsigned long bytes_after; |
2554 | unsigned long bytes_after; |
2526 | XTextProperty ct; |
2555 | XTextProperty ct; |
2527 | |
|
|
2528 | D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait)); |
|
|
2529 | |
2556 | |
2530 | if (prop == None) /* check for failed XConvertSelection */ |
2557 | if (prop == None) /* check for failed XConvertSelection */ |
2531 | { |
2558 | { |
2532 | if ((selection_type & Sel_CompoundText)) |
2559 | if ((selection_type & Sel_CompoundText)) |
2533 | { |
2560 | { |
… | |
… | |
2560 | &ct.nitems, &bytes_after, |
2587 | &ct.nitems, &bytes_after, |
2561 | &ct.value) != Success) |
2588 | &ct.value) != Success) |
2562 | break; |
2589 | break; |
2563 | |
2590 | |
2564 | if (ct.encoding == 0) |
2591 | if (ct.encoding == 0) |
|
|
2592 | break; |
|
|
2593 | |
|
|
2594 | if (ct.encoding == xa[XA_INCR]) |
2565 | { |
2595 | { |
2566 | D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); |
2596 | // INCR selection, start handshake |
|
|
2597 | XDeleteProperty (display->display, win, prop); |
|
|
2598 | selection_wait = Sel_incr; |
|
|
2599 | incr_ev.start (NOW + 10); |
2567 | break; |
2600 | break; |
2568 | } |
2601 | } |
2569 | |
2602 | |
2570 | if (ct.value == NULL) |
2603 | if (ct.value == NULL) |
2571 | { |
|
|
2572 | D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!")); |
|
|
2573 | continue; |
2604 | continue; |
2574 | } |
|
|
2575 | |
2605 | |
2576 | if (ct.nitems == 0) |
2606 | if (ct.nitems == 0) |
2577 | { |
2607 | { |
2578 | D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
|
|
2579 | |
|
|
2580 | if (selection_wait == Sel_normal && nread == 0 |
2608 | if (selection_wait == Sel_normal && nread == 0 |
2581 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2609 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2582 | { |
2610 | { |
2583 | /* |
2611 | /* |
2584 | * pass through again trying CUT_BUFFER0 if we've come from |
2612 | * pass through again trying CUT_BUFFER0 if we've come from |
2585 | * XConvertSelection () but nothing was presented |
2613 | * XConvertSelection () but nothing was presented |
2586 | */ |
2614 | */ |
2587 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
|
|
2588 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2615 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2589 | } |
2616 | } |
2590 | |
2617 | |
2591 | nread = -1; /* discount any previous stuff */ |
2618 | nread = -1; /* discount any previous stuff */ |
2592 | break; |
2619 | break; |
… | |
… | |
2594 | |
2621 | |
2595 | nread += ct.nitems; |
2622 | nread += ct.nitems; |
2596 | |
2623 | |
2597 | char **cl; |
2624 | char **cl; |
2598 | int cr; |
2625 | int cr; |
2599 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, |
2626 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) |
2600 | &cr) >= 0 && cl) |
|
|
2601 | { |
2627 | { |
2602 | for (int i = 0; i < cr; i++) |
2628 | for (int i = 0; i < cr; i++) |
2603 | paste ((unsigned char *)cl[i], STRLEN (cl[i])); |
2629 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2604 | |
2630 | |
2605 | XFreeStringList (cl); |
2631 | XFreeStringList (cl); |
2606 | } |
2632 | } |
2607 | else |
2633 | else |
2608 | paste (ct.value, ct.nitems); |
2634 | paste (ct.value, ct.nitems); |
… | |
… | |
2617 | XFree (ct.value); |
2643 | XFree (ct.value); |
2618 | |
2644 | |
2619 | if (selection_wait == Sel_normal) |
2645 | if (selection_wait == Sel_normal) |
2620 | selection_wait = Sel_none; |
2646 | selection_wait = Sel_none; |
2621 | |
2647 | |
2622 | D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); |
|
|
2623 | return (int)nread; |
2648 | return (int)nread; |
2624 | } |
2649 | } |
2625 | |
2650 | |
2626 | void |
2651 | void |
2627 | rxvt_term::incr_cb (time_watcher &w) |
2652 | rxvt_term::incr_cb (time_watcher &w) |
2628 | { |
2653 | { |
2629 | selection_wait = Sel_none; |
2654 | selection_wait = Sel_none; |
2630 | |
2655 | |
2631 | rxvt_print_error ("data loss: timeout on INCR selection paste"); |
2656 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2632 | } |
2657 | } |
2633 | |
2658 | |
2634 | /* |
2659 | /* |
2635 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2660 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2636 | */ |
2661 | */ |
2637 | void |
2662 | void |
2638 | rxvt_term::selection_property (Window win, Atom prop) |
2663 | rxvt_term::selection_property (Window win, Atom prop) |
2639 | { |
2664 | { |
2640 | int reget_time = 0; |
2665 | if (prop == None || selection_wait != Sel_incr) |
2641 | |
|
|
2642 | if (prop == None) |
|
|
2643 | return; |
2666 | return; |
2644 | |
2667 | |
2645 | D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); |
|
|
2646 | if (selection_wait == Sel_normal) |
|
|
2647 | { |
|
|
2648 | int a, afmt; |
|
|
2649 | Atom atype; |
|
|
2650 | unsigned long bytes_after, nitems; |
|
|
2651 | unsigned char *s = NULL; |
|
|
2652 | |
|
|
2653 | a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, |
|
|
2654 | xa[XA_INCR], &atype, &afmt, &nitems, |
|
|
2655 | &bytes_after, &s); |
|
|
2656 | if (s) |
|
|
2657 | XFree (s); |
|
|
2658 | if (a != Success) |
|
|
2659 | return; |
|
|
2660 | |
|
|
2661 | #ifndef __CYGWIN32__ |
|
|
2662 | if (atype == xa[XA_INCR]) |
|
|
2663 | { /* start an INCR transfer */ |
|
|
2664 | D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); |
|
|
2665 | XDeleteProperty (display->display, win, prop); |
|
|
2666 | XFlush (display->display); |
|
|
2667 | reget_time = 1; |
|
|
2668 | selection_wait = Sel_incr; |
|
|
2669 | } |
|
|
2670 | #endif |
|
|
2671 | |
|
|
2672 | } |
|
|
2673 | else if (selection_wait == Sel_incr) |
|
|
2674 | { |
|
|
2675 | reget_time = 1; |
|
|
2676 | |
|
|
2677 | if (selection_paste (win, prop, True) == -1) |
2668 | if (selection_paste (win, prop, 1) > 0) |
2678 | { |
|
|
2679 | D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); |
|
|
2680 | selection_wait = Sel_none; |
|
|
2681 | incr_ev.stop (); |
|
|
2682 | } |
|
|
2683 | } |
|
|
2684 | if (reget_time) /* received more data so reget time */ |
|
|
2685 | incr_ev.start (NOW + 10); |
2669 | incr_ev.start (NOW + 10); |
|
|
2670 | else |
|
|
2671 | { |
|
|
2672 | selection_wait = Sel_none; |
|
|
2673 | incr_ev.stop (); |
|
|
2674 | } |
2686 | } |
2675 | } |
2687 | |
2676 | |
2688 | /* ------------------------------------------------------------------------- */ |
2677 | /* ------------------------------------------------------------------------- */ |
2689 | /* |
2678 | /* |
2690 | * Request the current selection: |
2679 | * Request the current selection: |
… | |
… | |
2696 | * EXT: button 2 release |
2685 | * EXT: button 2 release |
2697 | */ |
2686 | */ |
2698 | void |
2687 | void |
2699 | rxvt_term::selection_request (Time tm, int x, int y) |
2688 | rxvt_term::selection_request (Time tm, int x, int y) |
2700 | { |
2689 | { |
2701 | D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); |
|
|
2702 | |
|
|
2703 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2690 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2704 | return; /* outside window */ |
2691 | return; /* outside window */ |
2705 | |
2692 | |
2706 | if (selection.text) |
2693 | if (selection.text) |
2707 | { /* internal selection */ |
2694 | { /* internal selection */ |
2708 | D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); |
|
|
2709 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2695 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2710 | paste ((unsigned char *)str, strlen (str)); |
2696 | paste ((unsigned char *)str, strlen (str)); |
2711 | free (str); |
2697 | free (str); |
2712 | return; |
2698 | return; |
2713 | } |
2699 | } |
… | |
… | |
2715 | { |
2701 | { |
2716 | int i; |
2702 | int i; |
2717 | |
2703 | |
2718 | selection_request_time = tm; |
2704 | selection_request_time = tm; |
2719 | selection_wait = Sel_normal; |
2705 | selection_wait = Sel_normal; |
|
|
2706 | |
2720 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2707 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2721 | { |
2708 | { |
2722 | #if X_HAVE_UTF8_STRING |
2709 | #if X_HAVE_UTF8_STRING |
2723 | selection_type = Sel_UTF8String; |
2710 | selection_type = Sel_UTF8String; |
2724 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
2711 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
… | |
… | |
2731 | |
2718 | |
2732 | } |
2719 | } |
2733 | } |
2720 | } |
2734 | |
2721 | |
2735 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2722 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2736 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
|
|
2737 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2723 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2738 | } |
2724 | } |
2739 | |
2725 | |
2740 | int |
2726 | int |
2741 | rxvt_term::selection_request_other (Atom target, int selnum) |
2727 | rxvt_term::selection_request_other (Atom target, int selnum) |
… | |
… | |
2754 | else |
2740 | else |
2755 | sel = xa[XA_CLIPBOARD]; |
2741 | sel = xa[XA_CLIPBOARD]; |
2756 | |
2742 | |
2757 | if (XGetSelectionOwner (display->display, sel) != None) |
2743 | if (XGetSelectionOwner (display->display, sel) != None) |
2758 | { |
2744 | { |
2759 | D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); |
|
|
2760 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2745 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2761 | TermWin.vt, selection_request_time); |
2746 | TermWin.vt, selection_request_time); |
2762 | return 1; |
2747 | return 1; |
2763 | } |
2748 | } |
2764 | |
2749 | |
… | |
… | |
2771 | * EXT: SelectionClear |
2756 | * EXT: SelectionClear |
2772 | */ |
2757 | */ |
2773 | void |
2758 | void |
2774 | rxvt_term::selection_clear () |
2759 | rxvt_term::selection_clear () |
2775 | { |
2760 | { |
2776 | D_SELECT ((stderr, "rxvt_selection_clear ()")); |
|
|
2777 | |
|
|
2778 | want_refresh = 1; |
2761 | want_refresh = 1; |
2779 | free (selection.text); |
2762 | free (selection.text); |
2780 | selection.text = NULL; |
2763 | selection.text = NULL; |
2781 | selection.len = 0; |
2764 | selection.len = 0; |
2782 | CLEAR_SELECTION (); |
2765 | CLEAR_SELECTION (); |
|
|
2766 | |
|
|
2767 | if (display->selection_owner == this) |
|
|
2768 | display->selection_owner = 0; |
2783 | } |
2769 | } |
2784 | |
2770 | |
2785 | /* ------------------------------------------------------------------------- */ |
2771 | /* ------------------------------------------------------------------------- */ |
2786 | /* |
2772 | /* |
2787 | * Copy a selection into the cut buffer |
2773 | * Copy a selection into the cut buffer |
… | |
… | |
2792 | { |
2778 | { |
2793 | int i, col, end_col, row, end_row; |
2779 | int i, col, end_col, row, end_row; |
2794 | wchar_t *new_selection_text; |
2780 | wchar_t *new_selection_text; |
2795 | text_t *t; |
2781 | text_t *t; |
2796 | |
2782 | |
2797 | D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); |
|
|
2798 | switch (selection.op) |
2783 | switch (selection.op) |
2799 | { |
2784 | { |
2800 | case SELECTION_CONT: |
2785 | case SELECTION_CONT: |
2801 | break; |
2786 | break; |
2802 | case SELECTION_INIT: |
2787 | case SELECTION_INIT: |
… | |
… | |
2824 | int ofs = 0; |
2809 | int ofs = 0; |
2825 | int extra = 0; |
2810 | int extra = 0; |
2826 | |
2811 | |
2827 | for (; row <= end_row; row++, col = 0) |
2812 | for (; row <= end_row; row++, col = 0) |
2828 | { |
2813 | { |
2829 | t = &(screen.text[row][col]); |
2814 | t = &screen.text[row][col]; |
2830 | |
2815 | |
2831 | end_col = screen.tlen[row]; |
2816 | end_col = screen.tlen[row]; |
2832 | |
2817 | |
2833 | if (end_col == -1) |
2818 | if (end_col == -1) |
2834 | end_col = TermWin.ncol; |
2819 | end_col = TermWin.ncol; |
… | |
… | |
2838 | |
2823 | |
2839 | for (; col < end_col; col++) |
2824 | for (; col < end_col; col++) |
2840 | { |
2825 | { |
2841 | if (*t == NOCHAR) |
2826 | if (*t == NOCHAR) |
2842 | t++; |
2827 | t++; |
|
|
2828 | #if ENABLE_COMBINING |
2843 | else if (IS_COMPOSE (*t)) |
2829 | else if (IS_COMPOSE (*t)) |
2844 | { |
2830 | { |
2845 | int len = rxvt_composite.expand (*t, 0); |
2831 | int len = rxvt_composite.expand (*t, 0); |
2846 | |
2832 | |
2847 | extra -= (len - 1); |
2833 | extra -= (len - 1); |
… | |
… | |
2853 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2839 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2854 | } |
2840 | } |
2855 | |
2841 | |
2856 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2842 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2857 | } |
2843 | } |
|
|
2844 | #endif |
2858 | else |
2845 | else |
2859 | new_selection_text[ofs++] = *t++; |
2846 | new_selection_text[ofs++] = *t++; |
2860 | } |
2847 | } |
2861 | |
2848 | |
2862 | if (screen.tlen[row] != -1 && row != end_row) |
2849 | if (screen.tlen[row] != -1 && row != end_row) |
2863 | new_selection_text[ofs++] = L'\n'; |
2850 | new_selection_text[ofs++] = C0_LF; |
2864 | } |
2851 | } |
2865 | |
2852 | |
2866 | #ifndef NO_OLD_SELECTION |
|
|
2867 | if (selection_style == OLD_SELECT) |
|
|
2868 | if (end_col == TermWin.ncol) |
|
|
2869 | new_selection_text[ofs++] = L'\n'; |
|
|
2870 | #endif |
|
|
2871 | #ifndef NO_NEW_SELECTION |
|
|
2872 | if (selection_style != OLD_SELECT) |
|
|
2873 | if (end_col != selection.end.col) |
2853 | if (end_col != selection.end.col) |
2874 | new_selection_text[ofs++] = L'\n'; |
2854 | new_selection_text[ofs++] = C0_LF; |
2875 | #endif |
2855 | |
2876 | new_selection_text[ofs] = 0; |
2856 | new_selection_text[ofs] = 0; |
2877 | |
2857 | |
2878 | if (ofs == 0) |
2858 | if (ofs == 0) |
2879 | { |
2859 | { |
2880 | free (new_selection_text); |
2860 | free (new_selection_text); |
… | |
… | |
2889 | |
2869 | |
2890 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2870 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2891 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2871 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2892 | display->set_selection_owner (this); |
2872 | display->set_selection_owner (this); |
2893 | else |
2873 | else |
2894 | rxvt_print_error ("can't get primary selection"); |
2874 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
2895 | |
2875 | |
2896 | #if 0 |
2876 | #if 0 |
2897 | XTextProperty ct; |
2877 | XTextProperty ct; |
2898 | |
2878 | |
2899 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2879 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
… | |
… | |
2903 | XFree (ct.value); |
2883 | XFree (ct.value); |
2904 | } |
2884 | } |
2905 | #endif |
2885 | #endif |
2906 | |
2886 | |
2907 | selection_time = tm; |
2887 | selection_time = tm; |
2908 | D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); |
|
|
2909 | } |
2888 | } |
2910 | |
2889 | |
2911 | /* ------------------------------------------------------------------------- */ |
2890 | /* ------------------------------------------------------------------------- */ |
2912 | /* |
2891 | /* |
2913 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2892 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2914 | * EXT: button 1 press |
2893 | * EXT: button 1 press |
2915 | */ |
2894 | */ |
2916 | void |
2895 | void |
2917 | rxvt_term::selection_click (int clicks, int x, int y) |
2896 | rxvt_term::selection_click (int clicks, int x, int y) |
2918 | { |
2897 | { |
2919 | D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y)); |
|
|
2920 | |
|
|
2921 | clicks = ((clicks - 1) % 3) + 1; |
2898 | clicks = ((clicks - 1) % 3) + 1; |
2922 | selection.clicks = clicks; /* save clicks so extend will work */ |
2899 | selection.clicks = clicks; /* save clicks so extend will work */ |
2923 | |
2900 | |
2924 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
2901 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
2925 | |
2902 | |
… | |
… | |
2939 | rxvt_term::selection_start_colrow (int col, int row) |
2916 | rxvt_term::selection_start_colrow (int col, int row) |
2940 | { |
2917 | { |
2941 | want_refresh = 1; |
2918 | want_refresh = 1; |
2942 | selection.mark.col = col; |
2919 | selection.mark.col = col; |
2943 | selection.mark.row = row - TermWin.view_start; |
2920 | selection.mark.row = row - TermWin.view_start; |
|
|
2921 | |
2944 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
2922 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
2945 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
2923 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
2946 | MAX_IT (selection.mark.col, 0); |
2924 | MAX_IT (selection.mark.col, 0); |
2947 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
2925 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
2948 | |
2926 | |
|
|
2927 | while (selection.mark.col > 0 |
|
|
2928 | && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) |
|
|
2929 | --selection.mark.col; |
|
|
2930 | |
2949 | if (selection.op) |
2931 | if (selection.op) |
2950 | { /* clear the old selection */ |
2932 | { /* clear the old selection */ |
2951 | selection.beg.row = selection.end.row = selection.mark.row; |
2933 | selection.beg.row = selection.end.row = selection.mark.row; |
2952 | selection.beg.col = selection.end.col = selection.mark.col; |
2934 | selection.beg.col = selection.end.col = selection.mark.col; |
2953 | } |
2935 | } |
|
|
2936 | |
2954 | selection.op = SELECTION_INIT; |
2937 | selection.op = SELECTION_INIT; |
2955 | selection.screen = current_screen; |
2938 | selection.screen = current_screen; |
2956 | } |
2939 | } |
2957 | |
2940 | |
2958 | /* ------------------------------------------------------------------------- */ |
2941 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
2960 | * Word select: select text for 2 clicks |
2943 | * Word select: select text for 2 clicks |
2961 | * We now only find out the boundary in one direction |
2944 | * We now only find out the boundary in one direction |
2962 | */ |
2945 | */ |
2963 | |
2946 | |
2964 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2947 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2965 | #define DELIMIT_TEXT(x) \ |
2948 | #define DELIMIT_TEXT(x) \ |
2966 | (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) |
2949 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
2967 | #define DELIMIT_REND(x) 1 |
2950 | #define DELIMIT_REND(x) 1 |
2968 | |
2951 | |
2969 | void |
2952 | void |
2970 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2953 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2971 | { |
2954 | { |
2972 | int col, row, dirnadd, tcol, trow, w1, w2; |
2955 | int col, row, dirnadd, tcol, trow, w1, w2; |
2973 | row_col_t bound; |
2956 | row_col_t bound; |
2974 | text_t *stp; |
2957 | text_t *stp; |
2975 | rend_t *srp; |
2958 | rend_t *srp; |
2976 | |
2959 | |
2977 | if (dirn == UP) |
2960 | if (dirn == UP) |
2978 | { |
2961 | { |
2979 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
2962 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
2980 | bound.col = 0; |
2963 | bound.col = 0; |
… | |
… | |
2984 | { |
2967 | { |
2985 | bound.row = TermWin.saveLines + TermWin.nrow; |
2968 | bound.row = TermWin.saveLines + TermWin.nrow; |
2986 | bound.col = TermWin.ncol - 1; |
2969 | bound.col = TermWin.ncol - 1; |
2987 | dirnadd = 1; |
2970 | dirnadd = 1; |
2988 | } |
2971 | } |
|
|
2972 | |
2989 | row = mark->row + TermWin.saveLines; |
2973 | row = mark->row + TermWin.saveLines; |
2990 | col = mark->col; |
2974 | col = mark->col; |
2991 | MAX_IT (col, 0); |
2975 | MAX_IT (col, 0); |
2992 | /* find the edge of a word */ |
2976 | /* find the edge of a word */ |
2993 | stp = & (screen.text[row][col]); |
2977 | stp = &screen.text[row][col]; |
2994 | w1 = DELIMIT_TEXT (*stp); |
2978 | w1 = DELIMIT_TEXT (*stp); |
2995 | |
2979 | |
2996 | if (selection_style != NEW_SELECT) |
2980 | srp = &screen.rend[row][col]; |
|
|
2981 | w2 = DELIMIT_REND (*srp); |
|
|
2982 | |
|
|
2983 | for (;;) |
2997 | { |
2984 | { |
2998 | if (w1 == 1) |
2985 | for (; col != bound.col; col += dirnadd) |
2999 | { |
2986 | { |
3000 | stp += dirnadd; |
2987 | stp += dirnadd; |
3001 | if (DELIMIT_TEXT (*stp) == 1) |
|
|
3002 | goto Old_Word_Selection_You_Die; |
|
|
3003 | col += dirnadd; |
|
|
3004 | } |
|
|
3005 | w1 = 0; |
|
|
3006 | } |
|
|
3007 | srp = (&screen.rend[row][col]); |
|
|
3008 | w2 = DELIMIT_REND (*srp); |
|
|
3009 | |
|
|
3010 | for (;;) |
|
|
3011 | { |
|
|
3012 | for (; col != bound.col; col += dirnadd) |
|
|
3013 | { |
|
|
3014 | stp += dirnadd; |
2988 | srp += dirnadd; |
|
|
2989 | |
|
|
2990 | if (*stp == NOCHAR) |
|
|
2991 | continue; |
|
|
2992 | |
3015 | if (DELIMIT_TEXT (*stp) != w1) |
2993 | if (DELIMIT_TEXT (*stp) != w1) |
3016 | break; |
2994 | break; |
3017 | srp += dirnadd; |
|
|
3018 | if (DELIMIT_REND (*srp) != w2) |
2995 | if (DELIMIT_REND (*srp) != w2) |
3019 | break; |
2996 | break; |
3020 | } |
2997 | } |
|
|
2998 | |
3021 | if ((col == bound.col) && (row != bound.row)) |
2999 | if ((col == bound.col) && (row != bound.row)) |
3022 | { |
3000 | { |
3023 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
3001 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
3024 | { |
3002 | { |
3025 | trow = row + dirnadd; |
3003 | trow = row + dirnadd; |
3026 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
3004 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
|
|
3005 | |
3027 | if (screen.text[trow] == NULL) |
3006 | if (screen.text[trow] == NULL) |
3028 | break; |
3007 | break; |
|
|
3008 | |
3029 | stp = & (screen.text[trow][tcol]); |
3009 | stp = & (screen.text[trow][tcol]); |
3030 | srp = & (screen.rend[trow][tcol]); |
3010 | srp = & (screen.rend[trow][tcol]); |
|
|
3011 | |
3031 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3012 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3032 | break; |
3013 | break; |
|
|
3014 | |
3033 | row = trow; |
3015 | row = trow; |
3034 | col = tcol; |
3016 | col = tcol; |
3035 | continue; |
3017 | continue; |
3036 | } |
3018 | } |
3037 | } |
3019 | } |
3038 | break; |
3020 | break; |
3039 | } |
3021 | } |
|
|
3022 | |
3040 | Old_Word_Selection_You_Die: |
3023 | Old_Word_Selection_You_Die: |
3041 | 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)); |
|
|
3042 | |
|
|
3043 | if (dirn == DN) |
3024 | if (dirn == DN) |
3044 | col++; /* put us on one past the end */ |
3025 | col++; /* put us on one past the end */ |
3045 | |
3026 | |
3046 | /* Poke the values back in */ |
3027 | /* Poke the values back in */ |
3047 | ret->row = row - TermWin.saveLines; |
3028 | ret->row = row - TermWin.saveLines; |
… | |
… | |
3066 | MAX_IT (row, 0); |
3047 | MAX_IT (row, 0); |
3067 | MIN_IT (row, (int)TermWin.nrow - 1); |
3048 | MIN_IT (row, (int)TermWin.nrow - 1); |
3068 | MAX_IT (col, 0); |
3049 | MAX_IT (col, 0); |
3069 | MIN_IT (col, (int)TermWin.ncol); |
3050 | MIN_IT (col, (int)TermWin.ncol); |
3070 | |
3051 | |
3071 | #ifndef NO_NEW_SELECTION |
|
|
3072 | /* |
3052 | /* |
3073 | * If we're selecting characters (single click) then we must check first |
3053 | * If we're selecting characters (single click) then we must check first |
3074 | * if we are at the same place as the original mark. If we are then |
3054 | * if we are at the same place as the original mark. If we are then |
3075 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3055 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3076 | * be _past_ a character for it to be selected. |
3056 | * be _past_ a character for it to be selected. |
3077 | */ |
3057 | */ |
3078 | if (selection_style != OLD_SELECT) |
|
|
3079 | { |
|
|
3080 | if (((selection.clicks % 3) == 1) && !flag |
3058 | if (((selection.clicks % 3) == 1) && !flag |
3081 | && (col == selection.mark.col |
3059 | && (col == selection.mark.col |
3082 | && (row == selection.mark.row + TermWin.view_start))) |
3060 | && (row == selection.mark.row + TermWin.view_start))) |
3083 | { |
3061 | { |
3084 | /* select nothing */ |
3062 | /* select nothing */ |
3085 | selection.beg.row = selection.end.row = 0; |
3063 | selection.beg.row = selection.end.row = 0; |
3086 | selection.beg.col = selection.end.col = 0; |
3064 | selection.beg.col = selection.end.col = 0; |
3087 | selection.clicks = 4; |
3065 | selection.clicks = 4; |
3088 | want_refresh = 1; |
3066 | want_refresh = 1; |
3089 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
|
|
3090 | return; |
3067 | return; |
3091 | } |
|
|
3092 | } |
3068 | } |
3093 | #endif |
3069 | |
3094 | if (selection.clicks == 4) |
3070 | if (selection.clicks == 4) |
3095 | selection.clicks = 1; |
3071 | selection.clicks = 1; |
3096 | |
3072 | |
3097 | selection_extend_colrow (col, row, !!flag, /* ? button 3 */ |
3073 | selection_extend_colrow (col, row, !!flag, /* ? button 3 */ |
3098 | flag == 1 ? 1 : 0, /* ? button press */ |
3074 | flag == 1 ? 1 : 0, /* ? button press */ |
… | |
… | |
3104 | * Extend the selection to the specified col/row |
3080 | * Extend the selection to the specified col/row |
3105 | */ |
3081 | */ |
3106 | void |
3082 | void |
3107 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3083 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3108 | { |
3084 | { |
3109 | int16_t ncol = TermWin.ncol; |
3085 | int16_t ncol = TermWin.ncol; |
3110 | int end_col; |
3086 | int end_col; |
3111 | row_col_t pos; |
3087 | row_col_t pos; |
3112 | enum { |
3088 | enum { |
3113 | LEFT, RIGHT |
3089 | LEFT, RIGHT |
3114 | } closeto = RIGHT; |
3090 | } closeto = RIGHT; |
3115 | |
|
|
3116 | 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)); |
|
|
3117 | 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)); |
|
|
3118 | |
3091 | |
3119 | want_refresh = 1; |
3092 | want_refresh = 1; |
3120 | switch (selection.op) |
3093 | switch (selection.op) |
3121 | { |
3094 | { |
3122 | case SELECTION_INIT: |
3095 | case SELECTION_INIT: |
… | |
… | |
3144 | && selection.beg.row == selection.end.row |
3117 | && selection.beg.row == selection.end.row |
3145 | && selection.beg.row != selection.mark.row) |
3118 | && selection.beg.row != selection.mark.row) |
3146 | { |
3119 | { |
3147 | selection.beg.col = selection.end.col = selection.mark.col; |
3120 | selection.beg.col = selection.end.col = selection.mark.col; |
3148 | selection.beg.row = selection.end.row = selection.mark.row; |
3121 | selection.beg.row = selection.end.row = selection.mark.row; |
3149 | 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)); |
|
|
3150 | } |
3122 | } |
3151 | |
3123 | |
3152 | pos.col = col; |
3124 | pos.col = col; |
3153 | pos.row = row; |
3125 | pos.row = row; |
3154 | |
3126 | |
3155 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
3127 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
3156 | |
3128 | |
3157 | #ifndef NO_OLD_SELECTION |
|
|
3158 | /* |
|
|
3159 | * This mimics some of the selection behaviour of version 2.20 and before. |
|
|
3160 | * There are no ``selection modes'', button3 is always character extension. |
|
|
3161 | * Note: button3 drag is always available, c.f. v2.20 |
|
|
3162 | * Selection always terminates (left or right as appropriate) at the mark. |
|
|
3163 | */ |
|
|
3164 | if (selection_style == OLD_SELECT) |
|
|
3165 | { |
|
|
3166 | if (selection.clicks == 1 || button3) |
|
|
3167 | { |
|
|
3168 | if (hate_those_clicks) |
|
|
3169 | { |
|
|
3170 | hate_those_clicks = 0; |
|
|
3171 | if (selection.clicks == 1) |
|
|
3172 | { |
|
|
3173 | selection.beg.row = selection.mark.row; |
|
|
3174 | selection.beg.col = selection.mark.col; |
|
|
3175 | } |
|
|
3176 | else |
|
|
3177 | { |
|
|
3178 | selection.mark.row = selection.beg.row; |
|
|
3179 | selection.mark.col = selection.beg.col; |
|
|
3180 | } |
|
|
3181 | } |
|
|
3182 | if (ROWCOL_IS_BEFORE (pos, selection.mark)) |
|
|
3183 | { |
|
|
3184 | selection.end.row = selection.mark.row; |
|
|
3185 | selection.end.col = selection.mark.col + 1; |
|
|
3186 | selection.beg.row = pos.row; |
|
|
3187 | selection.beg.col = pos.col; |
|
|
3188 | } |
|
|
3189 | else |
|
|
3190 | { |
|
|
3191 | selection.beg.row = selection.mark.row; |
|
|
3192 | selection.beg.col = selection.mark.col; |
|
|
3193 | selection.end.row = pos.row; |
|
|
3194 | selection.end.col = pos.col + 1; |
|
|
3195 | } |
|
|
3196 | } |
|
|
3197 | else if (selection.clicks == 2) |
|
|
3198 | { |
|
|
3199 | selection_delimit_word (UP, & (selection.mark), |
|
|
3200 | & (selection.beg)); |
|
|
3201 | selection_delimit_word (DN, & (selection.mark), |
|
|
3202 | & (selection.end)); |
|
|
3203 | hate_those_clicks = 1; |
|
|
3204 | } |
|
|
3205 | else if (selection.clicks == 3) |
|
|
3206 | { |
|
|
3207 | selection.beg.row = selection.end.row = selection.mark.row; |
|
|
3208 | selection.beg.col = 0; |
|
|
3209 | selection.end.col = ncol; |
|
|
3210 | hate_those_clicks = 1; |
|
|
3211 | } |
|
|
3212 | 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)); |
|
|
3213 | return; |
|
|
3214 | } |
|
|
3215 | #endif /* ! NO_OLD_SELECTION */ |
|
|
3216 | #ifndef NO_NEW_SELECTION |
|
|
3217 | /* selection_style must not be OLD_SELECT to get here */ |
|
|
3218 | /* |
3129 | /* |
3219 | * This is mainly xterm style selection with a couple of differences, mainly |
3130 | * This is mainly xterm style selection with a couple of differences, mainly |
3220 | * in the way button3 drag extension works. |
3131 | * in the way button3 drag extension works. |
3221 | * We're either doing: button1 drag; button3 press; or button3 drag |
3132 | * We're either doing: button1 drag; button3 press; or button3 drag |
3222 | * a) button1 drag : select around a midpoint/word/line - that point/word/line |
3133 | * a) button1 drag : select around a midpoint/word/line - that point/word/line |
… | |
… | |
3227 | * a point/word/line which is either the start or end of the selection |
3138 | * a point/word/line which is either the start or end of the selection |
3228 | * and it was decided by whichever point/word/line was `fixed' at the |
3139 | * and it was decided by whichever point/word/line was `fixed' at the |
3229 | * time of the most recent button3 press |
3140 | * time of the most recent button3 press |
3230 | */ |
3141 | */ |
3231 | if (button3 && buttonpress) |
3142 | if (button3 && buttonpress) |
3232 | { /* button3 press */ |
3143 | { /* button3 press */ |
3233 | /* |
3144 | /* |
3234 | * first determine which edge of the selection we are closest to |
3145 | * first determine which edge of the selection we are closest to |
3235 | */ |
3146 | */ |
3236 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3147 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3237 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3148 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3238 | && (((pos.col - selection.beg.col) |
3149 | && (((pos.col - selection.beg.col) |
3239 | + ((pos.row - selection.beg.row) * ncol)) |
3150 | + ((pos.row - selection.beg.row) * ncol)) |
3240 | < ((selection.end.col - pos.col) |
3151 | < ((selection.end.col - pos.col) |
3241 | + ((selection.end.row - pos.row) * ncol))))) |
3152 | + ((selection.end.row - pos.row) * ncol))))) |
3242 | closeto = LEFT; |
3153 | closeto = LEFT; |
|
|
3154 | |
3243 | if (closeto == LEFT) |
3155 | if (closeto == LEFT) |
3244 | { |
3156 | { |
3245 | selection.beg.row = pos.row; |
3157 | selection.beg.row = pos.row; |
3246 | selection.beg.col = pos.col; |
3158 | selection.beg.col = pos.col; |
3247 | selection.mark.row = selection.end.row; |
3159 | selection.mark.row = selection.end.row; |
3248 | selection.mark.col = selection.end.col |
3160 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3249 | - (selection.clicks == 2); |
|
|
3250 | } |
3161 | } |
3251 | else |
3162 | else |
3252 | { |
3163 | { |
3253 | selection.end.row = pos.row; |
3164 | selection.end.row = pos.row; |
3254 | selection.end.col = pos.col; |
3165 | selection.end.col = pos.col; |
3255 | selection.mark.row = selection.beg.row; |
3166 | selection.mark.row = selection.beg.row; |
3256 | selection.mark.col = selection.beg.col; |
3167 | selection.mark.col = selection.beg.col; |
3257 | } |
3168 | } |
3258 | } |
3169 | } |
3259 | else |
3170 | else |
3260 | { /* button1 drag or button3 drag */ |
3171 | { /* button1 drag or button3 drag */ |
3261 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3172 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3262 | { |
3173 | { |
3263 | if ((selection.mark.row == selection.end.row) |
3174 | if ((selection.mark.row == selection.end.row) |
3264 | && (selection.mark.col == selection.end.col) |
3175 | && (selection.mark.col == selection.end.col) |
3265 | && clickchange && selection.clicks == 2) |
3176 | && clickchange && selection.clicks == 2) |
3266 | selection.mark.col--; |
3177 | selection.mark.col--; |
|
|
3178 | |
3267 | selection.beg.row = pos.row; |
3179 | selection.beg.row = pos.row; |
3268 | selection.beg.col = pos.col; |
3180 | selection.beg.col = pos.col; |
3269 | selection.end.row = selection.mark.row; |
3181 | selection.end.row = selection.mark.row; |
3270 | selection.end.col = selection.mark.col |
3182 | selection.end.col = selection.mark.col + (selection.clicks == 2); |
3271 | + (selection.clicks == 2); |
|
|
3272 | } |
3183 | } |
3273 | else |
3184 | else |
3274 | { |
3185 | { |
3275 | selection.beg.row = selection.mark.row; |
3186 | selection.beg.row = selection.mark.row; |
3276 | selection.beg.col = selection.mark.col; |
3187 | selection.beg.col = selection.mark.col; |
… | |
… | |
3280 | } |
3191 | } |
3281 | |
3192 | |
3282 | if (selection.clicks == 1) |
3193 | if (selection.clicks == 1) |
3283 | { |
3194 | { |
3284 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3195 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
|
|
3196 | |
3285 | if (end_col != -1 && selection.beg.col > end_col) |
3197 | if (end_col != -1 && selection.beg.col > end_col) |
3286 | { |
3198 | { |
3287 | #if 1 |
3199 | #if 1 |
3288 | selection.beg.col = ncol; |
3200 | selection.beg.col = ncol; |
3289 | #else |
3201 | #else |
3290 | if (selection.beg.row != selection.end.row) |
3202 | if (selection.beg.row != selection.end.row) |
3291 | selection.beg.col = ncol; |
3203 | selection.beg.col = ncol; |
3292 | else |
3204 | else |
3293 | selection.beg.col = selection.mark.col; |
3205 | selection.beg.col = selection.mark.col; |
3294 | #endif |
3206 | #endif |
3295 | |
|
|
3296 | } |
3207 | } |
|
|
3208 | |
3297 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
3209 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
|
|
3210 | |
3298 | if (end_col != -1 && selection.end.col > end_col) |
3211 | if (end_col != -1 && selection.end.col > end_col) |
3299 | selection.end.col = ncol; |
3212 | selection.end.col = ncol; |
3300 | |
|
|
3301 | } |
3213 | } |
3302 | else if (selection.clicks == 2) |
3214 | else if (selection.clicks == 2) |
3303 | { |
3215 | { |
3304 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3216 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3305 | selection.end.col--; |
3217 | selection.end.col--; |
|
|
3218 | |
3306 | selection_delimit_word (UP, & (selection.beg), |
3219 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3307 | & (selection.beg)); |
|
|
3308 | selection_delimit_word (DN, & (selection.end), |
3220 | selection_delimit_word (DN, & (selection.end), & (selection.end)); |
3309 | & (selection.end)); |
|
|
3310 | } |
3221 | } |
3311 | else if (selection.clicks == 3) |
3222 | else if (selection.clicks == 3) |
3312 | { |
3223 | { |
3313 | #ifndef NO_FRILLS |
3224 | #if ENABLE_FRILLS |
3314 | if ((Options & Opt_tripleclickwords)) |
3225 | if ((options & Opt_tripleclickwords)) |
3315 | { |
3226 | { |
3316 | int end_row; |
3227 | int end_row; |
3317 | |
3228 | |
3318 | selection_delimit_word (UP, & (selection.beg), |
3229 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3319 | & (selection.beg)); |
|
|
3320 | end_row = screen.tlen[selection.mark.row |
3230 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3321 | + TermWin.saveLines]; |
3231 | |
3322 | for (end_row = selection.mark.row; end_row < TermWin.nrow; |
3232 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3323 | end_row++) |
|
|
3324 | { |
3233 | { |
3325 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
3234 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
|
|
3235 | |
3326 | if (end_col != -1) |
3236 | if (end_col != -1) |
3327 | { |
3237 | { |
3328 | selection.end.row = end_row; |
3238 | selection.end.row = end_row; |
3329 | selection.end.col = end_col; |
3239 | selection.end.col = end_col; |
3330 | selection_remove_trailing_spaces (); |
3240 | selection_remove_trailing_spaces (); |
… | |
… | |
3332 | } |
3242 | } |
3333 | } |
3243 | } |
3334 | } |
3244 | } |
3335 | else |
3245 | else |
3336 | #endif |
3246 | #endif |
3337 | |
|
|
3338 | { |
3247 | { |
3339 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3248 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3340 | selection.mark.col++; |
3249 | selection.mark.col++; |
3341 | selection.beg.col = 0; |
3250 | selection.beg.col = 0; |
3342 | selection.end.col = ncol; |
3251 | selection.end.col = ncol; |
3343 | } |
3252 | } |
3344 | } |
3253 | } |
|
|
3254 | |
3345 | if (button3 && buttonpress) |
3255 | if (button3 && buttonpress) |
3346 | { /* mark may need to be changed */ |
3256 | { /* mark may need to be changed */ |
3347 | if (closeto == LEFT) |
3257 | if (closeto == LEFT) |
3348 | { |
3258 | { |
3349 | selection.mark.row = selection.end.row; |
3259 | selection.mark.row = selection.end.row; |
3350 | selection.mark.col = selection.end.col |
3260 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3351 | - (selection.clicks == 2); |
|
|
3352 | } |
3261 | } |
3353 | else |
3262 | else |
3354 | { |
3263 | { |
3355 | selection.mark.row = selection.beg.row; |
3264 | selection.mark.row = selection.beg.row; |
3356 | selection.mark.col = selection.beg.col; |
3265 | selection.mark.col = selection.beg.col; |
3357 | } |
3266 | } |
3358 | } |
3267 | } |
3359 | 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)); |
|
|
3360 | #endif /* ! NO_NEW_SELECTION */ |
|
|
3361 | } |
3268 | } |
3362 | |
3269 | |
3363 | #ifndef NO_FRILLS |
3270 | #if ENABLE_FRILLS |
3364 | void |
3271 | void |
3365 | rxvt_term::selection_remove_trailing_spaces () |
3272 | rxvt_term::selection_remove_trailing_spaces () |
3366 | { |
3273 | { |
3367 | int32_t end_col, end_row; |
3274 | int32_t end_col, end_row; |
3368 | text_t *stp; |
3275 | text_t *stp; |
… | |
… | |
3457 | (8 * sizeof (target_list[0])), PropModeReplace, |
3364 | (8 * sizeof (target_list[0])), PropModeReplace, |
3458 | (unsigned char *)target_list, |
3365 | (unsigned char *)target_list, |
3459 | target - target_list); |
3366 | target - target_list); |
3460 | ev.property = rq.property; |
3367 | ev.property = rq.property; |
3461 | } |
3368 | } |
|
|
3369 | #if TODO // TODO |
3462 | else if (rq.target == xa[XA_MULTIPLE]) |
3370 | else if (rq.target == xa[XA_MULTIPLE]) |
3463 | { |
3371 | { |
3464 | /* TODO: Handle MULTIPLE */ |
3372 | /* TODO: Handle MULTIPLE */ |
3465 | } |
3373 | } |
|
|
3374 | #endif |
3466 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3375 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3467 | { |
3376 | { |
3468 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3377 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3469 | (8 * sizeof (Time)), PropModeReplace, |
3378 | (8 * sizeof (Time)), PropModeReplace, |
3470 | (unsigned char *)&selection_time, 1); |
3379 | (unsigned char *)&selection_time, 1); |
3471 | ev.property = rq.property; |
3380 | ev.property = rq.property; |
3472 | } |
3381 | } |
3473 | else if (rq.target == XA_STRING |
3382 | else if (rq.target == XA_STRING |
3474 | || rq.target == xa[XA_TEXT] |
3383 | || rq.target == xa[XA_TEXT] |
3475 | || rq.target == xa[XA_COMPOUND_TEXT] |
3384 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3551 | } |
3460 | } |
3552 | |
3461 | |
3553 | /* ------------------------------------------------------------------------- */ |
3462 | /* ------------------------------------------------------------------------- */ |
3554 | #ifdef USE_XIM |
3463 | #ifdef USE_XIM |
3555 | void |
3464 | void |
3556 | rxvt_term::im_set_position (XPoint *pos) |
3465 | rxvt_term::im_set_position (XPoint &pos) |
3557 | { |
3466 | { |
3558 | XWindowAttributes xwa; |
3467 | XWindowAttributes xwa; |
3559 | |
3468 | |
3560 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
3469 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
|
|
3470 | |
3561 | pos->x = Col2Pixel (screen.cur.col) + xwa.x; |
3471 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3562 | pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; |
3472 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; |
3563 | } |
3473 | } |
3564 | |
|
|
3565 | #endif |
3474 | #endif |
3566 | /* ------------------------------------------------------------------------- */ |
3475 | |
3567 | |
3476 | #if ENABLE_OVERLAY |
|
|
3477 | void |
|
|
3478 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
|
|
3479 | { |
|
|
3480 | if (TermWin.nrow < 3 || TermWin.ncol < 3) |
|
|
3481 | return; |
|
|
3482 | |
|
|
3483 | want_refresh = 1; |
|
|
3484 | |
|
|
3485 | scr_overlay_off (); |
|
|
3486 | |
|
|
3487 | if (x < 0) x = TermWin.ncol - w; |
|
|
3488 | if (y < 0) y = TermWin.nrow - h; |
|
|
3489 | |
|
|
3490 | // make space for border |
|
|
3491 | w += 2; MIN_IT (w, TermWin.ncol); |
|
|
3492 | h += 2; MIN_IT (h, TermWin.nrow); |
|
|
3493 | |
|
|
3494 | x -= 1; MAX_IT (x, 0); |
|
|
3495 | y -= 1; MAX_IT (y, 0); |
|
|
3496 | |
|
|
3497 | MIN_IT (x, TermWin.ncol - w); |
|
|
3498 | MIN_IT (y, TermWin.nrow - h); |
|
|
3499 | |
|
|
3500 | ov_x = x; ov_y = y; |
|
|
3501 | ov_w = w; ov_h = h; |
|
|
3502 | |
|
|
3503 | ov_text = new text_t *[h]; |
|
|
3504 | ov_rend = new rend_t *[h]; |
|
|
3505 | |
|
|
3506 | for (y = 0; y < h; y++) |
|
|
3507 | { |
|
|
3508 | text_t *tp = ov_text[y] = new text_t[w]; |
|
|
3509 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
|
|
3510 | |
|
|
3511 | text_t t0, t1, t2; |
|
|
3512 | rend_t r = SET_BGCOLOR (SET_FGCOLOR (RS_None, Color_bg), Color_fg); |
|
|
3513 | |
|
|
3514 | if (y == 0) |
|
|
3515 | t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; |
|
|
3516 | else if (y < h - 1) |
|
|
3517 | t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; |
|
|
3518 | else |
|
|
3519 | t0 = 0x255a, t1 = 0x2550, t2 = 0x255d; |
|
|
3520 | |
|
|
3521 | *tp++ = t0; |
|
|
3522 | *rp++ = r; |
|
|
3523 | |
|
|
3524 | for (x = w - 2; x > 0; --x) |
|
|
3525 | { |
|
|
3526 | *tp++ = t1; |
|
|
3527 | *rp++ = r; |
|
|
3528 | } |
|
|
3529 | |
|
|
3530 | *tp = t2; |
|
|
3531 | *rp = r; |
|
|
3532 | } |
|
|
3533 | } |
|
|
3534 | |
|
|
3535 | void |
|
|
3536 | rxvt_term::scr_overlay_off () |
|
|
3537 | { |
|
|
3538 | if (!ov_text) |
|
|
3539 | return; |
|
|
3540 | |
|
|
3541 | want_refresh = 1; |
|
|
3542 | |
|
|
3543 | for (int y = 0; y < ov_h; y++) |
|
|
3544 | { |
|
|
3545 | delete [] ov_text[y]; |
|
|
3546 | delete [] ov_rend[y]; |
|
|
3547 | } |
|
|
3548 | |
|
|
3549 | delete [] ov_text; ov_text = 0; |
|
|
3550 | delete [] ov_rend; ov_rend = 0; |
|
|
3551 | } |
|
|
3552 | |
|
|
3553 | void |
|
|
3554 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) |
|
|
3555 | { |
|
|
3556 | if (!ov_text || x >= ov_w - 2 || y >= ov_h) |
|
|
3557 | return; |
|
|
3558 | |
|
|
3559 | x++, y++; |
|
|
3560 | |
|
|
3561 | ov_text[y][x] = text; |
|
|
3562 | ov_rend[y][x] = rend; |
|
|
3563 | } |
|
|
3564 | |
|
|
3565 | void |
|
|
3566 | rxvt_term::scr_overlay_set (int x, int y, const char *s) |
|
|
3567 | { |
|
|
3568 | while (*s) |
|
|
3569 | scr_overlay_set (x++, y, *s++); |
|
|
3570 | } |
|
|
3571 | |
|
|
3572 | void |
|
|
3573 | rxvt_term::scr_swap_overlay () |
|
|
3574 | { |
|
|
3575 | if (!ov_text) |
|
|
3576 | return; |
|
|
3577 | |
|
|
3578 | int row_offset = ov_y + TermWin.saveLines - TermWin.view_start; |
|
|
3579 | |
|
|
3580 | // swap screen mem with overlay |
|
|
3581 | for (int y = ov_h; y--; ) |
|
|
3582 | { |
|
|
3583 | text_t *t1 = ov_text[y]; |
|
|
3584 | rend_t *r1 = ov_rend[y]; |
|
|
3585 | |
|
|
3586 | text_t *t2 = screen.text[y + row_offset] + ov_x; |
|
|
3587 | rend_t *r2 = screen.rend[y + row_offset] + ov_x; |
|
|
3588 | |
|
|
3589 | for (int x = ov_w; x--; ) |
|
|
3590 | { |
|
|
3591 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
|
|
3592 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, TermWin.fontset->find_font (t, false)); |
|
|
3593 | } |
|
|
3594 | } |
|
|
3595 | } |
|
|
3596 | |
|
|
3597 | #endif |
3568 | /* ------------------------------------------------------------------------- * |
3598 | /* ------------------------------------------------------------------------- */ |
3569 | * DEBUG ROUTINES * |
|
|
3570 | * ------------------------------------------------------------------------- */ |
|
|
3571 | #if 0 |
|
|
3572 | void |
|
|
3573 | rxvt_debug_colors (void) |
|
|
3574 | { |
|
|
3575 | int color; |
|
|
3576 | const char *name[] = |
|
|
3577 | { |
|
|
3578 | "fg", "bg", |
|
|
3579 | "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" |
|
|
3580 | }; |
|
|
3581 | |
|
|
3582 | fprintf (stderr, "Color ( "); |
|
|
3583 | if (rstyle & RS_RVid) |
|
|
3584 | fprintf (stderr, "rvid "); |
|
|
3585 | if (rstyle & RS_Bold) |
|
|
3586 | fprintf (stderr, "bold "); |
|
|
3587 | if (rstyle & RS_Blink) |
|
|
3588 | fprintf (stderr, "blink "); |
|
|
3589 | if (rstyle & RS_Uline) |
|
|
3590 | fprintf (stderr, "uline "); |
|
|
3591 | fprintf (stderr, "): "); |
|
|
3592 | |
|
|
3593 | color = GET_FGCOLOR (rstyle); |
|
|
3594 | #ifndef NO_BRIGHTCOLOR |
|
|
3595 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
|
|
3596 | { |
|
|
3597 | color -= (minBrightCOLOR - minCOLOR); |
|
|
3598 | fprintf (stderr, "bright "); |
|
|
3599 | } |
|
|
3600 | #endif |
|
|
3601 | fprintf (stderr, "%s on ", name[color]); |
|
|
3602 | |
|
|
3603 | color = GET_BGCOLOR (rstyle); |
|
|
3604 | #ifndef NO_BRIGHTCOLOR |
|
|
3605 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
|
|
3606 | { |
|
|
3607 | color -= (minBrightCOLOR - minCOLOR); |
|
|
3608 | fprintf (stderr, "bright "); |
|
|
3609 | } |
|
|
3610 | #endif |
|
|
3611 | fprintf (stderr, "%s\n", name[color]); |
|
|
3612 | } |
|
|
3613 | #endif |
|
|