From d5b4f4ba1d31e368e23ddd77774e285a13908622 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Sun, 1 Jan 2012 00:09:35 +0100 Subject: Fake middle clicks without gtk_button_{press,release}, which are deprecated Factor the logic that fakes clicks from a middle click in EphyMiddleClick(Tool)Button by forwarding a left click to GTK+ when we receive a middle click. Since ephy_gui_is_middle_click stops working in this case, add the minimal logic in EphyLinkAction to make it work again (basically, cache the button that activated the action inside the action itself). The EphyMiddleClickable(Tool)Button classes were written by Alexandre Mazari. https://bugzilla.gnome.org/show_bug.cgi?id=628364 --- lib/widgets/Makefile.am | 4 ++ lib/widgets/ephy-middle-clickable-button.c | 68 +++++++++++++++++++++++++ lib/widgets/ephy-middle-clickable-button.h | 56 ++++++++++++++++++++ lib/widgets/ephy-middle-clickable-tool-button.c | 46 +++++++++++++++++ lib/widgets/ephy-middle-clickable-tool-button.h | 55 ++++++++++++++++++++ 5 files changed, 229 insertions(+) create mode 100644 lib/widgets/ephy-middle-clickable-button.c create mode 100644 lib/widgets/ephy-middle-clickable-button.h create mode 100644 lib/widgets/ephy-middle-clickable-tool-button.c create mode 100644 lib/widgets/ephy-middle-clickable-tool-button.h (limited to 'lib') diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am index 941a9548a..57d5c73ce 100644 --- a/lib/widgets/Makefile.am +++ b/lib/widgets/Makefile.am @@ -5,6 +5,10 @@ libephywidgets_la_SOURCES = \ ephy-download-widget.h \ ephy-location-entry.c \ ephy-location-entry.h \ + ephy-middle-clickable-button.c \ + ephy-middle-clickable-button.h \ + ephy-middle-clickable-tool-button.c \ + ephy-middle-clickable-tool-button.h \ ephy-node-view.c \ ephy-node-view.h \ ephy-search-entry.c \ diff --git a/lib/widgets/ephy-middle-clickable-button.c b/lib/widgets/ephy-middle-clickable-button.c new file mode 100644 index 000000000..1e6f53e98 --- /dev/null +++ b/lib/widgets/ephy-middle-clickable-button.c @@ -0,0 +1,68 @@ +/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* + * Copyright © 2011 Alexandre Mazari + * Copyright © 2011 Igalia S.L. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "config.h" +#include "ephy-middle-clickable-button.h" + +G_DEFINE_TYPE (EphyMiddleClickableButton, ephy_middle_clickable_button, GTK_TYPE_BUTTON) + +static gboolean +ephy_middle_clickable_button_handle_event (GtkWidget * widget, + GdkEventButton * event) +{ + gboolean ret; + int actual_button; + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (ephy_middle_clickable_button_parent_class); + + actual_button = event->button; + + if (actual_button == 2) + event->button = 1; + + if (event->type == GDK_BUTTON_PRESS) + ret = widget_class->button_press_event (widget, event); + else + ret = widget_class->button_release_event (widget, event); + + event->button = actual_button; + + return ret; +} + +static void +ephy_middle_clickable_button_class_init (EphyMiddleClickableButtonClass *class) +{ + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); + + widget_class->button_press_event = ephy_middle_clickable_button_handle_event; + widget_class->button_release_event = ephy_middle_clickable_button_handle_event; +} + +static void +ephy_middle_clickable_button_init (EphyMiddleClickableButton *class) +{ +} + +GtkWidget * +ephy_middle_clickable_button_new () +{ + return gtk_widget_new (EPHY_TYPE_MIDDLE_CLICKABLE_BUTTON, NULL); +} diff --git a/lib/widgets/ephy-middle-clickable-button.h b/lib/widgets/ephy-middle-clickable-button.h new file mode 100644 index 000000000..e346a1488 --- /dev/null +++ b/lib/widgets/ephy-middle-clickable-button.h @@ -0,0 +1,56 @@ +/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* + * Copyright © 2011 Alexandre Mazari + * Copyright © 2011 Igalia S.L. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) +#error "Only can be included directly." +#endif + +#ifndef __EPHY_MIDDLE_CLICKABLE_BUTTON_H__ +#define __EPHY_MIDDLE_CLICKABLE_BUTTON_H__ + +#include + +G_BEGIN_DECLS + +#define EPHY_TYPE_MIDDLE_CLICKABLE_BUTTON (ephy_middle_clickable_button_get_type ()) +#define EPHY_MIDDLE_CLICKABLE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),EPHY_TYPE_MIDDLE_CLICKABLE_BUTTN, EphyMiddleClickableButton)) +#define EPHY_MIDDLE_CLICKABLE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_MIDDLE_CLICKABLE_BUTTN, EphyMiddleClickableButtonClass)) +#define EPHY_IS_MIDDLE_CLICKABLE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_MIDDLE_CLICKABLE_BUTON)) +#define EPHY_IS_MIDDLE_CLICKABLE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EPHY_TYPE_MIDDLE_CLICKABLE_BUTTN)) +#define EPHY_MIDDLE_CLICKABLE_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EPHY_TYPE_MIDDLE_CLICKABLE_BUTTN, EphyMiddleClickableButtonClass)) + +typedef struct _EphyMiddleClickableButton EphyMiddleClickableButton; +typedef struct _EphyMiddleClickableButtonClass EphyMiddleClickableButtonClass; + +struct _EphyMiddleClickableButton { + GtkButton parent; +}; + +struct _EphyMiddleClickableButtonClass { + GtkButtonClass parent_class; +}; + +GType ephy_middle_clickable_button_get_type (void) G_GNUC_CONST; +GtkWidget *ephy_middle_clickable_button_new (void); + +G_END_DECLS + +#endif diff --git a/lib/widgets/ephy-middle-clickable-tool-button.c b/lib/widgets/ephy-middle-clickable-tool-button.c new file mode 100644 index 000000000..6bcce5eb7 --- /dev/null +++ b/lib/widgets/ephy-middle-clickable-tool-button.c @@ -0,0 +1,46 @@ +/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* + * Copyright © 2011 Alexandre Mazari + * Copyright © 2011 Igalia S.L. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "config.h" +#include "ephy-middle-clickable-tool-button.h" + +#include "ephy-middle-clickable-button.h" + +G_DEFINE_TYPE (EphyMiddleClickableToolButton, ephy_middle_clickable_tool_button, GTK_TYPE_TOOL_BUTTON) + +static void +ephy_middle_clickable_tool_button_class_init (EphyMiddleClickableToolButtonClass *class) +{ + GtkToolButtonClass *tool_button_class = GTK_TOOL_BUTTON_CLASS (class); + + tool_button_class->button_type = EPHY_TYPE_MIDDLE_CLICKABLE_BUTTON; +} + +static void +ephy_middle_clickable_tool_button_init (EphyMiddleClickableToolButton *class) +{ +} + +GtkWidget * +ephy_middle_clickable_tool_button_new () +{ + return gtk_widget_new (EPHY_TYPE_MIDDLE_CLICKABLE_TOOL_BUTTON, NULL); +} diff --git a/lib/widgets/ephy-middle-clickable-tool-button.h b/lib/widgets/ephy-middle-clickable-tool-button.h new file mode 100644 index 000000000..a5863b9d7 --- /dev/null +++ b/lib/widgets/ephy-middle-clickable-tool-button.h @@ -0,0 +1,55 @@ +/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* + * Copyright © 2011 Igalia S.L. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) +#error "Only can be included directly." +#endif + +#ifndef __EPHY_MIDDLE_CLICKABLE_TOOL_BUTTON_H__ +#define __EPHY_MIDDLE_CLICKABLE_TOOL_BUTTON_H__ + +#include + +G_BEGIN_DECLS + +#define EPHY_TYPE_MIDDLE_CLICKABLE_TOOL_BUTTON (ephy_middle_clickable_tool_button_get_type ()) +#define EPHY_MIDDLE_CLICKABLE_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),EPHY_TYPE_MIDDLE_CLICKABLE_TOOL_BUTTON, EphyMiddleClickableToolBtton)) +#define EPHY_MIDDLE_CLICKABLE_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_MIDDLE_CLICKABLE_TOOL_BUTTON, EphyMiddleClickableToolBttonClass)) +#define EPHY_IS_MIDDLE_CLICKABLE_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_MIDDLE_CLICKABLE_TOOL_BUTTON)) +#define EPHY_IS_MIDDLE_CLICKABLE_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EPHY_TYPE_MIDDLE_CLICKABLE_TOOL_BUTTON)) +#define EPHY_MIDDLE_CLICKABLE_TOOL_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EPHY_TYPE_MIDDLE_CLICKABLE_TOOL_BUTTON, EphyMiddleClickableToolBttonClass)) + +typedef struct _EphyMiddleClickableToolButton EphyMiddleClickableToolButton; +typedef struct _EphyMiddleClickableToolButtonClass EphyMiddleClickableToolButtonClass; + +struct _EphyMiddleClickableToolButton { + GtkToolButton parent; +}; + +struct _EphyMiddleClickableToolButtonClass { + GtkToolButtonClass parent_class; +}; + +GType ephy_middle_clickable_tool_button_get_type (void) G_GNUC_CONST; +GtkWidget *ephy_middle_clickable_tool_button_new (void); + +G_END_DECLS + +#endif -- cgit v1.2.3