Re: [PATCH weston 08/10] desktop-shell: Rename protocol weston_desktop_shell

2015-11-06 Thread Pekka Paalanen 
On Fri, 6 Nov 2015 10:53:36 +0800
Jonas Ådahl  wrote:

> On Thu, Nov 05, 2015 at 04:31:37PM +0200, Pekka Paalanen wrote:
> > On Wed,  4 Nov 2015 16:49:57 +0800
> > Jonas Ådahl  wrote:
> > 
> > > In the effort of going away from generic names of protocols only
> > > relevant for weston, rename the weston desktop shell
> > > weston_desktop_shell.
> > > 
> > > This also resets the version to 1, as there will be no prior versions
> > > to weston_desktop_shell.
> > > 
> > > Signed-off-by: Jonas Ådahl 
> > > ---
> > >  Makefile.am   |  20 +++---
> > >  clients/desktop-shell.c   |  79 +++---
> > >  desktop-shell/input-panel.c   |   2 +-
> > >  desktop-shell/shell.c |  70 ++-
> > >  desktop-shell/shell.h |   4 +-
> > >  protocol/desktop-shell.xml| 138 
> > > --
> > >  protocol/weston-desktop-shell.xml | 134 
> > > 
> > >  7 files changed, 224 insertions(+), 223 deletions(-)
> > >  delete mode 100644 protocol/desktop-shell.xml
> > >  create mode 100644 protocol/weston-desktop-shell.xml
> > 
> > This renaming will break Maynard:
> > https://github.com/raspberrypi/maynard.git
> > 
> > This is not a blocker for this patch, just something we should be aware
> > of. The fix should be pretty easy if anyone cares.
> 
> Yea, and practically it is not an important name change. I do however
> think weston should 'set an example' and do the right thing here though.

Yes definely, let's do this. Just wanted to make a reminder in case
someone comes complaining Maynard broke. :-)


Thanks,
pq


pgpCLLDEg9Ikd.pgp
Description: OpenPGP digital signature
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel

Re: [PATCH weston 08/10] desktop-shell: Rename protocol weston_desktop_shell

2015-11-05 Thread Pekka Paalanen 
On Wed,  4 Nov 2015 16:49:57 +0800
Jonas Ådahl  wrote:

> In the effort of going away from generic names of protocols only
> relevant for weston, rename the weston desktop shell
> weston_desktop_shell.
> 
> This also resets the version to 1, as there will be no prior versions
> to weston_desktop_shell.
> 
> Signed-off-by: Jonas Ådahl 
> ---
>  Makefile.am   |  20 +++---
>  clients/desktop-shell.c   |  79 +++---
>  desktop-shell/input-panel.c   |   2 +-
>  desktop-shell/shell.c |  70 ++-
>  desktop-shell/shell.h |   4 +-
>  protocol/desktop-shell.xml| 138 
> --
>  protocol/weston-desktop-shell.xml | 134 
>  7 files changed, 224 insertions(+), 223 deletions(-)
>  delete mode 100644 protocol/desktop-shell.xml
>  create mode 100644 protocol/weston-desktop-shell.xml

This renaming will break Maynard:
https://github.com/raspberrypi/maynard.git

This is not a blocker for this patch, just something we should be aware
of. The fix should be pretty easy if anyone cares.

> diff --git a/desktop-shell/input-panel.c b/desktop-shell/input-panel.c
> index f5342aa..6619e4c 100644
> --- a/desktop-shell/input-panel.c
> +++ b/desktop-shell/input-panel.c
> @@ -30,7 +30,7 @@
>  #include 
>  
>  #include "shell.h"
> -#include "desktop-shell-server-protocol.h"
> +#include "weston-desktop-shell-server-protocol.h"
>  #include "input-method-unstable-v1-server-protocol.h"
>  #include "shared/helpers.h"

And no other changes in this file, that's odd. Maybe the header is not
needed at all?

Acked-by: Pekka Paalanen 


Thanks,
pq


pgpZmTjTV_NjX.pgp
Description: OpenPGP digital signature
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel

Re: [PATCH weston 08/10] desktop-shell: Rename protocol weston_desktop_shell

2015-11-05 Thread Jonas Ådahl 
On Thu, Nov 05, 2015 at 04:31:37PM +0200, Pekka Paalanen wrote:
> On Wed,  4 Nov 2015 16:49:57 +0800
> Jonas Ådahl  wrote:
> 
> > In the effort of going away from generic names of protocols only
> > relevant for weston, rename the weston desktop shell
> > weston_desktop_shell.
> > 
> > This also resets the version to 1, as there will be no prior versions
> > to weston_desktop_shell.
> > 
> > Signed-off-by: Jonas Ådahl 
> > ---
> >  Makefile.am   |  20 +++---
> >  clients/desktop-shell.c   |  79 +++---
> >  desktop-shell/input-panel.c   |   2 +-
> >  desktop-shell/shell.c |  70 ++-
> >  desktop-shell/shell.h |   4 +-
> >  protocol/desktop-shell.xml| 138 
> > --
> >  protocol/weston-desktop-shell.xml | 134 
> > 
> >  7 files changed, 224 insertions(+), 223 deletions(-)
> >  delete mode 100644 protocol/desktop-shell.xml
> >  create mode 100644 protocol/weston-desktop-shell.xml
> 
> This renaming will break Maynard:
> https://github.com/raspberrypi/maynard.git
> 
> This is not a blocker for this patch, just something we should be aware
> of. The fix should be pretty easy if anyone cares.

Yea, and practically it is not an important name change. I do however
think weston should 'set an example' and do the right thing here though.

