Use win_t member in img_t & tns_t instead of parameters

1 files changed, 19 insertions, 17 deletions

diff --git a/image.h b/image.h
index 316729a..0d53c9c 100644
--- a/image.h
+++ b/image.h
@@ -39,10 +39,15 @@ typedef struct {
 
 typedef struct {
 	Imlib_Image *im;
-	multi_img_t multi;
+	int w;
+	int h;
+
+	win_t *win;
+	int x;
+	int y;
 
-	float zoom;
 	scalemode_t scalemode;
+	float zoom;
 
 	bool re;
 	bool checkpan;
@@ -53,10 +58,7 @@ typedef struct {
 	bool slideshow;
 	int ss_delay; /* in ms */
 
-	int x;
-	int y;
-	int w;
-	int h;
+	multi_img_t multi;
 } img_t;
 
 void img_init(img_t*, win_t*);
@@ -64,21 +66,21 @@ void img_init(img_t*, win_t*);
 bool img_load(img_t*, const fileinfo_t*);
 void img_close(img_t*, bool);
 
-void img_render(img_t*, win_t*);
+void img_render(img_t*);
 
-bool img_fit_win(img_t*, win_t*);
-bool img_center(img_t*, win_t*);
+bool img_fit_win(img_t*);
+bool img_center(img_t*);
 
-bool img_zoom(img_t*, win_t*, float);
-bool img_zoom_in(img_t*, win_t*);
-bool img_zoom_out(img_t*, win_t*);
+bool img_zoom(img_t*, float);
+bool img_zoom_in(img_t*);
+bool img_zoom_out(img_t*);
 
-bool img_move(img_t*, win_t*, int, int);
-bool img_pan(img_t*, win_t*, direction_t, bool);
-bool img_pan_edge(img_t*, win_t*, direction_t);
+bool img_move(img_t*, int, int);
+bool img_pan(img_t*, direction_t, bool);
+bool img_pan_edge(img_t*, direction_t);
 
-void img_rotate_left(img_t*, win_t*);
-void img_rotate_right(img_t*, win_t*);
+void img_rotate_left(img_t*);
+void img_rotate_right(img_t*);
 
 void img_toggle_antialias(img_t*);