From 883ac02d220b4e5c4e85f7287adc0b158ef45896 Mon Sep 17 00:00:00 2001 From: Murray Calavera Date: Sat, 6 Jun 2015 13:02:22 +0000 Subject: [PATCH] Whitespace corrections Signed-off-by: Murray Calavera --- clients/window.h | 4 ++-- shared/cairo-util.h | 2 +- src/compositor-x11.c | 2 +- src/libbacklight.c | 2 +- src/libbacklight.h | 2 +- src/weston-launch.c | 10 +++++----- wcap/main.c | 2 +- wcap/wcap-decode.c | 2 +- xwayland/window-manager.c | 14 +++++++------- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/clients/window.h b/clients/window.h index 0686c3fc..34a5ef32 100644 --- a/clients/window.h +++ b/clients/window.h @@ -262,9 +262,9 @@ typedef void (*widget_touch_motion_handler_t)(struct widget *widget, float x, float y, void *data); -typedef void (*widget_touch_frame_handler_t)(struct widget *widget, +typedef void (*widget_touch_frame_handler_t)(struct widget *widget, struct input *input, void *data); -typedef void (*widget_touch_cancel_handler_t)(struct widget *widget, +typedef void (*widget_touch_cancel_handler_t)(struct widget *widget, struct input *input, void *data); typedef void (*widget_axis_handler_t)(struct widget *widget, struct input *input, uint32_t time, diff --git a/shared/cairo-util.h b/shared/cairo-util.h index dc735a6c..2f49ef88 100644 --- a/shared/cairo-util.h +++ b/shared/cairo-util.h @@ -69,7 +69,7 @@ enum { void theme_set_background_source(struct theme *t, cairo_t *cr, uint32_t flags); void -theme_render_frame(struct theme *t, +theme_render_frame(struct theme *t, cairo_t *cr, int width, int height, const char *title, struct wl_list *buttons, uint32_t flags); diff --git a/src/compositor-x11.c b/src/compositor-x11.c index 35656777..1c9c2f13 100644 --- a/src/compositor-x11.c +++ b/src/compositor-x11.c @@ -511,7 +511,7 @@ x11_output_set_wm_protocols(struct x11_compositor *c, xcb_atom_t list[1]; list[0] = c->atom.wm_delete_window; - xcb_change_property (c->conn, + xcb_change_property (c->conn, XCB_PROP_MODE_REPLACE, output->window, c->atom.wm_protocols, diff --git a/src/libbacklight.c b/src/libbacklight.c index 54f33182..722d66f0 100644 --- a/src/libbacklight.c +++ b/src/libbacklight.c @@ -259,7 +259,7 @@ struct backlight *backlight_init(struct udev_device *drm_device, parent = basename(buffer); - /* Perform matching for raw and firmware backlights - + /* Perform matching for raw and firmware backlights - platform backlights have to be assumed to match */ if (entry_type == BACKLIGHT_RAW || entry_type == BACKLIGHT_FIRMWARE) { diff --git a/src/libbacklight.h b/src/libbacklight.h index 0c326711..0d3293d9 100644 --- a/src/libbacklight.h +++ b/src/libbacklight.h @@ -5,7 +5,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif enum backlight_type { BACKLIGHT_RAW, diff --git a/src/weston-launch.c b/src/weston-launch.c index 10c66def..52c89d37 100644 --- a/src/weston-launch.c +++ b/src/weston-launch.c @@ -114,7 +114,7 @@ read_groups(void) { int n; gid_t *groups; - + n = getgroups(0, NULL); if (n < 0) { @@ -174,7 +174,7 @@ weston_launch_allowed(struct weston_launch *wl) free(session); } #endif - + return false; } @@ -224,7 +224,7 @@ setup_launcher_socket(struct weston_launch *wl) { if (socketpair(AF_LOCAL, SOCK_SEQPACKET, 0, wl->sock) < 0) error(1, errno, "socketpair failed"); - + if (fcntl(wl->sock[0], F_SETFD, FD_CLOEXEC) < 0) error(1, errno, "fcntl failed"); @@ -531,7 +531,7 @@ setup_tty(struct weston_launch *wl, const char *tty) error(1, errno, "could not open tty0"); if (ioctl(tty0, VT_OPENQRY, &wl->ttynr) < 0 || wl->ttynr == -1) - error(1, errno, "failed to find non-opened console"); + error(1, errno, "failed to find non-opened console"); snprintf(filename, sizeof filename, "/dev/tty%d", wl->ttynr); wl->tty = open(filename, O_RDWR | O_NOCTTY); @@ -680,7 +680,7 @@ main(int argc, char *argv[]) { "verbose", no_argument, NULL, 'v' }, { "help", no_argument, NULL, 'h' }, { 0, 0, NULL, 0 } - }; + }; memset(&wl, 0, sizeof wl); diff --git a/wcap/main.c b/wcap/main.c index 16d37f00..984f0c1a 100644 --- a/wcap/main.c +++ b/wcap/main.c @@ -151,7 +151,7 @@ convert_to_yuv444(struct wcap_decoder *decoder, unsigned char *out) up = yp + (psize * 2); vp = yp + (psize * 1); rp = decoder->frame + decoder->width * i; - end = rp + decoder->width; + end = rp + decoder->width; while (rp < end) { u = 0; v = 0; diff --git a/wcap/wcap-decode.c b/wcap/wcap-decode.c index 76ecc2f4..c0adacbf 100644 --- a/wcap/wcap-decode.c +++ b/wcap/wcap-decode.c @@ -131,7 +131,7 @@ wcap_decoder_create(const char *filename) free(decoder); return NULL; } - + header = decoder->map; decoder->format = header->format; decoder->count = 0; diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c index 1ea2c4c1..ca662036 100644 --- a/xwayland/window-manager.c +++ b/xwayland/window-manager.c @@ -595,7 +595,7 @@ weston_wm_window_send_configure_notify(struct weston_wm_window *window) configure_notify.override_redirect = 0; configure_notify.pad1 = 0; - xcb_send_event(wm->conn, 0, window->id, + xcb_send_event(wm->conn, 0, window->id, XCB_EVENT_MASK_STRUCTURE_NOTIFY, (char *) &configure_notify); } @@ -603,7 +603,7 @@ weston_wm_window_send_configure_notify(struct weston_wm_window *window) static void weston_wm_handle_configure_request(struct weston_wm *wm, xcb_generic_event_t *event) { - xcb_configure_request_event_t *configure_request = + xcb_configure_request_event_t *configure_request = (xcb_configure_request_event_t *) event; struct weston_wm_window *window; uint32_t mask, values[16]; @@ -672,7 +672,7 @@ our_resource(struct weston_wm *wm, uint32_t id) static void weston_wm_handle_configure_notify(struct weston_wm *wm, xcb_generic_event_t *event) { - xcb_configure_notify_event_t *configure_notify = + xcb_configure_notify_event_t *configure_notify = (xcb_configure_notify_event_t *) event; struct weston_wm_window *window; @@ -726,7 +726,7 @@ weston_wm_create_surface(struct wl_listener *listener, void *data) window->surface_id = 0; wl_list_remove(&window->link); break; - } + } } static void @@ -755,7 +755,7 @@ weston_wm_window_activate(struct wl_listener *listener, void *data) client_message.data.data32[0] = wm->atom.wm_take_focus; client_message.data.data32[1] = XCB_TIME_CURRENT_TIME; - xcb_send_event(wm->conn, 0, window->id, + xcb_send_event(wm->conn, 0, window->id, XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, (char *) &client_message); @@ -1081,7 +1081,7 @@ weston_wm_window_draw_decoration(void *data) /* We leave an extra pixel around the X window area to * make sure we don't sample from the undefined alpha * channel when filtering. */ - pixman_region32_init_rect(&window->surface->pending.opaque, + pixman_region32_init_rect(&window->surface->pending.opaque, x - 1, y - 1, window->width + 2, window->height + 2); @@ -2476,7 +2476,7 @@ xserver_map_shell_surface(struct weston_wm_window *window, return; } - window->shsurf = + window->shsurf = shell_interface->create_shell_surface(shell_interface->shell, window->surface, &shell_client);