He drank much whisky and when he was drunk always talked about the great masterpiece he was going to paint.
I think the sentence will be
He drank much whisky and always talked about the great masterpiece he was going to paint when he was drunk.
This sentence is from ''The Last Leaf'' by O.Henry. What is the subject of the verb ''talked about''? Is the sentence used ''wh-movement''?