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