From 1e7c3fd2ff156b635b6de62e2bb1b9ad9b70610b Mon Sep 17 00:00:00 2001 From: alberth Date: Sun, 16 Jan 2011 11:39:09 +0000 Subject: (svn r21820) -Codechange: Concatenate both functions. --- src/window.cpp | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/window.cpp b/src/window.cpp index caa936cb3..88a0878f6 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -1424,15 +1424,15 @@ static void HandlePlacePresize() } /** - * Handle dragging in mouse dragging mode (#WSM_DRAGDROP). + * Handle dragging and dropping in mouse dragging mode (#WSM_DRAGDROP). * @return State of handling the event. */ -static EventState HandleMouseDrag() +static EventState HandleMouseDragDrop() { Window *w; - if (_special_mouse_mode != WSM_DRAGDROP) return ES_NOT_HANDLED; - if (!_left_button_down || (_cursor.delta.x == 0 && _cursor.delta.y == 0)) return ES_NOT_HANDLED; + if (_special_mouse_mode != WSM_DRAGDROP) goto handle_dragdop; + if (!_left_button_down || (_cursor.delta.x == 0 && _cursor.delta.y == 0)) goto handle_dragdop; w = _thd.GetCallbackWnd(); @@ -1445,18 +1445,12 @@ static EventState HandleMouseDrag() } return ES_HANDLED; -} -/** - * Handle drop in mouse dragging mode (#WSM_DRAGDROP). - * @return State of handling the event. - */ -static EventState HandleDragDrop() -{ +handle_dragdop: if (_special_mouse_mode != WSM_DRAGDROP) return ES_NOT_HANDLED; if (_left_button_down) return ES_HANDLED; - Window *w = _thd.GetCallbackWnd(); + w = _thd.GetCallbackWnd(); if (w != NULL) { /* send an event in client coordinates. */ @@ -2178,8 +2172,7 @@ static void MouseLoop(MouseClick click, int mousewheel) UpdateTileSelection(); if (VpHandlePlaceSizingDrag() == ES_HANDLED) return; - if (HandleMouseDrag() == ES_HANDLED) return; - if (HandleDragDrop() == ES_HANDLED) return; + if (HandleMouseDragDrop() == ES_HANDLED) return; if (HandleWindowDragging() == ES_HANDLED) return; if (HandleScrollbarScrolling() == ES_HANDLED) return; if (HandleViewportScroll() == ES_HANDLED) return; -- cgit v1.2.3-70-g09d2