X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Futil%2Fwindow.c;h=8ba71f607a2cc01f1c575a0b33e9a3c498086a39;hb=bdf5fa4daad88f6a65b6f4be3acae7b663906e86;hp=1954ad35effb48fbbb2a7532810c9088f4118f2c;hpb=2e6b12080e5187b0e0db377cd4df22405119e5b8;p=chaz%2Ftint2

diff --git a/src/util/window.c b/src/util/window.c
index 1954ad3..8ba71f6 100644
--- a/src/util/window.c
+++ b/src/util/window.c
@@ -38,49 +38,40 @@
 
 void set_active (Window win)
 {
-   send_event32 (win, server.atom._NET_ACTIVE_WINDOW, 2, 0);
+   send_event32 (win, server.atom._NET_ACTIVE_WINDOW, 2, CurrentTime, 0);
 }
 
 
 void set_desktop (int desktop)
 {
-   send_event32 (server.root_win, server.atom._NET_CURRENT_DESKTOP, desktop, 0);
+   send_event32 (server.root_win, server.atom._NET_CURRENT_DESKTOP, desktop, 0, 0);
 }
 
 
 void windows_set_desktop (Window win, int desktop)
 {
-   send_event32 (win, server.atom._NET_WM_DESKTOP, desktop, 2);
+   send_event32 (win, server.atom._NET_WM_DESKTOP, desktop, 2, 0);
 }
 
 
 void set_close (Window win)
 {
-   send_event32 (win, server.atom._NET_CLOSE_WINDOW, 0, 2);
+   send_event32 (win, server.atom._NET_CLOSE_WINDOW, 0, 2, 0);
 }
 
 
 void window_toggle_shade (Window win)
 {
-   send_event32 (win, server.atom._NET_WM_STATE, 2, server.atom._NET_WM_STATE_SHADED);
+   send_event32 (win, server.atom._NET_WM_STATE, 2, server.atom._NET_WM_STATE_SHADED, 0);
 }
 
-/*
-int x11_send_expose(Display *dpy, Window dst, int x, int y, int width, int height)
+
+void window_maximize_restore (Window win)
 {
-	XEvent xe;
-	int rc;
-	xe.type = Expose;
-	xe.xexpose.window = dst;
-	xe.xexpose.x = x;
-	xe.xexpose.y = y;
-	xe.xexpose.width = width;
-	xe.xexpose.height = height;
-	xe.xexpose.count = 0;
-	rc = XSendEvent(tray_data.dpy, dst, True, NoEventMask, &xe);
-	return x11_ok() && rc != 0;
+   send_event32 (win, server.atom._NET_WM_STATE, 2, server.atom._NET_WM_STATE_MAXIMIZED_VERT, 0);
+   send_event32 (win, server.atom._NET_WM_STATE, 2, server.atom._NET_WM_STATE_MAXIMIZED_HORZ, 0);
 }
-*/
+
 
 int window_is_hidden (Window win)
 {
@@ -96,7 +87,7 @@ int window_is_hidden (Window win)
 
    at = server_get_property (win, server.atom._NET_WM_STATE, XA_ATOM, &count);
    for (i = 0; i < count; i++) {
-      if (at[i] == server.atom._NET_WM_STATE_SKIP_PAGER || at[i] == server.atom._NET_WM_STATE_SKIP_TASKBAR) {
+      if (at[i] == server.atom._NET_WM_STATE_SKIP_TASKBAR) {
          XFree(at);
          return 1;
       }
@@ -113,8 +104,9 @@ int window_is_hidden (Window win)
    XFree(at);
 
 	for (i=0 ; i < nb_panel ; i++) {
-		if (panel1[i].main_win == win)
+		if (panel1[i].main_win == win) {
 			return 1;
+		}
 	}
 
    // specification