diff options
| author |  keis <keijser@gmail.com> | 2011-07-28 22:31:30 +0200 |
|---|---|---|
| committer | keis <keijser@gmail.com> | 2011-07-28 22:31:30 +0200 |
| commit | db61f092140205e71f40fb14dc98a1e650c7e527 (patch) | |
| tree | 6a2459ae08c6baa4875b1db226dc7eb615a3cd3c /src/events.c | |
| parent | 1e20430333aee952f55f6caec4d55238a0160bf9 (diff) | |
| parent | e035f6f991fdbe9862a72fba6e8d348dcc25532f (diff) | |
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into mouse-events
Diffstat (limited to 'src/events.c')
| -rw-r--r-- | src/events.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/events.c b/src/events.c index 2da3e38..45140c0 100644 --- a/src/events.c +++ b/src/events.c @@ -6,8 +6,7 @@ #include "uzbl-core.h" #include "events.h" #include "util.h" - -UzblCore uzbl; +#include "type.h" /* Event id to name mapping * Event names must be in the same @@ -54,7 +53,9 @@ const char *event_table[LAST_EVENT] = { "DOWNLOAD_PROGRESS", "DOWNLOAD_COMPLETE", "ADD_COOKIE" , - "DELETE_COOKIE" + "DELETE_COOKIE" , + "FOCUS_ELEMENT" , + "BLUR_ELEMENT" }; void @@ -217,8 +218,10 @@ get_modifier_mask(guint state) { g_string_append(modifiers, "Ctrl|"); if(state & GDK_MOD1_MASK) g_string_append(modifiers,"Mod1|"); + /* Mod2 is usually Num_Luck. Ignore it as it messes up keybindings. if(state & GDK_MOD2_MASK) g_string_append(modifiers,"Mod2|"); + */ if(state & GDK_MOD3_MASK) g_string_append(modifiers,"Mod3|"); if(state & GDK_MOD4_MASK) |