1 | /*--------------------------------*-C-*--------------------------------------* |
1 | /*---------------------------------------------------------------------------* |
2 | * File: screen.C |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
… | |
… | |
26 | |
26 | |
27 | #include "../config.h" /* NECESSARY */ |
27 | #include "../config.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
|
|
32 | |
|
|
33 | #include <inttypes.h> |
31 | #include <inttypes.h> |
34 | |
32 | |
35 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a seperate compile! |
36 | |
34 | |
37 | inline void fill_text (text_t *start, text_t value, int len) |
35 | static inline void fill_text (text_t *start, text_t value, int len) |
38 | { |
36 | { |
39 | while (len--) |
37 | while (len--) |
40 | *start++ = value; |
38 | *start++ = value; |
41 | } |
39 | } |
42 | |
40 | |
… | |
… | |
47 | |
45 | |
48 | /* ------------------------------------------------------------------------- * |
46 | /* ------------------------------------------------------------------------- * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
47 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
50 | * ------------------------------------------------------------------------- */ |
48 | * ------------------------------------------------------------------------- */ |
51 | #define ZERO_SCROLLBACK() \ |
49 | #define ZERO_SCROLLBACK() \ |
52 | if (OPTION (Opt_scrollTtyOutput)) \ |
50 | if (option (Opt_scrollTtyOutput)) \ |
53 | view_start = 0 |
51 | view_start = 0 |
54 | #define CLEAR_SELECTION() \ |
52 | #define CLEAR_SELECTION() \ |
55 | selection.beg.row = selection.beg.col \ |
53 | selection.beg.row = selection.beg.col \ |
56 | = selection.end.row = selection.end.col = 0 |
54 | = selection.end.row = selection.end.col = 0 |
57 | #define CLEAR_ALL_SELECTION() \ |
55 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
85 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
83 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
86 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
84 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
87 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
85 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
88 | |
86 | |
89 | /* |
87 | /* |
90 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
|
|
91 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
88 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
92 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
|
|
93 | */ |
89 | */ |
94 | #define drawBuffer vt |
|
|
95 | |
|
|
96 | #define CLEAR_ROWS(row, num) \ |
|
|
97 | if (mapped) \ |
|
|
98 | XClearArea (display->display, drawBuffer, 0, \ |
|
|
99 | Row2Pixel (row), (unsigned int)width, \ |
|
|
100 | (unsigned int)Height2Pixel (num), False) |
|
|
101 | |
|
|
102 | #define CLEAR_CHARS(x, y, num) \ |
90 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (mapped) \ |
91 | if (mapped) \ |
104 | XClearArea (display->display, drawBuffer, x, y, \ |
92 | XClearArea (dpy, vt, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
93 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
94 | (unsigned int)Height2Pixel (1), False) |
107 | |
|
|
108 | #define ERASE_ROWS(row, num) \ |
|
|
109 | XFillRectangle (display->display, drawBuffer, gc, \ |
|
|
110 | 0, Row2Pixel (row), \ |
|
|
111 | (unsigned int)width, \ |
|
|
112 | (unsigned int)Height2Pixel (num)) |
|
|
113 | |
95 | |
114 | /* ------------------------------------------------------------------------- * |
96 | /* ------------------------------------------------------------------------- * |
115 | * SCREEN `COMMON' ROUTINES * |
97 | * SCREEN `COMMON' ROUTINES * |
116 | * ------------------------------------------------------------------------- */ |
98 | * ------------------------------------------------------------------------- */ |
117 | |
99 | |
118 | /* Fill part/all of a line with blanks. */ |
100 | /* Fill part/all of a line with blanks. */ |
119 | void |
101 | void |
120 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) |
102 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW |
121 | { |
103 | { |
122 | if (!l.t) |
104 | if (!l.t) |
123 | { |
105 | { |
124 | lalloc (l); |
106 | lalloc (l); |
125 | col = 0; |
107 | col = 0; |
126 | width = ncol; |
108 | width = ncol; |
127 | } |
109 | } |
128 | |
110 | |
129 | efs &= ~RS_baseattrMask; |
111 | l.touch (); |
|
|
112 | |
|
|
113 | efs &= ~RS_baseattrMask; // remove italic etc. fontstyles |
130 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
114 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
131 | |
115 | |
132 | text_t *et = l.t + col; |
116 | text_t *et = l.t + col; |
133 | rend_t *er = l.r + col; |
117 | rend_t *er = l.r + col; |
134 | |
118 | |
… | |
… | |
140 | } |
124 | } |
141 | |
125 | |
142 | /* ------------------------------------------------------------------------- */ |
126 | /* ------------------------------------------------------------------------- */ |
143 | /* Fill a full line with blanks - make sure it is allocated first */ |
127 | /* Fill a full line with blanks - make sure it is allocated first */ |
144 | void |
128 | void |
145 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
129 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW |
146 | { |
130 | { |
147 | scr_blank_line (l, 0, ncol, efs); |
131 | scr_blank_line (l, 0, ncol, efs); |
|
|
132 | |
|
|
133 | l.l = 0; |
|
|
134 | l.f = 0; |
|
|
135 | } |
|
|
136 | |
|
|
137 | // nuke a single wide character at the given column |
|
|
138 | void |
|
|
139 | rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW |
|
|
140 | { |
|
|
141 | // find begin |
|
|
142 | while (col > 0 && l.t[col] == NOCHAR) |
|
|
143 | col--; |
|
|
144 | |
|
|
145 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
|
|
146 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
|
|
147 | |
|
|
148 | // found start, nuke |
|
|
149 | do { |
|
|
150 | l.t[col] = ' '; |
|
|
151 | l.r[col] = rend; |
|
|
152 | col++; |
|
|
153 | } while (col < ncol && l.t[col] == NOCHAR); |
148 | } |
154 | } |
149 | |
155 | |
150 | /* ------------------------------------------------------------------------- * |
156 | /* ------------------------------------------------------------------------- * |
151 | * SCREEN INITIALISATION * |
157 | * SCREEN INITIALISATION * |
152 | * ------------------------------------------------------------------------- */ |
158 | * ------------------------------------------------------------------------- */ |
153 | |
159 | |
154 | void |
160 | void |
155 | rxvt_term::scr_reset () |
161 | rxvt_term::scr_reset () |
156 | { |
162 | { |
157 | #if ENABLE_OVERLAY |
|
|
158 | scr_overlay_off (); |
|
|
159 | #endif |
|
|
160 | |
|
|
161 | view_start = 0; |
163 | view_start = 0; |
162 | num_scr = 0; |
164 | num_scr = 0; |
163 | |
165 | |
164 | if (ncol == 0) |
166 | if (ncol == 0) |
165 | ncol = 80; |
167 | ncol = 80; |
… | |
… | |
169 | |
171 | |
170 | if (ncol == prev_ncol && nrow == prev_nrow) |
172 | if (ncol == prev_ncol && nrow == prev_nrow) |
171 | return; |
173 | return; |
172 | |
174 | |
173 | // we need at least two lines for wrapping to work correctly |
175 | // we need at least two lines for wrapping to work correctly |
174 | if (nrow + saveLines < 2) |
176 | while (nrow + saveLines < 2) |
175 | { |
177 | { |
176 | //TODO//FIXME |
178 | //TODO//FIXME |
177 | saveLines++; |
179 | saveLines++; |
178 | prev_nrow--; |
180 | prev_nrow--; |
179 | nsaved++; |
181 | top_row--; |
180 | } |
182 | } |
181 | |
183 | |
182 | want_refresh = 1; |
184 | want_refresh = 1; |
183 | |
185 | |
184 | int prev_total_rows = prev_nrow + saveLines; |
186 | int prev_total_rows = prev_nrow + saveLines; |
… | |
… | |
189 | |
191 | |
190 | if (!row_buf) |
192 | if (!row_buf) |
191 | { |
193 | { |
192 | /* |
194 | /* |
193 | * first time called so just malloc everything: don't rely on realloc |
195 | * 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 |
|
|
195 | */ |
196 | */ |
196 | nsaved = 0; /* no saved lines */ |
197 | top_row = 0; |
197 | term_start = 0; |
198 | term_start = 0; |
198 | |
199 | |
199 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
200 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
200 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
201 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
201 | |
202 | |
202 | row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
203 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
203 | temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
204 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
204 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
205 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
205 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
206 | |
206 | |
207 | for (int row = nrow; row--; ) |
207 | for (int row = nrow; row--; ) |
208 | { |
208 | { |
209 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
209 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
210 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
210 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
… | |
… | |
231 | selection.text = NULL; |
231 | selection.text = NULL; |
232 | selection.len = 0; |
232 | selection.len = 0; |
233 | selection.op = SELECTION_CLEAR; |
233 | selection.op = SELECTION_CLEAR; |
234 | selection.screen = PRIMARY; |
234 | selection.screen = PRIMARY; |
235 | selection.clicks = 0; |
235 | selection.clicks = 0; |
236 | CLEAR_ALL_SELECTION (); |
236 | selection.clip_text = NULL; |
237 | rvideo = 0; |
237 | selection.clip_len = 0; |
238 | } |
238 | } |
239 | else |
239 | else |
240 | { |
240 | { |
241 | /* |
241 | /* |
242 | * add or delete rows as appropriate |
242 | * add or delete rows as appropriate |
… | |
… | |
255 | } |
255 | } |
256 | } |
256 | } |
257 | #endif |
257 | #endif |
258 | |
258 | |
259 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
259 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
260 | temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t)); |
|
|
261 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
260 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
262 | |
261 | |
263 | for (int row = min (nrow, prev_nrow); row--; ) |
262 | for (int row = min (nrow, prev_nrow); row--; ) |
264 | { |
263 | { |
265 | lresize (drawn_buf[row]); |
264 | lresize (drawn_buf[row]); |
… | |
… | |
270 | { |
269 | { |
271 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
270 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
272 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
271 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
273 | } |
272 | } |
274 | |
273 | |
|
|
274 | line_t *old_buf = row_buf; |
275 | line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
275 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
276 | |
276 | |
277 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
277 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
278 | int pend = MOD (term_start - nsaved , prev_total_rows); |
278 | int pend = MOD (term_start + top_row , prev_total_rows); |
279 | int q = total_rows; // rewrapped row |
279 | int q = total_rows; // rewrapped row |
280 | |
280 | |
281 | if (nsaved) |
281 | if (top_row) |
282 | { |
282 | { |
283 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
283 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
284 | // to come up with a lean and mean algorithm. |
284 | // to come up with a lean and mean algorithm. |
|
|
285 | // TODO: maybe optimise when width didn't change |
285 | |
286 | |
286 | row_col_t ocur = screen.cur; |
287 | row_col_t ocur = screen.cur; |
287 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
288 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
288 | |
289 | |
289 | do |
290 | do |
290 | { |
291 | { |
291 | p = MOD (p - 1, prev_total_rows); |
292 | p = MOD (p - 1, prev_total_rows); |
292 | #ifdef DEBUG_STRICT |
|
|
293 | assert (old_buf [MOD (p, prev_total_rows)].t); |
293 | assert (old_buf [MOD (p, prev_total_rows)].t); |
294 | #endif |
|
|
295 | |
|
|
296 | int plines = 1; |
294 | int plines = 1; |
297 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
295 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
298 | |
296 | |
299 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
297 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
300 | { |
298 | { |
… | |
… | |
318 | // re-assemble the full line by destination lines |
316 | // re-assemble the full line by destination lines |
319 | for (int qrow = q; qlines--; qrow++) |
317 | for (int qrow = q; qlines--; qrow++) |
320 | { |
318 | { |
321 | qline = row_buf + qrow; |
319 | qline = row_buf + qrow; |
322 | lalloc (*qline); |
320 | lalloc (*qline); |
|
|
321 | qline->l = ncol; |
323 | qline->set_is_longer (); |
322 | qline->is_longer (1); |
324 | |
323 | |
325 | int qcol = 0; |
324 | int qcol = 0; |
|
|
325 | |
|
|
326 | // see below for cursor adjustment rationale |
|
|
327 | if (p == ocur.row) |
|
|
328 | screen.cur.row = q - (total_rows - nrow); |
326 | |
329 | |
327 | // fill a single destination line |
330 | // fill a single destination line |
328 | while (lofs < llen && qcol < ncol) |
331 | while (lofs < llen && qcol < ncol) |
329 | { |
332 | { |
330 | int prow = lofs / prev_ncol; |
333 | int prow = lofs / prev_ncol; |
… | |
… | |
341 | |
344 | |
342 | line_t &pline = old_buf [prow]; |
345 | line_t &pline = old_buf [prow]; |
343 | |
346 | |
344 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
347 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
345 | |
348 | |
346 | assert (len); |
|
|
347 | assert (pline.t); |
|
|
348 | |
|
|
349 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
349 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
350 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
350 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
351 | |
351 | |
352 | lofs += len; |
352 | lofs += len; |
353 | qcol += len; |
353 | qcol += len; |
354 | } |
354 | } |
355 | } |
355 | } |
356 | |
356 | |
357 | qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; |
357 | qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; |
358 | #ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY |
358 | qline->is_longer (0); |
359 | if (qline->l < 0) |
|
|
360 | { |
|
|
361 | fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D |
|
|
362 | qline->l = 0; |
|
|
363 | } |
|
|
364 | #endif |
|
|
365 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
359 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
366 | } |
360 | } |
367 | while (p != pend && q > 0); |
361 | while (p != pend && q > 0); |
368 | |
362 | |
369 | term_start = total_rows - nrow; |
363 | term_start = total_rows - nrow; |
370 | nsaved = term_start - q; |
364 | top_row = q - term_start; |
371 | |
365 | |
372 | // make sure all terminal lines exist |
366 | // make sure all terminal lines exist |
373 | while (nsaved < 0) |
367 | while (top_row > 0) |
374 | scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); |
368 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
375 | |
|
|
376 | } |
369 | } |
377 | else |
370 | else |
378 | { |
371 | { |
379 | // if no scrollback exists (yet), wing, instead of wrap |
372 | // if no scrollback exists (yet), wing, instead of wrap |
380 | |
373 | |
381 | for (int row = min (nrow, prev_nrow); row--; ) |
374 | for (int row = min (nrow, prev_nrow); row--; ) |
382 | { |
375 | { |
383 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
376 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
384 | line_t &qline = row_buf [row]; |
377 | line_t &qline = row_buf [row]; |
385 | |
378 | |
… | |
… | |
393 | } |
386 | } |
394 | |
387 | |
395 | term_start = 0; |
388 | term_start = 0; |
396 | } |
389 | } |
397 | |
390 | |
398 | #ifdef DEBUG_STRICT //TODO: remove |
|
|
399 | for (int i = -nsaved; i < nrow; i++) |
|
|
400 | assert (ROW (i).t); |
|
|
401 | #endif |
|
|
402 | |
|
|
403 | free (old_buf); |
391 | free (old_buf); |
404 | delete old_ta; |
392 | delete old_ta; |
405 | delete old_ra; |
393 | delete old_ra; |
406 | |
394 | |
407 | clamp_it (screen.cur.row, 0, nrow - 1); |
395 | clamp_it (screen.cur.row, 0, nrow - 1); |
408 | clamp_it (screen.cur.col, 0, ncol - 1); |
396 | clamp_it (screen.cur.col, 0, ncol - 1); |
|
|
397 | } |
409 | |
398 | |
410 | if (tabs) |
|
|
411 | free (tabs); |
399 | free (tabs); |
412 | } |
400 | tabs = (char *)rxvt_malloc (ncol); |
|
|
401 | |
|
|
402 | for (int col = ncol; --col; ) |
|
|
403 | tabs [col] = col % TABSIZE == 0; |
|
|
404 | |
|
|
405 | CLEAR_ALL_SELECTION (); |
413 | |
406 | |
414 | prev_nrow = nrow; |
407 | prev_nrow = nrow; |
415 | prev_ncol = ncol; |
408 | prev_ncol = ncol; |
416 | |
409 | |
417 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
|
|
418 | |
|
|
419 | for (int col = ncol; col--; ) |
|
|
420 | tabs [col] = col % TABSIZE == 0; |
|
|
421 | |
|
|
422 | tt_winch (); |
410 | tt_winch (); |
423 | |
411 | |
424 | PERL_INVOKE ((this, HOOK_RESET, DT_END)); |
412 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
425 | } |
413 | } |
426 | |
414 | |
427 | /* ------------------------------------------------------------------------- */ |
415 | /* ------------------------------------------------------------------------- */ |
428 | /* |
416 | /* |
429 | * Free everything. That way malloc debugging can find leakage. |
417 | * Free everything. That way malloc debugging can find leakage. |
430 | */ |
418 | */ |
431 | void |
419 | void |
432 | rxvt_term::scr_release () |
420 | rxvt_term::scr_release () NOTHROW |
433 | { |
421 | { |
|
|
422 | if (row_buf) |
|
|
423 | { |
434 | delete talloc; talloc = 0; |
424 | delete talloc; talloc = 0; |
435 | delete ralloc; ralloc = 0; |
425 | delete ralloc; ralloc = 0; |
436 | |
426 | |
437 | free (row_buf); |
427 | free (row_buf); |
438 | free (swap_buf); |
428 | free (swap_buf); |
439 | free (drawn_buf); |
429 | free (drawn_buf); |
440 | free (temp_buf); |
|
|
441 | free (tabs); |
|
|
442 | |
|
|
443 | row_buf = 0; // signal that we freed all the arrays |
430 | row_buf = 0; // signal that we freed all the arrays above |
444 | } |
|
|
445 | |
431 | |
|
|
432 | free (tabs); |
|
|
433 | tabs = 0; |
|
|
434 | } |
|
|
435 | } |
|
|
436 | |
446 | /* ------------------------------------------------------------------------- */ |
437 | /* ------------------------------------------------------------------------- */ |
447 | /* |
438 | /* |
448 | * Hard reset |
439 | * Hard/Soft reset |
449 | */ |
440 | */ |
450 | void |
441 | void |
451 | rxvt_term::scr_poweron () |
442 | rxvt_term::scr_poweron () |
452 | { |
443 | { |
453 | scr_release (); |
444 | scr_release (); |
454 | prev_nrow = prev_ncol = 0; |
445 | prev_nrow = prev_ncol = 0; |
|
|
446 | rvideo_mode = false; |
|
|
447 | scr_soft_reset (); |
455 | scr_reset (); |
448 | scr_reset (); |
456 | |
449 | |
457 | scr_clear (true); |
450 | scr_clear (true); |
458 | scr_refresh (SLOW_REFRESH); |
451 | scr_refresh (); |
|
|
452 | } |
|
|
453 | |
|
|
454 | void |
|
|
455 | rxvt_term::scr_soft_reset () |
|
|
456 | { |
|
|
457 | /* only affects modes, nothing drastic such as clearing the screen */ |
|
|
458 | #if ENABLE_OVERLAY |
|
|
459 | scr_overlay_off (); |
|
|
460 | #endif |
|
|
461 | |
|
|
462 | if (current_screen != PRIMARY) |
|
|
463 | scr_swap_screen (); |
|
|
464 | |
|
|
465 | scr_scroll_region (0, MAX_ROWS - 1); |
|
|
466 | scr_rendition (0, ~RS_None); |
|
|
467 | scr_insert_mode (0); |
459 | } |
468 | } |
460 | |
469 | |
461 | /* ------------------------------------------------------------------------- * |
470 | /* ------------------------------------------------------------------------- * |
462 | * PROCESS SCREEN COMMANDS * |
471 | * PROCESS SCREEN COMMANDS * |
463 | * ------------------------------------------------------------------------- */ |
472 | * ------------------------------------------------------------------------- */ |
… | |
… | |
465 | * Save and Restore cursor |
474 | * Save and Restore cursor |
466 | * XTERM_SEQ: Save cursor : ESC 7 |
475 | * XTERM_SEQ: Save cursor : ESC 7 |
467 | * XTERM_SEQ: Restore cursor: ESC 8 |
476 | * XTERM_SEQ: Restore cursor: ESC 8 |
468 | */ |
477 | */ |
469 | void |
478 | void |
470 | rxvt_term::scr_cursor (int mode) |
479 | rxvt_term::scr_cursor (cursor_mode mode) NOTHROW |
471 | { |
480 | { |
472 | screen_t *s; |
481 | screen_t *s; |
473 | |
482 | |
474 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
483 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
475 | if (current_screen == SECONDARY) |
484 | if (current_screen == SECONDARY) |
… | |
… | |
501 | } |
510 | } |
502 | |
511 | |
503 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
512 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
504 | min_it (s->cur.row, nrow - 1); |
513 | min_it (s->cur.row, nrow - 1); |
505 | min_it (s->cur.col, ncol - 1); |
514 | min_it (s->cur.col, ncol - 1); |
506 | #ifdef DEBUG_STRICT |
|
|
507 | assert (s->cur.row >= 0); |
515 | assert (s->cur.row >= 0); |
508 | assert (s->cur.col >= 0); |
516 | assert (s->cur.col >= 0); |
509 | #endif |
517 | } |
|
|
518 | |
|
|
519 | void |
|
|
520 | rxvt_term::scr_swap_screen () |
|
|
521 | { |
|
|
522 | if (!option (Opt_secondaryScreen)) |
|
|
523 | return; |
|
|
524 | |
|
|
525 | for (int i = prev_nrow; i--; ) |
|
|
526 | ::swap (ROW(i), swap_buf [i]); |
|
|
527 | |
|
|
528 | ::swap (screen.cur, swap.cur); |
|
|
529 | |
|
|
530 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
531 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
510 | } |
532 | } |
511 | |
533 | |
512 | /* ------------------------------------------------------------------------- */ |
534 | /* ------------------------------------------------------------------------- */ |
513 | /* |
535 | /* |
514 | * Swap between primary and secondary screens |
536 | * Swap between primary and secondary screens |
515 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
537 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
516 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
538 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
517 | */ |
539 | */ |
518 | int |
540 | void |
519 | rxvt_term::scr_change_screen (int scrn) |
541 | rxvt_term::scr_change_screen (int scrn) |
520 | { |
542 | { |
|
|
543 | if (scrn == current_screen) |
|
|
544 | return; |
|
|
545 | |
521 | want_refresh = 1; |
546 | want_refresh = 1; |
522 | view_start = 0; |
547 | view_start = 0; |
523 | |
548 | |
524 | if (current_screen == scrn) |
|
|
525 | return scrn; |
|
|
526 | |
|
|
527 | selection_check (2); /* check for boundary cross */ |
549 | selection_check (2); /* check for boundary cross */ |
528 | |
550 | |
529 | int i = current_screen; current_screen = scrn; scrn = i; |
551 | current_screen = scrn; |
530 | |
|
|
531 | ::swap (screen.cur.row, swap.cur.row); |
|
|
532 | ::swap (screen.cur.col, swap.cur.col); |
|
|
533 | |
|
|
534 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
535 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
536 | |
552 | |
537 | #if NSCREENS |
553 | #if NSCREENS |
538 | if (OPTION (Opt_secondaryScreen)) |
554 | if (option (Opt_secondaryScreen)) |
539 | { |
555 | { |
540 | num_scr = 0; |
556 | num_scr = 0; |
541 | |
557 | |
542 | for (int i = prev_nrow; i--; ) |
558 | scr_swap_screen (); |
543 | ::swap (ROW(i), swap_buf [i]); |
|
|
544 | |
559 | |
545 | ::swap (screen.charset, swap.charset); |
560 | ::swap (screen.charset, swap.charset); |
546 | ::swap (screen.flags, swap.flags); |
561 | ::swap (screen.flags, swap.flags); |
547 | screen.flags |= Screen_VisibleCursor; |
562 | screen.flags |= Screen_VisibleCursor; |
548 | swap.flags |= Screen_VisibleCursor; |
563 | swap.flags |= Screen_VisibleCursor; |
549 | } |
564 | } |
550 | else |
565 | else |
551 | #endif |
566 | #endif |
552 | if (OPTION (Opt_secondaryScroll)) |
567 | if (option (Opt_secondaryScroll)) |
553 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
568 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
554 | |
|
|
555 | return scrn; |
|
|
556 | } |
569 | } |
557 | |
570 | |
558 | // clear WrapNext indicator, solidifying position on next line |
571 | // clear WrapNext indicator, solidifying position on next line |
559 | void |
572 | void |
560 | rxvt_term::scr_do_wrap () |
573 | rxvt_term::scr_do_wrap () NOTHROW |
561 | { |
574 | { |
562 | if (!(screen.flags & Screen_WrapNext)) |
575 | if (!(screen.flags & Screen_WrapNext)) |
563 | return; |
576 | return; |
564 | |
577 | |
565 | screen.flags &= ~Screen_WrapNext; |
578 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
575 | /* ------------------------------------------------------------------------- */ |
588 | /* ------------------------------------------------------------------------- */ |
576 | /* |
589 | /* |
577 | * Change the colour for following text |
590 | * Change the colour for following text |
578 | */ |
591 | */ |
579 | void |
592 | void |
580 | rxvt_term::scr_color (unsigned int color, int fgbg) |
593 | rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW |
581 | { |
594 | { |
582 | if (color > maxTermCOLOR) |
595 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
583 | color = fgbg; |
596 | color = fgbg; |
584 | |
597 | |
585 | if (fgbg == Color_fg) |
598 | if (fgbg == Color_fg) |
586 | rstyle = SET_FGCOLOR (rstyle, color); |
599 | rstyle = SET_FGCOLOR (rstyle, color); |
587 | else |
600 | else |
… | |
… | |
591 | /* ------------------------------------------------------------------------- */ |
604 | /* ------------------------------------------------------------------------- */ |
592 | /* |
605 | /* |
593 | * Change the rendition style for following text |
606 | * Change the rendition style for following text |
594 | */ |
607 | */ |
595 | void |
608 | void |
596 | rxvt_term::scr_rendition (int set, int style) |
609 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
597 | { |
610 | { |
598 | if (set) |
611 | if (set) |
599 | rstyle |= style; |
612 | rstyle |= style; |
600 | else if (style == ~RS_None) |
613 | else if (style == ~RS_None) |
601 | rstyle = DEFAULT_RSTYLE; |
614 | rstyle = DEFAULT_RSTYLE; |
602 | else |
615 | else |
603 | rstyle &= ~style; |
616 | rstyle &= ~style; |
604 | } |
617 | } |
605 | |
618 | |
606 | /* ------------------------------------------------------------------------- */ |
619 | /* ------------------------------------------------------------------------- */ |
607 | /* |
620 | /* |
608 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
621 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
609 | * count positive ==> scroll up |
622 | * count positive ==> scroll up |
610 | * count negative ==> scroll down |
623 | * count negative ==> scroll down |
611 | */ |
624 | */ |
612 | int |
625 | int |
613 | rxvt_term::scr_scroll_text (int row1, int row2, int count) |
626 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
614 | { |
627 | { |
615 | if (count == 0 || (row1 > row2)) |
628 | if (count == 0 || (row1 > row2)) |
616 | return 0; |
629 | return 0; |
617 | |
630 | |
618 | want_refresh = 1; |
631 | want_refresh = 1; |
619 | num_scr += count; |
632 | num_scr += count; |
620 | |
633 | |
621 | if (count > 0 |
634 | if (count > 0 |
622 | && row1 == 0 |
635 | && row1 == 0 |
623 | && row2 == nrow - 1 |
|
|
624 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
636 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
625 | { |
637 | { |
626 | nsaved = min (nsaved + count, saveLines); |
638 | top_row = max (top_row - count, -saveLines); |
627 | |
639 | |
628 | PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); |
640 | // scroll everything up 'count' lines |
629 | |
|
|
630 | term_start = (term_start + count) % total_rows; |
641 | term_start = (term_start + count) % total_rows; |
631 | |
642 | |
|
|
643 | // sever bottommost line |
|
|
644 | { |
|
|
645 | line_t &l = ROW(row2 - count); |
|
|
646 | l.is_longer (0); |
|
|
647 | l.touch (); |
|
|
648 | } |
|
|
649 | |
|
|
650 | // erase newly scrolled-in lines |
|
|
651 | for (int i = count; i--; ) |
|
|
652 | { |
|
|
653 | line_t &l = ROW(nrow - 1 - i); |
|
|
654 | |
|
|
655 | // optimize if already cleared, can be significant on slow machines |
|
|
656 | // could be rolled into scr_blank_screen_mem |
|
|
657 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
|
|
658 | { |
|
|
659 | scr_blank_line (l, 0, l.l, rstyle); |
|
|
660 | l.l = 0; |
|
|
661 | l.f = 0; |
|
|
662 | } |
|
|
663 | else |
|
|
664 | scr_blank_screen_mem (l, rstyle); |
|
|
665 | } |
|
|
666 | |
|
|
667 | // now copy lines below the scroll region bottom to the |
|
|
668 | // bottom of the screen again, so they look as if they |
|
|
669 | // hadn't moved. |
|
|
670 | for (int i = nrow; --i > row2; ) |
|
|
671 | { |
|
|
672 | line_t &l1 = ROW(i - count); |
|
|
673 | line_t &l2 = ROW(i); |
|
|
674 | |
|
|
675 | ::swap (l1, l2); |
|
|
676 | l2.touch (); |
|
|
677 | } |
|
|
678 | |
|
|
679 | // move and/or clear selection, if any |
632 | if (selection.op && current_screen == selection.screen) |
680 | if (selection.op && current_screen == selection.screen) |
633 | { |
681 | { |
634 | selection.beg.row -= count; |
682 | selection.beg.row -= count; |
635 | selection.end.row -= count; |
683 | selection.end.row -= count; |
636 | selection.mark.row -= count; |
684 | selection.mark.row -= count; |
637 | |
685 | |
638 | if (selection.beg.row < -nsaved |
686 | if (selection.beg.row < top_row |
639 | || selection.end.row < -nsaved |
687 | || selection.end.row < top_row |
640 | || selection.mark.row < -nsaved) |
688 | || selection.mark.row < top_row) |
641 | { |
689 | { |
642 | CLEAR_ALL_SELECTION (); |
690 | CLEAR_ALL_SELECTION (); |
643 | selection.op = SELECTION_CLEAR; |
691 | selection.op = SELECTION_CLEAR; |
644 | } |
692 | } |
645 | } |
693 | } |
646 | |
694 | |
647 | for (int i = count; i--; ) |
695 | // finally move the view window, if desired |
648 | { |
|
|
649 | ROW(row2 - i).l = 0; |
|
|
650 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
|
|
651 | } |
|
|
652 | |
|
|
653 | if (OPTION (Opt_scrollWithBuffer) |
696 | if (option (Opt_scrollWithBuffer) |
654 | && view_start != 0 |
697 | && view_start != 0 |
655 | && view_start != saveLines) |
698 | && view_start != -saveLines) |
656 | scr_page (UP, count); |
699 | scr_page (UP, count); |
|
|
700 | |
|
|
701 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
|
|
702 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
657 | } |
703 | } |
658 | else |
704 | else |
659 | { |
705 | { |
660 | if (selection.op && current_screen == selection.screen) |
706 | if (selection.op && current_screen == selection.screen) |
661 | { |
707 | { |
… | |
… | |
673 | { |
719 | { |
674 | /* move selected region too */ |
720 | /* move selected region too */ |
675 | selection.beg.row -= count; |
721 | selection.beg.row -= count; |
676 | selection.end.row -= count; |
722 | selection.end.row -= count; |
677 | selection.mark.row -= count; |
723 | selection.mark.row -= count; |
678 | |
724 | |
679 | selection_check (0); |
725 | selection_check (0); |
680 | } |
726 | } |
681 | } |
727 | } |
682 | |
728 | |
683 | // use a simple and robust scrolling algorithm, this |
729 | // use a simple and robust scrolling algorithm, this |
… | |
… | |
685 | |
731 | |
686 | int rows = row2 - row1 + 1; |
732 | int rows = row2 - row1 + 1; |
687 | |
733 | |
688 | min_it (count, rows); |
734 | min_it (count, rows); |
689 | |
735 | |
|
|
736 | line_t *temp_buf = row_buf + total_rows; |
|
|
737 | |
690 | for (int row = 0; row < rows; row++) |
738 | for (int row = 0; row < rows; row++) |
691 | { |
739 | { |
692 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
740 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
693 | |
741 | |
694 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
742 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
… | |
… | |
705 | /* ------------------------------------------------------------------------- */ |
753 | /* ------------------------------------------------------------------------- */ |
706 | /* |
754 | /* |
707 | * Add text given in <str> of length <len> to screen struct |
755 | * Add text given in <str> of length <len> to screen struct |
708 | */ |
756 | */ |
709 | void |
757 | void |
710 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
758 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
711 | { |
759 | { |
712 | if (len <= 0) /* sanity */ |
760 | if (len <= 0) /* sanity */ |
713 | return; |
761 | return; |
714 | |
762 | |
715 | unsigned char checksel; |
763 | unsigned char checksel; |
716 | unicode_t c; |
764 | unicode_t c; |
717 | int last_col; |
765 | int ncol = this->ncol; |
718 | const unicode_t *strend = str + len; |
766 | const wchar_t *strend = str + len; |
719 | |
767 | |
720 | want_refresh = 1; |
768 | want_refresh = 1; |
721 | ZERO_SCROLLBACK (); |
769 | ZERO_SCROLLBACK (); |
722 | last_col = ncol; |
|
|
723 | |
770 | |
724 | if (nlines > 0) |
771 | if (minlines > 0) |
725 | { |
772 | { |
726 | nlines += screen.cur.row - screen.bscroll; |
773 | minlines += screen.cur.row - screen.bscroll; |
|
|
774 | min_it (minlines, screen.cur.row - top_row); |
|
|
775 | |
727 | if (nlines > 0 |
776 | if (minlines > 0 |
728 | && screen.tscroll == 0 |
777 | && screen.tscroll == 0 |
729 | && screen.bscroll == (nrow - 1)) |
778 | && screen.bscroll == nrow - 1) |
730 | { |
779 | { |
731 | /* _at least_ this many lines need to be scrolled */ |
780 | /* _at least_ this many lines need to be scrolled */ |
732 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines); |
781 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
733 | screen.cur.row -= nlines; |
782 | screen.cur.row -= minlines; |
734 | } |
783 | } |
735 | } |
784 | } |
736 | |
785 | |
737 | #ifdef DEBUG_STRICT |
|
|
738 | assert (screen.cur.col < last_col); |
786 | assert (screen.cur.col < ncol); |
739 | assert (screen.cur.row < nrow |
787 | assert (screen.cur.row < nrow |
740 | && screen.cur.row >= -nsaved); |
788 | && screen.cur.row >= top_row); |
741 | #endif |
|
|
742 | int row = screen.cur.row; |
789 | int row = screen.cur.row; |
743 | |
790 | |
744 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
791 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
745 | |
792 | |
746 | line_t *line = &ROW(row); |
793 | line_t *line = &ROW(row); |
747 | |
794 | |
748 | while (str < strend) |
795 | while (str < strend) |
749 | { |
796 | { |
750 | c = *str++; |
797 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
751 | |
798 | |
752 | if (c < 0x20) |
799 | if (expect_false (c < 0x20)) |
753 | if (c == C0_LF) |
800 | if (c == C0_LF) |
754 | { |
801 | { |
755 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
756 | max_it (line->l, screen.cur.col); |
802 | max_it (line->l, screen.cur.col); |
757 | |
803 | |
758 | screen.flags &= ~Screen_WrapNext; |
804 | screen.flags &= ~Screen_WrapNext; |
759 | |
805 | |
760 | if (screen.cur.row == screen.bscroll) |
806 | if (screen.cur.row == screen.bscroll) |
761 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
807 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
… | |
… | |
765 | line = &ROW(row); /* _must_ refresh */ |
811 | line = &ROW(row); /* _must_ refresh */ |
766 | continue; |
812 | continue; |
767 | } |
813 | } |
768 | else if (c == C0_CR) |
814 | else if (c == C0_CR) |
769 | { |
815 | { |
770 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
771 | max_it (line->l, screen.cur.col); |
816 | max_it (line->l, screen.cur.col); |
772 | |
817 | |
773 | screen.flags &= ~Screen_WrapNext; |
818 | screen.flags &= ~Screen_WrapNext; |
774 | screen.cur.col = 0; |
819 | screen.cur.col = 0; |
775 | continue; |
820 | continue; |
776 | } |
821 | } |
… | |
… | |
778 | { |
823 | { |
779 | scr_tab (1, true); |
824 | scr_tab (1, true); |
780 | continue; |
825 | continue; |
781 | } |
826 | } |
782 | |
827 | |
|
|
828 | if (expect_false ( |
783 | if (checksel /* see if we're writing within selection */ |
829 | checksel /* see if we're writing within selection */ |
784 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
830 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
785 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
831 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
832 | )) |
786 | { |
833 | { |
787 | checksel = 0; |
834 | checksel = 0; |
788 | /* |
835 | /* |
789 | * If we wrote anywhere in the selected area, kill the selection |
836 | * If we wrote anywhere in the selected area, kill the selection |
790 | * XXX: should we kill the mark too? Possibly, but maybe that |
837 | * XXX: should we kill the mark too? Possibly, but maybe that |
791 | * should be a similar check. |
838 | * should be a similar check. |
792 | */ |
839 | */ |
793 | CLEAR_SELECTION (); |
840 | CLEAR_SELECTION (); |
794 | } |
841 | } |
795 | |
842 | |
796 | if (screen.flags & Screen_WrapNext) |
843 | if (expect_false (screen.flags & Screen_WrapNext)) |
797 | { |
844 | { |
798 | line->set_is_longer (); |
|
|
799 | |
|
|
800 | scr_do_wrap (); |
845 | scr_do_wrap (); |
801 | |
846 | |
|
|
847 | line->l = ncol; |
|
|
848 | line->is_longer (1); |
|
|
849 | |
802 | row = screen.cur.row; |
850 | row = screen.cur.row; |
803 | line = &ROW(row); /* _must_ refresh */ |
851 | line = &ROW(row); /* _must_ refresh */ |
804 | } |
852 | } |
805 | |
853 | |
806 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
854 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
807 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
855 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
808 | c = 0xfffd; |
856 | c = 0xfffd; |
809 | |
857 | |
810 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
858 | // rely on wcwidth to tell us the character width, do wcwidth before |
811 | // do wcwidth before further replacements, as wcwidth might return -1 |
859 | // further replacements, as wcwidth might return -1 for the line |
812 | // for the line drawing characters below as they might be invalid in the current |
860 | // drawing characters below as they might be invalid in the current |
813 | // locale. |
861 | // locale. |
814 | int width = c < 0x100 ? 1 : wcwidth (c); |
862 | int width = WCWIDTH (c); |
815 | |
863 | |
816 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
864 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
817 | { |
865 | { |
818 | // vt100 special graphics and line drawing |
866 | // vt100 special graphics and line drawing |
819 | // 5f-7e standard vt100 |
867 | // 5f-7e standard vt100 |
820 | // 40-5e rxvt extension for extra curses acs chars |
868 | // 40-5e rxvt extension for extra curses acs chars |
821 | static uint16_t vt100_0[62] = { // 41 .. 7e |
869 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
834 | c = vt100_0[c - 0x41]; |
882 | c = vt100_0[c - 0x41]; |
835 | width = 1; // vt100 line drawing characters are always single-width |
883 | width = 1; // vt100 line drawing characters are always single-width |
836 | } |
884 | } |
837 | } |
885 | } |
838 | |
886 | |
839 | if (screen.flags & Screen_Insert) |
887 | if (expect_false (screen.flags & Screen_Insert)) |
840 | scr_insdel_chars (width, INSERT); |
888 | scr_insdel_chars (width, INSERT); |
841 | |
889 | |
842 | if (width != 0) |
890 | if (width != 0) |
843 | { |
891 | { |
844 | #if !UNICODE_3 |
892 | #if !UNICODE_3 |
… | |
… | |
850 | c = 0xfffd; |
898 | c = 0xfffd; |
851 | # endif |
899 | # endif |
852 | #endif |
900 | #endif |
853 | |
901 | |
854 | // nuke the character at this position, if required |
902 | // nuke the character at this position, if required |
|
|
903 | if (expect_false ( |
855 | if (line->t[screen.cur.col] == NOCHAR |
904 | line->t[screen.cur.col] == NOCHAR |
856 | || (screen.cur.col < ncol - 1 |
905 | || (screen.cur.col < ncol - 1 |
857 | && line->t[screen.cur.col + 1] == NOCHAR)) |
906 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
907 | )) |
|
|
908 | scr_kill_char (*line, screen.cur.col); |
|
|
909 | |
|
|
910 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
911 | |
|
|
912 | // if the character doesn't fit into the remaining columns... |
|
|
913 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
858 | { |
914 | { |
859 | int col = screen.cur.col; |
915 | // ... artificially enlargen the previous one |
860 | |
|
|
861 | // find begin |
|
|
862 | while (col > 0 && line->t[col] == NOCHAR) |
|
|
863 | col--; |
|
|
864 | |
|
|
865 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
|
|
866 | |
|
|
867 | // found begin, nuke |
|
|
868 | do { |
|
|
869 | line->t[col] = ' '; |
|
|
870 | line->r[col] = rend; |
|
|
871 | col++; |
|
|
872 | } while (col < ncol && line->t[col] == NOCHAR); |
|
|
873 | } |
|
|
874 | |
|
|
875 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
876 | |
|
|
877 | // if the character doesn't fit into the remaining columns... |
|
|
878 | if (screen.cur.col > last_col - width && last_col >= width) |
|
|
879 | { |
|
|
880 | // ...output spaces |
|
|
881 | c = ' '; |
916 | c = NOCHAR; |
882 | // and try the same character next loop iteration |
917 | // and try the same character next loop iteration |
883 | --str; |
918 | --str; |
884 | } |
919 | } |
|
|
920 | |
|
|
921 | line->touch (); |
885 | |
922 | |
886 | do |
923 | do |
887 | { |
924 | { |
888 | line->t[screen.cur.col] = c; |
925 | line->t[screen.cur.col] = c; |
889 | line->r[screen.cur.col] = rend; |
926 | line->r[screen.cur.col] = rend; |
890 | |
927 | |
891 | if (screen.cur.col < last_col - 1) |
928 | if (expect_true (screen.cur.col < ncol - 1)) |
892 | screen.cur.col++; |
929 | screen.cur.col++; |
893 | else |
930 | else |
894 | { |
931 | { |
895 | line->l = last_col; |
932 | line->l = ncol; |
896 | if (screen.flags & Screen_Autowrap) |
933 | if (screen.flags & Screen_Autowrap) |
897 | screen.flags |= Screen_WrapNext; |
934 | screen.flags |= Screen_WrapNext; |
898 | break; |
935 | break; |
899 | } |
936 | } |
900 | |
937 | |
901 | c = NOCHAR; |
938 | c = NOCHAR; |
902 | } |
939 | } |
903 | while (--width > 0); |
940 | while (expect_false (--width > 0)); |
904 | |
941 | |
905 | // pad with spaces when overwriting wide character with smaller one |
942 | // pad with spaces when overwriting wide character with smaller one |
906 | if (!width) |
943 | if (expect_false (!width)) |
|
|
944 | { |
|
|
945 | line->touch (); |
|
|
946 | |
907 | for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) |
947 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
908 | { |
948 | { |
909 | line->t[c] = ' '; |
949 | line->t[c] = ' '; |
910 | line->r[c] = rend; |
950 | line->r[c] = rend; |
911 | } |
951 | } |
912 | } |
952 | } |
|
|
953 | } |
|
|
954 | #if ENABLE_COMBINING |
913 | else // width == 0 |
955 | else // width == 0 |
914 | { |
956 | { |
915 | #if ENABLE_COMBINING |
957 | if (c != 0xfeff) // ignore BOM |
916 | // handle combining characters |
|
|
917 | // we just tag the accent on the previous on-screen character. |
|
|
918 | // this is arguably not correct, but also arguably not wrong. |
|
|
919 | // we don't handle double-width characters nicely yet. |
|
|
920 | text_t *tp; |
|
|
921 | rend_t *rp; |
|
|
922 | |
|
|
923 | if (screen.cur.col > 0) |
|
|
924 | { |
958 | { |
|
|
959 | // handle combining characters |
|
|
960 | // we just tag the accent on the previous on-screen character. |
|
|
961 | // this is arguably not correct, but also arguably not wrong. |
|
|
962 | // we don't handle double-width characters nicely yet. |
|
|
963 | line_t *linep; |
|
|
964 | text_t *tp; |
|
|
965 | rend_t *rp; |
|
|
966 | |
|
|
967 | if (screen.cur.col > 0) |
|
|
968 | { |
|
|
969 | linep = line; |
925 | tp = line->t + screen.cur.col - 1; |
970 | tp = line->t + screen.cur.col - 1; |
926 | rp = line->r + screen.cur.col - 1; |
971 | rp = line->r + screen.cur.col - 1; |
|
|
972 | } |
|
|
973 | else if (screen.cur.row > 0 |
|
|
974 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
975 | { |
|
|
976 | linep = &ROW(screen.cur.row - 1); |
|
|
977 | tp = line->t + ncol - 1; |
|
|
978 | rp = line->r + ncol - 1; |
|
|
979 | } |
|
|
980 | else |
|
|
981 | continue; |
927 | |
982 | |
|
|
983 | linep->touch (); |
|
|
984 | |
928 | while (*tp == NOCHAR && tp > line->t) |
985 | while (*tp == NOCHAR && tp > linep->t) |
929 | tp--, rp--; |
986 | tp--, rp--; |
|
|
987 | |
|
|
988 | // first try to find a precomposed character |
|
|
989 | unicode_t n = rxvt_compose (*tp, c); |
|
|
990 | if (n == NOCHAR) |
|
|
991 | n = rxvt_composite.compose (*tp, c); |
|
|
992 | |
|
|
993 | *tp = n; |
|
|
994 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
930 | } |
995 | } |
931 | else if (screen.cur.row > 0 |
|
|
932 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
933 | { |
|
|
934 | line_t *line = &ROW(screen.cur.row - 1); |
|
|
935 | |
|
|
936 | tp = line->t + last_col - 1; |
|
|
937 | rp = line->r + last_col - 1; |
|
|
938 | |
|
|
939 | while (*tp == NOCHAR && tp > line->t) |
|
|
940 | tp--, rp--; |
|
|
941 | } |
996 | } |
942 | else |
|
|
943 | continue; |
|
|
944 | |
|
|
945 | // first try to find a precomposed character |
|
|
946 | unicode_t n = rxvt_compose (*tp, c); |
|
|
947 | if (n == NOCHAR) |
|
|
948 | n = rxvt_composite.compose (*tp, c); |
|
|
949 | |
|
|
950 | *tp = n; |
|
|
951 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
|
|
952 | #endif |
997 | #endif |
953 | } |
|
|
954 | } |
998 | } |
955 | |
999 | |
956 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
957 | max_it (line->l, screen.cur.col); |
1000 | max_it (line->l, screen.cur.col); |
958 | |
1001 | |
959 | #ifdef DEBUG_STRICT |
|
|
960 | assert (screen.cur.row >= 0); |
1002 | assert (screen.cur.row >= 0); |
961 | #endif |
|
|
962 | } |
1003 | } |
963 | |
1004 | |
964 | /* ------------------------------------------------------------------------- */ |
1005 | /* ------------------------------------------------------------------------- */ |
965 | /* |
1006 | /* |
966 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1007 | * Process Backspace. Move back the cursor back a position, wrap if have to |
967 | * XTERM_SEQ: CTRL-H |
1008 | * XTERM_SEQ: CTRL-H |
968 | */ |
1009 | */ |
969 | void |
1010 | void |
970 | rxvt_term::scr_backspace () |
1011 | rxvt_term::scr_backspace () NOTHROW |
971 | { |
1012 | { |
972 | want_refresh = 1; |
|
|
973 | |
|
|
974 | if (screen.cur.col == 0) |
1013 | if (screen.cur.col == 0) |
975 | { |
1014 | { |
976 | if (screen.cur.row > 0) |
1015 | if (screen.cur.row > 0) |
977 | { |
1016 | { |
978 | #ifdef TERMCAP_HAS_BW |
1017 | #ifdef TERMCAP_HAS_BW |
979 | screen.cur.col = ncol - 1; |
1018 | screen.cur.col = ncol - 1; |
980 | screen.cur.row--; |
1019 | --screen.cur.row; |
981 | return; |
1020 | |
|
|
1021 | want_refresh = 1; |
982 | #endif |
1022 | #endif |
983 | } |
1023 | } |
984 | } |
1024 | } |
985 | else if (!(screen.flags & Screen_WrapNext)) |
1025 | else |
986 | scr_gotorc (0, -1, RELATIVE); |
1026 | scr_gotorc (0, -1, RELATIVE); |
987 | |
|
|
988 | screen.flags &= ~Screen_WrapNext; |
|
|
989 | } |
1027 | } |
990 | |
1028 | |
991 | /* ------------------------------------------------------------------------- */ |
1029 | /* ------------------------------------------------------------------------- */ |
992 | /* |
1030 | /* |
993 | * Process Horizontal Tab |
1031 | * Process Horizontal Tab |
994 | * count: +ve = forward; -ve = backwards |
1032 | * count: +ve = forward; -ve = backwards |
995 | * XTERM_SEQ: CTRL-I |
1033 | * XTERM_SEQ: CTRL-I |
996 | */ |
1034 | */ |
997 | void |
1035 | void |
998 | rxvt_term::scr_tab (int count, bool ht) |
1036 | rxvt_term::scr_tab (int count, bool ht) NOTHROW |
999 | { |
1037 | { |
1000 | int i, x; |
1038 | int i, x; |
1001 | |
1039 | |
1002 | want_refresh = 1; |
1040 | want_refresh = 1; |
1003 | i = x = screen.cur.col; |
1041 | i = x = screen.cur.col; |
… | |
… | |
1012 | |
1050 | |
1013 | for (; ++i < ncol; ) |
1051 | for (; ++i < ncol; ) |
1014 | if (tabs[i]) |
1052 | if (tabs[i]) |
1015 | { |
1053 | { |
1016 | x = i; |
1054 | x = i; |
|
|
1055 | |
1017 | if (!--count) |
1056 | if (!--count) |
1018 | break; |
1057 | break; |
1019 | } |
1058 | } |
1020 | else |
1059 | else |
1021 | ht &= l.t[i] == ' ' |
1060 | ht &= l.t[i] == ' ' |
1022 | && RS_SAME (l.r[i], base_rend); |
1061 | && RS_SAME (l.r[i], base_rend); |
1023 | |
1062 | |
1024 | if (count) |
1063 | if (count) |
1025 | x = ncol - 1; |
1064 | x = ncol - 1; |
1026 | |
1065 | |
1027 | // store horizontal tab commands as characters inside the text |
1066 | // store horizontal tab commands as characters inside the text |
1028 | // buffer so they can be selected and pasted. |
1067 | // buffer so they can be selected and pasted. |
1029 | if (ht && OPTION (Opt_pastableTabs)) |
1068 | if (ht && option (Opt_pastableTabs)) |
1030 | { |
1069 | { |
1031 | base_rend = SET_FONT (base_rend, 0); |
1070 | base_rend = SET_FONT (base_rend, 0); |
1032 | |
1071 | |
1033 | if (!l.is_longer ()) /* XXX: think about this */ |
1072 | l.touch (x); |
1034 | max_it (l.l, x); |
|
|
1035 | |
1073 | |
1036 | i = screen.cur.col; |
1074 | i = screen.cur.col; |
1037 | |
1075 | |
1038 | l.t[i] = '\t'; |
1076 | l.t[i] = '\t'; |
1039 | l.r[i] = base_rend; |
1077 | l.r[i] = base_rend; |
… | |
… | |
1068 | * Process DEC Back Index |
1106 | * Process DEC Back Index |
1069 | * XTERM_SEQ: ESC 6 |
1107 | * XTERM_SEQ: ESC 6 |
1070 | * Move cursor left in row. If we're at the left boundary, shift everything |
1108 | * Move cursor left in row. If we're at the left boundary, shift everything |
1071 | * in that row right. Clear left column. |
1109 | * in that row right. Clear left column. |
1072 | */ |
1110 | */ |
1073 | #if ENABLE_FRILLS |
1111 | #if !ENABLE_MINIMAL |
1074 | void |
1112 | void |
1075 | rxvt_term::scr_backindex () |
1113 | rxvt_term::scr_backindex () NOTHROW |
1076 | { |
1114 | { |
1077 | if (screen.cur.col > 0) |
1115 | if (screen.cur.col > 0) |
1078 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1116 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1079 | else |
1117 | else |
1080 | scr_insdel_chars (1, INSERT); |
1118 | scr_insdel_chars (1, INSERT); |
… | |
… | |
1085 | * Process DEC Forward Index |
1123 | * Process DEC Forward Index |
1086 | * XTERM_SEQ: ESC 9 |
1124 | * XTERM_SEQ: ESC 9 |
1087 | * Move cursor right in row. If we're at the right boundary, shift everything |
1125 | * Move cursor right in row. If we're at the right boundary, shift everything |
1088 | * in that row left. Clear right column. |
1126 | * in that row left. Clear right column. |
1089 | */ |
1127 | */ |
1090 | #if ENABLE_FRILLS |
1128 | #if !ENABLE_MINIMAL |
1091 | void |
1129 | void |
1092 | rxvt_term::scr_forwardindex () |
1130 | rxvt_term::scr_forwardindex () NOTHROW |
1093 | { |
1131 | { |
1094 | if (screen.cur.col < ncol - 1) |
1132 | if (screen.cur.col < ncol - 1) |
1095 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1133 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1096 | else |
1134 | else |
1097 | { |
1135 | { |
1098 | if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN |
1136 | line_t &l = ROW(screen.cur.row); |
1099 | ROW(screen.cur.row).l = ncol; |
1137 | |
|
|
1138 | l.touch (); |
|
|
1139 | l.is_longer (0); |
1100 | |
1140 | |
1101 | scr_gotorc (0, 0, R_RELATIVE); |
1141 | scr_gotorc (0, 0, R_RELATIVE); |
1102 | scr_insdel_chars (1, DELETE); |
1142 | scr_insdel_chars (1, DELETE); |
1103 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1143 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1104 | } |
1144 | } |
… | |
… | |
1108 | /* ------------------------------------------------------------------------- */ |
1148 | /* ------------------------------------------------------------------------- */ |
1109 | /* |
1149 | /* |
1110 | * Goto Row/Column |
1150 | * Goto Row/Column |
1111 | */ |
1151 | */ |
1112 | void |
1152 | void |
1113 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1153 | rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW |
1114 | { |
1154 | { |
1115 | want_refresh = 1; |
1155 | want_refresh = 1; |
1116 | ZERO_SCROLLBACK (); |
1156 | ZERO_SCROLLBACK (); |
1117 | |
1157 | |
1118 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1158 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
… | |
… | |
1140 | } |
1180 | } |
1141 | } |
1181 | } |
1142 | else |
1182 | else |
1143 | { |
1183 | { |
1144 | if (screen.flags & Screen_Relative) |
1184 | if (screen.flags & Screen_Relative) |
|
|
1185 | { |
1145 | { /* relative origin mode */ |
1186 | /* relative origin mode */ |
1146 | screen.cur.row = row + screen.tscroll; |
1187 | screen.cur.row = row + screen.tscroll; |
1147 | min_it (screen.cur.row, screen.bscroll); |
1188 | min_it (screen.cur.row, screen.bscroll); |
1148 | } |
1189 | } |
1149 | else |
1190 | else |
1150 | screen.cur.row = row; |
1191 | screen.cur.row = row; |
… | |
… | |
1156 | /* ------------------------------------------------------------------------- */ |
1197 | /* ------------------------------------------------------------------------- */ |
1157 | /* |
1198 | /* |
1158 | * direction should be UP or DN |
1199 | * direction should be UP or DN |
1159 | */ |
1200 | */ |
1160 | void |
1201 | void |
1161 | rxvt_term::scr_index (enum page_dirn direction) |
1202 | rxvt_term::scr_index (enum page_dirn direction) NOTHROW |
1162 | { |
1203 | { |
1163 | int dirn; |
1204 | int dirn; |
1164 | |
1205 | |
1165 | want_refresh = 1; |
1206 | want_refresh = 1; |
1166 | ZERO_SCROLLBACK (); |
1207 | ZERO_SCROLLBACK (); |
… | |
… | |
1183 | /* |
1224 | /* |
1184 | * Erase part or whole of a line |
1225 | * Erase part or whole of a line |
1185 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1226 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1186 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1227 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1187 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1228 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
|
|
1229 | * extension: clear to right unless wrapped: ESC [ 3 K |
1188 | */ |
1230 | */ |
1189 | void |
1231 | void |
1190 | rxvt_term::scr_erase_line (int mode) |
1232 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1191 | { |
1233 | { |
1192 | unsigned int col, num; |
1234 | unsigned int col, num; |
1193 | |
1235 | |
1194 | want_refresh = 1; |
1236 | want_refresh = 1; |
1195 | ZERO_SCROLLBACK (); |
1237 | ZERO_SCROLLBACK (); |
1196 | |
1238 | |
1197 | selection_check (1); |
1239 | selection_check (1); |
1198 | |
1240 | |
1199 | line_t &line = ROW(screen.cur.row); |
1241 | line_t &line = ROW(screen.cur.row); |
1200 | |
1242 | |
|
|
1243 | line.touch (); |
|
|
1244 | line.is_longer (0); |
|
|
1245 | |
1201 | switch (mode) |
1246 | switch (mode) |
1202 | { |
1247 | { |
|
|
1248 | case 3: |
|
|
1249 | if (screen.flags & Screen_WrapNext) |
|
|
1250 | return; |
|
|
1251 | |
|
|
1252 | /* fall through */ |
|
|
1253 | |
1203 | case 0: /* erase to end of line */ |
1254 | case 0: /* erase to end of line */ |
1204 | col = screen.cur.col; |
1255 | col = screen.cur.col; |
1205 | num = ncol - col; |
1256 | num = ncol - col; |
1206 | min_it (line.l, col); |
1257 | min_it (line.l, col); |
|
|
1258 | |
1207 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1259 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1208 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1260 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1209 | CLEAR_SELECTION (); |
1261 | CLEAR_SELECTION (); |
1210 | break; |
1262 | break; |
|
|
1263 | |
1211 | case 1: /* erase to beginning of line */ |
1264 | case 1: /* erase to beginning of line */ |
1212 | col = 0; |
1265 | col = 0; |
1213 | num = screen.cur.col + 1; |
1266 | num = screen.cur.col + 1; |
|
|
1267 | |
1214 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1268 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1215 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1269 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1216 | CLEAR_SELECTION (); |
1270 | CLEAR_SELECTION (); |
1217 | break; |
1271 | break; |
|
|
1272 | |
1218 | case 2: /* erase whole line */ |
1273 | case 2: /* erase whole line */ |
1219 | col = 0; |
1274 | col = 0; |
1220 | num = ncol; |
1275 | num = ncol; |
1221 | line.l = 0; |
1276 | line.l = 0; |
1222 | if (selection.beg.row <= screen.cur.row |
1277 | if (selection.beg.row <= screen.cur.row |
… | |
… | |
1236 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1291 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1237 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1292 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1238 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1293 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1239 | */ |
1294 | */ |
1240 | void |
1295 | void |
1241 | rxvt_term::scr_erase_screen (int mode) |
1296 | rxvt_term::scr_erase_screen (int mode) NOTHROW |
1242 | { |
1297 | { |
1243 | int num; |
1298 | int num; |
1244 | int32_t row; |
1299 | int32_t row; |
1245 | rend_t ren; |
1300 | rend_t ren; |
1246 | XGCValues gcvalue; |
1301 | XGCValues gcvalue; |
… | |
… | |
1280 | if (row >= nrow) /* Out Of Bounds */ |
1335 | if (row >= nrow) /* Out Of Bounds */ |
1281 | return; |
1336 | return; |
1282 | |
1337 | |
1283 | min_it (num, nrow - row); |
1338 | min_it (num, nrow - row); |
1284 | |
1339 | |
|
|
1340 | // TODO: the code below does not work when view_start != 0 |
|
|
1341 | // the workaround is to disable the clear and use a normal refresh |
|
|
1342 | // when view_start != 0. mysterious. |
1285 | if (rstyle & (RS_RVid | RS_Uline)) |
1343 | if (rstyle & (RS_RVid | RS_Uline)) |
1286 | ren = (rend_t) ~RS_None; |
1344 | ren = (rend_t) ~RS_None; |
1287 | else if (GET_BASEBG (rstyle) == Color_bg) |
1345 | else if (GET_BASEBG (rstyle) == Color_bg) |
1288 | { |
1346 | { |
1289 | ren = DEFAULT_RSTYLE; |
1347 | ren = DEFAULT_RSTYLE; |
1290 | CLEAR_ROWS (row, num); |
1348 | |
|
|
1349 | if (mapped && !view_start) |
|
|
1350 | XClearArea (dpy, vt, 0, |
|
|
1351 | Row2Pixel (row - view_start), (unsigned int)width, |
|
|
1352 | (unsigned int)Height2Pixel (num), False); |
1291 | } |
1353 | } |
1292 | else |
1354 | else |
1293 | { |
1355 | { |
1294 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1356 | ren = rstyle & (RS_fgMask | RS_bgMask); |
|
|
1357 | |
|
|
1358 | if (mapped && !view_start) |
|
|
1359 | { |
1295 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1360 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1296 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1361 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1297 | ERASE_ROWS (row, num); |
1362 | XFillRectangle (dpy, vt, gc, |
|
|
1363 | 0, Row2Pixel (row - view_start), |
|
|
1364 | (unsigned int)width, |
|
|
1365 | (unsigned int)Height2Pixel (num)); |
1298 | gcvalue.foreground = pix_colors[Color_fg]; |
1366 | gcvalue.foreground = pix_colors[Color_fg]; |
1299 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1367 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1368 | } |
1300 | } |
1369 | } |
1301 | |
1370 | |
1302 | for (; num--; row++) |
1371 | for (; num--; row++) |
1303 | { |
1372 | { |
1304 | ROW (row).l = 0; |
|
|
1305 | scr_blank_screen_mem (ROW (row), rstyle); |
1373 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1374 | |
|
|
1375 | if (!view_start) |
1306 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1376 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1307 | } |
1377 | } |
1308 | } |
1378 | } |
1309 | |
1379 | |
1310 | #if ENABLE_FRILLS |
1380 | #if !ENABLE_MINIMAL |
1311 | void |
1381 | void |
1312 | rxvt_term::scr_erase_savelines () |
1382 | rxvt_term::scr_erase_savelines () NOTHROW |
1313 | { |
1383 | { |
1314 | want_refresh = 1; |
1384 | want_refresh = 1; |
1315 | ZERO_SCROLLBACK (); |
1385 | ZERO_SCROLLBACK (); |
1316 | |
1386 | |
1317 | nsaved = 0; |
1387 | top_row = 0; |
1318 | } |
1388 | } |
1319 | #endif |
1389 | #endif |
1320 | |
1390 | |
1321 | /* ------------------------------------------------------------------------- */ |
1391 | /* ------------------------------------------------------------------------- */ |
1322 | /* |
1392 | /* |
1323 | * Fill the screen with `E's |
1393 | * Fill the screen with `E's |
1324 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1394 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1325 | */ |
1395 | */ |
1326 | void |
1396 | void |
1327 | rxvt_term::scr_E () |
1397 | rxvt_term::scr_E () NOTHROW |
1328 | { |
1398 | { |
1329 | rend_t fs; |
1399 | rend_t fs; |
1330 | |
1400 | |
1331 | want_refresh = 1; |
1401 | want_refresh = 1; |
1332 | ZERO_SCROLLBACK (); |
1402 | ZERO_SCROLLBACK (); |
… | |
… | |
1343 | rend_t *r1 = line.r; |
1413 | rend_t *r1 = line.r; |
1344 | |
1414 | |
1345 | for (int j = ncol; j--; ) |
1415 | for (int j = ncol; j--; ) |
1346 | *r1++ = fs; |
1416 | *r1++ = fs; |
1347 | |
1417 | |
1348 | line.l = ncol; /* make the `E's selectable */ |
1418 | line.is_longer (0); |
|
|
1419 | line.touch (ncol); |
1349 | } |
1420 | } |
1350 | } |
1421 | } |
1351 | |
1422 | |
1352 | /* ------------------------------------------------------------------------- */ |
1423 | /* ------------------------------------------------------------------------- */ |
1353 | /* |
1424 | /* |
1354 | * Insert/Delete <count> lines |
1425 | * Insert/Delete <count> lines |
1355 | */ |
1426 | */ |
1356 | void |
1427 | void |
1357 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1428 | rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW |
1358 | { |
1429 | { |
1359 | int end; |
1430 | int end; |
1360 | |
1431 | |
1361 | ZERO_SCROLLBACK (); |
1432 | ZERO_SCROLLBACK (); |
1362 | |
1433 | |
… | |
… | |
1382 | /* ------------------------------------------------------------------------- */ |
1453 | /* ------------------------------------------------------------------------- */ |
1383 | /* |
1454 | /* |
1384 | * Insert/Delete <count> characters from the current position |
1455 | * Insert/Delete <count> characters from the current position |
1385 | */ |
1456 | */ |
1386 | void |
1457 | void |
1387 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1458 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1388 | { |
1459 | { |
1389 | int col, row; |
|
|
1390 | rend_t tr; |
|
|
1391 | |
|
|
1392 | want_refresh = 1; |
1460 | want_refresh = 1; |
1393 | ZERO_SCROLLBACK (); |
1461 | ZERO_SCROLLBACK (); |
1394 | |
1462 | |
1395 | if (count <= 0) |
1463 | if (count <= 0) |
1396 | return; |
1464 | return; |
… | |
… | |
1398 | scr_do_wrap (); |
1466 | scr_do_wrap (); |
1399 | |
1467 | |
1400 | selection_check (1); |
1468 | selection_check (1); |
1401 | min_it (count, ncol - screen.cur.col); |
1469 | min_it (count, ncol - screen.cur.col); |
1402 | |
1470 | |
1403 | row = screen.cur.row; |
1471 | int row = screen.cur.row; |
1404 | |
1472 | |
1405 | line_t *line = &ROW(row); |
1473 | line_t *line = &ROW(row); |
1406 | |
1474 | |
|
|
1475 | line->touch (); |
|
|
1476 | line->is_longer (0); |
|
|
1477 | |
|
|
1478 | // nuke wide spanning the start |
|
|
1479 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1480 | scr_kill_char (*line, screen.cur.col); |
|
|
1481 | |
1407 | switch (insdel) |
1482 | switch (insdel) |
1408 | { |
1483 | { |
1409 | case INSERT: |
1484 | case INSERT: |
1410 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1485 | line->l = min (line->l + count, ncol); |
|
|
1486 | |
|
|
1487 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1488 | scr_kill_char (*line, screen.cur.col); |
|
|
1489 | |
|
|
1490 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1411 | { |
1491 | { |
1412 | line->t[col] = line->t[col - count]; |
1492 | line->t[col] = line->t[col - count]; |
1413 | line->r[col] = line->r[col - count]; |
1493 | line->r[col] = line->r[col - count]; |
1414 | } |
|
|
1415 | |
|
|
1416 | if (!line->is_longer ()) |
|
|
1417 | { |
|
|
1418 | line->l += count; |
|
|
1419 | min_it (line->l, ncol); |
|
|
1420 | } |
1494 | } |
1421 | |
1495 | |
1422 | if (selection.op && current_screen == selection.screen |
1496 | if (selection.op && current_screen == selection.screen |
1423 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1497 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1424 | { |
1498 | { |
1425 | if (selection.end.row != screen.cur.row |
1499 | if (selection.end.row != screen.cur.row |
1426 | || (selection.end.col + count >= ncol)) |
1500 | || (selection.end.col + count >= ncol)) |
1427 | CLEAR_SELECTION (); |
1501 | CLEAR_SELECTION (); |
1428 | else |
1502 | else |
|
|
1503 | { |
1429 | { /* shift selection */ |
1504 | /* shift selection */ |
1430 | selection.beg.col += count; |
1505 | selection.beg.col += count; |
1431 | selection.mark.col += count; /* XXX: yes? */ |
1506 | selection.mark.col += count; /* XXX: yes? */ |
1432 | selection.end.col += count; |
1507 | selection.end.col += count; |
1433 | } |
1508 | } |
1434 | } |
1509 | } |
… | |
… | |
1438 | |
1513 | |
1439 | case ERASE: |
1514 | case ERASE: |
1440 | screen.cur.col += count; /* don't worry if > ncol */ |
1515 | screen.cur.col += count; /* don't worry if > ncol */ |
1441 | selection_check (1); |
1516 | selection_check (1); |
1442 | screen.cur.col -= count; |
1517 | screen.cur.col -= count; |
|
|
1518 | |
|
|
1519 | // nuke wide char after the end |
|
|
1520 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1521 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1522 | |
1443 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1523 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1444 | break; |
1524 | break; |
1445 | |
1525 | |
1446 | case DELETE: |
1526 | case DELETE: |
1447 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1527 | line->l = max (line->l - count, 0); |
1448 | |
1528 | |
|
|
1529 | // nuke wide char spanning the end |
|
|
1530 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1531 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1532 | |
1449 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1533 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1450 | { |
1534 | { |
1451 | line->t[col] = line->t[col + count]; |
1535 | line->t[col] = line->t[col + count]; |
1452 | line->r[col] = line->r[col + count]; |
1536 | line->r[col] = line->r[col + count]; |
1453 | } |
1537 | } |
1454 | |
1538 | |
1455 | scr_blank_line (*line, ncol - count, count, tr); |
1539 | scr_blank_line (*line, ncol - count, count, rstyle); |
1456 | |
|
|
1457 | if (line->is_longer ()) /* break line continuation */ |
|
|
1458 | line->l = ncol; |
|
|
1459 | |
|
|
1460 | line->l = max (line->l - count, 0); |
|
|
1461 | |
1540 | |
1462 | if (selection.op && current_screen == selection.screen |
1541 | if (selection.op && current_screen == selection.screen |
1463 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1542 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1464 | { |
1543 | { |
1465 | if (selection.end.row != screen.cur.row |
1544 | if (selection.end.row != screen.cur.row |
… | |
… | |
1483 | /* |
1562 | /* |
1484 | * Set the scrolling region |
1563 | * Set the scrolling region |
1485 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1564 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1486 | */ |
1565 | */ |
1487 | void |
1566 | void |
1488 | rxvt_term::scr_scroll_region (int top, int bot) |
1567 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1489 | { |
1568 | { |
1490 | max_it (top, 0); |
1569 | max_it (top, 0); |
1491 | min_it (bot, nrow - 1); |
1570 | min_it (bot, nrow - 1); |
1492 | |
1571 | |
1493 | if (top > bot) |
1572 | if (top > bot) |
… | |
… | |
1503 | * Make the cursor visible/invisible |
1582 | * Make the cursor visible/invisible |
1504 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1583 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1505 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1584 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1506 | */ |
1585 | */ |
1507 | void |
1586 | void |
1508 | rxvt_term::scr_cursor_visible (int mode) |
1587 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1509 | { |
1588 | { |
1510 | want_refresh = 1; |
1589 | want_refresh = 1; |
1511 | |
1590 | |
1512 | if (mode) |
1591 | if (mode) |
1513 | screen.flags |= Screen_VisibleCursor; |
1592 | screen.flags |= Screen_VisibleCursor; |
… | |
… | |
1520 | * Set/unset automatic wrapping |
1599 | * Set/unset automatic wrapping |
1521 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1600 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1522 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1601 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1523 | */ |
1602 | */ |
1524 | void |
1603 | void |
1525 | rxvt_term::scr_autowrap (int mode) |
1604 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1526 | { |
1605 | { |
1527 | if (mode) |
1606 | if (mode) |
1528 | screen.flags |= Screen_Autowrap; |
1607 | screen.flags |= Screen_Autowrap; |
1529 | else |
1608 | else |
1530 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
1609 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
… | |
… | |
1539 | * and the cursor cannot be moved outside. |
1618 | * and the cursor cannot be moved outside. |
1540 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1619 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1541 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1620 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1542 | */ |
1621 | */ |
1543 | void |
1622 | void |
1544 | rxvt_term::scr_relative_origin (int mode) |
1623 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1545 | { |
1624 | { |
1546 | if (mode) |
1625 | if (mode) |
1547 | screen.flags |= Screen_Relative; |
1626 | screen.flags |= Screen_Relative; |
1548 | else |
1627 | else |
1549 | screen.flags &= ~Screen_Relative; |
1628 | screen.flags &= ~Screen_Relative; |
… | |
… | |
1556 | * Set insert/replace mode |
1635 | * Set insert/replace mode |
1557 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1636 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1558 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1637 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1559 | */ |
1638 | */ |
1560 | void |
1639 | void |
1561 | rxvt_term::scr_insert_mode (int mode) |
1640 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1562 | { |
1641 | { |
1563 | if (mode) |
1642 | if (mode) |
1564 | screen.flags |= Screen_Insert; |
1643 | screen.flags |= Screen_Insert; |
1565 | else |
1644 | else |
1566 | screen.flags &= ~Screen_Insert; |
1645 | screen.flags &= ~Screen_Insert; |
… | |
… | |
1572 | * XTERM_SEQ: Set tab at current column : ESC H |
1651 | * XTERM_SEQ: Set tab at current column : ESC H |
1573 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1652 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1574 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1653 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1575 | */ |
1654 | */ |
1576 | void |
1655 | void |
1577 | rxvt_term::scr_set_tab (int mode) |
1656 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1578 | { |
1657 | { |
1579 | if (mode < 0) |
1658 | if (mode < 0) |
1580 | memset (tabs, 0, ncol * sizeof (char)); |
1659 | memset (tabs, 0, ncol); |
1581 | else if (screen.cur.col < ncol) |
1660 | else if (screen.cur.col < ncol) |
1582 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1661 | tabs [screen.cur.col] = !!mode; |
1583 | } |
1662 | } |
1584 | |
1663 | |
1585 | /* ------------------------------------------------------------------------- */ |
1664 | /* ------------------------------------------------------------------------- */ |
1586 | /* |
1665 | /* |
1587 | * Set reverse/normal video |
1666 | * Set reverse/normal video |
1588 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1667 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1589 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1668 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1590 | */ |
1669 | */ |
1591 | void |
1670 | void |
1592 | rxvt_term::scr_rvideo_mode (int mode) |
1671 | rxvt_term::scr_rvideo_mode (bool on) NOTHROW |
1593 | { |
1672 | { |
1594 | XGCValues gcvalue; |
1673 | rvideo_mode = on; |
1595 | |
1674 | |
|
|
1675 | #ifndef NO_BELL |
|
|
1676 | on ^= rvideo_bell; |
|
|
1677 | #endif |
|
|
1678 | |
1596 | if (rvideo != mode) |
1679 | if (rvideo_state != on) |
1597 | { |
1680 | { |
1598 | rvideo = mode; |
1681 | rvideo_state = on; |
|
|
1682 | |
1599 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1683 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1600 | #if XPM_BACKGROUND |
1684 | #ifdef HAVE_BG_PIXMAP |
1601 | if (bgPixmap.pixmap == None) |
1685 | if (bgPixmap.pixmap == None) |
1602 | #endif |
1686 | #endif |
1603 | #if TRANSPARENT |
1687 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1604 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
|
|
1605 | #endif |
|
|
1606 | XSetWindowBackground (display->display, vt, |
|
|
1607 | pix_colors[Color_bg]); |
|
|
1608 | |
1688 | |
|
|
1689 | XGCValues gcvalue; |
1609 | gcvalue.foreground = pix_colors[Color_fg]; |
1690 | gcvalue.foreground = pix_colors[Color_fg]; |
1610 | gcvalue.background = pix_colors[Color_bg]; |
1691 | gcvalue.background = pix_colors[Color_bg]; |
1611 | XChangeGC (display->display, gc, GCBackground | GCForeground, |
1692 | XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue); |
1612 | &gcvalue); |
1693 | |
1613 | scr_clear (); |
1694 | scr_clear (); |
1614 | scr_touch (true); |
1695 | scr_touch (true); |
1615 | } |
1696 | } |
1616 | } |
1697 | } |
1617 | |
1698 | |
… | |
… | |
1619 | /* |
1700 | /* |
1620 | * Report current cursor position |
1701 | * Report current cursor position |
1621 | * XTERM_SEQ: Report position: ESC [ 6 n |
1702 | * XTERM_SEQ: Report position: ESC [ 6 n |
1622 | */ |
1703 | */ |
1623 | void |
1704 | void |
1624 | rxvt_term::scr_report_position () |
1705 | rxvt_term::scr_report_position () NOTHROW |
1625 | { |
1706 | { |
1626 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1707 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1627 | } |
1708 | } |
1628 | |
1709 | |
1629 | /* ------------------------------------------------------------------------- * |
1710 | /* ------------------------------------------------------------------------- * |
… | |
… | |
1632 | |
1713 | |
1633 | /* |
1714 | /* |
1634 | * Set font style |
1715 | * Set font style |
1635 | */ |
1716 | */ |
1636 | void |
1717 | void |
1637 | rxvt_term::set_font_style () |
1718 | rxvt_term::set_font_style () NOTHROW |
1638 | { |
1719 | { |
|
|
1720 | #if 0 |
1639 | switch (charsets[screen.charset]) |
1721 | switch (charsets [screen.charset]) |
1640 | { |
1722 | { |
1641 | case '0': /* DEC Special Character & Line Drawing Set */ |
1723 | case '0': /* DEC Special Character & Line Drawing Set */ |
1642 | break; |
1724 | break; |
1643 | case 'A': /* United Kingdom (UK) */ |
1725 | case 'A': /* United Kingdom (UK) */ |
1644 | break; |
1726 | break; |
… | |
… | |
1651 | case 'C': /* Finnish character set */ |
1733 | case 'C': /* Finnish character set */ |
1652 | break; |
1734 | break; |
1653 | case 'K': /* German character set */ |
1735 | case 'K': /* German character set */ |
1654 | break; |
1736 | break; |
1655 | } |
1737 | } |
|
|
1738 | #endif |
1656 | } |
1739 | } |
1657 | |
1740 | |
1658 | /* ------------------------------------------------------------------------- */ |
1741 | /* ------------------------------------------------------------------------- */ |
1659 | /* |
1742 | /* |
1660 | * Choose a font |
1743 | * Choose a font |
… | |
… | |
1662 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1745 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1663 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1746 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1664 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1747 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1665 | */ |
1748 | */ |
1666 | void |
1749 | void |
1667 | rxvt_term::scr_charset_choose (int set) |
1750 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1668 | { |
1751 | { |
1669 | screen.charset = set; |
1752 | screen.charset = set; |
1670 | set_font_style (); |
1753 | set_font_style (); |
1671 | } |
1754 | } |
1672 | |
1755 | |
… | |
… | |
1678 | * XTERM_SEQ: Set G2 character set: ESC * <C> |
1761 | * XTERM_SEQ: Set G2 character set: ESC * <C> |
1679 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1762 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1680 | * See set_font_style for possible values for <C> |
1763 | * See set_font_style for possible values for <C> |
1681 | */ |
1764 | */ |
1682 | void |
1765 | void |
1683 | rxvt_term::scr_charset_set (int set, unsigned int ch) |
1766 | rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW |
1684 | { |
1767 | { |
1685 | charsets[set] = (unsigned char)ch; |
1768 | charsets[set] = (unsigned char)ch; |
1686 | set_font_style (); |
1769 | set_font_style (); |
1687 | } |
1770 | } |
1688 | |
1771 | |
… | |
… | |
1693 | |
1776 | |
1694 | /* |
1777 | /* |
1695 | * refresh matching text. |
1778 | * refresh matching text. |
1696 | */ |
1779 | */ |
1697 | bool |
1780 | bool |
1698 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1781 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1699 | { |
1782 | { |
1700 | bool found = false; |
1783 | bool found = false; |
1701 | |
1784 | |
1702 | for (int i = 0; i < nrow; i++) |
1785 | for (int i = 0; i < nrow; i++) |
1703 | { |
1786 | { |
1704 | int col = 0; |
|
|
1705 | rend_t *drp = drawn_buf[i].r; |
1787 | rend_t *drp = drawn_buf[i].r; |
1706 | |
1788 | |
1707 | for (; col < ncol; col++, drp++) |
1789 | for (int col = 0; col < ncol; col++, drp++) |
1708 | if ((*drp & mask) == value) |
1790 | if ((*drp & mask) == value) |
1709 | { |
1791 | { |
1710 | found = true; |
1792 | found = true; |
1711 | *drp = ~value; |
1793 | *drp = ~value; |
1712 | } |
1794 | } |
… | |
… | |
1723 | PART_END, |
1805 | PART_END, |
1724 | RC_COUNT |
1806 | RC_COUNT |
1725 | }; |
1807 | }; |
1726 | |
1808 | |
1727 | void |
1809 | void |
1728 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1810 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1729 | { |
1811 | { |
1730 | int i; |
1812 | int i; |
1731 | row_col_t rc[RC_COUNT]; |
1813 | row_col_t rc[RC_COUNT]; |
1732 | |
1814 | |
1733 | if (!drawn_buf) /* sanity check */ |
1815 | if (!drawn_buf) /* sanity check */ |
… | |
… | |
1756 | } |
1838 | } |
1757 | |
1839 | |
1758 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1840 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1759 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1841 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1760 | |
1842 | |
|
|
1843 | num_scr_allow = 0; |
|
|
1844 | |
1761 | if (refresh) |
1845 | if (refresh) |
1762 | scr_refresh (SLOW_REFRESH); |
1846 | scr_refresh (); |
1763 | } |
1847 | } |
1764 | |
1848 | |
1765 | /* ------------------------------------------------------------------------- */ |
1849 | /* ------------------------------------------------------------------------- */ |
1766 | /* |
1850 | /* |
1767 | * Refresh the entire screen |
1851 | * Refresh the entire screen |
1768 | */ |
1852 | */ |
1769 | void |
1853 | void |
1770 | rxvt_term::scr_touch (bool refresh) |
1854 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1771 | { |
1855 | { |
1772 | scr_expose (0, 0, width, height, refresh); |
1856 | scr_expose (0, 0, width, height, refresh); |
1773 | } |
1857 | } |
1774 | |
1858 | |
1775 | /* ------------------------------------------------------------------------- */ |
1859 | /* ------------------------------------------------------------------------- */ |
1776 | /* |
1860 | /* |
1777 | * Move the display so that the line represented by scrollbar value Y is at |
1861 | * Move the display so that the line represented by scrollbar value Y is at |
1778 | * the top of the screen |
1862 | * the top of the screen |
1779 | */ |
1863 | */ |
1780 | int |
1864 | void |
1781 | rxvt_term::scr_move_to (int y, int len) |
1865 | rxvt_term::scr_move_to (int y, int len) NOTHROW |
1782 | { |
1866 | { |
1783 | long p = 0; |
1867 | scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); |
1784 | unsigned int oldviewstart; |
|
|
1785 | |
|
|
1786 | oldviewstart = view_start; |
|
|
1787 | |
|
|
1788 | if (y < len) |
|
|
1789 | { |
|
|
1790 | p = (nrow + nsaved) * (len - y) / len; |
|
|
1791 | p -= (long) (nrow - 1); |
|
|
1792 | p = max (p, 0); |
|
|
1793 | } |
|
|
1794 | |
|
|
1795 | view_start = (unsigned int)min (p, nsaved); |
|
|
1796 | |
|
|
1797 | return scr_changeview (oldviewstart); |
|
|
1798 | } |
1868 | } |
1799 | |
1869 | |
1800 | /* ------------------------------------------------------------------------- */ |
1870 | /* ------------------------------------------------------------------------- */ |
1801 | /* |
1871 | /* |
1802 | * Page the screen up/down nlines |
1872 | * Page the screen up/down nlines |
1803 | * direction should be UP or DN |
1873 | * direction should be UP or DN |
1804 | */ |
1874 | */ |
1805 | int |
1875 | bool |
1806 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1876 | rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW |
1807 | { |
1877 | { |
1808 | int n; |
1878 | int new_view_start = |
1809 | unsigned int oldviewstart; |
|
|
1810 | |
|
|
1811 | oldviewstart = view_start; |
|
|
1812 | |
|
|
1813 | if (direction == UP) |
|
|
1814 | { |
|
|
1815 | n = view_start + nlines; |
|
|
1816 | view_start = min (n, nsaved); |
|
|
1817 | } |
|
|
1818 | else |
|
|
1819 | { |
|
|
1820 | n = view_start - nlines; |
1879 | direction == UP ? view_start - nlines |
1821 | view_start = max (n, 0); |
1880 | : view_start + nlines; |
1822 | } |
|
|
1823 | |
1881 | |
1824 | return scr_changeview (oldviewstart); |
1882 | return scr_changeview (new_view_start); |
1825 | } |
1883 | } |
1826 | |
1884 | |
1827 | int |
1885 | bool |
1828 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1886 | rxvt_term::scr_changeview (int new_view_start) NOTHROW |
1829 | { |
1887 | { |
|
|
1888 | clamp_it (new_view_start, top_row, 0); |
|
|
1889 | |
|
|
1890 | if (new_view_start == view_start) |
|
|
1891 | return false; |
|
|
1892 | |
|
|
1893 | num_scr += new_view_start - view_start; |
|
|
1894 | view_start = new_view_start; |
|
|
1895 | want_refresh = 1; |
|
|
1896 | |
1830 | PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1897 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1831 | |
1898 | |
1832 | if (view_start != oldviewstart) |
1899 | return true; |
1833 | { |
|
|
1834 | want_refresh = 1; |
|
|
1835 | num_scr -= (view_start - oldviewstart); |
|
|
1836 | } |
|
|
1837 | |
|
|
1838 | return (int) (view_start - oldviewstart); |
|
|
1839 | } |
1900 | } |
1840 | |
1901 | |
1841 | /* ------------------------------------------------------------------------- */ |
1902 | #ifndef NO_BELL |
1842 | void |
1903 | void |
|
|
1904 | rxvt_term::bell_cb (ev::timer &w, int revents) |
|
|
1905 | { |
|
|
1906 | rvideo_bell = false; |
|
|
1907 | scr_rvideo_mode (rvideo_mode); |
|
|
1908 | refresh_check (); |
|
|
1909 | } |
|
|
1910 | #endif |
|
|
1911 | |
|
|
1912 | /* ------------------------------------------------------------------------- */ |
|
|
1913 | void |
1843 | rxvt_term::scr_bell () |
1914 | rxvt_term::scr_bell () NOTHROW |
1844 | { |
1915 | { |
1845 | #ifndef NO_BELL |
1916 | #ifndef NO_BELL |
1846 | |
1917 | |
1847 | # ifndef NO_MAPALERT |
1918 | # ifndef NO_MAPALERT |
1848 | # ifdef MAPALERT_OPTION |
1919 | # ifdef MAPALERT_OPTION |
1849 | if (OPTION (Opt_mapAlert)) |
1920 | if (option (Opt_mapAlert)) |
1850 | # endif |
1921 | # endif |
1851 | XMapWindow (display->display, parent[0]); |
1922 | XMapWindow (dpy, parent[0]); |
1852 | # endif |
1923 | # endif |
1853 | |
1924 | |
|
|
1925 | # if ENABLE_FRILLS |
|
|
1926 | if (option (Opt_urgentOnBell)) |
|
|
1927 | set_urgency (1); |
|
|
1928 | # endif |
|
|
1929 | |
1854 | if (OPTION (Opt_visualBell)) |
1930 | if (option (Opt_visualBell)) |
1855 | { |
1931 | { |
1856 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1932 | rvideo_bell = true; |
|
|
1933 | scr_rvideo_mode (rvideo_mode); |
|
|
1934 | flush (); |
|
|
1935 | |
1857 | rxvt_usleep (VISUAL_BELL_DURATION); |
1936 | bell_ev.start (VISUAL_BELL_DURATION); |
1858 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
|
|
1859 | } |
1937 | } |
1860 | else |
1938 | else |
1861 | XBell (display->display, 0); |
1939 | XBell (dpy, 0); |
1862 | |
1940 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1863 | #endif |
1941 | #endif |
1864 | } |
1942 | } |
1865 | |
1943 | |
1866 | /* ------------------------------------------------------------------------- */ |
1944 | /* ------------------------------------------------------------------------- */ |
1867 | /* ARGSUSED */ |
1945 | /* ARGSUSED */ |
1868 | void |
1946 | void |
1869 | rxvt_term::scr_printscreen (int fullhist) |
1947 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1870 | { |
1948 | { |
1871 | #ifdef PRINTPIPE |
1949 | #ifdef PRINTPIPE |
1872 | int nrows, row_start; |
1950 | int nrows, row_start; |
1873 | FILE *fd; |
1951 | FILE *fd = popen_printer (); |
1874 | |
1952 | |
1875 | if ((fd = popen_printer ()) == NULL) |
1953 | if (!fd) |
1876 | return; |
1954 | return; |
1877 | |
1955 | |
1878 | if (fullhist) |
1956 | if (fullhist) |
1879 | { |
1957 | { |
1880 | nrows = nrow + nsaved; |
1958 | nrows = nrow - top_row; |
1881 | row_start = -nsaved; |
1959 | row_start = top_row; |
1882 | } |
1960 | } |
1883 | else |
1961 | else |
1884 | { |
1962 | { |
1885 | nrows = nrow; |
1963 | nrows = nrow; |
1886 | row_start = -view_start; |
1964 | row_start = view_start; |
1887 | } |
1965 | } |
1888 | |
1966 | |
1889 | wctomb (0, 0); |
1967 | wctomb (0, 0); |
1890 | |
1968 | |
1891 | for (int r1 = 0; r1 < nrows; r1++) |
1969 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1892 | { |
1970 | { |
1893 | text_t *tp = ROW(r1).t; |
1971 | text_t *tp = ROW(r1).t; |
1894 | int len = ROW(r1).l; |
1972 | int len = ROW(r1).l; |
1895 | |
1973 | |
1896 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1974 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
1923 | * Refresh the screen |
2001 | * Refresh the screen |
1924 | * drawn_text/drawn_rend contain the screen information before the update. |
2002 | * drawn_text/drawn_rend contain the screen information before the update. |
1925 | * screen.text/screen.rend contain what the screen will change to. |
2003 | * screen.text/screen.rend contain what the screen will change to. |
1926 | */ |
2004 | */ |
1927 | void |
2005 | void |
1928 | rxvt_term::scr_refresh (unsigned char refresh_type) |
2006 | rxvt_term::scr_refresh () NOTHROW |
1929 | { |
2007 | { |
1930 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
|
|
1931 | showcursor; /* show the cursor */ |
|
|
1932 | int16_t col, row, /* column/row we're processing */ |
2008 | int16_t col, row, /* column/row we're processing */ |
1933 | ocrow; /* old cursor row */ |
2009 | ocrow; /* old cursor row */ |
1934 | int i; /* tmp */ |
2010 | int i; /* tmp */ |
1935 | #ifndef NO_CURSORCOLOR |
2011 | #ifndef NO_CURSORCOLOR |
1936 | rend_t cc1; /* store colours at cursor position (s) */ |
2012 | rend_t cc1; /* store colours at cursor position (s) */ |
1937 | #endif |
2013 | #endif |
1938 | rend_t *crp; // cursor rendition pointer |
2014 | rend_t *crp; // cursor rendition pointer |
|
|
2015 | rend_t ccol1, /* Cursor colour */ |
|
|
2016 | ccol2; /* Cursor colour2 */ |
1939 | |
2017 | |
1940 | want_refresh = 0; /* screen is current */ |
2018 | want_refresh = 0; /* screen is current */ |
1941 | |
2019 | |
1942 | if (refresh_type == NO_REFRESH || !mapped) |
2020 | if (refresh_type == NO_REFRESH || !mapped) |
1943 | return; |
2021 | return; |
1944 | |
2022 | |
1945 | /* |
2023 | /* |
1946 | * A: set up vars |
2024 | * A: set up vars |
1947 | */ |
2025 | */ |
1948 | must_clear = 0; |
|
|
1949 | refresh_count = 0; |
2026 | refresh_count = 0; |
1950 | |
2027 | |
1951 | #if XPM_BACKGROUND |
2028 | unsigned int old_screen_flags = screen.flags; |
|
|
2029 | char have_bg = 0; |
|
|
2030 | #ifdef HAVE_BG_PIXMAP |
1952 | must_clear |= bgPixmap.pixmap != None; |
2031 | have_bg = bgPixmap.pixmap != None; |
1953 | #endif |
|
|
1954 | #if TRANSPARENT |
|
|
1955 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
|
|
1956 | #endif |
2032 | #endif |
1957 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2033 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1958 | |
2034 | |
1959 | /* |
2035 | /* |
1960 | * B: reverse any characters which are selected |
2036 | * B: reverse any characters which are selected |
1961 | */ |
2037 | */ |
1962 | scr_reverse_selection (); |
2038 | scr_reverse_selection (); |
|
|
2039 | |
|
|
2040 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2041 | #if ENABLE_OVERLAY |
|
|
2042 | scr_swap_overlay (); |
|
|
2043 | #endif |
|
|
2044 | |
|
|
2045 | char showcursor = screen.flags & Screen_VisibleCursor; |
1963 | |
2046 | |
1964 | /* |
2047 | /* |
1965 | * C: set the cursor character (s) |
2048 | * C: set the cursor character (s) |
1966 | */ |
2049 | */ |
1967 | { |
2050 | { |
1968 | unsigned char setoldcursor; |
2051 | unsigned char setoldcursor; |
1969 | rend_t ccol1, /* Cursor colour */ |
|
|
1970 | ccol2; /* Cursor colour2 */ |
|
|
1971 | |
2052 | |
1972 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
1973 | #ifdef CURSOR_BLINK |
2053 | #ifdef CURSOR_BLINK |
1974 | if (hidden_cursor) |
2054 | if (hidden_cursor) |
1975 | showcursor = 0; |
2055 | showcursor = 0; |
1976 | #endif |
2056 | #endif |
1977 | |
2057 | |
… | |
… | |
1982 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2062 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
1983 | col--; |
2063 | col--; |
1984 | |
2064 | |
1985 | crp = &ROW(screen.cur.row).r[col]; |
2065 | crp = &ROW(screen.cur.row).r[col]; |
1986 | |
2066 | |
|
|
2067 | #ifndef NO_CURSORCOLOR |
|
|
2068 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2069 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2070 | ccol1 = Color_cursor; |
|
|
2071 | else |
|
|
2072 | #endif |
|
|
2073 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2074 | ccol1 = fgcolor_of (rstyle); |
|
|
2075 | #else |
|
|
2076 | ccol1 = Color_fg; |
|
|
2077 | #endif |
|
|
2078 | |
|
|
2079 | #ifndef NO_CURSORCOLOR |
|
|
2080 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2081 | ccol2 = Color_cursor2; |
|
|
2082 | else |
|
|
2083 | #endif |
|
|
2084 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2085 | ccol2 = bgcolor_of (rstyle); |
|
|
2086 | #else |
|
|
2087 | ccol2 = Color_bg; |
|
|
2088 | #endif |
|
|
2089 | |
1987 | if (showcursor && focus) |
2090 | if (showcursor && focus) |
1988 | { |
2091 | { |
1989 | if (OPTION (Opt_cursorUnderline)) |
2092 | if (option (Opt_cursorUnderline)) |
1990 | *crp ^= RS_Uline; |
2093 | *crp ^= RS_Uline; |
1991 | else |
2094 | else |
1992 | { |
2095 | { |
1993 | *crp ^= RS_RVid; |
2096 | *crp ^= RS_RVid; |
1994 | |
|
|
1995 | #ifndef NO_CURSORCOLOR |
|
|
1996 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
1997 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
1998 | ccol1 = Color_cursor; |
|
|
1999 | else |
|
|
2000 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2001 | ccol1 = fgcolor_of (rstyle); |
|
|
2002 | #else |
|
|
2003 | ccol1 = Color_fg; |
|
|
2004 | #endif |
|
|
2005 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2006 | ccol2 = Color_cursor2; |
|
|
2007 | else |
|
|
2008 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2009 | ccol2 = bgcolor_of (rstyle); |
|
|
2010 | #else |
|
|
2011 | ccol2 = Color_bg; |
|
|
2012 | #endif |
|
|
2013 | *crp = SET_FGCOLOR (*crp, ccol1); |
2097 | *crp = SET_FGCOLOR (*crp, ccol1); |
2014 | *crp = SET_BGCOLOR (*crp, ccol2); |
2098 | *crp = SET_BGCOLOR (*crp, ccol2); |
2015 | #endif |
|
|
2016 | } |
2099 | } |
2017 | } |
2100 | } |
2018 | } |
2101 | } |
2019 | |
2102 | |
2020 | /* make sure no outline cursor is left around */ |
2103 | /* make sure no outline cursor is left around */ |
2021 | setoldcursor = 0; |
2104 | setoldcursor = 0; |
2022 | if (ocrow != -1) |
2105 | if (ocrow != -1) |
2023 | { |
2106 | { |
2024 | if (screen.cur.row + view_start != ocrow |
2107 | if (screen.cur.row - view_start != ocrow |
2025 | || screen.cur.col != oldcursor.col) |
2108 | || screen.cur.col != oldcursor.col) |
2026 | { |
2109 | { |
2027 | if (ocrow < nrow |
2110 | if (ocrow < nrow |
2028 | && oldcursor.col < ncol) |
2111 | && oldcursor.col < ncol) |
2029 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2112 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
… | |
… | |
2037 | else if (!focus) |
2120 | else if (!focus) |
2038 | setoldcursor = 1; |
2121 | setoldcursor = 1; |
2039 | |
2122 | |
2040 | if (setoldcursor) |
2123 | if (setoldcursor) |
2041 | { |
2124 | { |
2042 | if (screen.cur.row + view_start >= nrow) |
2125 | if (screen.cur.row - view_start >= nrow) |
2043 | oldcursor.row = -1; |
2126 | oldcursor.row = -1; |
2044 | else |
2127 | else |
2045 | { |
2128 | { |
2046 | oldcursor.row = screen.cur.row + view_start; |
2129 | oldcursor.row = screen.cur.row - view_start; |
2047 | oldcursor.col = screen.cur.col; |
2130 | oldcursor.col = screen.cur.col; |
2048 | } |
2131 | } |
2049 | } |
2132 | } |
2050 | } |
2133 | } |
2051 | |
|
|
2052 | PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2053 | #if ENABLE_OVERLAY |
|
|
2054 | scr_swap_overlay (); |
|
|
2055 | #endif |
|
|
2056 | |
2134 | |
2057 | #ifndef NO_SLOW_LINK_SUPPORT |
2135 | #ifndef NO_SLOW_LINK_SUPPORT |
2058 | /* |
2136 | /* |
2059 | * D: CopyArea pass - very useful for slower links |
2137 | * D: CopyArea pass - very useful for slower links |
2060 | * This has been deliberately kept simple. |
2138 | * This has been deliberately kept simple. |
2061 | */ |
2139 | */ |
2062 | i = num_scr; |
|
|
2063 | if (!display->is_local |
2140 | if (!display->is_local |
2064 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2141 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2065 | && abs (num_scr) < nrow && !must_clear) |
2142 | && abs (num_scr) < nrow && !have_bg) |
2066 | { |
2143 | { |
2067 | int16_t nits; |
2144 | int16_t nits; |
|
|
2145 | int i = num_scr; |
2068 | int j; |
2146 | int j; |
2069 | int len, wlen; |
2147 | int len, wlen; |
|
|
2148 | dLocal (int, num_scr); |
2070 | |
2149 | |
2071 | j = nrow; |
2150 | j = nrow; |
2072 | wlen = len = -1; |
2151 | wlen = len = -1; |
2073 | row = i > 0 ? 0 : j - 1; |
2152 | row = i > 0 ? 0 : j - 1; |
|
|
2153 | |
2074 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2154 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2075 | { |
2155 | { |
2076 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2156 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2077 | { |
2157 | { |
2078 | line_t s = ROW(row - view_start); |
2158 | line_t s = ROW(view_start + row); |
2079 | line_t d = drawn_buf[row]; |
2159 | line_t d = drawn_buf[row]; |
2080 | line_t d2 = drawn_buf[row + i]; |
2160 | line_t d2 = drawn_buf[row + i]; |
2081 | |
2161 | |
2082 | for (nits = 0, col = ncol; col--; ) |
2162 | for (nits = 0, col = ncol; col--; ) |
2083 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2163 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
… | |
… | |
2099 | wlen = row; |
2179 | wlen = row; |
2100 | continue; |
2180 | continue; |
2101 | } |
2181 | } |
2102 | } |
2182 | } |
2103 | |
2183 | |
2104 | if (len != -1) |
2184 | if (len >= 0) |
2105 | { |
2185 | { |
2106 | /* also comes here at end if needed because of >= above */ |
2186 | /* also comes here at end if needed because of >= above */ |
2107 | if (wlen < len) |
2187 | if (wlen < len) |
2108 | ::swap (wlen, len); |
2188 | ::swap (wlen, len); |
2109 | |
2189 | |
|
|
2190 | XGCValues gcv; |
|
|
2191 | |
|
|
2192 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2110 | XCopyArea (display->display, vt, vt, |
2193 | XCopyArea (dpy, vt, vt, |
2111 | gc, 0, Row2Pixel (len + i), |
2194 | gc, 0, Row2Pixel (len + i), |
2112 | (unsigned int)this->width, |
2195 | (unsigned int)this->width, |
2113 | (unsigned int)Height2Pixel (wlen - len + 1), |
2196 | (unsigned int)Height2Pixel (wlen - len + 1), |
2114 | 0, Row2Pixel (len)); |
2197 | 0, Row2Pixel (len)); |
|
|
2198 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2199 | |
2115 | len = -1; |
2200 | len = -1; |
2116 | } |
2201 | } |
2117 | } |
2202 | } |
2118 | } |
2203 | } |
2119 | #endif |
2204 | #endif |
… | |
… | |
2121 | /* |
2206 | /* |
2122 | * E: main pass across every character |
2207 | * E: main pass across every character |
2123 | */ |
2208 | */ |
2124 | for (row = 0; row < nrow; row++) |
2209 | for (row = 0; row < nrow; row++) |
2125 | { |
2210 | { |
2126 | text_t *stp = ROW(row - view_start).t; |
2211 | text_t *stp = ROW(view_start + row).t; |
2127 | rend_t *srp = ROW(row - view_start).r; |
2212 | rend_t *srp = ROW(view_start + row).r; |
2128 | text_t *dtp = drawn_buf[row].t; |
2213 | text_t *dtp = drawn_buf[row].t; |
2129 | rend_t *drp = drawn_buf[row].r; |
2214 | rend_t *drp = drawn_buf[row].r; |
2130 | |
2215 | |
2131 | /* |
2216 | /* |
2132 | * E2: OK, now the real pass |
2217 | * E2: OK, now the real pass |
… | |
… | |
2143 | continue; |
2228 | continue; |
2144 | |
2229 | |
2145 | // redraw one or more characters |
2230 | // redraw one or more characters |
2146 | |
2231 | |
2147 | // seek to the beginning of wide characters |
2232 | // seek to the beginning of wide characters |
2148 | while (stp[col] == NOCHAR && col > 0) |
2233 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2149 | --col; |
2234 | --col; |
2150 | |
2235 | |
2151 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2236 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2152 | text_t *text = stp + col; |
2237 | text_t *text = stp + col; |
2153 | int count = 1; |
2238 | int count = 1; |
… | |
… | |
2160 | for (i = 0; ++col < ncol; ) |
2245 | for (i = 0; ++col < ncol; ) |
2161 | { |
2246 | { |
2162 | if (stp[col] == NOCHAR) |
2247 | if (stp[col] == NOCHAR) |
2163 | { |
2248 | { |
2164 | dtp[col] = stp[col]; |
2249 | dtp[col] = stp[col]; |
2165 | drp[col] = rend; |
2250 | drp[col] = srp[col]; |
|
|
2251 | |
2166 | count++; |
2252 | count++; |
2167 | i++; |
2253 | i++; |
2168 | |
2254 | |
2169 | continue; |
2255 | continue; |
2170 | } |
2256 | } |
… | |
… | |
2175 | count++; |
2261 | count++; |
2176 | |
2262 | |
2177 | if (stp[col] != dtp[col] |
2263 | if (stp[col] != dtp[col] |
2178 | || !RS_SAME (srp[col], drp[col])) |
2264 | || !RS_SAME (srp[col], drp[col])) |
2179 | { |
2265 | { |
2180 | if (must_clear && (i++ > count / 2)) |
2266 | if (have_bg && (i++ > count / 2)) |
2181 | break; |
2267 | break; |
2182 | |
2268 | |
2183 | dtp[col] = stp[col]; |
2269 | dtp[col] = stp[col]; |
2184 | drp[col] = rend; |
2270 | drp[col] = rend; |
2185 | i = 0; |
2271 | i = 0; |
2186 | } |
2272 | } |
2187 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2273 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2188 | break; |
2274 | break; |
2189 | } |
2275 | } |
2190 | |
2276 | |
2191 | col--; /* went one too far. move back */ |
2277 | col--; /* went one too far. move back */ |
2192 | count -= i; /* dump any matching trailing chars */ |
2278 | count -= i; /* dump any matching trailing chars */ |
2193 | |
2279 | |
2194 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2280 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2195 | while (i && text[count] == NOCHAR) |
2281 | while (expect_false (i && text[count] == NOCHAR)) |
2196 | count++, i--; |
2282 | count++, i--; |
2197 | |
2283 | |
2198 | /* |
2284 | /* |
2199 | * Determine the attributes for the string |
2285 | * Determine the attributes for the string |
2200 | */ |
2286 | */ |
2201 | int fore = fgcolor_of (rend); // desired foreground |
2287 | int fore = fgcolor_of (rend); // desired foreground |
2202 | int back = bgcolor_of (rend); // desired background |
2288 | int back = bgcolor_of (rend); // desired background |
2203 | |
2289 | |
2204 | // only do special processing if any attributes are set, which is unlikely |
2290 | // only do special processing if any attributes are set, which is unlikely |
2205 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2291 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2206 | { |
2292 | { |
2207 | #if ENABLE_STYLES |
|
|
2208 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2209 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2210 | drp[col + 1] = ~srp[col + 1]; |
|
|
2211 | |
|
|
2212 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2213 | while (text > stp |
|
|
2214 | && srp[text - stp - 1] & RS_Careful |
|
|
2215 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2216 | text--, count++, xpixel -= fwidth; |
|
|
2217 | #endif |
|
|
2218 | |
|
|
2219 | bool invert = rend & RS_RVid; |
2293 | bool invert = rend & RS_RVid; |
2220 | |
2294 | |
2221 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2295 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2222 | if (rend & RS_Bold |
|
|
2223 | && fore == Color_fg) |
2296 | if (rend & RS_Bold && fore == Color_fg) |
2224 | { |
2297 | { |
2225 | if (ISSET_PIXCOLOR (Color_BD)) |
2298 | if (ISSET_PIXCOLOR (Color_BD)) |
2226 | fore = Color_BD; |
2299 | fore = Color_BD; |
2227 | # if !ENABLE_STYLES |
2300 | # if !ENABLE_STYLES |
2228 | else |
2301 | else |
2229 | invert = !invert; |
2302 | invert = !invert; |
2230 | # endif |
2303 | # endif |
2231 | } |
2304 | } |
2232 | |
2305 | |
2233 | if (rend & RS_Italic |
2306 | if (rend & RS_Italic && fore == Color_fg) |
2234 | && fore == Color_fg) |
|
|
2235 | { |
2307 | { |
2236 | if (ISSET_PIXCOLOR (Color_IT)) |
2308 | if (ISSET_PIXCOLOR (Color_IT)) |
2237 | fore = Color_IT; |
2309 | fore = Color_IT; |
2238 | # if !ENABLE_STYLES |
2310 | # if !ENABLE_STYLES |
2239 | else |
2311 | else |
2240 | invert = !invert; |
2312 | invert = !invert; |
2241 | # endif |
2313 | # endif |
2242 | } |
2314 | } |
2243 | |
2315 | |
2244 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2316 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2245 | fore = Color_UL; |
2317 | fore = Color_UL; |
2246 | #endif |
2318 | #endif |
2247 | |
2319 | |
2248 | if (invert) |
2320 | if (invert) |
2249 | { |
2321 | { |
|
|
2322 | #ifdef OPTION_HC |
|
|
2323 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2324 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2325 | #endif |
|
|
2326 | /* invert the column if no highlightColor is set or it is the |
|
|
2327 | * current cursor column */ |
2250 | ::swap (fore, back); |
2328 | ::swap (fore, back); |
|
|
2329 | #ifdef OPTION_HC |
|
|
2330 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2331 | back = Color_HC; |
|
|
2332 | #endif |
2251 | |
2333 | |
2252 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2334 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2335 | # ifndef OPTION_HC |
2253 | if (ISSET_PIXCOLOR (Color_RV)) |
2336 | if (ISSET_PIXCOLOR (Color_RV)) |
2254 | back = Color_RV; |
2337 | back = Color_RV; |
2255 | |
2338 | # endif |
2256 | if (fore == back) |
2339 | if (fore == back) |
2257 | { |
2340 | { |
2258 | fore = Color_bg; |
2341 | fore = Color_bg; |
2259 | back = Color_fg; |
2342 | back = Color_fg; |
2260 | } |
2343 | } |
… | |
… | |
2262 | } |
2345 | } |
2263 | |
2346 | |
2264 | #ifdef TEXT_BLINK |
2347 | #ifdef TEXT_BLINK |
2265 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2348 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2266 | { |
2349 | { |
2267 | if (!text_blink_ev.active) |
2350 | if (!text_blink_ev.is_active ()) |
2268 | { |
2351 | { |
2269 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2352 | text_blink_ev.again (); |
2270 | hidden_text = 0; |
2353 | hidden_text = 0; |
2271 | } |
2354 | } |
2272 | else if (hidden_text) |
2355 | else if (hidden_text) |
2273 | fore = back; |
2356 | fore = back; |
2274 | } |
2357 | } |
2275 | #endif |
2358 | #endif |
|
|
2359 | |
|
|
2360 | #if ENABLE_STYLES |
|
|
2361 | // "careful" (too wide) character handling |
|
|
2362 | |
|
|
2363 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2364 | while (text > stp |
|
|
2365 | && srp[text - stp - 1] & RS_Careful |
|
|
2366 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2367 | text--, count++, xpixel -= fwidth; |
|
|
2368 | |
|
|
2369 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2370 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2371 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2372 | |
|
|
2373 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2374 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2375 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2376 | #endif |
2276 | } |
2377 | } |
2277 | |
2378 | |
2278 | /* |
2379 | /* |
2279 | * Actually do the drawing of the string here |
2380 | * Actually do the drawing of the string here |
2280 | */ |
2381 | */ |
2281 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2382 | rxvt_font *font = fontset [GET_STYLE (rend)]->get (*text, GET_FONT (rend)); |
2282 | |
2383 | |
2283 | if (back == fore) |
2384 | if (expect_true (have_bg && back == Color_bg)) |
2284 | font->clear_rect (*drawable, xpixel, ypixel, |
|
|
2285 | fwidth * count, fheight, |
|
|
2286 | back); |
|
|
2287 | else if (back == Color_bg) |
|
|
2288 | { |
2385 | { |
2289 | if (must_clear) |
2386 | // this is very ugly, maybe push it into ->draw? |
2290 | { |
|
|
2291 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2292 | |
2387 | |
2293 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2388 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2294 | if (text[i] != ' ') |
2389 | if (text[i] != ' ') |
2295 | { |
2390 | { |
2296 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2391 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2297 | break; |
2392 | goto did_clear; |
2298 | } |
|
|
2299 | } |
2393 | } |
2300 | else |
2394 | |
2301 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2395 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2396 | did_clear: ; |
2302 | } |
2397 | } |
2303 | else |
2398 | else |
2304 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2399 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2305 | |
2400 | |
2306 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2401 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2307 | { |
2402 | { |
2308 | #if ENABLE_FRILLS |
2403 | #if ENABLE_FRILLS |
2309 | if (ISSET_PIXCOLOR (Color_underline)) |
2404 | if (ISSET_PIXCOLOR (Color_underline)) |
2310 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2405 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2311 | else |
2406 | else |
2312 | #endif |
2407 | #endif |
2313 | XSetForeground (display->display, gc, pix_colors[fore]); |
2408 | XSetForeground (dpy, gc, pix_colors[fore]); |
2314 | |
2409 | |
2315 | XDrawLine (display->display, drawBuffer, gc, |
2410 | XDrawLine (dpy, vt, gc, |
2316 | xpixel, ypixel + font->ascent + 1, |
2411 | xpixel, ypixel + font->ascent + 1, |
2317 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2412 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2318 | } |
2413 | } |
2319 | } /* for (col....) */ |
2414 | } /* for (col....) */ |
2320 | } /* for (row....) */ |
2415 | } /* for (row....) */ |
2321 | |
2416 | |
2322 | #if ENABLE_OVERLAY |
|
|
2323 | scr_swap_overlay (); |
|
|
2324 | #endif |
|
|
2325 | PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2326 | |
|
|
2327 | /* |
2417 | /* |
2328 | * G: cleanup cursor and display outline cursor if necessary |
2418 | * G: cleanup cursor and display outline cursor if necessary |
2329 | */ |
2419 | */ |
2330 | if (showcursor) |
2420 | if (showcursor) |
2331 | { |
2421 | { |
2332 | if (focus) |
2422 | if (focus) |
2333 | { |
2423 | { |
2334 | if (OPTION (Opt_cursorUnderline)) |
2424 | if (option (Opt_cursorUnderline)) |
2335 | *crp ^= RS_Uline; |
2425 | *crp ^= RS_Uline; |
2336 | else |
2426 | else |
2337 | { |
2427 | { |
2338 | *crp ^= RS_RVid; |
2428 | *crp ^= RS_RVid; |
2339 | #ifndef NO_CURSORCOLOR |
2429 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2353 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2443 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2354 | cursorwidth++; |
2444 | cursorwidth++; |
2355 | |
2445 | |
2356 | #ifndef NO_CURSORCOLOR |
2446 | #ifndef NO_CURSORCOLOR |
2357 | if (ISSET_PIXCOLOR (Color_cursor)) |
2447 | if (ISSET_PIXCOLOR (Color_cursor)) |
2358 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2448 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2449 | else |
2359 | #endif |
2450 | #endif |
|
|
2451 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2360 | |
2452 | |
2361 | XDrawRectangle (display->display, drawBuffer, gc, |
2453 | XDrawRectangle (dpy, vt, gc, |
2362 | Col2Pixel (col), |
2454 | Col2Pixel (col), |
2363 | Row2Pixel (oldcursor.row), |
2455 | Row2Pixel (oldcursor.row), |
2364 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2456 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2365 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2457 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2366 | } |
2458 | } |
2367 | } |
2459 | } |
2368 | |
2460 | |
2369 | /* |
2461 | /* |
2370 | * H: cleanup selection |
2462 | * H: cleanup selection |
2371 | */ |
2463 | */ |
|
|
2464 | #if ENABLE_OVERLAY |
|
|
2465 | scr_swap_overlay (); |
|
|
2466 | #endif |
|
|
2467 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2468 | |
2372 | scr_reverse_selection (); |
2469 | scr_reverse_selection (); |
2373 | |
2470 | |
2374 | if (refresh_type & SMOOTH_REFRESH) |
2471 | screen.flags = old_screen_flags; |
2375 | XFlush (display->display); |
|
|
2376 | |
|
|
2377 | num_scr = 0; |
2472 | num_scr = 0; |
2378 | num_scr_allow = 1; |
2473 | num_scr_allow = 1; |
2379 | } |
2474 | } |
2380 | |
2475 | |
2381 | void |
2476 | void |
2382 | rxvt_term::scr_remap_chars (const line_t &l) |
2477 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2383 | { |
2478 | { |
2384 | if (!l.t) |
2479 | if (!l.t) |
2385 | return; |
2480 | return; |
2386 | |
2481 | |
|
|
2482 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
|
|
2483 | |
2387 | for (int i = ncol; i--; ) |
2484 | for (int i = ncol; i--; ) |
2388 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2485 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2389 | } |
2486 | } |
2390 | |
2487 | |
2391 | void |
2488 | void |
2392 | rxvt_term::scr_remap_chars () |
2489 | rxvt_term::scr_remap_chars () NOTHROW |
2393 | { |
2490 | { |
2394 | for (int i = total_rows; i--; ) |
2491 | for (int i = total_rows; i--; ) |
2395 | scr_remap_chars (row_buf [i]); |
2492 | scr_remap_chars (row_buf [i]); |
2396 | |
2493 | |
2397 | for (int i = nrow; i--; ) |
2494 | for (int i = nrow; i--; ) |
… | |
… | |
2400 | scr_remap_chars (swap_buf [i]); |
2497 | scr_remap_chars (swap_buf [i]); |
2401 | } |
2498 | } |
2402 | } |
2499 | } |
2403 | |
2500 | |
2404 | void |
2501 | void |
2405 | rxvt_term::scr_recolour () |
2502 | rxvt_term::scr_recolour () NOTHROW |
2406 | { |
2503 | { |
2407 | if (1 |
2504 | #ifdef HAVE_BG_PIXMAP |
2408 | #if TRANSPARENT |
2505 | bgPixmap.apply (); |
2409 | && !am_transparent |
2506 | #else |
2410 | #endif |
2507 | |
2411 | #if XPM_BACKGROUND |
|
|
2412 | && !bgPixmap.pixmap |
|
|
2413 | #endif |
|
|
2414 | ) |
|
|
2415 | { |
|
|
2416 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2508 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2417 | XClearWindow (display->display, parent[0]); |
2509 | XClearWindow (dpy, parent[0]); |
2418 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2510 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2419 | #if HAVE_SCROLLBARS |
2511 | |
2420 | if (scrollBar.win) |
2512 | if (scrollBar.win) |
2421 | { |
2513 | { |
2422 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2514 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2423 | scrollBar.setIdle (); |
2515 | scrollBar.state = STATE_IDLE; |
2424 | scrollbar_show (0); |
2516 | scrollBar.show (0); |
2425 | } |
|
|
2426 | #endif |
|
|
2427 | } |
2517 | } |
2428 | |
2518 | |
|
|
2519 | #endif |
|
|
2520 | |
|
|
2521 | /* bgPixmap.apply () does not do the following : */ |
2429 | scr_clear (); |
2522 | scr_clear (); |
2430 | scr_touch (true); |
2523 | scr_touch (true); |
2431 | want_refresh = 1; |
2524 | want_refresh = 1; |
2432 | } |
2525 | } |
2433 | |
2526 | |
2434 | /* ------------------------------------------------------------------------- */ |
2527 | /* ------------------------------------------------------------------------- */ |
2435 | void |
2528 | void |
2436 | rxvt_term::scr_clear (bool really) |
2529 | rxvt_term::scr_clear (bool really) NOTHROW |
2437 | { |
2530 | { |
2438 | if (!mapped) |
2531 | if (!mapped) |
2439 | return; |
2532 | return; |
2440 | |
2533 | |
2441 | num_scr_allow = 0; |
2534 | num_scr_allow = 0; |
2442 | want_refresh = 1; |
2535 | want_refresh = 1; |
2443 | |
2536 | |
2444 | if (really) |
2537 | if (really) |
2445 | XClearWindow (display->display, vt); |
2538 | XClearWindow (dpy, vt); |
2446 | } |
2539 | } |
2447 | |
2540 | |
2448 | /* ------------------------------------------------------------------------- */ |
|
|
2449 | void |
2541 | void |
|
|
2542 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
|
|
2543 | { |
|
|
2544 | int view_end = view_start + nrow; |
|
|
2545 | int row, col; |
|
|
2546 | |
|
|
2547 | for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) |
|
|
2548 | { |
|
|
2549 | text_t *stp = ROW(row).t; |
|
|
2550 | rend_t *srp = ROW(row).r; |
|
|
2551 | |
|
|
2552 | for (col = beg_col; col < end_col; col++) |
|
|
2553 | srp[col] ^= rstyle1; |
|
|
2554 | |
|
|
2555 | while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2556 | srp[col] ^= rstyle2; |
|
|
2557 | |
|
|
2558 | if (++col < end_col) |
|
|
2559 | srp[col] ^= rstyle2; |
|
|
2560 | } |
|
|
2561 | } |
|
|
2562 | |
|
|
2563 | void |
|
|
2564 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW |
|
|
2565 | { |
|
|
2566 | int view_end = view_start + nrow; |
|
|
2567 | int row, col; |
|
|
2568 | |
|
|
2569 | if (beg_row >= view_start) |
|
|
2570 | { |
|
|
2571 | col = beg_col; |
|
|
2572 | row = beg_row; |
|
|
2573 | } |
|
|
2574 | else |
|
|
2575 | { |
|
|
2576 | col = 0; |
|
|
2577 | row = view_start; |
|
|
2578 | } |
|
|
2579 | |
|
|
2580 | for (; row < min (end_row, view_end); row++, col = 0) |
|
|
2581 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
|
|
2582 | srp[col] ^= rstyle; |
|
|
2583 | |
|
|
2584 | if (row == end_row) |
|
|
2585 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
|
|
2586 | srp[col] ^= rstyle; |
|
|
2587 | } |
|
|
2588 | |
|
|
2589 | /* ------------------------------------------------------------------------- */ |
|
|
2590 | void |
2450 | rxvt_term::scr_reverse_selection () |
2591 | rxvt_term::scr_reverse_selection () NOTHROW |
2451 | { |
2592 | { |
2452 | if (selection.op |
2593 | if (selection.op |
2453 | && current_screen == selection.screen |
2594 | && current_screen == selection.screen |
2454 | && selection.end.row >= -view_start) |
2595 | && selection.end.row >= view_start) |
2455 | { |
2596 | { |
2456 | int view_end = -view_start + nrow; |
2597 | #if !ENABLE_MINIMAL |
2457 | int row, col; |
|
|
2458 | |
|
|
2459 | #if ENABLE_FRILLS |
|
|
2460 | if (selection.rect) |
2598 | if (selection.rect) |
2461 | { |
2599 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2462 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
2600 | selection.end.row, selection.end.col, |
2463 | { |
2601 | RS_RVid, RS_RVid | RS_Uline); |
2464 | text_t *stp = ROW(row).t; |
|
|
2465 | rend_t *srp = ROW(row).r; |
|
|
2466 | |
|
|
2467 | for (col = selection.beg.col; col < selection.end.col; col++) |
|
|
2468 | srp[col] ^= RS_RVid; |
|
|
2469 | |
|
|
2470 | while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2471 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2472 | |
|
|
2473 | if (++col < selection.end.col) |
|
|
2474 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2475 | } |
|
|
2476 | } |
|
|
2477 | else |
2602 | else |
2478 | #endif |
2603 | #endif |
2479 | { |
2604 | scr_xor_span (selection.beg.row, selection.beg.col, |
2480 | if (selection.beg.row >= -view_start) |
2605 | selection.end.row, selection.end.col, |
2481 | { |
2606 | RS_RVid); |
2482 | col = selection.beg.col; |
|
|
2483 | row = selection.beg.row; |
|
|
2484 | } |
|
|
2485 | else |
|
|
2486 | { |
|
|
2487 | col = 0; |
|
|
2488 | row = -view_start; |
|
|
2489 | } |
|
|
2490 | |
|
|
2491 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
|
|
2492 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
|
|
2493 | srp[col] ^= RS_RVid; |
|
|
2494 | |
|
|
2495 | if (row == selection.end.row) |
|
|
2496 | for (rend_t *srp = ROW(row).r; col < selection.end.col; col++) |
|
|
2497 | srp[col] ^= RS_RVid; |
|
|
2498 | } |
|
|
2499 | } |
2607 | } |
2500 | } |
2608 | } |
2501 | |
2609 | |
2502 | /* ------------------------------------------------------------------------- */ |
2610 | /* ------------------------------------------------------------------------- */ |
2503 | /* |
2611 | /* |
2504 | * Dump the whole scrollback and screen to the passed filedescriptor. The |
2612 | * Dump the whole scrollback and screen to the passed filedescriptor. The |
2505 | * invoking routine must close the fd. |
2613 | * invoking routine must close the fd. |
2506 | */ |
2614 | */ |
2507 | #if 0 |
2615 | #if 0 |
2508 | void |
2616 | void |
2509 | rxvt_term::scr_dump (int fd) |
2617 | rxvt_term::scr_dump (int fd) NOTHROW |
2510 | { |
2618 | { |
2511 | int row, wrote; |
2619 | int row, wrote; |
2512 | unsigned int width, towrite; |
2620 | unsigned int width, towrite; |
2513 | char r1[] = "\n"; |
2621 | char r1[] = "\n"; |
2514 | |
2622 | |
2515 | for (row = saveLines - nsaved; |
2623 | for (row = saveLines + top_row; |
2516 | row < saveLines + nrow - 1; row++) |
2624 | row < saveLines + nrow - 1; row++) |
2517 | { |
2625 | { |
2518 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2626 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2519 | : ncol; |
2627 | : ncol; |
2520 | for (towrite = width; towrite; towrite -= wrote) |
2628 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2533 | |
2641 | |
2534 | /* ------------------------------------------------------------------------- * |
2642 | /* ------------------------------------------------------------------------- * |
2535 | * CHARACTER SELECTION * |
2643 | * CHARACTER SELECTION * |
2536 | * ------------------------------------------------------------------------- */ |
2644 | * ------------------------------------------------------------------------- */ |
2537 | void |
2645 | void |
2538 | rxvt_term::selection_check (int check_more) |
2646 | rxvt_term::selection_check (int check_more) NOTHROW |
2539 | { |
2647 | { |
2540 | row_col_t pos; |
2648 | row_col_t pos; |
2541 | |
2649 | |
2542 | if (!selection.op) |
2650 | if (!selection.op) |
2543 | return; |
2651 | return; |
2544 | |
2652 | |
2545 | pos.row = pos.col = 0; |
2653 | pos.row = pos.col = 0; |
2546 | if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) |
2654 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2547 | || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) |
2655 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2548 | || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) |
2656 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2549 | || (check_more == 1 |
2657 | || (check_more == 1 |
2550 | && current_screen == selection.screen |
2658 | && current_screen == selection.screen |
2551 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2659 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2552 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2660 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2553 | || (check_more == 2 |
2661 | || (check_more == 2 |
… | |
… | |
2564 | /* ------------------------------------------------------------------------- */ |
2672 | /* ------------------------------------------------------------------------- */ |
2565 | /* |
2673 | /* |
2566 | * Paste a selection direct to the command fd |
2674 | * Paste a selection direct to the command fd |
2567 | */ |
2675 | */ |
2568 | void |
2676 | void |
2569 | rxvt_term::paste (char *data, unsigned int len) |
2677 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2570 | { |
2678 | { |
2571 | /* convert normal newline chars into common keyboard Return key sequence */ |
2679 | /* convert normal newline chars into common keyboard Return key sequence */ |
2572 | for (unsigned int i = 0; i < len; i++) |
2680 | for (unsigned int i = 0; i < len; i++) |
2573 | if (data[i] == C0_LF) |
2681 | if (data[i] == C0_LF) |
2574 | data[i] = C0_CR; |
2682 | data[i] = C0_CR; |
2575 | |
2683 | |
|
|
2684 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2685 | tt_printf ("\e[200~"); |
|
|
2686 | |
2576 | tt_write (data, len); |
2687 | tt_write (data, len); |
|
|
2688 | |
|
|
2689 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2690 | tt_printf ("\e[201~"); |
2577 | } |
2691 | } |
2578 | |
2692 | |
2579 | /* ------------------------------------------------------------------------- */ |
2693 | /* ------------------------------------------------------------------------- */ |
2580 | /* |
2694 | /* |
2581 | * Respond to a notification that a primary selection has been sent |
2695 | * Respond to a notification that a primary selection has been sent |
2582 | * EXT: SelectionNotify |
2696 | * EXT: SelectionNotify |
2583 | */ |
2697 | */ |
2584 | void |
2698 | void |
2585 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2699 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2586 | { |
2700 | { |
2587 | if (prop == None) /* check for failed XConvertSelection */ |
2701 | if (prop == None) /* check for failed XConvertSelection */ |
2588 | { |
2702 | { |
2589 | if ((selection_type & Sel_CompoundText)) |
2703 | if ((selection_type & Sel_CompoundText)) |
2590 | { |
2704 | { |
… | |
… | |
2610 | } |
2724 | } |
2611 | |
2725 | |
2612 | unsigned long bytes_after; |
2726 | unsigned long bytes_after; |
2613 | XTextProperty ct; |
2727 | XTextProperty ct; |
2614 | |
2728 | |
2615 | if (XGetWindowProperty (display->display, win, prop, |
2729 | if (XGetWindowProperty (dpy, win, prop, |
2616 | 0, PROP_SIZE / 4, |
2730 | 0, PROP_SIZE / 4, |
2617 | delete_prop, AnyPropertyType, |
2731 | delete_prop, AnyPropertyType, |
2618 | &ct.encoding, &ct.format, |
2732 | &ct.encoding, &ct.format, |
2619 | &ct.nitems, &bytes_after, |
2733 | &ct.nitems, &bytes_after, |
2620 | &ct.value) != Success) |
2734 | &ct.value) != Success) |
… | |
… | |
2629 | if (bytes_after) |
2743 | if (bytes_after) |
2630 | { |
2744 | { |
2631 | // fetch and append remaining data |
2745 | // fetch and append remaining data |
2632 | XTextProperty ct2; |
2746 | XTextProperty ct2; |
2633 | |
2747 | |
2634 | if (XGetWindowProperty (display->display, win, prop, |
2748 | if (XGetWindowProperty (dpy, win, prop, |
2635 | ct.nitems / 4, (bytes_after + 3) / 4, |
2749 | ct.nitems / 4, (bytes_after + 3) / 4, |
2636 | delete_prop, AnyPropertyType, |
2750 | delete_prop, AnyPropertyType, |
2637 | &ct2.encoding, &ct2.format, |
2751 | &ct2.encoding, &ct2.format, |
2638 | &ct2.nitems, &bytes_after, |
2752 | &ct2.nitems, &bytes_after, |
2639 | &ct2.value) != Success) |
2753 | &ct2.value) != Success) |
… | |
… | |
2652 | |
2766 | |
2653 | if (ct.encoding == xa[XA_INCR]) |
2767 | if (ct.encoding == xa[XA_INCR]) |
2654 | { |
2768 | { |
2655 | // INCR selection, start handshake |
2769 | // INCR selection, start handshake |
2656 | if (!delete_prop) |
2770 | if (!delete_prop) |
2657 | XDeleteProperty (display->display, win, prop); |
2771 | XDeleteProperty (dpy, win, prop); |
2658 | |
2772 | |
2659 | selection_wait = Sel_incr; |
2773 | selection_wait = Sel_incr; |
2660 | incr_buf_fill = 0; |
2774 | incr_buf_fill = 0; |
2661 | incr_ev.start (NOW + 10); |
2775 | incr_ev.start (10); |
2662 | |
2776 | |
2663 | goto bailout; |
2777 | goto bailout; |
2664 | } |
2778 | } |
2665 | |
2779 | |
2666 | if (ct.nitems == 0) |
2780 | if (ct.nitems == 0) |
… | |
… | |
2675 | ct.nitems = incr_buf_fill; |
2789 | ct.nitems = incr_buf_fill; |
2676 | incr_buf = 0; |
2790 | incr_buf = 0; |
2677 | incr_buf_size = 0; |
2791 | incr_buf_size = 0; |
2678 | incr_ev.stop (); |
2792 | incr_ev.stop (); |
2679 | } |
2793 | } |
2680 | else |
2794 | else |
2681 | { |
2795 | { |
2682 | if (selection_wait == Sel_normal |
2796 | if (selection_wait == Sel_normal |
2683 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2797 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2684 | { |
2798 | { |
2685 | /* |
2799 | /* |
… | |
… | |
2692 | goto bailout; |
2806 | goto bailout; |
2693 | } |
2807 | } |
2694 | } |
2808 | } |
2695 | else if (selection_wait == Sel_incr) |
2809 | else if (selection_wait == Sel_incr) |
2696 | { |
2810 | { |
2697 | incr_ev.start (NOW + 10); |
2811 | incr_ev.start (10); |
2698 | |
2812 | |
2699 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2813 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2700 | { |
2814 | { |
2701 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2815 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2702 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2816 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
… | |
… | |
2709 | } |
2823 | } |
2710 | |
2824 | |
2711 | char **cl; |
2825 | char **cl; |
2712 | int cr; |
2826 | int cr; |
2713 | |
2827 | |
2714 | #if ENABLE_FRILLS |
2828 | #if !ENABLE_MINIMAL |
2715 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2829 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2716 | // so recode it manually |
2830 | // so recode it manually |
2717 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2831 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2718 | { |
2832 | { |
2719 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2833 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2723 | paste (s, strlen (s)); |
2837 | paste (s, strlen (s)); |
2724 | free (s); |
2838 | free (s); |
2725 | } |
2839 | } |
2726 | else |
2840 | else |
2727 | #endif |
2841 | #endif |
2728 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2842 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2729 | && cl) |
2843 | && cl) |
2730 | { |
2844 | { |
2731 | for (int i = 0; i < cr; i++) |
2845 | for (int i = 0; i < cr; i++) |
2732 | paste (cl[i], strlen (cl[i])); |
2846 | paste (cl[i], strlen (cl[i])); |
2733 | |
2847 | |
… | |
… | |
2742 | if (selection_wait == Sel_normal) |
2856 | if (selection_wait == Sel_normal) |
2743 | selection_wait = Sel_none; |
2857 | selection_wait = Sel_none; |
2744 | } |
2858 | } |
2745 | |
2859 | |
2746 | void |
2860 | void |
2747 | rxvt_term::incr_cb (time_watcher &w) |
2861 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2748 | { |
2862 | { |
2749 | selection_wait = Sel_none; |
2863 | selection_wait = Sel_none; |
2750 | |
2864 | |
2751 | incr_buf_size = 0; |
2865 | incr_buf_size = 0; |
2752 | free (incr_buf); |
2866 | free (incr_buf); |
2753 | |
2867 | |
2754 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2868 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2755 | } |
2869 | } |
2756 | |
2870 | |
2757 | void |
2871 | void |
2758 | rxvt_term::selection_property (Window win, Atom prop) |
2872 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
2759 | { |
2873 | { |
2760 | if (prop == None || selection_wait != Sel_incr) |
2874 | if (prop == None || selection_wait != Sel_incr) |
2761 | return; |
2875 | return; |
2762 | |
2876 | |
2763 | selection_paste (win, prop, true); |
2877 | selection_paste (win, prop, true); |
2764 | } |
2878 | } |
2765 | |
2879 | |
2766 | /* ------------------------------------------------------------------------- */ |
2880 | /* ------------------------------------------------------------------------- */ |
2767 | /* |
2881 | /* |
2768 | * Request the current selection: |
2882 | * Request the current selection: |
2769 | * Order: > internal selection if available |
2883 | * Order: > internal selection if available |
2770 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2884 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2771 | * > CUT_BUFFER0 |
2885 | * > CUT_BUFFER0 |
2772 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2886 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2773 | * will auto fallback to CUT_BUFFER0 |
2887 | * will auto fallback to CUT_BUFFER0 |
2774 | * EXT: button 2 release |
2888 | * EXT: button 2 release |
2775 | */ |
2889 | */ |
2776 | void |
2890 | void |
2777 | rxvt_term::selection_request (Time tm, int x, int y) |
2891 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2778 | { |
2892 | { |
2779 | if (x < 0 || x >= width || y < 0 || y >= height) |
2893 | if (selection.text && selnum == Sel_Primary) |
2780 | return; /* outside window */ |
2894 | { |
2781 | |
|
|
2782 | if (selection.text) |
|
|
2783 | { /* internal selection */ |
2895 | /* internal selection */ |
2784 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2896 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2785 | paste (str, strlen (str)); |
2897 | paste (str, strlen (str)); |
2786 | free (str); |
2898 | free (str); |
2787 | return; |
2899 | return; |
2788 | } |
2900 | } |
2789 | else |
2901 | else |
2790 | { |
2902 | { |
2791 | int i; |
|
|
2792 | |
|
|
2793 | selection_request_time = tm; |
2903 | selection_request_time = tm; |
2794 | selection_wait = Sel_normal; |
2904 | selection_wait = Sel_normal; |
2795 | |
2905 | |
2796 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
|
|
2797 | { |
|
|
2798 | #if X_HAVE_UTF8_STRING |
2906 | #if X_HAVE_UTF8_STRING |
2799 | selection_type = Sel_UTF8String; |
2907 | selection_type = Sel_UTF8String; |
2800 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
2908 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2801 | return; |
2909 | return; |
2802 | #else |
2910 | #else |
2803 | selection_type = Sel_CompoundText; |
2911 | selection_type = Sel_CompoundText; |
2804 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2912 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2805 | return; |
2913 | return; |
2806 | #endif |
2914 | #endif |
2807 | } |
|
|
2808 | } |
2915 | } |
2809 | |
2916 | |
2810 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2917 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2811 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2918 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2812 | } |
2919 | } |
2813 | |
2920 | |
2814 | int |
2921 | int |
2815 | rxvt_term::selection_request_other (Atom target, int selnum) |
2922 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
2816 | { |
2923 | { |
2817 | Atom sel; |
2924 | Atom sel; |
2818 | |
2925 | |
2819 | selection_type |= selnum; |
2926 | selection_type |= selnum; |
2820 | |
2927 | |
… | |
… | |
2823 | else if (selnum == Sel_Secondary) |
2930 | else if (selnum == Sel_Secondary) |
2824 | sel = XA_SECONDARY; |
2931 | sel = XA_SECONDARY; |
2825 | else |
2932 | else |
2826 | sel = xa[XA_CLIPBOARD]; |
2933 | sel = xa[XA_CLIPBOARD]; |
2827 | |
2934 | |
2828 | if (XGetSelectionOwner (display->display, sel) != None) |
2935 | if (XGetSelectionOwner (dpy, sel) != None) |
2829 | { |
2936 | { |
2830 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2937 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2831 | vt, selection_request_time); |
2938 | vt, selection_request_time); |
2832 | return 1; |
2939 | return 1; |
2833 | } |
2940 | } |
2834 | |
2941 | |
2835 | return 0; |
2942 | return 0; |
… | |
… | |
2839 | /* |
2946 | /* |
2840 | * Clear all selected text |
2947 | * Clear all selected text |
2841 | * EXT: SelectionClear |
2948 | * EXT: SelectionClear |
2842 | */ |
2949 | */ |
2843 | void |
2950 | void |
2844 | rxvt_term::selection_clear () |
2951 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2845 | { |
2952 | { |
|
|
2953 | if (!clipboard) |
|
|
2954 | { |
2846 | want_refresh = 1; |
2955 | want_refresh = 1; |
2847 | free (selection.text); |
2956 | free (selection.text); |
2848 | selection.text = NULL; |
2957 | selection.text = NULL; |
2849 | selection.len = 0; |
2958 | selection.len = 0; |
2850 | CLEAR_SELECTION (); |
2959 | CLEAR_SELECTION (); |
2851 | |
2960 | |
2852 | if (display->selection_owner == this) |
2961 | if (display->selection_owner == this) |
2853 | display->selection_owner = 0; |
2962 | display->selection_owner = 0; |
|
|
2963 | } |
|
|
2964 | else |
|
|
2965 | { |
|
|
2966 | free (selection.clip_text); |
|
|
2967 | selection.clip_text = NULL; |
|
|
2968 | selection.clip_len = 0; |
|
|
2969 | |
|
|
2970 | if (display->clipboard_owner == this) |
|
|
2971 | display->clipboard_owner = 0; |
|
|
2972 | } |
|
|
2973 | } |
|
|
2974 | |
|
|
2975 | void |
|
|
2976 | rxvt_term::clipboard_copy (Time tm) |
|
|
2977 | { |
|
|
2978 | if (selection.len > 0) |
|
|
2979 | { |
|
|
2980 | free (selection.clip_text); |
|
|
2981 | selection.clip_len = selection.len; |
|
|
2982 | selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len); |
|
|
2983 | memcpy (selection.clip_text, selection.text, |
|
|
2984 | sizeof (wchar_t) * selection.clip_len); |
|
|
2985 | selection_grab (tm, true); |
|
|
2986 | } |
2854 | } |
2987 | } |
2855 | |
2988 | |
2856 | /* ------------------------------------------------------------------------- */ |
2989 | /* ------------------------------------------------------------------------- */ |
2857 | /* |
2990 | /* |
2858 | * Copy a selection into the cut buffer |
2991 | * Copy a selection into the cut buffer |
… | |
… | |
2882 | selection.op = SELECTION_DONE; |
3015 | selection.op = SELECTION_DONE; |
2883 | |
3016 | |
2884 | if (selection.clicks == 4) |
3017 | if (selection.clicks == 4) |
2885 | return; /* nothing selected, go away */ |
3018 | return; /* nothing selected, go away */ |
2886 | |
3019 | |
2887 | if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
3020 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2888 | return; |
3021 | return; |
2889 | |
3022 | |
2890 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3023 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2891 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
3024 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2892 | |
3025 | |
… | |
… | |
2898 | |
3031 | |
2899 | int end_col; |
3032 | int end_col; |
2900 | |
3033 | |
2901 | for (; row <= selection.end.row; row++, col = 0) |
3034 | for (; row <= selection.end.row; row++, col = 0) |
2902 | { |
3035 | { |
2903 | #if ENABLE_FRILLS |
3036 | #if !ENABLE_MINIMAL |
2904 | if (selection.rect) |
3037 | if (selection.rect) |
2905 | { |
3038 | { |
2906 | col = selection.beg.col; |
3039 | col = selection.beg.col; |
2907 | end_col = ncol + 1; |
3040 | end_col = ncol + 1; |
2908 | } |
3041 | } |
2909 | else |
3042 | else |
2910 | #endif |
3043 | #endif |
2911 | end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN |
3044 | end_col = ROW(row).l; |
2912 | |
3045 | |
2913 | col = max (col, 0); |
3046 | col = max (col, 0); |
2914 | |
3047 | |
2915 | if (row == selection.end.row |
3048 | if (row == selection.end.row |
2916 | #if ENABLE_FRILLS |
3049 | #if !ENABLE_MINIMAL |
2917 | || selection.rect |
3050 | || selection.rect |
2918 | #endif |
3051 | #endif |
2919 | ) |
3052 | ) |
2920 | min_it (end_col, selection.end.col); |
3053 | min_it (end_col, selection.end.col); |
2921 | |
3054 | |
2922 | t = ROW(row).t + col; |
3055 | t = ROW(row).t + col; |
|
|
3056 | |
2923 | for (; col < end_col; col++) |
3057 | for (; col < end_col; col++) |
2924 | { |
3058 | { |
2925 | if (*t == NOCHAR) |
3059 | if (*t == NOCHAR) |
2926 | t++; |
3060 | t++; |
2927 | #if ENABLE_COMBINING |
3061 | #if ENABLE_COMBINING |
… | |
… | |
2943 | #endif |
3077 | #endif |
2944 | else |
3078 | else |
2945 | new_selection_text[ofs++] = *t++; |
3079 | new_selection_text[ofs++] = *t++; |
2946 | } |
3080 | } |
2947 | |
3081 | |
2948 | #if ENABLE_FRILLS |
3082 | #if !ENABLE_MINIMAL |
2949 | if (selection.rect) |
3083 | if (selection.rect) |
2950 | { |
3084 | { |
2951 | while (ofs |
3085 | while (ofs |
2952 | && new_selection_text[ofs - 1] != C0_LF |
3086 | && new_selection_text[ofs - 1] != C0_LF |
2953 | && unicode::is_space (new_selection_text[ofs - 1])) |
3087 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
2976 | |
3110 | |
2977 | // we usually allocate much more than necessary, so realloc it smaller again |
3111 | // we usually allocate much more than necessary, so realloc it smaller again |
2978 | selection.len = ofs; |
3112 | selection.len = ofs; |
2979 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
3113 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2980 | |
3114 | |
2981 | if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) |
3115 | if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) |
2982 | return; |
3116 | return; |
2983 | |
3117 | |
2984 | selection_grab (tm); |
3118 | selection_grab (tm); |
2985 | } |
3119 | } |
2986 | |
3120 | |
2987 | bool |
3121 | bool |
2988 | rxvt_term::selection_grab (Time tm) |
3122 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
2989 | { |
3123 | { |
|
|
3124 | Atom sel; |
|
|
3125 | |
|
|
3126 | if (!clipboard) |
|
|
3127 | { |
2990 | selection_time = tm; |
3128 | selection_time = tm; |
2991 | |
3129 | sel = XA_PRIMARY; |
2992 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
|
|
2993 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
|
|
2994 | { |
3130 | } |
|
|
3131 | else |
|
|
3132 | { |
|
|
3133 | clipboard_time = tm; |
|
|
3134 | sel = xa[XA_CLIPBOARD]; |
|
|
3135 | } |
|
|
3136 | |
|
|
3137 | XSetSelectionOwner (dpy, sel, vt, tm); |
|
|
3138 | if (XGetSelectionOwner (dpy, sel) == vt) |
|
|
3139 | { |
2995 | display->set_selection_owner (this); |
3140 | display->set_selection_owner (this, clipboard); |
2996 | return true; |
3141 | return true; |
2997 | } |
3142 | } |
2998 | else |
3143 | else |
|
|
3144 | { |
|
|
3145 | selection_clear (clipboard); |
2999 | return false; |
3146 | return false; |
|
|
3147 | } |
3000 | |
3148 | |
3001 | #if 0 |
3149 | #if 0 |
3002 | XTextProperty ct; |
3150 | XTextProperty ct; |
3003 | |
3151 | |
3004 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3152 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3005 | { |
3153 | { |
3006 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3154 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3007 | XFree (ct.value); |
3155 | XFree (ct.value); |
3008 | } |
3156 | } |
3009 | #endif |
3157 | #endif |
… | |
… | |
3013 | /* |
3161 | /* |
3014 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3162 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3015 | * EXT: button 1 press |
3163 | * EXT: button 1 press |
3016 | */ |
3164 | */ |
3017 | void |
3165 | void |
3018 | rxvt_term::selection_click (int clicks, int x, int y) |
3166 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
3019 | { |
3167 | { |
3020 | clicks = ((clicks - 1) % 3) + 1; |
3168 | clicks = ((clicks - 1) % 3) + 1; |
3021 | selection.clicks = clicks; /* save clicks so extend will work */ |
3169 | selection.clicks = clicks; /* save clicks so extend will work */ |
3022 | |
3170 | |
|
|
3171 | if (clicks == 2 && !selection.rect |
|
|
3172 | && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) |
|
|
3173 | { |
|
|
3174 | MEvent.clicks = 1; // what a mess |
|
|
3175 | selection.screen = current_screen; |
|
|
3176 | selection.op = SELECTION_CONT; |
|
|
3177 | return; |
|
|
3178 | } |
|
|
3179 | |
3023 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3180 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3024 | |
3181 | |
3025 | if (clicks == 2 || clicks == 3) |
3182 | if (clicks == 2 || clicks == 3) |
3026 | selection_extend_colrow (selection.mark.col, |
3183 | selection_extend_colrow (selection.mark.col, |
3027 | selection.mark.row + view_start, |
3184 | selection.mark.row - view_start, |
3028 | 0, /* button 3 */ |
3185 | 0, /* button 3 */ |
3029 | 1, /* button press */ |
3186 | 1, /* button press */ |
3030 | 0); /* click change */ |
3187 | 0); /* click change */ |
3031 | } |
3188 | } |
3032 | |
3189 | |
3033 | /* ------------------------------------------------------------------------- */ |
3190 | /* ------------------------------------------------------------------------- */ |
3034 | /* |
3191 | /* |
3035 | * Mark a selection at the specified col/row |
3192 | * Mark a selection at the specified col/row |
3036 | */ |
3193 | */ |
3037 | void |
3194 | void |
3038 | rxvt_term::selection_start_colrow (int col, int row) |
3195 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
3039 | { |
3196 | { |
3040 | want_refresh = 1; |
3197 | want_refresh = 1; |
3041 | |
3198 | |
3042 | selection.mark.row = row - view_start; |
3199 | selection.mark.row = row + view_start; |
3043 | selection.mark.col = col; |
3200 | selection.mark.col = col; |
3044 | |
3201 | |
3045 | selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); |
3202 | selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1); |
3046 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3203 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3047 | |
3204 | |
3048 | while (selection.mark.col > 0 |
3205 | while (selection.mark.col > 0 |
3049 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3206 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3050 | --selection.mark.col; |
3207 | --selection.mark.col; |
3051 | |
3208 | |
3052 | if (selection.op) |
3209 | if (selection.op) |
|
|
3210 | { |
3053 | { /* clear the old selection */ |
3211 | /* clear the old selection */ |
3054 | selection.beg.row = selection.end.row = selection.mark.row; |
3212 | selection.beg.row = selection.end.row = selection.mark.row; |
3055 | selection.beg.col = selection.end.col = selection.mark.col; |
3213 | selection.beg.col = selection.end.col = selection.mark.col; |
3056 | } |
3214 | } |
3057 | |
3215 | |
3058 | selection.op = SELECTION_INIT; |
3216 | selection.op = SELECTION_INIT; |
… | |
… | |
3069 | #define DELIMIT_TEXT(x) \ |
3227 | #define DELIMIT_TEXT(x) \ |
3070 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3228 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3071 | #define DELIMIT_REND(x) 1 |
3229 | #define DELIMIT_REND(x) 1 |
3072 | |
3230 | |
3073 | void |
3231 | void |
3074 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
3232 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3075 | { |
3233 | { |
3076 | int col, row, dirnadd, tcol, trow, w1, w2; |
3234 | int col, row, dirnadd, tcol, trow, w1, w2; |
3077 | row_col_t bound; |
3235 | row_col_t bound; |
3078 | text_t *stp; |
3236 | text_t *stp; |
3079 | rend_t *srp; |
3237 | rend_t *srp; |
3080 | |
3238 | |
3081 | if (dirn == UP) |
3239 | if (dirn == UP) |
3082 | { |
3240 | { |
3083 | bound.row = - nsaved - 1; |
3241 | bound.row = top_row - 1; |
3084 | bound.col = 0; |
3242 | bound.col = 0; |
3085 | dirnadd = -1; |
3243 | dirnadd = -1; |
3086 | } |
3244 | } |
3087 | else |
3245 | else |
3088 | { |
3246 | { |
… | |
… | |
3153 | * flag == 0 ==> button 1 |
3311 | * flag == 0 ==> button 1 |
3154 | * flag == 1 ==> button 3 press |
3312 | * flag == 1 ==> button 3 press |
3155 | * flag == 2 ==> button 3 motion |
3313 | * flag == 2 ==> button 3 motion |
3156 | */ |
3314 | */ |
3157 | void |
3315 | void |
3158 | rxvt_term::selection_extend (int x, int y, int flag) |
3316 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3159 | { |
3317 | { |
3160 | int col = clamp (Pixel2Col (x), 0, ncol); |
3318 | int col = clamp (Pixel2Col (x), 0, ncol); |
3161 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3319 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3162 | |
3320 | |
3163 | /* |
3321 | /* |
… | |
… | |
3166 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3324 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3167 | * be _past_ a character for it to be selected. |
3325 | * be _past_ a character for it to be selected. |
3168 | */ |
3326 | */ |
3169 | if (((selection.clicks % 3) == 1) && !flag |
3327 | if (((selection.clicks % 3) == 1) && !flag |
3170 | && (col == selection.mark.col |
3328 | && (col == selection.mark.col |
3171 | && (row == selection.mark.row + view_start))) |
3329 | && (row == selection.mark.row - view_start))) |
3172 | { |
3330 | { |
3173 | /* select nothing */ |
3331 | /* select nothing */ |
3174 | selection.beg.row = selection.end.row = 0; |
3332 | selection.beg.row = selection.end.row = 0; |
3175 | selection.beg.col = selection.end.col = 0; |
3333 | selection.beg.col = selection.end.col = 0; |
3176 | selection.clicks = 4; |
3334 | selection.clicks = 4; |
… | |
… | |
3189 | /* ------------------------------------------------------------------------- */ |
3347 | /* ------------------------------------------------------------------------- */ |
3190 | /* |
3348 | /* |
3191 | * Extend the selection to the specified col/row |
3349 | * Extend the selection to the specified col/row |
3192 | */ |
3350 | */ |
3193 | void |
3351 | void |
3194 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3352 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3195 | { |
3353 | { |
3196 | row_col_t pos; |
3354 | row_col_t pos; |
3197 | enum { |
3355 | enum { |
3198 | LEFT, RIGHT |
3356 | LEFT, RIGHT |
3199 | } closeto = RIGHT; |
3357 | } closeto = RIGHT; |
… | |
… | |
3231 | selection.beg.col = selection.end.col = selection.mark.col; |
3389 | selection.beg.col = selection.end.col = selection.mark.col; |
3232 | selection.beg.row = selection.end.row = selection.mark.row; |
3390 | selection.beg.row = selection.end.row = selection.mark.row; |
3233 | } |
3391 | } |
3234 | |
3392 | |
3235 | pos.col = col; |
3393 | pos.col = col; |
3236 | pos.row = row - view_start; |
3394 | pos.row = view_start + row; |
3237 | |
3395 | |
3238 | /* |
3396 | /* |
3239 | * This is mainly xterm style selection with a couple of differences, mainly |
3397 | * This is mainly xterm style selection with a couple of differences, mainly |
3240 | * in the way button3 drag extension works. |
3398 | * in the way button3 drag extension works. |
3241 | * We're either doing: button1 drag; button3 press; or button3 drag |
3399 | * We're either doing: button1 drag; button3 press; or button3 drag |
… | |
… | |
3247 | * a point/word/line which is either the start or end of the selection |
3405 | * a point/word/line which is either the start or end of the selection |
3248 | * and it was decided by whichever point/word/line was `fixed' at the |
3406 | * and it was decided by whichever point/word/line was `fixed' at the |
3249 | * time of the most recent button3 press |
3407 | * time of the most recent button3 press |
3250 | */ |
3408 | */ |
3251 | if (button3 && buttonpress) |
3409 | if (button3 && buttonpress) |
|
|
3410 | { |
3252 | { /* button3 press */ |
3411 | /* button3 press */ |
3253 | /* |
3412 | /* |
3254 | * first determine which edge of the selection we are closest to |
3413 | * first determine which edge of the selection we are closest to |
3255 | */ |
3414 | */ |
3256 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3415 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3257 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3416 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3275 | selection.mark.row = selection.beg.row; |
3434 | selection.mark.row = selection.beg.row; |
3276 | selection.mark.col = selection.beg.col; |
3435 | selection.mark.col = selection.beg.col; |
3277 | } |
3436 | } |
3278 | } |
3437 | } |
3279 | else |
3438 | else |
|
|
3439 | { |
3280 | { /* button1 drag or button3 drag */ |
3440 | /* button1 drag or button3 drag */ |
3281 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3441 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3282 | { |
3442 | { |
3283 | if (selection.mark.row == selection.end.row |
3443 | if (selection.mark.row == selection.end.row |
3284 | && selection.mark.col == selection.end.col |
3444 | && selection.mark.col == selection.end.col |
3285 | && clickchange |
3445 | && clickchange |
… | |
… | |
3302 | |
3462 | |
3303 | if (selection.clicks == 1) |
3463 | if (selection.clicks == 1) |
3304 | { |
3464 | { |
3305 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3465 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3306 | && !ROW(selection.beg.row).is_longer () |
3466 | && !ROW(selection.beg.row).is_longer () |
3307 | #if ENABLE_FRILLS |
3467 | #if !ENABLE_MINIMAL |
3308 | && !selection.rect |
3468 | && !selection.rect |
3309 | #endif |
3469 | #endif |
3310 | ) |
3470 | ) |
3311 | selection.beg.col = ncol; |
3471 | selection.beg.col = ncol; |
3312 | |
3472 | |
3313 | if ( |
3473 | if ( |
3314 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3474 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3315 | && !ROW(selection.end.row).is_longer () |
3475 | && !ROW(selection.end.row).is_longer () |
3316 | #if ENABLE_FRILLS |
3476 | #if !ENABLE_MINIMAL |
3317 | && !selection.rect |
3477 | && !selection.rect |
3318 | #endif |
3478 | #endif |
3319 | ) |
3479 | ) |
3320 | selection.end.col = ncol; |
3480 | selection.end.col = ncol; |
3321 | } |
3481 | } |
3322 | else if (selection.clicks == 2) |
3482 | else if (selection.clicks == 2) |
3323 | { |
3483 | { |
3324 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3484 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3325 | selection.end.col--; |
3485 | selection.end.col--; |
3326 | |
3486 | |
3327 | if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) |
|
|
3328 | { |
|
|
3329 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3487 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3330 | selection_delimit_word (DN, &selection.end, &selection.end); |
3488 | selection_delimit_word (DN, &selection.end, &selection.end); |
3331 | } |
|
|
3332 | } |
3489 | } |
3333 | else if (selection.clicks == 3) |
3490 | else if (selection.clicks == 3) |
3334 | { |
3491 | { |
3335 | #if ENABLE_FRILLS |
3492 | #if ENABLE_FRILLS |
3336 | if (OPTION (Opt_tripleclickwords)) |
3493 | if (option (Opt_tripleclickwords)) |
3337 | { |
3494 | { |
3338 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3495 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3339 | |
3496 | |
3340 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3497 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3341 | { |
3498 | { |
3342 | if (!ROW(end_row).is_longer ()) |
3499 | if (!ROW(end_row).is_longer ()) |
3343 | { |
3500 | { |
3344 | selection.end.row = end_row; |
3501 | selection.end.row = end_row; |
3345 | selection.end.col = ROW(end_row).l; |
3502 | selection.end.col = ROW(end_row).l; |
|
|
3503 | # if !ENABLE_MINIMAL |
3346 | selection_remove_trailing_spaces (); |
3504 | selection_remove_trailing_spaces (); |
|
|
3505 | # endif |
3347 | break; |
3506 | break; |
3348 | } |
3507 | } |
3349 | } |
3508 | } |
3350 | } |
3509 | } |
3351 | else |
3510 | else |
… | |
… | |
3367 | selection.end.row++; |
3526 | selection.end.row++; |
3368 | } |
3527 | } |
3369 | } |
3528 | } |
3370 | |
3529 | |
3371 | if (button3 && buttonpress) |
3530 | if (button3 && buttonpress) |
|
|
3531 | { |
3372 | { /* mark may need to be changed */ |
3532 | /* mark may need to be changed */ |
3373 | if (closeto == LEFT) |
3533 | if (closeto == LEFT) |
3374 | { |
3534 | { |
3375 | selection.mark.row = selection.end.row; |
3535 | selection.mark.row = selection.end.row; |
3376 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3536 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3377 | } |
3537 | } |
… | |
… | |
3380 | selection.mark.row = selection.beg.row; |
3540 | selection.mark.row = selection.beg.row; |
3381 | selection.mark.col = selection.beg.col; |
3541 | selection.mark.col = selection.beg.col; |
3382 | } |
3542 | } |
3383 | } |
3543 | } |
3384 | |
3544 | |
3385 | #if ENABLE_FRILLS |
3545 | #if !ENABLE_MINIMAL |
3386 | if (selection.rect && selection.beg.col > selection.end.col) |
3546 | if (selection.rect && selection.beg.col > selection.end.col) |
3387 | ::swap (selection.beg.col, selection.end.col); |
3547 | ::swap (selection.beg.col, selection.end.col); |
3388 | #endif |
3548 | #endif |
3389 | } |
3549 | } |
3390 | |
3550 | |
3391 | #if ENABLE_FRILLS |
3551 | #if !ENABLE_MINIMAL |
3392 | void |
3552 | void |
3393 | rxvt_term::selection_remove_trailing_spaces () |
3553 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3394 | { |
3554 | { |
3395 | int32_t end_col, end_row; |
3555 | int32_t end_col, end_row; |
3396 | text_t *stp; |
3556 | text_t *stp; |
3397 | |
3557 | |
3398 | end_col = selection.end.col; |
3558 | end_col = selection.end.col; |
… | |
… | |
3436 | /* |
3596 | /* |
3437 | * Double click on button 3 when already selected |
3597 | * Double click on button 3 when already selected |
3438 | * EXT: button 3 double click |
3598 | * EXT: button 3 double click |
3439 | */ |
3599 | */ |
3440 | void |
3600 | void |
3441 | rxvt_term::selection_rotate (int x, int y) |
3601 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3442 | { |
3602 | { |
3443 | selection.clicks = selection.clicks % 3 + 1; |
3603 | selection.clicks = selection.clicks % 3 + 1; |
3444 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3604 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3445 | } |
3605 | } |
3446 | |
3606 | |
… | |
… | |
3448 | /* |
3608 | /* |
3449 | * Respond to a request for our current selection |
3609 | * Respond to a request for our current selection |
3450 | * EXT: SelectionRequest |
3610 | * EXT: SelectionRequest |
3451 | */ |
3611 | */ |
3452 | void |
3612 | void |
3453 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3613 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3454 | { |
3614 | { |
3455 | XSelectionEvent ev; |
3615 | XSelectionEvent ev; |
3456 | dDisp; |
|
|
3457 | |
3616 | |
3458 | ev.type = SelectionNotify; |
3617 | ev.type = SelectionNotify; |
3459 | ev.property = None; |
3618 | ev.property = None; |
3460 | ev.display = rq.display; |
3619 | ev.display = rq.display; |
3461 | ev.requestor = rq.requestor; |
3620 | ev.requestor = rq.requestor; |
… | |
… | |
3475 | *target++ = xa[XA_COMPOUND_TEXT]; |
3634 | *target++ = xa[XA_COMPOUND_TEXT]; |
3476 | #if X_HAVE_UTF8_STRING |
3635 | #if X_HAVE_UTF8_STRING |
3477 | *target++ = xa[XA_UTF8_STRING]; |
3636 | *target++ = xa[XA_UTF8_STRING]; |
3478 | #endif |
3637 | #endif |
3479 | |
3638 | |
3480 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3639 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3481 | 32, PropModeReplace, |
3640 | 32, PropModeReplace, |
3482 | (unsigned char *)target_list, target - target_list); |
3641 | (unsigned char *)target_list, target - target_list); |
3483 | ev.property = rq.property; |
3642 | ev.property = rq.property; |
3484 | } |
3643 | } |
3485 | #if TODO // TODO |
3644 | #if TODO // TODO |
3486 | else if (rq.target == xa[XA_MULTIPLE]) |
3645 | else if (rq.target == xa[XA_MULTIPLE]) |
3487 | { |
3646 | { |
3488 | /* TODO: Handle MULTIPLE */ |
3647 | /* TODO: Handle MULTIPLE */ |
3489 | } |
3648 | } |
3490 | #endif |
3649 | #endif |
3491 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3650 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3492 | { |
3651 | { |
3493 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3652 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3494 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3653 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3654 | ev.property = rq.property; |
|
|
3655 | } |
|
|
3656 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3657 | { |
|
|
3658 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3659 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3495 | ev.property = rq.property; |
3660 | ev.property = rq.property; |
3496 | } |
3661 | } |
3497 | else if (rq.target == XA_STRING |
3662 | else if (rq.target == XA_STRING |
3498 | || rq.target == xa[XA_TEXT] |
3663 | || rq.target == xa[XA_TEXT] |
3499 | || rq.target == xa[XA_COMPOUND_TEXT] |
3664 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3522 | style = enc_string; |
3687 | style = enc_string; |
3523 | else if (target == xa[XA_TEXT]) |
3688 | else if (target == xa[XA_TEXT]) |
3524 | style = enc_text; |
3689 | style = enc_text; |
3525 | else if (target == xa[XA_COMPOUND_TEXT]) |
3690 | else if (target == xa[XA_COMPOUND_TEXT]) |
3526 | style = enc_compound_text; |
3691 | style = enc_compound_text; |
3527 | #if ENABLE_FRILLS |
3692 | #if !ENABLE_MINIMAL |
3528 | else if (target == xa[XA_UTF8_STRING]) |
3693 | else if (target == xa[XA_UTF8_STRING]) |
3529 | style = enc_utf8; |
3694 | style = enc_utf8; |
3530 | #endif |
3695 | #endif |
3531 | else |
3696 | else |
3532 | { |
3697 | { |
3533 | target = xa[XA_COMPOUND_TEXT]; |
3698 | target = xa[XA_COMPOUND_TEXT]; |
3534 | style = enc_compound_text; |
3699 | style = enc_compound_text; |
3535 | } |
3700 | } |
3536 | |
3701 | |
3537 | if (selection.text) |
3702 | if (rq.selection == XA_PRIMARY && selection.text) |
3538 | { |
3703 | { |
3539 | cl = selection.text; |
3704 | cl = selection.text; |
3540 | selectlen = selection.len; |
3705 | selectlen = selection.len; |
3541 | } |
3706 | } |
|
|
3707 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3708 | { |
|
|
3709 | cl = selection.clip_text; |
|
|
3710 | selectlen = selection.clip_len; |
|
|
3711 | } |
3542 | else |
3712 | else |
3543 | { |
3713 | { |
3544 | cl = L""; |
3714 | cl = L""; |
3545 | selectlen = 0; |
3715 | selectlen = 0; |
3546 | } |
3716 | } |
3547 | |
3717 | |
3548 | #if ENABLE_FRILLS |
3718 | #if !ENABLE_MINIMAL |
3549 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3719 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3550 | // so recode it manually |
3720 | // so recode it manually |
3551 | if (style == enc_utf8) |
3721 | if (style == enc_utf8) |
3552 | { |
3722 | { |
3553 | freect = 1; |
3723 | freect = 1; |
… | |
… | |
3556 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3726 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3557 | ct.nitems = strlen ((char *)ct.value); |
3727 | ct.nitems = strlen ((char *)ct.value); |
3558 | } |
3728 | } |
3559 | else |
3729 | else |
3560 | #endif |
3730 | #endif |
3561 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3731 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3562 | freect = 1; |
3732 | freect = 1; |
3563 | else |
3733 | else |
3564 | { |
3734 | { |
3565 | /* if we failed to convert then send it raw */ |
3735 | /* if we failed to convert then send it raw */ |
3566 | ct.value = (unsigned char *)cl; |
3736 | ct.value = (unsigned char *)cl; |
3567 | ct.nitems = selectlen; |
3737 | ct.nitems = selectlen; |
3568 | ct.encoding = target; |
3738 | ct.encoding = target; |
3569 | } |
3739 | } |
3570 | |
3740 | |
3571 | XChangeProperty (disp, rq.requestor, rq.property, |
3741 | XChangeProperty (dpy, rq.requestor, rq.property, |
3572 | ct.encoding, 8, PropModeReplace, |
3742 | ct.encoding, 8, PropModeReplace, |
3573 | ct.value, (int)ct.nitems); |
3743 | ct.value, (int)ct.nitems); |
3574 | ev.property = rq.property; |
3744 | ev.property = rq.property; |
3575 | |
3745 | |
3576 | if (freect) |
3746 | if (freect) |
3577 | XFree (ct.value); |
3747 | XFree (ct.value); |
3578 | } |
3748 | } |
3579 | |
3749 | |
3580 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3750 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3581 | } |
|
|
3582 | |
|
|
3583 | /* ------------------------------------------------------------------------- * |
|
|
3584 | * MOUSE ROUTINES * |
|
|
3585 | * ------------------------------------------------------------------------- */ |
|
|
3586 | |
|
|
3587 | /* |
|
|
3588 | * return col/row values corresponding to x/y pixel values |
|
|
3589 | */ |
|
|
3590 | void |
|
|
3591 | rxvt_term::pixel_position (int *x, int *y) |
|
|
3592 | { |
|
|
3593 | *x = Pixel2Col (*x); |
|
|
3594 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
|
|
3595 | *y = Pixel2Row (*y); |
|
|
3596 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
|
|
3597 | } |
3751 | } |
3598 | |
3752 | |
3599 | /* ------------------------------------------------------------------------- */ |
3753 | /* ------------------------------------------------------------------------- */ |
3600 | #ifdef USE_XIM |
3754 | #ifdef USE_XIM |
3601 | void |
3755 | void |
3602 | rxvt_term::im_set_position (XPoint &pos) |
3756 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3603 | { |
3757 | { |
3604 | XWindowAttributes xwa; |
3758 | XWindowAttributes xwa; |
3605 | |
3759 | |
3606 | XGetWindowAttributes (display->display, vt, &xwa); |
3760 | XGetWindowAttributes (dpy, vt, &xwa); |
3607 | |
3761 | |
3608 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3762 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3609 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3763 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3610 | } |
3764 | } |
3611 | #endif |
3765 | #endif |
3612 | |
3766 | |
3613 | #if ENABLE_OVERLAY |
3767 | #if ENABLE_OVERLAY |
3614 | void |
3768 | void |
3615 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3769 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW |
3616 | { |
3770 | { |
3617 | if (nrow < 1 || ncol < 1) |
3771 | if (nrow < 1 || ncol < 1) |
3618 | return; |
3772 | return; |
3619 | |
3773 | |
3620 | want_refresh = 1; |
3774 | want_refresh = 1; |
… | |
… | |
3629 | h += 2; min_it (h, nrow); |
3783 | h += 2; min_it (h, nrow); |
3630 | |
3784 | |
3631 | x -= 1; clamp_it (x, 0, ncol - w); |
3785 | x -= 1; clamp_it (x, 0, ncol - w); |
3632 | y -= 1; clamp_it (y, 0, nrow - h); |
3786 | y -= 1; clamp_it (y, 0, nrow - h); |
3633 | |
3787 | |
3634 | ov_x = x; ov_y = y; |
3788 | ov.x = x; ov.y = y; |
3635 | ov_w = w; ov_h = h; |
3789 | ov.w = w; ov.h = h; |
3636 | |
3790 | |
3637 | ov_text = new text_t *[h]; |
3791 | ov.text = new text_t *[h]; |
3638 | ov_rend = new rend_t *[h]; |
3792 | ov.rend = new rend_t *[h]; |
3639 | |
3793 | |
3640 | for (y = 0; y < h; y++) |
3794 | for (y = 0; y < h; y++) |
3641 | { |
3795 | { |
3642 | text_t *tp = ov_text[y] = new text_t[w]; |
3796 | text_t *tp = ov.text[y] = new text_t[w]; |
3643 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3797 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3644 | |
3798 | |
3645 | text_t t0, t1, t2; |
3799 | text_t t0, t1, t2; |
3646 | rend_t r = OVERLAY_RSTYLE; |
3800 | rend_t r = OVERLAY_RSTYLE; |
3647 | |
3801 | |
3648 | if (y == 0) |
3802 | if (y == 0) |
… | |
… | |
3665 | *rp = r; |
3819 | *rp = r; |
3666 | } |
3820 | } |
3667 | } |
3821 | } |
3668 | |
3822 | |
3669 | void |
3823 | void |
3670 | rxvt_term::scr_overlay_off () |
3824 | rxvt_term::scr_overlay_off () NOTHROW |
3671 | { |
3825 | { |
3672 | if (!ov_text) |
3826 | if (!ov.text) |
3673 | return; |
3827 | return; |
3674 | |
3828 | |
3675 | want_refresh = 1; |
3829 | want_refresh = 1; |
3676 | |
3830 | |
3677 | for (int y = 0; y < ov_h; y++) |
3831 | for (int y = 0; y < ov.h; y++) |
3678 | { |
3832 | { |
3679 | delete [] ov_text[y]; |
3833 | delete [] ov.text[y]; |
3680 | delete [] ov_rend[y]; |
3834 | delete [] ov.rend[y]; |
3681 | } |
3835 | } |
3682 | |
3836 | |
3683 | delete [] ov_text; ov_text = 0; |
3837 | delete [] ov.text; ov.text = 0; |
3684 | delete [] ov_rend; ov_rend = 0; |
3838 | delete [] ov.rend; ov.rend = 0; |
3685 | } |
3839 | } |
3686 | |
3840 | |
3687 | void |
3841 | void |
3688 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) |
3842 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3689 | { |
3843 | { |
3690 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3844 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3691 | return; |
3845 | return; |
3692 | |
3846 | |
3693 | x++, y++; |
3847 | x++, y++; |
3694 | |
3848 | |
3695 | ov_text[y][x] = text; |
3849 | ov.text[y][x] = text; |
3696 | ov_rend[y][x] = rend; |
3850 | ov.rend[y][x] = rend; |
3697 | } |
3851 | } |
3698 | |
3852 | |
3699 | void |
3853 | void |
3700 | rxvt_term::scr_overlay_set (int x, int y, const char *s) |
3854 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3701 | { |
3855 | { |
3702 | while (*s) |
3856 | while (*s) |
3703 | scr_overlay_set (x++, y, *s++); |
3857 | scr_overlay_set (x++, y, *s++); |
3704 | } |
3858 | } |
3705 | |
3859 | |
3706 | void |
3860 | void |
3707 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) |
3861 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3708 | { |
3862 | { |
3709 | while (*s) |
3863 | while (*s) |
3710 | { |
3864 | { |
3711 | text_t t = *s++; |
3865 | text_t t = *s++; |
3712 | int width = wcwidth (t); |
3866 | int width = WCWIDTH (t); |
3713 | |
3867 | |
3714 | while (width--) |
3868 | while (width--) |
3715 | { |
3869 | { |
3716 | scr_overlay_set (x++, y, t); |
3870 | scr_overlay_set (x++, y, t); |
3717 | t = NOCHAR; |
3871 | t = NOCHAR; |
3718 | } |
3872 | } |
3719 | } |
3873 | } |
3720 | } |
3874 | } |
3721 | |
3875 | |
3722 | void |
3876 | void |
3723 | rxvt_term::scr_swap_overlay () |
3877 | rxvt_term::scr_swap_overlay () NOTHROW |
3724 | { |
3878 | { |
3725 | if (!ov_text) |
3879 | if (!ov.text) |
3726 | return; |
3880 | return; |
3727 | |
3881 | |
|
|
3882 | // hide cursor if it is within the overlay area |
|
|
3883 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3884 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3885 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3886 | |
3728 | // swap screen mem with overlay |
3887 | // swap screen mem with overlay |
3729 | for (int y = ov_h; y--; ) |
3888 | for (int y = ov.h; y--; ) |
3730 | { |
3889 | { |
3731 | text_t *t1 = ov_text[y]; |
3890 | text_t *t1 = ov.text[y]; |
3732 | rend_t *r1 = ov_rend[y]; |
3891 | rend_t *r1 = ov.rend[y]; |
3733 | |
3892 | |
3734 | text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; |
3893 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3735 | rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; |
3894 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3736 | |
3895 | |
3737 | for (int x = ov_w; x--; ) |
3896 | for (int x = ov.w; x--; ) |
3738 | { |
3897 | { |
3739 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3898 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3740 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3899 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3741 | } |
3900 | } |
3742 | } |
3901 | } |