c1565f3ca6
This was built as a hack for simple Wayland compositors like Weston
which were lazy and didn't want to configure windows server-side when
moved.
Since comboboxes and menus are separate toplevel O-R windows, this hack
breaks input as it needs to be traced normally, not simply sent to the
focused window.
X11 toolkits really do need their windows to be configured correctly
for their O-R windows comboboxes or menus other things, so let's fix
the lazy compositors and remove this.
I have tested this patch with both Weston and Mutter and neither of
them require any changes, and it fixes comboboxes and menus.
If somebody then wants to revert 73698d4, that's fine by me, so we
reduce the amount of API that DDXen have.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
179 lines
4.9 KiB
C
179 lines
4.9 KiB
C
/*
|
|
* Copyright © 2014 Intel Corporation
|
|
*
|
|
* Permission to use, copy, modify, distribute, and sell this software
|
|
* and its documentation for any purpose is hereby granted without
|
|
* fee, provided that the above copyright notice appear in all copies
|
|
* and that both that copyright notice and this permission notice
|
|
* appear in supporting documentation, and that the name of the
|
|
* copyright holders not be used in advertising or publicity
|
|
* pertaining to distribution of the software without specific,
|
|
* written prior permission. The copyright holders make no
|
|
* representations about the suitability of this software for any
|
|
* purpose. It is provided "as is" without express or implied
|
|
* warranty.
|
|
*
|
|
* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
|
|
* SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
|
* FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
* SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
|
|
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
|
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#ifndef XWAYLAND_H
|
|
#define XWAYLAND_H
|
|
|
|
#include <dix-config.h>
|
|
|
|
#include <stdio.h>
|
|
#include <unistd.h>
|
|
#include <errno.h>
|
|
|
|
#include <wayland-client.h>
|
|
|
|
#include <X11/X.h>
|
|
|
|
#include <fb.h>
|
|
#include <input.h>
|
|
#include <dix.h>
|
|
#include <randrstr.h>
|
|
#include <exevents.h>
|
|
|
|
struct xwl_screen {
|
|
int width;
|
|
int height;
|
|
int depth;
|
|
ScreenPtr screen;
|
|
WindowPtr pointer_limbo_window;
|
|
int expecting_event;
|
|
|
|
int wm_fd;
|
|
int listen_fds[5];
|
|
int listen_fd_count;
|
|
int rootless;
|
|
int glamor;
|
|
|
|
CreateScreenResourcesProcPtr CreateScreenResources;
|
|
CloseScreenProcPtr CloseScreen;
|
|
CreateWindowProcPtr CreateWindow;
|
|
DestroyWindowProcPtr DestroyWindow;
|
|
RealizeWindowProcPtr RealizeWindow;
|
|
UnrealizeWindowProcPtr UnrealizeWindow;
|
|
|
|
struct xorg_list output_list;
|
|
struct xorg_list seat_list;
|
|
struct xorg_list damage_window_list;
|
|
|
|
int wayland_fd;
|
|
struct wl_display *display;
|
|
struct wl_registry *registry;
|
|
struct wl_registry *input_registry;
|
|
struct wl_compositor *compositor;
|
|
struct wl_shm *shm;
|
|
struct wl_shell *shell;
|
|
|
|
uint32_t serial;
|
|
|
|
#define XWL_FORMAT_ARGB8888 (1 << 0)
|
|
#define XWL_FORMAT_XRGB8888 (1 << 1)
|
|
#define XWL_FORMAT_RGB565 (1 << 2)
|
|
|
|
int prepare_read;
|
|
|
|
char *device_name;
|
|
int drm_fd;
|
|
int fd_render_node;
|
|
struct wl_drm *drm;
|
|
uint32_t formats;
|
|
uint32_t capabilities;
|
|
void *egl_display, *egl_context;
|
|
struct gbm_device *gbm;
|
|
struct glamor_context *glamor_ctx;
|
|
};
|
|
|
|
struct xwl_window {
|
|
struct xwl_screen *xwl_screen;
|
|
struct wl_surface *surface;
|
|
struct wl_shell_surface *shell_surface;
|
|
WindowPtr window;
|
|
DamagePtr damage;
|
|
struct xorg_list link_damage;
|
|
struct wl_callback *frame_callback;
|
|
};
|
|
|
|
#define MODIFIER_META 0x01
|
|
|
|
struct xwl_seat {
|
|
DeviceIntPtr pointer;
|
|
DeviceIntPtr keyboard;
|
|
struct xwl_screen *xwl_screen;
|
|
struct wl_seat *seat;
|
|
struct wl_pointer *wl_pointer;
|
|
struct wl_keyboard *wl_keyboard;
|
|
struct wl_array keys;
|
|
struct xwl_window *focus_window;
|
|
uint32_t id;
|
|
uint32_t pointer_enter_serial;
|
|
struct xorg_list link;
|
|
CursorPtr x_cursor;
|
|
struct wl_surface *cursor;
|
|
struct wl_callback *cursor_frame_cb;
|
|
Bool cursor_needs_update;
|
|
|
|
size_t keymap_size;
|
|
char *keymap;
|
|
struct wl_surface *keyboard_focus;
|
|
};
|
|
|
|
struct xwl_output {
|
|
struct xorg_list link;
|
|
struct wl_output *output;
|
|
struct xwl_screen *xwl_screen;
|
|
RROutputPtr randr_output;
|
|
RRCrtcPtr randr_crtc;
|
|
int32_t x, y, width, height;
|
|
Rotation rotation;
|
|
};
|
|
|
|
struct xwl_pixmap;
|
|
|
|
Bool xwl_screen_init_cursor(struct xwl_screen *xwl_screen);
|
|
|
|
struct xwl_screen *xwl_screen_get(ScreenPtr screen);
|
|
|
|
void xwl_seat_set_cursor(struct xwl_seat *xwl_seat);
|
|
|
|
void xwl_seat_destroy(struct xwl_seat *xwl_seat);
|
|
|
|
Bool xwl_screen_init_output(struct xwl_screen *xwl_screen);
|
|
|
|
struct xwl_output *xwl_output_create(struct xwl_screen *xwl_screen,
|
|
uint32_t id);
|
|
|
|
void xwl_output_destroy(struct xwl_output *xwl_output);
|
|
|
|
RRModePtr xwayland_cvt(int HDisplay, int VDisplay,
|
|
float VRefresh, Bool Reduced, Bool Interlaced);
|
|
|
|
void xwl_pixmap_set_private(PixmapPtr pixmap, struct xwl_pixmap *xwl_pixmap);
|
|
struct xwl_pixmap *xwl_pixmap_get(PixmapPtr pixmap);
|
|
|
|
|
|
Bool xwl_shm_create_screen_resources(ScreenPtr screen);
|
|
PixmapPtr xwl_shm_create_pixmap(ScreenPtr screen, int width, int height,
|
|
int depth, unsigned int hint);
|
|
Bool xwl_shm_destroy_pixmap(PixmapPtr pixmap);
|
|
struct wl_buffer *xwl_shm_pixmap_get_wl_buffer(PixmapPtr pixmap);
|
|
|
|
|
|
Bool xwl_glamor_init(struct xwl_screen *xwl_screen);
|
|
|
|
Bool xwl_screen_init_glamor(struct xwl_screen *xwl_screen,
|
|
uint32_t id, uint32_t version);
|
|
struct wl_buffer *xwl_glamor_pixmap_get_wl_buffer(PixmapPtr pixmap);
|
|
|
|
#endif
|