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> |
… | |
… | |
93 | */ |
93 | */ |
94 | #define drawBuffer vt |
94 | #define drawBuffer vt |
95 | |
95 | |
96 | #define CLEAR_ROWS(row, num) \ |
96 | #define CLEAR_ROWS(row, num) \ |
97 | if (mapped) \ |
97 | if (mapped) \ |
98 | XClearArea (display->display, drawBuffer, 0, \ |
98 | XClearArea (dpy, drawBuffer, 0, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
100 | (unsigned int)Height2Pixel (num), False) |
100 | (unsigned int)Height2Pixel (num), False) |
101 | |
101 | |
102 | #define CLEAR_CHARS(x, y, num) \ |
102 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (mapped) \ |
103 | if (mapped) \ |
104 | XClearArea (display->display, drawBuffer, x, y, \ |
104 | XClearArea (dpy, drawBuffer, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
105 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
106 | (unsigned int)Height2Pixel (1), False) |
107 | |
107 | |
108 | #define ERASE_ROWS(row, num) \ |
108 | #define ERASE_ROWS(row, num) \ |
109 | XFillRectangle (display->display, drawBuffer, gc, \ |
109 | XFillRectangle (dpy, drawBuffer, gc, \ |
110 | 0, Row2Pixel (row), \ |
110 | 0, Row2Pixel (row), \ |
111 | (unsigned int)width, \ |
111 | (unsigned int)width, \ |
112 | (unsigned int)Height2Pixel (num)) |
112 | (unsigned int)Height2Pixel (num)) |
113 | |
113 | |
114 | /* ------------------------------------------------------------------------- * |
114 | /* ------------------------------------------------------------------------- * |
115 | * SCREEN `COMMON' ROUTINES * |
115 | * SCREEN `COMMON' ROUTINES * |
116 | * ------------------------------------------------------------------------- */ |
116 | * ------------------------------------------------------------------------- */ |
117 | |
117 | |
118 | /* Fill part/all of a line with blanks. */ |
118 | /* Fill part/all of a line with blanks. */ |
119 | void |
119 | void |
120 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) |
120 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW |
121 | { |
121 | { |
122 | if (!l.t) |
122 | if (!l.t) |
123 | { |
123 | { |
124 | lalloc (l); |
124 | lalloc (l); |
125 | col = 0; |
125 | col = 0; |
126 | width = ncol; |
126 | width = ncol; |
127 | } |
127 | } |
128 | |
128 | |
129 | l.touch (); |
129 | l.touch (); |
130 | |
130 | |
131 | efs &= ~RS_baseattrMask; |
131 | efs &= ~RS_baseattrMask; // remove italic etc. fontstyles |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
133 | |
133 | |
134 | text_t *et = l.t + col; |
134 | text_t *et = l.t + col; |
135 | rend_t *er = l.r + col; |
135 | rend_t *er = l.r + col; |
136 | |
136 | |
… | |
… | |
142 | } |
142 | } |
143 | |
143 | |
144 | /* ------------------------------------------------------------------------- */ |
144 | /* ------------------------------------------------------------------------- */ |
145 | /* Fill a full line with blanks - make sure it is allocated first */ |
145 | /* Fill a full line with blanks - make sure it is allocated first */ |
146 | void |
146 | void |
147 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
147 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW |
148 | { |
148 | { |
149 | scr_blank_line (l, 0, ncol, efs); |
149 | scr_blank_line (l, 0, ncol, efs); |
150 | |
150 | |
151 | l.l = 0; |
151 | l.l = 0; |
152 | l.f = 0; |
152 | l.f = 0; |
… | |
… | |
173 | nrow = 24; |
173 | nrow = 24; |
174 | |
174 | |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
176 | return; |
176 | return; |
177 | |
177 | |
|
|
178 | if (current_screen != PRIMARY) |
|
|
179 | scr_swap_screen (); |
|
|
180 | |
178 | // we need at least two lines for wrapping to work correctly |
181 | // we need at least two lines for wrapping to work correctly |
179 | if (nrow + saveLines < 2) |
182 | while (nrow + saveLines < 2) |
180 | { |
183 | { |
181 | //TODO//FIXME |
184 | //TODO//FIXME |
182 | saveLines++; |
185 | saveLines++; |
183 | prev_nrow--; |
186 | prev_nrow--; |
184 | top_row--; |
187 | top_row--; |
… | |
… | |
195 | if (!row_buf) |
198 | if (!row_buf) |
196 | { |
199 | { |
197 | /* |
200 | /* |
198 | * first time called so just malloc everything: don't rely on realloc |
201 | * first time called so just malloc everything: don't rely on realloc |
199 | */ |
202 | */ |
200 | top_row = 0; /* no saved lines */ |
203 | top_row = 0; |
201 | term_start = 0; |
204 | term_start = 0; |
202 | |
205 | |
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
206 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
207 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
205 | |
208 | |
… | |
… | |
234 | selection.text = NULL; |
237 | selection.text = NULL; |
235 | selection.len = 0; |
238 | selection.len = 0; |
236 | selection.op = SELECTION_CLEAR; |
239 | selection.op = SELECTION_CLEAR; |
237 | selection.screen = PRIMARY; |
240 | selection.screen = PRIMARY; |
238 | selection.clicks = 0; |
241 | selection.clicks = 0; |
239 | CLEAR_ALL_SELECTION (); |
242 | rvideo_state = rvideo_mode = false; |
240 | rvideo = 0; |
|
|
241 | } |
243 | } |
242 | else |
244 | else |
243 | { |
245 | { |
244 | /* |
246 | /* |
245 | * add or delete rows as appropriate |
247 | * add or delete rows as appropriate |
… | |
… | |
281 | int pend = MOD (term_start + top_row , prev_total_rows); |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
282 | int q = total_rows; // rewrapped row |
284 | int q = total_rows; // rewrapped row |
283 | |
285 | |
284 | if (top_row) |
286 | if (top_row) |
285 | { |
287 | { |
286 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
288 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
287 | // to come up with a lean and mean algorithm. |
289 | // to come up with a lean and mean algorithm. |
288 | |
290 | |
289 | row_col_t ocur = screen.cur; |
291 | row_col_t ocur = screen.cur; |
290 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
292 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
291 | |
293 | |
… | |
… | |
325 | qline->l = ncol; |
327 | qline->l = ncol; |
326 | qline->is_longer (1); |
328 | qline->is_longer (1); |
327 | |
329 | |
328 | int qcol = 0; |
330 | int qcol = 0; |
329 | |
331 | |
|
|
332 | // see below for cursor adjustment rationale |
|
|
333 | if (p == ocur.row) |
|
|
334 | screen.cur.row = q - (total_rows - nrow); |
|
|
335 | |
330 | // fill a single destination line |
336 | // fill a single destination line |
331 | while (lofs < llen && qcol < ncol) |
337 | while (lofs < llen && qcol < ncol) |
332 | { |
338 | { |
333 | int prow = lofs / prev_ncol; |
339 | int prow = lofs / prev_ncol; |
334 | int pcol = lofs % prev_ncol; |
340 | int pcol = lofs % prev_ncol; |
… | |
… | |
344 | |
350 | |
345 | line_t &pline = old_buf [prow]; |
351 | line_t &pline = old_buf [prow]; |
346 | |
352 | |
347 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
353 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
348 | |
354 | |
349 | assert (len); |
|
|
350 | assert (pline.t); |
|
|
351 | |
|
|
352 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
355 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
353 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
356 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
354 | |
357 | |
355 | lofs += len; |
358 | lofs += len; |
356 | qcol += len; |
359 | qcol += len; |
… | |
… | |
389 | } |
392 | } |
390 | |
393 | |
391 | term_start = 0; |
394 | term_start = 0; |
392 | } |
395 | } |
393 | |
396 | |
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); |
397 | free (old_buf); |
400 | delete old_ta; |
398 | delete old_ta; |
401 | delete old_ra; |
399 | delete old_ra; |
402 | |
400 | |
403 | clamp_it (screen.cur.row, 0, nrow - 1); |
401 | clamp_it (screen.cur.row, 0, nrow - 1); |
404 | clamp_it (screen.cur.col, 0, ncol - 1); |
402 | clamp_it (screen.cur.col, 0, ncol - 1); |
405 | |
403 | |
406 | if (tabs) |
|
|
407 | free (tabs); |
404 | free (tabs); |
408 | } |
405 | } |
|
|
406 | |
|
|
407 | CLEAR_ALL_SELECTION (); |
409 | |
408 | |
410 | prev_nrow = nrow; |
409 | prev_nrow = nrow; |
411 | prev_ncol = ncol; |
410 | prev_ncol = ncol; |
412 | |
411 | |
413 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
414 | |
413 | |
415 | for (int col = ncol; col--; ) |
414 | for (int col = ncol; col--; ) |
416 | tabs [col] = col % TABSIZE == 0; |
415 | tabs [col] = col % TABSIZE == 0; |
417 | |
416 | |
|
|
417 | if (current_screen != PRIMARY) |
|
|
418 | scr_swap_screen (); |
|
|
419 | |
418 | tt_winch (); |
420 | tt_winch (); |
419 | |
421 | |
420 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
422 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
421 | } |
423 | } |
422 | |
424 | |
423 | /* ------------------------------------------------------------------------- */ |
425 | /* ------------------------------------------------------------------------- */ |
424 | /* |
426 | /* |
425 | * Free everything. That way malloc debugging can find leakage. |
427 | * Free everything. That way malloc debugging can find leakage. |
426 | */ |
428 | */ |
427 | void |
429 | void |
428 | rxvt_term::scr_release () |
430 | rxvt_term::scr_release () NOTHROW |
429 | { |
431 | { |
|
|
432 | if (row_buf) |
|
|
433 | { |
430 | delete talloc; talloc = 0; |
434 | delete talloc; talloc = 0; |
431 | delete ralloc; ralloc = 0; |
435 | delete ralloc; ralloc = 0; |
432 | |
436 | |
433 | free (row_buf); |
437 | free (row_buf); |
434 | free (swap_buf); |
438 | free (swap_buf); |
435 | free (drawn_buf); |
439 | free (drawn_buf); |
436 | free (tabs); |
440 | free (tabs); |
437 | |
441 | |
438 | row_buf = 0; // signal that we freed all the arrays |
442 | row_buf = 0; // signal that we freed all the arrays |
|
|
443 | } |
439 | } |
444 | } |
440 | |
445 | |
441 | /* ------------------------------------------------------------------------- */ |
446 | /* ------------------------------------------------------------------------- */ |
442 | /* |
447 | /* |
443 | * Hard reset |
448 | * Hard reset |
… | |
… | |
448 | scr_release (); |
453 | scr_release (); |
449 | prev_nrow = prev_ncol = 0; |
454 | prev_nrow = prev_ncol = 0; |
450 | scr_reset (); |
455 | scr_reset (); |
451 | |
456 | |
452 | scr_clear (true); |
457 | scr_clear (true); |
453 | scr_refresh (SLOW_REFRESH); |
458 | scr_refresh (); |
454 | } |
459 | } |
455 | |
460 | |
456 | /* ------------------------------------------------------------------------- * |
461 | /* ------------------------------------------------------------------------- * |
457 | * PROCESS SCREEN COMMANDS * |
462 | * PROCESS SCREEN COMMANDS * |
458 | * ------------------------------------------------------------------------- */ |
463 | * ------------------------------------------------------------------------- */ |
… | |
… | |
460 | * Save and Restore cursor |
465 | * Save and Restore cursor |
461 | * XTERM_SEQ: Save cursor : ESC 7 |
466 | * XTERM_SEQ: Save cursor : ESC 7 |
462 | * XTERM_SEQ: Restore cursor: ESC 8 |
467 | * XTERM_SEQ: Restore cursor: ESC 8 |
463 | */ |
468 | */ |
464 | void |
469 | void |
465 | rxvt_term::scr_cursor (int mode) |
470 | rxvt_term::scr_cursor (cursor_mode mode) NOTHROW |
466 | { |
471 | { |
467 | screen_t *s; |
472 | screen_t *s; |
468 | |
473 | |
469 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
474 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
470 | if (current_screen == SECONDARY) |
475 | if (current_screen == SECONDARY) |
… | |
… | |
502 | assert (s->cur.row >= 0); |
507 | assert (s->cur.row >= 0); |
503 | assert (s->cur.col >= 0); |
508 | assert (s->cur.col >= 0); |
504 | #endif |
509 | #endif |
505 | } |
510 | } |
506 | |
511 | |
|
|
512 | void |
|
|
513 | rxvt_term::scr_swap_screen () |
|
|
514 | { |
|
|
515 | if (!OPTION (Opt_secondaryScreen)) |
|
|
516 | return; |
|
|
517 | |
|
|
518 | for (int i = prev_nrow; i--; ) |
|
|
519 | ::swap (ROW(i), swap_buf [i]); |
|
|
520 | |
|
|
521 | ::swap (screen.cur, swap.cur); |
|
|
522 | |
|
|
523 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
524 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
525 | } |
|
|
526 | |
507 | /* ------------------------------------------------------------------------- */ |
527 | /* ------------------------------------------------------------------------- */ |
508 | /* |
528 | /* |
509 | * Swap between primary and secondary screens |
529 | * Swap between primary and secondary screens |
510 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
530 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
511 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
531 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
512 | */ |
532 | */ |
513 | int |
533 | void |
514 | rxvt_term::scr_change_screen (int scrn) |
534 | rxvt_term::scr_change_screen (int scrn) |
515 | { |
535 | { |
|
|
536 | if (scrn == current_screen) |
|
|
537 | return; |
|
|
538 | |
516 | want_refresh = 1; |
539 | want_refresh = 1; |
517 | view_start = 0; |
540 | view_start = 0; |
518 | |
541 | |
519 | if (current_screen == scrn) |
|
|
520 | return scrn; |
|
|
521 | |
|
|
522 | selection_check (2); /* check for boundary cross */ |
542 | selection_check (2); /* check for boundary cross */ |
523 | |
543 | |
524 | int i = current_screen; current_screen = scrn; scrn = i; |
544 | int i = current_screen; current_screen = scrn; scrn = i; |
525 | |
|
|
526 | ::swap (screen.cur.row, swap.cur.row); |
|
|
527 | ::swap (screen.cur.col, swap.cur.col); |
|
|
528 | |
|
|
529 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
530 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
531 | |
545 | |
532 | #if NSCREENS |
546 | #if NSCREENS |
533 | if (OPTION (Opt_secondaryScreen)) |
547 | if (OPTION (Opt_secondaryScreen)) |
534 | { |
548 | { |
535 | num_scr = 0; |
549 | num_scr = 0; |
536 | |
550 | |
537 | for (int i = prev_nrow; i--; ) |
551 | scr_swap_screen (); |
538 | ::swap (ROW(i), swap_buf [i]); |
|
|
539 | |
552 | |
540 | ::swap (screen.charset, swap.charset); |
553 | ::swap (screen.charset, swap.charset); |
541 | ::swap (screen.flags, swap.flags); |
554 | ::swap (screen.flags, swap.flags); |
542 | screen.flags |= Screen_VisibleCursor; |
555 | screen.flags |= Screen_VisibleCursor; |
543 | swap.flags |= Screen_VisibleCursor; |
556 | swap.flags |= Screen_VisibleCursor; |
544 | } |
557 | } |
545 | else |
558 | else |
546 | #endif |
559 | #endif |
547 | if (OPTION (Opt_secondaryScroll)) |
560 | if (OPTION (Opt_secondaryScroll)) |
548 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
561 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
549 | |
|
|
550 | return scrn; |
|
|
551 | } |
562 | } |
552 | |
563 | |
553 | // clear WrapNext indicator, solidifying position on next line |
564 | // clear WrapNext indicator, solidifying position on next line |
554 | void |
565 | void |
555 | rxvt_term::scr_do_wrap () |
566 | rxvt_term::scr_do_wrap () NOTHROW |
556 | { |
567 | { |
557 | if (!(screen.flags & Screen_WrapNext)) |
568 | if (!(screen.flags & Screen_WrapNext)) |
558 | return; |
569 | return; |
559 | |
570 | |
560 | screen.flags &= ~Screen_WrapNext; |
571 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
570 | /* ------------------------------------------------------------------------- */ |
581 | /* ------------------------------------------------------------------------- */ |
571 | /* |
582 | /* |
572 | * Change the colour for following text |
583 | * Change the colour for following text |
573 | */ |
584 | */ |
574 | void |
585 | void |
575 | rxvt_term::scr_color (unsigned int color, int fgbg) |
586 | rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW |
576 | { |
587 | { |
577 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
588 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
578 | color = fgbg; |
589 | color = fgbg; |
579 | |
590 | |
580 | if (fgbg == Color_fg) |
591 | if (fgbg == Color_fg) |
… | |
… | |
586 | /* ------------------------------------------------------------------------- */ |
597 | /* ------------------------------------------------------------------------- */ |
587 | /* |
598 | /* |
588 | * Change the rendition style for following text |
599 | * Change the rendition style for following text |
589 | */ |
600 | */ |
590 | void |
601 | void |
591 | rxvt_term::scr_rendition (int set, int style) |
602 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
592 | { |
603 | { |
593 | if (set) |
604 | if (set) |
594 | rstyle |= style; |
605 | rstyle |= style; |
595 | else if (style == ~RS_None) |
606 | else if (style == ~RS_None) |
596 | rstyle = DEFAULT_RSTYLE; |
607 | rstyle = DEFAULT_RSTYLE; |
… | |
… | |
603 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
614 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
604 | * count positive ==> scroll up |
615 | * count positive ==> scroll up |
605 | * count negative ==> scroll down |
616 | * count negative ==> scroll down |
606 | */ |
617 | */ |
607 | int |
618 | int |
608 | rxvt_term::scr_scroll_text (int row1, int row2, int count) |
619 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
609 | { |
620 | { |
610 | if (count == 0 || (row1 > row2)) |
621 | if (count == 0 || (row1 > row2)) |
611 | return 0; |
622 | return 0; |
612 | |
623 | |
613 | want_refresh = 1; |
624 | want_refresh = 1; |
… | |
… | |
617 | && row1 == 0 |
628 | && row1 == 0 |
618 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
629 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
619 | { |
630 | { |
620 | top_row = max (top_row - count, -saveLines); |
631 | top_row = max (top_row - count, -saveLines); |
621 | |
632 | |
622 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
|
|
623 | |
|
|
624 | // scroll everything up 'count' lines |
633 | // scroll everything up 'count' lines |
625 | term_start = (term_start + count) % total_rows; |
634 | term_start = (term_start + count) % total_rows; |
626 | |
635 | |
|
|
636 | // sever bottommost line |
627 | { |
637 | { |
628 | // severe bottommost scrolled line |
|
|
629 | line_t &l = ROW(row2 - count); |
638 | line_t &l = ROW(row2 - count); |
|
|
639 | l.is_longer (0); |
630 | l.touch (); |
640 | l.touch (); |
631 | l.is_longer (0); |
|
|
632 | } |
641 | } |
633 | |
642 | |
634 | // erase newly scorlled-in lines |
643 | // erase newly scrolled-in lines |
635 | for (int i = count; i; --i ) |
644 | for (int i = count; i--; ) |
636 | { |
645 | { |
637 | // basically this is a slightly optimized scr_blank_screen_mem |
|
|
638 | // it is worth the effort on slower machines |
|
|
639 | line_t &l = ROW(nrow - i); |
646 | line_t &l = ROW(nrow - 1 - i); |
640 | |
647 | |
|
|
648 | // optimize if already cleared, can be significant on slow machines |
|
|
649 | // could be rolled into scr_blank_screen_mem |
|
|
650 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
|
|
651 | { |
641 | scr_blank_line (l, 0, l.l, rstyle); |
652 | scr_blank_line (l, 0, l.l, rstyle); |
642 | |
|
|
643 | l.l = 0; |
653 | l.l = 0; |
644 | l.f = 0; |
654 | l.f = 0; |
|
|
655 | } |
|
|
656 | else |
|
|
657 | scr_blank_screen_mem (l, rstyle); |
645 | } |
658 | } |
646 | |
659 | |
647 | // now copy lines below the scroll region bottom to the |
660 | // now copy lines below the scroll region bottom to the |
648 | // bottom of the screen again, so they look as if they |
661 | // bottom of the screen again, so they look as if they |
649 | // hadn't moved. |
662 | // hadn't moved. |
… | |
… | |
675 | // finally move the view window, if desired |
688 | // finally move the view window, if desired |
676 | if (OPTION (Opt_scrollWithBuffer) |
689 | if (OPTION (Opt_scrollWithBuffer) |
677 | && view_start != 0 |
690 | && view_start != 0 |
678 | && view_start != -saveLines) |
691 | && view_start != -saveLines) |
679 | scr_page (UP, count); |
692 | scr_page (UP, count); |
|
|
693 | |
|
|
694 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
|
|
695 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
680 | } |
696 | } |
681 | else |
697 | else |
682 | { |
698 | { |
683 | if (selection.op && current_screen == selection.screen) |
699 | if (selection.op && current_screen == selection.screen) |
684 | { |
700 | { |
… | |
… | |
730 | /* ------------------------------------------------------------------------- */ |
746 | /* ------------------------------------------------------------------------- */ |
731 | /* |
747 | /* |
732 | * Add text given in <str> of length <len> to screen struct |
748 | * Add text given in <str> of length <len> to screen struct |
733 | */ |
749 | */ |
734 | void |
750 | void |
735 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) |
751 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
736 | { |
752 | { |
737 | if (len <= 0) /* sanity */ |
753 | if (len <= 0) /* sanity */ |
738 | return; |
754 | return; |
739 | |
755 | |
740 | unsigned char checksel; |
756 | unsigned char checksel; |
… | |
… | |
746 | ZERO_SCROLLBACK (); |
762 | ZERO_SCROLLBACK (); |
747 | |
763 | |
748 | if (minlines > 0) |
764 | if (minlines > 0) |
749 | { |
765 | { |
750 | minlines += screen.cur.row - screen.bscroll; |
766 | minlines += screen.cur.row - screen.bscroll; |
|
|
767 | min_it (minlines, screen.cur.row - top_row); |
751 | |
768 | |
752 | if (minlines > 0 |
769 | if (minlines > 0 |
753 | && screen.tscroll == 0 |
770 | && screen.tscroll == 0 |
754 | && screen.bscroll == nrow - 1) |
771 | && screen.bscroll == nrow - 1) |
755 | { |
772 | { |
… | |
… | |
816 | CLEAR_SELECTION (); |
833 | CLEAR_SELECTION (); |
817 | } |
834 | } |
818 | |
835 | |
819 | if (screen.flags & Screen_WrapNext) |
836 | if (screen.flags & Screen_WrapNext) |
820 | { |
837 | { |
821 | max_it (line->l, ncol); |
|
|
822 | line->is_longer (1); |
|
|
823 | |
|
|
824 | scr_do_wrap (); |
838 | scr_do_wrap (); |
825 | |
839 | |
|
|
840 | line->l = ncol; |
|
|
841 | line->is_longer (1); |
|
|
842 | |
826 | row = screen.cur.row; |
843 | row = screen.cur.row; |
827 | line = &ROW(row); /* _must_ refresh */ |
844 | line = &ROW(row); /* _must_ refresh */ |
828 | } |
845 | } |
829 | |
846 | |
830 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
847 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
831 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
848 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
832 | c = 0xfffd; |
849 | c = 0xfffd; |
833 | |
850 | |
834 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
851 | // rely on wcwidth to tell us the character width, do wcwidth before |
835 | // do wcwidth before further replacements, as wcwidth might return -1 |
852 | // further replacements, as wcwidth might return -1 for the line |
836 | // for the line drawing characters below as they might be invalid in the current |
853 | // drawing characters below as they might be invalid in the current |
837 | // locale. |
854 | // locale. |
838 | int width = c < 0x100 ? 1 : wcwidth (c); |
855 | int width = WCWIDTH (c); |
839 | |
856 | |
840 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
857 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
841 | { |
858 | { |
842 | // vt100 special graphics and line drawing |
859 | // vt100 special graphics and line drawing |
843 | // 5f-7e standard vt100 |
860 | // 5f-7e standard vt100 |
… | |
… | |
994 | /* |
1011 | /* |
995 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1012 | * Process Backspace. Move back the cursor back a position, wrap if have to |
996 | * XTERM_SEQ: CTRL-H |
1013 | * XTERM_SEQ: CTRL-H |
997 | */ |
1014 | */ |
998 | void |
1015 | void |
999 | rxvt_term::scr_backspace () |
1016 | rxvt_term::scr_backspace () NOTHROW |
1000 | { |
1017 | { |
1001 | want_refresh = 1; |
1018 | want_refresh = 1; |
1002 | |
1019 | |
1003 | if (screen.cur.col == 0) |
1020 | if (screen.cur.col == 0) |
1004 | { |
1021 | { |
… | |
… | |
1022 | * Process Horizontal Tab |
1039 | * Process Horizontal Tab |
1023 | * count: +ve = forward; -ve = backwards |
1040 | * count: +ve = forward; -ve = backwards |
1024 | * XTERM_SEQ: CTRL-I |
1041 | * XTERM_SEQ: CTRL-I |
1025 | */ |
1042 | */ |
1026 | void |
1043 | void |
1027 | rxvt_term::scr_tab (int count, bool ht) |
1044 | rxvt_term::scr_tab (int count, bool ht) NOTHROW |
1028 | { |
1045 | { |
1029 | int i, x; |
1046 | int i, x; |
1030 | |
1047 | |
1031 | want_refresh = 1; |
1048 | want_refresh = 1; |
1032 | i = x = screen.cur.col; |
1049 | i = x = screen.cur.col; |
… | |
… | |
1097 | * Process DEC Back Index |
1114 | * Process DEC Back Index |
1098 | * XTERM_SEQ: ESC 6 |
1115 | * XTERM_SEQ: ESC 6 |
1099 | * Move cursor left in row. If we're at the left boundary, shift everything |
1116 | * Move cursor left in row. If we're at the left boundary, shift everything |
1100 | * in that row right. Clear left column. |
1117 | * in that row right. Clear left column. |
1101 | */ |
1118 | */ |
1102 | #if ENABLE_FRILLS |
1119 | #if !ENABLE_MINIMAL |
1103 | void |
1120 | void |
1104 | rxvt_term::scr_backindex () |
1121 | rxvt_term::scr_backindex () NOTHROW |
1105 | { |
1122 | { |
1106 | if (screen.cur.col > 0) |
1123 | if (screen.cur.col > 0) |
1107 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1124 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1108 | else |
1125 | else |
1109 | scr_insdel_chars (1, INSERT); |
1126 | scr_insdel_chars (1, INSERT); |
… | |
… | |
1114 | * Process DEC Forward Index |
1131 | * Process DEC Forward Index |
1115 | * XTERM_SEQ: ESC 9 |
1132 | * XTERM_SEQ: ESC 9 |
1116 | * Move cursor right in row. If we're at the right boundary, shift everything |
1133 | * Move cursor right in row. If we're at the right boundary, shift everything |
1117 | * in that row left. Clear right column. |
1134 | * in that row left. Clear right column. |
1118 | */ |
1135 | */ |
1119 | #if ENABLE_FRILLS |
1136 | #if !ENABLE_MINIMAL |
1120 | void |
1137 | void |
1121 | rxvt_term::scr_forwardindex () |
1138 | rxvt_term::scr_forwardindex () NOTHROW |
1122 | { |
1139 | { |
1123 | if (screen.cur.col < ncol - 1) |
1140 | if (screen.cur.col < ncol - 1) |
1124 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1141 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1125 | else |
1142 | else |
1126 | { |
1143 | { |
… | |
… | |
1139 | /* ------------------------------------------------------------------------- */ |
1156 | /* ------------------------------------------------------------------------- */ |
1140 | /* |
1157 | /* |
1141 | * Goto Row/Column |
1158 | * Goto Row/Column |
1142 | */ |
1159 | */ |
1143 | void |
1160 | void |
1144 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1161 | rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW |
1145 | { |
1162 | { |
1146 | want_refresh = 1; |
1163 | want_refresh = 1; |
1147 | ZERO_SCROLLBACK (); |
1164 | ZERO_SCROLLBACK (); |
1148 | |
1165 | |
1149 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1166 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
… | |
… | |
1187 | /* ------------------------------------------------------------------------- */ |
1204 | /* ------------------------------------------------------------------------- */ |
1188 | /* |
1205 | /* |
1189 | * direction should be UP or DN |
1206 | * direction should be UP or DN |
1190 | */ |
1207 | */ |
1191 | void |
1208 | void |
1192 | rxvt_term::scr_index (enum page_dirn direction) |
1209 | rxvt_term::scr_index (enum page_dirn direction) NOTHROW |
1193 | { |
1210 | { |
1194 | int dirn; |
1211 | int dirn; |
1195 | |
1212 | |
1196 | want_refresh = 1; |
1213 | want_refresh = 1; |
1197 | ZERO_SCROLLBACK (); |
1214 | ZERO_SCROLLBACK (); |
… | |
… | |
1216 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1233 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1217 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1234 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1218 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1235 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1219 | */ |
1236 | */ |
1220 | void |
1237 | void |
1221 | rxvt_term::scr_erase_line (int mode) |
1238 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1222 | { |
1239 | { |
1223 | unsigned int col, num; |
1240 | unsigned int col, num; |
1224 | |
1241 | |
1225 | want_refresh = 1; |
1242 | want_refresh = 1; |
1226 | ZERO_SCROLLBACK (); |
1243 | ZERO_SCROLLBACK (); |
… | |
… | |
1270 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1287 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1271 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1288 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1272 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1289 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1273 | */ |
1290 | */ |
1274 | void |
1291 | void |
1275 | rxvt_term::scr_erase_screen (int mode) |
1292 | rxvt_term::scr_erase_screen (int mode) NOTHROW |
1276 | { |
1293 | { |
1277 | int num; |
1294 | int num; |
1278 | int32_t row; |
1295 | int32_t row; |
1279 | rend_t ren; |
1296 | rend_t ren; |
1280 | XGCValues gcvalue; |
1297 | XGCValues gcvalue; |
… | |
… | |
1325 | } |
1342 | } |
1326 | else |
1343 | else |
1327 | { |
1344 | { |
1328 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1345 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1329 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1346 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1330 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1347 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1331 | ERASE_ROWS (row, num); |
1348 | ERASE_ROWS (row, num); |
1332 | gcvalue.foreground = pix_colors[Color_fg]; |
1349 | gcvalue.foreground = pix_colors[Color_fg]; |
1333 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1350 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1334 | } |
1351 | } |
1335 | |
1352 | |
1336 | for (; num--; row++) |
1353 | for (; num--; row++) |
1337 | { |
1354 | { |
1338 | scr_blank_screen_mem (ROW(row), rstyle); |
1355 | scr_blank_screen_mem (ROW(row), rstyle); |
1339 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1356 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1340 | } |
1357 | } |
1341 | } |
1358 | } |
1342 | |
1359 | |
1343 | #if ENABLE_FRILLS |
1360 | #if !ENABLE_MINIMAL |
1344 | void |
1361 | void |
1345 | rxvt_term::scr_erase_savelines () |
1362 | rxvt_term::scr_erase_savelines () NOTHROW |
1346 | { |
1363 | { |
1347 | want_refresh = 1; |
1364 | want_refresh = 1; |
1348 | ZERO_SCROLLBACK (); |
1365 | ZERO_SCROLLBACK (); |
1349 | |
1366 | |
1350 | top_row = 0; |
1367 | top_row = 0; |
… | |
… | |
1355 | /* |
1372 | /* |
1356 | * Fill the screen with `E's |
1373 | * Fill the screen with `E's |
1357 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1374 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1358 | */ |
1375 | */ |
1359 | void |
1376 | void |
1360 | rxvt_term::scr_E () |
1377 | rxvt_term::scr_E () NOTHROW |
1361 | { |
1378 | { |
1362 | rend_t fs; |
1379 | rend_t fs; |
1363 | |
1380 | |
1364 | want_refresh = 1; |
1381 | want_refresh = 1; |
1365 | ZERO_SCROLLBACK (); |
1382 | ZERO_SCROLLBACK (); |
… | |
… | |
1386 | /* ------------------------------------------------------------------------- */ |
1403 | /* ------------------------------------------------------------------------- */ |
1387 | /* |
1404 | /* |
1388 | * Insert/Delete <count> lines |
1405 | * Insert/Delete <count> lines |
1389 | */ |
1406 | */ |
1390 | void |
1407 | void |
1391 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1408 | rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW |
1392 | { |
1409 | { |
1393 | int end; |
1410 | int end; |
1394 | |
1411 | |
1395 | ZERO_SCROLLBACK (); |
1412 | ZERO_SCROLLBACK (); |
1396 | |
1413 | |
… | |
… | |
1416 | /* ------------------------------------------------------------------------- */ |
1433 | /* ------------------------------------------------------------------------- */ |
1417 | /* |
1434 | /* |
1418 | * Insert/Delete <count> characters from the current position |
1435 | * Insert/Delete <count> characters from the current position |
1419 | */ |
1436 | */ |
1420 | void |
1437 | void |
1421 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1438 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1422 | { |
1439 | { |
1423 | int col, row; |
1440 | int col, row; |
1424 | rend_t tr; |
1441 | rend_t tr; |
1425 | |
1442 | |
1426 | want_refresh = 1; |
1443 | want_refresh = 1; |
… | |
… | |
1514 | /* |
1531 | /* |
1515 | * Set the scrolling region |
1532 | * Set the scrolling region |
1516 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1533 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1517 | */ |
1534 | */ |
1518 | void |
1535 | void |
1519 | rxvt_term::scr_scroll_region (int top, int bot) |
1536 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1520 | { |
1537 | { |
1521 | max_it (top, 0); |
1538 | max_it (top, 0); |
1522 | min_it (bot, nrow - 1); |
1539 | min_it (bot, nrow - 1); |
1523 | |
1540 | |
1524 | if (top > bot) |
1541 | if (top > bot) |
… | |
… | |
1534 | * Make the cursor visible/invisible |
1551 | * Make the cursor visible/invisible |
1535 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1552 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1536 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1553 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1537 | */ |
1554 | */ |
1538 | void |
1555 | void |
1539 | rxvt_term::scr_cursor_visible (int mode) |
1556 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1540 | { |
1557 | { |
1541 | want_refresh = 1; |
1558 | want_refresh = 1; |
1542 | |
1559 | |
1543 | if (mode) |
1560 | if (mode) |
1544 | screen.flags |= Screen_VisibleCursor; |
1561 | screen.flags |= Screen_VisibleCursor; |
… | |
… | |
1551 | * Set/unset automatic wrapping |
1568 | * Set/unset automatic wrapping |
1552 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1569 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1553 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1570 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1554 | */ |
1571 | */ |
1555 | void |
1572 | void |
1556 | rxvt_term::scr_autowrap (int mode) |
1573 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1557 | { |
1574 | { |
1558 | if (mode) |
1575 | if (mode) |
1559 | screen.flags |= Screen_Autowrap; |
1576 | screen.flags |= Screen_Autowrap; |
1560 | else |
1577 | else |
1561 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
1578 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
… | |
… | |
1570 | * and the cursor cannot be moved outside. |
1587 | * and the cursor cannot be moved outside. |
1571 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1588 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1572 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1589 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1573 | */ |
1590 | */ |
1574 | void |
1591 | void |
1575 | rxvt_term::scr_relative_origin (int mode) |
1592 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1576 | { |
1593 | { |
1577 | if (mode) |
1594 | if (mode) |
1578 | screen.flags |= Screen_Relative; |
1595 | screen.flags |= Screen_Relative; |
1579 | else |
1596 | else |
1580 | screen.flags &= ~Screen_Relative; |
1597 | screen.flags &= ~Screen_Relative; |
… | |
… | |
1587 | * Set insert/replace mode |
1604 | * Set insert/replace mode |
1588 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1605 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1589 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1606 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1590 | */ |
1607 | */ |
1591 | void |
1608 | void |
1592 | rxvt_term::scr_insert_mode (int mode) |
1609 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1593 | { |
1610 | { |
1594 | if (mode) |
1611 | if (mode) |
1595 | screen.flags |= Screen_Insert; |
1612 | screen.flags |= Screen_Insert; |
1596 | else |
1613 | else |
1597 | screen.flags &= ~Screen_Insert; |
1614 | screen.flags &= ~Screen_Insert; |
… | |
… | |
1603 | * XTERM_SEQ: Set tab at current column : ESC H |
1620 | * XTERM_SEQ: Set tab at current column : ESC H |
1604 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1621 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1605 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1622 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1606 | */ |
1623 | */ |
1607 | void |
1624 | void |
1608 | rxvt_term::scr_set_tab (int mode) |
1625 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1609 | { |
1626 | { |
1610 | if (mode < 0) |
1627 | if (mode < 0) |
1611 | memset (tabs, 0, ncol * sizeof (char)); |
1628 | memset (tabs, 0, ncol * sizeof (char)); |
1612 | else if (screen.cur.col < ncol) |
1629 | else if (screen.cur.col < ncol) |
1613 | tabs [screen.cur.col] = !!mode; |
1630 | tabs [screen.cur.col] = !!mode; |
… | |
… | |
1618 | * Set reverse/normal video |
1635 | * Set reverse/normal video |
1619 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1636 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1620 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1637 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1621 | */ |
1638 | */ |
1622 | void |
1639 | void |
1623 | rxvt_term::scr_rvideo_mode (int mode) |
1640 | rxvt_term::scr_rvideo_mode (bool on) NOTHROW |
1624 | { |
1641 | { |
1625 | XGCValues gcvalue; |
1642 | rvideo_mode = on; |
1626 | |
1643 | |
|
|
1644 | #ifndef NO_BELL |
|
|
1645 | on ^= rvideo_bell; |
|
|
1646 | #endif |
|
|
1647 | |
1627 | if (rvideo != mode) |
1648 | if (rvideo_state != on) |
1628 | { |
1649 | { |
1629 | rvideo = mode; |
1650 | rvideo_state = on; |
|
|
1651 | |
1630 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1652 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1631 | #if XPM_BACKGROUND |
1653 | #if XPM_BACKGROUND |
1632 | if (bgPixmap.pixmap == None) |
1654 | if (bgPixmap.pixmap == None) |
1633 | #endif |
1655 | #endif |
1634 | #if TRANSPARENT |
1656 | #if TRANSPARENT |
1635 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
1657 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1636 | #endif |
1658 | #endif |
1637 | XSetWindowBackground (display->display, vt, |
1659 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1638 | pix_colors[Color_bg]); |
|
|
1639 | |
1660 | |
|
|
1661 | XGCValues gcvalue; |
1640 | gcvalue.foreground = pix_colors[Color_fg]; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1641 | gcvalue.background = pix_colors[Color_bg]; |
1663 | gcvalue.background = pix_colors[Color_bg]; |
1642 | XChangeGC (display->display, gc, GCBackground | GCForeground, |
1664 | XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue); |
1643 | &gcvalue); |
1665 | |
1644 | scr_clear (); |
1666 | scr_clear (); |
1645 | scr_touch (true); |
1667 | scr_touch (true); |
1646 | } |
1668 | } |
1647 | } |
1669 | } |
1648 | |
1670 | |
… | |
… | |
1650 | /* |
1672 | /* |
1651 | * Report current cursor position |
1673 | * Report current cursor position |
1652 | * XTERM_SEQ: Report position: ESC [ 6 n |
1674 | * XTERM_SEQ: Report position: ESC [ 6 n |
1653 | */ |
1675 | */ |
1654 | void |
1676 | void |
1655 | rxvt_term::scr_report_position () |
1677 | rxvt_term::scr_report_position () NOTHROW |
1656 | { |
1678 | { |
1657 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1679 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1658 | } |
1680 | } |
1659 | |
1681 | |
1660 | /* ------------------------------------------------------------------------- * |
1682 | /* ------------------------------------------------------------------------- * |
… | |
… | |
1663 | |
1685 | |
1664 | /* |
1686 | /* |
1665 | * Set font style |
1687 | * Set font style |
1666 | */ |
1688 | */ |
1667 | void |
1689 | void |
1668 | rxvt_term::set_font_style () |
1690 | rxvt_term::set_font_style () NOTHROW |
1669 | { |
1691 | { |
1670 | #if 0 |
1692 | #if 0 |
1671 | switch (charsets [screen.charset]) |
1693 | switch (charsets [screen.charset]) |
1672 | { |
1694 | { |
1673 | case '0': /* DEC Special Character & Line Drawing Set */ |
1695 | case '0': /* DEC Special Character & Line Drawing Set */ |
… | |
… | |
1695 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1717 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1696 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1718 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1697 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1719 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1698 | */ |
1720 | */ |
1699 | void |
1721 | void |
1700 | rxvt_term::scr_charset_choose (int set) |
1722 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1701 | { |
1723 | { |
1702 | screen.charset = set; |
1724 | screen.charset = set; |
1703 | set_font_style (); |
1725 | set_font_style (); |
1704 | } |
1726 | } |
1705 | |
1727 | |
… | |
… | |
1711 | * XTERM_SEQ: Set G2 character set: ESC * <C> |
1733 | * XTERM_SEQ: Set G2 character set: ESC * <C> |
1712 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1734 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1713 | * See set_font_style for possible values for <C> |
1735 | * See set_font_style for possible values for <C> |
1714 | */ |
1736 | */ |
1715 | void |
1737 | void |
1716 | rxvt_term::scr_charset_set (int set, unsigned int ch) |
1738 | rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW |
1717 | { |
1739 | { |
1718 | charsets[set] = (unsigned char)ch; |
1740 | charsets[set] = (unsigned char)ch; |
1719 | set_font_style (); |
1741 | set_font_style (); |
1720 | } |
1742 | } |
1721 | |
1743 | |
… | |
… | |
1726 | |
1748 | |
1727 | /* |
1749 | /* |
1728 | * refresh matching text. |
1750 | * refresh matching text. |
1729 | */ |
1751 | */ |
1730 | bool |
1752 | bool |
1731 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1753 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1732 | { |
1754 | { |
1733 | bool found = false; |
1755 | bool found = false; |
1734 | |
1756 | |
1735 | for (int i = 0; i < nrow; i++) |
1757 | for (int i = 0; i < nrow; i++) |
1736 | { |
1758 | { |
1737 | int col = 0; |
|
|
1738 | rend_t *drp = drawn_buf[i].r; |
1759 | rend_t *drp = drawn_buf[i].r; |
1739 | |
1760 | |
1740 | for (; col < ncol; col++, drp++) |
1761 | for (int col = 0; col < ncol; col++, drp++) |
1741 | if ((*drp & mask) == value) |
1762 | if ((*drp & mask) == value) |
1742 | { |
1763 | { |
1743 | found = true; |
1764 | found = true; |
1744 | *drp = ~value; |
1765 | *drp = ~value; |
1745 | } |
1766 | } |
… | |
… | |
1756 | PART_END, |
1777 | PART_END, |
1757 | RC_COUNT |
1778 | RC_COUNT |
1758 | }; |
1779 | }; |
1759 | |
1780 | |
1760 | void |
1781 | void |
1761 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1782 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1762 | { |
1783 | { |
1763 | int i; |
1784 | int i; |
1764 | row_col_t rc[RC_COUNT]; |
1785 | row_col_t rc[RC_COUNT]; |
1765 | |
1786 | |
1766 | if (!drawn_buf) /* sanity check */ |
1787 | if (!drawn_buf) /* sanity check */ |
… | |
… | |
1789 | } |
1810 | } |
1790 | |
1811 | |
1791 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1812 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1792 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1813 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1793 | |
1814 | |
|
|
1815 | num_scr_allow = 0; |
|
|
1816 | |
1794 | if (refresh) |
1817 | if (refresh) |
1795 | scr_refresh (SLOW_REFRESH); |
1818 | scr_refresh (); |
1796 | } |
1819 | } |
1797 | |
1820 | |
1798 | /* ------------------------------------------------------------------------- */ |
1821 | /* ------------------------------------------------------------------------- */ |
1799 | /* |
1822 | /* |
1800 | * Refresh the entire screen |
1823 | * Refresh the entire screen |
1801 | */ |
1824 | */ |
1802 | void |
1825 | void |
1803 | rxvt_term::scr_touch (bool refresh) |
1826 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1804 | { |
1827 | { |
1805 | scr_expose (0, 0, width, height, refresh); |
1828 | scr_expose (0, 0, width, height, refresh); |
1806 | } |
1829 | } |
1807 | |
1830 | |
1808 | /* ------------------------------------------------------------------------- */ |
1831 | /* ------------------------------------------------------------------------- */ |
1809 | /* |
1832 | /* |
1810 | * Move the display so that the line represented by scrollbar value Y is at |
1833 | * Move the display so that the line represented by scrollbar value Y is at |
1811 | * the top of the screen |
1834 | * the top of the screen |
1812 | */ |
1835 | */ |
1813 | void |
1836 | void |
1814 | rxvt_term::scr_move_to (int y, int len) |
1837 | rxvt_term::scr_move_to (int y, int len) NOTHROW |
1815 | { |
1838 | { |
1816 | scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); |
1839 | scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); |
1817 | } |
1840 | } |
1818 | |
1841 | |
1819 | /* ------------------------------------------------------------------------- */ |
1842 | /* ------------------------------------------------------------------------- */ |
1820 | /* |
1843 | /* |
1821 | * Page the screen up/down nlines |
1844 | * Page the screen up/down nlines |
1822 | * direction should be UP or DN |
1845 | * direction should be UP or DN |
1823 | */ |
1846 | */ |
1824 | bool |
1847 | bool |
1825 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1848 | rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW |
1826 | { |
1849 | { |
1827 | int new_view_start = |
1850 | int new_view_start = |
1828 | direction == UP ? view_start - nlines |
1851 | direction == UP ? view_start - nlines |
1829 | : view_start + nlines; |
1852 | : view_start + nlines; |
1830 | |
1853 | |
1831 | return scr_changeview (new_view_start); |
1854 | return scr_changeview (new_view_start); |
1832 | } |
1855 | } |
1833 | |
1856 | |
1834 | bool |
1857 | bool |
1835 | rxvt_term::scr_changeview (int new_view_start) |
1858 | rxvt_term::scr_changeview (int new_view_start) NOTHROW |
1836 | { |
1859 | { |
1837 | clamp_it (new_view_start, top_row, 0); |
1860 | clamp_it (new_view_start, top_row, 0); |
1838 | |
1861 | |
1839 | if (new_view_start == view_start) |
1862 | if (new_view_start == view_start) |
1840 | return false; |
1863 | return false; |
1841 | |
1864 | |
1842 | num_scr += new_view_start - view_start; |
1865 | num_scr += new_view_start - view_start; |
1843 | view_start = new_view_start; |
1866 | view_start = new_view_start; |
|
|
1867 | want_refresh = 1; |
|
|
1868 | |
1844 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1869 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1845 | want_refresh = 1; |
|
|
1846 | |
1870 | |
1847 | return true; |
1871 | return true; |
1848 | } |
1872 | } |
1849 | |
1873 | |
1850 | /* ------------------------------------------------------------------------- */ |
1874 | #ifndef NO_BELL |
1851 | void |
1875 | void |
|
|
1876 | rxvt_term::bell_cb (time_watcher &w) |
|
|
1877 | { |
|
|
1878 | rvideo_bell = false; |
|
|
1879 | scr_rvideo_mode (rvideo_mode); |
|
|
1880 | } |
|
|
1881 | #endif |
|
|
1882 | |
|
|
1883 | /* ------------------------------------------------------------------------- */ |
|
|
1884 | void |
1852 | rxvt_term::scr_bell () |
1885 | rxvt_term::scr_bell () NOTHROW |
1853 | { |
1886 | { |
1854 | #ifndef NO_BELL |
1887 | #ifndef NO_BELL |
1855 | |
1888 | |
1856 | # ifndef NO_MAPALERT |
1889 | # ifndef NO_MAPALERT |
1857 | # ifdef MAPALERT_OPTION |
1890 | # ifdef MAPALERT_OPTION |
1858 | if (OPTION (Opt_mapAlert)) |
1891 | if (OPTION (Opt_mapAlert)) |
1859 | # endif |
1892 | # endif |
1860 | XMapWindow (display->display, parent[0]); |
1893 | XMapWindow (dpy, parent[0]); |
1861 | # endif |
1894 | # endif |
1862 | |
1895 | |
1863 | if (OPTION (Opt_visualBell)) |
1896 | if (OPTION (Opt_visualBell)) |
1864 | { |
1897 | { |
1865 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1898 | rvideo_bell = true; |
|
|
1899 | scr_rvideo_mode (rvideo_mode); |
1866 | display->flush (); |
1900 | display->flush (); |
1867 | rxvt_usleep (VISUAL_BELL_DURATION); |
1901 | |
1868 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1902 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1869 | } |
1903 | } |
1870 | else |
1904 | else |
1871 | XBell (display->display, 0); |
1905 | XBell (dpy, 0); |
1872 | |
1906 | |
1873 | #endif |
1907 | #endif |
1874 | } |
1908 | } |
1875 | |
1909 | |
1876 | /* ------------------------------------------------------------------------- */ |
1910 | /* ------------------------------------------------------------------------- */ |
1877 | /* ARGSUSED */ |
1911 | /* ARGSUSED */ |
1878 | void |
1912 | void |
1879 | rxvt_term::scr_printscreen (int fullhist) |
1913 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1880 | { |
1914 | { |
1881 | #ifdef PRINTPIPE |
1915 | #ifdef PRINTPIPE |
1882 | int nrows, row_start; |
1916 | int nrows, row_start; |
1883 | FILE *fd; |
1917 | FILE *fd; |
1884 | |
1918 | |
… | |
… | |
1933 | * Refresh the screen |
1967 | * Refresh the screen |
1934 | * drawn_text/drawn_rend contain the screen information before the update. |
1968 | * drawn_text/drawn_rend contain the screen information before the update. |
1935 | * screen.text/screen.rend contain what the screen will change to. |
1969 | * screen.text/screen.rend contain what the screen will change to. |
1936 | */ |
1970 | */ |
1937 | void |
1971 | void |
1938 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1972 | rxvt_term::scr_refresh () NOTHROW |
1939 | { |
1973 | { |
1940 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1974 | unsigned char have_bg, |
1941 | showcursor; /* show the cursor */ |
1975 | showcursor; /* show the cursor */ |
1942 | int16_t col, row, /* column/row we're processing */ |
1976 | int16_t col, row, /* column/row we're processing */ |
1943 | ocrow; /* old cursor row */ |
1977 | ocrow; /* old cursor row */ |
1944 | int i; /* tmp */ |
1978 | int i; /* tmp */ |
1945 | #ifndef NO_CURSORCOLOR |
1979 | #ifndef NO_CURSORCOLOR |
… | |
… | |
1953 | return; |
1987 | return; |
1954 | |
1988 | |
1955 | /* |
1989 | /* |
1956 | * A: set up vars |
1990 | * A: set up vars |
1957 | */ |
1991 | */ |
1958 | must_clear = 0; |
1992 | have_bg = 0; |
1959 | refresh_count = 0; |
1993 | refresh_count = 0; |
1960 | |
1994 | |
1961 | #if XPM_BACKGROUND |
1995 | #if XPM_BACKGROUND |
1962 | must_clear |= bgPixmap.pixmap != None; |
1996 | have_bg |= bgPixmap.pixmap != None; |
1963 | #endif |
1997 | #endif |
1964 | #if TRANSPARENT |
1998 | #if TRANSPARENT |
1965 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
1999 | have_bg |= OPTION (Opt_transparent) && am_transparent; |
1966 | #endif |
2000 | #endif |
1967 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2001 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1968 | |
2002 | |
1969 | /* |
2003 | /* |
1970 | * B: reverse any characters which are selected |
2004 | * B: reverse any characters which are selected |
… | |
… | |
2067 | #ifndef NO_SLOW_LINK_SUPPORT |
2101 | #ifndef NO_SLOW_LINK_SUPPORT |
2068 | /* |
2102 | /* |
2069 | * D: CopyArea pass - very useful for slower links |
2103 | * D: CopyArea pass - very useful for slower links |
2070 | * This has been deliberately kept simple. |
2104 | * This has been deliberately kept simple. |
2071 | */ |
2105 | */ |
2072 | i = num_scr; |
|
|
2073 | if (!display->is_local |
2106 | if (!display->is_local |
2074 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2107 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2075 | && abs (num_scr) < nrow && !must_clear) |
2108 | && abs (num_scr) < nrow && !have_bg) |
2076 | { |
2109 | { |
2077 | int16_t nits; |
2110 | int16_t nits; |
|
|
2111 | int i = num_scr; |
2078 | int j; |
2112 | int j; |
2079 | int len, wlen; |
2113 | int len, wlen; |
|
|
2114 | dLocal (int, num_scr); |
2080 | |
2115 | |
2081 | j = nrow; |
2116 | j = nrow; |
2082 | wlen = len = -1; |
2117 | wlen = len = -1; |
2083 | row = i > 0 ? 0 : j - 1; |
2118 | row = i > 0 ? 0 : j - 1; |
|
|
2119 | |
2084 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2120 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2085 | { |
2121 | { |
2086 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2122 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2087 | { |
2123 | { |
2088 | line_t s = ROW(view_start + row); |
2124 | line_t s = ROW(view_start + row); |
… | |
… | |
2109 | wlen = row; |
2145 | wlen = row; |
2110 | continue; |
2146 | continue; |
2111 | } |
2147 | } |
2112 | } |
2148 | } |
2113 | |
2149 | |
2114 | if (len != -1) |
2150 | if (len >= 0) |
2115 | { |
2151 | { |
2116 | /* also comes here at end if needed because of >= above */ |
2152 | /* also comes here at end if needed because of >= above */ |
2117 | if (wlen < len) |
2153 | if (wlen < len) |
2118 | ::swap (wlen, len); |
2154 | ::swap (wlen, len); |
2119 | |
2155 | |
|
|
2156 | XGCValues gcv; |
|
|
2157 | |
|
|
2158 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2120 | XCopyArea (display->display, vt, vt, |
2159 | XCopyArea (dpy, vt, vt, |
2121 | gc, 0, Row2Pixel (len + i), |
2160 | gc, 0, Row2Pixel (len + i), |
2122 | (unsigned int)this->width, |
2161 | (unsigned int)this->width, |
2123 | (unsigned int)Height2Pixel (wlen - len + 1), |
2162 | (unsigned int)Height2Pixel (wlen - len + 1), |
2124 | 0, Row2Pixel (len)); |
2163 | 0, Row2Pixel (len)); |
|
|
2164 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2165 | |
2125 | len = -1; |
2166 | len = -1; |
2126 | } |
2167 | } |
2127 | } |
2168 | } |
2128 | } |
2169 | } |
2129 | #endif |
2170 | #endif |
… | |
… | |
2185 | count++; |
2226 | count++; |
2186 | |
2227 | |
2187 | if (stp[col] != dtp[col] |
2228 | if (stp[col] != dtp[col] |
2188 | || !RS_SAME (srp[col], drp[col])) |
2229 | || !RS_SAME (srp[col], drp[col])) |
2189 | { |
2230 | { |
2190 | if (must_clear && (i++ > count / 2)) |
2231 | if (have_bg && (i++ > count / 2)) |
2191 | break; |
2232 | break; |
2192 | |
2233 | |
2193 | dtp[col] = stp[col]; |
2234 | dtp[col] = stp[col]; |
2194 | drp[col] = rend; |
2235 | drp[col] = rend; |
2195 | i = 0; |
2236 | i = 0; |
2196 | } |
2237 | } |
2197 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2238 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2198 | break; |
2239 | break; |
2199 | } |
2240 | } |
2200 | |
2241 | |
2201 | col--; /* went one too far. move back */ |
2242 | col--; /* went one too far. move back */ |
2202 | count -= i; /* dump any matching trailing chars */ |
2243 | count -= i; /* dump any matching trailing chars */ |
… | |
… | |
2213 | |
2254 | |
2214 | // only do special processing if any attributes are set, which is unlikely |
2255 | // only do special processing if any attributes are set, which is unlikely |
2215 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2256 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2216 | { |
2257 | { |
2217 | #if ENABLE_STYLES |
2258 | #if ENABLE_STYLES |
2218 | // force redraw after "careful" characters to avoid pixel droppings |
2259 | // "careful" (too wide) character handling |
2219 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2220 | drp[col + 1] = ~srp[col + 1]; |
|
|
2221 | |
2260 | |
2222 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2261 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2223 | while (text > stp |
2262 | while (text > stp |
2224 | && srp[text - stp - 1] & RS_Careful |
2263 | && srp[text - stp - 1] & RS_Careful |
2225 | && RS_SAME (rend, srp[text - stp - 1])) |
2264 | && RS_SAME (rend, srp[text - stp - 1])) |
2226 | text--, count++, xpixel -= fwidth; |
2265 | text--, count++, xpixel -= fwidth; |
|
|
2266 | |
|
|
2267 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2268 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2269 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2270 | |
|
|
2271 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2272 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2273 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
2227 | #endif |
2274 | #endif |
2228 | |
2275 | |
2229 | bool invert = rend & RS_RVid; |
2276 | bool invert = rend & RS_RVid; |
2230 | |
2277 | |
2231 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2278 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
… | |
… | |
2289 | * Actually do the drawing of the string here |
2336 | * Actually do the drawing of the string here |
2290 | */ |
2337 | */ |
2291 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2338 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2292 | |
2339 | |
2293 | if (back == fore) |
2340 | if (back == fore) |
2294 | font->clear_rect (*drawable, xpixel, ypixel, |
2341 | font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back); |
2295 | fwidth * count, fheight, |
|
|
2296 | back); |
|
|
2297 | else if (back == Color_bg) |
2342 | else if (back == Color_bg && have_bg) |
2298 | { |
2343 | { |
2299 | if (must_clear) |
2344 | // this is very ugly, maybe push it into ->draw? |
2300 | { |
|
|
2301 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2302 | |
2345 | |
2303 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2346 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2304 | if (text[i] != ' ') |
2347 | if (text[i] != ' ') |
2305 | { |
2348 | { |
2306 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2349 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2307 | break; |
2350 | goto did_clear; |
2308 | } |
|
|
2309 | } |
2351 | } |
2310 | else |
2352 | |
2311 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2353 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2354 | did_clear: ; |
2312 | } |
2355 | } |
2313 | else |
2356 | else |
2314 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2357 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2315 | |
2358 | |
2316 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2359 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2317 | { |
2360 | { |
2318 | #if ENABLE_FRILLS |
2361 | #if ENABLE_FRILLS |
2319 | if (ISSET_PIXCOLOR (Color_underline)) |
2362 | if (ISSET_PIXCOLOR (Color_underline)) |
2320 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2363 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2321 | else |
2364 | else |
2322 | #endif |
2365 | #endif |
2323 | XSetForeground (display->display, gc, pix_colors[fore]); |
2366 | XSetForeground (dpy, gc, pix_colors[fore]); |
2324 | |
2367 | |
2325 | XDrawLine (display->display, drawBuffer, gc, |
2368 | XDrawLine (dpy, drawBuffer, gc, |
2326 | xpixel, ypixel + font->ascent + 1, |
2369 | xpixel, ypixel + font->ascent + 1, |
2327 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2370 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2328 | } |
2371 | } |
2329 | } /* for (col....) */ |
2372 | } /* for (col....) */ |
2330 | } /* for (row....) */ |
2373 | } /* for (row....) */ |
… | |
… | |
2363 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2406 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2364 | cursorwidth++; |
2407 | cursorwidth++; |
2365 | |
2408 | |
2366 | #ifndef NO_CURSORCOLOR |
2409 | #ifndef NO_CURSORCOLOR |
2367 | if (ISSET_PIXCOLOR (Color_cursor)) |
2410 | if (ISSET_PIXCOLOR (Color_cursor)) |
2368 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2411 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2369 | #endif |
2412 | #endif |
2370 | |
2413 | |
2371 | XDrawRectangle (display->display, drawBuffer, gc, |
2414 | XDrawRectangle (dpy, drawBuffer, gc, |
2372 | Col2Pixel (col), |
2415 | Col2Pixel (col), |
2373 | Row2Pixel (oldcursor.row), |
2416 | Row2Pixel (oldcursor.row), |
2374 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2417 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2375 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2418 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2376 | } |
2419 | } |
… | |
… | |
2384 | num_scr = 0; |
2427 | num_scr = 0; |
2385 | num_scr_allow = 1; |
2428 | num_scr_allow = 1; |
2386 | } |
2429 | } |
2387 | |
2430 | |
2388 | void |
2431 | void |
2389 | rxvt_term::scr_remap_chars (line_t &l) |
2432 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2390 | { |
2433 | { |
2391 | if (!l.t) |
2434 | if (!l.t) |
2392 | return; |
2435 | return; |
2393 | |
2436 | |
2394 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2437 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
… | |
… | |
2396 | for (int i = ncol; i--; ) |
2439 | for (int i = ncol; i--; ) |
2397 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2440 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2398 | } |
2441 | } |
2399 | |
2442 | |
2400 | void |
2443 | void |
2401 | rxvt_term::scr_remap_chars () |
2444 | rxvt_term::scr_remap_chars () NOTHROW |
2402 | { |
2445 | { |
2403 | for (int i = total_rows; i--; ) |
2446 | for (int i = total_rows; i--; ) |
2404 | scr_remap_chars (row_buf [i]); |
2447 | scr_remap_chars (row_buf [i]); |
2405 | |
2448 | |
2406 | for (int i = nrow; i--; ) |
2449 | for (int i = nrow; i--; ) |
… | |
… | |
2409 | scr_remap_chars (swap_buf [i]); |
2452 | scr_remap_chars (swap_buf [i]); |
2410 | } |
2453 | } |
2411 | } |
2454 | } |
2412 | |
2455 | |
2413 | void |
2456 | void |
2414 | rxvt_term::scr_recolour () |
2457 | rxvt_term::scr_recolour () NOTHROW |
2415 | { |
2458 | { |
2416 | if (1 |
2459 | if (1 |
2417 | #if TRANSPARENT |
2460 | #if TRANSPARENT |
2418 | && !am_transparent |
2461 | && !am_transparent |
2419 | #endif |
2462 | #endif |
2420 | #if XPM_BACKGROUND |
2463 | #if XPM_BACKGROUND |
2421 | && !bgPixmap.pixmap |
2464 | && !bgPixmap.pixmap |
2422 | #endif |
2465 | #endif |
2423 | ) |
2466 | ) |
2424 | { |
2467 | { |
2425 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2468 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2426 | XClearWindow (display->display, parent[0]); |
2469 | XClearWindow (dpy, parent[0]); |
2427 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2470 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2428 | #if HAVE_SCROLLBARS |
2471 | #if HAVE_SCROLLBARS |
2429 | if (scrollBar.win) |
2472 | if (scrollBar.win) |
2430 | { |
2473 | { |
2431 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2474 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2432 | scrollBar.setIdle (); |
2475 | scrollBar.setIdle (); |
2433 | scrollbar_show (0); |
2476 | scrollbar_show (0); |
2434 | } |
2477 | } |
2435 | #endif |
2478 | #endif |
2436 | } |
2479 | } |
… | |
… | |
2440 | want_refresh = 1; |
2483 | want_refresh = 1; |
2441 | } |
2484 | } |
2442 | |
2485 | |
2443 | /* ------------------------------------------------------------------------- */ |
2486 | /* ------------------------------------------------------------------------- */ |
2444 | void |
2487 | void |
2445 | rxvt_term::scr_clear (bool really) |
2488 | rxvt_term::scr_clear (bool really) NOTHROW |
2446 | { |
2489 | { |
2447 | if (!mapped) |
2490 | if (!mapped) |
2448 | return; |
2491 | return; |
2449 | |
2492 | |
2450 | num_scr_allow = 0; |
2493 | num_scr_allow = 0; |
2451 | want_refresh = 1; |
2494 | want_refresh = 1; |
2452 | |
2495 | |
2453 | if (really) |
2496 | if (really) |
2454 | XClearWindow (display->display, vt); |
2497 | XClearWindow (dpy, vt); |
2455 | } |
2498 | } |
2456 | |
2499 | |
2457 | void |
2500 | void |
2458 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) |
2501 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2459 | { |
2502 | { |
2460 | int view_end = view_start + nrow; |
2503 | int view_end = view_start + nrow; |
2461 | int row, col; |
2504 | int row, col; |
2462 | |
2505 | |
2463 | for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) |
2506 | for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) |
… | |
… | |
2475 | srp[col] ^= rstyle2; |
2518 | srp[col] ^= rstyle2; |
2476 | } |
2519 | } |
2477 | } |
2520 | } |
2478 | |
2521 | |
2479 | void |
2522 | void |
2480 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) |
2523 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW |
2481 | { |
2524 | { |
2482 | int view_end = view_start + nrow; |
2525 | int view_end = view_start + nrow; |
2483 | int row, col; |
2526 | int row, col; |
2484 | |
2527 | |
2485 | if (beg_row >= view_start) |
2528 | if (beg_row >= view_start) |
… | |
… | |
2502 | srp[col] ^= rstyle; |
2545 | srp[col] ^= rstyle; |
2503 | } |
2546 | } |
2504 | |
2547 | |
2505 | /* ------------------------------------------------------------------------- */ |
2548 | /* ------------------------------------------------------------------------- */ |
2506 | void |
2549 | void |
2507 | rxvt_term::scr_reverse_selection () |
2550 | rxvt_term::scr_reverse_selection () NOTHROW |
2508 | { |
2551 | { |
2509 | if (selection.op |
2552 | if (selection.op |
2510 | && current_screen == selection.screen |
2553 | && current_screen == selection.screen |
2511 | && selection.end.row >= view_start) |
2554 | && selection.end.row >= view_start) |
2512 | { |
2555 | { |
2513 | #if ENABLE_FRILLS |
2556 | #if !ENABLE_MINIMAL |
2514 | if (selection.rect) |
2557 | if (selection.rect) |
2515 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2558 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2516 | selection.end.row, selection.end.col, |
2559 | selection.end.row, selection.end.col, |
2517 | RS_RVid, RS_RVid | RS_Uline); |
2560 | RS_RVid, RS_RVid | RS_Uline); |
2518 | else |
2561 | else |
… | |
… | |
2528 | * Dump the whole scrollback and screen to the passed filedescriptor. The |
2571 | * Dump the whole scrollback and screen to the passed filedescriptor. The |
2529 | * invoking routine must close the fd. |
2572 | * invoking routine must close the fd. |
2530 | */ |
2573 | */ |
2531 | #if 0 |
2574 | #if 0 |
2532 | void |
2575 | void |
2533 | rxvt_term::scr_dump (int fd) |
2576 | rxvt_term::scr_dump (int fd) NOTHROW |
2534 | { |
2577 | { |
2535 | int row, wrote; |
2578 | int row, wrote; |
2536 | unsigned int width, towrite; |
2579 | unsigned int width, towrite; |
2537 | char r1[] = "\n"; |
2580 | char r1[] = "\n"; |
2538 | |
2581 | |
… | |
… | |
2557 | |
2600 | |
2558 | /* ------------------------------------------------------------------------- * |
2601 | /* ------------------------------------------------------------------------- * |
2559 | * CHARACTER SELECTION * |
2602 | * CHARACTER SELECTION * |
2560 | * ------------------------------------------------------------------------- */ |
2603 | * ------------------------------------------------------------------------- */ |
2561 | void |
2604 | void |
2562 | rxvt_term::selection_check (int check_more) |
2605 | rxvt_term::selection_check (int check_more) NOTHROW |
2563 | { |
2606 | { |
2564 | row_col_t pos; |
2607 | row_col_t pos; |
2565 | |
2608 | |
2566 | if (!selection.op) |
2609 | if (!selection.op) |
2567 | return; |
2610 | return; |
… | |
… | |
2588 | /* ------------------------------------------------------------------------- */ |
2631 | /* ------------------------------------------------------------------------- */ |
2589 | /* |
2632 | /* |
2590 | * Paste a selection direct to the command fd |
2633 | * Paste a selection direct to the command fd |
2591 | */ |
2634 | */ |
2592 | void |
2635 | void |
2593 | rxvt_term::paste (char *data, unsigned int len) |
2636 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2594 | { |
2637 | { |
2595 | /* convert normal newline chars into common keyboard Return key sequence */ |
2638 | /* convert normal newline chars into common keyboard Return key sequence */ |
2596 | for (unsigned int i = 0; i < len; i++) |
2639 | for (unsigned int i = 0; i < len; i++) |
2597 | if (data[i] == C0_LF) |
2640 | if (data[i] == C0_LF) |
2598 | data[i] = C0_CR; |
2641 | data[i] = C0_CR; |
… | |
… | |
2604 | /* |
2647 | /* |
2605 | * Respond to a notification that a primary selection has been sent |
2648 | * Respond to a notification that a primary selection has been sent |
2606 | * EXT: SelectionNotify |
2649 | * EXT: SelectionNotify |
2607 | */ |
2650 | */ |
2608 | void |
2651 | void |
2609 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2652 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2610 | { |
2653 | { |
2611 | if (prop == None) /* check for failed XConvertSelection */ |
2654 | if (prop == None) /* check for failed XConvertSelection */ |
2612 | { |
2655 | { |
2613 | if ((selection_type & Sel_CompoundText)) |
2656 | if ((selection_type & Sel_CompoundText)) |
2614 | { |
2657 | { |
… | |
… | |
2634 | } |
2677 | } |
2635 | |
2678 | |
2636 | unsigned long bytes_after; |
2679 | unsigned long bytes_after; |
2637 | XTextProperty ct; |
2680 | XTextProperty ct; |
2638 | |
2681 | |
2639 | if (XGetWindowProperty (display->display, win, prop, |
2682 | if (XGetWindowProperty (dpy, win, prop, |
2640 | 0, PROP_SIZE / 4, |
2683 | 0, PROP_SIZE / 4, |
2641 | delete_prop, AnyPropertyType, |
2684 | delete_prop, AnyPropertyType, |
2642 | &ct.encoding, &ct.format, |
2685 | &ct.encoding, &ct.format, |
2643 | &ct.nitems, &bytes_after, |
2686 | &ct.nitems, &bytes_after, |
2644 | &ct.value) != Success) |
2687 | &ct.value) != Success) |
… | |
… | |
2653 | if (bytes_after) |
2696 | if (bytes_after) |
2654 | { |
2697 | { |
2655 | // fetch and append remaining data |
2698 | // fetch and append remaining data |
2656 | XTextProperty ct2; |
2699 | XTextProperty ct2; |
2657 | |
2700 | |
2658 | if (XGetWindowProperty (display->display, win, prop, |
2701 | if (XGetWindowProperty (dpy, win, prop, |
2659 | ct.nitems / 4, (bytes_after + 3) / 4, |
2702 | ct.nitems / 4, (bytes_after + 3) / 4, |
2660 | delete_prop, AnyPropertyType, |
2703 | delete_prop, AnyPropertyType, |
2661 | &ct2.encoding, &ct2.format, |
2704 | &ct2.encoding, &ct2.format, |
2662 | &ct2.nitems, &bytes_after, |
2705 | &ct2.nitems, &bytes_after, |
2663 | &ct2.value) != Success) |
2706 | &ct2.value) != Success) |
… | |
… | |
2676 | |
2719 | |
2677 | if (ct.encoding == xa[XA_INCR]) |
2720 | if (ct.encoding == xa[XA_INCR]) |
2678 | { |
2721 | { |
2679 | // INCR selection, start handshake |
2722 | // INCR selection, start handshake |
2680 | if (!delete_prop) |
2723 | if (!delete_prop) |
2681 | XDeleteProperty (display->display, win, prop); |
2724 | XDeleteProperty (dpy, win, prop); |
2682 | |
2725 | |
2683 | selection_wait = Sel_incr; |
2726 | selection_wait = Sel_incr; |
2684 | incr_buf_fill = 0; |
2727 | incr_buf_fill = 0; |
2685 | incr_ev.start (NOW + 10); |
2728 | incr_ev.start (NOW + 10); |
2686 | |
2729 | |
… | |
… | |
2733 | } |
2776 | } |
2734 | |
2777 | |
2735 | char **cl; |
2778 | char **cl; |
2736 | int cr; |
2779 | int cr; |
2737 | |
2780 | |
2738 | #if ENABLE_FRILLS |
2781 | #if !ENABLE_MINIMAL |
2739 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2782 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2740 | // so recode it manually |
2783 | // so recode it manually |
2741 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2784 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2742 | { |
2785 | { |
2743 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2786 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2747 | paste (s, strlen (s)); |
2790 | paste (s, strlen (s)); |
2748 | free (s); |
2791 | free (s); |
2749 | } |
2792 | } |
2750 | else |
2793 | else |
2751 | #endif |
2794 | #endif |
2752 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2795 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2753 | && cl) |
2796 | && cl) |
2754 | { |
2797 | { |
2755 | for (int i = 0; i < cr; i++) |
2798 | for (int i = 0; i < cr; i++) |
2756 | paste (cl[i], strlen (cl[i])); |
2799 | paste (cl[i], strlen (cl[i])); |
2757 | |
2800 | |
… | |
… | |
2766 | if (selection_wait == Sel_normal) |
2809 | if (selection_wait == Sel_normal) |
2767 | selection_wait = Sel_none; |
2810 | selection_wait = Sel_none; |
2768 | } |
2811 | } |
2769 | |
2812 | |
2770 | void |
2813 | void |
2771 | rxvt_term::incr_cb (time_watcher &w) |
2814 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2772 | { |
2815 | { |
2773 | selection_wait = Sel_none; |
2816 | selection_wait = Sel_none; |
2774 | |
2817 | |
2775 | incr_buf_size = 0; |
2818 | incr_buf_size = 0; |
2776 | free (incr_buf); |
2819 | free (incr_buf); |
2777 | |
2820 | |
2778 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2821 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2779 | } |
2822 | } |
2780 | |
2823 | |
2781 | void |
2824 | void |
2782 | rxvt_term::selection_property (Window win, Atom prop) |
2825 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
2783 | { |
2826 | { |
2784 | if (prop == None || selection_wait != Sel_incr) |
2827 | if (prop == None || selection_wait != Sel_incr) |
2785 | return; |
2828 | return; |
2786 | |
2829 | |
2787 | selection_paste (win, prop, true); |
2830 | selection_paste (win, prop, true); |
… | |
… | |
2796 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2839 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2797 | * will auto fallback to CUT_BUFFER0 |
2840 | * will auto fallback to CUT_BUFFER0 |
2798 | * EXT: button 2 release |
2841 | * EXT: button 2 release |
2799 | */ |
2842 | */ |
2800 | void |
2843 | void |
2801 | rxvt_term::selection_request (Time tm, int x, int y) |
2844 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2802 | { |
2845 | { |
2803 | if (x < 0 || x >= width || y < 0 || y >= height) |
2846 | if (selection.text && selnum == Sel_Primary) |
2804 | return; /* outside window */ |
|
|
2805 | |
|
|
2806 | if (selection.text) |
|
|
2807 | { /* internal selection */ |
2847 | { /* internal selection */ |
2808 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2848 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2809 | paste (str, strlen (str)); |
2849 | paste (str, strlen (str)); |
2810 | free (str); |
2850 | free (str); |
2811 | return; |
2851 | return; |
2812 | } |
2852 | } |
2813 | else |
2853 | else |
2814 | { |
2854 | { |
2815 | int i; |
|
|
2816 | |
|
|
2817 | selection_request_time = tm; |
2855 | selection_request_time = tm; |
2818 | selection_wait = Sel_normal; |
2856 | selection_wait = Sel_normal; |
2819 | |
2857 | |
2820 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
|
|
2821 | { |
|
|
2822 | #if X_HAVE_UTF8_STRING |
2858 | #if X_HAVE_UTF8_STRING |
2823 | selection_type = Sel_UTF8String; |
2859 | selection_type = Sel_UTF8String; |
2824 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
2860 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2825 | return; |
2861 | return; |
2826 | #else |
2862 | #else |
2827 | selection_type = Sel_CompoundText; |
2863 | selection_type = Sel_CompoundText; |
2828 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2864 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2829 | return; |
2865 | return; |
2830 | #endif |
2866 | #endif |
2831 | } |
|
|
2832 | } |
2867 | } |
2833 | |
2868 | |
2834 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2869 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2835 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2870 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2836 | } |
2871 | } |
2837 | |
2872 | |
2838 | int |
2873 | int |
2839 | rxvt_term::selection_request_other (Atom target, int selnum) |
2874 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
2840 | { |
2875 | { |
2841 | Atom sel; |
2876 | Atom sel; |
2842 | |
2877 | |
2843 | selection_type |= selnum; |
2878 | selection_type |= selnum; |
2844 | |
2879 | |
… | |
… | |
2847 | else if (selnum == Sel_Secondary) |
2882 | else if (selnum == Sel_Secondary) |
2848 | sel = XA_SECONDARY; |
2883 | sel = XA_SECONDARY; |
2849 | else |
2884 | else |
2850 | sel = xa[XA_CLIPBOARD]; |
2885 | sel = xa[XA_CLIPBOARD]; |
2851 | |
2886 | |
2852 | if (XGetSelectionOwner (display->display, sel) != None) |
2887 | if (XGetSelectionOwner (dpy, sel) != None) |
2853 | { |
2888 | { |
2854 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2889 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2855 | vt, selection_request_time); |
2890 | vt, selection_request_time); |
2856 | return 1; |
2891 | return 1; |
2857 | } |
2892 | } |
2858 | |
2893 | |
2859 | return 0; |
2894 | return 0; |
… | |
… | |
2863 | /* |
2898 | /* |
2864 | * Clear all selected text |
2899 | * Clear all selected text |
2865 | * EXT: SelectionClear |
2900 | * EXT: SelectionClear |
2866 | */ |
2901 | */ |
2867 | void |
2902 | void |
2868 | rxvt_term::selection_clear () |
2903 | rxvt_term::selection_clear () NOTHROW |
2869 | { |
2904 | { |
2870 | want_refresh = 1; |
2905 | want_refresh = 1; |
2871 | free (selection.text); |
2906 | free (selection.text); |
2872 | selection.text = NULL; |
2907 | selection.text = NULL; |
2873 | selection.len = 0; |
2908 | selection.len = 0; |
… | |
… | |
2922 | |
2957 | |
2923 | int end_col; |
2958 | int end_col; |
2924 | |
2959 | |
2925 | for (; row <= selection.end.row; row++, col = 0) |
2960 | for (; row <= selection.end.row; row++, col = 0) |
2926 | { |
2961 | { |
2927 | #if ENABLE_FRILLS |
2962 | #if !ENABLE_MINIMAL |
2928 | if (selection.rect) |
2963 | if (selection.rect) |
2929 | { |
2964 | { |
2930 | col = selection.beg.col; |
2965 | col = selection.beg.col; |
2931 | end_col = ncol + 1; |
2966 | end_col = ncol + 1; |
2932 | } |
2967 | } |
… | |
… | |
2935 | end_col = ROW(row).l; |
2970 | end_col = ROW(row).l; |
2936 | |
2971 | |
2937 | col = max (col, 0); |
2972 | col = max (col, 0); |
2938 | |
2973 | |
2939 | if (row == selection.end.row |
2974 | if (row == selection.end.row |
2940 | #if ENABLE_FRILLS |
2975 | #if !ENABLE_MINIMAL |
2941 | || selection.rect |
2976 | || selection.rect |
2942 | #endif |
2977 | #endif |
2943 | ) |
2978 | ) |
2944 | min_it (end_col, selection.end.col); |
2979 | min_it (end_col, selection.end.col); |
2945 | |
2980 | |
… | |
… | |
2968 | #endif |
3003 | #endif |
2969 | else |
3004 | else |
2970 | new_selection_text[ofs++] = *t++; |
3005 | new_selection_text[ofs++] = *t++; |
2971 | } |
3006 | } |
2972 | |
3007 | |
2973 | #if ENABLE_FRILLS |
3008 | #if !ENABLE_MINIMAL |
2974 | if (selection.rect) |
3009 | if (selection.rect) |
2975 | { |
3010 | { |
2976 | while (ofs |
3011 | while (ofs |
2977 | && new_selection_text[ofs - 1] != C0_LF |
3012 | && new_selection_text[ofs - 1] != C0_LF |
2978 | && unicode::is_space (new_selection_text[ofs - 1])) |
3013 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3008 | |
3043 | |
3009 | selection_grab (tm); |
3044 | selection_grab (tm); |
3010 | } |
3045 | } |
3011 | |
3046 | |
3012 | bool |
3047 | bool |
3013 | rxvt_term::selection_grab (Time tm) |
3048 | rxvt_term::selection_grab (Time tm) NOTHROW |
3014 | { |
3049 | { |
3015 | selection_time = tm; |
3050 | selection_time = tm; |
3016 | |
3051 | |
3017 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3052 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3018 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3053 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3019 | { |
3054 | { |
3020 | display->set_selection_owner (this); |
3055 | display->set_selection_owner (this); |
3021 | return true; |
3056 | return true; |
3022 | } |
3057 | } |
3023 | else |
3058 | else |
… | |
… | |
3027 | } |
3062 | } |
3028 | |
3063 | |
3029 | #if 0 |
3064 | #if 0 |
3030 | XTextProperty ct; |
3065 | XTextProperty ct; |
3031 | |
3066 | |
3032 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3067 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3033 | { |
3068 | { |
3034 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3069 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3035 | XFree (ct.value); |
3070 | XFree (ct.value); |
3036 | } |
3071 | } |
3037 | #endif |
3072 | #endif |
… | |
… | |
3041 | /* |
3076 | /* |
3042 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3077 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3043 | * EXT: button 1 press |
3078 | * EXT: button 1 press |
3044 | */ |
3079 | */ |
3045 | void |
3080 | void |
3046 | rxvt_term::selection_click (int clicks, int x, int y) |
3081 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
3047 | { |
3082 | { |
3048 | clicks = ((clicks - 1) % 3) + 1; |
3083 | clicks = ((clicks - 1) % 3) + 1; |
3049 | selection.clicks = clicks; /* save clicks so extend will work */ |
3084 | selection.clicks = clicks; /* save clicks so extend will work */ |
3050 | |
3085 | |
3051 | if (clicks == 2 && !selection.rect |
3086 | if (clicks == 2 && !selection.rect |
… | |
… | |
3070 | /* ------------------------------------------------------------------------- */ |
3105 | /* ------------------------------------------------------------------------- */ |
3071 | /* |
3106 | /* |
3072 | * Mark a selection at the specified col/row |
3107 | * Mark a selection at the specified col/row |
3073 | */ |
3108 | */ |
3074 | void |
3109 | void |
3075 | rxvt_term::selection_start_colrow (int col, int row) |
3110 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
3076 | { |
3111 | { |
3077 | want_refresh = 1; |
3112 | want_refresh = 1; |
3078 | |
3113 | |
3079 | selection.mark.row = row + view_start; |
3114 | selection.mark.row = row + view_start; |
3080 | selection.mark.col = col; |
3115 | selection.mark.col = col; |
… | |
… | |
3106 | #define DELIMIT_TEXT(x) \ |
3141 | #define DELIMIT_TEXT(x) \ |
3107 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3142 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3108 | #define DELIMIT_REND(x) 1 |
3143 | #define DELIMIT_REND(x) 1 |
3109 | |
3144 | |
3110 | void |
3145 | void |
3111 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
3146 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3112 | { |
3147 | { |
3113 | int col, row, dirnadd, tcol, trow, w1, w2; |
3148 | int col, row, dirnadd, tcol, trow, w1, w2; |
3114 | row_col_t bound; |
3149 | row_col_t bound; |
3115 | text_t *stp; |
3150 | text_t *stp; |
3116 | rend_t *srp; |
3151 | rend_t *srp; |
… | |
… | |
3190 | * flag == 0 ==> button 1 |
3225 | * flag == 0 ==> button 1 |
3191 | * flag == 1 ==> button 3 press |
3226 | * flag == 1 ==> button 3 press |
3192 | * flag == 2 ==> button 3 motion |
3227 | * flag == 2 ==> button 3 motion |
3193 | */ |
3228 | */ |
3194 | void |
3229 | void |
3195 | rxvt_term::selection_extend (int x, int y, int flag) |
3230 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3196 | { |
3231 | { |
3197 | int col = clamp (Pixel2Col (x), 0, ncol); |
3232 | int col = clamp (Pixel2Col (x), 0, ncol); |
3198 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3233 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3199 | |
3234 | |
3200 | /* |
3235 | /* |
… | |
… | |
3226 | /* ------------------------------------------------------------------------- */ |
3261 | /* ------------------------------------------------------------------------- */ |
3227 | /* |
3262 | /* |
3228 | * Extend the selection to the specified col/row |
3263 | * Extend the selection to the specified col/row |
3229 | */ |
3264 | */ |
3230 | void |
3265 | void |
3231 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3266 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3232 | { |
3267 | { |
3233 | row_col_t pos; |
3268 | row_col_t pos; |
3234 | enum { |
3269 | enum { |
3235 | LEFT, RIGHT |
3270 | LEFT, RIGHT |
3236 | } closeto = RIGHT; |
3271 | } closeto = RIGHT; |
… | |
… | |
3339 | |
3374 | |
3340 | if (selection.clicks == 1) |
3375 | if (selection.clicks == 1) |
3341 | { |
3376 | { |
3342 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3377 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3343 | && !ROW(selection.beg.row).is_longer () |
3378 | && !ROW(selection.beg.row).is_longer () |
3344 | #if ENABLE_FRILLS |
3379 | #if !ENABLE_MINIMAL |
3345 | && !selection.rect |
3380 | && !selection.rect |
3346 | #endif |
3381 | #endif |
3347 | ) |
3382 | ) |
3348 | selection.beg.col = ncol; |
3383 | selection.beg.col = ncol; |
3349 | |
3384 | |
3350 | if ( |
3385 | if ( |
3351 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3386 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3352 | && !ROW(selection.end.row).is_longer () |
3387 | && !ROW(selection.end.row).is_longer () |
3353 | #if ENABLE_FRILLS |
3388 | #if !ENABLE_MINIMAL |
3354 | && !selection.rect |
3389 | && !selection.rect |
3355 | #endif |
3390 | #endif |
3356 | ) |
3391 | ) |
3357 | selection.end.col = ncol; |
3392 | selection.end.col = ncol; |
3358 | } |
3393 | } |
… | |
… | |
3375 | { |
3410 | { |
3376 | if (!ROW(end_row).is_longer ()) |
3411 | if (!ROW(end_row).is_longer ()) |
3377 | { |
3412 | { |
3378 | selection.end.row = end_row; |
3413 | selection.end.row = end_row; |
3379 | selection.end.col = ROW(end_row).l; |
3414 | selection.end.col = ROW(end_row).l; |
|
|
3415 | # if !ENABLE_MINIMAL |
3380 | selection_remove_trailing_spaces (); |
3416 | selection_remove_trailing_spaces (); |
|
|
3417 | # endif |
3381 | break; |
3418 | break; |
3382 | } |
3419 | } |
3383 | } |
3420 | } |
3384 | } |
3421 | } |
3385 | else |
3422 | else |
… | |
… | |
3414 | selection.mark.row = selection.beg.row; |
3451 | selection.mark.row = selection.beg.row; |
3415 | selection.mark.col = selection.beg.col; |
3452 | selection.mark.col = selection.beg.col; |
3416 | } |
3453 | } |
3417 | } |
3454 | } |
3418 | |
3455 | |
3419 | #if ENABLE_FRILLS |
3456 | #if !ENABLE_MINIMAL |
3420 | if (selection.rect && selection.beg.col > selection.end.col) |
3457 | if (selection.rect && selection.beg.col > selection.end.col) |
3421 | ::swap (selection.beg.col, selection.end.col); |
3458 | ::swap (selection.beg.col, selection.end.col); |
3422 | #endif |
3459 | #endif |
3423 | } |
3460 | } |
3424 | |
3461 | |
3425 | #if ENABLE_FRILLS |
3462 | #if !ENABLE_MINIMAL |
3426 | void |
3463 | void |
3427 | rxvt_term::selection_remove_trailing_spaces () |
3464 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3428 | { |
3465 | { |
3429 | int32_t end_col, end_row; |
3466 | int32_t end_col, end_row; |
3430 | text_t *stp; |
3467 | text_t *stp; |
3431 | |
3468 | |
3432 | end_col = selection.end.col; |
3469 | end_col = selection.end.col; |
… | |
… | |
3470 | /* |
3507 | /* |
3471 | * Double click on button 3 when already selected |
3508 | * Double click on button 3 when already selected |
3472 | * EXT: button 3 double click |
3509 | * EXT: button 3 double click |
3473 | */ |
3510 | */ |
3474 | void |
3511 | void |
3475 | rxvt_term::selection_rotate (int x, int y) |
3512 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3476 | { |
3513 | { |
3477 | selection.clicks = selection.clicks % 3 + 1; |
3514 | selection.clicks = selection.clicks % 3 + 1; |
3478 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3515 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3479 | } |
3516 | } |
3480 | |
3517 | |
… | |
… | |
3482 | /* |
3519 | /* |
3483 | * Respond to a request for our current selection |
3520 | * Respond to a request for our current selection |
3484 | * EXT: SelectionRequest |
3521 | * EXT: SelectionRequest |
3485 | */ |
3522 | */ |
3486 | void |
3523 | void |
3487 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3524 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3488 | { |
3525 | { |
3489 | XSelectionEvent ev; |
3526 | XSelectionEvent ev; |
3490 | dDisp; |
|
|
3491 | |
3527 | |
3492 | ev.type = SelectionNotify; |
3528 | ev.type = SelectionNotify; |
3493 | ev.property = None; |
3529 | ev.property = None; |
3494 | ev.display = rq.display; |
3530 | ev.display = rq.display; |
3495 | ev.requestor = rq.requestor; |
3531 | ev.requestor = rq.requestor; |
… | |
… | |
3509 | *target++ = xa[XA_COMPOUND_TEXT]; |
3545 | *target++ = xa[XA_COMPOUND_TEXT]; |
3510 | #if X_HAVE_UTF8_STRING |
3546 | #if X_HAVE_UTF8_STRING |
3511 | *target++ = xa[XA_UTF8_STRING]; |
3547 | *target++ = xa[XA_UTF8_STRING]; |
3512 | #endif |
3548 | #endif |
3513 | |
3549 | |
3514 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3550 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3515 | 32, PropModeReplace, |
3551 | 32, PropModeReplace, |
3516 | (unsigned char *)target_list, target - target_list); |
3552 | (unsigned char *)target_list, target - target_list); |
3517 | ev.property = rq.property; |
3553 | ev.property = rq.property; |
3518 | } |
3554 | } |
3519 | #if TODO // TODO |
3555 | #if TODO // TODO |
… | |
… | |
3522 | /* TODO: Handle MULTIPLE */ |
3558 | /* TODO: Handle MULTIPLE */ |
3523 | } |
3559 | } |
3524 | #endif |
3560 | #endif |
3525 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3561 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3526 | { |
3562 | { |
3527 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3563 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3528 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3564 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3529 | ev.property = rq.property; |
3565 | ev.property = rq.property; |
3530 | } |
3566 | } |
3531 | else if (rq.target == XA_STRING |
3567 | else if (rq.target == XA_STRING |
3532 | || rq.target == xa[XA_TEXT] |
3568 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3556 | style = enc_string; |
3592 | style = enc_string; |
3557 | else if (target == xa[XA_TEXT]) |
3593 | else if (target == xa[XA_TEXT]) |
3558 | style = enc_text; |
3594 | style = enc_text; |
3559 | else if (target == xa[XA_COMPOUND_TEXT]) |
3595 | else if (target == xa[XA_COMPOUND_TEXT]) |
3560 | style = enc_compound_text; |
3596 | style = enc_compound_text; |
3561 | #if ENABLE_FRILLS |
3597 | #if !ENABLE_MINIMAL |
3562 | else if (target == xa[XA_UTF8_STRING]) |
3598 | else if (target == xa[XA_UTF8_STRING]) |
3563 | style = enc_utf8; |
3599 | style = enc_utf8; |
3564 | #endif |
3600 | #endif |
3565 | else |
3601 | else |
3566 | { |
3602 | { |
… | |
… | |
3577 | { |
3613 | { |
3578 | cl = L""; |
3614 | cl = L""; |
3579 | selectlen = 0; |
3615 | selectlen = 0; |
3580 | } |
3616 | } |
3581 | |
3617 | |
3582 | #if ENABLE_FRILLS |
3618 | #if !ENABLE_MINIMAL |
3583 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3619 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3584 | // so recode it manually |
3620 | // so recode it manually |
3585 | if (style == enc_utf8) |
3621 | if (style == enc_utf8) |
3586 | { |
3622 | { |
3587 | freect = 1; |
3623 | freect = 1; |
… | |
… | |
3590 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3626 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3591 | ct.nitems = strlen ((char *)ct.value); |
3627 | ct.nitems = strlen ((char *)ct.value); |
3592 | } |
3628 | } |
3593 | else |
3629 | else |
3594 | #endif |
3630 | #endif |
3595 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3631 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3596 | freect = 1; |
3632 | freect = 1; |
3597 | else |
3633 | else |
3598 | { |
3634 | { |
3599 | /* if we failed to convert then send it raw */ |
3635 | /* if we failed to convert then send it raw */ |
3600 | ct.value = (unsigned char *)cl; |
3636 | ct.value = (unsigned char *)cl; |
3601 | ct.nitems = selectlen; |
3637 | ct.nitems = selectlen; |
3602 | ct.encoding = target; |
3638 | ct.encoding = target; |
3603 | } |
3639 | } |
3604 | |
3640 | |
3605 | XChangeProperty (disp, rq.requestor, rq.property, |
3641 | XChangeProperty (dpy, rq.requestor, rq.property, |
3606 | ct.encoding, 8, PropModeReplace, |
3642 | ct.encoding, 8, PropModeReplace, |
3607 | ct.value, (int)ct.nitems); |
3643 | ct.value, (int)ct.nitems); |
3608 | ev.property = rq.property; |
3644 | ev.property = rq.property; |
3609 | |
3645 | |
3610 | if (freect) |
3646 | if (freect) |
3611 | XFree (ct.value); |
3647 | XFree (ct.value); |
3612 | } |
3648 | } |
3613 | |
3649 | |
3614 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3650 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3615 | } |
3651 | } |
3616 | |
3652 | |
3617 | /* ------------------------------------------------------------------------- * |
3653 | /* ------------------------------------------------------------------------- * |
3618 | * MOUSE ROUTINES * |
3654 | * MOUSE ROUTINES * |
3619 | * ------------------------------------------------------------------------- */ |
3655 | * ------------------------------------------------------------------------- */ |
3620 | |
3656 | |
3621 | /* |
3657 | /* |
3622 | * return col/row values corresponding to x/y pixel values |
3658 | * return col/row values corresponding to x/y pixel values |
3623 | */ |
3659 | */ |
3624 | void |
3660 | void |
3625 | rxvt_term::pixel_position (int *x, int *y) |
3661 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
3626 | { |
3662 | { |
3627 | *x = Pixel2Col (*x); |
3663 | *x = Pixel2Col (*x); |
3628 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
3664 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
3629 | *y = Pixel2Row (*y); |
3665 | *y = Pixel2Row (*y); |
3630 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
3666 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
3631 | } |
3667 | } |
3632 | |
3668 | |
3633 | /* ------------------------------------------------------------------------- */ |
3669 | /* ------------------------------------------------------------------------- */ |
3634 | #ifdef USE_XIM |
3670 | #ifdef USE_XIM |
3635 | void |
3671 | void |
3636 | rxvt_term::im_set_position (XPoint &pos) |
3672 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3637 | { |
3673 | { |
3638 | XWindowAttributes xwa; |
3674 | XWindowAttributes xwa; |
3639 | |
3675 | |
3640 | XGetWindowAttributes (display->display, vt, &xwa); |
3676 | XGetWindowAttributes (dpy, vt, &xwa); |
3641 | |
3677 | |
3642 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3678 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3643 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3679 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3644 | } |
3680 | } |
3645 | #endif |
3681 | #endif |
3646 | |
3682 | |
3647 | #if ENABLE_OVERLAY |
3683 | #if ENABLE_OVERLAY |
3648 | void |
3684 | void |
3649 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3685 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW |
3650 | { |
3686 | { |
3651 | if (nrow < 1 || ncol < 1) |
3687 | if (nrow < 1 || ncol < 1) |
3652 | return; |
3688 | return; |
3653 | |
3689 | |
3654 | want_refresh = 1; |
3690 | want_refresh = 1; |
… | |
… | |
3699 | *rp = r; |
3735 | *rp = r; |
3700 | } |
3736 | } |
3701 | } |
3737 | } |
3702 | |
3738 | |
3703 | void |
3739 | void |
3704 | rxvt_term::scr_overlay_off () |
3740 | rxvt_term::scr_overlay_off () NOTHROW |
3705 | { |
3741 | { |
3706 | if (!ov_text) |
3742 | if (!ov_text) |
3707 | return; |
3743 | return; |
3708 | |
3744 | |
3709 | want_refresh = 1; |
3745 | want_refresh = 1; |
… | |
… | |
3717 | delete [] ov_text; ov_text = 0; |
3753 | delete [] ov_text; ov_text = 0; |
3718 | delete [] ov_rend; ov_rend = 0; |
3754 | delete [] ov_rend; ov_rend = 0; |
3719 | } |
3755 | } |
3720 | |
3756 | |
3721 | void |
3757 | void |
3722 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) |
3758 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3723 | { |
3759 | { |
3724 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3760 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3725 | return; |
3761 | return; |
3726 | |
3762 | |
3727 | x++, y++; |
3763 | x++, y++; |
… | |
… | |
3729 | ov_text[y][x] = text; |
3765 | ov_text[y][x] = text; |
3730 | ov_rend[y][x] = rend; |
3766 | ov_rend[y][x] = rend; |
3731 | } |
3767 | } |
3732 | |
3768 | |
3733 | void |
3769 | void |
3734 | rxvt_term::scr_overlay_set (int x, int y, const char *s) |
3770 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3735 | { |
3771 | { |
3736 | while (*s) |
3772 | while (*s) |
3737 | scr_overlay_set (x++, y, *s++); |
3773 | scr_overlay_set (x++, y, *s++); |
3738 | } |
3774 | } |
3739 | |
3775 | |
3740 | void |
3776 | void |
3741 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) |
3777 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3742 | { |
3778 | { |
3743 | while (*s) |
3779 | while (*s) |
3744 | { |
3780 | { |
3745 | text_t t = *s++; |
3781 | text_t t = *s++; |
3746 | int width = wcwidth (t); |
3782 | int width = WCWIDTH (t); |
3747 | |
3783 | |
3748 | while (width--) |
3784 | while (width--) |
3749 | { |
3785 | { |
3750 | scr_overlay_set (x++, y, t); |
3786 | scr_overlay_set (x++, y, t); |
3751 | t = NOCHAR; |
3787 | t = NOCHAR; |
3752 | } |
3788 | } |
3753 | } |
3789 | } |
3754 | } |
3790 | } |
3755 | |
3791 | |
3756 | void |
3792 | void |
3757 | rxvt_term::scr_swap_overlay () |
3793 | rxvt_term::scr_swap_overlay () NOTHROW |
3758 | { |
3794 | { |
3759 | if (!ov_text) |
3795 | if (!ov_text) |
3760 | return; |
3796 | return; |
3761 | |
3797 | |
3762 | // swap screen mem with overlay |
3798 | // swap screen mem with overlay |