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