Hi

As gtk+-directfb 2.10.13 (containing my upstream patched for the wrong cursor shape issue) entered unstable, the workaround i provided in gtk frontend is no longer necessary, so here is a patch to get us rid of it.

If no one notices regressions (and this shouldn't happen), i'm going to commit the patch in trunk.

regards

Attilio
Index: cdebconf/src/modules/frontend/gtk/gtk.c
===================================================================
--- cdebconf/src/modules/frontend/gtk/gtk.c	(revisione 47278)
+++ cdebconf/src/modules/frontend/gtk/gtk.c	(copia locale)
@@ -86,8 +86,6 @@
 
 static const char * get_text(struct frontend *obj, const char *template, const char *fallback );
 
-static int reset_cursor_cnt = 0;
-
 void register_setter(void (*func)(void*, struct question*),
              void *data, struct question *q, struct frontend *obj)
 {
@@ -346,22 +344,7 @@
     return FALSE;
 }
 
-/* TODO: workaround for bug #404482
- * This is a workaround for a bug in gtk/dfb which causes wrong GDK crossing
- * events (not) to be delivered and hence cursor not to be reshaped when
- * entering or leaving a gtktextview or a gtkentry
- */
-static gboolean reset_cursor_callback (GtkWidget *widget, GdkEventExpose *event, void *data)
-{
-    if (event->type == GDK_LEAVE_NOTIFY || event->type == GDK_ENTER_NOTIFY) {
-        if ( (reset_cursor_cnt % 2) == 0)
-            gdk_window_set_cursor (widget->window, NULL);
-        reset_cursor_cnt++;
-    }
 
-    return FALSE;
-}
-
 /* Scrolling to default row in SELECT questions has to be done after the
  * treeview has been realized
  */
@@ -1436,7 +1419,6 @@
     gtk_init (&args, &name);
 
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    g_signal_connect_after (G_OBJECT (window), "event", G_CALLBACK (reset_cursor_callback), NULL);
     gtk_widget_set_size_request (window, WINDOW_WIDTH, WINDOW_HEIGHT);
     gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
     gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);

Reply via email to