devilhorns pushed a commit to branch devs/devilhorns/wayland.
commit 558bc4cace69ceac731df3d41e75ef2cb1421cf0
Author: Chris Michael <[email protected]>
Date: Thu Mar 7 12:06:50 2013 +0000
Add new desktop_shell protocol header and code with proper naming.
Signed-off-by: Chris Michael <[email protected]>
---
src/modules/wl_shell/e_desktop_shell_protocol.c | 12 +++---
src/modules/wl_shell/e_desktop_shell_protocol.h | 56 ++++++++++++-------------
2 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/modules/wl_shell/e_desktop_shell_protocol.c
b/src/modules/wl_shell/e_desktop_shell_protocol.c
index ae531cf..98d56a1 100644
--- a/src/modules/wl_shell/e_desktop_shell_protocol.c
+++ b/src/modules/wl_shell/e_desktop_shell_protocol.c
@@ -28,7 +28,7 @@ static const struct wl_interface *types[] = {
&wl_output_interface,
};
-static const struct wl_message desktop_shell_requests[] = {
+static const struct wl_message e_desktop_shell_requests[] = {
{ "set_background", "oo", types + 1 },
{ "set_panel", "oo", types + 3 },
{ "set_lock_surface", "o", types + 5 },
@@ -36,16 +36,16 @@ static const struct wl_message desktop_shell_requests[] = {
{ "set_grab_surface", "o", types + 6 },
};
-static const struct wl_message desktop_shell_events[] = {
+static const struct wl_message e_desktop_shell_events[] = {
{ "configure", "uoii", types + 7 },
{ "prepare_lock_surface", "", types + 0 },
{ "grab_cursor", "u", types + 0 },
};
-WL_EXPORT const struct wl_interface desktop_shell_interface = {
- "desktop_shell", 1,
- 5, desktop_shell_requests,
- 3, desktop_shell_events,
+WL_EXPORT const struct wl_interface e_desktop_shell_interface = {
+ "e_desktop_shell", 1,
+ 5, e_desktop_shell_requests,
+ 3, e_desktop_shell_events,
};
static const struct wl_message screensaver_requests[] = {
diff --git a/src/modules/wl_shell/e_desktop_shell_protocol.h
b/src/modules/wl_shell/e_desktop_shell_protocol.h
index e42f75d..809b941 100644
--- a/src/modules/wl_shell/e_desktop_shell_protocol.h
+++ b/src/modules/wl_shell/e_desktop_shell_protocol.h
@@ -12,31 +12,31 @@ extern "C" {
struct wl_client;
struct wl_resource;
-struct desktop_shell;
+struct e_desktop_shell;
struct screensaver;
-extern const struct wl_interface desktop_shell_interface;
+extern const struct wl_interface e_desktop_shell_interface;
extern const struct wl_interface screensaver_interface;
-#ifndef DESKTOP_SHELL_CURSOR_ENUM
-#define DESKTOP_SHELL_CURSOR_ENUM
-enum desktop_shell_cursor {
- DESKTOP_SHELL_CURSOR_NONE = 0,
- DESKTOP_SHELL_CURSOR_RESIZE_TOP = 1,
- DESKTOP_SHELL_CURSOR_RESIZE_BOTTOM = 2,
- DESKTOP_SHELL_CURSOR_ARROW = 3,
- DESKTOP_SHELL_CURSOR_RESIZE_LEFT = 4,
- DESKTOP_SHELL_CURSOR_RESIZE_TOP_LEFT = 5,
- DESKTOP_SHELL_CURSOR_RESIZE_BOTTOM_LEFT = 6,
- DESKTOP_SHELL_CURSOR_MOVE = 7,
- DESKTOP_SHELL_CURSOR_RESIZE_RIGHT = 8,
- DESKTOP_SHELL_CURSOR_RESIZE_TOP_RIGHT = 9,
- DESKTOP_SHELL_CURSOR_RESIZE_BOTTOM_RIGHT = 10,
- DESKTOP_SHELL_CURSOR_BUSY = 11,
+#ifndef E_DESKTOP_SHELL_CURSOR_ENUM
+#define E_DESKTOP_SHELL_CURSOR_ENUM
+enum e_desktop_shell_cursor {
+ E_DESKTOP_SHELL_CURSOR_NONE = 0,
+ E_DESKTOP_SHELL_CURSOR_RESIZE_TOP = 1,
+ E_DESKTOP_SHELL_CURSOR_RESIZE_BOTTOM = 2,
+ E_DESKTOP_SHELL_CURSOR_ARROW = 3,
+ E_DESKTOP_SHELL_CURSOR_RESIZE_LEFT = 4,
+ E_DESKTOP_SHELL_CURSOR_RESIZE_TOP_LEFT = 5,
+ E_DESKTOP_SHELL_CURSOR_RESIZE_BOTTOM_LEFT = 6,
+ E_DESKTOP_SHELL_CURSOR_MOVE = 7,
+ E_DESKTOP_SHELL_CURSOR_RESIZE_RIGHT = 8,
+ E_DESKTOP_SHELL_CURSOR_RESIZE_TOP_RIGHT = 9,
+ E_DESKTOP_SHELL_CURSOR_RESIZE_BOTTOM_RIGHT = 10,
+ E_DESKTOP_SHELL_CURSOR_BUSY = 11,
};
-#endif /* DESKTOP_SHELL_CURSOR_ENUM */
+#endif /* E_DESKTOP_SHELL_CURSOR_ENUM */
-struct desktop_shell_interface {
+struct e_desktop_shell_interface {
/**
* set_background - (none)
* @output: (none)
@@ -76,26 +76,26 @@ struct desktop_shell_interface {
struct wl_resource *surface);
};
-#define DESKTOP_SHELL_CONFIGURE 0
-#define DESKTOP_SHELL_PREPARE_LOCK_SURFACE 1
-#define DESKTOP_SHELL_GRAB_CURSOR 2
+#define E_DESKTOP_SHELL_CONFIGURE 0
+#define E_DESKTOP_SHELL_PREPARE_LOCK_SURFACE 1
+#define E_DESKTOP_SHELL_GRAB_CURSOR 2
static inline void
-desktop_shell_send_configure(struct wl_resource *resource_, uint32_t edges,
struct wl_resource *surface, int32_t width, int32_t height)
+e_desktop_shell_send_configure(struct wl_resource *resource_, uint32_t edges,
struct wl_resource *surface, int32_t width, int32_t height)
{
- wl_resource_post_event(resource_, DESKTOP_SHELL_CONFIGURE, edges,
surface, width, height);
+ wl_resource_post_event(resource_, E_DESKTOP_SHELL_CONFIGURE, edges,
surface, width, height);
}
static inline void
-desktop_shell_send_prepare_lock_surface(struct wl_resource *resource_)
+e_desktop_shell_send_prepare_lock_surface(struct wl_resource *resource_)
{
- wl_resource_post_event(resource_, DESKTOP_SHELL_PREPARE_LOCK_SURFACE);
+ wl_resource_post_event(resource_, E_DESKTOP_SHELL_PREPARE_LOCK_SURFACE);
}
static inline void
-desktop_shell_send_grab_cursor(struct wl_resource *resource_, uint32_t cursor)
+e_desktop_shell_send_grab_cursor(struct wl_resource *resource_, uint32_t
cursor)
{
- wl_resource_post_event(resource_, DESKTOP_SHELL_GRAB_CURSOR, cursor);
+ wl_resource_post_event(resource_, E_DESKTOP_SHELL_GRAB_CURSOR, cursor);
}
struct screensaver_interface {
--
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
