From 1e8006eadc7500c21d2bf18725f5841ed2b93b08 Mon Sep 17 00:00:00 2001 From: Daniel Carl <danielcarl@gmx.de> Date: Sun, 16 Dec 2012 00:08:34 +0100 Subject: [PATCH] Moved key event related macros to main.h. So we can access them in every files that uses keypress event handlers. --- src/keybind.h | 4 ---- src/main.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/keybind.h b/src/keybind.h index 03a2001..ef9db09 100644 --- a/src/keybind.h +++ b/src/keybind.h @@ -20,10 +20,6 @@ #ifndef KEYBIND_H #define KEYBIND_H -#define IS_ESCAPE_KEY(k, s) ((k == GDK_Escape && s == 0) || (k == GDK_c && s == GDK_CONTROL_MASK)) -#define CLEAN_STATE_WITH_SHIFT(e) ((e)->state & (GDK_MOD1_MASK|GDK_MOD4_MASK|GDK_SHIFT_MASK|GDK_CONTROL_MASK)) -#define CLEAN_STATE(e) ((e)->state & (GDK_MOD1_MASK|GDK_MOD4_MASK|GDK_CONTROL_MASK)) - #include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms-compat.h> diff --git a/src/main.h b/src/main.h index f64b4e9..7329ace 100644 --- a/src/main.h +++ b/src/main.h @@ -48,6 +48,10 @@ #define GET_CLEAN_MODE() (CLEAN_MODE(vp.state.mode)) #define CLEAR_INPUT() (vp_echo(VP_MSG_NORMAL, "")) +#define IS_ESCAPE_KEY(k, s) ((k == GDK_Escape && s == 0) || (k == GDK_c && s == GDK_CONTROL_MASK)) +#define CLEAN_STATE_WITH_SHIFT(e) ((e)->state & (GDK_MOD1_MASK|GDK_MOD4_MASK|GDK_SHIFT_MASK|GDK_CONTROL_MASK)) +#define CLEAN_STATE(e) ((e)->state & (GDK_MOD1_MASK|GDK_MOD4_MASK|GDK_CONTROL_MASK)) + #ifdef HAS_GTK3 #define VpColor GdkRGBA #define VP_COLOR_PARSE(color, string) (gdk_rgba_parse(color, string)) -- 2.20.1