X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Ftexwindow.cpp;h=a1c395cf98641127d2f8ce14fc2648ba9195db9e;hb=e6f85035894ef94c8a3fe873a712d1fdae649cc7;hp=0097d9be95131dbef03d56b599762f829f5d5af1;hpb=1ede3dc63143af40210a3e9c1c601028359fac11;p=xonotic%2Fnetradiant.git diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index 0097d9be..a1c395cf 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -32,6 +32,7 @@ #include "debugging/debugging.h" #include "warnings.h" +#include "defaults.h" #include "ifilesystem.h" #include "iundo.h" #include "igl.h" @@ -86,9 +87,6 @@ #include "shaders.h" #include "commands.h" -#define NOTEX_BASENAME "notex" -#define SHADERNOTEX_BASENAME "shadernotex" - bool TextureBrowser_showWads(){ return !string_empty( g_pGameDescription->getKeyValue( "show_wads" ) ); } @@ -103,14 +101,10 @@ typedef std::set TextureGroups; 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 } } + typedef ReferenceCaller TextureGroupsAddWadCaller; namespace @@ -124,7 +118,9 @@ bool g_TextureBrowser_enableAlpha = true; CopiedString g_notex; CopiedString g_shadernotex; + bool isMissing(const char* name); + bool isNotex(const char* name); bool isMissing(const char* name){ @@ -138,10 +134,10 @@ bool isMissing(const char* name){ } bool isNotex(const char* name){ - if ( string_equal_suffix( name, "/" NOTEX_BASENAME ) ) { + if ( string_equal_suffix( name, "/" DEFAULT_NOTEX_BASENAME ) ) { return true; } - if ( string_equal_suffix( name, "/" SHADERNOTEX_BASENAME ) ) { + if ( string_equal_suffix( name, "/" DEFAULT_SHADERNOTEX_BASENAME ) ) { return true; } return false; @@ -155,9 +151,6 @@ void TextureGroups_addShader( TextureGroups& groups, const char* shaderName ){ if ( isNotex( shaderName ) ) { return; } - if ( isNotex( texture ) ) { - return; - } } if ( texture != shaderName ) { @@ -167,6 +160,7 @@ void TextureGroups_addShader( TextureGroups& groups, const char* shaderName ){ } } } + typedef ReferenceCaller TextureGroupsAddShaderCaller; void TextureGroups_addDirectory( TextureGroups& groups, const char* directory ){ @@ -178,7 +172,9 @@ class DeferredAdjustment { gdouble m_value; guint m_handler; + typedef void ( *ValueChangedFunction )( void* data, gdouble value ); + ValueChangedFunction m_function; void* m_data; @@ -191,28 +187,31 @@ static gboolean deferred_value_changed( gpointer data ){ reinterpret_cast( data )->m_value = 0; return FALSE; } + public: DeferredAdjustment( ValueChangedFunction function, void* data ) : m_value( 0 ), m_handler( 0 ), m_function( function ), m_data( data ){ } + void flush(){ if ( m_handler != 0 ) { g_source_remove( m_handler ); deferred_value_changed( this ); } } + void value_changed( gdouble value ){ m_value = value; if ( m_handler == 0 ) { m_handler = g_idle_add( deferred_value_changed, this ); } } -static void adjustment_value_changed( GtkAdjustment *adjustment, DeferredAdjustment* self ){ + +static void adjustment_value_changed(ui::Adjustment adjustment, DeferredAdjustment* self ){ self->value_changed( gtk_adjustment_get_value(adjustment) ); } }; - class TextureBrowser; typedef ReferenceCaller TextureBrowserQueueDrawCaller; @@ -226,26 +225,33 @@ enum StartupShaders STARTUPSHADERS_COMMON, }; -void TextureBrowser_hideUnusedExport( const BoolImportCallback& importer ); -typedef FreeCaller TextureBrowserHideUnusedExport; +void TextureBrowser_hideUnusedExport( const Callback & importer ); + +typedef FreeCaller &), TextureBrowser_hideUnusedExport> TextureBrowserHideUnusedExport; + +void TextureBrowser_showShadersExport( const Callback & importer ); + +typedef FreeCaller &), TextureBrowser_showShadersExport> TextureBrowserShowShadersExport; + +void TextureBrowser_showShaderlistOnly( const Callback & importer ); + +typedef FreeCaller &), TextureBrowser_showShaderlistOnly> TextureBrowserShowShaderlistOnlyExport; -void TextureBrowser_showShadersExport( const BoolImportCallback& importer ); -typedef FreeCaller TextureBrowserShowShadersExport; +void TextureBrowser_fixedSize( const Callback & importer ); -void TextureBrowser_showShaderlistOnly( const BoolImportCallback& importer ); -typedef FreeCaller TextureBrowserShowShaderlistOnlyExport; +typedef FreeCaller &), TextureBrowser_fixedSize> TextureBrowserFixedSizeExport; -void TextureBrowser_fixedSize( const BoolImportCallback& importer ); -typedef FreeCaller TextureBrowserFixedSizeExport; +void TextureBrowser_filterMissing( const Callback & importer ); -void TextureBrowser_filterMissing( const BoolImportCallback& importer ); -typedef FreeCaller TextureBrowserFilterMissingExport; +typedef FreeCaller &), TextureBrowser_filterMissing> TextureBrowserFilterMissingExport; -void TextureBrowser_filterFallback( const BoolImportCallback& importer ); -typedef FreeCaller TextureBrowserFilterFallbackExport; +void TextureBrowser_filterFallback( const Callback & importer ); -void TextureBrowser_enableAlpha( const BoolImportCallback& importer ); -typedef FreeCaller TextureBrowserEnableAlphaExport; +typedef FreeCaller &), TextureBrowser_filterFallback> TextureBrowserFilterFallbackExport; + +void TextureBrowser_enableAlpha( const Callback & importer ); + +typedef FreeCaller &), TextureBrowser_enableAlpha> TextureBrowserEnableAlphaExport; class TextureBrowser { @@ -257,9 +263,17 @@ 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::null}; +ui::TreeView m_treeViewTree{ui::New}; ui::TreeView m_treeViewTags{ui::null}; ui::Frame m_tag_frame{ui::null}; ui::ListStore m_assigned_store{ui::null}; @@ -310,6 +324,7 @@ bool m_searchedTags; bool m_tags; // The uniform size (in pixels) that textures are resized to when m_resizeTextures is true. int m_uniformTextureSize; + // Return the display width of a texture in the texture browser int getTextureWidth( qtexture_t* tex ){ int width; @@ -328,6 +343,7 @@ int getTextureWidth( qtexture_t* tex ){ } return width; } + // Return the display height of a texture in the texture browser int getTextureHeight( qtexture_t* tex ){ int height; @@ -347,7 +363,7 @@ int getTextureHeight( qtexture_t* tex ){ } TextureBrowser() : - m_texture_scroll( 0 ), + m_texture_scroll( ui::null ), m_hideunused_item( TextureBrowserHideUnusedExport() ), m_hidenotex_item( TextureBrowserFilterFallbackExport() ), m_showshaders_item( TextureBrowserShowShadersExport() ), @@ -378,7 +394,7 @@ void ( *TextureBrowser_textureSelected )( const char* shader ); 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; @@ -386,7 +402,7 @@ const char* TextureBrowser_getComonShadersName(){ 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; @@ -519,9 +535,6 @@ bool Texture_IsShown( IShader* shader, bool show_shaders, bool hideUnused ){ if ( isNotex( shader->getName() ) ) { return false; } - if ( isNotex( shader->getTexture()->name ) ) { - return false; - } } if ( g_TextureBrowser_currentDirectory == "Untagged" ) { @@ -558,7 +571,15 @@ bool Texture_IsShown( IShader* shader, bool show_shaders, bool hideUnused ){ } } 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; } } @@ -648,8 +669,10 @@ void realise(){ m_realiseCallbacks(); TextureBrowser_constructTreeStore(); } + void unrealise(){ } + void insert( const SignalHandler& handler ){ m_realiseCallbacks.connectLast( handler ); } @@ -671,14 +694,19 @@ void TextureBrowser_activeShadersChanged( TextureBrowser& textureBrowser ){ g_activeShadersChangedCallbacks(); } -void TextureBrowser_importShowScrollbar( TextureBrowser& textureBrowser, bool value ){ - textureBrowser.m_showTextureScrollbar = value; - if ( textureBrowser.m_texture_scroll != 0 ) { - textureBrowser.m_texture_scroll.visible(textureBrowser.m_showTextureScrollbar); - TextureBrowser_updateScroll( textureBrowser ); +struct TextureBrowser_ShowScrollbar { + static void Export(const TextureBrowser &self, const Callback &returnz) { + returnz(self.m_showTextureScrollbar); } -} -typedef ReferenceCaller TextureBrowserImportShowScrollbarCaller; + + static void Import(TextureBrowser &self, bool value) { + self.m_showTextureScrollbar = value; + if (self.m_texture_scroll) { + self.m_texture_scroll.visible(self.m_showTextureScrollbar); + TextureBrowser_updateScroll(self); + } + } +}; /* @@ -716,14 +744,27 @@ bool texture_name_ignore( const char* name ){ endswith( strTemp.c_str(), ".diffuse" ) || endswith( strTemp.c_str(), ".blend" ) || endswith( strTemp.c_str(), ".alpha" ) || - endswith( strTemp.c_str(), "_norm" ) || + endswith( strTemp.c_str(), "_alpha" ) || + /* Quetoo */ + endswith( strTemp.c_str(), "_h" ) || + endswith( strTemp.c_str(), "_local" ) || + endswith( strTemp.c_str(), "_nm" ) || + endswith( strTemp.c_str(), "_s" ) || + /* DarkPlaces */ endswith( strTemp.c_str(), "_bump" ) || endswith( strTemp.c_str(), "_glow" ) || endswith( strTemp.c_str(), "_gloss" ) || + endswith( strTemp.c_str(), "_luma" ) || + endswith( strTemp.c_str(), "_norm" ) || endswith( strTemp.c_str(), "_pants" ) || endswith( strTemp.c_str(), "_shirt" ) || endswith( strTemp.c_str(), "_reflect" ) || - endswith( strTemp.c_str(), "_alpha" ) || + /* Unvanquished */ + endswith( strTemp.c_str(), "_d" ) || + endswith( strTemp.c_str(), "_n" ) || + endswith( strTemp.c_str(), "_p" ) || + endswith( strTemp.c_str(), "_g" ) || + endswith( strTemp.c_str(), "_a" ) || 0; } @@ -733,6 +774,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() ); } }; @@ -750,7 +792,6 @@ void TextureBrowser_updateTitle(){ } - class TextureCategoryLoadShader { const char* m_directory; @@ -762,6 +803,7 @@ TextureCategoryLoadShader( const char* directory, std::size_t& count ) : m_directory( directory ), m_count( count ){ m_count = 0; } + void operator()( const char* name ) const { if ( shader_equal_prefix( name, "textures/" ) && shader_equal_prefix( name + string_length( "textures/" ), m_directory ) ) { @@ -775,6 +817,14 @@ void operator()( const char* name ) const { }; 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 ) ); @@ -791,6 +841,7 @@ void TextureDirectory_loadTexture( const char* directory, const char* texture ){ IShader* shader = QERApp_Shader_ForName( name.c_str() ); shader->DecRef(); } + typedef ConstPointerCaller TextureDirectoryLoadTextureCaller; class LoadTexturesByTypeVisitor : public ImageModules::Visitor @@ -800,6 +851,7 @@ public: LoadTexturesByTypeVisitor( const char* dirstring ) : m_dirstring( dirstring ){ } + void visit( const char* minor, const _QERPlugImageTable& table ) const { GlobalFileSystem().forEachFile( m_dirstring, minor, TextureDirectoryLoadTextureCaller( m_dirstring ) ); } @@ -807,10 +859,22 @@ void visit( const char* minor, const _QERPlugImageTable& table ) const { 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 ); - LoadShaderVisitor visitor; - archive->forEachFile( Archive::VisitorFunc( visitor, Archive::eFiles, 0 ), "textures/" ); + 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 { @@ -827,7 +891,19 @@ void TextureBrowser_ShowDirectory( TextureBrowser& textureBrowser, const char* d 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 ); + } } } @@ -854,6 +930,15 @@ void TextureBrowser_ShowTagSearchResult( TextureBrowser& textureBrowser, const c 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 @@ -863,40 +948,47 @@ void TextureBrowser_ShowTagSearchResult( TextureBrowser& textureBrowser, const c bool TextureBrowser_hideUnused(); -void TextureBrowser_hideUnusedExport( const BoolImportCallback& importer ){ +void TextureBrowser_hideUnusedExport( const Callback & importer ){ importer( TextureBrowser_hideUnused() ); } -typedef FreeCaller TextureBrowserHideUnusedExport; -void TextureBrowser_showShadersExport( const BoolImportCallback& importer ){ +typedef FreeCaller &), TextureBrowser_hideUnusedExport> TextureBrowserHideUnusedExport; + +void TextureBrowser_showShadersExport( const Callback & importer ){ importer( GlobalTextureBrowser().m_showShaders ); } -typedef FreeCaller TextureBrowserShowShadersExport; -void TextureBrowser_showShaderlistOnly( const BoolImportCallback& importer ){ +typedef FreeCaller &), TextureBrowser_showShadersExport> TextureBrowserShowShadersExport; + +void TextureBrowser_showShaderlistOnly( const Callback & importer ){ importer( g_TextureBrowser_shaderlistOnly ); } -typedef FreeCaller TextureBrowserShowShaderlistOnlyExport; -void TextureBrowser_fixedSize( const BoolImportCallback& importer ){ +typedef FreeCaller &), TextureBrowser_showShaderlistOnly> TextureBrowserShowShaderlistOnlyExport; + +void TextureBrowser_fixedSize( const Callback & importer ){ importer( g_TextureBrowser_fixedSize ); } -typedef FreeCaller TextureBrowser_FixedSizeExport; -void TextureBrowser_filterMissing( const BoolImportCallback& importer ){ +typedef FreeCaller &), TextureBrowser_fixedSize> TextureBrowser_FixedSizeExport; + +void TextureBrowser_filterMissing( const Callback & importer ){ importer( g_TextureBrowser_filterMissing ); } -typedef FreeCaller TextureBrowser_filterMissingExport; -void TextureBrowser_filterFallback( const BoolImportCallback& importer ){ +typedef FreeCaller &), TextureBrowser_filterMissing> TextureBrowser_filterMissingExport; + +void TextureBrowser_filterFallback( const Callback & importer ){ importer( g_TextureBrowser_filterFallback ); } -typedef FreeCaller TextureBrowser_filterFallbackExport; -void TextureBrowser_enableAlpha( const BoolImportCallback& importer ){ +typedef FreeCaller &), TextureBrowser_filterFallback> TextureBrowser_filterFallbackExport; + +void TextureBrowser_enableAlpha( const Callback & importer ){ importer( g_TextureBrowser_enableAlpha ); } -typedef FreeCaller TextureBrowser_enableAlphaExport; + +typedef FreeCaller &), TextureBrowser_enableAlpha> TextureBrowser_enableAlphaExport; void TextureBrowser_SetHideUnused( TextureBrowser& textureBrowser, bool hideUnused ){ if ( hideUnused ) { @@ -915,7 +1007,7 @@ void TextureBrowser_SetHideUnused( TextureBrowser& textureBrowser, bool hideUnus void TextureBrowser_ShowStartupShaders( TextureBrowser& textureBrowser ){ if ( textureBrowser.m_startupShaders == STARTUPSHADERS_COMMON ) { - TextureBrowser_ShowDirectory( textureBrowser, TextureBrowser_getComonShadersDir() ); + TextureBrowser_ShowDirectory( textureBrowser, TextureBrowser_getCommonShadersDir() ); } } @@ -1051,11 +1143,11 @@ void TextureBrowser_trackingDelta( int x, int y, unsigned int state, void* data } 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 ){ @@ -1085,6 +1177,7 @@ void Texture_Draw( TextureBrowser& textureBrowser ){ textureBrowser.color_textureback[1], textureBrowser.color_textureback[2], 0 ); + glViewport( 0, 0, textureBrowser.width, textureBrowser.height ); glMatrixMode( GL_PROJECTION ); glLoadIdentity(); @@ -1197,6 +1290,7 @@ void Texture_Draw( TextureBrowser& textureBrowser ){ 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; @@ -1210,6 +1304,7 @@ void Texture_Draw( TextureBrowser& textureBrowser ){ glVertex2i(x + left, y - nHeight - font_height + bottom); glVertex2i(x + right, y - nHeight - font_height + bottom); } + } glEnd(); glEnable( GL_TEXTURE_2D ); } @@ -1356,7 +1451,7 @@ void BuildStoreAvailableTags( ui::ListStore storeAvailable, 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 ) ); @@ -1377,7 +1472,7 @@ gboolean TextureBrowser_button_press( ui::Widget widget, GdkEventButton* event, 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(); } @@ -1389,7 +1484,7 @@ gboolean TextureBrowser_button_press( ui::Widget widget, GdkEventButton* event, 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 ); } } @@ -1416,7 +1511,7 @@ void TextureBrowser_scrollChanged( void* data, gdouble value ){ TextureBrowser_setOriginY( *reinterpret_cast( data ), -(int)value ); } -static void TextureBrowser_verticalScroll( GtkAdjustment *adjustment, TextureBrowser* textureBrowser ){ +static void TextureBrowser_verticalScroll(ui::Adjustment adjustment, TextureBrowser* textureBrowser ){ textureBrowser->m_scrollAdjustment.value_changed( gtk_adjustment_get_value(adjustment) ); } @@ -1448,7 +1543,7 @@ gboolean TextureBrowser_size_allocate( ui::Widget widget, GtkAllocation* allocat 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 ); @@ -1456,30 +1551,44 @@ gboolean TextureBrowser_expose( ui::Widget widget, GdkEventExpose* event, Textur 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 ){ // put the information from the old textures menu into a treeview GtkTreeIter iter, child; @@ -1487,23 +1596,27 @@ void TextureGroups_constructTreeModel( TextureGroups groups, ui::TreeStore store 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; } } @@ -1537,25 +1650,26 @@ TextureGroups TextureGroups_constructTreeView(){ void TextureBrowser_constructTreeStore(){ TextureGroups groups = TextureGroups_constructTreeView(); - auto store = ui::TreeStore(gtk_tree_store_new( 1, G_TYPE_STRING )); + 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; - auto store = ui::TreeStore(gtk_tree_store_new( 1, G_TYPE_STRING )); - auto model = g_TextureBrowser.m_all_tags_list; + TextureBrowser &textureBrowser = GlobalTextureBrowser(); + auto store = ui::TreeStore::from(gtk_tree_store_new( 1, G_TYPE_STRING )); + 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 ) ); } -void TreeView_onRowActivated( ui::TreeView treeview, GtkTreePath* path, ui::TreeViewColumn col, gpointer userdata ){ +void TreeView_onRowActivated( ui::TreeView treeview, ui::TreePath path, ui::TreeViewColumn col, gpointer userdata ){ GtkTreeIter iter; auto model = gtk_tree_view_get_model(treeview ); @@ -1568,7 +1682,7 @@ void TreeView_onRowActivated( ui::TreeView treeview, GtkTreePath* path, ui::Tree strcpy( dirName, buffer ); g_free( buffer ); - g_TextureBrowser.m_searchedTags = false; + GlobalTextureBrowser().m_searchedTags = false; if ( !TextureBrowser_showWads() ) { strcat( dirName, "/" ); @@ -1581,20 +1695,22 @@ void TreeView_onRowActivated( ui::TreeView treeview, GtkTreePath* path, ui::Tree } void TextureBrowser_createTreeViewTree(){ - g_TextureBrowser.m_treeViewTree = ui::TreeView(ui::New); - 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(); } void TextureBrowser_addTag(); + void TextureBrowser_renameTag(); + void TextureBrowser_deleteTag(); void TextureBrowser_createContextMenu( ui::Widget treeview, GdkEventButton *event ){ @@ -1637,20 +1753,22 @@ gboolean TreeViewTags_onButtonPressed( ui::TreeView treeview, GdkEventButton *ev } 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 ) { @@ -1670,8 +1788,8 @@ ui::MenuItem TextureBrowser_constructViewMenu( ui::Menu 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 { @@ -1681,7 +1799,7 @@ ui::MenuItem TextureBrowser_constructViewMenu( ui::Menu 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" ); } @@ -1691,8 +1809,8 @@ ui::MenuItem TextureBrowser_constructViewMenu( ui::Menu menu ){ 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 ); } @@ -1742,8 +1860,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 ); @@ -1755,27 +1874,27 @@ void TextureBrowser_assignTags(){ 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); } } } @@ -1792,8 +1911,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 ); @@ -1805,10 +1925,10 @@ void TextureBrowser_removeTags(){ 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 ); } } } @@ -1816,7 +1936,7 @@ void TextureBrowser_removeTags(){ 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(); @@ -1825,13 +1945,14 @@ void TextureBrowser_removeTags(){ } 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()); } } @@ -1841,8 +1962,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 ); @@ -1857,8 +1979,8 @@ void TextureBrowser_searchTags(){ 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 ); @@ -1874,18 +1996,18 @@ void TextureBrowser_searchTags(){ 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() ); @@ -1894,62 +2016,66 @@ void TextureBrowser_searchTags(){ 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(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(){ - ui::Widget image = ui::Widget(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); + auto image = ui::Widget::from(gtk_image_new_from_stock( GTK_STOCK_FIND, GTK_ICON_SIZE_SMALL_TOOLBAR )); + 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"; } } @@ -1962,9 +2088,9 @@ void TextureBrowser_checkTagFile(){ 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"; } } @@ -1976,13 +2102,45 @@ void TextureBrowser_checkTagFile(){ } void TextureBrowser_SetNotex(){ - StringOutputStream name( 256 ); - name << GlobalRadiant().getAppPath() << "bitmaps/" NOTEX_BASENAME ".png"; - g_notex = name.c_str(); + IShader* notex = QERApp_Shader_ForName( DEFAULT_NOTEX_NAME ); + 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; - name = StringOutputStream(256); - name << GlobalRadiant().getAppPath() << "bitmaps/" SHADERNOTEX_BASENAME " .png"; - g_shadernotex = name.c_str(); +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 ){ @@ -1990,13 +2148,14 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ // 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); @@ -2006,7 +2165,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ ui::Widget menu_bar{ui::null}; { // menu bar - menu_bar = ui::Widget(gtk_menu_bar_new()); + menu_bar = ui::Widget::from(gtk_menu_bar_new()); auto menu_view = ui::Menu(ui::New); auto view_item = TextureBrowser_constructViewMenu( menu_view ); gtk_menu_item_set_submenu( GTK_MENU_ITEM( view_item ), menu_view ); @@ -2021,57 +2180,65 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ 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 - ui::Widget w = ui::Widget(gtk_vscrollbar_new( ui::Adjustment( 0,0,0,1,1,0 ) )); + 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(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}); - 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_vfiller = ui::VBox( FALSE, 0 ); + textureBrowser.m_vframe.pack_start( textureBrowser.m_vfiller, FALSE, FALSE, 0 ); - table.attach(g_TextureBrowser.m_gl_widget, {1, 2, 1, 2}); - g_TextureBrowser.m_gl_widget.show(); + textureBrowser.m_hframe = ui::HBox( FALSE, 0 ); + textureBrowser.m_vframe.pack_start( textureBrowser.m_hframe, TRUE, TRUE, 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_hfiller = ui::HBox( FALSE, 0 ); + textureBrowser.m_hframe.pack_start( textureBrowser.m_hfiller, FALSE, FALSE, 0 ); - 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.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 + + TextureBrowser_constructGLWidget(); } // tag stuff - if ( g_TextureBrowser.m_tags ) { + if ( textureBrowser.m_tags ) { { // fill tag GtkListStore - g_TextureBrowser.m_all_tags_list = ui::ListStore(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 @@ -2081,67 +2248,67 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ 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(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(g_TextureBrowser.m_assigned_store )); - 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}); } @@ -2150,34 +2317,34 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ 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(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(g_TextureBrowser.m_available_store )); - 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}); } { // tag arrow buttons auto m_btn_left = ui::Button(ui::New); auto m_btn_right = ui::Button(ui::New); - auto m_arrow_left = ui::Widget(gtk_arrow_new( GTK_ARROW_LEFT, GTK_SHADOW_OUT )); - auto m_arrow_right = ui::Widget(gtk_arrow_new( GTK_ARROW_RIGHT, GTK_SHADOW_OUT )); + auto m_arrow_left = ui::Widget::from(gtk_arrow_new( GTK_ARROW_LEFT, GTK_SHADOW_OUT )); + auto m_arrow_right = ui::Widget::from(gtk_arrow_new( GTK_ARROW_RIGHT, GTK_SHADOW_OUT )); m_btn_left.add(m_arrow_left); m_btn_right.add(m_arrow_right); @@ -2208,24 +2375,82 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ } } 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 ); - g_TextureBrowser.m_gl_widget.unref(); + 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(); + + // Trigger the redraw. + TextureBrowser_redraw( &GlobalTextureBrowser() ); + ui::process(); + } +} +#endif // WORKAROUND_MACOS_GTK2_GLWIDGET + const Vector3& TextureBrowser_getBackgroundColour( TextureBrowser& textureBrowser ){ return textureBrowser.color_textureback; } @@ -2244,7 +2469,7 @@ void TextureBrowser_selectionHelper( ui::TreeModel model, ui::TreePath path, Gtk } 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" ); @@ -2254,20 +2479,21 @@ void TextureBrowser_shaderInfo(){ 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()); } } @@ -2280,8 +2506,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 @@ -2293,41 +2520,42 @@ void TextureBrowser_renameTag(){ 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 { - g_TextureBrowser.m_parent.alert( "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 = g_TextureBrowser.m_parent.alert( "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; @@ -2335,39 +2563,41 @@ void TextureBrowser_deleteTag(){ 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 { - g_TextureBrowser.m_parent.alert( "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(); @@ -2381,18 +2611,18 @@ void TextureBrowser_pasteTag(){ 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 ); } } } @@ -2400,11 +2630,12 @@ void TextureBrowser_pasteTag(){ 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(); @@ -2428,36 +2659,37 @@ void TextureBrowser_RefreshShaders(){ } void TextureBrowser_ToggleShowShaders(){ - g_TextureBrowser.m_showShaders ^= 1; - g_TextureBrowser.m_showshaders_item.update(); - TextureBrowser_queueDraw( g_TextureBrowser ); + GlobalTextureBrowser().m_showShaders ^= 1; + GlobalTextureBrowser().m_showshaders_item.update(); + 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_heightChanged( g_TextureBrowser ); + GlobalTextureBrowser().m_searchedTags = false; + TextureBrowser_heightChanged( GlobalTextureBrowser() ); TextureBrowser_updateTitle(); } void TextureBrowser_showUntagged(){ - auto result = g_TextureBrowser.m_parent.alert( "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() ); @@ -2469,7 +2701,7 @@ void TextureBrowser_showUntagged(){ g_TextureBrowser_currentDirectory = "Untagged"; TextureBrowser_queueDraw( GlobalTextureBrowser() ); - TextureBrowser_heightChanged( g_TextureBrowser ); + TextureBrowser_heightChanged( textureBrowser ); TextureBrowser_updateTitle(); } } @@ -2500,7 +2732,7 @@ void TextureBrowser_EnableAlpha(){ TextureBrowser_activeShadersChanged( GlobalTextureBrowser() ); } -void TextureBrowser_exportTitle( const StringImportCallback& importer ){ +void TextureBrowser_exportTitle( const Callback & importer ){ StringOutputStream buffer( 64 ); buffer << "Textures: "; if ( !string_empty( g_TextureBrowser_currentDirectory.c_str() ) ) { @@ -2513,72 +2745,70 @@ void TextureBrowser_exportTitle( const StringImportCallback& importer ){ importer( buffer.c_str() ); } - -void TextureScaleImport( TextureBrowser& textureBrowser, int value ){ - switch ( value ) - { - case 0: - TextureBrowser_setScale( textureBrowser, 10 ); - break; - case 1: - TextureBrowser_setScale( textureBrowser, 25 ); - break; - case 2: - TextureBrowser_setScale( textureBrowser, 50 ); - break; - case 3: - TextureBrowser_setScale( textureBrowser, 100 ); - break; - case 4: - TextureBrowser_setScale( textureBrowser, 200 ); - break; - } -} -typedef ReferenceCaller TextureScaleImportCaller; - -void TextureScaleExport( TextureBrowser& textureBrowser, const IntImportCallback& importer ){ - switch ( textureBrowser.m_textureScale ) - { - case 10: - importer( 0 ); - break; - case 25: - importer( 1 ); - break; - case 50: - importer( 2 ); - break; - case 100: - importer( 3 ); - break; - case 200: - importer( 4 ); - break; +struct TextureScale { + static void Export(const TextureBrowser &self, const Callback &returnz) { + switch (self.m_textureScale) { + case 10: + returnz(0); + break; + case 25: + returnz(1); + break; + case 50: + returnz(2); + break; + case 100: + returnz(3); + break; + case 200: + returnz(4); + break; + } } -} -typedef ReferenceCaller TextureScaleExportCaller; + static void Import(TextureBrowser &self, int value) { + switch (value) { + case 0: + TextureBrowser_setScale(self, 10); + break; + case 1: + TextureBrowser_setScale(self, 25); + break; + case 2: + TextureBrowser_setScale(self, 50); + break; + case 3: + TextureBrowser_setScale(self, 100); + break; + case 4: + TextureBrowser_setScale(self, 200); + break; + } + } +}; -void UniformTextureSizeImport( TextureBrowser& textureBrowser, int value ){ +struct UniformTextureSize { + static void Export(const TextureBrowser &self, const Callback &returnz) { + returnz(GlobalTextureBrowser().m_uniformTextureSize); + } - if ( value > 16 ) - TextureBrowser_setUniformSize( textureBrowser, value ); -} -typedef ReferenceCaller UniformTextureSizeImportCaller; + static void Import(TextureBrowser &self, int value) { + if (value > 16) + TextureBrowser_setUniformSize(self, value); + } +}; void TextureBrowser_constructPreferences( PreferencesPage& page ){ page.appendCheckBox( "", "Texture scrollbar", - TextureBrowserImportShowScrollbarCaller( GlobalTextureBrowser() ), - BoolExportCaller( GlobalTextureBrowser().m_showTextureScrollbar ) + make_property(GlobalTextureBrowser()) ); { const char* texture_scale[] = { "10%", "25%", "50%", "100%", "200%" }; page.appendCombo( "Texture Thumbnail Scale", STRING_ARRAY_RANGE( texture_scale ), - IntImportCallback( TextureScaleImportCaller( GlobalTextureBrowser() ) ), - IntExportCallback( TextureScaleExportCaller( GlobalTextureBrowser() ) ) + make_property(GlobalTextureBrowser()) ); } page.appendSpinner( @@ -2589,7 +2819,7 @@ void TextureBrowser_constructPreferences( PreferencesPage& page ){ ); 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 ) ); } } @@ -2597,6 +2827,7 @@ void TextureBrowser_constructPage( PreferenceGroup& group ){ PreferencesPage page( group.createPage( "Texture Browser", "Texture Browser Preferences" ) ); TextureBrowser_constructPreferences( page ); } + void TextureBrowser_registerPreferencesPage(){ PreferencesDialog_addSettingsPage( makeCallbackF(TextureBrowser_constructPage) ); } @@ -2605,13 +2836,12 @@ void TextureBrowser_registerPreferencesPage(){ #include "preferencesystem.h" #include "stringio.h" -typedef ReferenceCaller TextureBrowserSetScaleCaller; - - 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) ); @@ -2620,39 +2850,31 @@ void TextureBrowser_Construct(){ 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( g_TextureBrowser.m_showshaders_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", - makeSizeStringImportCallback( TextureBrowserSetScaleCaller( g_TextureBrowser ) ), - SizeExportStringCaller( g_TextureBrowser.m_textureScale ) - ); - GlobalPreferenceSystem().registerPreference( "UniformTextureSize", - makeIntStringImportCallback(UniformTextureSizeImportCaller(g_TextureBrowser)), - IntExportStringCaller(g_TextureBrowser.m_uniformTextureSize) ); - GlobalPreferenceSystem().registerPreference( "TextureScrollbar", - makeBoolStringImportCallback( TextureBrowserImportShowScrollbarCaller( g_TextureBrowser ) ), - BoolExportStringCaller( GlobalTextureBrowser().m_showTextureScrollbar ) - ); - GlobalPreferenceSystem().registerPreference( "ShowShaders", BoolImportStringCaller( GlobalTextureBrowser().m_showShaders ), BoolExportStringCaller( GlobalTextureBrowser().m_showShaders ) ); - GlobalPreferenceSystem().registerPreference( "ShowShaderlistOnly", BoolImportStringCaller( g_TextureBrowser_shaderlistOnly ), BoolExportStringCaller( g_TextureBrowser_shaderlistOnly ) ); - GlobalPreferenceSystem().registerPreference( "FixedSize", BoolImportStringCaller( g_TextureBrowser_fixedSize ), BoolExportStringCaller( g_TextureBrowser_fixedSize ) ); - GlobalPreferenceSystem().registerPreference( "FilterMissing", BoolImportStringCaller( g_TextureBrowser_filterMissing ), BoolExportStringCaller( g_TextureBrowser_filterMissing ) ); - GlobalPreferenceSystem().registerPreference( "EnableAlpha", BoolImportStringCaller( g_TextureBrowser_enableAlpha ), BoolExportStringCaller( g_TextureBrowser_enableAlpha ) ); - GlobalPreferenceSystem().registerPreference( "LoadShaders", IntImportStringCaller( reinterpret_cast( GlobalTextureBrowser().m_startupShaders ) ), IntExportStringCaller( reinterpret_cast( GlobalTextureBrowser().m_startupShaders ) ) ); - GlobalPreferenceSystem().registerPreference( "WheelMouseInc", SizeImportStringCaller( GlobalTextureBrowser().m_mouseWheelScrollIncrement ), SizeExportStringCaller( GlobalTextureBrowser().m_mouseWheelScrollIncrement ) ); - GlobalPreferenceSystem().registerPreference( "SI_Colors0", Vector3ImportStringCaller( GlobalTextureBrowser().color_textureback ), Vector3ExportStringCaller( GlobalTextureBrowser().color_textureback ) ); - - g_TextureBrowser.shader = texdef_name_default(); - - Textures_setModeChangedNotify( ReferenceCaller( g_TextureBrowser ) ); + 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 ) ); + + GlobalPreferenceSystem().registerPreference( "TextureScale", make_property_string(textureBrowser) ); + GlobalPreferenceSystem().registerPreference( "UniformTextureSize", make_property_string(textureBrowser) ); + GlobalPreferenceSystem().registerPreference( "TextureScrollbar", make_property_string(textureBrowser)); + GlobalPreferenceSystem().registerPreference( "ShowShaders", make_property_string( textureBrowser.m_showShaders ) ); + 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( textureBrowser.m_startupShaders ) ) ); + GlobalPreferenceSystem().registerPreference( "WheelMouseInc", make_property_string( textureBrowser.m_mouseWheelScrollIncrement ) ); + GlobalPreferenceSystem().registerPreference( "SI_Colors0", make_property_string( textureBrowser.color_textureback ) ); + + textureBrowser.shader = texdef_name_default(); + + Textures_setModeChangedNotify( ReferenceCaller( textureBrowser ) ); TextureBrowser_registerPreferencesPage(); @@ -2660,8 +2882,15 @@ void TextureBrowser_Construct(){ TextureBrowser_textureSelected = TextureClipboard_textureSelected; } + void TextureBrowser_Destroy(){ GlobalShaderSystem().detach( g_ShadersObserver ); Textures_setModeChangedNotify( Callback() ); } + +#if WORKAROUND_WINDOWS_GTK2_GLWIDGET +ui::GLArea TextureBrowser_getGLWidget(){ + return GlobalTextureBrowser().m_gl_widget; +} +#endif // WORKAROUND_WINDOWS_GTK2_GLWIDGET