From a919f5f0dd4c510d43817f2ebfed6c32def470cc Mon Sep 17 00:00:00 2001
From: Alexey Yakovenko <waker@users.sourceforge.net>
Date: Tue, 3 Jun 2014 22:09:07 +0200
Subject: gtkui: fixed keyboard handling (bug #1103)

---
 plugins/gtkui/deadbeef.glade |  4 ++--
 plugins/gtkui/gtkui.c        | 12 ------------
 plugins/gtkui/interface.c    |  7 ++++---
 plugins/gtkui/prefwin.c      | 13 -------------
 4 files changed, 6 insertions(+), 30 deletions(-)

(limited to 'plugins/gtkui')

diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade
index 7641ed20..c2082b28 100644
--- a/plugins/gtkui/deadbeef.glade
+++ b/plugins/gtkui/deadbeef.glade
@@ -22,7 +22,7 @@
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
-  <signal name="key_press_event" handler="on_mainwin_key_press_event" after="yes" last_modification_time="Thu, 30 Jul 2009 21:14:26 GMT"/>
+  <signal name="key_press_event" handler="on_mainwin_key_press_event" last_modification_time="Thu, 30 Jul 2009 21:14:26 GMT"/>
   <signal name="delete_event" handler="on_mainwin_delete_event" last_modification_time="Thu, 13 Aug 2009 20:35:55 GMT"/>
   <signal name="configure_event" handler="on_mainwin_configure_event" last_modification_time="Sun, 23 Aug 2009 15:26:53 GMT"/>
   <signal name="window_state_event" handler="on_mainwin_window_state_event" last_modification_time="Wed, 09 Dec 2009 19:39:55 GMT"/>
@@ -1722,7 +1722,7 @@
   <property name="visible">True</property>
   <property name="title">editcolumndlg</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="window_position">GTK_WIN_POS_MOUSE</property>
   <property name="modal">True</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c
index 5d2dedeb..5e2cbd2f 100644
--- a/plugins/gtkui/gtkui.c
+++ b/plugins/gtkui/gtkui.c
@@ -975,18 +975,6 @@ gtkui_thread (void *ctx) {
 
     mainwin = create_mainwin ();
 
-    // gtk adds default keybindings to GtkWindow, remove them
-    GtkBindingSet *binding_set = gtk_binding_set_by_class (GTK_WINDOW_GET_CLASS(mainwin));
-    gtk_binding_entry_remove (binding_set, GDK_space, 0);
-    gtk_binding_entry_remove (binding_set, GDK_KP_Space, 0);
-    gtk_binding_entry_remove (binding_set, GDK_Return, 0);
-    gtk_binding_entry_remove (binding_set, GDK_ISO_Enter, 0);
-    gtk_binding_entry_remove (binding_set, GDK_KP_Enter, 0);
-    gtk_binding_entry_remove (binding_set, GDK_Tab, GDK_CONTROL_MASK);
-    gtk_binding_entry_remove (binding_set, GDK_Tab, GDK_CONTROL_MASK|GDK_SHIFT_MASK);
-    gtk_binding_entry_remove (binding_set, GDK_KP_Tab, GDK_CONTROL_MASK);
-    gtk_binding_entry_remove (binding_set, GDK_KP_Tab, GDK_CONTROL_MASK|GDK_SHIFT_MASK);
-
     // initialize default hotkey mapping
     if (!deadbeef->conf_get_int ("hotkeys_created", 0)) {
         // check if any hotkeys were created manually (e.g. beta versions of 0.6)
diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c
index f73a1c55..49f4434d 100644
--- a/plugins/gtkui/interface.c
+++ b/plugins/gtkui/interface.c
@@ -461,9 +461,9 @@ create_mainwin (void)
   gtk_widget_show (statusbar);
   gtk_box_pack_start (GTK_BOX (vbox1), statusbar, FALSE, FALSE, 0);
 
-  g_signal_connect_after ((gpointer) mainwin, "key_press_event",
-                          G_CALLBACK (on_mainwin_key_press_event),
-                          NULL);
+  g_signal_connect ((gpointer) mainwin, "key_press_event",
+                    G_CALLBACK (on_mainwin_key_press_event),
+                    NULL);
   g_signal_connect ((gpointer) mainwin, "delete_event",
                     G_CALLBACK (on_mainwin_delete_event),
                     NULL);
@@ -1300,6 +1300,7 @@ create_editcolumndlg (void)
 
   editcolumndlg = gtk_dialog_new ();
   gtk_window_set_title (GTK_WINDOW (editcolumndlg), "editcolumndlg");
+  gtk_window_set_position (GTK_WINDOW (editcolumndlg), GTK_WIN_POS_MOUSE);
   gtk_window_set_modal (GTK_WINDOW (editcolumndlg), TRUE);
   gtk_window_set_type_hint (GTK_WINDOW (editcolumndlg), GDK_WINDOW_TYPE_HINT_DIALOG);
 
diff --git a/plugins/gtkui/prefwin.c b/plugins/gtkui/prefwin.c
index 00b68fbc..970dc42b 100644
--- a/plugins/gtkui/prefwin.c
+++ b/plugins/gtkui/prefwin.c
@@ -863,19 +863,6 @@ on_proxypassword_changed               (GtkEditable     *editable,
 }
 
 
-gboolean
-on_prefwin_key_press_event             (GtkWidget       *widget,
-                                        GdkEventKey     *event,
-                                        gpointer         user_data)
-{
-    if (event->keyval == GDK_Escape) {
-        gtk_widget_hide (widget);
-        gtk_widget_destroy (widget);
-    }
-    return FALSE;
-}
-
-
 void
 on_embolden_current_toggled            (GtkToggleButton *togglebutton,
                                         gpointer         user_data)
-- 
cgit v1.2.3