comparison libvo/x11_common.c @ 12111:8e31aacc3e81

- win_gravity memorizing and restoring while switching fullscreen mode (by Adam Tla/lka) - recommited without cosmetic changes (by me)

12110:a34dc5a369ca

#define WIN_LAYER_ONTOP                  6
#define WIN_LAYER_ABOVE_DOCK             10
 
int fs_layer=WIN_LAYER_ABOVE_DOCK;
static int orig_layer=0;

int stop_xscreensaver=0;

static int dpms_disabled=0;
static int timeout_save=0;

//          fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",vo_window,name,Event.xproperty.atom );
	      
	    XFree( name );
	   }
	   break;
     }
  }
  return ret;
}

     (vo_dwidth==vo_screenwidth && vo_dwidth!=vo_old_width) &&
     (vo_dheight==vo_screenheight && vo_dheight!=vo_old_height) ) return;
   vo_fs=VO_TRUE;
   vo_old_x=vo_dx; vo_old_y=vo_dy; vo_old_width=vo_dwidth; vo_old_height=vo_dheight;
   x=0; y=0; w=vo_screenwidth; h=vo_screenheight;
 }
 vo_x11_decoration( mDisplay,vo_window,(vo_fs) ? 0 : 1 );
 vo_x11_sizehint( x,y,w,h,0 );
 vo_x11_setlayer( mDisplay,vo_window,vo_fs );

12111:8e31aacc3e81

#define WIN_LAYER_ONTOP                  6
#define WIN_LAYER_ABOVE_DOCK             10
 
int fs_layer=WIN_LAYER_ABOVE_DOCK;
static int orig_layer=0;
static int old_gravity = NorthWestGravity;

int stop_xscreensaver=0;

static int dpms_disabled=0;
static int timeout_save=0;

//          fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",vo_window,name,Event.xproperty.atom );
	      
	    XFree( name );
	   }
	   break;
      case MapNotify:
		vo_hint.win_gravity = old_gravity;
		XSetWMNormalHints( mDisplay,vo_window,&vo_hint );
	   break;
     }
  }
  return ret;
}

     (vo_dwidth==vo_screenwidth && vo_dwidth!=vo_old_width) &&
     (vo_dheight==vo_screenheight && vo_dheight!=vo_old_height) ) return;
   vo_fs=VO_TRUE;
   vo_old_x=vo_dx; vo_old_y=vo_dy; vo_old_width=vo_dwidth; vo_old_height=vo_dheight;
   x=0; y=0; w=vo_screenwidth; h=vo_screenheight;
 
 }
 {
	long dummy;
	XGetWMNormalHints(mDisplay, vo_window, &vo_hint, &dummy);
	if (!(vo_hint.flags & PWinGravity))
		old_gravity = NorthWestGravity;
	else
		old_gravity = vo_hint.win_gravity;
 }
 vo_x11_decoration( mDisplay,vo_window,(vo_fs) ? 0 : 1 );
 vo_x11_sizehint( x,y,w,h,0 );
 vo_x11_setlayer( mDisplay,vo_window,vo_fs );