Commit Graph

1975 Commits

Author SHA1 Message Date
Kristian Høgsberg 572c2ff59a compositor: Add --help option 2012-07-30 15:41:14 -04:00
Pekka Paalanen 3361639b7b compositor: do clean-up on init failure
Simply exit(1)'ing the program will leave the VT unusable, since
DRM backend's clean-up does not run.

After a backend has been initialised, prefer jumping to clean-up instead
of directly exiting.

This fixes the case where 'weston-launch -- -i 5' would leave the
console unusable.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-07-30 12:42:31 -04:00
Kristian Høgsberg 148ef0124f compositor-drm: Don't leak output->name 2012-07-26 23:04:37 -04:00
Kristian Høgsberg 9ca38464cb compositor-drm: Look through all crtc/encoder combinations
We used to only check the first possible encoder, now we go through all
possible encoders and look through all possible crtcs for each encoder.
2012-07-26 22:44:55 -04:00
Kristian Høgsberg 2f9ed71a8f compositor-drm: Assign unique output names like xrandr does 2012-07-26 17:57:15 -04:00
Kristian Høgsberg 1acd9f82f8 compositor: Load modules with RTLD_NOW so we get missing symbols up front
Otherwise we have no way to clean up when we hit something undefined.
2012-07-26 11:39:26 -04:00
Kristian Høgsberg 72b0f8f2ec Update src/weston-egl-ext.h 2012-07-23 20:54:42 -04:00
Daniel Stone 9d01a3e548 evdev: Release weston_seat with underlying evdev device
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-23 20:18:06 -04:00
Daniel Stone 816c98edb0 Fix memory leak on compositor exit
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-23 20:18:00 -04:00
Daniel Stone 53b6b04685 evdev: Don't ignore multitouch touchscreens
Most touchscreen drivers provide ABS_X and BTN_TOUCH for legacy
single-touch emulation modes, but this isn't mandatory.  Make sure we
don't ignore touchscreens with provide multitouch events with the new
API only.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-23 20:17:54 -04:00
Kristian Høgsberg 0e696478a9 Handle new transform argument in wl_output.geometry event 2012-07-22 15:49:57 -04:00
Kristian Høgsberg c4063f310a xwm: Make override-redirect windows opaque 2012-07-22 15:32:45 -04:00
Tiago Vignatti ce1baa8097 xwm: use last focused window for guessing transient parent
On X the global absolute coordinates are sent in ConfigureNotify and transient
windows are mapped exactly on that position. On Wayland we don't have the
concept of global coordinates, and that's a problem for transient surfaces
without transient_for set because they rely on such hint for setting their
positioning.

So this solution is a workaround. It guesses a parent based on the last
focused window to determine the relative position of the transient surface.
This put transient windows of Chrome browser back to work.

Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-07-22 14:35:25 -04:00
Tiago Vignatti e66fcee435 xwm: Fix transient positioning
Commit eaee7841 took out the configure positioning of windows. This patch
brings it back and addresses also logic for resizing and sub-menus, that was
not covered on that commit.

Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-07-22 14:28:35 -04:00
Tiago Vignatti 2ea74d9f71 xwm: Initialize window decoration always as !override
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-07-22 14:26:49 -04:00
Philipp Brüschweiler f25602bdc0 Extract the text_model_manager interface from input_method
This is necessary because all clients need a way to create
text_models, but only one client at a time can be bound to
the input_method global (else we don't know to whom we are
supposed to send events).
2012-07-22 12:06:10 -04:00
Kristian Høgsberg f97f379dfc text-backend.c: Whitespace fixes
Use a temp variable to break a couple of long lines, break a few long
lines.
2012-07-22 11:51:42 -04:00
Philipp Brüschweiler 1746781385 text-backend: minor fixes
* make sure deactivation is done consistently when a text_model
  is destroyed
* zero out allocated objects
2012-07-22 11:49:18 -04:00
Kristian Høgsberg 1e51fecdf5 compositor: Destroy pending surface callbacks when destroying surface
Reported by Dima Ryazanov <dima@gmail.com> in
<1341937691-26234-1-git-send-email-dima@gmail.com> but we also need to
destroy callbacks when the surface is destroyed normally.
2012-07-22 11:34:19 -04:00
Tiago Vignatti 65191d144f shell: Remove unused pointer_end_grab
shell_grab_end already does that for us.

Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-07-20 15:31:52 -04:00
Tiago Vignatti 9134b77f2c xwm: Don't try to change frame cursor when there's no decoration
It was causing some artifacts on chrome.

Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-07-20 15:31:00 -04:00
Kristian Høgsberg a08b528597 shell: Center fullscreen surface whenever new buffer is attached 2012-07-20 15:31:00 -04:00
Kristian Høgsberg 905d7cedf5 compositor: Update to use new tokens for EGL_WL_bind_wayland_display 2012-07-19 14:20:20 -04:00
Kristian Høgsberg 71375066a4 Never install weston setuid
We don't support this anymore.  weston requires a setuid helper (such as
weston-launch) to run under kms, and should never run as root itself.

