fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-04 21:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

compositor: Remove shell->activate callback

Browse source 
It's all internal to the shell plugin now.
This commit is contained in:
Kristian Høgsberg 2011-12-19 15:19:54 -05:00
parent e1a850e5b0
commit 2a25cd4ffa
3 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
compositor/compositor.h
View file

@ -148,9 +148,6 @@ struct wlsc_spring {
};
struct wlsc_shell {
void (*activate)(struct wlsc_shell *shell,
struct wlsc_surface *es,
struct wlsc_input_device *device, uint32_t time);
void (*lock)(struct wlsc_shell *shell);
void (*unlock)(struct wlsc_shell *shell);
void (*map)(struct wlsc_shell *shell, struct wlsc_surface *surface,

4
compositor/shell.c
View file

@ -861,8 +861,7 @@ click_to_activate_binding(struct wl_input_device *device,
focus = (struct wlsc_surface *) device->pointer_focus;
if (state && focus && device->grab == NULL)
compositor->shell->activate(compositor->shell,
focus, wd, time);
activate(compositor->shell, focus, wd, time);
}
static void
@ -1249,7 +1248,6 @@ shell_init(struct wlsc_compositor *ec)
memset(shell, 0, sizeof *shell);
shell->compositor = ec;
shell->shell.activate = activate;
shell->shell.lock = lock;
shell->shell.unlock = unlock;
shell->shell.map = map;

8
compositor/tablet-shell.c
View file

@ -388,13 +388,6 @@ toggle_switcher(struct tablet_shell *shell)
}
}
static void
tablet_shell_activate(struct wlsc_shell *base, struct wlsc_surface *es,
struct wlsc_input_device *device, uint32_t time)
{
wlsc_surface_activate(es, device, time);
}
static void
tablet_shell_lock(struct wlsc_shell *base)
{
@ -555,7 +548,6 @@ shell_init(struct wlsc_compositor *compositor)
compositor->shell = &shell->shell;
shell->shell.activate = tablet_shell_activate;
shell->shell.lock = tablet_shell_lock;
shell->shell.unlock = tablet_shell_unlock;
shell->shell.map = tablet_shell_map;