frame-mtdev.h | frame-mtdev.h | |||
---|---|---|---|---|
skipping to change at line 22 | skipping to change at line 22 | |||
* This program is distributed in the hope that it will be useful, but | * This program is distributed in the hope that it will be useful, but | |||
* WITHOUT ANY WARRANTY; without even the implied warranty of | * WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |||
* General Public License for more details. | * General Public License for more details. | |||
* | * | |||
* You should have received a copy of the GNU General Public License along | * You should have received a copy of the GNU General Public License along | |||
* with this program. If not, see <http://www.gnu.org/licenses/>. | * with this program. If not, see <http://www.gnu.org/licenses/>. | |||
* | * | |||
************************************************************************** **/ | ************************************************************************** **/ | |||
#ifndef _UTOUCH_FRAME_MTDEV_H | #ifndef UTOUCH_FRAME_MTDEV_H | |||
#define _UTOUCH_FRAME_MTDEV_H | #define UTOUCH_FRAME_MTDEV_H | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
extern "C" { | extern "C" { | |||
#endif | #endif | |||
#define MTDEV_NO_LEGACY_API | #define MTDEV_NO_LEGACY_API | |||
#include <utouch/frame.h> | #include <utouch/frame.h> | |||
#include <evemu.h> | #include <evemu.h> | |||
#include <mtdev.h> | #include <mtdev.h> | |||
End of changes. 1 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
frame.h | frame.h | |||
---|---|---|---|---|
skipping to change at line 22 | skipping to change at line 22 | |||
* This program is distributed in the hope that it will be useful, but | * This program is distributed in the hope that it will be useful, but | |||
* WITHOUT ANY WARRANTY; without even the implied warranty of | * WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |||
* General Public License for more details. | * General Public License for more details. | |||
* | * | |||
* You should have received a copy of the GNU General Public License along | * You should have received a copy of the GNU General Public License along | |||
* with this program. If not, see <http://www.gnu.org/licenses/>. | * with this program. If not, see <http://www.gnu.org/licenses/>. | |||
* | * | |||
************************************************************************** **/ | ************************************************************************** **/ | |||
#ifndef _UTOUCH_FRAME_H | #ifndef UTOUCH_FRAME_H | |||
#define _UTOUCH_FRAME_H | #define UTOUCH_FRAME_H | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
extern "C" { | extern "C" { | |||
#endif | #endif | |||
#include <stdint.h> | #include <stdint.h> | |||
#define UTOUCH_FRAME_VERSION 0x00001010 | #define UTOUCH_FRAME_VERSION 0x00001010 | |||
/** | /** | |||
skipping to change at line 97 | skipping to change at line 97 | |||
float min_y; | float min_y; | |||
float max_x; | float max_x; | |||
float max_y; | float max_y; | |||
float max_pressure; | float max_pressure; | |||
float max_orient; | float max_orient; | |||
float mapped_min_x; | float mapped_min_x; | |||
float mapped_min_y; | float mapped_min_y; | |||
float mapped_max_x; | float mapped_max_x; | |||
float mapped_max_y; | float mapped_max_y; | |||
float mapped_max_pressure; | float mapped_max_pressure; | |||
unsigned int min_id; | ||||
unsigned int max_id; | ||||
}; | }; | |||
#define UTOUCH_TOOL_FINGER 0 | #define UTOUCH_TOOL_FINGER 0 | |||
#define UTOUCH_TOOL_PEN 1 | #define UTOUCH_TOOL_PEN 1 | |||
/** | /** | |||
* struct utouch_contact - surface contact details | * struct utouch_contact - surface contact details | |||
* @prev: pointer to same slot of previous frame | * @prev: pointer to same slot of previous frame | |||
* @active: currently in use | * @active: currently in use | |||
* @slot: slot occupied by this contact | * @slot: slot occupied by this contact | |||
skipping to change at line 132 | skipping to change at line 134 | |||
* size, but will remain binary compatible with older versions. | * size, but will remain binary compatible with older versions. | |||
* | * | |||
* Contact structures are connected into one ring per slot. The | * Contact structures are connected into one ring per slot. The | |||
* previous contact pointers are ABI agnostic, owned by the engine, | * previous contact pointers are ABI agnostic, owned by the engine, | |||
* and have engine scope. | * and have engine scope. | |||
*/ | */ | |||
struct utouch_contact { | struct utouch_contact { | |||
const struct utouch_contact *prev; | const struct utouch_contact *prev; | |||
int active; | int active; | |||
int slot; | int slot; | |||
int id; | unsigned int id; | |||
int tool_type; | int tool_type; | |||
float x; | float x; | |||
float y; | float y; | |||
float touch_major; | float touch_major; | |||
float touch_minor; | float touch_minor; | |||
float width_major; | float width_major; | |||
float width_minor; | float width_minor; | |||
float orientation; | float orientation; | |||
float pressure; | float pressure; | |||
float distance; | float distance; | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 5 lines changed or added | |||