summaryrefslogtreecommitdiff
path: root/src/options.h
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2011-09-28 22:02:44 +0200
committerDaniel Friesel <derf@finalrewind.org>2011-09-28 22:02:44 +0200
commitb58c46189cdb81eeac8796eb99e32f13c55fe95d (patch)
tree7f11ce961bc58509da68ec35a1835dda607d43e7 /src/options.h
parent9c5b74ae8e8fc758a949263d218949cfd33d8974 (diff)
Use buttons config instead of button options
Diffstat (limited to 'src/options.h')
-rw-r--r--src/options.h30
1 files changed, 16 insertions, 14 deletions
diff --git a/src/options.h b/src/options.h
index ae3a707..f1fe3c4 100644
--- a/src/options.h
+++ b/src/options.h
@@ -92,20 +92,6 @@ struct __fehoptions {
gib_style *menu_style_l;
- unsigned char pan_button;
- unsigned char zoom_button;
- unsigned char menu_button;
- unsigned char menu_ctrl_mask;
- unsigned char prev_button;
- unsigned char next_button;
-
- unsigned char rotate_button;
- unsigned char blur_button;
- unsigned char reload_button;
- unsigned char no_rotate_ctrl_mask;
- unsigned char no_blur_ctrl_mask;
- unsigned char no_pan_ctrl_mask;
-
int force_aliasing;
int thumb_w;
int thumb_h;
@@ -199,6 +185,22 @@ struct __fehkb {
struct __fehkey reload_plus;
};
+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;
+};
+
void init_parse_options(int argc, char **argv);
char *feh_string_normalize(char *str);