diff options
| author | Peter Osterlund <petero2@telia.com> | 2003-05-02 01:12:03 +0200 |
|---|---|---|
| committer | Peter Osterlund <petero2@telia.com> | 2006-04-09 04:00:53 +0200 |
| commit | 826b2136b226d29017271b7c098179f04c6c51b3 (patch) | |
| tree | f6e85b36622cdd1d87226654f2d7f38f5add797e /synaptics.h | |
| parent | 5b1ecfe525fca8deea1b5d742a929d7f900b60cc (diff) | |
Build improvements.
* Build synclient by default.
* Made it possible to build synclient even if an X source tree is not
available.
* Added Makefile dependencies so that things get recompiled when a
header file is changed.
* synclient.c now includes synaptics.h instead of duplicating the
shared memory segment definitions.
Diffstat (limited to 'synaptics.h')
| -rw-r--r-- | synaptics.h | 46 |
1 files changed, 28 insertions, 18 deletions
diff --git a/synaptics.h b/synaptics.h index d8df12f..2e6ebae 100644 --- a/synaptics.h +++ b/synaptics.h @@ -1,25 +1,13 @@ -#ifndef _SAMPLE_H_ -#define _SAMPLE_H_ +#ifndef _SYNAPTICS_H_ +#define _SYNAPTICS_H_ /****************************************************************************** - * Definitions - * structs, typedefs, #defines, enums + * Public definitions. + * Used by driver and the shared memory configurator *****************************************************************************/ -#define SYNAPTICS_MOVE_HISTORY 5 #define SHM_SYNAPTICS 23947 - -typedef struct _SynapticsTapRec -{ - int x, y; - unsigned int packet; -} SynapticsTapRec; - -typedef struct _SynapticsMoveHist +typedef struct _SynapticsSHM { - int x, y; -} SynapticsMoveHistRec; - -typedef struct _SynapticsSHM { /* Current device state */ int x, y; /* actual x, y Coordinates */ int z; /* pressure value */ @@ -47,6 +35,24 @@ typedef struct _SynapticsSHM { Bool updown_button_scrolling; /* Up/Down-Button scrolling or middle/double-click */ } SynapticsSHM, *SynapticsSHMPtr; +#ifdef SYNAPTICS_PRIVATE +/****************************************************************************** + * Definitions + * structs, typedefs, #defines, enums + *****************************************************************************/ +#define SYNAPTICS_MOVE_HISTORY 5 + +typedef struct _SynapticsTapRec +{ + int x, y; + unsigned int packet; +} SynapticsTapRec; + +typedef struct _SynapticsMoveHist +{ + int x, y; +} SynapticsMoveHistRec; + typedef struct _SynapticsPrivateRec { /* shared memory pointer */ @@ -107,10 +113,14 @@ static Bool DeviceOff(DeviceIntPtr); static Bool DeviceInit(DeviceIntPtr); static Bool SynapticsGetPacket(LocalDevicePtr, SynapticsPrivatePtr); static void PrintIdent(SynapticsPrivatePtr); + +#endif + + /* * DO NOT PUT ANYTHING AFTER THIS ENDIF */ -#endif +#endif /* _SYNAPTICS_H_ */ /* Local Variables: */ /* tab-width: 4 */ |