diff options
32 files changed, 194 insertions, 297 deletions
diff --git a/managers/clutter/mb-wm-comp-mgr-clutter.c b/managers/clutter/mb-wm-comp-mgr-clutter.c index 91163df..4d8a820 100644 --- a/managers/clutter/mb-wm-comp-mgr-clutter.c +++ b/managers/clutter/mb-wm-comp-mgr-clutter.c @@ -408,7 +408,7 @@ mb_wm_comp_mgr_clutter_client_get_actor (MBWMCompMgrClutterClient *cclient) struct _MBWMCompMgrClutterPrivate { ClutterActor * arena; - MBWMList * desktops; + GList * desktops; ClutterActor * shadow; Window overlay_window; @@ -514,7 +514,7 @@ mbwm_cmc_init (MBWMObject *obj, va_list vap) desktop = clutter_group_new (); clutter_actor_show (desktop); clutter_container_add_actor (CLUTTER_CONTAINER (arena), desktop); - priv->desktops = mb_wm_util_list_append (priv->desktops, desktop); + priv->desktops = g_list_append (priv->desktops, desktop); return 1; } @@ -805,7 +805,7 @@ mbwm_cmc_restack_real (MBWMCompMgr *mgr) MBWindowManager *wm = mgr->wm; MBWMCompMgrClutter *cmgr = CMGR (mgr); MBWMCompMgrClutterPrivate *priv = cmgr->priv; - MBWMList *l; + GList *l; int i = 0; if (priv->freeze_stack) @@ -853,7 +853,7 @@ mbwm_cmc_restack_real (MBWMCompMgr *mgr) } } -MBWMList * +GList * mb_wm_comp_mgr_clutter_get_desktops (MBWMCompMgrClutter *cmgr) { return cmgr->priv->desktops; @@ -867,7 +867,7 @@ ClutterActor * mb_wm_comp_mgr_clutter_get_nth_desktop (MBWMCompMgrClutter * cmgr, int desktop) { MBWMCompMgrClutterPrivate * priv = cmgr->priv; - MBWMList * l = priv->desktops; + GList * l = priv->desktops; int i = 0; while (l && i != desktop) @@ -880,7 +880,7 @@ mb_wm_comp_mgr_clutter_get_nth_desktop (MBWMCompMgrClutter * cmgr, int desktop) { /* End of the line -- append new desktop */ ClutterActor * d = clutter_group_new (); - priv->desktops = mb_wm_util_list_append (priv->desktops, d); + priv->desktops = g_list_append (priv->desktops, d); clutter_container_add_actor (CLUTTER_CONTAINER (priv->arena), d); l = l->next; @@ -911,7 +911,7 @@ mbwm_cmc_select_desktop (MBWMCompMgr * mgr, { MBWMCompMgrClutter * cmgr = CMGR (mgr); ClutterActor * d; - MBWMList * l; + GList * l; d = mb_wm_comp_mgr_clutter_get_nth_desktop (cmgr, desktop); @@ -943,7 +943,7 @@ mbwm_cmc_map_notify_real (MBWMCompMgr *mgr, ClutterActor *texture; ClutterActor *rect; MBGeometry geom; - const MBWMList *l; + const GList *l; unsigned int shadow_clr[4]; ClutterColor shadow_cclr; MBWMCompMgrShadowType shadow_type; @@ -1102,7 +1102,7 @@ static void _fade_apply_behaviour_to_client (MBWindowManagerClient *wc, unsigned long duration) { - MBWMList *l; + GList *l; ClutterActor *a = CCLIENT (wc->cm_client)->priv->actor; ClutterAnimation *anim; diff --git a/managers/clutter/mb-wm-comp-mgr-clutter.h b/managers/clutter/mb-wm-comp-mgr-clutter.h index c18fcbf..e929067 100644 --- a/managers/clutter/mb-wm-comp-mgr-clutter.h +++ b/managers/clutter/mb-wm-comp-mgr-clutter.h @@ -96,7 +96,7 @@ mb_wm_comp_mgr_clutter_client_unset_flags (MBWMCompMgrClutterClient *cclient, MBWMCompMgrClutterClientFlags mb_wm_comp_mgr_clutter_client_get_flags (MBWMCompMgrClutterClient *cclient); -MBWMList * +GList * mb_wm_comp_mgr_clutter_get_desktops (MBWMCompMgrClutter *cmgr); ClutterActor * diff --git a/managers/maemo/maemo-input.c b/managers/maemo/maemo-input.c index 52e1940..858608d 100644 --- a/managers/maemo/maemo-input.c +++ b/managers/maemo/maemo-input.c @@ -45,7 +45,7 @@ maemo_input_init (MBWMObject *this, va_list vap) if ((c = mb_wm_stack_get_highest_by_type (wm, MBWMClientTypeApp))) { Window w; - MBWMList *trans = mb_wm_client_get_transients (c); + GList *trans = mb_wm_client_get_transients (c); if (trans && (t = trans->data)) w = t->window->xwindow; @@ -56,7 +56,7 @@ maemo_input_init (MBWMObject *this, va_list vap) XSetTransientForHint(wm->xdpy, win->xwindow, w); - mb_wm_util_list_free (trans); + g_list_free (trans); } } #endif diff --git a/matchbox/mb-window-manager.c b/matchbox/mb-window-manager.c index fcc2bee..85ba720 100644 --- a/matchbox/mb-window-manager.c +++ b/matchbox/mb-window-manager.c @@ -265,11 +265,11 @@ static void mb_wm_destroy (MBWMObject *this) { MBWindowManager * wm = MB_WINDOW_MANAGER (this); - MBWMList *l = wm->clients; + GList *l = wm->clients; while (l) { - MBWMList * old = l; + GList * old = l; mb_wm_object_unref (l->data); l = l->next; @@ -423,7 +423,7 @@ mb_wm_handle_destroy_notify (XDestroyWindowEvent *xev, * the window is no longer managed, only the resources are * kept in the clients list; so we only remove it and free. */ - wm->clients = mb_wm_util_list_remove (wm->clients, client); + wm->clients = g_list_remove (wm->clients, client); mb_wm_object_unref (MB_WM_OBJECT (client)); } } @@ -939,9 +939,9 @@ mb_wm_update_root_win_lists (MBWindowManager *wm) int cnt = 0; int list_size; MBWindowManagerClient *c; - MBWMList *l; + GList *l; - list_size = mb_wm_util_list_length (wm->clients); + list_size = g_list_length (wm->clients); wins = alloca (sizeof(Window) * list_size); app_wins = alloca (sizeof(Window) * list_size); @@ -1030,7 +1030,7 @@ mb_wm_manage_client (MBWindowManager *wm, if (client == NULL) return; - wm->clients = mb_wm_util_list_append(wm->clients, (void*)client); + wm->clients = g_list_append(wm->clients, (void*)client); /* add to stack and move to position in stack */ mb_wm_stack_append_top (client); @@ -1113,7 +1113,7 @@ mb_wm_unmanage_client (MBWindowManager *wm, sync_flags |= MBWMSyncGeometry; if (destroy) - wm->clients = mb_wm_util_list_remove (wm->clients, (void*)client); + wm->clients = g_list_remove (wm->clients, (void*)client); mb_wm_stack_remove (client); mb_wm_update_root_win_lists (wm); @@ -1174,7 +1174,7 @@ MBWindowManagerClient* mb_wm_managed_client_from_xwindow(MBWindowManager *wm, Window win) { MBWindowManagerClient *client = NULL; - MBWMList *l; + GList *l; if (win == wm->root_win->xwindow) return NULL; @@ -1197,7 +1197,7 @@ MBWindowManagerClient* mb_wm_managed_client_from_frame (MBWindowManager *wm, Window frame) { MBWindowManagerClient *client = NULL; - MBWMList *l; + GList *l; if (frame == wm->root_win->xwindow) return NULL; diff --git a/matchbox/mb-window-manager.h b/matchbox/mb-window-manager.h index da9ddde..34b2897 100644 --- a/matchbox/mb-window-manager.h +++ b/matchbox/mb-window-manager.h @@ -76,7 +76,7 @@ struct MBWindowManager int xscreen; MBWindowManagerClient *stack_top, *stack_bottom; - MBWMList *clients; + GList *clients; MBWindowManagerClient *desktop; MBWindowManagerClient *focused_client; diff --git a/matchbox/mb-wm-client-app.c b/matchbox/mb-wm-client-app.c index 3aa9d2e..abac125 100644 --- a/matchbox/mb-wm-client-app.c +++ b/matchbox/mb-wm-client-app.c @@ -182,12 +182,12 @@ mb_wm_client_app_request_geometry (MBWindowManagerClient *client, static void mb_wm_client_app_theme_change (MBWindowManagerClient *client) { - MBWMList * l = client->decor; + GList * l = client->decor; while (l) { MBWMDecor * d = l->data; - MBWMList * n = l->next; + GList * n = l->next; mb_wm_object_unref (MB_WM_OBJECT (d)); free (l); diff --git a/matchbox/mb-wm-client-base.c b/matchbox/mb-wm-client-base.c index d9b0446..a75dd57 100644 --- a/matchbox/mb-wm-client-base.c +++ b/matchbox/mb-wm-client-base.c @@ -267,14 +267,14 @@ mb_wm_client_base_stack (MBWindowManagerClient *client, int flags) { /* Stack to highest/lowest possible possition in stack */ - MBWMList * t = mb_wm_client_get_transients (client); + GList * t = mb_wm_client_get_transients (client); mb_wm_stack_move_top(client); - mb_wm_util_list_foreach (t, (MBWMListForEachCB)mb_wm_client_stack, + g_list_foreach (t, (GFunc)mb_wm_client_stack, (void*)flags); - mb_wm_util_list_free (t); + g_list_free (t); } static void @@ -547,8 +547,8 @@ mb_wm_client_base_display_sync (MBWindowManagerClient *client) /* FIXME: need flags to handle other stuff like configure events etc */ /* Resize any decor */ - mb_wm_util_list_foreach(client->decor, - (MBWMListForEachCB)mb_wm_decor_handle_resize, + g_list_foreach(client->decor, + (GFunc)mb_wm_decor_handle_resize, NULL); mb_wm_util_untrap_x_errors(); @@ -643,8 +643,8 @@ mb_wm_client_base_display_sync (MBWindowManagerClient *client) XMapWindow(wm->xdpy, client->xwin_frame); } - mb_wm_util_list_foreach(client->decor, - (MBWMListForEachCB)mb_wm_decor_handle_repaint, + g_list_foreach(client->decor, + (GFunc)mb_wm_decor_handle_repaint, NULL); diff --git a/matchbox/mb-wm-client-desktop.c b/matchbox/mb-wm-client-desktop.c index 81ce628..878f858 100644 --- a/matchbox/mb-wm-client-desktop.c +++ b/matchbox/mb-wm-client-desktop.c @@ -147,12 +147,12 @@ mb_wm_client_desktop_stacking_layer (MBWindowManagerClient *client) static void mb_wm_client_desktop_theme_change (MBWindowManagerClient *client) { - MBWMList * l = client->decor; + GList * l = client->decor; while (l) { MBWMDecor * d = l->data; - MBWMList * n = l->next; + GList * n = l->next; mb_wm_object_unref (MB_WM_OBJECT (d)); free (l); diff --git a/matchbox/mb-wm-client-dialog.c b/matchbox/mb-wm-client-dialog.c index b854c7c..b998396 100644 --- a/matchbox/mb-wm-client-dialog.c +++ b/matchbox/mb-wm-client-dialog.c @@ -309,12 +309,12 @@ mb_wm_client_dialog_request_geometry (MBWindowManagerClient *client, static void mb_wm_client_dialog_theme_change (MBWindowManagerClient *client) { - MBWMList * l = client->decor; + GList * l = client->decor; while (l) { MBWMDecor * d = l->data; - MBWMList * n = l->next; + GList * n = l->next; mb_wm_object_unref (MB_WM_OBJECT (d)); free (l); diff --git a/matchbox/mb-wm-client-override.c b/matchbox/mb-wm-client-override.c index 238ce73..d09e11a 100644 --- a/matchbox/mb-wm-client-override.c +++ b/matchbox/mb-wm-client-override.c @@ -26,14 +26,14 @@ static void mb_wm_client_override_stack (MBWindowManagerClient *client, int flags) { - MBWMList * t = mb_wm_client_get_transients (client); + GList * t = mb_wm_client_get_transients (client); mb_wm_stack_move_top(client); - mb_wm_util_list_foreach (t, (MBWMListForEachCB)mb_wm_client_stack, + g_list_foreach (t, (GFunc)mb_wm_client_stack, (void*)flags); - mb_wm_util_list_free (t); + g_list_free (t); } static void diff --git a/matchbox/mb-wm-client-window.c b/matchbox/mb-wm-client-window.c index 8e8b67d..f8ab6c1 100644 --- a/matchbox/mb-wm-client-window.c +++ b/matchbox/mb-wm-client-window.c @@ -74,7 +74,7 @@ static void mb_wm_client_window_destroy (MBWMObject *this) { MBWMClientWindow * win = MB_WM_CLIENT_WINDOW (this); - MBWMList * l = win->icons; + GList * l = win->icons; if (win->name) XFree (win->name); @@ -921,8 +921,8 @@ mb_wm_client_window_sync_properties ( MBWMClientWindow *win, } else { - MBWMList *l = win->icons; - MBWMList *list_end = NULL; + GList *l = win->icons; + GList *list_end = NULL; unsigned long *p = icons; unsigned long *p_end = icons + nitems_return; @@ -937,7 +937,7 @@ mb_wm_client_window_sync_properties ( MBWMClientWindow *win, while (p < p_end) { - l = mb_wm_util_malloc0 (sizeof (MBWMList)); + l = mb_wm_util_malloc0 (sizeof (GList)); p = icon_from_net_wm_icon (p, (MBWMRgbaIcon **)&l->data); if (list_end) diff --git a/matchbox/mb-wm-client-window.h b/matchbox/mb-wm-client-window.h index af7c7a4..80c304a 100644 --- a/matchbox/mb-wm-client-window.h +++ b/matchbox/mb-wm-client-window.h @@ -147,7 +147,7 @@ struct MBWMClientWindow int translucency; char *machine; - MBWMList *icons; + GList *icons; MBWMClientWindowAllowedActions allowed_actions; diff --git a/matchbox/mb-wm-client.c b/matchbox/mb-wm-client.c index 6deeb13..963ac22 100644 --- a/matchbox/mb-wm-client.c +++ b/matchbox/mb-wm-client.c @@ -44,7 +44,7 @@ mb_wm_client_destroy (MBWMObject *obj) { MBWindowManagerClient * client = MB_WM_CLIENT(obj); MBWindowManager * wm = client->wmref; - MBWMList * l = client->decor; + GList * l = client->decor; if (client->sig_theme_change_id) mb_wm_object_signal_disconnect (MB_WM_OBJECT (wm), @@ -92,7 +92,7 @@ mb_wm_client_destroy (MBWMObject *obj) while (l) { MBWindowManagerClient * c = l->data; - MBWMList * l2 = l; + GList * l2 = l; c->transient_for = NULL; XUnmapWindow (wm->xdpy, c->window->xwindow); @@ -300,7 +300,7 @@ mb_wm_client_on_property_change (MBWMClientWindow *window, if (property & MBWM_WINDOW_PROP_NAME) { - MBWMList * l = client->decor; + GList * l = client->decor; while (l) { MBWMDecor * decor = l->data; @@ -585,7 +585,7 @@ void mb_wm_client_add_transient (MBWindowManagerClient *client, MBWindowManagerClient *transient) { - MBWMList *l; + GList *l; if (transient == NULL || client == NULL) return; @@ -606,7 +606,7 @@ mb_wm_client_add_transient (MBWindowManagerClient *client, l = l->next; } - client->transients = mb_wm_util_list_append(client->transients, transient); + client->transients = g_list_append(client->transients, transient); } void @@ -618,24 +618,24 @@ mb_wm_client_remove_transient (MBWindowManagerClient *client, transient->transient_for = NULL; - client->transients = mb_wm_util_list_remove(client->transients, transient); + client->transients = g_list_remove(client->transients, transient); if (client->last_focused_transient == transient) client->last_focused_transient = transient->next_focused_client; } -MBWMList* +GList* mb_wm_client_get_transients (MBWindowManagerClient *client) { - MBWMList *trans = NULL; - MBWMList *l = client->transients; + GList *trans = NULL; + GList *l = client->transients; Window xgroup = client->window->xwin_group; MBWindowManagerClient *c; MBWMClientType c_type = MB_WM_CLIENT_CLIENT_TYPE (client); while (l) { - trans = mb_wm_util_list_prepend (trans, l->data); + trans = g_list_prepend (trans, l->data); l = l->next; } @@ -662,7 +662,7 @@ mb_wm_client_get_transients (MBWindowManagerClient *client) if (!t || (MB_WM_CLIENT_CLIENT_TYPE (t) == MBWMClientTypeApp || MB_WM_CLIENT_CLIENT_TYPE (t) == MBWMClientTypeDesktop)) { - trans = mb_wm_util_list_prepend (trans, c); + trans = g_list_prepend (trans, c); } } } @@ -1029,7 +1029,7 @@ mb_wm_client_is_modal (MBWindowManagerClient *client) Bool mb_wm_client_owns_xwindow (MBWindowManagerClient *client, Window xwin) { - MBWMList * l; + GList * l; if (client->xwin_frame == xwin || client->window->xwindow == xwin) return True; diff --git a/matchbox/mb-wm-client.h b/matchbox/mb-wm-client.h index 57c2c49..0596f41 100644 --- a/matchbox/mb-wm-client.h +++ b/matchbox/mb-wm-client.h @@ -173,8 +173,8 @@ struct MBWindowManagerClient MBWindowManagerClient *next_focused_client; MBGeometry frame_geometry; /* FIXME: in ->priv ? */ - MBWMList *decor; - MBWMList *transients; + GList *decor; + GList *transients; MBWindowManagerClient *transient_for; MBWindowManagerClient *last_focused_transient; @@ -314,7 +314,7 @@ void mb_wm_client_remove_transient (MBWindowManagerClient *client, MBWindowManagerClient *transient); -MBWMList* +GList* mb_wm_client_get_transients (MBWindowManagerClient *client); MBWindowManagerClient* diff --git a/matchbox/mb-wm-comp-mgr-xrender.c b/matchbox/mb-wm-comp-mgr-xrender.c index b3ae255..50ec924 100644 --- a/matchbox/mb-wm-comp-mgr-xrender.c +++ b/matchbox/mb-wm-comp-mgr-xrender.c @@ -1164,7 +1164,7 @@ mb_wm_comp_mgr_xrender_turn_off_real (MBWMCompMgr *mgr) MBWindowManager * wm; Window rwin; MBWMCompMgrDefaultPrivate * priv; - MBWMList * l; + GList * l; if (!mgr) return; @@ -1229,7 +1229,7 @@ mb_wm_comp_mgr_xrender_turn_on_real (MBWMCompMgr *mgr) MBWindowManager * wm; Window rwin; MBWMCompMgrDefaultPrivate * priv; - MBWMList * l; + GList * l; if (!mgr) return; @@ -1430,7 +1430,7 @@ _render_a_client (MBWMCompMgrClient * client, /* * If the client is translucent, paint the decors only (solid). */ - MBWMList * l = wm_client->decor; + GList * l = wm_client->decor; while (l) { diff --git a/matchbox/mb-wm-decor.c b/matchbox/mb-wm-decor.c index 17a3ece..eb3945e 100644 --- a/matchbox/mb-wm-decor.c +++ b/matchbox/mb-wm-decor.c @@ -108,7 +108,7 @@ mb_wm_decor_resize (MBWMDecor *decor) { const MBGeometry *geom; MBWMTheme *theme = decor->parent_client->wmref->theme; - MBWMList *l; + GList *l; int btn_x_start, btn_x_end; int abs_packing = decor->absolute_packing; @@ -361,8 +361,8 @@ mb_wm_decor_sync_window (MBWMDecor *decor) mb_wm_decor_resize(decor); - mb_wm_util_list_foreach(decor->buttons, - (MBWMListForEachCB)mb_wm_decor_button_sync_window, + g_list_foreach(decor->buttons, + (GFunc)mb_wm_decor_button_sync_window, NULL); /* @@ -396,8 +396,8 @@ mb_wm_decor_sync_window (MBWMDecor *decor) /* Next up sort buttons */ - mb_wm_util_list_foreach(decor->buttons, - (MBWMListForEachCB)mb_wm_decor_button_sync_window, + g_list_foreach(decor->buttons, + (GFunc)mb_wm_decor_button_sync_window, NULL); if (mb_wm_util_untrap_x_errors()) @@ -502,7 +502,7 @@ mb_wm_decor_handle_map (MBWMDecor *decor) void mb_wm_decor_handle_repaint (MBWMDecor *decor) { - MBWMList *l; + GList *l; if (decor->parent_client == NULL) return; @@ -624,7 +624,7 @@ mb_wm_decor_attach (MBWMDecor *decor, MBWindowManagerClient *client) { decor->parent_client = client; - client->decor = mb_wm_util_list_append(client->decor, decor); + client->decor = g_list_append(client->decor, decor); mb_wm_decor_mark_dirty (decor); @@ -640,7 +640,7 @@ static void mb_wm_decor_destroy (MBWMObject* obj) { MBWMDecor * decor = MB_WM_DECOR(obj); - MBWMList * l = decor->buttons; + GList * l = decor->buttons; MBWMMainContext * ctx = decor->parent_client->wmref->main_ctx; if (decor->themedata && decor->destroy_themedata) @@ -654,7 +654,7 @@ mb_wm_decor_destroy (MBWMObject* obj) while (l) { - MBWMList * old = l; + GList * old = l; mb_wm_object_unref (MB_WM_OBJECT (l->data)); l = l->next; free (old); @@ -747,7 +747,7 @@ mb_wm_decor_button_press_handler (XButtonEvent *xev, MBWMDecorButton *button = (MBWMDecorButton *)userdata; MBWMDecor *decor = button->decor; MBWindowManager *wm = decor->parent_client->wmref; - MBWMList *l = NULL; + GList *l = NULL; Bool retval = True; if (xev->window == decor->xwin) @@ -934,7 +934,7 @@ mb_wm_decor_button_press_handler (XButtonEvent *xev, } done: - mb_wm_util_list_free (l); + g_list_free (l); return retval; } @@ -1019,7 +1019,7 @@ mb_wm_decor_button_init (MBWMObject *obj, va_list vap) decor, type); - decor->buttons = mb_wm_util_list_append (decor->buttons, button); + decor->buttons = g_list_append (decor->buttons, button); /* the decor assumes a reference, so add one for the caller */ mb_wm_object_ref (obj); diff --git a/matchbox/mb-wm-decor.h b/matchbox/mb-wm-decor.h index 99d1347..4084cb8 100644 --- a/matchbox/mb-wm-decor.h +++ b/matchbox/mb-wm-decor.h @@ -67,7 +67,7 @@ struct MBWMDecor MBGeometry geom; MBWMDecorDirtyState dirty; Bool absolute_packing; - MBWMList *buttons; + GList *buttons; int pack_start_x; int pack_end_x; diff --git a/matchbox/mb-wm-keys.c b/matchbox/mb-wm-keys.c index 41d416c..5c185de 100644 --- a/matchbox/mb-wm-keys.c +++ b/matchbox/mb-wm-keys.c @@ -3,7 +3,7 @@ struct MBWMKeys /* FIXME: Probably do want to hide these here */ { - MBWMList *bindings; /* Always points to first binding */ + GList *bindings; /* Always points to first binding */ int MetaMask; int HyperMask; @@ -137,7 +137,7 @@ mb_wm_keys_binding_add (MBWindowManager *wm, if (key_binding_set_grab (wm, binding, False)) { - keys->bindings = mb_wm_util_list_append(keys->bindings, binding); + keys->bindings = g_list_append(keys->bindings, binding); return binding; } @@ -264,7 +264,7 @@ mb_wm_keys_press (MBWindowManager *wm, KeySym keysym, int modifier_mask) { - MBWMList *iter; + GList *iter; MBWMKeyBinding *binding; if (!wm->keys) @@ -304,7 +304,7 @@ mb_wm_keys_press (MBWindowManager *wm, ++ignored_mask; } - iter = mb_wm_util_list_next(iter); + iter = g_list_next(iter); } } diff --git a/matchbox/mb-wm-layout.c b/matchbox/mb-wm-layout.c index 7e92998..72d41e7 100644 --- a/matchbox/mb-wm-layout.c +++ b/matchbox/mb-wm-layout.c @@ -601,7 +601,7 @@ mb_wm_layout_real_layout_fullscreen (MBWMLayout *layout, MBGeometry * avail_geom if (mb_wm_client_get_layout_hints (client) == (LayoutPrefFullscreen|LayoutPrefVisible)) { - MBWMList *l = mb_wm_client_get_transients (client); + GList *l = mb_wm_client_get_transients (client); mb_wm_client_get_coverage (client, &coverage); @@ -677,7 +677,7 @@ mb_wm_layout_real_layout_fullscreen (MBWMLayout *layout, MBGeometry * avail_geom MBWMClientReqGeomIsViaLayoutManager); } - mb_wm_util_list_free (l); + g_list_free (l); } } diff --git a/matchbox/mb-wm-main-context.c b/matchbox/mb-wm-main-context.c index 71d5d6c..263991c 100644 --- a/matchbox/mb-wm-main-context.c +++ b/matchbox/mb-wm-main-context.c @@ -172,7 +172,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, MBWMMainContext *ctx) { MBWindowManager *wm = ctx->wm; - MBWMList *iter; + GList *iter; Window xwin = xev->xany.window; #if (MBWM_WANT_DEBUG) @@ -207,7 +207,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, while (iter) { Window msg_xwin = XE_ITER_GET_XWIN(iter); - MBWMList * next = iter->next; + GList * next = iter->next; if (msg_xwin == None || msg_xwin == xwin) { @@ -242,7 +242,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, while (iter) { Window msg_xwin = XE_ITER_GET_XWIN(iter); - MBWMList * next = iter->next; + GList * next = iter->next; if (msg_xwin == None || msg_xwin == xwin) { @@ -263,7 +263,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, while (iter) { Window msg_xwin = XE_ITER_GET_XWIN(iter); - MBWMList * next = iter->next; + GList * next = iter->next; if (msg_xwin == None || msg_xwin == xwin) { @@ -282,7 +282,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, while (iter) { Window msg_xwin = XE_ITER_GET_XWIN(iter); - MBWMList * next = iter->next; + GList * next = iter->next; if (msg_xwin == None || msg_xwin == xwin) { @@ -312,7 +312,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, while (iter) { Window msg_xwin = XE_ITER_GET_XWIN(iter); - MBWMList * next = iter->next; + GList * next = iter->next; if (msg_xwin == None || msg_xwin == xwin) { @@ -331,7 +331,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, while (iter) { Window msg_xwin = XE_ITER_GET_XWIN(iter); - MBWMList * next = iter->next; + GList * next = iter->next; if (msg_xwin == None || msg_xwin == xwin) { @@ -364,7 +364,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, while (iter) { Window msg_xwin = XE_ITER_GET_XWIN(iter); - MBWMList * next = iter->next; + GList * next = iter->next; if (msg_xwin == None || msg_xwin == xwin) { @@ -397,7 +397,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, while (iter) { Window msg_xwin = XE_ITER_GET_XWIN(iter); - MBWMList * next = iter->next; + GList * next = iter->next; if (msg_xwin == None || msg_xwin == xwin) { @@ -416,7 +416,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, while (iter) { Window msg_xwin = XE_ITER_GET_XWIN(iter); - MBWMList * next = iter->next; + GList * next = iter->next; if (msg_xwin == None || msg_xwin == xwin) { @@ -450,7 +450,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, while (iter) { Window msg_xwin = XE_ITER_GET_XWIN(iter); - MBWMList * next = iter->next; + GList * next = iter->next; if (msg_xwin == None || msg_xwin == xwin) { @@ -469,7 +469,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, while (iter) { Window msg_xwin = XE_ITER_GET_XWIN(iter); - MBWMList * next = iter->next; + GList * next = iter->next; if (msg_xwin == None || msg_xwin == xwin) { @@ -488,7 +488,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, while (iter) { Window msg_xwin = XE_ITER_GET_XWIN(iter); - MBWMList * next = iter->next; + GList * next = iter->next; if (msg_xwin == None || msg_xwin == xwin) { @@ -507,7 +507,7 @@ mb_wm_main_context_handle_x_event (XEvent *xev, while (iter) { Window msg_xwin = XE_ITER_GET_XWIN(iter); - MBWMList * next = iter->next; + GList * next = iter->next; if (msg_xwin == None || msg_xwin == xwin) { @@ -623,7 +623,7 @@ mb_wm_main_context_x_event_handler_add (MBWMMainContext *ctx, if (type == wm->damage_event_base + XDamageNotify) { ctx->event_funcs.damage_notify = - mb_wm_util_list_append (ctx->event_funcs.damage_notify, func_info); + g_list_append (ctx->event_funcs.damage_notify, func_info); } else #endif @@ -633,51 +633,51 @@ mb_wm_main_context_x_event_handler_add (MBWMMainContext *ctx, break; case MapRequest: ctx->event_funcs.map_request = - mb_wm_util_list_append (ctx->event_funcs.map_request, func_info); + g_list_append (ctx->event_funcs.map_request, func_info); break; case MapNotify: ctx->event_funcs.map_notify= - mb_wm_util_list_append (ctx->event_funcs.map_notify, func_info); + g_list_append (ctx->event_funcs.map_notify, func_info); break; case UnmapNotify: ctx->event_funcs.unmap_notify= - mb_wm_util_list_append (ctx->event_funcs.unmap_notify, func_info); + g_list_append (ctx->event_funcs.unmap_notify, func_info); break; case DestroyNotify: ctx->event_funcs.destroy_notify = - mb_wm_util_list_append (ctx->event_funcs.destroy_notify, func_info); + g_list_append (ctx->event_funcs.destroy_notify, func_info); break; case ConfigureNotify: ctx->event_funcs.configure_notify = - mb_wm_util_list_append (ctx->event_funcs.configure_notify, func_info); + g_list_append (ctx->event_funcs.configure_notify, func_info); break; case ConfigureRequest: ctx->event_funcs.configure_request = - mb_wm_util_list_append (ctx->event_funcs.configure_request, func_info); + g_list_append (ctx->event_funcs.configure_request, func_info); break; case KeyPress: ctx->event_funcs.key_press = - mb_wm_util_list_append (ctx->event_funcs.key_press, func_info); + g_list_append (ctx->event_funcs.key_press, func_info); break; case PropertyNotify: ctx->event_funcs.property_notify = - mb_wm_util_list_append (ctx->event_funcs.property_notify, func_info); + g_list_append (ctx->event_funcs.property_notify, func_info); break; case ButtonPress: ctx->event_funcs.button_press = - mb_wm_util_list_append (ctx->event_funcs.button_press, func_info); + g_list_append (ctx->event_funcs.button_press, func_info); break; case ButtonRelease: ctx->event_funcs.button_release = - mb_wm_util_list_append (ctx->event_funcs.button_release, func_info); + g_list_append (ctx->event_funcs.button_release, func_info); break; case MotionNotify: ctx->event_funcs.motion_notify = - mb_wm_util_list_append (ctx->event_funcs.motion_notify, func_info); + g_list_append (ctx->event_funcs.motion_notify, func_info); break; case ClientMessage: ctx->event_funcs.client_message = - mb_wm_util_list_append (ctx->event_funcs.client_message, func_info); + g_list_append (ctx->event_funcs.client_message, func_info); break; default: @@ -692,8 +692,8 @@ mb_wm_main_context_x_event_handler_remove (MBWMMainContext *ctx, int type, unsigned long id) { - MBWMList * l = NULL; - MBWMList **l_start; + GList * l = NULL; + GList **l_start; #if ENABLE_COMPOSITE MBWindowManager * wm = ctx->wm; @@ -757,8 +757,8 @@ mb_wm_main_context_x_event_handler_remove (MBWMMainContext *ctx, if (info->id == id) { - MBWMList * prev = l->prev; - MBWMList * next = l->next; + GList * prev = l->prev; + GList * next = l->next; if (prev) prev->next = next; @@ -822,7 +822,7 @@ mb_wm_main_context_handle_timeout (MBWMTimeOutEventInfo *tinfo, static Bool mb_wm_main_context_check_timeouts (MBWMMainContext *ctx) { - MBWMList * l = mb_wm_util_list_get_first(ctx->event_funcs.timeout); + GList * l = g_list_first(ctx->event_funcs.timeout); struct timeval current_time; if (!l) @@ -840,10 +840,10 @@ mb_wm_main_context_check_timeouts (MBWMMainContext *ctx) /* Timeout handler notified it can be removed, do so now */ mb_wm_main_context_timeout_handler_remove (ctx,tid); /* To avoid race condition, restart at front of list */ - l = mb_wm_util_list_get_first(ctx->event_funcs.timeout); + l = g_list_first(ctx->event_funcs.timeout); } else - l = mb_wm_util_list_next(l); + l = g_list_next(l); } return True; } @@ -872,7 +872,7 @@ mb_wm_main_context_timeout_handler_add (MBWMMainContext *ctx, mb_wm_main_context_timeout_setup (tinfo, ¤t_time); ctx->event_funcs.timeout = - mb_wm_util_list_append (ctx->event_funcs.timeout, tinfo); + g_list_append (ctx->event_funcs.timeout, tinfo); return ids; @@ -886,7 +886,7 @@ mb_wm_main_context_timeout_handler_remove (MBWMMainContext *ctx, unsigned long id) { #if ! USE_GLIB_MAINLOOP - MBWMList * l = ctx->event_funcs.timeout; + GList * l = ctx->event_funcs.timeout; while (l) { @@ -896,11 +896,11 @@ mb_wm_main_context_timeout_handler_remove (MBWMMainContext *ctx, { /* Reset list head after entry removal */ ctx->event_funcs.timeout = - mb_wm_util_list_remove(ctx->event_funcs.timeout, l->data); + g_list_remove(ctx->event_funcs.timeout, l->data); return; } - l = mb_wm_util_list_next(l); + l = g_list_next(l); } #else g_source_remove (id); @@ -929,7 +929,7 @@ mb_wm_main_context_fd_watch_add (MBWMMainContext *ctx, finfo->userdata = userdata; ctx->event_funcs.fd_watch = - mb_wm_util_list_append (ctx->event_funcs.fd_watch, finfo); + g_list_append (ctx->event_funcs.fd_watch, finfo); ctx->n_poll_fds++; ctx->poll_fds = realloc (ctx->poll_fds, sizeof (struct pollfd)); @@ -950,7 +950,7 @@ mb_wm_main_context_fd_watch_remove (MBWMMainContext *ctx, unsigned long id) { #if ! USE_GLIB_MAINLOOP - MBWMList * l = ctx->event_funcs.fd_watch; + GList * l = ctx->event_funcs.fd_watch; while (l) { @@ -958,8 +958,8 @@ mb_wm_main_context_fd_watch_remove (MBWMMainContext *ctx, if (info->id == id) { - MBWMList * prev = l->prev; - MBWMList * next = l->next; + GList * prev = l->prev; + GList * next = l->next; if (prev) prev->next = next; @@ -1023,7 +1023,7 @@ mb_wm_main_context_io_channel_get_fd (MBWMIOChannel * channel) static void mb_wm_main_context_setup_poll_cache (MBWMMainContext *ctx) { - MBWMList *l = ctx->event_funcs.fd_watch; + GList *l = ctx->event_funcs.fd_watch; int i = 0; if (!ctx->poll_cache_dirty) @@ -1050,7 +1050,7 @@ mb_wm_main_context_check_fd_watches (MBWMMainContext * ctx) { int ret; int i = 0; - MBWMList * l = ctx->event_funcs.fd_watch; + GList * l = ctx->event_funcs.fd_watch; Bool removal = False; if (!ctx->n_poll_fds) @@ -1080,8 +1080,8 @@ mb_wm_main_context_check_fd_watches (MBWMMainContext * ctx) if (zap) { - MBWMList * prev = l->prev; - MBWMList * next = l->next; + GList * prev = l->prev; + GList * next = l->next; if (prev) prev->next = next; diff --git a/matchbox/mb-wm-main-context.h b/matchbox/mb-wm-main-context.h index f022f81..c40d4b7 100644 --- a/matchbox/mb-wm-main-context.h +++ b/matchbox/mb-wm-main-context.h @@ -43,26 +43,26 @@ typedef Bool (*MBWMMainContextXEventFunc) (XEvent * xev, void * userdata); typedef struct MBWMEventFuncs { /* FIXME: figure our X wrap / unwrap mechanism */ - MBWMList *map_notify; - MBWMList *unmap_notify; - MBWMList *map_request; - MBWMList *destroy_notify; - MBWMList *configure_request; - MBWMList *configure_notify; - MBWMList *key_press; - MBWMList *property_notify; - MBWMList *button_press; - MBWMList *button_release; - MBWMList *motion_notify; - MBWMList *client_message; + GList *map_notify; + GList *unmap_notify; + GList *map_request; + GList *destroy_notify; + GList *configure_request; + GList *configure_notify; + GList *key_press; + GList *property_notify; + GList *button_press; + GList *button_release; + GList *motion_notify; + GList *client_message; #if ENABLE_COMPOSITE - MBWMList *damage_notify; + GList *damage_notify; #endif #if ! USE_GLIB_MAINLOOP - MBWMList *timeout; - MBWMList *fd_watch; + GList *timeout; + GList *fd_watch; #endif } MBWMEventFuncs; diff --git a/matchbox/mb-wm-object.c b/matchbox/mb-wm-object.c index 63f4ffc..373841e 100644 --- a/matchbox/mb-wm-object.c +++ b/matchbox/mb-wm-object.c @@ -39,12 +39,12 @@ static int NObjectClasses = 0; /* * Increased for each ref call and decreased for each unref call */ -MBWMList *alloc_objects = NULL; +GList *alloc_objects = NULL; void mb_wm_object_dump () { - MBWMList * l = alloc_objects; + GList * l = alloc_objects; if (!l) { @@ -216,7 +216,7 @@ mb_wm_object_unref (MBWMObject *this) free (this); #if MBWM_WANT_DEBUG - alloc_objects = mb_wm_util_list_remove (alloc_objects, this); + alloc_objects = g_list_remove (alloc_objects, this); #endif } } @@ -293,7 +293,7 @@ mb_wm_object_new (int type, ...) { void * trace[MBWM_OBJECT_TRACE_DEPTH]; - alloc_objects = mb_wm_util_list_append (alloc_objects, obj); + alloc_objects = g_list_append (alloc_objects, obj); obj->trace_depth = backtrace (trace, sizeof(trace)/sizeof(void*)); obj->trace_strings = backtrace_symbols (trace, obj->trace_depth); } @@ -327,7 +327,7 @@ mb_wm_object_signal_connect (MBWMObject *obj, func_info->id = id_counter++; obj->callbacks = - mb_wm_util_list_append (obj->callbacks, func_info); + g_list_append (obj->callbacks, func_info); return func_info->id; } @@ -336,7 +336,7 @@ void mb_wm_object_signal_disconnect (MBWMObject *obj, unsigned long id) { - MBWMList *item = obj->callbacks; + GList *item = obj->callbacks; while (item) { @@ -344,8 +344,8 @@ mb_wm_object_signal_disconnect (MBWMObject *obj, if (info->id == id) { - MBWMList * prev = item->prev; - MBWMList * next = item->next; + GList * prev = item->prev; + GList * next = item->next; if (prev) prev->next = next; @@ -373,7 +373,7 @@ void mb_wm_object_signal_emit (MBWMObject *obj, unsigned long signal) { - MBWMList *item = obj->callbacks; + GList *item = obj->callbacks; while (item) { diff --git a/matchbox/mb-wm-object.h b/matchbox/mb-wm-object.h index 336558f..e43a45e 100644 --- a/matchbox/mb-wm-object.h +++ b/matchbox/mb-wm-object.h @@ -75,7 +75,7 @@ struct MBWMObject MBWMObjectClass *klass; int refcnt; - MBWMList *callbacks; + GList *callbacks; #if MBWM_WANT_DEBUG char **trace_strings; diff --git a/matchbox/mb-wm-stack.c b/matchbox/mb-wm-stack.c index af5c4a3..f23cf58 100644 --- a/matchbox/mb-wm-stack.c +++ b/matchbox/mb-wm-stack.c @@ -24,14 +24,14 @@ static void mb_wm_stack_ensure_trans_foreach (MBWindowManagerClient *client, void *data) { - MBWMList * t = mb_wm_client_get_transients (client); + GList * t = mb_wm_client_get_transients (client); mb_wm_stack_move_top (client); - mb_wm_util_list_foreach - (t, (MBWMListForEachCB) mb_wm_stack_ensure_trans_foreach, NULL); + g_list_foreach + (t, (GFunc) mb_wm_stack_ensure_trans_foreach, NULL); - mb_wm_util_list_free (t); + g_list_free (t); } void diff --git a/matchbox/mb-wm-theme-png.c b/matchbox/mb-wm-theme-png.c index a747691..d671b4d 100644 --- a/matchbox/mb-wm-theme-png.c +++ b/matchbox/mb-wm-theme-png.c @@ -879,7 +879,7 @@ construct_buttons (MBWMThemePng * theme, MBWMDecor * decor, MBWMXmlDecor *d) if (d) { - MBWMList * l = d->buttons; + GList * l = d->buttons; while (l) { MBWMXmlButton * b = l->data; diff --git a/matchbox/mb-wm-theme-xml.c b/matchbox/mb-wm-theme-xml.c index e075b7b..6407653 100644 --- a/matchbox/mb-wm-theme-xml.c +++ b/matchbox/mb-wm-theme-xml.c @@ -55,7 +55,7 @@ mb_wm_xml_decor_new () void mb_wm_xml_decor_free (MBWMXmlDecor * d) { - MBWMList * l; + GList * l; if (!d) return; @@ -64,7 +64,7 @@ mb_wm_xml_decor_free (MBWMXmlDecor * d) while (l) { MBWMXmlButton * b = l->data; - MBWMList * n = l->next; + GList * n = l->next; mb_wm_xml_button_free (b); free (l); @@ -93,7 +93,7 @@ mb_wm_xml_client_new () void mb_wm_xml_client_free (MBWMXmlClient * c) { - MBWMList * l; + GList * l; if (!c) return; @@ -102,7 +102,7 @@ mb_wm_xml_client_free (MBWMXmlClient * c) while (l) { MBWMXmlDecor * d = l->data; - MBWMList * n = l->next; + GList * n = l->next; mb_wm_xml_decor_free (d); free (l); @@ -133,7 +133,7 @@ mb_wm_xml_clr_from_string (MBWMColor * clr, const char *s) } MBWMXmlClient * -mb_wm_xml_client_find_by_type (MBWMList *l, MBWMClientType type) +mb_wm_xml_client_find_by_type (GList *l, MBWMClientType type) { while (l) { @@ -148,7 +148,7 @@ mb_wm_xml_client_find_by_type (MBWMList *l, MBWMClientType type) } MBWMXmlDecor * -mb_wm_xml_decor_find_by_type (MBWMList *l, MBWMDecorType type) +mb_wm_xml_decor_find_by_type (GList *l, MBWMDecorType type) { while (l) { @@ -163,7 +163,7 @@ mb_wm_xml_decor_find_by_type (MBWMList *l, MBWMDecorType type) } MBWMXmlButton * -mb_wm_xml_button_find_by_type (MBWMList *l, MBWMDecorButtonType type) +mb_wm_xml_button_find_by_type (GList *l, MBWMDecorButtonType type) { while (l) { @@ -179,19 +179,19 @@ mb_wm_xml_button_find_by_type (MBWMList *l, MBWMDecorButtonType type) #if 0 void -mb_wm_xml_client_dump (MBWMList * l) +mb_wm_xml_client_dump (GList * l) { printf ("=== XML Clients =====\n"); while (l) { MBWMXmlClient * c = l->data; - MBWMList *l2 = c->decors; + GList *l2 = c->decors; printf ("===== client type %d =====\n", c->type); while (l2) { MBWMXmlDecor * d = l2->data; - MBWMList *l3 = d->buttons; + GList *l3 = d->buttons; printf ("======= decor type %d =====\n", d->type); while (l3) diff --git a/matchbox/mb-wm-theme-xml.h b/matchbox/mb-wm-theme-xml.h index 26a38fc..5e7e9c1 100644 --- a/matchbox/mb-wm-theme-xml.h +++ b/matchbox/mb-wm-theme-xml.h @@ -54,7 +54,7 @@ typedef struct Decor MBWMXmlFontUnits font_units; char * font_family; - MBWMList * buttons; + GList * buttons; }MBWMXmlDecor; typedef struct Client @@ -68,7 +68,7 @@ typedef struct Client Bool shaped; - MBWMList *decors; + GList *decors; MBWMClientLayoutHints layout_hints; }MBWMXmlClient; @@ -92,13 +92,13 @@ void mb_wm_xml_client_free (MBWMXmlClient * c); MBWMXmlClient * -mb_wm_xml_client_find_by_type (MBWMList *l, MBWMClientType type); +mb_wm_xml_client_find_by_type (GList *l, MBWMClientType type); MBWMXmlDecor * -mb_wm_xml_decor_find_by_type (MBWMList *l, MBWMDecorType type); +mb_wm_xml_decor_find_by_type (GList *l, MBWMDecorType type); MBWMXmlButton * -mb_wm_xml_button_find_by_type (MBWMList *l, MBWMDecorButtonType type); +mb_wm_xml_button_find_by_type (GList *l, MBWMDecorButtonType type); void mb_wm_xml_clr_from_string (MBWMColor * clr, const char *s); diff --git a/matchbox/mb-wm-theme.c b/matchbox/mb-wm-theme.c index 93e8fe7..f496c24 100644 --- a/matchbox/mb-wm-theme.c +++ b/matchbox/mb-wm-theme.c @@ -46,7 +46,7 @@ static void xml_element_end_cb (void *data, const char *tag); static void -xml_stack_free (MBWMList *stack); +xml_stack_free (GList *stack); static void mb_wm_theme_simple_paint_decor (MBWMTheme *theme, MBWMDecor *decor); @@ -90,12 +90,12 @@ mb_wm_theme_destroy (MBWMObject *obj) if (theme->path) free (theme->path); - MBWMList *l = theme->xml_clients; + GList *l = theme->xml_clients; while (l) { MBWMXmlClient * c = l->data; - MBWMList * n = l->next; + GList * n = l->next; mb_wm_xml_client_free (c); free (l); @@ -109,7 +109,7 @@ mb_wm_theme_init (MBWMObject *obj, va_list vap) MBWMTheme *theme = MB_WM_THEME (obj); MBWindowManager *wm = NULL; MBWMObjectProp prop; - MBWMList *xml_clients = NULL; + GList *xml_clients = NULL; char *path = NULL; MBWMColor *clr_lowlight = NULL; MBWMColor *clr_shadow = NULL; @@ -126,7 +126,7 @@ mb_wm_theme_init (MBWMObject *obj, va_list vap) path = va_arg(vap, char *); break; case MBWMObjectPropThemeXmlClients: - xml_clients = va_arg(vap, MBWMList *); + xml_clients = va_arg(vap, GList *); break; case MBWMObjectPropThemeColorLowlight: clr_lowlight = va_arg(vap, MBWMColor *); @@ -370,9 +370,9 @@ struct expat_data XML_Parser par; int theme_type; int version; - MBWMList *xml_clients; + GList *xml_clients; char *img; - MBWMList *stack; + GList *stack; MBWMColor color_lowlight; MBWMColor color_shadow; MBWMCompMgrShadowType shadow_type; @@ -389,7 +389,7 @@ mb_wm_theme_new (MBWindowManager * wm, const char * theme_path) char buf[256]; XML_Parser par = NULL; FILE *file = NULL; - MBWMList *xml_clients = NULL; + GList *xml_clients = NULL; char *img = NULL; MBWMColor clr_lowlight; MBWMColor clr_shadow; @@ -800,18 +800,18 @@ mb_wm_theme_use_compositing_mgr (MBWMTheme * theme) */ static void -xml_stack_push (MBWMList ** stack, XmlCtx ctx) +xml_stack_push (GList ** stack, XmlCtx ctx) { struct stack_data * s = malloc (sizeof (struct stack_data)); s->ctx = ctx; s->data = NULL; - *stack = mb_wm_util_list_prepend (*stack, s); + *stack = g_list_prepend (*stack, s); } static XmlCtx -xml_stack_top_ctx (MBWMList *stack) +xml_stack_top_ctx (GList *stack) { struct stack_data * s = stack->data; @@ -819,7 +819,7 @@ xml_stack_top_ctx (MBWMList *stack) } static void * -xml_stack_top_data (MBWMList *stack) +xml_stack_top_data (GList *stack) { struct stack_data * s = stack->data; @@ -827,7 +827,7 @@ xml_stack_top_data (MBWMList *stack) } static void -xml_stack_top_set_data (MBWMList *stack, void * data) +xml_stack_top_set_data (GList *stack, void * data) { struct stack_data * s = stack->data; @@ -835,9 +835,9 @@ xml_stack_top_set_data (MBWMList *stack, void * data) } static void -xml_stack_pop (MBWMList ** stack) +xml_stack_pop (GList ** stack) { - MBWMList * top = *stack; + GList * top = *stack; struct stack_data * s = top->data; *stack = top->next; @@ -846,12 +846,12 @@ xml_stack_pop (MBWMList ** stack) } static void -xml_stack_free (MBWMList *stack) +xml_stack_free (GList *stack) { - MBWMList * l = stack; + GList * l = stack; while (l) { - MBWMList * n = l->next; + GList * n = l->next; free (l->data); free (l); @@ -1082,7 +1082,7 @@ xml_element_start_cb (void *data, const char *tag, const char **expat_attr) mb_wm_xml_client_free (c); else { - exd->xml_clients = mb_wm_util_list_prepend (exd->xml_clients, c); + exd->xml_clients = g_list_prepend (exd->xml_clients, c); xml_stack_top_set_data (exd->stack, c); } @@ -1186,7 +1186,7 @@ xml_element_start_cb (void *data, const char *tag, const char **expat_attr) mb_wm_xml_decor_free (d); else { - c->decors = mb_wm_util_list_prepend (c->decors, d); + c->decors = g_list_prepend (c->decors, d); xml_stack_top_set_data (exd->stack, d); } @@ -1286,7 +1286,7 @@ xml_element_start_cb (void *data, const char *tag, const char **expat_attr) return; } - d->buttons = mb_wm_util_list_append (d->buttons, b); + d->buttons = g_list_append (d->buttons, b); xml_stack_top_set_data (exd->stack, b); @@ -1385,7 +1385,7 @@ construct_buttons (MBWMTheme * theme, if (d) { - MBWMList * l = d->buttons; + GList * l = d->buttons; while (l) { MBWMXmlButton * b = l->data; diff --git a/matchbox/mb-wm-theme.h b/matchbox/mb-wm-theme.h index b0ce109..b90bc88 100644 --- a/matchbox/mb-wm-theme.h +++ b/matchbox/mb-wm-theme.h @@ -94,7 +94,7 @@ struct MBWMTheme MBWindowManager *wm; MBWMThemeCaps caps; char *path; - MBWMList *xml_clients; + GList *xml_clients; Bool compositing; Bool shaped; diff --git a/matchbox/mb-wm-types.h b/matchbox/mb-wm-types.h index 61121e7..5d6dbf7 100644 --- a/matchbox/mb-wm-types.h +++ b/matchbox/mb-wm-types.h @@ -50,16 +50,6 @@ typedef struct MBGeometry } MBGeometry; -typedef struct MBWMList MBWMList; - -typedef void (*MBWMListForEachCB) (void *data, void *userdata); - -struct MBWMList -{ - MBWMList *next, *prev; - void *data; -}; - typedef struct MBWMClientWindowAttributes /* Needs to be sorted */ { Visual *visual; diff --git a/matchbox/mb-wm-util.c b/matchbox/mb-wm-util.c index 9bf5b99..f7f49d1 100644 --- a/matchbox/mb-wm-util.c +++ b/matchbox/mb-wm-util.c @@ -88,70 +88,12 @@ mb_wm_util_warn (const char *format, ...) if (msg) free(msg); } -int -mb_wm_util_list_length(MBWMList *list) -{ - return g_list_length ((GList *)list); -} - -MBWMList* -mb_wm_util_list_get_last(MBWMList *list) -{ - return (MBWMList *)g_list_last ((GList *)list); -} - -MBWMList* -mb_wm_util_list_get_first(MBWMList *list) -{ - return (MBWMList *)g_list_first ((GList *)list); -} - -void* -mb_wm_util_list_get_nth_data(MBWMList *list, int n) -{ - return g_list_nth_data ((GList *)list, n); -} - -MBWMList* -mb_wm_util_list_prepend(MBWMList *list, void *data) -{ - return (MBWMList *)g_list_prepend ((GList *)list, data); -} - -MBWMList* -mb_wm_util_list_append(MBWMList *list, void *data) -{ - return (MBWMList *)g_list_append ((GList *)list, data); -} - -MBWMList* -mb_wm_util_list_remove(MBWMList *list, void *data) -{ - return (MBWMList *)g_list_remove ((GList *)list, data); -} - -void -mb_wm_util_list_foreach (const MBWMList *list, - MBWMListForEachCB func, - void *userdata) -{ - g_list_foreach ((GList *)list, (GFunc)func, userdata); -} - -void -mb_wm_util_list_free (MBWMList * list) -{ - g_list_free ((GList *)list); -} - - MBWMRgbaIcon * mb_wm_rgba_icon_new () { return mb_wm_util_malloc0 (sizeof (MBWMRgbaIcon)); } - void mb_wm_rgba_icon_free (MBWMRgbaIcon *icon) { diff --git a/matchbox/mb-wm-util.h b/matchbox/mb-wm-util.h index 07b1b86..aa8e533 100644 --- a/matchbox/mb-wm-util.h +++ b/matchbox/mb-wm-util.h @@ -69,41 +69,6 @@ mb_wm_util_trap_x_errors(void); int mb_wm_util_untrap_x_errors(void); - -/* List */ - - -#define mb_wm_util_list_next(list) (list)->next -#define mb_wm_util_list_prev(list) (list)->prev -#define mb_wm_util_list_data(data) (list)->data - -MBWMList* -mb_wm_util_list_remove(MBWMList *list, void *data); - -int -mb_wm_util_list_length(MBWMList *list); - -MBWMList* -mb_wm_util_list_get_last(MBWMList *list); - -MBWMList* -mb_wm_util_list_get_first(MBWMList *list); - -void* -mb_wm_util_list_get_nth_data(MBWMList *list, int n); - -MBWMList* -mb_wm_util_list_append(MBWMList *list, void *data); - -MBWMList* -mb_wm_util_list_prepend(MBWMList *list, void *data); - -void -mb_wm_util_list_foreach (const MBWMList *list, MBWMListForEachCB func, void *userdata); - -void -mb_wm_util_list_free (MBWMList * list); - MBWMRgbaIcon * mb_wm_rgba_icon_new (); |