x11: replace x/y/w/h with mp_rect

1 files changed, 3 insertions, 10 deletions

diff --git a/video/out/x11_common.h b/video/out/x11_common.h
index 6a0d59a667..b2264563c7 100644
--- a/video/out/x11_common.h
+++ b/video/out/x11_common.h
@@ -60,26 +60,19 @@ struct vo_x11_state {
     int orig_layer;
 
     // Current actual window position (updated on window move/resize events).
-    int win_x;
-    int win_y;
-    unsigned int win_width;
-    unsigned int win_height;
+    struct mp_rect winrc;
 
     int pending_vo_events;
 
     // last non-fullscreen extends (updated on fullscreen or reinitialization)
-    int nofs_width;
-    int nofs_height;
-    int nofs_x;
-    int nofs_y;
+    struct mp_rect nofsrc;
 
     /* Keep track of original video width/height to determine when to
      * resize window when reconfiguring. Resize window when video size
      * changes, but don't force window size changes as long as video size
      * stays the same (even if that size is different from the current
      * window size after the user modified the latter). */
-    int old_dwidth;
-    int old_dheight;
+    int old_dw, old_dh;
     /* Video size changed during fullscreen when we couldn't tell the new
      * size to the window manager. Must set window size when turning
      * fullscreen off. */