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

libweston: remove restore functionality

Browse Source 
This was used from the crash handlers, which do not exist anymore.
Nothing calls restore, so delete the dead code.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Daniel Stone <daniels@collabora.com>
dev
Pekka Paalanen 7 years ago committed by Daniel Stone
parent bb707dc0fe
commit f461414501
13 changed files with 0 additions and 60 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      libweston/compositor-drm.c
  2. 7
      libweston/compositor-fbdev.c
  3. 6
      libweston/compositor-headless.c
  4. 6
      libweston/compositor-rdp.c
  5. 6
      libweston/compositor-wayland.c
  6. 6
      libweston/compositor-x11.c
  7. 1
      libweston/compositor.h
  8. 1
      libweston/launcher-direct.c
  9. 1
      libweston/launcher-impl.h
  10. 8
      libweston/launcher-logind.c
  11. 7
      libweston/launcher-util.c
  12. 3
      libweston/launcher-util.h
  13. 1
      libweston/launcher-weston-launch.c

7
libweston/compositor-drm.c
Unescape View File

@ -5117,12 +5117,6 @@ udev_drm_event(int fd, uint32_t mask, void *data)
return 1;
}
static void
drm_restore(struct weston_compositor *ec)
{
weston_launcher_restore(ec->launcher);
}
static void
drm_destroy(struct weston_compositor *ec)
{
@ -5651,7 +5645,6 @@ drm_backend_create(struct weston_compositor *compositor,
}
b->base.destroy = drm_destroy;
b->base.restore = drm_restore;
b->base.repaint_begin = drm_repaint_begin;
b->base.repaint_flush = drm_repaint_flush;
b->base.repaint_cancel = drm_repaint_cancel;

7
libweston/compositor-fbdev.c
Unescape View File

@ -698,12 +698,6 @@ session_notify(struct wl_listener *listener, void *data)
}
}
static void
fbdev_restore(struct weston_compositor *compositor)
{
weston_launcher_restore(compositor->launcher);
}
static struct fbdev_backend *
fbdev_backend_create(struct weston_compositor *compositor,
struct weston_fbdev_backend_config *param)
@ -743,7 +737,6 @@ fbdev_backend_create(struct weston_compositor *compositor,
}
backend->base.destroy = fbdev_backend_destroy;
backend->base.restore = fbdev_restore;
backend->prev_state = WESTON_COMPOSITOR_ACTIVE;

6
libweston/compositor-headless.c
Unescape View File

