Add capture_mouse event and separate select/match controls