prefixing and capitalization for the Frame->ObFrame struct and the Context->ObFrameCo...

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 11eacbd8ace0ebd5c8e78c3bf99ffcfe274ae5ef..7c5ab11fee2652427c12e6415f377ac38d7b7557 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -40,8 +40,8 @@ static void event_process(XEvent *e);
 static void event_handle_root(XEvent *e);
 static void event_handle_dock(Dock *s, XEvent *e);
 static void event_handle_dockapp(DockApp *app, XEvent *e);
-static void event_handle_client(Client *c, XEvent *e);
-static void event_handle_menu(Client *c, XEvent *e);
+static void event_handle_client(ObClient *c, XEvent *e);
+static void event_handle_menu(ObClient *c, XEvent *e);
 static void fd_event_handle();
 #ifdef USE_SM
 static void ice_watch(IceConn conn, IcePointer data, Bool opening,
@@ -320,7 +320,7 @@ static void event_hack_mods(XEvent *e)
     }
 }
 
-static gboolean event_ignore(XEvent *e, Client *client)
+static gboolean event_ignore(XEvent *e, ObClient *client)
 {
     switch(e->type) {
     case FocusIn:
@@ -467,7 +467,7 @@ static gboolean event_ignore(XEvent *e, Client *client)
 static void event_process(XEvent *e)
 {
     Window window;
-    Client *client = NULL;
+    ObClient *client = NULL;
     Dock *dock = NULL;
     DockApp *dockapp = NULL;
     Menu *menu = NULL;
@@ -607,7 +607,7 @@ static void event_handle_root(XEvent *e)
     }
 }
 
-static void event_handle_client(Client *client, XEvent *e)
+static void event_handle_client(ObClient *client, XEvent *e)
 {
     XEvent ce;
     Atom msgtype;
@@ -620,23 +620,23 @@ static void event_handle_client(Client *client, XEvent *e)
            is a waste of resources to go drawing it. */
         if (!(e->xbutton.button == 4 || e->xbutton.button == 5)) {
             switch (frame_context(client, e->xbutton.window)) {
-            case Context_Maximize:
+            case OB_FRAME_CONTEXT_MAXIMIZE:
                 client->frame->max_press = (e->type == ButtonPress);
                 framerender_frame(client->frame);
                 break;
-            case Context_Close:
+            case OB_FRAME_CONTEXT_CLOSE:
                 client->frame->close_press = (e->type == ButtonPress);
                 framerender_frame(client->frame);
                 break;
-            case Context_Iconify:
+            case OB_FRAME_CONTEXT_ICONIFY:
                 client->frame->iconify_press = (e->type == ButtonPress);
                 framerender_frame(client->frame);
                 break;
-            case Context_AllDesktops:
+            case OB_FRAME_CONTEXT_ALLDESKTOPS:
                 client->frame->desk_press = (e->type == ButtonPress);
                 framerender_frame(client->frame);
                 break; 
-            case Context_Shade:
+            case OB_FRAME_CONTEXT_SHADE:
                 client->frame->shade_press = (e->type == ButtonPress);
                 framerender_frame(client->frame);
                 break;
@@ -982,7 +982,7 @@ static void event_handle_client(Client *client, XEvent *e)
     }
 }
 
-static void event_handle_menu(Client *client, XEvent *e)
+static void event_handle_menu(ObClient *client, XEvent *e)
 {
     static MenuEntry *over = NULL;
     MenuEntry *entry;