X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fmainframe.h;h=ee7368b1396e47bcb33bbd029d88a4240df22f92;hb=ed990b29b0790e2a4d798477df8be2965fd80f41;hp=c273845082dfa0fc28537b16ec4ba873e45a87a7;hpb=96a933aef38c52356b639fa0cc0903ba2f7ef041;p=xonotic%2Fnetradiant.git diff --git a/radiant/mainframe.h b/radiant/mainframe.h index c2738450..ee7368b1 100644 --- a/radiant/mainframe.h +++ b/radiant/mainframe.h @@ -22,6 +22,7 @@ #if !defined( INCLUDED_MAINFRAME_H ) #define INCLUDED_MAINFRAME_H +#include #include "gtkutil/window.h" #include "gtkutil/idledraw.h" #include "gtkutil/widget.h" @@ -36,8 +37,6 @@ class XYWnd; class CamWnd; class ZWnd; -typedef struct _GtkWidget GtkWidget; -typedef struct _GtkWindow GtkWindow; const int c_command_status = 0; const int c_position_status = 1; @@ -55,12 +54,13 @@ enum EViewStyle eFloating = 1, eSplit = 2, eRegularLeft = 3, + eSingle = 4, }; MainFrame(); ~MainFrame(); -GtkWindow* m_window; +ui::Window m_window{ui::null}; CopiedString m_command_status; CopiedString m_position_status; @@ -73,9 +73,9 @@ void Create(); void SaveWindowInfo(); void Shutdown(); -GtkWidget* m_vSplit; -GtkWidget* m_hSplit; -GtkWidget* m_vSplit2; +ui::Widget m_vSplit{ui::null}; +ui::Widget m_hSplit{ui::null}; +ui::Widget m_vSplit2{ui::null}; XYWnd* m_pXYWnd; XYWnd* m_pYZWnd; @@ -86,7 +86,7 @@ XYWnd* m_pActiveXY; bool m_bSleeping; -GtkWidget *m_pStatusLabel[c_count_status]; +void *m_pStatusLabel[c_count_status]; EViewStyle m_nCurrentStyle; @@ -104,10 +104,10 @@ void OnSleep(); void SetStatusText( CopiedString& status_text, const char* pText ); void UpdateStatusText(); void RedrawStatusText(); -typedef MemberCaller RedrawStatusTextCaller; +typedef MemberCaller RedrawStatusTextCaller; void SetGridStatus(); -typedef MemberCaller SetGridStatusCaller; +typedef MemberCaller SetGridStatusCaller; void SetActiveXY( XYWnd* p ); XYWnd* ActiveXY(){ @@ -142,7 +142,7 @@ bool FloatingGroupDialog(){ extern MainFrame* g_pParentWnd; -GtkWindow* MainFrame_getWindow(); +ui::Window MainFrame_getWindow(); enum EMouseButtonMode { @@ -165,8 +165,7 @@ void GLWindow_Destroy(); extern glwindow_globals_t g_glwindow_globals; template class LatchedValue; -typedef LatchedValue LatchedBool; -extern LatchedBool g_Layout_enableDetachableMenus; +extern LatchedValue g_Layout_enableDetachableMenus; void deleteSelection(); @@ -207,8 +206,22 @@ void EnginePath_verify(); const char* EnginePath_get(); const char* QERApp_GetGamePath(); +extern bool g_disableEnginePath; +extern bool g_disableHomePath; + +const int g_pakPathCount = 5; +extern CopiedString g_strPakPath[g_pakPathCount]; +const char* PakPath_get( int num ); + +extern CopiedString g_strAppFilePath; extern CopiedString g_strAppPath; +extern CopiedString g_strLibPath; +extern CopiedString g_strDataPath; + +const char* AppFilePath_get(); const char* AppPath_get(); +const char *LibPath_get(); +const char *DataPath_get(); extern CopiedString g_strSettingsPath; const char* SettingsPath_get(); @@ -245,6 +258,7 @@ void gamemode_set( const char* gamemode ); void Radiant_attachGameModeObserver( ModuleObserver& observer ); void Radiant_detachGameModeObserver( ModuleObserver& observer ); +void VFS_Refresh(); void VFS_Restart(); void VFS_Construct(); void VFS_Destroy(); @@ -258,6 +272,8 @@ void Radiant_detachHomePathsObserver( ModuleObserver& observer ); void MainFrame_Construct(); void MainFrame_Destroy(); +extern char **environ; +void Radiant_Restart(); extern float ( *GridStatus_getGridSize )(); extern int ( *GridStatus_getRotateIncrement )(); @@ -270,6 +286,6 @@ void XYWindowDestroyed_disconnect( SignalHandlerId id ); MouseEventHandlerId XYWindowMouseDown_connect( const MouseEventHandler& handler ); void XYWindowMouseDown_disconnect( MouseEventHandlerId id ); -extern GtkWidget* g_page_entity; +extern ui::Widget g_page_entity; #endif