diff options
| author | Andrew Choi | 2003-11-01 19:58:03 +0000 |
|---|---|---|
| committer | Andrew Choi | 2003-11-01 19:58:03 +0000 |
| commit | 64d4923e0668305cf46eb881f8af4cc73427e8b0 (patch) | |
| tree | 14e828a45115896eb22a4f3c1c7b7147c8fc0d5b /src | |
| parent | be69f6a59adcd0b547a2590346a37900006bcbd0 (diff) | |
| download | emacs-64d4923e0668305cf46eb881f8af4cc73427e8b0.tar.gz emacs-64d4923e0668305cf46eb881f8af4cc73427e8b0.zip | |
macterm.c (XTread_socket): Handle menubar selection and grow window
only for mouseDown events.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/macterm.c | 24 |
2 files changed, 19 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 88399d1ae17..b2f44c8573a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2003-11-01 Andrew Choi <akochoi@shaw.ca> | ||
| 2 | |||
| 3 | * macterm.c (XTread_socket): Handle menubar selection and grow | ||
| 4 | window only for mouseDown events. | ||
| 5 | |||
| 1 | 2003-10-31 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | 6 | 2003-10-31 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * xterm.c (x_term_init): For GTK part, increase x_initialized | 8 | * xterm.c (x_term_init): For GTK part, increase x_initialized |
diff --git a/src/macterm.c b/src/macterm.c index 6fe2bc1603c..f0f5a3f4722 100644 --- a/src/macterm.c +++ b/src/macterm.c | |||
| @@ -7773,14 +7773,15 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) | |||
| 7773 | switch (part_code) | 7773 | switch (part_code) |
| 7774 | { | 7774 | { |
| 7775 | case inMenuBar: | 7775 | case inMenuBar: |
| 7776 | { | 7776 | if (er.what == mouseDown) |
| 7777 | struct frame *f = ((mac_output *) | 7777 | { |
| 7778 | GetWRefCon (FrontWindow ()))->mFP; | 7778 | struct frame *f = ((mac_output *) |
| 7779 | saved_menu_event_location = er.where; | 7779 | GetWRefCon (FrontWindow ()))->mFP; |
| 7780 | bufp->kind = MENU_BAR_ACTIVATE_EVENT; | 7780 | saved_menu_event_location = er.where; |
| 7781 | XSETFRAME (bufp->frame_or_window, f); | 7781 | bufp->kind = MENU_BAR_ACTIVATE_EVENT; |
| 7782 | count++; | 7782 | XSETFRAME (bufp->frame_or_window, f); |
| 7783 | } | 7783 | count++; |
| 7784 | } | ||
| 7784 | break; | 7785 | break; |
| 7785 | 7786 | ||
| 7786 | case inContent: | 7787 | case inContent: |
| @@ -7899,8 +7900,11 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) | |||
| 7899 | 7900 | ||
| 7900 | /* window resize handling added --ben */ | 7901 | /* window resize handling added --ben */ |
| 7901 | case inGrow: | 7902 | case inGrow: |
| 7902 | do_grow_window(window_ptr, &er); | 7903 | if (er.what == mouseDown) |
| 7903 | break; | 7904 | { |
| 7905 | do_grow_window(window_ptr, &er); | ||
| 7906 | break; | ||
| 7907 | } | ||
| 7904 | 7908 | ||
| 7905 | /* window zoom handling added --ben */ | 7909 | /* window zoom handling added --ben */ |
| 7906 | case inZoomIn: | 7910 | case inZoomIn: |