Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-09-08 12:59:47 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-09-08 12:59:47 +0400
commit1a7eb3454eb887d9639c435ac0a6f1bd50c9b2bf (patch)
tree0db1d31cd18bd19da3b6ad5704142b8af114a190 /source/blender/windowmanager/intern
parenta9f10b6bc2fb55be26ae3a7e8b1467213678a0f6 (diff)
style cleanup
Diffstat (limited to 'source/blender/windowmanager/intern')
-rw-r--r--source/blender/windowmanager/intern/wm_event_system.c28
-rw-r--r--source/blender/windowmanager/intern/wm_window.c9
2 files changed, 24 insertions, 13 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index dee9d036891..17f17baba0e 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2708,7 +2708,8 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
switch (type) {
/* mouse move */
- case GHOST_kEventCursorMove: {
+ case GHOST_kEventCursorMove:
+ {
if (win->active) {
GHOST_TEventCursorData *cd = customdata;
wmEvent *lastevent = win->queue.last;
@@ -2751,7 +2752,8 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
}
break;
}
- case GHOST_kEventTrackpad: {
+ case GHOST_kEventTrackpad:
+ {
GHOST_TEventTrackpadData *pd = customdata;
switch (pd->subtype) {
case GHOST_kTrackpadEventMagnify:
@@ -2783,7 +2785,8 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
}
/* mouse button */
case GHOST_kEventButtonDown:
- case GHOST_kEventButtonUp: {
+ case GHOST_kEventButtonUp:
+ {
GHOST_TEventButtonData *bd = customdata;
event.val = (type == GHOST_kEventButtonDown) ? KM_PRESS : KM_RELEASE;
@@ -2831,7 +2834,8 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
}
/* keyboard */
case GHOST_kEventKeyDown:
- case GHOST_kEventKeyUp: {
+ case GHOST_kEventKeyUp:
+ {
GHOST_TEventKeyData *kd = customdata;
event.type = convert_key(kd->key);
event.ascii = kd->ascii;
@@ -2915,7 +2919,8 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
break;
}
- case GHOST_kEventWheel: {
+ case GHOST_kEventWheel:
+ {
GHOST_TEventWheelData *wheelData = customdata;
if (wheelData->z > 0)
@@ -2928,7 +2933,8 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
break;
}
- case GHOST_kEventTimer: {
+ case GHOST_kEventTimer:
+ {
event.type = TIMER;
event.custom = EVT_DATA_TIMER;
event.customdata = customdata;
@@ -2937,7 +2943,8 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
break;
}
- case GHOST_kEventNDOFMotion: {
+ case GHOST_kEventNDOFMotion:
+ {
event.type = NDOF_MOTION;
attach_ndof_data(&event, customdata);
wm_event_add(win, &event);
@@ -2947,7 +2954,8 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
break;
}
- case GHOST_kEventNDOFButton: {
+ case GHOST_kEventNDOFButton:
+ {
GHOST_TEventNDOFButtonData *e = customdata;
event.type = NDOF_BUTTON_NONE + e->button;
@@ -2973,12 +2981,12 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
case GHOST_kNumEventTypes:
break;
- case GHOST_kEventWindowDeactivate: {
+ case GHOST_kEventWindowDeactivate:
+ {
event.type = WINDEACTIVATE;
wm_event_add(win, &event);
break;
-
}
}
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index b83b93454e6..59c8235faf0 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -724,11 +724,13 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr C_void_ptr
break;
}
- case GHOST_kEventWindowClose: {
+ case GHOST_kEventWindowClose:
+ {
wm_window_close(C, wm, win);
break;
}
- case GHOST_kEventWindowUpdate: {
+ case GHOST_kEventWindowUpdate:
+ {
if (G.debug & G_DEBUG_EVENTS) {
printf("%s: ghost redraw %d\n", __func__, win->winid);
}
@@ -739,7 +741,8 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr C_void_ptr
break;
}
case GHOST_kEventWindowSize:
- case GHOST_kEventWindowMove: {
+ case GHOST_kEventWindowMove:
+ {
GHOST_TWindowState state;
state = GHOST_GetWindowState(win->ghostwin);
win->windowstate = state;