Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,17 @@ WORKDIR /InfiniteGlass

RUN sed -e '/PyGObject/d' glass-action/setup.py -i

RUN make all
RUN make devinstall
RUN rm -rf /InfiniteGlass/env
RUN make ENVDIR=/env all
RUN make ENVDIR=/env devinstall

RUN useradd glass
RUN mkdir -p /home/glass
RUN mkdir -p /home/glass/.config/session-state
RUN mkdir -p /home/glass/.config/dconf
RUN chown -R glass:users /home/glass
RUN mkdir -p /run/user/$(id -u glass)
RUN chown glass /run/user/$(id -u glass)
RUN chmod -R ugo+rw /InfiniteGlass
RUN sed -e "s+\(sudo:.*\)+\1glass+g" /etc/group -i
RUN sed -e "s+ALL$+NOPASSWD: ALL+g" /etc/sudoers -i
Expand Down
2 changes: 2 additions & 0 deletions dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,5 @@ xfonts-base
iproute2
x11-xserver-utils
xscreensaver
trayer
network-manager-gnome dbus-x11
12 changes: 12 additions & 0 deletions glass-config-init/glass_config_init/components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,15 @@ components:
panelterm:
command: ["xterm", "-title", "panelterm", "-xrm", "XTerm.vt100.allowTitleOps: false"]
environment: { "IG_APP_ID": "panelterm" }
trayer:
command: ["trayer",
"--transparent", "true",
"--alpha", "0",
"--padding", "10",
"--iconspacing", "10",
"--SetDockType", "false",
"--width", "400",
"--widthtype", "pixel"]
environment: { "IG_APP_ID": "trayer" }
nm-applet:
command: ["nm-applet", "--sm-disable"]
15 changes: 14 additions & 1 deletion glass-config-init/glass_config_init/ghosts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,23 @@ ghosts:
- !string XTerm
- !string ""
WM_NAME: !string panelterm
IG_COORDS: [0.0, "eq://apply($.root.get_geometry).height/apply($.root.get_geometry).width", 1.0, 0.0576171875]
IG_COORDS: [0.0, "eq://$.root.aspect_ratio", 1.0, 0.0576171875]
IG_SIZE: ["eq://apply($.root.get_geometry).width", "eq://int(apply($.root.get_geometry).width*0.0576171875)"]
IG_LAYER: IG_LAYER_OVERLAY

- IG_APP_ID: !string trayer
WM_CLASS:
- !string panel
- !string trayer
- !string ""
WM_NAME: !string panel
IG_SIZE: ["eq://int(apply($.root.get_geometry).width * 0.05)", "eq://int(apply($.root.get_geometry).height * 0.05)"]
IG_COORDS: [
0.01,
"eq://0.13 * $.root.aspect_ratio",
0.05,
"eq://0.05 * $.root.aspect_ratio"]
IG_LAYER: IG_LAYER_OVERLAY

# Match new windows when they first appear against these patterns and
# run the corresponding actions on them.
Expand Down
14 changes: 7 additions & 7 deletions glass-config-init/glass_config_init/widgets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,49 @@ widgets:
Zoom in:
properties:
IG_COLOR_TRANSFORM: 1
IG_COORDS: [0.01, "eq://0.2 * apply($.root.get_geometry).height/apply($.root.get_geometry).width", 0.05, 0.05]
IG_COORDS: [0.01, "eq://0.25 * $.root.aspect_ratio", 0.05, 0.05]
IG_CONTENT: !IG_SVG resource://glass_widgets/icons/circle-plus.fl.svg
action: zoom_to_fewer_windows

Zoom out:
properties:
IG_COLOR_TRANSFORM: 1
IG_COORDS: [0.01, "eq://0.3 * apply($.root.get_geometry).height/apply($.root.get_geometry).width", 0.05, 0.05]
IG_COORDS: [0.01, "eq://0.35 * $.root.aspect_ratio", 0.05, 0.05]
IG_CONTENT: !IG_SVG resource://glass_widgets/icons/circle-minus.fl.svg
action: zoom_to_more_windows

Zoom home:
properties:
IG_COLOR_TRANSFORM: 1
IG_COORDS: [0.01, "eq://0.4 * apply($.root.get_geometry).height/apply($.root.get_geometry).width", 0.05, 0.05]
IG_COORDS: [0.01, "eq://0.45 * $.root.aspect_ratio", 0.05, 0.05]
IG_CONTENT: !IG_SVG resource://glass_widgets/icons/home.fl.svg
action: zoom_home

