Cleanup keyb.h file.

This commit is contained in:
QC 2015-05-02 12:21:54 +02:00
parent 493801602a
commit 9492fe7611
2 changed files with 40 additions and 20 deletions

View file

@ -27,26 +27,26 @@ typedef enum _KeyBindingAction
} KeyBindingAction;
typedef struct _KeyBinding
{
unsigned int modmask;
KeySym keysym;
} KeyBinding;
typedef struct _ActionBindingEntry
{
const char *name;
char *keystr;
int num_bindings;
KeyBinding *kb;
} ActionBindingEntry;
/**
* Parse the keybindings.
* This should be called after the setting system is initialized.
*/
void parse_keys_abe ( void );
/**
* Setup the keybindings
* This adds all the entries to the settings system.
*/
void setup_abe ( void );
/**
* Cleanup.
*/
void cleanup_abe ( void );
extern ActionBindingEntry abe[NUM_ABE];
/**
* Check if this key has been triggered.
* @returns TRUE if key combo matches, FALSE otherwise.
*/
int abe_test_action ( KeyBindingAction action, unsigned int mask, KeySym key );
#endif // __KEYB_H__

View file

@ -3,10 +3,22 @@
#include "x11-helper.h"
#include "xrmoptions.h"
ActionBindingEntry abe[NUM_ABE];
// Use this so we can ignore numlock mask.
// TODO: maybe use something smarter here..
extern unsigned int NumlockMask;
typedef struct _KeyBinding
{
unsigned int modmask;
KeySym keysym;
} KeyBinding;
typedef struct _ActionBindingEntry
{
const char *name;
char *keystr;
int num_bindings;
KeyBinding *kb;
} ActionBindingEntry;
typedef struct _DefaultBinding
{
@ -15,6 +27,14 @@ typedef struct _DefaultBinding
char *keybinding;
} DefaultBinding;
ActionBindingEntry abe[NUM_ABE];
// Use this so we can ignore numlock mask.
// TODO: maybe use something smarter here..
extern unsigned int NumlockMask;
/**
* LIST OF DEFAULT SETTINGS
*/
DefaultBinding bindings[NUM_ABE] =
{
{