X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fentitylist.cpp;h=0230fe6d01cf9a7e2e2a80e169cbc4050efa9e05;hb=e3af470d9d19e105c9a9c6228931ee2645d09371;hp=4fdc5b4ea6e83f0f20c45085aa4c0141f3336be2;hpb=62d99f889c0e98be65f779d3983109c84ce58cec;p=xonotic%2Fnetradiant.git diff --git a/radiant/entitylist.cpp b/radiant/entitylist.cpp index 4fdc5b4e..0230fe6d 100644 --- a/radiant/entitylist.cpp +++ b/radiant/entitylist.cpp @@ -23,10 +23,8 @@ #include "iselection.h" -#include -#include -#include -#include +#include +#include #include "string/string.h" #include "scenelib.h" @@ -43,9 +41,8 @@ #include "treemodel.h" void RedrawEntityList(); -typedef FreeCaller RedrawEntityListCaller; +typedef FreeCaller RedrawEntityListCaller; -typedef struct _GtkTreeView GtkTreeView; class EntityList { @@ -62,20 +59,20 @@ EDirty m_dirty; IdleDraw m_idleDraw; WindowPositionTracker m_positionTracker; -GtkWindow* m_window; -GtkTreeView* m_tree_view; -GraphTreeModel* m_tree_model; +ui::Window m_window; +ui::TreeView m_tree_view{ui::null}; +ui::TreeModel m_tree_model{ui::null}; bool m_selection_disabled; EntityList() : m_dirty( EntityList::eDefault ), m_idleDraw( RedrawEntityListCaller() ), - m_window( 0 ), + m_window( ui::null ), m_selection_disabled( false ){ } -bool visible() const { - return GTK_WIDGET_VISIBLE( GTK_WIDGET( m_window ) ); +bool visible() { + return m_window.visible(); } }; @@ -102,7 +99,7 @@ const char* node_get_name( scene::Node& node ){ } template -inline void gtk_tree_model_get_pointer( GtkTreeModel* model, GtkTreeIter* iter, gint column, value_type** pointer ){ +inline void gtk_tree_model_get_pointer( ui::TreeModel model, GtkTreeIter* iter, gint column, value_type** pointer ){ GValue value = GValue_default(); gtk_tree_model_get_value( model, iter, column, &value ); *pointer = (value_type*)g_value_get_pointer( &value ); @@ -110,7 +107,7 @@ inline void gtk_tree_model_get_pointer( GtkTreeModel* model, GtkTreeIter* iter, -void entitylist_treeviewcolumn_celldatafunc( GtkTreeViewColumn* column, GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter, gpointer data ){ +void entitylist_treeviewcolumn_celldatafunc( ui::TreeViewColumn column, ui::CellRenderer renderer, ui::TreeModel model, GtkTreeIter* iter, gpointer data ){ scene::Node* node; gtk_tree_model_get_pointer( model, iter, 0, &node ); scene::Instance* instance; @@ -118,26 +115,26 @@ void entitylist_treeviewcolumn_celldatafunc( GtkTreeViewColumn* column, GtkCellR if ( node != 0 ) { gtk_cell_renderer_set_fixed_size( renderer, -1, -1 ); char* name = const_cast( node_get_name( *node ) ); - g_object_set( G_OBJECT( renderer ), "text", name, "visible", TRUE, 0 ); + g_object_set( G_OBJECT( renderer ), "text", name, "visible", TRUE, NULL ); //globalOutputStream() << "rendering cell " << makeQuoted(name) << "\n"; - GtkStyle* style = gtk_widget_get_style( GTK_WIDGET( getEntityList().m_tree_view ) ); + auto style = gtk_widget_get_style( ui::TreeView( getEntityList().m_tree_view ) ); if ( instance->childSelected() ) { - g_object_set( G_OBJECT( renderer ), "cell-background-gdk", &style->base[GTK_STATE_ACTIVE], 0 ); + g_object_set( G_OBJECT( renderer ), "cell-background-gdk", &style->base[GTK_STATE_ACTIVE], NULL ); } else { - g_object_set( G_OBJECT( renderer ), "cell-background-gdk", &style->base[GTK_STATE_NORMAL], 0 ); + g_object_set( G_OBJECT( renderer ), "cell-background-gdk", &style->base[GTK_STATE_NORMAL], NULL ); } } else { gtk_cell_renderer_set_fixed_size( renderer, -1, 0 ); - g_object_set( G_OBJECT( renderer ), "text", "", "visible", FALSE, 0 ); + g_object_set( G_OBJECT( renderer ), "text", "", "visible", FALSE, NULL ); } } -static gboolean entitylist_tree_select( GtkTreeSelection *selection, GtkTreeModel *model, GtkTreePath *path, gboolean path_currently_selected, gpointer data ){ +static gboolean entitylist_tree_select( ui::TreeSelection selection, ui::TreeModel model, ui::TreePath path, gboolean path_currently_selected, gpointer data ){ GtkTreeIter iter; gtk_tree_model_get_iter( model, &iter, path ); scene::Node* node; @@ -163,31 +160,31 @@ static gboolean entitylist_tree_select( GtkTreeSelection *selection, GtkTreeMode return FALSE; } -static gboolean entitylist_tree_select_null( GtkTreeSelection *selection, GtkTreeModel *model, GtkTreePath *path, gboolean path_currently_selected, gpointer data ){ +static gboolean entitylist_tree_select_null( ui::TreeSelection selection, ui::TreeModel model, ui::TreePath path, gboolean path_currently_selected, gpointer data ){ return TRUE; } -void EntityList_ConnectSignals( GtkTreeView* view ){ - GtkTreeSelection* select = gtk_tree_view_get_selection( view ); - gtk_tree_selection_set_select_function( select, entitylist_tree_select, NULL, 0 ); +void EntityList_ConnectSignals( ui::TreeView view ){ + auto select = gtk_tree_view_get_selection( view ); + gtk_tree_selection_set_select_function(select, reinterpret_cast(entitylist_tree_select), NULL, 0 ); } -void EntityList_DisconnectSignals( GtkTreeView* view ){ - GtkTreeSelection* select = gtk_tree_view_get_selection( view ); - gtk_tree_selection_set_select_function( select, entitylist_tree_select_null, 0, 0 ); +void EntityList_DisconnectSignals( ui::TreeView view ){ + auto select = gtk_tree_view_get_selection( view ); + gtk_tree_selection_set_select_function(select, reinterpret_cast(entitylist_tree_select_null), 0, 0 ); } -gboolean treemodel_update_selection( GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer data ){ - GtkTreeView* view = reinterpret_cast( data ); +gboolean treemodel_update_selection( ui::TreeModel model, ui::TreePath path, GtkTreeIter* iter, gpointer data ){ + auto view = ui::TreeView::from( data ); scene::Instance* instance; gtk_tree_model_get_pointer( model, iter, 1, &instance ); Selectable* selectable = Instance_getSelectable( *instance ); if ( selectable != 0 ) { - GtkTreeSelection* selection = gtk_tree_view_get_selection( view ); + auto selection = gtk_tree_view_get_selection( view ); if ( selectable->isSelected() ) { gtk_tree_selection_select_path( selection, path ); } @@ -200,9 +197,9 @@ gboolean treemodel_update_selection( GtkTreeModel* model, GtkTreePath* path, Gtk return FALSE; } -void EntityList_UpdateSelection( GtkTreeModel* model, GtkTreeView* view ){ +void EntityList_UpdateSelection( ui::TreeModel model, ui::TreeView view ){ EntityList_DisconnectSignals( view ); - gtk_tree_model_foreach( model, treemodel_update_selection, view ); + gtk_tree_model_foreach(model, reinterpret_cast(treemodel_update_selection), view._handle ); EntityList_ConnectSignals( view ); } @@ -212,7 +209,7 @@ void RedrawEntityList(){ { case EntityList::eInsertRemove: case EntityList::eSelection: - EntityList_UpdateSelection( GTK_TREE_MODEL( getEntityList().m_tree_model ), getEntityList().m_tree_view ); + EntityList_UpdateSelection( getEntityList().m_tree_model, getEntityList().m_tree_view ); default: break; } @@ -238,23 +235,23 @@ void EntityList_SelectionChanged( const Selectable& selectable ){ EntityList_SelectionUpdate(); } -void entitylist_treeview_rowcollapsed( GtkTreeView* view, GtkTreeIter* iter, GtkTreePath* path, gpointer user_data ){ +void entitylist_treeview_rowcollapsed( ui::TreeView view, GtkTreeIter* iter, ui::TreePath path, gpointer user_data ){ } -void entitylist_treeview_row_expanded( GtkTreeView* view, GtkTreeIter* iter, GtkTreePath* path, gpointer user_data ){ +void entitylist_treeview_row_expanded( ui::TreeView view, GtkTreeIter* iter, ui::TreePath path, gpointer user_data ){ EntityList_SelectionUpdate(); } void EntityList_SetShown( bool shown ){ - widget_set_visible( GTK_WIDGET( getEntityList().m_window ), shown ); + getEntityList().m_window.visible(shown); } void EntityList_toggleShown(){ EntityList_SetShown( !getEntityList().visible() ); } -gint graph_tree_model_compare_name( GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data ){ +gint graph_tree_model_compare_name( ui::TreeModel model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data ){ scene::Node* first; gtk_tree_model_get( model, a, 0, (gpointer*)&first, -1 ); scene::Node* second; @@ -271,23 +268,23 @@ gint graph_tree_model_compare_name( GtkTreeModel *model, GtkTreeIter *a, GtkTree extern GraphTreeModel* scene_graph_get_tree_model(); void AttachEntityTreeModel(){ - getEntityList().m_tree_model = scene_graph_get_tree_model(); + getEntityList().m_tree_model = ui::TreeModel::from(scene_graph_get_tree_model()); - gtk_tree_view_set_model( getEntityList().m_tree_view, GTK_TREE_MODEL( getEntityList().m_tree_model ) ); + gtk_tree_view_set_model( getEntityList().m_tree_view, getEntityList().m_tree_model ); } void DetachEntityTreeModel(){ - getEntityList().m_tree_model = 0; + getEntityList().m_tree_model = ui::TreeModel(ui::null); gtk_tree_view_set_model( getEntityList().m_tree_view, 0 ); } -void EntityList_constructWindow( GtkWindow* main_window ){ - ASSERT_MESSAGE( getEntityList().m_window == 0, "error" ); +void EntityList_constructWindow( ui::Window main_window ){ + ASSERT_TRUE( !getEntityList().m_window ); - GtkWindow* window = create_persistent_floating_window( "Entity List", main_window ); + auto window = ui::Window(create_persistent_floating_window( "Entity List", main_window )); - gtk_window_add_accel_group( window, global_accel ); + window.add_accel_group(global_accel); getEntityList().m_positionTracker.connect( window ); @@ -295,29 +292,29 @@ void EntityList_constructWindow( GtkWindow* main_window ){ getEntityList().m_window = window; { - GtkScrolledWindow* scr = create_scrolled_window( GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); - gtk_container_add( GTK_CONTAINER( window ), GTK_WIDGET( scr ) ); + auto scr = create_scrolled_window( ui::Policy::AUTOMATIC, ui::Policy::AUTOMATIC ); + window.add(scr); { - GtkWidget* view = gtk_tree_view_new(); - gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( view ), FALSE ); + auto view = ui::TreeView(ui::New); + gtk_tree_view_set_headers_visible(view, FALSE ); - GtkCellRenderer* renderer = gtk_cell_renderer_text_new(); - GtkTreeViewColumn* column = gtk_tree_view_column_new(); + auto renderer = ui::CellRendererText(ui::New); + auto column = gtk_tree_view_column_new(); gtk_tree_view_column_pack_start( column, renderer, TRUE ); - gtk_tree_view_column_set_cell_data_func( column, renderer, entitylist_treeviewcolumn_celldatafunc, 0, 0 ); + gtk_tree_view_column_set_cell_data_func(column, renderer, reinterpret_cast(entitylist_treeviewcolumn_celldatafunc), 0, 0 ); - GtkTreeSelection* select = gtk_tree_view_get_selection( GTK_TREE_VIEW( view ) ); + auto select = gtk_tree_view_get_selection(view ); gtk_tree_selection_set_mode( select, GTK_SELECTION_MULTIPLE ); - g_signal_connect( G_OBJECT( view ), "row_expanded", G_CALLBACK( entitylist_treeview_row_expanded ), 0 ); - g_signal_connect( G_OBJECT( view ), "row_collapsed", G_CALLBACK( entitylist_treeview_rowcollapsed ), 0 ); + view.connect( "row_expanded", G_CALLBACK( entitylist_treeview_row_expanded ), 0 ); + view.connect( "row_collapsed", G_CALLBACK( entitylist_treeview_rowcollapsed ), 0 ); - gtk_tree_view_append_column( GTK_TREE_VIEW( view ), column ); + gtk_tree_view_append_column(view, column ); - gtk_widget_show( view ); - gtk_container_add( GTK_CONTAINER( scr ), view ); - getEntityList().m_tree_view = GTK_TREE_VIEW( view ); + view.show(); + scr.add(view); + getEntityList().m_tree_view = view; } } @@ -378,9 +375,9 @@ void EntityList_Construct(){ getEntityList().m_positionTracker.setPosition( c_default_window_pos ); - GlobalPreferenceSystem().registerPreference( "EntityInfoDlg", WindowPositionTrackerImportStringCaller( getEntityList().m_positionTracker ), WindowPositionTrackerExportStringCaller( getEntityList().m_positionTracker ) ); + GlobalPreferenceSystem().registerPreference( "EntityInfoDlg", make_property( getEntityList().m_positionTracker ) ); - typedef FreeCaller1 EntityListSelectionChangedCaller; + typedef FreeCaller EntityListSelectionChangedCaller; GlobalSelectionSystem().addSelectionChangeCallback( EntityListSelectionChangedCaller() ); } void EntityList_Destroy(){