Kristian Høgsberg [Mon, 16 Jan 2012 16:53:54 +0000 (11:53 -0500)]
compositor: Install a SEGV handler to try and clean up the VT if we crash
Kristian Høgsberg [Mon, 16 Jan 2012 15:57:14 +0000 (10:57 -0500)]
tty: Fix order of VT ack/release ioctls and the vt handler
We can only set up once we've acquired the VT and we shouldn't release the
VT until we've cleaned up. Before we would release the VT first, and then
race to drop drm master as X tried to get drm master. Which would kill X.
Kristian Høgsberg [Mon, 16 Jan 2012 15:54:07 +0000 (10:54 -0500)]
evdev: Drop noisy debug messages on vt swtich
Kristian Høgsberg [Mon, 16 Jan 2012 15:52:52 +0000 (10:52 -0500)]
compositor-drm: Exit if we failed to get drm master
We can do anything without drm master. Also log an error in case we
fail to drop it, which will be trouble for whoever we're switching to.
Kristian Høgsberg [Mon, 16 Jan 2012 03:16:11 +0000 (22:16 -0500)]
xserver: Create WM window, handle client messages
Olivier Le Thanh Duong [Sat, 14 Jan 2012 14:57:34 +0000 (15:57 +0100)]
evdev: Correct warning on missing input device
Kristian Høgsberg [Sun, 15 Jan 2012 21:05:28 +0000 (16:05 -0500)]
xserver: Just dup fd instead of two fcntls to get a non-O_CLOEXEC fd
Yeah, it's the same number of lines of code, but this actually checks
the error return.
Kristian Høgsberg [Sun, 15 Jan 2012 21:04:33 +0000 (16:04 -0500)]
xserver: Set DISPLAY for clients launched by the compositor
Kristian Høgsberg [Sun, 15 Jan 2012 20:51:12 +0000 (15:51 -0500)]
xserver: Don't set -logfile option, only available to root user
Kristian Høgsberg [Sun, 15 Jan 2012 20:17:58 +0000 (15:17 -0500)]
tty: Leave tty in KD_GRAPHICS mode during vt switches
Part of the point of KD_GRAPHICS mode is that the kernel doesn't try
to restore the VT contents when we switch bach, but leaves that
to the user mode process. This avoids ugly flicker of text mode contents
before the compositor takes over.
Kristian Høgsberg [Sun, 15 Jan 2012 19:29:09 +0000 (14:29 -0500)]
compositor-drm: Fail, and fail early if we can't set up the tty
Typically a permissions problem. Weston should be setuid root or
be launched by a setuid helper.
Kristian Høgsberg [Sun, 15 Jan 2012 20:20:53 +0000 (15:20 -0500)]
tty: Close tty fd on exit
Kristian Høgsberg [Sun, 15 Jan 2012 19:27:10 +0000 (14:27 -0500)]
tty: If no tty option is given, use stdin and make sure it's a vt
Richard Hughes [Fri, 13 Jan 2012 10:07:01 +0000 (10:07 +0000)]
Explicitly add GIO to the client libs
This prevents a build warning on Fedora 16 of:
undefined reference to symbol 'g_file_get_basename'
Kristian Høgsberg [Thu, 12 Jan 2012 15:48:51 +0000 (10:48 -0500)]
view: Make view compile again
Kristian Høgsberg [Wed, 11 Jan 2012 19:24:46 +0000 (14:24 -0500)]
Use new format codes
Kristian Høgsberg [Wed, 11 Jan 2012 16:18:14 +0000 (11:18 -0500)]
window: Don't deref focus widget if there isn't one
Kristian Høgsberg [Wed, 11 Jan 2012 05:09:42 +0000 (00:09 -0500)]
window: Remove a few unused struct fields
Kristian Høgsberg [Wed, 11 Jan 2012 05:04:42 +0000 (00:04 -0500)]
window: Move focus widget to struct input
Kristian Høgsberg [Wed, 11 Jan 2012 04:46:33 +0000 (23:46 -0500)]
window: Implement input device grabbing
With all input events going to widgets now, we can grab an input device
to a widget, so that all events are delivered to that widgets handlers.
This lets us implement the last bit of the menu behaviour, that is
the client side grabbing of events. The result is that we can now pop down
the menu when we receive clicks in the clients own windows and we
don't send motion and button events to other widgets.
Kristian Høgsberg [Wed, 11 Jan 2012 03:41:05 +0000 (22:41 -0500)]
window: Make decorations just a widget
Woohoo, only took 25 commits of refactoring to get to this point.
Kristian Høgsberg [Wed, 11 Jan 2012 00:11:42 +0000 (19:11 -0500)]
window: Get rid of the window child allocation concept
Kristian Høgsberg [Tue, 10 Jan 2012 19:28:58 +0000 (14:28 -0500)]
window: Break widget grab before shell surface move or grab
Kristian Høgsberg [Tue, 10 Jan 2012 18:59:23 +0000 (13:59 -0500)]
wscreensaver: Use a widget and a redraw handler
Kristian Høgsberg [Tue, 10 Jan 2012 18:52:34 +0000 (13:52 -0500)]
window: Keep widgets in a tree instead of a list
Kristian Høgsberg [Tue, 10 Jan 2012 17:25:04 +0000 (12:25 -0500)]
window: Use surface coordinates for looking up widgets
Kristian Høgsberg [Tue, 10 Jan 2012 17:23:19 +0000 (12:23 -0500)]
window: Make resize and redraw handlers widget vfuncs
Kristian Høgsberg [Tue, 10 Jan 2012 15:49:41 +0000 (10:49 -0500)]
window: Allocate and flush the window surface in window.c
No need to push this to the toolkit users.
Kristian Høgsberg [Tue, 10 Jan 2012 14:43:58 +0000 (09:43 -0500)]
window: Drop the window widget
It was just a temporary convenience for moving things over.
Kristian Høgsberg [Mon, 9 Jan 2012 23:56:37 +0000 (18:56 -0500)]
clients/image: Delete old old key code
Kristian Høgsberg [Mon, 9 Jan 2012 23:48:14 +0000 (18:48 -0500)]
window: Run deferred tasks before blocking for initial iteration
The first iteration of the while loop wouldn't run the deferred tasks
before blocking in epoll_wait(). Move things around so we do.
Kristian Høgsberg [Mon, 9 Jan 2012 16:22:32 +0000 (11:22 -0500)]
window: Return pointer type from widget enter handler
Kristian Høgsberg [Mon, 9 Jan 2012 16:16:50 +0000 (11:16 -0500)]
desktop-shell: Rename panel_widget to panel_launcher
Kristian Høgsberg [Mon, 9 Jan 2012 16:12:05 +0000 (11:12 -0500)]
window: Move button handler to widget
Kristian Høgsberg [Mon, 9 Jan 2012 15:42:41 +0000 (10:42 -0500)]
window: Use the window widget instead of adding a window sized widget
Kristian Høgsberg [Mon, 9 Jan 2012 15:34:35 +0000 (10:34 -0500)]
window: Create a widget for the window, drop window motion handler
Kristian Høgsberg [Mon, 9 Jan 2012 14:44:45 +0000 (09:44 -0500)]
window: Convert a few clients to use widget motion handler
Kristian Høgsberg [Mon, 9 Jan 2012 14:36:16 +0000 (09:36 -0500)]
window: Add a widget motion handler
Kristian Høgsberg [Mon, 9 Jan 2012 14:32:07 +0000 (09:32 -0500)]
window: Remove window enter/leave handlers
Kristian Høgsberg [Mon, 9 Jan 2012 14:26:38 +0000 (09:26 -0500)]
dnd: Use a widget for enter/leave handling
Kristian Høgsberg [Mon, 9 Jan 2012 14:22:30 +0000 (09:22 -0500)]
window: Use widget enter/leave handlers for menu
Kristian Høgsberg [Mon, 9 Jan 2012 13:42:24 +0000 (08:42 -0500)]
window: Replace widget focus handler with a enter/leave handler pair
Kristian Høgsberg [Sun, 8 Jan 2012 20:41:52 +0000 (15:41 -0500)]
window: Use display_exit() instead of exit() in window menu
Kristian Høgsberg [Sun, 8 Jan 2012 20:18:19 +0000 (15:18 -0500)]
window: Move widget focus handler to the widget
Kristian Høgsberg [Sun, 8 Jan 2012 20:09:53 +0000 (15:09 -0500)]
window: Rename item to widget
It's a widget.
Kristian Høgsberg [Sat, 7 Jan 2012 02:59:05 +0000 (21:59 -0500)]
window: Add a window menu
At least this gives us a way to close the toy toolkit clients.
Kristian Høgsberg [Fri, 6 Jan 2012 20:24:52 +0000 (15:24 -0500)]
Remove redundant glTexImage2D() call
When we later upload the cursor image with glTexImage2D(), that will unbind
the image just fine. No need for a NULL upload. Except that that doesn't
currently happen with mesa drivers, but the NULL upload is redundant either
way.
Kristian Høgsberg [Fri, 6 Jan 2012 19:37:19 +0000 (14:37 -0500)]
compositor: Damage below before attaching new buffer
Kristian Høgsberg [Thu, 5 Jan 2012 03:19:14 +0000 (22:19 -0500)]
shell: Start implementing the popup surface type
This lands the basic behavior of the popup surface type, but there are still
a number of details to be worked out. Mainly there's a hardcoded timeout
to handle the case of releasing the popup button outside any of the
client windows, which triggers popup_end if it happens after the timeout.
Maybe we just need to add that as an argument, or we could add a new event
that fires in this case to let the client decide whether it ends the popup
or not.
Kristian Høgsberg [Thu, 5 Jan 2012 02:47:30 +0000 (21:47 -0500)]
Move wl_data_device implementation to wayland-server
Kristian Høgsberg [Thu, 5 Jan 2012 02:31:03 +0000 (21:31 -0500)]
Move default grab implementation to wayland-server
Kristian Høgsberg [Thu, 5 Jan 2012 02:30:29 +0000 (21:30 -0500)]
Use new grab api
Rob Bradford [Thu, 5 Jan 2012 15:30:00 +0000 (15:30 +0000)]
compositor: Don't try and destroy old pointer surface if it empty
If attach was called on wl_input_device with a nil buffer twice then the
second call would cause a segfault.
Pekka Paalanen [Thu, 5 Jan 2012 14:41:21 +0000 (16:41 +0200)]
evdev: warn about missing input devices
Usually there should be at least one input device, when Weston starts
up, or is reactivated by a VT switch. Add a nice warning, in case there
are no input devices.
This is to give a clue to users who happen to try Weston on DRM, and
do not get any response.
Add also a message to another failure case, that may lead to missing
input devices.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen [Thu, 5 Jan 2012 14:28:21 +0000 (16:28 +0200)]
compositor: force fade-in on start
Weston initialises to faded-out state, which means all outputs are just
black, even if they render fine.
Previously the fade-in was triggered probably by some random input
event, since Weston was not guaranteed to wake up. Especially with the
drm backend, and the usual problem of not having permissions to input
devices, Weston would not fade in at all and appear broken.
Force Weston to fade in right after initialisation. This show that at
least rendering works, if it does not respond to any input.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen [Wed, 4 Jan 2012 12:09:05 +0000 (14:09 +0200)]
shell: free memory on move/resize error paths
Memory leaks noticed by Valgrind, when wl_input_device_update_grab()
fails.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Kristian Høgsberg [Wed, 4 Jan 2012 04:24:14 +0000 (23:24 -0500)]
compositor-x11: Just a few more weston renames
Kristian Høgsberg [Wed, 4 Jan 2012 04:00:12 +0000 (23:00 -0500)]
x11: Dont claim the X11 selection when we set the proxy Wayland selection
Kristian Høgsberg [Wed, 4 Jan 2012 03:58:14 +0000 (22:58 -0500)]
data-device: Use a listener list to decouple the x11 selection bridge
Kristian Høgsberg [Wed, 4 Jan 2012 03:55:25 +0000 (22:55 -0500)]
x11: Initialize wm->incr when converting the TARGETS target
Kristian Høgsberg [Wed, 4 Jan 2012 03:53:33 +0000 (22:53 -0500)]
x11: Handle non-existing properties correctly
Don't try to read out ATOM or WINDOW values if there is no such property.
Kristian Høgsberg [Wed, 4 Jan 2012 03:43:36 +0000 (22:43 -0500)]
data-device: Fix a few bugs in the commit to drop ref-counting
Did not test that change.
Kristian Høgsberg [Tue, 3 Jan 2012 19:35:49 +0000 (14:35 -0500)]
More weston rename fixes
Kristian Høgsberg [Tue, 3 Jan 2012 19:11:07 +0000 (14:11 -0500)]
data-device: Handle source going away instead of ref-counting it
We have to deal with the data source going away. Even if we have a
reference to the server side data source, we can't do anything if the
client that provided the source went away. So just NULL the offers
source pointer in the destroy callback for the source.
Kristian Høgsberg [Tue, 3 Jan 2012 16:40:25 +0000 (11:40 -0500)]
Fix a few missing wlsc->weston renames
Kristian Høgsberg [Tue, 3 Jan 2012 16:29:15 +0000 (11:29 -0500)]
Merge remote-tracking branch 'pq/compositor-dtors-v1'
This collided with the big weston rename, but git did a good job of fixing
most cases.
Conflicts:
compositor/compositor.h
src/compositor-x11.c
src/compositor.c
src/screenshooter.c
src/util.c
Kristian Høgsberg [Tue, 3 Jan 2012 16:02:46 +0000 (11:02 -0500)]
Fix distcheck
Kristian Høgsberg [Tue, 3 Jan 2012 15:29:47 +0000 (10:29 -0500)]
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
Pekka Paalanen [Tue, 3 Jan 2012 09:58:34 +0000 (11:58 +0200)]
compositor-x11: improve x11_destroy()
Free many things we were leaking before:
- input device
- EGL resources
- xcb event source
- X Display
Fixes lots of Valgrind leaks.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen [Tue, 3 Jan 2012 09:51:03 +0000 (11:51 +0200)]
compositor-x11: implement x11_output_destroy()
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen [Tue, 3 Jan 2012 11:27:41 +0000 (13:27 +0200)]
compositor: fix use after free in wlsc_zoom_frame
Add the missing return statement, so the destroyed zoom object is not
used.
Found by Valgrind.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen [Tue, 3 Jan 2012 09:39:13 +0000 (11:39 +0200)]
compositor: add screenshooter destructor
Nothing was freeing the allocation from screenshooter_create().
Add enough boilerplate, that we can free it. Fixes a Valgrind leak.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen [Tue, 3 Jan 2012 08:26:03 +0000 (10:26 +0200)]
compositor: remove unused member from wlsc_input_device
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen [Tue, 3 Jan 2012 08:23:24 +0000 (10:23 +0200)]
compositor: free region members on surface destroy
The two pixman regions of struct wlsc_surface were not being freed
properly.
Fixes some Valgrind errors.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen [Mon, 2 Jan 2012 13:31:01 +0000 (15:31 +0200)]
compositor: add wlsc_input_device_fini()
Add a function for destroying all objects allocated in
wlsc_input_device_init().
This patch depends on "server: add wl_input_device_fini()" commit in the
Wayland core.
Compositor backends could now call wlsc_input_device_fini() to fix some
memory leaks.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen [Mon, 2 Jan 2012 14:06:56 +0000 (16:06 +0200)]
compositor: more cleanup on shutdown
Free idle_source, shm, and vertices and indices arrays on compositor
shutdown.
Fixes some Valgrind errors.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen [Mon, 2 Jan 2012 14:03:26 +0000 (16:03 +0200)]
compositor: clean up signal event sources on exit
Fixes some Valgrind errors.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen [Tue, 3 Jan 2012 08:01:20 +0000 (10:01 +0200)]
compositor: avoid scheduling rendering on shutdown
After the compositor exits the main loop in wl_display_run(), set the
compositor state to SLEEPING. This prevents scheduling repaints, that
will never be executed.
A repaint is scheduled by calling wl_event_loop_add_idle(), which
creates an idle event source. Normally the idle event source object is
destroyed after it has been executed. However, in the shutdown case we
never dispatch events again, and the object is leaked.
This leak is triggered by shell.c destructor, which destroys the
desktop-shell client. Destroying a client ends up calling
wlsc_compositor_schedule_repaint() while destroying the client
resources, especially surfaces.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen [Mon, 2 Jan 2012 14:00:24 +0000 (16:00 +0200)]
shell: destroy desktop_shell client on exit
If the compositor is shutting down while the desktop_shell still exists,
we leaked some resources by not destroying the client record.
Call wl_client_destroy() on the desktop_shell client, if it exists
during shutdown. Fixes some Valgrind errors.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen [Mon, 2 Jan 2012 13:47:07 +0000 (15:47 +0200)]
compositor: destroy all input binding objects on shutdown
wlsc_binding_destroy() was not being called at all. Fix the leaks by
introducing a function that destroys a whole list of bindings, instead
of individually saving an extra pointer to the binding object and
calling wlsc_binding_destroy() separately on each.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen [Mon, 2 Jan 2012 13:42:44 +0000 (15:42 +0200)]
compositor: free regions in wlsc_output_repaint()
Some of the local pixman region objects were not being properly
destroyed before returning from the function. Destroy them, fixes
some Valgrind errors.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen [Thu, 22 Dec 2011 11:43:43 +0000 (13:43 +0200)]
compositor: add destructors to shell plugins
Add a new wlsc_shell API function for destroying the shell plugin
object. Helps to reduce Valgrind reports.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Kristian Høgsberg [Thu, 29 Dec 2011 19:16:42 +0000 (14:16 -0500)]
x11: Clear X11 selection when we can't bridge the data type
Kristian Høgsberg [Thu, 29 Dec 2011 03:51:20 +0000 (22:51 -0500)]
Fix WL_EVENT_WRITEABLE typo
Kristian Høgsberg [Thu, 29 Dec 2011 03:29:23 +0000 (22:29 -0500)]
x11: Bridge Wayland selections to X11 CLIPBOARD selection
This is the other direction. The selection bridge will grab the X11
CLIPBOARD selection on behalf of the Wayland client when it sets the
Wayland selection. Right now only UTF-8 text is supported, but the
data types offered will be taken from the Wayland data source.
Kristian Høgsberg [Thu, 29 Dec 2011 03:04:27 +0000 (22:04 -0500)]
terminal: Don't close fd twice
Kristian Høgsberg [Wed, 28 Dec 2011 04:01:23 +0000 (23:01 -0500)]
x11: Handle BadWindow errors
Kristian Høgsberg [Wed, 28 Dec 2011 03:47:51 +0000 (22:47 -0500)]
x11: Remove destroy listener when X11 window is destroyed
Kristian Høgsberg [Wed, 28 Dec 2011 02:36:41 +0000 (21:36 -0500)]
x11: Store interesting window properties, dump a few more things
Kristian Høgsberg [Wed, 28 Dec 2011 01:20:46 +0000 (20:20 -0500)]
x11: Improvide debugging output a bit
Kristian Høgsberg [Tue, 27 Dec 2011 19:05:36 +0000 (14:05 -0500)]
x11: Remove a couple of done TODOs
Kristian Høgsberg [Tue, 27 Dec 2011 19:02:40 +0000 (14:02 -0500)]
compositor: Pull in hash table from protocol
We use it in the X WM implementation, but we don't want it in the core
libraries.
Kristian Høgsberg [Tue, 27 Dec 2011 18:50:04 +0000 (13:50 -0500)]
x11: Bridge X11 CLIPBOARD selection to Wayland clients
Kristian Høgsberg [Fri, 23 Dec 2011 18:33:45 +0000 (13:33 -0500)]
compositor-x11: Use ARRAY_LENGTH macro from wayland-util.h
Kristian Høgsberg [Thu, 22 Dec 2011 19:43:09 +0000 (14:43 -0500)]
compositor: Handle disappearing surfaces and input devices for touch
Kristian Høgsberg [Thu, 22 Dec 2011 03:54:49 +0000 (22:54 -0500)]
clients: Add simple-touch client for testing touch events.
Kristian Høgsberg [Thu, 22 Dec 2011 03:18:36 +0000 (22:18 -0500)]
evdev: Store positions for all touch points in the evdev device
We need to store all touchpoint positions so that if we just get an
ABS_MT_POSITION_X or Y event, we can pull the other coordinate from the
cache. And we need this across invocations of evdev_input_device_data(),
so the accumulator approach doesn't work.
Instead, we go back to the approach of storing all this state in the
evdev device struct and we might as well just move the rel and abs state
there too.
Kristian Høgsberg [Wed, 21 Dec 2011 22:25:54 +0000 (17:25 -0500)]
compositor: Send touch_up before clearing touch focus
Otherwise it never gets sent.
Kristian Høgsberg [Wed, 21 Dec 2011 22:14:54 +0000 (17:14 -0500)]
window.c: Add touch event stubs
Prevent window.c clients from crashing on touch events.
Kristian Høgsberg [Wed, 21 Dec 2011 22:11:45 +0000 (17:11 -0500)]
window.c: Rename input handlers to input_handle_*
They're event handlers for the input object, not the window object.