Changeset 253 in Main for trunk/Server

Timestamp:

Oct 4, 2024, 12:13:36 PM (6 weeks ago)

Author:

Nishi

Message:

fix stuff

Location:

trunk/Server

Files:

• Makefile (modified) (1 diff)
• config.c (modified) (2 diffs)
• gui.c (modified) (13 diffs)
• main.c (modified) (2 diffs)
• server.c (modified) (1 diff)

trunk/Server/Makefile

@@ -46 +46 @@
         $(CC) $(CFLAGS) $(EXTCFLAGS) -c -o $@ $<
 
-tewi.res: tewi.rc ../Binary/tewi.ico
-        $(WINDRES) tewi.rc -O coff -o $@
+tewi.res: concat.rc ../Binary/tewi.ico
+        $(WINDRES) concat.rc -O coff -o $@
 
-tewi_bcc.res: tewi.rc ../Binary/tewi.ico
-        brc32 -r -fo$@ tewi.rc
+tewi_bcc.res: concat.rc ../Binary/tewi.ico
+        brc32 -r -fo$@ concat.rc
 
-gui.res: gui.rc gui.h
-        $(WINDRES) gui.rc -O coff -o $@
+gui.res: concat.rc gui.h
+        $(WINDRES) concat.rc -O coff -o $@
 
-gui_bcc.res: gui.rc gui.h
-        brc32 -r -fo$@ gui.rc
+gui_bcc.res: concat.rc gui.h
+        brc32 -r -fo$@ concat.rc
 
-vc6.res: tewi.rc gui.rc
-        cat tewi.rc gui.rc > concat.rc
+vc6.res: concat.rc
         rc /fo$@ concat.rc
         rm -f concat.rc
 
+concat.rc: tewi.rc gui.rc
+        cat tewi.rc gui.rc > concat.rc
+
 clean:
         rm -f *.o tewi *.exe *.res *.elf *.sfo *.pbp *.self *.pkg *.obj concat.rc

trunk/Server/config.c

@@ -132 +132 @@
         int ifbr = 0;
         int ignore = -1;
+        int portcount;
         FILE* f;
         cm_log("Config", "Reading %s", path);
@@ -488 +489 @@
                 free(line);
                 fclose(f);
