From 22fc971a680f8300eb8be278cc11c8e0990bb16d Mon Sep 17 00:00:00 2001 From: seanpringle Date: Sat, 8 Sep 2012 21:59:51 +1000 Subject: [PATCH] remove old code --- xoat.c | 11 +++-------- xoat.h | 5 ----- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/xoat.c b/xoat.c index 95e189a..b021a08 100644 --- a/xoat.c +++ b/xoat.c @@ -585,7 +585,8 @@ void action_rollback(void *data, int num, client *cli) int i; client *c = NULL, *s, *a = NULL; for (i = snapshot.depth-1; i > -1; i--) { - if ((s = snapshot.clients[i]) && (c = window_build_client(s->window)) && c->visible && c->manage) + if ((s = snapshot.clients[i]) && (c = window_build_client(s->window)) + && !strcmp(s->class, c->class) && c->visible && c->manage) { c->monitor = s->monitor; client_place_spot(c, s->spot, 1); @@ -889,17 +890,11 @@ int main(int argc, char *argv[]) XSelectInput(display, root, StructureNotifyMask | SubstructureRedirectMask | SubstructureNotifyMask); // ewmh support - unsigned long desktop = 0, desktops = 3, pid = getpid(), viewport[2] = { 0, 0 }, - geometry[2] = { monitors[0].w, monitors[0].h }; - + unsigned long pid = getpid(); ewmh = XCreateSimpleWindow(display, root, 0, 0, 1, 1, 0, 0, 0); window_set_atom_prop(root, atoms[_NET_SUPPORTED], atoms, ATOMS); window_set_window_prop(root, atoms[_NET_SUPPORTING_WM_CHECK], &ewmh, 1); - window_set_cardinal_prop(root, atoms[_NET_CURRENT_DESKTOP], &desktop, 1); - window_set_cardinal_prop(root, atoms[_NET_NUMBER_OF_DESKTOPS], &desktops, 1); - window_set_cardinal_prop(root, atoms[_NET_DESKTOP_GEOMETRY], geometry, 2); - window_set_cardinal_prop(root, atoms[_NET_DESKTOP_VIEWPORT], viewport, 2); window_set_cardinal_prop(ewmh, atoms[_NET_WM_PID], &pid, 1); XChangeProperty(display, ewmh, atoms[_NET_WM_NAME], XA_STRING, 8, PropModeReplace, (const unsigned char*)"xoat", 4); diff --git a/xoat.h b/xoat.h index c935782..16d60e1 100644 --- a/xoat.h +++ b/xoat.h @@ -126,10 +126,6 @@ wm_strut struts; X(XOAT_RESTART),\ X(_MOTIF_WM_HINTS),\ X(_NET_SUPPORTED),\ - X(_NET_CURRENT_DESKTOP),\ - X(_NET_NUMBER_OF_DESKTOPS),\ - X(_NET_DESKTOP_GEOMETRY),\ - X(_NET_DESKTOP_VIEWPORT),\ X(_NET_ACTIVE_WINDOW),\ X(_NET_CLOSE_WINDOW),\ X(_NET_CLIENT_LIST_STACKING),\ @@ -137,7 +133,6 @@ wm_strut struts; X(_NET_SUPPORTING_WM_CHECK),\ X(_NET_WM_NAME),\ X(_NET_WM_PID),\ - X(_NET_WM_DESKTOP),\ X(_NET_WM_STRUT),\ X(_NET_WM_STRUT_PARTIAL),\ X(_NET_WM_WINDOW_TYPE),\