diff options
Diffstat (limited to 'matchbox/mb-wm-main-context.c')
-rw-r--r-- | matchbox/mb-wm-main-context.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/matchbox/mb-wm-main-context.c b/matchbox/mb-wm-main-context.c index 263991c..d9e7819 100644 --- a/matchbox/mb-wm-main-context.c +++ b/matchbox/mb-wm-main-context.c @@ -65,7 +65,7 @@ mb_wm_main_context_spin_xevent (MBWMMainContext *ctx); struct MBWMTimeOutEventInfo { int ms; - MBWindowManagerTimeOutFunc func; + MBWMManagerTimeOutFunc func; void *userdata; unsigned long id; struct timeval triggers; @@ -75,7 +75,7 @@ struct MBWMTimeOutEventInfo struct MBWMFdWatchInfo{ MBWMIOChannel *channel; MBWMIOCondition events; - MBWindowManagerFdWatchFunc func; + MBWMManagerFdWatchFunc func; void *userdata; unsigned long id; }; @@ -98,12 +98,12 @@ gboolean mb_wm_main_context_gloop_xevent (gpointer userdata) { MBWMMainContext * ctx = userdata; - MBWindowManager * wm = ctx->wm; + MBWMManager * wm = ctx->wm; while (mb_wm_main_context_spin_xevent (ctx)); if (wm->sync_type) - mb_wm_sync (wm); + mb_wm_manager_sync (wm); return TRUE; } @@ -113,7 +113,7 @@ static int mb_wm_main_context_init (MBWMObject *this, va_list vap) { MBWMMainContext *ctx = MB_WM_MAIN_CONTEXT (this); - MBWindowManager *wm = NULL; + MBWMManager *wm = NULL; MBWMObjectProp prop; prop = va_arg(vap, MBWMObjectProp); @@ -121,7 +121,7 @@ mb_wm_main_context_init (MBWMObject *this, va_list vap) { if (prop == MBWMObjectPropWm) { - wm = va_arg(vap, MBWindowManager *); + wm = va_arg(vap, MBWMManager *); break; } else @@ -156,7 +156,7 @@ mb_wm_main_context_class_type () } MBWMMainContext* -mb_wm_main_context_new (MBWindowManager *wm) +mb_wm_main_context_new (MBWMManager *wm) { MBWMMainContext *ctx; @@ -171,7 +171,7 @@ Bool mb_wm_main_context_handle_x_event (XEvent *xev, MBWMMainContext *ctx) { - MBWindowManager *wm = ctx->wm; + MBWMManager *wm = ctx->wm; GList *iter; Window xwin = xev->xany.window; @@ -181,7 +181,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, { MBWindowManagerClient *ev_client; - ev_client = mb_wm_managed_client_from_xwindow(wm, xev->xany.window); + ev_client = mb_wm_manager_managed_window_from_xwindow(wm, xev->xany.window); printf (" @ XEvent: '%s:%i' for %lx %s%s\n", xev->type < sizeof (MBWMDEBUGEvents)/sizeof(MBWMDEBUGEvents[0]) @@ -267,7 +267,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, if (msg_xwin == None || msg_xwin == xwin) { - if (!(MBWindowManagerMapRequestFunc)XE_ITER_GET_FUNC(iter) + if (!(MBWMManagerMapRequestFunc)XE_ITER_GET_FUNC(iter) ((XMapRequestEvent*)&xev->xmaprequest, XE_ITER_GET_DATA(iter))) break; @@ -286,7 +286,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, if (msg_xwin == None || msg_xwin == xwin) { - if (!(MBWindowManagerMapNotifyFunc)XE_ITER_GET_FUNC(iter) + if (!(MBWMManagerMapNotifyFunc)XE_ITER_GET_FUNC(iter) ((XMapEvent*)&xev->xmap, XE_ITER_GET_DATA(iter))) break; @@ -316,7 +316,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, if (msg_xwin == None || msg_xwin == xwin) { - if (!(MBWindowManagerUnmapNotifyFunc)XE_ITER_GET_FUNC(iter) + if (!(MBWMManagerUnmapNotifyFunc)XE_ITER_GET_FUNC(iter) ((XUnmapEvent*)&xev->xunmap, XE_ITER_GET_DATA(iter))) break; @@ -335,7 +335,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, if (msg_xwin == None || msg_xwin == xwin) { - if (!(MBWindowManagerDestroyNotifyFunc)XE_ITER_GET_FUNC(iter) + if (!(MBWMManagerDestroyNotifyFunc)XE_ITER_GET_FUNC(iter) ((XDestroyWindowEvent*)&xev->xdestroywindow, XE_ITER_GET_DATA(iter))) break; @@ -368,7 +368,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, if (msg_xwin == None || msg_xwin == xwin) { - if (!(MBWindowManagerConfigureNotifyFunc)XE_ITER_GET_FUNC(iter) + if (!(MBWMManagerConfigureNotifyFunc)XE_ITER_GET_FUNC(iter) ((XConfigureEvent*)&xev->xconfigure, XE_ITER_GET_DATA(iter))) break; @@ -401,7 +401,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, if (msg_xwin == None || msg_xwin == xwin) { - if (!(MBWindowManagerConfigureRequestFunc)XE_ITER_GET_FUNC(iter) + if (!(MBWMManagerConfigureRequestFunc)XE_ITER_GET_FUNC(iter) ((XConfigureRequestEvent*)&xev->xconfigurerequest, XE_ITER_GET_DATA(iter))) break; @@ -420,7 +420,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, if (msg_xwin == None || msg_xwin == xwin) { - if (!(MBWindowManagerKeyPressFunc)XE_ITER_GET_FUNC(iter) + if (!(MBWMManagerKeyPressFunc)XE_ITER_GET_FUNC(iter) ((XKeyEvent*)&xev->xkey, XE_ITER_GET_DATA(iter))) break; @@ -454,7 +454,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, if (msg_xwin == None || msg_xwin == xwin) { - if (!(MBWindowManagerPropertyNotifyFunc)XE_ITER_GET_FUNC(iter) + if (!(MBWMManagerPropertyNotifyFunc)XE_ITER_GET_FUNC(iter) ((XPropertyEvent*)&xev->xproperty, XE_ITER_GET_DATA(iter))) break; @@ -473,7 +473,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, if (msg_xwin == None || msg_xwin == xwin) { - if (!(MBWindowManagerButtonPressFunc)XE_ITER_GET_FUNC(iter) + if (!(MBWMManagerButtonPressFunc)XE_ITER_GET_FUNC(iter) ((XButtonEvent*)&xev->xbutton, XE_ITER_GET_DATA(iter))) break; @@ -492,7 +492,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, if (msg_xwin == None || msg_xwin == xwin) { - if (!(MBWindowManagerButtonReleaseFunc)XE_ITER_GET_FUNC(iter) + if (!(MBWMManagerButtonReleaseFunc)XE_ITER_GET_FUNC(iter) ((XButtonEvent*)&xev->xbutton, XE_ITER_GET_DATA(iter))) break; @@ -511,7 +511,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, if (msg_xwin == None || msg_xwin == xwin) { - if (!(MBWindowManagerMotionNotifyFunc)XE_ITER_GET_FUNC(iter) + if (!(MBWMManagerMotionNotifyFunc)XE_ITER_GET_FUNC(iter) ((XMotionEvent*)&xev->xmotion, XE_ITER_GET_DATA(iter))) break; @@ -528,7 +528,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, static Bool mb_wm_main_context_spin_xevent (MBWMMainContext *ctx) { - MBWindowManager * wm = ctx->wm; + MBWMManager * wm = ctx->wm; XEvent xev; if (!XEventsQueued (wm->xdpy, QueuedAfterFlush)) @@ -544,7 +544,7 @@ mb_wm_main_context_spin_xevent (MBWMMainContext *ctx) static Bool mb_wm_main_context_spin_xevent_blocking (MBWMMainContext *ctx) { - MBWindowManager * wm = ctx->wm; + MBWMManager * wm = ctx->wm; XEvent xev; XNextEvent(wm->xdpy, &xev); @@ -558,7 +558,7 @@ void mb_wm_main_context_loop (MBWMMainContext *ctx) { #if ! USE_GLIB_MAINLOOP - MBWindowManager * wm = ctx->wm; + MBWMManager * wm = ctx->wm; while (True) { @@ -581,7 +581,7 @@ mb_wm_main_context_loop (MBWMMainContext *ctx) } if (wm->sync_type) - mb_wm_sync (wm); + mb_wm_manager_sync (wm); } #endif } @@ -608,7 +608,7 @@ mb_wm_main_context_x_event_handler_add (MBWMMainContext *ctx, static unsigned long ids = 0; MBWMXEventFuncInfo * func_info; #if ENABLE_COMPOSITE - MBWindowManager * wm = ctx->wm; + MBWMManager * wm = ctx->wm; #endif ++ids; @@ -696,7 +696,7 @@ mb_wm_main_context_x_event_handler_remove (MBWMMainContext *ctx, GList **l_start; #if ENABLE_COMPOSITE - MBWindowManager * wm = ctx->wm; + MBWMManager * wm = ctx->wm; if (type == wm->damage_event_base + XDamageNotify) { @@ -852,7 +852,7 @@ mb_wm_main_context_check_timeouts (MBWMMainContext *ctx) unsigned long mb_wm_main_context_timeout_handler_add (MBWMMainContext *ctx, int ms, - MBWindowManagerTimeOutFunc func, + MBWMManagerTimeOutFunc func, void *userdata) { #if ! USE_GLIB_MAINLOOP @@ -911,7 +911,7 @@ unsigned long mb_wm_main_context_fd_watch_add (MBWMMainContext *ctx, MBWMIOChannel *channel, MBWMIOCondition events, - MBWindowManagerFdWatchFunc func, + MBWMManagerFdWatchFunc func, void *userdata) { #if ! USE_GLIB_MAINLOOP |