summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-03 22:33:06 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-03 22:33:06 +0000
commitdf7e654d52242c2cbd03346d3e886e7cc5ee7946 (patch)
tree53b69f17159cc043e6a91d704d75fe1976c6314f /libvo
parentc367f8074e91e6a87594b973da59f0ceffe8a175 (diff)
downloadmpv-df7e654d52242c2cbd03346d3e886e7cc5ee7946.tar.bz2
mpv-df7e654d52242c2cbd03346d3e886e7cc5ee7946.tar.xz
micro cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10995 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_3dfx.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/libvo/vo_3dfx.c b/libvo/vo_3dfx.c
index bf4cdf303f..59b8bf1906 100644
--- a/libvo/vo_3dfx.c
+++ b/libvo/vo_3dfx.c
@@ -100,7 +100,6 @@ static Display *display;
static Window mywindow;
static int bpp;
static XWindowAttributes attribs;
-static int X_already_started = 0;
static void
@@ -139,11 +138,10 @@ restore_regs(voodoo_2d_reg *regs)
}
static uint32_t
-create_window(Display *display)
+create_window(Display *display, char *title)
{
int screen;
unsigned int fg, bg;
- char *hello = "I hate X11";
XSizeHints hint;
XVisualInfo vinfo;
XEvent xev;
@@ -152,9 +150,6 @@ create_window(Display *display)
XSetWindowAttributes xswa;
unsigned long xswamask;
- if (X_already_started)
- return -1;
-
screen = DefaultScreen(display);
hint.x = 0;
@@ -194,7 +189,7 @@ create_window(Display *display)
/* Tell other applications about this window */
- XSetStandardProperties(display, mywindow, hello, hello, None, NULL, 0, &hint);
+ XSetStandardProperties(display, mywindow, title, title, None, NULL, 0, &hint);
/* Map window. */
@@ -212,7 +207,6 @@ create_window(Display *display)
XFlush(display);
XSync(display, False);
- X_already_started++;
return 0;
}
@@ -347,7 +341,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
is_fullscreen = fullscreen = 0;
if (!is_fullscreen)
- create_window(display);
+ create_window(display, title);
// Ask 3dfx driver for base memory address 0
data.port = 0x10; // PCI_BASE_ADDRESS_0_LINUX;