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

Hide keybidings_t away, subsequent simplifications 2/2 

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Pierre Habouzit 2008-06-30 22:49:11 +02:00 committed by Julien Danjou
parent 3a7dd8c715
commit 5798ef0594
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
keybinding.c
View File

@ -23,24 +23,31 @@
/* XStringToKeysym() */ /* XStringToKeysym() */
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include "structs.h"
#include "common/refcount.h"
#include "common/array.h"
#include "keybinding.h" #include "keybinding.h"
#include "window.h"
ARRAY_TYPE(keybinding_t *, keybinding);
extern awesome_t globalconf; extern awesome_t globalconf;
static struct { static struct {
keybinding_array_t by_code; keybinding_array_t by_code;
keybinding_array_t by_sym; keybinding_array_t by_sym;
} keys; } keys_g;
DO_LUA_NEW(static, keybinding_t, keybinding, "keybinding", keybinding_ref) static void keybinding_delete(keybinding_t **kbp)
DO_LUA_GC(keybinding_t, keybinding, "keybinding", keybinding_unref)
void keybinding_delete(keybinding_t **kbp)
{ {
luaL_unref(globalconf.L, LUA_REGISTRYINDEX, (*kbp)->fct); luaL_unref(globalconf.L, LUA_REGISTRYINDEX, (*kbp)->fct);
p_delete(kbp); p_delete(kbp);
} }
DO_RCNT(keybinding_t, keybinding, keybinding_delete)
ARRAY_FUNCS(keybinding_t *, keybinding, keybinding_unref)
DO_LUA_NEW(static, keybinding_t, keybinding, "keybinding", keybinding_ref)
DO_LUA_GC(keybinding_t, keybinding, "keybinding", keybinding_unref)
static int static int
keybinding_ev_cmp(xcb_keysym_t keysym, xcb_keycode_t keycode, keybinding_ev_cmp(xcb_keysym_t keysym, xcb_keycode_t keycode,
unsigned long mod, const keybinding_t *k) unsigned long mod, const keybinding_t *k)
@ -126,10 +133,10 @@ window_root_ungrabkey(keybinding_t *k)
&& phys_screen < globalconf.screens_info->nscreen); && phys_screen < globalconf.screens_info->nscreen);
} }
void static void
keybinding_register_root(keybinding_t *k) keybinding_register_root(keybinding_t *k)
{ {
keybinding_array_t *arr = k->keysym ? &keys.by_sym : &keys.by_code; keybinding_array_t *arr = k->keysym ? &keys_g.by_sym : &keys_g.by_code;
int l = 0, r = arr->len; int l = 0, r = arr->len;
keybinding_ref(&k); keybinding_ref(&k);
@ -154,10 +161,10 @@ keybinding_register_root(keybinding_t *k)
window_root_grabkey(k); window_root_grabkey(k);
} }
void static void
keybinding_unregister_root(keybinding_t **k) keybinding_unregister_root(keybinding_t **k)
{ {
keybinding_array_t *arr = (*k)->keysym ? &keys.by_sym : &keys.by_code; keybinding_array_t *arr = (*k)->keysym ? &keys_g.by_sym : &keys_g.by_code;
int l = 0, r = arr->len; int l = 0, r = arr->len;
while (l < r) { while (l < r) {
@ -181,7 +188,7 @@ keybinding_unregister_root(keybinding_t **k)
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.by_sym; const keybinding_array_t *arr = &keys_g.by_sym;
int l, r, mod = CLEANMASK(ev->state); int l, r, mod = CLEANMASK(ev->state);
xcb_keysym_t keysym; xcb_keysym_t keysym;
@ -203,8 +210,8 @@ keybinding_find(const xcb_key_press_event_t *ev)
break; break;
} }
} }
if (arr != &keys.by_code) { if (arr != &keys_g.by_code) {
arr = &keys.by_code; arr = &keys_g.by_code;
goto again; goto again;
} }
return NULL; return NULL;

13
keybinding.h
View File

@ -24,14 +24,8 @@
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include "lua.h" #include "lua.h"
#include "common/refcount.h"
#include "common/array.h"
/** Keys bindings */ typedef struct keybinding_t
typedef struct keybinding_t keybinding_t;
ARRAY_TYPE(struct keybinding_t *, keybinding);
struct keybinding_t
{ {
/** Ref count */ /** Ref count */
int refcount; int refcount;
@ -43,11 +37,8 @@ struct keybinding_t
xcb_keycode_t keycode; xcb_keycode_t keycode;
/** Lua function to execute. */ /** Lua function to execute. */
luaA_function fct; luaA_function fct;
}; } keybinding_t;
void keybinding_delete(keybinding_t **);
DO_RCNT(keybinding_t, keybinding, keybinding_delete)
ARRAY_FUNCS(keybinding_t *, keybinding, keybinding_unref)
keybinding_t *keybinding_find(const xcb_key_press_event_t *); keybinding_t *keybinding_find(const xcb_key_press_event_t *);
#endif #endif