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 <pcg@goof.com> |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
… | |
… | |
26 | |
26 | |
27 | #include "../config.h" /* NECESSARY */ |
27 | #include "../config.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
|
|
32 | |
|
|
33 | #include <inttypes.h> |
31 | #include <inttypes.h> |
34 | |
32 | |
35 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a separate compile! |
36 | |
34 | |
|
|
35 | static inline void |
37 | inline void fill_text (text_t *start, text_t value, int len) |
36 | fill_text (text_t *start, text_t value, int len) |
38 | { |
37 | { |
39 | while (len--) |
38 | while (len--) |
40 | *start++ = value; |
39 | *start++ = value; |
41 | } |
40 | } |
42 | |
41 | |
43 | /* ------------------------------------------------------------------------- */ |
42 | /* ------------------------------------------------------------------------- */ |
44 | #define PROP_SIZE 256*1024 |
|
|
45 | #define PASTE_SIZE 32768 |
|
|
46 | #define TABSIZE 8 /* default tab size */ |
43 | #define TABSIZE 8 /* default tab size */ |
47 | |
44 | |
48 | /* ------------------------------------------------------------------------- * |
45 | /* ------------------------------------------------------------------------- * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
46 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
50 | * ------------------------------------------------------------------------- */ |
47 | * ------------------------------------------------------------------------- */ |
51 | #define ZERO_SCROLLBACK() \ |
48 | #define ZERO_SCROLLBACK() \ |
52 | if (OPTION (Opt_scrollTtyOutput)) \ |
49 | if (option (Opt_scrollTtyOutput)) \ |
53 | view_start = 0 |
50 | view_start = 0 |
54 | #define CLEAR_SELECTION() \ |
51 | #define CLEAR_SELECTION() \ |
55 | selection.beg.row = selection.beg.col \ |
52 | selection.beg.row = selection.beg.col \ |
56 | = selection.end.row = selection.end.col = 0 |
53 | = selection.end.row = selection.end.col = 0 |
57 | #define CLEAR_ALL_SELECTION() \ |
54 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
85 | 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) |
86 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
83 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
87 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
84 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
88 | |
85 | |
89 | /* |
86 | /* |
90 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
|
|
91 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
87 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
92 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
|
|
93 | */ |
88 | */ |
94 | #define drawBuffer vt |
|
|
95 | |
|
|
96 | #define CLEAR_ROWS(row, num) \ |
|
|
97 | if (mapped) \ |
|
|
98 | XClearArea (dpy, drawBuffer, 0, \ |
|
|
99 | Row2Pixel (row), (unsigned int)width, \ |
|
|
100 | (unsigned int)Height2Pixel (num), False) |
|
|
101 | |
|
|
102 | #define CLEAR_CHARS(x, y, num) \ |
89 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (mapped) \ |
90 | if (mapped) \ |
104 | XClearArea (dpy, drawBuffer, x, y, \ |
91 | XClearArea (dpy, vt, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
92 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
93 | (unsigned int)Height2Pixel (1), False) |
107 | |
|
|
108 | #define ERASE_ROWS(row, num) \ |
|
|
109 | XFillRectangle (dpy, drawBuffer, gc, \ |
|
|
110 | 0, Row2Pixel (row), \ |
|
|
111 | (unsigned int)width, \ |
|
|
112 | (unsigned int)Height2Pixel (num)) |
|
|
113 | |
94 | |
114 | /* ------------------------------------------------------------------------- * |
95 | /* ------------------------------------------------------------------------- * |
115 | * SCREEN `COMMON' ROUTINES * |
96 | * SCREEN `COMMON' ROUTINES * |
116 | * ------------------------------------------------------------------------- */ |
97 | * ------------------------------------------------------------------------- */ |
117 | |
98 | |
… | |
… | |
150 | |
131 | |
151 | l.l = 0; |
132 | l.l = 0; |
152 | l.f = 0; |
133 | l.f = 0; |
153 | } |
134 | } |
154 | |
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 | |
155 | /* ------------------------------------------------------------------------- * |
157 | /* ------------------------------------------------------------------------- * |
156 | * SCREEN INITIALISATION * |
158 | * SCREEN INITIALISATION * |
157 | * ------------------------------------------------------------------------- */ |
159 | * ------------------------------------------------------------------------- */ |
158 | |
160 | |
159 | void |
161 | void |
160 | rxvt_term::scr_reset () |
162 | rxvt_term::scr_reset () |
161 | { |
163 | { |
162 | #if ENABLE_OVERLAY |
|
|
163 | scr_overlay_off (); |
|
|
164 | #endif |
|
|
165 | |
|
|
166 | view_start = 0; |
164 | view_start = 0; |
167 | num_scr = 0; |
165 | num_scr = 0; |
168 | |
166 | |
169 | if (ncol == 0) |
167 | if (ncol == 0) |
170 | ncol = 80; |
168 | ncol = 80; |
… | |
… | |
172 | if (nrow == 0) |
170 | if (nrow == 0) |
173 | nrow = 24; |
171 | nrow = 24; |
174 | |
172 | |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
173 | if (ncol == prev_ncol && nrow == prev_nrow) |
176 | return; |
174 | return; |
177 | |
|
|
178 | if (current_screen != PRIMARY) |
|
|
179 | scr_swap_screen (); |
|
|
180 | |
175 | |
181 | // we need at least two lines for wrapping to work correctly |
176 | // we need at least two lines for wrapping to work correctly |
182 | while (nrow + saveLines < 2) |
177 | while (nrow + saveLines < 2) |
183 | { |
178 | { |
184 | //TODO//FIXME |
179 | //TODO//FIXME |
… | |
… | |
237 | selection.text = NULL; |
232 | selection.text = NULL; |
238 | selection.len = 0; |
233 | selection.len = 0; |
239 | selection.op = SELECTION_CLEAR; |
234 | selection.op = SELECTION_CLEAR; |
240 | selection.screen = PRIMARY; |
235 | selection.screen = PRIMARY; |
241 | selection.clicks = 0; |
236 | selection.clicks = 0; |
242 | rvideo_state = rvideo_mode = false; |
237 | selection.clip_text = NULL; |
|
|
238 | selection.clip_len = 0; |
243 | } |
239 | } |
244 | else |
240 | else |
245 | { |
241 | { |
246 | /* |
242 | /* |
247 | * add or delete rows as appropriate |
243 | * add or delete rows as appropriate |
… | |
… | |
276 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
272 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
277 | } |
273 | } |
278 | |
274 | |
279 | line_t *old_buf = row_buf; |
275 | line_t *old_buf = row_buf; |
280 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
276 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
281 | |
277 | |
282 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
278 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
279 | int pend = MOD (term_start + top_row , prev_total_rows); |
284 | int q = total_rows; // rewrapped row |
280 | int q = total_rows; // rewrapped row |
285 | |
281 | |
286 | if (top_row) |
282 | if (top_row) |
287 | { |
283 | { |
288 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
284 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
289 | // to come up with a lean and mean algorithm. |
285 | // to come up with a lean and mean algorithm. |
|
|
286 | // TODO: maybe optimise when width didn't change |
290 | |
287 | |
291 | row_col_t ocur = screen.cur; |
288 | row_col_t ocur = screen.cur; |
292 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
289 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
293 | |
290 | |
294 | do |
291 | do |
295 | { |
292 | { |
296 | p = MOD (p - 1, prev_total_rows); |
293 | p = MOD (p - 1, prev_total_rows); |
297 | #ifdef DEBUG_STRICT |
|
|
298 | assert (old_buf [MOD (p, prev_total_rows)].t); |
294 | assert (old_buf [MOD (p, prev_total_rows)].t); |
299 | #endif |
|
|
300 | int plines = 1; |
295 | int plines = 1; |
301 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
296 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
302 | |
297 | |
303 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
298 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
304 | { |
299 | { |
… | |
… | |
330 | int qcol = 0; |
325 | int qcol = 0; |
331 | |
326 | |
332 | // see below for cursor adjustment rationale |
327 | // see below for cursor adjustment rationale |
333 | if (p == ocur.row) |
328 | if (p == ocur.row) |
334 | screen.cur.row = q - (total_rows - nrow); |
329 | screen.cur.row = q - (total_rows - nrow); |
335 | |
330 | |
336 | // fill a single destination line |
331 | // fill a single destination line |
337 | while (lofs < llen && qcol < ncol) |
332 | while (lofs < llen && qcol < ncol) |
338 | { |
333 | { |
339 | int prow = lofs / prev_ncol; |
334 | int prow = lofs / prev_ncol; |
340 | int pcol = lofs % prev_ncol; |
335 | int pcol = lofs % prev_ncol; |
… | |
… | |
366 | } |
361 | } |
367 | while (p != pend && q > 0); |
362 | while (p != pend && q > 0); |
368 | |
363 | |
369 | term_start = total_rows - nrow; |
364 | term_start = total_rows - nrow; |
370 | top_row = q - term_start; |
365 | top_row = q - term_start; |
371 | |
366 | |
372 | // make sure all terminal lines exist |
367 | // make sure all terminal lines exist |
373 | while (top_row > 0) |
368 | while (top_row > 0) |
374 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
369 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
375 | } |
370 | } |
376 | else |
371 | else |
377 | { |
372 | { |
378 | // if no scrollback exists (yet), wing, instead of wrap |
373 | // if no scrollback exists (yet), wing, instead of wrap |
379 | |
374 | |
380 | for (int row = min (nrow, prev_nrow); row--; ) |
375 | for (int row = min (nrow, prev_nrow); row--; ) |
381 | { |
376 | { |
382 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
377 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
383 | line_t &qline = row_buf [row]; |
378 | line_t &qline = row_buf [row]; |
384 | |
379 | |
… | |
… | |
398 | delete old_ta; |
393 | delete old_ta; |
399 | delete old_ra; |
394 | delete old_ra; |
400 | |
395 | |
401 | clamp_it (screen.cur.row, 0, nrow - 1); |
396 | clamp_it (screen.cur.row, 0, nrow - 1); |
402 | clamp_it (screen.cur.col, 0, ncol - 1); |
397 | clamp_it (screen.cur.col, 0, ncol - 1); |
|
|
398 | } |
403 | |
399 | |
404 | free (tabs); |
400 | free (tabs); |
405 | } |
401 | tabs = (char *)rxvt_malloc (ncol); |
|
|
402 | |
|
|
403 | for (int col = ncol; col--; ) |
|
|
404 | tabs [col] = col % TABSIZE == 0; |
406 | |
405 | |
407 | CLEAR_ALL_SELECTION (); |
406 | CLEAR_ALL_SELECTION (); |
408 | |
407 | |
409 | prev_nrow = nrow; |
408 | prev_nrow = nrow; |
410 | prev_ncol = ncol; |
409 | prev_ncol = ncol; |
411 | |
|
|
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
|
|
413 | |
|
|
414 | for (int col = ncol; col--; ) |
|
|
415 | tabs [col] = col % TABSIZE == 0; |
|
|
416 | |
|
|
417 | if (current_screen != PRIMARY) |
|
|
418 | scr_swap_screen (); |
|
|
419 | |
410 | |
420 | tt_winch (); |
411 | tt_winch (); |
421 | |
412 | |
422 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
413 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
423 | } |
414 | } |
… | |
… | |
435 | delete ralloc; ralloc = 0; |
426 | delete ralloc; ralloc = 0; |
436 | |
427 | |
437 | free (row_buf); |
428 | free (row_buf); |
438 | free (swap_buf); |
429 | free (swap_buf); |
439 | free (drawn_buf); |
430 | free (drawn_buf); |
|
|
431 | row_buf = 0; // signal that we freed all the arrays above |
|
|
432 | |
440 | free (tabs); |
433 | free (tabs); |
441 | |
434 | tabs = 0; |
442 | row_buf = 0; // signal that we freed all the arrays |
|
|
443 | } |
435 | } |
444 | } |
436 | } |
445 | |
437 | |
446 | /* ------------------------------------------------------------------------- */ |
438 | /* ------------------------------------------------------------------------- */ |
447 | /* |
439 | /* |
448 | * Hard reset |
440 | * Hard/Soft reset |
449 | */ |
441 | */ |
450 | void |
442 | void |
451 | rxvt_term::scr_poweron () |
443 | rxvt_term::scr_poweron () |
452 | { |
444 | { |
453 | scr_release (); |
445 | scr_release (); |
454 | prev_nrow = prev_ncol = 0; |
446 | prev_nrow = prev_ncol = 0; |
|
|
447 | rvideo_mode = false; |
|
|
448 | scr_soft_reset (); |
455 | scr_reset (); |
449 | scr_reset (); |
456 | |
450 | |
457 | scr_clear (true); |
451 | scr_clear (true); |
458 | scr_refresh (); |
452 | scr_refresh (); |
|
|
453 | } |
|
|
454 | |
|
|
455 | void |
|
|
456 | rxvt_term::scr_soft_reset () |
|
|
457 | { |
|
|
458 | /* only affects modes, nothing drastic such as clearing the screen */ |
|
|
459 | #if ENABLE_OVERLAY |
|
|
460 | scr_overlay_off (); |
|
|
461 | #endif |
|
|
462 | |
|
|
463 | if (current_screen != PRIMARY) |
|
|
464 | scr_swap_screen (); |
|
|
465 | |
|
|
466 | scr_scroll_region (0, MAX_ROWS - 1); |
|
|
467 | scr_rendition (0, ~RS_None); |
|
|
468 | scr_insert_mode (0); |
459 | } |
469 | } |
460 | |
470 | |
461 | /* ------------------------------------------------------------------------- * |
471 | /* ------------------------------------------------------------------------- * |
462 | * PROCESS SCREEN COMMANDS * |
472 | * PROCESS SCREEN COMMANDS * |
463 | * ------------------------------------------------------------------------- */ |
473 | * ------------------------------------------------------------------------- */ |
… | |
… | |
501 | } |
511 | } |
502 | |
512 | |
503 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
513 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
504 | min_it (s->cur.row, nrow - 1); |
514 | min_it (s->cur.row, nrow - 1); |
505 | min_it (s->cur.col, ncol - 1); |
515 | min_it (s->cur.col, ncol - 1); |
506 | #ifdef DEBUG_STRICT |
|
|
507 | assert (s->cur.row >= 0); |
516 | assert (s->cur.row >= 0); |
508 | assert (s->cur.col >= 0); |
517 | assert (s->cur.col >= 0); |
509 | #endif |
|
|
510 | } |
518 | } |
511 | |
519 | |
512 | void |
520 | void |
513 | rxvt_term::scr_swap_screen () |
521 | rxvt_term::scr_swap_screen () |
514 | { |
522 | { |
515 | if (!OPTION (Opt_secondaryScreen)) |
523 | if (!option (Opt_secondaryScreen)) |
516 | return; |
524 | return; |
517 | |
525 | |
518 | for (int i = prev_nrow; i--; ) |
526 | for (int i = prev_nrow; i--; ) |
519 | ::swap (ROW(i), swap_buf [i]); |
527 | ::swap (ROW(i), swap_buf [i]); |
520 | |
528 | |
… | |
… | |
539 | want_refresh = 1; |
547 | want_refresh = 1; |
540 | view_start = 0; |
548 | view_start = 0; |
541 | |
549 | |
542 | selection_check (2); /* check for boundary cross */ |
550 | selection_check (2); /* check for boundary cross */ |
543 | |
551 | |
544 | int i = current_screen; current_screen = scrn; scrn = i; |
552 | current_screen = scrn; |
545 | |
553 | |
546 | #if NSCREENS |
554 | #if NSCREENS |
547 | if (OPTION (Opt_secondaryScreen)) |
555 | if (option (Opt_secondaryScreen)) |
548 | { |
556 | { |
549 | num_scr = 0; |
557 | num_scr = 0; |
550 | |
558 | |
551 | scr_swap_screen (); |
559 | scr_swap_screen (); |
552 | |
560 | |
… | |
… | |
555 | screen.flags |= Screen_VisibleCursor; |
563 | screen.flags |= Screen_VisibleCursor; |
556 | swap.flags |= Screen_VisibleCursor; |
564 | swap.flags |= Screen_VisibleCursor; |
557 | } |
565 | } |
558 | else |
566 | else |
559 | #endif |
567 | #endif |
560 | if (OPTION (Opt_secondaryScroll)) |
568 | if (option (Opt_secondaryScroll)) |
561 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
569 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
562 | } |
570 | } |
563 | |
571 | |
564 | // clear WrapNext indicator, solidifying position on next line |
572 | // clear WrapNext indicator, solidifying position on next line |
565 | void |
573 | void |
… | |
… | |
598 | /* |
606 | /* |
599 | * Change the rendition style for following text |
607 | * Change the rendition style for following text |
600 | */ |
608 | */ |
601 | void |
609 | void |
602 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
610 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
603 | { |
611 | { |
604 | if (set) |
612 | if (set) |
605 | rstyle |= style; |
613 | rstyle |= style; |
606 | else if (style == ~RS_None) |
614 | else if (style == ~RS_None) |
607 | rstyle = DEFAULT_RSTYLE; |
615 | rstyle = DEFAULT_RSTYLE; |
608 | else |
616 | else |
609 | rstyle &= ~style; |
617 | rstyle &= ~style; |
610 | } |
618 | } |
611 | |
619 | |
612 | /* ------------------------------------------------------------------------- */ |
620 | /* ------------------------------------------------------------------------- */ |
613 | /* |
621 | /* |
614 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
622 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
615 | * count positive ==> scroll up |
623 | * count positive ==> scroll up |
… | |
… | |
624 | want_refresh = 1; |
632 | want_refresh = 1; |
625 | num_scr += count; |
633 | num_scr += count; |
626 | |
634 | |
627 | if (count > 0 |
635 | if (count > 0 |
628 | && row1 == 0 |
636 | && row1 == 0 |
629 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
637 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
630 | { |
638 | { |
631 | top_row = max (top_row - count, -saveLines); |
639 | top_row = max (top_row - count, -saveLines); |
632 | |
640 | |
633 | // scroll everything up 'count' lines |
641 | // scroll everything up 'count' lines |
634 | term_start = (term_start + count) % total_rows; |
642 | term_start = (term_start + count) % total_rows; |
… | |
… | |
666 | line_t &l2 = ROW(i); |
674 | line_t &l2 = ROW(i); |
667 | |
675 | |
668 | ::swap (l1, l2); |
676 | ::swap (l1, l2); |
669 | l2.touch (); |
677 | l2.touch (); |
670 | } |
678 | } |
671 | |
679 | |
672 | // move and/or clear selection, if any |
680 | // move and/or clear selection, if any |
673 | if (selection.op && current_screen == selection.screen) |
681 | if (selection.op && current_screen == selection.screen) |
674 | { |
682 | { |
675 | selection.beg.row -= count; |
683 | selection.beg.row -= count; |
676 | selection.end.row -= count; |
684 | selection.end.row -= count; |
… | |
… | |
684 | selection.op = SELECTION_CLEAR; |
692 | selection.op = SELECTION_CLEAR; |
685 | } |
693 | } |
686 | } |
694 | } |
687 | |
695 | |
688 | // finally move the view window, if desired |
696 | // finally move the view window, if desired |
689 | if (OPTION (Opt_scrollWithBuffer) |
697 | if (option (Opt_scrollWithBuffer) |
690 | && view_start != 0 |
698 | && view_start != 0 |
691 | && view_start != -saveLines) |
699 | && view_start != -saveLines) |
692 | scr_page (UP, count); |
700 | scr_page (UP, count); |
693 | |
701 | |
694 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
702 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
… | |
… | |
712 | { |
720 | { |
713 | /* move selected region too */ |
721 | /* move selected region too */ |
714 | selection.beg.row -= count; |
722 | selection.beg.row -= count; |
715 | selection.end.row -= count; |
723 | selection.end.row -= count; |
716 | selection.mark.row -= count; |
724 | selection.mark.row -= count; |
717 | |
725 | |
718 | selection_check (0); |
726 | selection_check (0); |
719 | } |
727 | } |
720 | } |
728 | } |
721 | |
729 | |
722 | // use a simple and robust scrolling algorithm, this |
730 | // use a simple and robust scrolling algorithm, this |
… | |
… | |
774 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
782 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
775 | screen.cur.row -= minlines; |
783 | screen.cur.row -= minlines; |
776 | } |
784 | } |
777 | } |
785 | } |
778 | |
786 | |
779 | #ifdef DEBUG_STRICT |
|
|
780 | assert (screen.cur.col < ncol); |
787 | assert (screen.cur.col < ncol); |
781 | assert (screen.cur.row < nrow |
788 | assert (screen.cur.row < nrow |
782 | && screen.cur.row >= top_row); |
789 | && screen.cur.row >= top_row); |
783 | #endif |
|
|
784 | int row = screen.cur.row; |
790 | int row = screen.cur.row; |
785 | |
791 | |
786 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
792 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
787 | |
793 | |
788 | line_t *line = &ROW(row); |
794 | line_t *line = &ROW(row); |
789 | |
795 | |
790 | while (str < strend) |
796 | while (str < strend) |
791 | { |
797 | { |
792 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
798 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
793 | |
799 | |
794 | if (c < 0x20) |
800 | if (expect_false (c < 0x20)) |
795 | if (c == C0_LF) |
801 | if (c == C0_LF) |
796 | { |
802 | { |
797 | max_it (line->l, screen.cur.col); |
803 | max_it (line->l, screen.cur.col); |
798 | |
804 | |
799 | screen.flags &= ~Screen_WrapNext; |
805 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
818 | { |
824 | { |
819 | scr_tab (1, true); |
825 | scr_tab (1, true); |
820 | continue; |
826 | continue; |
821 | } |
827 | } |
822 | |
828 | |
|
|
829 | if (expect_false ( |
823 | if (checksel /* see if we're writing within selection */ |
830 | checksel /* see if we're writing within selection */ |
824 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
831 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
825 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
832 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
833 | )) |
826 | { |
834 | { |
827 | checksel = 0; |
835 | checksel = 0; |
828 | /* |
836 | /* |
829 | * If we wrote anywhere in the selected area, kill the selection |
837 | * If we wrote anywhere in the selected area, kill the selection |
830 | * XXX: should we kill the mark too? Possibly, but maybe that |
838 | * XXX: should we kill the mark too? Possibly, but maybe that |
831 | * should be a similar check. |
839 | * should be a similar check. |
832 | */ |
840 | */ |
833 | CLEAR_SELECTION (); |
841 | CLEAR_SELECTION (); |
834 | } |
842 | } |
835 | |
843 | |
836 | if (screen.flags & Screen_WrapNext) |
844 | if (expect_false (screen.flags & Screen_WrapNext)) |
837 | { |
845 | { |
838 | scr_do_wrap (); |
846 | scr_do_wrap (); |
839 | |
847 | |
840 | line->l = ncol; |
848 | line->l = ncol; |
841 | line->is_longer (1); |
849 | line->is_longer (1); |
842 | |
850 | |
843 | row = screen.cur.row; |
851 | row = screen.cur.row; |
844 | line = &ROW(row); /* _must_ refresh */ |
852 | line = &ROW(row); /* _must_ refresh */ |
845 | } |
853 | } |
846 | |
854 | |
847 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
855 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
848 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
856 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
849 | c = 0xfffd; |
857 | c = 0xfffd; |
850 | |
858 | |
851 | // rely on wcwidth to tell us the character width, do wcwidth before |
859 | // rely on wcwidth to tell us the character width, do wcwidth before |
852 | // further replacements, as wcwidth might return -1 for the line |
860 | // further replacements, as wcwidth might return -1 for the line |
853 | // drawing characters below as they might be invalid in the current |
861 | // drawing characters below as they might be invalid in the current |
854 | // locale. |
862 | // locale. |
855 | int width = WCWIDTH (c); |
863 | int width = WCWIDTH (c); |
856 | |
864 | |
857 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
865 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
858 | { |
866 | { |
859 | // vt100 special graphics and line drawing |
867 | // vt100 special graphics and line drawing |
860 | // 5f-7e standard vt100 |
868 | // 5f-7e standard vt100 |
861 | // 40-5e rxvt extension for extra curses acs chars |
869 | // 40-5e rxvt extension for extra curses acs chars |
862 | static uint16_t vt100_0[62] = { // 41 .. 7e |
870 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
875 | c = vt100_0[c - 0x41]; |
883 | c = vt100_0[c - 0x41]; |
876 | width = 1; // vt100 line drawing characters are always single-width |
884 | width = 1; // vt100 line drawing characters are always single-width |
877 | } |
885 | } |
878 | } |
886 | } |
879 | |
887 | |
880 | if (screen.flags & Screen_Insert) |
888 | if (expect_false (screen.flags & Screen_Insert)) |
881 | scr_insdel_chars (width, INSERT); |
889 | scr_insdel_chars (width, INSERT); |
882 | |
890 | |
883 | if (width != 0) |
891 | if (width != 0) |
884 | { |
892 | { |
885 | #if !UNICODE_3 |
893 | #if !UNICODE_3 |
… | |
… | |
890 | # else |
898 | # else |
891 | c = 0xfffd; |
899 | c = 0xfffd; |
892 | # endif |
900 | # endif |
893 | #endif |
901 | #endif |
894 | |
902 | |
|
|
903 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
904 | |
|
|
905 | // if the character doesn't fit into the remaining columns... |
|
|
906 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
|
|
907 | { |
|
|
908 | if (screen.flags & Screen_Autowrap) |
|
|
909 | { |
|
|
910 | // ... artificially enlargen the previous one |
|
|
911 | c = NOCHAR; |
|
|
912 | // and try the same character next loop iteration |
|
|
913 | --str; |
|
|
914 | } |
|
|
915 | else |
|
|
916 | screen.cur.col = ncol - width; |
|
|
917 | } |
|
|
918 | |
895 | // nuke the character at this position, if required |
919 | // nuke the character at this position, if required |
|
|
920 | // due to wonderful coincidences everywhere else in this loop |
|
|
921 | // we never have to check for overwriting a wide char itself, |
|
|
922 | // only its tail. |
896 | if (line->t[screen.cur.col] == NOCHAR |
923 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
897 | || (screen.cur.col < ncol - 1 |
924 | scr_kill_char (*line, screen.cur.col); |
898 | && line->t[screen.cur.col + 1] == NOCHAR)) |
|
|
899 | { |
|
|
900 | int col = screen.cur.col; |
|
|
901 | |
|
|
902 | // find begin |
|
|
903 | while (col > 0 && line->t[col] == NOCHAR) |
|
|
904 | col--; |
|
|
905 | |
|
|
906 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
|
|
907 | |
|
|
908 | // found begin, nuke |
|
|
909 | do { |
|
|
910 | line->t[col] = ' '; |
|
|
911 | line->r[col] = rend; |
|
|
912 | col++; |
|
|
913 | } while (col < ncol && line->t[col] == NOCHAR); |
|
|
914 | } |
|
|
915 | |
|
|
916 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
917 | |
|
|
918 | // if the character doesn't fit into the remaining columns... |
|
|
919 | if (screen.cur.col > ncol - width && ncol >= width) |
|
|
920 | { |
|
|
921 | // ...output spaces |
|
|
922 | c = ' '; |
|
|
923 | // and try the same character next loop iteration |
|
|
924 | --str; |
|
|
925 | } |
|
|
926 | |
925 | |
927 | line->touch (); |
926 | line->touch (); |
928 | |
927 | |
929 | do |
928 | do |
930 | { |
929 | { |
931 | line->t[screen.cur.col] = c; |
930 | line->t[screen.cur.col] = c; |
932 | line->r[screen.cur.col] = rend; |
931 | line->r[screen.cur.col] = rend; |
933 | |
932 | |
934 | if (screen.cur.col < ncol - 1) |
933 | if (expect_true (screen.cur.col < ncol - 1)) |
935 | screen.cur.col++; |
934 | screen.cur.col++; |
936 | else |
935 | else |
937 | { |
936 | { |
938 | line->l = ncol; |
937 | line->l = ncol; |
939 | if (screen.flags & Screen_Autowrap) |
938 | if (screen.flags & Screen_Autowrap) |
940 | screen.flags |= Screen_WrapNext; |
939 | screen.flags |= Screen_WrapNext; |
941 | break; |
940 | |
|
|
941 | goto end_of_line; |
942 | } |
942 | } |
943 | |
943 | |
944 | c = NOCHAR; |
944 | c = NOCHAR; |
945 | } |
945 | } |
946 | while (--width > 0); |
946 | while (expect_false (--width > 0)); |
947 | |
947 | |
948 | // pad with spaces when overwriting wide character with smaller one |
948 | // pad with spaces when overwriting wide character with smaller one |
949 | if (!width) |
949 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
950 | { |
950 | { |
951 | line->touch (); |
951 | line->t[c] = ' '; |
|
|
952 | line->r[c] = rend; |
|
|
953 | } |
952 | |
954 | |
953 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
955 | end_of_line: |
|
|
956 | ; |
|
|
957 | } |
|
|
958 | #if ENABLE_COMBINING |
|
|
959 | else // width == 0 |
|
|
960 | { |
|
|
961 | if (c != 0xfeff) // ignore BOM |
|
|
962 | { |
|
|
963 | // handle combining characters |
|
|
964 | // we just tag the accent on the previous on-screen character. |
|
|
965 | // this is arguably not correct, but also arguably not wrong. |
|
|
966 | // we don't handle double-width characters nicely yet. |
|
|
967 | line_t *linep; |
|
|
968 | text_t *tp; |
|
|
969 | rend_t *rp; |
|
|
970 | |
|
|
971 | if (screen.cur.col > 0) |
954 | { |
972 | { |
955 | line->t[c] = ' '; |
|
|
956 | line->r[c] = rend; |
973 | linep = line; |
|
|
974 | tp = line->t + screen.cur.col - 1; |
|
|
975 | rp = line->r + screen.cur.col - 1; |
957 | } |
976 | } |
|
|
977 | else if (screen.cur.row > 0 |
|
|
978 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
979 | { |
|
|
980 | linep = &ROW(screen.cur.row - 1); |
|
|
981 | tp = line->t + ncol - 1; |
|
|
982 | rp = line->r + ncol - 1; |
|
|
983 | } |
|
|
984 | else |
|
|
985 | continue; |
|
|
986 | |
|
|
987 | linep->touch (); |
|
|
988 | |
|
|
989 | while (*tp == NOCHAR && tp > linep->t) |
|
|
990 | tp--, rp--; |
|
|
991 | |
|
|
992 | // first try to find a precomposed character |
|
|
993 | unicode_t n = rxvt_compose (*tp, c); |
|
|
994 | if (n == NOCHAR) |
|
|
995 | n = rxvt_composite.compose (*tp, c); |
|
|
996 | |
|
|
997 | *tp = n; |
|
|
998 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
958 | } |
999 | } |
959 | } |
1000 | } |
960 | else // width == 0 |
|
|
961 | { |
|
|
962 | #if ENABLE_COMBINING |
|
|
963 | // handle combining characters |
|
|
964 | // we just tag the accent on the previous on-screen character. |
|
|
965 | // this is arguably not correct, but also arguably not wrong. |
|
|
966 | // we don't handle double-width characters nicely yet. |
|
|
967 | line_t *linep; |
|
|
968 | text_t *tp; |
|
|
969 | rend_t *rp; |
|
|
970 | |
|
|
971 | if (screen.cur.col > 0) |
|
|
972 | { |
|
|
973 | linep = line; |
|
|
974 | tp = line->t + screen.cur.col - 1; |
|
|
975 | rp = line->r + screen.cur.col - 1; |
|
|
976 | } |
|
|
977 | else if (screen.cur.row > 0 |
|
|
978 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
979 | { |
|
|
980 | linep = &ROW(screen.cur.row - 1); |
|
|
981 | tp = line->t + ncol - 1; |
|
|
982 | rp = line->r + ncol - 1; |
|
|
983 | } |
|
|
984 | else |
|
|
985 | continue; |
|
|
986 | |
|
|
987 | linep->touch (); |
|
|
988 | |
|
|
989 | while (*tp == NOCHAR && tp > linep->t) |
|
|
990 | tp--, rp--; |
|
|
991 | |
|
|
992 | // first try to find a precomposed character |
|
|
993 | unicode_t n = rxvt_compose (*tp, c); |
|
|
994 | if (n == NOCHAR) |
|
|
995 | n = rxvt_composite.compose (*tp, c); |
|
|
996 | |
|
|
997 | *tp = n; |
|
|
998 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
|
|
999 | #endif |
1001 | #endif |
1000 | } |
|
|
1001 | } |
1002 | } |
1002 | |
1003 | |
1003 | max_it (line->l, screen.cur.col); |
1004 | max_it (line->l, screen.cur.col); |
1004 | |
1005 | |
1005 | #ifdef DEBUG_STRICT |
|
|
1006 | assert (screen.cur.row >= 0); |
1006 | assert (screen.cur.row >= 0); |
1007 | #endif |
|
|
1008 | } |
1007 | } |
1009 | |
1008 | |
1010 | /* ------------------------------------------------------------------------- */ |
1009 | /* ------------------------------------------------------------------------- */ |
1011 | /* |
1010 | /* |
1012 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1011 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1013 | * XTERM_SEQ: CTRL-H |
1012 | * XTERM_SEQ: CTRL-H |
1014 | */ |
1013 | */ |
1015 | void |
1014 | void |
1016 | rxvt_term::scr_backspace () NOTHROW |
1015 | rxvt_term::scr_backspace () NOTHROW |
1017 | { |
1016 | { |
1018 | want_refresh = 1; |
|
|
1019 | |
|
|
1020 | if (screen.cur.col == 0) |
1017 | if (screen.cur.col == 0) |
1021 | { |
1018 | { |
1022 | if (screen.cur.row > 0) |
1019 | if (screen.cur.row > 0) |
1023 | { |
1020 | { |
1024 | #ifdef TERMCAP_HAS_BW |
1021 | #ifdef TERMCAP_HAS_BW |
1025 | screen.cur.col = ncol - 1; |
1022 | screen.cur.col = ncol - 1; |
1026 | screen.cur.row--; |
1023 | --screen.cur.row; |
1027 | return; |
1024 | |
|
|
1025 | want_refresh = 1; |
1028 | #endif |
1026 | #endif |
1029 | } |
1027 | } |
1030 | } |
1028 | } |
1031 | else if (!(screen.flags & Screen_WrapNext)) |
1029 | else if (screen.flags & Screen_WrapNext) |
|
|
1030 | screen.flags &= ~Screen_WrapNext; |
|
|
1031 | else |
1032 | scr_gotorc (0, -1, RELATIVE); |
1032 | scr_gotorc (0, -1, RELATIVE); |
1033 | |
|
|
1034 | screen.flags &= ~Screen_WrapNext; |
|
|
1035 | } |
1033 | } |
1036 | |
1034 | |
1037 | /* ------------------------------------------------------------------------- */ |
1035 | /* ------------------------------------------------------------------------- */ |
1038 | /* |
1036 | /* |
1039 | * Process Horizontal Tab |
1037 | * Process Horizontal Tab |
… | |
… | |
1062 | x = i; |
1060 | x = i; |
1063 | |
1061 | |
1064 | if (!--count) |
1062 | if (!--count) |
1065 | break; |
1063 | break; |
1066 | } |
1064 | } |
1067 | else |
1065 | else |
1068 | ht &= l.t[i] == ' ' |
1066 | ht &= l.t[i] == ' ' |
1069 | && RS_SAME (l.r[i], base_rend); |
1067 | && RS_SAME (l.r[i], base_rend); |
1070 | |
1068 | |
1071 | if (count) |
1069 | if (count) |
1072 | x = ncol - 1; |
1070 | x = ncol - 1; |
1073 | |
1071 | |
1074 | // store horizontal tab commands as characters inside the text |
1072 | // store horizontal tab commands as characters inside the text |
1075 | // buffer so they can be selected and pasted. |
1073 | // buffer so they can be selected and pasted. |
1076 | if (ht && OPTION (Opt_pastableTabs)) |
1074 | if (ht && option (Opt_pastableTabs)) |
1077 | { |
1075 | { |
1078 | base_rend = SET_FONT (base_rend, 0); |
1076 | base_rend = SET_FONT (base_rend, 0); |
1079 | |
1077 | |
1080 | l.touch (x); |
1078 | l.touch (x); |
1081 | |
1079 | |
… | |
… | |
1188 | } |
1186 | } |
1189 | } |
1187 | } |
1190 | else |
1188 | else |
1191 | { |
1189 | { |
1192 | if (screen.flags & Screen_Relative) |
1190 | if (screen.flags & Screen_Relative) |
|
|
1191 | { |
1193 | { /* relative origin mode */ |
1192 | /* relative origin mode */ |
1194 | screen.cur.row = row + screen.tscroll; |
1193 | screen.cur.row = row + screen.tscroll; |
1195 | min_it (screen.cur.row, screen.bscroll); |
1194 | min_it (screen.cur.row, screen.bscroll); |
1196 | } |
1195 | } |
1197 | else |
1196 | else |
1198 | screen.cur.row = row; |
1197 | screen.cur.row = row; |
… | |
… | |
1231 | /* |
1230 | /* |
1232 | * Erase part or whole of a line |
1231 | * Erase part or whole of a line |
1233 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1232 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1234 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1233 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1235 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1234 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
|
|
1235 | * extension: clear to right unless wrapped: ESC [ 3 K |
1236 | */ |
1236 | */ |
1237 | void |
1237 | void |
1238 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1238 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1239 | { |
1239 | { |
1240 | unsigned int col, num; |
1240 | unsigned int col, num; |
… | |
… | |
1249 | line.touch (); |
1249 | line.touch (); |
1250 | line.is_longer (0); |
1250 | line.is_longer (0); |
1251 | |
1251 | |
1252 | switch (mode) |
1252 | switch (mode) |
1253 | { |
1253 | { |
|
|
1254 | case 3: |
|
|
1255 | if (screen.flags & Screen_WrapNext) |
|
|
1256 | return; |
|
|
1257 | |
|
|
1258 | /* fall through */ |
|
|
1259 | |
1254 | case 0: /* erase to end of line */ |
1260 | case 0: /* erase to end of line */ |
1255 | col = screen.cur.col; |
1261 | col = screen.cur.col; |
1256 | num = ncol - col; |
1262 | num = ncol - col; |
1257 | min_it (line.l, col); |
1263 | min_it (line.l, col); |
|
|
1264 | |
1258 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1265 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1259 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1266 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1260 | CLEAR_SELECTION (); |
1267 | CLEAR_SELECTION (); |
1261 | break; |
1268 | break; |
|
|
1269 | |
1262 | case 1: /* erase to beginning of line */ |
1270 | case 1: /* erase to beginning of line */ |
1263 | col = 0; |
1271 | col = 0; |
1264 | num = screen.cur.col + 1; |
1272 | num = screen.cur.col + 1; |
|
|
1273 | |
1265 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1274 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1266 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1275 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1267 | CLEAR_SELECTION (); |
1276 | CLEAR_SELECTION (); |
1268 | break; |
1277 | break; |
|
|
1278 | |
1269 | case 2: /* erase whole line */ |
1279 | case 2: /* erase whole line */ |
1270 | col = 0; |
1280 | col = 0; |
1271 | num = ncol; |
1281 | num = ncol; |
1272 | line.l = 0; |
1282 | line.l = 0; |
1273 | if (selection.beg.row <= screen.cur.row |
1283 | if (selection.beg.row <= screen.cur.row |
… | |
… | |
1331 | if (row >= nrow) /* Out Of Bounds */ |
1341 | if (row >= nrow) /* Out Of Bounds */ |
1332 | return; |
1342 | return; |
1333 | |
1343 | |
1334 | min_it (num, nrow - row); |
1344 | min_it (num, nrow - row); |
1335 | |
1345 | |
1336 | if (rstyle & (RS_RVid | RS_Uline)) |
1346 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1337 | ren = (rend_t) ~RS_None; |
1347 | ren = (rend_t) ~RS_None; |
1338 | else if (GET_BASEBG (rstyle) == Color_bg) |
1348 | else if (GET_BASEBG (rstyle) == Color_bg) |
1339 | { |
1349 | { |
1340 | ren = DEFAULT_RSTYLE; |
1350 | ren = DEFAULT_RSTYLE; |
1341 | CLEAR_ROWS (row, num); |
1351 | |
|
|
1352 | if (mapped) |
|
|
1353 | XClearArea (dpy, vt, 0, |
|
|
1354 | Row2Pixel (row - view_start), (unsigned int)width, |
|
|
1355 | (unsigned int)Height2Pixel (num), False); |
1342 | } |
1356 | } |
1343 | else |
1357 | else |
1344 | { |
1358 | { |
1345 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1359 | ren = rstyle & (RS_fgMask | RS_bgMask); |
|
|
1360 | |
|
|
1361 | if (mapped) |
|
|
1362 | { |
1346 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1363 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1347 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1364 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1348 | ERASE_ROWS (row, num); |
1365 | XFillRectangle (dpy, vt, gc, |
|
|
1366 | 0, Row2Pixel (row - view_start), |
|
|
1367 | (unsigned int)width, |
|
|
1368 | (unsigned int)Height2Pixel (num)); |
1349 | gcvalue.foreground = pix_colors[Color_fg]; |
1369 | gcvalue.foreground = pix_colors[Color_fg]; |
1350 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1370 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1371 | } |
1351 | } |
1372 | } |
1352 | |
1373 | |
1353 | for (; num--; row++) |
1374 | for (; num--; row++) |
1354 | { |
1375 | { |
1355 | scr_blank_screen_mem (ROW(row), rstyle); |
1376 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1377 | |
|
|
1378 | if (row - view_start < nrow) |
1356 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1379 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1357 | } |
1380 | } |
1358 | } |
1381 | } |
1359 | |
1382 | |
1360 | #if !ENABLE_MINIMAL |
1383 | #if !ENABLE_MINIMAL |
1361 | void |
1384 | void |
… | |
… | |
1435 | * Insert/Delete <count> characters from the current position |
1458 | * Insert/Delete <count> characters from the current position |
1436 | */ |
1459 | */ |
1437 | void |
1460 | void |
1438 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1461 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1439 | { |
1462 | { |
1440 | int col, row; |
|
|
1441 | rend_t tr; |
|
|
1442 | |
|
|
1443 | want_refresh = 1; |
1463 | want_refresh = 1; |
1444 | ZERO_SCROLLBACK (); |
1464 | ZERO_SCROLLBACK (); |
1445 | |
1465 | |
1446 | if (count <= 0) |
1466 | if (count <= 0) |
1447 | return; |
1467 | return; |
… | |
… | |
1449 | scr_do_wrap (); |
1469 | scr_do_wrap (); |
1450 | |
1470 | |
1451 | selection_check (1); |
1471 | selection_check (1); |
1452 | min_it (count, ncol - screen.cur.col); |
1472 | min_it (count, ncol - screen.cur.col); |
1453 | |
1473 | |
1454 | row = screen.cur.row; |
1474 | int row = screen.cur.row; |
1455 | |
1475 | |
1456 | line_t *line = &ROW(row); |
1476 | line_t *line = &ROW(row); |
1457 | |
1477 | |
1458 | line->touch (); |
1478 | line->touch (); |
1459 | line->is_longer (0); |
1479 | line->is_longer (0); |
1460 | |
1480 | |
|
|
1481 | // nuke wide spanning the start |
|
|
1482 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1483 | scr_kill_char (*line, screen.cur.col); |
|
|
1484 | |
1461 | switch (insdel) |
1485 | switch (insdel) |
1462 | { |
1486 | { |
1463 | case INSERT: |
1487 | case INSERT: |
1464 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1488 | line->l = min (line->l + count, ncol); |
|
|
1489 | |
|
|
1490 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1491 | scr_kill_char (*line, screen.cur.col); |
|
|
1492 | |
|
|
1493 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1465 | { |
1494 | { |
1466 | line->t[col] = line->t[col - count]; |
1495 | line->t[col] = line->t[col - count]; |
1467 | line->r[col] = line->r[col - count]; |
1496 | line->r[col] = line->r[col - count]; |
1468 | } |
1497 | } |
1469 | |
|
|
1470 | line->l = min (line->l + count, ncol); |
|
|
1471 | |
1498 | |
1472 | if (selection.op && current_screen == selection.screen |
1499 | if (selection.op && current_screen == selection.screen |
1473 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1500 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1474 | { |
1501 | { |
1475 | if (selection.end.row != screen.cur.row |
1502 | if (selection.end.row != screen.cur.row |
1476 | || (selection.end.col + count >= ncol)) |
1503 | || (selection.end.col + count >= ncol)) |
1477 | CLEAR_SELECTION (); |
1504 | CLEAR_SELECTION (); |
1478 | else |
1505 | else |
|
|
1506 | { |
1479 | { /* shift selection */ |
1507 | /* shift selection */ |
1480 | selection.beg.col += count; |
1508 | selection.beg.col += count; |
1481 | selection.mark.col += count; /* XXX: yes? */ |
1509 | selection.mark.col += count; /* XXX: yes? */ |
1482 | selection.end.col += count; |
1510 | selection.end.col += count; |
1483 | } |
1511 | } |
1484 | } |
1512 | } |
… | |
… | |
1489 | case ERASE: |
1517 | case ERASE: |
1490 | screen.cur.col += count; /* don't worry if > ncol */ |
1518 | screen.cur.col += count; /* don't worry if > ncol */ |
1491 | selection_check (1); |
1519 | selection_check (1); |
1492 | screen.cur.col -= count; |
1520 | screen.cur.col -= count; |
1493 | |
1521 | |
1494 | line->l = max (line->l - count, 0); |
1522 | // nuke wide char after the end |
|
|
1523 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1524 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1525 | |
1495 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1526 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1496 | break; |
1527 | break; |
1497 | |
1528 | |
1498 | case DELETE: |
1529 | case DELETE: |
1499 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1530 | line->l = max (line->l - count, 0); |
1500 | |
1531 | |
|
|
1532 | // nuke wide char spanning the end |
|
|
1533 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1534 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1535 | |
1501 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1536 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1502 | { |
1537 | { |
1503 | line->t[col] = line->t[col + count]; |
1538 | line->t[col] = line->t[col + count]; |
1504 | line->r[col] = line->r[col + count]; |
1539 | line->r[col] = line->r[col + count]; |
1505 | } |
1540 | } |
1506 | |
1541 | |
1507 | line->l = max (line->l - count, 0); |
|
|
1508 | scr_blank_line (*line, ncol - count, count, tr); |
1542 | scr_blank_line (*line, ncol - count, count, rstyle); |
1509 | |
1543 | |
1510 | if (selection.op && current_screen == selection.screen |
1544 | if (selection.op && current_screen == selection.screen |
1511 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1545 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1512 | { |
1546 | { |
1513 | if (selection.end.row != screen.cur.row |
1547 | if (selection.end.row != screen.cur.row |
… | |
… | |
1623 | */ |
1657 | */ |
1624 | void |
1658 | void |
1625 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1659 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1626 | { |
1660 | { |
1627 | if (mode < 0) |
1661 | if (mode < 0) |
1628 | memset (tabs, 0, ncol * sizeof (char)); |
1662 | memset (tabs, 0, ncol); |
1629 | else if (screen.cur.col < ncol) |
1663 | else if (screen.cur.col < ncol) |
1630 | tabs [screen.cur.col] = !!mode; |
1664 | tabs [screen.cur.col] = !!mode; |
1631 | } |
1665 | } |
1632 | |
1666 | |
1633 | /* ------------------------------------------------------------------------- */ |
1667 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1648 | if (rvideo_state != on) |
1682 | if (rvideo_state != on) |
1649 | { |
1683 | { |
1650 | rvideo_state = on; |
1684 | rvideo_state = on; |
1651 | |
1685 | |
1652 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1686 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1653 | #if XPM_BACKGROUND |
1687 | #ifdef HAVE_BG_PIXMAP |
1654 | if (bgPixmap.pixmap == None) |
1688 | if (bg_pixmap == None) |
1655 | #endif |
|
|
1656 | #if TRANSPARENT |
|
|
1657 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
|
|
1658 | #endif |
1689 | #endif |
1659 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1690 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1660 | |
1691 | |
1661 | XGCValues gcvalue; |
1692 | XGCValues gcvalue; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1693 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1871 | return true; |
1902 | return true; |
1872 | } |
1903 | } |
1873 | |
1904 | |
1874 | #ifndef NO_BELL |
1905 | #ifndef NO_BELL |
1875 | void |
1906 | void |
1876 | rxvt_term::bell_cb (time_watcher &w) |
1907 | rxvt_term::bell_cb (ev::timer &w, int revents) |
1877 | { |
1908 | { |
1878 | rvideo_bell = false; |
1909 | rvideo_bell = false; |
1879 | scr_rvideo_mode (rvideo_mode); |
1910 | scr_rvideo_mode (rvideo_mode); |
|
|
1911 | refresh_check (); |
1880 | } |
1912 | } |
1881 | #endif |
1913 | #endif |
1882 | |
1914 | |
1883 | /* ------------------------------------------------------------------------- */ |
1915 | /* ------------------------------------------------------------------------- */ |
1884 | void |
1916 | void |
… | |
… | |
1886 | { |
1918 | { |
1887 | #ifndef NO_BELL |
1919 | #ifndef NO_BELL |
1888 | |
1920 | |
1889 | # ifndef NO_MAPALERT |
1921 | # ifndef NO_MAPALERT |
1890 | # ifdef MAPALERT_OPTION |
1922 | # ifdef MAPALERT_OPTION |
1891 | if (OPTION (Opt_mapAlert)) |
1923 | if (option (Opt_mapAlert)) |
1892 | # endif |
1924 | # endif |
1893 | XMapWindow (dpy, parent[0]); |
1925 | XMapWindow (dpy, parent[0]); |
1894 | # endif |
1926 | # endif |
1895 | |
1927 | |
|
|
1928 | # if ENABLE_FRILLS |
|
|
1929 | if (option (Opt_urgentOnBell)) |
|
|
1930 | set_urgency (1); |
|
|
1931 | # endif |
|
|
1932 | |
1896 | if (OPTION (Opt_visualBell)) |
1933 | if (option (Opt_visualBell)) |
1897 | { |
1934 | { |
1898 | rvideo_bell = true; |
1935 | rvideo_bell = true; |
1899 | scr_rvideo_mode (rvideo_mode); |
1936 | scr_rvideo_mode (rvideo_mode); |
1900 | display->flush (); |
1937 | flush (); |
1901 | |
1938 | |
1902 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1939 | bell_ev.start (VISUAL_BELL_DURATION); |
1903 | } |
1940 | } |
1904 | else |
1941 | else |
1905 | XBell (dpy, 0); |
1942 | XBell (dpy, 0); |
1906 | |
1943 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1907 | #endif |
1944 | #endif |
1908 | } |
1945 | } |
1909 | |
1946 | |
1910 | /* ------------------------------------------------------------------------- */ |
1947 | /* ------------------------------------------------------------------------- */ |
1911 | /* ARGSUSED */ |
1948 | /* ARGSUSED */ |
1912 | void |
1949 | void |
1913 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1950 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1914 | { |
1951 | { |
1915 | #ifdef PRINTPIPE |
1952 | #ifdef PRINTPIPE |
1916 | int nrows, row_start; |
1953 | int nrows, row_start; |
1917 | FILE *fd; |
1954 | FILE *fd = popen_printer (); |
1918 | |
1955 | |
1919 | if ((fd = popen_printer ()) == NULL) |
1956 | if (!fd) |
1920 | return; |
1957 | return; |
1921 | |
1958 | |
1922 | if (fullhist) |
1959 | if (fullhist) |
1923 | { |
1960 | { |
1924 | nrows = nrow - top_row; |
1961 | nrows = nrow - top_row; |
… | |
… | |
1930 | row_start = view_start; |
1967 | row_start = view_start; |
1931 | } |
1968 | } |
1932 | |
1969 | |
1933 | wctomb (0, 0); |
1970 | wctomb (0, 0); |
1934 | |
1971 | |
1935 | for (int r1 = 0; r1 < nrows; r1++) |
1972 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1936 | { |
1973 | { |
1937 | text_t *tp = ROW(r1).t; |
1974 | text_t *tp = ROW(r1).t; |
1938 | int len = ROW(r1).l; |
1975 | int len = ROW(r1).l; |
1939 | |
1976 | |
1940 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1977 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
1969 | * screen.text/screen.rend contain what the screen will change to. |
2006 | * screen.text/screen.rend contain what the screen will change to. |
1970 | */ |
2007 | */ |
1971 | void |
2008 | void |
1972 | rxvt_term::scr_refresh () NOTHROW |
2009 | rxvt_term::scr_refresh () NOTHROW |
1973 | { |
2010 | { |
1974 | unsigned char have_bg, |
|
|
1975 | showcursor; /* show the cursor */ |
|
|
1976 | int16_t col, row, /* column/row we're processing */ |
2011 | int16_t col, row, /* column/row we're processing */ |
1977 | ocrow; /* old cursor row */ |
2012 | ocrow; /* old cursor row */ |
1978 | int i; /* tmp */ |
2013 | int i; /* tmp */ |
1979 | #ifndef NO_CURSORCOLOR |
2014 | #ifndef NO_CURSORCOLOR |
1980 | rend_t cc1; /* store colours at cursor position (s) */ |
2015 | rend_t cc1; /* store colours at cursor position (s) */ |
1981 | #endif |
2016 | #endif |
1982 | rend_t *crp; // cursor rendition pointer |
2017 | rend_t *crp; // cursor rendition pointer |
|
|
2018 | rend_t ccol1, /* Cursor colour */ |
|
|
2019 | ccol2; /* Cursor colour2 */ |
1983 | |
2020 | |
1984 | want_refresh = 0; /* screen is current */ |
2021 | want_refresh = 0; /* screen is current */ |
1985 | |
2022 | |
1986 | if (refresh_type == NO_REFRESH || !mapped) |
2023 | if (refresh_type == NO_REFRESH || !mapped) |
1987 | return; |
2024 | return; |
1988 | |
2025 | |
1989 | /* |
2026 | /* |
1990 | * A: set up vars |
2027 | * A: set up vars |
1991 | */ |
2028 | */ |
1992 | have_bg = 0; |
|
|
1993 | refresh_count = 0; |
2029 | refresh_count = 0; |
1994 | |
2030 | |
1995 | #if XPM_BACKGROUND |
2031 | unsigned int old_screen_flags = screen.flags; |
|
|
2032 | char have_bg = 0; |
|
|
2033 | #ifdef HAVE_BG_PIXMAP |
1996 | have_bg |= bgPixmap.pixmap != None; |
2034 | have_bg = bg_pixmap != None; |
1997 | #endif |
|
|
1998 | #if TRANSPARENT |
|
|
1999 | have_bg |= OPTION (Opt_transparent) && am_transparent; |
|
|
2000 | #endif |
2035 | #endif |
2001 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2036 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2002 | |
2037 | |
2003 | /* |
2038 | /* |
2004 | * B: reverse any characters which are selected |
2039 | * B: reverse any characters which are selected |
2005 | */ |
2040 | */ |
2006 | scr_reverse_selection (); |
2041 | scr_reverse_selection (); |
|
|
2042 | |
|
|
2043 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2044 | #if ENABLE_OVERLAY |
|
|
2045 | scr_swap_overlay (); |
|
|
2046 | #endif |
|
|
2047 | |
|
|
2048 | char showcursor = screen.flags & Screen_VisibleCursor; |
2007 | |
2049 | |
2008 | /* |
2050 | /* |
2009 | * C: set the cursor character (s) |
2051 | * C: set the cursor character (s) |
2010 | */ |
2052 | */ |
2011 | { |
2053 | { |
2012 | unsigned char setoldcursor; |
2054 | unsigned char setoldcursor; |
2013 | rend_t ccol1, /* Cursor colour */ |
|
|
2014 | ccol2; /* Cursor colour2 */ |
|
|
2015 | |
2055 | |
2016 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2017 | #ifdef CURSOR_BLINK |
2056 | #ifdef CURSOR_BLINK |
2018 | if (hidden_cursor) |
2057 | if (hidden_cursor) |
2019 | showcursor = 0; |
2058 | showcursor = 0; |
2020 | #endif |
2059 | #endif |
2021 | |
2060 | |
… | |
… | |
2026 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2065 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2027 | col--; |
2066 | col--; |
2028 | |
2067 | |
2029 | crp = &ROW(screen.cur.row).r[col]; |
2068 | crp = &ROW(screen.cur.row).r[col]; |
2030 | |
2069 | |
2031 | if (showcursor && focus) |
2070 | #ifndef NO_CURSORCOLOR |
|
|
2071 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2072 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2073 | ccol1 = Color_cursor; |
|
|
2074 | else |
|
|
2075 | #endif |
|
|
2076 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2077 | ccol1 = fgcolor_of (rstyle); |
|
|
2078 | #else |
|
|
2079 | ccol1 = Color_fg; |
|
|
2080 | #endif |
|
|
2081 | |
|
|
2082 | #ifndef NO_CURSORCOLOR |
|
|
2083 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2084 | ccol2 = Color_cursor2; |
|
|
2085 | else |
|
|
2086 | #endif |
|
|
2087 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2088 | ccol2 = bgcolor_of (rstyle); |
|
|
2089 | #else |
|
|
2090 | ccol2 = Color_bg; |
|
|
2091 | #endif |
|
|
2092 | |
|
|
2093 | if (focus) |
2032 | { |
2094 | { |
2033 | if (OPTION (Opt_cursorUnderline)) |
2095 | if (option (Opt_cursorUnderline)) |
2034 | *crp ^= RS_Uline; |
2096 | *crp ^= RS_Uline; |
2035 | else |
2097 | else |
2036 | { |
2098 | { |
2037 | *crp ^= RS_RVid; |
2099 | *crp ^= RS_RVid; |
2038 | |
|
|
2039 | #ifndef NO_CURSORCOLOR |
|
|
2040 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2041 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2042 | ccol1 = Color_cursor; |
|
|
2043 | else |
|
|
2044 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2045 | ccol1 = fgcolor_of (rstyle); |
|
|
2046 | #else |
|
|
2047 | ccol1 = Color_fg; |
|
|
2048 | #endif |
|
|
2049 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2050 | ccol2 = Color_cursor2; |
|
|
2051 | else |
|
|
2052 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2053 | ccol2 = bgcolor_of (rstyle); |
|
|
2054 | #else |
|
|
2055 | ccol2 = Color_bg; |
|
|
2056 | #endif |
|
|
2057 | *crp = SET_FGCOLOR (*crp, ccol1); |
2100 | *crp = SET_FGCOLOR (*crp, ccol1); |
2058 | *crp = SET_BGCOLOR (*crp, ccol2); |
2101 | *crp = SET_BGCOLOR (*crp, ccol2); |
2059 | #endif |
|
|
2060 | } |
2102 | } |
2061 | } |
2103 | } |
2062 | } |
2104 | } |
2063 | |
2105 | |
2064 | /* make sure no outline cursor is left around */ |
2106 | /* make sure no outline cursor is left around */ |
… | |
… | |
2091 | oldcursor.col = screen.cur.col; |
2133 | oldcursor.col = screen.cur.col; |
2092 | } |
2134 | } |
2093 | } |
2135 | } |
2094 | } |
2136 | } |
2095 | |
2137 | |
2096 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2097 | #if ENABLE_OVERLAY |
|
|
2098 | scr_swap_overlay (); |
|
|
2099 | #endif |
|
|
2100 | |
|
|
2101 | #ifndef NO_SLOW_LINK_SUPPORT |
2138 | #ifndef NO_SLOW_LINK_SUPPORT |
2102 | /* |
2139 | /* |
2103 | * D: CopyArea pass - very useful for slower links |
2140 | * D: CopyArea pass - very useful for slower links |
2104 | * This has been deliberately kept simple. |
2141 | * This has been deliberately kept simple. |
2105 | */ |
2142 | */ |
… | |
… | |
2194 | continue; |
2231 | continue; |
2195 | |
2232 | |
2196 | // redraw one or more characters |
2233 | // redraw one or more characters |
2197 | |
2234 | |
2198 | // seek to the beginning of wide characters |
2235 | // seek to the beginning of wide characters |
2199 | while (stp[col] == NOCHAR && col > 0) |
2236 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2200 | --col; |
2237 | --col; |
2201 | |
2238 | |
2202 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2239 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2203 | text_t *text = stp + col; |
2240 | text_t *text = stp + col; |
2204 | int count = 1; |
2241 | int count = 1; |
2205 | |
2242 | |
2206 | dtp[col] = stp[col]; |
2243 | dtp[col] = stp[col]; |
2207 | drp[col] = rend; |
2244 | drp[col] = rend; |
… | |
… | |
2211 | for (i = 0; ++col < ncol; ) |
2248 | for (i = 0; ++col < ncol; ) |
2212 | { |
2249 | { |
2213 | if (stp[col] == NOCHAR) |
2250 | if (stp[col] == NOCHAR) |
2214 | { |
2251 | { |
2215 | dtp[col] = stp[col]; |
2252 | dtp[col] = stp[col]; |
2216 | drp[col] = rend; |
2253 | drp[col] = srp[col]; |
|
|
2254 | |
2217 | count++; |
2255 | count++; |
2218 | i++; |
2256 | i++; |
2219 | |
2257 | |
2220 | continue; |
2258 | continue; |
2221 | } |
2259 | } |
… | |
… | |
2241 | |
2279 | |
2242 | col--; /* went one too far. move back */ |
2280 | col--; /* went one too far. move back */ |
2243 | count -= i; /* dump any matching trailing chars */ |
2281 | count -= i; /* dump any matching trailing chars */ |
2244 | |
2282 | |
2245 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2283 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2246 | while (i && text[count] == NOCHAR) |
2284 | while (expect_false (i && text[count] == NOCHAR)) |
2247 | count++, i--; |
2285 | count++, i--; |
2248 | |
2286 | |
2249 | /* |
2287 | /* |
2250 | * Determine the attributes for the string |
2288 | * Determine the attributes for the string |
2251 | */ |
2289 | */ |
2252 | int fore = fgcolor_of (rend); // desired foreground |
2290 | int fore = fgcolor_of (rend); // desired foreground |
2253 | int back = bgcolor_of (rend); // desired background |
2291 | int back = bgcolor_of (rend); // desired background |
2254 | |
2292 | |
2255 | // only do special processing if any attributes are set, which is unlikely |
2293 | // only do special processing if any attributes are set, which is unlikely |
2256 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2294 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2257 | { |
2295 | { |
2258 | #if ENABLE_STYLES |
|
|
2259 | // "careful" (too wide) character handling |
|
|
2260 | |
|
|
2261 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2262 | while (text > stp |
|
|
2263 | && srp[text - stp - 1] & RS_Careful |
|
|
2264 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2265 | text--, count++, xpixel -= fwidth; |
|
|
2266 | |
|
|
2267 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2268 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2269 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2270 | |
|
|
2271 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2272 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2273 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2274 | #endif |
|
|
2275 | |
|
|
2276 | bool invert = rend & RS_RVid; |
2296 | bool invert = rend & RS_RVid; |
2277 | |
2297 | |
2278 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2298 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2279 | if (rend & RS_Bold |
|
|
2280 | && fore == Color_fg) |
2299 | if (rend & RS_Bold && fore == Color_fg) |
2281 | { |
2300 | { |
2282 | if (ISSET_PIXCOLOR (Color_BD)) |
2301 | if (ISSET_PIXCOLOR (Color_BD)) |
2283 | fore = Color_BD; |
2302 | fore = Color_BD; |
2284 | # if !ENABLE_STYLES |
2303 | # if !ENABLE_STYLES |
2285 | else |
2304 | else |
2286 | invert = !invert; |
2305 | invert = !invert; |
2287 | # endif |
2306 | # endif |
2288 | } |
2307 | } |
2289 | |
2308 | |
2290 | if (rend & RS_Italic |
2309 | if (rend & RS_Italic && fore == Color_fg) |
2291 | && fore == Color_fg) |
|
|
2292 | { |
2310 | { |
2293 | if (ISSET_PIXCOLOR (Color_IT)) |
2311 | if (ISSET_PIXCOLOR (Color_IT)) |
2294 | fore = Color_IT; |
2312 | fore = Color_IT; |
2295 | # if !ENABLE_STYLES |
2313 | # if !ENABLE_STYLES |
2296 | else |
2314 | else |
… | |
… | |
2300 | |
2318 | |
2301 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2319 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2302 | fore = Color_UL; |
2320 | fore = Color_UL; |
2303 | #endif |
2321 | #endif |
2304 | |
2322 | |
|
|
2323 | #ifdef OPTION_HC |
|
|
2324 | if (rend & RS_Sel) |
|
|
2325 | { |
|
|
2326 | /* invert the column if no highlightColor is set or it is the |
|
|
2327 | * current cursor column */ |
|
|
2328 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2329 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2330 | { |
|
|
2331 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2332 | fore = Color_HTC; |
|
|
2333 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2334 | else if (!invert) |
|
|
2335 | fore = back; |
|
|
2336 | |
|
|
2337 | back = Color_HC; |
|
|
2338 | invert = 0; |
|
|
2339 | } |
|
|
2340 | } |
|
|
2341 | #endif |
|
|
2342 | |
2305 | if (invert) |
2343 | if (invert) |
2306 | { |
2344 | { |
2307 | ::swap (fore, back); |
2345 | ::swap (fore, back); |
2308 | |
2346 | |
2309 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2347 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2310 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2311 | back = Color_RV; |
|
|
2312 | |
|
|
2313 | if (fore == back) |
2348 | if (fore == back) |
2314 | { |
2349 | { |
2315 | fore = Color_bg; |
2350 | fore = Color_bg; |
2316 | back = Color_fg; |
2351 | back = Color_fg; |
2317 | } |
2352 | } |
… | |
… | |
2319 | } |
2354 | } |
2320 | |
2355 | |
2321 | #ifdef TEXT_BLINK |
2356 | #ifdef TEXT_BLINK |
2322 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2357 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2323 | { |
2358 | { |
2324 | if (!text_blink_ev.active) |
2359 | if (!text_blink_ev.is_active ()) |
2325 | { |
2360 | { |
2326 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2361 | text_blink_ev.again (); |
2327 | hidden_text = 0; |
2362 | hidden_text = 0; |
2328 | } |
2363 | } |
2329 | else if (hidden_text) |
2364 | else if (hidden_text) |
2330 | fore = back; |
2365 | fore = back; |
2331 | } |
2366 | } |
2332 | #endif |
2367 | #endif |
|
|
2368 | |
|
|
2369 | #if ENABLE_STYLES |
|
|
2370 | // "careful" (too wide) character handling |
|
|
2371 | |
|
|
2372 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2373 | while (text > stp |
|
|
2374 | && srp[text - stp - 1] & RS_Careful |
|
|
2375 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2376 | text--, count++, xpixel -= fwidth; |
|
|
2377 | |
|
|
2378 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2379 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2380 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2381 | |
|
|
2382 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2383 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2384 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2385 | #endif |
2333 | } |
2386 | } |
2334 | |
2387 | |
2335 | /* |
2388 | /* |
2336 | * Actually do the drawing of the string here |
2389 | * Actually do the drawing of the string here |
2337 | */ |
2390 | */ |
2338 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2391 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2339 | |
2392 | |
2340 | if (back == fore) |
2393 | if (expect_true (have_bg && back == Color_bg)) |
2341 | font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back); |
|
|
2342 | else if (back == Color_bg && have_bg) |
|
|
2343 | { |
2394 | { |
2344 | // this is very ugly, maybe push it into ->draw? |
2395 | // this is very ugly, maybe push it into ->draw? |
2345 | |
2396 | |
2346 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2397 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2347 | if (text[i] != ' ') |
2398 | if (text[i] != ' ') |
2348 | { |
2399 | { |
2349 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2400 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2350 | goto did_clear; |
2401 | goto did_clear; |
2351 | } |
2402 | } |
2352 | |
2403 | |
2353 | CLEAR_CHARS (xpixel, ypixel, count); |
2404 | CLEAR_CHARS (xpixel, ypixel, count); |
2354 | did_clear: ; |
2405 | did_clear: ; |
2355 | } |
2406 | } |
2356 | else |
2407 | else |
2357 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2408 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2358 | |
2409 | |
2359 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2410 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2360 | { |
2411 | { |
2361 | #if ENABLE_FRILLS |
2412 | #if ENABLE_FRILLS |
2362 | if (ISSET_PIXCOLOR (Color_underline)) |
2413 | if (ISSET_PIXCOLOR (Color_underline)) |
2363 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2414 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2364 | else |
2415 | else |
2365 | #endif |
2416 | #endif |
2366 | XSetForeground (dpy, gc, pix_colors[fore]); |
2417 | XSetForeground (dpy, gc, pix_colors[fore]); |
2367 | |
2418 | |
2368 | XDrawLine (dpy, drawBuffer, gc, |
2419 | XDrawLine (dpy, vt, gc, |
2369 | xpixel, ypixel + font->ascent + 1, |
2420 | xpixel, ypixel + font->ascent + 1, |
2370 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2421 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2371 | } |
2422 | } |
2372 | } /* for (col....) */ |
2423 | } /* for (col....) */ |
2373 | } /* for (row....) */ |
2424 | } /* for (row....) */ |
2374 | |
2425 | |
2375 | #if ENABLE_OVERLAY |
|
|
2376 | scr_swap_overlay (); |
|
|
2377 | #endif |
|
|
2378 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2379 | |
|
|
2380 | /* |
2426 | /* |
2381 | * G: cleanup cursor and display outline cursor if necessary |
2427 | * G: cleanup cursor and display outline cursor if necessary |
2382 | */ |
2428 | */ |
2383 | if (showcursor) |
2429 | if (showcursor) |
2384 | { |
2430 | { |
2385 | if (focus) |
2431 | if (focus) |
2386 | { |
2432 | { |
2387 | if (OPTION (Opt_cursorUnderline)) |
2433 | if (option (Opt_cursorUnderline)) |
2388 | *crp ^= RS_Uline; |
2434 | *crp ^= RS_Uline; |
2389 | else |
2435 | else |
2390 | { |
2436 | { |
2391 | *crp ^= RS_RVid; |
2437 | *crp ^= RS_RVid; |
2392 | #ifndef NO_CURSORCOLOR |
2438 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2407 | cursorwidth++; |
2453 | cursorwidth++; |
2408 | |
2454 | |
2409 | #ifndef NO_CURSORCOLOR |
2455 | #ifndef NO_CURSORCOLOR |
2410 | if (ISSET_PIXCOLOR (Color_cursor)) |
2456 | if (ISSET_PIXCOLOR (Color_cursor)) |
2411 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2457 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2458 | else |
2412 | #endif |
2459 | #endif |
|
|
2460 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2413 | |
2461 | |
2414 | XDrawRectangle (dpy, drawBuffer, gc, |
2462 | XDrawRectangle (dpy, vt, gc, |
2415 | Col2Pixel (col), |
2463 | Col2Pixel (col), |
2416 | Row2Pixel (oldcursor.row), |
2464 | Row2Pixel (oldcursor.row), |
2417 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2465 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2418 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2466 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2419 | } |
2467 | } |
2420 | } |
2468 | } |
2421 | |
2469 | |
2422 | /* |
2470 | /* |
2423 | * H: cleanup selection |
2471 | * H: cleanup selection |
2424 | */ |
2472 | */ |
|
|
2473 | #if ENABLE_OVERLAY |
|
|
2474 | scr_swap_overlay (); |
|
|
2475 | #endif |
|
|
2476 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2477 | |
2425 | scr_reverse_selection (); |
2478 | scr_reverse_selection (); |
2426 | |
2479 | |
|
|
2480 | screen.flags = old_screen_flags; |
2427 | num_scr = 0; |
2481 | num_scr = 0; |
2428 | num_scr_allow = 1; |
2482 | num_scr_allow = 1; |
2429 | } |
2483 | } |
2430 | |
2484 | |
2431 | void |
2485 | void |
… | |
… | |
2452 | scr_remap_chars (swap_buf [i]); |
2506 | scr_remap_chars (swap_buf [i]); |
2453 | } |
2507 | } |
2454 | } |
2508 | } |
2455 | |
2509 | |
2456 | void |
2510 | void |
2457 | rxvt_term::scr_recolour () NOTHROW |
2511 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2458 | { |
2512 | { |
2459 | if (1 |
2513 | bool transparent = false; |
2460 | #if TRANSPARENT |
2514 | |
2461 | && !am_transparent |
2515 | #ifdef HAVE_BG_PIXMAP |
|
|
2516 | if (bg_pixmap != None) |
|
|
2517 | { |
|
|
2518 | # ifdef ENABLE_TRANSPARENCY |
|
|
2519 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2520 | { |
|
|
2521 | XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); |
|
|
2522 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
|
|
2523 | |
|
|
2524 | transparent = true; |
|
|
2525 | } |
|
|
2526 | else |
2462 | #endif |
2527 | # endif |
2463 | #if XPM_BACKGROUND |
|
|
2464 | && !bgPixmap.pixmap |
|
|
2465 | #endif |
|
|
2466 | ) |
2528 | { |
|
|
2529 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
|
|
2530 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2531 | } |
|
|
2532 | } |
|
|
2533 | else |
|
|
2534 | #endif |
2467 | { |
2535 | { |
2468 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2536 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2469 | XClearWindow (dpy, parent[0]); |
|
|
2470 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2537 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2471 | #if HAVE_SCROLLBARS |
2538 | } |
|
|
2539 | |
|
|
2540 | XClearWindow (dpy, parent[0]); |
|
|
2541 | |
2472 | if (scrollBar.win) |
2542 | if (scrollBar.win) |
2473 | { |
2543 | { |
|
|
2544 | if (transparent) |
|
|
2545 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2546 | else |
2474 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2547 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2475 | scrollBar.setIdle (); |
2548 | scrollBar.state = STATE_IDLE; |
2476 | scrollbar_show (0); |
2549 | scrollBar.show (0); |
2477 | } |
2550 | } |
2478 | #endif |
2551 | |
|
|
2552 | if (refresh) |
2479 | } |
2553 | { |
2480 | |
|
|
2481 | scr_clear (); |
2554 | scr_clear (); |
2482 | scr_touch (true); |
2555 | scr_touch (true); |
|
|
2556 | } |
2483 | want_refresh = 1; |
2557 | want_refresh = 1; |
2484 | } |
2558 | } |
2485 | |
2559 | |
2486 | /* ------------------------------------------------------------------------- */ |
2560 | /* ------------------------------------------------------------------------- */ |
2487 | void |
2561 | void |
… | |
… | |
2555 | { |
2629 | { |
2556 | #if !ENABLE_MINIMAL |
2630 | #if !ENABLE_MINIMAL |
2557 | if (selection.rect) |
2631 | if (selection.rect) |
2558 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2632 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2559 | selection.end.row, selection.end.col, |
2633 | selection.end.row, selection.end.col, |
2560 | RS_RVid, RS_RVid | RS_Uline); |
2634 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2561 | else |
2635 | else |
2562 | #endif |
2636 | #endif |
2563 | scr_xor_span (selection.beg.row, selection.beg.col, |
2637 | scr_xor_span (selection.beg.row, selection.beg.col, |
2564 | selection.end.row, selection.end.col, |
2638 | selection.end.row, selection.end.col, |
2565 | RS_RVid); |
2639 | RS_Sel | RS_RVid); |
2566 | } |
2640 | } |
2567 | } |
2641 | } |
2568 | |
2642 | |
2569 | /* ------------------------------------------------------------------------- */ |
2643 | /* ------------------------------------------------------------------------- */ |
2570 | /* |
2644 | /* |
… | |
… | |
2575 | void |
2649 | void |
2576 | rxvt_term::scr_dump (int fd) NOTHROW |
2650 | rxvt_term::scr_dump (int fd) NOTHROW |
2577 | { |
2651 | { |
2578 | int row, wrote; |
2652 | int row, wrote; |
2579 | unsigned int width, towrite; |
2653 | unsigned int width, towrite; |
2580 | char r1[] = "\n"; |
2654 | const char r1[] = "\n"; |
2581 | |
2655 | |
2582 | for (row = saveLines - nsaved; |
2656 | for (row = saveLines + top_row; |
2583 | row < saveLines + nrow - 1; row++) |
2657 | row < saveLines + nrow - 1; row++) |
2584 | { |
2658 | { |
2585 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2659 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2586 | : ncol; |
2660 | : ncol; |
2587 | for (towrite = width; towrite; towrite -= wrote) |
2661 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2631 | /* ------------------------------------------------------------------------- */ |
2705 | /* ------------------------------------------------------------------------- */ |
2632 | /* |
2706 | /* |
2633 | * Paste a selection direct to the command fd |
2707 | * Paste a selection direct to the command fd |
2634 | */ |
2708 | */ |
2635 | void |
2709 | void |
2636 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2710 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2637 | { |
2711 | { |
2638 | /* convert normal newline chars into common keyboard Return key sequence */ |
2712 | /* convert normal newline chars into common keyboard Return key sequence */ |
2639 | for (unsigned int i = 0; i < len; i++) |
2713 | for (unsigned int i = 0; i < len; i++) |
2640 | if (data[i] == C0_LF) |
2714 | if (data[i] == C0_LF) |
2641 | data[i] = C0_CR; |
2715 | data[i] = C0_CR; |
2642 | |
2716 | |
|
|
2717 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2718 | tt_printf ("\e[200~"); |
|
|
2719 | |
2643 | tt_write (data, len); |
2720 | tt_write (data, len); |
|
|
2721 | |
|
|
2722 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2723 | tt_printf ("\e[201~"); |
|
|
2724 | } |
|
|
2725 | |
|
|
2726 | void |
|
|
2727 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
|
|
2728 | { |
|
|
2729 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
|
|
2730 | return; |
|
|
2731 | |
|
|
2732 | tt_paste (data, len); |
2644 | } |
2733 | } |
2645 | |
2734 | |
2646 | /* ------------------------------------------------------------------------- */ |
2735 | /* ------------------------------------------------------------------------- */ |
2647 | /* |
2736 | /* |
2648 | * Respond to a notification that a primary selection has been sent |
2737 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2651 | void |
2740 | void |
2652 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2741 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2653 | { |
2742 | { |
2654 | if (prop == None) /* check for failed XConvertSelection */ |
2743 | if (prop == None) /* check for failed XConvertSelection */ |
2655 | { |
2744 | { |
|
|
2745 | int selnum = selection_type & Sel_whereMask; |
|
|
2746 | |
2656 | if ((selection_type & Sel_CompoundText)) |
2747 | if ((selection_type & Sel_CompoundText)) |
2657 | { |
2748 | { |
2658 | int selnum = selection_type & Sel_whereMask; |
|
|
2659 | |
|
|
2660 | selection_type = 0; |
2749 | selection_type = 0; |
2661 | if (selnum != Sel_direct) |
|
|
2662 | selection_request_other (XA_STRING, selnum); |
2750 | selection_request_other (XA_STRING, selnum); |
2663 | } |
2751 | } |
2664 | |
2752 | |
2665 | if ((selection_type & Sel_UTF8String)) |
2753 | if ((selection_type & Sel_UTF8String)) |
2666 | { |
2754 | { |
2667 | int selnum = selection_type & Sel_whereMask; |
|
|
2668 | |
|
|
2669 | selection_type = Sel_CompoundText; |
2755 | selection_type = Sel_CompoundText; |
2670 | if (selnum != Sel_direct) |
|
|
2671 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2756 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2672 | else |
|
|
2673 | selection_type = 0; |
|
|
2674 | } |
2757 | } |
2675 | |
2758 | |
2676 | return; |
2759 | return; |
2677 | } |
2760 | } |
2678 | |
2761 | |
2679 | unsigned long bytes_after; |
2762 | unsigned long bytes_after; |
2680 | XTextProperty ct; |
2763 | XTextProperty ct; |
2681 | |
2764 | |
|
|
2765 | // length == (2^31 - 1) / 4, as gdk |
2682 | if (XGetWindowProperty (dpy, win, prop, |
2766 | if (XGetWindowProperty (dpy, win, prop, |
2683 | 0, PROP_SIZE / 4, |
2767 | 0, 0x1fffffff, |
2684 | delete_prop, AnyPropertyType, |
2768 | delete_prop, AnyPropertyType, |
2685 | &ct.encoding, &ct.format, |
2769 | &ct.encoding, &ct.format, |
2686 | &ct.nitems, &bytes_after, |
2770 | &ct.nitems, &bytes_after, |
2687 | &ct.value) != Success) |
2771 | &ct.value) != Success) |
2688 | { |
2772 | { |
… | |
… | |
2691 | } |
2775 | } |
2692 | |
2776 | |
2693 | if (ct.encoding == None) |
2777 | if (ct.encoding == None) |
2694 | goto bailout; |
2778 | goto bailout; |
2695 | |
2779 | |
2696 | if (bytes_after) |
|
|
2697 | { |
|
|
2698 | // fetch and append remaining data |
|
|
2699 | XTextProperty ct2; |
|
|
2700 | |
|
|
2701 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2702 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2703 | delete_prop, AnyPropertyType, |
|
|
2704 | &ct2.encoding, &ct2.format, |
|
|
2705 | &ct2.nitems, &bytes_after, |
|
|
2706 | &ct2.value) != Success) |
|
|
2707 | goto bailout; |
|
|
2708 | |
|
|
2709 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2710 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2711 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2712 | ct.nitems += ct2.nitems; |
|
|
2713 | |
|
|
2714 | XFree (ct2.value); |
|
|
2715 | } |
|
|
2716 | |
|
|
2717 | if (ct.value == 0) |
2780 | if (ct.value == 0) |
2718 | goto bailout; |
2781 | goto bailout; |
2719 | |
2782 | |
2720 | if (ct.encoding == xa[XA_INCR]) |
2783 | if (ct.encoding == xa[XA_INCR]) |
2721 | { |
2784 | { |
… | |
… | |
2723 | if (!delete_prop) |
2786 | if (!delete_prop) |
2724 | XDeleteProperty (dpy, win, prop); |
2787 | XDeleteProperty (dpy, win, prop); |
2725 | |
2788 | |
2726 | selection_wait = Sel_incr; |
2789 | selection_wait = Sel_incr; |
2727 | incr_buf_fill = 0; |
2790 | incr_buf_fill = 0; |
2728 | incr_ev.start (NOW + 10); |
2791 | incr_ev.start (10); |
2729 | |
2792 | |
2730 | goto bailout; |
2793 | goto bailout; |
2731 | } |
2794 | } |
2732 | |
2795 | |
2733 | if (ct.nitems == 0) |
2796 | if (ct.nitems == 0) |
… | |
… | |
2742 | ct.nitems = incr_buf_fill; |
2805 | ct.nitems = incr_buf_fill; |
2743 | incr_buf = 0; |
2806 | incr_buf = 0; |
2744 | incr_buf_size = 0; |
2807 | incr_buf_size = 0; |
2745 | incr_ev.stop (); |
2808 | incr_ev.stop (); |
2746 | } |
2809 | } |
2747 | else |
2810 | else |
2748 | { |
2811 | { |
2749 | if (selection_wait == Sel_normal |
2812 | if (selection_wait == Sel_normal |
2750 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2813 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2751 | { |
2814 | { |
2752 | /* |
2815 | /* |
2753 | * pass through again trying CUT_BUFFER0 if we've come from |
2816 | * pass through again trying CUT_BUFFER0 if we've come from |
2754 | * XConvertSelection () but nothing was presented |
2817 | * XConvertSelection () but nothing was presented |
2755 | */ |
2818 | */ |
2756 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2819 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2757 | } |
2820 | } |
2758 | |
2821 | |
2759 | goto bailout; |
2822 | goto bailout; |
2760 | } |
2823 | } |
2761 | } |
2824 | } |
2762 | else if (selection_wait == Sel_incr) |
2825 | else if (selection_wait == Sel_incr) |
2763 | { |
2826 | { |
2764 | incr_ev.start (NOW + 10); |
2827 | incr_ev.start (10); |
2765 | |
2828 | |
2766 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2829 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2767 | { |
2830 | { |
2768 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2831 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2769 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2832 | incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size); |
2770 | } |
2833 | } |
2771 | |
2834 | |
2772 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2835 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2773 | incr_buf_fill += ct.nitems; |
2836 | incr_buf_fill += ct.nitems; |
2774 | |
2837 | |
… | |
… | |
2809 | if (selection_wait == Sel_normal) |
2872 | if (selection_wait == Sel_normal) |
2810 | selection_wait = Sel_none; |
2873 | selection_wait = Sel_none; |
2811 | } |
2874 | } |
2812 | |
2875 | |
2813 | void |
2876 | void |
2814 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2877 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2815 | { |
2878 | { |
2816 | selection_wait = Sel_none; |
2879 | selection_wait = Sel_none; |
2817 | |
2880 | |
2818 | incr_buf_size = 0; |
2881 | incr_buf_size = 0; |
2819 | free (incr_buf); |
2882 | free (incr_buf); |
|
|
2883 | incr_buf = 0; |
2820 | |
2884 | |
2821 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2885 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2822 | } |
2886 | } |
2823 | |
2887 | |
2824 | void |
2888 | void |
… | |
… | |
2830 | selection_paste (win, prop, true); |
2894 | selection_paste (win, prop, true); |
2831 | } |
2895 | } |
2832 | |
2896 | |
2833 | /* ------------------------------------------------------------------------- */ |
2897 | /* ------------------------------------------------------------------------- */ |
2834 | /* |
2898 | /* |
2835 | * Request the current selection: |
2899 | * Request the current selection: |
2836 | * Order: > internal selection if available |
2900 | * Order: > internal selection if available |
2837 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2901 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2838 | * > CUT_BUFFER0 |
2902 | * > CUT_BUFFER0 |
2839 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2903 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2840 | * will auto fallback to CUT_BUFFER0 |
2904 | * will auto fallback to CUT_BUFFER0 |
… | |
… | |
2842 | */ |
2906 | */ |
2843 | void |
2907 | void |
2844 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2908 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2845 | { |
2909 | { |
2846 | if (selection.text && selnum == Sel_Primary) |
2910 | if (selection.text && selnum == Sel_Primary) |
|
|
2911 | { |
2847 | { /* internal selection */ |
2912 | /* internal selection */ |
2848 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2913 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2849 | paste (str, strlen (str)); |
2914 | paste (str, strlen (str)); |
2850 | free (str); |
2915 | free (str); |
2851 | return; |
2916 | return; |
2852 | } |
2917 | } |
… | |
… | |
2856 | selection_wait = Sel_normal; |
2921 | selection_wait = Sel_normal; |
2857 | |
2922 | |
2858 | #if X_HAVE_UTF8_STRING |
2923 | #if X_HAVE_UTF8_STRING |
2859 | selection_type = Sel_UTF8String; |
2924 | selection_type = Sel_UTF8String; |
2860 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2925 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2861 | return; |
2926 | return; |
2862 | #else |
2927 | #else |
2863 | selection_type = Sel_CompoundText; |
2928 | selection_type = Sel_CompoundText; |
2864 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2929 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2865 | return; |
2930 | return; |
2866 | #endif |
2931 | #endif |
2867 | } |
2932 | } |
2868 | |
2933 | |
2869 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2934 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2870 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2935 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
… | |
… | |
2898 | /* |
2963 | /* |
2899 | * Clear all selected text |
2964 | * Clear all selected text |
2900 | * EXT: SelectionClear |
2965 | * EXT: SelectionClear |
2901 | */ |
2966 | */ |
2902 | void |
2967 | void |
2903 | rxvt_term::selection_clear () NOTHROW |
2968 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2904 | { |
2969 | { |
|
|
2970 | if (!clipboard) |
|
|
2971 | { |
2905 | want_refresh = 1; |
2972 | want_refresh = 1; |
2906 | free (selection.text); |
2973 | free (selection.text); |
2907 | selection.text = NULL; |
2974 | selection.text = NULL; |
2908 | selection.len = 0; |
2975 | selection.len = 0; |
2909 | CLEAR_SELECTION (); |
2976 | CLEAR_SELECTION (); |
2910 | |
2977 | |
2911 | if (display->selection_owner == this) |
2978 | if (display->selection_owner == this) |
2912 | display->selection_owner = 0; |
2979 | display->selection_owner = 0; |
|
|
2980 | } |
|
|
2981 | else |
|
|
2982 | { |
|
|
2983 | free (selection.clip_text); |
|
|
2984 | selection.clip_text = NULL; |
|
|
2985 | selection.clip_len = 0; |
|
|
2986 | |
|
|
2987 | if (display->clipboard_owner == this) |
|
|
2988 | display->clipboard_owner = 0; |
|
|
2989 | } |
2913 | } |
2990 | } |
2914 | |
2991 | |
2915 | /* ------------------------------------------------------------------------- */ |
2992 | /* ------------------------------------------------------------------------- */ |
2916 | /* |
2993 | /* |
2917 | * Copy a selection into the cut buffer |
2994 | * Copy a selection into the cut buffer |
2918 | * EXT: button 1 or 3 release |
2995 | * EXT: button 1 or 3 release |
2919 | */ |
2996 | */ |
2920 | void |
2997 | void |
2921 | rxvt_term::selection_make (Time tm) |
2998 | rxvt_term::selection_make (Time tm) |
2922 | { |
2999 | { |
2923 | int i; |
3000 | int size; |
2924 | wchar_t *new_selection_text; |
3001 | wchar_t *new_selection_text; |
2925 | text_t *t; |
3002 | text_t *t; |
2926 | |
3003 | |
2927 | switch (selection.op) |
3004 | switch (selection.op) |
2928 | { |
3005 | { |
… | |
… | |
2944 | return; /* nothing selected, go away */ |
3021 | return; /* nothing selected, go away */ |
2945 | |
3022 | |
2946 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
3023 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2947 | return; |
3024 | return; |
2948 | |
3025 | |
2949 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3026 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2950 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
3027 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
2951 | |
3028 | |
2952 | int ofs = 0; |
3029 | int ofs = 0; |
2953 | int extra = 0; |
3030 | int extra = 0; |
2954 | |
3031 | |
2955 | int col = selection.beg.col; |
3032 | int col = selection.beg.col; |
… | |
… | |
2961 | { |
3038 | { |
2962 | #if !ENABLE_MINIMAL |
3039 | #if !ENABLE_MINIMAL |
2963 | if (selection.rect) |
3040 | if (selection.rect) |
2964 | { |
3041 | { |
2965 | col = selection.beg.col; |
3042 | col = selection.beg.col; |
2966 | end_col = ncol + 1; |
3043 | end_col = selection.end.col; |
2967 | } |
3044 | } |
2968 | else |
3045 | else |
2969 | #endif |
3046 | #endif |
2970 | end_col = ROW(row).l; |
3047 | end_col = ROW(row).l; |
2971 | |
3048 | |
2972 | col = max (col, 0); |
3049 | col = max (col, 0); |
2973 | |
3050 | |
2974 | if (row == selection.end.row |
3051 | if (row == selection.end.row) |
2975 | #if !ENABLE_MINIMAL |
|
|
2976 | || selection.rect |
|
|
2977 | #endif |
|
|
2978 | ) |
|
|
2979 | min_it (end_col, selection.end.col); |
3052 | min_it (end_col, selection.end.col); |
2980 | |
3053 | |
2981 | t = ROW(row).t + col; |
3054 | t = ROW(row).t + col; |
2982 | |
3055 | |
2983 | for (; col < end_col; col++) |
3056 | for (; col < end_col; col++) |
… | |
… | |
2991 | |
3064 | |
2992 | extra -= (len - 1); |
3065 | extra -= (len - 1); |
2993 | |
3066 | |
2994 | if (extra < 0) |
3067 | if (extra < 0) |
2995 | { |
3068 | { |
2996 | extra += i; |
3069 | extra += size; |
2997 | i += i; |
3070 | size += size; |
2998 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
3071 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
2999 | } |
3072 | } |
3000 | |
3073 | |
3001 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3074 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3002 | } |
3075 | } |
3003 | #endif |
3076 | #endif |
… | |
… | |
3015 | |
3088 | |
3016 | new_selection_text[ofs++] = C0_LF; |
3089 | new_selection_text[ofs++] = C0_LF; |
3017 | } |
3090 | } |
3018 | else |
3091 | else |
3019 | #endif |
3092 | #endif |
3020 | if (!ROW(row).is_longer () && row != selection.end.row) |
3093 | if (!ROW(row).is_longer () |
|
|
3094 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
3095 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3021 | new_selection_text[ofs++] = C0_LF; |
3096 | new_selection_text[ofs++] = C0_LF; |
3022 | } |
3097 | } |
3023 | |
|
|
3024 | if (end_col != selection.end.col) |
|
|
3025 | new_selection_text[ofs++] = C0_LF; |
|
|
3026 | |
3098 | |
3027 | new_selection_text[ofs] = 0; |
3099 | new_selection_text[ofs] = 0; |
3028 | |
3100 | |
3029 | if (ofs == 0) |
3101 | if (ofs == 0) |
3030 | { |
3102 | { |
… | |
… | |
3043 | |
3115 | |
3044 | selection_grab (tm); |
3116 | selection_grab (tm); |
3045 | } |
3117 | } |
3046 | |
3118 | |
3047 | bool |
3119 | bool |
3048 | rxvt_term::selection_grab (Time tm) NOTHROW |
3120 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3049 | { |
3121 | { |
|
|
3122 | Atom sel; |
|
|
3123 | |
|
|
3124 | if (!clipboard) |
|
|
3125 | { |
3050 | selection_time = tm; |
3126 | selection_time = tm; |
|
|
3127 | sel = XA_PRIMARY; |
|
|
3128 | } |
|
|
3129 | else |
|
|
3130 | { |
|
|
3131 | clipboard_time = tm; |
|
|
3132 | sel = xa[XA_CLIPBOARD]; |
|
|
3133 | } |
3051 | |
3134 | |
3052 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3135 | XSetSelectionOwner (dpy, sel, vt, tm); |
3053 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3136 | if (XGetSelectionOwner (dpy, sel) == vt) |
3054 | { |
3137 | { |
3055 | display->set_selection_owner (this); |
3138 | display->set_selection_owner (this, clipboard); |
3056 | return true; |
3139 | return true; |
3057 | } |
3140 | } |
3058 | else |
3141 | else |
3059 | { |
3142 | { |
3060 | selection_clear (); |
3143 | selection_clear (clipboard); |
3061 | return false; |
3144 | return false; |
3062 | } |
3145 | } |
3063 | |
3146 | |
3064 | #if 0 |
3147 | #if 0 |
3065 | XTextProperty ct; |
3148 | XTextProperty ct; |
… | |
… | |
3118 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3201 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3119 | |
3202 | |
3120 | while (selection.mark.col > 0 |
3203 | while (selection.mark.col > 0 |
3121 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3204 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3122 | --selection.mark.col; |
3205 | --selection.mark.col; |
3123 | |
3206 | |
3124 | if (selection.op) |
3207 | if (selection.op) |
|
|
3208 | { |
3125 | { /* clear the old selection */ |
3209 | /* clear the old selection */ |
3126 | selection.beg.row = selection.end.row = selection.mark.row; |
3210 | selection.beg.row = selection.end.row = selection.mark.row; |
3127 | selection.beg.col = selection.end.col = selection.mark.col; |
3211 | selection.beg.col = selection.end.col = selection.mark.col; |
3128 | } |
3212 | } |
3129 | |
3213 | |
3130 | selection.op = SELECTION_INIT; |
3214 | selection.op = SELECTION_INIT; |
… | |
… | |
3319 | * a point/word/line which is either the start or end of the selection |
3403 | * a point/word/line which is either the start or end of the selection |
3320 | * and it was decided by whichever point/word/line was `fixed' at the |
3404 | * and it was decided by whichever point/word/line was `fixed' at the |
3321 | * time of the most recent button3 press |
3405 | * time of the most recent button3 press |
3322 | */ |
3406 | */ |
3323 | if (button3 && buttonpress) |
3407 | if (button3 && buttonpress) |
|
|
3408 | { |
3324 | { /* button3 press */ |
3409 | /* button3 press */ |
3325 | /* |
3410 | /* |
3326 | * first determine which edge of the selection we are closest to |
3411 | * first determine which edge of the selection we are closest to |
3327 | */ |
3412 | */ |
3328 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3413 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3329 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3414 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3347 | selection.mark.row = selection.beg.row; |
3432 | selection.mark.row = selection.beg.row; |
3348 | selection.mark.col = selection.beg.col; |
3433 | selection.mark.col = selection.beg.col; |
3349 | } |
3434 | } |
3350 | } |
3435 | } |
3351 | else |
3436 | else |
|
|
3437 | { |
3352 | { /* button1 drag or button3 drag */ |
3438 | /* button1 drag or button3 drag */ |
3353 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3439 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3354 | { |
3440 | { |
3355 | if (selection.mark.row == selection.end.row |
3441 | if (selection.mark.row == selection.end.row |
3356 | && selection.mark.col == selection.end.col |
3442 | && selection.mark.col == selection.end.col |
3357 | && clickchange |
3443 | && clickchange |
… | |
… | |
3400 | selection_delimit_word (DN, &selection.end, &selection.end); |
3486 | selection_delimit_word (DN, &selection.end, &selection.end); |
3401 | } |
3487 | } |
3402 | else if (selection.clicks == 3) |
3488 | else if (selection.clicks == 3) |
3403 | { |
3489 | { |
3404 | #if ENABLE_FRILLS |
3490 | #if ENABLE_FRILLS |
3405 | if (OPTION (Opt_tripleclickwords)) |
3491 | if (option (Opt_tripleclickwords)) |
3406 | { |
3492 | { |
3407 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3493 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3408 | |
3494 | |
3409 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3495 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3410 | { |
3496 | { |
… | |
… | |
3438 | selection.end.row++; |
3524 | selection.end.row++; |
3439 | } |
3525 | } |
3440 | } |
3526 | } |
3441 | |
3527 | |
3442 | if (button3 && buttonpress) |
3528 | if (button3 && buttonpress) |
|
|
3529 | { |
3443 | { /* mark may need to be changed */ |
3530 | /* mark may need to be changed */ |
3444 | if (closeto == LEFT) |
3531 | if (closeto == LEFT) |
3445 | { |
3532 | { |
3446 | selection.mark.row = selection.end.row; |
3533 | selection.mark.row = selection.end.row; |
3447 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3534 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3448 | } |
3535 | } |
… | |
… | |
3556 | else if (rq.target == xa[XA_MULTIPLE]) |
3643 | else if (rq.target == xa[XA_MULTIPLE]) |
3557 | { |
3644 | { |
3558 | /* TODO: Handle MULTIPLE */ |
3645 | /* TODO: Handle MULTIPLE */ |
3559 | } |
3646 | } |
3560 | #endif |
3647 | #endif |
3561 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3648 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3562 | { |
3649 | { |
3563 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3650 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3564 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3651 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3652 | ev.property = rq.property; |
|
|
3653 | } |
|
|
3654 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3655 | { |
|
|
3656 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3657 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3565 | ev.property = rq.property; |
3658 | ev.property = rq.property; |
3566 | } |
3659 | } |
3567 | else if (rq.target == XA_STRING |
3660 | else if (rq.target == XA_STRING |
3568 | || rq.target == xa[XA_TEXT] |
3661 | || rq.target == xa[XA_TEXT] |
3569 | || rq.target == xa[XA_COMPOUND_TEXT] |
3662 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3602 | { |
3695 | { |
3603 | target = xa[XA_COMPOUND_TEXT]; |
3696 | target = xa[XA_COMPOUND_TEXT]; |
3604 | style = enc_compound_text; |
3697 | style = enc_compound_text; |
3605 | } |
3698 | } |
3606 | |
3699 | |
3607 | if (selection.text) |
3700 | if (rq.selection == XA_PRIMARY && selection.text) |
3608 | { |
3701 | { |
3609 | cl = selection.text; |
3702 | cl = selection.text; |
3610 | selectlen = selection.len; |
3703 | selectlen = selection.len; |
|
|
3704 | } |
|
|
3705 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3706 | { |
|
|
3707 | cl = selection.clip_text; |
|
|
3708 | selectlen = selection.clip_len; |
3611 | } |
3709 | } |
3612 | else |
3710 | else |
3613 | { |
3711 | { |
3614 | cl = L""; |
3712 | cl = L""; |
3615 | selectlen = 0; |
3713 | selectlen = 0; |
… | |
… | |
3647 | XFree (ct.value); |
3745 | XFree (ct.value); |
3648 | } |
3746 | } |
3649 | |
3747 | |
3650 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3748 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3651 | } |
3749 | } |
3652 | |
|
|
3653 | /* ------------------------------------------------------------------------- * |
|
|
3654 | * MOUSE ROUTINES * |
|
|
3655 | * ------------------------------------------------------------------------- */ |
|
|
3656 | |
|
|
3657 | /* |
|
|
3658 | * return col/row values corresponding to x/y pixel values |
|
|
3659 | */ |
|
|
3660 | void |
|
|
3661 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
|
|
3662 | { |
|
|
3663 | *x = Pixel2Col (*x); |
|
|
3664 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
|
|
3665 | *y = Pixel2Row (*y); |
|
|
3666 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
|
|
3667 | } |
|
|
3668 | |
3750 | |
3669 | /* ------------------------------------------------------------------------- */ |
3751 | /* ------------------------------------------------------------------------- */ |
3670 | #ifdef USE_XIM |
3752 | #ifdef USE_XIM |
3671 | void |
3753 | void |
3672 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3754 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
… | |
… | |
3699 | h += 2; min_it (h, nrow); |
3781 | h += 2; min_it (h, nrow); |
3700 | |
3782 | |
3701 | x -= 1; clamp_it (x, 0, ncol - w); |
3783 | x -= 1; clamp_it (x, 0, ncol - w); |
3702 | y -= 1; clamp_it (y, 0, nrow - h); |
3784 | y -= 1; clamp_it (y, 0, nrow - h); |
3703 | |
3785 | |
3704 | ov_x = x; ov_y = y; |
3786 | ov.x = x; ov.y = y; |
3705 | ov_w = w; ov_h = h; |
3787 | ov.w = w; ov.h = h; |
3706 | |
3788 | |
3707 | ov_text = new text_t *[h]; |
3789 | ov.text = new text_t *[h]; |
3708 | ov_rend = new rend_t *[h]; |
3790 | ov.rend = new rend_t *[h]; |
3709 | |
3791 | |
3710 | for (y = 0; y < h; y++) |
3792 | for (y = 0; y < h; y++) |
3711 | { |
3793 | { |
3712 | text_t *tp = ov_text[y] = new text_t[w]; |
3794 | text_t *tp = ov.text[y] = new text_t[w]; |
3713 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3795 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3714 | |
3796 | |
3715 | text_t t0, t1, t2; |
3797 | text_t t0, t1, t2; |
3716 | rend_t r = OVERLAY_RSTYLE; |
3798 | rend_t r = OVERLAY_RSTYLE; |
3717 | |
3799 | |
3718 | if (y == 0) |
3800 | if (y == 0) |
… | |
… | |
3737 | } |
3819 | } |
3738 | |
3820 | |
3739 | void |
3821 | void |
3740 | rxvt_term::scr_overlay_off () NOTHROW |
3822 | rxvt_term::scr_overlay_off () NOTHROW |
3741 | { |
3823 | { |
3742 | if (!ov_text) |
3824 | if (!ov.text) |
3743 | return; |
3825 | return; |
3744 | |
3826 | |
3745 | want_refresh = 1; |
3827 | want_refresh = 1; |
3746 | |
3828 | |
3747 | for (int y = 0; y < ov_h; y++) |
3829 | for (int y = 0; y < ov.h; y++) |
3748 | { |
3830 | { |
3749 | delete [] ov_text[y]; |
3831 | delete [] ov.text[y]; |
3750 | delete [] ov_rend[y]; |
3832 | delete [] ov.rend[y]; |
3751 | } |
3833 | } |
3752 | |
3834 | |
3753 | delete [] ov_text; ov_text = 0; |
3835 | delete [] ov.text; ov.text = 0; |
3754 | delete [] ov_rend; ov_rend = 0; |
3836 | delete [] ov.rend; ov.rend = 0; |
3755 | } |
3837 | } |
3756 | |
3838 | |
3757 | void |
3839 | void |
3758 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3840 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3759 | { |
3841 | { |
3760 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3842 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3761 | return; |
3843 | return; |
3762 | |
3844 | |
3763 | x++, y++; |
3845 | x++, y++; |
3764 | |
3846 | |
3765 | ov_text[y][x] = text; |
3847 | ov.text[y][x] = text; |
3766 | ov_rend[y][x] = rend; |
3848 | ov.rend[y][x] = rend; |
3767 | } |
3849 | } |
3768 | |
3850 | |
3769 | void |
3851 | void |
3770 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3852 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3771 | { |
3853 | { |
… | |
… | |
3790 | } |
3872 | } |
3791 | |
3873 | |
3792 | void |
3874 | void |
3793 | rxvt_term::scr_swap_overlay () NOTHROW |
3875 | rxvt_term::scr_swap_overlay () NOTHROW |
3794 | { |
3876 | { |
3795 | if (!ov_text) |
3877 | if (!ov.text) |
3796 | return; |
3878 | return; |
3797 | |
3879 | |
|
|
3880 | // hide cursor if it is within the overlay area |
|
|
3881 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3882 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3883 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3884 | |
3798 | // swap screen mem with overlay |
3885 | // swap screen mem with overlay |
3799 | for (int y = ov_h; y--; ) |
3886 | for (int y = ov.h; y--; ) |
3800 | { |
3887 | { |
3801 | text_t *t1 = ov_text[y]; |
3888 | text_t *t1 = ov.text[y]; |
3802 | rend_t *r1 = ov_rend[y]; |
3889 | rend_t *r1 = ov.rend[y]; |
3803 | |
3890 | |
3804 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3891 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3805 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3892 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3806 | |
3893 | |
3807 | for (int x = ov_w; x--; ) |
3894 | for (int x = ov.w; x--; ) |
3808 | { |
3895 | { |
3809 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3896 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3810 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3897 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3811 | } |
3898 | } |
3812 | } |
3899 | } |