blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Cleanup: remove redundant NULL window checks handling events

This commit is contained in:
Campbell Barton 2021-03-05 21:30:16 +11:00
parent 6bc01222c6
commit 5668901ced
1 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
source/blender/windowmanager/intern/wm_event_system.c
View File

@ -2951,16 +2951,15 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
{
int action = wm_handlers_do_intern(C, event, handlers);
/* Fileread case. */
if (CTX_wm_window(C) == NULL) {
/* Will be NULL in the file read case. */
wmWindow *win = CTX_wm_window(C);
if (win == NULL) {
return action;
}
if (ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE)) {
/* Test for CLICK_DRAG events. */
if (wm_action_not_handled(action)) {
wmWindow *win = CTX_wm_window(C);
if (win->event_queue_check_drag) {
if (WM_event_drag_test(event, &event->prevclickx)) {
int x = event->x;
@ -2991,10 +2990,7 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
}
}
else {
wmWindow *win = CTX_wm_window(C);
if (win) {
win->event_queue_check_drag = false;
}
win->event_queue_check_drag = false;
}
}
else if (ISMOUSE_BUTTON(event->type) || ISKEYBOARD(event->type)) {
@ -3002,24 +2998,20 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
/* Test for CLICK events. */
if (wm_action_not_handled(action)) {
wmWindow *win = CTX_wm_window(C);
/* eventstate stores if previous event was a KM_PRESS, in case that
* wasn't handled, the KM_RELEASE will become a KM_CLICK */
if (win != NULL) {
if (event->val == KM_PRESS) {
if (event->prevval != KM_PRESS) {
win->event_queue_check_click = true;
win->event_queue_check_drag = true;
}
}
else if (event->val == KM_RELEASE) {
win->event_queue_check_drag = false;
if (event->val == KM_PRESS) {
if (event->prevval != KM_PRESS) {
win->event_queue_check_click = true;
win->event_queue_check_drag = true;
}
}
else if (event->val == KM_RELEASE) {
win->event_queue_check_drag = false;
}
if (win && event->prevtype == event->type) {
if (event->prevtype == event->type) {
if (event->val == KM_RELEASE) {
if (event->prevval == KM_PRESS) {
@ -3062,11 +3054,8 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
}
}
else {
wmWindow *win = CTX_wm_window(C);
if (win) {
win->event_queue_check_click = false;
win->event_queue_check_drag = false;
}
win->event_queue_check_click = false;
win->event_queue_check_drag = false;
}
}
else if (ISMOUSE_WHEEL(event->type) || ISMOUSE_GESTURE(event->type)) {
@ -3076,11 +3065,8 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
/* pass */
}
else {
wmWindow *win = CTX_wm_window(C);
if (win) {
if (ISKEYMODIFIER(event->prevtype)) {
win->event_queue_check_click = false;
}
if (ISKEYMODIFIER(event->prevtype)) {
win->event_queue_check_click = false;
}
}
}