Changeset 18 in Main

Timestamp:

26/11/2011 09:26:12 (18 months ago)

Author:

duggan

Message:

Now loads topology data. A sample topology file has been included. To use, copy to output dir for executable.

Location:

src/fake_app_server

Files:

• App.cpp (modified) (2 diffs)
• App.h (modified) (4 diffs)
• main.cpp (modified) (1 diff)
• topology.txt (added)

src/fake_app_server/App.cpp

@@ -12 +12 @@
         if (LoadTopology("topology.txt") != B_OK)
         {
+                status = B_ERROR;
         }
         // TODO: create framebuffers and windows to display them
@@ -33 +34 @@
                         // connected(0/1) : number of resolutions : default / current resolution index : widthxheightxbpp@refresh : ... <-- one for each head
                         file.getline(rawline, 1024);
-                        line = rawline;
-                        // TODO: fix this if statement (skips any line that has a '#' in it, regardless of location)
-                        if (line.FindFirst("#") != B_ERROR)
+                        // TODO: implement a Trim function
+                        if (rawline[0] == '#' || rawline[0] == '\n')
                         {
                                 continue;
                         }
-                        // get everything up to the first ':'
-                        BString temp("");
+                        line = rawline;
+                        BString temp;
+                        uint32 slotnum;
                         line.MoveInto(temp, 0, line.FindFirst(":"));
                         line.RemoveFirst(":");
+                        slotnum = atoi(temp.String());
+                        cout<<"slotnum: "<<slotnum<<endl;
+                        line.MoveInto(temp, 0, line.FindFirst(":"));
+                        line.RemoveFirst(":");
+                        Devices[slotnum].HeadCount = atoi(temp.String());
+                        cout<<"headcount: "<<Devices[slotnum].HeadCount<<endl;
+                        Devices[slotnum].Heads = new Head[Devices[slotnum].HeadCount];
+                        Devices[slotnum].DeviceID = line;
+                        cout<<"deviceid: "<<Devices[slotnum].DeviceID<<endl;
+                        for(int a = 0 ; a < Devices[slotnum].HeadCount ; a++)
+                        {
+                                do
+                                {
+                                        file.getline(rawline, 1024);
+                                } while (rawline[0] == '#' || rawline[0] == '\n');
+                                line = rawline;
+                                line.MoveInto(temp, 0, line.FindFirst(":"));
+                                line.RemoveFirst(":");
+                                if (atoi(temp.String()) == 0)
+                                {
+                                        Devices[slotnum].Heads[a].Connected = false;
+                                }
+                                else
+                                {
+                                        Devices[slotnum].Heads[a].Connected = true;
+                                }
+                                cout<<"connected: "<<Devices[slotnum].Heads[a].Connected<<endl;
+                                line.MoveInto(temp, 0, line.FindFirst(":"));
+                                line.RemoveFirst(":");
+                                Devices[slotnum].Heads[a].ResolutionCount = atoi(temp.String());
+                                cout<<"rescount: "<<Devices[slotnum].Heads[a].ResolutionCount<<endl;
+                                Devices[slotnum].Heads[a].Resolutions = new Resolution[Devices[slotnum].Heads[a].ResolutionCount];
+                                line.MoveInto(temp, 0, line.FindFirst(":"));
+                                line.RemoveFirst(":");
+                                Devices[slotnum].Heads[a].CurrentResolution = atoi(temp.String());
+                                cout<<"current: "<<Devices[slotnum].Heads[a].CurrentResolution<<endl;
+                                for (int b = 0; b < Devices[slotnum].Heads[a].ResolutionCount; b++)
+                                {
+                                        if (line.FindFirst(":") != B_ERROR)
+                                        {
+                                                line.MoveInto(temp, 0, line.FindFirst(":"));
+                                                line.RemoveFirst(":");
+                                        }
+                                        else
+                                        {
+                                                temp = line;
+                                        }
+                                        BString temp2;
+                                        temp.MoveInto(temp2, 0, line.FindFirst("x"));
+                                        temp.RemoveFirst("x");
+                                        Devices[slotnum].Heads[a].Resolutions[b].Width = atoi(temp2.String());
+                                        temp.MoveInto(temp2, 0, line.FindFirst("x"));
+                                        temp.RemoveFirst("x");
+                                        Devices[slotnum].Heads[a].Resolutions[b].Height = atoi(temp2.String());
+                                        temp.MoveInto(temp2, 0, line.FindFirst("@"));
+                                        temp.RemoveFirst("@");
+                                        Devices[slotnum].Heads[a].Resolutions[b].BPP = atoi(temp2.String());
+                                        Devices[slotnum].Heads[a].Resolutions[b].Refresh = atoi(temp.String());
+                                }
+                        }
                 }
+        }
+        else
+        {
+                // File not found
+                return B_ERROR;
         }
         return B_OK;
 }
+
+status_t
+App::Status()
+{
+        return status;
+}

src/fake_app_server/App.h

@@ -15 +15 @@
 #include <iostream>
 #include <fstream>
+#include <stdlib.h>
+
+#define MAX_SLOTS 8
 
 
@@ -30 +33 @@
         bool Connected;
         uint32 ResolutionCount;
-        Resolution* ResolutionList;
+        uint32 CurrentResolution;
+        Resolution* Resolutions;
 };
 
@@ -36 +40 @@
 struct Device
 {
-        uint32 Slot;
         uint32 HeadCount;
         BString DeviceID;
-        HeadData* Heads;
+        Head* Heads;
 };
 
@@ -46 +49 @@
 public:
         App(void);
+        status_t        Status();
 
 private:
         status_t LoadTopology(BString);
-        Device* Devices;
+        Device Devices[MAX_SLOTS];
+        status_t        status;
 };
 

src/fake_app_server/main.cpp

@@ -15 +15 @@
 {
         App* app = new App();
-        app->Run();
+        if (app->Status() == B_OK)
+        {
+                app->Run();
+        }
 /*
 // TODO: PUT THIS IN ANOTHER THREAD (probably from within App)