Group:
properties:
IG_COLOR_TRANSFORM: 1
IG_COORDS: [0.01, "eq://0.5 * apply($.root.get_geometry).height/apply($.root.get_geometry).width", 0.05, 0.05]
IG_COORDS: [0.01, "eq://0.55 * $.root.aspect_ratio", 0.05, 0.05]
IG_CONTENT: !IG_SVG resource://glass_widgets/icons/group.fl.svg
action: send_island_create

Tile:
properties:
IG_COLOR_TRANSFORM: 1
IG_COORDS: [0.01, "eq://0.6 * apply($.root.get_geometry).height/apply($.root.get_geometry).width", 0.05, 0.05]
IG_COORDS: [0.01, "eq://0.65 * $.root.aspect_ratio", 0.05, 0.05]
IG_CONTENT: !IG_SVG resource://glass_widgets/icons/th-list.fl.svg
action: tile_visible_to_1_1

Exit:
properties:
IG_COLOR_TRANSFORM: 1
IG_COORDS: [0.01, "eq://0.7 * apply($.root.get_geometry).height/apply($.root.get_geometry).width", 0.05, 0.05]
IG_COORDS: [0.01, "eq://0.75 * $.root.aspect_ratio", 0.05, 0.05]
IG_CONTENT: !IG_SVG resource://glass_widgets/icons/eject.fl.svg
action: send_exit

Debug:
properties:
IG_COLOR_TRANSFORM: 1
IG_COORDS: [0.01, "eq://0.8 * apply($.root.get_geometry).height/apply($.root.get_geometry).width", 0.05, 0.05]
IG_COORDS: [0.01, "eq://0.85 * $.root.aspect_ratio", 0.05, 0.05]
IG_CONTENT: !IG_SVG resource://glass_widgets/icons/bug.fl.svg
action: send_debug

Expand Down
6 changes: 5 additions & 1 deletion scripts/docker-runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ echo "######################################################"
export | grep GLASS
echo "######################################################"

su -c "bash -c 'cd /InfiniteGlass; scripts/xstartup.sh'" glass
export XDG_RUNTIME_DIR=/run/user/$(id -u)
dbus-daemon --session --fork --print-address > /tmp/dbus_address
export DBUS_SESSION_BUS_ADDRESS=$(cat /tmp/dbus_address)

su -c "bash -c 'cd /InfiniteGlass; ENVDIR=/env scripts/xstartup.sh'" glass
6 changes: 3 additions & 3 deletions scripts/glass-renderer-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

if [ "$GLASS_DEBUGGER" = "valgrind" ]; then
echo "Debugging using Valgrind..."
exec valgrind --vgdb=yes ./build/glass-renderer
exec valgrind --vgdb=yes $(which glass-renderer)
else
if [ "$GLASS_DEBUGGER" = "gdb" ]; then
echo "Debugging using GDB..."
exec gdb ./env/bin/glass-renderer 0<&3 1>&4 2>&5
exec gdb $(which glass-renderer) 0<&3 1>&4 2>&5
else
echo "Starting renderer without debugger"
exec ./env/bin/glass-renderer
exec $(which glass-renderer)
fi
fi
3 changes: 3 additions & 0 deletions scripts/run-in-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,12 @@ docker run \
--ipc=host \
--user id -u root \
--cap-add=ALL \
-v $(pwd):/InfiniteGlass \
-v ~/.config/glass:/home/glass/.config/glass \
-v /tmp/.X11-unix:/tmp/.X11-unix:rw \
-v /tmp/.ICE-unix:/tmp/.ICE-unix:rw \
-v /run/dbus/system_bus_socket:/run/dbus/system_bus_socket \
-v $(pwd):/host \
-v "$XAUTH:$XAUTH" \
-e "XAUTHORITY=$XAUTH" \
-e DISPLAY \
Expand Down
6 changes: 4 additions & 2 deletions scripts/xinitrc
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#! /bin/bash

set +x

export GLASS_SHADER_PATH=build
export MALLOC_CHECK_=2

if [ "$GLASS_DMALLOC" ]; then
eval "$(dmalloc -l ./logfile -i 100 high)"
fi
. ./env/bin/activate

. "$ENVDIR/bin/activate"

ulimit -c unlimited

Expand Down
Loading