- switch x11drvdlg to kernel_style, and clean up some superflous code