aboutsummaryrefslogtreecommitdiffstats
path: root/managers
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2010-08-18 12:59:33 +0100
committerRobert Bragg <robert@linux.intel.com>2010-12-09 22:46:47 +0000
commit2840ebd7b29af37d7e36dff000f6aa409d048041 (patch)
treecc17d85b8b006e2c5ef8238a8cfb65b501e965b2 /managers
parenta8e582f0d589a4405fc86855903a3d39a45df655 (diff)
downloadlibmatchboxwm2-2840ebd7b29af37d7e36dff000f6aa409d048041.tar.gz
libmatchboxwm2-2840ebd7b29af37d7e36dff000f6aa409d048041.tar.bz2
libmatchboxwm2-2840ebd7b29af37d7e36dff000f6aa409d048041.zip
rename mb-window-manager -> mb-wm-manager
So the naming of MBWindowManager is consistent with other matchbox objects the new name is MBWMManager. The API has also been modified so that method functions aren't simply using the mb_wm_method_name scheme they new use a mb_wm_manager_method_name scheme. Some of the property setters were missing an explicit "set" in the name which has been added, and in anticipation that we will start to replace the use of "client" with "window" some of methods corresponding to windows have been renamed ahead of time.
Diffstat (limited to 'managers')
-rw-r--r--managers/clutter/mb-wm-comp-mgr-clutter.c22
-rw-r--r--managers/clutter/mb-wm-comp-mgr-clutter.h2
-rw-r--r--managers/maemo/maemo-input.c6
-rw-r--r--managers/maemo/maemo-input.h2
-rw-r--r--managers/maemo/maemo-toolbar.c6
-rw-r--r--managers/maemo/maemo-toolbar.h2
-rw-r--r--managers/maemo/maemo-window-manager.c34
-rw-r--r--managers/maemo/maemo-window-manager.h6
-rw-r--r--managers/maemo/matchbox-window-manager-2-maemo.c14
-rw-r--r--managers/simple/matchbox-window-manager-2-simple.c16
10 files changed, 55 insertions, 55 deletions
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));