Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

keybinding: store in globalconf 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-10-31 17:08:32 +01:00
parent 5613bac3d3
commit 8d1120d096
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
keybinding.c
View File

@ -24,17 +24,9 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include "structs.h" #include "structs.h"
#include "keybinding.h"
ARRAY_TYPE(keybinding_t *, keybinding)
extern awesome_t globalconf; extern awesome_t globalconf;
static struct {
keybinding_array_t by_code;
keybinding_array_t by_sym;
} keys_g;
static void static void
keybinding_delete(keybinding_t **kbp) keybinding_delete(keybinding_t **kbp)
{ {
@ -136,7 +128,7 @@ window_root_ungrabkey(keybinding_t *k)
static void static void
keybinding_register_root(keybinding_t *k) keybinding_register_root(keybinding_t *k)
{ {
keybinding_array_t *arr = k->keysym ? &keys_g.by_sym : &keys_g.by_code; keybinding_array_t *arr = k->keysym ? &globalconf.keys.by_sym : &globalconf.keys.by_code;
int l = 0, r = arr->len; int l = 0, r = arr->len;
keybinding_ref(&k); keybinding_ref(&k);
@ -164,7 +156,7 @@ keybinding_register_root(keybinding_t *k)
static void static void
keybinding_unregister_root(keybinding_t **k) keybinding_unregister_root(keybinding_t **k)
{ {
keybinding_array_t *arr = (*k)->keysym ? &keys_g.by_sym : &keys_g.by_code; keybinding_array_t *arr = (*k)->keysym ? &globalconf.keys.by_sym : &globalconf.keys.by_code;
int l = 0, r = arr->len; int l = 0, r = arr->len;
while (l < r) { while (l < r) {
@ -261,7 +253,7 @@ key_getkeysym(xcb_keycode_t detail, uint16_t state)
keybinding_t * keybinding_t *
keybinding_find(const xcb_key_press_event_t *ev) keybinding_find(const xcb_key_press_event_t *ev)
{ {
const keybinding_array_t *arr = &keys_g.by_sym; const keybinding_array_t *arr = &globalconf.keys.by_sym;
int l, r, mod = XUTIL_MASK_CLEAN(ev->state); int l, r, mod = XUTIL_MASK_CLEAN(ev->state);
xcb_keysym_t keysym; xcb_keysym_t keysym;
@ -286,9 +278,9 @@ keybinding_find(const xcb_key_press_event_t *ev)
break; break;
} }
} }
if (arr != &keys_g.by_code) if (arr != &globalconf.keys.by_code)
{ {
arr = &keys_g.by_code; arr = &globalconf.keys.by_code;
goto again; goto again;
} }
return NULL; return NULL;

3
keybinding.h
View File

@ -24,6 +24,7 @@
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include "luaa.h" #include "luaa.h"
#include "common/array.h"
typedef struct keybinding_t typedef struct keybinding_t
{ {
@ -39,6 +40,8 @@ typedef struct keybinding_t
luaA_ref fct; luaA_ref fct;
} keybinding_t; } keybinding_t;
ARRAY_TYPE(keybinding_t *, keybinding)
keybinding_t *keybinding_find(const xcb_key_press_event_t *); keybinding_t *keybinding_find(const xcb_key_press_event_t *);
xcb_keysym_t key_getkeysym(xcb_keycode_t, uint16_t); xcb_keysym_t key_getkeysym(xcb_keycode_t, uint16_t);

7
structs.h
View File

@ -28,6 +28,7 @@
#include "luaa.h" #include "luaa.h"
#include "layout.h" #include "layout.h"
#include "swindow.h" #include "swindow.h"
#include "keybinding.h"
#include "common/xutil.h" #include "common/xutil.h"
#include "common/xembed.h" #include "common/xembed.h"
#include "common/refcount.h" #include "common/refcount.h"
@ -303,6 +304,12 @@ struct awesome_t
int nscreen; int nscreen;
/** True if xinerama is active */ /** True if xinerama is active */
bool xinerama_is_active; bool xinerama_is_active;
/** Key bindings */
struct
{
keybinding_array_t by_code;
keybinding_array_t by_sym;
} keys;
/** Mouse bindings list */ /** Mouse bindings list */
button_array_t buttons; button_array_t buttons;
/** Numlock mask */ /** Numlock mask */