> 
> > diff --git a/desktop-shell/input-panel.c b/desktop-shell/input-panel.c
> > index f5342aa..6619e4c 100644
> > --- a/desktop-shell/input-panel.c
> > +++ b/desktop-shell/input-panel.c
> > @@ -30,7 +30,7 @@
> >  #include 
> >  
> >  #include "shell.h"
> > -#include "desktop-shell-server-protocol.h"
> > +#include "weston-desktop-shell-server-protocol.h"
> >  #include "input-method-unstable-v1-server-protocol.h"
> >  #include "shared/helpers.h"
> 
> And no other changes in this file, that's odd. Maybe the header is not
> needed at all?

Indeed. It could be removed.


Jonas

> 
> Acked-by: Pekka Paalanen 
> 
> 
> Thanks,
> pq


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

[PATCH weston 08/10] desktop-shell: Rename protocol weston_desktop_shell

2015-11-04 Thread Jonas Ådahl 
In the effort of going away from generic names of protocols only
relevant for weston, rename the weston desktop shell
weston_desktop_shell.

This also resets the version to 1, as there will be no prior versions
to weston_desktop_shell.

Signed-off-by: Jonas Ådahl 
---
 Makefile.am   |  20 +++---
 clients/desktop-shell.c   |  79 +++---
 desktop-shell/input-panel.c   |   2 +-
 desktop-shell/shell.c |  70 ++-
 desktop-shell/shell.h |   4 +-
 protocol/desktop-shell.xml| 138 --
 protocol/weston-desktop-shell.xml | 134 
 7 files changed, 224 insertions(+), 223 deletions(-)
 delete mode 100644 protocol/desktop-shell.xml
 create mode 100644 protocol/weston-desktop-shell.xml

diff --git a/Makefile.am b/Makefile.am
index 46732e2..c2e7fcf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -693,9 +693,9 @@ weston_editor_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS) 
$(PANGO_CFLAGS)
 endif
 
 weston_keyboard_SOURCES = clients/keyboard.c
-nodist_weston_keyboard_SOURCES =   \
-   protocol/desktop-shell-client-protocol.h\
-   protocol/desktop-shell-protocol.c   \
+nodist_weston_keyboard_SOURCES =   \
+   protocol/weston-desktop-shell-client-protocol.h \
+   protocol/weston-desktop-shell-protocol.c\
protocol/input-method-unstable-v1-protocol.c\
protocol/input-method-unstable-v1-client-protocol.h
 weston_keyboard_LDADD = libtoytoolkit.la
@@ -721,8 +721,8 @@ weston_desktop_shell_SOURCES =  
\
clients/desktop-shell.c \
shared/helpers.h
 nodist_weston_desktop_shell_SOURCES =  \
-   protocol/desktop-shell-client-protocol.h\
-   protocol/desktop-shell-protocol.c
+   protocol/weston-desktop-shell-client-protocol.h \
+   protocol/weston-desktop-shell-protocol.c
 weston_desktop_shell_LDADD = libtoytoolkit.la
 weston_desktop_shell_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
@@ -757,8 +757,8 @@ BUILT_SOURCES +=\
protocol/text-input-unstable-v1-client-protocol.h   \
protocol/input-method-unstable-v1-protocol.c\
protocol/input-method-unstable-v1-client-protocol.h \
-   protocol/desktop-shell-client-protocol.h\
-   protocol/desktop-shell-protocol.c   \
+   protocol/weston-desktop-shell-client-protocol.h \
+   protocol/weston-desktop-shell-protocol.c\
protocol/scaler-client-protocol.h   \
protocol/scaler-protocol.c  \
protocol/workspaces-client-protocol.h   \
@@ -839,8 +839,8 @@ desktop_shell_la_SOURCES =  \
desktop-shell/input-panel.c \
shared/helpers.h
 nodist_desktop_shell_la_SOURCES =  \
-   protocol/desktop-shell-protocol.c   \
-   protocol/desktop-shell-server-protocol.h\
+   protocol/weston-desktop-shell-protocol.c\
+   protocol/weston-desktop-shell-server-protocol.h \
protocol/xdg-shell-unstable-v5-protocol.c   \
protocol/xdg-shell-unstable-v5-server-protocol.h
 
@@ -1340,7 +1340,7 @@ BUILT_SOURCES +=  \
protocol/text-input-unstable-v1-client-protocol.h
 
 EXTRA_DIST +=  \
-   protocol/desktop-shell.xml  \
+   protocol/weston-desktop-shell.xml   \
protocol/screenshooter.xml  \
protocol/workspaces.xml \
protocol/text-cursor-position.xml   \
diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c
index 9cf3d68..6ab76dc 100644
--- a/clients/desktop-shell.c
+++ b/clients/desktop-shell.c
@@ -47,14 +47,13 @@
 #include "shared/config-parser.h"
 #include "shared/helpers.h"
 
-#include "desktop-shell-client-protocol.h"
+#include "weston-desktop-shell-client-protocol.h"
 
 extern char **environ; /* defined by libc */
 
 struct desktop {
struct display *display;
-   struct desktop_shell *shell;
-   uint32_t interface_version;
+   struct weston_desktop_shell *shell;
struct unlock_dialog *unlock_dialog;
struct task unlock_task;
struct wl_list outputs;
@@ -72,7 +71,7 @@ struct desktop {
 
 struct surface {
void (*configure)(void *data,
- struct desktop_shell *desktop_shell,
+ struct weston_desktop_shell *desktop_shell,
  uint32_t edges, struct window *window,
  int32_t width, int32_t height);
 };
@@ -174,8 +173,7 @@ check_desktop_ready(struct window *window)