summaryrefslogtreecommitdiff
path: root/driver
diff options
context:
space:
mode:
Diffstat (limited to 'driver')
-rw-r--r--driver/xf86-input-ws/src/ws.c5
-rw-r--r--driver/xf86-input-ws/src/ws.h1
2 files changed, 1 insertions, 5 deletions
diff --git a/driver/xf86-input-ws/src/ws.c b/driver/xf86-input-ws/src/ws.c
index 4b9e42d9e..cf6200948 100644
--- a/driver/xf86-input-ws/src/ws.c
+++ b/driver/xf86-input-ws/src/ws.c
@@ -13,7 +13,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $OpenBSD: ws.c,v 1.30 2010/01/10 15:22:47 matthieu Exp $ */
+/* $OpenBSD: ws.c,v 1.31 2010/01/10 16:33:44 matthieu Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -392,9 +392,6 @@ wsDeviceInit(DeviceIntPtr pWS)
btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
#endif
- priv->screen_width = screenInfo.screens[priv->screen_no]->width;
- priv->screen_height = screenInfo.screens[priv->screen_no]->height;
-
for (i = 0; i < NBUTTONS; i++)
map[i + 1] = i + 1;
if (!InitButtonClassDeviceStruct(pWS,
diff --git a/driver/xf86-input-ws/src/ws.h b/driver/xf86-input-ws/src/ws.h
index 5c121fb01..64b7076dd 100644
--- a/driver/xf86-input-ws/src/ws.h
+++ b/driver/xf86-input-ws/src/ws.h
@@ -44,7 +44,6 @@ typedef struct WSDevice {
int swap_axes;
int raw;
int inv_x, inv_y;
- int screen_width, screen_height;
int screen_no;
int num, den, threshold; /* relative accel params */
pointer buffer;