[vlc-commits] XCB/window: remove the Matchbox hack

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May 28 09:16:16 2011 +0300| [19cc555ef738ee7de0fdf48b926b0e32517216d3] | committer: Rémi Denis-Courmont

XCB/window: remove the Matchbox hack

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=19cc555ef738ee7de0fdf48b926b0e32517216d3
---

 modules/video_output/xcb/window.c |   57 +------------------------------------
 1 files changed, 1 insertions(+), 56 deletions(-)

diff --git a/modules/video_output/xcb/window.c b/modules/video_output/xcb/window.c
index 3fee99d..4f8cbcc 100644
--- a/modules/video_output/xcb/window.c
+++ b/modules/video_output/xcb/window.c
@@ -90,8 +90,6 @@ vlc_module_end ()
 static int Control (vout_window_t *, int, va_list ap);
 static void *Thread (void *);
 
-#define MATCHBOX_HACK 1 /* Matchbox focus hack */
-
 struct vout_window_sys_t
 {
     xcb_connection_t *conn;
@@ -103,9 +101,6 @@ struct vout_window_sys_t
     xcb_atom_t wm_state_above;
     xcb_atom_t wm_state_below;
     xcb_atom_t wm_state_fullscreen;
-#ifdef MATCHBOX_HACK
-    xcb_atom_t mb_current_app_window;
-#endif
 
     bool embedded;
 };
@@ -195,20 +190,11 @@ static void CacheAtoms (vout_window_sys_t *p_sys)
     wm_state_above_ck = intern_string (conn, "_NET_WM_STATE_ABOVE");
     wm_state_below_ck = intern_string (conn, "_NET_WM_STATE_BELOW");
     wm_state_fs_ck = intern_string (conn, "_NET_WM_STATE_FULLSCREEN");
-#ifdef MATCHBOX_HACK
-    xcb_intern_atom_cookie_t mb_current_app_window;
-    mb_current_app_window = xcb_intern_atom (conn, true,
-                                             strlen ("_MB_CURRENT_APP_WINDOW"),
-                                             "_MB_CURRENT_APP_WINDOW");
-#endif
 
     p_sys->wm_state = get_atom (conn, wm_state_ck);
     p_sys->wm_state_above = get_atom (conn, wm_state_above_ck);
     p_sys->wm_state_below = get_atom (conn, wm_state_below_ck);
     p_sys->wm_state_fullscreen = get_atom (conn, wm_state_fs_ck);
-#ifdef MATCHBOX_HACK
-    p_sys->mb_current_app_window = get_atom (conn, mb_current_app_window);
-#endif
 }
 
 /**
@@ -334,14 +320,6 @@ static int Open (vout_window_t *wnd, const vout_window_cfg_t *cfg)
 
     /* Cache any EWMH atom we may need later */
     CacheAtoms (p_sys);
-#ifdef MATCHBOX_HACK
-    if (p_sys->mb_current_app_window)
-    {
-        uint32_t value = XCB_EVENT_MASK_PROPERTY_CHANGE;
-        xcb_change_window_attributes (conn, scr->root,
-                                      XCB_CW_EVENT_MASK, &value);
-    }
-#endif
 
     /* Make the window visible */
     xcb_map_window (conn, window);
@@ -358,11 +336,6 @@ static int Open (vout_window_t *wnd, const vout_window_cfg_t *cfg)
      && vlc_clone (&p_sys->thread, Thread, wnd, VLC_THREAD_PRIORITY_LOW))
         DestroyKeyHandler (p_sys->keys);
 
-#ifdef MATCHBOX_HACK
-    if (p_sys->mb_current_app_window)
-        xcb_set_input_focus (p_sys->conn, XCB_INPUT_FOCUS_POINTER_ROOT,
-                             wnd->handle.xid, XCB_CURRENT_TIME);
-#endif
     xcb_flush (conn); /* Make sure map_window is sent (should be useless) */
     return VLC_SUCCESS;
 
@@ -417,35 +390,7 @@ static void *Thread (void *data)
         {
             if (ProcessKeyEvent (p_sys->keys, ev) == 0)
                 continue;
-#ifdef MATCHBOX_HACK
-            if (p_sys->mb_current_app_window
-             && (ev->response_type & 0x7f) == XCB_PROPERTY_NOTIFY)
-            {
-                const xcb_property_notify_event_t *pne =
-                    (xcb_property_notify_event_t *)ev;
-                if (pne->atom == p_sys->mb_current_app_window
-                 && pne->state == XCB_PROPERTY_NEW_VALUE)
-                {
-                    xcb_get_property_reply_t *r =
-                        xcb_get_property_reply (conn,
-                            xcb_get_property (conn, 0, pne->window, pne->atom,
-                                              XA_WINDOW, 0, 4), NULL);
-                    if (r != NULL
-                     && !memcmp (xcb_get_property_value (r), &wnd->handle.xid,
-                                 4))
-                    {
-                        msg_Dbg (wnd, "asking Matchbox for input focus");
-                        xcb_set_input_focus (conn,
-                                             XCB_INPUT_FOCUS_POINTER_ROOT,
-                                             wnd->handle.xid, pne->time);
-                        xcb_flush (conn);
-                    }
-                    free (r);
-                }
-            }
-            else
-#endif
-                msg_Dbg (wnd, "unhandled event: %"PRIu8, ev->response_type);
+            msg_Dbg (wnd, "unhandled event: %"PRIu8, ev->response_type);
             free (ev);
         }
         vlc_restorecancel (canc);