mirror of
https://github.com/clockworkpi/launcher.git
synced 2025-12-12 17:58:50 +01:00
Merge pull request #141 from cuu/master
add gpu driver switch,dwm,bug fix
This commit is contained in:
GNU
GitHub
commit
f036a2f264
11
.cpirc
11
.cpirc
@ -1,12 +1,19 @@
|
||||
SCREEN=`cat /sys/class/graphics/fb0/modes`
|
||||
|
||||
XORG_CONF="/home/cpi/launcher/.xorg.conf"
|
||||
if [ -f ~/.lima ]
|
||||
then
|
||||
XORG_CONF="/home/cpi/launcher/.xorg_lima.conf"
|
||||
fi
|
||||
|
||||
if [ -f /tmp/autologin ]
|
||||
then
|
||||
rm -f /tmp/autologin
|
||||
mpd ~/.mpd.conf
|
||||
if [[ $SCREEN =~ .*320.* ]]
|
||||
then
|
||||
startx /home/cpi/launcher/.xinitrc -- -nocursor > /tmp/x.log 2>&1
|
||||
startx /home/cpi/launcher/.xinitrc -- -xf86config $XORG_CONF -nocursor > /tmp/x.log 2>&1
|
||||
else
|
||||
startx /home/cpi/launcher/.xinitrc hdmi > /tmp/x.log 2>&1
|
||||
startx /home/cpi/launcher/.xinitrc hdmi -- -xf86config $XORG_CONF > /tmp/x.log 2>&1
|
||||
fi
|
||||
fi
|
||||
|
||||
6
.xinitrc
6
.xinitrc
@ -5,13 +5,15 @@ hdmi )
|
||||
feh --bg-center ~/launcher/sys.py/gameshell/wallpaper/desktopbg.jpg
|
||||
exec ~/launcher/load.sh &
|
||||
exec ~/launcher/sys.py/gsnotify/gsnotify-arm daemon &
|
||||
exec /usr/bin/twm -f ~/launcher/.twmrc
|
||||
#exec /usr/bin/twm -f ~/launcher/.twmrc
|
||||
exec ~/launcher/dwm-mod
|
||||
;;
|
||||
gameshell )
|
||||
feh --bg-center ~/launcher/sys.py/gameshell/wallpaper/loading.png
|
||||
exec ~/launcher/load.sh &
|
||||
exec ~/launcher/sys.py/gsnotify/gsnotify-arm &
|
||||
exec awesome -c ~/launcher/awesome/rc.lua
|
||||
#exec awesome -c ~/launcher/awesome/rc.lua
|
||||
exec ~/launcher/dwm-mod
|
||||
;;
|
||||
*)
|
||||
exec $1;;
|
||||
|
||||
7
.xorg.conf
Normal file
7
.xorg.conf
Normal file
@ -0,0 +1,7 @@
|
||||
Section "Device"
|
||||
Identifier "Allwinner A10/A13 FBDEV"
|
||||
Driver "fbturbo"
|
||||
Option "fbdev" "/dev/fb0"
|
||||
|
||||
Option "SwapbuffersWait" "true"
|
||||
EndSection
|
||||
7
.xorg_lima.conf
Normal file
7
.xorg_lima.conf
Normal file
@ -0,0 +1,7 @@
|
||||
Section "Device"
|
||||
Identifier "Allwinner A10/A13 FBDEV"
|
||||
Driver "modesetting"
|
||||
Option "fbdev" "/dev/fb0"
|
||||
|
||||
Option "SwapbuffersWait" "true"
|
||||
EndSection
|
||||
319
Menu/GameShell/10_Settings/Lima/__init__.py
Normal file
319
Menu/GameShell/10_Settings/Lima/__init__.py
Normal file
@ -0,0 +1,319 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import os
|
||||
import pygame
|
||||
import platform
|
||||
#import commands
|
||||
import glob
|
||||
#from beeprint import pp
|
||||
from libs.roundrects import aa_round_rect
|
||||
|
||||
## local UI import
|
||||
from UI.constants import Width,Height,ICON_TYPES,RESTARTUI
|
||||
from UI.page import Page,PageSelector
|
||||
from UI.label import Label
|
||||
from UI.fonts import fonts
|
||||
from UI.util_funcs import midRect
|
||||
from UI.keys_def import CurKeys
|
||||
from UI.scroller import ListScroller
|
||||
from UI.icon_pool import MyIconPool
|
||||
from UI.icon_item import IconItem
|
||||
from UI.multilabel import MultiLabel
|
||||
from UI.skin_manager import MySkinManager
|
||||
from UI.lang_manager import MyLangManager
|
||||
from UI.info_page_list_item import InfoPageListItem
|
||||
from UI.info_page_selector import InfoPageSelector
|
||||
|
||||
import config
|
||||
|
||||
class ListPageSelector(InfoPageSelector):
|
||||
def Draw(self):
|
||||
idx = self._Parent._PsIndex
|
||||
|
||||
if idx < len(self._Parent._MyList):
|
||||
x = self._Parent._MyList[idx]._PosX+2 ## ++
|
||||
y = self._Parent._MyList[idx]._PosY+1
|
||||
h = self._Parent._MyList[idx]._Height -3
|
||||
|
||||
self._PosX = x
|
||||
self._PosY = y
|
||||
self._Height = h
|
||||
|
||||
aa_round_rect(self._Parent._CanvasHWND,
|
||||
(x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
|
||||
|
||||
|
||||
class PageListItem(InfoPageListItem):
|
||||
_PosX = 0
|
||||
_PosY = 0
|
||||
_Width = 0
|
||||
_Height = 30
|
||||
|
||||
_Labels = {}
|
||||
_Icons = {}
|
||||
_Fonts = {}
|
||||
|
||||
_LinkObj = None
|
||||
|
||||
_Active = False
|
||||
_Value = ""
|
||||
|
||||
def Draw(self):
|
||||
|
||||
self._Labels["Text"]._PosY = self._PosY+ (self._Height- self._Labels["Text"]._Height)/2
|
||||
|
||||
if self._Active == True:
|
||||
self._Parent._Icons["done"].NewCoord( self._Parent._Width-30,self._PosY+5)
|
||||
self._Parent._Icons["done"].Draw()
|
||||
|
||||
self._Labels["Text"].Draw(self._Active)
|
||||
|
||||
if "Small" in self._Labels:
|
||||
self._Labels["Small"]._PosX = self._Width - self._Labels["Small"]._Width -10
|
||||
self._Labels["Small"]._PosY = self._PosY + (self._Height- self._Labels["Small"]._Height)/2
|
||||
self._Labels["Small"].Draw()
|
||||
|
||||
pygame.draw.line(self._Parent._CanvasHWND,MySkinManager.GiveColor('Line'),(self._PosX,self._PosY+self._Height-1),(self._PosX+self._Width,self._PosY+self._Height-1),1)
|
||||
|
||||
class LanguagesPage(Page):
|
||||
_FootMsg = ["Nav","","","Back","Select"]
|
||||
_MyList = []
|
||||
_ListFont = fonts["notosanscjk15"]
|
||||
|
||||
_AList = {}
|
||||
|
||||
_Scrolled = 0
|
||||
|
||||
_BGwidth = 320
|
||||
_BGheight = 240-24-20
|
||||
|
||||
_DrawOnce = False
|
||||
_Scroller = None
|
||||
_InfoPage = None
|
||||
|
||||
def __init__(self):
|
||||
Page.__init__(self)
|
||||
self._Icons = {}
|
||||
|
||||
def GenList(self):
|
||||
|
||||
self._MyList = []
|
||||
|
||||
start_x = 0
|
||||
start_y = 0
|
||||
last_height = 0
|
||||
|
||||
drivers = [["fbturbo","Fbturbo"],
|
||||
["modesetting","Lima"]]
|
||||
|
||||
|
||||
for i,u in enumerate( drivers ):
|
||||
#print(i,u)
|
||||
li = PageListItem()
|
||||
li._Parent = self
|
||||
li._PosX = start_x
|
||||
li._PosY = start_y + last_height
|
||||
li._Width = Width
|
||||
li._Fonts["normal"] = self._ListFont
|
||||
li._Active = False
|
||||
li._Value = u[0]
|
||||
li.Init( u[1] )
|
||||
|
||||
last_height += li._Height
|
||||
|
||||
self._MyList.append(li)
|
||||
|
||||
def Init(self):
|
||||
if self._Screen != None:
|
||||
if self._Screen._CanvasHWND != None and self._CanvasHWND == None:
|
||||
self._HWND = self._Screen._CanvasHWND
|
||||
self._CanvasHWND = pygame.Surface( (self._Screen._Width,self._BGheight) )
|
||||
|
||||
self._PosX = self._Index*self._Screen._Width
|
||||
self._Width = self._Screen._Width ## equal to screen width
|
||||
self._Height = self._Screen._Height
|
||||
|
||||
done = IconItem()
|
||||
done._ImgSurf = MyIconPool._Icons["done"]
|
||||
done._MyType = ICON_TYPES["STAT"]
|
||||
done._Parent = self
|
||||
self._Icons["done"] = done
|
||||
|
||||
ps = ListPageSelector()
|
||||
ps._Parent = self
|
||||
self._Ps = ps
|
||||
self._PsIndex = 0
|
||||
|
||||
self.GenList()
|
||||
|
||||
self._Scroller = ListScroller()
|
||||
self._Scroller._Parent = self
|
||||
self._Scroller._PosX = self._Width - 10
|
||||
self._Scroller._PosY = 2
|
||||
self._Scroller.Init()
|
||||
self._Scroller.SetCanvasHWND(self._HWND)
|
||||
|
||||
|
||||
def ScrollDown(self):
|
||||
if len(self._MyList) == 0:
|
||||
return
|
||||
self._PsIndex +=1
|
||||
if self._PsIndex >= len(self._MyList):
|
||||
self._PsIndex = len(self._MyList) -1
|
||||
|
||||
cur_li = self._MyList[self._PsIndex]
|
||||
if cur_li._PosY +cur_li._Height > self._Height:
|
||||
for i in range(0,len(self._MyList)):
|
||||
self._MyList[i]._PosY -= self._MyList[i]._Height
|
||||
|
||||
def ScrollUp(self):
|
||||
if len(self._MyList) == 0:
|
||||
return
|
||||
self._PsIndex -= 1
|
||||
if self._PsIndex < 0:
|
||||
self._PsIndex = 0
|
||||
cur_li = self._MyList[self._PsIndex]
|
||||
if cur_li._PosY < 0:
|
||||
for i in range(0, len(self._MyList)):
|
||||
self._MyList[i]._PosY += self._MyList[i]._Height
|
||||
|
||||
|
||||
def Click(self):
|
||||
if len(self._MyList) == 0:
|
||||
return
|
||||
|
||||
cur_li = self._MyList[self._PsIndex]
|
||||
if cur_li._Active == True:
|
||||
return
|
||||
|
||||
print(cur_li._Value)
|
||||
|
||||
if "arm" in platform.machine():
|
||||
for i in self._MyList:
|
||||
i._Active = False
|
||||
|
||||
cur_li._Active = True
|
||||
self._Screen._MsgBox.SetText("Applying")
|
||||
self._Screen._MsgBox.Draw()
|
||||
self._Screen.SwapAndShow()
|
||||
|
||||
if "modesetting" in cur_li._Value:
|
||||
os.system("touch ~/.lima")
|
||||
else:
|
||||
os.system("rm ~/.lima")
|
||||
|
||||
pygame.time.delay(800)
|
||||
os.system("sudo reboot")
|
||||
|
||||
else:
|
||||
self._Screen._MsgBox.SetText("Do it in GameShell")
|
||||
self._Screen._MsgBox.Draw()
|
||||
self._Screen.SwapAndShow()
|
||||
|
||||
def OnLoadCb(self):
|
||||
self._Scrolled = 0
|
||||
self._PosY = 0
|
||||
self._DrawOnce = False
|
||||
|
||||
## grep Driver /etc/xorg.conf | tr -s " " | cut -d " " -f3
|
||||
## "fbturbo"
|
||||
## "modesetting"
|
||||
thedrv = ""
|
||||
|
||||
if "arm" in platform.machine():
|
||||
if FileExists("~/.lima"):
|
||||
thedrv = "modesetting"
|
||||
else:
|
||||
thedrv = "fbturbo"
|
||||
|
||||
if thedrv == "":
|
||||
thedrv = "fbturbo"
|
||||
|
||||
for i in self._MyList:
|
||||
if thedrv in i._Value:
|
||||
i._Active = True
|
||||
|
||||
def OnReturnBackCb(self):
|
||||
pass
|
||||
"""
|
||||
self.ReturnToUpLevelPage()
|
||||
self._Screen.Draw()
|
||||
self._Screen.SwapAndShow()
|
||||
"""
|
||||
def KeyDown(self,event):
|
||||
if event.key == CurKeys["A"] or event.key == CurKeys["Menu"]:
|
||||
self.ReturnToUpLevelPage()
|
||||
self._Screen.Draw()
|
||||
self._Screen.SwapAndShow()
|
||||
|
||||
if event.key == CurKeys["B"]:
|
||||
self.Click()
|
||||
|
||||
if event.key == CurKeys["Up"]:
|
||||
self.ScrollUp()
|
||||
self._Screen.Draw()
|
||||
self._Screen.SwapAndShow()
|
||||
if event.key == CurKeys["Down"]:
|
||||
self.ScrollDown()
|
||||
self._Screen.Draw()
|
||||
self._Screen.SwapAndShow()
|
||||
|
||||
|
||||
def Draw(self):
|
||||
|
||||
self.ClearCanvas()
|
||||
if len(self._MyList) == 0:
|
||||
return
|
||||
|
||||
else:
|
||||
if len(self._MyList) * PageListItem._Height > self._Height:
|
||||
self._Ps._Width = self._Width - 11
|
||||
self._Ps.Draw()
|
||||
for i in self._MyList:
|
||||
if i._PosY > self._Height + self._Height/2:
|
||||
break
|
||||
if i._PosY < 0:
|
||||
continue
|
||||
i.Draw()
|
||||
self._Scroller.UpdateSize( len(self._MyList)*PageListItem._Height, self._PsIndex*PageListItem._Height)
|
||||
self._Scroller.Draw()
|
||||
|
||||
else:
|
||||
self._Ps._Width = self._Width
|
||||
self._Ps.Draw()
|
||||
for i in self._MyList:
|
||||
if i._PosY > self._Height + self._Height/2:
|
||||
break
|
||||
if i._PosY < 0:
|
||||
continue
|
||||
i.Draw()
|
||||
|
||||
if self._HWND != None:
|
||||
self._HWND.fill((255,255,255))
|
||||
|
||||
self._HWND.blit(self._CanvasHWND,(self._PosX,self._PosY,self._Width, self._Height ) )
|
||||
|
||||
|
||||
class APIOBJ(object):
|
||||
|
||||
_Page = None
|
||||
def __init__(self):
|
||||
pass
|
||||
def Init(self,main_screen):
|
||||
self._Page = LanguagesPage()
|
||||
self._Page._Screen = main_screen
|
||||
self._Page._Name ="GPU driver switch"
|
||||
self._Page.Init()
|
||||
|
||||
def API(self,main_screen):
|
||||
if main_screen !=None:
|
||||
main_screen.PushPage(self._Page)
|
||||
main_screen.Draw()
|
||||
main_screen.SwapAndShow()
|
||||
|
||||
OBJ = APIOBJ()
|
||||
def Init(main_screen):
|
||||
OBJ.Init(main_screen)
|
||||
def API(main_screen):
|
||||
OBJ.API(main_screen)
|
||||
|
||||
|
||||
@ -66,7 +66,8 @@ class ListPage(Page):
|
||||
["","About", "About"],
|
||||
["","PowerOFF","Power off"],
|
||||
["","ButtonsLayout","Buttons Layout"],
|
||||
["","LauncherGo","Switch to LauncherGo"]]
|
||||
["","LauncherGo","Switch to LauncherGo"],
|
||||
["","Lima","GPU driver switch"]]
|
||||
|
||||
start_x = 0
|
||||
start_y = 0
|
||||
|
||||
@ -4,11 +4,9 @@ BAT_PNT=`upower -i $(upower -e | grep 'battery') | grep -E "state|to\ full|perce
|
||||
|
||||
if [ "$BAT_PNT" -lt "20" ]; then
|
||||
|
||||
if [ "$BAT_PNT" -lt "10" ]; then
|
||||
echo '{"type":"once","content":"Low Battery: 10% of battery remaining"}'
|
||||
fi
|
||||
|
||||
if [ "$BAT_PNT" -lt "5" ]; then
|
||||
echo '{"type":"once","content":"Low Battery: 5% of battery remaining"}'
|
||||
elif [ "$BAT_PNT" -lt "10" ]; then
|
||||
echo '{"type":"once","content":"Low Battery: 10% of battery remaining"}'
|
||||
fi
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user