Linux: Refactor X11DesktopHandler

ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
 
 #include <stddef.h>
 #include <stdint.h>
 #include <X11/extensions/shape.h>
@@ skipping 54 matching lines @@
   gfx::Rect GetX11RootWindowBounds() const;
 
   // Returns the current bounds in terms of the X11 Root Window including the
   // borders provided by the window manager (if any).
   gfx::Rect GetX11RootWindowOuterBounds() const;
 
   // Returns the window shape if the window is not rectangular. Returns NULL
   // otherwise.
   ::Region GetWindowShape() const;
 
-  // Called by X11DesktopHandler to notify us that the native windowing system
-  // has changed our activation.
-  void HandleNativeWidgetActivationChanged(bool active);
-
   void AddObserver(views::DesktopWindowTreeHostObserverX11* observer);
   void RemoveObserver(views::DesktopWindowTreeHostObserverX11* observer);
 
   // Swaps the current handler for events in the non client view with |handler|.
   void SwapNonClientEventHandler(std::unique_ptr<ui::EventHandler> handler);
 
   // Runs the |func| callback for each content-window, and deallocates the
   // internal list of open windows.
   static void CleanUpWindowList(void (*func)(aura::Window* window));
 
@@ skipping 90 matching lines @@
   // window size to the monitor size causes the WM to set the EWMH for
   // fullscreen.
   gfx::Size AdjustSize(const gfx::Size& requested_size);
 
   // Called when |xwindow_|'s _NET_WM_STATE property is updated.
   void OnWMStateUpdated();
 
   // Called when |xwindow_|'s _NET_FRAME_EXTENTS property is updated.
   void OnFrameExtentsUpdated();
 
+  // Record the activation state.
+  void BeforeActivationStateChanged();
+
+  // Handle the state change since BeforeActivationStateChanged().
+  void AfterActivationStateChanged();
+
   // Makes a round trip to the X server to get the enclosing workspace for this
   // window.  Returns true iff |workspace_| was changed.
   bool UpdateWorkspace();
 
   // Updates |xwindow_|'s minimum and maximum size.
   void UpdateMinAndMaxSize();
 
   // Updates |xwindow_|'s _NET_WM_USER_TIME if |xwindow_| is active.
   void UpdateWMUserTime(const ui::PlatformEvent& event);
 
+  // Gets the last seen server timestamp.  Avoids returning CurrentTime.
+  Time GetTimestamp();
+
   // Sends a message to the x11 window manager, enabling or disabling the
   // states |state1| and |state2|.
   void SetWMSpecState(bool enabled, ::Atom state1, ::Atom state2);
 
   // Checks if the window manager has set a specific state.
   bool HasWMSpecProperty(const char* property) const;
 
   // Sets whether the window's borders are provided by the window manager.
   void SetUseNativeFrame(bool use_native_frame);
 
@@ skipping 142 matching lines @@
   base::string16 window_title_;
 
   // Whether we currently are flashing our frame. This feature is implemented
   // by setting the urgency hint with the window manager, which can draw
   // attention to the window or completely ignore the hint. We stop flashing
   // the frame when |xwindow_| gains focus or handles a mouse button event.
   bool urgency_hint_set_;
 
   bool activatable_;
 
+  // The focus-tracking state variables are as described in
+  // gtk/docs/focus_tracking.txt
+
+  // Is the pointer in |xwindow_| or one of its children?
+  bool has_pointer_;
+
+  // Does |xwindow_| have the pointer grab?  This does not necissarily indicate

[danakj, 2016/08/11 21:48:20]

typo

[Tom (Use chromium acct), 2016/08/15 18:42:46]

Done.

+  // |xwindow_| has the keyboard grab.
+  bool has_pointer_grab_;
+
+  // (An ancestor window is focused) && |has_pointer_|
+  bool has_pointer_focus_;
+
+  // Is |xwindow_| or one of its children focused?
+  // |has_window_focus_| and |has_pointer_focus_| are mutually exclusive.

[danakj, 2016/08/11 21:48:20]

nit: don't line wrap for every sentence

[Tom (Use chromium acct), 2016/08/15 18:42:46]

Done.

+  // |xwindow_| will receive in put iff:

[danakj, 2016/08/11 21:48:20]

input

[Tom (Use chromium acct), 2016/08/15 18:42:46]

Done.

+  // |has_window_focus_| || |has_pointer_grab_| || |has_pointer_focus_|

[danakj, 2016/08/11 21:48:20]

nit: indent this a bit will read easier

[Tom (Use chromium acct), 2016/08/15 18:42:46]

Done.

+  bool has_window_focus_;
+
+  // X11 does not support deactivating windows; you can only activate a
+  // different window.  If we would like to be deactivated, we just ignore
+  // input we no longer care about.
+  bool ignore_input_;
+
+  // Used for tracking activation state in {Before|After}ActivationStateChanged.
+  bool was_active_;
+  bool had_pointer_grab_;
+  bool had_window_focus_;
+
   base::CancelableCallback<void()> delayed_resize_task_;
 
   base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_