From 5cf61ee02354c1c9f80c11f3796afc4b948055d6 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 13 Apr 2003 07:18:28 +0000 Subject: move the openbox engine into librender and the kernel. the theme is loaded and stored inside librender. the frame is decorated and managed inside the kernel. --- plugins/keyboard/keyboard.c | 2 ++ plugins/mouse/mouse.c | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins') diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c index 81809649..115c1182 100644 --- a/plugins/keyboard/keyboard.c +++ b/plugins/keyboard/keyboard.c @@ -116,6 +116,8 @@ static void event(ObEvent *e, void *foo) if (e->type == Event_X_KeyRelease) return; + g_assert(e->type == Event_X_KeyPress); + if (e->data.x.e->xkey.keycode == reset_key && e->data.x.e->xkey.state == reset_state) { reset_chains(); diff --git a/plugins/mouse/mouse.c b/plugins/mouse/mouse.c index 37c22bd8..b2173c25 100644 --- a/plugins/mouse/mouse.c +++ b/plugins/mouse/mouse.c @@ -3,9 +3,7 @@ #include "kernel/action.h" #include "kernel/event.h" #include "kernel/client.h" -#include "kernel/frame.h" #include "kernel/grab.h" -#include "kernel/engine.h" #include "kernel/parse.h" #include "kernel/frame.h" #include "translate.h" @@ -242,8 +240,8 @@ static void event(ObEvent *e, void *foo) button = e->data.x.e->xbutton.button; state = e->data.x.e->xbutton.state; } - context = engine_get_context(e->data.x.client, - e->data.x.e->xbutton.window); + context = frame_context(e->data.x.client->frame, + e->data.x.e->xbutton.window); fire_button(MouseAction_Press, context, e->data.x.client, e->data.x.e->xbutton.state, @@ -257,8 +255,8 @@ static void event(ObEvent *e, void *foo) break; case Event_X_ButtonRelease: - context = engine_get_context(e->data.x.client, - e->data.x.e->xbutton.window); + context = frame_context(e->data.x.client->frame, + e->data.x.e->xbutton.window); if (e->data.x.e->xbutton.button == button) { /* end drags */ if (drag_used) { @@ -316,8 +314,8 @@ static void event(ObEvent *e, void *foo) (ABS(dx) >= threshold || ABS(dy) >= threshold)) drag = TRUE; if (drag) { - context = engine_get_context(e->data.x.client, - e->data.x.e->xbutton.window); + context = frame_context(e->data.x.client->frame, + e->data.x.e->xbutton.window); drag_used = fire_motion(MouseAction_Motion, context, e->data.x.client, state, button, cx, cy, cw, ch, dx, dy, -- cgit v1.2.3