1 | /*---------------------------------------------------------------------------* |
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 <schmorp@schmorp.de> |
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. |
… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <inttypes.h> |
31 | #include <inttypes.h> |
32 | |
32 | |
33 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a separate compile! |
34 | |
34 | |
|
|
35 | static inline void |
35 | static inline void fill_text (text_t *start, text_t value, int len) |
36 | fill_text (text_t *start, text_t value, int len) |
36 | { |
37 | { |
37 | while (len--) |
38 | while (len--) |
38 | *start++ = value; |
39 | *start++ = value; |
39 | } |
40 | } |
40 | |
41 | |
41 | /* ------------------------------------------------------------------------- */ |
42 | /* ------------------------------------------------------------------------- */ |
42 | #define PROP_SIZE 256*1024 |
|
|
43 | #define PASTE_SIZE 32768 |
|
|
44 | #define TABSIZE 8 /* default tab size */ |
43 | #define TABSIZE 8 /* default tab size */ |
45 | |
44 | |
46 | /* ------------------------------------------------------------------------- * |
45 | /* ------------------------------------------------------------------------- * |
47 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
46 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
48 | * ------------------------------------------------------------------------- */ |
47 | * ------------------------------------------------------------------------- */ |
… | |
… | |
83 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
82 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
84 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
83 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
85 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
84 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
86 | |
85 | |
87 | /* |
86 | /* |
88 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
|
|
89 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
87 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
90 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
|
|
91 | */ |
88 | */ |
92 | #define drawBuffer vt |
|
|
93 | |
|
|
94 | #define CLEAR_ROWS(row, num) \ |
|
|
95 | if (mapped) \ |
|
|
96 | XClearArea (dpy, drawBuffer, 0, \ |
|
|
97 | Row2Pixel (row), (unsigned int)width, \ |
|
|
98 | (unsigned int)Height2Pixel (num), False) |
|
|
99 | |
|
|
100 | #define CLEAR_CHARS(x, y, num) \ |
89 | #define CLEAR_CHARS(x, y, num) \ |
101 | if (mapped) \ |
90 | if (mapped) \ |
102 | XClearArea (dpy, drawBuffer, x, y, \ |
91 | XClearArea (dpy, vt, x, y, \ |
103 | (unsigned int)Width2Pixel (num), \ |
92 | (unsigned int)Width2Pixel (num), \ |
104 | (unsigned int)Height2Pixel (1), False) |
93 | (unsigned int)Height2Pixel (1), False) |
105 | |
|
|
106 | #define ERASE_ROWS(row, num) \ |
|
|
107 | XFillRectangle (dpy, drawBuffer, gc, \ |
|
|
108 | 0, Row2Pixel (row), \ |
|
|
109 | (unsigned int)width, \ |
|
|
110 | (unsigned int)Height2Pixel (num)) |
|
|
111 | |
94 | |
112 | /* ------------------------------------------------------------------------- * |
95 | /* ------------------------------------------------------------------------- * |
113 | * SCREEN `COMMON' ROUTINES * |
96 | * SCREEN `COMMON' ROUTINES * |
114 | * ------------------------------------------------------------------------- */ |
97 | * ------------------------------------------------------------------------- */ |
115 | |
98 | |
… | |
… | |
148 | |
131 | |
149 | l.l = 0; |
132 | l.l = 0; |
150 | l.f = 0; |
133 | l.f = 0; |
151 | } |
134 | } |
152 | |
135 | |
|
|
136 | // nuke a single wide character at the given column |
|
|
137 | void |
|
|
138 | rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW |
|
|
139 | { |
|
|
140 | // find begin |
|
|
141 | while (col > 0 && l.t[col] == NOCHAR) |
|
|
142 | col--; |
|
|
143 | |
|
|
144 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
|
|
145 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
|
|
146 | |
|
|
147 | l.touch (); |
|
|
148 | |
|
|
149 | // found start, nuke |
|
|
150 | do { |
|
|
151 | l.t[col] = ' '; |
|
|
152 | l.r[col] = rend; |
|
|
153 | col++; |
|
|
154 | } while (col < ncol && l.t[col] == NOCHAR); |
|
|
155 | } |
|
|
156 | |
153 | /* ------------------------------------------------------------------------- * |
157 | /* ------------------------------------------------------------------------- * |
154 | * SCREEN INITIALISATION * |
158 | * SCREEN INITIALISATION * |
155 | * ------------------------------------------------------------------------- */ |
159 | * ------------------------------------------------------------------------- */ |
156 | |
160 | |
157 | void |
161 | void |
… | |
… | |
159 | { |
163 | { |
160 | #if ENABLE_OVERLAY |
164 | #if ENABLE_OVERLAY |
161 | scr_overlay_off (); |
165 | scr_overlay_off (); |
162 | #endif |
166 | #endif |
163 | |
167 | |
164 | rvideo_mode = false; |
|
|
165 | view_start = 0; |
168 | view_start = 0; |
166 | num_scr = 0; |
169 | num_scr = 0; |
167 | |
170 | |
168 | if (ncol == 0) |
171 | if (ncol == 0) |
169 | ncol = 80; |
172 | ncol = 80; |
… | |
… | |
171 | if (nrow == 0) |
174 | if (nrow == 0) |
172 | nrow = 24; |
175 | nrow = 24; |
173 | |
176 | |
174 | if (ncol == prev_ncol && nrow == prev_nrow) |
177 | if (ncol == prev_ncol && nrow == prev_nrow) |
175 | return; |
178 | return; |
176 | |
|
|
177 | if (current_screen != PRIMARY) |
|
|
178 | scr_swap_screen (); |
|
|
179 | |
179 | |
180 | // we need at least two lines for wrapping to work correctly |
180 | // we need at least two lines for wrapping to work correctly |
181 | while (nrow + saveLines < 2) |
181 | while (nrow + saveLines < 2) |
182 | { |
182 | { |
183 | //TODO//FIXME |
183 | //TODO//FIXME |
… | |
… | |
203 | term_start = 0; |
203 | term_start = 0; |
204 | |
204 | |
205 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
205 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
206 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
206 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
207 | |
207 | |
208 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
208 | row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t)); |
209 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
209 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
210 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
210 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
211 | |
211 | |
212 | for (int row = nrow; row--; ) |
212 | for (int row = nrow; row--; ) |
213 | { |
213 | { |
… | |
… | |
236 | selection.text = NULL; |
236 | selection.text = NULL; |
237 | selection.len = 0; |
237 | selection.len = 0; |
238 | selection.op = SELECTION_CLEAR; |
238 | selection.op = SELECTION_CLEAR; |
239 | selection.screen = PRIMARY; |
239 | selection.screen = PRIMARY; |
240 | selection.clicks = 0; |
240 | selection.clicks = 0; |
|
|
241 | selection.clip_text = NULL; |
|
|
242 | selection.clip_len = 0; |
241 | } |
243 | } |
242 | else |
244 | else |
243 | { |
245 | { |
244 | /* |
246 | /* |
245 | * add or delete rows as appropriate |
247 | * add or delete rows as appropriate |
… | |
… | |
273 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
275 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
274 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
276 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
275 | } |
277 | } |
276 | |
278 | |
277 | line_t *old_buf = row_buf; |
279 | line_t *old_buf = row_buf; |
278 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
280 | row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
279 | |
281 | |
280 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
282 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
281 | int pend = MOD (term_start + top_row , prev_total_rows); |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
282 | int q = total_rows; // rewrapped row |
284 | int q = total_rows; // rewrapped row |
283 | |
285 | |
284 | if (top_row) |
286 | if (top_row) |
285 | { |
287 | { |
286 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
288 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
287 | // to come up with a lean and mean algorithm. |
289 | // to come up with a lean and mean algorithm. |
|
|
290 | // TODO: maybe optimise when width didn't change |
288 | |
291 | |
289 | row_col_t ocur = screen.cur; |
292 | row_col_t ocur = screen.cur; |
290 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
293 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
291 | |
294 | |
292 | do |
295 | do |
293 | { |
296 | { |
294 | p = MOD (p - 1, prev_total_rows); |
297 | p = MOD (p - 1, prev_total_rows); |
295 | #ifdef DEBUG_STRICT |
|
|
296 | assert (old_buf [MOD (p, prev_total_rows)].t); |
298 | assert (old_buf [MOD (p, prev_total_rows)].t); |
297 | #endif |
|
|
298 | int plines = 1; |
299 | int plines = 1; |
299 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
300 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
300 | |
301 | |
301 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
302 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
302 | { |
303 | { |
… | |
… | |
328 | int qcol = 0; |
329 | int qcol = 0; |
329 | |
330 | |
330 | // see below for cursor adjustment rationale |
331 | // see below for cursor adjustment rationale |
331 | if (p == ocur.row) |
332 | if (p == ocur.row) |
332 | screen.cur.row = q - (total_rows - nrow); |
333 | screen.cur.row = q - (total_rows - nrow); |
333 | |
334 | |
334 | // fill a single destination line |
335 | // fill a single destination line |
335 | while (lofs < llen && qcol < ncol) |
336 | while (lofs < llen && qcol < ncol) |
336 | { |
337 | { |
337 | int prow = lofs / prev_ncol; |
338 | int prow = lofs / prev_ncol; |
338 | int pcol = lofs % prev_ncol; |
339 | int pcol = lofs % prev_ncol; |
… | |
… | |
364 | } |
365 | } |
365 | while (p != pend && q > 0); |
366 | while (p != pend && q > 0); |
366 | |
367 | |
367 | term_start = total_rows - nrow; |
368 | term_start = total_rows - nrow; |
368 | top_row = q - term_start; |
369 | top_row = q - term_start; |
369 | |
370 | |
370 | // make sure all terminal lines exist |
371 | // make sure all terminal lines exist |
371 | while (top_row > 0) |
372 | while (top_row > 0) |
372 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
373 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
373 | } |
374 | } |
374 | else |
375 | else |
375 | { |
376 | { |
376 | // if no scrollback exists (yet), wing, instead of wrap |
377 | // if no scrollback exists (yet), wing, instead of wrap |
377 | |
378 | |
378 | for (int row = min (nrow, prev_nrow); row--; ) |
379 | for (int row = min (nrow, prev_nrow); row--; ) |
379 | { |
380 | { |
380 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
381 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
381 | line_t &qline = row_buf [row]; |
382 | line_t &qline = row_buf [row]; |
382 | |
383 | |
… | |
… | |
396 | delete old_ta; |
397 | delete old_ta; |
397 | delete old_ra; |
398 | delete old_ra; |
398 | |
399 | |
399 | clamp_it (screen.cur.row, 0, nrow - 1); |
400 | clamp_it (screen.cur.row, 0, nrow - 1); |
400 | clamp_it (screen.cur.col, 0, ncol - 1); |
401 | clamp_it (screen.cur.col, 0, ncol - 1); |
|
|
402 | } |
401 | |
403 | |
402 | free (tabs); |
404 | free (tabs); |
403 | } |
405 | tabs = (char *)rxvt_malloc (ncol); |
|
|
406 | |
|
|
407 | for (int col = ncol; col--; ) |
|
|
408 | tabs [col] = col % TABSIZE == 0; |
404 | |
409 | |
405 | CLEAR_ALL_SELECTION (); |
410 | CLEAR_ALL_SELECTION (); |
406 | |
411 | |
407 | prev_nrow = nrow; |
412 | prev_nrow = nrow; |
408 | prev_ncol = ncol; |
413 | prev_ncol = ncol; |
409 | |
|
|
410 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
|
|
411 | |
|
|
412 | for (int col = ncol; --col; ) |
|
|
413 | tabs [col] = col % TABSIZE == 0; |
|
|
414 | |
|
|
415 | if (current_screen != PRIMARY) |
|
|
416 | scr_swap_screen (); |
|
|
417 | |
414 | |
418 | tt_winch (); |
415 | tt_winch (); |
419 | |
416 | |
420 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
417 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
421 | } |
418 | } |
… | |
… | |
433 | delete ralloc; ralloc = 0; |
430 | delete ralloc; ralloc = 0; |
434 | |
431 | |
435 | free (row_buf); |
432 | free (row_buf); |
436 | free (swap_buf); |
433 | free (swap_buf); |
437 | free (drawn_buf); |
434 | free (drawn_buf); |
|
|
435 | row_buf = 0; // signal that we freed all the arrays above |
|
|
436 | |
438 | free (tabs); |
437 | free (tabs); |
439 | |
438 | tabs = 0; |
440 | row_buf = 0; // signal that we freed all the arrays |
|
|
441 | } |
439 | } |
442 | } |
440 | } |
443 | |
441 | |
444 | /* ------------------------------------------------------------------------- */ |
442 | /* ------------------------------------------------------------------------- */ |
445 | /* |
443 | /* |
446 | * Hard reset |
444 | * Hard/Soft reset |
447 | */ |
445 | */ |
448 | void |
446 | void |
449 | rxvt_term::scr_poweron () |
447 | rxvt_term::scr_poweron () |
450 | { |
448 | { |
451 | scr_release (); |
449 | scr_release (); |
452 | prev_nrow = prev_ncol = 0; |
450 | prev_nrow = prev_ncol = 0; |
|
|
451 | rvideo_mode = false; |
|
|
452 | scr_soft_reset (); |
453 | scr_reset (); |
453 | scr_reset (); |
454 | |
454 | |
455 | scr_clear (true); |
455 | scr_clear (true); |
456 | scr_refresh (); |
456 | scr_refresh (); |
|
|
457 | } |
|
|
458 | |
|
|
459 | void |
|
|
460 | rxvt_term::scr_soft_reset () |
|
|
461 | { |
|
|
462 | /* only affects modes, nothing drastic such as clearing the screen */ |
|
|
463 | #if ENABLE_OVERLAY |
|
|
464 | scr_overlay_off (); |
|
|
465 | #endif |
|
|
466 | |
|
|
467 | if (current_screen != PRIMARY) |
|
|
468 | scr_swap_screen (); |
|
|
469 | |
|
|
470 | scr_scroll_region (0, MAX_ROWS - 1); |
|
|
471 | scr_rendition (0, ~RS_None); |
|
|
472 | scr_insert_mode (0); |
457 | } |
473 | } |
458 | |
474 | |
459 | /* ------------------------------------------------------------------------- * |
475 | /* ------------------------------------------------------------------------- * |
460 | * PROCESS SCREEN COMMANDS * |
476 | * PROCESS SCREEN COMMANDS * |
461 | * ------------------------------------------------------------------------- */ |
477 | * ------------------------------------------------------------------------- */ |
… | |
… | |
499 | } |
515 | } |
500 | |
516 | |
501 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
517 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
502 | min_it (s->cur.row, nrow - 1); |
518 | min_it (s->cur.row, nrow - 1); |
503 | min_it (s->cur.col, ncol - 1); |
519 | min_it (s->cur.col, ncol - 1); |
504 | #ifdef DEBUG_STRICT |
|
|
505 | assert (s->cur.row >= 0); |
520 | assert (s->cur.row >= 0); |
506 | assert (s->cur.col >= 0); |
521 | assert (s->cur.col >= 0); |
507 | #endif |
|
|
508 | } |
522 | } |
509 | |
523 | |
510 | void |
524 | void |
511 | rxvt_term::scr_swap_screen () |
525 | rxvt_term::scr_swap_screen () |
512 | { |
526 | { |
… | |
… | |
537 | want_refresh = 1; |
551 | want_refresh = 1; |
538 | view_start = 0; |
552 | view_start = 0; |
539 | |
553 | |
540 | selection_check (2); /* check for boundary cross */ |
554 | selection_check (2); /* check for boundary cross */ |
541 | |
555 | |
542 | int i = current_screen; current_screen = scrn; scrn = i; |
556 | current_screen = scrn; |
543 | |
557 | |
544 | #if NSCREENS |
558 | #if NSCREENS |
545 | if (option (Opt_secondaryScreen)) |
559 | if (option (Opt_secondaryScreen)) |
546 | { |
560 | { |
547 | num_scr = 0; |
561 | num_scr = 0; |
… | |
… | |
596 | /* |
610 | /* |
597 | * Change the rendition style for following text |
611 | * Change the rendition style for following text |
598 | */ |
612 | */ |
599 | void |
613 | void |
600 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
614 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
601 | { |
615 | { |
602 | if (set) |
616 | if (set) |
603 | rstyle |= style; |
617 | rstyle |= style; |
604 | else if (style == ~RS_None) |
618 | else if (style == ~RS_None) |
605 | rstyle = DEFAULT_RSTYLE; |
619 | rstyle = DEFAULT_RSTYLE; |
606 | else |
620 | else |
607 | rstyle &= ~style; |
621 | rstyle &= ~style; |
608 | } |
622 | } |
609 | |
623 | |
610 | /* ------------------------------------------------------------------------- */ |
624 | /* ------------------------------------------------------------------------- */ |
611 | /* |
625 | /* |
612 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
626 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
613 | * count positive ==> scroll up |
627 | * count positive ==> scroll up |
… | |
… | |
624 | |
638 | |
625 | if (count > 0 |
639 | if (count > 0 |
626 | && row1 == 0 |
640 | && row1 == 0 |
627 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
641 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
628 | { |
642 | { |
|
|
643 | min_it (count, total_rows - (nrow - (row2 + 1))); |
|
|
644 | |
629 | top_row = max (top_row - count, -saveLines); |
645 | top_row = max (top_row - count, -saveLines); |
630 | |
|
|
631 | // scroll everything up 'count' lines |
|
|
632 | term_start = (term_start + count) % total_rows; |
|
|
633 | |
646 | |
634 | // sever bottommost line |
647 | // sever bottommost line |
635 | { |
648 | { |
636 | line_t &l = ROW(row2 - count); |
649 | line_t &l = ROW(row2); |
637 | l.is_longer (0); |
650 | l.is_longer (0); |
638 | l.touch (); |
651 | l.touch (); |
639 | } |
652 | } |
640 | |
653 | |
|
|
654 | // scroll everything up 'count' lines |
|
|
655 | term_start = (term_start + count) % total_rows; |
|
|
656 | |
|
|
657 | // now copy lines below the scroll region bottom to the |
|
|
658 | // bottom of the screen again, so they look as if they |
|
|
659 | // hadn't moved. |
|
|
660 | for (int i = nrow; --i > row2; ) |
|
|
661 | { |
|
|
662 | line_t &l1 = ROW(i - count); |
|
|
663 | line_t &l2 = ROW(i); |
|
|
664 | |
|
|
665 | ::swap (l1, l2); |
|
|
666 | l2.touch (); |
|
|
667 | } |
|
|
668 | |
641 | // erase newly scrolled-in lines |
669 | // erase newly scrolled-in lines |
642 | for (int i = count; i--; ) |
670 | for (int i = count; i--; ) |
643 | { |
671 | { |
644 | line_t &l = ROW(nrow - 1 - i); |
672 | line_t &l = ROW(row2 - i); |
645 | |
673 | |
646 | // optimize if already cleared, can be significant on slow machines |
674 | // optimise if already cleared, can be significant on slow machines |
647 | // could be rolled into scr_blank_screen_mem |
675 | // could be rolled into scr_blank_screen_mem |
648 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
676 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
649 | { |
677 | { |
650 | scr_blank_line (l, 0, l.l, rstyle); |
678 | scr_blank_line (l, 0, l.l, rstyle); |
651 | l.l = 0; |
679 | l.l = 0; |
… | |
… | |
653 | } |
681 | } |
654 | else |
682 | else |
655 | scr_blank_screen_mem (l, rstyle); |
683 | scr_blank_screen_mem (l, rstyle); |
656 | } |
684 | } |
657 | |
685 | |
658 | // now copy lines below the scroll region bottom to the |
|
|
659 | // bottom of the screen again, so they look as if they |
|
|
660 | // hadn't moved. |
|
|
661 | for (int i = nrow; --i > row2; ) |
|
|
662 | { |
|
|
663 | line_t &l1 = ROW(i - count); |
|
|
664 | line_t &l2 = ROW(i); |
|
|
665 | |
|
|
666 | ::swap (l1, l2); |
|
|
667 | l2.touch (); |
|
|
668 | } |
|
|
669 | |
|
|
670 | // move and/or clear selection, if any |
686 | // move and/or clear selection, if any |
671 | if (selection.op && current_screen == selection.screen) |
687 | if (selection.op && current_screen == selection.screen |
|
|
688 | && selection.beg.row <= row2) |
672 | { |
689 | { |
673 | selection.beg.row -= count; |
690 | selection.beg.row -= count; |
674 | selection.end.row -= count; |
691 | selection.end.row -= count; |
675 | selection.mark.row -= count; |
692 | selection.mark.row -= count; |
676 | |
693 | |
677 | if (selection.beg.row < top_row |
694 | selection_check (0); |
678 | || selection.end.row < top_row |
|
|
679 | || selection.mark.row < top_row) |
|
|
680 | { |
|
|
681 | CLEAR_ALL_SELECTION (); |
|
|
682 | selection.op = SELECTION_CLEAR; |
|
|
683 | } |
|
|
684 | } |
695 | } |
685 | |
696 | |
686 | // finally move the view window, if desired |
697 | // finally move the view window, if desired |
687 | if (option (Opt_scrollWithBuffer) |
698 | if (option (Opt_scrollWithBuffer) |
688 | && view_start != 0 |
699 | && view_start != 0 |
… | |
… | |
710 | { |
721 | { |
711 | /* move selected region too */ |
722 | /* move selected region too */ |
712 | selection.beg.row -= count; |
723 | selection.beg.row -= count; |
713 | selection.end.row -= count; |
724 | selection.end.row -= count; |
714 | selection.mark.row -= count; |
725 | selection.mark.row -= count; |
715 | |
726 | |
716 | selection_check (0); |
727 | selection_check (0); |
717 | } |
728 | } |
718 | } |
729 | } |
719 | |
730 | |
720 | // use a simple and robust scrolling algorithm, this |
731 | // use a simple and robust scrolling algorithm, this |
721 | // part of scr_scroll_text is not time-critical. |
732 | // part of scr_scroll_text is not time-critical. |
722 | |
733 | |
|
|
734 | // sever line above scroll region |
|
|
735 | if (row1) |
|
|
736 | { |
|
|
737 | line_t &l = ROW(row1 - 1); |
|
|
738 | l.is_longer (0); |
|
|
739 | l.touch (); |
|
|
740 | } |
|
|
741 | |
723 | int rows = row2 - row1 + 1; |
742 | int rows = row2 - row1 + 1; |
724 | |
743 | |
725 | min_it (count, rows); |
744 | min_it (count, rows); |
726 | |
745 | |
727 | line_t *temp_buf = row_buf + total_rows; |
746 | line_t *temp_buf = rxvt_temp_buf<line_t> (rows); |
728 | |
747 | |
729 | for (int row = 0; row < rows; row++) |
748 | for (int row = 0; row < rows; row++) |
730 | { |
749 | { |
731 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
750 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
732 | |
751 | |
… | |
… | |
734 | scr_blank_screen_mem (temp_buf [row], rstyle); |
753 | scr_blank_screen_mem (temp_buf [row], rstyle); |
735 | } |
754 | } |
736 | |
755 | |
737 | for (int row = 0; row < rows; row++) |
756 | for (int row = 0; row < rows; row++) |
738 | ROW(row1 + row) = temp_buf [row]; |
757 | ROW(row1 + row) = temp_buf [row]; |
|
|
758 | |
|
|
759 | // sever bottommost line |
|
|
760 | { |
|
|
761 | line_t &l = ROW(row2); |
|
|
762 | l.is_longer (0); |
|
|
763 | l.touch (); |
|
|
764 | } |
739 | } |
765 | } |
740 | |
766 | |
741 | return count; |
767 | return count; |
742 | } |
768 | } |
743 | |
769 | |
… | |
… | |
749 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
775 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
750 | { |
776 | { |
751 | if (len <= 0) /* sanity */ |
777 | if (len <= 0) /* sanity */ |
752 | return; |
778 | return; |
753 | |
779 | |
754 | unsigned char checksel; |
780 | bool checksel; |
755 | unicode_t c; |
781 | unicode_t c; |
756 | int ncol = this->ncol; |
782 | int ncol = this->ncol; |
757 | const wchar_t *strend = str + len; |
783 | const wchar_t *strend = str + len; |
758 | |
784 | |
759 | want_refresh = 1; |
785 | want_refresh = 1; |
… | |
… | |
772 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
798 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
773 | screen.cur.row -= minlines; |
799 | screen.cur.row -= minlines; |
774 | } |
800 | } |
775 | } |
801 | } |
776 | |
802 | |
777 | #ifdef DEBUG_STRICT |
|
|
778 | assert (screen.cur.col < ncol); |
803 | assert (screen.cur.col < ncol); |
779 | assert (screen.cur.row < nrow |
804 | assert (screen.cur.row < nrow |
780 | && screen.cur.row >= top_row); |
805 | && screen.cur.row >= top_row); |
781 | #endif |
|
|
782 | int row = screen.cur.row; |
806 | int row = screen.cur.row; |
783 | |
807 | |
784 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
808 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
785 | |
809 | |
786 | line_t *line = &ROW(row); |
810 | line_t *line = &ROW(row); |
787 | |
811 | |
788 | while (str < strend) |
812 | while (str < strend) |
789 | { |
813 | { |
790 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
814 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
791 | |
815 | |
792 | if (c < 0x20) |
816 | if (ecb_unlikely (c < 0x20)) |
793 | if (c == C0_LF) |
817 | if (c == C0_LF) |
794 | { |
818 | { |
795 | max_it (line->l, screen.cur.col); |
819 | max_it (line->l, screen.cur.col); |
796 | |
820 | |
797 | screen.flags &= ~Screen_WrapNext; |
821 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
816 | { |
840 | { |
817 | scr_tab (1, true); |
841 | scr_tab (1, true); |
818 | continue; |
842 | continue; |
819 | } |
843 | } |
820 | |
844 | |
|
|
845 | if (ecb_unlikely ( |
821 | if (checksel /* see if we're writing within selection */ |
846 | checksel /* see if we're writing within selection */ |
822 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
847 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
823 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
848 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
849 | )) |
824 | { |
850 | { |
825 | checksel = 0; |
851 | checksel = 0; |
826 | /* |
852 | /* |
827 | * If we wrote anywhere in the selected area, kill the selection |
853 | * If we wrote anywhere in the selected area, kill the selection |
828 | * XXX: should we kill the mark too? Possibly, but maybe that |
854 | * XXX: should we kill the mark too? Possibly, but maybe that |
829 | * should be a similar check. |
855 | * should be a similar check. |
830 | */ |
856 | */ |
831 | CLEAR_SELECTION (); |
857 | CLEAR_SELECTION (); |
832 | } |
858 | } |
833 | |
859 | |
834 | if (screen.flags & Screen_WrapNext) |
860 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
835 | { |
861 | { |
836 | scr_do_wrap (); |
862 | scr_do_wrap (); |
837 | |
863 | |
838 | line->l = ncol; |
864 | line->l = ncol; |
839 | line->is_longer (1); |
865 | line->is_longer (1); |
840 | |
866 | |
841 | row = screen.cur.row; |
867 | row = screen.cur.row; |
842 | line = &ROW(row); /* _must_ refresh */ |
868 | line = &ROW(row); /* _must_ refresh */ |
843 | } |
869 | } |
844 | |
870 | |
845 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
871 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
846 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
872 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
847 | c = 0xfffd; |
873 | c = 0xfffd; |
848 | |
874 | |
849 | // rely on wcwidth to tell us the character width, do wcwidth before |
875 | // rely on wcwidth to tell us the character width, do wcwidth before |
850 | // further replacements, as wcwidth might return -1 for the line |
876 | // further replacements, as wcwidth might return -1 for the line |
851 | // drawing characters below as they might be invalid in the current |
877 | // drawing characters below as they might be invalid in the current |
852 | // locale. |
878 | // locale. |
853 | int width = WCWIDTH (c); |
879 | int width = WCWIDTH (c); |
854 | |
880 | |
855 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
881 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
856 | { |
882 | { |
857 | // vt100 special graphics and line drawing |
883 | // vt100 special graphics and line drawing |
858 | // 5f-7e standard vt100 |
884 | // 5f-7e standard vt100 |
859 | // 40-5e rxvt extension for extra curses acs chars |
885 | // 40-5e rxvt extension for extra curses acs chars |
860 | static uint16_t vt100_0[62] = { // 41 .. 7e |
886 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
873 | c = vt100_0[c - 0x41]; |
899 | c = vt100_0[c - 0x41]; |
874 | width = 1; // vt100 line drawing characters are always single-width |
900 | width = 1; // vt100 line drawing characters are always single-width |
875 | } |
901 | } |
876 | } |
902 | } |
877 | |
903 | |
878 | if (screen.flags & Screen_Insert) |
904 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
879 | scr_insdel_chars (width, INSERT); |
905 | scr_insdel_chars (width, INSERT); |
880 | |
906 | |
881 | if (width != 0) |
907 | if (width != 0) |
882 | { |
908 | { |
883 | #if !UNICODE_3 |
909 | #if !UNICODE_3 |
… | |
… | |
888 | # else |
914 | # else |
889 | c = 0xfffd; |
915 | c = 0xfffd; |
890 | # endif |
916 | # endif |
891 | #endif |
917 | #endif |
892 | |
918 | |
|
|
919 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
920 | |
|
|
921 | // if the character doesn't fit into the remaining columns... |
|
|
922 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
|
|
923 | { |
|
|
924 | if (screen.flags & Screen_Autowrap) |
|
|
925 | { |
|
|
926 | // ... artificially enlargen the previous one |
|
|
927 | c = NOCHAR; |
|
|
928 | // and try the same character next loop iteration |
|
|
929 | --str; |
|
|
930 | } |
|
|
931 | else |
|
|
932 | screen.cur.col = ncol - width; |
|
|
933 | } |
|
|
934 | |
893 | // nuke the character at this position, if required |
935 | // nuke the character at this position, if required |
|
|
936 | // due to wonderful coincidences everywhere else in this loop |
|
|
937 | // we never have to check for overwriting a wide char itself, |
|
|
938 | // only its tail. |
894 | if (line->t[screen.cur.col] == NOCHAR |
939 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
895 | || (screen.cur.col < ncol - 1 |
940 | scr_kill_char (*line, screen.cur.col); |
896 | && line->t[screen.cur.col + 1] == NOCHAR)) |
|
|
897 | { |
|
|
898 | int col = screen.cur.col; |
|
|
899 | |
|
|
900 | // find begin |
|
|
901 | while (col > 0 && line->t[col] == NOCHAR) |
|
|
902 | col--; |
|
|
903 | |
|
|
904 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
|
|
905 | |
|
|
906 | // found begin, nuke |
|
|
907 | do { |
|
|
908 | line->t[col] = ' '; |
|
|
909 | line->r[col] = rend; |
|
|
910 | col++; |
|
|
911 | } while (col < ncol && line->t[col] == NOCHAR); |
|
|
912 | } |
|
|
913 | |
|
|
914 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
915 | |
|
|
916 | // if the character doesn't fit into the remaining columns... |
|
|
917 | if (screen.cur.col > ncol - width && ncol >= width) |
|
|
918 | { |
|
|
919 | // ...output spaces |
|
|
920 | c = ' '; |
|
|
921 | // and try the same character next loop iteration |
|
|
922 | --str; |
|
|
923 | } |
|
|
924 | |
941 | |
925 | line->touch (); |
942 | line->touch (); |
926 | |
943 | |
927 | do |
944 | do |
928 | { |
945 | { |
929 | line->t[screen.cur.col] = c; |
946 | line->t[screen.cur.col] = c; |
930 | line->r[screen.cur.col] = rend; |
947 | line->r[screen.cur.col] = rend; |
931 | |
948 | |
932 | if (screen.cur.col < ncol - 1) |
949 | if (ecb_likely (screen.cur.col < ncol - 1)) |
933 | screen.cur.col++; |
950 | screen.cur.col++; |
934 | else |
951 | else |
935 | { |
952 | { |
936 | line->l = ncol; |
953 | line->l = ncol; |
937 | if (screen.flags & Screen_Autowrap) |
954 | if (screen.flags & Screen_Autowrap) |
938 | screen.flags |= Screen_WrapNext; |
955 | screen.flags |= Screen_WrapNext; |
939 | break; |
956 | |
|
|
957 | goto end_of_line; |
940 | } |
958 | } |
941 | |
959 | |
942 | c = NOCHAR; |
960 | c = NOCHAR; |
943 | } |
961 | } |
944 | while (--width > 0); |
962 | while (ecb_unlikely (--width > 0)); |
945 | |
963 | |
946 | // pad with spaces when overwriting wide character with smaller one |
964 | // pad with spaces when overwriting wide character with smaller one |
947 | if (!width) |
965 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
948 | { |
966 | { |
949 | line->touch (); |
967 | line->t[c] = ' '; |
|
|
968 | line->r[c] = rend; |
|
|
969 | } |
950 | |
970 | |
951 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
971 | end_of_line: |
|
|
972 | ; |
|
|
973 | } |
|
|
974 | #if ENABLE_COMBINING |
|
|
975 | else // width == 0 |
|
|
976 | { |
|
|
977 | if (c != 0xfeff) // ignore BOM |
|
|
978 | { |
|
|
979 | // handle combining characters |
|
|
980 | // we just tag the accent on the previous on-screen character. |
|
|
981 | // this is arguably not correct, but also arguably not wrong. |
|
|
982 | // we don't handle double-width characters nicely yet. |
|
|
983 | line_t *linep; |
|
|
984 | text_t *tp; |
|
|
985 | rend_t *rp; |
|
|
986 | |
|
|
987 | if (screen.cur.col > 0) |
952 | { |
988 | { |
953 | line->t[c] = ' '; |
|
|
954 | line->r[c] = rend; |
989 | linep = line; |
|
|
990 | tp = line->t + screen.cur.col - 1; |
|
|
991 | rp = line->r + screen.cur.col - 1; |
955 | } |
992 | } |
|
|
993 | else if (screen.cur.row > 0 |
|
|
994 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
995 | { |
|
|
996 | linep = &ROW(screen.cur.row - 1); |
|
|
997 | tp = line->t + ncol - 1; |
|
|
998 | rp = line->r + ncol - 1; |
|
|
999 | } |
|
|
1000 | else |
|
|
1001 | continue; |
|
|
1002 | |
|
|
1003 | linep->touch (); |
|
|
1004 | |
|
|
1005 | while (*tp == NOCHAR && tp > linep->t) |
|
|
1006 | tp--, rp--; |
|
|
1007 | |
|
|
1008 | // first try to find a precomposed character |
|
|
1009 | unicode_t n = rxvt_compose (*tp, c); |
|
|
1010 | if (n == NOCHAR) |
|
|
1011 | n = rxvt_composite.compose (*tp, c); |
|
|
1012 | |
|
|
1013 | *tp = n; |
|
|
1014 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
956 | } |
1015 | } |
957 | } |
1016 | } |
958 | else // width == 0 |
|
|
959 | { |
|
|
960 | #if ENABLE_COMBINING |
|
|
961 | // handle combining characters |
|
|
962 | // we just tag the accent on the previous on-screen character. |
|
|
963 | // this is arguably not correct, but also arguably not wrong. |
|
|
964 | // we don't handle double-width characters nicely yet. |
|
|
965 | line_t *linep; |
|
|
966 | text_t *tp; |
|
|
967 | rend_t *rp; |
|
|
968 | |
|
|
969 | if (screen.cur.col > 0) |
|
|
970 | { |
|
|
971 | linep = line; |
|
|
972 | tp = line->t + screen.cur.col - 1; |
|
|
973 | rp = line->r + screen.cur.col - 1; |
|
|
974 | } |
|
|
975 | else if (screen.cur.row > 0 |
|
|
976 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
977 | { |
|
|
978 | linep = &ROW(screen.cur.row - 1); |
|
|
979 | tp = line->t + ncol - 1; |
|
|
980 | rp = line->r + ncol - 1; |
|
|
981 | } |
|
|
982 | else |
|
|
983 | continue; |
|
|
984 | |
|
|
985 | linep->touch (); |
|
|
986 | |
|
|
987 | while (*tp == NOCHAR && tp > linep->t) |
|
|
988 | tp--, rp--; |
|
|
989 | |
|
|
990 | // first try to find a precomposed character |
|
|
991 | unicode_t n = rxvt_compose (*tp, c); |
|
|
992 | if (n == NOCHAR) |
|
|
993 | n = rxvt_composite.compose (*tp, c); |
|
|
994 | |
|
|
995 | *tp = n; |
|
|
996 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
|
|
997 | #endif |
1017 | #endif |
998 | } |
|
|
999 | } |
1018 | } |
1000 | |
1019 | |
1001 | max_it (line->l, screen.cur.col); |
1020 | max_it (line->l, screen.cur.col); |
1002 | |
1021 | |
1003 | #ifdef DEBUG_STRICT |
|
|
1004 | assert (screen.cur.row >= 0); |
1022 | assert (screen.cur.row >= 0); |
1005 | #endif |
|
|
1006 | } |
1023 | } |
1007 | |
1024 | |
1008 | /* ------------------------------------------------------------------------- */ |
1025 | /* ------------------------------------------------------------------------- */ |
1009 | /* |
1026 | /* |
1010 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1027 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1011 | * XTERM_SEQ: CTRL-H |
1028 | * XTERM_SEQ: CTRL-H |
1012 | */ |
1029 | */ |
1013 | void |
1030 | void |
1014 | rxvt_term::scr_backspace () NOTHROW |
1031 | rxvt_term::scr_backspace () NOTHROW |
1015 | { |
1032 | { |
1016 | want_refresh = 1; |
|
|
1017 | |
|
|
1018 | if (screen.cur.col == 0) |
1033 | if (screen.cur.col == 0) |
1019 | { |
1034 | { |
1020 | if (screen.cur.row > 0) |
1035 | if (screen.cur.row > 0) |
1021 | { |
1036 | { |
1022 | #ifdef TERMCAP_HAS_BW |
1037 | #ifdef TERMCAP_HAS_BW |
1023 | screen.cur.col = ncol - 1; |
1038 | screen.cur.col = ncol - 1; |
1024 | screen.cur.row--; |
1039 | --screen.cur.row; |
1025 | return; |
1040 | |
|
|
1041 | want_refresh = 1; |
1026 | #endif |
1042 | #endif |
1027 | } |
1043 | } |
1028 | } |
1044 | } |
1029 | else if (!(screen.flags & Screen_WrapNext)) |
1045 | else if (screen.flags & Screen_WrapNext) |
|
|
1046 | screen.flags &= ~Screen_WrapNext; |
|
|
1047 | else |
1030 | scr_gotorc (0, -1, RELATIVE); |
1048 | scr_gotorc (0, -1, RELATIVE); |
1031 | |
|
|
1032 | screen.flags &= ~Screen_WrapNext; |
|
|
1033 | } |
1049 | } |
1034 | |
1050 | |
1035 | /* ------------------------------------------------------------------------- */ |
1051 | /* ------------------------------------------------------------------------- */ |
1036 | /* |
1052 | /* |
1037 | * Process Horizontal Tab |
1053 | * Process Horizontal Tab |
… | |
… | |
1060 | x = i; |
1076 | x = i; |
1061 | |
1077 | |
1062 | if (!--count) |
1078 | if (!--count) |
1063 | break; |
1079 | break; |
1064 | } |
1080 | } |
1065 | else |
1081 | else |
1066 | ht &= l.t[i] == ' ' |
1082 | ht &= l.t[i] == ' ' |
1067 | && RS_SAME (l.r[i], base_rend); |
1083 | && RS_SAME (l.r[i], base_rend); |
1068 | |
1084 | |
1069 | if (count) |
1085 | if (count) |
1070 | x = ncol - 1; |
1086 | x = ncol - 1; |
… | |
… | |
1186 | } |
1202 | } |
1187 | } |
1203 | } |
1188 | else |
1204 | else |
1189 | { |
1205 | { |
1190 | if (screen.flags & Screen_Relative) |
1206 | if (screen.flags & Screen_Relative) |
|
|
1207 | { |
1191 | { /* relative origin mode */ |
1208 | /* relative origin mode */ |
1192 | screen.cur.row = row + screen.tscroll; |
1209 | screen.cur.row = row + screen.tscroll; |
1193 | min_it (screen.cur.row, screen.bscroll); |
1210 | min_it (screen.cur.row, screen.bscroll); |
1194 | } |
1211 | } |
1195 | else |
1212 | else |
1196 | screen.cur.row = row; |
1213 | screen.cur.row = row; |
… | |
… | |
1229 | /* |
1246 | /* |
1230 | * Erase part or whole of a line |
1247 | * Erase part or whole of a line |
1231 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1248 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1232 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1249 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1233 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1250 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
|
|
1251 | * extension: clear to right unless wrapped: ESC [ 3 K |
1234 | */ |
1252 | */ |
1235 | void |
1253 | void |
1236 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1254 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1237 | { |
1255 | { |
1238 | unsigned int col, num; |
1256 | unsigned int col, num; |
… | |
… | |
1247 | line.touch (); |
1265 | line.touch (); |
1248 | line.is_longer (0); |
1266 | line.is_longer (0); |
1249 | |
1267 | |
1250 | switch (mode) |
1268 | switch (mode) |
1251 | { |
1269 | { |
|
|
1270 | case 3: |
|
|
1271 | if (screen.flags & Screen_WrapNext) |
|
|
1272 | return; |
|
|
1273 | |
|
|
1274 | /* fall through */ |
|
|
1275 | |
1252 | case 0: /* erase to end of line */ |
1276 | case 0: /* erase to end of line */ |
1253 | col = screen.cur.col; |
1277 | col = screen.cur.col; |
1254 | num = ncol - col; |
1278 | num = ncol - col; |
1255 | min_it (line.l, col); |
1279 | min_it (line.l, col); |
|
|
1280 | |
1256 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1281 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1257 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1282 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1258 | CLEAR_SELECTION (); |
1283 | CLEAR_SELECTION (); |
1259 | break; |
1284 | break; |
|
|
1285 | |
1260 | case 1: /* erase to beginning of line */ |
1286 | case 1: /* erase to beginning of line */ |
1261 | col = 0; |
1287 | col = 0; |
1262 | num = screen.cur.col + 1; |
1288 | num = screen.cur.col + 1; |
|
|
1289 | |
1263 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1290 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1264 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1291 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1265 | CLEAR_SELECTION (); |
1292 | CLEAR_SELECTION (); |
1266 | break; |
1293 | break; |
|
|
1294 | |
1267 | case 2: /* erase whole line */ |
1295 | case 2: /* erase whole line */ |
1268 | col = 0; |
1296 | col = 0; |
1269 | num = ncol; |
1297 | num = ncol; |
1270 | line.l = 0; |
1298 | line.l = 0; |
1271 | if (selection.beg.row <= screen.cur.row |
1299 | if (selection.beg.row <= screen.cur.row |
… | |
… | |
1298 | ZERO_SCROLLBACK (); |
1326 | ZERO_SCROLLBACK (); |
1299 | |
1327 | |
1300 | switch (mode) |
1328 | switch (mode) |
1301 | { |
1329 | { |
1302 | case 0: /* erase to end of screen */ |
1330 | case 0: /* erase to end of screen */ |
1303 | selection_check (1); |
|
|
1304 | scr_erase_line (0); |
1331 | scr_erase_line (0); |
1305 | row = screen.cur.row + 1; /* possible OOB */ |
1332 | row = screen.cur.row + 1; /* possible OOB */ |
1306 | num = nrow - row; |
1333 | num = nrow - row; |
1307 | break; |
1334 | break; |
1308 | case 1: /* erase to beginning of screen */ |
1335 | case 1: /* erase to beginning of screen */ |
1309 | selection_check (3); |
|
|
1310 | scr_erase_line (1); |
1336 | scr_erase_line (1); |
1311 | row = 0; |
1337 | row = 0; |
1312 | num = screen.cur.row; |
1338 | num = screen.cur.row; |
1313 | break; |
1339 | break; |
1314 | case 2: /* erase whole screen */ |
1340 | case 2: /* erase whole screen */ |
1315 | selection_check (3); |
|
|
1316 | row = 0; |
1341 | row = 0; |
1317 | num = nrow; |
1342 | num = nrow; |
1318 | break; |
1343 | break; |
1319 | default: |
1344 | default: |
1320 | return; |
1345 | return; |
… | |
… | |
1329 | if (row >= nrow) /* Out Of Bounds */ |
1354 | if (row >= nrow) /* Out Of Bounds */ |
1330 | return; |
1355 | return; |
1331 | |
1356 | |
1332 | min_it (num, nrow - row); |
1357 | min_it (num, nrow - row); |
1333 | |
1358 | |
1334 | if (rstyle & (RS_RVid | RS_Uline)) |
1359 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1335 | ren = (rend_t) ~RS_None; |
1360 | ren = (rend_t) ~RS_None; |
1336 | else if (GET_BASEBG (rstyle) == Color_bg) |
1361 | else if (GET_BASEBG (rstyle) == Color_bg) |
1337 | { |
1362 | { |
1338 | ren = DEFAULT_RSTYLE; |
1363 | ren = DEFAULT_RSTYLE; |
1339 | CLEAR_ROWS (row, num); |
1364 | |
|
|
1365 | if (mapped) |
|
|
1366 | XClearArea (dpy, vt, 0, |
|
|
1367 | Row2Pixel (row - view_start), (unsigned int)width, |
|
|
1368 | (unsigned int)Height2Pixel (num), False); |
1340 | } |
1369 | } |
1341 | else |
1370 | else |
1342 | { |
1371 | { |
1343 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1372 | ren = rstyle & (RS_fgMask | RS_bgMask); |
|
|
1373 | |
|
|
1374 | if (mapped) |
|
|
1375 | { |
1344 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1376 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1345 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1377 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1346 | ERASE_ROWS (row, num); |
1378 | XFillRectangle (dpy, vt, gc, |
|
|
1379 | 0, Row2Pixel (row - view_start), |
|
|
1380 | (unsigned int)width, |
|
|
1381 | (unsigned int)Height2Pixel (num)); |
1347 | gcvalue.foreground = pix_colors[Color_fg]; |
1382 | gcvalue.foreground = pix_colors[Color_fg]; |
1348 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1383 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1384 | } |
1349 | } |
1385 | } |
1350 | |
1386 | |
1351 | for (; num--; row++) |
1387 | for (; num--; row++) |
1352 | { |
1388 | { |
1353 | scr_blank_screen_mem (ROW(row), rstyle); |
1389 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1390 | |
|
|
1391 | if (row - view_start < nrow) |
1354 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1392 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1355 | } |
1393 | } |
1356 | } |
1394 | } |
1357 | |
1395 | |
1358 | #if !ENABLE_MINIMAL |
1396 | #if !ENABLE_MINIMAL |
1359 | void |
1397 | void |
… | |
… | |
1433 | * Insert/Delete <count> characters from the current position |
1471 | * Insert/Delete <count> characters from the current position |
1434 | */ |
1472 | */ |
1435 | void |
1473 | void |
1436 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1474 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1437 | { |
1475 | { |
1438 | int col, row; |
|
|
1439 | rend_t tr; |
|
|
1440 | |
|
|
1441 | want_refresh = 1; |
1476 | want_refresh = 1; |
1442 | ZERO_SCROLLBACK (); |
1477 | ZERO_SCROLLBACK (); |
1443 | |
1478 | |
1444 | if (count <= 0) |
1479 | if (count <= 0) |
1445 | return; |
1480 | return; |
… | |
… | |
1447 | scr_do_wrap (); |
1482 | scr_do_wrap (); |
1448 | |
1483 | |
1449 | selection_check (1); |
1484 | selection_check (1); |
1450 | min_it (count, ncol - screen.cur.col); |
1485 | min_it (count, ncol - screen.cur.col); |
1451 | |
1486 | |
1452 | row = screen.cur.row; |
1487 | int row = screen.cur.row; |
1453 | |
1488 | |
1454 | line_t *line = &ROW(row); |
1489 | line_t *line = &ROW(row); |
1455 | |
1490 | |
1456 | line->touch (); |
1491 | line->touch (); |
1457 | line->is_longer (0); |
1492 | line->is_longer (0); |
1458 | |
1493 | |
|
|
1494 | // nuke wide spanning the start |
|
|
1495 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1496 | scr_kill_char (*line, screen.cur.col); |
|
|
1497 | |
1459 | switch (insdel) |
1498 | switch (insdel) |
1460 | { |
1499 | { |
1461 | case INSERT: |
1500 | case INSERT: |
1462 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1501 | line->l = min (line->l + count, ncol); |
|
|
1502 | |
|
|
1503 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1504 | scr_kill_char (*line, screen.cur.col); |
|
|
1505 | |
|
|
1506 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1463 | { |
1507 | { |
1464 | line->t[col] = line->t[col - count]; |
1508 | line->t[col] = line->t[col - count]; |
1465 | line->r[col] = line->r[col - count]; |
1509 | line->r[col] = line->r[col - count]; |
1466 | } |
1510 | } |
1467 | |
|
|
1468 | line->l = min (line->l + count, ncol); |
|
|
1469 | |
1511 | |
1470 | if (selection.op && current_screen == selection.screen |
1512 | if (selection.op && current_screen == selection.screen |
1471 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1513 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1472 | { |
1514 | { |
1473 | if (selection.end.row != screen.cur.row |
1515 | if (selection.end.row != screen.cur.row |
1474 | || (selection.end.col + count >= ncol)) |
1516 | || (selection.end.col + count >= ncol)) |
1475 | CLEAR_SELECTION (); |
1517 | CLEAR_SELECTION (); |
1476 | else |
1518 | else |
|
|
1519 | { |
1477 | { /* shift selection */ |
1520 | /* shift selection */ |
1478 | selection.beg.col += count; |
1521 | selection.beg.col += count; |
1479 | selection.mark.col += count; /* XXX: yes? */ |
1522 | selection.mark.col += count; /* XXX: yes? */ |
1480 | selection.end.col += count; |
1523 | selection.end.col += count; |
1481 | } |
1524 | } |
1482 | } |
1525 | } |
… | |
… | |
1487 | case ERASE: |
1530 | case ERASE: |
1488 | screen.cur.col += count; /* don't worry if > ncol */ |
1531 | screen.cur.col += count; /* don't worry if > ncol */ |
1489 | selection_check (1); |
1532 | selection_check (1); |
1490 | screen.cur.col -= count; |
1533 | screen.cur.col -= count; |
1491 | |
1534 | |
1492 | line->l = max (line->l - count, 0); |
1535 | // nuke wide char after 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 | |
1493 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1539 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1494 | break; |
1540 | break; |
1495 | |
1541 | |
1496 | case DELETE: |
1542 | case DELETE: |
1497 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1543 | line->l = max (line->l - count, 0); |
1498 | |
1544 | |
|
|
1545 | // nuke wide char spanning the end |
|
|
1546 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1547 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1548 | |
1499 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1549 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1500 | { |
1550 | { |
1501 | line->t[col] = line->t[col + count]; |
1551 | line->t[col] = line->t[col + count]; |
1502 | line->r[col] = line->r[col + count]; |
1552 | line->r[col] = line->r[col + count]; |
1503 | } |
1553 | } |
1504 | |
1554 | |
1505 | line->l = max (line->l - count, 0); |
|
|
1506 | scr_blank_line (*line, ncol - count, count, tr); |
1555 | scr_blank_line (*line, ncol - count, count, rstyle); |
1507 | |
1556 | |
1508 | if (selection.op && current_screen == selection.screen |
1557 | if (selection.op && current_screen == selection.screen |
1509 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1558 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1510 | { |
1559 | { |
1511 | if (selection.end.row != screen.cur.row |
1560 | if (selection.end.row != screen.cur.row |
… | |
… | |
1621 | */ |
1670 | */ |
1622 | void |
1671 | void |
1623 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1672 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1624 | { |
1673 | { |
1625 | if (mode < 0) |
1674 | if (mode < 0) |
1626 | memset (tabs, 0, ncol * sizeof (char)); |
1675 | memset (tabs, 0, ncol); |
1627 | else if (screen.cur.col < ncol) |
1676 | else if (screen.cur.col < ncol) |
1628 | tabs [screen.cur.col] = !!mode; |
1677 | tabs [screen.cur.col] = !!mode; |
1629 | } |
1678 | } |
1630 | |
1679 | |
1631 | /* ------------------------------------------------------------------------- */ |
1680 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1647 | { |
1696 | { |
1648 | rvideo_state = on; |
1697 | rvideo_state = on; |
1649 | |
1698 | |
1650 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1699 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1651 | #ifdef HAVE_BG_PIXMAP |
1700 | #ifdef HAVE_BG_PIXMAP |
1652 | if (bgPixmap.pixmap == None) |
1701 | if (bg_pixmap == None) |
1653 | #endif |
1702 | #endif |
1654 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1703 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1655 | |
1704 | |
1656 | XGCValues gcvalue; |
1705 | XGCValues gcvalue; |
1657 | gcvalue.foreground = pix_colors[Color_fg]; |
1706 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1801 | for (i = PART_BEG; i < RC_COUNT; i++) |
1850 | for (i = PART_BEG; i < RC_COUNT; i++) |
1802 | { |
1851 | { |
1803 | min_it (rc[i].col, ncol - 1); |
1852 | min_it (rc[i].col, ncol - 1); |
1804 | min_it (rc[i].row, nrow - 1); |
1853 | min_it (rc[i].row, nrow - 1); |
1805 | } |
1854 | } |
1806 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1855 | |
1807 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1856 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1808 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1857 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1809 | |
1858 | |
1810 | num_scr_allow = 0; |
1859 | num_scr_allow = 0; |
1811 | |
1860 | |
… | |
… | |
1866 | return true; |
1915 | return true; |
1867 | } |
1916 | } |
1868 | |
1917 | |
1869 | #ifndef NO_BELL |
1918 | #ifndef NO_BELL |
1870 | void |
1919 | void |
1871 | rxvt_term::bell_cb (time_watcher &w) |
1920 | rxvt_term::bell_cb (ev::timer &w, int revents) |
1872 | { |
1921 | { |
1873 | rvideo_bell = false; |
1922 | rvideo_bell = false; |
1874 | scr_rvideo_mode (rvideo_mode); |
1923 | scr_rvideo_mode (rvideo_mode); |
|
|
1924 | refresh_check (); |
1875 | } |
1925 | } |
1876 | #endif |
1926 | #endif |
1877 | |
1927 | |
1878 | /* ------------------------------------------------------------------------- */ |
1928 | /* ------------------------------------------------------------------------- */ |
1879 | void |
1929 | void |
… | |
… | |
1883 | |
1933 | |
1884 | # ifndef NO_MAPALERT |
1934 | # ifndef NO_MAPALERT |
1885 | # ifdef MAPALERT_OPTION |
1935 | # ifdef MAPALERT_OPTION |
1886 | if (option (Opt_mapAlert)) |
1936 | if (option (Opt_mapAlert)) |
1887 | # endif |
1937 | # endif |
1888 | XMapWindow (dpy, parent[0]); |
1938 | XMapWindow (dpy, parent); |
1889 | # endif |
1939 | # endif |
|
|
1940 | |
1890 | # if ENABLE_FRILLS |
1941 | # if ENABLE_FRILLS |
1891 | if (option (Opt_urgentOnBell)) |
1942 | if (option (Opt_urgentOnBell)) |
1892 | { |
1943 | set_urgency (1); |
1893 | XWMHints *h; |
|
|
1894 | |
|
|
1895 | h = XGetWMHints(dpy, parent[0]); |
|
|
1896 | if (h != NULL) |
|
|
1897 | { |
|
|
1898 | h->flags |= XUrgencyHint; |
|
|
1899 | XSetWMHints(dpy, parent[0], h); |
|
|
1900 | } |
|
|
1901 | } |
|
|
1902 | # endif |
1944 | # endif |
1903 | |
1945 | |
1904 | if (option (Opt_visualBell)) |
1946 | if (option (Opt_visualBell)) |
1905 | { |
1947 | { |
1906 | rvideo_bell = true; |
1948 | rvideo_bell = true; |
1907 | scr_rvideo_mode (rvideo_mode); |
1949 | scr_rvideo_mode (rvideo_mode); |
1908 | display->flush (); |
1950 | flush (); |
1909 | |
1951 | |
1910 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1952 | bell_ev.start (VISUAL_BELL_DURATION); |
1911 | } |
1953 | } |
1912 | else |
1954 | else |
1913 | XBell (dpy, 0); |
1955 | XBell (dpy, 0); |
|
|
1956 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1914 | #endif |
1957 | #endif |
1915 | } |
1958 | } |
1916 | |
1959 | |
1917 | /* ------------------------------------------------------------------------- */ |
1960 | /* ------------------------------------------------------------------------- */ |
1918 | /* ARGSUSED */ |
|
|
1919 | void |
1961 | void |
1920 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1962 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1921 | { |
1963 | { |
1922 | #ifdef PRINTPIPE |
1964 | #ifdef PRINTPIPE |
1923 | int nrows, row_start; |
1965 | int nrows, row_start; |
1924 | FILE *fd; |
1966 | FILE *fd = popen_printer (); |
1925 | |
1967 | |
1926 | if ((fd = popen_printer ()) == NULL) |
1968 | if (!fd) |
1927 | return; |
1969 | return; |
1928 | |
1970 | |
1929 | if (fullhist) |
1971 | if (fullhist) |
1930 | { |
1972 | { |
1931 | nrows = nrow - top_row; |
1973 | nrows = nrow - top_row; |
… | |
… | |
1937 | row_start = view_start; |
1979 | row_start = view_start; |
1938 | } |
1980 | } |
1939 | |
1981 | |
1940 | wctomb (0, 0); |
1982 | wctomb (0, 0); |
1941 | |
1983 | |
1942 | for (int r1 = 0; r1 < nrows; r1++) |
1984 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1943 | { |
1985 | { |
1944 | text_t *tp = ROW(r1).t; |
1986 | text_t *tp = ROW(r1).t; |
1945 | int len = ROW(r1).l; |
1987 | int len = ROW(r1).l; |
1946 | |
1988 | |
1947 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1989 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
1976 | * screen.text/screen.rend contain what the screen will change to. |
2018 | * screen.text/screen.rend contain what the screen will change to. |
1977 | */ |
2019 | */ |
1978 | void |
2020 | void |
1979 | rxvt_term::scr_refresh () NOTHROW |
2021 | rxvt_term::scr_refresh () NOTHROW |
1980 | { |
2022 | { |
1981 | unsigned char have_bg, |
|
|
1982 | showcursor; /* show the cursor */ |
|
|
1983 | int16_t col, row, /* column/row we're processing */ |
2023 | int16_t col, row, /* column/row we're processing */ |
1984 | ocrow; /* old cursor row */ |
2024 | ocrow; /* old cursor row */ |
1985 | int i; /* tmp */ |
2025 | int i; /* tmp */ |
1986 | #ifndef NO_CURSORCOLOR |
2026 | #ifndef NO_CURSORCOLOR |
1987 | rend_t cc1; /* store colours at cursor position (s) */ |
2027 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
1996 | return; |
2036 | return; |
1997 | |
2037 | |
1998 | /* |
2038 | /* |
1999 | * A: set up vars |
2039 | * A: set up vars |
2000 | */ |
2040 | */ |
2001 | have_bg = 0; |
|
|
2002 | refresh_count = 0; |
2041 | refresh_count = 0; |
2003 | |
2042 | |
|
|
2043 | unsigned int old_screen_flags = screen.flags; |
|
|
2044 | bool have_bg = 0; |
2004 | #ifdef HAVE_BG_PIXMAP |
2045 | #ifdef HAVE_BG_PIXMAP |
2005 | have_bg |= bgPixmap.pixmap != None; |
2046 | have_bg = bg_pixmap != None; |
2006 | #endif |
2047 | #endif |
2007 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2048 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2008 | |
2049 | |
2009 | /* |
2050 | /* |
2010 | * B: reverse any characters which are selected |
2051 | * B: reverse any characters which are selected |
2011 | */ |
2052 | */ |
2012 | scr_reverse_selection (); |
2053 | scr_reverse_selection (); |
2013 | |
2054 | |
|
|
2055 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2056 | #if ENABLE_OVERLAY |
|
|
2057 | scr_swap_overlay (); |
|
|
2058 | #endif |
|
|
2059 | |
|
|
2060 | bool showcursor = screen.flags & Screen_VisibleCursor; |
|
|
2061 | |
2014 | /* |
2062 | /* |
2015 | * C: set the cursor character (s) |
2063 | * C: set the cursor character (s) |
2016 | */ |
2064 | */ |
2017 | { |
2065 | { |
2018 | unsigned char setoldcursor; |
2066 | bool setoldcursor; |
2019 | |
2067 | |
2020 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2021 | #ifdef CURSOR_BLINK |
2068 | #ifdef CURSOR_BLINK |
2022 | if (hidden_cursor) |
2069 | if (hidden_cursor) |
2023 | showcursor = 0; |
2070 | showcursor = 0; |
2024 | #endif |
2071 | #endif |
2025 | |
2072 | |
… | |
… | |
2053 | ccol2 = bgcolor_of (rstyle); |
2100 | ccol2 = bgcolor_of (rstyle); |
2054 | #else |
2101 | #else |
2055 | ccol2 = Color_bg; |
2102 | ccol2 = Color_bg; |
2056 | #endif |
2103 | #endif |
2057 | |
2104 | |
2058 | if (showcursor && focus) |
2105 | if (focus) |
2059 | { |
2106 | { |
2060 | if (option (Opt_cursorUnderline)) |
2107 | if (option (Opt_cursorUnderline)) |
2061 | *crp ^= RS_Uline; |
2108 | *crp ^= RS_Uline; |
2062 | else |
2109 | else |
2063 | { |
2110 | { |
… | |
… | |
2098 | oldcursor.col = screen.cur.col; |
2145 | oldcursor.col = screen.cur.col; |
2099 | } |
2146 | } |
2100 | } |
2147 | } |
2101 | } |
2148 | } |
2102 | |
2149 | |
2103 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2104 | #if ENABLE_OVERLAY |
|
|
2105 | scr_swap_overlay (); |
|
|
2106 | #endif |
|
|
2107 | |
|
|
2108 | #ifndef NO_SLOW_LINK_SUPPORT |
2150 | #ifndef NO_SLOW_LINK_SUPPORT |
2109 | /* |
2151 | /* |
2110 | * D: CopyArea pass - very useful for slower links |
2152 | * D: CopyArea pass - very useful for slower links |
2111 | * This has been deliberately kept simple. |
2153 | * This has been deliberately kept simple. |
2112 | */ |
2154 | */ |
… | |
… | |
2201 | continue; |
2243 | continue; |
2202 | |
2244 | |
2203 | // redraw one or more characters |
2245 | // redraw one or more characters |
2204 | |
2246 | |
2205 | // seek to the beginning of wide characters |
2247 | // seek to the beginning of wide characters |
2206 | while (stp[col] == NOCHAR && col > 0) |
2248 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2207 | --col; |
2249 | --col; |
2208 | |
2250 | |
2209 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2251 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2210 | text_t *text = stp + col; |
2252 | text_t *text = stp + col; |
2211 | int count = 1; |
2253 | int count = 1; |
2212 | |
2254 | |
2213 | dtp[col] = stp[col]; |
2255 | dtp[col] = stp[col]; |
2214 | drp[col] = rend; |
2256 | drp[col] = rend; |
… | |
… | |
2218 | for (i = 0; ++col < ncol; ) |
2260 | for (i = 0; ++col < ncol; ) |
2219 | { |
2261 | { |
2220 | if (stp[col] == NOCHAR) |
2262 | if (stp[col] == NOCHAR) |
2221 | { |
2263 | { |
2222 | dtp[col] = stp[col]; |
2264 | dtp[col] = stp[col]; |
2223 | drp[col] = rend; |
2265 | drp[col] = srp[col]; |
|
|
2266 | |
2224 | count++; |
2267 | count++; |
2225 | i++; |
2268 | i++; |
2226 | |
2269 | |
2227 | continue; |
2270 | continue; |
2228 | } |
2271 | } |
… | |
… | |
2248 | |
2291 | |
2249 | col--; /* went one too far. move back */ |
2292 | col--; /* went one too far. move back */ |
2250 | count -= i; /* dump any matching trailing chars */ |
2293 | count -= i; /* dump any matching trailing chars */ |
2251 | |
2294 | |
2252 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2295 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2253 | while (i && text[count] == NOCHAR) |
2296 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2254 | count++, i--; |
2297 | count++, i--; |
2255 | |
2298 | |
2256 | /* |
2299 | /* |
2257 | * Determine the attributes for the string |
2300 | * Determine the attributes for the string |
2258 | */ |
2301 | */ |
2259 | int fore = fgcolor_of (rend); // desired foreground |
2302 | int fore = fgcolor_of (rend); // desired foreground |
2260 | int back = bgcolor_of (rend); // desired background |
2303 | int back = bgcolor_of (rend); // desired background |
2261 | |
2304 | |
2262 | // only do special processing if any attributes are set, which is unlikely |
2305 | // only do special processing if any attributes are set, which is unlikely |
2263 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2306 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2264 | { |
2307 | { |
2265 | bool invert = rend & RS_RVid; |
2308 | bool invert = rend & RS_RVid; |
2266 | |
2309 | |
2267 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2310 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2268 | if (rend & RS_Bold |
|
|
2269 | && fore == Color_fg) |
2311 | if (rend & RS_Bold && fore == Color_fg) |
2270 | { |
2312 | { |
2271 | if (ISSET_PIXCOLOR (Color_BD)) |
2313 | if (ISSET_PIXCOLOR (Color_BD)) |
2272 | fore = Color_BD; |
2314 | fore = Color_BD; |
2273 | # if !ENABLE_STYLES |
2315 | # if !ENABLE_STYLES |
2274 | else |
2316 | else |
2275 | invert = !invert; |
2317 | invert = !invert; |
2276 | # endif |
2318 | # endif |
2277 | } |
2319 | } |
2278 | |
2320 | |
2279 | if (rend & RS_Italic |
2321 | if (rend & RS_Italic && fore == Color_fg) |
2280 | && fore == Color_fg) |
|
|
2281 | { |
2322 | { |
2282 | if (ISSET_PIXCOLOR (Color_IT)) |
2323 | if (ISSET_PIXCOLOR (Color_IT)) |
2283 | fore = Color_IT; |
2324 | fore = Color_IT; |
2284 | # if !ENABLE_STYLES |
2325 | # if !ENABLE_STYLES |
2285 | else |
2326 | else |
… | |
… | |
2289 | |
2330 | |
2290 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2331 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2291 | fore = Color_UL; |
2332 | fore = Color_UL; |
2292 | #endif |
2333 | #endif |
2293 | |
2334 | |
|
|
2335 | #ifdef OPTION_HC |
|
|
2336 | if (rend & RS_Sel) |
|
|
2337 | { |
|
|
2338 | /* invert the column if no highlightColor is set or it is the |
|
|
2339 | * current cursor column */ |
|
|
2340 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2341 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2342 | { |
|
|
2343 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2344 | fore = Color_HTC; |
|
|
2345 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2346 | else if (!invert) |
|
|
2347 | fore = back; |
|
|
2348 | |
|
|
2349 | back = Color_HC; |
|
|
2350 | invert = 0; |
|
|
2351 | } |
|
|
2352 | } |
|
|
2353 | #endif |
|
|
2354 | |
2294 | if (invert) |
2355 | if (invert) |
2295 | { |
2356 | { |
2296 | #ifdef OPTION_HC |
|
|
2297 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2298 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2299 | #endif |
|
|
2300 | /* invert the column if no highlightColor is set or it is the |
|
|
2301 | * current cursor column */ |
|
|
2302 | ::swap (fore, back); |
2357 | ::swap (fore, back); |
2303 | #ifdef OPTION_HC |
|
|
2304 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2305 | back = Color_HC; |
|
|
2306 | #endif |
|
|
2307 | |
2358 | |
2308 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2359 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2309 | # ifndef OPTION_HC |
|
|
2310 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2311 | back = Color_RV; |
|
|
2312 | # endif |
|
|
2313 | if (fore == back) |
2360 | if (fore == back) |
2314 | { |
2361 | { |
2315 | fore = Color_bg; |
2362 | fore = Color_bg; |
2316 | back = Color_fg; |
2363 | back = Color_fg; |
2317 | } |
2364 | } |
… | |
… | |
2319 | } |
2366 | } |
2320 | |
2367 | |
2321 | #ifdef TEXT_BLINK |
2368 | #ifdef TEXT_BLINK |
2322 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2369 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2323 | { |
2370 | { |
2324 | if (!text_blink_ev.active) |
2371 | if (!text_blink_ev.is_active ()) |
2325 | { |
2372 | { |
2326 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2373 | text_blink_ev.again (); |
2327 | hidden_text = 0; |
2374 | hidden_text = 0; |
2328 | } |
2375 | } |
2329 | else if (hidden_text) |
2376 | else if (hidden_text) |
2330 | fore = back; |
2377 | fore = back; |
2331 | } |
2378 | } |
… | |
… | |
2353 | /* |
2400 | /* |
2354 | * Actually do the drawing of the string here |
2401 | * Actually do the drawing of the string here |
2355 | */ |
2402 | */ |
2356 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2403 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2357 | |
2404 | |
2358 | if (have_bg && back == Color_bg) |
2405 | if (ecb_likely (have_bg && back == Color_bg)) |
2359 | { |
2406 | { |
2360 | // this is very ugly, maybe push it into ->draw? |
2407 | // this is very ugly, maybe push it into ->draw? |
2361 | |
2408 | |
2362 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2409 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2363 | if (text[i] != ' ') |
2410 | if (text[i] != ' ') |
… | |
… | |
2370 | did_clear: ; |
2417 | did_clear: ; |
2371 | } |
2418 | } |
2372 | else |
2419 | else |
2373 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2420 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2374 | |
2421 | |
2375 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2422 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2376 | { |
2423 | { |
2377 | #if ENABLE_FRILLS |
2424 | #if ENABLE_FRILLS |
2378 | if (ISSET_PIXCOLOR (Color_underline)) |
2425 | if (ISSET_PIXCOLOR (Color_underline)) |
2379 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2426 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2380 | else |
2427 | else |
2381 | #endif |
2428 | #endif |
2382 | XSetForeground (dpy, gc, pix_colors[fore]); |
2429 | XSetForeground (dpy, gc, pix_colors[fore]); |
2383 | |
2430 | |
2384 | XDrawLine (dpy, drawBuffer, gc, |
2431 | XDrawLine (dpy, vt, gc, |
2385 | xpixel, ypixel + font->ascent + 1, |
2432 | xpixel, ypixel + font->ascent + 1, |
2386 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2433 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2387 | } |
2434 | } |
2388 | } /* for (col....) */ |
2435 | } /* for (col....) */ |
2389 | } /* for (row....) */ |
2436 | } /* for (row....) */ |
2390 | |
|
|
2391 | #if ENABLE_OVERLAY |
|
|
2392 | scr_swap_overlay (); |
|
|
2393 | #endif |
|
|
2394 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2395 | |
2437 | |
2396 | /* |
2438 | /* |
2397 | * G: cleanup cursor and display outline cursor if necessary |
2439 | * G: cleanup cursor and display outline cursor if necessary |
2398 | */ |
2440 | */ |
2399 | if (showcursor) |
2441 | if (showcursor) |
… | |
… | |
2427 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2469 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2428 | else |
2470 | else |
2429 | #endif |
2471 | #endif |
2430 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2472 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2431 | |
2473 | |
2432 | XDrawRectangle (dpy, drawBuffer, gc, |
2474 | XDrawRectangle (dpy, vt, gc, |
2433 | Col2Pixel (col), |
2475 | Col2Pixel (col), |
2434 | Row2Pixel (oldcursor.row), |
2476 | Row2Pixel (oldcursor.row), |
2435 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2477 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2436 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2478 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2437 | } |
2479 | } |
2438 | } |
2480 | } |
2439 | |
2481 | |
2440 | /* |
2482 | /* |
2441 | * H: cleanup selection |
2483 | * H: cleanup selection |
2442 | */ |
2484 | */ |
|
|
2485 | #if ENABLE_OVERLAY |
|
|
2486 | scr_swap_overlay (); |
|
|
2487 | #endif |
|
|
2488 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2489 | |
2443 | scr_reverse_selection (); |
2490 | scr_reverse_selection (); |
2444 | |
2491 | |
|
|
2492 | screen.flags = old_screen_flags; |
2445 | num_scr = 0; |
2493 | num_scr = 0; |
2446 | num_scr_allow = 1; |
2494 | num_scr_allow = 1; |
2447 | } |
2495 | } |
2448 | |
2496 | |
2449 | void |
2497 | void |
… | |
… | |
2470 | scr_remap_chars (swap_buf [i]); |
2518 | scr_remap_chars (swap_buf [i]); |
2471 | } |
2519 | } |
2472 | } |
2520 | } |
2473 | |
2521 | |
2474 | void |
2522 | void |
2475 | rxvt_term::scr_recolour () NOTHROW |
2523 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2476 | { |
2524 | { |
|
|
2525 | bool transparent = false; |
|
|
2526 | |
2477 | #ifdef HAVE_BG_PIXMAP |
2527 | #ifdef HAVE_BG_PIXMAP |
2478 | bgPixmap.apply (); |
2528 | if (bg_pixmap != None) |
2479 | #else |
2529 | { |
|
|
2530 | # ifdef ENABLE_TRANSPARENCY |
|
|
2531 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2532 | { |
|
|
2533 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
|
|
2534 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
|
|
2535 | |
|
|
2536 | transparent = true; |
|
|
2537 | } |
|
|
2538 | else |
|
|
2539 | # endif |
|
|
2540 | { |
|
|
2541 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
|
|
2542 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2543 | } |
|
|
2544 | } |
|
|
2545 | else |
|
|
2546 | #endif |
|
|
2547 | { |
2480 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2548 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2481 | XClearWindow (dpy, parent[0]); |
|
|
2482 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2549 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2483 | # if HAVE_SCROLLBARS |
2550 | } |
|
|
2551 | |
|
|
2552 | XClearWindow (dpy, parent); |
|
|
2553 | |
2484 | if (scrollBar.win) |
2554 | if (scrollBar.win) |
2485 | { |
2555 | { |
|
|
2556 | if (transparent) |
|
|
2557 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2558 | else |
2486 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2559 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2487 | scrollBar.setIdle (); |
2560 | scrollBar.state = SB_STATE_IDLE; |
2488 | scrollbar_show (0); |
2561 | scrollBar.show (0); |
2489 | } |
2562 | } |
2490 | # endif |
2563 | |
2491 | #endif |
2564 | if (refresh) |
2492 | |
2565 | { |
2493 | scr_clear (); |
2566 | scr_clear (); |
2494 | scr_touch (true); |
2567 | scr_touch (true); |
|
|
2568 | } |
2495 | want_refresh = 1; |
2569 | want_refresh = 1; |
2496 | } |
2570 | } |
2497 | |
2571 | |
2498 | /* ------------------------------------------------------------------------- */ |
2572 | /* ------------------------------------------------------------------------- */ |
2499 | void |
2573 | void |
… | |
… | |
2567 | { |
2641 | { |
2568 | #if !ENABLE_MINIMAL |
2642 | #if !ENABLE_MINIMAL |
2569 | if (selection.rect) |
2643 | if (selection.rect) |
2570 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2644 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2571 | selection.end.row, selection.end.col, |
2645 | selection.end.row, selection.end.col, |
2572 | RS_RVid, RS_RVid | RS_Uline); |
2646 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2573 | else |
2647 | else |
2574 | #endif |
2648 | #endif |
2575 | scr_xor_span (selection.beg.row, selection.beg.col, |
2649 | scr_xor_span (selection.beg.row, selection.beg.col, |
2576 | selection.end.row, selection.end.col, |
2650 | selection.end.row, selection.end.col, |
2577 | RS_RVid); |
2651 | RS_Sel | RS_RVid); |
2578 | } |
2652 | } |
2579 | } |
2653 | } |
2580 | |
2654 | |
2581 | /* ------------------------------------------------------------------------- */ |
2655 | /* ------------------------------------------------------------------------- */ |
2582 | /* |
2656 | /* |
… | |
… | |
2587 | void |
2661 | void |
2588 | rxvt_term::scr_dump (int fd) NOTHROW |
2662 | rxvt_term::scr_dump (int fd) NOTHROW |
2589 | { |
2663 | { |
2590 | int row, wrote; |
2664 | int row, wrote; |
2591 | unsigned int width, towrite; |
2665 | unsigned int width, towrite; |
2592 | char r1[] = "\n"; |
2666 | const char r1[] = "\n"; |
2593 | |
2667 | |
2594 | for (row = saveLines - nsaved; |
2668 | for (row = saveLines + top_row; |
2595 | row < saveLines + nrow - 1; row++) |
2669 | row < saveLines + nrow - 1; row++) |
2596 | { |
2670 | { |
2597 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2671 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2598 | : ncol; |
2672 | : ncol; |
2599 | for (towrite = width; towrite; towrite -= wrote) |
2673 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2614 | * CHARACTER SELECTION * |
2688 | * CHARACTER SELECTION * |
2615 | * ------------------------------------------------------------------------- */ |
2689 | * ------------------------------------------------------------------------- */ |
2616 | void |
2690 | void |
2617 | rxvt_term::selection_check (int check_more) NOTHROW |
2691 | rxvt_term::selection_check (int check_more) NOTHROW |
2618 | { |
2692 | { |
2619 | row_col_t pos; |
|
|
2620 | |
|
|
2621 | if (!selection.op) |
2693 | if (!selection.op) |
2622 | return; |
2694 | return; |
2623 | |
2695 | |
|
|
2696 | row_col_t pos; |
2624 | pos.row = pos.col = 0; |
2697 | pos.row = pos.col = 0; |
|
|
2698 | |
2625 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2699 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2626 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2700 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2627 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2701 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2628 | || (check_more == 1 |
2702 | || (check_more == 1 |
2629 | && current_screen == selection.screen |
2703 | && current_screen == selection.screen |
… | |
… | |
2631 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2705 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2632 | || (check_more == 2 |
2706 | || (check_more == 2 |
2633 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2707 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2634 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2708 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2635 | || (check_more == 3 |
2709 | || (check_more == 3 |
2636 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2710 | && ROWCOL_IS_AFTER (selection.end, pos))) |
2637 | || (check_more == 4 /* screen width change */ |
|
|
2638 | && (selection.beg.row != selection.end.row |
|
|
2639 | || selection.end.col > ncol))) |
|
|
2640 | CLEAR_SELECTION (); |
2711 | CLEAR_ALL_SELECTION (); |
2641 | } |
2712 | } |
2642 | |
2713 | |
2643 | /* ------------------------------------------------------------------------- */ |
2714 | /* ------------------------------------------------------------------------- */ |
2644 | /* |
2715 | /* |
2645 | * Paste a selection direct to the command fd |
2716 | * Paste a selection direct to the command fd |
2646 | */ |
2717 | */ |
2647 | void |
2718 | void |
2648 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2719 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2649 | { |
2720 | { |
2650 | /* convert normal newline chars into common keyboard Return key sequence */ |
2721 | /* convert normal newline chars into common keyboard Return key sequence */ |
2651 | for (unsigned int i = 0; i < len; i++) |
2722 | for (unsigned int i = 0; i < len; i++) |
2652 | if (data[i] == C0_LF) |
2723 | if (data[i] == C0_LF) |
2653 | data[i] = C0_CR; |
2724 | data[i] = C0_CR; |
2654 | |
2725 | |
|
|
2726 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2727 | tt_printf ("\e[200~"); |
|
|
2728 | |
2655 | tt_write (data, len); |
2729 | tt_write (data, len); |
2656 | } |
|
|
2657 | |
2730 | |
2658 | /* ------------------------------------------------------------------------- */ |
2731 | if (priv_modes & PrivMode_BracketPaste) |
2659 | /* |
2732 | tt_printf ("\e[201~"); |
2660 | * Respond to a notification that a primary selection has been sent |
|
|
2661 | * EXT: SelectionNotify |
|
|
2662 | */ |
|
|
2663 | void |
|
|
2664 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
|
|
2665 | { |
|
|
2666 | if (prop == None) /* check for failed XConvertSelection */ |
|
|
2667 | { |
|
|
2668 | if ((selection_type & Sel_CompoundText)) |
|
|
2669 | { |
|
|
2670 | int selnum = selection_type & Sel_whereMask; |
|
|
2671 | |
|
|
2672 | selection_type = 0; |
|
|
2673 | if (selnum != Sel_direct) |
|
|
2674 | selection_request_other (XA_STRING, selnum); |
|
|
2675 | } |
|
|
2676 | |
|
|
2677 | if ((selection_type & Sel_UTF8String)) |
|
|
2678 | { |
|
|
2679 | int selnum = selection_type & Sel_whereMask; |
|
|
2680 | |
|
|
2681 | selection_type = Sel_CompoundText; |
|
|
2682 | if (selnum != Sel_direct) |
|
|
2683 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2684 | else |
|
|
2685 | selection_type = 0; |
|
|
2686 | } |
|
|
2687 | |
|
|
2688 | return; |
|
|
2689 | } |
|
|
2690 | |
|
|
2691 | unsigned long bytes_after; |
|
|
2692 | XTextProperty ct; |
|
|
2693 | |
|
|
2694 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2695 | 0, PROP_SIZE / 4, |
|
|
2696 | delete_prop, AnyPropertyType, |
|
|
2697 | &ct.encoding, &ct.format, |
|
|
2698 | &ct.nitems, &bytes_after, |
|
|
2699 | &ct.value) != Success) |
|
|
2700 | { |
|
|
2701 | ct.value = 0; |
|
|
2702 | goto bailout; |
|
|
2703 | } |
|
|
2704 | |
|
|
2705 | if (ct.encoding == None) |
|
|
2706 | goto bailout; |
|
|
2707 | |
|
|
2708 | if (bytes_after) |
|
|
2709 | { |
|
|
2710 | // fetch and append remaining data |
|
|
2711 | XTextProperty ct2; |
|
|
2712 | |
|
|
2713 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2714 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2715 | delete_prop, AnyPropertyType, |
|
|
2716 | &ct2.encoding, &ct2.format, |
|
|
2717 | &ct2.nitems, &bytes_after, |
|
|
2718 | &ct2.value) != Success) |
|
|
2719 | goto bailout; |
|
|
2720 | |
|
|
2721 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2722 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2723 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2724 | ct.nitems += ct2.nitems; |
|
|
2725 | |
|
|
2726 | XFree (ct2.value); |
|
|
2727 | } |
|
|
2728 | |
|
|
2729 | if (ct.value == 0) |
|
|
2730 | goto bailout; |
|
|
2731 | |
|
|
2732 | if (ct.encoding == xa[XA_INCR]) |
|
|
2733 | { |
|
|
2734 | // INCR selection, start handshake |
|
|
2735 | if (!delete_prop) |
|
|
2736 | XDeleteProperty (dpy, win, prop); |
|
|
2737 | |
|
|
2738 | selection_wait = Sel_incr; |
|
|
2739 | incr_buf_fill = 0; |
|
|
2740 | incr_ev.start (NOW + 10); |
|
|
2741 | |
|
|
2742 | goto bailout; |
|
|
2743 | } |
|
|
2744 | |
|
|
2745 | if (ct.nitems == 0) |
|
|
2746 | { |
|
|
2747 | if (selection_wait == Sel_incr) |
|
|
2748 | { |
|
|
2749 | XFree (ct.value); |
|
|
2750 | |
|
|
2751 | // finally complete, now paste the whole thing |
|
|
2752 | selection_wait = Sel_normal; |
|
|
2753 | ct.value = (unsigned char *)incr_buf; |
|
|
2754 | ct.nitems = incr_buf_fill; |
|
|
2755 | incr_buf = 0; |
|
|
2756 | incr_buf_size = 0; |
|
|
2757 | incr_ev.stop (); |
|
|
2758 | } |
|
|
2759 | else |
|
|
2760 | { |
|
|
2761 | if (selection_wait == Sel_normal |
|
|
2762 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2763 | { |
|
|
2764 | /* |
|
|
2765 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2766 | * XConvertSelection () but nothing was presented |
|
|
2767 | */ |
|
|
2768 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2769 | } |
|
|
2770 | |
|
|
2771 | goto bailout; |
|
|
2772 | } |
|
|
2773 | } |
|
|
2774 | else if (selection_wait == Sel_incr) |
|
|
2775 | { |
|
|
2776 | incr_ev.start (NOW + 10); |
|
|
2777 | |
|
|
2778 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2779 | { |
|
|
2780 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2781 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2782 | } |
|
|
2783 | |
|
|
2784 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2785 | incr_buf_fill += ct.nitems; |
|
|
2786 | |
|
|
2787 | goto bailout; |
|
|
2788 | } |
|
|
2789 | |
|
|
2790 | char **cl; |
|
|
2791 | int cr; |
|
|
2792 | |
|
|
2793 | #if !ENABLE_MINIMAL |
|
|
2794 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2795 | // so recode it manually |
|
|
2796 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2797 | { |
|
|
2798 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2799 | char *s = rxvt_wcstombs (w); |
|
|
2800 | free (w); |
|
|
2801 | // TODO: strlen == only the first element will be converted. well... |
|
|
2802 | paste (s, strlen (s)); |
|
|
2803 | free (s); |
|
|
2804 | } |
|
|
2805 | else |
|
|
2806 | #endif |
|
|
2807 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2808 | && cl) |
|
|
2809 | { |
|
|
2810 | for (int i = 0; i < cr; i++) |
|
|
2811 | paste (cl[i], strlen (cl[i])); |
|
|
2812 | |
|
|
2813 | XFreeStringList (cl); |
|
|
2814 | } |
|
|
2815 | else |
|
|
2816 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2817 | |
|
|
2818 | bailout: |
|
|
2819 | XFree (ct.value); |
|
|
2820 | |
|
|
2821 | if (selection_wait == Sel_normal) |
|
|
2822 | selection_wait = Sel_none; |
|
|
2823 | } |
2733 | } |
2824 | |
2734 | |
2825 | void |
2735 | void |
2826 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2736 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2827 | { |
2737 | { |
2828 | selection_wait = Sel_none; |
2738 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
2829 | |
|
|
2830 | incr_buf_size = 0; |
|
|
2831 | free (incr_buf); |
|
|
2832 | |
|
|
2833 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2834 | } |
|
|
2835 | |
|
|
2836 | void |
|
|
2837 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2838 | { |
|
|
2839 | if (prop == None || selection_wait != Sel_incr) |
|
|
2840 | return; |
2739 | return; |
2841 | |
2740 | |
2842 | selection_paste (win, prop, true); |
2741 | tt_paste (data, len); |
2843 | } |
2742 | } |
2844 | |
2743 | |
2845 | /* ------------------------------------------------------------------------- */ |
2744 | /* ------------------------------------------------------------------------- */ |
2846 | /* |
2745 | /* |
2847 | * Request the current selection: |
2746 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2848 | * Order: > internal selection if available |
2747 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2849 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2748 | * as fallback |
2850 | * > CUT_BUFFER0 |
|
|
2851 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
|
|
2852 | * will auto fallback to CUT_BUFFER0 |
|
|
2853 | * EXT: button 2 release |
2749 | * EXT: button 2 release |
2854 | */ |
2750 | */ |
2855 | void |
2751 | void |
2856 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2752 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2857 | { |
2753 | { |
2858 | if (selection.text && selnum == Sel_Primary) |
2754 | if (!selection_req) |
2859 | { /* internal selection */ |
|
|
2860 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2861 | paste (str, strlen (str)); |
|
|
2862 | free (str); |
|
|
2863 | return; |
|
|
2864 | } |
2755 | { |
2865 | else |
2756 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); |
|
|
2757 | selection_req->run (); |
2866 | { |
2758 | } |
2867 | selection_request_time = tm; |
|
|
2868 | selection_wait = Sel_normal; |
|
|
2869 | |
|
|
2870 | #if X_HAVE_UTF8_STRING |
|
|
2871 | selection_type = Sel_UTF8String; |
|
|
2872 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2873 | return; |
|
|
2874 | #else |
|
|
2875 | selection_type = Sel_CompoundText; |
|
|
2876 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2877 | return; |
|
|
2878 | #endif |
|
|
2879 | } |
|
|
2880 | |
|
|
2881 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
|
|
2882 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2883 | } |
|
|
2884 | |
|
|
2885 | int |
|
|
2886 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2887 | { |
|
|
2888 | Atom sel; |
|
|
2889 | |
|
|
2890 | selection_type |= selnum; |
|
|
2891 | |
|
|
2892 | if (selnum == Sel_Primary) |
|
|
2893 | sel = XA_PRIMARY; |
|
|
2894 | else if (selnum == Sel_Secondary) |
|
|
2895 | sel = XA_SECONDARY; |
|
|
2896 | else |
|
|
2897 | sel = xa[XA_CLIPBOARD]; |
|
|
2898 | |
|
|
2899 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2900 | { |
|
|
2901 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2902 | vt, selection_request_time); |
|
|
2903 | return 1; |
|
|
2904 | } |
|
|
2905 | |
|
|
2906 | return 0; |
|
|
2907 | } |
2759 | } |
2908 | |
2760 | |
2909 | /* ------------------------------------------------------------------------- */ |
2761 | /* ------------------------------------------------------------------------- */ |
2910 | /* |
2762 | /* |
2911 | * Clear all selected text |
2763 | * Clear all selected text |
2912 | * EXT: SelectionClear |
2764 | * EXT: SelectionClear |
2913 | */ |
2765 | */ |
2914 | void |
2766 | void |
2915 | rxvt_term::selection_clear () NOTHROW |
2767 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2916 | { |
2768 | { |
|
|
2769 | if (!clipboard) |
|
|
2770 | { |
2917 | want_refresh = 1; |
2771 | want_refresh = 1; |
2918 | free (selection.text); |
2772 | free (selection.text); |
2919 | selection.text = NULL; |
2773 | selection.text = NULL; |
2920 | selection.len = 0; |
2774 | selection.len = 0; |
2921 | CLEAR_SELECTION (); |
2775 | CLEAR_SELECTION (); |
2922 | |
2776 | |
2923 | if (display->selection_owner == this) |
2777 | if (display->selection_owner == this) |
2924 | display->selection_owner = 0; |
2778 | display->selection_owner = 0; |
|
|
2779 | } |
|
|
2780 | else |
|
|
2781 | { |
|
|
2782 | free (selection.clip_text); |
|
|
2783 | selection.clip_text = NULL; |
|
|
2784 | selection.clip_len = 0; |
|
|
2785 | |
|
|
2786 | if (display->clipboard_owner == this) |
|
|
2787 | display->clipboard_owner = 0; |
|
|
2788 | } |
2925 | } |
2789 | } |
2926 | |
2790 | |
2927 | /* ------------------------------------------------------------------------- */ |
2791 | /* ------------------------------------------------------------------------- */ |
2928 | /* |
2792 | /* |
2929 | * Copy a selection into the cut buffer |
2793 | * Copy a selection into the cut buffer |
2930 | * EXT: button 1 or 3 release |
2794 | * EXT: button 1 or 3 release |
2931 | */ |
2795 | */ |
2932 | void |
2796 | void |
2933 | rxvt_term::selection_make (Time tm) |
2797 | rxvt_term::selection_make (Time tm) |
2934 | { |
2798 | { |
2935 | int i; |
2799 | int size; |
2936 | wchar_t *new_selection_text; |
2800 | wchar_t *new_selection_text; |
2937 | text_t *t; |
2801 | text_t *t; |
2938 | |
2802 | |
2939 | switch (selection.op) |
2803 | switch (selection.op) |
2940 | { |
2804 | { |
… | |
… | |
2956 | return; /* nothing selected, go away */ |
2820 | return; /* nothing selected, go away */ |
2957 | |
2821 | |
2958 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2822 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2959 | return; |
2823 | return; |
2960 | |
2824 | |
2961 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2825 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2962 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2826 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
2963 | |
2827 | |
2964 | int ofs = 0; |
2828 | int ofs = 0; |
2965 | int extra = 0; |
2829 | int extra = 0; |
2966 | |
2830 | |
2967 | int col = selection.beg.col; |
2831 | int col = selection.beg.col; |
… | |
… | |
2973 | { |
2837 | { |
2974 | #if !ENABLE_MINIMAL |
2838 | #if !ENABLE_MINIMAL |
2975 | if (selection.rect) |
2839 | if (selection.rect) |
2976 | { |
2840 | { |
2977 | col = selection.beg.col; |
2841 | col = selection.beg.col; |
2978 | end_col = ncol + 1; |
2842 | end_col = selection.end.col; |
2979 | } |
2843 | } |
2980 | else |
2844 | else |
2981 | #endif |
2845 | #endif |
2982 | end_col = ROW(row).l; |
2846 | end_col = ROW(row).l; |
2983 | |
2847 | |
2984 | col = max (col, 0); |
2848 | col = max (col, 0); |
2985 | |
2849 | |
2986 | if (row == selection.end.row |
2850 | if (row == selection.end.row) |
2987 | #if !ENABLE_MINIMAL |
|
|
2988 | || selection.rect |
|
|
2989 | #endif |
|
|
2990 | ) |
|
|
2991 | min_it (end_col, selection.end.col); |
2851 | min_it (end_col, selection.end.col); |
2992 | |
2852 | |
2993 | t = ROW(row).t + col; |
2853 | t = ROW(row).t + col; |
2994 | |
2854 | |
2995 | for (; col < end_col; col++) |
2855 | for (; col < end_col; col++) |
… | |
… | |
3003 | |
2863 | |
3004 | extra -= (len - 1); |
2864 | extra -= (len - 1); |
3005 | |
2865 | |
3006 | if (extra < 0) |
2866 | if (extra < 0) |
3007 | { |
2867 | { |
3008 | extra += i; |
2868 | extra += size; |
3009 | i += i; |
2869 | size += size; |
3010 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2870 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3011 | } |
2871 | } |
3012 | |
2872 | |
3013 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2873 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3014 | } |
2874 | } |
3015 | #endif |
2875 | #endif |
… | |
… | |
3027 | |
2887 | |
3028 | new_selection_text[ofs++] = C0_LF; |
2888 | new_selection_text[ofs++] = C0_LF; |
3029 | } |
2889 | } |
3030 | else |
2890 | else |
3031 | #endif |
2891 | #endif |
3032 | if (!ROW(row).is_longer () && row != selection.end.row) |
2892 | if (!ROW(row).is_longer () |
|
|
2893 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
2894 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3033 | new_selection_text[ofs++] = C0_LF; |
2895 | new_selection_text[ofs++] = C0_LF; |
3034 | } |
2896 | } |
3035 | |
|
|
3036 | if (end_col != selection.end.col) |
|
|
3037 | new_selection_text[ofs++] = C0_LF; |
|
|
3038 | |
2897 | |
3039 | new_selection_text[ofs] = 0; |
2898 | new_selection_text[ofs] = 0; |
3040 | |
2899 | |
3041 | if (ofs == 0) |
2900 | if (ofs == 0) |
3042 | { |
2901 | { |
… | |
… | |
3055 | |
2914 | |
3056 | selection_grab (tm); |
2915 | selection_grab (tm); |
3057 | } |
2916 | } |
3058 | |
2917 | |
3059 | bool |
2918 | bool |
3060 | rxvt_term::selection_grab (Time tm) NOTHROW |
2919 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3061 | { |
2920 | { |
|
|
2921 | Atom sel; |
|
|
2922 | |
|
|
2923 | if (!clipboard) |
|
|
2924 | { |
3062 | selection_time = tm; |
2925 | selection_time = tm; |
|
|
2926 | sel = XA_PRIMARY; |
|
|
2927 | } |
|
|
2928 | else |
|
|
2929 | { |
|
|
2930 | clipboard_time = tm; |
|
|
2931 | sel = xa[XA_CLIPBOARD]; |
|
|
2932 | } |
3063 | |
2933 | |
3064 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
2934 | XSetSelectionOwner (dpy, sel, vt, tm); |
3065 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
2935 | if (XGetSelectionOwner (dpy, sel) == vt) |
3066 | { |
2936 | { |
3067 | display->set_selection_owner (this); |
2937 | display->set_selection_owner (this, clipboard); |
3068 | return true; |
2938 | return true; |
3069 | } |
2939 | } |
3070 | else |
2940 | else |
3071 | { |
2941 | { |
3072 | selection_clear (); |
2942 | selection_clear (clipboard); |
3073 | return false; |
2943 | return false; |
3074 | } |
2944 | } |
3075 | |
2945 | |
3076 | #if 0 |
2946 | #if 0 |
3077 | XTextProperty ct; |
2947 | XTextProperty ct; |
… | |
… | |
3130 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3000 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3131 | |
3001 | |
3132 | while (selection.mark.col > 0 |
3002 | while (selection.mark.col > 0 |
3133 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3003 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3134 | --selection.mark.col; |
3004 | --selection.mark.col; |
3135 | |
3005 | |
3136 | if (selection.op) |
3006 | if (selection.op) |
|
|
3007 | { |
3137 | { /* clear the old selection */ |
3008 | /* clear the old selection */ |
3138 | selection.beg.row = selection.end.row = selection.mark.row; |
3009 | selection.beg.row = selection.end.row = selection.mark.row; |
3139 | selection.beg.col = selection.end.col = selection.mark.col; |
3010 | selection.beg.col = selection.end.col = selection.mark.col; |
3140 | } |
3011 | } |
3141 | |
3012 | |
3142 | selection.op = SELECTION_INIT; |
3013 | selection.op = SELECTION_INIT; |
… | |
… | |
3331 | * a point/word/line which is either the start or end of the selection |
3202 | * a point/word/line which is either the start or end of the selection |
3332 | * and it was decided by whichever point/word/line was `fixed' at the |
3203 | * and it was decided by whichever point/word/line was `fixed' at the |
3333 | * time of the most recent button3 press |
3204 | * time of the most recent button3 press |
3334 | */ |
3205 | */ |
3335 | if (button3 && buttonpress) |
3206 | if (button3 && buttonpress) |
|
|
3207 | { |
3336 | { /* button3 press */ |
3208 | /* button3 press */ |
3337 | /* |
3209 | /* |
3338 | * first determine which edge of the selection we are closest to |
3210 | * first determine which edge of the selection we are closest to |
3339 | */ |
3211 | */ |
3340 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3212 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3341 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3213 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3359 | selection.mark.row = selection.beg.row; |
3231 | selection.mark.row = selection.beg.row; |
3360 | selection.mark.col = selection.beg.col; |
3232 | selection.mark.col = selection.beg.col; |
3361 | } |
3233 | } |
3362 | } |
3234 | } |
3363 | else |
3235 | else |
|
|
3236 | { |
3364 | { /* button1 drag or button3 drag */ |
3237 | /* button1 drag or button3 drag */ |
3365 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3238 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3366 | { |
3239 | { |
3367 | if (selection.mark.row == selection.end.row |
3240 | if (selection.mark.row == selection.end.row |
3368 | && selection.mark.col == selection.end.col |
3241 | && selection.mark.col == selection.end.col |
3369 | && clickchange |
3242 | && clickchange |
… | |
… | |
3450 | selection.end.row++; |
3323 | selection.end.row++; |
3451 | } |
3324 | } |
3452 | } |
3325 | } |
3453 | |
3326 | |
3454 | if (button3 && buttonpress) |
3327 | if (button3 && buttonpress) |
|
|
3328 | { |
3455 | { /* mark may need to be changed */ |
3329 | /* mark may need to be changed */ |
3456 | if (closeto == LEFT) |
3330 | if (closeto == LEFT) |
3457 | { |
3331 | { |
3458 | selection.mark.row = selection.end.row; |
3332 | selection.mark.row = selection.end.row; |
3459 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3333 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3460 | } |
3334 | } |
… | |
… | |
3533 | * EXT: SelectionRequest |
3407 | * EXT: SelectionRequest |
3534 | */ |
3408 | */ |
3535 | void |
3409 | void |
3536 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3410 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3537 | { |
3411 | { |
|
|
3412 | Atom property = rq.property == None ? rq.target : rq.property; |
3538 | XSelectionEvent ev; |
3413 | XSelectionEvent ev; |
3539 | |
3414 | |
3540 | ev.type = SelectionNotify; |
3415 | ev.type = SelectionNotify; |
3541 | ev.property = None; |
3416 | ev.property = None; |
3542 | ev.display = rq.display; |
3417 | ev.display = rq.display; |
… | |
… | |
3557 | *target++ = xa[XA_COMPOUND_TEXT]; |
3432 | *target++ = xa[XA_COMPOUND_TEXT]; |
3558 | #if X_HAVE_UTF8_STRING |
3433 | #if X_HAVE_UTF8_STRING |
3559 | *target++ = xa[XA_UTF8_STRING]; |
3434 | *target++ = xa[XA_UTF8_STRING]; |
3560 | #endif |
3435 | #endif |
3561 | |
3436 | |
3562 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3437 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3563 | 32, PropModeReplace, |
3438 | 32, PropModeReplace, |
3564 | (unsigned char *)target_list, target - target_list); |
3439 | (unsigned char *)target_list, target - target_list); |
3565 | ev.property = rq.property; |
3440 | ev.property = property; |
3566 | } |
3441 | } |
3567 | #if TODO // TODO |
3442 | #if TODO // TODO |
3568 | else if (rq.target == xa[XA_MULTIPLE]) |
3443 | else if (rq.target == xa[XA_MULTIPLE]) |
3569 | { |
3444 | { |
3570 | /* TODO: Handle MULTIPLE */ |
3445 | /* TODO: Handle MULTIPLE */ |
3571 | } |
3446 | } |
3572 | #endif |
3447 | #endif |
3573 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3448 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3574 | { |
3449 | { |
3575 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3450 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3576 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3451 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3577 | ev.property = rq.property; |
3452 | ev.property = property; |
|
|
3453 | } |
|
|
3454 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3455 | { |
|
|
3456 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
|
|
3457 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
|
|
3458 | ev.property = property; |
3578 | } |
3459 | } |
3579 | else if (rq.target == XA_STRING |
3460 | else if (rq.target == XA_STRING |
3580 | || rq.target == xa[XA_TEXT] |
3461 | || rq.target == xa[XA_TEXT] |
3581 | || rq.target == xa[XA_COMPOUND_TEXT] |
3462 | || rq.target == xa[XA_COMPOUND_TEXT] |
3582 | || rq.target == xa[XA_UTF8_STRING] |
3463 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3614 | { |
3495 | { |
3615 | target = xa[XA_COMPOUND_TEXT]; |
3496 | target = xa[XA_COMPOUND_TEXT]; |
3616 | style = enc_compound_text; |
3497 | style = enc_compound_text; |
3617 | } |
3498 | } |
3618 | |
3499 | |
3619 | if (selection.text) |
3500 | if (rq.selection == XA_PRIMARY && selection.text) |
3620 | { |
3501 | { |
3621 | cl = selection.text; |
3502 | cl = selection.text; |
3622 | selectlen = selection.len; |
3503 | selectlen = selection.len; |
|
|
3504 | } |
|
|
3505 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3506 | { |
|
|
3507 | cl = selection.clip_text; |
|
|
3508 | selectlen = selection.clip_len; |
3623 | } |
3509 | } |
3624 | else |
3510 | else |
3625 | { |
3511 | { |
3626 | cl = L""; |
3512 | cl = L""; |
3627 | selectlen = 0; |
3513 | selectlen = 0; |
… | |
… | |
3648 | ct.value = (unsigned char *)cl; |
3534 | ct.value = (unsigned char *)cl; |
3649 | ct.nitems = selectlen; |
3535 | ct.nitems = selectlen; |
3650 | ct.encoding = target; |
3536 | ct.encoding = target; |
3651 | } |
3537 | } |
3652 | |
3538 | |
3653 | XChangeProperty (dpy, rq.requestor, rq.property, |
3539 | XChangeProperty (dpy, rq.requestor, property, |
3654 | ct.encoding, 8, PropModeReplace, |
3540 | ct.encoding, 8, PropModeReplace, |
3655 | ct.value, (int)ct.nitems); |
3541 | ct.value, (int)ct.nitems); |
3656 | ev.property = rq.property; |
3542 | ev.property = property; |
3657 | |
3543 | |
3658 | if (freect) |
3544 | if (freect) |
3659 | XFree (ct.value); |
3545 | XFree (ct.value); |
3660 | } |
3546 | } |
3661 | |
3547 | |
3662 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3548 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3663 | } |
|
|
3664 | |
|
|
3665 | /* ------------------------------------------------------------------------- * |
|
|
3666 | * MOUSE ROUTINES * |
|
|
3667 | * ------------------------------------------------------------------------- */ |
|
|
3668 | |
|
|
3669 | /* |
|
|
3670 | * return col/row values corresponding to x/y pixel values |
|
|
3671 | */ |
|
|
3672 | void |
|
|
3673 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
|
|
3674 | { |
|
|
3675 | *x = Pixel2Col (*x); |
|
|
3676 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
|
|
3677 | *y = Pixel2Row (*y); |
|
|
3678 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
|
|
3679 | } |
3549 | } |
3680 | |
3550 | |
3681 | /* ------------------------------------------------------------------------- */ |
3551 | /* ------------------------------------------------------------------------- */ |
3682 | #ifdef USE_XIM |
3552 | #ifdef USE_XIM |
3683 | void |
3553 | void |
… | |
… | |
3711 | h += 2; min_it (h, nrow); |
3581 | h += 2; min_it (h, nrow); |
3712 | |
3582 | |
3713 | x -= 1; clamp_it (x, 0, ncol - w); |
3583 | x -= 1; clamp_it (x, 0, ncol - w); |
3714 | y -= 1; clamp_it (y, 0, nrow - h); |
3584 | y -= 1; clamp_it (y, 0, nrow - h); |
3715 | |
3585 | |
3716 | ov_x = x; ov_y = y; |
3586 | ov.x = x; ov.y = y; |
3717 | ov_w = w; ov_h = h; |
3587 | ov.w = w; ov.h = h; |
3718 | |
3588 | |
3719 | ov_text = new text_t *[h]; |
3589 | ov.text = new text_t *[h]; |
3720 | ov_rend = new rend_t *[h]; |
3590 | ov.rend = new rend_t *[h]; |
3721 | |
3591 | |
3722 | for (y = 0; y < h; y++) |
3592 | for (y = 0; y < h; y++) |
3723 | { |
3593 | { |
3724 | text_t *tp = ov_text[y] = new text_t[w]; |
3594 | text_t *tp = ov.text[y] = new text_t[w]; |
3725 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3595 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3726 | |
3596 | |
3727 | text_t t0, t1, t2; |
3597 | text_t t0, t1, t2; |
3728 | rend_t r = OVERLAY_RSTYLE; |
3598 | rend_t r = OVERLAY_RSTYLE; |
3729 | |
3599 | |
3730 | if (y == 0) |
3600 | if (y == 0) |
… | |
… | |
3749 | } |
3619 | } |
3750 | |
3620 | |
3751 | void |
3621 | void |
3752 | rxvt_term::scr_overlay_off () NOTHROW |
3622 | rxvt_term::scr_overlay_off () NOTHROW |
3753 | { |
3623 | { |
3754 | if (!ov_text) |
3624 | if (!ov.text) |
3755 | return; |
3625 | return; |
3756 | |
3626 | |
3757 | want_refresh = 1; |
3627 | want_refresh = 1; |
3758 | |
3628 | |
3759 | for (int y = 0; y < ov_h; y++) |
3629 | for (int y = 0; y < ov.h; y++) |
3760 | { |
3630 | { |
3761 | delete [] ov_text[y]; |
3631 | delete [] ov.text[y]; |
3762 | delete [] ov_rend[y]; |
3632 | delete [] ov.rend[y]; |
3763 | } |
3633 | } |
3764 | |
3634 | |
3765 | delete [] ov_text; ov_text = 0; |
3635 | delete [] ov.text; ov.text = 0; |
3766 | delete [] ov_rend; ov_rend = 0; |
3636 | delete [] ov.rend; ov.rend = 0; |
3767 | } |
3637 | } |
3768 | |
3638 | |
3769 | void |
3639 | void |
3770 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3640 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3771 | { |
3641 | { |
3772 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3642 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3773 | return; |
3643 | return; |
3774 | |
3644 | |
3775 | x++, y++; |
3645 | x++, y++; |
3776 | |
3646 | |
3777 | ov_text[y][x] = text; |
3647 | ov.text[y][x] = text; |
3778 | ov_rend[y][x] = rend; |
3648 | ov.rend[y][x] = rend; |
3779 | } |
3649 | } |
3780 | |
3650 | |
3781 | void |
3651 | void |
3782 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3652 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3783 | { |
3653 | { |
… | |
… | |
3802 | } |
3672 | } |
3803 | |
3673 | |
3804 | void |
3674 | void |
3805 | rxvt_term::scr_swap_overlay () NOTHROW |
3675 | rxvt_term::scr_swap_overlay () NOTHROW |
3806 | { |
3676 | { |
3807 | if (!ov_text) |
3677 | if (!ov.text) |
3808 | return; |
3678 | return; |
3809 | |
3679 | |
|
|
3680 | // hide cursor if it is within the overlay area |
|
|
3681 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3682 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3683 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3684 | |
3810 | // swap screen mem with overlay |
3685 | // swap screen mem with overlay |
3811 | for (int y = ov_h; y--; ) |
3686 | for (int y = ov.h; y--; ) |
3812 | { |
3687 | { |
3813 | text_t *t1 = ov_text[y]; |
3688 | text_t *t1 = ov.text[y]; |
3814 | rend_t *r1 = ov_rend[y]; |
3689 | rend_t *r1 = ov.rend[y]; |
3815 | |
3690 | |
3816 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3691 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3817 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3692 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3818 | |
3693 | |
3819 | for (int x = ov_w; x--; ) |
3694 | for (int x = ov.w; x--; ) |
3820 | { |
3695 | { |
3821 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3696 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3822 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3697 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3823 | } |
3698 | } |
3824 | } |
3699 | } |