X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmain.c;h=731323fe75afdcd754c7e05e9e50fec6968b72fd;hb=656ea8c3c91e8998d55915fe2c5601adf7351d82;hp=6886685605d828f59c05af77b61358d841e6f464;hpb=95df11a9bb98b4454f25645ad47c2c5eaa34c695;p=geometrycompositor.git

diff --git a/source/main.c b/source/main.c
index 6886685..731323f 100644
--- a/source/main.c
+++ b/source/main.c
@@ -333,6 +333,43 @@ void remove_window(Compositor *compositor, CompositedScreen *screen, CompositedW
 		screen->windows[i] = screen->windows[i+1];
 }
 
+CompositedWindow *reorder_window(CompositedScreen *screen, CompositedWindow *window, Window above)
+{
+	unsigned i, j;
+	CompositedWindow hold;
+
+	i = window-screen->windows;
+	if(above)
+	{
+		for(j=0; j<screen->nwindows; ++j)
+			if(screen->windows[j].window==above)
+				break;
+
+		if(j>=screen->nwindows || i==j+1)
+			return window;
+
+		if(j<i)
+			++j;
+	}
+	else
+		j = 0;
+
+	hold = *window;
+	if(i<j)
+	{
+		for(; i<j; ++i)
+			screen->windows[i] = screen->windows[i+1];
+	}
+	else
+	{
+		for(; i>j; --i)
+			screen->windows[i] = screen->windows[i-1];
+	}
+	screen->windows[j] = hold;
+
+	return &screen->windows[j];
+}
+
 CompositedScreen *find_screen_by_root(Compositor *compositor, Window root)
 {
 	unsigned i;
@@ -518,22 +555,28 @@ void process_create_window_event(Compositor *compositor, XCreateWindowEvent *eve
 
 void process_destroy_window_event(Compositor *compositor, XDestroyWindowEvent *event)
 {
-	CompositedScreen *screen = find_screen_by_root(compositor, event->event);
+	CompositedScreen *screen;
+	CompositedWindow *window;
+
+	screen = find_screen_by_root(compositor, event->event);
 	if(!screen)
 		return;
 
-	CompositedWindow *window = find_window(screen, event->window);
+	window = find_window(screen, event->window);
 	if(window)
 		remove_window(compositor, screen, window, 1);
 }
 
 void process_map_event(Compositor *compositor, XMapEvent *event)
 {
-	CompositedScreen *screen = find_screen_by_root(compositor, event->event);
+	CompositedScreen *screen;
+	CompositedWindow *window;
+
+	screen = find_screen_by_root(compositor, event->event);
 	if(!screen)
 		return;
 
-	CompositedWindow *window = find_window(screen, event->window);
+	window = find_window(screen, event->window);
 	if(!window)
 		return;
 
@@ -545,11 +588,14 @@ void process_map_event(Compositor *compositor, XMapEvent *event)
 
 void process_unmap_event(Compositor *compositor, XUnmapEvent *event)
 {
-	CompositedScreen *screen = find_screen_by_root(compositor, event->event);
+	CompositedScreen *screen;
+	CompositedWindow *window;
+
+	screen = find_screen_by_root(compositor, event->event);
 	if(!screen)
 		return;
 
-	CompositedWindow *window = find_window(screen, event->window);
+	window = find_window(screen, event->window);
 	if(window)
 		window->map_state = IsUnviewable;
 
@@ -558,11 +604,13 @@ void process_unmap_event(Compositor *compositor, XUnmapEvent *event)
 
 void process_reparent_event(Compositor *compositor, XReparentEvent *event)
 {
-	CompositedScreen *screen = find_screen_by_root(compositor, event->event);
+	CompositedScreen *screen;
+	CompositedWindow *window;
+
+	screen = find_screen_by_root(compositor, event->event);
 	if(!screen)
 		return;
 
-	CompositedWindow *window;
 	if(event->parent==screen->root)
 		window = add_window(compositor, screen, event->window);
 	else
@@ -578,13 +626,44 @@ void process_reparent_event(Compositor *compositor, XReparentEvent *event)
 		mark_dirty(compositor, screen);
 }
 
+void process_configure_event(Compositor *compositor, XConfigureEvent *event)
+{
+	CompositedScreen *screen;
+	CompositedWindow *window;
+
+	screen = find_screen_by_root(compositor, event->event);
+	if(!screen)
+		return;
+
+	window = find_window(screen, event->window);
+	if(!window)
+		return;
+
+	window->x = event->x;
+	window->y = event->y;
+	if((unsigned)event->width!=window->width || (unsigned)event->height!=window->height || (unsigned)event->border_width!=window->border)
+	{
+		window->width = event->width;
+		window->height = event->height;
+		window->border = event->border_width;
+		create_window_pixmap(compositor, screen, window);
+	}
+	reorder_window(screen, window, event->above);
+
+	if(window->map_state==IsViewable)
+		mark_dirty(compositor, screen);
+}
+
 void process_damage_event(Compositor *compositor, XDamageNotifyEvent *event)
 {
-	CompositedScreen *screen = find_screen_by_window(compositor, event->drawable);
+	CompositedScreen *screen;
+	CompositedWindow *window;
+
+	screen = find_screen_by_window(compositor, event->drawable);
 	if(!screen)
 		return;
 
-	CompositedWindow *window = find_window(screen, event->drawable);
+	window = find_window(screen, event->drawable);
 	if(window->map_state==IsViewable)
 		mark_dirty(compositor, screen);
 }
@@ -617,6 +696,9 @@ int process_event(Compositor *compositor)
 	case ReparentNotify:
 		process_reparent_event(compositor, &event.xreparent);
 		break;
+	case ConfigureNotify:
+		process_configure_event(compositor, &event.xconfigure);
+		break;
 	default:
 		if(event.type==compositor->damage_event+XDamageNotify)
 			process_damage_event(compositor, (XDamageNotifyEvent *)&event);