comparison src/frame-x.c @ 207:e45d5e7c476e r20-4b2

Import from CVS: tag r20-4b2
author cvs
date Mon, 13 Aug 2007 10:03:52 +0200
parents acd284d43ca1
children 41ff10fd062f
comparison
equal deleted inserted replaced
206:d3e9274cbc4e 207:e45d5e7c476e
1261 x_event.xbutton.y = lisp_event->event.button.y; 1261 x_event.xbutton.y = lisp_event->event.button.y;
1262 x_event.xbutton.x_root = lisp_event->event.button.x; /* this is wrong */ 1262 x_event.xbutton.x_root = lisp_event->event.button.x; /* this is wrong */
1263 x_event.xbutton.y_root = lisp_event->event.button.y; 1263 x_event.xbutton.y_root = lisp_event->event.button.y;
1264 1264
1265 modifier = lisp_event->event.button.modifiers; 1265 modifier = lisp_event->event.button.modifiers;
1266 if (modifier && MOD_SHIFT) state |= ShiftMask; 1266 if (modifier & MOD_SHIFT) state |= ShiftMask;
1267 if (modifier && MOD_CONTROL) state |= ControlMask; 1267 if (modifier & MOD_CONTROL) state |= ControlMask;
1268 if (modifier && MOD_META) state |= xd->MetaMask; 1268 if (modifier & MOD_META) state |= xd->MetaMask;
1269 if (modifier && MOD_SUPER) state |= xd->SuperMask; 1269 if (modifier & MOD_SUPER) state |= xd->SuperMask;
1270 if (modifier && MOD_HYPER) state |= xd->HyperMask; 1270 if (modifier & MOD_HYPER) state |= xd->HyperMask;
1271 if (modifier && MOD_ALT) state |= xd->AltMask; 1271 if (modifier & MOD_ALT) state |= xd->AltMask;
1272 state |= (Button1Mask << (lisp_event->event.button.button-1)); 1272 state |= Button1Mask << (lisp_event->event.button.button-1);
1273 1273
1274 x_event.xbutton.state = state; 1274 x_event.xbutton.state = state;
1275 x_event.xbutton.button = lisp_event->event.button.button; 1275 x_event.xbutton.button = lisp_event->event.button.button;
1276 x_event.xkey.same_screen = True; 1276 x_event.xkey.same_screen = True;
1277 1277