diff --git a/.cpirc b/.cpirc index 5ed1a86..731f94a 100644 --- a/.cpirc +++ b/.cpirc @@ -1,12 +1,19 @@ SCREEN=`cat /sys/class/graphics/fb0/modes` + +XORG_CONF="/home/cpi/launchergo/.xorg.conf" +if [ -f ~/.lima ] +then +XORG_CONF="/home/cpi/launchergo/.xorg_lima.conf" +fi + if [ -f /tmp/autologin ] then rm -f /tmp/autologin mpd ~/.mpd.conf if [[ $SCREEN =~ .*320.* ]] then - startx /home/cpi/launchergo/.xinitrc -- -nocursor > /tmp/x.log 2>&1 + startx /home/cpi/launchergo/.xinitrc -- -xf86config $XORG_CONF -nocursor > /tmp/x.log 2>&1 else - startx /home/cpi/launchergo/.xinitrc hdmi > /tmp/x.log 2>&1 + startx /home/cpi/launchergo/.xinitrc hdmi -- -xf86config $XORG_CONF > /tmp/x.log 2>&1 fi fi diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..bde0374 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Menu/GameShell/20_Retro Games/Pcsx"] + path = Menu/GameShell/20_Retro Games/Pcsx + url = https://github.com/cuu/Pcsx.git diff --git a/.xinitrc b/.xinitrc index 28c2d05..490a3f0 100644 --- a/.xinitrc +++ b/.xinitrc @@ -5,13 +5,15 @@ hdmi ) feh --bg-center ~/launchergo/sysgo/gameshell/wallpaper/desktopbg.jpg exec ~/launchergo/load.sh & exec ~/launcher/sys.py/gsnotify/gsnotify-arm daemon & - exec /usr/bin/twm -f ~/launchergo/.twmrc +# exec /usr/bin/twm -f ~/launchergo/.twmrc + exec ~/launchergo/dwm-mod ;; gameshell ) feh --bg-center ~/launchergo/sysgo/gameshell/wallpaper/loading.png exec ~/launchergo/load.sh & exec ~/launcher/sys.py/gsnotify/gsnotify-arm & - exec awesome -c ~/launchergo/awesome/rc.lua +# exec awesome -c ~/launchergo/awesome/rc.lua + exec ~/launchergo/dwm-mod ;; *) exec $1;; diff --git a/.xorg.conf b/.xorg.conf new file mode 100644 index 0000000..fa95690 --- /dev/null +++ b/.xorg.conf @@ -0,0 +1,7 @@ +Section "Device" + Identifier "Allwinner A10/A13 FBDEV" + Driver "fbturbo" + Option "fbdev" "/dev/fb0" + + Option "SwapbuffersWait" "true" +EndSection diff --git a/.xorg_lima.conf b/.xorg_lima.conf new file mode 100644 index 0000000..8c4fac2 --- /dev/null +++ b/.xorg_lima.conf @@ -0,0 +1,7 @@ +Section "Device" + Identifier "Allwinner A10/A13 FBDEV" + Driver "modesetting" + Option "fbdev" "/dev/fb0" + + Option "SwapbuffersWait" "true" +EndSection diff --git a/Menu/GameShell/20_Retro Games/Pcsx b/Menu/GameShell/20_Retro Games/Pcsx new file mode 160000 index 0000000..c532ced --- /dev/null +++ b/Menu/GameShell/20_Retro Games/Pcsx @@ -0,0 +1 @@ +Subproject commit c532cedb5387697c633777f37a52e11f95fa3352 diff --git a/dwm-mod b/dwm-mod new file mode 100755 index 0000000..ab5dabc Binary files /dev/null and b/dwm-mod differ diff --git a/main b/main index 3f29440..2402056 100755 Binary files a/main and b/main differ diff --git a/md5sum.log b/md5sum.log index 4bbf9d2..ecc22a4 100644 --- a/md5sum.log +++ b/md5sum.log @@ -1 +1,2 @@ -06286d87e7724c2ff79155db9a8e826b main +f767ff5a91748714129ed417e3392c15 main +b4681733b228e2976a309efb7902588c dwm-mod diff --git a/md5sum.sh b/md5sum.sh index 9ea2d9e..1e384ee 100755 --- a/md5sum.sh +++ b/md5sum.sh @@ -3,6 +3,7 @@ set -x find . -iname "*.so" -exec md5sum {} + > md5sum.log echo `md5sum main` >> md5sum.log +echo `md5sum dwm-mod` >> md5sum.log