tinyx: port X11 #82

adamgreloch · 2024-08-02T10:40:16Z

JIRA: RTOS-861, RTOS-826

Description

Adds ports of:

tinycorelinux/tinyx, a streamlined version of xorg-server 1.2.0, with working Xfbdev and keyboard/mouse and X11 forwarding with -tcp -ac
some x11-apps: xmessage, ico, xclock, xeyes, twm, xinit, xrdb, xsetroot, xgc
feh and necesary libs: freetype, imlib2 (png support only)
dwm and st terminal
idunham/tinyxlib, a streamlined version of libX11
all other necessary common libs not contained in tinyxlib, i.e. libXfont

Having all this, using a dotfile config such as one on adamgreloch/tinyx project branch, one can run:

Motivation and Context

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)
Chore (refactoring, style fixes, git/CI config, submodule management, no code logic changes)

How Has This Been Tested?

Already covered by automatic testing.
New test added: (add PR link here).
Tested by hand on: ia32-generic-qemu, ia32-generic-pc

Checklist:

My change requires a change to the documentation.
I have updated the documentation accordingly.
I have added tests to cover my changes.
All new and existing linter checks and tests passed.
My changes generate no new compilation warnings for any of the targets.

Special treatment

This PR needs additional PRs to work (list the PRs, preferably in merge-order).
build: Add common utility functions, tidy up build process #78
posix: fix unix socket accept/connect, add their nonblocking variants, handle MSG_PEEK in recv phoenix-rtos-kernel#572
pc-tty: add framebuffer-based console phoenix-rtos-devices#515
pc-tty: add PS/2 mouse support and kbd/mouse vdevs phoenix-rtos-devices#512
ia32: add passing of graphmode params via syspage and platformctl phoenix-rtos-kernel#596
png: add libpng port #88
I will merge this PR by myself when appropriate.

tinyx/patches/tinyx/eed490/01-configure.ac.patch

tinyx/patches/tinyx/eed490/03-mi.patch

tinyx/build.sh

github-actions · 2024-09-24T15:35:38Z

Unit Test Results

7 787 tests +64 7 069 ✅ +61 41m 53s ⏱️ + 3m 53s
461 suites +18 718 💤 + 3
1 files ± 0 0 ❌ ± 0

Results for commit a9c8dc1. ± Comparison against base commit 549e10b.

♻️ This comment has been updated with latest results.

JIRA: RTOS-826

tinyx/build.sh

github-actions · 2024-10-07T07:52:25Z

build.sh

📝 [shellcheck] _{reported by reviewdog 🐶}
Not following: ./phoenix-rtos-ports/build.subr: openBinaryFile: does not exist (No such file or directory) SC1091

phoenix-rtos-ports/build.sh

Line 78 in f617fbc

mkdir -p "${PREFIX_PORT_BUILD}"

JIRA: RTOS-826, RTOS-861

