Implement gesture button setting and default to right
This commit is contained in:
parent
43baf4706a
commit
6a5585254a
1 changed files with 5 additions and 5 deletions
|
@ -28,6 +28,7 @@ struct MouseGestureNode {
|
||||||
} MouseGestureNode_t;
|
} MouseGestureNode_t;
|
||||||
|
|
||||||
struct _MouseGesture {
|
struct _MouseGesture {
|
||||||
|
MouseButton button;
|
||||||
struct MouseGestureNode start;
|
struct MouseGestureNode start;
|
||||||
struct MouseGestureNode middle;
|
struct MouseGestureNode middle;
|
||||||
struct MouseGestureNode end;
|
struct MouseGestureNode end;
|
||||||
|
@ -37,8 +38,6 @@ struct _MouseGesture {
|
||||||
#define DEVIANCE 20
|
#define DEVIANCE 20
|
||||||
#define MINLENGTH 50
|
#define MINLENGTH 50
|
||||||
|
|
||||||
#define MOUSE_GESTURES_BUTTON MOUSE_BUTTON_MIDDLE
|
|
||||||
|
|
||||||
MouseGesture *gesture;
|
MouseGesture *gesture;
|
||||||
|
|
||||||
void mouse_gesture_clear (MouseGesture *g)
|
void mouse_gesture_clear (MouseGesture *g)
|
||||||
|
@ -65,7 +64,7 @@ mouse_gestures_button_press_event_cb (GtkWidget* web_view,
|
||||||
GdkEvent* event,
|
GdkEvent* event,
|
||||||
MidoriBrowser* browser)
|
MidoriBrowser* browser)
|
||||||
{
|
{
|
||||||
if (event->button.button == MOUSE_GESTURES_BUTTON)
|
if (event->button.button == gesture->button)
|
||||||
{
|
{
|
||||||
/* If the gesture was previously cleaned,
|
/* If the gesture was previously cleaned,
|
||||||
start a new gesture and coordinates. */
|
start a new gesture and coordinates. */
|
||||||
|
@ -127,7 +126,7 @@ mouse_gestures_button_release_event_cb (GtkWidget* web_view,
|
||||||
MidoriView* view)
|
MidoriView* view)
|
||||||
{
|
{
|
||||||
/* All mouse gestures will use this mouse button */
|
/* All mouse gestures will use this mouse button */
|
||||||
if (gesture->last == MOUSE_GESTURES_BUTTON)
|
if (gesture->last == gesture->button)
|
||||||
{
|
{
|
||||||
/* The initial horizontal move is between the bounds */
|
/* The initial horizontal move is between the bounds */
|
||||||
if ((gesture->middle.x - gesture->start.x < DEVIANCE) &&
|
if ((gesture->middle.x - gesture->start.x < DEVIANCE) &&
|
||||||
|
@ -285,6 +284,7 @@ mouse_gestures_activate_cb (MidoriExtension* extension,
|
||||||
guint i;
|
guint i;
|
||||||
|
|
||||||
gesture = mouse_gesture_new ();
|
gesture = mouse_gesture_new ();
|
||||||
|
gesture->button = midori_extension_get_integer (extension, "button");
|
||||||
|
|
||||||
browsers = katze_object_get_object (app, "browsers");
|
browsers = katze_object_get_object (app, "browsers");
|
||||||
i = 0;
|
i = 0;
|
||||||
|
@ -304,7 +304,7 @@ extension_init (void)
|
||||||
"description", _("Control Midori by moving the mouse"),
|
"description", _("Control Midori by moving the mouse"),
|
||||||
"version", "0.1",
|
"version", "0.1",
|
||||||
"authors", "Matthias Kruk <mkruk@matthiaskruk.de>", NULL);
|
"authors", "Matthias Kruk <mkruk@matthiaskruk.de>", NULL);
|
||||||
midori_extension_install_integer (extension, "button", MOUSE_GESTURES_BUTTON);
|
midori_extension_install_integer (extension, "button", MOUSE_BUTTON_RIGHT);
|
||||||
|
|
||||||
g_signal_connect (extension, "activate",
|
g_signal_connect (extension, "activate",
|
||||||
G_CALLBACK (mouse_gestures_activate_cb), NULL);
|
G_CALLBACK (mouse_gestures_activate_cb), NULL);
|
||||||
|
|
Loading…
Reference in a new issue