refactor: reorganize globalmenu into src/window
This commit is contained in:
5 files changed
+9
-18
No files matched your search
+3
-3
@@ -45,9 +45,9 @@ meson compile -C builddir
|
|||||||
cd ../../../..
|
cd ../../../..
|
||||||
|
|
||||||
# Compile Global Menu shim
|
# Compile Global Menu shim
|
||||||
cd src/globalmenu
|
cd src/window/globalmenu
|
||||||
gcc -shared -fPIC -O2 -o libmenu_button_shim.so libmenu_button_shim.c $(pkg-config --cflags --libs gtk+-3.0) -ldl
|
gcc -shared -fPIC -O2 -o libmenu_button_shim.so libmenu_button_shim.c $(pkg-config --cflags --libs gtk+-3.0) -ldl
|
||||||
cd ../..
|
cd ../../..
|
||||||
|
|
||||||
# Run
|
# Run
|
||||||
uv run start
|
uv run start
|
||||||
@@ -73,8 +73,8 @@ Modus/
|
|||||||
│ │ ├── screencapture/ # Screen capture/recording
|
│ │ ├── screencapture/ # Screen capture/recording
|
||||||
│ │ ├── desktop/ # Desktop widgets
|
│ │ ├── desktop/ # Desktop widgets
|
||||||
│ │ ├── settings/ # Settings window
|
│ │ ├── settings/ # Settings window
|
||||||
|
│ │ ├── globalmenu/ # macOS global menu bar
|
||||||
│ │ └── lock.py # Session lock screen
|
│ │ └── lock.py # Session lock screen
|
||||||
│ ├── globalmenu/ # macOS global menu bar
|
|
||||||
│ └── styles/ # GTK CSS stylesheets
|
│ └── styles/ # GTK CSS stylesheets
|
||||||
├── config/ # User-facing config (TOML)
|
├── config/ # User-facing config (TOML)
|
||||||
│ ├── config.toml # Main settings
|
│ ├── config.toml # Main settings
|
||||||
|
|||||||
@@ -64,9 +64,9 @@ meson compile -C builddir
|
|||||||
cd ../../../..
|
cd ../../../..
|
||||||
|
|
||||||
# Compile Global Menu shim
|
# Compile Global Menu shim
|
||||||
cd src/globalmenu
|
cd src/window/globalmenu
|
||||||
gcc -shared -fPIC -O2 -o libmenu_button_shim.so libmenu_button_shim.c $(pkg-config --cflags --libs gtk+-3.0) -ldl
|
gcc -shared -fPIC -O2 -o libmenu_button_shim.so libmenu_button_shim.c $(pkg-config --cflags --libs gtk+-3.0) -ldl
|
||||||
cd ../..
|
cd ../../..
|
||||||
|
|
||||||
uv run start
|
uv run start
|
||||||
```
|
```
|
||||||
@@ -89,7 +89,7 @@ shim only for that process:
|
|||||||
```bash
|
```bash
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# ~/.local/bin/modus-launch — GTK3-aware launcher for the global menu shim
|
# ~/.local/bin/modus-launch — GTK3-aware launcher for the global menu shim
|
||||||
SHIM=~/.config/Modus/src/globalmenu/libmenu_button_shim.so
|
SHIM=~/.config/Modus/src/window/globalmenu/libmenu_button_shim.so
|
||||||
BIN="$(command -v "$1")"
|
BIN="$(command -v "$1")"
|
||||||
if [[ -n "$BIN" ]] && readelf -d "$BIN" 2>/dev/null | grep -q 'libgtk-3\.so\.0'; then
|
if [[ -n "$BIN" ]] && readelf -d "$BIN" 2>/dev/null | grep -q 'libgtk-3\.so\.0'; then
|
||||||
LD_PRELOAD="$SHIM" "$@"
|
LD_PRELOAD="$SHIM" "$@"
|
||||||
|
|||||||
+2
-2
@@ -314,8 +314,8 @@ fi
|
|||||||
progress "Building Global Menu shim"
|
progress "Building Global Menu shim"
|
||||||
|
|
||||||
step "Compiling libmenu_button_shim.so..."
|
step "Compiling libmenu_button_shim.so..."
|
||||||
SHIM_SRC="$INSTALL_DIR/src/globalmenu/libmenu_button_shim.c"
|
SHIM_SRC="$INSTALL_DIR/src/window/globalmenu/libmenu_button_shim.c"
|
||||||
SHIM_OUT="$INSTALL_DIR/src/globalmenu/libmenu_button_shim.so"
|
SHIM_OUT="$INSTALL_DIR/src/window/globalmenu/libmenu_button_shim.so"
|
||||||
if [ -f "$SHIM_SRC" ]; then
|
if [ -f "$SHIM_SRC" ]; then
|
||||||
if gcc -shared -fPIC -O2 -o "$SHIM_OUT" "$SHIM_SRC" $(pkg-config --cflags --libs gtk+-3.0) -ldl 2>/dev/null; then
|
if gcc -shared -fPIC -O2 -o "$SHIM_OUT" "$SHIM_SRC" $(pkg-config --cflags --libs gtk+-3.0) -ldl 2>/dev/null; then
|
||||||
success "libmenu_button_shim.so built successfully"
|
success "libmenu_button_shim.so built successfully"
|
||||||
|
|||||||
+1
-1
@@ -98,7 +98,7 @@ ignore = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[tool.ruff.lint.isort]
|
[tool.ruff.lint.isort]
|
||||||
known-first-party = ["services", "utils", "shared", "window", "globalmenu"]
|
known-first-party = ["services", "utils", "shared", "window"]
|
||||||
|
|
||||||
[tool.ruff.lint.per-file-ignores]
|
[tool.ruff.lint.per-file-ignores]
|
||||||
"src/main.py" = ["E402"]
|
"src/main.py" = ["E402"]
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
|
|
||||||
fabric @ git+https://github.com/Fabric-Development/fabric.git@b7b0f9975f0cf161ccf81c1adfb181230d553f79
|
|
||||||
httpx==0.28.1
|
|
||||||
pam==0.2.0
|
|
||||||
psutil==7.2.2
|
|
||||||
ruff==0.15.2
|
|
||||||
six==1.17.0
|
|
||||||
tomlkit==0.15.0
|
|
||||||
pre-commit=4.6.0
|
|
||||||
Reference in new issue
Block a user