Whitespace corrections

Signed-off-by: Murray Calavera <murray.calavera@gmail.com>
dev
Murray Calavera 10 years ago committed by Bryce Harrington
parent 97b9b17668
commit 883ac02d22
  1. 4
      clients/window.h
  2. 2
      shared/cairo-util.h
  3. 2
      src/compositor-x11.c
  4. 2
      src/libbacklight.c
  5. 2
      src/libbacklight.h
  6. 10
      src/weston-launch.c
  7. 2
      wcap/main.c
  8. 2
      wcap/wcap-decode.c
  9. 14
      xwayland/window-manager.c

@ -262,9 +262,9 @@ typedef void (*widget_touch_motion_handler_t)(struct widget *widget,
float x, float x,
float y, float y,
void *data); 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); 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); struct input *input, void *data);
typedef void (*widget_axis_handler_t)(struct widget *widget, typedef void (*widget_axis_handler_t)(struct widget *widget,
struct input *input, uint32_t time, struct input *input, uint32_t time,

@ -69,7 +69,7 @@ enum {
void void
theme_set_background_source(struct theme *t, cairo_t *cr, uint32_t flags); theme_set_background_source(struct theme *t, cairo_t *cr, uint32_t flags);
void void
theme_render_frame(struct theme *t, theme_render_frame(struct theme *t,
cairo_t *cr, int width, int height, cairo_t *cr, int width, int height,
const char *title, struct wl_list *buttons, const char *title, struct wl_list *buttons,
uint32_t flags); uint32_t flags);

@ -511,7 +511,7 @@ x11_output_set_wm_protocols(struct x11_compositor *c,
xcb_atom_t list[1]; xcb_atom_t list[1];
list[0] = c->atom.wm_delete_window; list[0] = c->atom.wm_delete_window;
xcb_change_property (c->conn, xcb_change_property (c->conn,
XCB_PROP_MODE_REPLACE, XCB_PROP_MODE_REPLACE,
output->window, output->window,
c->atom.wm_protocols, c->atom.wm_protocols,

@ -259,7 +259,7 @@ struct backlight *backlight_init(struct udev_device *drm_device,
parent = basename(buffer); 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 */ platform backlights have to be assumed to match */
if (entry_type == BACKLIGHT_RAW || if (entry_type == BACKLIGHT_RAW ||
entry_type == BACKLIGHT_FIRMWARE) { entry_type == BACKLIGHT_FIRMWARE) {

@ -5,7 +5,7 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
enum backlight_type { enum backlight_type {
BACKLIGHT_RAW, BACKLIGHT_RAW,

@ -114,7 +114,7 @@ read_groups(void)
{ {
int n; int n;
gid_t *groups; gid_t *groups;
n = getgroups(0, NULL); n = getgroups(0, NULL);
if (n < 0) { if (n < 0) {
@ -174,7 +174,7 @@ weston_launch_allowed(struct weston_launch *wl)
free(session); free(session);
} }
#endif #endif
return false; return false;
} }
@ -224,7 +224,7 @@ setup_launcher_socket(struct weston_launch *wl)
{ {
if (socketpair(AF_LOCAL, SOCK_SEQPACKET, 0, wl->sock) < 0) if (socketpair(AF_LOCAL, SOCK_SEQPACKET, 0, wl->sock) < 0)
error(1, errno, "socketpair failed"); error(1, errno, "socketpair failed");
if (fcntl(wl->sock[0], F_SETFD, FD_CLOEXEC) < 0) if (fcntl(wl->sock[0], F_SETFD, FD_CLOEXEC) < 0)
error(1, errno, "fcntl failed"); 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"); error(1, errno, "could not open tty0");
if (ioctl(tty0, VT_OPENQRY, &wl->ttynr) < 0 || wl->ttynr == -1) 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); snprintf(filename, sizeof filename, "/dev/tty%d", wl->ttynr);
wl->tty = open(filename, O_RDWR | O_NOCTTY); wl->tty = open(filename, O_RDWR | O_NOCTTY);
@ -680,7 +680,7 @@ main(int argc, char *argv[])
{ "verbose", no_argument, NULL, 'v' }, { "verbose", no_argument, NULL, 'v' },
{ "help", no_argument, NULL, 'h' }, { "help", no_argument, NULL, 'h' },
{ 0, 0, NULL, 0 } { 0, 0, NULL, 0 }
}; };
memset(&wl, 0, sizeof wl); memset(&wl, 0, sizeof wl);

@ -151,7 +151,7 @@ convert_to_yuv444(struct wcap_decoder *decoder, unsigned char *out)
up = yp + (psize * 2); up = yp + (psize * 2);
vp = yp + (psize * 1); vp = yp + (psize * 1);
rp = decoder->frame + decoder->width * i; rp = decoder->frame + decoder->width * i;
end = rp + decoder->width; end = rp + decoder->width;
while (rp < end) { while (rp < end) {
u = 0; u = 0;
v = 0; v = 0;

@ -131,7 +131,7 @@ wcap_decoder_create(const char *filename)
free(decoder); free(decoder);
return NULL; return NULL;
} }
header = decoder->map; header = decoder->map;
decoder->format = header->format; decoder->format = header->format;
decoder->count = 0; decoder->count = 0;

@ -595,7 +595,7 @@ weston_wm_window_send_configure_notify(struct weston_wm_window *window)
configure_notify.override_redirect = 0; configure_notify.override_redirect = 0;
configure_notify.pad1 = 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, XCB_EVENT_MASK_STRUCTURE_NOTIFY,
(char *) &configure_notify); (char *) &configure_notify);
} }
@ -603,7 +603,7 @@ weston_wm_window_send_configure_notify(struct weston_wm_window *window)
static void static void
weston_wm_handle_configure_request(struct weston_wm *wm, xcb_generic_event_t *event) 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; (xcb_configure_request_event_t *) event;
struct weston_wm_window *window; struct weston_wm_window *window;
uint32_t mask, values[16]; uint32_t mask, values[16];
@ -672,7 +672,7 @@ our_resource(struct weston_wm *wm, uint32_t id)
static void static void
weston_wm_handle_configure_notify(struct weston_wm *wm, xcb_generic_event_t *event) 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; (xcb_configure_notify_event_t *) event;
struct weston_wm_window *window; struct weston_wm_window *window;
@ -726,7 +726,7 @@ weston_wm_create_surface(struct wl_listener *listener, void *data)
window->surface_id = 0; window->surface_id = 0;
wl_list_remove(&window->link); wl_list_remove(&window->link);
break; break;
} }
} }
static void 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[0] = wm->atom.wm_take_focus;
client_message.data.data32[1] = XCB_TIME_CURRENT_TIME; 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, XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT,
(char *) &client_message); (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 /* We leave an extra pixel around the X window area to
* make sure we don't sample from the undefined alpha * make sure we don't sample from the undefined alpha
* channel when filtering. */ * channel when filtering. */
pixman_region32_init_rect(&window->surface->pending.opaque, pixman_region32_init_rect(&window->surface->pending.opaque,
x - 1, y - 1, x - 1, y - 1,
window->width + 2, window->width + 2,
window->height + 2); window->height + 2);
@ -2476,7 +2476,7 @@ xserver_map_shell_surface(struct weston_wm_window *window,
return; return;
} }
window->shsurf = window->shsurf =
shell_interface->create_shell_surface(shell_interface->shell, shell_interface->create_shell_surface(shell_interface->shell,
window->surface, window->surface,
&shell_client); &shell_client);

Loading…
Cancel
Save