qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@449 b3059339-0415-0410-9bf9-f77b7e298cf2

7 files changed, 165 insertions, 258 deletions

diff --git a/libvo/mga_common.c b/libvo/mga_common.c
index 3794584d89..a6dd82ff9a 100644
--- a/libvo/mga_common.c
+++ b/libvo/mga_common.c
@@ -150,9 +150,13 @@ write_frame_yuy2(uint8_t *y)
 static uint32_t
 draw_frame(uint8_t *src[])
 {
-        if (mga_vid_config.format==MGA_VID_FORMAT_YUY2)
-                write_frame_yuy2(src[0]);
-	return 0;
+    switch(mga_vid_config.format){
+    case MGA_VID_FORMAT_YUY2:
+        write_frame_yuy2(src[0]);break;
+    case MGA_VID_FORMAT_UYVY:
+        write_frame_yuy2(src[0]);break;
+    }
+    return 0;
 }
 
 static uint32_t
@@ -161,6 +165,7 @@ query_format(uint32_t format)
     switch(format){
     case IMGFMT_YV12:
     case IMGFMT_YUY2:
+    case IMGFMT_UYVY:
 //    case IMGFMT_RGB|24:
 //    case IMGFMT_BGR|24:
         return 1;
diff --git a/libvo/vo_mga.c b/libvo/vo_mga.c
index b05d028cc6..00e5b6afed 100644
--- a/libvo/vo_mga.c
+++ b/libvo/vo_mga.c
@@ -70,6 +70,9 @@ init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint3
         case IMGFMT_YUY2:
 	    mga_vid_config.frame_size = ((width + 31) & ~31) * height * 2;
             mga_vid_config.format=MGA_VID_FORMAT_YUY2; break;
+        case IMGFMT_UYVY:
+	    mga_vid_config.frame_size = ((width + 31) & ~31) * height * 2;
+            mga_vid_config.format=MGA_VID_FORMAT_UYVY; break;
         default: 
             fprintf(stderr,"mga: invalid output format %0X\n",format);
             return (-1);
diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c
index 73e301d186..1b757a5c3b 100644
--- a/libvo/vo_sdl.c
+++ b/libvo/vo_sdl.c
@@ -377,27 +377,24 @@ init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint3
 	struct sdl_priv_s *priv = &sdl_priv;
         unsigned int sdl_format;
 
-	sdl_format = format;
+
         switch(format){
-		case IMGFMT_YV12:
-			printf("\nSDL: Using 0x%X (YV12) image format\n", format); break;
-		case IMGFMT_IYUV:
-			printf("\nSDL: Using 0x%X (IYUV) image format\n", format); break;
-		case IMGFMT_YUY2:
-			printf("\nSDL: Using 0x%X (YUY2) image format\n", format); break;
-		case IMGFMT_UYVY:
-			printf("\nSDL: Using 0x%X (UYVY) image format\n", format); break;
-		case IMGFMT_YVYU:
-			printf("\nSDL: Using 0x%X (YVYU) image format\n", format); break;
-		case IMGFMT_I420:
-			printf("\nSDL: Using 0x%X (I420) image format\n", format);
-			printf("SDL: Mapping I420 to IYUV (untested please report if it works)\n");
-			sdl_format = SDL_IYUV_OVERLAY;
-		break;	
-		default:
-			printf("\nSDL: Unsupported image format (0x%X)\n",format);
-			return -1;
-	}
+          case IMGFMT_YV12:
+	  	sdl_format=SDL_YV12_OVERLAY;
+		printf("SDL: Using YV12 image format\n");
+	  break;
+          case IMGFMT_YUY2:
+	  	sdl_format=SDL_YUY2_OVERLAY;
+		printf("SDL: Using YUY2 image format\n");
+	  break;
+          case IMGFMT_UYVY:
+	  	sdl_format=SDL_UYVY_OVERLAY;
+		printf("SDL: Using UYVY image format\n");
+	  break;
+          default:
+            printf("SDL: Unsupported image format (0x%X)\n",format);
+            return -1;
+        }
 
 	sdl_open (NULL, NULL);
 
diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c
index 1206f082d9..29f7a84a50 100644
--- a/libvo/vo_svga.c
+++ b/libvo/vo_svga.c
@@ -41,203 +41,124 @@ static uint32_t orig_w, orig_h, maxw, maxh; // Width, height
 static float scaling = 1.0;
 static uint32_t x_pos, y_pos; // Position
 
-// SVGAlib - list of detected modes
-typedef struct vga_modelist_s {
-          uint16_t modenum;
-          vga_modeinfo modeinfo;
-	  struct vga_modelist_s *next;
-        } vga_modelist_t;
-
-vga_modelist_t *modelist = NULL;
-
+// Order must not change!
+#define _640x480x32K 	 0   // 17
+#define _640x480x64K 	 1   // 18
+#define _640x480x16M 	 2   // 19
+#define _640x480x16M32   3   // 34
+#define _800x600x32K 	 4   // 20
+#define _800x600x64K 	 5   // 21
+#define _800x600x16M 	 6   // 22 
+#define _800x600x16M32   7   // 35
+#define _1024x768x32K 	 8   // 23
+#define _1024x768x64K 	 9   // 24
+#define _1024x768x16M 	 10  // 25
+#define _1024x768x16M32  11  // 36
+#define VID_MODE_NUM	 12
+
+static uint8_t vid_modes[VID_MODE_NUM];
+static vid_mode_nums[VID_MODE_NUM] = {17,18,19,34,20,21,22,35,23,24,25,36};
+static uint8_t vid_mode;
 static uint8_t bpp;
-static uint8_t bpp_conv = 0;
-static uint32_t pformat;
 
-#define BPP_15 1
-#define BPP_16 2
-#define BPP_24 4
-#define BPP_32 8
-static uint8_t bpp_avail = 0;
+static uint32_t pformat;
 
 static uint8_t checked = 0;
+static uint8_t bpp_conv = 0;
 
