mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-20 02:50:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

[277/906] open x client connection for sender only at start up

Browse source
This commit is contained in:
Julien Isorce 2008-11-21 19:37:21 +01:00 committed by Matthew Waters
parent 4a2f97e4e5
commit ed96a2f5ad
1 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
gst-libs/gst/gl/gstglwindow_x11.c
View file

@ -56,6 +56,8 @@ struct _GstGLWindowPrivate
gint connection; gint connection;
XVisualInfo *visual_info; XVisualInfo *visual_info;
Display *disp_send;
Window internal_win_id; Window internal_win_id;
GLXContext gl_context; GLXContext gl_context;
@ -113,6 +115,8 @@ gst_gl_window_finalize (GObject * object)
XCloseDisplay (priv->device); XCloseDisplay (priv->device);
XCloseDisplay (priv->disp_send);
g_debug ("display closed\n"); g_debug ("display closed\n");
if (priv->cond_send_message) if (priv->cond_send_message)
@ -266,6 +270,12 @@ gst_gl_window_new (gint width, gint height)
g_debug ("gl device id: %ld\n", (gulong) priv->device); g_debug ("gl device id: %ld\n", (gulong) priv->device);
priv->disp_send = XOpenDisplay (priv->display_name);
XSynchronize (priv->disp_send, FALSE);
g_debug ("gl display sender: %ld\n", (gulong) priv->disp_send);
priv->screen = DefaultScreenOfDisplay (priv->device); priv->screen = DefaultScreenOfDisplay (priv->device);
priv->screen_num = DefaultScreen (priv->device); priv->screen_num = DefaultScreen (priv->device);
priv->visual = DefaultVisual (priv->device, priv->screen_num); priv->visual = DefaultVisual (priv->device, priv->screen_num);
@ -479,23 +489,20 @@ gst_gl_window_draw (GstGLWindow *window)
if (priv->running) if (priv->running)
{ {
Display *disp;
XEvent event; XEvent event;
XWindowAttributes attr; XWindowAttributes attr;
disp = XOpenDisplay (priv->display_name);
if (priv->visible) if (priv->visible)
{ {
XMapWindow (disp, priv->internal_win_id); XMapWindow (priv->disp_send, priv->internal_win_id);
priv->visible = FALSE; priv->visible = FALSE;
} }
XGetWindowAttributes (disp, priv->internal_win_id, &attr); XGetWindowAttributes (priv->disp_send, priv->internal_win_id, &attr);
event.xexpose.type = Expose; event.xexpose.type = Expose;
event.xexpose.send_event = TRUE; event.xexpose.send_event = TRUE;
event.xexpose.display = disp; event.xexpose.display = priv->disp_send;
event.xexpose.window = priv->internal_win_id; event.xexpose.window = priv->internal_win_id;
event.xexpose.x = attr.x; event.xexpose.x = attr.x;
event.xexpose.y = attr.y; event.xexpose.y = attr.y;
@ -503,10 +510,8 @@ gst_gl_window_draw (GstGLWindow *window)
event.xexpose.height = attr.height; event.xexpose.height = attr.height;
event.xexpose.count = 0; event.xexpose.count = 0;
XSendEvent (disp, priv->internal_win_id, FALSE, ExposureMask, &event); XSendEvent (priv->disp_send, priv->internal_win_id, FALSE, ExposureMask, &event);
XSync (disp, FALSE); XSync (priv->disp_send, FALSE);
XCloseDisplay (disp);
} }
g_mutex_unlock (priv->x_lock); g_mutex_unlock (priv->x_lock);
@ -704,24 +709,19 @@ gst_gl_window_quit_loop (GstGLWindow *window, GstGLWindowCB callback, gpointer d
if (priv->running) if (priv->running)
{ {
Display *disp;
XEvent event; XEvent event;
disp = XOpenDisplay (priv->display_name);
event.xclient.type = ClientMessage; event.xclient.type = ClientMessage;
event.xclient.send_event = TRUE; event.xclient.send_event = TRUE;
event.xclient.display = disp; event.xclient.display = priv->disp_send;
event.xclient.window = priv->internal_win_id; event.xclient.window = priv->internal_win_id;
event.xclient.message_type = XInternAtom (disp, "WM_QUIT_LOOP", True);; event.xclient.message_type = XInternAtom (priv->disp_send, "WM_QUIT_LOOP", True);;
event.xclient.format = 32; event.xclient.format = 32;
event.xclient.data.l[0] = (long) callback; event.xclient.data.l[0] = (long) callback;
event.xclient.data.l[1] = (long) data; event.xclient.data.l[1] = (long) data;
XSendEvent (disp, priv->internal_win_id, FALSE, NoEventMask, &event); XSendEvent (priv->disp_send, priv->internal_win_id, FALSE, NoEventMask, &event);
XSync (disp, FALSE); XSync (priv->disp_send, FALSE);
XCloseDisplay (disp);
} }
g_mutex_unlock (priv->x_lock); g_mutex_unlock (priv->x_lock);
@ -746,24 +746,19 @@ gst_gl_window_send_message (GstGLWindow *window, GstGLWindowCB callback, gpointe
if (priv->running) if (priv->running)
{ {
Display *disp;
XEvent event; XEvent event;
disp = XOpenDisplay (priv->display_name);
event.xclient.type = ClientMessage; event.xclient.type = ClientMessage;
event.xclient.send_event = TRUE; event.xclient.send_event = TRUE;
event.xclient.display = disp; event.xclient.display = priv->disp_send;
event.xclient.window = priv->internal_win_id; event.xclient.window = priv->internal_win_id;
event.xclient.message_type = XInternAtom (disp, "WM_GL_WINDOW", True); event.xclient.message_type = XInternAtom (priv->disp_send, "WM_GL_WINDOW", True);
event.xclient.format = 32; event.xclient.format = 32;
event.xclient.data.l[0] = (long) callback; event.xclient.data.l[0] = (long) callback;
event.xclient.data.l[1] = (long) data; event.xclient.data.l[1] = (long) data;
XSendEvent (disp, priv->internal_win_id, FALSE, NoEventMask, &event); XSendEvent (priv->disp_send, priv->internal_win_id, FALSE, NoEventMask, &event);
XSync (disp, FALSE); XSync (priv->disp_send, FALSE);
XCloseDisplay (disp);
g_cond_wait (priv->cond_send_message, priv->x_lock); g_cond_wait (priv->cond_send_message, priv->x_lock);