diff options
| author | Miles Bader | 2006-05-02 05:51:52 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-05-02 05:51:52 +0000 |
| commit | fe682fb2f05fcbd9fcd2d12c2110719adcfcb58a (patch) | |
| tree | 2a89d2d9ea2689cfe80a7618885cdd9f449761dd /src/w32term.c | |
| parent | 7e635d0ed3c42e6e779821f5c0c1c62289f4c1ee (diff) | |
| parent | 6cf93749317c2e18f850cd0f47f905895e850bfc (diff) | |
| download | emacs-fe682fb2f05fcbd9fcd2d12c2110719adcfcb58a.tar.gz emacs-fe682fb2f05fcbd9fcd2d12c2110719adcfcb58a.zip | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-58
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 239-258)
- Update from CVS
- (Ffield_beginning, find_field): Undo change of 2006-04-23.
- Rcirc patch from Ryan Yeske
- Merge from gnus--rel--5.10
- Clean up lisp/gnus/ChangeLog a bit
* gnus--rel--5.10 (patch 91-98)
- Merge from emacs--devo--0
- Update from CVS
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/w32term.c b/src/w32term.c index 5681b6ee62f..305527946fb 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -3282,8 +3282,10 @@ construct_mouse_wheel (result, msg, f) | |||
| 3282 | result->modifiers = (msg->dwModifiers | 3282 | result->modifiers = (msg->dwModifiers |
| 3283 | | ((delta < 0 ) ? down_modifier : up_modifier)); | 3283 | | ((delta < 0 ) ? down_modifier : up_modifier)); |
| 3284 | 3284 | ||
| 3285 | p.x = LOWORD (msg->msg.lParam); | 3285 | /* With multiple monitors, we can legitimately get negative |
| 3286 | p.y = HIWORD (msg->msg.lParam); | 3286 | coordinates, so cast to short to interpret them correctly. */ |
| 3287 | p.x = (short) LOWORD (msg->msg.lParam); | ||
| 3288 | p.y = (short) HIWORD (msg->msg.lParam); | ||
| 3287 | ScreenToClient (msg->msg.hwnd, &p); | 3289 | ScreenToClient (msg->msg.hwnd, &p); |
| 3288 | XSETINT (result->x, p.x); | 3290 | XSETINT (result->x, p.x); |
| 3289 | XSETINT (result->y, p.y); | 3291 | XSETINT (result->y, p.y); |