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 | |
… | |
… | |
470 | * Hard reset |
480 | * Hard reset |
471 | */ |
481 | */ |
472 | void |
482 | void |
473 | rxvt_term::scr_poweron () |
483 | rxvt_term::scr_poweron () |
474 | { |
484 | { |
475 | D_SCREEN ((stderr, "rxvt_scr_poweron ()")); |
|
|
476 | |
|
|
477 | scr_release (); |
485 | scr_release (); |
478 | prev_nrow = prev_ncol = 0; |
486 | prev_nrow = prev_ncol = 0; |
479 | scr_reset (); |
487 | scr_reset (); |
480 | |
488 | |
481 | scr_clear (); |
489 | scr_clear (true); |
482 | scr_refresh (SLOW_REFRESH); |
490 | scr_refresh (SLOW_REFRESH); |
483 | } |
491 | } |
484 | |
492 | |
485 | /* ------------------------------------------------------------------------- * |
493 | /* ------------------------------------------------------------------------- * |
486 | * PROCESS SCREEN COMMANDS * |
494 | * PROCESS SCREEN COMMANDS * |
… | |
… | |
492 | */ |
500 | */ |
493 | void |
501 | void |
494 | rxvt_term::scr_cursor (int mode) |
502 | rxvt_term::scr_cursor (int mode) |
495 | { |
503 | { |
496 | screen_t *s; |
504 | screen_t *s; |
497 | |
|
|
498 | D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); |
|
|
499 | |
505 | |
500 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
506 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
501 | if (current_screen == SECONDARY) |
507 | if (current_screen == SECONDARY) |
502 | s = &swap; |
508 | s = &swap; |
503 | else |
509 | else |
… | |
… | |
511 | s->s_cur.col = s->cur.col; |
517 | s->s_cur.col = s->cur.col; |
512 | s->s_rstyle = rstyle; |
518 | s->s_rstyle = rstyle; |
513 | s->s_charset = s->charset; |
519 | s->s_charset = s->charset; |
514 | s->s_charset_char = charsets[s->charset]; |
520 | s->s_charset_char = charsets[s->charset]; |
515 | break; |
521 | break; |
|
|
522 | |
516 | case RESTORE: |
523 | case RESTORE: |
517 | want_refresh = 1; |
524 | want_refresh = 1; |
518 | s->cur.row = s->s_cur.row; |
525 | s->cur.row = s->s_cur.row; |
519 | s->cur.col = s->s_cur.col; |
526 | s->cur.col = s->s_cur.col; |
520 | s->flags &= ~Screen_WrapNext; |
527 | s->flags &= ~Screen_WrapNext; |
… | |
… | |
551 | int offset; |
558 | int offset; |
552 | #endif |
559 | #endif |
553 | |
560 | |
554 | want_refresh = 1; |
561 | want_refresh = 1; |
555 | |
562 | |
556 | D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); |
|
|
557 | |
|
|
558 | TermWin.view_start = 0; |
563 | TermWin.view_start = 0; |
559 | |
564 | |
560 | if (current_screen == scrn) |
565 | if (current_screen == scrn) |
561 | return scrn; |
566 | return scrn; |
562 | |
567 | |
563 | selection_check (2); /* check for boundary cross */ |
568 | selection_check (2); /* check for boundary cross */ |
564 | |
569 | |
565 | SWAP_IT (current_screen, scrn, int); |
570 | SWAP_IT (current_screen, scrn, int); |
566 | #if NSCREENS |
571 | #if NSCREENS |
567 | if (Options & Opt_secondaryScreen) |
572 | if (options & Opt_secondaryScreen) |
568 | { |
573 | { |
569 | num_scr = 0; |
574 | num_scr = 0; |
570 | offset = TermWin.saveLines; |
575 | offset = TermWin.saveLines; |
571 | for (i = prev_nrow; i--;) |
576 | for (i = prev_nrow; i--;) |
572 | { |
577 | { |
… | |
… | |
590 | screen.flags |= Screen_VisibleCursor; |
595 | screen.flags |= Screen_VisibleCursor; |
591 | swap.flags |= Screen_VisibleCursor; |
596 | swap.flags |= Screen_VisibleCursor; |
592 | } |
597 | } |
593 | else |
598 | else |
594 | #endif |
599 | #endif |
595 | if (Options & Opt_secondaryScroll) |
600 | if (options & Opt_secondaryScroll) |
596 | //if (current_screen == PRIMARY) |
601 | //if (current_screen == PRIMARY) |
597 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
602 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
598 | 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++; |
599 | } |
621 | } |
600 | |
622 | |
601 | /* ------------------------------------------------------------------------- */ |
623 | /* ------------------------------------------------------------------------- */ |
602 | /* |
624 | /* |
603 | * Change the colour for following text |
625 | * Change the colour for following text |
… | |
… | |
642 | |
664 | |
643 | if (count == 0 || (row1 > row2)) |
665 | if (count == 0 || (row1 > row2)) |
644 | return 0; |
666 | return 0; |
645 | |
667 | |
646 | want_refresh = 1; |
668 | want_refresh = 1; |
647 | D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); |
|
|
648 | |
669 | |
649 | if (row1 == 0 && count > 0 |
670 | if (row1 == 0 && count > 0 |
650 | && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) |
671 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
651 | { |
672 | { |
652 | nscrolled = (long)TermWin.nscrolled + (long)count; |
673 | nscrolled = (long)TermWin.nscrolled + (long)count; |
653 | |
674 | |
654 | if (nscrolled > (long)TermWin.saveLines) |
675 | if (nscrolled > (long)TermWin.saveLines) |
655 | TermWin.nscrolled = TermWin.saveLines; |
676 | TermWin.nscrolled = TermWin.saveLines; |
656 | else |
677 | else |
657 | TermWin.nscrolled = (uint16_t)nscrolled; |
678 | TermWin.nscrolled = (uint16_t)nscrolled; |
658 | |
679 | |
659 | if ((Options & Opt_scrollWithBuffer) |
680 | if ((options & Opt_scrollWithBuffer) |
660 | && TermWin.view_start != 0 |
681 | && TermWin.view_start != 0 |
661 | && TermWin.view_start != TermWin.saveLines) |
682 | && TermWin.view_start != TermWin.saveLines) |
662 | scr_page (UP, count); |
683 | scr_page (UP, count); |
663 | } |
684 | } |
664 | else if (!spec) |
685 | else if (!spec) |
… | |
… | |
703 | if (j > 0) |
724 | if (j > 0) |
704 | { |
725 | { |
705 | /* A: scroll up */ |
726 | /* A: scroll up */ |
706 | |
727 | |
707 | /* 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 */ |
708 | for (i = 0, j = row1; i < count; i++, j++) |
745 | for (i = 0, j = row2; i < count; i++, j--) |
709 | { |
746 | { |
710 | buf_text[i] = screen.text[j]; |
747 | buf_text[i] = screen.text[j]; |
711 | buf_rend[i] = screen.rend[j]; |
748 | buf_rend[i] = screen.rend[j]; |
712 | } |
749 | } |
|
|
750 | |
713 | /* A2: Rotate lines */ |
751 | /* B2: Rotate lines */ |
714 | for (j = row1, i = j + count; i <= row2; i++, j++) |
752 | for (j = row2, i = j - count; i >= row1; i--, j--) |
715 | { |
753 | { |
716 | screen.tlen[j] = screen.tlen[i]; |
754 | screen.tlen[j] = screen.tlen[i]; |
717 | screen.text[j] = screen.text[i]; |
755 | screen.text[j] = screen.text[i]; |
718 | screen.rend[j] = screen.rend[i]; |
756 | screen.rend[j] = screen.rend[i]; |
719 | } |
757 | } |
720 | j = row2 - count + 1, i = count; |
|
|
721 | } |
|
|
722 | else /* if (j < 0) */ |
|
|
723 | { |
|
|
724 | /* B: scroll down */ |
|
|
725 | |
758 | |
726 | /* B1: Copy lines that will get clobbered by the rotation */ |
|
|
727 | for (i = 0, j = row2; i < count; i++, j--) |
|
|
728 | { |
|
|
729 | buf_text[i] = screen.text[j]; |
|
|
730 | buf_rend[i] = screen.rend[j]; |
|
|
731 | } |
|
|
732 | /* B2: Rotate lines */ |
|
|
733 | for (j = row2, i = j - count; i >= row1; i--, j--) |
|
|
734 | { |
|
|
735 | screen.tlen[j] = screen.tlen[i]; |
|
|
736 | screen.text[j] = screen.text[i]; |
|
|
737 | screen.rend[j] = screen.rend[i]; |
|
|
738 | } |
|
|
739 | j = row1, i = count; |
759 | j = row1, i = count; |
740 | count = -count; |
760 | count = -count; |
741 | } |
761 | } |
742 | |
762 | |
743 | /* 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 */ |
744 | for (; i--; j++) |
768 | for (; i--; j++) |
745 | { |
|
|
746 | screen.tlen[j] = 0; |
|
|
747 | screen.text[j] = buf_text[i]; |
|
|
748 | screen.rend[j] = buf_rend[i]; |
|
|
749 | |
|
|
750 | if (!spec) /* line length may not equal TermWin.ncol */ |
|
|
751 | scr_blank_screen_mem (screen.text, screen.rend, |
769 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); |
752 | (unsigned int)j, rstyle); |
|
|
753 | } |
|
|
754 | |
770 | |
755 | return count; |
771 | return count; |
756 | } |
772 | } |
757 | |
773 | |
758 | /* ------------------------------------------------------------------------- */ |
774 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
760 | * Add text given in <str> of length <len> to screen struct |
776 | * Add text given in <str> of length <len> to screen struct |
761 | */ |
777 | */ |
762 | void |
778 | void |
763 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
779 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
764 | { |
780 | { |
765 | unsigned char checksel, clearsel; |
781 | unsigned char checksel; |
766 | unicode_t c; |
782 | unicode_t c; |
767 | int i, row, last_col; |
783 | int i, row, last_col; |
768 | text_t *stp; |
784 | text_t *stp; |
769 | rend_t *srp; |
785 | rend_t *srp; |
770 | |
786 | |
771 | if (len <= 0) /* sanity */ |
787 | if (len <= 0) /* sanity */ |
772 | return; |
788 | return; |
773 | |
789 | |
774 | want_refresh = 1; |
790 | want_refresh = 1; |
|
|
791 | ZERO_SCROLLBACK (); |
775 | last_col = TermWin.ncol; |
792 | last_col = TermWin.ncol; |
776 | |
793 | |
777 | D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); |
|
|
778 | ZERO_SCROLLBACK (); |
|
|
779 | if (nlines > 0) |
794 | if (nlines > 0) |
780 | { |
795 | { |
781 | nlines += (screen.cur.row - screen.bscroll); |
796 | nlines += screen.cur.row - screen.bscroll; |
782 | if ((nlines > 0) |
797 | if ((nlines > 0) |
783 | && (screen.tscroll == 0) |
798 | && (screen.tscroll == 0) |
784 | && (screen.bscroll == (TermWin.nrow - 1))) |
799 | && (screen.bscroll == (TermWin.nrow - 1))) |
785 | { |
800 | { |
786 | /* _at least_ this many lines need to be scrolled */ |
801 | /* _at least_ this many lines need to be scrolled */ |
787 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
802 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
788 | screen.cur.row -= nlines; |
803 | screen.cur.row -= nlines; |
789 | } |
804 | } |
790 | } |
805 | } |
|
|
806 | |
791 | #ifdef DEBUG_STRICT |
807 | #ifdef DEBUG_STRICT |
792 | assert (screen.cur.col < last_col); |
808 | assert (screen.cur.col < last_col); |
793 | assert ((screen.cur.row < TermWin.nrow) |
809 | assert ((screen.cur.row < TermWin.nrow) |
794 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
810 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
795 | #else /* drive with your eyes closed */ |
811 | #else /* drive with your eyes closed */ |
796 | MIN_IT (screen.cur.col, last_col - 1); |
812 | MIN_IT (screen.cur.col, last_col - 1); |
797 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
813 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
798 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
814 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
799 | #endif |
815 | #endif |
800 | row = screen.cur.row + TermWin.saveLines; |
816 | row = screen.cur.row + TermWin.saveLines; |
801 | |
817 | |
802 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
818 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
803 | clearsel = 0; |
|
|
804 | |
819 | |
805 | stp = screen.text[row]; |
820 | stp = screen.text[row]; |
806 | srp = screen.rend[row]; |
821 | srp = screen.rend[row]; |
807 | |
822 | |
808 | while (len--) |
823 | while (len--) |
… | |
… | |
810 | c = *str++; |
825 | c = *str++; |
811 | |
826 | |
812 | if (c < 0x20) |
827 | if (c < 0x20) |
813 | switch (c) |
828 | switch (c) |
814 | { |
829 | { |
815 | case '\t': |
830 | case C0_HT: |
816 | scr_tab (1); |
831 | scr_tab (1); |
817 | continue; |
832 | continue; |
818 | |
833 | |
819 | case '\n': |
834 | case C0_LF: |
820 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
835 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
821 | MAX_IT (screen.tlen[row], screen.cur.col); |
836 | MAX_IT (screen.tlen[row], screen.cur.col); |
822 | |
837 | |
823 | screen.flags &= ~Screen_WrapNext; |
838 | screen.flags &= ~Screen_WrapNext; |
824 | |
839 | |
… | |
… | |
829 | |
844 | |
830 | stp = screen.text[row]; /* _must_ refresh */ |
845 | stp = screen.text[row]; /* _must_ refresh */ |
831 | srp = screen.rend[row]; /* _must_ refresh */ |
846 | srp = screen.rend[row]; /* _must_ refresh */ |
832 | continue; |
847 | continue; |
833 | |
848 | |
834 | case '\r': |
849 | case C0_CR: |
835 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
850 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
836 | MAX_IT (screen.tlen[row], screen.cur.col); |
851 | MAX_IT (screen.tlen[row], screen.cur.col); |
837 | |
852 | |
838 | screen.flags &= ~Screen_WrapNext; |
853 | screen.flags &= ~Screen_WrapNext; |
839 | screen.cur.col = 0; |
854 | screen.cur.col = 0; |
… | |
… | |
843 | if (checksel /* see if we're writing within selection */ |
858 | if (checksel /* see if we're writing within selection */ |
844 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
859 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
845 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
860 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
846 | { |
861 | { |
847 | checksel = 0; |
862 | checksel = 0; |
848 | 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 (); |
849 | } |
869 | } |
850 | |
870 | |
851 | if (screen.flags & Screen_WrapNext) |
871 | if (screen.flags & Screen_WrapNext) |
852 | { |
872 | { |
853 | screen.tlen[row] = -1; |
873 | screen.tlen[row] = -1; |
854 | if (screen.cur.row == screen.bscroll) |
874 | |
855 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
856 | else if (screen.cur.row < (TermWin.nrow - 1)) |
|
|
857 | row = (++screen.cur.row) + TermWin.saveLines; |
875 | scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; |
858 | |
876 | |
859 | stp = screen.text[row]; /* _must_ refresh */ |
877 | stp = screen.text[row]; /* _must_ refresh */ |
860 | srp = screen.rend[row]; /* _must_ refresh */ |
878 | srp = screen.rend[row]; /* _must_ refresh */ |
861 | screen.cur.col = 0; |
|
|
862 | screen.flags &= ~Screen_WrapNext; |
|
|
863 | } |
879 | } |
864 | |
880 | |
865 | if (screen.flags & Screen_Insert) |
881 | if (screen.flags & Screen_Insert) |
866 | scr_insdel_chars (1, INSERT); |
882 | scr_insdel_chars (1, INSERT); |
867 | |
883 | |
868 | // 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 |
869 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
885 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
870 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
886 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
871 | int width = c < 256 ? 1 : wcwidth (c); |
887 | int width = c < 0x100 ? 1 : wcwidth (c); |
872 | |
888 | |
873 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
889 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
874 | { |
890 | { |
875 | // vt100 special graphics and line drawing |
891 | // vt100 special graphics and line drawing |
876 | static uint16_t vt100_0[32] = { // 5f .. 7e |
892 | static uint16_t vt100_0[32] = { // 5f .. 7e |
… | |
… | |
885 | c = vt100_0[c - 0x5f]; |
901 | c = vt100_0[c - 0x5f]; |
886 | width = 1; |
902 | width = 1; |
887 | } |
903 | } |
888 | } |
904 | } |
889 | |
905 | |
890 | if (width > 0) |
906 | if (width != 0) |
891 | { |
907 | { |
892 | #if !UNICODE_3 && ENABLE_COMBINING |
908 | #if !UNICODE_3 |
893 | // trim characters we can't store directly :( |
909 | // trim characters we can't store directly :( |
894 | if (c >= 0x10000) |
910 | if (c >= 0x10000) |
|
|
911 | # if ENABLE_COMBINING |
895 | 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; |
896 | #endif |
915 | # endif |
897 | 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]); |
898 | |
922 | |
899 | do |
923 | do |
900 | { |
924 | { |
901 | stp[screen.cur.col] = c; |
925 | stp[screen.cur.col] = c; |
902 | srp[screen.cur.col] = rend; |
926 | srp[screen.cur.col] = rend; |
… | |
… | |
963 | } |
987 | } |
964 | |
988 | |
965 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
989 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
966 | MAX_IT (screen.tlen[row], screen.cur.col); |
990 | MAX_IT (screen.tlen[row], screen.cur.col); |
967 | |
991 | |
968 | /* |
|
|
969 | * If we wrote anywhere in the selected area, kill the selection |
|
|
970 | * XXX: should we kill the mark too? Possibly, but maybe that |
|
|
971 | * should be a similar check. |
|
|
972 | */ |
|
|
973 | if (clearsel) |
|
|
974 | CLEAR_SELECTION (); |
|
|
975 | |
|
|
976 | #ifdef DEBUG_STRICT |
992 | #ifdef DEBUG_STRICT |
977 | assert (screen.cur.row >= 0); |
993 | assert (screen.cur.row >= 0); |
978 | #else /* drive with your eyes closed */ |
994 | #else /* drive with your eyes closed */ |
979 | MAX_IT (screen.cur.row, 0); |
995 | MAX_IT (screen.cur.row, 0); |
980 | #endif |
996 | #endif |
… | |
… | |
987 | */ |
1003 | */ |
988 | void |
1004 | void |
989 | rxvt_term::scr_backspace () |
1005 | rxvt_term::scr_backspace () |
990 | { |
1006 | { |
991 | want_refresh = 1; |
1007 | want_refresh = 1; |
|
|
1008 | |
992 | if (screen.cur.col == 0) |
1009 | if (screen.cur.col == 0) |
993 | { |
1010 | { |
994 | if (screen.cur.row > 0) |
1011 | if (screen.cur.row > 0) |
995 | { |
1012 | { |
996 | #ifdef TERMCAP_HAS_BW |
1013 | #ifdef TERMCAP_HAS_BW |
997 | screen.cur.col = TermWin.ncol - 1; |
1014 | screen.cur.col = TermWin.ncol - 1; |
998 | screen.cur.row--; |
1015 | screen.cur.row--; |
999 | return; |
1016 | return; |
1000 | #endif |
1017 | #endif |
1001 | |
|
|
1002 | } |
1018 | } |
1003 | } |
1019 | } |
1004 | else if ((screen.flags & Screen_WrapNext) == 0) |
1020 | else if (!(screen.flags & Screen_WrapNext)) |
1005 | scr_gotorc (0, -1, RELATIVE); |
1021 | scr_gotorc (0, -1, RELATIVE); |
|
|
1022 | |
1006 | screen.flags &= ~Screen_WrapNext; |
1023 | screen.flags &= ~Screen_WrapNext; |
1007 | } |
1024 | } |
1008 | |
1025 | |
1009 | /* ------------------------------------------------------------------------- */ |
1026 | /* ------------------------------------------------------------------------- */ |
1010 | /* |
1027 | /* |
… | |
… | |
1015 | void |
1032 | void |
1016 | rxvt_term::scr_tab (int count) |
1033 | rxvt_term::scr_tab (int count) |
1017 | { |
1034 | { |
1018 | int i, x; |
1035 | int i, x; |
1019 | |
1036 | |
1020 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
|
|
1021 | want_refresh = 1; |
1037 | want_refresh = 1; |
1022 | i = x = screen.cur.col; |
1038 | i = x = screen.cur.col; |
1023 | |
1039 | |
1024 | if (count == 0) |
1040 | if (count == 0) |
1025 | return; |
1041 | return; |
… | |
… | |
1059 | * Process DEC Back Index |
1075 | * Process DEC Back Index |
1060 | * XTERM_SEQ: ESC 6 |
1076 | * XTERM_SEQ: ESC 6 |
1061 | * 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 |
1062 | * in that row right. Clear left column. |
1078 | * in that row right. Clear left column. |
1063 | */ |
1079 | */ |
1064 | #ifndef NO_FRILLS |
1080 | #if ENABLE_FRILLS |
1065 | void |
1081 | void |
1066 | rxvt_term::scr_backindex () |
1082 | rxvt_term::scr_backindex () |
1067 | { |
1083 | { |
1068 | if (screen.cur.col > 0) |
1084 | if (screen.cur.col > 0) |
1069 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1085 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1070 | else |
1086 | else |
1071 | { |
1087 | { |
1072 | if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) |
1088 | if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) |
1073 | return; /* um, yeah? */ |
1089 | return; /* um, yeah? */ |
|
|
1090 | |
1074 | scr_insdel_chars (1, INSERT); |
1091 | scr_insdel_chars (1, INSERT); |
1075 | } |
1092 | } |
1076 | } |
1093 | } |
1077 | #endif |
1094 | #endif |
1078 | /* ------------------------------------------------------------------------- */ |
1095 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1080 | * Process DEC Forward Index |
1097 | * Process DEC Forward Index |
1081 | * XTERM_SEQ: ESC 9 |
1098 | * XTERM_SEQ: ESC 9 |
1082 | * 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 |
1083 | * in that row left. Clear right column. |
1100 | * in that row left. Clear right column. |
1084 | */ |
1101 | */ |
1085 | #ifndef NO_FRILLS |
1102 | #if ENABLE_FRILLS |
1086 | void |
1103 | void |
1087 | rxvt_term::scr_forwardindex () |
1104 | rxvt_term::scr_forwardindex () |
1088 | { |
1105 | { |
1089 | int row; |
1106 | int row; |
1090 | |
1107 | |
1091 | if (screen.cur.col < TermWin.ncol - 1) |
1108 | if (screen.cur.col < TermWin.ncol - 1) |
1092 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1109 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1093 | else |
1110 | else |
1094 | { |
1111 | { |
1095 | row = screen.cur.row + TermWin.saveLines; |
1112 | row = screen.cur.row + TermWin.saveLines; |
|
|
1113 | |
1096 | if (screen.tlen[row] == 0) |
1114 | if (screen.tlen[row] == 0) |
1097 | return; /* um, yeah? */ |
1115 | return; /* um, yeah? */ |
1098 | else if (screen.tlen[row] == -1) |
1116 | else if (screen.tlen[row] == -1) |
1099 | screen.tlen[row] = TermWin.ncol; |
1117 | screen.tlen[row] = TermWin.ncol; |
|
|
1118 | |
1100 | scr_gotorc (0, 0, R_RELATIVE); |
1119 | scr_gotorc (0, 0, R_RELATIVE); |
1101 | scr_insdel_chars (1, DELETE); |
1120 | scr_insdel_chars (1, DELETE); |
1102 | scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); |
1121 | scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); |
1103 | } |
1122 | } |
1104 | } |
1123 | } |
… | |
… | |
1112 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1131 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1113 | { |
1132 | { |
1114 | want_refresh = 1; |
1133 | want_refresh = 1; |
1115 | ZERO_SCROLLBACK (); |
1134 | ZERO_SCROLLBACK (); |
1116 | |
1135 | |
1117 | D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); |
|
|
1118 | |
|
|
1119 | screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) |
1136 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1120 | : col); |
|
|
1121 | MAX_IT (screen.cur.col, 0); |
1137 | MAX_IT (screen.cur.col, 0); |
1122 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1138 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1123 | |
1139 | |
1124 | screen.flags &= ~Screen_WrapNext; |
1140 | screen.flags &= ~Screen_WrapNext; |
|
|
1141 | |
1125 | if (relative & R_RELATIVE) |
1142 | if (relative & R_RELATIVE) |
1126 | { |
1143 | { |
1127 | if (row > 0) |
1144 | if (row > 0) |
1128 | { |
1145 | { |
1129 | if (screen.cur.row <= screen.bscroll |
1146 | if (screen.cur.row <= screen.bscroll |
… | |
… | |
1149 | MIN_IT (screen.cur.row, screen.bscroll); |
1166 | MIN_IT (screen.cur.row, screen.bscroll); |
1150 | } |
1167 | } |
1151 | else |
1168 | else |
1152 | screen.cur.row = row; |
1169 | screen.cur.row = row; |
1153 | } |
1170 | } |
|
|
1171 | |
1154 | MAX_IT (screen.cur.row, 0); |
1172 | MAX_IT (screen.cur.row, 0); |
1155 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1173 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1156 | |
|
|
1157 | while (screen.cur.col > 0 |
|
|
1158 | && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR) |
|
|
1159 | screen.cur.col--; |
|
|
1160 | } |
1174 | } |
1161 | |
1175 | |
1162 | /* ------------------------------------------------------------------------- */ |
1176 | /* ------------------------------------------------------------------------- */ |
1163 | /* |
1177 | /* |
1164 | * direction should be UP or DN |
1178 | * direction should be UP or DN |
1165 | */ |
1179 | */ |
1166 | void |
1180 | void |
1167 | rxvt_term::scr_index (enum page_dirn direction) |
1181 | rxvt_term::scr_index (enum page_dirn direction) |
1168 | { |
1182 | { |
1169 | int dirn; |
1183 | int dirn; |
1170 | |
1184 | |
1171 | want_refresh = 1; |
1185 | want_refresh = 1; |
|
|
1186 | ZERO_SCROLLBACK (); |
|
|
1187 | |
1172 | dirn = ((direction == UP) ? 1 : -1); |
1188 | dirn = ((direction == UP) ? 1 : -1); |
1173 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
|
|
1174 | |
|
|
1175 | ZERO_SCROLLBACK (); |
|
|
1176 | |
1189 | |
1177 | screen.flags &= ~Screen_WrapNext; |
1190 | screen.flags &= ~Screen_WrapNext; |
|
|
1191 | |
1178 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1192 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1179 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1193 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1180 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1194 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1181 | else |
1195 | else |
1182 | screen.cur.row += dirn; |
1196 | screen.cur.row += dirn; |
|
|
1197 | |
1183 | MAX_IT (screen.cur.row, 0); |
1198 | MAX_IT (screen.cur.row, 0); |
1184 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1199 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1185 | selection_check (0); |
1200 | selection_check (0); |
1186 | } |
1201 | } |
1187 | |
1202 | |
… | |
… | |
1196 | rxvt_term::scr_erase_line (int mode) |
1211 | rxvt_term::scr_erase_line (int mode) |
1197 | { |
1212 | { |
1198 | unsigned int row, col, num; |
1213 | unsigned int row, col, num; |
1199 | |
1214 | |
1200 | want_refresh = 1; |
1215 | want_refresh = 1; |
1201 | D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row)); |
|
|
1202 | ZERO_SCROLLBACK (); |
1216 | ZERO_SCROLLBACK (); |
1203 | |
1217 | |
1204 | selection_check (1); |
1218 | selection_check (1); |
1205 | |
|
|
1206 | screen.flags &= ~Screen_WrapNext; |
|
|
1207 | |
1219 | |
1208 | row = TermWin.saveLines + screen.cur.row; |
1220 | row = TermWin.saveLines + screen.cur.row; |
1209 | switch (mode) |
1221 | switch (mode) |
1210 | { |
1222 | { |
1211 | case 0: /* erase to end of line */ |
1223 | case 0: /* erase to end of line */ |
… | |
… | |
1234 | default: |
1246 | default: |
1235 | return; |
1247 | return; |
1236 | } |
1248 | } |
1237 | |
1249 | |
1238 | if (screen.text[row]) |
1250 | if (screen.text[row]) |
1239 | scr_blank_line (& (screen.text[row][col]), |
1251 | scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle); |
1240 | & (screen.rend[row][col]), num, rstyle); |
|
|
1241 | else |
1252 | else |
1242 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
1253 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
1243 | } |
1254 | } |
1244 | |
1255 | |
1245 | /* ------------------------------------------------------------------------- */ |
1256 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1256 | int32_t row, row_offset; |
1267 | int32_t row, row_offset; |
1257 | rend_t ren; |
1268 | rend_t ren; |
1258 | XGCValues gcvalue; |
1269 | XGCValues gcvalue; |
1259 | |
1270 | |
1260 | want_refresh = 1; |
1271 | want_refresh = 1; |
1261 | D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); |
|
|
1262 | ZERO_SCROLLBACK (); |
1272 | ZERO_SCROLLBACK (); |
|
|
1273 | |
1263 | row_offset = (int32_t)TermWin.saveLines; |
1274 | row_offset = (int32_t)TermWin.saveLines; |
1264 | |
1275 | |
1265 | switch (mode) |
1276 | switch (mode) |
1266 | { |
1277 | { |
1267 | case 0: /* erase to end of screen */ |
1278 | case 0: /* erase to end of screen */ |
… | |
… | |
1283 | break; |
1294 | break; |
1284 | default: |
1295 | default: |
1285 | return; |
1296 | return; |
1286 | } |
1297 | } |
1287 | |
1298 | |
1288 | refresh_type |= REFRESH_BOUNDS; |
|
|
1289 | |
|
|
1290 | if (selection.op && current_screen == selection.screen |
1299 | if (selection.op && current_screen == selection.screen |
1291 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1300 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1292 | || (selection.end.row >= row |
1301 | || (selection.end.row >= row |
1293 | && selection.end.row <= row + num))) |
1302 | && selection.end.row <= row + num))) |
1294 | CLEAR_SELECTION (); |
1303 | CLEAR_SELECTION (); |
… | |
… | |
1306 | CLEAR_ROWS (row, num); |
1315 | CLEAR_ROWS (row, num); |
1307 | } |
1316 | } |
1308 | else |
1317 | else |
1309 | { |
1318 | { |
1310 | ren = (rstyle & (RS_fgMask | RS_bgMask)); |
1319 | ren = (rstyle & (RS_fgMask | RS_bgMask)); |
1311 | gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; |
1320 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1312 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1321 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1313 | ERASE_ROWS (row, num); |
1322 | ERASE_ROWS (row, num); |
1314 | gcvalue.foreground = PixColors[Color_fg]; |
1323 | gcvalue.foreground = pix_colors[Color_fg]; |
1315 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1324 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1316 | } |
1325 | } |
1317 | |
1326 | |
1318 | for (; num--; row++) |
1327 | for (; num--; row++) |
1319 | { |
1328 | { |
… | |
… | |
1335 | { |
1344 | { |
1336 | int i, j, k; |
1345 | int i, j, k; |
1337 | rend_t *r1, fs; |
1346 | rend_t *r1, fs; |
1338 | |
1347 | |
1339 | want_refresh = 1; |
1348 | want_refresh = 1; |
|
|
1349 | ZERO_SCROLLBACK (); |
|
|
1350 | |
1340 | num_scr_allow = 0; |
1351 | num_scr_allow = 0; |
1341 | ZERO_SCROLLBACK (); |
|
|
1342 | selection_check (3); |
1352 | selection_check (3); |
1343 | |
1353 | |
1344 | fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); |
1354 | fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); |
1345 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1355 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1346 | { |
1356 | { |
… | |
… | |
1373 | if (insdel == DELETE) |
1383 | if (insdel == DELETE) |
1374 | return; |
1384 | return; |
1375 | else if (insdel == INSERT) |
1385 | else if (insdel == INSERT) |
1376 | count = end; |
1386 | count = end; |
1377 | } |
1387 | } |
1378 | screen.flags &= ~Screen_WrapNext; |
1388 | |
|
|
1389 | scr_do_wrap (); |
1379 | |
1390 | |
1380 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); |
1391 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); |
1381 | } |
1392 | } |
1382 | |
1393 | |
1383 | /* ------------------------------------------------------------------------- */ |
1394 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1397 | ZERO_SCROLLBACK (); |
1408 | ZERO_SCROLLBACK (); |
1398 | |
1409 | |
1399 | if (count <= 0) |
1410 | if (count <= 0) |
1400 | return; |
1411 | return; |
1401 | |
1412 | |
|
|
1413 | scr_do_wrap (); |
|
|
1414 | |
1402 | selection_check (1); |
1415 | selection_check (1); |
1403 | MIN_IT (count, (TermWin.ncol - screen.cur.col)); |
1416 | MIN_IT (count, (TermWin.ncol - screen.cur.col)); |
1404 | |
1417 | |
1405 | row = screen.cur.row + TermWin.saveLines; |
1418 | row = screen.cur.row + TermWin.saveLines; |
1406 | screen.flags &= ~Screen_WrapNext; |
|
|
1407 | |
1419 | |
1408 | stp = screen.text[row]; |
1420 | stp = screen.text[row]; |
1409 | srp = screen.rend[row]; |
1421 | srp = screen.rend[row]; |
1410 | slp = & (screen.tlen[row]); |
1422 | slp = &screen.tlen[row]; |
1411 | |
1423 | |
1412 | switch (insdel) |
1424 | switch (insdel) |
1413 | { |
1425 | { |
1414 | case INSERT: |
1426 | case INSERT: |
1415 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1427 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
… | |
… | |
1517 | */ |
1529 | */ |
1518 | void |
1530 | void |
1519 | rxvt_term::scr_cursor_visible (int mode) |
1531 | rxvt_term::scr_cursor_visible (int mode) |
1520 | { |
1532 | { |
1521 | want_refresh = 1; |
1533 | want_refresh = 1; |
|
|
1534 | |
1522 | if (mode) |
1535 | if (mode) |
1523 | screen.flags |= Screen_VisibleCursor; |
1536 | screen.flags |= Screen_VisibleCursor; |
1524 | else |
1537 | else |
1525 | screen.flags &= ~Screen_VisibleCursor; |
1538 | screen.flags &= ~Screen_VisibleCursor; |
1526 | } |
1539 | } |
… | |
… | |
1535 | rxvt_term::scr_autowrap (int mode) |
1548 | rxvt_term::scr_autowrap (int mode) |
1536 | { |
1549 | { |
1537 | if (mode) |
1550 | if (mode) |
1538 | screen.flags |= Screen_Autowrap; |
1551 | screen.flags |= Screen_Autowrap; |
1539 | else |
1552 | else |
1540 | screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); |
1553 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
1541 | } |
1554 | } |
1542 | |
1555 | |
1543 | /* ------------------------------------------------------------------------- */ |
1556 | /* ------------------------------------------------------------------------- */ |
1544 | /* |
1557 | /* |
1545 | * Set/unset margin origin mode |
1558 | * Set/unset margin origin mode |
… | |
… | |
1584 | */ |
1597 | */ |
1585 | void |
1598 | void |
1586 | rxvt_term::scr_set_tab (int mode) |
1599 | rxvt_term::scr_set_tab (int mode) |
1587 | { |
1600 | { |
1588 | if (mode < 0) |
1601 | if (mode < 0) |
1589 | MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); |
1602 | memset (tabs, 0, TermWin.ncol * sizeof (char)); |
1590 | else if (screen.cur.col < TermWin.ncol) |
1603 | else if (screen.cur.col < TermWin.ncol) |
1591 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1604 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1592 | } |
1605 | } |
1593 | |
1606 | |
1594 | /* ------------------------------------------------------------------------- */ |
1607 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1598 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1611 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1599 | */ |
1612 | */ |
1600 | void |
1613 | void |
1601 | rxvt_term::scr_rvideo_mode (int mode) |
1614 | rxvt_term::scr_rvideo_mode (int mode) |
1602 | { |
1615 | { |
1603 | XGCValues gcvalue; |
1616 | XGCValues gcvalue; |
1604 | |
1617 | |
1605 | if (rvideo != mode) |
1618 | if (rvideo != mode) |
1606 | { |
1619 | { |
1607 | rvideo = mode; |
1620 | rvideo = mode; |
1608 | SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); |
1621 | SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); |
1609 | #if defined(XPM_BACKGROUND) |
1622 | #if defined(XPM_BACKGROUND) |
1610 | if (bgPixmap.pixmap == None) |
1623 | if (bgPixmap.pixmap == None) |
1611 | #endif |
1624 | #endif |
1612 | #if defined(TRANSPARENT) |
1625 | #if defined(TRANSPARENT) |
1613 | if (! (Options & Opt_transparent) || am_transparent == 0) |
1626 | if (! (options & Opt_transparent) || am_transparent == 0) |
1614 | #endif |
1627 | #endif |
1615 | XSetWindowBackground (display->display, TermWin.vt, |
1628 | XSetWindowBackground (display->display, TermWin.vt, |
1616 | PixColors[Color_bg]); |
1629 | pix_colors[Color_bg]); |
1617 | |
1630 | |
1618 | gcvalue.foreground = PixColors[Color_fg]; |
1631 | gcvalue.foreground = pix_colors[Color_fg]; |
1619 | gcvalue.background = PixColors[Color_bg]; |
1632 | gcvalue.background = pix_colors[Color_bg]; |
1620 | XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, |
1633 | XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, |
1621 | &gcvalue); |
1634 | &gcvalue); |
1622 | scr_clear (); |
1635 | scr_clear (); |
1623 | scr_touch (true); |
1636 | scr_touch (true); |
1624 | } |
1637 | } |
… | |
… | |
1740 | row_col_t rc[RC_COUNT]; |
1753 | row_col_t rc[RC_COUNT]; |
1741 | |
1754 | |
1742 | if (drawn_text == NULL) /* sanity check */ |
1755 | if (drawn_text == NULL) /* sanity check */ |
1743 | return; |
1756 | return; |
1744 | |
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 | |
1745 | #ifdef DEBUG_STRICT |
1766 | #ifdef DEBUG_STRICT |
1746 | x = max (x, (int)TermWin.int_bwidth); |
1767 | x = max (x, 0); |
1747 | x = min (x, (int)TermWin.width); |
1768 | x = min (x, (int)TermWin.width); |
1748 | y = max (y, (int)TermWin.int_bwidth); |
1769 | y = max (y, 0); |
1749 | y = min (y, (int)TermWin.height); |
1770 | y = min (y, (int)TermWin.height); |
1750 | #endif |
1771 | #endif |
1751 | |
1772 | |
1752 | /* round down */ |
1773 | /* round down */ |
1753 | rc[PART_BEG].col = Pixel2Col (x); |
1774 | rc[PART_BEG].col = Pixel2Col (x); |
… | |
… | |
1761 | { |
1782 | { |
1762 | MIN_IT (rc[i].col, TermWin.ncol - 1); |
1783 | MIN_IT (rc[i].col, TermWin.ncol - 1); |
1763 | MIN_IT (rc[i].row, TermWin.nrow - 1); |
1784 | MIN_IT (rc[i].row, TermWin.nrow - 1); |
1764 | } |
1785 | } |
1765 | |
1786 | |
1766 | D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); |
|
|
1767 | |
|
|
1768 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1787 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1769 | 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); |
1770 | (rc[PART_END].col - rc[PART_BEG].col + 1)); |
|
|
1771 | |
1789 | |
1772 | if (refresh) |
1790 | if (refresh) |
1773 | scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); |
1791 | scr_refresh (SLOW_REFRESH); |
1774 | } |
1792 | } |
1775 | |
1793 | |
1776 | /* ------------------------------------------------------------------------- */ |
1794 | /* ------------------------------------------------------------------------- */ |
1777 | /* |
1795 | /* |
1778 | * Refresh the entire screen |
1796 | * Refresh the entire screen |
… | |
… | |
1793 | { |
1811 | { |
1794 | long p = 0; |
1812 | long p = 0; |
1795 | uint16_t oldviewstart; |
1813 | uint16_t oldviewstart; |
1796 | |
1814 | |
1797 | oldviewstart = TermWin.view_start; |
1815 | oldviewstart = TermWin.view_start; |
|
|
1816 | |
1798 | if (y < len) |
1817 | if (y < len) |
1799 | { |
1818 | { |
1800 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1819 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1801 | p -= (long) (TermWin.nrow - 1); |
1820 | p -= (long) (TermWin.nrow - 1); |
1802 | p = max (p, 0); |
1821 | p = max (p, 0); |
1803 | } |
1822 | } |
|
|
1823 | |
1804 | TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); |
1824 | TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); |
1805 | D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start)); |
|
|
1806 | |
1825 | |
1807 | return scr_changeview (oldviewstart); |
1826 | return scr_changeview (oldviewstart); |
1808 | } |
1827 | } |
1809 | |
1828 | |
1810 | /* ------------------------------------------------------------------------- */ |
1829 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1813 | * direction should be UP or DN |
1832 | * direction should be UP or DN |
1814 | */ |
1833 | */ |
1815 | int |
1834 | int |
1816 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1835 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1817 | { |
1836 | { |
1818 | int n; |
1837 | int n; |
1819 | uint16_t oldviewstart; |
1838 | uint16_t oldviewstart; |
1820 | |
1839 | |
1821 | D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); |
|
|
1822 | #ifdef DEBUG_STRICT |
1840 | #ifdef DEBUG_STRICT |
1823 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
1841 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
1824 | #endif |
1842 | #endif |
1825 | oldviewstart = TermWin.view_start; |
1843 | oldviewstart = TermWin.view_start; |
1826 | if (direction == UP) |
1844 | if (direction == UP) |
… | |
… | |
1842 | if (TermWin.view_start != oldviewstart) |
1860 | if (TermWin.view_start != oldviewstart) |
1843 | { |
1861 | { |
1844 | want_refresh = 1; |
1862 | want_refresh = 1; |
1845 | num_scr -= (TermWin.view_start - oldviewstart); |
1863 | num_scr -= (TermWin.view_start - oldviewstart); |
1846 | } |
1864 | } |
|
|
1865 | |
1847 | return (int) (TermWin.view_start - oldviewstart); |
1866 | return (int) (TermWin.view_start - oldviewstart); |
1848 | } |
1867 | } |
1849 | |
1868 | |
1850 | /* ------------------------------------------------------------------------- */ |
1869 | /* ------------------------------------------------------------------------- */ |
1851 | void |
1870 | void |
1852 | rxvt_term::scr_bell () |
1871 | rxvt_term::scr_bell () |
1853 | { |
1872 | { |
1854 | #ifndef NO_BELL |
1873 | #ifndef NO_BELL |
1855 | # ifndef NO_MAPALERT |
1874 | # ifndef NO_MAPALERT |
1856 | # ifdef MAPALERT_OPTION |
1875 | # ifdef MAPALERT_OPTION |
1857 | if (Options & Opt_mapAlert) |
1876 | if (options & Opt_mapAlert) |
1858 | # endif |
1877 | # endif |
1859 | XMapWindow (display->display, TermWin.parent[0]); |
1878 | XMapWindow (display->display, TermWin.parent[0]); |
1860 | # endif |
1879 | # endif |
1861 | if (Options & Opt_visualBell) |
1880 | if (options & Opt_visualBell) |
1862 | { |
1881 | { |
1863 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1882 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1864 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1883 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1865 | } |
1884 | } |
1866 | else |
1885 | else |
… | |
… | |
1872 | /* ARGSUSED */ |
1891 | /* ARGSUSED */ |
1873 | void |
1892 | void |
1874 | rxvt_term::scr_printscreen (int fullhist) |
1893 | rxvt_term::scr_printscreen (int fullhist) |
1875 | { |
1894 | { |
1876 | #ifdef PRINTPIPE |
1895 | #ifdef PRINTPIPE |
1877 | int i, r1, nrows, row_offset; |
1896 | int i, r1, nrows, row_offset; |
1878 | text_t *t; |
1897 | FILE *fd; |
1879 | FILE *fd; |
|
|
1880 | |
1898 | |
1881 | if ((fd = popen_printer ()) == NULL) |
1899 | if ((fd = popen_printer ()) == NULL) |
1882 | return; |
1900 | return; |
|
|
1901 | |
1883 | nrows = TermWin.nrow; |
1902 | nrows = TermWin.nrow; |
1884 | row_offset = TermWin.saveLines; |
1903 | row_offset = TermWin.saveLines; |
|
|
1904 | |
1885 | if (!fullhist) |
1905 | if (!fullhist) |
1886 | row_offset -= TermWin.view_start; |
1906 | row_offset -= TermWin.view_start; |
1887 | else |
1907 | else |
1888 | { |
1908 | { |
1889 | nrows += TermWin.nscrolled; |
1909 | nrows += TermWin.nscrolled; |
1890 | row_offset -= TermWin.nscrolled; |
1910 | row_offset -= TermWin.nscrolled; |
1891 | } |
1911 | } |
1892 | |
1912 | |
|
|
1913 | wctomb (0, 0); |
|
|
1914 | |
1893 | for (r1 = 0; r1 < nrows; r1++) |
1915 | for (r1 = 0; r1 < nrows; r1++) |
1894 | { |
1916 | { |
1895 | t = screen.text[r1 + row_offset]; |
1917 | text_t *tp = screen.text[r1 + row_offset]; |
1896 | for (i = TermWin.ncol - 1; i >= 0; i--) |
1918 | int len = screen.tlen[r1 + row_offset]; |
1897 | if (!isspace (t[i])) |
1919 | |
1898 | break; |
1920 | for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) |
1899 | 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); |
1900 | } |
1939 | } |
|
|
1940 | |
1901 | pclose_printer (fd); |
1941 | pclose_printer (fd); |
1902 | #endif |
1942 | #endif |
1903 | } |
1943 | } |
1904 | |
1944 | |
1905 | /* ------------------------------------------------------------------------- */ |
1945 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1919 | ((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) |
1920 | |
1960 | |
1921 | void |
1961 | void |
1922 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1962 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1923 | { |
1963 | { |
1924 | unsigned char clearfirst, /* first character writes before cell */ |
|
|
1925 | clearlast, /* last character writes beyond cell */ |
|
|
1926 | must_clear, /* use draw_string not draw_image_string */ |
1964 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1927 | rvid, /* reverse video this position */ |
1965 | rvid, /* reverse video this position */ |
1928 | showcursor; /* show the cursor */ |
1966 | showcursor; /* show the cursor */ |
1929 | int16_t col, row, /* column/row we're processing */ |
1967 | int16_t col, row, /* column/row we're processing */ |
1930 | ocrow; /* old cursor row */ |
1968 | ocrow; /* old cursor row */ |
1931 | int i, /* tmp */ |
1969 | int i, /* tmp */ |
1932 | row_offset; /* basic offset in screen structure */ |
1970 | row_offset; /* basic offset in screen structure */ |
1933 | #ifndef NO_CURSORCOLOR |
1971 | #ifndef NO_CURSORCOLOR |
1934 | rend_t cc1; /* store colours at cursor position (s) */ |
1972 | rend_t cc1; /* store colours at cursor position (s) */ |
1935 | #endif |
1973 | #endif |
1936 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
1974 | rend_t *crp; // cursor rendition pointer |
1937 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
|
|
1938 | |
1975 | |
1939 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
1976 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
1940 | return; |
1977 | return; |
1941 | |
1978 | |
1942 | /* |
1979 | /* |
1943 | * A: set up vars |
1980 | * A: set up vars |
1944 | */ |
1981 | */ |
1945 | clearfirst = clearlast = must_clear = 0; |
1982 | must_clear = 0; |
1946 | |
|
|
1947 | refresh_count = 0; |
1983 | refresh_count = 0; |
1948 | |
1984 | |
1949 | row_offset = TermWin.saveLines - TermWin.view_start; |
1985 | row_offset = TermWin.saveLines - TermWin.view_start; |
1950 | |
|
|
1951 | if ((refresh_type & REFRESH_BOUNDS)) |
|
|
1952 | { |
|
|
1953 | clearfirst = clearlast = 1; |
|
|
1954 | refresh_type &= ~REFRESH_BOUNDS; |
|
|
1955 | } |
|
|
1956 | |
1986 | |
1957 | #ifdef XPM_BACKGROUND |
1987 | #ifdef XPM_BACKGROUND |
1958 | must_clear |= (bgPixmap.pixmap != None); |
1988 | must_clear |= (bgPixmap.pixmap != None); |
1959 | #endif |
1989 | #endif |
1960 | #ifdef TRANSPARENT |
1990 | #ifdef TRANSPARENT |
1961 | must_clear |= ((Options & Opt_transparent) && am_transparent); |
1991 | must_clear |= ((options & Opt_transparent) && am_transparent); |
1962 | #endif |
1992 | #endif |
1963 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1993 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1964 | |
1994 | |
1965 | /* |
1995 | /* |
1966 | * B: reverse any characters which are selected |
1996 | * B: reverse any characters which are selected |
1967 | */ |
1997 | */ |
1968 | scr_reverse_selection (); |
1998 | scr_reverse_selection (); |
|
|
1999 | #if ENABLE_OVERLAY |
|
|
2000 | scr_swap_overlay (); |
|
|
2001 | #endif |
1969 | |
2002 | |
1970 | /* |
2003 | /* |
1971 | * C: set the cursor character (s) |
2004 | * C: set the cursor character (s) |
1972 | */ |
2005 | */ |
1973 | { |
2006 | { |
… | |
… | |
1981 | showcursor = 0; |
2014 | showcursor = 0; |
1982 | #endif |
2015 | #endif |
1983 | |
2016 | |
1984 | if (showcursor) |
2017 | if (showcursor) |
1985 | { |
2018 | { |
|
|
2019 | int col = screen.cur.col; |
|
|
2020 | |
|
|
2021 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
|
|
2022 | col--; |
|
|
2023 | |
1986 | srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); |
2024 | crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; |
1987 | |
2025 | |
1988 | if (showcursor && TermWin.focus) |
2026 | if (showcursor && TermWin.focus) |
1989 | { |
2027 | { |
1990 | *srp ^= RS_RVid; |
2028 | *crp ^= RS_RVid; |
1991 | #ifndef NO_CURSORCOLOR |
2029 | #ifndef NO_CURSORCOLOR |
1992 | cc1 = *srp & (RS_fgMask | RS_bgMask); |
2030 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
1993 | if (ISSET_PIXCOLOR (Color_cursor)) |
2031 | if (ISSET_PIXCOLOR (Color_cursor)) |
1994 | ccol1 = Color_cursor; |
2032 | ccol1 = Color_cursor; |
1995 | else |
2033 | else |
1996 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2034 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1997 | ccol1 = GET_FGCOLOR (rstyle); |
2035 | ccol1 = GET_FGCOLOR (rstyle); |
… | |
… | |
2004 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2042 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2005 | ccol2 = GET_BGCOLOR (rstyle); |
2043 | ccol2 = GET_BGCOLOR (rstyle); |
2006 | #else |
2044 | #else |
2007 | ccol2 = Color_bg; |
2045 | ccol2 = Color_bg; |
2008 | #endif |
2046 | #endif |
2009 | *srp = SET_FGCOLOR (*srp, ccol1); |
2047 | *crp = SET_FGCOLOR (*crp, ccol1); |
2010 | *srp = SET_BGCOLOR (*srp, ccol2); |
2048 | *crp = SET_BGCOLOR (*crp, ccol2); |
2011 | #endif |
2049 | #endif |
2012 | } |
2050 | } |
2013 | } |
2051 | } |
2014 | |
2052 | |
2015 | /* make sure no outline cursor is left around */ |
2053 | /* make sure no outline cursor is left around */ |
… | |
… | |
2042 | oldcursor.col = screen.cur.col; |
2080 | oldcursor.col = screen.cur.col; |
2043 | } |
2081 | } |
2044 | } |
2082 | } |
2045 | } |
2083 | } |
2046 | |
2084 | |
|
|
2085 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
|
|
2086 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
2047 | #ifndef NO_SLOW_LINK_SUPPORT |
2087 | #ifndef NO_SLOW_LINK_SUPPORT |
2048 | /* |
2088 | /* |
2049 | * D: CopyArea pass - very useful for slower links |
2089 | * D: CopyArea pass - very useful for slower links |
2050 | * This has been deliberately kept simple. |
2090 | * This has been deliberately kept simple. |
2051 | */ |
2091 | */ |
2052 | i = num_scr; |
2092 | i = num_scr; |
|
|
2093 | if (!display->is_local |
2053 | if (refresh_type == FAST_REFRESH && num_scr_allow && i |
2094 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2054 | && abs (i) < TermWin.nrow && !must_clear) |
2095 | && abs (i) < TermWin.nrow && !must_clear) |
2055 | { |
2096 | { |
2056 | int16_t nits; |
2097 | int16_t nits; |
2057 | int j; |
2098 | int j; |
2058 | rend_t *drp2; |
|
|
2059 | text_t *dtp2; |
|
|
2060 | int len, wlen; |
2099 | int len, wlen; |
2061 | |
2100 | |
2062 | j = TermWin.nrow; |
2101 | j = TermWin.nrow; |
2063 | wlen = len = -1; |
2102 | wlen = len = -1; |
2064 | row = i > 0 ? 0 : j - 1; |
2103 | row = i > 0 ? 0 : j - 1; |
2065 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2104 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2066 | { |
2105 | { |
2067 | if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) |
2106 | if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) |
2068 | { |
2107 | { |
2069 | stp = screen.text[row + row_offset]; |
2108 | text_t *stp = screen.text[row + row_offset]; |
2070 | srp = screen.rend[row + row_offset]; |
2109 | rend_t *srp = screen.rend[row + row_offset]; |
2071 | dtp = drawn_text[row]; |
2110 | text_t *dtp = drawn_text[row]; |
2072 | dtp2 = drawn_text[row + i]; |
2111 | text_t *dtp2 = drawn_text[row + i]; |
2073 | drp = drawn_rend[row]; |
2112 | rend_t *drp = drawn_rend[row]; |
2074 | drp2 = drawn_rend[row + i]; |
2113 | rend_t *drp2 = drawn_rend[row + i]; |
2075 | |
2114 | |
2076 | for (nits = 0, col = TermWin.ncol; col--; ) |
2115 | for (nits = 0, col = TermWin.ncol; col--; ) |
2077 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2116 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2078 | nits--; |
2117 | nits--; |
2079 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
2118 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
… | |
… | |
2099 | { |
2138 | { |
2100 | /* also comes here at end if needed because of >= above */ |
2139 | /* also comes here at end if needed because of >= above */ |
2101 | if (wlen < len) |
2140 | if (wlen < len) |
2102 | SWAP_IT (wlen, len, int); |
2141 | SWAP_IT (wlen, len, int); |
2103 | |
2142 | |
2104 | D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); |
|
|
2105 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2143 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2106 | TermWin.gc, 0, Row2Pixel (len + i), |
2144 | TermWin.gc, 0, Row2Pixel (len + i), |
2107 | (unsigned int)TermWin_TotalWidth (), |
2145 | (unsigned int)TermWin_TotalWidth (), |
2108 | (unsigned int)Height2Pixel (wlen - len + 1), |
2146 | (unsigned int)Height2Pixel (wlen - len + 1), |
2109 | 0, Row2Pixel (len)); |
2147 | 0, Row2Pixel (len)); |
… | |
… | |
2116 | /* |
2154 | /* |
2117 | * E: main pass across every character |
2155 | * E: main pass across every character |
2118 | */ |
2156 | */ |
2119 | for (row = 0; row < TermWin.nrow; row++) |
2157 | for (row = 0; row < TermWin.nrow; row++) |
2120 | { |
2158 | { |
2121 | stp = screen.text[row + row_offset]; |
2159 | text_t *stp = screen.text[row + row_offset]; |
2122 | srp = screen.rend[row + row_offset]; |
2160 | rend_t *srp = screen.rend[row + row_offset]; |
2123 | dtp = drawn_text[row]; |
2161 | text_t *dtp = drawn_text[row]; |
2124 | drp = drawn_rend[row]; |
2162 | rend_t *drp = drawn_rend[row]; |
2125 | |
2163 | |
2126 | /* |
2164 | /* |
2127 | * E2: OK, now the real pass |
2165 | * E2: OK, now the real pass |
2128 | */ |
2166 | */ |
2129 | int ypixel = (int)Row2Pixel (row); |
2167 | int ypixel = (int)Row2Pixel (row); |
… | |
… | |
2159 | if (stp[col] == NOCHAR) |
2197 | if (stp[col] == NOCHAR) |
2160 | { |
2198 | { |
2161 | dtp[col] = stp[col]; |
2199 | dtp[col] = stp[col]; |
2162 | drp[col] = rend; |
2200 | drp[col] = rend; |
2163 | count++; |
2201 | count++; |
2164 | |
|
|
2165 | if (i) // only possible skip if char unchanged |
|
|
2166 | i++; |
2202 | i++; |
2167 | |
2203 | |
2168 | continue; |
2204 | continue; |
2169 | } |
2205 | } |
2170 | |
2206 | |
2171 | if (rend != srp[col]) |
2207 | if (rend != srp[col]) |
… | |
… | |
2174 | count++; |
2210 | count++; |
2175 | |
2211 | |
2176 | if (stp[col] != dtp[col] |
2212 | if (stp[col] != dtp[col] |
2177 | || srp[col] != drp[col]) |
2213 | || srp[col] != drp[col]) |
2178 | { |
2214 | { |
2179 | if (must_clear && (i++ > (count / 2))) |
2215 | if (must_clear && (i++ > count / 2)) |
2180 | break; |
2216 | break; |
2181 | |
2217 | |
2182 | dtp[col] = stp[col]; |
2218 | dtp[col] = stp[col]; |
2183 | drp[col] = rend; |
2219 | drp[col] = rend; |
2184 | i = 0; |
2220 | i = 0; |
2185 | } |
2221 | } |
2186 | else if (must_clear || (stp[col] != ' ' && ++i >= 32)) |
2222 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2187 | break; |
2223 | break; |
2188 | } |
2224 | } |
2189 | |
2225 | |
2190 | col--; /* went one too far. move back */ |
2226 | col--; /* went one too far. move back */ |
2191 | 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--; |
2192 | |
2232 | |
2193 | /* |
2233 | /* |
2194 | * Determine the attributes for the string |
2234 | * Determine the attributes for the string |
2195 | */ |
2235 | */ |
2196 | int fid = GET_FONT (rend); |
2236 | int fid = GET_FONT (rend); |
… | |
… | |
2200 | rend = GET_ATTR (rend); |
2240 | rend = GET_ATTR (rend); |
2201 | |
2241 | |
2202 | rvid = !!(rend & RS_RVid); |
2242 | rvid = !!(rend & RS_RVid); |
2203 | |
2243 | |
2204 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2244 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2205 | if (rend & RS_Bold && fore == Color_fg) |
2245 | if (rend & RS_Bold && fore == Color_fg && !(options & Opt_realBold)) |
2206 | { |
2246 | { |
2207 | if (ISSET_PIXCOLOR (Color_BD)) |
2247 | if (ISSET_PIXCOLOR (Color_BD)) |
2208 | fore = Color_BD; |
2248 | fore = Color_BD; |
2209 | else |
2249 | else |
2210 | rvid = !rvid; |
2250 | rvid = !rvid; |
… | |
… | |
2228 | back = Color_RV; |
2268 | back = Color_RV; |
2229 | #endif |
2269 | #endif |
2230 | } |
2270 | } |
2231 | |
2271 | |
2232 | #ifdef TEXT_BLINK |
2272 | #ifdef TEXT_BLINK |
2233 | if (rend & RS_Blink && back == Color_bg) |
2273 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2234 | { |
2274 | { |
2235 | if (!text_blink_ev.active) |
2275 | if (!text_blink_ev.active) |
2236 | { |
2276 | { |
2237 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2277 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2238 | hidden_text = 0; |
2278 | hidden_text = 0; |
… | |
… | |
2268 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2308 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2269 | } |
2309 | } |
2270 | else |
2310 | else |
2271 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2311 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2272 | |
2312 | |
2273 | if ((rend & RS_Uline) && (font->descent > 1)) |
2313 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2274 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2314 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2275 | xpixel, ypixel + font->ascent + 1, |
2315 | xpixel, ypixel + font->ascent + 1, |
2276 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2316 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2277 | } /* for (col....) */ |
2317 | } /* for (col....) */ |
2278 | } /* for (row....) */ |
2318 | } /* for (row....) */ |
… | |
… | |
2282 | */ |
2322 | */ |
2283 | if (showcursor) |
2323 | if (showcursor) |
2284 | { |
2324 | { |
2285 | if (TermWin.focus) |
2325 | if (TermWin.focus) |
2286 | { |
2326 | { |
2287 | srp = & (screen.rend[screen.cur.row + TermWin.saveLines] |
|
|
2288 | [screen.cur.col]); |
|
|
2289 | *srp ^= RS_RVid; |
2327 | *crp ^= RS_RVid; |
2290 | #ifndef NO_CURSORCOLOR |
2328 | #ifndef NO_CURSORCOLOR |
2291 | *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2329 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2292 | #endif |
2330 | #endif |
2293 | } |
2331 | } |
2294 | else if (oldcursor.row >= 0) |
2332 | else if (oldcursor.row >= 0) |
2295 | { |
2333 | { |
2296 | #ifndef NO_CURSORCOLOR |
2334 | #ifndef NO_CURSORCOLOR |
2297 | if (ISSET_PIXCOLOR (Color_cursor)) |
2335 | if (ISSET_PIXCOLOR (Color_cursor)) |
2298 | XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); |
2336 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); |
2299 | #endif |
2337 | #endif |
2300 | int cursorwidth = 1; |
2338 | int cursorwidth = 1; |
2301 | while (oldcursor.col + cursorwidth < TermWin.ncol |
2339 | while (oldcursor.col + cursorwidth < TermWin.ncol |
2302 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
2340 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
2303 | cursorwidth++; |
2341 | cursorwidth++; |
… | |
… | |
2311 | } |
2349 | } |
2312 | |
2350 | |
2313 | /* |
2351 | /* |
2314 | * H: cleanup selection |
2352 | * H: cleanup selection |
2315 | */ |
2353 | */ |
|
|
2354 | #if ENABLE_OVERLAY |
|
|
2355 | scr_swap_overlay (); |
|
|
2356 | #endif |
2316 | scr_reverse_selection (); |
2357 | scr_reverse_selection (); |
2317 | |
2358 | |
2318 | /* |
|
|
2319 | * I: other general cleanup |
|
|
2320 | */ |
|
|
2321 | if (clearfirst && TermWin.int_bwidth) |
|
|
2322 | /* |
|
|
2323 | * clear the whole screen height, note that width == 0 is treated |
|
|
2324 | * specially by XClearArea |
|
|
2325 | */ |
|
|
2326 | XClearArea (display->display, TermWin.vt, 0, 0, |
|
|
2327 | (unsigned int)TermWin.int_bwidth, |
|
|
2328 | (unsigned int)TermWin_TotalHeight (), False); |
|
|
2329 | |
|
|
2330 | if (clearlast && TermWin.int_bwidth) |
|
|
2331 | /* |
|
|
2332 | * clear the whole screen height, note that width == 0 is treated |
|
|
2333 | * specially by XClearArea |
|
|
2334 | */ |
|
|
2335 | XClearArea (display->display, TermWin.vt, |
|
|
2336 | TermWin.width + TermWin.int_bwidth, 0, |
|
|
2337 | (unsigned int)TermWin.int_bwidth, |
|
|
2338 | (unsigned int)TermWin_TotalHeight (), False); |
|
|
2339 | |
|
|
2340 | if (refresh_type & SMOOTH_REFRESH) |
2359 | if (refresh_type & SMOOTH_REFRESH) |
2341 | XSync (display->display, False); |
2360 | XFlush (display->display); |
2342 | |
2361 | |
2343 | num_scr = 0; |
2362 | num_scr = 0; |
2344 | num_scr_allow = 1; |
2363 | num_scr_allow = 1; |
2345 | want_refresh = 0; /* screen is current */ |
2364 | want_refresh = 0; /* screen is current */ |
2346 | } |
2365 | } |
… | |
… | |
2377 | |
2396 | |
2378 | num_scr_allow = 0; |
2397 | num_scr_allow = 0; |
2379 | want_refresh = 1; |
2398 | want_refresh = 1; |
2380 | |
2399 | |
2381 | #ifdef TRANSPARENT |
2400 | #ifdef TRANSPARENT |
2382 | if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) |
2401 | if ((options & Opt_transparent) && (am_pixmap_trans == 0)) |
2383 | { |
2402 | { |
2384 | int i; |
2403 | int i; |
2385 | |
2404 | |
2386 | if (! (Options & Opt_transparent_all)) |
2405 | if (! (options & Opt_transparent_all)) |
2387 | i = 0; |
2406 | i = 0; |
2388 | else |
2407 | else |
2389 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
2408 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
2390 | |
2409 | |
2391 | while (i--) |
2410 | while (i--) |
… | |
… | |
2468 | * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 |
2487 | * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 |
2469 | */ |
2488 | */ |
2470 | void |
2489 | void |
2471 | rxvt_term::selection_check (int check_more) |
2490 | rxvt_term::selection_check (int check_more) |
2472 | { |
2491 | { |
2473 | row_col_t pos; |
2492 | row_col_t pos; |
2474 | |
2493 | |
2475 | if (!selection.op) |
2494 | if (!selection.op) |
2476 | return; |
2495 | return; |
2477 | |
2496 | |
2478 | pos.row = pos.col = 0; |
2497 | pos.row = pos.col = 0; |
… | |
… | |
2505 | rxvt_term::paste (const unsigned char *data, unsigned int len) |
2524 | rxvt_term::paste (const unsigned char *data, unsigned int len) |
2506 | { |
2525 | { |
2507 | unsigned int i, j, n; |
2526 | unsigned int i, j, n; |
2508 | unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); |
2527 | unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); |
2509 | |
2528 | |
2510 | #if 0 |
|
|
2511 | /* a paste should act like the user is typing, so check scrollTtyKeypress */ |
|
|
2512 | ZERO_SCROLLBACK (r); |
|
|
2513 | #endif |
|
|
2514 | |
|
|
2515 | /* convert normal newline chars into common keyboard Return key sequence */ |
2529 | /* convert normal newline chars into common keyboard Return key sequence */ |
2516 | for (i = 0; i < len; i += PROP_SIZE) |
2530 | for (i = 0; i < len; i += PROP_SIZE) |
2517 | { |
2531 | { |
2518 | n = min (len - i, PROP_SIZE); |
2532 | n = min (len - i, PROP_SIZE); |
2519 | MEMCPY (ds, data + i, n); |
2533 | memcpy (ds, data + i, n); |
2520 | |
2534 | |
2521 | for (j = 0; j < n; j++) |
2535 | for (j = 0; j < n; j++) |
2522 | if (ds[j] == '\n') |
2536 | if (ds[j] == C0_LF) |
2523 | ds[j] = '\r'; |
2537 | ds[j] = C0_CR; |
2524 | |
2538 | |
2525 | tt_write (ds, (int)n); |
2539 | tt_write (ds, (int)n); |
2526 | } |
2540 | } |
2527 | |
2541 | |
2528 | free (ds); |
2542 | free (ds); |
… | |
… | |
2537 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2551 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2538 | { |
2552 | { |
2539 | long nread = 0; |
2553 | long nread = 0; |
2540 | unsigned long bytes_after; |
2554 | unsigned long bytes_after; |
2541 | XTextProperty ct; |
2555 | XTextProperty ct; |
2542 | |
|
|
2543 | D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait)); |
|
|
2544 | |
2556 | |
2545 | if (prop == None) /* check for failed XConvertSelection */ |
2557 | if (prop == None) /* check for failed XConvertSelection */ |
2546 | { |
2558 | { |
2547 | if ((selection_type & Sel_CompoundText)) |
2559 | if ((selection_type & Sel_CompoundText)) |
2548 | { |
2560 | { |
… | |
… | |
2575 | &ct.nitems, &bytes_after, |
2587 | &ct.nitems, &bytes_after, |
2576 | &ct.value) != Success) |
2588 | &ct.value) != Success) |
2577 | break; |
2589 | break; |
2578 | |
2590 | |
2579 | if (ct.encoding == 0) |
2591 | if (ct.encoding == 0) |
|
|
2592 | break; |
|
|
2593 | |
|
|
2594 | if (ct.encoding == xa[XA_INCR]) |
2580 | { |
2595 | { |
2581 | 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); |
2582 | break; |
2600 | break; |
2583 | } |
2601 | } |
2584 | |
2602 | |
2585 | if (ct.value == NULL) |
2603 | if (ct.value == NULL) |
2586 | { |
|
|
2587 | D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!")); |
|
|
2588 | continue; |
2604 | continue; |
2589 | } |
|
|
2590 | |
2605 | |
2591 | if (ct.nitems == 0) |
2606 | if (ct.nitems == 0) |
2592 | { |
2607 | { |
2593 | D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
|
|
2594 | |
|
|
2595 | if (selection_wait == Sel_normal && nread == 0 |
2608 | if (selection_wait == Sel_normal && nread == 0 |
2596 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2609 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2597 | { |
2610 | { |
2598 | /* |
2611 | /* |
2599 | * pass through again trying CUT_BUFFER0 if we've come from |
2612 | * pass through again trying CUT_BUFFER0 if we've come from |
2600 | * XConvertSelection () but nothing was presented |
2613 | * XConvertSelection () but nothing was presented |
2601 | */ |
2614 | */ |
2602 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
|
|
2603 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2615 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2604 | } |
2616 | } |
2605 | |
2617 | |
2606 | nread = -1; /* discount any previous stuff */ |
2618 | nread = -1; /* discount any previous stuff */ |
2607 | break; |
2619 | break; |
… | |
… | |
2609 | |
2621 | |
2610 | nread += ct.nitems; |
2622 | nread += ct.nitems; |
2611 | |
2623 | |
2612 | char **cl; |
2624 | char **cl; |
2613 | int cr; |
2625 | int cr; |
2614 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, |
2626 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) |
2615 | &cr) >= 0 && cl) |
|
|
2616 | { |
2627 | { |
2617 | for (int i = 0; i < cr; i++) |
2628 | for (int i = 0; i < cr; i++) |
2618 | paste ((unsigned char *)cl[i], STRLEN (cl[i])); |
2629 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2619 | |
2630 | |
2620 | XFreeStringList (cl); |
2631 | XFreeStringList (cl); |
2621 | } |
2632 | } |
2622 | else |
2633 | else |
2623 | paste (ct.value, ct.nitems); |
2634 | paste (ct.value, ct.nitems); |
… | |
… | |
2632 | XFree (ct.value); |
2643 | XFree (ct.value); |
2633 | |
2644 | |
2634 | if (selection_wait == Sel_normal) |
2645 | if (selection_wait == Sel_normal) |
2635 | selection_wait = Sel_none; |
2646 | selection_wait = Sel_none; |
2636 | |
2647 | |
2637 | D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); |
|
|
2638 | return (int)nread; |
2648 | return (int)nread; |
2639 | } |
2649 | } |
2640 | |
2650 | |
2641 | void |
2651 | void |
2642 | rxvt_term::incr_cb (time_watcher &w) |
2652 | rxvt_term::incr_cb (time_watcher &w) |
… | |
… | |
2650 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2660 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2651 | */ |
2661 | */ |
2652 | void |
2662 | void |
2653 | rxvt_term::selection_property (Window win, Atom prop) |
2663 | rxvt_term::selection_property (Window win, Atom prop) |
2654 | { |
2664 | { |
2655 | int reget_time = 0; |
2665 | if (prop == None || selection_wait != Sel_incr) |
2656 | |
|
|
2657 | if (prop == None) |
|
|
2658 | return; |
2666 | return; |
2659 | |
2667 | |
2660 | D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); |
|
|
2661 | if (selection_wait == Sel_normal) |
|
|
2662 | { |
|
|
2663 | int a, afmt; |
|
|
2664 | Atom atype; |
|
|
2665 | unsigned long bytes_after, nitems; |
|
|
2666 | unsigned char *s = NULL; |
|
|
2667 | |
|
|
2668 | a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, |
|
|
2669 | xa[XA_INCR], &atype, &afmt, &nitems, |
|
|
2670 | &bytes_after, &s); |
|
|
2671 | if (s) |
|
|
2672 | XFree (s); |
|
|
2673 | if (a != Success) |
|
|
2674 | return; |
|
|
2675 | |
|
|
2676 | #ifndef __CYGWIN32__ |
|
|
2677 | if (atype == xa[XA_INCR]) |
|
|
2678 | { /* start an INCR transfer */ |
|
|
2679 | D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); |
|
|
2680 | XDeleteProperty (display->display, win, prop); |
|
|
2681 | XFlush (display->display); |
|
|
2682 | reget_time = 1; |
|
|
2683 | selection_wait = Sel_incr; |
|
|
2684 | } |
|
|
2685 | #endif |
|
|
2686 | |
|
|
2687 | } |
|
|
2688 | else if (selection_wait == Sel_incr) |
|
|
2689 | { |
|
|
2690 | reget_time = 1; |
|
|
2691 | |
|
|
2692 | if (selection_paste (win, prop, True) == -1) |
2668 | if (selection_paste (win, prop, 1) > 0) |
2693 | { |
|
|
2694 | D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); |
|
|
2695 | selection_wait = Sel_none; |
|
|
2696 | incr_ev.stop (); |
|
|
2697 | } |
|
|
2698 | } |
|
|
2699 | if (reget_time) /* received more data so reget time */ |
|
|
2700 | incr_ev.start (NOW + 10); |
2669 | incr_ev.start (NOW + 10); |
|
|
2670 | else |
|
|
2671 | { |
|
|
2672 | selection_wait = Sel_none; |
|
|
2673 | incr_ev.stop (); |
|
|
2674 | } |
2701 | } |
2675 | } |
2702 | |
2676 | |
2703 | /* ------------------------------------------------------------------------- */ |
2677 | /* ------------------------------------------------------------------------- */ |
2704 | /* |
2678 | /* |
2705 | * Request the current selection: |
2679 | * Request the current selection: |
… | |
… | |
2711 | * EXT: button 2 release |
2685 | * EXT: button 2 release |
2712 | */ |
2686 | */ |
2713 | void |
2687 | void |
2714 | rxvt_term::selection_request (Time tm, int x, int y) |
2688 | rxvt_term::selection_request (Time tm, int x, int y) |
2715 | { |
2689 | { |
2716 | D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); |
|
|
2717 | |
|
|
2718 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2690 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2719 | return; /* outside window */ |
2691 | return; /* outside window */ |
2720 | |
2692 | |
2721 | if (selection.text) |
2693 | if (selection.text) |
2722 | { /* internal selection */ |
2694 | { /* internal selection */ |
2723 | D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); |
|
|
2724 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2695 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2725 | paste ((unsigned char *)str, strlen (str)); |
2696 | paste ((unsigned char *)str, strlen (str)); |
2726 | free (str); |
2697 | free (str); |
2727 | return; |
2698 | return; |
2728 | } |
2699 | } |
… | |
… | |
2747 | |
2718 | |
2748 | } |
2719 | } |
2749 | } |
2720 | } |
2750 | |
2721 | |
2751 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2722 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2752 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
|
|
2753 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2723 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2754 | } |
2724 | } |
2755 | |
2725 | |
2756 | int |
2726 | int |
2757 | rxvt_term::selection_request_other (Atom target, int selnum) |
2727 | rxvt_term::selection_request_other (Atom target, int selnum) |
… | |
… | |
2770 | else |
2740 | else |
2771 | sel = xa[XA_CLIPBOARD]; |
2741 | sel = xa[XA_CLIPBOARD]; |
2772 | |
2742 | |
2773 | if (XGetSelectionOwner (display->display, sel) != None) |
2743 | if (XGetSelectionOwner (display->display, sel) != None) |
2774 | { |
2744 | { |
2775 | D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); |
|
|
2776 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2745 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2777 | TermWin.vt, selection_request_time); |
2746 | TermWin.vt, selection_request_time); |
2778 | return 1; |
2747 | return 1; |
2779 | } |
2748 | } |
2780 | |
2749 | |
… | |
… | |
2787 | * EXT: SelectionClear |
2756 | * EXT: SelectionClear |
2788 | */ |
2757 | */ |
2789 | void |
2758 | void |
2790 | rxvt_term::selection_clear () |
2759 | rxvt_term::selection_clear () |
2791 | { |
2760 | { |
2792 | D_SELECT ((stderr, "rxvt_selection_clear ()")); |
|
|
2793 | |
|
|
2794 | want_refresh = 1; |
2761 | want_refresh = 1; |
2795 | free (selection.text); |
2762 | free (selection.text); |
2796 | selection.text = NULL; |
2763 | selection.text = NULL; |
2797 | selection.len = 0; |
2764 | selection.len = 0; |
2798 | CLEAR_SELECTION (); |
2765 | CLEAR_SELECTION (); |
… | |
… | |
2811 | { |
2778 | { |
2812 | int i, col, end_col, row, end_row; |
2779 | int i, col, end_col, row, end_row; |
2813 | wchar_t *new_selection_text; |
2780 | wchar_t *new_selection_text; |
2814 | text_t *t; |
2781 | text_t *t; |
2815 | |
2782 | |
2816 | D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); |
|
|
2817 | switch (selection.op) |
2783 | switch (selection.op) |
2818 | { |
2784 | { |
2819 | case SELECTION_CONT: |
2785 | case SELECTION_CONT: |
2820 | break; |
2786 | break; |
2821 | case SELECTION_INIT: |
2787 | case SELECTION_INIT: |
… | |
… | |
2843 | int ofs = 0; |
2809 | int ofs = 0; |
2844 | int extra = 0; |
2810 | int extra = 0; |
2845 | |
2811 | |
2846 | for (; row <= end_row; row++, col = 0) |
2812 | for (; row <= end_row; row++, col = 0) |
2847 | { |
2813 | { |
2848 | t = &(screen.text[row][col]); |
2814 | t = &screen.text[row][col]; |
2849 | |
2815 | |
2850 | end_col = screen.tlen[row]; |
2816 | end_col = screen.tlen[row]; |
2851 | |
2817 | |
2852 | if (end_col == -1) |
2818 | if (end_col == -1) |
2853 | end_col = TermWin.ncol; |
2819 | end_col = TermWin.ncol; |
… | |
… | |
2879 | else |
2845 | else |
2880 | new_selection_text[ofs++] = *t++; |
2846 | new_selection_text[ofs++] = *t++; |
2881 | } |
2847 | } |
2882 | |
2848 | |
2883 | if (screen.tlen[row] != -1 && row != end_row) |
2849 | if (screen.tlen[row] != -1 && row != end_row) |
2884 | new_selection_text[ofs++] = L'\n'; |
2850 | new_selection_text[ofs++] = C0_LF; |
2885 | } |
2851 | } |
2886 | |
2852 | |
2887 | if (end_col != selection.end.col) |
2853 | if (end_col != selection.end.col) |
2888 | new_selection_text[ofs++] = L'\n'; |
2854 | new_selection_text[ofs++] = C0_LF; |
2889 | |
2855 | |
2890 | new_selection_text[ofs] = 0; |
2856 | new_selection_text[ofs] = 0; |
2891 | |
2857 | |
2892 | if (ofs == 0) |
2858 | if (ofs == 0) |
2893 | { |
2859 | { |
… | |
… | |
2917 | XFree (ct.value); |
2883 | XFree (ct.value); |
2918 | } |
2884 | } |
2919 | #endif |
2885 | #endif |
2920 | |
2886 | |
2921 | selection_time = tm; |
2887 | selection_time = tm; |
2922 | D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); |
|
|
2923 | } |
2888 | } |
2924 | |
2889 | |
2925 | /* ------------------------------------------------------------------------- */ |
2890 | /* ------------------------------------------------------------------------- */ |
2926 | /* |
2891 | /* |
2927 | * 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 |
2928 | * EXT: button 1 press |
2893 | * EXT: button 1 press |
2929 | */ |
2894 | */ |
2930 | void |
2895 | void |
2931 | rxvt_term::selection_click (int clicks, int x, int y) |
2896 | rxvt_term::selection_click (int clicks, int x, int y) |
2932 | { |
2897 | { |
2933 | D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y)); |
|
|
2934 | |
|
|
2935 | clicks = ((clicks - 1) % 3) + 1; |
2898 | clicks = ((clicks - 1) % 3) + 1; |
2936 | selection.clicks = clicks; /* save clicks so extend will work */ |
2899 | selection.clicks = clicks; /* save clicks so extend will work */ |
2937 | |
2900 | |
2938 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
2901 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
2939 | |
2902 | |
… | |
… | |
2981 | * We now only find out the boundary in one direction |
2944 | * We now only find out the boundary in one direction |
2982 | */ |
2945 | */ |
2983 | |
2946 | |
2984 | /* 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 */ |
2985 | #define DELIMIT_TEXT(x) \ |
2948 | #define DELIMIT_TEXT(x) \ |
2986 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) |
2949 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
2987 | #define DELIMIT_REND(x) 1 |
2950 | #define DELIMIT_REND(x) 1 |
2988 | |
2951 | |
2989 | void |
2952 | void |
2990 | 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) |
2991 | { |
2954 | { |
… | |
… | |
3009 | |
2972 | |
3010 | row = mark->row + TermWin.saveLines; |
2973 | row = mark->row + TermWin.saveLines; |
3011 | col = mark->col; |
2974 | col = mark->col; |
3012 | MAX_IT (col, 0); |
2975 | MAX_IT (col, 0); |
3013 | /* find the edge of a word */ |
2976 | /* find the edge of a word */ |
3014 | stp = & (screen.text[row][col]); |
2977 | stp = &screen.text[row][col]; |
3015 | w1 = DELIMIT_TEXT (*stp); |
2978 | w1 = DELIMIT_TEXT (*stp); |
3016 | |
2979 | |
3017 | srp = (&screen.rend[row][col]); |
2980 | srp = &screen.rend[row][col]; |
3018 | w2 = DELIMIT_REND (*srp); |
2981 | w2 = DELIMIT_REND (*srp); |
3019 | |
2982 | |
3020 | for (;;) |
2983 | for (;;) |
3021 | { |
2984 | { |
3022 | for (; col != bound.col; col += dirnadd) |
2985 | for (; col != bound.col; col += dirnadd) |
… | |
… | |
3056 | } |
3019 | } |
3057 | break; |
3020 | break; |
3058 | } |
3021 | } |
3059 | |
3022 | |
3060 | Old_Word_Selection_You_Die: |
3023 | Old_Word_Selection_You_Die: |
3061 | D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); |
|
|
3062 | |
|
|
3063 | if (dirn == DN) |
3024 | if (dirn == DN) |
3064 | col++; /* put us on one past the end */ |
3025 | col++; /* put us on one past the end */ |
3065 | |
3026 | |
3066 | /* Poke the values back in */ |
3027 | /* Poke the values back in */ |
3067 | ret->row = row - TermWin.saveLines; |
3028 | ret->row = row - TermWin.saveLines; |
… | |
… | |
3101 | /* select nothing */ |
3062 | /* select nothing */ |
3102 | selection.beg.row = selection.end.row = 0; |
3063 | selection.beg.row = selection.end.row = 0; |
3103 | selection.beg.col = selection.end.col = 0; |
3064 | selection.beg.col = selection.end.col = 0; |
3104 | selection.clicks = 4; |
3065 | selection.clicks = 4; |
3105 | want_refresh = 1; |
3066 | want_refresh = 1; |
3106 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
|
|
3107 | return; |
3067 | return; |
3108 | } |
3068 | } |
3109 | |
3069 | |
3110 | if (selection.clicks == 4) |
3070 | if (selection.clicks == 4) |
3111 | selection.clicks = 1; |
3071 | selection.clicks = 1; |
… | |
… | |
3120 | * Extend the selection to the specified col/row |
3080 | * Extend the selection to the specified col/row |
3121 | */ |
3081 | */ |
3122 | void |
3082 | void |
3123 | 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) |
3124 | { |
3084 | { |
3125 | int16_t ncol = TermWin.ncol; |
3085 | int16_t ncol = TermWin.ncol; |
3126 | int end_col; |
3086 | int end_col; |
3127 | row_col_t pos; |
3087 | row_col_t pos; |
3128 | enum { |
3088 | enum { |
3129 | LEFT, RIGHT |
3089 | LEFT, RIGHT |
3130 | } closeto = RIGHT; |
3090 | } closeto = RIGHT; |
3131 | |
|
|
3132 | D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); |
|
|
3133 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
|
|
3134 | |
3091 | |
3135 | want_refresh = 1; |
3092 | want_refresh = 1; |
3136 | switch (selection.op) |
3093 | switch (selection.op) |
3137 | { |
3094 | { |
3138 | case SELECTION_INIT: |
3095 | case SELECTION_INIT: |
… | |
… | |
3160 | && selection.beg.row == selection.end.row |
3117 | && selection.beg.row == selection.end.row |
3161 | && selection.beg.row != selection.mark.row) |
3118 | && selection.beg.row != selection.mark.row) |
3162 | { |
3119 | { |
3163 | selection.beg.col = selection.end.col = selection.mark.col; |
3120 | selection.beg.col = selection.end.col = selection.mark.col; |
3164 | selection.beg.row = selection.end.row = selection.mark.row; |
3121 | selection.beg.row = selection.end.row = selection.mark.row; |
3165 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
|
|
3166 | } |
3122 | } |
3167 | |
3123 | |
3168 | pos.col = col; |
3124 | pos.col = col; |
3169 | pos.row = row; |
3125 | pos.row = row; |
3170 | |
3126 | |
… | |
… | |
3263 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3219 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3264 | selection_delimit_word (DN, & (selection.end), & (selection.end)); |
3220 | selection_delimit_word (DN, & (selection.end), & (selection.end)); |
3265 | } |
3221 | } |
3266 | else if (selection.clicks == 3) |
3222 | else if (selection.clicks == 3) |
3267 | { |
3223 | { |
3268 | #ifndef NO_FRILLS |
3224 | #if ENABLE_FRILLS |
3269 | if ((Options & Opt_tripleclickwords)) |
3225 | if ((options & Opt_tripleclickwords)) |
3270 | { |
3226 | { |
3271 | int end_row; |
3227 | int end_row; |
3272 | |
3228 | |
3273 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3229 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3274 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3230 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
… | |
… | |
3299 | if (button3 && buttonpress) |
3255 | if (button3 && buttonpress) |
3300 | { /* mark may need to be changed */ |
3256 | { /* mark may need to be changed */ |
3301 | if (closeto == LEFT) |
3257 | if (closeto == LEFT) |
3302 | { |
3258 | { |
3303 | selection.mark.row = selection.end.row; |
3259 | selection.mark.row = selection.end.row; |
3304 | selection.mark.col = selection.end.col |
3260 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3305 | - (selection.clicks == 2); |
|
|
3306 | } |
3261 | } |
3307 | else |
3262 | else |
3308 | { |
3263 | { |
3309 | selection.mark.row = selection.beg.row; |
3264 | selection.mark.row = selection.beg.row; |
3310 | selection.mark.col = selection.beg.col; |
3265 | selection.mark.col = selection.beg.col; |
3311 | } |
3266 | } |
3312 | } |
3267 | } |
3313 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
|
|
3314 | } |
3268 | } |
3315 | |
3269 | |
3316 | #ifndef NO_FRILLS |
3270 | #if ENABLE_FRILLS |
3317 | void |
3271 | void |
3318 | rxvt_term::selection_remove_trailing_spaces () |
3272 | rxvt_term::selection_remove_trailing_spaces () |
3319 | { |
3273 | { |
3320 | int32_t end_col, end_row; |
3274 | int32_t end_col, end_row; |
3321 | text_t *stp; |
3275 | text_t *stp; |
… | |
… | |
3410 | (8 * sizeof (target_list[0])), PropModeReplace, |
3364 | (8 * sizeof (target_list[0])), PropModeReplace, |
3411 | (unsigned char *)target_list, |
3365 | (unsigned char *)target_list, |
3412 | target - target_list); |
3366 | target - target_list); |
3413 | ev.property = rq.property; |
3367 | ev.property = rq.property; |
3414 | } |
3368 | } |
|
|
3369 | #if TODO // TODO |
3415 | else if (rq.target == xa[XA_MULTIPLE]) |
3370 | else if (rq.target == xa[XA_MULTIPLE]) |
3416 | { |
3371 | { |
3417 | /* TODO: Handle MULTIPLE */ |
3372 | /* TODO: Handle MULTIPLE */ |
3418 | } |
3373 | } |
|
|
3374 | #endif |
3419 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3375 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3420 | { |
3376 | { |
3421 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3377 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3422 | (8 * sizeof (Time)), PropModeReplace, |
3378 | (8 * sizeof (Time)), PropModeReplace, |
3423 | (unsigned char *)&selection_time, 1); |
3379 | (unsigned char *)&selection_time, 1); |
… | |
… | |
3504 | } |
3460 | } |
3505 | |
3461 | |
3506 | /* ------------------------------------------------------------------------- */ |
3462 | /* ------------------------------------------------------------------------- */ |
3507 | #ifdef USE_XIM |
3463 | #ifdef USE_XIM |
3508 | void |
3464 | void |
3509 | rxvt_term::im_set_position (XPoint *pos) |
3465 | rxvt_term::im_set_position (XPoint &pos) |
3510 | { |
3466 | { |
3511 | XWindowAttributes xwa; |
3467 | XWindowAttributes xwa; |
3512 | |
3468 | |
3513 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
3469 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
|
|
3470 | |
3514 | pos->x = Col2Pixel (screen.cur.col) + xwa.x; |
3471 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3515 | pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; |
3472 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; |
3516 | } |
3473 | } |
3517 | |
|
|
3518 | #endif |
3474 | #endif |
3519 | /* ------------------------------------------------------------------------- */ |
3475 | |
3520 | |
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 |
3521 | /* ------------------------------------------------------------------------- * |
3598 | /* ------------------------------------------------------------------------- */ |
3522 | * DEBUG ROUTINES * |
|
|
3523 | * ------------------------------------------------------------------------- */ |
|
|
3524 | #if 0 |
|
|
3525 | void |
|
|
3526 | rxvt_debug_colors (void) |
|
|
3527 | { |
|
|
3528 | int color; |
|
|
3529 | const char *name[] = |
|
|
3530 | { |
|
|
3531 | "fg", "bg", |
|
|
3532 | "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" |
|
|
3533 | }; |
|
|
3534 | |
|
|
3535 | fprintf (stderr, "Color ( "); |
|
|
3536 | if (rstyle & RS_RVid) |
|
|
3537 | fprintf (stderr, "rvid "); |
|
|
3538 | if (rstyle & RS_Bold) |
|
|
3539 | fprintf (stderr, "bold "); |
|
|
3540 | if (rstyle & RS_Blink) |
|
|
3541 | fprintf (stderr, "blink "); |
|
|
3542 | if (rstyle & RS_Uline) |
|
|
3543 | fprintf (stderr, "uline "); |
|
|
3544 | fprintf (stderr, "): "); |
|
|
3545 | |
|
|
3546 | color = GET_FGCOLOR (rstyle); |
|
|
3547 | #ifndef NO_BRIGHTCOLOR |
|
|
3548 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
|
|
3549 | { |
|
|
3550 | color -= (minBrightCOLOR - minCOLOR); |
|
|
3551 | fprintf (stderr, "bright "); |
|
|
3552 | } |
|
|
3553 | #endif |
|
|
3554 | fprintf (stderr, "%s on ", name[color]); |
|
|
3555 | |
|
|
3556 | color = GET_BGCOLOR (rstyle); |
|
|
3557 | #ifndef NO_BRIGHTCOLOR |
|
|
3558 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
|
|
3559 | { |
|
|
3560 | color -= (minBrightCOLOR - minCOLOR); |
|
|
3561 | fprintf (stderr, "bright "); |
|
|
3562 | } |
|
|
3563 | #endif |
|
|
3564 | fprintf (stderr, "%s\n", name[color]); |
|
|
3565 | } |
|
|
3566 | #endif |
|
|