Refactor the hook_callback for x11 to try and make it easier to work on.  A bit more massaging is needed.
Fixed small conflict.
Merge branch 'munsuri' of github.com:kwhat/libuiohook into munsuri

Conflicts:
	src/x11/hook_callback.c