summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Choi <akochoi@shaw.ca>2003-11-01 19:58:03 +0000
committerAndrew Choi <akochoi@shaw.ca>2003-11-01 19:58:03 +0000
commit64d4923e0668305cf46eb881f8af4cc73427e8b0 (patch)
tree14e828a45115896eb22a4f3c1c7b7147c8fc0d5b
parentbe69f6a59adcd0b547a2590346a37900006bcbd0 (diff)
downloademacs-64d4923e0668305cf46eb881f8af4cc73427e8b0.tar.gz
macterm.c (XTread_socket): Handle menubar selection and grow window
only for mouseDown events.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/macterm.c24
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 @@
+2003-11-01 Andrew Choi <akochoi@shaw.ca>
+
+ * macterm.c (XTread_socket): Handle menubar selection and grow
+ window only for mouseDown events.
+
2003-10-31 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* 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)
switch (part_code)
{
case inMenuBar:
- {
- struct frame *f = ((mac_output *)
- GetWRefCon (FrontWindow ()))->mFP;
- saved_menu_event_location = er.where;
- bufp->kind = MENU_BAR_ACTIVATE_EVENT;
- XSETFRAME (bufp->frame_or_window, f);
- count++;
- }
+ if (er.what == mouseDown)
+ {
+ struct frame *f = ((mac_output *)
+ GetWRefCon (FrontWindow ()))->mFP;
+ saved_menu_event_location = er.where;
+ bufp->kind = MENU_BAR_ACTIVATE_EVENT;
+ XSETFRAME (bufp->frame_or_window, f);
+ count++;
+ }
break;
case inContent:
@@ -7899,8 +7900,11 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
/* window resize handling added --ben */
case inGrow:
- do_grow_window(window_ptr, &er);
- break;
+ if (er.what == mouseDown)
+ {
+ do_grow_window(window_ptr, &er);
+ break;
+ }
/* window zoom handling added --ben */
case inZoomIn: