| Message ID | 1418294973-21790-11-git-send-email-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 2014-12-11 at 11:49, Gerd Hoffmann wrote: > Now that common event handling code is split off, we can move > over sdl_refresh to sdl2-2d.c, and rename it to sdl2_2d_refresh. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > include/ui/sdl2.h | 1 + > ui/sdl2-2d.c | 9 +++++++++ > ui/sdl2.c | 10 +--------- > 3 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h > index 27b3132..9e9a92d 100644 > --- a/include/ui/sdl2.h > +++ b/include/ui/sdl2.h > @@ -23,4 +23,5 @@ void sdl2_2d_update(DisplayChangeListener *dcl, > int x, int y, int w, int h); > void sdl2_2d_switch(DisplayChangeListener *dcl, > DisplaySurface *new_surface); > +void sdl2_2d_refresh(DisplayChangeListener *dcl); > void sdl2_2d_redraw(struct sdl2_console *scon); > diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c > index 40a552c..9c60075 100644 > --- a/ui/sdl2-2d.c > +++ b/ui/sdl2-2d.c > @@ -103,6 +103,15 @@ void sdl2_2d_switch(DisplayChangeListener *dcl, > sdl2_2d_redraw(scon); > } > > +void sdl2_2d_refresh(DisplayChangeListener *dcl) > +{ > + struct sdl2_console *scon = container_of(dcl, struct sdl2_console, dcl); > + > + assert(!scon->opengl); This doesn't compile for me because this flag is not added by this series. With this assertion moved to the OpenGL series: Reviewed-by: Max Reitz <mreitz@redhat.com>
On Do, 2014-12-11 at 16:19 +0100, Max Reitz wrote: > On 2014-12-11 at 11:49, Gerd Hoffmann wrote: > > Now that common event handling code is split off, we can move > > over sdl_refresh to sdl2-2d.c, and rename it to sdl2_2d_refresh. > > > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > > --- > > include/ui/sdl2.h | 1 + > > ui/sdl2-2d.c | 9 +++++++++ > > ui/sdl2.c | 10 +--------- > > 3 files changed, 11 insertions(+), 9 deletions(-) > > > > diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h > > index 27b3132..9e9a92d 100644 > > --- a/include/ui/sdl2.h > > +++ b/include/ui/sdl2.h > > @@ -23,4 +23,5 @@ void sdl2_2d_update(DisplayChangeListener *dcl, > > int x, int y, int w, int h); > > void sdl2_2d_switch(DisplayChangeListener *dcl, > > DisplaySurface *new_surface); > > +void sdl2_2d_refresh(DisplayChangeListener *dcl); > > void sdl2_2d_redraw(struct sdl2_console *scon); > > diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c > > index 40a552c..9c60075 100644 > > --- a/ui/sdl2-2d.c > > +++ b/ui/sdl2-2d.c > > @@ -103,6 +103,15 @@ void sdl2_2d_switch(DisplayChangeListener *dcl, > > sdl2_2d_redraw(scon); > > } > > > > +void sdl2_2d_refresh(DisplayChangeListener *dcl) > > +{ > > + struct sdl2_console *scon = container_of(dcl, struct sdl2_console, dcl); > > + > > + assert(!scon->opengl); > > This doesn't compile for me because this flag is not added by this series. Fixed. cheers, Gerd
diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h index 27b3132..9e9a92d 100644 --- a/include/ui/sdl2.h +++ b/include/ui/sdl2.h @@ -23,4 +23,5 @@ void sdl2_2d_update(DisplayChangeListener *dcl, int x, int y, int w, int h); void sdl2_2d_switch(DisplayChangeListener *dcl, DisplaySurface *new_surface); +void sdl2_2d_refresh(DisplayChangeListener *dcl); void sdl2_2d_redraw(struct sdl2_console *scon); diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c index 40a552c..9c60075 100644 --- a/ui/sdl2-2d.c +++ b/ui/sdl2-2d.c @@ -103,6 +103,15 @@ void sdl2_2d_switch(DisplayChangeListener *dcl, sdl2_2d_redraw(scon); } +void sdl2_2d_refresh(DisplayChangeListener *dcl) +{ + struct sdl2_console *scon = container_of(dcl, struct sdl2_console, dcl); + + assert(!scon->opengl); + graphic_hw_update(dcl->con); + sdl2_poll_events(scon); +} + void sdl2_2d_redraw(struct sdl2_console *scon) { if (!scon->surface) { diff --git a/ui/sdl2.c b/ui/sdl2.c index 8d10e0e..a1def81 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -594,14 +594,6 @@ void sdl2_poll_events(struct sdl2_console *scon) } } -static void sdl_refresh(DisplayChangeListener *dcl) -{ - struct sdl2_console *scon = container_of(dcl, struct sdl2_console, dcl); - - graphic_hw_update(dcl->con); - sdl2_poll_events(scon); -} - static void sdl_mouse_warp(DisplayChangeListener *dcl, int x, int y, int on) { @@ -667,7 +659,7 @@ static const DisplayChangeListenerOps dcl_2d_ops = { .dpy_name = "sdl2-2d", .dpy_gfx_update = sdl2_2d_update, .dpy_gfx_switch = sdl2_2d_switch, - .dpy_refresh = sdl_refresh, + .dpy_refresh = sdl2_2d_refresh, .dpy_mouse_set = sdl_mouse_warp, .dpy_cursor_define = sdl_mouse_define, };
Now that common event handling code is split off, we can move over sdl_refresh to sdl2-2d.c, and rename it to sdl2_2d_refresh. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- include/ui/sdl2.h | 1 + ui/sdl2-2d.c | 9 +++++++++ ui/sdl2.c | 10 +--------- 3 files changed, 11 insertions(+), 9 deletions(-)