andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move pointOnScreen to inpututils.c

Browse Source 
We need this from other files too.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Peter Hutterer 2011-08-30 16:58:04 -04:00
parent d0a7cd759d
commit 911e7368bf
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dix/events.c
View File

@ -524,13 +524,6 @@ SyntheticMotion(DeviceIntPtr dev, int x, int y) {
#ifdef PANORAMIX #ifdef PANORAMIX
static void PostNewCursor(DeviceIntPtr pDev); static void PostNewCursor(DeviceIntPtr pDev);
static Bool
pointOnScreen(ScreenPtr pScreen, int x, int y)
{
return x >= pScreen->x && x < pScreen->x + pScreen->width &&
y >= pScreen->y && y < pScreen->y + pScreen->height;
}
static Bool static Bool
XineramaSetCursorPosition( XineramaSetCursorPosition(
DeviceIntPtr pDev, DeviceIntPtr pDev,
@ -550,13 +543,13 @@ XineramaSetCursorPosition(
x += screenInfo.screens[0]->x; x += screenInfo.screens[0]->x;
y += screenInfo.screens[0]->y; y += screenInfo.screens[0]->y;
if(!pointOnScreen(pScreen, x, y)) if(!point_on_screen(pScreen, x, y))
{ {
FOR_NSCREENS(i) FOR_NSCREENS(i)
{ {
if(i == pScreen->myNum) if(i == pScreen->myNum)
continue; continue;
if(pointOnScreen(screenInfo.screens[i], x, y)) if(point_on_screen(screenInfo.screens[i], x, y))
{ {
pScreen = screenInfo.screens[i]; pScreen = screenInfo.screens[i];
break; break;

8
dix/inpututils.c
View File

@ -37,6 +37,7 @@
#include "xkbstr.h" #include "xkbstr.h"
#include "inpututils.h" #include "inpututils.h"
#include "eventstr.h" #include "eventstr.h"
#include "scrnintstr.h"
/* Check if a button map change is okay with the device. /* Check if a button map change is okay with the device.
* Returns -1 for BadValue, as it collides with MappingBusy. */ * Returns -1 for BadValue, as it collides with MappingBusy. */
@ -619,6 +620,13 @@ void init_device_event(DeviceEvent *event, DeviceIntPtr dev, Time ms)
event->sourceid = dev->id; event->sourceid = dev->id;
} }
Bool
point_on_screen(ScreenPtr pScreen, int x, int y)
{
return x >= pScreen->x && x < pScreen->x + pScreen->width &&
y >= pScreen->y && y < pScreen->y + pScreen->height;
}
/** /**
* Delete the element with the key from the list, freeing all memory * Delete the element with the key from the list, freeing all memory
* associated with the element.. * associated with the element..

2
include/input.h
View File

@ -608,4 +608,6 @@ extern _X_EXPORT const char* input_option_get_value(const InputOption *opt);
extern _X_EXPORT void input_option_set_key(InputOption *opt, const char* key); extern _X_EXPORT void input_option_set_key(InputOption *opt, const char* key);
extern _X_EXPORT void input_option_set_value(InputOption *opt, const char* value); extern _X_EXPORT void input_option_set_value(InputOption *opt, const char* value);
extern _X_HIDDEN Bool point_on_screen(ScreenPtr pScreen, int x, int y);
#endif /* INPUT_H */ #endif /* INPUT_H */