I know there's an option to require a password upon waking from sleep and the screen saver. Is it possible to just have OS X prompt me for my password when I wake it from sleep and not from the screen saver?
I think you can do it, but it'll take a little work. You can use a utility called sleepwatcher to run a script when your machine wakes up and sleeps. The script can turn the password for the screensaver on and off.