diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-12-19 13:47:53 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2008-12-19 13:47:53 -0500 |
| commit | 82f6e8a2efcf6039f0ada8dfa3828d203c0b797d (patch) | |
| tree | 4dd68e77f79ef45f6a3363a2ad284b3f0f9f024d /evdev.c | |
| parent | Use the new eagle config chooser for picking the config. (diff) | |
| download | wayland-82f6e8a2efcf6039f0ada8dfa3828d203c0b797d.tar wayland-82f6e8a2efcf6039f0ada8dfa3828d203c0b797d.tar.gz wayland-82f6e8a2efcf6039f0ada8dfa3828d203c0b797d.tar.bz2 wayland-82f6e8a2efcf6039f0ada8dfa3828d203c0b797d.tar.lz wayland-82f6e8a2efcf6039f0ada8dfa3828d203c0b797d.tar.xz wayland-82f6e8a2efcf6039f0ada8dfa3828d203c0b797d.tar.zst wayland-82f6e8a2efcf6039f0ada8dfa3828d203c0b797d.zip | |
Rename egl-compositor to wayland-system-compositor.
The wayland-system-compositor is the top-level compositor. X sessions
or nested Wayland sessions will run as clients of the system compositor.
The system compositor is licensed under the GPL.
Diffstat (limited to 'evdev.c')
| -rw-r--r-- | evdev.c | 37 |
1 files changed, 16 insertions, 21 deletions
@@ -1,23 +1,19 @@ /* * Copyright © 2008 Kristian Høgsberg * - * 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 the copyright holders not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. The copyright holders make no representations - * about the suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL THE COPYRIGHT HOLDERS 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <stdio.h> @@ -29,10 +25,10 @@ #include <linux/input.h> #include "wayland.h" -#include "egl-compositor.h" +#include "wayland-system-compositor.h" struct evdev_input_device { - struct egl_input_device *device; + struct wlsc_input_device *device; struct wl_event_source *source; int tool, new_x, new_y; int base_x, base_y; @@ -49,8 +45,7 @@ static void evdev_input_device_data(int fd, uint32_t mask, void *data) dx = 0; dy = 0; absolute_event = 0; - egl_device_get_position(device->device, &x, &y); - + wlsc_device_get_position(device->device, &x, &y); len = read(fd, &ev, sizeof ev); if (len < 0 || len % sizeof e[0] != 0) { @@ -143,7 +138,7 @@ static void evdev_input_device_data(int fd, uint32_t mask, void *data) } struct evdev_input_device * -evdev_input_device_create(struct egl_input_device *master, +evdev_input_device_create(struct wlsc_input_device *master, struct wl_display *display, const char *path) { struct evdev_input_device *device; |
