Skip to content

Feature: Migrate OSK #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trigg wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature: Migrate OSK #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7895346
osk: osk brought to wf-shell with augmentation
trigg Jun 20, 2026
6a56071
osk: fix a missed include gate on enchant
trigg Jun 20, 2026
b2a4501
fix: another enchant gating error
trigg Jun 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
489 changes: 489 additions & 0 deletions data/layouts/ansi.xml
View file
Open in desktop

Large diffs are not rendered by default.

2,158 changes: 2,158 additions & 0 deletions data/layouts/emoji.xml
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 30 additions & 0 deletions data/layouts/ether.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0" />
<object class="GtkBox" id="keyboard_main">
<child>
<object class="GtkScrolledWindow">
<property name="vexpand">true</property>
<property name="hexpand">true</property>
<child>
<object class="GtkFlowBox">
<property name="valign">start</property>
<property name="max-children-per-line">10</property>
<property name="min-children-per-line">5</property>
<property name="selection-mode">none</property>
<property name="row-spacing">4</property>
<property name="column-spacing">4</property>
<child>
<object class="GtkLabel">
<property name="label">ether</property>
<property name="width-request">50</property>
<property name="height-request">50</property>
<style><class name="emoji"/></style>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</interface>
480 changes: 480 additions & 0 deletions data/layouts/iso.xml
View file
Open in desktop

Large diffs are not rendered by default.

230 changes: 230 additions & 0 deletions data/layouts/numpad.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,230 @@
<?xml version='1.0' encoding='utf-8'?>
<interface>
<requires lib="gtk" version="4.0" />

<object class="GtkBox" id="keyboard_main">
<property name="orientation">vertical</property>
<property name="hexpand">true</property>
<property name="vexpand">true</property>
<child>
<object class="GtkGrid" id="numpad_grid">
<property name="halign">center</property>
<property name="valign">center</property>
<property name="row-spacing">6</property>
<property name="column-spacing">6</property>
<property name="vexpand">true</property>
<property name="column-homogeneous">True</property>
<property name="row-homogeneous">True</property>
<child>
<object class="GtkToggleButton">
<property name="width-request">50</property>
<property name="height-request">50</property>
<layout>
<property name="column">0</property>
<property name="row">0</property>
</layout>
<property name="name">KPNM</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="width-request">50</property>
<property name="height-request">50</property>
<layout>
<property name="column">1</property>
<property name="row">0</property>
</layout>
<property name="name">KPDV</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="width-request">50</property>
<property name="height-request">50</property>
<layout>
<property name="column">2</property>
<property name="row">0</property>
</layout>
<property name="name">KPMU</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="width-request">50</property>
<property name="height-request">50</property>
<layout>
<property name="column">3</property>
<property name="row">0</property>
</layout>
<property name="name">KPSU</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="width-request">50</property>
<property name="height-request">50</property>
<layout>
<property name="column">0</property>
<property name="row">1</property>
</layout>
<property name="name">KP7</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="width-request">50</property>
<property name="height-request">50</property>
<layout>
<property name="column">1</property>
<property name="row">1</property>
</layout>
<property name="name">KP8</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="width-request">50</property>
<property name="height-request">50</property>
<layout>
<property name="column">2</property>
<property name="row">1</property>
</layout>
<property name="name">KP9</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="width-request">50</property>
<property name="height-request">106</property>
<layout>
<property name="column">3</property>
<property name="row">1</property>
<property name="row-span">2</property>
</layout>
<property name="name">KPAD</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="width-request">50</property>
<property name="height-request">50</property>
<layout>
<property name="column">0</property>
<property name="row">2</property>
</layout>
<property name="name">KP4</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="width-request">50</property>
<property name="height-request">50</property>
<layout>
<property name="column">1</property>
<property name="row">2</property>
</layout>
<property name="name">KP5</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="width-request">50</property>
<property name="height-request">50</property>
<layout>
<property name="column">2</property>
<property name="row">2</property>
</layout>
<property name="name">KP6</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="width-request">50</property>
<property name="height-request">50</property>
<layout>
<property name="column">0</property>
<property name="row">3</property>
</layout>
<property name="name">KP1</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="width-request">50</property>
<property name="height-request">50</property>
<layout>
<property name="column">1</property>
<property name="row">3</property>
</layout>
<property name="name">KP2</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="width-request">50</property>
<property name="height-request">50</property>
<layout>
<property name="column">2</property>
<property name="row">3</property>
</layout>
<property name="name">KP3</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="width-request">50</property>
<property name="height-request">106</property>
<layout>
<property name="column">3</property>
<property name="row">3</property>
<property name="row-span">2</property>
</layout>
<property name="name">KPEN</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="width-request">106</property>
<property name="height-request">50</property>
<layout>
<property name="column">0</property>
<property name="row">4</property>
<property name="column-span">2</property>
</layout>
<property name="name">KP0</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="width-request">50</property>
<property name="height-request">50</property>
<layout>
<property name="column">2</property>
<property name="row">4</property>
</layout>
<property name="name">KPDL</property>
</object>
</child>
<child>
<object class="GtkButton">
<layout>
<property name="column">5</property>
<property name="row">3</property>
<property name="row-span">2</property>
</layout>
<property name="name">ESC</property>
</object>
</child>
<child>
<object class="GtkButton">
<layout>
<property name="column">5</property>
<property name="row">0</property>
</layout>
<property name="name">BKSP</property>
</object>
</child>
</object>
</child>
</object>
</interface>
6 changes: 6 additions & 0 deletions data/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,10 @@ install_data('wf-locker', install_dir:'/etc/pam.d/')

