diff options
| author | jacob1 <jfu614@gmail.com> | 2012-07-23 16:10:54 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-02 13:26:44 (GMT) |
| commit | daeddd551969e3546c2870de59f4e2c8fbdf6786 (patch) | |
| tree | 00681a1f55f9d8ebcb51b2a24d8c8a9393fc7117 /includes | |
| parent | 23f9de6f811550a0cf5091b0415f141ee04e9ddb (diff) | |
| download | powder-daeddd551969e3546c2870de59f4e2c8fbdf6786.zip powder-daeddd551969e3546c2870de59f4e2c8fbdf6786.tar.gz | |
move some key stuff out of sdl_poll, zoom won't be triggered even when disabled by lua now
Conflicts:
src/interface.c
src/main.c
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/interface.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/includes/interface.h b/includes/interface.h index 478273a..1437c5f 100644 --- a/includes/interface.h +++ b/includes/interface.h @@ -196,7 +196,7 @@ typedef struct ui_richtext ui_richtext; int SLALT; extern SDLMod sdl_mod; -extern int sdl_key, sdl_rkey, sdl_wheel, sdl_caps, sdl_ascii, sdl_zoom_trig; +extern int sdl_key, sdl_rkey, sdl_wheel, sdl_ascii, sdl_zoom_trig; #if (defined(LIN32) || defined(LIN64)) && defined(SDL_VIDEO_DRIVER_X11) extern SDL_SysWMinfo sdl_wminfo; extern Atom XA_CLIPBOARD, XA_TARGETS; @@ -319,6 +319,8 @@ int color_menu_ui(pixel *vid_buf, int i, int *cr, int *cg, int *cb, int b, int b int sdl_poll(void); +void stickmen_keys(); + void set_cmode(int cm); char *download_ui(pixel *vid_buf, char *uri, int *len); |