mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Regenerate wakefield-client-protocol using an older wayland-scanner to temporarily fix build problems

Browse Source 
(cherry picked from commit 7310c73a94)
This commit is contained in:
Nikita Tsarev
2023-08-17 15:56:48 +02:00
committed by jbrbot
parent 86e1a68895
commit d4d7ba4da2
3 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jb/generate-wakefield.sh
View File

@@ -1,6 +1,12 @@
#!/bin/bash
if [[ -z "$1" ]]; then
SCANNER=wayland-scanner
else
SCANNER="$1"
fi
set -ex
wayland-scanner client-header src/java.desktop/share/native/libwakefield/protocol/wakefield.xml src/java.desktop/unix/native/libawt_wlawt/wakefield-client-protocol.h
wayland-scanner private-code src/java.desktop/share/native/libwakefield/protocol/wakefield.xml src/java.desktop/unix/native/libawt_wlawt/wakefield-client-protocol.c
"$SCANNER" client-header src/java.desktop/share/native/libwakefield/protocol/wakefield.xml src/java.desktop/unix/native/libawt_wlawt/wakefield-client-protocol.h
"$SCANNER" private-code src/java.desktop/share/native/libwakefield/protocol/wakefield.xml src/java.desktop/unix/native/libawt_wlawt/wakefield-client-protocol.c

2
src/java.desktop/unix/native/libawt_wlawt/wakefield-client-protocol.c
View File

@@ -1,4 +1,4 @@
/* Generated by wayland-scanner 1.21.0 */
/* Generated by wayland-scanner 1.19.0 */
/*
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.

40
src/java.desktop/unix/native/libawt_wlawt/wakefield-client-protocol.h
View File

@@ -1,4 +1,4 @@
/* Generated by wayland-scanner 1.21.0 */
/* Generated by wayland-scanner 1.19.0 */
#ifndef WAKEFIELD_CLIENT_PROTOCOL_H
#define WAKEFIELD_CLIENT_PROTOCOL_H
@@ -224,8 +224,10 @@ wakefield_get_version(struct wakefield *wakefield)
static inline void
wakefield_destroy(struct wakefield *wakefield)
{
wl_proxy_marshal_flags((struct wl_proxy *) wakefield,
WAKEFIELD_DESTROY, NULL, wl_proxy_get_version((struct wl_proxy *) wakefield), WL_MARSHAL_FLAG_DESTROY);
wl_proxy_marshal((struct wl_proxy *) wakefield,
WAKEFIELD_DESTROY);
wl_proxy_destroy((struct wl_proxy *) wakefield);
}
/**
@@ -239,8 +241,8 @@ wakefield_destroy(struct wakefield *wakefield)
static inline void
wakefield_move_surface(struct wakefield *wakefield, struct wl_surface *surface, int32_t x, int32_t y)
{
wl_proxy_marshal_flags((struct wl_proxy *) wakefield,
WAKEFIELD_MOVE_SURFACE, NULL, wl_proxy_get_version((struct wl_proxy *) wakefield), 0, surface, x, y);
wl_proxy_marshal((struct wl_proxy *) wakefield,
WAKEFIELD_MOVE_SURFACE, surface, x, y);
}
/**
@@ -251,8 +253,8 @@ wakefield_move_surface(struct wakefield *wakefield, struct wl_surface *surface,
static inline void
wakefield_get_surface_location(struct wakefield *wakefield, struct wl_surface *surface)
{
wl_proxy_marshal_flags((struct wl_proxy *) wakefield,
WAKEFIELD_GET_SURFACE_LOCATION, NULL, wl_proxy_get_version((struct wl_proxy *) wakefield), 0, surface);
wl_proxy_marshal((struct wl_proxy *) wakefield,
WAKEFIELD_GET_SURFACE_LOCATION, surface);
}
/**
@@ -263,8 +265,8 @@ wakefield_get_surface_location(struct wakefield *wakefield, struct wl_surface *s
static inline void
wakefield_get_pixel_color(struct wakefield *wakefield, int32_t x, int32_t y)
{
wl_proxy_marshal_flags((struct wl_proxy *) wakefield,
WAKEFIELD_GET_PIXEL_COLOR, NULL, wl_proxy_get_version((struct wl_proxy *) wakefield), 0, x, y);
wl_proxy_marshal((struct wl_proxy *) wakefield,
WAKEFIELD_GET_PIXEL_COLOR, x, y);
}
/**
@@ -275,8 +277,8 @@ wakefield_get_pixel_color(struct wakefield *wakefield, int32_t x, int32_t y)
static inline void
wakefield_send_key(struct wakefield *wakefield, uint32_t key, uint32_t state)
{
wl_proxy_marshal_flags((struct wl_proxy *) wakefield,
WAKEFIELD_SEND_KEY, NULL, wl_proxy_get_version((struct wl_proxy *) wakefield), 0, key, state);
wl_proxy_marshal((struct wl_proxy *) wakefield,
WAKEFIELD_SEND_KEY, key, state);
}
/**
@@ -287,8 +289,8 @@ wakefield_send_key(struct wakefield *wakefield, uint32_t key, uint32_t state)
static inline void
wakefield_send_cursor(struct wakefield *wakefield, int32_t x, int32_t y)
{
wl_proxy_marshal_flags((struct wl_proxy *) wakefield,
WAKEFIELD_SEND_CURSOR, NULL, wl_proxy_get_version((struct wl_proxy *) wakefield), 0, x, y);
wl_proxy_marshal((struct wl_proxy *) wakefield,
WAKEFIELD_SEND_CURSOR, x, y);
}
/**
@@ -299,8 +301,8 @@ wakefield_send_cursor(struct wakefield *wakefield, int32_t x, int32_t y)
static inline void
wakefield_send_button(struct wakefield *wakefield, uint32_t button, uint32_t state)
{
wl_proxy_marshal_flags((struct wl_proxy *) wakefield,
WAKEFIELD_SEND_BUTTON, NULL, wl_proxy_get_version((struct wl_proxy *) wakefield), 0, button, state);
wl_proxy_marshal((struct wl_proxy *) wakefield,
WAKEFIELD_SEND_BUTTON, button, state);
}
/**
@@ -311,8 +313,8 @@ wakefield_send_button(struct wakefield *wakefield, uint32_t button, uint32_t sta
static inline void
wakefield_send_wheel(struct wakefield *wakefield, int32_t amount)
{
wl_proxy_marshal_flags((struct wl_proxy *) wakefield,
WAKEFIELD_SEND_WHEEL, NULL, wl_proxy_get_version((struct wl_proxy *) wakefield), 0, amount);
wl_proxy_marshal((struct wl_proxy *) wakefield,
WAKEFIELD_SEND_WHEEL, amount);
}
/**
@@ -321,8 +323,8 @@ wakefield_send_wheel(struct wakefield *wakefield, int32_t amount)
static inline void
wakefield_capture_create(struct wakefield *wakefield, struct wl_buffer *buffer, int32_t x, int32_t y)
{
wl_proxy_marshal_flags((struct wl_proxy *) wakefield,
WAKEFIELD_CAPTURE_CREATE, NULL, wl_proxy_get_version((struct wl_proxy *) wakefield), 0, buffer, x, y);
wl_proxy_marshal((struct wl_proxy *) wakefield,
WAKEFIELD_CAPTURE_CREATE, buffer, x, y);
}
#ifdef __cplusplus