diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | clients/Makefile | 2 | ||||
| -rw-r--r-- | compositor.c | 23 | ||||
| -rw-r--r-- | config.mk.in | 2 | ||||
| -rw-r--r-- | data/COPYING | 6 | ||||
| -rw-r--r-- | data/Makefile | 21 | ||||
| -rw-r--r-- | data/bottom_left_corner.png | bin | 0 -> 1100 bytes | |||
| -rw-r--r-- | data/bottom_right_corner.png | bin | 0 -> 1033 bytes | |||
| -rw-r--r-- | data/bottom_side.png | bin | 0 -> 994 bytes | |||
| -rw-r--r-- | data/grabbing.png | bin | 0 -> 1004 bytes | |||
| -rw-r--r-- | data/left_ptr.png | bin | 0 -> 1046 bytes | |||
| -rw-r--r-- | data/left_side.png | bin | 0 -> 1141 bytes | |||
| -rw-r--r-- | data/right_side.png | bin | 0 -> 1051 bytes | |||
| -rw-r--r-- | data/top_left_corner.png | bin | 0 -> 1251 bytes | |||
| -rw-r--r-- | data/top_right_corner.png | bin | 0 -> 1163 bytes | |||
| -rw-r--r-- | data/top_side.png | bin | 0 -> 1116 bytes | |||
| -rw-r--r-- | data/xterm.png | bin | 0 -> 615 bytes | |||
| -rw-r--r-- | spec/Makefile | 2 |
19 files changed, 47 insertions, 16 deletions
@@ -4,7 +4,6 @@ *.pc compositor *.jpg -*.png *~ aclocal.m4 autom4te.cache/ @@ -1,6 +1,6 @@ include config.mk -subdirs = clients spec +subdirs = clients spec data libs = libwayland-server.so libwayland-client.so all : $(libs) compositor subdirs-all scanner @@ -60,10 +60,10 @@ scanner : \ scanner : LDLIBS += $(EXPAT_LIBS) -subdirs-all subdirs-clean : +subdirs-all subdirs-clean subdirs-install: for f in $(subdirs); do $(MAKE) -C $$f $(@:subdirs-%=%); done -install : $(libs) compositor +install : $(libs) compositor subdirs-install install -d $(libdir) $(libdir)/pkgconfig ${udev_rules_dir} install $(libs) $(libdir) install wayland-server.pc wayland-client.pc $(libdir)/pkgconfig diff --git a/clients/Makefile b/clients/Makefile index cd46599..1ff8f14 100644 --- a/clients/Makefile +++ b/clients/Makefile @@ -21,3 +21,5 @@ view : view.o window.o wayland-glib.o cairo-util.o terminal : LDLIBS += -lutil view : CFLAGS += $(POPPLER_CFLAGS) view : LDLIBS += $(POPPLER_LIBS) + +install :
\ No newline at end of file diff --git a/compositor.c b/compositor.c index a1b9fcc..89fc1a6 100644 --- a/compositor.c +++ b/compositor.c @@ -24,7 +24,6 @@ #include <sys/ioctl.h> #include <fcntl.h> #include <unistd.h> -#include <cairo.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <math.h> #include <time.h> @@ -202,17 +201,17 @@ static const struct { const char *filename; int hotspot_x, hotspot_y; } pointer_images[] = { - { "resources/bottom_left_corner.png", 6, 30 }, - { "resources/bottom_right_corner.png", 28, 28 }, - { "resources/bottom_side.png", 16, 20 }, - { "resources/grabbing.png", 20, 17 }, - { "resources/left_ptr.png", 10, 5 }, - { "resources/left_side.png", 10, 20 }, - { "resources/right_side.png", 30, 19 }, - { "resources/top_left_corner.png", 8, 8 }, - { "resources/top_right_corner.png", 26, 8 }, - { "resources/top_side.png", 18, 8 }, - { "resources/xterm.png", 15, 15 } + { DATADIR "/wayland/bottom_left_corner.png", 6, 30 }, + { DATADIR "/wayland/bottom_right_corner.png", 28, 28 }, + { DATADIR "/wayland/bottom_side.png", 16, 20 }, + { DATADIR "/wayland/grabbing.png", 20, 17 }, + { DATADIR "/wayland/left_ptr.png", 10, 5 }, + { DATADIR "/wayland/left_side.png", 10, 20 }, + { DATADIR "/wayland/right_side.png", 30, 19 }, + { DATADIR "/wayland/top_left_corner.png", 8, 8 }, + { DATADIR "/wayland/top_right_corner.png", 26, 8 }, + { DATADIR "/wayland/top_side.png", 18, 8 }, + { DATADIR "/wayland/xterm.png", 15, 15 } }; static void diff --git a/config.mk.in b/config.mk.in index 60af1cc..c8659e1 100644 --- a/config.mk.in +++ b/config.mk.in @@ -1,10 +1,12 @@ CFLAGS = @GCC_CFLAGS@ -O -g -Wall -MMD -MF .$*.deps +CPPFLAGS = -DDATADIR=\"$(datadir)\" prefix = @prefix@ exec_prefix = @exec_prefix@ udev_rules_dir = @sysconfdir@/udev/rules.d libdir = @libdir@ includedir = @includedir@ +datadir = @datadir@ COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@ COMPOSITOR_LIBS = @COMPOSITOR_LIBS@ diff --git a/data/COPYING b/data/COPYING new file mode 100644 index 0000000..b9d6c37 --- /dev/null +++ b/data/COPYING @@ -0,0 +1,6 @@ +(c) 2007-2010 Novell, Inc. + +This work is licenced under the Creative Commons Attribution-Share Alike 3.0 +United States License. To view a copy of this licence, visit +http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative +Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA. diff --git a/data/Makefile b/data/Makefile new file mode 100644 index 0000000..3a44a1b --- /dev/null +++ b/data/Makefile @@ -0,0 +1,21 @@ +include ../config.mk + +cursor_images = \ + bottom_left_corner.png \ + bottom_right_corner.png \ + bottom_side.png \ + grabbing.png \ + left_ptr.png \ + left_side.png \ + right_side.png \ + top_left_corner.png \ + top_right_corner.png \ + top_side.png \ + xterm.png + + +all : + +install : + install -d $(datadir)/wayland + install $(cursor_images) $(datadir)/wayland diff --git a/data/bottom_left_corner.png b/data/bottom_left_corner.png Binary files differnew file mode 100644 index 0000000..2d4370f --- /dev/null +++ b/data/bottom_left_corner.png diff --git a/data/bottom_right_corner.png b/data/bottom_right_corner.png Binary files differnew file mode 100644 index 0000000..768e777 --- /dev/null +++ b/data/bottom_right_corner.png diff --git a/data/bottom_side.png b/data/bottom_side.png Binary files differnew file mode 100644 index 0000000..ac7c70e --- /dev/null +++ b/data/bottom_side.png diff --git a/data/grabbing.png b/data/grabbing.png Binary files differnew file mode 100644 index 0000000..0469459 --- /dev/null +++ b/data/grabbing.png diff --git a/data/left_ptr.png b/data/left_ptr.png Binary files differnew file mode 100644 index 0000000..c42ac55 --- /dev/null +++ b/data/left_ptr.png diff --git a/data/left_side.png b/data/left_side.png Binary files differnew file mode 100644 index 0000000..2e2fab5 --- /dev/null +++ b/data/left_side.png diff --git a/data/right_side.png b/data/right_side.png Binary files differnew file mode 100644 index 0000000..d49b114 --- /dev/null +++ b/data/right_side.png diff --git a/data/top_left_corner.png b/data/top_left_corner.png Binary files differnew file mode 100644 index 0000000..25c4e84 --- /dev/null +++ b/data/top_left_corner.png diff --git a/data/top_right_corner.png b/data/top_right_corner.png Binary files differnew file mode 100644 index 0000000..fb7727c --- /dev/null +++ b/data/top_right_corner.png diff --git a/data/top_side.png b/data/top_side.png Binary files differnew file mode 100644 index 0000000..bf351f1 --- /dev/null +++ b/data/top_side.png diff --git a/data/xterm.png b/data/xterm.png Binary files differnew file mode 100644 index 0000000..dc054c9 --- /dev/null +++ b/data/xterm.png diff --git a/spec/Makefile b/spec/Makefile index bbb81ff..26a3e23 100644 --- a/spec/Makefile +++ b/spec/Makefile @@ -7,3 +7,5 @@ main.pdf : main.tex clean : rm -f main.pdf main.aux main.log + +install : |
