x11_common: implement --show-in-taskbar option

This adds a new option --show-in-taskbar, which controls whether mpv appears in taskbars. This is useful for picture-in-picture setups where the video window should not appear in taskbars. On X11, this can be controled by setting the _NET_WM_STATE_SKIP_TASKBAR window state.

nanahi committed 2 years ago

Commit dcd10341 parent 3a92d7b3 files · +21 −0Browse files

Unified · Split

3 files

options/options.c +2 −0
options/options.h +1 −0
video/out/x11_common.c +18 −0

options/options.c+2−0

     {"keepaspect-window", OPT_BOOL(keepaspect_window)},
     {"hidpi-window-scale", OPT_BOOL(hidpi_window_scale)},
     {"native-fs", OPT_BOOL(native_fs)},
+    {"show-in-taskbar", OPT_BOOL(show_in_taskbar)},
     {"display-fps-override", OPT_DOUBLE(display_fps_override),
         M_RANGE(0, DBL_MAX)},
     {"video-timing-offset", OPT_DOUBLE(timing_offset), M_RANGE(0.0, 1.0)},
         .keepaspect_window = true,
         .native_fs = true,
         .taskbar_progress = true,
+        .show_in_taskbar = true,
         .border = true,
         .title_bar = true,
         .appid = "mpv",

options/options.h+1−0

@@ -56,6 +56,7 @@ typedef struct mp_vo_opts { · 55 unmodified lines
56	bool keepaspect_window;	56	bool keepaspect_window;
57	bool hidpi_window_scale;	57	bool hidpi_window_scale;
58	bool native_fs;	58	bool native_fs;
		59	bool show_in_taskbar;
59		60
60	int64_t WinID;	61	int64_t WinID;
61		62

video/out/x11_common.c+18−0

 static void vo_x11_selectinput_witherr(struct vo *vo, Display *display,
                                        Window w, long event_mask);
 static void vo_x11_setlayer(struct vo *vo, bool ontop);
+static void vo_x11_set_in_taskbar(struct vo *vo, bool in);
 static void vo_x11_xembed_handle_message(struct vo *vo, XClientMessageEvent *ce);
 static void vo_x11_xembed_send_message(struct vo_x11_state *x11, long m[4]);
 static void vo_x11_move_resize(struct vo *vo, bool move, bool resize,
     if (opts->ontop)
         vo_x11_setlayer(vo, opts->ontop);
+    if (!opts->show_in_taskbar)
+        vo_x11_set_in_taskbar(vo, opts->show_in_taskbar);
     vo_x11_fullscreen(vo);
     }
 }
+static void vo_x11_set_in_taskbar(struct vo *vo, bool in)
+{
+    struct vo_x11_state *x11 = vo->x11;
+    if (x11->parent || !x11->window)
+        return;
+    if (x11->wm_type & (vo_wm_SKIP_TASKBAR)) {
+        char *state = "_NET_WM_STATE_SKIP_TASKBAR";
+        x11_set_ewmh_state(x11, state, !in);
+        MP_VERBOSE(x11, "NET style set skip taskbar (%d).\n", !in);
+    }
+}
 static bool rc_overlaps(struct mp_rect rc1, struct mp_rect rc2)
 {
     return mp_rect_intersection(&rc1, &rc2); // changes the first argument
                 vo_x11_fullscreen(vo);
             if (opt == &opts->ontop)
                 vo_x11_setlayer(vo, opts->ontop);
+            if (opt == &opts->show_in_taskbar)
+                vo_x11_set_in_taskbar(vo, opts->show_in_taskbar);
             if (opt == &opts->border || opt == &opts->title_bar)
                 vo_x11_decoration(vo, opts->border, opts->title_bar);
             if (opt == &opts->all_workspaces)

x11_common: implement --show-in-taskbar option

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code