Replace :win with :box and allow for (w . h) box
image-display.el (from scratch rewrite of image-mode.el)