diff options
| author | Jan Djärv | 2013-12-19 08:38:08 +0100 |
|---|---|---|
| committer | Jan Djärv | 2013-12-19 08:38:08 +0100 |
| commit | 570c054a6f95000c040f319ab039808b15cd8533 (patch) | |
| tree | 02ba21bd287989ce23a1085d3bd36e54825c78bf /src | |
| parent | ce41edb426ccd6acc1c653d8a9a28aded9e9d594 (diff) | |
| download | emacs-570c054a6f95000c040f319ab039808b15cd8533.tar.gz emacs-570c054a6f95000c040f319ab039808b15cd8533.zip | |
Generate HORIZ_WHEEL_EVENT.
* nsterm.m (mouseDown:): Generate HORIZ_WHEEL_EVENT.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/nsterm.m | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index eaec5dd97dc..d6db5b30e0c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-12-19 Anders Lindgren <andlind@gmail.com> | ||
| 2 | |||
| 3 | * nsterm.m (mouseDown:): Generate HORIZ_WHEEL_EVENT. | ||
| 4 | |||
| 1 | 2013-12-18 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2013-12-18 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Minor fixes for recent openp changes. | 7 | Minor fixes for recent openp changes. |
diff --git a/src/nsterm.m b/src/nsterm.m index 733c05ae53a..99c061d16bc 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -5498,8 +5498,18 @@ not_in_argv (NSString *arg) | |||
| 5498 | CGFloat delta = [theEvent deltaY]; | 5498 | CGFloat delta = [theEvent deltaY]; |
| 5499 | /* Mac notebooks send wheel events w/delta =0 when trackpad scrolling */ | 5499 | /* Mac notebooks send wheel events w/delta =0 when trackpad scrolling */ |
| 5500 | if (delta == 0) | 5500 | if (delta == 0) |
| 5501 | return; | 5501 | { |
| 5502 | emacs_event->kind = WHEEL_EVENT; | 5502 | delta = [theEvent deltaX]; |
| 5503 | if (delta == 0) | ||
| 5504 | { | ||
| 5505 | NSTRACE (deltaIsZero); | ||
| 5506 | return; | ||
| 5507 | } | ||
| 5508 | emacs_event->kind = HORIZ_WHEEL_EVENT; | ||
| 5509 | } | ||
| 5510 | else | ||
| 5511 | emacs_event->kind = WHEEL_EVENT; | ||
| 5512 | |||
| 5503 | emacs_event->code = 0; | 5513 | emacs_event->code = 0; |
| 5504 | emacs_event->modifiers = EV_MODIFIERS (theEvent) | | 5514 | emacs_event->modifiers = EV_MODIFIERS (theEvent) | |
| 5505 | ((delta > 0) ? up_modifier : down_modifier); | 5515 | ((delta > 0) ? up_modifier : down_modifier); |