swc

commit 961bdedaeaca25ccef8832e973a387ae9e425706
parent 4a85e65f92f1540c27e51fd109f5b466b76fea53
Author: Michael Forney <mforney@mforney.org>
Date:   Fri, 21 Jun 2013 00:38:39 -0700

Style

Diffstat:
M
Makefile.am
 | 
8
+-------
M
data_device_manager.c
 | 
2
+-
M
region.c
 | 
10
++++------
M
seat.c
 | 
11
-----------
M
surface.c
 | 
11
++---------
M
util.h
 | 
11
-----------

6 files changed, 8 insertions(+), 45 deletions(-)
diff --git a/Makefile.am b/Makefile.am
@@ -1,11 +1,10 @@
 # swc: Makefile.am
 
 ACLOCAL_AMFLAGS = -I m4
+AM_CFLAGS = $(pixman_CFLAGS)
 
 lib_LTLIBRARIES = libswc.la
 
-AM_CFLAGS = $(pixman_CFLAGS)
-
 libswc_la_SOURCES = \
 	compositor.c compositor.h \
 	util.c util.h \
@@ -30,10 +29,5 @@ libswc_la_LIBADD = $(wayland_server_LIBS) $(udev_LIBS) $(xkbcommon_LIBS) \
 	$(drm_LIBS) $(drm_intel_LIBS) $(gbm_LIBS) $(egl_LIBS) $(pixman_LIBS) \
 	intel/libintel.la
 
-# testclient_SOURCES = \
-# 	testclient.c
-# 
-# testclient_LDADD = $(wayland_client_LIBS)
-
 SUBDIRS = intel
 
diff --git a/data_device_manager.c b/data_device_manager.c
@@ -21,7 +21,7 @@ static void get_data_device(struct wl_client * client,
 }
 
 static struct wl_data_device_manager_interface
-data_device_manager_implementation = {
+    data_device_manager_implementation = {
     .create_data_source = &create_data_source,
     .get_data_device = &get_data_device
 };
diff --git a/region.c b/region.c
@@ -18,9 +18,8 @@ static void destroy(struct wl_client * client,
     wl_resource_destroy(resource);
 }
 
-static void add(struct wl_client * client,
-                       struct wl_resource * resource,
-                       int32_t x, int32_t y, int32_t width, int32_t height)
+static void add(struct wl_client * client, struct wl_resource * resource,
+                int32_t x, int32_t y, int32_t width, int32_t height)
 {
     struct swc_region * region = resource->data;
 
@@ -28,9 +27,8 @@ static void add(struct wl_client * client,
                                x, y, width, height);
 }
 
-static void subtract(struct wl_client * client,
-                            struct wl_resource * resource,
-                            int32_t x, int32_t y, int32_t width, int32_t height)
+static void subtract(struct wl_client * client, struct wl_resource * resource,
+                     int32_t x, int32_t y, int32_t width, int32_t height)
 {
     struct swc_region * region = resource->data;
     pixman_region32_t operand;
diff --git a/seat.c b/seat.c
@@ -194,17 +194,6 @@ static void get_keyboard(struct wl_client * client, struct wl_resource * resourc
 static void get_touch(struct wl_client * client, struct wl_resource * resource,
                uint32_t id)
 {
-    /*
-    struct wl_resource * client_resource;
-    struct swc_seat * seat = resource->data;
-    struct wl_touch * touch = &seat->touch;
-
-    client_resource = wl_client_add_object(client, &wl_touch_interface,
-                                           NULL, id, seat);
-    client_resource->destroy = &swc_unbind_resource;
-
-    wl_list_insert(&touch->resources, &client_resource->link);
-    */
 }
 
 struct wl_seat_interface seat_implementation = {
diff --git a/surface.c b/surface.c
@@ -44,8 +44,6 @@ static void attach(struct wl_client * client, struct wl_resource * resource,
 {
     struct swc_surface * surface = resource->data;
 
-    printf("surface_attach\n");
-
     surface->pending.x = x;
     surface->pending.y = y;
 
@@ -69,7 +67,6 @@ static void attach(struct wl_client * client, struct wl_resource * resource,
 static void damage(struct wl_client * client, struct wl_resource * resource,
                    int32_t x, int32_t y, int32_t width, int32_t height)
 {
-    printf("surface_damage\n");
     struct swc_surface * surface = resource->data;
 
     pixman_region32_union_rect(&surface->pending.state.damage,
@@ -83,8 +80,6 @@ static void frame(struct wl_client * client, struct wl_resource * resource,
     struct swc_surface * surface = resource->data;
     struct wl_resource * callback_resource;
 
-    printf("surface_frame\n");
-
     callback_resource = wl_client_add_object(client, &wl_callback_interface,
                                              NULL, id, NULL);
     wl_list_insert(surface->pending.state.frame_callbacks.prev,
@@ -97,7 +92,7 @@ static void set_opaque_region(struct wl_client * client,
 {
     struct swc_surface * surface = resource->data;
 
-    printf("surface_set_opaque_region\n");
+    //printf("surface_set_opaque_region\n");
 
     if (region_resource)
     {
@@ -115,7 +110,7 @@ static void set_input_region(struct wl_client * client,
 {
     struct swc_surface * surface = resource->data;
 
-    printf("surface_set_input_region\n");
+    printf("surface.set_input_region\n");
 
     if (region_resource)
     {
@@ -132,8 +127,6 @@ static void commit(struct wl_client * client, struct wl_resource * resource)
     struct swc_surface * surface = resource->data;
     struct swc_event event;
 
-    printf("surface_commit\n");
-
     event.data = surface;
 
     if (surface->pending.state.buffer != surface->state.buffer)
diff --git a/util.h b/util.h
@@ -3,17 +3,6 @@
 
 #include <wayland-server.h>
 
-/*
-void swc_object_init(struct wl_object * object,
-                     const struct wl_interface * interface,
-                     const void * implementation, uint32_t id);
-
-void swc_resource_init(struct wl_resource * resource,
-                       struct wl_client * client, 
-
-void swc_client_add_object(struct wl_clientstruct wl_resource * resource, );
-*/
-
 void swc_unbind_resource(struct wl_resource * resource);
 
 struct wl_resource * swc_find_resource_for_client(struct wl_list * resources,