qi-hardware/eda-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/eda-tools.git synced 2024-11-04 23:05:21 +02:00
Code

eeshow/gui-aoi.c: prepare API for future dragging support

Browse Source
This commit is contained in:
Werner Almesberger 2016-08-14 12:30:24 -03:00
parent c00f065993
commit 5ccd805b43
3 changed files with 92 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
eeshow/gui-aoi.c
View File

@ -18,12 +18,19 @@
*/
#include <stddef.h>
#include <math.h>
#include <assert.h>
#include "util.h"
#include "gui-aoi.h"
#define DRAG_RADIUS 5
static const struct aoi *hovering = NULL;
static const struct aoi *clicked = NULL;
static int clicked_x, clicked_y;
struct aoi *aoi_add(struct aoi **aois, const struct aoi *cfg)
@ -48,6 +55,18 @@ void aoi_update(struct aoi *aoi, const struct aoi *cfg)
}
static const struct aoi *find_aoi(const struct aoi *aois, int x, int y)
{
const struct aoi *aoi;
for (aoi = aois; aoi; aoi = aoi->next)
if (x >= aoi->x && x < aoi->x + aoi->w &&
y >= aoi->y && y < aoi->y + aoi->h)
break;
return aoi;
}
bool aoi_hover(const struct aoi *aois, int x, int y)
{
const struct aoi *aoi;
@ -60,10 +79,7 @@ bool aoi_hover(const struct aoi *aois, int x, int y)
hovering = NULL;
}
for (aoi = aois; aoi; aoi = aoi->next)
if (x >= aoi->x && x < aoi->x + aoi->w &&
y >= aoi->y && y < aoi->y + aoi->h)
break;
aoi = find_aoi(aois, x, y);
if (aoi && aoi->hover && aoi->hover(aoi->user, 1)) {
hovering = aoi;
return 1;
@ -72,23 +88,66 @@ bool aoi_hover(const struct aoi *aois, int x, int y)
}
bool aoi_click(const struct aoi *aois, int x, int y)
bool aoi_move(const struct aoi *aois, int x, int y)
{
const struct aoi *aoi;
if (hovering) {
hovering->hover(hovering->user, 0);
hovering = NULL;
}
if (!clicked)
return 0;
/*
* Ensure we're on the right list and are using the same coordinate
* system.
*/
for (aoi = aois; aoi; aoi = aoi->next)
if (x >= aoi->x && x < aoi->x + aoi->w &&
y >= aoi->y && y < aoi->y + aoi->h)
if (aoi == clicked)
break;
if (aoi && aoi->click) {
aoi->click(aoi->user);
return 1;
}
return 0;
if (!aoi)
return 0;
if (hypot(x - clicked_x, y - clicked_y) > DRAG_RADIUS)
clicked = NULL;
return 1;
}
bool aoi_down(const struct aoi *aois, int x, int y)
{
assert(!clicked);
aoi_dehover();
clicked = find_aoi(aois, x, y);
if (!clicked)
return 0;
clicked_x = x;
clicked_y = y;
return 1;
}
bool aoi_up(const struct aoi *aois, int x, int y)
{
const struct aoi *aoi;
if (!aoi_move(aois, x, y))
return 0;
/*
* Ensure we're on the right list and are using the same coordinate
* system.
*/
for (aoi = aois; aoi; aoi = aoi->next)
if (aoi == clicked)
break;
if (!aoi)
return 0;
clicked->click(clicked->user);
clicked = NULL;
return 1;
}

6
eeshow/gui-aoi.h
View File

@ -31,7 +31,11 @@ struct aoi {
struct aoi *aoi_add(struct aoi **aois, const struct aoi *cfg);
void aoi_update(struct aoi *aoi, const struct aoi *cfg);
bool aoi_hover(const struct aoi *aois, int x, int y);
bool aoi_click(const struct aoi *aois, int x, int y);
bool aoi_move(const struct aoi *aois, int x, int y);
bool aoi_down(const struct aoi *aois, int x, int y);
bool aoi_up(const struct aoi *aois, int x, int y);
void aoi_remove(struct aoi **aois, const struct aoi *aoi);
void aoi_dehover(void);

15
eeshow/gui.c
View File

@ -771,7 +771,10 @@ static gboolean motion_notify_event(GtkWidget *widget, GdkEventMotion *event,
canvas_coord(ctx, event->x, event->y, &x, &y);
aoi_hover(ctx->aois, event->x, event->y) ||
aoi_move(ctx->aois, event->x, event->y) ||
aoi_move(curr_sheet->aois,
x + curr_sheet->xmin, y + curr_sheet->ymin) ||
aoi_hover(ctx->aois, event->x, event->y) ||
aoi_hover(curr_sheet->aois,
x + curr_sheet->xmin, y + curr_sheet->ymin);
pan_update(ctx, event->x, event->y);
@ -791,9 +794,9 @@ static gboolean button_press_event(GtkWidget *widget, GdkEventButton *event,
switch (event->button) {
case 1:
if (aoi_click(ctx->aois, event->x, event->y))
if (aoi_down(ctx->aois, event->x, event->y))
break;
if (aoi_click(curr_sheet->aois,
if (aoi_down(curr_sheet->aois,
x + curr_sheet->xmin, y + curr_sheet->ymin))
break;
if (ctx->showing_history)
@ -815,12 +818,18 @@ static gboolean button_release_event(GtkWidget *widget, GdkEventButton *event,
gpointer data)
{
struct gui_ctx *ctx = data;
const struct gui_sheet *curr_sheet = ctx->curr_sheet;
int x, y;
canvas_coord(ctx, event->x, event->y, &x, &y);
switch (event->button) {
case 1:
if (aoi_up(ctx->aois, event->x, event->y))
break;
if (aoi_up(curr_sheet->aois,
x + curr_sheet->xmin, y + curr_sheet->ymin))
break;
break;
case 2:
pan_end(ctx, event->x, event->y);