Pekka Paalanen
9ef3e012d6
desktop-shell: screen locking protocol
...
Add protocol and functions for supporting screen locking, triggered by
activity timeout.
After activity timeout, compositor starts the fade to black, and then
enters SLEEPING state. At that point it calls lock() in the shell
plugin.
When input events trigger a wakeup, unlock() in the shell plugin is
called. This sends prepare_lock_surface event to the desktop-shell
client. The screen stays locked while the compositor starts fade-in.
At this point, desktop-shell client usually creates a surface for the
unlocking GUI (e.g. a password prompt), and sends it with the
set_lock_surface request. The compositor supposedly shows and allows
interaction only with the given lock surface (not yet implemented).
When desktop-shell has authenticated the user, or instead of issuing
set_lock_surface, it sends the unlock request. Upon receiving the unlock
request, the shell plugin unlocks the screen.
If desktop-shell client dies, the screen is unlocked automatically.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2011-11-15 14:18:50 -05:00
Kristian Høgsberg
496433b541
compositor: Hold on to surface.frame requests until we assign an output
...
We can't just throw away the callback, so hold on to the requests until
we have an output for the surface.
2011-11-15 13:50:21 -05:00
Kristian Høgsberg
3164c946ac
compositor: Drop unused wlsc_output field 'background'
2011-11-15 11:57:54 -05:00
Pekka Paalanen
8c19645e69
compositor: fix destroy_frame_callback()
...
Pass the correct pointer to free().
This is just a cosmetic change, because 'resource' happens to be the
first member in wlsc_frame_callback.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2011-11-15 09:06:09 -05:00
Kristian Høgsberg
64f1c3fd52
De-brand the tablet shell
...
Drop the MeeGo part of the name.
2011-11-14 15:57:59 -05:00
Kristian Høgsberg
c4693c4ab4
Install desktop-shell in $prefix/libexec
2011-11-14 14:57:17 -05:00
Kristian Høgsberg
d826404472
compositor: Drop redundant compositor->damage
...
This is the same as the damage of the top-level surface so just use that.
There's a problem that if we change the stacking, the damage layering breaks,
but that's a problem we already have.
2011-11-11 11:48:15 -05:00
Kristian Høgsberg
46770139bc
shell: Set initial toplevel position in map callback
2011-11-09 12:40:08 -05:00
Kristian Høgsberg
32e24cc628
compositor: Split shell->attach into map and configure
...
The shell module only needs to deal with attach when it's either the initial
attach or when the attach changes the size of the surface. In case of
initial attach, the shell needs to pick a position for the surface and a
place in the surface stack. We split this case out as a new shell->map
callback. The other case is split into the shell->configure callback,
where the shell may adjust the surface position or reject the new size.
2011-11-09 12:07:35 -05:00
David Herrmann
63ff706c0e
compositor-drm: Fix setting O_CLOEXEC
...
The third parameter of open() is for file-creation modes. File flags are passed
in the second paramater.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2011-11-05 22:04:03 -04:00
Pekka Paalanen
bbe605241d
compositor: only authorized client can bind desktop_shell
...
Check, that only the desktop-shell client spawned by the compositor
(desktop-shell plugin) is allowed to bind to desktop_shell interface.
Other clients will receive an error like:
wl_display@1.error(desktop_shell@20, 0,
"permission to bind desktop_shell denied")
The error has the proper object id and interface type.
Note: desktop-shell cannot be started manually anymore, it has to be
started by the compositor automatically.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2011-11-03 15:16:39 -04:00
Pekka Paalanen
6cd281a023
desktop-shell: launch from the compositor
...
Fork and exec desktop-shell in the compositor. This is a way to create
an authenticated client. Later, the desktop-shell interface will be
reserved for this client only.
For exec to work, the compositor should be started from the
wayland-demos' root directory.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2011-11-03 15:16:19 -04:00
Ander Conselvan de Oliveira
ef7c8d9ddf
compositor-*: check for surfaceless_gles2 instead of surfaceless_opengl
...
All the compositors are using GLES2 so check for the appropriate
surfaceless extension.
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
2011-11-01 11:18:39 -04:00
Kristian Høgsberg
d3ef7be781
compositor: Tweak fade spring to not overshoot
2011-10-29 15:04:42 -04:00
Kristian Høgsberg
06a670f2e7
compositor-x11: Call finish_frame from a timer callback
...
The repaint logic breaks when finish_frame is called from the present
callback. Ideally we should throttle to vsync (or even better, the
compositor repaint cycle, but hey, X is X), but this goes a long way.
2011-10-29 14:39:13 -04:00
Kristian Høgsberg
3ff589df78
compositor: Make spring model always use the same time step
2011-10-29 13:41:18 -04:00
Kristian Høgsberg
ff298d9834
compositor: Clear cursor buffer in create_sprite_from_png()
2011-10-28 20:41:28 -04:00
Ander Conselvan de Oliveira
0de0aafa7f
composior: fix tiny cursor bug with drm compositor
...
The drm compositor always creates a 64x64 bo for the cursor image
regardless of the size of the actual cursor. When the fade animation
kicks in it disables the hardware cursor so that it is rendered as a
regular surface. This surface is rendered to a 32x32 region but using
a 64x64 texture so the cursor gets scaled down.
Fix this by making create_cursor_image return the actual size of the
image created to the compositor.
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
2011-10-28 14:36:28 -04:00
Casey Dahlin
fb39963cc9
Update .gitignores
2011-10-28 13:32:17 -04:00
Tiago Vignatti
ac9cfd3065
evdev: Simplify error path for device creation
...
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2011-10-28 13:15:25 -04:00
Tiago Vignatti
d9f7d1f0c5
evdev: Delete unused fields from evdev_input_device
...
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2011-10-28 13:09:42 -04:00
Tiago Vignatti
ac2dc6aafe
evdev: Add hotplug support
...
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2011-10-28 13:05:06 -04:00
Ander Conselvan de Oliveira
9a38a0a191
compositor: page flip away from a client buffer if it's destroyed
...
If the current or pending scanout buffer is destroyed, the client frame
will remain being displayed until something else causes a repaint to be
scheduled.
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
2011-10-28 12:43:47 -04:00
Kristian Høgsberg
ac5098f11a
Merge remote-tracking branch 'robster/rob/pointer-fixes'
2011-10-25 09:07:12 -04:00
Rob Bradford
1d72447d9b
compositor: Report an error if we cannot the load the pointer image files
2011-10-25 13:43:44 +01:00
Rob Bradford
d354711fc7
compositor: Don't try and use a NULL sprite for the device pointer
...
If loading the pointer images to the sprites fails then do not try and use
those NULL sprites for the pointer.
2011-10-25 13:38:31 +01:00
Kristian Høgsberg
2459694ab2
compositor: Clean up resource destroy callback handling
2011-10-24 17:51:02 -04:00
Pekka Paalanen
02ebfb1276
compositor: fix drag segfault
...
Without this fix, the dnd demo would make the demo compositor crash in
shell.c:drag_offer() because resource->data is NULL.
Initialise resource->data in shell_create_drag().
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2011-10-24 15:35:09 -04:00
Ander Conselvan de Oliveira
02924bc0b6
compositor: fix whitespace error in wlsc_output_set_cursor
...
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
2011-10-24 15:32:16 -04:00
Ander Conselvan de Oliveira
22e22a55be
compositor: don't schedule idle_repaint from calls to repaint
...
wlsc_output_repaint may call wlsc_surface_damage indirectly through
wlsc_output_set_cursor. If this happens in the call made from repaint,
one ends up with repaint being called from both idle_repaint and
wlsc_output_finish_frame.
Fix this by setting output->repaint_scheduled to 1 before calling
wlsc_output_repaint in the function repaint.
[krh] Edited to just only clear repaint_scheduled, when we no longer have
a repaint scheduled.
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
2011-10-24 15:32:16 -04:00
Kristian Høgsberg
a4b7e20392
drm: Only add an output once we've successfully initialized it
2011-10-24 15:32:13 -04:00
Kristian Høgsberg
53e79898a4
drm: Remove unneccesary drm_output_prepare_render() call
2011-10-24 13:25:24 -04:00
Kristian Høgsberg
9c46ff1a1e
drm: Specify depth as 24 when creating the KMS FB
...
At least intel kms rejects depth 32 now, and 24 is want we want.
2011-10-24 13:25:24 -04:00
Kristian Høgsberg
191454e6c2
compositor: Rename scanout surfaces
...
Let's call the surface that's about to be pageflipped 'pending' and the
one we're currently showing 'scanout'.
2011-10-24 13:25:17 -04:00
Ander Conselvan de Oliveira
f1621d2945
compositor: don't release the front buffer after page flip
...
On repaint, wlsc_output_repaint will replace output->scanout_buffer with
the new front buffer and then output->present() will cause this buffer
to be displayed. When wlsc_output_finish_frame is called, the
compositor will send a release buffer event for output->scanout_buffer
which is actually the front buffer now.
This patch changes this code to release the previous scanout_buffer
instead of the front buffer on wlsc_output_finish_frame.
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
2011-10-24 11:59:11 -04:00
Ander Conselvan de Oliveira
3b19966f19
compositor: move setup of scanout surface out of wlsc_output_repaint
...
Move this to a separate function to better accommodate changes in the
following commit.
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
2011-10-24 11:59:11 -04:00
Kristian Høgsberg
cbd06f94d1
compositor: Silence a couple of valgrind warnings
2011-10-12 16:29:31 -04:00
Kristian Høgsberg
32ff1f5012
compositor: Dont repick for grabbed surfaces
2011-10-12 00:36:54 -04:00
Kristian Høgsberg
dcef9ca23c
x11: Fix last-minute edit bug
2011-10-12 00:01:18 -04:00
Kristian Høgsberg
d6e5525a20
x11: Manage xserver focus better
2011-10-11 23:41:17 -04:00
Kristian Høgsberg
707e10fa75
x11: Handle a few more window property atoms
2011-10-11 23:13:30 -04:00
Kristian Høgsberg
a6ef0993e8
x11: Truncate property string to property length
2011-10-11 22:46:01 -04:00
Kristian Høgsberg
f0d9116fc8
x11: Add a destroy listener for X11 surfaces
2011-10-11 22:44:23 -04:00
Kristian Høgsberg
d2baf1fe5f
compositor: Repick focus surface as surfaces come and go
2011-10-11 22:22:27 -04:00
Kristian Høgsberg
293af264af
x11: Use compositor time, not X event time
...
X event time is not compatible with wlsc_compositor_get_time().
2011-10-11 17:23:02 -04:00
Benjamin Franzke
02dee2caad
compositor-drm: Fix invalid usage of udev ressources
...
The reference returned by udev_list_entry_get_name is
only valid until udev_enumerate_unref is called.
Call unref after the last usage of such.
2011-10-07 10:00:11 +02:00
Benjamin Franzke
a764ee5158
compositor-drm: Enumerate only cards with name card*
...
To exclude /dev/dri/controlD* from the enumeration.
2011-10-07 09:57:50 +02:00
Benjamin Franzke
439d98697a
compositor-drm: Be patient when output creation fails
...
Do not fail if e.g. only one of 3 connectors cant be enabled.
Could be that we just have not enough crtcs available.
2011-10-07 09:56:54 +02:00
Benjamin Franzke
c18366d1e9
compositor-openwfd: Fix tty assignment in backend_init
2011-10-07 08:33:08 +02:00
Kristian Høgsberg
96aa7da24a
Change remaining GPLv2 headers to MIT
...
The files in question are copyright Benjamin Franzke (who agrees),
Intel Corporation, Red Hat and myself. On behalf of Red Hat,
Richard Fontana says:
"Therefore, to the extent that Red Hat, Inc. has any copyright
interest in the files you cited as of this date (compositor-drm.c,
compositor.c, compositor.h, screenshooter.c in
http://cgit.freedesktop.org/wayland/wayland-demos/tree/compositor ),
Red Hat hereby elects to apply the CC0 1.0 Universal Public Domain
Dedication to such copyrighted material. See:
http://creativecommons.org/publicdomain/zero/1.0/legalcode .
Thanks,
Richard E. Fontana
Open Source Licensing and Patent Counsel
Red Hat, Inc."
2011-09-19 17:29:24 -04:00
Tiago Vignatti
37f27d59cd
xserver: check whether pointer exists when exiting
...
At initialization, if it fails in binding the socket or creating the
lock file then the pointer will be already freed and will result a
segfault when quiting the compositor.
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2011-09-08 18:27:31 -04:00
Kristian Høgsberg
a4a42f0ab5
shell: Reject moving or resizing toplevel windows
2011-09-08 16:56:57 -04:00
Kristian Høgsberg
9c4eecb5c0
Rename motion_grab to implicit_grab
...
Let's just use the same terms as X.
2011-09-06 18:13:14 -04:00
Kristian Høgsberg
7584062153
Add a desktop_shell interface
...
Mostly a toy-thing for now, to allow prototyping a desktop-shell client.
2011-09-06 13:48:16 -04:00
Kristian Høgsberg
f59da399d8
compositor: Don't crash when receiving kb focus with no surface
2011-09-06 13:44:56 -04:00
Kristian Høgsberg
109a00700e
compositor: Drop built-in background support
...
There should always be a background client (file manager, home screen,
animated wallpaper or just a plain static image).
2011-09-06 13:43:50 -04:00
Kristian Høgsberg
4eaa830381
compositor: Repick surface when grab ends
...
We were doing it manually in a few places and forgetting it in the
implicit grab case.
2011-09-06 13:41:47 -04:00
Kristian Høgsberg
e7b5b41e93
evdev: Associate touchscreen devices with output up front
...
This isn't going to change over time, so just tracking it in the
evdev device is a little easier. Also, we need to adjust for the
output position when transforming the device events to screen space.
2011-09-01 17:18:48 -04:00
Tiago Vignatti
d904359949
evdev: treat BTN_TOUCH as BTN_LEFT
...
idea stolen from xorg evdev.
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2011-09-01 17:18:07 -04:00
Tiago Vignatti
faee80196f
compositor: choose tty from command line
...
This is a backend option, so you should use something like '-otty='.
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2011-09-01 16:07:07 -04:00
Tiago Vignatti
bbc2e03b2a
evdev: use last output from compositor to get the screen geometries
...
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2011-09-01 12:32:29 -04:00
Tiago Vignatti
8be003baba
evdev: organize the code for processing events
...
Nothing was touched, just code moved around.
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2011-09-01 12:30:48 -04:00
Kristian Høgsberg
9ebcf94b83
Use wl_resource_* error functions
2011-09-01 09:54:57 -04:00
Matt Roper
11568a73ba
Turn off hardware cursor when screen fade begins.
...
The compositor was never actually calling the output backend to turn off
the hardware cursor when the screen begins fading. This would result in
a stuck hardware cursor and movable software cursor for the duration of
the fade/unfade.
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
2011-08-31 16:27:35 -04:00
Benjamin Franzke
e8e0e6e2db
Update gitignore
2011-08-31 16:25:32 -04:00
Benjamin Franzke
91eacca38b
Remove egl display type setenv hack
...
No longer needed with mesa 7.12-devel egl display autodetection.
2011-08-31 16:25:18 -04:00
Benjamin Franzke
48c4ea2dbd
compositor-drm: Merge drm_output_destroy and destroy_output
2011-08-31 16:24:27 -04:00
Benjamin Franzke
117483daaa
compositor-drm: Coding style fixes
...
- Reformat indentation and 80-column wrap
- Use output->base rather than output_base
- Remove traling space
2011-08-31 16:24:25 -04:00
Benjamin Franzke
b826302efb
Remove return type from wlsc_compositor_shutdown
...
Fixes "control reaches end of non-void function" warning
and is not needed (yet).
2011-08-31 16:24:23 -04:00
Benjamin Franzke
4c394190a3
compositor-openwfd: Fix wfd_destroy_output
...
Dont (incorrectly) call destroy_output
from wfd_destroy_output, rather merge both.
2011-08-31 16:24:20 -04:00
Kristian Høgsberg
f389cacc20
Move away from visuals and just use EGLConfigs or shm format tokens
2011-08-31 16:21:38 -04:00
Kristian Høgsberg
4ebf3a0c2e
Fix cursor visibility bug
2011-08-29 17:12:37 -04:00
Kristian Høgsberg
6f7179c652
compositor: Discard surface.frame if the surface isn't visible
2011-08-29 17:12:37 -04:00
Kristian Høgsberg
8e6d71247e
compositor: Track bound resources for input device
2011-08-29 17:12:37 -04:00
Kristian Høgsberg
57295ebf20
compositor: Handle NULL buffer in input_device.attach correctly
2011-08-29 17:12:37 -04:00
Kristian Høgsberg
fd07fb76bc
Create resource for wl_output
2011-08-29 17:12:37 -04:00
Kristian Høgsberg
97d44aa58b
Pass resources to functions that take object references
2011-08-29 17:12:37 -04:00
Kristian Høgsberg
f790c79ec7
Use wl_display_bind() for binding to globals
2011-08-29 17:12:36 -04:00
Kristian Høgsberg
d9551a3377
compositor: drop wl_display_add_object()
2011-08-29 17:12:36 -04:00
Kristian Høgsberg
904055a652
compositor: Make all exported objects wl_resources
2011-08-29 17:12:36 -04:00
Kristian Høgsberg
334182062f
Use the new wl_callback interface
2011-08-29 17:12:36 -04:00
Matt Roper
361d2ade02
Update compositor shutdown code
...
Adds a general wlsc_compositor_shutdown() function that all output
backends call when shutting down. wlsc_compositor_shutdown() will call
a new 'destroy' method of each output to perform backend-specific
cleanup (e.g., turning off the hardware cursor in the DRM compositor).
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
2011-08-29 17:12:27 -04:00
Matt Roper
045037e005
Turn off hardware cursors on VT switch before dropping DRM master.
...
The DRM cursor ioctl requires DRM master. We shouldn't drop
master until after we're done turning off the hardware cursors
for a VT switch.
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
2011-08-27 12:10:19 -04:00
Tiago Vignatti
c0827fd9d6
evdev: opt out accelerometer type of devices
...
We may want to adjust the protocol later for clients that care for
these devices only, generating a special event.
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2011-08-19 10:55:33 -04:00
Tiago Vignatti
2cc8b87310
compositor: fix pitch initialization
...
texture_region was getting a trash value for computing. I don't
understand how we couldn't see any artifact on surface output in such
case.
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2011-08-19 10:55:33 -04:00
Tiago Vignatti
d9c8250955
evdev: use a separate function for configuring devices
...
No semantical changes.
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2011-08-19 10:55:33 -04:00
Ander Conselvan de Oliveira
90bc9e6532
compositor-drm: Fix compilation error caused by typo.
2011-08-17 09:30:16 -04:00
Ander Conselvan de Oliveira
c483917512
compositor-drm: Make unused parts of the cursor image transparent
...
The bo for the cursor image is always created with size 64x64 even if
the actual cursor image is smaller than that. If this memory is not
initialized, random data can create artifacts near the cursor.
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
2011-08-16 21:32:54 -04:00
Dima Ryazanov
c224748665
Don't discard key press / key release events if the keys are different
...
Keystrokes get dropped if the user types too quickly.
2011-08-16 21:32:54 -04:00
Kristian Høgsberg
6bded3fd95
Don't pass NULL pointer as user data to signal handler
2011-08-12 14:55:07 -04:00
Matt Peterson
63900ec374
Relative movement with a touchpad and other misc fixes for events
2011-08-12 10:20:36 -04:00
Benjamin Franzke
9eaee35613
compositor-drm: Ignore disconnected connectors width
...
- Fixes segfault, if first enumerated connector is not connected.
- Corrects x-offset where e.g. the 2. of 3 connectors is not connected.
(where width of 1. output would have taken twice as
offset for output at 3. connector)
2011-08-12 10:17:12 -04:00
Kristian Høgsberg
3651bd54e1
xserver: Shut down if X server is crashing too fast
2011-08-11 18:59:35 -04:00
Kristian Høgsberg
3cf1172397
xserver: Clean up wm on X server exit
2011-08-11 17:58:59 -04:00
Kristian Høgsberg
f6ee695805
xserver: Clean up lockfile creation a bit
2011-08-11 17:48:38 -04:00
Kristian Høgsberg
534222b4d9
xserver: Listen on abstract X socket too
...
And try the next display if binding fails.
2011-08-11 17:27:56 -04:00
Tiago Vignatti
2116b89156
compositor: Move signal handler initialization before module loading
...
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2011-08-11 15:15:30 -04:00
Tiago Vignatti
5884bcde4a
configure: add helper for setting xserver directory
...
With this the X server directory can become independent from the
installation prefix set by autoconf.
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2011-08-11 15:09:59 -04:00
Kristian Høgsberg
338c96325b
xserver: Print atom names
2011-07-27 05:59:19 -07:00
Kristian Høgsberg
c1ace8c465
tty: Use /dev/tty instead of tty0
2011-07-22 07:25:21 -07:00
Kristian Høgsberg
9ffb6b9866
compositor: Only configure surface when it changes geometry
2011-07-21 20:14:57 -07:00
Kristian Høgsberg
4f0df049bb
compositor: Pick output for surface based on amount of overlap
2011-07-21 20:14:52 -07:00
Benjamin Franzke
7fb56b3ebc
compositor-openwfd: Update to systemd seat input devices
2011-07-21 10:27:39 -07:00
Kristian Høgsberg
1ccd9d2a8d
compositor-x11: Support multiple outputs
2011-07-21 10:22:13 -07:00
Kristian Høgsberg
a4ba1da03d
xserver: Ignore requests from X servers we didn't launch
2011-07-21 09:48:09 -07:00
Kristian Høgsberg
1d26603633
evdev: Only add event devices
2011-07-21 08:42:58 -07:00
Kristian Høgsberg
b3b425c8d1
xserver: use $bindir prefix when launching X
2011-07-21 08:42:42 -07:00
Kristian Høgsberg
535e2c65c7
xserver: Memset the right size
2011-07-20 18:15:50 -07:00
Kristian Høgsberg
4a431477ec
xserver: Only launch wm for xservers we launch
2011-07-20 18:15:27 -07:00
Kristian Høgsberg
86ec8e80d8
compositor: Use systemd seats for input devices as well
2011-07-19 16:10:11 -07:00
Kristian Høgsberg
8d51f141ca
compositor: Use systemd seat configuration conventions
...
http://www.freedesktop.org/wiki/Software/systemd/multiseat
2011-07-15 21:28:38 -04:00
Kristian Høgsberg
3cad436a91
xserver: Clean up X server socket on exit
2011-07-15 21:09:24 -04:00
Kristian Høgsberg
fcf6577108
xserver: Detect an clean up stale lock file
2011-07-15 20:14:57 -04:00
Kristian Høgsberg
d6520e144a
xserver: Create per-display log file
2011-07-15 20:14:00 -04:00
Kristian Høgsberg
6244668cc5
compositor-drm: Drop cursor debug message
2011-07-15 17:26:34 -04:00
Kristian Høgsberg
7341e9b6d9
compositor: Fix damage tracking for multi-head compositors
2011-07-01 22:12:11 -04:00
Benjamin Franzke
a8bdeae1b6
compositor: Fix cursor damaging on multi head
...
Removing cursors from the surface list,
for usage as hardware cursor needs lower damaging.
Also damge when re-adding to the surface list.
2011-07-01 15:51:41 -04:00
Kristian Høgsberg
5ec0a93a98
compositor: Add a simple WM to the xserver launcher
2011-07-01 10:46:40 -04:00
Kristian Høgsberg
cd0d10b752
compositor: Damage surface when raising
2011-06-24 08:37:06 -04:00
Benjamin Franzke
8e9e6264c1
openwfd: Combine native_resolution/rect/width,height into union
2011-06-24 13:43:08 +02:00
Benjamin Franzke
9b1f2d2e8e
compositor-openwfd: Expose physical size
2011-06-24 13:13:34 +02:00
Benjamin Franzke
259037d1d8
compositor-openwfd: Expose all modes
2011-06-24 13:08:31 +02:00
Benjamin Franzke
a16e002bd8
compositor-drm: Pass physical size to output_init
2011-06-24 11:57:06 +02:00
Kristian Høgsberg
a691aeefd7
compositor: Track opaque region of a surface
2011-06-23 22:48:37 -04:00
Kristian Høgsberg
aee7f84347
compositor: Stop repainting below opaque surfaces
2011-06-23 21:25:20 -04:00
Kristian Høgsberg
53df1d8a6b
compositor: Fix a couple of region leaks
2011-06-23 21:11:19 -04:00
Kristian Høgsberg
b8a983395d
compositor: Add helper to damage surface below
2011-06-23 21:00:04 -04:00
Kristian Høgsberg
8b72f60478
compositor: Clip away obscured damage
2011-06-23 20:46:34 -04:00
Kristian Høgsberg
20300ba112
compositor: Accumulate damage in per-surface regions
2011-06-23 20:29:12 -04:00
Kristian Høgsberg
b1ba0d1f99
Merge remote-tracking branch 'bnf/fix'
2011-06-23 17:44:13 -04:00
Benjamin Franzke
b7c00a4376
Send keyboard_focus only to client surfaces
2011-06-23 23:30:30 +02:00
Kristian Høgsberg
9d4db0996f
compositor: Launch X server rootless
2011-06-23 17:23:28 -04:00
Kristian Høgsberg
758dd3ea55
compsitor: Put background surface in the big surface list
2011-06-23 15:52:11 -04:00
Kristian Høgsberg
8244b44524
compositor: Put cursor surfaces into the big surface list
2011-06-23 15:52:11 -04:00
Kristian Høgsberg
751b5bcdd2
compositor: Change default background to be a png
2011-06-23 15:52:10 -04:00
Benjamin Franzke
060cf805bb
Use gbm for compositor-{drm,openwfd}
2011-06-23 21:25:37 +02:00
Benjamin Franzke
41402f8ec6
compositor-openwfd: Update to mode changes
...
This is just to have it running again.
Todo: Expose all modes, subpixel..
2011-06-23 16:12:17 +02:00
Kristian Høgsberg
d4af320178
meego-tablet-shell: Use central sigchild handler
2011-06-21 17:43:31 -04:00
Kristian Høgsberg
27da538ab5
compositor: Add socket based activation for X server
2011-06-21 17:32:25 -04:00
Kristian Høgsberg
57eca7424a
meego-tablet-shell: Generalize zoom animation
2011-06-21 16:40:56 -04:00
Kristian Høgsberg
487213defd
Damage surface before attaching new buffer
...
This reverts cde9bfc805
. We need to damage the
area covered by the old surface when attaching a new buffer. The new surface
area will be damaged by the client.
2011-06-21 15:40:31 -04:00
Kristian Høgsberg
fd94bf0fd0
compositor: Fix region leak
2011-06-21 15:33:18 -04:00
Kristian Høgsberg
e75cb7f64b
compositor: Store the output rectangle in a region
2011-06-21 15:32:56 -04:00
Kristian Høgsberg
ef04414f39
compositor: Repaint immediately after pageflip finishes
2011-06-21 15:02:12 -04:00
Benjamin Franzke
6f5fc69b67
compositor: Decrement buffers busy_count in post_release
2011-06-21 19:35:45 +02:00
Kristian Høgsberg
ec138901c1
Merge remote-tracking branch 'bnf/buffer.release-2'
...
Conflicts:
compositor/compositor.h
2011-06-21 13:10:01 -04:00
Benjamin Franzke
0628626d55
Implement buffer.release event
2011-06-21 18:41:37 +02:00
Kristian Høgsberg
2468692c9f
Merge remote-tracking branch 'bnf/fixes-2'
2011-06-21 11:31:38 -04:00
Kristian Høgsberg
8f0ce05f52
compositor: Send out more detailed output events
2011-06-21 11:16:58 -04:00
Benjamin Franzke
d72037cc78
compositor: Send frame event after redraw
2011-06-21 16:41:20 +02:00
Benjamin Franzke
fb4b5a293a
compositor: Do not leak old client buffers
2011-06-21 10:44:37 +02:00
Kristian Høgsberg
40caded030
compositor: Only use GL_LINEAR when surface is transformed
2011-06-20 19:48:16 -04:00
Kristian Høgsberg
cde9bfc805
compositor: Damage after setting surface width and height
2011-06-20 10:45:57 -04:00
Kristian Høgsberg
7c47667921
compositor-wayland: Update to new APIs
2011-06-20 10:45:57 -04:00
Kristian Høgsberg
7a5c979f4c
Move map requests to shell
2011-06-20 10:45:24 -04:00
Kristian Høgsberg
83eeacb489
compositor-x11: Support fullscreen mode
2011-06-18 04:20:54 -04:00
Kristian Høgsberg
ff073a6a6b
compositor: Don't pass a non-existing varying into the fragment shader
2011-05-19 12:05:51 -04:00
Kristian Høgsberg
52612f113c
meego-tablet-shell: Tweak spring constants
2011-05-19 11:55:50 -04:00
Casey Dahlin
9a06f700b5
Update .gitignore
2011-05-19 11:13:03 -04:00
Kristian Høgsberg
2e02d24cb3
compositor: Call wlsc_buffer_attach() after setting es->width
...
Otherwise we end up with a 0 pitch.
2011-05-16 10:42:06 -04:00
Egbert Eich
e7b8d9055e
compositor: Set EGL_PLATFORM env variable for each backend.
...
I may have missed something, but - since the Wayland compositor
already picks a platform backend, opens a connection and initializes the
backend specific display data structure it doesn't make sense
to let egl pick a platform. If it picks a different one the
display specific data structure will most likely not match.
Thus determine the platform in the Wayland rendering backend by setting
the EGL_PLATFORM env variable.
For the client any other platform than 'wayland' doesn't seem to make
sense.
I'm not sure if I've got the the platform ofr openfwd right.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
2011-05-10 16:42:08 -04:00
Kristian Høgsberg
b79216e7a0
meego-tablet-compositor: Only ask for lockscreen after we get homescreen
...
This way we don't fade up until the lockscreen is showing.
2011-05-10 14:40:08 -04:00
Benjamin Franzke
b7acce60e2
compositor: Fix warning in load_module
2011-05-06 23:19:22 +02:00
Benjamin Franzke
f2de6c7ba0
compositor-openwfd: Update to tty, cursor and cflags changes
2011-05-06 23:17:11 +02:00
Benjamin Franzke
4721a3c912
Make use of wl_resource.destroy_listener_list for surfaces.
2011-05-06 16:03:33 -04:00
Kristian Høgsberg
d8e181bd3f
compositor-drm: Hide hw cursors on vt switch
2011-05-06 15:38:28 -04:00
Kristian Høgsberg
9396fc515b
compositor-drm: Fix vt switching
...
Don't take input or render while switched away, drop and set master correctly.
2011-05-06 15:15:37 -04:00
Kristian Høgsberg
6c709a3e4f
Fix warnings and symbol visibility from missing CFLAGS
2011-05-06 14:52:41 -04:00
Kristian Høgsberg
bbefb136d1
Make sure all targets use GCC_CFLAGS
2011-05-06 14:49:06 -04:00
Kristian Høgsberg
e4c40a4734
compositor: Disable hw cursor if we're texturing the cursor
2011-05-06 14:04:21 -04:00
Kristian Høgsberg
4d07a1c213
compositor: Scanout client buffers even if they're not map_fullscreen
2011-05-06 14:03:12 -04:00
Kristian Høgsberg
7981d00a59
compositor-drm: Use EGL_DRM_BUFFER_USE_CURSOR_MESA
2011-05-06 13:23:49 -04:00
Kristian Høgsberg
5fa7f17199
meego-tablet-shell: Destroy tablet_client resource in destroy request
2011-05-05 15:30:40 -04:00
Kristian Høgsberg
bfcf07cd59
meego-tablet-shell: Handle app switcher choices
2011-05-05 15:25:28 -04:00
Benjamin Franzke
f64c66106f
compositor-openwfd: Fixup backend split
2011-05-04 16:18:31 -04:00
Kristian Høgsberg
81e8c26176
meego-tablet-shell: Rename tablet_client.poke to activate and add a destructor
2011-05-04 16:17:45 -04:00
Kristian Høgsberg
92fb0e9e39
meego-tablet-shell: Add requests to let ux-daemon ask for appgrid or panels
2011-05-04 16:16:43 -04:00
Kristian Høgsberg
8050bd217f
compositor-drm: Fix modularization breakage
2011-05-04 15:08:04 -04:00
Kristian Høgsberg
1258a4a552
meego-tablet-shell: Track the state of the UI explicitly
2011-05-04 11:35:02 -04:00
Kristian Høgsberg
f77ce46fe5
meego-tablet-shell: Handle meta key with super modifier so we get the release
2011-05-03 13:11:43 -04:00
Kristian Høgsberg
132c65360e
meego-tablet-shell: Handle animation surface going away
2011-05-03 12:41:03 -04:00
Kristian Høgsberg
1c5621840b
compositor: Split backends into modules
2011-05-02 22:09:20 -04:00
Kristian Høgsberg
9d09777e40
meego-tablet-shell: Use KEY_COMPOSE for the menu key
...
This is what the Windows menu key maps to in evdev keycodes.
2011-05-02 15:24:11 -04:00
Kristian Høgsberg
269c78286f
compositor: Rename tweener to spring
...
Because it's a spring model, not a tweener.
2011-05-02 14:38:18 -04:00
Kristian Høgsberg
0bc0e24968
compositor: Group matrix and inverse in struct wlsc_transform
2011-05-02 14:35:40 -04:00
Kristian Høgsberg
3a53efe26e
meego-tablet-shell: Factor out zoom animation
2011-05-02 14:21:03 -04:00
Kristian Høgsberg
d28b4d7be8
meego-tablet-shell: Match meego-ux-daemon key bindings
2011-05-02 14:11:15 -04:00
Kristian Høgsberg
3d1cad80c2
meego-tablet-shell: Only clear CLOEXEC flag in child
2011-05-02 13:57:38 -04:00
Kristian Høgsberg
d880e14f8a
compositor: Export matrix functions
2011-05-02 13:53:45 -04:00
Kristian Høgsberg
a04eecc27b
compositor: Drop broken opaque repaint optimization for now
2011-05-02 13:52:00 -04:00
Kristian Høgsberg
2e94d1120a
compositor: Remove unused surface matrix, add optional transform
2011-05-02 13:47:51 -04:00
Kristian Høgsberg
4a9be13d2a
Tweak tweener constants and add friction parameter
2011-05-02 13:38:03 -04:00
Kristian Høgsberg
fac11d25e4
Remove unused surface->buffer field
...
If we make sure the link is either on a list or initialized, we can alway
just remove it.
2011-05-02 13:35:17 -04:00
Benjamin Franzke
080ab6c1be
compositor-wayland: Fix interface renames (prefix)
2011-05-02 12:22:40 -04:00
Kristian Høgsberg
8544903741
compositor: Screenhoot into a client provided shm buffer
...
This moves the png writing part to the client and removes the gdk-pixbuf
dependency from the compositor.
2011-05-02 12:13:14 -04:00
Kristian Høgsberg
b41d76c151
compositor: Use libpng directly instead of gdb-pixbuf
2011-05-02 12:13:14 -04:00
Kristian Høgsberg
d34912c4f9
Just use getopt_long for option parsing
2011-05-02 12:13:13 -04:00
Benjamin Franzke
d59eb1c3aa
compositor-drm: Retrieve extension functions before wlsc_compositor_init
...
wlsc_compositor_init calls pointer_create, which calls
create_cursor which needs EGL_MESA_drm_image functions.
2011-04-29 22:20:25 +02:00
Casey Dahlin
48d49eb5f9
Add some new things to .gitignore
...
libtoytoolkit.a, and generated protocol headers for meego-tablet.
2011-04-29 10:30:13 -04:00
Benjamin Franzke
e28f84b7d8
compositor-openwfd: Use wfd_device_id as drm fd
...
owfdrm uses non-0 (0 == WFD_INVALID_DEVICE_ID) fd's as wfd_device_ids.
This is not standardized, but also not invalid.
2011-04-28 21:36:01 +02:00
Benjamin Franzke
7d36664c0d
compositor: Fix drm compositor cflags typo
2011-04-28 07:28:41 +02:00
Benjamin Franzke
0b5116f746
compositor: Recalculate fullscreen surface x,y in surface_attach
2011-04-26 11:18:57 -04:00
Benjamin Franzke
e5b3b2601c
Cast fd's to intptr_t before casting to EGLNativeDisplay
...
Fixes warnings on 64bit.
Also use wlsc_compositor::destroy_image in compositor-openwfd.
2011-04-26 11:18:43 -04:00
Kristian Høgsberg
80492e220a
configure: Only check dependencies for the enabled compositor backends
2011-04-26 11:10:32 -04:00
Kristian Høgsberg
172ffd1012
compositor: Fix overlapping options
2011-04-25 15:59:15 -04:00
Kristian Høgsberg
82ed0423a1
compositor-x11: Only use xcb_poll_for_queued_event if we have it
...
Otherwise we can just fall back to xcb_poll_for_event, and just do a
harmless read on the socket.
2011-04-25 15:41:59 -04:00
Kristian Høgsberg
b5819dc61d
compositor: Stop using EGL_EGLEXT_PROTOTYPES and look up extension functions
2011-04-25 15:35:05 -04:00
Kristian Høgsberg
c352ab03fe
compositor: Don't use glClear for clearing
...
Draw solid color rectangles clipped to the repaint area instead.
2011-04-25 14:28:31 -04:00
Benjamin Franzke
fab5ec1215
compositor: Use stride/4 as width for shm textures
2011-04-25 20:24:45 +02:00
Benjamin Franzke
cdd9db7ed2
compositor: Use EGL_WL_bind_wayland_display only if available
2011-04-25 19:34:36 +02:00
Kristian Høgsberg
eb7e12c73b
Add meego-tablet-shell
...
We'll probably break it out into its own repo down the road, but for
now keeping it here is convenient.
2011-04-23 13:17:43 -04:00
Kristian Høgsberg
02ec0a5d3a
compositor: Support loadable shells
...
The shell module is responsible for implementing the higher level
compositor behavior. We default to the desktop-lite shell built in to
the compositor.
2011-04-23 13:04:11 -04:00
Kristian Høgsberg
cce1aecd3c
compositor: Fade to black on idle timeout
2011-04-22 15:38:14 -04:00
Kristian Høgsberg
7ffc4488f4
compositor: Refactor shader setup a bit
2011-04-22 14:23:51 -04:00
Kristian Høgsberg
b31d7d7423
compositor-openwfd: Fix event handler return type
2011-04-22 14:05:32 -04:00
Kristian Høgsberg
e10a5d9fea
compositor: Implement a simple screensaver feature
...
We'll need protocol for screensaver inhibit requests.
2011-04-22 14:01:18 -04:00
Kristian Høgsberg
95d843de11
Also fix compositor-wayland event handler
2011-04-22 13:01:26 -04:00
Kristian Høgsberg
b1868479ad
Update return types of event handler functions
...
Missed this in previous commit.
2011-04-22 12:27:57 -04:00
Kristian Høgsberg
127d0f0050
compositor-x11: Adjust to event loop changes
...
Instead of having a separate check function, we just mark our x11 event
source as needing a post-dispatch check. The event loop will call our
dispatch function again after all dispatching is done, this time with
mask = 0. If we don't process any events, return 0, so the event loop
doesn't keep calling us.
2011-04-22 12:18:16 -04:00
Benjamin Franzke
315b3dc73b
Make use of wayland-server shm common code
2011-04-22 11:53:50 -04:00
Benjamin Franzke
bab41fb70c
compositor: Use surface_attached_to list for shm-buffers
2011-04-22 11:53:48 -04:00
Benjamin Franzke
0c347f0d72
compositor: Add wlsc_shm_buffer_attach
2011-04-22 11:53:47 -04:00
Benjamin Franzke
bde55ec8e4
Implement buffer.damage in shm, use it in window.c
2011-04-22 11:53:45 -04:00
Benjamin Franzke
e997c5fb09
compositor-x11: Set xcb to be eventqueue owner
...
This'll fix egl_gallium (when bind_wayland_display is done).
2011-04-22 10:35:10 -04:00
Kristian Høgsberg
df2f197076
compositor: Pass NULL for context to wayland buffer eglCreateImageKHR()
2011-04-21 23:48:57 -04:00
Kristian Høgsberg
ee72482a00
compositor-x11: Use check function to make sure we handle all events
...
If somebody else did an X11 round trip, that could leave events in the
XCB buffer that we wouldn't see until the next X event came in. The new
event source check function lets us check the XCB queue after dispatching
and this way we'll see events we need to deal with right away.
2011-04-21 14:54:33 -04:00
Kristian Høgsberg
025f7b8f8e
compositor-x11: Use the keymap_notify immediately following the focus_in event
...
The event handling gets a little trickier this way but we need the
keymap sent immdiately after the focus_in event to determine which keys
are pressed as the compositor receives keyboard focus.
2011-04-20 14:20:02 -04:00
Kristian Høgsberg
94da7e1767
compositor-x11: Generalize handling of event pairs
...
We need to look at the focus_in and keymap notify pair to correctly determine
the set of held down keys at focus in time, so generalize the handling
of event pairs in preparation for that.
2011-04-20 14:20:02 -04:00
Kristian Høgsberg
cf57dc52ff
Update to work with scanner that doesn't hardcode wl_*
...
This lets us drop the wl_ prefix for the un-officual screenshooter protocol.
2011-04-20 14:20:02 -04:00
Kristian Høgsberg
91342c6081
Switch to new subscribe protocol and wayland-egl
2011-04-20 14:20:02 -04:00
Benjamin Franzke
e649fac2d8
compositor-openwfd: Fixup rebase
2011-04-20 20:16:25 +02:00
Benjamin Franzke
5d00709931
compositor: Add OpenWF Display backend
2011-04-20 17:53:47 +02:00
Benjamin Franzke
66aa235b4c
Optimize fullscreen scanout abit
...
Use the drm fb_id used for the scanout-test
as well for the corresponding pageflip.
Move most of the scanout details into compositor-drm.
2011-04-20 17:30:12 +02:00
Kristian Høgsberg
218c0349ed
Merge remote-tracking branch 'bnf/fullscreen-pageflip'
2011-04-20 09:35:15 -04:00
Benjamin Franzke
431da9a4cc
Make use of a hardware cursor in compositor-drm
2011-04-20 15:29:35 +02:00
Benjamin Franzke
1178a3ce5c
compositor(-drm): Pageflip to fullscreen surfaces
2011-04-19 09:05:08 +02:00
Kristian Høgsberg
3ddd148fba
compositor-x11: Suppress keyboard repeat events
2011-04-15 15:48:07 -04:00
Kristian Høgsberg
10f097e8dd
Only invoke shell button bindings if there's a pointer focus surface
2011-04-13 11:52:54 -04:00
Kristian Høgsberg
547cadf375
Move more switcher details to switcher.c
2011-04-12 22:23:30 -04:00
Kristian Høgsberg
30021d7993
Move switcher behaviour into switcher.c
2011-04-12 22:09:42 -04:00
Kristian Høgsberg
0793756d52
Move shell bindings to shell.c
2011-04-12 22:09:42 -04:00
Kristian Høgsberg
a8ec86395d
Extend wlsc_binding to cover buttons too
2011-04-12 22:09:38 -04:00
Kristian Høgsberg
f512d07e2d
Update modifier state as input devices enter and leave
2011-04-12 17:16:00 -04:00
Kristian Høgsberg
0b9334a51a
Define _GNU_SOURCE for O_CLOEXEC flag
2011-04-12 11:34:32 -04:00
Kristian Høgsberg
c32c81b650
Remove typo
...
Failed to break up the patch into commits.
2011-04-11 16:49:17 -04:00
Kristian Høgsberg
11e2828bdc
Merge remote-tracking branch 'bnf/surface-frame-event'
...
Conflicts:
compositor/compositor.c
2011-04-11 16:47:50 -04:00
Kristian Høgsberg
3555d09813
Add a simple key binding mechanism
2011-04-11 13:58:13 -04:00
Kristian Høgsberg
04db9fa583
Call present after clearing repaint_needed
...
In case we end up scheduling a repaint in the finish_frame callback.
2011-04-11 13:39:43 -04:00
Kristian Høgsberg
cfc6d27b4c
Clip out pixels covered by opaque surfaces during repaint
2011-04-11 13:34:24 -04:00
Kristian Høgsberg
9cd7aca0e0
compositor-drm: Close drm fd on exec
2011-04-11 13:19:16 -04:00