Browse Source

add xorg configs,change xinit logic

cuu 5 years ago
parent
commit
70fa42423a

+ 9 - 2
.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

+ 4 - 2
.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;;

+ 7 - 0
.xorg.conf

@@ -0,0 +1,7 @@
+Section "Device"
+        Identifier      "Allwinner A10/A13 FBDEV"
+        Driver          "fbturbo"
+        Option          "fbdev" "/dev/fb0"
+
+        Option          "SwapbuffersWait" "true"
+EndSection

+ 7 - 0
.xorg_lima.conf

@@ -0,0 +1,7 @@
+Section "Device"
+        Identifier      "Allwinner A10/A13 FBDEV"
+        Driver          "modesetting"
+        Option          "fbdev" "/dev/fb0"
+
+        Option          "SwapbuffersWait" "true"
+EndSection

+ 8 - 0
Menu/GameShell/20_Retro Games/Pcsx/.gitignore

@@ -0,0 +1,8 @@
+bios
+bios/*
+screenshots
+screenshots/*
+.pcsx
+.pcsx/*
+*.log
+

BIN
Menu/GameShell/20_Retro Games/Pcsx/Pcsx.png


+ 3 - 0
Menu/GameShell/20_Retro Games/Pcsx/Pcsx.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./pcsx

+ 17 - 0
Menu/GameShell/20_Retro Games/Pcsx/README.md

@@ -0,0 +1,17 @@
+# Pcsx for GameShell
+
+Pcsx emulator for GameShell 
+
+[orig post ](https://forum.clockworkpi.com/t/gcw-zero-pcsx4all-for-gs/433)
+
+launcher version before 2.0:   
+
+Just clone it into ~/apps/launcher/Menu/GameShell and reload [Launcher](https://github.com/clockworkpi/launcher)  
+
+launcher version 2.0:  
+Just clone it into ~/apps/Menu/ and reload [Launcher](https://github.com/clockworkpi/launcher)  
+
+
+
+
+

+ 0 - 0
Menu/GameShell/20_Retro Games/Pcsx/ScreenShots/.gitkeep


BIN
Menu/GameShell/20_Retro Games/Pcsx/pcsx


+ 1 - 0
Menu/GameShell/20_Retro Games/Pcsx/pcsx.md5sum

@@ -0,0 +1 @@
+8a4e0d1746e2bfcfb3c877cfdbf4953f  pcsx

BIN
dwm-mod


+ 1 - 0
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