From: Thomas Debesse Date: Mon, 20 Jun 2022 02:44:41 +0000 (+0200) Subject: Merge commit 'b243946c9ffd022cd5d82f2cf474ebfb125929b9' into master-merge X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=2f3b74eff8ba0ca83d3f7d14fe11f93483d22c89;hp=-c;p=xonotic%2Fnetradiant.git Merge commit 'b243946c9ffd022cd5d82f2cf474ebfb125929b9' into master-merge --- 2f3b74eff8ba0ca83d3f7d14fe11f93483d22c89 diff --combined radiant/mainframe.cpp index 7bb9b590,93edac9a..f87f4725 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@@ -101,18 -101,6 +101,18 @@@ #include "referencecache.h" #include "texwindow.h" +#if GDEF_OS_WINDOWS +#include +#else +#include +#endif + +#ifdef WORKAROUND_WINDOWS_GTK2_GLWIDGET +/* workaround for gtk 2.24 issue: not displayed glwidget after toggle */ +#define WORKAROUND_GOBJECT_SET_GLWIDGET(window, widget) g_object_set_data( G_OBJECT( window ), "glwidget", G_OBJECT( widget ) ) +#else +#define WORKAROUND_GOBJECT_SET_GLWIDGET(window, widget) +#endif struct layout_globals_t { @@@ -167,8 -155,6 +167,8 @@@ void VFS_Refresh() RefreshReferences(); // also refresh texture browser TextureBrowser_RefreshShaders(); + // also show textures (all or common) + TextureBrowser_ShowStartupShaders( GlobalTextureBrowser() ); } void VFS_Restart(){ @@@ -227,7 -213,9 +227,7 @@@ void HomePaths_Realise() } path.clear(); path << DirectoryCleaned( g_get_home_dir() ) << prefix << "/"; -#endif - -#if GDEF_OS_WINDOWS +#elif GDEF_OS_WINDOWS TCHAR mydocsdir[MAX_PATH + 1]; wchar_t *mydocsdirw; HMODULE shfolder = LoadLibrary( "shfolder.dll" ); @@@ -264,19 -252,13 +264,19 @@@ break; } } -#endif - -#if GDEF_OS_POSIX +#elif GDEF_OS_XDG + path.clear(); + path << DirectoryCleaned( g_get_user_data_dir() ) << ( prefix + 1 ) << "/"; + if ( file_exists( path.c_str() ) && file_is_directory( path.c_str() ) ) { + g_qeglobals.m_userEnginePath = path.c_str(); + break; + } + else { path.clear(); path << DirectoryCleaned( g_get_home_dir() ) << prefix << "/"; g_qeglobals.m_userEnginePath = path.c_str(); break; + } #endif } @@@ -452,32 -434,14 +452,32 @@@ void setPakPath( int num, const char* p } -// App Path +// executable file path (full path) +CopiedString g_strAppFilePath; -CopiedString g_strAppPath; ///< holds the full path of the executable +// directory paths +CopiedString g_strAppPath; +CopiedString g_strLibPath; +CopiedString g_strDataPath; + +const char* AppFilePath_get(){ + return g_strAppFilePath.c_str(); +} const char* AppPath_get(){ return g_strAppPath.c_str(); } +const char *LibPath_get() +{ + return g_strLibPath.c_str(); +} + +const char *DataPath_get() +{ + return g_strDataPath.c_str(); +} + /// the path to the local rc-dir const char* LocalRcPath_get( void ){ static CopiedString rc_path; @@@ -576,28 -540,39 +576,28 @@@ struct PakPath4 bool g_disableEnginePath = false; bool g_disableHomePath = false; -void Paths_constructPreferences( PreferencesPage& page ){ +void Paths_constructBasicPreferences( PreferencesPage& page ) { page.appendPathEntry( "Engine Path", true, make_property(g_strEnginePath) ); +} - page.appendCheckBox( - "", "Do not use Engine Path", - g_disableEnginePath - ); +void Paths_constructPreferences( PreferencesPage& page ){ + Paths_constructBasicPreferences( page ); - page.appendCheckBox( - "", "Do not use Home Path", - g_disableHomePath - ); + page.appendSpacer( 4 ); + page.appendLabel( "", "Advanced options" ); + page.appendCheckBox( "", "Do not use Engine Path", g_disableEnginePath ); + page.appendCheckBox( "", "Do not use Home Path", g_disableHomePath ); - for ( int i = 0; i < g_pakPathCount; i++ ) { - std::string label = "Pak Path " + std::to_string(i); - switch (i) { - case 0: - page.appendPathEntry( label.c_str(), true, make_property( g_strPakPath[i] ) ); - break; - case 1: - page.appendPathEntry( label.c_str(), true, make_property( g_strPakPath[i] ) ); - break; - case 2: - page.appendPathEntry( label.c_str(), true, make_property( g_strPakPath[i] ) ); - break; - case 3: - page.appendPathEntry( label.c_str(), true, make_property( g_strPakPath[i] ) ); - break; - case 4: - page.appendPathEntry( label.c_str(), true, make_property( g_strPakPath[i] ) ); - break; -} - } + page.appendSpacer( 4 ); + page.appendLabel( "", "Only a very few games support Pak Paths," ); + page.appendLabel( "", "if you don't know what it is, leave this blank." ); + + const char *label = "Pak Path "; + page.appendPathEntry( label, true, make_property( g_strPakPath[0] ) ); + page.appendPathEntry( label, true, make_property( g_strPakPath[1] ) ); + page.appendPathEntry( label, true, make_property( g_strPakPath[2] ) ); + page.appendPathEntry( label, true, make_property( g_strPakPath[3] ) ); + page.appendPathEntry( label, true, make_property( g_strPakPath[4] ) ); } void Paths_constructPage( PreferenceGroup& group ){ @@@ -614,14 -589,14 +614,14 @@@ class PathsDialog : public Dialo { public: ui::Window BuildDialog(){ - auto frame = create_dialog_frame( "Path settings", ui::Shadow::ETCHED_IN ); + auto frame = create_dialog_frame( "Path Settings", ui::Shadow::ETCHED_IN ); auto vbox2 = create_dialog_vbox( 0, 4 ); frame.add(vbox2); { - PreferencesPage preferencesPage( *this, vbox2 ); - Paths_constructPreferences( preferencesPage ); + PreferencesPage page( *this, vbox2 ); + Paths_constructBasicPreferences( page ); } return ui::Window(create_simple_modal_dialog_window( "Engine Path Not Found", m_modal, frame )); @@@ -780,7 -755,7 +780,7 @@@ void Radiant_detachGameToolsPathObserve void Radiant_Initialise(){ GlobalModuleServer_Initialise(); - Radiant_loadModulesFromRoot( AppPath_get() ); + Radiant_loadModulesFromRoot( LibPath_get() ); Preferences_Load(); @@@ -809,7 -784,7 +809,7 @@@ void Radiant_Shutdown() } void Exit(){ - if ( ConfirmModified( "Exit Radiant" ) ) { + if ( ConfirmModified( "Exit " RADIANT_NAME ) ) { gtk_main_quit(); } } @@@ -970,53 -945,6 +970,53 @@@ void ColorScheme_Ydnar() XY_UpdateAllWindows(); } +/* color scheme to fit the GTK Adwaita Dark theme */ +void ColorScheme_AdwaitaDark() +{ + // SI_Colors0 + // GlobalTextureBrowser().color_textureback + TextureBrowser_setBackgroundColour(GlobalTextureBrowser(), Vector3(0.25f, 0.25f, 0.25f)); + + // SI_Colors4 + g_camwindow_globals.color_cameraback = Vector3(0.25f, 0.25f, 0.25f); + // SI_Colors12 + g_camwindow_globals.color_selbrushes3d = Vector3(1.0f, 0.0f, 0.0f); + CamWnd_Update(*g_pParentWnd->GetCamWnd()); + + // SI_Colors1 + g_xywindow_globals.color_gridback = Vector3(0.25f, 0.25f, 0.25f); + // SI_Colors2 + g_xywindow_globals.color_gridminor = Vector3(0.21f, 0.23f, 0.23f); + // SI_Colors3 + g_xywindow_globals.color_gridmajor = Vector3(0.14f, 0.15f, 0.15f); + // SI_Colors14 + g_xywindow_globals.color_gridmajor_alt = Vector3(1.0f, 0.0f, 0.0f); + // SI_Colors6 + g_xywindow_globals.color_gridblock = Vector3(1.0f, 1.0f, 1.0f); + // SI_Colors7 + g_xywindow_globals.color_gridtext = Vector3(0.0f, 0.0f, 0.0f); + // ?? + g_xywindow_globals.color_selbrushes = Vector3(1.0f, 0.0f, 0.0f); + // ?? + g_xywindow_globals.color_clipper = Vector3(0.0f, 0.0f, 1.0f); + // SI_Colors8 + g_xywindow_globals.color_brushes = Vector3(0.73f, 0.73f, 0.73f); + + // SI_AxisColors0 + g_xywindow_globals.AxisColorX = Vector3(1.0f, 0.0f, 0.0f); + // SI_AxisColors1 + g_xywindow_globals.AxisColorY = Vector3(0.0f, 1.0f, 0.0f); + // SI_AxisColors2 + g_xywindow_globals.AxisColorZ = Vector3(0.0f, 0.0f, 1.0f); + SetWorldspawnColour(g_xywindow_globals.color_brushes); + // ?? + g_xywindow_globals.color_viewname = Vector3(0.5f, 0.0f, 0.75f); + XY_UpdateAllWindows(); + + // SI_Colors5 + // g_entity_globals.color_entity = Vector3(0.0f, 0.0f, 0.0f); +} + typedef Callback GetColourCallback; typedef Callback SetColourCallback; @@@ -1134,7 -1062,6 +1134,7 @@@ ui::MenuItem create_colours_menu() create_menu_item_with_mnemonic( menu_3, "Q3Radiant Original", "ColorSchemeQER" ); create_menu_item_with_mnemonic( menu_3, "Black and Green", "ColorSchemeBlackAndGreen" ); create_menu_item_with_mnemonic( menu_3, "Maya/Max/Lightwave Emulation", "ColorSchemeYdnar" ); + create_menu_item_with_mnemonic(menu_3, "Adwaita Dark", "ColorSchemeAdwaitaDark"); menu_separator( menu_in_menu ); @@@ -1808,11 -1735,9 +1808,11 @@@ void Selection_SnapToGrid() static gint qe_every_second( gpointer data ){ - GdkModifierType mask; + if (g_pParentWnd == nullptr) + return TRUE; - gdk_window_get_pointer( 0, 0, 0, &mask ); + GdkModifierType mask; + gdk_window_get_pointer( gtk_widget_get_window(g_pParentWnd->m_window), nullptr, nullptr, &mask ); if ( ( mask & ( GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK ) ) == 0 ) { QE_CheckAutoSave(); @@@ -1924,18 -1849,15 +1924,18 @@@ void ScreenUpdates_Disable( const char bool isActiveApp = MainFrame_isActiveApp(); g_wait = create_wait_dialog( title, message ); - gtk_grab_add( g_wait.m_window ); if ( isActiveApp ) { g_wait.m_window.show(); + gtk_grab_add( g_wait.m_window ); ScreenUpdates_process(); } } else if ( g_wait.m_window.visible() ) { g_wait.m_label.text(message); + if ( GTK_IS_WINDOW(g_wait.m_window) ) { + gtk_grab_add(g_wait.m_window); + } ScreenUpdates_process(); } g_wait_stack.push_back( message ); @@@ -2162,9 -2084,6 +2162,9 @@@ ui::MenuItem create_view_menu( MainFram create_menu_item_with_mnemonic( camera_menu, "Far Clip Plane In", "CubicClipZoomIn" ); create_menu_item_with_mnemonic( camera_menu, "Far Clip Plane Out", "CubicClipZoomOut" ); menu_separator( camera_menu ); + create_menu_item_with_mnemonic( camera_menu, "Decrease FOV", "FOVDec" ); + create_menu_item_with_mnemonic( camera_menu, "Increase FOV", "FOVInc" ); + menu_separator( camera_menu ); create_menu_item_with_mnemonic( camera_menu, "Next leak spot", "NextLeakSpot" ); create_menu_item_with_mnemonic( camera_menu, "Previous leak spot", "PrevLeakSpot" ); menu_separator( camera_menu ); @@@ -2414,7 -2333,7 +2414,7 @@@ ui::MenuItem create_help_menu() create_menu_item_with_mnemonic( menu, "Bug report", makeCallbackF(OpenBugReportURL) ); create_menu_item_with_mnemonic( menu, "Shortcuts list", makeCallbackF(DoCommandListDlg) ); - create_menu_item_with_mnemonic( menu, "_About", makeCallbackF(DoAbout) ); + create_menu_item_with_mnemonic( menu, "_About...", makeCallbackF(DoAbout) ); return help_menu_item; } @@@ -2795,14 -2714,10 +2795,14 @@@ MainFrame::~MainFrame() for ( std::vector::iterator i = g_floating_windows.begin(); i != g_floating_windows.end(); ++i ) { +#ifndef WORKAROUND_MACOS_GTK2_DESTROY i->destroy(); +#endif } +#ifndef WORKAROUND_MACOS_GTK2_DESTROY m_window.destroy(); +#endif } void MainFrame::SetActiveXY( XYWnd* p ){ @@@ -2959,16 -2874,13 +2959,16 @@@ WindowPositionTracker g_posXZWnd WindowPositionTracker g_posYZWnd; static gint mainframe_delete( ui::Widget widget, GdkEvent *event, gpointer data ){ - if ( ConfirmModified( "Exit Radiant" ) ) { + if ( ConfirmModified( "Exit " RADIANT_NAME ) ) { gtk_main_quit(); } return TRUE; } +PanedState g_single_hpaned = { 0.75f, -1, }; +PanedState g_single_vpaned = { 0.75f, -1, }; + void MainFrame::Create(){ ui::Window window = ui::Window( ui::window_type::TOP ); @@@ -3016,42 -2928,54 +3016,54 @@@ auto main_toolbar = create_main_toolbar( CurrentStyle() ); vbox.pack_start( main_toolbar, FALSE, FALSE, 0 ); - auto plugin_toolbar = create_plugin_toolbar(); - if ( !g_Layout_enablePluginToolbar.m_value ) { - plugin_toolbar.hide(); - } - - if ( g_Layout_enableFilterToolbar.m_value ) { - auto space = [&]() { - auto btn = gtk_separator_tool_item_new(); - gtk_widget_show(GTK_WIDGET(btn)); - gtk_container_add(GTK_CONTAINER(plugin_toolbar), GTK_WIDGET(btn)); - }; - - space(); - toolbar_append_toggle_button( plugin_toolbar, "World (ALT + 1)", "f-world.bmp", "FilterWorldBrushes" ); - toolbar_append_toggle_button( plugin_toolbar, "Details (CTRL + D)", "f-details.bmp", "FilterDetails" ); - toolbar_append_toggle_button( plugin_toolbar, "Structural (CTRL + SHIFT + D)", "f-structural.bmp", "FilterStructural" ); - toolbar_append_toggle_button( plugin_toolbar, "Patches (CTRL + P)", "patch_wireframe.png", "FilterPatches" ); - space(); - toolbar_append_toggle_button( plugin_toolbar, "Areaportals (ALT + 3)", "f-areaportal.bmp", "FilterAreaportals" ); - toolbar_append_toggle_button( plugin_toolbar, "Translucent (ALT + 4)", "f-translucent.bmp", "FilterTranslucent" ); - toolbar_append_toggle_button( plugin_toolbar, "Liquids (ALT + 5)", "f-liquids.bmp", "FilterLiquids" ); - toolbar_append_toggle_button( plugin_toolbar, "Caulk (ALT + 6)", "f-caulk.bmp", "FilterCaulk" ); - toolbar_append_toggle_button( plugin_toolbar, "Clips (ALT + 7)", "f-clip.bmp", "FilterClips" ); - toolbar_append_toggle_button( plugin_toolbar, "HintsSkips (CTRL + H)", "f-hint.bmp", "FilterHintsSkips" ); - //toolbar_append_toggle_button( plugin_toolbar, "Paths (ALT + 8)", "texture_lock.bmp", "FilterPaths" ); - space(); - toolbar_append_toggle_button( plugin_toolbar, "Entities (ALT + 2)", "f-entities.bmp", "FilterEntities" ); - toolbar_append_toggle_button( plugin_toolbar, "Lights (ALT + 0)", "lightinspector.png", "FilterLights" ); - toolbar_append_toggle_button( plugin_toolbar, "Models (SHIFT + M)", "f-models.bmp", "FilterModels" ); - toolbar_append_toggle_button( plugin_toolbar, "Triggers (CTRL + SHIFT + T)", "f-triggers.bmp", "FilterTriggers" ); - // toolbar_append_toggle_button( plugin_toolbar, "Decals (SHIFT + D)", "f-decals.bmp", "FilterDecals" ); - space(); - toolbar_append_button( plugin_toolbar, "InvertFilters", "f-invert.bmp", "InvertFilters" ); - toolbar_append_button( plugin_toolbar, "ResetFilters", "f-reset.bmp", "ResetFilters" ); + if ( g_Layout_enablePluginToolbar.m_value || g_Layout_enableFilterToolbar.m_value ){ + auto PFbox = ui::HBox( FALSE, 3 ); + vbox.pack_start( PFbox, FALSE, FALSE, 0 ); + PFbox.show(); + if ( g_Layout_enablePluginToolbar.m_value ){ + auto plugin_toolbar = create_plugin_toolbar(); + if ( g_Layout_enableFilterToolbar.m_value ){ + PFbox.pack_start( plugin_toolbar, FALSE, FALSE, 0 ); + } + else{ + PFbox.pack_start( plugin_toolbar, TRUE, TRUE, 0 ); + } + } + if ( g_Layout_enableFilterToolbar.m_value ){ + auto filter_toolbar = create_filter_toolbar(); + filter_toolbar.show(); + + auto space = [&]() { + auto btn = gtk_separator_tool_item_new(); + gtk_widget_show(GTK_WIDGET(btn)); + gtk_container_add(GTK_CONTAINER(filter_toolbar), GTK_WIDGET(btn)); + }; + + toolbar_append_toggle_button( filter_toolbar, "World (ALT + 1)", "f-world.bmp", "FilterWorldBrushes" ); + toolbar_append_toggle_button( filter_toolbar, "Details (CTRL + D)", "f-details.bmp", "FilterDetails" ); + toolbar_append_toggle_button( filter_toolbar, "Structural (CTRL + SHIFT + D)", "f-structural.bmp", "FilterStructural" ); + toolbar_append_toggle_button( filter_toolbar, "Patches (CTRL + P)", "patch_wireframe.png", "FilterPatches" ); + space(); + toolbar_append_toggle_button( filter_toolbar, "Areaportals (ALT + 3)", "f-areaportal.bmp", "FilterAreaportals" ); + toolbar_append_toggle_button( filter_toolbar, "Translucent (ALT + 4)", "f-translucent.bmp", "FilterTranslucent" ); + toolbar_append_toggle_button( filter_toolbar, "Liquids (ALT + 5)", "f-liquids.bmp", "FilterLiquids" ); + toolbar_append_toggle_button( filter_toolbar, "Caulk (ALT + 6)", "f-caulk.bmp", "FilterCaulk" ); + toolbar_append_toggle_button( filter_toolbar, "Clips (ALT + 7)", "f-clip.bmp", "FilterClips" ); + toolbar_append_toggle_button( filter_toolbar, "HintsSkips (CTRL + H)", "f-hint.bmp", "FilterHintsSkips" ); + //toolbar_append_toggle_button( filter_toolbar, "Paths (ALT + 8)", "texture_lock.bmp", "FilterPaths" ); + space(); + toolbar_append_toggle_button( filter_toolbar, "Entities (ALT + 2)", "f-entities.bmp", "FilterEntities" ); + toolbar_append_toggle_button( filter_toolbar, "Lights (ALT + 0)", "lightinspector.png", "FilterLights" ); + toolbar_append_toggle_button( filter_toolbar, "Models (SHIFT + M)", "f-models.bmp", "FilterModels" ); + toolbar_append_toggle_button( filter_toolbar, "Triggers (CTRL + SHIFT + T)", "f-triggers.bmp", "FilterTriggers" ); + //toolbar_append_toggle_button( filter_toolbar, "Decals (SHIFT + D)", "f-decals.bmp", "FilterDecals" ); + space(); + toolbar_append_button( filter_toolbar, "InvertFilters", "f-invert.bmp", "InvertFilters" ); + toolbar_append_button( filter_toolbar, "ResetFilters", "f-reset.bmp", "ResetFilters" ); + + PFbox.pack_start( filter_toolbar, FALSE, FALSE, 0 ); + } } - vbox.pack_start( plugin_toolbar, FALSE, FALSE, 0 ); ui::Widget main_statusbar = create_main_statusbar(reinterpret_cast(m_pStatusLabel)); vbox.pack_end(main_statusbar, FALSE, TRUE, 2); @@@ -3084,8 -3008,7 +3096,8 @@@ window.show(); - if ( CurrentStyle() == eRegular || CurrentStyle() == eRegularLeft ) { + if ( CurrentStyle() == eRegular || CurrentStyle() == eRegularLeft ) + { { ui::Widget hsplit = ui::HPaned(ui::New); m_vSplit = hsplit; @@@ -3146,8 -3069,7 +3158,8 @@@ gtk_paned_set_position( GTK_PANED( m_vSplit2 ), g_layout_globals.nCamHeight ); } - else if ( CurrentStyle() == eFloating ) { + else if ( CurrentStyle() == eFloating ) + { { ui::Window window = ui::Window(create_persistent_floating_window( "Camera", m_window )); global_accel_connect_window( window ); @@@ -3164,8 -3086,6 +3176,8 @@@ } CamWnd_setParent( *m_pCamWnd, window ); + WORKAROUND_GOBJECT_SET_GLWIDGET( window, CamWnd_getWidget( *m_pCamWnd ) ); + g_floating_windows.push_back( window ); } @@@ -3185,8 -3105,6 +3197,8 @@@ } XY_Top_Shown_Construct( window ); + WORKAROUND_GOBJECT_SET_GLWIDGET( window, m_pXYWnd->GetWidget() ); + g_floating_windows.push_back( window ); } @@@ -3206,8 -3124,6 +3218,8 @@@ XZ_Front_Shown_Construct( window ); + WORKAROUND_GOBJECT_SET_GLWIDGET( window, m_pXZWnd->GetWidget() ); + g_floating_windows.push_back( window ); } @@@ -3227,21 -3143,17 +3239,21 @@@ YZ_Side_Shown_Construct( window ); + WORKAROUND_GOBJECT_SET_GLWIDGET( window, m_pYZWnd->GetWidget() ); + g_floating_windows.push_back( window ); } { auto frame = create_framed_widget( TextureBrowser_constructWindow( GroupDialog_getWindow() ) ); g_page_textures = GroupDialog_addPage( "Textures", frame, TextureBrowserExportTitleCaller() ); + + WORKAROUND_GOBJECT_SET_GLWIDGET( GroupDialog_getWindow(), TextureBrowser_getGLWidget() ); } GroupDialog_show(); } - else // 4 way + else if ( CurrentStyle() == eSplit ) { m_pCamWnd = NewCamWnd(); GlobalCamera_setCamWnd( *m_pCamWnd ); @@@ -3270,60 -3182,8 +3282,60 @@@ { auto frame = create_framed_widget( TextureBrowser_constructWindow( window ) ); g_page_textures = GroupDialog_addPage( "Textures", frame, TextureBrowserExportTitleCaller() ); + + WORKAROUND_GOBJECT_SET_GLWIDGET( window, TextureBrowser_getGLWidget() ); } } + else // single window + { + m_pCamWnd = NewCamWnd(); + GlobalCamera_setCamWnd( *m_pCamWnd ); + CamWnd_setParent( *m_pCamWnd, window ); + + ui::Widget camera = CamWnd_getWidget( *m_pCamWnd ); + + m_pYZWnd = new XYWnd(); + m_pYZWnd->SetViewType( YZ ); + + ui::Widget yz = m_pYZWnd->GetWidget(); + + m_pXYWnd = new XYWnd(); + m_pXYWnd->SetViewType( XY ); + + ui::Widget xy = m_pXYWnd->GetWidget(); + + m_pXZWnd = new XYWnd(); + m_pXZWnd->SetViewType( XZ ); + + ui::Widget xz = m_pXZWnd->GetWidget(); + + ui::Widget hsplit = ui::HPaned(ui::New); + vbox.pack_start( hsplit, TRUE, TRUE, 0 ); + hsplit.show(); + + ui::Widget split = create_split_views( camera, yz, xy, xz ); + + ui::Widget vsplit = ui::VPaned(ui::New); + vsplit.show(); + + // textures + ui::Widget texture_window = create_framed_widget( TextureBrowser_constructWindow( window ) ); + + // console + ui::Widget console_window = create_framed_widget( Console_constructWindow( window ) ); + + gtk_paned_add1( GTK_PANED( hsplit ), split ); + gtk_paned_add2( GTK_PANED( hsplit ), vsplit ); + + gtk_paned_add1( GTK_PANED( vsplit ), texture_window ); + gtk_paned_add2( GTK_PANED( vsplit ), console_window ); + + hsplit.connect( "size_allocate", G_CALLBACK( hpaned_allocate ), &g_single_hpaned ); + hsplit.connect( "notify::position", G_CALLBACK( paned_position ), &g_single_hpaned ); + + vsplit.connect( "size_allocate", G_CALLBACK( vpaned_allocate ), &g_single_vpaned ); + vsplit.connect( "notify::position", G_CALLBACK( paned_position ), &g_single_vpaned ); + } EntityList_constructWindow( window ); PreferencesDialog_constructWindow( window ); @@@ -3411,7 -3271,7 +3423,7 @@@ void MainFrame::SetStatusText( CopiedSt } void Sys_Status( const char* status ){ - if ( g_pParentWnd != 0 ) { + if ( g_pParentWnd != nullptr ) { g_pParentWnd->SetStatusText( g_pParentWnd->m_command_status, status ); } } @@@ -3443,7 -3303,7 +3455,7 @@@ void MainFrame::SetGridStatus() } void GridStatus_onTextureLockEnabledChanged(){ - if ( g_pParentWnd != 0 ) { + if ( g_pParentWnd != nullptr ) { g_pParentWnd->SetGridStatus(); } } @@@ -3488,7 -3348,7 +3500,7 @@@ void GlobalGL_sharedContextDestroyed() void Layout_constructPreferences( PreferencesPage& page ){ { - const char* layouts[] = { "window1.png", "window2.png", "window3.png", "window4.png" }; + const char* layouts[] = { "window1.png", "window2.png", "window3.png", "window4.png", "window5.png" }; page.appendRadioIcons( "Window Layout", STRING_ARRAY_RANGE( layouts ), @@@ -3524,9 -3384,9 +3536,9 @@@ void Layout_registerPreferencesPage() PreferencesDialog_addInterfacePage( makeCallbackF(Layout_constructPage) ); } - #include "preferencesystem.h" #include "stringio.h" +#include "transformpath/transformpath.h" void MainFrame_Construct(){ GlobalCommands_insert( "OpenManual", makeCallbackF(OpenHelpURL), Accelerator( GDK_KEY_F1 ) ); @@@ -3602,7 -3462,6 +3614,7 @@@ GlobalCommands_insert( "ColorSchemeQER", makeCallbackF(ColorScheme_QER) ); GlobalCommands_insert( "ColorSchemeBlackAndGreen", makeCallbackF(ColorScheme_Black) ); GlobalCommands_insert( "ColorSchemeYdnar", makeCallbackF(ColorScheme_Ydnar) ); + GlobalCommands_insert("ColorSchemeAdwaitaDark", makeCallbackF(ColorScheme_AdwaitaDark)); GlobalCommands_insert( "ChooseTextureBackgroundColor", makeCallback( g_ColoursMenu.m_textureback ) ); GlobalCommands_insert( "ChooseGridBackgroundColor", makeCallback( g_ColoursMenu.m_xyback ) ); GlobalCommands_insert( "ChooseGridMajorColor", makeCallback( g_ColoursMenu.m_gridmajor ) ); @@@ -3691,11 -3550,9 +3703,11 @@@ #error "unknown platform" #endif ; + StringOutputStream path( 256 ); path << DirectoryCleaned( g_pGameDescription->getRequiredKeyValue( ENGINEPATH_ATTRIBUTE ) ); - g_strEnginePath = path.c_str(); + + g_strEnginePath = transformPath( path.c_str() ).c_str(); GlobalPreferenceSystem().registerPreference( "EnginePath", make_property_string( g_strEnginePath ) ); } @@@ -3720,7 -3577,8 +3732,7 @@@ g_entityCount.setCountChangedCallback( makeCallbackF(QE_entityCountChanged) ); GlobalEntityCreator().setCounter( &g_entityCount ); - GLWidget_sharedContextCreated = GlobalGL_sharedContextCreated; - GLWidget_sharedContextDestroyed = GlobalGL_sharedContextDestroyed; + glwidget_set_shared_context_constructors( GlobalGL_sharedContextCreated, GlobalGL_sharedContextDestroyed); GlobalEntityClassManager().attach( g_WorldspawnColourEntityClassObserver ); } @@@ -3740,61 -3598,3 +3752,61 @@@ void GLWindow_Construct() void GLWindow_Destroy(){ } + +/* HACK: If ui::main is not called yet, +gtk_main_quit will not quit, so tell main +to not call ui::main. This happens when a +map is loaded from command line and require +a restart because of wrong format. +Delete this when the code to not have to +restart to load another format is merged. */ +extern bool g_dontStart; + +void Radiant_Restart(){ + // preferences are expected to be already saved in any way + // this is just to be sure and be future proof + Preferences_Save(); + + // this asks user for saving if map is modified + // user can chose to not save, it's ok + ConfirmModified( "Restart " RADIANT_NAME ); + + int status; + + char *argv[ 3 ]; + char exe_file[ 256 ]; + char map_file[ 256 ]; + bool with_map = false; + + strncpy( exe_file, g_strAppFilePath.c_str(), 256 ); + + if ( !Map_Unnamed( g_map ) ) { + strncpy( map_file, Map_Name( g_map ), 256 ); + with_map = true; + } + + argv[ 0 ] = exe_file; + argv[ 1 ] = with_map ? map_file : NULL; + argv[ 2 ] = NULL; + +#if GDEF_OS_WINDOWS + status = !_spawnvpe( P_NOWAIT, exe_file, argv, environ ); +#else + pid_t pid; + + status = posix_spawn( &pid, exe_file, NULL, NULL, argv, environ ); +#endif + + // quit if radiant successfully started + if ( status == 0 ) { + gtk_main_quit(); + /* HACK: If ui::main is not called yet, + gtk_main_quit will not quit, so tell main + to not call ui::main. This happens when a + map is loaded from command line and require + a restart because of wrong format. + Delete this when the code to not have to + restart to load another format is merged. */ + g_dontStart = true; + } +} diff --combined radiant/plugintoolbar.cpp index e06491d8,61f2f4a4..d710945d --- a/radiant/plugintoolbar.cpp +++ b/radiant/plugintoolbar.cpp @@@ -42,13 -42,13 +42,13 @@@ ui::Image new_plugin_image( const char { StringOutputStream fullpath( 256 ); - fullpath << AppPath_get() << g_pluginsDir << "bitmaps/" << filename; + fullpath << DataPath_get() << g_pluginsDir << "bitmaps/" << filename; if ( auto image = image_new_from_file_with_mask(fullpath.c_str()) ) return image; } { StringOutputStream fullpath( 256 ); - fullpath << AppPath_get() << g_modulesDir << "bitmaps/" << filename; + fullpath << DataPath_get() << g_modulesDir << "bitmaps/" << filename; if ( auto image = image_new_from_file_with_mask(fullpath.c_str()) ) return image; } @@@ -131,3 -131,17 +131,17 @@@ ui::Toolbar create_plugin_toolbar() return toolbar; } + + ui::Toolbar create_filter_toolbar(){ + + auto toolbar = ui::Toolbar::from( gtk_toolbar_new() ); + gtk_orientable_set_orientation( GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_HORIZONTAL ); + gtk_toolbar_set_style( toolbar, GTK_TOOLBAR_ICONS ); + toolbar.show(); + + g_plugin_toolbar = toolbar; + + PluginToolbar_populate(); + + return toolbar; + } diff --combined radiant/texwindow.cpp index edfe4bc7,1d766aea..81d1edc0 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@@ -101,7 -101,12 +101,7 @@@ typedef std::set TextureG void TextureGroups_addWad( TextureGroups& groups, const char* archive ){ if ( extension_equal( path_get_extension( archive ), "wad" ) ) { -#if 1 groups.insert( archive ); -#else - CopiedString archiveBaseName( path_get_filename_start( archive ), path_get_filename_base_end( archive ) ); - groups.insert( archiveBaseName ); -#endif } } @@@ -237,6 -242,10 +237,10 @@@ void TextureBrowser_showShadersExport( typedef FreeCaller &), TextureBrowser_showShadersExport> TextureBrowserShowShadersExport; + void TextureBrowser_showTexturesExport( const Callback & importer ); + + typedef FreeCaller &), TextureBrowser_showTexturesExport> TextureBrowserShowTexturesExport; + void TextureBrowser_showShaderlistOnly( const Callback & importer ); typedef FreeCaller &), TextureBrowser_showShaderlistOnly> TextureBrowserShowShaderlistOnlyExport; @@@ -267,14 -276,6 +271,14 @@@ int m_nTotalHeight CopiedString shader; ui::Window m_parent{ui::null}; +#ifdef WORKAROUND_MACOS_GTK2_GLWIDGET +ui::VBox m_vframe{ui::null}; +ui::VBox m_vfiller{ui::null}; +ui::HBox m_hframe{ui::null}; +ui::HBox m_hfiller{ui::null}; +#else // !WORKAROUND_MACOS_GTK2_GLWIDGET +ui::VBox m_frame{ui::null}; +#endif // !WORKAROUND_MACOS_GTK2_GLWIDGET ui::GLArea m_gl_widget{ui::null}; ui::Widget m_texture_scroll{ui::null}; ui::TreeView m_treeViewTree{ui::New}; @@@ -298,6 -299,7 +302,7 @@@ std::set m_found_shaders ToggleItem m_hideunused_item; ToggleItem m_hidenotex_item; ToggleItem m_showshaders_item; + ToggleItem m_showtextures_item; ToggleItem m_showshaderlistonly_item; ToggleItem m_fixedsize_item; ToggleItem m_filternotex_item; @@@ -318,6 -320,7 +323,7 @@@ std::size_t m_mouseWheelScrollIncrement std::size_t m_textureScale; // make the texture increments match the grid changes bool m_showShaders; + bool m_showTextures; bool m_showTextureScrollbar; StartupShaders m_startupShaders; // if true, the texture window will only display in-use shaders @@@ -407,6 -410,7 +413,7 @@@ TextureBrowser() m_hideunused_item( TextureBrowserHideUnusedExport() ), m_hidenotex_item( TextureBrowserFilterFallbackExport() ), m_showshaders_item( TextureBrowserShowShadersExport() ), + m_showtextures_item( TextureBrowserShowTexturesExport() ), m_showshaderlistonly_item( TextureBrowserShowShaderlistOnlyExport() ), m_fixedsize_item( TextureBrowserFixedSizeExport() ), m_filternotex_item( TextureBrowserFilterMissingExport() ), @@@ -418,6 -422,7 +425,7 @@@ m_mouseWheelScrollIncrement( 64 ), m_textureScale( 50 ), m_showShaders( true ), + m_showTextures( true ), m_showTextureScrollbar( true ), m_startupShaders( STARTUPSHADERS_NONE ), m_hideUnused( false ), @@@ -435,7 -440,7 +443,7 @@@ void ( *TextureBrowser_textureSelected void TextureBrowser_updateScroll( TextureBrowser& textureBrowser ); -const char* TextureBrowser_getComonShadersName(){ +const char* TextureBrowser_getCommonShadersName(){ const char* value = g_pGameDescription->getKeyValue( "common_shaders_name" ); if ( !string_empty( value ) ) { return value; @@@ -443,7 -448,7 +451,7 @@@ return "Common"; } -const char* TextureBrowser_getComonShadersDir(){ +const char* TextureBrowser_getCommonShadersDir(){ const char* value = g_pGameDescription->getKeyValue( "common_shaders_dir" ); if ( !string_empty( value ) ) { return value; @@@ -563,7 -568,7 +571,7 @@@ bool TextureSearch_IsShown( const char } // if texture_showinuse jump over non in-use textures - bool Texture_IsShown( IShader* shader, bool show_shaders, bool hideUnused ){ + bool Texture_IsShown( IShader* shader, bool show_shaders, bool show_textures, bool hideUnused ){ // filter missing shaders // ugly: filter on built-in fallback name after substitution if ( g_TextureBrowser_filterMissing ) { @@@ -602,6 -607,10 +610,10 @@@ return false; } + if ( !show_textures && shader->IsDefault() ) { + return false; + } + if ( hideUnused && !shader->IsInUse() ) { return false; } @@@ -615,15 -624,7 +627,15 @@@ } } else { - if ( !shader_equal_prefix( shader_get_textureName( shader->getName() ), g_TextureBrowser_currentDirectory.c_str() ) ) { + if ( TextureBrowser_showWads() ) + { + if ( g_TextureBrowser_currentDirectory != "" + && !string_equal( shader->getWadName(), g_TextureBrowser_currentDirectory.c_str() ) ) + { + return false; + } + } + else if ( !shader_equal_prefix( shader_get_textureName( shader->getName() ), g_TextureBrowser_currentDirectory.c_str() ) ) { return false; } } @@@ -650,7 -651,7 +662,7 @@@ void TextureBrowser_evaluateHeight( Tex { IShader* shader = QERApp_ActiveShaders_IteratorCurrent(); - if ( !Texture_IsShown( shader, textureBrowser.m_showShaders, textureBrowser.m_hideUnused ) ) { + if ( !Texture_IsShown( shader, textureBrowser.m_showShaders, textureBrowser.m_showTextures, textureBrowser.m_hideUnused ) ) { continue; } @@@ -713,6 -714,7 +725,7 @@@ Signal0 m_realiseCallbacks public: void realise(){ m_realiseCallbacks(); + /* texturebrowser tree update on vfs restart */ TextureBrowser_constructTreeStore(); } @@@ -820,7 -822,6 +833,7 @@@ public void visit( const char* name ){ IShader* shader = QERApp_Shader_ForName( CopiedString( StringRange( name, path_get_filename_base_end( name ) ) ).c_str() ); shader->DecRef(); + shader->setWadName( g_TextureBrowser_currentDirectory.c_str() ); } }; @@@ -863,14 -864,6 +876,14 @@@ void operator()( const char* name ) con }; void TextureDirectory_loadTexture( const char* directory, const char* texture ){ + // Doom3-like dds/ prefix (used by DarkPlaces). + // When we list dds/textures/ folder, + // store the texture names without dds/ prefix. + if ( !strncmp( "dds/", directory, 4 ) ) + { + directory = &directory[ 4 ]; + } + StringOutputStream name( 256 ); name << directory << StringRange( texture, path_get_filename_base_end( texture ) ); @@@ -905,22 -898,10 +918,22 @@@ void visit( const char* minor, const _Q void TextureBrowser_ShowDirectory( TextureBrowser& textureBrowser, const char* directory ){ if ( TextureBrowser_showWads() ) { + g_TextureBrowser_currentDirectory = directory; + TextureBrowser_heightChanged( textureBrowser ); + Archive* archive = GlobalFileSystem().getArchive( directory ); - ASSERT_NOTNULL( archive ); + if ( archive != nullptr ) + { LoadShaderVisitor visitor; archive->forEachFile( Archive::VisitorFunc( visitor, Archive::eFiles, 0 ), "textures/" ); + + // Doom3-like dds/ prefix (used by DarkPlaces). + archive->forEachFile( Archive::VisitorFunc( visitor, Archive::eFiles, 0 ), "dds/textures/" ); + } + else if ( extension_equal_i( path_get_extension( directory ), "wad" ) ) + { + globalErrorStream() << "Failed to load " << directory << "\n"; + } } else { @@@ -937,19 -918,7 +950,19 @@@ StringOutputStream dirstring( 64 ); dirstring << "textures/" << directory; - Radiant_getImageModules().foreachModule( LoadTexturesByTypeVisitor( dirstring.c_str() ) ); + { + LoadTexturesByTypeVisitor visitor( dirstring.c_str() ); + Radiant_getImageModules().foreachModule( visitor ); + } + + // Doom3-like dds/ prefix (used by DarkPlaces). + dirstring.clear(); + dirstring << "dds/textures/" << directory; + + { + LoadTexturesByTypeVisitor visitor( dirstring.c_str() ); + Radiant_getImageModules().foreachModule( visitor ); + } } } @@@ -976,15 -945,6 +989,15 @@@ void TextureBrowser_ShowTagSearchResult LoadTexturesByTypeVisitor visitor( dirstring.c_str() ); Radiant_getImageModules().foreachModule( visitor ); } + + // Doom3-like dds/ prefix (used by DarkPlaces). + dirstring.clear(); + dirstring << "dds/textures/" << directory; + + { + LoadTexturesByTypeVisitor visitor( dirstring.c_str() ); + Radiant_getImageModules().foreachModule( visitor ); + } } // we'll display the newly loaded textures + all the ones already in use @@@ -1006,6 -966,12 +1019,12 @@@ void TextureBrowser_showShadersExport( typedef FreeCaller &), TextureBrowser_showShadersExport> TextureBrowserShowShadersExport; + void TextureBrowser_showTexturesExport( const Callback & importer ){ + importer( GlobalTextureBrowser().m_showTextures ); + } + + typedef FreeCaller &), TextureBrowser_showTexturesExport> TextureBrowserShowTexturesExport; + void TextureBrowser_showShaderlistOnly( const Callback & importer ){ importer( g_TextureBrowser_shaderlistOnly ); } @@@ -1053,7 -1019,7 +1072,7 @@@ void TextureBrowser_SetHideUnused( Text void TextureBrowser_ShowStartupShaders( TextureBrowser& textureBrowser ){ if ( textureBrowser.m_startupShaders == STARTUPSHADERS_COMMON ) { - TextureBrowser_ShowDirectory( textureBrowser, TextureBrowser_getComonShadersDir() ); + TextureBrowser_ShowDirectory( textureBrowser, TextureBrowser_getCommonShadersDir() ); } } @@@ -1071,7 -1037,7 +1090,7 @@@ void TextureBrowser_Focus( TextureBrows { IShader* shader = QERApp_ActiveShaders_IteratorCurrent(); - if ( !Texture_IsShown( shader, textureBrowser.m_showShaders, textureBrowser.m_hideUnused ) ) { + if ( !Texture_IsShown( shader, textureBrowser.m_showShaders, textureBrowser.m_showTextures, textureBrowser.m_hideUnused ) ) { continue; } @@@ -1112,7 -1078,7 +1131,7 @@@ IShader* Texture_At( TextureBrowser& te { IShader* shader = QERApp_ActiveShaders_IteratorCurrent(); - if ( !Texture_IsShown( shader, textureBrowser.m_showShaders, textureBrowser.m_hideUnused ) ) { + if ( !Texture_IsShown( shader, textureBrowser.m_showShaders, textureBrowser.m_showTextures, textureBrowser.m_hideUnused ) ) { continue; } @@@ -1189,11 -1155,11 +1208,11 @@@ void TextureBrowser_trackingDelta( int } void TextureBrowser_Tracking_MouseDown( TextureBrowser& textureBrowser ){ - textureBrowser.m_freezePointer.freeze_pointer( textureBrowser.m_parent, TextureBrowser_trackingDelta, &textureBrowser ); + textureBrowser.m_freezePointer.freeze_pointer( textureBrowser.m_gl_widget, TextureBrowser_trackingDelta, &textureBrowser ); } void TextureBrowser_Tracking_MouseUp( TextureBrowser& textureBrowser ){ - textureBrowser.m_freezePointer.unfreeze_pointer( textureBrowser.m_parent ); + textureBrowser.m_freezePointer.unfreeze_pointer( textureBrowser.m_gl_widget ); } void TextureBrowser_Selection_MouseDown( TextureBrowser& textureBrowser, guint32 flags, int pointx, int pointy ){ @@@ -1223,13 -1189,14 +1242,15 @@@ void Texture_Draw( TextureBrowser& text textureBrowser.color_textureback[1], textureBrowser.color_textureback[2], 0 ); + glViewport( 0, 0, textureBrowser.width, textureBrowser.height ); glMatrixMode( GL_PROJECTION ); glLoadIdentity(); glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); glDisable( GL_DEPTH_TEST ); + + //glDisable( GL_BLEND ); if ( g_TextureBrowser_enableAlpha ) { glEnable( GL_BLEND ); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@@ -1237,6 -1204,7 +1258,7 @@@ else { glDisable( GL_BLEND ); } + glOrtho( 0, textureBrowser.width, originy - textureBrowser.height, originy, -100, 100 ); glEnable( GL_TEXTURE_2D ); @@@ -1250,7 -1218,7 +1272,7 @@@ { IShader* shader = QERApp_ActiveShaders_IteratorCurrent(); - if ( !Texture_IsShown( shader, textureBrowser.m_showShaders, textureBrowser.m_hideUnused ) ) { + if ( !Texture_IsShown( shader, textureBrowser.m_showShaders, textureBrowser.m_showTextures, textureBrowser.m_hideUnused ) ) { continue; } @@@ -1278,8 -1246,41 +1300,41 @@@ // shaders have a white border, simple textures don't // if !texture_showinuse: (some textures displayed may not be in use) // draw an additional square around with 0.5 1 0.5 color + glLineWidth( 1 ); + // shader border: + if ( !shader->IsDefault() ) { + //real 1px white/black stipple + glColor3f( 0, 0, 0 ); + glDisable( GL_TEXTURE_2D ); + + float xf = (float)x; + float yf = (float)( y - TextureBrowser_fontHeight( textureBrowser ) ); + glBegin( GL_LINE_LOOP ); + glVertex2f( xf - 1.5,yf + 1.5 ); + glVertex2f( xf - 1.5,yf - nHeight - 1.5 ); + glVertex2f( xf + 1.5 + nWidth,yf - nHeight - 1.5 ); + glVertex2f( xf + 1.5 + nWidth,yf + 1.5 ); + + glEnd(); + + glEnable( GL_LINE_STIPPLE ); + glLineStipple( 1, 0x0FFF ); + + glBegin( GL_LINE_LOOP ); + glColor3f( 1, 1, 1 ); + + glVertex2f( xf - 1.5,yf + 1.5 ); + glVertex2f( xf - 1.5,yf - nHeight - 1.5 ); + glVertex2f( xf + 1.5 + nWidth,yf - nHeight - 1.5 ); + glVertex2f( xf + 1.5 + nWidth,yf + 1.5 ); + + glEnd(); + glDisable( GL_LINE_STIPPLE ); + glEnable( GL_TEXTURE_2D ); + + } if ( shader_equal( TextureBrowser_GetSelectedShader( textureBrowser ), shader->getName() ) ) { - glLineWidth( 3 ); + glLineWidth( 2 ); if ( textureBrowser.m_rmbSelected ) { glColor3f( 0,0,1 ); } @@@ -1298,45 -1299,29 +1353,29 @@@ glEnable( GL_TEXTURE_2D ); glLineWidth( 1 ); } - else - { - glLineWidth( 1 ); - // shader border: - if ( !shader->IsDefault() ) { - glColor3f( 1,1,1 ); - glDisable( GL_TEXTURE_2D ); - - glBegin( GL_LINE_LOOP ); - glVertex2i( x - 1,y + 1 - TextureBrowser_fontHeight( textureBrowser ) ); - glVertex2i( x - 1,y - nHeight - 1 - TextureBrowser_fontHeight( textureBrowser ) ); - glVertex2i( x + 1 + nWidth,y - nHeight - 1 - TextureBrowser_fontHeight( textureBrowser ) ); - glVertex2i( x + 1 + nWidth,y + 1 - TextureBrowser_fontHeight( textureBrowser ) ); - glEnd(); - glEnable( GL_TEXTURE_2D ); - } - - // highlight in-use textures + // highlight in-use textures - if ( !textureBrowser.m_hideUnused && shader->IsInUse() ) { + else if ( !textureBrowser.m_hideUnused && shader->IsInUse() ) { + //1px with float + float xf = (float)x; + float yf = (float)( y - TextureBrowser_fontHeight( textureBrowser ) ); - glColor3f( 0.5,1,0.5 ); - glDisable( GL_TEXTURE_2D ); - glBegin( GL_LINE_LOOP ); + glColor3f( 0.5,1,0.5 ); + glDisable( GL_TEXTURE_2D ); + glBegin( GL_LINE_LOOP ); - glVertex2i( x - 3,y + 3 - TextureBrowser_fontHeight( textureBrowser ) ); - glVertex2i( x - 3,y - nHeight - 3 - TextureBrowser_fontHeight( textureBrowser ) ); - glVertex2i( x + 3 + nWidth,y - nHeight - 3 - TextureBrowser_fontHeight( textureBrowser ) ); - glVertex2i( x + 3 + nWidth,y + 3 - TextureBrowser_fontHeight( textureBrowser ) ); + glVertex2f( xf - 3.5,yf + 3.5 ); + glVertex2f( xf - 3.5,yf - nHeight - 3.5 ); + glVertex2f( xf + 3.5 + nWidth,yf - nHeight - 3.5 ); + glVertex2f( xf + 3.5 + nWidth,yf + 3.5 ); - glEnd(); - glEnable( GL_TEXTURE_2D ); - } + glEnd(); + glEnable( GL_TEXTURE_2D ); + } - } // draw checkerboard for transparent textures - if ( g_TextureBrowser_enableAlpha ) + if ( g_TextureBrowser_enableAlpha ) { glDisable( GL_TEXTURE_2D ); glBegin( GL_QUADS ); int font_height = TextureBrowser_fontHeight( textureBrowser ); for ( int i = 0; i < nHeight; i += 8 ) - { for ( int j = 0; j < nWidth; j += 8 ) { unsigned char color = (i + j) / 8 % 2 ? 0x66 : 0x99; @@@ -1350,7 -1335,6 +1389,6 @@@ glVertex2i(x + left, y - nHeight - font_height + bottom); glVertex2i(x + right, y - nHeight - font_height + bottom); } - } glEnd(); glEnable( GL_TEXTURE_2D ); } @@@ -1405,18 -1389,30 +1443,30 @@@ void TextureBrowser_queueDraw( TextureB void TextureBrowser_setScale( TextureBrowser& textureBrowser, std::size_t scale ){ textureBrowser.m_textureScale = scale; + textureBrowser.m_heightChanged = true; + textureBrowser.m_originInvalid = true; + g_activeShadersChangedCallbacks(); + TextureBrowser_queueDraw( textureBrowser ); } void TextureBrowser_setUniformSize( TextureBrowser& textureBrowser, std::size_t scale ){ textureBrowser.m_uniformTextureSize = scale; + textureBrowser.m_heightChanged = true; + textureBrowser.m_originInvalid = true; + g_activeShadersChangedCallbacks(); + TextureBrowser_queueDraw( textureBrowser ); } void TextureBrowser_setUniformMinSize( TextureBrowser& textureBrowser, std::size_t scale ){ textureBrowser.m_uniformTextureMinSize = scale; + textureBrowser.m_heightChanged = true; + textureBrowser.m_originInvalid = true; + g_activeShadersChangedCallbacks(); + TextureBrowser_queueDraw( textureBrowser ); } @@@ -1502,7 -1498,7 +1552,7 @@@ void BuildStoreAvailableTags( ui::Lis gboolean TextureBrowser_button_press( ui::Widget widget, GdkEventButton* event, TextureBrowser* textureBrowser ){ if ( event->type == GDK_BUTTON_PRESS ) { if ( event->button == 3 ) { - if ( GlobalTextureBrowser().m_tags ) { + if ( textureBrowser->m_tags ) { textureBrowser->m_rmbSelected = true; TextureBrowser_Selection_MouseDown( *textureBrowser, event->state, static_cast( event->x ), static_cast( event->y ) ); @@@ -1523,19 -1519,43 +1573,43 @@@ else if ( event->button == 1 ) { TextureBrowser_Selection_MouseDown( *textureBrowser, event->state, static_cast( event->x ), static_cast( event->y ) ); - if ( GlobalTextureBrowser().m_tags ) { + if ( textureBrowser->m_tags ) { textureBrowser->m_rmbSelected = false; textureBrowser->m_tag_frame.hide(); } } } + else if ( event->type == GDK_2BUTTON_PRESS ) { + #define GARUX_DISABLE_2BUTTON + #ifndef GARUX_DISABLE_2BUTTON + const char* sh = textureBrowser->shader.c_str(); + char* dir = strrchr( sh, '/' ); + if( dir != NULL ){ + *(dir + 1) = '\0'; + dir = strchr( sh, '/' ); + if( dir != NULL ){ + dir++; + if( *dir != '\0'){ + ScopeDisableScreenUpdates disableScreenUpdates( dir, "Loading Textures" ); + TextureBrowser_ShowDirectory( *textureBrowser, dir ); + TextureBrowser_queueDraw( *textureBrowser ); + } + } + } + #endif + } + else if ( event->type == GDK_3BUTTON_PRESS ) { - ScopeDisableScreenUpdates disableScreenUpdates( TextureBrowser_getComonShadersDir(), "Loading Textures" ); - TextureBrowser_ShowDirectory( *textureBrowser, TextureBrowser_getComonShadersDir() ); ++ ScopeDisableScreenUpdates disableScreenUpdates( TextureBrowser_getCommonShadersDir(), "Loading Textures" ); ++ TextureBrowser_ShowDirectory( *textureBrowser, TextureBrowser_getCommonShadersDir() ); + TextureBrowser_queueDraw( *textureBrowser ); + } return FALSE; } gboolean TextureBrowser_button_release( ui::Widget widget, GdkEventButton* event, TextureBrowser* textureBrowser ){ if ( event->type == GDK_BUTTON_RELEASE ) { if ( event->button == 3 ) { - if ( !GlobalTextureBrowser().m_tags ) { + if ( !textureBrowser->m_tags ) { TextureBrowser_Tracking_MouseUp( *textureBrowser ); } } @@@ -1594,7 -1614,7 +1668,7 @@@ gboolean TextureBrowser_size_allocate( return FALSE; } -gboolean TextureBrowser_expose( ui::Widget widget, GdkEventExpose* event, TextureBrowser* textureBrowser ){ +void TextureBrowser_redraw( TextureBrowser* textureBrowser ){ if ( glwidget_make_current( textureBrowser->m_gl_widget ) != FALSE ) { GlobalOpenGL_debugAssertNoErrors(); TextureBrowser_evaluateHeight( *textureBrowser ); @@@ -1602,42 -1622,28 +1676,42 @@@ GlobalOpenGL_debugAssertNoErrors(); glwidget_swap_buffers( textureBrowser->m_gl_widget ); } - return FALSE; } - -TextureBrowser g_TextureBrowser; +gboolean TextureBrowser_expose( ui::Widget widget, GdkEventExpose* event, TextureBrowser* textureBrowser ){ + TextureBrowser_redraw( textureBrowser ); + return FALSE; +} TextureBrowser& GlobalTextureBrowser(){ - return g_TextureBrowser; + static TextureBrowser textureBrowser; + return textureBrowser; } bool TextureBrowser_hideUnused(){ - return g_TextureBrowser.m_hideUnused; + return GlobalTextureBrowser().m_hideUnused; } void TextureBrowser_ToggleHideUnused(){ - if ( g_TextureBrowser.m_hideUnused ) { - TextureBrowser_SetHideUnused( g_TextureBrowser, false ); + TextureBrowser &textureBrowser = GlobalTextureBrowser(); + if ( textureBrowser.m_hideUnused ) { + TextureBrowser_SetHideUnused( textureBrowser, false ); } else { - TextureBrowser_SetHideUnused( g_TextureBrowser, true ); + TextureBrowser_SetHideUnused( textureBrowser, true ); + } +} + +const char* TextureGroups_transformDirName( const char* dirName, StringOutputStream *archiveName ) +{ + if ( TextureBrowser_showWads() ) { + archiveName->clear(); + *archiveName << StringRange( path_get_filename_start( dirName ), path_get_filename_base_end( dirName ) ) \ + << "." << path_get_extension( dirName ); + return archiveName->c_str(); } + return dirName; } void TextureGroups_constructTreeModel( TextureGroups groups, ui::TreeStore store ){ @@@ -1647,27 -1653,23 +1721,27 @@@ TextureGroups::const_iterator i = groups.begin(); while ( i != groups.end() ) { - const char* dirName = ( *i ).c_str(); + StringOutputStream archiveName; + StringOutputStream nextArchiveName; + const char* dirName = TextureGroups_transformDirName( ( *i ).c_str(), &archiveName ); + const char* firstUnderscore = strchr( dirName, '_' ); StringRange dirRoot( dirName, ( firstUnderscore == 0 ) ? dirName : firstUnderscore + 1 ); TextureGroups::const_iterator next = i; ++next; + if ( firstUnderscore != 0 && next != groups.end() - && string_equal_start( ( *next ).c_str(), dirRoot ) ) { + && string_equal_start( TextureGroups_transformDirName( ( *next ).c_str(), &nextArchiveName ), dirRoot ) ) { gtk_tree_store_append( store, &iter, NULL ); gtk_tree_store_set( store, &iter, 0, CopiedString( StringRange( dirName, firstUnderscore ) ).c_str(), -1 ); // keep going... - while ( i != groups.end() && string_equal_start( ( *i ).c_str(), dirRoot ) ) + while ( i != groups.end() && string_equal_start( TextureGroups_transformDirName( ( *i ).c_str(), &nextArchiveName ), dirRoot ) ) { gtk_tree_store_append( store, &child, &iter ); - gtk_tree_store_set( store, &child, 0, ( *i ).c_str(), -1 ); + gtk_tree_store_set( store, &child, 0, TextureGroups_transformDirName( ( *i ).c_str(), &nextArchiveName ), -1 ); ++i; } } @@@ -1704,18 -1706,17 +1778,18 @@@ void TextureBrowser_constructTreeStore( auto store = ui::TreeStore::from(gtk_tree_store_new( 1, G_TYPE_STRING )); TextureGroups_constructTreeModel( groups, store ); - gtk_tree_view_set_model(g_TextureBrowser.m_treeViewTree, store); + gtk_tree_view_set_model(GlobalTextureBrowser().m_treeViewTree, store); g_object_unref( G_OBJECT( store ) ); } void TextureBrowser_constructTreeStoreTags(){ TextureGroups groups; + TextureBrowser &textureBrowser = GlobalTextureBrowser(); auto store = ui::TreeStore::from(gtk_tree_store_new( 1, G_TYPE_STRING )); - auto model = g_TextureBrowser.m_all_tags_list; + auto model = GlobalTextureBrowser().m_all_tags_list; - gtk_tree_view_set_model(g_TextureBrowser.m_treeViewTags, model ); + gtk_tree_view_set_model(GlobalTextureBrowser().m_treeViewTags, model ); g_object_unref( G_OBJECT( store ) ); } @@@ -1733,7 -1734,7 +1807,7 @@@ void TreeView_onRowActivated( ui::TreeV strcpy( dirName, buffer ); g_free( buffer ); - g_TextureBrowser.m_searchedTags = false; + GlobalTextureBrowser().m_searchedTags = false; if ( !TextureBrowser_showWads() ) { strcat( dirName, "/" ); @@@ -1748,14 -1749,13 +1822,14 @@@ } void TextureBrowser_createTreeViewTree(){ - gtk_tree_view_set_enable_search(g_TextureBrowser.m_treeViewTree, FALSE ); + TextureBrowser &textureBrowser = GlobalTextureBrowser(); + gtk_tree_view_set_enable_search(textureBrowser.m_treeViewTree, FALSE ); - gtk_tree_view_set_headers_visible(g_TextureBrowser.m_treeViewTree, FALSE ); - g_TextureBrowser.m_treeViewTree.connect( "row-activated", (GCallback) TreeView_onRowActivated, NULL ); + gtk_tree_view_set_headers_visible(textureBrowser.m_treeViewTree, FALSE ); + textureBrowser.m_treeViewTree.connect( "row-activated", (GCallback) TreeView_onRowActivated, NULL ); auto renderer = ui::CellRendererText(ui::New); - gtk_tree_view_insert_column_with_attributes(g_TextureBrowser.m_treeViewTree, -1, "", renderer, "text", 0, NULL ); + gtk_tree_view_insert_column_with_attributes(textureBrowser.m_treeViewTree, -1, "", renderer, "text", 0, NULL ); TextureBrowser_constructTreeStore(); } @@@ -1806,22 -1806,20 +1880,22 @@@ gboolean TreeViewTags_onButtonPressed( } void TextureBrowser_createTreeViewTags(){ - g_TextureBrowser.m_treeViewTags = ui::TreeView(ui::New); - gtk_tree_view_set_enable_search(g_TextureBrowser.m_treeViewTags, FALSE ); + TextureBrowser &textureBrowser = GlobalTextureBrowser(); + textureBrowser.m_treeViewTags = ui::TreeView(ui::New); + gtk_tree_view_set_enable_search(textureBrowser.m_treeViewTags, FALSE ); - g_TextureBrowser.m_treeViewTags.connect( "button-press-event", (GCallback)TreeViewTags_onButtonPressed, NULL ); + textureBrowser.m_treeViewTags.connect( "button-press-event", (GCallback)TreeViewTags_onButtonPressed, NULL ); - gtk_tree_view_set_headers_visible(g_TextureBrowser.m_treeViewTags, FALSE ); + gtk_tree_view_set_headers_visible(textureBrowser.m_treeViewTags, FALSE ); auto renderer = ui::CellRendererText(ui::New); - gtk_tree_view_insert_column_with_attributes(g_TextureBrowser.m_treeViewTags, -1, "", renderer, "text", 0, NULL ); + gtk_tree_view_insert_column_with_attributes(textureBrowser.m_treeViewTags, -1, "", renderer, "text", 0, NULL ); TextureBrowser_constructTreeStoreTags(); } ui::MenuItem TextureBrowser_constructViewMenu( ui::Menu menu ){ + TextureBrowser &textureBrowser = GlobalTextureBrowser(); ui::MenuItem textures_menu_item = ui::MenuItem(new_sub_menu_item_with_mnemonic( "_View" )); if ( g_Layout_enableDetachableMenus.m_value ) { @@@ -1838,23 -1836,24 +1912,24 @@@ menu_separator( menu ); - create_menu_item_with_mnemonic( menu, "Show All", "ShowAllTextures" ); // we always want to show shaders but don't want a "Show Shaders" menu for doom3 and .wad file games - if ( g_pGameDescription->mGameType == "doom3" || !string_empty( g_pGameDescription->getKeyValue( "show_wads" ) ) ) { - g_TextureBrowser.m_showShaders = true; + if ( g_pGameDescription->mGameType == "doom3" || TextureBrowser_showWads() ) { + textureBrowser.m_showShaders = true; } else { create_check_menu_item_with_mnemonic( menu, "Show shaders", "ToggleShowShaders" ); + create_check_menu_item_with_mnemonic( menu, "Show textures", "ToggleShowTextures" ); + menu_separator( menu ); } - if ( g_pGameDescription->mGameType != "doom3" && string_empty( g_pGameDescription->getKeyValue( "show_wads" ) ) ) { - create_check_menu_item_with_mnemonic( menu, "Shaders Only", "ToggleShowShaderlistOnly" ); - } - if ( g_TextureBrowser.m_tags ) { + if ( textureBrowser.m_tags ) { create_menu_item_with_mnemonic( menu, "Show Untagged", "ShowUntagged" ); } + if ( g_pGameDescription->mGameType != "doom3" && string_empty( g_pGameDescription->getKeyValue( "show_wads" ) ) ) { + create_check_menu_item_with_mnemonic( menu, "ShaderList Only", "ToggleShowShaderlistOnly" ); + } menu_separator( menu ); create_check_menu_item_with_mnemonic( menu, "Fixed Size", "FixedSize" ); @@@ -1862,8 -1861,8 +1937,8 @@@ if ( string_empty( g_pGameDescription->getKeyValue( "show_wads" ) ) ) { menu_separator( menu ); - g_TextureBrowser.m_shader_info_item = ui::Widget(create_menu_item_with_mnemonic( menu, "Shader Info", "ShaderInfo" )); - gtk_widget_set_sensitive( g_TextureBrowser.m_shader_info_item, FALSE ); + textureBrowser.m_shader_info_item = ui::Widget(create_menu_item_with_mnemonic( menu, "Shader Info", "ShaderInfo" )); + gtk_widget_set_sensitive( textureBrowser.m_shader_info_item, FALSE ); } @@@ -1900,7 -1899,7 +1975,7 @@@ ui::MenuItem TextureBrowser_constructTa return textures_menu_item; } -gboolean TextureBrowser_tagMoveHelper( ui::TreeModel model, ui::TreePath path, GtkTreeIter iter, GSList** selected ){ +gboolean TextureBrowser_tagMoveHelper( ui::TreeModel model, ui::TreePath path, GtkTreeIter* iter, GSList** selected ){ g_assert( selected != NULL ); auto rowref = gtk_tree_row_reference_new( model, path ); @@@ -1913,9 -1912,8 +1988,9 @@@ void TextureBrowser_assignTags() GSList* selected = NULL; GSList* node; gchar* tag_assigned; + TextureBrowser &textureBrowser = GlobalTextureBrowser(); - auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_available_tree ); + auto selection = gtk_tree_view_get_selection(textureBrowser.m_available_tree ); gtk_tree_selection_selected_foreach( selection, (GtkTreeSelectionForeachFunc)TextureBrowser_tagMoveHelper, &selected ); @@@ -1927,27 -1925,27 +2002,27 @@@ if ( path ) { GtkTreeIter iter; - if ( gtk_tree_model_get_iter(g_TextureBrowser.m_available_store, &iter, path ) ) { - gtk_tree_model_get(g_TextureBrowser.m_available_store, &iter, TAG_COLUMN, &tag_assigned, -1 ); - if ( !TagBuilder.CheckShaderTag( g_TextureBrowser.shader.c_str() ) ) { + if ( gtk_tree_model_get_iter(textureBrowser.m_available_store, &iter, path ) ) { + gtk_tree_model_get(textureBrowser.m_available_store, &iter, TAG_COLUMN, &tag_assigned, -1 ); + if ( !TagBuilder.CheckShaderTag( textureBrowser.shader.c_str() ) ) { // create a custom shader/texture entry - IShader* ishader = QERApp_Shader_ForName( g_TextureBrowser.shader.c_str() ); + IShader* ishader = QERApp_Shader_ForName( textureBrowser.shader.c_str() ); CopiedString filename = ishader->getShaderFileName(); if ( filename.empty() ) { // it's a texture - TagBuilder.AddShaderNode( g_TextureBrowser.shader.c_str(), CUSTOM, TEXTURE ); + TagBuilder.AddShaderNode( textureBrowser.shader.c_str(), CUSTOM, TEXTURE ); } else { // it's a shader - TagBuilder.AddShaderNode( g_TextureBrowser.shader.c_str(), CUSTOM, SHADER ); + TagBuilder.AddShaderNode( textureBrowser.shader.c_str(), CUSTOM, SHADER ); } ishader->DecRef(); } - TagBuilder.AddShaderTag( g_TextureBrowser.shader.c_str(), (char*)tag_assigned, TAG ); + TagBuilder.AddShaderTag( textureBrowser.shader.c_str(), (char*)tag_assigned, TAG ); - gtk_list_store_remove( g_TextureBrowser.m_available_store, &iter ); - g_TextureBrowser.m_assigned_store.append(TAG_COLUMN, tag_assigned); + gtk_list_store_remove( textureBrowser.m_available_store, &iter ); + textureBrowser.m_assigned_store.append(TAG_COLUMN, tag_assigned); } } } @@@ -1964,9 -1962,8 +2039,9 @@@ void TextureBrowser_removeTags() GSList* selected = NULL; GSList* node; gchar* tag; + TextureBrowser &textureBrowser = GlobalTextureBrowser(); - auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_assigned_tree ); + auto selection = gtk_tree_view_get_selection(textureBrowser.m_assigned_tree ); gtk_tree_selection_selected_foreach( selection, (GtkTreeSelectionForeachFunc)TextureBrowser_tagMoveHelper, &selected ); @@@ -1978,10 -1975,10 +2053,10 @@@ if ( path ) { GtkTreeIter iter; - if ( gtk_tree_model_get_iter(g_TextureBrowser.m_assigned_store, &iter, path ) ) { - gtk_tree_model_get(g_TextureBrowser.m_assigned_store, &iter, TAG_COLUMN, &tag, -1 ); - TagBuilder.DeleteShaderTag( g_TextureBrowser.shader.c_str(), tag ); - gtk_list_store_remove( g_TextureBrowser.m_assigned_store, &iter ); + if ( gtk_tree_model_get_iter(textureBrowser.m_assigned_store, &iter, path ) ) { + gtk_tree_model_get(textureBrowser.m_assigned_store, &iter, TAG_COLUMN, &tag, -1 ); + TagBuilder.DeleteShaderTag( textureBrowser.shader.c_str(), tag ); + gtk_list_store_remove( textureBrowser.m_assigned_store, &iter ); } } } @@@ -1989,7 -1986,7 +2064,7 @@@ g_slist_foreach( selected, (GFunc)gtk_tree_row_reference_free, NULL ); // Update the "available tags list" - BuildStoreAvailableTags( g_TextureBrowser.m_available_store, g_TextureBrowser.m_assigned_store, g_TextureBrowser.m_all_tags, &g_TextureBrowser ); + BuildStoreAvailableTags( textureBrowser.m_available_store, textureBrowser.m_assigned_store, textureBrowser.m_all_tags, &textureBrowser ); // Save changes TagBuilder.SaveXmlDoc(); @@@ -1998,14 -1995,13 +2073,14 @@@ } void TextureBrowser_buildTagList(){ - g_TextureBrowser.m_all_tags_list.clear(); + TextureBrowser &textureBrowser = GlobalTextureBrowser(); + textureBrowser.m_all_tags_list.clear(); std::set::iterator iter; - for ( iter = g_TextureBrowser.m_all_tags.begin(); iter != g_TextureBrowser.m_all_tags.end(); ++iter ) + for ( iter = textureBrowser.m_all_tags.begin(); iter != textureBrowser.m_all_tags.end(); ++iter ) { - g_TextureBrowser.m_all_tags_list.append(TAG_COLUMN, (*iter).c_str()); + textureBrowser.m_all_tags_list.append(TAG_COLUMN, (*iter).c_str()); } } @@@ -2015,9 -2011,8 +2090,9 @@@ void TextureBrowser_searchTags() gchar* tag; char buffer[256]; char tags_searched[256]; + TextureBrowser &textureBrowser = GlobalTextureBrowser(); - auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_treeViewTags ); + auto selection = gtk_tree_view_get_selection(textureBrowser.m_treeViewTags ); gtk_tree_selection_selected_foreach( selection, (GtkTreeSelectionForeachFunc)TextureBrowser_tagMoveHelper, &selected ); @@@ -2032,8 -2027,8 +2107,8 @@@ if ( path ) { GtkTreeIter iter; - if ( gtk_tree_model_get_iter(g_TextureBrowser.m_all_tags_list, &iter, path ) ) { - gtk_tree_model_get(g_TextureBrowser.m_all_tags_list, &iter, TAG_COLUMN, &tag, -1 ); + if ( gtk_tree_model_get_iter(textureBrowser.m_all_tags_list, &iter, path ) ) { + gtk_tree_model_get(textureBrowser.m_all_tags_list, &iter, TAG_COLUMN, &tag, -1 ); strcat( buffer, tag ); strcat( tags_searched, tag ); @@@ -2049,18 -2044,18 +2124,18 @@@ g_slist_foreach( selected, (GFunc)gtk_tree_row_reference_free, NULL ); - g_TextureBrowser.m_found_shaders.clear(); // delete old list - TagBuilder.TagSearch( buffer, g_TextureBrowser.m_found_shaders ); + textureBrowser.m_found_shaders.clear(); // delete old list + TagBuilder.TagSearch( buffer, textureBrowser.m_found_shaders ); - if ( !g_TextureBrowser.m_found_shaders.empty() ) { // found something - size_t shaders_found = g_TextureBrowser.m_found_shaders.size(); + if ( !textureBrowser.m_found_shaders.empty() ) { // found something + size_t shaders_found = textureBrowser.m_found_shaders.size(); globalOutputStream() << "Found " << (unsigned int)shaders_found << " textures and shaders with " << tags_searched << "\n"; ScopeDisableScreenUpdates disableScreenUpdates( "Searching...", "Loading Textures" ); std::set::iterator iter; - for ( iter = g_TextureBrowser.m_found_shaders.begin(); iter != g_TextureBrowser.m_found_shaders.end(); iter++ ) + for ( iter = textureBrowser.m_found_shaders.begin(); iter != textureBrowser.m_found_shaders.end(); iter++ ) { std::string path = ( *iter ).c_str(); size_t pos = path.find_last_of( "/", path.size() ); @@@ -2069,66 -2064,62 +2144,66 @@@ TextureDirectory_loadTexture( path.c_str(), name.c_str() ); } } - g_TextureBrowser.m_searchedTags = true; + textureBrowser.m_searchedTags = true; g_TextureBrowser_currentDirectory = tags_searched; - g_TextureBrowser.m_nTotalHeight = 0; - TextureBrowser_setOriginY( g_TextureBrowser, 0 ); - TextureBrowser_heightChanged( g_TextureBrowser ); + textureBrowser.m_nTotalHeight = 0; + TextureBrowser_setOriginY( textureBrowser, 0 ); + TextureBrowser_heightChanged( textureBrowser ); TextureBrowser_updateTitle(); } g_slist_free( selected ); } void TextureBrowser_toggleSearchButton(){ - gint page = gtk_notebook_get_current_page( GTK_NOTEBOOK( g_TextureBrowser.m_tag_notebook ) ); + TextureBrowser &textureBrowser = GlobalTextureBrowser(); + gint page = gtk_notebook_get_current_page( GTK_NOTEBOOK( textureBrowser.m_tag_notebook ) ); if ( page == 0 ) { // tag page - gtk_widget_show_all( g_TextureBrowser.m_search_button ); + gtk_widget_show_all( textureBrowser.m_search_button ); } else { - g_TextureBrowser.m_search_button.hide(); + textureBrowser.m_search_button.hide(); } } void TextureBrowser_constructTagNotebook(){ - g_TextureBrowser.m_tag_notebook = ui::Widget::from(gtk_notebook_new()); + TextureBrowser &textureBrowser = GlobalTextureBrowser(); + textureBrowser.m_tag_notebook = ui::Widget::from(gtk_notebook_new()); ui::Widget labelTags = ui::Label( "Tags" ); ui::Widget labelTextures = ui::Label( "Textures" ); - gtk_notebook_append_page( GTK_NOTEBOOK( g_TextureBrowser.m_tag_notebook ), g_TextureBrowser.m_scr_win_tree, labelTextures ); - gtk_notebook_append_page( GTK_NOTEBOOK( g_TextureBrowser.m_tag_notebook ), g_TextureBrowser.m_scr_win_tags, labelTags ); + gtk_notebook_append_page( GTK_NOTEBOOK( textureBrowser.m_tag_notebook ), textureBrowser.m_scr_win_tree, labelTextures ); + gtk_notebook_append_page( GTK_NOTEBOOK( textureBrowser.m_tag_notebook ), textureBrowser.m_scr_win_tags, labelTags ); - g_TextureBrowser.m_tag_notebook.connect( "switch-page", G_CALLBACK( TextureBrowser_toggleSearchButton ), NULL ); + textureBrowser.m_tag_notebook.connect( "switch-page", G_CALLBACK( TextureBrowser_toggleSearchButton ), NULL ); - gtk_widget_show_all( g_TextureBrowser.m_tag_notebook ); + gtk_widget_show_all( textureBrowser.m_tag_notebook ); } void TextureBrowser_constructSearchButton(){ auto image = ui::Widget::from(gtk_image_new_from_stock( GTK_STOCK_FIND, GTK_ICON_SIZE_SMALL_TOOLBAR )); - g_TextureBrowser.m_search_button = ui::Button(ui::New); - g_TextureBrowser.m_search_button.connect( "clicked", G_CALLBACK( TextureBrowser_searchTags ), NULL ); - gtk_widget_set_tooltip_text(g_TextureBrowser.m_search_button, "Search with selected tags"); - g_TextureBrowser.m_search_button.add(image); + TextureBrowser &textureBrowser = GlobalTextureBrowser(); + textureBrowser.m_search_button = ui::Button(ui::New); + textureBrowser.m_search_button.connect( "clicked", G_CALLBACK( TextureBrowser_searchTags ), NULL ); + gtk_widget_set_tooltip_text(textureBrowser.m_search_button, "Search with selected tags"); + textureBrowser.m_search_button.add(image); } void TextureBrowser_checkTagFile(){ const char SHADERTAG_FILE[] = "shadertags.xml"; CopiedString default_filename, rc_filename; StringOutputStream stream( 256 ); + TextureBrowser &textureBrowser = GlobalTextureBrowser(); stream << LocalRcPath_get(); stream << SHADERTAG_FILE; rc_filename = stream.c_str(); if ( file_exists( rc_filename.c_str() ) ) { - g_TextureBrowser.m_tags = TagBuilder.OpenXmlDoc( rc_filename.c_str() ); + textureBrowser.m_tags = TagBuilder.OpenXmlDoc( rc_filename.c_str() ); - if ( g_TextureBrowser.m_tags ) { + if ( textureBrowser.m_tags ) { globalOutputStream() << "Loading tag file " << rc_filename.c_str() << ".\n"; } } @@@ -2141,9 -2132,9 +2216,9 @@@ default_filename = stream.c_str(); if ( file_exists( default_filename.c_str() ) ) { - g_TextureBrowser.m_tags = TagBuilder.OpenXmlDoc( default_filename.c_str(), rc_filename.c_str() ); + textureBrowser.m_tags = TagBuilder.OpenXmlDoc( default_filename.c_str(), rc_filename.c_str() ); - if ( g_TextureBrowser.m_tags ) { + if ( textureBrowser.m_tags ) { globalOutputStream() << "Loading default tag file " << default_filename.c_str() << ".\n"; } } @@@ -2159,56 -2150,24 +2234,56 @@@ void TextureBrowser_SetNotex() IShader* shadernotex = QERApp_Shader_ForName( DEFAULT_SHADERNOTEX_NAME ); g_notex = notex->getTexture()->name; + g_shadernotex = shadernotex->getTexture()->name; notex->DecRef(); shadernotex->DecRef(); } +static bool isGLWidgetConstructed = false; +static bool isWindowConstructed = false; + +void TextureBrowser_constructGLWidget(){ + TextureBrowser &textureBrowser = GlobalTextureBrowser(); + textureBrowser.m_gl_widget = glwidget_new( FALSE ); + g_object_ref( textureBrowser.m_gl_widget._handle ); + + gtk_widget_set_events( textureBrowser.m_gl_widget, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK ); + gtk_widget_set_can_focus( textureBrowser.m_gl_widget, true ); + + textureBrowser.m_sizeHandler = textureBrowser.m_gl_widget.connect( "size_allocate", G_CALLBACK( TextureBrowser_size_allocate ), &textureBrowser ); + textureBrowser.m_exposeHandler = textureBrowser.m_gl_widget.on_render( G_CALLBACK( TextureBrowser_expose ), &textureBrowser ); + + textureBrowser.m_gl_widget.connect( "button_press_event", G_CALLBACK( TextureBrowser_button_press ), &textureBrowser ); + textureBrowser.m_gl_widget.connect( "button_release_event", G_CALLBACK( TextureBrowser_button_release ), &textureBrowser ); + textureBrowser.m_gl_widget.connect( "motion_notify_event", G_CALLBACK( TextureBrowser_motion ), &textureBrowser ); + textureBrowser.m_gl_widget.connect( "scroll_event", G_CALLBACK( TextureBrowser_scroll ), &textureBrowser ); + +#ifdef WORKAROUND_MACOS_GTK2_GLWIDGET + textureBrowser.m_hframe.pack_start( textureBrowser.m_gl_widget, TRUE, TRUE, 0 ); +#else // !WORKAROUND_MACOS_GTK2_GLWIDGET + textureBrowser.m_frame.pack_start( textureBrowser.m_gl_widget, TRUE, TRUE, 0 ); +#endif // !WORKAROUND_MACOS_GTK2_GLWIDGET + + textureBrowser.m_gl_widget.show(); + + isGLWidgetConstructed = true; +} + ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ // The gl_widget and the tag assignment frame should be packed into a GtkVPaned with the slider // position stored in local.pref. gtk_paned_get_position() and gtk_paned_set_position() don't // seem to work in gtk 2.4 and the arrow buttons don't handle GTK_FILL, so here's another thing // for the "once-the-gtk-libs-are-updated-TODO-list" :x + TextureBrowser &textureBrowser = GlobalTextureBrowser(); TextureBrowser_checkTagFile(); TextureBrowser_SetNotex(); - GlobalShaderSystem().setActiveShadersChangedNotify( ReferenceCaller( g_TextureBrowser ) ); + GlobalShaderSystem().setActiveShadersChangedNotify( ReferenceCaller( textureBrowser ) ); - g_TextureBrowser.m_parent = toplevel; + textureBrowser.m_parent = toplevel; auto table = ui::Table(3, 3, FALSE); auto vbox = ui::VBox(FALSE, 0); @@@ -2233,65 -2192,57 +2308,65 @@@ menu_bar.show(); } { // Texture TreeView - g_TextureBrowser.m_scr_win_tree = ui::ScrolledWindow(ui::New); - gtk_container_set_border_width( GTK_CONTAINER( g_TextureBrowser.m_scr_win_tree ), 0 ); + textureBrowser.m_scr_win_tree = ui::ScrolledWindow(ui::New); + gtk_container_set_border_width( GTK_CONTAINER( textureBrowser.m_scr_win_tree ), 0 ); // vertical only scrolling for treeview - gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( g_TextureBrowser.m_scr_win_tree ), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS ); + gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( textureBrowser.m_scr_win_tree ), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS ); - g_TextureBrowser.m_scr_win_tree.show(); + textureBrowser.m_scr_win_tree.show(); TextureBrowser_createTreeViewTree(); - gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( g_TextureBrowser.m_scr_win_tree ), g_TextureBrowser.m_treeViewTree ); - g_TextureBrowser.m_treeViewTree.show(); + gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( textureBrowser.m_scr_win_tree ), textureBrowser.m_treeViewTree ); + textureBrowser.m_treeViewTree.show(); } { // gl_widget scrollbar auto w = ui::Widget::from(gtk_vscrollbar_new( ui::Adjustment( 0,0,0,1,1,0 ) )); table.attach(w, {2, 3, 1, 2}, {GTK_SHRINK, GTK_FILL}); w.show(); - g_TextureBrowser.m_texture_scroll = w; + textureBrowser.m_texture_scroll = w; - auto vadjustment = ui::Adjustment::from(gtk_range_get_adjustment( GTK_RANGE( g_TextureBrowser.m_texture_scroll ) )); - vadjustment.connect( "value_changed", G_CALLBACK( TextureBrowser_verticalScroll ), &g_TextureBrowser ); + auto vadjustment = ui::Adjustment::from(gtk_range_get_adjustment( GTK_RANGE( textureBrowser.m_texture_scroll ) )); + vadjustment.connect( "value_changed", G_CALLBACK( TextureBrowser_verticalScroll ), &textureBrowser ); - g_TextureBrowser.m_texture_scroll.visible(g_TextureBrowser.m_showTextureScrollbar); + textureBrowser.m_texture_scroll.visible(textureBrowser.m_showTextureScrollbar); } { // gl_widget - g_TextureBrowser.m_gl_widget = glwidget_new( FALSE ); - g_object_ref( g_TextureBrowser.m_gl_widget._handle ); +#ifdef WORKAROUND_MACOS_GTK2_GLWIDGET + textureBrowser.m_vframe = ui::VBox( FALSE, 0 ); + table.attach(textureBrowser.m_vframe, {1, 2, 1, 2}); + + textureBrowser.m_vfiller = ui::VBox( FALSE, 0 ); + textureBrowser.m_vframe.pack_start( textureBrowser.m_vfiller, FALSE, FALSE, 0 ); - gtk_widget_set_events( g_TextureBrowser.m_gl_widget, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK ); - gtk_widget_set_can_focus( g_TextureBrowser.m_gl_widget, true ); + textureBrowser.m_hframe = ui::HBox( FALSE, 0 ); + textureBrowser.m_vframe.pack_start( textureBrowser.m_hframe, TRUE, TRUE, 0 ); - table.attach(g_TextureBrowser.m_gl_widget, {1, 2, 1, 2}); - g_TextureBrowser.m_gl_widget.show(); + textureBrowser.m_hfiller = ui::HBox( FALSE, 0 ); + textureBrowser.m_hframe.pack_start( textureBrowser.m_hfiller, FALSE, FALSE, 0 ); - g_TextureBrowser.m_sizeHandler = g_TextureBrowser.m_gl_widget.connect( "size_allocate", G_CALLBACK( TextureBrowser_size_allocate ), &g_TextureBrowser ); - g_TextureBrowser.m_exposeHandler = g_TextureBrowser.m_gl_widget.on_render( G_CALLBACK( TextureBrowser_expose ), &g_TextureBrowser ); + textureBrowser.m_vframe.show(); + textureBrowser.m_vfiller.show(); + textureBrowser.m_hframe.show(), + textureBrowser.m_hfiller.show(); +#else // !WORKAROUND_MACOS_GTK2_GLWIDGET + textureBrowser.m_frame = ui::VBox( FALSE, 0 ); + table.attach(textureBrowser.m_frame, {1, 2, 1, 2}); + textureBrowser.m_frame.show(); +#endif // !WORKAROUND_MACOS_GTK2_GLWIDGET - g_TextureBrowser.m_gl_widget.connect( "button_press_event", G_CALLBACK( TextureBrowser_button_press ), &g_TextureBrowser ); - g_TextureBrowser.m_gl_widget.connect( "button_release_event", G_CALLBACK( TextureBrowser_button_release ), &g_TextureBrowser ); - g_TextureBrowser.m_gl_widget.connect( "motion_notify_event", G_CALLBACK( TextureBrowser_motion ), &g_TextureBrowser ); - g_TextureBrowser.m_gl_widget.connect( "scroll_event", G_CALLBACK( TextureBrowser_scroll ), &g_TextureBrowser ); + TextureBrowser_constructGLWidget(); } // tag stuff - if ( g_TextureBrowser.m_tags ) { + if ( textureBrowser.m_tags ) { { // fill tag GtkListStore - g_TextureBrowser.m_all_tags_list = ui::ListStore::from(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); - auto sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_all_tags_list ); + textureBrowser.m_all_tags_list = ui::ListStore::from(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); + auto sortable = GTK_TREE_SORTABLE( textureBrowser.m_all_tags_list ); gtk_tree_sortable_set_sort_column_id( sortable, TAG_COLUMN, GTK_SORT_ASCENDING ); - TagBuilder.GetAllTags( g_TextureBrowser.m_all_tags ); + TagBuilder.GetAllTags( textureBrowser.m_all_tags ); TextureBrowser_buildTagList(); } { // tag menu bar @@@ -2301,67 -2252,67 +2376,67 @@@ gtk_menu_shell_append( GTK_MENU_SHELL( menu_bar ), tags_item ); } { // Tag TreeView - g_TextureBrowser.m_scr_win_tags = ui::ScrolledWindow(ui::New); - gtk_container_set_border_width( GTK_CONTAINER( g_TextureBrowser.m_scr_win_tags ), 0 ); + textureBrowser.m_scr_win_tags = ui::ScrolledWindow(ui::New); + gtk_container_set_border_width( GTK_CONTAINER( textureBrowser.m_scr_win_tags ), 0 ); // vertical only scrolling for treeview - gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( g_TextureBrowser.m_scr_win_tags ), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS ); + gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( textureBrowser.m_scr_win_tags ), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS ); TextureBrowser_createTreeViewTags(); - auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_treeViewTags ); + auto selection = gtk_tree_view_get_selection(textureBrowser.m_treeViewTags ); gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE ); - gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( g_TextureBrowser.m_scr_win_tags ), g_TextureBrowser.m_treeViewTags ); - g_TextureBrowser.m_treeViewTags.show(); + gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( textureBrowser.m_scr_win_tags ), textureBrowser.m_treeViewTags ); + textureBrowser.m_treeViewTags.show(); } { // Texture/Tag notebook TextureBrowser_constructTagNotebook(); - vbox.pack_start( g_TextureBrowser.m_tag_notebook, TRUE, TRUE, 0 ); + vbox.pack_start( textureBrowser.m_tag_notebook, TRUE, TRUE, 0 ); } { // Tag search button TextureBrowser_constructSearchButton(); - vbox.pack_end(g_TextureBrowser.m_search_button, FALSE, FALSE, 0); + vbox.pack_end(textureBrowser.m_search_button, FALSE, FALSE, 0); } auto frame_table = ui::Table(3, 3, FALSE); { // Tag frame - g_TextureBrowser.m_tag_frame = ui::Frame( "Tag assignment" ); - gtk_frame_set_label_align( GTK_FRAME( g_TextureBrowser.m_tag_frame ), 0.5, 0.5 ); - gtk_frame_set_shadow_type( GTK_FRAME( g_TextureBrowser.m_tag_frame ), GTK_SHADOW_NONE ); + textureBrowser.m_tag_frame = ui::Frame( "Tag assignment" ); + gtk_frame_set_label_align( GTK_FRAME( textureBrowser.m_tag_frame ), 0.5, 0.5 ); + gtk_frame_set_shadow_type( GTK_FRAME( textureBrowser.m_tag_frame ), GTK_SHADOW_NONE ); - table.attach(g_TextureBrowser.m_tag_frame, {1, 3, 2, 3}, {GTK_FILL, GTK_SHRINK}); + table.attach(textureBrowser.m_tag_frame, {1, 3, 2, 3}, {GTK_FILL, GTK_SHRINK}); frame_table.show(); - g_TextureBrowser.m_tag_frame.add(frame_table); + textureBrowser.m_tag_frame.add(frame_table); } { // assigned tag list ui::Widget scrolled_win = ui::ScrolledWindow(ui::New); gtk_container_set_border_width( GTK_CONTAINER( scrolled_win ), 0 ); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolled_win ), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS ); - g_TextureBrowser.m_assigned_store = ui::ListStore::from(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); + textureBrowser.m_assigned_store = ui::ListStore::from(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); - auto sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_assigned_store ); + auto sortable = GTK_TREE_SORTABLE( textureBrowser.m_assigned_store ); gtk_tree_sortable_set_sort_column_id( sortable, TAG_COLUMN, GTK_SORT_ASCENDING ); auto renderer = ui::CellRendererText(ui::New); - g_TextureBrowser.m_assigned_tree = ui::TreeView(ui::TreeModel::from(g_TextureBrowser.m_assigned_store._handle)); - g_TextureBrowser.m_assigned_store.unref(); - g_TextureBrowser.m_assigned_tree.connect( "row-activated", (GCallback) TextureBrowser_removeTags, NULL ); - gtk_tree_view_set_headers_visible(g_TextureBrowser.m_assigned_tree, FALSE ); + textureBrowser.m_assigned_tree = ui::TreeView(ui::TreeModel::from(textureBrowser.m_assigned_store._handle)); + textureBrowser.m_assigned_store.unref(); + textureBrowser.m_assigned_tree.connect( "row-activated", (GCallback) TextureBrowser_removeTags, NULL ); + gtk_tree_view_set_headers_visible(textureBrowser.m_assigned_tree, FALSE ); - auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_assigned_tree ); + auto selection = gtk_tree_view_get_selection(textureBrowser.m_assigned_tree ); gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE ); auto column = ui::TreeViewColumn( "", renderer, {{"text", TAG_COLUMN}} ); - gtk_tree_view_append_column(g_TextureBrowser.m_assigned_tree, column ); - g_TextureBrowser.m_assigned_tree.show(); + gtk_tree_view_append_column(textureBrowser.m_assigned_tree, column ); + textureBrowser.m_assigned_tree.show(); scrolled_win.show(); - gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( scrolled_win ), g_TextureBrowser.m_assigned_tree ); + gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( scrolled_win ), textureBrowser.m_assigned_tree ); frame_table.attach(scrolled_win, {0, 1, 1, 3}, {GTK_FILL, GTK_FILL}); } @@@ -2370,26 -2321,26 +2445,26 @@@ gtk_container_set_border_width( GTK_CONTAINER( scrolled_win ), 0 ); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolled_win ), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS ); - g_TextureBrowser.m_available_store = ui::ListStore::from(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); - auto sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_available_store ); + textureBrowser.m_available_store = ui::ListStore::from(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); + auto sortable = GTK_TREE_SORTABLE( textureBrowser.m_available_store ); gtk_tree_sortable_set_sort_column_id( sortable, TAG_COLUMN, GTK_SORT_ASCENDING ); auto renderer = ui::CellRendererText(ui::New); - g_TextureBrowser.m_available_tree = ui::TreeView(ui::TreeModel::from(g_TextureBrowser.m_available_store._handle)); - g_TextureBrowser.m_available_store.unref(); - g_TextureBrowser.m_available_tree.connect( "row-activated", (GCallback) TextureBrowser_assignTags, NULL ); - gtk_tree_view_set_headers_visible(g_TextureBrowser.m_available_tree, FALSE ); + textureBrowser.m_available_tree = ui::TreeView(ui::TreeModel::from(textureBrowser.m_available_store._handle)); + textureBrowser.m_available_store.unref(); + textureBrowser.m_available_tree.connect( "row-activated", (GCallback) TextureBrowser_assignTags, NULL ); + gtk_tree_view_set_headers_visible(textureBrowser.m_available_tree, FALSE ); - auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_available_tree ); + auto selection = gtk_tree_view_get_selection(textureBrowser.m_available_tree ); gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE ); auto column = ui::TreeViewColumn( "", renderer, {{"text", TAG_COLUMN}} ); - gtk_tree_view_append_column(g_TextureBrowser.m_available_tree, column ); - g_TextureBrowser.m_available_tree.show(); + gtk_tree_view_append_column(textureBrowser.m_available_tree, column ); + textureBrowser.m_available_tree.show(); scrolled_win.show(); - gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( scrolled_win ), g_TextureBrowser.m_available_tree ); + gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( scrolled_win ), textureBrowser.m_available_tree ); frame_table.attach(scrolled_win, {2, 3, 1, 3}, {GTK_FILL, GTK_FILL}); } @@@ -2428,81 -2379,23 +2503,81 @@@ } } else { // no tag support, show the texture tree only - vbox.pack_start( g_TextureBrowser.m_scr_win_tree, TRUE, TRUE, 0 ); + vbox.pack_start( textureBrowser.m_scr_win_tree, TRUE, TRUE, 0 ); } // TODO do we need this? //gtk_container_set_focus_chain(GTK_CONTAINER(hbox_table), NULL); + isWindowConstructed = true; + return table; } +void TextureBrowser_destroyGLWidget(){ + TextureBrowser &textureBrowser = GlobalTextureBrowser(); + if ( isGLWidgetConstructed ) + { + g_signal_handler_disconnect( G_OBJECT( textureBrowser.m_gl_widget ), textureBrowser.m_sizeHandler ); + g_signal_handler_disconnect( G_OBJECT( textureBrowser.m_gl_widget ), textureBrowser.m_exposeHandler ); + +#ifdef WORKAROUND_MACOS_GTK2_GLWIDGET + textureBrowser.m_hframe.remove( textureBrowser.m_gl_widget ); +#else // !WORKAROUND_MACOS_GTK2_GLWIDGET + textureBrowser.m_frame.remove( textureBrowser.m_gl_widget ); +#endif // !WORKAROUND_MACOS_GTK2_GLWIDGET + + textureBrowser.m_gl_widget.unref(); + + isGLWidgetConstructed = false; + } +} + void TextureBrowser_destroyWindow(){ GlobalShaderSystem().setActiveShadersChangedNotify( Callback() ); - g_signal_handler_disconnect( G_OBJECT( g_TextureBrowser.m_gl_widget ), g_TextureBrowser.m_sizeHandler ); - g_signal_handler_disconnect( G_OBJECT( g_TextureBrowser.m_gl_widget ), g_TextureBrowser.m_exposeHandler ); + TextureBrowser_destroyGLWidget(); +} + +#ifdef WORKAROUND_MACOS_GTK2_GLWIDGET +/* workaround for gtkglext on gtk 2 issue: OpenGL texture viewport being drawn over the other pages */ +/* this is very ugly: force the resizing of the viewport to a single bottom line by forcing the + * resizing of the gl widget by expanding some empty boxes, so the widget area size is reduced + * while covered by another page, so the texture viewport is still rendered over the other page + * but does not annoy the user that much because it's just a line on the bottom that may even + * be printed over existing bottom frame or very close to it. */ +void TextureBrowser_showGLWidget(){ + TextureBrowser &textureBrowser = GlobalTextureBrowser(); + if ( isWindowConstructed && isGLWidgetConstructed ) + { + textureBrowser.m_vframe.set_child_packing( textureBrowser.m_vfiller, FALSE, FALSE, 0, ui::Packing::START ); + textureBrowser.m_vframe.set_child_packing( textureBrowser.m_hframe, TRUE, TRUE, 0, ui::Packing::START ); + textureBrowser.m_vframe.set_child_packing( textureBrowser.m_hfiller, FALSE, FALSE, 0, ui::Packing::START ); + textureBrowser.m_vframe.set_child_packing( textureBrowser.m_gl_widget, TRUE, TRUE, 0, ui::Packing::START ); + + textureBrowser.m_gl_widget.show(); +} +} + +void TextureBrowser_hideGLWidget(){ + TextureBrowser &textureBrowser = GlobalTextureBrowser(); + if ( isWindowConstructed && isGLWidgetConstructed ) + { + textureBrowser.m_vframe.set_child_packing( textureBrowser.m_vfiller, TRUE, TRUE, 0, ui::Packing::START); + textureBrowser.m_vframe.set_child_packing( textureBrowser.m_hframe, FALSE, FALSE, 0, ui::Packing::END ); + textureBrowser.m_vframe.set_child_packing( textureBrowser.m_hfiller, TRUE, TRUE, 0, ui::Packing::START); + textureBrowser.m_vframe.set_child_packing( textureBrowser.m_gl_widget, FALSE, FALSE, 0, ui::Packing::END ); + + // The hack needs the GL widget to not be hidden to work, + // so resizing it triggers the redraw of it with the new size. + // GlobalTextureBrowser().m_gl_widget.hide(); - g_TextureBrowser.m_gl_widget.unref(); + // Trigger the redraw. + TextureBrowser_redraw( &GlobalTextureBrowser() ); + ui::process(); + } } +#endif // WORKAROUND_MACOS_GTK2_GLWIDGET const Vector3& TextureBrowser_getBackgroundColour( TextureBrowser& textureBrowser ){ return textureBrowser.color_textureback; @@@ -2522,7 -2415,7 +2597,7 @@@ void TextureBrowser_selectionHelper( ui } void TextureBrowser_shaderInfo(){ - const char* name = TextureBrowser_GetSelectedShader( g_TextureBrowser ); + const char* name = TextureBrowser_GetSelectedShader( GlobalTextureBrowser() ); IShader* shader = QERApp_Shader_ForName( name ); DoShaderInfoDlg( name, shader->getShaderFileName(), "Shader Info" ); @@@ -2532,21 -2425,20 +2607,21 @@@ void TextureBrowser_addTag(){ CopiedString tag; + TextureBrowser &textureBrowser = GlobalTextureBrowser(); EMessageBoxReturn result = DoShaderTagDlg( &tag, "Add shader tag" ); if ( result == eIDOK && !tag.empty() ) { GtkTreeIter iter; - g_TextureBrowser.m_all_tags.insert( tag.c_str() ); - gtk_list_store_append( g_TextureBrowser.m_available_store, &iter ); - gtk_list_store_set( g_TextureBrowser.m_available_store, &iter, TAG_COLUMN, tag.c_str(), -1 ); + textureBrowser.m_all_tags.insert( tag.c_str() ); + gtk_list_store_append( textureBrowser.m_available_store, &iter ); + gtk_list_store_set( textureBrowser.m_available_store, &iter, TAG_COLUMN, tag.c_str(), -1 ); // Select the currently added tag in the available list - auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_available_tree ); + auto selection = gtk_tree_view_get_selection(textureBrowser.m_available_tree ); gtk_tree_selection_select_iter( selection, &iter ); - g_TextureBrowser.m_all_tags_list.append(TAG_COLUMN, tag.c_str()); + textureBrowser.m_all_tags_list.append(TAG_COLUMN, tag.c_str()); } } @@@ -2559,9 -2451,8 +2634,9 @@@ void TextureBrowser_renameTag() */ GSList* selected = NULL; + TextureBrowser &textureBrowser = GlobalTextureBrowser(); - auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_treeViewTags ); + auto selection = gtk_tree_view_get_selection(textureBrowser.m_treeViewTags ); gtk_tree_selection_selected_foreach( selection, GtkTreeSelectionForeachFunc( TextureBrowser_selectionHelper ), &selected ); if ( g_slist_length( selected ) == 1 ) { // we only rename a single tag @@@ -2573,42 -2464,41 +2648,42 @@@ gchar* rowTag; gchar* oldTag = (char*)selected->data; - bool row = gtk_tree_model_get_iter_first(g_TextureBrowser.m_all_tags_list, &iterList ) != 0; + bool row = gtk_tree_model_get_iter_first(textureBrowser.m_all_tags_list, &iterList ) != 0; while ( row ) { - gtk_tree_model_get(g_TextureBrowser.m_all_tags_list, &iterList, TAG_COLUMN, &rowTag, -1 ); + gtk_tree_model_get(textureBrowser.m_all_tags_list, &iterList, TAG_COLUMN, &rowTag, -1 ); if ( strcmp( rowTag, oldTag ) == 0 ) { - gtk_list_store_set( g_TextureBrowser.m_all_tags_list, &iterList, TAG_COLUMN, newTag.c_str(), -1 ); + gtk_list_store_set( textureBrowser.m_all_tags_list, &iterList, TAG_COLUMN, newTag.c_str(), -1 ); } - row = gtk_tree_model_iter_next(g_TextureBrowser.m_all_tags_list, &iterList ) != 0; + row = gtk_tree_model_iter_next(textureBrowser.m_all_tags_list, &iterList ) != 0; } TagBuilder.RenameShaderTag( oldTag, newTag.c_str() ); - g_TextureBrowser.m_all_tags.erase( (CopiedString)oldTag ); - g_TextureBrowser.m_all_tags.insert( newTag ); + textureBrowser.m_all_tags.erase( (CopiedString)oldTag ); + textureBrowser.m_all_tags.insert( newTag ); - BuildStoreAssignedTags( g_TextureBrowser.m_assigned_store, g_TextureBrowser.shader.c_str(), &g_TextureBrowser ); - BuildStoreAvailableTags( g_TextureBrowser.m_available_store, g_TextureBrowser.m_assigned_store, g_TextureBrowser.m_all_tags, &g_TextureBrowser ); + BuildStoreAssignedTags( textureBrowser.m_assigned_store, textureBrowser.shader.c_str(), &textureBrowser ); + BuildStoreAvailableTags( textureBrowser.m_available_store, textureBrowser.m_assigned_store, textureBrowser.m_all_tags, &textureBrowser ); } } else { - ui::alert( g_TextureBrowser.m_parent, "Select a single tag for renaming." ); + ui::alert( textureBrowser.m_parent, "Select a single tag for renaming." ); } } void TextureBrowser_deleteTag(){ GSList* selected = NULL; + TextureBrowser &textureBrowser = GlobalTextureBrowser(); - auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_treeViewTags ); + auto selection = gtk_tree_view_get_selection(textureBrowser.m_treeViewTags ); gtk_tree_selection_selected_foreach( selection, GtkTreeSelectionForeachFunc( TextureBrowser_selectionHelper ), &selected ); if ( g_slist_length( selected ) == 1 ) { // we only delete a single tag - auto result = ui::alert( g_TextureBrowser.m_parent, "Are you sure you want to delete the selected tag?", "Delete Tag", ui::alert_type::YESNO, ui::alert_icon::Question ); + auto result = ui::alert( textureBrowser.m_parent, "Are you sure you want to delete the selected tag?", "Delete Tag", ui::alert_type::YESNO, ui::alert_icon::Question ); if ( result == ui::alert_response::YES ) { GtkTreeIter iterSelected; @@@ -2616,41 -2506,39 +2691,41 @@@ gchar* tagSelected = (char*)selected->data; - bool row = gtk_tree_model_get_iter_first(g_TextureBrowser.m_all_tags_list, &iterSelected ) != 0; + bool row = gtk_tree_model_get_iter_first(textureBrowser.m_all_tags_list, &iterSelected ) != 0; while ( row ) { - gtk_tree_model_get(g_TextureBrowser.m_all_tags_list, &iterSelected, TAG_COLUMN, &rowTag, -1 ); + gtk_tree_model_get(textureBrowser.m_all_tags_list, &iterSelected, TAG_COLUMN, &rowTag, -1 ); if ( strcmp( rowTag, tagSelected ) == 0 ) { - gtk_list_store_remove( g_TextureBrowser.m_all_tags_list, &iterSelected ); + gtk_list_store_remove( textureBrowser.m_all_tags_list, &iterSelected ); break; } - row = gtk_tree_model_iter_next(g_TextureBrowser.m_all_tags_list, &iterSelected ) != 0; + row = gtk_tree_model_iter_next(textureBrowser.m_all_tags_list, &iterSelected ) != 0; } TagBuilder.DeleteTag( tagSelected ); - g_TextureBrowser.m_all_tags.erase( (CopiedString)tagSelected ); + textureBrowser.m_all_tags.erase( (CopiedString)tagSelected ); - BuildStoreAssignedTags( g_TextureBrowser.m_assigned_store, g_TextureBrowser.shader.c_str(), &g_TextureBrowser ); - BuildStoreAvailableTags( g_TextureBrowser.m_available_store, g_TextureBrowser.m_assigned_store, g_TextureBrowser.m_all_tags, &g_TextureBrowser ); + BuildStoreAssignedTags( textureBrowser.m_assigned_store, textureBrowser.shader.c_str(), &textureBrowser ); + BuildStoreAvailableTags( textureBrowser.m_available_store, textureBrowser.m_assigned_store, textureBrowser.m_all_tags, &textureBrowser ); } } else { - ui::alert( g_TextureBrowser.m_parent, "Select a single tag for deletion." ); + ui::alert( textureBrowser.m_parent, "Select a single tag for deletion." ); } } void TextureBrowser_copyTag(){ - g_TextureBrowser.m_copied_tags.clear(); - TagBuilder.GetShaderTags( g_TextureBrowser.shader.c_str(), g_TextureBrowser.m_copied_tags ); + TextureBrowser &textureBrowser = GlobalTextureBrowser(); + textureBrowser.m_copied_tags.clear(); + TagBuilder.GetShaderTags( textureBrowser.shader.c_str(), textureBrowser.m_copied_tags ); } void TextureBrowser_pasteTag(){ - IShader* ishader = QERApp_Shader_ForName( g_TextureBrowser.shader.c_str() ); - CopiedString shader = g_TextureBrowser.shader.c_str(); + TextureBrowser &textureBrowser = GlobalTextureBrowser(); + IShader* ishader = QERApp_Shader_ForName( textureBrowser.shader.c_str() ); + CopiedString shader = textureBrowser.shader.c_str(); if ( !TagBuilder.CheckShaderTag( shader.c_str() ) ) { CopiedString shaderFile = ishader->getShaderFileName(); @@@ -2664,18 -2552,18 +2739,18 @@@ TagBuilder.AddShaderNode( shader.c_str(), CUSTOM, SHADER ); } - for ( size_t i = 0; i < g_TextureBrowser.m_copied_tags.size(); ++i ) + for ( size_t i = 0; i < textureBrowser.m_copied_tags.size(); ++i ) { - TagBuilder.AddShaderTag( shader.c_str(), g_TextureBrowser.m_copied_tags[i].c_str(), TAG ); + TagBuilder.AddShaderTag( shader.c_str(), textureBrowser.m_copied_tags[i].c_str(), TAG ); } } else { - for ( size_t i = 0; i < g_TextureBrowser.m_copied_tags.size(); ++i ) + for ( size_t i = 0; i < textureBrowser.m_copied_tags.size(); ++i ) { - if ( !TagBuilder.CheckShaderTag( shader.c_str(), g_TextureBrowser.m_copied_tags[i].c_str() ) ) { + if ( !TagBuilder.CheckShaderTag( shader.c_str(), textureBrowser.m_copied_tags[i].c_str() ) ) { // the tag doesn't exist - let's add it - TagBuilder.AddShaderTag( shader.c_str(), g_TextureBrowser.m_copied_tags[i].c_str(), TAG ); + TagBuilder.AddShaderTag( shader.c_str(), textureBrowser.m_copied_tags[i].c_str(), TAG ); } } } @@@ -2683,15 -2571,15 +2758,16 @@@ ishader->DecRef(); TagBuilder.SaveXmlDoc(); - BuildStoreAssignedTags( g_TextureBrowser.m_assigned_store, shader.c_str(), &g_TextureBrowser ); - BuildStoreAvailableTags( g_TextureBrowser.m_available_store, g_TextureBrowser.m_assigned_store, g_TextureBrowser.m_all_tags, &g_TextureBrowser ); + BuildStoreAssignedTags( textureBrowser.m_assigned_store, shader.c_str(), &textureBrowser ); + BuildStoreAvailableTags( textureBrowser.m_available_store, textureBrowser.m_assigned_store, textureBrowser.m_all_tags, &textureBrowser ); } void TextureBrowser_RefreshShaders(){ + TextureBrowser &textureBrowser = GlobalTextureBrowser(); - ScopeDisableScreenUpdates disableScreenUpdates( "Processing...", "Loading Shaders" ); - GlobalShaderSystem().refresh(); - UpdateAllWindows(); + + /* When shaders are refreshed, forces reloading the textures as well. + Previously it would at best only display shaders, at worst mess up some textured objects. */ + auto selection = gtk_tree_view_get_selection(GlobalTextureBrowser().m_treeViewTree); GtkTreeModel* model = NULL; GtkTreeIter iter; @@@ -2706,43 -2594,71 +2782,72 @@@ if ( !TextureBrowser_showWads() ) { strcat( dirName, "/" ); } + + ScopeDisableScreenUpdates disableScreenUpdates( "Processing...", "Loading Shaders" ); + GlobalShaderSystem().refresh(); + UpdateAllWindows(); + TextureBrowser_ShowDirectory( GlobalTextureBrowser(), dirName ); TextureBrowser_queueDraw( GlobalTextureBrowser() ); } + + else{ + ScopeDisableScreenUpdates disableScreenUpdates( "Processing...", "Loading Shaders" ); + GlobalShaderSystem().refresh(); + UpdateAllWindows(); + } } void TextureBrowser_ToggleShowShaders(){ - g_TextureBrowser.m_showShaders ^= 1; - g_TextureBrowser.m_showshaders_item.update(); + GlobalTextureBrowser().m_showShaders ^= 1; + GlobalTextureBrowser().m_showshaders_item.update(); + - g_TextureBrowser.m_heightChanged = true; - g_TextureBrowser.m_originInvalid = true; ++ GlobalTextureBrowser().m_heightChanged = true; ++ GlobalTextureBrowser().m_originInvalid = true; + g_activeShadersChangedCallbacks(); + - TextureBrowser_queueDraw( g_TextureBrowser ); ++ TextureBrowser_queueDraw( GlobalTextureBrowser() ); + } + + void TextureBrowser_ToggleShowTextures(){ - g_TextureBrowser.m_showTextures ^= 1; - g_TextureBrowser.m_showtextures_item.update(); ++ GlobalTextureBrowser().m_showTextures ^= 1; ++ GlobalTextureBrowser().m_showtextures_item.update(); + - g_TextureBrowser.m_heightChanged = true; - g_TextureBrowser.m_originInvalid = true; ++ GlobalTextureBrowser().m_heightChanged = true; ++ GlobalTextureBrowser().m_originInvalid = true; + g_activeShadersChangedCallbacks(); + - TextureBrowser_queueDraw( g_TextureBrowser ); + TextureBrowser_queueDraw( GlobalTextureBrowser() ); } void TextureBrowser_ToggleShowShaderListOnly(){ g_TextureBrowser_shaderlistOnly ^= 1; - g_TextureBrowser.m_showshaderlistonly_item.update(); + GlobalTextureBrowser().m_showshaderlistonly_item.update(); TextureBrowser_constructTreeStore(); } void TextureBrowser_showAll(){ g_TextureBrowser_currentDirectory = ""; - g_TextureBrowser.m_searchedTags = false; -// TextureBrowser_SetHideUnused( g_TextureBrowser, false ); + GlobalTextureBrowser().m_searchedTags = false; - TextureBrowser_heightChanged( GlobalTextureBrowser() ); ++// TextureBrowser_SetHideUnused( GlobalTextureBrowser(), false ); + TextureBrowser_ToggleHideUnused(); - //TextureBrowser_heightChanged( g_TextureBrowser ); ++ //TextureBrowser_heightChanged( GlobalTextureBrowser() ); TextureBrowser_updateTitle(); } void TextureBrowser_showUntagged(){ - auto result = ui::alert( g_TextureBrowser.m_parent, "WARNING! This function might need a lot of memory and time. Are you sure you want to use it?", "Show Untagged", ui::alert_type::YESNO, ui::alert_icon::Warning ); + TextureBrowser &textureBrowser = GlobalTextureBrowser(); + auto result = ui::alert( textureBrowser.m_parent, "WARNING! This function might need a lot of memory and time. Are you sure you want to use it?", "Show Untagged", ui::alert_type::YESNO, ui::alert_icon::Warning ); if ( result == ui::alert_response::YES ) { - g_TextureBrowser.m_found_shaders.clear(); - TagBuilder.GetUntagged( g_TextureBrowser.m_found_shaders ); + textureBrowser.m_found_shaders.clear(); + TagBuilder.GetUntagged( textureBrowser.m_found_shaders ); std::set::iterator iter; ScopeDisableScreenUpdates disableScreenUpdates( "Searching untagged textures...", "Loading Textures" ); - for ( iter = g_TextureBrowser.m_found_shaders.begin(); iter != g_TextureBrowser.m_found_shaders.end(); iter++ ) + for ( iter = textureBrowser.m_found_shaders.begin(); iter != textureBrowser.m_found_shaders.end(); iter++ ) { std::string path = ( *iter ).c_str(); size_t pos = path.find_last_of( "/", path.size() ); @@@ -2754,7 -2670,7 +2859,7 @@@ g_TextureBrowser_currentDirectory = "Untagged"; TextureBrowser_queueDraw( GlobalTextureBrowser() ); - TextureBrowser_heightChanged( g_TextureBrowser ); + TextureBrowser_heightChanged( textureBrowser ); TextureBrowser_updateTitle(); } } @@@ -2842,7 -2758,7 +2947,7 @@@ struct TextureScale struct UniformTextureSize { static void Export(const TextureBrowser &self, const Callback &returnz) { - returnz(g_TextureBrowser.m_uniformTextureSize); + returnz(GlobalTextureBrowser().m_uniformTextureSize); } static void Import(TextureBrowser &self, int value) { @@@ -2853,7 -2769,7 +2958,7 @@@ struct UniformTextureMinSize { static void Export(const TextureBrowser &self, const Callback &returnz) { - returnz(g_TextureBrowser.m_uniformTextureMinSize); + returnz(GlobalTextureBrowser().m_uniformTextureMinSize); } static void Import(TextureBrowser &self, int value) { @@@ -2879,7 -2795,7 +2984,7 @@@ void TextureBrowser_constructPreference page.appendSpinner( "Thumbnails Min Size", GlobalTextureBrowser().m_uniformTextureMinSize, GlobalTextureBrowser().m_uniformTextureMinSize, 16, 8192 ); page.appendEntry( "Mousewheel Increment", GlobalTextureBrowser().m_mouseWheelScrollIncrement ); { - const char* startup_shaders[] = { "None", TextureBrowser_getComonShadersName() }; + const char* startup_shaders[] = { "None", TextureBrowser_getCommonShadersName() }; page.appendCombo( "Load Shaders at Startup", reinterpret_cast( GlobalTextureBrowser().m_startupShaders ), STRING_ARRAY_RANGE( startup_shaders ) ); } } @@@ -2901,8 -2817,6 +3006,8 @@@ void TextureBrowser_registerPreferences void TextureClipboard_textureSelected( const char* shader ); void TextureBrowser_Construct(){ + TextureBrowser &textureBrowser = GlobalTextureBrowser(); + GlobalCommands_insert( "ShaderInfo", makeCallbackF(TextureBrowser_shaderInfo) ); GlobalCommands_insert( "ShowUntagged", makeCallbackF(TextureBrowser_showUntagged) ); GlobalCommands_insert( "AddTag", makeCallbackF(TextureBrowser_addTag) ); @@@ -2911,32 -2825,35 +3016,35 @@@ GlobalCommands_insert( "CopyTag", makeCallbackF(TextureBrowser_copyTag) ); GlobalCommands_insert( "PasteTag", makeCallbackF(TextureBrowser_pasteTag) ); GlobalCommands_insert( "RefreshShaders", makeCallbackF(VFS_Refresh) ); - GlobalToggles_insert( "ShowInUse", makeCallbackF(TextureBrowser_ToggleHideUnused), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_hideunused_item ), Accelerator( 'U' ) ); + GlobalToggles_insert( "ShowInUse", makeCallbackF(TextureBrowser_ToggleHideUnused), ToggleItem::AddCallbackCaller( textureBrowser.m_hideunused_item ), Accelerator( 'U' ) ); GlobalCommands_insert( "ShowAllTextures", makeCallbackF(TextureBrowser_showAll), Accelerator( 'A', (GdkModifierType)GDK_CONTROL_MASK ) ); GlobalCommands_insert( "ToggleTextures", makeCallbackF(TextureBrowser_toggleShow), Accelerator( 'T' ) ); - GlobalToggles_insert( "ToggleShowShaders", makeCallbackF(TextureBrowser_ToggleShowShaders), ToggleItem::AddCallbackCaller( textureBrowser.m_showshaders_item ) ); - GlobalToggles_insert( "ToggleShowShaderlistOnly", makeCallbackF(TextureBrowser_ToggleShowShaderListOnly), ToggleItem::AddCallbackCaller( textureBrowser.m_showshaderlistonly_item ) ); - GlobalToggles_insert( "FixedSize", makeCallbackF(TextureBrowser_FixedSize), ToggleItem::AddCallbackCaller( textureBrowser.m_fixedsize_item ) ); - GlobalToggles_insert( "FilterMissing", makeCallbackF(TextureBrowser_FilterMissing), ToggleItem::AddCallbackCaller( textureBrowser.m_filternotex_item ) ); - GlobalToggles_insert( "FilterFallback", makeCallbackF(TextureBrowser_FilterFallback), ToggleItem::AddCallbackCaller( textureBrowser.m_hidenotex_item ) ); - GlobalToggles_insert( "EnableAlpha", makeCallbackF(TextureBrowser_EnableAlpha), ToggleItem::AddCallbackCaller( textureBrowser.m_enablealpha_item ) ); - GlobalToggles_insert( "ToggleShowShaders", makeCallbackF(TextureBrowser_ToggleShowShaders), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_showshaders_item ) ); - GlobalToggles_insert( "ToggleShowTextures", makeCallbackF(TextureBrowser_ToggleShowTextures), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_showtextures_item ) ); ++ GlobalToggles_insert( "ToggleShowShaders", makeCallbackF(TextureBrowser_ToggleShowShaders), ToggleItem::AddCallbackCaller( GlobalTextureBrowser().m_showshaders_item ) ); ++ GlobalToggles_insert( "ToggleShowTextures", makeCallbackF(TextureBrowser_ToggleShowTextures), ToggleItem::AddCallbackCaller( GlobalTextureBrowser().m_showtextures_item ) ); + GlobalToggles_insert( "ToggleShowShaderlistOnly", makeCallbackF(TextureBrowser_ToggleShowShaderListOnly), - ToggleItem::AddCallbackCaller( g_TextureBrowser.m_showshaderlistonly_item ) ); - GlobalToggles_insert( "FixedSize", makeCallbackF(TextureBrowser_FixedSize), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_fixedsize_item ) ); - GlobalToggles_insert( "FilterMissing", makeCallbackF(TextureBrowser_FilterMissing), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_filternotex_item ) ); - GlobalToggles_insert( "FilterFallback", makeCallbackF(TextureBrowser_FilterFallback), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_hidenotex_item ) ); - GlobalToggles_insert( "EnableAlpha", makeCallbackF(TextureBrowser_EnableAlpha), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_enablealpha_item ) ); - - GlobalPreferenceSystem().registerPreference( "TextureScale", make_property_string(g_TextureBrowser) ); - GlobalPreferenceSystem().registerPreference( "UniformTextureSize", make_property_string(g_TextureBrowser) ); - GlobalPreferenceSystem().registerPreference( "UniformTextureMinSize", make_property_string(g_TextureBrowser) ); - GlobalPreferenceSystem().registerPreference( "TextureScrollbar", make_property_string(GlobalTextureBrowser())); - GlobalPreferenceSystem().registerPreference( "ShowShaders", make_property_string( GlobalTextureBrowser().m_showShaders ) ); ++ ToggleItem::AddCallbackCaller( GlobalTextureBrowser().m_showshaderlistonly_item ) ); ++ GlobalToggles_insert( "FixedSize", makeCallbackF(TextureBrowser_FixedSize), ToggleItem::AddCallbackCaller( GlobalTextureBrowser().m_fixedsize_item ) ); ++ GlobalToggles_insert( "FilterMissing", makeCallbackF(TextureBrowser_FilterMissing), ToggleItem::AddCallbackCaller( GlobalTextureBrowser().m_filternotex_item ) ); ++ GlobalToggles_insert( "FilterFallback", makeCallbackF(TextureBrowser_FilterFallback), ToggleItem::AddCallbackCaller( GlobalTextureBrowser().m_hidenotex_item ) ); ++ GlobalToggles_insert( "EnableAlpha", makeCallbackF(TextureBrowser_EnableAlpha), ToggleItem::AddCallbackCaller( GlobalTextureBrowser().m_enablealpha_item ) ); + + GlobalPreferenceSystem().registerPreference( "TextureScale", make_property_string(textureBrowser) ); + GlobalPreferenceSystem().registerPreference( "UniformTextureSize", make_property_string(textureBrowser) ); + GlobalPreferenceSystem().registerPreference( "UniformTextureMinSize", make_property_string(textureBrowser) ); + GlobalPreferenceSystem().registerPreference( "TextureScrollbar", make_property_string(textureBrowser)); + GlobalPreferenceSystem().registerPreference( "ShowShaders", make_property_string( textureBrowser.m_showShaders ) ); + GlobalPreferenceSystem().registerPreference( "ShowTextures", make_property_string( GlobalTextureBrowser().m_showTextures ) ); GlobalPreferenceSystem().registerPreference( "ShowShaderlistOnly", make_property_string( g_TextureBrowser_shaderlistOnly ) ); GlobalPreferenceSystem().registerPreference( "FixedSize", make_property_string( g_TextureBrowser_fixedSize ) ); GlobalPreferenceSystem().registerPreference( "FilterMissing", make_property_string( g_TextureBrowser_filterMissing ) ); GlobalPreferenceSystem().registerPreference( "EnableAlpha", make_property_string( g_TextureBrowser_enableAlpha ) ); - GlobalPreferenceSystem().registerPreference( "LoadShaders", make_property_string( reinterpret_cast( GlobalTextureBrowser().m_startupShaders ) ) ); - GlobalPreferenceSystem().registerPreference( "WheelMouseInc", make_property_string( GlobalTextureBrowser().m_mouseWheelScrollIncrement ) ); - GlobalPreferenceSystem().registerPreference( "SI_Colors0", make_property_string( GlobalTextureBrowser().color_textureback ) ); + GlobalPreferenceSystem().registerPreference( "LoadShaders", make_property_string( reinterpret_cast( textureBrowser.m_startupShaders ) ) ); + GlobalPreferenceSystem().registerPreference( "WheelMouseInc", make_property_string( textureBrowser.m_mouseWheelScrollIncrement ) ); + GlobalPreferenceSystem().registerPreference( "SI_Colors0", make_property_string( textureBrowser.color_textureback ) ); - g_TextureBrowser.shader = texdef_name_default(); + textureBrowser.shader = texdef_name_default(); - Textures_setModeChangedNotify( ReferenceCaller( g_TextureBrowser ) ); + Textures_setModeChangedNotify( ReferenceCaller( textureBrowser ) ); TextureBrowser_registerPreferencesPage(); @@@ -2950,9 -2867,3 +3058,9 @@@ void TextureBrowser_Destroy() Textures_setModeChangedNotify( Callback() ); } + +#if WORKAROUND_WINDOWS_GTK2_GLWIDGET +ui::GLArea TextureBrowser_getGLWidget(){ + return GlobalTextureBrowser().m_gl_widget; +} +#endif // WORKAROUND_WINDOWS_GTK2_GLWIDGET diff --combined tools/quake3/common/vfs.c index 3c09ba2a,48a1f86f..345846e6 --- a/tools/quake3/common/vfs.c +++ b/tools/quake3/common/vfs.c @@@ -50,10 -50,10 +50,10 @@@ #include "mathlib.h" #include "inout.h" #include "vfs.h" -#include +#include #include - #define BAD_MINIZ - #ifndef BAD_MINIZ + #define GARUX_DISABLE_BAD_MINIZ + #ifndef GARUX_DISABLE_BAD_MINIZ #include "miniz.h" #endif @@@ -192,7 -192,6 +192,7 @@@ void vfsInitDirectory( const char *pat } if ( g_numDirs == VFS_MAXDIRS ) { + Sys_FPrintf( SYS_WRN, "WARNING: too many VFS directories, can't init %s\n", path ); return; } @@@ -234,7 -233,6 +234,7 @@@ if ( ext != NULL && ( !Q_stricmp( ext, ".pk3dir" ) || !Q_stricmp( ext, ".dpkdir" ) ) ) { if ( g_numDirs == VFS_MAXDIRS ) { + g_free( dirlist ); continue; } snprintf( g_strDirs[g_numDirs], PATH_MAX, "%s/%s", path, name ); @@@ -245,7 -243,6 +245,7 @@@ } if ( ext == NULL || ( Q_stricmp( ext, ".pk3" ) != 0 && Q_stricmp( ext, ".dpk" ) != 0 ) ) { + g_free( dirlist ); continue; } } @@@ -375,56 -372,6 +375,56 @@@ int vfsGetFileCount( const char *filena return count; } +static qboolean isSymlink(const unz_file_info64 *fileInfo) { + // see https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/linux/stat.h + // redefine so it works outside of Unices + const unsigned long Q3MAP_S_IFMT = 00170000; + const unsigned long Q3MAP_S_IFLNK = 0120000; + // see https://trac.edgewall.org/attachment/ticket/8919/ZipDownload.patch + const unsigned long PKZIP_EXTERNAL_ATTR_FILE_TYPE_SHIFT = 16; + + unsigned long attr = fileInfo->external_fa >> PKZIP_EXTERNAL_ATTR_FILE_TYPE_SHIFT; + return (attr & Q3MAP_S_IFMT) == Q3MAP_S_IFLNK; +} + +// The zip format has a maximum filename size of 64K +static const int MAX_FILENAME_BUF = 65537; + +/* The symlink implementation is ported from Dæmon engine implementation by slipher which was a complete rewrite of one illwieckz did on Dæmon by taking inspiration from Darkplaces engine. + +See: + +- https://github.com/DaemonEngine/Daemon/blob/master/src/common/FileSystem.cpp +- https://gitlab.com/xonotic/darkplaces/-/blob/div0-stable/fs.c + +Some words by slipher: + +> Symlinks are a bad feature which you should not use. Therefore, the implementation is as +> slow as possible with a full iteration of the archive performed for each symlink. + +> The symlink path `relative` must be relative to the symlink's location. +> Only supports paths consisting of "../" 0 or more times, followed by non-magical path components. +*/ +void resolveSymlinkPath( const char* base, const char* relative, char* resolved ){ + + base = g_path_get_dirname( base ); + + while( g_str_has_prefix( relative, "../" ) ) + { + if ( base[0] == '\0' ) + { + Sys_FPrintf( SYS_WRN, "Error while reading symbolic link: \"%s\": no such directory\n", base ); + resolved[0] = '\0'; + return; + } + + base = g_path_get_dirname( base ); + relative += 3; + } + + snprintf( resolved, MAX_FILENAME_BUF, "%s/%s", base, relative); +} + // NOTE: when loading a file, you have to allocate one extra byte and set it to \0 int vfsLoadFile( const char *filename, void **bufferptr, int index ){ int i, count = 0; @@@ -465,7 -412,7 +465,7 @@@ } *bufferptr = NULL; - strcpy( fixed, filename ); + strncpy( fixed, filename, sizeof( fixed ) ); vfsFixDOSName( fixed ); lower = g_ascii_strdown( fixed, -1 ); @@@ -509,11 -456,6 +509,11 @@@ } } + // Do not resolve more than 5 recursive symbolic links to + // prevent circular symbolic links. + int max_symlink_depth = 5; + + openSymlinkTarget: for ( lst = g_pakFiles; lst != NULL; lst = g_slist_next( lst ) ) { VFS_PAKFILE* file = (VFS_PAKFILE*)lst->data; @@@ -531,47 -473,13 +531,47 @@@ return -1; } + unz_file_info64 fileInfo; + if ( unzGetCurrentFileInfo64( file->zipfile, &fileInfo, filename, sizeof(filename), NULL, 0, NULL, 0 ) != UNZ_OK ) { + return -1; + } + *bufferptr = safe_malloc( file->size + 1 ); // we need to end the buffer with a 0 ( (char*) ( *bufferptr ) )[file->size] = 0; i = unzReadCurrentFile( file->zipfile, *bufferptr, file->size ); unzCloseCurrentFile( file->zipfile ); + + if ( isSymlink( &fileInfo ) ) { + Sys_FPrintf( SYS_VRB, "Found symbolic link: \"%s\"\n", filename ); + + if ( max_symlink_depth == 0 ) { + Sys_FPrintf( SYS_WRN, "Maximum symbolic link depth reached\n" ); + g_free( lower ); + return -1; + } + + max_symlink_depth--; + + const char* relative = (const char*) *bufferptr; + char resolved[MAX_FILENAME_BUF]; + + resolveSymlinkPath( file->name, relative, resolved ); + + Sys_FPrintf( SYS_VRB, "Resolved symbolic link: \"%s\"\n", resolved ); + + g_free( lower ); + strncpy( fixed, resolved, sizeof( fixed ) ); + vfsFixDOSName( fixed ); + lower = g_ascii_strdown( fixed, -1 ); + + // slow as possible full iteration of the archive + goto openSymlinkTarget; + } + if ( i < 0 ) { + g_free( lower ); return -1; } else{ @@@ -582,14 -490,13 +582,14 @@@ count++; } + g_free( lower ); return -1; } qboolean vfsPackFile( const char *filename, const char *packname, const int compLevel ){ - #ifndef BAD_MINIZ + #ifndef GARUX_DISABLE_BAD_MINIZ int i; char tmp[NAME_MAX], fixed[NAME_MAX]; GSList *lst;