cleanup x11 keyboard handling some more