isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Fix header file style

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-04-22 18:09:38 -04:00
parent 88040d6b8a
commit 003ff3d255
5 changed files with 74 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wayland/meta-wayland-data-device.h
View File

@ -20,17 +20,15 @@
* OF THIS SOFTWARE. * OF THIS SOFTWARE.
*/ */
#ifndef __META_WAYLAND_DATA_DEVICE_H__ #ifndef META_WAYLAND_DATA_DEVICE_H
#define __META_WAYLAND_DATA_DEVICE_H__ #define META_WAYLAND_DATA_DEVICE_H
#include <wayland-server.h> #include <wayland-server.h>
#include "meta-wayland-private.h" #include "meta-wayland-private.h"
void void meta_wayland_data_device_manager_init (MetaWaylandCompositor *compositor);
meta_wayland_data_device_manager_init (MetaWaylandCompositor *compositor);
void void meta_wayland_data_device_set_keyboard_focus (MetaWaylandSeat *seat);
meta_wayland_data_device_set_keyboard_focus (MetaWaylandSeat *seat);
#endif /* __META_WAYLAND_DATA_DEVICE_H__ */ #endif /* META_WAYLAND_DATA_DEVICE_H */

36
src/wayland/meta-wayland-keyboard.h
View File

@ -42,8 +42,8 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifndef __META_WAYLAND_KEYBOARD_H__ #ifndef META_WAYLAND_KEYBOARD_H
#define __META_WAYLAND_KEYBOARD_H__ #define META_WAYLAND_KEYBOARD_H
#include <clutter/clutter.h> #include <clutter/clutter.h>
#include <wayland-server.h> #include <wayland-server.h>
@ -101,38 +101,30 @@ struct _MetaWaylandKeyboard
struct wl_resource *input_method_resource; struct wl_resource *input_method_resource;
}; };
void void meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard,
meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard,
struct wl_display *display); struct wl_display *display);
void void meta_wayland_keyboard_release (MetaWaylandKeyboard *keyboard);
meta_wayland_keyboard_release (MetaWaylandKeyboard *keyboard);
void void meta_wayland_keyboard_update (MetaWaylandKeyboard *keyboard,
meta_wayland_keyboard_update (MetaWaylandKeyboard *keyboard,
const ClutterKeyEvent *event); const ClutterKeyEvent *event);
gboolean gboolean meta_wayland_keyboard_handle_event (MetaWaylandKeyboard *keyboard,
meta_wayland_keyboard_handle_event (MetaWaylandKeyboard *keyboard,
const ClutterKeyEvent *event); const ClutterKeyEvent *event);
void void meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,
meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,
MetaWaylandSurface *surface); MetaWaylandSurface *surface);
void void meta_wayland_keyboard_start_grab (MetaWaylandKeyboard *device,
meta_wayland_keyboard_start_grab (MetaWaylandKeyboard *device,
MetaWaylandKeyboardGrab *grab); MetaWaylandKeyboardGrab *grab);
void void meta_wayland_keyboard_end_grab (MetaWaylandKeyboard *keyboard);
meta_wayland_keyboard_end_grab (MetaWaylandKeyboard *keyboard);
typedef enum { typedef enum {
META_WAYLAND_KEYBOARD_SKIP_XCLIENTS = 1, META_WAYLAND_KEYBOARD_SKIP_XCLIENTS = 1,
} MetaWaylandKeyboardSetKeymapFlags; } MetaWaylandKeyboardSetKeymapFlags;
void void meta_wayland_keyboard_set_keymap_names (MetaWaylandKeyboard *keyboard,
meta_wayland_keyboard_set_keymap_names (MetaWaylandKeyboard *keyboard,
const char *rules, const char *rules,
const char *model, const char *model,
const char *layout, const char *layout,
@ -140,13 +132,11 @@ meta_wayland_keyboard_set_keymap_names (MetaWaylandKeyboard *keyboard,
const char *options, const char *options,
int flags); int flags);
struct wl_client * struct wl_client * meta_wayland_keyboard_get_focus_client (MetaWaylandKeyboard *keyboard);
meta_wayland_keyboard_get_focus_client (MetaWaylandKeyboard *keyboard);
void void meta_wayland_keyboard_create_new_resource (MetaWaylandKeyboard *keyboard,
meta_wayland_keyboard_create_new_resource (MetaWaylandKeyboard *keyboard,
struct wl_client *client, struct wl_client *client,
struct wl_resource *seat_resource, struct wl_resource *seat_resource,
uint32_t id); uint32_t id);
#endif /* __META_WAYLAND_KEYBOARD_H__ */ #endif /* META_WAYLAND_KEYBOARD_H */

42
src/wayland/meta-wayland-pointer.h
View File

@ -17,8 +17,8 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __META_WAYLAND_POINTER_H__ #ifndef META_WAYLAND_POINTER_H
#define __META_WAYLAND_POINTER_H__ #define META_WAYLAND_POINTER_H
#include <wayland-server.h> #include <wayland-server.h>
@ -74,52 +74,40 @@ struct _MetaWaylandPointer
guint32 button_count; guint32 button_count;
}; };
void void meta_wayland_pointer_init (MetaWaylandPointer *pointer,
meta_wayland_pointer_init (MetaWaylandPointer *pointer,
struct wl_display *display); struct wl_display *display);
void void meta_wayland_pointer_release (MetaWaylandPointer *pointer);
meta_wayland_pointer_release (MetaWaylandPointer *pointer);
void void meta_wayland_pointer_update (MetaWaylandPointer *pointer,
meta_wayland_pointer_update (MetaWaylandPointer *pointer,
const ClutterEvent *event); const ClutterEvent *event);
gboolean gboolean meta_wayland_pointer_handle_event (MetaWaylandPointer *pointer,
meta_wayland_pointer_handle_event (MetaWaylandPointer *pointer,
const ClutterEvent *event); const ClutterEvent *event);
void void meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
MetaWaylandSurface *surface); MetaWaylandSurface *surface);
void void meta_wayland_pointer_start_grab (MetaWaylandPointer *pointer,
meta_wayland_pointer_start_grab (MetaWaylandPointer *pointer,
MetaWaylandPointerGrab *grab); MetaWaylandPointerGrab *grab);
void void meta_wayland_pointer_end_grab (MetaWaylandPointer *pointer);
meta_wayland_pointer_end_grab (MetaWaylandPointer *pointer);
gboolean gboolean meta_wayland_pointer_start_popup_grab (MetaWaylandPointer *pointer,
meta_wayland_pointer_start_popup_grab (MetaWaylandPointer *pointer,
MetaWaylandSurface *popup); MetaWaylandSurface *popup);
void void meta_wayland_pointer_repick (MetaWaylandPointer *pointer);
meta_wayland_pointer_repick (MetaWaylandPointer *pointer);
void void meta_wayland_pointer_get_relative_coordinates (MetaWaylandPointer *pointer,
meta_wayland_pointer_get_relative_coordinates (MetaWaylandPointer *pointer,
MetaWaylandSurface *surface, MetaWaylandSurface *surface,
wl_fixed_t *x, wl_fixed_t *x,
wl_fixed_t *y); wl_fixed_t *y);
void void meta_wayland_pointer_update_cursor_surface (MetaWaylandPointer *pointer);
meta_wayland_pointer_update_cursor_surface (MetaWaylandPointer *pointer);
void void meta_wayland_pointer_create_new_resource (MetaWaylandPointer *pointer,
meta_wayland_pointer_create_new_resource (MetaWaylandPointer *pointer,
struct wl_client *client, struct wl_client *client,
struct wl_resource *seat_resource, struct wl_resource *seat_resource,
uint32_t id); uint32_t id);
#endif /* __META_WAYLAND_POINTER_H__ */ #endif /* META_WAYLAND_POINTER_H */

