diff --git a/x11-libs/gtk3/additional-files/compile-schemas.sh b/x11-libs/gtk3/additional-files/compile-schemas.sh new file mode 100644 index 000000000..eb29c6400 --- /dev/null +++ b/x11-libs/gtk3/additional-files/compile-schemas.sh @@ -0,0 +1,8 @@ +#!/bin/sh +SYSTEM_DATA_DIR="`finddir B_SYSTEM_DATA_DIRECTORY`" +NONPACKAGED_DATA_DIR="`finddir B_SYSTEM_NONPACKAGED_DATA_DIRECTORY`" + +mkdir -p $NONPACKAGED_DATA_DIR/glib-2.0/schemas +cp -nrf $SYSTEM_DATA_DIR/glib-2.0/schemas/* $NONPACKAGED_DATA_DIR/glib-2.0/schemas + +glib-compile-schemas $NONPACKAGED_DATA_DIR/glib-2.0/schemas diff --git a/x11-libs/gtk3/gtk3-3.24.30.recipe b/x11-libs/gtk3/gtk3-3.24.30.recipe deleted file mode 100644 index b2a732677..000000000 --- a/x11-libs/gtk3/gtk3-3.24.30.recipe +++ /dev/null @@ -1,126 +0,0 @@ -SUMMARY="A multi-platform toolkit for creating graphical user interfaces" -DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user \ -interfaces. Offering a complete set of widgets, GTK is suitable for projects \ -ranging from small one-off projects to complete application suites." -HOMEPAGE="https://www.gtk.org" -COPYRIGHT="GNOME Desktop" -LICENSE="GNU LGPL v2" -REVISION="6" -SOURCE_URI="https://ftp.gnome.org/pub/gnome/sources/gtk+/3.24/gtk+-$portVersion.tar.xz" -CHECKSUM_SHA256="ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9" -SOURCE_DIR="gtk+-$portVersion" -PATCHES="gtk3-$portVersion.patchset" - -ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - gtk3$secondaryArchSuffix = $portVersion compat >= 3 - cmd:gtk_builder_tool$secondaryArchSuffix - cmd:gtk_encode_symbolic_svg$secondaryArchSuffix - cmd:gtk_launch$secondaryArchSuffix - cmd:gtk_query_immodules_3.0$secondaryArchSuffix - cmd:gtk_query_settings$secondaryArchSuffix - cmd:gtk_update_icon_cache$secondaryArchSuffix - cmd:gtk3_demo_application$secondaryArchSuffix - cmd:gtk3_demo$secondaryArchSuffix - cmd:gtk3_icon_browser$secondaryArchSuffix - cmd:gtk3_widget_factory$secondaryArchSuffix - lib:libgailutil_3$secondaryArchSuffix - lib:libgdk_3$secondaryArchSuffix = 3.2400.10 compat >= 1 - lib:libgtk_3$secondaryArchSuffix = 3.2400.10 compat >= 1 - " -REQUIRES=" - haiku$secondaryArchSuffix - haiku_svg_icon_theme - shared_mime_info$secondaryArchSuffix - libepoxy${secondaryArchSuffix} - pango$secondaryArchSuffix - atk$secondaryArchSuffix - gdk_pixbuf$secondaryArchSuffix - xcairo$secondaryArchSuffix - lib:libfontconfig$secondaryArchSuffix - lib:libfreetype$secondaryArchSuffix - lib:libfribidi$secondaryArchSuffix - lib:libglib_2.0$secondaryArchSuffix - lib:libGL$secondaryArchSuffix - lib:libharfbuzz$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libintl$secondaryArchSuffix - lib:libX11$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -PROVIDES_devel=" - gtk3${secondaryArchSuffix}_devel - devel:libgtk_3$secondaryArchSuffix = 3.2400.10 compat >= 2 - devel:libgdk_3$secondaryArchSuffix = 3.2400.10 compat >= 2 - " -REQUIRES_devel=" - gtk3$secondaryArchSuffix == $portVersion base - pango${secondaryArchSuffix}_devel - atk${secondaryArchSuffix}_devel - gdk_pixbuf${secondaryArchSuffix}_devel - xcairo${secondaryArchSuffix}_devel - devel:libglib_2.0$secondaryArchSuffix - devel:libGL$secondaryArchSuffix - devel:libepoxy$secondaryArchSuffix - devel:libX11$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - pango${secondaryArchSuffix}_devel - atk${secondaryArchSuffix}_devel - gdk_pixbuf${secondaryArchSuffix}_devel - xcairo${secondaryArchSuffix}_devel - devel:libGL$secondaryArchSuffix - devel:libglib_2.0$secondaryArchSuffix - devel:libepoxy$secondaryArchSuffix - devel:libX11$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:which - " - -BUILD() -{ - runConfigure ./configure \ - --disable-gtk-doc --with-included-immodules=xim - - # build once, this will fail - make -C testsuite clean - make $jobArgs || true - - # patch disable some things in typefuncs.inc - sed -i '/gdk_x11_device_manager_xi2_get_type/s@^@//@' gtk/gtktypefuncs.inc - sed -i '/gdk_x11_device_xi2_get_type/s@^@//@' gtk/gtktypefuncs.inc - sed -i '/gdk_x11_gl_context_get_type/s@^@//@' gtk/gtktypefuncs.inc - - # now build with the patched files - make $jobArgs -} - -INSTALL() -{ - - make install - - rm $libDir/*.la - - fixPkgconfig - prepareInstalledDevelLibs \ - libgdk-3 \ - libgtk-3 - - packageEntries devel \ - $developDir -} diff --git a/x11-libs/gtk3/gtk3-3.24.34.recipe b/x11-libs/gtk3/gtk3-3.24.34.recipe new file mode 100644 index 000000000..1b3d8d29c --- /dev/null +++ b/x11-libs/gtk3/gtk3-3.24.34.recipe @@ -0,0 +1,181 @@ +SUMMARY="A multi-platform toolkit for creating graphical user interfaces" +DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user \ +interfaces. Offering a complete set of widgets, GTK is suitable for projects \ +ranging from small one-off projects to complete application suites." +HOMEPAGE="https://www.gtk.org" +COPYRIGHT="GNOME Desktop" +LICENSE="GNU LGPL v2" +REVISION="4" +SOURCE_URI="https://ftp.gnome.org/pub/gnome/sources/gtk+/3.24/gtk+-$portVersion.tar.xz" +CHECKSUM_SHA256="dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec" +SOURCE_DIR="gtk+-$portVersion" +SOURCE_URI_2="https://github.com/lah7/gtk3-classic/archive/refs/tags/$portVersion.tar.gz" +CHECKSUM_SHA256_2="c454399ee763e083d3799b1a3d7c4078b00c852649d8fee97d0568750baf09d7" +SOURCE_DIR_2="gtk3-classic-$portVersion" +PATCHES="gtk3-$portVersion.patchset" +PATCHES_2="gtk3-classic-$portVersion.patchset" +ADDITIONAL_FILES="compile-schemas.sh" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +GLOBAL_WRITABLE_FILES=" + settings/gtk-3.0/im-multipress.conf keep-old + " + +POST_INSTALL_SCRIPTS=" + $relativePostInstallDir/compile-schemas.sh + " + +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + +PROVIDES=" + gtk3$secondaryArchSuffix = $portVersion compat >= 3 + cmd:gtk_builder_tool$commandSuffix + cmd:gtk_encode_symbolic_svg$commandSuffix + cmd:gtk_launch$commandSuffix + cmd:gtk_query_immodules_3.0$commandSuffix + cmd:gtk_query_settings$commandSuffix + cmd:gtk_update_icon_cache$commandSuffix + cmd:gtk3_demo_application$commandSuffix + cmd:gtk3_demo$commandSuffix + cmd:gtk3_icon_browser$commandSuffix + cmd:gtk3_widget_factory$commandSuffix + lib:libgailutil_3$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libgdk_3$secondaryArchSuffix = 3.2404.30 compat >= 3 + lib:libgtk_3$secondaryArchSuffix = 3.2404.30 compat >= 3 + " +REQUIRES=" + haiku$secondaryArchSuffix + adwaita_icon_theme + haiku_svg_icon_theme + iso_codes + gsettings_desktop_schemas$secondaryArchSuffix + shared_mime_info$secondaryArchSuffix + lib:libatk_1.0$secondaryArchSuffix + lib:libcairo$secondaryArchSuffix + lib:libcairo_gobject$secondaryArchSuffix + lib:libepoxy$secondaryArchSuffix + lib:libfontconfig$secondaryArchSuffix + lib:libfreetype$secondaryArchSuffix + lib:libfribidi$secondaryArchSuffix + lib:libgdk_pixbuf_2.0$secondaryArchSuffix + lib:libglib_2.0$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libharfbuzz$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + lib:libpango_1.0$secondaryArchSuffix + lib:libpangocairo_1.0$secondaryArchSuffix + lib:libpangoft2_1.0$secondaryArchSuffix + lib:librsvg_2$secondaryArchSuffix + lib:libwayland_client$secondaryArchSuffix + lib:libwayland_server$secondaryArchSuffix + lib:libxkbcommon$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:wayland_server_inproc$secondaryArchSuffix + " + +PROVIDES_devel=" + gtk3${secondaryArchSuffix}_devel + devel:libgailutil_3$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libgtk_3$secondaryArchSuffix = 3.2404.30 compat >= 3 + devel:libgdk_3$secondaryArchSuffix = 3.2404.30 compat >= 3 + " +REQUIRES_devel=" + gtk3$secondaryArchSuffix == $portVersion base + devel:libatk_1.0$secondaryArchSuffix + devel:libcairo$secondaryArchSuffix + devel:libgdk_pixbuf_2.0$secondaryArchSuffix + devel:libGL$secondaryArchSuffix + devel:libglib_2.0$secondaryArchSuffix + devel:libepoxy$secondaryArchSuffix + devel:libpango_1.0$secondaryArchSuffix + devel:libwayland_client$secondaryArchSuffix + devel:libwayland_server$secondaryArchSuffix + devel:libxkbcommon$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + iso_codes + wayland_protocols$secondaryArchSuffix + devel:libatk_1.0$secondaryArchSuffix + devel:libcairo$secondaryArchSuffix + devel:libGL$secondaryArchSuffix + devel:libgdk_pixbuf_2.0$secondaryArchSuffix + devel:libglib_2.0$secondaryArchSuffix + devel:libepoxy$secondaryArchSuffix + devel:libpango_1.0$secondaryArchSuffix + devel:libwayland_client$secondaryArchSuffix + devel:libwayland_server$secondaryArchSuffix + devel:libxkbcommon$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:glib_compile_schemas + cmd:ld$secondaryArchSuffix + cmd:meson + cmd:ninja + cmd:patch + cmd:pkg_config$secondaryArchSuffix + cmd:wayland_scanner + cmd:which + cmd:update_mime_database$secondaryArchSuffix + " + +PATCH() +{ + cd $sourceDir + for file in $sourceDir2/*.patch; do patch -p1 < $file; done +} + +BUILD() +{ + CFLAGS="-D_BSD_SOURCE" \ + LDFLAGS="-lbsd -lgnu -lnetwork" \ + meson Build \ + --buildtype=release \ + --prefix="$prefix" \ + --libdir="$libDir" \ + --includedir="$includeDir" \ + --bindir="$commandBinDir" \ + --libexecdir="$commandBinDir" \ + --datadir="$dataDir" \ + --localedir="$dataDir/locale" \ + --sysconfdir="$settingsDir" \ + -Dx11_backend=false \ + -Dwayland_backend=true \ + -Dbroadway_backend=false \ + -Dintrospection=false + + ninja -C Build +} + +INSTALL() +{ + ninja install -C Build + + rm -rf $dataDir/glib-2.0/schemas/gschemas.compiled + rm -rf $dataDir/icons/hicolor/icon-theme.cache + + mkdir -p $postInstallDir + cp -f $portDir/additional-files/compile-schemas.sh $postInstallDir + chmod -v a+rx $postInstallDir/compile-schemas.sh + + fixPkgconfig + prepareInstalledDevelLibs \ + libgdk-3 \ + libgtk-3 \ + libgailutil-3 + + packageEntries devel \ + $developDir +} diff --git a/x11-libs/gtk3/patches/gtk3-3.24.30.patchset b/x11-libs/gtk3/patches/gtk3-3.24.30.patchset deleted file mode 100644 index f2ea004b3..000000000 --- a/x11-libs/gtk3/patches/gtk3-3.24.30.patchset +++ /dev/null @@ -1,1131 +0,0 @@ -From 7faf7bdb157110975b7312691e786ca737487a7c Mon Sep 17 00:00:00 2001 -From: Augustin Cavalier -Date: Tue, 18 Jan 2022 18:43:52 -0500 -Subject: Disable code that uses direct X11 requests. - - -diff --git a/gdk/x11/gdkasync.c b/gdk/x11/gdkasync.c -index 6963213..bf61f6d 100644 ---- a/gdk/x11/gdkasync.c -+++ b/gdk/x11/gdkasync.c -@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group. - #include "gdkprivate-x11.h" - - #include -- -+#if 0 - - typedef struct _ChildInfoChildState ChildInfoChildState; - typedef struct _ChildInfoState ChildInfoState; -@@ -123,8 +123,8 @@ struct _RoundtripState - static gboolean - callback_idle (gpointer data) - { -- SendEventState *state = (SendEventState *)data; -- -+ SendEventState *state = (SendEventState *)data; -+ - state->callback (state->window, !state->have_error, state->data); - - g_free (state); -@@ -139,7 +139,7 @@ send_event_handler (Display *dpy, - int len, - XPointer data) - { -- SendEventState *state = (SendEventState *)data; -+ SendEventState *state = (SendEventState *)data; - - if (dpy->last_request_read == state->send_event_req) - { -@@ -154,7 +154,7 @@ send_event_handler (Display *dpy, - { - xGetInputFocusReply replbuf; - xGetInputFocusReply *repl G_GNUC_UNUSED; -- -+ - if (rep->generic.type != X_Error) - { - /* Actually does nothing, since there are no additional bytes -@@ -191,7 +191,7 @@ client_message_to_wire (XClientMessageEvent *ev, - event->u.u.detail = ev->format; - switch (ev->format) - { -- case 8: -+ case 8: - event->u.clientMessage.u.b.type = ev->message_type; - for (i = 0; i < 20; i++) - event->u.clientMessage.u.b.bytes[i] = ev->data.b[i]; -@@ -224,8 +224,8 @@ client_message_to_wire (XClientMessageEvent *ev, - } - - void --_gdk_x11_send_client_message_async (GdkDisplay *display, -- Window window, -+_gdk_x11_send_client_message_async (GdkDisplay *display, -+ Window window, - gboolean propagate, - glong event_mask, - XClientMessageEvent *event_send, -@@ -234,7 +234,7 @@ _gdk_x11_send_client_message_async (GdkDisplay *display, - { - Display *dpy; - SendEventState *state; -- -+ - dpy = GDK_DISPLAY_XDISPLAY (display); - - state = g_new (SendEventState, 1); -@@ -244,7 +244,7 @@ _gdk_x11_send_client_message_async (GdkDisplay *display, - state->callback = callback; - state->data = data; - state->have_error = FALSE; -- -+ - LockDisplay(dpy); - - state->async.next = dpy->async_handlers; -@@ -255,20 +255,20 @@ _gdk_x11_send_client_message_async (GdkDisplay *display, - { - register xSendEventReq *req; - xEvent ev; -- -+ - client_message_to_wire (event_send, &ev); -- -+ - GetReq(SendEvent, req); - req->destination = window; - req->propagate = propagate; - req->eventMask = event_mask; - /* gross, matches Xproto.h */ --#ifdef WORD64 -+#ifdef WORD64 - memcpy ((char *) req->eventdata, (char *) &ev, SIZEOF(xEvent)); --#else -+#else - memcpy ((char *) &req->event, (char *) &ev, SIZEOF(xEvent)); - #endif -- -+ - state->send_event_req = dpy->request; - } - -@@ -277,11 +277,11 @@ _gdk_x11_send_client_message_async (GdkDisplay *display, - */ - { - G_GNUC_UNUSED xReq *req; -- -+ - GetEmptyReq(GetInputFocus, req); - state->get_input_focus_req = dpy->request; - } -- -+ - UnlockDisplay(dpy); - SyncHandle(); - } -@@ -297,7 +297,7 @@ list_children_handler (Display *dpy, - - if (dpy->last_request_read != state->get_property_req) - return False; -- -+ - if (rep->generic.type == X_Error) - { - state->have_error = TRUE; -@@ -307,7 +307,7 @@ list_children_handler (Display *dpy, - { - xGetPropertyReply replbuf; - xGetPropertyReply *repl; -- -+ - repl = (xGetPropertyReply *) - _XGetAsyncReply(dpy, (char *)&replbuf, rep, buf, len, - (sizeof(xGetPropertyReply) - sizeof(xReply)) >> 2, -@@ -343,7 +343,7 @@ list_children_and_wm_state (Display *dpy, - *children = NULL; - *nchildren = 0; - *has_wm_state = FALSE; -- -+ - state.have_error = FALSE; - state.has_wm_state = FALSE; - -@@ -361,10 +361,10 @@ list_children_and_wm_state (Display *dpy, - prop_req->delete = False; - prop_req->longOffset = 0; - prop_req->longLength = 0; -- -+ - state.get_property_req = dpy->request; - } -- -+ - GetResReq(QueryTree, w, req); - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) - { -@@ -392,7 +392,7 @@ list_children_and_wm_state (Display *dpy, - DeqAsyncHandler(dpy, &async); - UnlockDisplay(dpy); - SyncHandle(); -- -+ - return !state.have_error; - } - -@@ -412,7 +412,7 @@ handle_get_geometry_reply (Display *dpy, - xGetGeometryReply *repl) - { - GdkChildInfoX11 *child = &state->child_info[state->n_children_found]; -- -+ - child->x = cvtINT16toInt (repl->x); - child->y = cvtINT16toInt (repl->y); - child->width = repl->width; -@@ -463,12 +463,12 @@ get_child_info_handler (Display *dpy, - XPointer data) - { - Bool result = True; -- -+ - ChildInfoState *state = (ChildInfoState *)data; - - if (dpy->last_request_read != state->child_states[state->current_child].seq[state->current_request]) - return False; -- -+ - if (rep->generic.type == X_Error) - { - state->child_has_error = TRUE; -@@ -487,12 +487,12 @@ get_child_info_handler (Display *dpy, - { - xGetPropertyReply replbuf; - xGetPropertyReply *repl; -- -+ - repl = (xGetPropertyReply *) - _XGetAsyncReply(dpy, (char *)&replbuf, rep, buf, len, - (sizeof(xGetPropertyReply) - sizeof(xReply)) >> 2, - True); -- -+ - handle_get_property_reply (dpy, state, repl); - } - break; -@@ -500,12 +500,12 @@ get_child_info_handler (Display *dpy, - { - xGetWindowAttributesReply replbuf; - xGetWindowAttributesReply *repl; -- -+ - repl = (xGetWindowAttributesReply *) - _XGetAsyncReply(dpy, (char *)&replbuf, rep, buf, len, - (sizeof(xGetWindowAttributesReply) - sizeof(xReply)) >> 2, - True); -- -+ - handle_get_wa_reply (dpy, state, repl); - } - break; -@@ -513,12 +513,12 @@ get_child_info_handler (Display *dpy, - { - xGetGeometryReply replbuf; - xGetGeometryReply *repl; -- -+ - repl = (xGetGeometryReply *) - _XGetAsyncReply(dpy, (char *)&replbuf, rep, buf, len, - (sizeof(xGetGeometryReply) - sizeof(xReply)) >> 2, - True); -- -+ - handle_get_geometry_reply (dpy, state, repl); - } - break; -@@ -548,7 +548,7 @@ _gdk_x11_get_window_child_info (GdkDisplay *display, - - *children = NULL; - *nchildren = 0; -- -+ - dpy = GDK_DISPLAY_XDISPLAY (display); - if (get_wm_state) - wm_state_atom = gdk_x11_get_xatom_by_name_for_display (display, "WM_STATE"); -@@ -601,13 +601,13 @@ _gdk_x11_get_window_child_info (GdkDisplay *display, - async.handler = get_child_info_handler; - async.data = (XPointer) &state; - dpy->async_handlers = &async; -- -+ - for (i = 0; i < state.nchildren; i++) - { - xResourceReq *resource_req; - xGetPropertyReq *prop_req; - Window win = state.children[i]; -- -+ - if (get_wm_state) - { - GetReq (GetProperty, prop_req); -@@ -620,10 +620,10 @@ _gdk_x11_get_window_child_info (GdkDisplay *display, - - state.child_states[i].seq[CHILD_INFO_GET_PROPERTY] = dpy->request; - } -- -+ - GetResReq(GetWindowAttributes, win, resource_req); - state.child_states[i].seq[CHILD_INFO_GET_WA] = dpy->request; -- -+ - GetResReq(GetGeometry, win, resource_req); - state.child_states[i].seq[CHILD_INFO_GET_GEOMETRY] = dpy->request; - } -@@ -654,7 +654,7 @@ _gdk_x11_get_window_child_info (GdkDisplay *display, - - g_free (state.children); - g_free (state.child_states); -- -+ - DeqAsyncHandler(dpy, &async); - UnlockDisplay(dpy); - SyncHandle(); -@@ -665,8 +665,8 @@ _gdk_x11_get_window_child_info (GdkDisplay *display, - static gboolean - roundtrip_callback_idle (gpointer data) - { -- RoundtripState *state = (RoundtripState *)data; -- -+ RoundtripState *state = (RoundtripState *)data; -+ - state->callback (state->display, state->data, state->get_input_focus_req); - - g_free (state); -@@ -681,13 +681,13 @@ roundtrip_handler (Display *dpy, - int len, - XPointer data) - { -- RoundtripState *state = (RoundtripState *)data; -- -+ RoundtripState *state = (RoundtripState *)data; -+ - if (dpy->last_request_read == state->get_input_focus_req) - { - xGetInputFocusReply replbuf; - xGetInputFocusReply *repl G_GNUC_UNUSED; -- -+ - if (rep->generic.type != X_Error) - { - /* Actually does nothing, since there are no additional bytes -@@ -699,7 +699,7 @@ roundtrip_handler (Display *dpy, - True); - } - -- -+ - if (state->callback) - { - guint id; -@@ -716,13 +716,13 @@ roundtrip_handler (Display *dpy, - } - - void --_gdk_x11_roundtrip_async (GdkDisplay *display, -+_gdk_x11_roundtrip_async (GdkDisplay *display, - GdkRoundTripCallback callback, - gpointer data) - { - Display *dpy; - RoundtripState *state; -- -+ - dpy = GDK_DISPLAY_XDISPLAY (display); - - state = g_new (RoundtripState, 1); -@@ -731,7 +731,7 @@ _gdk_x11_roundtrip_async (GdkDisplay *display, - state->dpy = dpy; - state->callback = callback; - state->data = data; -- -+ - LockDisplay(dpy); - - state->async.next = dpy->async_handlers; -@@ -744,11 +744,12 @@ _gdk_x11_roundtrip_async (GdkDisplay *display, - */ - { - G_GNUC_UNUSED xReq *req; -- -+ - GetEmptyReq(GetInputFocus, req); - state->get_input_focus_req = dpy->request; - } -- -+ - UnlockDisplay(dpy); - SyncHandle(); - } -+#endif -diff --git a/gdk/x11/gdkasync.h b/gdk/x11/gdkasync.h -index f7be90f..b6ccc73 100644 ---- a/gdk/x11/gdkasync.h -+++ b/gdk/x11/gdkasync.h -@@ -45,24 +45,24 @@ struct _GdkChildInfoX11 - guint window_class : 2; - }; - --void _gdk_x11_send_client_message_async (GdkDisplay *display, -+static void _gdk_x11_send_client_message_async (GdkDisplay *display, - Window window, - gboolean propagate, - glong event_mask, - XClientMessageEvent *event_send, - GdkSendXEventCallback callback, -- gpointer data); -+ gpointer data) {} - --gboolean _gdk_x11_get_window_child_info (GdkDisplay *display, -+static gboolean _gdk_x11_get_window_child_info (GdkDisplay *display, - Window window, - gboolean get_wm_state, - gboolean *win_has_wm_state, - GdkChildInfoX11 **children, -- guint *nchildren); -+ guint *nchildren) { return FALSE; } - --void _gdk_x11_roundtrip_async (GdkDisplay *display, -+static void _gdk_x11_roundtrip_async (GdkDisplay *display, - GdkRoundTripCallback callback, -- gpointer data); -+ gpointer data) {} - - G_END_DECLS - --- -2.30.2 - - -From 4e16e7eebd8518a485ea9dca4b872ca0f434fbd1 Mon Sep 17 00:00:00 2001 -From: Augustin Cavalier -Date: Tue, 18 Jan 2022 18:46:39 -0500 -Subject: Make it possible to build without XI2. - - -diff --git a/configure b/configure -index edd41ad..887d6d5 100755 ---- a/configure -+++ b/configure -@@ -26710,7 +26710,7 @@ fi - fi - - if test "x$have_xinput2" != "xyes"; then : -- as_fn_error $? "*** XInput2 extension not found. Check 'config.log' for more details." "$LINENO" 5 -+ #as_fn_error $? "*** XInput2 extension not found. Check 'config.log' for more details." "$LINENO" 5 - fi - - # Check for the RANDR extension -diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c -index cd1849c..99d1752 100644 ---- a/gdk/x11/gdkdevice-xi2.c -+++ b/gdk/x11/gdkdevice-xi2.c -@@ -14,7 +14,7 @@ - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ -- -+#if 0 - #include "config.h" - - #include "gdkx11device-xi2.h" -@@ -930,3 +930,4 @@ gdk_x11_device_xi2_store_axes (GdkX11DeviceXI2 *device, - else - device->last_axes = NULL; - } -+#endif -diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c -index 00e64d2..c602a1b 100644 ---- a/gdk/x11/gdkdevicemanager-xi2.c -+++ b/gdk/x11/gdkdevicemanager-xi2.c -@@ -14,7 +14,7 @@ - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ -- -+#if 0 - #include "config.h" - - #include "gdkx11devicemanager-xi2.h" -@@ -2129,3 +2129,4 @@ _gdk_x11_device_manager_xi2_lookup (GdkX11DeviceManagerXI2 *device_manager_xi2, - return g_hash_table_lookup (device_manager_xi2->id_table, - GINT_TO_POINTER (device_id)); - } -+#endif -diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c -index 96edea6..002d206 100644 ---- a/gtk/gtkdnd.c -+++ b/gtk/gtkdnd.c -@@ -365,6 +365,7 @@ root_key_filter (GdkXEvent *xevent, - ev->xkey.window = (Window)data; - else if (ev->type == GenericEvent) - { -+#if 0 - XGenericEventCookie *cookie; - XIDeviceEvent *dev; - -@@ -374,6 +375,7 @@ root_key_filter (GdkXEvent *xevent, - if (dev->evtype == XI_KeyPress || - dev->evtype == XI_KeyRelease) - dev->event = (Window)data; -+#endif - } - - return GDK_FILTER_CONTINUE; -@@ -633,7 +635,7 @@ static guint32 - gtk_drag_get_event_time (GdkEvent *event) - { - guint32 tm = GDK_CURRENT_TIME; -- -+ - if (event) - switch (event->type) - { -@@ -662,7 +664,7 @@ gtk_drag_get_event_time (GdkEvent *event) - default: /* use current time */ - break; - } -- -+ - return tm; - } - -@@ -679,7 +681,7 @@ gtk_drag_get_event_actions (const GdkEvent *event, - if (event) - { - GdkModifierType state = 0; -- -+ - switch (event->type) - { - case GDK_MOTION_NOTIFY: -@@ -752,7 +754,7 @@ gtk_drag_get_event_actions (const GdkEvent *event, - else - { - *possible_actions = actions; -- -+ - if (actions & GDK_ACTION_COPY) - *suggested_action = GDK_ACTION_COPY; - else if (actions & GDK_ACTION_MOVE) -@@ -919,7 +921,7 @@ gtk_drag_get_source_widget (GdkDragContext *context) - GSList *tmp_list; - - g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), NULL); -- -+ - tmp_list = source_widgets; - while (tmp_list) - { -@@ -950,7 +952,7 @@ gtk_drag_get_source_widget (GdkDragContext *context) - * Informs the drag source that the drop is finished, and - * that the data of the drag will no longer be required. - */ --void -+void - gtk_drag_finish (GdkDragContext *context, - gboolean success, - gboolean del, -@@ -970,18 +972,18 @@ gtk_drag_finish (GdkDragContext *context, - GtkWidget *selection_widget = gtk_drag_get_ipc_widget_for_screen (gdk_window_get_screen (gdk_drag_context_get_source_window (context))); - - g_object_ref (context); -- -+ - g_object_set_data (G_OBJECT (selection_widget), I_("drag-context"), context); - g_signal_connect (selection_widget, "selection-received", - G_CALLBACK (gtk_drag_selection_received), - NULL); -- -+ - gtk_selection_convert (selection_widget, - gdk_drag_get_selection (context), - target, - time); - } -- -+ - if (!(success && del)) - gdk_drop_finish (context, success, time); - } --- -2.30.2 - - -From ae1208e0e1e201a0abc98522c875d0f5021ce08d Mon Sep 17 00:00:00 2001 -From: Augustin Cavalier -Date: Tue, 18 Jan 2022 18:48:40 -0500 -Subject: Disable GLX. - - -diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c -index 0d0422e..482541f 100644 ---- a/gdk/x11/gdkglcontext-x11.c -+++ b/gdk/x11/gdkglcontext-x11.c -@@ -39,10 +39,13 @@ - - #include - -+#if 0 - #include -+#endif - --G_DEFINE_TYPE (GdkX11GLContext, gdk_x11_gl_context, GDK_TYPE_GL_CONTEXT) -+//G_DEFINE_TYPE (GdkX11GLContext, gdk_x11_gl_context, GDK_TYPE_GL_CONTEXT) - -+#if 0 - typedef struct { - GdkDisplay *display; - -@@ -117,11 +120,13 @@ maybe_wait_for_vblank (GdkDisplay *display, - glXWaitVideoSyncSGI (2, (current_count + 1) % 2, ¤t_count); - } - } -+#endif - - void - gdk_x11_window_invalidate_for_new_frame (GdkWindow *window, - cairo_region_t *update_area) - { -+#if 0 - cairo_rectangle_int_t window_rect; - GdkDisplay *display = gdk_window_get_display (window); - GdkX11Display *display_x11 = GDK_X11_DISPLAY (display); -@@ -194,9 +199,10 @@ gdk_x11_window_invalidate_for_new_frame (GdkWindow *window, - buffer is fully up-to-date for the swapbuffer */ - cairo_region_union_rectangle (update_area, &window_rect); - } -- -+#endif - } - -+#if 0 - static void - gdk_gl_blit_region (GdkWindow *window, cairo_region_t *region) - { -@@ -842,10 +848,14 @@ gdk_x11_gl_context_init (GdkX11GLContext *self) - { - self->do_frame_sync = TRUE; - } -+#endif - - gboolean - gdk_x11_screen_init_gl (GdkScreen *screen) - { -+ return FALSE; -+ -+#if 0 - GdkDisplay *display = gdk_screen_get_display (screen); - GdkX11Display *display_x11 = GDK_X11_DISPLAY (display); - Display *dpy; -@@ -916,8 +926,10 @@ gdk_x11_screen_init_gl (GdkScreen *screen) - display_x11->has_glx_sync_control ? "yes" : "no")); - - return TRUE; -+#endif - } - -+#if 0 - #define MAX_GLX_ATTRS 30 - - static gboolean -@@ -1007,6 +1019,7 @@ out: - - return retval; - } -+#endif - - struct glvisualinfo { - int supports_gl; -@@ -1041,6 +1054,7 @@ visual_is_rgba (const GdkVisual *visual) - visual->blue_mask == 0x0000ff; - } - -+#if 0 - /* This picks a compatible (as in has the same X visual details) visual - that has "better" characteristics on the GL side */ - static GdkVisual * -@@ -1179,10 +1193,12 @@ save_cached_gl_visuals (GdkDisplay *display, int system, int rgba) - (unsigned char *)visualdata, 2); - gdk_x11_display_error_trap_pop_ignored (display); - } -+#endif - - void - _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) - { -+#if 0 - GdkX11Screen *x11_screen; - GdkDisplay *display; - GdkX11Display *display_x11; -@@ -1259,6 +1275,7 @@ _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) - save_cached_gl_visuals (display, - gdk_x11_visual_get_xvisual (x11_screen->system_visual)->visualid, - x11_screen->rgba_visual ? gdk_x11_visual_get_xvisual (x11_screen->rgba_visual)->visualid : 0); -+#endif - } - - GdkGLContext * -@@ -1267,6 +1284,8 @@ gdk_x11_window_create_gl_context (GdkWindow *window, - GdkGLContext *share, - GError **error) - { -+ return NULL; -+#if 0 - GdkDisplay *display; - GdkX11GLContext *context; - GdkVisual *visual; -@@ -1296,12 +1315,15 @@ gdk_x11_window_create_gl_context (GdkWindow *window, - context->is_attached = attached; - - return GDK_GL_CONTEXT (context); -+#endif - } - - gboolean - gdk_x11_display_make_gl_context_current (GdkDisplay *display, - GdkGLContext *context) - { -+ return FALSE; -+#if 0 - GdkX11GLContext *context_x11; - Display *dpy = gdk_x11_display_get_xdisplay (display); - GdkWindow *window; -@@ -1357,6 +1379,7 @@ gdk_x11_display_make_gl_context_current (GdkDisplay *display, - } - - return TRUE; -+#endif - } - - /** -@@ -1381,13 +1404,14 @@ gdk_x11_display_get_glx_version (GdkDisplay *display, - if (!GDK_IS_X11_DISPLAY (display)) - return FALSE; - -- if (!gdk_x11_screen_init_gl (gdk_display_get_default_screen (display))) -+ //if (!gdk_x11_screen_init_gl (gdk_display_get_default_screen (display))) - return FALSE; -- -+#if 0 - if (major != NULL) - *major = GDK_X11_DISPLAY (display)->glx_version / 10; - if (minor != NULL) - *minor = GDK_X11_DISPLAY (display)->glx_version % 10; - - return TRUE; -+#endif - } -diff --git a/gdk/x11/gdkglcontext-x11.h b/gdk/x11/gdkglcontext-x11.h -index 44cb0d5..753b265 100644 ---- a/gdk/x11/gdkglcontext-x11.h -+++ b/gdk/x11/gdkglcontext-x11.h -@@ -1,7 +1,7 @@ - /* GDK - The GIMP Drawing Kit - * - * gdkglcontext-x11.h: Private X11 specific OpenGL wrappers -- * -+ * - * Copyright © 2014 Emmanuele Bassi - * - * This library is free software; you can redistribute it and/or -@@ -24,8 +24,8 @@ - #include - #include - --#include --#include -+//#include -+//#include - - #include "gdkglcontextprivate.h" - #include "gdkdisplayprivate.h" -@@ -40,9 +40,9 @@ struct _GdkX11GLContext - { - GdkGLContext parent_instance; - -- GLXContext glx_context; -+ /*GLXContext glx_context; - GLXFBConfig glx_config; -- GLXDrawable drawable; -+ GLXDrawable drawable;*/ - - guint is_attached : 1; - guint is_direct : 1; -diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c -index 48237d1..79d786e 100644 ---- a/gtk/inspector/general.c -+++ b/gtk/inspector/general.c -@@ -31,6 +31,7 @@ - #include "gtkadjustment.h" - #include "gtkbox.h" - -+#undef GDK_WINDOWING_X11 - #ifdef GDK_WINDOWING_X11 - #include "x11/gdkx.h" - #include --- -2.30.2 - - -From f324f93a943cf45ed842f6821bdb87e5f8288b9b Mon Sep 17 00:00:00 2001 -From: Augustin Cavalier -Date: Tue, 18 Jan 2022 18:49:39 -0500 -Subject: Build without ATK-bridge. - - -diff --git a/configure b/configure -index 887d6d5..c1f9910 100755 ---- a/configure -+++ b/configure -@@ -27043,8 +27043,8 @@ fi - ######################################## - - if test x$enable_x11_backend = xyes; then -- ATK_PACKAGES="atk atk-bridge-2.0" --else -+# ATK_PACKAGES="atk atk-bridge-2.0" -+#else - ATK_PACKAGES="atk" - fi - -diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c -index 7f0e520..78b979b 100644 ---- a/gtk/a11y/gtkaccessibility.c -+++ b/gtk/a11y/gtkaccessibility.c -@@ -38,7 +38,8 @@ - #include - - #ifdef GDK_WINDOWING_X11 --#include -+#undef GDK_WINDOWING_X11 -+//#include - #endif - - static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, --- -2.30.2 - - -From d4c5484f070af803592211f6cca9b014350d317f Mon Sep 17 00:00:00 2001 -From: Augustin Cavalier -Date: Tue, 18 Jan 2022 18:50:15 -0500 -Subject: Disable another XI2 usage. - - -diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c -index 7e08f47..2ce9544 100644 ---- a/gdk/x11/gdkdisplay-x11.c -+++ b/gdk/x11/gdkdisplay-x11.c -@@ -3083,8 +3083,7 @@ gdk_x11_display_get_default_seat (GdkDisplay *display) - } - - gdk_x11_display_error_trap_push (display); -- result = XIGetClientPointer (GDK_DISPLAY_XDISPLAY (display), -- None, &device_id); -+ result = BadImplementation;//XIGetClientPointer (GDK_DISPLAY_XDISPLAY (display), None, &device_id); - gdk_x11_display_error_trap_pop_ignored (display); - - for (l = seats; l; l = l->next) --- -2.30.2 - - -From 6234d5fecc236fc22e797225b5a7d917ce8863e8 Mon Sep 17 00:00:00 2001 -From: Augustin Cavalier -Date: Tue, 18 Jan 2022 18:51:09 -0500 -Subject: Rework keyboard handling code to be more compatible with Xlibe. - - -diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c -index 350a79b..9953e3d 100644 ---- a/gdk/x11/gdkdevicemanager-core-x11.c -+++ b/gdk/x11/gdkdevicemanager-core-x11.c -@@ -151,7 +151,7 @@ translate_key_event (GdkDisplay *display, - XEvent *xevent) - { - GdkKeymap *keymap = gdk_keymap_get_for_display (display); -- GdkModifierType consumed, state; -+ GdkModifierType consumed = 0, state = 0; - - event->key.type = xevent->xany.type == KeyPress ? GDK_KEY_PRESS : GDK_KEY_RELEASE; - event->key.time = xevent->xkey.time; -@@ -164,20 +164,40 @@ translate_key_event (GdkDisplay *display, - - event->key.keyval = GDK_KEY_VoidSymbol; - -+#if 0 - gdk_keymap_translate_keyboard_state (keymap, - event->key.hardware_keycode, - event->key.state, - event->key.group, - &event->key.keyval, - NULL, NULL, &consumed); -+#endif - - state = event->key.state & ~consumed; - _gdk_x11_keymap_add_virt_mods (keymap, &state); - event->key.state |= state; - -+#ifndef __HAIKU__ - event->key.is_modifier = gdk_x11_keymap_key_is_modifier (keymap, event->key.hardware_keycode); - - _gdk_x11_event_translate_keyboard_string (&event->key); -+#else -+ // KeyEvents contain hidden data with a full UTF-8 string representing -+ // the key event on Haiku (and maybe elsewhere.) We have to use XLookupString -+ // instead of the GDK keymap processing functions in order to utilize it. -+ KeySym keysym; -+ char buffer[8] = {}; -+ event->key.string = NULL; -+ XLookupString(&xevent->xkey, buffer, sizeof(buffer), &keysym, NULL); -+ event->key.keyval = keysym; -+ event->key.length = strlen(buffer); -+ if (event->key.length) { -+ event->key.string = g_strdup(buffer); -+ keysym = gdk_unicode_to_keyval(g_utf8_get_char(buffer)); -+ if (event->key.keyval == NoSymbol || keysym < 0x01000000) -+ event->key.keyval = keysym; -+ } -+#endif - - #ifdef G_ENABLE_DEBUG - if (GDK_DEBUG_CHECK (EVENTS)) -@@ -689,7 +709,7 @@ gdk_x11_device_manager_core_translate_event (GdkEventTranslator *translator, - xevent->xfocus.mode); - return_val = FALSE; - break; -- -+ - default: - return_val = FALSE; - } -diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c -index 577e4a1..8fc265d 100644 ---- a/gdk/x11/gdkkeys-x11.c -+++ b/gdk/x11/gdkkeys-x11.c -@@ -183,6 +183,10 @@ update_modmap (Display *display, - for (i = 0; i < 8; i++) - keymap_x11->modmap[i] = 1 << i; - -+#ifdef __HAIKU__ -+ return; -+#endif -+ - for (i = 0; i < XkbNumVirtualMods; i++) - { - for (j = 0; vmods[j].atom; j++) -@@ -584,7 +588,7 @@ update_direction (GdkX11Keymap *keymap_x11, - - had_direction = keymap_x11->have_direction; - old_direction = keymap_x11->current_direction; -- -+#ifndef __HAIKU__ - group_atom = xkb->names->groups[group]; - - /* a group change? */ -@@ -594,7 +598,7 @@ update_direction (GdkX11Keymap *keymap_x11, - keymap_x11->current_group_atom = group_atom; - keymap_x11->have_direction = TRUE; - } -- -+#endif - return !had_direction || old_direction != keymap_x11->current_direction; - } - -@@ -795,11 +799,24 @@ gdk_x11_keymap_get_entries_for_keyval (GdkKeymap *keymap, - - retval = g_array_new (FALSE, FALSE, sizeof (GdkKeymapKey)); - -+#ifdef __HAIKU__ -+ if (1) { -+ Display* xdisplay = GDK_X11_DISPLAY(GDK_KEYMAP (keymap_x11)->display)->xdisplay; -+ KeyCode code = XKeysymToKeycode(xdisplay, keyval); -+ if (code) { -+ GdkKeymapKey key; -+ key.keycode = code; -+ key.group = 0; -+ key.level = 0; -+ g_array_append_val (retval, key); -+ } -+ } else -+#endif -+ - #ifdef HAVE_XKB - if (KEYMAP_USE_XKB (keymap)) - { - /* See sec 15.3.4 in XKB docs */ -- - XkbDescRec *xkb = get_xkb (keymap_x11); - gint keycode; - -@@ -940,6 +957,23 @@ gdk_x11_keymap_get_entries_for_keycode (GdkKeymap *keymap, - else - keyval_array = NULL; - -+#ifdef __HAIKU__ -+ if (1) { -+ Display* xdisplay = GDK_X11_DISPLAY(GDK_KEYMAP (keymap_x11)->display)->xdisplay; -+ KeySym keysym = XKeycodeToKeysym(xdisplay, hardware_keycode, 0); -+ if (keysym != NoSymbol) { -+ GdkKeymapKey key; -+ key.keycode = hardware_keycode; -+ key.group = 0; -+ key.level = 0; -+ if (key_array) -+ g_array_append_val (key_array, key); -+ if (keyval_array) -+ g_array_append_val (keyval_array, keysym); -+ } -+ } else -+#endif -+ - #ifdef HAVE_XKB - if (KEYMAP_USE_XKB (keymap)) - { -@@ -1318,6 +1352,7 @@ gdk_x11_keymap_translate_keyboard_state (GdkKeymap *keymap, - state &= ~(1 << 13 | 1 << 14); - state |= group << 13; - -+#ifndef __HAIKU__ - MyEnhancedXkbTranslateKeyCode (xkb, - hardware_keycode, - state, -@@ -1325,6 +1360,17 @@ gdk_x11_keymap_translate_keyboard_state (GdkKeymap *keymap, - &tmp_keyval, - effective_group, - level); -+#else -+ XkbTranslateKeyCode (xkb, -+ hardware_keycode, -+ state, -+ &tmp_modifiers, -+ &tmp_keyval); -+ if (effective_group) -+ *effective_group = 0; -+ if (level) -+ *level = 0; -+#endif - - if (state & ~tmp_modifiers & LockMask) - tmp_keyval = gdk_keyval_to_upper (tmp_keyval); --- -2.30.2 - - -From 4a80c50a8cb38aba5b792a1a7254bac894531459 Mon Sep 17 00:00:00 2001 -From: Augustin Cavalier -Date: Tue, 18 Jan 2022 18:52:45 -0500 -Subject: Atoms are pointer-width not integer-width. - -Important for Xlibe. - -diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c -index 7a8046e..4a4712d 100644 ---- a/gdk/x11/gdkproperty-x11.c -+++ b/gdk/x11/gdkproperty-x11.c -@@ -57,9 +57,9 @@ insert_atom_pair (GdkDisplay *display, - - g_hash_table_insert (display_x11->atom_from_virtual, - GDK_ATOM_TO_POINTER (virtual_atom), -- GUINT_TO_POINTER (xatom)); -+ (gpointer) (xatom)); - g_hash_table_insert (display_x11->atom_to_virtual, -- GUINT_TO_POINTER (xatom), -+ (gpointer) (xatom), - GDK_ATOM_TO_POINTER (virtual_atom)); - } - -@@ -73,7 +73,7 @@ lookup_cached_xatom (GdkDisplay *display, - return ATOM_TO_INDEX (atom); - - if (display_x11->atom_from_virtual) -- return GPOINTER_TO_UINT (g_hash_table_lookup (display_x11->atom_from_virtual, -+ return (Atom) (g_hash_table_lookup (display_x11->atom_from_virtual, - GDK_ATOM_TO_POINTER (atom))); - - return None; --- -2.30.2 - - -From dd8a375af5ea8de028db75ecfcec81c6a087f095 Mon Sep 17 00:00:00 2001 -From: Augustin Cavalier -Date: Tue, 18 Jan 2022 20:01:57 -0500 -Subject: Pretend for one test we are not using X11. - - -diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c -index 24540e3..5fd75b5 100644 ---- a/testsuite/gtk/objects-finalize.c -+++ b/testsuite/gtk/objects-finalize.c -@@ -19,6 +19,7 @@ - #include - #include - -+#undef GDK_WINDOWING_X11 - #ifdef GDK_WINDOWING_X11 - # include - #endif --- -2.30.2 - - -From aa7ef4d72741aa6aa0f1df84b9e34176d7fe67a0 Mon Sep 17 00:00:00 2001 -From: Augustin Cavalier -Date: Tue, 18 Jan 2022 20:20:22 -0500 -Subject: HACK: gtkiconhelper: Do not crash when failing to find the fallback - icon. - -Somehow, resources appear to be somewhat broken, and the icon is -not actually included. This deserves investigation. - -diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c -index f6e3e29..83a9c87 100644 ---- a/gtk/gtkiconhelper.c -+++ b/gtk/gtkiconhelper.c -@@ -491,8 +491,8 @@ ensure_surface_for_gicon (GtkIconHelper *self, - &error); - /* We include this image as resource, so we always have it available or - * the icontheme code is broken */ -- g_assert_no_error (error); -- g_assert (destination); -+ //g_assert_no_error (error); -+ //g_assert (destination); - symbolic = FALSE; - } - --- -2.30.2 - - -From 49df1cb0482d9e2ced5abb08b81957b17d59af94 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 26 Jan 2022 22:58:51 +1000 -Subject: Use haiku icon theme by default - - -diff --git a/gtk/gtksettingsprivate.h b/gtk/gtksettingsprivate.h -index 47f75a6..3dbf348 100644 ---- a/gtk/gtksettingsprivate.h -+++ b/gtk/gtksettingsprivate.h -@@ -24,7 +24,7 @@ - G_BEGIN_DECLS - - #define DEFAULT_THEME_NAME "Adwaita" --#define DEFAULT_ICON_THEME "Adwaita" -+#define DEFAULT_ICON_THEME "haiku" - - void _gtk_settings_set_property_value_from_rc (GtkSettings *settings, - const gchar *name, --- -2.30.2 - diff --git a/x11-libs/gtk3/patches/gtk3-3.24.34.patchset b/x11-libs/gtk3/patches/gtk3-3.24.34.patchset new file mode 100644 index 000000000..eae5676a4 --- /dev/null +++ b/x11-libs/gtk3/patches/gtk3-3.24.34.patchset @@ -0,0 +1,1097 @@ +From 4d860b38a1103f4bfa5e1c4f5db1f4313eea6ef5 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Fri, 18 Nov 2022 12:43:43 +1000 +Subject: Link with libbsd + + +diff --git a/gdk/meson.build b/gdk/meson.build +index 4bb1bf2..4598182 100644 +--- a/gdk/meson.build ++++ b/gdk/meson.build +@@ -199,6 +199,7 @@ gdk_gen_headers = [gdkenum_h, gdkmarshal_h, gdkconfig, gdkversionmacros] + + gdk_deps = [ + libm, ++ cc.find_library('bsd'), + pixbuf_dep, + cairo_dep, + pango_dep, +-- +2.37.3 + + +From 5834175a650856bec0f3bbcc72e3685c702134fa Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Fri, 18 Nov 2022 12:44:41 +1000 +Subject: Remove syscall.h include + + +diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c +index 20f662d..16ebc40 100644 +--- a/gdk/wayland/gdkdisplay-wayland.c ++++ b/gdk/wayland/gdkdisplay-wayland.c +@@ -28,7 +28,9 @@ + #endif + + #include ++#ifndef __HAIKU__ + #include ++#endif + + #include + #include "gdkwayland.h" +-- +2.37.3 + + +From e092a5c0fe049ff0018c5b173157a39dc649cf98 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Fri, 18 Nov 2022 12:45:53 +1000 +Subject: Add input-event-codes.h from linux + + +diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c +index 67bd322..eaa044a 100644 +--- a/gdk/wayland/gdkdevice-wayland.c ++++ b/gdk/wayland/gdkdevice-wayland.c +@@ -44,6 +44,8 @@ + #include + #elif defined(HAVE_LINUX_INPUT_H) + #include ++#else ++#include "input-event-codes.h" + #endif + + #define BUTTON_BASE (BTN_LEFT - 1) /* Used to translate to 1-indexed buttons */ +diff --git a/gdk/wayland/input-event-codes.h b/gdk/wayland/input-event-codes.h +new file mode 100644 +index 0000000..225ec87 +--- /dev/null ++++ b/gdk/wayland/input-event-codes.h +@@ -0,0 +1,950 @@ ++/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ ++/* ++ * Input event codes ++ * ++ * *** IMPORTANT *** ++ * This file is not only included from C-code but also from devicetree source ++ * files. As such this file MUST only contain comments and defines. ++ * ++ * Copyright (c) 1999-2002 Vojtech Pavlik ++ * Copyright (c) 2015 Hans de Goede ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 as published by ++ * the Free Software Foundation. ++ */ ++#ifndef _UAPI_INPUT_EVENT_CODES_H ++#define _UAPI_INPUT_EVENT_CODES_H ++ ++/* ++ * Device properties and quirks ++ */ ++ ++#define INPUT_PROP_POINTER 0x00 /* needs a pointer */ ++#define INPUT_PROP_DIRECT 0x01 /* direct input devices */ ++#define INPUT_PROP_BUTTONPAD 0x02 /* has button(s) under pad */ ++#define INPUT_PROP_SEMI_MT 0x03 /* touch rectangle only */ ++#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */ ++#define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */ ++#define INPUT_PROP_ACCELEROMETER 0x06 /* has accelerometer */ ++ ++#define INPUT_PROP_MAX 0x1f ++#define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) ++ ++/* ++ * Event types ++ */ ++ ++#define EV_SYN 0x00 ++#define EV_KEY 0x01 ++#define EV_REL 0x02 ++#define EV_ABS 0x03 ++#define EV_MSC 0x04 ++#define EV_SW 0x05 ++#define EV_LED 0x11 ++#define EV_SND 0x12 ++#define EV_REP 0x14 ++#define EV_FF 0x15 ++#define EV_PWR 0x16 ++#define EV_FF_STATUS 0x17 ++#define EV_MAX 0x1f ++#define EV_CNT (EV_MAX+1) ++ ++/* ++ * Synchronization events. ++ */ ++ ++#define SYN_REPORT 0 ++#define SYN_CONFIG 1 ++#define SYN_MT_REPORT 2 ++#define SYN_DROPPED 3 ++#define SYN_MAX 0xf ++#define SYN_CNT (SYN_MAX+1) ++ ++/* ++ * Keys and buttons ++ * ++ * Most of the keys/buttons are modeled after USB HUT 1.12 ++ * (see http://www.usb.org/developers/hidpage). ++ * Abbreviations in the comments: ++ * AC - Application Control ++ * AL - Application Launch Button ++ * SC - System Control ++ */ ++ ++#define KEY_RESERVED 0 ++#define KEY_ESC 1 ++#define KEY_1 2 ++#define KEY_2 3 ++#define KEY_3 4 ++#define KEY_4 5 ++#define KEY_5 6 ++#define KEY_6 7 ++#define KEY_7 8 ++#define KEY_8 9 ++#define KEY_9 10 ++#define KEY_0 11 ++#define KEY_MINUS 12 ++#define KEY_EQUAL 13 ++#define KEY_BACKSPACE 14 ++#define KEY_TAB 15 ++#define KEY_Q 16 ++#define KEY_W 17 ++#define KEY_E 18 ++#define KEY_R 19 ++#define KEY_T 20 ++#define KEY_Y 21 ++#define KEY_U 22 ++#define KEY_I 23 ++#define KEY_O 24 ++#define KEY_P 25 ++#define KEY_LEFTBRACE 26 ++#define KEY_RIGHTBRACE 27 ++#define KEY_ENTER 28 ++#define KEY_LEFTCTRL 29 ++#define KEY_A 30 ++#define KEY_S 31 ++#define KEY_D 32 ++#define KEY_F 33 ++#define KEY_G 34 ++#define KEY_H 35 ++#define KEY_J 36 ++#define KEY_K 37 ++#define KEY_L 38 ++#define KEY_SEMICOLON 39 ++#define KEY_APOSTROPHE 40 ++#define KEY_GRAVE 41 ++#define KEY_LEFTSHIFT 42 ++#define KEY_BACKSLASH 43 ++#define KEY_Z 44 ++#define KEY_X 45 ++#define KEY_C 46 ++#define KEY_V 47 ++#define KEY_B 48 ++#define KEY_N 49 ++#define KEY_M 50 ++#define KEY_COMMA 51 ++#define KEY_DOT 52 ++#define KEY_SLASH 53 ++#define KEY_RIGHTSHIFT 54 ++#define KEY_KPASTERISK 55 ++#define KEY_LEFTALT 56 ++#define KEY_SPACE 57 ++#define KEY_CAPSLOCK 58 ++#define KEY_F1 59 ++#define KEY_F2 60 ++#define KEY_F3 61 ++#define KEY_F4 62 ++#define KEY_F5 63 ++#define KEY_F6 64 ++#define KEY_F7 65 ++#define KEY_F8 66 ++#define KEY_F9 67 ++#define KEY_F10 68 ++#define KEY_NUMLOCK 69 ++#define KEY_SCROLLLOCK 70 ++#define KEY_KP7 71 ++#define KEY_KP8 72 ++#define KEY_KP9 73 ++#define KEY_KPMINUS 74 ++#define KEY_KP4 75 ++#define KEY_KP5 76 ++#define KEY_KP6 77 ++#define KEY_KPPLUS 78 ++#define KEY_KP1 79 ++#define KEY_KP2 80 ++#define KEY_KP3 81 ++#define KEY_KP0 82 ++#define KEY_KPDOT 83 ++ ++#define KEY_ZENKAKUHANKAKU 85 ++#define KEY_102ND 86 ++#define KEY_F11 87 ++#define KEY_F12 88 ++#define KEY_RO 89 ++#define KEY_KATAKANA 90 ++#define KEY_HIRAGANA 91 ++#define KEY_HENKAN 92 ++#define KEY_KATAKANAHIRAGANA 93 ++#define KEY_MUHENKAN 94 ++#define KEY_KPJPCOMMA 95 ++#define KEY_KPENTER 96 ++#define KEY_RIGHTCTRL 97 ++#define KEY_KPSLASH 98 ++#define KEY_SYSRQ 99 ++#define KEY_RIGHTALT 100 ++#define KEY_LINEFEED 101 ++#define KEY_HOME 102 ++#define KEY_UP 103 ++#define KEY_PAGEUP 104 ++#define KEY_LEFT 105 ++#define KEY_RIGHT 106 ++#define KEY_END 107 ++#define KEY_DOWN 108 ++#define KEY_PAGEDOWN 109 ++#define KEY_INSERT 110 ++#define KEY_DELETE 111 ++#define KEY_MACRO 112 ++#define KEY_MUTE 113 ++#define KEY_VOLUMEDOWN 114 ++#define KEY_VOLUMEUP 115 ++#define KEY_POWER 116 /* SC System Power Down */ ++#define KEY_KPEQUAL 117 ++#define KEY_KPPLUSMINUS 118 ++#define KEY_PAUSE 119 ++#define KEY_SCALE 120 /* AL Compiz Scale (Expose) */ ++ ++#define KEY_KPCOMMA 121 ++#define KEY_HANGEUL 122 ++#define KEY_HANGUEL KEY_HANGEUL ++#define KEY_HANJA 123 ++#define KEY_YEN 124 ++#define KEY_LEFTMETA 125 ++#define KEY_RIGHTMETA 126 ++#define KEY_COMPOSE 127 ++ ++#define KEY_STOP 128 /* AC Stop */ ++#define KEY_AGAIN 129 ++#define KEY_PROPS 130 /* AC Properties */ ++#define KEY_UNDO 131 /* AC Undo */ ++#define KEY_FRONT 132 ++#define KEY_COPY 133 /* AC Copy */ ++#define KEY_OPEN 134 /* AC Open */ ++#define KEY_PASTE 135 /* AC Paste */ ++#define KEY_FIND 136 /* AC Search */ ++#define KEY_CUT 137 /* AC Cut */ ++#define KEY_HELP 138 /* AL Integrated Help Center */ ++#define KEY_MENU 139 /* Menu (show menu) */ ++#define KEY_CALC 140 /* AL Calculator */ ++#define KEY_SETUP 141 ++#define KEY_SLEEP 142 /* SC System Sleep */ ++#define KEY_WAKEUP 143 /* System Wake Up */ ++#define KEY_FILE 144 /* AL Local Machine Browser */ ++#define KEY_SENDFILE 145 ++#define KEY_DELETEFILE 146 ++#define KEY_XFER 147 ++#define KEY_PROG1 148 ++#define KEY_PROG2 149 ++#define KEY_WWW 150 /* AL Internet Browser */ ++#define KEY_MSDOS 151 ++#define KEY_COFFEE 152 /* AL Terminal Lock/Screensaver */ ++#define KEY_SCREENLOCK KEY_COFFEE ++#define KEY_ROTATE_DISPLAY 153 /* Display orientation for e.g. tablets */ ++#define KEY_DIRECTION KEY_ROTATE_DISPLAY ++#define KEY_CYCLEWINDOWS 154 ++#define KEY_MAIL 155 ++#define KEY_BOOKMARKS 156 /* AC Bookmarks */ ++#define KEY_COMPUTER 157 ++#define KEY_BACK 158 /* AC Back */ ++#define KEY_FORWARD 159 /* AC Forward */ ++#define KEY_CLOSECD 160 ++#define KEY_EJECTCD 161 ++#define KEY_EJECTCLOSECD 162 ++#define KEY_NEXTSONG 163 ++#define KEY_PLAYPAUSE 164 ++#define KEY_PREVIOUSSONG 165 ++#define KEY_STOPCD 166 ++#define KEY_RECORD 167 ++#define KEY_REWIND 168 ++#define KEY_PHONE 169 /* Media Select Telephone */ ++#define KEY_ISO 170 ++#define KEY_CONFIG 171 /* AL Consumer Control Configuration */ ++#define KEY_HOMEPAGE 172 /* AC Home */ ++#define KEY_REFRESH 173 /* AC Refresh */ ++#define KEY_EXIT 174 /* AC Exit */ ++#define KEY_MOVE 175 ++#define KEY_EDIT 176 ++#define KEY_SCROLLUP 177 ++#define KEY_SCROLLDOWN 178 ++#define KEY_KPLEFTPAREN 179 ++#define KEY_KPRIGHTPAREN 180 ++#define KEY_NEW 181 /* AC New */ ++#define KEY_REDO 182 /* AC Redo/Repeat */ ++ ++#define KEY_F13 183 ++#define KEY_F14 184 ++#define KEY_F15 185 ++#define KEY_F16 186 ++#define KEY_F17 187 ++#define KEY_F18 188 ++#define KEY_F19 189 ++#define KEY_F20 190 ++#define KEY_F21 191 ++#define KEY_F22 192 ++#define KEY_F23 193 ++#define KEY_F24 194 ++ ++#define KEY_PLAYCD 200 ++#define KEY_PAUSECD 201 ++#define KEY_PROG3 202 ++#define KEY_PROG4 203 ++#define KEY_DASHBOARD 204 /* AL Dashboard */ ++#define KEY_SUSPEND 205 ++#define KEY_CLOSE 206 /* AC Close */ ++#define KEY_PLAY 207 ++#define KEY_FASTFORWARD 208 ++#define KEY_BASSBOOST 209 ++#define KEY_PRINT 210 /* AC Print */ ++#define KEY_HP 211 ++#define KEY_CAMERA 212 ++#define KEY_SOUND 213 ++#define KEY_QUESTION 214 ++#define KEY_EMAIL 215 ++#define KEY_CHAT 216 ++#define KEY_SEARCH 217 ++#define KEY_CONNECT 218 ++#define KEY_FINANCE 219 /* AL Checkbook/Finance */ ++#define KEY_SPORT 220 ++#define KEY_SHOP 221 ++#define KEY_ALTERASE 222 ++#define KEY_CANCEL 223 /* AC Cancel */ ++#define KEY_BRIGHTNESSDOWN 224 ++#define KEY_BRIGHTNESSUP 225 ++#define KEY_MEDIA 226 ++ ++#define KEY_SWITCHVIDEOMODE 227 /* Cycle between available video ++ outputs (Monitor/LCD/TV-out/etc) */ ++#define KEY_KBDILLUMTOGGLE 228 ++#define KEY_KBDILLUMDOWN 229 ++#define KEY_KBDILLUMUP 230 ++ ++#define KEY_SEND 231 /* AC Send */ ++#define KEY_REPLY 232 /* AC Reply */ ++#define KEY_FORWARDMAIL 233 /* AC Forward Msg */ ++#define KEY_SAVE 234 /* AC Save */ ++#define KEY_DOCUMENTS 235 ++ ++#define KEY_BATTERY 236 ++ ++#define KEY_BLUETOOTH 237 ++#define KEY_WLAN 238 ++#define KEY_UWB 239 ++ ++#define KEY_UNKNOWN 240 ++ ++#define KEY_VIDEO_NEXT 241 /* drive next video source */ ++#define KEY_VIDEO_PREV 242 /* drive previous video source */ ++#define KEY_BRIGHTNESS_CYCLE 243 /* brightness up, after max is min */ ++#define KEY_BRIGHTNESS_AUTO 244 /* Set Auto Brightness: manual ++ brightness control is off, ++ rely on ambient */ ++#define KEY_BRIGHTNESS_ZERO KEY_BRIGHTNESS_AUTO ++#define KEY_DISPLAY_OFF 245 /* display device to off state */ ++ ++#define KEY_WWAN 246 /* Wireless WAN (LTE, UMTS, GSM, etc.) */ ++#define KEY_WIMAX KEY_WWAN ++#define KEY_RFKILL 247 /* Key that controls all radios */ ++ ++#define KEY_MICMUTE 248 /* Mute / unmute the microphone */ ++ ++/* Code 255 is reserved for special needs of AT keyboard driver */ ++ ++#define BTN_MISC 0x100 ++#define BTN_0 0x100 ++#define BTN_1 0x101 ++#define BTN_2 0x102 ++#define BTN_3 0x103 ++#define BTN_4 0x104 ++#define BTN_5 0x105 ++#define BTN_6 0x106 ++#define BTN_7 0x107 ++#define BTN_8 0x108 ++#define BTN_9 0x109 ++ ++#define BTN_MOUSE 0x110 ++#define BTN_LEFT 0x110 ++#define BTN_RIGHT 0x111 ++#define BTN_MIDDLE 0x112 ++#define BTN_SIDE 0x113 ++#define BTN_EXTRA 0x114 ++#define BTN_FORWARD 0x115 ++#define BTN_BACK 0x116 ++#define BTN_TASK 0x117 ++ ++#define BTN_JOYSTICK 0x120 ++#define BTN_TRIGGER 0x120 ++#define BTN_THUMB 0x121 ++#define BTN_THUMB2 0x122 ++#define BTN_TOP 0x123 ++#define BTN_TOP2 0x124 ++#define BTN_PINKIE 0x125 ++#define BTN_BASE 0x126 ++#define BTN_BASE2 0x127 ++#define BTN_BASE3 0x128 ++#define BTN_BASE4 0x129 ++#define BTN_BASE5 0x12a ++#define BTN_BASE6 0x12b ++#define BTN_DEAD 0x12f ++ ++#define BTN_GAMEPAD 0x130 ++#define BTN_SOUTH 0x130 ++#define BTN_A BTN_SOUTH ++#define BTN_EAST 0x131 ++#define BTN_B BTN_EAST ++#define BTN_C 0x132 ++#define BTN_NORTH 0x133 ++#define BTN_X BTN_NORTH ++#define BTN_WEST 0x134 ++#define BTN_Y BTN_WEST ++#define BTN_Z 0x135 ++#define BTN_TL 0x136 ++#define BTN_TR 0x137 ++#define BTN_TL2 0x138 ++#define BTN_TR2 0x139 ++#define BTN_SELECT 0x13a ++#define BTN_START 0x13b ++#define BTN_MODE 0x13c ++#define BTN_THUMBL 0x13d ++#define BTN_THUMBR 0x13e ++ ++#define BTN_DIGI 0x140 ++#define BTN_TOOL_PEN 0x140 ++#define BTN_TOOL_RUBBER 0x141 ++#define BTN_TOOL_BRUSH 0x142 ++#define BTN_TOOL_PENCIL 0x143 ++#define BTN_TOOL_AIRBRUSH 0x144 ++#define BTN_TOOL_FINGER 0x145 ++#define BTN_TOOL_MOUSE 0x146 ++#define BTN_TOOL_LENS 0x147 ++#define BTN_TOOL_QUINTTAP 0x148 /* Five fingers on trackpad */ ++#define BTN_STYLUS3 0x149 ++#define BTN_TOUCH 0x14a ++#define BTN_STYLUS 0x14b ++#define BTN_STYLUS2 0x14c ++#define BTN_TOOL_DOUBLETAP 0x14d ++#define BTN_TOOL_TRIPLETAP 0x14e ++#define BTN_TOOL_QUADTAP 0x14f /* Four fingers on trackpad */ ++ ++#define BTN_WHEEL 0x150 ++#define BTN_GEAR_DOWN 0x150 ++#define BTN_GEAR_UP 0x151 ++ ++#define KEY_OK 0x160 ++#define KEY_SELECT 0x161 ++#define KEY_GOTO 0x162 ++#define KEY_CLEAR 0x163 ++#define KEY_POWER2 0x164 ++#define KEY_OPTION 0x165 ++#define KEY_INFO 0x166 /* AL OEM Features/Tips/Tutorial */ ++#define KEY_TIME 0x167 ++#define KEY_VENDOR 0x168 ++#define KEY_ARCHIVE 0x169 ++#define KEY_PROGRAM 0x16a /* Media Select Program Guide */ ++#define KEY_CHANNEL 0x16b ++#define KEY_FAVORITES 0x16c ++#define KEY_EPG 0x16d ++#define KEY_PVR 0x16e /* Media Select Home */ ++#define KEY_MHP 0x16f ++#define KEY_LANGUAGE 0x170 ++#define KEY_TITLE 0x171 ++#define KEY_SUBTITLE 0x172 ++#define KEY_ANGLE 0x173 ++#define KEY_FULL_SCREEN 0x174 /* AC View Toggle */ ++#define KEY_ZOOM KEY_FULL_SCREEN ++#define KEY_MODE 0x175 ++#define KEY_KEYBOARD 0x176 ++#define KEY_ASPECT_RATIO 0x177 /* HUTRR37: Aspect */ ++#define KEY_SCREEN KEY_ASPECT_RATIO ++#define KEY_PC 0x178 /* Media Select Computer */ ++#define KEY_TV 0x179 /* Media Select TV */ ++#define KEY_TV2 0x17a /* Media Select Cable */ ++#define KEY_VCR 0x17b /* Media Select VCR */ ++#define KEY_VCR2 0x17c /* VCR Plus */ ++#define KEY_SAT 0x17d /* Media Select Satellite */ ++#define KEY_SAT2 0x17e ++#define KEY_CD 0x17f /* Media Select CD */ ++#define KEY_TAPE 0x180 /* Media Select Tape */ ++#define KEY_RADIO 0x181 ++#define KEY_TUNER 0x182 /* Media Select Tuner */ ++#define KEY_PLAYER 0x183 ++#define KEY_TEXT 0x184 ++#define KEY_DVD 0x185 /* Media Select DVD */ ++#define KEY_AUX 0x186 ++#define KEY_MP3 0x187 ++#define KEY_AUDIO 0x188 /* AL Audio Browser */ ++#define KEY_VIDEO 0x189 /* AL Movie Browser */ ++#define KEY_DIRECTORY 0x18a ++#define KEY_LIST 0x18b ++#define KEY_MEMO 0x18c /* Media Select Messages */ ++#define KEY_CALENDAR 0x18d ++#define KEY_RED 0x18e ++#define KEY_GREEN 0x18f ++#define KEY_YELLOW 0x190 ++#define KEY_BLUE 0x191 ++#define KEY_CHANNELUP 0x192 /* Channel Increment */ ++#define KEY_CHANNELDOWN 0x193 /* Channel Decrement */ ++#define KEY_FIRST 0x194 ++#define KEY_LAST 0x195 /* Recall Last */ ++#define KEY_AB 0x196 ++#define KEY_NEXT 0x197 ++#define KEY_RESTART 0x198 ++#define KEY_SLOW 0x199 ++#define KEY_SHUFFLE 0x19a ++#define KEY_BREAK 0x19b ++#define KEY_PREVIOUS 0x19c ++#define KEY_DIGITS 0x19d ++#define KEY_TEEN 0x19e ++#define KEY_TWEN 0x19f ++#define KEY_VIDEOPHONE 0x1a0 /* Media Select Video Phone */ ++#define KEY_GAMES 0x1a1 /* Media Select Games */ ++#define KEY_ZOOMIN 0x1a2 /* AC Zoom In */ ++#define KEY_ZOOMOUT 0x1a3 /* AC Zoom Out */ ++#define KEY_ZOOMRESET 0x1a4 /* AC Zoom */ ++#define KEY_WORDPROCESSOR 0x1a5 /* AL Word Processor */ ++#define KEY_EDITOR 0x1a6 /* AL Text Editor */ ++#define KEY_SPREADSHEET 0x1a7 /* AL Spreadsheet */ ++#define KEY_GRAPHICSEDITOR 0x1a8 /* AL Graphics Editor */ ++#define KEY_PRESENTATION 0x1a9 /* AL Presentation App */ ++#define KEY_DATABASE 0x1aa /* AL Database App */ ++#define KEY_NEWS 0x1ab /* AL Newsreader */ ++#define KEY_VOICEMAIL 0x1ac /* AL Voicemail */ ++#define KEY_ADDRESSBOOK 0x1ad /* AL Contacts/Address Book */ ++#define KEY_MESSENGER 0x1ae /* AL Instant Messaging */ ++#define KEY_DISPLAYTOGGLE 0x1af /* Turn display (LCD) on and off */ ++#define KEY_BRIGHTNESS_TOGGLE KEY_DISPLAYTOGGLE ++#define KEY_SPELLCHECK 0x1b0 /* AL Spell Check */ ++#define KEY_LOGOFF 0x1b1 /* AL Logoff */ ++ ++#define KEY_DOLLAR 0x1b2 ++#define KEY_EURO 0x1b3 ++ ++#define KEY_FRAMEBACK 0x1b4 /* Consumer - transport controls */ ++#define KEY_FRAMEFORWARD 0x1b5 ++#define KEY_CONTEXT_MENU 0x1b6 /* GenDesc - system context menu */ ++#define KEY_MEDIA_REPEAT 0x1b7 /* Consumer - transport control */ ++#define KEY_10CHANNELSUP 0x1b8 /* 10 channels up (10+) */ ++#define KEY_10CHANNELSDOWN 0x1b9 /* 10 channels down (10-) */ ++#define KEY_IMAGES 0x1ba /* AL Image Browser */ ++#define KEY_NOTIFICATION_CENTER 0x1bc /* Show/hide the notification center */ ++#define KEY_PICKUP_PHONE 0x1bd /* Answer incoming call */ ++#define KEY_HANGUP_PHONE 0x1be /* Decline incoming call */ ++ ++#define KEY_DEL_EOL 0x1c0 ++#define KEY_DEL_EOS 0x1c1 ++#define KEY_INS_LINE 0x1c2 ++#define KEY_DEL_LINE 0x1c3 ++ ++#define KEY_FN 0x1d0 ++#define KEY_FN_ESC 0x1d1 ++#define KEY_FN_F1 0x1d2 ++#define KEY_FN_F2 0x1d3 ++#define KEY_FN_F3 0x1d4 ++#define KEY_FN_F4 0x1d5 ++#define KEY_FN_F5 0x1d6 ++#define KEY_FN_F6 0x1d7 ++#define KEY_FN_F7 0x1d8 ++#define KEY_FN_F8 0x1d9 ++#define KEY_FN_F9 0x1da ++#define KEY_FN_F10 0x1db ++#define KEY_FN_F11 0x1dc ++#define KEY_FN_F12 0x1dd ++#define KEY_FN_1 0x1de ++#define KEY_FN_2 0x1df ++#define KEY_FN_D 0x1e0 ++#define KEY_FN_E 0x1e1 ++#define KEY_FN_F 0x1e2 ++#define KEY_FN_S 0x1e3 ++#define KEY_FN_B 0x1e4 ++#define KEY_FN_RIGHT_SHIFT 0x1e5 ++ ++#define KEY_BRL_DOT1 0x1f1 ++#define KEY_BRL_DOT2 0x1f2 ++#define KEY_BRL_DOT3 0x1f3 ++#define KEY_BRL_DOT4 0x1f4 ++#define KEY_BRL_DOT5 0x1f5 ++#define KEY_BRL_DOT6 0x1f6 ++#define KEY_BRL_DOT7 0x1f7 ++#define KEY_BRL_DOT8 0x1f8 ++#define KEY_BRL_DOT9 0x1f9 ++#define KEY_BRL_DOT10 0x1fa ++ ++#define KEY_NUMERIC_0 0x200 /* used by phones, remote controls, */ ++#define KEY_NUMERIC_1 0x201 /* and other keypads */ ++#define KEY_NUMERIC_2 0x202 ++#define KEY_NUMERIC_3 0x203 ++#define KEY_NUMERIC_4 0x204 ++#define KEY_NUMERIC_5 0x205 ++#define KEY_NUMERIC_6 0x206 ++#define KEY_NUMERIC_7 0x207 ++#define KEY_NUMERIC_8 0x208 ++#define KEY_NUMERIC_9 0x209 ++#define KEY_NUMERIC_STAR 0x20a ++#define KEY_NUMERIC_POUND 0x20b ++#define KEY_NUMERIC_A 0x20c /* Phone key A - HUT Telephony 0xb9 */ ++#define KEY_NUMERIC_B 0x20d ++#define KEY_NUMERIC_C 0x20e ++#define KEY_NUMERIC_D 0x20f ++ ++#define KEY_CAMERA_FOCUS 0x210 ++#define KEY_WPS_BUTTON 0x211 /* WiFi Protected Setup key */ ++ ++#define KEY_TOUCHPAD_TOGGLE 0x212 /* Request switch touchpad on or off */ ++#define KEY_TOUCHPAD_ON 0x213 ++#define KEY_TOUCHPAD_OFF 0x214 ++ ++#define KEY_CAMERA_ZOOMIN 0x215 ++#define KEY_CAMERA_ZOOMOUT 0x216 ++#define KEY_CAMERA_UP 0x217 ++#define KEY_CAMERA_DOWN 0x218 ++#define KEY_CAMERA_LEFT 0x219 ++#define KEY_CAMERA_RIGHT 0x21a ++ ++#define KEY_ATTENDANT_ON 0x21b ++#define KEY_ATTENDANT_OFF 0x21c ++#define KEY_ATTENDANT_TOGGLE 0x21d /* Attendant call on or off */ ++#define KEY_LIGHTS_TOGGLE 0x21e /* Reading light on or off */ ++ ++#define BTN_DPAD_UP 0x220 ++#define BTN_DPAD_DOWN 0x221 ++#define BTN_DPAD_LEFT 0x222 ++#define BTN_DPAD_RIGHT 0x223 ++ ++#define KEY_ALS_TOGGLE 0x230 /* Ambient light sensor */ ++#define KEY_ROTATE_LOCK_TOGGLE 0x231 /* Display rotation lock */ ++ ++#define KEY_BUTTONCONFIG 0x240 /* AL Button Configuration */ ++#define KEY_TASKMANAGER 0x241 /* AL Task/Project Manager */ ++#define KEY_JOURNAL 0x242 /* AL Log/Journal/Timecard */ ++#define KEY_CONTROLPANEL 0x243 /* AL Control Panel */ ++#define KEY_APPSELECT 0x244 /* AL Select Task/Application */ ++#define KEY_SCREENSAVER 0x245 /* AL Screen Saver */ ++#define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */ ++#define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */ ++#define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */ ++#define KEY_EMOJI_PICKER 0x249 /* Show/hide emoji picker (HUTRR101) */ ++ ++#define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ ++#define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ ++ ++#define KEY_KBDINPUTASSIST_PREV 0x260 ++#define KEY_KBDINPUTASSIST_NEXT 0x261 ++#define KEY_KBDINPUTASSIST_PREVGROUP 0x262 ++#define KEY_KBDINPUTASSIST_NEXTGROUP 0x263 ++#define KEY_KBDINPUTASSIST_ACCEPT 0x264 ++#define KEY_KBDINPUTASSIST_CANCEL 0x265 ++ ++/* Diagonal movement keys */ ++#define KEY_RIGHT_UP 0x266 ++#define KEY_RIGHT_DOWN 0x267 ++#define KEY_LEFT_UP 0x268 ++#define KEY_LEFT_DOWN 0x269 ++ ++#define KEY_ROOT_MENU 0x26a /* Show Device's Root Menu */ ++/* Show Top Menu of the Media (e.g. DVD) */ ++#define KEY_MEDIA_TOP_MENU 0x26b ++#define KEY_NUMERIC_11 0x26c ++#define KEY_NUMERIC_12 0x26d ++/* ++ * Toggle Audio Description: refers to an audio service that helps blind and ++ * visually impaired consumers understand the action in a program. Note: in ++ * some countries this is referred to as "Video Description". ++ */ ++#define KEY_AUDIO_DESC 0x26e ++#define KEY_3D_MODE 0x26f ++#define KEY_NEXT_FAVORITE 0x270 ++#define KEY_STOP_RECORD 0x271 ++#define KEY_PAUSE_RECORD 0x272 ++#define KEY_VOD 0x273 /* Video on Demand */ ++#define KEY_UNMUTE 0x274 ++#define KEY_FASTREVERSE 0x275 ++#define KEY_SLOWREVERSE 0x276 ++/* ++ * Control a data application associated with the currently viewed channel, ++ * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.) ++ */ ++#define KEY_DATA 0x277 ++#define KEY_ONSCREEN_KEYBOARD 0x278 ++/* Electronic privacy screen control */ ++#define KEY_PRIVACY_SCREEN_TOGGLE 0x279 ++ ++/* Select an area of screen to be copied */ ++#define KEY_SELECTIVE_SCREENSHOT 0x27a ++ ++/* ++ * Some keyboards have keys which do not have a defined meaning, these keys ++ * are intended to be programmed / bound to macros by the user. For most ++ * keyboards with these macro-keys the key-sequence to inject, or action to ++ * take, is all handled by software on the host side. So from the kernel's ++ * point of view these are just normal keys. ++ * ++ * The KEY_MACRO# codes below are intended for such keys, which may be labeled ++ * e.g. G1-G18, or S1 - S30. The KEY_MACRO# codes MUST NOT be used for keys ++ * where the marking on the key does indicate a defined meaning / purpose. ++ * ++ * The KEY_MACRO# codes MUST also NOT be used as fallback for when no existing ++ * KEY_FOO define matches the marking / purpose. In this case a new KEY_FOO ++ * define MUST be added. ++ */ ++#define KEY_MACRO1 0x290 ++#define KEY_MACRO2 0x291 ++#define KEY_MACRO3 0x292 ++#define KEY_MACRO4 0x293 ++#define KEY_MACRO5 0x294 ++#define KEY_MACRO6 0x295 ++#define KEY_MACRO7 0x296 ++#define KEY_MACRO8 0x297 ++#define KEY_MACRO9 0x298 ++#define KEY_MACRO10 0x299 ++#define KEY_MACRO11 0x29a ++#define KEY_MACRO12 0x29b ++#define KEY_MACRO13 0x29c ++#define KEY_MACRO14 0x29d ++#define KEY_MACRO15 0x29e ++#define KEY_MACRO16 0x29f ++#define KEY_MACRO17 0x2a0 ++#define KEY_MACRO18 0x2a1 ++#define KEY_MACRO19 0x2a2 ++#define KEY_MACRO20 0x2a3 ++#define KEY_MACRO21 0x2a4 ++#define KEY_MACRO22 0x2a5 ++#define KEY_MACRO23 0x2a6 ++#define KEY_MACRO24 0x2a7 ++#define KEY_MACRO25 0x2a8 ++#define KEY_MACRO26 0x2a9 ++#define KEY_MACRO27 0x2aa ++#define KEY_MACRO28 0x2ab ++#define KEY_MACRO29 0x2ac ++#define KEY_MACRO30 0x2ad ++ ++/* ++ * Some keyboards with the macro-keys described above have some extra keys ++ * for controlling the host-side software responsible for the macro handling: ++ * -A macro recording start/stop key. Note that not all keyboards which emit ++ * KEY_MACRO_RECORD_START will also emit KEY_MACRO_RECORD_STOP if ++ * KEY_MACRO_RECORD_STOP is not advertised, then KEY_MACRO_RECORD_START ++ * should be interpreted as a recording start/stop toggle; ++ * -Keys for switching between different macro (pre)sets, either a key for ++ * cycling through the configured presets or keys to directly select a preset. ++ */ ++#define KEY_MACRO_RECORD_START 0x2b0 ++#define KEY_MACRO_RECORD_STOP 0x2b1 ++#define KEY_MACRO_PRESET_CYCLE 0x2b2 ++#define KEY_MACRO_PRESET1 0x2b3 ++#define KEY_MACRO_PRESET2 0x2b4 ++#define KEY_MACRO_PRESET3 0x2b5 ++ ++/* ++ * Some keyboards have a buildin LCD panel where the contents are controlled ++ * by the host. Often these have a number of keys directly below the LCD ++ * intended for controlling a menu shown on the LCD. These keys often don't ++ * have any labeling so we just name them KEY_KBD_LCD_MENU# ++ */ ++#define KEY_KBD_LCD_MENU1 0x2b8 ++#define KEY_KBD_LCD_MENU2 0x2b9 ++#define KEY_KBD_LCD_MENU3 0x2ba ++#define KEY_KBD_LCD_MENU4 0x2bb ++#define KEY_KBD_LCD_MENU5 0x2bc ++ ++#define BTN_TRIGGER_HAPPY 0x2c0 ++#define BTN_TRIGGER_HAPPY1 0x2c0 ++#define BTN_TRIGGER_HAPPY2 0x2c1 ++#define BTN_TRIGGER_HAPPY3 0x2c2 ++#define BTN_TRIGGER_HAPPY4 0x2c3 ++#define BTN_TRIGGER_HAPPY5 0x2c4 ++#define BTN_TRIGGER_HAPPY6 0x2c5 ++#define BTN_TRIGGER_HAPPY7 0x2c6 ++#define BTN_TRIGGER_HAPPY8 0x2c7 ++#define BTN_TRIGGER_HAPPY9 0x2c8 ++#define BTN_TRIGGER_HAPPY10 0x2c9 ++#define BTN_TRIGGER_HAPPY11 0x2ca ++#define BTN_TRIGGER_HAPPY12 0x2cb ++#define BTN_TRIGGER_HAPPY13 0x2cc ++#define BTN_TRIGGER_HAPPY14 0x2cd ++#define BTN_TRIGGER_HAPPY15 0x2ce ++#define BTN_TRIGGER_HAPPY16 0x2cf ++#define BTN_TRIGGER_HAPPY17 0x2d0 ++#define BTN_TRIGGER_HAPPY18 0x2d1 ++#define BTN_TRIGGER_HAPPY19 0x2d2 ++#define BTN_TRIGGER_HAPPY20 0x2d3 ++#define BTN_TRIGGER_HAPPY21 0x2d4 ++#define BTN_TRIGGER_HAPPY22 0x2d5 ++#define BTN_TRIGGER_HAPPY23 0x2d6 ++#define BTN_TRIGGER_HAPPY24 0x2d7 ++#define BTN_TRIGGER_HAPPY25 0x2d8 ++#define BTN_TRIGGER_HAPPY26 0x2d9 ++#define BTN_TRIGGER_HAPPY27 0x2da ++#define BTN_TRIGGER_HAPPY28 0x2db ++#define BTN_TRIGGER_HAPPY29 0x2dc ++#define BTN_TRIGGER_HAPPY30 0x2dd ++#define BTN_TRIGGER_HAPPY31 0x2de ++#define BTN_TRIGGER_HAPPY32 0x2df ++#define BTN_TRIGGER_HAPPY33 0x2e0 ++#define BTN_TRIGGER_HAPPY34 0x2e1 ++#define BTN_TRIGGER_HAPPY35 0x2e2 ++#define BTN_TRIGGER_HAPPY36 0x2e3 ++#define BTN_TRIGGER_HAPPY37 0x2e4 ++#define BTN_TRIGGER_HAPPY38 0x2e5 ++#define BTN_TRIGGER_HAPPY39 0x2e6 ++#define BTN_TRIGGER_HAPPY40 0x2e7 ++ ++/* We avoid low common keys in module aliases so they don't get huge. */ ++#define KEY_MIN_INTERESTING KEY_MUTE ++#define KEY_MAX 0x2ff ++#define KEY_CNT (KEY_MAX+1) ++ ++/* ++ * Relative axes ++ */ ++ ++#define REL_X 0x00 ++#define REL_Y 0x01 ++#define REL_Z 0x02 ++#define REL_RX 0x03 ++#define REL_RY 0x04 ++#define REL_RZ 0x05 ++#define REL_HWHEEL 0x06 ++#define REL_DIAL 0x07 ++#define REL_WHEEL 0x08 ++#define REL_MISC 0x09 ++/* ++ * 0x0a is reserved and should not be used in input drivers. ++ * It was used by HID as REL_MISC+1 and userspace needs to detect if ++ * the next REL_* event is correct or is just REL_MISC + n. ++ * We define here REL_RESERVED so userspace can rely on it and detect ++ * the situation described above. ++ */ ++#define REL_RESERVED 0x0a ++#define REL_WHEEL_HI_RES 0x0b ++#define REL_HWHEEL_HI_RES 0x0c ++#define REL_MAX 0x0f ++#define REL_CNT (REL_MAX+1) ++ ++/* ++ * Absolute axes ++ */ ++ ++#define ABS_X 0x00 ++#define ABS_Y 0x01 ++#define ABS_Z 0x02 ++#define ABS_RX 0x03 ++#define ABS_RY 0x04 ++#define ABS_RZ 0x05 ++#define ABS_THROTTLE 0x06 ++#define ABS_RUDDER 0x07 ++#define ABS_WHEEL 0x08 ++#define ABS_GAS 0x09 ++#define ABS_BRAKE 0x0a ++#define ABS_HAT0X 0x10 ++#define ABS_HAT0Y 0x11 ++#define ABS_HAT1X 0x12 ++#define ABS_HAT1Y 0x13 ++#define ABS_HAT2X 0x14 ++#define ABS_HAT2Y 0x15 ++#define ABS_HAT3X 0x16 ++#define ABS_HAT3Y 0x17 ++#define ABS_PRESSURE 0x18 ++#define ABS_DISTANCE 0x19 ++#define ABS_TILT_X 0x1a ++#define ABS_TILT_Y 0x1b ++#define ABS_TOOL_WIDTH 0x1c ++ ++#define ABS_VOLUME 0x20 ++ ++#define ABS_MISC 0x28 ++ ++/* ++ * 0x2e is reserved and should not be used in input drivers. ++ * It was used by HID as ABS_MISC+6 and userspace needs to detect if ++ * the next ABS_* event is correct or is just ABS_MISC + n. ++ * We define here ABS_RESERVED so userspace can rely on it and detect ++ * the situation described above. ++ */ ++#define ABS_RESERVED 0x2e ++ ++#define ABS_MT_SLOT 0x2f /* MT slot being modified */ ++#define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */ ++#define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */ ++#define ABS_MT_WIDTH_MAJOR 0x32 /* Major axis of approaching ellipse */ ++#define ABS_MT_WIDTH_MINOR 0x33 /* Minor axis (omit if circular) */ ++#define ABS_MT_ORIENTATION 0x34 /* Ellipse orientation */ ++#define ABS_MT_POSITION_X 0x35 /* Center X touch position */ ++#define ABS_MT_POSITION_Y 0x36 /* Center Y touch position */ ++#define ABS_MT_TOOL_TYPE 0x37 /* Type of touching device */ ++#define ABS_MT_BLOB_ID 0x38 /* Group a set of packets as a blob */ ++#define ABS_MT_TRACKING_ID 0x39 /* Unique ID of initiated contact */ ++#define ABS_MT_PRESSURE 0x3a /* Pressure on contact area */ ++#define ABS_MT_DISTANCE 0x3b /* Contact hover distance */ ++#define ABS_MT_TOOL_X 0x3c /* Center X tool position */ ++#define ABS_MT_TOOL_Y 0x3d /* Center Y tool position */ ++ ++ ++#define ABS_MAX 0x3f ++#define ABS_CNT (ABS_MAX+1) ++ ++/* ++ * Switch events ++ */ ++ ++#define SW_LID 0x00 /* set = lid shut */ ++#define SW_TABLET_MODE 0x01 /* set = tablet mode */ ++#define SW_HEADPHONE_INSERT 0x02 /* set = inserted */ ++#define SW_RFKILL_ALL 0x03 /* rfkill master switch, type "any" ++ set = radio enabled */ ++#define SW_RADIO SW_RFKILL_ALL /* deprecated */ ++#define SW_MICROPHONE_INSERT 0x04 /* set = inserted */ ++#define SW_DOCK 0x05 /* set = plugged into dock */ ++#define SW_LINEOUT_INSERT 0x06 /* set = inserted */ ++#define SW_JACK_PHYSICAL_INSERT 0x07 /* set = mechanical switch set */ ++#define SW_VIDEOOUT_INSERT 0x08 /* set = inserted */ ++#define SW_CAMERA_LENS_COVER 0x09 /* set = lens covered */ ++#define SW_KEYPAD_SLIDE 0x0a /* set = keypad slide out */ ++#define SW_FRONT_PROXIMITY 0x0b /* set = front proximity sensor active */ ++#define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */ ++#define SW_LINEIN_INSERT 0x0d /* set = inserted */ ++#define SW_MUTE_DEVICE 0x0e /* set = device disabled */ ++#define SW_PEN_INSERTED 0x0f /* set = pen inserted */ ++#define SW_MACHINE_COVER 0x10 /* set = cover closed */ ++#define SW_MAX 0x10 ++#define SW_CNT (SW_MAX+1) ++ ++/* ++ * Misc events ++ */ ++ ++#define MSC_SERIAL 0x00 ++#define MSC_PULSELED 0x01 ++#define MSC_GESTURE 0x02 ++#define MSC_RAW 0x03 ++#define MSC_SCAN 0x04 ++#define MSC_TIMESTAMP 0x05 ++#define MSC_MAX 0x07 ++#define MSC_CNT (MSC_MAX+1) ++ ++/* ++ * LEDs ++ */ ++ ++#define LED_NUML 0x00 ++#define LED_CAPSL 0x01 ++#define LED_SCROLLL 0x02 ++#define LED_COMPOSE 0x03 ++#define LED_KANA 0x04 ++#define LED_SLEEP 0x05 ++#define LED_SUSPEND 0x06 ++#define LED_MUTE 0x07 ++#define LED_MISC 0x08 ++#define LED_MAIL 0x09 ++#define LED_CHARGING 0x0a ++#define LED_MAX 0x0f ++#define LED_CNT (LED_MAX+1) ++ ++/* ++ * Autorepeat values ++ */ ++ ++#define REP_DELAY 0x00 ++#define REP_PERIOD 0x01 ++#define REP_MAX 0x01 ++#define REP_CNT (REP_MAX+1) ++ ++/* ++ * Sounds ++ */ ++ ++#define SND_CLICK 0x00 ++#define SND_BELL 0x01 ++#define SND_TONE 0x02 ++#define SND_MAX 0x07 ++#define SND_CNT (SND_MAX+1) ++ ++#endif +-- +2.37.3 + + +From 63e2c4894393babeba2bb467c87dc4fc306c9b3b Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Fri, 18 Nov 2022 12:46:32 +1000 +Subject: Remove check for XDG_RUNTIME_DIR + + +diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c +index 16ebc40..3923035 100644 +--- a/gdk/wayland/gdkdisplay-wayland.c ++++ b/gdk/wayland/gdkdisplay-wayland.c +@@ -589,8 +589,10 @@ _gdk_wayland_display_open (const gchar *display_name) + * fail, logging a fatal error in the process. Save ourselves from + * that. + */ ++#ifndef __HAIKU__ + if (g_getenv ("XDG_RUNTIME_DIR") == NULL) + return NULL; ++#endif + + wl_log_set_handler_client (log_handler); + +-- +2.37.3 + + +From 9d231e32d8a2ee9f8b59e35323f6bb805b5e9fab Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Fri, 18 Nov 2022 12:47:03 +1000 +Subject: Disable header for dialogs by default + + +diff --git a/gdk/wayland/gdkscreen-wayland.c b/gdk/wayland/gdkscreen-wayland.c +index 90c12d8..4f161e3 100644 +--- a/gdk/wayland/gdkscreen-wayland.c ++++ b/gdk/wayland/gdkscreen-wayland.c +@@ -1090,7 +1090,7 @@ gdk_wayland_screen_get_setting (GdkScreen *screen, + + if (strcmp (name, "gtk-dialogs-use-header") == 0) + { +- g_value_set_boolean (value, TRUE); ++ g_value_set_boolean (value, FALSE); + return TRUE; + } + +-- +2.37.3 + + +From d94ac727ee991df3bfb6e907812517f31e93b379 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Fri, 18 Nov 2022 14:36:09 +1000 +Subject: Disable shadows + + +diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c +index 8df1c8e..6b59799 100644 +--- a/gtk/gtkwindow.c ++++ b/gtk/gtkwindow.c +@@ -4111,6 +4111,10 @@ gtk_window_supports_client_shadow (GtkWindow *window) + screen = _gtk_window_get_screen (window); + display = gdk_screen_get_display (screen); + ++#ifdef __HAIKU__ ++ return FALSE; ++#endif ++ + #ifdef GDK_WINDOWING_X11 + if (GDK_IS_X11_DISPLAY (display)) + { +-- +2.37.3 + diff --git a/x11-libs/gtk3/patches/gtk3-classic-3.24.34.patchset b/x11-libs/gtk3/patches/gtk3-classic-3.24.34.patchset new file mode 100644 index 000000000..2611fc182 --- /dev/null +++ b/x11-libs/gtk3/patches/gtk3-classic-3.24.34.patchset @@ -0,0 +1,36 @@ +From 6e3baebfa6f1596c2468e082794bd2ee6aadf4b0 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Fri, 18 Nov 2022 12:54:12 +1000 +Subject: Check GTK_CSD variable for wayland also + + +diff --git a/csd__disabled-by-default.patch b/csd__disabled-by-default.patch +index fc6b852..a62263b 100644 +--- a/csd__disabled-by-default.patch ++++ b/csd__disabled-by-default.patch +@@ -2,18 +2,18 @@ Index: b/gtk/gtkwindow.c + =================================================================== + --- a/gtk/gtkwindow.c + +++ b/gtk/gtkwindow.c +-@@ -4164,6 +4164,14 @@ gtk_window_enable_csd (GtkWindow *window ++@@ -4165,6 +4165,13 @@ gtk_window_enable_csd (GtkWindow *window) + } + + priv->client_decorated = TRUE; +-+#ifdef GDK_WINDOWING_X11 +-+ if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (widget)) && g_getenv("GTK_CSD") == FALSE) +++ +++ if (g_getenv("GTK_CSD") == FALSE) + + { + + gtk_style_context_remove_class (gtk_widget_get_style_context (widget), GTK_STYLE_CLASS_CSD); + + gtk_style_context_remove_class (gtk_widget_get_style_context (widget), "solid-csd"); + + priv->client_decorated = FALSE; + + } +-+#endif + } + + static void ++ +-- +2.37.3 +