[PATCH v2] desktop-shell: configurable clock

2012-06-15 Thread Martin Minarik
Add weston.ini section to allow customizing the format of the displayed time. The redraw interval is based on whether the required format contains a second entries (%S %s %T). In case no settings are found, fall back to default values. --- clients/desktop-shell.c | 52 ++

[PATCH] weston: Silence valgrind

2012-06-15 Thread Martin Minarik
--- src/clipboard.c |2 ++ src/compositor.c |6 +++--- src/log.c|4 ++-- src/util.c |4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/clipboard.c b/src/clipboard.c index 92c8a83..9cf391a 100644 --- a/src/clipboard.c +++ b/src/clipboard.c @@

[PATCH] wayland: Silence valgrind

2012-06-15 Thread Martin Minarik
--- src/connection.c |2 ++ src/wayland-server.c |4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/connection.c b/src/connection.c index 1272210..bf75e66 100644 --- a/src/connection.c +++ b/src/connection.c @@ -422,6 +422,8 @@ wl_closure_vmarshal(struct wl_obj

Re: [PATCH 0/5] Cursor surfaces and animated cursors

2012-06-15 Thread Kristian Høgsberg
On Fri, Jun 15, 2012 at 05:27:31PM +0300, Ander Conselvan de Oliveira wrote: > Hi, > > This series adds the protocol for a client to make a surface created > by it the current pointer surface. That way it is possible to get > frame callbacks on this surface and use it to implement animated > curso

Re: [PATCH weston 5/5] window: Implement animated cursors (using pointer surfaces)

2012-06-15 Thread Kristian Høgsberg
On Fri, Jun 15, 2012 at 05:27:36PM +0300, Ander Conselvan de Oliveira wrote: > Since the introduction of pointer.set_cursor(), it is possible for a > client to set the surface containing the pointer image and get frame > callbacks on it thus allowing a clear implementation of animated > cursors. >

Re: [PATCH] dri2: Pass a ScreenPtr through to the driver's AuthMagic

2012-06-15 Thread Kristian Høgsberg
On Fri, Jun 15, 2012 at 12:35:00PM +0200, Michel Dänzer wrote: > On Fre, 2012-06-15 at 19:01 +1000, Christopher James Halse Rogers > wrote: > > xwayland drivers need access to their screen private data to authenticate. > > Now that drivers no longer have direct access to the global screen arrays,

Re: [PATCH] dri2: Pass a ScreenPtr through to the driver's AuthMagic

2012-06-15 Thread Kristian Høgsberg
On Fri, Jun 15, 2012 at 07:01:34PM +1000, Christopher James Halse Rogers wrote: > xwayland drivers need access to their screen private data to authenticate. > Now that drivers no longer have direct access to the global screen arrays, > this needs to be passed in as function context. The way it was

Re: [PATCH weston 3/5] compositor: Fix crash when surface is map'd and unmap'd before repaint

2012-06-15 Thread Ander Conselvan de Oliveira
--- For the record, I ran into this issue while doing the cursor surfaces patches, but I could also reproduce it with this patch. I looked into writing this as test but it wasn't obvious to me how I would do that with the current test framework, so I just gave up. clients/simple-shm.c | 18 +++

[PATCH weston 5/5] window: Implement animated cursors (using pointer surfaces)

2012-06-15 Thread Ander Conselvan de Oliveira
Since the introduction of pointer.set_cursor(), it is possible for a client to set the surface containing the pointer image and get frame callbacks on it thus allowing a clear implementation of animated cursors. This also makes the busy cursor hack of using frame callbacks on the busy surface unne

[PATCH weston 4/5] compositor: Track pointer image protocol change

2012-06-15 Thread Ander Conselvan de Oliveira
The request pointer.attach was replaced with pointer.set_cursor that lets a client set the cursor surface for a given pointer. --- clients/simple-egl.c |2 +- clients/window.c | 13 +- src/compositor-wayland.c |2 +- src/compositor.c | 112 +++

[PATCH weston 3/5] compositor: Fix crash when surface is map'd and unmap'd before repaint

2012-06-15 Thread Ander Conselvan de Oliveira
If a surface is map'd and unmap'd before an output repaint occurs, it is not added to the compositor's surface list, so the field weston_surface::link might be invalid (the field is initialized on weston_surface_create()), and it that case Weston will crash on the call to wl_list_remove(&surface->l

[PATCH wayland 2/2] cursor: Add function for calculating current frame in cursor animation

2012-06-15 Thread Ander Conselvan de Oliveira
Given a pointer to struct wl_cursor and an elapsed time in ms., wl_cursor_frame() will return the index of the cursor image the should be displayed. --- cursor/wayland-cursor.c | 49 -- cursor/wayland-cursor.h |3 ++ 2 files changed, 45 insertions(

[PATCH wayland 1/2] protocol: replace pointer.attach with pointer.set_cursor

2012-06-15 Thread Ander Conselvan de Oliveira
--- protocol/wayland.xml | 27 +-- 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/protocol/wayland.xml b/protocol/wayland.xml index e9c6787..23b244f 100644 --- a/protocol/wayland.xml +++ b/protocol/wayland.xml @@ -773,15 +773,30 @@ - -

[PATCH 0/5] Cursor surfaces and animated cursors

2012-06-15 Thread Ander Conselvan de Oliveira
Hi, This series adds the protocol for a client to make a surface created by it the current pointer surface. That way it is possible to get frame callbacks on this surface and use it to implement animated cursors. I'm not particularly sure about the description about the hotspot on the protocol. I

Re: [PATCH] tablet-shell: Fix compiling error for using stderr.

2012-06-15 Thread Kristian Høgsberg
On Thu, Jun 14, 2012 at 10:12:55AM +0300, Pekka Paalanen wrote: > On Thu, 14 Jun 2012 15:07:47 +0800 > zhiwen...@linux.intel.com wrote: > > > From: Alex Wu > > > > Not including the stdio.h makes this compiling error. > > --- > > src/tablet-shell.c |1 + > > 1 file changed, 1 insertion(+) >

Re: [PATCH weston] Increment frame_counter before calling animation->frame().

2012-06-15 Thread Kristian Høgsberg
On Thu, Jun 14, 2012 at 01:01:56AM -0600, Scott Moreau wrote: > Iterate the frame_counter before calling animation->frame() because the > animation might be > destroyed in this path. The first frame is now 1 (not 0) in the animation > frame handlers. > --- > > This fixes bug #51057 Thanks, Kris

Re: [PATCH weston] simple-egl: Minor fix ups.

2012-06-15 Thread Kristian Høgsberg
On Wed, Jun 13, 2012 at 05:42:21PM -0600, Scott Moreau wrote: > 1) Fix typo when initializing variables > 2) Remove gratuitous glFlush() call > 3) Localize shader program variable Thanks, looks good. Kristian > --- > clients/simple-egl.c | 28 +--- > 1 files changed, 13

