Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

style cleanup

Browse Source
This commit is contained in:
Campbell Barton
2012-09-08 08:59:47 +00:00
parent a9f10b6bc2
commit 1a7eb3454e
20 changed files with 382 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/ghost/intern/GHOST_C-api.cpp
View File

@@ -529,7 +529,10 @@ char *GHOST_GetTitle(GHOST_WindowHandle windowhandle)
char *ctitle = (char *) malloc(title.Length() + 1);
if (ctitle == NULL) return NULL;
if (ctitle == NULL) {
return NULL;
}
strcpy(ctitle, title.Ptr());
return ctitle;

45
intern/ghost/test/multitest/EventToBuf.c
View File

@@ -203,33 +203,36 @@ void event_to_buf(GHOST_EventHandle evt, char buf[128])
void *data= GHOST_GetEventData(evt);
char *pos= buf;
pos+= sprintf(pos, "event: %6.2f, %16s", time, eventtype_to_string(type));
pos += sprintf(pos, "event: %6.2f, %16s", time, eventtype_to_string(type));
if (win) {
char *s= GHOST_GetTitle(win);
pos+= sprintf(pos, " - win: %s", s);
pos += sprintf(pos, " - win: %s", s);
free(s);
} else {
pos+= sprintf(pos, " - sys evt");
}
switch (type) {
case GHOST_kEventCursorMove: {
GHOST_TEventCursorData *cd= data;
pos+= sprintf(pos, " - pos: (%d, %d)", cd->x, cd->y);
break;
}
case GHOST_kEventButtonDown:
case GHOST_kEventButtonUp: {
GHOST_TEventButtonData *bd= data;
pos+= sprintf(pos, " - but: %d", bd->button);
break;
}
case GHOST_kEventKeyDown:
case GHOST_kEventKeyUp: {
GHOST_TEventKeyData *kd= data;
pos+= sprintf(pos, " - key: %s (%d)", keytype_to_string(kd->key), kd->key);
if (kd->ascii) pos+= sprintf(pos, " ascii: '%c' (%d)", kd->ascii, kd->ascii);
break;
}
case GHOST_kEventCursorMove:
{
GHOST_TEventCursorData *cd= data;
pos += sprintf(pos, " - pos: (%d, %d)", cd->x, cd->y);
break;
}
case GHOST_kEventButtonDown:
case GHOST_kEventButtonUp:
{
GHOST_TEventButtonData *bd= data;
pos += sprintf(pos, " - but: %d", bd->button);
break;
}
case GHOST_kEventKeyDown:
case GHOST_kEventKeyUp:
{
GHOST_TEventKeyData *kd= data;
pos += sprintf(pos, " - key: %s (%d)", keytype_to_string(kd->key), kd->key);
if (kd->ascii) pos+= sprintf(pos, " ascii: '%c' (%d)", kd->ascii, kd->ascii);
break;
}
}
}

24
intern/ghost/test/multitest/MultiTest.c
View File

@@ -267,7 +267,8 @@ static void mainwindow_handle(void *priv, GHOST_EventHandle evt)
mainwindow_log(mw, buf);
switch (type) {
case GHOST_kEventCursorMove: {
case GHOST_kEventCursorMove:
{
GHOST_TEventCursorData *cd = GHOST_GetEventData(evt);
int x, y;
GHOST_ScreenToClient(mw->win, cd->x, cd->y, &x, &y);
@@ -275,13 +276,15 @@ static void mainwindow_handle(void *priv, GHOST_EventHandle evt)
break;
}
case GHOST_kEventButtonDown:
case GHOST_kEventButtonUp: {
case GHOST_kEventButtonUp:
{
GHOST_TEventButtonData *bd = GHOST_GetEventData(evt);
mainwindow_do_button(mw, bd->button, (type == GHOST_kEventButtonDown));
break;
}
case GHOST_kEventKeyDown:
case GHOST_kEventKeyUp: {
case GHOST_kEventKeyUp:
{
GHOST_TEventKeyData *kd = GHOST_GetEventData(evt);
mainwindow_do_key(mw, kd->key, (type == GHOST_kEventKeyDown));
break;
@@ -541,7 +544,8 @@ static void loggerwindow_handle(void *priv, GHOST_EventHandle evt)
GHOST_TEventType type = GHOST_GetEventType(evt);
switch (type) {
case GHOST_kEventCursorMove: {
case GHOST_kEventCursorMove:
{
GHOST_TEventCursorData *cd = GHOST_GetEventData(evt);
int x, y;
GHOST_ScreenToClient(lw->win, cd->x, cd->y, &x, &y);
@@ -549,13 +553,15 @@ static void loggerwindow_handle(void *priv, GHOST_EventHandle evt)
break;
}
case GHOST_kEventButtonDown:
case GHOST_kEventButtonUp: {
case GHOST_kEventButtonUp:
{
GHOST_TEventButtonData *bd = GHOST_GetEventData(evt);
loggerwindow_do_button(lw, bd->button, (type == GHOST_kEventButtonDown));
break;
}
case GHOST_kEventKeyDown:
case GHOST_kEventKeyUp: {
case GHOST_kEventKeyUp:
{
GHOST_TEventKeyData *kd = GHOST_GetEventData(evt);
loggerwindow_do_key(lw, kd->key, (type == GHOST_kEventKeyDown));
break;
@@ -743,13 +749,15 @@ static void extrawindow_handle(void *priv, GHOST_EventHandle evt)
switch (type) {
case GHOST_kEventKeyDown:
case GHOST_kEventKeyUp: {
case GHOST_kEventKeyUp:
{
GHOST_TEventKeyData *kd = GHOST_GetEventData(evt);
extrawindow_do_key(ew, kd->key, (type == GHOST_kEventKeyDown));
break;
}
case GHOST_kEventCursorMove: {
case GHOST_kEventCursorMove:
{
extrawindow_spin_cursor(ew, GHOST_GetEventTime(evt));
break;
}