mplayer.hg: libvo/vo_ggi.c comparison

comparison libvo/vo_ggi.c @ 15406:04c47e9acab3

- make use of libggiwmh if found by configure * For now use it to set the window title * Implement "Window-On-Top" (experimental) - Improved dirty region handling introduced in rev 1.33. - other minor fixes patch by Christoph Egger <Christoph_Egger at gmx dot de>

author	diego
date	Wed, 11 May 2005 08:04:13 +0000
parents	db06e2acdf3d
children	fd51fd1ff231

comparison

equal deleted inserted replaced

-:93ae97c2de4c
+:04c47e9acab3
 #include "fastmemcpy.h"
 #include <ggi/ggi.h>
+#ifdef HAVE_GGIWMH
+#include <ggi/wmh.h>
+#endif
+#ifdef HAVE_GGIWMH
+extern int vo_ontop;	/* Window on top */
+#endif
 /* maximum buffers */
 #undef GGI_FLIP
 static vo_info_t info =
 {
 static struct ggi_conf_s {
 char *driver;
 ggi_visual_t parentvis;
 ggi_visual_t vis;
-ggi_mode gmode;
 /* source image format */
 int srcwidth;
 int srcheight;
 int srcformat;
 int async;
 int voflags;
 } ggi_conf;
+#ifdef HAVE_GGIWMH
+static void window_ontop(void)
+{
+mp_msg(MSGT_VO, MSGL_V, "[ggi] debug: window_ontop() called\n");
+ggiWmhZOrder(ggi_conf.parentvis, ZO_TOP);
+return;
+}
+#endif
 static void set_graphtype(uint32_t format, ggi_mode *mode)
 {
 switch(format)
 }
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
 uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
-int i;
-int rc;
 ggi_mode mode = {
 	1,			/* frames */
 	{ 0, 0 },		/* top, left corner */
 	{ width, height },	/* bottem, right corner */
 	{ GGI_AUTO, GGI_AUTO },	/* size */
 #if 0
 printf("[ggi] mode: ");
 ggiPrintMode(&parentmode);
 printf("\n");
+printf("[ggi] submode: ");
+ggiPrintMode(&mode);
+printf("\n");
 #endif
 ggiCheckMode(ggi_conf.parentvis, &parentmode);
 if (ggiSetMode(ggi_conf.parentvis, &parentmode) < 0)
 if ((parentmode.graphtype == GT_INVALID) || (parentmode.graphtype == GT_AUTO))
 {
 	mp_msg(MSGT_VO, MSGL_ERR, "[ggi] not supported depth/bpp\n");
 	return(-1);
 }
+#if 0
+printf("[ggi] mode: ");
+ggiPrintMode(&parentmode);
+printf("\n");
+#endif
 /* calculate top, left corner */
 mode.visible.x = (parentmode.virt.x - width) / 2;
 mode.visible.y = (parentmode.virt.y - height) / 2;
 /* calculate bottom, right corner */
-mode.virt.x = mode.visible.x + width;
+mode.virt.x = width;
-mode.virt.y = mode.visible.y + height;
+mode.virt.y = height;
 ggiCheckMode(ggi_conf.vis, &mode);
 if (ggiSetMode(ggi_conf.vis, &mode) < 0)
 {
 {
 	mp_msg(MSGT_VO, MSGL_ERR, "[ggi] unable to get video mode\n");
 	return(-1);
 }
+#ifdef HAVE_GGIWMH
-ggi_conf.gmode = mode;
+ggiWmhSetTitle(ggi_conf.parentvis, title);
+if (vo_ontop) window_ontop();
+#endif
 #if 0
-printf("[ggi] mode: ");
+printf("[ggi] submode: ");
 ggiPrintMode(&mode);
 printf("\n");
 #endif
 vo_depthonscreen = GT_DEPTH(parentmode.graphtype);
 vo_dbpp = GT_SIZE(parentmode.graphtype);
 ggi_conf.srcwidth = width;
 ggi_conf.srcheight = height;
 ggi_conf.srcformat = format;
+ggi_conf.dstwidth = mode.virt.x;
+ggi_conf.dstheight = mode.virt.y;
 ggi_conf.voflags = flags;
 if (IMGFMT_IS_RGB(ggi_conf.srcformat))
 {
 {
 mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] Unknown image format: %s\n",
 	    vo_format_name(ggi_conf.srcformat));
 	return(-1);
 }
-vo_dwidth = ggi_conf.dstwidth = ggi_conf.gmode.virt.x;
-vo_dheight = ggi_conf.dstheight = ggi_conf.gmode.virt.y;
 ggiSetFlags(ggi_conf.vis, GGIFLAG_ASYNC);
 if (GT_SCHEME(mode.graphtype) == GT_PALETTE)
 	ggiSetColorfulPalette(ggi_conf.vis);
 static void flip_page(void)
 {
 ggiFlushRegion(ggi_conf.vis, ggi_conf.flushregion.x1, ggi_conf.flushregion.y1,
 		ggi_conf.flushregion.x2 - ggi_conf.flushregion.x1,
 		ggi_conf.flushregion.y2 - ggi_conf.flushregion.y1);
-ggi_conf.flushregion.x1 = ggi_conf.flushregion.x2 = ggi_conf.dstwidth / 2;
-ggi_conf.flushregion.y1 = ggi_conf.flushregion.y2 = ggi_conf.dstheight / 2;
+ggi_conf.flushregion.x1 = ggi_conf.flushregion.x2 = -1;
+ggi_conf.flushregion.y1 = ggi_conf.flushregion.y2 = -1;
 }
 static uint32_t draw_slice(uint8_t *src[], int stride[], int w, int h,
 int x, int y)
 {
 ggiPutBox(ggi_conf.vis, x, y, w, h, src[0]);
-if (x < ggi_conf.flushregion.x1)
+if ((ggi_conf.flushregion.x1 == -1) || (x < ggi_conf.flushregion.x1))
 	    ggi_conf.flushregion.x1 = x;
-if (y < ggi_conf.flushregion.y1)
+if ((ggi_conf.flushregion.y1 == -1) || (y < ggi_conf.flushregion.y1))
 	    ggi_conf.flushregion.y1 = y;
-if ((x + w) > ggi_conf.flushregion.x2)
+if ((ggi_conf.flushregion.x2 == -1) || ((x + w) > ggi_conf.flushregion.x2))
 	    ggi_conf.flushregion.x2 = x + w;
-if ((y + h) > ggi_conf.flushregion.y2)
+if ((ggi_conf.flushregion.y2 == -1) || ((y + h) > ggi_conf.flushregion.y2))
 	    ggi_conf.flushregion.y2 = y + h;
 return(1);
 }
 if (ggiInit() != 0)
 {
 	mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to initialize GGI\n");
 	return(-1);
 }
+#ifdef HAVE_GGIWMH
+if (ggiWmhInit() < 0)
+{
+	mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to initialize libggiwmh\n");
+	return(-1);
+}
+#endif
 if ((char *)arg)
 {
 	int i = 0;
 	ggi_conf.driver = strdup(arg);
 	mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to open the video output\n");
 	ggiExit();
 	return(-1);
 }
+#ifdef HAVE_GGIWMH
+ggiWmhAttach(ggi_conf.parentvis);
+#endif
 mp_msg(MSGT_VO, MSGL_V, "[ggi] using '%s' output\n",
 	(ggi_conf.driver == NULL) ? "default" : ggi_conf.driver);
 return 0;
 static void uninit(void)
 {
 if (ggi_conf.driver)
 	free(ggi_conf.driver);
+#ifdef HAVE_GGIWMH
+ggiWmhDetach(ggi_conf.parentvis);
+ggiWmhExit();
+#endif
 ggiClose(ggi_conf.vis);
 ggiClose(ggi_conf.parentvis);
 ggiExit();
 }
 {
 	case VOCTRL_QUERY_FORMAT:
 	    return query_format(*((uint32_t*)data));
 	case VOCTRL_GET_IMAGE:
 	    return get_image(data);
+#ifdef HAVE_GGIWMH
+	case VOCTRL_ONTOP:
+	    vo_ontop = (!(vo_ontop));
+	    window_ontop();
+	    return VO_TRUE;
+#endif
 }
 return VO_NOTIMPL;
 }
 /* EVENT handling */

Mercurial > mplayer.hg

comparison libvo/vo_ggi.c @ 15406:04c47e9acab3