lxdream.org :: lxdream/src/display.h r1072:d82e04e6d497

filename	src/display.h
changeset	1072:d82e04e6d497
prev	1010:a506a2f66180
next	1076:18c164e8aec4
author	nkeynes
date	Tue Jul 21 20:33:21 2009 +1000 (14 years ago)
permissions	-rw-r--r--
last change	Heavy configuration management refactor - Configuration groups now take both an on_change event handler and a default keybinding handler, making most keybinding tasks quite simple - GUI configuration all merged into a unified model, drastically reducing the amount of GUI config code. Bonuses - OSX now has a hotkey preference pane - GTK keybinding editor is much more usable

file

annotate

diff

log

raw

     1.1 --- a/src/display.h	Sun Apr 12 02:04:27 2009 +0000
     1.2 +++ b/src/display.h	Tue Jul 21 20:33:21 2009 +1000
     1.3 @@ -27,6 +27,7 @@
     1.4  #include <glib.h>
     1.5  #include "lxdream.h"
     1.6  #include "gettext.h"
     1.7 +#include "config.h"
     1.8  #ifdef APPLE_BUILD
     1.9  #include <OpenGL/gl.h>
    1.10  #include <OpenGL/glext.h>
    1.11 @@ -230,7 +231,7 @@
    1.12  /* Pressure is 0..127  (allowing a joystick to be defined as two half-axes of 7- bits each) */
    1.13  #define MAX_PRESSURE 0x7F
    1.14  
    1.15 -typedef void (*input_key_callback_t)( void *data, uint32_t value, uint32_t pressure, gboolean isKeyDown );
    1.16 +typedef key_binding_t input_key_callback_t;
    1.17  
    1.18  /**
    1.19   * Callback to receive mouse input events
    1.20 @@ -252,6 +253,11 @@
    1.21  void input_unregister_key( const gchar *keysym, input_key_callback_t callback,
    1.22                             void *data, uint32_t value );
    1.23  
    1.24 +gboolean input_register_keygroup( lxdream_config_group_t group );
    1.25 +void input_unregister_keygroup( lxdream_config_group_t group );
    1.26 +gboolean input_keygroup_changed( void *data, lxdream_config_group_t group, unsigned key,
    1.27 +                             const gchar *oldval, const gchar *newval );
    1.28 +
    1.29  /**
    1.30   * Register a hook to receive all keyboard input events
    1.31   */