add a direct path for draw_mask

and get draw_circle ready for draw-along-circle