Skip to content

Commit d2e8e72

Browse files
committed
Some formatting changes.
1 parent b6e74d1 commit d2e8e72

File tree

1 file changed

+23
-19
lines changed

1 file changed

+23
-19
lines changed

src_c/_event.c

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,11 @@ _pg_unicode_from_event(SDL_Event *event)
187187
int capitalize = (capsheld && !shiftheld) || (shiftheld && !capsheld);
188188

189189
#if SDL_VERSION_ATLEAST(3, 0, 0)
190-
if (event->key.mod & KMOD_CTRL) {
190+
if (event->key.mod & KMOD_CTRL)
191191
#else
192-
if (event->key.keysym.mod & KMOD_CTRL) {
192+
if (event->key.keysym.mod & KMOD_CTRL)
193193
#endif
194+
{
194195
/* Control Key held, send control-key related unicode. */
195196
if (key >= SDLK_a && key <= SDLK_z)
196197
return key - SDLK_a + 1;
@@ -312,10 +313,11 @@ _pg_get_event_unicode(SDL_Event *event)
312313
int i;
313314
for (i = 0; i < MAX_SCAN_UNICODE; i++) {
314315
#if SDL_VERSION_ATLEAST(3, 0, 0)
315-
if (scanunicode[i].key == event->key.scancode) {
316+
if (scanunicode[i].key == event->key.scancode)
316317
#else
317-
if (scanunicode[i].key == event->key.keysym.scancode) {
318+
if (scanunicode[i].key == event->key.keysym.scancode)
318319
#endif
320+
{
319321
if (event->type == SDL_KEYUP) {
320322
/* mark the position as free real estate for other
321323
* events to occupy. */
@@ -531,12 +533,13 @@ pg_event_filter(void *_, SDL_Event *event)
531533
{
532534
/* DON'T filter SDL_WINDOWEVENTs here. If we delete events, they
533535
* won't be available to low-level SDL2 either.*/
536+
switch (
534537
#if SDL_VERSION_ATLEAST(3, 0, 0)
535-
switch (event->type)
538+
event->type
536539
#else
537-
switch (event->window.event)
540+
event->window.event
538541
#endif
539-
{
542+
) {
540543
case SDL_WINDOWEVENT_RESIZED:
541544
SDL_FilterEvents(_pg_remove_pending_VIDEORESIZE, &newevent);
542545

@@ -852,10 +855,11 @@ dict_or_obj_from_event(SDL_Event *event)
852855
break;
853856
case SDL_ACTIVEEVENT:
854857
#if SDL_VERSION_ATLEAST(3, 0, 0)
855-
switch (event->window.data2) {
858+
switch (event->window.data2)
856859
#else
857-
switch (event->window.event) {
860+
switch (event->window.event)
858861
#endif
862+
{
859863
case SDL_WINDOWEVENT_ENTER:
860864
gain = 1;
861865
state = SDL_APPMOUSEFOCUS;
@@ -1064,12 +1068,12 @@ dict_or_obj_from_event(SDL_Event *event)
10641068
PyFloat_FromDouble((double)event->wheel.preciseY));
10651069

10661070
#else /* ~SDL_VERSION_ATLEAST(2, 0, 18) */
1067-
/* fallback to regular x and y when SDL version used does not
1068-
* support precise fields */
1069-
_pg_insobj(dict, "precise_x",
1070-
PyFloat_FromDouble((double)event->wheel.x));
1071-
_pg_insobj(dict, "precise_y",
1072-
PyFloat_FromDouble((double)event->wheel.y));
1071+
/* fallback to regular x and y when SDL version used does not
1072+
* support precise fields */
1073+
_pg_insobj(dict, "precise_x",
1074+
PyFloat_FromDouble((double)event->wheel.x));
1075+
_pg_insobj(dict, "precise_y",
1076+
PyFloat_FromDouble((double)event->wheel.y));
10731077

10741078
#endif /* ~SDL_VERSION_ATLEAST(2, 0, 18) */
10751079
_pg_insobj(
@@ -1295,12 +1299,12 @@ dict_or_obj_from_event(SDL_Event *event)
12951299
}
12961300
PyObject *pgWindow;
12971301
#if SDL_VERSION_ATLEAST(3, 0, 0)
1298-
if (!window ||
1299-
!(pgWindow = SDL_GetPointerProperty(SDL_GetWindowProperties(window),
1300-
"pg_window", NULL))) {
1302+
if (!window || !(pgWindow = SDL_GetPointerProperty(
1303+
SDL_GetWindowProperties(window), "pg_window", NULL)))
13011304
#else
1302-
if (!window || !(pgWindow = SDL_GetWindowData(window, "pg_window"))) {
1305+
if (!window || !(pgWindow = SDL_GetWindowData(window, "pg_window")))
13031306
#endif
1307+
{
13041308
pgWindow = Py_None;
13051309
}
13061310
Py_INCREF(pgWindow);

0 commit comments

Comments
 (0)