M src/server.c → src/server.c

@@ -364,20 +364,6 @@ server.monitor[0].names = 0;
 	}
 }
 
-void print_monitors()
-{
-	fprintf(stderr, "Number of monitors: %d\n", server.nb_monitor);
-	int i;
-	for (i = 0; i < server.nb_monitor; i++) {
-		fprintf(stderr, "Monitor %d: x = %d, y = %d, w = %d, h = %d\n",
-				i+1,
-				server.monitor[i].x,
-				server.monitor[i].y,
-				server.monitor[i].width,
-				server.monitor[i].height);
-	}
-}
-
 int server_get_number_of_desktops()
 {
 	return get_property32(server.root_win, server.atom._NET_NUMBER_OF_DESKTOPS, XA_CARDINAL);

M src/server.h → src/server.h

@@ -153,7 +153,6 @@ void get_root_pixmap();
 
 // detect monitors and desktops
 void get_monitors();
-void print_monitors();
 void get_desktops();
 int server_get_number_of_desktops();
 

M src/taskbar/task.c → src/taskbar/task.c

@@ -533,12 +533,6 @@ (hide_task_diff_monitor || nb_panel > 1)) {
 					hide = 1;
 				}
 				if (1 - hide != tsk1->area.on_screen) {
-					fprintf(stderr, "%s %s task %ld '%s' (panel monitor = %d)\n",
-							__FUNCTION__,
-							hide ? "hiding" : "showing",
-							tsk->win,
-							tsk->title ? tsk->title : "??",
-							((Panel*)tsk->area.panel)->monitor + 1);
 					tsk1->area.on_screen = 1 - hide;
 					set_task_redraw(tsk1);
 					Panel *p = (Panel*)tsk->area.panel;

M src/util/window.c → src/util/window.c

@@ -130,16 +130,7 @@ {
 	int i, x, y;
 	Window src;
 
-	XTextProperty xname;
-	char *name;
-	if (XGetWMName(server.dsp, win, &xname)) {
-		name = strdup((char*)xname.value);
-		XFree(xname.value);
-	} else {
-		name = strdup("??");
-	}
-
-	Bool result = XTranslateCoordinates(server.dsp, win, server.root_win, 0, 0, &x, &y, &src);
+	XTranslateCoordinates(server.dsp, win, server.root_win, 0, 0, &x, &y, &src);
 	x += 2;
 	y += 2;
 	for (i = 0; i < server.nb_monitor; i++) {
@@ -148,14 +139,9 @@ if (y >= server.monitor[i].y && y <= (server.monitor[i].y + server.monitor[i].height))
 				break;
 	}
 
-	if (i == server.nb_monitor)
-		i = 0;
-
-	printf("\n%s: window %ld '%s': monitor %d, x = %d, y = %d, result = %s\n", __FUNCTION__, win, name, i+1, x, y, result ? "True" : "False");
-	print_monitors();
-	free(name);
-
-	return i;
+	//printf("window %lx : ecran %d, (%d, %d)\n", win, i, x, y);
+	if (i == server.nb_monitor) return 0;
+	else return i;
 }
 
 void window_get_coordinates (Window win, int *x, int *y, int *w, int *h)