Re: [PATCH] dri2: Pass a ScreenPtr through to the driver's AuthMagic

2012-06-15 Thread Christopher James Halse Rogers
On Fri, 2012-06-15 at 21:54 +1000, Christopher James Halse Rogers wrote: > On Fri, 2012-06-15 at 12:35 +0200, Michel Dänzer wrote: > > On Fre, 2012-06-15 at 19:01 +1000, Christopher James Halse Rogers > > wrote: > > > xwayland drivers need access to their screen private data to authenticate. > > >

Re: [PATCH] dri2: Pass a ScreenPtr through to the driver's AuthMagic

2012-06-15 Thread Christopher James Halse Rogers
On Fri, 2012-06-15 at 12:35 +0200, Michel Dänzer wrote: > On Fre, 2012-06-15 at 19:01 +1000, Christopher James Halse Rogers > wrote: > > xwayland drivers need access to their screen private data to authenticate. > > Now that drivers no longer have direct access to the global screen arrays, > > thi

xwayland patches past the xserver reindentation

2012-06-15 Thread Christopher James Halse Rogers
As a part of getting an xwayland usable with the xserver 1.12.2 that will shortly be in Ubuntu I've rebased the xwayland branch on 1.12.2; you can find that here: https://github.com/RAOF/xserver/tree/xwayland-1.12.2 This is past the set of commits which reintented the server code. The patches are

[PATCH] dri2: Pass a ScreenPtr through to the driver's AuthMagic

2012-06-15 Thread Christopher James Halse Rogers
xwayland drivers need access to their screen private data to authenticate. Now that drivers no longer have direct access to the global screen arrays, this needs to be passed in as function context. The way it was working was ugly, anyway. Signed-off-by: Christopher James Halse Rogers --- This c

[PATCH] Add xwayland support (v2)

2012-06-15 Thread Christopher James Halse Rogers
v2: Fix build against Xservers without Wayland support Don't try to acquire/drop drm master under Wayland Refresh for xserver 1.13 kill-all-direct-access-to-xf86Screens Signed-off-by: Christopher James Halse Rogers --- I'll send this upstream to nouveau once the corresponding DRI2 commi