1 | /*--------------------------------*-C-*--------------------------------------* |
1 | /*--------------------------------*-C-*--------------------------------------* |
2 | * File: screen.c |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
|
|
6 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
6 | * |
7 | * |
7 | * This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
9 | * the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * (at your option) any later version. |
11 | * (at your option) any later version. |
… | |
… | |
16 | * |
17 | * |
17 | * You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License |
18 | * along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | *--------------------------------------------------------------------------*/ |
21 | *--------------------------------------------------------------------------*/ |
|
|
22 | |
21 | /* |
23 | /* |
22 | * We handle _all_ screen updates and selections |
24 | * This file handles _all_ screen updates and selections |
23 | */ |
25 | */ |
24 | |
26 | |
25 | #include "../config.h" /* NECESSARY */ |
27 | #include "../config.h" /* NECESSARY */ |
26 | #define INTERN_SCREEN |
28 | #define INTERN_SCREEN |
27 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "screen.intpro" /* PROTOS for internal routines */ |
30 | #include "screen.intpro" /* PROTOS for internal routines */ |
29 | |
31 | |
30 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
32 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
31 | |
33 | |
32 | #include <stdint.h> |
34 | #include <inttypes.h> |
33 | #include <wchar.h> |
35 | #include <wchar.h> |
34 | |
36 | |
35 | #include "salloc.C" // HACK!! |
37 | #include "salloc.C" // HACK, should be a seperate compile! |
36 | |
38 | |
37 | inline void fill_text (text_t *start, text_t value, int len) |
39 | inline void fill_text (text_t *start, text_t value, int len) |
38 | { |
40 | { |
39 | while (len--) |
41 | while (len--) |
40 | *start++ = value; |
42 | *start++ = value; |
… | |
… | |
46 | |
48 | |
47 | /* ------------------------------------------------------------------------- * |
49 | /* ------------------------------------------------------------------------- * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
50 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * ------------------------------------------------------------------------- */ |
51 | * ------------------------------------------------------------------------- */ |
50 | #define ZERO_SCROLLBACK() \ |
52 | #define ZERO_SCROLLBACK() \ |
51 | if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ |
53 | if (Options & Opt_scrollTtyOutput) \ |
52 | TermWin.view_start = 0 |
54 | TermWin.view_start = 0 |
53 | #define CLEAR_SELECTION() \ |
55 | #define CLEAR_SELECTION() \ |
54 | selection.beg.row = selection.beg.col \ |
56 | selection.beg.row = selection.beg.col \ |
55 | = selection.end.row = selection.end.col = 0 |
57 | = selection.end.row = selection.end.col = 0 |
56 | #define CLEAR_ALL_SELECTION() \ |
58 | #define CLEAR_ALL_SELECTION() \ |
57 | selection.beg.row = selection.beg.col \ |
59 | selection.beg.row = selection.beg.col \ |
58 | = selection.mark.row = selection.mark.col \ |
60 | = selection.mark.row = selection.mark.col \ |
59 | = selection.end.row = selection.end.col = 0 |
61 | = selection.end.row = selection.end.col = 0 |
60 | |
62 | |
61 | #define ROW_AND_COL_IS_AFTER(A, B, C, D) \ |
63 | #define ROW_AND_COL_IS_AFTER(A, B, C, D) \ |
62 | (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) |
64 | (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) |
63 | #define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ |
65 | #define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ |
64 | (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) |
66 | (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) |
65 | #define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ |
67 | #define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ |
66 | (((A) == (C)) && ((B) > (D))) |
68 | (((A) == (C)) && ((B) > (D))) |
67 | #define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ |
69 | #define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ |
68 | (((A) == (C)) && ((B) >= (D))) |
70 | (((A) == (C)) && ((B) >= (D))) |
69 | #define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ |
71 | #define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ |
70 | (((A) == (C)) && ((B) < (D))) |
72 | (((A) == (C)) && ((B) < (D))) |
71 | #define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ |
73 | #define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ |
72 | (((A) == (C)) && ((B) <= (D))) |
74 | (((A) == (C)) && ((B) <= (D))) |
73 | |
75 | |
74 | /* these must be row_col_t */ |
76 | /* these must be row_col_t */ |
75 | #define ROWCOL_IS_AFTER(X, Y) \ |
77 | #define ROWCOL_IS_AFTER(X, Y) \ |
76 | ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
78 | ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
77 | #define ROWCOL_IS_BEFORE(X, Y) \ |
79 | #define ROWCOL_IS_BEFORE(X, Y) \ |
78 | ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
80 | ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
79 | #define ROWCOL_IN_ROW_AFTER(X, Y) \ |
81 | #define ROWCOL_IN_ROW_AFTER(X, Y) \ |
80 | ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
82 | ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
81 | #define ROWCOL_IN_ROW_BEFORE(X, Y) \ |
83 | #define ROWCOL_IN_ROW_BEFORE(X, Y) \ |
82 | ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
84 | ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
83 | #define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ |
85 | #define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ |
84 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
86 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
85 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
87 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
86 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
88 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
87 | |
89 | |
88 | /* |
90 | /* |
89 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
91 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
90 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
92 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
91 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
93 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
92 | */ |
94 | */ |
93 | #define drawBuffer TermWin.vt |
95 | #define drawBuffer TermWin.vt |
94 | |
96 | |
95 | #define CLEAR_ROWS(row, num) \ |
97 | #define CLEAR_ROWS(row, num) \ |
96 | if (TermWin.mapped) \ |
98 | if (TermWin.mapped) \ |
97 | XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ |
99 | XClearArea (display->display, drawBuffer, 0, \ |
98 | Row2Pixel (row), (unsigned int)TermWin.width, \ |
100 | Row2Pixel (row), (unsigned int)TermWin.width, \ |
99 | (unsigned int)Height2Pixel (num), False) |
101 | (unsigned int)Height2Pixel (num), False) |
100 | |
102 | |
101 | #define CLEAR_CHARS(x, y, num) \ |
103 | #define CLEAR_CHARS(x, y, num) \ |
102 | if (TermWin.mapped) \ |
104 | if (TermWin.mapped) \ |
103 | XClearArea (display->display, drawBuffer, x, y, \ |
105 | XClearArea (display->display, drawBuffer, x, y, \ |
104 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Width2Pixel (num), \ |
105 | (unsigned int)Height2Pixel (1), False) |
107 | (unsigned int)Height2Pixel (1), False) |
106 | |
108 | |
107 | #define ERASE_ROWS(row, num) \ |
109 | #define ERASE_ROWS(row, num) \ |
108 | XFillRectangle (display->display, drawBuffer, TermWin.gc, \ |
110 | XFillRectangle (display->display, drawBuffer, TermWin.gc, \ |
109 | TermWin.int_bwidth, Row2Pixel (row), \ |
111 | 0, Row2Pixel (row), \ |
110 | (unsigned int)TermWin.width, \ |
112 | (unsigned int)TermWin.width, \ |
111 | (unsigned int)Height2Pixel (num)) |
113 | (unsigned int)Height2Pixel (num)) |
112 | |
114 | |
113 | /* ------------------------------------------------------------------------- * |
115 | /* ------------------------------------------------------------------------- * |
114 | * SCREEN `COMMON' ROUTINES * |
116 | * SCREEN `COMMON' ROUTINES * |
115 | * ------------------------------------------------------------------------- */ |
117 | * ------------------------------------------------------------------------- */ |
116 | /* Fill part/all of a line with blanks. */ |
118 | /* Fill part/all of a line with blanks. */ |
117 | void |
119 | void |
118 | rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) |
120 | rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) |
119 | { |
121 | { |
120 | efs &= ~RS_baseattrMask; |
122 | efs &= ~RS_baseattrMask; |
121 | efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); |
123 | efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]); |
122 | |
124 | |
123 | while (width--) |
125 | while (width--) |
124 | { |
126 | { |
125 | *et++ = ' '; |
127 | *et++ = ' '; |
126 | *er++ = efs; |
128 | *er++ = efs; |
… | |
… | |
170 | nrow = TermWin.nrow; |
172 | nrow = TermWin.nrow; |
171 | |
173 | |
172 | if (ncol == prev_ncol && nrow == prev_nrow) |
174 | if (ncol == prev_ncol && nrow == prev_nrow) |
173 | return; |
175 | return; |
174 | |
176 | |
|
|
177 | // we need at least two lines for wrapping to work correctly |
|
|
178 | if (nrow + TermWin.saveLines < 2) |
|
|
179 | { |
|
|
180 | TermWin.saveLines++; |
|
|
181 | prev_nrow--; |
|
|
182 | TermWin.nscrolled++; |
|
|
183 | } |
|
|
184 | |
175 | want_refresh = 1; |
185 | want_refresh = 1; |
176 | |
186 | |
|
|
187 | prev_total_rows = prev_nrow + TermWin.saveLines; |
177 | total_rows = nrow + TermWin.saveLines; |
188 | total_rows = nrow + TermWin.saveLines; |
178 | prev_total_rows = prev_nrow + TermWin.saveLines; |
|
|
179 | |
189 | |
180 | screen.tscroll = 0; |
190 | screen.tscroll = 0; |
181 | screen.bscroll = nrow - 1; |
191 | screen.bscroll = nrow - 1; |
182 | |
192 | |
183 | if (!talloc) |
193 | if (!talloc) |
184 | { |
194 | { |
185 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
195 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
186 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
196 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
187 | } |
197 | } |
188 | |
198 | |
189 | if (prev_nrow == 0) |
199 | if (!screen.text) |
190 | { |
200 | { |
191 | /* |
201 | /* |
192 | * first time called so just malloc everything : don't rely on realloc |
202 | * first time called so just malloc everything: don't rely on realloc |
193 | * Note: this is still needed so that all the scrollback lines are NULL |
203 | * Note: this is still needed so that all the scrollback lines are NULL |
194 | */ |
204 | */ |
195 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
205 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
196 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
206 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
197 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
207 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
… | |
… | |
254 | scr_scroll_text (0, (int)prev_nrow - 1, k, 1); |
264 | scr_scroll_text (0, (int)prev_nrow - 1, k, 1); |
255 | |
265 | |
256 | for (p = nrow; p < prev_nrow; p++) |
266 | for (p = nrow; p < prev_nrow; p++) |
257 | { |
267 | { |
258 | q = p + TermWin.saveLines; |
268 | q = p + TermWin.saveLines; |
|
|
269 | |
259 | if (screen.text[q]) |
270 | if (screen.text[q]) |
260 | { |
271 | { |
261 | #ifdef DEBUG_STRICT |
272 | #ifdef DEBUG_STRICT |
262 | assert (screen.rend[q]); |
273 | assert (screen.rend[q]); |
263 | #endif |
274 | #endif |
264 | talloc->free (screen.text[q]); |
275 | talloc->free (screen.text[q]); |
265 | ralloc->free (screen.rend[q]); |
276 | ralloc->free (screen.rend[q]); |
266 | } |
277 | } |
|
|
278 | |
267 | if (swap.text[p]) |
279 | if (swap.text[p]) |
268 | { |
280 | { |
269 | #ifdef DEBUG_STRICT |
281 | #ifdef DEBUG_STRICT |
270 | assert (swap.rend[p]); |
282 | assert (swap.rend[p]); |
271 | #endif |
283 | #endif |
272 | talloc->free (swap.text[p]); |
284 | talloc->free (swap.text[p]); |
273 | ralloc->free (swap.rend[p]); |
285 | ralloc->free (swap.rend[p]); |
274 | } |
286 | } |
|
|
287 | |
275 | #ifdef DEBUG_STRICT |
288 | #ifdef DEBUG_STRICT |
276 | assert (drawn_text[p] && drawn_rend[p]); |
289 | assert (drawn_text[p] && drawn_rend[p]); |
277 | #endif |
290 | #endif |
278 | talloc->free (drawn_text[p]); |
291 | talloc->free (drawn_text[p]); |
279 | ralloc->free (drawn_rend[p]); |
292 | ralloc->free (drawn_rend[p]); |
… | |
… | |
309 | swap.tlen[p] = 0; |
322 | swap.tlen[p] = 0; |
310 | swap.text[p] = NULL; |
323 | swap.text[p] = NULL; |
311 | swap.rend[p] = NULL; |
324 | swap.rend[p] = NULL; |
312 | drawn_text[p] = NULL; |
325 | drawn_text[p] = NULL; |
313 | drawn_rend[p] = NULL; |
326 | drawn_rend[p] = NULL; |
314 | scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); |
327 | scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); |
315 | scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); |
328 | scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); |
316 | } |
329 | } |
317 | |
330 | |
318 | if (k > 0) |
331 | if (k > 0) |
319 | { |
332 | { |
… | |
… | |
334 | } |
347 | } |
335 | |
348 | |
336 | /* resize columns */ |
349 | /* resize columns */ |
337 | if (ncol != prev_ncol) |
350 | if (ncol != prev_ncol) |
338 | { |
351 | { |
339 | int common = min (prev_ncol, ncol); |
|
|
340 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
352 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
341 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
353 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
342 | |
354 | |
343 | for (p = 0; p < total_rows; p++) |
355 | for (p = 0; p < total_rows; p++) |
344 | { |
356 | { |
345 | if (screen.text[p]) |
357 | if (screen.text[p]) |
346 | { |
358 | { |
347 | text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; |
359 | screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t)); |
348 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r; |
360 | screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t)); |
349 | |
361 | |
350 | MIN_IT (screen.tlen[p], (int16_t)ncol); |
362 | MIN_IT (screen.tlen[p], (int16_t)ncol); |
351 | |
363 | |
352 | if (ncol > prev_ncol) |
364 | if (ncol > prev_ncol) |
353 | scr_blank_line (& (screen.text[p][prev_ncol]), |
365 | scr_blank_line (&screen.text[p][prev_ncol], |
354 | & (screen.rend[p][prev_ncol]), |
366 | &screen.rend[p][prev_ncol], |
355 | ncol - prev_ncol, |
367 | ncol - prev_ncol, setrstyle); |
356 | setrstyle); |
|
|
357 | } |
368 | } |
358 | } |
369 | } |
359 | |
370 | |
360 | for (p = 0; p < nrow; p++) |
371 | for (p = 0; p < nrow; p++) |
361 | { |
372 | { |
362 | text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t; |
373 | drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t)); |
363 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r; |
374 | drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t)); |
364 | |
375 | |
365 | if (ncol > prev_ncol) |
376 | if (ncol > prev_ncol) |
366 | scr_blank_line (& (drawn_text[p][prev_ncol]), |
377 | scr_blank_line (&drawn_text[p][prev_ncol], |
367 | & (drawn_rend[p][prev_ncol]), |
378 | &drawn_rend[p][prev_ncol], |
368 | ncol - prev_ncol, setrstyle); |
379 | ncol - prev_ncol, setrstyle); |
369 | |
380 | |
370 | if (swap.text[p]) |
381 | if (swap.text[p]) |
371 | { |
382 | { |
372 | text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t; |
383 | swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t)); |
373 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r; |
384 | swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t)); |
374 | |
385 | |
375 | MIN_IT (swap.tlen[p], (int16_t)ncol); |
386 | MIN_IT (swap.tlen[p], (int16_t)ncol); |
376 | |
387 | |
377 | if (ncol > prev_ncol) |
388 | if (ncol > prev_ncol) |
378 | scr_blank_line (& (swap.text[p][prev_ncol]), |
389 | scr_blank_line (&swap.text[p][prev_ncol], |
379 | & (swap.rend[p][prev_ncol]), |
390 | &swap.rend[p][prev_ncol], |
380 | ncol - prev_ncol, setrstyle); |
391 | ncol - prev_ncol, setrstyle); |
381 | } |
392 | } |
382 | |
393 | |
383 | } |
394 | } |
384 | |
395 | |
… | |
… | |
436 | { |
447 | { |
437 | uint16_t total_rows; |
448 | uint16_t total_rows; |
438 | int i; |
449 | int i; |
439 | |
450 | |
440 | total_rows = TermWin.nrow + TermWin.saveLines; |
451 | total_rows = TermWin.nrow + TermWin.saveLines; |
441 | |
|
|
442 | #ifdef DEBUG_STRICT |
|
|
443 | for (i = 0; i < total_rows; i++) |
|
|
444 | { |
|
|
445 | if (screen.text[i]) |
|
|
446 | /* then so is screen.rend[i] */ |
|
|
447 | assert (screen.rend[i]); |
|
|
448 | } |
|
|
449 | #endif |
|
|
450 | |
452 | |
451 | delete talloc; talloc = 0; |
453 | delete talloc; talloc = 0; |
452 | delete ralloc; ralloc = 0; |
454 | delete ralloc; ralloc = 0; |
453 | |
455 | |
454 | free (screen.text); |
456 | free (screen.text); |
… | |
… | |
483 | |
485 | |
484 | scr_release (); |
486 | scr_release (); |
485 | prev_nrow = prev_ncol = 0; |
487 | prev_nrow = prev_ncol = 0; |
486 | scr_reset (); |
488 | scr_reset (); |
487 | |
489 | |
488 | scr_clear (); |
490 | scr_clear (true); |
489 | scr_refresh (SLOW_REFRESH); |
491 | scr_refresh (SLOW_REFRESH); |
490 | } |
492 | } |
491 | |
493 | |
492 | /* ------------------------------------------------------------------------- * |
494 | /* ------------------------------------------------------------------------- * |
493 | * PROCESS SCREEN COMMANDS * |
495 | * PROCESS SCREEN COMMANDS * |
… | |
… | |
498 | * XTERM_SEQ: Restore cursor: ESC 8 |
500 | * XTERM_SEQ: Restore cursor: ESC 8 |
499 | */ |
501 | */ |
500 | void |
502 | void |
501 | rxvt_term::scr_cursor (int mode) |
503 | rxvt_term::scr_cursor (int mode) |
502 | { |
504 | { |
503 | screen_t *s; |
505 | screen_t *s; |
504 | |
506 | |
505 | D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); |
507 | D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); |
506 | |
508 | |
507 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
509 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
508 | if (current_screen == SECONDARY) |
510 | if (current_screen == SECONDARY) |
509 | s = & (swap); |
511 | s = &swap; |
510 | else |
512 | else |
511 | #endif |
513 | #endif |
512 | s = & (screen); |
514 | s = &screen; |
|
|
515 | |
513 | switch (mode) |
516 | switch (mode) |
514 | { |
517 | { |
515 | case SAVE: |
518 | case SAVE: |
516 | s->s_cur.row = s->cur.row; |
519 | s->s_cur.row = s->cur.row; |
517 | s->s_cur.col = s->cur.col; |
520 | s->s_cur.col = s->cur.col; |
518 | s->s_rstyle = rstyle; |
521 | s->s_rstyle = rstyle; |
519 | s->s_charset = s->charset; |
522 | s->s_charset = s->charset; |
520 | s->s_charset_char = charsets[s->charset]; |
523 | s->s_charset_char = charsets[s->charset]; |
521 | break; |
524 | break; |
|
|
525 | |
522 | case RESTORE: |
526 | case RESTORE: |
523 | want_refresh = 1; |
527 | want_refresh = 1; |
524 | s->cur.row = s->s_cur.row; |
528 | s->cur.row = s->s_cur.row; |
525 | s->cur.col = s->s_cur.col; |
529 | s->cur.col = s->s_cur.col; |
526 | s->flags &= ~Screen_WrapNext; |
530 | s->flags &= ~Screen_WrapNext; |
… | |
… | |
528 | s->charset = s->s_charset; |
532 | s->charset = s->s_charset; |
529 | charsets[s->charset] = s->s_charset_char; |
533 | charsets[s->charset] = s->s_charset_char; |
530 | set_font_style (); |
534 | set_font_style (); |
531 | break; |
535 | break; |
532 | } |
536 | } |
|
|
537 | |
533 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
538 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
534 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
539 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
535 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
540 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
536 | #ifdef DEBUG_STRICT |
541 | #ifdef DEBUG_STRICT |
537 | assert (s->cur.row >= 0); |
542 | assert (s->cur.row >= 0); |
… | |
… | |
549 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
554 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
550 | */ |
555 | */ |
551 | int |
556 | int |
552 | rxvt_term::scr_change_screen (int scrn) |
557 | rxvt_term::scr_change_screen (int scrn) |
553 | { |
558 | { |
554 | int i; |
559 | int i; |
555 | #if NSCREENS |
560 | #if NSCREENS |
556 | int offset; |
561 | int offset; |
557 | #endif |
562 | #endif |
558 | |
563 | |
559 | want_refresh = 1; |
564 | want_refresh = 1; |
560 | |
565 | |
561 | D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); |
566 | D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); |
562 | |
567 | |
563 | TermWin.view_start = 0; |
568 | TermWin.view_start = 0; |
564 | |
569 | |
565 | if (current_screen == scrn) |
570 | if (current_screen == scrn) |
566 | return current_screen; |
571 | return scrn; |
567 | |
572 | |
568 | selection_check (2); /* check for boundary cross */ |
573 | selection_check (2); /* check for boundary cross */ |
569 | |
574 | |
570 | SWAP_IT (current_screen, scrn, int); |
575 | SWAP_IT (current_screen, scrn, int); |
571 | #if NSCREENS |
576 | #if NSCREENS |
|
|
577 | if (Options & Opt_secondaryScreen) |
|
|
578 | { |
572 | num_scr = 0; |
579 | num_scr = 0; |
573 | offset = TermWin.saveLines; |
580 | offset = TermWin.saveLines; |
574 | for (i = prev_nrow; i--;) |
581 | for (i = prev_nrow; i--;) |
575 | { |
582 | { |
576 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
583 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
577 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
584 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
578 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
585 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
579 | } |
586 | } |
580 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
587 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
581 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
588 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
582 | # ifdef DEBUG_STRICT |
589 | # ifdef DEBUG_STRICT |
583 | assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); |
590 | assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); |
584 | assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); |
591 | assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); |
585 | # else /* drive with your eyes closed */ |
592 | # else /* drive with your eyes closed */ |
586 | MAX_IT (screen.cur.row, 0); |
593 | MAX_IT (screen.cur.row, 0); |
587 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
594 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
588 | MAX_IT (screen.cur.col, 0); |
595 | MAX_IT (screen.cur.col, 0); |
589 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
596 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
590 | # endif |
597 | # endif |
591 | SWAP_IT (screen.charset, swap.charset, int16_t); |
598 | SWAP_IT (screen.charset, swap.charset, int16_t); |
592 | SWAP_IT (screen.flags, swap.flags, int); |
599 | SWAP_IT (screen.flags, swap.flags, int); |
593 | screen.flags |= Screen_VisibleCursor; |
600 | screen.flags |= Screen_VisibleCursor; |
594 | swap.flags |= Screen_VisibleCursor; |
601 | swap.flags |= Screen_VisibleCursor; |
595 | #else |
602 | } |
596 | # ifdef SCROLL_ON_NO_SECONDARY |
603 | else |
|
|
604 | #endif |
|
|
605 | if (Options & Opt_secondaryScroll) |
597 | if (current_screen == PRIMARY) |
606 | //if (current_screen == PRIMARY) |
598 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
607 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
599 | # endif |
|
|
600 | #endif |
|
|
601 | return scrn; |
608 | return scrn; |
602 | } |
609 | } |
603 | |
610 | |
604 | /* ------------------------------------------------------------------------- */ |
611 | /* ------------------------------------------------------------------------- */ |
605 | /* |
612 | /* |
… | |
… | |
647 | return 0; |
654 | return 0; |
648 | |
655 | |
649 | want_refresh = 1; |
656 | want_refresh = 1; |
650 | D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); |
657 | D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); |
651 | |
658 | |
652 | if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) |
659 | if (row1 == 0 && count > 0 |
|
|
660 | && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) |
653 | { |
661 | { |
654 | nscrolled = (long)TermWin.nscrolled + (long)count; |
662 | nscrolled = (long)TermWin.nscrolled + (long)count; |
655 | |
663 | |
656 | if (nscrolled > (long)TermWin.saveLines) |
664 | if (nscrolled > (long)TermWin.saveLines) |
657 | TermWin.nscrolled = TermWin.saveLines; |
665 | TermWin.nscrolled = TermWin.saveLines; |
… | |
… | |
705 | if (j > 0) |
713 | if (j > 0) |
706 | { |
714 | { |
707 | /* A: scroll up */ |
715 | /* A: scroll up */ |
708 | |
716 | |
709 | /* A1: Copy lines that will get clobbered by the rotation */ |
717 | /* A1: Copy lines that will get clobbered by the rotation */ |
|
|
718 | memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); |
|
|
719 | memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); |
|
|
720 | |
|
|
721 | /* A2: Rotate lines */ |
|
|
722 | i = row2 - row1 - count + 1; |
|
|
723 | memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); |
|
|
724 | memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); |
|
|
725 | memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); |
|
|
726 | |
|
|
727 | j = row2 - count + 1, i = count; |
|
|
728 | } |
|
|
729 | else /* if (j < 0) */ |
|
|
730 | { |
|
|
731 | /* B: scroll down */ |
|
|
732 | |
|
|
733 | /* B1: Copy lines that will get clobbered by the rotation */ |
710 | for (i = 0, j = row1; i < count; i++, j++) |
734 | for (i = 0, j = row2; i < count; i++, j--) |
711 | { |
735 | { |
712 | buf_text[i] = screen.text[j]; |
736 | buf_text[i] = screen.text[j]; |
713 | buf_rend[i] = screen.rend[j]; |
737 | buf_rend[i] = screen.rend[j]; |
714 | } |
738 | } |
|
|
739 | |
715 | /* A2: Rotate lines */ |
740 | /* B2: Rotate lines */ |
716 | for (j = row1, i = j + count; i <= row2; i++, j++) |
741 | for (j = row2, i = j - count; i >= row1; i--, j--) |
717 | { |
742 | { |
718 | screen.tlen[j] = screen.tlen[i]; |
743 | screen.tlen[j] = screen.tlen[i]; |
719 | screen.text[j] = screen.text[i]; |
744 | screen.text[j] = screen.text[i]; |
720 | screen.rend[j] = screen.rend[i]; |
745 | screen.rend[j] = screen.rend[i]; |
721 | } |
746 | } |
722 | j = row2 - count + 1, i = count; |
|
|
723 | } |
|
|
724 | else /* if (j < 0) */ |
|
|
725 | { |
|
|
726 | /* B: scroll down */ |
|
|
727 | |
747 | |
728 | /* B1: Copy lines that will get clobbered by the rotation */ |
|
|
729 | for (i = 0, j = row2; i < count; i++, j--) |
|
|
730 | { |
|
|
731 | buf_text[i] = screen.text[j]; |
|
|
732 | buf_rend[i] = screen.rend[j]; |
|
|
733 | } |
|
|
734 | /* B2: Rotate lines */ |
|
|
735 | for (j = row2, i = j - count; i >= row1; i--, j--) |
|
|
736 | { |
|
|
737 | screen.tlen[j] = screen.tlen[i]; |
|
|
738 | screen.text[j] = screen.text[i]; |
|
|
739 | screen.rend[j] = screen.rend[i]; |
|
|
740 | } |
|
|
741 | j = row1, i = count; |
748 | j = row1, i = count; |
742 | count = -count; |
749 | count = -count; |
743 | } |
750 | } |
744 | |
751 | |
745 | /* C: Resurrect lines */ |
752 | /* C: Resurrect lines */ |
|
|
753 | memset (screen.tlen + j, 0, i * sizeof (int16_t)); |
|
|
754 | memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); |
|
|
755 | memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); |
|
|
756 | if (!spec) /* line length may not equal TermWin.ncol */ |
746 | for (; i--; j++) |
757 | for (; i--; j++) |
747 | { |
|
|
748 | screen.tlen[j] = 0; |
|
|
749 | screen.text[j] = buf_text[i]; |
|
|
750 | screen.rend[j] = buf_rend[i]; |
|
|
751 | |
|
|
752 | if (!spec) /* line length may not equal TermWin.ncol */ |
|
|
753 | scr_blank_screen_mem (screen.text, screen.rend, |
758 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); |
754 | (unsigned int)j, rstyle); |
|
|
755 | } |
|
|
756 | |
759 | |
757 | return count; |
760 | return count; |
758 | } |
761 | } |
759 | |
762 | |
760 | /* ------------------------------------------------------------------------- */ |
763 | /* ------------------------------------------------------------------------- */ |
761 | /* |
764 | /* |
762 | * Add text given in <str> of length <len> to screen struct |
765 | * Add text given in <str> of length <len> to screen struct |
763 | */ |
766 | */ |
764 | void |
767 | void |
765 | rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) |
768 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
766 | { |
769 | { |
767 | unsigned char checksel, clearsel; |
770 | unsigned char checksel, clearsel; |
768 | uint32_t c; |
771 | unicode_t c; |
769 | int i, row, last_col; |
772 | int i, row, last_col; |
770 | text_t *stp; |
773 | text_t *stp; |
771 | rend_t *srp; |
774 | rend_t *srp; |
772 | |
775 | |
773 | if (len <= 0) /* sanity */ |
776 | if (len <= 0) /* sanity */ |
774 | return; |
777 | return; |
775 | |
778 | |
776 | want_refresh = 1; |
779 | want_refresh = 1; |
… | |
… | |
778 | |
781 | |
779 | D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); |
782 | D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); |
780 | ZERO_SCROLLBACK (); |
783 | ZERO_SCROLLBACK (); |
781 | if (nlines > 0) |
784 | if (nlines > 0) |
782 | { |
785 | { |
783 | nlines += (screen.cur.row - screen.bscroll); |
786 | nlines += screen.cur.row - screen.bscroll; |
784 | if ((nlines > 0) |
787 | if ((nlines > 0) |
785 | && (screen.tscroll == 0) |
788 | && (screen.tscroll == 0) |
786 | && (screen.bscroll == (TermWin.nrow - 1))) |
789 | && (screen.bscroll == (TermWin.nrow - 1))) |
787 | { |
790 | { |
788 | /* _at least_ this many lines need to be scrolled */ |
791 | /* _at least_ this many lines need to be scrolled */ |
789 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
792 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
790 | screen.cur.row -= nlines; |
793 | screen.cur.row -= nlines; |
791 | } |
794 | } |
792 | } |
795 | } |
|
|
796 | |
793 | #ifdef DEBUG_STRICT |
797 | #ifdef DEBUG_STRICT |
794 | assert (screen.cur.col < last_col); |
798 | assert (screen.cur.col < last_col); |
795 | assert ((screen.cur.row < TermWin.nrow) |
799 | assert ((screen.cur.row < TermWin.nrow) |
796 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
800 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
797 | #else /* drive with your eyes closed */ |
801 | #else /* drive with your eyes closed */ |
798 | MIN_IT (screen.cur.col, last_col - 1); |
802 | MIN_IT (screen.cur.col, last_col - 1); |
799 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
803 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
800 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
804 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
801 | #endif |
805 | #endif |
802 | row = screen.cur.row + TermWin.saveLines; |
806 | row = screen.cur.row + TermWin.saveLines; |
803 | |
807 | |
804 | checksel = (selection.op |
808 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
805 | && current_screen == selection.screen) ? 1 : 0; |
|
|
806 | clearsel = 0; |
809 | clearsel = 0; |
807 | |
810 | |
808 | stp = screen.text[row]; |
811 | stp = screen.text[row]; |
809 | srp = screen.rend[row]; |
812 | srp = screen.rend[row]; |
810 | |
813 | |
811 | for (i = 0; i < len;) |
814 | while (len--) |
812 | { |
815 | { |
813 | c = str[i++]; |
816 | c = *str++; |
|
|
817 | |
|
|
818 | if (c < 0x20) |
814 | switch (c) |
819 | switch (c) |
815 | { |
820 | { |
816 | case '\t': |
821 | case C0_HT: |
817 | scr_tab (1); |
822 | scr_tab (1); |
818 | continue; |
823 | continue; |
819 | case '\n': |
824 | |
|
|
825 | case C0_LF: |
820 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
826 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
821 | MAX_IT (screen.tlen[row], screen.cur.col); |
827 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
828 | |
822 | screen.flags &= ~Screen_WrapNext; |
829 | screen.flags &= ~Screen_WrapNext; |
|
|
830 | |
823 | if (screen.cur.row == screen.bscroll) |
831 | if (screen.cur.row == screen.bscroll) |
824 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
832 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
825 | else if (screen.cur.row < (TermWin.nrow - 1)) |
833 | else if (screen.cur.row < (TermWin.nrow - 1)) |
826 | row = (++screen.cur.row) + TermWin.saveLines; |
834 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
835 | |
827 | stp = screen.text[row]; /* _must_ refresh */ |
836 | stp = screen.text[row]; /* _must_ refresh */ |
828 | srp = screen.rend[row]; /* _must_ refresh */ |
837 | srp = screen.rend[row]; /* _must_ refresh */ |
829 | continue; |
838 | continue; |
830 | case '\r': |
839 | |
|
|
840 | case C0_CR: |
831 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
841 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
832 | MAX_IT (screen.tlen[row], screen.cur.col); |
842 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
843 | |
833 | screen.flags &= ~Screen_WrapNext; |
844 | screen.flags &= ~Screen_WrapNext; |
834 | screen.cur.col = 0; |
845 | screen.cur.col = 0; |
835 | continue; |
846 | continue; |
836 | default: |
|
|
837 | if (c == 127) |
|
|
838 | continue; /* yummmm..... */ |
|
|
839 | break; |
|
|
840 | } |
847 | } |
841 | |
848 | |
842 | if (checksel /* see if we're writing within selection */ |
849 | if (checksel /* see if we're writing within selection */ |
843 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
850 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
844 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
851 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
845 | { |
852 | { |
846 | checksel = 0; |
853 | checksel = 0; |
847 | clearsel = 1; |
854 | clearsel = 1; |
848 | } |
855 | } |
|
|
856 | |
849 | if (screen.flags & Screen_WrapNext) |
857 | if (screen.flags & Screen_WrapNext) |
850 | { |
858 | { |
851 | screen.tlen[row] = -1; |
859 | screen.tlen[row] = -1; |
852 | if (screen.cur.row == screen.bscroll) |
860 | if (screen.cur.row == screen.bscroll) |
853 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
861 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
854 | else if (screen.cur.row < (TermWin.nrow - 1)) |
862 | else if (screen.cur.row < (TermWin.nrow - 1)) |
855 | row = (++screen.cur.row) + TermWin.saveLines; |
863 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
864 | |
856 | stp = screen.text[row]; /* _must_ refresh */ |
865 | stp = screen.text[row]; /* _must_ refresh */ |
857 | srp = screen.rend[row]; /* _must_ refresh */ |
866 | srp = screen.rend[row]; /* _must_ refresh */ |
858 | screen.cur.col = 0; |
867 | screen.cur.col = 0; |
859 | screen.flags &= ~Screen_WrapNext; |
868 | screen.flags &= ~Screen_WrapNext; |
860 | } |
869 | } |
|
|
870 | |
861 | if (screen.flags & Screen_Insert) |
871 | if (screen.flags & Screen_Insert) |
862 | scr_insdel_chars (1, INSERT); |
872 | scr_insdel_chars (1, INSERT); |
863 | |
873 | |
|
|
874 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
|
|
875 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
|
|
876 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
|
|
877 | int width = c < 0x100 ? 1 : wcwidth (c); |
|
|
878 | |
864 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
879 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
865 | switch (c) |
|
|
866 | { |
880 | { |
867 | case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; |
881 | // vt100 special graphics and line drawing |
868 | case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; |
882 | static uint16_t vt100_0[32] = { // 5f .. 7e |
869 | case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break; |
883 | 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, |
870 | case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break; |
884 | 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, |
871 | case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break; |
885 | 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, |
872 | case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break; |
886 | 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, |
873 | case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break; |
|
|
874 | case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break; |
|
|
875 | case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break; |
|
|
876 | case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break; |
|
|
877 | case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; |
|
|
878 | } |
887 | }; |
879 | |
888 | |
880 | rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); |
889 | if (c >= 0x5f && c <= 0x7e) |
881 | // rely on wcwidth to tell us the character width, at least for non-ascii |
890 | { |
882 | int width = c <= 128 ? 1 : wcwidth (c); |
891 | c = vt100_0[c - 0x5f]; |
|
|
892 | width = 1; |
|
|
893 | } |
|
|
894 | } |
883 | |
895 | |
884 | // width -1 characters (e.g. combining chars) are ignored currently. |
|
|
885 | if (width > 0) |
896 | if (width != 0) |
|
|
897 | { |
|
|
898 | #if !UNICODE_3 && ENABLE_COMBINING |
|
|
899 | // trim characters we can't store directly :( |
|
|
900 | if (c >= 0x10000) |
|
|
901 | c = rxvt_composite.compose (c); // map to lower 16 bits |
|
|
902 | #endif |
|
|
903 | bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0); |
|
|
904 | rend_t rend = SET_FONT (rstyle, |
|
|
905 | c > 0x7f || bold || c < 0x20 |
|
|
906 | ? TermWin.fontset->find_font (c, bold) |
|
|
907 | : TermWin.ascii_map [c - 0x20]); |
|
|
908 | |
886 | do |
909 | do |
887 | { |
910 | { |
888 | stp[screen.cur.col] = c; |
911 | stp[screen.cur.col] = c; |
889 | srp[screen.cur.col] = rend; |
912 | srp[screen.cur.col] = rend; |
890 | |
913 | |
891 | if (screen.cur.col < last_col - 1) |
914 | if (screen.cur.col < last_col - 1) |
892 | screen.cur.col++; |
915 | screen.cur.col++; |
893 | else |
916 | else |
894 | { |
917 | { |
895 | screen.tlen[row] = last_col; |
918 | screen.tlen[row] = last_col; |
896 | if (screen.flags & Screen_Autowrap) |
919 | if (screen.flags & Screen_Autowrap) |
897 | screen.flags |= Screen_WrapNext; |
920 | screen.flags |= Screen_WrapNext; |
898 | break; |
921 | break; |
899 | } |
922 | } |
900 | |
923 | |
901 | c = NOCHAR; |
924 | c = NOCHAR; |
902 | } |
925 | } |
903 | while (--width > 0); |
926 | while (--width > 0); |
|
|
927 | |
|
|
928 | // pad with spaces when overwriting wide character with smaller one |
|
|
929 | for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) |
|
|
930 | { |
|
|
931 | stp[c] = ' '; |
|
|
932 | srp[c] = rend; |
|
|
933 | } |
|
|
934 | } |
|
|
935 | else if (width == 0) |
|
|
936 | { |
|
|
937 | #if ENABLE_COMBINING |
|
|
938 | // handle combining characters |
|
|
939 | // we just tag the accent on the previous on-screen character. |
|
|
940 | // this is arguably not correct, but also arguably not wrong. |
|
|
941 | // we don't handle double-width characters nicely yet. |
|
|
942 | |
|
|
943 | text_t *tp; |
|
|
944 | rend_t *rp; |
|
|
945 | |
|
|
946 | if (screen.cur.col > 0) |
|
|
947 | { |
|
|
948 | tp = stp + screen.cur.col - 1; |
|
|
949 | rp = srp + screen.cur.col - 1; |
|
|
950 | } |
|
|
951 | else if (screen.cur.row > 0 |
|
|
952 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
|
|
953 | { |
|
|
954 | tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; |
|
|
955 | rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; |
|
|
956 | } |
904 | else |
957 | else |
905 | (void)0; /* handle combining character etc. here. */ |
958 | continue; |
|
|
959 | |
|
|
960 | // handle double-width-chars by making them look extremely ugly |
|
|
961 | if (*tp == NOCHAR) |
|
|
962 | *tp = ' '; // hack //D //TODO //--tp, --rp; |
|
|
963 | |
|
|
964 | // first try to find a precomposed character |
|
|
965 | unicode_t n = rxvt_compose (*tp, c); |
|
|
966 | if (n == NOCHAR) |
|
|
967 | n = rxvt_composite.compose (*tp, c); |
|
|
968 | |
|
|
969 | *tp = n; |
|
|
970 | *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); |
|
|
971 | #endif |
|
|
972 | } |
906 | } |
973 | } |
907 | |
974 | |
908 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
975 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
909 | MAX_IT (screen.tlen[row], screen.cur.col); |
976 | MAX_IT (screen.tlen[row], screen.cur.col); |
910 | |
977 | |
… | |
… | |
930 | */ |
997 | */ |
931 | void |
998 | void |
932 | rxvt_term::scr_backspace () |
999 | rxvt_term::scr_backspace () |
933 | { |
1000 | { |
934 | want_refresh = 1; |
1001 | want_refresh = 1; |
|
|
1002 | |
935 | if (screen.cur.col == 0) |
1003 | if (screen.cur.col == 0) |
936 | { |
1004 | { |
937 | if (screen.cur.row > 0) |
1005 | if (screen.cur.row > 0) |
938 | { |
1006 | { |
939 | #ifdef TERMCAP_HAS_BW |
1007 | #ifdef TERMCAP_HAS_BW |
… | |
… | |
944 | |
1012 | |
945 | } |
1013 | } |
946 | } |
1014 | } |
947 | else if ((screen.flags & Screen_WrapNext) == 0) |
1015 | else if ((screen.flags & Screen_WrapNext) == 0) |
948 | scr_gotorc (0, -1, RELATIVE); |
1016 | scr_gotorc (0, -1, RELATIVE); |
|
|
1017 | |
949 | screen.flags &= ~Screen_WrapNext; |
1018 | screen.flags &= ~Screen_WrapNext; |
950 | } |
1019 | } |
951 | |
1020 | |
952 | /* ------------------------------------------------------------------------- */ |
1021 | /* ------------------------------------------------------------------------- */ |
953 | /* |
1022 | /* |
… | |
… | |
956 | * XTERM_SEQ: CTRL-I |
1025 | * XTERM_SEQ: CTRL-I |
957 | */ |
1026 | */ |
958 | void |
1027 | void |
959 | rxvt_term::scr_tab (int count) |
1028 | rxvt_term::scr_tab (int count) |
960 | { |
1029 | { |
961 | int i, x; |
1030 | int i, x; |
962 | |
1031 | |
963 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
1032 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
964 | want_refresh = 1; |
1033 | want_refresh = 1; |
965 | i = x = screen.cur.col; |
1034 | i = x = screen.cur.col; |
|
|
1035 | |
966 | if (count == 0) |
1036 | if (count == 0) |
967 | return; |
1037 | return; |
968 | else if (count > 0) |
1038 | else if (count > 0) |
969 | { |
1039 | { |
970 | for (; ++i < TermWin.ncol; ) |
1040 | for (; ++i < TermWin.ncol; ) |
… | |
… | |
972 | { |
1042 | { |
973 | x = i; |
1043 | x = i; |
974 | if (!--count) |
1044 | if (!--count) |
975 | break; |
1045 | break; |
976 | } |
1046 | } |
|
|
1047 | |
977 | if (count) |
1048 | if (count) |
978 | x = TermWin.ncol - 1; |
1049 | x = TermWin.ncol - 1; |
979 | } |
1050 | } |
980 | else /* if (count < 0) */ |
1051 | else /* if (count < 0) */ |
981 | { |
1052 | { |
… | |
… | |
984 | { |
1055 | { |
985 | x = i; |
1056 | x = i; |
986 | if (!++count) |
1057 | if (!++count) |
987 | break; |
1058 | break; |
988 | } |
1059 | } |
|
|
1060 | |
989 | if (count) |
1061 | if (count) |
990 | x = 0; |
1062 | x = 0; |
991 | } |
1063 | } |
|
|
1064 | |
992 | if (x != screen.cur.col) |
1065 | if (x != screen.cur.col) |
993 | scr_gotorc (0, x, R_RELATIVE); |
1066 | scr_gotorc (0, x, R_RELATIVE); |
994 | } |
1067 | } |
995 | |
1068 | |
996 | /* ------------------------------------------------------------------------- */ |
1069 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1053 | want_refresh = 1; |
1126 | want_refresh = 1; |
1054 | ZERO_SCROLLBACK (); |
1127 | ZERO_SCROLLBACK (); |
1055 | |
1128 | |
1056 | D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); |
1129 | D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); |
1057 | |
1130 | |
1058 | screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) |
1131 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1059 | : col); |
|
|
1060 | MAX_IT (screen.cur.col, 0); |
1132 | MAX_IT (screen.cur.col, 0); |
1061 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1133 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1062 | |
1134 | |
1063 | screen.flags &= ~Screen_WrapNext; |
1135 | screen.flags &= ~Screen_WrapNext; |
1064 | if (relative & R_RELATIVE) |
1136 | if (relative & R_RELATIVE) |
… | |
… | |
1090 | else |
1162 | else |
1091 | screen.cur.row = row; |
1163 | screen.cur.row = row; |
1092 | } |
1164 | } |
1093 | MAX_IT (screen.cur.row, 0); |
1165 | MAX_IT (screen.cur.row, 0); |
1094 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1166 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
|
|
1167 | |
|
|
1168 | while (screen.cur.col > 0 |
|
|
1169 | && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR) |
|
|
1170 | screen.cur.col--; |
1095 | } |
1171 | } |
1096 | |
1172 | |
1097 | /* ------------------------------------------------------------------------- */ |
1173 | /* ------------------------------------------------------------------------- */ |
1098 | /* |
1174 | /* |
1099 | * direction should be UP or DN |
1175 | * direction should be UP or DN |
1100 | */ |
1176 | */ |
1101 | void |
1177 | void |
1102 | rxvt_term::scr_index (enum page_dirn direction) |
1178 | rxvt_term::scr_index (enum page_dirn direction) |
1103 | { |
1179 | { |
1104 | int dirn; |
1180 | int dirn; |
1105 | |
1181 | |
1106 | want_refresh = 1; |
1182 | want_refresh = 1; |
1107 | dirn = ((direction == UP) ? 1 : -1); |
1183 | dirn = ((direction == UP) ? 1 : -1); |
1108 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
1184 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
1109 | |
1185 | |
… | |
… | |
1169 | default: |
1245 | default: |
1170 | return; |
1246 | return; |
1171 | } |
1247 | } |
1172 | |
1248 | |
1173 | if (screen.text[row]) |
1249 | if (screen.text[row]) |
1174 | scr_blank_line (& (screen.text[row][col]), |
1250 | scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle); |
1175 | & (screen.rend[row][col]), num, rstyle); |
|
|
1176 | else |
1251 | else |
1177 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
1252 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
1178 | } |
1253 | } |
1179 | |
1254 | |
1180 | /* ------------------------------------------------------------------------- */ |
1255 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1185 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1260 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1186 | */ |
1261 | */ |
1187 | void |
1262 | void |
1188 | rxvt_term::scr_erase_screen (int mode) |
1263 | rxvt_term::scr_erase_screen (int mode) |
1189 | { |
1264 | { |
1190 | int num; |
1265 | int num; |
1191 | int32_t row, row_offset; |
1266 | int32_t row, row_offset; |
1192 | rend_t ren; |
1267 | rend_t ren; |
1193 | XGCValues gcvalue; |
1268 | XGCValues gcvalue; |
1194 | |
1269 | |
1195 | want_refresh = 1; |
1270 | want_refresh = 1; |
1196 | D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); |
1271 | D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); |
1197 | ZERO_SCROLLBACK (); |
1272 | ZERO_SCROLLBACK (); |
1198 | row_offset = (int32_t)TermWin.saveLines; |
1273 | row_offset = (int32_t)TermWin.saveLines; |
… | |
… | |
1217 | num = TermWin.nrow; |
1292 | num = TermWin.nrow; |
1218 | break; |
1293 | break; |
1219 | default: |
1294 | default: |
1220 | return; |
1295 | return; |
1221 | } |
1296 | } |
1222 | refresh_type |= REFRESH_BOUNDS; |
1297 | |
1223 | if (selection.op && current_screen == selection.screen |
1298 | if (selection.op && current_screen == selection.screen |
1224 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1299 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1225 | || (selection.end.row >= row |
1300 | || (selection.end.row >= row |
1226 | && selection.end.row <= row + num))) |
1301 | && selection.end.row <= row + num))) |
1227 | CLEAR_SELECTION (); |
1302 | CLEAR_SELECTION (); |
|
|
1303 | |
1228 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1304 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1229 | return; |
1305 | return; |
|
|
1306 | |
1230 | MIN_IT (num, (TermWin.nrow - row)); |
1307 | MIN_IT (num, (TermWin.nrow - row)); |
|
|
1308 | |
1231 | if (rstyle & (RS_RVid | RS_Uline)) |
1309 | if (rstyle & (RS_RVid | RS_Uline)) |
1232 | ren = (rend_t) ~RS_None; |
1310 | ren = (rend_t) ~RS_None; |
1233 | else if (GET_BASEBG (rstyle) == Color_bg) |
1311 | else if (GET_BASEBG (rstyle) == Color_bg) |
1234 | { |
1312 | { |
1235 | ren = DEFAULT_RSTYLE; |
1313 | ren = DEFAULT_RSTYLE; |
… | |
… | |
1242 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1320 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1243 | ERASE_ROWS (row, num); |
1321 | ERASE_ROWS (row, num); |
1244 | gcvalue.foreground = PixColors[Color_fg]; |
1322 | gcvalue.foreground = PixColors[Color_fg]; |
1245 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1323 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1246 | } |
1324 | } |
|
|
1325 | |
1247 | for (; num--; row++) |
1326 | for (; num--; row++) |
1248 | { |
1327 | { |
1249 | scr_blank_screen_mem (screen.text, screen.rend, |
1328 | scr_blank_screen_mem (screen.text, screen.rend, |
1250 | (unsigned int) (row + row_offset), rstyle); |
1329 | (unsigned int) (row + row_offset), rstyle); |
1251 | screen.tlen[row + row_offset] = 0; |
1330 | screen.tlen[row + row_offset] = 0; |
… | |
… | |
1285 | * Insert/Delete <count> lines |
1364 | * Insert/Delete <count> lines |
1286 | */ |
1365 | */ |
1287 | void |
1366 | void |
1288 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1367 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1289 | { |
1368 | { |
1290 | int end; |
1369 | int end; |
1291 | |
1370 | |
1292 | ZERO_SCROLLBACK (); |
1371 | ZERO_SCROLLBACK (); |
1293 | |
1372 | |
1294 | selection_check (1); |
1373 | selection_check (1); |
1295 | |
1374 | |
… | |
… | |
1314 | * Insert/Delete <count> characters from the current position |
1393 | * Insert/Delete <count> characters from the current position |
1315 | */ |
1394 | */ |
1316 | void |
1395 | void |
1317 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1396 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1318 | { |
1397 | { |
1319 | int col, row; |
1398 | int col, row; |
1320 | rend_t tr; |
1399 | rend_t tr; |
1321 | text_t *stp; |
1400 | text_t *stp; |
1322 | rend_t *srp; |
1401 | rend_t *srp; |
1323 | int16_t *slp; |
1402 | int16_t *slp; |
1324 | |
1403 | |
1325 | want_refresh = 1; |
1404 | want_refresh = 1; |
1326 | ZERO_SCROLLBACK (); |
1405 | ZERO_SCROLLBACK (); |
1327 | |
1406 | |
1328 | if (count <= 0) |
1407 | if (count <= 0) |
… | |
… | |
1335 | screen.flags &= ~Screen_WrapNext; |
1414 | screen.flags &= ~Screen_WrapNext; |
1336 | |
1415 | |
1337 | stp = screen.text[row]; |
1416 | stp = screen.text[row]; |
1338 | srp = screen.rend[row]; |
1417 | srp = screen.rend[row]; |
1339 | slp = & (screen.tlen[row]); |
1418 | slp = & (screen.tlen[row]); |
|
|
1419 | |
1340 | switch (insdel) |
1420 | switch (insdel) |
1341 | { |
1421 | { |
1342 | case INSERT: |
1422 | case INSERT: |
1343 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1423 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1344 | col--) |
1424 | col--) |
1345 | { |
1425 | { |
1346 | stp[col] = stp[col - count]; |
1426 | stp[col] = stp[col - count]; |
1347 | srp[col] = srp[col - count]; |
1427 | srp[col] = srp[col - count]; |
1348 | } |
1428 | } |
|
|
1429 | |
1349 | if (*slp != -1) |
1430 | if (*slp != -1) |
1350 | { |
1431 | { |
1351 | *slp += count; |
1432 | *slp += count; |
1352 | MIN_IT (*slp, TermWin.ncol); |
1433 | MIN_IT (*slp, TermWin.ncol); |
1353 | } |
1434 | } |
|
|
1435 | |
1354 | if (selection.op && current_screen == selection.screen |
1436 | if (selection.op && current_screen == selection.screen |
1355 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1437 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1356 | { |
1438 | { |
1357 | if (selection.end.row != screen.cur.row |
1439 | if (selection.end.row != screen.cur.row |
1358 | || (selection.end.col + count >= TermWin.ncol)) |
1440 | || (selection.end.col + count >= TermWin.ncol)) |
… | |
… | |
1362 | selection.beg.col += count; |
1444 | selection.beg.col += count; |
1363 | selection.mark.col += count; /* XXX: yes? */ |
1445 | selection.mark.col += count; /* XXX: yes? */ |
1364 | selection.end.col += count; |
1446 | selection.end.col += count; |
1365 | } |
1447 | } |
1366 | } |
1448 | } |
|
|
1449 | |
1367 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1450 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1368 | (unsigned int)count, rstyle); |
1451 | (unsigned int)count, rstyle); |
1369 | break; |
1452 | break; |
|
|
1453 | |
1370 | case ERASE: |
1454 | case ERASE: |
1371 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1455 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1372 | selection_check (1); |
1456 | selection_check (1); |
1373 | screen.cur.col -= count; |
1457 | screen.cur.col -= count; |
1374 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1458 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1375 | (unsigned int)count, rstyle); |
1459 | (unsigned int)count, rstyle); |
1376 | break; |
1460 | break; |
|
|
1461 | |
1377 | case DELETE: |
1462 | case DELETE: |
1378 | tr = srp[TermWin.ncol - 1] |
|
|
1379 | & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1463 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
|
|
1464 | |
1380 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1465 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1381 | { |
1466 | { |
1382 | stp[col] = stp[col + count]; |
1467 | stp[col] = stp[col + count]; |
1383 | srp[col] = srp[col + count]; |
1468 | srp[col] = srp[col + count]; |
1384 | } |
1469 | } |
|
|
1470 | |
1385 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1471 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1386 | & (srp[TermWin.ncol - count]), |
1472 | & (srp[TermWin.ncol - count]), |
1387 | (unsigned int)count, tr); |
1473 | (unsigned int)count, tr); |
|
|
1474 | |
1388 | if (*slp == -1) /* break line continuation */ |
1475 | if (*slp == -1) /* break line continuation */ |
1389 | *slp = TermWin.ncol; |
1476 | *slp = TermWin.ncol; |
|
|
1477 | |
1390 | *slp -= count; |
1478 | *slp -= count; |
1391 | MAX_IT (*slp, 0); |
1479 | MAX_IT (*slp, 0); |
|
|
1480 | |
1392 | if (selection.op && current_screen == selection.screen |
1481 | if (selection.op && current_screen == selection.screen |
1393 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1482 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1394 | { |
1483 | { |
1395 | if (selection.end.row != screen.cur.row |
1484 | if (selection.end.row != screen.cur.row |
1396 | || (screen.cur.col >= selection.beg.col - count) |
1485 | || (screen.cur.col >= selection.beg.col - count) |
… | |
… | |
1402 | selection.beg.col -= count; |
1491 | selection.beg.col -= count; |
1403 | selection.mark.col -= count; /* XXX: yes? */ |
1492 | selection.mark.col -= count; /* XXX: yes? */ |
1404 | selection.end.col -= count; |
1493 | selection.end.col -= count; |
1405 | } |
1494 | } |
1406 | } |
1495 | } |
|
|
1496 | |
1407 | break; |
1497 | break; |
1408 | } |
1498 | } |
1409 | } |
1499 | } |
1410 | |
1500 | |
1411 | /* ------------------------------------------------------------------------- */ |
1501 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1416 | void |
1506 | void |
1417 | rxvt_term::scr_scroll_region (int top, int bot) |
1507 | rxvt_term::scr_scroll_region (int top, int bot) |
1418 | { |
1508 | { |
1419 | MAX_IT (top, 0); |
1509 | MAX_IT (top, 0); |
1420 | MIN_IT (bot, (int)TermWin.nrow - 1); |
1510 | MIN_IT (bot, (int)TermWin.nrow - 1); |
|
|
1511 | |
1421 | if (top > bot) |
1512 | if (top > bot) |
1422 | return; |
1513 | return; |
|
|
1514 | |
1423 | screen.tscroll = top; |
1515 | screen.tscroll = top; |
1424 | screen.bscroll = bot; |
1516 | screen.bscroll = bot; |
1425 | scr_gotorc (0, 0, 0); |
1517 | scr_gotorc (0, 0, 0); |
1426 | } |
1518 | } |
1427 | |
1519 | |
… | |
… | |
1433 | */ |
1525 | */ |
1434 | void |
1526 | void |
1435 | rxvt_term::scr_cursor_visible (int mode) |
1527 | rxvt_term::scr_cursor_visible (int mode) |
1436 | { |
1528 | { |
1437 | want_refresh = 1; |
1529 | want_refresh = 1; |
|
|
1530 | |
1438 | if (mode) |
1531 | if (mode) |
1439 | screen.flags |= Screen_VisibleCursor; |
1532 | screen.flags |= Screen_VisibleCursor; |
1440 | else |
1533 | else |
1441 | screen.flags &= ~Screen_VisibleCursor; |
1534 | screen.flags &= ~Screen_VisibleCursor; |
1442 | } |
1535 | } |
… | |
… | |
1656 | row_col_t rc[RC_COUNT]; |
1749 | row_col_t rc[RC_COUNT]; |
1657 | |
1750 | |
1658 | if (drawn_text == NULL) /* sanity check */ |
1751 | if (drawn_text == NULL) /* sanity check */ |
1659 | return; |
1752 | return; |
1660 | |
1753 | |
|
|
1754 | #ifndef NO_SLOW_LINK_SUPPORT |
|
|
1755 | if (refresh_type == FAST_REFRESH && !display->is_local) |
|
|
1756 | { |
|
|
1757 | y = 0; |
|
|
1758 | height = TermWin.height; |
|
|
1759 | } |
|
|
1760 | #endif |
|
|
1761 | |
1661 | #ifdef DEBUG_STRICT |
1762 | #ifdef DEBUG_STRICT |
1662 | x = max (x, (int)TermWin.int_bwidth); |
1763 | x = max (x, 0); |
1663 | x = min (x, (int)TermWin.width); |
1764 | x = min (x, (int)TermWin.width); |
1664 | y = max (y, (int)TermWin.int_bwidth); |
1765 | y = max (y, 0); |
1665 | y = min (y, (int)TermWin.height); |
1766 | y = min (y, (int)TermWin.height); |
1666 | #endif |
1767 | #endif |
1667 | |
1768 | |
1668 | /* round down */ |
1769 | /* round down */ |
1669 | rc[PART_BEG].col = Pixel2Col (x); |
1770 | rc[PART_BEG].col = Pixel2Col (x); |
… | |
… | |
1680 | } |
1781 | } |
1681 | |
1782 | |
1682 | D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); |
1783 | D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); |
1683 | |
1784 | |
1684 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1785 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1685 | fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, |
1786 | fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1686 | (rc[PART_END].col - rc[PART_BEG].col + 1)); |
|
|
1687 | |
1787 | |
1688 | if (refresh) |
1788 | if (refresh) |
1689 | scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); |
1789 | scr_refresh (SLOW_REFRESH); |
1690 | } |
1790 | } |
1691 | |
1791 | |
1692 | /* ------------------------------------------------------------------------- */ |
1792 | /* ------------------------------------------------------------------------- */ |
1693 | /* |
1793 | /* |
1694 | * Refresh the entire screen |
1794 | * Refresh the entire screen |
… | |
… | |
1729 | * direction should be UP or DN |
1829 | * direction should be UP or DN |
1730 | */ |
1830 | */ |
1731 | int |
1831 | int |
1732 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1832 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1733 | { |
1833 | { |
1734 | int n; |
1834 | int n; |
1735 | uint16_t oldviewstart; |
1835 | uint16_t oldviewstart; |
1736 | |
1836 | |
1737 | D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); |
1837 | D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); |
1738 | #ifdef DEBUG_STRICT |
1838 | #ifdef DEBUG_STRICT |
1739 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
1839 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
1740 | #endif |
1840 | #endif |
… | |
… | |
1758 | if (TermWin.view_start != oldviewstart) |
1858 | if (TermWin.view_start != oldviewstart) |
1759 | { |
1859 | { |
1760 | want_refresh = 1; |
1860 | want_refresh = 1; |
1761 | num_scr -= (TermWin.view_start - oldviewstart); |
1861 | num_scr -= (TermWin.view_start - oldviewstart); |
1762 | } |
1862 | } |
|
|
1863 | |
1763 | return (int) (TermWin.view_start - oldviewstart); |
1864 | return (int) (TermWin.view_start - oldviewstart); |
1764 | } |
1865 | } |
1765 | |
1866 | |
1766 | /* ------------------------------------------------------------------------- */ |
1867 | /* ------------------------------------------------------------------------- */ |
1767 | void |
1868 | void |
… | |
… | |
1835 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
1936 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
1836 | |
1937 | |
1837 | void |
1938 | void |
1838 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1939 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1839 | { |
1940 | { |
1840 | unsigned char clearfirst, /* first character writes before cell */ |
|
|
1841 | clearlast, /* last character writes beyond cell */ |
|
|
1842 | must_clear, /* use draw_string not draw_image_string */ |
1941 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1843 | rvid, /* reverse video this position */ |
1942 | rvid, /* reverse video this position */ |
1844 | showcursor; /* show the cursor */ |
1943 | showcursor; /* show the cursor */ |
1845 | int16_t col, row, /* column/row we're processing */ |
1944 | int16_t col, row, /* column/row we're processing */ |
1846 | ocrow; /* old cursor row */ |
1945 | ocrow; /* old cursor row */ |
1847 | int cursorwidth; |
|
|
1848 | int i, /* tmp */ |
1946 | int i, /* tmp */ |
1849 | row_offset; /* basic offset in screen structure */ |
1947 | row_offset; /* basic offset in screen structure */ |
1850 | #ifndef NO_CURSORCOLOR |
1948 | #ifndef NO_CURSORCOLOR |
1851 | rend_t cc1; /* store colours at cursor position (s) */ |
1949 | rend_t cc1; /* store colours at cursor position (s) */ |
1852 | #endif |
1950 | #endif |
1853 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
1951 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
1854 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
1952 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
1855 | |
1953 | |
1856 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
1954 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
1857 | return; |
1955 | return; |
1858 | |
1956 | |
1859 | /* |
1957 | /* |
1860 | * A: set up vars |
1958 | * A: set up vars |
1861 | */ |
1959 | */ |
1862 | clearfirst = clearlast = must_clear = 0; |
1960 | must_clear = 0; |
1863 | |
1961 | |
1864 | refresh_count = 0; |
1962 | refresh_count = 0; |
1865 | |
1963 | |
1866 | row_offset = TermWin.saveLines - TermWin.view_start; |
1964 | row_offset = TermWin.saveLines - TermWin.view_start; |
1867 | |
|
|
1868 | if ((refresh_type & REFRESH_BOUNDS)) |
|
|
1869 | { |
|
|
1870 | clearfirst = clearlast = 1; |
|
|
1871 | refresh_type &= ~REFRESH_BOUNDS; |
|
|
1872 | } |
|
|
1873 | |
1965 | |
1874 | #ifdef XPM_BACKGROUND |
1966 | #ifdef XPM_BACKGROUND |
1875 | must_clear |= (bgPixmap.pixmap != None); |
1967 | must_clear |= (bgPixmap.pixmap != None); |
1876 | #endif |
1968 | #endif |
1877 | #ifdef TRANSPARENT |
1969 | #ifdef TRANSPARENT |
… | |
… | |
1886 | |
1978 | |
1887 | /* |
1979 | /* |
1888 | * C: set the cursor character (s) |
1980 | * C: set the cursor character (s) |
1889 | */ |
1981 | */ |
1890 | { |
1982 | { |
1891 | unsigned char setoldcursor; |
1983 | unsigned char setoldcursor; |
1892 | rend_t ccol1, /* Cursor colour */ |
1984 | rend_t ccol1, /* Cursor colour */ |
1893 | ccol2; /* Cursor colour2 */ |
1985 | ccol2; /* Cursor colour2 */ |
1894 | |
1986 | |
1895 | showcursor = (screen.flags & Screen_VisibleCursor); |
1987 | showcursor = (screen.flags & Screen_VisibleCursor); |
1896 | cursorwidth = 0; |
|
|
1897 | #ifdef CURSOR_BLINK |
1988 | #ifdef CURSOR_BLINK |
1898 | if (hidden_cursor) |
1989 | if (hidden_cursor) |
1899 | showcursor = 0; |
1990 | showcursor = 0; |
1900 | #endif |
1991 | #endif |
1901 | |
1992 | |
1902 | cursorwidth = 0; |
|
|
1903 | |
|
|
1904 | if (showcursor) |
1993 | if (showcursor) |
1905 | { |
1994 | { |
1906 | cursorwidth++; |
|
|
1907 | |
|
|
1908 | srp = & (screen.rend[screen.cur.row + TermWin.saveLines] |
1995 | srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); |
1909 | [screen.cur.col]); |
|
|
1910 | |
1996 | |
1911 | if (showcursor && TermWin.focus) |
1997 | if (showcursor && TermWin.focus) |
1912 | { |
1998 | { |
1913 | *srp ^= RS_RVid; |
1999 | *srp ^= RS_RVid; |
1914 | #ifndef NO_CURSORCOLOR |
2000 | #ifndef NO_CURSORCOLOR |
… | |
… | |
1930 | ccol2 = Color_bg; |
2016 | ccol2 = Color_bg; |
1931 | #endif |
2017 | #endif |
1932 | *srp = SET_FGCOLOR (*srp, ccol1); |
2018 | *srp = SET_FGCOLOR (*srp, ccol1); |
1933 | *srp = SET_BGCOLOR (*srp, ccol2); |
2019 | *srp = SET_BGCOLOR (*srp, ccol2); |
1934 | #endif |
2020 | #endif |
1935 | |
|
|
1936 | } |
2021 | } |
1937 | } |
2022 | } |
1938 | |
2023 | |
1939 | /* make sure no outline cursor is left around */ |
2024 | /* make sure no outline cursor is left around */ |
1940 | setoldcursor = 0; |
2025 | setoldcursor = 0; |
… | |
… | |
1943 | if (screen.cur.row + TermWin.view_start != ocrow |
2028 | if (screen.cur.row + TermWin.view_start != ocrow |
1944 | || screen.cur.col != oldcursor.col) |
2029 | || screen.cur.col != oldcursor.col) |
1945 | { |
2030 | { |
1946 | if (ocrow < TermWin.nrow |
2031 | if (ocrow < TermWin.nrow |
1947 | && oldcursor.col < TermWin.ncol) |
2032 | && oldcursor.col < TermWin.ncol) |
1948 | { |
|
|
1949 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
2033 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
1950 | } |
2034 | |
1951 | if (TermWin.focus || !showcursor) |
2035 | if (TermWin.focus || !showcursor) |
1952 | oldcursor.row = -1; |
2036 | oldcursor.row = -1; |
1953 | else |
2037 | else |
1954 | setoldcursor = 1; |
2038 | setoldcursor = 1; |
1955 | } |
2039 | } |
1956 | } |
2040 | } |
1957 | else if (!TermWin.focus) |
2041 | else if (!TermWin.focus) |
1958 | setoldcursor = 1; |
2042 | setoldcursor = 1; |
|
|
2043 | |
1959 | if (setoldcursor) |
2044 | if (setoldcursor) |
1960 | { |
2045 | { |
1961 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
2046 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
1962 | oldcursor.row = -1; |
2047 | oldcursor.row = -1; |
1963 | else |
2048 | else |
… | |
… | |
1972 | /* |
2057 | /* |
1973 | * D: CopyArea pass - very useful for slower links |
2058 | * D: CopyArea pass - very useful for slower links |
1974 | * This has been deliberately kept simple. |
2059 | * This has been deliberately kept simple. |
1975 | */ |
2060 | */ |
1976 | i = num_scr; |
2061 | i = num_scr; |
|
|
2062 | if (!display->is_local |
1977 | if (refresh_type == FAST_REFRESH && num_scr_allow && i |
2063 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
1978 | && abs (i) < TermWin.nrow && !must_clear) |
2064 | && abs (i) < TermWin.nrow && !must_clear) |
1979 | { |
2065 | { |
1980 | int16_t nits; |
2066 | int16_t nits; |
1981 | int j; |
2067 | int j; |
1982 | rend_t *drp2; |
2068 | rend_t *drp2; |
1983 | text_t *dtp2; |
2069 | text_t *dtp2; |
1984 | int len, wlen; |
2070 | int len, wlen; |
1985 | |
2071 | |
1986 | j = TermWin.nrow; |
2072 | j = TermWin.nrow; |
1987 | wlen = len = -1; |
2073 | wlen = len = -1; |
1988 | row = i > 0 ? 0 : j - 1; |
2074 | row = i > 0 ? 0 : j - 1; |
1989 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2075 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
… | |
… | |
2053 | int ypixel = (int)Row2Pixel (row); |
2139 | int ypixel = (int)Row2Pixel (row); |
2054 | |
2140 | |
2055 | for (col = 0; col < TermWin.ncol; col++) |
2141 | for (col = 0; col < TermWin.ncol; col++) |
2056 | { |
2142 | { |
2057 | /* compare new text with old - if exactly the same then continue */ |
2143 | /* compare new text with old - if exactly the same then continue */ |
|
|
2144 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
|
|
2145 | && (srp[col] == drp[col] /* Either rendition the same or */ |
|
|
2146 | || (stp[col] == ' ' /* space w/ no background change */ |
|
|
2147 | && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) |
|
|
2148 | continue; |
|
|
2149 | |
|
|
2150 | // redraw one or more characters |
|
|
2151 | |
|
|
2152 | // seek to the beginning if wide characters |
|
|
2153 | while (stp[col] == NOCHAR && col > 0) |
|
|
2154 | --col; |
|
|
2155 | |
2058 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2156 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2059 | |
|
|
2060 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
|
|
2061 | && (rend == drp[col] /* Either rendition the same or */ |
|
|
2062 | || (stp[col] == ' ' /* space w/ no background change */ |
|
|
2063 | && GET_BGATTR (rend) == GET_BGATTR (drp[col])))) |
|
|
2064 | continue; |
|
|
2065 | |
|
|
2066 | text_t *text = stp + col; |
2157 | text_t *text = stp + col; |
2067 | int count = 1; |
2158 | int count = 1; |
2068 | |
2159 | |
2069 | /* redraw one or more characters */ |
|
|
2070 | |
|
|
2071 | dtp[col] = stp[col]; |
2160 | dtp[col] = stp[col]; |
2072 | drp[col] = rend; |
2161 | drp[col] = rend; |
2073 | |
|
|
2074 | if (*text == NOCHAR) // never start redrawing at invisible characters. */ |
|
|
2075 | continue; |
|
|
2076 | |
2162 | |
2077 | int xpixel = Col2Pixel (col); |
2163 | int xpixel = Col2Pixel (col); |
2078 | |
2164 | |
2079 | // this loop looks very messy, it can probably be optimized |
2165 | // this loop looks very messy, it can probably be optimized |
2080 | // and cleaned a bit by you? |
2166 | // and cleaned a bit by you? |
… | |
… | |
2121 | int fore = GET_FGCOLOR (rend); // desired foreground |
2207 | int fore = GET_FGCOLOR (rend); // desired foreground |
2122 | int back = GET_BGCOLOR (rend); // desired background |
2208 | int back = GET_BGCOLOR (rend); // desired background |
2123 | |
2209 | |
2124 | rend = GET_ATTR (rend); |
2210 | rend = GET_ATTR (rend); |
2125 | |
2211 | |
2126 | rvid = !! (rend & RS_RVid); |
2212 | rvid = !!(rend & RS_RVid); |
|
|
2213 | |
|
|
2214 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2215 | if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) |
|
|
2216 | { |
|
|
2217 | if (ISSET_PIXCOLOR (Color_BD)) |
|
|
2218 | fore = Color_BD; |
|
|
2219 | else |
|
|
2220 | rvid = !rvid; |
|
|
2221 | } |
|
|
2222 | |
|
|
2223 | if (rend & RS_Uline) |
|
|
2224 | if (ISSET_PIXCOLOR (Color_UL)) |
|
|
2225 | fore = Color_UL; |
|
|
2226 | #endif |
|
|
2227 | |
2127 | if (rvid) |
2228 | if (rvid) |
2128 | { |
2229 | { |
2129 | SWAP_IT (fore, back, int); |
2230 | SWAP_IT (fore, back, int); |
2130 | |
2231 | |
2131 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2232 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
… | |
… | |
2134 | && !ISSET_PIXCOLOR (Color_cursor) |
2235 | && !ISSET_PIXCOLOR (Color_cursor) |
2135 | # endif |
2236 | # endif |
2136 | ) |
2237 | ) |
2137 | back = Color_RV; |
2238 | back = Color_RV; |
2138 | #endif |
2239 | #endif |
2139 | |
|
|
2140 | } |
2240 | } |
|
|
2241 | |
2141 | #ifdef TEXT_BLINK |
2242 | #ifdef TEXT_BLINK |
2142 | if (rend & RS_Blink) |
2243 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2143 | { |
2244 | { |
2144 | if (!text_blink_ev.active) |
2245 | if (!text_blink_ev.active) |
2145 | { |
2246 | { |
2146 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2247 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2147 | hidden_text = 0; |
2248 | hidden_text = 0; |
2148 | } |
2249 | } |
2149 | else if (hidden_text) |
2250 | else if (hidden_text) |
2150 | fore = back; |
2251 | fore = back; |
2151 | } |
|
|
2152 | #endif |
|
|
2153 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2154 | else if (rend & RS_Bold) |
|
|
2155 | { |
|
|
2156 | if (ISSET_PIXCOLOR (Color_BD)) |
|
|
2157 | fore = Color_BD; |
|
|
2158 | else if (fore == Color_fg) |
|
|
2159 | fore = Color_White; |
|
|
2160 | } |
|
|
2161 | else if (rend & RS_Uline) |
|
|
2162 | { |
|
|
2163 | if (ISSET_PIXCOLOR (Color_UL)) |
|
|
2164 | fore = Color_UL; |
|
|
2165 | } |
2252 | } |
2166 | #endif |
2253 | #endif |
2167 | |
2254 | |
2168 | /* |
2255 | /* |
2169 | * Actually do the drawing of the string here |
2256 | * Actually do the drawing of the string here |
… | |
… | |
2191 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2278 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2192 | } |
2279 | } |
2193 | else |
2280 | else |
2194 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2281 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2195 | |
2282 | |
2196 | if ((rend & RS_Uline) && (font->descent > 1)) |
2283 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2197 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2284 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2198 | xpixel, ypixel + font->ascent + 1, |
2285 | xpixel, ypixel + font->ascent + 1, |
2199 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2286 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2200 | } /* for (col....) */ |
2287 | } /* for (col....) */ |
2201 | } /* for (row....) */ |
2288 | } /* for (row....) */ |
2202 | |
2289 | |
2203 | /* |
2290 | /* |
2204 | * G: cleanup cursor and display outline cursor if necessary |
2291 | * G: cleanup cursor and display outline cursor if necessary |
… | |
… | |
2211 | [screen.cur.col]); |
2298 | [screen.cur.col]); |
2212 | *srp ^= RS_RVid; |
2299 | *srp ^= RS_RVid; |
2213 | #ifndef NO_CURSORCOLOR |
2300 | #ifndef NO_CURSORCOLOR |
2214 | *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2301 | *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2215 | #endif |
2302 | #endif |
2216 | |
|
|
2217 | } |
2303 | } |
2218 | else if (oldcursor.row >= 0) |
2304 | else if (oldcursor.row >= 0) |
2219 | { |
2305 | { |
2220 | #ifndef NO_CURSORCOLOR |
2306 | #ifndef NO_CURSORCOLOR |
2221 | if (ISSET_PIXCOLOR (Color_cursor)) |
2307 | if (ISSET_PIXCOLOR (Color_cursor)) |
2222 | XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); |
2308 | XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); |
2223 | #endif |
2309 | #endif |
|
|
2310 | int cursorwidth = 1; |
|
|
2311 | while (oldcursor.col + cursorwidth < TermWin.ncol |
|
|
2312 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
|
|
2313 | cursorwidth++; |
|
|
2314 | |
2224 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2315 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2225 | Col2Pixel (oldcursor.col), |
2316 | Col2Pixel (oldcursor.col), |
2226 | Row2Pixel (oldcursor.row), |
2317 | Row2Pixel (oldcursor.row), |
2227 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2318 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2228 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2319 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2229 | } |
2320 | } |
2230 | } |
2321 | } |
2231 | |
2322 | |
2232 | /* |
2323 | /* |
2233 | * H: cleanup selection |
2324 | * H: cleanup selection |
2234 | */ |
2325 | */ |
2235 | scr_reverse_selection (); |
2326 | scr_reverse_selection (); |
2236 | |
2327 | |
2237 | /* |
|
|
2238 | * I: other general cleanup |
|
|
2239 | */ |
|
|
2240 | if (clearfirst && TermWin.int_bwidth) |
|
|
2241 | /* |
|
|
2242 | * clear the whole screen height, note that width == 0 is treated |
|
|
2243 | * specially by XClearArea |
|
|
2244 | */ |
|
|
2245 | XClearArea (display->display, TermWin.vt, 0, 0, |
|
|
2246 | (unsigned int)TermWin.int_bwidth, |
|
|
2247 | (unsigned int)TermWin_TotalHeight (), False); |
|
|
2248 | if (clearlast && TermWin.int_bwidth) |
|
|
2249 | /* |
|
|
2250 | * clear the whole screen height, note that width == 0 is treated |
|
|
2251 | * specially by XClearArea |
|
|
2252 | */ |
|
|
2253 | XClearArea (display->display, TermWin.vt, |
|
|
2254 | TermWin.width + TermWin.int_bwidth, 0, |
|
|
2255 | (unsigned int)TermWin.int_bwidth, |
|
|
2256 | (unsigned int)TermWin_TotalHeight (), False); |
|
|
2257 | if (refresh_type & SMOOTH_REFRESH) |
2328 | if (refresh_type & SMOOTH_REFRESH) |
2258 | XSync (display->display, False); |
2329 | XFlush (display->display); |
2259 | |
2330 | |
2260 | num_scr = 0; |
2331 | num_scr = 0; |
2261 | num_scr_allow = 1; |
2332 | num_scr_allow = 1; |
2262 | want_refresh = 0; /* screen is current */ |
2333 | want_refresh = 0; /* screen is current */ |
2263 | } |
2334 | } |
… | |
… | |
2285 | } |
2356 | } |
2286 | } |
2357 | } |
2287 | |
2358 | |
2288 | /* ------------------------------------------------------------------------- */ |
2359 | /* ------------------------------------------------------------------------- */ |
2289 | void |
2360 | void |
2290 | rxvt_term::scr_clear () |
2361 | rxvt_term::scr_clear (bool really) |
2291 | { |
2362 | { |
2292 | if (!TermWin.mapped) |
2363 | if (!TermWin.mapped) |
2293 | return; |
2364 | return; |
2294 | |
2365 | |
2295 | num_scr_allow = 0; |
2366 | num_scr_allow = 0; |
2296 | want_refresh = 1; |
2367 | want_refresh = 1; |
|
|
2368 | |
2297 | #ifdef TRANSPARENT |
2369 | #ifdef TRANSPARENT |
2298 | if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) |
2370 | if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) |
2299 | { |
2371 | { |
2300 | int i; |
2372 | int i; |
2301 | |
2373 | |
… | |
… | |
2308 | if (TermWin.parent[i] != None) |
2380 | if (TermWin.parent[i] != None) |
2309 | XClearWindow (display->display, TermWin.parent[i]); |
2381 | XClearWindow (display->display, TermWin.parent[i]); |
2310 | } |
2382 | } |
2311 | #endif |
2383 | #endif |
2312 | |
2384 | |
|
|
2385 | if (really) |
2313 | XClearWindow (display->display, TermWin.vt); |
2386 | XClearWindow (display->display, TermWin.vt); |
2314 | } |
2387 | } |
2315 | |
2388 | |
2316 | /* ------------------------------------------------------------------------- */ |
2389 | /* ------------------------------------------------------------------------- */ |
2317 | void |
2390 | void |
2318 | rxvt_term::scr_reverse_selection () |
2391 | rxvt_term::scr_reverse_selection () |
2319 | { |
2392 | { |
2320 | int i, col, row, end_row; |
|
|
2321 | rend_t *srp; |
|
|
2322 | |
|
|
2323 | if (selection.op && current_screen == selection.screen) |
2393 | if (selection.op && current_screen == selection.screen) |
2324 | { |
2394 | { |
2325 | end_row = TermWin.saveLines - TermWin.view_start; |
2395 | int end_row = TermWin.saveLines - TermWin.view_start; |
2326 | i = selection.beg.row + TermWin.saveLines; |
2396 | int i = selection.beg.row + TermWin.saveLines; |
2327 | row = selection.end.row + TermWin.saveLines; |
2397 | int col, row = selection.end.row + TermWin.saveLines; |
|
|
2398 | rend_t *srp; |
|
|
2399 | |
2328 | if (i >= end_row) |
2400 | if (i >= end_row) |
2329 | col = selection.beg.col; |
2401 | col = selection.beg.col; |
2330 | else |
2402 | else |
2331 | { |
2403 | { |
2332 | col = 0; |
2404 | col = 0; |
2333 | i = end_row; |
2405 | i = end_row; |
2334 | } |
2406 | } |
|
|
2407 | |
2335 | end_row += TermWin.nrow; |
2408 | end_row += TermWin.nrow; |
2336 | for (; i < row && i < end_row; i++, col = 0) |
2409 | for (; i < row && i < end_row; i++, col = 0) |
2337 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
2410 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
2338 | srp[col] ^= RS_RVid; |
2411 | srp[col] ^= RS_RVid; |
|
|
2412 | |
2339 | if (i == row && i < end_row) |
2413 | if (i == row && i < end_row) |
2340 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2414 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2341 | srp[col] ^= RS_RVid; |
2415 | srp[col] ^= RS_RVid; |
2342 | } |
2416 | } |
2343 | } |
2417 | } |
… | |
… | |
2431 | { |
2505 | { |
2432 | n = min (len - i, PROP_SIZE); |
2506 | n = min (len - i, PROP_SIZE); |
2433 | MEMCPY (ds, data + i, n); |
2507 | MEMCPY (ds, data + i, n); |
2434 | |
2508 | |
2435 | for (j = 0; j < n; j++) |
2509 | for (j = 0; j < n; j++) |
2436 | if (ds[j] == '\n') |
2510 | if (ds[j] == C0_LF) |
2437 | ds[j] = '\r'; |
2511 | ds[j] = C0_CR; |
2438 | |
2512 | |
2439 | tt_write (ds, (int)n); |
2513 | tt_write (ds, (int)n); |
2440 | } |
2514 | } |
2441 | |
2515 | |
2442 | free (ds); |
2516 | free (ds); |
… | |
… | |
2482 | } |
2556 | } |
2483 | |
2557 | |
2484 | for (;;) |
2558 | for (;;) |
2485 | { |
2559 | { |
2486 | if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), |
2560 | if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), |
2487 | (long) (PROP_SIZE / 4), delete_prop, |
2561 | (long) (PROP_SIZE / 4), delete_prop, |
2488 | AnyPropertyType, &ct.encoding, &ct.format, |
2562 | AnyPropertyType, &ct.encoding, &ct.format, |
2489 | &ct.nitems, &bytes_after, |
2563 | &ct.nitems, &bytes_after, |
2490 | &ct.value) != Success) |
2564 | &ct.value) != Success) |
2491 | break; |
2565 | break; |
2492 | |
2566 | |
2493 | if (ct.encoding == 0) |
2567 | if (ct.encoding == 0) |
2494 | { |
2568 | { |
2495 | D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); |
2569 | D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); |
2496 | break; |
2570 | break; |
2497 | } |
2571 | } |
|
|
2572 | else if (ct.encoding == xa[XA_INCR]) |
|
|
2573 | { |
|
|
2574 | // INCR selection, start handshake |
|
|
2575 | XDeleteProperty (display->display, win, prop); |
|
|
2576 | selection_wait = Sel_incr; |
|
|
2577 | incr_ev.start (NOW + 10); |
|
|
2578 | break; |
|
|
2579 | } |
2498 | |
2580 | |
2499 | if (ct.value == NULL) |
2581 | if (ct.value == NULL) |
2500 | { |
2582 | { |
2501 | D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!")); |
2583 | D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!")); |
2502 | continue; |
2584 | continue; |
2503 | } |
2585 | } |
2504 | |
2586 | |
2505 | if (ct.nitems == 0) |
2587 | if (ct.nitems == 0) |
2506 | { |
2588 | { |
2507 | D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
2589 | D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
|
|
2590 | |
2508 | if (selection_wait == Sel_normal && nread == 0) |
2591 | if (selection_wait == Sel_normal && nread == 0 |
|
|
2592 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2509 | { |
2593 | { |
2510 | /* |
2594 | /* |
2511 | * pass through again trying CUT_BUFFER0 if we've come from |
2595 | * pass through again trying CUT_BUFFER0 if we've come from |
2512 | * XConvertSelection () but nothing was presented |
2596 | * XConvertSelection () but nothing was presented |
2513 | */ |
2597 | */ |
… | |
… | |
2521 | |
2605 | |
2522 | nread += ct.nitems; |
2606 | nread += ct.nitems; |
2523 | |
2607 | |
2524 | char **cl; |
2608 | char **cl; |
2525 | int cr; |
2609 | int cr; |
2526 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, |
2610 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) |
2527 | &cr) >= 0 && cl) |
|
|
2528 | { |
2611 | { |
2529 | for (int i = 0; i < cr; i++) |
2612 | for (int i = 0; i < cr; i++) |
2530 | paste ((unsigned char *)cl[i], STRLEN (cl[i])); |
2613 | paste ((unsigned char *)cl[i], STRLEN (cl[i])); |
2531 | |
2614 | |
2532 | XFreeStringList (cl); |
2615 | XFreeStringList (cl); |
… | |
… | |
2553 | void |
2636 | void |
2554 | rxvt_term::incr_cb (time_watcher &w) |
2637 | rxvt_term::incr_cb (time_watcher &w) |
2555 | { |
2638 | { |
2556 | selection_wait = Sel_none; |
2639 | selection_wait = Sel_none; |
2557 | |
2640 | |
2558 | rxvt_print_error ("data loss: timeout on INCR selection paste"); |
2641 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2559 | } |
2642 | } |
2560 | |
2643 | |
2561 | /* |
2644 | /* |
2562 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2645 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2563 | */ |
2646 | */ |
2564 | void |
2647 | void |
2565 | rxvt_term::selection_property (Window win, Atom prop) |
2648 | rxvt_term::selection_property (Window win, Atom prop) |
2566 | { |
2649 | { |
2567 | int reget_time = 0; |
2650 | if (prop == None || selection_wait != Sel_incr) |
2568 | |
|
|
2569 | if (prop == None) |
|
|
2570 | return; |
2651 | return; |
2571 | D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); |
|
|
2572 | if (selection_wait == Sel_normal) |
|
|
2573 | { |
|
|
2574 | int a, afmt; |
|
|
2575 | Atom atype; |
|
|
2576 | unsigned long bytes_after, nitems; |
|
|
2577 | unsigned char *s = NULL; |
|
|
2578 | |
2652 | |
2579 | a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, |
|
|
2580 | xa[XA_INCR], &atype, &afmt, &nitems, |
|
|
2581 | &bytes_after, &s); |
|
|
2582 | if (s) |
|
|
2583 | XFree (s); |
|
|
2584 | if (a != Success) |
|
|
2585 | return; |
|
|
2586 | #ifndef __CYGWIN32__ |
|
|
2587 | if (atype == xa[XA_INCR]) |
|
|
2588 | { /* start an INCR transfer */ |
|
|
2589 | D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); |
|
|
2590 | XDeleteProperty (display->display, win, prop); |
|
|
2591 | XFlush (display->display); |
|
|
2592 | reget_time = 1; |
|
|
2593 | selection_wait = Sel_incr; |
|
|
2594 | } |
|
|
2595 | #endif |
|
|
2596 | |
|
|
2597 | } |
|
|
2598 | else if (selection_wait == Sel_incr) |
|
|
2599 | { |
|
|
2600 | reget_time = 1; |
|
|
2601 | if (selection_paste (win, prop, True) == -1) |
2653 | if (selection_paste (win, prop, 1) > 0) |
2602 | { |
|
|
2603 | D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); |
|
|
2604 | selection_wait = Sel_none; |
|
|
2605 | incr_ev.stop (); |
|
|
2606 | } |
|
|
2607 | } |
|
|
2608 | if (reget_time) /* received more data so reget time */ |
|
|
2609 | incr_ev.start (NOW + 10); |
2654 | incr_ev.start (NOW + 10); |
|
|
2655 | else |
|
|
2656 | { |
|
|
2657 | selection_wait = Sel_none; |
|
|
2658 | incr_ev.stop (); |
|
|
2659 | } |
2610 | } |
2660 | } |
|
|
2661 | |
2611 | /* ------------------------------------------------------------------------- */ |
2662 | /* ------------------------------------------------------------------------- */ |
2612 | /* |
2663 | /* |
2613 | * Request the current selection: |
2664 | * Request the current selection: |
2614 | * Order: > internal selection if available |
2665 | * Order: > internal selection if available |
2615 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2666 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
… | |
… | |
2620 | */ |
2671 | */ |
2621 | void |
2672 | void |
2622 | rxvt_term::selection_request (Time tm, int x, int y) |
2673 | rxvt_term::selection_request (Time tm, int x, int y) |
2623 | { |
2674 | { |
2624 | D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); |
2675 | D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); |
|
|
2676 | |
2625 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2677 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2626 | return; /* outside window */ |
2678 | return; /* outside window */ |
2627 | |
2679 | |
2628 | if (selection.text != NULL) |
2680 | if (selection.text) |
2629 | { /* internal selection */ |
2681 | { /* internal selection */ |
2630 | D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); |
2682 | D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); |
2631 | paste (selection.text, selection.len); |
2683 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2684 | paste ((unsigned char *)str, strlen (str)); |
|
|
2685 | free (str); |
2632 | return; |
2686 | return; |
2633 | } |
2687 | } |
2634 | else |
2688 | else |
2635 | { |
2689 | { |
2636 | int i; |
2690 | int i; |
2637 | |
2691 | |
2638 | selection_request_time = tm; |
2692 | selection_request_time = tm; |
2639 | selection_wait = Sel_normal; |
2693 | selection_wait = Sel_normal; |
|
|
2694 | |
2640 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2695 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2641 | { |
2696 | { |
2642 | #if X_HAVE_UTF8_STRING |
2697 | #if X_HAVE_UTF8_STRING |
2643 | selection_type = Sel_UTF8String; |
2698 | selection_type = Sel_UTF8String; |
2644 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
2699 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
… | |
… | |
2649 | return; |
2704 | return; |
2650 | #endif |
2705 | #endif |
2651 | |
2706 | |
2652 | } |
2707 | } |
2653 | } |
2708 | } |
|
|
2709 | |
2654 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2710 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2655 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2711 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2656 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2712 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2657 | } |
2713 | } |
2658 | |
2714 | |
2659 | int |
2715 | int |
2660 | rxvt_term::selection_request_other (Atom target, int selnum) |
2716 | rxvt_term::selection_request_other (Atom target, int selnum) |
2661 | { |
2717 | { |
2662 | Atom sel; |
2718 | Atom sel; |
2663 | #ifdef DEBUG_SELECT |
2719 | #ifdef DEBUG_SELECT |
2664 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
2720 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
2665 | #endif |
2721 | #endif |
2666 | |
2722 | |
2667 | selection_type |= selnum; |
2723 | selection_type |= selnum; |
|
|
2724 | |
2668 | if (selnum == Sel_Primary) |
2725 | if (selnum == Sel_Primary) |
2669 | sel = XA_PRIMARY; |
2726 | sel = XA_PRIMARY; |
2670 | else if (selnum == Sel_Secondary) |
2727 | else if (selnum == Sel_Secondary) |
2671 | sel = XA_SECONDARY; |
2728 | sel = XA_SECONDARY; |
2672 | else |
2729 | else |
2673 | sel = xa[XA_CLIPBOARD]; |
2730 | sel = xa[XA_CLIPBOARD]; |
|
|
2731 | |
2674 | if (XGetSelectionOwner (display->display, sel) != None) |
2732 | if (XGetSelectionOwner (display->display, sel) != None) |
2675 | { |
2733 | { |
2676 | D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); |
2734 | D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); |
2677 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2735 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2678 | TermWin.vt, selection_request_time); |
2736 | TermWin.vt, selection_request_time); |
2679 | return 1; |
2737 | return 1; |
2680 | } |
2738 | } |
|
|
2739 | |
2681 | return 0; |
2740 | return 0; |
2682 | } |
2741 | } |
2683 | |
2742 | |
2684 | /* ------------------------------------------------------------------------- */ |
2743 | /* ------------------------------------------------------------------------- */ |
2685 | /* |
2744 | /* |
… | |
… | |
2694 | want_refresh = 1; |
2753 | want_refresh = 1; |
2695 | free (selection.text); |
2754 | free (selection.text); |
2696 | selection.text = NULL; |
2755 | selection.text = NULL; |
2697 | selection.len = 0; |
2756 | selection.len = 0; |
2698 | CLEAR_SELECTION (); |
2757 | CLEAR_SELECTION (); |
|
|
2758 | |
|
|
2759 | if (display->selection_owner == this) |
|
|
2760 | display->selection_owner = 0; |
2699 | } |
2761 | } |
2700 | |
2762 | |
2701 | /* ------------------------------------------------------------------------- */ |
2763 | /* ------------------------------------------------------------------------- */ |
2702 | /* |
2764 | /* |
2703 | * Copy a selection into the cut buffer |
2765 | * Copy a selection into the cut buffer |
2704 | * EXT: button 1 or 3 release |
2766 | * EXT: button 1 or 3 release |
2705 | */ |
2767 | */ |
2706 | void |
2768 | void |
2707 | rxvt_term::selection_make (Time tm) |
2769 | rxvt_term::selection_make (Time tm) |
2708 | { |
2770 | { |
2709 | int i, col, end_col, row, end_row; |
2771 | int i, col, end_col, row, end_row; |
2710 | unsigned char *new_selection_text; |
2772 | wchar_t *new_selection_text; |
2711 | char *str; |
|
|
2712 | text_t *t; |
2773 | text_t *t; |
2713 | #ifdef ACS_ASCII |
|
|
2714 | rend_t *re; |
|
|
2715 | #endif |
|
|
2716 | |
2774 | |
2717 | D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); |
2775 | D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); |
2718 | switch (selection.op) |
2776 | switch (selection.op) |
2719 | { |
2777 | { |
2720 | case SELECTION_CONT: |
2778 | case SELECTION_CONT: |
… | |
… | |
2726 | selection.op = SELECTION_DONE; |
2784 | selection.op = SELECTION_DONE; |
2727 | /* FALLTHROUGH */ |
2785 | /* FALLTHROUGH */ |
2728 | default: |
2786 | default: |
2729 | return; |
2787 | return; |
2730 | } |
2788 | } |
|
|
2789 | |
2731 | selection.op = SELECTION_DONE; |
2790 | selection.op = SELECTION_DONE; |
2732 | |
2791 | |
2733 | if (selection.clicks == 4) |
2792 | if (selection.clicks == 4) |
2734 | return; /* nothing selected, go away */ |
2793 | return; /* nothing selected, go away */ |
2735 | |
2794 | |
2736 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; |
2795 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2737 | str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); |
2796 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2738 | |
|
|
2739 | new_selection_text = (unsigned char *)str; |
|
|
2740 | |
2797 | |
2741 | col = selection.beg.col; |
2798 | col = selection.beg.col; |
2742 | MAX_IT (col, 0); |
2799 | MAX_IT (col, 0); |
2743 | row = selection.beg.row + TermWin.saveLines; |
2800 | row = selection.beg.row + TermWin.saveLines; |
2744 | end_row = selection.end.row + TermWin.saveLines; |
2801 | end_row = selection.end.row + TermWin.saveLines; |
|
|
2802 | int ofs = 0; |
|
|
2803 | int extra = 0; |
2745 | |
2804 | |
2746 | for (; row <= end_row; row++, col = 0) |
2805 | for (; row <= end_row; row++, col = 0) |
2747 | { |
2806 | { |
2748 | t = & (screen.text[row][col]); |
2807 | t = &(screen.text[row][col]); |
2749 | |
2808 | |
2750 | end_col = screen.tlen[row]; |
2809 | end_col = screen.tlen[row]; |
2751 | |
2810 | |
2752 | if (end_col == -1) |
2811 | if (end_col == -1) |
2753 | end_col = TermWin.ncol; |
2812 | end_col = TermWin.ncol; |
2754 | |
2813 | |
2755 | if (row == end_row) |
2814 | if (row == end_row) |
2756 | MIN_IT (end_col, selection.end.col); |
2815 | MIN_IT (end_col, selection.end.col); |
2757 | |
2816 | |
2758 | for (; col < end_col; col++) |
2817 | for (; col < end_col; col++) |
|
|
2818 | { |
2759 | if (*t == NOCHAR) |
2819 | if (*t == NOCHAR) |
2760 | t++; |
2820 | t++; |
|
|
2821 | #if ENABLE_COMBINING |
|
|
2822 | else if (IS_COMPOSE (*t)) |
|
|
2823 | { |
|
|
2824 | int len = rxvt_composite.expand (*t, 0); |
|
|
2825 | |
|
|
2826 | extra -= (len - 1); |
|
|
2827 | |
|
|
2828 | if (extra < 0) |
|
|
2829 | { |
|
|
2830 | extra += i; |
|
|
2831 | i += i; |
|
|
2832 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
|
|
2833 | } |
|
|
2834 | |
|
|
2835 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
|
|
2836 | } |
|
|
2837 | #endif |
2761 | else |
2838 | else |
2762 | { |
2839 | new_selection_text[ofs++] = *t++; |
2763 | int len = wctomb (str, *t++); |
|
|
2764 | if (len > 0) |
|
|
2765 | str += len; |
|
|
2766 | } |
2840 | } |
2767 | |
2841 | |
2768 | if (screen.tlen[row] != -1 && row != end_row) |
2842 | if (screen.tlen[row] != -1 && row != end_row) |
2769 | *str++ = '\n'; |
2843 | new_selection_text[ofs++] = C0_LF; |
2770 | } |
2844 | } |
2771 | |
2845 | |
2772 | #ifndef NO_OLD_SELECTION |
|
|
2773 | if (selection_style == OLD_SELECT) |
|
|
2774 | if (end_col == TermWin.ncol) |
|
|
2775 | *str++ = '\n'; |
|
|
2776 | #endif |
|
|
2777 | #ifndef NO_NEW_SELECTION |
|
|
2778 | if (selection_style != OLD_SELECT) |
|
|
2779 | if (end_col != selection.end.col) |
2846 | if (end_col != selection.end.col) |
2780 | *str++ = '\n'; |
2847 | new_selection_text[ofs++] = C0_LF; |
2781 | #endif |
|
|
2782 | *str = '\0'; |
|
|
2783 | |
2848 | |
2784 | i = str - (char *)new_selection_text; |
2849 | new_selection_text[ofs] = 0; |
|
|
2850 | |
2785 | if (i == 0) |
2851 | if (ofs == 0) |
2786 | { |
2852 | { |
2787 | free (new_selection_text); |
2853 | free (new_selection_text); |
2788 | return; |
2854 | return; |
2789 | } |
2855 | } |
2790 | |
2856 | |
2791 | // due to MB_MAX_CUR, selection wastage is usually high, so realloc |
|
|
2792 | if (str - (char *)new_selection_text > 1024) |
|
|
2793 | new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1); |
|
|
2794 | |
|
|
2795 | selection.len = i; |
|
|
2796 | |
|
|
2797 | if (selection.text) |
|
|
2798 | free (selection.text); |
2857 | free (selection.text); |
2799 | |
2858 | |
2800 | selection.text = new_selection_text; |
2859 | // we usually allocate much more than necessary, so realloc it smaller again |
|
|
2860 | selection.len = ofs; |
|
|
2861 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2801 | |
2862 | |
2802 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2863 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2803 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2864 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2804 | display->set_selection_owner (this); |
2865 | display->set_selection_owner (this); |
2805 | else |
2866 | else |
2806 | rxvt_print_error ("can't get primary selection"); |
2867 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
2807 | |
2868 | |
2808 | { |
2869 | #if 0 |
2809 | XTextProperty ct; |
2870 | XTextProperty ct; |
2810 | char *cl = (char *)selection.text; |
|
|
2811 | |
2871 | |
2812 | if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) |
2872 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2813 | { |
2873 | { |
2814 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
|
|
2815 | PropModeReplace, ct.value, ct.nitems); |
|
|
2816 | XFree (ct.value); |
|
|
2817 | } |
|
|
2818 | else |
|
|
2819 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
2874 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
2820 | PropModeReplace, selection.text, (int)selection.len); |
2875 | PropModeReplace, ct.value, ct.nitems); |
|
|
2876 | XFree (ct.value); |
2821 | } |
2877 | } |
|
|
2878 | #endif |
2822 | |
2879 | |
2823 | selection_time = tm; |
2880 | selection_time = tm; |
2824 | D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); |
2881 | D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); |
2825 | } |
2882 | } |
2826 | |
2883 | |
… | |
… | |
2855 | rxvt_term::selection_start_colrow (int col, int row) |
2912 | rxvt_term::selection_start_colrow (int col, int row) |
2856 | { |
2913 | { |
2857 | want_refresh = 1; |
2914 | want_refresh = 1; |
2858 | selection.mark.col = col; |
2915 | selection.mark.col = col; |
2859 | selection.mark.row = row - TermWin.view_start; |
2916 | selection.mark.row = row - TermWin.view_start; |
|
|
2917 | |
2860 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
2918 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
2861 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
2919 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
2862 | MAX_IT (selection.mark.col, 0); |
2920 | MAX_IT (selection.mark.col, 0); |
2863 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
2921 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
2864 | |
2922 | |
|
|
2923 | while (selection.mark.col > 0 |
|
|
2924 | && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) |
|
|
2925 | --selection.mark.col; |
|
|
2926 | |
2865 | if (selection.op) |
2927 | if (selection.op) |
2866 | { /* clear the old selection */ |
2928 | { /* clear the old selection */ |
2867 | selection.beg.row = selection.end.row = selection.mark.row; |
2929 | selection.beg.row = selection.end.row = selection.mark.row; |
2868 | selection.beg.col = selection.end.col = selection.mark.col; |
2930 | selection.beg.col = selection.end.col = selection.mark.col; |
2869 | } |
2931 | } |
|
|
2932 | |
2870 | selection.op = SELECTION_INIT; |
2933 | selection.op = SELECTION_INIT; |
2871 | selection.screen = current_screen; |
2934 | selection.screen = current_screen; |
2872 | } |
2935 | } |
2873 | |
2936 | |
2874 | /* ------------------------------------------------------------------------- */ |
2937 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
2876 | * Word select: select text for 2 clicks |
2939 | * Word select: select text for 2 clicks |
2877 | * We now only find out the boundary in one direction |
2940 | * We now only find out the boundary in one direction |
2878 | */ |
2941 | */ |
2879 | |
2942 | |
2880 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2943 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2881 | #define DELIMIT_TEXT(x) \ |
2944 | #define DELIMIT_TEXT(x) \ |
2882 | (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) |
2945 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) |
2883 | #define DELIMIT_REND(x) 1 |
2946 | #define DELIMIT_REND(x) 1 |
2884 | |
2947 | |
2885 | void |
2948 | void |
2886 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2949 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2887 | { |
2950 | { |
2888 | int col, row, dirnadd, tcol, trow, w1, w2; |
2951 | int col, row, dirnadd, tcol, trow, w1, w2; |
2889 | row_col_t bound; |
2952 | row_col_t bound; |
2890 | text_t *stp; |
2953 | text_t *stp; |
2891 | rend_t *srp; |
2954 | rend_t *srp; |
2892 | |
2955 | |
2893 | if (dirn == UP) |
2956 | if (dirn == UP) |
2894 | { |
2957 | { |
2895 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
2958 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
2896 | bound.col = 0; |
2959 | bound.col = 0; |
… | |
… | |
2900 | { |
2963 | { |
2901 | bound.row = TermWin.saveLines + TermWin.nrow; |
2964 | bound.row = TermWin.saveLines + TermWin.nrow; |
2902 | bound.col = TermWin.ncol - 1; |
2965 | bound.col = TermWin.ncol - 1; |
2903 | dirnadd = 1; |
2966 | dirnadd = 1; |
2904 | } |
2967 | } |
|
|
2968 | |
2905 | row = mark->row + TermWin.saveLines; |
2969 | row = mark->row + TermWin.saveLines; |
2906 | col = mark->col; |
2970 | col = mark->col; |
2907 | MAX_IT (col, 0); |
2971 | MAX_IT (col, 0); |
2908 | /* find the edge of a word */ |
2972 | /* find the edge of a word */ |
2909 | stp = & (screen.text[row][col]); |
2973 | stp = & (screen.text[row][col]); |
2910 | w1 = DELIMIT_TEXT (*stp); |
2974 | w1 = DELIMIT_TEXT (*stp); |
2911 | |
2975 | |
2912 | if (selection_style != NEW_SELECT) |
|
|
2913 | { |
|
|
2914 | if (w1 == 1) |
|
|
2915 | { |
|
|
2916 | stp += dirnadd; |
|
|
2917 | if (DELIMIT_TEXT (*stp) == 1) |
|
|
2918 | goto Old_Word_Selection_You_Die; |
|
|
2919 | col += dirnadd; |
|
|
2920 | } |
|
|
2921 | w1 = 0; |
|
|
2922 | } |
|
|
2923 | srp = (&screen.rend[row][col]); |
2976 | srp = (&screen.rend[row][col]); |
2924 | w2 = DELIMIT_REND (*srp); |
2977 | w2 = DELIMIT_REND (*srp); |
2925 | |
2978 | |
2926 | for (;;) |
2979 | for (;;) |
2927 | { |
2980 | { |
2928 | for (; col != bound.col; col += dirnadd) |
2981 | for (; col != bound.col; col += dirnadd) |
2929 | { |
2982 | { |
2930 | stp += dirnadd; |
2983 | stp += dirnadd; |
|
|
2984 | srp += dirnadd; |
|
|
2985 | |
|
|
2986 | if (*stp == NOCHAR) |
|
|
2987 | continue; |
|
|
2988 | |
2931 | if (DELIMIT_TEXT (*stp) != w1) |
2989 | if (DELIMIT_TEXT (*stp) != w1) |
2932 | break; |
2990 | break; |
2933 | srp += dirnadd; |
|
|
2934 | if (DELIMIT_REND (*srp) != w2) |
2991 | if (DELIMIT_REND (*srp) != w2) |
2935 | break; |
2992 | break; |
2936 | } |
2993 | } |
|
|
2994 | |
2937 | if ((col == bound.col) && (row != bound.row)) |
2995 | if ((col == bound.col) && (row != bound.row)) |
2938 | { |
2996 | { |
2939 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
2997 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
2940 | { |
2998 | { |
2941 | trow = row + dirnadd; |
2999 | trow = row + dirnadd; |
2942 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
3000 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
|
|
3001 | |
2943 | if (screen.text[trow] == NULL) |
3002 | if (screen.text[trow] == NULL) |
2944 | break; |
3003 | break; |
|
|
3004 | |
2945 | stp = & (screen.text[trow][tcol]); |
3005 | stp = & (screen.text[trow][tcol]); |
2946 | srp = & (screen.rend[trow][tcol]); |
3006 | srp = & (screen.rend[trow][tcol]); |
|
|
3007 | |
2947 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3008 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
2948 | break; |
3009 | break; |
|
|
3010 | |
2949 | row = trow; |
3011 | row = trow; |
2950 | col = tcol; |
3012 | col = tcol; |
2951 | continue; |
3013 | continue; |
2952 | } |
3014 | } |
2953 | } |
3015 | } |
2954 | break; |
3016 | break; |
2955 | } |
3017 | } |
|
|
3018 | |
2956 | Old_Word_Selection_You_Die: |
3019 | Old_Word_Selection_You_Die: |
2957 | D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); |
3020 | D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); |
2958 | |
3021 | |
2959 | if (dirn == DN) |
3022 | if (dirn == DN) |
2960 | col++; /* put us on one past the end */ |
3023 | col++; /* put us on one past the end */ |
… | |
… | |
2982 | MAX_IT (row, 0); |
3045 | MAX_IT (row, 0); |
2983 | MIN_IT (row, (int)TermWin.nrow - 1); |
3046 | MIN_IT (row, (int)TermWin.nrow - 1); |
2984 | MAX_IT (col, 0); |
3047 | MAX_IT (col, 0); |
2985 | MIN_IT (col, (int)TermWin.ncol); |
3048 | MIN_IT (col, (int)TermWin.ncol); |
2986 | |
3049 | |
2987 | #ifndef NO_NEW_SELECTION |
|
|
2988 | /* |
3050 | /* |
2989 | * If we're selecting characters (single click) then we must check first |
3051 | * If we're selecting characters (single click) then we must check first |
2990 | * if we are at the same place as the original mark. If we are then |
3052 | * if we are at the same place as the original mark. If we are then |
2991 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3053 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
2992 | * be _past_ a character for it to be selected. |
3054 | * be _past_ a character for it to be selected. |
2993 | */ |
3055 | */ |
2994 | if (selection_style != OLD_SELECT) |
|
|
2995 | { |
|
|
2996 | if (((selection.clicks % 3) == 1) && !flag |
3056 | if (((selection.clicks % 3) == 1) && !flag |
2997 | && (col == selection.mark.col |
3057 | && (col == selection.mark.col |
2998 | && (row == selection.mark.row + TermWin.view_start))) |
3058 | && (row == selection.mark.row + TermWin.view_start))) |
2999 | { |
3059 | { |
3000 | /* select nothing */ |
3060 | /* select nothing */ |
3001 | selection.beg.row = selection.end.row = 0; |
3061 | selection.beg.row = selection.end.row = 0; |
3002 | selection.beg.col = selection.end.col = 0; |
3062 | selection.beg.col = selection.end.col = 0; |
3003 | selection.clicks = 4; |
3063 | selection.clicks = 4; |
3004 | want_refresh = 1; |
3064 | want_refresh = 1; |
3005 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
3065 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
3006 | return; |
3066 | return; |
3007 | } |
|
|
3008 | } |
3067 | } |
3009 | #endif |
3068 | |
3010 | if (selection.clicks == 4) |
3069 | if (selection.clicks == 4) |
3011 | selection.clicks = 1; |
3070 | selection.clicks = 1; |
3012 | |
3071 | |
3013 | selection_extend_colrow (col, row, !!flag, /* ? button 3 */ |
3072 | selection_extend_colrow (col, row, !!flag, /* ? button 3 */ |
3014 | flag == 1 ? 1 : 0, /* ? button press */ |
3073 | flag == 1 ? 1 : 0, /* ? button press */ |
… | |
… | |
3020 | * Extend the selection to the specified col/row |
3079 | * Extend the selection to the specified col/row |
3021 | */ |
3080 | */ |
3022 | void |
3081 | void |
3023 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3082 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3024 | { |
3083 | { |
3025 | int16_t ncol = TermWin.ncol; |
3084 | int16_t ncol = TermWin.ncol; |
3026 | int end_col; |
3085 | int end_col; |
3027 | row_col_t pos; |
3086 | row_col_t pos; |
3028 | enum { |
3087 | enum { |
3029 | LEFT, RIGHT |
3088 | LEFT, RIGHT |
3030 | } closeto = RIGHT; |
3089 | } closeto = RIGHT; |
3031 | |
3090 | |
3032 | D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); |
3091 | D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); |
… | |
… | |
3068 | pos.col = col; |
3127 | pos.col = col; |
3069 | pos.row = row; |
3128 | pos.row = row; |
3070 | |
3129 | |
3071 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
3130 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
3072 | |
3131 | |
3073 | #ifndef NO_OLD_SELECTION |
|
|
3074 | /* |
|
|
3075 | * This mimics some of the selection behaviour of version 2.20 and before. |
|
|
3076 | * There are no ``selection modes'', button3 is always character extension. |
|
|
3077 | * Note: button3 drag is always available, c.f. v2.20 |
|
|
3078 | * Selection always terminates (left or right as appropriate) at the mark. |
|
|
3079 | */ |
|
|
3080 | if (selection_style == OLD_SELECT) |
|
|
3081 | { |
|
|
3082 | if (selection.clicks == 1 || button3) |
|
|
3083 | { |
|
|
3084 | if (hate_those_clicks) |
|
|
3085 | { |
|
|
3086 | hate_those_clicks = 0; |
|
|
3087 | if (selection.clicks == 1) |
|
|
3088 | { |
|
|
3089 | selection.beg.row = selection.mark.row; |
|
|
3090 | selection.beg.col = selection.mark.col; |
|
|
3091 | } |
|
|
3092 | else |
|
|
3093 | { |
|
|
3094 | selection.mark.row = selection.beg.row; |
|
|
3095 | selection.mark.col = selection.beg.col; |
|
|
3096 | } |
|
|
3097 | } |
|
|
3098 | if (ROWCOL_IS_BEFORE (pos, selection.mark)) |
|
|
3099 | { |
|
|
3100 | selection.end.row = selection.mark.row; |
|
|
3101 | selection.end.col = selection.mark.col + 1; |
|
|
3102 | selection.beg.row = pos.row; |
|
|
3103 | selection.beg.col = pos.col; |
|
|
3104 | } |
|
|
3105 | else |
|
|
3106 | { |
|
|
3107 | selection.beg.row = selection.mark.row; |
|
|
3108 | selection.beg.col = selection.mark.col; |
|
|
3109 | selection.end.row = pos.row; |
|
|
3110 | selection.end.col = pos.col + 1; |
|
|
3111 | } |
|
|
3112 | } |
|
|
3113 | else if (selection.clicks == 2) |
|
|
3114 | { |
|
|
3115 | selection_delimit_word (UP, & (selection.mark), |
|
|
3116 | & (selection.beg)); |
|
|
3117 | selection_delimit_word (DN, & (selection.mark), |
|
|
3118 | & (selection.end)); |
|
|
3119 | hate_those_clicks = 1; |
|
|
3120 | } |
|
|
3121 | else if (selection.clicks == 3) |
|
|
3122 | { |
|
|
3123 | selection.beg.row = selection.end.row = selection.mark.row; |
|
|
3124 | selection.beg.col = 0; |
|
|
3125 | selection.end.col = ncol; |
|
|
3126 | hate_those_clicks = 1; |
|
|
3127 | } |
|
|
3128 | 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)); |
|
|
3129 | return; |
|
|
3130 | } |
|
|
3131 | #endif /* ! NO_OLD_SELECTION */ |
|
|
3132 | #ifndef NO_NEW_SELECTION |
|
|
3133 | /* selection_style must not be OLD_SELECT to get here */ |
|
|
3134 | /* |
3132 | /* |
3135 | * This is mainly xterm style selection with a couple of differences, mainly |
3133 | * This is mainly xterm style selection with a couple of differences, mainly |
3136 | * in the way button3 drag extension works. |
3134 | * in the way button3 drag extension works. |
3137 | * We're either doing: button1 drag; button3 press; or button3 drag |
3135 | * We're either doing: button1 drag; button3 press; or button3 drag |
3138 | * a) button1 drag : select around a midpoint/word/line - that point/word/line |
3136 | * a) button1 drag : select around a midpoint/word/line - that point/word/line |
… | |
… | |
3143 | * a point/word/line which is either the start or end of the selection |
3141 | * a point/word/line which is either the start or end of the selection |
3144 | * and it was decided by whichever point/word/line was `fixed' at the |
3142 | * and it was decided by whichever point/word/line was `fixed' at the |
3145 | * time of the most recent button3 press |
3143 | * time of the most recent button3 press |
3146 | */ |
3144 | */ |
3147 | if (button3 && buttonpress) |
3145 | if (button3 && buttonpress) |
3148 | { /* button3 press */ |
3146 | { /* button3 press */ |
3149 | /* |
3147 | /* |
3150 | * first determine which edge of the selection we are closest to |
3148 | * first determine which edge of the selection we are closest to |
3151 | */ |
3149 | */ |
3152 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3150 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3153 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3151 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3154 | && (((pos.col - selection.beg.col) |
3152 | && (((pos.col - selection.beg.col) |
3155 | + ((pos.row - selection.beg.row) * ncol)) |
3153 | + ((pos.row - selection.beg.row) * ncol)) |
3156 | < ((selection.end.col - pos.col) |
3154 | < ((selection.end.col - pos.col) |
3157 | + ((selection.end.row - pos.row) * ncol))))) |
3155 | + ((selection.end.row - pos.row) * ncol))))) |
3158 | closeto = LEFT; |
3156 | closeto = LEFT; |
|
|
3157 | |
3159 | if (closeto == LEFT) |
3158 | if (closeto == LEFT) |
3160 | { |
3159 | { |
3161 | selection.beg.row = pos.row; |
3160 | selection.beg.row = pos.row; |
3162 | selection.beg.col = pos.col; |
3161 | selection.beg.col = pos.col; |
3163 | selection.mark.row = selection.end.row; |
3162 | selection.mark.row = selection.end.row; |
3164 | selection.mark.col = selection.end.col |
3163 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3165 | - (selection.clicks == 2); |
|
|
3166 | } |
3164 | } |
3167 | else |
3165 | else |
3168 | { |
3166 | { |
3169 | selection.end.row = pos.row; |
3167 | selection.end.row = pos.row; |
3170 | selection.end.col = pos.col; |
3168 | selection.end.col = pos.col; |
3171 | selection.mark.row = selection.beg.row; |
3169 | selection.mark.row = selection.beg.row; |
3172 | selection.mark.col = selection.beg.col; |
3170 | selection.mark.col = selection.beg.col; |
3173 | } |
3171 | } |
3174 | } |
3172 | } |
3175 | else |
3173 | else |
3176 | { /* button1 drag or button3 drag */ |
3174 | { /* button1 drag or button3 drag */ |
3177 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3175 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3178 | { |
3176 | { |
3179 | if ((selection.mark.row == selection.end.row) |
3177 | if ((selection.mark.row == selection.end.row) |
3180 | && (selection.mark.col == selection.end.col) |
3178 | && (selection.mark.col == selection.end.col) |
3181 | && clickchange && selection.clicks == 2) |
3179 | && clickchange && selection.clicks == 2) |
3182 | selection.mark.col--; |
3180 | selection.mark.col--; |
|
|
3181 | |
3183 | selection.beg.row = pos.row; |
3182 | selection.beg.row = pos.row; |
3184 | selection.beg.col = pos.col; |
3183 | selection.beg.col = pos.col; |
3185 | selection.end.row = selection.mark.row; |
3184 | selection.end.row = selection.mark.row; |
3186 | selection.end.col = selection.mark.col |
3185 | selection.end.col = selection.mark.col + (selection.clicks == 2); |
3187 | + (selection.clicks == 2); |
|
|
3188 | } |
3186 | } |
3189 | else |
3187 | else |
3190 | { |
3188 | { |
3191 | selection.beg.row = selection.mark.row; |
3189 | selection.beg.row = selection.mark.row; |
3192 | selection.beg.col = selection.mark.col; |
3190 | selection.beg.col = selection.mark.col; |
… | |
… | |
3196 | } |
3194 | } |
3197 | |
3195 | |
3198 | if (selection.clicks == 1) |
3196 | if (selection.clicks == 1) |
3199 | { |
3197 | { |
3200 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3198 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
|
|
3199 | |
3201 | if (end_col != -1 && selection.beg.col > end_col) |
3200 | if (end_col != -1 && selection.beg.col > end_col) |
3202 | { |
3201 | { |
3203 | #if 1 |
3202 | #if 1 |
3204 | selection.beg.col = ncol; |
3203 | selection.beg.col = ncol; |
3205 | #else |
3204 | #else |
3206 | if (selection.beg.row != selection.end.row) |
3205 | if (selection.beg.row != selection.end.row) |
3207 | selection.beg.col = ncol; |
3206 | selection.beg.col = ncol; |
3208 | else |
3207 | else |
3209 | selection.beg.col = selection.mark.col; |
3208 | selection.beg.col = selection.mark.col; |
3210 | #endif |
3209 | #endif |
3211 | |
|
|
3212 | } |
3210 | } |
|
|
3211 | |
3213 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
3212 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
|
|
3213 | |
3214 | if (end_col != -1 && selection.end.col > end_col) |
3214 | if (end_col != -1 && selection.end.col > end_col) |
3215 | selection.end.col = ncol; |
3215 | selection.end.col = ncol; |
3216 | |
|
|
3217 | } |
3216 | } |
3218 | else if (selection.clicks == 2) |
3217 | else if (selection.clicks == 2) |
3219 | { |
3218 | { |
3220 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3219 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3221 | selection.end.col--; |
3220 | selection.end.col--; |
|
|
3221 | |
3222 | selection_delimit_word (UP, & (selection.beg), |
3222 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3223 | & (selection.beg)); |
|
|
3224 | selection_delimit_word (DN, & (selection.end), |
3223 | selection_delimit_word (DN, & (selection.end), & (selection.end)); |
3225 | & (selection.end)); |
|
|
3226 | } |
3224 | } |
3227 | else if (selection.clicks == 3) |
3225 | else if (selection.clicks == 3) |
3228 | { |
3226 | { |
3229 | #ifndef NO_FRILLS |
3227 | #ifndef NO_FRILLS |
3230 | if ((Options & Opt_tripleclickwords)) |
3228 | if ((Options & Opt_tripleclickwords)) |
3231 | { |
3229 | { |
3232 | int end_row; |
3230 | int end_row; |
3233 | |
3231 | |
3234 | selection_delimit_word (UP, & (selection.beg), |
3232 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3235 | & (selection.beg)); |
|
|
3236 | end_row = screen.tlen[selection.mark.row |
3233 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3237 | + TermWin.saveLines]; |
3234 | |
3238 | for (end_row = selection.mark.row; end_row < TermWin.nrow; |
3235 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3239 | end_row++) |
|
|
3240 | { |
3236 | { |
3241 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
3237 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
|
|
3238 | |
3242 | if (end_col != -1) |
3239 | if (end_col != -1) |
3243 | { |
3240 | { |
3244 | selection.end.row = end_row; |
3241 | selection.end.row = end_row; |
3245 | selection.end.col = end_col; |
3242 | selection.end.col = end_col; |
3246 | selection_remove_trailing_spaces (); |
3243 | selection_remove_trailing_spaces (); |
… | |
… | |
3248 | } |
3245 | } |
3249 | } |
3246 | } |
3250 | } |
3247 | } |
3251 | else |
3248 | else |
3252 | #endif |
3249 | #endif |
3253 | |
|
|
3254 | { |
3250 | { |
3255 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3251 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3256 | selection.mark.col++; |
3252 | selection.mark.col++; |
3257 | selection.beg.col = 0; |
3253 | selection.beg.col = 0; |
3258 | selection.end.col = ncol; |
3254 | selection.end.col = ncol; |
3259 | } |
3255 | } |
3260 | } |
3256 | } |
|
|
3257 | |
3261 | if (button3 && buttonpress) |
3258 | if (button3 && buttonpress) |
3262 | { /* mark may need to be changed */ |
3259 | { /* mark may need to be changed */ |
3263 | if (closeto == LEFT) |
3260 | if (closeto == LEFT) |
3264 | { |
3261 | { |
3265 | selection.mark.row = selection.end.row; |
3262 | selection.mark.row = selection.end.row; |
3266 | selection.mark.col = selection.end.col |
3263 | selection.mark.col = selection.end.col |
3267 | - (selection.clicks == 2); |
3264 | - (selection.clicks == 2); |
… | |
… | |
3271 | selection.mark.row = selection.beg.row; |
3268 | selection.mark.row = selection.beg.row; |
3272 | selection.mark.col = selection.beg.col; |
3269 | selection.mark.col = selection.beg.col; |
3273 | } |
3270 | } |
3274 | } |
3271 | } |
3275 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3272 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3276 | #endif /* ! NO_NEW_SELECTION */ |
|
|
3277 | } |
3273 | } |
3278 | |
3274 | |
3279 | #ifndef NO_FRILLS |
3275 | #ifndef NO_FRILLS |
3280 | void |
3276 | void |
3281 | rxvt_term::selection_remove_trailing_spaces () |
3277 | rxvt_term::selection_remove_trailing_spaces () |
… | |
… | |
3355 | ev.target = rq.target; |
3351 | ev.target = rq.target; |
3356 | ev.time = rq.time; |
3352 | ev.time = rq.time; |
3357 | |
3353 | |
3358 | if (rq.target == xa[XA_TARGETS]) |
3354 | if (rq.target == xa[XA_TARGETS]) |
3359 | { |
3355 | { |
3360 | Atom32 target_list[5]; |
3356 | Atom32 target_list[6]; |
3361 | Atom32 *target = target_list; |
3357 | Atom32 *target = target_list; |
3362 | |
3358 | |
3363 | *target++ = (Atom32) xa[XA_TARGETS]; |
3359 | *target++ = (Atom32) xa[XA_TARGETS]; |
|
|
3360 | *target++ = (Atom32) xa[XA_TIMESTAMP]; |
3364 | *target++ = (Atom32) XA_STRING; |
3361 | *target++ = (Atom32) XA_STRING; |
3365 | *target++ = (Atom32) xa[XA_TEXT]; |
3362 | *target++ = (Atom32) xa[XA_TEXT]; |
3366 | *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; |
3363 | *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; |
3367 | #if X_HAVE_UTF8_STRING |
3364 | #if X_HAVE_UTF8_STRING |
3368 | *target++ = (Atom32) xa[XA_UTF8_STRING]; |
3365 | *target++ = (Atom32) xa[XA_UTF8_STRING]; |
3369 | #endif |
3366 | #endif |
|
|
3367 | |
3370 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3368 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3371 | (8 * sizeof (target_list[0])), PropModeReplace, |
3369 | (8 * sizeof (target_list[0])), PropModeReplace, |
3372 | (unsigned char *)target_list, |
3370 | (unsigned char *)target_list, |
3373 | target - target_list); |
3371 | target - target_list); |
3374 | ev.property = rq.property; |
3372 | ev.property = rq.property; |
3375 | } |
3373 | } |
|
|
3374 | #if TODO // TODO |
3376 | else if (rq.target == xa[XA_MULTIPLE]) |
3375 | else if (rq.target == xa[XA_MULTIPLE]) |
3377 | { |
3376 | { |
3378 | /* TODO: Handle MULTIPLE */ |
3377 | /* TODO: Handle MULTIPLE */ |
3379 | } |
3378 | } |
|
|
3379 | #endif |
3380 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3380 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3381 | { |
3381 | { |
3382 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3382 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3383 | (8 * sizeof (Time)), PropModeReplace, |
3383 | (8 * sizeof (Time)), PropModeReplace, |
3384 | (unsigned char *)&selection_time, 1); |
3384 | (unsigned char *)&selection_time, 1); |
3385 | ev.property = rq.property; |
3385 | ev.property = rq.property; |
3386 | } |
3386 | } |
3387 | else if (rq.target == XA_STRING |
3387 | else if (rq.target == XA_STRING |
3388 | || rq.target == xa[XA_TEXT] |
3388 | || rq.target == xa[XA_TEXT] |
3389 | || rq.target == xa[XA_COMPOUND_TEXT] |
3389 | || rq.target == xa[XA_COMPOUND_TEXT] |
3390 | || rq.target == xa[XA_UTF8_STRING] |
3390 | || rq.target == xa[XA_UTF8_STRING] |
3391 | ) |
3391 | ) |
3392 | { |
3392 | { |
3393 | short freect = 0; |
3393 | short freect = 0; |
3394 | int selectlen; |
3394 | int selectlen; |
3395 | char *cl; |
3395 | wchar_t *cl; |
3396 | |
3396 | |
3397 | target = rq.target; |
3397 | target = rq.target; |
3398 | |
3398 | |
3399 | if (target == XA_STRING) |
3399 | if (target == XA_STRING) |
3400 | // we actually don't do XA_STRING, but who cares, as i18n clients |
3400 | // we actually don't do XA_STRING, but who cares, as i18n clients |
3401 | // will ask for another format anyways. |
3401 | // will ask for another format anyways. |
3402 | style = XStringStyle; |
3402 | style = XStringStyle; |
3403 | else if (target == xa[XA_TEXT]) |
3403 | else if (target == xa[XA_TEXT]) |
3404 | style = XTextStyle; |
3404 | style = XStdICCTextStyle; |
3405 | else if (target == xa[XA_COMPOUND_TEXT]) |
3405 | else if (target == xa[XA_COMPOUND_TEXT]) |
3406 | style = XCompoundTextStyle; |
3406 | style = XCompoundTextStyle; |
3407 | #if X_HAVE_UTF8_STRING |
3407 | #if X_HAVE_UTF8_STRING |
3408 | else if (target == xa[XA_UTF8_STRING]) |
3408 | else if (target == xa[XA_UTF8_STRING]) |
3409 | style = XUTF8StringStyle; |
3409 | style = XUTF8StringStyle; |
… | |
… | |
3414 | style = XCompoundTextStyle; |
3414 | style = XCompoundTextStyle; |
3415 | } |
3415 | } |
3416 | |
3416 | |
3417 | if (selection.text) |
3417 | if (selection.text) |
3418 | { |
3418 | { |
3419 | cl = (char *)selection.text; |
3419 | cl = selection.text; |
3420 | selectlen = selection.len; |
3420 | selectlen = selection.len; |
3421 | } |
3421 | } |
3422 | else |
3422 | else |
3423 | { |
3423 | { |
3424 | cl = ""; |
3424 | cl = L""; |
3425 | selectlen = 0; |
3425 | selectlen = 0; |
3426 | } |
3426 | } |
3427 | |
3427 | |
|
|
3428 | // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it |
|
|
3429 | // manually for XUTF8StringStyle. |
3428 | if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) |
3430 | if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) |
3429 | freect = 1; |
3431 | freect = 1; |
3430 | else |
3432 | else |
3431 | { |
3433 | { |
3432 | /* if we failed to convert then send it raw */ |
3434 | /* if we failed to convert then send it raw */ |
3433 | ct.value = (unsigned char *)cl; |
3435 | ct.value = (unsigned char *)cl; |
… | |
… | |
3440 | ev.property = rq.property; |
3442 | ev.property = rq.property; |
3441 | |
3443 | |
3442 | if (freect) |
3444 | if (freect) |
3443 | XFree (ct.value); |
3445 | XFree (ct.value); |
3444 | } |
3446 | } |
|
|
3447 | |
3445 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3448 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3446 | } |
3449 | } |
3447 | |
3450 | |
3448 | /* ------------------------------------------------------------------------- * |
3451 | /* ------------------------------------------------------------------------- * |
3449 | * MOUSE ROUTINES * |
3452 | * MOUSE ROUTINES * |
… | |
… | |
3473 | pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; |
3476 | pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; |
3474 | } |
3477 | } |
3475 | |
3478 | |
3476 | #endif |
3479 | #endif |
3477 | /* ------------------------------------------------------------------------- */ |
3480 | /* ------------------------------------------------------------------------- */ |
3478 | |
|
|
3479 | /* ------------------------------------------------------------------------- * |
|
|
3480 | * DEBUG ROUTINES * |
|
|
3481 | * ------------------------------------------------------------------------- */ |
|
|
3482 | #if 0 |
|
|
3483 | void |
|
|
3484 | rxvt_debug_colors (void) |
|
|
3485 | { |
|
|
3486 | int color; |
|
|
3487 | const char *name[] = |
|
|
3488 | { |
|
|
3489 | "fg", "bg", |
|
|
3490 | "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" |
|
|
3491 | }; |
|
|
3492 | |
|
|
3493 | fprintf (stderr, "Color ( "); |
|
|
3494 | if (rstyle & RS_RVid) |
|
|
3495 | fprintf (stderr, "rvid "); |
|
|
3496 | if (rstyle & RS_Bold) |
|
|
3497 | fprintf (stderr, "bold "); |
|
|
3498 | if (rstyle & RS_Blink) |
|
|
3499 | fprintf (stderr, "blink "); |
|
|
3500 | if (rstyle & RS_Uline) |
|
|
3501 | fprintf (stderr, "uline "); |
|
|
3502 | fprintf (stderr, "): "); |
|
|
3503 | |
|
|
3504 | color = GET_FGCOLOR (rstyle); |
|
|
3505 | #ifndef NO_BRIGHTCOLOR |
|
|
3506 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
|
|
3507 | { |
|
|
3508 | color -= (minBrightCOLOR - minCOLOR); |
|
|
3509 | fprintf (stderr, "bright "); |
|
|
3510 | } |
|
|
3511 | #endif |
|
|
3512 | fprintf (stderr, "%s on ", name[color]); |
|
|
3513 | |
|
|
3514 | color = GET_BGCOLOR (rstyle); |
|
|
3515 | #ifndef NO_BRIGHTCOLOR |
|
|
3516 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
|
|
3517 | { |
|
|
3518 | color -= (minBrightCOLOR - minCOLOR); |
|
|
3519 | fprintf (stderr, "bright "); |
|
|
3520 | } |
|
|
3521 | #endif |
|
|
3522 | fprintf (stderr, "%s\n", name[color]); |
|
|
3523 | } |
|
|
3524 | #endif |
|
|