-static int add_mode(uint16_t mode, vga_modeinfo minfo) {
-  vga_modelist_t *list;
-
-  if (modelist == NULL) {
-    modelist = malloc(sizeof(vga_modelist_t));
-    modelist->modenum = mode;
-    modelist->modeinfo = minfo;
-    modelist->next = NULL;
-    if (modelist == NULL) {
-      printf("vo_svga: add_mode() failed. Not enough memory for modelist.");
-      return(1); // error
-    }
-  } else {
-      list = modelist;
-      while (list->next != NULL)
-        list = list->next;
-      list->next = malloc(sizeof(vga_modelist_t));
-      if (list->next == NULL) {
-        printf("vo_svga: add_mode() failed. Not enough memory for modelist.");
-        return(1); // error
-      }
-      list = list->next;
-      list->modenum = mode;
-      list->modeinfo = minfo;
-      list->next = NULL;
-    }  
-}
-
-static int checksupportedmodes() {
-  uint16_t i;
-  vga_modeinfo *minfo;
+static void checksupportedmodes() {
+  int i;
   
   checked = 1;
   vga_init();
   vga_disabledriverreport();
-  for (i = 1; i < vga_lastmodenumber(); i++)
-    if (vga_hasmode(i) > 0) {
-      minfo = vga_getmodeinfo(i);
-      switch (minfo->colors) {
-        case 32768: bpp_avail |= BPP_15; break;
-        case 65536: bpp_avail |= BPP_16; break;
-      }
-      switch (minfo->bytesperpixel) {
-        case 3: bpp_avail |= BPP_24; break;
-        case 4: bpp_avail |= BPP_32; break;
-      }
-      if (add_mode(i, *minfo))
-        return(1);
-    }
+  for (i = 0; i < VID_MODE_NUM; i++) {
+    if (vga_hasmode(vid_mode_nums[i]) > 0)
+      vid_modes[i] = 1;
+    else vid_modes[i] = 0;
+  }
 }
 
 static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width,
                      uint32_t d_height, uint32_t fullscreen, char *title, 
 		     uint32_t format) {
-  uint32_t req_w = (d_width > 0 ? d_width : width);
-  uint32_t req_h = (d_height > 0 ? d_height : height);
-  uint16_t vid_mode = 0;
-  uint8_t widescreen = (((req_w*1.0)/req_h) > (4.0/3)) ? 1 : 0;
-  vga_modelist_t *list = modelist;
+  uint32_t wid = (d_width > 0 ? d_width : width);
   
   if (!checked) {
-    if (checksupportedmodes()) // Looking for available video modes
-      return(1);
+    checksupportedmodes(); // Looking for available video modes
   }
 
-  bpp_avail = 0;
-  while (list != NULL) {
-    if ((list->modeinfo.width >= req_w) && (list->modeinfo.height >= req_h)) {
-      switch (list->modeinfo.colors) {
-        case 32768: bpp_avail |= BPP_15; break;
-        case 65536: bpp_avail |= BPP_16; break;
-      }
-      switch (list->modeinfo.bytesperpixel) {
-        case 3: bpp_avail |= BPP_24; break;
-        case 4: bpp_avail |= BPP_32; break;
-      }
-    }
-    list = list->next;
-  }
-  
   pformat = format;
   
-  // bpp check
-  bpp_conv = 0;
+  // -bpp check
   if (!vo_dbpp) {
     if (format == IMGFMT_YV12) bpp = 32;
     else bpp = format & 255;
-    switch (bpp) {
-      case 32: if (!(bpp_avail & BPP_32)) {
-	         printf("vo_svga: Haven't found video mode which fit to: %dx%d %dbpp\n",req_w,req_h,bpp);
-		 printf("vo_svga: Maybe you should try -bpp\n");
-		 return(1);
-	       } 
-               break;
-      case 24: if (!(bpp_avail & BPP_24))
-                 if (!(bpp_avail & BPP_32)) {
-	           printf("vo_svga: Haven't found video mode which fit to: %dx%d %dbpp\n",req_w,req_h,bpp);
-		   printf("vo_svga: Maybe you should try -bpp\n");
-		   return(1);
-		 } else {
-		     bpp = 32;
-		     bpp_conv = 1;
-		   }     
-               break;
-      case 16: if (!(bpp_avail & BPP_16)) {
-	         printf("vo_svga: Haven't found video mode which fit to: %dx%d %dbpp\n",req_w,req_h,bpp);
-		 printf("vo_svga: Maybe you should try -bpp\n");
-		 return(1);
-	       } 
-               break;
-      case 15: if (!(bpp_avail & BPP_15))
-                 if (!(bpp_avail & BPP_16)) {
-	           printf("vo_svga: Haven't found video mode which fit to: %dx%d %dbpp\n",req_w,req_h,bpp);
-		   printf("vo_svga: Maybe you should try -bpp\n");
-		   return(1);
-		 } else {
-		     bpp = 16;
-		     bpp_conv = 1;
-		   }
-               break;
-    }
   } else {
       bpp = vo_dbpp;
       switch (bpp) {
-        case 32: if (!(bpp_avail & BPP_32)) {
-	           printf("vo_svga: %dbpp not supported by HW or SVGAlib\n",bpp);
+        case 32: if (!(vid_modes[_640x480x16M32] | vid_modes[_800x600x16M32] | vid_modes[_1024x768x16M32])) {
+	           printf("vo_svga: %dbpp not supported by HW or SVGAlib",bpp);
 		   return(1);
                  }
-        case 24: if (!(bpp_avail & BPP_24)) {
-	           printf("vo_svga: %dbpp not supported by HW or SVGAlib\n",bpp);
+        case 24: if (!(vid_modes[_640x480x16M] | vid_modes[_800x600x16M] | vid_modes[_1024x768x16M])) {
+	           printf("vo_svga: %dbpp not supported by HW or SVGAlib",bpp);
 		   return(1);
                  }
-        case 16: if (!(bpp_avail & BPP_16)) {
-	           printf("vo_svga: %dbpp not supported by HW or SVGAlib\n",bpp);
+        case 16: if (!(vid_modes[_640x480x64K] | vid_modes[_800x600x64K] | vid_modes[_1024x768x64K])) {
+	           printf("vo_svga: %dbpp not supported by HW or SVGAlib",bpp);
 		   return(1);
                  }
-        case 15: if (!(bpp_avail & BPP_15)) {
-	           printf("vo_svga: %dbpp not supported by HW or SVGAlib\n",bpp);
+        case 15: if (!(vid_modes[_640x480x32K] | vid_modes[_800x600x32K] | vid_modes[_1024x768x32K])) {
+	           printf("vo_svga: %dbpp not supported by HW or SVGAlib",bpp);
 		   return(1);
                  }
       }
     }
-
-  list = modelist;
-  while ((list != NULL) && (!vid_mode)) {
-    if ((list->modeinfo.width >= req_w) && (list->modeinfo.height >= req_h)) {
+  
+  if (wid > 800)
+    switch (bpp) {
+      case 32: vid_mode = 36; break;
+      case 24: vid_mode = bpp_conv ? 36 : 25; bpp = 32; break;
+      case 16: vid_mode = 24; break;
+      case 15: vid_mode = bpp_conv ? 24 : 23; bpp = 16; break;
+    }
+  else
+    if (wid > 640)
       switch (bpp) {
-        case 32: if (list->modeinfo.bytesperpixel == 4)
-	           vid_mode = list->modenum;
-        case 24: if (list->modeinfo.bytesperpixel == 3)
-	           vid_mode = list->modenum;
-        case 16: if (list->modeinfo.colors == 65536)
-	           vid_mode = list->modenum;
-        case 15: if (list->modeinfo.colors == 32768)
-	           vid_mode = list->modenum;
+        case 32: vid_mode = 35; break;
+        case 24: vid_mode = bpp_conv ? 35 : 22; bpp = 32; break;
+        case 16: vid_mode = 21; break;
+        case 15: vid_mode = bpp_conv ? 21 : 20; bpp = 16; break;
       }
-    }
-    list = list->next;
+    else
+      switch (bpp) {
+        case 32: vid_mode = 34; break;
+        case 24: vid_mode = bpp_conv ? 34 : 19; bpp = 32; break;
+        case 16: vid_mode = 18; break;
+        case 15: vid_mode = bpp_conv ? 18 : 17; bpp = 16; break;
+      }
+  if (bpp_conv)
+    bppbuf = malloc(maxw * maxh * BYTESPERPIXEL);
+  if (!bppbuf) {
+    printf("vo_svga: Not enough memory for buffering!");
+    uninit();
+    return (1);
   }
-  
+
   vga_setlinearaddressing();
   if (vga_setmode(vid_mode) == -1){
     printf("vo_svga: vga_setmode(%d) failed.\n",vid_mode);
-    uninit();
     return(1); // error
   }
   if (gl_setcontextvga(vid_mode)){
     printf("vo_svga: gl_setcontextvga(%d) failed.\n",vid_mode);
-    uninit();
     return(1); // error
   }
   screen = gl_allocatecontext();
   gl_getcontext(screen);
   if (gl_setcontextvgavirtual(vid_mode)){
     printf("vo_svga: gl_setcontextvgavirtual(%d) failed.\n",vid_mode);
-    uninit();
     return(1); // error
   }
   virt = gl_allocatecontext();
@@ -245,24 +166,16 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width,
   gl_setcontext(virt);
   gl_clearscreen(0);
   
-  if (bpp_conv)
-    bppbuf = malloc(maxw * maxh * BYTESPERPIXEL);
-  if (bppbuf == NULL) {
-    printf("vo_svga: Not enough memory for buffering!\n");
-    uninit();
-    return (1);
-  }
-
   orig_w = width;
   orig_h = height;
   if ((fullscreen & 0x04) && (WIDTH != orig_w)) {
-    if (!widescreen) {
+    if (((orig_w*1.0) / orig_h) < (4.0/3)) {
       maxh = HEIGHT;
       scaling = maxh / (orig_h * 1.0);
       maxw = (uint32_t) (orig_w * scaling);
       scalebuf = malloc(maxw * maxh * BYTESPERPIXEL);
-      if (scalebuf == NULL) {
-        printf("vo_svga: Not enough memory for buffering!\n");
+      if (!scalebuf) {
+        printf("vo_svga: Not enough memory for buffering!");
 	uninit();
 	return (1);
       }
@@ -271,8 +184,8 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width,
         scaling = maxw / (orig_w * 1.0);
         maxh = (uint32_t) (orig_h * scaling);
         scalebuf = malloc(maxw * maxh * BYTESPERPIXEL);
-        if (scalebuf == NULL) {
-          printf("vo_svga: Not enough memory for buffering!\n");
+        if (!scalebuf) {
+          printf("vo_svga: Not enough memory for buffering!");
 	  uninit();
 	  return (1);
         }
@@ -287,8 +200,8 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width,
   if (pformat == IMGFMT_YV12) {
     yuv2rgb_init(bpp, MODE_RGB);
     yuvbuf = malloc(maxw * maxh * BYTESPERPIXEL);
-    if (yuvbuf == NULL) {
-      printf("vo_svga: Not enough memory for buffering!\n");
+    if (!yuvbuf) {
+      printf("vo_svga: Not enough memory for buffering!");
       uninit();
       return (1);
     }
@@ -304,33 +217,31 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width,
 static uint32_t query_format(uint32_t format) {
   uint8_t res = 0;
 
-  if (!checked) {
-    if (checksupportedmodes()) // Looking for available video modes
-      return(0);
-  }
+  if (!checked)
+    checksupportedmodes(); // Looking for available video modes
   switch (format) {
     case IMGFMT_RGB32: 
     case IMGFMT_BGR|32: {
-      return ((bpp_avail & BPP_32) ? 1 : 0);
+      return (vid_modes[_640x480x16M32] | vid_modes[_800x600x16M32] | vid_modes[_1024x768x16M32]);
     }
     case IMGFMT_RGB24: 
     case IMGFMT_BGR|24: {
-      res = (bpp_avail & BPP_24) ? 1 : 0;
+      res = vid_modes[_640x480x16M] | vid_modes[_800x600x16M] | vid_modes[_1024x768x16M];
       if (!res) {
-        res = (bpp_avail & BPP_32) ? 1 : 0;
+        res = vid_modes[_640x480x16M32] | vid_modes[_800x600x16M32] | vid_modes[_1024x768x16M32];
 	bpp_conv = 1;
       }
       return (res);
     }
     case IMGFMT_RGB16: 
     case IMGFMT_BGR|16: {
-      return ((bpp_avail & BPP_16) ? 1 : 0);
+      return (vid_modes[_640x480x64K] | vid_modes[_800x600x64K] | vid_modes[_1024x768x64K]);
     }
     case IMGFMT_RGB15: 
     case IMGFMT_BGR|15: {
-      res = (bpp_avail & BPP_15) ? 1 : 0;
+      res = vid_modes[_640x480x32K] | vid_modes[_800x600x32K] | vid_modes[_1024x768x32K];
       if (!res) {
-        res = (bpp_avail & BPP_16) ? 1 : 0;
+        res = vid_modes[_640x480x64K] | vid_modes[_800x600x64K] | vid_modes[_1024x768x64K];
         bpp_conv = 1;
       }
       return (res);
@@ -367,7 +278,7 @@ static uint32_t draw_frame(uint8_t *src[]) {
     yuv2rgb(yuvbuf, src[0], src[1], src[2], orig_w, orig_h, orig_w * BYTESPERPIXEL, orig_w, orig_w / 2);
     src[0] = yuvbuf;
   }
-  if (scalebuf != NULL) {
+  if (scalebuf) {
     gl_scalebox(orig_w, orig_h, src[0], maxw, maxh, scalebuf);
     src[0] = scalebuf;
   }
@@ -413,7 +324,7 @@ static uint32_t draw_slice(uint8_t *image[], int stride[],
   sw = (uint32_t) (w * scaling);
   sh = (uint32_t) (h * scaling);
   yuv2rgb(yuvbuf, image[0], image[1], image[2], w, h, orig_w * BYTESPERPIXEL, stride[0], stride[1]);
-  if (scalebuf != NULL) {
+  if (scalebuf) {
     gl_scalebox(w, h, yuvbuf, sw, sh, scalebuf);
     src = scalebuf;
   }
@@ -436,25 +347,14 @@ static void check_events(void) {
 }
 
 static void uninit(void) {
-  vga_modelist_t *list = modelist;
-
   gl_freecontext(screen);
   gl_freecontext(virt);
   vga_setmode(TEXT);
-  if (bppbuf != NULL)
+  if (bppbuf)
     free(bppbuf);
-  if (scalebuf != NULL)
+  if (scalebuf)
     free(scalebuf);
-  if (yuvbuf != NULL)
+  if (yuvbuf)
     free(yuvbuf);
-  if (modelist != NULL) {
-    while (modelist->next != NULL) {
-      list = modelist;
-      while (list->next != NULL)
-        list = list->next;
-      free(list);
-    }
-    free(modelist);
-  }
 }
 	
\ No newline at end of file
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c
index 0d995cad4c..35c4850d82 100644
--- a/libvo/vo_xmga.c
+++ b/libvo/vo_xmga.c
@@ -189,6 +189,10 @@ static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_
         mga_vid_config.format=MGA_VID_FORMAT_YUY2;
         mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height * 2;
         break;
+   case IMGFMT_UYVY:
+        mga_vid_config.format=MGA_VID_FORMAT_UYVY;
+        mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height * 2;
+        break;
    default:          fprintf(stderr,"mga: invalid output format %0X\n",format); return (-1);
   }
 
diff --git a/libvo/wskeys.h b/libvo/wskeys.h
index e3643ca09f..e624abc34f 100644
--- a/libvo/wskeys.h
+++ b/libvo/wskeys.h
@@ -60,8 +60,6 @@
 #define wsSpace ' '
 #define wsMinus '-'
 #define wsPlus  '+'
-#define wsMul   '*'
-#define wsDiv   '/'
 
 #define wsUp            0x52 + 256
 #define wsDown          0x54 + 256
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 9c72b16732..0379797f81 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -1,37 +1,41 @@
+
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
+#include "config.h"
+
+#ifdef X11_FULLSCREEN
+
+#include <string.h>
 #include <unistd.h>
 #include <sys/mman.h>
 
-#include "config.h"
 #include "video_out.h"
 
-#ifdef X11_FULLSCREEN
-
 #include <X11/Xmd.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 
+#include <X11/extensions/dpms.h>
+
 static int dpms_disabled=0;
 static int timeout_save=0;
 
 
 void vo_hidecursor ( Display *disp , Window win )
 {
-        Cursor no_ptr;
-        Pixmap bm_no;
-        XColor black,dummy;
-        Colormap colormap;
-        static unsigned char bm_no_data[] = { 0,0,0,0, 0,0,0,0  };
-
-        colormap = DefaultColormap(disp,DefaultScreen(disp));
-        XAllocNamedColor(disp,colormap,"black",&black,&dummy);
-        bm_no = XCreateBitmapFromData(disp, win, bm_no_data, 8,8);
-        no_ptr=XCreatePixmapCursor(disp, bm_no, bm_no,&black, &black,0, 0);
-        XDefineCursor(disp,win,no_ptr);
+	Cursor no_ptr;
+	Pixmap bm_no;
+	XColor black,dummy;
+	Colormap colormap;
+	static unsigned char bm_no_data[] = { 0,0,0,0, 0,0,0,0  };
+	
+	colormap = DefaultColormap(disp,DefaultScreen(disp));
+	XAllocNamedColor(disp,colormap,"black",&black,&dummy);	
+	bm_no = XCreateBitmapFromData(disp, win, bm_no_data, 8,8);    
+	no_ptr=XCreatePixmapCursor(disp, bm_no, bm_no,&black, &black,0, 0);									          
+	XDefineCursor(disp,win,no_ptr);
 }
 
 
@@ -96,10 +100,6 @@ void vo_x11_putkey(int key){
    case wsGrayMinus: mplayer_put_key('-'); break;
    case wsPlus:
    case wsGrayPlus:  mplayer_put_key('+'); break;
-   case wsGrayMul:
-   case wsMul:       mplayer_put_key('*'); break;
-   case wsGrayDiv:
-   case wsDiv:       mplayer_put_key('/'); break;
    default: if((key>='a' && key<='z')||(key>='A' && key<='Z')) mplayer_put_key(key);
   }
 
@@ -153,17 +153,17 @@ int vo_x11_check_events(Display *mydisplay){
    switch( Event.type )
     {
        case Expose:
-             ret|=VO_EVENT_EXPOSE;
+	     ret|=VO_EVENT_EXPOSE;
              break;
        case ConfigureNotify:
              vo_dwidth=Event.xconfigure.width;
-             vo_dheight=Event.xconfigure.height;
-             ret|=VO_EVENT_RESIZE;
+	     vo_dheight=Event.xconfigure.height;
+	     ret|=VO_EVENT_RESIZE;
              break;
        case KeyPress:
              XLookupString( &Event.xkey,buf,sizeof(buf),&keySym,&stat );
              vo_x11_putkey( ( (keySym&0xff00) != 0?( (keySym&0x00ff) + 256 ):( keySym ) ) );
-             ret|=VO_EVENT_KEYPRESS;
+	     ret|=VO_EVENT_KEYPRESS;
              break;
     }
   }
@@ -171,27 +171,25 @@ int vo_x11_check_events(Display *mydisplay){
   return ret;
 }
 
-#endif
-
 void saver_on(Display *mDisplay) {
 
     int nothing;
     if (dpms_disabled)
     {
-        if (DPMSQueryExtension(mDisplay, &nothing, &nothing))
-        {
-            printf ("Enabling DPMS\n");
-            DPMSEnable(mDisplay);  // restoring power saving settings
-            DPMSQueryExtension(mDisplay, &nothing, &nothing);
-        }
+	if (DPMSQueryExtension(mDisplay, &nothing, &nothing))
+	{
+	    printf ("Enabling DPMS\n");
+	    DPMSEnable(mDisplay);  // restoring power saving settings
+	    DPMSQueryExtension(mDisplay, &nothing, &nothing);
+	}
     }
-
+    
     if (timeout_save)
     {
-        int dummy, interval, prefer_blank, allow_exp;
-        XGetScreenSaver(mDisplay, &dummy, &interval, &prefer_blank, &allow_exp);
-        XSetScreenSaver(mDisplay, timeout_save, interval, prefer_blank, allow_exp);
-        XGetScreenSaver(mDisplay, &timeout_save, &interval, &prefer_blank, &allow_exp);
+	int dummy, interval, prefer_blank, allow_exp;
+	XGetScreenSaver(mDisplay, &dummy, &interval, &prefer_blank, &allow_exp);
+	XSetScreenSaver(mDisplay, timeout_save, interval, prefer_blank, allow_exp);
+	XGetScreenSaver(mDisplay, &timeout_save, &interval, &prefer_blank, &allow_exp);
     }
 
 }
@@ -202,18 +200,20 @@ void saver_off(Display *mDisplay) {
 
     if (DPMSQueryExtension(mDisplay, &nothing, &nothing))
     {
-        BOOL onoff;
-        CARD16 state;
-        DPMSInfo(mDisplay, &state, &onoff);
-        if (onoff)
-        {
-            printf ("Disabling DPMS\n");
-            dpms_disabled=1;
-                DPMSDisable(mDisplay);  // monitor powersave off
-        }
+	BOOL onoff;
+	CARD16 state;
+	DPMSInfo(mDisplay, &state, &onoff);
+	if (onoff)
+	{
+	    printf ("Disabling DPMS\n");
+	    dpms_disabled=1;
+		DPMSDisable(mDisplay);  // monitor powersave off
+	}
     }
     XGetScreenSaver(mDisplay, &timeout_save, &interval, &prefer_blank, &allow_exp);
     if (timeout_save)
-        XSetScreenSaver(mDisplay, 0, interval, prefer_blank, allow_exp);
-                    // turning off screensaver
+	XSetScreenSaver(mDisplay, 0, interval, prefer_blank, allow_exp);
+		    // turning off screensaver
 }
+
+#endif