diff options
Diffstat (limited to 'matchbox/mb-wm-root-window.c')
-rw-r--r-- | matchbox/mb-wm-root-window.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/matchbox/mb-wm-root-window.c b/matchbox/mb-wm-root-window.c index 21b8617..3af19c2 100644 --- a/matchbox/mb-wm-root-window.c +++ b/matchbox/mb-wm-root-window.c @@ -55,7 +55,7 @@ static int mb_wm_root_window_init (MBWMObject *this, va_list vap) { MBWMRootWindow *root_window = MB_WM_ROOT_WINDOW (this); - MBWindowManager *wm; + MBWMManager *wm; MBWMObjectProp prop; XSetWindowAttributes attr; @@ -64,7 +64,7 @@ mb_wm_root_window_init (MBWMObject *this, va_list vap) { if (prop == MBWMObjectPropWm) { - wm = va_arg(vap, MBWindowManager *); + wm = va_arg(vap, MBWMManager *); break; } else @@ -118,7 +118,7 @@ mb_wm_root_window_class_type () } MBWMRootWindow* -mb_wm_root_window_get (MBWindowManager *wm) +mb_wm_root_window_get (MBWMManager *wm) { static MBWMRootWindow * root_window = NULL; @@ -139,7 +139,7 @@ static Bool mb_wm_root_window_init_attributes (MBWMRootWindow * win) { XSetWindowAttributes sattr; - MBWindowManager *wm = win->wm; + MBWMManager *wm = win->wm; sattr.event_mask = SubstructureRedirectMask |SubstructureNotifyMask @@ -168,7 +168,7 @@ mb_wm_root_window_init_attributes (MBWMRootWindow * win) void mb_wm_root_window_update_supported_props (MBWMRootWindow *win) { - MBWindowManager *wm = win->wm; + MBWMManager *wm = win->wm; Window rwin = win->xwindow; CARD32 num_supported = 0; @@ -249,7 +249,7 @@ mb_wm_root_window_update_supported_props (MBWMRootWindow *win) static void mb_wm_root_window_init_properties (MBWMRootWindow * win) { - MBWindowManager *wm = win->wm; + MBWMManager *wm = win->wm; Window rwin = win->xwindow; Window hwin = win->hidden_window; @@ -322,21 +322,21 @@ mb_wm_root_window_init_properties (MBWMRootWindow * win) int mb_wm_root_window_handle_message (MBWMRootWindow *win, XClientMessageEvent *e) { - MBWindowManager *wm = win->wm; + MBWMManager *wm = win->wm; MBWindowManagerClient *c = NULL; if (e->message_type == wm->atoms[MBWM_ATOM_NET_ACTIVE_WINDOW]) { Window xwin = e->window; - if ((c = mb_wm_managed_client_from_xwindow (wm, xwin)) != NULL) - mb_wm_activate_client (wm, c); + if ((c = mb_wm_manager_managed_window_from_xwindow (wm, xwin)) != NULL) + mb_wm_manager_activate_window (wm, c); return 1; } else if (e->message_type == wm->atoms[MBWM_ATOM_NET_CLOSE_WINDOW]) { - if ((c = mb_wm_managed_client_from_xwindow(wm, e->window)) != NULL) + if ((c = mb_wm_manager_managed_window_from_xwindow(wm, e->window)) != NULL) mb_wm_client_deliver_delete(c); return 1; @@ -344,8 +344,8 @@ mb_wm_root_window_handle_message (MBWMRootWindow *win, XClientMessageEvent *e) else if (e->message_type == wm->atoms[MBWM_ATOM_WM_PROTOCOLS] && e->data.l[0] == wm->atoms[MBWM_ATOM_NET_WM_PING]) { - if ((c = mb_wm_managed_client_from_xwindow(wm, e->data.l[2])) != NULL) - mb_wm_handle_ping_reply (wm, c); + if ((c = mb_wm_manager_managed_window_from_xwindow(wm, e->data.l[2])) != NULL) + mb_wm_manager_handle_ping_reply (wm, c); return 1; } else if (e->message_type == wm->atoms[MBWM_ATOM_NET_WM_STATE]) @@ -360,7 +360,7 @@ mb_wm_root_window_handle_message (MBWMRootWindow *win, XClientMessageEvent *e) state_op = MBWMClientWindowStateChangeToggle; if (e->data.l[1] == wm->atoms[MBWM_ATOM_NET_WM_STATE_FULLSCREEN] - && ((c = mb_wm_managed_client_from_xwindow(wm, e->window)) != NULL) + && ((c = mb_wm_manager_managed_window_from_xwindow(wm, e->window)) != NULL) && MB_WM_IS_CLIENT_APP (c)) { mb_wm_client_set_state (c, @@ -368,7 +368,7 @@ mb_wm_root_window_handle_message (MBWMRootWindow *win, XClientMessageEvent *e) state_op); } else if (e->data.l[1] == wm->atoms[MBWM_ATOM_NET_WM_STATE_ABOVE] - && ((c = mb_wm_managed_client_from_xwindow(wm, e->window)) != + && ((c = mb_wm_manager_managed_window_from_xwindow(wm, e->window)) != NULL) && MB_WM_IS_CLIENT_DIALOG (c)) { @@ -384,7 +384,7 @@ mb_wm_root_window_handle_message (MBWMRootWindow *win, XClientMessageEvent *e) switch (e->data.l[0]) { case IconicState: - if ((c = mb_wm_managed_client_from_xwindow (wm, e->window))) + if ((c = mb_wm_manager_managed_window_from_xwindow (wm, e->window))) mb_wm_client_iconize (c); default: @@ -394,12 +394,12 @@ mb_wm_root_window_handle_message (MBWMRootWindow *win, XClientMessageEvent *e) } else if (e->message_type == wm->atoms[MBWM_ATOM_NET_SHOWING_DESKTOP]) { - mb_wm_handle_show_desktop (wm, e->data.l[0]); + mb_wm_manager_handle_show_desktop (wm, e->data.l[0]); return 1; } else if (e->message_type == wm->atoms[MBWM_ATOM_NET_CURRENT_DESKTOP]) { - mb_wm_select_desktop (wm, e->data.l[0]); + mb_wm_manager_select_desktop (wm, e->data.l[0]); return 1; } else if (e->message_type == wm->atoms[MBWM_ATOM_MB_COMMAND]) @@ -409,20 +409,20 @@ mb_wm_root_window_handle_message (MBWMRootWindow *win, XClientMessageEvent *e) case MB_CMD_EXIT: exit(0); case MB_CMD_NEXT: - mb_wm_cycle_apps (wm, False); + mb_wm_manager_cycle_apps (wm, False); break; case MB_CMD_PREV: - mb_wm_cycle_apps (wm, True); + mb_wm_manager_cycle_apps (wm, True); break; case MB_CMD_DESKTOP: - mb_wm_toggle_desktop (wm); + mb_wm_manager_toggle_desktop (wm); break; #if ENABLE_COMPOSITE case MB_CMD_COMPOSITE: - if (mb_wm_compositing_enabled (wm)) - mb_wm_compositing_off (wm); + if (mb_wm_manager_compositing_enabled (wm)) + mb_wm_manager_set_compositing_off (wm); else - mb_wm_compositing_on (wm); + mb_wm_manager_set_compositing_on (wm); break; #endif default: |