install_data('xdpw/wayfire', install_dir: '/etc/xdg/xdg-desktop-portal-wlr/')

install_data(join_paths('layouts', 'ansi.xml'), install_dir: layout_dir)
install_data(join_paths('layouts', 'iso.xml'), install_dir: layout_dir)
install_data(join_paths('layouts', 'emoji.xml'), install_dir: layout_dir)
install_data(join_paths('layouts', 'ether.xml'), install_dir: layout_dir)
install_data(join_paths('layouts', 'numpad.xml'), install_dir: layout_dir)

subdir('css')
59 changes: 36 additions & 23 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
project(
'wf-shell',
'c',
'cpp',
version: '0.11.0',
license: 'MIT',
meson_version: '>=0.51.0',
default_options: [
'cpp_std=c++17',
'c_std=c11',
'warning_level=2',
'werror=false',
],
'wf-shell',
'c',
'cpp',
version: '0.11.0',
license: 'MIT',
meson_version: '>=0.51.0',
default_options: [
'cpp_std=c++17',
'c_std=c11',
'warning_level=2',
'werror=false',
],
)

wayfire = dependency('wayfire')
Expand All @@ -22,63 +22,76 @@ wfconfig = dependency('wf-config', version: '>=0.7.0') #TODO fallback submodule
epoxy = dependency('epoxy')
gtklayershell = dependency('gtk4-layer-shell-0', version: '>=1.3.0', required: false)
if not gtklayershell.found()
gtklayershell = dependency('gtk4-layer-shell', fallback: ['gtk4-layer-shell'])
gtklayershell = dependency('gtk4-layer-shell', fallback: ['gtk4-layer-shell'])
endif
libpulse = dependency('libpulse', required: get_option('volume-widget'))
libgvc = subproject('gvc', default_options: ['static=true'], required: get_option('volume-widget'))
pipewire = dependency('libpipewire-0.3', required: get_option('wp-mixer-widget'))
wireplumber = dependency('wireplumber-0.5', required: get_option('wp-mixer-widget'))
ddcutil = dependency('ddcutil', required: get_option('ddcutil'))
dbusmenu_gtk = dependency('dbusmenu-glib-0.4')
xkb = dependency('xkbcommon')
xkbregistry = dependency('xkbregistry')
json = subproject('wf-json').get_variable('wfjson')
openssl = dependency('openssl')
gbm = dependency('gbm', required: get_option('live-previews-dmabuf'))
drm = dependency('libdrm', required: get_option('live-previews-dmabuf'))
enchant = dependency('enchant-2', required: false)
llama = dependency('llama', required: false)

if get_option('wayland-logout') == true
wayland_logout = subproject('wayland-logout')
wayland_logout = subproject('wayland-logout')
endif

if get_option('weather') == true
subproject('owf')
add_project_arguments('-DHAVE_WEATHER=1', language: 'cpp')
subproject('owf')
add_project_arguments('-DHAVE_WEATHER=1', language: 'cpp')
endif

if gbm.found() and drm.found() and not get_option('live-previews-dmabuf').disabled()
add_project_arguments('-DHAVE_DMABUF=1', language: 'cpp')
add_project_arguments('-DHAVE_DMABUF=1', language: 'cpp')
endif

if libpulse.found()
libgvc = libgvc.get_variable('libgvc_dep')
add_project_arguments('-DHAVE_PULSE=1', language: 'cpp')
libgvc = libgvc.get_variable('libgvc_dep')
add_project_arguments('-DHAVE_PULSE=1', language: 'cpp')
endif

if wireplumber.found()
add_project_arguments('-DHAVE_WIREPLUMBER=1', language: 'cpp')
add_project_arguments('-DHAVE_WIREPLUMBER=1', language: 'cpp')
endif

if ddcutil.found()
add_project_arguments('-DHAVE_DDCUTIL=1', language: 'cpp')
add_project_arguments('-DHAVE_DDCUTIL=1', language: 'cpp')
endif

if enchant.found()
add_project_arguments('-DHAVE_ENCHANT=1', language: 'cpp')
endif

if llama.found()
add_project_arguments('-DHAVE_LLAMA=1', language: 'cpp')
endif

needs_libinotify = ['freebsd', 'dragonfly'].contains(host_machine.system())
libinotify = dependency('libinotify', required: needs_libinotify)

add_project_arguments(
['-Wno-pedantic', '-Wno-unused-parameter', '-Wno-parentheses'],
language: 'cpp',
['-Wno-pedantic', '-Wno-unused-parameter', '-Wno-parentheses'],
language: 'cpp',
)

resource_dir = join_paths(get_option('prefix'), 'share', 'wf-shell')
metadata_dir = join_paths(resource_dir, 'metadata')
sysconf_dir = join_paths(get_option('prefix'), get_option('sysconfdir'))
layout_dir = join_paths(get_option('prefix'), 'share', 'wf-osk', 'layouts')

icon_dir = join_paths(get_option('prefix'), 'share', 'wf-shell', 'icons')
add_project_arguments('-DICONDIR="' + icon_dir + '"', language: 'cpp')
add_project_arguments('-DRESOURCEDIR="' + resource_dir + '"', language: 'cpp')
add_project_arguments('-DMETADATA_DIR="' + metadata_dir + '"', language: 'cpp')
add_project_arguments('-DSYSCONF_DIR="' + sysconf_dir + '"', language: 'cpp')
add_project_arguments('-DLAYOUT_DIR="' + layout_dir + '"', language: 'cpp')

subdir('metadata')
subdir('proto')
Expand Down
Loading
Loading