summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2008-10-28 20:08:07 +0000
committerphintuka <phintuka>2008-10-28 20:08:07 +0000
commit0d411b8e5f7cb64fa94f28685308848ca05fb6c1 (patch)
tree487715c3e8495f476bec8e17a5a76deb25245acf
parentdce0c254cedd1c12edb0717ea80751f384bd06f5 (diff)
downloadxineliboutput-0d411b8e5f7cb64fa94f28685308848ca05fb6c1.tar.gz
xineliboutput-0d411b8e5f7cb64fa94f28685308848ca05fb6c1.tar.bz2
Unified usage of display (use this->display)
-rw-r--r--xine_sxfe_frontend.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/xine_sxfe_frontend.c b/xine_sxfe_frontend.c
index b67da9b0..c0263488 100644
--- a/xine_sxfe_frontend.c
+++ b/xine_sxfe_frontend.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: xine_sxfe_frontend.c,v 1.89 2008-10-28 20:05:37 phintuka Exp $
+ * $Id: xine_sxfe_frontend.c,v 1.90 2008-10-28 20:08:07 phintuka Exp $
*
*/
@@ -1444,15 +1444,15 @@ static void XConfigureEvent_handler(sxfe_t *this, XConfigureEvent *cev)
if ((cev->x == 0) && (cev->y == 0)) {
if(!this->fullscreen) {
int tmp_x, tmp_y;
- Window tmp_win;
- XLockDisplay(cev->display);
- if(XTranslateCoordinates(cev->display, cev->window,
- DefaultRootWindow(cev->display),
+ Window tmp_win;
+ XLockDisplay(this->display);
+ if(XTranslateCoordinates(this->display, cev->window,
+ DefaultRootWindow(this->display),
0, 0, &tmp_x, &tmp_y, &tmp_win)) {
this->x.xpos = tmp_x;
this->x.ypos = tmp_y;
}
- XUnlockDisplay(cev->display);
+ XUnlockDisplay(this->display);
}
} else {
if(!this->fullscreen) {
@@ -1591,9 +1591,9 @@ static int sxfe_run(frontend_t *this_gen)
XFocusChangeEvent *fev = (XFocusChangeEvent *) &event;
/* Show HUD again if sxfe window receives focus */
if(fev->window == this->window[0] || fev->window == this->window[1]) {
- XLockDisplay(fev->display);
+ XLockDisplay(this->display);
XMapWindow(this->display, this->hud_window);
- XUnlockDisplay(fev->display);
+ XUnlockDisplay(this->display);
}
}
break;
@@ -1604,9 +1604,9 @@ static int sxfe_run(frontend_t *this_gen)
XFocusChangeEvent *fev = (XFocusChangeEvent *) &event;
/* Dismiss HUD window if focusing away from frontend window */
if(fev->window == this->window[0] || fev->window == this->window[1]) {
- XLockDisplay(fev->display);
+ XLockDisplay(this->display);
XUnmapWindow(this->display, this->hud_window);
- XUnlockDisplay(fev->display);
+ XUnlockDisplay(this->display);
}
}
break;