From aa27686912550bcd2c681879a45da59e7f31a908 Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Fri, 5 Nov 1999 22:36:46 +0000
Subject: [PATCH] Fixed problems in menu scrolling caused by the patch sent by
 Swivel.

---
 src/event.c | 20 --------------------
 src/menu.c  |  5 -----
 2 files changed, 25 deletions(-)

diff --git a/src/event.c b/src/event.c
index eddd009a..f0aa940e 100644
--- a/src/event.c
+++ b/src/event.c
@@ -979,26 +979,6 @@ handleEnterNotify(XEvent *event)
 	}
     }
 
-/* start my fix scrolled menus */
-    if (wPreferences.scrollable_menus) {
-        if (scr->flags.jump_back_pending ||
-            event->xcrossing.x_root <= 1 ||
-            event->xcrossing.x_root >= (scr->scr_width - 2) ||
-            event->xcrossing.y_root <= 1 ||
-            event->xcrossing.y_root >= (scr->scr_height - 2)) {
-#ifdef DEBUG
-            L("pointer at screen edge in EnterNotify event, fear");
-#endif
-           menu = wMenuUnderPointer(scr);
-           if (menu!=NULL) {
-              	wMenuScroll(menu, event);
-		return;
-	   }
-        }
-    }
-/* end fix scrolled menus */
-
-
     if (XFindContext(dpy, event->xcrossing.window, wWinContext,
                      (XPointer *)&desc)!=XCNOENT) {
         if(desc->handle_enternotify)
diff --git a/src/menu.c b/src/menu.c
index c7761df2..0a22964d 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1792,12 +1792,7 @@ wMenuScroll(WMenu *menu, XEvent *event)
         WMNextEvent(dpy, &ev);
         switch (ev.type) {
 	 case EnterNotify:
-/*
-	this um causes a nasty crash ugly ugh i dont see *why* we do this,
-	everything seems fine without it. ( swivel )
             WMHandleEvent(&ev);
-*/
-		break;
 	 case MotionNotify:
             x = (ev.type==MotionNotify) ? ev.xmotion.x_root : ev.xcrossing.x_root;
             y = (ev.type==MotionNotify) ? ev.xmotion.y_root : ev.xcrossing.y_root;
-- 
2.11.4.GIT