… | |
… | |
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 (xdisp, 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 (xdisp, 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 (xdisp, 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 | /* ------------------------------------------------------------------------- * |
… | |
… | |
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 | rvideo = 0; |
242 | rvideo_state = rvideo_mode = false; |
240 | } |
243 | } |
241 | else |
244 | else |
242 | { |
245 | { |
243 | /* |
246 | /* |
244 | * add or delete rows as appropriate |
247 | * add or delete rows as appropriate |
… | |
… | |
280 | int pend = MOD (term_start + top_row , prev_total_rows); |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
281 | int q = total_rows; // rewrapped row |
284 | int q = total_rows; // rewrapped row |
282 | |
285 | |
283 | if (top_row) |
286 | if (top_row) |
284 | { |
287 | { |
285 | // 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 |
286 | // to come up with a lean and mean algorithm. |
289 | // to come up with a lean and mean algorithm. |
287 | |
290 | |
288 | row_col_t ocur = screen.cur; |
291 | row_col_t ocur = screen.cur; |
289 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
292 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
290 | |
293 | |
… | |
… | |
347 | |
350 | |
348 | line_t &pline = old_buf [prow]; |
351 | line_t &pline = old_buf [prow]; |
349 | |
352 | |
350 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
353 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
351 | |
354 | |
352 | #if DEBUG_STRICT |
|
|
353 | assert (len); |
|
|
354 | assert (pline.t); |
|
|
355 | #endif |
|
|
356 | |
|
|
357 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
355 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
358 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
356 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
359 | |
357 | |
360 | lofs += len; |
358 | lofs += len; |
361 | qcol += len; |
359 | qcol += len; |
… | |
… | |
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 | } |
409 | |
406 | |
410 | CLEAR_ALL_SELECTION (); |
407 | CLEAR_ALL_SELECTION (); |
411 | |
408 | |
412 | prev_nrow = nrow; |
409 | prev_nrow = nrow; |
… | |
… | |
415 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
416 | |
413 | |
417 | for (int col = ncol; col--; ) |
414 | for (int col = ncol; col--; ) |
418 | tabs [col] = col % TABSIZE == 0; |
415 | tabs [col] = col % TABSIZE == 0; |
419 | |
416 | |
|
|
417 | if (current_screen != PRIMARY) |
|
|
418 | scr_swap_screen (); |
|
|
419 | |
420 | tt_winch (); |
420 | tt_winch (); |
421 | |
421 | |
422 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
422 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
423 | } |
423 | } |
424 | |
424 | |
… | |
… | |
427 | * Free everything. That way malloc debugging can find leakage. |
427 | * Free everything. That way malloc debugging can find leakage. |
428 | */ |
428 | */ |
429 | void |
429 | void |
430 | rxvt_term::scr_release () NOTHROW |
430 | rxvt_term::scr_release () NOTHROW |
431 | { |
431 | { |
|
|
432 | if (row_buf) |
|
|
433 | { |
432 | delete talloc; talloc = 0; |
434 | delete talloc; talloc = 0; |
433 | delete ralloc; ralloc = 0; |
435 | delete ralloc; ralloc = 0; |
434 | |
436 | |
435 | free (row_buf); |
437 | free (row_buf); |
436 | free (swap_buf); |
438 | free (swap_buf); |
437 | free (drawn_buf); |
439 | free (drawn_buf); |
438 | free (tabs); |
440 | free (tabs); |
439 | |
441 | |
440 | row_buf = 0; // signal that we freed all the arrays |
442 | row_buf = 0; // signal that we freed all the arrays |
|
|
443 | } |
441 | } |
444 | } |
442 | |
445 | |
443 | /* ------------------------------------------------------------------------- */ |
446 | /* ------------------------------------------------------------------------- */ |
444 | /* |
447 | /* |
445 | * Hard reset |
448 | * Hard reset |
446 | */ |
449 | */ |
447 | void |
450 | void |
448 | rxvt_term::scr_poweron () NOTHROW |
451 | rxvt_term::scr_poweron () |
449 | { |
452 | { |
450 | scr_release (); |
453 | scr_release (); |
451 | prev_nrow = prev_ncol = 0; |
454 | prev_nrow = prev_ncol = 0; |
452 | scr_reset (); |
455 | scr_reset (); |
453 | |
456 | |
… | |
… | |
504 | assert (s->cur.row >= 0); |
507 | assert (s->cur.row >= 0); |
505 | assert (s->cur.col >= 0); |
508 | assert (s->cur.col >= 0); |
506 | #endif |
509 | #endif |
507 | } |
510 | } |
508 | |
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 | |
509 | /* ------------------------------------------------------------------------- */ |
527 | /* ------------------------------------------------------------------------- */ |
510 | /* |
528 | /* |
511 | * Swap between primary and secondary screens |
529 | * Swap between primary and secondary screens |
512 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
530 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
513 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
531 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
514 | */ |
532 | */ |
515 | int |
533 | void |
516 | rxvt_term::scr_change_screen (int scrn) NOTHROW |
534 | rxvt_term::scr_change_screen (int scrn) |
517 | { |
535 | { |
|
|
536 | if (scrn == current_screen) |
|
|
537 | return; |
|
|
538 | |
518 | want_refresh = 1; |
539 | want_refresh = 1; |
519 | view_start = 0; |
540 | view_start = 0; |
520 | |
541 | |
521 | if (current_screen == scrn) |
|
|
522 | return scrn; |
|
|
523 | |
|
|
524 | selection_check (2); /* check for boundary cross */ |
542 | selection_check (2); /* check for boundary cross */ |
525 | |
543 | |
526 | int i = current_screen; current_screen = scrn; scrn = i; |
544 | int i = current_screen; current_screen = scrn; scrn = i; |
527 | |
|
|
528 | ::swap (screen.cur.row, swap.cur.row); |
|
|
529 | ::swap (screen.cur.col, swap.cur.col); |
|
|
530 | |
|
|
531 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
532 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
533 | |
545 | |
534 | #if NSCREENS |
546 | #if NSCREENS |
535 | if (OPTION (Opt_secondaryScreen)) |
547 | if (OPTION (Opt_secondaryScreen)) |
536 | { |
548 | { |
537 | num_scr = 0; |
549 | num_scr = 0; |
538 | |
550 | |
539 | for (int i = prev_nrow; i--; ) |
551 | scr_swap_screen (); |
540 | ::swap (ROW(i), swap_buf [i]); |
|
|
541 | |
552 | |
542 | ::swap (screen.charset, swap.charset); |
553 | ::swap (screen.charset, swap.charset); |
543 | ::swap (screen.flags, swap.flags); |
554 | ::swap (screen.flags, swap.flags); |
544 | screen.flags |= Screen_VisibleCursor; |
555 | screen.flags |= Screen_VisibleCursor; |
545 | swap.flags |= Screen_VisibleCursor; |
556 | swap.flags |= Screen_VisibleCursor; |
546 | } |
557 | } |
547 | else |
558 | else |
548 | #endif |
559 | #endif |
549 | if (OPTION (Opt_secondaryScroll)) |
560 | if (OPTION (Opt_secondaryScroll)) |
550 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
561 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
551 | |
|
|
552 | return scrn; |
|
|
553 | } |
562 | } |
554 | |
563 | |
555 | // clear WrapNext indicator, solidifying position on next line |
564 | // clear WrapNext indicator, solidifying position on next line |
556 | void |
565 | void |
557 | rxvt_term::scr_do_wrap () NOTHROW |
566 | rxvt_term::scr_do_wrap () NOTHROW |
… | |
… | |
631 | l.touch (); |
640 | l.touch (); |
632 | } |
641 | } |
633 | |
642 | |
634 | // erase newly scrolled-in lines |
643 | // erase newly scrolled-in lines |
635 | for (int i = count; i--; ) |
644 | for (int i = count; i--; ) |
636 | { |
645 | scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle); |
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 - 1 - i); |
|
|
640 | |
|
|
641 | scr_blank_line (l, 0, l.l, rstyle); |
|
|
642 | |
|
|
643 | l.l = 0; |
|
|
644 | l.f = 0; |
|
|
645 | } |
|
|
646 | |
646 | |
647 | // now copy lines below the scroll region bottom to the |
647 | // now copy lines below the scroll region bottom to the |
648 | // bottom of the screen again, so they look as if they |
648 | // bottom of the screen again, so they look as if they |
649 | // hadn't moved. |
649 | // hadn't moved. |
650 | for (int i = nrow; --i > row2; ) |
650 | for (int i = nrow; --i > row2; ) |
… | |
… | |
749 | ZERO_SCROLLBACK (); |
749 | ZERO_SCROLLBACK (); |
750 | |
750 | |
751 | if (minlines > 0) |
751 | if (minlines > 0) |
752 | { |
752 | { |
753 | minlines += screen.cur.row - screen.bscroll; |
753 | minlines += screen.cur.row - screen.bscroll; |
|
|
754 | min_it (minlines, screen.cur.row - top_row); |
754 | |
755 | |
755 | if (minlines > 0 |
756 | if (minlines > 0 |
756 | && screen.tscroll == 0 |
757 | && screen.tscroll == 0 |
757 | && screen.bscroll == nrow - 1) |
758 | && screen.bscroll == nrow - 1) |
758 | { |
759 | { |
… | |
… | |
832 | |
833 | |
833 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
834 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
834 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
835 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
835 | c = 0xfffd; |
836 | c = 0xfffd; |
836 | |
837 | |
837 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
838 | // rely on wcwidth to tell us the character width, do wcwidth before |
838 | // do wcwidth before further replacements, as wcwidth might return -1 |
839 | // further replacements, as wcwidth might return -1 for the line |
839 | // for the line drawing characters below as they might be invalid in the current |
840 | // drawing characters below as they might be invalid in the current |
840 | // locale. |
841 | // locale. |
841 | int width = c < 0x100 ? 1 : wcwidth (c); |
842 | int width = WCWIDTH (c); |
842 | |
843 | |
843 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
844 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
844 | { |
845 | { |
845 | // vt100 special graphics and line drawing |
846 | // vt100 special graphics and line drawing |
846 | // 5f-7e standard vt100 |
847 | // 5f-7e standard vt100 |
… | |
… | |
1328 | } |
1329 | } |
1329 | else |
1330 | else |
1330 | { |
1331 | { |
1331 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1332 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1332 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1333 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1333 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1334 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1334 | ERASE_ROWS (row, num); |
1335 | ERASE_ROWS (row, num); |
1335 | gcvalue.foreground = pix_colors[Color_fg]; |
1336 | gcvalue.foreground = pix_colors[Color_fg]; |
1336 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1337 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1337 | } |
1338 | } |
1338 | |
1339 | |
1339 | for (; num--; row++) |
1340 | for (; num--; row++) |
1340 | { |
1341 | { |
1341 | scr_blank_screen_mem (ROW(row), rstyle); |
1342 | scr_blank_screen_mem (ROW(row), rstyle); |
… | |
… | |
1621 | * Set reverse/normal video |
1622 | * Set reverse/normal video |
1622 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1623 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1623 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1624 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1624 | */ |
1625 | */ |
1625 | void |
1626 | void |
1626 | rxvt_term::scr_rvideo_mode (int mode) NOTHROW |
1627 | rxvt_term::scr_rvideo_mode (bool on) NOTHROW |
1627 | { |
1628 | { |
1628 | XGCValues gcvalue; |
1629 | rvideo_mode = on; |
1629 | |
1630 | |
|
|
1631 | #ifndef NO_BELL |
|
|
1632 | on ^= rvideo_bell; |
|
|
1633 | #endif |
|
|
1634 | |
1630 | if (rvideo != mode) |
1635 | if (rvideo_state != on) |
1631 | { |
1636 | { |
1632 | rvideo = mode; |
1637 | rvideo_state = on; |
|
|
1638 | |
1633 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1639 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1634 | #if XPM_BACKGROUND |
1640 | #if XPM_BACKGROUND |
1635 | if (bgPixmap.pixmap == None) |
1641 | if (bgPixmap.pixmap == None) |
1636 | #endif |
1642 | #endif |
1637 | #if TRANSPARENT |
1643 | #if TRANSPARENT |
1638 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
1644 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1639 | #endif |
1645 | #endif |
1640 | XSetWindowBackground (display->display, vt, |
1646 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
1641 | pix_colors[Color_bg]); |
|
|
1642 | |
1647 | |
|
|
1648 | XGCValues gcvalue; |
1643 | gcvalue.foreground = pix_colors[Color_fg]; |
1649 | gcvalue.foreground = pix_colors[Color_fg]; |
1644 | gcvalue.background = pix_colors[Color_bg]; |
1650 | gcvalue.background = pix_colors[Color_bg]; |
1645 | XChangeGC (display->display, gc, GCBackground | GCForeground, |
1651 | XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); |
1646 | &gcvalue); |
1652 | |
1647 | scr_clear (); |
1653 | scr_clear (); |
1648 | scr_touch (true); |
1654 | scr_touch (true); |
1649 | } |
1655 | } |
1650 | } |
1656 | } |
1651 | |
1657 | |
… | |
… | |
1851 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1857 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1852 | |
1858 | |
1853 | return true; |
1859 | return true; |
1854 | } |
1860 | } |
1855 | |
1861 | |
|
|
1862 | #ifndef NO_BELL |
|
|
1863 | void |
|
|
1864 | rxvt_term::bell_cb (time_watcher &w) |
|
|
1865 | { |
|
|
1866 | rvideo_bell = false; |
|
|
1867 | scr_rvideo_mode (rvideo_mode); |
|
|
1868 | } |
|
|
1869 | #endif |
|
|
1870 | |
1856 | /* ------------------------------------------------------------------------- */ |
1871 | /* ------------------------------------------------------------------------- */ |
1857 | void |
1872 | void |
1858 | rxvt_term::scr_bell () NOTHROW |
1873 | rxvt_term::scr_bell () NOTHROW |
1859 | { |
1874 | { |
1860 | #ifndef NO_BELL |
1875 | #ifndef NO_BELL |
1861 | |
1876 | |
1862 | # ifndef NO_MAPALERT |
1877 | # ifndef NO_MAPALERT |
1863 | # ifdef MAPALERT_OPTION |
1878 | # ifdef MAPALERT_OPTION |
1864 | if (OPTION (Opt_mapAlert)) |
1879 | if (OPTION (Opt_mapAlert)) |
1865 | # endif |
1880 | # endif |
1866 | XMapWindow (display->display, parent[0]); |
1881 | XMapWindow (xdisp, parent[0]); |
1867 | # endif |
1882 | # endif |
1868 | |
1883 | |
1869 | if (OPTION (Opt_visualBell)) |
1884 | if (OPTION (Opt_visualBell)) |
1870 | { |
1885 | { |
1871 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1886 | rvideo_bell = true; |
|
|
1887 | scr_rvideo_mode (rvideo_mode); |
1872 | display->flush (); |
1888 | display->flush (); |
1873 | rxvt_usleep (VISUAL_BELL_DURATION); |
1889 | |
1874 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1890 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1875 | } |
1891 | } |
1876 | else |
1892 | else |
1877 | XBell (display->display, 0); |
1893 | XBell (xdisp, 0); |
1878 | |
1894 | |
1879 | #endif |
1895 | #endif |
1880 | } |
1896 | } |
1881 | |
1897 | |
1882 | /* ------------------------------------------------------------------------- */ |
1898 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
2121 | { |
2137 | { |
2122 | /* also comes here at end if needed because of >= above */ |
2138 | /* also comes here at end if needed because of >= above */ |
2123 | if (wlen < len) |
2139 | if (wlen < len) |
2124 | ::swap (wlen, len); |
2140 | ::swap (wlen, len); |
2125 | |
2141 | |
2126 | XCopyArea (display->display, vt, vt, |
2142 | XCopyArea (xdisp, vt, vt, |
2127 | gc, 0, Row2Pixel (len + i), |
2143 | gc, 0, Row2Pixel (len + i), |
2128 | (unsigned int)this->width, |
2144 | (unsigned int)this->width, |
2129 | (unsigned int)Height2Pixel (wlen - len + 1), |
2145 | (unsigned int)Height2Pixel (wlen - len + 1), |
2130 | 0, Row2Pixel (len)); |
2146 | 0, Row2Pixel (len)); |
2131 | len = -1; |
2147 | len = -1; |
… | |
… | |
2219 | |
2235 | |
2220 | // only do special processing if any attributes are set, which is unlikely |
2236 | // only do special processing if any attributes are set, which is unlikely |
2221 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2237 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2222 | { |
2238 | { |
2223 | #if ENABLE_STYLES |
2239 | #if ENABLE_STYLES |
2224 | // force redraw after "careful" characters to avoid pixel droppings |
2240 | // "careful" (too wide) character handling |
2225 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2226 | drp[col + 1] = ~srp[col + 1]; |
|
|
2227 | |
2241 | |
2228 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2242 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2229 | while (text > stp |
2243 | while (text > stp |
2230 | && srp[text - stp - 1] & RS_Careful |
2244 | && srp[text - stp - 1] & RS_Careful |
2231 | && RS_SAME (rend, srp[text - stp - 1])) |
2245 | && RS_SAME (rend, srp[text - stp - 1])) |
2232 | text--, count++, xpixel -= fwidth; |
2246 | text--, count++, xpixel -= fwidth; |
|
|
2247 | |
|
|
2248 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2249 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2250 | drp[col + i + 1] = ~srp[col + i + 1]; |
|
|
2251 | |
|
|
2252 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2253 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2254 | drp[text - stp - i - 1] = ~srp[text - stp - i - 1]; |
2233 | #endif |
2255 | #endif |
2234 | |
2256 | |
2235 | bool invert = rend & RS_RVid; |
2257 | bool invert = rend & RS_RVid; |
2236 | |
2258 | |
2237 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2259 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
… | |
… | |
2321 | |
2343 | |
2322 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2344 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2323 | { |
2345 | { |
2324 | #if ENABLE_FRILLS |
2346 | #if ENABLE_FRILLS |
2325 | if (ISSET_PIXCOLOR (Color_underline)) |
2347 | if (ISSET_PIXCOLOR (Color_underline)) |
2326 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2348 | XSetForeground (xdisp, gc, pix_colors[Color_underline]); |
2327 | else |
2349 | else |
2328 | #endif |
2350 | #endif |
2329 | XSetForeground (display->display, gc, pix_colors[fore]); |
2351 | XSetForeground (xdisp, gc, pix_colors[fore]); |
2330 | |
2352 | |
2331 | XDrawLine (display->display, drawBuffer, gc, |
2353 | XDrawLine (xdisp, drawBuffer, gc, |
2332 | xpixel, ypixel + font->ascent + 1, |
2354 | xpixel, ypixel + font->ascent + 1, |
2333 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2355 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2334 | } |
2356 | } |
2335 | } /* for (col....) */ |
2357 | } /* for (col....) */ |
2336 | } /* for (row....) */ |
2358 | } /* for (row....) */ |
… | |
… | |
2369 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2391 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2370 | cursorwidth++; |
2392 | cursorwidth++; |
2371 | |
2393 | |
2372 | #ifndef NO_CURSORCOLOR |
2394 | #ifndef NO_CURSORCOLOR |
2373 | if (ISSET_PIXCOLOR (Color_cursor)) |
2395 | if (ISSET_PIXCOLOR (Color_cursor)) |
2374 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2396 | XSetForeground (xdisp, gc, pix_colors[Color_cursor]); |
2375 | #endif |
2397 | #endif |
2376 | |
2398 | |
2377 | XDrawRectangle (display->display, drawBuffer, gc, |
2399 | XDrawRectangle (xdisp, drawBuffer, gc, |
2378 | Col2Pixel (col), |
2400 | Col2Pixel (col), |
2379 | Row2Pixel (oldcursor.row), |
2401 | Row2Pixel (oldcursor.row), |
2380 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2402 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2381 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2403 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2382 | } |
2404 | } |
… | |
… | |
2426 | #if XPM_BACKGROUND |
2448 | #if XPM_BACKGROUND |
2427 | && !bgPixmap.pixmap |
2449 | && !bgPixmap.pixmap |
2428 | #endif |
2450 | #endif |
2429 | ) |
2451 | ) |
2430 | { |
2452 | { |
2431 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2453 | XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); |
2432 | XClearWindow (display->display, parent[0]); |
2454 | XClearWindow (xdisp, parent[0]); |
2433 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2455 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
2434 | #if HAVE_SCROLLBARS |
2456 | #if HAVE_SCROLLBARS |
2435 | if (scrollBar.win) |
2457 | if (scrollBar.win) |
2436 | { |
2458 | { |
2437 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2459 | XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); |
2438 | scrollBar.setIdle (); |
2460 | scrollBar.setIdle (); |
2439 | scrollbar_show (0); |
2461 | scrollbar_show (0); |
2440 | } |
2462 | } |
2441 | #endif |
2463 | #endif |
2442 | } |
2464 | } |
… | |
… | |
2455 | |
2477 | |
2456 | num_scr_allow = 0; |
2478 | num_scr_allow = 0; |
2457 | want_refresh = 1; |
2479 | want_refresh = 1; |
2458 | |
2480 | |
2459 | if (really) |
2481 | if (really) |
2460 | XClearWindow (display->display, vt); |
2482 | XClearWindow (xdisp, vt); |
2461 | } |
2483 | } |
2462 | |
2484 | |
2463 | void |
2485 | void |
2464 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2486 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2465 | { |
2487 | { |
… | |
… | |
2640 | } |
2662 | } |
2641 | |
2663 | |
2642 | unsigned long bytes_after; |
2664 | unsigned long bytes_after; |
2643 | XTextProperty ct; |
2665 | XTextProperty ct; |
2644 | |
2666 | |
2645 | if (XGetWindowProperty (display->display, win, prop, |
2667 | if (XGetWindowProperty (xdisp, win, prop, |
2646 | 0, PROP_SIZE / 4, |
2668 | 0, PROP_SIZE / 4, |
2647 | delete_prop, AnyPropertyType, |
2669 | delete_prop, AnyPropertyType, |
2648 | &ct.encoding, &ct.format, |
2670 | &ct.encoding, &ct.format, |
2649 | &ct.nitems, &bytes_after, |
2671 | &ct.nitems, &bytes_after, |
2650 | &ct.value) != Success) |
2672 | &ct.value) != Success) |
… | |
… | |
2659 | if (bytes_after) |
2681 | if (bytes_after) |
2660 | { |
2682 | { |
2661 | // fetch and append remaining data |
2683 | // fetch and append remaining data |
2662 | XTextProperty ct2; |
2684 | XTextProperty ct2; |
2663 | |
2685 | |
2664 | if (XGetWindowProperty (display->display, win, prop, |
2686 | if (XGetWindowProperty (xdisp, win, prop, |
2665 | ct.nitems / 4, (bytes_after + 3) / 4, |
2687 | ct.nitems / 4, (bytes_after + 3) / 4, |
2666 | delete_prop, AnyPropertyType, |
2688 | delete_prop, AnyPropertyType, |
2667 | &ct2.encoding, &ct2.format, |
2689 | &ct2.encoding, &ct2.format, |
2668 | &ct2.nitems, &bytes_after, |
2690 | &ct2.nitems, &bytes_after, |
2669 | &ct2.value) != Success) |
2691 | &ct2.value) != Success) |
… | |
… | |
2682 | |
2704 | |
2683 | if (ct.encoding == xa[XA_INCR]) |
2705 | if (ct.encoding == xa[XA_INCR]) |
2684 | { |
2706 | { |
2685 | // INCR selection, start handshake |
2707 | // INCR selection, start handshake |
2686 | if (!delete_prop) |
2708 | if (!delete_prop) |
2687 | XDeleteProperty (display->display, win, prop); |
2709 | XDeleteProperty (xdisp, win, prop); |
2688 | |
2710 | |
2689 | selection_wait = Sel_incr; |
2711 | selection_wait = Sel_incr; |
2690 | incr_buf_fill = 0; |
2712 | incr_buf_fill = 0; |
2691 | incr_ev.start (NOW + 10); |
2713 | incr_ev.start (NOW + 10); |
2692 | |
2714 | |
… | |
… | |
2753 | paste (s, strlen (s)); |
2775 | paste (s, strlen (s)); |
2754 | free (s); |
2776 | free (s); |
2755 | } |
2777 | } |
2756 | else |
2778 | else |
2757 | #endif |
2779 | #endif |
2758 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2780 | if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 |
2759 | && cl) |
2781 | && cl) |
2760 | { |
2782 | { |
2761 | for (int i = 0; i < cr; i++) |
2783 | for (int i = 0; i < cr; i++) |
2762 | paste (cl[i], strlen (cl[i])); |
2784 | paste (cl[i], strlen (cl[i])); |
2763 | |
2785 | |
… | |
… | |
2804 | * EXT: button 2 release |
2826 | * EXT: button 2 release |
2805 | */ |
2827 | */ |
2806 | void |
2828 | void |
2807 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2829 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2808 | { |
2830 | { |
2809 | /* After making a selection with selection_make this function will always |
2831 | if (selection.text && selnum == Sel_Primary) |
2810 | * return the internal selection, which is not correct IMO, now much more since |
|
|
2811 | * I added the selnum parameter. |
|
|
2812 | */ |
|
|
2813 | #if 0 |
|
|
2814 | if (selection.text) |
|
|
2815 | { /* internal selection */ |
2832 | { /* internal selection */ |
2816 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2833 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2817 | paste (str, strlen (str)); |
2834 | paste (str, strlen (str)); |
2818 | free (str); |
2835 | free (str); |
2819 | return; |
2836 | return; |
2820 | } |
2837 | } |
2821 | else |
2838 | else |
2822 | #endif |
|
|
2823 | { |
2839 | { |
2824 | selection_request_time = tm; |
2840 | selection_request_time = tm; |
2825 | selection_wait = Sel_normal; |
2841 | selection_wait = Sel_normal; |
2826 | |
2842 | |
2827 | #if X_HAVE_UTF8_STRING |
2843 | #if X_HAVE_UTF8_STRING |
… | |
… | |
2851 | else if (selnum == Sel_Secondary) |
2867 | else if (selnum == Sel_Secondary) |
2852 | sel = XA_SECONDARY; |
2868 | sel = XA_SECONDARY; |
2853 | else |
2869 | else |
2854 | sel = xa[XA_CLIPBOARD]; |
2870 | sel = xa[XA_CLIPBOARD]; |
2855 | |
2871 | |
2856 | if (XGetSelectionOwner (display->display, sel) != None) |
2872 | if (XGetSelectionOwner (xdisp, sel) != None) |
2857 | { |
2873 | { |
2858 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2874 | XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], |
2859 | vt, selection_request_time); |
2875 | vt, selection_request_time); |
2860 | return 1; |
2876 | return 1; |
2861 | } |
2877 | } |
2862 | |
2878 | |
2863 | return 0; |
2879 | return 0; |
… | |
… | |
3016 | bool |
3032 | bool |
3017 | rxvt_term::selection_grab (Time tm) NOTHROW |
3033 | rxvt_term::selection_grab (Time tm) NOTHROW |
3018 | { |
3034 | { |
3019 | selection_time = tm; |
3035 | selection_time = tm; |
3020 | |
3036 | |
3021 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3037 | XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); |
3022 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3038 | if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) |
3023 | { |
3039 | { |
3024 | display->set_selection_owner (this); |
3040 | display->set_selection_owner (this); |
3025 | return true; |
3041 | return true; |
3026 | } |
3042 | } |
3027 | else |
3043 | else |
… | |
… | |
3031 | } |
3047 | } |
3032 | |
3048 | |
3033 | #if 0 |
3049 | #if 0 |
3034 | XTextProperty ct; |
3050 | XTextProperty ct; |
3035 | |
3051 | |
3036 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3052 | if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) |
3037 | { |
3053 | { |
3038 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3054 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3039 | XFree (ct.value); |
3055 | XFree (ct.value); |
3040 | } |
3056 | } |
3041 | #endif |
3057 | #endif |
… | |
… | |
3489 | */ |
3505 | */ |
3490 | void |
3506 | void |
3491 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3507 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3492 | { |
3508 | { |
3493 | XSelectionEvent ev; |
3509 | XSelectionEvent ev; |
3494 | dDisp; |
|
|
3495 | |
3510 | |
3496 | ev.type = SelectionNotify; |
3511 | ev.type = SelectionNotify; |
3497 | ev.property = None; |
3512 | ev.property = None; |
3498 | ev.display = rq.display; |
3513 | ev.display = rq.display; |
3499 | ev.requestor = rq.requestor; |
3514 | ev.requestor = rq.requestor; |
… | |
… | |
3513 | *target++ = xa[XA_COMPOUND_TEXT]; |
3528 | *target++ = xa[XA_COMPOUND_TEXT]; |
3514 | #if X_HAVE_UTF8_STRING |
3529 | #if X_HAVE_UTF8_STRING |
3515 | *target++ = xa[XA_UTF8_STRING]; |
3530 | *target++ = xa[XA_UTF8_STRING]; |
3516 | #endif |
3531 | #endif |
3517 | |
3532 | |
3518 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3533 | XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, |
3519 | 32, PropModeReplace, |
3534 | 32, PropModeReplace, |
3520 | (unsigned char *)target_list, target - target_list); |
3535 | (unsigned char *)target_list, target - target_list); |
3521 | ev.property = rq.property; |
3536 | ev.property = rq.property; |
3522 | } |
3537 | } |
3523 | #if TODO // TODO |
3538 | #if TODO // TODO |
… | |
… | |
3526 | /* TODO: Handle MULTIPLE */ |
3541 | /* TODO: Handle MULTIPLE */ |
3527 | } |
3542 | } |
3528 | #endif |
3543 | #endif |
3529 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3544 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3530 | { |
3545 | { |
3531 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3546 | XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, |
3532 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3547 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3533 | ev.property = rq.property; |
3548 | ev.property = rq.property; |
3534 | } |
3549 | } |
3535 | else if (rq.target == XA_STRING |
3550 | else if (rq.target == XA_STRING |
3536 | || rq.target == xa[XA_TEXT] |
3551 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3594 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3609 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3595 | ct.nitems = strlen ((char *)ct.value); |
3610 | ct.nitems = strlen ((char *)ct.value); |
3596 | } |
3611 | } |
3597 | else |
3612 | else |
3598 | #endif |
3613 | #endif |
3599 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3614 | if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3600 | freect = 1; |
3615 | freect = 1; |
3601 | else |
3616 | else |
3602 | { |
3617 | { |
3603 | /* if we failed to convert then send it raw */ |
3618 | /* if we failed to convert then send it raw */ |
3604 | ct.value = (unsigned char *)cl; |
3619 | ct.value = (unsigned char *)cl; |
3605 | ct.nitems = selectlen; |
3620 | ct.nitems = selectlen; |
3606 | ct.encoding = target; |
3621 | ct.encoding = target; |
3607 | } |
3622 | } |
3608 | |
3623 | |
3609 | XChangeProperty (disp, rq.requestor, rq.property, |
3624 | XChangeProperty (xdisp, rq.requestor, rq.property, |
3610 | ct.encoding, 8, PropModeReplace, |
3625 | ct.encoding, 8, PropModeReplace, |
3611 | ct.value, (int)ct.nitems); |
3626 | ct.value, (int)ct.nitems); |
3612 | ev.property = rq.property; |
3627 | ev.property = rq.property; |
3613 | |
3628 | |
3614 | if (freect) |
3629 | if (freect) |
3615 | XFree (ct.value); |
3630 | XFree (ct.value); |
3616 | } |
3631 | } |
3617 | |
3632 | |
3618 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3633 | XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); |
3619 | } |
3634 | } |
3620 | |
3635 | |
3621 | /* ------------------------------------------------------------------------- * |
3636 | /* ------------------------------------------------------------------------- * |
3622 | * MOUSE ROUTINES * |
3637 | * MOUSE ROUTINES * |
3623 | * ------------------------------------------------------------------------- */ |
3638 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3639 | void |
3654 | void |
3640 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3655 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3641 | { |
3656 | { |
3642 | XWindowAttributes xwa; |
3657 | XWindowAttributes xwa; |
3643 | |
3658 | |
3644 | XGetWindowAttributes (display->display, vt, &xwa); |
3659 | XGetWindowAttributes (xdisp, vt, &xwa); |
3645 | |
3660 | |
3646 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3661 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3647 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3662 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3648 | } |
3663 | } |
3649 | #endif |
3664 | #endif |
… | |
… | |
3745 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3760 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3746 | { |
3761 | { |
3747 | while (*s) |
3762 | while (*s) |
3748 | { |
3763 | { |
3749 | text_t t = *s++; |
3764 | text_t t = *s++; |
3750 | int width = wcwidth (t); |
3765 | int width = WCWIDTH (t); |
3751 | |
3766 | |
3752 | while (width--) |
3767 | while (width--) |
3753 | { |
3768 | { |
3754 | scr_overlay_set (x++, y, t); |
3769 | scr_overlay_set (x++, y, t); |
3755 | t = NOCHAR; |
3770 | t = NOCHAR; |