draw: clean up draw.h interface