Move example compositor to subdirectory

dev
Kristian Høgsberg 14 years ago
parent ef2f485056
commit 76b43326a5
  1. 1
      .gitignore
  2. 16
      Makefile
  3. 12
      TODO
  4. 18
      compositor/Makefile
  5. 0
      compositor/compositor-drm.c
  6. 0
      compositor/compositor-x11.c
  7. 0
      compositor/compositor.c
  8. 0
      compositor/compositor.h
  9. 0
      compositor/drm.c
  10. 0
      compositor/screenshooter.c

1
.gitignore vendored

@ -2,7 +2,6 @@
*.o
*.so
*.pc
compositor
*.jpg
*~
aclocal.m4

@ -1,9 +1,9 @@
include config.mk
subdirs = clients spec data
subdirs = compositor clients spec data
libs = libwayland-server.so libwayland-client.so
all : $(libs) compositor subdirs-all scanner
all : $(libs) subdirs-all scanner
headers = \
wayland-util.h \
@ -44,16 +44,6 @@ $(libs) : LDLIBS += $(FFI_LIBS)
$(libs) :
gcc -shared $^ $(LDLIBS) -o $@
compositor : \
compositor.o \
compositor-drm.o \
compositor-x11.o \
screenshooter.o \
drm.o
compositor : CFLAGS += $(COMPOSITOR_CFLAGS)
compositor : LDLIBS += ./libwayland-server.so $(COMPOSITOR_LIBS) -rdynamic -lrt -lEGL -lm
scanner : \
scanner.o \
wayland-util.o
@ -71,7 +61,7 @@ install : $(libs) compositor subdirs-install
install 70-wayland.rules ${udev_rules_dir}
clean : subdirs-clean
rm -f compositor scanner *.o *.so .*.deps
rm -f scanner *.o *.so .*.deps
rm -f wayland-protocol.c \
wayland-server-protocol.h wayland-client-protocol.h

12
TODO

@ -1,5 +1,17 @@
Core wayland protocol
- surface.set_grab_mode(GRAB_OWNER_EVENTS vs GRAB_SURFACE_EVENTS), to
make menus work right: click and drag in a menubar grabs the
pointer to the menubar (which we need for detecting motion into
another menu item), but we need events for the popup menu surface
as well.
- input_device.attach() should use a timestamp so the server can
discard late requests (sending a request to set the pointer image
in response to a motion event, the pointer leaves and then reenters
the surface, before the server receives the reqest -> the server
must discard it).
- The message format has to include information about number of fds
in the message so we can skip a message correctly. Or we should
just give up on trying to recover from unknown messages.

@ -0,0 +1,18 @@
include ../config.mk
CFLAGS += $(COMPOSITOR_CFLAGS)
LDLIBS += -L.. -lwayland-server $(COMPOSITOR_LIBS) -rdynamic -lrt -lEGL -lm
all : compositor
compositor : \
compositor.o \
compositor-drm.o \
compositor-x11.o \
screenshooter.o \
drm.o
clean :
rm -f compositor *.o .*.deps
install :
Loading…
Cancel
Save