I've attached a patch that seems to work for single clicks. I had to move Fx_popup_menu's implementation outside of DEFUN so I could use used_mouse_menu in it. What do you think?