02-keysym.patch adds key event printing for keyboard testing (a poor man's xev) JIRA: RTOS-826, RTOS-863

These patches require /dev/kbd and /dev/mouse PS/2 vdevs to be available JIRA: RTOS-826, RTOS-864

JIRA: RTOS-826, RTOS-865

JIRA: RTOS-826, RTOS-861

JIRA: RTOS-826, RTOS-889

JIRA: RTOS-826, RTOS-865, RTOS-889

JIRA: RTOS-826, RTOS-889

JIRA: RTOS-862

Pressing ^C in X session is now captured by client apps instead of killing the X server. Pressing ^C in st sends SIGINT to the process inside pty instead of doing nothing. JIRA: RTOS-826, RTOS-861, RTOS-889

…in xserver JIRA: RTOS-902, RTOS-906

Use the TTYSETMODE ioctl to stop the fbcon from drawing to the same framebuffer xserver is using JIRA: RTOS-906, RTOS-925

JIRA: RTOS-889

Adds a port of feh image viewer with png support from imlib2. The support is hardcoded into imlib2 loaders.c as a workaround for the lack of dynamic lib support (dlopen(), dlsym() etc.) JIRA: RTOS-955

github-actions · 2024-10-21T06:57:17Z

tinyx/build.sh

+}
+
+
+build_freetype() {


⚠️ [shellcheck] _{reported by reviewdog 🐶}
build_freetype references arguments, but none are ever passed. SC2120

github-actions · 2024-10-21T06:57:17Z

tinyx/build.sh

+  b_port_apply_patches "${PREFIX_PORT_SRC}" "${appname}/${version}"
+
+  make -C "${PREFIX_PORT_SRC}" PREFIX="${PREFIX_PORT_BUILD}" PLATFORM="unix" \
+    CFG="--host="${HOST%phoenix}linux" --bindir="${PREFIX_PROG}" --sbindir="${PREFIX_PROG}" \


📝 [shellcheck] _{reported by reviewdog 🐶}
Double quote to prevent globbing and word splitting. SC2086

github-actions · 2024-10-21T06:57:17Z

tinyx/build.sh

+  b_port_apply_patches "${PREFIX_PORT_SRC}" "${appname}/${version}"
+
+  make -C "${PREFIX_PORT_SRC}" PREFIX="${PREFIX_PORT_BUILD}" PLATFORM="unix" \
+    CFG="--host="${HOST%phoenix}linux" --bindir="${PREFIX_PROG}" --sbindir="${PREFIX_PROG}" \


⚠️ [shellcheck] _{reported by reviewdog 🐶}
The surrounding quotes actually unquote this. Remove or escape them. SC2027

github-actions · 2024-10-21T06:57:17Z

tinyx/build.sh

+  b_port_apply_patches "${PREFIX_PORT_SRC}" "${appname}/${version}"
+
+  make -C "${PREFIX_PORT_SRC}" PREFIX="${PREFIX_PORT_BUILD}" PLATFORM="unix" \
+    CFG="--host="${HOST%phoenix}linux" --bindir="${PREFIX_PROG}" --sbindir="${PREFIX_PROG}" \


📝 [shellcheck] _{reported by reviewdog 🐶}
Double quote to prevent globbing and word splitting. SC2086

github-actions · 2024-10-21T06:57:18Z

tinyx/build.sh

+  b_port_apply_patches "${PREFIX_PORT_SRC}" "${appname}/${version}"
+
+  make -C "${PREFIX_PORT_SRC}" PREFIX="${PREFIX_PORT_BUILD}" PLATFORM="unix" \
+    CFG="--host="${HOST%phoenix}linux" --bindir="${PREFIX_PROG}" --sbindir="${PREFIX_PROG}" \


⚠️ [shellcheck] _{reported by reviewdog 🐶}
The surrounding quotes actually unquote this. Remove or escape them. SC2027

github-actions · 2024-10-21T06:57:18Z

tinyx/build.sh

+  make -C "${PREFIX_PORT_SRC}" PREFIX="${PREFIX_PORT_BUILD}" PLATFORM="unix" \
+    CFG="--host="${HOST%phoenix}linux" --bindir="${PREFIX_PROG}" --sbindir="${PREFIX_PROG}" \
+     --libdir="${PREFIX_A}" --includedir="${PREFIX_H}" \
+     --prefix="${PREFIX_PORT_INSTALL}" --datarootdir="${PREFIX_A}" "${@}" \


📝 [shellcheck] _{reported by reviewdog 🐶}
Double quote to prevent globbing and word splitting. SC2086

github-actions · 2024-10-21T06:57:18Z

tinyx/build.sh

+  make -C "${PREFIX_PORT_SRC}" PREFIX="${PREFIX_PORT_BUILD}" PLATFORM="unix" \
+    CFG="--host="${HOST%phoenix}linux" --bindir="${PREFIX_PROG}" --sbindir="${PREFIX_PROG}" \
+     --libdir="${PREFIX_A}" --includedir="${PREFIX_H}" \
+     --prefix="${PREFIX_PORT_INSTALL}" --datarootdir="${PREFIX_A}" "${@}" \


🚫 [shellcheck] _{reported by reviewdog 🐶}
Double quote array expansions to avoid re-splitting elements. SC2068

github-actions · 2024-10-21T06:57:18Z

tinyx/build.sh

+  make -C "${PREFIX_PORT_SRC}" PREFIX="${PREFIX_PORT_BUILD}" PLATFORM="unix" \
+    CFG="--host="${HOST%phoenix}linux" --bindir="${PREFIX_PROG}" --sbindir="${PREFIX_PROG}" \
+     --libdir="${PREFIX_A}" --includedir="${PREFIX_H}" \
+     --prefix="${PREFIX_PORT_INSTALL}" --datarootdir="${PREFIX_A}" "${@}" \


🚫 [shellcheck] _{reported by reviewdog 🐶}
Argument mixes string and array. Use * or separate argument. SC2145

github-actions · 2024-10-21T06:57:18Z

tinyx/build.sh

+  make -C "${PREFIX_PORT_SRC}" PREFIX="${PREFIX_PORT_BUILD}" PLATFORM="unix" \
+    CFG="--host="${HOST%phoenix}linux" --bindir="${PREFIX_PROG}" --sbindir="${PREFIX_PROG}" \
+     --libdir="${PREFIX_A}" --includedir="${PREFIX_H}" \
+     --prefix="${PREFIX_PORT_INSTALL}" --datarootdir="${PREFIX_A}" "${@}" \


⚠️ [shellcheck] _{reported by reviewdog 🐶}
The surrounding quotes actually unquote this. Remove or escape them. SC2027

github-actions · 2024-10-21T06:57:18Z

tinyx/build.sh

+
+# Image viewer (requires libpng port)
+
+build_freetype


📝 [shellcheck] _{reported by reviewdog 🐶}
Use build_freetype "$@" if function's $1 should mean script's $1. SC2119

github-actions · 2024-10-21T06:57:22Z

tinyx/build.sh

+    CFG="--host="${HOST%phoenix}linux" --bindir="${PREFIX_PROG}" --sbindir="${PREFIX_PROG}" \
+     --libdir="${PREFIX_A}" --includedir="${PREFIX_H}" \
+     --prefix="${PREFIX_PORT_INSTALL}" --datarootdir="${PREFIX_A}" "${@}" \


[shellcheck (suggestion)] _{reported by reviewdog 🐶}

Suggested change

CFG="--host="${HOST%phoenix}linux" --bindir="${PREFIX_PROG}" --sbindir="${PREFIX_PROG}" \

--libdir="${PREFIX_A}" --includedir="${PREFIX_H}" \

--prefix="${PREFIX_PORT_INSTALL}" --datarootdir="${PREFIX_A}" "${@}" \

CFG="--host=""${HOST%phoenix}"linux" --bindir=""${PREFIX_PROG}"" --sbindir=""${PREFIX_PROG}"" \

--libdir=""${PREFIX_A}"" --includedir=""${PREFIX_H}"" \

--prefix=""${PREFIX_PORT_INSTALL}"" --datarootdir=""${PREFIX_A}"" "${@}" \

github-actions bot reviewed Aug 2, 2024

View reviewed changes

tinyx/patches/tinyx/eed490/01-configure.ac.patch Show resolved Hide resolved

tinyx/patches/tinyx/eed490/03-mi.patch Show resolved Hide resolved

adamgreloch changed the base branch from master to Darchiv/NIL-595 August 2, 2024 10:41

adamgreloch force-pushed the adamgreloch/RTOS-861 branch from 0af4985 to f4be2eb Compare August 2, 2024 10:51

adamgreloch changed the title ~~tinyx: add ports of tinyx/Xfbdev, necessary libs and ico~~ tinyx: port X11 Aug 9, 2024

adamgreloch force-pushed the adamgreloch/RTOS-861 branch from 6fff19f to 5cfc088 Compare August 30, 2024 12:48

adamgreloch marked this pull request as ready for review August 30, 2024 12:52

adamgreloch marked this pull request as draft August 30, 2024 13:00

adamgreloch force-pushed the adamgreloch/RTOS-861 branch 4 times, most recently from c07b378 to a451d71 Compare September 6, 2024 10:46

Darchiv force-pushed the Darchiv/NIL-595 branch from 85770ab to 89d1aff Compare September 20, 2024 18:04

Base automatically changed from Darchiv/NIL-595 to master September 23, 2024 09:14

adamgreloch force-pushed the adamgreloch/RTOS-861 branch from a3fb453 to 52c953e Compare September 24, 2024 15:18

github-actions bot reviewed Sep 24, 2024

View reviewed changes

tinyx/build.sh Show resolved Hide resolved

tinyx/build.sh Show resolved Hide resolved

github-actions bot reviewed Sep 24, 2024

View reviewed changes

tinyx/build.sh Show resolved Hide resolved

tinyx: add build.sh skeleton, add tinyx to root build.sh

b8cff9a

JIRA: RTOS-826

adamgreloch force-pushed the adamgreloch/RTOS-861 branch 3 times, most recently from 66e8fcb to 5a4dd99 Compare October 2, 2024 11:41

github-actions bot reviewed Oct 2, 2024

View reviewed changes

tinyx/build.sh Show resolved Hide resolved

tinyx/build.sh Show resolved Hide resolved

adamgreloch marked this pull request as ready for review October 2, 2024 11:41

github-actions bot reviewed Oct 2, 2024

View reviewed changes

tinyx/build.sh Show resolved Hide resolved

adamgreloch requested a review from Darchiv October 2, 2024 11:41

adamgreloch force-pushed the adamgreloch/RTOS-861 branch 2 times, most recently from bf96377 to f617fbc Compare October 7, 2024 07:52

github-actions bot reviewed Oct 7, 2024

View reviewed changes

adamgreloch added 2 commits October 9, 2024 16:24

tinyx: add tinyx and its dependencies ports

f7a3170

JIRA: RTOS-826, RTOS-861

tinyx: add ico port

4d2baf7

02-keysym.patch adds key event printing for keyboard testing (a poor man's xev) JIRA: RTOS-826, RTOS-863

adamgreloch added 3 commits October 9, 2024 16:24

tinyx: patch input methods in xserver

264162b

These patches require /dev/kbd and /dev/mouse PS/2 vdevs to be available JIRA: RTOS-826, RTOS-864

tinyx: add dwm port

b9417f5

JIRA: RTOS-826, RTOS-865

tinyx: generalize xserver fbdev, fix keyboard mapping in xserver

8fedccf

JIRA: RTOS-826, RTOS-861

adamgreloch force-pushed the adamgreloch/RTOS-861 branch from 28e8e6b to 2ef1e42 Compare October 9, 2024 14:37

adamgreloch added 8 commits October 9, 2024 16:43

tinyx: add st port

f6d8d0a

JIRA: RTOS-826, RTOS-889

tinyx: port x11-apps (xmessage, xeyes, xclock, twm)

8e8211d

JIRA: RTOS-826, RTOS-865, RTOS-889

tinyx: port x11-apps (xsetroot, xinit, xrdb, xgc)

79af7fd

JIRA: RTOS-826, RTOS-889

tinyx: fix colormap in xserver

16d246b

JIRA: RTOS-862

tinyx: fix SIGINT handling in st and xserver

3eab46b

Pressing ^C in X session is now captured by client apps instead of killing the X server. Pressing ^C in st sends SIGINT to the process inside pty instead of doing nothing. JIRA: RTOS-826, RTOS-861, RTOS-889

tinyx: use platformctl to draw on higher VGA framebuffer resolutions …

7ec77d0

…in xserver JIRA: RTOS-902, RTOS-906

tinyx: disable fbcon while server is running

846ef07

Use the TTYSETMODE ioctl to stop the fbcon from drawing to the same framebuffer xserver is using JIRA: RTOS-906, RTOS-925

tinyx: add xbill port

5d48778

JIRA: RTOS-889

adamgreloch force-pushed the adamgreloch/RTOS-861 branch from 2ef1e42 to 5d48778 Compare October 9, 2024 15:34

tinyx: add feh port (png-only)

a9c8dc1

Adds a port of feh image viewer with png support from imlib2. The support is hardcoded into imlib2 loaders.c as a workaround for the lack of dynamic lib support (dlopen(), dlsym() etc.) JIRA: RTOS-955

github-actions bot reviewed Oct 21, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

tinyx: port X11 #82

tinyx: port X11 #82

adamgreloch commented Aug 2, 2024 •

edited

Loading

github-actions bot commented Sep 24, 2024 •

edited

Loading

github-actions bot Oct 7, 2024

github-actions bot Oct 21, 2024

github-actions bot Oct 21, 2024

github-actions bot Oct 21, 2024

github-actions bot Oct 21, 2024

github-actions bot Oct 21, 2024

github-actions bot Oct 21, 2024

github-actions bot Oct 21, 2024

github-actions bot Oct 21, 2024

github-actions bot Oct 21, 2024

github-actions bot Oct 21, 2024

github-actions bot Oct 21, 2024

		}


		build_freetype() {

tinyx: port X11 #82

Are you sure you want to change the base?

tinyx: port X11 #82

Conversation

adamgreloch commented Aug 2, 2024 • edited Loading

Description

Motivation and Context

Types of changes

How Has This Been Tested?

Checklist:

Special treatment

github-actions bot commented Sep 24, 2024 • edited Loading

Unit Test Results

github-actions bot Oct 7, 2024

Choose a reason for hiding this comment

github-actions bot Oct 21, 2024

Choose a reason for hiding this comment

github-actions bot Oct 21, 2024

Choose a reason for hiding this comment

github-actions bot Oct 21, 2024

Choose a reason for hiding this comment

github-actions bot Oct 21, 2024

Choose a reason for hiding this comment

github-actions bot Oct 21, 2024

Choose a reason for hiding this comment

github-actions bot Oct 21, 2024

Choose a reason for hiding this comment

github-actions bot Oct 21, 2024

Choose a reason for hiding this comment

github-actions bot Oct 21, 2024

Choose a reason for hiding this comment

github-actions bot Oct 21, 2024

Choose a reason for hiding this comment

github-actions bot Oct 21, 2024

Choose a reason for hiding this comment

github-actions bot Oct 21, 2024

Choose a reason for hiding this comment

adamgreloch commented Aug 2, 2024 •

edited

Loading

github-actions bot commented Sep 24, 2024 •

edited

Loading