Autogamy is self-pollination within the same flower.
Geitonogamy is the transfer of pollen from the anther of one flower to the stigma of another flower on the \textit{same plant}. Ecologically, this is cross-pollination because it involves a pollinating agent (like an insect or wind). However, genetically it is equivalent to autogamy because the pollen and the ovule come from the same parent plant.
Xenogamy is cross-pollination between flowers on different plants.
Cleistogamy refers to flowers that never open and are self-pollinated, not requiring a pollinator.