mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 23:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

GLFB: slightly better fullscreen handling

Browse Source
This commit is contained in:
Stefan Seyfried
2013-05-06 00:25:29 +02:00
parent 2e54579ba6
commit 9cc35ff0cc
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
generic-pc/glfb.cpp
View File

@@ -261,7 +261,7 @@ void GLFramebuffer::releaseGLObjects()
struct input_event ev; struct input_event ev;
if (key == 'f') if (key == 'f')
{ {
lt_info_c("GLFB::%s: toggle fullscreen\n", __func__); lt_info_c("GLFB::%s: toggle fullscreen %s\n", __func__, gThiz->mFullscreen?"off":"on");
gThiz->mFullscreen = !(gThiz->mFullscreen); gThiz->mFullscreen = !(gThiz->mFullscreen);
gThiz->mReInit = true; gThiz->mReInit = true;
return; return;
@@ -324,6 +324,7 @@ void GLFramebuffer::render()
*mX = y * mOA.num / mOA.den; *mX = y * mOA.num / mOA.den;
xoff = (x - *mX) / 2; xoff = (x - *mX) / 2;
yoff = (y - *mY) / 2; yoff = (y - *mY) / 2;
glutFullScreen();
} else } else
*mX = *mY * mOA.num / mOA.den; *mX = *mY * mOA.num / mOA.den;
lt_info("%s: reinit mX:%d mY:%d xoff:%d yoff:%d fs %d\n", lt_info("%s: reinit mX:%d mY:%d xoff:%d yoff:%d fs %d\n",
@@ -354,9 +355,7 @@ void GLFramebuffer::render()
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
} }
mReInitLock.unlock(); mReInitLock.unlock();
if (mFullscreen) if (!mFullscreen && (*mX != glutGet(GLUT_WINDOW_WIDTH) || *mY != glutGet(GLUT_WINDOW_HEIGHT)))
glutFullScreen();
else if (*mX != glutGet(GLUT_WINDOW_WIDTH) || *mY != glutGet(GLUT_WINDOW_HEIGHT))
glutReshapeWindow(*mX, *mY); glutReshapeWindow(*mX, *mY);
bltDisplayBuffer(); /* decoded video stream */ bltDisplayBuffer(); /* decoded video stream */
@@ -463,7 +462,7 @@ void GLFramebuffer::checkReinit(int x, int y)
static int last_x = 0, last_y = 0; static int last_x = 0, last_y = 0;
mReInitLock.lock(); mReInitLock.lock();
if (mReInit == false && (x != *mX || y != *mY)) { if (!mFullscreen && !mReInit && (x != *mX || y != *mY)) {
if (x != *mX && abs(x - last_x) > 2) { if (x != *mX && abs(x - last_x) > 2) {
*mX = x; *mX = x;
*mY = *mX * mOA.den / mOA.num; *mY = *mX * mOA.den / mOA.num;