1 | /*--------------------------------*-C-*--------------------------------------* |
1 | /*---------------------------------------------------------------------------* |
2 | * File: screen.C |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
… | |
… | |
26 | |
26 | |
27 | #include "../config.h" /* NECESSARY */ |
27 | #include "../config.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
|
|
32 | |
|
|
33 | #include <inttypes.h> |
31 | #include <inttypes.h> |
34 | |
32 | |
35 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a seperate compile! |
36 | |
34 | |
37 | inline void fill_text (text_t *start, text_t value, int len) |
35 | inline void fill_text (text_t *start, text_t value, int len) |
… | |
… | |
47 | |
45 | |
48 | /* ------------------------------------------------------------------------- * |
46 | /* ------------------------------------------------------------------------- * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
47 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
50 | * ------------------------------------------------------------------------- */ |
48 | * ------------------------------------------------------------------------- */ |
51 | #define ZERO_SCROLLBACK() \ |
49 | #define ZERO_SCROLLBACK() \ |
52 | if (OPTION (Opt_scrollTtyOutput)) \ |
50 | if (option (Opt_scrollTtyOutput)) \ |
53 | view_start = 0 |
51 | view_start = 0 |
54 | #define CLEAR_SELECTION() \ |
52 | #define CLEAR_SELECTION() \ |
55 | selection.beg.row = selection.beg.col \ |
53 | selection.beg.row = selection.beg.col \ |
56 | = selection.end.row = selection.end.col = 0 |
54 | = selection.end.row = selection.end.col = 0 |
57 | #define CLEAR_ALL_SELECTION() \ |
55 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
93 | */ |
91 | */ |
94 | #define drawBuffer vt |
92 | #define drawBuffer vt |
95 | |
93 | |
96 | #define CLEAR_ROWS(row, num) \ |
94 | #define CLEAR_ROWS(row, num) \ |
97 | if (mapped) \ |
95 | if (mapped) \ |
98 | XClearArea (display->display, drawBuffer, 0, \ |
96 | XClearArea (dpy, drawBuffer, 0, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
97 | Row2Pixel (row), (unsigned int)width, \ |
100 | (unsigned int)Height2Pixel (num), False) |
98 | (unsigned int)Height2Pixel (num), False) |
101 | |
99 | |
102 | #define CLEAR_CHARS(x, y, num) \ |
100 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (mapped) \ |
101 | if (mapped) \ |
104 | XClearArea (display->display, drawBuffer, x, y, \ |
102 | XClearArea (dpy, drawBuffer, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
103 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
104 | (unsigned int)Height2Pixel (1), False) |
107 | |
105 | |
108 | #define ERASE_ROWS(row, num) \ |
106 | #define ERASE_ROWS(row, num) \ |
109 | XFillRectangle (display->display, drawBuffer, gc, \ |
107 | XFillRectangle (dpy, drawBuffer, gc, \ |
110 | 0, Row2Pixel (row), \ |
108 | 0, Row2Pixel (row), \ |
111 | (unsigned int)width, \ |
109 | (unsigned int)width, \ |
112 | (unsigned int)Height2Pixel (num)) |
110 | (unsigned int)Height2Pixel (num)) |
113 | |
111 | |
114 | /* ------------------------------------------------------------------------- * |
112 | /* ------------------------------------------------------------------------- * |
115 | * SCREEN `COMMON' ROUTINES * |
113 | * SCREEN `COMMON' ROUTINES * |
116 | * ------------------------------------------------------------------------- */ |
114 | * ------------------------------------------------------------------------- */ |
117 | |
115 | |
118 | /* Fill part/all of a line with blanks. */ |
116 | /* Fill part/all of a line with blanks. */ |
119 | void |
117 | void |
120 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const |
118 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW |
121 | { |
119 | { |
122 | if (!l.t) |
120 | if (!l.t) |
123 | { |
121 | { |
124 | lalloc (l); |
122 | lalloc (l); |
125 | col = 0; |
123 | col = 0; |
126 | width = ncol; |
124 | width = ncol; |
127 | } |
125 | } |
128 | |
126 | |
129 | l.touch (); |
127 | l.touch (); |
130 | |
128 | |
131 | efs &= ~RS_baseattrMask; |
129 | efs &= ~RS_baseattrMask; // remove italic etc. fontstyles |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
130 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
133 | |
131 | |
134 | text_t *et = l.t + col; |
132 | text_t *et = l.t + col; |
135 | rend_t *er = l.r + col; |
133 | rend_t *er = l.r + col; |
136 | |
134 | |
… | |
… | |
142 | } |
140 | } |
143 | |
141 | |
144 | /* ------------------------------------------------------------------------- */ |
142 | /* ------------------------------------------------------------------------- */ |
145 | /* Fill a full line with blanks - make sure it is allocated first */ |
143 | /* Fill a full line with blanks - make sure it is allocated first */ |
146 | void |
144 | void |
147 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const |
145 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW |
148 | { |
146 | { |
149 | scr_blank_line (l, 0, ncol, efs); |
147 | scr_blank_line (l, 0, ncol, efs); |
150 | |
148 | |
151 | l.l = 0; |
149 | l.l = 0; |
152 | l.f = 0; |
150 | l.f = 0; |
… | |
… | |
161 | { |
159 | { |
162 | #if ENABLE_OVERLAY |
160 | #if ENABLE_OVERLAY |
163 | scr_overlay_off (); |
161 | scr_overlay_off (); |
164 | #endif |
162 | #endif |
165 | |
163 | |
|
|
164 | rvideo_mode = false; |
166 | view_start = 0; |
165 | view_start = 0; |
167 | num_scr = 0; |
166 | num_scr = 0; |
168 | |
167 | |
169 | if (ncol == 0) |
168 | if (ncol == 0) |
170 | ncol = 80; |
169 | ncol = 80; |
… | |
… | |
173 | nrow = 24; |
172 | nrow = 24; |
174 | |
173 | |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
174 | if (ncol == prev_ncol && nrow == prev_nrow) |
176 | return; |
175 | return; |
177 | |
176 | |
|
|
177 | if (current_screen != PRIMARY) |
|
|
178 | scr_swap_screen (); |
|
|
179 | |
178 | // we need at least two lines for wrapping to work correctly |
180 | // we need at least two lines for wrapping to work correctly |
179 | if (nrow + saveLines < 2) |
181 | while (nrow + saveLines < 2) |
180 | { |
182 | { |
181 | //TODO//FIXME |
183 | //TODO//FIXME |
182 | saveLines++; |
184 | saveLines++; |
183 | prev_nrow--; |
185 | prev_nrow--; |
184 | top_row--; |
186 | top_row--; |
… | |
… | |
195 | if (!row_buf) |
197 | if (!row_buf) |
196 | { |
198 | { |
197 | /* |
199 | /* |
198 | * first time called so just malloc everything: don't rely on realloc |
200 | * first time called so just malloc everything: don't rely on realloc |
199 | */ |
201 | */ |
200 | top_row = 0; /* no saved lines */ |
202 | top_row = 0; |
201 | term_start = 0; |
203 | term_start = 0; |
202 | |
204 | |
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
205 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
206 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
205 | |
207 | |
… | |
… | |
234 | selection.text = NULL; |
236 | selection.text = NULL; |
235 | selection.len = 0; |
237 | selection.len = 0; |
236 | selection.op = SELECTION_CLEAR; |
238 | selection.op = SELECTION_CLEAR; |
237 | selection.screen = PRIMARY; |
239 | selection.screen = PRIMARY; |
238 | selection.clicks = 0; |
240 | selection.clicks = 0; |
239 | CLEAR_ALL_SELECTION (); |
|
|
240 | rvideo = 0; |
|
|
241 | } |
241 | } |
242 | else |
242 | else |
243 | { |
243 | { |
244 | /* |
244 | /* |
245 | * add or delete rows as appropriate |
245 | * add or delete rows as appropriate |
… | |
… | |
281 | int pend = MOD (term_start + top_row , prev_total_rows); |
281 | int pend = MOD (term_start + top_row , prev_total_rows); |
282 | int q = total_rows; // rewrapped row |
282 | int q = total_rows; // rewrapped row |
283 | |
283 | |
284 | if (top_row) |
284 | if (top_row) |
285 | { |
285 | { |
286 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
286 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
287 | // to come up with a lean and mean algorithm. |
287 | // to come up with a lean and mean algorithm. |
288 | |
288 | |
289 | row_col_t ocur = screen.cur; |
289 | row_col_t ocur = screen.cur; |
290 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
290 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
291 | |
291 | |
… | |
… | |
325 | qline->l = ncol; |
325 | qline->l = ncol; |
326 | qline->is_longer (1); |
326 | qline->is_longer (1); |
327 | |
327 | |
328 | int qcol = 0; |
328 | int qcol = 0; |
329 | |
329 | |
|
|
330 | // see below for cursor adjustment rationale |
|
|
331 | if (p == ocur.row) |
|
|
332 | screen.cur.row = q - (total_rows - nrow); |
|
|
333 | |
330 | // fill a single destination line |
334 | // fill a single destination line |
331 | while (lofs < llen && qcol < ncol) |
335 | while (lofs < llen && qcol < ncol) |
332 | { |
336 | { |
333 | int prow = lofs / prev_ncol; |
337 | int prow = lofs / prev_ncol; |
334 | int pcol = lofs % prev_ncol; |
338 | int pcol = lofs % prev_ncol; |
… | |
… | |
344 | |
348 | |
345 | line_t &pline = old_buf [prow]; |
349 | line_t &pline = old_buf [prow]; |
346 | |
350 | |
347 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
351 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
348 | |
352 | |
349 | assert (len); |
|
|
350 | assert (pline.t); |
|
|
351 | |
|
|
352 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
353 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
353 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
354 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
354 | |
355 | |
355 | lofs += len; |
356 | lofs += len; |
356 | qcol += len; |
357 | qcol += len; |
… | |
… | |
389 | } |
390 | } |
390 | |
391 | |
391 | term_start = 0; |
392 | term_start = 0; |
392 | } |
393 | } |
393 | |
394 | |
394 | #ifdef DEBUG_STRICT //TODO: remove |
|
|
395 | for (int i = top_row; i < nrow; i++) |
|
|
396 | assert (ROW (i).t); |
|
|
397 | #endif |
|
|
398 | |
|
|
399 | free (old_buf); |
395 | free (old_buf); |
400 | delete old_ta; |
396 | delete old_ta; |
401 | delete old_ra; |
397 | delete old_ra; |
402 | |
398 | |
403 | clamp_it (screen.cur.row, 0, nrow - 1); |
399 | clamp_it (screen.cur.row, 0, nrow - 1); |
404 | clamp_it (screen.cur.col, 0, ncol - 1); |
400 | clamp_it (screen.cur.col, 0, ncol - 1); |
405 | |
401 | |
406 | if (tabs) |
|
|
407 | free (tabs); |
402 | free (tabs); |
408 | } |
403 | } |
|
|
404 | |
|
|
405 | CLEAR_ALL_SELECTION (); |
409 | |
406 | |
410 | prev_nrow = nrow; |
407 | prev_nrow = nrow; |
411 | prev_ncol = ncol; |
408 | prev_ncol = ncol; |
412 | |
409 | |
413 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
410 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
414 | |
411 | |
415 | for (int col = ncol; col--; ) |
412 | for (int col = ncol; --col; ) |
416 | tabs [col] = col % TABSIZE == 0; |
413 | tabs [col] = col % TABSIZE == 0; |
417 | |
414 | |
|
|
415 | if (current_screen != PRIMARY) |
|
|
416 | scr_swap_screen (); |
|
|
417 | |
418 | tt_winch (); |
418 | tt_winch (); |
419 | |
419 | |
420 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
420 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
421 | } |
421 | } |
422 | |
422 | |
423 | /* ------------------------------------------------------------------------- */ |
423 | /* ------------------------------------------------------------------------- */ |
424 | /* |
424 | /* |
425 | * Free everything. That way malloc debugging can find leakage. |
425 | * Free everything. That way malloc debugging can find leakage. |
426 | */ |
426 | */ |
427 | void |
427 | void |
428 | rxvt_term::scr_release () |
428 | rxvt_term::scr_release () NOTHROW |
429 | { |
429 | { |
|
|
430 | if (row_buf) |
|
|
431 | { |
430 | delete talloc; talloc = 0; |
432 | delete talloc; talloc = 0; |
431 | delete ralloc; ralloc = 0; |
433 | delete ralloc; ralloc = 0; |
432 | |
434 | |
433 | free (row_buf); |
435 | free (row_buf); |
434 | free (swap_buf); |
436 | free (swap_buf); |
435 | free (drawn_buf); |
437 | free (drawn_buf); |
436 | free (tabs); |
438 | free (tabs); |
437 | |
439 | |
438 | row_buf = 0; // signal that we freed all the arrays |
440 | row_buf = 0; // signal that we freed all the arrays |
|
|
441 | } |
439 | } |
442 | } |
440 | |
443 | |
441 | /* ------------------------------------------------------------------------- */ |
444 | /* ------------------------------------------------------------------------- */ |
442 | /* |
445 | /* |
443 | * Hard reset |
446 | * Hard reset |
… | |
… | |
460 | * Save and Restore cursor |
463 | * Save and Restore cursor |
461 | * XTERM_SEQ: Save cursor : ESC 7 |
464 | * XTERM_SEQ: Save cursor : ESC 7 |
462 | * XTERM_SEQ: Restore cursor: ESC 8 |
465 | * XTERM_SEQ: Restore cursor: ESC 8 |
463 | */ |
466 | */ |
464 | void |
467 | void |
465 | rxvt_term::scr_cursor (int mode) |
468 | rxvt_term::scr_cursor (cursor_mode mode) NOTHROW |
466 | { |
469 | { |
467 | screen_t *s; |
470 | screen_t *s; |
468 | |
471 | |
469 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
472 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
470 | if (current_screen == SECONDARY) |
473 | if (current_screen == SECONDARY) |
… | |
… | |
502 | assert (s->cur.row >= 0); |
505 | assert (s->cur.row >= 0); |
503 | assert (s->cur.col >= 0); |
506 | assert (s->cur.col >= 0); |
504 | #endif |
507 | #endif |
505 | } |
508 | } |
506 | |
509 | |
|
|
510 | void |
|
|
511 | rxvt_term::scr_swap_screen () |
|
|
512 | { |
|
|
513 | if (!option (Opt_secondaryScreen)) |
|
|
514 | return; |
|
|
515 | |
|
|
516 | for (int i = prev_nrow; i--; ) |
|
|
517 | ::swap (ROW(i), swap_buf [i]); |
|
|
518 | |
|
|
519 | ::swap (screen.cur, swap.cur); |
|
|
520 | |
|
|
521 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
522 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
523 | } |
|
|
524 | |
507 | /* ------------------------------------------------------------------------- */ |
525 | /* ------------------------------------------------------------------------- */ |
508 | /* |
526 | /* |
509 | * Swap between primary and secondary screens |
527 | * Swap between primary and secondary screens |
510 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
528 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
511 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
529 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
512 | */ |
530 | */ |
513 | int |
531 | void |
514 | rxvt_term::scr_change_screen (int scrn) |
532 | rxvt_term::scr_change_screen (int scrn) |
515 | { |
533 | { |
|
|
534 | if (scrn == current_screen) |
|
|
535 | return; |
|
|
536 | |
516 | want_refresh = 1; |
537 | want_refresh = 1; |
517 | view_start = 0; |
538 | view_start = 0; |
518 | |
539 | |
519 | if (current_screen == scrn) |
|
|
520 | return scrn; |
|
|
521 | |
|
|
522 | selection_check (2); /* check for boundary cross */ |
540 | selection_check (2); /* check for boundary cross */ |
523 | |
541 | |
524 | int i = current_screen; current_screen = scrn; scrn = i; |
542 | int i = current_screen; current_screen = scrn; scrn = i; |
525 | |
543 | |
526 | ::swap (screen.cur.row, swap.cur.row); |
|
|
527 | ::swap (screen.cur.col, swap.cur.col); |
|
|
528 | |
|
|
529 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
530 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
531 | |
|
|
532 | #if NSCREENS |
544 | #if NSCREENS |
533 | if (OPTION (Opt_secondaryScreen)) |
545 | if (option (Opt_secondaryScreen)) |
534 | { |
546 | { |
535 | num_scr = 0; |
547 | num_scr = 0; |
536 | |
548 | |
537 | for (int i = prev_nrow; i--; ) |
549 | scr_swap_screen (); |
538 | ::swap (ROW(i), swap_buf [i]); |
|
|
539 | |
550 | |
540 | ::swap (screen.charset, swap.charset); |
551 | ::swap (screen.charset, swap.charset); |
541 | ::swap (screen.flags, swap.flags); |
552 | ::swap (screen.flags, swap.flags); |
542 | screen.flags |= Screen_VisibleCursor; |
553 | screen.flags |= Screen_VisibleCursor; |
543 | swap.flags |= Screen_VisibleCursor; |
554 | swap.flags |= Screen_VisibleCursor; |
544 | } |
555 | } |
545 | else |
556 | else |
546 | #endif |
557 | #endif |
547 | if (OPTION (Opt_secondaryScroll)) |
558 | if (option (Opt_secondaryScroll)) |
548 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
559 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
549 | |
|
|
550 | return scrn; |
|
|
551 | } |
560 | } |
552 | |
561 | |
553 | // clear WrapNext indicator, solidifying position on next line |
562 | // clear WrapNext indicator, solidifying position on next line |
554 | void |
563 | void |
555 | rxvt_term::scr_do_wrap () |
564 | rxvt_term::scr_do_wrap () NOTHROW |
556 | { |
565 | { |
557 | if (!(screen.flags & Screen_WrapNext)) |
566 | if (!(screen.flags & Screen_WrapNext)) |
558 | return; |
567 | return; |
559 | |
568 | |
560 | screen.flags &= ~Screen_WrapNext; |
569 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
570 | /* ------------------------------------------------------------------------- */ |
579 | /* ------------------------------------------------------------------------- */ |
571 | /* |
580 | /* |
572 | * Change the colour for following text |
581 | * Change the colour for following text |
573 | */ |
582 | */ |
574 | void |
583 | void |
575 | rxvt_term::scr_color (unsigned int color, int fgbg) |
584 | rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW |
576 | { |
585 | { |
577 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
586 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
578 | color = fgbg; |
587 | color = fgbg; |
579 | |
588 | |
580 | if (fgbg == Color_fg) |
589 | if (fgbg == Color_fg) |
… | |
… | |
586 | /* ------------------------------------------------------------------------- */ |
595 | /* ------------------------------------------------------------------------- */ |
587 | /* |
596 | /* |
588 | * Change the rendition style for following text |
597 | * Change the rendition style for following text |
589 | */ |
598 | */ |
590 | void |
599 | void |
591 | rxvt_term::scr_rendition (int set, int style) |
600 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
592 | { |
601 | { |
593 | if (set) |
602 | if (set) |
594 | rstyle |= style; |
603 | rstyle |= style; |
595 | else if (style == ~RS_None) |
604 | else if (style == ~RS_None) |
596 | rstyle = DEFAULT_RSTYLE; |
605 | rstyle = DEFAULT_RSTYLE; |
… | |
… | |
603 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
612 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
604 | * count positive ==> scroll up |
613 | * count positive ==> scroll up |
605 | * count negative ==> scroll down |
614 | * count negative ==> scroll down |
606 | */ |
615 | */ |
607 | int |
616 | int |
608 | rxvt_term::scr_scroll_text (int row1, int row2, int count) |
617 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
609 | { |
618 | { |
610 | if (count == 0 || (row1 > row2)) |
619 | if (count == 0 || (row1 > row2)) |
611 | return 0; |
620 | return 0; |
612 | |
621 | |
613 | want_refresh = 1; |
622 | want_refresh = 1; |
614 | num_scr += count; |
623 | num_scr += count; |
615 | |
624 | |
616 | if (count > 0 |
625 | if (count > 0 |
617 | && row1 == 0 |
626 | && row1 == 0 |
618 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
627 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
619 | { |
628 | { |
620 | top_row = max (top_row - count, -saveLines); |
629 | top_row = max (top_row - count, -saveLines); |
621 | |
630 | |
622 | // scroll everything up 'count' lines |
631 | // scroll everything up 'count' lines |
623 | term_start = (term_start + count) % total_rows; |
632 | term_start = (term_start + count) % total_rows; |
624 | |
633 | |
|
|
634 | // sever bottommost line |
625 | { |
635 | { |
626 | // severe bottommost scrolled line |
|
|
627 | line_t &l = ROW(row2 - count); |
636 | line_t &l = ROW(row2 - count); |
|
|
637 | l.is_longer (0); |
628 | l.touch (); |
638 | l.touch (); |
629 | l.is_longer (0); |
|
|
630 | } |
639 | } |
631 | |
640 | |
632 | // erase newly scorlled-in lines |
641 | // erase newly scrolled-in lines |
633 | for (int i = count; i; --i ) |
642 | for (int i = count; i--; ) |
634 | { |
643 | { |
635 | // basically this is a slightly optimized scr_blank_screen_mem |
|
|
636 | // it is worth the effort on slower machines |
|
|
637 | line_t &l = ROW(nrow - i); |
644 | line_t &l = ROW(nrow - 1 - i); |
638 | |
645 | |
|
|
646 | // optimize if already cleared, can be significant on slow machines |
|
|
647 | // could be rolled into scr_blank_screen_mem |
|
|
648 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
|
|
649 | { |
639 | scr_blank_line (l, 0, l.l, rstyle); |
650 | scr_blank_line (l, 0, l.l, rstyle); |
640 | |
|
|
641 | l.l = 0; |
651 | l.l = 0; |
642 | l.f = 0; |
652 | l.f = 0; |
|
|
653 | } |
|
|
654 | else |
|
|
655 | scr_blank_screen_mem (l, rstyle); |
643 | } |
656 | } |
644 | |
657 | |
645 | // now copy lines below the scroll region bottom to the |
658 | // now copy lines below the scroll region bottom to the |
646 | // bottom of the screen again, so they look as if they |
659 | // bottom of the screen again, so they look as if they |
647 | // hadn't moved. |
660 | // hadn't moved. |
… | |
… | |
669 | selection.op = SELECTION_CLEAR; |
682 | selection.op = SELECTION_CLEAR; |
670 | } |
683 | } |
671 | } |
684 | } |
672 | |
685 | |
673 | // finally move the view window, if desired |
686 | // finally move the view window, if desired |
674 | if (OPTION (Opt_scrollWithBuffer) |
687 | if (option (Opt_scrollWithBuffer) |
675 | && view_start != 0 |
688 | && view_start != 0 |
676 | && view_start != -saveLines) |
689 | && view_start != -saveLines) |
677 | scr_page (UP, count); |
690 | scr_page (UP, count); |
678 | |
691 | |
679 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
692 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
… | |
… | |
731 | /* ------------------------------------------------------------------------- */ |
744 | /* ------------------------------------------------------------------------- */ |
732 | /* |
745 | /* |
733 | * Add text given in <str> of length <len> to screen struct |
746 | * Add text given in <str> of length <len> to screen struct |
734 | */ |
747 | */ |
735 | void |
748 | void |
736 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) |
749 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
737 | { |
750 | { |
738 | if (len <= 0) /* sanity */ |
751 | if (len <= 0) /* sanity */ |
739 | return; |
752 | return; |
740 | |
753 | |
741 | unsigned char checksel; |
754 | unsigned char checksel; |
… | |
… | |
747 | ZERO_SCROLLBACK (); |
760 | ZERO_SCROLLBACK (); |
748 | |
761 | |
749 | if (minlines > 0) |
762 | if (minlines > 0) |
750 | { |
763 | { |
751 | minlines += screen.cur.row - screen.bscroll; |
764 | minlines += screen.cur.row - screen.bscroll; |
|
|
765 | min_it (minlines, screen.cur.row - top_row); |
752 | |
766 | |
753 | if (minlines > 0 |
767 | if (minlines > 0 |
754 | && screen.tscroll == 0 |
768 | && screen.tscroll == 0 |
755 | && screen.bscroll == nrow - 1) |
769 | && screen.bscroll == nrow - 1) |
756 | { |
770 | { |
… | |
… | |
817 | CLEAR_SELECTION (); |
831 | CLEAR_SELECTION (); |
818 | } |
832 | } |
819 | |
833 | |
820 | if (screen.flags & Screen_WrapNext) |
834 | if (screen.flags & Screen_WrapNext) |
821 | { |
835 | { |
822 | max_it (line->l, ncol); |
|
|
823 | line->is_longer (1); |
|
|
824 | |
|
|
825 | scr_do_wrap (); |
836 | scr_do_wrap (); |
826 | |
837 | |
|
|
838 | line->l = ncol; |
|
|
839 | line->is_longer (1); |
|
|
840 | |
827 | row = screen.cur.row; |
841 | row = screen.cur.row; |
828 | line = &ROW(row); /* _must_ refresh */ |
842 | line = &ROW(row); /* _must_ refresh */ |
829 | } |
843 | } |
830 | |
844 | |
831 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
845 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
832 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
846 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
833 | c = 0xfffd; |
847 | c = 0xfffd; |
834 | |
848 | |
835 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
849 | // rely on wcwidth to tell us the character width, do wcwidth before |
836 | // do wcwidth before further replacements, as wcwidth might return -1 |
850 | // further replacements, as wcwidth might return -1 for the line |
837 | // for the line drawing characters below as they might be invalid in the current |
851 | // drawing characters below as they might be invalid in the current |
838 | // locale. |
852 | // locale. |
839 | int width = c < 0x100 ? 1 : wcwidth (c); |
853 | int width = WCWIDTH (c); |
840 | |
854 | |
841 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
855 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
842 | { |
856 | { |
843 | // vt100 special graphics and line drawing |
857 | // vt100 special graphics and line drawing |
844 | // 5f-7e standard vt100 |
858 | // 5f-7e standard vt100 |
… | |
… | |
995 | /* |
1009 | /* |
996 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1010 | * Process Backspace. Move back the cursor back a position, wrap if have to |
997 | * XTERM_SEQ: CTRL-H |
1011 | * XTERM_SEQ: CTRL-H |
998 | */ |
1012 | */ |
999 | void |
1013 | void |
1000 | rxvt_term::scr_backspace () |
1014 | rxvt_term::scr_backspace () NOTHROW |
1001 | { |
1015 | { |
1002 | want_refresh = 1; |
1016 | want_refresh = 1; |
1003 | |
1017 | |
1004 | if (screen.cur.col == 0) |
1018 | if (screen.cur.col == 0) |
1005 | { |
1019 | { |
… | |
… | |
1023 | * Process Horizontal Tab |
1037 | * Process Horizontal Tab |
1024 | * count: +ve = forward; -ve = backwards |
1038 | * count: +ve = forward; -ve = backwards |
1025 | * XTERM_SEQ: CTRL-I |
1039 | * XTERM_SEQ: CTRL-I |
1026 | */ |
1040 | */ |
1027 | void |
1041 | void |
1028 | rxvt_term::scr_tab (int count, bool ht) |
1042 | rxvt_term::scr_tab (int count, bool ht) NOTHROW |
1029 | { |
1043 | { |
1030 | int i, x; |
1044 | int i, x; |
1031 | |
1045 | |
1032 | want_refresh = 1; |
1046 | want_refresh = 1; |
1033 | i = x = screen.cur.col; |
1047 | i = x = screen.cur.col; |
… | |
… | |
1055 | if (count) |
1069 | if (count) |
1056 | x = ncol - 1; |
1070 | x = ncol - 1; |
1057 | |
1071 | |
1058 | // store horizontal tab commands as characters inside the text |
1072 | // store horizontal tab commands as characters inside the text |
1059 | // buffer so they can be selected and pasted. |
1073 | // buffer so they can be selected and pasted. |
1060 | if (ht && OPTION (Opt_pastableTabs)) |
1074 | if (ht && option (Opt_pastableTabs)) |
1061 | { |
1075 | { |
1062 | base_rend = SET_FONT (base_rend, 0); |
1076 | base_rend = SET_FONT (base_rend, 0); |
1063 | |
1077 | |
1064 | l.touch (x); |
1078 | l.touch (x); |
1065 | |
1079 | |
… | |
… | |
1098 | * Process DEC Back Index |
1112 | * Process DEC Back Index |
1099 | * XTERM_SEQ: ESC 6 |
1113 | * XTERM_SEQ: ESC 6 |
1100 | * Move cursor left in row. If we're at the left boundary, shift everything |
1114 | * Move cursor left in row. If we're at the left boundary, shift everything |
1101 | * in that row right. Clear left column. |
1115 | * in that row right. Clear left column. |
1102 | */ |
1116 | */ |
1103 | #if ENABLE_FRILLS |
1117 | #if !ENABLE_MINIMAL |
1104 | void |
1118 | void |
1105 | rxvt_term::scr_backindex () |
1119 | rxvt_term::scr_backindex () NOTHROW |
1106 | { |
1120 | { |
1107 | if (screen.cur.col > 0) |
1121 | if (screen.cur.col > 0) |
1108 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1122 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1109 | else |
1123 | else |
1110 | scr_insdel_chars (1, INSERT); |
1124 | scr_insdel_chars (1, INSERT); |
… | |
… | |
1115 | * Process DEC Forward Index |
1129 | * Process DEC Forward Index |
1116 | * XTERM_SEQ: ESC 9 |
1130 | * XTERM_SEQ: ESC 9 |
1117 | * Move cursor right in row. If we're at the right boundary, shift everything |
1131 | * Move cursor right in row. If we're at the right boundary, shift everything |
1118 | * in that row left. Clear right column. |
1132 | * in that row left. Clear right column. |
1119 | */ |
1133 | */ |
1120 | #if ENABLE_FRILLS |
1134 | #if !ENABLE_MINIMAL |
1121 | void |
1135 | void |
1122 | rxvt_term::scr_forwardindex () |
1136 | rxvt_term::scr_forwardindex () NOTHROW |
1123 | { |
1137 | { |
1124 | if (screen.cur.col < ncol - 1) |
1138 | if (screen.cur.col < ncol - 1) |
1125 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1139 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1126 | else |
1140 | else |
1127 | { |
1141 | { |
… | |
… | |
1140 | /* ------------------------------------------------------------------------- */ |
1154 | /* ------------------------------------------------------------------------- */ |
1141 | /* |
1155 | /* |
1142 | * Goto Row/Column |
1156 | * Goto Row/Column |
1143 | */ |
1157 | */ |
1144 | void |
1158 | void |
1145 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1159 | rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW |
1146 | { |
1160 | { |
1147 | want_refresh = 1; |
1161 | want_refresh = 1; |
1148 | ZERO_SCROLLBACK (); |
1162 | ZERO_SCROLLBACK (); |
1149 | |
1163 | |
1150 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1164 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
… | |
… | |
1188 | /* ------------------------------------------------------------------------- */ |
1202 | /* ------------------------------------------------------------------------- */ |
1189 | /* |
1203 | /* |
1190 | * direction should be UP or DN |
1204 | * direction should be UP or DN |
1191 | */ |
1205 | */ |
1192 | void |
1206 | void |
1193 | rxvt_term::scr_index (enum page_dirn direction) |
1207 | rxvt_term::scr_index (enum page_dirn direction) NOTHROW |
1194 | { |
1208 | { |
1195 | int dirn; |
1209 | int dirn; |
1196 | |
1210 | |
1197 | want_refresh = 1; |
1211 | want_refresh = 1; |
1198 | ZERO_SCROLLBACK (); |
1212 | ZERO_SCROLLBACK (); |
… | |
… | |
1217 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1231 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1218 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1232 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1219 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1233 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1220 | */ |
1234 | */ |
1221 | void |
1235 | void |
1222 | rxvt_term::scr_erase_line (int mode) |
1236 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1223 | { |
1237 | { |
1224 | unsigned int col, num; |
1238 | unsigned int col, num; |
1225 | |
1239 | |
1226 | want_refresh = 1; |
1240 | want_refresh = 1; |
1227 | ZERO_SCROLLBACK (); |
1241 | ZERO_SCROLLBACK (); |
… | |
… | |
1271 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1285 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1272 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1286 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1273 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1287 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1274 | */ |
1288 | */ |
1275 | void |
1289 | void |
1276 | rxvt_term::scr_erase_screen (int mode) |
1290 | rxvt_term::scr_erase_screen (int mode) NOTHROW |
1277 | { |
1291 | { |
1278 | int num; |
1292 | int num; |
1279 | int32_t row; |
1293 | int32_t row; |
1280 | rend_t ren; |
1294 | rend_t ren; |
1281 | XGCValues gcvalue; |
1295 | XGCValues gcvalue; |
… | |
… | |
1326 | } |
1340 | } |
1327 | else |
1341 | else |
1328 | { |
1342 | { |
1329 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1343 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1330 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1344 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1331 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1345 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1332 | ERASE_ROWS (row, num); |
1346 | ERASE_ROWS (row, num); |
1333 | gcvalue.foreground = pix_colors[Color_fg]; |
1347 | gcvalue.foreground = pix_colors[Color_fg]; |
1334 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1348 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1335 | } |
1349 | } |
1336 | |
1350 | |
1337 | for (; num--; row++) |
1351 | for (; num--; row++) |
1338 | { |
1352 | { |
1339 | scr_blank_screen_mem (ROW(row), rstyle); |
1353 | scr_blank_screen_mem (ROW(row), rstyle); |
1340 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1354 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1341 | } |
1355 | } |
1342 | } |
1356 | } |
1343 | |
1357 | |
1344 | #if ENABLE_FRILLS |
1358 | #if !ENABLE_MINIMAL |
1345 | void |
1359 | void |
1346 | rxvt_term::scr_erase_savelines () |
1360 | rxvt_term::scr_erase_savelines () NOTHROW |
1347 | { |
1361 | { |
1348 | want_refresh = 1; |
1362 | want_refresh = 1; |
1349 | ZERO_SCROLLBACK (); |
1363 | ZERO_SCROLLBACK (); |
1350 | |
1364 | |
1351 | top_row = 0; |
1365 | top_row = 0; |
… | |
… | |
1356 | /* |
1370 | /* |
1357 | * Fill the screen with `E's |
1371 | * Fill the screen with `E's |
1358 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1372 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1359 | */ |
1373 | */ |
1360 | void |
1374 | void |
1361 | rxvt_term::scr_E () |
1375 | rxvt_term::scr_E () NOTHROW |
1362 | { |
1376 | { |
1363 | rend_t fs; |
1377 | rend_t fs; |
1364 | |
1378 | |
1365 | want_refresh = 1; |
1379 | want_refresh = 1; |
1366 | ZERO_SCROLLBACK (); |
1380 | ZERO_SCROLLBACK (); |
… | |
… | |
1387 | /* ------------------------------------------------------------------------- */ |
1401 | /* ------------------------------------------------------------------------- */ |
1388 | /* |
1402 | /* |
1389 | * Insert/Delete <count> lines |
1403 | * Insert/Delete <count> lines |
1390 | */ |
1404 | */ |
1391 | void |
1405 | void |
1392 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1406 | rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW |
1393 | { |
1407 | { |
1394 | int end; |
1408 | int end; |
1395 | |
1409 | |
1396 | ZERO_SCROLLBACK (); |
1410 | ZERO_SCROLLBACK (); |
1397 | |
1411 | |
… | |
… | |
1417 | /* ------------------------------------------------------------------------- */ |
1431 | /* ------------------------------------------------------------------------- */ |
1418 | /* |
1432 | /* |
1419 | * Insert/Delete <count> characters from the current position |
1433 | * Insert/Delete <count> characters from the current position |
1420 | */ |
1434 | */ |
1421 | void |
1435 | void |
1422 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1436 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1423 | { |
1437 | { |
1424 | int col, row; |
1438 | int col, row; |
1425 | rend_t tr; |
1439 | rend_t tr; |
1426 | |
1440 | |
1427 | want_refresh = 1; |
1441 | want_refresh = 1; |
… | |
… | |
1515 | /* |
1529 | /* |
1516 | * Set the scrolling region |
1530 | * Set the scrolling region |
1517 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1531 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1518 | */ |
1532 | */ |
1519 | void |
1533 | void |
1520 | rxvt_term::scr_scroll_region (int top, int bot) |
1534 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1521 | { |
1535 | { |
1522 | max_it (top, 0); |
1536 | max_it (top, 0); |
1523 | min_it (bot, nrow - 1); |
1537 | min_it (bot, nrow - 1); |
1524 | |
1538 | |
1525 | if (top > bot) |
1539 | if (top > bot) |
… | |
… | |
1535 | * Make the cursor visible/invisible |
1549 | * Make the cursor visible/invisible |
1536 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1550 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1537 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1551 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1538 | */ |
1552 | */ |
1539 | void |
1553 | void |
1540 | rxvt_term::scr_cursor_visible (int mode) |
1554 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1541 | { |
1555 | { |
1542 | want_refresh = 1; |
1556 | want_refresh = 1; |
1543 | |
1557 | |
1544 | if (mode) |
1558 | if (mode) |
1545 | screen.flags |= Screen_VisibleCursor; |
1559 | screen.flags |= Screen_VisibleCursor; |
… | |
… | |
1552 | * Set/unset automatic wrapping |
1566 | * Set/unset automatic wrapping |
1553 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1567 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1554 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1568 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1555 | */ |
1569 | */ |
1556 | void |
1570 | void |
1557 | rxvt_term::scr_autowrap (int mode) |
1571 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1558 | { |
1572 | { |
1559 | if (mode) |
1573 | if (mode) |
1560 | screen.flags |= Screen_Autowrap; |
1574 | screen.flags |= Screen_Autowrap; |
1561 | else |
1575 | else |
1562 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
1576 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
… | |
… | |
1571 | * and the cursor cannot be moved outside. |
1585 | * and the cursor cannot be moved outside. |
1572 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1586 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1573 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1587 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1574 | */ |
1588 | */ |
1575 | void |
1589 | void |
1576 | rxvt_term::scr_relative_origin (int mode) |
1590 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1577 | { |
1591 | { |
1578 | if (mode) |
1592 | if (mode) |
1579 | screen.flags |= Screen_Relative; |
1593 | screen.flags |= Screen_Relative; |
1580 | else |
1594 | else |
1581 | screen.flags &= ~Screen_Relative; |
1595 | screen.flags &= ~Screen_Relative; |
… | |
… | |
1588 | * Set insert/replace mode |
1602 | * Set insert/replace mode |
1589 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1603 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1590 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1604 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1591 | */ |
1605 | */ |
1592 | void |
1606 | void |
1593 | rxvt_term::scr_insert_mode (int mode) |
1607 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1594 | { |
1608 | { |
1595 | if (mode) |
1609 | if (mode) |
1596 | screen.flags |= Screen_Insert; |
1610 | screen.flags |= Screen_Insert; |
1597 | else |
1611 | else |
1598 | screen.flags &= ~Screen_Insert; |
1612 | screen.flags &= ~Screen_Insert; |
… | |
… | |
1604 | * XTERM_SEQ: Set tab at current column : ESC H |
1618 | * XTERM_SEQ: Set tab at current column : ESC H |
1605 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1619 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1606 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1620 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1607 | */ |
1621 | */ |
1608 | void |
1622 | void |
1609 | rxvt_term::scr_set_tab (int mode) |
1623 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1610 | { |
1624 | { |
1611 | if (mode < 0) |
1625 | if (mode < 0) |
1612 | memset (tabs, 0, ncol * sizeof (char)); |
1626 | memset (tabs, 0, ncol * sizeof (char)); |
1613 | else if (screen.cur.col < ncol) |
1627 | else if (screen.cur.col < ncol) |
1614 | tabs [screen.cur.col] = !!mode; |
1628 | tabs [screen.cur.col] = !!mode; |
… | |
… | |
1619 | * Set reverse/normal video |
1633 | * Set reverse/normal video |
1620 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1634 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1621 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1635 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1622 | */ |
1636 | */ |
1623 | void |
1637 | void |
1624 | rxvt_term::scr_rvideo_mode (int mode) |
1638 | rxvt_term::scr_rvideo_mode (bool on) NOTHROW |
1625 | { |
1639 | { |
1626 | XGCValues gcvalue; |
1640 | rvideo_mode = on; |
1627 | |
1641 | |
|
|
1642 | #ifndef NO_BELL |
|
|
1643 | on ^= rvideo_bell; |
|
|
1644 | #endif |
|
|
1645 | |
1628 | if (rvideo != mode) |
1646 | if (rvideo_state != on) |
1629 | { |
1647 | { |
1630 | rvideo = mode; |
1648 | rvideo_state = on; |
|
|
1649 | |
1631 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1650 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1632 | #if XPM_BACKGROUND |
1651 | #ifdef HAVE_BG_PIXMAP |
1633 | if (bgPixmap.pixmap == None) |
1652 | if (bgPixmap.pixmap == None) |
1634 | #endif |
1653 | #endif |
1635 | #if TRANSPARENT |
1654 | #if ENABLE_TRANSPARENCY |
1636 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
1655 | if (!option (Opt_transparent) || am_transparent == 0) |
1637 | #endif |
1656 | #endif |
1638 | XSetWindowBackground (display->display, vt, |
1657 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1639 | pix_colors[Color_bg]); |
|
|
1640 | |
1658 | |
|
|
1659 | XGCValues gcvalue; |
1641 | gcvalue.foreground = pix_colors[Color_fg]; |
1660 | gcvalue.foreground = pix_colors[Color_fg]; |
1642 | gcvalue.background = pix_colors[Color_bg]; |
1661 | gcvalue.background = pix_colors[Color_bg]; |
1643 | XChangeGC (display->display, gc, GCBackground | GCForeground, |
1662 | XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue); |
1644 | &gcvalue); |
1663 | |
1645 | scr_clear (); |
1664 | scr_clear (); |
1646 | scr_touch (true); |
1665 | scr_touch (true); |
1647 | } |
1666 | } |
1648 | } |
1667 | } |
1649 | |
1668 | |
… | |
… | |
1651 | /* |
1670 | /* |
1652 | * Report current cursor position |
1671 | * Report current cursor position |
1653 | * XTERM_SEQ: Report position: ESC [ 6 n |
1672 | * XTERM_SEQ: Report position: ESC [ 6 n |
1654 | */ |
1673 | */ |
1655 | void |
1674 | void |
1656 | rxvt_term::scr_report_position () |
1675 | rxvt_term::scr_report_position () NOTHROW |
1657 | { |
1676 | { |
1658 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1677 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1659 | } |
1678 | } |
1660 | |
1679 | |
1661 | /* ------------------------------------------------------------------------- * |
1680 | /* ------------------------------------------------------------------------- * |
… | |
… | |
1664 | |
1683 | |
1665 | /* |
1684 | /* |
1666 | * Set font style |
1685 | * Set font style |
1667 | */ |
1686 | */ |
1668 | void |
1687 | void |
1669 | rxvt_term::set_font_style () |
1688 | rxvt_term::set_font_style () NOTHROW |
1670 | { |
1689 | { |
1671 | #if 0 |
1690 | #if 0 |
1672 | switch (charsets [screen.charset]) |
1691 | switch (charsets [screen.charset]) |
1673 | { |
1692 | { |
1674 | case '0': /* DEC Special Character & Line Drawing Set */ |
1693 | case '0': /* DEC Special Character & Line Drawing Set */ |
… | |
… | |
1696 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1715 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1697 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1716 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1698 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1717 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1699 | */ |
1718 | */ |
1700 | void |
1719 | void |
1701 | rxvt_term::scr_charset_choose (int set) |
1720 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1702 | { |
1721 | { |
1703 | screen.charset = set; |
1722 | screen.charset = set; |
1704 | set_font_style (); |
1723 | set_font_style (); |
1705 | } |
1724 | } |
1706 | |
1725 | |
… | |
… | |
1712 | * XTERM_SEQ: Set G2 character set: ESC * <C> |
1731 | * XTERM_SEQ: Set G2 character set: ESC * <C> |
1713 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1732 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1714 | * See set_font_style for possible values for <C> |
1733 | * See set_font_style for possible values for <C> |
1715 | */ |
1734 | */ |
1716 | void |
1735 | void |
1717 | rxvt_term::scr_charset_set (int set, unsigned int ch) |
1736 | rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW |
1718 | { |
1737 | { |
1719 | charsets[set] = (unsigned char)ch; |
1738 | charsets[set] = (unsigned char)ch; |
1720 | set_font_style (); |
1739 | set_font_style (); |
1721 | } |
1740 | } |
1722 | |
1741 | |
… | |
… | |
1727 | |
1746 | |
1728 | /* |
1747 | /* |
1729 | * refresh matching text. |
1748 | * refresh matching text. |
1730 | */ |
1749 | */ |
1731 | bool |
1750 | bool |
1732 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1751 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1733 | { |
1752 | { |
1734 | bool found = false; |
1753 | bool found = false; |
1735 | |
1754 | |
1736 | for (int i = 0; i < nrow; i++) |
1755 | for (int i = 0; i < nrow; i++) |
1737 | { |
1756 | { |
1738 | int col = 0; |
|
|
1739 | rend_t *drp = drawn_buf[i].r; |
1757 | rend_t *drp = drawn_buf[i].r; |
1740 | |
1758 | |
1741 | for (; col < ncol; col++, drp++) |
1759 | for (int col = 0; col < ncol; col++, drp++) |
1742 | if ((*drp & mask) == value) |
1760 | if ((*drp & mask) == value) |
1743 | { |
1761 | { |
1744 | found = true; |
1762 | found = true; |
1745 | *drp = ~value; |
1763 | *drp = ~value; |
1746 | } |
1764 | } |
… | |
… | |
1757 | PART_END, |
1775 | PART_END, |
1758 | RC_COUNT |
1776 | RC_COUNT |
1759 | }; |
1777 | }; |
1760 | |
1778 | |
1761 | void |
1779 | void |
1762 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1780 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1763 | { |
1781 | { |
1764 | int i; |
1782 | int i; |
1765 | row_col_t rc[RC_COUNT]; |
1783 | row_col_t rc[RC_COUNT]; |
1766 | |
1784 | |
1767 | if (!drawn_buf) /* sanity check */ |
1785 | if (!drawn_buf) /* sanity check */ |
… | |
… | |
1801 | /* ------------------------------------------------------------------------- */ |
1819 | /* ------------------------------------------------------------------------- */ |
1802 | /* |
1820 | /* |
1803 | * Refresh the entire screen |
1821 | * Refresh the entire screen |
1804 | */ |
1822 | */ |
1805 | void |
1823 | void |
1806 | rxvt_term::scr_touch (bool refresh) |
1824 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1807 | { |
1825 | { |
1808 | scr_expose (0, 0, width, height, refresh); |
1826 | scr_expose (0, 0, width, height, refresh); |
1809 | } |
1827 | } |
1810 | |
1828 | |
1811 | /* ------------------------------------------------------------------------- */ |
1829 | /* ------------------------------------------------------------------------- */ |
1812 | /* |
1830 | /* |
1813 | * Move the display so that the line represented by scrollbar value Y is at |
1831 | * Move the display so that the line represented by scrollbar value Y is at |
1814 | * the top of the screen |
1832 | * the top of the screen |
1815 | */ |
1833 | */ |
1816 | void |
1834 | void |
1817 | rxvt_term::scr_move_to (int y, int len) |
1835 | rxvt_term::scr_move_to (int y, int len) NOTHROW |
1818 | { |
1836 | { |
1819 | scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); |
1837 | scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); |
1820 | } |
1838 | } |
1821 | |
1839 | |
1822 | /* ------------------------------------------------------------------------- */ |
1840 | /* ------------------------------------------------------------------------- */ |
1823 | /* |
1841 | /* |
1824 | * Page the screen up/down nlines |
1842 | * Page the screen up/down nlines |
1825 | * direction should be UP or DN |
1843 | * direction should be UP or DN |
1826 | */ |
1844 | */ |
1827 | bool |
1845 | bool |
1828 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1846 | rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW |
1829 | { |
1847 | { |
1830 | int new_view_start = |
1848 | int new_view_start = |
1831 | direction == UP ? view_start - nlines |
1849 | direction == UP ? view_start - nlines |
1832 | : view_start + nlines; |
1850 | : view_start + nlines; |
1833 | |
1851 | |
1834 | return scr_changeview (new_view_start); |
1852 | return scr_changeview (new_view_start); |
1835 | } |
1853 | } |
1836 | |
1854 | |
1837 | bool |
1855 | bool |
1838 | rxvt_term::scr_changeview (int new_view_start) |
1856 | rxvt_term::scr_changeview (int new_view_start) NOTHROW |
1839 | { |
1857 | { |
1840 | clamp_it (new_view_start, top_row, 0); |
1858 | clamp_it (new_view_start, top_row, 0); |
1841 | |
1859 | |
1842 | if (new_view_start == view_start) |
1860 | if (new_view_start == view_start) |
1843 | return false; |
1861 | return false; |
… | |
… | |
1849 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1867 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1850 | |
1868 | |
1851 | return true; |
1869 | return true; |
1852 | } |
1870 | } |
1853 | |
1871 | |
1854 | /* ------------------------------------------------------------------------- */ |
1872 | #ifndef NO_BELL |
1855 | void |
1873 | void |
|
|
1874 | rxvt_term::bell_cb (time_watcher &w) |
|
|
1875 | { |
|
|
1876 | rvideo_bell = false; |
|
|
1877 | scr_rvideo_mode (rvideo_mode); |
|
|
1878 | } |
|
|
1879 | #endif |
|
|
1880 | |
|
|
1881 | /* ------------------------------------------------------------------------- */ |
|
|
1882 | void |
1856 | rxvt_term::scr_bell () |
1883 | rxvt_term::scr_bell () NOTHROW |
1857 | { |
1884 | { |
1858 | #ifndef NO_BELL |
1885 | #ifndef NO_BELL |
1859 | |
1886 | |
1860 | # ifndef NO_MAPALERT |
1887 | # ifndef NO_MAPALERT |
1861 | # ifdef MAPALERT_OPTION |
1888 | # ifdef MAPALERT_OPTION |
1862 | if (OPTION (Opt_mapAlert)) |
1889 | if (option (Opt_mapAlert)) |
1863 | # endif |
1890 | # endif |
1864 | XMapWindow (display->display, parent[0]); |
1891 | XMapWindow (dpy, parent[0]); |
1865 | # endif |
1892 | # endif |
|
|
1893 | # if ENABLE_FRILLS |
|
|
1894 | if (option (Opt_urgentOnBell)) |
|
|
1895 | { |
|
|
1896 | XWMHints *h; |
1866 | |
1897 | |
1867 | if (OPTION (Opt_visualBell)) |
1898 | h = XGetWMHints(dpy, parent[0]); |
|
|
1899 | if (h != NULL) |
|
|
1900 | { |
|
|
1901 | h->flags |= XUrgencyHint; |
|
|
1902 | XSetWMHints(dpy, parent[0], h); |
|
|
1903 | } |
1868 | { |
1904 | } |
1869 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1905 | # endif |
|
|
1906 | |
|
|
1907 | if (option (Opt_visualBell)) |
|
|
1908 | { |
|
|
1909 | rvideo_bell = true; |
|
|
1910 | scr_rvideo_mode (rvideo_mode); |
1870 | display->flush (); |
1911 | display->flush (); |
1871 | rxvt_usleep (VISUAL_BELL_DURATION); |
1912 | |
1872 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1913 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1873 | } |
1914 | } |
1874 | else |
1915 | else |
1875 | XBell (display->display, 0); |
1916 | XBell (dpy, 0); |
1876 | |
|
|
1877 | #endif |
1917 | #endif |
1878 | } |
1918 | } |
1879 | |
1919 | |
1880 | /* ------------------------------------------------------------------------- */ |
1920 | /* ------------------------------------------------------------------------- */ |
1881 | /* ARGSUSED */ |
1921 | /* ARGSUSED */ |
1882 | void |
1922 | void |
1883 | rxvt_term::scr_printscreen (int fullhist) |
1923 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1884 | { |
1924 | { |
1885 | #ifdef PRINTPIPE |
1925 | #ifdef PRINTPIPE |
1886 | int nrows, row_start; |
1926 | int nrows, row_start; |
1887 | FILE *fd; |
1927 | FILE *fd; |
1888 | |
1928 | |
… | |
… | |
1937 | * Refresh the screen |
1977 | * Refresh the screen |
1938 | * drawn_text/drawn_rend contain the screen information before the update. |
1978 | * drawn_text/drawn_rend contain the screen information before the update. |
1939 | * screen.text/screen.rend contain what the screen will change to. |
1979 | * screen.text/screen.rend contain what the screen will change to. |
1940 | */ |
1980 | */ |
1941 | void |
1981 | void |
1942 | rxvt_term::scr_refresh () |
1982 | rxvt_term::scr_refresh () NOTHROW |
1943 | { |
1983 | { |
1944 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1984 | unsigned char have_bg, |
1945 | showcursor; /* show the cursor */ |
1985 | showcursor; /* show the cursor */ |
1946 | int16_t col, row, /* column/row we're processing */ |
1986 | int16_t col, row, /* column/row we're processing */ |
1947 | ocrow; /* old cursor row */ |
1987 | ocrow; /* old cursor row */ |
1948 | int i; /* tmp */ |
1988 | int i; /* tmp */ |
1949 | #ifndef NO_CURSORCOLOR |
1989 | #ifndef NO_CURSORCOLOR |
1950 | rend_t cc1; /* store colours at cursor position (s) */ |
1990 | rend_t cc1; /* store colours at cursor position (s) */ |
1951 | #endif |
1991 | #endif |
1952 | rend_t *crp; // cursor rendition pointer |
1992 | rend_t *crp; // cursor rendition pointer |
|
|
1993 | rend_t ccol1, /* Cursor colour */ |
|
|
1994 | ccol2; /* Cursor colour2 */ |
1953 | |
1995 | |
1954 | want_refresh = 0; /* screen is current */ |
1996 | want_refresh = 0; /* screen is current */ |
1955 | |
1997 | |
1956 | if (refresh_type == NO_REFRESH || !mapped) |
1998 | if (refresh_type == NO_REFRESH || !mapped) |
1957 | return; |
1999 | return; |
1958 | |
2000 | |
1959 | /* |
2001 | /* |
1960 | * A: set up vars |
2002 | * A: set up vars |
1961 | */ |
2003 | */ |
1962 | must_clear = 0; |
2004 | have_bg = 0; |
1963 | refresh_count = 0; |
2005 | refresh_count = 0; |
1964 | |
2006 | |
1965 | #if XPM_BACKGROUND |
2007 | #ifdef HAVE_BG_PIXMAP |
1966 | must_clear |= bgPixmap.pixmap != None; |
2008 | have_bg |= bgPixmap.pixmap != None; |
1967 | #endif |
2009 | #endif |
1968 | #if TRANSPARENT |
2010 | #if ENABLE_TRANSPARENCY |
1969 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
2011 | have_bg |= option (Opt_transparent) && am_transparent; |
1970 | #endif |
2012 | #endif |
1971 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2013 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1972 | |
2014 | |
1973 | /* |
2015 | /* |
1974 | * B: reverse any characters which are selected |
2016 | * B: reverse any characters which are selected |
… | |
… | |
1978 | /* |
2020 | /* |
1979 | * C: set the cursor character (s) |
2021 | * C: set the cursor character (s) |
1980 | */ |
2022 | */ |
1981 | { |
2023 | { |
1982 | unsigned char setoldcursor; |
2024 | unsigned char setoldcursor; |
1983 | rend_t ccol1, /* Cursor colour */ |
|
|
1984 | ccol2; /* Cursor colour2 */ |
|
|
1985 | |
2025 | |
1986 | showcursor = (screen.flags & Screen_VisibleCursor); |
2026 | showcursor = (screen.flags & Screen_VisibleCursor); |
1987 | #ifdef CURSOR_BLINK |
2027 | #ifdef CURSOR_BLINK |
1988 | if (hidden_cursor) |
2028 | if (hidden_cursor) |
1989 | showcursor = 0; |
2029 | showcursor = 0; |
… | |
… | |
1996 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2036 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
1997 | col--; |
2037 | col--; |
1998 | |
2038 | |
1999 | crp = &ROW(screen.cur.row).r[col]; |
2039 | crp = &ROW(screen.cur.row).r[col]; |
2000 | |
2040 | |
|
|
2041 | #ifndef NO_CURSORCOLOR |
|
|
2042 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2043 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2044 | ccol1 = Color_cursor; |
|
|
2045 | else |
|
|
2046 | #endif |
|
|
2047 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2048 | ccol1 = fgcolor_of (rstyle); |
|
|
2049 | #else |
|
|
2050 | ccol1 = Color_fg; |
|
|
2051 | #endif |
|
|
2052 | |
|
|
2053 | #ifndef NO_CURSORCOLOR |
|
|
2054 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2055 | ccol2 = Color_cursor2; |
|
|
2056 | else |
|
|
2057 | #endif |
|
|
2058 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2059 | ccol2 = bgcolor_of (rstyle); |
|
|
2060 | #else |
|
|
2061 | ccol2 = Color_bg; |
|
|
2062 | #endif |
|
|
2063 | |
2001 | if (showcursor && focus) |
2064 | if (showcursor && focus) |
2002 | { |
2065 | { |
2003 | if (OPTION (Opt_cursorUnderline)) |
2066 | if (option (Opt_cursorUnderline)) |
2004 | *crp ^= RS_Uline; |
2067 | *crp ^= RS_Uline; |
2005 | else |
2068 | else |
2006 | { |
2069 | { |
2007 | *crp ^= RS_RVid; |
2070 | *crp ^= RS_RVid; |
2008 | |
|
|
2009 | #ifndef NO_CURSORCOLOR |
|
|
2010 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2011 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2012 | ccol1 = Color_cursor; |
|
|
2013 | else |
|
|
2014 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2015 | ccol1 = fgcolor_of (rstyle); |
|
|
2016 | #else |
|
|
2017 | ccol1 = Color_fg; |
|
|
2018 | #endif |
|
|
2019 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2020 | ccol2 = Color_cursor2; |
|
|
2021 | else |
|
|
2022 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2023 | ccol2 = bgcolor_of (rstyle); |
|
|
2024 | #else |
|
|
2025 | ccol2 = Color_bg; |
|
|
2026 | #endif |
|
|
2027 | *crp = SET_FGCOLOR (*crp, ccol1); |
2071 | *crp = SET_FGCOLOR (*crp, ccol1); |
2028 | *crp = SET_BGCOLOR (*crp, ccol2); |
2072 | *crp = SET_BGCOLOR (*crp, ccol2); |
2029 | #endif |
|
|
2030 | } |
2073 | } |
2031 | } |
2074 | } |
2032 | } |
2075 | } |
2033 | |
2076 | |
2034 | /* make sure no outline cursor is left around */ |
2077 | /* make sure no outline cursor is left around */ |
… | |
… | |
2073 | * D: CopyArea pass - very useful for slower links |
2116 | * D: CopyArea pass - very useful for slower links |
2074 | * This has been deliberately kept simple. |
2117 | * This has been deliberately kept simple. |
2075 | */ |
2118 | */ |
2076 | if (!display->is_local |
2119 | if (!display->is_local |
2077 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2120 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2078 | && abs (num_scr) < nrow && !must_clear) |
2121 | && abs (num_scr) < nrow && !have_bg) |
2079 | { |
2122 | { |
2080 | int16_t nits; |
2123 | int16_t nits; |
|
|
2124 | int i = num_scr; |
2081 | int j; |
2125 | int j; |
2082 | int len, wlen; |
2126 | int len, wlen; |
2083 | dLocal (int, num_scr); |
2127 | dLocal (int, num_scr); |
2084 | |
2128 | |
2085 | j = nrow; |
2129 | j = nrow; |
2086 | wlen = len = -1; |
2130 | wlen = len = -1; |
2087 | row = i > 0 ? 0 : j - 1; |
2131 | row = i > 0 ? 0 : j - 1; |
|
|
2132 | |
2088 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2133 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2089 | { |
2134 | { |
2090 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2135 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2091 | { |
2136 | { |
2092 | line_t s = ROW(view_start + row); |
2137 | line_t s = ROW(view_start + row); |
… | |
… | |
2113 | wlen = row; |
2158 | wlen = row; |
2114 | continue; |
2159 | continue; |
2115 | } |
2160 | } |
2116 | } |
2161 | } |
2117 | |
2162 | |
2118 | if (len != -1) |
2163 | if (len >= 0) |
2119 | { |
2164 | { |
2120 | /* also comes here at end if needed because of >= above */ |
2165 | /* also comes here at end if needed because of >= above */ |
2121 | if (wlen < len) |
2166 | if (wlen < len) |
2122 | ::swap (wlen, len); |
2167 | ::swap (wlen, len); |
2123 | |
2168 | |
|
|
2169 | XGCValues gcv; |
|
|
2170 | |
|
|
2171 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2124 | XCopyArea (display->display, vt, vt, |
2172 | XCopyArea (dpy, vt, vt, |
2125 | gc, 0, Row2Pixel (len + i), |
2173 | gc, 0, Row2Pixel (len + i), |
2126 | (unsigned int)this->width, |
2174 | (unsigned int)this->width, |
2127 | (unsigned int)Height2Pixel (wlen - len + 1), |
2175 | (unsigned int)Height2Pixel (wlen - len + 1), |
2128 | 0, Row2Pixel (len)); |
2176 | 0, Row2Pixel (len)); |
|
|
2177 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2178 | |
2129 | len = -1; |
2179 | len = -1; |
2130 | } |
2180 | } |
2131 | } |
2181 | } |
2132 | } |
2182 | } |
2133 | #endif |
2183 | #endif |
… | |
… | |
2189 | count++; |
2239 | count++; |
2190 | |
2240 | |
2191 | if (stp[col] != dtp[col] |
2241 | if (stp[col] != dtp[col] |
2192 | || !RS_SAME (srp[col], drp[col])) |
2242 | || !RS_SAME (srp[col], drp[col])) |
2193 | { |
2243 | { |
2194 | if (must_clear && (i++ > count / 2)) |
2244 | if (have_bg && (i++ > count / 2)) |
2195 | break; |
2245 | break; |
2196 | |
2246 | |
2197 | dtp[col] = stp[col]; |
2247 | dtp[col] = stp[col]; |
2198 | drp[col] = rend; |
2248 | drp[col] = rend; |
2199 | i = 0; |
2249 | i = 0; |
2200 | } |
2250 | } |
2201 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2251 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2202 | break; |
2252 | break; |
2203 | } |
2253 | } |
2204 | |
2254 | |
2205 | col--; /* went one too far. move back */ |
2255 | col--; /* went one too far. move back */ |
2206 | count -= i; /* dump any matching trailing chars */ |
2256 | count -= i; /* dump any matching trailing chars */ |
… | |
… | |
2216 | int back = bgcolor_of (rend); // desired background |
2266 | int back = bgcolor_of (rend); // desired background |
2217 | |
2267 | |
2218 | // only do special processing if any attributes are set, which is unlikely |
2268 | // only do special processing if any attributes are set, which is unlikely |
2219 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2269 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2220 | { |
2270 | { |
2221 | #if ENABLE_STYLES |
|
|
2222 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2223 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2224 | drp[col + 1] = ~srp[col + 1]; |
|
|
2225 | |
|
|
2226 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2227 | while (text > stp |
|
|
2228 | && srp[text - stp - 1] & RS_Careful |
|
|
2229 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2230 | text--, count++, xpixel -= fwidth; |
|
|
2231 | #endif |
|
|
2232 | |
|
|
2233 | bool invert = rend & RS_RVid; |
2271 | bool invert = rend & RS_RVid; |
2234 | |
2272 | |
2235 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2273 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2236 | if (rend & RS_Bold |
2274 | if (rend & RS_Bold |
2237 | && fore == Color_fg) |
2275 | && fore == Color_fg) |
… | |
… | |
2253 | else |
2291 | else |
2254 | invert = !invert; |
2292 | invert = !invert; |
2255 | # endif |
2293 | # endif |
2256 | } |
2294 | } |
2257 | |
2295 | |
2258 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2296 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2259 | fore = Color_UL; |
2297 | fore = Color_UL; |
2260 | #endif |
2298 | #endif |
2261 | |
2299 | |
2262 | if (invert) |
2300 | if (invert) |
2263 | { |
2301 | { |
|
|
2302 | #ifdef OPTION_HC |
|
|
2303 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2304 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2305 | #endif |
|
|
2306 | /* invert the column if no highlightColor is set or it is the |
|
|
2307 | * current cursor column */ |
2264 | ::swap (fore, back); |
2308 | ::swap (fore, back); |
|
|
2309 | #ifdef OPTION_HC |
|
|
2310 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2311 | back = Color_HC; |
|
|
2312 | #endif |
2265 | |
2313 | |
2266 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2314 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2315 | # ifndef OPTION_HC |
2267 | if (ISSET_PIXCOLOR (Color_RV)) |
2316 | if (ISSET_PIXCOLOR (Color_RV)) |
2268 | back = Color_RV; |
2317 | back = Color_RV; |
2269 | |
2318 | # endif |
2270 | if (fore == back) |
2319 | if (fore == back) |
2271 | { |
2320 | { |
2272 | fore = Color_bg; |
2321 | fore = Color_bg; |
2273 | back = Color_fg; |
2322 | back = Color_fg; |
2274 | } |
2323 | } |
… | |
… | |
2285 | } |
2334 | } |
2286 | else if (hidden_text) |
2335 | else if (hidden_text) |
2287 | fore = back; |
2336 | fore = back; |
2288 | } |
2337 | } |
2289 | #endif |
2338 | #endif |
|
|
2339 | |
|
|
2340 | #if ENABLE_STYLES |
|
|
2341 | // "careful" (too wide) character handling |
|
|
2342 | |
|
|
2343 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2344 | while (text > stp |
|
|
2345 | && srp[text - stp - 1] & RS_Careful |
|
|
2346 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2347 | text--, count++, xpixel -= fwidth; |
|
|
2348 | |
|
|
2349 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2350 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2351 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2352 | |
|
|
2353 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2354 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2355 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2356 | #endif |
2290 | } |
2357 | } |
2291 | |
2358 | |
2292 | /* |
2359 | /* |
2293 | * Actually do the drawing of the string here |
2360 | * Actually do the drawing of the string here |
2294 | */ |
2361 | */ |
2295 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2362 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2296 | |
2363 | |
2297 | if (back == fore) |
|
|
2298 | font->clear_rect (*drawable, xpixel, ypixel, |
|
|
2299 | fwidth * count, fheight, |
|
|
2300 | back); |
|
|
2301 | else if (back == Color_bg) |
2364 | if (have_bg && back == Color_bg) |
2302 | { |
2365 | { |
2303 | if (must_clear) |
2366 | // this is very ugly, maybe push it into ->draw? |
2304 | { |
|
|
2305 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2306 | |
2367 | |
2307 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2368 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2308 | if (text[i] != ' ') |
2369 | if (text[i] != ' ') |
2309 | { |
2370 | { |
2310 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2371 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2311 | break; |
2372 | goto did_clear; |
2312 | } |
|
|
2313 | } |
2373 | } |
2314 | else |
2374 | |
2315 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2375 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2376 | did_clear: ; |
2316 | } |
2377 | } |
2317 | else |
2378 | else |
2318 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2379 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2319 | |
2380 | |
2320 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2381 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2321 | { |
2382 | { |
2322 | #if ENABLE_FRILLS |
2383 | #if ENABLE_FRILLS |
2323 | if (ISSET_PIXCOLOR (Color_underline)) |
2384 | if (ISSET_PIXCOLOR (Color_underline)) |
2324 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2385 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2325 | else |
2386 | else |
2326 | #endif |
2387 | #endif |
2327 | XSetForeground (display->display, gc, pix_colors[fore]); |
2388 | XSetForeground (dpy, gc, pix_colors[fore]); |
2328 | |
2389 | |
2329 | XDrawLine (display->display, drawBuffer, gc, |
2390 | XDrawLine (dpy, drawBuffer, gc, |
2330 | xpixel, ypixel + font->ascent + 1, |
2391 | xpixel, ypixel + font->ascent + 1, |
2331 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2392 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2332 | } |
2393 | } |
2333 | } /* for (col....) */ |
2394 | } /* for (col....) */ |
2334 | } /* for (row....) */ |
2395 | } /* for (row....) */ |
… | |
… | |
2343 | */ |
2404 | */ |
2344 | if (showcursor) |
2405 | if (showcursor) |
2345 | { |
2406 | { |
2346 | if (focus) |
2407 | if (focus) |
2347 | { |
2408 | { |
2348 | if (OPTION (Opt_cursorUnderline)) |
2409 | if (option (Opt_cursorUnderline)) |
2349 | *crp ^= RS_Uline; |
2410 | *crp ^= RS_Uline; |
2350 | else |
2411 | else |
2351 | { |
2412 | { |
2352 | *crp ^= RS_RVid; |
2413 | *crp ^= RS_RVid; |
2353 | #ifndef NO_CURSORCOLOR |
2414 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2367 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2428 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2368 | cursorwidth++; |
2429 | cursorwidth++; |
2369 | |
2430 | |
2370 | #ifndef NO_CURSORCOLOR |
2431 | #ifndef NO_CURSORCOLOR |
2371 | if (ISSET_PIXCOLOR (Color_cursor)) |
2432 | if (ISSET_PIXCOLOR (Color_cursor)) |
2372 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2433 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2434 | else |
2373 | #endif |
2435 | #endif |
|
|
2436 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2374 | |
2437 | |
2375 | XDrawRectangle (display->display, drawBuffer, gc, |
2438 | XDrawRectangle (dpy, drawBuffer, gc, |
2376 | Col2Pixel (col), |
2439 | Col2Pixel (col), |
2377 | Row2Pixel (oldcursor.row), |
2440 | Row2Pixel (oldcursor.row), |
2378 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2441 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2379 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2442 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2380 | } |
2443 | } |
… | |
… | |
2388 | num_scr = 0; |
2451 | num_scr = 0; |
2389 | num_scr_allow = 1; |
2452 | num_scr_allow = 1; |
2390 | } |
2453 | } |
2391 | |
2454 | |
2392 | void |
2455 | void |
2393 | rxvt_term::scr_remap_chars (line_t &l) |
2456 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2394 | { |
2457 | { |
2395 | if (!l.t) |
2458 | if (!l.t) |
2396 | return; |
2459 | return; |
2397 | |
2460 | |
2398 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2461 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
… | |
… | |
2400 | for (int i = ncol; i--; ) |
2463 | for (int i = ncol; i--; ) |
2401 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2464 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2402 | } |
2465 | } |
2403 | |
2466 | |
2404 | void |
2467 | void |
2405 | rxvt_term::scr_remap_chars () |
2468 | rxvt_term::scr_remap_chars () NOTHROW |
2406 | { |
2469 | { |
2407 | for (int i = total_rows; i--; ) |
2470 | for (int i = total_rows; i--; ) |
2408 | scr_remap_chars (row_buf [i]); |
2471 | scr_remap_chars (row_buf [i]); |
2409 | |
2472 | |
2410 | for (int i = nrow; i--; ) |
2473 | for (int i = nrow; i--; ) |
… | |
… | |
2413 | scr_remap_chars (swap_buf [i]); |
2476 | scr_remap_chars (swap_buf [i]); |
2414 | } |
2477 | } |
2415 | } |
2478 | } |
2416 | |
2479 | |
2417 | void |
2480 | void |
2418 | rxvt_term::scr_recolour () |
2481 | rxvt_term::scr_recolour () NOTHROW |
2419 | { |
2482 | { |
2420 | if (1 |
2483 | if (1 |
2421 | #if TRANSPARENT |
2484 | #if ENABLE_TRANSPARENCY |
2422 | && !am_transparent |
2485 | && !am_transparent |
2423 | #endif |
2486 | #endif |
2424 | #if XPM_BACKGROUND |
2487 | #ifdef HAVE_BG_PIXMAP |
2425 | && !bgPixmap.pixmap |
2488 | && !bgPixmap.pixmap |
2426 | #endif |
2489 | #endif |
2427 | ) |
2490 | ) |
2428 | { |
2491 | { |
2429 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2492 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2430 | XClearWindow (display->display, parent[0]); |
2493 | XClearWindow (dpy, parent[0]); |
2431 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2494 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2432 | #if HAVE_SCROLLBARS |
2495 | #if HAVE_SCROLLBARS |
2433 | if (scrollBar.win) |
2496 | if (scrollBar.win) |
2434 | { |
2497 | { |
2435 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2498 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2436 | scrollBar.setIdle (); |
2499 | scrollBar.setIdle (); |
2437 | scrollbar_show (0); |
2500 | scrollbar_show (0); |
2438 | } |
2501 | } |
2439 | #endif |
2502 | #endif |
2440 | } |
2503 | } |
… | |
… | |
2444 | want_refresh = 1; |
2507 | want_refresh = 1; |
2445 | } |
2508 | } |
2446 | |
2509 | |
2447 | /* ------------------------------------------------------------------------- */ |
2510 | /* ------------------------------------------------------------------------- */ |
2448 | void |
2511 | void |
2449 | rxvt_term::scr_clear (bool really) |
2512 | rxvt_term::scr_clear (bool really) NOTHROW |
2450 | { |
2513 | { |
2451 | if (!mapped) |
2514 | if (!mapped) |
2452 | return; |
2515 | return; |
2453 | |
2516 | |
2454 | num_scr_allow = 0; |
2517 | num_scr_allow = 0; |
2455 | want_refresh = 1; |
2518 | want_refresh = 1; |
2456 | |
2519 | |
2457 | if (really) |
2520 | if (really) |
2458 | XClearWindow (display->display, vt); |
2521 | XClearWindow (dpy, vt); |
2459 | } |
2522 | } |
2460 | |
2523 | |
2461 | void |
2524 | void |
2462 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) |
2525 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2463 | { |
2526 | { |
2464 | int view_end = view_start + nrow; |
2527 | int view_end = view_start + nrow; |
2465 | int row, col; |
2528 | int row, col; |
2466 | |
2529 | |
2467 | for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) |
2530 | for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) |
… | |
… | |
2479 | srp[col] ^= rstyle2; |
2542 | srp[col] ^= rstyle2; |
2480 | } |
2543 | } |
2481 | } |
2544 | } |
2482 | |
2545 | |
2483 | void |
2546 | void |
2484 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) |
2547 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW |
2485 | { |
2548 | { |
2486 | int view_end = view_start + nrow; |
2549 | int view_end = view_start + nrow; |
2487 | int row, col; |
2550 | int row, col; |
2488 | |
2551 | |
2489 | if (beg_row >= view_start) |
2552 | if (beg_row >= view_start) |
… | |
… | |
2506 | srp[col] ^= rstyle; |
2569 | srp[col] ^= rstyle; |
2507 | } |
2570 | } |
2508 | |
2571 | |
2509 | /* ------------------------------------------------------------------------- */ |
2572 | /* ------------------------------------------------------------------------- */ |
2510 | void |
2573 | void |
2511 | rxvt_term::scr_reverse_selection () |
2574 | rxvt_term::scr_reverse_selection () NOTHROW |
2512 | { |
2575 | { |
2513 | if (selection.op |
2576 | if (selection.op |
2514 | && current_screen == selection.screen |
2577 | && current_screen == selection.screen |
2515 | && selection.end.row >= view_start) |
2578 | && selection.end.row >= view_start) |
2516 | { |
2579 | { |
2517 | #if ENABLE_FRILLS |
2580 | #if !ENABLE_MINIMAL |
2518 | if (selection.rect) |
2581 | if (selection.rect) |
2519 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2582 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2520 | selection.end.row, selection.end.col, |
2583 | selection.end.row, selection.end.col, |
2521 | RS_RVid, RS_RVid | RS_Uline); |
2584 | RS_RVid, RS_RVid | RS_Uline); |
2522 | else |
2585 | else |
… | |
… | |
2532 | * Dump the whole scrollback and screen to the passed filedescriptor. The |
2595 | * Dump the whole scrollback and screen to the passed filedescriptor. The |
2533 | * invoking routine must close the fd. |
2596 | * invoking routine must close the fd. |
2534 | */ |
2597 | */ |
2535 | #if 0 |
2598 | #if 0 |
2536 | void |
2599 | void |
2537 | rxvt_term::scr_dump (int fd) |
2600 | rxvt_term::scr_dump (int fd) NOTHROW |
2538 | { |
2601 | { |
2539 | int row, wrote; |
2602 | int row, wrote; |
2540 | unsigned int width, towrite; |
2603 | unsigned int width, towrite; |
2541 | char r1[] = "\n"; |
2604 | char r1[] = "\n"; |
2542 | |
2605 | |
… | |
… | |
2561 | |
2624 | |
2562 | /* ------------------------------------------------------------------------- * |
2625 | /* ------------------------------------------------------------------------- * |
2563 | * CHARACTER SELECTION * |
2626 | * CHARACTER SELECTION * |
2564 | * ------------------------------------------------------------------------- */ |
2627 | * ------------------------------------------------------------------------- */ |
2565 | void |
2628 | void |
2566 | rxvt_term::selection_check (int check_more) |
2629 | rxvt_term::selection_check (int check_more) NOTHROW |
2567 | { |
2630 | { |
2568 | row_col_t pos; |
2631 | row_col_t pos; |
2569 | |
2632 | |
2570 | if (!selection.op) |
2633 | if (!selection.op) |
2571 | return; |
2634 | return; |
… | |
… | |
2592 | /* ------------------------------------------------------------------------- */ |
2655 | /* ------------------------------------------------------------------------- */ |
2593 | /* |
2656 | /* |
2594 | * Paste a selection direct to the command fd |
2657 | * Paste a selection direct to the command fd |
2595 | */ |
2658 | */ |
2596 | void |
2659 | void |
2597 | rxvt_term::paste (char *data, unsigned int len) |
2660 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2598 | { |
2661 | { |
2599 | /* convert normal newline chars into common keyboard Return key sequence */ |
2662 | /* convert normal newline chars into common keyboard Return key sequence */ |
2600 | for (unsigned int i = 0; i < len; i++) |
2663 | for (unsigned int i = 0; i < len; i++) |
2601 | if (data[i] == C0_LF) |
2664 | if (data[i] == C0_LF) |
2602 | data[i] = C0_CR; |
2665 | data[i] = C0_CR; |
… | |
… | |
2608 | /* |
2671 | /* |
2609 | * Respond to a notification that a primary selection has been sent |
2672 | * Respond to a notification that a primary selection has been sent |
2610 | * EXT: SelectionNotify |
2673 | * EXT: SelectionNotify |
2611 | */ |
2674 | */ |
2612 | void |
2675 | void |
2613 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2676 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2614 | { |
2677 | { |
2615 | if (prop == None) /* check for failed XConvertSelection */ |
2678 | if (prop == None) /* check for failed XConvertSelection */ |
2616 | { |
2679 | { |
2617 | if ((selection_type & Sel_CompoundText)) |
2680 | if ((selection_type & Sel_CompoundText)) |
2618 | { |
2681 | { |
… | |
… | |
2638 | } |
2701 | } |
2639 | |
2702 | |
2640 | unsigned long bytes_after; |
2703 | unsigned long bytes_after; |
2641 | XTextProperty ct; |
2704 | XTextProperty ct; |
2642 | |
2705 | |
2643 | if (XGetWindowProperty (display->display, win, prop, |
2706 | if (XGetWindowProperty (dpy, win, prop, |
2644 | 0, PROP_SIZE / 4, |
2707 | 0, PROP_SIZE / 4, |
2645 | delete_prop, AnyPropertyType, |
2708 | delete_prop, AnyPropertyType, |
2646 | &ct.encoding, &ct.format, |
2709 | &ct.encoding, &ct.format, |
2647 | &ct.nitems, &bytes_after, |
2710 | &ct.nitems, &bytes_after, |
2648 | &ct.value) != Success) |
2711 | &ct.value) != Success) |
… | |
… | |
2657 | if (bytes_after) |
2720 | if (bytes_after) |
2658 | { |
2721 | { |
2659 | // fetch and append remaining data |
2722 | // fetch and append remaining data |
2660 | XTextProperty ct2; |
2723 | XTextProperty ct2; |
2661 | |
2724 | |
2662 | if (XGetWindowProperty (display->display, win, prop, |
2725 | if (XGetWindowProperty (dpy, win, prop, |
2663 | ct.nitems / 4, (bytes_after + 3) / 4, |
2726 | ct.nitems / 4, (bytes_after + 3) / 4, |
2664 | delete_prop, AnyPropertyType, |
2727 | delete_prop, AnyPropertyType, |
2665 | &ct2.encoding, &ct2.format, |
2728 | &ct2.encoding, &ct2.format, |
2666 | &ct2.nitems, &bytes_after, |
2729 | &ct2.nitems, &bytes_after, |
2667 | &ct2.value) != Success) |
2730 | &ct2.value) != Success) |
… | |
… | |
2680 | |
2743 | |
2681 | if (ct.encoding == xa[XA_INCR]) |
2744 | if (ct.encoding == xa[XA_INCR]) |
2682 | { |
2745 | { |
2683 | // INCR selection, start handshake |
2746 | // INCR selection, start handshake |
2684 | if (!delete_prop) |
2747 | if (!delete_prop) |
2685 | XDeleteProperty (display->display, win, prop); |
2748 | XDeleteProperty (dpy, win, prop); |
2686 | |
2749 | |
2687 | selection_wait = Sel_incr; |
2750 | selection_wait = Sel_incr; |
2688 | incr_buf_fill = 0; |
2751 | incr_buf_fill = 0; |
2689 | incr_ev.start (NOW + 10); |
2752 | incr_ev.start (NOW + 10); |
2690 | |
2753 | |
… | |
… | |
2737 | } |
2800 | } |
2738 | |
2801 | |
2739 | char **cl; |
2802 | char **cl; |
2740 | int cr; |
2803 | int cr; |
2741 | |
2804 | |
2742 | #if ENABLE_FRILLS |
2805 | #if !ENABLE_MINIMAL |
2743 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2806 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2744 | // so recode it manually |
2807 | // so recode it manually |
2745 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2808 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2746 | { |
2809 | { |
2747 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2810 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2751 | paste (s, strlen (s)); |
2814 | paste (s, strlen (s)); |
2752 | free (s); |
2815 | free (s); |
2753 | } |
2816 | } |
2754 | else |
2817 | else |
2755 | #endif |
2818 | #endif |
2756 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2819 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2757 | && cl) |
2820 | && cl) |
2758 | { |
2821 | { |
2759 | for (int i = 0; i < cr; i++) |
2822 | for (int i = 0; i < cr; i++) |
2760 | paste (cl[i], strlen (cl[i])); |
2823 | paste (cl[i], strlen (cl[i])); |
2761 | |
2824 | |
… | |
… | |
2770 | if (selection_wait == Sel_normal) |
2833 | if (selection_wait == Sel_normal) |
2771 | selection_wait = Sel_none; |
2834 | selection_wait = Sel_none; |
2772 | } |
2835 | } |
2773 | |
2836 | |
2774 | void |
2837 | void |
2775 | rxvt_term::incr_cb (time_watcher &w) |
2838 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2776 | { |
2839 | { |
2777 | selection_wait = Sel_none; |
2840 | selection_wait = Sel_none; |
2778 | |
2841 | |
2779 | incr_buf_size = 0; |
2842 | incr_buf_size = 0; |
2780 | free (incr_buf); |
2843 | free (incr_buf); |
2781 | |
2844 | |
2782 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2845 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2783 | } |
2846 | } |
2784 | |
2847 | |
2785 | void |
2848 | void |
2786 | rxvt_term::selection_property (Window win, Atom prop) |
2849 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
2787 | { |
2850 | { |
2788 | if (prop == None || selection_wait != Sel_incr) |
2851 | if (prop == None || selection_wait != Sel_incr) |
2789 | return; |
2852 | return; |
2790 | |
2853 | |
2791 | selection_paste (win, prop, true); |
2854 | selection_paste (win, prop, true); |
… | |
… | |
2800 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2863 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2801 | * will auto fallback to CUT_BUFFER0 |
2864 | * will auto fallback to CUT_BUFFER0 |
2802 | * EXT: button 2 release |
2865 | * EXT: button 2 release |
2803 | */ |
2866 | */ |
2804 | void |
2867 | void |
2805 | rxvt_term::selection_request (Time tm, int x, int y) |
2868 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2806 | { |
2869 | { |
2807 | if (x < 0 || x >= width || y < 0 || y >= height) |
2870 | if (selection.text && selnum == Sel_Primary) |
2808 | return; /* outside window */ |
|
|
2809 | |
|
|
2810 | if (selection.text) |
|
|
2811 | { /* internal selection */ |
2871 | { /* internal selection */ |
2812 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2872 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2813 | paste (str, strlen (str)); |
2873 | paste (str, strlen (str)); |
2814 | free (str); |
2874 | free (str); |
2815 | return; |
2875 | return; |
2816 | } |
2876 | } |
2817 | else |
2877 | else |
2818 | { |
2878 | { |
2819 | int i; |
|
|
2820 | |
|
|
2821 | selection_request_time = tm; |
2879 | selection_request_time = tm; |
2822 | selection_wait = Sel_normal; |
2880 | selection_wait = Sel_normal; |
2823 | |
2881 | |
2824 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
|
|
2825 | { |
|
|
2826 | #if X_HAVE_UTF8_STRING |
2882 | #if X_HAVE_UTF8_STRING |
2827 | selection_type = Sel_UTF8String; |
2883 | selection_type = Sel_UTF8String; |
2828 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
2884 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2829 | return; |
2885 | return; |
2830 | #else |
2886 | #else |
2831 | selection_type = Sel_CompoundText; |
2887 | selection_type = Sel_CompoundText; |
2832 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2888 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2833 | return; |
2889 | return; |
2834 | #endif |
2890 | #endif |
2835 | } |
|
|
2836 | } |
2891 | } |
2837 | |
2892 | |
2838 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2893 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2839 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2894 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2840 | } |
2895 | } |
2841 | |
2896 | |
2842 | int |
2897 | int |
2843 | rxvt_term::selection_request_other (Atom target, int selnum) |
2898 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
2844 | { |
2899 | { |
2845 | Atom sel; |
2900 | Atom sel; |
2846 | |
2901 | |
2847 | selection_type |= selnum; |
2902 | selection_type |= selnum; |
2848 | |
2903 | |
… | |
… | |
2851 | else if (selnum == Sel_Secondary) |
2906 | else if (selnum == Sel_Secondary) |
2852 | sel = XA_SECONDARY; |
2907 | sel = XA_SECONDARY; |
2853 | else |
2908 | else |
2854 | sel = xa[XA_CLIPBOARD]; |
2909 | sel = xa[XA_CLIPBOARD]; |
2855 | |
2910 | |
2856 | if (XGetSelectionOwner (display->display, sel) != None) |
2911 | if (XGetSelectionOwner (dpy, sel) != None) |
2857 | { |
2912 | { |
2858 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2913 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2859 | vt, selection_request_time); |
2914 | vt, selection_request_time); |
2860 | return 1; |
2915 | return 1; |
2861 | } |
2916 | } |
2862 | |
2917 | |
2863 | return 0; |
2918 | return 0; |
… | |
… | |
2867 | /* |
2922 | /* |
2868 | * Clear all selected text |
2923 | * Clear all selected text |
2869 | * EXT: SelectionClear |
2924 | * EXT: SelectionClear |
2870 | */ |
2925 | */ |
2871 | void |
2926 | void |
2872 | rxvt_term::selection_clear () |
2927 | rxvt_term::selection_clear () NOTHROW |
2873 | { |
2928 | { |
2874 | want_refresh = 1; |
2929 | want_refresh = 1; |
2875 | free (selection.text); |
2930 | free (selection.text); |
2876 | selection.text = NULL; |
2931 | selection.text = NULL; |
2877 | selection.len = 0; |
2932 | selection.len = 0; |
… | |
… | |
2926 | |
2981 | |
2927 | int end_col; |
2982 | int end_col; |
2928 | |
2983 | |
2929 | for (; row <= selection.end.row; row++, col = 0) |
2984 | for (; row <= selection.end.row; row++, col = 0) |
2930 | { |
2985 | { |
2931 | #if ENABLE_FRILLS |
2986 | #if !ENABLE_MINIMAL |
2932 | if (selection.rect) |
2987 | if (selection.rect) |
2933 | { |
2988 | { |
2934 | col = selection.beg.col; |
2989 | col = selection.beg.col; |
2935 | end_col = ncol + 1; |
2990 | end_col = ncol + 1; |
2936 | } |
2991 | } |
… | |
… | |
2939 | end_col = ROW(row).l; |
2994 | end_col = ROW(row).l; |
2940 | |
2995 | |
2941 | col = max (col, 0); |
2996 | col = max (col, 0); |
2942 | |
2997 | |
2943 | if (row == selection.end.row |
2998 | if (row == selection.end.row |
2944 | #if ENABLE_FRILLS |
2999 | #if !ENABLE_MINIMAL |
2945 | || selection.rect |
3000 | || selection.rect |
2946 | #endif |
3001 | #endif |
2947 | ) |
3002 | ) |
2948 | min_it (end_col, selection.end.col); |
3003 | min_it (end_col, selection.end.col); |
2949 | |
3004 | |
… | |
… | |
2972 | #endif |
3027 | #endif |
2973 | else |
3028 | else |
2974 | new_selection_text[ofs++] = *t++; |
3029 | new_selection_text[ofs++] = *t++; |
2975 | } |
3030 | } |
2976 | |
3031 | |
2977 | #if ENABLE_FRILLS |
3032 | #if !ENABLE_MINIMAL |
2978 | if (selection.rect) |
3033 | if (selection.rect) |
2979 | { |
3034 | { |
2980 | while (ofs |
3035 | while (ofs |
2981 | && new_selection_text[ofs - 1] != C0_LF |
3036 | && new_selection_text[ofs - 1] != C0_LF |
2982 | && unicode::is_space (new_selection_text[ofs - 1])) |
3037 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3012 | |
3067 | |
3013 | selection_grab (tm); |
3068 | selection_grab (tm); |
3014 | } |
3069 | } |
3015 | |
3070 | |
3016 | bool |
3071 | bool |
3017 | rxvt_term::selection_grab (Time tm) |
3072 | rxvt_term::selection_grab (Time tm) NOTHROW |
3018 | { |
3073 | { |
3019 | selection_time = tm; |
3074 | selection_time = tm; |
3020 | |
3075 | |
3021 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3076 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3022 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3077 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3023 | { |
3078 | { |
3024 | display->set_selection_owner (this); |
3079 | display->set_selection_owner (this); |
3025 | return true; |
3080 | return true; |
3026 | } |
3081 | } |
3027 | else |
3082 | else |
… | |
… | |
3031 | } |
3086 | } |
3032 | |
3087 | |
3033 | #if 0 |
3088 | #if 0 |
3034 | XTextProperty ct; |
3089 | XTextProperty ct; |
3035 | |
3090 | |
3036 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3091 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3037 | { |
3092 | { |
3038 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3093 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3039 | XFree (ct.value); |
3094 | XFree (ct.value); |
3040 | } |
3095 | } |
3041 | #endif |
3096 | #endif |
… | |
… | |
3045 | /* |
3100 | /* |
3046 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3101 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3047 | * EXT: button 1 press |
3102 | * EXT: button 1 press |
3048 | */ |
3103 | */ |
3049 | void |
3104 | void |
3050 | rxvt_term::selection_click (int clicks, int x, int y) |
3105 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
3051 | { |
3106 | { |
3052 | clicks = ((clicks - 1) % 3) + 1; |
3107 | clicks = ((clicks - 1) % 3) + 1; |
3053 | selection.clicks = clicks; /* save clicks so extend will work */ |
3108 | selection.clicks = clicks; /* save clicks so extend will work */ |
3054 | |
3109 | |
3055 | if (clicks == 2 && !selection.rect |
3110 | if (clicks == 2 && !selection.rect |
… | |
… | |
3074 | /* ------------------------------------------------------------------------- */ |
3129 | /* ------------------------------------------------------------------------- */ |
3075 | /* |
3130 | /* |
3076 | * Mark a selection at the specified col/row |
3131 | * Mark a selection at the specified col/row |
3077 | */ |
3132 | */ |
3078 | void |
3133 | void |
3079 | rxvt_term::selection_start_colrow (int col, int row) |
3134 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
3080 | { |
3135 | { |
3081 | want_refresh = 1; |
3136 | want_refresh = 1; |
3082 | |
3137 | |
3083 | selection.mark.row = row + view_start; |
3138 | selection.mark.row = row + view_start; |
3084 | selection.mark.col = col; |
3139 | selection.mark.col = col; |
… | |
… | |
3110 | #define DELIMIT_TEXT(x) \ |
3165 | #define DELIMIT_TEXT(x) \ |
3111 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3166 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3112 | #define DELIMIT_REND(x) 1 |
3167 | #define DELIMIT_REND(x) 1 |
3113 | |
3168 | |
3114 | void |
3169 | void |
3115 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
3170 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3116 | { |
3171 | { |
3117 | int col, row, dirnadd, tcol, trow, w1, w2; |
3172 | int col, row, dirnadd, tcol, trow, w1, w2; |
3118 | row_col_t bound; |
3173 | row_col_t bound; |
3119 | text_t *stp; |
3174 | text_t *stp; |
3120 | rend_t *srp; |
3175 | rend_t *srp; |
… | |
… | |
3194 | * flag == 0 ==> button 1 |
3249 | * flag == 0 ==> button 1 |
3195 | * flag == 1 ==> button 3 press |
3250 | * flag == 1 ==> button 3 press |
3196 | * flag == 2 ==> button 3 motion |
3251 | * flag == 2 ==> button 3 motion |
3197 | */ |
3252 | */ |
3198 | void |
3253 | void |
3199 | rxvt_term::selection_extend (int x, int y, int flag) |
3254 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3200 | { |
3255 | { |
3201 | int col = clamp (Pixel2Col (x), 0, ncol); |
3256 | int col = clamp (Pixel2Col (x), 0, ncol); |
3202 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3257 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3203 | |
3258 | |
3204 | /* |
3259 | /* |
… | |
… | |
3230 | /* ------------------------------------------------------------------------- */ |
3285 | /* ------------------------------------------------------------------------- */ |
3231 | /* |
3286 | /* |
3232 | * Extend the selection to the specified col/row |
3287 | * Extend the selection to the specified col/row |
3233 | */ |
3288 | */ |
3234 | void |
3289 | void |
3235 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3290 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3236 | { |
3291 | { |
3237 | row_col_t pos; |
3292 | row_col_t pos; |
3238 | enum { |
3293 | enum { |
3239 | LEFT, RIGHT |
3294 | LEFT, RIGHT |
3240 | } closeto = RIGHT; |
3295 | } closeto = RIGHT; |
… | |
… | |
3343 | |
3398 | |
3344 | if (selection.clicks == 1) |
3399 | if (selection.clicks == 1) |
3345 | { |
3400 | { |
3346 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3401 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3347 | && !ROW(selection.beg.row).is_longer () |
3402 | && !ROW(selection.beg.row).is_longer () |
3348 | #if ENABLE_FRILLS |
3403 | #if !ENABLE_MINIMAL |
3349 | && !selection.rect |
3404 | && !selection.rect |
3350 | #endif |
3405 | #endif |
3351 | ) |
3406 | ) |
3352 | selection.beg.col = ncol; |
3407 | selection.beg.col = ncol; |
3353 | |
3408 | |
3354 | if ( |
3409 | if ( |
3355 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3410 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3356 | && !ROW(selection.end.row).is_longer () |
3411 | && !ROW(selection.end.row).is_longer () |
3357 | #if ENABLE_FRILLS |
3412 | #if !ENABLE_MINIMAL |
3358 | && !selection.rect |
3413 | && !selection.rect |
3359 | #endif |
3414 | #endif |
3360 | ) |
3415 | ) |
3361 | selection.end.col = ncol; |
3416 | selection.end.col = ncol; |
3362 | } |
3417 | } |
… | |
… | |
3369 | selection_delimit_word (DN, &selection.end, &selection.end); |
3424 | selection_delimit_word (DN, &selection.end, &selection.end); |
3370 | } |
3425 | } |
3371 | else if (selection.clicks == 3) |
3426 | else if (selection.clicks == 3) |
3372 | { |
3427 | { |
3373 | #if ENABLE_FRILLS |
3428 | #if ENABLE_FRILLS |
3374 | if (OPTION (Opt_tripleclickwords)) |
3429 | if (option (Opt_tripleclickwords)) |
3375 | { |
3430 | { |
3376 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3431 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3377 | |
3432 | |
3378 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3433 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3379 | { |
3434 | { |
3380 | if (!ROW(end_row).is_longer ()) |
3435 | if (!ROW(end_row).is_longer ()) |
3381 | { |
3436 | { |
3382 | selection.end.row = end_row; |
3437 | selection.end.row = end_row; |
3383 | selection.end.col = ROW(end_row).l; |
3438 | selection.end.col = ROW(end_row).l; |
|
|
3439 | # if !ENABLE_MINIMAL |
3384 | selection_remove_trailing_spaces (); |
3440 | selection_remove_trailing_spaces (); |
|
|
3441 | # endif |
3385 | break; |
3442 | break; |
3386 | } |
3443 | } |
3387 | } |
3444 | } |
3388 | } |
3445 | } |
3389 | else |
3446 | else |
… | |
… | |
3418 | selection.mark.row = selection.beg.row; |
3475 | selection.mark.row = selection.beg.row; |
3419 | selection.mark.col = selection.beg.col; |
3476 | selection.mark.col = selection.beg.col; |
3420 | } |
3477 | } |
3421 | } |
3478 | } |
3422 | |
3479 | |
3423 | #if ENABLE_FRILLS |
3480 | #if !ENABLE_MINIMAL |
3424 | if (selection.rect && selection.beg.col > selection.end.col) |
3481 | if (selection.rect && selection.beg.col > selection.end.col) |
3425 | ::swap (selection.beg.col, selection.end.col); |
3482 | ::swap (selection.beg.col, selection.end.col); |
3426 | #endif |
3483 | #endif |
3427 | } |
3484 | } |
3428 | |
3485 | |
3429 | #if ENABLE_FRILLS |
3486 | #if !ENABLE_MINIMAL |
3430 | void |
3487 | void |
3431 | rxvt_term::selection_remove_trailing_spaces () |
3488 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3432 | { |
3489 | { |
3433 | int32_t end_col, end_row; |
3490 | int32_t end_col, end_row; |
3434 | text_t *stp; |
3491 | text_t *stp; |
3435 | |
3492 | |
3436 | end_col = selection.end.col; |
3493 | end_col = selection.end.col; |
… | |
… | |
3474 | /* |
3531 | /* |
3475 | * Double click on button 3 when already selected |
3532 | * Double click on button 3 when already selected |
3476 | * EXT: button 3 double click |
3533 | * EXT: button 3 double click |
3477 | */ |
3534 | */ |
3478 | void |
3535 | void |
3479 | rxvt_term::selection_rotate (int x, int y) |
3536 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3480 | { |
3537 | { |
3481 | selection.clicks = selection.clicks % 3 + 1; |
3538 | selection.clicks = selection.clicks % 3 + 1; |
3482 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3539 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3483 | } |
3540 | } |
3484 | |
3541 | |
… | |
… | |
3486 | /* |
3543 | /* |
3487 | * Respond to a request for our current selection |
3544 | * Respond to a request for our current selection |
3488 | * EXT: SelectionRequest |
3545 | * EXT: SelectionRequest |
3489 | */ |
3546 | */ |
3490 | void |
3547 | void |
3491 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3548 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3492 | { |
3549 | { |
3493 | XSelectionEvent ev; |
3550 | XSelectionEvent ev; |
3494 | dDisp; |
|
|
3495 | |
3551 | |
3496 | ev.type = SelectionNotify; |
3552 | ev.type = SelectionNotify; |
3497 | ev.property = None; |
3553 | ev.property = None; |
3498 | ev.display = rq.display; |
3554 | ev.display = rq.display; |
3499 | ev.requestor = rq.requestor; |
3555 | ev.requestor = rq.requestor; |
… | |
… | |
3513 | *target++ = xa[XA_COMPOUND_TEXT]; |
3569 | *target++ = xa[XA_COMPOUND_TEXT]; |
3514 | #if X_HAVE_UTF8_STRING |
3570 | #if X_HAVE_UTF8_STRING |
3515 | *target++ = xa[XA_UTF8_STRING]; |
3571 | *target++ = xa[XA_UTF8_STRING]; |
3516 | #endif |
3572 | #endif |
3517 | |
3573 | |
3518 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3574 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3519 | 32, PropModeReplace, |
3575 | 32, PropModeReplace, |
3520 | (unsigned char *)target_list, target - target_list); |
3576 | (unsigned char *)target_list, target - target_list); |
3521 | ev.property = rq.property; |
3577 | ev.property = rq.property; |
3522 | } |
3578 | } |
3523 | #if TODO // TODO |
3579 | #if TODO // TODO |
… | |
… | |
3526 | /* TODO: Handle MULTIPLE */ |
3582 | /* TODO: Handle MULTIPLE */ |
3527 | } |
3583 | } |
3528 | #endif |
3584 | #endif |
3529 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3585 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3530 | { |
3586 | { |
3531 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3587 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3532 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3588 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3533 | ev.property = rq.property; |
3589 | ev.property = rq.property; |
3534 | } |
3590 | } |
3535 | else if (rq.target == XA_STRING |
3591 | else if (rq.target == XA_STRING |
3536 | || rq.target == xa[XA_TEXT] |
3592 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3560 | style = enc_string; |
3616 | style = enc_string; |
3561 | else if (target == xa[XA_TEXT]) |
3617 | else if (target == xa[XA_TEXT]) |
3562 | style = enc_text; |
3618 | style = enc_text; |
3563 | else if (target == xa[XA_COMPOUND_TEXT]) |
3619 | else if (target == xa[XA_COMPOUND_TEXT]) |
3564 | style = enc_compound_text; |
3620 | style = enc_compound_text; |
3565 | #if ENABLE_FRILLS |
3621 | #if !ENABLE_MINIMAL |
3566 | else if (target == xa[XA_UTF8_STRING]) |
3622 | else if (target == xa[XA_UTF8_STRING]) |
3567 | style = enc_utf8; |
3623 | style = enc_utf8; |
3568 | #endif |
3624 | #endif |
3569 | else |
3625 | else |
3570 | { |
3626 | { |
… | |
… | |
3581 | { |
3637 | { |
3582 | cl = L""; |
3638 | cl = L""; |
3583 | selectlen = 0; |
3639 | selectlen = 0; |
3584 | } |
3640 | } |
3585 | |
3641 | |
3586 | #if ENABLE_FRILLS |
3642 | #if !ENABLE_MINIMAL |
3587 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3643 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3588 | // so recode it manually |
3644 | // so recode it manually |
3589 | if (style == enc_utf8) |
3645 | if (style == enc_utf8) |
3590 | { |
3646 | { |
3591 | freect = 1; |
3647 | freect = 1; |
… | |
… | |
3594 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3650 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3595 | ct.nitems = strlen ((char *)ct.value); |
3651 | ct.nitems = strlen ((char *)ct.value); |
3596 | } |
3652 | } |
3597 | else |
3653 | else |
3598 | #endif |
3654 | #endif |
3599 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3655 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3600 | freect = 1; |
3656 | freect = 1; |
3601 | else |
3657 | else |
3602 | { |
3658 | { |
3603 | /* if we failed to convert then send it raw */ |
3659 | /* if we failed to convert then send it raw */ |
3604 | ct.value = (unsigned char *)cl; |
3660 | ct.value = (unsigned char *)cl; |
3605 | ct.nitems = selectlen; |
3661 | ct.nitems = selectlen; |
3606 | ct.encoding = target; |
3662 | ct.encoding = target; |
3607 | } |
3663 | } |
3608 | |
3664 | |
3609 | XChangeProperty (disp, rq.requestor, rq.property, |
3665 | XChangeProperty (dpy, rq.requestor, rq.property, |
3610 | ct.encoding, 8, PropModeReplace, |
3666 | ct.encoding, 8, PropModeReplace, |
3611 | ct.value, (int)ct.nitems); |
3667 | ct.value, (int)ct.nitems); |
3612 | ev.property = rq.property; |
3668 | ev.property = rq.property; |
3613 | |
3669 | |
3614 | if (freect) |
3670 | if (freect) |
3615 | XFree (ct.value); |
3671 | XFree (ct.value); |
3616 | } |
3672 | } |
3617 | |
3673 | |
3618 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3674 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3619 | } |
3675 | } |
3620 | |
3676 | |
3621 | /* ------------------------------------------------------------------------- * |
3677 | /* ------------------------------------------------------------------------- * |
3622 | * MOUSE ROUTINES * |
3678 | * MOUSE ROUTINES * |
3623 | * ------------------------------------------------------------------------- */ |
3679 | * ------------------------------------------------------------------------- */ |
3624 | |
3680 | |
3625 | /* |
3681 | /* |
3626 | * return col/row values corresponding to x/y pixel values |
3682 | * return col/row values corresponding to x/y pixel values |
3627 | */ |
3683 | */ |
3628 | void |
3684 | void |
3629 | rxvt_term::pixel_position (int *x, int *y) |
3685 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
3630 | { |
3686 | { |
3631 | *x = Pixel2Col (*x); |
3687 | *x = Pixel2Col (*x); |
3632 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
3688 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
3633 | *y = Pixel2Row (*y); |
3689 | *y = Pixel2Row (*y); |
3634 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
3690 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
3635 | } |
3691 | } |
3636 | |
3692 | |
3637 | /* ------------------------------------------------------------------------- */ |
3693 | /* ------------------------------------------------------------------------- */ |
3638 | #ifdef USE_XIM |
3694 | #ifdef USE_XIM |
3639 | void |
3695 | void |
3640 | rxvt_term::im_set_position (XPoint &pos) |
3696 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3641 | { |
3697 | { |
3642 | XWindowAttributes xwa; |
3698 | XWindowAttributes xwa; |
3643 | |
3699 | |
3644 | XGetWindowAttributes (display->display, vt, &xwa); |
3700 | XGetWindowAttributes (dpy, vt, &xwa); |
3645 | |
3701 | |
3646 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3702 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3647 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3703 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3648 | } |
3704 | } |
3649 | #endif |
3705 | #endif |
3650 | |
3706 | |
3651 | #if ENABLE_OVERLAY |
3707 | #if ENABLE_OVERLAY |
3652 | void |
3708 | void |
3653 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3709 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW |
3654 | { |
3710 | { |
3655 | if (nrow < 1 || ncol < 1) |
3711 | if (nrow < 1 || ncol < 1) |
3656 | return; |
3712 | return; |
3657 | |
3713 | |
3658 | want_refresh = 1; |
3714 | want_refresh = 1; |
… | |
… | |
3703 | *rp = r; |
3759 | *rp = r; |
3704 | } |
3760 | } |
3705 | } |
3761 | } |
3706 | |
3762 | |
3707 | void |
3763 | void |
3708 | rxvt_term::scr_overlay_off () |
3764 | rxvt_term::scr_overlay_off () NOTHROW |
3709 | { |
3765 | { |
3710 | if (!ov_text) |
3766 | if (!ov_text) |
3711 | return; |
3767 | return; |
3712 | |
3768 | |
3713 | want_refresh = 1; |
3769 | want_refresh = 1; |
… | |
… | |
3721 | delete [] ov_text; ov_text = 0; |
3777 | delete [] ov_text; ov_text = 0; |
3722 | delete [] ov_rend; ov_rend = 0; |
3778 | delete [] ov_rend; ov_rend = 0; |
3723 | } |
3779 | } |
3724 | |
3780 | |
3725 | void |
3781 | void |
3726 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) |
3782 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3727 | { |
3783 | { |
3728 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3784 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3729 | return; |
3785 | return; |
3730 | |
3786 | |
3731 | x++, y++; |
3787 | x++, y++; |
… | |
… | |
3733 | ov_text[y][x] = text; |
3789 | ov_text[y][x] = text; |
3734 | ov_rend[y][x] = rend; |
3790 | ov_rend[y][x] = rend; |
3735 | } |
3791 | } |
3736 | |
3792 | |
3737 | void |
3793 | void |
3738 | rxvt_term::scr_overlay_set (int x, int y, const char *s) |
3794 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3739 | { |
3795 | { |
3740 | while (*s) |
3796 | while (*s) |
3741 | scr_overlay_set (x++, y, *s++); |
3797 | scr_overlay_set (x++, y, *s++); |
3742 | } |
3798 | } |
3743 | |
3799 | |
3744 | void |
3800 | void |
3745 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) |
3801 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3746 | { |
3802 | { |
3747 | while (*s) |
3803 | while (*s) |
3748 | { |
3804 | { |
3749 | text_t t = *s++; |
3805 | text_t t = *s++; |
3750 | int width = wcwidth (t); |
3806 | int width = WCWIDTH (t); |
3751 | |
3807 | |
3752 | while (width--) |
3808 | while (width--) |
3753 | { |
3809 | { |
3754 | scr_overlay_set (x++, y, t); |
3810 | scr_overlay_set (x++, y, t); |
3755 | t = NOCHAR; |
3811 | t = NOCHAR; |
3756 | } |
3812 | } |
3757 | } |
3813 | } |
3758 | } |
3814 | } |
3759 | |
3815 | |
3760 | void |
3816 | void |
3761 | rxvt_term::scr_swap_overlay () |
3817 | rxvt_term::scr_swap_overlay () NOTHROW |
3762 | { |
3818 | { |
3763 | if (!ov_text) |
3819 | if (!ov_text) |
3764 | return; |
3820 | return; |
3765 | |
3821 | |
3766 | // swap screen mem with overlay |
3822 | // swap screen mem with overlay |