summaryrefslogtreecommitdiff
path: root/src/client/screen.c
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2008-12-11 19:39:49 +0100
committerTomas Chvatal <scarabeus@gentoo.org>2008-12-11 19:39:49 +0100
commita83321436c8d40210bbbd0a44fe1290ed71638af (patch)
tree02004c36772311bdc1ba6b9a2508b20691cca5c6 /src/client/screen.c
parent3ba6105170ecac2fb124d9eb7e81ba72dd4700b8 (diff)
Revert "First pass for renaming screen/widget."
This reverts commit 3ba6105170ecac2fb124d9eb7e81ba72dd4700b8.
Diffstat (limited to 'src/client/screen.c')
-rw-r--r--src/client/screen.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/client/screen.c b/src/client/screen.c
index 453aae3..71d48d8 100644
--- a/src/client/screen.c
+++ b/src/client/screen.c
@@ -12,8 +12,8 @@
//#define DEBUG_TIME_DRAW
-static t *currentScreen;
-static t *futureScreen;
+static screen_t *currentScreen;
+static screen_t *futureScreen;
static list_t *listScreen;
@@ -24,10 +24,10 @@ bool_t isScreenInicialized()
return isScreenInit;
}
-t *newScreen(char *name, void (*fce_start) (), void (*fce_event) (),
+screen_t *newScreen(char *name, void (*fce_start) (), void (*fce_event) (),
void (*fce_draw) (), void (*fce_stop) ())
{
- t *new;
+ screen_t *new;
assert(name != NULL);
assert(fce_start != NULL);
@@ -35,7 +35,7 @@ t *newScreen(char *name, void (*fce_start) (), void (*fce_event) (),
assert(fce_draw != NULL);
assert(fce_stop != NULL);
- new = malloc(sizeof(t));
+ new = malloc(sizeof(screen_t));
new->name = strdup(name);
new->fce_start = fce_start;
new->fce_event = fce_event;
@@ -45,7 +45,7 @@ t *newScreen(char *name, void (*fce_start) (), void (*fce_event) (),
return new;
}
-void destroyScreen(t * p)
+void destroyScreen(screen_t * p)
{
assert(p != NULL);
@@ -53,7 +53,7 @@ void destroyScreen(t * p)
free(p);
}
-void registerScreen(t * p)
+void registerScreen(screen_t * p)
{
assert(p != NULL);
@@ -72,13 +72,13 @@ void initScreen()
isScreenInit = TRUE;
}
-static t *findScreen(char *name)
+static screen_t *findScreen(char *name)
{
- t *this;
+ screen_t *this;
int i;
for (i = 0; i < listScreen->count; i++) {
- this = (t *) (listScreen->list[i]);
+ this = (screen_t *) (listScreen->list[i]);
assert(this != NULL);
if (strcmp(name, this->name) == 0) {