libxcwm: Replaced event type defines with enum.

Also removed xcwm_context_t from xcwm_event_t and accessor functions.
Context available through window.

Signed-off-by: Jess VanDerwalker <washu@sonic.net>

Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>

3 files changed, 18 insertions, 30 deletions

diff --git a/include/xcwm/event.h b/include/xcwm/event.h
index a280c43..22255f2 100644
--- a/include/xcwm/event.h
+++ b/include/xcwm/event.h
@@ -37,24 +37,20 @@ typedef struct xcwm_event_t xcwm_event_t;
 typedef void (*xcwm_event_cb_t)(xcwm_event_t const *event);
 
 /* Event types */
-#define XTOQ_DAMAGE  0
-#define XTOQ_EXPOSE  1
-#define XTOQ_CREATE  2
-#define XTOQ_DESTROY 3
+typedef enum xcwm_event_type_t {
+    XCWM_EVENT_WINDOW_DAMAGE = 0,
+    XCWM_EVENT_WINDOW_EXPOSE,
+    XCWM_EVENT_WINDOW_CREATE,
+    XCWM_EVENT_WINDOW_DESTROY
+} xcwm_event_type_t;
 
 /**
  *  Return the event type for the given event.
  */
-int
+xcwm_event_type_t
 xcwm_event_get_type(xcwm_event_t const *event);
 
 /**
- * Return the context for the given event.
- */
-xcwm_context_t *
-xcwm_event_get_context(xcwm_event_t const *event);
-
-/**
  * Return the window for the given event.
  * @param event The event
  * @return The window connected to the event.
diff --git a/src/libxcwm/event_loop.c b/src/libxcwm/event_loop.c
index fe56e2f..cb3d2c1 100644
--- a/src/libxcwm/event_loop.c
+++ b/src/libxcwm/event_loop.c
@@ -34,9 +34,8 @@
 
 /* Definition of abstract data type for event */
 struct xcwm_event_t {
-    xcwm_context_t *context;
     xcwm_window_t *window;
-    int event_type;
+    xcwm_event_type_t event_type;
 };
 
 /* Locally used data structure */
@@ -134,7 +133,7 @@ run_event_loop(void *thread_arg_struct)
             xcwm_rect_t dmg_area;
 
             return_evt = malloc(sizeof(xcwm_event_t));
-            return_evt->event_type = XTOQ_DAMAGE;
+            return_evt->event_type = XCWM_EVENT_WINDOW_DAMAGE;
             return_evt->window =
                 _xcwm_get_window_node_by_window_id(dmgevnt->drawable);
             if (!return_evt->window) {
@@ -237,7 +236,7 @@ run_event_loop(void *thread_arg_struct)
                        exevnt->height);
 
                 return_evt = malloc(sizeof(xcwm_event_t));
-                return_evt->event_type = XTOQ_EXPOSE;
+                return_evt->event_type = XCWM_EVENT_WINDOW_EXPOSE;
                 callback_ptr(return_evt);
                 break;
             }
@@ -263,7 +262,7 @@ run_event_loop(void *thread_arg_struct)
                 }
 
                 return_evt = malloc(sizeof(xcwm_event_t));
-                return_evt->event_type = XTOQ_DESTROY;
+                return_evt->event_type = XCWM_EVENT_WINDOW_DESTROY;
                 return_evt->window = window;
 
                 callback_ptr(return_evt);
@@ -286,7 +285,7 @@ run_event_loop(void *thread_arg_struct)
                     free(return_evt);
                     break;
                 }
-                return_evt->event_type = XTOQ_CREATE;
+                return_evt->event_type = XCWM_EVENT_WINDOW_CREATE;
                 callback_ptr(return_evt);
                 break;
             }
@@ -304,7 +303,7 @@ run_event_loop(void *thread_arg_struct)
                     break;
                 }
                 _xcwm_map_window(event_conn, return_evt->window);
-                return_evt->event_type = XTOQ_CREATE;
+                return_evt->event_type = XCWM_EVENT_WINDOW_CREATE;
                 callback_ptr(return_evt);
                 break;
             }
@@ -323,7 +322,7 @@ run_event_loop(void *thread_arg_struct)
                 }
 
                 return_evt = malloc(sizeof(xcwm_event_t));
-                return_evt->event_type = XTOQ_DESTROY;
+                return_evt->event_type = XCWM_EVENT_WINDOW_DESTROY;
                 return_evt->window = window;
 
                 callback_ptr(return_evt);
@@ -406,19 +405,12 @@ run_event_loop(void *thread_arg_struct)
     return NULL;
 }
 
-int
+xcwm_event_type_t
 xcwm_event_get_type(xcwm_event_t const *event)
 {
     return event->event_type;
 }
 
-/* FIXME: Do we still need a context in the event? Probably not... */
-xcwm_context_t *
-xcwm_event_get_context(xcwm_event_t const *event)
-{
-    return event->context;
-}
-
 xcwm_window_t *
 xcwm_event_get_window(xcwm_event_t const *event)
 {
diff --git a/src/xtoq/XtoqController.m b/src/xtoq/XtoqController.m
index 00d2ba5..67f833f 100644
--- a/src/xtoq/XtoqController.m
+++ b/src/xtoq/XtoqController.m
@@ -579,14 +579,14 @@ void
 eventHandler(xcwm_event_t *event)
 {
     xcwm_window_t *window = xcwm_event_get_window(event);
-    if (xcwm_event_get_type(event) == XTOQ_DAMAGE) {
+    if (xcwm_event_get_type(event) == XCWM_EVENT_WINDOW_DAMAGE) {
         [referenceToSelf updateImage: window];
     }
-    else if (xcwm_event_get_type(event) == XTOQ_CREATE) {
+    else if (xcwm_event_get_type(event) == XCWM_EVENT_WINDOW_CREATE) {
         NSLog(@"Window was created");
         [referenceToSelf createNewWindow: window];
     }
-    else if (xcwm_event_get_type(event) == XTOQ_DESTROY) {
+    else if (xcwm_event_get_type(event) == XCWM_EVENT_WINDOW_DESTROY) {
         NSLog(@"Window was destroyed");
         [referenceToSelf destroyWindow: window];
     }