25
src/wayland/meta-wayland-seat.h
View File

@ -19,8 +19,8 @@
* 02111-1307, USA. * 02111-1307, USA.
*/ */
#ifndef __META_WAYLAND_SEAT_H__ #ifndef META_WAYLAND_SEAT_H
#define __META_WAYLAND_SEAT_H__ #define META_WAYLAND_SEAT_H
#include <wayland-server.h> #include <wayland-server.h>
#include <clutter/clutter.h> #include <clutter/clutter.h>
@ -57,24 +57,17 @@ struct _MetaWaylandSeat
struct wl_display *display; struct wl_display *display;
}; };
void void meta_wayland_seat_init (MetaWaylandCompositor *compositor);
meta_wayland_seat_init (MetaWaylandCompositor *compositor);
void void meta_wayland_seat_free (MetaWaylandSeat *seat);
meta_wayland_seat_free (MetaWaylandSeat *seat);
void void meta_wayland_seat_update (MetaWaylandSeat *seat,
meta_wayland_seat_update (MetaWaylandSeat *seat,
const ClutterEvent *event); const ClutterEvent *event);
gboolean gboolean meta_wayland_seat_handle_event (MetaWaylandSeat *seat,
meta_wayland_seat_handle_event (MetaWaylandSeat *seat,
const ClutterEvent *event); const ClutterEvent *event);
void void meta_wayland_seat_repick (MetaWaylandSeat *seat);
meta_wayland_seat_repick (MetaWaylandSeat *seat); void meta_wayland_seat_update_cursor_surface (MetaWaylandSeat *seat);
void #endif /* META_WAYLAND_SEAT_H */
meta_wayland_seat_update_cursor_surface (MetaWaylandSeat *seat);
#endif /* __META_WAYLAND_SEAT_H__ */

8
src/wayland/meta-wayland.h
View File

@ -32,15 +32,15 @@ void meta_wayland_finalize (void);
* API after meta_wayland_init() has been called. */ * API after meta_wayland_init() has been called. */
MetaWaylandCompositor *meta_wayland_compositor_get_default (void); MetaWaylandCompositor *meta_wayland_compositor_get_default (void);
void meta_wayland_compositor_update (MetaWaylandCompositor *compositor,
const ClutterEvent *event);
gboolean meta_wayland_compositor_handle_event (MetaWaylandCompositor *compositor,
const ClutterEvent *event);
void meta_wayland_compositor_repick (MetaWaylandCompositor *compositor); void meta_wayland_compositor_repick (MetaWaylandCompositor *compositor);
void meta_wayland_compositor_set_input_focus (MetaWaylandCompositor *compositor, void meta_wayland_compositor_set_input_focus (MetaWaylandCompositor *compositor,
MetaWindow *window); MetaWindow *window);
gboolean meta_wayland_compositor_handle_event (MetaWaylandCompositor *compositor,
const ClutterEvent *event);
void meta_wayland_compositor_update (MetaWaylandCompositor *compositor,
const ClutterEvent *event);
void meta_wayland_compositor_paint_finished (MetaWaylandCompositor *compositor); void meta_wayland_compositor_paint_finished (MetaWaylandCompositor *compositor);
#endif #endif