Small changes pygmae init and set display

This commit is contained in:
Ander
2014-11-20 23:41:19 +01:00
parent c5286524ae
commit ef09d888f3

View File

@@ -18,21 +18,28 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
super(TouchScreen, self).__init__() super(TouchScreen, self).__init__()
self.core = core self.core = core
self.running = False self.running = False
self.screen_size = (config['touchscreen']['screen_width'], self.cursor = config['touchscreen']['cursor']
config['touchscreen']['screen_height'])
self.cache_dir = config['touchscreen']['cache_dir'] self.cache_dir = config['touchscreen']['cache_dir']
self.fullscreen = config['touchscreen']['fullscreen'] self.fullscreen = config['touchscreen']['fullscreen']
os.putenv("SDL_FBDEV", config['touchscreen']['sdl_fbdev']) self.screen_size = (config['touchscreen']['screen_width'],
os.putenv("SDL_MOUSEDRV", config['touchscreen'][ config['touchscreen']['screen_height'])
'sdl_mousdrv']) os.environ["SDL_FBDEV"] = config['touchscreen']['sdl_fbdev']
os.putenv("SDL_MOUSEDEV",config['touchscreen'][ os.environ["SDL_MOUSEDRV"] = config['touchscreen'][
'sdl_mousedev']) 'sdl_mousdrv']
os.environ["SDL_MOUSEDEV"] = config['touchscreen'][
'sdl_mousedev']
pygame.init() pygame.init()
self.cursor = config['touchscreen']['cursor'] if self.fullscreen:
self.screen = pygame.display.set_mode(self.screen_size,
pygame.FULLSCREEN)
else:
self.screen = pygame.display.set_mode(self.screen_size)
pygame.mouse.set_visible(self.cursor)
self.screen_manager = ScreenManager(self.screen_size, self.screen_manager = ScreenManager(self.screen_size,
self.core, self.core,
self.cache_dir) self.cache_dir)
# Raspberry pi GPIO # Raspberry pi GPIO
self.gpio = config['touchscreen']['gpio'] self.gpio = config['touchscreen']['gpio']
if self.gpio: if self.gpio:
@@ -48,15 +55,9 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
def start_thread(self): def start_thread(self):
clock = pygame.time.Clock() clock = pygame.time.Clock()
if self.fullscreen:
screen = pygame.display.set_mode(self.screen_size,
pygame.FULLSCREEN)
else:
screen = pygame.display.set_mode(self.screen_size)
pygame.mouse.set_visible(self.cursor)
while self.running: while self.running:
clock.tick(15) clock.tick(15)
screen.blit(self.screen_manager.update(), (0, 0)) self.screen.blit(self.screen_manager.update(), (0, 0))
pygame.display.flip() pygame.display.flip()
for event in pygame.event.get(): for event in pygame.event.get():
if event.type == pygame.QUIT: if event.type == pygame.QUIT: