mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files
compositor/compositor.h
-3
View File
@@ -148,9 +148,6 @@ struct wlsc_spring {
}; };
struct wlsc_shell { 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 (*lock)(struct wlsc_shell *shell);
void (*unlock)(struct wlsc_shell *shell); void (*unlock)(struct wlsc_shell *shell);
void (*map)(struct wlsc_shell *shell, struct wlsc_surface *surface, void (*map)(struct wlsc_shell *shell, struct wlsc_surface *surface,
compositor/shell.c
+1 -3
View File
@@ -861,8 +861,7 @@ click_to_activate_binding(struct wl_input_device *device,
focus = (struct wlsc_surface *) device->pointer_focus; focus = (struct wlsc_surface *) device->pointer_focus;
if (state && focus && device->grab == NULL) if (state && focus && device->grab == NULL)
compositor->shell->activate(compositor->shell, activate(compositor->shell, focus, wd, time);
focus, wd, time);
} }
static void static void
@@ -1249,7 +1248,6 @@ shell_init(struct wlsc_compositor *ec)
memset(shell, 0, sizeof *shell); memset(shell, 0, sizeof *shell);
shell->compositor = ec; shell->compositor = ec;
shell->shell.activate = activate;
shell->shell.lock = lock; shell->shell.lock = lock;
shell->shell.unlock = unlock; shell->shell.unlock = unlock;
shell->shell.map = map; shell->shell.map = map;
compositor/tablet-shell.c
-8
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 static void
tablet_shell_lock(struct wlsc_shell *base) tablet_shell_lock(struct wlsc_shell *base)
{ {
@@ -555,7 +548,6 @@ shell_init(struct wlsc_compositor *compositor)
compositor->shell = &shell->shell; compositor->shell = &shell->shell;
shell->shell.activate = tablet_shell_activate;
shell->shell.lock = tablet_shell_lock; shell->shell.lock = tablet_shell_lock;
shell->shell.unlock = tablet_shell_unlock; shell->shell.unlock = tablet_shell_unlock;
shell->shell.map = tablet_shell_map; shell->shell.map = tablet_shell_map;