Split screen_build_screen() into more generic code and type: screeninfos_new()

awesome.c

@@ -193,6 +193,7 @@ main(int argc, char *argv[])
     struct sockaddr_un *addr;
     Client *c;
     XSetWindowAttributes wa;
+    ScreensInfo *si;
     static struct option long_options[] =
     {
         {"help",    0, NULL, 'h'},
@@ -264,15 +265,14 @@ main(int argc, char *argv[])
     ewmh_init_atoms();
 
     /* init screens struct */
-    screen_build_screens();
+    si = screensinfo_new(dpy);
+    globalconf.nscreen = si->nscreen;
+    globalconf.screens = p_new(VirtScreen, si->nscreen);
     focus_add_client(NULL);
 
     /* parse config */
     config_parse(confpath);
 
-    /* scan existing windows */
-    scan();
-
     /* init cursors */
     globalconf.cursor[CurNormal] = XCreateFontCursor(globalconf.display, XC_left_ptr);
     globalconf.cursor[CurResize] = XCreateFontCursor(globalconf.display, XC_sizing);
@@ -281,6 +281,7 @@ main(int argc, char *argv[])
     /* for each virtual screen */
     for(screen = 0; screen < globalconf.nscreen; screen++)
     {
+        globalconf.screens[screen].geometry = si->geometry[screen];
         /* view at least one tag */
         tag_view(globalconf.screens[screen].tags, True);
 
@@ -288,6 +289,8 @@ main(int argc, char *argv[])
             statusbar_init(statusbar);
     }
 
+    screensinfo_delete(&si);
+
     /* select for events */
     wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
         | EnterWindowMask | LeaveWindowMask | StructureNotifyMask | PointerMotionMask;
@@ -308,6 +311,9 @@ main(int argc, char *argv[])
         window_root_grabkeys(screen);
     }
 
+    /* scan existing windows */
+    scan();
+
     handler = p_new(event_handler *, LASTEvent);
     handler[ButtonPress] = event_handle_buttonpress;
     handler[ConfigureRequest] = event_handle_configurerequest;

screen.c

@@ -145,64 +145,73 @@ screen_xsi_to_area(XineramaScreenInfo si)
 }
 
 void
-screen_build_screens(void)
+screensinfo_delete(ScreensInfo **si)
 {
-    XineramaScreenInfo *si;
+    p_delete(&(*si)->geometry);
+    p_delete(si);
+}
+
+ScreensInfo *
+screensinfo_new(Display *disp)
+{
+    ScreensInfo *si;
+    XineramaScreenInfo *xsi;
     int xinerama_screen_number, screen, screen_to_test;
     Bool drop;
 
-    if(XineramaIsActive(globalconf.display))
+    si = p_new(ScreensInfo, 1);
+
+    if(XineramaIsActive(disp))
     {
-        si = XineramaQueryScreens(globalconf.display, &xinerama_screen_number);
+        xsi = XineramaQueryScreens(disp, &xinerama_screen_number);
-        globalconf.screens = p_new(VirtScreen, xinerama_screen_number);
+        si->geometry = p_new(Area, xinerama_screen_number);
-        globalconf.nscreen = 0;
+        si->nscreen = 0;
 
         /* now check if screens overlaps (same x,y): if so, we take only the biggest one */
         for(screen = 0; screen < xinerama_screen_number; screen++)
         {
             drop = False;
-            for(screen_to_test = 0; screen_to_test < globalconf.nscreen; screen_to_test++)
+            for(screen_to_test = 0; screen_to_test < si->nscreen; screen_to_test++)
-                if(si[screen].x_org == globalconf.screens[screen_to_test].geometry.x
+                if(xsi[screen].x_org == si->geometry[screen_to_test].x
-                   && si[screen].y_org == globalconf.screens[screen_to_test].geometry.y)
+                   && xsi[screen].y_org == si->geometry[screen_to_test].y)
                     {
                         /* we already have a screen for this area, just check if
                          * it's not bigger and drop it */
                         drop = True;
-                        globalconf.screens[screen_to_test].geometry.width =
+                        si->geometry[screen_to_test].width =
-                            MAX(si[screen].width, si[screen_to_test].width);
+                            MAX(xsi[screen].width, xsi[screen_to_test].width);
-                        globalconf.screens[screen_to_test].geometry.height =
+                        si->geometry[screen_to_test].height =
-                            MAX(si[screen].height, si[screen_to_test].height);
+                            MAX(xsi[screen].height, xsi[screen_to_test].height);
                     }
             if(!drop)
-                globalconf.screens[globalconf.nscreen++].geometry = screen_xsi_to_area(si[screen]);
+                si->geometry[si->nscreen++] = screen_xsi_to_area(xsi[screen]);
         }
 
         /* realloc smaller if xinerama_screen_number != screen registered */
-        if(xinerama_screen_number != globalconf.nscreen)
+        if(xinerama_screen_number != si->nscreen)
         {
-            VirtScreen *newscreens = p_new(VirtScreen, globalconf.nscreen);
+            Area *newgeometry = p_new(Area, si->nscreen);
-            memcpy(newscreens, globalconf.screens, globalconf.nscreen * sizeof(VirtScreen));
+            memcpy(newgeometry, si->geometry, si->nscreen * sizeof(Area));
-            p_delete(&globalconf.screens);
+            p_delete(&si->geometry);
-            globalconf.screens = newscreens;
+            si->geometry = newgeometry;
         }
 
-        XFree(si);
+        XFree(xsi);
     }
     else
     {
-        globalconf.nscreen = ScreenCount(globalconf.display);
+        si->nscreen = ScreenCount(disp);
-        globalconf.screens = p_new(VirtScreen, globalconf.nscreen);
+        si->geometry = p_new(Area, si->nscreen);
-        for(screen = 0; screen < globalconf.nscreen; screen++)
+        for(screen = 0; screen < si->nscreen; screen++)
         {
-            globalconf.screens[screen].geometry.x = 0;
+            si->geometry[screen].x = 0;
-            globalconf.screens[screen].geometry.y = 0;
+            si->geometry[screen].y = 0;
-            globalconf.screens[screen].geometry.width =
+            si->geometry[screen].width = DisplayWidth(disp, screen);
-                DisplayWidth(globalconf.display, screen);
+            si->geometry[screen].height = DisplayHeight(disp, screen);
-            globalconf.screens[screen].geometry.height =
-                DisplayHeight(globalconf.display, screen);
         }
     }
 
+    return si;
 }
 
 /** This returns the real X screen number for a logical

screen.h

@@ -24,10 +24,17 @@
 
 #include "structs.h"
 
+typedef struct
+{
+    int nscreen;
+    Area *geometry;
+} ScreensInfo;
+
 Area screen_get_area(int, Statusbar *, Padding *);
 Area get_display_area(int, Statusbar *, Padding *);
 int screen_get_bycoord(int, int, int);
-void screen_build_screens(void);
+void screensinfo_delete(ScreensInfo **);
+ScreensInfo *screensinfo_new(Display *);
 int get_phys_screen(int);
 void move_client_to_screen(Client *, int, Bool);