Permalink
Browse files

Remove plugins

We are not ready for a system compositor yet and a C++ desktop compositor
is not as compelling as it might sound.
  • Loading branch information...
1 parent a6c5f97 commit b09c15cc60341f3b91486949106397838483e5ad @plfiorini plfiorini committed Sep 22, 2013
Showing with 0 additions and 3,064 deletions.
  1. +0 −86 protocol/display-manager.xml
  2. +0 −29 protocol/system-compositor.xml
  3. +0 −1 src/CMakeLists.txt
  4. +0 −3 src/plugins/CMakeLists.txt
  5. +0 −2 src/plugins/compositors/CMakeLists.txt
  6. +0 −43 src/plugins/compositors/classic/CMakeLists.txt
  7. +0 −3 src/plugins/compositors/classic/classic.json
  8. +0 −5 src/plugins/compositors/classic/classic.qrc
  9. +0 −434 src/plugins/compositors/classic/compositor.cpp
  10. +0 −118 src/plugins/compositors/classic/compositor.h
  11. BIN src/plugins/compositors/classic/images/background.jpg
  12. +0 −88 src/plugins/compositors/classic/integration.cpp
  13. +0 −65 src/plugins/compositors/classic/integration.h
  14. +0 −49 src/plugins/compositors/classic/main.cpp
  15. +0 −77 src/plugins/compositors/classic/qopenglwindow.cpp
  16. +0 −72 src/plugins/compositors/classic/qopenglwindow.h
  17. +0 −162 src/plugins/compositors/classic/textureblitter.cpp
  18. +0 −67 src/plugins/compositors/classic/textureblitter.h
  19. +0 −58 src/plugins/compositors/system/CMakeLists.txt
  20. +0 −134 src/plugins/compositors/system/displaymanagerserver.cpp
  21. +0 −73 src/plugins/compositors/system/displaymanagerserver.h
  22. +0 −48 src/plugins/compositors/system/main.cpp
  23. +0 −61 src/plugins/compositors/system/qml/Compositor.qml
  24. +0 −247 src/plugins/compositors/system/qml/CompositorLogic.js
  25. +0 −89 src/plugins/compositors/system/qml/ContrastEffect.qml
  26. +0 −72 src/plugins/compositors/system/qml/WindowChrome.qml
  27. +0 −153 src/plugins/compositors/system/qml/WindowContainer.qml
  28. +0 −3 src/plugins/compositors/system/system.json
  29. +0 −9 src/plugins/compositors/system/system.qrc
  30. +0 −98 src/plugins/compositors/system/systemclient.cpp
  31. +0 −66 src/plugins/compositors/system/systemclient.h
  32. +0 −195 src/plugins/compositors/system/systemcompositor.cpp
  33. +0 −89 src/plugins/compositors/system/systemcompositor.h
  34. +0 −269 src/plugins/compositors/system/systemcompositorserver.cpp
  35. +0 −96 src/plugins/compositors/system/systemcompositorserver.h
