meego-tablet-shell: Rename tablet_client.poke to activate and add a destructor

dev
Kristian Høgsberg 14 years ago
parent 92fb0e9e39
commit 81e8c26176
  1. 27
      compositor/meego-tablet-shell.c
  2. 3
      protocol/meego-tablet.xml

@ -343,7 +343,13 @@ destroy_tablet_client(struct wl_resource *resource, struct wl_client *client)
} }
static void static void
tablet_client_poke(struct wl_client *client, tablet_client_destroy(struct wl_client *client,
struct meego_tablet_client *tablet_client)
{
}
static void
tablet_client_activate(struct wl_client *client,
struct meego_tablet_client *tablet_client) struct meego_tablet_client *tablet_client)
{ {
struct wlsc_compositor *compositor = tablet_client->shell->compositor; struct wlsc_compositor *compositor = tablet_client->shell->compositor;
@ -351,18 +357,25 @@ tablet_client_poke(struct wl_client *client,
struct wlsc_input_device *device = struct wlsc_input_device *device =
(struct wlsc_input_device *) compositor->input_device; (struct wlsc_input_device *) compositor->input_device;
fprintf(stderr, "poke client %s\n", tablet_client->name); fprintf(stderr, "activate client %s\n", tablet_client->name);
shell->current_client = tablet_client; shell->current_client = tablet_client;
if (tablet_client->surface) { if (!tablet_client->surface)
return;
wlsc_surface_activate(tablet_client->surface, device, wlsc_surface_activate(tablet_client->surface, device,
wlsc_compositor_get_time()); wlsc_compositor_get_time());
meego_tablet_shell_set_state(tablet_client->shell,
STATE_TASK); if (shell->state == STATE_SWITCHER) {
} wl_list_remove(&shell->switcher_listener.link);
shell->switcher_surface = NULL;
};
meego_tablet_shell_set_state(tablet_client->shell, STATE_TASK);
} }
static const struct meego_tablet_client_interface tablet_client_interface = { static const struct meego_tablet_client_interface tablet_client_interface = {
tablet_client_poke tablet_client_destroy,
tablet_client_activate
}; };
static void static void

@ -33,7 +33,8 @@
</interface> </interface>
<interface name="meego_tablet_client" version="1"> <interface name="meego_tablet_client" version="1">
<request name="poke"/> <request name="destroy" type="destructor"/>
<request name="activate"/>
</interface> </interface>
</protocol> </protocol>

Loading…
Cancel
Save