commit 03de3e248a78dbaf8775d462cfcafbe169c22e9e
parent 680957d351e033d051f38d1b1dead7a701616789
Author: Michael Forney <mforney@mforney.org>
Date: Sun, 16 Feb 2014 22:54:25 -0800
input_focus: Drop swc_ prefix for non-public structures/functions
Diffstat:
8 files changed, 54 insertions(+), 56 deletions(-)
diff --git a/libswc/input_focus.c b/libswc/input_focus.c
@@ -1,6 +1,6 @@
/* swc: input_focus.c
*
- * Copyright (c) 2013 Michael Forney
+ * Copyright (c) 2013, 2014 Michael Forney
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@
#include "surface.h"
#include "util.h"
-static inline void focus(struct swc_input_focus * input_focus,
+static inline void focus(struct input_focus * input_focus,
struct swc_surface * surface,
struct wl_resource * resource)
{
@@ -43,7 +43,7 @@ static inline void focus(struct swc_input_focus * input_focus,
input_focus->resource = resource;
}
-static inline void unfocus(struct swc_input_focus * input_focus)
+static inline void unfocus(struct input_focus * input_focus)
{
if (input_focus->surface)
wl_list_remove(&input_focus->surface_destroy_listener.link);
@@ -58,15 +58,15 @@ static inline void unfocus(struct swc_input_focus * input_focus)
static void handle_focus_surface_destroy(struct wl_listener * listener,
void * data)
{
- struct swc_input_focus * input_focus = CONTAINER_OF
+ struct input_focus * input_focus = CONTAINER_OF
(listener, typeof(*input_focus), surface_destroy_listener);
input_focus->surface = NULL;
input_focus->resource = NULL;
}
-bool swc_input_focus_initialize(struct swc_input_focus * input_focus,
- struct swc_input_focus_handler * handler)
+bool input_focus_initialize(struct input_focus * input_focus,
+ struct input_focus_handler * handler)
{
input_focus->resource = NULL;
input_focus->surface = NULL;
@@ -80,13 +80,13 @@ bool swc_input_focus_initialize(struct swc_input_focus * input_focus,
return true;
}
-void swc_input_focus_finalize(struct swc_input_focus * input_focus)
+void input_focus_finalize(struct input_focus * input_focus)
{
/* XXX: Destroy resources? */
}
-void swc_input_focus_add_resource(struct swc_input_focus * input_focus,
- struct wl_resource * resource)
+void input_focus_add_resource(struct input_focus * input_focus,
+ struct wl_resource * resource)
{
/* If this new input resource corresponds to our focus, set it as our
* focus. */
@@ -107,8 +107,8 @@ void swc_input_focus_add_resource(struct swc_input_focus * input_focus,
wl_list_insert(&input_focus->resources, wl_resource_get_link(resource));
}
-void swc_input_focus_remove_resource(struct swc_input_focus * input_focus,
- struct wl_resource * resource)
+void input_focus_remove_resource(struct input_focus * input_focus,
+ struct wl_resource * resource)
{
if (resource == input_focus->resource)
input_focus->resource = NULL;
@@ -116,12 +116,12 @@ void swc_input_focus_remove_resource(struct swc_input_focus * input_focus,
swc_remove_resource(resource);
}
-void swc_input_focus_set(struct swc_input_focus * input_focus,
- struct swc_surface * surface)
+void input_focus_set(struct input_focus * input_focus,
+ struct swc_surface * surface)
{
struct wl_client * client;
struct wl_resource * resource;
- struct swc_input_focus_event_data data;
+ struct input_focus_event_data data;
if (surface == input_focus->surface)
return;
@@ -147,7 +147,7 @@ void swc_input_focus_set(struct swc_input_focus * input_focus,
data.new = input_focus->surface;
- swc_send_event(&input_focus->event_signal, SWC_INPUT_FOCUS_EVENT_CHANGED,
+ swc_send_event(&input_focus->event_signal, INPUT_FOCUS_EVENT_CHANGED,
&data);
return;
diff --git a/libswc/input_focus.h b/libswc/input_focus.h
@@ -1,6 +1,6 @@
/* swc: input_focus.h
*
- * Copyright (c) 2013 Michael Forney
+ * Copyright (c) 2013, 2014 Michael Forney
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -29,49 +29,49 @@
enum
{
- SWC_INPUT_FOCUS_EVENT_CHANGED
+ INPUT_FOCUS_EVENT_CHANGED
};
-struct swc_input_focus_event_data
+struct input_focus_event_data
{
struct swc_surface * old, * new;
};
-struct swc_input_focus_handler
+struct input_focus_handler
{
- void (* enter)(struct swc_input_focus_handler * handler,
+ void (* enter)(struct input_focus_handler * handler,
struct wl_resource * resource,
struct swc_surface * surface);
- void (* leave)(struct swc_input_focus_handler * handler,
+ void (* leave)(struct input_focus_handler * handler,
struct wl_resource * resource,
struct swc_surface * surface);
};
-struct swc_input_focus
+struct input_focus
{
struct wl_resource * resource;
struct swc_surface * surface;
struct wl_listener surface_destroy_listener;
- struct swc_input_focus_handler * handler;
+ struct input_focus_handler * handler;
struct wl_list resources;
struct wl_signal event_signal;
};
-bool swc_input_focus_initialize(struct swc_input_focus * input_focus,
- struct swc_input_focus_handler * input_handler);
+bool input_focus_initialize(struct input_focus * input_focus,
+ struct input_focus_handler * input_handler);
-void swc_input_focus_finalize(struct swc_input_focus * input_focus);
+void input_focus_finalize(struct input_focus * input_focus);
-void swc_input_focus_add_resource(struct swc_input_focus * input_focus,
- struct wl_resource * resource);
+void input_focus_add_resource(struct input_focus * input_focus,
+ struct wl_resource * resource);
-void swc_input_focus_remove_resource(struct swc_input_focus * input_focus,
- struct wl_resource * resource);
+void input_focus_remove_resource(struct input_focus * input_focus,
+ struct wl_resource * resource);
-void swc_input_focus_set(struct swc_input_focus * input_focus,
- struct swc_surface * surface);
+void input_focus_set(struct input_focus * input_focus,
+ struct swc_surface * surface);
#endif
diff --git a/libswc/keyboard.c b/libswc/keyboard.c
@@ -32,7 +32,7 @@
#include <stdio.h>
#include <string.h>
-static void enter(struct swc_input_focus_handler * handler,
+static void enter(struct input_focus_handler * handler,
struct wl_resource * resource, struct swc_surface * surface)
{
struct swc_keyboard * keyboard;
@@ -49,7 +49,7 @@ static void enter(struct swc_input_focus_handler * handler,
&keyboard->client_handler.keys);
}
-static void leave(struct swc_input_focus_handler * handler,
+static void leave(struct input_focus_handler * handler,
struct wl_resource * resource, struct swc_surface * surface)
{
struct wl_client * client;
@@ -110,7 +110,7 @@ bool swc_keyboard_initialize(struct swc_keyboard * keyboard)
goto error0;
}
- if (!swc_input_focus_initialize(&keyboard->focus, &keyboard->focus_handler))
+ if (!input_focus_initialize(&keyboard->focus, &keyboard->focus_handler))
goto error1;
keyboard->modifier_state = (struct swc_keyboard_modifier_state) { 0 };
@@ -123,8 +123,6 @@ bool swc_keyboard_initialize(struct swc_keyboard * keyboard)
wl_list_init(&keyboard->handlers);
wl_list_insert(&keyboard->handlers, &keyboard->client_handler.link);
- swc_input_focus_initialize(&keyboard->focus, &keyboard->focus_handler);
-
return true;
error1:
@@ -136,7 +134,7 @@ bool swc_keyboard_initialize(struct swc_keyboard * keyboard)
void swc_keyboard_finalize(struct swc_keyboard * keyboard)
{
wl_array_release(&keyboard->client_handler.keys);
- swc_input_focus_finalize(&keyboard->focus);
+ input_focus_finalize(&keyboard->focus);
swc_xkb_finalize(&keyboard->xkb);
}
@@ -146,14 +144,14 @@ void swc_keyboard_finalize(struct swc_keyboard * keyboard)
void swc_keyboard_set_focus(struct swc_keyboard * keyboard,
struct swc_surface * surface)
{
- swc_input_focus_set(&keyboard->focus, surface);
+ input_focus_set(&keyboard->focus, surface);
}
static void unbind(struct wl_resource * resource)
{
struct swc_keyboard * keyboard = wl_resource_get_user_data(resource);
- swc_input_focus_remove_resource(&keyboard->focus, resource);
+ input_focus_remove_resource(&keyboard->focus, resource);
}
struct wl_resource * swc_keyboard_bind(struct swc_keyboard * keyboard,
@@ -163,7 +161,7 @@ struct wl_resource * swc_keyboard_bind(struct swc_keyboard * keyboard,
client_resource = wl_resource_create(client, &wl_keyboard_interface, 1, id);
wl_resource_set_implementation(client_resource, NULL, keyboard, &unbind);
- swc_input_focus_add_resource(&keyboard->focus, client_resource);
+ input_focus_add_resource(&keyboard->focus, client_resource);
/* Subtract one to remove terminating NULL character. */
wl_keyboard_send_keymap(client_resource, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
diff --git a/libswc/keyboard.h b/libswc/keyboard.h
@@ -54,8 +54,8 @@ struct swc_keyboard_handler
struct swc_keyboard
{
- struct swc_input_focus focus;
- struct swc_input_focus_handler focus_handler;
+ struct input_focus focus;
+ struct input_focus_handler focus_handler;
struct swc_xkb xkb;
struct wl_list handlers;
diff --git a/libswc/pointer.c b/libswc/pointer.c
@@ -39,7 +39,7 @@ struct button_press
struct swc_pointer_handler * handler;
};
-static void enter(struct swc_input_focus_handler * handler,
+static void enter(struct input_focus_handler * handler,
struct wl_resource * resource, struct swc_surface * surface)
{
struct swc_pointer * pointer;
@@ -60,7 +60,7 @@ static void enter(struct swc_input_focus_handler * handler,
surface_x, surface_y);
}
-static void leave(struct swc_input_focus_handler * handler,
+static void leave(struct input_focus_handler * handler,
struct wl_resource * resource, struct swc_surface * surface)
{
struct wl_client * client;
@@ -278,7 +278,7 @@ bool swc_pointer_initialize(struct swc_pointer * pointer)
swc_pointer_set_cursor(pointer, cursor_left_ptr);
- swc_input_focus_initialize(&pointer->focus, &pointer->focus_handler);
+ input_focus_initialize(&pointer->focus, &pointer->focus_handler);
pixman_region32_init(&pointer->region);
return true;
@@ -286,7 +286,7 @@ bool swc_pointer_initialize(struct swc_pointer * pointer)
void swc_pointer_finalize(struct swc_pointer * pointer)
{
- swc_input_focus_finalize(&pointer->focus);
+ input_focus_finalize(&pointer->focus);
pixman_region32_fini(&pointer->region);
}
@@ -296,7 +296,7 @@ void swc_pointer_finalize(struct swc_pointer * pointer)
void swc_pointer_set_focus(struct swc_pointer * pointer,
struct swc_surface * surface)
{
- swc_input_focus_set(&pointer->focus, surface);
+ input_focus_set(&pointer->focus, surface);
}
static void clip_position(struct swc_pointer * pointer,
@@ -365,7 +365,7 @@ static void unbind(struct wl_resource * resource)
{
struct swc_pointer * pointer = wl_resource_get_user_data(resource);
- swc_input_focus_remove_resource(&pointer->focus, resource);
+ input_focus_remove_resource(&pointer->focus, resource);
}
struct wl_resource * swc_pointer_bind(struct swc_pointer * pointer,
@@ -376,7 +376,7 @@ struct wl_resource * swc_pointer_bind(struct swc_pointer * pointer,
client_resource = wl_resource_create(client, &wl_pointer_interface, 1, id);
wl_resource_set_implementation(client_resource, &pointer_implementation,
pointer, &unbind);
- swc_input_focus_add_resource(&pointer->focus, client_resource);
+ input_focus_add_resource(&pointer->focus, client_resource);
return client_resource;
}
diff --git a/libswc/pointer.h b/libswc/pointer.h
@@ -47,8 +47,8 @@ struct swc_pointer_handler
struct swc_pointer
{
- struct swc_input_focus focus;
- struct swc_input_focus_handler focus_handler;
+ struct input_focus focus;
+ struct input_focus_handler focus_handler;
struct
{
diff --git a/libswc/seat.c b/libswc/seat.c
@@ -96,11 +96,11 @@ static void handle_keyboard_focus_event(struct wl_listener * listener,
void * data)
{
struct swc_event * event = data;
- struct swc_input_focus_event_data * event_data = event->data;
+ struct input_focus_event_data * event_data = event->data;
switch (event->type)
{
- case SWC_INPUT_FOCUS_EVENT_CHANGED:
+ case INPUT_FOCUS_EVENT_CHANGED:
if (event_data->new)
{
struct wl_client * client
diff --git a/libswc/window.c b/libswc/window.c
@@ -39,10 +39,10 @@
static void handle_window_enter(struct wl_listener * listener, void * data)
{
struct swc_event * event = data;
- struct swc_input_focus_event_data * event_data = event->data;
+ struct input_focus_event_data * event_data = event->data;
struct window * window;
- if (event->type != SWC_INPUT_FOCUS_EVENT_CHANGED)
+ if (event->type != INPUT_FOCUS_EVENT_CHANGED)
return;
if (!event_data->new || !(window = event_data->new->window))