-                return stop;
+                for(portcount = 0; config.ports[portcount] != -1; portcount++);
+                if(portcount == 0){
+                        return 1;
+                }else{
+                        return stop;
+                }
         } else {
                 cm_log("Config", "Could not open the file");

trunk/Server/gui.c

@@ -4 +4 @@
 
 #include "gui.h"
-
+#include "tw_server.h"
+
+#include <cm_log.h>
+
+#include <stdio.h>
 #include <windows.h>
+#include <process.h>
 #include <commctrl.h>
 
@@ -15 +20 @@
 HWND button_about;
 HWND status;
+HFONT monospace;
 BOOL tewi_alive;
 BOOL was_starting;
 BOOL exiting;
+BOOL idle;
+extern FILE* logfile;
+extern int running;
 
 #define WINWIDTH(rc) (rc.right - rc.left)
 #define WINHEIGHT(rc) (rc.bottom - rc.top)
 
-#define DIALOG_X(n) (HIWORD(GetDialogBaseUnits()) * n)
-#define DIALOG_Y(n) (LOWORD(GetDialogBaseUnits()) * n)
+int startup(int argc, char** argv);
 
 void ShowBitmapSize(HWND hWnd, HDC hdc, const char* name, int x, int y, int w, int h){
@@ -45 +53 @@
 }
 
+int max = 0;
+void AddLog(const char* str){
+        HDC hdc;
+        PAINTSTRUCT ps;
+        SIZE sz;
+
+        SendMessage(logarea, LB_ADDSTRING, 0, (LPARAM)str);
+
+        hdc = CreateCompatibleDC(NULL);
+        SelectObject(hdc, monospace);
+        GetTextExtentPoint32(hdc, str, strlen(str), &sz);
+        DeleteDC(hdc);
+        
+        if(max < sz.cx){
+                max = sz.cx;
+                SendMessage(logarea, LB_SETHORIZONTALEXTENT, max, 0);
+        }
+}
+
 LRESULT CALLBACK VersionDialog(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp){
         if(msg == WM_COMMAND){
@@ -63 +90 @@
                 HDC dc = (HDC)wp;
                 SetBkMode(dc, TRANSPARENT);
-                return GetSysColorBrush(COLOR_MENU);
+                return (LRESULT)GetSysColorBrush(COLOR_MENU);
         }else{
                 return FALSE;
@@ -70 +97 @@
 }
 
+void tewi_thread(void* ptr){
+        int st = startup(0, NULL);
+        was_starting = TRUE;
+        if(st == -1){
+                tewi_alive = TRUE;
+                idle = FALSE;
+        }else{
+                cm_force_log("Config error");
+                idle = FALSE;
+                _endthread();
+        }
+        running = 1;
+        tw_server_loop();
+        tewi_alive = FALSE;
+        was_starting = TRUE;
+        idle = FALSE;
+        _endthread();
+}
+
 void StartTewi(void){
-        was_starting = TRUE;
+        EnableWindow(button_start, FALSE);
+        EnableWindow(button_stop, FALSE);
+        _beginthread(tewi_thread, 0, NULL);
 }
 
 void StopTewi(void){
-        was_starting = TRUE;
+        EnableWindow(button_start, FALSE);
+        EnableWindow(button_stop, FALSE);
+        running = 0;
 }
 
@@ -119 +169 @@
                 InitCommonControls();
 
+                monospace = (HFONT)GetStockObject(SYSTEM_FIXED_FONT);
+
                 status = CreateStatusWindow(WS_CHILD | WS_VISIBLE | CCS_BOTTOM, NULL, hWnd, GUI_STATUS);
                 SendMessage(status, SB_SIMPLE, 0, 0);
@@ -129 +181 @@
                 button_about = CreateWindow("BUTTON", "&About", WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON, WINWIDTH(rc) - 100, 20 * 2, 100, 20, hWnd, (HMENU)GUI_BUTTON_ABOUT, hInst, NULL);
                 button_about = CreateWindow("BUTTON", "E&xit", WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON, WINWIDTH(rc) - 100, WINHEIGHT(rc) - WINHEIGHT(src) - 20, 100, 20, hWnd, (HMENU)GUI_BUTTON_EXIT, hInst, NULL);
-                logarea = CreateWindow("LISTBOX", NULL, WS_CHILD | WS_VISIBLE | WS_VSCROLL, 0, 40, WINWIDTH(rc) - 100, WINHEIGHT(rc) - 40 - WINHEIGHT(src), hWnd, (HMENU)GUI_LOG, hInst, NULL);
+                logarea = CreateWindow("LISTBOX", NULL, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_HSCROLL | LBS_NOINTEGRALHEIGHT | LBS_NOSEL, 0, 40, WINWIDTH(rc) - 100, WINHEIGHT(rc) - 40 - WINHEIGHT(src), hWnd, (HMENU)GUI_LOG, hInst, NULL);
+
+                SendMessage(logarea, WM_SETFONT, (WPARAM)monospace, TRUE);
+
                 SetTimer(hWnd, TIMER_WATCH_TEWI, 100, NULL);
         }else if(msg == WM_TIMER){
                 if(wp == TIMER_WATCH_TEWI){
-                        if(tewi_alive){
+                        if(idle){
+                        }else if(tewi_alive){
                                 if(was_starting){
                                         was_starting = FALSE;
@@ -140 +196 @@
                                 EnableWindow(button_start, FALSE);
                                 EnableWindow(button_stop, TRUE);
+                                idle = TRUE;
                         }else{
                                 if(was_starting){
@@ -151 +208 @@
                                         SendMessage(hWnd, WM_CLOSE, 0, 0);
                                 }
+                                idle = TRUE;
                         }
                 }
@@ -172 +230 @@
 
 BOOL InitApp(void){
-        WNDCLASS wc;
+        WNDCLASSEX wc;
+        wc.cbSize = sizeof(WNDCLASSEX);
         wc.style = CS_HREDRAW | CS_VREDRAW;
         wc.lpfnWndProc = WndProc;
@@ -183 +242 @@
         wc.lpszMenuName = NULL;
         wc.lpszClassName = "tewihttpd";
-        return RegisterClass(&wc);
+        wc.hIconSm = LoadIcon(hInst, "TEWI");
+        return RegisterClassEx(&wc);
 }
 
@@ -191 +251 @@
         HWND hDeskWnd = GetDesktopWindow();
         GetWindowRect(hDeskWnd, &deskrc);
-        hWnd = CreateWindow("tewihttpd", "Tewi HTTPd", (WS_OVERLAPPEDWINDOW ^ WS_THICKFRAME) ^ WS_MAXIMIZEBOX, 0, 0, 600, 200, NULL, 0, hInst, NULL);
+        hWnd = CreateWindow("tewihttpd", "Tewi HTTPd", (WS_OVERLAPPEDWINDOW ^ WS_THICKFRAME) ^ WS_MAXIMIZEBOX, 0, 0, 600, 400, NULL, 0, hInst, NULL);
 
         if(!hWnd){
@@ -210 +270 @@
         was_starting = FALSE;
         exiting = FALSE;
+        idle = TRUE;
+        logfile = stderr;
         if(!InitApp()){
                 return FALSE;

trunk/Server/main.c

@@ -527 +527 @@
 #endif
 
-#if !defined(BUILD_GUI) || !(defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__))
+#if !defined(BUILD_GUI_VALID)
 int main(int argc, char** argv) {
         int st;
@@ -797 +797 @@
         signal(SIGCHLD, SIG_IGN);
         signal(SIGPIPE, SIG_IGN);
-#else
+#elif !defined(BUILD_GUI)
         SetConsoleTitle(tw_server);
 #endif

trunk/Server/server.c

@@ -1050 +1050 @@
                 }
         }
-}
+        for(i = 0; i < sockcount; i++){
+                close_socket(sockets[i]);
+        }
+        cm_force_log("Server is down");
+}