summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-02 20:48:45 +0100
committerwm4 <wm4@nowhere>2014-11-02 20:55:07 +0100
commit416c86f3cb3535a5b252b8c08a7f4cb253fa495a (patch)
treee4124d52d879ee55ceca6896da16ebf832f49129 /video
parent4e2574f025b9f143140008cbed48f6ee9705f813 (diff)
downloadmpv-416c86f3cb3535a5b252b8c08a7f4cb253fa495a.tar.bz2
mpv-416c86f3cb3535a5b252b8c08a7f4cb253fa495a.tar.xz
command: add window-minimized property (X11 only)
More or less requested by #1237. Should be simple to extend this to other backends.
Diffstat (limited to 'video')
-rw-r--r--video/out/vo.h9
-rw-r--r--video/out/x11_common.c19
-rw-r--r--video/out/x11_common.h1
3 files changed, 28 insertions, 1 deletions
diff --git a/video/out/vo.h b/video/out/vo.h
index 035b4dc1d6..6906cab222 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -36,9 +36,11 @@
#define VO_EVENT_RESIZE 2
// The ICC profile needs to be reloaded
#define VO_EVENT_ICC_PROFILE_PATH_CHANGED 4
+// Some other window state changed
+#define VO_EVENT_WIN_STATE 8
// Set of events the player core may be interested in.
-#define VO_EVENTS_USER (VO_EVENT_RESIZE)
+#define VO_EVENTS_USER (VO_EVENT_RESIZE | VO_EVENT_WIN_STATE)
enum mp_voctrl {
/* signal a device reset seek */
@@ -83,6 +85,8 @@ enum mp_voctrl {
VOCTRL_GET_UNFS_WINDOW_SIZE, // int[2] (w/h)
VOCTRL_SET_UNFS_WINDOW_SIZE, // int[2] (w/h)
+ VOCTRL_GET_WIN_STATE, // int* (VO_WIN_STATE_* flags)
+
// The VO is supposed to set "known" fields, and leave the others
// untouched or set to 0.
// imgfmt/w/h/d_w/d_h can be omitted for convenience.
@@ -130,6 +134,9 @@ struct voctrl_screenshot_args {
bool has_osd;
};
+// VOCTRL_GET_WIN_STATE
+#define VO_WIN_STATE_MINIMIZED 1
+
#define VO_TRUE true
#define VO_FALSE false
#define VO_ERROR -1
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 04f475ec5f..1779c5c29e 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -952,6 +952,8 @@ int vo_x11_check_events(struct vo *vo)
MP_VERBOSE(x11, "not waiting for MapNotify\n");
x11->pseudo_mapped = true;
}
+ } else if (Event.xproperty.atom == x11->atom_wm_state) {
+ x11->pending_vo_events |= VO_EVENT_WIN_STATE;
}
break;
default:
@@ -1229,6 +1231,7 @@ static void vo_x11_create_window(struct vo *vo, XVisualInfo *vis,
}
x11->atom_frame_exts = XA(x11, _NET_FRAME_EXTENTS);
+ x11->atom_wm_state = XA(x11, _NET_WM_STATE);
}
static void vo_x11_map_window(struct vo *vo, struct mp_rect rc)
@@ -1584,6 +1587,22 @@ int vo_x11_control(struct vo *vo, int *events, int request, void *arg)
}
return VO_TRUE;
}
+ case VOCTRL_GET_WIN_STATE: {
+ if (!x11->window)
+ return VO_FALSE;
+ int num_elems;
+ long *elems = x11_get_property(x11, x11->window, x11->atom_wm_state,
+ XA_ATOM, 32, &num_elems);
+ if (elems) {
+ Atom hidden = XA(x11, _NET_WM_STATE_HIDDEN);
+ for (int n = 0; n < num_elems; n++) {
+ if (elems[n] == hidden)
+ *(int *)arg |= VO_WIN_STATE_MINIMIZED;
+ }
+ XFree(elems);
+ }
+ return VO_TRUE;
+ }
case VOCTRL_SET_CURSOR_VISIBILITY:
vo_set_cursor_hidden(vo, !(*(bool *)arg));
return VO_TRUE;
diff --git a/video/out/x11_common.h b/video/out/x11_common.h
index 696e73aff3..d5927933c3 100644
--- a/video/out/x11_common.h
+++ b/video/out/x11_common.h
@@ -108,6 +108,7 @@ struct vo_x11_state {
Window dnd_src_window;
Atom atom_frame_exts;
+ Atom atom_wm_state;
/* dragging the window */
bool win_drag_button1_down;