mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-31 22:25:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Send device name at connect time

Browse source
This commit is contained in:
Kristian Høgsberg 2010-06-08 20:34:11 -04:00
parent 945ea0e743
commit 478d9265f9
16 changed files with 139 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

23
clients/terminal.c
View file

@ -50,7 +50,6 @@ static int option_fullscreen;
struct terminal {
struct window *window;
struct display *display;
struct wl_compositor *compositor;
int redraw_scheduled, redraw_pending;
char *data;
int width, height, start, row, column;
@ -418,9 +417,8 @@ resize_handler(struct window *window, void *data)
}
static void
handle_acknowledge(void *data,
struct wl_compositor *compositor,
uint32_t key, uint32_t frame)
acknowledge_handler(struct window *window,
uint32_t key, uint32_t frame, void *data)
{
struct terminal *terminal = data;
@ -431,18 +429,6 @@ handle_acknowledge(void *data,
}
}
static void
handle_frame(void *data,
struct wl_compositor *compositor,
uint32_t frame, uint32_t timestamp)
{
}
static const struct wl_compositor_listener compositor_listener = {
handle_acknowledge,
handle_frame,
};
static void
key_handler(struct window *window, uint32_t key, uint32_t unicode,
uint32_t state, uint32_t modifiers, void *data)
@ -493,12 +479,9 @@ terminal_create(struct display *display, int fullscreen)
terminal->redraw_scheduled = 1;
terminal->margin = 5;
terminal->compositor = display_get_compositor(display);
window_set_fullscreen(terminal->window, terminal->fullscreen);
window_set_resize_handler(terminal->window, resize_handler, terminal);
wl_compositor_add_listener(terminal->compositor,
&compositor_listener, terminal);
window_set_acknowledge_handler(terminal->window, acknowledge_handler, terminal);
window_set_key_handler(terminal->window, key_handler, terminal);
window_set_keyboard_focus_handler(terminal->window,