return false;
}
-static gboolean accelerator_key_event( GtkWindow* window, GdkEventKey* event, AcceleratorMap* acceleratorMap ){
+static gboolean accelerator_key_event( ui::Window window, GdkEventKey* event, AcceleratorMap* acceleratorMap ){
return AcceleratorMap_activate( *acceleratorMap, accelerator_for_event_key( event->keyval, event->state ) );
}
return 0;
}
-bool window_has_accel( GtkWindow* toplevel ){
+bool window_has_accel( ui::Window toplevel ){
return g_slist_length( gtk_accel_groups_from_object( G_OBJECT( toplevel ) ) ) != 0;
}
g_queuedAcceleratorsAdd.clear();
}
-void accel_group_test( GtkWindow* toplevel, GtkAccelGroup* accel ){
- guint n_entries;
- gtk_accel_group_query( accel, '4', (GdkModifierType)0, &n_entries );
- globalOutputStream() << "grid4: " << n_entries << "\n";
- globalOutputStream() << "toplevel accelgroups: " << g_slist_length( gtk_accel_groups_from_object( G_OBJECT( toplevel ) ) ) << "\n";
-}
-
-typedef std::set<GtkWindow*> WindowSet;
+typedef std::set<ui::Window> WindowSet;
WindowSet g_accel_windows;
bool Buttons_press( ButtonMask& buttons, guint button, guint state ){
g_accel_enabled = false;
for ( WindowSet::iterator i = g_accel_windows.begin(); i != g_accel_windows.end(); ++i )
{
- GtkWindow* toplevel = *i;
+ ui::Window toplevel = *i;
ASSERT_MESSAGE( window_has_accel( toplevel ), "ERROR" );
ASSERT_MESSAGE( gtk_widget_is_toplevel( GTK_WIDGET(toplevel) ), "disabling accel for non-toplevel window" );
gtk_window_remove_accel_group( toplevel, global_accel );
#if 0
globalOutputStream() << reinterpret_cast<unsigned int>( toplevel ) << ": disabled global accelerators\n";
-#endif
-#if 0
- accel_group_test( toplevel, global_accel );
#endif
}
}
g_accel_enabled = true;
for ( WindowSet::iterator i = g_accel_windows.begin(); i != g_accel_windows.end(); ++i )
{
- GtkWindow* toplevel = *i;
+ ui::Window toplevel = *i;
ASSERT_MESSAGE( !window_has_accel( toplevel ), "ERROR" );
ASSERT_MESSAGE( gtk_widget_is_toplevel( GTK_WIDGET(toplevel) ), "enabling accel for non-toplevel window" );
- gtk_window_add_accel_group( toplevel, global_accel );
+ toplevel.add_accel_group( global_accel );
#if 0
globalOutputStream() << reinterpret_cast<unsigned int>( toplevel ) << ": enabled global accelerators\n";
-#endif
-#if 0
- accel_group_test( toplevel, global_accel );
#endif
}
globalQueuedAccelerators_commit();
Keys_releaseAll( g_pressedKeys.keys, 0 );
}
-void GlobalPressedKeys_connect( GtkWindow* window ){
+void GlobalPressedKeys_connect( ui::Window window ){
unsigned int key_press_handler = g_signal_connect( G_OBJECT( window ), "key_press_event", G_CALLBACK( PressedKeys_key_press ), &g_pressedKeys );
unsigned int key_release_handler = g_signal_connect( G_OBJECT( window ), "key_release_event", G_CALLBACK( PressedKeys_key_release ), &g_pressedKeys );
g_object_set_data( G_OBJECT( window ), "key_press_handler", gint_to_pointer( key_press_handler ) );
g_object_set_data( G_OBJECT( window ), "focus_out_handler", gint_to_pointer( focus_out_handler ) );
}
-void GlobalPressedKeys_disconnect( GtkWindow* window ){
+void GlobalPressedKeys_disconnect( ui::Window window ){
g_signal_handler_disconnect( G_OBJECT( window ), gpointer_to_int( g_object_get_data( G_OBJECT( window ), "key_press_handler" ) ) );
g_signal_handler_disconnect( G_OBJECT( window ), gpointer_to_int( g_object_get_data( G_OBJECT( window ), "key_release_handler" ) ) );
g_signal_handler_disconnect( G_OBJECT( window ), gpointer_to_int( g_object_get_data( G_OBJECT( window ), "focus_in_handler" ) ) );
}
}
-GtkAccelGroup* global_accel = 0;
-
-void global_accel_init(){
- global_accel = ui::AccelGroup();
-}
-
-void global_accel_destroy(){
- g_object_unref( global_accel );
-}
+ui::AccelGroup global_accel = ui::AccelGroup();
GClosure* global_accel_group_add_accelerator( Accelerator accelerator, const Callback& callback ){
if ( !global_accel_enabled() ) {
}
/// \brief Propagates key events to the focus-widget, overriding global accelerators.
-static gboolean override_global_accelerators( GtkWindow* window, GdkEventKey* event, gpointer data ){
+static gboolean override_global_accelerators( ui::Window window, GdkEventKey* event, gpointer data ){
gboolean b = gtk_window_propagate_key_event( window, event );
return b;
}
-void global_accel_connect_window( GtkWindow* window ){
+void global_accel_connect_window( ui::Window window ){
#if 1
unsigned int override_handler = g_signal_connect( G_OBJECT( window ), "key_press_event", G_CALLBACK( override_global_accelerators ), 0 );
g_object_set_data( G_OBJECT( window ), "override_handler", gint_to_pointer( override_handler ) );
g_object_set_data( G_OBJECT( window ), "key_release_handler", gint_to_pointer( key_release_handler ) );
#endif
g_accel_windows.insert( window );
- gtk_window_add_accel_group( window, global_accel );
+ window.add_accel_group( global_accel );
}
-void global_accel_disconnect_window( GtkWindow* window ){
+void global_accel_disconnect_window( ui::Window window ){
#if 1
GlobalPressedKeys_disconnect( window );