Search
lxdream.org :: lxdream/src/drivers/video_gtk.c :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename src/drivers/video_gtk.c
changeset 614:a2d239d4438a
prev609:41b61a0d5f1a
next620:d9b28f78b952
author nkeynes
date Mon Jan 28 02:38:09 2008 +0000 (11 years ago)
permissions -rw-r--r--
last change Bug #49: Joystick support work in progress
file annotate diff log raw
1.1 --- a/src/drivers/video_gtk.c Sat Jan 26 03:11:56 2008 +0000
1.2 +++ b/src/drivers/video_gtk.c Mon Jan 28 02:38:09 2008 +0000
1.3 @@ -36,11 +36,12 @@
1.4 void video_gtk_shutdown();
1.5 gboolean video_gtk_display_blank( uint32_t colour );
1.6 uint16_t video_gtk_resolve_keysym( const gchar *keysym );
1.7 -uint16_t video_gtk_keycode_to_dckeysym(uint32_t keycode);
1.8 +uint16_t video_gtk_keycode_to_dckeysym(uint16_t keycode);
1.9
1.10 struct display_driver display_gtk_driver = { "gtk", video_gtk_init, video_gtk_shutdown,
1.11 video_gtk_resolve_keysym,
1.12 video_gtk_keycode_to_dckeysym,
1.13 + NULL,
1.14 NULL, NULL, NULL, NULL, NULL,
1.15 video_gtk_display_blank, NULL };
1.16
1.17 @@ -71,7 +72,7 @@
1.18 return TRUE;
1.19 }
1.20
1.21 -uint16_t video_gtk_keycode_to_dckeysym(uint32_t keycode)
1.22 +uint16_t video_gtk_keycode_to_dckeysym(uint16_t keycode)
1.23 {
1.24 if( keycode >= 'a' && keycode <= 'z' ) {
1.25 return (keycode - 'a') + DCKB_A;
1.26 @@ -170,6 +171,9 @@
1.27 ! video_glx_init_driver( &display_gtk_driver ) ) {
1.28 return FALSE;
1.29 }
1.30 +#ifdef HAVE_LINUX_JOYSTICK
1.31 + linux_joystick_init();
1.32 +#endif
1.33 return TRUE;
1.34 }
1.35
.