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>2019-06-04 04:30:31 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-06-04 04:30:31 +0300
commit935c9ab0de1ce3d36f93ce5aeee5d0f82d6f2591 (patch)
treea735f6c42044b6d7df3ce538468f6fcaff5e343a /intern/ghost/test/multitest
parent0dbd05ffdd52c62c055fa68ab42061831a71b1ee (diff)
Cleanup: Cleanup: style, use braces for GHOST (X11/SDL)
Diffstat (limited to 'intern/ghost/test/multitest')
-rw-r--r--intern/ghost/test/multitest/EventToBuf.c3
-rw-r--r--intern/ghost/test/multitest/MultiTest.c45
2 files changed, 32 insertions, 16 deletions
diff --git a/intern/ghost/test/multitest/EventToBuf.c b/intern/ghost/test/multitest/EventToBuf.c
index 5aee8a50a8d..0829169260d 100644
--- a/intern/ghost/test/multitest/EventToBuf.c
+++ b/intern/ghost/test/multitest/EventToBuf.c
@@ -234,8 +234,9 @@ void event_to_buf(GHOST_EventHandle evt, char buf[128])
case GHOST_kEventKeyUp: {
GHOST_TEventKeyData *kd = data;
pos += sprintf(pos, " - key: %s (%d)", keytype_to_string(kd->key), kd->key);
- if (kd->ascii)
+ if (kd->ascii) {
pos += sprintf(pos, " ascii: '%c' (%d)", kd->ascii, kd->ascii);
+ }
break;
}
}
diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c
index 25e9f6b2bf1..504a11b5aa3 100644
--- a/intern/ghost/test/multitest/MultiTest.c
+++ b/intern/ghost/test/multitest/MultiTest.c
@@ -84,10 +84,12 @@ void rect_bevel_side(int rect[2][2], int side, float *lt, float *dk, const float
int x = (corner == 0 || corner == 1) ? (rect[0][0] + i) : (rect[1][0] - i - 1);
int y = (corner == 0 || corner == 3) ? (rect[0][1] + i) : (rect[1][1] - i - 1);
- if (ltidx == corner)
+ if (ltidx == corner) {
glColor3f(col[0] * ltf, col[1] * ltf, col[2] * ltf);
- if (dkidx == corner)
+ }
+ if (dkidx == corner) {
glColor3f(col[0] * dkf, col[1] * dkf, col[2] * dkf);
+ }
glVertex2i(lx, ly);
glVertex2i(lx = x, ly = y);
@@ -183,37 +185,44 @@ static void mainwindow_do_key(MainWindow *mw, GHOST_TKey key, int press)
{
switch (key) {
case GHOST_kKeyC:
- if (press)
+ if (press) {
GHOST_SetCursorShape(mw->win,
(GHOST_TStandardCursor)(rand() % (GHOST_kStandardCursorNumCursors)));
+ }
break;
case GHOST_kKeyLeftBracket:
- if (press)
+ if (press) {
GHOST_SetCursorVisibility(mw->win, 0);
+ }
break;
case GHOST_kKeyRightBracket:
- if (press)
+ if (press) {
GHOST_SetCursorVisibility(mw->win, 1);
+ }
break;
case GHOST_kKeyE:
- if (press)
+ if (press) {
multitestapp_toggle_extra_window(mw->app);
+ }
break;
case GHOST_kKeyQ:
- if (press)
+ if (press) {
multitestapp_exit(mw->app);
+ }
break;
case GHOST_kKeyT:
- if (press)
+ if (press) {
mainwindow_log(mw, "TextTest~|`hello`\"world\",<>/");
+ }
break;
case GHOST_kKeyR:
if (press) {
int i;
mainwindow_log(mw, "Invalidating window 10 times");
- for (i = 0; i < 10; i++)
+ for (i = 0; i < 10; i++) {
GHOST_InvalidateWindow(mw->win);
+ }
}
break;
case GHOST_kKeyF11:
@@ -529,8 +538,9 @@ static void loggerwindow_do_key(LoggerWindow *lw, GHOST_TKey key, int press)
{
switch (key) {
case GHOST_kKeyQ:
- if (press)
+ if (press) {
multitestapp_exit(lw->app);
+ }
break;
}
}
@@ -700,8 +710,9 @@ static void extrawindow_do_key(ExtraWindow *ew, GHOST_TKey key, int press)
{
switch (key) {
case GHOST_kKeyE:
- if (press)
+ if (press) {
multitestapp_toggle_extra_window(ew->app);
+ }
break;
}
}
@@ -871,19 +882,23 @@ MultiTestApp *multitestapp_new(void)
GHOST_EventConsumerHandle consumer = GHOST_CreateEventConsumer(multitest_event_handler, app);
app->sys = GHOST_CreateSystem();
- if (!app->sys)
+ if (!app->sys) {
fatal("Unable to create ghost system");
+ }
- if (!GHOST_AddEventConsumer(app->sys, consumer))
+ if (!GHOST_AddEventConsumer(app->sys, consumer)) {
fatal("Unable to add multitest event consumer ");
+ }
app->main = mainwindow_new(app);
- if (!app->main)
+ if (!app->main) {
fatal("Unable to create main window");
+ }
app->logger = loggerwindow_new(app);
- if (!app->logger)
+ if (!app->logger) {
fatal("Unable to create logger window");
+ }
app->extra = NULL;
app->exit = 0;