diff options
| -rw-r--r-- | openbox/client.c | 4 | ||||
| -rw-r--r-- | openbox/dock.c | 20 | ||||
| -rw-r--r-- | openbox/dock.h | 4 |
3 files changed, 24 insertions, 4 deletions
diff --git a/openbox/client.c b/openbox/client.c index 5f54e640..77bf98fd 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -301,7 +301,7 @@ void client_manage(Window window) dispatch_client(Event_Client_Mapped, self, 0, 0); - g_message("Managed window 0x%lx", window); + g_message("Managed window 0x%lx (%s)", window, self->name); } void client_unmanage_all() @@ -315,7 +315,7 @@ void client_unmanage(Client *self) int j; GSList *it; - g_message("Unmanaging window: %lx", self->window); + g_message("Unmanaging window: %lx (%s)", self->window, self->name); dispatch_client(Event_Client_Destroy, self, 0, 0); g_assert(self != NULL); diff --git a/openbox/dock.c b/openbox/dock.c index 8215dcbf..e17c8913 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -1,5 +1,6 @@ #include "dock.h" #include "screen.h" +#include "prop.h" #include "config.h" #include "grab.h" #include "openbox.h" @@ -51,12 +52,25 @@ void dock_add(Window win, XWMHints *wmhints) { DockApp *app; XWindowAttributes attrib; + char **data; app = g_new0(DockApp, 1); app->obwin.type = Window_DockApp; app->win = win; app->icon_win = (wmhints->flags & IconWindowHint) ? wmhints->icon_window : win; + + if (PROP_GETSS(app->win, wm_class, locale, &data)) { + if (data[0]) { + app->name = g_strdup(data[0]); + if (data[1]) + app->class = g_strdup(data[1]); + } + g_strfreev(data); + } + + if (app->name == NULL) app->name = g_strdup(""); + if (app->class == NULL) app->class = g_strdup(""); if (XGetWindowAttributes(ob_display, app->icon_win, &attrib)) { app->w = attrib.width; @@ -98,7 +112,7 @@ void dock_add(Window win, XWMHints *wmhints) g_hash_table_insert(window_map, &app->icon_win, app); - g_message("Managed Dock App: 0x%lx", app->icon_win); + g_message("Managed Dock App: 0x%lx (%s)", app->icon_win, app->class); } void dock_remove_all() @@ -123,8 +137,10 @@ void dock_remove(DockApp *app, gboolean reparent) dock->dock_apps = g_list_remove(dock->dock_apps, app); dock_configure(); - g_message("Unmanaged Dock App: 0x%lx", app->icon_win); + g_message("Unmanaged Dock App: 0x%lx (%s)", app->icon_win, app->class); + g_free(app->name); + g_free(app->class); g_free(app); } diff --git a/openbox/dock.h b/openbox/dock.h index 14411499..2b6dc4d2 100644 --- a/openbox/dock.h +++ b/openbox/dock.h @@ -46,6 +46,10 @@ typedef struct DockApp { Window icon_win; Window win; + + char *name; + char *class; + int x; int y; int w; |