aboutsummaryrefslogtreecommitdiffstats
path: root/matchbox/mb-wm-client.c
diff options
context:
space:
mode:
Diffstat (limited to 'matchbox/mb-wm-client.c')
-rw-r--r--matchbox/mb-wm-client.c54
1 files changed, 27 insertions, 27 deletions
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 ||
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-18 23:19:48 +0000