Re: [PATCH 3/3] shell: Add wl_output name event

[Jason Ekstrand]

On Mar 16, 2014 10:20 PM, Quanxian Wang quanxian.w...@intel.com wrote:

 Signed-off-by: Quanxian Wang quanxian.w...@intel.com
 ---
  clients/desktop-shell.c | 10 +-
  clients/window.c| 10 +-
  2 files changed, 18 insertions(+), 2 deletions(-)

 diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c
 index a0c6b6d..cefe936 100644
 --- a/clients/desktop-shell.c
 +++ b/clients/desktop-shell.c
 @@ -1172,6 +1172,13 @@ output_handle_mode(void *data,
  }

  static void
 +output_handle_name(void *data,
 +  struct wl_output *wl_output,
 +  const char *name)
 +{
 +}
 +
 +static void
  output_handle_done(void *data,
 struct wl_output *wl_output)
  {
 @@ -1192,7 +1199,8 @@ static const struct wl_output_listener
output_listener = {
 output_handle_geometry,
 output_handle_mode,
 output_handle_done,
 -   output_handle_scale
 +   output_handle_scale,
 +   output_handle_name
  };

If you we're going to add the listeners, we should actually bind to version
3.


  static void
 diff --git a/clients/window.c b/clients/window.c
 index 3136a7d..4946b7a 100644
 --- a/clients/window.c
 +++ b/clients/window.c
 @@ -4714,11 +4714,19 @@ display_handle_mode(void *data,
 }
  }

 +static void
 +display_handle_name(void *data,
 +   struct wl_output *wl_output,
 +   const char *name)
 +{
 +}
 +
  static const struct wl_output_listener output_listener = {
 display_handle_geometry,
 display_handle_mode,
 display_handle_done,
 -   display_handle_scale
 +   display_handle_scale,
 +   display_handle_name
  };

Same here.

--Jason Ekstrand


  static void
 --
 1.8.1.2

___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel

[PATCH 3/3] shell: Add wl_output name event

[Quanxian Wang]

Signed-off-by: Quanxian Wang quanxian.w...@intel.com
---
 clients/desktop-shell.c | 12 ++--
 clients/window.c| 12 ++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c
index a0c6b6d..9b15e3c 100644
--- a/clients/desktop-shell.c
+++ b/clients/desktop-shell.c
@@ -1172,6 +1172,13 @@ output_handle_mode(void *data,
 }
 
 static void
+output_handle_name(void *data,
+  struct wl_output *wl_output,
+  const char *name)
+{
+}
+
+static void
 output_handle_done(void *data,
struct wl_output *wl_output)
 {
@@ -1192,7 +1199,8 @@ static const struct wl_output_listener output_listener = {
output_handle_geometry,
output_handle_mode,
output_handle_done,
-   output_handle_scale
+   output_handle_scale,
+   output_handle_name
 };
 
 static void
@@ -1221,7 +1229,7 @@ create_output(struct desktop *desktop, uint32_t id)
return;
 
output-output =
-   display_bind(desktop-display, id, wl_output_interface, 2);
+   display_bind(desktop-display, id, wl_output_interface, 3);
output-server_output_id = id;
 
wl_output_add_listener(output-output, output_listener, output);
diff --git a/clients/window.c b/clients/window.c
index c8287e2..c3e9633 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -4758,11 +4758,19 @@ display_handle_mode(void *data,
}
 }
 
+static void
+display_handle_name(void *data,
+   struct wl_output *wl_output,
+   const char *name)
+{
+}
+
 static const struct wl_output_listener output_listener = {
display_handle_geometry,
display_handle_mode,
display_handle_done,
-   display_handle_scale
+   display_handle_scale,
+   display_handle_name
 };
 
 static void
@@ -4774,7 +4782,7 @@ display_add_output(struct display *d, uint32_t id)
output-display = d;
output-scale = 1;
output-output =
-   wl_registry_bind(d-registry, id, wl_output_interface, 2);
+   wl_registry_bind(d-registry, id, wl_output_interface, 3);
output-server_output_id = id;
wl_list_insert(d-output_list.prev, output-link);
 
-- 
1.8.1.2

___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel

[PATCH 3/3] shell: Add wl_output name event

[Quanxian Wang]

Signed-off-by: Quanxian Wang quanxian.w...@intel.com
---
 clients/desktop-shell.c | 10 +-
 clients/window.c| 10 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c
index a0c6b6d..cefe936 100644
--- a/clients/desktop-shell.c
+++ b/clients/desktop-shell.c
@@ -1172,6 +1172,13 @@ output_handle_mode(void *data,
 }
 
 static void
+output_handle_name(void *data,
+  struct wl_output *wl_output,
+  const char *name)
+{
+}
+
+static void
 output_handle_done(void *data,
struct wl_output *wl_output)
 {
@@ -1192,7 +1199,8 @@ static const struct wl_output_listener output_listener = {
output_handle_geometry,
output_handle_mode,
output_handle_done,
-   output_handle_scale
+   output_handle_scale,
+   output_handle_name
 };
 
 static void
diff --git a/clients/window.c b/clients/window.c
index 3136a7d..4946b7a 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -4714,11 +4714,19 @@ display_handle_mode(void *data,
}
 }
 
+static void
+display_handle_name(void *data,
+   struct wl_output *wl_output,
+   const char *name)
+{
+}
+
 static const struct wl_output_listener output_listener = {
display_handle_geometry,
display_handle_mode,
display_handle_done,
-   display_handle_scale
+   display_handle_scale,
+   display_handle_name
 };
 
 static void
-- 
1.8.1.2

___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel

[PATCH 3/3] shell: Add wl_output name event

[Quanxian Wang]

Signed-off-by: Quanxian Wang quanxian.w...@intel.com
---
 clients/desktop-shell.c | 10 +-
 clients/window.c| 10 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c
index a0c6b6d..cefe936 100644
--- a/clients/desktop-shell.c
+++ b/clients/desktop-shell.c
@@ -1172,6 +1172,13 @@ output_handle_mode(void *data,
 }
 
 static void
+output_handle_name(void *data,
+  struct wl_output *wl_output,
+  const char *name)
+{
+}
+
+static void
 output_handle_done(void *data,
struct wl_output *wl_output)
 {
@@ -1192,7 +1199,8 @@ static const struct wl_output_listener output_listener = {
output_handle_geometry,
output_handle_mode,
output_handle_done,
-   output_handle_scale
+   output_handle_scale,
+   output_handle_name
 };
 
 static void
diff --git a/clients/window.c b/clients/window.c
index 3136a7d..4946b7a 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -4714,11 +4714,19 @@ display_handle_mode(void *data,
}
 }
 
+static void
+display_handle_name(void *data,
+   struct wl_output *wl_output,
+   const char *name)
+{
+}
+
 static const struct wl_output_listener output_listener = {
display_handle_geometry,
display_handle_mode,
display_handle_done,
-   display_handle_scale
+   display_handle_scale,
+   display_handle_name
 };
 
 static void
-- 
1.8.1.2

___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel