summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2012-01-24 13:12:17 +0000
committerphintuka <phintuka>2012-01-24 13:12:17 +0000
commit175f30faff39467f19fcd2fdc3eb0b05843e3aa4 (patch)
tree703bfbf4c90d66cabd7d041e63ac4f5681d0085e
parentc808341c45928d559c1b0b743cdbc5df589b78e8 (diff)
downloadxineliboutput-175f30faff39467f19fcd2fdc3eb0b05843e3aa4.tar.gz
xineliboutput-175f30faff39467f19fcd2fdc3eb0b05843e3aa4.tar.bz2
Moved all XShm stuff under HAVE_XSHM
-rw-r--r--xine_sxfe_frontend.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/xine_sxfe_frontend.c b/xine_sxfe_frontend.c
index fa4c4e59..a4a4e391 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.179 2012-01-24 12:58:33 phintuka Exp $
+ * $Id: xine_sxfe_frontend.c,v 1.180 2012-01-24 13:12:17 phintuka Exp $
*
*/
@@ -114,7 +114,9 @@ typedef struct sxfe_s {
Window window[2];
int screen;
int window_id; /* output to another window */
+#ifdef HAVE_XSHM
int xshm_completion_event;
+#endif
Time prev_click_time; /* time of previous mouse button click (grab double clicks) */
int mousecursor_timeout;
#ifdef HAVE_XDPMS
@@ -2170,8 +2172,8 @@ static int sxfe_display_open(frontend_t *this_gen,
/* #warning sxfe_display_open: TODO: switch vmode */
/* completion event */
- this->xshm_completion_event = -1;
#ifdef HAVE_XSHM
+ this->xshm_completion_event = -1;
if (XShmQueryExtension (this->display) == True) {
this->xshm_completion_event = XShmGetEventBase (this->display) + ShmCompletion;
}
@@ -2750,8 +2752,10 @@ static int sxfe_run(frontend_t *this_gen)
default:; // ignore other events.
}
+#ifdef HAVE_XSHM
if (event.type == this->xshm_completion_event)
xine_port_send_gui_data (this->x.video_port, XINE_GUI_SEND_COMPLETION_EVENT, &event);
+#endif
}
return !this->x.fe.xine_is_finished((frontend_t*)this, 0);