| … | |
… | |
| 105 | if (cc->c2 == c2) return c1; |
105 | if (cc->c2 == c2) return c1; |
| 106 | cc = (*this)[cc->c1]; |
106 | cc = (*this)[cc->c1]; |
| 107 | } |
107 | } |
| 108 | |
108 | |
| 109 | // check to see whether this combination already exists otherwise |
109 | // check to see whether this combination already exists otherwise |
| 110 | for (cc = v.end (); cc-- > v.begin (); ) |
110 | for (cc = v.begin (); cc < v.end (); cc++) |
| 111 | if (cc->c1 == c1 && cc->c2 == c2) |
111 | if (cc->c1 == c1 && cc->c2 == c2) |
| 112 | return COMPOSE_LO + (cc - v.begin ()); |
112 | return COMPOSE_LO + (cc - v.begin ()); |
| 113 | |
113 | |
| 114 | // allocate a new combination |
114 | // allocate a new combination |
| 115 | if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) |
115 | if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) |
| … | |
… | |
| 267 | for (int i = 0; i < allocated.size (); i++) |
267 | for (int i = 0; i < allocated.size (); i++) |
| 268 | free (allocated [i]); |
268 | free (allocated [i]); |
| 269 | |
269 | |
| 270 | free (selection.text); |
270 | free (selection.text); |
| 271 | free (selection.clip_text); |
271 | free (selection.clip_text); |
| 272 | // TODO: manage env vars in child only(!) |
|
|
| 273 | free (env_display); |
|
|
| 274 | free (env_term); |
|
|
| 275 | free (locale); |
272 | free (locale); |
| 276 | free (v_buffer); |
273 | free (v_buffer); |
| 277 | |
274 | |
| 278 | delete selection_req; |
275 | delete selection_req; |
| 279 | |
276 | |
| … | |
… | |
| 706 | if (recalc_y) |
703 | if (recalc_y) |
| 707 | szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; |
704 | szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; |
| 708 | |
705 | |
| 709 | ncol = width / fwidth; |
706 | ncol = width / fwidth; |
| 710 | nrow = height / fheight; |
707 | nrow = height / fheight; |
|
|
708 | |
|
|
709 | // When the size of the vt window is not a multiple of the cell |
|
|
710 | // size, i.e., when the wm does not honour our size hints, there are |
|
|
711 | // extra areas not covered by the terminal screen. Such gaps, when a |
|
|
712 | // bg pixmap is set, would have to be cleared manually to properly |
|
|
713 | // refresh the background. We take the simpler route and shrink the |
|
|
714 | // vt window so as to avoid creating gaps. |
|
|
715 | width = ncol * fwidth; |
|
|
716 | height = nrow * fheight; |
| 711 | } |
717 | } |
| 712 | |
718 | |
| 713 | /*----------------------------------------------------------------------*/ |
719 | /*----------------------------------------------------------------------*/ |
| 714 | /* |
720 | /* |
| 715 | * Tell the teletype handler what size the window is. |
721 | * Tell the teletype handler what size the window is. |
| … | |
… | |
| 1650 | if (update_background_ev.is_active ()) |
1656 | if (update_background_ev.is_active ()) |
| 1651 | return; |
1657 | return; |
| 1652 | |
1658 | |
| 1653 | bg_invalidate (); |
1659 | bg_invalidate (); |
| 1654 | |
1660 | |
|
|
1661 | if (!mapped) |
|
|
1662 | return; |
|
|
1663 | |
| 1655 | ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); |
1664 | ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); |
| 1656 | |
1665 | |
| 1657 | if (to_wait <= 0.) |
1666 | if (to_wait <= 0.) |
| 1658 | bg_render (); |
1667 | bg_render (); |
| 1659 | else |
1668 | else |
