Content, to me, is a neutral term. A lack of wants or needs plaguing me.

Happiness occurs when I am moved beyond that, by something which touches me positively. Playing a computer game, talking with friends, chasing my nephew around the garden, laughing at some silly thing with my wife. All of these are actively positive, beyond simple contentedness.