Disabe the setuid warning in configure.ac since we now only install the
minimal weston-launch as setuid.
2012-07-19 14:17:58 -04:00
Kristian Høgsberg 82a1d11cfa shell: Set shell_interface.shell at initialization 2012-07-19 14:02:49 -04:00
Kristian Høgsberg 70a11b131d compositor-drm: Remove cursor debug message 2012-07-18 17:23:41 -04:00
Kristian Høgsberg 1f5de35482 compositor-drm: Only update hw cursor contents when it changes
We avoid the memcpy, gbm_bo_write and the drmModeSetCursor ioctl per frame.
2012-07-18 15:52:14 -04:00
Kristian Høgsberg 24e4275c30 compositor-drm: Only call drmModeMoveCursor() if hw cursor position changed
Saves an ioctl per frame.
2012-07-18 15:52:14 -04:00
Kristian Høgsberg f1ea63ff05 compositor: Don't record surface damage when we move or transform surfaces
surface->damage is for when the contents of the surface changes.  Instead,
use weston_surface_damage_below() to repaint the damaged area.  We avoid
unecessary uploading shm and hw cursor contents this way.
2012-07-18 15:52:14 -04:00
Kristian Høgsberg 94de680439 shell: Default to maximize/fullscreen on current output 2012-07-18 15:52:13 -04:00
Kristian Høgsberg 971cbc8c9e compositor: Free the right EGLImage
We forgot to index the image array and freed image[0] multiple times
2012-07-17 14:21:25 -04:00
Kristian Høgsberg 4901f6ceea compositor-drm: Allocate hw cursor like other planes
We no longer reserve the hw cursor for just the pointer sprite.  Any
surface that satisfies the requirements for the hw cursor can be used.

Of course that's more or less always the pointer sprite, but at least now
we don't hard-code the references to compositor->seat anymore.
2012-07-16 16:44:24 -04:00
Kristian Høgsberg a6edab3e23 compositor-drm: Combine drm_output_set_cursor and weston_output_set_cursor
weston_output_set_cursor was the left-over of a core compositor cursor
helper that we moved into compositor-drm.c.
2012-07-16 16:44:24 -04:00
Kristian Høgsberg 6143f7dfbd compositor-drm: Assign primary framebuffer in assign_planes callout
Determining whether it was possible to use a surface buffer as the
primary framebuffer was always a bit of a hack.  Just before rendering,
we look at the second top-most surface to see if it's the right size and
position and then use it if it is.  If we have a hw cursor and a drm
plane on top, it's no longer the second top-most and it wouldn't be picked
even if it could work.

With this change, we inspect surfaces in drm_assign_planes and try to find
a candidate for the primary fb there.  We track the overlap like for
overlays and if there is a surface that's not overlapped and fills the
output we pick it.

This commit also consolidate the logic to track damage as we move a surface
in and out of the primary plane, which was missing in the drm plane case.
2012-07-16 16:44:23 -04:00
Kristian Høgsberg 3b00bae996 compositor-drm: Support hardware scaling with drm planes
The kms planes support scaling, so try to detect transformations that
are just translations + scaling and program the kms plane accordingly.

In particular, this lets us fullscreen a yuv surfaces with the scale method
and have the compositor use a kms plane for scaling and color conversion.
2012-07-16 16:44:23 -04:00
Kristian Høgsberg 270a7cb02d compositor-drm: Follow gbm_bo_get_pitch rename to gbm_bo_get_stride
It was always a confusing mis-nomer, fix it while we can.
2012-07-16 16:44:16 -04:00
Kristian Høgsberg 2763a2e94e compositor-drm: Use gbm_bo_import instead of gbm_bo_create_from_egl_surface
This lets us create the gbm bo from the wl_buffer instead of the
EGLImage.  With planar buffer, the EGLImage corresponds to a plane
and not the entire planar buffer.

More importantly, with some YUV formats (packed YUYV and similar) we use
several EGLImages to sample the different components, but KMS only
want one plane in that case.
2012-07-16 16:40:29 -04:00
Tiago Vignatti c190323c90 xwm: set the root window pointer to left_ptr
More pretty and also consistent with toytoolkit.

Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-07-16 13:35:27 -04:00
Tiago Vignatti 236b48d414 xwm: set appropriate cursors for the frame window
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-07-16 13:35:27 -04:00
Tiago Vignatti 90fada4338 xwayland: add simple xcb-cursor hook based on libXcursor
It's in fact based on the core of libXcursor, which doesn't bring any Xlib
dependency.

Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-07-16 13:35:27 -04:00
Kristian Høgsberg e89cef37eb xwayland: Look up 32 depth rgba render format as well 2012-07-16 13:35:27 -04:00
Kristian Høgsberg e6d8d2f62a xwayland: Use the right length for iterating through the formats array
Spotted by Tiago Vignatti, minimal fix to just use the right length.
2012-07-16 13:35:26 -04:00
Ander Conselvan de Oliveira eac9a46012 shell: Don't ping the grab surface
If the grab surface happens to be unresponsive, the busy cursor grab
will be started and that will cause the grab surface to receive focus,
which in turn leads to it being pingged again. Break the cycle by not
sending pings to it. If the shell is unresponsive it won't be able to
set the busy cursor anyway.
2012-07-16 13:35:25 -04:00
Kristian Høgsberg c7814d2e98 compositor: Don't send wl_surface.enter/leave if we didn't find a resource 2012-07-12 12:34:43 -04:00
Kristian Høgsberg 240dfeb0fe shell: Scale fullscreen surface without cropping them, center on output 2012-07-12 12:32:31 -04:00
Tiago Vignatti cd717b5695 compositor: remove useless weston_compositor_repick call
compositor->focus was just unset, and weston_compositor_repick() has no
effect.

Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-07-11 22:26:25 -04:00
Rafal Mielniczuk 96ddcb25ab clipboard: add seat destroy signal handler 2012-07-11 15:42:46 -04:00
Gwenole Beauchesne 28f59b027a compositor: handle YUV buffers.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
2012-07-10 15:57:01 -04:00
Kristian Høgsberg 76574d1fb7 Update weston-egl-ext.h with EGL_WL_bind_wayland_display changes 2012-07-10 15:56:12 -04:00
Gwenole Beauchesne faf91854a8 compositor: add YUV shaders.
Add shaders for NV12 (2 planes), YUV (3 planes) and YUYV (sampled as 2 planes)

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
2012-07-10 15:54:17 -04:00