Commit acbb0c4b authored by William Hua's avatar William Hua

mir: fix warnings

parent 594ba307
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "gdkmir-private.h" #include "gdkmir-private.h"
void static void
_gdk_mir_print_modifiers (unsigned int modifiers) _gdk_mir_print_modifiers (unsigned int modifiers)
{ {
g_printerr (" Modifiers"); g_printerr (" Modifiers");
...@@ -58,7 +58,7 @@ _gdk_mir_print_modifiers (unsigned int modifiers) ...@@ -58,7 +58,7 @@ _gdk_mir_print_modifiers (unsigned int modifiers)
g_printerr ("\n"); g_printerr ("\n");
} }
void static void
_gdk_mir_print_key_event (const MirInputEvent *event) _gdk_mir_print_key_event (const MirInputEvent *event)
{ {
const MirKeyboardEvent *keyboard_event = mir_input_event_get_keyboard_event (event); const MirKeyboardEvent *keyboard_event = mir_input_event_get_keyboard_event (event);
...@@ -147,7 +147,7 @@ _gdk_mir_print_touch_event (const MirInputEvent *event) ...@@ -147,7 +147,7 @@ _gdk_mir_print_touch_event (const MirInputEvent *event)
} }
} }
void static void
_gdk_mir_print_motion_event (const MirInputEvent *event) _gdk_mir_print_motion_event (const MirInputEvent *event)
{ {
const MirPointerEvent *pointer_event = mir_input_event_get_pointer_event (event); const MirPointerEvent *pointer_event = mir_input_event_get_pointer_event (event);
...@@ -199,7 +199,7 @@ _gdk_mir_print_motion_event (const MirInputEvent *event) ...@@ -199,7 +199,7 @@ _gdk_mir_print_motion_event (const MirInputEvent *event)
g_printerr (" Event Time %lli\n", (long long int) mir_input_event_get_event_time (event)); g_printerr (" Event Time %lli\n", (long long int) mir_input_event_get_event_time (event));
} }
void static void
_gdk_mir_print_surface_event (const MirSurfaceEvent *event) _gdk_mir_print_surface_event (const MirSurfaceEvent *event)
{ {
g_printerr ("SURFACE\n"); g_printerr ("SURFACE\n");
...@@ -226,15 +226,15 @@ _gdk_mir_print_surface_event (const MirSurfaceEvent *event) ...@@ -226,15 +226,15 @@ _gdk_mir_print_surface_event (const MirSurfaceEvent *event)
g_printerr (" Value %i\n", mir_surface_event_get_attribute_value (event)); g_printerr (" Value %i\n", mir_surface_event_get_attribute_value (event));
} }
void static void
_gdk_mir_print_resize_event (const MirResizeEvent *event) _gdk_mir_print_resize_event (const MirResizeEvent *event)
{ {
g_printerr ("RESIZE\n"); g_printerr ("RESIZE\n");
g_printerr (" Size (%i, %i)\n", mir_resize_event_get_width (event), mir_resize_event_get_height (event)); g_printerr (" Size (%i, %i)\n", mir_resize_event_get_width (event), mir_resize_event_get_height (event));
} }
void static void
_gdk_mir_print_close_event (const MirCloseSurfaceEvent *event) _gdk_mir_print_close_event (void)
{ {
g_printerr ("CLOSED\n"); g_printerr ("CLOSED\n");
} }
...@@ -275,7 +275,7 @@ _gdk_mir_print_event (const MirEvent *event) ...@@ -275,7 +275,7 @@ _gdk_mir_print_event (const MirEvent *event)
_gdk_mir_print_resize_event (mir_event_get_resize_event (event)); _gdk_mir_print_resize_event (mir_event_get_resize_event (event));
break; break;
case mir_event_type_close_surface: case mir_event_type_close_surface:
_gdk_mir_print_close_event (mir_event_get_close_surface_event (event)); _gdk_mir_print_close_event ();
break; break;
default: default:
g_printerr ("EVENT %u\n", mir_event_get_type (event)); g_printerr ("EVENT %u\n", mir_event_get_type (event));
......
...@@ -121,16 +121,6 @@ EGLSurface _gdk_mir_window_get_egl_surface (GdkWindow *window, EGLConfig config) ...@@ -121,16 +121,6 @@ EGLSurface _gdk_mir_window_get_egl_surface (GdkWindow *window, EGLConfig config)
EGLSurface _gdk_mir_window_get_dummy_egl_surface (GdkWindow *window, EGLConfig config); EGLSurface _gdk_mir_window_get_dummy_egl_surface (GdkWindow *window, EGLConfig config);
void _gdk_mir_print_modifiers (unsigned int modifiers);
void _gdk_mir_print_key_event (const MirInputEvent *event);
void _gdk_mir_print_motion_event (const MirInputEvent *event);
void _gdk_mir_print_surface_event (const MirSurfaceEvent *event);
void _gdk_mir_print_resize_event (const MirResizeEvent *event);
void _gdk_mir_print_event (const MirEvent *event); void _gdk_mir_print_event (const MirEvent *event);
#endif /* __GDK_PRIVATE_MIR_H__ */ #endif /* __GDK_PRIVATE_MIR_H__ */
...@@ -537,8 +537,7 @@ handle_resize_event (GdkWindow *window, ...@@ -537,8 +537,7 @@ handle_resize_event (GdkWindow *window,
} }
static void static void
handle_close_event (GdkWindow *window, handle_close_event (GdkWindow *window)
const MirCloseSurfaceEvent *event)
{ {
send_event (window, get_pointer (window), gdk_event_new (GDK_DESTROY)); send_event (window, get_pointer (window), gdk_event_new (GDK_DESTROY));
gdk_window_destroy_notify (window); gdk_window_destroy_notify (window);
...@@ -596,7 +595,7 @@ gdk_mir_event_source_queue_event (GdkDisplay *display, ...@@ -596,7 +595,7 @@ gdk_mir_event_source_queue_event (GdkDisplay *display,
// FIXME? // FIXME?
break; break;
case mir_event_type_close_surface: case mir_event_type_close_surface:
handle_close_event (window, mir_event_get_close_surface_event (event)); handle_close_event (window);
break; break;
default: default:
g_warning ("Ignoring unknown Mir event %d", mir_event_get_type (event)); g_warning ("Ignoring unknown Mir event %d", mir_event_get_type (event));
......
...@@ -1152,7 +1152,9 @@ gdk_mir_window_impl_register_dnd (GdkWindow *window) ...@@ -1152,7 +1152,9 @@ gdk_mir_window_impl_register_dnd (GdkWindow *window)
static GdkDragContext * static GdkDragContext *
gdk_mir_window_impl_drag_begin (GdkWindow *window, gdk_mir_window_impl_drag_begin (GdkWindow *window,
GdkDevice *device, GdkDevice *device,
GList *targets) GList *targets,
gint x_root,
gint y_root)
{ {
//g_printerr ("gdk_mir_window_impl_drag_begin window=%p\n", window); //g_printerr ("gdk_mir_window_impl_drag_begin window=%p\n", window);
return NULL; return NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment