diff options
60 files changed, 595 insertions, 595 deletions
diff --git a/configure.ac b/configure.ac index 2184dec..1cce666 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ m4_define([mbwm_api_version], [2.0]) AC_PREREQ(2.63) AC_INIT([matchbox], mbwm_version, [mallum@handhelds.org]) -AC_CONFIG_SRCDIR([matchbox/mb-window-manager.c]) +AC_CONFIG_SRCDIR([matchbox/mb-wm-manager.c]) AM_INIT_AUTOMAKE(1.11 foreign dist-bzip2) AM_SILENT_RULES([yes]) diff --git a/managers/clutter/mb-wm-comp-mgr-clutter.c b/managers/clutter/mb-wm-comp-mgr-clutter.c index 4d8a820..53c4baf 100644 --- a/managers/clutter/mb-wm-comp-mgr-clutter.c +++ b/managers/clutter/mb-wm-comp-mgr-clutter.c @@ -124,7 +124,7 @@ mbwm_cmc_fetch_texture (MBWMCompMgrClient *client) MBWMCompMgrClutterClient *cclient = CCLIENT(client); MBWMCompMgrClutterClientPrivate *priv = cclient->priv; MBWindowManagerClient *wm_client = client->wm_client; - MBWindowManager *wm = client->wm; + MBWMManager *wm = client->wm; MBGeometry geom; Window xwin; Window root; @@ -274,7 +274,7 @@ mbwm_cmc_client_destroy (MBWMObject* obj) MBWMCompMgrClient *c = MB_WM_COMP_MGR_CLIENT (obj); MBWMCompMgrClutterClient *cclient = CCLIENT (obj); MBWMCompMgrClutterClientPrivate *priv = cclient->priv; - MBWindowManager *wm = c->wm; + MBWMManager *wm = c->wm; MBWMCompMgrClutter *mgr = CMGR (wm->comp_mgr); int i; @@ -497,7 +497,7 @@ mbwm_cmc_init (MBWMObject *obj, va_list vap) MBWMCompMgr * mgr = MB_WM_COMP_MGR (obj); MBWMCompMgrClutter * cmgr = CMGR (obj); MBWMCompMgrClutterPrivate * priv; - MBWindowManager * wm = mgr->wm; + MBWMManager * wm = mgr->wm; ClutterActor * desktop, * arena; priv = mb_wm_util_malloc0 (sizeof (MBWMCompMgrClutterPrivate)); @@ -554,7 +554,7 @@ mb_wm_comp_mgr_clutter_class_type () static void mbwm_cmc_turn_off_real (MBWMCompMgr *mgr) { - MBWindowManager * wm = mgr->wm; + MBWMManager * wm = mgr->wm; MBWMCompMgrClutterPrivate * priv; if (!mgr) @@ -584,7 +584,7 @@ mbwm_cmc_turn_off_real (MBWMCompMgr *mgr) static void mbwm_cmc_turn_on_real (MBWMCompMgr *mgr) { - MBWindowManager * wm; + MBWMManager * wm; MBWMCompMgrClutterPrivate * priv; if (!mgr || !mgr->disabled) @@ -646,7 +646,7 @@ mbwm_cmc_client_repair_real (MBWMCompMgrClient * client) MBWindowManagerClient *wm_client = client->wm_client; MBWMCompMgrClutterClient *cclient = CCLIENT (client); MBWMCompMgrClutterClientPrivate *priv = cclient->priv; - MBWindowManager *wm = client->wm; + MBWMManager *wm = client->wm; XserverRegion parts; int i, r_count; XRectangle *r_damage; @@ -745,10 +745,10 @@ mbwm_cmc_handle_damage (XDamageNotifyEvent * de, MBWMCompMgr * mgr) { MBWMCompMgrClutterPrivate * priv = CMGR (mgr)->priv; - MBWindowManager * wm = mgr->wm; + MBWMManager * wm = mgr->wm; MBWindowManagerClient * c; - c = mb_wm_managed_client_from_frame (wm, de->drawable); + c = mb_wm_manager_managed_window_from_frame (wm, de->drawable); if (c && c->cm_client) { @@ -802,7 +802,7 @@ mbwm_cmc_unfreeze_stack (MBWMCompMgr *mgr) static void mbwm_cmc_restack_real (MBWMCompMgr *mgr) { - MBWindowManager *wm = mgr->wm; + MBWMManager *wm = mgr->wm; MBWMCompMgrClutter *cmgr = CMGR (mgr); MBWMCompMgrClutterPrivate *priv = cmgr->priv; GList *l; @@ -938,7 +938,7 @@ mbwm_cmc_map_notify_real (MBWMCompMgr *mgr, MBWMCompMgrClient *client = c->cm_client; MBWMCompMgrClutterClient *cclient = CCLIENT(client); MBWMCompMgrClutterClientPrivate *priv = cclient->priv; - MBWindowManager *wm = client->wm; + MBWMManager *wm = client->wm; ClutterActor *actor; ClutterActor *texture; ClutterActor *rect; @@ -1302,7 +1302,7 @@ mbwm_cmc_add_actor (MBWMCompMgrClutter *cmgr, } MBWMCompMgr * -mb_wm_comp_mgr_clutter_new (MBWindowManager *wm) +mb_wm_comp_mgr_clutter_new (MBWMManager *wm) { MBWMObject *mgr; diff --git a/managers/clutter/mb-wm-comp-mgr-clutter.h b/managers/clutter/mb-wm-comp-mgr-clutter.h index e929067..500d148 100644 --- a/managers/clutter/mb-wm-comp-mgr-clutter.h +++ b/managers/clutter/mb-wm-comp-mgr-clutter.h @@ -65,7 +65,7 @@ int mb_wm_comp_mgr_clutter_class_type (); MBWMCompMgr* -mb_wm_comp_mgr_clutter_new (MBWindowManager *wm); +mb_wm_comp_mgr_clutter_new (MBWMManager *wm); struct _MBWMCompMgrClutterClient { diff --git a/managers/maemo/maemo-input.c b/managers/maemo/maemo-input.c index 858608d..f7c89de 100644 --- a/managers/maemo/maemo-input.c +++ b/managers/maemo/maemo-input.c @@ -30,7 +30,7 @@ maemo_input_init (MBWMObject *this, va_list vap) { MBWindowManagerClient *client = MB_WM_CLIENT (this); MBWMClientInput *client_input = MB_WM_CLIENT_INPUT (this); - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; MBWMClientWindow *win = client->window; /* Maemo input windows must always be transient for something; however, for @@ -66,7 +66,7 @@ maemo_input_init (MBWMObject *this, va_list vap) && win->xwin_transient_for != wm->root_win->xwindow) { MBWindowManagerClient * t = - mb_wm_managed_client_from_xwindow (wm, + mb_wm_manager_managed_window_from_xwindow (wm, win->xwin_transient_for); mb_wm_client_get_coverage (t, & client_input->transient_geom); @@ -109,7 +109,7 @@ maemo_input_class_type () } MBWindowManagerClient* -maemo_input_new (MBWindowManager *wm, MBWMClientWindow *win) +maemo_input_new (MBWMManager *wm, MBWMClientWindow *win) { MBWindowManagerClient *client; diff --git a/managers/maemo/maemo-input.h b/managers/maemo/maemo-input.h index 73ea2a2..35dfe26 100644 --- a/managers/maemo/maemo-input.h +++ b/managers/maemo/maemo-input.h @@ -42,7 +42,7 @@ struct MaemoInputClass }; MBWindowManagerClient* -maemo_input_new (MBWindowManager *wm, MBWMClientWindow *win); +maemo_input_new (MBWMManager *wm, MBWMClientWindow *win); int maemo_input_class_type (); diff --git a/managers/maemo/maemo-toolbar.c b/managers/maemo/maemo-toolbar.c index 436d8c4..fde6683 100644 --- a/managers/maemo/maemo-toolbar.c +++ b/managers/maemo/maemo-toolbar.c @@ -54,7 +54,7 @@ maemo_toolbar_init (MBWMObject *this, va_list vap) { MBWindowManagerClient * client = MB_WM_CLIENT (this); MaemoToolbar * toolbar = MAEMO_TOOLBAR (this); - MBWindowManager * wm = client->wmref; + MBWMManager * wm = client->wmref; MBGeometry geom; MBGeometry * w_geom = &client->window->geometry; MBWMClientWindow * win = client->window; @@ -220,7 +220,7 @@ maemo_toolbar_stacking_layer (MBWindowManagerClient *client) /* * If we are showing desktop, ensure that we stack above it. */ - if (client->wmref->flags & MBWindowManagerFlagDesktop) + if (client->wmref->flags & MBWMManagerFlagDesktop) return MBWMStackLayerTopMid; return client->stacking_layer; @@ -276,7 +276,7 @@ maemo_toolbar_class_type () } MBWindowManagerClient* -maemo_toolbar_new (MBWindowManager *wm, MBWMClientWindow *win) +maemo_toolbar_new (MBWMManager *wm, MBWMClientWindow *win) { MBWindowManagerClient *client = NULL; diff --git a/managers/maemo/maemo-toolbar.h b/managers/maemo/maemo-toolbar.h index c5267c1..b2ea8b1 100644 --- a/managers/maemo/maemo-toolbar.h +++ b/managers/maemo/maemo-toolbar.h @@ -45,7 +45,7 @@ struct MaemoToolbarClass }; MBWindowManagerClient* -maemo_toolbar_new(MBWindowManager *wm, MBWMClientWindow *win); +maemo_toolbar_new(MBWMManager *wm, MBWMClientWindow *win); int maemo_toolbar_class_type (); diff --git a/managers/maemo/maemo-window-manager.c b/managers/maemo/maemo-window-manager.c index 62e0107..0a1ce86 100644 --- a/managers/maemo/maemo-window-manager.c +++ b/managers/maemo/maemo-window-manager.c @@ -26,14 +26,14 @@ #include <stdarg.h> static void -maemo_window_manager_process_cmdline (MBWindowManager *, int, char **); +maemo_window_manager_process_cmdline (MBWMManager *, int, char **); static Bool -maemo_window_manager_client_activate (MBWindowManager * wm, +maemo_window_manager_client_activate (MBWMManager * wm, MBWindowManagerClient *c); static MBWindowManagerClient* -maemo_window_manager_client_new_func (MBWindowManager *wm, +maemo_window_manager_client_new_func (MBWMManager *wm, MBWMClientWindow *win) { if (win->override_redirect) @@ -104,11 +104,11 @@ maemo_window_manager_client_new_func (MBWindowManager *wm, static void maemo_window_manager_class_init (MBWMObjectClass *klass) { - MBWindowManagerClass *wm_class; + MBWMManagerClass *wm_class; MBWM_MARK(); - wm_class = (MBWindowManagerClass *)klass; + wm_class = (MBWMManagerClass *)klass; wm_class->process_cmdline = maemo_window_manager_process_cmdline; wm_class->client_new = maemo_window_manager_client_new_func; @@ -127,7 +127,7 @@ maemo_window_manager_destroy (MBWMObject *this) static int maemo_window_manager_init (MBWMObject *this, va_list vap) { - MBWindowManager *wm = MB_WINDOW_MANAGER (this); + MBWMManager *wm = MB_WM_MANAGER (this); wm->modality_type = MBWMModalitySystem; return 1; @@ -148,18 +148,18 @@ maemo_window_manager_class_type () maemo_window_manager_class_init }; - type = mb_wm_object_register_class (&info, MB_TYPE_WINDOW_MANAGER, 0); + type = mb_wm_object_register_class (&info, MB_WM_TYPE_MANAGER, 0); } return type; } -MBWindowManager* +MBWMManager* maemo_window_manager_new (int argc, char **argv) { - MBWindowManager *wm = NULL; + MBWMManager *wm = NULL; - wm = MB_WINDOW_MANAGER (mb_wm_object_new (MB_TYPE_MAEMO_WINDOW_MANAGER, + wm = MB_WM_MANAGER (mb_wm_object_new (MB_TYPE_MAEMO_WINDOW_MANAGER, MBWMObjectPropArgc, argc, MBWMObjectPropArgv, argv, NULL)); @@ -171,26 +171,26 @@ maemo_window_manager_new (int argc, char **argv) } static void -maemo_window_manager_process_cmdline (MBWindowManager *wm, +maemo_window_manager_process_cmdline (MBWMManager *wm, int argc, char **argv) { - MBWindowManagerClass * wm_class = - MB_WINDOW_MANAGER_CLASS(MB_WM_OBJECT_GET_PARENT_CLASS(MB_WM_OBJECT(wm))); + MBWMManagerClass * wm_class = + MB_WM_MANAGER_CLASS(MB_WM_OBJECT_GET_PARENT_CLASS(MB_WM_OBJECT(wm))); if (wm_class->process_cmdline) wm_class->process_cmdline (wm); } static Bool -maemo_window_manager_client_activate (MBWindowManager * wm, +maemo_window_manager_client_activate (MBWMManager * wm, MBWindowManagerClient *c) { - MBWindowManagerClass *parent_klass; + MBWMManagerClass *parent_klass; MBWMClientType c_type; /* Get parent klass so we can chain up to the parent method */ parent_klass = - MB_WINDOW_MANAGER_CLASS(MB_WM_OBJECT_GET_PARENT_CLASS(MB_WM_OBJECT(wm))); + MB_WM_MANAGER_CLASS(MB_WM_OBJECT_GET_PARENT_CLASS(MB_WM_OBJECT(wm))); MBWM_ASSERT (parent_klass->client_activate); @@ -199,7 +199,7 @@ maemo_window_manager_client_activate (MBWindowManager * wm, c_type = MB_WM_CLIENT_CLIENT_TYPE (c); - if (c_type == MBWMClientTypeApp && c != mb_wm_get_visible_main_client (wm)) + if (c_type == MBWMClientTypeApp && c != mb_wm_manager_manager_get_visible_main_window (wm)) { /* Agressive ping to weed out any hungup applications */ mb_wm_client_ping_start (c); diff --git a/managers/maemo/maemo-window-manager.h b/managers/maemo/maemo-window-manager.h index ce67597..fdf6e9b 100644 --- a/managers/maemo/maemo-window-manager.h +++ b/managers/maemo/maemo-window-manager.h @@ -33,15 +33,15 @@ typedef struct MaemoWindowManagerPriv MaemoWindowManagerPriv; struct MaemoWindowManager { - MBWindowManager parent; + MBWMManager parent; }; struct MaemoWindowManagerClass { - MBWindowManagerClass parent; + MBWMManagerClass parent; }; -MBWindowManager * +MBWMManager * maemo_window_manager_new (int argc, char **argv); #endif diff --git a/managers/maemo/matchbox-window-manager-2-maemo.c b/managers/maemo/matchbox-window-manager-2-maemo.c index 6998dd1..577a1b2 100644 --- a/managers/maemo/matchbox-window-manager-2-maemo.c +++ b/managers/maemo/matchbox-window-manager-2-maemo.c @@ -28,7 +28,7 @@ enum { KEY_ACTION_TOGGLE_DESKTOP, }; -static MBWindowManager *wm = NULL; +static MBWMManager *wm = NULL; #if MBWM_WANT_DEBUG /* @@ -62,7 +62,7 @@ signal_handler (int sig) #endif void -key_binding_func (MBWindowManager *wm, +key_binding_func (MBWMManager *wm, MBWMKeyBinding *binding, void *userdata) { @@ -74,17 +74,17 @@ key_binding_func (MBWindowManager *wm, switch (action) { case KEY_ACTION_PAGE_NEXT: - mb_wm_cycle_apps (wm, False); + mb_wm_manager_cycle_apps (wm, False); break; case KEY_ACTION_PAGE_PREV: - mb_wm_cycle_apps (wm, True); + mb_wm_manager_cycle_apps (wm, True); break; case KEY_ACTION_TOGGLE_FULLSCREEN: printf(" ### KEY_ACTION_TOGGLE_FULLSCREEN ### \n"); break; case KEY_ACTION_TOGGLE_DESKTOP: printf(" ### KEY_ACTION_TOGGLE_DESKTOP ### \n"); - mb_wm_toggle_desktop (wm); + mb_wm_manager_toggle_desktop (wm); break; } } @@ -102,7 +102,7 @@ main(int argc, char **argv) mb_wm_object_init(); wm = maemo_window_manager_new(argc, argv); - mb_wm_init (wm); + mb_wm_manager_run (wm); if (wm == NULL) mb_wm_util_fatal_error("OOM?"); @@ -125,7 +125,7 @@ main(int argc, char **argv) NULL, (void*)KEY_ACTION_PAGE_PREV); - mb_wm_main_loop (wm); + mb_wm_manager_main_loop (wm); mb_wm_object_unref (MB_WM_OBJECT (wm)); diff --git a/managers/simple/matchbox-window-manager-2-simple.c b/managers/simple/matchbox-window-manager-2-simple.c index 5a3472a..8881895 100644 --- a/managers/simple/matchbox-window-manager-2-simple.c +++ b/managers/simple/matchbox-window-manager-2-simple.c @@ -12,7 +12,7 @@ enum { KEY_ACTION_TOGGLE_DESKTOP, }; -static MBWindowManager *wm = NULL; +static MBWMManager *wm = NULL; #if MBWM_WANT_DEBUG /* @@ -46,7 +46,7 @@ signal_handler (int sig) #endif void -key_binding_func (MBWindowManager *wm, +key_binding_func (MBWMManager *wm, MBWMKeyBinding *binding, void *userdata) { @@ -58,17 +58,17 @@ key_binding_func (MBWindowManager *wm, switch (action) { case KEY_ACTION_PAGE_NEXT: - mb_wm_cycle_apps (wm, False); + mb_wm_manager_cycle_apps (wm, False); break; case KEY_ACTION_PAGE_PREV: - mb_wm_cycle_apps (wm, True); + mb_wm_manager_cycle_apps (wm, True); break; case KEY_ACTION_TOGGLE_FULLSCREEN: printf(" ### KEY_ACTION_TOGGLE_FULLSCREEN ### \n"); break; case KEY_ACTION_TOGGLE_DESKTOP: printf(" ### KEY_ACTION_TOGGLE_DESKTOP ### \n"); - mb_wm_toggle_desktop (wm); + mb_wm_manager_toggle_desktop (wm); break; } } @@ -94,8 +94,8 @@ main(int argc, char **argv) dpy = GDK_DISPLAY(); #endif - wm = mb_wm_new_with_dpy (argc, argv, dpy); - mb_wm_init (wm); + wm = mb_wm_manager_new_with_dpy (argc, argv, dpy); + mb_wm_manager_run (wm); if (wm == NULL) mb_wm_util_fatal_error("OOM?"); @@ -118,7 +118,7 @@ main(int argc, char **argv) NULL, (void*)KEY_ACTION_PAGE_PREV); - mb_wm_main_loop(wm); + mb_wm_manager_main_loop(wm); mb_wm_object_unref (MB_WM_OBJECT (wm)); diff --git a/matchbox/Makefile.am b/matchbox/Makefile.am index acc64f3..8ad2c05 100644 --- a/matchbox/Makefile.am +++ b/matchbox/Makefile.am @@ -35,8 +35,8 @@ source = \ mb-wm-keys.c \ mb-wm-decor.h \ mb-wm-decor.c \ - mb-window-manager.h \ - mb-window-manager.c \ + mb-wm-manager.h \ + mb-wm-manager.c \ mb-wm-main-context.h \ mb-wm-main-context.c \ xas.h \ diff --git a/matchbox/matchbox.h b/matchbox/matchbox.h index f59d0e7..0a745eb 100644 --- a/matchbox/matchbox.h +++ b/matchbox/matchbox.h @@ -65,6 +65,6 @@ #include <matchbox/mb-wm-client-panel.h> #include <matchbox/mb-wm-layout.h> #include <matchbox/mb-wm-stack.h> -#include <matchbox/mb-window-manager.h> +#include <matchbox/mb-wm-manager.h> #include <matchbox/mb-wm-main-context.h> #endif diff --git a/matchbox/mb-wm-atoms.c b/matchbox/mb-wm-atoms.c index 4b270a8..d96dcd6 100644 --- a/matchbox/mb-wm-atoms.c +++ b/matchbox/mb-wm-atoms.c @@ -1,7 +1,7 @@ #include "matchbox.h" void -mb_wm_atoms_init(MBWindowManager *wm) +mb_wm_atoms_init(MBWMManager *wm) { /* * The list below *MUST* be kept in the same order as the corresponding diff --git a/matchbox/mb-wm-atoms.h b/matchbox/mb-wm-atoms.h index 2007acc..1871672 100644 --- a/matchbox/mb-wm-atoms.h +++ b/matchbox/mb-wm-atoms.h @@ -21,9 +21,9 @@ #ifndef _HAVE_MB_WM_ATOMS_H #define _HAVE_MB_WM_ATOMS_H -#include <matchbox/mb-window-manager.h> +#include <matchbox/mb-wm-manager.h> void -mb_wm_atoms_init(MBWindowManager *wm); +mb_wm_atoms_init(MBWMManager *wm); #endif diff --git a/matchbox/mb-wm-client-app.c b/matchbox/mb-wm-client-app.c index abac125..8b98db2 100644 --- a/matchbox/mb-wm-client-app.c +++ b/matchbox/mb-wm-client-app.c @@ -46,7 +46,7 @@ static int mb_wm_client_app_init (MBWMObject *this, va_list vap) { MBWindowManagerClient *client = MB_WM_CLIENT (this); - MBWindowManager *wm = NULL; + MBWMManager *wm = NULL; MBWMClientAppClass *app_class; app_class = MB_WM_CLIENT_APP_CLASS (MB_WM_OBJECT_GET_CLASS (this)); @@ -61,7 +61,7 @@ mb_wm_client_app_init (MBWMObject *this, va_list vap) { if (prop == MBWMObjectPropWm) { - wm = va_arg(vap, MBWindowManager *); + wm = va_arg(vap, MBWMManager *); break; } else @@ -135,7 +135,7 @@ mb_wm_client_app_request_geometry (MBWindowManagerClient *client, MBWMClientReqGeomIsViaUserAction)) { int north, south, west, east; - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; if ((client->window->ewmh_state & MBWMClientWindowEWMHStateFullscreen)|| !client->decor) @@ -226,7 +226,7 @@ mb_wm_client_app_stacking_layer (MBWindowManagerClient *client) } MBWindowManagerClient* -mb_wm_client_app_new (MBWindowManager *wm, MBWMClientWindow *win) +mb_wm_client_app_new (MBWMManager *wm, MBWMClientWindow *win) { MBWindowManagerClient *client; diff --git a/matchbox/mb-wm-client-app.h b/matchbox/mb-wm-client-app.h index 1f33a7e..59602b7 100644 --- a/matchbox/mb-wm-client-app.h +++ b/matchbox/mb-wm-client-app.h @@ -43,7 +43,7 @@ struct MBWMClientAppClass }; MBWindowManagerClient* -mb_wm_client_app_new(MBWindowManager *wm, MBWMClientWindow *win); +mb_wm_client_app_new(MBWMManager *wm, MBWMClientWindow *win); int mb_wm_client_app_class_type (); diff --git a/matchbox/mb-wm-client-base.c b/matchbox/mb-wm-client-base.c index a75dd57..bb0311b 100644 --- a/matchbox/mb-wm-client-base.c +++ b/matchbox/mb-wm-client-base.c @@ -82,7 +82,7 @@ mb_wm_client_base_destroy (MBWMObject *this) { MBWindowManagerClient *parent; MBWindowManagerClient *client; - MBWindowManager *wm; + MBWMManager *wm; MBWM_MARK(); @@ -147,7 +147,7 @@ mb_wm_client_base_class_type () static void mb_wm_client_base_realize (MBWindowManagerClient *client) { - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; XSetWindowAttributes attr; @@ -232,7 +232,7 @@ mb_wm_client_base_realize (MBWindowManagerClient *client) */ if (mb_wm_client_is_modal (client) && !mb_wm_client_get_transient_for (client) && - mb_wm_get_modality_type (wm) == MBWMModalitySystem) + mb_wm_manager_get_modality_type (wm) == MBWMModalitySystem) { XSetWindowAttributes attr; attr.override_redirect = True; @@ -297,7 +297,7 @@ mb_wm_client_base_set_state_props (MBWindowManagerClient *c) { unsigned long flags = c->window->ewmh_state; Window xwin = c->window->xwindow; - MBWindowManager *wm = c->wmref; + MBWMManager *wm = c->wmref; Display *xdpy = wm->xdpy; CARD32 card32[2]; Atom ewmh_state [MBWMClientWindowEWHMStatesCount]; @@ -356,7 +356,7 @@ mb_wm_client_base_set_state_props (MBWindowManagerClient *c) static void send_synthetic_configure_notify (MBWindowManagerClient *client) { - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; XConfigureEvent ce; ce.type = ConfigureNotify; @@ -377,7 +377,7 @@ send_synthetic_configure_notify (MBWindowManagerClient *client) static void move_resize_client_xwin (MBWindowManagerClient *client, int x, int y, int w, int h) { - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; /* ICCCM says if you ignore a configure request or you respond * by only moving/re-stacking the window - without a size change, @@ -422,7 +422,7 @@ move_resize_client_xwin (MBWindowManagerClient *client, int x, int y, int w, int static void mb_wm_client_base_display_sync (MBWindowManagerClient *client) { - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; MBWMClientWindow * win = client->window; Bool fullscreen = (win->ewmh_state & MBWMClientWindowEWMHStateFullscreen); @@ -708,7 +708,7 @@ static Bool mb_wm_client_base_focus (MBWindowManagerClient *client) { static Window last_focused = None; - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; Window xwin = client->window->xwindow; if (!mb_wm_client_want_focus (client)) diff --git a/matchbox/mb-wm-client-desktop.c b/matchbox/mb-wm-client-desktop.c index 878f858..2219f30 100644 --- a/matchbox/mb-wm-client-desktop.c +++ b/matchbox/mb-wm-client-desktop.c @@ -42,7 +42,7 @@ static int mb_wm_client_desktop_init (MBWMObject *this, va_list vap) { MBWindowManagerClient *client = MB_WM_CLIENT (this); - MBWindowManager *wm = NULL; + MBWMManager *wm = NULL; MBWMClientDesktopClass *inp_class; MBGeometry geom; @@ -108,7 +108,7 @@ mb_wm_client_desktop_request_geometry (MBWindowManagerClient *client, if (flags & (MBWMClientReqGeomIsViaLayoutManager|MBWMClientReqGeomForced)) { int north = 0, south = 0, west = 0, east = 0; - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; if (client->decor) mb_wm_theme_get_decor_dimensions (wm->theme, client, @@ -138,7 +138,7 @@ mb_wm_client_desktop_request_geometry (MBWindowManagerClient *client, static MBWMStackLayerType mb_wm_client_desktop_stacking_layer (MBWindowManagerClient *client) { - if (client->wmref->flags & MBWindowManagerFlagDesktop) + if (client->wmref->flags & MBWMManagerFlagDesktop) return MBWMStackLayerMid; return MBWMStackLayerBottom; @@ -182,7 +182,7 @@ mb_wm_client_desktop_theme_change (MBWindowManagerClient *client) } MBWindowManagerClient* -mb_wm_client_desktop_new (MBWindowManager *wm, MBWMClientWindow *win) +mb_wm_client_desktop_new (MBWMManager *wm, MBWMClientWindow *win) { MBWindowManagerClient *client; diff --git a/matchbox/mb-wm-client-desktop.h b/matchbox/mb-wm-client-desktop.h index 3484fa6..ae602d8 100644 --- a/matchbox/mb-wm-client-desktop.h +++ b/matchbox/mb-wm-client-desktop.h @@ -42,7 +42,7 @@ struct MBWMClientDesktopClass }; MBWindowManagerClient* -mb_wm_client_desktop_new(MBWindowManager *wm, MBWMClientWindow *win); +mb_wm_client_desktop_new(MBWMManager *wm, MBWMClientWindow *win); int mb_wm_client_desktop_class_type (); diff --git a/matchbox/mb-wm-client-dialog.c b/matchbox/mb-wm-client-dialog.c index b998396..aae490d 100644 --- a/matchbox/mb-wm-client-dialog.c +++ b/matchbox/mb-wm-client-dialog.c @@ -1,5 +1,5 @@ #include "mb-wm-client-dialog.h" -#include "mb-window-manager.h" +#include "mb-wm-manager.h" #include "mb-wm-theme.h" @@ -38,7 +38,7 @@ mb_wm_client_dialog_show (MBWindowManagerClient *client) if (client->transient_for != NULL) { - MBWindowManager * wm = client->wmref; + MBWMManager * wm = client->wmref; /* * If an attempt has been made to activate a hidden @@ -52,7 +52,7 @@ mb_wm_client_dialog_show (MBWindowManagerClient *client) while (parent->transient_for != NULL) parent = parent->transient_for; - if (parent != mb_wm_get_visible_main_client(wm)) + if (parent != mb_wm_manager_manager_get_visible_main_window(wm)) mb_wm_client_show (parent); } @@ -88,7 +88,7 @@ static int mb_wm_client_dialog_init (MBWMObject *this, va_list vap) { MBWindowManagerClient *client = MB_WM_CLIENT (this); - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; MBWMClientWindow *win = client->window; MBGeometry geom; int n, s, w, e; @@ -124,7 +124,7 @@ mb_wm_client_dialog_init (MBWMObject *this, va_list vap) MBWM_DBG ("Adding to '%lx' transient list", win->xwin_transient_for); mb_wm_client_add_transient - (mb_wm_managed_client_from_xwindow (wm, + (mb_wm_manager_managed_window_from_xwindow (wm, win->xwin_transient_for), client); client->stacking_layer = 0; /* We stack with whatever transient too */ @@ -145,7 +145,7 @@ mb_wm_client_dialog_init (MBWMObject *this, va_list vap) { MBGeometry avail_geom; - mb_wm_get_display_geometry (wm, &avail_geom); + mb_wm_manager_get_display_geometry (wm, &avail_geom); client->window->geometry.x = (avail_geom.width - client->window->geometry.width) / 2; @@ -224,7 +224,7 @@ mb_wm_client_dialog_request_geometry (MBWindowManagerClient *client, if (change_size) { int north = 0, south = 0, west = 0, east = 0; - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; if (client->decor) mb_wm_theme_get_decor_dimensions (wm->theme, client, @@ -345,7 +345,7 @@ mb_wm_client_dialog_theme_change (MBWindowManagerClient *client) MBWindowManagerClient* -mb_wm_client_dialog_new (MBWindowManager *wm, MBWMClientWindow *win) +mb_wm_client_dialog_new (MBWMManager *wm, MBWMClientWindow *win) { MBWindowManagerClient *client; diff --git a/matchbox/mb-wm-client-dialog.h b/matchbox/mb-wm-client-dialog.h index c22ec2c..c68e689 100644 --- a/matchbox/mb-wm-client-dialog.h +++ b/matchbox/mb-wm-client-dialog.h @@ -44,7 +44,7 @@ struct MBWMClientDialogClass }; MBWindowManagerClient* -mb_wm_client_dialog_new (MBWindowManager *wm, MBWMClientWindow *win); +mb_wm_client_dialog_new (MBWMManager *wm, MBWMClientWindow *win); int mb_wm_client_dialog_class_type (); diff --git a/matchbox/mb-wm-client-input.c b/matchbox/mb-wm-client-input.c index 3a63d40..3e3fdae 100644 --- a/matchbox/mb-wm-client-input.c +++ b/matchbox/mb-wm-client-input.c @@ -48,7 +48,7 @@ mb_wm_client_input_init (MBWMObject *this, va_list vap) { MBWMClientInput *client_input = MB_WM_CLIENT_INPUT (this); MBWindowManagerClient *client = MB_WM_CLIENT (this); - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; MBWMClientWindow *win = client->window; if (win->xwin_transient_for @@ -56,7 +56,7 @@ mb_wm_client_input_init (MBWMObject *this, va_list vap) && win->xwin_transient_for != wm->root_win->xwindow) { MBWindowManagerClient * t = - mb_wm_managed_client_from_xwindow (wm, + mb_wm_manager_managed_window_from_xwindow (wm, win->xwin_transient_for); mb_wm_client_get_coverage (t, & client_input->transient_geom); @@ -146,7 +146,7 @@ mb_wm_client_input_stack (MBWindowManagerClient *client, int flags) } MBWindowManagerClient* -mb_wm_client_input_new (MBWindowManager *wm, MBWMClientWindow *win) +mb_wm_client_input_new (MBWMManager *wm, MBWMClientWindow *win) { MBWindowManagerClient *client; diff --git a/matchbox/mb-wm-client-input.h b/matchbox/mb-wm-client-input.h index ed15a56..d255be4 100644 --- a/matchbox/mb-wm-client-input.h +++ b/matchbox/mb-wm-client-input.h @@ -44,7 +44,7 @@ struct MBWMClientInputClass }; MBWindowManagerClient* -mb_wm_client_input_new (MBWindowManager *wm, MBWMClientWindow *win); +mb_wm_client_input_new (MBWMManager *wm, MBWMClientWindow *win); int mb_wm_client_input_class_type (); diff --git a/matchbox/mb-wm-client-menu.c b/matchbox/mb-wm-client-menu.c index b68f771..031fe89 100644 --- a/matchbox/mb-wm-client-menu.c +++ b/matchbox/mb-wm-client-menu.c @@ -45,7 +45,7 @@ static int mb_wm_client_menu_init (MBWMObject *this, va_list vap) { MBWindowManagerClient *client = MB_WM_CLIENT (this); - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; MBWMClientWindow *win = client->window; Atom actions[] = { wm->atoms[MBWM_ATOM_NET_WM_ACTION_CLOSE], @@ -78,7 +78,7 @@ mb_wm_client_menu_init (MBWMObject *this, va_list vap) MBWM_DBG ("Adding to '%lx' transient list", win->xwin_transient_for); mb_wm_client_add_transient - (mb_wm_managed_client_from_xwindow (wm, + (mb_wm_manager_managed_window_from_xwindow (wm, win->xwin_transient_for), client); client->stacking_layer = 0; /* We stack with whatever transient too */ @@ -141,7 +141,7 @@ mb_wm_client_menu_request_geometry (MBWindowManagerClient *client, } MBWindowManagerClient* -mb_wm_client_menu_new (MBWindowManager *wm, MBWMClientWindow *win) +mb_wm_client_menu_new (MBWMManager *wm, MBWMClientWindow *win) { MBWindowManagerClient *client; diff --git a/matchbox/mb-wm-client-menu.h b/matchbox/mb-wm-client-menu.h index 8d2f1c6..7e0ef06 100644 --- a/matchbox/mb-wm-client-menu.h +++ b/matchbox/mb-wm-client-menu.h @@ -42,7 +42,7 @@ struct MBWMClientMenuClass }; MBWindowManagerClient* -mb_wm_client_menu_new (MBWindowManager *wm, MBWMClientWindow *win); +mb_wm_client_menu_new (MBWMManager *wm, MBWMClientWindow *win); int mb_wm_client_menu_class_type (); diff --git a/matchbox/mb-wm-client-note.c b/matchbox/mb-wm-client-note.c index d0bb770..43e7036 100644 --- a/matchbox/mb-wm-client-note.c +++ b/matchbox/mb-wm-client-note.c @@ -47,7 +47,7 @@ static int mb_wm_client_note_init (MBWMObject *this, va_list vap) { MBWindowManagerClient *client = MB_WM_CLIENT (this); - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; MBWMClientWindow *win = client->window; MBGeometry geom; Bool change = False; @@ -138,7 +138,7 @@ mb_wm_client_note_class_type () } MBWindowManagerClient* -mb_wm_client_note_new (MBWindowManager *wm, MBWMClientWindow *win) +mb_wm_client_note_new (MBWMManager *wm, MBWMClientWindow *win) { MBWindowManagerClient *client; diff --git a/matchbox/mb-wm-client-note.h b/matchbox/mb-wm-client-note.h index 2b12cb9..fe49096 100644 --- a/matchbox/mb-wm-client-note.h +++ b/matchbox/mb-wm-client-note.h @@ -43,7 +43,7 @@ struct MBWMClientNoteClass }; MBWindowManagerClient* -mb_wm_client_note_new (MBWindowManager *wm, MBWMClientWindow *win); +mb_wm_client_note_new (MBWMManager *wm, MBWMClientWindow *win); int mb_wm_client_note_class_type (); diff --git a/matchbox/mb-wm-client-override.c b/matchbox/mb-wm-client-override.c index d09e11a..350c8db 100644 --- a/matchbox/mb-wm-client-override.c +++ b/matchbox/mb-wm-client-override.c @@ -62,7 +62,7 @@ static int mb_wm_client_override_init (MBWMObject *this, va_list vap) { MBWindowManagerClient *client = MB_WM_CLIENT (this); - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; MBWMClientWindow *win = client->window; if (win->xwin_transient_for @@ -72,7 +72,7 @@ mb_wm_client_override_init (MBWMObject *this, va_list vap) MBWM_DBG ("Adding to '%lx' transient list", win->xwin_transient_for); mb_wm_client_add_transient - (mb_wm_managed_client_from_xwindow (wm, + (mb_wm_manager_managed_window_from_xwindow (wm, win->xwin_transient_for), client); client->stacking_layer = 0; /* We stack with whatever transient too */ @@ -109,7 +109,7 @@ mb_wm_client_override_class_type () } MBWindowManagerClient* -mb_wm_client_override_new (MBWindowManager *wm, MBWMClientWindow *win) +mb_wm_client_override_new (MBWMManager *wm, MBWMClientWindow *win) { MBWindowManagerClient *client; diff --git a/matchbox/mb-wm-client-override.h b/matchbox/mb-wm-client-override.h index 2f155b4..b37338b 100644 --- a/matchbox/mb-wm-client-override.h +++ b/matchbox/mb-wm-client-override.h @@ -42,7 +42,7 @@ struct MBWMClientOverrideClass }; MBWindowManagerClient* -mb_wm_client_override_new (MBWindowManager *wm, MBWMClientWindow *win); +mb_wm_client_override_new (MBWMManager *wm, MBWMClientWindow *win); int mb_wm_client_override_class_type (); diff --git a/matchbox/mb-wm-client-panel.c b/matchbox/mb-wm-client-panel.c index c915d6b..4e43eb4 100644 --- a/matchbox/mb-wm-client-panel.c +++ b/matchbox/mb-wm-client-panel.c @@ -48,7 +48,7 @@ mb_wm_client_panel_init (MBWMObject *this, va_list vap) * window accordingly */ MBWMClientWindow * win = client->window; - MBWindowManager * wm = client->wmref; + MBWMManager * wm = client->wmref; int g_x, g_y, x, y, w, h; unsigned int g_w, g_h, g_bw, g_d; @@ -207,14 +207,14 @@ mb_wm_client_panel_stacking_layer (MBWindowManagerClient *client) /* * If we are showing desktop, ensure that we stack above it. */ - if (client->wmref->flags & MBWindowManagerFlagDesktop) + if (client->wmref->flags & MBWMManagerFlagDesktop) return MBWMStackLayerTopMid; return client->stacking_layer; } MBWindowManagerClient* -mb_wm_client_panel_new(MBWindowManager *wm, MBWMClientWindow *win) +mb_wm_client_panel_new(MBWMManager *wm, MBWMClientWindow *win) { MBWindowManagerClient *client = NULL; diff --git a/matchbox/mb-wm-client-panel.h b/matchbox/mb-wm-client-panel.h index 42096be..aeb9c4c 100644 --- a/matchbox/mb-wm-client-panel.h +++ b/matchbox/mb-wm-client-panel.h @@ -43,7 +43,7 @@ struct MBWMClientPanelClass }; MBWindowManagerClient* -mb_wm_client_panel_new(MBWindowManager *wm, MBWMClientWindow *win); +mb_wm_client_panel_new(MBWMManager *wm, MBWMClientWindow *win); int mb_wm_client_panel_class_type (); diff --git a/matchbox/mb-wm-client-window.c b/matchbox/mb-wm-client-window.c index f8ab6c1..f4fbdfa 100644 --- a/matchbox/mb-wm-client-window.c +++ b/matchbox/mb-wm-client-window.c @@ -97,7 +97,7 @@ mb_wm_client_window_init (MBWMObject *this, va_list vap) { MBWMClientWindow *win = MB_WM_CLIENT_WINDOW (this); MBWMObjectProp prop; - MBWindowManager *wm = NULL; + MBWMManager *wm = NULL; Window xwin = None; prop = va_arg(vap, MBWMObjectProp); @@ -106,7 +106,7 @@ mb_wm_client_window_init (MBWMObject *this, va_list vap) switch (prop) { case MBWMObjectPropWm: - wm = va_arg(vap, MBWindowManager *); + wm = va_arg(vap, MBWMManager *); break; case MBWMObjectPropXwindow: xwin = va_arg(vap, Window); @@ -154,7 +154,7 @@ mb_wm_client_window_class_type () } MBWMClientWindow* -mb_wm_client_window_new (MBWindowManager *wm, Window xwin) +mb_wm_client_window_new (MBWMManager *wm, Window xwin) { MBWMClientWindow *win; @@ -206,7 +206,7 @@ mb_wm_client_window_sync_properties ( MBWMClientWindow *win, unsigned long props_req) { MBWMCookie cookies[N_COOKIES]; - MBWindowManager *wm = win->wm; + MBWMManager *wm = win->wm; Atom actual_type_return, *result_atom = NULL; int actual_format_return; unsigned long nitems_return; diff --git a/matchbox/mb-wm-client-window.h b/matchbox/mb-wm-client-window.h index 80c304a..9d4b276 100644 --- a/matchbox/mb-wm-client-window.h +++ b/matchbox/mb-wm-client-window.h @@ -127,7 +127,7 @@ struct MBWMClientWindow Window xwindow; Visual *visual; Colormap colormap; - MBWindowManager *wm; + MBWMManager *wm; Atom net_type; Atom *net_type_full; @@ -170,7 +170,7 @@ int mb_wm_client_window_class_type (); MBWMClientWindow* -mb_wm_client_window_new (MBWindowManager *wm, Window xwin); +mb_wm_client_window_new (MBWMManager *wm, Window xwin); Bool mb_wm_client_window_sync_properties (MBWMClientWindow *win, diff --git a/matchbox/mb-wm-client.c b/matchbox/mb-wm-client.c index 963ac22..8dd0746 100644 --- a/matchbox/mb-wm-client.c +++ b/matchbox/mb-wm-client.c @@ -20,7 +20,7 @@ #include "mb-wm-config.h" #include "mb-wm-client.h" -#include "mb-window-manager.h" +#include "mb-wm-manager.h" #include "mb-wm-theme.h" #include <unistd.h> @@ -43,7 +43,7 @@ static void mb_wm_client_destroy (MBWMObject *obj) { MBWindowManagerClient * client = MB_WM_CLIENT(obj); - MBWindowManager * wm = client->wmref; + MBWMManager * wm = client->wmref; GList * l = client->decor; if (client->sig_theme_change_id) @@ -64,7 +64,7 @@ mb_wm_client_destroy (MBWMObject *obj) mb_wm_client_ping_stop (client); #if ENABLE_COMPOSITE - if (mb_wm_compositing_enabled (wm)) + if (mb_wm_manager_compositing_enabled (wm)) { mb_wm_comp_mgr_unregister_client (wm->comp_mgr, client); } @@ -109,7 +109,7 @@ mb_wm_client_on_property_change (MBWMClientWindow *window, void *userdata); static Bool -mb_wm_client_on_theme_change (MBWindowManager * wm, int signal, +mb_wm_client_on_theme_change (MBWMManager * wm, int signal, MBWindowManagerClient * client) { mb_wm_client_theme_change (client); @@ -121,7 +121,7 @@ static int mb_wm_client_init (MBWMObject *obj, va_list vap) { MBWindowManagerClient *client; - MBWindowManager *wm = NULL; + MBWMManager *wm = NULL; MBWMClientWindow *win = NULL; MBWMObjectProp prop; int status; @@ -132,7 +132,7 @@ mb_wm_client_init (MBWMObject *obj, va_list vap) switch (prop) { case MBWMObjectPropWm: - wm = va_arg(vap, MBWindowManager *); + wm = va_arg(vap, MBWMManager *); break; case MBWMObjectPropClientWindow: win = va_arg(vap, MBWMClientWindow *); @@ -171,7 +171,7 @@ mb_wm_client_init (MBWMObject *obj, va_list vap) client->sig_theme_change_id = mb_wm_object_signal_connect (MB_WM_OBJECT (wm), - MBWindowManagerSignalThemeChange, + MBWMManagerSignalThemeChange, (MBWMObjectCallbackFunc)mb_wm_client_on_theme_change, client); @@ -225,7 +225,7 @@ void mb_wm_client_fullscreen_mark_dirty (MBWindowManagerClient *client) { /* fullscreen implies geometry and visibility sync */ - mb_wm_display_sync_queue (client->wmref, + mb_wm_manager_display_sync_queue (client->wmref, MBWMSyncFullscreen | MBWMSyncVisibility | MBWMSyncGeometry); @@ -237,14 +237,14 @@ mb_wm_client_fullscreen_mark_dirty (MBWindowManagerClient *client) void mb_wm_client_stacking_mark_dirty (MBWindowManagerClient *client) { - mb_wm_display_sync_queue (client->wmref, MBWMSyncStacking); + mb_wm_manager_display_sync_queue (client->wmref, MBWMSyncStacking); client->priv->sync_state |= MBWMSyncStacking; } void mb_wm_client_geometry_mark_dirty (MBWindowManagerClient *client) { - mb_wm_display_sync_queue (client->wmref, MBWMSyncGeometry); + mb_wm_manager_display_sync_queue (client->wmref, MBWMSyncGeometry); client->priv->sync_state |= MBWMSyncGeometry; } @@ -252,7 +252,7 @@ mb_wm_client_geometry_mark_dirty (MBWindowManagerClient *client) void mb_wm_client_visibility_mark_dirty (MBWindowManagerClient *client) { - mb_wm_display_sync_queue (client->wmref, MBWMSyncVisibility); + mb_wm_manager_display_sync_queue (client->wmref, MBWMSyncVisibility); client->priv->sync_state |= MBWMSyncVisibility; @@ -262,7 +262,7 @@ mb_wm_client_visibility_mark_dirty (MBWindowManagerClient *client) void mb_wm_client_configure_request_ack_queue (MBWindowManagerClient *client) { - mb_wm_display_sync_queue (client->wmref, MBWMSyncConfigRequestAck); + mb_wm_manager_display_sync_queue (client->wmref, MBWMSyncConfigRequestAck); client->priv->sync_state |= MBWMSyncConfigRequestAck; @@ -278,7 +278,7 @@ mb_wm_client_needs_configure_request_ack (MBWindowManagerClient *client) void mb_wm_client_decor_mark_dirty (MBWindowManagerClient *client) { - mb_wm_display_sync_queue (client->wmref, MBWMSyncDecor); + mb_wm_manager_display_sync_queue (client->wmref, MBWMSyncDecor); client->priv->sync_state |= MBWMSyncDecor; @@ -330,7 +330,7 @@ mb_wm_client_on_property_change (MBWMClientWindow *window, } MBWindowManagerClient* /* FIXME: rename to mb_wm_client_base/class_new ? */ -mb_wm_client_new (MBWindowManager *wm, MBWMClientWindow *win) +mb_wm_client_new (MBWMManager *wm, MBWMClientWindow *win) { MBWindowManagerClient *client = NULL; @@ -425,7 +425,7 @@ mb_wm_client_hide (MBWindowManagerClient *client) client->priv->mapped = False; - mb_wm_unfocus_client (client->wmref, client); + mb_wm_manager_unfocus_window (client->wmref, client); mb_wm_client_visibility_mark_dirty (client); } } @@ -437,7 +437,7 @@ mb_wm_client_hide (MBWindowManagerClient *client) * of True indicating that the focus has changed. * * NB: This function should be considered protected and only called by the - * MBWindowManager object code. + * MBWMManager object code. */ Bool mb_wm_client_focus (MBWindowManagerClient *client) @@ -695,7 +695,7 @@ mb_wm_client_deliver_message (MBWindowManagerClient *client, unsigned long data3, unsigned long data4) { - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; Window xwin = client->window->xwindow; XEvent ev; @@ -720,7 +720,7 @@ void mb_wm_client_deliver_wm_protocol (MBWindowManagerClient *client, Atom protocol) { - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; mb_wm_client_deliver_message (client, wm->atoms[MBWM_ATOM_WM_PROTOCOLS], protocol, CurrentTime, 0, 0, 0); @@ -729,7 +729,7 @@ mb_wm_client_deliver_wm_protocol (MBWindowManagerClient *client, static void mb_wm_client_deliver_ping_protocol (MBWindowManagerClient *client) { - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; mb_wm_client_deliver_message (client, wm->atoms[MBWM_ATOM_WM_PROTOCOLS], @@ -744,7 +744,7 @@ mb_wm_client_ping_timeout_cb (void * userdata) { MBWindowManagerClient * client = userdata; - mb_wm_handle_hang_client (client->wmref, client); + mb_wm_manager_handle_hung_window (client->wmref, client); mb_wm_client_ping_stop (client); return False; @@ -753,7 +753,7 @@ mb_wm_client_ping_timeout_cb (void * userdata) void mb_wm_client_ping_start (MBWindowManagerClient *client) { - MBWindowManager * wm = client->wmref; + MBWMManager * wm = client->wmref; MBWMMainContext * ctx = wm->main_ctx; MBWMClientWindowProtos protos = client->window->protos; @@ -788,7 +788,7 @@ mb_wm_client_shutdown (MBWindowManagerClient *client) { char buf[257]; int sig = 9; - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; MBWMClientWindow *win = client->window; Window xwin = client->window->xwindow; const char *machine = win->machine; @@ -809,7 +809,7 @@ mb_wm_client_shutdown (MBWindowManagerClient *client) void mb_wm_client_deliver_delete (MBWindowManagerClient *client) { - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; MBWMClientWindowProtos protos = client->window->protos; if ((protos & MBWMClientWindowProtosDelete)) @@ -839,7 +839,7 @@ mb_wm_client_set_state (MBWindowManagerClient *client, MBWMAtom state, MBWMClientWindowStateChange state_op) { - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; MBWMClientWindow *win = client->window; Bool old_state; Bool new_state; @@ -917,7 +917,7 @@ mb_wm_client_set_state (MBWindowManagerClient *client, * fullscreen */ if (activate) - mb_wm_activate_client(wm, client); + mb_wm_manager_activate_window(wm, client); } Bool @@ -983,7 +983,7 @@ mb_wm_client_iconize (MBWindowManagerClient *client) * We cannot iconize the client until the effect finished, otherwise it * will unmap before the effect takes place, so we do this in the callback. */ - if (mb_wm_compositing_enabled (client->wmref)) + if (mb_wm_manager_compositing_enabled (client->wmref)) { mb_wm_comp_mgr_do_effect (client->wmref->comp_mgr, client, MBWMCompMgrClientEventMinimize); @@ -1002,7 +1002,7 @@ int mb_wm_client_title_height (MBWindowManagerClient *client) { MBWMClientWindow * win = client->window; - MBWindowManager * wm = client->wmref; + MBWMManager * wm = client->wmref; int north; if (!wm->theme || diff --git a/matchbox/mb-wm-client.h b/matchbox/mb-wm-client.h index 0596f41..341179e 100644 --- a/matchbox/mb-wm-client.h +++ b/matchbox/mb-wm-client.h @@ -104,10 +104,10 @@ MBWMClientReqGeomType; /* Methods */ -typedef void (*MBWMClientNewMethod) (MBWindowManager *wm, +typedef void (*MBWMClientNewMethod) (MBWMManager *wm, MBWMClientWindow *win); -typedef void (*MBWMClientInitMethod) (MBWindowManager *wm, +typedef void (*MBWMClientInitMethod) (MBWMManager *wm, MBWindowManagerClient *client, MBWMClientWindow *win); @@ -159,7 +159,7 @@ struct MBWindowManagerClient MBWMObject parent; /* ### public ### */ - MBWindowManager *wmref; + MBWMManager *wmref; char *name; MBWMClientWindow *window; Window xwin_frame; @@ -216,10 +216,10 @@ int mb_wm_client_class_type (); MBWMClientWindow* -mb_wm_client_window_new (MBWindowManager *wm, Window window); +mb_wm_client_window_new (MBWMManager *wm, Window window); MBWindowManagerClient* -mb_wm_client_new (MBWindowManager *wm, MBWMClientWindow *win); +mb_wm_client_new (MBWMManager *wm, MBWMClientWindow *win); void mb_wm_client_realize (MBWindowManagerClient *client); diff --git a/matchbox/mb-wm-comp-mgr-xrender.c b/matchbox/mb-wm-comp-mgr-xrender.c index 50ec924..635f653 100644 --- a/matchbox/mb-wm-comp-mgr-xrender.c +++ b/matchbox/mb-wm-comp-mgr-xrender.c @@ -82,7 +82,7 @@ mb_wm_comp_mgr_xrender_client_init (MBWMObject *obj, va_list vap) { MBWMCompMgrClient *client = MB_WM_COMP_MGR_CLIENT (obj); MBWMCompMgrDefaultClient *dclient = MB_WM_COMP_MGR_DEFAULT_CLIENT (obj); - MBWindowManager *wm; + MBWMManager *wm; MBWindowManagerClient *wm_client = client->wm_client; if (!wm_client || !wm_client->wmref) @@ -96,7 +96,7 @@ mb_wm_comp_mgr_xrender_client_destroy (MBWMObject* obj) { MBWMCompMgrClient * c = MB_WM_COMP_MGR_CLIENT (obj); MBWMCompMgrDefaultClient * dc = MB_WM_COMP_MGR_DEFAULT_CLIENT (obj); - MBWindowManager * wm = c->wm; + MBWMManager * wm = c->wm; mb_wm_comp_mgr_client_hide (c); @@ -161,12 +161,12 @@ mb_wm_comp_mgr_xrender_client_hide_real (MBWMCompMgrClient * client) { MBWMCompMgrDefaultClient * dclient = MB_WM_COMP_MGR_DEFAULT_CLIENT (client); MBWindowManagerClient * wm_client = client->wm_client; - MBWindowManager * wm = client->wm; + MBWMManager * wm = client->wm; MBWMCompMgr * mgr = wm->comp_mgr; MBWindowManagerClient * c; Bool is_modal = mb_wm_client_is_modal (wm_client); - if (is_modal && ((c = mb_wm_get_visible_main_client (wm)) != NULL)) + if (is_modal && ((c = mb_wm_manager_manager_get_visible_main_window (wm)) != NULL)) { XserverRegion extents; /* We need to make sure the any lowlighting on a 'parent' @@ -205,7 +205,7 @@ mb_wm_comp_mgr_xrender_client_show_real (MBWMCompMgrClient * client) { MBWMCompMgrDefaultClient * dclient = MB_WM_COMP_MGR_DEFAULT_CLIENT (client); MBWindowManagerClient * wm_client = client->wm_client; - MBWindowManager * wm = client->wm; + MBWMManager * wm = client->wm; MBWMCompMgr * mgr = wm->comp_mgr; XserverRegion region; XRenderPictureAttributes pa; @@ -408,7 +408,7 @@ mb_wm_comp_mgr_xrender_init (MBWMObject *obj, va_list vap) { MBWMCompMgr * mgr = MB_WM_COMP_MGR (obj); MBWMCompMgrDefault * dmgr = MB_WM_COMP_MGR_DEFAULT (obj); - MBWindowManager * wm = mgr->wm; + MBWMManager * wm = mgr->wm; MBWMCompMgrDefaultPrivate * priv; if (!wm) @@ -585,7 +585,7 @@ mb_wm_comp_mgr_xrender_shadow_setup_part (MBWMCompMgr * mgr, int width, int height) { - MBWindowManager * wm = mgr->wm; + MBWMManager * wm = mgr->wm; *ximage = XCreateImage (wm->xdpy, DefaultVisual(wm->xdpy, wm->xscreen), 8, ZPixmap, 0, 0, @@ -610,7 +610,7 @@ mb_wm_comp_mgr_xrender_shadow_finalise_part (MBWMCompMgr * mgr, int width, int height) { - MBWindowManager * wm = mgr->wm; + MBWMManager * wm = mgr->wm; GC gc = XCreateGC (wm->xdpy, pxm, 0, 0); XPutImage (wm->xdpy, pxm, gc, ximage, 0, 0, 0, 0, width, height); @@ -622,7 +622,7 @@ mb_wm_comp_mgr_xrender_shadow_finalise_part (MBWMCompMgr * mgr, static void mb_wm_comp_mgr_xrender_shadow_setup (MBWMCompMgr * mgr) { - MBWindowManager * wm = mgr->wm; + MBWMManager * wm = mgr->wm; MBWMCompMgrDefaultPrivate * priv = MB_WM_COMP_MGR_DEFAULT (mgr)->priv; XImage * ximage; Pixmap pxm; @@ -834,7 +834,7 @@ static Picture mb_wm_comp_mgr_xrender_shadow_gaussian_make_picture (MBWMCompMgr * mgr, int width, int height) { - MBWindowManager * wm = mgr->wm; + MBWMManager * wm = mgr->wm; MBWMCompMgrDefaultPrivate * priv = MB_WM_COMP_MGR_DEFAULT (mgr)->priv; Picture pic; Pixmap pxm; @@ -933,7 +933,7 @@ static XserverRegion mb_wm_comp_mgr_xrender_client_extents (MBWMCompMgrClient *client) { MBWindowManagerClient *wm_client = client->wm_client; - MBWindowManager *wm = client->wm; + MBWMManager *wm = client->wm; MBWMCompMgr *mgr = wm->comp_mgr; MBWMCompMgrDefaultPrivate *priv = MB_WM_COMP_MGR_DEFAULT (mgr)->priv; MBGeometry geom; @@ -979,7 +979,7 @@ mb_wm_comp_mgr_xrender_client_border_size (MBWMCompMgrClient * client, int x, int y) { MBWindowManagerClient * wm_client = client->wm_client; - MBWindowManager * wm = client->wm; + MBWMManager * wm = client->wm; XserverRegion border; border = XFixesCreateRegionFromWindow (wm->xdpy, @@ -997,7 +997,7 @@ mb_wm_comp_mgr_xrender_client_window_region (MBWMCompMgrClient *client, Window xwin, int x, int y) { MBWindowManagerClient * wm_client = client->wm_client; - MBWindowManager * wm = client->wm; + MBWMManager * wm = client->wm; XserverRegion region; region = @@ -1012,7 +1012,7 @@ mb_wm_comp_mgr_xrender_client_window_region (MBWMCompMgrClient *client, static Visual* mb_wm_comp_mgr_xrender_get_argb32_visual (MBWMCompMgr * mgr) { - MBWindowManager * wm = mgr->wm; + MBWMManager * wm = mgr->wm; XVisualInfo * xvi; XVisualInfo template; int nvi; @@ -1047,7 +1047,7 @@ mb_wm_comp_mgr_xrender_get_argb32_visual (MBWMCompMgr * mgr) static void mb_wm_comp_mgr_xrender_init_pictures (MBWMCompMgr *mgr) { - MBWindowManager * wm; + MBWMManager * wm; Window rwin; MBWMCompMgrDefaultPrivate * priv; Pixmap transPixmap, blackPixmap, lowlightPixmap, @@ -1161,7 +1161,7 @@ mb_wm_comp_mgr_xrender_init_pictures (MBWMCompMgr *mgr) static void mb_wm_comp_mgr_xrender_turn_off_real (MBWMCompMgr *mgr) { - MBWindowManager * wm; + MBWMManager * wm; Window rwin; MBWMCompMgrDefaultPrivate * priv; GList * l; @@ -1226,7 +1226,7 @@ mb_wm_comp_mgr_xrender_render_region (MBWMCompMgr *mgr, XserverRegion region); static void mb_wm_comp_mgr_xrender_turn_on_real (MBWMCompMgr *mgr) { - MBWindowManager * wm; + MBWMManager * wm; Window rwin; MBWMCompMgrDefaultPrivate * priv; GList * l; @@ -1277,7 +1277,7 @@ static void mb_wm_comp_mgr_xrender_add_damage (MBWMCompMgr * mgr, XserverRegion damage) { MBWMCompMgrDefaultPrivate * priv = MB_WM_COMP_MGR_DEFAULT (mgr)->priv; - MBWindowManager * wm = mgr->wm; + MBWMManager * wm = mgr->wm; if (priv->all_damage) { @@ -1289,14 +1289,14 @@ mb_wm_comp_mgr_xrender_add_damage (MBWMCompMgr * mgr, XserverRegion damage) else priv->all_damage = damage; - mb_wm_display_sync_queue (wm, MBWMSyncVisibility); + mb_wm_manager_display_sync_queue (wm, MBWMSyncVisibility); } static void mb_wm_comp_mgr_xrender_client_repair_real (MBWMCompMgrClient * client) { MBWindowManagerClient * wm_client = client->wm_client; - MBWindowManager * wm = client->wm; + MBWMManager * wm = client->wm; MBWMCompMgr * mgr = wm->comp_mgr; XserverRegion parts; MBGeometry geom; @@ -1318,7 +1318,7 @@ mb_wm_comp_mgr_xrender_client_configure_real (MBWMCompMgrClient * client) { MBWMCompMgrDefaultClient * dclient = MB_WM_COMP_MGR_DEFAULT_CLIENT (client); MBWindowManagerClient * wm_client = client->wm_client; - MBWindowManager * wm = client->wm; + MBWMManager * wm = client->wm; MBWMCompMgr * mgr = wm->comp_mgr; XserverRegion damage = None; XserverRegion extents; @@ -1351,10 +1351,10 @@ mb_wm_comp_mgr_xrender_handle_damage (XDamageNotifyEvent * de, MBWMCompMgr * mgr) { MBWMCompMgrDefaultPrivate * priv = MB_WM_COMP_MGR_DEFAULT (mgr)->priv; - MBWindowManager * wm = mgr->wm; + MBWMManager * wm = mgr->wm; MBWindowManagerClient * c; - c = mb_wm_managed_client_from_frame (wm, de->drawable); + c = mb_wm_manager_managed_window_from_frame (wm, de->drawable); if (c && c->cm_client) { @@ -1388,7 +1388,7 @@ _render_a_client (MBWMCompMgrClient * client, { MBWMCompMgrDefaultClient * dclient = MB_WM_COMP_MGR_DEFAULT_CLIENT (client); MBWindowManagerClient * wm_client = client->wm_client; - MBWindowManager * wm = client->wm; + MBWMManager * wm = client->wm; MBWMCompMgr * mgr = wm->comp_mgr; MBWMCompMgrDefaultPrivate * priv = MB_WM_COMP_MGR_DEFAULT (mgr)->priv; MBWMClientType ctype = MB_WM_CLIENT_CLIENT_TYPE (wm_client); @@ -1508,7 +1508,7 @@ mb_wm_comp_mgr_xrender_render_real (MBWMCompMgr *mgr) static void mb_wm_comp_mgr_xrender_render_region (MBWMCompMgr *mgr, XserverRegion region) { - MBWindowManager * wm = mgr->wm; + MBWMManager * wm = mgr->wm; MBWMCompMgrDefaultPrivate * priv = MB_WM_COMP_MGR_DEFAULT (mgr)->priv; MBWindowManagerClient * wmc_top, * wmc_temp, * wmc_solid = NULL; int lowlight = 0; @@ -1535,7 +1535,7 @@ mb_wm_comp_mgr_xrender_render_region (MBWMCompMgr *mgr, XserverRegion region) destroy_region = 1; } - wmc_top = mb_wm_get_visible_main_client (wm); + wmc_top = mb_wm_manager_manager_get_visible_main_window (wm); if (wmc_top) top_translucent = @@ -1575,7 +1575,7 @@ mb_wm_comp_mgr_xrender_render_region (MBWMCompMgr *mgr, XserverRegion region) if (type == MBWMClientTypeDialog && is_modal) { - MBWMModality modality = mb_wm_get_modality_type (wm); + MBWMModality modality = mb_wm_manager_get_modality_type (wm); switch (modality) { case MBWMModalityNormal: @@ -1826,7 +1826,7 @@ mb_wm_comp_mgr_xrender_render_region (MBWMCompMgr *mgr, XserverRegion region) } MBWMCompMgr * -mb_wm_comp_mgr_xrender_new (MBWindowManager *wm) +mb_wm_comp_mgr_xrender_new (MBWMManager *wm) { MBWMObject *mgr; diff --git a/matchbox/mb-wm-comp-mgr-xrender.h b/matchbox/mb-wm-comp-mgr-xrender.h index 15e52bd..708508c 100644 --- a/matchbox/mb-wm-comp-mgr-xrender.h +++ b/matchbox/mb-wm-comp-mgr-xrender.h @@ -55,7 +55,7 @@ int mb_wm_comp_mgr_xrender_class_type (); MBWMCompMgr* -mb_wm_comp_mgr_xrender_new (MBWindowManager *wm); +mb_wm_comp_mgr_xrender_new (MBWMManager *wm); struct MBWMCompMgrDefaultClientClass { diff --git a/matchbox/mb-wm-comp-mgr.c b/matchbox/mb-wm-comp-mgr.c index fe5afcc..4ce51a6 100644 --- a/matchbox/mb-wm-comp-mgr.c +++ b/matchbox/mb-wm-comp-mgr.c @@ -166,7 +166,7 @@ mb_wm_comp_mgr_client_repair (MBWMCompMgrClient * client) * MBWMCompMgr object * * Base class for the composite manager, providing the common interface - * through which the manager is access by the MBWindowManager object. + * through which the manager is access by the MBWMManager object. */ static void mb_wm_comp_mgr_class_init (MBWMObjectClass *klass) @@ -180,7 +180,7 @@ static int mb_wm_comp_mgr_init (MBWMObject *obj, va_list vap) { MBWMCompMgr * mgr = MB_WM_COMP_MGR (obj); - MBWindowManager * wm = NULL; + MBWMManager * wm = NULL; MBWMObjectProp prop; prop = va_arg(vap, MBWMObjectProp); @@ -189,7 +189,7 @@ mb_wm_comp_mgr_init (MBWMObject *obj, va_list vap) switch (prop) { case MBWMObjectPropWm: - wm = va_arg(vap, MBWindowManager *); + wm = va_arg(vap, MBWMManager *); break; default: MBWMO_PROP_EAT (vap, prop); @@ -431,7 +431,7 @@ mb_wm_comp_mgr_select_desktop (MBWMCompMgr * mgr, void mb_wm_comp_mgr_turn_on (MBWMCompMgr *mgr) { - MBWindowManager *wm = mgr->wm; + MBWMManager *wm = mgr->wm; MBWMCompMgrClass *klass = MB_WM_COMP_MGR_CLASS (MB_WM_OBJECT_GET_CLASS (mgr)); @@ -451,7 +451,7 @@ mb_wm_comp_mgr_turn_on (MBWMCompMgr *mgr) void mb_wm_comp_mgr_turn_off (MBWMCompMgr *mgr) { - MBWindowManager *wm = mgr->wm; + MBWMManager *wm = mgr->wm; MBWMCompMgrClass *klass = MB_WM_COMP_MGR_CLASS (MB_WM_OBJECT_GET_CLASS (mgr)); @@ -468,7 +468,7 @@ mb_wm_comp_mgr_turn_off (MBWMCompMgr *mgr) /* * Returns true if the window identified by id xwin is a special window * that belongs to the compositing manager and should, therefore, be left - * alone by MBWMWindow manager (e.g., the overalay window). + * alone by MBWindowManagerClient manager (e.g., the overalay window). */ Bool mb_wm_comp_mgr_is_my_window (MBWMCompMgr * mgr, Window xwin) diff --git a/matchbox/mb-wm-comp-mgr.h b/matchbox/mb-wm-comp-mgr.h index 9e7224c..60d7d92 100644 --- a/matchbox/mb-wm-comp-mgr.h +++ b/matchbox/mb-wm-comp-mgr.h @@ -55,7 +55,7 @@ struct MBWMCompMgr { MBWMObject parent; - MBWindowManager *wm; + MBWMManager *wm; Bool disabled; unsigned long damage_cb_id; }; @@ -143,7 +143,7 @@ struct MBWMCompMgrClient { MBWMObject parent; - MBWindowManager * wm; + MBWMManager * wm; MBWindowManagerClient * wm_client; /* Make private ? */ diff --git a/matchbox/mb-wm-decor.c b/matchbox/mb-wm-decor.c index eb3945e..51f674e 100644 --- a/matchbox/mb-wm-decor.c +++ b/matchbox/mb-wm-decor.c @@ -39,7 +39,7 @@ static int mb_wm_decor_init (MBWMObject *obj, va_list vap) { MBWMDecor *decor = MB_WM_DECOR (obj); - MBWindowManager *wm = NULL; + MBWMManager *wm = NULL; MBWMDecorType type = 0; MBWMObjectProp prop; int abs_packing = 0; @@ -50,7 +50,7 @@ mb_wm_decor_init (MBWMObject *obj, va_list vap) switch (prop) { case MBWMObjectPropWm: - wm = va_arg(vap, MBWindowManager *); + wm = va_arg(vap, MBWMManager *); break; case MBWMObjectPropDecorType: type = va_arg(vap, MBWMDecorType); @@ -200,7 +200,7 @@ mb_wm_decor_release_handler (XButtonEvent *xev, void *userdata) { MBWMDecor *decor = userdata; - MBWindowManager *wm = decor->parent_client->wmref; + MBWMManager *wm = decor->parent_client->wmref; mb_wm_main_context_x_event_handler_remove (wm->main_ctx, ButtonRelease, decor->release_cb_id); @@ -217,7 +217,7 @@ mb_wm_decor_press_handler (XButtonEvent *xev, void *userdata) { MBWMDecor *decor = userdata; - MBWindowManager *wm = decor->parent_client->wmref; + MBWMManager *wm = decor->parent_client->wmref; Bool retval = True; if (xev->window == decor->xwin) @@ -319,7 +319,7 @@ mb_wm_decor_press_handler (XButtonEvent *xev, static Bool mb_wm_decor_sync_window (MBWMDecor *decor) { - MBWindowManager *wm; + MBWMManager *wm; XSetWindowAttributes attr; if (decor->parent_client == NULL) @@ -410,7 +410,7 @@ mb_wm_decor_sync_window (MBWMDecor *decor) static Bool mb_wm_decor_reparent (MBWMDecor *decor) { - MBWindowManager *wm; + MBWMManager *wm; if (decor->parent_client == NULL) return False; @@ -438,7 +438,7 @@ mb_wm_decor_reparent (MBWMDecor *decor) static void mb_wm_decor_calc_geometry (MBWMDecor *decor) { - MBWindowManager *wm; + MBWMManager *wm; MBWindowManagerClient *client; int n, s, w, e; @@ -542,7 +542,7 @@ mb_wm_decor_handle_resize (MBWMDecor *decor) } MBWMDecor* -mb_wm_decor_new (MBWindowManager *wm, +mb_wm_decor_new (MBWMManager *wm, MBWMDecorType type) { MBWMObject *decor; @@ -690,7 +690,7 @@ static void mb_wm_decor_button_stock_button_action (MBWMDecorButton *button) { MBWindowManagerClient *client = button->decor->parent_client; - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; switch (button->type) { @@ -746,7 +746,7 @@ mb_wm_decor_button_press_handler (XButtonEvent *xev, { MBWMDecorButton *button = (MBWMDecorButton *)userdata; MBWMDecor *decor = button->decor; - MBWindowManager *wm = decor->parent_client->wmref; + MBWMManager *wm = decor->parent_client->wmref; GList *l = NULL; Bool retval = True; @@ -950,7 +950,7 @@ static int mb_wm_decor_button_init (MBWMObject *obj, va_list vap) { MBWMDecorButton *button = MB_WM_DECOR_BUTTON (obj); - MBWindowManager *wm = NULL; + MBWMManager *wm = NULL; MBWMDecor *decor = NULL; MBWMDecorButtonPressedFunc press = NULL; MBWMDecorButtonReleasedFunc release = NULL; @@ -965,7 +965,7 @@ mb_wm_decor_button_init (MBWMObject *obj, va_list vap) switch (prop) { case MBWMObjectPropWm: - wm = va_arg(vap, MBWindowManager *); + wm = va_arg(vap, MBWMManager *); break; case MBWMObjectPropDecor: decor = va_arg(vap, MBWMDecor*); @@ -1076,7 +1076,7 @@ static void mb_wm_decor_button_realize (MBWMDecorButton *button) { MBWMDecor *decor = button->decor; - MBWindowManager *wm = decor->parent_client->wmref; + MBWMManager *wm = decor->parent_client->wmref; button->press_cb_id = mb_wm_main_context_x_event_handler_add (wm->main_ctx, @@ -1120,7 +1120,7 @@ mb_wm_decor_button_move_to (MBWMDecorButton *button, int x, int y) } MBWMDecorButton* -mb_wm_decor_button_new (MBWindowManager *wm, +mb_wm_decor_button_new (MBWMManager *wm, MBWMDecorButtonType type, MBWMDecorButtonPack pack, MBWMDecor *decor, @@ -1144,7 +1144,7 @@ mb_wm_decor_button_new (MBWindowManager *wm, } MBWMDecorButton* -mb_wm_decor_button_stock_new (MBWindowManager *wm, +mb_wm_decor_button_stock_new (MBWMManager *wm, MBWMDecorButtonType type, MBWMDecorButtonPack pack, MBWMDecor *decor, diff --git a/matchbox/mb-wm-decor.h b/matchbox/mb-wm-decor.h index 4084cb8..a25ffdb 100644 --- a/matchbox/mb-wm-decor.h +++ b/matchbox/mb-wm-decor.h @@ -37,11 +37,11 @@ typedef struct MBWMDecorClass MBWMDecorClass; typedef struct MBWMDecorButton MBWMDecorButton; typedef struct MBWMDecorButtonClass MBWMDecorButtonClass; -typedef void (*MBWMDecorButtonPressedFunc) (MBWindowManager *wm, +typedef void (*MBWMDecorButtonPressedFunc) (MBWMManager *wm, MBWMDecorButton *button, void *userdata); -typedef void (*MBWMDecorButtonReleasedFunc) (MBWindowManager *wm, +typedef void (*MBWMDecorButtonReleasedFunc) (MBWMManager *wm, MBWMDecorButton *button, void *userdata); @@ -85,7 +85,7 @@ struct MBWMDecorClass MBWMDecor* -mb_wm_decor_new (MBWindowManager *wm, +mb_wm_decor_new (MBWMManager *wm, MBWMDecorType type); void @@ -215,7 +215,7 @@ void mb_wm_decor_button_handle_repaint (MBWMDecorButton *button); MBWMDecorButton* -mb_wm_decor_button_new (MBWindowManager *wm, +mb_wm_decor_button_new (MBWMManager *wm, MBWMDecorButtonType type, MBWMDecorButtonPack pack, MBWMDecor *decor, @@ -225,7 +225,7 @@ mb_wm_decor_button_new (MBWindowManager *wm, MBWMDecorButton* -mb_wm_decor_button_stock_new (MBWindowManager *wm, +mb_wm_decor_button_stock_new (MBWMManager *wm, MBWMDecorButtonType type, MBWMDecorButtonPack pack, MBWMDecor *decor, diff --git a/matchbox/mb-wm-keys.c b/matchbox/mb-wm-keys.c index 5c185de..0fe4e5c 100644 --- a/matchbox/mb-wm-keys.c +++ b/matchbox/mb-wm-keys.c @@ -17,7 +17,7 @@ struct MBWMKeys /* FIXME: Probably do want to hide these here */ }; static Bool -keysym_needs_shift (MBWindowManager *wm, KeySym keysym) +keysym_needs_shift (MBWMManager *wm, KeySym keysym) { int min_kc, max_kc, keycode, col; KeySym k; @@ -35,7 +35,7 @@ keysym_needs_shift (MBWindowManager *wm, KeySym keysym) } static Bool -key_binding_set_grab (MBWindowManager *wm, +key_binding_set_grab (MBWMManager *wm, MBWMKeyBinding *key, Bool ungrab) { @@ -101,13 +101,13 @@ key_binding_set_grab (MBWindowManager *wm, } void -mb_wm_keys_binding_remove_all (MBWindowManager *wm) +mb_wm_keys_binding_remove_all (MBWMManager *wm) { } void -mb_wm_keys_binding_remove (MBWindowManager *wm, +mb_wm_keys_binding_remove (MBWMManager *wm, MBWMKeyBinding *binding) { @@ -115,7 +115,7 @@ mb_wm_keys_binding_remove (MBWindowManager *wm, } MBWMKeyBinding* -mb_wm_keys_binding_add (MBWindowManager *wm, +mb_wm_keys_binding_add (MBWMManager *wm, KeySym ks, int mask, MBWMKeyPressedFunc press_func, @@ -147,7 +147,7 @@ mb_wm_keys_binding_add (MBWindowManager *wm, } MBWMKeyBinding* -mb_wm_keys_binding_add_with_spec (MBWindowManager *wm, +mb_wm_keys_binding_add_with_spec (MBWMManager *wm, const char *keystr, MBWMKeyPressedFunc press_func, MBWMKeyDestroyFunc destroy_func, @@ -260,7 +260,7 @@ mb_wm_keys_binding_add_with_spec (MBWindowManager *wm, } void /* FIXME: rename */ -mb_wm_keys_press (MBWindowManager *wm, +mb_wm_keys_press (MBWMManager *wm, KeySym keysym, int modifier_mask) { @@ -310,7 +310,7 @@ mb_wm_keys_press (MBWindowManager *wm, Bool -mb_wm_keys_init(MBWindowManager *wm) +mb_wm_keys_init(MBWMManager *wm) { int mod_idx, mod_key, col, kpm; XModifierKeymap *mod_map; diff --git a/matchbox/mb-wm-keys.h b/matchbox/mb-wm-keys.h index eb5608c..452444f 100644 --- a/matchbox/mb-wm-keys.h +++ b/matchbox/mb-wm-keys.h @@ -26,11 +26,11 @@ typedef struct MBWMKeys MBWMKeys; typedef struct MBWMKeyBinding MBWMKeyBinding; -typedef void (*MBWMKeyPressedFunc) (MBWindowManager *wm, +typedef void (*MBWMKeyPressedFunc) (MBWMManager *wm, MBWMKeyBinding *binding, void *userdata); -typedef void (*MBWMKeyDestroyFunc) (MBWindowManager *wm, +typedef void (*MBWMKeyDestroyFunc) (MBWMManager *wm, MBWMKeyBinding *binding, void *userdata); @@ -45,13 +45,13 @@ struct MBWMKeyBinding }; void -mb_wm_keys_binding_remove_all (MBWindowManager *wm); +mb_wm_keys_binding_remove_all (MBWMManager *wm); void -mb_wm_keys_binding_remove (MBWindowManager *wm, +mb_wm_keys_binding_remove (MBWMManager *wm, MBWMKeyBinding *binding); MBWMKeyBinding* -mb_wm_keys_binding_add (MBWindowManager *wm, +mb_wm_keys_binding_add (MBWMManager *wm, KeySym ks, int mask, MBWMKeyPressedFunc press_func, @@ -59,18 +59,18 @@ mb_wm_keys_binding_add (MBWindowManager *wm, void *userdata); MBWMKeyBinding* -mb_wm_keys_binding_add_with_spec (MBWindowManager *wm, +mb_wm_keys_binding_add_with_spec (MBWMManager *wm, const char *keystr, MBWMKeyPressedFunc press_func, MBWMKeyDestroyFunc destroy_func, void *userdata); void -mb_wm_keys_press (MBWindowManager *wm, +mb_wm_keys_press (MBWMManager *wm, KeySym keysym, int modifier_mask); Bool -mb_wm_keys_init (MBWindowManager *wm); +mb_wm_keys_init (MBWMManager *wm); #endif diff --git a/matchbox/mb-wm-layout.c b/matchbox/mb-wm-layout.c index 72d41e7..2dd1074 100644 --- a/matchbox/mb-wm-layout.c +++ b/matchbox/mb-wm-layout.c @@ -38,7 +38,7 @@ mb_wm_layout_init (MBWMObject *this, va_list vap) { MBWMLayout *layout = MB_WM_LAYOUT (this); MBWMObjectProp prop; - MBWindowManager *wm = NULL; + MBWMManager *wm = NULL; prop = va_arg(vap, MBWMObjectProp); while (prop) @@ -46,7 +46,7 @@ mb_wm_layout_init (MBWMObject *this, va_list vap) switch (prop) { case MBWMObjectPropWm: - wm = va_arg(vap, MBWindowManager *); + wm = va_arg(vap, MBWMManager *); break; default: MBWMO_PROP_EAT (vap, prop); @@ -84,7 +84,7 @@ mb_wm_layout_class_type () } MBWMLayout* -mb_wm_layout_new (MBWindowManager *wm) +mb_wm_layout_new (MBWMManager *wm) { MBWMLayout *layout; @@ -212,7 +212,7 @@ mb_wm_layout_maximise_geometry (MBGeometry *geom, static void mb_wm_layout_real_layout_panels (MBWMLayout *layout, MBGeometry * avail_geom) { - MBWindowManager *wm = layout->wm; + MBWMManager *wm = layout->wm; MBWindowManagerClient *client; MBGeometry coverage; Bool need_change; @@ -359,7 +359,7 @@ mb_wm_layout_real_layout_panels (MBWMLayout *layout, MBGeometry * avail_geom) static void mb_wm_layout_real_layout_input (MBWMLayout *layout, MBGeometry * avail_geom) { - MBWindowManager *wm = layout->wm; + MBWMManager *wm = layout->wm; MBWindowManagerClient *client; MBGeometry coverage; Bool need_change; @@ -535,7 +535,7 @@ mb_wm_layout_real_layout_input (MBWMLayout *layout, MBGeometry * avail_geom) static void mb_wm_layout_real_layout_free (MBWMLayout *layout, MBGeometry * avail_geom) { - MBWindowManager *wm = layout->wm; + MBWMManager *wm = layout->wm; MBWindowManagerClient *client; MBGeometry coverage; Bool need_change; @@ -593,7 +593,7 @@ mb_wm_layout_real_layout_free (MBWMLayout *layout, MBGeometry * avail_geom) static void mb_wm_layout_real_layout_fullscreen (MBWMLayout *layout, MBGeometry * avail_geom) { - MBWindowManager *wm = layout->wm; + MBWMManager *wm = layout->wm; MBWindowManagerClient *client; MBGeometry coverage; @@ -685,7 +685,7 @@ static void mb_wm_layout_real_update (MBWMLayout * layout) { MBWMLayoutClass *klass; - MBWindowManager *wm = layout->wm; + MBWMManager *wm = layout->wm; MBGeometry avail_geom; klass = MB_WM_LAYOUT_CLASS (MB_WM_OBJECT_GET_CLASS (layout)); @@ -695,7 +695,7 @@ mb_wm_layout_real_update (MBWMLayout * layout) MBWM_ASSERT (klass->layout_free); MBWM_ASSERT (klass->layout_fullscreen); - mb_wm_get_display_geometry (wm, &avail_geom); + mb_wm_manager_get_display_geometry (wm, &avail_geom); /* cycle through clients, laying out each in below order. @@ -736,7 +736,7 @@ mb_wm_layout_real_update (MBWMLayout * layout) klass->layout_input (layout, &avail_geom); klass->layout_free (layout, &avail_geom); - mb_wm_get_display_geometry (wm, &avail_geom); + mb_wm_manager_get_display_geometry (wm, &avail_geom); klass->layout_fullscreen (layout, &avail_geom); } diff --git a/matchbox/mb-wm-layout.h b/matchbox/mb-wm-layout.h index 1fe97de..33055d4 100644 --- a/matchbox/mb-wm-layout.h +++ b/matchbox/mb-wm-layout.h @@ -35,7 +35,7 @@ struct MBWMLayout { MBWMObject parent; - MBWindowManager *wm; + MBWMManager *wm; }; struct MBWMLayoutClass @@ -54,7 +54,7 @@ int mb_wm_layout_class_type (); MBWMLayout* -mb_wm_layout_new (MBWindowManager *wm); +mb_wm_layout_new (MBWMManager *wm); void mb_wm_layout_update (MBWMLayout *layout); 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 diff --git a/matchbox/mb-wm-main-context.h b/matchbox/mb-wm-main-context.h index c40d4b7..6a84cc2 100644 --- a/matchbox/mb-wm-main-context.h +++ b/matchbox/mb-wm-main-context.h @@ -22,7 +22,7 @@ #define _HAVE_MB_MAIN_CONTEXT_H #include <matchbox/mb-wm-object.h> -#include <matchbox/mb-window-manager.h> +#include <matchbox/mb-wm-manager.h> #include <poll.h> #define MB_WM_MAIN_CONTEXT(c) ((MBWMMainContext*)(c)) @@ -71,7 +71,7 @@ struct MBWMMainContext { MBWMObject parent; - MBWindowManager *wm; + MBWMManager *wm; MBWMEventFuncs event_funcs; struct pollfd *poll_fds; @@ -88,7 +88,7 @@ int mb_wm_main_context_class_type (); MBWMMainContext* -mb_wm_main_context_new(MBWindowManager *wm); +mb_wm_main_context_new(MBWMManager *wm); unsigned long mb_wm_main_context_x_event_handler_add (MBWMMainContext *ctx, @@ -105,7 +105,7 @@ mb_wm_main_context_x_event_handler_remove (MBWMMainContext *ctx, unsigned long mb_wm_main_context_timeout_handler_add (MBWMMainContext *ctx, int ms, - MBWindowManagerTimeOutFunc func, + MBWMManagerTimeOutFunc func, void *userdata); void @@ -125,7 +125,7 @@ unsigned long mb_wm_main_context_fd_watch_add (MBWMMainContext *ctx, MBWMIOChannel *channel, MBWMIOCondition events, - MBWindowManagerFdWatchFunc func, + MBWMManagerFdWatchFunc func, void *userdata); void diff --git a/matchbox/mb-window-manager.c b/matchbox/mb-wm-manager.c index 85ba720..1d87e85 100644 --- a/matchbox/mb-window-manager.c +++ b/matchbox/mb-wm-manager.c @@ -60,26 +60,26 @@ #include <X11/cursorfont.h> static void -mb_wm_process_cmdline (MBWindowManager *wm); +mb_wm_process_cmdline (MBWMManager *wm); static void -mb_wm_focus_client (MBWindowManager *wm, MBWindowManagerClient *client); +mb_wm_focus_client (MBWMManager *wm, MBWindowManagerClient *client); static Bool -mb_wm_activate_client_real (MBWindowManager * wm, MBWindowManagerClient *c); +mb_wm_manager_activate_window_real (MBWMManager * wm, MBWindowManagerClient *c); static void -mb_wm_update_root_win_rectangles (MBWindowManager *wm); +mb_wm_update_root_win_rectangles (MBWMManager *wm); static Bool -mb_wm_is_my_window (MBWindowManager *wm, Window xwin, +mb_wm_is_my_window (MBWMManager *wm, Window xwin, MBWindowManagerClient **client); static void -mb_wm_real_get_desktop_geometry (MBWindowManager *wm, MBGeometry *geom); +mb_wm_real_get_desktop_geometry (MBWMManager *wm, MBGeometry *geom); static MBWindowManagerClient* -mb_wm_client_new_func (MBWindowManager *wm, MBWMClientWindow *win) +mb_wm_client_new_func (MBWMManager *wm, MBWMClientWindow *win) { if (win->override_redirect) { @@ -147,7 +147,7 @@ mb_wm_client_new_func (MBWindowManager *wm, MBWMClientWindow *win) } static MBWMTheme * -mb_wm_real_theme_new (MBWindowManager * wm, const char * path) +mb_wm_real_theme_new (MBWMManager * wm, const char * path) { /* * FIXME -- load the selected theme from some configuration @@ -156,7 +156,7 @@ mb_wm_real_theme_new (MBWindowManager * wm, const char * path) } static MBWMLayout * -mb_wm_layout_new_real (MBWindowManager *wm) +mb_wm_layout_new_real (MBWMManager *wm) { MBWMLayout * layout = mb_wm_layout_new (wm); @@ -170,13 +170,13 @@ mb_wm_layout_new_real (MBWindowManager *wm) static GdkFilterReturn mb_wm_gdk_xevent_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data) { - MBWindowManager * wm = data; + MBWMManager * wm = data; XEvent * xev = (XEvent*) xevent; mb_wm_main_context_handle_x_event (xev, wm->main_ctx); if (wm->sync_type) - mb_wm_sync (wm); + mb_wm_manager_sync (wm); return GDK_FILTER_CONTINUE; } @@ -206,12 +206,12 @@ mb_wm_clutter_gdk_xevent_filter (GdkXEvent *xevent, GdkEvent *event, static ClutterX11FilterReturn mb_wm_clutter_xevent_filter (XEvent *xev, ClutterEvent *cev, gpointer data) { - MBWindowManager * wm = data; + MBWMManager * wm = data; mb_wm_main_context_handle_x_event (xev, wm->main_ctx); if (wm->sync_type) - mb_wm_sync (wm); + mb_wm_manager_sync (wm); return CLUTTER_X11_FILTER_CONTINUE; } @@ -220,7 +220,7 @@ mb_wm_clutter_xevent_filter (XEvent *xev, ClutterEvent *cev, gpointer data) #if MANAGER_CLUTTER || USE_GTK static void -mb_wm_main_real (MBWindowManager *wm) +mb_wm_main_real (MBWMManager *wm) { #if USE_GTK @@ -239,16 +239,16 @@ mb_wm_main_real (MBWindowManager *wm) static void mb_wm_class_init (MBWMObjectClass *klass) { - MBWindowManagerClass *wm_class; + MBWMManagerClass *wm_class; MBWM_MARK(); - wm_class = (MBWindowManagerClass *)klass; + wm_class = (MBWMManagerClass *)klass; wm_class->process_cmdline = mb_wm_process_cmdline; wm_class->client_new = mb_wm_client_new_func; wm_class->theme_new = mb_wm_real_theme_new; - wm_class->client_activate = mb_wm_activate_client_real; + wm_class->client_activate = mb_wm_manager_activate_window_real; wm_class->layout_new = mb_wm_layout_new_real; wm_class->get_desktop_geometry = mb_wm_real_get_desktop_geometry; @@ -257,14 +257,14 @@ mb_wm_class_init (MBWMObjectClass *klass) #endif #if MBWM_WANT_DEBUG - klass->klass_name = "MBWindowManager"; + klass->klass_name = "MBWMManager"; #endif } static void mb_wm_destroy (MBWMObject *this) { - MBWindowManager * wm = MB_WINDOW_MANAGER (this); + MBWMManager * wm = MB_WM_MANAGER (this); GList *l = wm->clients; while (l) @@ -284,19 +284,19 @@ mb_wm_destroy (MBWMObject *this) } static int -mb_window_manager_init (MBWMObject *this, va_list vap); +mb_wm_manager_init (MBWMObject *this, va_list vap); int -mb_wm_class_type () +mb_wm_manager_class_type () { static int type = 0; if (UNLIKELY(type == 0)) { static MBWMObjectClassInfo info = { - sizeof (MBWindowManagerClass), - sizeof (MBWindowManager), - mb_window_manager_init, + sizeof (MBWMManagerClass), + sizeof (MBWMManager), + mb_wm_manager_init, mb_wm_destroy, mb_wm_class_init }; @@ -307,12 +307,12 @@ mb_wm_class_type () return type; } -MBWindowManager* -mb_wm_new (int argc, char **argv) +MBWMManager* +mb_wm_manager_new (int argc, char **argv) { - MBWindowManager *wm = NULL; + MBWMManager *wm = NULL; - wm = MB_WINDOW_MANAGER (mb_wm_object_new (MB_TYPE_WINDOW_MANAGER, + wm = MB_WM_MANAGER (mb_wm_object_new (MB_WM_TYPE_MANAGER, MBWMObjectPropArgc, argc, MBWMObjectPropArgv, argv, NULL)); @@ -323,12 +323,12 @@ mb_wm_new (int argc, char **argv) return wm; } -MBWindowManager* -mb_wm_new_with_dpy (int argc, char **argv, Display * dpy) +MBWMManager* +mb_wm_manager_new_with_dpy (int argc, char **argv, Display * dpy) { - MBWindowManager *wm = NULL; + MBWMManager *wm = NULL; - wm = MB_WINDOW_MANAGER (mb_wm_object_new (MB_TYPE_WINDOW_MANAGER, + wm = MB_WM_MANAGER (mb_wm_object_new (MB_WM_TYPE_MANAGER, MBWMObjectPropArgc, argc, MBWMObjectPropArgv, argv, MBWMObjectPropDpy, dpy, @@ -344,7 +344,7 @@ static Bool mb_wm_handle_key_press (XKeyEvent *xev, void *userdata) { - MBWindowManager *wm = (MBWindowManager*)userdata; + MBWMManager *wm = (MBWMManager*)userdata; mb_wm_keys_press (wm, XKeycodeToKeysym(wm->xdpy, xev->keycode, 0), @@ -356,7 +356,7 @@ mb_wm_handle_key_press (XKeyEvent *xev, static Bool mb_wm_handle_button_press (XButtonEvent *xev, void *userdata) { - MBWindowManager *wm = (MBWindowManager*)userdata; + MBWMManager *wm = (MBWMManager*)userdata; MBWindowManagerClient *client = NULL; if (xev->button != 1) @@ -374,12 +374,12 @@ mb_wm_handle_button_press (XButtonEvent *xev, void *userdata) */ if (MB_WM_CLIENT_CLIENT_TYPE (client) == MBWMClientTypeApp) { - MBWindowManagerClient * top = mb_wm_get_visible_main_client(wm); + MBWindowManagerClient * top = mb_wm_manager_manager_get_visible_main_window(wm); if (top == client) mb_wm_focus_client (wm, client); else - mb_wm_activate_client (wm, client); + mb_wm_manager_activate_window (wm, client); } else { @@ -395,12 +395,12 @@ static Bool mb_wm_handle_destroy_notify (XDestroyWindowEvent *xev, void *userdata) { - MBWindowManager *wm = (MBWindowManager*)userdata; + MBWMManager *wm = (MBWMManager*)userdata; MBWindowManagerClient *client = NULL; MBWM_MARK(); - client = mb_wm_managed_client_from_xwindow(wm, xev->window); + client = mb_wm_manager_managed_window_from_xwindow(wm, xev->window); if (client) { @@ -414,7 +414,7 @@ mb_wm_handle_destroy_notify (XDestroyWindowEvent *xev, * on a different desktop than current, we have to unmanage * it, as it is still considered managed. */ - mb_wm_unmanage_client (wm, client, True); + mb_wm_manager_unmanage_window (wm, client, True); } else { @@ -428,7 +428,7 @@ mb_wm_handle_destroy_notify (XDestroyWindowEvent *xev, } } else - mb_wm_unmanage_client (wm, client, True); + mb_wm_manager_unmanage_window (wm, client, True); } return True; @@ -438,12 +438,12 @@ static Bool mb_wm_handle_unmap_notify (XUnmapEvent *xev, void *userdata) { - MBWindowManager *wm = (MBWindowManager*)userdata; + MBWMManager *wm = (MBWMManager*)userdata; MBWindowManagerClient *client = NULL; MBWM_MARK(); - client = mb_wm_managed_client_from_xwindow(wm, xev->window); + client = mb_wm_manager_managed_window_from_xwindow(wm, xev->window); if (client) { @@ -469,18 +469,18 @@ mb_wm_handle_unmap_notify (XUnmapEvent *xev, { MBWM_DBG ("iconizing client %p\n", client); - mb_wm_unmanage_client (wm, client, False); + mb_wm_manager_unmanage_window (wm, client, False); mb_wm_client_reset_iconizing (client); } else if (!mb_wm_client_window_is_state_set (client->window, MBWMClientWindowEWMHStateHidden)) { #if ENABLE_COMPOSITE - if (mb_wm_compositing_enabled (wm)) + if (mb_wm_manager_compositing_enabled (wm)) mb_wm_comp_mgr_unmap_notify (wm->comp_mgr, client); #endif MBWM_DBG ("removing client %p\n", client); - mb_wm_unmanage_client (wm, client, True); + mb_wm_manager_unmanage_window (wm, client, True); } } } @@ -492,7 +492,7 @@ static Bool mb_wm_handle_property_notify (XPropertyEvent *xev, void *userdata) { - MBWindowManager *wm = (MBWindowManager*)userdata; + MBWMManager *wm = (MBWMManager*)userdata; MBWindowManagerClient *client; int flag = 0; @@ -515,7 +515,7 @@ mb_wm_handle_property_notify (XPropertyEvent *xev, if (!type || !items) return True; - mb_wm_set_theme_from_path (wm, theme_path); + mb_wm_manager_set_theme_from_path (wm, theme_path); XFree (theme_path); } @@ -523,7 +523,7 @@ mb_wm_handle_property_notify (XPropertyEvent *xev, return True; } - client = mb_wm_managed_client_from_xwindow(wm, xev->window); + client = mb_wm_manager_managed_window_from_xwindow(wm, xev->window); if (!client) return True; @@ -561,13 +561,13 @@ static Bool mb_wm_handle_composite_config_notify (XConfigureEvent *xev, void *userdata) { - MBWindowManager * wm = (MBWindowManager*)userdata; + MBWMManager * wm = (MBWMManager*)userdata; if (mb_wm_comp_mgr_enabled (wm->comp_mgr)) { MBWindowManagerClient *client; - client = mb_wm_managed_client_from_frame (wm, xev->window); + client = mb_wm_manager_managed_window_from_frame (wm, xev->window); if (client) mb_wm_comp_mgr_client_configure (client->cm_client); @@ -584,21 +584,21 @@ static Bool mb_wm_handle_root_config_notify (XConfigureEvent *xev, void *userdata) { - MBWindowManager * wm = (MBWindowManager*)userdata; + MBWMManager * wm = (MBWMManager*)userdata; wm->xdpy_width = xev->width; wm->xdpy_height = xev->height; mb_wm_update_root_win_rectangles (wm); - mb_wm_display_sync_queue (wm, MBWMSyncGeometry); + mb_wm_manager_display_sync_queue (wm, MBWMSyncGeometry); } static Bool mb_wm_handle_config_request (XConfigureRequestEvent *xev, void *userdata) { - MBWindowManager *wm = (MBWindowManager*)userdata; + MBWMManager *wm = (MBWMManager*)userdata; MBWindowManagerClient *client; unsigned long value_mask; int req_x = xev->x; @@ -608,7 +608,7 @@ mb_wm_handle_config_request (XConfigureRequestEvent *xev, MBGeometry req_geom, *win_geom; Bool no_size_change; - client = mb_wm_managed_client_from_xwindow(wm, xev->window); + client = mb_wm_manager_managed_window_from_xwindow(wm, xev->window); if (!client) { @@ -644,7 +644,7 @@ mb_wm_handle_config_request (XConfigureRequestEvent *xev, * also want to tweak the window geometry. * * We make a note that the configure request needs a response - * and when we reach mb_wm_sync - but after all layout decisions + * and when we reach mb_wm_manager_sync - but after all layout decisions * have been made - then we can determine if the request * has been accepted or not and send any synthetic events as * needed. @@ -663,7 +663,7 @@ mb_wm_handle_config_request (XConfigureRequestEvent *xev, * window, optionaly return the client. */ static Bool -mb_wm_is_my_window (MBWindowManager *wm, +mb_wm_is_my_window (MBWMManager *wm, Window xwin, MBWindowManagerClient **client) { @@ -704,10 +704,10 @@ static Bool mb_wm_handle_map_notify (XMapEvent *xev, void *userdata) { - MBWindowManager *wm = (MBWindowManager*)userdata; + MBWMManager *wm = (MBWMManager*)userdata; MBWindowManagerClient *client = NULL; - MBWindowManagerClass *wm_class = - MB_WINDOW_MANAGER_CLASS (MB_WM_OBJECT_GET_CLASS (wm)); + MBWMManagerClass *wm_class = + MB_WM_MANAGER_CLASS (MB_WM_OBJECT_GET_CLASS (wm)); MBWMClientWindow *win = NULL; MBWM_NOTE (COMPOSITOR, "@@@@ Map Notify for %x @@@@\n", xev->window); @@ -760,7 +760,7 @@ mb_wm_handle_map_notify (XMapEvent *xev, return True; } - mb_wm_manage_client (wm, client, True); + mb_wm_manager_manage_window (wm, client, True); mb_wm_comp_mgr_map_notify (wm->comp_mgr, client); return True; @@ -771,10 +771,10 @@ static Bool mb_wm_handle_map_request (XMapRequestEvent *xev, void *userdata) { - MBWindowManager *wm = (MBWindowManager*)userdata; + MBWMManager *wm = (MBWMManager*)userdata; MBWindowManagerClient *client = NULL; - MBWindowManagerClass *wm_class = - MB_WINDOW_MANAGER_CLASS (MB_WM_OBJECT_GET_CLASS (wm)); + MBWMManagerClass *wm_class = + MB_WM_MANAGER_CLASS (MB_WM_OBJECT_GET_CLASS (wm)); MBWMClientWindow *win = NULL; MBWM_MARK(); @@ -784,7 +784,7 @@ mb_wm_handle_map_request (XMapRequestEvent *xev, if (mb_wm_is_my_window (wm, xev->window, &client)) { if (client) - mb_wm_activate_client (wm, client); + mb_wm_manager_activate_window (wm, client); return True; } @@ -808,14 +808,14 @@ mb_wm_handle_map_request (XMapRequestEvent *xev, return True; } - mb_wm_manage_client (wm, client, True); + mb_wm_manager_manage_window (wm, client, True); return True; } static void -stack_get_window_list (MBWindowManager *wm, Window * win_list, int * count) +stack_get_window_list (MBWMManager *wm, Window * win_list, int * count) { MBWindowManagerClient *client; int i = 0; @@ -839,7 +839,7 @@ stack_get_window_list (MBWindowManager *wm, Window * win_list, int * count) } static void -stack_sync_to_display (MBWindowManager *wm) +stack_sync_to_display (MBWMManager *wm) { Window *win_list = NULL; int count; @@ -863,7 +863,7 @@ stack_sync_to_display (MBWindowManager *wm) } void -mb_wm_sync (MBWindowManager *wm) +mb_wm_manager_sync (MBWMManager *wm) { /* Sync all changes to display */ MBWindowManagerClient *client = NULL; @@ -927,7 +927,7 @@ mb_wm_sync (MBWindowManager *wm) } static void -mb_wm_update_root_win_lists (MBWindowManager *wm) +mb_wm_update_root_win_lists (MBWMManager *wm) { Window root_win = wm->root_win->xwindow; @@ -946,14 +946,14 @@ mb_wm_update_root_win_lists (MBWindowManager *wm) wins = alloca (sizeof(Window) * list_size); app_wins = alloca (sizeof(Window) * list_size); - if ((wm->flags & MBWindowManagerFlagDesktop) && wm->desktop) + if ((wm->flags & MBWMManagerFlagDesktop) && wm->desktop) { wins[cnt++] = MB_WM_CLIENT_XWIN(wm->desktop); } mb_wm_stack_enumerate (wm,c) { - if (!(wm->flags & MBWindowManagerFlagDesktop) || c != wm->desktop) + if (!(wm->flags & MBWMManagerFlagDesktop) || c != wm->desktop) wins[cnt++] = c->window->xwindow; } @@ -1020,7 +1020,7 @@ mb_wm_update_root_win_lists (MBWindowManager *wm) } void -mb_wm_manage_client (MBWindowManager *wm, +mb_wm_manager_manage_window (MBWMManager *wm, MBWindowManagerClient *client, Bool activate) { @@ -1081,11 +1081,11 @@ mb_wm_manage_client (MBWindowManager *wm, #endif if (activate && MB_WM_CLIENT_CLIENT_TYPE (client) != MBWMClientTypeDesktop) - mb_wm_activate_client (wm, client); + mb_wm_manager_activate_window (wm, client); else mb_wm_client_show (client); - mb_wm_display_sync_queue (client->wmref, sync_flags); + mb_wm_manager_display_sync_queue (client->wmref, sync_flags); } /* @@ -1093,7 +1093,7 @@ mb_wm_manage_client (MBWindowManager *wm, * should be destroyed or moved into the iconized category. */ void -mb_wm_unmanage_client (MBWindowManager *wm, +mb_wm_manager_unmanage_window (MBWMManager *wm, MBWindowManagerClient *client, Bool destroy) { @@ -1159,7 +1159,7 @@ mb_wm_unmanage_client (MBWindowManager *wm, #endif if (wm->focused_client == client) - mb_wm_unfocus_client (wm, client); + mb_wm_manager_unfocus_window (wm, client); if (client == wm->desktop) wm->desktop = NULL; @@ -1167,11 +1167,11 @@ mb_wm_unmanage_client (MBWindowManager *wm, if (destroy) mb_wm_object_unref (MB_WM_OBJECT(client)); - mb_wm_display_sync_queue (wm, sync_flags); + mb_wm_manager_display_sync_queue (wm, sync_flags); } MBWindowManagerClient* -mb_wm_managed_client_from_xwindow(MBWindowManager *wm, Window win) +mb_wm_manager_managed_window_from_xwindow(MBWMManager *wm, Window win) { MBWindowManagerClient *client = NULL; GList *l; @@ -1194,7 +1194,7 @@ mb_wm_managed_client_from_xwindow(MBWindowManager *wm, Window win) } MBWindowManagerClient* -mb_wm_managed_client_from_frame (MBWindowManager *wm, Window frame) +mb_wm_manager_managed_window_from_frame (MBWMManager *wm, Window frame) { MBWindowManagerClient *client = NULL; GList *l; @@ -1225,19 +1225,19 @@ mb_wm_managed_client_from_frame (MBWindowManager *wm, Window frame) * * * If configured with glib main loop integration: * - * * If there is an implemetation for the MBWindowManager main() virtual + * * If there is an implemetation for the MBWMManager main() virtual * function, we call it. * * * Otherwise, start a normal glib main loop. */ void -mb_wm_main_loop(MBWindowManager *wm) +mb_wm_manager_main_loop(MBWMManager *wm) { #if !USE_GLIB_MAINLOOP mb_wm_main_context_loop (wm->main_ctx); #else - MBWindowManagerClass * wm_class = - MB_WINDOW_MANAGER_CLASS (MB_WM_OBJECT_GET_CLASS (wm)); + MBWMManagerClass * wm_class = + MB_WM_MANAGER_CLASS (MB_WM_OBJECT_GET_CLASS (wm)); #if !MANAGER_CLUTTER if (!wm_class->main) @@ -1259,7 +1259,7 @@ mb_wm_main_loop(MBWindowManager *wm) } void -mb_wm_get_display_geometry (MBWindowManager *wm, +mb_wm_manager_get_display_geometry (MBWMManager *wm, MBGeometry *geometry) { geometry->x = 0; @@ -1269,19 +1269,19 @@ mb_wm_get_display_geometry (MBWindowManager *wm, } void -mb_wm_display_sync_queue (MBWindowManager* wm, MBWMSyncType sync) +mb_wm_manager_display_sync_queue (MBWMManager* wm, MBWMSyncType sync) { wm->sync_type |= sync; } static void -mb_wm_manage_preexistsing_wins (MBWindowManager* wm) +mb_wm_manage_preexistsing_wins (MBWMManager* wm) { unsigned int nwins, i; Window foowin1, foowin2, *wins; XWindowAttributes attr; - MBWindowManagerClass * wm_class = - MB_WINDOW_MANAGER_CLASS (MB_WM_OBJECT_GET_CLASS (wm)); + MBWMManagerClass * wm_class = + MB_WM_MANAGER_CLASS (MB_WM_OBJECT_GET_CLASS (wm)); if (!wm_class->client_new) return; @@ -1321,13 +1321,13 @@ mb_wm_manage_preexistsing_wins (MBWindowManager* wm) #if ENABLE_COMPOSITE /* * Register the new client with the composite manager before - * we call mb_wm_manage_client() -- this is necessary so that + * we call mb_wm_manager_manage_window() -- this is necessary so that * we can process map notification on the frame. */ if (wm->comp_mgr && mb_wm_comp_mgr_enabled (wm->comp_mgr)) mb_wm_comp_mgr_register_client (wm->comp_mgr, client); #endif - mb_wm_manage_client(wm, client, False); + mb_wm_manager_manage_window(wm, client, False); } else mb_wm_object_unref (MB_WM_OBJECT (win)); @@ -1338,7 +1338,7 @@ mb_wm_manage_preexistsing_wins (MBWindowManager* wm) } static void -mb_wm_real_get_desktop_geometry (MBWindowManager *wm, MBGeometry * geom) +mb_wm_real_get_desktop_geometry (MBWMManager *wm, MBGeometry * geom) { MBWindowManagerClient *c; MBGeometry p_geom; @@ -1375,11 +1375,11 @@ mb_wm_real_get_desktop_geometry (MBWindowManager *wm, MBGeometry * geom) } static void -mb_wm_get_desktop_geometry (MBWindowManager *wm, MBGeometry * geom) +mb_wm_get_desktop_geometry (MBWMManager *wm, MBGeometry * geom) { - MBWindowManagerClass *wm_class; + MBWMManagerClass *wm_class; - wm_class = (MBWindowManagerClass *) MB_WM_OBJECT_GET_CLASS (wm); + wm_class = (MBWMManagerClass *) MB_WM_OBJECT_GET_CLASS (wm); MBWM_ASSERT (wm_class->get_desktop_geometry); @@ -1387,7 +1387,7 @@ mb_wm_get_desktop_geometry (MBWindowManager *wm, MBGeometry * geom) } static void -mb_wm_update_root_win_rectangles (MBWindowManager *wm) +mb_wm_update_root_win_rectangles (MBWMManager *wm) { Display * dpy = wm->xdpy; Window root = wm->root_win->xwindow; @@ -1417,14 +1417,14 @@ mb_wm_update_root_win_rectangles (MBWindowManager *wm) } int -mb_wm_register_client_type (void) +mb_wm_manager_register_window_type (void) { static int type_cnt = 0; return ++type_cnt; } static int -mb_wm_init_xdpy (MBWindowManager * wm, const char * display) +mb_wm_manager_init_xdpy (MBWMManager * wm, const char * display) { if (!wm->xdpy) { @@ -1446,29 +1446,29 @@ mb_wm_init_xdpy (MBWindowManager * wm, const char * display) } static void -mb_wm_init_cursors (MBWindowManager * wm) +mb_wm_manager_init_cursors (MBWMManager * wm) { XColor col; Pixmap pix = XCreatePixmap (wm->xdpy, wm->root_win->xwindow, 1, 1, 1); memset (&col, 0, sizeof (col)); - wm->cursors[MBWindowManagerCursorNone] = + wm->cursors[MBWMManagerCursorNone] = XCreatePixmapCursor (wm->xdpy, pix, pix, &col, &col, 1, 1); XFreePixmap (wm->xdpy, pix); - wm->cursors[MBWindowManagerCursorLeftPtr] = + wm->cursors[MBWMManagerCursorLeftPtr] = XCreateFontCursor(wm->xdpy, XC_left_ptr); - MBWM_ASSERT (wm->cursors[_MBWindowManagerCursorLast - 1] != 0); + MBWM_ASSERT (wm->cursors[_MBWMManagerCursorLast - 1] != 0); - mb_wm_set_cursor (wm, MBWindowManagerCursorLeftPtr); + mb_wm_manager_set_cursor (wm, MBWMManagerCursorLeftPtr); } #if ENABLE_COMPOSITE static Bool -mb_wm_init_comp_extensions (MBWindowManager *wm) +mb_wm_manager_init_comp_extensions (MBWMManager *wm) { int event_base, error_base; int damage_error; @@ -1498,21 +1498,21 @@ mb_wm_init_comp_extensions (MBWindowManager *wm) #endif /* - * This function must be called before the MBWindowManager object can be + * This function must be called before the MBWMManager object can be * used. */ static void -_mb_wm_init (MBWindowManager * wm, MBWMCompMgr *compositor) +_mb_wm_manager_run (MBWMManager * wm, MBWMCompMgr *compositor) { - MBWindowManagerClass *wm_class; + MBWMManagerClass *wm_class; - wm_class = (MBWindowManagerClass *) MB_WM_OBJECT_GET_CLASS (wm); + wm_class = (MBWMManagerClass *) MB_WM_OBJECT_GET_CLASS (wm); - mb_wm_set_theme_from_path (wm, wm->theme_path); + mb_wm_manager_set_theme_from_path (wm, wm->theme_path); MBWM_ASSERT (wm_class->layout_new); - mb_wm_set_layout (wm, wm_class->layout_new (wm)); + mb_wm_manager_set_layout (wm, wm_class->layout_new (wm)); #if ENABLE_COMPOSITE if (compositor) @@ -1520,7 +1520,7 @@ _mb_wm_init (MBWindowManager * wm, MBWMCompMgr *compositor) wm->comp_mgr = mb_wm_object_ref (MB_WM_OBJECT (compositor)); if (mb_wm_theme_use_compositing_mgr (wm->theme)) - mb_wm_compositing_on (wm); + mb_wm_manager_set_compositing_on (wm); } #endif @@ -1537,24 +1537,24 @@ _mb_wm_init (MBWindowManager * wm, MBWMCompMgr *compositor) } void -mb_wm_init (MBWindowManager *window_manager) +mb_wm_manager_run (MBWMManager *window_manager) { - _mb_wm_init (window_manager, NULL); + _mb_wm_manager_run (window_manager, NULL); } void -mb_wm_init_with_compositor (MBWindowManager *window_manager, +mb_wm_manager_run_with_compositor (MBWMManager *window_manager, MBWMCompMgr *compositor) { - _mb_wm_init (window_manager, compositor); + _mb_wm_manager_run (window_manager, compositor); } static int -mb_window_manager_init (MBWMObject *this, va_list vap) +mb_wm_manager_init (MBWMObject *this, va_list vap) { - MBWindowManager *wm = MB_WINDOW_MANAGER (this); - MBWindowManagerClass *wm_class; + MBWMManager *wm = MB_WM_MANAGER (this); + MBWMManagerClass *wm_class; MBWMObjectProp prop; int argc = 0; char **argv = NULL; @@ -1580,7 +1580,7 @@ mb_window_manager_init (MBWMObject *this, va_list vap) prop = va_arg(vap, MBWMObjectProp); } - wm_class = (MBWindowManagerClass *) MB_WM_OBJECT_GET_CLASS (wm); + wm_class = (MBWMManagerClass *) MB_WM_OBJECT_GET_CLASS (wm); wm->argv = argv; wm->argc = argc; @@ -1588,7 +1588,7 @@ mb_window_manager_init (MBWMObject *this, va_list vap) if (argc && argv && wm_class->process_cmdline) wm_class->process_cmdline (wm); - if (!mb_wm_init_xdpy (wm, NULL)) + if (!mb_wm_manager_init_xdpy (wm, NULL)) return 0; if (getenv("MB_SYNC")) @@ -1603,7 +1603,7 @@ mb_window_manager_init (MBWMObject *this, va_list vap) mb_wm_atoms_init(wm); #if ENABLE_COMPOSITE - if (!mb_wm_init_comp_extensions (wm)) + if (!mb_wm_manager_init_comp_extensions (wm)) return 0; #endif @@ -1677,7 +1677,7 @@ mb_window_manager_init (MBWMObject *this, va_list vap) mb_wm_keys_init(wm); - mb_wm_init_cursors (wm); + mb_wm_manager_init_cursors (wm); base_foo (); @@ -1713,7 +1713,7 @@ mb_wm_cmdline_help (const char *arg0, Bool quit) } static void -mb_wm_process_cmdline (MBWindowManager *wm) +mb_wm_process_cmdline (MBWMManager *wm) { int i; char ** argv = wm->argv; @@ -1727,14 +1727,14 @@ mb_wm_process_cmdline (MBWindowManager *wm) } else if (!strcmp(argv[i], "-theme-always-reload")) { - wm->flags |= MBWindowManagerFlagAlwaysReloadTheme; + wm->flags |= MBWMManagerFlagAlwaysReloadTheme; } else if (i < argc - 1) { /* These need to have a value after the name parameter */ if (!strcmp(argv[i], "-display")) { - mb_wm_init_xdpy (wm, argv[++i]); + mb_wm_manager_init_xdpy (wm, argv[++i]); } else if (!strcmp ("-sm-client-id", argv[i])) { @@ -1750,15 +1750,15 @@ mb_wm_process_cmdline (MBWindowManager *wm) /* * Anything below here needs a display conection */ - if (!wm->xdpy && !mb_wm_init_xdpy (wm, NULL)) + if (!wm->xdpy && !mb_wm_manager_init_xdpy (wm, NULL)) return; } void -mb_wm_activate_client (MBWindowManager * wm, MBWindowManagerClient *c) +mb_wm_manager_activate_window (MBWMManager * wm, MBWindowManagerClient *c) { - MBWindowManagerClass *wm_klass; - wm_klass = MB_WINDOW_MANAGER_CLASS (MB_WM_OBJECT_GET_CLASS (wm)); + MBWMManagerClass *wm_klass; + wm_klass = MB_WM_MANAGER_CLASS (MB_WM_OBJECT_GET_CLASS (wm)); MBWM_ASSERT (wm_klass->client_activate); @@ -1767,7 +1767,7 @@ mb_wm_activate_client (MBWindowManager * wm, MBWindowManagerClient *c) static Bool -mb_wm_activate_client_real (MBWindowManager * wm, MBWindowManagerClient *c) +mb_wm_manager_activate_window_real (MBWMManager * wm, MBWindowManagerClient *c) { MBWMClientType c_type; Bool was_desktop; @@ -1790,7 +1790,7 @@ mb_wm_activate_client_real (MBWindowManager * wm, MBWindowManagerClient *c) return True; } - was_desktop = (wm->flags & MBWindowManagerFlagDesktop); + was_desktop = (wm->flags & MBWMManagerFlagDesktop); /* * We are showing desktop if either the client is desktop, it is transient @@ -1807,9 +1807,9 @@ mb_wm_activate_client_real (MBWindowManager * wm, MBWindowManagerClient *c) MBWMClientTypeOverride)))); if (is_desktop) - wm->flags |= MBWindowManagerFlagDesktop; + wm->flags |= MBWMManagerFlagDesktop; else - wm->flags &= ~MBWindowManagerFlagDesktop; + wm->flags &= ~MBWMManagerFlagDesktop; mb_wm_client_show (c); @@ -1843,33 +1843,33 @@ mb_wm_activate_client_real (MBWindowManager * wm, MBWindowManagerClient *c) (unsigned char *)&c->window->xwindow, 1); } - mb_wm_display_sync_queue (wm, MBWMSyncStacking | MBWMSyncVisibility); + mb_wm_manager_display_sync_queue (wm, MBWMSyncStacking | MBWMSyncVisibility); return True; } MBWindowManagerClient* -mb_wm_get_visible_main_client(MBWindowManager *wm) +mb_wm_manager_manager_get_visible_main_window(MBWMManager *wm) { - if ((wm->flags & MBWindowManagerFlagDesktop) && wm->desktop) + if ((wm->flags & MBWMManagerFlagDesktop) && wm->desktop) return wm->desktop; return mb_wm_stack_get_highest_by_type (wm, MBWMClientTypeApp); } void -mb_wm_handle_ping_reply (MBWindowManager * wm, MBWindowManagerClient *c) +mb_wm_manager_handle_ping_reply (MBWMManager * wm, MBWindowManagerClient *c) { if (c == NULL) return; if (mb_wm_client_ping_in_progress (c)) { - MBWindowManagerClass *wm_klass; + MBWMManagerClass *wm_klass; mb_wm_client_ping_stop (c); - wm_klass = MB_WINDOW_MANAGER_CLASS (MB_WM_OBJECT_GET_CLASS (wm)); + wm_klass = MB_WM_MANAGER_CLASS (MB_WM_OBJECT_GET_CLASS (wm)); if (wm_klass->client_responding) wm_klass->client_responding (wm, c); @@ -1877,14 +1877,14 @@ mb_wm_handle_ping_reply (MBWindowManager * wm, MBWindowManagerClient *c) } void -mb_wm_handle_hang_client (MBWindowManager * wm, MBWindowManagerClient *c) +mb_wm_manager_handle_hung_window (MBWMManager * wm, MBWindowManagerClient *c) { - MBWindowManagerClass *wm_klass; + MBWMManagerClass *wm_klass; if (c == NULL) return; - wm_klass = MB_WINDOW_MANAGER_CLASS (MB_WM_OBJECT_GET_CLASS (wm)); + wm_klass = MB_WM_MANAGER_CLASS (MB_WM_OBJECT_GET_CLASS (wm)); if (!wm_klass->client_hang || !wm_klass->client_hang (wm, c)) { @@ -1893,39 +1893,39 @@ mb_wm_handle_hang_client (MBWindowManager * wm, MBWindowManagerClient *c) } void -mb_wm_toggle_desktop (MBWindowManager * wm) +mb_wm_manager_toggle_desktop (MBWMManager * wm) { - Bool show = !(wm->flags & MBWindowManagerFlagDesktop); - mb_wm_handle_show_desktop (wm, show); + Bool show = !(wm->flags & MBWMManagerFlagDesktop); + mb_wm_manager_handle_show_desktop (wm, show); } void -mb_wm_handle_show_desktop (MBWindowManager * wm, Bool show) +mb_wm_manager_handle_show_desktop (MBWMManager * wm, Bool show) { if (!wm->desktop) return; if (show) - mb_wm_activate_client (wm, wm->desktop); + mb_wm_manager_activate_window (wm, wm->desktop); else { MBWindowManagerClient * c = mb_wm_stack_get_highest_by_type (wm, MBWMClientTypeApp); if (c) - mb_wm_activate_client (wm, c); + mb_wm_manager_activate_window (wm, c); } } void -mb_wm_set_layout (MBWindowManager *wm, MBWMLayout *layout) +mb_wm_manager_set_layout (MBWMManager *wm, MBWMLayout *layout) { wm->layout = layout; wm->sync_type |= (MBWMSyncGeometry | MBWMSyncVisibility); } static void -mb_wm_focus_client (MBWindowManager *wm, MBWindowManagerClient *c) +mb_wm_focus_client (MBWMManager *wm, MBWindowManagerClient *c) { MBWindowManagerClient * client = c; @@ -1955,7 +1955,7 @@ mb_wm_focus_client (MBWindowManager *wm, MBWindowManagerClient *c) if (!mb_wm_client_is_realized (client)) { /* We need the window mapped before we can focus it, but do not - * want to do a full-scale mb_wm_sync (): + * want to do a full-scale mb_wm_manager_sync (): * * First We need to update layout, othewise the window will get frame * size of 0x0; then we can realize it, and do a display sync (i.e., @@ -2001,7 +2001,7 @@ mb_wm_focus_client (MBWindowManager *wm, MBWindowManagerClient *c) } void -mb_wm_unfocus_client (MBWindowManager *wm, MBWindowManagerClient *client) +mb_wm_manager_unfocus_window (MBWMManager *wm, MBWindowManagerClient *client) { MBWindowManagerClient *next = NULL; @@ -2030,17 +2030,17 @@ mb_wm_unfocus_client (MBWindowManager *wm, MBWindowManagerClient *client) wm->focused_client = NULL; if (next) - mb_wm_activate_client (wm, next); + mb_wm_manager_activate_window (wm, next); } void -mb_wm_cycle_apps (MBWindowManager *wm, Bool reverse) +mb_wm_manager_cycle_apps (MBWMManager *wm, Bool reverse) { MBWindowManagerClient *old_top, *new_top; - if (wm->flags & MBWindowManagerFlagDesktop) + if (wm->flags & MBWMManagerFlagDesktop) { - mb_wm_handle_show_desktop (wm, False); + mb_wm_manager_handle_show_desktop (wm, False); return; } @@ -2054,12 +2054,12 @@ mb_wm_cycle_apps (MBWindowManager *wm, Bool reverse) if (wm->comp_mgr && mb_wm_comp_mgr_enabled (wm->comp_mgr)) mb_wm_comp_mgr_do_transition (wm->comp_mgr, old_top, new_top, reverse); #endif - mb_wm_activate_client (wm, new_top); + mb_wm_manager_activate_window (wm, new_top); } } void -mb_wm_set_theme (MBWindowManager *wm, MBWMTheme * theme) +mb_wm_manager_set_theme (MBWMManager *wm, MBWMTheme * theme) { if (!theme) return; @@ -2072,7 +2072,7 @@ mb_wm_set_theme (MBWindowManager *wm, MBWMTheme * theme) wm->theme = theme; wm->sync_type |= (MBWMSyncGeometry | MBWMSyncVisibility | MBWMSyncDecor); - /* When initializing the MBWindowManager object, the theme gets created + /* When initializing the MBWMManager object, the theme gets created * before the root window, so that the root window can interogate it, * so we can get here before the window is in place */ @@ -2080,23 +2080,23 @@ mb_wm_set_theme (MBWindowManager *wm, MBWMTheme * theme) mb_wm_root_window_update_supported_props (wm->root_win); mb_wm_object_signal_emit (MB_WM_OBJECT (wm), - MBWindowManagerSignalThemeChange); + MBWMManagerSignalThemeChange); XUngrabServer(wm->xdpy); } void -mb_wm_set_theme_from_path (MBWindowManager *wm, const char *theme_path) +mb_wm_manager_set_theme_from_path (MBWMManager *wm, const char *theme_path) { MBWMTheme *theme; - MBWindowManagerClass *wm_class; + MBWMManagerClass *wm_class; - wm_class = MB_WINDOW_MANAGER_CLASS (MB_WM_OBJECT_GET_CLASS (wm)); + wm_class = MB_WM_MANAGER_CLASS (MB_WM_OBJECT_GET_CLASS (wm)); if (wm->theme) { - if (!(wm->flags & MBWindowManagerFlagAlwaysReloadTheme) && + if (!(wm->flags & MBWMManagerFlagAlwaysReloadTheme) && (wm->theme->path && theme_path && !strcmp (theme_path, wm->theme->path))) return; @@ -2107,11 +2107,11 @@ mb_wm_set_theme_from_path (MBWindowManager *wm, const char *theme_path) theme = wm_class->theme_new (wm, theme_path); - mb_wm_set_theme (wm, theme); + mb_wm_manager_set_theme (wm, theme); } void -mb_wm_set_cursor (MBWindowManager * wm, MBWindowManagerCursor cursor) +mb_wm_manager_set_cursor (MBWMManager * wm, MBWMManagerCursor cursor) { static int major = 0, minor = 0, ev_base, err_base; Display * dpy; @@ -2136,7 +2136,7 @@ mb_wm_set_cursor (MBWindowManager * wm, MBWindowManagerCursor cursor) if (major >= 4) { - if (cursor == MBWindowManagerCursorNone) + if (cursor == MBWMManagerCursorNone) { XFixesHideCursor (dpy, rwin); } @@ -2160,7 +2160,7 @@ mb_wm_set_cursor (MBWindowManager * wm, MBWindowManagerCursor cursor) } void -mb_wm_compositing_on (MBWindowManager *wm) +mb_wm_manager_set_compositing_on (MBWMManager *wm) { #if ENABLE_COMPOSITE if (wm->comp_mgr && !mb_wm_comp_mgr_enabled (wm->comp_mgr)) @@ -2169,7 +2169,7 @@ mb_wm_compositing_on (MBWindowManager *wm) } void -mb_wm_compositing_off (MBWindowManager * wm) +mb_wm_manager_set_compositing_off (MBWMManager * wm) { #if ENABLE_COMPOSITE if (wm->comp_mgr && mb_wm_comp_mgr_enabled (wm->comp_mgr)) @@ -2178,7 +2178,7 @@ mb_wm_compositing_off (MBWindowManager * wm) } Bool -mb_wm_compositing_enabled (MBWindowManager * wm) +mb_wm_manager_compositing_enabled (MBWMManager * wm) { #if ENABLE_COMPOSITE return mb_wm_comp_mgr_enabled (wm->comp_mgr); @@ -2188,13 +2188,13 @@ mb_wm_compositing_enabled (MBWindowManager * wm) } MBWMModality -mb_wm_get_modality_type (MBWindowManager * wm) +mb_wm_manager_get_modality_type (MBWMManager * wm) { return wm->modality_type; } void -mb_wm_set_n_desktops (MBWindowManager *wm, int n_desktops) +mb_wm_manager_set_n_desktops (MBWMManager *wm, int n_desktops) { CARD32 card32 = n_desktops; @@ -2210,7 +2210,7 @@ mb_wm_set_n_desktops (MBWindowManager *wm, int n_desktops) void -mb_wm_select_desktop (MBWindowManager *wm, int desktop) +mb_wm_manager_select_desktop (MBWMManager *wm, int desktop) { CARD32 card32 = desktop; MBWindowManagerClient *c; @@ -2225,7 +2225,7 @@ mb_wm_select_desktop (MBWindowManager *wm, int desktop) if (desktop >= wm->n_desktops) { - mb_wm_set_n_desktops (wm, desktop + 1); + mb_wm_manager_set_n_desktops (wm, desktop + 1); } mb_wm_stack_enumerate (wm, c) @@ -2237,13 +2237,13 @@ mb_wm_select_desktop (MBWindowManager *wm, int desktop) (unsigned char *)&card32, 1); #if ENABLE_COMPOSITE - if (mb_wm_compositing_enabled (wm)) + if (mb_wm_manager_compositing_enabled (wm)) mb_wm_comp_mgr_select_desktop (wm->comp_mgr, desktop, old_desktop); #endif } int -mb_wm_util_pixels_to_points (MBWindowManager *wm, int pixels) +mb_wm_manager_util_pixels_to_points (MBWMManager *wm, int pixels) { static double scale = 0.0; /* Points per pixel */ int points; diff --git a/matchbox/mb-window-manager.h b/matchbox/mb-wm-manager.h index 34b2897..72a27a2 100644 --- a/matchbox/mb-window-manager.h +++ b/matchbox/mb-wm-manager.h @@ -18,8 +18,8 @@ * */ -#ifndef _HAVE_MB_WM_WINDOW_MANAGER_H -#define _HAVE_MB_WM_WINDOW_MANAGER_H +#ifndef _HAVE_MB_WM_MANAGER_H +#define _HAVE_MB_WM_MANAGER_H #include <matchbox/mb-wm-config.h> #include <matchbox/mb-wm-object.h> @@ -40,34 +40,34 @@ typedef struct MBWMMainContext MBWMMainContext; #define MB_WM_MAIN_CONTEXT_TYPEDEF_DEFINED #endif -#define MB_WINDOW_MANAGER(c) ((MBWindowManager*)(c)) -#define MB_WINDOW_MANAGER_CLASS(c) ((MBWindowManagerClass*)(c)) -#define MB_TYPE_WINDOW_MANAGER (mb_wm_class_type ()) +#define MB_WM_MANAGER(c) ((MBWMManager*)(c)) +#define MB_WM_MANAGER_CLASS(c) ((MBWMManagerClass*)(c)) +#define MB_WM_TYPE_MANAGER (mb_wm_manager_class_type ()) -typedef struct MBWindowManagerClass MBWindowManagerClass; -typedef struct MBWindowManagerPriv MBWindowManagerPriv; +typedef struct MBWMManagerClass MBWMManagerClass; +typedef struct MBWMManagerPriv MBWMManagerPriv; -typedef enum MBWindowManagerFlag +typedef enum MBWMManagerFlag { - MBWindowManagerFlagDesktop = (1<<0), - MBWindowManagerFlagAlwaysReloadTheme = (1<<1), -} MBWindowManagerFlag; + MBWMManagerFlagDesktop = (1<<0), + MBWMManagerFlagAlwaysReloadTheme = (1<<1), +} MBWMManagerFlag; typedef enum { - MBWindowManagerSignalThemeChange = 1, -} MBWindowManagerSingal; + MBWMManagerSignalThemeChange = 1, +} MBWMManagerSingal; typedef enum { - MBWindowManagerCursorNone = 0, - MBWindowManagerCursorLeftPtr, + MBWMManagerCursorNone = 0, + MBWMManagerCursorLeftPtr, - _MBWindowManagerCursorLast -} MBWindowManagerCursor; + _MBWMManagerCursorLast +} MBWMManagerCursor; -struct MBWindowManager +struct MBWMManager { MBWMObject parent; @@ -100,14 +100,14 @@ struct MBWindowManager MBWMTheme *theme; MBWMLayout *layout; MBWMMainContext *main_ctx; - MBWindowManagerFlag flags; + MBWMManagerFlag flags; #if ENABLE_COMPOSITE MBWMCompMgr *comp_mgr; int damage_event_base; #endif - MBWindowManagerCursor cursor; - Cursor cursors[_MBWindowManagerCursorLast]; + MBWMManagerCursor cursor; + Cursor cursors[_MBWMManagerCursorLast]; /* Temporary stuff, only valid during object initialization */ const char *theme_path; @@ -118,140 +118,140 @@ struct MBWindowManager int argc; }; -struct MBWindowManagerClass +struct MBWMManagerClass { MBWMObjectClass parent; - void (*process_cmdline) (MBWindowManager * wm); + void (*process_cmdline) (MBWMManager * wm); - MBWindowManagerClient* (*client_new) (MBWindowManager *wm, + MBWindowManagerClient* (*client_new) (MBWMManager *wm, MBWMClientWindow *w); - MBWMLayout * (*layout_new) (MBWindowManager *wm); + MBWMLayout * (*layout_new) (MBWMManager *wm); /* These return True if now further action to be taken */ - Bool (*client_activate) (MBWindowManager *wm, MBWindowManagerClient *c); - Bool (*client_responding) (MBWindowManager *wm, MBWindowManagerClient *c); - Bool (*client_hang) (MBWindowManager *wm, MBWindowManagerClient *c); + Bool (*client_activate) (MBWMManager *wm, MBWindowManagerClient *c); + Bool (*client_responding) (MBWMManager *wm, MBWindowManagerClient *c); + Bool (*client_hang) (MBWMManager *wm, MBWindowManagerClient *c); - MBWMTheme * (*theme_new) (MBWindowManager *wm, const char * path); + MBWMTheme * (*theme_new) (MBWMManager *wm, const char * path); - void (*get_desktop_geometry) (MBWindowManager *wm, MBGeometry *geom); + void (*get_desktop_geometry) (MBWMManager *wm, MBGeometry *geom); - void (*main) (MBWindowManager *wm); + void (*main) (MBWMManager *wm); }; /** * SECTION:matchbox2 * @short_description: Core functions for creating and manipulating a - * #MBWindowManager + * #MBWMManager * - * The core object of Matchbox2 is the #MBWindowManager object, which + * The core object of Matchbox2 is the #MBWMManager object, which * is the first thing you would instantiate when implementing a new * window manager. */ -MBWindowManager * -mb_wm_new (int argc, char **argv); +MBWMManager * +mb_wm_manager_new (int argc, char **argv); -MBWindowManager * -mb_wm_new_with_dpy (int argc, char **argv, Display * dpy); +MBWMManager * +mb_wm_manager_new_with_dpy (int argc, char **argv, Display * dpy); void -mb_wm_init (MBWindowManager * wm); +mb_wm_manager_run (MBWMManager * wm); void -mb_wm_init_with_compositor (MBWindowManager * wm, MBWMCompMgr *compositor); +mb_wm_manager_run_with_compositor (MBWMManager * wm, MBWMCompMgr *compositor); void -mb_wm_set_layout (MBWindowManager *wm, MBWMLayout *layout); +mb_wm_manager_set_layout (MBWMManager *wm, MBWMLayout *layout); int -mb_wm_class_type (); +mb_wm_manager_class_type (); void -mb_wm_main_loop(MBWindowManager *wm); +mb_wm_manager_main_loop(MBWMManager *wm); MBWindowManagerClient* -mb_wm_managed_client_from_xwindow(MBWindowManager *wm, Window win); +mb_wm_manager_managed_window_from_xwindow(MBWMManager *wm, Window win); MBWindowManagerClient* -mb_wm_managed_client_from_frame (MBWindowManager *wm, Window frame); +mb_wm_manager_managed_window_from_frame (MBWMManager *wm, Window frame); int -mb_wm_register_client_type (void); +mb_wm_manager_register_window_type (void); void -mb_wm_manage_client (MBWindowManager *wm, +mb_wm_manager_manage_window (MBWMManager *wm, MBWindowManagerClient *client, Bool activate); void -mb_wm_unmanage_client (MBWindowManager *wm, +mb_wm_manager_unmanage_window (MBWMManager *wm, MBWindowManagerClient *client, Bool destroy); void -mb_wm_display_sync_queue (MBWindowManager* wm, MBWMSyncType sync); +mb_wm_manager_display_sync_queue (MBWMManager* wm, MBWMSyncType sync); void -mb_wm_get_display_geometry (MBWindowManager *wm, +mb_wm_manager_get_display_geometry (MBWMManager *wm, MBGeometry *geometry); void -mb_wm_activate_client(MBWindowManager * wm, MBWindowManagerClient *c); +mb_wm_manager_activate_window(MBWMManager * wm, MBWindowManagerClient *c); void -mb_wm_handle_ping_reply (MBWindowManager * wm, MBWindowManagerClient *c); +mb_wm_manager_handle_ping_reply (MBWMManager * wm, MBWindowManagerClient *c); void -mb_wm_handle_hang_client (MBWindowManager * wm, MBWindowManagerClient *c); +mb_wm_manager_handle_hung_window (MBWMManager * wm, MBWindowManagerClient *c); void -mb_wm_handle_show_desktop (MBWindowManager * wm, Bool show); +mb_wm_manager_handle_show_desktop (MBWMManager * wm, Bool show); void -mb_wm_toggle_desktop (MBWindowManager * wm); +mb_wm_manager_toggle_desktop (MBWMManager * wm); MBWindowManagerClient* -mb_wm_get_visible_main_client(MBWindowManager *wm); +mb_wm_manager_manager_get_visible_main_window(MBWMManager *wm); void -mb_wm_unfocus_client (MBWindowManager *wm, MBWindowManagerClient *client); +mb_wm_manager_unfocus_window (MBWMManager *wm, MBWindowManagerClient *client); void -mb_wm_cycle_apps (MBWindowManager *wm, Bool reverse); +mb_wm_manager_cycle_apps (MBWMManager *wm, Bool reverse); void -mb_wm_set_theme (MBWindowManager *wm, MBWMTheme * theme); +mb_wm_manager_set_theme (MBWMManager *wm, MBWMTheme * theme); void -mb_wm_set_theme_from_path (MBWindowManager *wm, const char *theme_path); +mb_wm_manager_set_theme_from_path (MBWMManager *wm, const char *theme_path); void -mb_wm_set_cursor (MBWindowManager * wm, MBWindowManagerCursor cursor); +mb_wm_manager_set_cursor (MBWMManager * wm, MBWMManagerCursor cursor); void -mb_wm_compositing_on (MBWindowManager * wm); +mb_wm_manager_set_compositing_on (MBWMManager * wm); void -mb_wm_compositing_off (MBWindowManager * wm); +mb_wm_manager_set_compositing_off (MBWMManager * wm); Bool -mb_wm_compositing_enabled (MBWindowManager * wm); +mb_wm_manager_compositing_enabled (MBWMManager * wm); MBWMModality -mb_wm_get_modality_type (MBWindowManager * wm); +mb_wm_manager_get_modality_type (MBWMManager * wm); void -mb_wm_sync (MBWindowManager *wm); +mb_wm_manager_sync (MBWMManager *wm); void -mb_wm_set_n_desktops (MBWindowManager *wm, int n_desktops); +mb_wm_manager_set_n_desktops (MBWMManager *wm, int n_desktops); void -mb_wm_select_desktop (MBWindowManager *wm, int desktop); +mb_wm_manager_select_desktop (MBWMManager *wm, int desktop); int -mb_wm_util_pixels_to_points (MBWindowManager *wm, int pixels); +mb_wm_manager_util_pixels_to_points (MBWMManager *wm, int pixels); #endif diff --git a/matchbox/mb-wm-props.c b/matchbox/mb-wm-props.c index fbf538a..283ffee 100644 --- a/matchbox/mb-wm-props.c +++ b/matchbox/mb-wm-props.c @@ -2,7 +2,7 @@ #include "xas.h" MBWMCookie -mb_wm_property_req (MBWindowManager *wm, +mb_wm_property_req (MBWMManager *wm, Window win, Atom property, long offset, @@ -25,7 +25,7 @@ mb_wm_property_req (MBWindowManager *wm, Status -mb_wm_property_reply (MBWindowManager *wm, +mb_wm_property_reply (MBWMManager *wm, MBWMCookie cookie, Atom *actual_type_return, int *actual_format_return, @@ -45,7 +45,7 @@ mb_wm_property_reply (MBWindowManager *wm, } void* -mb_wm_property_get_reply_and_validate (MBWindowManager *wm, +mb_wm_property_get_reply_and_validate (MBWMManager *wm, MBWMCookie cookie, Atom expected_type, int expected_format, @@ -95,7 +95,7 @@ mb_wm_property_get_reply_and_validate (MBWindowManager *wm, Bool -mb_wm_property_have_reply (MBWindowManager *wm, +mb_wm_property_have_reply (MBWMManager *wm, MBWMCookie cookie) { return xas_have_reply(wm->xas_context, (XasCookie)cookie); @@ -103,21 +103,21 @@ mb_wm_property_have_reply (MBWindowManager *wm, MBWMCookie -mb_wm_xwin_get_attributes (MBWindowManager *wm, +mb_wm_xwin_get_attributes (MBWMManager *wm, Window win) { return xas_get_window_attributes(wm->xas_context, win); } MBWMCookie -mb_wm_xwin_get_geometry (MBWindowManager *wm, +mb_wm_xwin_get_geometry (MBWMManager *wm, Drawable d) { return xas_get_geometry(wm->xas_context, d); } MBWMClientWindowAttributes* -mb_wm_xwin_get_attributes_reply (MBWindowManager *wm, +mb_wm_xwin_get_attributes_reply (MBWMManager *wm, MBWMCookie cookie, int *x_error_code) { @@ -128,7 +128,7 @@ mb_wm_xwin_get_attributes_reply (MBWindowManager *wm, } Status -mb_wm_xwin_get_geometry_reply (MBWindowManager *wm, +mb_wm_xwin_get_geometry_reply (MBWMManager *wm, XasCookie cookie, MBGeometry *geom_return, unsigned int *border_width_return, @@ -148,7 +148,7 @@ mb_wm_xwin_get_geometry_reply (MBWindowManager *wm, void -mb_wm_props_send_x_message (MBWindowManager *wm, +mb_wm_props_send_x_message (MBWMManager *wm, Window xwin_src, Window xwin_dest, Atom delivery_atom, @@ -184,7 +184,7 @@ mb_wm_props_send_x_message (MBWindowManager *wm, } void -mb_wm_props_sync_root_props (MBWindowManager *wm) +mb_wm_props_sync_root_props (MBWMManager *wm) { @@ -193,7 +193,7 @@ mb_wm_props_sync_root_props (MBWindowManager *wm) } void -mb_wm_props_root_message (MBWindowManager *wm) +mb_wm_props_root_message (MBWMManager *wm) { diff --git a/matchbox/mb-wm-props.h b/matchbox/mb-wm-props.h index 07418ca..4c04654 100644 --- a/matchbox/mb-wm-props.h +++ b/matchbox/mb-wm-props.h @@ -22,7 +22,7 @@ #define _HAVE_MB_WM_PROPS_H MBWMCookie -mb_wm_property_req (MBWindowManager *wm, +mb_wm_property_req (MBWMManager *wm, Window win, Atom property, long offset, @@ -31,7 +31,7 @@ mb_wm_property_req (MBWindowManager *wm, Atom req_type); Status -mb_wm_property_reply (MBWindowManager *wm, +mb_wm_property_reply (MBWMManager *wm, MBWMCookie cookie, Atom *actual_type_return, int *actual_format_return, @@ -41,7 +41,7 @@ mb_wm_property_reply (MBWindowManager *wm, int *x_error_code); void* -mb_wm_property_get_reply_and_validate (MBWindowManager *wm, +mb_wm_property_get_reply_and_validate (MBWMManager *wm, MBWMCookie cookie, Atom expected_type, int expected_format, @@ -49,25 +49,25 @@ mb_wm_property_get_reply_and_validate (MBWindowManager *wm, int *n_items_ret, int *x_error_code); Bool -mb_wm_property_have_reply (MBWindowManager *wm, +mb_wm_property_have_reply (MBWMManager *wm, MBWMCookie cookie); /* FIXME: mb_wm_xwin_* calls to go else where */ MBWMCookie -mb_wm_xwin_get_attributes (MBWindowManager *wm, +mb_wm_xwin_get_attributes (MBWMManager *wm, Window win); MBWMCookie -mb_wm_xwin_get_geometry (MBWindowManager *wm, +mb_wm_xwin_get_geometry (MBWMManager *wm, Drawable d); MBWMClientWindowAttributes* -mb_wm_xwin_get_attributes_reply (MBWindowManager *wm, +mb_wm_xwin_get_attributes_reply (MBWMManager *wm, MBWMCookie cookie, int *x_error_code); Status -mb_wm_xwin_get_geometry_reply (MBWindowManager *wm, +mb_wm_xwin_get_geometry_reply (MBWMManager *wm, XasCookie cookie, MBGeometry *geom_return, unsigned int *border_width_return, @@ -75,7 +75,7 @@ mb_wm_xwin_get_geometry_reply (MBWindowManager *wm, int *x_error_code); void -mb_wm_props_send_x_message (MBWindowManager *wm, +mb_wm_props_send_x_message (MBWMManager *wm, Window xwin_src, Window xwin_dest, Atom delivery_atom, 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: diff --git a/matchbox/mb-wm-root-window.h b/matchbox/mb-wm-root-window.h index 3d98006..095b171 100644 --- a/matchbox/mb-wm-root-window.h +++ b/matchbox/mb-wm-root-window.h @@ -22,7 +22,7 @@ #define _HAVE_MB_WM_ROOT_WINDOW_H #include <matchbox/mb-wm-object.h> -#include <matchbox/mb-window-manager.h> +#include <matchbox/mb-wm-manager.h> typedef struct MBWMRootWindow MBWMRootWindow; typedef struct MBWMRootWindowClass MBWMRootWindowClass; @@ -37,7 +37,7 @@ struct MBWMRootWindow Window xwindow; Window hidden_window; - MBWindowManager *wm; + MBWMManager *wm; }; struct MBWMRootWindowClass @@ -46,7 +46,7 @@ struct MBWMRootWindowClass }; MBWMRootWindow * -mb_wm_root_window_get (MBWindowManager *wm); +mb_wm_root_window_get (MBWMManager *wm); int mb_wm_root_window_class_type (); diff --git a/matchbox/mb-wm-stack.c b/matchbox/mb-wm-stack.c index f23cf58..afc33ea 100644 --- a/matchbox/mb-wm-stack.c +++ b/matchbox/mb-wm-stack.c @@ -35,7 +35,7 @@ mb_wm_stack_ensure_trans_foreach (MBWindowManagerClient *client, void *data) } void -mb_wm_stack_dump (MBWindowManager *wm) +mb_wm_stack_dump (MBWMManager *wm) { #if (MBWM_WANT_DEBUG) MBWindowManagerClient *client; @@ -75,7 +75,7 @@ mb_wm_stack_dump (MBWindowManager *wm) } void -mb_wm_stack_ensure (MBWindowManager *wm) +mb_wm_stack_ensure (MBWMManager *wm) { MBWindowManagerClient *client, *seen, *next; int i; @@ -135,7 +135,7 @@ void mb_wm_stack_insert_above_client (MBWindowManagerClient *client, MBWindowManagerClient *client_below) { - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; MBWM_ASSERT (client != NULL); @@ -168,7 +168,7 @@ mb_wm_stack_insert_above_client (MBWindowManagerClient *client, void mb_wm_stack_append_top (MBWindowManagerClient *client) { - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; mb_wm_stack_insert_above_client(client, wm->stack_top); } @@ -183,7 +183,7 @@ void mb_wm_stack_move_client_above_type (MBWindowManagerClient *client, MBWMClientType type_below) { - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; MBWindowManagerClient *highest_client = NULL; highest_client = mb_wm_stack_get_highest_by_type (wm, type_below); @@ -207,7 +207,7 @@ mb_wm_stack_move_above_client (MBWindowManagerClient *client, } MBWindowManagerClient* -mb_wm_stack_get_highest_by_type (MBWindowManager *wm, +mb_wm_stack_get_highest_by_type (MBWMManager *wm, MBWMClientType type) { MBWindowManagerClient *c = NULL; @@ -220,7 +220,7 @@ mb_wm_stack_get_highest_by_type (MBWindowManager *wm, } MBWindowManagerClient* -mb_wm_stack_get_lowest_by_type(MBWindowManager *w, MBWMClientType wanted_type) +mb_wm_stack_get_lowest_by_type(MBWMManager *w, MBWMClientType wanted_type) { MBWindowManagerClient *c = NULL; @@ -233,7 +233,7 @@ mb_wm_stack_get_lowest_by_type(MBWindowManager *w, MBWMClientType wanted_type) } MBWindowManagerClient * -mb_wm_stack_cycle_by_type(MBWindowManager *wm, MBWMClientType type, +mb_wm_stack_cycle_by_type(MBWMManager *wm, MBWMClientType type, Bool reverse) { if (reverse) @@ -278,7 +278,7 @@ mb_wm_stack_cycle_by_type(MBWindowManager *wm, MBWMClientType type, void mb_wm_stack_remove (MBWindowManagerClient *client) { - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; Bool change = False; if (wm->stack_top == wm->stack_bottom) diff --git a/matchbox/mb-wm-stack.h b/matchbox/mb-wm-stack.h index 58afc45..18eda0d 100644 --- a/matchbox/mb-wm-stack.h +++ b/matchbox/mb-wm-stack.h @@ -50,7 +50,7 @@ (w)->stack_n_clients void -mb_wm_stack_ensure (MBWindowManager *wm); +mb_wm_stack_ensure (MBWMManager *wm); void mb_wm_stack_insert_above_client (MBWindowManagerClient *client, @@ -71,7 +71,7 @@ mb_wm_stack_move_client_above_type (MBWindowManagerClient *client, MBWMClientType type_below); MBWindowManagerClient * -mb_wm_stack_cycle_by_type(MBWindowManager *w, MBWMClientType type, +mb_wm_stack_cycle_by_type(MBWMManager *w, MBWMClientType type, Bool reverse); void @@ -79,18 +79,18 @@ mb_wm_stack_move_above_client (MBWindowManagerClient *client, MBWindowManagerClient *client_below); MBWindowManagerClient* -mb_wm_stack_get_highest_by_type(MBWindowManager *w, +mb_wm_stack_get_highest_by_type(MBWMManager *w, MBWMClientType wanted_type); MBWindowManagerClient* -mb_wm_stack_get_lowest_by_type(MBWindowManager *w, +mb_wm_stack_get_lowest_by_type(MBWMManager *w, MBWMClientType wanted_type); void mb_wm_stack_remove (MBWindowManagerClient *client); void -mb_wm_stack_dump (MBWindowManager *wm); +mb_wm_stack_dump (MBWMManager *wm); #endif diff --git a/matchbox/mb-wm-theme-png.c b/matchbox/mb-wm-theme-png.c index d671b4d..c242d9b 100644 --- a/matchbox/mb-wm-theme-png.c +++ b/matchbox/mb-wm-theme-png.c @@ -207,7 +207,7 @@ xft_load_font(MBWMDecor * decor, MBWMXmlDecor *d) if (d->font_units == MBWMXmlFontUnitsPixels) { - font_size = mb_wm_util_pixels_to_points (decor->parent_client->wmref, + font_size = mb_wm_manager_util_pixels_to_points (decor->parent_client->wmref, font_size); } @@ -874,7 +874,7 @@ static void construct_buttons (MBWMThemePng * theme, MBWMDecor * decor, MBWMXmlDecor *d) { MBWindowManagerClient *client = decor->parent_client; - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; MBWMDecorButton *button; if (d) @@ -905,7 +905,7 @@ mb_wm_theme_png_create_decor (MBWMTheme *theme, { MBWMClientType c_type = MB_WM_CLIENT_CLIENT_TYPE (client); MBWMDecor *decor = NULL; - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; MBWMXmlClient *c; if ((c = mb_wm_xml_client_find_by_type (theme->xml_clients, c_type))) @@ -1204,7 +1204,7 @@ mb_wm_theme_png_load_file (const char *file, static int mb_wm_theme_png_ximg (MBWMThemePng * theme, const char * img) { - MBWindowManager * wm = MB_WM_THEME (theme)->wm; + MBWMManager * wm = MB_WM_THEME (theme)->wm; Display * dpy = wm->xdpy; int screen = wm->xscreen; diff --git a/matchbox/mb-wm-theme.c b/matchbox/mb-wm-theme.c index f496c24..2ba1f0a 100644 --- a/matchbox/mb-wm-theme.c +++ b/matchbox/mb-wm-theme.c @@ -107,7 +107,7 @@ static int mb_wm_theme_init (MBWMObject *obj, va_list vap) { MBWMTheme *theme = MB_WM_THEME (obj); - MBWindowManager *wm = NULL; + MBWMManager *wm = NULL; MBWMObjectProp prop; GList *xml_clients = NULL; char *path = NULL; @@ -120,7 +120,7 @@ mb_wm_theme_init (MBWMObject *obj, va_list vap) switch (prop) { case MBWMObjectPropWm: - wm = va_arg(vap, MBWindowManager *); + wm = va_arg(vap, MBWMManager *); break; case MBWMObjectPropThemePath: path = va_arg(vap, char *); @@ -381,7 +381,7 @@ struct expat_data }; MBWMTheme * -mb_wm_theme_new (MBWindowManager * wm, const char * theme_path) +mb_wm_theme_new (MBWMManager * wm, const char * theme_path) { MBWMTheme *theme = NULL; int theme_type = 0; @@ -1380,7 +1380,7 @@ construct_buttons (MBWMTheme * theme, MBWMDecor * decor, MBWMXmlDecor *d) { MBWindowManagerClient *client = decor->parent_client; - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; MBWMDecorButton *button; if (d) @@ -1497,7 +1497,7 @@ mb_wm_theme_simple_create_decor (MBWMTheme *theme, { MBWMClientType c_type = MB_WM_CLIENT_CLIENT_TYPE (client); MBWMDecor *decor = NULL; - MBWindowManager *wm = client->wmref; + MBWMManager *wm = client->wmref; MBWMXmlClient *c; if (MB_WM_THEME (theme)->xml_clients && @@ -1749,7 +1749,7 @@ xft_load_font (MBWMDecor * decor, MBWMXmlDecor *d) if (!d || d->font_units == MBWMXmlFontUnitsPixels) { - font_size = mb_wm_util_pixels_to_points (decor->parent_client->wmref, + font_size = mb_wm_manager_util_pixels_to_points (decor->parent_client->wmref, font_size); } @@ -1769,7 +1769,7 @@ mb_wm_theme_simple_paint_decor (MBWMTheme *theme, MBWMDecor *decor) const MBGeometry *geom; MBWindowManagerClient *client; Window xwin; - MBWindowManager *wm = theme->wm; + MBWMManager *wm = theme->wm; MBWMColor clr_bg; MBWMColor clr_fg; MBWMClientType c_type; @@ -1896,7 +1896,7 @@ mb_wm_theme_simple_paint_button (MBWMTheme *theme, MBWMDecorButton *button) MBWMDecor *decor; MBWindowManagerClient *client; Window xwin; - MBWindowManager *wm = theme->wm; + MBWMManager *wm = theme->wm; int x, y, w, h; MBWMColor clr_bg; MBWMColor clr_fg; diff --git a/matchbox/mb-wm-theme.h b/matchbox/mb-wm-theme.h index b90bc88..574c8c6 100644 --- a/matchbox/mb-wm-theme.h +++ b/matchbox/mb-wm-theme.h @@ -91,7 +91,7 @@ struct MBWMTheme { MBWMObject parent; - MBWindowManager *wm; + MBWMManager *wm; MBWMThemeCaps caps; char *path; GList *xml_clients; @@ -107,7 +107,7 @@ int mb_wm_theme_class_type (); MBWMTheme * -mb_wm_theme_new (MBWindowManager * wm, const char * theme_path); +mb_wm_theme_new (MBWMManager * wm, const char * theme_path); void mb_wm_theme_paint_decor (MBWMTheme *theme, diff --git a/matchbox/mb-wm-types.h b/matchbox/mb-wm-types.h index 5d6dbf7..5111f2b 100644 --- a/matchbox/mb-wm-types.h +++ b/matchbox/mb-wm-types.h @@ -32,7 +32,7 @@ /* XXX: The plan is to eventually move this into mb-wm-window-manager.h * the way we expose private struct members currently ends up resulting * in *lots* of circular typedef dependencies! */ -typedef struct MBWindowManager MBWindowManager; +typedef struct MBWMManager MBWMManager; typedef struct MBWMFuncInfo { @@ -246,7 +246,7 @@ typedef Bool (*MBWMXEventFunc) (void *xev, void *userdata); -typedef Bool (*MBWindowManagerMapNotifyFunc) +typedef Bool (*MBWMManagerMapNotifyFunc) (XMapEvent *xev, void *userdata); @@ -254,47 +254,47 @@ typedef Bool (*MBWindowManagerClientMessageFunc) (XClientMessageEvent *xev, void *userdata); -typedef Bool (*MBWindowManagerMapRequestFunc) +typedef Bool (*MBWMManagerMapRequestFunc) (XMapRequestEvent *xev, void *userdata); -typedef Bool (*MBWindowManagerUnmapNotifyFunc) +typedef Bool (*MBWMManagerUnmapNotifyFunc) (XUnmapEvent *xev, void *userdata); -typedef Bool (*MBWindowManagerDestroyNotifyFunc) +typedef Bool (*MBWMManagerDestroyNotifyFunc) (XDestroyWindowEvent *xev, void *userdata); -typedef Bool (*MBWindowManagerConfigureNotifyFunc) +typedef Bool (*MBWMManagerConfigureNotifyFunc) (XConfigureEvent *xev, void *userdata); -typedef Bool (*MBWindowManagerConfigureRequestFunc) +typedef Bool (*MBWMManagerConfigureRequestFunc) (XConfigureRequestEvent *xev, void *userdata); -typedef Bool (*MBWindowManagerKeyPressFunc) +typedef Bool (*MBWMManagerKeyPressFunc) (XKeyEvent *xev, void *userdata); -typedef Bool (*MBWindowManagerPropertyNotifyFunc) +typedef Bool (*MBWMManagerPropertyNotifyFunc) (XPropertyEvent *xev, void *userdata); -typedef Bool (*MBWindowManagerButtonPressFunc) +typedef Bool (*MBWMManagerButtonPressFunc) (XButtonEvent *xev, void *userdata); -typedef Bool (*MBWindowManagerButtonReleaseFunc) +typedef Bool (*MBWMManagerButtonReleaseFunc) (XButtonEvent *xev, void *userdata); -typedef Bool (*MBWindowManagerMotionNotifyFunc) +typedef Bool (*MBWMManagerMotionNotifyFunc) (XMotionEvent *xev, void *userdata); -typedef Bool (*MBWindowManagerTimeOutFunc) +typedef Bool (*MBWMManagerTimeOutFunc) (void *userdata); #if USE_GLIB_MAINLOOP @@ -305,7 +305,7 @@ typedef int MBWMIOChannel; typedef int MBWMIOCondition; #endif -typedef Bool (*MBWindowManagerFdWatchFunc) +typedef Bool (*MBWMManagerFdWatchFunc) (MBWMIOChannel *channel, MBWMIOCondition events, void *userdata); |