1 | /*--------------------------------*-C-*--------------------------------------* |
1 | /*--------------------------------*-C-*--------------------------------------* |
2 | * File: screen.c |
2 | * File: screen.c |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * $Id: screen.C,v 1.3 2003/11/25 11:52:42 pcg Exp $ |
4 | * $Id: screen.C,v 1.4 2003/11/25 15:25:17 pcg Exp $ |
5 | * |
5 | * |
6 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
7 | * |
7 | * |
8 | * 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 |
9 | * 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 |
… | |
… | |
21 | *--------------------------------------------------------------------------*/ |
21 | *--------------------------------------------------------------------------*/ |
22 | /* |
22 | /* |
23 | * We handle _all_ screen updates and selections |
23 | * We handle _all_ screen updates and selections |
24 | */ |
24 | */ |
25 | |
25 | |
26 | #include "../config.h" /* NECESSARY */ |
26 | #include "../config.h" /* NECESSARY */ |
27 | #define INTERN_SCREEN |
27 | #define INTERN_SCREEN |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "screen.intpro" /* PROTOS for internal routines */ |
29 | #include "screen.intpro" /* PROTOS for internal routines */ |
30 | |
30 | |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
32 | |
32 | |
33 | #include <stdint.h> |
33 | #include <stdint.h> |
34 | #include <wchar.h> |
34 | #include <wchar.h> |
35 | |
35 | |
36 | inline void fill_text (text_t *start, text_t value, int len) |
36 | inline void fill_text (text_t *start, text_t value, int len) |
37 | { |
37 | { |
38 | while (len--) |
38 | while (len--) |
39 | *start++ = value; |
39 | *start++ = value; |
40 | } |
40 | } |
41 | |
41 | |
42 | #define RESET_CHSTAT(H) \ |
42 | #define RESET_CHSTAT(H) \ |
43 | if ((H)->chstat == WBYTE) \ |
43 | if ((H)->chstat == WBYTE) \ |
44 | (H)->chstat = SBYTE, (H)->lost_multi = 1 |
44 | (H)->chstat = SBYTE, (H)->lost_multi = 1 |
45 | |
45 | |
46 | /* ------------------------------------------------------------------------- */ |
46 | /* ------------------------------------------------------------------------- */ |
47 | #define PROP_SIZE 16384 |
47 | #define PROP_SIZE 16384 |
48 | #define TABSIZE 8 /* default tab size */ |
48 | #define TABSIZE 8 /* default tab size */ |
49 | |
49 | |
50 | /* ------------------------------------------------------------------------- * |
50 | /* ------------------------------------------------------------------------- * |
51 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
51 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
52 | * ------------------------------------------------------------------------- */ |
52 | * ------------------------------------------------------------------------- */ |
53 | #define ZERO_SCROLLBACK(R) \ |
53 | #define ZERO_SCROLLBACK(R) \ |
54 | if (((R)->Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ |
54 | if (((R)->Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ |
55 | (R)->TermWin.view_start = 0 |
55 | (R)->TermWin.view_start = 0 |
56 | #define CLEAR_SELECTION(R) \ |
56 | #define CLEAR_SELECTION(R) \ |
57 | (R)->selection.beg.row = (R)->selection.beg.col \ |
57 | (R)->selection.beg.row = (R)->selection.beg.col \ |
58 | = (R)->selection.end.row = (R)->selection.end.col = 0 |
58 | = (R)->selection.end.row = (R)->selection.end.col = 0 |
59 | #define CLEAR_ALL_SELECTION(R) \ |
59 | #define CLEAR_ALL_SELECTION(R) \ |
60 | (R)->selection.beg.row = (R)->selection.beg.col \ |
60 | (R)->selection.beg.row = (R)->selection.beg.col \ |
61 | = (R)->selection.mark.row = (R)->selection.mark.col \ |
61 | = (R)->selection.mark.row = (R)->selection.mark.col \ |
62 | = (R)->selection.end.row = (R)->selection.end.col = 0 |
62 | = (R)->selection.end.row = (R)->selection.end.col = 0 |
63 | |
63 | |
64 | #define ROW_AND_COL_IS_AFTER(A, B, C, D) \ |
64 | #define ROW_AND_COL_IS_AFTER(A, B, C, D) \ |
65 | (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) |
65 | (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) |
66 | #define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ |
66 | #define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ |
67 | (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) |
67 | (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) |
68 | #define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ |
68 | #define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ |
69 | (((A) == (C)) && ((B) > (D))) |
69 | (((A) == (C)) && ((B) > (D))) |
70 | #define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ |
70 | #define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ |
71 | (((A) == (C)) && ((B) >= (D))) |
71 | (((A) == (C)) && ((B) >= (D))) |
72 | #define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ |
72 | #define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ |
73 | (((A) == (C)) && ((B) < (D))) |
73 | (((A) == (C)) && ((B) < (D))) |
74 | #define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ |
74 | #define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ |
75 | (((A) == (C)) && ((B) <= (D))) |
75 | (((A) == (C)) && ((B) <= (D))) |
76 | |
76 | |
77 | /* these must be row_col_t */ |
77 | /* these must be row_col_t */ |
78 | #define ROWCOL_IS_AFTER(X, Y) \ |
78 | #define ROWCOL_IS_AFTER(X, Y) \ |
79 | ROW_AND_COL_IS_AFTER((X).row, (X).col, (Y).row, (Y).col) |
79 | ROW_AND_COL_IS_AFTER((X).row, (X).col, (Y).row, (Y).col) |
80 | #define ROWCOL_IS_BEFORE(X, Y) \ |
80 | #define ROWCOL_IS_BEFORE(X, Y) \ |
81 | ROW_AND_COL_IS_BEFORE((X).row, (X).col, (Y).row, (Y).col) |
81 | ROW_AND_COL_IS_BEFORE((X).row, (X).col, (Y).row, (Y).col) |
82 | #define ROWCOL_IN_ROW_AFTER(X, Y) \ |
82 | #define ROWCOL_IN_ROW_AFTER(X, Y) \ |
83 | ROW_AND_COL_IN_ROW_AFTER((X).row, (X).col, (Y).row, (Y).col) |
83 | ROW_AND_COL_IN_ROW_AFTER((X).row, (X).col, (Y).row, (Y).col) |
84 | #define ROWCOL_IN_ROW_BEFORE(X, Y) \ |
84 | #define ROWCOL_IN_ROW_BEFORE(X, Y) \ |
85 | ROW_AND_COL_IN_ROW_BEFORE((X).row, (X).col, (Y).row, (Y).col) |
85 | ROW_AND_COL_IN_ROW_BEFORE((X).row, (X).col, (Y).row, (Y).col) |
86 | #define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ |
86 | #define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ |
87 | ROW_AND_COL_IN_ROW_AT_OR_AFTER((X).row, (X).col, (Y).row, (Y).col) |
87 | ROW_AND_COL_IN_ROW_AT_OR_AFTER((X).row, (X).col, (Y).row, (Y).col) |
88 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
88 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
89 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE((X).row, (X).col, (Y).row, (Y).col) |
89 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE((X).row, (X).col, (Y).row, (Y).col) |
90 | |
90 | |
91 | /* |
91 | /* |
92 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
92 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
93 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
93 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
94 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
94 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
95 | */ |
95 | */ |
96 | #define drawBuffer (R->TermWin.vt) |
96 | #define drawBuffer (R->TermWin.vt) |
97 | |
97 | |
98 | #define CLEAR_ROWS(row, num) \ |
98 | #define CLEAR_ROWS(row, num) \ |
99 | if (R->TermWin.mapped) \ |
99 | if (R->TermWin.mapped) \ |
100 | XClearArea(R->Xdisplay, drawBuffer, R->TermWin.int_bwidth, \ |
100 | XClearArea(R->Xdisplay, drawBuffer, R->TermWin.int_bwidth, \ |
101 | Row2Pixel(row), (unsigned int)R->TermWin.width, \ |
101 | Row2Pixel(row), (unsigned int)R->TermWin.width, \ |
102 | (unsigned int)Height2Pixel(num), False) |
102 | (unsigned int)Height2Pixel(num), False) |
103 | |
103 | |
104 | #define CLEAR_CHARS(x, y, num) \ |
104 | #define CLEAR_CHARS(x, y, num) \ |
105 | if (R->TermWin.mapped) \ |
105 | if (R->TermWin.mapped) \ |
106 | XClearArea(R->Xdisplay, drawBuffer, x, y, \ |
106 | XClearArea(R->Xdisplay, drawBuffer, x, y, \ |
107 | (unsigned int)Width2Pixel(num), \ |
107 | (unsigned int)Width2Pixel(num), \ |
108 | (unsigned int)Height2Pixel(1), False) |
108 | (unsigned int)Height2Pixel(1), False) |
109 | |
109 | |
110 | #define ERASE_ROWS(row, num) \ |
110 | #define ERASE_ROWS(row, num) \ |
111 | XFillRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, \ |
111 | XFillRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, \ |
112 | R->TermWin.int_bwidth, Row2Pixel(row), \ |
112 | R->TermWin.int_bwidth, Row2Pixel(row), \ |
113 | (unsigned int)R->TermWin.width, \ |
113 | (unsigned int)R->TermWin.width, \ |
114 | (unsigned int)Height2Pixel(num)) |
114 | (unsigned int)Height2Pixel(num)) |
115 | |
115 | |
116 | /* ------------------------------------------------------------------------- * |
116 | /* ------------------------------------------------------------------------- * |
117 | * SCREEN `COMMON' ROUTINES * |
117 | * SCREEN `COMMON' ROUTINES * |
118 | * ------------------------------------------------------------------------- */ |
118 | * ------------------------------------------------------------------------- */ |
119 | /* Fill part/all of a line with blanks. */ |
119 | /* Fill part/all of a line with blanks. */ |
… | |
… | |
125 | efs = SET_FONT (efs, R->TermWin.fontset->find_font (' ')); |
125 | efs = SET_FONT (efs, R->TermWin.fontset->find_font (' ')); |
126 | |
126 | |
127 | while (width--) |
127 | while (width--) |
128 | { |
128 | { |
129 | *et++ = ' '; |
129 | *et++ = ' '; |
130 | *er++ = efs; |
130 | *er++ = efs; |
131 | } |
131 | } |
132 | } |
132 | } |
133 | |
133 | |
134 | /* ------------------------------------------------------------------------- */ |
134 | /* ------------------------------------------------------------------------- */ |
135 | /* Fill a full line with blanks - make sure it is allocated first */ |
135 | /* Fill a full line with blanks - make sure it is allocated first */ |
… | |
… | |
142 | |
142 | |
143 | #ifdef DEBUG_STRICT |
143 | #ifdef DEBUG_STRICT |
144 | assert((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); |
144 | assert((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); |
145 | #endif |
145 | #endif |
146 | if (tp[row] == NULL) { |
146 | if (tp[row] == NULL) { |
147 | tp[row] = (text_t *)rxvt_malloc(sizeof(text_t) * width); |
147 | tp[row] = (text_t *)rxvt_malloc(sizeof(text_t) * width); |
148 | rp[row] = (rend_t *)rxvt_malloc(sizeof(rend_t) * width); |
148 | rp[row] = (rend_t *)rxvt_malloc(sizeof(rend_t) * width); |
149 | } |
149 | } |
150 | rxvt_blank_line (aR_ tp[row], rp[row], width, efs); |
150 | rxvt_blank_line (aR_ tp[row], rp[row], width, efs); |
151 | } |
151 | } |
152 | |
152 | |
153 | /* ------------------------------------------------------------------------- * |
153 | /* ------------------------------------------------------------------------- * |
… | |
… | |
156 | /* EXTPROTO */ |
156 | /* EXTPROTO */ |
157 | void |
157 | void |
158 | rxvt_scr_reset(pR) |
158 | rxvt_scr_reset(pR) |
159 | { |
159 | { |
160 | unsigned int ncol, nrow, prev_ncol, prev_nrow, |
160 | unsigned int ncol, nrow, prev_ncol, prev_nrow, |
161 | total_rows, prev_total_rows; |
161 | total_rows, prev_total_rows; |
162 | unsigned int p, q; |
162 | unsigned int p, q; |
163 | int k; |
163 | int k; |
164 | rend_t setrstyle; |
164 | rend_t setrstyle; |
165 | |
165 | |
166 | D_SCREEN((stderr, "rxvt_scr_reset()")); |
166 | D_SCREEN((stderr, "rxvt_scr_reset()")); |
… | |
… | |
170 | R->num_scr = 0; |
170 | R->num_scr = 0; |
171 | |
171 | |
172 | prev_ncol = R->prev_ncol; |
172 | prev_ncol = R->prev_ncol; |
173 | prev_nrow = R->prev_nrow; |
173 | prev_nrow = R->prev_nrow; |
174 | if (R->TermWin.ncol == 0) |
174 | if (R->TermWin.ncol == 0) |
175 | R->TermWin.ncol = 80; |
175 | R->TermWin.ncol = 80; |
176 | if (R->TermWin.nrow == 0) |
176 | if (R->TermWin.nrow == 0) |
177 | R->TermWin.nrow = 24; |
177 | R->TermWin.nrow = 24; |
178 | ncol = R->TermWin.ncol; |
178 | ncol = R->TermWin.ncol; |
179 | nrow = R->TermWin.nrow; |
179 | nrow = R->TermWin.nrow; |
180 | if (ncol == prev_ncol && nrow == prev_nrow) |
180 | if (ncol == prev_ncol && nrow == prev_nrow) |
181 | return; |
181 | return; |
182 | |
182 | |
183 | R->want_refresh = 1; |
183 | R->want_refresh = 1; |
184 | |
184 | |
185 | total_rows = nrow + R->TermWin.saveLines; |
185 | total_rows = nrow + R->TermWin.saveLines; |
186 | prev_total_rows = prev_nrow + R->TermWin.saveLines; |
186 | prev_total_rows = prev_nrow + R->TermWin.saveLines; |
… | |
… | |
191 | if (prev_nrow == 0) { |
191 | if (prev_nrow == 0) { |
192 | /* |
192 | /* |
193 | * A: first time called so just malloc everything : don't rely on realloc |
193 | * A: first time called so just malloc everything : don't rely on realloc |
194 | * Note: this is still needed so that all the scrollback lines are NULL |
194 | * Note: this is still needed so that all the scrollback lines are NULL |
195 | */ |
195 | */ |
196 | R->screen.text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); |
196 | R->screen.text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); |
197 | R->buf_text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); |
197 | R->buf_text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); |
198 | R->drawn_text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); |
198 | R->drawn_text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); |
199 | R->swap.text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); |
199 | R->swap.text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); |
200 | |
200 | |
201 | R->screen.tlen = (int16_t *)rxvt_calloc(total_rows, sizeof(int16_t)); |
201 | R->screen.tlen = (int16_t *)rxvt_calloc(total_rows, sizeof(int16_t)); |
202 | R->swap.tlen = (int16_t *)rxvt_calloc(nrow, sizeof(int16_t)); |
202 | R->swap.tlen = (int16_t *)rxvt_calloc(nrow, sizeof(int16_t)); |
203 | |
203 | |
204 | R->screen.rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); |
204 | R->screen.rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); |
205 | R->buf_rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); |
205 | R->buf_rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); |
206 | R->drawn_rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); |
206 | R->drawn_rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); |
207 | R->swap.rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); |
207 | R->swap.rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); |
208 | |
208 | |
209 | for (p = 0; p < nrow; p++) { |
209 | for (p = 0; p < nrow; p++) { |
210 | q = p + R->TermWin.saveLines; |
210 | q = p + R->TermWin.saveLines; |
211 | rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, |
211 | rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, |
212 | q, DEFAULT_RSTYLE); |
212 | q, DEFAULT_RSTYLE); |
213 | rxvt_blank_screen_mem(aR_ R->swap.text, R->swap.rend, |
213 | rxvt_blank_screen_mem(aR_ R->swap.text, R->swap.rend, |
214 | p, DEFAULT_RSTYLE); |
214 | p, DEFAULT_RSTYLE); |
215 | R->screen.tlen[q] = R->swap.tlen[p] = 0; |
215 | R->screen.tlen[q] = R->swap.tlen[p] = 0; |
216 | rxvt_blank_screen_mem(aR_ R->drawn_text, R->drawn_rend, |
216 | rxvt_blank_screen_mem(aR_ R->drawn_text, R->drawn_rend, |
217 | p, DEFAULT_RSTYLE); |
217 | p, DEFAULT_RSTYLE); |
218 | } |
218 | } |
219 | MEMSET(R->charsets, 'B', sizeof(R->charsets)); |
219 | MEMSET(R->charsets, 'B', sizeof(R->charsets)); |
220 | R->TermWin.nscrolled = 0; /* no saved lines */ |
220 | R->TermWin.nscrolled = 0; /* no saved lines */ |
221 | R->rstyle = DEFAULT_RSTYLE; |
221 | R->rstyle = DEFAULT_RSTYLE; |
222 | R->screen.flags = Screen_DefaultFlags; |
222 | R->screen.flags = Screen_DefaultFlags; |
223 | R->screen.cur.row = R->screen.cur.col = 0; |
223 | R->screen.cur.row = R->screen.cur.col = 0; |
224 | R->screen.charset = 0; |
224 | R->screen.charset = 0; |
225 | R->current_screen = PRIMARY; |
225 | R->current_screen = PRIMARY; |
226 | rxvt_scr_cursor(aR_ SAVE); |
226 | rxvt_scr_cursor(aR_ SAVE); |
227 | #if NSCREENS |
227 | #if NSCREENS |
228 | R->swap.flags = Screen_DefaultFlags; |
228 | R->swap.flags = Screen_DefaultFlags; |
229 | R->swap.cur.row = R->swap.cur.col = 0; |
229 | R->swap.cur.row = R->swap.cur.col = 0; |
230 | R->swap.charset = 0; |
230 | R->swap.charset = 0; |
231 | R->current_screen = SECONDARY; |
231 | R->current_screen = SECONDARY; |
232 | rxvt_scr_cursor(aR_ SAVE); |
232 | rxvt_scr_cursor(aR_ SAVE); |
233 | R->current_screen = PRIMARY; |
233 | R->current_screen = PRIMARY; |
234 | #endif |
234 | #endif |
235 | R->selection.text = NULL; |
235 | R->selection.text = NULL; |
236 | R->selection.len = 0; |
236 | R->selection.len = 0; |
237 | R->selection.op = SELECTION_CLEAR; |
237 | R->selection.op = SELECTION_CLEAR; |
238 | R->selection.screen = PRIMARY; |
238 | R->selection.screen = PRIMARY; |
239 | R->selection.clicks = 0; |
239 | R->selection.clicks = 0; |
240 | CLEAR_ALL_SELECTION(R); |
240 | CLEAR_ALL_SELECTION(R); |
241 | R->rvideo = 0; |
241 | R->rvideo = 0; |
242 | |
242 | |
243 | } else { |
243 | } else { |
244 | /* |
244 | /* |
245 | * B1: add or delete rows as appropriate |
245 | * B1: add or delete rows as appropriate |
246 | */ |
246 | */ |
247 | setrstyle = DEFAULT_RSTYLE; |
247 | setrstyle = DEFAULT_RSTYLE; |
248 | |
248 | |
249 | if (nrow < prev_nrow) { |
249 | if (nrow < prev_nrow) { |
250 | /* delete rows */ |
250 | /* delete rows */ |
251 | k = min(R->TermWin.nscrolled, prev_nrow - nrow); |
251 | k = min(R->TermWin.nscrolled, prev_nrow - nrow); |
252 | rxvt_scroll_text(aR_ 0, (int)prev_nrow - 1, k, 1); |
252 | rxvt_scroll_text(aR_ 0, (int)prev_nrow - 1, k, 1); |
253 | for (p = nrow; p < prev_nrow; p++) { |
253 | for (p = nrow; p < prev_nrow; p++) { |
254 | q = p + R->TermWin.saveLines; |
254 | q = p + R->TermWin.saveLines; |
255 | if (R->screen.text[q]) { |
255 | if (R->screen.text[q]) { |
256 | #ifdef DEBUG_STRICT |
256 | #ifdef DEBUG_STRICT |
257 | assert(R->screen.rend[q]); |
257 | assert(R->screen.rend[q]); |
258 | #endif |
258 | #endif |
259 | free(R->screen.text[q]); |
259 | free(R->screen.text[q]); |
260 | free(R->screen.rend[q]); |
260 | free(R->screen.rend[q]); |
261 | } |
261 | } |
262 | if (R->swap.text[p]) { |
262 | if (R->swap.text[p]) { |
263 | #ifdef DEBUG_STRICT |
263 | #ifdef DEBUG_STRICT |
264 | assert(R->swap.rend[p]); |
264 | assert(R->swap.rend[p]); |
265 | #endif |
265 | #endif |
266 | free(R->swap.text[p]); |
266 | free(R->swap.text[p]); |
267 | free(R->swap.rend[p]); |
267 | free(R->swap.rend[p]); |
268 | } |
268 | } |
269 | #ifdef DEBUG_STRICT |
269 | #ifdef DEBUG_STRICT |
270 | assert(R->drawn_text[p] && R->drawn_rend[p]); |
270 | assert(R->drawn_text[p] && R->drawn_rend[p]); |
271 | #endif |
271 | #endif |
272 | free(R->drawn_text[p]); |
272 | free(R->drawn_text[p]); |
273 | free(R->drawn_rend[p]); |
273 | free(R->drawn_rend[p]); |
274 | } |
274 | } |
275 | /* we have fewer rows so fix up cursor position */ |
275 | /* we have fewer rows so fix up cursor position */ |
276 | MIN_IT(R->screen.cur.row, (int32_t)nrow - 1); |
276 | MIN_IT(R->screen.cur.row, (int32_t)nrow - 1); |
277 | MIN_IT(R->swap.cur.row, (int32_t)nrow - 1); |
277 | MIN_IT(R->swap.cur.row, (int32_t)nrow - 1); |
278 | |
278 | |
279 | rxvt_scr_reset_realloc(aR); /* realloc _last_ */ |
279 | rxvt_scr_reset_realloc(aR); /* realloc _last_ */ |
280 | |
280 | |
281 | } else if (nrow > prev_nrow) { |
281 | } else if (nrow > prev_nrow) { |
282 | /* add rows */ |
282 | /* add rows */ |
283 | rxvt_scr_reset_realloc(aR); /* realloc _first_ */ |
283 | rxvt_scr_reset_realloc(aR); /* realloc _first_ */ |
284 | |
284 | |
285 | k = min(R->TermWin.nscrolled, nrow - prev_nrow); |
285 | k = min(R->TermWin.nscrolled, nrow - prev_nrow); |
286 | for (p = prev_total_rows; p < total_rows; p++) { |
286 | for (p = prev_total_rows; p < total_rows; p++) { |
287 | R->screen.tlen[p] = 0; |
287 | R->screen.tlen[p] = 0; |
288 | R->screen.text[p] = NULL; |
288 | R->screen.text[p] = NULL; |
289 | R->screen.rend[p] = NULL; |
289 | R->screen.rend[p] = NULL; |
290 | } |
290 | } |
291 | for (p = prev_total_rows; p < total_rows - k; p++) |
291 | for (p = prev_total_rows; p < total_rows - k; p++) |
292 | rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, |
292 | rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, |
293 | p, setrstyle); |
293 | p, setrstyle); |
294 | for (p = prev_nrow; p < nrow; p++) { |
294 | for (p = prev_nrow; p < nrow; p++) { |
295 | R->swap.tlen[p] = 0; |
295 | R->swap.tlen[p] = 0; |
296 | R->swap.text[p] = NULL; |
296 | R->swap.text[p] = NULL; |
297 | R->swap.rend[p] = NULL; |
297 | R->swap.rend[p] = NULL; |
298 | R->drawn_text[p] = NULL; |
298 | R->drawn_text[p] = NULL; |
299 | R->drawn_rend[p] = NULL; |
299 | R->drawn_rend[p] = NULL; |
300 | rxvt_blank_screen_mem(aR_ R->swap.text, R->swap.rend, |
300 | rxvt_blank_screen_mem(aR_ R->swap.text, R->swap.rend, |
301 | p, setrstyle); |
301 | p, setrstyle); |
302 | rxvt_blank_screen_mem(aR_ R->drawn_text, R->drawn_rend, |
302 | rxvt_blank_screen_mem(aR_ R->drawn_text, R->drawn_rend, |
303 | p, setrstyle); |
303 | p, setrstyle); |
304 | } |
304 | } |
305 | if (k > 0) { |
305 | if (k > 0) { |
306 | rxvt_scroll_text(aR_ 0, (int)nrow - 1, -k, 1); |
306 | rxvt_scroll_text(aR_ 0, (int)nrow - 1, -k, 1); |
307 | R->screen.cur.row += k; |
307 | R->screen.cur.row += k; |
308 | R->screen.s_cur.row += k; |
308 | R->screen.s_cur.row += k; |
309 | R->TermWin.nscrolled -= k; |
309 | R->TermWin.nscrolled -= k; |
310 | } |
310 | } |
311 | #ifdef DEBUG_STRICT |
311 | #ifdef DEBUG_STRICT |
312 | assert(R->screen.cur.row < R->TermWin.nrow); |
312 | assert(R->screen.cur.row < R->TermWin.nrow); |
313 | assert(R->swap.cur.row < R->TermWin.nrow); |
313 | assert(R->swap.cur.row < R->TermWin.nrow); |
314 | #else /* drive with your eyes closed */ |
314 | #else /* drive with your eyes closed */ |
315 | MIN_IT(R->screen.cur.row, nrow - 1); |
315 | MIN_IT(R->screen.cur.row, nrow - 1); |
316 | MIN_IT(R->swap.cur.row, nrow - 1); |
316 | MIN_IT(R->swap.cur.row, nrow - 1); |
317 | #endif |
317 | #endif |
318 | } |
318 | } |
319 | /* B2: resize columns */ |
319 | /* B2: resize columns */ |
320 | if (ncol != prev_ncol) { |
320 | if (ncol != prev_ncol) { |
321 | for (p = 0; p < total_rows; p++) { |
321 | for (p = 0; p < total_rows; p++) { |
322 | if (R->screen.text[p]) { |
322 | if (R->screen.text[p]) { |
323 | R->screen.text[p] = (text_t *)rxvt_realloc(R->screen.text[p], ncol * sizeof(text_t)); |
323 | R->screen.text[p] = (text_t *)rxvt_realloc(R->screen.text[p], ncol * sizeof(text_t)); |
324 | R->screen.rend[p] = (rend_t *)rxvt_realloc(R->screen.rend[p], ncol * sizeof(rend_t)); |
324 | R->screen.rend[p] = (rend_t *)rxvt_realloc(R->screen.rend[p], ncol * sizeof(rend_t)); |
325 | MIN_IT(R->screen.tlen[p], (int16_t)ncol); |
325 | MIN_IT(R->screen.tlen[p], (int16_t)ncol); |
326 | if (ncol > prev_ncol) |
326 | if (ncol > prev_ncol) |
327 | rxvt_blank_line(aR_ |
327 | rxvt_blank_line(aR_ |
328 | &(R->screen.text[p][prev_ncol]), |
328 | &(R->screen.text[p][prev_ncol]), |
329 | &(R->screen.rend[p][prev_ncol]), |
329 | &(R->screen.rend[p][prev_ncol]), |
330 | ncol - prev_ncol, |
330 | ncol - prev_ncol, |
331 | setrstyle); |
331 | setrstyle); |
332 | } |
332 | } |
333 | } |
333 | } |
334 | for (p = 0; p < nrow; p++) { |
334 | for (p = 0; p < nrow; p++) { |
335 | R->drawn_text[p] = (text_t *)rxvt_realloc(R->drawn_text[p], ncol * sizeof(text_t)); |
335 | R->drawn_text[p] = (text_t *)rxvt_realloc(R->drawn_text[p], ncol * sizeof(text_t)); |
336 | R->drawn_rend[p] = (rend_t *)rxvt_realloc(R->drawn_rend[p], ncol * sizeof(rend_t)); |
336 | R->drawn_rend[p] = (rend_t *)rxvt_realloc(R->drawn_rend[p], ncol * sizeof(rend_t)); |
337 | if (R->swap.text[p]) { |
337 | if (R->swap.text[p]) { |
338 | R->swap.text[p] = (text_t *)rxvt_realloc(R->swap.text[p], ncol * sizeof(text_t)); |
338 | R->swap.text[p] = (text_t *)rxvt_realloc(R->swap.text[p], ncol * sizeof(text_t)); |
339 | R->swap.rend[p] = (rend_t *)rxvt_realloc(R->swap.rend[p], ncol * sizeof(rend_t)); |
339 | R->swap.rend[p] = (rend_t *)rxvt_realloc(R->swap.rend[p], ncol * sizeof(rend_t)); |
340 | MIN_IT(R->swap.tlen[p], (int16_t)ncol); |
340 | MIN_IT(R->swap.tlen[p], (int16_t)ncol); |
341 | if (ncol > prev_ncol) |
341 | if (ncol > prev_ncol) |
342 | rxvt_blank_line(aR_ |
342 | rxvt_blank_line(aR_ |
343 | &(R->swap.text[p][prev_ncol]), |
343 | &(R->swap.text[p][prev_ncol]), |
344 | &(R->swap.rend[p][prev_ncol]), |
344 | &(R->swap.rend[p][prev_ncol]), |
345 | ncol - prev_ncol, setrstyle); |
345 | ncol - prev_ncol, setrstyle); |
346 | } |
346 | } |
347 | if (ncol > prev_ncol) |
347 | if (ncol > prev_ncol) |
348 | rxvt_blank_line(aR_ |
348 | rxvt_blank_line(aR_ |
349 | &(R->drawn_text[p][prev_ncol]), |
349 | &(R->drawn_text[p][prev_ncol]), |
350 | &(R->drawn_rend[p][prev_ncol]), |
350 | &(R->drawn_rend[p][prev_ncol]), |
351 | ncol - prev_ncol, setrstyle); |
351 | ncol - prev_ncol, setrstyle); |
352 | } |
352 | } |
353 | MIN_IT(R->screen.cur.col, (int16_t)ncol - 1); |
353 | MIN_IT(R->screen.cur.col, (int16_t)ncol - 1); |
354 | MIN_IT(R->swap.cur.col, (int16_t)ncol - 1); |
354 | MIN_IT(R->swap.cur.col, (int16_t)ncol - 1); |
355 | } |
355 | } |
356 | if (R->tabs) |
356 | if (R->tabs) |
357 | free(R->tabs); |
357 | free(R->tabs); |
358 | } |
358 | } |
359 | |
359 | |
360 | R->tabs = (char *)rxvt_malloc(ncol * sizeof(char)); |
360 | R->tabs = (char *)rxvt_malloc(ncol * sizeof(char)); |
361 | |
361 | |
362 | for (p = 0; p < ncol; p++) |
362 | for (p = 0; p < ncol; p++) |
363 | R->tabs[p] = (p % TABSIZE == 0) ? 1 : 0; |
363 | R->tabs[p] = (p % TABSIZE == 0) ? 1 : 0; |
364 | |
364 | |
365 | R->prev_nrow = nrow; |
365 | R->prev_nrow = nrow; |
366 | R->prev_ncol = ncol; |
366 | R->prev_ncol = ncol; |
367 | |
367 | |
368 | rxvt_tt_winsize(R->cmd_fd, R->TermWin.ncol, R->TermWin.nrow, R->cmd_pid); |
368 | rxvt_tt_winsize(R->cmd_fd, R->TermWin.ncol, R->TermWin.nrow, R->cmd_pid); |
… | |
… | |
403 | uint16_t total_rows; |
403 | uint16_t total_rows; |
404 | int i; |
404 | int i; |
405 | |
405 | |
406 | total_rows = R->TermWin.nrow + R->TermWin.saveLines; |
406 | total_rows = R->TermWin.nrow + R->TermWin.saveLines; |
407 | for (i = 0; i < total_rows; i++) { |
407 | for (i = 0; i < total_rows; i++) { |
408 | if (R->screen.text[i]) { /* then so is R->screen.rend[i] */ |
408 | if (R->screen.text[i]) { /* then so is R->screen.rend[i] */ |
409 | free(R->screen.text[i]); |
409 | free(R->screen.text[i]); |
410 | #ifdef DEBUG_STRICT |
410 | #ifdef DEBUG_STRICT |
411 | assert(R->screen.rend[i]); |
411 | assert(R->screen.rend[i]); |
412 | #endif |
412 | #endif |
413 | free(R->screen.rend[i]); |
413 | free(R->screen.rend[i]); |
414 | } |
414 | } |
415 | } |
415 | } |
416 | for (i = 0; i < R->TermWin.nrow; i++) { |
416 | for (i = 0; i < R->TermWin.nrow; i++) { |
417 | free(R->drawn_text[i]); |
417 | free(R->drawn_text[i]); |
418 | free(R->drawn_rend[i]); |
418 | free(R->drawn_rend[i]); |
419 | free(R->swap.text[i]); |
419 | free(R->swap.text[i]); |
420 | free(R->swap.rend[i]); |
420 | free(R->swap.rend[i]); |
421 | } |
421 | } |
422 | free(R->screen.text); |
422 | free(R->screen.text); |
423 | free(R->screen.tlen); |
423 | free(R->screen.tlen); |
424 | free(R->screen.rend); |
424 | free(R->screen.rend); |
425 | free(R->drawn_text); |
425 | free(R->drawn_text); |
… | |
… | |
477 | |
477 | |
478 | D_SCREEN((stderr, "rxvt_scr_cursor(%c)", mode)); |
478 | D_SCREEN((stderr, "rxvt_scr_cursor(%c)", mode)); |
479 | |
479 | |
480 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
480 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
481 | if (R->current_screen == SECONDARY) |
481 | if (R->current_screen == SECONDARY) |
482 | s = &(R->swap); |
482 | s = &(R->swap); |
483 | else |
483 | else |
484 | #endif |
484 | #endif |
485 | s = &(R->screen); |
485 | s = &(R->screen); |
486 | switch (mode) { |
486 | switch (mode) { |
487 | case SAVE: |
487 | case SAVE: |
488 | s->s_cur.row = s->cur.row; |
488 | s->s_cur.row = s->cur.row; |
489 | s->s_cur.col = s->cur.col; |
489 | s->s_cur.col = s->cur.col; |
490 | s->s_rstyle = R->rstyle; |
490 | s->s_rstyle = R->rstyle; |
491 | s->s_charset = s->charset; |
491 | s->s_charset = s->charset; |
492 | s->s_charset_char = R->charsets[s->charset]; |
492 | s->s_charset_char = R->charsets[s->charset]; |
493 | break; |
493 | break; |
494 | case RESTORE: |
494 | case RESTORE: |
495 | R->want_refresh = 1; |
495 | R->want_refresh = 1; |
496 | s->cur.row = s->s_cur.row; |
496 | s->cur.row = s->s_cur.row; |
497 | s->cur.col = s->s_cur.col; |
497 | s->cur.col = s->s_cur.col; |
498 | s->flags &= ~Screen_WrapNext; |
498 | s->flags &= ~Screen_WrapNext; |
499 | R->rstyle = s->s_rstyle; |
499 | R->rstyle = s->s_rstyle; |
500 | s->charset = s->s_charset; |
500 | s->charset = s->s_charset; |
501 | R->charsets[s->charset] = s->s_charset_char; |
501 | R->charsets[s->charset] = s->s_charset_char; |
502 | rxvt_set_font_style(aR); |
502 | rxvt_set_font_style(aR); |
503 | break; |
503 | break; |
504 | } |
504 | } |
505 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
505 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
506 | MIN_IT(s->cur.row, R->TermWin.nrow - 1); |
506 | MIN_IT(s->cur.row, R->TermWin.nrow - 1); |
507 | MIN_IT(s->cur.col, R->TermWin.ncol - 1); |
507 | MIN_IT(s->cur.col, R->TermWin.ncol - 1); |
508 | #ifdef DEBUG_STRICT |
508 | #ifdef DEBUG_STRICT |
509 | assert(s->cur.row >= 0); |
509 | assert(s->cur.row >= 0); |
510 | assert(s->cur.col >= 0); |
510 | assert(s->cur.col >= 0); |
511 | #else /* drive with your eyes closed */ |
511 | #else /* drive with your eyes closed */ |
512 | MAX_IT(s->cur.row, 0); |
512 | MAX_IT(s->cur.row, 0); |
513 | MAX_IT(s->cur.col, 0); |
513 | MAX_IT(s->cur.col, 0); |
514 | #endif |
514 | #endif |
515 | } |
515 | } |
516 | |
516 | |
… | |
… | |
535 | |
535 | |
536 | R->TermWin.view_start = 0; |
536 | R->TermWin.view_start = 0; |
537 | RESET_CHSTAT(R); |
537 | RESET_CHSTAT(R); |
538 | |
538 | |
539 | if (R->current_screen == scrn) |
539 | if (R->current_screen == scrn) |
540 | return R->current_screen; |
540 | return R->current_screen; |
541 | |
541 | |
542 | rxvt_selection_check(aR_ 2); /* check for boundary cross */ |
542 | rxvt_selection_check(aR_ 2); /* check for boundary cross */ |
543 | |
543 | |
544 | SWAP_IT(R->current_screen, scrn, int); |
544 | SWAP_IT(R->current_screen, scrn, int); |
545 | #if NSCREENS |
545 | #if NSCREENS |
546 | R->num_scr = 0; |
546 | R->num_scr = 0; |
547 | offset = R->TermWin.saveLines; |
547 | offset = R->TermWin.saveLines; |
548 | for (i = R->prev_nrow; i--;) { |
548 | for (i = R->prev_nrow; i--;) { |
549 | SWAP_IT(R->screen.text[i + offset], R->swap.text[i], text_t *); |
549 | SWAP_IT(R->screen.text[i + offset], R->swap.text[i], text_t *); |
550 | SWAP_IT(R->screen.tlen[i + offset], R->swap.tlen[i], int16_t); |
550 | SWAP_IT(R->screen.tlen[i + offset], R->swap.tlen[i], int16_t); |
551 | SWAP_IT(R->screen.rend[i + offset], R->swap.rend[i], rend_t *); |
551 | SWAP_IT(R->screen.rend[i + offset], R->swap.rend[i], rend_t *); |
552 | } |
552 | } |
553 | SWAP_IT(R->screen.cur.row, R->swap.cur.row, int16_t); |
553 | SWAP_IT(R->screen.cur.row, R->swap.cur.row, int16_t); |
554 | SWAP_IT(R->screen.cur.col, R->swap.cur.col, int16_t); |
554 | SWAP_IT(R->screen.cur.col, R->swap.cur.col, int16_t); |
555 | # ifdef DEBUG_STRICT |
555 | # ifdef DEBUG_STRICT |
556 | assert((R->screen.cur.row >= 0) && (R->screen.cur.row < R->prev_nrow)); |
556 | assert((R->screen.cur.row >= 0) && (R->screen.cur.row < R->prev_nrow)); |
557 | assert((R->screen.cur.col >= 0) && (R->screen.cur.col < R->prev_ncol)); |
557 | assert((R->screen.cur.col >= 0) && (R->screen.cur.col < R->prev_ncol)); |
558 | # else /* drive with your eyes closed */ |
558 | # else /* drive with your eyes closed */ |
559 | MAX_IT(R->screen.cur.row, 0); |
559 | MAX_IT(R->screen.cur.row, 0); |
560 | MIN_IT(R->screen.cur.row, (int32_t)R->prev_nrow - 1); |
560 | MIN_IT(R->screen.cur.row, (int32_t)R->prev_nrow - 1); |
561 | MAX_IT(R->screen.cur.col, 0); |
561 | MAX_IT(R->screen.cur.col, 0); |
562 | MIN_IT(R->screen.cur.col, (int32_t)R->prev_ncol - 1); |
562 | MIN_IT(R->screen.cur.col, (int32_t)R->prev_ncol - 1); |
563 | # endif |
563 | # endif |
… | |
… | |
567 | R->swap.flags |= Screen_VisibleCursor; |
567 | R->swap.flags |= Screen_VisibleCursor; |
568 | |
568 | |
569 | # ifdef RXVT_GRAPHICS |
569 | # ifdef RXVT_GRAPHICS |
570 | |
570 | |
571 | if (rxvt_Gr_Displayed(aR)) { |
571 | if (rxvt_Gr_Displayed(aR)) { |
572 | rxvt_Gr_scroll(aR_ 0); |
572 | rxvt_Gr_scroll(aR_ 0); |
573 | rxvt_Gr_ChangeScreen(aR); |
573 | rxvt_Gr_ChangeScreen(aR); |
574 | } |
574 | } |
575 | # endif |
575 | # endif |
576 | #else |
576 | #else |
577 | # ifdef SCROLL_ON_NO_SECONDARY |
577 | # ifdef SCROLL_ON_NO_SECONDARY |
578 | # ifdef RXVT_GRAPHICS |
578 | # ifdef RXVT_GRAPHICS |
579 | if (rxvt_Gr_Displayed(aR)) |
579 | if (rxvt_Gr_Displayed(aR)) |
580 | rxvt_Gr_ClearScreen(aR); |
580 | rxvt_Gr_ClearScreen(aR); |
581 | # endif |
581 | # endif |
582 | if (R->current_screen == PRIMARY |
582 | if (R->current_screen == PRIMARY |
583 | # ifdef RXVT_GRAPHICS |
583 | # ifdef RXVT_GRAPHICS |
584 | && !rxvt_Gr_Displayed(aR) |
584 | && !rxvt_Gr_Displayed(aR) |
585 | # endif |
585 | # endif |
586 | ) |
586 | ) |
587 | rxvt_scroll_text(aR_ 0, (R->prev_nrow - 1), R->prev_nrow, 0); |
587 | rxvt_scroll_text(aR_ 0, (R->prev_nrow - 1), R->prev_nrow, 0); |
588 | # endif |
588 | # endif |
589 | #endif |
589 | #endif |
590 | return scrn; |
590 | return scrn; |
591 | } |
591 | } |
592 | |
592 | |
… | |
… | |
598 | void |
598 | void |
599 | rxvt_scr_color(pR_ unsigned int color, int fgbg) |
599 | rxvt_scr_color(pR_ unsigned int color, int fgbg) |
600 | { |
600 | { |
601 | color &= RS_fgMask; |
601 | color &= RS_fgMask; |
602 | if (fgbg == Color_fg) |
602 | if (fgbg == Color_fg) |
603 | R->rstyle = SET_FGCOLOR(R->rstyle, color); |
603 | R->rstyle = SET_FGCOLOR(R->rstyle, color); |
604 | else |
604 | else |
605 | R->rstyle = SET_BGCOLOR(R->rstyle, color); |
605 | R->rstyle = SET_BGCOLOR(R->rstyle, color); |
606 | } |
606 | } |
607 | |
607 | |
608 | /* ------------------------------------------------------------------------- */ |
608 | /* ------------------------------------------------------------------------- */ |
609 | /* |
609 | /* |
610 | * Change the rendition style for following text |
610 | * Change the rendition style for following text |
… | |
… | |
612 | /* EXTPROTO */ |
612 | /* EXTPROTO */ |
613 | void |
613 | void |
614 | rxvt_scr_rendition(pR_ int set, int style) |
614 | rxvt_scr_rendition(pR_ int set, int style) |
615 | { |
615 | { |
616 | if (set) |
616 | if (set) |
617 | R->rstyle |= style; |
617 | R->rstyle |= style; |
618 | else if (style == ~RS_None) |
618 | else if (style == ~RS_None) |
619 | R->rstyle = DEFAULT_RSTYLE; |
619 | R->rstyle = DEFAULT_RSTYLE; |
620 | else |
620 | else |
621 | R->rstyle &= ~style; |
621 | R->rstyle &= ~style; |
622 | } |
622 | } |
623 | |
623 | |
624 | /* ------------------------------------------------------------------------- */ |
624 | /* ------------------------------------------------------------------------- */ |
625 | /* |
625 | /* |
626 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
626 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
… | |
… | |
634 | { |
634 | { |
635 | int i, j; |
635 | int i, j; |
636 | long nscrolled; |
636 | long nscrolled; |
637 | |
637 | |
638 | if (count == 0 || (row1 > row2)) |
638 | if (count == 0 || (row1 > row2)) |
639 | return 0; |
639 | return 0; |
640 | |
640 | |
641 | R->want_refresh = 1; |
641 | R->want_refresh = 1; |
642 | D_SCREEN((stderr, "rxvt_scroll_text(%d,%d,%d,%d): %s", row1, row2, count, spec, (R->current_screen == PRIMARY) ? "Primary" : "Secondary")); |
642 | D_SCREEN((stderr, "rxvt_scroll_text(%d,%d,%d,%d): %s", row1, row2, count, spec, (R->current_screen == PRIMARY) ? "Primary" : "Secondary")); |
643 | |
643 | |
644 | if ((count > 0) && (row1 == 0) && (R->current_screen == PRIMARY)) { |
644 | if ((count > 0) && (row1 == 0) && (R->current_screen == PRIMARY)) { |
645 | nscrolled = (long)R->TermWin.nscrolled + (long)count;; |
645 | nscrolled = (long)R->TermWin.nscrolled + (long)count;; |
646 | if (nscrolled > (long)R->TermWin.saveLines) |
646 | if (nscrolled > (long)R->TermWin.saveLines) |
647 | R->TermWin.nscrolled = R->TermWin.saveLines; |
647 | R->TermWin.nscrolled = R->TermWin.saveLines; |
648 | else |
648 | else |
649 | R->TermWin.nscrolled = (uint16_t)nscrolled; |
649 | R->TermWin.nscrolled = (uint16_t)nscrolled; |
650 | if ((R->Options & Opt_scrollWithBuffer) |
650 | if ((R->Options & Opt_scrollWithBuffer) |
651 | && R->TermWin.view_start != 0 |
651 | && R->TermWin.view_start != 0 |
652 | && R->TermWin.view_start != R->TermWin.saveLines) |
652 | && R->TermWin.view_start != R->TermWin.saveLines) |
653 | rxvt_scr_page(aR_ UP, count); |
653 | rxvt_scr_page(aR_ UP, count); |
654 | } else if (!spec) |
654 | } else if (!spec) |
655 | row1 += R->TermWin.saveLines; |
655 | row1 += R->TermWin.saveLines; |
656 | row2 += R->TermWin.saveLines; |
656 | row2 += R->TermWin.saveLines; |
657 | |
657 | |
658 | if (R->selection.op && R->current_screen == R->selection.screen) { |
658 | if (R->selection.op && R->current_screen == R->selection.screen) { |
659 | i = R->selection.beg.row + R->TermWin.saveLines; |
659 | i = R->selection.beg.row + R->TermWin.saveLines; |
660 | j = R->selection.end.row + R->TermWin.saveLines; |
660 | j = R->selection.end.row + R->TermWin.saveLines; |
661 | if ((i < row1 && j > row1) |
661 | if ((i < row1 && j > row1) |
662 | || (i < row2 && j > row2) |
662 | || (i < row2 && j > row2) |
663 | || (i - count < row1 && i >= row1) |
663 | || (i - count < row1 && i >= row1) |
664 | || (i - count > row2 && i <= row2) |
664 | || (i - count > row2 && i <= row2) |
665 | || (j - count < row1 && j >= row1) |
665 | || (j - count < row1 && j >= row1) |
666 | || (j - count > row2 && j <= row2)) { |
666 | || (j - count > row2 && j <= row2)) { |
667 | CLEAR_ALL_SELECTION(R); |
667 | CLEAR_ALL_SELECTION(R); |
668 | R->selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
668 | R->selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
669 | } else if (j >= row1 && j <= row2) { |
669 | } else if (j >= row1 && j <= row2) { |
670 | /* move selected region too */ |
670 | /* move selected region too */ |
671 | R->selection.beg.row -= count; |
671 | R->selection.beg.row -= count; |
672 | R->selection.end.row -= count; |
672 | R->selection.end.row -= count; |
673 | R->selection.mark.row -= count; |
673 | R->selection.mark.row -= count; |
674 | } |
674 | } |
675 | } |
675 | } |
676 | rxvt_selection_check(aR_ 0); /* _after_ R->TermWin.nscrolled update */ |
676 | rxvt_selection_check(aR_ 0); /* _after_ R->TermWin.nscrolled update */ |
677 | |
677 | |
678 | R->num_scr += count; |
678 | R->num_scr += count; |
679 | j = count; |
679 | j = count; |
680 | if (count < 0) |
680 | if (count < 0) |
681 | count = -count; |
681 | count = -count; |
682 | i = row2 - row1 + 1; |
682 | i = row2 - row1 + 1; |
683 | MIN_IT(count, i); |
683 | MIN_IT(count, i); |
684 | |
684 | |
685 | if (j > 0) { |
685 | if (j > 0) { |
686 | /* A: scroll up */ |
686 | /* A: scroll up */ |
687 | |
687 | |
688 | /* A1: Copy lines that will get clobbered by the rotation */ |
688 | /* A1: Copy lines that will get clobbered by the rotation */ |
689 | for (i = 0, j = row1; i < count; i++, j++) { |
689 | for (i = 0, j = row1; i < count; i++, j++) { |
690 | R->buf_text[i] = R->screen.text[j]; |
690 | R->buf_text[i] = R->screen.text[j]; |
691 | R->buf_rend[i] = R->screen.rend[j]; |
691 | R->buf_rend[i] = R->screen.rend[j]; |
692 | } |
692 | } |
693 | /* A2: Rotate lines */ |
693 | /* A2: Rotate lines */ |
694 | for (j = row1, i = j + count; i <= row2; i++, j++) { |
694 | for (j = row1, i = j + count; i <= row2; i++, j++) { |
695 | R->screen.tlen[j] = R->screen.tlen[i]; |
695 | R->screen.tlen[j] = R->screen.tlen[i]; |
696 | R->screen.text[j] = R->screen.text[i]; |
696 | R->screen.text[j] = R->screen.text[i]; |
697 | R->screen.rend[j] = R->screen.rend[i]; |
697 | R->screen.rend[j] = R->screen.rend[i]; |
698 | } |
698 | } |
699 | j = row2 - count + 1, i = count; |
699 | j = row2 - count + 1, i = count; |
700 | } else /* if (j < 0) */ { |
700 | } else /* if (j < 0) */ { |
701 | /* B: scroll down */ |
701 | /* B: scroll down */ |
702 | |
702 | |
703 | /* B1: Copy lines that will get clobbered by the rotation */ |
703 | /* B1: Copy lines that will get clobbered by the rotation */ |
704 | for (i = 0, j = row2; i < count; i++, j--) { |
704 | for (i = 0, j = row2; i < count; i++, j--) { |
705 | R->buf_text[i] = R->screen.text[j]; |
705 | R->buf_text[i] = R->screen.text[j]; |
706 | R->buf_rend[i] = R->screen.rend[j]; |
706 | R->buf_rend[i] = R->screen.rend[j]; |
707 | } |
707 | } |
708 | /* B2: Rotate lines */ |
708 | /* B2: Rotate lines */ |
709 | for (j = row2, i = j - count; i >= row1; i--, j--) { |
709 | for (j = row2, i = j - count; i >= row1; i--, j--) { |
710 | R->screen.tlen[j] = R->screen.tlen[i]; |
710 | R->screen.tlen[j] = R->screen.tlen[i]; |
711 | R->screen.text[j] = R->screen.text[i]; |
711 | R->screen.text[j] = R->screen.text[i]; |
712 | R->screen.rend[j] = R->screen.rend[i]; |
712 | R->screen.rend[j] = R->screen.rend[i]; |
713 | } |
713 | } |
714 | j = row1, i = count; |
714 | j = row1, i = count; |
715 | count = -count; |
715 | count = -count; |
716 | } |
716 | } |
717 | |
717 | |
718 | /* C: Resurrect lines */ |
718 | /* C: Resurrect lines */ |
719 | for (; i--; j++) { |
719 | for (; i--; j++) { |
720 | R->screen.tlen[j] = 0; |
720 | R->screen.tlen[j] = 0; |
721 | R->screen.text[j] = R->buf_text[i]; |
721 | R->screen.text[j] = R->buf_text[i]; |
722 | R->screen.rend[j] = R->buf_rend[i]; |
722 | R->screen.rend[j] = R->buf_rend[i]; |
723 | if (!spec) /* line length may not equal TermWin.ncol */ |
723 | if (!spec) /* line length may not equal TermWin.ncol */ |
724 | rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, |
724 | rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, |
725 | (unsigned int)j, R->rstyle); |
725 | (unsigned int)j, R->rstyle); |
726 | } |
726 | } |
727 | |
727 | |
728 | #ifdef RXVT_GRAPHICS |
728 | #ifdef RXVT_GRAPHICS |
729 | if (rxvt_Gr_Displayed(aR)) |
729 | if (rxvt_Gr_Displayed(aR)) |
730 | rxvt_Gr_scroll(aR_ count); |
730 | rxvt_Gr_scroll(aR_ count); |
731 | #endif |
731 | #endif |
732 | return count; |
732 | return count; |
733 | } |
733 | } |
734 | |
734 | |
735 | /* ------------------------------------------------------------------------- */ |
735 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
744 | uint32_t c; |
744 | uint32_t c; |
745 | int i, row, last_col; |
745 | int i, row, last_col; |
746 | text_t *stp; |
746 | text_t *stp; |
747 | rend_t *srp; |
747 | rend_t *srp; |
748 | |
748 | |
749 | if (len <= 0) /* sanity */ |
749 | if (len <= 0) /* sanity */ |
750 | return; |
750 | return; |
751 | |
751 | |
752 | R->want_refresh = 1; |
752 | R->want_refresh = 1; |
753 | last_col = R->TermWin.ncol; |
753 | last_col = R->TermWin.ncol; |
754 | |
754 | |
755 | D_SCREEN((stderr, "rxvt_scr_add_lines(%d,%d)", nlines, len)); |
755 | D_SCREEN((stderr, "rxvt_scr_add_lines(%d,%d)", nlines, len)); |
756 | ZERO_SCROLLBACK(R); |
756 | ZERO_SCROLLBACK(R); |
757 | if (nlines > 0) { |
757 | if (nlines > 0) { |
758 | nlines += (R->screen.cur.row - R->screen.bscroll); |
758 | nlines += (R->screen.cur.row - R->screen.bscroll); |
759 | if ((nlines > 0) |
759 | if ((nlines > 0) |
760 | && (R->screen.tscroll == 0) |
760 | && (R->screen.tscroll == 0) |
761 | && (R->screen.bscroll == (R->TermWin.nrow - 1))) { |
761 | && (R->screen.bscroll == (R->TermWin.nrow - 1))) { |
762 | /* _at least_ this many lines need to be scrolled */ |
762 | /* _at least_ this many lines need to be scrolled */ |
763 | rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, nlines, |
763 | rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, nlines, |
764 | 0); |
764 | 0); |
765 | R->screen.cur.row -= nlines; |
765 | R->screen.cur.row -= nlines; |
766 | } |
766 | } |
767 | } |
767 | } |
768 | #ifdef DEBUG_STRICT |
768 | #ifdef DEBUG_STRICT |
769 | assert(R->screen.cur.col < last_col); |
769 | assert(R->screen.cur.col < last_col); |
770 | assert((R->screen.cur.row < R->TermWin.nrow) |
770 | assert((R->screen.cur.row < R->TermWin.nrow) |
771 | && (R->screen.cur.row >= -(int32_t)R->TermWin.nscrolled)); |
771 | && (R->screen.cur.row >= -(int32_t)R->TermWin.nscrolled)); |
772 | #else /* drive with your eyes closed */ |
772 | #else /* drive with your eyes closed */ |
773 | MIN_IT(R->screen.cur.col, last_col - 1); |
773 | MIN_IT(R->screen.cur.col, last_col - 1); |
774 | MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); |
774 | MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); |
775 | MAX_IT(R->screen.cur.row, -(int32_t)R->TermWin.nscrolled); |
775 | MAX_IT(R->screen.cur.row, -(int32_t)R->TermWin.nscrolled); |
776 | #endif |
776 | #endif |
777 | row = R->screen.cur.row + R->TermWin.saveLines; |
777 | row = R->screen.cur.row + R->TermWin.saveLines; |
778 | |
778 | |
779 | checksel = (R->selection.op |
779 | checksel = (R->selection.op |
780 | && R->current_screen == R->selection.screen) ? 1 : 0; |
780 | && R->current_screen == R->selection.screen) ? 1 : 0; |
781 | clearsel = 0; |
781 | clearsel = 0; |
782 | |
782 | |
783 | stp = R->screen.text[row]; |
783 | stp = R->screen.text[row]; |
784 | srp = R->screen.rend[row]; |
784 | srp = R->screen.rend[row]; |
785 | |
785 | |
786 | for (i = 0; i < len;) { |
786 | for (i = 0; i < len;) { |
787 | c = str[i++]; |
787 | c = str[i++]; |
788 | switch (c) { |
788 | switch (c) { |
789 | case '\t': |
789 | case '\t': |
790 | rxvt_scr_tab(aR_ 1); |
790 | rxvt_scr_tab(aR_ 1); |
791 | continue; |
791 | continue; |
792 | case '\n': |
792 | case '\n': |
793 | if (R->screen.tlen[row] != -1) /* XXX: think about this */ |
793 | if (R->screen.tlen[row] != -1) /* XXX: think about this */ |
794 | MAX_IT(R->screen.tlen[row], R->screen.cur.col); |
794 | MAX_IT(R->screen.tlen[row], R->screen.cur.col); |
795 | R->screen.flags &= ~Screen_WrapNext; |
795 | R->screen.flags &= ~Screen_WrapNext; |
796 | if (R->screen.cur.row == R->screen.bscroll) |
796 | if (R->screen.cur.row == R->screen.bscroll) |
797 | rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, 1, 0); |
797 | rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, 1, 0); |
798 | else if (R->screen.cur.row < (R->TermWin.nrow - 1)) |
798 | else if (R->screen.cur.row < (R->TermWin.nrow - 1)) |
799 | row = (++R->screen.cur.row) + R->TermWin.saveLines; |
799 | row = (++R->screen.cur.row) + R->TermWin.saveLines; |
800 | stp = R->screen.text[row]; /* _must_ refresh */ |
800 | stp = R->screen.text[row]; /* _must_ refresh */ |
801 | srp = R->screen.rend[row]; /* _must_ refresh */ |
801 | srp = R->screen.rend[row]; /* _must_ refresh */ |
802 | RESET_CHSTAT(R); |
802 | RESET_CHSTAT(R); |
803 | continue; |
803 | continue; |
804 | case '\r': |
804 | case '\r': |
805 | if (R->screen.tlen[row] != -1) /* XXX: think about this */ |
805 | if (R->screen.tlen[row] != -1) /* XXX: think about this */ |
806 | MAX_IT(R->screen.tlen[row], R->screen.cur.col); |
806 | MAX_IT(R->screen.tlen[row], R->screen.cur.col); |
807 | R->screen.flags &= ~Screen_WrapNext; |
807 | R->screen.flags &= ~Screen_WrapNext; |
808 | R->screen.cur.col = 0; |
808 | R->screen.cur.col = 0; |
809 | RESET_CHSTAT(R); |
809 | RESET_CHSTAT(R); |
810 | continue; |
810 | continue; |
811 | default: |
811 | default: |
812 | if (c == 127) |
812 | if (c == 127) |
813 | continue; /* yummmm..... */ |
813 | continue; /* yummmm..... */ |
814 | break; |
814 | break; |
815 | } |
815 | } |
816 | |
816 | |
817 | if (checksel /* see if we're writing within selection */ |
817 | if (checksel /* see if we're writing within selection */ |
818 | && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) |
818 | && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) |
819 | && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) { |
819 | && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) { |
820 | checksel = 0; |
820 | checksel = 0; |
821 | clearsel = 1; |
821 | clearsel = 1; |
822 | } |
822 | } |
823 | if (R->screen.flags & Screen_WrapNext) { |
823 | if (R->screen.flags & Screen_WrapNext) { |
824 | R->screen.tlen[row] = -1; |
824 | R->screen.tlen[row] = -1; |
825 | if (R->screen.cur.row == R->screen.bscroll) |
825 | if (R->screen.cur.row == R->screen.bscroll) |
826 | rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, 1, 0); |
826 | rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, 1, 0); |
827 | else if (R->screen.cur.row < (R->TermWin.nrow - 1)) |
827 | else if (R->screen.cur.row < (R->TermWin.nrow - 1)) |
828 | row = (++R->screen.cur.row) + R->TermWin.saveLines; |
828 | row = (++R->screen.cur.row) + R->TermWin.saveLines; |
829 | stp = R->screen.text[row]; /* _must_ refresh */ |
829 | stp = R->screen.text[row]; /* _must_ refresh */ |
830 | srp = R->screen.rend[row]; /* _must_ refresh */ |
830 | srp = R->screen.rend[row]; /* _must_ refresh */ |
831 | R->screen.cur.col = 0; |
831 | R->screen.cur.col = 0; |
832 | R->screen.flags &= ~Screen_WrapNext; |
832 | R->screen.flags &= ~Screen_WrapNext; |
833 | } |
833 | } |
834 | if (R->screen.flags & Screen_Insert) |
834 | if (R->screen.flags & Screen_Insert) |
835 | rxvt_scr_insdel_chars(aR_ 1, INSERT); |
835 | rxvt_scr_insdel_chars(aR_ 1, INSERT); |
836 | |
836 | |
837 | if (R->charsets[R->screen.charset] == '0') // DEC SPECIAL |
837 | if (R->charsets[R->screen.charset] == '0') // DEC SPECIAL |
838 | switch (c) |
838 | switch (c) |
839 | { |
839 | { |
840 | case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; |
840 | case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; |
… | |
… | |
850 | case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; |
850 | case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; |
851 | } |
851 | } |
852 | |
852 | |
853 | rend_t rend = SET_FONT (R->rstyle, R->TermWin.fontset->find_font (c)); |
853 | rend_t rend = SET_FONT (R->rstyle, R->TermWin.fontset->find_font (c)); |
854 | |
854 | |
855 | stp[R->screen.cur.col] = c; |
855 | stp[R->screen.cur.col] = c; |
856 | srp[R->screen.cur.col] = rend; |
856 | srp[R->screen.cur.col] = rend; |
857 | |
857 | |
858 | if (c > 255) |
858 | if (c > 255) |
859 | { |
859 | { |
860 | // rely on wcwidth to tell us the character width, at least for non iso-8859-1 |
860 | // rely on wcwidth to tell us the character width, at least for non iso-8859-1 |
861 | int width = wcwidth (c); |
861 | int width = wcwidth (c); |
… | |
… | |
872 | srp[R->screen.cur.col] = rend; |
872 | srp[R->screen.cur.col] = rend; |
873 | } |
873 | } |
874 | } |
874 | } |
875 | } |
875 | } |
876 | |
876 | |
877 | if (R->screen.cur.col < last_col - 1) |
877 | if (R->screen.cur.col < last_col - 1) |
878 | R->screen.cur.col++; |
878 | R->screen.cur.col++; |
879 | else { |
879 | else { |
880 | R->screen.tlen[row] = last_col; |
880 | R->screen.tlen[row] = last_col; |
881 | if (R->screen.flags & Screen_Autowrap) |
881 | if (R->screen.flags & Screen_Autowrap) |
882 | R->screen.flags |= Screen_WrapNext; |
882 | R->screen.flags |= Screen_WrapNext; |
883 | } |
883 | } |
884 | } |
884 | } |
885 | if (R->screen.tlen[row] != -1) /* XXX: think about this */ |
885 | if (R->screen.tlen[row] != -1) /* XXX: think about this */ |
886 | MAX_IT(R->screen.tlen[row], R->screen.cur.col); |
886 | MAX_IT(R->screen.tlen[row], R->screen.cur.col); |
887 | |
887 | |
888 | /* |
888 | /* |
889 | * If we wrote anywhere in the selected area, kill the selection |
889 | * If we wrote anywhere in the selected area, kill the selection |
890 | * XXX: should we kill the mark too? Possibly, but maybe that |
890 | * XXX: should we kill the mark too? Possibly, but maybe that |
891 | * should be a similar check. |
891 | * should be a similar check. |
892 | */ |
892 | */ |
893 | if (clearsel) |
893 | if (clearsel) |
894 | CLEAR_SELECTION(R); |
894 | CLEAR_SELECTION(R); |
895 | |
895 | |
896 | #ifdef DEBUG_STRICT |
896 | #ifdef DEBUG_STRICT |
897 | assert(R->screen.cur.row >= 0); |
897 | assert(R->screen.cur.row >= 0); |
898 | #else /* drive with your eyes closed */ |
898 | #else /* drive with your eyes closed */ |
899 | MAX_IT(R->screen.cur.row, 0); |
899 | MAX_IT(R->screen.cur.row, 0); |
900 | #endif |
900 | #endif |
901 | } |
901 | } |
902 | |
902 | |
903 | /* ------------------------------------------------------------------------- */ |
903 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
910 | rxvt_scr_backspace(pR) |
910 | rxvt_scr_backspace(pR) |
911 | { |
911 | { |
912 | RESET_CHSTAT(R); |
912 | RESET_CHSTAT(R); |
913 | R->want_refresh = 1; |
913 | R->want_refresh = 1; |
914 | if (R->screen.cur.col == 0) { |
914 | if (R->screen.cur.col == 0) { |
915 | if (R->screen.cur.row > 0) { |
915 | if (R->screen.cur.row > 0) { |
916 | #ifdef TERMCAP_HAS_BW |
916 | #ifdef TERMCAP_HAS_BW |
917 | R->screen.cur.col = R->TermWin.ncol - 1; |
917 | R->screen.cur.col = R->TermWin.ncol - 1; |
918 | R->screen.cur.row--; |
918 | R->screen.cur.row--; |
919 | return; |
919 | return; |
920 | #endif |
920 | #endif |
921 | } |
921 | } |
922 | } else if ((R->screen.flags & Screen_WrapNext) == 0) |
922 | } else if ((R->screen.flags & Screen_WrapNext) == 0) |
923 | rxvt_scr_gotorc(aR_ 0, -1, RELATIVE); |
923 | rxvt_scr_gotorc(aR_ 0, -1, RELATIVE); |
924 | R->screen.flags &= ~Screen_WrapNext; |
924 | R->screen.flags &= ~Screen_WrapNext; |
925 | } |
925 | } |
926 | |
926 | |
927 | /* ------------------------------------------------------------------------- */ |
927 | /* ------------------------------------------------------------------------- */ |
928 | /* |
928 | /* |
… | |
… | |
939 | D_SCREEN((stderr, "rxvt_scr_tab(%d)", count)); |
939 | D_SCREEN((stderr, "rxvt_scr_tab(%d)", count)); |
940 | R->want_refresh = 1; |
940 | R->want_refresh = 1; |
941 | RESET_CHSTAT(R); |
941 | RESET_CHSTAT(R); |
942 | i = x = R->screen.cur.col; |
942 | i = x = R->screen.cur.col; |
943 | if (count == 0) |
943 | if (count == 0) |
944 | return; |
944 | return; |
945 | else if (count > 0) { |
945 | else if (count > 0) { |
946 | for (; ++i < R->TermWin.ncol; ) |
946 | for (; ++i < R->TermWin.ncol; ) |
947 | if (R->tabs[i]) { |
947 | if (R->tabs[i]) { |
948 | x = i; |
948 | x = i; |
949 | if (!--count) |
949 | if (!--count) |
950 | break; |
950 | break; |
951 | } |
951 | } |
952 | if (count) |
952 | if (count) |
953 | x = R->TermWin.ncol - 1; |
953 | x = R->TermWin.ncol - 1; |
954 | } else /* if (count < 0) */ { |
954 | } else /* if (count < 0) */ { |
955 | for (; --i >= 0; ) |
955 | for (; --i >= 0; ) |
956 | if (R->tabs[i]) { |
956 | if (R->tabs[i]) { |
957 | x = i; |
957 | x = i; |
958 | if (!++count) |
958 | if (!++count) |
959 | break; |
959 | break; |
960 | } |
960 | } |
961 | if (count) |
961 | if (count) |
962 | x = 0; |
962 | x = 0; |
963 | } |
963 | } |
964 | if (x != R->screen.cur.col) |
964 | if (x != R->screen.cur.col) |
965 | rxvt_scr_gotorc(aR_ 0, x, R_RELATIVE); |
965 | rxvt_scr_gotorc(aR_ 0, x, R_RELATIVE); |
966 | } |
966 | } |
967 | |
967 | |
968 | /* ------------------------------------------------------------------------- */ |
968 | /* ------------------------------------------------------------------------- */ |
969 | /* |
969 | /* |
970 | * Process DEC Back Index |
970 | * Process DEC Back Index |
… | |
… | |
976 | /* EXTPROTO */ |
976 | /* EXTPROTO */ |
977 | void |
977 | void |
978 | rxvt_scr_backindex(pR) |
978 | rxvt_scr_backindex(pR) |
979 | { |
979 | { |
980 | if (R->screen.cur.col > 0) |
980 | if (R->screen.cur.col > 0) |
981 | rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); |
981 | rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); |
982 | else { |
982 | else { |
983 | if (R->screen.tlen[R->screen.cur.row + R->TermWin.saveLines] == 0) |
983 | if (R->screen.tlen[R->screen.cur.row + R->TermWin.saveLines] == 0) |
984 | return; /* um, yeah? */ |
984 | return; /* um, yeah? */ |
985 | rxvt_scr_insdel_chars(aR_ 1, INSERT); |
985 | rxvt_scr_insdel_chars(aR_ 1, INSERT); |
986 | } |
986 | } |
987 | } |
987 | } |
988 | #endif |
988 | #endif |
989 | /* ------------------------------------------------------------------------- */ |
989 | /* ------------------------------------------------------------------------- */ |
990 | /* |
990 | /* |
… | |
… | |
999 | rxvt_scr_forwardindex(pR) |
999 | rxvt_scr_forwardindex(pR) |
1000 | { |
1000 | { |
1001 | int row; |
1001 | int row; |
1002 | |
1002 | |
1003 | if (R->screen.cur.col < R->TermWin.ncol - 1) |
1003 | if (R->screen.cur.col < R->TermWin.ncol - 1) |
1004 | rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); |
1004 | rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); |
1005 | else { |
1005 | else { |
1006 | row = R->screen.cur.row + R->TermWin.saveLines; |
1006 | row = R->screen.cur.row + R->TermWin.saveLines; |
1007 | if (R->screen.tlen[row] == 0) |
1007 | if (R->screen.tlen[row] == 0) |
1008 | return; /* um, yeah? */ |
1008 | return; /* um, yeah? */ |
1009 | else if (R->screen.tlen[row] == -1) |
1009 | else if (R->screen.tlen[row] == -1) |
1010 | R->screen.tlen[row] = R->TermWin.ncol; |
1010 | R->screen.tlen[row] = R->TermWin.ncol; |
1011 | rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); |
1011 | rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); |
1012 | rxvt_scr_insdel_chars(aR_ 1, DELETE); |
1012 | rxvt_scr_insdel_chars(aR_ 1, DELETE); |
1013 | rxvt_scr_gotorc(aR_ 0, R->TermWin.ncol - 1, R_RELATIVE); |
1013 | rxvt_scr_gotorc(aR_ 0, R->TermWin.ncol - 1, R_RELATIVE); |
1014 | } |
1014 | } |
1015 | } |
1015 | } |
1016 | #endif |
1016 | #endif |
1017 | |
1017 | |
1018 | /* ------------------------------------------------------------------------- */ |
1018 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1026 | R->want_refresh = 1; |
1026 | R->want_refresh = 1; |
1027 | ZERO_SCROLLBACK(R); |
1027 | ZERO_SCROLLBACK(R); |
1028 | RESET_CHSTAT(R); |
1028 | RESET_CHSTAT(R); |
1029 | #ifdef RXVT_GRAPHICS |
1029 | #ifdef RXVT_GRAPHICS |
1030 | if (rxvt_Gr_Displayed(aR)) |
1030 | if (rxvt_Gr_Displayed(aR)) |
1031 | rxvt_Gr_scroll(aR_ 0); |
1031 | rxvt_Gr_scroll(aR_ 0); |
1032 | #endif |
1032 | #endif |
1033 | |
1033 | |
1034 | 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, R->screen.cur.row, R->screen.cur.col)); |
1034 | 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, R->screen.cur.row, R->screen.cur.col)); |
1035 | |
1035 | |
1036 | R->screen.cur.col = ((relative & C_RELATIVE) ? (R->screen.cur.col + col) |
1036 | R->screen.cur.col = ((relative & C_RELATIVE) ? (R->screen.cur.col + col) |
1037 | : col); |
1037 | : col); |
1038 | MAX_IT(R->screen.cur.col, 0); |
1038 | MAX_IT(R->screen.cur.col, 0); |
1039 | MIN_IT(R->screen.cur.col, (int32_t)R->TermWin.ncol - 1); |
1039 | MIN_IT(R->screen.cur.col, (int32_t)R->TermWin.ncol - 1); |
1040 | |
1040 | |
1041 | R->screen.flags &= ~Screen_WrapNext; |
1041 | R->screen.flags &= ~Screen_WrapNext; |
1042 | if (relative & R_RELATIVE) { |
1042 | if (relative & R_RELATIVE) { |
1043 | if (row > 0) { |
1043 | if (row > 0) { |
1044 | if (R->screen.cur.row <= R->screen.bscroll |
1044 | if (R->screen.cur.row <= R->screen.bscroll |
1045 | && (R->screen.cur.row + row) > R->screen.bscroll) |
1045 | && (R->screen.cur.row + row) > R->screen.bscroll) |
1046 | R->screen.cur.row = R->screen.bscroll; |
1046 | R->screen.cur.row = R->screen.bscroll; |
1047 | else |
1047 | else |
1048 | R->screen.cur.row += row; |
1048 | R->screen.cur.row += row; |
1049 | } else if (row < 0) { |
1049 | } else if (row < 0) { |
1050 | if (R->screen.cur.row >= R->screen.tscroll |
1050 | if (R->screen.cur.row >= R->screen.tscroll |
1051 | && (R->screen.cur.row + row) < R->screen.tscroll) |
1051 | && (R->screen.cur.row + row) < R->screen.tscroll) |
1052 | R->screen.cur.row = R->screen.tscroll; |
1052 | R->screen.cur.row = R->screen.tscroll; |
1053 | else |
1053 | else |
1054 | R->screen.cur.row += row; |
1054 | R->screen.cur.row += row; |
1055 | } |
1055 | } |
1056 | } else { |
1056 | } else { |
1057 | if (R->screen.flags & Screen_Relative) { /* relative origin mode */ |
1057 | if (R->screen.flags & Screen_Relative) { /* relative origin mode */ |
1058 | R->screen.cur.row = row + R->screen.tscroll; |
1058 | R->screen.cur.row = row + R->screen.tscroll; |
1059 | MIN_IT(R->screen.cur.row, R->screen.bscroll); |
1059 | MIN_IT(R->screen.cur.row, R->screen.bscroll); |
1060 | } else |
1060 | } else |
1061 | R->screen.cur.row = row; |
1061 | R->screen.cur.row = row; |
1062 | } |
1062 | } |
1063 | MAX_IT(R->screen.cur.row, 0); |
1063 | MAX_IT(R->screen.cur.row, 0); |
1064 | MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); |
1064 | MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); |
1065 | } |
1065 | } |
1066 | |
1066 | |
… | |
… | |
1081 | ZERO_SCROLLBACK(R); |
1081 | ZERO_SCROLLBACK(R); |
1082 | RESET_CHSTAT(R); |
1082 | RESET_CHSTAT(R); |
1083 | |
1083 | |
1084 | #ifdef RXVT_GRAPHICS |
1084 | #ifdef RXVT_GRAPHICS |
1085 | if (rxvt_Gr_Displayed(aR)) |
1085 | if (rxvt_Gr_Displayed(aR)) |
1086 | rxvt_Gr_scroll(aR_ 0); |
1086 | rxvt_Gr_scroll(aR_ 0); |
1087 | #endif |
1087 | #endif |
1088 | |
1088 | |
1089 | R->screen.flags &= ~Screen_WrapNext; |
1089 | R->screen.flags &= ~Screen_WrapNext; |
1090 | if ((R->screen.cur.row == R->screen.bscroll && direction == UP) |
1090 | if ((R->screen.cur.row == R->screen.bscroll && direction == UP) |
1091 | || (R->screen.cur.row == R->screen.tscroll && direction == DN)) |
1091 | || (R->screen.cur.row == R->screen.tscroll && direction == DN)) |
1092 | rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, dirn, 0); |
1092 | rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, dirn, 0); |
1093 | else |
1093 | else |
1094 | R->screen.cur.row += dirn; |
1094 | R->screen.cur.row += dirn; |
1095 | MAX_IT(R->screen.cur.row, 0); |
1095 | MAX_IT(R->screen.cur.row, 0); |
1096 | MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); |
1096 | MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); |
1097 | rxvt_selection_check(aR_ 0); |
1097 | rxvt_selection_check(aR_ 0); |
1098 | } |
1098 | } |
1099 | |
1099 | |
… | |
… | |
1115 | ZERO_SCROLLBACK(R); |
1115 | ZERO_SCROLLBACK(R); |
1116 | RESET_CHSTAT(R); |
1116 | RESET_CHSTAT(R); |
1117 | |
1117 | |
1118 | #ifdef RXVT_GRAPHICS |
1118 | #ifdef RXVT_GRAPHICS |
1119 | if (rxvt_Gr_Displayed(aR)) |
1119 | if (rxvt_Gr_Displayed(aR)) |
1120 | rxvt_Gr_scroll(aR_ 0); |
1120 | rxvt_Gr_scroll(aR_ 0); |
1121 | #endif |
1121 | #endif |
1122 | |
1122 | |
1123 | rxvt_selection_check(aR_ 1); |
1123 | rxvt_selection_check(aR_ 1); |
1124 | |
1124 | |
1125 | R->screen.flags &= ~Screen_WrapNext; |
1125 | R->screen.flags &= ~Screen_WrapNext; |
1126 | |
1126 | |
1127 | row = R->TermWin.saveLines + R->screen.cur.row; |
1127 | row = R->TermWin.saveLines + R->screen.cur.row; |
1128 | switch (mode) { |
1128 | switch (mode) { |
1129 | case 0: /* erase to end of line */ |
1129 | case 0: /* erase to end of line */ |
1130 | col = R->screen.cur.col; |
1130 | col = R->screen.cur.col; |
1131 | num = R->TermWin.ncol - col; |
1131 | num = R->TermWin.ncol - col; |
1132 | MIN_IT(R->screen.tlen[row], (int16_t)col); |
1132 | MIN_IT(R->screen.tlen[row], (int16_t)col); |
1133 | if (ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur) |
1133 | if (ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur) |
1134 | || ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.end, R->screen.cur)) |
1134 | || ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.end, R->screen.cur)) |
1135 | CLEAR_SELECTION(R); |
1135 | CLEAR_SELECTION(R); |
1136 | break; |
1136 | break; |
1137 | case 1: /* erase to beginning of line */ |
1137 | case 1: /* erase to beginning of line */ |
1138 | col = 0; |
1138 | col = 0; |
1139 | num = R->screen.cur.col + 1; |
1139 | num = R->screen.cur.col + 1; |
1140 | if (ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.beg, R->screen.cur) |
1140 | if (ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.beg, R->screen.cur) |
1141 | || ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.end, R->screen.cur)) |
1141 | || ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.end, R->screen.cur)) |
1142 | CLEAR_SELECTION(R); |
1142 | CLEAR_SELECTION(R); |
1143 | break; |
1143 | break; |
1144 | case 2: /* erase whole line */ |
1144 | case 2: /* erase whole line */ |
1145 | col = 0; |
1145 | col = 0; |
1146 | num = R->TermWin.ncol; |
1146 | num = R->TermWin.ncol; |
1147 | R->screen.tlen[row] = 0; |
1147 | R->screen.tlen[row] = 0; |
1148 | if (R->selection.beg.row <= R->screen.cur.row |
1148 | if (R->selection.beg.row <= R->screen.cur.row |
1149 | && R->selection.end.row >= R->screen.cur.row) |
1149 | && R->selection.end.row >= R->screen.cur.row) |
1150 | CLEAR_SELECTION(R); |
1150 | CLEAR_SELECTION(R); |
1151 | break; |
1151 | break; |
1152 | default: |
1152 | default: |
1153 | return; |
1153 | return; |
1154 | } |
1154 | } |
1155 | if (R->screen.text[row]) |
1155 | if (R->screen.text[row]) |
1156 | rxvt_blank_line(aR_ |
1156 | rxvt_blank_line(aR_ |
1157 | &(R->screen.text[row][col]), |
1157 | &(R->screen.text[row][col]), |
1158 | &(R->screen.rend[row][col]), num, R->rstyle); |
1158 | &(R->screen.rend[row][col]), num, R->rstyle); |
1159 | else |
1159 | else |
1160 | rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, row, |
1160 | rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, row, |
1161 | R->rstyle); |
1161 | R->rstyle); |
1162 | } |
1162 | } |
1163 | |
1163 | |
1164 | /* ------------------------------------------------------------------------- */ |
1164 | /* ------------------------------------------------------------------------- */ |
1165 | /* |
1165 | /* |
1166 | * Erase part of whole of the screen |
1166 | * Erase part of whole of the screen |
… | |
… | |
1182 | ZERO_SCROLLBACK(R); |
1182 | ZERO_SCROLLBACK(R); |
1183 | RESET_CHSTAT(R); |
1183 | RESET_CHSTAT(R); |
1184 | row_offset = (int32_t)R->TermWin.saveLines; |
1184 | row_offset = (int32_t)R->TermWin.saveLines; |
1185 | |
1185 | |
1186 | switch (mode) { |
1186 | switch (mode) { |
1187 | case 0: /* erase to end of screen */ |
1187 | case 0: /* erase to end of screen */ |
1188 | rxvt_selection_check(aR_ 1); |
1188 | rxvt_selection_check(aR_ 1); |
1189 | rxvt_scr_erase_line(aR_ 0); |
1189 | rxvt_scr_erase_line(aR_ 0); |
1190 | row = R->screen.cur.row + 1; /* possible OOB */ |
1190 | row = R->screen.cur.row + 1; /* possible OOB */ |
1191 | num = R->TermWin.nrow - row; |
1191 | num = R->TermWin.nrow - row; |
1192 | break; |
1192 | break; |
1193 | case 1: /* erase to beginning of screen */ |
1193 | case 1: /* erase to beginning of screen */ |
1194 | rxvt_selection_check(aR_ 3); |
1194 | rxvt_selection_check(aR_ 3); |
1195 | rxvt_scr_erase_line(aR_ 1); |
1195 | rxvt_scr_erase_line(aR_ 1); |
1196 | row = 0; |
1196 | row = 0; |
1197 | num = R->screen.cur.row; |
1197 | num = R->screen.cur.row; |
1198 | break; |
1198 | break; |
1199 | case 2: /* erase whole screen */ |
1199 | case 2: /* erase whole screen */ |
1200 | rxvt_selection_check(aR_ 3); |
1200 | rxvt_selection_check(aR_ 3); |
1201 | #ifdef RXVT_GRAPHICS |
1201 | #ifdef RXVT_GRAPHICS |
1202 | rxvt_Gr_ClearScreen(aR); |
1202 | rxvt_Gr_ClearScreen(aR); |
1203 | #endif |
1203 | #endif |
1204 | row = 0; |
1204 | row = 0; |
1205 | num = R->TermWin.nrow; |
1205 | num = R->TermWin.nrow; |
1206 | break; |
1206 | break; |
1207 | default: |
1207 | default: |
1208 | return; |
1208 | return; |
1209 | } |
1209 | } |
1210 | R->refresh_type |= REFRESH_BOUNDS; |
1210 | R->refresh_type |= REFRESH_BOUNDS; |
1211 | if (R->selection.op && R->current_screen == R->selection.screen |
1211 | if (R->selection.op && R->current_screen == R->selection.screen |
1212 | && ((R->selection.beg.row >= row && R->selection.beg.row <= row + num) |
1212 | && ((R->selection.beg.row >= row && R->selection.beg.row <= row + num) |
1213 | || (R->selection.end.row >= row |
1213 | || (R->selection.end.row >= row |
1214 | && R->selection.end.row <= row + num))) |
1214 | && R->selection.end.row <= row + num))) |
1215 | CLEAR_SELECTION(R); |
1215 | CLEAR_SELECTION(R); |
1216 | if (row >= R->TermWin.nrow) /* Out Of Bounds */ |
1216 | if (row >= R->TermWin.nrow) /* Out Of Bounds */ |
1217 | return; |
1217 | return; |
1218 | MIN_IT(num, (R->TermWin.nrow - row)); |
1218 | MIN_IT(num, (R->TermWin.nrow - row)); |
1219 | if (R->rstyle & (RS_RVid | RS_Uline)) |
1219 | if (R->rstyle & (RS_RVid | RS_Uline)) |
1220 | ren = (rend_t) ~RS_None; |
1220 | ren = (rend_t) ~RS_None; |
1221 | else if (GET_BASEBG(R->rstyle) == Color_bg) { |
1221 | else if (GET_BASEBG(R->rstyle) == Color_bg) { |
1222 | ren = DEFAULT_RSTYLE; |
1222 | ren = DEFAULT_RSTYLE; |
1223 | CLEAR_ROWS(row, num); |
1223 | CLEAR_ROWS(row, num); |
1224 | } else { |
1224 | } else { |
1225 | ren = (R->rstyle & (RS_fgMask | RS_bgMask)); |
1225 | ren = (R->rstyle & (RS_fgMask | RS_bgMask)); |
1226 | gcvalue.foreground = R->PixColors[GET_BGCOLOR(R->rstyle)]; |
1226 | gcvalue.foreground = R->PixColors[GET_BGCOLOR(R->rstyle)]; |
1227 | XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); |
1227 | XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); |
1228 | ERASE_ROWS(row, num); |
1228 | ERASE_ROWS(row, num); |
1229 | gcvalue.foreground = R->PixColors[Color_fg]; |
1229 | gcvalue.foreground = R->PixColors[Color_fg]; |
1230 | XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); |
1230 | XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); |
1231 | } |
1231 | } |
1232 | for (; num--; row++) { |
1232 | for (; num--; row++) { |
1233 | rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, |
1233 | rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, |
1234 | (unsigned int)(row + row_offset), R->rstyle); |
1234 | (unsigned int)(row + row_offset), R->rstyle); |
1235 | R->screen.tlen[row + row_offset] = 0; |
1235 | R->screen.tlen[row + row_offset] = 0; |
1236 | rxvt_blank_line(aR_ |
1236 | rxvt_blank_line(aR_ |
1237 | R->drawn_text[row], R->drawn_rend[row], |
1237 | R->drawn_text[row], R->drawn_rend[row], |
1238 | (unsigned int)R->TermWin.ncol, ren); |
1238 | (unsigned int)R->TermWin.ncol, ren); |
1239 | } |
1239 | } |
1240 | } |
1240 | } |
1241 | |
1241 | |
1242 | /* ------------------------------------------------------------------------- */ |
1242 | /* ------------------------------------------------------------------------- */ |
1243 | /* |
1243 | /* |
… | |
… | |
1257 | RESET_CHSTAT(R); |
1257 | RESET_CHSTAT(R); |
1258 | rxvt_selection_check(aR_ 3); |
1258 | rxvt_selection_check(aR_ 3); |
1259 | |
1259 | |
1260 | fs = SET_FONT (R->rstyle, R->TermWin.fontset->find_font ('E')); |
1260 | fs = SET_FONT (R->rstyle, R->TermWin.fontset->find_font ('E')); |
1261 | for (k = R->TermWin.saveLines, i = R->TermWin.nrow; i--; k++) { |
1261 | for (k = R->TermWin.saveLines, i = R->TermWin.nrow; i--; k++) { |
1262 | R->screen.tlen[k] = R->TermWin.ncol; /* make the `E's selectable */ |
1262 | R->screen.tlen[k] = R->TermWin.ncol; /* make the `E's selectable */ |
1263 | fill_text (R->screen.text[k], 'E', R->TermWin.ncol); |
1263 | fill_text (R->screen.text[k], 'E', R->TermWin.ncol); |
1264 | for (r1 = R->screen.rend[k], j = R->TermWin.ncol; j--; ) |
1264 | for (r1 = R->screen.rend[k], j = R->TermWin.ncol; j--; ) |
1265 | *r1++ = fs; |
1265 | *r1++ = fs; |
1266 | } |
1266 | } |
1267 | } |
1267 | } |
1268 | |
1268 | |
1269 | /* ------------------------------------------------------------------------- */ |
1269 | /* ------------------------------------------------------------------------- */ |
1270 | /* |
1270 | /* |
… | |
… | |
1279 | ZERO_SCROLLBACK(R); |
1279 | ZERO_SCROLLBACK(R); |
1280 | RESET_CHSTAT(R); |
1280 | RESET_CHSTAT(R); |
1281 | |
1281 | |
1282 | #ifdef RXVT_GRAPHICS |
1282 | #ifdef RXVT_GRAPHICS |
1283 | if (rxvt_Gr_Displayed(aR)) |
1283 | if (rxvt_Gr_Displayed(aR)) |
1284 | rxvt_Gr_scroll(aR_ 0); |
1284 | rxvt_Gr_scroll(aR_ 0); |
1285 | #endif |
1285 | #endif |
1286 | |
1286 | |
1287 | rxvt_selection_check(aR_ 1); |
1287 | rxvt_selection_check(aR_ 1); |
1288 | |
1288 | |
1289 | if (R->screen.cur.row > R->screen.bscroll) |
1289 | if (R->screen.cur.row > R->screen.bscroll) |
1290 | return; |
1290 | return; |
1291 | |
1291 | |
1292 | end = R->screen.bscroll - R->screen.cur.row + 1; |
1292 | end = R->screen.bscroll - R->screen.cur.row + 1; |
1293 | if (count > end) { |
1293 | if (count > end) { |
1294 | if (insdel == DELETE) |
1294 | if (insdel == DELETE) |
1295 | return; |
1295 | return; |
1296 | else if (insdel == INSERT) |
1296 | else if (insdel == INSERT) |
1297 | count = end; |
1297 | count = end; |
1298 | } |
1298 | } |
1299 | R->screen.flags &= ~Screen_WrapNext; |
1299 | R->screen.flags &= ~Screen_WrapNext; |
1300 | |
1300 | |
1301 | rxvt_scroll_text(aR_ R->screen.cur.row, R->screen.bscroll, insdel * count, |
1301 | rxvt_scroll_text(aR_ R->screen.cur.row, R->screen.bscroll, insdel * count, |
1302 | 0); |
1302 | 0); |
1303 | } |
1303 | } |
1304 | |
1304 | |
1305 | /* ------------------------------------------------------------------------- */ |
1305 | /* ------------------------------------------------------------------------- */ |
1306 | /* |
1306 | /* |
1307 | * Insert/Delete <count> characters from the current position |
1307 | * Insert/Delete <count> characters from the current position |
… | |
… | |
1322 | RESET_CHSTAT(R); |
1322 | RESET_CHSTAT(R); |
1323 | #endif |
1323 | #endif |
1324 | |
1324 | |
1325 | #ifdef RXVT_GRAPHICS |
1325 | #ifdef RXVT_GRAPHICS |
1326 | if (rxvt_Gr_Displayed(aR)) |
1326 | if (rxvt_Gr_Displayed(aR)) |
1327 | rxvt_Gr_scroll(aR_ 0); |
1327 | rxvt_Gr_scroll(aR_ 0); |
1328 | #endif |
1328 | #endif |
1329 | |
1329 | |
1330 | if (count <= 0) |
1330 | if (count <= 0) |
1331 | return; |
1331 | return; |
1332 | |
1332 | |
1333 | rxvt_selection_check(aR_ 1); |
1333 | rxvt_selection_check(aR_ 1); |
1334 | MIN_IT(count, (R->TermWin.ncol - R->screen.cur.col)); |
1334 | MIN_IT(count, (R->TermWin.ncol - R->screen.cur.col)); |
1335 | |
1335 | |
1336 | row = R->screen.cur.row + R->TermWin.saveLines; |
1336 | row = R->screen.cur.row + R->TermWin.saveLines; |
… | |
… | |
1339 | stp = R->screen.text[row]; |
1339 | stp = R->screen.text[row]; |
1340 | srp = R->screen.rend[row]; |
1340 | srp = R->screen.rend[row]; |
1341 | slp = &(R->screen.tlen[row]); |
1341 | slp = &(R->screen.tlen[row]); |
1342 | switch (insdel) { |
1342 | switch (insdel) { |
1343 | case INSERT: |
1343 | case INSERT: |
1344 | for (col = R->TermWin.ncol - 1; (col - count) >= R->screen.cur.col; |
1344 | for (col = R->TermWin.ncol - 1; (col - count) >= R->screen.cur.col; |
1345 | col--) { |
1345 | col--) { |
1346 | stp[col] = stp[col - count]; |
1346 | stp[col] = stp[col - count]; |
1347 | srp[col] = srp[col - count]; |
1347 | srp[col] = srp[col - count]; |
1348 | } |
1348 | } |
1349 | if (*slp != -1) { |
1349 | if (*slp != -1) { |
1350 | *slp += count; |
1350 | *slp += count; |
1351 | MIN_IT(*slp, R->TermWin.ncol); |
1351 | MIN_IT(*slp, R->TermWin.ncol); |
1352 | } |
1352 | } |
1353 | if (R->selection.op && R->current_screen == R->selection.screen |
1353 | if (R->selection.op && R->current_screen == R->selection.screen |
1354 | && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { |
1354 | && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { |
1355 | if (R->selection.end.row != R->screen.cur.row |
1355 | if (R->selection.end.row != R->screen.cur.row |
1356 | || (R->selection.end.col + count >= R->TermWin.ncol)) |
1356 | || (R->selection.end.col + count >= R->TermWin.ncol)) |
1357 | CLEAR_SELECTION(R); |
1357 | CLEAR_SELECTION(R); |
1358 | else { /* shift selection */ |
1358 | else { /* shift selection */ |
1359 | R->selection.beg.col += count; |
1359 | R->selection.beg.col += count; |
1360 | R->selection.mark.col += count; /* XXX: yes? */ |
1360 | R->selection.mark.col += count; /* XXX: yes? */ |
1361 | R->selection.end.col += count; |
1361 | R->selection.end.col += count; |
1362 | } |
1362 | } |
1363 | } |
1363 | } |
1364 | rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), |
1364 | rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), |
1365 | (unsigned int)count, R->rstyle); |
1365 | (unsigned int)count, R->rstyle); |
1366 | break; |
1366 | break; |
1367 | case ERASE: |
1367 | case ERASE: |
1368 | R->screen.cur.col += count; /* don't worry if > R->TermWin.ncol */ |
1368 | R->screen.cur.col += count; /* don't worry if > R->TermWin.ncol */ |
1369 | rxvt_selection_check(aR_ 1); |
1369 | rxvt_selection_check(aR_ 1); |
1370 | R->screen.cur.col -= count; |
1370 | R->screen.cur.col -= count; |
1371 | rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), |
1371 | rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), |
1372 | (unsigned int)count, R->rstyle); |
1372 | (unsigned int)count, R->rstyle); |
1373 | break; |
1373 | break; |
1374 | case DELETE: |
1374 | case DELETE: |
1375 | tr = srp[R->TermWin.ncol - 1] |
1375 | tr = srp[R->TermWin.ncol - 1] |
1376 | & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1376 | & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1377 | for (col = R->screen.cur.col; (col + count) < R->TermWin.ncol; col++) { |
1377 | for (col = R->screen.cur.col; (col + count) < R->TermWin.ncol; col++) { |
1378 | stp[col] = stp[col + count]; |
1378 | stp[col] = stp[col + count]; |
1379 | srp[col] = srp[col + count]; |
1379 | srp[col] = srp[col + count]; |
1380 | } |
1380 | } |
1381 | rxvt_blank_line(aR_ |
1381 | rxvt_blank_line(aR_ |
1382 | &(stp[R->TermWin.ncol - count]), |
1382 | &(stp[R->TermWin.ncol - count]), |
1383 | &(srp[R->TermWin.ncol - count]), |
1383 | &(srp[R->TermWin.ncol - count]), |
1384 | (unsigned int)count, tr); |
1384 | (unsigned int)count, tr); |
1385 | if (*slp == -1) /* break line continuation */ |
1385 | if (*slp == -1) /* break line continuation */ |
1386 | *slp = R->TermWin.ncol; |
1386 | *slp = R->TermWin.ncol; |
1387 | *slp -= count; |
1387 | *slp -= count; |
1388 | MAX_IT(*slp, 0); |
1388 | MAX_IT(*slp, 0); |
1389 | if (R->selection.op && R->current_screen == R->selection.screen |
1389 | if (R->selection.op && R->current_screen == R->selection.screen |
1390 | && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { |
1390 | && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { |
1391 | if (R->selection.end.row != R->screen.cur.row |
1391 | if (R->selection.end.row != R->screen.cur.row |
1392 | || (R->screen.cur.col >= R->selection.beg.col - count) |
1392 | || (R->screen.cur.col >= R->selection.beg.col - count) |
1393 | || R->selection.end.col >= R->TermWin.ncol) |
1393 | || R->selection.end.col >= R->TermWin.ncol) |
1394 | CLEAR_SELECTION(R); |
1394 | CLEAR_SELECTION(R); |
1395 | else { |
1395 | else { |
1396 | /* shift selection */ |
1396 | /* shift selection */ |
1397 | R->selection.beg.col -= count; |
1397 | R->selection.beg.col -= count; |
1398 | R->selection.mark.col -= count; /* XXX: yes? */ |
1398 | R->selection.mark.col -= count; /* XXX: yes? */ |
1399 | R->selection.end.col -= count; |
1399 | R->selection.end.col -= count; |
1400 | } |
1400 | } |
1401 | } |
1401 | } |
1402 | break; |
1402 | break; |
1403 | } |
1403 | } |
1404 | } |
1404 | } |
1405 | |
1405 | |
1406 | /* ------------------------------------------------------------------------- */ |
1406 | /* ------------------------------------------------------------------------- */ |
1407 | /* |
1407 | /* |
… | |
… | |
1413 | rxvt_scr_scroll_region(pR_ int top, int bot) |
1413 | rxvt_scr_scroll_region(pR_ int top, int bot) |
1414 | { |
1414 | { |
1415 | MAX_IT(top, 0); |
1415 | MAX_IT(top, 0); |
1416 | MIN_IT(bot, (int)R->TermWin.nrow - 1); |
1416 | MIN_IT(bot, (int)R->TermWin.nrow - 1); |
1417 | if (top > bot) |
1417 | if (top > bot) |
1418 | return; |
1418 | return; |
1419 | R->screen.tscroll = top; |
1419 | R->screen.tscroll = top; |
1420 | R->screen.bscroll = bot; |
1420 | R->screen.bscroll = bot; |
1421 | rxvt_scr_gotorc(aR_ 0, 0, 0); |
1421 | rxvt_scr_gotorc(aR_ 0, 0, 0); |
1422 | } |
1422 | } |
1423 | |
1423 | |
… | |
… | |
1431 | void |
1431 | void |
1432 | rxvt_scr_cursor_visible(pR_ int mode) |
1432 | rxvt_scr_cursor_visible(pR_ int mode) |
1433 | { |
1433 | { |
1434 | R->want_refresh = 1; |
1434 | R->want_refresh = 1; |
1435 | if (mode) |
1435 | if (mode) |
1436 | R->screen.flags |= Screen_VisibleCursor; |
1436 | R->screen.flags |= Screen_VisibleCursor; |
1437 | else |
1437 | else |
1438 | R->screen.flags &= ~Screen_VisibleCursor; |
1438 | R->screen.flags &= ~Screen_VisibleCursor; |
1439 | } |
1439 | } |
1440 | |
1440 | |
1441 | /* ------------------------------------------------------------------------- */ |
1441 | /* ------------------------------------------------------------------------- */ |
1442 | /* |
1442 | /* |
1443 | * Set/unset automatic wrapping |
1443 | * Set/unset automatic wrapping |
… | |
… | |
1447 | /* EXTPROTO */ |
1447 | /* EXTPROTO */ |
1448 | void |
1448 | void |
1449 | rxvt_scr_autowrap(pR_ int mode) |
1449 | rxvt_scr_autowrap(pR_ int mode) |
1450 | { |
1450 | { |
1451 | if (mode) |
1451 | if (mode) |
1452 | R->screen.flags |= Screen_Autowrap; |
1452 | R->screen.flags |= Screen_Autowrap; |
1453 | else |
1453 | else |
1454 | R->screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
1454 | R->screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
1455 | } |
1455 | } |
1456 | |
1456 | |
1457 | /* ------------------------------------------------------------------------- */ |
1457 | /* ------------------------------------------------------------------------- */ |
1458 | /* |
1458 | /* |
1459 | * Set/unset margin origin mode |
1459 | * Set/unset margin origin mode |
… | |
… | |
1467 | /* EXTPROTO */ |
1467 | /* EXTPROTO */ |
1468 | void |
1468 | void |
1469 | rxvt_scr_relative_origin(pR_ int mode) |
1469 | rxvt_scr_relative_origin(pR_ int mode) |
1470 | { |
1470 | { |
1471 | if (mode) |
1471 | if (mode) |
1472 | R->screen.flags |= Screen_Relative; |
1472 | R->screen.flags |= Screen_Relative; |
1473 | else |
1473 | else |
1474 | R->screen.flags &= ~Screen_Relative; |
1474 | R->screen.flags &= ~Screen_Relative; |
1475 | rxvt_scr_gotorc(aR_ 0, 0, 0); |
1475 | rxvt_scr_gotorc(aR_ 0, 0, 0); |
1476 | } |
1476 | } |
1477 | |
1477 | |
1478 | /* ------------------------------------------------------------------------- */ |
1478 | /* ------------------------------------------------------------------------- */ |
1479 | /* |
1479 | /* |
… | |
… | |
1484 | /* EXTPROTO */ |
1484 | /* EXTPROTO */ |
1485 | void |
1485 | void |
1486 | rxvt_scr_insert_mode(pR_ int mode) |
1486 | rxvt_scr_insert_mode(pR_ int mode) |
1487 | { |
1487 | { |
1488 | if (mode) |
1488 | if (mode) |
1489 | R->screen.flags |= Screen_Insert; |
1489 | R->screen.flags |= Screen_Insert; |
1490 | else |
1490 | else |
1491 | R->screen.flags &= ~Screen_Insert; |
1491 | R->screen.flags &= ~Screen_Insert; |
1492 | } |
1492 | } |
1493 | |
1493 | |
1494 | /* ------------------------------------------------------------------------- */ |
1494 | /* ------------------------------------------------------------------------- */ |
1495 | /* |
1495 | /* |
1496 | * Set/Unset tabs |
1496 | * Set/Unset tabs |
… | |
… | |
1501 | /* EXTPROTO */ |
1501 | /* EXTPROTO */ |
1502 | void |
1502 | void |
1503 | rxvt_scr_set_tab(pR_ int mode) |
1503 | rxvt_scr_set_tab(pR_ int mode) |
1504 | { |
1504 | { |
1505 | if (mode < 0) |
1505 | if (mode < 0) |
1506 | MEMSET(R->tabs, 0, R->TermWin.ncol * sizeof(char)); |
1506 | MEMSET(R->tabs, 0, R->TermWin.ncol * sizeof(char)); |
1507 | else if (R->screen.cur.col < R->TermWin.ncol) |
1507 | else if (R->screen.cur.col < R->TermWin.ncol) |
1508 | R->tabs[R->screen.cur.col] = (mode ? 1 : 0); |
1508 | R->tabs[R->screen.cur.col] = (mode ? 1 : 0); |
1509 | } |
1509 | } |
1510 | |
1510 | |
1511 | /* ------------------------------------------------------------------------- */ |
1511 | /* ------------------------------------------------------------------------- */ |
1512 | /* |
1512 | /* |
1513 | * Set reverse/normal video |
1513 | * Set reverse/normal video |
… | |
… | |
1519 | rxvt_scr_rvideo_mode(pR_ int mode) |
1519 | rxvt_scr_rvideo_mode(pR_ int mode) |
1520 | { |
1520 | { |
1521 | XGCValues gcvalue; |
1521 | XGCValues gcvalue; |
1522 | |
1522 | |
1523 | if (R->rvideo != mode) { |
1523 | if (R->rvideo != mode) { |
1524 | R->rvideo = mode; |
1524 | R->rvideo = mode; |
1525 | SWAP_IT(R->PixColors[Color_fg], R->PixColors[Color_bg], rxvt_color); |
1525 | SWAP_IT(R->PixColors[Color_fg], R->PixColors[Color_bg], rxvt_color); |
1526 | #if defined(XPM_BACKGROUND) |
1526 | #if defined(XPM_BACKGROUND) |
1527 | if (R->bgPixmap.pixmap == None) |
1527 | if (R->bgPixmap.pixmap == None) |
1528 | #endif |
1528 | #endif |
1529 | #if defined(TRANSPARENT) |
1529 | #if defined(TRANSPARENT) |
1530 | if (!(R->Options & Opt_transparent) || R->am_transparent == 0) |
1530 | if (!(R->Options & Opt_transparent) || R->am_transparent == 0) |
1531 | #endif |
1531 | #endif |
1532 | XSetWindowBackground(R->Xdisplay, R->TermWin.vt, |
1532 | XSetWindowBackground(R->Xdisplay, R->TermWin.vt, |
1533 | R->PixColors[Color_bg]); |
1533 | R->PixColors[Color_bg]); |
1534 | |
1534 | |
1535 | gcvalue.foreground = R->PixColors[Color_fg]; |
1535 | gcvalue.foreground = R->PixColors[Color_fg]; |
1536 | gcvalue.background = R->PixColors[Color_bg]; |
1536 | gcvalue.background = R->PixColors[Color_bg]; |
1537 | XChangeGC(R->Xdisplay, R->TermWin.gc, GCBackground | GCForeground, |
1537 | XChangeGC(R->Xdisplay, R->TermWin.gc, GCBackground | GCForeground, |
1538 | &gcvalue); |
1538 | &gcvalue); |
1539 | rxvt_scr_clear(aR); |
1539 | rxvt_scr_clear(aR); |
1540 | rxvt_scr_touch(aR_ True); |
1540 | rxvt_scr_touch(aR_ True); |
1541 | } |
1541 | } |
1542 | } |
1542 | } |
1543 | |
1543 | |
1544 | /* ------------------------------------------------------------------------- */ |
1544 | /* ------------------------------------------------------------------------- */ |
1545 | /* |
1545 | /* |
… | |
… | |
1549 | /* EXTPROTO */ |
1549 | /* EXTPROTO */ |
1550 | void |
1550 | void |
1551 | rxvt_scr_report_position(pR) |
1551 | rxvt_scr_report_position(pR) |
1552 | { |
1552 | { |
1553 | rxvt_tt_printf(aR_ "\033[%d;%dR", R->screen.cur.row + 1, |
1553 | rxvt_tt_printf(aR_ "\033[%d;%dR", R->screen.cur.row + 1, |
1554 | R->screen.cur.col + 1); |
1554 | R->screen.cur.col + 1); |
1555 | } |
1555 | } |
1556 | |
1556 | |
1557 | /* ------------------------------------------------------------------------- * |
1557 | /* ------------------------------------------------------------------------- * |
1558 | * FONTS * |
1558 | * FONTS * |
1559 | * ------------------------------------------------------------------------- */ |
1559 | * ------------------------------------------------------------------------- */ |
… | |
… | |
1564 | /* INTPROTO */ |
1564 | /* INTPROTO */ |
1565 | void |
1565 | void |
1566 | rxvt_set_font_style(pR) |
1566 | rxvt_set_font_style(pR) |
1567 | { |
1567 | { |
1568 | switch (R->charsets[R->screen.charset]) { |
1568 | switch (R->charsets[R->screen.charset]) { |
1569 | case '0': /* DEC Special Character & Line Drawing Set */ |
1569 | case '0': /* DEC Special Character & Line Drawing Set */ |
1570 | break; |
1570 | break; |
1571 | case 'A': /* United Kingdom (UK) */ |
1571 | case 'A': /* United Kingdom (UK) */ |
1572 | break; |
1572 | break; |
1573 | case 'B': /* United States (USASCII) */ |
1573 | case 'B': /* United States (USASCII) */ |
1574 | break; |
1574 | break; |
1575 | case '<': /* Multinational character set */ |
1575 | case '<': /* Multinational character set */ |
1576 | break; |
1576 | break; |
1577 | case '5': /* Finnish character set */ |
1577 | case '5': /* Finnish character set */ |
1578 | break; |
1578 | break; |
1579 | case 'C': /* Finnish character set */ |
1579 | case 'C': /* Finnish character set */ |
1580 | break; |
1580 | break; |
1581 | case 'K': /* German character set */ |
1581 | case 'K': /* German character set */ |
1582 | break; |
1582 | break; |
1583 | } |
1583 | } |
1584 | } |
1584 | } |
1585 | |
1585 | |
1586 | /* ------------------------------------------------------------------------- */ |
1586 | /* ------------------------------------------------------------------------- */ |
1587 | /* |
1587 | /* |
… | |
… | |
1656 | rxvt_scr_expose(pR_ int x, int y, int width, int height, Bool refresh) |
1656 | rxvt_scr_expose(pR_ int x, int y, int width, int height, Bool refresh) |
1657 | { |
1657 | { |
1658 | int i; |
1658 | int i; |
1659 | row_col_t rc[RC_COUNT]; |
1659 | row_col_t rc[RC_COUNT]; |
1660 | |
1660 | |
1661 | if (R->drawn_text == NULL) /* sanity check */ |
1661 | if (R->drawn_text == NULL) /* sanity check */ |
1662 | return; |
1662 | return; |
1663 | |
1663 | |
1664 | #ifdef DEBUG_STRICT |
1664 | #ifdef DEBUG_STRICT |
1665 | x = max(x, (int)R->TermWin.int_bwidth); |
1665 | x = max(x, (int)R->TermWin.int_bwidth); |
1666 | x = min(x, (int)R->TermWin.width); |
1666 | x = min(x, (int)R->TermWin.width); |
1667 | y = max(y, (int)R->TermWin.int_bwidth); |
1667 | y = max(y, (int)R->TermWin.int_bwidth); |
… | |
… | |
1675 | rc[PART_END].col = Pixel2Width(x + width + R->TermWin.fwidth - 1); |
1675 | rc[PART_END].col = Pixel2Width(x + width + R->TermWin.fwidth - 1); |
1676 | rc[PART_END].row = Pixel2Row(y + height + R->TermWin.fheight - 1); |
1676 | rc[PART_END].row = Pixel2Row(y + height + R->TermWin.fheight - 1); |
1677 | |
1677 | |
1678 | /* sanity checks */ |
1678 | /* sanity checks */ |
1679 | for (i = PART_BEG; i < RC_COUNT; i++) { |
1679 | for (i = PART_BEG; i < RC_COUNT; i++) { |
1680 | MIN_IT(rc[i].col, R->TermWin.ncol - 1); |
1680 | MIN_IT(rc[i].col, R->TermWin.ncol - 1); |
1681 | MIN_IT(rc[i].row, R->TermWin.nrow - 1); |
1681 | MIN_IT(rc[i].row, R->TermWin.nrow - 1); |
1682 | } |
1682 | } |
1683 | |
1683 | |
1684 | 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)); |
1684 | 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)); |
1685 | |
1685 | |
1686 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1686 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1687 | fill_text (&(R->drawn_text[i][rc[PART_BEG].col]), 0, |
1687 | fill_text (&(R->drawn_text[i][rc[PART_BEG].col]), 0, |
1688 | (rc[PART_END].col - rc[PART_BEG].col + 1)); |
1688 | (rc[PART_END].col - rc[PART_BEG].col + 1)); |
1689 | |
1689 | |
1690 | if (refresh) |
1690 | if (refresh) |
1691 | rxvt_scr_refresh(aR_ SLOW_REFRESH | REFRESH_BOUNDS); |
1691 | rxvt_scr_refresh(aR_ SLOW_REFRESH | REFRESH_BOUNDS); |
1692 | } |
1692 | } |
1693 | |
1693 | |
1694 | /* ------------------------------------------------------------------------- */ |
1694 | /* ------------------------------------------------------------------------- */ |
1695 | /* |
1695 | /* |
1696 | * Refresh the entire screen |
1696 | * Refresh the entire screen |
… | |
… | |
1714 | long p = 0; |
1714 | long p = 0; |
1715 | uint16_t oldviewstart; |
1715 | uint16_t oldviewstart; |
1716 | |
1716 | |
1717 | oldviewstart = R->TermWin.view_start; |
1717 | oldviewstart = R->TermWin.view_start; |
1718 | if (y < len) { |
1718 | if (y < len) { |
1719 | p = (R->TermWin.nrow + R->TermWin.nscrolled) * (len - y) / len; |
1719 | p = (R->TermWin.nrow + R->TermWin.nscrolled) * (len - y) / len; |
1720 | p -= (long)(R->TermWin.nrow - 1); |
1720 | p -= (long)(R->TermWin.nrow - 1); |
1721 | p = max(p, 0); |
1721 | p = max(p, 0); |
1722 | } |
1722 | } |
1723 | R->TermWin.view_start = (uint16_t)min(p, R->TermWin.nscrolled); |
1723 | R->TermWin.view_start = (uint16_t)min(p, R->TermWin.nscrolled); |
1724 | D_SCREEN((stderr, "rxvt_scr_move_to(%d, %d) view_start:%d", y, len, R->TermWin.view_start)); |
1724 | D_SCREEN((stderr, "rxvt_scr_move_to(%d, %d) view_start:%d", y, len, R->TermWin.view_start)); |
1725 | |
1725 | |
1726 | return rxvt_scr_changeview(aR_ oldviewstart); |
1726 | return rxvt_scr_changeview(aR_ oldviewstart); |
… | |
… | |
1742 | #ifdef DEBUG_STRICT |
1742 | #ifdef DEBUG_STRICT |
1743 | assert((nlines >= 0) && (nlines <= R->TermWin.nrow)); |
1743 | assert((nlines >= 0) && (nlines <= R->TermWin.nrow)); |
1744 | #endif |
1744 | #endif |
1745 | oldviewstart = R->TermWin.view_start; |
1745 | oldviewstart = R->TermWin.view_start; |
1746 | if (direction == UP) { |
1746 | if (direction == UP) { |
1747 | n = R->TermWin.view_start + nlines; |
1747 | n = R->TermWin.view_start + nlines; |
1748 | R->TermWin.view_start = min(n, R->TermWin.nscrolled); |
1748 | R->TermWin.view_start = min(n, R->TermWin.nscrolled); |
1749 | } else { |
1749 | } else { |
1750 | n = R->TermWin.view_start - nlines; |
1750 | n = R->TermWin.view_start - nlines; |
1751 | R->TermWin.view_start = max(n, 0); |
1751 | R->TermWin.view_start = max(n, 0); |
1752 | } |
1752 | } |
1753 | return rxvt_scr_changeview(aR_ oldviewstart); |
1753 | return rxvt_scr_changeview(aR_ oldviewstart); |
1754 | } |
1754 | } |
1755 | |
1755 | |
1756 | /* INTPROTO */ |
1756 | /* INTPROTO */ |
1757 | int |
1757 | int |
1758 | rxvt_scr_changeview(pR_ uint16_t oldviewstart) |
1758 | rxvt_scr_changeview(pR_ uint16_t oldviewstart) |
1759 | { |
1759 | { |
1760 | if (R->TermWin.view_start != oldviewstart) { |
1760 | if (R->TermWin.view_start != oldviewstart) { |
1761 | R->want_refresh = 1; |
1761 | R->want_refresh = 1; |
1762 | #ifdef RXVT_GRAPHICS |
1762 | #ifdef RXVT_GRAPHICS |
1763 | if (rxvt_Gr_Displayed(aR)) |
1763 | if (rxvt_Gr_Displayed(aR)) |
1764 | rxvt_Gr_scroll(aR_ 0); |
1764 | rxvt_Gr_scroll(aR_ 0); |
1765 | #endif |
1765 | #endif |
1766 | R->num_scr -= (R->TermWin.view_start - oldviewstart); |
1766 | R->num_scr -= (R->TermWin.view_start - oldviewstart); |
1767 | } |
1767 | } |
1768 | return (int)(R->TermWin.view_start - oldviewstart); |
1768 | return (int)(R->TermWin.view_start - oldviewstart); |
1769 | } |
1769 | } |
1770 | |
1770 | |
1771 | /* ------------------------------------------------------------------------- */ |
1771 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1776 | #ifndef NO_BELL |
1776 | #ifndef NO_BELL |
1777 | # ifndef NO_MAPALERT |
1777 | # ifndef NO_MAPALERT |
1778 | # ifdef MAPALERT_OPTION |
1778 | # ifdef MAPALERT_OPTION |
1779 | if (R->Options & Opt_mapAlert) |
1779 | if (R->Options & Opt_mapAlert) |
1780 | # endif |
1780 | # endif |
1781 | XMapWindow(R->Xdisplay, R->TermWin.parent[0]); |
1781 | XMapWindow(R->Xdisplay, R->TermWin.parent[0]); |
1782 | # endif |
1782 | # endif |
1783 | if (R->Options & Opt_visualBell) { |
1783 | if (R->Options & Opt_visualBell) { |
1784 | rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ |
1784 | rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ |
1785 | rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ |
1785 | rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ |
1786 | } else |
1786 | } else |
1787 | XBell(R->Xdisplay, 0); |
1787 | XBell(R->Xdisplay, 0); |
1788 | #endif |
1788 | #endif |
1789 | } |
1789 | } |
1790 | |
1790 | |
1791 | /* ------------------------------------------------------------------------- */ |
1791 | /* ------------------------------------------------------------------------- */ |
1792 | /* ARGSUSED */ |
1792 | /* ARGSUSED */ |
… | |
… | |
1798 | int i, r1, nrows, row_offset; |
1798 | int i, r1, nrows, row_offset; |
1799 | text_t *t; |
1799 | text_t *t; |
1800 | FILE *fd; |
1800 | FILE *fd; |
1801 | |
1801 | |
1802 | if ((fd = rxvt_popen_printer(aR)) == NULL) |
1802 | if ((fd = rxvt_popen_printer(aR)) == NULL) |
1803 | return; |
1803 | return; |
1804 | nrows = R->TermWin.nrow; |
1804 | nrows = R->TermWin.nrow; |
1805 | row_offset = R->TermWin.saveLines; |
1805 | row_offset = R->TermWin.saveLines; |
1806 | if (!fullhist) |
1806 | if (!fullhist) |
1807 | row_offset -= R->TermWin.view_start; |
1807 | row_offset -= R->TermWin.view_start; |
1808 | else { |
1808 | else { |
1809 | nrows += R->TermWin.nscrolled; |
1809 | nrows += R->TermWin.nscrolled; |
1810 | row_offset -= R->TermWin.nscrolled; |
1810 | row_offset -= R->TermWin.nscrolled; |
1811 | } |
1811 | } |
1812 | |
1812 | |
1813 | for (r1 = 0; r1 < nrows; r1++) { |
1813 | for (r1 = 0; r1 < nrows; r1++) { |
1814 | t = R->screen.text[r1 + row_offset]; |
1814 | t = R->screen.text[r1 + row_offset]; |
1815 | for (i = R->TermWin.ncol - 1; i >= 0; i--) |
1815 | for (i = R->TermWin.ncol - 1; i >= 0; i--) |
1816 | if (!isspace(t[i])) |
1816 | if (!isspace(t[i])) |
1817 | break; |
1817 | break; |
1818 | fprintf(fd, "%.*s\n", (i + 1), t); |
1818 | fprintf(fd, "%.*s\n", (i + 1), t); |
1819 | } |
1819 | } |
1820 | rxvt_pclose_printer(fd); |
1820 | rxvt_pclose_printer(fd); |
1821 | #endif |
1821 | #endif |
1822 | } |
1822 | } |
1823 | |
1823 | |
… | |
… | |
1827 | * R->drawn_text/R->drawn_rend contain the screen information before the update. |
1827 | * R->drawn_text/R->drawn_rend contain the screen information before the update. |
1828 | * R->screen.text/R->screen.rend contain what the screen will change to. |
1828 | * R->screen.text/R->screen.rend contain what the screen will change to. |
1829 | */ |
1829 | */ |
1830 | |
1830 | |
1831 | #if defined (NO_BRIGHTCOLOR) || defined (VERYBOLD) |
1831 | #if defined (NO_BRIGHTCOLOR) || defined (VERYBOLD) |
1832 | # define MONO_BOLD(x) ((x) & (RS_Bold|RS_Blink)) |
1832 | # define MONO_BOLD(x) ((x) & (RS_Bold|RS_Blink)) |
1833 | # define MONO_BOLD_FG(x, fg) MONO_BOLD(x) |
1833 | # define MONO_BOLD_FG(x, fg) MONO_BOLD(x) |
1834 | #else |
1834 | #else |
1835 | # define MONO_BOLD(x) \ |
1835 | # define MONO_BOLD(x) \ |
1836 | (((x) & (RS_Bold | RS_fgMask)) == (RS_Bold | Color_fg)) |
1836 | (((x) & (RS_Bold | RS_fgMask)) == (RS_Bold | Color_fg)) |
1837 | # define MONO_BOLD_FG(x, fg) (((x) & RS_Bold) && (fg) == Color_fg) |
1837 | # define MONO_BOLD_FG(x, fg) (((x) & RS_Bold) && (fg) == Color_fg) |
1838 | #endif |
1838 | #endif |
1839 | |
1839 | |
1840 | #define FONT_WIDTH(X, Y) \ |
1840 | #define FONT_WIDTH(X, Y) \ |
1841 | (X)->per_char[(Y) - (X)->min_char_or_byte2].width |
1841 | (X)->per_char[(Y) - (X)->min_char_or_byte2].width |
1842 | #define FONT_RBEAR(X, Y) \ |
1842 | #define FONT_RBEAR(X, Y) \ |
1843 | (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing |
1843 | (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing |
1844 | #define FONT_LBEAR(X, Y) \ |
1844 | #define FONT_LBEAR(X, Y) \ |
1845 | (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing |
1845 | (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing |
1846 | #define IS_FONT_CHAR(X, Y) \ |
1846 | #define IS_FONT_CHAR(X, Y) \ |
1847 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
1847 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
1848 | |
1848 | |
1849 | /* EXTPROTO */ |
1849 | /* EXTPROTO */ |
1850 | void |
1850 | void |
1851 | rxvt_scr_refresh(pR_ unsigned char refresh_type) |
1851 | rxvt_scr_refresh(pR_ unsigned char refresh_type) |
1852 | { |
1852 | { |
1853 | unsigned char clearfirst, /* first character writes before cell */ |
1853 | unsigned char clearfirst, /* first character writes before cell */ |
1854 | clearlast, /* last character writes beyond cell */ |
1854 | clearlast, /* last character writes beyond cell */ |
1855 | must_clear, /* use draw_string not draw_image_string */ |
1855 | must_clear, /* use draw_string not draw_image_string */ |
1856 | #ifndef NO_BOLDFONT |
1856 | #ifndef NO_BOLDFONT |
1857 | bfont, /* we've changed font to bold font */ |
1857 | bfont, /* we've changed font to bold font */ |
1858 | #endif |
1858 | #endif |
1859 | rvid, /* reverse video this position */ |
1859 | rvid, /* reverse video this position */ |
1860 | wbyte, /* we're in multibyte */ |
1860 | wbyte, /* we're in multibyte */ |
1861 | showcursor; /* show the cursor */ |
1861 | showcursor; /* show the cursor */ |
1862 | int fore, back; /* desired foreground/background */ |
1862 | int fore, back; /* desired foreground/background */ |
1863 | int16_t col, row, /* column/row we're processing */ |
1863 | int16_t col, row, /* column/row we're processing */ |
1864 | ocrow; /* old cursor row */ |
1864 | ocrow; /* old cursor row */ |
1865 | int cursorwidth; |
1865 | int cursorwidth; |
1866 | int i, /* tmp */ |
1866 | int i, /* tmp */ |
1867 | row_offset; /* basic offset in screen structure */ |
1867 | row_offset; /* basic offset in screen structure */ |
1868 | #ifndef NO_CURSORCOLOR |
1868 | #ifndef NO_CURSORCOLOR |
1869 | rend_t cc1; /* store colours at cursor position(s) */ |
1869 | rend_t cc1; /* store colours at cursor position(s) */ |
1870 | rend_t cc2; /* store colours at cursor position(s) */ |
1870 | rend_t cc2; /* store colours at cursor position(s) */ |
1871 | #endif |
1871 | #endif |
1872 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
1872 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
1873 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
1873 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
1874 | char *buffer; /* local copy of R->buffer */ |
1874 | char *buffer; /* local copy of R->buffer */ |
1875 | |
1875 | |
1876 | if (refresh_type == NO_REFRESH || !R->TermWin.mapped) |
1876 | if (refresh_type == NO_REFRESH || !R->TermWin.mapped) |
1877 | return; |
1877 | return; |
1878 | |
1878 | |
1879 | /* |
1879 | /* |
1880 | * A: set up vars |
1880 | * A: set up vars |
1881 | */ |
1881 | */ |
1882 | clearfirst = clearlast = must_clear = wbyte = 0; |
1882 | clearfirst = clearlast = must_clear = wbyte = 0; |
1883 | #ifndef NO_BOLDFONT |
1883 | #ifndef NO_BOLDFONT |
1884 | bfont = 0; |
1884 | bfont = 0; |
1885 | #endif |
1885 | #endif |
1886 | |
1886 | |
1887 | if (R->currmaxcol < R->TermWin.ncol) { |
1887 | if (R->currmaxcol < R->TermWin.ncol) |
|
|
1888 | { |
1888 | R->currmaxcol = R->TermWin.ncol; |
1889 | R->currmaxcol = R->TermWin.ncol; |
1889 | R->buffer = (char *)rxvt_realloc (R->buffer, |
1890 | R->buffer = (char *)rxvt_realloc (R->buffer, |
1890 | sizeof(char) * (R->currmaxcol + 1) * MB_CUR_MAX); |
1891 | sizeof(char) * (R->currmaxcol + 1) * MB_CUR_MAX); |
1891 | } |
1892 | } |
|
|
1893 | |
1892 | buffer = R->buffer; |
1894 | buffer = R->buffer; |
1893 | R->refresh_count = 0; |
1895 | R->refresh_count = 0; |
1894 | |
1896 | |
1895 | row_offset = R->TermWin.saveLines - R->TermWin.view_start; |
1897 | row_offset = R->TermWin.saveLines - R->TermWin.view_start; |
1896 | |
1898 | |
1897 | if ((refresh_type & REFRESH_BOUNDS)) { |
1899 | if ((refresh_type & REFRESH_BOUNDS)) |
|
|
1900 | { |
1898 | clearfirst = clearlast = 1; |
1901 | clearfirst = clearlast = 1; |
1899 | R->refresh_type &= ~REFRESH_BOUNDS; |
1902 | R->refresh_type &= ~REFRESH_BOUNDS; |
1900 | } |
1903 | } |
|
|
1904 | |
1901 | #if defined(XPM_BACKGROUND) |
1905 | #if defined(XPM_BACKGROUND) |
1902 | must_clear |= (R->bgPixmap.pixmap != None); |
1906 | must_clear |= (R->bgPixmap.pixmap != None); |
1903 | #endif |
1907 | #endif |
1904 | #if defined(TRANSPARENT) |
1908 | #if defined(TRANSPARENT) |
1905 | must_clear |= ((R->Options & Opt_transparent) && R->am_transparent); |
1909 | must_clear |= ((R->Options & Opt_transparent) && R->am_transparent); |
… | |
… | |
1913 | |
1917 | |
1914 | /* |
1918 | /* |
1915 | * C: set the cursor character(s) |
1919 | * C: set the cursor character(s) |
1916 | */ |
1920 | */ |
1917 | { |
1921 | { |
1918 | unsigned char setoldcursor; |
1922 | unsigned char setoldcursor; |
1919 | rend_t ccol1, /* Cursor colour */ |
1923 | rend_t ccol1, /* Cursor colour */ |
1920 | ccol2; /* Cursor colour2 */ |
1924 | ccol2; /* Cursor colour2 */ |
1921 | |
1925 | |
1922 | showcursor = (R->screen.flags & Screen_VisibleCursor); |
1926 | showcursor = (R->screen.flags & Screen_VisibleCursor); |
1923 | cursorwidth = 0; |
1927 | cursorwidth = 0; |
1924 | #ifdef CURSOR_BLINK |
1928 | #ifdef CURSOR_BLINK |
1925 | if (R->hidden_cursor) |
1929 | if (R->hidden_cursor) |
1926 | showcursor = 0; |
1930 | showcursor = 0; |
1927 | #endif |
1931 | #endif |
1928 | |
1932 | |
1929 | cursorwidth = 0; |
1933 | cursorwidth = 0; |
1930 | |
1934 | |
1931 | if (showcursor) |
1935 | if (showcursor) |
1932 | { |
1936 | { |
1933 | cursorwidth++; |
1937 | cursorwidth++; |
1934 | |
1938 | |
1935 | srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] |
1939 | srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] |
1936 | [R->screen.cur.col]); |
1940 | [R->screen.cur.col]); |
1937 | |
1941 | |
1938 | if (showcursor && R->TermWin.focus) |
1942 | if (showcursor && R->TermWin.focus) |
1939 | { |
1943 | { |
1940 | *srp ^= RS_RVid; |
1944 | *srp ^= RS_RVid; |
1941 | #ifndef NO_CURSORCOLOR |
1945 | #ifndef NO_CURSORCOLOR |
1942 | cc1 = *srp & (RS_fgMask | RS_bgMask); |
1946 | cc1 = *srp & (RS_fgMask | RS_bgMask); |
1943 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor)) |
1947 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor)) |
1944 | ccol1 = Color_cursor; |
1948 | ccol1 = Color_cursor; |
1945 | else |
1949 | else |
1946 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1950 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1947 | ccol1 = GET_FGCOLOR(R->rstyle); |
1951 | ccol1 = GET_FGCOLOR(R->rstyle); |
1948 | #else |
1952 | #else |
1949 | ccol1 = Color_fg; |
1953 | ccol1 = Color_fg; |
1950 | #endif |
1954 | #endif |
1951 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor2)) |
1955 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor2)) |
1952 | ccol2 = Color_cursor2; |
1956 | ccol2 = Color_cursor2; |
1953 | else |
1957 | else |
1954 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1958 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1955 | ccol2 = GET_BGCOLOR(R->rstyle); |
1959 | ccol2 = GET_BGCOLOR(R->rstyle); |
1956 | #else |
1960 | #else |
1957 | ccol2 = Color_bg; |
1961 | ccol2 = Color_bg; |
1958 | #endif |
1962 | #endif |
1959 | *srp = SET_FGCOLOR(*srp, ccol1); |
1963 | *srp = SET_FGCOLOR(*srp, ccol1); |
1960 | *srp = SET_BGCOLOR(*srp, ccol2); |
1964 | *srp = SET_BGCOLOR(*srp, ccol2); |
1961 | #endif |
1965 | #endif |
|
|
1966 | } |
|
|
1967 | |
|
|
1968 | while (IS_WIDE (*srp)) |
|
|
1969 | cursorwidth++, srp++; |
|
|
1970 | } |
|
|
1971 | |
|
|
1972 | /* make sure no outline cursor is left around */ |
|
|
1973 | setoldcursor = 0; |
|
|
1974 | if (ocrow != -1) { |
|
|
1975 | if (R->screen.cur.row + R->TermWin.view_start != ocrow |
|
|
1976 | || R->screen.cur.col != R->oldcursor.col) { |
|
|
1977 | if (ocrow < R->TermWin.nrow |
|
|
1978 | && R->oldcursor.col < R->TermWin.ncol) { |
|
|
1979 | R->drawn_rend[ocrow][R->oldcursor.col] ^= (RS_RVid | RS_Uline); |
1962 | } |
1980 | } |
1963 | |
1981 | if (R->TermWin.focus || !showcursor) |
1964 | while (IS_WIDE (*srp)) |
1982 | R->oldcursor.row = -1; |
1965 | cursorwidth++, srp++; |
1983 | else |
|
|
1984 | setoldcursor = 1; |
1966 | } |
1985 | } |
1967 | |
|
|
1968 | /* make sure no outline cursor is left around */ |
|
|
1969 | setoldcursor = 0; |
|
|
1970 | if (ocrow != -1) { |
|
|
1971 | if (R->screen.cur.row + R->TermWin.view_start != ocrow |
|
|
1972 | || R->screen.cur.col != R->oldcursor.col) { |
|
|
1973 | if (ocrow < R->TermWin.nrow |
|
|
1974 | && R->oldcursor.col < R->TermWin.ncol) { |
|
|
1975 | R->drawn_rend[ocrow][R->oldcursor.col] ^= (RS_RVid | RS_Uline); |
|
|
1976 | } |
|
|
1977 | if (R->TermWin.focus || !showcursor) |
|
|
1978 | R->oldcursor.row = -1; |
|
|
1979 | else |
|
|
1980 | setoldcursor = 1; |
|
|
1981 | } |
|
|
1982 | } else if (!R->TermWin.focus) |
1986 | } else if (!R->TermWin.focus) |
1983 | setoldcursor = 1; |
1987 | setoldcursor = 1; |
1984 | if (setoldcursor) { |
1988 | if (setoldcursor) { |
1985 | if (R->screen.cur.row + R->TermWin.view_start >= R->TermWin.nrow) |
1989 | if (R->screen.cur.row + R->TermWin.view_start >= R->TermWin.nrow) |
1986 | R->oldcursor.row = -1; |
1990 | R->oldcursor.row = -1; |
1987 | else { |
1991 | else { |
1988 | R->oldcursor.row = R->screen.cur.row + R->TermWin.view_start; |
1992 | R->oldcursor.row = R->screen.cur.row + R->TermWin.view_start; |
1989 | R->oldcursor.col = R->screen.cur.col; |
1993 | R->oldcursor.col = R->screen.cur.col; |
|
|
1994 | } |
1990 | } |
1995 | } |
1991 | } |
|
|
1992 | } |
1996 | } |
1993 | |
1997 | |
1994 | #ifndef NO_SLOW_LINK_SUPPORT |
1998 | #ifndef NO_SLOW_LINK_SUPPORT |
1995 | /* |
1999 | /* |
1996 | * D: CopyArea pass - very useful for slower links |
2000 | * D: CopyArea pass - very useful for slower links |
1997 | * This has been deliberately kept simple. |
2001 | * This has been deliberately kept simple. |
1998 | */ |
2002 | */ |
1999 | i = R->num_scr; |
2003 | i = R->num_scr; |
2000 | if (refresh_type == FAST_REFRESH && R->num_scr_allow && i |
2004 | if (refresh_type == FAST_REFRESH && R->num_scr_allow && i |
2001 | && abs(i) < R->TermWin.nrow && !must_clear) { |
2005 | && abs(i) < R->TermWin.nrow && !must_clear) |
|
|
2006 | { |
2002 | int16_t nits; |
2007 | int16_t nits; |
2003 | int j; |
2008 | int j; |
2004 | rend_t *drp2; |
2009 | rend_t *drp2; |
2005 | text_t *dtp2; |
2010 | text_t *dtp2; |
2006 | int len, wlen; |
2011 | int len, wlen; |
2007 | |
2012 | |
2008 | j = R->TermWin.nrow; |
2013 | j = R->TermWin.nrow; |
2009 | wlen = len = -1; |
2014 | wlen = len = -1; |
2010 | row = i > 0 ? 0 : j - 1; |
2015 | row = i > 0 ? 0 : j - 1; |
2011 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) { |
2016 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
|
|
2017 | { |
2012 | if (row + i >= 0 && row + i < R->TermWin.nrow && row + i != ocrow) { |
2018 | if (row + i >= 0 && row + i < R->TermWin.nrow && row + i != ocrow) |
|
|
2019 | { |
2013 | stp = R->screen.text[row + row_offset]; |
2020 | stp = R->screen.text[row + row_offset]; |
2014 | srp = R->screen.rend[row + row_offset]; |
2021 | srp = R->screen.rend[row + row_offset]; |
2015 | dtp = R->drawn_text[row]; |
2022 | dtp = R->drawn_text[row]; |
2016 | dtp2 = R->drawn_text[row + i]; |
2023 | dtp2 = R->drawn_text[row + i]; |
2017 | drp = R->drawn_rend[row]; |
2024 | drp = R->drawn_rend[row]; |
2018 | drp2 = R->drawn_rend[row + i]; |
2025 | drp2 = R->drawn_rend[row + i]; |
|
|
2026 | |
2019 | for (nits = 0, col = R->TermWin.ncol; col--; ) |
2027 | for (nits = 0, col = R->TermWin.ncol; col--; ) |
2020 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2028 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2021 | nits--; |
2029 | nits--; |
2022 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
2030 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
2023 | nits++; |
2031 | nits++; |
|
|
2032 | |
2024 | if (nits > 8) { /* XXX: arbitrary choice */ |
2033 | if (nits > 8) /* XXX: arbitrary choice */ |
|
|
2034 | { |
2025 | for (col = R->TermWin.ncol; col--; ) { |
2035 | for (col = R->TermWin.ncol; col--; ) |
2026 | *dtp++ = *dtp2++; |
2036 | { |
2027 | *drp++ = *drp2++; |
2037 | *dtp++ = *dtp2++; |
2028 | } |
2038 | *drp++ = *drp2++; |
2029 | if (len == -1) |
2039 | } |
2030 | len = row; |
2040 | |
2031 | wlen = row; |
2041 | if (len == -1) |
2032 | continue; |
2042 | len = row; |
2033 | } |
2043 | |
2034 | } |
2044 | wlen = row; |
|
|
2045 | continue; |
|
|
2046 | } |
|
|
2047 | } |
|
|
2048 | |
2035 | if (len != -1) { |
2049 | if (len != -1) |
|
|
2050 | { |
2036 | /* also comes here at end if needed because of >= above */ |
2051 | /* also comes here at end if needed because of >= above */ |
2037 | if (wlen < len) |
2052 | if (wlen < len) |
2038 | SWAP_IT(wlen, len, int); |
2053 | SWAP_IT(wlen, len, int); |
2039 | D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); |
2054 | D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); |
2040 | XCopyArea(R->Xdisplay, R->TermWin.vt, R->TermWin.vt, |
2055 | XCopyArea(R->Xdisplay, R->TermWin.vt, R->TermWin.vt, |
2041 | R->TermWin.gc, 0, Row2Pixel(len + i), |
2056 | R->TermWin.gc, 0, Row2Pixel(len + i), |
2042 | (unsigned int)TermWin_TotalWidth(), |
2057 | (unsigned int)TermWin_TotalWidth(), |
2043 | (unsigned int)Height2Pixel(wlen - len + 1), |
2058 | (unsigned int)Height2Pixel(wlen - len + 1), |
2044 | 0, Row2Pixel(len)); |
2059 | 0, Row2Pixel(len)); |
2045 | len = -1; |
2060 | len = -1; |
2046 | } |
2061 | } |
2047 | } |
2062 | } |
2048 | } |
2063 | } |
2049 | #endif |
2064 | #endif |
2050 | |
2065 | |
2051 | /* |
2066 | /* |
2052 | * E: main pass across every character |
2067 | * E: main pass across every character |
… | |
… | |
2059 | drp = R->drawn_rend[row]; |
2074 | drp = R->drawn_rend[row]; |
2060 | |
2075 | |
2061 | /* |
2076 | /* |
2062 | * E2: OK, now the real pass |
2077 | * E2: OK, now the real pass |
2063 | */ |
2078 | */ |
2064 | int ypixel = (int)Row2Pixel(row); |
2079 | int ypixel = (int)Row2Pixel(row); |
2065 | |
2080 | |
2066 | for (col = 0; col < R->TermWin.ncol; col++) { |
2081 | for (col = 0; col < R->TermWin.ncol; col++) |
|
|
2082 | { |
2067 | /* compare new text with old - if exactly the same then continue */ |
2083 | /* compare new text with old - if exactly the same then continue */ |
2068 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2084 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2069 | |
2085 | |
2070 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2086 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2071 | && (rend == drp[col] /* Either rendition the same or */ |
2087 | && (rend == drp[col] /* Either rendition the same or */ |
2072 | || (stp[col] == ' ' /* space w/ no background change */ |
2088 | || (stp[col] == ' ' /* space w/ no background change */ |
2073 | && GET_BGATTR(rend) == GET_BGATTR(drp[col])))) |
2089 | && GET_BGATTR(rend) == GET_BGATTR(drp[col])))) |
2074 | continue; |
2090 | continue; |
2075 | |
2091 | |
2076 | text_t *text = stp + col; |
2092 | text_t *text = stp + col; |
2077 | int count = 1; |
2093 | int count = 1; |
2078 | |
2094 | |
2079 | /* redraw one or more characters */ |
2095 | /* redraw one or more characters */ |
2080 | |
2096 | |
2081 | dtp[col] = stp[col]; |
2097 | dtp[col] = stp[col]; |
2082 | drp[col] = rend; |
2098 | drp[col] = rend; |
2083 | |
2099 | |
2084 | if (*text == NOCHAR) // never start redrawing at invisible characters. */ |
2100 | if (*text == NOCHAR) // never start redrawing at invisible characters. */ |
2085 | continue; |
2101 | continue; |
2086 | |
2102 | |
2087 | int xpixel = Col2Pixel(col); |
2103 | int xpixel = Col2Pixel(col); |
2088 | |
2104 | |
2089 | // this loop looks very messy, it can probably be optimized |
2105 | // this loop looks very messy, it can probably be optimized |
2090 | // and cleaned a bit by you? |
2106 | // and cleaned a bit by you? |
2091 | for (i = 0; ++col < R->TermWin.ncol; ) |
2107 | for (i = 0; ++col < R->TermWin.ncol; ) |
2092 | { |
2108 | { |
… | |
… | |
2119 | } |
2135 | } |
2120 | else if (must_clear || (stp[col] != ' ' && ++i >= 32)) |
2136 | else if (must_clear || (stp[col] != ' ' && ++i >= 32)) |
2121 | break; |
2137 | break; |
2122 | } |
2138 | } |
2123 | |
2139 | |
2124 | col--; /* went one too far. move back */ |
2140 | col--; /* went one too far. move back */ |
2125 | count -= i; /* dump any matching trailing chars */ |
2141 | count -= i; /* dump any matching trailing chars */ |
2126 | |
2142 | |
2127 | /* |
2143 | /* |
2128 | * Determine the attributes for the string |
2144 | * Determine the attributes for the string |
2129 | */ |
2145 | */ |
2130 | int fid = GET_FONT(rend); |
2146 | int fid = GET_FONT(rend); |
2131 | fore = GET_FGCOLOR(rend); |
2147 | fore = GET_FGCOLOR(rend); |
2132 | back = GET_BGCOLOR(rend); |
2148 | back = GET_BGCOLOR(rend); |
2133 | rend = GET_ATTR(rend); |
2149 | rend = GET_ATTR(rend); |
2134 | |
2150 | |
2135 | rvid = (rend & RS_RVid) ? 1 : 0; |
2151 | rvid = (rend & RS_RVid) ? 1 : 0; |
2136 | #ifdef OPTION_HC |
2152 | #ifdef OPTION_HC |
2137 | if (!rvid && (rend & RS_Blink)) |
2153 | if (!rvid && (rend & RS_Blink)) |
2138 | { |
2154 | { |
2139 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_HC)) |
2155 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_HC)) |
2140 | back = Color_HC; |
2156 | back = Color_HC; |
2141 | else |
2157 | else |
2142 | rvid = !rvid; /* fall back */ |
2158 | rvid = !rvid; /* fall back */ |
2143 | } |
2159 | } |
2144 | #endif |
2160 | #endif |
2145 | if (rvid) |
2161 | if (rvid) |
2146 | { |
2162 | { |
2147 | SWAP_IT(fore, back, int); |
2163 | SWAP_IT(fore, back, int); |
2148 | |
2164 | |
2149 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2165 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2150 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_RV) |
2166 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_RV) |
2151 | # ifndef NO_CURSORCOLOR |
2167 | # ifndef NO_CURSORCOLOR |
2152 | && !ISSET_PIXCOLOR(R, Color_cursor) |
2168 | && !ISSET_PIXCOLOR(R, Color_cursor) |
2153 | # endif |
2169 | # endif |
2154 | ) |
2170 | ) |
2155 | back = Color_RV; |
2171 | back = Color_RV; |
2156 | #endif |
2172 | #endif |
2157 | } |
2173 | } |
2158 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2174 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2159 | else if (rend & RS_Bold) |
2175 | else if (rend & RS_Bold) |
2160 | { |
2176 | { |
2161 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_BD)) |
2177 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_BD)) |
2162 | { |
2178 | { |
2163 | fore = Color_BD; |
2179 | fore = Color_BD; |
2164 | # ifndef VERYBOLD |
2180 | # ifndef VERYBOLD |
2165 | rend &= ~RS_Bold; /* we've taken care of it */ |
2181 | rend &= ~RS_Bold; /* we've taken care of it */ |
2166 | # endif |
2182 | # endif |
2167 | } |
2183 | } |
2168 | } |
2184 | } |
2169 | else if (rend & RS_Uline) |
2185 | else if (rend & RS_Uline) |
2170 | { |
2186 | { |
2171 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_UL)) |
2187 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_UL)) |
2172 | { |
2188 | { |
2173 | fore = Color_UL; |
2189 | fore = Color_UL; |
2174 | rend &= ~RS_Uline; /* we've taken care of it */ |
2190 | rend &= ~RS_Uline; /* we've taken care of it */ |
2175 | } |
2191 | } |
2176 | } |
2192 | } |
2177 | #endif |
2193 | #endif |
2178 | |
2194 | |
2179 | /* |
2195 | /* |
2180 | * Actually do the drawing of the string here |
2196 | * Actually do the drawing of the string here |
2181 | */ |
2197 | */ |
2182 | rxvt_font *font = (*R->TermWin.fontset)[fid]; |
2198 | rxvt_font *font = (*R->TermWin.fontset)[fid]; |
2183 | |
2199 | |
2184 | if (back == Color_bg) |
2200 | if (back == Color_bg) |
2185 | { |
2201 | { |
2186 | if (must_clear) |
2202 | if (must_clear) |
2187 | { |
2203 | { |
2188 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2204 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2189 | if (text[i] != ' ') { |
2205 | if (text[i] != ' ') |
|
|
2206 | { |
2190 | font->draw (xpixel, ypixel, text, count, fore, -1); |
2207 | font->draw (xpixel, ypixel, text, count, fore, -1); |
2191 | goto nodraw; |
2208 | goto nodraw; |
2192 | } |
2209 | } |
|
|
2210 | |
2193 | CLEAR_CHARS(xpixel, ypixel, count); |
2211 | CLEAR_CHARS(xpixel, ypixel, count); |
2194 | nodraw: ; |
2212 | nodraw: ; |
2195 | } |
2213 | } |
2196 | else |
2214 | else |
2197 | font->draw (xpixel, ypixel, text, count, fore, Color_bg); |
2215 | font->draw (xpixel, ypixel, text, count, fore, Color_bg); |
2198 | } else |
2216 | } |
|
|
2217 | else |
2199 | font->draw (xpixel, ypixel, text, count, fore, back); |
2218 | font->draw (xpixel, ypixel, text, count, fore, back); |
2200 | |
2219 | |
2201 | if ((rend & RS_Uline) && (font->descent > 1)) |
2220 | if ((rend & RS_Uline) && (font->descent > 1)) |
2202 | XDrawLine(R->Xdisplay, drawBuffer, R->TermWin.gc, |
2221 | XDrawLine(R->Xdisplay, drawBuffer, R->TermWin.gc, |
2203 | xpixel, ypixel + font->ascent + 1, |
2222 | xpixel, ypixel + font->ascent + 1, |
2204 | xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); |
2223 | xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); |
2205 | } /* for (col....) */ |
2224 | } /* for (col....) */ |
2206 | } /* for (row....) */ |
2225 | } /* for (row....) */ |
2207 | |
2226 | |
2208 | /* |
2227 | /* |
2209 | * G: cleanup cursor and display outline cursor if necessary |
2228 | * G: cleanup cursor and display outline cursor if necessary |
2210 | */ |
2229 | */ |
2211 | if (showcursor) { |
2230 | if (showcursor) { |
2212 | if (R->TermWin.focus) { |
2231 | if (R->TermWin.focus) { |
2213 | srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] |
2232 | srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] |
2214 | [R->screen.cur.col]); |
2233 | [R->screen.cur.col]); |
2215 | *srp ^= RS_RVid; |
2234 | *srp ^= RS_RVid; |
2216 | #ifndef NO_CURSORCOLOR |
2235 | #ifndef NO_CURSORCOLOR |
2217 | *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1; |
2236 | *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1; |
2218 | #endif |
2237 | #endif |
2219 | } else if (R->oldcursor.row >= 0) { |
2238 | } else if (R->oldcursor.row >= 0) { |
2220 | #ifndef NO_CURSORCOLOR |
2239 | #ifndef NO_CURSORCOLOR |
2221 | unsigned long gcmask; /* Graphics Context mask */ |
2240 | unsigned long gcmask; /* Graphics Context mask */ |
2222 | |
2241 | |
2223 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor)) { |
2242 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor)) { |
2224 | XSetForeground (R->Xdisplay, R->TermWin.gc, R->PixColors[Color_cursor]); |
2243 | XSetForeground (R->Xdisplay, R->TermWin.gc, R->PixColors[Color_cursor]); |
2225 | } |
2244 | } |
2226 | #endif |
2245 | #endif |
2227 | XDrawRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, |
2246 | XDrawRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, |
2228 | Col2Pixel(R->oldcursor.col), |
2247 | Col2Pixel(R->oldcursor.col), |
2229 | Row2Pixel(R->oldcursor.row), |
2248 | Row2Pixel(R->oldcursor.row), |
2230 | (unsigned int)(Width2Pixel(cursorwidth) - 1), |
2249 | (unsigned int)(Width2Pixel(cursorwidth) - 1), |
2231 | (unsigned int)(Height2Pixel(1) - R->TermWin.lineSpace - 1)); |
2250 | (unsigned int)(Height2Pixel(1) - R->TermWin.lineSpace - 1)); |
2232 | } |
2251 | } |
2233 | } |
2252 | } |
2234 | /* |
2253 | /* |
2235 | * H: cleanup selection |
2254 | * H: cleanup selection |
2236 | */ |
2255 | */ |
2237 | rxvt_scr_reverse_selection(aR); |
2256 | rxvt_scr_reverse_selection(aR); |
2238 | |
2257 | |
2239 | /* |
2258 | /* |
2240 | * I: other general cleanup |
2259 | * I: other general cleanup |
2241 | */ |
2260 | */ |
2242 | if (clearfirst && R->TermWin.int_bwidth) |
2261 | if (clearfirst && R->TermWin.int_bwidth) |
2243 | /* |
2262 | /* |
2244 | * clear the whole screen height, note that width == 0 is treated |
2263 | * clear the whole screen height, note that width == 0 is treated |
2245 | * specially by XClearArea |
2264 | * specially by XClearArea |
2246 | */ |
2265 | */ |
2247 | XClearArea(R->Xdisplay, R->TermWin.vt, 0, 0, |
2266 | XClearArea(R->Xdisplay, R->TermWin.vt, 0, 0, |
2248 | (unsigned int)R->TermWin.int_bwidth, |
2267 | (unsigned int)R->TermWin.int_bwidth, |
2249 | (unsigned int)TermWin_TotalHeight(), False); |
2268 | (unsigned int)TermWin_TotalHeight(), False); |
2250 | if (clearlast && R->TermWin.int_bwidth) |
2269 | if (clearlast && R->TermWin.int_bwidth) |
2251 | /* |
2270 | /* |
2252 | * clear the whole screen height, note that width == 0 is treated |
2271 | * clear the whole screen height, note that width == 0 is treated |
2253 | * specially by XClearArea |
2272 | * specially by XClearArea |
2254 | */ |
2273 | */ |
2255 | XClearArea(R->Xdisplay, R->TermWin.vt, |
2274 | XClearArea(R->Xdisplay, R->TermWin.vt, |
2256 | R->TermWin.width + R->TermWin.int_bwidth, 0, |
2275 | R->TermWin.width + R->TermWin.int_bwidth, 0, |
2257 | (unsigned int)R->TermWin.int_bwidth, |
2276 | (unsigned int)R->TermWin.int_bwidth, |
2258 | (unsigned int)TermWin_TotalHeight(), False); |
2277 | (unsigned int)TermWin_TotalHeight(), False); |
2259 | if (refresh_type & SMOOTH_REFRESH) |
2278 | if (refresh_type & SMOOTH_REFRESH) |
2260 | XSync(R->Xdisplay, False); |
2279 | XSync(R->Xdisplay, False); |
2261 | |
2280 | |
2262 | R->num_scr = 0; |
2281 | R->num_scr = 0; |
2263 | R->num_scr_allow = 1; |
2282 | R->num_scr_allow = 1; |
2264 | R->want_refresh = 0; /* screen is current */ |
2283 | R->want_refresh = 0; /* screen is current */ |
2265 | } |
2284 | } |
2266 | /* ------------------------------------------------------------------------- */ |
2285 | /* ------------------------------------------------------------------------- */ |
2267 | |
2286 | |
2268 | /* EXTPROTO */ |
2287 | /* EXTPROTO */ |
2269 | void |
2288 | void |
2270 | rxvt_scr_clear(pR) |
2289 | rxvt_scr_clear(pR) |
2271 | { |
2290 | { |
2272 | if (!R->TermWin.mapped) |
2291 | if (!R->TermWin.mapped) |
2273 | return; |
2292 | return; |
2274 | R->num_scr_allow = 0; |
2293 | R->num_scr_allow = 0; |
2275 | R->want_refresh = 1; |
2294 | R->want_refresh = 1; |
2276 | #ifdef TRANSPARENT |
2295 | #ifdef TRANSPARENT |
2277 | if ((R->Options & Opt_transparent) && (R->am_pixmap_trans == 0)) { |
2296 | if ((R->Options & Opt_transparent) && (R->am_pixmap_trans == 0)) { |
2278 | int i; |
2297 | int i; |
2279 | |
2298 | |
2280 | if (!(R->Options & Opt_transparent_all)) |
2299 | if (!(R->Options & Opt_transparent_all)) |
2281 | i = 0; |
2300 | i = 0; |
2282 | else |
2301 | else |
2283 | i = (int)(sizeof(R->TermWin.parent) / sizeof(Window)); |
2302 | i = (int)(sizeof(R->TermWin.parent) / sizeof(Window)); |
2284 | for (; i--;) |
2303 | for (; i--;) |
2285 | if (R->TermWin.parent[i] != None) |
2304 | if (R->TermWin.parent[i] != None) |
2286 | XClearWindow(R->Xdisplay, R->TermWin.parent[i]); |
2305 | XClearWindow(R->Xdisplay, R->TermWin.parent[i]); |
2287 | } |
2306 | } |
2288 | #endif |
2307 | #endif |
2289 | XClearWindow(R->Xdisplay, R->TermWin.vt); |
2308 | XClearWindow(R->Xdisplay, R->TermWin.vt); |
2290 | } |
2309 | } |
2291 | |
2310 | |
… | |
… | |
2296 | { |
2315 | { |
2297 | int i, col, row, end_row; |
2316 | int i, col, row, end_row; |
2298 | rend_t *srp; |
2317 | rend_t *srp; |
2299 | |
2318 | |
2300 | if (R->selection.op && R->current_screen == R->selection.screen) { |
2319 | if (R->selection.op && R->current_screen == R->selection.screen) { |
2301 | end_row = R->TermWin.saveLines - R->TermWin.view_start; |
2320 | end_row = R->TermWin.saveLines - R->TermWin.view_start; |
2302 | i = R->selection.beg.row + R->TermWin.saveLines; |
2321 | i = R->selection.beg.row + R->TermWin.saveLines; |
2303 | row = R->selection.end.row + R->TermWin.saveLines; |
2322 | row = R->selection.end.row + R->TermWin.saveLines; |
2304 | if (i >= end_row) |
2323 | if (i >= end_row) |
2305 | col = R->selection.beg.col; |
2324 | col = R->selection.beg.col; |
2306 | else { |
2325 | else { |
2307 | col = 0; |
2326 | col = 0; |
2308 | i = end_row; |
2327 | i = end_row; |
2309 | } |
2328 | } |
2310 | end_row += R->TermWin.nrow; |
2329 | end_row += R->TermWin.nrow; |
2311 | for (; i < row && i < end_row; i++, col = 0) |
2330 | for (; i < row && i < end_row; i++, col = 0) |
2312 | for (srp = R->screen.rend[i]; col < R->TermWin.ncol; col++) |
2331 | for (srp = R->screen.rend[i]; col < R->TermWin.ncol; col++) |
2313 | #ifndef OPTION_HC |
2332 | #ifndef OPTION_HC |
2314 | srp[col] ^= RS_RVid; |
2333 | srp[col] ^= RS_RVid; |
2315 | #else |
2334 | #else |
2316 | srp[col] ^= RS_Blink; |
2335 | srp[col] ^= RS_Blink; |
2317 | #endif |
2336 | #endif |
2318 | if (i == row && i < end_row) |
2337 | if (i == row && i < end_row) |
2319 | for (srp = R->screen.rend[i]; col < R->selection.end.col; col++) |
2338 | for (srp = R->screen.rend[i]; col < R->selection.end.col; col++) |
2320 | #ifndef OPTION_HC |
2339 | #ifndef OPTION_HC |
2321 | srp[col] ^= RS_RVid; |
2340 | srp[col] ^= RS_RVid; |
2322 | #else |
2341 | #else |
2323 | srp[col] ^= RS_Blink; |
2342 | srp[col] ^= RS_Blink; |
2324 | #endif |
2343 | #endif |
2325 | } |
2344 | } |
2326 | } |
2345 | } |
2327 | |
2346 | |
2328 | /* ------------------------------------------------------------------------- */ |
2347 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
2338 | int row, wrote; |
2357 | int row, wrote; |
2339 | unsigned int width, towrite; |
2358 | unsigned int width, towrite; |
2340 | char r1[] = "\n"; |
2359 | char r1[] = "\n"; |
2341 | |
2360 | |
2342 | for (row = R->TermWin.saveLines - R->TermWin.nscrolled; |
2361 | for (row = R->TermWin.saveLines - R->TermWin.nscrolled; |
2343 | row < R->TermWin.saveLines + R->TermWin.nrow - 1; row++) { |
2362 | row < R->TermWin.saveLines + R->TermWin.nrow - 1; row++) { |
2344 | width = R->screen.tlen[row] >= 0 ? R->screen.tlen[row] |
2363 | width = R->screen.tlen[row] >= 0 ? R->screen.tlen[row] |
2345 | : R->TermWin.ncol; |
2364 | : R->TermWin.ncol; |
2346 | for (towrite = width; towrite; towrite -= wrote) { |
2365 | for (towrite = width; towrite; towrite -= wrote) { |
2347 | wrote = write(fd, &(R->screen.text[row][width - towrite]), |
2366 | wrote = write(fd, &(R->screen.text[row][width - towrite]), |
2348 | towrite); |
2367 | towrite); |
2349 | if (wrote < 0) |
2368 | if (wrote < 0) |
2350 | return; /* XXX: death, no report */ |
2369 | return; /* XXX: death, no report */ |
2351 | } |
2370 | } |
2352 | if (R->screen.tlen[row] >= 0) |
2371 | if (R->screen.tlen[row] >= 0) |
2353 | if (write(fd, r1, 1) <= 0) |
2372 | if (write(fd, r1, 1) <= 0) |
2354 | return; /* XXX: death, no report */ |
2373 | return; /* XXX: death, no report */ |
2355 | } |
2374 | } |
2356 | } |
2375 | } |
2357 | #endif |
2376 | #endif |
2358 | |
2377 | |
2359 | /* ------------------------------------------------------------------------- * |
2378 | /* ------------------------------------------------------------------------- * |
… | |
… | |
2368 | rxvt_selection_check(pR_ int check_more) |
2387 | rxvt_selection_check(pR_ int check_more) |
2369 | { |
2388 | { |
2370 | row_col_t pos; |
2389 | row_col_t pos; |
2371 | |
2390 | |
2372 | if (!R->selection.op) |
2391 | if (!R->selection.op) |
2373 | return; |
2392 | return; |
2374 | |
2393 | |
2375 | pos.row = pos.col = 0; |
2394 | pos.row = pos.col = 0; |
2376 | if ((R->selection.beg.row < -(int32_t)R->TermWin.nscrolled) |
2395 | if ((R->selection.beg.row < -(int32_t)R->TermWin.nscrolled) |
2377 | || (R->selection.beg.row >= R->TermWin.nrow) |
2396 | || (R->selection.beg.row >= R->TermWin.nrow) |
2378 | || (R->selection.mark.row < -(int32_t)R->TermWin.nscrolled) |
2397 | || (R->selection.mark.row < -(int32_t)R->TermWin.nscrolled) |
2379 | || (R->selection.mark.row >= R->TermWin.nrow) |
2398 | || (R->selection.mark.row >= R->TermWin.nrow) |
2380 | || (R->selection.end.row < -(int32_t)R->TermWin.nscrolled) |
2399 | || (R->selection.end.row < -(int32_t)R->TermWin.nscrolled) |
2381 | || (R->selection.end.row >= R->TermWin.nrow) |
2400 | || (R->selection.end.row >= R->TermWin.nrow) |
2382 | || (check_more == 1 |
2401 | || (check_more == 1 |
2383 | && R->current_screen == R->selection.screen |
2402 | && R->current_screen == R->selection.screen |
2384 | && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) |
2403 | && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) |
2385 | && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) |
2404 | && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) |
2386 | || (check_more == 2 |
2405 | || (check_more == 2 |
2387 | && ROWCOL_IS_BEFORE(R->selection.beg, pos) |
2406 | && ROWCOL_IS_BEFORE(R->selection.beg, pos) |
2388 | && ROWCOL_IS_AFTER(R->selection.end, pos)) |
2407 | && ROWCOL_IS_AFTER(R->selection.end, pos)) |
2389 | || (check_more == 3 |
2408 | || (check_more == 3 |
2390 | && ROWCOL_IS_AFTER(R->selection.end, pos)) |
2409 | && ROWCOL_IS_AFTER(R->selection.end, pos)) |
2391 | || (check_more == 4 /* screen width change */ |
2410 | || (check_more == 4 /* screen width change */ |
2392 | && (R->selection.beg.row != R->selection.end.row |
2411 | && (R->selection.beg.row != R->selection.end.row |
2393 | || R->selection.end.col > R->TermWin.ncol))) |
2412 | || R->selection.end.col > R->TermWin.ncol))) |
2394 | CLEAR_SELECTION(R); |
2413 | CLEAR_SELECTION(R); |
2395 | } |
2414 | } |
2396 | |
2415 | |
2397 | /* ------------------------------------------------------------------------- */ |
2416 | /* ------------------------------------------------------------------------- */ |
2398 | /* |
2417 | /* |
2399 | * Paste a selection direct to the command fd |
2418 | * Paste a selection direct to the command fd |
… | |
… | |
2405 | unsigned int i, j, n; |
2424 | unsigned int i, j, n; |
2406 | unsigned char *ds = (unsigned char *)rxvt_malloc(PROP_SIZE); |
2425 | unsigned char *ds = (unsigned char *)rxvt_malloc(PROP_SIZE); |
2407 | |
2426 | |
2408 | /* convert normal newline chars into common keyboard Return key sequence */ |
2427 | /* convert normal newline chars into common keyboard Return key sequence */ |
2409 | for (i = 0; i < nitems; i += PROP_SIZE) { |
2428 | for (i = 0; i < nitems; i += PROP_SIZE) { |
2410 | n = min(nitems - i, PROP_SIZE); |
2429 | n = min(nitems - i, PROP_SIZE); |
2411 | MEMCPY(ds, data + i, n); |
2430 | MEMCPY(ds, data + i, n); |
2412 | for (j = 0; j < n; j++) |
2431 | for (j = 0; j < n; j++) |
2413 | if (ds[j] == '\n') |
2432 | if (ds[j] == '\n') |
2414 | ds[j] = '\r'; |
2433 | ds[j] = '\r'; |
2415 | rxvt_tt_write(aR_ ds, (int)n); |
2434 | rxvt_tt_write(aR_ ds, (int)n); |
2416 | } |
2435 | } |
2417 | free(ds); |
2436 | free(ds); |
2418 | } |
2437 | } |
2419 | |
2438 | |
2420 | /* ------------------------------------------------------------------------- */ |
2439 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
2434 | char **cl; |
2453 | char **cl; |
2435 | #endif |
2454 | #endif |
2436 | |
2455 | |
2437 | D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait)); |
2456 | D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait)); |
2438 | |
2457 | |
2439 | if (prop == None) { /* check for failed XConvertSelection */ |
2458 | if (prop == None) { /* check for failed XConvertSelection */ |
2440 | #ifdef MULTICHAR_SET |
2459 | #ifdef MULTICHAR_SET |
2441 | if ((R->selection_type & Sel_CompoundText)) { |
2460 | if ((R->selection_type & Sel_CompoundText)) { |
2442 | int selnum = R->selection_type & Sel_whereMask; |
2461 | int selnum = R->selection_type & Sel_whereMask; |
2443 | |
2462 | |
2444 | R->selection_type = 0; |
2463 | R->selection_type = 0; |
2445 | if (selnum != Sel_direct) |
2464 | if (selnum != Sel_direct) |
2446 | rxvt_selection_request_other(aR_ XA_STRING, selnum); |
2465 | rxvt_selection_request_other(aR_ XA_STRING, selnum); |
2447 | } |
2466 | } |
2448 | #endif |
2467 | #endif |
2449 | return 0; |
2468 | return 0; |
2450 | } |
2469 | } |
2451 | for (;;) { |
2470 | for (;;) { |
2452 | if (XGetWindowProperty(R->Xdisplay, win, prop, (long)(nread / 4), |
2471 | if (XGetWindowProperty(R->Xdisplay, win, prop, (long)(nread / 4), |
2453 | (long)(PROP_SIZE / 4), delete_prop, |
2472 | (long)(PROP_SIZE / 4), delete_prop, |
2454 | AnyPropertyType, &ct.encoding, &ct.format, |
2473 | AnyPropertyType, &ct.encoding, &ct.format, |
2455 | &ct.nitems, &bytes_after, |
2474 | &ct.nitems, &bytes_after, |
2456 | &ct.value) != Success) |
2475 | &ct.value) != Success) |
2457 | break; |
2476 | break; |
2458 | if (ct.encoding == 0) { |
2477 | if (ct.encoding == 0) { |
2459 | D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); |
2478 | D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); |
2460 | break; |
2479 | break; |
2461 | } |
2480 | } |
2462 | if (ct.value == NULL) { |
2481 | if (ct.value == NULL) { |
2463 | D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!")); |
2482 | D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!")); |
2464 | continue; |
2483 | continue; |
2465 | } |
2484 | } |
2466 | if (ct.nitems == 0) { |
2485 | if (ct.nitems == 0) { |
2467 | D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
2486 | D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
2468 | if (R->selection_wait == Sel_normal && nread == 0) { |
2487 | if (R->selection_wait == Sel_normal && nread == 0) { |
2469 | /* |
2488 | /* |
2470 | * pass through again trying CUT_BUFFER0 if we've come from |
2489 | * pass through again trying CUT_BUFFER0 if we've come from |
2471 | * XConvertSelection() but nothing was presented |
2490 | * XConvertSelection() but nothing was presented |
2472 | */ |
2491 | */ |
2473 | D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2492 | D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2474 | rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); |
2493 | rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); |
2475 | } |
2494 | } |
2476 | nread = -1; /* discount any previous stuff */ |
2495 | nread = -1; /* discount any previous stuff */ |
2477 | break; |
2496 | break; |
2478 | } |
2497 | } |
2479 | nread += ct.nitems; |
2498 | nread += ct.nitems; |
2480 | #ifdef MULTICHAR_SET |
2499 | #ifdef MULTICHAR_SET |
2481 | if (XmbTextPropertyToTextList(R->Xdisplay, &ct, &cl, |
2500 | if (XmbTextPropertyToTextList(R->Xdisplay, &ct, &cl, |
2482 | &dummy_count) == Success && cl) { |
2501 | &dummy_count) == Success && cl) { |
2483 | rxvt_PasteIt(aR_ cl[0], STRLEN(cl[0])); |
2502 | rxvt_PasteIt(aR_ cl[0], STRLEN(cl[0])); |
2484 | XFreeStringList(cl); |
2503 | XFreeStringList(cl); |
2485 | } else |
2504 | } else |
2486 | #endif |
2505 | #endif |
2487 | rxvt_PasteIt(aR_ ct.value, (unsigned int)ct.nitems); |
2506 | rxvt_PasteIt(aR_ ct.value, (unsigned int)ct.nitems); |
2488 | if (bytes_after == 0) |
2507 | if (bytes_after == 0) |
2489 | break; |
2508 | break; |
2490 | XFree(ct.value); |
2509 | XFree(ct.value); |
2491 | } |
2510 | } |
2492 | if (ct.value) |
2511 | if (ct.value) |
2493 | XFree(ct.value); |
2512 | XFree(ct.value); |
2494 | if (R->selection_wait == Sel_normal) |
2513 | if (R->selection_wait == Sel_normal) |
2495 | R->selection_wait = Sel_none; |
2514 | R->selection_wait = Sel_none; |
2496 | D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); |
2515 | D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); |
2497 | return (int)nread; |
2516 | return (int)nread; |
2498 | } |
2517 | } |
2499 | |
2518 | |
2500 | /* |
2519 | /* |
… | |
… | |
2505 | rxvt_selection_property(pR_ Window win, Atom prop) |
2524 | rxvt_selection_property(pR_ Window win, Atom prop) |
2506 | { |
2525 | { |
2507 | int reget_time = 0; |
2526 | int reget_time = 0; |
2508 | |
2527 | |
2509 | if (prop == None) |
2528 | if (prop == None) |
2510 | return; |
2529 | return; |
2511 | D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop)); |
2530 | D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop)); |
2512 | if (R->selection_wait == Sel_normal) { |
2531 | if (R->selection_wait == Sel_normal) { |
2513 | int a, afmt; |
2532 | int a, afmt; |
2514 | Atom atype; |
2533 | Atom atype; |
2515 | unsigned long bytes_after, nitems; |
2534 | unsigned long bytes_after, nitems; |
2516 | unsigned char *s = NULL; |
2535 | unsigned char *s = NULL; |
2517 | |
2536 | |
2518 | a = XGetWindowProperty(R->Xdisplay, win, prop, 0L, 1L, False, |
2537 | a = XGetWindowProperty(R->Xdisplay, win, prop, 0L, 1L, False, |
2519 | R->xa[XA_INCR], &atype, &afmt, &nitems, |
2538 | R->xa[XA_INCR], &atype, &afmt, &nitems, |
2520 | &bytes_after, &s); |
2539 | &bytes_after, &s); |
2521 | if (s) |
2540 | if (s) |
2522 | XFree(s); |
2541 | XFree(s); |
2523 | if (a != Success) |
2542 | if (a != Success) |
2524 | return; |
2543 | return; |
2525 | #ifndef __CYGWIN32__ |
2544 | #ifndef __CYGWIN32__ |
2526 | if (atype == R->xa[XA_INCR]) { /* start an INCR transfer */ |
2545 | if (atype == R->xa[XA_INCR]) { /* start an INCR transfer */ |
2527 | D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer")); |
2546 | D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer")); |
2528 | XDeleteProperty(R->Xdisplay, win, prop); |
2547 | XDeleteProperty(R->Xdisplay, win, prop); |
2529 | XFlush(R->Xdisplay); |
2548 | XFlush(R->Xdisplay); |
2530 | reget_time = 1; |
2549 | reget_time = 1; |
2531 | R->selection_wait = Sel_incr; |
2550 | R->selection_wait = Sel_incr; |
2532 | } |
2551 | } |
2533 | #endif |
2552 | #endif |
2534 | } else if (R->selection_wait == Sel_incr) { |
2553 | } else if (R->selection_wait == Sel_incr) { |
2535 | reget_time = 1; |
2554 | reget_time = 1; |
2536 | if (rxvt_selection_paste(aR_ win, prop, True) == -1) { |
2555 | if (rxvt_selection_paste(aR_ win, prop, True) == -1) { |
2537 | D_SELECT((stderr, "rxvt_selection_property: INCR: clean end")); |
2556 | D_SELECT((stderr, "rxvt_selection_property: INCR: clean end")); |
2538 | R->selection_wait = Sel_none; |
2557 | R->selection_wait = Sel_none; |
2539 | R->timeout[TIMEOUT_INCR].tv_sec = 0; /* turn off timer */ |
2558 | R->timeout[TIMEOUT_INCR].tv_sec = 0; /* turn off timer */ |
2540 | } |
2559 | } |
2541 | } |
2560 | } |
2542 | if (reget_time) { /* received more data so reget time */ |
2561 | if (reget_time) { /* received more data so reget time */ |
2543 | (void)gettimeofday(&(R->timeout[TIMEOUT_INCR]), NULL); |
2562 | (void)gettimeofday(&(R->timeout[TIMEOUT_INCR]), NULL); |
2544 | R->timeout[TIMEOUT_INCR].tv_sec += 10; /* ten seconds wait */ |
2563 | R->timeout[TIMEOUT_INCR].tv_sec += 10; /* ten seconds wait */ |
2545 | } |
2564 | } |
2546 | } |
2565 | } |
2547 | /* ------------------------------------------------------------------------- */ |
2566 | /* ------------------------------------------------------------------------- */ |
2548 | /* |
2567 | /* |
2549 | * Request the current selection: |
2568 | * Request the current selection: |
… | |
… | |
2558 | void |
2577 | void |
2559 | rxvt_selection_request(pR_ Time tm, int x, int y) |
2578 | rxvt_selection_request(pR_ Time tm, int x, int y) |
2560 | { |
2579 | { |
2561 | D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y)); |
2580 | D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y)); |
2562 | if (x < 0 || x >= R->TermWin.width || y < 0 || y >= R->TermWin.height) |
2581 | if (x < 0 || x >= R->TermWin.width || y < 0 || y >= R->TermWin.height) |
2563 | return; /* outside window */ |
2582 | return; /* outside window */ |
2564 | |
2583 | |
2565 | if (R->selection.text != NULL) { /* internal selection */ |
2584 | if (R->selection.text != NULL) { /* internal selection */ |
2566 | D_SELECT((stderr, "rxvt_selection_request: pasting internal")); |
2585 | D_SELECT((stderr, "rxvt_selection_request: pasting internal")); |
2567 | rxvt_PasteIt(aR_ R->selection.text, R->selection.len); |
2586 | rxvt_PasteIt(aR_ R->selection.text, R->selection.len); |
2568 | return; |
2587 | return; |
2569 | } else { |
2588 | } else { |
2570 | int i; |
2589 | int i; |
2571 | |
2590 | |
2572 | R->selection_request_time = tm; |
2591 | R->selection_request_time = tm; |
2573 | R->selection_wait = Sel_normal; |
2592 | R->selection_wait = Sel_normal; |
2574 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) { |
2593 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) { |
2575 | #ifdef MULTICHAR_SET |
2594 | #ifdef MULTICHAR_SET |
2576 | R->selection_type = Sel_CompoundText; |
2595 | R->selection_type = Sel_CompoundText; |
2577 | #else |
2596 | #else |
2578 | R->selection_type = 0; |
2597 | R->selection_type = 0; |
2579 | #endif |
2598 | #endif |
2580 | if (rxvt_selection_request_other(aR_ |
2599 | if (rxvt_selection_request_other(aR_ |
2581 | #ifdef MULTICHAR_SET |
2600 | #ifdef MULTICHAR_SET |
2582 | R->xa[XA_COMPOUND_TEXT], |
2601 | R->xa[XA_COMPOUND_TEXT], |
2583 | #else |
2602 | #else |
2584 | XA_STRING, |
2603 | XA_STRING, |
2585 | #endif |
2604 | #endif |
2586 | i)) |
2605 | i)) |
2587 | return; |
2606 | return; |
2588 | } |
2607 | } |
2589 | } |
2608 | } |
2590 | R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ |
2609 | R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ |
2591 | D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2610 | D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2592 | rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); |
2611 | rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); |
2593 | } |
2612 | } |
2594 | |
2613 | |
2595 | /* INTPROTO */ |
2614 | /* INTPROTO */ |
… | |
… | |
2601 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
2620 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
2602 | #endif |
2621 | #endif |
2603 | |
2622 | |
2604 | R->selection_type |= selnum; |
2623 | R->selection_type |= selnum; |
2605 | if (selnum == Sel_Primary) |
2624 | if (selnum == Sel_Primary) |
2606 | sel = XA_PRIMARY; |
2625 | sel = XA_PRIMARY; |
2607 | else if (selnum == Sel_Secondary) |
2626 | else if (selnum == Sel_Secondary) |
2608 | sel = XA_SECONDARY; |
2627 | sel = XA_SECONDARY; |
2609 | else |
2628 | else |
2610 | sel = R->xa[XA_CLIPBOARD]; |
2629 | sel = R->xa[XA_CLIPBOARD]; |
2611 | if (XGetSelectionOwner(R->Xdisplay, sel) != None) { |
2630 | if (XGetSelectionOwner(R->Xdisplay, sel) != None) { |
2612 | D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); |
2631 | D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); |
2613 | XConvertSelection(R->Xdisplay, sel, target, R->xa[XA_VT_SELECTION], |
2632 | XConvertSelection(R->Xdisplay, sel, target, R->xa[XA_VT_SELECTION], |
2614 | R->TermWin.vt, R->selection_request_time); |
2633 | R->TermWin.vt, R->selection_request_time); |
2615 | return 1; |
2634 | return 1; |
2616 | } |
2635 | } |
2617 | return 0; |
2636 | return 0; |
2618 | } |
2637 | } |
2619 | |
2638 | |
2620 | /* ------------------------------------------------------------------------- */ |
2639 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
2628 | { |
2647 | { |
2629 | D_SELECT((stderr, "rxvt_selection_clear()")); |
2648 | D_SELECT((stderr, "rxvt_selection_clear()")); |
2630 | |
2649 | |
2631 | R->want_refresh = 1; |
2650 | R->want_refresh = 1; |
2632 | if (R->selection.text) |
2651 | if (R->selection.text) |
2633 | free(R->selection.text); |
2652 | free(R->selection.text); |
2634 | R->selection.text = NULL; |
2653 | R->selection.text = NULL; |
2635 | R->selection.len = 0; |
2654 | R->selection.len = 0; |
2636 | CLEAR_SELECTION(R); |
2655 | CLEAR_SELECTION(R); |
2637 | } |
2656 | } |
2638 | |
2657 | |
… | |
… | |
2654 | #endif |
2673 | #endif |
2655 | |
2674 | |
2656 | D_SELECT((stderr, "rxvt_selection_make(): R->selection.op=%d, R->selection.clicks=%d", R->selection.op, R->selection.clicks)); |
2675 | D_SELECT((stderr, "rxvt_selection_make(): R->selection.op=%d, R->selection.clicks=%d", R->selection.op, R->selection.clicks)); |
2657 | switch (R->selection.op) { |
2676 | switch (R->selection.op) { |
2658 | case SELECTION_CONT: |
2677 | case SELECTION_CONT: |
2659 | break; |
2678 | break; |
2660 | case SELECTION_INIT: |
2679 | case SELECTION_INIT: |
2661 | CLEAR_SELECTION(R); |
2680 | CLEAR_SELECTION(R); |
2662 | /* FALLTHROUGH */ |
2681 | /* FALLTHROUGH */ |
2663 | case SELECTION_BEGIN: |
2682 | case SELECTION_BEGIN: |
2664 | R->selection.op = SELECTION_DONE; |
2683 | R->selection.op = SELECTION_DONE; |
2665 | /* FALLTHROUGH */ |
2684 | /* FALLTHROUGH */ |
2666 | default: |
2685 | default: |
2667 | return; |
2686 | return; |
2668 | } |
2687 | } |
2669 | R->selection.op = SELECTION_DONE; |
2688 | R->selection.op = SELECTION_DONE; |
2670 | |
2689 | |
2671 | if (R->selection.clicks == 4) |
2690 | if (R->selection.clicks == 4) |
2672 | return; /* nothing selected, go away */ |
2691 | return; /* nothing selected, go away */ |
2673 | |
2692 | |
2674 | i = (R->selection.end.row - R->selection.beg.row + 1) * (R->TermWin.ncol + 1) + 1; |
2693 | i = (R->selection.end.row - R->selection.beg.row + 1) * (R->TermWin.ncol + 1) + 1; |
2675 | str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); |
2694 | str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); |
2676 | |
2695 | |
2677 | new_selection_text = (unsigned char *)str; |
2696 | new_selection_text = (unsigned char *)str; |
… | |
… | |
2681 | row = R->selection.beg.row + R->TermWin.saveLines; |
2700 | row = R->selection.beg.row + R->TermWin.saveLines; |
2682 | end_row = R->selection.end.row + R->TermWin.saveLines; |
2701 | end_row = R->selection.end.row + R->TermWin.saveLines; |
2683 | |
2702 | |
2684 | for (; row <= end_row; row++, col = 0) |
2703 | for (; row <= end_row; row++, col = 0) |
2685 | { |
2704 | { |
2686 | t = &(R->screen.text[row][col]); |
2705 | t = &(R->screen.text[row][col]); |
2687 | |
2706 | |
2688 | end_col = R->screen.tlen[row]; |
2707 | end_col = R->screen.tlen[row]; |
2689 | |
2708 | |
2690 | if (end_col == -1) |
2709 | if (end_col == -1) |
2691 | end_col = R->TermWin.ncol; |
2710 | end_col = R->TermWin.ncol; |
2692 | |
2711 | |
2693 | if (row == end_row) |
2712 | if (row == end_row) |
2694 | MIN_IT (end_col, R->selection.end.col); |
2713 | MIN_IT (end_col, R->selection.end.col); |
2695 | |
2714 | |
2696 | for (; col < end_col; col++) |
2715 | for (; col < end_col; col++) |
2697 | if (*t == NOCHAR) |
2716 | if (*t == NOCHAR) |
2698 | t++; |
2717 | t++; |
2699 | else |
2718 | else |
2700 | { |
2719 | { |
2701 | int len = wctomb (str, *t++); |
2720 | int len = wctomb (str, *t++); |
2702 | if (len > 0) |
2721 | if (len > 0) |
2703 | str += len; |
2722 | str += len; |
2704 | } |
2723 | } |
2705 | |
2724 | |
2706 | if (R->screen.tlen[row] != -1 && row != end_row) |
2725 | if (R->screen.tlen[row] != -1 && row != end_row) |
2707 | *str++ = '\n'; |
2726 | *str++ = '\n'; |
2708 | } |
2727 | } |
2709 | |
2728 | |
2710 | #ifndef NO_OLD_SELECTION |
2729 | #ifndef NO_OLD_SELECTION |
2711 | if (R->selection_style == OLD_SELECT) |
2730 | if (R->selection_style == OLD_SELECT) |
2712 | if (end_col == R->TermWin.ncol) |
2731 | if (end_col == R->TermWin.ncol) |
2713 | *str++ = '\n'; |
2732 | *str++ = '\n'; |
2714 | #endif |
2733 | #endif |
2715 | #ifndef NO_NEW_SELECTION |
2734 | #ifndef NO_NEW_SELECTION |
2716 | if (R->selection_style != OLD_SELECT) |
2735 | if (R->selection_style != OLD_SELECT) |
2717 | if (end_col != R->selection.end.col) |
2736 | if (end_col != R->selection.end.col) |
2718 | *str++ = '\n'; |
2737 | *str++ = '\n'; |
2719 | #endif |
2738 | #endif |
2720 | *str = '\0'; |
2739 | *str = '\0'; |
2721 | |
2740 | |
2722 | i = str - (char *)new_selection_text; |
2741 | i = str - (char *)new_selection_text; |
2723 | if (i == 0) |
2742 | if (i == 0) |
2724 | { |
2743 | { |
2725 | free (new_selection_text); |
2744 | free (new_selection_text); |
2726 | return; |
2745 | return; |
2727 | } |
2746 | } |
2728 | |
2747 | |
2729 | // due to MB_MAX_CUR, selection wastage is usually high |
2748 | // due to MB_MAX_CUR, selection wastage is usually high |
2730 | if (str - (char *)new_selection_text > 1024) |
2749 | if (str - (char *)new_selection_text > 1024) |
2731 | new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1); |
2750 | new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1); |
2732 | |
2751 | |
2733 | R->selection.len = i; |
2752 | R->selection.len = i; |
2734 | if (R->selection.text) |
2753 | if (R->selection.text) |
2735 | free (R->selection.text); |
2754 | free (R->selection.text); |
2736 | |
2755 | |
2737 | R->selection.text = new_selection_text; |
2756 | R->selection.text = new_selection_text; |
2738 | |
2757 | |
2739 | XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm); |
2758 | XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm); |
2740 | if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt) |
2759 | if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt) |
2741 | rxvt_print_error("can't get primary selection"); |
2760 | rxvt_print_error("can't get primary selection"); |
2742 | XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, |
2761 | XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, |
2743 | PropModeReplace, R->selection.text, (int)R->selection.len); |
2762 | PropModeReplace, R->selection.text, (int)R->selection.len); |
2744 | R->selection_time = tm; |
2763 | R->selection_time = tm; |
2745 | D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len)); |
2764 | D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len)); |
2746 | } |
2765 | } |
2747 | |
2766 | |
2748 | /* ------------------------------------------------------------------------- */ |
2767 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
2755 | rxvt_selection_click(pR_ int clicks, int x, int y) |
2774 | rxvt_selection_click(pR_ int clicks, int x, int y) |
2756 | { |
2775 | { |
2757 | D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y)); |
2776 | D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y)); |
2758 | |
2777 | |
2759 | clicks = ((clicks - 1) % 3) + 1; |
2778 | clicks = ((clicks - 1) % 3) + 1; |
2760 | R->selection.clicks = clicks; /* save clicks so extend will work */ |
2779 | R->selection.clicks = clicks; /* save clicks so extend will work */ |
2761 | |
2780 | |
2762 | rxvt_selection_start_colrow(aR_ Pixel2Col(x), Pixel2Row(y)); |
2781 | rxvt_selection_start_colrow(aR_ Pixel2Col(x), Pixel2Row(y)); |
2763 | if (clicks == 2 || clicks == 3) |
2782 | if (clicks == 2 || clicks == 3) |
2764 | rxvt_selection_extend_colrow(aR_ R->selection.mark.col, |
2783 | rxvt_selection_extend_colrow(aR_ R->selection.mark.col, |
2765 | R->selection.mark.row |
2784 | R->selection.mark.row |
2766 | + R->TermWin.view_start, |
2785 | + R->TermWin.view_start, |
2767 | 0, /* button 3 */ |
2786 | 0, /* button 3 */ |
2768 | 1, /* button press */ |
2787 | 1, /* button press */ |
2769 | 0); /* click change */ |
2788 | 0); /* click change */ |
2770 | } |
2789 | } |
2771 | |
2790 | |
2772 | /* ------------------------------------------------------------------------- */ |
2791 | /* ------------------------------------------------------------------------- */ |
2773 | /* |
2792 | /* |
2774 | * Mark a selection at the specified col/row |
2793 | * Mark a selection at the specified col/row |
… | |
… | |
2783 | MAX_IT(R->selection.mark.row, -(int32_t)R->TermWin.nscrolled); |
2802 | MAX_IT(R->selection.mark.row, -(int32_t)R->TermWin.nscrolled); |
2784 | MIN_IT(R->selection.mark.row, (int32_t)R->TermWin.nrow - 1); |
2803 | MIN_IT(R->selection.mark.row, (int32_t)R->TermWin.nrow - 1); |
2785 | MAX_IT(R->selection.mark.col, 0); |
2804 | MAX_IT(R->selection.mark.col, 0); |
2786 | MIN_IT(R->selection.mark.col, (int32_t)R->TermWin.ncol - 1); |
2805 | MIN_IT(R->selection.mark.col, (int32_t)R->TermWin.ncol - 1); |
2787 | |
2806 | |
2788 | if (R->selection.op) { /* clear the old selection */ |
2807 | if (R->selection.op) { /* clear the old selection */ |
2789 | R->selection.beg.row = R->selection.end.row = R->selection.mark.row; |
2808 | R->selection.beg.row = R->selection.end.row = R->selection.mark.row; |
2790 | R->selection.beg.col = R->selection.end.col = R->selection.mark.col; |
2809 | R->selection.beg.col = R->selection.end.col = R->selection.mark.col; |
2791 | } |
2810 | } |
2792 | R->selection.op = SELECTION_INIT; |
2811 | R->selection.op = SELECTION_INIT; |
2793 | R->selection.screen = R->current_screen; |
2812 | R->selection.screen = R->current_screen; |
2794 | } |
2813 | } |
2795 | |
2814 | |
… | |
… | |
2801 | |
2820 | |
2802 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2821 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2803 | #define DELIMIT_TEXT(x) \ |
2822 | #define DELIMIT_TEXT(x) \ |
2804 | (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(R->rs[Rs_cutchars], (x)) != NULL)) |
2823 | (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(R->rs[Rs_cutchars], (x)) != NULL)) |
2805 | #ifdef MULTICHAR_SET |
2824 | #ifdef MULTICHAR_SET |
2806 | # define DELIMIT_REND(x) (((x) & RS_multiMask) ? 1 : 0) |
2825 | # define DELIMIT_REND(x) (((x) & RS_multiMask) ? 1 : 0) |
2807 | #else |
2826 | #else |
2808 | # define DELIMIT_REND(x) 1 |
2827 | # define DELIMIT_REND(x) 1 |
2809 | #endif |
2828 | #endif |
2810 | |
2829 | |
2811 | /* INTPROTO */ |
2830 | /* INTPROTO */ |
2812 | void |
2831 | void |
2813 | rxvt_selection_delimit_word(pR_ enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2832 | rxvt_selection_delimit_word(pR_ enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
… | |
… | |
2816 | row_col_t bound; |
2835 | row_col_t bound; |
2817 | text_t *stp; |
2836 | text_t *stp; |
2818 | rend_t *srp; |
2837 | rend_t *srp; |
2819 | |
2838 | |
2820 | if (dirn == UP) { |
2839 | if (dirn == UP) { |
2821 | bound.row = R->TermWin.saveLines - R->TermWin.nscrolled - 1; |
2840 | bound.row = R->TermWin.saveLines - R->TermWin.nscrolled - 1; |
2822 | bound.col = 0; |
2841 | bound.col = 0; |
2823 | dirnadd = -1; |
2842 | dirnadd = -1; |
2824 | } else { |
2843 | } else { |
2825 | bound.row = R->TermWin.saveLines + R->TermWin.nrow; |
2844 | bound.row = R->TermWin.saveLines + R->TermWin.nrow; |
2826 | bound.col = R->TermWin.ncol - 1; |
2845 | bound.col = R->TermWin.ncol - 1; |
2827 | dirnadd = 1; |
2846 | dirnadd = 1; |
2828 | } |
2847 | } |
2829 | row = mark->row + R->TermWin.saveLines; |
2848 | row = mark->row + R->TermWin.saveLines; |
2830 | col = mark->col; |
2849 | col = mark->col; |
2831 | MAX_IT(col, 0); |
2850 | MAX_IT(col, 0); |
2832 | /* find the edge of a word */ |
2851 | /* find the edge of a word */ |
2833 | stp = &(R->screen.text[row][col]); |
2852 | stp = &(R->screen.text[row][col]); |
2834 | w1 = DELIMIT_TEXT(*stp); |
2853 | w1 = DELIMIT_TEXT(*stp); |
2835 | |
2854 | |
2836 | if (R->selection_style != NEW_SELECT) { |
2855 | if (R->selection_style != NEW_SELECT) { |
2837 | if (w1 == 1) { |
2856 | if (w1 == 1) { |
2838 | stp += dirnadd; |
2857 | stp += dirnadd; |
2839 | if (DELIMIT_TEXT(*stp) == 1) |
2858 | if (DELIMIT_TEXT(*stp) == 1) |
2840 | goto Old_Word_Selection_You_Die; |
2859 | goto Old_Word_Selection_You_Die; |
2841 | col += dirnadd; |
2860 | col += dirnadd; |
2842 | } |
2861 | } |
2843 | w1 = 0; |
2862 | w1 = 0; |
2844 | } |
2863 | } |
2845 | srp = (&R->screen.rend[row][col]); |
2864 | srp = (&R->screen.rend[row][col]); |
2846 | w2 = DELIMIT_REND(*srp); |
2865 | w2 = DELIMIT_REND(*srp); |
2847 | |
2866 | |
2848 | for (;;) { |
2867 | for (;;) { |
2849 | for (; col != bound.col; col += dirnadd) { |
2868 | for (; col != bound.col; col += dirnadd) { |
2850 | stp += dirnadd; |
2869 | stp += dirnadd; |
2851 | if (DELIMIT_TEXT(*stp) != w1) |
2870 | if (DELIMIT_TEXT(*stp) != w1) |
2852 | break; |
2871 | break; |
2853 | srp += dirnadd; |
2872 | srp += dirnadd; |
2854 | if (DELIMIT_REND(*srp) != w2) |
2873 | if (DELIMIT_REND(*srp) != w2) |
2855 | break; |
2874 | break; |
2856 | } |
2875 | } |
2857 | if ((col == bound.col) && (row != bound.row)) { |
2876 | if ((col == bound.col) && (row != bound.row)) { |
2858 | if (R->screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) { |
2877 | if (R->screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) { |
2859 | trow = row + dirnadd; |
2878 | trow = row + dirnadd; |
2860 | tcol = dirn == UP ? R->TermWin.ncol - 1 : 0; |
2879 | tcol = dirn == UP ? R->TermWin.ncol - 1 : 0; |
2861 | if (R->screen.text[trow] == NULL) |
2880 | if (R->screen.text[trow] == NULL) |
2862 | break; |
2881 | break; |
2863 | stp = &(R->screen.text[trow][tcol]); |
2882 | stp = &(R->screen.text[trow][tcol]); |
2864 | srp = &(R->screen.rend[trow][tcol]); |
2883 | srp = &(R->screen.rend[trow][tcol]); |
2865 | if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2) |
2884 | if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2) |
|
|
2885 | break; |
|
|
2886 | row = trow; |
|
|
2887 | col = tcol; |
|
|
2888 | continue; |
|
|
2889 | } |
|
|
2890 | } |
2866 | break; |
2891 | break; |
2867 | row = trow; |
|
|
2868 | col = tcol; |
|
|
2869 | continue; |
|
|
2870 | } |
|
|
2871 | } |
|
|
2872 | break; |
|
|
2873 | } |
2892 | } |
2874 | Old_Word_Selection_You_Die: |
2893 | Old_Word_Selection_You_Die: |
2875 | 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 - R->TermWin.saveLines, col)); |
2894 | 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 - R->TermWin.saveLines, col)); |
2876 | |
2895 | |
2877 | if (dirn == DN) |
2896 | if (dirn == DN) |
2878 | col++; /* put us on one past the end */ |
2897 | col++; /* put us on one past the end */ |
2879 | |
2898 | |
2880 | /* Poke the values back in */ |
2899 | /* Poke the values back in */ |
2881 | ret->row = row - R->TermWin.saveLines; |
2900 | ret->row = row - R->TermWin.saveLines; |
2882 | ret->col = col; |
2901 | ret->col = col; |
2883 | } |
2902 | } |
… | |
… | |
2908 | * if we are at the same place as the original mark. If we are then |
2927 | * if we are at the same place as the original mark. If we are then |
2909 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
2928 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
2910 | * be _past_ a character for it to be selected. |
2929 | * be _past_ a character for it to be selected. |
2911 | */ |
2930 | */ |
2912 | if (R->selection_style != OLD_SELECT) { |
2931 | if (R->selection_style != OLD_SELECT) { |
2913 | if (((R->selection.clicks % 3) == 1) && !flag |
2932 | if (((R->selection.clicks % 3) == 1) && !flag |
2914 | && (col == R->selection.mark.col |
2933 | && (col == R->selection.mark.col |
2915 | && (row == R->selection.mark.row + R->TermWin.view_start))) { |
2934 | && (row == R->selection.mark.row + R->TermWin.view_start))) { |
2916 | /* select nothing */ |
2935 | /* select nothing */ |
2917 | R->selection.beg.row = R->selection.end.row = 0; |
2936 | R->selection.beg.row = R->selection.end.row = 0; |
2918 | R->selection.beg.col = R->selection.end.col = 0; |
2937 | R->selection.beg.col = R->selection.end.col = 0; |
2919 | R->selection.clicks = 4; |
2938 | R->selection.clicks = 4; |
2920 | R->want_refresh = 1; |
2939 | R->want_refresh = 1; |
2921 | D_SELECT((stderr, "rxvt_selection_extend() R->selection.clicks = 4")); |
2940 | D_SELECT((stderr, "rxvt_selection_extend() R->selection.clicks = 4")); |
2922 | return; |
2941 | return; |
2923 | } |
2942 | } |
2924 | } |
2943 | } |
2925 | #endif |
2944 | #endif |
2926 | if (R->selection.clicks == 4) |
2945 | if (R->selection.clicks == 4) |
2927 | R->selection.clicks = 1; |
2946 | R->selection.clicks = 1; |
2928 | rxvt_selection_extend_colrow(aR_ col, row, !!flag, /* ? button 3 */ |
2947 | rxvt_selection_extend_colrow(aR_ col, row, !!flag, /* ? button 3 */ |
2929 | flag == 1 ? 1 : 0, /* ? button press */ |
2948 | flag == 1 ? 1 : 0, /* ? button press */ |
2930 | 0); /* no click change */ |
2949 | 0); /* no click change */ |
2931 | } |
2950 | } |
2932 | |
2951 | |
2933 | /* ------------------------------------------------------------------------- */ |
2952 | /* ------------------------------------------------------------------------- */ |
2934 | /* |
2953 | /* |
2935 | * Extend the selection to the specified col/row |
2954 | * Extend the selection to the specified col/row |
… | |
… | |
2940 | { |
2959 | { |
2941 | int16_t ncol = R->TermWin.ncol; |
2960 | int16_t ncol = R->TermWin.ncol; |
2942 | int end_col; |
2961 | int end_col; |
2943 | row_col_t pos; |
2962 | row_col_t pos; |
2944 | enum { |
2963 | enum { |
2945 | LEFT, RIGHT |
2964 | LEFT, RIGHT |
2946 | } closeto = RIGHT; |
2965 | } closeto = RIGHT; |
2947 | |
2966 | |
2948 | D_SELECT((stderr, "rxvt_selection_extend_colrow(c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, R->selection.clicks, R->selection.op)); |
2967 | D_SELECT((stderr, "rxvt_selection_extend_colrow(c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, R->selection.clicks, R->selection.op)); |
2949 | D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); |
2968 | D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); |
2950 | |
2969 | |
2951 | R->want_refresh = 1; |
2970 | R->want_refresh = 1; |
2952 | switch (R->selection.op) { |
2971 | switch (R->selection.op) { |
2953 | case SELECTION_INIT: |
2972 | case SELECTION_INIT: |
2954 | CLEAR_SELECTION(R); |
2973 | CLEAR_SELECTION(R); |
2955 | R->selection.op = SELECTION_BEGIN; |
2974 | R->selection.op = SELECTION_BEGIN; |
2956 | /* FALLTHROUGH */ |
2975 | /* FALLTHROUGH */ |
2957 | case SELECTION_BEGIN: |
2976 | case SELECTION_BEGIN: |
2958 | if (row != R->selection.mark.row || col != R->selection.mark.col |
2977 | if (row != R->selection.mark.row || col != R->selection.mark.col |
2959 | || (!button3 && buttonpress)) |
2978 | || (!button3 && buttonpress)) |
2960 | R->selection.op = SELECTION_CONT; |
2979 | R->selection.op = SELECTION_CONT; |
2961 | break; |
2980 | break; |
2962 | case SELECTION_DONE: |
2981 | case SELECTION_DONE: |
2963 | R->selection.op = SELECTION_CONT; |
2982 | R->selection.op = SELECTION_CONT; |
2964 | /* FALLTHROUGH */ |
2983 | /* FALLTHROUGH */ |
2965 | case SELECTION_CONT: |
2984 | case SELECTION_CONT: |
2966 | break; |
2985 | break; |
2967 | case SELECTION_CLEAR: |
2986 | case SELECTION_CLEAR: |
2968 | rxvt_selection_start_colrow(aR_ col, row); |
2987 | rxvt_selection_start_colrow(aR_ col, row); |
2969 | /* FALLTHROUGH */ |
2988 | /* FALLTHROUGH */ |
2970 | default: |
2989 | default: |
2971 | return; |
2990 | return; |
2972 | } |
2991 | } |
2973 | if (R->selection.beg.col == R->selection.end.col |
2992 | if (R->selection.beg.col == R->selection.end.col |
2974 | && R->selection.beg.col != R->selection.mark.col |
2993 | && R->selection.beg.col != R->selection.mark.col |
2975 | && R->selection.beg.row == R->selection.end.row |
2994 | && R->selection.beg.row == R->selection.end.row |
2976 | && R->selection.beg.row != R->selection.mark.row) { |
2995 | && R->selection.beg.row != R->selection.mark.row) { |
2977 | R->selection.beg.col = R->selection.end.col = R->selection.mark.col; |
2996 | R->selection.beg.col = R->selection.end.col = R->selection.mark.col; |
2978 | R->selection.beg.row = R->selection.end.row = R->selection.mark.row; |
2997 | R->selection.beg.row = R->selection.end.row = R->selection.mark.row; |
2979 | D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT2 b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); |
2998 | D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT2 b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); |
2980 | } |
2999 | } |
2981 | |
3000 | |
2982 | pos.col = col; |
3001 | pos.col = col; |
2983 | pos.row = row; |
3002 | pos.row = row; |
2984 | |
3003 | |
2985 | pos.row -= R->TermWin.view_start; /* adjust for scroll */ |
3004 | pos.row -= R->TermWin.view_start; /* adjust for scroll */ |
2986 | |
3005 | |
2987 | #ifndef NO_OLD_SELECTION |
3006 | #ifndef NO_OLD_SELECTION |
2988 | /* |
3007 | /* |
2989 | * This mimics some of the selection behaviour of version 2.20 and before. |
3008 | * This mimics some of the selection behaviour of version 2.20 and before. |
2990 | * There are no ``selection modes'', button3 is always character extension. |
3009 | * There are no ``selection modes'', button3 is always character extension. |
2991 | * Note: button3 drag is always available, c.f. v2.20 |
3010 | * Note: button3 drag is always available, c.f. v2.20 |
2992 | * Selection always terminates (left or right as appropriate) at the mark. |
3011 | * Selection always terminates (left or right as appropriate) at the mark. |
2993 | */ |
3012 | */ |
2994 | if (R->selection_style == OLD_SELECT) { |
3013 | if (R->selection_style == OLD_SELECT) { |
2995 | if (R->selection.clicks == 1 || button3) { |
3014 | if (R->selection.clicks == 1 || button3) { |
2996 | if (R->hate_those_clicks) { |
3015 | if (R->hate_those_clicks) { |
2997 | R->hate_those_clicks = 0; |
3016 | R->hate_those_clicks = 0; |
2998 | if (R->selection.clicks == 1) { |
3017 | if (R->selection.clicks == 1) { |
2999 | R->selection.beg.row = R->selection.mark.row; |
3018 | R->selection.beg.row = R->selection.mark.row; |
3000 | R->selection.beg.col = R->selection.mark.col; |
3019 | R->selection.beg.col = R->selection.mark.col; |
3001 | } else { |
3020 | } else { |
3002 | R->selection.mark.row = R->selection.beg.row; |
3021 | R->selection.mark.row = R->selection.beg.row; |
3003 | R->selection.mark.col = R->selection.beg.col; |
3022 | R->selection.mark.col = R->selection.beg.col; |
3004 | } |
3023 | } |
3005 | } |
3024 | } |
3006 | if (ROWCOL_IS_BEFORE(pos, R->selection.mark)) { |
3025 | if (ROWCOL_IS_BEFORE(pos, R->selection.mark)) { |
3007 | R->selection.end.row = R->selection.mark.row; |
3026 | R->selection.end.row = R->selection.mark.row; |
3008 | R->selection.end.col = R->selection.mark.col + 1; |
3027 | R->selection.end.col = R->selection.mark.col + 1; |
3009 | R->selection.beg.row = pos.row; |
3028 | R->selection.beg.row = pos.row; |
3010 | R->selection.beg.col = pos.col; |
3029 | R->selection.beg.col = pos.col; |
3011 | } else { |
3030 | } else { |
3012 | R->selection.beg.row = R->selection.mark.row; |
3031 | R->selection.beg.row = R->selection.mark.row; |
3013 | R->selection.beg.col = R->selection.mark.col; |
3032 | R->selection.beg.col = R->selection.mark.col; |
3014 | R->selection.end.row = pos.row; |
3033 | R->selection.end.row = pos.row; |
3015 | R->selection.end.col = pos.col + 1; |
3034 | R->selection.end.col = pos.col + 1; |
3016 | } |
3035 | } |
3017 | } else if (R->selection.clicks == 2) { |
3036 | } else if (R->selection.clicks == 2) { |
3018 | rxvt_selection_delimit_word(aR_ UP, &(R->selection.mark), |
3037 | rxvt_selection_delimit_word(aR_ UP, &(R->selection.mark), |
3019 | &(R->selection.beg)); |
3038 | &(R->selection.beg)); |
3020 | rxvt_selection_delimit_word(aR_ DN, &(R->selection.mark), |
3039 | rxvt_selection_delimit_word(aR_ DN, &(R->selection.mark), |
3021 | &(R->selection.end)); |
3040 | &(R->selection.end)); |
3022 | R->hate_those_clicks = 1; |
3041 | R->hate_those_clicks = 1; |
3023 | } else if (R->selection.clicks == 3) { |
3042 | } else if (R->selection.clicks == 3) { |
3024 | R->selection.beg.row = R->selection.end.row = R->selection.mark.row; |
3043 | R->selection.beg.row = R->selection.end.row = R->selection.mark.row; |
3025 | R->selection.beg.col = 0; |
3044 | R->selection.beg.col = 0; |
3026 | R->selection.end.col = ncol; |
3045 | R->selection.end.col = ncol; |
3027 | R->hate_those_clicks = 1; |
3046 | R->hate_those_clicks = 1; |
3028 | } |
3047 | } |
3029 | D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); |
3048 | D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); |
3030 | return; |
3049 | return; |
3031 | } |
3050 | } |
3032 | #endif /* ! NO_OLD_SELECTION */ |
3051 | #endif /* ! NO_OLD_SELECTION */ |
3033 | #ifndef NO_NEW_SELECTION |
3052 | #ifndef NO_NEW_SELECTION |
3034 | /* selection_style must not be OLD_SELECT to get here */ |
3053 | /* selection_style must not be OLD_SELECT to get here */ |
3035 | /* |
3054 | /* |
3036 | * This is mainly xterm style selection with a couple of differences, mainly |
3055 | * This is mainly xterm style selection with a couple of differences, mainly |
3037 | * in the way button3 drag extension works. |
3056 | * in the way button3 drag extension works. |
… | |
… | |
3043 | * c) button3 drag : extend/contract character/word/line - we select around |
3062 | * c) button3 drag : extend/contract character/word/line - we select around |
3044 | * a point/word/line which is either the start or end of the selection |
3063 | * a point/word/line which is either the start or end of the selection |
3045 | * and it was decided by whichever point/word/line was `fixed' at the |
3064 | * and it was decided by whichever point/word/line was `fixed' at the |
3046 | * time of the most recent button3 press |
3065 | * time of the most recent button3 press |
3047 | */ |
3066 | */ |
3048 | if (button3 && buttonpress) { /* button3 press */ |
3067 | if (button3 && buttonpress) { /* button3 press */ |
3049 | /* |
3068 | /* |
3050 | * first determine which edge of the selection we are closest to |
3069 | * first determine which edge of the selection we are closest to |
3051 | */ |
3070 | */ |
3052 | if (ROWCOL_IS_BEFORE(pos, R->selection.beg) |
3071 | if (ROWCOL_IS_BEFORE(pos, R->selection.beg) |
3053 | || (!ROWCOL_IS_AFTER(pos, R->selection.end) |
3072 | || (!ROWCOL_IS_AFTER(pos, R->selection.end) |
3054 | && (((pos.col - R->selection.beg.col) |
3073 | && (((pos.col - R->selection.beg.col) |
3055 | + ((pos.row - R->selection.beg.row) * ncol)) |
3074 | + ((pos.row - R->selection.beg.row) * ncol)) |
3056 | < ((R->selection.end.col - pos.col) |
3075 | < ((R->selection.end.col - pos.col) |
3057 | + ((R->selection.end.row - pos.row) * ncol))))) |
3076 | + ((R->selection.end.row - pos.row) * ncol))))) |
3058 | closeto = LEFT; |
3077 | closeto = LEFT; |
3059 | if (closeto == LEFT) { |
3078 | if (closeto == LEFT) { |
3060 | R->selection.beg.row = pos.row; |
3079 | R->selection.beg.row = pos.row; |
3061 | R->selection.beg.col = pos.col; |
3080 | R->selection.beg.col = pos.col; |
3062 | R->selection.mark.row = R->selection.end.row; |
3081 | R->selection.mark.row = R->selection.end.row; |
3063 | R->selection.mark.col = R->selection.end.col |
3082 | R->selection.mark.col = R->selection.end.col |
3064 | - (R->selection.clicks == 2); |
3083 | - (R->selection.clicks == 2); |
3065 | } else { |
3084 | } else { |
3066 | R->selection.end.row = pos.row; |
3085 | R->selection.end.row = pos.row; |
3067 | R->selection.end.col = pos.col; |
3086 | R->selection.end.col = pos.col; |
3068 | R->selection.mark.row = R->selection.beg.row; |
3087 | R->selection.mark.row = R->selection.beg.row; |
3069 | R->selection.mark.col = R->selection.beg.col; |
3088 | R->selection.mark.col = R->selection.beg.col; |
3070 | } |
3089 | } |
3071 | } else { /* button1 drag or button3 drag */ |
3090 | } else { /* button1 drag or button3 drag */ |
3072 | if (ROWCOL_IS_AFTER(R->selection.mark, pos)) { |
3091 | if (ROWCOL_IS_AFTER(R->selection.mark, pos)) { |
3073 | if ((R->selection.mark.row == R->selection.end.row) |
3092 | if ((R->selection.mark.row == R->selection.end.row) |
3074 | && (R->selection.mark.col == R->selection.end.col) |
3093 | && (R->selection.mark.col == R->selection.end.col) |
3075 | && clickchange && R->selection.clicks == 2) |
3094 | && clickchange && R->selection.clicks == 2) |
3076 | R->selection.mark.col--; |
3095 | R->selection.mark.col--; |
3077 | R->selection.beg.row = pos.row; |
3096 | R->selection.beg.row = pos.row; |
3078 | R->selection.beg.col = pos.col; |
3097 | R->selection.beg.col = pos.col; |
3079 | R->selection.end.row = R->selection.mark.row; |
3098 | R->selection.end.row = R->selection.mark.row; |
3080 | R->selection.end.col = R->selection.mark.col |
3099 | R->selection.end.col = R->selection.mark.col |
3081 | + (R->selection.clicks == 2); |
3100 | + (R->selection.clicks == 2); |
3082 | } else { |
3101 | } else { |
3083 | R->selection.beg.row = R->selection.mark.row; |
3102 | R->selection.beg.row = R->selection.mark.row; |
3084 | R->selection.beg.col = R->selection.mark.col; |
3103 | R->selection.beg.col = R->selection.mark.col; |
3085 | R->selection.end.row = pos.row; |
3104 | R->selection.end.row = pos.row; |
3086 | R->selection.end.col = pos.col; |
3105 | R->selection.end.col = pos.col; |
3087 | } |
3106 | } |
3088 | } |
3107 | } |
3089 | |
3108 | |
3090 | if (R->selection.clicks == 1) { |
3109 | if (R->selection.clicks == 1) { |
3091 | end_col = R->screen.tlen[R->selection.beg.row + R->TermWin.saveLines]; |
3110 | end_col = R->screen.tlen[R->selection.beg.row + R->TermWin.saveLines]; |
3092 | if (end_col != -1 && R->selection.beg.col > end_col) { |
3111 | if (end_col != -1 && R->selection.beg.col > end_col) { |
3093 | #if 1 |
3112 | #if 1 |
3094 | R->selection.beg.col = ncol; |
3113 | R->selection.beg.col = ncol; |
3095 | #else |
3114 | #else |
3096 | if (R->selection.beg.row != R->selection.end.row) |
3115 | if (R->selection.beg.row != R->selection.end.row) |
3097 | R->selection.beg.col = ncol; |
3116 | R->selection.beg.col = ncol; |
3098 | else |
3117 | else |
3099 | R->selection.beg.col = R->selection.mark.col; |
3118 | R->selection.beg.col = R->selection.mark.col; |
3100 | #endif |
3119 | #endif |
3101 | } |
3120 | } |
3102 | end_col = R->screen.tlen[R->selection.end.row + R->TermWin.saveLines]; |
3121 | end_col = R->screen.tlen[R->selection.end.row + R->TermWin.saveLines]; |
3103 | if (end_col != -1 && R->selection.end.col > end_col) |
3122 | if (end_col != -1 && R->selection.end.col > end_col) |
3104 | R->selection.end.col = ncol; |
3123 | R->selection.end.col = ncol; |
3105 | |
3124 | |
3106 | } else if (R->selection.clicks == 2) { |
3125 | } else if (R->selection.clicks == 2) { |
3107 | if (ROWCOL_IS_AFTER(R->selection.end, R->selection.beg)) |
3126 | if (ROWCOL_IS_AFTER(R->selection.end, R->selection.beg)) |
3108 | R->selection.end.col--; |
3127 | R->selection.end.col--; |
3109 | rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg), |
3128 | rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg), |
3110 | &(R->selection.beg)); |
3129 | &(R->selection.beg)); |
3111 | rxvt_selection_delimit_word(aR_ DN, &(R->selection.end), |
3130 | rxvt_selection_delimit_word(aR_ DN, &(R->selection.end), |
3112 | &(R->selection.end)); |
3131 | &(R->selection.end)); |
3113 | } else if (R->selection.clicks == 3) { |
3132 | } else if (R->selection.clicks == 3) { |
3114 | #ifndef NO_FRILLS |
3133 | #ifndef NO_FRILLS |
3115 | if ((R->Options & Opt_tripleclickwords)) { |
3134 | if ((R->Options & Opt_tripleclickwords)) { |
3116 | int end_row; |
3135 | int end_row; |
3117 | |
3136 | |
3118 | rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg), |
3137 | rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg), |
3119 | &(R->selection.beg)); |
3138 | &(R->selection.beg)); |
3120 | end_row = R->screen.tlen[R->selection.mark.row |
3139 | end_row = R->screen.tlen[R->selection.mark.row |
3121 | + R->TermWin.saveLines]; |
3140 | + R->TermWin.saveLines]; |
3122 | for (end_row = R->selection.mark.row; end_row < R->TermWin.nrow; |
3141 | for (end_row = R->selection.mark.row; end_row < R->TermWin.nrow; |
3123 | end_row++) { |
3142 | end_row++) { |
3124 | end_col = R->screen.tlen[end_row + R->TermWin.saveLines]; |
3143 | end_col = R->screen.tlen[end_row + R->TermWin.saveLines]; |
3125 | if (end_col != -1) { |
3144 | if (end_col != -1) { |
3126 | R->selection.end.row = end_row; |
3145 | R->selection.end.row = end_row; |
3127 | R->selection.end.col = end_col; |
3146 | R->selection.end.col = end_col; |
3128 | rxvt_selection_remove_trailing_spaces(aR); |
3147 | rxvt_selection_remove_trailing_spaces(aR); |
3129 | break; |
3148 | break; |
3130 | } |
3149 | } |
3131 | } |
3150 | } |
3132 | } else |
3151 | } else |
3133 | #endif |
3152 | #endif |
3134 | { |
3153 | { |
3135 | if (ROWCOL_IS_AFTER(R->selection.mark, R->selection.beg)) |
3154 | if (ROWCOL_IS_AFTER(R->selection.mark, R->selection.beg)) |
3136 | R->selection.mark.col++; |
3155 | R->selection.mark.col++; |
3137 | R->selection.beg.col = 0; |
3156 | R->selection.beg.col = 0; |
3138 | R->selection.end.col = ncol; |
3157 | R->selection.end.col = ncol; |
3139 | } |
3158 | } |
3140 | } |
3159 | } |
3141 | if (button3 && buttonpress) { /* mark may need to be changed */ |
3160 | if (button3 && buttonpress) { /* mark may need to be changed */ |
3142 | if (closeto == LEFT) { |
3161 | if (closeto == LEFT) { |
3143 | R->selection.mark.row = R->selection.end.row; |
3162 | R->selection.mark.row = R->selection.end.row; |
3144 | R->selection.mark.col = R->selection.end.col |
3163 | R->selection.mark.col = R->selection.end.col |
3145 | - (R->selection.clicks == 2); |
3164 | - (R->selection.clicks == 2); |
3146 | } else { |
3165 | } else { |
3147 | R->selection.mark.row = R->selection.beg.row; |
3166 | R->selection.mark.row = R->selection.beg.row; |
3148 | R->selection.mark.col = R->selection.beg.col; |
3167 | R->selection.mark.col = R->selection.beg.col; |
3149 | } |
3168 | } |
3150 | } |
3169 | } |
3151 | D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); |
3170 | D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); |
3152 | #endif /* ! NO_NEW_SELECTION */ |
3171 | #endif /* ! NO_NEW_SELECTION */ |
3153 | } |
3172 | } |
3154 | |
3173 | |
3155 | #ifndef NO_FRILLS |
3174 | #ifndef NO_FRILLS |
3156 | /* INTPROTO */ |
3175 | /* INTPROTO */ |
3157 | void |
3176 | void |
… | |
… | |
3161 | text_t *stp; |
3180 | text_t *stp; |
3162 | |
3181 | |
3163 | end_col = R->selection.end.col; |
3182 | end_col = R->selection.end.col; |
3164 | end_row = R->selection.end.row; |
3183 | end_row = R->selection.end.row; |
3165 | for ( ; end_row >= R->selection.beg.row; ) { |
3184 | for ( ; end_row >= R->selection.beg.row; ) { |
3166 | stp = R->screen.text[end_row + R->TermWin.saveLines]; |
3185 | stp = R->screen.text[end_row + R->TermWin.saveLines]; |
3167 | while (--end_col >= 0) { |
3186 | while (--end_col >= 0) { |
3168 | if (stp[end_col] != ' ' && stp[end_col] != '\t') |
3187 | if (stp[end_col] != ' ' && stp[end_col] != '\t') |
3169 | break; |
3188 | break; |
3170 | } |
3189 | } |
3171 | if (end_col >= 0 |
3190 | if (end_col >= 0 |
3172 | || R->screen.tlen[end_row - 1 + R->TermWin.saveLines] != -1) { |
3191 | || R->screen.tlen[end_row - 1 + R->TermWin.saveLines] != -1) { |
3173 | R->selection.end.col = end_col + 1; |
3192 | R->selection.end.col = end_col + 1; |
3174 | R->selection.end.row = end_row; |
3193 | R->selection.end.row = end_row; |
3175 | break; |
3194 | break; |
3176 | } |
3195 | } |
3177 | end_row--; |
3196 | end_row--; |
3178 | end_col = R->TermWin.ncol; |
3197 | end_col = R->TermWin.ncol; |
3179 | } |
3198 | } |
3180 | if (R->selection.mark.row > R->selection.end.row) { |
3199 | if (R->selection.mark.row > R->selection.end.row) { |
3181 | R->selection.mark.row = R->selection.end.row; |
3200 | R->selection.mark.row = R->selection.end.row; |
3182 | R->selection.mark.col = R->selection.end.col; |
3201 | R->selection.mark.col = R->selection.end.col; |
3183 | } else if (R->selection.mark.row == R->selection.end.row |
3202 | } else if (R->selection.mark.row == R->selection.end.row |
3184 | && R->selection.mark.col > R->selection.end.col) |
3203 | && R->selection.mark.col > R->selection.end.col) |
3185 | R->selection.mark.col = R->selection.end.col; |
3204 | R->selection.mark.col = R->selection.end.col; |
3186 | } |
3205 | } |
3187 | #endif |
3206 | #endif |
3188 | |
3207 | |
3189 | /* ------------------------------------------------------------------------- */ |
3208 | /* ------------------------------------------------------------------------- */ |
3190 | /* |
3209 | /* |
… | |
… | |
3234 | ev.selection = rq->selection; |
3253 | ev.selection = rq->selection; |
3235 | ev.target = rq->target; |
3254 | ev.target = rq->target; |
3236 | ev.time = rq->time; |
3255 | ev.time = rq->time; |
3237 | |
3256 | |
3238 | if (rq->target == R->xa[XA_TARGETS]) { |
3257 | if (rq->target == R->xa[XA_TARGETS]) { |
3239 | target_list[0] = (Atom32) R->xa[XA_TARGETS]; |
3258 | target_list[0] = (Atom32) R->xa[XA_TARGETS]; |
3240 | target_list[1] = (Atom32) XA_STRING; |
3259 | target_list[1] = (Atom32) XA_STRING; |
3241 | target_list[2] = (Atom32) R->xa[XA_TEXT]; |
3260 | target_list[2] = (Atom32) R->xa[XA_TEXT]; |
3242 | #ifdef USE_XIM |
3261 | #ifdef USE_XIM |
3243 | target_list[3] = (Atom32) R->xa[XA_COMPOUND_TEXT]; |
3262 | target_list[3] = (Atom32) R->xa[XA_COMPOUND_TEXT]; |
3244 | #endif |
3263 | #endif |
3245 | XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM, |
3264 | XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM, |
3246 | (8 * sizeof(target_list[0])), PropModeReplace, |
3265 | (8 * sizeof(target_list[0])), PropModeReplace, |
3247 | (unsigned char *)target_list, |
3266 | (unsigned char *)target_list, |
3248 | (sizeof(target_list) / sizeof(target_list[0]))); |
3267 | (sizeof(target_list) / sizeof(target_list[0]))); |
3249 | ev.property = rq->property; |
3268 | ev.property = rq->property; |
3250 | } else if (rq->target == R->xa[XA_MULTIPLE]) { |
3269 | } else if (rq->target == R->xa[XA_MULTIPLE]) { |
3251 | /* TODO: Handle MULTIPLE */ |
3270 | /* TODO: Handle MULTIPLE */ |
3252 | } else if (rq->target == R->xa[XA_TIMESTAMP] && R->selection.text) { |
3271 | } else if (rq->target == R->xa[XA_TIMESTAMP] && R->selection.text) { |
3253 | XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER, |
3272 | XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER, |
3254 | (8 * sizeof(Time)), PropModeReplace, |
3273 | (8 * sizeof(Time)), PropModeReplace, |
3255 | (unsigned char *)&R->selection_time, 1); |
3274 | (unsigned char *)&R->selection_time, 1); |
3256 | ev.property = rq->property; |
3275 | ev.property = rq->property; |
3257 | } else if (rq->target == XA_STRING |
3276 | } else if (rq->target == XA_STRING |
3258 | || rq->target == R->xa[XA_COMPOUND_TEXT] |
3277 | || rq->target == R->xa[XA_COMPOUND_TEXT] |
3259 | || rq->target == R->xa[XA_TEXT]) { |
3278 | || rq->target == R->xa[XA_TEXT]) { |
3260 | #ifdef USE_XIM |
3279 | #ifdef USE_XIM |
3261 | short freect = 0; |
3280 | short freect = 0; |
3262 | #endif |
3281 | #endif |
3263 | int selectlen; |
3282 | int selectlen; |
3264 | |
3283 | |
3265 | #ifdef USE_XIM |
3284 | #ifdef USE_XIM |
3266 | if (rq->target != XA_STRING) { |
3285 | if (rq->target != XA_STRING) { |
3267 | target = R->xa[XA_COMPOUND_TEXT]; |
3286 | target = R->xa[XA_COMPOUND_TEXT]; |
3268 | style = (rq->target == R->xa[XA_COMPOUND_TEXT]) |
3287 | style = (rq->target == R->xa[XA_COMPOUND_TEXT]) |
3269 | ? XCompoundTextStyle : XStdICCTextStyle; |
3288 | ? XCompoundTextStyle : XStdICCTextStyle; |
3270 | } else |
3289 | } else |
3271 | #endif |
3290 | #endif |
3272 | { |
3291 | { |
3273 | target = XA_STRING; |
3292 | target = XA_STRING; |
3274 | style = XStringStyle; |
3293 | style = XStringStyle; |
3275 | } |
3294 | } |
3276 | if (R->selection.text) { |
3295 | if (R->selection.text) { |
3277 | cl[0] = (char *)R->selection.text; |
3296 | cl[0] = (char *)R->selection.text; |
3278 | selectlen = R->selection.len; |
3297 | selectlen = R->selection.len; |
3279 | } else { |
3298 | } else { |
3280 | cl[0] = dummy; |
3299 | cl[0] = dummy; |
3281 | *dummy = '\0'; |
3300 | *dummy = '\0'; |
3282 | selectlen = 0; |
3301 | selectlen = 0; |
3283 | } |
3302 | } |
3284 | #ifdef USE_XIM |
3303 | #ifdef USE_XIM |
3285 | if (XmbTextListToTextProperty(R->Xdisplay, cl, 1, style, &ct) |
3304 | if (XmbTextListToTextProperty(R->Xdisplay, cl, 1, style, &ct) |
3286 | == Success) /* if we failed to convert then send it raw */ |
3305 | == Success) /* if we failed to convert then send it raw */ |
3287 | freect = 1; |
3306 | freect = 1; |
3288 | else |
3307 | else |
3289 | #endif |
3308 | #endif |
3290 | { |
3309 | { |
3291 | ct.value = (unsigned char *)cl[0]; |
3310 | ct.value = (unsigned char *)cl[0]; |
3292 | ct.nitems = selectlen; |
3311 | ct.nitems = selectlen; |
3293 | } |
3312 | } |
3294 | XChangeProperty(R->Xdisplay, rq->requestor, rq->property, |
3313 | XChangeProperty(R->Xdisplay, rq->requestor, rq->property, |
3295 | target, 8, PropModeReplace, |
3314 | target, 8, PropModeReplace, |
3296 | ct.value, (int)ct.nitems); |
3315 | ct.value, (int)ct.nitems); |
3297 | ev.property = rq->property; |
3316 | ev.property = rq->property; |
3298 | #ifdef USE_XIM |
3317 | #ifdef USE_XIM |
3299 | if (freect) |
3318 | if (freect) |
3300 | XFree(ct.value); |
3319 | XFree(ct.value); |
3301 | #endif |
3320 | #endif |
3302 | } |
3321 | } |
3303 | XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); |
3322 | XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); |
3304 | } |
3323 | } |
3305 | |
3324 | |
… | |
… | |
3328 | XWindowAttributes xwa; |
3347 | XWindowAttributes xwa; |
3329 | |
3348 | |
3330 | XGetWindowAttributes(R->Xdisplay, R->TermWin.vt, &xwa); |
3349 | XGetWindowAttributes(R->Xdisplay, R->TermWin.vt, &xwa); |
3331 | pos->x = Col2Pixel(R->screen.cur.col) + xwa.x; |
3350 | pos->x = Col2Pixel(R->screen.cur.col) + xwa.x; |
3332 | pos->y = Height2Pixel((R->screen.cur.row + 1)) + xwa.y |
3351 | pos->y = Height2Pixel((R->screen.cur.row + 1)) + xwa.y |
3333 | - R->TermWin.lineSpace; |
3352 | - R->TermWin.lineSpace; |
3334 | } |
3353 | } |
3335 | #endif |
3354 | #endif |
3336 | /* ------------------------------------------------------------------------- */ |
3355 | /* ------------------------------------------------------------------------- */ |
3337 | |
3356 | |
3338 | /* ------------------------------------------------------------------------- * |
3357 | /* ------------------------------------------------------------------------- * |
… | |
… | |
3343 | void |
3362 | void |
3344 | rxvt_debug_colors(void) |
3363 | rxvt_debug_colors(void) |
3345 | { |
3364 | { |
3346 | int color; |
3365 | int color; |
3347 | const char *name[] = { |
3366 | const char *name[] = { |
3348 | "fg", "bg", |
3367 | "fg", "bg", |
3349 | "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" |
3368 | "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" |
3350 | }; |
3369 | }; |
3351 | |
3370 | |
3352 | fprintf(stderr, "Color ( "); |
3371 | fprintf(stderr, "Color ( "); |
3353 | if (R->rstyle & RS_RVid) |
3372 | if (R->rstyle & RS_RVid) |
3354 | fprintf(stderr, "rvid "); |
3373 | fprintf(stderr, "rvid "); |
3355 | if (R->rstyle & RS_Bold) |
3374 | if (R->rstyle & RS_Bold) |
3356 | fprintf(stderr, "bold "); |
3375 | fprintf(stderr, "bold "); |
3357 | if (R->rstyle & RS_Blink) |
3376 | if (R->rstyle & RS_Blink) |
3358 | fprintf(stderr, "blink "); |
3377 | fprintf(stderr, "blink "); |
3359 | if (R->rstyle & RS_Uline) |
3378 | if (R->rstyle & RS_Uline) |
3360 | fprintf(stderr, "uline "); |
3379 | fprintf(stderr, "uline "); |
3361 | fprintf(stderr, "): "); |
3380 | fprintf(stderr, "): "); |
3362 | |
3381 | |
3363 | color = GET_FGCOLOR(R->rstyle); |
3382 | color = GET_FGCOLOR(R->rstyle); |
3364 | #ifndef NO_BRIGHTCOLOR |
3383 | #ifndef NO_BRIGHTCOLOR |
3365 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) { |
3384 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) { |
3366 | color -= (minBrightCOLOR - minCOLOR); |
3385 | color -= (minBrightCOLOR - minCOLOR); |
3367 | fprintf(stderr, "bright "); |
3386 | fprintf(stderr, "bright "); |
3368 | } |
3387 | } |
3369 | #endif |
3388 | #endif |
3370 | fprintf(stderr, "%s on ", name[color]); |
3389 | fprintf(stderr, "%s on ", name[color]); |
3371 | |
3390 | |
3372 | color = GET_BGCOLOR(R->rstyle); |
3391 | color = GET_BGCOLOR(R->rstyle); |
3373 | #ifndef NO_BRIGHTCOLOR |
3392 | #ifndef NO_BRIGHTCOLOR |
3374 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) { |
3393 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) { |
3375 | color -= (minBrightCOLOR - minCOLOR); |
3394 | color -= (minBrightCOLOR - minCOLOR); |
3376 | fprintf(stderr, "bright "); |
3395 | fprintf(stderr, "bright "); |
3377 | } |
3396 | } |
3378 | #endif |
3397 | #endif |
3379 | fprintf(stderr, "%s\n", name[color]); |
3398 | fprintf(stderr, "%s\n", name[color]); |
3380 | } |
3399 | } |
3381 | #endif |
3400 | #endif |