@@ -1,86 +0,0 @@
-<protocol name="display_manager">
- <interface name="wl_system_client" version="1">
- <request name="terminate" type="destructor">
- <description summary="disconnect a client">
- Disconnect a client's connection to the system compositor, and
- destroy its associated resources.
- </description>
- </request>
- <event name="ready">
- <description summary="client ready">
- Sent when the system compositor has determined a client is ready to
- be switched to. Generally this means that the client has attached
- the first buffer to its surface.
- </description>
- </event>
- <event name="client_disconnected">
- <!-- Need disconnect reason? -->
- </event>
- </interface>
-
- <interface name="wl_display_manager" version="1">
- <description summary="Manage multiple users' displays">
- The display manager can use this interface to manage the system
- compositor. It has requests to add new clients, to transition between
- clients.
-
- All clients of the system compositor are assumed to be fullscreen.
- With the exception of transitions, the compositor will generally
- display only a single client at once.
- </description>
-
- <request name="add_client">
- <description summary="add a new system client">
- This adds a new client to the system compositor. The system
- compositor will listen to requests from the new client on the passed
- fd.
- </description>
- <arg name="id" type="new_id" interface="wl_system_client"/>
- <arg name="fd" type="fd"/>
- <!-- Possibly need user, and display manager cookie? -->
- </request>
-
- <request name="switch_to_client">
- <description summary="switch to client">
- This request switches input and display focus to a different client.
- The compositor may perform some transition animation between the two
- clients, such as a crossfade or cube animation. During the transition
- no client will have input focus.
- </description>
- <arg name="id" type="object" interface="wl_system_client"/>
- <!-- Possibly need to specify transition options? -->
- </request>
-
- <enum name="error">
- <entry name="keybinding_exists" value="0"/>
- <entry name="invalid_keybinding" value="1"/>
- </enum>
-
- <request name="bind_key">
- <description summary="receive notification when a key chord is pressed">
- This request adds a key combination to the set of keybindings reserved
- by the display manager. When one of these key combinations is pressed,
- a keybinding event with cookie is sent to the display manager.
-
- These keypresses are not sent to any other client.
- </description>
- <arg name="key" type="uint"/>
- <arg name="modifier" type="uint"/>
- <arg name="cookie" type="uint" />
- </request>
-
- <request name="unbind_key">
- <description summary="remove a key combination from the list of keybindings">
- This request removes a key combination to the set of keybindings.
- </description>
- <arg name="key" type="uint"/>
- <arg name="modifier" type="uint"/>
- <arg name="cookie" type="uint" />
- </request>
-
- <event name="keybinding_notify">
- <arg name="cookie" type="uint"/>
- </event>
- </interface>
-</protocol>
-
@@ -1,29 +0,0 @@
-<protocol name="system_compositor">
- <interface name="wl_system_compositor" version="1">
- <description summary="Manage multiple users' displays">
-
- </description>
- <request name="present_surface">
- <description summary="present surface for display">
- This requests the system compositor to display surface on output.
- Each client of the system compositor can have at most one surface
- per output at any one time.
-
- Subsequent requests with the same output replace the surface bound
- to that output.
- </description>
- <arg name="surface" type="object" interface="wl_surface"/>
- <arg name="output" type="object" interface="wl_output"/>
- </request>
-
- <request name="ready">
- <description summary="notify that client is ready">
- This notifies the system compositor that the client is ready to be
- switched to. The client should have made a call to present_surface
- prior to signaling readiness.
- </description>
- </request>
- </interface>
-</protocol>
-
-
View
@@ -2,4 +2,3 @@ add_subdirectory(libgreenisland)
if(Qt5Compositor_FOUND)
add_subdirectory(greenisland)
endif()
-#add_subdirectory(plugins)
@@ -1,3 +0,0 @@
-if(Qt5Compositor_FOUND)
- add_subdirectory(compositors)
-endif()
@@ -1,2 +0,0 @@
-#add_subdirectory(classic)
-add_subdirectory(system)
@@ -1,43 +0,0 @@
-include_directories(
- ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
- ${Qt5Compositor_PRIVATE_INCLUDE_DIRS}
- ${WAYLAND_SERVER_INCLUDE_DIR}
- ${CMAKE_SOURCE_DIR}/headers
- ${CMAKE_SOURCE_DIR}/headers/GreenIsland
- ${CMAKE_BINARY_DIR}/headers/GreenIsland
-)
-
-add_definitions(-DQT_PLUGIN)
-
-set(SOURCES
- main.cpp
- qopenglwindow.cpp
- textureblitter.cpp
- compositor.cpp
- integration.cpp
-)
-
-wayland_add_protocol_server(SOURCES
- ${CMAKE_SOURCE_DIR}/protocol/desktop-shell.xml
- desktop-shell
-)
-wayland_add_protocol_client(SOURCES
- ${CMAKE_SOURCE_DIR}/protocol/desktop-shell.xml
- desktop-shell
-)
-
-qt5_add_resources(RESOURCES classic.qrc)
-
-add_library(classic SHARED ${SOURCES} ${RESOURCES})
-qt5_use_modules(classic Compositor)
-set_target_properties(classic PROPERTIES
- PREFIX ""
- LINK_FLAGS -L${WAYLAND_SERVER_LIBDIR}
-)
-target_link_libraries(classic
- ${WAYLAND_SERVER_LIBRARIES}
- GreenIsland
-)
-
-install(TARGETS classic
- DESTINATION ${CMAKE_INSTALL_PLUGINSDIR}/greenisland/compositors)
@@ -1,3 +0,0 @@
-{
- "Keys": [ "classic" ]
-}
@@ -1,5 +0,0 @@
-<RCC>
- <qresource prefix="/">
- <file alias="images/background.jpg">images/background.jpg</file>
- </qresource>
-</RCC>
Oops, something went wrong.

0 comments on commit b09c15c

Please sign in to comment.