callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

put BTN_{WHEEL,GEAR_DOWN,GEAR_UP} usage in #ifdefs, since pre-2.6 kernels

Browse Source 
2004-06-16  Manish Singh  <yosh@gimp.org>

        * modules/controller_linux_input.c: put BTN_{WHEEL,GEAR_DOWN,GEAR_UP}
        usage in #ifdefs, since pre-2.6 kernels do not have them.

        * modules/controller_linux_input.c (linux_input_read_event): n_bytes
        should be a gsize.
This commit is contained in:
Manish Singh
2004-06-16 23:37:38 +00:00
committed by Manish Singh
parent ed891b72db
commit efe3ff1b91
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2004-06-16 Manish Singh <yosh@gimp.org>
* modules/controller_linux_input.c: put BTN_{WHEEL,GEAR_DOWN,GEAR_UP}
usage in #ifdefs, since pre-2.6 kernels do not have them.
* modules/controller_linux_input.c (linux_input_read_event): n_bytes
should be a gsize.
2004-06-16 Michael Natterer <mitch@gimp.org> 2004-06-16 Michael Natterer <mitch@gimp.org>
* app/actions/context-actions.c * app/actions/context-actions.c

8
modules/controller_linux_input.c
View File

@ -67,9 +67,15 @@ static const LinuxInputEvent key_events[] =
{ BTN_EXTRA, "button-extra", N_("Button Extra") }, { BTN_EXTRA, "button-extra", N_("Button Extra") },
{ BTN_FORWARD, "button-forward", N_("Button Forward") }, { BTN_FORWARD, "button-forward", N_("Button Forward") },
{ BTN_BACK, "button-back", N_("Button Forward") }, { BTN_BACK, "button-back", N_("Button Forward") },
#ifdef BTN_WHEEL
{ BTN_WHEEL, "button-wheel", N_("Button Wheel") }, { BTN_WHEEL, "button-wheel", N_("Button Wheel") },
#endif
#ifdef BTN_GEAR_DOWN
{ BTN_GEAR_DOWN, "button-gear-down", N_("Button Gear Down") }, { BTN_GEAR_DOWN, "button-gear-down", N_("Button Gear Down") },
#endif
#ifdef BTN_GEAR_UP
{ BTN_GEAR_UP, "button-gear-up", N_("Button Gear Up") } { BTN_GEAR_UP, "button-gear-up", N_("Button Gear Up") }
#endif
}; };
static const LinuxInputEvent rel_events[] = static const LinuxInputEvent rel_events[] =
@ -378,7 +384,7 @@ linux_input_read_event (GIOChannel *io,
gpointer data) gpointer data)
{ {
struct input_event ev; struct input_event ev;
gint n_bytes; gsize n_bytes;
gint i; gint i;
if (g_io_channel_read_chars (io, if (g_io_channel_read_chars (io,