Merge #1255

1255: Drop unused atoms r=AlanGriffiths a=wmww These are atoms we're not using and won't need in the immediate future. We can always add them back as we need them. Co-authored-by: William Wold <[email protected]>
canonical · Feb 7, 2020 · 5ab2f33 · 5ab2f33
2 parents e60acb6 + d297291
commit 5ab2f33
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 52 deletions.
diff --git a/src/server/frontend_xwayland/xcb_connection.cpp b/src/server/frontend_xwayland/xcb_connection.cpp
@@ -53,18 +53,14 @@ auto mf::XCBConnection::Atom::name() const -> std::string
 mf::XCBConnection::XCBConnection(int fd)
     : xcb_connection{xcb_connect_to_fd(fd, nullptr)},
       wm_protocols{"WM_PROTOCOLS", this},
-      wm_normal_hints{"WM_NORMAL_HINTS", this},
       wm_take_focus{"WM_TAKE_FOCUS", this},
       wm_delete_window{"WM_DELETE_WINDOW", this},
       wm_state{"WM_STATE", this},
       wm_change_state{"WM_CHANGE_STATE", this},
       wm_s0{"WM_S0", this},
-      wm_client_machine{"WM_CLIENT_MACHINE", this},
-      wm_transient_for{"WM_TRANSIENT_FOR", this},
       net_wm_cm_s0{"_NET_WM_CM_S0", this},
       net_wm_name{"_NET_WM_NAME", this},
       net_wm_pid{"_NET_WM_PID", this},
-      net_wm_icon{"_NET_WM_ICON", this},
       net_wm_state{"_NET_WM_STATE", this},
       net_wm_state_maximized_vert{"_NET_WM_STATE_MAXIMIZED_VERT", this},
       net_wm_state_maximized_horz{"_NET_WM_STATE_MAXIMIZED_HORZ", this},
@@ -95,29 +91,8 @@ mf::XCBConnection::XCBConnection(int fd)
       motif_wm_hints{"_MOTIF_WM_HINTS", this},
       clipboard{"CLIPBOARD", this},
       clipboard_manager{"CLIPBOARD_MANAGER", this},
-      targets{"TARGETS", this},
       utf8_string{"UTF8_STRING", this},
-      wl_selection{"_WL_SELECTION", this},
-      incr{"INCR", this},
-      timestamp{"TIMESTAMP", this},
-      multiple{"MULTIPLE", this},
-      compound_text{"COMPOUND_TEXT", this},
-      text{"TEXT", this},
-      string{"STRING", this},
-      window{"WINDOW", this},
-      text_plain_utf8{"text/plain;charset=utf-8", this},
-      text_plain{"text/plain", this},
-      xdnd_selection{"XdndSelection", this},
-      xdnd_aware{"XdndAware", this},
-      xdnd_enter{"XdndEnter", this},
-      xdnd_leave{"XdndLeave", this},
-      xdnd_drop{"XdndDrop", this},
-      xdnd_status{"XdndStatus", this},
-      xdnd_finished{"XdndFinished", this},
-      xdnd_type_list{"XdndTypeList", this},
-      xdnd_action_copy{"XdndActionCopy", this},
-      wl_surface_id{"WL_SURFACE_ID", this},
-      allow_commits{"_XWAYLAND_ALLOW_COMMITS", this}
+      wl_surface_id{"WL_SURFACE_ID", this}
 {
 }
 

diff --git a/src/server/frontend_xwayland/xcb_connection.h b/src/server/frontend_xwayland/xcb_connection.h
@@ -163,18 +163,14 @@ class XCBConnection
     }
 
     Atom const wm_protocols;
-    Atom const wm_normal_hints;
     Atom const wm_take_focus;
     Atom const wm_delete_window;
     Atom const wm_state;
     Atom const wm_change_state;
     Atom const wm_s0;
-    Atom const wm_client_machine;
-    Atom const wm_transient_for;
     Atom const net_wm_cm_s0;
     Atom const net_wm_name;
     Atom const net_wm_pid;
-    Atom const net_wm_icon;
     Atom const net_wm_state;
     Atom const net_wm_state_maximized_vert;
     Atom const net_wm_state_maximized_horz;
@@ -205,29 +201,8 @@ class XCBConnection
     Atom const motif_wm_hints;
     Atom const clipboard;
     Atom const clipboard_manager;
-    Atom const targets;
     Atom const utf8_string;
-    Atom const wl_selection;
-    Atom const incr;
-    Atom const timestamp;
-    Atom const multiple;
-    Atom const compound_text;
-    Atom const text;
-    Atom const string;
-    Atom const window;
-    Atom const text_plain_utf8;
-    Atom const text_plain;
-    Atom const xdnd_selection;
-    Atom const xdnd_aware;
-    Atom const xdnd_enter;
-    Atom const xdnd_leave;
-    Atom const xdnd_drop;
-    Atom const xdnd_status;
-    Atom const xdnd_finished;
-    Atom const xdnd_type_list;
-    Atom const xdnd_action_copy;
     Atom const wl_surface_id;
-    Atom const allow_commits;
 
 private:
     XCBConnection(XCBConnection&) = delete;

diff --git a/src/server/frontend_xwayland/xwayland_surface.cpp b/src/server/frontend_xwayland/xwayland_surface.cpp
@@ -157,7 +157,7 @@ mf::XWaylandSurface::XWaylandSurface(
           property_handler<xcb_window_t>(
               connection,
               window,
-              connection->wm_transient_for,
+              XCB_ATOM_WM_TRANSIENT_FOR,
               [this](xcb_window_t value)
               {
                   std::shared_ptr<scene::Surface> parent_scene_surface; // May remain nullptr