summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/events.c94
-rw-r--r--src/keyevents.c7
-rw-r--r--src/options.h32
-rw-r--r--src/structs.h2
4 files changed, 64 insertions, 71 deletions
diff --git a/src/events.c b/src/events.c
index 23a14ba..b0ebac0 100644
--- a/src/events.c
+++ b/src/events.c
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define FEH_JITTER_OFFSET 2
#define FEH_JITTER_TIME 1
-fehbb buttons;
+extern fehkb keys;
feh_event_handler *ev_handler[LASTEvent];
@@ -45,13 +45,13 @@ static void feh_event_handle_LeaveNotify(XEvent * ev);
static void feh_event_handle_MotionNotify(XEvent * ev);
static void feh_event_handle_ClientMessage(XEvent * ev);
-static void feh_set_bb(fehbutton *bb, int modifier, char button)
+static void feh_set_bb(fehkey *bb, int modifier, char button)
{
- bb->modifier = modifier;
+ bb->state = modifier;
bb->button = button;
}
-static void feh_set_parse_bb_partial(fehbutton *button, char *binding)
+static void feh_set_parse_bb_partial(fehkey *button, char *binding)
{
char *cur = binding;
int mod = 0;
@@ -83,9 +83,13 @@ static void feh_set_parse_bb_partial(fehbutton *button, char *binding)
}
button->button = atoi(cur);
- button->modifier = mod;
+ button->state = mod;
}
+/*
+ * Called after init_keyevents in keyevents.c
+ * -> no need to memset
+ */
void init_buttonbindings(void)
{
char *home = NULL;
@@ -93,20 +97,18 @@ void init_buttonbindings(void)
char *confpath = NULL;
char line[128];
char action[32], button[8];
- struct __fehbutton *cur_bb = NULL;
+ struct __fehkey *cur_bb = NULL;
FILE *conf = NULL;
int read = 0;
- memset(&buttons, 0, sizeof(buttons));
-
- feh_set_bb(&buttons.reload, 0, 0);
- feh_set_bb(&buttons.pan, 0, 1);
- feh_set_bb(&buttons.zoom, 0, 2);
- feh_set_bb(&buttons.menu, 0, 3);
- feh_set_bb(&buttons.prev, 0, 4);
- feh_set_bb(&buttons.next, 0, 5);
- feh_set_bb(&buttons.blur, 4, 1);
- feh_set_bb(&buttons.rotate, 4, 2);
+ feh_set_bb(&keys.reload, 0, 0);
+ feh_set_bb(&keys.pan, 0, 1);
+ feh_set_bb(&keys.zoom, 0, 2);
+ feh_set_bb(&keys.menu, 0, 3);
+ feh_set_bb(&keys.prev, 0, 4);
+ feh_set_bb(&keys.next, 0, 5);
+ feh_set_bb(&keys.blur, 4, 1);
+ feh_set_bb(&keys.rotate, 4, 2);
home = getenv("HOME");
confhome = getenv("XDG_CONFIG_HOME");
@@ -136,25 +138,25 @@ void init_buttonbindings(void)
continue;
if (!strcmp(action, "reload"))
- cur_bb = &buttons.reload;
+ cur_bb = &keys.reload;
else if (!strcmp(action, "pan"))
- cur_bb = &buttons.pan;
+ cur_bb = &keys.pan;
else if (!strcmp(action, "zoom"))
- cur_bb = &buttons.zoom;
+ cur_bb = &keys.zoom;
else if (!strcmp(action, "menu"))
- cur_bb = &buttons.menu;
+ cur_bb = &keys.menu;
else if (!strcmp(action, "prev"))
- cur_bb = &buttons.prev;
+ cur_bb = &keys.prev;
else if (!strcmp(action, "next"))
- cur_bb = &buttons.next;
+ cur_bb = &keys.next;
else if (!strcmp(action, "blur"))
- cur_bb = &buttons.blur;
+ cur_bb = &keys.blur;
else if (!strcmp(action, "rotate"))
- cur_bb = &buttons.rotate;
+ cur_bb = &keys.rotate;
else if (!strcmp(action, "zoom_in"))
- cur_bb = &buttons.zoom_in;
+ cur_bb = &keys.zoom_in;
else if (!strcmp(action, "zoom_out"))
- cur_bb = &buttons.zoom_out;
+ cur_bb = &keys.zoom_out;
else
weprintf("buttons: Invalid action: %s", action);
@@ -164,9 +166,9 @@ void init_buttonbindings(void)
fclose(conf);
}
-static short feh_is_bb(fehbutton *bb, int button, int mod)
+static short feh_is_bb(fehkey *bb, unsigned int button, unsigned int mod)
{
- if ((bb->modifier == mod) && (bb->button == button))
+ if ((bb->state == mod) && (bb->button == button))
return 1;
return 0;
}
@@ -193,7 +195,7 @@ void feh_event_init(void)
static void feh_event_handle_ButtonPress(XEvent * ev)
{
winwidget winwid = NULL;
- int state, button;
+ unsigned int state, button;
/* get the heck out if it's a mouse-click on the
cover, we'll hide the menus on release */
@@ -209,23 +211,23 @@ static void feh_event_handle_ButtonPress(XEvent * ev)
state = ev->xbutton.state & (ControlMask | ShiftMask | Mod1Mask | Mod4Mask);
button = ev->xbutton.button;
- if (!opt.no_menus && feh_is_bb(&buttons.menu, button, state)) {
+ if (!opt.no_menus && feh_is_bb(&keys.menu, button, state)) {
D(("Menu Button Press event\n"));
winwidget_show_menu(winwid);
- } else if (feh_is_bb(&buttons.rotate, button, state)
+ } else if (feh_is_bb(&keys.rotate, button, state)
&& (winwid->type != WIN_TYPE_THUMBNAIL)) {
opt.mode = MODE_ROTATE;
winwid->mode = MODE_ROTATE;
D(("rotate starting at %d, %d\n", ev->xbutton.x, ev->xbutton.y));
- } else if (feh_is_bb(&buttons.blur, button, state)
+ } else if (feh_is_bb(&keys.blur, button, state)
&& (winwid->type != WIN_TYPE_THUMBNAIL)) {
opt.mode = MODE_BLUR;
winwid->mode = MODE_BLUR;
D(("blur starting at %d, %d\n", ev->xbutton.x, ev->xbutton.y));
- } else if (feh_is_bb(&buttons.pan, button, state)) {
+ } else if (feh_is_bb(&keys.pan, button, state)) {
D(("Next button, but could be pan mode\n"));
opt.mode = MODE_NEXT;
winwid->mode = MODE_NEXT;
@@ -234,7 +236,7 @@ static void feh_event_handle_ButtonPress(XEvent * ev)
winwid->click_offset_y = ev->xbutton.y - winwid->im_y;
winwid->click_start_time = time(NULL);
- } else if (feh_is_bb(&buttons.zoom, button, state)) {
+ } else if (feh_is_bb(&keys.zoom, button, state)) {
D(("Zoom Button Press event\n"));
opt.mode = MODE_ZOOM;
winwid->mode = MODE_ZOOM;
@@ -249,7 +251,7 @@ static void feh_event_handle_ButtonPress(XEvent * ev)
winwid->im_click_offset_y = (winwid->click_offset_y
- winwid->im_y) / winwid->old_zoom;
- } else if (feh_is_bb(&buttons.zoom_in, button, state)) {
+ } else if (feh_is_bb(&keys.zoom_in, button, state)) {
D(("Zoom_In Button Press event\n"));
D(("click offset is %d,%d\n", ev->xbutton.x, ev->xbutton.y));
winwid->click_offset_x = ev->xbutton.x;
@@ -277,7 +279,7 @@ static void feh_event_handle_ButtonPress(XEvent * ev)
winwidget_sanitise_offsets(winwid);
winwidget_render_image(winwid, 0, 0);
- } else if (feh_is_bb(&buttons.zoom_out, button, state)) {
+ } else if (feh_is_bb(&keys.zoom_out, button, state)) {
D(("Zoom_Out Button Press event\n"));
D(("click offset is %d,%d\n", ev->xbutton.x, ev->xbutton.y));
winwid->click_offset_x = ev->xbutton.x;
@@ -305,16 +307,16 @@ static void feh_event_handle_ButtonPress(XEvent * ev)
winwidget_sanitise_offsets(winwid);
winwidget_render_image(winwid, 0, 0);
- } else if (feh_is_bb(&buttons.reload, button, state)) {
+ } else if (feh_is_bb(&keys.reload, button, state)) {
D(("Reload Button Press event\n"));
feh_reload_image(winwid, 0, 1);
- } else if (feh_is_bb(&buttons.prev, button, state)) {
+ } else if (feh_is_bb(&keys.prev, button, state)) {
D(("Prev Button Press event\n"));
if (winwid->type == WIN_TYPE_SLIDESHOW)
slideshow_change_image(winwid, SLIDE_PREV, 1);
- } else if (feh_is_bb(&buttons.next, button, state)) {
+ } else if (feh_is_bb(&keys.next, button, state)) {
D(("Next Button Press event\n"));
if (winwid->type == WIN_TYPE_SLIDESHOW)
slideshow_change_image(winwid, SLIDE_NEXT, 1);
@@ -328,8 +330,8 @@ static void feh_event_handle_ButtonPress(XEvent * ev)
static void feh_event_handle_ButtonRelease(XEvent * ev)
{
winwidget winwid = NULL;
- int state = ev->xbutton.state & (ControlMask | ShiftMask | Mod1Mask | Mod4Mask);
- int button = ev->xbutton.button;
+ unsigned int state = ev->xbutton.state & (ControlMask | ShiftMask | Mod1Mask | Mod4Mask);
+ unsigned int button = ev->xbutton.button;
if (menu_root) {
/* if menus are open, close them, and execute action if needed */
@@ -354,7 +356,7 @@ static void feh_event_handle_ButtonRelease(XEvent * ev)
return;
}
- if (feh_is_bb(&buttons.pan, button, state)) {
+ if (feh_is_bb(&keys.pan, button, state)) {
if (opt.mode == MODE_PAN) {
D(("Disabling pan mode\n"));
opt.mode = MODE_NORMAL;
@@ -392,13 +394,13 @@ static void feh_event_handle_ButtonRelease(XEvent * ev)
winwid->mode = MODE_NORMAL;
}
- } else if (feh_is_bb(&buttons.rotate, button, state)
- || feh_is_bb(&buttons.zoom, button, state)) {
+ } else if (feh_is_bb(&keys.rotate, button, state)
+ || feh_is_bb(&keys.zoom, button, state)) {
D(("Disabling mode\n"));
opt.mode = MODE_NORMAL;
winwid->mode = MODE_NORMAL;
- if ((feh_is_bb(&buttons.zoom, button, state))
+ if ((feh_is_bb(&keys.zoom, button, state))
&& (ev->xbutton.x == winwid->click_offset_x)
&& (ev->xbutton.y == winwid->click_offset_y)) {
winwid->zoom = 1.0;
@@ -408,7 +410,7 @@ static void feh_event_handle_ButtonRelease(XEvent * ev)
winwidget_render_image(winwid, 0, 0);
- } else if (feh_is_bb(&buttons.blur, button, state)) {
+ } else if (feh_is_bb(&keys.blur, button, state)) {
D(("Disabling Blur mode\n"));
opt.mode = MODE_NORMAL;
winwid->mode = MODE_NORMAL;
diff --git a/src/keyevents.c b/src/keyevents.c
index 4837c0b..61a6a0a 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -32,7 +32,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
fehkb keys;
-static void feh_set_kb(fehkey *key, int s0, int y0, int s1, int y1, int s2, int y2) {
+static void feh_set_kb(fehkey *key, unsigned int s0, unsigned int y0, unsigned
+ int s1, unsigned int y1, unsigned int s2, unsigned int y2) {
key->keystates[0] = s0;
key->keystates[1] = s1;
key->keystates[2] = s2;
@@ -131,7 +132,7 @@ void init_keyevents(void) {
feh_set_kb(&keys.action_9 , 0, XK_9 , 0, XK_KP_9 , 0, 0);
feh_set_kb(&keys.zoom_in , 0, XK_Up , 0, XK_KP_Add , 0, 0);
feh_set_kb(&keys.zoom_out , 0, XK_Down , 0, XK_KP_Subtract,0, 0);
- feh_set_kb(&keys.zoom_default, 0, XK_KP_Multiply, 0, XK_asterisk, 0, 0);
+ feh_set_kb(&keys.zoom_default, 0, XK_KP_Multiply, 0, XK_asterisk,0, 0);
feh_set_kb(&keys.zoom_fit , 0, XK_KP_Divide , 0, XK_slash , 0, 0);
feh_set_kb(&keys.size_to_image, 0, XK_w , 0, 0 , 0, 0);
feh_set_kb(&keys.render , 0, XK_KP_Begin , 0, XK_R , 0, 0);
@@ -328,7 +329,7 @@ void init_keyevents(void) {
fclose(conf);
}
-static short feh_is_kp(fehkey *key, int sym, int state) {
+static short feh_is_kp(fehkey *key, unsigned int sym, unsigned int state) {
int i;
for (i = 0; i < 3; i++) {
diff --git a/src/options.h b/src/options.h
index bbf129f..7440749 100644
--- a/src/options.h
+++ b/src/options.h
@@ -129,8 +129,10 @@ struct __fehoptions {
};
struct __fehkey {
- int keysyms[3];
- int keystates[3];
+ unsigned int keysyms[3];
+ unsigned int keystates[3];
+ unsigned int state;
+ unsigned int button;
};
struct __fehkb {
@@ -199,24 +201,14 @@ struct __fehkb {
struct __fehkey reload_minus;
struct __fehkey reload_plus;
struct __fehkey toggle_keep_vp;
-};
-
-struct __fehbutton {
- int modifier;
- char button;
-};
-
-struct __fehbb {
- struct __fehbutton pan;
- struct __fehbutton zoom;
- struct __fehbutton reload;
- struct __fehbutton prev;
- struct __fehbutton next;
- struct __fehbutton menu;
- struct __fehbutton blur;
- struct __fehbutton rotate;
- struct __fehbutton zoom_in;
- struct __fehbutton zoom_out;
+ struct __fehkey pan;
+ struct __fehkey zoom;
+ struct __fehkey reload;
+ struct __fehkey prev;
+ struct __fehkey next;
+ struct __fehkey menu;
+ struct __fehkey blur;
+ struct __fehkey rotate;
};
void init_parse_options(int argc, char **argv);
diff --git a/src/structs.h b/src/structs.h
index e1acf2d..3942bc0 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -36,7 +36,5 @@ typedef _winwidget *winwidget;
typedef struct __fehoptions fehoptions;
typedef struct __fehkey fehkey;
typedef struct __fehkb fehkb;
-typedef struct __fehbutton fehbutton;
-typedef struct __fehbb fehbb;
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-14 04:14:46 +0000