@ -245,11 +245,6 @@ headless_output_create(struct weston_compositor *compositor,
return 0;
}
static void
headless_restore(struct weston_compositor *ec)
{
}
static void
headless_destroy(struct weston_compositor *ec)
{
@ -283,7 +278,6 @@ headless_backend_create(struct weston_compositor *compositor,
goto err_free;
b->base.destroy = headless_destroy;
b->base.restore = headless_restore;
b->use_pixman = config->use_pixman;
if (b->use_pixman) {

6
libweston/compositor-rdp.c
Unescape View File

@ -596,11 +596,6 @@ rdp_backend_create_output(struct weston_compositor *compositor)
return 0;
}
static void
rdp_restore(struct weston_compositor *ec)
{
}
static void
rdp_destroy(struct weston_compositor *ec)
{
@ -1303,7 +1298,6 @@ rdp_backend_create(struct weston_compositor *compositor,
b->compositor = compositor;
b->base.destroy = rdp_destroy;
b->base.restore = rdp_restore;
b->rdp_key = config->rdp_key ? strdup(config->rdp_key) : NULL;
b->no_clients_resize = config->no_clients_resize;

6
libweston/compositor-wayland.c
Unescape View File

@ -2450,11 +2450,6 @@ wayland_backend_handle_event(int fd, uint32_t mask, void *data)
return count;
}
static void
wayland_restore(struct weston_compositor *ec)
{
}
static void
wayland_destroy(struct weston_compositor *ec)
{
@ -2618,7 +2613,6 @@ wayland_backend_create(struct weston_compositor *compositor,
}
b->base.destroy = wayland_destroy;
b->base.restore = wayland_restore;
loop = wl_display_get_event_loop(compositor->wl_display);

6
libweston/compositor-x11.c
Unescape View File

@ -1742,11 +1742,6 @@ x11_backend_get_wm_info(struct x11_backend *c)
free(reply);
}
static void
x11_restore(struct weston_compositor *ec)
{
}
static void
x11_destroy(struct weston_compositor *ec)
{
@ -1839,7 +1834,6 @@ x11_backend_create(struct weston_compositor *compositor,
weston_log("Using %s renderer\n", config->use_pixman ? "pixman" : "gl");
b->base.destroy = x11_destroy;
b->base.restore = x11_restore;
if (x11_input_create(b, config->no_input) < 0) {
weston_log("Failed to create X11 input\n");

1
libweston/compositor.h
Unescape View File

@ -820,7 +820,6 @@ struct weston_backend_config {
struct weston_backend {
void (*destroy)(struct weston_compositor *compositor);
void (*restore)(struct weston_compositor *compositor);
/** Begin a repaint sequence
*

1
libweston/launcher-direct.c
Unescape View File

@ -333,6 +333,5 @@ const struct launcher_interface launcher_direct_iface = {
.open = launcher_direct_open,
.close = launcher_direct_close,
.activate_vt = launcher_direct_activate_vt,
.restore = launcher_direct_restore,
.get_vt = launcher_direct_get_vt,
};

1
libweston/launcher-impl.h
Unescape View File

@ -36,7 +36,6 @@ struct launcher_interface {
int (* open) (struct weston_launcher *launcher, const char *path, int flags);
void (* close) (struct weston_launcher *launcher, int fd);
int (* activate_vt) (struct weston_launcher *launcher, int vt);
void (* restore) (struct weston_launcher *launcher);
/* Get the number of the VT weston is running in */
int (* get_vt) (struct weston_launcher *launcher);
};

8
libweston/launcher-logind.c
Unescape View File

@ -238,11 +238,6 @@ launcher_logind_close(struct weston_launcher *launcher, int fd)
minor(st.st_rdev));
}
static void
launcher_logind_restore(struct weston_launcher *launcher)
{
}
static int
launcher_logind_activate_vt(struct weston_launcher *launcher, int vt)
{
@ -382,7 +377,6 @@ static void
disconnected_dbus(struct launcher_logind *wl)
{
weston_log("logind: dbus connection lost, exiting..\n");
launcher_logind_restore(&wl->base);
exit(-1);
}
@ -403,7 +397,6 @@ session_removed(struct launcher_logind *wl, DBusMessage *m)
if (!strcmp(name, wl->sid)) {
weston_log("logind: our session got closed, exiting..\n");
launcher_logind_restore(&wl->base);
exit(-1);
}
}
@ -852,6 +845,5 @@ const struct launcher_interface launcher_logind_iface = {
.open = launcher_logind_open,
.close = launcher_logind_close,
.activate_vt = launcher_logind_activate_vt,
.restore = launcher_logind_restore,
.get_vt = launcher_logind_get_vt,
};

7
libweston/launcher-util.c
Unescape View File

@ -86,13 +86,6 @@ weston_launcher_activate_vt(struct weston_launcher *launcher, int vt)
return launcher->iface->activate_vt(launcher, vt);
}
WL_EXPORT void
weston_launcher_restore(struct weston_launcher *launcher)
{
launcher->iface->restore(launcher);
}
static void
switch_vt_binding(struct weston_keyboard *keyboard,
const struct timespec *time, uint32_t key, void *data)

3
libweston/launcher-util.h
Unescape View File

@ -49,9 +49,6 @@ weston_launcher_close(struct weston_launcher *launcher, int fd);
int
weston_launcher_activate_vt(struct weston_launcher *launcher, int vt);
void
weston_launcher_restore(struct weston_launcher *launcher);
void
weston_setup_vt_switch_bindings(struct weston_compositor *compositor);

1
libweston/launcher-weston-launch.c
Unescape View File

@ -303,6 +303,5 @@ const struct launcher_interface launcher_weston_launch_iface = {
.open = launcher_weston_launch_open,
.close = launcher_weston_launch_close,
.activate_vt = launcher_weston_launch_activate_vt,
.restore = launcher_weston_launch_restore,
.get_vt = launcher_weston_launch_get_vt,
};

Write Preview
Loading…
Cancel
Save