diff options
| author | Keith Packard <keithp@keithp.com> | 2011-11-02 21:20:07 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-11-02 21:20:07 -0700 |
| commit | d91aa0e6601bdf3e2cfa57b3412ab14ac486edc4 (patch) | |
| tree | 7c18b19cfd5fb4d05f54549121fda33e1b9cd249 /include | |
| parent | 8df3a9ca5abbd56eb2013fa65250d21a8f18865b (diff) | |
| parent | 401150d7dcad08be7c1f07e076f810cd61e2105c (diff) | |
Merge remote-tracking branch 'whot/two-screen-coordinates'
Diffstat (limited to 'include')
| -rw-r--r-- | include/input.h | 1 | ||||
| -rw-r--r-- | include/inputstr.h | 5 | ||||
| -rw-r--r-- | include/scrnintstr.h | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/include/input.h b/include/input.h index 4eee47ce4..5dd5c1bcf 100644 --- a/include/input.h +++ b/include/input.h @@ -614,5 +614,6 @@ 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_HIDDEN Bool point_on_screen(ScreenPtr pScreen, int x, int y); +extern _X_HIDDEN void update_desktop_dimensions(void); #endif /* INPUT_H */ diff --git a/include/inputstr.h b/include/inputstr.h index 7a1554075..0a2128732 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -534,8 +534,9 @@ typedef struct _DeviceIntRec { DeviceIntPtr lastSlave; /* last slave device used */ /* last valuator values recorded, not posted to client; - * for slave devices, valuators is in device coordinates - * for master devices, valuators is in screen coordinates + * for slave devices, valuators is in device coordinates, mapped to the + * desktop + * for master devices, valuators is in desktop coordinates. * see dix/getevents.c * remainder supports acceleration */ diff --git a/include/scrnintstr.h b/include/scrnintstr.h index a9357e8a5..132a67193 100644 --- a/include/scrnintstr.h +++ b/include/scrnintstr.h @@ -561,6 +561,10 @@ typedef struct _ScreenInfo { formats[MAXFORMATS]; int numScreens; ScreenPtr screens[MAXSCREENS]; + int x; /* origin */ + int y; /* origin */ + int width; /* total width of all screens together */ + int height; /* total height of all screens together */ } ScreenInfo; extern _X_EXPORT ScreenInfo screenInfo; |