Commit Graph

749 Commits

Author SHA1 Message Date
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
Gwenole Beauchesne 6d0304904c compositor: factor out RGB shader.
Simplify RGB shader code and split off common code that could be reused.
This is preparatory work for YUV shaders.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
2012-07-10 15:44:33 -04:00
Gwenole Beauchesne 023f855f8d compositor: prepare for multi-planar surfaces.
Make weston_surface::texture and ::surface an array, while keeping
[0] for RGB surfaces.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
2012-07-10 15:44:33 -04:00
Juan Zhao 4ab9468865 shell: Use the correct the member name when iterating panel_list
It does not get the correct panel height for now.  The memeber of list
to read should be layer_link not link now.

Signed-off-by: Juan Zhao <juan.j.zhao@linux.intel.com>
2012-07-10 08:47:25 -04:00
Kristian Høgsberg e4d3a2bce6 Only position fullscreen surface in surface->configure callback
We end up calling shell_configure_fullscreen() from activate(), where
surface->buffer may be NULL.  Instead, call it on initial map and
first buffer attach after surface type change.  Both code path
come from the surface->configure callback where surface->buffer is know
to be non-NULL.

https://bugs.freedesktop.org/show_bug.cgi?id=51678
2012-07-09 21:49:10 -04:00
Martin Olsson 197214112c xwayland: Don't leak fd while reading lock file in src/xwayland/launcher.c 2012-07-09 17:50:45 -04:00
Martin Olsson 11434bb2ea compositor-x11: Add error handling in x11_compositor_create() 2012-07-09 17:50:45 -04:00
Martin Olsson c5db50f549 compositor-wayland: Add error handling in wayland_compositor_create() 2012-07-09 17:50:45 -04:00
Martin Olsson c5da0999fe compositor-android: Add proper error handling in android_compositor_create() 2012-07-09 17:50:45 -04:00
Ander Conselvan de Oliveira f1c00c0b76 compositor: Always empty the input region of the pointer surface
Otherwise a surface.attach request might cause the input region to be
reset to the default value (the entire surface) causing it to receive
focus.

Tiago ran into this problem with xwayland.
2012-07-09 17:32:46 -04:00
Kristian Høgsberg 1248158e7d compositor-x11: Set make and model so we don't send NULL strings 2012-07-02 21:24:57 -04:00
Rob Bradford 31b6862eeb shell: Use desired output when sending configure events when maximised
With shell_surface.set_maximised the caller can provide an output to maximise
to or the default output will be used. With the corresponding configure we
should use the dimensions from the chosen output not the output the surface
was currently on.

Similarly when calculating the position for the window in the map() function
we should use the desired output again.

There is no need to assign shsurf->output to es->output since that happens in
the map() function later.
2012-07-02 15:16:19 -04:00
Rob Bradford 8f24156926 compositor: Correctly calculate changed sub image rectangle
When calling glTexSubImage2D for sub image updates for SHM surfaces the
changed rectangle was being wrongly calculated. This resulted in interesting
redraw artefacts for clients using SHM.
2012-07-02 14:41:47 -04:00
Rafal Mielniczuk 340a4343d0 clipboard: initialise clipboard memory after creation
In case we don't, weston segfault in clipboard_set_selection
on:
if (clipboard->source)
		clipboard_source_unref(clipboard->source);
2012-07-01 21:04:48 -04:00
Ander Conselvan de Oliveira 00d17bb903 shell: Don't move fullscreen surfaces 2012-06-28 14:14:01 -04:00
Ander Conselvan de Oliveira b9d2a0fc0a shell: Show approprite cursors during move and resize grabs
This patch expands the busy cursor mechanism so that it is possible for
the desktop-shell client to show the appropriate cursor during grabs.
2012-06-28 14:13:57 -04:00
Ander Conselvan de Oliveira 1fbda0e81d compositor: Always allow owner of pointer surface to change the hotspot
Make pointer_set_cursor() succeed if a client that doesn't have pointer
focus but is the owner of the current pointer surface calls it.
2012-06-28 14:13:52 -04:00
Kristian Høgsberg 73694c832b compositor: Move repaint debug binding to mod-shift-space
Alt-space or Super-space are too likely to conflict with application
bindings.
2012-06-28 14:13:10 -04:00
Kristian Høgsberg c7cd626bcf compositor: Update xkb state with key releases on focus out
This happens when vt-switching away from the compositor (drm) or
giving keyboard focus to a different X window.  Release the modifiers
so we don't get stuck modifiers.  We'll update with the new keys down
when we come back.
2012-06-28 13:46:09 -04:00
Kristian Høgsberg 061c425331 compositor-drm: Improve initial mode picking
We now pick the driver preferred mode for our initial mode.  If no preferred
mode is available we default to the current mode.  We also have a command
line option now to keep the current mode if it differs from the preferred.

This commit also drops the built-in mode and insteade uses the current mode
if the connector doesn't report any modes.
2012-06-28 11:47:42 -04:00
Kristian Høgsberg 8150b190d6 shell: Take a wl_surface as parent for transient and popup windows 2012-06-27 10:24:22 -04:00
Kristian Høgsberg 0636ac307e shell: Make input_panel just a regular wl_surface 2012-06-27 10:24:21 -04:00
Kristian Høgsberg 1a73a6335d shell: Make screensaver just a wl_surface 2012-06-27 10:24:21 -04:00
Kristian Høgsberg 730c94d62e shell: Make the lock surface just a plain wl_surface too 2012-06-27 10:24:21 -04:00
Kristian Høgsberg af7b1ffaf4 shell: Make panel just a wl_surface too 2012-06-27 10:24:21 -04:00
Kristian Høgsberg 962342cb8e shell: Don't make desktop_shell background a wl_shell_surface
We don't gain anything from taking a wl_shell_surface in
desktop_surface.set_background, except making wl_shell_surface
gratuitously dependent on wl_shell.  In shell.c we can also handle
backgrounds in their own background_configure function which simplifies
the mapping and placement logic.
2012-06-26 16:29:53 -04:00
Ander Conselvan de Oliveira 01a57ed506 compositor-drm: Don't leak FBs when the buffer of a sprite is detroyed
As a side effect, the overlay is disabled when the buffer is destroyed.
2012-06-26 10:25:24 -04:00