Commit ebd36c74 authored by Peter Hutterer's avatar Peter Hutterer

Move synaptics.h leftovers to synapticsstr.h, drop synaptics.h

This leaves us with a duplicated define for the maxbuttons but I'll live
with that for now.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
Acked-by: default avatarChase Douglas <chase.douglas@canonical.com>
parent 3430f4af
......@@ -18,4 +18,4 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
sdk_HEADERS = synaptics.h synaptics-properties.h
sdk_HEADERS = synaptics-properties.h
/*
* Permission to use, copy, modify, distribute, and sell this software
* and its documentation for any purpose is hereby granted without
* fee, provided that the above copyright notice appear in all copies
* and that both that copyright notice and this permission notice
* appear in supporting documentation, and that the name of Red Hat
* not be used in advertising or publicity pertaining to distribution
* of the software without specific, written prior permission. Red
* Hat makes no representations about the suitability of this software
* for any purpose. It is provided "as is" without express or implied
* warranty.
*
* THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
* NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#ifndef _SYNAPTICS_H_
#define _SYNAPTICS_H_
#include <X11/Xdefs.h>
/******************************************************************************
* Public definitions.
* Used by driver and the shared memory configurator
*****************************************************************************/
typedef enum {
RT_TAP = 0, /* Right top corner */
RB_TAP, /* Right bottom corner */
LT_TAP, /* Left top corner */
LB_TAP, /* Left bottom corner */
F1_TAP, /* Non-corner tap, one finger */
F2_TAP, /* Non-corner tap, two fingers */
F3_TAP, /* Non-corner tap, three fingers */
MAX_TAP
} TapEvent;
typedef enum {
F1_CLICK1 = 0, /* Click left, one finger */
F2_CLICK1, /* Click left, two fingers */
F3_CLICK1, /* Click left, three fingers */
MAX_CLICK
} ClickFingerEvent;
#define SYN_MAX_BUTTONS 12 /* Max number of mouse buttons */
#endif /* _SYNAPTICS_H_ */
......@@ -34,7 +34,6 @@
#include <xorg-server.h>
#include "synproto.h"
#include "synaptics.h"
#include "synapticsstr.h"
#include "ps2comm.h"
#include <xf86.h>
......
......@@ -39,7 +39,6 @@
#include <string.h>
#include <stdio.h>
#include "synproto.h"
#include "synaptics.h"
#include "synapticsstr.h"
#include <xf86.h>
#include <mtdev.h>
......
......@@ -35,7 +35,6 @@
#include <xf86Xinput.h>
#include <exevents.h>
#include "synaptics.h"
#include "synapticsstr.h"
#include "synaptics-properties.h"
......
......@@ -38,7 +38,6 @@
#include <xorg-server.h>
#include "synproto.h"
#include "synaptics.h"
#include "synapticsstr.h"
#include "ps2comm.h"
#include <xf86.h>
......
......@@ -45,7 +45,6 @@
#include <errno.h>
#include <string.h>
#include "synproto.h"
#include "synaptics.h"
#include "synapticsstr.h"
#include "ps2comm.h" /* ps2_print_ident() */
#include <xf86.h>
......
......@@ -74,7 +74,6 @@
#include <xserver-properties.h>
#include <ptrveloc.h>
#include "synaptics.h"
#include "synapticsstr.h"
#include "synaptics-properties.h"
......
......@@ -46,6 +46,26 @@
*****************************************************************************/
#define SYNAPTICS_MOVE_HISTORY 5
#define SYNAPTICS_MAX_TOUCHES 10
#define SYN_MAX_BUTTONS 12 /* Max number of mouse buttons */
typedef enum {
RT_TAP = 0, /* Right top corner */
RB_TAP, /* Right bottom corner */
LT_TAP, /* Left top corner */
LB_TAP, /* Left bottom corner */
F1_TAP, /* Non-corner tap, one finger */
F2_TAP, /* Non-corner tap, two fingers */
F3_TAP, /* Non-corner tap, three fingers */
MAX_TAP
} TapEvent;
typedef enum {
F1_CLICK1 = 0, /* Click left, one finger */
F2_CLICK1, /* Click left, two fingers */
F3_CLICK1, /* Click left, three fingers */
MAX_CLICK
} ClickFingerEvent;
typedef struct _SynapticsMoveHist {
int x, y;
......
......@@ -22,7 +22,6 @@
*/
#include "synproto.h"
#include "synaptics.h"
#include "synapticsstr.h"
static int
......
......@@ -31,7 +31,6 @@
#include <stdio.h>
#include <assert.h>
#include "synaptics.h"
#include "synapticsstr.h"
#include "eventcomm.h"
......
......@@ -43,13 +43,14 @@
#include <X11/Xatom.h>
#include <X11/extensions/XI.h>
#include <X11/extensions/XInput.h>
#include "synaptics.h"
#include "synaptics-properties.h"
#ifndef XATOM_FLOAT
#define XATOM_FLOAT "FLOAT"
#endif
#define SYN_MAX_BUTTONS 12
union flong { /* Xlibs 64-bit property handling madness */
long l;
float f;
......
......@@ -45,7 +45,6 @@
#include <sys/time.h>
#include <sys/stat.h>
#include "synaptics.h"
#include "synaptics-properties.h"
typedef enum {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment