1 | /*--------------------------------*-C-*--------------------------------------* |
1 | /*--------------------------------*-C-*--------------------------------------* |
2 | * File: screen.c |
2 | * File: screen.c |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * $Id: screen.C,v 1.4 2003/11/25 15:25:17 pcg Exp $ |
|
|
5 | * |
4 | * |
6 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
7 | * |
6 | * |
8 | * This program is free software; you can redistribute it and/or modify |
7 | * 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 |
8 | * it under the terms of the GNU General Public License as published by |
… | |
… | |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
30 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
32 | |
31 | |
33 | #include <stdint.h> |
32 | #include <stdint.h> |
34 | #include <wchar.h> |
33 | #include <wchar.h> |
35 | |
34 | |
|
|
35 | #include "salloc.C" // HACK!! |
|
|
36 | |
36 | inline void fill_text (text_t *start, text_t value, int len) |
37 | inline void fill_text (text_t *start, text_t value, int len) |
37 | { |
38 | { |
38 | while (len--) |
39 | while (len--) |
39 | *start++ = value; |
40 | *start++ = value; |
40 | } |
41 | } |
41 | |
|
|
42 | #define RESET_CHSTAT(H) \ |
|
|
43 | if ((H)->chstat == WBYTE) \ |
|
|
44 | (H)->chstat = SBYTE, (H)->lost_multi = 1 |
|
|
45 | |
42 | |
46 | /* ------------------------------------------------------------------------- */ |
43 | /* ------------------------------------------------------------------------- */ |
47 | #define PROP_SIZE 16384 |
44 | #define PROP_SIZE 16384 |
48 | #define TABSIZE 8 /* default tab size */ |
45 | #define TABSIZE 8 /* default tab size */ |
49 | |
46 | |
… | |
… | |
91 | /* |
88 | /* |
92 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
89 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
93 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
90 | * 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 |
91 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
95 | */ |
92 | */ |
96 | #define drawBuffer (R->TermWin.vt) |
93 | #define drawBuffer TermWin.vt |
97 | |
94 | |
98 | #define CLEAR_ROWS(row, num) \ |
95 | #define CLEAR_ROWS(row, num) \ |
99 | if (R->TermWin.mapped) \ |
96 | if (TermWin.mapped) \ |
100 | XClearArea(R->Xdisplay, drawBuffer, R->TermWin.int_bwidth, \ |
97 | XClearArea (Xdisplay, drawBuffer, TermWin.int_bwidth, \ |
101 | Row2Pixel(row), (unsigned int)R->TermWin.width, \ |
98 | Row2Pixel(row), (unsigned int)TermWin.width, \ |
102 | (unsigned int)Height2Pixel(num), False) |
99 | (unsigned int)Height2Pixel(num), False) |
103 | |
100 | |
104 | #define CLEAR_CHARS(x, y, num) \ |
101 | #define CLEAR_CHARS(x, y, num) \ |
105 | if (R->TermWin.mapped) \ |
102 | if (TermWin.mapped) \ |
106 | XClearArea(R->Xdisplay, drawBuffer, x, y, \ |
103 | XClearArea (Xdisplay, drawBuffer, x, y, \ |
107 | (unsigned int)Width2Pixel(num), \ |
104 | (unsigned int)Width2Pixel(num), \ |
108 | (unsigned int)Height2Pixel(1), False) |
105 | (unsigned int)Height2Pixel(1), False) |
109 | |
106 | |
110 | #define ERASE_ROWS(row, num) \ |
107 | #define ERASE_ROWS(row, num) \ |
111 | XFillRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, \ |
108 | XFillRectangle (Xdisplay, drawBuffer, TermWin.gc, \ |
112 | R->TermWin.int_bwidth, Row2Pixel(row), \ |
109 | TermWin.int_bwidth, Row2Pixel(row), \ |
113 | (unsigned int)R->TermWin.width, \ |
110 | (unsigned int)TermWin.width, \ |
114 | (unsigned int)Height2Pixel(num)) |
111 | (unsigned int)Height2Pixel(num)) |
115 | |
112 | |
116 | /* ------------------------------------------------------------------------- * |
113 | /* ------------------------------------------------------------------------- * |
117 | * SCREEN `COMMON' ROUTINES * |
114 | * SCREEN `COMMON' ROUTINES * |
118 | * ------------------------------------------------------------------------- */ |
115 | * ------------------------------------------------------------------------- */ |
119 | /* Fill part/all of a line with blanks. */ |
116 | /* Fill part/all of a line with blanks. */ |
120 | /* INTPROTO */ |
|
|
121 | void |
117 | void |
122 | rxvt_blank_line(pR_ text_t *et, rend_t *er, unsigned int width, rend_t efs) |
118 | rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) |
123 | { |
119 | { |
124 | efs &= ~RS_baseattrMask; |
120 | efs &= ~RS_baseattrMask; |
125 | efs = SET_FONT (efs, R->TermWin.fontset->find_font (' ')); |
121 | efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); |
126 | |
122 | |
127 | while (width--) |
123 | while (width--) |
128 | { |
124 | { |
129 | *et++ = ' '; |
125 | *et++ = ' '; |
130 | *er++ = efs; |
126 | *er++ = efs; |
131 | } |
127 | } |
132 | } |
128 | } |
133 | |
129 | |
134 | /* ------------------------------------------------------------------------- */ |
130 | /* ------------------------------------------------------------------------- */ |
135 | /* Fill a full line with blanks - make sure it is allocated first */ |
131 | /* Fill a full line with blanks - make sure it is allocated first */ |
136 | /* INTPROTO */ |
|
|
137 | void |
132 | void |
138 | rxvt_blank_screen_mem(pR_ text_t **tp, rend_t **rp, unsigned int row, rend_t efs) |
133 | rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) |
139 | { |
134 | { |
140 | int width = R->TermWin.ncol; |
|
|
141 | rend_t *er; |
|
|
142 | |
|
|
143 | #ifdef DEBUG_STRICT |
135 | #ifdef DEBUG_STRICT |
144 | assert((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); |
136 | assert((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); |
145 | #endif |
137 | #endif |
146 | if (tp[row] == NULL) { |
138 | if (tp[row] == NULL) |
147 | tp[row] = (text_t *)rxvt_malloc(sizeof(text_t) * width); |
|
|
148 | rp[row] = (rend_t *)rxvt_malloc(sizeof(rend_t) * width); |
|
|
149 | } |
139 | { |
|
|
140 | tp[row] = (text_t *)talloc->alloc (); |
|
|
141 | rp[row] = (rend_t *)ralloc->alloc (); |
|
|
142 | } |
|
|
143 | |
150 | rxvt_blank_line (aR_ tp[row], rp[row], width, efs); |
144 | scr_blank_line (tp[row], rp[row], TermWin.ncol, efs); |
151 | } |
145 | } |
152 | |
146 | |
153 | /* ------------------------------------------------------------------------- * |
147 | /* ------------------------------------------------------------------------- * |
154 | * SCREEN INITIALISATION * |
148 | * SCREEN INITIALISATION * |
155 | * ------------------------------------------------------------------------- */ |
149 | * ------------------------------------------------------------------------- */ |
156 | /* EXTPROTO */ |
|
|
157 | void |
150 | void |
158 | rxvt_scr_reset(pR) |
151 | rxvt_term::scr_reset () |
159 | { |
152 | { |
160 | unsigned int ncol, nrow, prev_ncol, prev_nrow, |
153 | unsigned int ncol, nrow, total_rows, prev_total_rows; |
161 | total_rows, prev_total_rows; |
|
|
162 | unsigned int p, q; |
154 | unsigned int p, q; |
163 | int k; |
155 | int k; |
164 | rend_t setrstyle; |
156 | rend_t setrstyle; |
165 | |
157 | |
166 | D_SCREEN((stderr, "rxvt_scr_reset()")); |
158 | D_SCREEN((stderr, "rxvt_scr_reset()")); |
167 | |
159 | |
168 | R->TermWin.view_start = 0; |
160 | TermWin.view_start = 0; |
169 | RESET_CHSTAT(R); |
|
|
170 | R->num_scr = 0; |
161 | num_scr = 0; |
171 | |
162 | |
172 | prev_ncol = R->prev_ncol; |
|
|
173 | prev_nrow = R->prev_nrow; |
|
|
174 | if (R->TermWin.ncol == 0) |
163 | if (TermWin.ncol == 0) |
175 | R->TermWin.ncol = 80; |
164 | TermWin.ncol = 80; |
|
|
165 | |
176 | if (R->TermWin.nrow == 0) |
166 | if (TermWin.nrow == 0) |
177 | R->TermWin.nrow = 24; |
167 | TermWin.nrow = 24; |
|
|
168 | |
178 | ncol = R->TermWin.ncol; |
169 | ncol = TermWin.ncol; |
179 | nrow = R->TermWin.nrow; |
170 | nrow = TermWin.nrow; |
|
|
171 | |
180 | if (ncol == prev_ncol && nrow == prev_nrow) |
172 | if (ncol == prev_ncol && nrow == prev_nrow) |
181 | return; |
173 | return; |
182 | |
174 | |
183 | R->want_refresh = 1; |
175 | want_refresh = 1; |
184 | |
176 | |
185 | total_rows = nrow + R->TermWin.saveLines; |
177 | total_rows = nrow + TermWin.saveLines; |
186 | prev_total_rows = prev_nrow + R->TermWin.saveLines; |
178 | prev_total_rows = prev_nrow + TermWin.saveLines; |
187 | |
179 | |
188 | R->screen.tscroll = 0; |
180 | screen.tscroll = 0; |
189 | R->screen.bscroll = nrow - 1; |
181 | screen.bscroll = nrow - 1; |
190 | |
182 | |
|
|
183 | if (!talloc) |
|
|
184 | { |
|
|
185 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
186 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
187 | } |
|
|
188 | |
191 | if (prev_nrow == 0) { |
189 | if (prev_nrow == 0) |
192 | /* |
190 | { |
|
|
191 | /* |
193 | * A: first time called so just malloc everything : don't rely on realloc |
192 | * 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 |
193 | * Note: this is still needed so that all the scrollback lines are NULL |
195 | */ |
194 | */ |
196 | R->screen.text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); |
195 | screen.text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); |
197 | R->buf_text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); |
196 | buf_text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); |
198 | R->drawn_text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); |
197 | drawn_text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); |
199 | R->swap.text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); |
198 | swap.text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); |
200 | |
199 | |
201 | R->screen.tlen = (int16_t *)rxvt_calloc(total_rows, sizeof(int16_t)); |
200 | screen.tlen = (int16_t *)rxvt_calloc(total_rows, sizeof(int16_t)); |
202 | R->swap.tlen = (int16_t *)rxvt_calloc(nrow, sizeof(int16_t)); |
201 | swap.tlen = (int16_t *)rxvt_calloc(nrow, sizeof(int16_t)); |
203 | |
202 | |
204 | R->screen.rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); |
203 | screen.rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); |
205 | R->buf_rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); |
204 | buf_rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); |
206 | R->drawn_rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); |
205 | drawn_rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); |
207 | R->swap.rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); |
206 | swap.rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); |
208 | |
207 | |
209 | for (p = 0; p < nrow; p++) { |
208 | for (p = 0; p < nrow; p++) |
|
|
209 | { |
210 | q = p + R->TermWin.saveLines; |
210 | q = p + TermWin.saveLines; |
211 | rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, |
211 | scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); |
212 | q, DEFAULT_RSTYLE); |
212 | scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); |
213 | rxvt_blank_screen_mem(aR_ R->swap.text, R->swap.rend, |
|
|
214 | p, DEFAULT_RSTYLE); |
|
|
215 | R->screen.tlen[q] = R->swap.tlen[p] = 0; |
213 | screen.tlen[q] = swap.tlen[p] = 0; |
216 | rxvt_blank_screen_mem(aR_ R->drawn_text, R->drawn_rend, |
214 | scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); |
217 | p, DEFAULT_RSTYLE); |
|
|
218 | } |
215 | } |
|
|
216 | |
219 | MEMSET(R->charsets, 'B', sizeof(R->charsets)); |
217 | MEMSET(charsets, 'B', sizeof(charsets)); |
220 | R->TermWin.nscrolled = 0; /* no saved lines */ |
218 | TermWin.nscrolled = 0; /* no saved lines */ |
221 | R->rstyle = DEFAULT_RSTYLE; |
219 | rstyle = DEFAULT_RSTYLE; |
222 | R->screen.flags = Screen_DefaultFlags; |
220 | screen.flags = Screen_DefaultFlags; |
223 | R->screen.cur.row = R->screen.cur.col = 0; |
221 | screen.cur.row = screen.cur.col = 0; |
224 | R->screen.charset = 0; |
222 | screen.charset = 0; |
225 | R->current_screen = PRIMARY; |
223 | current_screen = PRIMARY; |
226 | rxvt_scr_cursor(aR_ SAVE); |
224 | rxvt_scr_cursor (this, SAVE); |
|
|
225 | |
227 | #if NSCREENS |
226 | #if NSCREENS |
228 | R->swap.flags = Screen_DefaultFlags; |
227 | swap.flags = Screen_DefaultFlags; |
229 | R->swap.cur.row = R->swap.cur.col = 0; |
228 | swap.cur.row = swap.cur.col = 0; |
230 | R->swap.charset = 0; |
229 | swap.charset = 0; |
231 | R->current_screen = SECONDARY; |
230 | current_screen = SECONDARY; |
232 | rxvt_scr_cursor(aR_ SAVE); |
231 | rxvt_scr_cursor (this, SAVE); |
233 | R->current_screen = PRIMARY; |
232 | current_screen = PRIMARY; |
234 | #endif |
233 | #endif |
|
|
234 | |
235 | R->selection.text = NULL; |
235 | selection.text = NULL; |
236 | R->selection.len = 0; |
236 | selection.len = 0; |
237 | R->selection.op = SELECTION_CLEAR; |
237 | selection.op = SELECTION_CLEAR; |
238 | R->selection.screen = PRIMARY; |
238 | selection.screen = PRIMARY; |
239 | R->selection.clicks = 0; |
239 | selection.clicks = 0; |
240 | CLEAR_ALL_SELECTION(R); |
240 | CLEAR_ALL_SELECTION (this); |
241 | R->rvideo = 0; |
241 | rvideo = 0; |
242 | |
242 | } |
243 | } else { |
243 | else |
244 | /* |
244 | { |
|
|
245 | /* |
245 | * B1: add or delete rows as appropriate |
246 | * add or delete rows as appropriate |
246 | */ |
247 | */ |
247 | setrstyle = DEFAULT_RSTYLE; |
248 | setrstyle = DEFAULT_RSTYLE; |
248 | |
249 | |
249 | if (nrow < prev_nrow) { |
250 | if (nrow < prev_nrow) |
|
|
251 | { |
250 | /* delete rows */ |
252 | /* delete rows */ |
251 | k = min(R->TermWin.nscrolled, prev_nrow - nrow); |
253 | k = min (TermWin.nscrolled, prev_nrow - nrow); |
252 | rxvt_scroll_text(aR_ 0, (int)prev_nrow - 1, k, 1); |
254 | scr_scroll_text (0, (int)prev_nrow - 1, k, 1); |
|
|
255 | |
253 | for (p = nrow; p < prev_nrow; p++) { |
256 | for (p = nrow; p < prev_nrow; p++) |
|
|
257 | { |
254 | q = p + R->TermWin.saveLines; |
258 | q = p + TermWin.saveLines; |
255 | if (R->screen.text[q]) { |
259 | if (screen.text[q]) |
|
|
260 | { |
256 | #ifdef DEBUG_STRICT |
261 | #ifdef DEBUG_STRICT |
257 | assert(R->screen.rend[q]); |
262 | assert (screen.rend[q]); |
258 | #endif |
263 | #endif |
259 | free(R->screen.text[q]); |
264 | talloc->free (screen.text[q]); |
260 | free(R->screen.rend[q]); |
265 | ralloc->free (screen.rend[q]); |
261 | } |
266 | } |
262 | if (R->swap.text[p]) { |
267 | if (swap.text[p]) |
|
|
268 | { |
263 | #ifdef DEBUG_STRICT |
269 | #ifdef DEBUG_STRICT |
264 | assert(R->swap.rend[p]); |
270 | assert (swap.rend[p]); |
265 | #endif |
271 | #endif |
266 | free(R->swap.text[p]); |
272 | talloc->free (swap.text[p]); |
267 | free(R->swap.rend[p]); |
273 | ralloc->free (swap.rend[p]); |
268 | } |
274 | } |
269 | #ifdef DEBUG_STRICT |
275 | #ifdef DEBUG_STRICT |
270 | assert(R->drawn_text[p] && R->drawn_rend[p]); |
276 | assert (drawn_text[p] && drawn_rend[p]); |
271 | #endif |
277 | #endif |
272 | free(R->drawn_text[p]); |
278 | talloc->free (drawn_text[p]); |
273 | free(R->drawn_rend[p]); |
279 | ralloc->free (drawn_rend[p]); |
274 | } |
280 | } |
|
|
281 | |
275 | /* we have fewer rows so fix up cursor position */ |
282 | /* we have fewer rows so fix up cursor position */ |
276 | MIN_IT(R->screen.cur.row, (int32_t)nrow - 1); |
283 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
277 | MIN_IT(R->swap.cur.row, (int32_t)nrow - 1); |
284 | MIN_IT (swap.cur.row, (int32_t)nrow - 1); |
278 | |
285 | |
279 | rxvt_scr_reset_realloc(aR); /* realloc _last_ */ |
286 | scr_reset_realloc (); /* realloc _last_ */ |
280 | |
287 | } |
281 | } else if (nrow > prev_nrow) { |
288 | else if (nrow > prev_nrow) |
|
|
289 | { |
282 | /* add rows */ |
290 | /* add rows */ |
283 | rxvt_scr_reset_realloc(aR); /* realloc _first_ */ |
291 | scr_reset_realloc (); /* realloc _first_ */ |
284 | |
292 | |
|
|
293 | TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
|
|
294 | |
285 | k = min(R->TermWin.nscrolled, nrow - prev_nrow); |
295 | k = min (TermWin.nscrolled, nrow - prev_nrow); |
|
|
296 | |
286 | for (p = prev_total_rows; p < total_rows; p++) { |
297 | for (p = prev_total_rows; p < total_rows; p++) |
|
|
298 | { |
287 | R->screen.tlen[p] = 0; |
299 | screen.tlen[p] = 0; |
288 | R->screen.text[p] = NULL; |
300 | screen.text[p] = NULL; |
289 | R->screen.rend[p] = NULL; |
301 | screen.rend[p] = NULL; |
290 | } |
302 | } |
|
|
303 | |
291 | for (p = prev_total_rows; p < total_rows - k; p++) |
304 | for (p = prev_total_rows; p < total_rows - k; p++) |
292 | rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, |
305 | scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle); |
293 | p, setrstyle); |
306 | |
294 | for (p = prev_nrow; p < nrow; p++) { |
307 | for (p = prev_nrow; p < nrow; p++) |
|
|
308 | { |
295 | R->swap.tlen[p] = 0; |
309 | swap.tlen[p] = 0; |
296 | R->swap.text[p] = NULL; |
310 | swap.text[p] = NULL; |
297 | R->swap.rend[p] = NULL; |
311 | swap.rend[p] = NULL; |
298 | R->drawn_text[p] = NULL; |
312 | drawn_text[p] = NULL; |
299 | R->drawn_rend[p] = NULL; |
313 | drawn_rend[p] = NULL; |
300 | rxvt_blank_screen_mem(aR_ R->swap.text, R->swap.rend, |
314 | scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); |
301 | p, setrstyle); |
|
|
302 | rxvt_blank_screen_mem(aR_ R->drawn_text, R->drawn_rend, |
315 | scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); |
303 | p, setrstyle); |
|
|
304 | } |
316 | } |
|
|
317 | |
305 | if (k > 0) { |
318 | if (k > 0) |
|
|
319 | { |
306 | rxvt_scroll_text(aR_ 0, (int)nrow - 1, -k, 1); |
320 | scr_scroll_text (0, (int)nrow - 1, -k, 1); |
307 | R->screen.cur.row += k; |
321 | screen.cur.row += k; |
308 | R->screen.s_cur.row += k; |
322 | screen.s_cur.row += k; |
309 | R->TermWin.nscrolled -= k; |
323 | TermWin.nscrolled -= k; |
310 | } |
324 | } |
311 | #ifdef DEBUG_STRICT |
325 | #ifdef DEBUG_STRICT |
312 | assert(R->screen.cur.row < R->TermWin.nrow); |
326 | assert(screen.cur.row < TermWin.nrow); |
313 | assert(R->swap.cur.row < R->TermWin.nrow); |
327 | assert(swap.cur.row < TermWin.nrow); |
314 | #else /* drive with your eyes closed */ |
328 | #else /* drive with your eyes closed */ |
|
|
329 | |
315 | MIN_IT(R->screen.cur.row, nrow - 1); |
330 | MIN_IT(screen.cur.row, nrow - 1); |
316 | MIN_IT(R->swap.cur.row, nrow - 1); |
331 | MIN_IT(swap.cur.row, nrow - 1); |
317 | #endif |
332 | #endif |
|
|
333 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
318 | } |
334 | } |
|
|
335 | |
319 | /* B2: resize columns */ |
336 | /* resize columns */ |
320 | if (ncol != prev_ncol) { |
337 | if (ncol != prev_ncol) |
|
|
338 | { |
|
|
339 | int common = min (prev_ncol, ncol); |
|
|
340 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
341 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
342 | |
321 | for (p = 0; p < total_rows; p++) { |
343 | for (p = 0; p < total_rows; p++) |
|
|
344 | { |
322 | if (R->screen.text[p]) { |
345 | if (screen.text[p]) |
323 | R->screen.text[p] = (text_t *)rxvt_realloc(R->screen.text[p], ncol * sizeof(text_t)); |
346 | { |
324 | R->screen.rend[p] = (rend_t *)rxvt_realloc(R->screen.rend[p], ncol * sizeof(rend_t)); |
347 | text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; |
|
|
348 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r; |
|
|
349 | |
325 | MIN_IT(R->screen.tlen[p], (int16_t)ncol); |
350 | MIN_IT(screen.tlen[p], (int16_t)ncol); |
|
|
351 | |
326 | if (ncol > prev_ncol) |
352 | if (ncol > prev_ncol) |
327 | rxvt_blank_line(aR_ |
353 | scr_blank_line (&(screen.text[p][prev_ncol]), |
328 | &(R->screen.text[p][prev_ncol]), |
|
|
329 | &(R->screen.rend[p][prev_ncol]), |
354 | &(screen.rend[p][prev_ncol]), |
330 | ncol - prev_ncol, |
355 | ncol - prev_ncol, |
331 | setrstyle); |
356 | setrstyle); |
332 | } |
357 | } |
333 | } |
358 | } |
|
|
359 | |
334 | for (p = 0; p < nrow; p++) { |
360 | for (p = 0; p < nrow; p++) |
335 | R->drawn_text[p] = (text_t *)rxvt_realloc(R->drawn_text[p], ncol * sizeof(text_t)); |
361 | { |
336 | R->drawn_rend[p] = (rend_t *)rxvt_realloc(R->drawn_rend[p], ncol * sizeof(rend_t)); |
362 | text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t; |
|
|
363 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r; |
|
|
364 | |
|
|
365 | if (ncol > prev_ncol) |
|
|
366 | scr_blank_line (&(drawn_text[p][prev_ncol]), |
|
|
367 | &(drawn_rend[p][prev_ncol]), |
|
|
368 | ncol - prev_ncol, setrstyle); |
|
|
369 | |
337 | if (R->swap.text[p]) { |
370 | if (swap.text[p]) |
338 | R->swap.text[p] = (text_t *)rxvt_realloc(R->swap.text[p], ncol * sizeof(text_t)); |
371 | { |
339 | R->swap.rend[p] = (rend_t *)rxvt_realloc(R->swap.rend[p], ncol * sizeof(rend_t)); |
372 | text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t; |
|
|
373 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r; |
|
|
374 | |
340 | MIN_IT(R->swap.tlen[p], (int16_t)ncol); |
375 | MIN_IT(swap.tlen[p], (int16_t)ncol); |
|
|
376 | |
341 | if (ncol > prev_ncol) |
377 | if (ncol > prev_ncol) |
342 | rxvt_blank_line(aR_ |
378 | scr_blank_line (&(swap.text[p][prev_ncol]), |
343 | &(R->swap.text[p][prev_ncol]), |
|
|
344 | &(R->swap.rend[p][prev_ncol]), |
379 | &(swap.rend[p][prev_ncol]), |
345 | ncol - prev_ncol, setrstyle); |
380 | ncol - prev_ncol, setrstyle); |
346 | } |
381 | } |
347 | if (ncol > prev_ncol) |
382 | |
348 | rxvt_blank_line(aR_ |
|
|
349 | &(R->drawn_text[p][prev_ncol]), |
|
|
350 | &(R->drawn_rend[p][prev_ncol]), |
|
|
351 | ncol - prev_ncol, setrstyle); |
|
|
352 | } |
383 | } |
|
|
384 | |
353 | MIN_IT(R->screen.cur.col, (int16_t)ncol - 1); |
385 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
354 | MIN_IT(R->swap.cur.col, (int16_t)ncol - 1); |
386 | MIN_IT (swap.cur.col, (int16_t)ncol - 1); |
|
|
387 | |
|
|
388 | delete talloc; talloc = ta; |
|
|
389 | delete ralloc; ralloc = ra; |
355 | } |
390 | } |
|
|
391 | |
356 | if (R->tabs) |
392 | if (tabs) |
357 | free(R->tabs); |
393 | free(tabs); |
358 | } |
394 | } |
359 | |
395 | |
|
|
396 | prev_nrow = nrow; |
|
|
397 | prev_ncol = ncol; |
|
|
398 | |
360 | R->tabs = (char *)rxvt_malloc(ncol * sizeof(char)); |
399 | tabs = (char *)rxvt_malloc (ncol * sizeof(char)); |
361 | |
400 | |
362 | for (p = 0; p < ncol; p++) |
401 | for (p = 0; p < ncol; p++) |
363 | R->tabs[p] = (p % TABSIZE == 0) ? 1 : 0; |
402 | tabs[p] = (p % TABSIZE == 0) ? 1 : 0; |
364 | |
403 | |
365 | R->prev_nrow = nrow; |
404 | tt_winch (); |
366 | R->prev_ncol = ncol; |
|
|
367 | |
|
|
368 | rxvt_tt_winsize(R->cmd_fd, R->TermWin.ncol, R->TermWin.nrow, R->cmd_pid); |
|
|
369 | } |
405 | } |
370 | |
406 | |
371 | /* INTPROTO */ |
|
|
372 | void |
407 | void |
373 | rxvt_scr_reset_realloc(pR) |
408 | rxvt_term::scr_reset_realloc() |
374 | { |
409 | { |
375 | uint16_t total_rows, nrow; |
410 | uint16_t total_rows, nrow; |
376 | |
411 | |
377 | nrow = R->TermWin.nrow; |
412 | nrow = TermWin.nrow; |
378 | total_rows = nrow + R->TermWin.saveLines; |
413 | total_rows = nrow + TermWin.saveLines; |
379 | /* *INDENT-OFF* */ |
414 | /* *INDENT-OFF* */ |
380 | R->screen.text = (text_t **)rxvt_realloc(R->screen.text, total_rows * sizeof(text_t *)); |
415 | screen.text = (text_t **)rxvt_realloc(screen.text, total_rows * sizeof(text_t *)); |
381 | R->buf_text = (text_t **)rxvt_realloc(R->buf_text , total_rows * sizeof(text_t *)); |
416 | buf_text = (text_t **)rxvt_realloc(buf_text , total_rows * sizeof(text_t *)); |
382 | R->drawn_text = (text_t **)rxvt_realloc(R->drawn_text , nrow * sizeof(text_t *)); |
417 | drawn_text = (text_t **)rxvt_realloc(drawn_text , nrow * sizeof(text_t *)); |
383 | R->swap.text = (text_t **)rxvt_realloc(R->swap.text , nrow * sizeof(text_t *)); |
418 | swap.text = (text_t **)rxvt_realloc(swap.text , nrow * sizeof(text_t *)); |
384 | |
419 | |
385 | R->screen.tlen = (int16_t *)rxvt_realloc(R->screen.tlen, total_rows * sizeof(int16_t)); |
420 | screen.tlen = (int16_t *)rxvt_realloc(screen.tlen, total_rows * sizeof(int16_t)); |
386 | R->swap.tlen = (int16_t *)rxvt_realloc(R->swap.tlen , total_rows * sizeof(int16_t)); |
421 | swap.tlen = (int16_t *)rxvt_realloc(swap.tlen , total_rows * sizeof(int16_t)); |
387 | |
422 | |
388 | R->screen.rend = (rend_t **)rxvt_realloc(R->screen.rend, total_rows * sizeof(rend_t *)); |
423 | screen.rend = (rend_t **)rxvt_realloc(screen.rend, total_rows * sizeof(rend_t *)); |
389 | R->buf_rend = (rend_t **)rxvt_realloc(R->buf_rend , total_rows * sizeof(rend_t *)); |
424 | buf_rend = (rend_t **)rxvt_realloc(buf_rend , total_rows * sizeof(rend_t *)); |
390 | R->drawn_rend = (rend_t **)rxvt_realloc(R->drawn_rend , nrow * sizeof(rend_t *)); |
425 | drawn_rend = (rend_t **)rxvt_realloc(drawn_rend , nrow * sizeof(rend_t *)); |
391 | R->swap.rend = (rend_t **)rxvt_realloc(R->swap.rend , nrow * sizeof(rend_t *)); |
426 | swap.rend = (rend_t **)rxvt_realloc(swap.rend , nrow * sizeof(rend_t *)); |
392 | /* *INDENT-ON* */ |
427 | /* *INDENT-ON* */ |
393 | } |
428 | } |
394 | |
429 | |
395 | /* ------------------------------------------------------------------------- */ |
430 | /* ------------------------------------------------------------------------- */ |
396 | /* |
431 | /* |
397 | * Free everything. That way malloc debugging can find leakage. |
432 | * Free everything. That way malloc debugging can find leakage. |
398 | */ |
433 | */ |
399 | /* EXTPROTO */ |
|
|
400 | void |
434 | void |
401 | rxvt_scr_release(pR) |
435 | rxvt_term::scr_release() |
402 | { |
436 | { |
403 | uint16_t total_rows; |
437 | uint16_t total_rows; |
404 | int i; |
438 | int i; |
405 | |
439 | |
406 | total_rows = R->TermWin.nrow + R->TermWin.saveLines; |
440 | total_rows = TermWin.nrow + TermWin.saveLines; |
407 | for (i = 0; i < total_rows; i++) { |
441 | |
408 | if (R->screen.text[i]) { /* then so is R->screen.rend[i] */ |
|
|
409 | free(R->screen.text[i]); |
|
|
410 | #ifdef DEBUG_STRICT |
442 | #ifdef DEBUG_STRICT |
|
|
443 | for (i = 0; i < total_rows; i++) |
|
|
444 | { |
|
|
445 | if (screen.text[i]) |
|
|
446 | /* then so is screen.rend[i] */ |
411 | assert(R->screen.rend[i]); |
447 | assert(screen.rend[i]); |
412 | #endif |
|
|
413 | free(R->screen.rend[i]); |
|
|
414 | } |
|
|
415 | } |
448 | } |
416 | for (i = 0; i < R->TermWin.nrow; i++) { |
449 | #endif |
417 | free(R->drawn_text[i]); |
450 | |
418 | free(R->drawn_rend[i]); |
451 | delete talloc; talloc = 0; |
419 | free(R->swap.text[i]); |
452 | delete ralloc; ralloc = 0; |
420 | free(R->swap.rend[i]); |
453 | |
421 | } |
|
|
422 | free(R->screen.text); |
454 | free (screen.text); |
423 | free(R->screen.tlen); |
455 | free (screen.tlen); |
424 | free(R->screen.rend); |
456 | free (screen.rend); |
425 | free(R->drawn_text); |
457 | free (drawn_text); |
426 | free(R->drawn_rend); |
458 | free (drawn_rend); |
427 | free(R->swap.text); |
459 | free (swap.text); |
428 | free(R->swap.tlen); |
460 | free (swap.tlen); |
429 | free(R->swap.rend); |
461 | free (swap.rend); |
430 | free(R->buf_text); |
462 | free (buf_text); |
431 | free(R->buf_rend); |
463 | free (buf_rend); |
432 | free(R->tabs); |
464 | free (tabs); |
433 | |
465 | |
434 | /* NULL these so if anything tries to use them, we'll know about it */ |
466 | /* NULL these so if anything tries to use them, we'll know about it */ |
435 | R->screen.text = R->drawn_text = R->swap.text = NULL; |
467 | screen.text = drawn_text = swap.text = NULL; |
436 | R->screen.rend = R->drawn_rend = R->swap.rend = NULL; |
468 | screen.rend = drawn_rend = swap.rend = NULL; |
437 | R->screen.tlen = R->swap.tlen = NULL; |
469 | screen.tlen = swap.tlen = NULL; |
438 | R->buf_text = NULL; |
470 | buf_text = NULL; |
439 | R->buf_rend = NULL; |
471 | buf_rend = NULL; |
440 | R->tabs = NULL; |
472 | tabs = NULL; |
441 | } |
473 | } |
442 | |
474 | |
443 | /* ------------------------------------------------------------------------- */ |
475 | /* ------------------------------------------------------------------------- */ |
444 | /* |
476 | /* |
445 | * Hard reset |
477 | * Hard reset |
446 | */ |
478 | */ |
447 | /* EXTPROTO */ |
479 | /* EXTPROTO */ |
448 | void |
480 | void |
449 | rxvt_scr_poweron(pR) |
481 | rxvt_scr_poweron(pR) |
450 | { |
482 | { |
451 | D_SCREEN((stderr, "rxvt_scr_poweron()")); |
483 | D_SCREEN((stderr, "rxvt_scr_poweron()")); |
452 | |
484 | |
453 | rxvt_scr_release(aR); |
485 | R->scr_release (); |
454 | R->prev_nrow = R->prev_ncol = 0; |
486 | R->prev_nrow = R->prev_ncol = 0; |
455 | rxvt_scr_reset(aR); |
487 | R->scr_reset (); |
456 | |
488 | |
457 | rxvt_scr_clear(aR); |
489 | R->scr_clear (); |
458 | rxvt_scr_refresh(aR_ SLOW_REFRESH); |
490 | R->scr_refresh (SLOW_REFRESH); |
459 | #ifdef RXVT_GRAPHICS |
491 | #ifdef RXVT_GRAPHICS |
460 | rxvt_Gr_reset(aR); |
492 | rxvt_Gr_reset (aR); |
461 | #endif |
493 | #endif |
462 | } |
494 | } |
463 | |
495 | |
464 | /* ------------------------------------------------------------------------- * |
496 | /* ------------------------------------------------------------------------- * |
465 | * PROCESS SCREEN COMMANDS * |
497 | * PROCESS SCREEN COMMANDS * |
… | |
… | |
532 | R->want_refresh = 1; |
564 | R->want_refresh = 1; |
533 | |
565 | |
534 | D_SCREEN((stderr, "rxvt_scr_change_screen(%d)", scrn)); |
566 | D_SCREEN((stderr, "rxvt_scr_change_screen(%d)", scrn)); |
535 | |
567 | |
536 | R->TermWin.view_start = 0; |
568 | R->TermWin.view_start = 0; |
537 | RESET_CHSTAT(R); |
|
|
538 | |
569 | |
539 | if (R->current_screen == scrn) |
570 | if (R->current_screen == scrn) |
540 | return R->current_screen; |
571 | return R->current_screen; |
541 | |
572 | |
542 | rxvt_selection_check(aR_ 2); /* check for boundary cross */ |
573 | rxvt_selection_check(aR_ 2); /* check for boundary cross */ |
… | |
… | |
582 | if (R->current_screen == PRIMARY |
613 | if (R->current_screen == PRIMARY |
583 | # ifdef RXVT_GRAPHICS |
614 | # ifdef RXVT_GRAPHICS |
584 | && !rxvt_Gr_Displayed(aR) |
615 | && !rxvt_Gr_Displayed(aR) |
585 | # endif |
616 | # endif |
586 | ) |
617 | ) |
587 | rxvt_scroll_text(aR_ 0, (R->prev_nrow - 1), R->prev_nrow, 0); |
618 | R->scr_scroll_text(0, (R->prev_nrow - 1), R->prev_nrow, 0); |
588 | # endif |
619 | # endif |
589 | #endif |
620 | #endif |
590 | return scrn; |
621 | return scrn; |
591 | } |
622 | } |
592 | |
623 | |
… | |
… | |
626 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
657 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
627 | * count positive ==> scroll up |
658 | * count positive ==> scroll up |
628 | * count negative ==> scroll down |
659 | * count negative ==> scroll down |
629 | * spec == 0 for normal routines |
660 | * spec == 0 for normal routines |
630 | */ |
661 | */ |
631 | /* EXTPROTO */ |
|
|
632 | int |
662 | int |
633 | rxvt_scroll_text(pR_ int row1, int row2, int count, int spec) |
663 | rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) |
634 | { |
664 | { |
635 | int i, j; |
665 | int i, j; |
636 | long nscrolled; |
666 | long nscrolled; |
637 | |
667 | |
638 | if (count == 0 || (row1 > row2)) |
668 | if (count == 0 || (row1 > row2)) |
639 | return 0; |
669 | return 0; |
640 | |
670 | |
641 | R->want_refresh = 1; |
671 | 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")); |
672 | D_SCREEN((stderr, "rxvt_scroll_text(%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); |
643 | |
673 | |
644 | if ((count > 0) && (row1 == 0) && (R->current_screen == PRIMARY)) { |
674 | if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) |
|
|
675 | { |
645 | nscrolled = (long)R->TermWin.nscrolled + (long)count;; |
676 | nscrolled = (long)TermWin.nscrolled + (long)count; |
|
|
677 | |
646 | if (nscrolled > (long)R->TermWin.saveLines) |
678 | if (nscrolled > (long)TermWin.saveLines) |
647 | R->TermWin.nscrolled = R->TermWin.saveLines; |
679 | TermWin.nscrolled = TermWin.saveLines; |
648 | else |
680 | else |
649 | R->TermWin.nscrolled = (uint16_t)nscrolled; |
681 | TermWin.nscrolled = (uint16_t)nscrolled; |
|
|
682 | |
650 | if ((R->Options & Opt_scrollWithBuffer) |
683 | if ((Options & Opt_scrollWithBuffer) |
651 | && R->TermWin.view_start != 0 |
684 | && TermWin.view_start != 0 |
652 | && R->TermWin.view_start != R->TermWin.saveLines) |
685 | && TermWin.view_start != TermWin.saveLines) |
653 | rxvt_scr_page(aR_ UP, count); |
686 | rxvt_scr_page (this, UP, count); |
|
|
687 | } |
654 | } else if (!spec) |
688 | else if (!spec) |
655 | row1 += R->TermWin.saveLines; |
|
|
656 | row2 += R->TermWin.saveLines; |
689 | row1 += TermWin.saveLines; |
657 | |
690 | |
|
|
691 | row2 += TermWin.saveLines; |
|
|
692 | |
658 | if (R->selection.op && R->current_screen == R->selection.screen) { |
693 | if (selection.op && current_screen == selection.screen) |
|
|
694 | { |
659 | i = R->selection.beg.row + R->TermWin.saveLines; |
695 | i = selection.beg.row + TermWin.saveLines; |
660 | j = R->selection.end.row + R->TermWin.saveLines; |
696 | j = selection.end.row + TermWin.saveLines; |
661 | if ((i < row1 && j > row1) |
697 | if ((i < row1 && j > row1) |
662 | || (i < row2 && j > row2) |
698 | || (i < row2 && j > row2) |
663 | || (i - count < row1 && i >= row1) |
699 | || (i - count < row1 && i >= row1) |
664 | || (i - count > row2 && i <= row2) |
700 | || (i - count > row2 && i <= row2) |
665 | || (j - count < row1 && j >= row1) |
701 | || (j - count < row1 && j >= row1) |
666 | || (j - count > row2 && j <= row2)) { |
702 | || (j - count > row2 && j <= row2)) |
|
|
703 | { |
667 | CLEAR_ALL_SELECTION(R); |
704 | CLEAR_ALL_SELECTION (this); |
668 | R->selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
705 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
|
|
706 | } |
669 | } else if (j >= row1 && j <= row2) { |
707 | else if (j >= row1 && j <= row2) |
|
|
708 | { |
670 | /* move selected region too */ |
709 | /* move selected region too */ |
671 | R->selection.beg.row -= count; |
710 | selection.beg.row -= count; |
672 | R->selection.end.row -= count; |
711 | selection.end.row -= count; |
673 | R->selection.mark.row -= count; |
712 | selection.mark.row -= count; |
674 | } |
713 | } |
675 | } |
714 | } |
|
|
715 | |
676 | rxvt_selection_check(aR_ 0); /* _after_ R->TermWin.nscrolled update */ |
716 | rxvt_selection_check (this, 0); /* _after_ TermWin.nscrolled update */ |
677 | |
717 | |
678 | R->num_scr += count; |
718 | num_scr += count; |
679 | j = count; |
719 | j = count; |
|
|
720 | |
680 | if (count < 0) |
721 | if (count < 0) |
681 | count = -count; |
722 | count = -count; |
|
|
723 | |
682 | i = row2 - row1 + 1; |
724 | i = row2 - row1 + 1; |
683 | MIN_IT(count, i); |
725 | MIN_IT(count, i); |
684 | |
726 | |
685 | if (j > 0) { |
727 | if (j > 0) |
|
|
728 | { |
686 | /* A: scroll up */ |
729 | /* A: scroll up */ |
687 | |
730 | |
688 | /* A1: Copy lines that will get clobbered by the rotation */ |
731 | /* A1: Copy lines that will get clobbered by the rotation */ |
689 | for (i = 0, j = row1; i < count; i++, j++) { |
732 | for (i = 0, j = row1; i < count; i++, j++) |
|
|
733 | { |
690 | R->buf_text[i] = R->screen.text[j]; |
734 | buf_text[i] = screen.text[j]; |
691 | R->buf_rend[i] = R->screen.rend[j]; |
735 | buf_rend[i] = screen.rend[j]; |
692 | } |
736 | } |
693 | /* A2: Rotate lines */ |
737 | /* A2: Rotate lines */ |
694 | for (j = row1, i = j + count; i <= row2; i++, j++) { |
738 | for (j = row1, i = j + count; i <= row2; i++, j++) |
|
|
739 | { |
695 | R->screen.tlen[j] = R->screen.tlen[i]; |
740 | screen.tlen[j] = screen.tlen[i]; |
696 | R->screen.text[j] = R->screen.text[i]; |
741 | screen.text[j] = screen.text[i]; |
697 | R->screen.rend[j] = R->screen.rend[i]; |
742 | screen.rend[j] = screen.rend[i]; |
698 | } |
743 | } |
699 | j = row2 - count + 1, i = count; |
744 | j = row2 - count + 1, i = count; |
|
|
745 | } |
700 | } else /* if (j < 0) */ { |
746 | else /* if (j < 0) */ |
|
|
747 | { |
701 | /* B: scroll down */ |
748 | /* B: scroll down */ |
702 | |
749 | |
703 | /* B1: Copy lines that will get clobbered by the rotation */ |
750 | /* B1: Copy lines that will get clobbered by the rotation */ |
704 | for (i = 0, j = row2; i < count; i++, j--) { |
751 | for (i = 0, j = row2; i < count; i++, j--) |
|
|
752 | { |
705 | R->buf_text[i] = R->screen.text[j]; |
753 | buf_text[i] = screen.text[j]; |
706 | R->buf_rend[i] = R->screen.rend[j]; |
754 | buf_rend[i] = screen.rend[j]; |
707 | } |
755 | } |
708 | /* B2: Rotate lines */ |
756 | /* B2: Rotate lines */ |
709 | for (j = row2, i = j - count; i >= row1; i--, j--) { |
757 | for (j = row2, i = j - count; i >= row1; i--, j--) |
|
|
758 | { |
710 | R->screen.tlen[j] = R->screen.tlen[i]; |
759 | screen.tlen[j] = screen.tlen[i]; |
711 | R->screen.text[j] = R->screen.text[i]; |
760 | screen.text[j] = screen.text[i]; |
712 | R->screen.rend[j] = R->screen.rend[i]; |
761 | screen.rend[j] = screen.rend[i]; |
713 | } |
762 | } |
714 | j = row1, i = count; |
763 | j = row1, i = count; |
715 | count = -count; |
764 | count = -count; |
716 | } |
765 | } |
717 | |
766 | |
718 | /* C: Resurrect lines */ |
767 | /* C: Resurrect lines */ |
719 | for (; i--; j++) { |
768 | for (; i--; j++) |
|
|
769 | { |
720 | R->screen.tlen[j] = 0; |
770 | screen.tlen[j] = 0; |
721 | R->screen.text[j] = R->buf_text[i]; |
771 | screen.text[j] = buf_text[i]; |
722 | R->screen.rend[j] = R->buf_rend[i]; |
772 | screen.rend[j] = buf_rend[i]; |
|
|
773 | |
723 | if (!spec) /* line length may not equal TermWin.ncol */ |
774 | if (!spec) /* line length may not equal TermWin.ncol */ |
724 | rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, |
775 | scr_blank_screen_mem (screen.text, screen.rend, |
725 | (unsigned int)j, R->rstyle); |
776 | (unsigned int)j, rstyle); |
726 | } |
777 | } |
727 | |
778 | |
728 | #ifdef RXVT_GRAPHICS |
779 | #ifdef RXVT_GRAPHICS |
729 | if (rxvt_Gr_Displayed(aR)) |
780 | if (rxvt_Gr_Displayed (this)) |
730 | rxvt_Gr_scroll(aR_ count); |
781 | rxvt_Gr_scroll(this, count); |
731 | #endif |
782 | #endif |
|
|
783 | |
732 | return count; |
784 | return count; |
733 | } |
785 | } |
734 | |
786 | |
735 | /* ------------------------------------------------------------------------- */ |
787 | /* ------------------------------------------------------------------------- */ |
736 | /* |
788 | /* |
737 | * Add text given in <str> of length <len> to screen struct |
789 | * Add text given in <str> of length <len> to screen struct |
… | |
… | |
758 | nlines += (R->screen.cur.row - R->screen.bscroll); |
810 | nlines += (R->screen.cur.row - R->screen.bscroll); |
759 | if ((nlines > 0) |
811 | if ((nlines > 0) |
760 | && (R->screen.tscroll == 0) |
812 | && (R->screen.tscroll == 0) |
761 | && (R->screen.bscroll == (R->TermWin.nrow - 1))) { |
813 | && (R->screen.bscroll == (R->TermWin.nrow - 1))) { |
762 | /* _at least_ this many lines need to be scrolled */ |
814 | /* _at least_ this many lines need to be scrolled */ |
763 | rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, nlines, |
815 | R->scr_scroll_text(R->screen.tscroll, R->screen.bscroll, nlines, 0); |
764 | 0); |
|
|
765 | R->screen.cur.row -= nlines; |
816 | R->screen.cur.row -= nlines; |
766 | } |
817 | } |
767 | } |
818 | } |
768 | #ifdef DEBUG_STRICT |
819 | #ifdef DEBUG_STRICT |
769 | assert(R->screen.cur.col < last_col); |
820 | assert(R->screen.cur.col < last_col); |
… | |
… | |
785 | |
836 | |
786 | for (i = 0; i < len;) { |
837 | for (i = 0; i < len;) { |
787 | c = str[i++]; |
838 | c = str[i++]; |
788 | switch (c) { |
839 | switch (c) { |
789 | case '\t': |
840 | case '\t': |
790 | rxvt_scr_tab(aR_ 1); |
841 | rxvt_scr_tab (aR_ 1); |
791 | continue; |
842 | continue; |
792 | case '\n': |
843 | case '\n': |
793 | if (R->screen.tlen[row] != -1) /* XXX: think about this */ |
844 | if (R->screen.tlen[row] != -1) /* XXX: think about this */ |
794 | MAX_IT(R->screen.tlen[row], R->screen.cur.col); |
845 | MAX_IT(R->screen.tlen[row], R->screen.cur.col); |
795 | R->screen.flags &= ~Screen_WrapNext; |
846 | R->screen.flags &= ~Screen_WrapNext; |
796 | if (R->screen.cur.row == R->screen.bscroll) |
847 | if (R->screen.cur.row == R->screen.bscroll) |
797 | rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, 1, 0); |
848 | R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, 1, 0); |
798 | else if (R->screen.cur.row < (R->TermWin.nrow - 1)) |
849 | else if (R->screen.cur.row < (R->TermWin.nrow - 1)) |
799 | row = (++R->screen.cur.row) + R->TermWin.saveLines; |
850 | row = (++R->screen.cur.row) + R->TermWin.saveLines; |
800 | stp = R->screen.text[row]; /* _must_ refresh */ |
851 | stp = R->screen.text[row]; /* _must_ refresh */ |
801 | srp = R->screen.rend[row]; /* _must_ refresh */ |
852 | srp = R->screen.rend[row]; /* _must_ refresh */ |
802 | RESET_CHSTAT(R); |
|
|
803 | continue; |
853 | continue; |
804 | case '\r': |
854 | case '\r': |
805 | if (R->screen.tlen[row] != -1) /* XXX: think about this */ |
855 | if (R->screen.tlen[row] != -1) /* XXX: think about this */ |
806 | MAX_IT(R->screen.tlen[row], R->screen.cur.col); |
856 | MAX_IT(R->screen.tlen[row], R->screen.cur.col); |
807 | R->screen.flags &= ~Screen_WrapNext; |
857 | R->screen.flags &= ~Screen_WrapNext; |
808 | R->screen.cur.col = 0; |
858 | R->screen.cur.col = 0; |
809 | RESET_CHSTAT(R); |
|
|
810 | continue; |
859 | continue; |
811 | default: |
860 | default: |
812 | if (c == 127) |
861 | if (c == 127) |
813 | continue; /* yummmm..... */ |
862 | continue; /* yummmm..... */ |
814 | break; |
863 | break; |
… | |
… | |
821 | clearsel = 1; |
870 | clearsel = 1; |
822 | } |
871 | } |
823 | if (R->screen.flags & Screen_WrapNext) { |
872 | if (R->screen.flags & Screen_WrapNext) { |
824 | R->screen.tlen[row] = -1; |
873 | R->screen.tlen[row] = -1; |
825 | if (R->screen.cur.row == R->screen.bscroll) |
874 | if (R->screen.cur.row == R->screen.bscroll) |
826 | rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, 1, 0); |
875 | R->scr_scroll_text(R->screen.tscroll, R->screen.bscroll, 1, 0); |
827 | else if (R->screen.cur.row < (R->TermWin.nrow - 1)) |
876 | else if (R->screen.cur.row < (R->TermWin.nrow - 1)) |
828 | row = (++R->screen.cur.row) + R->TermWin.saveLines; |
877 | row = (++R->screen.cur.row) + R->TermWin.saveLines; |
829 | stp = R->screen.text[row]; /* _must_ refresh */ |
878 | stp = R->screen.text[row]; /* _must_ refresh */ |
830 | srp = R->screen.rend[row]; /* _must_ refresh */ |
879 | srp = R->screen.rend[row]; /* _must_ refresh */ |
831 | R->screen.cur.col = 0; |
880 | R->screen.cur.col = 0; |
… | |
… | |
849 | case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break; |
898 | case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break; |
850 | case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; |
899 | case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; |
851 | } |
900 | } |
852 | |
901 | |
853 | rend_t rend = SET_FONT (R->rstyle, R->TermWin.fontset->find_font (c)); |
902 | rend_t rend = SET_FONT (R->rstyle, R->TermWin.fontset->find_font (c)); |
854 | |
|
|
855 | stp[R->screen.cur.col] = c; |
|
|
856 | srp[R->screen.cur.col] = rend; |
|
|
857 | |
|
|
858 | if (c > 255) |
|
|
859 | { |
|
|
860 | // rely on wcwidth to tell us the character width, at least for non iso-8859-1 |
903 | // rely on wcwidth to tell us the character width, at least for non-ascii |
861 | int width = wcwidth (c); |
904 | int width = c <= 128 ? 1 : wcwidth (c); |
|
|
905 | |
|
|
906 | // width -1 characters (e.g. combining chars) are ignored currently. |
|
|
907 | if (width > 0) |
|
|
908 | do |
862 | |
909 | { |
863 | if (width > 1) |
910 | stp[R->screen.cur.col] = c; |
864 | { |
|
|
865 | while (--width > 0 && R->screen.cur.col < last_col - 1) |
|
|
866 | { |
|
|
867 | |
|
|
868 | srp[R->screen.cur.col] |= RS_wide; |
911 | srp[R->screen.cur.col] = rend; |
869 | |
912 | |
|
|
913 | if (R->screen.cur.col < last_col - 1) |
870 | R->screen.cur.col++; |
914 | R->screen.cur.col++; |
871 | stp[R->screen.cur.col] = NOCHAR; |
915 | else |
872 | srp[R->screen.cur.col] = rend; |
|
|
873 | } |
916 | { |
874 | } |
|
|
875 | } |
|
|
876 | |
|
|
877 | if (R->screen.cur.col < last_col - 1) |
|
|
878 | R->screen.cur.col++; |
|
|
879 | else { |
|
|
880 | R->screen.tlen[row] = last_col; |
917 | R->screen.tlen[row] = last_col; |
881 | if (R->screen.flags & Screen_Autowrap) |
918 | if (R->screen.flags & Screen_Autowrap) |
882 | R->screen.flags |= Screen_WrapNext; |
919 | R->screen.flags |= Screen_WrapNext; |
|
|
920 | break; |
|
|
921 | } |
|
|
922 | |
|
|
923 | c = NOCHAR; |
883 | } |
924 | } |
|
|
925 | while (--width > 0); |
|
|
926 | else |
|
|
927 | 1; /* handle combining character etc. here. */ |
884 | } |
928 | } |
|
|
929 | |
885 | if (R->screen.tlen[row] != -1) /* XXX: think about this */ |
930 | if (R->screen.tlen[row] != -1) /* XXX: think about this */ |
886 | MAX_IT(R->screen.tlen[row], R->screen.cur.col); |
931 | MAX_IT(R->screen.tlen[row], R->screen.cur.col); |
887 | |
932 | |
888 | /* |
933 | /* |
889 | * If we wrote anywhere in the selected area, kill the selection |
934 | * If we wrote anywhere in the selected area, kill the selection |
890 | * XXX: should we kill the mark too? Possibly, but maybe that |
935 | * XXX: should we kill the mark too? Possibly, but maybe that |
891 | * should be a similar check. |
936 | * should be a similar check. |
… | |
… | |
907 | */ |
952 | */ |
908 | /* EXTPROTO */ |
953 | /* EXTPROTO */ |
909 | void |
954 | void |
910 | rxvt_scr_backspace(pR) |
955 | rxvt_scr_backspace(pR) |
911 | { |
956 | { |
912 | RESET_CHSTAT(R); |
|
|
913 | R->want_refresh = 1; |
957 | R->want_refresh = 1; |
914 | if (R->screen.cur.col == 0) { |
958 | if (R->screen.cur.col == 0) { |
915 | if (R->screen.cur.row > 0) { |
959 | if (R->screen.cur.row > 0) { |
916 | #ifdef TERMCAP_HAS_BW |
960 | #ifdef TERMCAP_HAS_BW |
917 | R->screen.cur.col = R->TermWin.ncol - 1; |
961 | R->screen.cur.col = R->TermWin.ncol - 1; |
… | |
… | |
936 | { |
980 | { |
937 | int i, x; |
981 | int i, x; |
938 | |
982 | |
939 | D_SCREEN((stderr, "rxvt_scr_tab(%d)", count)); |
983 | D_SCREEN((stderr, "rxvt_scr_tab(%d)", count)); |
940 | R->want_refresh = 1; |
984 | R->want_refresh = 1; |
941 | RESET_CHSTAT(R); |
|
|
942 | i = x = R->screen.cur.col; |
985 | i = x = R->screen.cur.col; |
943 | if (count == 0) |
986 | if (count == 0) |
944 | return; |
987 | return; |
945 | else if (count > 0) { |
988 | else if (count > 0) { |
946 | for (; ++i < R->TermWin.ncol; ) |
989 | for (; ++i < R->TermWin.ncol; ) |
… | |
… | |
1023 | void |
1066 | void |
1024 | rxvt_scr_gotorc(pR_ int row, int col, int relative) |
1067 | rxvt_scr_gotorc(pR_ int row, int col, int relative) |
1025 | { |
1068 | { |
1026 | R->want_refresh = 1; |
1069 | R->want_refresh = 1; |
1027 | ZERO_SCROLLBACK(R); |
1070 | ZERO_SCROLLBACK(R); |
1028 | RESET_CHSTAT(R); |
|
|
1029 | #ifdef RXVT_GRAPHICS |
1071 | #ifdef RXVT_GRAPHICS |
1030 | if (rxvt_Gr_Displayed(aR)) |
1072 | if (rxvt_Gr_Displayed(aR)) |
1031 | rxvt_Gr_scroll(aR_ 0); |
1073 | rxvt_Gr_scroll(aR_ 0); |
1032 | #endif |
1074 | #endif |
1033 | |
1075 | |
… | |
… | |
1077 | R->want_refresh = 1; |
1119 | R->want_refresh = 1; |
1078 | dirn = ((direction == UP) ? 1 : -1); |
1120 | dirn = ((direction == UP) ? 1 : -1); |
1079 | D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn)); |
1121 | D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn)); |
1080 | |
1122 | |
1081 | ZERO_SCROLLBACK(R); |
1123 | ZERO_SCROLLBACK(R); |
1082 | RESET_CHSTAT(R); |
|
|
1083 | |
1124 | |
1084 | #ifdef RXVT_GRAPHICS |
1125 | #ifdef RXVT_GRAPHICS |
1085 | if (rxvt_Gr_Displayed(aR)) |
1126 | if (rxvt_Gr_Displayed(aR)) |
1086 | rxvt_Gr_scroll(aR_ 0); |
1127 | rxvt_Gr_scroll(aR_ 0); |
1087 | #endif |
1128 | #endif |
1088 | |
1129 | |
1089 | R->screen.flags &= ~Screen_WrapNext; |
1130 | R->screen.flags &= ~Screen_WrapNext; |
1090 | if ((R->screen.cur.row == R->screen.bscroll && direction == UP) |
1131 | if ((R->screen.cur.row == R->screen.bscroll && direction == UP) |
1091 | || (R->screen.cur.row == R->screen.tscroll && direction == DN)) |
1132 | || (R->screen.cur.row == R->screen.tscroll && direction == DN)) |
1092 | rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, dirn, 0); |
1133 | R->scr_scroll_text(R->screen.tscroll, R->screen.bscroll, dirn, 0); |
1093 | else |
1134 | else |
1094 | R->screen.cur.row += dirn; |
1135 | R->screen.cur.row += dirn; |
1095 | MAX_IT(R->screen.cur.row, 0); |
1136 | MAX_IT(R->screen.cur.row, 0); |
1096 | MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); |
1137 | MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); |
1097 | rxvt_selection_check(aR_ 0); |
1138 | rxvt_selection_check(aR_ 0); |
… | |
… | |
1106 | */ |
1147 | */ |
1107 | /* EXTPROTO */ |
1148 | /* EXTPROTO */ |
1108 | void |
1149 | void |
1109 | rxvt_scr_erase_line(pR_ int mode) |
1150 | rxvt_scr_erase_line(pR_ int mode) |
1110 | { |
1151 | { |
1111 | unsigned int row, col, num; |
1152 | unsigned int row, col, num; |
1112 | |
1153 | |
1113 | R->want_refresh = 1; |
1154 | R->want_refresh = 1; |
1114 | D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, R->screen.cur.row)); |
1155 | D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, R->screen.cur.row)); |
1115 | ZERO_SCROLLBACK(R); |
1156 | ZERO_SCROLLBACK (R); |
1116 | RESET_CHSTAT(R); |
|
|
1117 | |
1157 | |
1118 | #ifdef RXVT_GRAPHICS |
1158 | #ifdef RXVT_GRAPHICS |
1119 | if (rxvt_Gr_Displayed(aR)) |
1159 | if (rxvt_Gr_Displayed (aR)) |
1120 | rxvt_Gr_scroll(aR_ 0); |
1160 | rxvt_Gr_scroll (aR_ 0); |
1121 | #endif |
1161 | #endif |
1122 | |
1162 | |
1123 | rxvt_selection_check(aR_ 1); |
1163 | rxvt_selection_check (aR_ 1); |
1124 | |
1164 | |
1125 | R->screen.flags &= ~Screen_WrapNext; |
1165 | R->screen.flags &= ~Screen_WrapNext; |
1126 | |
1166 | |
1127 | row = R->TermWin.saveLines + R->screen.cur.row; |
1167 | row = R->TermWin.saveLines + R->screen.cur.row; |
1128 | switch (mode) { |
1168 | switch (mode) |
|
|
1169 | { |
1129 | case 0: /* erase to end of line */ |
1170 | case 0: /* erase to end of line */ |
1130 | col = R->screen.cur.col; |
1171 | col = R->screen.cur.col; |
1131 | num = R->TermWin.ncol - col; |
1172 | num = R->TermWin.ncol - col; |
1132 | MIN_IT(R->screen.tlen[row], (int16_t)col); |
1173 | MIN_IT(R->screen.tlen[row], (int16_t)col); |
1133 | if (ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur) |
1174 | 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)) |
1175 | || ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.end, R->screen.cur)) |
1135 | CLEAR_SELECTION(R); |
1176 | CLEAR_SELECTION(R); |
1136 | break; |
1177 | break; |
1137 | case 1: /* erase to beginning of line */ |
1178 | case 1: /* erase to beginning of line */ |
1138 | col = 0; |
1179 | col = 0; |
1139 | num = R->screen.cur.col + 1; |
1180 | num = R->screen.cur.col + 1; |
1140 | if (ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.beg, R->screen.cur) |
1181 | 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)) |
1182 | || ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.end, R->screen.cur)) |
1142 | CLEAR_SELECTION(R); |
1183 | CLEAR_SELECTION(R); |
1143 | break; |
1184 | break; |
1144 | case 2: /* erase whole line */ |
1185 | case 2: /* erase whole line */ |
1145 | col = 0; |
1186 | col = 0; |
1146 | num = R->TermWin.ncol; |
1187 | num = R->TermWin.ncol; |
1147 | R->screen.tlen[row] = 0; |
1188 | R->screen.tlen[row] = 0; |
1148 | if (R->selection.beg.row <= R->screen.cur.row |
1189 | if (R->selection.beg.row <= R->screen.cur.row |
1149 | && R->selection.end.row >= R->screen.cur.row) |
1190 | && R->selection.end.row >= R->screen.cur.row) |
1150 | CLEAR_SELECTION(R); |
1191 | CLEAR_SELECTION(R); |
1151 | break; |
1192 | break; |
1152 | default: |
1193 | default: |
1153 | return; |
1194 | return; |
1154 | } |
1195 | } |
|
|
1196 | |
1155 | if (R->screen.text[row]) |
1197 | if (R->screen.text[row]) |
1156 | rxvt_blank_line(aR_ |
1198 | R->scr_blank_line (&(R->screen.text[row][col]), |
1157 | &(R->screen.text[row][col]), |
|
|
1158 | &(R->screen.rend[row][col]), num, R->rstyle); |
1199 | &(R->screen.rend[row][col]), num, R->rstyle); |
1159 | else |
1200 | else |
1160 | rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, row, |
1201 | R->scr_blank_screen_mem (R->screen.text, R->screen.rend, row, R->rstyle); |
1161 | R->rstyle); |
|
|
1162 | } |
1202 | } |
1163 | |
1203 | |
1164 | /* ------------------------------------------------------------------------- */ |
1204 | /* ------------------------------------------------------------------------- */ |
1165 | /* |
1205 | /* |
1166 | * Erase part of whole of the screen |
1206 | * Erase part of whole of the screen |
1167 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1207 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1168 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1208 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1169 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1209 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1170 | */ |
1210 | */ |
1171 | /* EXTPROTO */ |
|
|
1172 | void |
1211 | void |
1173 | rxvt_scr_erase_screen(pR_ int mode) |
1212 | rxvt_term::scr_erase_screen (int mode) |
1174 | { |
1213 | { |
1175 | int num; |
1214 | int num; |
1176 | int32_t row, row_offset; |
1215 | int32_t row, row_offset; |
1177 | rend_t ren; |
1216 | rend_t ren; |
1178 | XGCValues gcvalue; |
1217 | XGCValues gcvalue; |
1179 | |
1218 | |
1180 | R->want_refresh = 1; |
1219 | want_refresh = 1; |
1181 | D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, R->screen.cur.row)); |
1220 | D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, screen.cur.row)); |
1182 | ZERO_SCROLLBACK(R); |
1221 | ZERO_SCROLLBACK(this); |
1183 | RESET_CHSTAT(R); |
|
|
1184 | row_offset = (int32_t)R->TermWin.saveLines; |
1222 | row_offset = (int32_t)TermWin.saveLines; |
1185 | |
1223 | |
1186 | switch (mode) { |
1224 | switch (mode) { |
1187 | case 0: /* erase to end of screen */ |
1225 | case 0: /* erase to end of screen */ |
1188 | rxvt_selection_check(aR_ 1); |
1226 | rxvt_selection_check(this,1); |
1189 | rxvt_scr_erase_line(aR_ 0); |
1227 | rxvt_scr_erase_line(this,0); |
1190 | row = R->screen.cur.row + 1; /* possible OOB */ |
1228 | row = screen.cur.row + 1; /* possible OOB */ |
1191 | num = R->TermWin.nrow - row; |
1229 | num = TermWin.nrow - row; |
1192 | break; |
1230 | break; |
1193 | case 1: /* erase to beginning of screen */ |
1231 | case 1: /* erase to beginning of screen */ |
1194 | rxvt_selection_check(aR_ 3); |
1232 | rxvt_selection_check(this,3); |
1195 | rxvt_scr_erase_line(aR_ 1); |
1233 | rxvt_scr_erase_line(this,1); |
1196 | row = 0; |
1234 | row = 0; |
1197 | num = R->screen.cur.row; |
1235 | num = screen.cur.row; |
1198 | break; |
1236 | break; |
1199 | case 2: /* erase whole screen */ |
1237 | case 2: /* erase whole screen */ |
1200 | rxvt_selection_check(aR_ 3); |
1238 | rxvt_selection_check (this, 3); |
1201 | #ifdef RXVT_GRAPHICS |
1239 | #ifdef RXVT_GRAPHICS |
1202 | rxvt_Gr_ClearScreen(aR); |
1240 | rxvt_Gr_ClearScreen (this); |
1203 | #endif |
1241 | #endif |
1204 | row = 0; |
1242 | row = 0; |
1205 | num = R->TermWin.nrow; |
1243 | num = TermWin.nrow; |
1206 | break; |
1244 | break; |
1207 | default: |
1245 | default: |
1208 | return; |
1246 | return; |
1209 | } |
1247 | } |
1210 | R->refresh_type |= REFRESH_BOUNDS; |
1248 | refresh_type |= REFRESH_BOUNDS; |
1211 | if (R->selection.op && R->current_screen == R->selection.screen |
1249 | if (selection.op && current_screen == selection.screen |
1212 | && ((R->selection.beg.row >= row && R->selection.beg.row <= row + num) |
1250 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1213 | || (R->selection.end.row >= row |
1251 | || (selection.end.row >= row |
1214 | && R->selection.end.row <= row + num))) |
1252 | && selection.end.row <= row + num))) |
1215 | CLEAR_SELECTION(R); |
1253 | CLEAR_SELECTION (this); |
1216 | if (row >= R->TermWin.nrow) /* Out Of Bounds */ |
1254 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1217 | return; |
1255 | return; |
1218 | MIN_IT(num, (R->TermWin.nrow - row)); |
1256 | MIN_IT(num, (TermWin.nrow - row)); |
1219 | if (R->rstyle & (RS_RVid | RS_Uline)) |
1257 | if (rstyle & (RS_RVid | RS_Uline)) |
1220 | ren = (rend_t) ~RS_None; |
1258 | ren = (rend_t) ~RS_None; |
1221 | else if (GET_BASEBG(R->rstyle) == Color_bg) { |
1259 | else if (GET_BASEBG(rstyle) == Color_bg) { |
1222 | ren = DEFAULT_RSTYLE; |
1260 | ren = DEFAULT_RSTYLE; |
1223 | CLEAR_ROWS(row, num); |
1261 | CLEAR_ROWS(row, num); |
1224 | } else { |
1262 | } else { |
1225 | ren = (R->rstyle & (RS_fgMask | RS_bgMask)); |
1263 | ren = (rstyle & (RS_fgMask | RS_bgMask)); |
1226 | gcvalue.foreground = R->PixColors[GET_BGCOLOR(R->rstyle)]; |
1264 | gcvalue.foreground = PixColors[GET_BGCOLOR(rstyle)]; |
1227 | XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); |
1265 | XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue); |
1228 | ERASE_ROWS(row, num); |
1266 | ERASE_ROWS(row, num); |
1229 | gcvalue.foreground = R->PixColors[Color_fg]; |
1267 | gcvalue.foreground = PixColors[Color_fg]; |
1230 | XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); |
1268 | XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue); |
1231 | } |
1269 | } |
1232 | for (; num--; row++) { |
1270 | for (; num--; row++) { |
1233 | rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, |
1271 | scr_blank_screen_mem (screen.text, screen.rend, |
1234 | (unsigned int)(row + row_offset), R->rstyle); |
1272 | (unsigned int)(row + row_offset), rstyle); |
1235 | R->screen.tlen[row + row_offset] = 0; |
1273 | screen.tlen[row + row_offset] = 0; |
1236 | rxvt_blank_line(aR_ |
1274 | scr_blank_line (drawn_text[row], drawn_rend[row], |
1237 | R->drawn_text[row], R->drawn_rend[row], |
|
|
1238 | (unsigned int)R->TermWin.ncol, ren); |
1275 | (unsigned int)TermWin.ncol, ren); |
1239 | } |
1276 | } |
1240 | } |
1277 | } |
1241 | |
1278 | |
1242 | /* ------------------------------------------------------------------------- */ |
1279 | /* ------------------------------------------------------------------------- */ |
1243 | /* |
1280 | /* |
… | |
… | |
1252 | rend_t *r1, fs; |
1289 | rend_t *r1, fs; |
1253 | |
1290 | |
1254 | R->want_refresh = 1; |
1291 | R->want_refresh = 1; |
1255 | R->num_scr_allow = 0; |
1292 | R->num_scr_allow = 0; |
1256 | ZERO_SCROLLBACK(R); |
1293 | ZERO_SCROLLBACK(R); |
1257 | RESET_CHSTAT(R); |
|
|
1258 | rxvt_selection_check(aR_ 3); |
1294 | rxvt_selection_check(aR_ 3); |
1259 | |
1295 | |
1260 | fs = SET_FONT (R->rstyle, R->TermWin.fontset->find_font ('E')); |
1296 | fs = SET_FONT (R->rstyle, R->TermWin.fontset->find_font ('E')); |
1261 | for (k = R->TermWin.saveLines, i = R->TermWin.nrow; i--; k++) { |
1297 | for (k = R->TermWin.saveLines, i = R->TermWin.nrow; i--; k++) { |
1262 | R->screen.tlen[k] = R->TermWin.ncol; /* make the `E's selectable */ |
1298 | R->screen.tlen[k] = R->TermWin.ncol; /* make the `E's selectable */ |
… | |
… | |
1275 | rxvt_scr_insdel_lines(pR_ int count, int insdel) |
1311 | rxvt_scr_insdel_lines(pR_ int count, int insdel) |
1276 | { |
1312 | { |
1277 | int end; |
1313 | int end; |
1278 | |
1314 | |
1279 | ZERO_SCROLLBACK(R); |
1315 | ZERO_SCROLLBACK(R); |
1280 | RESET_CHSTAT(R); |
|
|
1281 | |
1316 | |
1282 | #ifdef RXVT_GRAPHICS |
1317 | #ifdef RXVT_GRAPHICS |
1283 | if (rxvt_Gr_Displayed(aR)) |
1318 | if (rxvt_Gr_Displayed(aR)) |
1284 | rxvt_Gr_scroll(aR_ 0); |
1319 | rxvt_Gr_scroll(aR_ 0); |
1285 | #endif |
1320 | #endif |
… | |
… | |
1296 | else if (insdel == INSERT) |
1331 | else if (insdel == INSERT) |
1297 | count = end; |
1332 | count = end; |
1298 | } |
1333 | } |
1299 | R->screen.flags &= ~Screen_WrapNext; |
1334 | R->screen.flags &= ~Screen_WrapNext; |
1300 | |
1335 | |
1301 | rxvt_scroll_text(aR_ R->screen.cur.row, R->screen.bscroll, insdel * count, |
1336 | R->scr_scroll_text(R->screen.cur.row, R->screen.bscroll, insdel * count, 0); |
1302 | 0); |
|
|
1303 | } |
1337 | } |
1304 | |
1338 | |
1305 | /* ------------------------------------------------------------------------- */ |
1339 | /* ------------------------------------------------------------------------- */ |
1306 | /* |
1340 | /* |
1307 | * Insert/Delete <count> characters from the current position |
1341 | * Insert/Delete <count> characters from the current position |
… | |
… | |
1316 | rend_t *srp; |
1350 | rend_t *srp; |
1317 | int16_t *slp; |
1351 | int16_t *slp; |
1318 | |
1352 | |
1319 | R->want_refresh = 1; |
1353 | R->want_refresh = 1; |
1320 | ZERO_SCROLLBACK(R); |
1354 | ZERO_SCROLLBACK(R); |
1321 | #if 0 |
|
|
1322 | RESET_CHSTAT(R); |
|
|
1323 | #endif |
|
|
1324 | |
1355 | |
1325 | #ifdef RXVT_GRAPHICS |
1356 | #ifdef RXVT_GRAPHICS |
1326 | if (rxvt_Gr_Displayed(aR)) |
1357 | if (rxvt_Gr_Displayed(aR)) |
1327 | rxvt_Gr_scroll(aR_ 0); |
1358 | rxvt_Gr_scroll(aR_ 0); |
1328 | #endif |
1359 | #endif |
… | |
… | |
1359 | R->selection.beg.col += count; |
1390 | R->selection.beg.col += count; |
1360 | R->selection.mark.col += count; /* XXX: yes? */ |
1391 | R->selection.mark.col += count; /* XXX: yes? */ |
1361 | R->selection.end.col += count; |
1392 | R->selection.end.col += count; |
1362 | } |
1393 | } |
1363 | } |
1394 | } |
1364 | rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), |
1395 | R->scr_blank_line (&(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), |
1365 | (unsigned int)count, R->rstyle); |
1396 | (unsigned int)count, R->rstyle); |
1366 | break; |
1397 | break; |
1367 | case ERASE: |
1398 | case ERASE: |
1368 | R->screen.cur.col += count; /* don't worry if > R->TermWin.ncol */ |
1399 | R->screen.cur.col += count; /* don't worry if > R->TermWin.ncol */ |
1369 | rxvt_selection_check(aR_ 1); |
1400 | rxvt_selection_check(aR_ 1); |
1370 | R->screen.cur.col -= count; |
1401 | R->screen.cur.col -= count; |
1371 | rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), |
1402 | R->scr_blank_line (&(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), |
1372 | (unsigned int)count, R->rstyle); |
1403 | (unsigned int)count, R->rstyle); |
1373 | break; |
1404 | break; |
1374 | case DELETE: |
1405 | case DELETE: |
1375 | tr = srp[R->TermWin.ncol - 1] |
1406 | tr = srp[R->TermWin.ncol - 1] |
1376 | & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1407 | & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1377 | for (col = R->screen.cur.col; (col + count) < R->TermWin.ncol; col++) { |
1408 | for (col = R->screen.cur.col; (col + count) < R->TermWin.ncol; col++) { |
1378 | stp[col] = stp[col + count]; |
1409 | stp[col] = stp[col + count]; |
1379 | srp[col] = srp[col + count]; |
1410 | srp[col] = srp[col + count]; |
1380 | } |
1411 | } |
1381 | rxvt_blank_line(aR_ |
1412 | R->scr_blank_line (&(stp[R->TermWin.ncol - count]), |
1382 | &(stp[R->TermWin.ncol - count]), |
|
|
1383 | &(srp[R->TermWin.ncol - count]), |
1413 | &(srp[R->TermWin.ncol - count]), |
1384 | (unsigned int)count, tr); |
1414 | (unsigned int)count, tr); |
1385 | if (*slp == -1) /* break line continuation */ |
1415 | if (*slp == -1) /* break line continuation */ |
1386 | *slp = R->TermWin.ncol; |
1416 | *slp = R->TermWin.ncol; |
1387 | *slp -= count; |
1417 | *slp -= count; |
1388 | MAX_IT(*slp, 0); |
1418 | MAX_IT(*slp, 0); |
1389 | if (R->selection.op && R->current_screen == R->selection.screen |
1419 | if (R->selection.op && R->current_screen == R->selection.screen |
… | |
… | |
1534 | |
1564 | |
1535 | gcvalue.foreground = R->PixColors[Color_fg]; |
1565 | gcvalue.foreground = R->PixColors[Color_fg]; |
1536 | gcvalue.background = R->PixColors[Color_bg]; |
1566 | gcvalue.background = R->PixColors[Color_bg]; |
1537 | XChangeGC(R->Xdisplay, R->TermWin.gc, GCBackground | GCForeground, |
1567 | XChangeGC(R->Xdisplay, R->TermWin.gc, GCBackground | GCForeground, |
1538 | &gcvalue); |
1568 | &gcvalue); |
1539 | rxvt_scr_clear(aR); |
1569 | R->scr_clear (); |
1540 | rxvt_scr_touch(aR_ True); |
1570 | R->scr_touch (true); |
1541 | } |
1571 | } |
1542 | } |
1572 | } |
1543 | |
1573 | |
1544 | /* ------------------------------------------------------------------------- */ |
1574 | /* ------------------------------------------------------------------------- */ |
1545 | /* |
1575 | /* |
… | |
… | |
1548 | */ |
1578 | */ |
1549 | /* EXTPROTO */ |
1579 | /* EXTPROTO */ |
1550 | void |
1580 | void |
1551 | rxvt_scr_report_position(pR) |
1581 | rxvt_scr_report_position(pR) |
1552 | { |
1582 | { |
1553 | rxvt_tt_printf(aR_ "\033[%d;%dR", R->screen.cur.row + 1, |
1583 | R->tt_printf("\033[%d;%dR", R->screen.cur.row + 1, R->screen.cur.col + 1); |
1554 | R->screen.cur.col + 1); |
|
|
1555 | } |
1584 | } |
1556 | |
1585 | |
1557 | /* ------------------------------------------------------------------------- * |
1586 | /* ------------------------------------------------------------------------- * |
1558 | * FONTS * |
1587 | * FONTS * |
1559 | * ------------------------------------------------------------------------- */ |
1588 | * ------------------------------------------------------------------------- */ |
… | |
… | |
1616 | rxvt_set_font_style(aR); |
1645 | rxvt_set_font_style(aR); |
1617 | } |
1646 | } |
1618 | |
1647 | |
1619 | |
1648 | |
1620 | /* ------------------------------------------------------------------------- * |
1649 | /* ------------------------------------------------------------------------- * |
1621 | * GRAPHICS COLOURS * |
|
|
1622 | * ------------------------------------------------------------------------- */ |
|
|
1623 | |
|
|
1624 | #ifdef RXVT_GRAPHICS |
|
|
1625 | /* EXTPROTO */ |
|
|
1626 | int |
|
|
1627 | rxvt_scr_get_fgcolor(pR) |
|
|
1628 | { |
|
|
1629 | return GET_FGCOLOR(R->rstyle); |
|
|
1630 | } |
|
|
1631 | |
|
|
1632 | /* ------------------------------------------------------------------------- */ |
|
|
1633 | /* EXTPROTO */ |
|
|
1634 | int |
|
|
1635 | rxvt_scr_get_bgcolor(pR) |
|
|
1636 | { |
|
|
1637 | return GET_BGCOLOR(R->rstyle); |
|
|
1638 | } |
|
|
1639 | #endif |
|
|
1640 | |
|
|
1641 | /* ------------------------------------------------------------------------- * |
|
|
1642 | * MAJOR SCREEN MANIPULATION * |
1650 | * MAJOR SCREEN MANIPULATION * |
1643 | * ------------------------------------------------------------------------- */ |
1651 | * ------------------------------------------------------------------------- */ |
1644 | |
1652 | |
1645 | /* |
1653 | /* |
1646 | * Refresh an area |
1654 | * Refresh an area |
… | |
… | |
1649 | PART_BEG = 0, |
1657 | PART_BEG = 0, |
1650 | PART_END, |
1658 | PART_END, |
1651 | RC_COUNT |
1659 | RC_COUNT |
1652 | }; |
1660 | }; |
1653 | |
1661 | |
1654 | /* EXTPROTO */ |
|
|
1655 | void |
1662 | void |
1656 | rxvt_scr_expose(pR_ int x, int y, int width, int height, Bool refresh) |
1663 | rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) |
1657 | { |
1664 | { |
1658 | int i; |
1665 | int i; |
1659 | row_col_t rc[RC_COUNT]; |
1666 | row_col_t rc[RC_COUNT]; |
1660 | |
1667 | |
1661 | if (R->drawn_text == NULL) /* sanity check */ |
1668 | if (drawn_text == NULL) /* sanity check */ |
1662 | return; |
1669 | return; |
1663 | |
1670 | |
1664 | #ifdef DEBUG_STRICT |
1671 | #ifdef DEBUG_STRICT |
1665 | x = max(x, (int)R->TermWin.int_bwidth); |
1672 | x = max(x, (int)TermWin.int_bwidth); |
1666 | x = min(x, (int)R->TermWin.width); |
1673 | x = min(x, (int)TermWin.width); |
1667 | y = max(y, (int)R->TermWin.int_bwidth); |
1674 | y = max(y, (int)TermWin.int_bwidth); |
1668 | y = min(y, (int)R->TermWin.height); |
1675 | y = min(y, (int)TermWin.height); |
1669 | #endif |
1676 | #endif |
1670 | |
1677 | |
1671 | /* round down */ |
1678 | /* round down */ |
1672 | rc[PART_BEG].col = Pixel2Col(x); |
1679 | rc[PART_BEG].col = Pixel2Col(x); |
1673 | rc[PART_BEG].row = Pixel2Row(y); |
1680 | rc[PART_BEG].row = Pixel2Row(y); |
1674 | /* round up */ |
1681 | /* round up */ |
1675 | rc[PART_END].col = Pixel2Width(x + width + R->TermWin.fwidth - 1); |
1682 | rc[PART_END].col = Pixel2Width(x + width + TermWin.fwidth - 1); |
1676 | rc[PART_END].row = Pixel2Row(y + height + R->TermWin.fheight - 1); |
1683 | rc[PART_END].row = Pixel2Row(y + height + TermWin.fheight - 1); |
1677 | |
1684 | |
1678 | /* sanity checks */ |
1685 | /* sanity checks */ |
1679 | for (i = PART_BEG; i < RC_COUNT; i++) { |
1686 | for (i = PART_BEG; i < RC_COUNT; i++) |
|
|
1687 | { |
1680 | MIN_IT(rc[i].col, R->TermWin.ncol - 1); |
1688 | MIN_IT(rc[i].col, TermWin.ncol - 1); |
1681 | MIN_IT(rc[i].row, R->TermWin.nrow - 1); |
1689 | MIN_IT(rc[i].row, TermWin.nrow - 1); |
1682 | } |
1690 | } |
1683 | |
1691 | |
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)); |
1692 | 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 | |
1693 | |
1686 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1694 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1687 | fill_text (&(R->drawn_text[i][rc[PART_BEG].col]), 0, |
1695 | fill_text (&(drawn_text[i][rc[PART_BEG].col]), 0, |
1688 | (rc[PART_END].col - rc[PART_BEG].col + 1)); |
1696 | (rc[PART_END].col - rc[PART_BEG].col + 1)); |
1689 | |
1697 | |
1690 | if (refresh) |
1698 | if (refresh) |
1691 | rxvt_scr_refresh(aR_ SLOW_REFRESH | REFRESH_BOUNDS); |
1699 | scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); |
1692 | } |
1700 | } |
1693 | |
1701 | |
1694 | /* ------------------------------------------------------------------------- */ |
1702 | /* ------------------------------------------------------------------------- */ |
1695 | /* |
1703 | /* |
1696 | * Refresh the entire screen |
1704 | * Refresh the entire screen |
1697 | */ |
1705 | */ |
1698 | /* EXTPROTO */ |
|
|
1699 | void |
1706 | void |
1700 | rxvt_scr_touch(pR_ Bool refresh) |
1707 | rxvt_term::scr_touch (bool refresh) |
1701 | { |
1708 | { |
1702 | rxvt_scr_expose(aR_ 0, 0, R->TermWin.width, R->TermWin.height, refresh); |
1709 | scr_expose (0, 0, TermWin.width, TermWin.height, refresh); |
1703 | } |
1710 | } |
1704 | |
1711 | |
1705 | /* ------------------------------------------------------------------------- */ |
1712 | /* ------------------------------------------------------------------------- */ |
1706 | /* |
1713 | /* |
1707 | * Move the display so that the line represented by scrollbar value Y is at |
1714 | * Move the display so that the line represented by scrollbar value Y is at |
… | |
… | |
1826 | * Refresh the screen |
1833 | * Refresh the screen |
1827 | * R->drawn_text/R->drawn_rend contain the screen information before the update. |
1834 | * 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. |
1835 | * R->screen.text/R->screen.rend contain what the screen will change to. |
1829 | */ |
1836 | */ |
1830 | |
1837 | |
1831 | #if defined (NO_BRIGHTCOLOR) || defined (VERYBOLD) |
|
|
1832 | # define MONO_BOLD(x) ((x) & (RS_Bold|RS_Blink)) |
|
|
1833 | # define MONO_BOLD_FG(x, fg) MONO_BOLD(x) |
|
|
1834 | #else |
|
|
1835 | # define MONO_BOLD(x) \ |
|
|
1836 | (((x) & (RS_Bold | RS_fgMask)) == (RS_Bold | Color_fg)) |
|
|
1837 | # define MONO_BOLD_FG(x, fg) (((x) & RS_Bold) && (fg) == Color_fg) |
|
|
1838 | #endif |
|
|
1839 | |
|
|
1840 | #define FONT_WIDTH(X, Y) \ |
1838 | #define FONT_WIDTH(X, Y) \ |
1841 | (X)->per_char[(Y) - (X)->min_char_or_byte2].width |
1839 | (X)->per_char[(Y) - (X)->min_char_or_byte2].width |
1842 | #define FONT_RBEAR(X, Y) \ |
1840 | #define FONT_RBEAR(X, Y) \ |
1843 | (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing |
1841 | (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing |
1844 | #define FONT_LBEAR(X, Y) \ |
1842 | #define FONT_LBEAR(X, Y) \ |
1845 | (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing |
1843 | (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing |
1846 | #define IS_FONT_CHAR(X, Y) \ |
1844 | #define IS_FONT_CHAR(X, Y) \ |
1847 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
1845 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
1848 | |
1846 | |
1849 | /* EXTPROTO */ |
|
|
1850 | void |
1847 | void |
1851 | rxvt_scr_refresh(pR_ unsigned char refresh_type) |
1848 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1852 | { |
1849 | { |
1853 | unsigned char clearfirst, /* first character writes before cell */ |
1850 | unsigned char clearfirst, /* first character writes before cell */ |
1854 | clearlast, /* last character writes beyond cell */ |
1851 | clearlast, /* last character writes beyond cell */ |
1855 | must_clear, /* use draw_string not draw_image_string */ |
1852 | must_clear, /* use draw_string not draw_image_string */ |
1856 | #ifndef NO_BOLDFONT |
|
|
1857 | bfont, /* we've changed font to bold font */ |
|
|
1858 | #endif |
|
|
1859 | rvid, /* reverse video this position */ |
1853 | rvid, /* reverse video this position */ |
1860 | wbyte, /* we're in multibyte */ |
|
|
1861 | showcursor; /* show the cursor */ |
1854 | showcursor; /* show the cursor */ |
1862 | int fore, back; /* desired foreground/background */ |
|
|
1863 | int16_t col, row, /* column/row we're processing */ |
1855 | int16_t col, row, /* column/row we're processing */ |
1864 | ocrow; /* old cursor row */ |
1856 | ocrow; /* old cursor row */ |
1865 | int cursorwidth; |
1857 | int cursorwidth; |
1866 | int i, /* tmp */ |
1858 | int i, /* tmp */ |
1867 | row_offset; /* basic offset in screen structure */ |
1859 | row_offset; /* basic offset in screen structure */ |
… | |
… | |
1869 | rend_t cc1; /* store colours at cursor position(s) */ |
1861 | rend_t cc1; /* store colours at cursor position(s) */ |
1870 | rend_t cc2; /* store colours at cursor position(s) */ |
1862 | rend_t cc2; /* store colours at cursor position(s) */ |
1871 | #endif |
1863 | #endif |
1872 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
1864 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
1873 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
1865 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
1874 | char *buffer; /* local copy of R->buffer */ |
|
|
1875 | |
1866 | |
1876 | if (refresh_type == NO_REFRESH || !R->TermWin.mapped) |
1867 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
1877 | return; |
1868 | return; |
1878 | |
1869 | |
1879 | /* |
1870 | /* |
1880 | * A: set up vars |
1871 | * A: set up vars |
1881 | */ |
1872 | */ |
1882 | clearfirst = clearlast = must_clear = wbyte = 0; |
1873 | clearfirst = clearlast = must_clear = 0; |
1883 | #ifndef NO_BOLDFONT |
|
|
1884 | bfont = 0; |
|
|
1885 | #endif |
|
|
1886 | |
1874 | |
1887 | if (R->currmaxcol < R->TermWin.ncol) |
1875 | if (currmaxcol < TermWin.ncol) |
1888 | { |
1876 | { |
1889 | R->currmaxcol = R->TermWin.ncol; |
1877 | currmaxcol = TermWin.ncol; |
1890 | R->buffer = (char *)rxvt_realloc (R->buffer, |
1878 | buffer = (char *)rxvt_realloc (buffer, |
1891 | sizeof(char) * (R->currmaxcol + 1) * MB_CUR_MAX); |
1879 | sizeof(char) * (currmaxcol + 1) * MB_CUR_MAX); |
1892 | } |
1880 | } |
1893 | |
1881 | |
1894 | buffer = R->buffer; |
|
|
1895 | R->refresh_count = 0; |
1882 | refresh_count = 0; |
1896 | |
1883 | |
1897 | row_offset = R->TermWin.saveLines - R->TermWin.view_start; |
1884 | row_offset = TermWin.saveLines - TermWin.view_start; |
1898 | |
1885 | |
1899 | if ((refresh_type & REFRESH_BOUNDS)) |
1886 | if ((refresh_type & REFRESH_BOUNDS)) |
1900 | { |
1887 | { |
1901 | clearfirst = clearlast = 1; |
1888 | clearfirst = clearlast = 1; |
1902 | R->refresh_type &= ~REFRESH_BOUNDS; |
1889 | refresh_type &= ~REFRESH_BOUNDS; |
1903 | } |
1890 | } |
1904 | |
1891 | |
1905 | #if defined(XPM_BACKGROUND) |
1892 | #if defined(XPM_BACKGROUND) |
1906 | must_clear |= (R->bgPixmap.pixmap != None); |
1893 | must_clear |= (bgPixmap.pixmap != None); |
1907 | #endif |
1894 | #endif |
1908 | #if defined(TRANSPARENT) |
1895 | #if defined(TRANSPARENT) |
1909 | must_clear |= ((R->Options & Opt_transparent) && R->am_transparent); |
1896 | must_clear |= ((Options & Opt_transparent) && am_transparent); |
1910 | #endif |
1897 | #endif |
1911 | ocrow = R->oldcursor.row; /* is there an old outline cursor on screen? */ |
1898 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1912 | |
1899 | |
1913 | /* |
1900 | /* |
1914 | * B: reverse any characters which are selected |
1901 | * B: reverse any characters which are selected |
1915 | */ |
1902 | */ |
1916 | rxvt_scr_reverse_selection(aR); |
1903 | rxvt_scr_reverse_selection (this); |
1917 | |
1904 | |
1918 | /* |
1905 | /* |
1919 | * C: set the cursor character(s) |
1906 | * C: set the cursor character(s) |
1920 | */ |
1907 | */ |
1921 | { |
1908 | { |
1922 | unsigned char setoldcursor; |
1909 | unsigned char setoldcursor; |
1923 | rend_t ccol1, /* Cursor colour */ |
1910 | rend_t ccol1, /* Cursor colour */ |
1924 | ccol2; /* Cursor colour2 */ |
1911 | ccol2; /* Cursor colour2 */ |
1925 | |
1912 | |
1926 | showcursor = (R->screen.flags & Screen_VisibleCursor); |
1913 | showcursor = (screen.flags & Screen_VisibleCursor); |
1927 | cursorwidth = 0; |
1914 | cursorwidth = 0; |
1928 | #ifdef CURSOR_BLINK |
1915 | #ifdef CURSOR_BLINK |
1929 | if (R->hidden_cursor) |
1916 | if (hidden_cursor) |
1930 | showcursor = 0; |
1917 | showcursor = 0; |
1931 | #endif |
1918 | #endif |
1932 | |
1919 | |
1933 | cursorwidth = 0; |
1920 | cursorwidth = 0; |
1934 | |
1921 | |
1935 | if (showcursor) |
1922 | if (showcursor) |
1936 | { |
1923 | { |
1937 | cursorwidth++; |
1924 | cursorwidth++; |
1938 | |
1925 | |
1939 | srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] |
1926 | srp = &(screen.rend[screen.cur.row + TermWin.saveLines] |
1940 | [R->screen.cur.col]); |
1927 | [screen.cur.col]); |
1941 | |
1928 | |
1942 | if (showcursor && R->TermWin.focus) |
1929 | if (showcursor && TermWin.focus) |
1943 | { |
1930 | { |
1944 | *srp ^= RS_RVid; |
1931 | *srp ^= RS_RVid; |
1945 | #ifndef NO_CURSORCOLOR |
1932 | #ifndef NO_CURSORCOLOR |
1946 | cc1 = *srp & (RS_fgMask | RS_bgMask); |
1933 | cc1 = *srp & (RS_fgMask | RS_bgMask); |
1947 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor)) |
1934 | if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor)) |
1948 | ccol1 = Color_cursor; |
1935 | ccol1 = Color_cursor; |
1949 | else |
1936 | else |
1950 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1937 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1951 | ccol1 = GET_FGCOLOR(R->rstyle); |
1938 | ccol1 = GET_FGCOLOR(rstyle); |
1952 | #else |
1939 | #else |
1953 | ccol1 = Color_fg; |
1940 | ccol1 = Color_fg; |
1954 | #endif |
1941 | #endif |
1955 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor2)) |
1942 | if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor2)) |
1956 | ccol2 = Color_cursor2; |
1943 | ccol2 = Color_cursor2; |
1957 | else |
1944 | else |
1958 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1945 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1959 | ccol2 = GET_BGCOLOR(R->rstyle); |
1946 | ccol2 = GET_BGCOLOR(rstyle); |
1960 | #else |
1947 | #else |
1961 | ccol2 = Color_bg; |
1948 | ccol2 = Color_bg; |
1962 | #endif |
1949 | #endif |
1963 | *srp = SET_FGCOLOR(*srp, ccol1); |
1950 | *srp = SET_FGCOLOR(*srp, ccol1); |
1964 | *srp = SET_BGCOLOR(*srp, ccol2); |
1951 | *srp = SET_BGCOLOR(*srp, ccol2); |
1965 | #endif |
1952 | #endif |
1966 | } |
1953 | } |
1967 | |
|
|
1968 | while (IS_WIDE (*srp)) |
|
|
1969 | cursorwidth++, srp++; |
|
|
1970 | } |
1954 | } |
1971 | |
1955 | |
1972 | /* make sure no outline cursor is left around */ |
1956 | /* make sure no outline cursor is left around */ |
1973 | setoldcursor = 0; |
1957 | setoldcursor = 0; |
1974 | if (ocrow != -1) { |
1958 | if (ocrow != -1) { |
1975 | if (R->screen.cur.row + R->TermWin.view_start != ocrow |
1959 | if (screen.cur.row + TermWin.view_start != ocrow |
1976 | || R->screen.cur.col != R->oldcursor.col) { |
1960 | || screen.cur.col != oldcursor.col) { |
1977 | if (ocrow < R->TermWin.nrow |
1961 | if (ocrow < TermWin.nrow |
1978 | && R->oldcursor.col < R->TermWin.ncol) { |
1962 | && oldcursor.col < TermWin.ncol) { |
1979 | R->drawn_rend[ocrow][R->oldcursor.col] ^= (RS_RVid | RS_Uline); |
1963 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
1980 | } |
1964 | } |
1981 | if (R->TermWin.focus || !showcursor) |
1965 | if (TermWin.focus || !showcursor) |
1982 | R->oldcursor.row = -1; |
1966 | oldcursor.row = -1; |
1983 | else |
1967 | else |
1984 | setoldcursor = 1; |
1968 | setoldcursor = 1; |
1985 | } |
1969 | } |
1986 | } else if (!R->TermWin.focus) |
1970 | } else if (!TermWin.focus) |
1987 | setoldcursor = 1; |
1971 | setoldcursor = 1; |
1988 | if (setoldcursor) { |
1972 | if (setoldcursor) { |
1989 | if (R->screen.cur.row + R->TermWin.view_start >= R->TermWin.nrow) |
1973 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
1990 | R->oldcursor.row = -1; |
1974 | oldcursor.row = -1; |
1991 | else { |
1975 | else { |
1992 | R->oldcursor.row = R->screen.cur.row + R->TermWin.view_start; |
1976 | oldcursor.row = screen.cur.row + TermWin.view_start; |
1993 | R->oldcursor.col = R->screen.cur.col; |
1977 | oldcursor.col = screen.cur.col; |
1994 | } |
1978 | } |
1995 | } |
1979 | } |
1996 | } |
1980 | } |
1997 | |
1981 | |
1998 | #ifndef NO_SLOW_LINK_SUPPORT |
1982 | #ifndef NO_SLOW_LINK_SUPPORT |
1999 | /* |
1983 | /* |
2000 | * D: CopyArea pass - very useful for slower links |
1984 | * D: CopyArea pass - very useful for slower links |
2001 | * This has been deliberately kept simple. |
1985 | * This has been deliberately kept simple. |
2002 | */ |
1986 | */ |
2003 | i = R->num_scr; |
1987 | i = num_scr; |
2004 | if (refresh_type == FAST_REFRESH && R->num_scr_allow && i |
1988 | if (refresh_type == FAST_REFRESH && num_scr_allow && i |
2005 | && abs(i) < R->TermWin.nrow && !must_clear) |
1989 | && abs(i) < TermWin.nrow && !must_clear) |
2006 | { |
1990 | { |
2007 | int16_t nits; |
1991 | int16_t nits; |
2008 | int j; |
1992 | int j; |
2009 | rend_t *drp2; |
1993 | rend_t *drp2; |
2010 | text_t *dtp2; |
1994 | text_t *dtp2; |
2011 | int len, wlen; |
1995 | int len, wlen; |
2012 | |
1996 | |
2013 | j = R->TermWin.nrow; |
1997 | j = TermWin.nrow; |
2014 | wlen = len = -1; |
1998 | wlen = len = -1; |
2015 | row = i > 0 ? 0 : j - 1; |
1999 | row = i > 0 ? 0 : j - 1; |
2016 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2000 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2017 | { |
2001 | { |
2018 | if (row + i >= 0 && row + i < R->TermWin.nrow && row + i != ocrow) |
2002 | if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) |
2019 | { |
2003 | { |
2020 | stp = R->screen.text[row + row_offset]; |
2004 | stp = screen.text[row + row_offset]; |
2021 | srp = R->screen.rend[row + row_offset]; |
2005 | srp = screen.rend[row + row_offset]; |
2022 | dtp = R->drawn_text[row]; |
2006 | dtp = drawn_text[row]; |
2023 | dtp2 = R->drawn_text[row + i]; |
2007 | dtp2 = drawn_text[row + i]; |
2024 | drp = R->drawn_rend[row]; |
2008 | drp = drawn_rend[row]; |
2025 | drp2 = R->drawn_rend[row + i]; |
2009 | drp2 = drawn_rend[row + i]; |
2026 | |
2010 | |
2027 | for (nits = 0, col = R->TermWin.ncol; col--; ) |
2011 | for (nits = 0, col = TermWin.ncol; col--; ) |
2028 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2012 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2029 | nits--; |
2013 | nits--; |
2030 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
2014 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
2031 | nits++; |
2015 | nits++; |
2032 | |
2016 | |
2033 | if (nits > 8) /* XXX: arbitrary choice */ |
2017 | if (nits > 8) /* XXX: arbitrary choice */ |
2034 | { |
2018 | { |
2035 | for (col = R->TermWin.ncol; col--; ) |
2019 | for (col = TermWin.ncol; col--; ) |
2036 | { |
2020 | { |
2037 | *dtp++ = *dtp2++; |
2021 | *dtp++ = *dtp2++; |
2038 | *drp++ = *drp2++; |
2022 | *drp++ = *drp2++; |
2039 | } |
2023 | } |
2040 | |
2024 | |
… | |
… | |
2049 | if (len != -1) |
2033 | if (len != -1) |
2050 | { |
2034 | { |
2051 | /* also comes here at end if needed because of >= above */ |
2035 | /* also comes here at end if needed because of >= above */ |
2052 | if (wlen < len) |
2036 | if (wlen < len) |
2053 | SWAP_IT(wlen, len, int); |
2037 | SWAP_IT(wlen, len, int); |
|
|
2038 | |
2054 | D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); |
2039 | D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); |
2055 | XCopyArea(R->Xdisplay, R->TermWin.vt, R->TermWin.vt, |
2040 | XCopyArea (Xdisplay, TermWin.vt, TermWin.vt, |
2056 | R->TermWin.gc, 0, Row2Pixel(len + i), |
2041 | TermWin.gc, 0, Row2Pixel (len + i), |
2057 | (unsigned int)TermWin_TotalWidth(), |
2042 | (unsigned int)TermWin_TotalWidth (), |
2058 | (unsigned int)Height2Pixel(wlen - len + 1), |
2043 | (unsigned int)Height2Pixel (wlen - len + 1), |
2059 | 0, Row2Pixel(len)); |
2044 | 0, Row2Pixel (len)); |
2060 | len = -1; |
2045 | len = -1; |
2061 | } |
2046 | } |
2062 | } |
2047 | } |
2063 | } |
2048 | } |
2064 | #endif |
2049 | #endif |
2065 | |
2050 | |
2066 | /* |
2051 | /* |
2067 | * E: main pass across every character |
2052 | * E: main pass across every character |
2068 | */ |
2053 | */ |
2069 | for (row = 0; row < R->TermWin.nrow; row++) |
2054 | for (row = 0; row < TermWin.nrow; row++) |
2070 | { |
2055 | { |
2071 | stp = R->screen.text[row + row_offset]; |
2056 | stp = screen.text[row + row_offset]; |
2072 | srp = R->screen.rend[row + row_offset]; |
2057 | srp = screen.rend[row + row_offset]; |
2073 | dtp = R->drawn_text[row]; |
2058 | dtp = drawn_text[row]; |
2074 | drp = R->drawn_rend[row]; |
2059 | drp = drawn_rend[row]; |
2075 | |
2060 | |
2076 | /* |
2061 | /* |
2077 | * E2: OK, now the real pass |
2062 | * E2: OK, now the real pass |
2078 | */ |
2063 | */ |
2079 | int ypixel = (int)Row2Pixel(row); |
2064 | int ypixel = (int)Row2Pixel(row); |
2080 | |
2065 | |
2081 | for (col = 0; col < R->TermWin.ncol; col++) |
2066 | for (col = 0; col < TermWin.ncol; col++) |
2082 | { |
2067 | { |
2083 | /* compare new text with old - if exactly the same then continue */ |
2068 | /* compare new text with old - if exactly the same then continue */ |
2084 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2069 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2085 | |
2070 | |
2086 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2071 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
… | |
… | |
2102 | |
2087 | |
2103 | int xpixel = Col2Pixel(col); |
2088 | int xpixel = Col2Pixel(col); |
2104 | |
2089 | |
2105 | // this loop looks very messy, it can probably be optimized |
2090 | // this loop looks very messy, it can probably be optimized |
2106 | // and cleaned a bit by you? |
2091 | // and cleaned a bit by you? |
2107 | for (i = 0; ++col < R->TermWin.ncol; ) |
2092 | for (i = 0; ++col < TermWin.ncol; ) |
2108 | { |
2093 | { |
2109 | if (stp[col] == NOCHAR) |
2094 | if (stp[col] == NOCHAR) |
2110 | { |
2095 | { |
2111 | dtp[col] = stp[col]; |
2096 | dtp[col] = stp[col]; |
2112 | drp[col] = rend; |
2097 | drp[col] = rend; |
… | |
… | |
2116 | i++; |
2101 | i++; |
2117 | |
2102 | |
2118 | continue; |
2103 | continue; |
2119 | } |
2104 | } |
2120 | |
2105 | |
2121 | if (((rend ^ srp[col]) & ~RS_wide) != 0) |
2106 | if (rend != srp[col]) |
2122 | break; |
2107 | break; |
2123 | |
2108 | |
2124 | count++; |
2109 | count++; |
2125 | |
2110 | |
2126 | if (stp[col] != dtp[col] |
2111 | if (stp[col] != dtp[col] |
… | |
… | |
2138 | } |
2123 | } |
2139 | |
2124 | |
2140 | col--; /* went one too far. move back */ |
2125 | col--; /* went one too far. move back */ |
2141 | count -= i; /* dump any matching trailing chars */ |
2126 | count -= i; /* dump any matching trailing chars */ |
2142 | |
2127 | |
2143 | /* |
2128 | /* |
2144 | * Determine the attributes for the string |
2129 | * Determine the attributes for the string |
2145 | */ |
2130 | */ |
2146 | int fid = GET_FONT(rend); |
2131 | int fid = GET_FONT (rend); |
2147 | fore = GET_FGCOLOR(rend); |
2132 | int fore = GET_FGCOLOR (rend); // desired foreground |
2148 | back = GET_BGCOLOR(rend); |
2133 | int back = GET_BGCOLOR (rend); // desired background |
|
|
2134 | |
2149 | rend = GET_ATTR(rend); |
2135 | rend = GET_ATTR (rend); |
2150 | |
2136 | |
2151 | rvid = (rend & RS_RVid) ? 1 : 0; |
2137 | rvid = !!(rend & RS_RVid); |
2152 | #ifdef OPTION_HC |
2138 | #ifdef OPTION_HC |
2153 | if (!rvid && (rend & RS_Blink)) |
2139 | if (!rvid && (rend & RS_Blink)) |
2154 | { |
2140 | { |
2155 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_HC)) |
2141 | if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_HC)) |
2156 | back = Color_HC; |
2142 | back = Color_HC; |
2157 | else |
2143 | else |
2158 | rvid = !rvid; /* fall back */ |
2144 | rvid = !rvid; /* fall back */ |
2159 | } |
2145 | } |
2160 | #endif |
2146 | #endif |
2161 | if (rvid) |
2147 | if (rvid) |
2162 | { |
2148 | { |
2163 | SWAP_IT(fore, back, int); |
2149 | SWAP_IT(fore, back, int); |
2164 | |
2150 | |
2165 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2151 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2166 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_RV) |
2152 | if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_RV) |
2167 | # ifndef NO_CURSORCOLOR |
2153 | # ifndef NO_CURSORCOLOR |
2168 | && !ISSET_PIXCOLOR(R, Color_cursor) |
2154 | && !ISSET_PIXCOLOR (this, Color_cursor) |
2169 | # endif |
2155 | # endif |
2170 | ) |
2156 | ) |
2171 | back = Color_RV; |
2157 | back = Color_RV; |
2172 | #endif |
2158 | #endif |
2173 | } |
2159 | } |
2174 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2160 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2175 | else if (rend & RS_Bold) |
2161 | else if (rend & RS_Bold) |
2176 | { |
2162 | { |
2177 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_BD)) |
2163 | if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_BD)) |
2178 | { |
|
|
2179 | fore = Color_BD; |
2164 | fore = Color_BD; |
2180 | # ifndef VERYBOLD |
|
|
2181 | rend &= ~RS_Bold; /* we've taken care of it */ |
|
|
2182 | # endif |
|
|
2183 | } |
|
|
2184 | } |
2165 | } |
2185 | else if (rend & RS_Uline) |
2166 | else if (rend & RS_Uline) |
2186 | { |
2167 | { |
2187 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_UL)) |
2168 | if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_UL)) |
2188 | { |
|
|
2189 | fore = Color_UL; |
2169 | fore = Color_UL; |
2190 | rend &= ~RS_Uline; /* we've taken care of it */ |
|
|
2191 | } |
|
|
2192 | } |
2170 | } |
2193 | #endif |
2171 | #endif |
2194 | |
2172 | |
2195 | /* |
2173 | /* |
2196 | * Actually do the drawing of the string here |
2174 | * Actually do the drawing of the string here |
2197 | */ |
2175 | */ |
2198 | rxvt_font *font = (*R->TermWin.fontset)[fid]; |
2176 | rxvt_font *font = (*TermWin.fontset)[fid]; |
2199 | |
2177 | |
2200 | if (back == Color_bg) |
2178 | if (back == Color_bg) |
2201 | { |
2179 | { |
2202 | if (must_clear) |
2180 | if (must_clear) |
2203 | { |
2181 | { |
… | |
… | |
2206 | { |
2184 | { |
2207 | font->draw (xpixel, ypixel, text, count, fore, -1); |
2185 | font->draw (xpixel, ypixel, text, count, fore, -1); |
2208 | goto nodraw; |
2186 | goto nodraw; |
2209 | } |
2187 | } |
2210 | |
2188 | |
2211 | CLEAR_CHARS(xpixel, ypixel, count); |
2189 | CLEAR_CHARS (xpixel, ypixel, count); |
2212 | nodraw: ; |
2190 | nodraw: ; |
2213 | } |
2191 | } |
2214 | else |
2192 | else |
2215 | font->draw (xpixel, ypixel, text, count, fore, Color_bg); |
2193 | font->draw (xpixel, ypixel, text, count, fore, Color_bg); |
2216 | } |
2194 | } |
2217 | else |
2195 | else |
2218 | font->draw (xpixel, ypixel, text, count, fore, back); |
2196 | font->draw (xpixel, ypixel, text, count, fore, back); |
2219 | |
2197 | |
2220 | if ((rend & RS_Uline) && (font->descent > 1)) |
2198 | if ((rend & RS_Uline) && (font->descent > 1)) |
2221 | XDrawLine(R->Xdisplay, drawBuffer, R->TermWin.gc, |
2199 | XDrawLine(Xdisplay, drawBuffer, TermWin.gc, |
2222 | xpixel, ypixel + font->ascent + 1, |
2200 | xpixel, ypixel + font->ascent + 1, |
2223 | xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); |
2201 | xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); |
2224 | } /* for (col....) */ |
2202 | } /* for (col....) */ |
2225 | } /* for (row....) */ |
2203 | } /* for (row....) */ |
2226 | |
2204 | |
2227 | /* |
2205 | /* |
2228 | * G: cleanup cursor and display outline cursor if necessary |
2206 | * G: cleanup cursor and display outline cursor if necessary |
2229 | */ |
2207 | */ |
2230 | if (showcursor) { |
2208 | if (showcursor) { |
2231 | if (R->TermWin.focus) { |
2209 | if (TermWin.focus) { |
2232 | srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] |
2210 | srp = &(screen.rend[screen.cur.row + TermWin.saveLines] |
2233 | [R->screen.cur.col]); |
2211 | [screen.cur.col]); |
2234 | *srp ^= RS_RVid; |
2212 | *srp ^= RS_RVid; |
2235 | #ifndef NO_CURSORCOLOR |
2213 | #ifndef NO_CURSORCOLOR |
2236 | *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1; |
2214 | *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1; |
2237 | #endif |
2215 | #endif |
2238 | } else if (R->oldcursor.row >= 0) { |
2216 | } else if (oldcursor.row >= 0) { |
2239 | #ifndef NO_CURSORCOLOR |
2217 | #ifndef NO_CURSORCOLOR |
2240 | unsigned long gcmask; /* Graphics Context mask */ |
2218 | unsigned long gcmask; /* Graphics Context mask */ |
2241 | |
2219 | |
2242 | if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor)) { |
2220 | if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor)) |
2243 | XSetForeground (R->Xdisplay, R->TermWin.gc, R->PixColors[Color_cursor]); |
2221 | XSetForeground (Xdisplay, TermWin.gc, PixColors[Color_cursor]); |
2244 | } |
|
|
2245 | #endif |
2222 | #endif |
2246 | XDrawRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, |
2223 | XDrawRectangle(Xdisplay, drawBuffer, TermWin.gc, |
2247 | Col2Pixel(R->oldcursor.col), |
2224 | Col2Pixel(oldcursor.col), |
2248 | Row2Pixel(R->oldcursor.row), |
2225 | Row2Pixel(oldcursor.row), |
2249 | (unsigned int)(Width2Pixel(cursorwidth) - 1), |
2226 | (unsigned int)(Width2Pixel(cursorwidth) - 1), |
2250 | (unsigned int)(Height2Pixel(1) - R->TermWin.lineSpace - 1)); |
2227 | (unsigned int)(Height2Pixel(1) - TermWin.lineSpace - 1)); |
2251 | } |
2228 | } |
2252 | } |
2229 | } |
2253 | /* |
2230 | |
|
|
2231 | /* |
2254 | * H: cleanup selection |
2232 | * H: cleanup selection |
2255 | */ |
2233 | */ |
2256 | rxvt_scr_reverse_selection(aR); |
2234 | rxvt_scr_reverse_selection (this); |
2257 | |
2235 | |
2258 | /* |
2236 | /* |
2259 | * I: other general cleanup |
2237 | * I: other general cleanup |
2260 | */ |
2238 | */ |
2261 | if (clearfirst && R->TermWin.int_bwidth) |
2239 | if (clearfirst && TermWin.int_bwidth) |
2262 | /* |
2240 | /* |
2263 | * clear the whole screen height, note that width == 0 is treated |
2241 | * clear the whole screen height, note that width == 0 is treated |
2264 | * specially by XClearArea |
2242 | * specially by XClearArea |
2265 | */ |
2243 | */ |
2266 | XClearArea(R->Xdisplay, R->TermWin.vt, 0, 0, |
2244 | XClearArea(Xdisplay, TermWin.vt, 0, 0, |
2267 | (unsigned int)R->TermWin.int_bwidth, |
2245 | (unsigned int)TermWin.int_bwidth, |
2268 | (unsigned int)TermWin_TotalHeight(), False); |
2246 | (unsigned int)TermWin_TotalHeight(), False); |
2269 | if (clearlast && R->TermWin.int_bwidth) |
2247 | if (clearlast && TermWin.int_bwidth) |
2270 | /* |
2248 | /* |
2271 | * clear the whole screen height, note that width == 0 is treated |
2249 | * clear the whole screen height, note that width == 0 is treated |
2272 | * specially by XClearArea |
2250 | * specially by XClearArea |
2273 | */ |
2251 | */ |
2274 | XClearArea(R->Xdisplay, R->TermWin.vt, |
2252 | XClearArea(Xdisplay, TermWin.vt, |
2275 | R->TermWin.width + R->TermWin.int_bwidth, 0, |
2253 | TermWin.width + TermWin.int_bwidth, 0, |
2276 | (unsigned int)R->TermWin.int_bwidth, |
2254 | (unsigned int)TermWin.int_bwidth, |
2277 | (unsigned int)TermWin_TotalHeight(), False); |
2255 | (unsigned int)TermWin_TotalHeight(), False); |
2278 | if (refresh_type & SMOOTH_REFRESH) |
2256 | if (refresh_type & SMOOTH_REFRESH) |
2279 | XSync(R->Xdisplay, False); |
2257 | XSync(Xdisplay, False); |
2280 | |
2258 | |
2281 | R->num_scr = 0; |
2259 | num_scr = 0; |
2282 | R->num_scr_allow = 1; |
2260 | num_scr_allow = 1; |
2283 | R->want_refresh = 0; /* screen is current */ |
2261 | want_refresh = 0; /* screen is current */ |
2284 | } |
2262 | } |
2285 | /* ------------------------------------------------------------------------- */ |
|
|
2286 | |
2263 | |
2287 | /* EXTPROTO */ |
2264 | /* ------------------------------------------------------------------------- */ |
2288 | void |
2265 | void |
2289 | rxvt_scr_clear(pR) |
2266 | rxvt_term::scr_clear() |
2290 | { |
2267 | { |
2291 | if (!R->TermWin.mapped) |
2268 | if (!TermWin.mapped) |
2292 | return; |
2269 | return; |
|
|
2270 | |
2293 | R->num_scr_allow = 0; |
2271 | num_scr_allow = 0; |
2294 | R->want_refresh = 1; |
2272 | want_refresh = 1; |
2295 | #ifdef TRANSPARENT |
2273 | #ifdef TRANSPARENT |
2296 | if ((R->Options & Opt_transparent) && (R->am_pixmap_trans == 0)) { |
2274 | if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) |
2297 | int i; |
2275 | { |
|
|
2276 | int i; |
2298 | |
2277 | |
2299 | if (!(R->Options & Opt_transparent_all)) |
2278 | if (!(Options & Opt_transparent_all)) |
2300 | i = 0; |
2279 | i = 0; |
2301 | else |
2280 | else |
2302 | i = (int)(sizeof(R->TermWin.parent) / sizeof(Window)); |
2281 | i = (int)(sizeof(TermWin.parent) / sizeof(Window)); |
2303 | for (; i--;) |
2282 | |
|
|
2283 | while (i--) |
2304 | if (R->TermWin.parent[i] != None) |
2284 | if (TermWin.parent[i] != None) |
2305 | XClearWindow(R->Xdisplay, R->TermWin.parent[i]); |
2285 | XClearWindow(Xdisplay, TermWin.parent[i]); |
2306 | } |
2286 | } |
2307 | #endif |
2287 | #endif |
|
|
2288 | |
2308 | XClearWindow(R->Xdisplay, R->TermWin.vt); |
2289 | XClearWindow (Xdisplay, TermWin.vt); |
2309 | } |
2290 | } |
2310 | |
2291 | |
2311 | /* ------------------------------------------------------------------------- */ |
2292 | /* ------------------------------------------------------------------------- */ |
2312 | /* INTPROTO */ |
2293 | /* INTPROTO */ |
2313 | void |
2294 | void |
… | |
… | |
2415 | |
2396 | |
2416 | /* ------------------------------------------------------------------------- */ |
2397 | /* ------------------------------------------------------------------------- */ |
2417 | /* |
2398 | /* |
2418 | * Paste a selection direct to the command fd |
2399 | * Paste a selection direct to the command fd |
2419 | */ |
2400 | */ |
2420 | /* INTPROTO */ |
|
|
2421 | void |
2401 | void |
2422 | rxvt_PasteIt(pR_ const unsigned char *data, unsigned int nitems) |
2402 | rxvt_term::paste (const unsigned char *data, unsigned int len) |
2423 | { |
2403 | { |
2424 | unsigned int i, j, n; |
2404 | unsigned int i, j, n; |
2425 | unsigned char *ds = (unsigned char *)rxvt_malloc(PROP_SIZE); |
2405 | unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); |
2426 | |
2406 | |
|
|
2407 | #if 0 |
|
|
2408 | /* a paste should act like the user is typing, so check scrollTtyKeypress */ |
|
|
2409 | ZERO_SCROLLBACK (r); |
|
|
2410 | #endif |
|
|
2411 | |
2427 | /* convert normal newline chars into common keyboard Return key sequence */ |
2412 | /* convert normal newline chars into common keyboard Return key sequence */ |
2428 | for (i = 0; i < nitems; i += PROP_SIZE) { |
2413 | for (i = 0; i < len; i += PROP_SIZE) |
|
|
2414 | { |
2429 | n = min(nitems - i, PROP_SIZE); |
2415 | n = min (len - i, PROP_SIZE); |
2430 | MEMCPY(ds, data + i, n); |
2416 | MEMCPY (ds, data + i, n); |
|
|
2417 | |
2431 | for (j = 0; j < n; j++) |
2418 | for (j = 0; j < n; j++) |
2432 | if (ds[j] == '\n') |
2419 | if (ds[j] == '\n') |
2433 | ds[j] = '\r'; |
2420 | ds[j] = '\r'; |
|
|
2421 | |
2434 | rxvt_tt_write(aR_ ds, (int)n); |
2422 | tt_write (ds, (int)n); |
2435 | } |
2423 | } |
|
|
2424 | |
2436 | free(ds); |
2425 | free(ds); |
2437 | } |
2426 | } |
2438 | |
2427 | |
2439 | /* ------------------------------------------------------------------------- */ |
2428 | /* ------------------------------------------------------------------------- */ |
2440 | /* |
2429 | /* |
2441 | * Respond to a notification that a primary selection has been sent |
2430 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2443 | */ |
2432 | */ |
2444 | /* EXTPROTO */ |
2433 | /* EXTPROTO */ |
2445 | int |
2434 | int |
2446 | rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop) |
2435 | rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop) |
2447 | { |
2436 | { |
2448 | long nread = 0; |
2437 | long nread = 0; |
2449 | unsigned long bytes_after; |
2438 | unsigned long bytes_after; |
2450 | XTextProperty ct; |
2439 | XTextProperty ct; |
2451 | #ifdef MULTICHAR_SET |
|
|
2452 | int dummy_count; |
|
|
2453 | char **cl; |
|
|
2454 | #endif |
|
|
2455 | |
2440 | |
2456 | D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait)); |
2441 | D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait)); |
2457 | |
2442 | |
2458 | if (prop == None) { /* check for failed XConvertSelection */ |
2443 | if (prop == None) /* check for failed XConvertSelection */ |
2459 | #ifdef MULTICHAR_SET |
2444 | { |
2460 | if ((R->selection_type & Sel_CompoundText)) { |
2445 | if ((R->selection_type & Sel_CompoundText)) |
|
|
2446 | { |
2461 | int selnum = R->selection_type & Sel_whereMask; |
2447 | int selnum = R->selection_type & Sel_whereMask; |
2462 | |
2448 | |
|
|
2449 | R->selection_type = 0; |
|
|
2450 | if (selnum != Sel_direct) |
|
|
2451 | rxvt_selection_request_other(aR_ XA_STRING, selnum); |
|
|
2452 | } |
|
|
2453 | |
|
|
2454 | if ((R->selection_type & Sel_UTF8String)) |
|
|
2455 | { |
|
|
2456 | int selnum = R->selection_type & Sel_whereMask; |
|
|
2457 | |
|
|
2458 | R->selection_type = Sel_CompoundText; |
|
|
2459 | if (selnum != Sel_direct) |
|
|
2460 | rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], selnum); |
|
|
2461 | else |
2463 | R->selection_type = 0; |
2462 | R->selection_type = 0; |
2464 | if (selnum != Sel_direct) |
2463 | } |
2465 | rxvt_selection_request_other(aR_ XA_STRING, selnum); |
|
|
2466 | } |
2464 | |
2467 | #endif |
|
|
2468 | return 0; |
2465 | return 0; |
2469 | } |
2466 | } |
|
|
2467 | |
2470 | for (;;) { |
2468 | for (;;) |
|
|
2469 | { |
2471 | if (XGetWindowProperty(R->Xdisplay, win, prop, (long)(nread / 4), |
2470 | if (XGetWindowProperty(R->Xdisplay, win, prop, (long)(nread / 4), |
2472 | (long)(PROP_SIZE / 4), delete_prop, |
2471 | (long)(PROP_SIZE / 4), delete_prop, |
2473 | AnyPropertyType, &ct.encoding, &ct.format, |
2472 | AnyPropertyType, &ct.encoding, &ct.format, |
2474 | &ct.nitems, &bytes_after, |
2473 | &ct.nitems, &bytes_after, |
2475 | &ct.value) != Success) |
2474 | &ct.value) != Success) |
2476 | break; |
2475 | break; |
|
|
2476 | |
2477 | if (ct.encoding == 0) { |
2477 | if (ct.encoding == 0) |
|
|
2478 | { |
2478 | D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); |
2479 | D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); |
2479 | break; |
2480 | break; |
2480 | } |
2481 | } |
|
|
2482 | |
2481 | if (ct.value == NULL) { |
2483 | if (ct.value == NULL) |
|
|
2484 | { |
2482 | D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!")); |
2485 | D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!")); |
2483 | continue; |
2486 | continue; |
2484 | } |
2487 | } |
|
|
2488 | |
2485 | if (ct.nitems == 0) { |
2489 | if (ct.nitems == 0) |
|
|
2490 | { |
2486 | D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
2491 | D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
2487 | if (R->selection_wait == Sel_normal && nread == 0) { |
2492 | if (R->selection_wait == Sel_normal && nread == 0) |
|
|
2493 | { |
2488 | /* |
2494 | /* |
2489 | * pass through again trying CUT_BUFFER0 if we've come from |
2495 | * pass through again trying CUT_BUFFER0 if we've come from |
2490 | * XConvertSelection() but nothing was presented |
2496 | * XConvertSelection() but nothing was presented |
2491 | */ |
2497 | */ |
2492 | D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2498 | D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2493 | rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); |
2499 | rxvt_selection_paste (aR_ Xroot, XA_CUT_BUFFER0, False); |
2494 | } |
2500 | } |
|
|
2501 | |
2495 | nread = -1; /* discount any previous stuff */ |
2502 | nread = -1; /* discount any previous stuff */ |
2496 | break; |
2503 | break; |
2497 | } |
2504 | } |
|
|
2505 | |
2498 | nread += ct.nitems; |
2506 | nread += ct.nitems; |
2499 | #ifdef MULTICHAR_SET |
2507 | |
|
|
2508 | char **cl; |
|
|
2509 | int cr; |
2500 | if (XmbTextPropertyToTextList(R->Xdisplay, &ct, &cl, |
2510 | if (XmbTextPropertyToTextList (R->Xdisplay, &ct, &cl, |
2501 | &dummy_count) == Success && cl) { |
2511 | &cr) >= 0 && cl) |
2502 | rxvt_PasteIt(aR_ cl[0], STRLEN(cl[0])); |
2512 | { |
|
|
2513 | for (int i = 0; i < cr; i++) |
|
|
2514 | R->paste ((unsigned char *)cl[i], STRLEN (cl[i])); |
|
|
2515 | |
2503 | XFreeStringList(cl); |
2516 | XFreeStringList (cl); |
|
|
2517 | } |
2504 | } else |
2518 | else |
2505 | #endif |
2519 | R->paste (ct.value, ct.nitems); |
2506 | rxvt_PasteIt(aR_ ct.value, (unsigned int)ct.nitems); |
2520 | |
2507 | if (bytes_after == 0) |
2521 | if (bytes_after == 0) |
2508 | break; |
2522 | break; |
|
|
2523 | |
2509 | XFree(ct.value); |
2524 | XFree (ct.value); |
2510 | } |
2525 | } |
|
|
2526 | |
2511 | if (ct.value) |
2527 | if (ct.value) |
2512 | XFree(ct.value); |
2528 | XFree (ct.value); |
|
|
2529 | |
2513 | if (R->selection_wait == Sel_normal) |
2530 | if (R->selection_wait == Sel_normal) |
2514 | R->selection_wait = Sel_none; |
2531 | R->selection_wait = Sel_none; |
|
|
2532 | |
2515 | D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); |
2533 | D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); |
2516 | return (int)nread; |
2534 | return (int)nread; |
|
|
2535 | } |
|
|
2536 | |
|
|
2537 | void |
|
|
2538 | rxvt_term::incr_cb (time_watcher &w) |
|
|
2539 | { |
|
|
2540 | selection_wait = Sel_none; |
|
|
2541 | |
|
|
2542 | rxvt_print_error ("data loss: timeout on INCR selection paste"); |
2517 | } |
2543 | } |
2518 | |
2544 | |
2519 | /* |
2545 | /* |
2520 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2546 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2521 | */ |
2547 | */ |
… | |
… | |
2553 | } else if (R->selection_wait == Sel_incr) { |
2579 | } else if (R->selection_wait == Sel_incr) { |
2554 | reget_time = 1; |
2580 | reget_time = 1; |
2555 | if (rxvt_selection_paste(aR_ win, prop, True) == -1) { |
2581 | if (rxvt_selection_paste(aR_ win, prop, True) == -1) { |
2556 | D_SELECT((stderr, "rxvt_selection_property: INCR: clean end")); |
2582 | D_SELECT((stderr, "rxvt_selection_property: INCR: clean end")); |
2557 | R->selection_wait = Sel_none; |
2583 | R->selection_wait = Sel_none; |
2558 | R->timeout[TIMEOUT_INCR].tv_sec = 0; /* turn off timer */ |
2584 | R->incr_ev.stop (); |
2559 | } |
2585 | } |
2560 | } |
2586 | } |
2561 | if (reget_time) { /* received more data so reget time */ |
2587 | if (reget_time) /* received more data so reget time */ |
2562 | (void)gettimeofday(&(R->timeout[TIMEOUT_INCR]), NULL); |
2588 | R->incr_ev.start (NOW + 10); |
2563 | R->timeout[TIMEOUT_INCR].tv_sec += 10; /* ten seconds wait */ |
|
|
2564 | } |
|
|
2565 | } |
2589 | } |
2566 | /* ------------------------------------------------------------------------- */ |
2590 | /* ------------------------------------------------------------------------- */ |
2567 | /* |
2591 | /* |
2568 | * Request the current selection: |
2592 | * Request the current selection: |
2569 | * Order: > internal selection if available |
2593 | * Order: > internal selection if available |
… | |
… | |
2581 | if (x < 0 || x >= R->TermWin.width || y < 0 || y >= R->TermWin.height) |
2605 | if (x < 0 || x >= R->TermWin.width || y < 0 || y >= R->TermWin.height) |
2582 | return; /* outside window */ |
2606 | return; /* outside window */ |
2583 | |
2607 | |
2584 | if (R->selection.text != NULL) { /* internal selection */ |
2608 | if (R->selection.text != NULL) { /* internal selection */ |
2585 | D_SELECT((stderr, "rxvt_selection_request: pasting internal")); |
2609 | D_SELECT((stderr, "rxvt_selection_request: pasting internal")); |
2586 | rxvt_PasteIt(aR_ R->selection.text, R->selection.len); |
2610 | R->paste (R->selection.text, R->selection.len); |
2587 | return; |
2611 | return; |
2588 | } else { |
2612 | } else { |
2589 | int i; |
2613 | int i; |
2590 | |
2614 | |
2591 | R->selection_request_time = tm; |
2615 | R->selection_request_time = tm; |
2592 | R->selection_wait = Sel_normal; |
2616 | R->selection_wait = Sel_normal; |
2593 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) { |
2617 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) { |
2594 | #ifdef MULTICHAR_SET |
2618 | #if X_HAVE_UTF8_STRING |
|
|
2619 | R->selection_type = Sel_UTF8String; |
|
|
2620 | if (rxvt_selection_request_other(aR_ R->xa[XA_UTF8_STRING], i)) |
|
|
2621 | return; |
|
|
2622 | #else |
2595 | R->selection_type = Sel_CompoundText; |
2623 | R->selection_type = Sel_CompoundText; |
2596 | #else |
|
|
2597 | R->selection_type = 0; |
|
|
2598 | #endif |
|
|
2599 | if (rxvt_selection_request_other(aR_ |
2624 | if (rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], i)) |
2600 | #ifdef MULTICHAR_SET |
|
|
2601 | R->xa[XA_COMPOUND_TEXT], |
|
|
2602 | #else |
|
|
2603 | XA_STRING, |
|
|
2604 | #endif |
|
|
2605 | i)) |
|
|
2606 | return; |
2625 | return; |
|
|
2626 | #endif |
2607 | } |
2627 | } |
2608 | } |
2628 | } |
2609 | R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ |
2629 | R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ |
2610 | D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2630 | D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2611 | rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); |
2631 | rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); |
… | |
… | |
2743 | { |
2763 | { |
2744 | free (new_selection_text); |
2764 | free (new_selection_text); |
2745 | return; |
2765 | return; |
2746 | } |
2766 | } |
2747 | |
2767 | |
2748 | // due to MB_MAX_CUR, selection wastage is usually high |
2768 | // due to MB_MAX_CUR, selection wastage is usually high, so realloc |
2749 | if (str - (char *)new_selection_text > 1024) |
2769 | if (str - (char *)new_selection_text > 1024) |
2750 | new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1); |
2770 | new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1); |
2751 | |
2771 | |
2752 | R->selection.len = i; |
2772 | R->selection.len = i; |
|
|
2773 | |
2753 | if (R->selection.text) |
2774 | if (R->selection.text) |
2754 | free (R->selection.text); |
2775 | free (R->selection.text); |
2755 | |
2776 | |
2756 | R->selection.text = new_selection_text; |
2777 | R->selection.text = new_selection_text; |
2757 | |
2778 | |
2758 | XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm); |
2779 | XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm); |
2759 | if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt) |
2780 | if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt) |
2760 | rxvt_print_error("can't get primary selection"); |
2781 | rxvt_print_error("can't get primary selection"); |
|
|
2782 | |
|
|
2783 | |
|
|
2784 | { |
|
|
2785 | XTextProperty ct; |
|
|
2786 | char *cl = (char *)R->selection.text; |
|
|
2787 | |
|
|
2788 | if (XmbTextListToTextProperty(R->Xdisplay, &cl, 1, XStringStyle, &ct) >= 0) |
|
|
2789 | { |
|
|
2790 | XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, |
|
|
2791 | PropModeReplace, ct.value, ct.nitems); |
|
|
2792 | XFree (ct.value); |
|
|
2793 | } |
|
|
2794 | else |
2761 | XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, |
2795 | XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, |
2762 | PropModeReplace, R->selection.text, (int)R->selection.len); |
2796 | PropModeReplace, R->selection.text, (int)R->selection.len); |
|
|
2797 | } |
|
|
2798 | |
2763 | R->selection_time = tm; |
2799 | R->selection_time = tm; |
2764 | D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len)); |
2800 | D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len)); |
2765 | } |
2801 | } |
2766 | |
2802 | |
2767 | /* ------------------------------------------------------------------------- */ |
2803 | /* ------------------------------------------------------------------------- */ |
2768 | /* |
2804 | /* |
2769 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2805 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2770 | * EXT: button 1 press |
2806 | * EXT: button 1 press |
2771 | */ |
2807 | */ |
2772 | /* EXTPROTO */ |
|
|
2773 | void |
2808 | void |
2774 | rxvt_selection_click(pR_ int clicks, int x, int y) |
2809 | rxvt_term::selection_click (int clicks, int x, int y) |
2775 | { |
2810 | { |
2776 | D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y)); |
2811 | D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y)); |
2777 | |
2812 | |
2778 | clicks = ((clicks - 1) % 3) + 1; |
2813 | clicks = ((clicks - 1) % 3) + 1; |
2779 | R->selection.clicks = clicks; /* save clicks so extend will work */ |
2814 | selection.clicks = clicks; /* save clicks so extend will work */ |
2780 | |
2815 | |
2781 | rxvt_selection_start_colrow(aR_ Pixel2Col(x), Pixel2Row(y)); |
2816 | rxvt_selection_start_colrow (this, Pixel2Col(x), Pixel2Row(y)); |
|
|
2817 | |
2782 | if (clicks == 2 || clicks == 3) |
2818 | if (clicks == 2 || clicks == 3) |
2783 | rxvt_selection_extend_colrow(aR_ R->selection.mark.col, |
2819 | rxvt_selection_extend_colrow (this, selection.mark.col, |
2784 | R->selection.mark.row |
|
|
2785 | + R->TermWin.view_start, |
2820 | selection.mark.row + TermWin.view_start, |
2786 | 0, /* button 3 */ |
2821 | 0, /* button 3 */ |
2787 | 1, /* button press */ |
2822 | 1, /* button press */ |
2788 | 0); /* click change */ |
2823 | 0); /* click change */ |
2789 | } |
2824 | } |
2790 | |
2825 | |
2791 | /* ------------------------------------------------------------------------- */ |
2826 | /* ------------------------------------------------------------------------- */ |
2792 | /* |
2827 | /* |
2793 | * Mark a selection at the specified col/row |
2828 | * Mark a selection at the specified col/row |
… | |
… | |
2819 | */ |
2854 | */ |
2820 | |
2855 | |
2821 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2856 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2822 | #define DELIMIT_TEXT(x) \ |
2857 | #define DELIMIT_TEXT(x) \ |
2823 | (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(R->rs[Rs_cutchars], (x)) != NULL)) |
2858 | (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(R->rs[Rs_cutchars], (x)) != NULL)) |
2824 | #ifdef MULTICHAR_SET |
|
|
2825 | # define DELIMIT_REND(x) (((x) & RS_multiMask) ? 1 : 0) |
|
|
2826 | #else |
|
|
2827 | # define DELIMIT_REND(x) 1 |
2859 | #define DELIMIT_REND(x) 1 |
2828 | #endif |
|
|
2829 | |
2860 | |
2830 | /* INTPROTO */ |
2861 | /* INTPROTO */ |
2831 | void |
2862 | void |
2832 | rxvt_selection_delimit_word(pR_ enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2863 | rxvt_selection_delimit_word(pR_ enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2833 | { |
2864 | { |
… | |
… | |
2907 | * EXT: button 3 press; button 1 or 3 drag |
2938 | * EXT: button 3 press; button 1 or 3 drag |
2908 | * flag == 0 ==> button 1 |
2939 | * flag == 0 ==> button 1 |
2909 | * flag == 1 ==> button 3 press |
2940 | * flag == 1 ==> button 3 press |
2910 | * flag == 2 ==> button 3 motion |
2941 | * flag == 2 ==> button 3 motion |
2911 | */ |
2942 | */ |
2912 | /* EXTPROTO */ |
|
|
2913 | void |
2943 | void |
2914 | rxvt_selection_extend(pR_ int x, int y, int flag) |
2944 | rxvt_term::selection_extend (int x, int y, int flag) |
2915 | { |
2945 | { |
2916 | int col, row; |
2946 | int col, row; |
2917 | |
2947 | |
2918 | col = Pixel2Col(x); |
2948 | col = Pixel2Col(x); |
2919 | row = Pixel2Row(y); |
2949 | row = Pixel2Row(y); |
2920 | MAX_IT(row, 0); |
2950 | MAX_IT(row, 0); |
2921 | MIN_IT(row, (int)R->TermWin.nrow - 1); |
2951 | MIN_IT(row, (int)TermWin.nrow - 1); |
2922 | MAX_IT(col, 0); |
2952 | MAX_IT(col, 0); |
2923 | MIN_IT(col, (int)R->TermWin.ncol); |
2953 | MIN_IT(col, (int)TermWin.ncol); |
|
|
2954 | |
2924 | #ifndef NO_NEW_SELECTION |
2955 | #ifndef NO_NEW_SELECTION |
2925 | /* |
2956 | /* |
2926 | * If we're selecting characters (single click) then we must check first |
2957 | * If we're selecting characters (single click) then we must check first |
2927 | * if we are at the same place as the original mark. If we are then |
2958 | * if we are at the same place as the original mark. If we are then |
2928 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
2959 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
2929 | * be _past_ a character for it to be selected. |
2960 | * be _past_ a character for it to be selected. |
2930 | */ |
2961 | */ |
2931 | if (R->selection_style != OLD_SELECT) { |
2962 | if (selection_style != OLD_SELECT) |
|
|
2963 | { |
2932 | if (((R->selection.clicks % 3) == 1) && !flag |
2964 | if (((selection.clicks % 3) == 1) && !flag |
2933 | && (col == R->selection.mark.col |
2965 | && (col == selection.mark.col |
2934 | && (row == R->selection.mark.row + R->TermWin.view_start))) { |
2966 | && (row == selection.mark.row + TermWin.view_start))) |
|
|
2967 | { |
2935 | /* select nothing */ |
2968 | /* select nothing */ |
2936 | R->selection.beg.row = R->selection.end.row = 0; |
2969 | selection.beg.row = selection.end.row = 0; |
2937 | R->selection.beg.col = R->selection.end.col = 0; |
2970 | selection.beg.col = selection.end.col = 0; |
2938 | R->selection.clicks = 4; |
2971 | selection.clicks = 4; |
2939 | R->want_refresh = 1; |
2972 | want_refresh = 1; |
2940 | D_SELECT((stderr, "rxvt_selection_extend() R->selection.clicks = 4")); |
2973 | D_SELECT((stderr, "rxvt_selection_extend() selection.clicks = 4")); |
2941 | return; |
2974 | return; |
2942 | } |
2975 | } |
2943 | } |
2976 | } |
2944 | #endif |
2977 | #endif |
2945 | if (R->selection.clicks == 4) |
2978 | if (selection.clicks == 4) |
2946 | R->selection.clicks = 1; |
2979 | selection.clicks = 1; |
|
|
2980 | |
2947 | rxvt_selection_extend_colrow(aR_ col, row, !!flag, /* ? button 3 */ |
2981 | rxvt_selection_extend_colrow (this, col, row, !!flag, /* ? button 3 */ |
2948 | flag == 1 ? 1 : 0, /* ? button press */ |
2982 | flag == 1 ? 1 : 0, /* ? button press */ |
2949 | 0); /* no click change */ |
2983 | 0); /* no click change */ |
2950 | } |
2984 | } |
2951 | |
2985 | |
2952 | /* ------------------------------------------------------------------------- */ |
2986 | /* ------------------------------------------------------------------------- */ |
2953 | /* |
2987 | /* |
2954 | * Extend the selection to the specified col/row |
2988 | * Extend the selection to the specified col/row |
… | |
… | |
3208 | /* ------------------------------------------------------------------------- */ |
3242 | /* ------------------------------------------------------------------------- */ |
3209 | /* |
3243 | /* |
3210 | * Double click on button 3 when already selected |
3244 | * Double click on button 3 when already selected |
3211 | * EXT: button 3 double click |
3245 | * EXT: button 3 double click |
3212 | */ |
3246 | */ |
3213 | /* EXTPROTO */ |
|
|
3214 | void |
3247 | void |
3215 | rxvt_selection_rotate(pR_ int x, int y) |
3248 | rxvt_term::selection_rotate (int x, int y) |
3216 | { |
3249 | { |
3217 | R->selection.clicks = R->selection.clicks % 3 + 1; |
3250 | selection.clicks = selection.clicks % 3 + 1; |
3218 | rxvt_selection_extend_colrow(aR_ Pixel2Col(x), Pixel2Row(y), 1, 0, 1); |
3251 | rxvt_selection_extend_colrow (this, Pixel2Col(x), Pixel2Row(y), 1, 0, 1); |
3219 | } |
3252 | } |
3220 | |
3253 | |
3221 | /* ------------------------------------------------------------------------- */ |
3254 | /* ------------------------------------------------------------------------- */ |
3222 | /* |
3255 | /* |
3223 | * On some systems, the Atom typedef is 64 bits wide. We need to have a type |
3256 | * On some systems, the Atom typedef is 64 bits wide. We need to have a type |
3224 | * that is exactly 32 bits wide, because a format of 64 is not allowed by |
3257 | * that is exactly 32 bits wide, because a format of 64 is not allowed by |
3225 | * the X11 protocol. |
3258 | * the X11 protocol. |
3226 | */ |
3259 | */ |
3227 | typedef CARD32 Atom32; |
3260 | typedef CARD32 Atom32; |
3228 | |
3261 | |
3229 | /* ------------------------------------------------------------------------- */ |
3262 | /* ------------------------------------------------------------------------- */ |
3230 | /* |
3263 | /* |
3231 | * Respond to a request for our current selection |
3264 | * Respond to a request for our current selection |
3232 | * EXT: SelectionRequest |
3265 | * EXT: SelectionRequest |
… | |
… | |
3234 | /* EXTPROTO */ |
3267 | /* EXTPROTO */ |
3235 | void |
3268 | void |
3236 | rxvt_selection_send(pR_ const XSelectionRequestEvent *rq) |
3269 | rxvt_selection_send(pR_ const XSelectionRequestEvent *rq) |
3237 | { |
3270 | { |
3238 | XSelectionEvent ev; |
3271 | XSelectionEvent ev; |
3239 | #ifdef USE_XIM |
|
|
3240 | Atom32 target_list[4]; |
|
|
3241 | #else |
|
|
3242 | Atom32 target_list[3]; |
|
|
3243 | #endif |
|
|
3244 | Atom target; |
|
|
3245 | XTextProperty ct; |
3272 | XTextProperty ct; |
3246 | XICCEncodingStyle style; |
3273 | XICCEncodingStyle style; |
3247 | char *cl[2], dummy[1]; |
3274 | Atom target; |
3248 | |
3275 | |
3249 | ev.type = SelectionNotify; |
3276 | ev.type = SelectionNotify; |
3250 | ev.property = None; |
3277 | ev.property = None; |
3251 | ev.display = rq->display; |
3278 | ev.display = rq->display; |
3252 | ev.requestor = rq->requestor; |
3279 | ev.requestor = rq->requestor; |
3253 | ev.selection = rq->selection; |
3280 | ev.selection = rq->selection; |
3254 | ev.target = rq->target; |
3281 | ev.target = rq->target; |
3255 | ev.time = rq->time; |
3282 | ev.time = rq->time; |
3256 | |
3283 | |
3257 | if (rq->target == R->xa[XA_TARGETS]) { |
3284 | if (rq->target == R->xa[XA_TARGETS]) { |
|
|
3285 | Atom32 target_list[5]; |
|
|
3286 | Atom32 *target = target_list; |
|
|
3287 | |
3258 | target_list[0] = (Atom32) R->xa[XA_TARGETS]; |
3288 | *target++ = (Atom32) R->xa[XA_TARGETS]; |
3259 | target_list[1] = (Atom32) XA_STRING; |
3289 | *target++ = (Atom32) XA_STRING; |
3260 | target_list[2] = (Atom32) R->xa[XA_TEXT]; |
3290 | *target++ = (Atom32) R->xa[XA_TEXT]; |
3261 | #ifdef USE_XIM |
|
|
3262 | target_list[3] = (Atom32) R->xa[XA_COMPOUND_TEXT]; |
3291 | *target++ = (Atom32) R->xa[XA_COMPOUND_TEXT]; |
|
|
3292 | #if X_HAVE_UTF8_STRING |
|
|
3293 | *target++ = (Atom32) R->xa[XA_UTF8_STRING]; |
3263 | #endif |
3294 | #endif |
3264 | XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM, |
3295 | XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM, |
3265 | (8 * sizeof(target_list[0])), PropModeReplace, |
3296 | (8 * sizeof(target_list[0])), PropModeReplace, |
3266 | (unsigned char *)target_list, |
3297 | (unsigned char *)target_list, |
3267 | (sizeof(target_list) / sizeof(target_list[0]))); |
3298 | target - target_list); |
3268 | ev.property = rq->property; |
3299 | ev.property = rq->property; |
3269 | } else if (rq->target == R->xa[XA_MULTIPLE]) { |
3300 | } else if (rq->target == R->xa[XA_MULTIPLE]) { |
3270 | /* TODO: Handle MULTIPLE */ |
3301 | /* TODO: Handle MULTIPLE */ |
3271 | } else if (rq->target == R->xa[XA_TIMESTAMP] && R->selection.text) { |
3302 | } else if (rq->target == R->xa[XA_TIMESTAMP] && R->selection.text) { |
3272 | XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER, |
3303 | XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER, |
3273 | (8 * sizeof(Time)), PropModeReplace, |
3304 | (8 * sizeof(Time)), PropModeReplace, |
3274 | (unsigned char *)&R->selection_time, 1); |
3305 | (unsigned char *)&R->selection_time, 1); |
3275 | ev.property = rq->property; |
3306 | ev.property = rq->property; |
3276 | } else if (rq->target == XA_STRING |
3307 | } else if (rq->target == XA_STRING |
|
|
3308 | || rq->target == R->xa[XA_TEXT] |
3277 | || rq->target == R->xa[XA_COMPOUND_TEXT] |
3309 | || rq->target == R->xa[XA_COMPOUND_TEXT] |
3278 | || rq->target == R->xa[XA_TEXT]) { |
3310 | || rq->target == R->xa[XA_UTF8_STRING] |
3279 | #ifdef USE_XIM |
3311 | ) { |
3280 | short freect = 0; |
3312 | short freect = 0; |
3281 | #endif |
|
|
3282 | int selectlen; |
3313 | int selectlen; |
|
|
3314 | char *cl; |
3283 | |
3315 | |
3284 | #ifdef USE_XIM |
3316 | target = rq->target; |
|
|
3317 | |
3285 | if (rq->target != XA_STRING) { |
3318 | if (target == XA_STRING) |
|
|
3319 | // we actually don't do XA_STRING, but who cares, as i18n clients |
|
|
3320 | // will ask for another format anyways. |
|
|
3321 | style = XStringStyle; |
|
|
3322 | else if (target == R->xa[XA_TEXT]) |
|
|
3323 | style = XTextStyle; |
|
|
3324 | else if (target == R->xa[XA_COMPOUND_TEXT]) |
|
|
3325 | style = XCompoundTextStyle; |
|
|
3326 | #if X_HAVE_UTF8_STRING |
|
|
3327 | else if (target == R->xa[XA_UTF8_STRING]) |
|
|
3328 | style = XUTF8StringStyle; |
|
|
3329 | #endif |
|
|
3330 | else |
|
|
3331 | { |
3286 | target = R->xa[XA_COMPOUND_TEXT]; |
3332 | target = R->xa[XA_COMPOUND_TEXT]; |
3287 | style = (rq->target == R->xa[XA_COMPOUND_TEXT]) |
|
|
3288 | ? XCompoundTextStyle : XStdICCTextStyle; |
|
|
3289 | } else |
|
|
3290 | #endif |
|
|
3291 | { |
|
|
3292 | target = XA_STRING; |
|
|
3293 | style = XStringStyle; |
3333 | style = XCompoundTextStyle; |
3294 | } |
3334 | } |
|
|
3335 | |
3295 | if (R->selection.text) { |
3336 | if (R->selection.text) { |
3296 | cl[0] = (char *)R->selection.text; |
3337 | cl = (char *)R->selection.text; |
3297 | selectlen = R->selection.len; |
3338 | selectlen = R->selection.len; |
3298 | } else { |
3339 | } else { |
3299 | cl[0] = dummy; |
3340 | cl = ""; |
3300 | *dummy = '\0'; |
|
|
3301 | selectlen = 0; |
3341 | selectlen = 0; |
3302 | } |
3342 | } |
3303 | #ifdef USE_XIM |
3343 | |
3304 | if (XmbTextListToTextProperty(R->Xdisplay, cl, 1, style, &ct) |
3344 | if (XmbTextListToTextProperty(R->Xdisplay, &cl, 1, style, &ct) >= 0) |
3305 | == Success) /* if we failed to convert then send it raw */ |
|
|
3306 | freect = 1; |
3345 | freect = 1; |
3307 | else |
3346 | else |
3308 | #endif |
|
|
3309 | { |
3347 | { |
|
|
3348 | /* if we failed to convert then send it raw */ |
3310 | ct.value = (unsigned char *)cl[0]; |
3349 | ct.value = (unsigned char *)cl; |
3311 | ct.nitems = selectlen; |
3350 | ct.nitems = selectlen; |
3312 | } |
3351 | } |
|
|
3352 | |
3313 | XChangeProperty(R->Xdisplay, rq->requestor, rq->property, |
3353 | XChangeProperty(R->Xdisplay, rq->requestor, rq->property, |
3314 | target, 8, PropModeReplace, |
3354 | target, 8, PropModeReplace, |
3315 | ct.value, (int)ct.nitems); |
3355 | ct.value, (int)ct.nitems); |
3316 | ev.property = rq->property; |
3356 | ev.property = rq->property; |
3317 | #ifdef USE_XIM |
3357 | |
3318 | if (freect) |
3358 | if (freect) |
3319 | XFree(ct.value); |
3359 | XFree (ct.value); |
3320 | #endif |
|
|
3321 | } |
3360 | } |
3322 | XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); |
3361 | XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); |
3323 | } |
3362 | } |
3324 | |
3363 | |
3325 | /* ------------------------------------------------------------------------- * |
3364 | /* ------------------------------------------------------------------------- * |
… | |
… | |
3327 | * ------------------------------------------------------------------------- */ |
3366 | * ------------------------------------------------------------------------- */ |
3328 | |
3367 | |
3329 | /* |
3368 | /* |
3330 | * return col/row values corresponding to x/y pixel values |
3369 | * return col/row values corresponding to x/y pixel values |
3331 | */ |
3370 | */ |
3332 | /* EXTPROTO */ |
|
|
3333 | void |
3371 | void |
3334 | rxvt_pixel_position(pR_ int *x, int *y) |
3372 | rxvt_term::pixel_position (int *x, int *y) |
3335 | { |
3373 | { |
3336 | *x = Pixel2Col(*x); |
3374 | *x = Pixel2Col(*x); |
3337 | /* MAX_IT(*x, 0); MIN_IT(*x, (int)R->TermWin.ncol - 1); */ |
3375 | /* MAX_IT(*x, 0); MIN_IT(*x, (int)R->TermWin.ncol - 1); */ |
3338 | *y = Pixel2Row(*y); |
3376 | *y = Pixel2Row(*y); |
3339 | /* MAX_IT(*y, 0); MIN_IT(*y, (int)R->TermWin.nrow - 1); */ |
3377 | /* MAX_IT(*y, 0); MIN_IT(*y, (int)R->TermWin.nrow - 1); */ |
3340 | } |
3378 | } |
|
|
3379 | |
3341 | /* ------------------------------------------------------------------------- */ |
3380 | /* ------------------------------------------------------------------------- */ |
3342 | #ifdef USE_XIM |
3381 | #ifdef USE_XIM |
3343 | /* EXTPROTO */ |
|
|
3344 | void |
3382 | void |
3345 | rxvt_setPosition(pR_ XPoint *pos) |
3383 | rxvt_term::set_position (XPoint *pos) |
3346 | { |
3384 | { |
3347 | XWindowAttributes xwa; |
3385 | XWindowAttributes xwa; |
3348 | |
3386 | |
3349 | XGetWindowAttributes(R->Xdisplay, R->TermWin.vt, &xwa); |
3387 | XGetWindowAttributes (Xdisplay, TermWin.vt, &xwa); |
3350 | pos->x = Col2Pixel(R->screen.cur.col) + xwa.x; |
3388 | pos->x = Col2Pixel (screen.cur.col) + xwa.x; |
3351 | pos->y = Height2Pixel((R->screen.cur.row + 1)) + xwa.y |
3389 | pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; |
3352 | - R->TermWin.lineSpace; |
|
|
3353 | } |
3390 | } |
|
|
3391 | |
3354 | #endif |
3392 | #endif |
3355 | /* ------------------------------------------------------------------------- */ |
3393 | /* ------------------------------------------------------------------------- */ |
3356 | |
3394 | |
3357 | /* ------------------------------------------------------------------------- * |
3395 | /* ------------------------------------------------------------------------- * |
3358 | * DEBUG ROUTINES * |
3396 | * DEBUG ROUTINES * |