Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1104)

Unified Diff: ui/wayland/wayland_display.h

Issue 7457023: Adding a Wayland basic toolkit (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: removed unused flag Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/wayland/wayland_display.h
diff --git a/ui/wayland/wayland_display.h b/ui/wayland/wayland_display.h
new file mode 100644
index 0000000000000000000000000000000000000000..d826f9391520283c3df953b283cbdcf922bb6b03
--- /dev/null
+++ b/ui/wayland/wayland_display.h
@@ -0,0 +1,91 @@
+// Copyright (c) 2011 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_WAYLAND_WAYLAND_DISPLAY_H_
+#define UI_WAYLAND_WAYLAND_DISPLAY_H_
+
+#include <list>
+#include <stdint.h>
+
+#include "base/basictypes.h"
+
+class WaylandBuffer;
+class WaylandInputDevice;
+class WaylandScreen;
+
+struct wl_compositor;
+struct wl_display;
+struct wl_shell;
+struct wl_shm;
+struct wl_surface;
+struct wl_visual;
+
+// WaylandDisplay is a wrapper around wl_display. Once we get a valid
+// wl_display, the Wayland server will send different events to register
+// the Wayland compositor, shell, visuals, screens, input devices, ...
+class WaylandDisplay {
+ public:
+ // Attempt to create a connection to the display. If it fails this returns
+ // NULL
+ static WaylandDisplay* Connect(char* name);
+ // Get the WaylandDisplay associated with the native Wayland display
+ static WaylandDisplay* GetDisplay(wl_display* display);
+
+ ~WaylandDisplay();
+
+ // Creates a wayland surface. This is used to create a window surface.
+ // The returned pointer should be deleted by the caller.
+ wl_surface* CreateSurface();
+ // Sets the specified buffer as the surface for the cursor. (x, y) is
+ // the hotspot for the cursor.
+ void SetCursor(WaylandBuffer* buffer, int32_t x, int32_t y);
+
+ // Returns a pointer to the wl_display.
+ wl_display* GetNativeDisplay() const;
+ // Returns a list of the registered screens.
+ std::list<WaylandScreen*> GetScreenList() const;
+ wl_shell* GetShell() const;
tfarina 2011/07/22 23:06:45 add blank lines between those methods.
+ wl_shm* GetShm() const;
+ wl_visual* GetVisual() const;
+ private:
tfarina 2011/07/22 23:06:45 add a blank line above to separate public and priv
+ WaylandDisplay(char* name);
+
+ // WaylandDisplay manages the memory of all these pointers.
+ wl_display* display_;
tfarina 2011/07/22 23:06:45 member variables should be at the end of the priva
+ wl_compositor* compositor_;
+ wl_shell* shell_;
+ wl_shm* shm_;
+ wl_visual* visual_;
+ std::list<WaylandScreen*> screen_list_;
+ std::list<WaylandInputDevice*> input_list_;
+
+ // This handler resolves all server events used in initialization. It also
+ // handles input device registration, screen registration.
+ static void DisplayHandleGlobal(wl_display* display,
+ uint32_t id,
+ const char* interface,
+ uint32_t version,
+ void* data);
+ // Used by the compositor initialization to register the different visuals.
+ static void CompositorHandleVisual(void* data,
+ wl_compositor* compositor,
+ uint32_t id,
+ uint32_t token);
+ // Used when the shell requires configuration. This is called when a
+ // window is configured and receives its size.
+ // TODO(dnicoara) Need to look if there is one shell per window. Then it
+ // makes more sense to move this into the WaylandWindow and it would keep
+ // track of the shell.
+ static void ShellHandleConfigure(void* data,
+ wl_shell* shell,
+ uint32_t time,
+ uint32_t edges,
+ wl_surface* surface,
+ int32_t width,
+ int32_t height);
+
+ DISALLOW_COPY_AND_ASSIGN(WaylandDisplay);
+};
+
+#endif // UI_WAYLAND_WAYLAND_DISPLAY_H_

Powered by Google App Engine
This is Rietveld 408576698